484 files changed, 183912 insertions, 201218 deletions

diff --git a/ChangeLog b/ChangeLog
index 91445e6..8b160d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,881 @@
-commit 5bd7d9a736997289de10c3bcdbaa089955e46233
+commit 4125c3461149ddec7fb58f58390a5c052eb7f1fc
 Author: Jens Georg <mail@jensge.org>
-Date:   Fri Nov 10 17:30:17 2017 +0100
+Date:   Mon Apr 9 20:26:42 2018 +0200
 
-    Prepare 0.26.4
+    Prepare 0.28.2
 
 M	NEWS
 M	configure.ac
+M	meson.build
 
-commit 6beec4d6cfa7c5a54186f99a04b3ef9e456d8842
+commit 717552104d580c9dad3c8953085fa3e08b26c750
+Author: Jens Georg <mail+gitkraken@jensge.org>
+Date:	Sat Mar 31 13:50:00 2018 +0200
+
+    Piwigo: Fix logging in with "&" in password
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=718742
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit 986cb24554aa9dfd54634b087ee86e7ec2f8c586
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 28 19:19:42 2018 +0200
+
+    Fix crash on editing images with alpha channel
+
+    The cache does not carry alpha channel, use proper counting there
+    to not
+    exceed the cache size
+
+M	src/ColorTransformation.vala
+
+commit 6c1939ef77f33a08204a0869572be62db98635f4
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 26 00:29:14 2018 +0200
+
+    saved search: Fix working with Gtk 3.18
+
+    Looks like Glade's verifier did not find this.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=794673
+
+M	ui/saved_search_dialog.ui
+
+commit 46483b7a7997555d33336177b7f5b9a58cc94db1
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Mar 25 14:48:21 2018 +0200
+
+    Prepare 0.28.1
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 119d0f3b29c5c017081c014af14fcd609bbaa2d5
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Mar 25 14:34:46 2018 +0200
+
+    Revert "publishers: Properly escape urlencoded payload"
+
+    It Breaks at least flicker upload
+
+    This reverts commit 7dc86b74c8a4cd251fb8815a818a206cd7a0d6b0.
+
+M	plugins/common/RESTSupport.vala
+
+commit caaacf4a1c673ca3ea778251c12577274e736859
+Author: gogo <trebelnik2@gmail.com>
+Date:	Thu Mar 22 00:05:12 2018 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit c723f2c1a17568272623340ca4cf696897171948
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 12 22:50:32 2018 +0100
+
+    Fix undefined symbol error
+
+    Or: inline does not do what you expect it to do.
+
+    https://en.wikipedia.org/wiki/Inline_function#C99
+
+    We really want static inline here.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=794293
+
+M	src/_transformation.c
+
+commit 3abcc2f5061e27ba5b5b244ad5e059ba7c3eb2f2
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:	Thu Mar 15 22:20:17 2018 +0200
+
+    Update Latvian translation
+
+M	po/lv.po
+
+commit ecaf52c6dddb02a0c7c92c96ae9869025037465b
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 12 22:06:46 2018 +0100
+
+    Prepare 0.28.0
+
+M	NEWS
+M	configure.ac
+M	icons/Makefile.am
+D	icons/about-aachen.jpg
+A	icons/about-braunschweig.jpg
+M	meson.build
+M	org.gnome.Shotwell.gresource.xml
+M	src/AppWindow.vala
+M	src/Resources.vala
+
+commit 1c0d3d0b0fe6f5f244f126c75cae881e5b5cbc2a
+Author: Alan Mortensen <alanmortensen.am@gmail.com>
+Date:	Sat Mar 10 17:08:25 2018 +0100
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit 986bc3735579db11b8ed4f52bd86f6cb8bc70047
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 6 20:52:06 2018 +0100
+
+    Prepare 0.27.92
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 5553bf0d37de1ca0b1300fc22d4a0280ca3e3efd
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Sat Mar 3 09:51:50 2018 +0100
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit d42a829e93eb955726089ccfc7c98b5227c738e3
+Author: GNOME Translation Robot <gnome-sysadmin@gnome.org>
+Date:	Fri Mar 2 12:10:35 2018 +0000
+
+    Update Scottish Gaelic translation
+
+    (cherry picked from commit ab2c74b50966b746107383f699c39789922e8e92)
+
+M	po/gd.po
+
+commit c03ea62be62c24b72817e97ea9a19da47a51a532
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Tue Feb 27 21:02:00 2018 +0000
+
+    Update German translation
+
+M	help/de/de.po
+
+commit d5aa2a2df84a807843e684075bec711ee1df8ad4
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 26 18:16:40 2018 +0100
+
+    Save selection before setting the restore point
+
+    With the fix for bug 786531, setting the restore point before
+    executing
+    the job would add the restore point to the list of selected items.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=793818
+
+M	src/MediaPage.vala
+
+commit e2df3354579f29cda50d28c94687b025a808a6e9
+Author: Tim Sabsch <tim@sabsch.com>
+Date:	Tue Feb 27 19:58:26 2018 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit 0adcf57608f6a0556bb62e8a35ca08c01fdb4e42
+Author: gogo <trebelnik2@gmail.com>
+Date:	Tue Feb 27 00:00:02 2018 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit bf739e5c74cb77f72acf389c7a309e39b56561fd
+Author: Balázs Úr <balazs@urbalazs.hu>
+Date:	Mon Feb 26 22:44:52 2018 +0000
+
+    Update Hungarian translation
+
+M	po/hu.po
+
+commit 03bcc8b01e07dd36eb1b195de7d54e4b88ff4446
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Sun Feb 25 22:55:25 2018 +0100
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 1544f599c4995084f2b487e602e4c264066fdb07
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sat Feb 24 00:46:26 2018 +0100
+
+    Fix Spanish translation header
+
+M	help/es/es.po
+M	po/es.po
+
+commit 9241488bec9f9f74cb0b80353e67c85a50825a9a
+Author: Daniel Korostil <ted.korostiled@gmail.com>
+Date:	Thu Feb 22 07:40:18 2018 +0000
+
+    Update Ukrainian translation
+
+M	po/uk.po
+
+commit 2eaeb63bf4b4d79b81035030551b34ec99582186
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:	Wed Feb 21 07:55:54 2018 +0100
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr@latin.po
+
+commit 7dc86b74c8a4cd251fb8815a818a206cd7a0d6b0
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 10 21:12:32 2018 +0100
+
+    publishers: Properly escape urlencoded payload
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=718742
+
+M	plugins/common/RESTSupport.vala
+
+commit 418c4b2feb27b8e93a8cc1ee7cfee219630a2f7a
+Author: Jiri Grönroos <jiri.gronroos@iki.fi>
+Date:	Sat Feb 10 17:58:25 2018 +0000
+
+    Update Finnish translation
+
+M	po/fi.po
+
+commit d607aebe3314cbe4cfcb26e17ca13fd60567f1f2
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 5 19:08:54 2018 +0100
+
+    Prepare 0.27.4
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 3b3b7c424437d66703abb10b1ac5dc3c7539f6d1
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Sun Jan 28 13:13:11 2018 +0100
+
+    Updated Czech translation
+
+M	help/cs/cs.po
+M	po/cs.po
+
+commit af6f570624795ca364b9922597dd02d4a3dc832d
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Sat Jan 20 22:00:38 2018 +0100
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 9c2c6af1f188974ba01b23c3bf88b40f20006bf5
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Wed Jan 17 20:37:49 2018 +0100
+
+    Fixes to Catalan translation
+
+M	po/ca.po
+
+commit d076d4c54fbc0c24a14b9f70757afa0e69712eb4
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jan 13 23:05:18 2018 +0100
+
+    Prevent crash when removing the event's last photo
+
+    Issue is that this would destroy the event and destroy the media page,
+    afterwards trying to update the undo list on the now destroyed view
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=786531
+
+M	src/MediaPage.vala
+
+commit 1786a3a69dd79f378ba4f669d2e28fe9c5d10a7b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jan 13 21:48:28 2018 +0100
+
+    Fix folder sidebar with DAV
+
+    Shotwell tried to go up to the root folder, but if a concrete path is
+    mounted, the parent might not have a path associated
+
+    So we stop if there is either no parent or the parent does not have a
+    local mount representation
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=792498
+
+M	src/folders/FoldersBranch.vala
+
+commit 5125d2fbfad5408f42958802f0d6a6ebfa01d7aa
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:	Sat Jan 13 14:26:43 2018 +0000
+
+    Update Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 99c2704b1350cb074c45503578520982b5ac7e3e
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Jan 9 21:52:32 2018 +0100
+
+    Prepare 0.27.3
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit e902cd38eda129eb1e9b928d5dea5c47a1f45572
+Author: Cheng-Chia Tseng <pswo10680@gmail.com>
+Date:	Tue Jan 2 11:22:02 2018 +0000
+
+    Update Chinese (Taiwan) translation
+
+M	po/zh_TW.po
+
+commit c625d5b3476aa45903633b4904761bbc4fa18fe2
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Jan 1 13:26:13 2018 +0100
+
+    Use new location for appdata files
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=790185
+
+M	m4/appstream-xml.m4
+M	misc/meson.build
+
+commit f55ead60f6dd2a4b3cbc00f5042103fa8a3a602e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Jan 1 11:31:44 2018 +0100
+
+    Make internal helper library shared
+
+    Fixes issue with multiple class registration in ubuntu ppa binaries
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=792058
+
+M	src/plugins/meson.build
+
+commit 908b0333d8f6f2bdd1520e6d6fdecb237da94750
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 28 08:50:17 2017 +0100
+
+    Enhance spacing without headerbars
+
+M	src/publishing/PublishingUI.vala
+
+commit 9d2642f7c018b0d353915f5dae4a5ccbfa9c26c0
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Dec 25 15:02:13 2017 +0100
+
+    Add documentation for contrast
+
+M	help/C/edit-adjustments.page
+
+commit 8e2edcaa7291a8f36dd41f94c657c1f89e66ba8e
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 24 16:22:10 2017 +0100
+
+    Fix showing help when running from build dir
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=717126
+
+M	src/Resources.vala
+
+commit b80a42d7a4f60be28369204936f55a2e0f16f5ae
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 24 14:13:05 2017 +0100
+
+    Don't wrongly fall back to shotwell developer
+
+    If we requested CAMERA development, but the RAW file did not have any
+    preview embedded, Shotwell falls back to the SHOTWELL developer, even
+    though we have the camera-developed fle available
+
+    Only fall back to SHOTWELL if embedded was chosen and embedded is not
+    available.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=791893
+
+M	src/Photo.vala
+
+commit 70cab367c581563b9e6bfd2bb4b8850fe78a8005
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+Date:	Sun Dec 24 09:25:30 2017 +0100
+
+    build: Drop broken reference to MaybeHeaderbarDialog.vala
+
+M	shotwell.am
+
+commit 686e625647034587ef62efe4400a23f4927a00f1
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Dec 23 21:25:15 2017 +0100
+
+    Some syling fixes for SavedSearch dialog
+
+M	src/searches/SavedSearchDialog.vala
+
+commit 365cb94e4854bcb5edd1c4db89f4ed0454559662
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Dec 23 15:02:02 2017 +0100
+
+    Align Histogram in center
+
+M	src/editing_tools/RGBHistogramManipulator.vala
+
+commit d0dd38464c0654e909da679713bd3751f6a6ae24
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Dec 23 15:01:45 2017 +0100
+
+    Adjustment Tool: Add labels to sliders
+
+    So the actual values can be seen and probably taken over to other
+    images
+
+M	src/editing_tools/EditingTools.vala
+
+commit caa27aa336f77a9e969bd7972ccec609b1bbf00f
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 23:30:56 2017 +0100
+
+    Fix another merge issue
+
+M	ui/manifest_widget.ui
+
+commit 5829627cef569db0574cba1de831b9af4e400edd
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 23:16:32 2017 +0100
+
+    Remove merge issues from shotwell.ui
+
+M	ui/shotwell.ui
+
+commit 1b003e8f3ba02b658f08497dd63d710850b43e46
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 23:10:54 2017 +0100
+
+    Add a dummy Piwigo server
+
+A	test/server.py
+
+commit 9fd45306cc05922137944f210b4cb93424c68e81
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 22:07:36 2017 +0100
+
+    Update automake
+
+M	shotwell.am
+M	ui/Makefile.am
+
+commit f1abf623183ed1bc964e8224802558129efa189c
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 22:06:58 2017 +0100
+
+    Update POTFILES.in and POTFILES.skip
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit a4c40931da84727358a9ef3f8858764b8045bae6
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 21:46:00 2017 +0100
+
+    Use ListBox for search criteria row
+
+M	src/searches/SavedSearchDialog.vala
+M	ui/saved_search_dialog.ui
+
+commit b3a2f41ddf3bb3d12a17f2420d98ef13da0269e0
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 19 21:36:40 2017 +0100
+
+    More consistent HeaderBar handling
+
+M	src/Properties.vala
+M	src/Resources.vala
+M	src/data_imports/DataImportsUI.vala
+M	src/dialogs/AdjustDateTimeDialog.vala
+M	src/dialogs/ExportDialog.vala
+M	src/dialogs/MultiTextEntryDialog.vala
+M	src/dialogs/Preferences.vala
+M	src/dialogs/SetBackground.vala
+M	src/dialogs/SetBackgroundSlideshow.vala
+M	src/dialogs/TextEntry.vala
+M	src/dialogs/WelcomeDialog.vala
+M	src/publishing/PublishingUI.vala
+M	src/searches/SavedSearchDialog.vala
+
+commit f489c26f64aa16b989c397002c076553845d5cf7
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 14:13:21 2017 +0100
+
+    Make ManifestWidget templated
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/dialogs/Preferences.vala
+M	src/plugins/ManifestWidget.vala
+A	ui/manifest_widget.ui
+M	ui/shotwell.ui
+
+commit 9bf6ab69afdf00894cf3a73e0b8af24c5414d494
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 13:36:10 2017 +0100
+
+    Make SavedSearch dialog templated
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/searches/SavedSearchDialog.vala
+A	ui/saved_search_dialog.ui
+M	ui/shotwell.ui
+
+commit a450daec832468b92068e428ed545183db9d1093
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 12:47:38 2017 +0100
+
+    Extract ProgressDialog
+
+M	src/Dialogs.vala
+A	src/dialogs/ProgressDialog.vala
+M	src/meson.build
+
+commit 044842b35962932fdf59db1bfd7ed6a3db5039f3
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 19 21:34:55 2017 +0100
+
+    Extract WelcomeDialog
+
+M	src/Dialogs.vala
+A	src/dialogs/WelcomeDialog.vala
+M	src/meson.build
+
+commit 122e3bda66d4b4afbc110363c6f1c00f237898ad
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 19 20:59:22 2017 +0100
+
+    Extract AdjustDateTimeDialog
+
+M	src/Dialogs.vala
+A	src/dialogs/AdjustDateTimeDialog.vala
+M	src/meson.build
+
+commit a0916895cf7e7a6d448b66374572762739227abe
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 16:42:49 2017 +0100
+
+    Extract MultiTextEntryDialog
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/Dialogs.vala
+A	src/dialogs/MultiTextEntryDialog.vala
+M	src/meson.build
+A	ui/multitextentrydialog.ui
+M	ui/shotwell.ui
+
+commit 7351d786f3256e7fa535cef906785a473fb37e67
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 19 20:41:14 2017 +0100
+
+    Extract Export dialog
+
+M	src/Dialogs.vala
+A	src/dialogs/ExportDialog.vala
+M	src/meson.build
+
+commit d783672bf514ec85c8f73f041f65f5bbb59d10ca
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 16:42:26 2017 +0100
+
+    Extract Preferences Dialog
+
+M	src/Dialogs.vala
+A	src/dialogs/Preferences.vala
+M	src/meson.build
+
+commit 70215a717702713711332f9270255d4f8edd455c
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 16:40:55 2017 +0100
+
+    Extract TextEntry dialog
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/Dialogs.vala
+A	src/dialogs/EntryMultiCompletion.vala
+A	src/dialogs/TextEntry.vala
+M	src/meson.build
+M	ui/shotwell.ui
+A	ui/textentrydialog.ui
+
+commit 3b177a6a7d37016b92bf98e0f3021eb31353f15a
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 16:40:05 2017 +0100
+
+    Extract SetBackgroundSlideshow dialog
+
+M	shotwell.am
+M	src/Dialogs.vala
+A	src/dialogs/SetBackgroundSlideshow.vala
+M	src/meson.build
+
+commit af567f9ca897202763c770e979cd1d1781cebe7b
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Dec 20 16:38:27 2017 +0100
+
+    Extract SetBackground dialog
+
+M	shotwell.am
+M	src/Dialogs.vala
+A	src/dialogs/SetBackground.vala
+M	src/meson.build
+
+commit c50772173477689f38fb65234b3a757958974831
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:	Wed Dec 20 18:23:12 2017 +0100
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit 4c4afdad9d442b168621fe6fdabaafe739948d97
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Dec 18 11:13:18 2017 +0100
+
+    When switching month/year in calendar, update other inputs
+
+M	src/Dialogs.vala
+
+commit 7026555aede74e65ee374f0baa52c5c8d1b2458e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Dec 18 11:07:55 2017 +0100
+
+    Add F4 as shortcut for Date/Time dialog
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=753943
+
+M	src/CollectionPage.vala
+M	ui/direct.ui
+M	ui/photo.ui
+
+commit 476ccb26f086585de4b8c2a9bd0dd3c6dd6c5ba4
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Dec 15 05:21:03 2017 +0100
+
+    Make Histogram keyboard accessible
+
+    Histogram can now be used by keyboard as follows:
+
+    - Left/Right key will move the manipulator
+    - Shift will select which manipulator is used. No Shift => left
+      manipulator, Shift => right manipulator
+    - Normal increase or decrease is 5. Using CTRL this can be modified
+    to 1
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716431
+
+M	src/editing_tools/RGBHistogramManipulator.vala
+
+commit 7d3034fac2e78b54aa9d70025ff5faafd243a6ca
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 12 20:46:54 2017 +0100
+
+    Fix type of primary_source_id table on upgrade
+
+    This is TEXT now, not INTEGER
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=790469
+
+M	src/db/Db.vala
+
+commit 7f932b0f40611cbc76b925751769e6432d396ec9
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Dec 12 20:33:31 2017 +0100
+
+    Fix upgrading from Shotwell 0.7.2
+
+    There was a check missing for the existence of VideoTable
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=790469
+
+M	src/db/Db.vala
+
+commit 2c8ae067b7bf0181d8e1c9b557928119e158614b
+Author: Kukuh Syafaat <syafaatkukuh@gmail.com>
+Date:	Tue Dec 12 13:00:52 2017 +0000
+
+    Update Indonesian translation
+
+M	po/id.po
+
+commit c569afc460716f675f0009d9a475baedbb87da84
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Dec 11 18:25:46 2017 +0100
+
+    Prepare 0.27.2
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 15db8493b70c5e4e90b95cecda73f34663eda1fa
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 10 14:06:17 2017 +0100
+
+    help: Fix keyboard shortcut for publishing
+
+M	help/C/share-upload.page
+
+commit 826963a088633e66e062dc55165141358097ff56
+Author: Josef Andersson <l10nl18nsweja@gmail.com>
+Date:	Tue Nov 28 00:25:43 2017 +0000
+
+    Update Swedish translation
+
+M	po/sv.po
+
+commit 2fe7872a0902a79a2b1a27d6b0273e50a37380fa
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Nov 27 12:56:05 2017 +0100
+
+    Make month and year editable in date/time selector
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=736643
+
+M	src/Dialogs.vala
+
+commit 5e9053bb76999178f6ae27f011c4a3f90325512e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Nov 27 20:32:35 2017 +0100
+
+    Fix compiling with older valac
+
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+
+commit 437714de31aec97f25928bd93331ae4aad1e9514
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 26 21:34:52 2017 +0100
+
+    Trigger keyword update when comment changes
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=729857
+
+M	src/MediaDataRepresentation.vala
+
+commit 3f9a84bf92bb930336cd1df027596290a59e3dba
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Nov 26 18:47:43 2017 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 2f0cb4807540574100f007139f9d8a5da36490e2
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 26 15:43:58 2017 +0100
+
+    Do not reset title on startup
+
+    This partially reverts some of the startup optimisation made in
+    125bfbe
+    but doesn't seem to make the startup any worse
+
+    Fixes sorting by title
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=790668
+
+M	src/Thumbnail.vala
+
+commit 28cbe3fa2255954951e098fb24db5f599c4e3c89
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Fri Nov 24 21:46:38 2017 +0100
+
+    Update POTFILES.in
+
+M	po/POTFILES.in
+
+commit a9a09f8944e9aa4c594367c23b89a8a7c70dcd2e
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Nov 24 21:33:47 2017 +0100
+
+    Flickr: Remove external browser call
+
+    Instead, do the authentication flow with WebKit.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=718977
+
+M	authenticator.am
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+D	plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
+M
+plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
+
+commit 6a2fe441f5872b7e98dd3ae81ec28242c78fa602
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Nov 17 19:29:26 2017 +0100
+
+    OAuth1: Move into own file
+
+M	Makefile.am
+A	plugins/common/OAuth1Support.vala
+M	plugins/common/RESTSupport.vala
+M	plugins/meson.build
+
+commit e5abe03c52172f6bdb649c4247d8face70646bdc
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 16 21:44:49 2017 +0100
+
+    OAuth1: Fix upload signing
+
+M	plugins/common/RESTSupport.vala
+
+commit f8849b8dfa51c3a6718dbf72261f5002798b8f8f
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 16 21:43:11 2017 +0100
+
+    Tumblr,Flicker: Fix authorization
+
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+
+commit 807376fc2f2fdd718d1025b68ad4338146628eab
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 16 20:47:35 2017 +0100
+
+    OAuth: Fix serialization of upload authorization
+
+M	plugins/common/RESTSupport.vala
+
+commit 38fc4ab9a2f593e19626d2dea3a16df23351a47f
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 16 10:25:39 2017 +0100
+
+    tumblr: Rename authentication call-back
+
+    Just to be clear, minor clean-up
+
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+
+commit 204004856ccb5c60a1df0d72c8ecdf40aa337898
+Author: Ask Hjorth Larsen <asklarsen@gmail.com>
+Date:	Sat Nov 11 18:44:56 2017 +0100
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit fdda622dbb58e904231c3f0f7cd678375f12f991
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Nov 11 14:42:39 2017 +0100
+
+    Clean-up printing dialog
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=779677
+
+M	ui/printing_widget.ui
+
+commit a54c9b6f48d5451c877aff02056b73328e7e512e
 Author: Jens Georg <mail@jensge.org>
 Date:	Fri Nov 10 16:28:47 2017 +0100
 
@@ -19,7 +887,296 @@ Date:	Fri Nov 10 16:28:47 2017 +0100
 
 M	src/Page.vala
 
-commit 102c304d32f605081871bda77c23a5c021f87245
+commit 6d6e33022b69fb6cab6ce369964d7a813e7231c4
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Nov 9 17:58:45 2017 +0100
+
+    Update POTFILES.in and POTFILES.skip
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit c39348626287522b83abf1b2ce7a9eec9bf07f69
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 9 00:42:17 2017 +0100
+
+    Add OAuth1.UploadTransaction base class
+
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+
+commit 9e9b8bc33d567838f2a55ca57456973ba29c98b5
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 8 23:47:57 2017 +0100
+
+    Tumblr: Fix indentation
+
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+
+commit 3d44027404c19eb1f97c17f4f106a99876ba848f
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 8 23:43:21 2017 +0100
+
+    Move OAuth1 code into common library
+
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+M	plugins/authenticator/shotwell/OAuth1Authenticator.vala
+M	plugins/authenticator/shotwell/TumblrAuthenticator.vala
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+
+commit 6192c47ff22522cb0f938533f0b7de5ac55c6b08
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 8 22:47:32 2017 +0100
+
+    Tumblr: Re-use OAuth1 code in authenticator
+
+M	plugins/authenticator/shotwell/TumblrAuthenticator.vala
+
+commit 314e369bb7b6302d39cbbe93bd3bef6904549f9b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Oct 22 19:49:31 2017 +0200
+
+    Tumblr: Add Authenticator to framework
+
+M	authenticator.am
+M	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+A	plugins/authenticator/shotwell/TumblrAuthenticator.vala
+M	plugins/authenticator/shotwell/meson.build
+M
+plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
+R100	plugins/shotwell-publishing/tumblr_authentication_pane.ui
+plugins/authenticator/shotwell/tumblr_authentication_pane.ui
+M	plugins/shotwell-publishing/TumblrPublishing.vala
+M
+plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+M	po/POTFILES.in
+M	publish.am
+
+commit 78d3090eb507835abf52df86217ba0724fc28d09
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Oct 22 14:01:33 2017 +0200
+
+    Flickr: Split out OAuth1 stuff into common class
+
+M	authenticator.am
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+A	plugins/authenticator/shotwell/OAuth1Authenticator.vala
+M	plugins/authenticator/shotwell/meson.build
+
+commit e9f8c2498d7364981f1fdf3ab30072e51f4e2720
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 7 09:17:37 2017 +0100
+
+    ColorTransformation: Round up slice length
+
+    Otherwise we miss a couple of lines at the end.
+
+M	src/ColorTransformation.vala
+
+commit 08408e7068ef2d91f00cc58604de2902ebfceb09
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 5 19:06:55 2017 +0100
+
+    Fill pixel cache from lookup table
+
+M	src/editing_tools/EditingTools.vala
+
+commit d71dd2276dbfa6bfec36a275617e9b0de06a19ec
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 5 19:06:36 2017 +0100
+
+    Parallelize color transformations
+
+M	src/ColorTransformation.vala
+M	src/graphics-processor.vala
+
+commit 1d7b21c77dad55845734b28425f31bb0023bd791
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 5 18:59:23 2017 +0100
+
+    Convert color transformations to C
+
+    GCC has massive issues to optimize away the struct assignments Vala
+    generates. clang seems to be fine with them, but we cannot require a C
+    compiler.
+
+M	pipeline.am
+M	src/ColorTransformation.vala
+A	src/_transformation.c
+M	src/meson.build
+
+commit 4d4041a133a029bfb123fd48f641cbe6acbad5a6
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 8 15:34:35 2017 +0100
+
+    Fix unmounting devices on MTP conflict
+
+    Apparently there are devices that are occupied bz the MTP volume
+    monitor. Fix unmounting those cameras as well
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=786821
+
+M	src/camera/ImportPage.vala
+
+commit 3430844a7ee61cc67089c95486ad784d7af6f613
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Oct 26 22:01:41 2017 +0200
+
+    Rename "Width or height" in Gallery plug-in as well
+
+M
+plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+
+commit 06a720c4e1f720ad2e88e93ab27c29c9f341f4fd
+Author: Alan Mortensen <alanmortensen.am@gmail.com>
+Date:	Sat Nov 4 13:49:51 2017 +0100
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit 1b1e155d781e2bfadafe5f8430df269b28219be2
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Sun Oct 29 08:36:37 2017 +0100
+
+    Updated Czech translation
+
+M	help/cs/cs.po
+M	po/cs.po
+
+commit 6bfefa9389d4c34b5b080ed5d18855b9354f1f36
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Tue Oct 24 07:34:34 2017 +0000
+
+    Update German translation
+
+M	help/de/de.po
+
+commit b4c947b4e29c3bdb081372bcbc8c0854c7971123
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Tue Oct 24 07:10:48 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit e7cc6ebd30abf253142fa947819b3fffe549c27b
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Mon Oct 23 08:14:27 2017 +0200
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 1ec966bdf3e7c9cc6915542f484aacd4ee9b12ff
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Oct 22 18:10:09 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 763b1be74f3f5f51157e12bd88f3e04f7600c474
+Author: Cheng-Chia Tseng <pswo10680@gmail.com>
+Date:	Sun Oct 22 13:35:50 2017 +0000
+
+    Update Chinese (Taiwan) translation
+
+M	po/zh_TW.po
+
+commit ca488db5886936aafe4f1b3590489d1a16650fa1
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Sep 25 21:59:03 2017 +0200
+
+    Re-word "Width or Height" scaling constraint
+
+    Also add some documentation on what that is supposed to do
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=787553
+
+M	help/C/share-export.page
+M	src/Dimensions.vala
+
+commit af9a74811bc5f5ff3e3a7cea3dcbb9ada5ea3eb1
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 21 11:13:50 2017 +0200
+
+    debian: Use meson
+
+M	debian/changelog
+M	debian/control
+M	debian/rules
+
+commit 3900ffccf9cfb6b15ab06b38d97d5edfe18c289f
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 21 10:44:24 2017 +0200
+
+    Dist shotwell.svg
+
+M	icons/Makefile.am
+
+commit eed20d153fe8d6959947191aa9a99e060c36280b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 21 10:29:06 2017 +0200
+
+    Prepare 0.27.1
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 6a080645557627e0321e975f0333135c04aa6821
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 21 09:50:48 2017 +0200
+
+    Add SVG version of trash_process.png
+
+A	help/C/figures/trash_process.svg
+
+commit 3f6b526aa193c5f059e4fbb4399f454683eb9b9d
+Author: Isaac F. Ferreira Filho <isaacmob@riseup.net>
+Date:	Sat Oct 7 07:58:07 2017 +0000
+
+    Update Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 9aba7a4aa713ca135502e29c1126bce1aa5e21bf
+Author: Kukuh Syafaat <syafaatkukuh@gmail.com>
+Date:	Wed Oct 4 12:44:46 2017 +0000
+
+    Update Indonesian translation
+
+M	po/id.po
+
+commit 53924d1e7f8db3f1b462e1486cb10bc288568b42
+Author: Gert <gw.fossdev@gmail.com>
+Date:	Tue Oct 3 20:45:00 2017 +0000
+
+    Speed up event creation
+
+    Instead of switching to the event while populating it, first populate
+    it, then switch to it. This avoids triggering a redraw each time
+    a photo
+    is added to the event.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=787400
+
+M	src/Commands.vala
+
+commit 170a14e84dd80a8465b4af81d09b7e5bf42cb72f
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Oct 4 10:48:44 2017 +0200
+
+    Fix missing icon of start-up dialog
+
+A	icons/shotwell.svg
+M	org.gnome.Shotwell.gresource.xml
+
+commit 67d3081eb291547150dac756f6b2a00c1add9531
 Author: stefan <stefan.home@aon.at>
 Date:	Wed Aug 30 21:11:13 2017 +0200
 
@@ -36,7 +1193,84 @@ Date:	Wed Aug 30 21:11:13 2017 +0200
 M	src/MediaViewTracker.vala
 M	src/SearchFilter.vala
 
-commit 28d0ef17c13f0a8e892a50a5488333a4f93b7150
+commit d0617ef1d1fe2a30882821cd64e5be4f2a7dbe1d
+Author: Jeremy Bicha <jbicha@ubuntu.com>
+Date:	Tue Oct 3 09:21:48 2017 -0400
+
+    Fix typo in Indonesian translation
+
+M	po/id.po
+
+commit 3d7852010cee16d24368f0889926646fcc7681b3
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Mon Oct 2 10:25:06 2017 +0000
+
+    Update German translation
+
+M	help/de/de.po
+
+commit 2563bf16ef71f84bc1aa7bcf18e4e642321b1271
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Mon Oct 2 10:18:41 2017 +0000
+
+    Update German translation
+
+    (cherry picked from commit 6bb7858c26260415155cc40ea003a88cef568ed6)
+
+M	help/de/de.po
+
+commit f784f74b88f6fc039f4ab07f22bbcb40811d6635
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Mon Oct 2 09:19:40 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit 377816708c7213259802451724b1fd0fd1da72fc
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Sun Oct 1 09:55:35 2017 +0200
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit fd2c38b47811ca859d541dc35462678b3f7e677c
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Thu Sep 28 20:48:42 2017 +0000
+
+    Update Swedish translation
+
+M	help/sv/sv.po
+
+commit f4867f928060eb442a07cfa391e17d218af6eff3
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Sep 28 15:19:30 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit f0cc8ab7929242faa58f6aa69b7a123bec692f09
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Sep 28 14:21:27 2017 +0200
+
+    Mark missing strings for translation
+
+    Unfortunately, Glade suffers from
+    https://bugzilla.gnome.org/show_bug.cgi?id=782753
+
+M	ui/preferences_dialog.ui
+
+commit 9de0e2d1787986f0f43c49deb90632fb8272974a
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Mon Sep 25 18:58:26 2017 +0200
+
+    Updated Czech translation
+
+M	help/cs/cs.po
+
+commit 0c9344dd9b5f1135728710358eea5d2869a59a14
 Author: Andre Klapper <a9016009@gmx.de>
 Date:	Mon Sep 25 18:11:43 2017 +0200
 
@@ -44,7 +1278,7 @@ Date:	Mon Sep 25 18:11:43 2017 +0200
 
 M	help/C/organize-remove.page
 
-commit 65bc6811cc8db3366f73ab479ad077cabd92d968
+commit 472b6b24c16547bbe422e35d88ac25324a6d4227
 Author: Andre Klapper <a9016009@gmx.de>
 Date:	Mon Sep 25 18:10:10 2017 +0200
 
@@ -52,7 +1286,7 @@ Date:	Mon Sep 25 18:10:10 2017 +0200
 
 M	help/C/formats.page
 
-commit d7a68d2364f351dd551ccc0c514897d9c801ade9
+commit a08cf40434fc65d697e3f1a05bb44ad7f563f348
 Author: Andre Klapper <a9016009@gmx.de>
 Date:	Mon Sep 25 18:08:33 2017 +0200
 
@@ -65,7 +1299,7 @@ M	help/C/organize-event.page
 M	help/C/organize-flag.page
 M	help/C/view-displaying.page
 
-commit 747f1be1d4f86d4d5e0487e0e40f6b54c3c74a48
+commit cacc93cf7f5a374f35d88689a021219090c6b0fb
 Author: Andre Klapper <a9016009@gmx.de>
 Date:	Sun Sep 24 23:50:03 2017 +0200
 
@@ -73,7 +1307,27 @@ Date:	Sun Sep 24 23:50:03 2017 +0200
 
 M	help/de/de.po
 
-commit 9389c1b62f7be8d58b5042eb3d4b9168143a3663
+commit bcbd455f4da6917efa10086d68f17f390974b9d2
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Sep 23 13:17:49 2017 +0200
+
+    Remove locale-dependent filter short-cuts
+
+    They did not work after the GtkAction removal anyway and are redundant
+    by the search bar action accellerators which do it in a more
+    language-portable way
+
+M	src/MediaPage.vala
+
+commit e7fbd65ec55e2c419c2b965baaf1a2f66ec99135
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Sep 23 11:43:04 2017 +0200
+
+    Remove obsolete action
+
+M	src/MediaPage.vala
+
+commit 3929fd76688de8a5fcb6951504c26d133d735937
 Author: Jens Georg <mail@jensge.org>
 Date:	Sat Sep 23 08:05:29 2017 +0200
 
@@ -84,7 +1338,7 @@ Date:	Sat Sep 23 08:05:29 2017 +0200
 
 M	src/Page.vala
 
-commit 24cebbc5535ad0bbd2eb50d101557bdf3eb56977
+commit 5b2a70d25718bdc5b4f5056cc501b9a0155d7a13
 Author: Jens Georg <mail@jensge.org>
 Date:	Fri Sep 22 22:55:42 2017 +0200
 
@@ -94,7 +1348,26 @@ Date:	Fri Sep 22 22:55:42 2017 +0200
 
 M	ui/savedsearch.ui
 
-commit 8f489ada52ae9340df0aad2f2b8eef0ce72cd8b0
+commit f8d28561a4f4f1fff263dee71c354105852ff1f2
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Sep 22 22:26:10 2017 +0200
+
+    Remove Rajce and Yandex no longer build by default
+
+    Both are not working any longer
+
+M	configure.ac
+M	meson_options.txt
+
+commit 6af0385194fc91db3bf07c673bc18ee7151c141d
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Wed Sep 20 19:44:21 2017 +0200
+
+    Added image for doc translation
+
+A	help/de/figures/trash_process.png
+
+commit b1347a13e68da0e4dbbcaa2f7d282bb7798bbdd9
 Author: Jens Georg <mail@jensge.org>
 Date:	Tue Sep 19 22:35:01 2017 +0200
 
@@ -110,7 +1383,7 @@ Date:	Tue Sep 19 22:35:01 2017 +0200
 
 M	src/events/EventDirectoryItem.vala
 
-commit 79d74903a0b7ac330c8ccec3b0510e1462da5b14
+commit 3b42439efa04bfa63d0a3c5d00a30cb09948f5b1
 Author: Jens Georg <mail@jensge.org>
 Date:	Sat Sep 16 09:13:39 2017 +0200
 
@@ -120,7 +1393,23 @@ Date:	Sat Sep 16 09:13:39 2017 +0200
 
 M	src/VideoSupport.vala
 
-commit 5b888386b8c0e40a94a356bf6d5420e741ebfda1
+commit 7ac90f5fef90610493775475ff08a01ba58b61d2
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:	Sun Sep 10 18:15:02 2017 +0000
+
+    Update Hungarian translation
+
+M	po/hu.po
+
+commit 31edc3cbe09bccae50d6237c85f7f7d518f583fe
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Sun Sep 10 09:26:35 2017 +0200
+
+    Fixes to Catalan translation
+
+M	po/ca.po
+
+commit dcd71fed6848ce8f6d3422f429bd2bb00616d2f2
 Author: Peter Seiderer <ps.report@gmx.net>
 Date:	Sun Feb 5 00:08:00 2012 +0000
 
@@ -133,7 +1422,63 @@ Date:	Sun Feb 5 00:08:00 2012 +0000
 
 M	src/camera/GPhoto.vala
 
-commit b576977462ed4f987f24f47a029a3aff25d7e3c6
+commit 1d936a21f714365943ba2ad2e771be8e77edd1bb
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Thu Sep 7 18:18:02 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit c5dbf59dc04510728ac2210dbc2903e381033509
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Thu Sep 7 16:29:35 2017 +0200
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 8cf927172ed834afec73923afcb631c6bae00a0e
+Author: Jiri Grönroos <jiri.gronroos@iki.fi>
+Date:	Thu Sep 7 12:12:44 2017 +0000
+
+    Update Finnish translation
+
+M	po/fi.po
+
+commit 1601862abd28cf70a77306716142460a3968dbc8
+Author: Andika Triwidada <atriwidada@gnome.org>
+Date:	Fri Sep 1 08:38:41 2017 +0000
+
+    Update Indonesian translation
+
+M	po/id.po
+
+commit 26712a040700947d1a22055fab9e7c07fba54da1
+Author: Cheng-Chia Tseng <pswo10680@gmail.com>
+Date:	Thu Aug 31 04:27:57 2017 +0000
+
+    Update Chinese (Taiwan) translation
+
+M	po/zh_TW.po
+
+commit 2e028c96365f0a9087d76994648c539d9e3dd3a4
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Thu Aug 31 03:17:19 2017 +0200
+
+    Updated Czech translation
+
+M	help/cs/cs.po
+
+commit 77e1f7dc5c9ebf14269cbc3230b58f2959cbf9d5
+Author: Cheng-Chia Tseng <pswo10680@gmail.com>
+Date:	Wed Aug 30 13:54:53 2017 +0000
+
+    Update Chinese (Taiwan) translation
+
+M	po/zh_TW.po
+
+commit 012a1caeef173f2adbe2cf0e20c709d895858ace
 Author: Jens Georg <mail@jensge.org>
 Date:	Sat Aug 26 15:37:12 2017 +0200
 
@@ -143,74 +1488,136 @@ Date:	Sat Aug 26 15:37:12 2017 +0200
 
 M	src/MediaDataRepresentation.vala
 
-commit fc42ea3448cd742b3bc041ee5d5c0175a16d2a89
-Author: Stefan Willinger <stefan.home@aon.at>
-Date:	Sun Aug 20 23:11:09 2017 +0200
+commit 11f5efeb7e95bdac202242edd8d121a2c2087225
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Mon Aug 28 15:46:07 2017 +0200
 
-    Rename backing photo to lower case as well
+    Updated Czech translation
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=777626
+M	po/cs.po
 
-M	src/LibraryFiles.vala
-M	src/photos/RawSupport.vala
+commit d7264c3d9779ba4604e4f7d82d3005380d7ac3df
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Aug 27 17:22:48 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit b997726a779013fa0f304f39081674dad7e5f964
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sat Aug 26 16:00:32 2017 +0200
+
+    Use Unicode apostrophes in new tooltips
+
+    See https://developer.gnome.org/hig/stable/typography.html
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=772339
+
+M	src/folders/FoldersBranch.vala
+M	src/tags/TagsBranch.vala
 
-commit 68b9564e4f3a7cecc769523433b5f2b51f3ce2d8
+commit 61164195c49d04cb7cbdb05468af7b355b1dbd60
 Author: Jens Georg <mail@jensge.org>
-Date:	Sun Aug 20 14:59:50 2017 +0200
+Date:	Sat Aug 26 14:26:24 2017 +0200
 
-    Fix import progress when importing RAW files
+    Fix top-level tooltips
 
-M	src/BatchImport.vala
+M	src/camera/CameraBranch.vala
+M	src/events/EventsBranch.vala
+M	src/folders/FoldersBranch.vala
+M	src/library/LibraryBranch.vala
+M	src/searches/SearchesBranch.vala
+M	src/sidebar/common.vala
+M	src/tags/TagsBranch.vala
 
-commit 431f5681b177608638c6472ce7ea13c539ae7cb5
-Author: Jeremy Bicha <jbicha@ubuntu.com>
-Date:	Tue Oct 3 09:21:48 2017 -0400
+commit bf19032a801520a7ba3048e473367306b6aca838
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Fri Aug 25 18:59:45 2017 +0000
 
-    Fix typo in Indonesian translation
+    Update Swedish translation
 
-M	po/id.po
+M	help/sv/sv.po
 
-commit 6bb7858c26260415155cc40ea003a88cef568ed6
-Author: Mario Blättermann <mario.blaettermann@gmail.com>
-Date:	Mon Oct 2 10:18:41 2017 +0000
+commit 4331130354a3ce887f679ce094b3b9d7723263da
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Fri Aug 25 18:29:38 2017 +0200
 
-    Update German translation
+    Updated Czech translation
 
-M	help/de/de.po
+M	po/cs.po
 
-commit fb214d3c2ad6e7dd3ea52c329ed82943978e416a
-Author: Mario Blättermann <mario.blaettermann@gmail.com>
-Date:	Wed Sep 20 19:46:13 2017 +0200
+commit 4df466a5b1d1e67ae23c7e11b7fea0cc4d21202c
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Fri Aug 25 03:05:05 2017 +0200
 
-    Added image for doc translation
+    Update POTFILES.in and POTFILES.skip
 
-A	help/de/figures/trash_process.png
+M	po/POTFILES.in
+M	po/POTFILES.skip
 
-commit 7a7d69fea2124f8627aa7808bcdbd15acd443a30
-Author: Marcos Lans <marcoslansgarza@gmail.com>
-Date:	Mon Sep 11 17:40:13 2017 +0000
+commit 11c2c85696b032edd8a47b4384e89b7e784900a9
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Aug 24 22:21:54 2017 +0200
 
-    Update Galician translation
+    Add more details to Mass storage cameras
 
-M	po/gl.po
+    Get icon and description from associated GVolume for mass storage
+    cameras. This should make it easier to find the correct camera when
+    having connected more than one devices.
 
-commit 7220b65989637a961d5b46540d41b8e928b5ca60
-Author: Balázs Meskó <meskobalazs@fedoraproject.org>
-Date:	Sun Sep 10 12:55:01 2017 +0000
+M	src/camera/CameraTable.vala
+M	src/sidebar/Tree.vala
 
-    Update Hungarian translation
+commit 62be9ebf6d2460facddd07532844d678ee7b5d53
+Author: Stefan Willinger <stefan.home@aon.at>
+Date:	Sun Aug 20 23:11:09 2017 +0200
 
-M	po/hu.po
+    Rename backing photo to lower case as well
 
-commit f792157bf60a93dcf7a764bfaa664bcedd533287
-Author: Cheng-Chia Tseng <pswo10680@gmail.com>
-Date:	Thu Aug 31 04:36:39 2017 +0000
+    https://bugzilla.gnome.org/show_bug.cgi?id=777626
 
-    Update Chinese (Taiwan) translation
+M	src/LibraryFiles.vala
+M	src/photos/RawSupport.vala
 
-M	po/zh_TW.po
+commit 1e502e42373c36c11711af6e3dfde378286c0f48
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Mon Aug 21 08:49:58 2017 +0200
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 272c5c12cc904a940aeec0387e6add75014169d8
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Aug 20 14:59:50 2017 +0200
 
-commit 15cc83b25c44939571d42210cbb02a7825756b8c
+    Fix import progress when importing RAW files
+
+M	src/BatchImport.vala
+
+commit 67b4d6ed0fba2f2cc891915d1afb84e8bd17acdf
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Aug 19 10:29:30 2017 +0200
+
+    Keep RAW+JPEG association from CameraImport
+
+    CameraImportJob will copy RAW and JPEG, pass only the raws down to the
+    batch importer.
+
+    The batch importer then won't know about the associated file, and
+    extract the embedded file (or worse, make a development) of the RAW
+    file, schedule thumbnailing for that.
+
+    In the conclude step of the CameraImportJob, the files would be
+    associated, leading to the development being thrown away and run
+    another
+    thumbnailing job.
+
+M	src/BatchImport.vala
+M	src/camera/ImportPage.vala
+
+commit b19769ed9b153b3aaf1b036bb6555682370f50a4
 Author: Thomas Moschny <thomas.moschny@gmx.de>
 Date:	Sun Aug 13 09:47:00 2017 +0000
 
@@ -224,24 +1631,24 @@ Date:	Sun Aug 13 09:47:00 2017 +0000
 
 M	misc/Makefile.am
 
-commit f4f06a401a9cd13594dcae4bfd0aaeaaa4df410d
-Author: Jens Georg <mail@jensge.org>
-Date:	Sun Aug 13 09:04:54 2017 +0200
+commit 1624d8179e70a7ee1d3bd325a09edbe90bf96d5c
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:	Sun Aug 13 15:17:01 2017 +0200
 
-    Update debian
+    Updated Serbian translation
 
-M	debian/changelog
+M	po/sr.po
+M	po/sr@latin.po
 
-commit c2d999c39385c7889b191b2b3b15a6b3d334e579
-Author: Jens Georg <mail@jensge.org>
-Date:	Thu Aug 10 20:53:37 2017 +0200
+commit 8f55736280edcd5dc6fa24f86e87ed15cb660e41
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sat Aug 12 02:22:34 2017 +0200
 
-    Prepare 0.26.3
+    Update Polish translation
 
-M	NEWS
-M	configure.ac
+M	po/pl.po
 
-commit 6d4c0ff11a496b5d2a47f9269c4e154bf251d987
+commit 208bc88a17d7524905cb8bf465d9f5ba64e073bd
 Author: Jens Georg <mail@jensge.org>
 Date:	Thu Aug 10 19:18:10 2017 +0200
 
@@ -256,7 +1663,86 @@ Date:	Thu Aug 10 19:18:10 2017 +0200
 
 M	src/camera/GPhoto.vala
 
-commit 553c35470798f959ac2cc2e44cddcccb88d23fdd
+commit 1841a168747cbc3802d544b7f3652753e0407b57
+Author: Marcos Lans <marcoslansgarza@gmail.com>
+Date:	Mon Aug 7 07:52:44 2017 +0000
+
+    Update Galician translation
+
+M	po/gl.po
+
+commit 793f8e20be31b92c07ab244bc84c13458546724a
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Aug 6 19:33:23 2017 +0200
+
+    Reset menubar injection state after re-loading ui
+
+    Fixes menu items disappearing from Photos menu
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=785196
+
+M	src/Page.vala
+
+commit 79330cb40420c100d2a3f1baf0a5cb5ad4fad274
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Thu Aug 3 02:57:13 2017 +0200
+
+    help: Fix wording in string
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=785711
+
+M	help/C/import-file.page
+
+commit ad42f642c4f3dcfe6be94f8c01d341b15a0db24e
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Aug 3 10:11:33 2017 +0200
+
+    Remove deprecated "find" icon
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=785761
+
+M	src/SearchFilter.vala
+M	src/searches/SearchesBranch.vala
+
+commit ce27ab01d7a019444263341b84bba3c474ad4df6
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Jul 17 20:40:53 2017 +0200
+
+    Sort camera file list before matching
+
+    RAW + JPEG file matching uses a sliding window of two. Sometimes it
+    seems to not being able to find the matching JPEG even if it is there.
+    Sort the list to increase the chance of the files matching up.
+
+M	src/camera/ImportPage.vala
+
+commit c5925c803e8df19a52039e77c66efa679d3c63df
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Fri Aug 4 20:33:46 2017 +0000
+
+    Update German translation
+
+    (cherry picked from commit 000e9a5f5da10f87b739b35901842f0a261fd240)
+
+M	help/de/de.po
+
+commit 13f0c2ee09c0d02678d703bceaee22130a69d8fb
+Author: Balázs Meskó <meskobalazs@fedoraproject.org>
+Date:	Wed Aug 2 19:44:27 2017 +0000
+
+    Update Hungarian translation
+
+M	po/hu.po
+
+commit 64704a06dd4a91c401cc9efe3ffa871e81ee8e01
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Fri Jul 28 20:39:29 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit ca81bf374902c9a07e695d8cab97a2bfd45ea235
 Author: Brian Masney <masneyb@onstation.org>
 Date:	Wed Jul 12 19:29:12 2017 -0400
 
@@ -275,38 +1761,67 @@ Date:	Wed Jul 12 19:29:12 2017 -0400
 M	configure.ac
 M	misc/Makefile.am
 
-commit 682bd5511f128d8f09759a3883a00231b23d44c9
+commit 8bd5dab147e7f31a7ffb53f009ebf0ad568bf8d7
+Author: Kukuh Syafaat <syafaatkukuh@gmail.com>
+Date:	Mon Jul 10 11:50:15 2017 +0000
+
+    Update Indonesian translation
+
+M	po/id.po
+
+commit 8cf7a7a4743cbe2a7acfc71423acb81f7efd0f2e
 Author: Jens Georg <mail@jensge.org>
-Date:	Thu Aug 3 10:11:33 2017 +0200
+Date:	Sun Jul 9 22:19:36 2017 +0200
 
-    Remove deprecated "find" icon
+    Do not endlessly create thumbs
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=785761
+    notify_altered("image", ... will trigger thumnail re-genration and in
+    consequence other events, and it does all of this twice. Otoh, the
+    thumbnail is already generated on inport.
 
-M	src/SearchFilter.vala
-M	src/searches/Branch.vala
+M	src/BatchImport.vala
+M	src/Photo.vala
 
-commit 85d118b62b947a7f63b784faf0a9a128244e3653
+commit 2ef1bfc0f98e2b35212777e83dbac157b133472e
 Author: Jens Georg <mail@jensge.org>
-Date:	Sun Aug 6 19:33:23 2017 +0200
+Date:	Sun Jul 9 23:36:53 2017 +0200
 
-    Reset menubar injection state after re-loading ui
+    If Preview is JPEG, save as-is
 
-    Fixes menu items disappearing from Photos menu
+    Then there is no need to do a decode/encode
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=785196
+M	src/Photo.vala
+M	src/photos/JfifSupport.vala
 
-M	src/Page.vala
+commit 3a0cd2e0e508700a2fb8752e4736dd7542f7bdea
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jul 9 23:32:36 2017 +0200
 
-commit 000e9a5f5da10f87b739b35901842f0a261fd240
-Author: Mario Blättermann <mario.blaettermann@gmail.com>
-Date:	Fri Aug 4 20:33:46 2017 +0000
+    Add timing output for imports
 
-    Update German translation
+M	src/BatchImport.vala
 
-M	help/de/de.po
+commit b59db2dec66117b5b07345bb20b7c6d0d597d474
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jul 8 10:33:15 2017 +0200
+
+    Remove dead code
+
+M	src/SortedList.vala
+
+commit c2a42623d3b720c3bdfc037709f2b33e142479fd
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jul 8 09:10:26 2017 +0200
+
+    Remove obsolete external
 
-commit 8f10d5901e633262e1ddccae9d67127a251d7776
+    collate_key_for_filename() is bound since ages now
+
+M	src/SortedList.vala
+M	src/Thumbnail.vala
+M	src/folders/FoldersBranch.vala
+
+commit 10f1cb78a3c9933cf8be56d6e71b2e4ae8086c73
 Author: Jens Georg <mail@jensge.org>
 Date:	Sat Jul 8 08:09:56 2017 +0200
 
@@ -316,33 +1831,265 @@ Date:	Sat Jul 8 08:09:56 2017 +0200
 
 M	src/DesktopIntegration.vala
 
-commit ba32876ab09a524dafbea46929fd936716f29ba4
+commit 0caab9a44040a25a19b0b95e836969b8f3ada169
 Author: Jens Georg <mail@jensge.org>
-Date:	Sat Jun 3 09:20:05 2017 +0200
+Date:	Tue Jul 4 20:57:18 2017 +0200
 
-    debian: Depend on libexiv2 explicitly
+    import: Hide file selector after clicking ok
 
-M	debian/control
+M	src/library/LibraryWindow.vala
+
+commit 2a352e155ae614bbaf4d92087679ac877c72b344
+Author: Marek Černocký <marek@manet.cz>
+Date:	Sun Jun 25 23:09:38 2017 +0200
+
+    Updated Czech translation
+
+M	help/cs/cs.po
+
+commit 79fa8ab407c91f7cf20f561cd18d641bd900eb82
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:	Sun Jun 25 19:28:11 2017 +0000
+
+    Update Brazilian Portuguese translation
 
-commit a4eb756865037d74f71c7b43ffe345dc8fa915e2
+M	po/pt_BR.po
+
+commit f9c29c2fdc9ab145ade05e0f65d9fd1f9d90f4ba
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jun 25 18:27:27 2017 +0200
+
+    Fix accidential compile error in previous commit
+
+M	src/LibraryFiles.vala
+
+commit 30392070469331dd4603b307adfa2e73b16d3f4a
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jun 25 16:56:43 2017 +0200
+
+    Fix tabs
+
+M	src/LibraryFiles.vala
+
+commit 0aed7ef7bec2d9a360e0cd5cc33bf48b42be2232
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:	Sat Jun 24 17:03:18 2017 +0200
+
+    Updated Spanish translation
+
+M	po/es.po
+
+commit def5569e2a7bed1e13efb17a06ba78c8adb4e79e
 Author: Marek Černocký <marek@manet.cz>
-Date:	Sat Jun 24 10:40:53 2017 +0200
+Date:	Sat Jun 24 10:41:28 2017 +0200
 
     Updated Czech translation
 
 M	po/cs.po
 
-commit 4f0174c855ca28b2b1f51e51120333de89edf994
+commit b382a073126c661016963d724ac6770223049675
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Jun 23 23:58:12 2017 +0200
+
+    Re-use variable for toolbar decision
+
+M	src/AppWindow.vala
+
+commit 594a2a590d2387a7a384a3124dff189f3e745c4e
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Jun 23 23:54:26 2017 +0200
+
+    fullscreen: Hide toolbar if disabled in settings
+
+    If the toolbar is disabled in settings, also start with it hidden in
+    fullscreen, unless it was pinned
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=741962
+
+M	src/AppWindow.vala
+
+commit a582f5a275932ea56df3da6d6a80e9cf744fed49
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Jun 22 11:56:55 2017 +0200
+
+    meson: Add shotwell-graphics-processor binary
+
+M	src/meson.build
+
+commit 47f9273fb87d65f66002f659fca1632bf7c67ad4
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Jun 22 11:56:25 2017 +0200
+
+    meson: Only add unity as a dependency if found
+
+M	meson.build
+M	src/meson.build
+
+commit af1125c277a37f6e76887f148d424be5f37310ea
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jun 21 19:49:54 2017 +0200
+
+    meson: Fix missing libm for transitions
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=783956
+
+M	plugins/shotwell-transitions/meson.build
+
+commit 96764807a5fb67f7a0e639c0313794e8fc4bbaa0
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jun 21 19:34:53 2017 +0200
+
+    build: Fix missing files for dist tarball
+
+M	Makefile.am
+A	apport/git.mk
+
+commit 3cf63a8b0366ca5ccfdeddcbc29be89407db92b6
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jun 21 12:19:34 2017 +0200
+
+    meson: Add version to internal helper libs
+
+M	plugins/authenticator/shotwell/meson.build
+M	plugins/meson.build
+
+commit f8a64f1adea2124e8e47107899a0141749f68ff7
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Mon Jun 19 22:08:19 2017 +0200
+
+    Fixes to Catalan translation
+
+M	po/ca.po
+
+commit 685efd81061ff2428a0984e3fc0d80960ddc864f
 Author: Jens Georg <mail@jensge.org>
-Date:	Thu Jun 1 18:52:56 2017 +0200
+Date:	Mon Jun 19 18:42:33 2017 +0200
 
-    Prepare Shotwell 0.26.2
+    Prepare 0.27.0
 
 M	NEWS
-M	configure.ac
-M	debian/changelog
+M	meson.build
+
+commit 85a0872e4a2def44dd3cc5ee046680d688899369
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Jun 19 21:09:22 2017 +0200
+
+    build: Dist new ui files
+
+M	shotwell.am
+M	ui/Makefile.am
+
+commit 1f6956a247423442740e6fac1011b0512304fdaf
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Jun 19 21:09:08 2017 +0200
+
+    build: Dist graphics processor helper files
 
-commit e54216f18f6984a78c9a07f1b150a1c72cfc49a1
+M	pipeline.am
+
+commit dddab55309c29604d77fa944c1188d91c74d6881
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jun 18 21:57:07 2017 +0200
+
+    Remove "sidebar" style class from treeview
+
+    Fixes missing drop prelight
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=768938
+
+M	src/sidebar/Tree.vala
+
+commit d247268ad42de0f0e6d873f5476488a02ca6d456
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Jun 18 21:18:09 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 43c17c9eece5387d3cc5a332b2c7acdf9cc871e6
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jun 18 13:40:46 2017 +0200
+
+    import: When receiving IO_USB_CLAIM error, retry
+
+    It seems that this at least in GNOME will allow Shotwell to continue
+    to talk
+    to the camera without any scary dialog or user interaction.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716499
+
+M	src/camera/ImportPage.vala
+
+commit 7e03c54c67f4d791d2d94ec870adc436b62a6c41
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Jun 18 08:36:30 2017 +0200
+
+    Remove explicit memcopy in import
+
+M	src/camera/GPhoto.vala
+M	src/camera/ImportPage.vala
+M	src/data_imports/DataImportSource.vala
+M	src/photos/PhotoMetadata.vala
+M	src/util/misc.vala
+
+commit f87e80255d0ff273536f5f78afcd34b4665ec7c9
+Author: Emin Tufan Çetin <etcetin@gmail.com>
+Date:	Wed Jun 7 12:18:28 2017 +0000
+
+    Update Turkish translation
+
+M	po/tr.po
+
+commit 0b1ae0ea6a5552ef346878816926226458b065bf
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Mon Jun 5 21:28:54 2017 +0200
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 59ef23afa1168593c01c30895b83ab782975f2c5
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Jun 4 10:25:56 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit d3f4bd0ab9dcf3bb8c7f4d2aeac1bfba2825db98
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jun 3 10:18:01 2017 +0200
+
+    Fix search path for local gsettings schema
+
+M	misc/meson.build
+M	src/main.vala
+
+commit 3b010ca59f8930e5daec68858a521a3518028702
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jun 3 13:27:17 2017 +0200
+
+    Use old-style file copy if library is on remote fs
+
+    Especially on vboxfs backed bz NTFS we have an issue that the
+    hiddenfile/rename mechanism of GIO breaks
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=760868
+
+M	src/LibraryFiles.vala
+M	src/MediaDataRepresentation.vala
+M	src/main.vala
+
+commit d05ace2653227c7ba5b8b0804045ac5df2cfe678
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Jun 3 09:20:05 2017 +0200
+
+    debian: Depend on libexiv2 explicitly
+
+M	debian/control
+
+commit 153f78055026d4435861691d24760eb89f7051fd
 Author: Jens Georg <mail@jensge.org>
 Date:	Thu Jun 1 18:42:47 2017 +0200
 
@@ -352,7 +2099,290 @@ Date:	Thu Jun 1 18:42:47 2017 +0200
 
 M	src/data_imports/DataImportsUI.vala
 
-commit 56d69796770c5b8f29930224f851b2b445ca1863
+commit 101c88652c7a4e4d85daa65eff54c399f6048b8c
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed May 31 19:35:35 2017 +0200
+
+    build: Dist meson files in automake tarball
+
+M	Makefile.am
+
+commit d44130a4cf9de5a24719c404588829bd60ba5f57
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed May 31 19:09:12 2017 +0200
+
+    Add missing build files
+
+M	Makefile.am
+A	apport/Makefile.am
+A	apport/meson.build
+
+commit c9f414307468dd3f9706b4702646cb7ed162b06f
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue May 30 22:15:13 2017 +0200
+
+    Add option to install apport hook
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716547
+
+M	Makefile.am
+M	configure.ac
+M	meson.build
+M	meson_options.txt
+
+commit b7291a262ea5755676f8395c2e53b3bc9ca32332
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue May 30 22:13:20 2017 +0200
+
+    Remove f-spot help from meson build
+
+M	help/meson.build
+
+commit 036f831a14d74160741b7c6d8e404d0be63e8e1d
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue May 30 18:28:48 2017 +0200
+
+    Fix typo in fullscreen option
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716830
+
+M	src/main.vala
+
+commit 802c4a92c83afc3380286731b1faf8e35aeae8f4
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue May 30 18:27:22 2017 +0200
+
+    Fix automake build
+
+M	help/Makefile.am
+
+commit 0f8afb46d62765181bb2a2c6ab16ec8a55761dce
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 29 22:55:13 2017 +0200
+
+    doc: Add --fullscreen option to manpage
+
+M	help/shotwell.1
+
+commit b958b2ee0410987589392dc2ed9fa5c340ae9167
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 29 22:42:27 2017 +0200
+
+    direct: Add option to start fullscreen
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716830
+
+M	src/main.vala
+
+commit c6f5114554725e12e7c0e9c3384bdc8eb376b40d
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 29 22:19:45 2017 +0200
+
+    Remove F-Sport related things from help
+
+D	help/C/import-f-spot.page
+M	help/C/import-file.page
+M	help/C/view-sidebar.page
+
+commit 82cd4ca2cb1cd6f5e382d9073a3015f4d2287f12
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 29 22:07:42 2017 +0200
+
+    import: Add option to not recurse into subfolders
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716448
+
+M	help/C/import-file.page
+M	src/BatchImport.vala
+M	src/LibraryMonitor.vala
+M	src/library/LibraryWindow.vala
+M	src/main.vala
+
+commit 877d86b16ddc35f26ddfcfecc50728c8a8e809f5
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 29 20:02:26 2017 +0200
+
+    Fix build
+
+M	Makefile.am
+M	src/CollectionPage.vala
+
+commit 6a6bc91e40b9bfee4d5e9cba1860944123e400b6
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun May 28 17:18:54 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 62c96ed53845943e629905ecc1e91fc00705dd44
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun May 28 00:29:24 2017 +0200
+
+    Use ngettext for export dialog title
+
+M	src/CollectionPage.vala
+
+commit 65239afd1b8efecd6045e84f1c67ada0b2fb78c3
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat May 27 23:50:38 2017 +0200
+
+    build: Expose varios code options through meson config
+
+M	meson.build
+M	meson_options.txt
+
+commit 5347425b43784ba85152a642cef3db50a788e689
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri May 26 09:50:26 2017 +0200
+
+    Fix running from meson build dir
+
+M	src/AppDirs.vala
+M	src/util/system.vala
+
+commit fd478255fa3749d8e1dc236c33c4880ff19ce96b
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu May 25 15:49:34 2017 +0200
+
+    Update POTFILES.skip
+
+M	po/POTFILES.skip
+
+commit 97194a9c3dab535cd1a79f6a080fe0c7602e16ed
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu May 25 10:07:02 2017 +0200
+
+    build: meson: Add back build options
+
+A	git-hash
+M	meson.build
+A	meson_options.txt
+M	plugins/meson.build
+M	src/meson.build
+D	vapi/unity.deps
+D	vapi/unity.vapi
+
+commit e1420e580eff4f782115a48f71c474cd15e0f1ff
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu May 25 09:35:37 2017 +0200
+
+    build: Set meson buildtype to debugoptimized
+
+    Otherwise the image manipulation algorithms get really slow
+
+M	meson.build
+
+commit b77a0711c8a7a590b697bfd1e8403a966e564da0
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon May 8 19:45:39 2017 +0200
+
+    build: Add meson support
+
+A	app-icons/meson.build
+A	help/meson.build
+A	meson.build
+A	misc/meson.build
+A	plugins/authenticator/meson.build
+A	plugins/authenticator/shotwell/meson.build
+A	plugins/common/meson.build
+A	plugins/meson.build
+A	plugins/shotwell-publishing-extras/meson.build
+A	plugins/shotwell-publishing/meson.build
+A	plugins/shotwell-transitions/meson.build
+A	po/meson.build
+A	settings-migrator/meson.build
+A	src/meson.build
+A	src/plugins/meson.build
+A	thumbnailer/meson.build
+
+commit 2b5a2e7c5e58baccce32a42a6ec881af1464ebe5
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu May 25 08:34:07 2017 +0200
+
+    build: Remove unnecessary desktop file processing
+
+M	misc/Makefile.am
+R100	misc/shotwell-viewer.desktop.in.in
+misc/shotwell-viewer.desktop.in
+R100	misc/shotwell.desktop.in.in	misc/shotwell.desktop.in
+M	po/POTFILES.in
+
+commit f2bf2893256cf88f0b8f44b917c59ed85038f4f3
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed May 24 08:00:24 2017 +0200
+
+    build: Prepare for meson
+
+M	po/POTFILES.in
+M	shotwell.am
+R100	src/camera/Branch.vala	src/camera/CameraBranch.vala
+R100	src/events/Branch.vala	src/events/EventsBranch.vala
+R100	src/folders/Branch.vala src/folders/FoldersBranch.vala
+R100	src/folders/Page.vala	src/folders/FoldersPage.vala
+R100	src/library/Branch.vala src/library/LibraryBranch.vala
+R100	src/searches/Branch.vala	src/searches/SearchesBranch.vala
+R100	src/tags/Branch.vala	src/tags/TagsBranch.vala
+
+commit e6ffdef23a0a93d2e658366b4902e0e864b60967
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu May 18 22:25:15 2017 +0200
+
+    gphoto: Don't copy buffer when creating input stream from CameraFile
+
+M	src/camera/GPhoto.vala
+
+commit 30bc836cdaf9416bde793643d3d5c549aa638a35
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu May 18 19:48:20 2017 +0200
+
+    metadata: Save one memcpy when generating the md5s
+
+M	src/BatchImport.vala
+M	src/camera/ImportPage.vala
+M	src/photos/GdkSupport.vala
+M	src/photos/PhotoMetadata.vala
+M	src/photos/RawSupport.vala
+
+commit 60331744c4c9a5afd7f71ac1f13a57c4d3f18e73
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Sun May 14 19:23:32 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit 2916157ce111bc0b7485b83fdd3cf36b0fc748f3
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun May 14 15:20:07 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 7e3a8ca1edc829b1247557964cb2f3b01eb4fea7
+Author: Jeremy Bicha <jbicha@ubuntu.com>
+Date:	Thu Apr 20 21:35:08 2017 -0400
+
+    Capitalize From and With consistently
+
+    https://developer.gnome.org/hig/stable/writing-style.html#capitalization
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=781567
+
+M	ui/collection.ui
+M	ui/event.ui
+M	ui/events_directory.ui
+M	ui/import.ui
+M	ui/import_queue.ui
+M	ui/media.ui
+M	ui/offline.ui
+M	ui/photo.ui
+M	ui/photo_context.ui
+M	ui/tags.ui
+M	ui/trash.ui
+
+commit e00379b5545254bc197a9d42946d1dd9ddfc54f7
 Author: Jens Georg <mail@jensge.org>
 Date:	Mon May 1 18:29:34 2017 +0200
 
@@ -366,117 +2396,460 @@ Date:	Mon May 1 18:29:34 2017 +0200
 
 M	src/photos/PhotoMetadata.vala
 
-commit d822571fd8529d931c5740b402c18e9ce2962b42
-Author: Jens Georg <mail@jensge.org>
-Date:	Sun Apr 2 19:52:30 2017 +0200
+commit bcb05381f57e3b452800aab18bc65ed49105750b
+Author: Claude Paroz <claude@2xlibre.net>
+Date:	Thu May 4 22:09:26 2017 +0200
 
-    Fix browsing on gvfs filesystems
+    Updated French translation
 
-    Signed-off-by: Jens Georg <mail@jensge.org>
+    Kindly reviewed by Julien Hardelin.
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=733652
+M	po/fr.po
 
-M	src/DirectoryMonitor.vala
+commit b8056c5d25b904ac6397580ff5a9bbc86b30a464
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Mon May 1 20:34:05 2017 +0200
+
+    Update POTFILES.in and POTFILES.skip
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit 6c78096023dcf16771fcb2261fcdea60b357a1b6
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Mon May 1 19:40:02 2017 +0200
 
-commit c01a8b79df0f10b5d206b70d508c322c830962ac
+    Fixes to Catalan translation
+
+M	po/ca.po
+
+commit 5b7a8754849ca8cd366508ed724f9b8e407e2fe7
 Author: Jens Georg <mail@jensge.org>
-Date:	Fri Mar 24 19:47:52 2017 +0100
+Date:	Mon May 1 16:51:16 2017 +0200
 
-    Disable minimize button on Unity
+    Revert accidental dependency change
 
-    Signed-off-by: Jens Georg <mail@jensge.org>
+M	configure.ac
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=719240
+commit 830f041bbec1d45844917bba65243826f33a46d6
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 22 23:59:58 2017 +0200
 
-M	src/publishing/PublishingUI.vala
+    Move Tumblr connector to standard publishing plugins
 
-commit 5674371e83b382bf1db5b5df246068b5a6e076b2
-Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
-Date:	Fri May 5 07:00:25 2017 +0200
+    https://bugzilla.gnome.org/show_bug.cgi?id=719020
 
-    Updated Serbian translation
+M
+plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
+M	plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+R097	plugins/shotwell-publishing-extras/TumblrPublishing.vala
+plugins/shotwell-publishing/TumblrPublishing.vala
+M
+plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+M	plugins/shotwell-publishing/shotwell-publishing.vala
+R100	plugins/shotwell-publishing-extras/tumblr.png
+plugins/shotwell-publishing/tumblr.png
+R100	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+plugins/shotwell-publishing/tumblr_authentication_pane.ui
+R100
+plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
+M	publish-extra.am
+M	publish.am
 
-M	po/sr.po
-M	po/sr@latin.po
+commit 9db1e4db604a2e5791806d5c125a80779dbfa1ad
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 22 09:30:54 2017 +0200
 
-commit 8bb3e2be9bac5519aa183beeca70c3a796b5c821
-Author: Rafael Fontenelle <rafaelff@gnome.org>
-Date:	Sun Apr 30 21:44:51 2017 +0000
+    Fix header bar for preferences dialog
+
+M	src/Dialogs.vala
+
+commit 0c99adc7513bf07536ab2bf75dba2cab60217d9c
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:	Sun Apr 30 19:13:37 2017 +0000
 
     Update Brazilian Portuguese translation
 
 M	po/pt_BR.po
 
-commit 0c23fdd826e9330c254b2b5293c1458980e3a91d
+commit 4c6cb058290bdd399a95b0b8c0b7db9d14ac293c
+Author: Andika Triwidada <atriwidada@gnome.org>
+Date:	Sun Apr 30 10:10:59 2017 +0000
+
+    Update Indonesian translation
+
+M	po/id.po
+
+commit 683e2285ee73b71e96b3d652d889c593682de6ca
 Author: Andika Triwidada <atriwidada@gnome.org>
 Date:	Sun Apr 30 10:04:31 2017 +0000
 
     Update Indonesian translation
 
+    (cherry picked from commit 0c23fdd826e9330c254b2b5293c1458980e3a91d)
+
 M	po/id.po
 
-commit 85d55e4b6b68aa02dff4da7f0a3081f9c82687a4
+commit c5d7f1931c8b464398dc1d8b2144ad095dfeeba8
 Author: Andika Triwidada <atriwidada@gnome.org>
 Date:	Sat Apr 29 10:59:45 2017 +0000
 
     Update Indonesian translation
 
+    (cherry picked from commit 85d55e4b6b68aa02dff4da7f0a3081f9c82687a4)
+
 M	po/id.po
 
-commit ce5e8576276481f15b015017283afa8d0f119646
+commit 752823691ef7d5c9154c596e5d55cda2789af63b
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Fri Apr 28 19:35:41 2017 +0200
+
+    Fix to Catalan translation
+
+M	po/ca.po
+
+commit 32c49a8397078538924fbe8141b4c5f4b421c630
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Apr 27 17:43:56 2017 +0200
+
+    Update po/Makevars
+
+M	po/Makevars
+
+commit 8d412ad1f727085af39d979834398ca610837933
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Wed Apr 26 20:22:53 2017 +0200
+
+    Update Catalan translation
+
+M	po/ca.po
+
+commit 09c7bb554e81e131ab8fd6f06eec73472f711ff9
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Apr 23 20:25:18 2017 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit a001b96928f2c789a93766ada3a24d85b21f0a14
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 22 08:47:13 2017 +0200
+
+    Paint transparent background on thumbnails
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716708
+
+M	src/CheckerboardLayout.vala
+
+commit f02f5c4560310ad96ca277101a5150c4445bd4e8
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 22 00:56:01 2017 +0200
+
+    Add transparancy settings to preferences
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716708
+
+M	src/Dialogs.vala
+M	ui/preferences_dialog.ui
+
+commit e3f1b4360a2085559b4479f02068ce95aed1fe6c
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Apr 21 23:42:31 2017 +0200
+
+    Add signals for transparent color change
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716708
+
+M	src/Page.vala
+M	src/config/Config.vala
+M	src/config/ConfigurationInterfaces.vala
+M	src/util/image.vala
+
+commit 6e9ea5fc8e72faf857e48866cddcf128c9f1bbad
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Apr 21 22:51:52 2017 +0200
+
+    Add gsettings for transparency background
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716708
+
+M	misc/org.yorba.shotwell.gschema.xml
+M	src/config/ConfigurationInterfaces.vala
+M	src/config/GSettingsEngine.vala
+M	src/util/image.vala
+
+commit 6d1786b36a93298a35e19d6dd3ec95569de9bd2a
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Apr 20 21:44:50 2017 +0200
+
+    Paint image background for transparent images
+
+    Fixes issue with images that have black foreground and transparent
+    background
+    by painting stippled background pattern.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=716708
+
+M	configure.ac
+M	src/Page.vala
+M	src/editing_tools/EditingTools.vala
+M	src/editing_tools/StraightenTool.vala
+M	src/util/image.vala
+
+commit 0697b78bc32c409d49916d139e2cbb76e51da86f
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 22 08:47:43 2017 +0200
+
+    Remove deprecated functions
+
+    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/events/EventPage.vala
+M	src/events/EventsDirectoryPage.vala
+M	src/library/TrashPage.vala
+
+commit 171416306165013e664d66c141e1f8551ac4935b
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Apr 17 08:40:16 2017 +0200
+
+    Fix warning messages on compile
+
+    "You should give exactly one file name"
+
+    Caused by shotwell.am passing too many and the authenticator
+    passing not
+    enough
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	authenticator.am
+M	shotwell.am
+
+commit b138c780f4f9412685e455d678516f5e5f292d43
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Apr 17 08:04:42 2017 +0200
+
+    Use nice 19 for video thumbnailer
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	thumbnailer.am
+M	thumbnailer/shotwell-video-thumbnailer.vala
+
+commit 6fb50b78c45c1a48f048b2f8ebf708672376c4ad
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Apr 17 08:03:48 2017 +0200
+
+    Update vaapi blacklisting
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/VideoSupport.vala
+M	thumbnailer/shotwell-video-thumbnailer.vala
+
+commit d03303ec059f086efb7773a04e0ada773dca0334
 Author: Daniel Mustieles <daniel.mustieles@gmail.com>
 Date:	Tue Apr 18 10:17:32 2017 +0000
 
     Update Spanish translation
 
+    (cherry picked from commit ce5e8576276481f15b015017283afa8d0f119646)
+
 M	po/es.po
 
-commit 0860f8657c1bf69c04fc37bac0901faf57022ce6
+commit 37b02518d069239535d8eb0a58b96aa1a189bfd0
 Author: Dušan Kazik <prescott66@gmail.com>
 Date:	Sat Apr 15 17:29:54 2017 +0000
 
     Update Slovak translation
 
+    (cherry picked from commit 0860f8657c1bf69c04fc37bac0901faf57022ce6)
+
 M	po/sk.po
 
-commit 23f098ffa0b6fb7586829ff171c57dfa74f2d7f6
+commit 91c097b16559417bc3fccbb680bfab1fdec41e9c
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Wed Apr 12 10:24:05 2017 +0000
+
+    Update Swedish translation
+
+M	help/sv/sv.po
+
+commit f286c01022f4180122eff7c64df366d7302137fb
 Author: Jens Georg <mail@jensge.org>
-Date:	Tue Apr 11 22:34:52 2017 +0200
+Date:	Mon Apr 10 20:37:16 2017 +0200
 
-    Prepare 0.26.1
+    Remove deprecated function in histogram
 
     Signed-off-by: Jens Georg <mail@jensge.org>
 
-M	NEWS
-M	configure.ac
+M	src/editing_tools/RGBHistogramManipulator.vala
 
-commit 69b52b5c0bfe8f3d43bb7edc1178aa06460ddaac
+commit 9bd9ed556fc948592f60302d22a669ad60bb4905
 Author: Jens Georg <mail@jensge.org>
-Date:	Sun Apr 2 20:28:48 2017 +0200
+Date:	Mon Apr 10 20:36:39 2017 +0200
 
-    Fix direct ui context menu
+    Remove histogram frame
 
     Signed-off-by: Jens Georg <mail@jensge.org>
 
-M	ui/direct_context.ui
+M	src/editing_tools/RGBHistogramManipulator.vala
 
-commit 02aecfc6de87917febc9a1202f98c2e3730f1f2e
-Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
-Date:	Wed Apr 5 14:13:33 2017 +0000
+commit 312e837b1ced28f7157f47c893b1a756a4d60f51
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Apr 10 20:09:26 2017 +0200
 
-    Update Swedish translation
+    Use Cairo to draw histogram overlays
 
-M	po/sv.po
+    Signed-off-by: Jens Georg <mail@jensge.org>
 
-commit 9e3e06e17f314e289fb13e155be61546edbf5a2c
-Author: Mario Blättermann <mario.blaettermann@gmail.com>
-Date:	Tue Apr 4 11:56:58 2017 +0000
+M	src/editing_tools/RGBHistogramManipulator.vala
 
-    Update German translation
+commit 0eee31c74bbe387238c90a9168b4c6556418eed0
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Apr 10 18:51:36 2017 +0200
 
-M	po/de.po
+    Remove non-functional slider
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/RGBHistogramManipulator.vala
+
+commit 79d4477f2b1c556f0655f0022ba9e895936d5723
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Apr 9 22:44:34 2017 +0200
+
+    Extract preferences ui
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	org.gnome.Shotwell.gresource.xml
+M	po/POTFILES.in
+M	src/Dialogs.vala
+M	src/library/LibraryWindow.vala
+C064	ui/shotwell.ui	ui/preferences_dialog.ui
+M	ui/shotwell.ui
+
+commit 5df63e07261b44e6fc1b5d046e16af0c451a0c0b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Apr 9 22:15:00 2017 +0200
+
+    docs: Link mentioned manpage directly
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	help/C/other-files.page
+
+commit 3c4c0b80836407e5d247d1970ebbfd2b1a76c671
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Apr 7 19:57:10 2017 +0200
+
+    Make slideshow settings templated
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
 
-commit 551f7a40c46793b5604fc8e1b637098479136715
+M	org.gnome.Shotwell.gresource.xml
+M	po/POTFILES.in
+M	src/SlideshowPage.vala
+M	src/config/Config.vala
+M	ui/shotwell.ui
+A	ui/slideshow_settings.ui
+
+commit 9bf27fc5ab7c0172cb28175cbc12f5fd7d3c6268
+Author: gogo <trebelnik2@gmail.com>
+Date:	Sun Apr 9 22:24:58 2017 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit a3a1ae47e93a79b3bd768907eeb856a167a6378b
+Author: gogo <trebelnik2@gmail.com>
+Date:	Sun Apr 9 22:23:13 2017 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit 26a529f3df179fc0c92136b7c71bb44f61edd2db
+Author: gogo <trebelnik2@gmail.com>
+Date:	Sun Apr 9 22:17:10 2017 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit 3ec3b858eef79a06becc1df649bab881a41addb1
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Apr 7 16:09:18 2017 +0200
+
+    Remove custom complicated drag nub
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	icons/Makefile.am
+D	icons/drag_nub.png
+M	org.gnome.Shotwell.gresource.xml
+M	shotwell.am
+R062	src/CustomComponents.vala
+src/editing_tools/RGBHistogramManipulator.vala
+
+commit f6b5b243029e581b8f30d210f1ef58b3a410f364
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Apr 6 22:28:59 2017 +0200
+
+    Remove deprecated theme adaption
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/CustomComponents.vala
+
+commit d7743656fcfe515cf201f38a5e3fc6e115ae2456
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Apr 4 21:23:29 2017 +0200
+
+    Bump Gtk+ requirements to 3.18
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=774650
+
+M	configure.ac
+M	ui/collection.ui
+M	ui/direct_context.ui
+M	ui/printing_widget.ui
+M	ui/set_background_dialog.ui
+M	ui/set_background_slideshow_dialog.ui
+M	ui/shotwell.ui
+
+commit 1a290847c83ee2900544fd9e9dc2717c894be77b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Apr 2 20:28:48 2017 +0200
+
+    Fix direct ui context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/direct_context.ui
+
+commit 21b38c07291a01984fe96d922a073d7156abef85
 Author: Piotr Drąg <piotrdrag@gmail.com>
 Date:	Mon Apr 3 10:26:01 2017 +0200
 
@@ -484,7 +2857,19 @@ Date:	Mon Apr 3 10:26:01 2017 +0200
 
 M	po/pl.po
 
-commit 7d47e96468da449fecd44da59f138a3490849c2f
+commit 218edbb1dbb230996ebbf8a3ea8f21125e6c14dd
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Apr 2 19:52:30 2017 +0200
+
+    Fix browsing on gvfs filesystems
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=733652
+
+M	src/DirectoryMonitor.vala
+
+commit c7c30e248284f9acb358883d9b8cdd42c3a61233
 Author: Jens Georg <mail@jensge.org>
 Date:	Sun Apr 2 18:25:58 2017 +0200
 
@@ -501,35 +2886,39 @@ M	ui/photo.ui
 M	ui/photo_context.ui
 M	ui/tags.ui
 
-commit ee05c98b0b6402de86bbcf6342dbf37fb4851034
+commit f8ee4c16b894e54af8e8b08d7b124442f7e1cb71
 Author: Jens Georg <mail@jensge.org>
-Date:	Wed Mar 22 22:43:21 2017 +0100
+Date:	Sun Mar 26 18:50:22 2017 +0200
 
-    Use unicode strings in About and make it translatable
+    Do not use functions to convert RGB values
 
-    Signed-off-by: Jens Georg <mail@jensge.org>
+M	src/ColorTransformation.vala
 
-    https://bugzilla.gnome.org/show_bug.cgi?id=780415
+commit 95a3411c234cb234baf6214635eb2c58065aa44b
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Mon Mar 27 22:38:33 2017 +0200
 
-M	src/AppWindow.vala
+    Update Polish translation
+
+M	po/pl.po
 
-commit ae71641518eccd460346ac61823450c25f58e759
+commit b69329a1d90ecc1f6262a05bc1dbd8b6d5b89852
 Author: Rafael Fontenelle <rafaelff@gnome.org>
-Date:	Sat Apr 1 19:38:52 2017 +0000
+Date:	Sun Mar 26 21:34:10 2017 +0000
 
     Update Brazilian Portuguese translation
 
 M	po/pt_BR.po
 
-commit d0981de810939217bccd1d7aea9737ffa95e910f
-Author: Piotr Drąg <piotrdrag@gmail.com>
-Date:	Mon Mar 27 22:38:33 2017 +0200
+commit ba85d38da7caff4f9ae1a701cace4194716b80b7
+Author: Alan Mortensen <alanmortensen.am@gmail.com>
+Date:	Sat Mar 25 22:51:23 2017 +0100
 
-    Update Polish translation
+    Updated Danish translation
 
-M	po/pl.po
+M	po/da.po
 
-commit 5f7dd48dba4e13871df58ac343f46ee63e84616f
+commit e2bc1744ee2fe43ac85f9dce688666de3cde1a17
 Author: Piotr Drąg <piotrdrag@gmail.com>
 Date:	Sat Mar 25 22:24:24 2017 +0100
 
@@ -537,6 +2926,185 @@ Date:	Sat Mar 25 22:24:24 2017 +0100
 
 M	po/pl.po
 
+commit 1d6f2c52db76072472f349e6796c2ad801d2acb0
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 22:53:11 2017 +0100
+
+    RGB value lookup
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/ColorTransformation.vala
+
+commit 6d7373884ba3a055449549c3b6958e60d4fbea13
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 22:00:10 2017 +0100
+
+    Compose HSV transformations
+
+    This is possible because all work on the light value only an use
+    remapping
+    tables, so we can just remap the tables from one operation into
+    the other
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/ColorTransformation.vala
+
+commit a050c2b72f51a14db508611dcd980f1a0543b773
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 21:59:38 2017 +0100
+
+    Disable cast checks for ColorTransformation
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	pipeline.am
+
+commit 2f562c8f843236370918ee52e99b6ff7f7191696
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 20:43:39 2017 +0100
+
+    transformer: Make it possible to set output format
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/graphics-processor.vala
+
+commit cc0c75f9dfb6df75576d45f67b8ad7624e630899
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 20:36:20 2017 +0100
+
+    transformer: Add possibility to define options on commandline
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/graphics-processor.vala
+
+commit ca90c9242b7702f50c81a0f4dfd67ef90fe772c6
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 20:24:22 2017 +0100
+
+    transformer: Implement auto-enhance
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/graphics-processor.vala
+
+commit 0b2e029eaee954b1ea9838920389ef99b643ea1f
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 20:24:05 2017 +0100
+
+    transformer: Check input parameters
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/graphics-processor.vala
+
+commit b28e4aec37478dcd48ce6c1768039ffe9dcee0f8
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 15 21:24:44 2017 +0100
+
+    Disable asserts in color processing
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	pipeline.am
+
+commit a902a3031284c4ee6ff05990ba878cfd92432fe1
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 14 23:43:22 2017 +0100
+
+    Do not use abstract functions to lookup constants
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=742563
+
+M	src/ColorTransformation.vala
+
+commit 0621137d56b664ac23438c2114bb6d20a3cbe3b7
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 14 23:09:53 2017 +0100
+
+    Create commandline utility to apply transformations
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	Makefile.am
+A	pipeline.am
+M	shotwell.am
+M	src/ColorTransformation.vala
+A	src/graphics-processor.vala
+
+commit a94a5c66a1d00f669076aed4212c606d9848322a
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Mar 24 19:47:52 2017 +0100
+
+    Disable minimize button on Unity
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=719240
+
+M	src/publishing/PublishingUI.vala
+
+commit 9dda9980371d47b8386a44bf9924b55f480487a7
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 22 22:37:20 2017 +0100
+
+    Remove codename
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+
+commit 0cef3922b53c20291cbdb77d9a0054c6711c168e
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 22 00:03:01 2017 +0100
+
+    Post-release version bump
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 93eee7fe1f92acf08ad9220ef377a14eaeee65a6
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 21 23:48:57 2017 +0100
+
+    Remove F-Spot support
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=773267
+    https://bugzilla.gnome.org/show_bug.cgi?id=716599
+    https://bugzilla.gnome.org/show_bug.cgi?id=717767
+    https://bugzilla.gnome.org/show_bug.cgi?id=718809
+    https://bugzilla.gnome.org/show_bug.cgi?id=718846
+    https://bugzilla.gnome.org/show_bug.cgi?id=719031
+    https://bugzilla.gnome.org/show_bug.cgi?id=752008
+
+M	Makefile.am
+D	import.am
+D	plugins/shotwell-data-imports/FSpotDatabase.vala
+D	plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
+D	plugins/shotwell-data-imports/FSpotDatabaseTable.vala
+D	plugins/shotwell-data-imports/FSpotImporter.vala
+D	plugins/shotwell-data-imports/FSpotMetaTable.vala
+D	plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
+D	plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
+D	plugins/shotwell-data-imports/FSpotPhotosTable.vala
+D	plugins/shotwell-data-imports/FSpotRollsTable.vala
+D	plugins/shotwell-data-imports/FSpotTableBehavior.vala
+D	plugins/shotwell-data-imports/FSpotTagsTable.vala
+D	plugins/shotwell-data-imports/SqliteSupport.vala
+D	plugins/shotwell-data-imports/VersionNumber.vala
+D	plugins/shotwell-data-imports/f-spot-24.png
+D
+plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
+D	plugins/shotwell-data-imports/shotwell-data-imports.vala
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
 commit b83a820fc0a3f85f22484f3275adf086ad8e2ca3
 Author: Jens Georg <mail@jensge.org>
 Date:	Mon Mar 20 13:41:40 2017 +0100
diff --git a/Makefile.am b/Makefile.am
index 93b929b..720cf2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 SUBDIRS = misc help po app-icons icons ui
 
-EXTRA_DIST = AUTHORS
+if INSTALL_APPORT_HOOK
+SUBDIRS += apport
+endif
+
+EXTRA_DIST = AUTHORS git-hash
 
 AUTHORS:
 	$(AM_V_GEN)if test -d "$(srcdir)/.git"; \
@@ -27,6 +31,7 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
 
 GITIGNOREFILES = \
+	build \
 	ABOUT-NLS \
 	plugins/**/*.h \
 	plugins/**/*.vapi \
@@ -53,6 +58,7 @@ lib_LTLIBRARIES = \
 
 plugins_common_libshotwell_plugin_common_la_SOURCES = \
 	plugins/common/RESTSupport.vala \
+	plugins/common/OAuth1Support.vala \
 	plugins/common/Resources.vala \
 	plugins/common/WebAuthenticationPane.vala \
 	plugins/common/BuilderPane.vala \
@@ -128,6 +134,7 @@ dist_noinst_DATA = $(NULL)
 MOSTLYCLEANFILES = $(NULL)
 
 include $(top_srcdir)/common.am
+include $(top_srcdir)/pipeline.am
 include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
 
@@ -142,7 +149,6 @@ include $(top_srcdir)/publish-extra.am
 endif
 
 include $(top_srcdir)/transition.am
-include $(top_srcdir)/import.am
 
 dist_noinst_SCRIPTS = \
 	autogen.sh
@@ -154,6 +160,41 @@ dist_noinst_DATA += \
 	vapi/libexif.vapi \
 	vapi/libgphoto2.vapi \
 	vapi/libraw.vapi \
-	vapi/unity.deps \
-	vapi/unity.vapi \
-	vapi/misc.vapi
+	vapi/misc.vapi \
+	app-icons/meson.build \
+	thumbnailer/meson.build \
+	meson.build \
+	po/meson.build \
+	apport/meson.build \
+	help/meson.build \
+	settings-migrator/meson.build \
+	misc/meson.build \
+	src/meson.build \
+	src/plugins/meson.build \
+	plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/authenticator/meson.build \
+	plugins/common/meson.build \
+	plugins/shotwell-transitions/meson.build \
+	meson_options.txt \
+	app-icons/meson.build \
+	apport/meson.build \
+	help/meson.build \
+	meson.build \
+	meson_options.txt \
+	misc/meson.build \
+	plugins/authenticator/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/common/meson.build \
+	plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/shotwell-transitions/meson.build \
+	po/meson.build \
+	settings-migrator/meson.build \
+	src/meson.build \
+	src/plugins/meson.build \
+	thumbnailer/meson.build \
+	apport/shotwell.py
diff --git a/Makefile.in b/Makefile.in
index 5aea40f..3f0f4e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,31 +91,32 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@INSTALL_APPORT_HOOK_TRUE@am__append_1 = apport
 pkglibexec_PROGRAMS = thumbnailer/shotwell-video-thumbnailer$(EXEEXT)
-@IS_GITVERSION_TRUE@am__append_1 = -D_GIT_VERSION='"@GITVER@"'
-@IS_GITVERSION_TRUE@am__append_2 = --define=_GITVERSION
+@IS_GITVERSION_TRUE@am__append_2 = -D_GIT_VERSION='"@GITVER@"'
+@IS_GITVERSION_TRUE@am__append_3 = --define=_GITVERSION
+noinst_PROGRAMS = src/shotwell-graphics-processor$(EXEEXT)
 bin_PROGRAMS = shotwell$(EXEEXT)
-@AUTHENTICATOR_SHOTWELL_TRUE@am__append_3 = \
+@AUTHENTICATOR_SHOTWELL_TRUE@am__append_4 = \
 @AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala \
 @AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala \
 @AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala \
-@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/GoogleAuthenticator.vala \
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/OAuth1Authenticator.vala \
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/TumblrAuthenticator.vala
 
-@HAVE_EXTRA_PLUGINS_TRUE@am__append_4 = plugins/shotwell-publishing-extras/shotwell-publishing-extras.la
-@HAVE_EXTRA_PLUGINS_TRUE@am__append_5 = \
+@HAVE_EXTRA_PLUGINS_TRUE@am__append_5 = plugins/shotwell-publishing-extras/shotwell-publishing-extras.la
+@HAVE_EXTRA_PLUGINS_TRUE@am__append_6 = \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/gallery3.png \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/rajce.png \
-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/tumblr.png \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
 
-@HAVE_EXTRA_PLUGINS_TRUE@am__append_6 = plugins/shotwell-publishing-extras/resource.c
+@HAVE_EXTRA_PLUGINS_TRUE@am__append_7 = plugins/shotwell-publishing-extras/resource.c
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
@@ -185,12 +186,16 @@ am__plugins_authenticator_libshotwell_authenticator_la_SOURCES_DIST =  \
 	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala \
 	plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala \
 	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala \
-	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+	plugins/authenticator/shotwell/GoogleAuthenticator.vala \
+	plugins/authenticator/shotwell/OAuth1Authenticator.vala \
+	plugins/authenticator/shotwell/TumblrAuthenticator.vala
 am__dirstamp = $(am__leading_dot)dirstamp
 @AUTHENTICATOR_SHOTWELL_TRUE@am__objects_1 = plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.lo \
 @AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.lo \
 @AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.lo \
-@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo \
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo \
+@AUTHENTICATOR_SHOTWELL_TRUE@	plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo
 am_plugins_authenticator_libshotwell_authenticator_la_OBJECTS =  \
 	$(am__objects_1)
 nodist_plugins_authenticator_libshotwell_authenticator_la_OBJECTS = plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo
@@ -208,6 +213,7 @@ plugins_authenticator_libshotwell_authenticator_la_LINK = $(LIBTOOL) \
 plugins_common_libshotwell_plugin_common_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
 am_plugins_common_libshotwell_plugin_common_la_OBJECTS = plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo \
+	plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo
@@ -218,33 +224,6 @@ plugins_common_libshotwell_plugin_common_la_LINK = $(LIBTOOL) \
 	--mode=link $(CCLD) \
 	$(plugins_common_libshotwell_plugin_common_la_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-plugins_shotwell_data_imports_shotwell_data_imports_la_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
-am_plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS = plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo \
-	plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo
-nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS = plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo
-plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS = $(am_plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS) \
-	$(nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS)
-plugins_shotwell_data_imports_shotwell_data_imports_la_LINK =  \
-	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) \
-	$(CFLAGS) \
-	$(plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
 @HAVE_EXTRA_PLUGINS_TRUE@plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES =  \
 @HAVE_EXTRA_PLUGINS_TRUE@	$(am__DEPENDENCIES_1) \
 @HAVE_EXTRA_PLUGINS_TRUE@	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
@@ -252,13 +231,11 @@ am__plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES_DIS
 	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
 @HAVE_EXTRA_PLUGINS_TRUE@am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.lo \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo \
-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo
 @HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo
 plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = $(am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) \
@@ -280,6 +257,7 @@ am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo \
+	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo
 nodist_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-resource.lo
@@ -316,6 +294,17 @@ plugins_shotwell_transitions_shotwell_transitions_la_LINK =  \
 	$(CFLAGS) \
 	$(plugins_shotwell_transitions_shotwell_transitions_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+src_libgraphics_processor_la_LIBADD =
+am_src_libgraphics_processor_la_OBJECTS =  \
+	src/src_libgraphics_processor_la-ColorTransformation.lo \
+	src/util/src_libgraphics_processor_la-KeyValueMap.lo \
+	src/src_libgraphics_processor_la-_transformation.lo
+src_libgraphics_processor_la_OBJECTS =  \
+	$(am_src_libgraphics_processor_la_OBJECTS)
+src_libgraphics_processor_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 src_plugins_libplugin_la_LIBADD =
 am_src_plugins_libplugin_la_OBJECTS =  \
 	src/plugins/src_plugins_libplugin_la-SpitInterfaces.lo \
@@ -328,7 +317,7 @@ src_plugins_libplugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(src_plugins_libplugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
 am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/util/shotwell-Util.$(OBJEXT) \
 	src/util/shotwell-file.$(OBJEXT) \
@@ -336,7 +325,6 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/util/shotwell-misc.$(OBJEXT) \
 	src/util/shotwell-string.$(OBJEXT) \
 	src/util/shotwell-system.$(OBJEXT) \
-	src/util/shotwell-KeyValueMap.$(OBJEXT) \
 	src/util/shotwell-ui.$(OBJEXT) \
 	src/threads/shotwell-Threads.$(OBJEXT) \
 	src/threads/shotwell-Workers.$(OBJEXT) \
@@ -351,7 +339,18 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/db/shotwell-VideoTable.$(OBJEXT) \
 	src/db/shotwell-VersionTable.$(OBJEXT) \
 	src/db/shotwell-SavedSearchDBTable.$(OBJEXT) \
+	src/dialogs/shotwell-Preferences.$(OBJEXT) \
+	src/dialogs/shotwell-EntryMultiCompletion.$(OBJEXT) \
+	src/dialogs/shotwell-ExportDialog.$(OBJEXT) \
+	src/dialogs/shotwell-TextEntry.$(OBJEXT) \
+	src/dialogs/shotwell-WelcomeDialog.$(OBJEXT) \
+	src/dialogs/shotwell-MultiTextEntryDialog.$(OBJEXT) \
+	src/dialogs/shotwell-AdjustDateTimeDialog.$(OBJEXT) \
+	src/dialogs/shotwell-SetBackground.$(OBJEXT) \
+	src/dialogs/shotwell-ProgressDialog.$(OBJEXT) \
+	src/dialogs/shotwell-SetBackgroundSlideshow.$(OBJEXT) \
 	src/editing_tools/shotwell-EditingTools.$(OBJEXT) \
+	src/editing_tools/shotwell-RGBHistogramManipulator.$(OBJEXT) \
 	src/editing_tools/shotwell-StraightenTool.$(OBJEXT) \
 	src/slideshow/shotwell-Slideshow.$(OBJEXT) \
 	src/slideshow/shotwell-TransitionEffects.$(OBJEXT) \
@@ -376,7 +375,7 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/publishing/shotwell-APIGlue.$(OBJEXT) \
 	src/library/shotwell-Library.$(OBJEXT) \
 	src/library/shotwell-LibraryWindow.$(OBJEXT) \
-	src/library/shotwell-Branch.$(OBJEXT) \
+	src/library/shotwell-LibraryBranch.$(OBJEXT) \
 	src/library/shotwell-TrashSidebarEntry.$(OBJEXT) \
 	src/library/shotwell-OfflineSidebarEntry.$(OBJEXT) \
 	src/library/shotwell-FlaggedSidebarEntry.$(OBJEXT) \
@@ -415,22 +414,22 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/sidebar/shotwell-Tree.$(OBJEXT) \
 	src/sidebar/shotwell-common.$(OBJEXT) \
 	src/events/shotwell-Events.$(OBJEXT) \
-	src/events/shotwell-Branch.$(OBJEXT) \
+	src/events/shotwell-EventsBranch.$(OBJEXT) \
 	src/events/shotwell-EventsDirectoryPage.$(OBJEXT) \
 	src/events/shotwell-EventPage.$(OBJEXT) \
 	src/events/shotwell-EventDirectoryItem.$(OBJEXT) \
 	src/tags/shotwell-Tags.$(OBJEXT) \
-	src/tags/shotwell-Branch.$(OBJEXT) \
+	src/tags/shotwell-TagsBranch.$(OBJEXT) \
 	src/tags/shotwell-TagPage.$(OBJEXT) \
 	src/tags/shotwell-HierarchicalTagIndex.$(OBJEXT) \
 	src/tags/shotwell-HierarchicalTagUtilities.$(OBJEXT) \
 	src/camera/shotwell-Camera.$(OBJEXT) \
-	src/camera/shotwell-Branch.$(OBJEXT) \
+	src/camera/shotwell-CameraBranch.$(OBJEXT) \
 	src/camera/shotwell-CameraTable.$(OBJEXT) \
 	src/camera/shotwell-GPhoto.$(OBJEXT) \
 	src/camera/shotwell-ImportPage.$(OBJEXT) \
 	src/searches/shotwell-Searches.$(OBJEXT) \
-	src/searches/shotwell-Branch.$(OBJEXT) \
+	src/searches/shotwell-SearchesBranch.$(OBJEXT) \
 	src/searches/shotwell-SearchBoolean.$(OBJEXT) \
 	src/searches/shotwell-SavedSearchPage.$(OBJEXT) \
 	src/searches/shotwell-SavedSearchDialog.$(OBJEXT) \
@@ -443,8 +442,8 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/data_imports/shotwell-DataImportJob.$(OBJEXT) \
 	src/data_imports/shotwell-DataImportSource.$(OBJEXT) \
 	src/folders/shotwell-Folders.$(OBJEXT) \
-	src/folders/shotwell-Branch.$(OBJEXT) \
-	src/folders/shotwell-Page.$(OBJEXT) \
+	src/folders/shotwell-FoldersBranch.$(OBJEXT) \
+	src/folders/shotwell-FoldersPage.$(OBJEXT) \
 	src/shotwell-main.$(OBJEXT) src/shotwell-AppWindow.$(OBJEXT) \
 	src/shotwell-CollectionPage.$(OBJEXT) \
 	src/shotwell-NaturalCollate.$(OBJEXT) \
@@ -459,10 +458,7 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/shotwell-BatchImport.$(OBJEXT) \
 	src/shotwell-Dialogs.$(OBJEXT) \
 	src/shotwell-Resources.$(OBJEXT) src/shotwell-Debug.$(OBJEXT) \
-	src/shotwell-ColorTransformation.$(OBJEXT) \
-	src/shotwell-Properties.$(OBJEXT) \
-	src/shotwell-CustomComponents.$(OBJEXT) \
-	src/shotwell-Event.$(OBJEXT) \
+	src/shotwell-Properties.$(OBJEXT) src/shotwell-Event.$(OBJEXT) \
 	src/shotwell-International.$(OBJEXT) \
 	src/shotwell-AppDirs.$(OBJEXT) \
 	src/shotwell-PixbufCache.$(OBJEXT) \
@@ -517,11 +513,21 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/.unitize/shotwell-_Direct_unitize_entry.$(OBJEXT)
 nodist_shotwell_OBJECTS = shotwell-resource.$(OBJEXT)
 shotwell_OBJECTS = $(am_shotwell_OBJECTS) $(nodist_shotwell_OBJECTS)
-shotwell_DEPENDENCIES = src/plugins/libplugin.la $(am__DEPENDENCIES_1) \
+shotwell_DEPENDENCIES = src/plugins/libplugin.la \
+	src/libgraphics-processor.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 shotwell_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(shotwell_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_src_shotwell_graphics_processor_OBJECTS = src/src_shotwell_graphics_processor-graphics-processor.$(OBJEXT)
+src_shotwell_graphics_processor_OBJECTS =  \
+	$(am_src_shotwell_graphics_processor_OBJECTS)
+src_shotwell_graphics_processor_DEPENDENCIES =  \
+	src/libgraphics-processor.la $(am__DEPENDENCIES_1)
+src_shotwell_graphics_processor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(src_shotwell_graphics_processor_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_thumbnailer_shotwell_video_thumbnailer_OBJECTS = thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.$(OBJEXT)
 thumbnailer_shotwell_video_thumbnailer_OBJECTS =  \
 	$(am_thumbnailer_shotwell_video_thumbnailer_OBJECTS)
@@ -578,24 +584,25 @@ SOURCES =  \
 	$(plugins_authenticator_libshotwell_authenticator_la_SOURCES) \
 	$(nodist_plugins_authenticator_libshotwell_authenticator_la_SOURCES) \
 	$(plugins_common_libshotwell_plugin_common_la_SOURCES) \
-	$(plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES) \
-	$(nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES) \
 	$(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES) \
 	$(nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES) \
 	$(plugins_shotwell_publishing_shotwell_publishing_la_SOURCES) \
 	$(nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES) \
 	$(plugins_shotwell_transitions_shotwell_transitions_la_SOURCES) \
 	$(nodist_plugins_shotwell_transitions_shotwell_transitions_la_SOURCES) \
+	$(src_libgraphics_processor_la_SOURCES) \
 	$(src_plugins_libplugin_la_SOURCES) $(shotwell_SOURCES) \
 	$(nodist_shotwell_SOURCES) \
+	$(src_shotwell_graphics_processor_SOURCES) \
 	$(thumbnailer_shotwell_video_thumbnailer_SOURCES)
 DIST_SOURCES = $(am__plugins_authenticator_libshotwell_authenticator_la_SOURCES_DIST) \
 	$(plugins_common_libshotwell_plugin_common_la_SOURCES) \
-	$(plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES) \
 	$(am__plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES_DIST) \
 	$(plugins_shotwell_publishing_shotwell_publishing_la_SOURCES) \
 	$(plugins_shotwell_transitions_shotwell_transitions_la_SOURCES) \
+	$(src_libgraphics_processor_la_SOURCES) \
 	$(src_plugins_libplugin_la_SOURCES) $(shotwell_SOURCES) \
+	$(src_shotwell_graphics_processor_SOURCES) \
 	$(thumbnailer_shotwell_video_thumbnailer_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -610,12 +617,15 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__dist_noinst_DATA_DIST = org.gnome.Shotwell.gresource.xml \
-	plugins/authenticator/shotwell/flickr_pin_entry_pane.ui \
+am__dist_noinst_DATA_DIST = src/shotwell-graphics-processor.vapi \
+	src/shotwell-graphics-processor.h \
+	org.gnome.Shotwell.gresource.xml \
+	plugins/authenticator/shotwell/tumblr_authentication_pane.ui \
 	plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml \
 	plugins/authenticator/shotwell-authenticator.h \
 	plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-publishing/flickr.png \
+	plugins/shotwell-publishing/tumblr.png \
 	plugins/shotwell-publishing/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
@@ -625,27 +635,32 @@ am__dist_noinst_DATA_DIST = org.gnome.Shotwell.gresource.xml \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
 	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
+	plugins/shotwell-publishing/tumblr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
 	plugins/shotwell-publishing-extras/gallery3.png \
 	plugins/shotwell-publishing-extras/rajce.png \
-	plugins/shotwell-publishing-extras/tumblr.png \
 	plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \
 	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
 	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
-	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
 	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
 	plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml \
 	plugins/shotwell-transitions/slideshow-plugin.png \
 	plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml \
-	plugins/shotwell-data-imports/f-spot-24.png \
-	plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml \
 	plugins/shotwell-plugin-dev-1.0.h \
 	plugins/shotwell-plugin-common.h vapi/gphoto.h \
 	vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \
-	vapi/unity.deps vapi/unity.vapi vapi/misc.vapi
+	vapi/misc.vapi app-icons/meson.build thumbnailer/meson.build \
+	meson.build po/meson.build apport/meson.build help/meson.build \
+	settings-migrator/meson.build misc/meson.build src/meson.build \
+	src/plugins/meson.build plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/authenticator/meson.build plugins/common/meson.build \
+	plugins/shotwell-transitions/meson.build meson_options.txt \
+	apport/shotwell.py
 DATA = $(dist_noinst_DATA) $(dist_plugin_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -676,16 +691,17 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = misc help po app-icons icons ui apport
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp \
 	$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp \
-	$(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp \
 	$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp \
 	$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp \
 	$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp \
 	$(srcdir)/shotwell_vala.stamp \
+	$(srcdir)/src_libgraphics_processor_la_vala.stamp \
 	$(srcdir)/src_plugins_libplugin_la_vala.stamp \
+	$(srcdir)/src_shotwell_graphics_processor_vala.stamp \
 	$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp \
 	$(top_srcdir)/authenticator.am $(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
@@ -695,7 +711,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/build-aux/install-sh \
 	$(top_srcdir)/build-aux/ltmain.sh \
 	$(top_srcdir)/build-aux/missing $(top_srcdir)/common.am \
-	$(top_srcdir)/import.am $(top_srcdir)/publish-extra.am \
+	$(top_srcdir)/pipeline.am $(top_srcdir)/publish-extra.am \
 	$(top_srcdir)/publish.am $(top_srcdir)/shotwell.am \
 	$(top_srcdir)/thumbnailer.am $(top_srcdir)/transition.am \
 	ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS \
@@ -705,33 +721,21 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c \
 	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c \
 	plugins/authenticator/shotwell/GoogleAuthenticator.c \
+	plugins/authenticator/shotwell/OAuth1Authenticator.c \
 	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c \
-	plugins/common/BuilderPane.c plugins/common/RESTSupport.c \
-	plugins/common/Resources.c \
+	plugins/authenticator/shotwell/TumblrAuthenticator.c \
+	plugins/common/BuilderPane.c plugins/common/OAuth1Support.c \
+	plugins/common/RESTSupport.c plugins/common/Resources.c \
 	plugins/common/WebAuthenticationPane.c \
-	plugins/shotwell-data-imports/FSpotDatabase.c \
-	plugins/shotwell-data-imports/FSpotDatabaseBehavior.c \
-	plugins/shotwell-data-imports/FSpotDatabaseTable.c \
-	plugins/shotwell-data-imports/FSpotImporter.c \
-	plugins/shotwell-data-imports/FSpotMetaTable.c \
-	plugins/shotwell-data-imports/FSpotPhotoTagsTable.c \
-	plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c \
-	plugins/shotwell-data-imports/FSpotPhotosTable.c \
-	plugins/shotwell-data-imports/FSpotRollsTable.c \
-	plugins/shotwell-data-imports/FSpotTableBehavior.c \
-	plugins/shotwell-data-imports/FSpotTagsTable.c \
-	plugins/shotwell-data-imports/SqliteSupport.c \
-	plugins/shotwell-data-imports/VersionNumber.c \
-	plugins/shotwell-data-imports/shotwell-data-imports.c \
 	plugins/shotwell-publishing-extras/GalleryConnector.c \
 	plugins/shotwell-publishing-extras/RajcePublishing.c \
-	plugins/shotwell-publishing-extras/TumblrPublishing.c \
 	plugins/shotwell-publishing-extras/YandexPublishing.c \
 	plugins/shotwell-publishing-extras/shotwell-publishing-extras.c \
 	plugins/shotwell-publishing/FacebookPublishing.c \
 	plugins/shotwell-publishing/FlickrPublishing.c \
 	plugins/shotwell-publishing/PicasaPublishing.c \
 	plugins/shotwell-publishing/PiwigoPublishing.c \
+	plugins/shotwell-publishing/TumblrPublishing.c \
 	plugins/shotwell-publishing/YouTubePublishing.c \
 	plugins/shotwell-publishing/shotwell-publishing.c \
 	plugins/shotwell-transitions/BlindsEffect.c \
@@ -766,13 +770,13 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	src/AppDirs.c src/AppWindow.c src/Application.c \
 	src/BatchImport.c src/Box.c src/CheckerboardLayout.c \
 	src/CollectionPage.c src/ColorTransformation.c \
-	src/CommandManager.c src/Commands.c src/CustomComponents.c \
-	src/Debug.c src/DesktopIntegration.c src/Dialogs.c \
-	src/Dimensions.c src/DirectoryMonitor.c src/Event.c \
-	src/Exporter.c src/International.c src/LibraryFiles.c \
-	src/LibraryMonitor.c src/MediaDataRepresentation.c \
-	src/MediaInterfaces.c src/MediaMetadata.c src/MediaMonitor.c \
-	src/MediaPage.c src/MediaViewTracker.c src/MetadataWriter.c \
+	src/CommandManager.c src/Commands.c src/Debug.c \
+	src/DesktopIntegration.c src/Dialogs.c src/Dimensions.c \
+	src/DirectoryMonitor.c src/Event.c src/Exporter.c \
+	src/International.c src/LibraryFiles.c src/LibraryMonitor.c \
+	src/MediaDataRepresentation.c src/MediaInterfaces.c \
+	src/MediaMetadata.c src/MediaMonitor.c src/MediaPage.c \
+	src/MediaViewTracker.c src/MetadataWriter.c \
 	src/NaturalCollate.c src/Orientation.c src/Page.c src/Photo.c \
 	src/PhotoMonitor.c src/PhotoPage.c src/PixbufCache.c \
 	src/Printing.c src/Properties.c src/Resources.c \
@@ -780,8 +784,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	src/SortedList.c src/Tag.c src/Thumbnail.c \
 	src/ThumbnailCache.c src/TimedQueue.c src/Tombstone.c \
 	src/UnityProgressBar.c src/Upgrades.c src/VideoMetadata.c \
-	src/VideoMonitor.c src/VideoSupport.c src/camera/Branch.c \
-	src/camera/Camera.c src/camera/CameraTable.c \
+	src/VideoMonitor.c src/VideoSupport.c src/camera/Camera.c \
+	src/camera/CameraBranch.c src/camera/CameraTable.c \
 	src/camera/GPhoto.c src/camera/ImportPage.c \
 	src/config/Config.c src/config/ConfigurationInterfaces.c \
 	src/config/GSettingsEngine.c src/core/Alteration.c \
@@ -801,24 +805,31 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	src/db/Db.c src/db/EventTable.c src/db/PhotoTable.c \
 	src/db/SavedSearchDBTable.c src/db/TagTable.c \
 	src/db/TombstoneTable.c src/db/VersionTable.c \
-	src/db/VideoTable.c src/direct/Direct.c \
+	src/db/VideoTable.c src/dialogs/AdjustDateTimeDialog.c \
+	src/dialogs/EntryMultiCompletion.c src/dialogs/ExportDialog.c \
+	src/dialogs/MultiTextEntryDialog.c src/dialogs/Preferences.c \
+	src/dialogs/ProgressDialog.c src/dialogs/SetBackground.c \
+	src/dialogs/SetBackgroundSlideshow.c src/dialogs/TextEntry.c \
+	src/dialogs/WelcomeDialog.c src/direct/Direct.c \
 	src/direct/DirectPhoto.c src/direct/DirectPhotoPage.c \
 	src/direct/DirectView.c src/direct/DirectWindow.c \
 	src/editing_tools/EditingTools.c \
-	src/editing_tools/StraightenTool.c src/events/Branch.c \
+	src/editing_tools/RGBHistogramManipulator.c \
+	src/editing_tools/StraightenTool.c \
 	src/events/EventDirectoryItem.c src/events/EventPage.c \
-	src/events/Events.c src/events/EventsDirectoryPage.c \
-	src/folders/Branch.c src/folders/Folders.c src/folders/Page.c \
-	src/library/Branch.c src/library/FlaggedPage.c \
+	src/events/Events.c src/events/EventsBranch.c \
+	src/events/EventsDirectoryPage.c src/folders/Folders.c \
+	src/folders/FoldersBranch.c src/folders/FoldersPage.c \
+	src/graphics-processor.c src/library/FlaggedPage.c \
 	src/library/FlaggedSidebarEntry.c \
 	src/library/ImportQueuePage.c \
 	src/library/ImportQueueSidebarEntry.c \
 	src/library/LastImportPage.c \
 	src/library/LastImportSidebarEntry.c src/library/Library.c \
-	src/library/LibraryWindow.c src/library/OfflinePage.c \
-	src/library/OfflineSidebarEntry.c src/library/TrashPage.c \
-	src/library/TrashSidebarEntry.c src/main.c \
-	src/photos/BmpSupport.c src/photos/GRaw.c \
+	src/library/LibraryBranch.c src/library/LibraryWindow.c \
+	src/library/OfflinePage.c src/library/OfflineSidebarEntry.c \
+	src/library/TrashPage.c src/library/TrashSidebarEntry.c \
+	src/main.c src/photos/BmpSupport.c src/photos/GRaw.c \
 	src/photos/GdkSupport.c src/photos/JfifSupport.c \
 	src/photos/PhotoFileAdapter.c src/photos/PhotoFileFormat.c \
 	src/photos/PhotoFileSniffer.c src/photos/PhotoMetadata.c \
@@ -832,21 +843,21 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	src/plugins/TransitionsInterfaces.c src/publishing/APIGlue.c \
 	src/publishing/Publishing.c \
 	src/publishing/PublishingPluginHost.c \
-	src/publishing/PublishingUI.c src/searches/Branch.c \
-	src/searches/SavedSearchDialog.c \
+	src/publishing/PublishingUI.c src/searches/SavedSearchDialog.c \
 	src/searches/SavedSearchPage.c src/searches/SearchBoolean.c \
-	src/searches/Searches.c src/sidebar/Branch.c \
-	src/sidebar/Entry.c src/sidebar/Sidebar.c src/sidebar/Tree.c \
-	src/sidebar/common.c src/slideshow/Slideshow.c \
-	src/slideshow/TransitionEffects.c src/tags/Branch.c \
+	src/searches/Searches.c src/searches/SearchesBranch.c \
+	src/sidebar/Branch.c src/sidebar/Entry.c src/sidebar/Sidebar.c \
+	src/sidebar/Tree.c src/sidebar/common.c \
+	src/slideshow/Slideshow.c src/slideshow/TransitionEffects.c \
 	src/tags/HierarchicalTagIndex.c \
 	src/tags/HierarchicalTagUtilities.c src/tags/TagPage.c \
-	src/tags/Tags.c src/threads/BackgroundJob.c \
-	src/threads/Semaphore.c src/threads/Threads.c \
-	src/threads/Workers.c src/unit/Unit.c src/util/KeyValueMap.c \
-	src/util/Util.c src/util/file.c src/util/image.c \
-	src/util/misc.c src/util/string.c src/util/system.c \
-	src/util/ui.c thumbnailer/shotwell-video-thumbnailer.c
+	src/tags/Tags.c src/tags/TagsBranch.c \
+	src/threads/BackgroundJob.c src/threads/Semaphore.c \
+	src/threads/Threads.c src/threads/Workers.c src/unit/Unit.c \
+	src/util/KeyValueMap.c src/util/Util.c src/util/file.c \
+	src/util/image.c src/util/misc.c src/util/string.c \
+	src/util/system.c src/util/ui.c \
+	thumbnailer/shotwell-video-thumbnailer.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -1068,8 +1079,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = misc help po app-icons icons ui
-EXTRA_DIST = AUTHORS
+SUBDIRS = misc help po app-icons icons ui $(am__append_1)
+EXTRA_DIST = AUTHORS git-hash
 #	find $(distdir) -name "*.c" -o -name "shotwell*.h" -o -name "shotwell*.vapi" -o -name "*vala.stamp" -exec rm {} \;
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -1077,6 +1088,7 @@ MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
 
 GITIGNOREFILES = \
+	build \
 	ABOUT-NLS \
 	plugins/**/*.h \
 	plugins/**/*.vapi \
@@ -1102,6 +1114,7 @@ lib_LTLIBRARIES = plugins/common/libshotwell-plugin-common.la \
 	plugins/authenticator/libshotwell-authenticator.la
 plugins_common_libshotwell_plugin_common_la_SOURCES = \
 	plugins/common/RESTSupport.vala \
+	plugins/common/OAuth1Support.vala \
 	plugins/common/Resources.vala \
 	plugins/common/WebAuthenticationPane.vala \
 	plugins/common/BuilderPane.vala \
@@ -1132,9 +1145,8 @@ plugins_common_libshotwell_plugin_common_la_LIBADD = \
 #
 # Create intermediate library for the Plugin API
 #
-noinst_LTLIBRARIES = \
-	src/plugins/libplugin.la
-
+noinst_LTLIBRARIES = src/plugins/libplugin.la \
+	src/libgraphics-processor.la
 src_plugins_libplugin_la_SOURCES = \
 	src/plugins/SpitInterfaces.vala \
 	src/plugins/TransitionsInterfaces.vala \
@@ -1162,17 +1174,19 @@ SHOTWELL_PLUGIN_LDFLAGS = \
 plugindir = $(pkglibdir)/plugins/builtin
 plugin_LTLIBRARIES =  \
 	plugins/shotwell-publishing/shotwell-publishing.la \
-	$(am__append_4) \
-	plugins/shotwell-transitions/shotwell-transitions.la \
-	plugins/shotwell-data-imports/shotwell-data-imports.la
+	$(am__append_5) \
+	plugins/shotwell-transitions/shotwell-transitions.la
 dist_plugin_DATA = 
 dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
-dist_noinst_DATA = $(NULL) org.gnome.Shotwell.gresource.xml \
-	plugins/authenticator/shotwell/flickr_pin_entry_pane.ui \
+dist_noinst_DATA = $(NULL) src/shotwell-graphics-processor.vapi \
+	src/shotwell-graphics-processor.h \
+	org.gnome.Shotwell.gresource.xml \
+	plugins/authenticator/shotwell/tumblr_authentication_pane.ui \
 	plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml \
 	plugins/authenticator/shotwell-authenticator.h \
 	plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-publishing/flickr.png \
+	plugins/shotwell-publishing/tumblr.png \
 	plugins/shotwell-publishing/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
@@ -1182,27 +1196,44 @@ dist_noinst_DATA = $(NULL) org.gnome.Shotwell.gresource.xml \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
 	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
+	plugins/shotwell-publishing/tumblr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
-	$(am__append_5) \
+	$(am__append_6) \
 	plugins/shotwell-transitions/slideshow-plugin.png \
 	plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml \
-	plugins/shotwell-data-imports/f-spot-24.png \
-	plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml \
 	plugins/shotwell-plugin-dev-1.0.h \
 	plugins/shotwell-plugin-common.h vapi/gphoto.h \
 	vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \
-	vapi/unity.deps vapi/unity.vapi vapi/misc.vapi
+	vapi/misc.vapi app-icons/meson.build thumbnailer/meson.build \
+	meson.build po/meson.build apport/meson.build help/meson.build \
+	settings-migrator/meson.build misc/meson.build src/meson.build \
+	src/plugins/meson.build plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/authenticator/meson.build plugins/common/meson.build \
+	plugins/shotwell-transitions/meson.build meson_options.txt \
+	app-icons/meson.build apport/meson.build help/meson.build \
+	meson.build meson_options.txt misc/meson.build \
+	plugins/authenticator/meson.build \
+	plugins/authenticator/shotwell/meson.build \
+	plugins/common/meson.build plugins/meson.build \
+	plugins/shotwell-publishing-extras/meson.build \
+	plugins/shotwell-publishing/meson.build \
+	plugins/shotwell-transitions/meson.build po/meson.build \
+	settings-migrator/meson.build src/meson.build \
+	src/plugins/meson.build thumbnailer/meson.build \
+	apport/shotwell.py
 MOSTLYCLEANFILES = $(NULL) resource.c plugins/authenticator/resource.c \
-	plugins/shotwell-publishing/resource.c $(am__append_6) \
-	plugins/shotwell-transitions/resource.c \
-	plugins/shotwell-data-imports/resource.c
+	plugins/shotwell-publishing/resource.c $(am__append_7) \
+	plugins/shotwell-transitions/resource.c
 
 # --enable-checking needs to come first to not trigger
 #  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18734
 COMMON_VALAFLAGS = --enable-checking --target-glib=2.40 --thread \
 	--fatal-warnings --enable-experimental --enable-deprecated \
-	$(am__append_2)
+	$(am__append_3)
 COMMON_CFLAGS = -I$(top_srcdir)/vapi -D_PREFIX='"$(prefix)"' \
 	-Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
 	-D_VERSION='"$(VERSION)"' \
@@ -1210,16 +1241,51 @@ COMMON_CFLAGS = -I$(top_srcdir)/vapi -D_PREFIX='"$(prefix)"' \
 	-D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
 	-D_LIBEXECDIR='"$(libexecdir)"' -D_LIB='"$(libdir)"' \
 	-Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
-	$(am__append_1)
+	$(am__append_2)
+src_libgraphics_processor_la_SOURCES = \
+	src/ColorTransformation.vala \
+	src/util/KeyValueMap.vala \
+	src/_transformation.c
+
+src_libgraphics_processor_la_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--disable-assert \
+	--pkg gio-2.0 \
+	--pkg gdk-3.0 \
+	--pkg gee-0.8 \
+	--pkg gdk-pixbuf-2.0 \
+	--vapi=src/shotwell-graphics-processor.vapi \
+	--header=src/shotwell-graphics-processor.h
+
+src_libgraphics_processor_la_CFLAGS = $(SHOTWELL_CFLAGS) \
+	$(COMMON_CFLAGS) -DG_DISABLE_CAST_CHECKS
+src_shotwell_graphics_processor_SOURCES = \
+	src/graphics-processor.vala \
+	src/shotwell-graphics-processor.vapi
+
+src_shotwell_graphics_processor_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--pkg gio-2.0 \
+	--pkg gdk-3.0 \
+	--pkg gee-0.8 \
+	--pkg gdk-pixbuf-2.0
+
+src_shotwell_graphics_processor_CFLAGS = $(SHOTWELL_CFLAGS) $(COMMON_CFLAGS)
+src_shotwell_graphics_processor_LDADD = \
+	src/libgraphics-processor.la \
+	$(SHOTWELL_LIBS)
+
 shotwell_CFLAGS = \
 	$(SHOTWELL_CFLAGS) \
 	$(UNITY_CFLAGS) \
 	$(COMMON_CFLAGS) \
 	-I$(top_builddir)/plugins \
-	-I$(abs_top_srcdir)/plugins
+	-I$(abs_top_srcdir)/plugins \
+	-I$(abs_top_srcdir)/src
 
 shotwell_LDADD = \
 	src/plugins/libplugin.la \
+	src/libgraphics-processor.la \
 	$(SHOTWELL_LIBS) \
 	$(UNITY_LIBS)
 
@@ -1249,7 +1315,6 @@ shotwell_SOURCES = \
 	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 \
@@ -1264,7 +1329,18 @@ shotwell_SOURCES = \
 	src/db/VideoTable.vala \
 	src/db/VersionTable.vala \
 	src/db/SavedSearchDBTable.vala \
+	src/dialogs/Preferences.vala \
+	src/dialogs/EntryMultiCompletion.vala \
+	src/dialogs/ExportDialog.vala \
+	src/dialogs/TextEntry.vala \
+	src/dialogs/WelcomeDialog.vala \
+	src/dialogs/MultiTextEntryDialog.vala \
+	src/dialogs/AdjustDateTimeDialog.vala \
+	src/dialogs/SetBackground.vala \
+	src/dialogs/ProgressDialog.vala \
+	src/dialogs/SetBackgroundSlideshow.vala \
 	src/editing_tools/EditingTools.vala \
+	src/editing_tools/RGBHistogramManipulator.vala \
 	src/editing_tools/StraightenTool.vala \
 	src/slideshow/Slideshow.vala \
 	src/slideshow/TransitionEffects.vala \
@@ -1289,7 +1365,7 @@ shotwell_SOURCES = \
 	src/publishing/APIGlue.vala \
 	src/library/Library.vala \
 	src/library/LibraryWindow.vala \
-	src/library/Branch.vala \
+	src/library/LibraryBranch.vala \
 	src/library/TrashSidebarEntry.vala \
 	src/library/OfflineSidebarEntry.vala \
 	src/library/FlaggedSidebarEntry.vala \
@@ -1328,22 +1404,22 @@ shotwell_SOURCES = \
 	src/sidebar/Tree.vala \
 	src/sidebar/common.vala \
 	src/events/Events.vala \
-	src/events/Branch.vala \
+	src/events/EventsBranch.vala \
 	src/events/EventsDirectoryPage.vala \
 	src/events/EventPage.vala \
 	src/events/EventDirectoryItem.vala \
 	src/tags/Tags.vala \
-	src/tags/Branch.vala \
+	src/tags/TagsBranch.vala \
 	src/tags/TagPage.vala \
 	src/tags/HierarchicalTagIndex.vala \
 	src/tags/HierarchicalTagUtilities.vala \
 	src/camera/Camera.vala \
-	src/camera/Branch.vala \
+	src/camera/CameraBranch.vala \
 	src/camera/CameraTable.vala \
 	src/camera/GPhoto.vala \
 	src/camera/ImportPage.vala \
 	src/searches/Searches.vala \
-	src/searches/Branch.vala \
+	src/searches/SearchesBranch.vala \
 	src/searches/SearchBoolean.vala \
 	src/searches/SavedSearchPage.vala \
 	src/searches/SavedSearchDialog.vala \
@@ -1356,8 +1432,8 @@ shotwell_SOURCES = \
 	src/data_imports/DataImportJob.vala \
 	src/data_imports/DataImportSource.vala \
 	src/folders/Folders.vala \
-	src/folders/Branch.vala \
-	src/folders/Page.vala \
+	src/folders/FoldersBranch.vala \
+	src/folders/FoldersPage.vala \
 	src/main.vala \
 	src/AppWindow.vala \
 	src/CollectionPage.vala \
@@ -1376,9 +1452,7 @@ shotwell_SOURCES = \
 	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 \
@@ -1433,19 +1507,21 @@ shotwell_SOURCES = \
 	src/.unitize/_FoldersInternals.vala \
 	src/.unitize/_Library_unitize_entry.vala \
 	src/.unitize/_Direct_unitize_entry.vala \
-	plugins/shotwell-plugin-dev-1.0.vapi
+	plugins/shotwell-plugin-dev-1.0.vapi \
+	src/shotwell-graphics-processor.vapi
 
 thumbnailer_shotwell_video_thumbnailer_SOURCES = thumbnailer/shotwell-video-thumbnailer.vala
 thumbnailer_shotwell_video_thumbnailer_VALAFLAGS = $(COMMON_VALAFLAGS) \
 	--pkg gstreamer-1.0 \
 	--pkg gee-0.8 \
-	--pkg gtk+-3.0
+	--pkg gtk+-3.0 \
+	--pkg posix
 
 thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS)
 thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS)
 plugins_authenticator_libshotwell_authenticator_la_SOURCES =  \
 	plugins/shotwell-plugin-common.vapi \
-	plugins/shotwell-plugin-dev-1.0.vapi $(am__append_3)
+	plugins/shotwell-plugin-dev-1.0.vapi $(am__append_4)
 plugins_authenticator_libshotwell_authenticator_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
 	--library shotwell-authenticator \
@@ -1469,7 +1545,7 @@ nodist_plugins_authenticator_libshotwell_authenticator_la_SOURCES = \
 
 AUTHENTICATOR_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
 		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
-		--generate-dependencies $(AUTHENTICATOR_SHOTWELL_RESOURCE_FILE))
+		--generate-dependencies $(AUTHENTICATOR_RESOURCE_FILE))
 
 @AUTHENTICATOR_SHOTWELL_TRUE@AUTHENTICATOR_RESOURCE_FILE := $(abs_top_srcdir)/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
 @AUTHENTICATOR_SHOTWELL_TRUE@AUTHENTICATOR_RESOURCE_SOURCEDIR := $(abs_top_srcdir)/plugins/authenticator/shotwell
@@ -1478,6 +1554,7 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/FacebookPublishing.vala \
 	plugins/shotwell-publishing/PicasaPublishing.vala \
 	plugins/shotwell-publishing/FlickrPublishing.vala \
+	plugins/shotwell-publishing/TumblrPublishing.vala \
 	plugins/shotwell-publishing/YouTubePublishing.vala \
 	plugins/shotwell-publishing/PiwigoPublishing.vala \
 	plugins/shotwell-plugin-common.vapi \
@@ -1528,7 +1605,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/GalleryConnector.vala \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/RajcePublishing.vala \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \
-@HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/TumblrPublishing.vala \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/YandexPublishing.vala \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-plugin-common.vapi
 
@@ -1603,52 +1679,6 @@ plugins_shotwell_transitions_shotwell_transitions_la_LIBADD = \
 	$(TRANSITIONS_LIBS) -lm \
 	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
 
-plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
-	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
-
-nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
-	plugins/shotwell-data-imports/resource.c
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
-	$(COMMON_VALAFLAGS) \
-	--pkg gtk+-3.0 \
-	--pkg libsoup-2.4 \
-	--pkg gexiv2 \
-	--pkg gee-0.8 \
-	--pkg json-glib-1.0 \
-	--pkg shotwell-plugin-dev-1.0 \
-	--pkg libxml-2.0 \
-	--pkg webkit2gtk-4.0 \
-	--pkg sqlite3 \
-	--vapidir $(abs_top_srcdir)/plugins
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS = \
-	-DPLUGIN_RESOURCE_PATH='"/org/gnome/Shotwell/Imports"' \
-	$(PLUGIN_CFLAGS) \
-	$(COMMON_CFLAGS) \
-	-I $(abs_top_srcdir)/plugins
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS = \
-	$(SHOTWELL_PLUGIN_LDFLAGS)
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD = \
-	$(IMPORT_LIBS) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
-
 
 # Authenticators
 
@@ -1663,7 +1693,7 @@ all: config.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.am $(top_srcdir)/shotwell.am $(top_srcdir)/thumbnailer.am $(top_srcdir)/authenticator.am $(top_srcdir)/publish.am $(top_srcdir)/publish-extra.am $(top_srcdir)/transition.am $(top_srcdir)/import.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/common.am $(top_srcdir)/pipeline.am $(top_srcdir)/shotwell.am $(top_srcdir)/thumbnailer.am $(top_srcdir)/authenticator.am $(top_srcdir)/publish.am $(top_srcdir)/publish-extra.am $(top_srcdir)/transition.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1685,7 +1715,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/common.am $(top_srcdir)/shotwell.am $(top_srcdir)/thumbnailer.am $(top_srcdir)/authenticator.am $(top_srcdir)/publish.am $(top_srcdir)/publish-extra.am $(top_srcdir)/transition.am $(top_srcdir)/import.am $(am__empty):
+$(top_srcdir)/common.am $(top_srcdir)/pipeline.am $(top_srcdir)/shotwell.am $(top_srcdir)/thumbnailer.am $(top_srcdir)/authenticator.am $(top_srcdir)/publish.am $(top_srcdir)/publish-extra.am $(top_srcdir)/transition.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1809,6 +1839,12 @@ plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_l
 plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo:  \
 	plugins/authenticator/shotwell/$(am__dirstamp) \
 	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
 plugins/authenticator/$(am__dirstamp):
 	@$(MKDIR_P) plugins/authenticator
 	@: > plugins/authenticator/$(am__dirstamp)
@@ -1830,6 +1866,9 @@ plugins/common/$(DEPDIR)/$(am__dirstamp):
 plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo:  \
 	plugins/common/$(am__dirstamp) \
 	plugins/common/$(DEPDIR)/$(am__dirstamp)
+plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo:  \
+	plugins/common/$(am__dirstamp) \
+	plugins/common/$(DEPDIR)/$(am__dirstamp)
 plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo:  \
 	plugins/common/$(am__dirstamp) \
 	plugins/common/$(DEPDIR)/$(am__dirstamp)
@@ -1842,60 +1881,6 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo:  \
 
 plugins/common/libshotwell-plugin-common.la: $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) $(EXTRA_plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) plugins/common/$(am__dirstamp)
 	$(AM_V_CCLD)$(plugins_common_libshotwell_plugin_common_la_LINK) -rpath $(libdir) $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_LIBADD) $(LIBS)
-plugins/shotwell-data-imports/$(am__dirstamp):
-	@$(MKDIR_P) plugins/shotwell-data-imports
-	@: > plugins/shotwell-data-imports/$(am__dirstamp)
-plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) plugins/shotwell-data-imports/$(DEPDIR)
-	@: > plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo:  \
-	plugins/shotwell-data-imports/$(am__dirstamp) \
-	plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-
-plugins/shotwell-data-imports/shotwell-data-imports.la: $(plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_DEPENDENCIES) $(EXTRA_plugins_shotwell_data_imports_shotwell_data_imports_la_DEPENDENCIES) plugins/shotwell-data-imports/$(am__dirstamp)
-	$(AM_V_CCLD)$(plugins_shotwell_data_imports_shotwell_data_imports_la_LINK) -rpath $(plugindir) $(plugins_shotwell_data_imports_shotwell_data_imports_la_OBJECTS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD) $(LIBS)
 plugins/shotwell-publishing-extras/$(am__dirstamp):
 	@$(MKDIR_P) plugins/shotwell-publishing-extras
 	@: > plugins/shotwell-publishing-extras/$(am__dirstamp)
@@ -1911,9 +1896,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
 plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo:  \
 	plugins/shotwell-publishing-extras/$(am__dirstamp) \
 	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
-plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo:  \
-	plugins/shotwell-publishing-extras/$(am__dirstamp) \
-	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
 plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo:  \
 	plugins/shotwell-publishing-extras/$(am__dirstamp) \
 	plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
@@ -1941,6 +1923,9 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-P
 plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo:  \
 	plugins/shotwell-publishing/$(am__dirstamp) \
 	plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
+plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo:  \
+	plugins/shotwell-publishing/$(am__dirstamp) \
+	plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
 plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo:  \
 	plugins/shotwell-publishing/$(am__dirstamp) \
 	plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
@@ -1998,6 +1983,27 @@ plugins/shotwell-transitions/plugins_shotwell_transitions_shotwell_transitions_l
 
 plugins/shotwell-transitions/shotwell-transitions.la: $(plugins_shotwell_transitions_shotwell_transitions_la_OBJECTS) $(plugins_shotwell_transitions_shotwell_transitions_la_DEPENDENCIES) $(EXTRA_plugins_shotwell_transitions_shotwell_transitions_la_DEPENDENCIES) plugins/shotwell-transitions/$(am__dirstamp)
 	$(AM_V_CCLD)$(plugins_shotwell_transitions_shotwell_transitions_la_LINK) -rpath $(plugindir) $(plugins_shotwell_transitions_shotwell_transitions_la_OBJECTS) $(plugins_shotwell_transitions_shotwell_transitions_la_LIBADD) $(LIBS)
+src/$(am__dirstamp):
+	@$(MKDIR_P) src
+	@: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/$(DEPDIR)
+	@: > src/$(DEPDIR)/$(am__dirstamp)
+src/src_libgraphics_processor_la-ColorTransformation.lo:  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/util/$(am__dirstamp):
+	@$(MKDIR_P) src/util
+	@: > src/util/$(am__dirstamp)
+src/util/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/util/$(DEPDIR)
+	@: > src/util/$(DEPDIR)/$(am__dirstamp)
+src/util/src_libgraphics_processor_la-KeyValueMap.lo:  \
+	src/util/$(am__dirstamp) src/util/$(DEPDIR)/$(am__dirstamp)
+src/src_libgraphics_processor_la-_transformation.lo:  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/libgraphics-processor.la: $(src_libgraphics_processor_la_OBJECTS) $(src_libgraphics_processor_la_DEPENDENCIES) $(EXTRA_src_libgraphics_processor_la_DEPENDENCIES) src/$(am__dirstamp)
+	$(AM_V_CCLD)$(src_libgraphics_processor_la_LINK)  $(src_libgraphics_processor_la_OBJECTS) $(src_libgraphics_processor_la_LIBADD) $(LIBS)
 src/plugins/$(am__dirstamp):
 	@$(MKDIR_P) src/plugins
 	@: > src/plugins/$(am__dirstamp)
@@ -2068,6 +2074,15 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
@@ -2125,12 +2140,6 @@ src/unit/$(DEPDIR)/$(am__dirstamp):
 	@: > src/unit/$(DEPDIR)/$(am__dirstamp)
 src/unit/shotwell-Unit.$(OBJEXT): src/unit/$(am__dirstamp) \
 	src/unit/$(DEPDIR)/$(am__dirstamp)
-src/util/$(am__dirstamp):
-	@$(MKDIR_P) src/util
-	@: > src/util/$(am__dirstamp)
-src/util/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/util/$(DEPDIR)
-	@: > src/util/$(DEPDIR)/$(am__dirstamp)
 src/util/shotwell-Util.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
 src/util/shotwell-file.$(OBJEXT): src/util/$(am__dirstamp) \
@@ -2143,8 +2152,6 @@ src/util/shotwell-string.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
 src/util/shotwell-system.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
-src/util/shotwell-KeyValueMap.$(OBJEXT): src/util/$(am__dirstamp) \
-	src/util/$(DEPDIR)/$(am__dirstamp)
 src/util/shotwell-ui.$(OBJEXT): src/util/$(am__dirstamp) \
 	src/util/$(DEPDIR)/$(am__dirstamp)
 src/threads/$(am__dirstamp):
@@ -2186,6 +2193,41 @@ src/db/shotwell-VersionTable.$(OBJEXT): src/db/$(am__dirstamp) \
 	src/db/$(DEPDIR)/$(am__dirstamp)
 src/db/shotwell-SavedSearchDBTable.$(OBJEXT): src/db/$(am__dirstamp) \
 	src/db/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/$(am__dirstamp):
+	@$(MKDIR_P) src/dialogs
+	@: > src/dialogs/$(am__dirstamp)
+src/dialogs/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/dialogs/$(DEPDIR)
+	@: > src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-Preferences.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-EntryMultiCompletion.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-ExportDialog.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-TextEntry.$(OBJEXT): src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-WelcomeDialog.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-MultiTextEntryDialog.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-AdjustDateTimeDialog.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-SetBackground.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-ProgressDialog.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
+src/dialogs/shotwell-SetBackgroundSlideshow.$(OBJEXT):  \
+	src/dialogs/$(am__dirstamp) \
+	src/dialogs/$(DEPDIR)/$(am__dirstamp)
 src/editing_tools/$(am__dirstamp):
 	@$(MKDIR_P) src/editing_tools
 	@: > src/editing_tools/$(am__dirstamp)
@@ -2195,6 +2237,9 @@ src/editing_tools/$(DEPDIR)/$(am__dirstamp):
 src/editing_tools/shotwell-EditingTools.$(OBJEXT):  \
 	src/editing_tools/$(am__dirstamp) \
 	src/editing_tools/$(DEPDIR)/$(am__dirstamp)
+src/editing_tools/shotwell-RGBHistogramManipulator.$(OBJEXT):  \
+	src/editing_tools/$(am__dirstamp) \
+	src/editing_tools/$(DEPDIR)/$(am__dirstamp)
 src/editing_tools/shotwell-StraightenTool.$(OBJEXT):  \
 	src/editing_tools/$(am__dirstamp) \
 	src/editing_tools/$(DEPDIR)/$(am__dirstamp)
@@ -2281,7 +2326,8 @@ src/library/shotwell-Library.$(OBJEXT): src/library/$(am__dirstamp) \
 src/library/shotwell-LibraryWindow.$(OBJEXT):  \
 	src/library/$(am__dirstamp) \
 	src/library/$(DEPDIR)/$(am__dirstamp)
-src/library/shotwell-Branch.$(OBJEXT): src/library/$(am__dirstamp) \
+src/library/shotwell-LibraryBranch.$(OBJEXT):  \
+	src/library/$(am__dirstamp) \
 	src/library/$(DEPDIR)/$(am__dirstamp)
 src/library/shotwell-TrashSidebarEntry.$(OBJEXT):  \
 	src/library/$(am__dirstamp) \
@@ -2394,7 +2440,8 @@ src/events/$(DEPDIR)/$(am__dirstamp):
 	@: > src/events/$(DEPDIR)/$(am__dirstamp)
 src/events/shotwell-Events.$(OBJEXT): src/events/$(am__dirstamp) \
 	src/events/$(DEPDIR)/$(am__dirstamp)
-src/events/shotwell-Branch.$(OBJEXT): src/events/$(am__dirstamp) \
+src/events/shotwell-EventsBranch.$(OBJEXT):  \
+	src/events/$(am__dirstamp) \
 	src/events/$(DEPDIR)/$(am__dirstamp)
 src/events/shotwell-EventsDirectoryPage.$(OBJEXT):  \
 	src/events/$(am__dirstamp) \
@@ -2412,7 +2459,7 @@ src/tags/$(DEPDIR)/$(am__dirstamp):
 	@: > src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/shotwell-Tags.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
-src/tags/shotwell-Branch.$(OBJEXT): src/tags/$(am__dirstamp) \
+src/tags/shotwell-TagsBranch.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
 src/tags/shotwell-TagPage.$(OBJEXT): src/tags/$(am__dirstamp) \
 	src/tags/$(DEPDIR)/$(am__dirstamp)
@@ -2428,7 +2475,8 @@ src/camera/$(DEPDIR)/$(am__dirstamp):
 	@: > src/camera/$(DEPDIR)/$(am__dirstamp)
 src/camera/shotwell-Camera.$(OBJEXT): src/camera/$(am__dirstamp) \
 	src/camera/$(DEPDIR)/$(am__dirstamp)
-src/camera/shotwell-Branch.$(OBJEXT): src/camera/$(am__dirstamp) \
+src/camera/shotwell-CameraBranch.$(OBJEXT):  \
+	src/camera/$(am__dirstamp) \
 	src/camera/$(DEPDIR)/$(am__dirstamp)
 src/camera/shotwell-CameraTable.$(OBJEXT): src/camera/$(am__dirstamp) \
 	src/camera/$(DEPDIR)/$(am__dirstamp)
@@ -2445,7 +2493,8 @@ src/searches/$(DEPDIR)/$(am__dirstamp):
 src/searches/shotwell-Searches.$(OBJEXT):  \
 	src/searches/$(am__dirstamp) \
 	src/searches/$(DEPDIR)/$(am__dirstamp)
-src/searches/shotwell-Branch.$(OBJEXT): src/searches/$(am__dirstamp) \
+src/searches/shotwell-SearchesBranch.$(OBJEXT):  \
+	src/searches/$(am__dirstamp) \
 	src/searches/$(DEPDIR)/$(am__dirstamp)
 src/searches/shotwell-SearchBoolean.$(OBJEXT):  \
 	src/searches/$(am__dirstamp) \
@@ -2499,16 +2548,12 @@ src/folders/$(DEPDIR)/$(am__dirstamp):
 	@: > src/folders/$(DEPDIR)/$(am__dirstamp)
 src/folders/shotwell-Folders.$(OBJEXT): src/folders/$(am__dirstamp) \
 	src/folders/$(DEPDIR)/$(am__dirstamp)
-src/folders/shotwell-Branch.$(OBJEXT): src/folders/$(am__dirstamp) \
+src/folders/shotwell-FoldersBranch.$(OBJEXT):  \
+	src/folders/$(am__dirstamp) \
 	src/folders/$(DEPDIR)/$(am__dirstamp)
-src/folders/shotwell-Page.$(OBJEXT): src/folders/$(am__dirstamp) \
+src/folders/shotwell-FoldersPage.$(OBJEXT):  \
+	src/folders/$(am__dirstamp) \
 	src/folders/$(DEPDIR)/$(am__dirstamp)
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-main.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-AppWindow.$(OBJEXT): src/$(am__dirstamp) \
@@ -2545,12 +2590,8 @@ src/shotwell-Resources.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-Debug.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/shotwell-ColorTransformation.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-Properties.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/shotwell-CustomComponents.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-Event.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/shotwell-International.$(OBJEXT): src/$(am__dirstamp) \
@@ -2691,6 +2732,12 @@ src/.unitize/shotwell-_Direct_unitize_entry.$(OBJEXT):  \
 shotwell$(EXEEXT): $(shotwell_OBJECTS) $(shotwell_DEPENDENCIES) $(EXTRA_shotwell_DEPENDENCIES) 
 	@rm -f shotwell$(EXEEXT)
 	$(AM_V_CCLD)$(shotwell_LINK) $(shotwell_OBJECTS) $(shotwell_LDADD) $(LIBS)
+src/src_shotwell_graphics_processor-graphics-processor.$(OBJEXT):  \
+	src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+
+src/shotwell-graphics-processor$(EXEEXT): $(src_shotwell_graphics_processor_OBJECTS) $(src_shotwell_graphics_processor_DEPENDENCIES) $(EXTRA_src_shotwell_graphics_processor_DEPENDENCIES) src/$(am__dirstamp)
+	@rm -f src/shotwell-graphics-processor$(EXEEXT)
+	$(AM_V_CCLD)$(src_shotwell_graphics_processor_LINK) $(src_shotwell_graphics_processor_OBJECTS) $(src_shotwell_graphics_processor_LDADD) $(LIBS)
 thumbnailer/$(am__dirstamp):
 	@$(MKDIR_P) thumbnailer
 	@: > thumbnailer/$(am__dirstamp)
@@ -2748,8 +2795,6 @@ mostlyclean-compile:
 	-rm -f plugins/authenticator/shotwell/*.lo
 	-rm -f plugins/common/*.$(OBJEXT)
 	-rm -f plugins/common/*.lo
-	-rm -f plugins/shotwell-data-imports/*.$(OBJEXT)
-	-rm -f plugins/shotwell-data-imports/*.lo
 	-rm -f plugins/shotwell-publishing-extras/*.$(OBJEXT)
 	-rm -f plugins/shotwell-publishing-extras/*.lo
 	-rm -f plugins/shotwell-publishing/*.$(OBJEXT)
@@ -2757,12 +2802,14 @@ mostlyclean-compile:
 	-rm -f plugins/shotwell-transitions/*.$(OBJEXT)
 	-rm -f plugins/shotwell-transitions/*.lo
 	-rm -f src/*.$(OBJEXT)
+	-rm -f src/*.lo
 	-rm -f src/.unitize/*.$(OBJEXT)
 	-rm -f src/camera/*.$(OBJEXT)
 	-rm -f src/config/*.$(OBJEXT)
 	-rm -f src/core/*.$(OBJEXT)
 	-rm -f src/data_imports/*.$(OBJEXT)
 	-rm -f src/db/*.$(OBJEXT)
+	-rm -f src/dialogs/*.$(OBJEXT)
 	-rm -f src/direct/*.$(OBJEXT)
 	-rm -f src/editing_tools/*.$(OBJEXT)
 	-rm -f src/events/*.$(OBJEXT)
@@ -2779,6 +2826,7 @@ mostlyclean-compile:
 	-rm -f src/threads/*.$(OBJEXT)
 	-rm -f src/unit/*.$(OBJEXT)
 	-rm -f src/util/*.$(OBJEXT)
+	-rm -f src/util/*.lo
 	-rm -f thumbnailer/*.$(OBJEXT)
 
 distclean-compile:
@@ -2789,29 +2837,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-BuilderPane.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-OAuth1Support.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.Plo@am__quote@
@@ -2819,6 +2854,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-resource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo@am__quote@
@@ -2841,10 +2877,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-Box.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-CheckerboardLayout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-CollectionPage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-ColorTransformation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-CommandManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-Commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-CustomComponents.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-Debug.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-DesktopIntegration.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-Dialogs.Po@am__quote@
@@ -2887,6 +2921,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-VideoMonitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-VideoSupport.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libgraphics_processor_la-ColorTransformation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libgraphics_processor_la-_transformation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_CameraInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_ConfigInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_CoreInternals.Po@am__quote@
@@ -2909,8 +2946,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_ThreadsInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_UnitInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_UtilInternals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-Camera.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-CameraBranch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-CameraTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-GPhoto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/camera/$(DEPDIR)/shotwell-ImportPage.Po@am__quote@
@@ -2948,22 +2985,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/db/$(DEPDIR)/shotwell-TombstoneTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/db/$(DEPDIR)/shotwell-VersionTable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/db/$(DEPDIR)/shotwell-VideoTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-Preferences.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-SetBackground.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-TextEntry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/direct/$(DEPDIR)/shotwell-Direct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/direct/$(DEPDIR)/shotwell-DirectPhoto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/direct/$(DEPDIR)/shotwell-DirectPhotoPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/direct/$(DEPDIR)/shotwell-DirectView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/direct/$(DEPDIR)/shotwell-DirectWindow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/editing_tools/$(DEPDIR)/shotwell-EditingTools.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/editing_tools/$(DEPDIR)/shotwell-StraightenTool.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-EventDirectoryItem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-EventPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-Events.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-EventsBranch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/events/$(DEPDIR)/shotwell-EventsDirectoryPage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/folders/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/folders/$(DEPDIR)/shotwell-Folders.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/folders/$(DEPDIR)/shotwell-Page.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-Branch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/folders/$(DEPDIR)/shotwell-FoldersBranch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/folders/$(DEPDIR)/shotwell-FoldersPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-FlaggedPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-FlaggedSidebarEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-ImportQueuePage.Po@am__quote@
@@ -2971,6 +3018,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-LastImportPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-LastImportSidebarEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-Library.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-LibraryBranch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-LibraryWindow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-OfflinePage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/library/$(DEPDIR)/shotwell-OfflineSidebarEntry.Po@am__quote@
@@ -2999,11 +3047,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/publishing/$(DEPDIR)/shotwell-Publishing.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/publishing/$(DEPDIR)/shotwell-PublishingPluginHost.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/publishing/$(DEPDIR)/shotwell-PublishingUI.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-SavedSearchDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-SavedSearchPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-SearchBoolean.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-Searches.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/searches/$(DEPDIR)/shotwell-SearchesBranch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/sidebar/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/sidebar/$(DEPDIR)/shotwell-Entry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/sidebar/$(DEPDIR)/shotwell-Sidebar.Po@am__quote@
@@ -3011,17 +3059,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/sidebar/$(DEPDIR)/shotwell-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/slideshow/$(DEPDIR)/shotwell-Slideshow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/slideshow/$(DEPDIR)/shotwell-TransitionEffects.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-Branch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-HierarchicalTagIndex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-HierarchicalTagUtilities.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-TagPage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-Tags.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/tags/$(DEPDIR)/shotwell-TagsBranch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/threads/$(DEPDIR)/shotwell-BackgroundJob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/threads/$(DEPDIR)/shotwell-Semaphore.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/threads/$(DEPDIR)/shotwell-Threads.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/threads/$(DEPDIR)/shotwell-Workers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/unit/$(DEPDIR)/shotwell-Unit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-KeyValueMap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-Util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-image.Po@am__quote@
@@ -3029,6 +3076,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-system.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/shotwell-ui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/src_libgraphics_processor_la-KeyValueMap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Po@am__quote@
 
 .c.o:
@@ -3083,6 +3131,20 @@ plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo `test -f 'plugins/authenticator/shotwell/GoogleAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/GoogleAuthenticator.c
 
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo: plugins/authenticator/shotwell/OAuth1Authenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -MT plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.Tpo -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo `test -f 'plugins/authenticator/shotwell/OAuth1Authenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/OAuth1Authenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/OAuth1Authenticator.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-OAuth1Authenticator.lo `test -f 'plugins/authenticator/shotwell/OAuth1Authenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/OAuth1Authenticator.c
+
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo: plugins/authenticator/shotwell/TumblrAuthenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -MT plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.Tpo -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo `test -f 'plugins/authenticator/shotwell/TumblrAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/TumblrAuthenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/TumblrAuthenticator.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-TumblrAuthenticator.lo `test -f 'plugins/authenticator/shotwell/TumblrAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/TumblrAuthenticator.c
+
 plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo: plugins/authenticator/resource.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -MT plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo -MD -MP -MF plugins/authenticator/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-resource.Tpo -c -o plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo `test -f 'plugins/authenticator/resource.c' || echo '$(srcdir)/'`plugins/authenticator/resource.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-resource.Tpo plugins/authenticator/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-resource.Plo
@@ -3097,6 +3159,13 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo: plugi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo `test -f 'plugins/common/RESTSupport.c' || echo '$(srcdir)/'`plugins/common/RESTSupport.c
 
+plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo: plugins/common/OAuth1Support.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -MT plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo -MD -MP -MF plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-OAuth1Support.Tpo -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo `test -f 'plugins/common/OAuth1Support.c' || echo '$(srcdir)/'`plugins/common/OAuth1Support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-OAuth1Support.Tpo plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-OAuth1Support.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/common/OAuth1Support.c' object='plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-OAuth1Support.lo `test -f 'plugins/common/OAuth1Support.c' || echo '$(srcdir)/'`plugins/common/OAuth1Support.c
+
 plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo: plugins/common/Resources.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -MT plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo -MD -MP -MF plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Tpo -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo `test -f 'plugins/common/Resources.c' || echo '$(srcdir)/'`plugins/common/Resources.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Tpo plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Plo
@@ -3118,111 +3187,6 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo: plugi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo `test -f 'plugins/common/BuilderPane.c' || echo '$(srcdir)/'`plugins/common/BuilderPane.c
 
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo: plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotDatabaseBehavior.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo: plugins/shotwell-data-imports/FSpotDatabaseTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotDatabaseTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo: plugins/shotwell-data-imports/FSpotDatabase.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabase.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabase.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotDatabase.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabase.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabase.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo: plugins/shotwell-data-imports/FSpotImporter.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo `test -f 'plugins/shotwell-data-imports/FSpotImporter.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotImporter.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotImporter.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotImporter.lo `test -f 'plugins/shotwell-data-imports/FSpotImporter.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotImporter.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo: plugins/shotwell-data-imports/FSpotMetaTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo `test -f 'plugins/shotwell-data-imports/FSpotMetaTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotMetaTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotMetaTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotMetaTable.lo `test -f 'plugins/shotwell-data-imports/FSpotMetaTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotMetaTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo: plugins/shotwell-data-imports/FSpotPhotosTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotosTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotosTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotPhotosTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotosTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotosTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotosTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo: plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotoTagsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotPhotoTagsTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoTagsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotoTagsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo: plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotPhotoVersionsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo: plugins/shotwell-data-imports/FSpotRollsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotRollsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotRollsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotRollsTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotRollsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotRollsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotRollsTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo: plugins/shotwell-data-imports/FSpotTableBehavior.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotTableBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotTableBehavior.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotTableBehavior.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTableBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotTableBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotTableBehavior.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo: plugins/shotwell-data-imports/FSpotTagsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotTagsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotTagsTable.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/FSpotTagsTable.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotTagsTable.lo `test -f 'plugins/shotwell-data-imports/FSpotTagsTable.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotTagsTable.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo: plugins/shotwell-data-imports/shotwell-data-imports.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo `test -f 'plugins/shotwell-data-imports/shotwell-data-imports.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/shotwell-data-imports.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/shotwell-data-imports.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.lo `test -f 'plugins/shotwell-data-imports/shotwell-data-imports.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/shotwell-data-imports.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo: plugins/shotwell-data-imports/SqliteSupport.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo `test -f 'plugins/shotwell-data-imports/SqliteSupport.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/SqliteSupport.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/SqliteSupport.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-SqliteSupport.lo `test -f 'plugins/shotwell-data-imports/SqliteSupport.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/SqliteSupport.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo: plugins/shotwell-data-imports/VersionNumber.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo `test -f 'plugins/shotwell-data-imports/VersionNumber.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/VersionNumber.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/VersionNumber.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-VersionNumber.lo `test -f 'plugins/shotwell-data-imports/VersionNumber.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/VersionNumber.c
-
-plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo: plugins/shotwell-data-imports/resource.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo `test -f 'plugins/shotwell-data-imports/resource.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/resource.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-data-imports/resource.c' object='plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-resource.lo `test -f 'plugins/shotwell-data-imports/resource.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/resource.c
-
 plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo: plugins/shotwell-publishing-extras/GalleryConnector.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo `test -f 'plugins/shotwell-publishing-extras/GalleryConnector.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/GalleryConnector.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Plo
@@ -3244,13 +3208,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo `test -f 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
 
-plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: plugins/shotwell-publishing-extras/TumblrPublishing.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-publishing-extras/TumblrPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c
-
 plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: plugins/shotwell-publishing-extras/YandexPublishing.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo
@@ -3293,6 +3250,13 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-F
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c
 
+plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo: plugins/shotwell-publishing/TumblrPublishing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/TumblrPublishing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/shotwell-publishing/TumblrPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/TumblrPublishing.c
+
 plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: plugins/shotwell-publishing/YouTubePublishing.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo
@@ -3398,6 +3362,27 @@ plugins/shotwell-transitions/plugins_shotwell_transitions_shotwell_transitions_l
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_transitions_shotwell_transitions_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-transitions/plugins_shotwell_transitions_shotwell_transitions_la-resource.lo `test -f 'plugins/shotwell-transitions/resource.c' || echo '$(srcdir)/'`plugins/shotwell-transitions/resource.c
 
+src/src_libgraphics_processor_la-ColorTransformation.lo: src/ColorTransformation.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -MT src/src_libgraphics_processor_la-ColorTransformation.lo -MD -MP -MF src/$(DEPDIR)/src_libgraphics_processor_la-ColorTransformation.Tpo -c -o src/src_libgraphics_processor_la-ColorTransformation.lo `test -f 'src/ColorTransformation.c' || echo '$(srcdir)/'`src/ColorTransformation.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libgraphics_processor_la-ColorTransformation.Tpo src/$(DEPDIR)/src_libgraphics_processor_la-ColorTransformation.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ColorTransformation.c' object='src/src_libgraphics_processor_la-ColorTransformation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -c -o src/src_libgraphics_processor_la-ColorTransformation.lo `test -f 'src/ColorTransformation.c' || echo '$(srcdir)/'`src/ColorTransformation.c
+
+src/util/src_libgraphics_processor_la-KeyValueMap.lo: src/util/KeyValueMap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -MT src/util/src_libgraphics_processor_la-KeyValueMap.lo -MD -MP -MF src/util/$(DEPDIR)/src_libgraphics_processor_la-KeyValueMap.Tpo -c -o src/util/src_libgraphics_processor_la-KeyValueMap.lo `test -f 'src/util/KeyValueMap.c' || echo '$(srcdir)/'`src/util/KeyValueMap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/util/$(DEPDIR)/src_libgraphics_processor_la-KeyValueMap.Tpo src/util/$(DEPDIR)/src_libgraphics_processor_la-KeyValueMap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/util/KeyValueMap.c' object='src/util/src_libgraphics_processor_la-KeyValueMap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -c -o src/util/src_libgraphics_processor_la-KeyValueMap.lo `test -f 'src/util/KeyValueMap.c' || echo '$(srcdir)/'`src/util/KeyValueMap.c
+
+src/src_libgraphics_processor_la-_transformation.lo: src/_transformation.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -MT src/src_libgraphics_processor_la-_transformation.lo -MD -MP -MF src/$(DEPDIR)/src_libgraphics_processor_la-_transformation.Tpo -c -o src/src_libgraphics_processor_la-_transformation.lo `test -f 'src/_transformation.c' || echo '$(srcdir)/'`src/_transformation.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libgraphics_processor_la-_transformation.Tpo src/$(DEPDIR)/src_libgraphics_processor_la-_transformation.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/_transformation.c' object='src/src_libgraphics_processor_la-_transformation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_libgraphics_processor_la_CFLAGS) $(CFLAGS) -c -o src/src_libgraphics_processor_la-_transformation.lo `test -f 'src/_transformation.c' || echo '$(srcdir)/'`src/_transformation.c
+
 src/plugins/src_plugins_libplugin_la-SpitInterfaces.lo: src/plugins/SpitInterfaces.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_plugins_libplugin_la_CFLAGS) $(CFLAGS) -MT src/plugins/src_plugins_libplugin_la-SpitInterfaces.lo -MD -MP -MF src/plugins/$(DEPDIR)/src_plugins_libplugin_la-SpitInterfaces.Tpo -c -o src/plugins/src_plugins_libplugin_la-SpitInterfaces.lo `test -f 'src/plugins/SpitInterfaces.c' || echo '$(srcdir)/'`src/plugins/SpitInterfaces.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/plugins/$(DEPDIR)/src_plugins_libplugin_la-SpitInterfaces.Tpo src/plugins/$(DEPDIR)/src_plugins_libplugin_la-SpitInterfaces.Plo
@@ -3524,20 +3509,6 @@ src/util/shotwell-system.obj: src/util/system.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/util/shotwell-system.obj `if test -f 'src/util/system.c'; then $(CYGPATH_W) 'src/util/system.c'; else $(CYGPATH_W) '$(srcdir)/src/util/system.c'; fi`
 
-src/util/shotwell-KeyValueMap.o: src/util/KeyValueMap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/util/shotwell-KeyValueMap.o -MD -MP -MF src/util/$(DEPDIR)/shotwell-KeyValueMap.Tpo -c -o src/util/shotwell-KeyValueMap.o `test -f 'src/util/KeyValueMap.c' || echo '$(srcdir)/'`src/util/KeyValueMap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/util/$(DEPDIR)/shotwell-KeyValueMap.Tpo src/util/$(DEPDIR)/shotwell-KeyValueMap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/util/KeyValueMap.c' object='src/util/shotwell-KeyValueMap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/util/shotwell-KeyValueMap.o `test -f 'src/util/KeyValueMap.c' || echo '$(srcdir)/'`src/util/KeyValueMap.c
-
-src/util/shotwell-KeyValueMap.obj: src/util/KeyValueMap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/util/shotwell-KeyValueMap.obj -MD -MP -MF src/util/$(DEPDIR)/shotwell-KeyValueMap.Tpo -c -o src/util/shotwell-KeyValueMap.obj `if test -f 'src/util/KeyValueMap.c'; then $(CYGPATH_W) 'src/util/KeyValueMap.c'; else $(CYGPATH_W) '$(srcdir)/src/util/KeyValueMap.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/util/$(DEPDIR)/shotwell-KeyValueMap.Tpo src/util/$(DEPDIR)/shotwell-KeyValueMap.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/util/KeyValueMap.c' object='src/util/shotwell-KeyValueMap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/util/shotwell-KeyValueMap.obj `if test -f 'src/util/KeyValueMap.c'; then $(CYGPATH_W) 'src/util/KeyValueMap.c'; else $(CYGPATH_W) '$(srcdir)/src/util/KeyValueMap.c'; fi`
-
 src/util/shotwell-ui.o: src/util/ui.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/util/shotwell-ui.o -MD -MP -MF src/util/$(DEPDIR)/shotwell-ui.Tpo -c -o src/util/shotwell-ui.o `test -f 'src/util/ui.c' || echo '$(srcdir)/'`src/util/ui.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/util/$(DEPDIR)/shotwell-ui.Tpo src/util/$(DEPDIR)/shotwell-ui.Po
@@ -3734,6 +3705,146 @@ src/db/shotwell-SavedSearchDBTable.obj: src/db/SavedSearchDBTable.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/db/shotwell-SavedSearchDBTable.obj `if test -f 'src/db/SavedSearchDBTable.c'; then $(CYGPATH_W) 'src/db/SavedSearchDBTable.c'; else $(CYGPATH_W) '$(srcdir)/src/db/SavedSearchDBTable.c'; fi`
 
+src/dialogs/shotwell-Preferences.o: src/dialogs/Preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-Preferences.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-Preferences.Tpo -c -o src/dialogs/shotwell-Preferences.o `test -f 'src/dialogs/Preferences.c' || echo '$(srcdir)/'`src/dialogs/Preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-Preferences.Tpo src/dialogs/$(DEPDIR)/shotwell-Preferences.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/Preferences.c' object='src/dialogs/shotwell-Preferences.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-Preferences.o `test -f 'src/dialogs/Preferences.c' || echo '$(srcdir)/'`src/dialogs/Preferences.c
+
+src/dialogs/shotwell-Preferences.obj: src/dialogs/Preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-Preferences.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-Preferences.Tpo -c -o src/dialogs/shotwell-Preferences.obj `if test -f 'src/dialogs/Preferences.c'; then $(CYGPATH_W) 'src/dialogs/Preferences.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/Preferences.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-Preferences.Tpo src/dialogs/$(DEPDIR)/shotwell-Preferences.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/Preferences.c' object='src/dialogs/shotwell-Preferences.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-Preferences.obj `if test -f 'src/dialogs/Preferences.c'; then $(CYGPATH_W) 'src/dialogs/Preferences.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/Preferences.c'; fi`
+
+src/dialogs/shotwell-EntryMultiCompletion.o: src/dialogs/EntryMultiCompletion.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-EntryMultiCompletion.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Tpo -c -o src/dialogs/shotwell-EntryMultiCompletion.o `test -f 'src/dialogs/EntryMultiCompletion.c' || echo '$(srcdir)/'`src/dialogs/EntryMultiCompletion.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Tpo src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/EntryMultiCompletion.c' object='src/dialogs/shotwell-EntryMultiCompletion.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-EntryMultiCompletion.o `test -f 'src/dialogs/EntryMultiCompletion.c' || echo '$(srcdir)/'`src/dialogs/EntryMultiCompletion.c
+
+src/dialogs/shotwell-EntryMultiCompletion.obj: src/dialogs/EntryMultiCompletion.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-EntryMultiCompletion.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Tpo -c -o src/dialogs/shotwell-EntryMultiCompletion.obj `if test -f 'src/dialogs/EntryMultiCompletion.c'; then $(CYGPATH_W) 'src/dialogs/EntryMultiCompletion.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/EntryMultiCompletion.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Tpo src/dialogs/$(DEPDIR)/shotwell-EntryMultiCompletion.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/EntryMultiCompletion.c' object='src/dialogs/shotwell-EntryMultiCompletion.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-EntryMultiCompletion.obj `if test -f 'src/dialogs/EntryMultiCompletion.c'; then $(CYGPATH_W) 'src/dialogs/EntryMultiCompletion.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/EntryMultiCompletion.c'; fi`
+
+src/dialogs/shotwell-ExportDialog.o: src/dialogs/ExportDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-ExportDialog.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Tpo -c -o src/dialogs/shotwell-ExportDialog.o `test -f 'src/dialogs/ExportDialog.c' || echo '$(srcdir)/'`src/dialogs/ExportDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/ExportDialog.c' object='src/dialogs/shotwell-ExportDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-ExportDialog.o `test -f 'src/dialogs/ExportDialog.c' || echo '$(srcdir)/'`src/dialogs/ExportDialog.c
+
+src/dialogs/shotwell-ExportDialog.obj: src/dialogs/ExportDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-ExportDialog.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Tpo -c -o src/dialogs/shotwell-ExportDialog.obj `if test -f 'src/dialogs/ExportDialog.c'; then $(CYGPATH_W) 'src/dialogs/ExportDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/ExportDialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-ExportDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/ExportDialog.c' object='src/dialogs/shotwell-ExportDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-ExportDialog.obj `if test -f 'src/dialogs/ExportDialog.c'; then $(CYGPATH_W) 'src/dialogs/ExportDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/ExportDialog.c'; fi`
+
+src/dialogs/shotwell-TextEntry.o: src/dialogs/TextEntry.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-TextEntry.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-TextEntry.Tpo -c -o src/dialogs/shotwell-TextEntry.o `test -f 'src/dialogs/TextEntry.c' || echo '$(srcdir)/'`src/dialogs/TextEntry.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-TextEntry.Tpo src/dialogs/$(DEPDIR)/shotwell-TextEntry.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/TextEntry.c' object='src/dialogs/shotwell-TextEntry.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-TextEntry.o `test -f 'src/dialogs/TextEntry.c' || echo '$(srcdir)/'`src/dialogs/TextEntry.c
+
+src/dialogs/shotwell-TextEntry.obj: src/dialogs/TextEntry.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-TextEntry.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-TextEntry.Tpo -c -o src/dialogs/shotwell-TextEntry.obj `if test -f 'src/dialogs/TextEntry.c'; then $(CYGPATH_W) 'src/dialogs/TextEntry.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/TextEntry.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-TextEntry.Tpo src/dialogs/$(DEPDIR)/shotwell-TextEntry.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/TextEntry.c' object='src/dialogs/shotwell-TextEntry.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-TextEntry.obj `if test -f 'src/dialogs/TextEntry.c'; then $(CYGPATH_W) 'src/dialogs/TextEntry.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/TextEntry.c'; fi`
+
+src/dialogs/shotwell-WelcomeDialog.o: src/dialogs/WelcomeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-WelcomeDialog.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Tpo -c -o src/dialogs/shotwell-WelcomeDialog.o `test -f 'src/dialogs/WelcomeDialog.c' || echo '$(srcdir)/'`src/dialogs/WelcomeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/WelcomeDialog.c' object='src/dialogs/shotwell-WelcomeDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-WelcomeDialog.o `test -f 'src/dialogs/WelcomeDialog.c' || echo '$(srcdir)/'`src/dialogs/WelcomeDialog.c
+
+src/dialogs/shotwell-WelcomeDialog.obj: src/dialogs/WelcomeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-WelcomeDialog.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Tpo -c -o src/dialogs/shotwell-WelcomeDialog.obj `if test -f 'src/dialogs/WelcomeDialog.c'; then $(CYGPATH_W) 'src/dialogs/WelcomeDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/WelcomeDialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-WelcomeDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/WelcomeDialog.c' object='src/dialogs/shotwell-WelcomeDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-WelcomeDialog.obj `if test -f 'src/dialogs/WelcomeDialog.c'; then $(CYGPATH_W) 'src/dialogs/WelcomeDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/WelcomeDialog.c'; fi`
+
+src/dialogs/shotwell-MultiTextEntryDialog.o: src/dialogs/MultiTextEntryDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-MultiTextEntryDialog.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Tpo -c -o src/dialogs/shotwell-MultiTextEntryDialog.o `test -f 'src/dialogs/MultiTextEntryDialog.c' || echo '$(srcdir)/'`src/dialogs/MultiTextEntryDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/MultiTextEntryDialog.c' object='src/dialogs/shotwell-MultiTextEntryDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-MultiTextEntryDialog.o `test -f 'src/dialogs/MultiTextEntryDialog.c' || echo '$(srcdir)/'`src/dialogs/MultiTextEntryDialog.c
+
+src/dialogs/shotwell-MultiTextEntryDialog.obj: src/dialogs/MultiTextEntryDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-MultiTextEntryDialog.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Tpo -c -o src/dialogs/shotwell-MultiTextEntryDialog.obj `if test -f 'src/dialogs/MultiTextEntryDialog.c'; then $(CYGPATH_W) 'src/dialogs/MultiTextEntryDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/MultiTextEntryDialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-MultiTextEntryDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/MultiTextEntryDialog.c' object='src/dialogs/shotwell-MultiTextEntryDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-MultiTextEntryDialog.obj `if test -f 'src/dialogs/MultiTextEntryDialog.c'; then $(CYGPATH_W) 'src/dialogs/MultiTextEntryDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/MultiTextEntryDialog.c'; fi`
+
+src/dialogs/shotwell-AdjustDateTimeDialog.o: src/dialogs/AdjustDateTimeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-AdjustDateTimeDialog.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Tpo -c -o src/dialogs/shotwell-AdjustDateTimeDialog.o `test -f 'src/dialogs/AdjustDateTimeDialog.c' || echo '$(srcdir)/'`src/dialogs/AdjustDateTimeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/AdjustDateTimeDialog.c' object='src/dialogs/shotwell-AdjustDateTimeDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-AdjustDateTimeDialog.o `test -f 'src/dialogs/AdjustDateTimeDialog.c' || echo '$(srcdir)/'`src/dialogs/AdjustDateTimeDialog.c
+
+src/dialogs/shotwell-AdjustDateTimeDialog.obj: src/dialogs/AdjustDateTimeDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-AdjustDateTimeDialog.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Tpo -c -o src/dialogs/shotwell-AdjustDateTimeDialog.obj `if test -f 'src/dialogs/AdjustDateTimeDialog.c'; then $(CYGPATH_W) 'src/dialogs/AdjustDateTimeDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/AdjustDateTimeDialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-AdjustDateTimeDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/AdjustDateTimeDialog.c' object='src/dialogs/shotwell-AdjustDateTimeDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-AdjustDateTimeDialog.obj `if test -f 'src/dialogs/AdjustDateTimeDialog.c'; then $(CYGPATH_W) 'src/dialogs/AdjustDateTimeDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/AdjustDateTimeDialog.c'; fi`
+
+src/dialogs/shotwell-SetBackground.o: src/dialogs/SetBackground.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-SetBackground.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-SetBackground.Tpo -c -o src/dialogs/shotwell-SetBackground.o `test -f 'src/dialogs/SetBackground.c' || echo '$(srcdir)/'`src/dialogs/SetBackground.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-SetBackground.Tpo src/dialogs/$(DEPDIR)/shotwell-SetBackground.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/SetBackground.c' object='src/dialogs/shotwell-SetBackground.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-SetBackground.o `test -f 'src/dialogs/SetBackground.c' || echo '$(srcdir)/'`src/dialogs/SetBackground.c
+
+src/dialogs/shotwell-SetBackground.obj: src/dialogs/SetBackground.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-SetBackground.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-SetBackground.Tpo -c -o src/dialogs/shotwell-SetBackground.obj `if test -f 'src/dialogs/SetBackground.c'; then $(CYGPATH_W) 'src/dialogs/SetBackground.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/SetBackground.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-SetBackground.Tpo src/dialogs/$(DEPDIR)/shotwell-SetBackground.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/SetBackground.c' object='src/dialogs/shotwell-SetBackground.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-SetBackground.obj `if test -f 'src/dialogs/SetBackground.c'; then $(CYGPATH_W) 'src/dialogs/SetBackground.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/SetBackground.c'; fi`
+
+src/dialogs/shotwell-ProgressDialog.o: src/dialogs/ProgressDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-ProgressDialog.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Tpo -c -o src/dialogs/shotwell-ProgressDialog.o `test -f 'src/dialogs/ProgressDialog.c' || echo '$(srcdir)/'`src/dialogs/ProgressDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/ProgressDialog.c' object='src/dialogs/shotwell-ProgressDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-ProgressDialog.o `test -f 'src/dialogs/ProgressDialog.c' || echo '$(srcdir)/'`src/dialogs/ProgressDialog.c
+
+src/dialogs/shotwell-ProgressDialog.obj: src/dialogs/ProgressDialog.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-ProgressDialog.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Tpo -c -o src/dialogs/shotwell-ProgressDialog.obj `if test -f 'src/dialogs/ProgressDialog.c'; then $(CYGPATH_W) 'src/dialogs/ProgressDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/ProgressDialog.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Tpo src/dialogs/$(DEPDIR)/shotwell-ProgressDialog.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/ProgressDialog.c' object='src/dialogs/shotwell-ProgressDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-ProgressDialog.obj `if test -f 'src/dialogs/ProgressDialog.c'; then $(CYGPATH_W) 'src/dialogs/ProgressDialog.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/ProgressDialog.c'; fi`
+
+src/dialogs/shotwell-SetBackgroundSlideshow.o: src/dialogs/SetBackgroundSlideshow.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-SetBackgroundSlideshow.o -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Tpo -c -o src/dialogs/shotwell-SetBackgroundSlideshow.o `test -f 'src/dialogs/SetBackgroundSlideshow.c' || echo '$(srcdir)/'`src/dialogs/SetBackgroundSlideshow.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Tpo src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/SetBackgroundSlideshow.c' object='src/dialogs/shotwell-SetBackgroundSlideshow.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-SetBackgroundSlideshow.o `test -f 'src/dialogs/SetBackgroundSlideshow.c' || echo '$(srcdir)/'`src/dialogs/SetBackgroundSlideshow.c
+
+src/dialogs/shotwell-SetBackgroundSlideshow.obj: src/dialogs/SetBackgroundSlideshow.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/dialogs/shotwell-SetBackgroundSlideshow.obj -MD -MP -MF src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Tpo -c -o src/dialogs/shotwell-SetBackgroundSlideshow.obj `if test -f 'src/dialogs/SetBackgroundSlideshow.c'; then $(CYGPATH_W) 'src/dialogs/SetBackgroundSlideshow.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/SetBackgroundSlideshow.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Tpo src/dialogs/$(DEPDIR)/shotwell-SetBackgroundSlideshow.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/dialogs/SetBackgroundSlideshow.c' object='src/dialogs/shotwell-SetBackgroundSlideshow.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/dialogs/shotwell-SetBackgroundSlideshow.obj `if test -f 'src/dialogs/SetBackgroundSlideshow.c'; then $(CYGPATH_W) 'src/dialogs/SetBackgroundSlideshow.c'; else $(CYGPATH_W) '$(srcdir)/src/dialogs/SetBackgroundSlideshow.c'; fi`
+
 src/editing_tools/shotwell-EditingTools.o: src/editing_tools/EditingTools.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/editing_tools/shotwell-EditingTools.o -MD -MP -MF src/editing_tools/$(DEPDIR)/shotwell-EditingTools.Tpo -c -o src/editing_tools/shotwell-EditingTools.o `test -f 'src/editing_tools/EditingTools.c' || echo '$(srcdir)/'`src/editing_tools/EditingTools.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/editing_tools/$(DEPDIR)/shotwell-EditingTools.Tpo src/editing_tools/$(DEPDIR)/shotwell-EditingTools.Po
@@ -3748,6 +3859,20 @@ src/editing_tools/shotwell-EditingTools.obj: src/editing_tools/EditingTools.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/editing_tools/shotwell-EditingTools.obj `if test -f 'src/editing_tools/EditingTools.c'; then $(CYGPATH_W) 'src/editing_tools/EditingTools.c'; else $(CYGPATH_W) '$(srcdir)/src/editing_tools/EditingTools.c'; fi`
 
+src/editing_tools/shotwell-RGBHistogramManipulator.o: src/editing_tools/RGBHistogramManipulator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/editing_tools/shotwell-RGBHistogramManipulator.o -MD -MP -MF src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Tpo -c -o src/editing_tools/shotwell-RGBHistogramManipulator.o `test -f 'src/editing_tools/RGBHistogramManipulator.c' || echo '$(srcdir)/'`src/editing_tools/RGBHistogramManipulator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Tpo src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/editing_tools/RGBHistogramManipulator.c' object='src/editing_tools/shotwell-RGBHistogramManipulator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/editing_tools/shotwell-RGBHistogramManipulator.o `test -f 'src/editing_tools/RGBHistogramManipulator.c' || echo '$(srcdir)/'`src/editing_tools/RGBHistogramManipulator.c
+
+src/editing_tools/shotwell-RGBHistogramManipulator.obj: src/editing_tools/RGBHistogramManipulator.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/editing_tools/shotwell-RGBHistogramManipulator.obj -MD -MP -MF src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Tpo -c -o src/editing_tools/shotwell-RGBHistogramManipulator.obj `if test -f 'src/editing_tools/RGBHistogramManipulator.c'; then $(CYGPATH_W) 'src/editing_tools/RGBHistogramManipulator.c'; else $(CYGPATH_W) '$(srcdir)/src/editing_tools/RGBHistogramManipulator.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Tpo src/editing_tools/$(DEPDIR)/shotwell-RGBHistogramManipulator.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/editing_tools/RGBHistogramManipulator.c' object='src/editing_tools/shotwell-RGBHistogramManipulator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/editing_tools/shotwell-RGBHistogramManipulator.obj `if test -f 'src/editing_tools/RGBHistogramManipulator.c'; then $(CYGPATH_W) 'src/editing_tools/RGBHistogramManipulator.c'; else $(CYGPATH_W) '$(srcdir)/src/editing_tools/RGBHistogramManipulator.c'; fi`
+
 src/editing_tools/shotwell-StraightenTool.o: src/editing_tools/StraightenTool.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/editing_tools/shotwell-StraightenTool.o -MD -MP -MF src/editing_tools/$(DEPDIR)/shotwell-StraightenTool.Tpo -c -o src/editing_tools/shotwell-StraightenTool.o `test -f 'src/editing_tools/StraightenTool.c' || echo '$(srcdir)/'`src/editing_tools/StraightenTool.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/editing_tools/$(DEPDIR)/shotwell-StraightenTool.Tpo src/editing_tools/$(DEPDIR)/shotwell-StraightenTool.Po
@@ -4084,19 +4209,19 @@ src/library/shotwell-LibraryWindow.obj: src/library/LibraryWindow.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/library/shotwell-LibraryWindow.obj `if test -f 'src/library/LibraryWindow.c'; then $(CYGPATH_W) 'src/library/LibraryWindow.c'; else $(CYGPATH_W) '$(srcdir)/src/library/LibraryWindow.c'; fi`
 
-src/library/shotwell-Branch.o: src/library/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/library/shotwell-Branch.o -MD -MP -MF src/library/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/library/shotwell-Branch.o `test -f 'src/library/Branch.c' || echo '$(srcdir)/'`src/library/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/library/$(DEPDIR)/shotwell-Branch.Tpo src/library/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/library/Branch.c' object='src/library/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/library/shotwell-LibraryBranch.o: src/library/LibraryBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/library/shotwell-LibraryBranch.o -MD -MP -MF src/library/$(DEPDIR)/shotwell-LibraryBranch.Tpo -c -o src/library/shotwell-LibraryBranch.o `test -f 'src/library/LibraryBranch.c' || echo '$(srcdir)/'`src/library/LibraryBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/library/$(DEPDIR)/shotwell-LibraryBranch.Tpo src/library/$(DEPDIR)/shotwell-LibraryBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/library/LibraryBranch.c' object='src/library/shotwell-LibraryBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/library/shotwell-Branch.o `test -f 'src/library/Branch.c' || echo '$(srcdir)/'`src/library/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/library/shotwell-LibraryBranch.o `test -f 'src/library/LibraryBranch.c' || echo '$(srcdir)/'`src/library/LibraryBranch.c
 
-src/library/shotwell-Branch.obj: src/library/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/library/shotwell-Branch.obj -MD -MP -MF src/library/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/library/shotwell-Branch.obj `if test -f 'src/library/Branch.c'; then $(CYGPATH_W) 'src/library/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/library/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/library/$(DEPDIR)/shotwell-Branch.Tpo src/library/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/library/Branch.c' object='src/library/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/library/shotwell-LibraryBranch.obj: src/library/LibraryBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/library/shotwell-LibraryBranch.obj -MD -MP -MF src/library/$(DEPDIR)/shotwell-LibraryBranch.Tpo -c -o src/library/shotwell-LibraryBranch.obj `if test -f 'src/library/LibraryBranch.c'; then $(CYGPATH_W) 'src/library/LibraryBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/library/LibraryBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/library/$(DEPDIR)/shotwell-LibraryBranch.Tpo src/library/$(DEPDIR)/shotwell-LibraryBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/library/LibraryBranch.c' object='src/library/shotwell-LibraryBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/library/shotwell-Branch.obj `if test -f 'src/library/Branch.c'; then $(CYGPATH_W) 'src/library/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/library/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/library/shotwell-LibraryBranch.obj `if test -f 'src/library/LibraryBranch.c'; then $(CYGPATH_W) 'src/library/LibraryBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/library/LibraryBranch.c'; fi`
 
 src/library/shotwell-TrashSidebarEntry.o: src/library/TrashSidebarEntry.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/library/shotwell-TrashSidebarEntry.o -MD -MP -MF src/library/$(DEPDIR)/shotwell-TrashSidebarEntry.Tpo -c -o src/library/shotwell-TrashSidebarEntry.o `test -f 'src/library/TrashSidebarEntry.c' || echo '$(srcdir)/'`src/library/TrashSidebarEntry.c
@@ -4630,19 +4755,19 @@ src/events/shotwell-Events.obj: src/events/Events.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/events/shotwell-Events.obj `if test -f 'src/events/Events.c'; then $(CYGPATH_W) 'src/events/Events.c'; else $(CYGPATH_W) '$(srcdir)/src/events/Events.c'; fi`
 
-src/events/shotwell-Branch.o: src/events/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/events/shotwell-Branch.o -MD -MP -MF src/events/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/events/shotwell-Branch.o `test -f 'src/events/Branch.c' || echo '$(srcdir)/'`src/events/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/events/$(DEPDIR)/shotwell-Branch.Tpo src/events/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/events/Branch.c' object='src/events/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/events/shotwell-EventsBranch.o: src/events/EventsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/events/shotwell-EventsBranch.o -MD -MP -MF src/events/$(DEPDIR)/shotwell-EventsBranch.Tpo -c -o src/events/shotwell-EventsBranch.o `test -f 'src/events/EventsBranch.c' || echo '$(srcdir)/'`src/events/EventsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/events/$(DEPDIR)/shotwell-EventsBranch.Tpo src/events/$(DEPDIR)/shotwell-EventsBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/events/EventsBranch.c' object='src/events/shotwell-EventsBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/events/shotwell-Branch.o `test -f 'src/events/Branch.c' || echo '$(srcdir)/'`src/events/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/events/shotwell-EventsBranch.o `test -f 'src/events/EventsBranch.c' || echo '$(srcdir)/'`src/events/EventsBranch.c
 
-src/events/shotwell-Branch.obj: src/events/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/events/shotwell-Branch.obj -MD -MP -MF src/events/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/events/shotwell-Branch.obj `if test -f 'src/events/Branch.c'; then $(CYGPATH_W) 'src/events/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/events/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/events/$(DEPDIR)/shotwell-Branch.Tpo src/events/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/events/Branch.c' object='src/events/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/events/shotwell-EventsBranch.obj: src/events/EventsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/events/shotwell-EventsBranch.obj -MD -MP -MF src/events/$(DEPDIR)/shotwell-EventsBranch.Tpo -c -o src/events/shotwell-EventsBranch.obj `if test -f 'src/events/EventsBranch.c'; then $(CYGPATH_W) 'src/events/EventsBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/events/EventsBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/events/$(DEPDIR)/shotwell-EventsBranch.Tpo src/events/$(DEPDIR)/shotwell-EventsBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/events/EventsBranch.c' object='src/events/shotwell-EventsBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/events/shotwell-Branch.obj `if test -f 'src/events/Branch.c'; then $(CYGPATH_W) 'src/events/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/events/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/events/shotwell-EventsBranch.obj `if test -f 'src/events/EventsBranch.c'; then $(CYGPATH_W) 'src/events/EventsBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/events/EventsBranch.c'; fi`
 
 src/events/shotwell-EventsDirectoryPage.o: src/events/EventsDirectoryPage.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/events/shotwell-EventsDirectoryPage.o -MD -MP -MF src/events/$(DEPDIR)/shotwell-EventsDirectoryPage.Tpo -c -o src/events/shotwell-EventsDirectoryPage.o `test -f 'src/events/EventsDirectoryPage.c' || echo '$(srcdir)/'`src/events/EventsDirectoryPage.c
@@ -4700,19 +4825,19 @@ src/tags/shotwell-Tags.obj: src/tags/Tags.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/tags/shotwell-Tags.obj `if test -f 'src/tags/Tags.c'; then $(CYGPATH_W) 'src/tags/Tags.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/Tags.c'; fi`
 
-src/tags/shotwell-Branch.o: src/tags/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/tags/shotwell-Branch.o -MD -MP -MF src/tags/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/tags/shotwell-Branch.o `test -f 'src/tags/Branch.c' || echo '$(srcdir)/'`src/tags/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/shotwell-Branch.Tpo src/tags/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/Branch.c' object='src/tags/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/tags/shotwell-TagsBranch.o: src/tags/TagsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/tags/shotwell-TagsBranch.o -MD -MP -MF src/tags/$(DEPDIR)/shotwell-TagsBranch.Tpo -c -o src/tags/shotwell-TagsBranch.o `test -f 'src/tags/TagsBranch.c' || echo '$(srcdir)/'`src/tags/TagsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/shotwell-TagsBranch.Tpo src/tags/$(DEPDIR)/shotwell-TagsBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/TagsBranch.c' object='src/tags/shotwell-TagsBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/tags/shotwell-Branch.o `test -f 'src/tags/Branch.c' || echo '$(srcdir)/'`src/tags/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/tags/shotwell-TagsBranch.o `test -f 'src/tags/TagsBranch.c' || echo '$(srcdir)/'`src/tags/TagsBranch.c
 
-src/tags/shotwell-Branch.obj: src/tags/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/tags/shotwell-Branch.obj -MD -MP -MF src/tags/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/tags/shotwell-Branch.obj `if test -f 'src/tags/Branch.c'; then $(CYGPATH_W) 'src/tags/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/shotwell-Branch.Tpo src/tags/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/Branch.c' object='src/tags/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/tags/shotwell-TagsBranch.obj: src/tags/TagsBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/tags/shotwell-TagsBranch.obj -MD -MP -MF src/tags/$(DEPDIR)/shotwell-TagsBranch.Tpo -c -o src/tags/shotwell-TagsBranch.obj `if test -f 'src/tags/TagsBranch.c'; then $(CYGPATH_W) 'src/tags/TagsBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/TagsBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/tags/$(DEPDIR)/shotwell-TagsBranch.Tpo src/tags/$(DEPDIR)/shotwell-TagsBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/tags/TagsBranch.c' object='src/tags/shotwell-TagsBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/tags/shotwell-Branch.obj `if test -f 'src/tags/Branch.c'; then $(CYGPATH_W) 'src/tags/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/tags/shotwell-TagsBranch.obj `if test -f 'src/tags/TagsBranch.c'; then $(CYGPATH_W) 'src/tags/TagsBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/tags/TagsBranch.c'; fi`
 
 src/tags/shotwell-TagPage.o: src/tags/TagPage.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/tags/shotwell-TagPage.o -MD -MP -MF src/tags/$(DEPDIR)/shotwell-TagPage.Tpo -c -o src/tags/shotwell-TagPage.o `test -f 'src/tags/TagPage.c' || echo '$(srcdir)/'`src/tags/TagPage.c
@@ -4770,19 +4895,19 @@ src/camera/shotwell-Camera.obj: src/camera/Camera.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/camera/shotwell-Camera.obj `if test -f 'src/camera/Camera.c'; then $(CYGPATH_W) 'src/camera/Camera.c'; else $(CYGPATH_W) '$(srcdir)/src/camera/Camera.c'; fi`
 
-src/camera/shotwell-Branch.o: src/camera/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/camera/shotwell-Branch.o -MD -MP -MF src/camera/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/camera/shotwell-Branch.o `test -f 'src/camera/Branch.c' || echo '$(srcdir)/'`src/camera/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/camera/$(DEPDIR)/shotwell-Branch.Tpo src/camera/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/camera/Branch.c' object='src/camera/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/camera/shotwell-CameraBranch.o: src/camera/CameraBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/camera/shotwell-CameraBranch.o -MD -MP -MF src/camera/$(DEPDIR)/shotwell-CameraBranch.Tpo -c -o src/camera/shotwell-CameraBranch.o `test -f 'src/camera/CameraBranch.c' || echo '$(srcdir)/'`src/camera/CameraBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/camera/$(DEPDIR)/shotwell-CameraBranch.Tpo src/camera/$(DEPDIR)/shotwell-CameraBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/camera/CameraBranch.c' object='src/camera/shotwell-CameraBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/camera/shotwell-Branch.o `test -f 'src/camera/Branch.c' || echo '$(srcdir)/'`src/camera/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/camera/shotwell-CameraBranch.o `test -f 'src/camera/CameraBranch.c' || echo '$(srcdir)/'`src/camera/CameraBranch.c
 
-src/camera/shotwell-Branch.obj: src/camera/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/camera/shotwell-Branch.obj -MD -MP -MF src/camera/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/camera/shotwell-Branch.obj `if test -f 'src/camera/Branch.c'; then $(CYGPATH_W) 'src/camera/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/camera/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/camera/$(DEPDIR)/shotwell-Branch.Tpo src/camera/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/camera/Branch.c' object='src/camera/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/camera/shotwell-CameraBranch.obj: src/camera/CameraBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/camera/shotwell-CameraBranch.obj -MD -MP -MF src/camera/$(DEPDIR)/shotwell-CameraBranch.Tpo -c -o src/camera/shotwell-CameraBranch.obj `if test -f 'src/camera/CameraBranch.c'; then $(CYGPATH_W) 'src/camera/CameraBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/camera/CameraBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/camera/$(DEPDIR)/shotwell-CameraBranch.Tpo src/camera/$(DEPDIR)/shotwell-CameraBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/camera/CameraBranch.c' object='src/camera/shotwell-CameraBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/camera/shotwell-Branch.obj `if test -f 'src/camera/Branch.c'; then $(CYGPATH_W) 'src/camera/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/camera/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/camera/shotwell-CameraBranch.obj `if test -f 'src/camera/CameraBranch.c'; then $(CYGPATH_W) 'src/camera/CameraBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/camera/CameraBranch.c'; fi`
 
 src/camera/shotwell-CameraTable.o: src/camera/CameraTable.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/camera/shotwell-CameraTable.o -MD -MP -MF src/camera/$(DEPDIR)/shotwell-CameraTable.Tpo -c -o src/camera/shotwell-CameraTable.o `test -f 'src/camera/CameraTable.c' || echo '$(srcdir)/'`src/camera/CameraTable.c
@@ -4840,19 +4965,19 @@ src/searches/shotwell-Searches.obj: src/searches/Searches.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/searches/shotwell-Searches.obj `if test -f 'src/searches/Searches.c'; then $(CYGPATH_W) 'src/searches/Searches.c'; else $(CYGPATH_W) '$(srcdir)/src/searches/Searches.c'; fi`
 
-src/searches/shotwell-Branch.o: src/searches/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/searches/shotwell-Branch.o -MD -MP -MF src/searches/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/searches/shotwell-Branch.o `test -f 'src/searches/Branch.c' || echo '$(srcdir)/'`src/searches/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/searches/$(DEPDIR)/shotwell-Branch.Tpo src/searches/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/searches/Branch.c' object='src/searches/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/searches/shotwell-SearchesBranch.o: src/searches/SearchesBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/searches/shotwell-SearchesBranch.o -MD -MP -MF src/searches/$(DEPDIR)/shotwell-SearchesBranch.Tpo -c -o src/searches/shotwell-SearchesBranch.o `test -f 'src/searches/SearchesBranch.c' || echo '$(srcdir)/'`src/searches/SearchesBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/searches/$(DEPDIR)/shotwell-SearchesBranch.Tpo src/searches/$(DEPDIR)/shotwell-SearchesBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/searches/SearchesBranch.c' object='src/searches/shotwell-SearchesBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/searches/shotwell-Branch.o `test -f 'src/searches/Branch.c' || echo '$(srcdir)/'`src/searches/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/searches/shotwell-SearchesBranch.o `test -f 'src/searches/SearchesBranch.c' || echo '$(srcdir)/'`src/searches/SearchesBranch.c
 
-src/searches/shotwell-Branch.obj: src/searches/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/searches/shotwell-Branch.obj -MD -MP -MF src/searches/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/searches/shotwell-Branch.obj `if test -f 'src/searches/Branch.c'; then $(CYGPATH_W) 'src/searches/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/searches/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/searches/$(DEPDIR)/shotwell-Branch.Tpo src/searches/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/searches/Branch.c' object='src/searches/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/searches/shotwell-SearchesBranch.obj: src/searches/SearchesBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/searches/shotwell-SearchesBranch.obj -MD -MP -MF src/searches/$(DEPDIR)/shotwell-SearchesBranch.Tpo -c -o src/searches/shotwell-SearchesBranch.obj `if test -f 'src/searches/SearchesBranch.c'; then $(CYGPATH_W) 'src/searches/SearchesBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/searches/SearchesBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/searches/$(DEPDIR)/shotwell-SearchesBranch.Tpo src/searches/$(DEPDIR)/shotwell-SearchesBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/searches/SearchesBranch.c' object='src/searches/shotwell-SearchesBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/searches/shotwell-Branch.obj `if test -f 'src/searches/Branch.c'; then $(CYGPATH_W) 'src/searches/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/searches/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/searches/shotwell-SearchesBranch.obj `if test -f 'src/searches/SearchesBranch.c'; then $(CYGPATH_W) 'src/searches/SearchesBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/searches/SearchesBranch.c'; fi`
 
 src/searches/shotwell-SearchBoolean.o: src/searches/SearchBoolean.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/searches/shotwell-SearchBoolean.o -MD -MP -MF src/searches/$(DEPDIR)/shotwell-SearchBoolean.Tpo -c -o src/searches/shotwell-SearchBoolean.o `test -f 'src/searches/SearchBoolean.c' || echo '$(srcdir)/'`src/searches/SearchBoolean.c
@@ -5022,33 +5147,33 @@ src/folders/shotwell-Folders.obj: src/folders/Folders.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-Folders.obj `if test -f 'src/folders/Folders.c'; then $(CYGPATH_W) 'src/folders/Folders.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/Folders.c'; fi`
 
-src/folders/shotwell-Branch.o: src/folders/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-Branch.o -MD -MP -MF src/folders/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/folders/shotwell-Branch.o `test -f 'src/folders/Branch.c' || echo '$(srcdir)/'`src/folders/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-Branch.Tpo src/folders/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/Branch.c' object='src/folders/shotwell-Branch.o' libtool=no @AMDEPBACKSLASH@
+src/folders/shotwell-FoldersBranch.o: src/folders/FoldersBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-FoldersBranch.o -MD -MP -MF src/folders/$(DEPDIR)/shotwell-FoldersBranch.Tpo -c -o src/folders/shotwell-FoldersBranch.o `test -f 'src/folders/FoldersBranch.c' || echo '$(srcdir)/'`src/folders/FoldersBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-FoldersBranch.Tpo src/folders/$(DEPDIR)/shotwell-FoldersBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/FoldersBranch.c' object='src/folders/shotwell-FoldersBranch.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-Branch.o `test -f 'src/folders/Branch.c' || echo '$(srcdir)/'`src/folders/Branch.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-FoldersBranch.o `test -f 'src/folders/FoldersBranch.c' || echo '$(srcdir)/'`src/folders/FoldersBranch.c
 
-src/folders/shotwell-Branch.obj: src/folders/Branch.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-Branch.obj -MD -MP -MF src/folders/$(DEPDIR)/shotwell-Branch.Tpo -c -o src/folders/shotwell-Branch.obj `if test -f 'src/folders/Branch.c'; then $(CYGPATH_W) 'src/folders/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/Branch.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-Branch.Tpo src/folders/$(DEPDIR)/shotwell-Branch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/Branch.c' object='src/folders/shotwell-Branch.obj' libtool=no @AMDEPBACKSLASH@
+src/folders/shotwell-FoldersBranch.obj: src/folders/FoldersBranch.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-FoldersBranch.obj -MD -MP -MF src/folders/$(DEPDIR)/shotwell-FoldersBranch.Tpo -c -o src/folders/shotwell-FoldersBranch.obj `if test -f 'src/folders/FoldersBranch.c'; then $(CYGPATH_W) 'src/folders/FoldersBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/FoldersBranch.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-FoldersBranch.Tpo src/folders/$(DEPDIR)/shotwell-FoldersBranch.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/FoldersBranch.c' object='src/folders/shotwell-FoldersBranch.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-Branch.obj `if test -f 'src/folders/Branch.c'; then $(CYGPATH_W) 'src/folders/Branch.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/Branch.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-FoldersBranch.obj `if test -f 'src/folders/FoldersBranch.c'; then $(CYGPATH_W) 'src/folders/FoldersBranch.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/FoldersBranch.c'; fi`
 
-src/folders/shotwell-Page.o: src/folders/Page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-Page.o -MD -MP -MF src/folders/$(DEPDIR)/shotwell-Page.Tpo -c -o src/folders/shotwell-Page.o `test -f 'src/folders/Page.c' || echo '$(srcdir)/'`src/folders/Page.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-Page.Tpo src/folders/$(DEPDIR)/shotwell-Page.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/Page.c' object='src/folders/shotwell-Page.o' libtool=no @AMDEPBACKSLASH@
+src/folders/shotwell-FoldersPage.o: src/folders/FoldersPage.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-FoldersPage.o -MD -MP -MF src/folders/$(DEPDIR)/shotwell-FoldersPage.Tpo -c -o src/folders/shotwell-FoldersPage.o `test -f 'src/folders/FoldersPage.c' || echo '$(srcdir)/'`src/folders/FoldersPage.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-FoldersPage.Tpo src/folders/$(DEPDIR)/shotwell-FoldersPage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/FoldersPage.c' object='src/folders/shotwell-FoldersPage.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-Page.o `test -f 'src/folders/Page.c' || echo '$(srcdir)/'`src/folders/Page.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-FoldersPage.o `test -f 'src/folders/FoldersPage.c' || echo '$(srcdir)/'`src/folders/FoldersPage.c
 
-src/folders/shotwell-Page.obj: src/folders/Page.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-Page.obj -MD -MP -MF src/folders/$(DEPDIR)/shotwell-Page.Tpo -c -o src/folders/shotwell-Page.obj `if test -f 'src/folders/Page.c'; then $(CYGPATH_W) 'src/folders/Page.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/Page.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-Page.Tpo src/folders/$(DEPDIR)/shotwell-Page.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/Page.c' object='src/folders/shotwell-Page.obj' libtool=no @AMDEPBACKSLASH@
+src/folders/shotwell-FoldersPage.obj: src/folders/FoldersPage.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/folders/shotwell-FoldersPage.obj -MD -MP -MF src/folders/$(DEPDIR)/shotwell-FoldersPage.Tpo -c -o src/folders/shotwell-FoldersPage.obj `if test -f 'src/folders/FoldersPage.c'; then $(CYGPATH_W) 'src/folders/FoldersPage.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/FoldersPage.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/folders/$(DEPDIR)/shotwell-FoldersPage.Tpo src/folders/$(DEPDIR)/shotwell-FoldersPage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/folders/FoldersPage.c' object='src/folders/shotwell-FoldersPage.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-Page.obj `if test -f 'src/folders/Page.c'; then $(CYGPATH_W) 'src/folders/Page.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/Page.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/folders/shotwell-FoldersPage.obj `if test -f 'src/folders/FoldersPage.c'; then $(CYGPATH_W) 'src/folders/FoldersPage.c'; else $(CYGPATH_W) '$(srcdir)/src/folders/FoldersPage.c'; fi`
 
 src/shotwell-main.o: src/main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-main.o -MD -MP -MF src/$(DEPDIR)/shotwell-main.Tpo -c -o src/shotwell-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
@@ -5302,20 +5427,6 @@ src/shotwell-Debug.obj: src/Debug.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-Debug.obj `if test -f 'src/Debug.c'; then $(CYGPATH_W) 'src/Debug.c'; else $(CYGPATH_W) '$(srcdir)/src/Debug.c'; fi`
 
-src/shotwell-ColorTransformation.o: src/ColorTransformation.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-ColorTransformation.o -MD -MP -MF src/$(DEPDIR)/shotwell-ColorTransformation.Tpo -c -o src/shotwell-ColorTransformation.o `test -f 'src/ColorTransformation.c' || echo '$(srcdir)/'`src/ColorTransformation.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-ColorTransformation.Tpo src/$(DEPDIR)/shotwell-ColorTransformation.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ColorTransformation.c' object='src/shotwell-ColorTransformation.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-ColorTransformation.o `test -f 'src/ColorTransformation.c' || echo '$(srcdir)/'`src/ColorTransformation.c
-
-src/shotwell-ColorTransformation.obj: src/ColorTransformation.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-ColorTransformation.obj -MD -MP -MF src/$(DEPDIR)/shotwell-ColorTransformation.Tpo -c -o src/shotwell-ColorTransformation.obj `if test -f 'src/ColorTransformation.c'; then $(CYGPATH_W) 'src/ColorTransformation.c'; else $(CYGPATH_W) '$(srcdir)/src/ColorTransformation.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-ColorTransformation.Tpo src/$(DEPDIR)/shotwell-ColorTransformation.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/ColorTransformation.c' object='src/shotwell-ColorTransformation.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-ColorTransformation.obj `if test -f 'src/ColorTransformation.c'; then $(CYGPATH_W) 'src/ColorTransformation.c'; else $(CYGPATH_W) '$(srcdir)/src/ColorTransformation.c'; fi`
-
 src/shotwell-Properties.o: src/Properties.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-Properties.o -MD -MP -MF src/$(DEPDIR)/shotwell-Properties.Tpo -c -o src/shotwell-Properties.o `test -f 'src/Properties.c' || echo '$(srcdir)/'`src/Properties.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-Properties.Tpo src/$(DEPDIR)/shotwell-Properties.Po
@@ -5330,20 +5441,6 @@ src/shotwell-Properties.obj: src/Properties.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-Properties.obj `if test -f 'src/Properties.c'; then $(CYGPATH_W) 'src/Properties.c'; else $(CYGPATH_W) '$(srcdir)/src/Properties.c'; fi`
 
-src/shotwell-CustomComponents.o: src/CustomComponents.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-CustomComponents.o -MD -MP -MF src/$(DEPDIR)/shotwell-CustomComponents.Tpo -c -o src/shotwell-CustomComponents.o `test -f 'src/CustomComponents.c' || echo '$(srcdir)/'`src/CustomComponents.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-CustomComponents.Tpo src/$(DEPDIR)/shotwell-CustomComponents.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/CustomComponents.c' object='src/shotwell-CustomComponents.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-CustomComponents.o `test -f 'src/CustomComponents.c' || echo '$(srcdir)/'`src/CustomComponents.c
-
-src/shotwell-CustomComponents.obj: src/CustomComponents.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-CustomComponents.obj -MD -MP -MF src/$(DEPDIR)/shotwell-CustomComponents.Tpo -c -o src/shotwell-CustomComponents.obj `if test -f 'src/CustomComponents.c'; then $(CYGPATH_W) 'src/CustomComponents.c'; else $(CYGPATH_W) '$(srcdir)/src/CustomComponents.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-CustomComponents.Tpo src/$(DEPDIR)/shotwell-CustomComponents.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/CustomComponents.c' object='src/shotwell-CustomComponents.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-CustomComponents.obj `if test -f 'src/CustomComponents.c'; then $(CYGPATH_W) 'src/CustomComponents.c'; else $(CYGPATH_W) '$(srcdir)/src/CustomComponents.c'; fi`
-
 src/shotwell-Event.o: src/Event.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-Event.o -MD -MP -MF src/$(DEPDIR)/shotwell-Event.Tpo -c -o src/shotwell-Event.o `test -f 'src/Event.c' || echo '$(srcdir)/'`src/Event.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-Event.Tpo src/$(DEPDIR)/shotwell-Event.Po
@@ -6114,6 +6211,20 @@ shotwell-resource.obj: resource.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o shotwell-resource.obj `if test -f 'resource.c'; then $(CYGPATH_W) 'resource.c'; else $(CYGPATH_W) '$(srcdir)/resource.c'; fi`
 
+src/src_shotwell_graphics_processor-graphics-processor.o: src/graphics-processor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_shotwell_graphics_processor_CFLAGS) $(CFLAGS) -MT src/src_shotwell_graphics_processor-graphics-processor.o -MD -MP -MF src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Tpo -c -o src/src_shotwell_graphics_processor-graphics-processor.o `test -f 'src/graphics-processor.c' || echo '$(srcdir)/'`src/graphics-processor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Tpo src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/graphics-processor.c' object='src/src_shotwell_graphics_processor-graphics-processor.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_shotwell_graphics_processor_CFLAGS) $(CFLAGS) -c -o src/src_shotwell_graphics_processor-graphics-processor.o `test -f 'src/graphics-processor.c' || echo '$(srcdir)/'`src/graphics-processor.c
+
+src/src_shotwell_graphics_processor-graphics-processor.obj: src/graphics-processor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_shotwell_graphics_processor_CFLAGS) $(CFLAGS) -MT src/src_shotwell_graphics_processor-graphics-processor.obj -MD -MP -MF src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Tpo -c -o src/src_shotwell_graphics_processor-graphics-processor.obj `if test -f 'src/graphics-processor.c'; then $(CYGPATH_W) 'src/graphics-processor.c'; else $(CYGPATH_W) '$(srcdir)/src/graphics-processor.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Tpo src/$(DEPDIR)/src_shotwell_graphics_processor-graphics-processor.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/graphics-processor.c' object='src/src_shotwell_graphics_processor-graphics-processor.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(src_shotwell_graphics_processor_CFLAGS) $(CFLAGS) -c -o src/src_shotwell_graphics_processor-graphics-processor.obj `if test -f 'src/graphics-processor.c'; then $(CYGPATH_W) 'src/graphics-processor.c'; else $(CYGPATH_W) '$(srcdir)/src/graphics-processor.c'; fi`
+
 thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o: thumbnailer/shotwell-video-thumbnailer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -MT thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o -MD -MP -MF thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Tpo -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o `test -f 'thumbnailer/shotwell-video-thumbnailer.c' || echo '$(srcdir)/'`thumbnailer/shotwell-video-thumbnailer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Tpo thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Po
@@ -6162,11 +6273,6 @@ $(srcdir)/src/util/system.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/util/KeyValueMap.c: $(srcdir)/shotwell_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
-	fi
 $(srcdir)/src/util/ui.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -6237,11 +6343,66 @@ $(srcdir)/src/db/SavedSearchDBTable.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
+$(srcdir)/src/dialogs/Preferences.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/EntryMultiCompletion.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/ExportDialog.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/TextEntry.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/WelcomeDialog.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/MultiTextEntryDialog.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/AdjustDateTimeDialog.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/SetBackground.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/ProgressDialog.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
+$(srcdir)/src/dialogs/SetBackgroundSlideshow.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
 $(srcdir)/src/editing_tools/EditingTools.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
+$(srcdir)/src/editing_tools/RGBHistogramManipulator.c: $(srcdir)/shotwell_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
+	fi
 $(srcdir)/src/editing_tools/StraightenTool.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -6362,7 +6523,7 @@ $(srcdir)/src/library/LibraryWindow.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/library/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/library/LibraryBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6557,7 +6718,7 @@ $(srcdir)/src/events/Events.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/events/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/events/EventsBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6582,7 +6743,7 @@ $(srcdir)/src/tags/Tags.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/tags/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/tags/TagsBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6607,7 +6768,7 @@ $(srcdir)/src/camera/Camera.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/camera/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/camera/CameraBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6632,7 +6793,7 @@ $(srcdir)/src/searches/Searches.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/searches/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/searches/SearchesBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6697,12 +6858,12 @@ $(srcdir)/src/folders/Folders.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/folders/Branch.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/folders/FoldersBranch.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/folders/Page.c: $(srcdir)/shotwell_vala.stamp
+$(srcdir)/src/folders/FoldersPage.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
@@ -6797,21 +6958,11 @@ $(srcdir)/src/Debug.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/ColorTransformation.c: $(srcdir)/shotwell_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
-	fi
 $(srcdir)/src/Properties.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/src/CustomComponents.c: $(srcdir)/shotwell_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
-	fi
 $(srcdir)/src/Event.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -7082,9 +7233,18 @@ $(srcdir)/src/.unitize/_Direct_unitize_entry.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/shotwell_vala.stamp; \
 	fi
-$(srcdir)/shotwell_vala.stamp: 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
+$(srcdir)/shotwell_vala.stamp: 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/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/dialogs/Preferences.vala src/dialogs/EntryMultiCompletion.vala src/dialogs/ExportDialog.vala src/dialogs/TextEntry.vala src/dialogs/WelcomeDialog.vala src/dialogs/MultiTextEntryDialog.vala src/dialogs/AdjustDateTimeDialog.vala src/dialogs/SetBackground.vala src/dialogs/ProgressDialog.vala src/dialogs/SetBackgroundSlideshow.vala src/editing_tools/EditingTools.vala src/editing_tools/RGBHistogramManipulator.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/LibraryBranch.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/EventsBranch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/TagsBranch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/CameraBranch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/SearchesBranch.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/FoldersBranch.vala src/folders/FoldersPage.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/Properties.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 src/shotwell-graphics-processor.vapi
+	$(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/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/dialogs/Preferences.vala src/dialogs/EntryMultiCompletion.vala src/dialogs/ExportDialog.vala src/dialogs/TextEntry.vala src/dialogs/WelcomeDialog.vala src/dialogs/MultiTextEntryDialog.vala src/dialogs/AdjustDateTimeDialog.vala src/dialogs/SetBackground.vala src/dialogs/ProgressDialog.vala src/dialogs/SetBackgroundSlideshow.vala src/editing_tools/EditingTools.vala src/editing_tools/RGBHistogramManipulator.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/LibraryBranch.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/EventsBranch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/TagsBranch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/CameraBranch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/SearchesBranch.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/FoldersBranch.vala src/folders/FoldersPage.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/Properties.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 src/shotwell-graphics-processor.vapi
+	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/src/graphics-processor.c: $(srcdir)/src_shotwell_graphics_processor_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_shotwell_graphics_processor_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_shotwell_graphics_processor_vala.stamp; \
+	fi
+$(srcdir)/src_shotwell_graphics_processor_vala.stamp: src/graphics-processor.vala src/shotwell-graphics-processor.vapi
 	$(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_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_shotwell_graphics_processor_VALAFLAGS) $(VALAFLAGS) -C src/graphics-processor.vala src/shotwell-graphics-processor.vapi
 	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi
@@ -7095,93 +7255,39 @@ $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwel
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/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-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/GoogleAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/OAuth1Authenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/authenticator/shotwell/TumblrAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+$(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp: plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_authenticator_libshotwell_authenticator_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.vala
 	$(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
@@ -7227,6 +7333,11 @@ $(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shot
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
 	fi
+$(srcdir)/plugins/shotwell-publishing/TumblrPublishing.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
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	fi
 $(srcdir)/plugins/shotwell-publishing/YouTubePublishing.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
 	@if test -f $@; then :; else \
@@ -7237,131 +7348,135 @@ $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shot
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: 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 plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
+$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
 	$(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 plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
+	$(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/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-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_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-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_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-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_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_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)/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_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_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)/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/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+	$(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/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
+$(srcdir)/src/ColorTransformation.c: $(srcdir)/src_libgraphics_processor_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_libgraphics_processor_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_libgraphics_processor_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseTable.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
+$(srcdir)/src/util/KeyValueMap.c: $(srcdir)/src_libgraphics_processor_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_libgraphics_processor_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_libgraphics_processor_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotDatabase.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
+$(srcdir)/src_libgraphics_processor_la_vala.stamp: src/ColorTransformation.vala src/util/KeyValueMap.vala
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_libgraphics_processor_la_VALAFLAGS) $(VALAFLAGS) -C src/ColorTransformation.vala src/util/KeyValueMap.vala
+	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotImporter.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
+$(srcdir)/plugins/common/OAuth1Support.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotMetaTable.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
+$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotPhotosTable.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
+$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotPhotoTagsTable.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
+$(srcdir)/plugins/common/BuilderPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.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
+$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/OAuth1Support.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/OAuth1Support.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 \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotRollsTable.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
+$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotTableBehavior.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
+$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/FSpotTagsTable.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
+$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/shotwell-data-imports.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
+$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/SqliteSupport.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
+$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-data-imports/VersionNumber.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
+$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp: 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)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/authenticator/shotwell/ShotwellAuthenticatorFactory.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/authenticator/shotwell/GoogleAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp: plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala
+$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_authenticator_libshotwell_authenticator_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -7372,11 +7487,12 @@ clean-libtool:
 	-rm -rf plugins/authenticator/.libs plugins/authenticator/_libs
 	-rm -rf plugins/authenticator/shotwell/.libs plugins/authenticator/shotwell/_libs
 	-rm -rf plugins/common/.libs plugins/common/_libs
-	-rm -rf plugins/shotwell-data-imports/.libs plugins/shotwell-data-imports/_libs
 	-rm -rf plugins/shotwell-publishing/.libs plugins/shotwell-publishing/_libs
 	-rm -rf plugins/shotwell-publishing-extras/.libs plugins/shotwell-publishing-extras/_libs
 	-rm -rf plugins/shotwell-transitions/.libs plugins/shotwell-transitions/_libs
+	-rm -rf src/.libs src/_libs
 	-rm -rf src/plugins/.libs src/plugins/_libs
+	-rm -rf src/util/.libs src/util/_libs
 	-rm -rf thumbnailer/.libs thumbnailer/_libs
 
 distclean-libtool:
@@ -7743,8 +7859,6 @@ distclean-generic:
 	-rm -f plugins/authenticator/shotwell/$(am__dirstamp)
 	-rm -f plugins/common/$(DEPDIR)/$(am__dirstamp)
 	-rm -f plugins/common/$(am__dirstamp)
-	-rm -f plugins/shotwell-data-imports/$(DEPDIR)/$(am__dirstamp)
-	-rm -f plugins/shotwell-data-imports/$(am__dirstamp)
 	-rm -f plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp)
 	-rm -f plugins/shotwell-publishing-extras/$(am__dirstamp)
 	-rm -f plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp)
@@ -7765,6 +7879,8 @@ distclean-generic:
 	-rm -f src/data_imports/$(am__dirstamp)
 	-rm -f src/db/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/db/$(am__dirstamp)
+	-rm -f src/dialogs/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/dialogs/$(am__dirstamp)
 	-rm -f src/direct/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/direct/$(am__dirstamp)
 	-rm -f src/editing_tools/$(DEPDIR)/$(am__dirstamp)
@@ -7804,34 +7920,23 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
 	-rm -f $(srcdir)/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
 	-rm -f $(srcdir)/plugins/authenticator/shotwell/GoogleAuthenticator.c
+	-rm -f $(srcdir)/plugins/authenticator/shotwell/OAuth1Authenticator.c
 	-rm -f $(srcdir)/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+	-rm -f $(srcdir)/plugins/authenticator/shotwell/TumblrAuthenticator.c
 	-rm -f $(srcdir)/plugins/common/BuilderPane.c
+	-rm -f $(srcdir)/plugins/common/OAuth1Support.c
 	-rm -f $(srcdir)/plugins/common/RESTSupport.c
 	-rm -f $(srcdir)/plugins/common/Resources.c
 	-rm -f $(srcdir)/plugins/common/WebAuthenticationPane.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabase.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotImporter.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotMetaTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotPhotosTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotRollsTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotTableBehavior.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotTagsTable.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/SqliteSupport.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/VersionNumber.c
-	-rm -f $(srcdir)/plugins/shotwell-data-imports/shotwell-data-imports.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c
-	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c
+	-rm -f $(srcdir)/plugins/shotwell-publishing/TumblrPublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c
 	-rm -f $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c
 	-rm -f $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c
@@ -7847,7 +7952,6 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c
 	-rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
 	-rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	-rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp
 	-rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
 	-rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
 	-rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
@@ -7884,7 +7988,6 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/ColorTransformation.c
 	-rm -f $(srcdir)/src/CommandManager.c
 	-rm -f $(srcdir)/src/Commands.c
-	-rm -f $(srcdir)/src/CustomComponents.c
 	-rm -f $(srcdir)/src/Debug.c
 	-rm -f $(srcdir)/src/DesktopIntegration.c
 	-rm -f $(srcdir)/src/Dialogs.c
@@ -7926,8 +8029,8 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/VideoMetadata.c
 	-rm -f $(srcdir)/src/VideoMonitor.c
 	-rm -f $(srcdir)/src/VideoSupport.c
-	-rm -f $(srcdir)/src/camera/Branch.c
 	-rm -f $(srcdir)/src/camera/Camera.c
+	-rm -f $(srcdir)/src/camera/CameraBranch.c
 	-rm -f $(srcdir)/src/camera/CameraTable.c
 	-rm -f $(srcdir)/src/camera/GPhoto.c
 	-rm -f $(srcdir)/src/camera/ImportPage.c
@@ -7965,22 +8068,33 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/db/TombstoneTable.c
 	-rm -f $(srcdir)/src/db/VersionTable.c
 	-rm -f $(srcdir)/src/db/VideoTable.c
+	-rm -f $(srcdir)/src/dialogs/AdjustDateTimeDialog.c
+	-rm -f $(srcdir)/src/dialogs/EntryMultiCompletion.c
+	-rm -f $(srcdir)/src/dialogs/ExportDialog.c
+	-rm -f $(srcdir)/src/dialogs/MultiTextEntryDialog.c
+	-rm -f $(srcdir)/src/dialogs/Preferences.c
+	-rm -f $(srcdir)/src/dialogs/ProgressDialog.c
+	-rm -f $(srcdir)/src/dialogs/SetBackground.c
+	-rm -f $(srcdir)/src/dialogs/SetBackgroundSlideshow.c
+	-rm -f $(srcdir)/src/dialogs/TextEntry.c
+	-rm -f $(srcdir)/src/dialogs/WelcomeDialog.c
 	-rm -f $(srcdir)/src/direct/Direct.c
 	-rm -f $(srcdir)/src/direct/DirectPhoto.c
 	-rm -f $(srcdir)/src/direct/DirectPhotoPage.c
 	-rm -f $(srcdir)/src/direct/DirectView.c
 	-rm -f $(srcdir)/src/direct/DirectWindow.c
 	-rm -f $(srcdir)/src/editing_tools/EditingTools.c
+	-rm -f $(srcdir)/src/editing_tools/RGBHistogramManipulator.c
 	-rm -f $(srcdir)/src/editing_tools/StraightenTool.c
-	-rm -f $(srcdir)/src/events/Branch.c
 	-rm -f $(srcdir)/src/events/EventDirectoryItem.c
 	-rm -f $(srcdir)/src/events/EventPage.c
 	-rm -f $(srcdir)/src/events/Events.c
+	-rm -f $(srcdir)/src/events/EventsBranch.c
 	-rm -f $(srcdir)/src/events/EventsDirectoryPage.c
-	-rm -f $(srcdir)/src/folders/Branch.c
 	-rm -f $(srcdir)/src/folders/Folders.c
-	-rm -f $(srcdir)/src/folders/Page.c
-	-rm -f $(srcdir)/src/library/Branch.c
+	-rm -f $(srcdir)/src/folders/FoldersBranch.c
+	-rm -f $(srcdir)/src/folders/FoldersPage.c
+	-rm -f $(srcdir)/src/graphics-processor.c
 	-rm -f $(srcdir)/src/library/FlaggedPage.c
 	-rm -f $(srcdir)/src/library/FlaggedSidebarEntry.c
 	-rm -f $(srcdir)/src/library/ImportQueuePage.c
@@ -7988,6 +8102,7 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/library/LastImportPage.c
 	-rm -f $(srcdir)/src/library/LastImportSidebarEntry.c
 	-rm -f $(srcdir)/src/library/Library.c
+	-rm -f $(srcdir)/src/library/LibraryBranch.c
 	-rm -f $(srcdir)/src/library/LibraryWindow.c
 	-rm -f $(srcdir)/src/library/OfflinePage.c
 	-rm -f $(srcdir)/src/library/OfflineSidebarEntry.c
@@ -8017,11 +8132,11 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/publishing/Publishing.c
 	-rm -f $(srcdir)/src/publishing/PublishingPluginHost.c
 	-rm -f $(srcdir)/src/publishing/PublishingUI.c
-	-rm -f $(srcdir)/src/searches/Branch.c
 	-rm -f $(srcdir)/src/searches/SavedSearchDialog.c
 	-rm -f $(srcdir)/src/searches/SavedSearchPage.c
 	-rm -f $(srcdir)/src/searches/SearchBoolean.c
 	-rm -f $(srcdir)/src/searches/Searches.c
+	-rm -f $(srcdir)/src/searches/SearchesBranch.c
 	-rm -f $(srcdir)/src/sidebar/Branch.c
 	-rm -f $(srcdir)/src/sidebar/Entry.c
 	-rm -f $(srcdir)/src/sidebar/Sidebar.c
@@ -8029,11 +8144,11 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/sidebar/common.c
 	-rm -f $(srcdir)/src/slideshow/Slideshow.c
 	-rm -f $(srcdir)/src/slideshow/TransitionEffects.c
-	-rm -f $(srcdir)/src/tags/Branch.c
 	-rm -f $(srcdir)/src/tags/HierarchicalTagIndex.c
 	-rm -f $(srcdir)/src/tags/HierarchicalTagUtilities.c
 	-rm -f $(srcdir)/src/tags/TagPage.c
 	-rm -f $(srcdir)/src/tags/Tags.c
+	-rm -f $(srcdir)/src/tags/TagsBranch.c
 	-rm -f $(srcdir)/src/threads/BackgroundJob.c
 	-rm -f $(srcdir)/src/threads/Semaphore.c
 	-rm -f $(srcdir)/src/threads/Threads.c
@@ -8047,40 +8162,31 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src/util/string.c
 	-rm -f $(srcdir)/src/util/system.c
 	-rm -f $(srcdir)/src/util/ui.c
+	-rm -f $(srcdir)/src_libgraphics_processor_la_vala.stamp
 	-rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	-rm -f $(srcdir)/src_shotwell_graphics_processor_vala.stamp
 	-rm -f $(srcdir)/thumbnailer/shotwell-video-thumbnailer.c
 	-rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
 	-rm -f plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
 	-rm -f plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
 	-rm -f plugins/authenticator/shotwell/GoogleAuthenticator.c
+	-rm -f plugins/authenticator/shotwell/OAuth1Authenticator.c
 	-rm -f plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+	-rm -f plugins/authenticator/shotwell/TumblrAuthenticator.c
 	-rm -f plugins/common/BuilderPane.c
+	-rm -f plugins/common/OAuth1Support.c
 	-rm -f plugins/common/RESTSupport.c
 	-rm -f plugins/common/Resources.c
 	-rm -f plugins/common/WebAuthenticationPane.c
-	-rm -f plugins/shotwell-data-imports/FSpotDatabase.c
-	-rm -f plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-	-rm -f plugins/shotwell-data-imports/FSpotDatabaseTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotImporter.c
-	-rm -f plugins/shotwell-data-imports/FSpotMetaTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotPhotosTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotRollsTable.c
-	-rm -f plugins/shotwell-data-imports/FSpotTableBehavior.c
-	-rm -f plugins/shotwell-data-imports/FSpotTagsTable.c
-	-rm -f plugins/shotwell-data-imports/SqliteSupport.c
-	-rm -f plugins/shotwell-data-imports/VersionNumber.c
-	-rm -f plugins/shotwell-data-imports/shotwell-data-imports.c
 	-rm -f plugins/shotwell-publishing-extras/GalleryConnector.c
 	-rm -f plugins/shotwell-publishing-extras/RajcePublishing.c
-	-rm -f plugins/shotwell-publishing-extras/TumblrPublishing.c
 	-rm -f plugins/shotwell-publishing-extras/YandexPublishing.c
 	-rm -f plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
 	-rm -f plugins/shotwell-publishing/FacebookPublishing.c
 	-rm -f plugins/shotwell-publishing/FlickrPublishing.c
 	-rm -f plugins/shotwell-publishing/PicasaPublishing.c
 	-rm -f plugins/shotwell-publishing/PiwigoPublishing.c
+	-rm -f plugins/shotwell-publishing/TumblrPublishing.c
 	-rm -f plugins/shotwell-publishing/YouTubePublishing.c
 	-rm -f plugins/shotwell-publishing/shotwell-publishing.c
 	-rm -f plugins/shotwell-transitions/BlindsEffect.c
@@ -8126,7 +8232,6 @@ maintainer-clean-generic:
 	-rm -f src/ColorTransformation.c
 	-rm -f src/CommandManager.c
 	-rm -f src/Commands.c
-	-rm -f src/CustomComponents.c
 	-rm -f src/Debug.c
 	-rm -f src/DesktopIntegration.c
 	-rm -f src/Dialogs.c
@@ -8168,8 +8273,8 @@ maintainer-clean-generic:
 	-rm -f src/VideoMetadata.c
 	-rm -f src/VideoMonitor.c
 	-rm -f src/VideoSupport.c
-	-rm -f src/camera/Branch.c
 	-rm -f src/camera/Camera.c
+	-rm -f src/camera/CameraBranch.c
 	-rm -f src/camera/CameraTable.c
 	-rm -f src/camera/GPhoto.c
 	-rm -f src/camera/ImportPage.c
@@ -8207,22 +8312,33 @@ maintainer-clean-generic:
 	-rm -f src/db/TombstoneTable.c
 	-rm -f src/db/VersionTable.c
 	-rm -f src/db/VideoTable.c
+	-rm -f src/dialogs/AdjustDateTimeDialog.c
+	-rm -f src/dialogs/EntryMultiCompletion.c
+	-rm -f src/dialogs/ExportDialog.c
+	-rm -f src/dialogs/MultiTextEntryDialog.c
+	-rm -f src/dialogs/Preferences.c
+	-rm -f src/dialogs/ProgressDialog.c
+	-rm -f src/dialogs/SetBackground.c
+	-rm -f src/dialogs/SetBackgroundSlideshow.c
+	-rm -f src/dialogs/TextEntry.c
+	-rm -f src/dialogs/WelcomeDialog.c
 	-rm -f src/direct/Direct.c
 	-rm -f src/direct/DirectPhoto.c
 	-rm -f src/direct/DirectPhotoPage.c
 	-rm -f src/direct/DirectView.c
 	-rm -f src/direct/DirectWindow.c
 	-rm -f src/editing_tools/EditingTools.c
+	-rm -f src/editing_tools/RGBHistogramManipulator.c
 	-rm -f src/editing_tools/StraightenTool.c
-	-rm -f src/events/Branch.c
 	-rm -f src/events/EventDirectoryItem.c
 	-rm -f src/events/EventPage.c
 	-rm -f src/events/Events.c
+	-rm -f src/events/EventsBranch.c
 	-rm -f src/events/EventsDirectoryPage.c
-	-rm -f src/folders/Branch.c
 	-rm -f src/folders/Folders.c
-	-rm -f src/folders/Page.c
-	-rm -f src/library/Branch.c
+	-rm -f src/folders/FoldersBranch.c
+	-rm -f src/folders/FoldersPage.c
+	-rm -f src/graphics-processor.c
 	-rm -f src/library/FlaggedPage.c
 	-rm -f src/library/FlaggedSidebarEntry.c
 	-rm -f src/library/ImportQueuePage.c
@@ -8230,6 +8346,7 @@ maintainer-clean-generic:
 	-rm -f src/library/LastImportPage.c
 	-rm -f src/library/LastImportSidebarEntry.c
 	-rm -f src/library/Library.c
+	-rm -f src/library/LibraryBranch.c
 	-rm -f src/library/LibraryWindow.c
 	-rm -f src/library/OfflinePage.c
 	-rm -f src/library/OfflineSidebarEntry.c
@@ -8259,11 +8376,11 @@ maintainer-clean-generic:
 	-rm -f src/publishing/Publishing.c
 	-rm -f src/publishing/PublishingPluginHost.c
 	-rm -f src/publishing/PublishingUI.c
-	-rm -f src/searches/Branch.c
 	-rm -f src/searches/SavedSearchDialog.c
 	-rm -f src/searches/SavedSearchPage.c
 	-rm -f src/searches/SearchBoolean.c
 	-rm -f src/searches/Searches.c
+	-rm -f src/searches/SearchesBranch.c
 	-rm -f src/sidebar/Branch.c
 	-rm -f src/sidebar/Entry.c
 	-rm -f src/sidebar/Sidebar.c
@@ -8271,11 +8388,11 @@ maintainer-clean-generic:
 	-rm -f src/sidebar/common.c
 	-rm -f src/slideshow/Slideshow.c
 	-rm -f src/slideshow/TransitionEffects.c
-	-rm -f src/tags/Branch.c
 	-rm -f src/tags/HierarchicalTagIndex.c
 	-rm -f src/tags/HierarchicalTagUtilities.c
 	-rm -f src/tags/TagPage.c
 	-rm -f src/tags/Tags.c
+	-rm -f src/tags/TagsBranch.c
 	-rm -f src/threads/BackgroundJob.c
 	-rm -f src/threads/Semaphore.c
 	-rm -f src/threads/Threads.c
@@ -8294,12 +8411,13 @@ maintainer-clean-generic:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-noinstLTLIBRARIES clean-pkglibexecPROGRAMS \
-	clean-pluginLTLIBRARIES mostlyclean-am
+	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+	clean-pkglibexecPROGRAMS clean-pluginLTLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) plugins/authenticator/$(DEPDIR) plugins/authenticator/shotwell/$(DEPDIR) plugins/common/$(DEPDIR) plugins/shotwell-data-imports/$(DEPDIR) plugins/shotwell-publishing-extras/$(DEPDIR) plugins/shotwell-publishing/$(DEPDIR) plugins/shotwell-transitions/$(DEPDIR) src/$(DEPDIR) src/.unitize/$(DEPDIR) src/camera/$(DEPDIR) src/config/$(DEPDIR) src/core/$(DEPDIR) src/data_imports/$(DEPDIR) src/db/$(DEPDIR) src/direct/$(DEPDIR) src/editing_tools/$(DEPDIR) src/events/$(DEPDIR) src/folders/$(DEPDIR) src/library/$(DEPDIR) src/photos/$(DEPDIR) src/plugins/$(DEPDIR) src/publishing/$(DEPDIR) src/searches/$(DEPDIR) src/sidebar/$(DEPDIR) src/slideshow/$(DEPDIR) src/tags/$(DEPDIR) src/threads/$(DEPDIR) src/unit/$(DEPDIR) src/util/$(DEPDIR) thumbnailer/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) plugins/authenticator/$(DEPDIR) plugins/authenticator/shotwell/$(DEPDIR) plugins/common/$(DEPDIR) plugins/shotwell-publishing-extras/$(DEPDIR) plugins/shotwell-publishing/$(DEPDIR) plugins/shotwell-transitions/$(DEPDIR) src/$(DEPDIR) src/.unitize/$(DEPDIR) src/camera/$(DEPDIR) src/config/$(DEPDIR) src/core/$(DEPDIR) src/data_imports/$(DEPDIR) src/db/$(DEPDIR) src/dialogs/$(DEPDIR) src/direct/$(DEPDIR) src/editing_tools/$(DEPDIR) src/events/$(DEPDIR) src/folders/$(DEPDIR) src/library/$(DEPDIR) src/photos/$(DEPDIR) src/plugins/$(DEPDIR) src/publishing/$(DEPDIR) src/searches/$(DEPDIR) src/sidebar/$(DEPDIR) src/slideshow/$(DEPDIR) src/tags/$(DEPDIR) src/threads/$(DEPDIR) src/unit/$(DEPDIR) src/util/$(DEPDIR) thumbnailer/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -8348,7 +8466,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) plugins/authenticator/$(DEPDIR) plugins/authenticator/shotwell/$(DEPDIR) plugins/common/$(DEPDIR) plugins/shotwell-data-imports/$(DEPDIR) plugins/shotwell-publishing-extras/$(DEPDIR) plugins/shotwell-publishing/$(DEPDIR) plugins/shotwell-transitions/$(DEPDIR) src/$(DEPDIR) src/.unitize/$(DEPDIR) src/camera/$(DEPDIR) src/config/$(DEPDIR) src/core/$(DEPDIR) src/data_imports/$(DEPDIR) src/db/$(DEPDIR) src/direct/$(DEPDIR) src/editing_tools/$(DEPDIR) src/events/$(DEPDIR) src/folders/$(DEPDIR) src/library/$(DEPDIR) src/photos/$(DEPDIR) src/plugins/$(DEPDIR) src/publishing/$(DEPDIR) src/searches/$(DEPDIR) src/sidebar/$(DEPDIR) src/slideshow/$(DEPDIR) src/tags/$(DEPDIR) src/threads/$(DEPDIR) src/unit/$(DEPDIR) src/util/$(DEPDIR) thumbnailer/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) plugins/authenticator/$(DEPDIR) plugins/authenticator/shotwell/$(DEPDIR) plugins/common/$(DEPDIR) plugins/shotwell-publishing-extras/$(DEPDIR) plugins/shotwell-publishing/$(DEPDIR) plugins/shotwell-transitions/$(DEPDIR) src/$(DEPDIR) src/.unitize/$(DEPDIR) src/camera/$(DEPDIR) src/config/$(DEPDIR) src/core/$(DEPDIR) src/data_imports/$(DEPDIR) src/db/$(DEPDIR) src/dialogs/$(DEPDIR) src/direct/$(DEPDIR) src/editing_tools/$(DEPDIR) src/events/$(DEPDIR) src/folders/$(DEPDIR) src/library/$(DEPDIR) src/photos/$(DEPDIR) src/plugins/$(DEPDIR) src/publishing/$(DEPDIR) src/searches/$(DEPDIR) src/sidebar/$(DEPDIR) src/slideshow/$(DEPDIR) src/tags/$(DEPDIR) src/threads/$(DEPDIR) src/unit/$(DEPDIR) src/util/$(DEPDIR) thumbnailer/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -8374,19 +8492,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_pkglibexecSCRIPTS \
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-binPROGRAMS \
 	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstLTLIBRARIES clean-pkglibexecPROGRAMS \
-	clean-pluginLTLIBRARIES cscope cscopelist-am ctags ctags-am \
-	dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
-	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dist_pkglibexecSCRIPTS \
-	install-dist_pluginDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-pdf install-pdf-am \
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+	clean-pkglibexecPROGRAMS clean-pluginLTLIBRARIES cscope \
+	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-dist_pkglibexecSCRIPTS install-dist_pluginDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
 	install-pkglibexecPROGRAMS install-pluginLTLIBRARIES \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
@@ -8424,11 +8542,14 @@ $(top_srcdir)/plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-common
 plugins/shotwell-plugin-dev-1.0.vapi plugins/shotwell-plugin-dev-1.0.h: src_plugins_libplugin_la_vala.stamp
 
 -include $(top_srcdir)/git.mk
+src/shotwell-graphics-processor.vapi src/shotwell-graphics-processor.h: \
+	src_libgraphics_processor_la_vala.stamp
+	-I$(abs_top_builddir)/src
 
 resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
 		--sourcedir=$(abs_top_srcdir) \
-		--generate $<
+		--generate $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml
 
 plugins/authenticator/shotwell-authenticator.vapi plugins/authenticator/shotwell-authenticator.h: \
 	plugins_authenticator_libshotwell_authenticator_la_vala.stamp
@@ -8451,9 +8572,6 @@ plugins/shotwell-publishing/resource.c: $(PUBLISHING_RESOURCE_DEPS) $(PUBLISHING
 plugins/shotwell-transitions/resource.c: plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-transitions --generate $<
 
-plugins/shotwell-data-imports/resource.c: plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-data-imports --generate $<
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/NEWS b/NEWS
index 75151bb..2e718c7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,71 +1,350 @@
-Shotwell 0.26.4 - 10 Nov 2017
-  * Fix buld rules for appstream files
-  * Fix import progress bar when importing RAW files
-  * Fix renaming of backing photos when renaming to lower case on import
-  * Fix removing the RAW file when deleting photos and there is no Trash
-  * Fix duplicate detection for Canon imports
-  * Fix importing MP4 videos from certain Android devices
-  * Fix missing event pictures when moving library
-  * Fix useless sub-menu for saved searches
-  * Fix criticals on right-click
-  * Fix help files to pass validation
-  * Fix assert when removing last photo from import roll
-  * Fix scrolling and zooming by mouse wheel on Wayland
+Shotwell 0.28.2 - 9 Apr 2018
+  * Fix saved search dialog on Gtk 3.18
+  * Fix crash when editing images with alpha channel
+  * Fix logging in to Piwigo when password contains &
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718742
+ - https://bugzilla.gnome.org/show_bug.cgi?id=794673
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+
+Shotwell 0.28.1 - 25 Mar 2018
+  * The paperbag. Unbreak all publishers
+  * Translation updates
+  * Fix a missing symbol error
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=794293
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+ - gogo <trebelnik2@gmail.com>
+
+Added/updated translations
+ - hr, courtesy of gogo
+ - lv, courtesy of Rūdolfs Mazurs
+
+Shotwell 0.28.0 - 12 Mar 2018
+  * Translation updates
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Alan Mortensen <alanmortensen.am@gmail.com>
+
+Added/updated translations
+ - da, courtesy of Alan Mortensen
+
+Shotwell 0.27.92 - 6 Mar 2018
+  * Fix log in to Piwigo if password contains &
+  * Fix deleting two photos when pressing Delete
+  * Translation updates
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718742
+ - https://bugzilla.gnome.org/show_bug.cgi?id=793818
+
+All contributors to this release:
+ - Jordi Mas <jmas@softcatala.org>
+ - Jens Georg <mail@jensge.org>
+ - Мирослав Николић <miroslavnikolic@rocketmail.com>
+ - Tim Sabsch <tim@sabsch.com>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Jiri Grönroos <jiri.gronroos@iki.fi>
+ - gogo <trebelnik2@gmail.com>
+ - GNOME Translation Robot <gnome-sysadmin@gnome.org>
+ - Daniel Korostil <ted.korostiled@gmail.com>
+ - Balázs Úr <balazs@urbalazs.hu>
+
+Added/updated translations
+ - ca, courtesy of Carles Ferrando Garcia
+ - de, courtesy of Mario Blättermann
+ - de, courtesy of Tim Sabsch
+ - es, courtesy of Daniel Mustieles
+ - fi, courtesy of Jiri Grönroos
+ - gd, courtesy of GunChleoc
+ - hr, courtesy of gogo
+ - hu, courtesy of Balázs Úr
+ - sr, courtesy of Мирослав Николић
+ - sr@latin, courtesy of Miroslav Nikolić
+ - uk, courtesy of Yuri Chornoivan
+
+Shotwell 0.27.4 - 5 Feb 2018
+  * Fix a crash when importing in-place from DAV
+  * Fix a crash when removing the last photo of an event
   * Translation updates
 
 Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=786531
+ - https://bugzilla.gnome.org/show_bug.cgi?id=792498
+
+All contributors to this release:
+ - Jordi Mas <jmas@softcatala.org>
+ - Jens Georg <mail@jensge.org>
+ - Rafael Fontenelle <rafaelff@gnome.org>
+ - Marek Cernocky <marek_cernocky@conel.cz>
+
+Added/updated translations
+ - ca, courtesy of Carles Ferrando Garcia
+ - cs, courtesy of Marek Černocký
+ - pt_BR, courtesy of Rafael Fontenelle
+
+Shotwell 0.27.3 - 9 Jan 2018
+  * Fix upgrading from Shotwell 0.7.2
+  * Make Histogram widget accessible by keyboard
+  * Add F4 as shortcut for the Date/Time dialog
+  * Fix an issue where the date/time picker was out-of-sync with the
+    calendar widget
+  * Refactor shotwell.ui into smaller ui files and make some of the
+    dialogs templated
+  * Rewrite saved search dialog to use GtkListBox
+  * Add a very simple Piwigo server to do offline testing
+  * Add labels to sliders in adjustment tool
+  * Fix issue where Shotwell would fall back to the internal developer
+    if the RAW+JPEG pair did not contain an embedded development in the
+    RAW files
+  * Fix showing the help when running from build folder
+  * Fix issue with linking the plugin interfaces multiple times
+  * Fix install location for appdata
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716431
+ - https://bugzilla.gnome.org/show_bug.cgi?id=717126
+ - https://bugzilla.gnome.org/show_bug.cgi?id=753943
+ - https://bugzilla.gnome.org/show_bug.cgi?id=790185
+ - https://bugzilla.gnome.org/show_bug.cgi?id=790469
+ - https://bugzilla.gnome.org/show_bug.cgi?id=791893
+ - https://bugzilla.gnome.org/show_bug.cgi?id=792058
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Rico Tzschichholz <ricotz@ubuntu.com>
+ - Kukuh Syafaat <syafaatkukuh@gmail.com>
+ - Daniel Mustieles <daniel.mustieles@gmail.com>
+ - Cheng-Chia Tseng <pswo10680@gmail.com>
+
+Added/updated translations
+ - es, courtesy of Daniel Mustieles
+ - id, courtesy of Kukuh Syafaat
+ - zh_TW, courtesy of Cheng-Chia Tseng
+
+Shotwell 0.27.2 - 11 Dec 2017
+  * Use meson for building the debian package
+  * Improve the wording for the "Width or Height" scaling constraint
+  * Fix unmounting the camera when it is mounted via mtp, not gphoto2
+  * Speed up color transformations
+  * Refactor Tumblr and Flickr code to use common OAuth1 base class
+  * Flickr: Do the authentication in Shotwell, not calling the system browser
+  * Fix sorting by title
+  * Fix searching for newly added keywords
+  * Make it possible to edit month and year easily in date/time picker
+  * Doc: Fix keybord shortcut for publishing pane
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718977
+ - https://bugzilla.gnome.org/show_bug.cgi?id=729857
+ - https://bugzilla.gnome.org/show_bug.cgi?id=736643
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779677
+ - https://bugzilla.gnome.org/show_bug.cgi?id=781472
+ - https://bugzilla.gnome.org/show_bug.cgi?id=786821
+ - https://bugzilla.gnome.org/show_bug.cgi?id=787553
+ - https://bugzilla.gnome.org/show_bug.cgi?id=790668
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Marek Cernocky <marek_cernocky@conel.cz>
+ - Josef Andersson <l10nl18nsweja@gmail.com>
+ - Cheng-Chia Tseng <pswo10680@gmail.com>
+ - Ask Hjorth Larsen <asklarsen@gmail.com>
+ - Alan Mortensen <alanmortensen.am@gmail.com>
+
+Added/updated translations
+ - cs, courtesy of Marek Černocký
+ - da, courtesy of Alan Mortensen
+ - de, courtesy of Mario Blättermann
+ - pl, courtesy of Piotr Drąg
+ - sv, courtesy of Josef Andersson
+ - zh_TW, courtesy of Cheng-Chia Tseng
+
+Shotwell 0.27.1 - 21 Oct 2017
+  * Properly dist meson files with autotools
+  * Dist apport helper with autotools
+  * Fix checking against unity
+  * Build the graphics-processor binary when building with meson
+  * Hide toolbar in fullscreen when disabled in settings
+  * When clicking ok in import, hide file selector
+  * Properly xml-escape the file names in wallpaper.xml
+  * Do not re-encode JPEG previews
+  * Only create thumbs for RAW imports once
+  * Use APPSTREAM instead of APPDATA
+  * Improve RAW/JPEG pair matching by sorting file list
+  * Fix deprecated "find" icons
+  * Fix help for non-recursive photo import
+  * Fix menu-bar injection
+  * Avoid data corruption when importing from camera
+  * Re-use RAW/JPEG association from camera import
+  * Rename backing photo when importing to lower case
+  * Improve description of mass-storage cameras
+  * Improve top-level tool-tips on navigation tree
+  * More unicode use
+  * When trashing without trash available, also remove RAW file
+  * Fix trimming of EXIF thumbs from Canon cameras
+  * Import Videos even if they use application/x-extension-mp4
+  * Fix missing event pictures when not copying thumbnails
+  * Remove Rajce and Yandex plugin from default build
+  * Remove useless submenu on saved searches
+  * Fix some criticals on context menu actions
+  * Some code clean-ups
+  * Remove locale-dependent keyboard shortcuts
+  * Fix Help to pass yelp-check
+  * Fix crash on removing last photo from import roll
+  * Fix window icon of start-up dialog
+  * Speed-up event creation on import and merge
+
+Bugs fixed in this release:
  - https://bugzilla.gnome.org/show_bug.cgi?id=717735
  - https://bugzilla.gnome.org/show_bug.cgi?id=719142
  - https://bugzilla.gnome.org/show_bug.cgi?id=719186
+ - https://bugzilla.gnome.org/show_bug.cgi?id=741962
  - https://bugzilla.gnome.org/show_bug.cgi?id=748666
+ - https://bugzilla.gnome.org/show_bug.cgi?id=772339
  - https://bugzilla.gnome.org/show_bug.cgi?id=773206
  - https://bugzilla.gnome.org/show_bug.cgi?id=777626
- - https://bugzilla.gnome.org/show_bug.cgi?id=781472
+ - https://bugzilla.gnome.org/show_bug.cgi?id=782753
+ - https://bugzilla.gnome.org/show_bug.cgi?id=783956
+ - https://bugzilla.gnome.org/show_bug.cgi?id=784661
  - https://bugzilla.gnome.org/show_bug.cgi?id=784883
+ - https://bugzilla.gnome.org/show_bug.cgi?id=785196
+ - https://bugzilla.gnome.org/show_bug.cgi?id=785503
+ - https://bugzilla.gnome.org/show_bug.cgi?id=785711
+ - https://bugzilla.gnome.org/show_bug.cgi?id=785761
+ - https://bugzilla.gnome.org/show_bug.cgi?id=787400
 
 All contributors to this release:
  - Jens Georg <mail@jensge.org>
- - Andre Klapper <a9016009@gmx.de>
  - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Marek Cernocky <marek_cernocky@conel.cz>
+ - Jordi Mas <jmas@softcatala.org>
+ - Andre Klapper <a9016009@gmx.de>
+ - Anders Jonsson <anders.jonsson@norsjovallen.se>
+ - Marek Černocký <marek@manet.cz>
+ - Kukuh Syafaat <syafaatkukuh@gmail.com>
+ - Cheng-Chia Tseng <pswo10680@gmail.com>
+ - Мирослав Николић <miroslavnikolic@rocketmail.com>
  - Thomas Moschny <thomas.moschny@gmx.de>
  - Stefan Willinger <stefan.home@aon.at>
  - stefan <stefan.home@aon.at>
+ - Rafael Fontenelle <rafaelff@gnome.org>
  - Peter Seiderer <ps.report@gmx.net>
  - Marcos Lans <marcoslansgarza@gmail.com>
+ - Jiri Grönroos <jiri.gronroos@iki.fi>
  - Jeremy Bicha <jbicha@ubuntu.com>
- - Cheng-Chia Tseng <pswo10680@gmail.com>
+ - Isaac F. Ferreira Filho <isaacmob@riseup.net>
+ - Gert <gw.fossdev@gmail.com>
+ - Daniel Mustieles <daniel.mustieles@gmail.com>
+ - Brian Masney <masneyb@onstation.org>
+ - Balázs Úr <urbalazs@gmail.com>
  - Balázs Meskó <meskobalazs@fedoraproject.org>
+ - Andika Triwidada <atriwidada@gnome.org>
 
 Added/updated translations
+ - ca, courtesy of Carles Ferrando Garcia
+ - cs, courtesy of Marek Černocký
  - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - fi, courtesy of Jir Grönroos
  - gl, courtesy of marcos
  - hu, courtesy of Meskó Balázs
- - id, courtesy of Andika Triwidada
+ - id, courtesy of Kukuh Syafaat
+ - pl, courtesy of Piotr Drąg
+ - pt_BR, courtesy of Isaac Ferreira Filho
+ - sr, courtesy of Мирослав Николић
+ - sr@latin, courtesy of Miroslav Nikolić
+ - sv, courtesy of Anders Jonsson
  - zh_TW, courtesy of Cheng-Chia Tseng
 
-Shotwell 0.26.3 - 10 Aug 2017
-  * Fix missing XML escape in wallpaper.xml file
-  * Fix missing "Photos" menu content
-  * Fix missing "find" icon
-  * Fix build macro for appstream
-  * Fix data loss/corruption issue when importing from camera
+Shotwell 0.27.0 - 19 Jun 2017
+  * Remove F-Spot import support
+  * Create a commandline utility to test image transformations
+  * Speed up color transformations a bit
+  * Bump GTK+ requirement to 3.18 and remove deprecated functions
+  * Clean-up histogram drawing code
+  * Run thumbnailer with nice 19
+  * Update VAAPI blacklisting for video thumbnailer and new plugin structure
+  * Add configurable image background
+  * Split several dialogs from shotwell.ui file
+  * Move Tumblr to default plugin set
+  * Remove some unnecessary memcpys on import
+  * Add Meson build support
+  * Some more ngettext for plurals
+  * Add --fullscreen/-f option for viewer
+  * Add option to install Ubuntu apport hook
+  * Fix issue when importing to NTFS-backed vboxfs
+  * Fix GSettings schema search path for running out-of-tree
+  * Work around "Camera locked: -53" error on GNOME
+  * Fix issue with missing highlight on dnd actions
 
 Bugs fixed in this release:
- - https://bugzilla.gnome.org/show_bug.cgi?id=784661
- - https://bugzilla.gnome.org/show_bug.cgi?id=784883
- - https://bugzilla.gnome.org/show_bug.cgi?id=785196
- - https://bugzilla.gnome.org/show_bug.cgi?id=785503
- - https://bugzilla.gnome.org/show_bug.cgi?id=785761
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716448
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716499
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716547
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716599
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716708
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716830
+ - https://bugzilla.gnome.org/show_bug.cgi?id=717767
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718809
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718846
+ - https://bugzilla.gnome.org/show_bug.cgi?id=719020
+ - https://bugzilla.gnome.org/show_bug.cgi?id=719031
+ - https://bugzilla.gnome.org/show_bug.cgi?id=719240
+ - https://bugzilla.gnome.org/show_bug.cgi?id=733652
+ - https://bugzilla.gnome.org/show_bug.cgi?id=742563
+ - https://bugzilla.gnome.org/show_bug.cgi?id=752008
+ - https://bugzilla.gnome.org/show_bug.cgi?id=760868
+ - https://bugzilla.gnome.org/show_bug.cgi?id=768938
+ - https://bugzilla.gnome.org/show_bug.cgi?id=773267
+ - https://bugzilla.gnome.org/show_bug.cgi?id=774650
+ - https://bugzilla.gnome.org/show_bug.cgi?id=780811
+ - https://bugzilla.gnome.org/show_bug.cgi?id=781567
+ - https://bugzilla.gnome.org/show_bug.cgi?id=781897
+ - https://bugzilla.gnome.org/show_bug.cgi?id=783250
 
 All contributors to this release:
  - Jens Georg <mail@jensge.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Jordi Mas <jmas@softcatala.org>
+ - gogo <trebelnik2@gmail.com>
+ - Andika Triwidada <atriwidada@gnome.org>
+ - Rafael Fontenelle <rafaelff@gnome.org>
  - Mario Blättermann <mario.blaettermann@gmail.com>
- - Marek Černocký <marek@manet.cz>
- - Brian Masney <masneyb@onstation.org>
+ - Jeremy Bicha <jbicha@ubuntu.com>
+ - Enrico Nicoletto <liverig@gmail.com>
+ - Emin Tufan Çetin <etcetin@gmail.com>
+ - Dušan Kazik <prescott66@gmail.com>
+ - Daniel Mustieles <daniel.mustieles@gmail.com>
+ - Claude Paroz <claude@2xlibre.net>
+ - Anders Jonsson <anders.jonsson@norsjovallen.se>
+ - Alan Mortensen <alanmortensen.am@gmail.com>
 
 Added/updated translations
- - cs, courtesy of Marek Černocký
- - de, courtesy of Christian Kirbach
+ - ca, courtesy of Jordi Mas
+ - da, courtesy of Alan Mortensen
+ - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - fr, courtesy of Claude Paroz
+ - hr, courtesy of gogo
+ - id, courtesy of Andika Triwidada
+ - pl, courtesy of Piotr Drąg
+ - pt_BR, courtesy of Enrico Nicoletto
+ - sk, courtesy of Dušan Kazik
+ - sv, courtesy of Anders Jonsson
+ - tr, courtesy of Emin Tufan Çetin
 
 Shotwell 0.26.2 - 1 Jun 2017
   * Fix issue when minimizing publishing UI on Unity
diff --git a/app-icons/meson.build b/app-icons/meson.build
new file mode 100644
index 0000000..7cf43a7
--- /dev/null
+++ b/app-icons/meson.build
@@ -0,0 +1,14 @@
+install_subdir('16x16',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('22x22',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('24x24',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('256x256',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('32x32',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('48x48',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
+install_subdir('symbolic',
+               install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor'))
diff --git a/apport/Makefile.am b/apport/Makefile.am
new file mode 100644
index 0000000..2d38c50
--- /dev/null
+++ b/apport/Makefile.am
@@ -0,0 +1,2 @@
+apportdir = $(datadir)/apport/package-hooks
+apport_DATA = shotwell.py
diff --git a/apport/Makefile.in b/apport/Makefile.in
new file mode 100644
index 0000000..fdbb867
--- /dev/null
+++ b/apport/Makefile.in
@@ -0,0 +1,564 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = apport
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \
+	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+	$(top_srcdir)/m4/ax_is_release.m4 \
+	$(top_srcdir)/m4/ax_require_defined.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(apportdir)"
+DATA = $(apport_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+API_VERSION = @API_VERSION@
+APPSTREAM_UTIL = @APPSTREAM_UTIL@
+AR = @AR@
+AUTHENTICATOR_CFLAGS = @AUTHENTICATOR_CFLAGS@
+AUTHENTICATOR_LIBS = @AUTHENTICATOR_LIBS@
+AUTHENTICATOR_PACKAGES = @AUTHENTICATOR_PACKAGES@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIT = @GIT@
+GITVER = @GITVER@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
+HAVE_EXTRA_PLUGINS = @HAVE_EXTRA_PLUGINS@
+HAVE_UNITY = @HAVE_UNITY@
+HELP_DIR = @HELP_DIR@
+IMPORT_CFLAGS = @IMPORT_CFLAGS@
+IMPORT_LIBS = @IMPORT_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ITSTOOL = @ITSTOOL@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MICRO_VERSION = @MICRO_VERSION@
+MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
+PLUGIN_LIBS = @PLUGIN_LIBS@
+POSUB = @POSUB@
+PUBLISHER_VALAFLAGS = @PUBLISHER_VALAFLAGS@
+PUBLISHING_CFLAGS = @PUBLISHING_CFLAGS@
+PUBLISHING_LIBS = @PUBLISHING_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHOTWELL_CFLAGS = @SHOTWELL_CFLAGS@
+SHOTWELL_LIBS = @SHOTWELL_LIBS@
+STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TRANSITIONS_CFLAGS = @TRANSITIONS_CFLAGS@
+TRANSITIONS_LIBS = @TRANSITIONS_LIBS@
+UNITY_CFLAGS = @UNITY_CFLAGS@
+UNITY_LIBS = @UNITY_LIBS@
+UNITY_VALAFLAGS = @UNITY_VALAFLAGS@
+USE_NLS = @USE_NLS@
+VALAC = @VALAC@
+VALAFLAGS = @VALAFLAGS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+appstreamxmldir = @appstreamxmldir@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+apportdir = $(datadir)/apport/package-hooks
+apport_DATA = shotwell.py
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign apport/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign apport/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-apportDATA: $(apport_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(apport_DATA)'; test -n "$(apportdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(apportdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(apportdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apportdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(apportdir)" || exit $$?; \
+	done
+
+uninstall-apportDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(apport_DATA)'; test -n "$(apportdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(apportdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(apportdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-apportDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-apportDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-apportDATA install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-apportDATA
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/apport/meson.build b/apport/meson.build
new file mode 100644
index 0000000..0c1b060
--- /dev/null
+++ b/apport/meson.build
@@ -0,0 +1,2 @@
+install_data('shotwell.py',
+             install_dir : join_paths(get_option('datadir'), 'apport', 'package-hooks'))
diff --git a/apport/shotwell.py b/apport/shotwell.py
new file mode 100644
index 0000000..a6a0183
--- /dev/null
+++ b/apport/shotwell.py
@@ -0,0 +1,7 @@
+import os.path
+import apport.hookutils
+
+def add_info(report):
+    log_file = os.path.expanduser('~/.cache/shotwell/shotwell.log')
+    apport.hookutils.attach_file_if_exists(report, log_file, 'shotwell.log')
+
diff --git a/authenticator.am b/authenticator.am
index abc0fa3..2de83ed 100644
--- a/authenticator.am
+++ b/authenticator.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES += plugins/authenticator/libshotwell-authenticator.la
 
 dist_noinst_DATA += \
-	plugins/authenticator/shotwell/flickr_pin_entry_pane.ui \
+	plugins/authenticator/shotwell/tumblr_authentication_pane.ui \
 	plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml \
 	plugins/authenticator/shotwell-authenticator.h
 
@@ -38,7 +38,7 @@ MOSTLYCLEANFILES += plugins/authenticator/resource.c
 
 AUTHENTICATOR_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
 		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
-		--generate-dependencies $(AUTHENTICATOR_SHOTWELL_RESOURCE_FILE))
+		--generate-dependencies $(AUTHENTICATOR_RESOURCE_FILE))
 
 plugins/authenticator/resource.c: $(AUTHENTICATOR_RESOURCE_DEPS) $(AUTHENTICATOR_RESOURCE_FILE)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
@@ -54,5 +54,7 @@ plugins_authenticator_libshotwell_authenticator_la_SOURCES += \
 	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala \
 	plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala \
 	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala \
-	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+	plugins/authenticator/shotwell/GoogleAuthenticator.vala \
+	plugins/authenticator/shotwell/OAuth1Authenticator.vala \
+	plugins/authenticator/shotwell/TumblrAuthenticator.vala
 endif
diff --git a/configure b/configure
index 89983b8..bf5c2de 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.26.4.
+# Generated by GNU Autoconf 2.69 for shotwell 0.28.2.
 #
 # 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.26.4'
-PACKAGE_STRING='shotwell 0.26.4'
+PACKAGE_VERSION='0.28.2'
+PACKAGE_STRING='shotwell 0.28.2'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -730,6 +730,8 @@ HAVE_EXTRA_PLUGINS_FALSE
 HAVE_EXTRA_PLUGINS_TRUE
 HAVE_EXTRA_PLUGINS
 PUBLISHER_VALAFLAGS
+INSTALL_APPORT_HOOK_FALSE
+INSTALL_APPORT_HOOK_TRUE
 HAVE_UNITY_FALSE
 HAVE_UNITY_TRUE
 HAVE_UNITY
@@ -909,6 +911,7 @@ with_libintl_prefix
 enable_schemas_compile
 with_authenticator
 enable_unity_support
+enable_apport_hook
 enable_publishers
 enable_extra_plugins
 enable_shared
@@ -1502,7 +1505,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.26.4 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.28.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.26.4:";;
+     short | recursive ) echo "Configuration of shotwell 0.28.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1597,9 +1600,10 @@ Optional Features:
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --enable-unity-support  Enable Ubuntu Unity integration
+  --enable-apport-hook    Install apport hook
   --enable-publishers=[list-of-publishers or all]
                           A comma-separated list of publishers from
-                          facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex
+                          facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr
   --disable-extra-plugins Enable building and installation of extra publishing
                           plugins
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1746,7 +1750,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.26.4
+shotwell configure 0.28.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2024,7 +2028,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.26.4, which was
+It was created by shotwell $as_me 0.28.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2483,14 +2487,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 MAJOR_VERSION=0
 
-MINOR_VERSION=26
+MINOR_VERSION=28
 
-MICRO_VERSION=4
+MICRO_VERSION=2
 
 API_VERSION=0
 
 
-GITVER=5bd7d9a736997289de10c3bcdbaa089955e46233
+GITVER=4125c3461149ddec7fb58f58390a5c052eb7f1fc
 
 
  if test "x$GITVER" != "x"; then
@@ -2988,7 +2992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.26.4'
+ VERSION='0.28.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8000,7 +8004,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8018,7 +8022,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8039,7 +8043,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8068,7 +8072,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8086,7 +8090,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8107,7 +8111,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8145,7 +8149,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8164,7 +8168,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8186,7 +8190,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8234,14 +8238,14 @@ if test -n "$THUMBNAILER_CFLAGS"; then
     pkg_cv_THUMBNAILER_CFLAGS="$THUMBNAILER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8254,14 +8258,14 @@ if test -n "$THUMBNAILER_LIBS"; then
     pkg_cv_THUMBNAILER_LIBS="$THUMBNAILER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8283,16 +8287,16 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         else
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THUMBNAILER_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0) were not met:
 
 $THUMBNAILER_PKG_ERRORS
@@ -8945,18 +8949,35 @@ else
 fi
 
 
+# Check whether --enable-apport-hook was given.
+if test "${enable_apport_hook+set}" = set; then :
+  enableval=$enable_apport_hook;
+else
+  enable_apport_hook=no
+fi
+
+
+ if test "x$enable_apport_hook" != "xno"; then
+  INSTALL_APPORT_HOOK_TRUE=
+  INSTALL_APPORT_HOOK_FALSE='#'
+else
+  INSTALL_APPORT_HOOK_TRUE='#'
+  INSTALL_APPORT_HOOK_FALSE=
+fi
+
+
 
 
 # Check whether --enable-publishers was given.
 if test "${enable_publishers+set}" = set; then :
   enableval=$enable_publishers;
 else
-  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr"
 fi
 
 
 if test "$xenable_publishers" = "xall"; then :
-  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr"
 fi
 
 save_ifs=$IFS
@@ -17145,7 +17166,7 @@ else
 fi
 fi
 
-  appstreamxmldir=${datadir}/appdata
+  appstreamxmldir=${datadir}/metainfo
 
 
   APPSTREAM_XML_RULES='
@@ -17193,7 +17214,7 @@ clean-appstream-xml:
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 
 
-ac_config_files="$ac_config_files Makefile misc/Makefile po/Makefile.in help/Makefile app-icons/Makefile icons/Makefile ui/Makefile"
+ac_config_files="$ac_config_files Makefile misc/Makefile po/Makefile.in help/Makefile app-icons/Makefile icons/Makefile ui/Makefile apport/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -17360,6 +17381,10 @@ if test -z "${HAVE_UNITY_TRUE}" && test -z "${HAVE_UNITY_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_UNITY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${INSTALL_APPORT_HOOK_TRUE}" && test -z "${INSTALL_APPORT_HOOK_FALSE}"; then
+  as_fn_error $? "conditional \"INSTALL_APPORT_HOOK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_EXTRA_PLUGINS_TRUE}" && test -z "${HAVE_EXTRA_PLUGINS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_EXTRA_PLUGINS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17761,7 +17786,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.26.4, which was
+This file was extended by shotwell $as_me 0.28.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17827,7 +17852,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.26.4
+shotwell config.status 0.28.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18258,6 +18283,7 @@ do
     "app-icons/Makefile") CONFIG_FILES="$CONFIG_FILES app-icons/Makefile" ;;
     "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
     "ui/Makefile") CONFIG_FILES="$CONFIG_FILES ui/Makefile" ;;
+    "apport/Makefile") CONFIG_FILES="$CONFIG_FILES apport/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 7c86f18..bdea8b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ dnl ***********************************************************************
 dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
-m4_define([minor_version],[26])
-m4_define([micro_version],[4])
+m4_define([minor_version],[28])
+m4_define([micro_version],[2])
 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])
@@ -113,7 +113,7 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.14.0
+                             gtk+-3.0 >= 3.18.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -121,7 +121,7 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
                             ])
-PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
+PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.18.0
                                 gstreamer-base-1.0 >= 1.0.0])
 
 PKG_CHECK_MODULES(PLUGIN, [gobject-2.0 glib-2.0 json-glib-1.0 libxml-2.0
@@ -166,10 +166,21 @@ AC_SUBST([HAVE_UNITY])
 AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
 
 dnl ***********************************************************************
+dnl Ubuntu apport hook
+dnl ***********************************************************************
+AC_ARG_ENABLE([apport-hook],
+              AS_HELP_STRING([--enable-apport-hook],
+                             [Install apport hook]),
+              [],
+              [enable_apport_hook=no])
+
+AM_CONDITIONAL([INSTALL_APPORT_HOOK], [test "x$enable_apport_hook" != "xno"])
+
+dnl ***********************************************************************
 dnl Publishers
 dnl ***********************************************************************
 
-m4_define(ALL_PUBLISHERS, [facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex])
+m4_define(ALL_PUBLISHERS, [facebook, flickr, picasa, piwigo, youtube, gallery3, tumblr])
 AC_ARG_ENABLE([publishers],
             AS_HELP_STRING([--enable-publishers=@<:@list-of-publishers or all@:>@],
                            [A comma-separated list of publishers from ALL_PUBLISHERS]),
@@ -275,6 +286,7 @@ AC_CONFIG_FILES([
     app-icons/Makefile
     icons/Makefile
     ui/Makefile
+    apport/Makefile
 ],[],
 [API_VERSION='$API_VERSION'])
 AC_OUTPUT
diff --git a/git-hash b/git-hash
new file mode 100755
index 0000000..bcb8f94
--- /dev/null
+++ b/git-hash
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd $MESON_SOURCE_ROOT
+exec git rev-parse HEAD 2>/dev/null
diff --git a/help/C/edit-adjustments.page b/help/C/edit-adjustments.page
index d96b8fe..a388a7b 100644
--- a/help/C/edit-adjustments.page
+++ b/help/C/edit-adjustments.page
@@ -25,6 +25,10 @@
    <p>Changes the brightness to make it look like the photo was exposed for a longer or shorter time. Use this to correct under- or over-exposed photos.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Saturation</title>
    <p>Changes how vivid colors look. If your photo looks gray and washed out, try increasing the saturation. If colors look too bold, try decreasing it.</p>
   </item>
diff --git a/help/C/import-f-spot.page b/help/C/import-f-spot.page
deleted file mode 100644
index f96c128..0000000
--- a/help/C/import-f-spot.page
+++ /dev/null
@@ -1,22 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide"
-      id="import-f-spot">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell can import all your photos and tags from the F-Spot photo manager.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Importing from F-Spot</title>
-
-    <p>To import an existing photo collection from F-Spot:</p>
-    <steps>
-    <item><p>Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>. </p></item>
-    <item><p>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.</p></item>
-    </steps>
-    <p>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.</p>
-</page>
diff --git a/help/C/import-file.page b/help/C/import-file.page
index da25e4e..fcbeb46 100644
--- a/help/C/import-file.page
+++ b/help/C/import-file.page
@@ -6,14 +6,14 @@
         <link type="guide" xref="index#import"/>
         <desc>Import photos that are already saved on your computer.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     </info>
 
 	<title>Importing from your hard disk</title>
 
     <p>To import photo files from your hard disk into Shotwell, just drag them from your file browser into the Shotwell window.</p>
     
-    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>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.</p>
     
diff --git a/help/C/other-files.page b/help/C/other-files.page
index 20bb9f8..9a9bd98 100644
--- a/help/C/other-files.page
+++ b/help/C/other-files.page
@@ -70,7 +70,7 @@
         </table>
 
         <p>
-            There are other symbols available; please check the manual for strftime by running 
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
             the command <cmd>man strftime</cmd> if you need one that isn't listed here.
         </p>
     </section>
diff --git a/help/C/share-export.page b/help/C/share-export.page
index 992ca11..693a52a 100644
--- a/help/C/share-export.page
+++ b/help/C/share-export.page
@@ -35,7 +35,14 @@ Shotwell will be included, and Shotwell will convert photos to the destination f
 </list>
 </item>
 <item><p>The image quality for exporting (Low, Medium, High, or Maximum).</p></item>
-<item><p>A scaling constraint (which means how Shotwell will decide to scale the photos down), and the desired pixel size.</p></item>
+<item><p>A scaling constraint (which means how Shotwell will decide to scale the photos down), and the desired pixel size.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</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>
 </list>
 
diff --git a/help/C/share-upload.page b/help/C/share-upload.page
index 739e73e..76740a5 100644
--- a/help/C/share-upload.page
+++ b/help/C/share-upload.page
@@ -15,17 +15,17 @@
     and videos to the following services, each of which requires an account:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (videos only)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, a photo site popular in Russia (photos only)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Any site running the <link href="http://piwigo.org">Piwigo</link> photo gallery software (photos only)</p></item>
     </list>
     
     <p>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>.
+     <guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</gui> toolbar button or use <keyseq><key>Ctrl</key><key>Shift</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.</p>
     
     <p>Publishing to Facebook requires you to grant certain permissions to the Shotwell Facebook application.
diff --git a/help/C/view-sidebar.page b/help/C/view-sidebar.page
index 2da4674..25c5d25 100644
--- a/help/C/view-sidebar.page
+++ b/help/C/view-sidebar.page
@@ -11,7 +11,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/Makefile.am b/help/Makefile.am
index 30fa388..834851f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -28,7 +28,6 @@ HELP_FILES = \
 	formats.page \
 	import-camera.page \
 	import-file.page \
-	import-f-spot.page \
 	import-memorycard.page \
 	index.page \
 	organize-event.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index 4c1b00d..caa4386 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -367,7 +367,6 @@ HELP_FILES = \
 	formats.page \
 	import-camera.page \
 	import-file.page \
-	import-f-spot.page \
 	import-memorycard.page \
 	index.page \
 	organize-event.page \
diff --git a/help/cs/cs.po b/help/cs/cs.po
index c5a71d8..db4a21a 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -1,13 +1,13 @@
 # Czech translation for shotwell.
 # Copyright (C) 2014 shotwell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the shotwell package.
-# Marek Černocký <marek@manet.cz>, 2014, 2016.
+# Marek Černocký <marek@manet.cz>, 2014, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2016-09-04 08:44+0000\n"
-"PO-Revision-Date: 2016-09-13 11:15+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-01-26 22:00+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -89,11 +89,26 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/edit-adjustments.page:28
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:29
+msgid ""
+"Changes the contrast of a photo. Use it to correct flat-looking photos or "
+"photos where the difference between bright and dark spots seems to big."
+msgstr ""
+"Mění kontrast fotografie. To můžete využít k opravě fotografií, které mají "
+"malou „hloubku“, nebo u kterých nedobře působí příliš velké rozdíly mezi "
+"světlými a tmavými plochami."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:32
 msgid "Saturation"
 msgstr "Sytost"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:29
+#: C/edit-adjustments.page:33
 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."
@@ -102,12 +117,12 @@ msgstr ""
 "zkuste zvýšit sytost. Když barvy naopak příliš křičí, zkuste ji snížit."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:32
+#: C/edit-adjustments.page:36
 msgid "Tint"
 msgstr "Odstín"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:33
+#: C/edit-adjustments.page:37
 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 "
@@ -120,12 +135,12 @@ msgstr ""
 "na „žárovka“ mají modrý nádech."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:36
+#: C/edit-adjustments.page:40
 msgid "Temperature"
 msgstr "Teplota"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:37
+#: C/edit-adjustments.page:41
 msgid ""
 "Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
 "depressing scenes look more lively, for example."
@@ -134,12 +149,12 @@ msgstr ""
 "použít například k tomu, aby studené depresivní scény vypadaly více živě."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:40
+#: C/edit-adjustments.page:44
 msgid "Shadows"
 msgstr "Tóny"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:41
+#: C/edit-adjustments.page:45
 msgid ""
 "This makes shadowy areas appear lighter. Use this to make detail more "
 "visible if it's obscured by the darkness of a shadow."
@@ -148,12 +163,12 @@ msgstr ""
 "tonou v tmavých stínech."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:44
+#: C/edit-adjustments.page:48
 msgid "Intensity Threshold (sliders on the histogram)"
 msgstr "Práh intenzity (táhla na histogramu)"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:45
+#: C/edit-adjustments.page:49
 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 "
@@ -163,18 +178,6 @@ msgstr ""
 "nejtmavější černá. Použijte ke změně kontrastu fotografie. Změna tohoto "
 "nastavení může přinést výsledky u fotografií, které vypadají mdle a vybledle."
 
-#. (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."
@@ -307,6 +310,18 @@ msgstr ""
 "Oříznutí fotografie podle pravidla třetin čas přinese výsledek v podobě "
 "mnohem působivějšího obrázku."
 
+#. (itstool) path: section/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: media/p
 #: C/edit-crop.page:43
 msgid ""
@@ -721,13 +736,13 @@ msgstr "Podporované formáty fotografií a videí"
 #. (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."
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link xref=\"other-raw\">RAW</"
+"link> photo files. Shotwell does not yet support other graphics format such "
+"as GIF."
 msgstr ""
 "Shotwell podporuje soubory s fotografiemi ve formátech JPEG, PNG, TIFF, BMP "
-"a <link type=\"guide\" xref=\"other-raw\">RAW</link>. Zatím nepodporuje "
-"další formáty, jako je třeba GIF."
+"a <link xref=\"other-raw\">RAW</link>. Zatím nepodporuje další formáty, jako "
+"je třeba GIF."
 
 #. (itstool) path: page/p
 #: C/formats.page:16
@@ -748,10 +763,10 @@ msgstr ""
 #: 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."
+"<link xref=\"other-raw\">RAW</link> section."
 msgstr ""
 "Více informací o formátu fotografií RAW v aplikaci Shotwell najdete v oddíle "
-"<link type=\"guide\" xref=\"other-raw\">RAW</link>."
+"<link xref=\"other-raw\">RAW</link>."
 
 #. (itstool) path: page/p
 #: C/formats.page:22
@@ -884,11 +899,16 @@ msgstr ""
 #: 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."
+"gui></guiseq> and select the folder containing the photos you want to "
+"import. If you do not want Shotwell to recurse into subfolders while "
+"importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox "
+"on the bottom of the file dialog."
 msgstr ""
 "Případně můžete kliknout na <guiseq><gui>Soubor</gui> <gui>Importovat ze "
 "složky…</gui></guiseq> a vyberte složku obsahující fotografie, které chcete "
-"importovat."
+"importovat. Jestliže nechcete, aby se Shotwell při importu zanořoval "
+"postupně do podsložek, můžete zrušit zaškrtnutí volby <gui>Zanořovat se do "
+"podsložek</gui> ve spodní části dialogového okna."
 
 #. (itstool) path: page/p
 #: C/import-file.page:18
@@ -928,56 +948,6 @@ msgstr ""
 "importovaným fotografiím."
 
 #. (itstool) path: info/desc
-#: C/import-f-spot.page:7
-msgid ""
-"Shotwell can import all your photos and tags from the F-Spot photo manager."
-msgstr ""
-"Shotwell umí naimportovat všechny fotografie a štítky ze správce fotografií "
-"F-Spot."
-
-#. (itstool) path: page/title
-#: C/import-f-spot.page:12
-msgid "Importing from F-Spot"
-msgstr "Import z aplikace F-Spot"
-
-#. (itstool) path: page/p
-#: C/import-f-spot.page:14
-msgid "To import an existing photo collection from F-Spot:"
-msgstr "Když chcete importovat stávající sbírku fotografií z aplikace 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 ""
-"Vyberte <guiseq><gui>Soubor</gui><gui>Importovat z aplikace</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 ""
-"Nyní zvolte buď výchozí knihovnu F-Spot nebo jinou databázi F-Spot. V "
-"případě, že importujete z jiné databáze F-Sport, vyberte složku a soubor v "
-"dialogovém okně, které se objeví."
-
-#. (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 naimportuje vaše fotografie, spolu s jejich štítky a dalšími "
-"informacemi. Jakmile je import dokončen, můžete v postranním panelu vybrat "
-"<gui>Poslední import</gui>, abyste viděli všechny naimportované fotografie. "
-"Rovněž v seznamu událostí se objeví nové položky s daty odpovídajícími "
-"importovaným fotografiím."
-
-#. (itstool) path: info/desc
 #: C/import-memorycard.page:7
 msgid "Import photos from a digital camera's memory card."
 msgstr "Jak importovat fotografie z paměťové karty z digitálního fotoaparátu."
@@ -1043,59 +1013,53 @@ msgstr ""
 "<link xref=\"import-camera\">přímo připojením svého fotoaparátu k počítači</"
 "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
+#: C/index.page:8
 msgid "Jim Nelson"
 msgstr "Jim Nelson"
 
 #. (itstool) path: credit/name
-#: C/index.page:11
+#: C/index.page:10
 msgid "Allison Barlow"
 msgstr "Allison Barlow"
 
 #. (itstool) path: credit/name
-#: C/index.page:13
+#: C/index.page:12
 msgid "Robert Ancell"
 msgstr "Robert Ancell"
 
 #. (itstool) path: credit/name
-#: C/index.page:15
+#: C/index.page:14
 msgid "Peter Smith"
 msgstr "Peter Smith"
 
 #. (itstool) path: credit/name
-#: C/index.page:17
+#: C/index.page:16
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
+#. (itstool) path: title/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:22
+msgctxt "_"
+msgid ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+msgstr ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+
 #. (itstool) path: page/title
-#: C/index.page:23
+#: C/index.page:22
 msgid ""
 "<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
 "Manager"
@@ -1104,32 +1068,32 @@ msgstr ""
 "Shotwell"
 
 #. (itstool) path: section/title
-#: C/index.page:26
+#: C/index.page:25
 msgid "Importing Photos"
 msgstr "Import fotografií"
 
 #. (itstool) path: section/title
-#: C/index.page:30
+#: C/index.page:29
 msgid "Viewing Photos"
 msgstr "Zobrazení fotografií"
 
 #. (itstool) path: section/title
-#: C/index.page:34
+#: C/index.page:33
 msgid "Organizing Photos"
 msgstr "Třídění fotografií"
 
 #. (itstool) path: section/title
-#: C/index.page:38
+#: C/index.page:37
 msgid "Editing Photos"
 msgstr "Úprava fotografií"
 
 #. (itstool) path: section/title
-#: C/index.page:42
+#: C/index.page:41
 msgid "Sharing Photos"
 msgstr "Sdílení fotografií"
 
 #. (itstool) path: section/title
-#: C/index.page:46
+#: C/index.page:45
 msgid "Other Features"
 msgstr "Ostatní funkce"
 
@@ -1461,20 +1425,6 @@ msgstr ""
 "<guiseq><gui>Hodnotit</gui><gui>Snížit</gui></guiseq>, nebo klávesovými "
 "zkratkami <key>&lt;</key> a <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 ""
@@ -1495,6 +1445,20 @@ msgstr ""
 "Fotografie můžete odebrat z knihovny a navíc i úplně smazat z pevného disku."
 
 #. (itstool) path: page/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: media/p
 #: C/organize-remove.page:15
 msgid "Delete process"
 msgstr "Postup mazání"
@@ -2192,13 +2156,13 @@ msgstr "odp."
 #. (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."
+"There are other symbols available; please check the <link href=\"man:strftime"
+"\">manual for strftime</link> by running the command <cmd>man strftime</cmd> "
+"if you need one that isn't listed here."
 msgstr ""
 "Existují ještě další symboly, které zde uvedené nejsou. Jestli vás zajímají, "
-"podívejte se do příručky k funkci strftime, stačí použít příkaz <cmd>man "
-"strftime</cmd>."
+"podívejte se do <link href=\"man:strftime\">příručky k funkci strftime</"
+"link>, stačí použít příkaz <cmd>man strftime</cmd>."
 
 #. (itstool) path: section/title
 #: C/other-files.page:79
@@ -2760,11 +2724,67 @@ msgid ""
 "A scaling constraint (which means how Shotwell will decide to scale the "
 "photos down), and the desired pixel size."
 msgstr ""
-"Pravidlo pro škálování (což znamená, jak se má Shotwell chovat při škálování "
-"fotografií na menší rozměr) a požadovaná velikost v pixelech."
+"Pravidlo pro škálování (což znamená, jak se má Shotwell chovat při změně "
+"velikosti fotografie na menší rozměr) a požadovaná velikost v pixelech."
+
+#. (itstool) path: item/title
+#: C/share-export.page:40
+msgid "Original size"
+msgstr "Původní velikost"
+
+#. (itstool) path: item/p
+#: C/share-export.page:40
+msgid "Image will be exported without any scaling applied"
+msgstr "Obrázek bude exportován bez použití změny velikosti"
+
+#. (itstool) path: item/title
+#: C/share-export.page:41
+msgid "Longest edge"
+msgstr "Delší strana"
+
+#. (itstool) path: item/p
+#: C/share-export.page:41
+msgid ""
+"Image will be exported by having its longest edge scaled to <gui>Pixels</"
+"gui> and the other according to the aspect ratio"
+msgstr ""
+"Obrázek bude exportována tak, aby u delší strany došlo ke změně velikosti na "
+"<gui>Počet pixelů</gui> a u druhé úměrně tomu při zachování poměru stran."
+
+#. (itstool) path: item/title
+#: C/share-export.page:42
+msgid "Width"
+msgstr "Šířka"
 
 #. (itstool) path: item/p
-#: C/share-export.page:39
+#: C/share-export.page:42
+msgid ""
+"The image width will have its width scaled to the given pixel size and its "
+"height according to the aspect ratio. This is equivalent to <gui>Longest "
+"Edge</gui> for landscape pictures."
+msgstr ""
+"U obrázku dojde ke změně šířky na zadaný počet pixelů a u výšky na úměrný "
+"počet pixelů tak, aby byl zachován počet stran. Výsledek je stejný, jako "
+"když použijete volbu <gui>Delší strana</gui> u obrázku otočeného na šířku."
+
+#. (itstool) path: item/title
+#: C/share-export.page:43
+msgid "Height"
+msgstr "Výška"
+
+#. (itstool) path: item/p
+#: C/share-export.page:43
+msgid ""
+"The image height will have its height scaled to the given pixel size and its "
+"width according to the aspect ratio. This is equivalent to <gui>Longest "
+"Edge</gui> for portrait pictures."
+msgstr ""
+"U obrázku dojde ke změně výšky na zadaný počet pixelů a u šiřky na úměrný "
+"počet pixelů tak, aby byl zachován počet stran. Výsledek je stejný, jako "
+"když použijete volbu <gui>Delší strana</gui> u obrázku otočeného na výšku."
+
+#. (itstool) path: item/p
+#: C/share-export.page:46
 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 "
@@ -2775,7 +2795,7 @@ msgstr ""
 "údaji nebo jiné štítky, které nechcete, aby viděl někdo jiný."
 
 #. (itstool) path: page/p
-#: C/share-export.page:42
+#: C/share-export.page:49
 msgid ""
 "If selected, Shotwell will write tags, titles, and other metadata to the new "
 "files."
@@ -2937,36 +2957,32 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/share-upload.page:18
-msgid "<link href=\"http://facebook.com\">Facebook</link>"
-msgstr "<link href=\"http://facebook.cz\">Facebook</link>"
+msgid "<link href=\"https://facebook.com\">Facebook</link>"
+msgstr "<link href=\"https://facebook.cz\">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>"
+msgid "<link href=\"https://flickr.com\">Flickr</link>"
+msgstr "<link href=\"https://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=\"https://picasaweb.google.com\">Picasa Web Albums</link> and "
 "<link href=\"http://plus.google.com\">Google+</link>"
 msgstr ""
-"<link href=\"http://picasaweb.google.cz\">Picasa Web Albums</link> a <link "
+"<link href=\"https://picasaweb.google.cz\">Picasa Web Albums</link> a <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.cz\">YouTube</link> (jen videa)"
+msgid "<link href=\"https://youtube.com\">YouTube</link> (videos only)"
+msgstr "<link href=\"https://youtube.cz\">YouTube</link> (jen videa)"
 
 #. (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>, fotoserver "
-"populární v Rusku (jen fotografie)"
+msgid "<link href=\"https://tumblr.com\">Tumblr</link> (videos only)"
+msgstr "<link href=\"https://tumblr.com\">Tumblr</link> (jen videa)"
 
 #. (itstool) path: item/p
 #: C/share-upload.page:23
@@ -2984,19 +3000,19 @@ msgid ""
 "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."
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>Shift</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 ""
 "Když chcete zveřejnit vybrané fotografie ze sbírky, zvolte "
 "<guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a klikněte na kartu "
 "<gui>Zásuvné moduly</gui>, abyste povolili zásuvný modul pro službu, kterou "
 "chcete ke zveřejnění použít. Následně zvolte <guiseq><gui>Soubor</gui> "
 "<gui>Zveřejnit</gui></guiseq> nebo zmáčkněte tlačítko <gui>Zveřejnit</gui> "
-"na nástrojové liště nebo použijte klávesovou zkratku <keyseq><key>Ctrl</"
-"key><key>P</key></keyseq>. Uvidíte dialogové okno, ve kterém si můžete "
-"vybrat požadovanou službu. Následně se k ní musíte přihlásit, připadně si "
-"vytvořit účet."
+"na nástrojové liště nebo použijte klávesovou zkratku <keyseq><key>Ctrl</key>"
+"<key>Shift</key><key>P</key></keyseq>. Uvidíte dialogové okno, ve kterém si "
+"můžete vybrat požadovanou službu. Následně se k ní musíte přihlásit, připadně "
+"si vytvořit účet."
 
 #. (itstool) path: page/p
 #: C/share-upload.page:31
@@ -3183,12 +3199,12 @@ msgstr ""
 "Postranní panel na levé straně okna vypisuje různá zobrazení vaší knihovny."
 
 #. (itstool) path: page/title
-#: C/view-sidebar.page:21
+#: C/view-sidebar.page:20
 msgid "The sidebar"
 msgstr "Postranní panel"
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:23
+#: C/view-sidebar.page:22
 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 "
@@ -3199,7 +3215,7 @@ msgstr ""
 "disku je uchována jen v jedné kopii."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:25
+#: C/view-sidebar.page:24
 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."
@@ -3209,21 +3225,21 @@ msgstr ""
 "fotoaparátu, z paměťové karty nebo z pevného disku."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:27
+#: C/view-sidebar.page:26
 msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
 msgstr ""
 "V <gui>Označeno</gui> jsou uvedeny všechny fotografie, které jste již dříve "
 "označili."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:29
+#: C/view-sidebar.page:28
 msgid ""
 "The <gui>Saved Search</gui> allows you to sort your library by many criteria."
 msgstr ""
 "<gui>Uložená hledání</gui> umožňují třídit vaši knihovnu podle řady kritérií."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:31
+#: C/view-sidebar.page:30
 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."
@@ -3232,7 +3248,7 @@ msgstr ""
 "Událost je skupina fotografií, které byly pořízeny přibližně ve stejnou dobu."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:33
+#: C/view-sidebar.page:32
 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 "
@@ -3242,32 +3258,3 @@ msgstr ""
 "fotografiím přiřadili. Každá fotografie může mít přiřazeno více štítků. Když "
 "kliknete na název štítku v postranním panelu, uvidíte všechny fotografie, "
 "které mají takovýto štítek přiřazený."
-
-#~ msgid "Facebook"
-#~ msgstr "Facebook"
-
-#~ msgid "Flickr"
-#~ msgstr "Flickr"
-
-#~ msgid "Symbol"
-#~ msgstr "symbol"
-
-#~ 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/cs/edit-adjustments.page b/help/cs/edit-adjustments.page
index 335595c..5f4dc0c 100644
--- a/help/cs/edit-adjustments.page
+++ b/help/cs/edit-adjustments.page
@@ -24,6 +24,10 @@
    <p>Mění jas, což funguje podobně, jako by byla fotografie exponována po delší nebo kratší čas. Použijte ke korekci podexponované nebo přeexponované fotografie.</p>
   </item>
   <item>
+   <title>Kontrast</title>
+   <p>Mění kontrast fotografie. To můžete využít k opravě fotografií, které mají malou „hloubku“, nebo u kterých nedobře působí příliš velké rozdíly mezi světlými a tmavými plochami.</p>
+  </item>
+  <item>
    <title>Sytost</title>
    <p>Mění, jak jasně vypadají barvy. Když vaše fotografie působí šedě a vybledle, zkuste zvýšit sytost. Když barvy naopak příliš křičí, zkuste ji snížit.</p>
   </item>
diff --git a/help/cs/formats.page b/help/cs/formats.page
index feaa512..5b81591 100644
--- a/help/cs/formats.page
+++ b/help/cs/formats.page
@@ -10,13 +10,11 @@
 
 	<title>Podporované formáty fotografií a videí</title>
 
-   <p>Shotwell supports JPEG, PNG, TIFF, BMP and <link xref="other-raw">RAW</link> photo files. Shotwell does not yet support other graphics format such as GIF.</p>
+   <p>Shotwell podporuje soubory s fotografiemi ve formátech JPEG, PNG, TIFF, BMP a <link xref="other-raw">RAW</link>. Zatím nepodporuje další formáty, jako je třeba GIF.</p>
 
 <p>Podpora RAW je v aplikaci Shotwell prozatím omezená. Když si zobrazíte surovou fotografii RAW, zobrazí se vám ve skutečnosti JPEG odvozený z RAW, ne přímo RAW. Navíc, propojovací roura k editoru není plně 16bitová – upravované fotografie můžete exportovat jen jako 8bitové soubory. K exportu mohou být použity všechny podporované formáty (JPEG, PNG, TIFF, BMP).</p>
 
-<p>For more information about RAW-format photos in Shotwell, please see
-the <link xref="other-raw">RAW</link> section.
-</p>
+<p>Více informací o formátu fotografií RAW v aplikaci Shotwell najdete v oddíle <link xref="other-raw">RAW</link>.</p>
 
 <p>Shotwell podporuje také videosoubory v libovolném formátu, který podporuje multimediální knihovna GStreamer na systému, ve kterém Shotwell běží. Typicky to představuje mimo jiné následující formáty:</p>
 <list>
diff --git a/help/cs/import-f-spot.page b/help/cs/import-f-spot.page
deleted file mode 100644
index 4c67429..0000000
--- a/help/cs/import-f-spot.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="cs">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell umí naimportovat všechny fotografie a štítky ze správce fotografií F-Spot.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Import z aplikace F-Spot</title>
-
-    <p>Když chcete importovat stávající sbírku fotografií z aplikace F-Spot:</p>
-    <steps>
-    <item><p>Vyberte <guiseq><gui>Soubor</gui><gui>Importovat z aplikace</gui></guiseq>.</p></item>
-    <item><p>Nyní zvolte buď výchozí knihovnu F-Spot nebo jinou databázi F-Spot. V případě, že importujete z jiné databáze F-Sport, vyberte složku a soubor v dialogovém okně, které se objeví.</p></item>
-    </steps>
-    <p>Shotwell naimportuje vaše fotografie, spolu s jejich štítky a dalšími informacemi. Jakmile je import dokončen, můžete v postranním panelu vybrat <gui>Poslední import</gui>, abyste viděli všechny naimportované fotografie. Rovněž v seznamu událostí se objeví nové položky s daty odpovídajícími importovaným fotografiím.</p>
-</page>
diff --git a/help/cs/import-file.page b/help/cs/import-file.page
index 569daa7..8c4143f 100644
--- a/help/cs/import-file.page
+++ b/help/cs/import-file.page
@@ -5,14 +5,14 @@
         <link type="guide" xref="index#import"/>
         <desc>Jak importovat fotografie, které jsou již uloženy ve vašem počítači.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     </info>
 
 	<title>Import z pevného disku</title>
 
     <p>Pro naimportování souborů z pevného disku do aplikace Shotwell stačí soubory přetáhnout ze správce souborů do okna Shotwell.</p>
     
-    <p>Případně můžete kliknout na <guiseq><gui>Soubor</gui> <gui>Importovat ze složky…</gui></guiseq> a vyberte složku obsahující fotografie, které chcete importovat.</p>
+    <p>Případně můžete kliknout na <guiseq><gui>Soubor</gui> <gui>Importovat ze složky…</gui></guiseq> a vyberte složku obsahující fotografie, které chcete importovat. Jestliže nechcete, aby se Shotwell při importu zanořoval postupně do podsložek, můžete zrušit zaškrtnutí volby <gui>Zanořovat se do podsložek</gui> ve spodní části dialogového okna.</p>
     
     <p>Shotwell se vás dotáže, jestli chcete soubory s fotografiemi zkopírovat do složky knihovny (což je obvykle složka <file>Obrázky</file> ve vaší domovské složce) nebo je naimportovat s odkazem na stávající umístění, bez kopírování souborů.</p>
     
diff --git a/help/cs/other-files.page b/help/cs/other-files.page
index 72d8b81..4c09dc0 100644
--- a/help/cs/other-files.page
+++ b/help/cs/other-files.page
@@ -48,7 +48,7 @@
             </tbody>
         </table>
 
-        <p>Existují ještě další symboly, které zde uvedené nejsou. Jestli vás zajímají, podívejte se do příručky k funkci strftime, stačí použít příkaz <cmd>man strftime</cmd>.</p>
+        <p>Existují ještě další symboly, které zde uvedené nejsou. Jestli vás zajímají, podívejte se do <link href="man:strftime">příručky k funkci strftime</link>, stačí použít příkaz <cmd>man strftime</cmd>.</p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/cs/share-export.page b/help/cs/share-export.page
index 6b88a8a..12a1a5f 100644
--- a/help/cs/share-export.page
+++ b/help/cs/share-export.page
@@ -23,7 +23,14 @@
 </list>
 </item>
 <item><p>Kvalita exportovaného obrázku (nízká, střední, vysoká nebo maximální).</p></item>
-<item><p>Pravidlo pro škálování (což znamená, jak se má Shotwell chovat při škálování fotografií na menší rozměr) a požadovaná velikost v pixelech.</p></item>
+<item><p>Pravidlo pro škálování (což znamená, jak se má Shotwell chovat při změně velikosti fotografie na menší rozměr) a požadovaná velikost v pixelech.</p>
+<terms>
+<item><title>Původní velikost</title><p>Obrázek bude exportován bez použití změny velikosti</p></item>
+<item><title>Delší strana</title><p>Obrázek bude exportována tak, aby u delší strany došlo ke změně velikosti na <gui>Počet pixelů</gui> a u druhé úměrně tomu při zachování poměru stran.</p></item>
+<item><title>Šířka</title><p>U obrázku dojde ke změně šířky na zadaný počet pixelů a u výšky na úměrný počet pixelů tak, aby byl zachován počet stran. Výsledek je stejný, jako když použijete volbu <gui>Delší strana</gui> u obrázku otočeného na šířku.</p></item>
+<item><title>Výška</title><p>U obrázku dojde ke změně výšky na zadaný počet pixelů a u šiřky na úměrný počet pixelů tak, aby byl zachován počet stran. Výsledek je stejný, jako když použijete volbu <gui>Delší strana</gui> u obrázku otočeného na výšku.</p></item>
+</terms>
+</item>
 <item><p>Volba, jestli chcete exportovat i metadata, jako jsou štítky nebo hodnocení. To vám může pomoci v ochraně soukromí, pokud máte štítky s geolokačními údaji nebo jiné štítky, které nechcete, aby viděl někdo jiný.</p></item>
 </list>
 
diff --git a/help/cs/share-upload.page b/help/cs/share-upload.page
index 9e20684..4651d33 100644
--- a/help/cs/share-upload.page
+++ b/help/cs/share-upload.page
@@ -13,15 +13,15 @@
     <p>Za pomoci <link xref="other-plugins">zásuvných modulů</link> umí Shotwell zveřejňovat fotografie a videa na následujících službách (na každé musíte mít zřízen účet):</p>
     
     <list>
-    <item><p><link href="http://facebook.cz">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.cz">Picasa Web Albums</link> a <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.cz">YouTube</link> (jen videa)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, fotoserver populární v Rusku (jen fotografie)</p></item>
+    <item><p><link href="https://facebook.cz">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.cz">Picasa Web Albums</link> a <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.cz">YouTube</link> (jen videa)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (jen videa)</p></item>
     <item><p>Libovolný server, na kterém běží software pro fotogralerie <link href="http://piwigo.org">Piwigo</link> (jen fotky)</p></item>
     </list>
     
-    <p>Když chcete zveřejnit vybrané fotografie ze sbírky, zvolte <guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a klikněte na kartu <gui>Zásuvné moduly</gui>, abyste povolili zásuvný modul pro službu, kterou chcete ke zveřejnění použít. Následně zvolte <guiseq><gui>Soubor</gui> <gui>Zveřejnit</gui></guiseq> nebo zmáčkněte tlačítko <gui>Zveřejnit</gui> na nástrojové liště nebo použijte klávesovou zkratku <keyseq><key>Ctrl</key><key>P</key></keyseq>. Uvidíte dialogové okno, ve kterém si můžete vybrat požadovanou službu. Následně se k ní musíte přihlásit, připadně si vytvořit účet.</p>
+    <p>Když chcete zveřejnit vybrané fotografie ze sbírky, zvolte <guiseq><gui>Upravit</gui> <gui>Předvolby</gui></guiseq> a klikněte na kartu <gui>Zásuvné moduly</gui>, abyste povolili zásuvný modul pro službu, kterou chcete ke zveřejnění použít. Následně zvolte <guiseq><gui>Soubor</gui> <gui>Zveřejnit</gui></guiseq> nebo zmáčkněte tlačítko <gui>Zveřejnit</gui> na nástrojové liště nebo použijte klávesovou zkratku <keyseq><key>Ctrl</key><key>Shift</key><key>P</key></keyseq>. Uvidíte dialogové okno, ve kterém si můžete vybrat požadovanou službu. Následně se k ní musíte přihlásit, připadně si vytvořit účet.</p>
     
     <p>Zveřejnění na Facebooku vyžaduje udělení určitých oprávnění aplikaci Shotwell Facebook. Tato oprávnění stačí přidělit jednou, když napoprvé přiřazujete Shotwell k účtu na Facebooku.</p>
     <note style="advanced"><p>Budete moci zveřejňovat obrázky nanejvýše s oprávněními, které jste aplikaci Shotwell Facbook odsouhlasili.</p></note>
diff --git a/help/cs/view-sidebar.page b/help/cs/view-sidebar.page
index 5ee76e5..d830865 100644
--- a/help/cs/view-sidebar.page
+++ b/help/cs/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/de/de.po b/help/de/de.po
index eb9d833..248b53a 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,15 +1,15 @@
 # German translation for the shotwell manual.
 # Copyright (C) 2015 shotwell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the shotwell package.
-# Christian Kirbach <Christian.Kirbach@gmail.com>, 2015, 2016.
+# Christian Kirbach <Christian.Kirbach@gmail.com>, 2015-2016.
 # Benjamin Steinwender <b@stbe.at>, 2015.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2016, 2017.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2016-2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell shotwell-0.20\n"
-"POT-Creation-Date: 2017-09-10 12:55+0000\n"
-"PO-Revision-Date: 2017-09-20 19:48+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-27 22:00+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016\n"
+"Mario Blättermann <mario.blaettermann@gmail.com>, 2009, 2016-2017\n"
 "Benjamin Steinwender <b@stbe.at>, 2014-2015\n"
 "Christian Kirbach <christian.kirbach@gmail.com>, 2014, 2016, 2017"
 
@@ -96,11 +96,26 @@ msgstr ""
 
 #. (itstool) path: item/title
 #: C/edit-adjustments.page:28
+msgid "Contrast"
+msgstr "Kontrast"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:29
+msgid ""
+"Changes the contrast of a photo. Use it to correct flat-looking photos or "
+"photos where the difference between bright and dark spots seems to big."
+msgstr ""
+"Ändert den Kontrast eines Fotos. Verwenden Sie dies zur Korrektur von flau "
+"aussehenden Fotos oder wenn der Unterschied zwischen hellen und dunklen "
+"Bildbereichen zu groß ist."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:32
 msgid "Saturation"
 msgstr "Sättigung"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:29
+#: C/edit-adjustments.page:33
 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."
@@ -111,12 +126,12 @@ msgstr ""
 "verringern."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:32
+#: C/edit-adjustments.page:36
 msgid "Tint"
 msgstr "Farbton"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:33
+#: C/edit-adjustments.page:37
 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 "
@@ -129,12 +144,12 @@ msgstr ""
 "Einstellung »Glühlampenlicht« aufgenommene Fotos einen Blaustich aufweisen."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:36
+#: C/edit-adjustments.page:40
 msgid "Temperature"
 msgstr "Temperatur"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:37
+#: C/edit-adjustments.page:41
 msgid ""
 "Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
 "depressing scenes look more lively, for example."
@@ -143,12 +158,12 @@ msgstr ""
 "damit beispielsweise kühle, depressive Szenen lebendiger wirken lassen."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:40
+#: C/edit-adjustments.page:44
 msgid "Shadows"
 msgstr "Schatten"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:41
+#: C/edit-adjustments.page:45
 msgid ""
 "This makes shadowy areas appear lighter. Use this to make detail more "
 "visible if it's obscured by the darkness of a shadow."
@@ -157,12 +172,12 @@ msgstr ""
 "hervorheben, die in einem Schattenbereich verdeckt sind."
 
 #. (itstool) path: item/title
-#: C/edit-adjustments.page:44
+#: C/edit-adjustments.page:48
 msgid "Intensity Threshold (sliders on the histogram)"
 msgstr "Schwellwert der Intensität (Schieberegler im Histogramm)"
 
 #. (itstool) path: item/p
-#: C/edit-adjustments.page:45
+#: C/edit-adjustments.page:49
 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 "
@@ -321,7 +336,7 @@ msgstr ""
 msgctxt "_"
 msgid ""
 "external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
-msgstr "original"
+msgstr "original'"
 
 #. (itstool) path: media/p
 #: C/edit-crop.page:43
@@ -756,13 +771,13 @@ msgstr "Unterstützte Foto- und Video-Formate"
 #. (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."
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link xref=\"other-raw\">RAW</"
+"link> photo files. Shotwell does not yet support other graphics format such "
+"as GIF."
 msgstr ""
-"Shotwell unterstützt JPEG, PNG, TIFF, BMP und <link type=\"guide\" xref="
-"\"other-raw\">RAW</link>-Fotodateien. Andere Grafikformate, wie "
-"beispielsweise GIF, unterstützt Shotwell noch nicht."
+"Shotwell unterstützt JPEG, PNG, TIFF, BMP und <link xref=\"other-raw\">RAW</"
+"link>-Fotodateien. Andere Grafikformate, wie beispielsweise GIF, unterstützt "
+"Shotwell noch nicht."
 
 #. (itstool) path: page/p
 #: C/formats.page:16
@@ -784,10 +799,10 @@ msgstr ""
 #: 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."
+"<link xref=\"other-raw\">RAW</link> section."
 msgstr ""
 "Für weiterführende Informationen über Fotos im RAW-Format in Shotwell lesen "
-"Sie bitte den Abschnitt <link type=\"guide\" xref=\"other-raw\">RAW</link>."
+"Sie bitte den Abschnitt <link xref=\"other-raw\">RAW</link>."
 
 #. (itstool) path: page/p
 #: C/formats.page:22
@@ -922,11 +937,16 @@ msgstr ""
 #: 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."
+"gui></guiseq> and select the folder containing the photos you want to "
+"import. If you do not want Shotwell to recurse into subfolders while "
+"importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox "
+"on the bottom of the file dialog."
 msgstr ""
 "Wählen Sie alternativ <guiseq><gui>Datei</gui><gui>Aus Ordner importieren …</"
 "gui></guiseq> und wählen Sie den Ordner mit den Fotos aus, die Sie "
-"importieren wollen."
+"importieren wollen. Wenn Sie vermeiden wollen, dass Shotwell beim Import "
+"auch Unterordner mit einbezieht, dann deaktivieren Sie das Ankreuzfeld "
+"<gui>Unterordner einbeziehen</gui> unten im Dateiauswahldialog."
 
 #. (itstool) path: page/p
 #: C/import-file.page:18
@@ -966,57 +986,6 @@ msgstr ""
 "zugehörigen Zeitstempeln."
 
 #. (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 kann alle Ihre Fotos und Stichworte aus der Fotoverwaltung F-Spot "
-"importieren."
-
-#. (itstool) path: page/title
-#: C/import-f-spot.page:12
-msgid "Importing from F-Spot"
-msgstr "Importieren aus F-Spot"
-
-#. (itstool) path: page/p
-#: C/import-f-spot.page:14
-msgid "To import an existing photo collection from F-Spot:"
-msgstr "So importieren Sie eine bestehende Fotosammlung aus 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 ""
-"Wählen Sie <guiseq><gui>Datei</gui><gui>Importieren aus 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 ""
-"Wählen Sie anschließend die voreingestellte F-Spot-Bibliothek oder eine "
-"andere F-Spot-Datenbank. Wenn Sie aus einer anderen F-Spot-Datenbank "
-"importieren, wählen Sie einen Ordner und eine Datei im Dateiwähler."
-
-#. (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 importiert daraufhin Ihre Fotos zusammen mit den zugehörigen "
-"Markierungen und weiteren Informationen. Sobald der Import abgeschlossen "
-"ist, wählen Sie <gui>Letzter Import</gui> in der Seitenleiste, um alle "
-"erfolgreich importierten Fotos zu sehen. Die Ereignisliste zeigt auch neue "
-"Einträge für die importierten Fotos mit den zugehörigen Zeitstempeln."
-
-#. (itstool) path: info/desc
 #: C/import-memorycard.page:7
 msgid "Import photos from a digital camera's memory card."
 msgstr "Fotos von der Speicherkarte einer Digitalkamera importieren."
@@ -1088,34 +1057,28 @@ 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
+#: C/index.page:8
 msgid "Jim Nelson"
 msgstr "Jim Nelson"
 
 #. (itstool) path: credit/name
-#: C/index.page:11
+#: C/index.page:10
 msgid "Allison Barlow"
 msgstr "Allison Barlow"
 
 #. (itstool) path: credit/name
-#: C/index.page:13
+#: C/index.page:12
 msgid "Robert Ancell"
 msgstr "Robert Ancell"
 
 #. (itstool) path: credit/name
-#: C/index.page:15
+#: C/index.page:14
 msgid "Peter Smith"
 msgstr "Peter Smith"
 
 #. (itstool) path: credit/name
-#: C/index.page:17
+#: C/index.page:16
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
@@ -1124,15 +1087,15 @@ msgstr "Phil Bull"
 #. 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
+#: C/index.page:22
 msgctxt "_"
 msgid ""
 "external ref='figures/shotwell_logo.png' "
 "md5='4b333499555b4e496b1a38f7899067f3'"
-msgstr "original"
+msgstr "original'"
 
 #. (itstool) path: page/title
-#: C/index.page:23
+#: C/index.page:22
 msgid ""
 "<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
 "Manager"
@@ -1141,32 +1104,32 @@ msgstr ""
 "Fotoverwaltung"
 
 #. (itstool) path: section/title
-#: C/index.page:26
+#: C/index.page:25
 msgid "Importing Photos"
 msgstr "Fotos importieren"
 
 #. (itstool) path: section/title
-#: C/index.page:30
+#: C/index.page:29
 msgid "Viewing Photos"
 msgstr "Fotos ansehen"
 
 #. (itstool) path: section/title
-#: C/index.page:34
+#: C/index.page:33
 msgid "Organizing Photos"
 msgstr "Fotos organisieren"
 
 #. (itstool) path: section/title
-#: C/index.page:38
+#: C/index.page:37
 msgid "Editing Photos"
 msgstr "Fotos bearbeiten"
 
 #. (itstool) path: section/title
-#: C/index.page:42
+#: C/index.page:41
 msgid "Sharing Photos"
 msgstr "Fotos teilen"
 
 #. (itstool) path: section/title
-#: C/index.page:46
+#: C/index.page:45
 msgid "Other Features"
 msgstr "Weitere Funktionen"
 
@@ -1538,7 +1501,7 @@ msgid ""
 "md5='ed596bda34c2f4a79a310fbc8bb51fd2'"
 msgstr "ok'"
 
-#. (itstool) path: page/media
+#. (itstool) path: media/p
 #: C/organize-remove.page:15
 msgid "Delete process"
 msgstr "Löschvorgang"
@@ -2261,13 +2224,14 @@ msgstr "p. m."
 #. (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."
+"There are other symbols available; please check the <link href=\"man:strftime"
+"\">manual for strftime</link> by running the command <cmd>man strftime</cmd> "
+"if you need one that isn't listed here."
 msgstr ""
-"Es sind weitere Symbole verfügbar. Bitte schauen Sie dazu im Handbuch von "
-"strftime nach, welches Sie mit dem Befehl <cmd>man strftime</cmd> ansehen "
-"können, falls ein benötigtes Symbol hier nicht aufgelistet ist."
+"Es sind weitere Symbole verfügbar. Bitte schauen Sie dazu im <link href="
+"\"man:strftime\">Handbuch von strftime</link> nach, welches Sie mit dem "
+"Befehl <cmd>man strftime</cmd> ansehen können, falls ein benötigtes Symbol "
+"hier nicht aufgelistet ist."
 
 #. (itstool) path: section/title
 #: C/other-files.page:79
@@ -2844,8 +2808,64 @@ msgstr ""
 "Eine Skalierungsbeschränkung (sie legt fest, wie Shotwell entscheidet die "
 "Fotos zu skalieren) und die gewünschte Pixelgröße."
 
+#. (itstool) path: item/title
+#: C/share-export.page:40
+msgid "Original size"
+msgstr "Ursprüngliche Größe"
+
+#. (itstool) path: item/p
+#: C/share-export.page:40
+msgid "Image will be exported without any scaling applied"
+msgstr "Das Bild wird ohne Skalierung exportiert"
+
+#. (itstool) path: item/title
+#: C/share-export.page:41
+msgid "Longest edge"
+msgstr "Längste Seite"
+
+#. (itstool) path: item/p
+#: C/share-export.page:41
+msgid ""
+"Image will be exported by having its longest edge scaled to <gui>Pixels</"
+"gui> and the other according to the aspect ratio"
+msgstr ""
+"Die längste Seite des Bildes wird anhand der angegebenen <gui>Pixel</gui> "
+"skaliert und die andere Seite entsprechend dem Seitenverhältnis."
+
+#. (itstool) path: item/title
+#: C/share-export.page:42
+msgid "Width"
+msgstr "Breite"
+
 #. (itstool) path: item/p
-#: C/share-export.page:39
+#: C/share-export.page:42
+msgid ""
+"The image width will have its width scaled to the given pixel size and its "
+"height according to the aspect ratio. This is equivalent to <gui>Longest "
+"Edge</gui> for landscape pictures."
+msgstr ""
+"Die Bildbreite wird anhand der angegebenen Pixel skaliert und die Bildhöhe "
+"entsprechend dem Seitenverhältnis. Dies entspricht der <gui>Längsten Seite</"
+"gui> bei Querformaten."
+
+#. (itstool) path: item/title
+#: C/share-export.page:43
+msgid "Height"
+msgstr "Höhe"
+
+#. (itstool) path: item/p
+#: C/share-export.page:43
+msgid ""
+"The image height will have its height scaled to the given pixel size and its "
+"width according to the aspect ratio. This is equivalent to <gui>Longest "
+"Edge</gui> for portrait pictures."
+msgstr ""
+"Die Bildhöhe wird anhand der angegebenen Pixel skaliert und die Bildbreite "
+"entsprechend dem Seitenverhältnis. Dies entspricht der <gui>Längsten Seite</"
+"gui> bei Hochformaten."
+
+#. (itstool) path: item/p
+#: C/share-export.page:46
 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 "
@@ -2857,7 +2877,7 @@ msgstr ""
 "Privatsphäre zu schützen."
 
 #. (itstool) path: page/p
-#: C/share-export.page:42
+#: C/share-export.page:49
 msgid ""
 "If selected, Shotwell will write tags, titles, and other metadata to the new "
 "files."
@@ -2932,7 +2952,7 @@ 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 versendet Fotos mit dem Mechanismus »Senden an« der GNOME "
+"Shotwell versendet Fotos mit dem Mechanismus <gui>Senden an</gui> der GNOME "
 "Arbeitsumgebung. So können Sie Fotos per E-Mail, Sofortnachricht oder auf "
 "andere Weisen verschicken."
 
@@ -3021,18 +3041,20 @@ msgstr ""
 
 #. (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>"
+#| msgid "<link href=\"http://facebook.com\">Facebook</link>"
+msgid "<link href=\"https://facebook.com\">Facebook</link>"
+msgstr "<link href=\"https://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>"
+#| msgid "<link href=\"http://flickr.com\">Flickr</link>"
+msgid "<link href=\"https://flickr.com\">Flickr</link>"
+msgstr "<link href=\"https://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=\"https://picasaweb.google.com\">Picasa Web Albums</link> and "
 "<link href=\"http://plus.google.com\">Google+</link>"
 msgstr ""
 "<link href=\"https://picasaweb.google.com/home?hl=de\">Picasa Webalben</"
@@ -3040,17 +3062,13 @@ msgstr ""
 
 #. (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> (nur Videos)"
+msgid "<link href=\"https://youtube.com\">YouTube</link> (videos only)"
+msgstr "<link href=\"https://youtube.com\">YouTube</link> (nur Videos)"
 
 #. (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>, eine in Russland "
-"beliebte Fotoseite (nur Fotos)"
+msgid "<link href=\"https://tumblr.com\">Tumblr</link> (videos only)"
+msgstr "<link href=\"https://youtube.com\">YouTube</link> (nur Videos)"
 
 #. (itstool) path: item/p
 #: C/share-upload.page:23
@@ -3068,9 +3086,9 @@ msgid ""
 "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."
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>Shift</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 ""
 "Wählen Sie zum Veröffentlichen von gewählten Fotos einer Sammlung "
 "<guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq> und dann den "
@@ -3078,9 +3096,9 @@ msgstr ""
 "Dienst, den Sie verwenden wollen. Wählen Sie anschließend "
 "<guiseq><gui>Datei</gui><gui>Veröffentlichen</gui></guiseq> oder den Knopf "
 "<gui>Veröffentlichen</gui> in der Werkzeugleiste oder tippen Sie "
-"<keyseq><key>Strg</key><key>P</key></keyseq>. Daraufhin erscheint ein "
-"Fenster, in dem Sie den Dienst zur Veröffentlichung wählen. Sie müssen sich "
-"dann beim Dienst anmelden."
+"<keyseq><key>Strg</key><key>Umschalt</key><key>P</key></keyseq>. Daraufhin "
+"erscheint ein Fenster, in dem Sie den Dienst zur Veröffentlichung wählen. "
+"Sie müssen sich dann beim Dienst anmelden."
 
 #. (itstool) path: page/p
 #: C/share-upload.page:31
@@ -3274,12 +3292,12 @@ msgstr ""
 "Bibliothek."
 
 #. (itstool) path: page/title
-#: C/view-sidebar.page:21
+#: C/view-sidebar.page:20
 msgid "The sidebar"
 msgstr "Die Seitenleiste"
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:23
+#: C/view-sidebar.page:22
 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 "
@@ -3290,7 +3308,7 @@ msgstr ""
 "sehen, ist es tatsächlich nur einmal auf Ihrem System gespeichert."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:25
+#: C/view-sidebar.page:24
 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."
@@ -3300,12 +3318,12 @@ msgstr ""
 "oder der Festplatte."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:27
+#: C/view-sidebar.page:26
 msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
 msgstr "<gui>Markiert</gui> listet alle zuvor markierten Fotos."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:29
+#: C/view-sidebar.page:28
 msgid ""
 "The <gui>Saved Search</gui> allows you to sort your library by many criteria."
 msgstr ""
@@ -3313,7 +3331,7 @@ msgstr ""
 "vielen verschiedenen Kriterien."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:31
+#: C/view-sidebar.page:30
 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."
@@ -3323,7 +3341,7 @@ msgstr ""
 "Zeitraum aufgenommen wurden."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:33
+#: C/view-sidebar.page:32
 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 "
diff --git a/help/de/edit-adjustments.page b/help/de/edit-adjustments.page
index 7570855..7521d13 100644
--- a/help/de/edit-adjustments.page
+++ b/help/de/edit-adjustments.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -42,6 +42,10 @@
    <p>Änderung der Helligkeit, so dass es aussieht, also ob das Foto länger oder kürzer belichtet worden wäre. Verwenden Sie diese Möglichkeit, um über- und unterbelichtete Fotos zu korrigieren.</p>
   </item>
   <item>
+   <title>Kontrast</title>
+   <p>Ändert den Kontrast eines Fotos. Verwenden Sie dies zur Korrektur von flau aussehenden Fotos oder wenn der Unterschied zwischen hellen und dunklen Bildbereichen zu groß ist.</p>
+  </item>
+  <item>
    <title>Sättigung</title>
    <p>Dadurch wird bestimmt, wie lebendig Farben wirken. Wenn Ihr Foto grau und ausgewaschen erscheint, sollten Sie die Sättigung erhöhen. Wenn sich Farben zu sehr in den Vordergrund setzen, sollten Sie versuchen, die Sättigung zu verringern.</p>
   </item>
diff --git a/help/de/edit-crop.page b/help/de/edit-crop.page
index 9de1e44..d15605f 100644
--- a/help/de/edit-crop.page
+++ b/help/de/edit-crop.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-date-time.page b/help/de/edit-date-time.page
index 1545d47..c596396 100644
--- a/help/de/edit-date-time.page
+++ b/help/de/edit-date-time.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-enhance.page b/help/de/edit-enhance.page
index 5505882..03fe5cb 100644
--- a/help/de/edit-enhance.page
+++ b/help/de/edit-enhance.page
@@ -12,7 +12,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-external.page b/help/de/edit-external.page
index 1594782..40eaa8c 100644
--- a/help/de/edit-external.page
+++ b/help/de/edit-external.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-nondestructive.page b/help/de/edit-nondestructive.page
index f2cfe12..dfe518f 100644
--- a/help/de/edit-nondestructive.page
+++ b/help/de/edit-nondestructive.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-redeye.page b/help/de/edit-redeye.page
index f9bf2c1..dfc89d4 100644
--- a/help/de/edit-redeye.page
+++ b/help/de/edit-redeye.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-rotate.page b/help/de/edit-rotate.page
index 0bcb80c..146abac 100644
--- a/help/de/edit-rotate.page
+++ b/help/de/edit-rotate.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-straighten.page b/help/de/edit-straighten.page
index 36f0530..2621593 100644
--- a/help/de/edit-straighten.page
+++ b/help/de/edit-straighten.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/edit-undo.page b/help/de/edit-undo.page
index 5fd14a1..eed37da 100644
--- a/help/de/edit-undo.page
+++ b/help/de/edit-undo.page
@@ -12,7 +12,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/formats.page b/help/de/formats.page
index dbaf68a..967514f 100644
--- a/help/de/formats.page
+++ b/help/de/formats.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -28,13 +28,11 @@
 
 	<title>Unterstützte Foto- und Video-Formate</title>
 
-   <p>Shotwell supports JPEG, PNG, TIFF, BMP and <link xref="other-raw">RAW</link> photo files. Shotwell does not yet support other graphics format such as GIF.</p>
+   <p>Shotwell unterstützt JPEG, PNG, TIFF, BMP und <link xref="other-raw">RAW</link>-Fotodateien. Andere Grafikformate, wie beispielsweise GIF, unterstützt Shotwell noch nicht.</p>
 
 <p>Die Unterstützung des RAW-Formats in Shotwell ist derzeit eingeschränkt. Wenn Sie ein RAW-Foto betrachten, sehen Sie tatsächlich ein JPEG-Bild, das aus dem RAW-Foto abgeleitet wurde, und nicht das tatsächliche RAW-Bild. Darüber hinaus sind die Bearbeitungsschritte nicht vollständig in 16 Bit. Bearbeitete Fotos werden nur als 8-Bit-Dateien exportiert. Alle unterstützten Formate können exportiert werden (JPEG, PNG, TIFF, BMP).</p>
 
-<p>For more information about RAW-format photos in Shotwell, please see
-the <link xref="other-raw">RAW</link> section.
-</p>
+<p>Für weiterführende Informationen über Fotos im RAW-Format in Shotwell lesen Sie bitte den Abschnitt <link xref="other-raw">RAW</link>.</p>
 
 <p>Shotwell unterstützt Video-Dateien in jedem Format, das auch von der GStreamer Medienbibliothek auf dem System unterstützt wird, auf dem Shotwell ausgeführt wird. Typischerweise zählen dazu unter anderen folgende Formate:</p>
 <list>
diff --git a/help/de/import-camera.page b/help/de/import-camera.page
index 45752ea..1923412 100644
--- a/help/de/import-camera.page
+++ b/help/de/import-camera.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/import-f-spot.page b/help/de/import-f-spot.page
deleted file mode 100644
index 72e9474..0000000
--- a/help/de/import-f-spot.page
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="de">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell kann alle Ihre Fotos und Stichworte aus der Fotoverwaltung F-Spot importieren.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Mario Blättermann</mal:name>
-      <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Benjamin Steinwender</mal:name>
-      <mal:email>b@stbe.at</mal:email>
-      <mal:years>2014-2015</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Christian Kirbach</mal:name>
-      <mal:email>christian.kirbach@gmail.com</mal:email>
-      <mal:years>2014, 2016, 2017</mal:years>
-    </mal:credit>
-  </info>
-
-	<title>Importieren aus F-Spot</title>
-
-    <p>So importieren Sie eine bestehende Fotosammlung aus F-Spot:</p>
-    <steps>
-    <item><p>Wählen Sie <guiseq><gui>Datei</gui><gui>Importieren aus F-Spot</gui></guiseq>.</p></item>
-    <item><p>Wählen Sie anschließend die voreingestellte F-Spot-Bibliothek oder eine andere F-Spot-Datenbank. Wenn Sie aus einer anderen F-Spot-Datenbank importieren, wählen Sie einen Ordner und eine Datei im Dateiwähler.</p></item>
-    </steps>
-    <p>Shotwell importiert daraufhin Ihre Fotos zusammen mit den zugehörigen Markierungen und weiteren Informationen. Sobald der Import abgeschlossen ist, wählen Sie <gui>Letzter Import</gui> in der Seitenleiste, um alle erfolgreich importierten Fotos zu sehen. Die Ereignisliste zeigt auch neue Einträge für die importierten Fotos mit den zugehörigen Zeitstempeln.</p>
-</page>
diff --git a/help/de/import-file.page b/help/de/import-file.page
index 2bfe9f0..2c81530 100644
--- a/help/de/import-file.page
+++ b/help/de/import-file.page
@@ -5,12 +5,12 @@
         <link type="guide" xref="index#import"/>
         <desc>Fotos importieren, die bereits auf Ihrem Rechner gespeichert sind.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -30,7 +30,7 @@
 
     <p>Um Fotodateien von Ihrer Festplatte in Shotwell zu importieren, ziehen Sie sie einfach aus der Dateiverwaltung in das Shotwell-Fenster.</p>
     
-    <p>Wählen Sie alternativ <guiseq><gui>Datei</gui><gui>Aus Ordner importieren …</gui></guiseq> und wählen Sie den Ordner mit den Fotos aus, die Sie importieren wollen.</p>
+    <p>Wählen Sie alternativ <guiseq><gui>Datei</gui><gui>Aus Ordner importieren …</gui></guiseq> und wählen Sie den Ordner mit den Fotos aus, die Sie importieren wollen. Wenn Sie vermeiden wollen, dass Shotwell beim Import auch Unterordner mit einbezieht, dann deaktivieren Sie das Ankreuzfeld <gui>Unterordner einbeziehen</gui> unten im Dateiauswahldialog.</p>
     
     <p>Shotwell fragt, ob Sie die Fotodateien in Ihren Bibliotheksordner (normalerweise der Ordner <file>Bilder</file> in Ihrem persönlichen Ordner) kopieren möchten, oder ob Sie sie ohne Kopieren importieren wollen.</p>
     
diff --git a/help/de/import-memorycard.page b/help/de/import-memorycard.page
index 79a967e..c7fd217 100644
--- a/help/de/import-memorycard.page
+++ b/help/de/import-memorycard.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/index.page b/help/de/index.page
index e429f79..98fa6f6 100644
--- a/help/de/index.page
+++ b/help/de/index.page
@@ -19,7 +19,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-event.page b/help/de/organize-event.page
index bb81a74..dcad6b4 100644
--- a/help/de/organize-event.page
+++ b/help/de/organize-event.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-flag.page b/help/de/organize-flag.page
index 8b99308..1582044 100644
--- a/help/de/organize-flag.page
+++ b/help/de/organize-flag.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-rating.page b/help/de/organize-rating.page
index b2186ac..7127266 100644
--- a/help/de/organize-rating.page
+++ b/help/de/organize-rating.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-remove.page b/help/de/organize-remove.page
index 4b9358d..9339172 100644
--- a/help/de/organize-remove.page
+++ b/help/de/organize-remove.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-search.page b/help/de/organize-search.page
index b515779..4d0860a 100644
--- a/help/de/organize-search.page
+++ b/help/de/organize-search.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-tag.page b/help/de/organize-tag.page
index 50b23c7..e2e901e 100644
--- a/help/de/organize-tag.page
+++ b/help/de/organize-tag.page
@@ -12,7 +12,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/organize-title.page b/help/de/organize-title.page
index a75ec93..91ef214 100644
--- a/help/de/organize-title.page
+++ b/help/de/organize-title.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/other-files.page b/help/de/other-files.page
index 075df85..cbbee00 100644
--- a/help/de/other-files.page
+++ b/help/de/other-files.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -66,7 +66,7 @@
             </tbody>
         </table>
 
-        <p>Es sind weitere Symbole verfügbar. Bitte schauen Sie dazu im Handbuch von strftime nach, welches Sie mit dem Befehl <cmd>man strftime</cmd> ansehen können, falls ein benötigtes Symbol hier nicht aufgelistet ist.</p>
+        <p>Es sind weitere Symbole verfügbar. Bitte schauen Sie dazu im <link href="man:strftime">Handbuch von strftime</link> nach, welches Sie mit dem Befehl <cmd>man strftime</cmd> ansehen können, falls ein benötigtes Symbol hier nicht aufgelistet ist.</p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/de/other-missing.page b/help/de/other-missing.page
index 8b45a95..de8e2aa 100644
--- a/help/de/other-missing.page
+++ b/help/de/other-missing.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/other-multiple.page b/help/de/other-multiple.page
index c78ed27..8c40a63 100644
--- a/help/de/other-multiple.page
+++ b/help/de/other-multiple.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/other-plugins.page b/help/de/other-plugins.page
index 321e49a..4180d13 100644
--- a/help/de/other-plugins.page
+++ b/help/de/other-plugins.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/raw.page b/help/de/raw.page
index b608856..c69e1dd 100644
--- a/help/de/raw.page
+++ b/help/de/raw.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/running.page b/help/de/running.page
index f5fc80b..ba8307b 100644
--- a/help/de/running.page
+++ b/help/de/running.page
@@ -12,7 +12,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/share-background.page b/help/de/share-background.page
index 171fbf3..04c5bd7 100644
--- a/help/de/share-background.page
+++ b/help/de/share-background.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/share-export.page b/help/de/share-export.page
index af618ed..d97fea2 100644
--- a/help/de/share-export.page
+++ b/help/de/share-export.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -41,7 +41,14 @@
 </list>
 </item>
 <item><p>Die Bildqualität beim Exportieren (gering, mittel, hoch oder maximal).</p></item>
-<item><p>Eine Skalierungsbeschränkung (sie legt fest, wie Shotwell entscheidet die Fotos zu skalieren) und die gewünschte Pixelgröße.</p></item>
+<item><p>Eine Skalierungsbeschränkung (sie legt fest, wie Shotwell entscheidet die Fotos zu skalieren) und die gewünschte Pixelgröße.</p>
+<terms>
+<item><title>Ursprüngliche Größe</title><p>Das Bild wird ohne Skalierung exportiert</p></item>
+<item><title>Längste Seite</title><p>Die längste Seite des Bildes wird anhand der angegebenen <gui>Pixel</gui> skaliert und die andere Seite entsprechend dem Seitenverhältnis.</p></item>
+<item><title>Breite</title><p>Die Bildbreite wird anhand der angegebenen Pixel skaliert und die Bildhöhe entsprechend dem Seitenverhältnis. Dies entspricht der <gui>Längsten Seite</gui> bei Querformaten.</p></item>
+<item><title>Höhe</title><p>Die Bildhöhe wird anhand der angegebenen Pixel skaliert und die Bildbreite entsprechend dem Seitenverhältnis. Dies entspricht der <gui>Längsten Seite</gui> bei Hochformaten.</p></item>
+</terms>
+</item>
 <item><p>Legt fest, ob Metadaten wie beispielsweise Markierungen oder Bewertungen exportiert werden sollen. Im Falle von Metadaten für Ortsdienste oder anderweitiger privater Markierungen kann dies dabei helfen, Ihre Privatsphäre zu schützen.</p></item>
 </list>
 
diff --git a/help/de/share-print.page b/help/de/share-print.page
index 7bb84dd..cd20522 100644
--- a/help/de/share-print.page
+++ b/help/de/share-print.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/share-send.page b/help/de/share-send.page
index ec7fc0a..5a02799 100644
--- a/help/de/share-send.page
+++ b/help/de/share-send.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -28,7 +28,7 @@
 
 	<title>Fotos versenden</title>
 
-    <p>Shotwell versendet Fotos mit dem Mechanismus »Senden an« der GNOME Arbeitsumgebung. So können Sie Fotos per E-Mail, Sofortnachricht oder auf andere Weisen verschicken.</p>
+    <p>Shotwell versendet Fotos mit dem Mechanismus <gui>Senden an</gui> der GNOME Arbeitsumgebung. So können Sie Fotos per E-Mail, Sofortnachricht oder auf andere Weisen verschicken.</p>
     <p>Wählen Sie Fotos zum Verschicken in Shotwell aus und wählen Sie dann <guiseq><gui>Datei</gui><gui>Senden an</gui></guiseq>, oder klicken Sie mit der rechten Maustaste auf das Foto und wählen Sie <gui>Senden an</gui> im Kontextmenü. Daraufhin erscheint der Dialog <gui>Senden an</gui>, wo Sie ein Verfahren zum Verschicken der Fotos (wie zum Beispiel E-Mail oder Sofortnachricht) und einen Empfänger festlegen. Optional können Sie Dateien komprimieren und versenden.</p>
     
 </page>
diff --git a/help/de/share-slideshow.page b/help/de/share-slideshow.page
index c12920c..7a1e4b2 100644
--- a/help/de/share-slideshow.page
+++ b/help/de/share-slideshow.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/share-upload.page b/help/de/share-upload.page
index 759bc3f..1681951 100644
--- a/help/de/share-upload.page
+++ b/help/de/share-upload.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
@@ -31,15 +31,15 @@
     <p>Mit Hilfe von <link xref="other-plugins">Erweiterungen</link> kann Shotwell Fotos und Videos bei den folgenden Diensten veröffentlichen. Jeder Dienst erfordert ein Benutzerkonto:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
     <item><p><link href="https://picasaweb.google.com/home?hl=de">Picasa Webalben</link> und <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (nur Videos)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, eine in Russland beliebte Fotoseite (nur Fotos)</p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (nur Videos)</p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (nur Videos)</p></item>
     <item><p>Jede Internetseite, welche die Fotogalerie-Software <link href="http://piwigo.org">Piwigo</link> installiert hat (nur Fotos)</p></item>
     </list>
     
-    <p>Wählen Sie zum Veröffentlichen von gewählten Fotos einer Sammlung <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq> und dann den Reiter <gui>Erweiterungen</gui> zum Einschalten der Erweiterung für den Dienst, den Sie verwenden wollen. Wählen Sie anschließend <guiseq><gui>Datei</gui><gui>Veröffentlichen</gui></guiseq> oder den Knopf <gui>Veröffentlichen</gui> in der Werkzeugleiste oder tippen Sie <keyseq><key>Strg</key><key>P</key></keyseq>. Daraufhin erscheint ein Fenster, in dem Sie den Dienst zur Veröffentlichung wählen. Sie müssen sich dann beim Dienst anmelden.</p>
+    <p>Wählen Sie zum Veröffentlichen von gewählten Fotos einer Sammlung <guiseq><gui>Bearbeiten</gui><gui>Einstellungen</gui></guiseq> und dann den Reiter <gui>Erweiterungen</gui> zum Einschalten der Erweiterung für den Dienst, den Sie verwenden wollen. Wählen Sie anschließend <guiseq><gui>Datei</gui><gui>Veröffentlichen</gui></guiseq> oder den Knopf <gui>Veröffentlichen</gui> in der Werkzeugleiste oder tippen Sie <keyseq><key>Strg</key><key>Umschalt</key><key>P</key></keyseq>. Daraufhin erscheint ein Fenster, in dem Sie den Dienst zur Veröffentlichung wählen. Sie müssen sich dann beim Dienst anmelden.</p>
     
     <p>Die Veröffentlichung auf Facebook erfordert es, der Anwendung »Shotwell Connect Facebook« verschiedene Rechte einzuräumen. Sie müssen diese Zugriffsrechte nur einmal gewähren, wenn Sie Shotwell zum ersten Mal mit Facebook verbinden.</p>
     <note style="advanced"><p>Sie können Bilder nur mit höchstens den Zugriffsrechten veröffentlichen, die Sie der Shotwell Facebook-Anwendung gewährt haben.</p></note>
diff --git a/help/de/view-displaying.page b/help/de/view-displaying.page
index 888f7ce..02ca27d 100644
--- a/help/de/view-displaying.page
+++ b/help/de/view-displaying.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/view-information.page b/help/de/view-information.page
index 0c33f76..e4083a3 100644
--- a/help/de/view-information.page
+++ b/help/de/view-information.page
@@ -10,7 +10,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/de/view-sidebar.page b/help/de/view-sidebar.page
index 8bf2175..17fa1a6 100644
--- a/help/de/view-sidebar.page
+++ b/help/de/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
@@ -19,7 +18,7 @@
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Mario Blättermann</mal:name>
       <mal:email>mario.blaettermann@gmail.com</mal:email>
-      <mal:years>2009, 2016</mal:years>
+      <mal:years>2009, 2016-2017</mal:years>
     </mal:credit>
   
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
diff --git a/help/el/edit-adjustments.page b/help/el/edit-adjustments.page
index 2a56bae..acb869d 100644
--- a/help/el/edit-adjustments.page
+++ b/help/el/edit-adjustments.page
@@ -24,6 +24,10 @@
    <p>Αλλάζει τη φωτεινότητα κάνοντας τη φωτογραφία να φαίνεται ότι εκτέθηκε για μεγαλύτερο ή λιγότερο χρόνο. Χρησιμοποιήστε το για να διορθώσετε υποεκτεθειμένες ή υπερεκτεθειμένες φωτογραφίες.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Κορεσμός</title>
    <p>Αλλάζει τη ζωηρότητα των χρωμάτων. Αν η φωτογραφία φαίνεται γκρίζα και ξεθωριασμένη, δοκιμάστε να αυξήσετε τον κορεσμό. Αν τα χρώματα φαίνονται υπερβολικά έντονα, δοκιμάστε να τον μειώσετε.</p>
   </item>
diff --git a/help/el/import-f-spot.page b/help/el/import-f-spot.page
deleted file mode 100644
index 6067edb..0000000
--- a/help/el/import-f-spot.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="el">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Το Shotwell μπορεί να εισάγει όλες τις φωτογραφίες και ετικέτες σας από τον διαχειριστή φωτογραφιών F-Spot.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Εισαγωγή από F-Spot</title>
-
-    <p>Για να εισάγετε μια υπάρχουσα φωτογραφική συλλογή από F-Spot:</p>
-    <steps>
-    <item><p>Επιλέξτε <guiseq><gui>Αρχείο</gui><gui>Εισαγωγή από F-Spot</gui></guiseq>.</p></item>
-    <item><p>Τώρα επιλέξτε ή την προεπιλεγμένη βιβλιοθήκη F-Spot ή κάποια άλλη βάση δεδομένων F-Spot. Αν η εισαγωγή είναι από μια άλλη βάση δεδομένων F-Spot, επιλέξτε κατάλογο και αρχείο από το πλαίσιο διαλόγου επιλογής.</p></item>
-    </steps>
-    <p>Το Shotwell θα εισάγει τις φωτογραφίες σας, μαζί με τις ετικέτες τους και άλλες πληροφορίες. Αφού συμπληρωθεί η εισαγωγή, μπορείτε να επιλέξετε <gui>Τελευταία εισαγωγή</gui> στην πλευρική στήλη για να δείτε όλες τις φωτογραφίες εισηγμένες με επιτυχία. Ο κατάλογος συμβάντων θα εμφανίσει επίσης νέες καταχωρίσεις για τις ημερομηνίες που αντιστοιχούν στις εισηγμένες φωτογραφίες.</p>
-</page>
diff --git a/help/el/import-file.page b/help/el/import-file.page
index 26dd401..874c43a 100644
--- a/help/el/import-file.page
+++ b/help/el/import-file.page
@@ -5,14 +5,14 @@
         <link type="guide" xref="index#import"/>
         <desc>Για να εισάγετε φωτογραφίες που είναι ήδη αποθηκευμένες στον υπολογιστή σας.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     </info>
 
 	<title>Εισαγωγή από τον σκληρό δίσκο σας</title>
 
     <p>Για να εισάγετε αρχεία φωτογραφιών από τον σκληρό δίσκο σας στο Shotwell, μεταφέρτε τα απλά από τον περιηγητή αρχείων σας στο παράθυρο Shotwell.</p>
     
-    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>Το Shotwell θα ρωτήσει αν θέλετε να αντιγράψετε τα αρχεία φωτογραφίας στον φάκελο βιβλιοθήκης (συνήθως αυτός είναι ο φάκελος <file>Pictures</file> στον προσωπικό σας κατάλογο) ή να τα εισάγετε επί τόπου χωρίς αντιγραφή των αρχείων.</p>
     
diff --git a/help/el/other-files.page b/help/el/other-files.page
index 994ed95..87af7b8 100644
--- a/help/el/other-files.page
+++ b/help/el/other-files.page
@@ -48,7 +48,10 @@
             </tbody>
         </table>
 
-        <p>Υπάρχουν άλλα διαθέσιμα σύμβολα· παρακαλούμε, ελέγξτε το εγχειρίδιο για strftime εκτελώντας την εντολή <cmd>man strftime</cmd> αν χρειάζεστε ένα σύμβολο που δεν είναι καταχωρισμένο εδώ.</p>
+        <p>
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
+            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
+        </p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/el/share-export.page b/help/el/share-export.page
index 9ea9f81..62ee38e 100644
--- a/help/el/share-export.page
+++ b/help/el/share-export.page
@@ -26,7 +26,14 @@ A window will appear allowing you to make several choices:
 </list>
 </item>
 <item><p>Η ποιότητα εικόνας για εξαγωγή (χαμηλή, μέτρια, υψηλή, ή μέγιστη).</p></item>
-<item><p>Ένας περιορισμός κλιμάκωσης (που σημαίνει πώς θα αποφασίσει το Shotwell να σμικρύνει τις φωτογραφίες) και το επιθυμητό μέγεθος εικονοστοιχείων.</p></item>
+<item><p>Ένας περιορισμός κλιμάκωσης (που σημαίνει πώς θα αποφασίσει το Shotwell να σμικρύνει τις φωτογραφίες) και το επιθυμητό μέγεθος εικονοστοιχείων.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</item>
 <item><p>Η επιλογή εξαγωγής μεταδεδομένων όπως ετικέτες ή αξιολογήσεις. Αυτό μπορεί να βοηθήσει στην αποθήκευση της ιδιωτικότητά σας αν έχετε ετικέτες γεωεντοπισμού ή ετικέτες που δεν θα έπρεπε να ιδωθούν από κάποιον.</p></item>
 </list>
 
diff --git a/help/el/share-upload.page b/help/el/share-upload.page
index 6a3e4ec..cbb6fb5 100644
--- a/help/el/share-upload.page
+++ b/help/el/share-upload.page
@@ -13,15 +13,18 @@
     <p>Μέσα από τη χρήση <link xref="other-plugins">προσθέτων</link>, το Shotwell μπορεί να δημοσιεύσει φωτογραφίες και βίντεο στις ακόλουθες υπηρεσίες, που καθεμιά τους απαιτεί έναν λογαριασμό:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Συλλογές ιστού Picasa</link> και <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (μόνο βίντεο)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, έναν δημοφιλή τόπο φωτογραφιών στη Ρωσία (μόνο φωτογραφίες)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Οποιονδήποτε τόπο που τρέχει το λογισμικό συλλογής φωτογραφιών <link href="http://piwigo.org">Piwigo</link> (μόνο φωτογραφίες)</p></item>
     </list>
     
-    <p>Για να δημοσιεύσετε επιλεγμένες φωτογραφίες σε μια συλλογή, επιλέξτε <guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</gui></guiseq> και πατήστε την καρτέλα <gui>Πρόσθετα</gui> για να ενεργοποιήσετε το πρόσθετο για την υπηρεσία στην οποία θέλετε να δημοσιεύσετε. Κατόπιν, επιλέξτε, <guiseq><gui>Αρχείο</gui><gui>Δημοσίευση</gui></guiseq>, πατήστε το πλήκτρο εργαλειοθήκης <gui>Δημοσίευση</gui> ή χρησιμοποιήστε <keyseq><key>Ctrl</key><key>P</key></keyseq>. Θα δείτε έναν διάλογο που σας επιτρέπει να επιλέξετε μια υπηρεσία δημοσίευσης. Θα χρειαστείτε τότε να συνδεθείτε ή να δημιουργήσετε έναν λογαριασμό.</p>
+    <p>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>Shift</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.</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.
diff --git a/help/el/view-sidebar.page b/help/el/view-sidebar.page
index 6bb8482..777590d 100644
--- a/help/el/view-sidebar.page
+++ b/help/el/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/es/edit-adjustments.page b/help/es/edit-adjustments.page
index f6ef4e9..f537ca5 100644
--- a/help/es/edit-adjustments.page
+++ b/help/es/edit-adjustments.page
@@ -42,6 +42,10 @@
    <p>Cambia el brillo para que parezca que la foto se ha expuesto por un tiempo más o menos largo. Utilice esta opción para corregir las fotografías sobreexpuestas o excesivamente subexpuestas.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Saturación</title>
    <p>Cambia la intensidad de los colores. Si su foto parece gris y pálida, pruebe a aumentar la saturación. Si los colores se ven demasiado intensos, intente disminuirlos.</p>
   </item>
diff --git a/help/es/es.po b/help/es/es.po
index bb54e1d..4ba89b6 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -11,7 +11,7 @@
 # 

 # 

 # 

-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
, 2017.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016, 2017.
 #
 msgid ""
 msgstr ""
diff --git a/help/es/import-f-spot.page b/help/es/import-f-spot.page
deleted file mode 100644
index 57b9c1e..0000000
--- a/help/es/import-f-spot.page
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="es">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell puede importar todas sus fotos y etiquetas desde el gestor de fotos F-Spot.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Marina Prado</mal:name>
-      <mal:email>mapraro93@hotmail.com</mal:email>
-      <mal:years>2016</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Daniel Mustieles</mal:name>
-      <mal:email>daniel.mustieles@gmail.com</mal:email>
-      <mal:years>2014 - 2016</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Dámaris Letelier</mal:name>
-      <mal:email>dam.letelier@gmail.com</mal:email>
-      <mal:years>2014</mal:years>
-    </mal:credit>
-  </info>
-
-	<title>Importar desde F-Spot</title>
-
-    <p>Para importar una colección de fotos existente desde F-Spot:</p>
-    <steps>
-    <item><p>Seleccione <guiseq><gui>Archivo</gui><gui>Importar desde F-Spot</gui></guiseq>.</p></item>
-    <item><p>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.</p></item>
-    </steps>
-    <p>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.</p>
-</page>
diff --git a/help/es/import-file.page b/help/es/import-file.page
index c0919c8..e20a680 100644
--- a/help/es/import-file.page
+++ b/help/es/import-file.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#import"/>
         <desc>Importar fotos que ya están en el equipo.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Marina Prado</mal:name>
@@ -30,7 +30,7 @@
 
     <p>Para importar fotos desde su disco duro a Shotwell, solo debe arrastrarlas desde su explorador a la ventana de Shotwell.</p>
     
-    <p>Alternativamente, pulse <guiseq><gui>Archivo</gui><gui>Importar desde la carpeta...</gui></guiseq> y seleccione la carpeta que contiene las fotos que quiere importar.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>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.</p>
     
diff --git a/help/es/other-files.page b/help/es/other-files.page
index 19b4008..e6739f1 100644
--- a/help/es/other-files.page
+++ b/help/es/other-files.page
@@ -66,7 +66,10 @@
             </tbody>
         </table>
 
-        <p>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í.</p>
+        <p>
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
+            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
+        </p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/es/share-export.page b/help/es/share-export.page
index 2e1db2f..6a71941 100644
--- a/help/es/share-export.page
+++ b/help/es/share-export.page
@@ -41,7 +41,14 @@
 </list>
 </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>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>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</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>
 
diff --git a/help/es/share-upload.page b/help/es/share-upload.page
index fe393f7..fbd0153 100644
--- a/help/es/share-upload.page
+++ b/help/es/share-upload.page
@@ -31,15 +31,18 @@
     <p>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.</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Álbumes de Picasa Web</link> y <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (sólo vídeos)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, una página de fotos popular en Rusia (sólo fotos)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Cualquier sitio que ejecute el software de galería de fotos <link href="http://piwigo.org">Piwigo</link> (sólo fotos)</p></item>
     </list>
     
-    <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>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>Shift</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.</p>
     
     <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>
diff --git a/help/es/view-sidebar.page b/help/es/view-sidebar.page
index c0d5b6f..958f5b5 100644
--- a/help/es/view-sidebar.page
+++ b/help/es/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/hu/edit-adjustments.page b/help/hu/edit-adjustments.page
index fcee924..aeb0a31 100644
--- a/help/hu/edit-adjustments.page
+++ b/help/hu/edit-adjustments.page
@@ -36,6 +36,10 @@
    <p>Changes the brightness to make it look like the photo was exposed for a longer or shorter time. Use this to correct under- or over-exposed photos.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Telítettség</title>
    <p>Changes how vivid colors look. If your photo looks gray and washed out, try increasing the saturation. If colors look too bold, try decreasing it.</p>
   </item>
diff --git a/help/hu/import-f-spot.page b/help/hu/import-f-spot.page
deleted file mode 100644
index 4b892e5..0000000
--- a/help/hu/import-f-spot.page
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="hu">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell can import all your photos and tags from the F-Spot photo manager.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Kelemen Gábor</mal:name>
-      <mal:email>kelemeng at gnome dot hu</mal:email>
-      <mal:years>2014.</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Úr Balázs</mal:name>
-      <mal:email>urbalazs at gmail dot hu</mal:email>
-      <mal:years>2015, 2016.</mal:years>
-    </mal:credit>
-  </info>
-
-	<title>Importing from F-Spot</title>
-
-    <p>To import an existing photo collection from F-Spot:</p>
-    <steps>
-    <item><p>Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>. </p></item>
-    <item><p>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.</p></item>
-    </steps>
-    <p>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.</p>
-</page>
diff --git a/help/hu/import-file.page b/help/hu/import-file.page
index 5ffcb98..42f655d 100644
--- a/help/hu/import-file.page
+++ b/help/hu/import-file.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#import"/>
         <desc>Import photos that are already saved on your computer.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Kelemen Gábor</mal:name>
@@ -24,7 +24,7 @@
 
     <p>To import photo files from your hard disk into Shotwell, just drag them from your file browser into the Shotwell window.</p>
     
-    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>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.</p>
     
diff --git a/help/hu/other-files.page b/help/hu/other-files.page
index e6fcfb9..947bb2d 100644
--- a/help/hu/other-files.page
+++ b/help/hu/other-files.page
@@ -72,7 +72,10 @@
             </tbody>
         </table>
 
-        <p>További szimbólumok érhetők el. Nézze meg az strftime kézikönyvét a <cmd>man strftime</cmd> parancsot lefuttatva, ha olyanra van szüksége, amely nincs itt felsorolva.</p>
+        <p>
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
+            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
+        </p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/hu/share-export.page b/help/hu/share-export.page
index cb7a5b1..f8e7ad5 100644
--- a/help/hu/share-export.page
+++ b/help/hu/share-export.page
@@ -35,7 +35,14 @@
 </list>
 </item>
 <item><p>Az exportáláshoz használandó képminőség (alacsony, közepes, magas vagy maximális).</p></item>
-<item><p>Méretezési megszorítás (azaz a Shotwell eldönti, hogy a fényképeket le kell-e méretezni), és a kívánt képpontméret.</p></item>
+<item><p>Méretezési megszorítás (azaz a Shotwell eldönti, hogy a fényképeket le kell-e méretezni), és a kívánt képpontméret.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</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>
 </list>
 
diff --git a/help/hu/share-upload.page b/help/hu/share-upload.page
index ab26502..f581e86 100644
--- a/help/hu/share-upload.page
+++ b/help/hu/share-upload.page
@@ -25,15 +25,18 @@
     <p>A <link xref="other-plugins">bővítmények</link> használatával a Shotwell képes fényképeket és videókat közzétenni a következő szolgáltatásokon, amelyek mindegyike egy fiókot igényel:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Webalbumok</link> és <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (csak videók)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, egy Oroszországban népszerű fénykép-megosztó oldal (csak fényképek)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Bármeny oldal, amely a <link href="http://piwigo.org">Piwigo</link> fényképgaléria-szoftvert futtatja (csak fényképek)</p></item>
     </list>
     
-    <p>Egy gyűjtemény kiválasztott fényképeinek közzétételéhez válassza a <guiseq><gui>Szerkesztés</gui><gui>Beállítások</gui></guiseq> menüpontot, és kattintson a <gui>Bővítmények</gui> lapra azon szolgáltatás bővítményének bekapcsolásához, amelyen közzé szeretné tenni a fényképeket. Ezután válassza a <guiseq><gui>Fájl</gui><gui>Közzététel</gui></guiseq> menüpontot, nyomja meg a <gui>Közzététel</gui> eszköztárgombot, vagy használja a <keyseq><key>Ctrl</key><key>P</key></keyseq> kombinációt. A megjelenő ablakban kiválaszthat egy közzétételi szolgáltatást. Ezután be kell jelentkeznie vagy létre kell hoznia egy fiókot.</p>
+    <p>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>Shift</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.</p>
     
     <p>A Facebookra való közzétételhez bizonyos jogosultságokat kell adnia a Shotwell Facebook alkalmazásnak. Ezeket a jogosultságokat csak egyszer kell megadnia, amikor a Shotwell programot először társítja a Facebook fiókjához.</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>
diff --git a/help/hu/view-sidebar.page b/help/hu/view-sidebar.page
index 010059e..41186ee 100644
--- a/help/hu/view-sidebar.page
+++ b/help/hu/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/lv/edit-adjustments.page b/help/lv/edit-adjustments.page
index 8ceaff8..8958237 100644
--- a/help/lv/edit-adjustments.page
+++ b/help/lv/edit-adjustments.page
@@ -24,6 +24,10 @@
    <p>Maina gaišumu, lai izskatītos, ka fotogrāfijas ir eksponētas ilgāku vai īsāku laiku. Ar to var labot pāreksponētas vai nepietiekami eksponētas fotogrāfijas.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Piesātinājums</title>
    <p>Maina, cik spilgtas izskatās krāsas. Ja fotogrāfija izskatās pārāk pelēka vai izbalējusi, mēģiniet palielināt piesātinājumu. Ja krāsas ir pārāk izteiktas, samaziniet to.</p>
   </item>
diff --git a/help/lv/import-f-spot.page b/help/lv/import-f-spot.page
deleted file mode 100644
index 9145fad..0000000
--- a/help/lv/import-f-spot.page
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="lv">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell var arī importēt visas jūsu fotogrāfijas un tagus no F-Spot fotogrāfiju pārvaldnieka.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    </info>
-
-	<title>Importēšana no F-Spot</title>
-
-    <p>Lai importētu esošo fotogrāfiju kolekciju no F-Spot:</p>
-    <steps>
-    <item><p>Izvēlieties <guiseq><gui>Datne</gui><gui>Importēt no F-Spot</gui></guiseq>.</p></item>
-    <item><p>Tagad izvēlieties vai no noklusējuma F-Spot bibliotēku vai citu F-Spot datubāzi. Ja importējat no citas F-Spot datubāzes, izvēlēties direktoriju un datni ar izvēlētāja dialoglodziņu.</p></item>
-    </steps>
-    <p>Shotwell importēs jūsu fotogrāfijas ar to tagiem un citu informāciju. Kad importēšana ir pabeigta, varat izvēlēties <gui>Pēdējais imports</gui> sānu joslā, lai redzētu visas veiksmīgi importētās fotogrāfijas. Notikumu saraksts arī attēlos jaunos ierakstus datumiem, kas atbilst importētajām fotogrāfijām.</p>
-</page>
diff --git a/help/lv/import-file.page b/help/lv/import-file.page
index 460eb63..d1a3eb7 100644
--- a/help/lv/import-file.page
+++ b/help/lv/import-file.page
@@ -5,14 +5,14 @@
         <link type="guide" xref="index#import"/>
         <desc>Importēt fotogrāfijas, kas jau ir saglabātas datorā.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     </info>
 
 	<title>Importēt no cietā diska</title>
 
     <p>Lai importētu datnes no cietā diska uz Shotwell, velciet tās no datņu pārlūka Shotwell logā.</p>
     
-    <p>Varat arī spiest <guiseq><gui>Datne</gui><gui>Importēt no mapes...</gui></guiseq> un izvēlieties mapi, kura satur fotogrāfijas, kuras vēlaties importēt.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>Shotwell jums prasīs, vai vēlaties kopēt fotogrāfiju datnes uz jūsu bibliotēkas mapi (parasti tā ir mape <file>Attēli</file>, kas atrodas jūsu mājas direktorijā), vai importējiet tās, nekopējot datnes.</p>
     
diff --git a/help/lv/other-files.page b/help/lv/other-files.page
index f3d4383..f645a03 100644
--- a/help/lv/other-files.page
+++ b/help/lv/other-files.page
@@ -48,7 +48,10 @@
             </tbody>
         </table>
 
-        <p>Ir pieejami vēl vairāki simboli; skatiet strftime rokasgrāmatu, izpildot komandu <cmd>man strftime</cmd>, ja ir vajadzīgs simbols, kas nav šeit sarakstā.</p>
+        <p>
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
+            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
+        </p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/lv/share-export.page b/help/lv/share-export.page
index 139a0a7..913b405 100644
--- a/help/lv/share-export.page
+++ b/help/lv/share-export.page
@@ -23,7 +23,14 @@
 </list>
 </item>
 <item><p>Attēlu kvalitāte eksportējot (zema, vidēja, augsta vai maksimāla).</p></item>
-<item><p>Mēroga ierobežojums (kas norāda, kā Shotwell izlems samazināt fotogrāfijas) un vēlamais pikseļu izmērs.</p></item>
+<item><p>Mēroga ierobežojums (kas norāda, kā Shotwell izlems samazināt fotogrāfijas) un vēlamais pikseļu izmērs.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</item>
 <item><p>Opcija, vai vēlaties eksportēt metadatus, piemēram, tagus un vērtējumus. Tas var palīdzēt saglabāt privātumu, ja jums ir ģeolokācijas tagi vai tādi tagi, ko citiem nevajadzētu redzēt.</p></item>
 </list>
 
diff --git a/help/lv/share-upload.page b/help/lv/share-upload.page
index d3977ad..d6217e1 100644
--- a/help/lv/share-upload.page
+++ b/help/lv/share-upload.page
@@ -13,15 +13,18 @@
     <p>Izmantojot <link xref="other-plugins">spraudņus</link>, Shotwell var publicēt fotogrāfijas un video uz sekojošajiem pakalpojumiem, kur katram ir nepieciešams konts:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> un <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (tikai video)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, Krievijā populāra fotogrāfiju vietne (tikai fotogrāfijas)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Jebkura vietne, kas izmanto <link href="http://piwigo.org">Piwigo</link> fotogrāfiju galerijas programmatūru (tikai fotogrāfijas)</p></item>
     </list>
     
-    <p>Lai publicētu kolekcijā izvēlētās fotogrāfijas, izvēlieties <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> un spiediet cilni <gui>Spraudņi</gui>, lai ieslēgtu tā pakalpojuma spraudni, kurā publicēt. Pēc tam izvēlieties <guiseq><gui>Datne</gui><gui>Publicēt</gui></guiseq>, spiediet rīkjoslas pogu <gui>Publicēt</gui> vai izmantojiet <keyseq><key>Ctrl</key><key>P</key></keyseq>. Parādīsies dialoglodziņš, kas ļauj izvēlēties publicēšanas pakalpojumu. Pēc tam jums vajadzēs ierakstīties vai izveidot kontu.</p>
+    <p>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>Shift</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.</p>
     
     <p>Lai publicētu Facebook vietnē Shotwell Facebook lietotnei vajag īpašas atļaujas. Šīs atļaujas ir jādod tikai vienreiz, kad asociējat Shotwell ar savu Facebook kontu.</p>
     <note style="advanced"><p>Jūs varēsiet publicēt attēlus ar tām tiesībām, kādas sniedzāt Shotwell Facebook lietotnei</p></note>
diff --git a/help/lv/view-sidebar.page b/help/lv/view-sidebar.page
index 53dbdc5..16e5a45 100644
--- a/help/lv/view-sidebar.page
+++ b/help/lv/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/meson.build b/help/meson.build
new file mode 100644
index 0000000..4d4a172
--- /dev/null
+++ b/help/meson.build
@@ -0,0 +1,53 @@
+install_man('shotwell.1')
+
+yelp_pages = [
+    'edit-adjustments.page',
+    'edit-crop.page',
+    'edit-date-time.page',
+    'edit-enhance.page',
+    'edit-external.page',
+    'edit-nondestructive.page',
+    'edit-redeye.page',
+    'edit-rotate.page',
+    'edit-straighten.page',
+    'edit-undo.page',
+    'formats.page',
+    'import-camera.page',
+    'import-file.page',
+    'import-memorycard.page',
+    'index.page',
+    'organize-event.page',
+    'organize-flag.page',
+    'organize-rating.page',
+    'organize-remove.page',
+    'organize-search.page',
+    'organize-tag.page',
+    'organize-title.page',
+    'other-files.page',
+    'other-missing.page',
+    'other-multiple.page',
+    'other-plugins.page',
+    'raw.page',
+    'running.page',
+    'share-background.page',
+    'share-export.page',
+    'share-print.page',
+    'share-send.page',
+    'share-slideshow.page',
+    'share-upload.page',
+    'view-displaying.page',
+    'view-information.page',
+    'view-sidebar.page']
+
+yelp_media = [
+    'figures/edit_toolbar.png',
+    'figures/editing_overview.png',
+    'figures/shotwell_logo.png',
+    'figures/crop_thirds.jpg',
+    'figures/trash_process.png']
+
+gnome.yelp('shotwell',
+           sources : yelp_pages,
+           media : yelp_media,
+           symlink_media : true,
+           languages : [ 'cs', 'de', 'el', 'es', 'hu', 'lv', 'pt_BR', 'sv'])
diff --git a/help/pt_BR/edit-adjustments.page b/help/pt_BR/edit-adjustments.page
index ac59c88..1f5205f 100644
--- a/help/pt_BR/edit-adjustments.page
+++ b/help/pt_BR/edit-adjustments.page
@@ -30,6 +30,10 @@
    <p>Altera o brilho para fazer parecer que a foto foi exposta por um tempo maior ou menor. Utilize este ajuste para corrigir fotografias sub ou sobre-expostas.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Saturação</title>
    <p>Ajusta o quanto vivas parecem as cores. Se a foto parece cinzenta e com cores pouco vivas, tente aumentar a saturação. Se as cores parecem muito ousadas, tente diminuí-la.</p>
   </item>
diff --git a/help/pt_BR/import-f-spot.page b/help/pt_BR/import-f-spot.page
deleted file mode 100644
index b982856..0000000
--- a/help/pt_BR/import-f-spot.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="pt-BR">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>O Shotwell pode importar todas as suas fotos e etiquetas do programa gerenciador de fotos F-Spot.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Felipe Braga</mal:name>
-      <mal:email>fbobraga@gmail.com</mal:email>
-      <mal:years>2015</mal:years>
-    </mal:credit>
-  </info>
-
-	<title>Importando do F-Spot</title>
-
-    <p>Para importar uma coleção de fotos existentes do programa F-Spot:</p>
-    <steps>
-    <item><p>Selecione <guiseq><gui>Arquivo</gui><gui>Importar do F-Spot</gui></guiseq>.</p></item>
-    <item><p>Escolha a biblioteca padrão do F-Spot ou outro banco de dados do F-Spot. Para importar bancos d dados diferentes do padrão do F-Spot, selecione o diretório e o arquivo dele.</p></item>
-    </steps>
-    <p>O Shotwell vai importar suas fotos, com as suas etiquetas e outras informações. Quando a importação for concluída, você pode selecionar <gui>Última importação</gui> na barra lateral para ver as fotos importadas. A lista de eventos também irá mostrar novas entradas para as datas correspondentes às fotos importadas.</p>
-</page>
diff --git a/help/pt_BR/import-file.page b/help/pt_BR/import-file.page
index a11e17d..29436ae 100644
--- a/help/pt_BR/import-file.page
+++ b/help/pt_BR/import-file.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#import"/>
         <desc>Importe fotos existentes no computador.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Felipe Braga</mal:name>
@@ -18,7 +18,7 @@
 
     <p>Para importar arquivos de seu disco rígido para o Shotwell, basta arrastá-los a partir do seu navegador de arquivos para a janela do Shotwell.</p>
     
-    <p>Alternativamente, use o item de menu <guiseq><gui>Arquivo</gui><gui>Importar da pasta...</gui></guiseq> e selecione a pasta que contém as fotos que você deseja importar.</p>
+    <p>Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</gui></guiseq> and select the folder containing the photos you want to import. If you do not want Shotwell to recurse into subfolders while importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox on the bottom of the file dialog.</p>
     
     <p>O Shotwell irá perguntar se você deseja copiar os arquivos de fotos para a pasta de biblioteca (geralmente este é a pasta <file>Imagens</file> no seu diretório pessoal) ou importá-los do lugar, sem copiar os arquivos.</p>
     
diff --git a/help/pt_BR/other-files.page b/help/pt_BR/other-files.page
index 5fcc72b..f1e85ab 100644
--- a/help/pt_BR/other-files.page
+++ b/help/pt_BR/other-files.page
@@ -54,7 +54,10 @@
             </tbody>
         </table>
 
-        <p>Existem outros símbolos disponíveis; por favor, verifique o manual do "strftime", com o comando <cmd>man strftime</cmd> se você precisa de um que não esteja aqui.</p>
+        <p>
+            There are other symbols available; please check the <link href="man:strftime">manual for strftime</link> by running
+            the command <cmd>man strftime</cmd> if you need one that isn't listed here.
+        </p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/pt_BR/share-export.page b/help/pt_BR/share-export.page
index a47592a..d4b2144 100644
--- a/help/pt_BR/share-export.page
+++ b/help/pt_BR/share-export.page
@@ -29,7 +29,14 @@
 </list>
 </item>
 <item><p>A qualidade da imagem para a exportação (Baixo, Médio, Alto, ou Máximo).</p></item>
-<item><p>Uma restrição de escala (como o que significa que o Shotwell irá diminuir as fotos quando se necessário), e o número de pixeis desejado.</p></item>
+<item><p>Uma restrição de escala (como o que significa que o Shotwell irá diminuir as fotos quando se necessário), e o número de pixeis desejado.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</item>
 <item><p>A opção se você deseja exportar metadados, como etiquetas ou avaliações. Isso pode ajudar a manter a sua privacidade, se você tem etiquetas de geolocalização que não devem ser vistas por qualquer um.</p></item>
 </list>
 
diff --git a/help/pt_BR/share-upload.page b/help/pt_BR/share-upload.page
index cb804b0..6a2f8af 100644
--- a/help/pt_BR/share-upload.page
+++ b/help/pt_BR/share-upload.page
@@ -19,15 +19,18 @@
     <p>Através do uso de <link xref="other-plugins">plug-ins</link>, o Shotwell pode publicar fotos e vídeos para os seguintes serviços (cada um necessita de uma conta):</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> e <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (somente vídeos)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, um site de fotos popular na Rússia (somente fotos)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Qualquer site usando o software de galeria de fotos <link href="http://piwigo.org">Piwigo</link> (somente fotos)</p></item>
     </list>
     
-    <p>Para publicar as fotos selecionadas, use o item do menu <guiseq><gui>Editar</gui><gui>Preferências</gui></guiseq> e clique na aba <gui>Plug-ins</gui> para ativar o plug-in para o serviço correspondente. Em seguida, selecione as fotos/vídeos e use o menu <guiseq><gui>Arquivo</gui><gui>Publicar</gui></guiseq> ou pressione o botão <gui>Publicar</gui> na barra de ferramentas ou, ainda, use as teclas <keyseq><key>Ctrl</key><key>P</key></keyseq>. Você verá uma caixa de diálogo que permite selecionar um serviço de publicação. Em seguida, será necessário fazer o login ou criar uma conta.</p>
+    <p>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>Shift</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.</p>
     
     <p>Publicar para o Facebook necessita que você conceda algumas permissões para o aplicativo Facebook do Shotwell. Você só precisará conceder essas permissões quando usar o Shotwell para publicar fotos/vídeos no Facebook pela primeira vez.</p>
     <note style="advanced"><p>Você apenas conseguirá publicar imagens com a permissão que você concedeu para o aplicativo Facebook do Shotwell</p></note>
diff --git a/help/pt_BR/view-sidebar.page b/help/pt_BR/view-sidebar.page
index ab424c1..a093208 100644
--- a/help/pt_BR/view-sidebar.page
+++ b/help/pt_BR/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/help/shotwell.1 b/help/shotwell.1
index 195143f..a68f387 100644
--- a/help/shotwell.1
+++ b/help/shotwell.1
@@ -26,6 +26,11 @@ Path to Shotwell's private data
 Do not monitor library directory at runtime for changes
 .RE
 
+.B \-f, \-\-fullscreen
+.RS
+Open the viewer mode in fullscreen. Has no effect in library mode.
+.RE
+
 .B \-\-no-startup-progress
 .RS
 Don't display startup progress meter
diff --git a/help/sv/edit-adjustments.page b/help/sv/edit-adjustments.page
index cd5e772..b3e7a41 100644
--- a/help/sv/edit-adjustments.page
+++ b/help/sv/edit-adjustments.page
@@ -36,6 +36,10 @@
    <p>Ändra ljusstyrkan för att få det att se ut som att bilden exponerades en längre eller kortare tid. Använd detta för att korrigera över- eller underexponerade bilder.</p>
   </item>
   <item>
+   <title>Contrast</title>
+   <p>Changes the contrast of a photo. Use it to correct flat-looking photos or photos where the difference between bright and dark spots seems to big.</p>
+  </item>
+  <item>
    <title>Mättnad</title>
    <p>Ändrar hur levande färger uppfattas. Om din bild ser grå och urblekt ut, prova att öka mättnaden. Om färgerna är för starka, prova att minska den.</p>
   </item>
diff --git a/help/sv/formats.page b/help/sv/formats.page
index a152498..e0a9a4b 100644
--- a/help/sv/formats.page
+++ b/help/sv/formats.page
@@ -22,13 +22,11 @@
 
 	<title>Bild- och videoformat som stöds</title>
 
-   <p>Shotwell supports JPEG, PNG, TIFF, BMP and <link xref="other-raw">RAW</link> photo files. Shotwell does not yet support other graphics format such as GIF.</p>
+   <p>Shotwell stödjer JPEG, PNG, TIFF, BMP och <link xref="other-raw">RAW</link>-bildfiler. Shotwell stödjer inte ännu andra grafikformat som GIF.</p>
 
 <p>Shotwells RAW-formatstöd är för tillfället begränsat. När du visar en RAW-bild visar du egentligen en JPEG som härstammar från RAW-bilden, inte själva RAW-bilden. Dessutom är RAW-redigeringsflödet inte helt 16-bitars - du kan bara exportera redigerade bilder som 8-bitars filer. Alla format som stöds kan användas för export (JPEG, PNG, TIFF, BMP).</p>
 
-<p>For more information about RAW-format photos in Shotwell, please see
-the <link xref="other-raw">RAW</link> section.
-</p>
+<p>För mer information om RAW-formatbilder i Shotwell, se avsnittet <link xref="other-raw">RAW</link>.</p>
 
 <p>Shotwell stödjer också filmfiler i format som GStreamer mediabibliotek stödjer, på systemet där Shotwell körs. Normalt inkluderar det följande format, bland andra:</p>
 <list>
diff --git a/help/sv/import-f-spot.page b/help/sv/import-f-spot.page
deleted file mode 100644
index 4fdaba7..0000000
--- a/help/sv/import-f-spot.page
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="sv">
-
-    <info>
-        <link type="guide" xref="index#import"/>
-        <desc>Shotwell kan importera alla dina bilder och taggar från bildhanteraren F-Spot.</desc>
-        
-        <link type="next" xref="import-camera"/>
-    
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Josef Andersson</mal:name>
-      <mal:email>josef.andersson@fripost.org</mal:email>
-      <mal:years>2015</mal:years>
-    </mal:credit>
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name>Anders Jonsson</mal:name>
-      <mal:email>anders.jonsson@norsjovallen.se</mal:email>
-      <mal:years>2016</mal:years>
-    </mal:credit>
-  </info>
-
-	<title>Importera från F-Spot</title>
-
-    <p>För att importera en befintlig bildsamling från F-Spot:</p>
-    <steps>
-    <item><p>Välj <guiseq><gui>Arkiv</gui><gui>Importera från F-Spot</gui></guiseq>.</p></item>
-    <item><p>Välj nu antingen F-Spot-biblioteket eller en annan F-Spot-databas. Om importen sker från en annan F-Spot-databas, välj katalog och fil från valdialogrutan.</p></item>
-    </steps>
-    <p>Shotwell kommer att importera dina bilder tillsammans med deras taggar och annan information. När importen är klar kan du välja <gui>Senaste import</gui> i sidopanelen för att se alla bilder som importerades. Händelselistan kommer också att visa nya angivelser för datum som motsvarar de importerade bilderna.</p>
-</page>
diff --git a/help/sv/import-file.page b/help/sv/import-file.page
index d73b040..1505b33 100644
--- a/help/sv/import-file.page
+++ b/help/sv/import-file.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#import"/>
         <desc>Importera bilder som redan är sparade på din dator.</desc>
         
-        <link type="next" xref="import-f-spot"/>
+        <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Josef Andersson</mal:name>
@@ -24,7 +24,7 @@
 
     <p>För att importera bildfiler från din hårddisk till Shotwell, dra dem från din filhanterare till Shotwell-fönstret.</p>
     
-    <p>Alternativt, klicka <guiseq><gui>Arkiv</gui><gui>Importera från mapp…</gui></guiseq> och markera mappen som innehåller de bilder du vill importera.</p>
+    <p>Alternativt, klicka <guiseq><gui>Arkiv</gui><gui>Importera från mapp…</gui></guiseq> och markera mappen som innehåller de bilder du vill importera. Om du inte vill att Shotwell rekursivt ska gå in i undermappar under import kan du avmarkera kryssrutan <gui>Gå rekursivt in i undermappar</gui> längst ner i fildialogen.</p>
     
     <p>Shotwell kommer att fråga huruvida du vill kopiera bildfiler till din biblioteksmapp (vanligtvis mappen <file>Bilder</file> i din hemkatalog) eller importera dem direkt utan att kopiera filerna.</p>
     
diff --git a/help/sv/other-files.page b/help/sv/other-files.page
index bcfd7cd..3252e6f 100644
--- a/help/sv/other-files.page
+++ b/help/sv/other-files.page
@@ -60,7 +60,7 @@
             </tbody>
         </table>
 
-        <p>Det finns andra symboler tillgängliga, se handboken för strftime genom att köra kommandot <cmd>man strftime</cmd> om du behöver en som inte listas här.</p>
+        <p>Det finns andra symboler tillgängliga, se <link href="man:strftime">handboken för strftime</link> genom att köra kommandot <cmd>man strftime</cmd> om du behöver en som inte listas här.</p>
     </section>
 
     <section id="automatic-import">
diff --git a/help/sv/share-export.page b/help/sv/share-export.page
index 3749189..b9e21fc 100644
--- a/help/sv/share-export.page
+++ b/help/sv/share-export.page
@@ -35,7 +35,14 @@
 </list>
 </item>
 <item><p>Bildkvaliteten för export (låg, mellan, hög eller maximal)</p></item>
-<item><p>En skalningsbegränsning (vilket betyder hur Shotwell bestämmer hur bilderna ska skalas) och önskad bildpunktsstorlek.</p></item>
+<item><p>En skalningsbegränsning (vilket betyder hur Shotwell bestämmer hur bilderna ska skalas) och önskad bildpunktsstorlek.</p>
+<terms>
+<item><title>Original size</title><p>Image will be exported without any scaling applied</p></item>
+<item><title>Longest edge</title><p>Image will be exported by having its longest edge scaled to <gui>Pixels</gui> and the other according to the aspect ratio</p></item>
+<item><title>Width</title><p>The image width will have its width scaled to the given pixel size and its height according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for landscape pictures.</p></item>
+<item><title>Height</title><p>The image height will have its height scaled to the given pixel size and its width according to the aspect ratio. This is equivalent to <gui>Longest Edge</gui> for portrait pictures.</p></item>
+</terms>
+</item>
 <item><p>Huruvida du vill exportera metadata som taggar eller betyg. Detta kan skydda din sekretess om du har geoplats-taggar eller taggar ingen bör se.</p></item>
 </list>
 
diff --git a/help/sv/share-upload.page b/help/sv/share-upload.page
index c87b969..8effa11 100644
--- a/help/sv/share-upload.page
+++ b/help/sv/share-upload.page
@@ -25,15 +25,18 @@
     <p>Genom att använda <link xref="other-plugins">insticksmoduler</link> kan Shotwell publicera bilder och filmer till följande tjänster, som var och en kräver ett konto:</p>
     
     <list>
-    <item><p><link href="http://facebook.com">Facebook</link></p></item>
-    <item><p><link href="http://flickr.com">Flickr</link></p></item>
-    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> och <link href="http://plus.google.com">Google+</link></p></item>
-    <item><p><link href="http://youtube.com">YouTube</link> (endast video)</p></item>
-    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, en populär webbplats i Ryssland (endast bilder)</p></item>
+    <item><p><link href="https://facebook.com">Facebook</link></p></item>
+    <item><p><link href="https://flickr.com">Flickr</link></p></item>
+    <item><p><link href="https://picasaweb.google.com">Picasa Web Albums</link> and <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="https://youtube.com">YouTube</link> (videos only)</p></item>
+    <item><p><link href="https://tumblr.com">Tumblr</link> (videos only)</p></item>
     <item><p>Vilken webbplats som helst som kör <link href="http://piwigo.org">Piwigo</link>-bildgalleriprogram (endast bilder)</p></item>
     </list>
     
-    <p>För att publicera markerade bilder i en samling, välj <guiseq><gui>Redigera</gui><gui>Inställningar</gui></guiseq> och klicka på fliken <gui>Insticksmoduler</gui> för att aktivera insticket för tjänsten du vill publicera till. Välj sedan <guiseq><gui>Arkiv</gui><gui>Publicera</gui></guiseq>, tryck verktygsfältsknappen <gui>Publicera</gui> eller använd <keyseq><key>Ctrl</key><key>P</key></keyseq>. Du får då upp en dialog som låter dig välja en publiceringstjänst. Du måste sedan logga in eller skapa ett konto.</p>
+    <p>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>Shift</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.</p>
     
     <p>Att publicera till Facebook kräver att du ger tillstånd för programmet Shotwell för Facebook. Du behöver bara ge dessa tillstånd en gång, då du först associerar Shotwell med ditt Facebook-konto.</p>
     <note style="advanced"><p>Du kommer bara kunna publicera bilder med högst behörigheten du givit tillstånd till för programmet Shotwell för Facebook</p></note>
diff --git a/help/sv/sv.po b/help/sv/sv.po
index 59b1afb..7ad6c1b 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -1,13 +1,13 @@
 # Swedish translation for shotwell help
-# Copyright © 2015, 2016 shotwell's COPYRIGHT HOLDER
+# Copyright © 2015, 2016, 2017 shotwell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the shotwell package.
 # Josef Andersson <josef.andersson@fripost.org>, 2015.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2017-01-18 21:37+0000\n"
-"PO-Revision-Date: 2017-02-12 15:58+0100\n"
+"POT-Creation-Date: 2017-09-25 16:12+0000\n"
+"PO-Revision-Date: 2017-09-28 22:48+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -165,18 +165,6 @@ msgstr ""
 "svarta är. Använd dem för att ändra kontrasten på en bild. Speciellt bilder "
 "som ser urblekta ut bör ha nytta av att ändra dessa inställningar."
 
-#. (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."
@@ -312,6 +300,18 @@ msgstr ""
 "Att beskära en bild så att den passar under tredelningsregeln ger ofta en "
 "visuellt tilltalande bild."
 
+#. (itstool) path: section/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: media/p
 #: C/edit-crop.page:43
 msgid ""
@@ -720,16 +720,16 @@ msgstr ""
 msgid "Supported photo and video formats"
 msgstr "Bild- och videoformat som stöds"
 
+# TODO:format->formats?
 #. (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."
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link xref=\"other-raw\">RAW</"
+"link> photo files. Shotwell does not yet support other graphics format such "
+"as GIF."
 msgstr ""
-"Shotwell stödjer JPEG, PNG, TIFF, BMP och <link type=\"guide\" xref=\"other-"
-"raw\">RAW</link>-bildfiler. Shotwell stödjer inte ännu andra grafikformat "
-"som GIF."
+"Shotwell stödjer JPEG, PNG, TIFF, BMP och <link xref=\"other-raw\">RAW</"
+"link>-bildfiler. Shotwell stödjer inte ännu andra grafikformat som GIF."
 
 #. (itstool) path: page/p
 #: C/formats.page:16
@@ -750,10 +750,10 @@ msgstr ""
 #: 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."
+"<link xref=\"other-raw\">RAW</link> section."
 msgstr ""
-"För mer information om RAW-formatbilder i Shotwell, se avsnittet <link type="
-"\"guide\" xref=\"other-raw\">RAW</link>."
+"För mer information om RAW-formatbilder i Shotwell, se avsnittet <link xref="
+"\"other-raw\">RAW</link>."
 
 #. (itstool) path: page/p
 #: C/formats.page:22
@@ -884,10 +884,16 @@ msgstr ""
 #: 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."
+"gui></guiseq> and select the folder containing the photos you want to "
+"import. If you do not want Shotwell to recurse into subfolders while "
+"importing, you can uncheck the <gui>Recurse Into Subfolders</gui> checkbox "
+"on the bottom of the file dialog."
 msgstr ""
 "Alternativt, klicka <guiseq><gui>Arkiv</gui><gui>Importera från mapp…</gui></"
-"guiseq> och markera mappen som innehåller de bilder du vill importera."
+"guiseq> och markera mappen som innehåller de bilder du vill importera. Om du "
+"inte vill att Shotwell rekursivt ska gå in i undermappar under import kan du "
+"avmarkera kryssrutan <gui>Gå rekursivt in i undermappar</gui> längst ner i "
+"fildialogen."
 
 #. (itstool) path: page/p
 #: C/import-file.page:18
@@ -925,56 +931,6 @@ msgstr ""
 "poster för datumen som motsvarar de importerade bilderna."
 
 #. (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 kan importera alla dina bilder och taggar från bildhanteraren F-"
-"Spot."
-
-#. (itstool) path: page/title
-#: C/import-f-spot.page:12
-msgid "Importing from F-Spot"
-msgstr "Importera från F-Spot"
-
-#. (itstool) path: page/p
-#: C/import-f-spot.page:14
-msgid "To import an existing photo collection from F-Spot:"
-msgstr "För att importera en befintlig bildsamling från 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 ""
-"Välj <guiseq><gui>Arkiv</gui><gui>Importera från 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 ""
-"Välj nu antingen F-Spot-biblioteket eller en annan F-Spot-databas. Om "
-"importen sker från en annan F-Spot-databas, välj katalog och fil från "
-"valdialogrutan."
-
-#. (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 kommer att importera dina bilder tillsammans med deras taggar och "
-"annan information. När importen är klar kan du välja <gui>Senaste import</"
-"gui> i sidopanelen för att se alla bilder som importerades. Händelselistan "
-"kommer också att visa nya angivelser för datum som motsvarar de importerade "
-"bilderna."
-
-#. (itstool) path: info/desc
 #: C/import-memorycard.page:7
 msgid "Import photos from a digital camera's memory card."
 msgstr "Importera bilder från en digitalkameras minneskort."
@@ -1039,59 +995,53 @@ msgstr ""
 "fungerar bör du ändå kunna importera bilder genom att ansluta <link xref="
 "\"import-camera\"> din kamera direkt till datorn </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
+#: C/index.page:8
 msgid "Jim Nelson"
 msgstr "Jim Nelson"
 
 #. (itstool) path: credit/name
-#: C/index.page:11
+#: C/index.page:10
 msgid "Allison Barlow"
 msgstr "Allison Barlow"
 
 #. (itstool) path: credit/name
-#: C/index.page:13
+#: C/index.page:12
 msgid "Robert Ancell"
 msgstr "Robert Ancell"
 
 #. (itstool) path: credit/name
-#: C/index.page:15
+#: C/index.page:14
 msgid "Peter Smith"
 msgstr "Peter Smith"
 
 #. (itstool) path: credit/name
-#: C/index.page:17
+#: C/index.page:16
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
+#. (itstool) path: title/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:22
+msgctxt "_"
+msgid ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+msgstr ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+
 #. (itstool) path: page/title
-#: C/index.page:23
+#: C/index.page:22
 msgid ""
 "<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
 "Manager"
@@ -1100,32 +1050,32 @@ msgstr ""
 "bildhanterare"
 
 #. (itstool) path: section/title
-#: C/index.page:26
+#: C/index.page:25
 msgid "Importing Photos"
 msgstr "Importera bilder"
 
 #. (itstool) path: section/title
-#: C/index.page:30
+#: C/index.page:29
 msgid "Viewing Photos"
 msgstr "Visa bilder"
 
 #. (itstool) path: section/title
-#: C/index.page:34
+#: C/index.page:33
 msgid "Organizing Photos"
 msgstr "Ordna bilder"
 
 #. (itstool) path: section/title
-#: C/index.page:38
+#: C/index.page:37
 msgid "Editing Photos"
 msgstr "Redigera bilder"
 
 #. (itstool) path: section/title
-#: C/index.page:42
+#: C/index.page:41
 msgid "Sharing Photos"
 msgstr "Dela bilder"
 
 #. (itstool) path: section/title
-#: C/index.page:46
+#: C/index.page:45
 msgid "Other Features"
 msgstr "Andra egenskaper"
 
@@ -1449,20 +1399,6 @@ msgstr ""
 "<guiseq><gui>Betygsätt</gui><gui>Sänk</gui></guiseq>-kommandona, eller "
 "tangentbordsgenvägarna <key>&lt;</key> och <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 ""
@@ -1485,6 +1421,20 @@ msgstr ""
 "fullständigt från din hårddisk."
 
 #. (itstool) path: page/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: media/p
 #: C/organize-remove.page:15
 msgid "Delete process"
 msgstr "Raderingsprocess"
@@ -2177,12 +2127,13 @@ 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."
+"There are other symbols available; please check the <link href=\"man:strftime"
+"\">manual for strftime</link> by running the command <cmd>man strftime</cmd> "
+"if you need one that isn't listed here."
 msgstr ""
-"Det finns andra symboler tillgängliga, se handboken för strftime genom att "
-"köra kommandot <cmd>man strftime</cmd> om du behöver en som inte listas här."
+"Det finns andra symboler tillgängliga, se <link href=\"man:strftime"
+"\">handboken för strftime</link> genom att köra kommandot <cmd>man strftime</"
+"cmd> om du behöver en som inte listas här."
 
 #. (itstool) path: section/title
 #: C/other-files.page:79
@@ -3162,12 +3113,12 @@ msgstr ""
 "Sidopanelen till vänster om fönstret listar olika vyer över ditt bibliotek."
 
 #. (itstool) path: page/title
-#: C/view-sidebar.page:21
+#: C/view-sidebar.page:20
 msgid "The sidebar"
 msgstr "Sidopanelen"
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:23
+#: C/view-sidebar.page:22
 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 "
@@ -3178,7 +3129,7 @@ msgstr ""
 "lagrad en gång på din hårddisk."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:25
+#: C/view-sidebar.page:24
 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."
@@ -3188,12 +3139,12 @@ msgstr ""
 "hårddisken."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:27
+#: C/view-sidebar.page:26
 msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
 msgstr "<gui>Flaggade</gui> listar alla bilder du tidigare flaggat."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:29
+#: C/view-sidebar.page:28
 msgid ""
 "The <gui>Saved Search</gui> allows you to sort your library by many criteria."
 msgstr ""
@@ -3201,7 +3152,7 @@ msgstr ""
 "kriterier."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:31
+#: C/view-sidebar.page:30
 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."
@@ -3210,7 +3161,7 @@ msgstr ""
 "händelser är en grupp av bilder som tagits ungefär samtidigt."
 
 #. (itstool) path: page/p
-#: C/view-sidebar.page:33
+#: C/view-sidebar.page:32
 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 "
@@ -3220,6 +3171,50 @@ msgstr ""
 "kan ha flera taggar kopplade till dem. När du klickar på namnet på en tagg i "
 "sidopanelen kommer du att se alla bilder associerade med den taggen."
 
+#~ msgctxt "text"
+#~ msgid "Shotwell"
+#~ msgstr "Shotwell"
+
+#~ msgid ""
+#~ "Shotwell can import all your photos and tags from the F-Spot photo "
+#~ "manager."
+#~ msgstr ""
+#~ "Shotwell kan importera alla dina bilder och taggar från bildhanteraren F-"
+#~ "Spot."
+
+#~ msgid "Importing from F-Spot"
+#~ msgstr "Importera från F-Spot"
+
+#~ msgid "To import an existing photo collection from F-Spot:"
+#~ msgstr "För att importera en befintlig bildsamling från F-Spot:"
+
+#~ msgid ""
+#~ "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
+#~ msgstr ""
+#~ "Välj <guiseq><gui>Arkiv</gui><gui>Importera från F-Spot</gui></guiseq>."
+
+#~ 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 ""
+#~ "Välj nu antingen F-Spot-biblioteket eller en annan F-Spot-databas. Om "
+#~ "importen sker från en annan F-Spot-databas, välj katalog och fil från "
+#~ "valdialogrutan."
+
+#~ 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 kommer att importera dina bilder tillsammans med deras taggar "
+#~ "och annan information. När importen är klar kan du välja <gui>Senaste "
+#~ "import</gui> i sidopanelen för att se alla bilder som importerades. "
+#~ "Händelselistan kommer också att visa nya angivelser för datum som "
+#~ "motsvarar de importerade bilderna."
+
 #~ msgid "Facebook"
 #~ msgstr "Facebook"
 
diff --git a/help/sv/view-sidebar.page b/help/sv/view-sidebar.page
index 0920377..faac524 100644
--- a/help/sv/view-sidebar.page
+++ b/help/sv/view-sidebar.page
@@ -10,7 +10,6 @@
         <link type="seealso" xref="flag"/>
         <link type="seealso" xref="search#savedsearch"/>
         <link type="seealso" xref="import-file"/>
-        <link type="seealso" xref="import-f-spot"/>
         <link type="seealso" xref="import-memorycard"/>
         <link type="seealso" xref="import-camera"/>
         
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 59f6087..0c93e7a 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,9 +1,8 @@
 dist_noinst_DATA = \
-	about-aachen.jpg \
+	about-braunschweig.jpg \
 	all-rejected.png \
 	crop-pivot-reticle.png \
 	crop.svg \
-	drag_nub.png \
 	faces-tool.png \
 	filter-flagged-disabled.png \
 	filter-flagged.png \
@@ -42,6 +41,7 @@ dist_noinst_DATA = \
 	shotwell-16.png \
 	shotwell-auto-enhance.png \
 	shotwell.png \
+	shotwell.svg \
 	shotwell-street.jpg \
 	slideshow-extension-point.png \
 	sprocket.png \
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 0bb568d..2f32470 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -314,11 +314,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 dist_noinst_DATA = \
-	about-aachen.jpg \
+	about-braunschweig.jpg \
 	all-rejected.png \
 	crop-pivot-reticle.png \
 	crop.svg \
-	drag_nub.png \
 	faces-tool.png \
 	filter-flagged-disabled.png \
 	filter-flagged.png \
@@ -357,6 +356,7 @@ dist_noinst_DATA = \
 	shotwell-16.png \
 	shotwell-auto-enhance.png \
 	shotwell.png \
+	shotwell.svg \
 	shotwell-street.jpg \
 	slideshow-extension-point.png \
 	sprocket.png \
diff --git a/icons/about-aachen.jpg b/icons/about-aachen.jpg
deleted file mode 100644
index 924cfb9..0000000
--- a/icons/about-aachen.jpg
+++ /dev/null
diff --git a/icons/about-braunschweig.jpg b/icons/about-braunschweig.jpg
new file mode 100644
index 0000000..dae41ae
--- /dev/null
+++ b/icons/about-braunschweig.jpg
diff --git a/icons/drag_nub.png b/icons/drag_nub.png
deleted file mode 100644
index f16a85d..0000000
--- a/icons/drag_nub.png
+++ /dev/null
diff --git a/icons/shotwell.svg b/icons/shotwell.svg
new file mode 100644
index 0000000..d3ede48
--- /dev/null
+++ b/icons/shotwell.svg
@@ -0,0 +1,624 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="180"
+   height="163.29721"
+   viewBox="0 0 47.624999 43.205722"
+   version="1.1"
+   id="svg1962"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="shotwell.svg">
+  <defs
+     id="defs1956">
+    <filter
+       inkscape:collect="always"
+       id="filter5562-3"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3642241"
+         id="feGaussianBlur5564-0" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5574-7"
+       x="-0.14485998"
+       width="1.2897201"
+       y="-0.13481142"
+       height="1.2696228"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.2156237"
+         id="feGaussianBlur5576-7" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5574"
+       x="-0.14485998"
+       width="1.2897201"
+       y="-0.13481142"
+       height="1.2696228">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.2156237"
+         id="feGaussianBlur5576" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5562">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3642241"
+         id="feGaussianBlur5564" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4732"
+       id="linearGradient5617"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-176.323,132.49025,151.08834)"
+       x1="68.873505"
+       y1="51.558125"
+       x2="175.17638"
+       y2="109.70502" />
+    <linearGradient
+       id="linearGradient4732">
+      <stop
+         id="stop4734"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#d7dad3;stop-opacity:1;"
+         offset="0.15395921"
+         id="stop4738" />
+      <stop
+         id="stop4736"
+         offset="1"
+         style="stop-color:white;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5626"
+       id="linearGradient5619"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-176.323,132.49025,151.08834)"
+       x1="179.23587"
+       y1="142.29613"
+       x2="148.46533"
+       y2="51.268147" />
+    <linearGradient
+       id="linearGradient5626"
+       gradientUnits="userSpaceOnUse"
+       x1="135.96919"
+       y1="291.77829"
+       x2="41.1329"
+       y2="74.766403">
+      <stop
+         offset="0"
+         style="stop-color:#d16060;stop-opacity:1"
+         id="stop5628" />
+      <stop
+         offset="1"
+         style="stop-color:#dac0c5;stop-opacity:1"
+         id="stop5631" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4748">
+      <path
+         d="M 155.5293,128.78906 41.039062,161.09961 78.347656,293.53516 C 116.71585,282.70697 156.24425,274.21964 193.12695,259.04102 178.2475,216.64081 168.77837,171.70581 155.5293,128.78906 Z"
+         inkscape:href="#path652-6"
+         id="path4750"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:1.10601008;stroke-opacity:1;marker:none;enable-background:accumulate"
+         xlink:href="#path652-6"
+         inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.347656 293.53516 C 116.71585 282.70697 156.24425 274.21964 193.12695 259.04102 C 178.2475 216.64081 168.77837 171.70581 155.5293 128.78906 z "
+         inkscape:radius="0"
+         sodipodi:type="inkscape:offset" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter4764">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.47475"
+         id="feGaussianBlur4766" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5583"
+       id="radialGradient5621"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8538598,-0.05539543,0.03934884,1.3168464,-97.492667,-27.660481)"
+       cx="117.19691"
+       cy="126.45943"
+       fx="117.19691"
+       fy="126.45943"
+       r="43" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5583">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5585" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5587" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter5597"
+       x="-0.12276876"
+       width="1.2455375"
+       y="-0.16192776"
+       height="1.3238555">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.9132543"
+         id="feGaussianBlur5599" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5739">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.8985523"
+         id="feGaussianBlur5741" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient82201"
+       id="linearGradient5737"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-176.323,132.49025,151.08834)"
+       x1="68.873505"
+       y1="51.558125"
+       x2="175.17638"
+       y2="109.70502" />
+    <linearGradient
+       id="linearGradient82201">
+      <stop
+         style="stop-color:#eeeeee;stop-opacity:1"
+         offset="0"
+         id="stop82203" />
+      <stop
+         id="stop82205"
+         offset="0.15395921"
+         style="stop-color:#d7dad3;stop-opacity:1;" />
+      <stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="1"
+         id="stop82207" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6969-5"
+       id="linearGradient81638-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.8615626,0,0,3.6867045,-117.22131,27.190584)"
+       x1="-11.986486"
+       y1="11.500009"
+       x2="-11.986486"
+       y2="28.976542" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6969-5">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop6971-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop6973-3" />
+    </linearGradient>
+    <clipPath
+       id="clipPath4719-3-3"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         y="428"
+         x="84"
+         height="56"
+         width="92"
+         id="rect4721-9-7"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+    </clipPath>
+    <filter
+       height="1.6053097"
+       y="-0.30265486"
+       width="1.6053097"
+       x="-0.30265486"
+       id="filter4709-1-0"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4711-29-9"
+         stdDeviation="3.5333828"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter4608-6-0"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4610-1-5"
+         stdDeviation="0.84057318"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       height="1.405442"
+       y="-0.20272098"
+       width="1.222294"
+       x="-0.11114702"
+       id="filter4616-8-2"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4618-0-5"
+         stdDeviation="0.83939158"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4616-1-3"
+       id="linearGradient81640-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.968333,0,0,4.8387798,-222.41578,-11.288882)"
+       x1="25.355263"
+       y1="33.357342"
+       x2="25.355263"
+       y2="31.76339" />
+    <linearGradient
+       id="linearGradient4616-1-3"
+       inkscape:collect="always">
+      <stop
+         id="stop4618-9-7"
+         offset="0"
+         style="stop-color: rgb(46, 52, 54); stop-opacity: 1;" />
+      <stop
+         id="stop4620-2-6"
+         offset="1"
+         style="stop-color: rgb(46, 52, 54); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4610-7-8"
+       id="linearGradient81642-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0969936,0,0,1.3825125,-293.78497,-511.067)"
+       x1="145"
+       y1="481.125"
+       x2="149.75"
+       y2="492.875" />
+    <linearGradient
+       id="linearGradient4610-7-8"
+       inkscape:collect="always">
+      <stop
+         id="stop4612-57-3"
+         offset="0"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" />
+      <stop
+         id="stop4614-0-2"
+         offset="1"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+    </linearGradient>
+    <clipPath
+       id="clipPath4396-4-0"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         id="path4398-9-9"
+         d="m 79.40625,432.78125 c 4.95211,3.15625 10.09773,2.36004 13.8125,6.28125 0.20853,0.22012 0.41543,0.41335 0.625,0.625 -0.91227,0.0132 -3.36173,-0.64471 -5.8125,-0.21875 -2.03999,0.35455 -4.02605,-0.55433 -6.4375,1.03125 2.8086,-1.17696 5.05872,-0.41657 7.3125,-0.71875 1.75702,-0.23558 4.85952,0.60574 6.84375,1.75 3.19912,2.92004 6.06811,5.00342 6.65625,7.03125 0.75156,2.59125 0.93062,10.17703 0.96875,13.3125 -0.33977,-0.27402 -0.66062,-0.5645 -0.96875,-0.875 -0.68906,-0.71321 -1.34766,-1.47779 -2.15625,-2.0625 -0.77698,-0.56343 -1.58267,-1.08104 -2.21875,-1.8125 -0.66486,-0.8969 -1.44709,-1.69706 -2.1875,-2.53125 -0.70592,-0.72238 -1.45646,-1.39671 -2.125,-2.15625 -0.61554,-0.75741 -1.33614,-1.42319 -2.1875,-1.90625 -0.77581,-0.47272 -1.5828,-1.00327 -2.53125,-0.96875 -0.47451,-0.0791 -0.95887,-0.19127 -1.3125,-0.53125 -0.59769,-0.44175 -1.32432,-0.71337 -2.0625,-0.78125 l 0.125,0.0625 c 0.9109,0.24481 1.68179,0.8215 2.40625,1.40625 0.82464,0.41098 1.87022,0.34115 2.53125,1.0625 0.70456,0.74408 1.76065,1.14357 2.28125,2.0625 0.20942,0.35023 0.44974,0.66458 0.71875,0.96875 -0.70331,0.27896 -1.37908,1.26201 -1.875,1.59375 -1.29807,0.86836 -4.60919,-2.74752 -7.5,-2.40625 2.08544,-0.0469 5.75517,2.50843 6.46875,2.71875 0.55836,0.16459 -1.66639,2.10357 -3.375,3.03125 1.51744,-0.43138 3.97727,-2.51723 4.4375,-2.625 0.57771,-0.13527 1.16213,-1.94726 2.4375,-1.6875 0.26687,0.28232 0.53984,0.57255 0.78125,0.875 0.69303,0.78032 1.38577,1.54029 1.96875,2.40625 0.85162,1.06177 1.95474,1.87787 2.875,2.875 0.7471,0.7803 1.39506,1.64575 2.09375,2.46875 0.93323,1.12487 1.87928,2.25013 2.8125,3.375 0.42144,0.87267 1.03174,1.61036 1.65625,2.34375 0.66563,0.75999 1.30957,1.55781 1.8125,2.4375 0.59909,0.89138 1.1135,1.84141 1.5,2.84375 0.30827,0.94828 0.48395,1.92145 0.625,2.90625 0.19051,1.03702 0.34872,2.0991 0.25,3.15625 -0.14578,1.5715 -0.30651,3.14619 -0.4375,4.71875 -0.0217,0.7843 -0.12135,1.62135 0.25,2.34375 0.88575,0.56065 1.94401,0.69175 2.96875,0.75 0.86591,-0.0236 1.72648,-0.22461 2.46875,-0.6875 0.31904,-0.16231 0.63392,-0.49478 0.46875,-0.875 -0.18667,-1.01745 -0.40295,-2.03142 -0.5,-3.0625 -0.1344,-1.15271 -0.25974,-2.31102 -0.34375,-3.46875 -0.099,-1.09509 -0.14847,-2.18257 -0.1875,-3.28125 0.0322,-1.00198 0.0767,-2.03591 0.375,-3 0.32471,-0.94223 0.65194,-2.18347 1.25,-2.96875 0.85084,-1.04281 2.1162,-1.51624 3.09375,-2.4375 0.82415,-0.71738 1.68863,-1.38982 2.46875,-2.15625 0.75889,-0.71303 1.63356,-2.17099 2.3125,-2.96875 0.7624,-0.80646 1.48992,-0.89854 2.21875,-1.625 0.18969,-0.12973 0.38766,-0.25786 0.59375,-0.375 0.52915,-0.26792 1.04107,-0.57592 1.71875,-0.625 0.70029,0.0397 1.39399,-0.19008 2.09375,-0.0937 0.70007,0.0559 1.02933,0.72896 1.78125,0.65625 0.66535,-0.12321 1.35216,-0.12021 2.03125,-0.0625 -0.21541,-0.0835 -0.44604,-0.15445 -0.6875,-0.1875 -0.48981,-0.0904 -0.98368,0.0758 -1.46875,0.0313 -0.63207,-0.054 -0.8309,-0.55639 -1.375,-0.71875 -0.66242,-0.11588 -1.35944,0.10128 -2.03125,0.0625 -0.5382,-0.0737 -1.05528,0.0455 -1.59375,0.0313 0.76409,-1.1233 1.44323,-2.44724 2.25,-3.375 1.3398,-1.24472 2.98696,-2.48222 4.03125,-2.96875 1.39189,-0.64849 2.38459,0.15819 4.21875,-0.75 -2.03978,0.86066 -3.28052,-0.27726 -5.6875,1.125 -1.32634,0.76242 -2.21246,1.18656 -2.96875,1.71875 -1.58811,-1.34506 -0.70451,-6.06166 -2.09375,-8.78125 0.0827,-0.0958 0.125,-0.20732 0.125,-0.34375 1.54418,-0.65828 3.85538,-0.62579 5.34375,-0.34375 1.80941,0.34285 1.14282,0.69721 2.0625,0.75 0.8083,0.0464 2.21338,0.8335 3.34375,1.28125 1.22261,0.48428 1.53834,-0.0211 3.84375,1.21875 -1.65524,-1.12051 -3.34913,-1.13223 -3.59375,-1.40625 0.7457,-2.42944 3.79609,-2.88736 5.0625,-5.1875 -1.76435,2.59269 -4.05299,2.33985 -5.28125,5.09375 -1.22654,-0.34407 -2.44261,-0.89298 -3.0625,-1.28125 1.49793,-1.8748 -1.68651,-7.18964 -1.78125,-9 -0.11059,2.41309 2.83075,5.84705 1.25,8.8125 -3.16781,-1.25867 -5.75024,-0.78886 -7.4375,-0.40625 -0.0628,-0.0425 -0.14103,-0.0804 -0.21875,-0.0937 -1.38487,-2.04113 -0.95284,-3.54566 -2.5,-5.78125 0.85981,2.03517 1.03075,4.21454 1.875,5.96875 0.0201,0.0419 0.0431,0.0827 0.0625,0.125 -0.0386,0.0749 -0.0625,0.16002 -0.0625,0.25 0,0.22641 0.14749,0.41694 0.34375,0.5 0.92516,2.72077 0.58242,6.13236 0.8125,8.65625 -2.33949,-3.83923 -5.15618,-3.90227 -6.78125,-10.25 1.34906,7.76942 7.42824,8.46368 5.875,13.34375 -1.18921,1.23925 -3.11722,3.33597 -4.03125,4.25 -0.76285,0.67868 -1.59581,1.26835 -2.4375,1.84375 -0.87643,0.65389 -0.79689,1.13319 -1.71875,1.71875 -0.68733,0.46263 -2.24808,0.96188 -2.84375,1.4375 -0.77914,0.62211 -1.21036,1.46972 -1.875,2.3125 -0.35417,0.47917 -1.23958,0.61458 -1.5625,1.25 -0.32894,-1.33239 -1.28622,-3.80883 -3.09375,-4.84375 -0.89341,-0.51154 -1.89485,-1.4387 -2.625,-2.21875 -0.16244,-0.16986 -0.32136,-0.31728 -0.5,-0.46875 -1.2415,-3.00067 -1.37508,-6.70906 -1.65625,-10.0625 0.097,-0.0922 0.17429,-0.19076 0.28125,-0.28125 0.53668,-0.40499 1.03141,-0.85932 1.9375,-1.125 1.00361,-0.19673 1.64252,0.33535 2.6875,0.1875 1.01534,-0.18272 1.85205,-1.06453 2.84375,-1.375 0.83379,-0.32538 2.07498,-0.13823 3.0625,-0.3125 -1.14808,0.056 -2.26509,-0.14799 -3.375,0.1875 -0.91936,0.16193 -1.46612,1.11655 -2.34375,1.15625 -1.0076,0.1187 -1.63048,-0.40688 -2.59375,-0.21875 -0.80343,0.11401 -1.45915,0.39725 -2.21875,0.5625 -0.096,-0.0611 -0.4129,0.0496 -0.40625,-0.0625 -0.0616,-0.56577 -0.12813,-1.12745 -0.21875,-1.65625 -0.06,-3.89672 4.27346,-2.57015 5.15625,-3.25 0.58133,-0.44768 3.85453,-3.04945 6.75,-3.65625 -3.43517,0.61964 -6.89928,3.23605 -6.5625,2.40625 0.43039,-1.06043 0.76035,-7.91801 2.84375,-10.375 -3.23258,3.13778 -1.93744,10.59758 -4.28125,11.3125 -1.14933,0.35058 -3.94816,-0.0106 -4.4375,1.375 -0.10489,-0.29885 -0.21204,-0.57258 -0.34375,-0.84375 -0.84843,-1.74675 -3.20807,-3.66898 -5.71875,-5.84375 -0.24719,-1.22331 1.70858,-1.61353 1.90625,-2.125 0.15296,-0.39577 2.42162,-2.38883 3,-3.6875 -1.08179,1.42622 -3.17911,3.22298 -3.28125,2.71875 -0.13053,-0.6444 -2.23183,-4.07697 -1.96875,-5.90625 -0.63373,2.51321 2.51245,5.71105 1.53125,6.78125 -0.40432,0.441 -1.56827,1.00067 -1.8125,1.65625 -1.21315,-1.06576 -2.41928,-2.18039 -3.53125,-3.40625 -3.25105,-3.58405 -5.7455,-2.03174 -14.3125,-5.65625 z"
+         style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <filter
+       id="filter4412-3-4"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4414-08-9"
+         stdDeviation="0.5940625"
+         inkscape:collect="always" />
+    </filter>
+    <radialGradient
+       r="46"
+       fy="536.62244"
+       fx="130"
+       cy="536.62244"
+       cx="130"
+       gradientTransform="matrix(3.5206254,0,0,0.26301885,-608.85683,18.482138)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient81697"
+       xlink:href="#linearGradient4610-7-8"
+       inkscape:collect="always" />
+    <radialGradient
+       r="43"
+       fy="126.45943"
+       fx="117.19691"
+       cy="126.45943"
+       cx="117.19691"
+       gradientTransform="matrix(-2.4172118,0.85547689,0.60766824,1.7170104,276.64011,-137.51309)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5680"
+       xlink:href="#linearGradient5583"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.7751634"
+     inkscape:cx="184.28571"
+     inkscape:cy="55.913857"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1280"
+     inkscape:window-height="736"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata1959">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.0266635,-0.6141706)">
+    <g
+       style="display:inline;enable-background:new"
+       id="g27007"
+       transform="matrix(0.15365393,0,0,0.15365393,7.2037232,2.7005331)">
+      <g
+         id="g3938">
+        <g
+           style="display:inline;enable-background:new"
+           id="g5637"
+           transform="matrix(-0.93231771,0.36164028,0.36164028,0.93231771,121.94775,-121.15174)">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path5641"
+             d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1535088;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5562-3);enable-background:accumulate" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.28508774;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5574-7);enable-background:accumulate"
+             d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z"
+             id="path5639"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc" />
+        </g>
+        <g
+           id="g5605"
+           transform="translate(53.917986,-49.770448)">
+          <path
+             clip-path="none"
+             mask="none"
+             id="path614-2"
+             d="m 96.057801,197.62401 17.515329,-31.28833 -6.94768,1.96128 -10.567539,29.32695 z"
+             style="opacity:0.3;fill-rule:nonzero;stroke:none"
+             inkscape:connector-curvature="0" />
+          <g
+             transform="translate(0,1.0368843)"
+             id="g5601">
+            <path
+               sodipodi:nodetypes="ccccccc"
+               inkscape:connector-curvature="0"
+               id="path5568"
+               d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.43421056;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5574);enable-background:accumulate" />
+            <path
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.53070176;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5562);enable-background:accumulate"
+               d="m 155.53125,130.16376 -114.5,32.3125 L 78,294.22626 178.90625,265.75751 c 6.3543,-1.46637 14.8069,-5.30604 14.8069,-5.30604 l -5.40065,-13.50646 z"
+               id="path5558"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccc" />
+          </g>
+          <path
+             sodipodi:nodetypes="ccccc"
+             clip-path="none"
+             mask="none"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5617);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;enable-background:accumulate"
+             d="m 193.12735,259.04147 c -36.8827,15.17862 -76.41062,23.66583 -114.778811,34.49402 L 41.039341,161.09919 155.52978,128.78824 c 13.24907,42.91675 22.71812,87.85302 37.59757,130.25323 z"
+             id="path652-6"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             clip-path="none"
+             mask="none"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62650001;marker:none;enable-background:accumulate"
+             d="M 177.89611,230.92829 74.980588,259.97585 47.965623,164.76109 150.89304,135.71089 Z"
+             id="path656-5"
+             inkscape:connector-curvature="0" />
+          <path
+             clip-path="url(#clipPath4748)"
+             d="M 155.5293,128.78906 41.039062,161.09961 78.347656,293.53516 C 116.71585,282.70697 156.24425,274.21964 193.12695,259.04102 178.2475,216.64081 168.77837,171.70581 155.5293,128.78906 Z"
+             inkscape:href="#path652-6"
+             id="path4742"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.22807019;fill:none;stroke:#000000;stroke-width:0.76326501;stroke-opacity:1;marker:none;filter:url(#filter4764);enable-background:accumulate"
+             xlink:href="#path652-6"
+             inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.347656 293.53516 C 116.71585 282.70697 156.24425 274.21964 193.12695 259.04102 C 178.2475 216.64081 168.77837 171.70581 155.5293 128.78906 z "
+             inkscape:radius="0"
+             sodipodi:type="inkscape:offset" />
+          <path
+             sodipodi:nodetypes="ccccccccccccccccccccccccscccccccccccsccccccccc"
+             inkscape:connector-curvature="0"
+             id="path5519"
+             d="m 63.381265,221.33742 0.631168,-0.67134 0.99513,-4.18247 2.703526,2.63649 3.087659,-1.12747 -0.09797,-2.89517 3.153832,2.5076 4.374969,-0.0344 2.093389,4.75996 2.669151,-1.73848 -3.898035,-11.06418 18.526808,-5.05988 2.12604,5.72502 4.503018,-1.28904 -0.83788,-2.92697 3.21658,-0.67716 1.61129,5.62877 7.72128,1.44371 -4.15412,-8.55486 4.2435,-5.59957 -0.8396,-6.33687 2.35119,5.66057 7.3999,2.02291 2.57979,12.41595 c 0,0 3.82842,0.60928 2.99141,-0.61273 -0.83701,-1.222 -3.05931,-6.43226 -3.05931,-6.43226 l 5.98283,-1.22544 -4.67318,-17.1759 3.24835,-1.41708 -3.3214,-15.85766 5.41221,15.50274 3.28188,1.25294 1.67746,9.26383 6.59382,-1.64394 1.74105,7.78402 3.37727,-0.96677 c 0,0 -4.79692,-7.39645 -3.44602,-7.78316 1.35091,-0.38672 6.36867,-1.5795 6.36867,-1.5795 l 2.48096,7.81582 7.81583,-2.48096 -1.38786,-9.10314 -4.79864,-10.80637 3.37553,-4.37669 16.69298,58.31402 -103.190188,29.61014 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5d1616;fill-opacity:1;stroke:none;stroke-width:2.7650249;marker:none;enable-background:accumulate" />
+          <path
+             d="m 120.75,120.5 -12.5,40.75 c 0,0 19.5,13.75 28.75,15.25 9.25,1.5 14.25,1.5 14.25,1.5 L 134,116.75 Z m -55.5,15 36.75,23 14.75,-37.25 z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:url(#radialGradient5621);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+             transform="matrix(1.3825125,0,0,1.3825125,-30.205823,-31.335013)"
+             id="path5580"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccc"
+             transform="matrix(1.3825125,0,0,1.3825125,-32.279592,-30.643757)"
+             inkscape:connector-curvature="0"
+             id="path5591"
+             d="m 63,173.5 16.5,58 60,-16 C 110.34106,211.86701 84.170728,199.76627 63,173.5 Z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate" />
+        </g>
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           d="M 91,103.75 172.75,80.5 172.25,82 93,104 l 23.25,89.25 z"
+           id="path5624"
+           inkscape:connector-curvature="0"
+           transform="matrix(1.3825125,0,0,1.3825125,-30.205823,-31.335013)" />
+        <g
+           transform="matrix(-0.93231771,0.36164027,0.36164027,0.93231771,121.57277,-122.11845)"
+           id="g5633">
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:0.3;fill-rule:nonzero;stroke:none"
+             d="m 96.057801,197.62401 17.515329,-31.28833 -6.94768,1.96128 -10.567539,29.32695 z"
+             id="path5635"
+             mask="none"
+             clip-path="none" />
+          <path
+             sodipodi:type="inkscape:offset"
+             inkscape:radius="0"
+             inkscape:original="M 155.5293 128.78906 L 41.039062 161.09961 L 78.001953 292.84375 L 193.69141 261.14258 L 155.5293 128.78906 z "
+             xlink:href="#path5643"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.49561409;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;filter:url(#filter5739);enable-background:accumulate"
+             id="path5735"
+             inkscape:href="#path5643"
+             d="M 155.5293,128.78906 41.039062,161.09961 78.001953,292.84375 193.69141,261.14258 Z"
+             transform="translate(0.81725754,0.42442927)" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path5643"
+             d="M 193.69137,261.1424 78.002911,292.84423 41.039341,161.09919 155.52978,128.78824 Z"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5737);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10601008;marker:none;enable-background:accumulate"
+             mask="none"
+             clip-path="none"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter5597);enable-background:accumulate"
+             d="m 63,173.5 16.5,58 60,-16 C 110.34106,211.86701 84.170728,199.76627 63,173.5 Z"
+             id="path5653"
+             inkscape:connector-curvature="0"
+             transform="matrix(1.3825125,0,0,1.3825125,-32.279592,-30.643757)"
+             sodipodi:nodetypes="cccc" />
+          <g
+             style="display:inline;enable-background:new"
+             id="g81624"
+             transform="matrix(-1.033868,0.29618128,0.29618128,1.033868,-77.890924,123.32847)">
+            <rect
+               inkscape:r_cy="true"
+               inkscape:r_cx="true"
+               style="display:inline;fill:url(#linearGradient81638-4);fill-opacity:1;stroke:none"
+               id="rect6022"
+               width="100.23215"
+               height="88.480797"
+               x="-201.63737"
+               y="69.588402"
+               rx="0"
+               ry="0" />
+            <g
+               style="display:inline"
+               id="g6024"
+               clip-path="url(#clipPath4719-3-3)"
+               transform="matrix(1.3825125,0,0,1.3825125,-317.76856,-520.74458)">
+              <circle
+                 style="display:inline;fill:#b6cee7;fill-opacity:1;stroke:none;filter:url(#filter4709-1-0)"
+                 id="path6026"
+                 transform="matrix(1.71312,0,0,1.37852,-77.8045,-183.178)"
+                 cx="110.79479"
+                 cy="483.02795"
+                 r="14.009553" />
+              <g
+                 id="g6028">
+                <circle
+                   style="fill:#b6cee7;fill-opacity:1;stroke:none"
+                   id="path6030"
+                   transform="matrix(1.14208,0,0,1.14208,-14.5363,-68.6555)"
+                   cx="110.79479"
+                   cy="483.02795"
+                   r="14.009553" />
+                <circle
+                   style="display:inline;fill:#e0eaf5;fill-opacity:1;stroke:none;filter:url(#filter4608-6-0)"
+                   id="path6032"
+                   transform="matrix(0.994857,0,0,0.994857,1.775,2.45615)"
+                   cx="110.79479"
+                   cy="483.02795"
+                   r="14.009553" />
+              </g>
+            </g>
+            <path
+               transform="matrix(1.3825125,0,0,1.3825125,-203.01988,68.205885)"
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter4616-8-2)"
+               d="m 28.9999,47.93738 c -5.0025,0 -9.0625,4.06 -9.0625,9.0625 0,0.2919 0,0.5902 0.031,0.875 h 18.0625 c 0.027,-0.2848 0.031,-0.5831 0.031,-0.875 0,-5.0025 -4.06,-9.0625 -9.0625,-9.0625 h -10e-5 z"
+               id="path6034" />
+            <path
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:url(#linearGradient81640-2);fill-opacity:1;stroke:none"
+               d="m -201.63751,148.56426 c 24.68028,-4.71645 44.83962,-0.23033 66.77949,-0.17282 l 34.14392,-2.4194 v 12.09699 h -100.92341 z"
+               id="path6036"
+               sodipodi:nodetypes="cccccc" />
+            <path
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               d="m -195.54573,76.198439 c 6.84634,4.363485 13.96019,3.262729 19.09595,8.683837 0.28825,0.304429 0.5743,0.571531 0.86407,0.86407 -1.26127,0.01825 -4.64759,-0.891305 -8.03585,-0.302355 -2.82033,0.490101 -5.56614,-0.766327 -8.89993,1.425647 3.88293,-1.627079 6.99372,-0.575817 10.10963,-0.993612 2.42907,-0.32572 6.71832,0.837388 9.4615,2.419397 4.42293,4.036936 8.38936,6.917263 9.20241,9.720721 1.0391,3.582506 1.28657,14.069966 1.33924,18.404696 -0.46964,-0.37881 -0.91328,-0.78043 -1.33924,-1.2097 -0.95269,-0.98601 -1.86321,-2.04294 -2.98111,-2.85143 -1.07407,-0.77891 -2.18796,-1.4945 -3.06738,-2.5058 -0.91923,-1.23998 -2.00063,-2.34613 -3.02424,-3.49942 -0.97592,-0.99873 -2.01363,-1.93095 -2.93784,-2.98111 -0.85094,-1.04711 -1.84718,-1.96759 -3.02425,-2.63535 -1.07255,-0.65351 -2.18824,-1.38707 -3.49955,-1.339373 -0.656,-0.109357 -1.32556,-0.264337 -1.81455,-0.734391 -0.82619,-0.610794 -1.83086,-0.986284 -2.85143,-1.080157 l 0.17281,0.08641 c 1.25933,0.338577 2.32511,1.135734 3.32674,1.944227 1.14002,0.568214 2.58558,0.471574 3.49942,1.468914 0.97412,1.02873 2.43419,1.58104 3.15392,2.85143 0.2895,0.48416 0.62172,0.91882 0.99361,1.33924 -0.97232,0.38573 -1.90648,1.74474 -2.59221,2.20345 -1.7945,1.20044 -6.37213,-3.79845 -10.36884,-3.32674 2.88323,-0.0648 7.95664,3.46804 8.9432,3.75878 0.77199,0.22756 -2.30382,2.90825 -4.66598,4.19067 2.09782,-0.59628 5.49866,-3.48006 6.1349,-3.6291 0.79867,-0.18691 1.60661,-2.69202 3.36987,-2.33299 0.36899,0.39043 0.74628,0.79163 1.08002,1.2097 0.95822,1.07892 1.91588,2.12949 2.72189,3.32674 1.17735,1.46795 2.7024,2.59622 3.97472,3.97473 1.03288,1.07877 1.92875,2.2752 2.89457,3.413 1.2903,1.55519 2.59815,3.11093 3.88832,4.66598 0.58272,1.20652 1.42647,2.2264 2.28985,3.24034 0.9202,1.05071 1.81054,2.15367 2.5058,3.36987 0.82827,1.23237 1.53943,2.54576 2.07377,3.93145 0.42623,1.31104 0.669,2.6565 0.86407,4.018 0.26337,1.43366 0.48209,2.90203 0.34563,4.36348 -0.20157,2.17262 -0.42374,4.34966 -0.60485,6.5238 -0.0304,1.08431 -0.16783,2.24147 0.34563,3.2402 1.22449,0.77517 2.6876,0.95642 4.10427,1.03688 1.19725,-0.0326 2.3869,-0.31051 3.41314,-0.95048 0.44102,-0.22438 0.87638,-0.68392 0.64799,-1.20969 -0.25798,-1.40657 -0.55702,-2.80844 -0.69126,-4.23395 -0.18581,-1.59362 -0.35904,-3.19498 -0.47517,-4.79552 -0.13687,-1.51399 -0.2053,-3.01747 -0.25922,-4.53644 0.0442,-1.38514 0.10645,-2.81465 0.51844,-4.14753 0.4489,-1.30261 0.90126,-3.01858 1.72814,-4.10427 1.17624,-1.44168 2.92567,-2.09616 4.27708,-3.36987 1.13947,-0.99182 2.33465,-1.92142 3.41315,-2.98112 1.04919,-0.98573 2.25847,-3.00143 3.19706,-4.10426 1.05402,-1.115 2.0598,-1.24219 3.06738,-2.24658 0.26226,-0.17931 0.536,-0.35655 0.82093,-0.51844 0.73149,-0.37038 1.43933,-0.79619 2.37612,-0.86408 0.96818,0.0549 1.92723,-0.26281 2.89471,-0.12954 0.9679,0.0773 1.42302,1.00772 2.46253,0.90721 0.91992,-0.17033 1.86943,-0.16618 2.8083,-0.0864 -0.2978,-0.11544 -0.6166,-0.21346 -0.95048,-0.25922 -0.67716,-0.12498 -1.35998,0.10479 -2.03063,0.0433 -0.87375,-0.0747 -1.14873,-0.76923 -1.90096,-0.99361 -0.91578,-0.16024 -1.87939,0.14004 -2.80816,0.0864 -0.74407,-0.1019 -1.45896,0.0629 -2.20345,0.0433 1.05638,-1.55298 1.99538,-3.38329 3.11066,-4.66598 1.85229,-1.72082 4.12956,-3.43168 5.57332,-4.10441 1.92432,-0.89656 3.29674,0.21872 5.8324,-1.03688 -2.81991,1.18993 -4.53533,-0.38323 -7.86304,1.55533 -1.83362,1.05416 -3.05867,1.64048 -4.10426,2.37626 -2.19557,-1.85962 -0.97398,-8.380375 -2.89471,-12.140256 0.11475,-0.132444 0.17282,-0.286594 0.17282,-0.475169 2.13487,-0.910108 5.33014,-0.865176 7.38787,-0.475308 2.50152,0.474064 1.57993,0.964026 2.85143,1.036884 1.11749,0.06415 3.06005,1.152325 4.6227,1.771414 1.6904,0.66955 2.12686,-0.02917 5.3141,1.684868 -2.28833,-1.549106 -4.63017,-1.565281 -4.96847,-1.944089 1.03094,-3.358814 5.24816,-3.991867 6.99897,-7.171784 -2.43917,3.58444 -5.60318,3.234803 -7.30132,7.042104 -1.69566,-0.475584 -3.37692,-1.234445 -4.23394,-1.771275 2.07086,-2.591934 -2.33161,-9.93985 -2.46267,-12.442612 -0.15277,3.336141 3.91361,8.08355 1.72814,12.183391 -4.37953,-1.740169 -7.94973,-1.090664 -10.28244,-0.561715 -0.0871,-0.05876 -0.19493,-0.111154 -0.30235,-0.129541 -1.91464,-2.821847 -1.31726,-4.901837 -3.45628,-7.992581 1.18868,2.813689 1.42495,5.826598 2.59221,8.251802 0.0276,0.05793 0.0594,0.114334 0.0871,0.172814 -0.0525,0.10355 -0.0871,0.22134 -0.0871,0.345628 0,0.313139 0.20392,0.576508 0.47517,0.691256 1.2791,3.76154 0.80531,8.478119 1.12329,11.967439 -3.23425,-5.30774 -7.12837,-5.39497 -9.37509,-14.170744 1.86514,10.741294 10.26957,11.701164 8.12226,18.447824 -1.64409,1.71335 -4.30957,4.61207 -5.57333,5.87568 -1.05458,0.93831 -2.20621,1.75358 -3.36987,2.54908 -1.21163,0.90402 -1.10159,1.56666 -2.37612,2.37612 -0.9502,0.63969 -3.10803,1.32984 -3.93159,1.98736 -1.07712,0.86007 -1.67326,2.03202 -2.59221,3.19706 -0.48955,0.6625 -1.71363,0.8497 -2.16018,1.72814 -0.45471,-1.84192 -1.77819,-5.26571 -4.27708,-6.69647 -1.23513,-0.70729 -2.61972,-1.98902 -3.62909,-3.06752 -0.22452,-0.23475 -0.44434,-0.43853 -0.69126,-0.64798 -1.71639,-4.14851 -1.90109,-9.27542 -2.28985,-13.91153 0.1341,-0.12747 0.24097,-0.26379 0.3889,-0.3889 0.74199,-0.55992 1.42592,-1.188 2.67861,-1.55533 1.38749,-0.27194 2.27078,0.46369 3.71551,0.25922 1.40366,-0.25259 2.56041,-1.47168 3.93145,-1.90095 1.15274,-0.44974 2.86871,-0.19107 4.23394,-0.43204 -1.58712,0.0774 -3.13139,-0.20461 -4.66598,0.25922 -1.27094,0.22397 -2.0269,1.54371 -3.24019,1.5986 -1.39302,0.1641 -2.25419,-0.56254 -3.58596,-0.30249 -1.11071,0.15774 -2.01723,0.54927 -3.06738,0.77766 -0.13273,-0.0845 -0.57084,0.0686 -0.56172,-0.0864 -0.0857,-0.78208 -0.1771,-1.55864 -0.30235,-2.28971 -0.0829,-5.387238 5.90816,-3.553335 7.12851,-4.493167 0.80379,-0.618951 5.32903,-4.215972 9.33196,-5.05488 -4.74907,0.856743 -9.53823,4.473948 -9.07274,3.32674 0.59503,-1.466017 1.05126,-10.946734 3.93159,-14.343567 -4.46911,4.338048 -2.67848,14.651314 -5.91895,15.639672 -1.58893,0.484709 -5.4583,-0.01466 -6.1349,1.900955 -0.14489,-0.413233 -0.2931,-0.791627 -0.47517,-1.166564 -1.17293,-2.414835 -4.43524,-5.0723 -7.90631,-8.078988 -0.34162,-1.691228 2.36216,-2.230684 2.63548,-2.937839 0.21152,-0.547199 3.34789,-3.302546 4.14754,-5.098015 -1.49561,1.971739 -4.39515,4.455838 -4.53644,3.758637 -0.18042,-0.890891 -3.08549,-5.636366 -2.72175,-8.165396 -0.8761,3.474531 3.47342,7.895529 2.1169,9.375094 -0.55895,0.609688 -2.16806,1.38348 -2.50581,2.289855 -1.67712,-1.473481 -3.34457,-3.01443 -4.88192,-4.709252 -4.49469,-4.954925 -7.94323,-2.808851 -19.78721,-7.819767 v -2.76e-4 0 z"
+               id="path6038" />
+            <path
+               inkscape:connector-curvature="0"
+               style="display:inline;opacity:0.79729698;fill:url(#linearGradient81642-3);fill-opacity:1;fill-rule:evenodd;stroke:none"
+               d="m -137.01768,149.60114 c -1.08931,0.0664 -2.17479,0.22535 -2.81104,0.86407 0.0252,0.82315 0.63823,1.7851 1.13122,2.67862 0.99606,1.6456 2.00399,3.28029 3.01673,4.9252 h 5.45074 c -0.46863,-1.05859 -0.90183,-2.14303 -1.33702,-3.19706 -0.51043,-1.17486 -0.89865,-2.34004 -1.30267,-3.49942 -0.0461,-0.43328 -0.5813,-0.80877 -1.02843,-0.99375 -1.09118,-0.52743 -2.15549,-0.7507 -3.11953,-0.77766 z"
+               id="path6040" />
+            <path
+               inkscape:connector-curvature="0"
+               style="display:inline;opacity:0.49153197;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter4412-3-4)"
+               d="m 80.40625,432.78125 c 4.95211,3.15625 10.09773,2.36004 13.8125,6.28125 0.16682,0.1761 0.33306,0.33512 0.5,0.5 0.47081,0.0642 0.86634,0.12875 1.125,0.125 -0.20957,-0.21165 -0.41647,-0.40488 -0.625,-0.625 -3.01825,-3.18598 -6.9951,-3.26716 -11.03125,-4.875 -0.03474,-0.0138 -0.059,-0.0484 -0.09375,-0.0625 -1.10179,-0.36006 -2.29362,-0.75403 -3.6875,-1.34375 z m 18.125,0.625 c -0.63373,2.51321 2.51245,5.71105 1.53125,6.78125 -0.28982,0.31612 -0.95433,0.69532 -1.40625,1.125 0.12002,0.10757 0.25465,0.20603 0.375,0.3125 0.45504,-0.64981 1.60175,-0.96015 1.75,-1.34375 0.0395,-0.1023 0.21224,-0.3176 0.46875,-0.59375 0.007,-0.15893 -0.013,-0.33834 -0.0625,-0.53125 -0.36749,0.24581 -0.65336,0.32478 -0.6875,0.15625 -0.13053,-0.6444 -2.23183,-4.07697 -1.96875,-5.90625 z m 15.125,3 c -3.23258,3.13778 -1.93744,10.59758 -4.28125,11.3125 -0.87305,0.26631 -2.67739,0.13373 -3.71875,0.65625 0.10564,0.23081 0.1924,0.46561 0.28125,0.71875 0.48934,-1.38565 3.28817,-1.02442 4.4375,-1.375 0.40212,-0.12266 0.70836,-0.4424 0.9375,-0.90625 -0.37324,0.16279 -0.58924,0.18863 -0.5,-0.0313 0.43039,-1.06043 0.76035,-7.91801 2.84375,-10.375 z m -9.875,0.1875 c -0.65633,0.8653 -1.67467,1.86478 -2.40625,2.40625 0.035,0.0884 0.11425,0.25945 0.125,0.3125 0.006,0.0315 0.01,0.0483 0.0313,0.0625 0.76016,-0.80336 1.86771,-1.92287 2.25,-2.78125 z m 31.15625,1.28125 c -0.10681,2.33068 2.61199,5.60659 1.375,8.5 0.1879,0.0583 0.37002,0.14826 0.5625,0.21875 1.03088,-2.07763 -1.84715,-6.99222 -1.9375,-8.71875 z m -44.09375,1.4375 c -0.58853,-0.002 -1.19981,0.0498 -1.8125,0.15625 -0.24454,0.0425 -0.47494,0.0811 -0.71875,0.0937 0.57324,0.0163 1.14758,0.006 1.71875,-0.0937 0.3802,-0.0661 0.75059,-0.10454 1.125,-0.125 -0.10937,-0.003 -0.20125,-0.031 -0.3125,-0.0313 z m -4.90625,0.21875 c -1.05294,0.0153 -2.13802,0.17596 -3.34375,0.96875 0.73581,-0.30835 1.4245,-0.46615 2.09375,-0.5625 0.66231,-0.25997 1.29099,-0.37458 1.90625,-0.40625 -0.21749,-0.006 -0.43522,-0.003 -0.65625,0 z M 91.625,439.75 c -0.16769,-0.002 -0.31622,0.0195 -0.46875,0.0313 1.75151,0.14017 4.01985,0.84237 5.59375,1.75 3.19912,2.92004 6.06811,5.00342 6.65625,7.03125 0.69343,2.39084 0.87982,8.89902 0.9375,12.375 0.0202,0.021 0.0422,0.0415 0.0625,0.0625 0.30813,0.3105 0.62898,0.60098 0.96875,0.875 -0.0381,-3.13547 -0.21719,-10.72125 -0.96875,-13.3125 -0.58814,-2.02783 -3.45713,-4.11121 -6.65625,-7.03125 -1.7362,-1.00123 -4.32697,-1.76239 -6.125,-1.78125 z m -4.5,0.0625 c 0.65921,0.0186 1.30134,0.0547 1.9375,0.0313 -0.6308,-0.0149 -1.27239,-0.0416 -1.9375,-0.0313 z m 38.90625,0.59375 c 0.85981,2.03517 1.03075,4.21454 1.875,5.96875 0.0201,0.0419 0.0431,0.0827 0.0625,0.125 -0.0386,0.0749 -0.0625,0.16002 -0.0625,0.25 0,0.22641 0.14749,0.41694 0.34375,0.5 0.75795,2.22902 0.68188,4.89913 0.75,7.1875 0.35884,0.43277 0.71896,0.90498 1.0625,1.46875 -0.081,-0.88874 -0.10567,-1.89754 -0.125,-2.9375 -0.22118,-1.90879 -0.22993,-4.24515 -1.0625,-5.875 0.0353,-0.0409 0.0733,-0.0777 0.0937,-0.125 -0.004,-0.008 0.004,-0.0227 0,-0.0313 -0.0255,-0.0612 -0.0625,-0.11723 -0.0625,-0.1875 0,-0.09 0.024,-0.17511 0.0625,-0.25 -0.0194,-0.0423 -0.0424,-0.0831 -0.0625,-0.125 -0.0198,-0.0411 -0.0434,-0.0834 -0.0625,-0.125 -0.0287,0.006 -0.0655,0.0249 -0.0937,0.0313 -0.0628,-0.0425 -0.14103,-0.0804 -0.21875,-0.0937 -1.38487,-2.04113 -0.95284,-3.54566 -2.5,-5.78125 z m 19.03125,2.65625 c -1.69758,2.49457 -3.86818,2.37373 -5.125,4.8125 0.0526,0.0186 0.10315,0.0444 0.15625,0.0625 0.89869,-2.16469 3.75785,-2.67569 4.96875,-4.875 z m -27.6875,1.3125 c -2.19466,0.39587 -4.28042,1.54971 -5.5,2.15625 -0.0203,0.0759 -0.0419,0.19937 -0.0625,0.25 -0.0928,0.22874 0.15792,0.18098 0.5625,0 1.35368,-0.92023 3.20812,-2.03073 5,-2.40625 z m 4.90625,1.28125 c 1.34906,7.76942 7.42824,8.46368 5.875,13.34375 -1.18921,1.23925 -3.11722,3.33597 -4.03125,4.25 -0.76285,0.67868 -1.59581,1.26835 -2.4375,1.84375 -0.87643,0.65389 -0.79689,1.13319 -1.71875,1.71875 -0.68733,0.46263 -2.24808,0.96188 -2.84375,1.4375 -0.77914,0.62211 -1.21036,1.46972 -1.875,2.3125 -0.17709,0.23959 -0.47526,0.38932 -0.78125,0.5625 0.0747,0.23312 0.17111,0.49452 0.21875,0.6875 0.32292,-0.63542 1.20833,-0.77083 1.5625,-1.25 0.66464,-0.84278 1.09586,-1.69039 1.875,-2.3125 0.59567,-0.47562 2.15642,-0.97487 2.84375,-1.4375 0.92186,-0.58556 0.84232,-1.06486 1.71875,-1.71875 0.84169,-0.5754 1.67465,-1.16507 2.4375,-1.84375 0.91403,-0.91403 2.84204,-3.01075 4.03125,-4.25 0.39409,-1.23817 0.2929,-2.21057 -0.0937,-3.09375 -0.005,-0.008 0.005,-0.0235 0,-0.0313 -2.33668,-3.81627 -5.15947,-3.88386 -6.78125,-10.21875 z m 9.625,0.21875 c -0.92497,0.006 -1.69874,0.11176 -2.40625,0.25 0.0135,0.0204 0.0173,0.042 0.0313,0.0625 0.0777,0.0133 0.1559,0.0513 0.21875,0.0937 0.73442,-0.16654 1.63943,-0.32515 2.6875,-0.375 -0.17873,-0.007 -0.35939,-0.0323 -0.53125,-0.0313 z m 0.78125,0.34375 c -0.0732,0.003 -0.1456,0.0269 -0.21875,0.0313 0.67709,0.016 1.33761,0.0544 1.875,0.15625 1.80941,0.34285 1.14282,0.69721 2.0625,0.75 0.8083,0.0464 2.21338,0.8335 3.34375,1.28125 1.22261,0.48428 1.53834,-0.0211 3.84375,1.21875 -1.65524,-1.12051 -3.34913,-1.13223 -3.59375,-1.40625 0.0129,-0.0419 0.017,-0.0842 0.0313,-0.125 -0.0649,-0.0291 -0.12217,-0.0641 -0.1875,-0.0937 -0.0207,0.0437 -0.0423,0.0797 -0.0625,0.125 -1.00669,-0.2824 -1.9875,-0.7062 -2.65625,-1.0625 -0.18654,-0.0477 -0.28433,-0.1223 -0.40625,-0.21875 -0.0974,-0.077 -0.24506,-0.15717 -0.5,-0.25 -0.0108,0.0211 -0.02,0.0415 -0.0313,0.0625 -0.24588,-0.0977 -0.48007,-0.17228 -0.71875,-0.25 -0.0468,-0.01 -0.0744,-0.0217 -0.125,-0.0313 -0.74419,-0.14102 -1.69938,-0.22641 -2.65625,-0.1875 z M 86.625,448.25 l 0.125,0.0625 c 0.9109,0.24481 1.68179,0.8215 2.40625,1.40625 0.82464,0.41098 1.87022,0.34115 2.53125,1.0625 0.70456,0.74408 1.76065,1.14357 2.28125,2.0625 0.20942,0.35023 0.44974,0.66458 0.71875,0.96875 -0.70331,0.27896 -1.37908,1.26201 -1.875,1.59375 -0.0184,0.0123 -0.0433,0.0207 -0.0625,0.0313 0.26674,0.0829 0.5096,0.12431 0.71875,0.0937 0.35283,-0.4495 0.78212,-0.98745 1.375,-1.09375 0.27247,-0.26266 0.5507,-0.50877 0.84375,-0.625 -0.26901,-0.30417 -0.50933,-0.61852 -0.71875,-0.96875 -0.5206,-0.91893 -1.57669,-1.31842 -2.28125,-2.0625 -0.66103,-0.72135 -1.70661,-0.65152 -2.53125,-1.0625 -0.06827,-0.0551 -0.14958,-0.10156 -0.21875,-0.15625 -0.45456,-0.0788 -0.91165,-0.20596 -1.25,-0.53125 -0.59769,-0.44175 -1.32432,-0.71337 -2.0625,-0.78125 z m 28.3125,3.0625 c -0.5615,-0.002 -1.13254,0.0198 -1.6875,0.1875 -0.8619,0.15181 -1.40092,0.98682 -2.1875,1.125 0.15712,0.0284 0.29573,0.0585 0.46875,0.0625 0.008,-0.004 0.0232,0.004 0.0313,0 0.66399,-0.34171 1.29896,-0.84303 2,-1.0625 0.29196,-0.11393 0.63652,-0.16173 1,-0.1875 0.45253,-0.0986 0.91776,-0.12668 1.375,-0.125 -0.33672,-0.005 -0.66726,10e-4 -1,0 z m -6.28125,1.09375 c -0.11119,0.004 -0.22334,0.008 -0.34375,0.0313 -0.58666,0.0833 -1.09791,0.25436 -1.625,0.40625 0.003,0.0315 -0.003,0.0623 0,0.0937 -0.007,0.11209 0.31024,10e-4 0.40625,0.0625 0.72887,-0.15857 1.36514,-0.40917 2.125,-0.53125 -0.18386,-0.0329 -0.36151,-0.0695 -0.5625,-0.0625 z m 0.75,0.375 c -0.11556,0.005 -0.24955,0.007 -0.375,0.0313 0.5303,0.0941 1.02742,0.28089 1.6875,0.1875 0.0423,-0.008 0.0833,-0.0213 0.125,-0.0313 -0.48738,-0.0785 -0.91748,-0.20805 -1.4375,-0.1875 z m -23.5625,0.1875 c -0.18337,-0.008 -0.35057,0.01 -0.53125,0.0313 2.08544,-0.0469 5.75517,2.50843 6.46875,2.71875 0.55836,0.16459 -1.66639,2.10357 -3.375,3.03125 1.32776,-0.37746 3.38761,-2.02266 4.1875,-2.5 0.01714,-0.0102 0.01528,-0.0221 0.03125,-0.0313 0.21446,-0.26888 0.31472,-0.45329 0.15625,-0.5 -0.0892,-0.0263 -0.23354,-0.0976 -0.40625,-0.1875 -1.40032,0.064 -4.06601,-2.46133 -6.53125,-2.5625 z m 53.78125,0.0625 c -0.88641,0.37401 -1.6291,0.38336 -2.375,0.375 0.46305,-0.0347 0.90399,-0.0303 1.34375,-0.0313 0.31369,-0.0695 0.65846,-0.15916 1.03125,-0.34375 z m -2.375,0.375 c -0.97055,-0.0109 -1.9515,-0.0429 -3.3125,0.75 -0.98526,0.56636 -1.68584,0.93652 -2.3125,1.3125 0.1001,0.15403 0.21261,0.29518 0.34375,0.40625 0.43285,-0.30459 0.95516,-0.58877 1.53125,-0.90625 0.0447,-0.0331 0.0806,-0.0614 0.125,-0.0937 0.66035,-0.48117 1.29197,-0.8658 1.78125,-1.09375 0.34797,-0.16212 0.68254,-0.22024 1,-0.25 0.018,-0.004 0.0446,0.004 0.0625,0 0.27556,-0.0643 0.52793,-0.10604 0.78125,-0.125 z m -41.40625,1.03125 c -0.15346,0.0275 -0.30526,0.0776 -0.4375,0.15625 0.22223,0.23657 0.45596,0.46782 0.65625,0.71875 0.69303,0.78032 1.38577,1.54029 1.96875,2.40625 0.85162,1.06177 1.95474,1.87787 2.875,2.875 0.7471,0.7803 1.39506,1.64575 2.09375,2.46875 0.93323,1.12487 1.87928,2.25013 2.8125,3.375 0.42144,0.87267 1.03174,1.61036 1.65625,2.34375 0.66563,0.75999 1.30957,1.55781 1.8125,2.4375 0.59909,0.89138 1.1135,1.84141 1.5,2.84375 0.30827,0.94828 0.48395,1.92145 0.625,2.90625 0.19051,1.03702 0.34872,2.0991 0.25,3.15625 -0.14578,1.5715 -0.30651,3.14619 -0.4375,4.71875 -0.0217,0.7843 -0.12135,1.62135 0.25,2.34375 0.88575,0.56065 1.94401,0.69175 2.96875,0.75 0.15421,-0.004 0.31552,-0.0153 0.46875,-0.0313 -0.85535,-0.0774 -1.70207,-0.25325 -2.4375,-0.71875 -0.37135,-0.7224 -0.27171,-1.55945 -0.25,-2.34375 0.13099,-1.57256 0.29172,-3.14725 0.4375,-4.71875 0.0987,-1.05715 -0.0595,-2.11923 -0.25,-3.15625 -0.14105,-0.9848 -0.31673,-1.95797 -0.625,-2.90625 -0.3865,-1.00234 -0.90091,-1.95237 -1.5,-2.84375 -0.50293,-0.87969 -1.14687,-1.67751 -1.8125,-2.4375 -0.62451,-0.73339 -1.23481,-1.47108 -1.65625,-2.34375 -0.93322,-1.12487 -1.87927,-2.25013 -2.8125,-3.375 -0.69869,-0.823 -1.34665,-1.68845 -2.09375,-2.46875 -0.92026,-0.99713 -2.02338,-1.81323 -2.875,-2.875 -0.58298,-0.86596 -1.27572,-1.62593 -1.96875,-2.40625 -0.24141,-0.30245 -0.51438,-0.59268 -0.78125,-0.875 -0.15942,-0.0325 -0.29833,-0.0249 -0.4375,0 z M 132.25,460 c -0.27801,0.006 -0.56326,0.0349 -0.84375,0.0625 0.10242,0.002 0.20882,0.017 0.3125,0.0313 0.3359,0.0194 0.69022,-0.0275 1.03125,-0.0625 -0.1656,-0.029 -0.331,-0.0347 -0.5,-0.0313 z m -2.09375,0.0625 c -0.0128,0.019 -0.0184,0.0436 -0.0313,0.0625 0.19686,0.005 0.40053,-0.0167 0.59375,-0.0313 -0.19023,-0.0261 -0.37567,-0.039 -0.5625,-0.0313 z m 2.78125,0.21875 c -0.14219,0.006 -0.2642,0.0468 -0.40625,0.0625 0.65402,0.0921 0.99171,0.6953 1.71875,0.625 0.16682,-0.0309 0.33094,-0.0464 0.5,-0.0625 -0.11167,-0.0407 -0.21151,-0.0958 -0.3125,-0.15625 -0.10595,0.005 -0.20725,0.01 -0.3125,0 -0.40936,-0.035 -0.64885,-0.24056 -0.90625,-0.4375 -0.0927,-0.004 -0.18865,-0.0352 -0.28125,-0.0313 z m 2.28125,0.40625 c -0.072,10e-4 -0.14679,0.0254 -0.21875,0.0313 0.0432,0.009 0.0772,0.0272 0.125,0.0313 0.15833,0.0145 0.30899,-0.0171 0.46875,-0.0313 -0.12245,-0.0226 -0.25224,-0.0334 -0.375,-0.0313 z m 0.96875,0.1875 c -0.0641,0.002 -0.12357,0.0276 -0.1875,0.0313 0.0927,0.006 0.18873,-0.008 0.28125,0 -0.0298,-0.0116 -0.0634,-0.0202 -0.0937,-0.0313 z"
+               id="path6048"
+               clip-path="url(#clipPath4396-4-0)"
+               transform="matrix(1.3825125,0,0,1.3825125,-305.32593,-522.1271)" />
+            <path
+               inkscape:connector-curvature="0"
+               style="display:inline;fill:url(#radialGradient81697);fill-opacity:1;stroke:none"
+               d="m -201.63751,148.56426 c 24.68028,-4.71645 44.83962,-0.23033 66.77949,-0.17282 l 34.14392,-2.4194 v 12.09699 h -100.92341 z"
+               id="path6060"
+               sodipodi:nodetypes="cccccc" />
+          </g>
+          <path
+             inkscape:connector-curvature="0"
+             id="path5661"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.26315792;fill:url(#radialGradient5680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+             d="m 65.721644,159.81043 40.178316,49.03653 c -1.02107,4.80894 -33.127292,39.78516 -33.127292,39.78516 L 47.828886,164.33579 Z m 77.732016,-22.58834 c -0.26874,31.03893 -19.8432,43.99547 -30.87274,64.95546 L 73.075232,158.07018 Z"
+             sodipodi:nodetypes="ccccccccc" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/import.am b/import.am
deleted file mode 100644
index cbab67c..0000000
--- a/import.am
+++ /dev/null
@@ -1,54 +0,0 @@
-plugin_LTLIBRARIES += plugins/shotwell-data-imports/shotwell-data-imports.la
-dist_noinst_DATA += \
-	plugins/shotwell-data-imports/f-spot-24.png \
-	plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
-	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
-
-nodist_plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES = \
-	plugins/shotwell-data-imports/resource.c
-MOSTLYCLEANFILES += plugins/shotwell-data-imports/resource.c
-
-plugins/shotwell-data-imports/resource.c: plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-data-imports --generate $<
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS = \
-	$(COMMON_VALAFLAGS) \
-	--pkg gtk+-3.0 \
-	--pkg libsoup-2.4 \
-	--pkg gexiv2 \
-	--pkg gee-0.8 \
-	--pkg json-glib-1.0 \
-	--pkg shotwell-plugin-dev-1.0 \
-	--pkg libxml-2.0 \
-	--pkg webkit2gtk-4.0 \
-	--pkg sqlite3 \
-	--vapidir $(abs_top_srcdir)/plugins
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS = \
-	-DPLUGIN_RESOURCE_PATH='"/org/gnome/Shotwell/Imports"' \
-	$(PLUGIN_CFLAGS) \
-	$(COMMON_CFLAGS) \
-	-I $(abs_top_srcdir)/plugins
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_LDFLAGS = \
-	$(SHOTWELL_PLUGIN_LDFLAGS)
-
-plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD = \
-	$(IMPORT_LIBS) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
diff --git a/m4/appstream-xml.m4 b/m4/appstream-xml.m4
index 1472802..11ed91a 100644
--- a/m4/appstream-xml.m4
+++ b/m4/appstream-xml.m4
@@ -10,7 +10,7 @@ dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add
 dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated
 dnl at make check time, if appstream-util is installed, as well as installed
 dnl to the correct location automatically. Add --enable-appstream-util to
-dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
+dnl AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
 dnl doing a distcheck.
 dnl
 dnl Adding files to appstream_XML does not distribute them automatically.
@@ -36,7 +36,7 @@ AC_DEFUN([APPSTREAM_XML],
          AS_IF([test "x$enable_appstream_validate" = "xyes"],
                [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
 
-  AC_SUBST([appstreamxmldir], [${datadir}/appdata])
+  AC_SUBST([appstreamxmldir], [${datadir}/metainfo])
 
   APPSTREAM_XML_RULES='
 .PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..315fe69
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,107 @@
+project('Shotwell', ['vala', 'c'],
+        version : '0.28.2',
+        default_options : ['buildtype=debugoptimized'])
+
+gnome = import('gnome')
+i18n = import('i18n')
+
+conf = configuration_data()
+conf.set('GETTEXT_PACKAGE', '"@0@"'.format(meson.project_name().to_lower()))
+conf.set('_VERSION', '"@0@"'.format(meson.project_version()))
+conf.set('_PREFIX', '"@0@"'.format(get_option('prefix')))
+conf.set('_LANG_SUPPORT_DIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('localedir'))))
+conf.set('_LIBEXECDIR', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libexecdir'))))
+conf.set('_LIB', '"@0@"'.format(join_paths(get_option('prefix'), get_option('libdir'))))
+configure_file(output : 'config.h', configuration: conf)
+
+config_incdir = include_directories('.')
+vapi_incdir = include_directories('vapi')
+shotwell_plugin_dir = join_paths(get_option('libdir'), 'shotwell', 'plugins', 'builtin')
+
+add_global_arguments(['-DHAVE_CONFIG_H=1'],
+                     ['-include'], ['config.h'], language : 'c')
+add_global_arguments(['--target-glib=2.40',
+                      '--vapidir=@0@'.format(join_paths(meson.current_source_dir(),
+                        'vapi')),
+                      '--enable-checking',
+                      '--fatal-warnings',
+                      '--enable-experimental',
+                      '--enable-deprecated'], language : 'vala')
+
+gitver = run_command(find_program('git-hash'))
+if gitver.returncode() == 0
+  add_global_arguments(['-D_GIT_VERSION="@0@"'.format(gitver.stdout().strip())],
+    language : 'c')
+  add_global_arguments(['--define=_GITVERSION'], language : 'vala')
+endif
+
+gtk = dependency('gtk+-3.0', version : '>= 3.18')
+gio = dependency('gio-2.0', version: '>= 2.40')
+gmodule = dependency('gmodule-2.0', version: '>= 2.40')
+gio_unix = dependency('gio-unix-2.0', version: '>= 2.40')
+gee = dependency('gee-0.8', version: '>= 0.8.5')
+webkit = dependency('webkit2gtk-4.0', version: '>= 2.4')
+soup = dependency('libsoup-2.4')
+json_glib = dependency('json-glib-1.0')
+xml = dependency('libxml-2.0')
+gdk = dependency('gdk-3.0', version : '>= 3.18')
+gdk_pixbuf = dependency('gdk-pixbuf-2.0')
+sqlite = dependency('sqlite3', version : '>= 3.5.9')
+gstreamer = dependency('gstreamer-1.0', version : '>= 1.0')
+gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
+gphoto2 = dependency('libgphoto2', version : '>= 2.5.0')
+gudev = dependency('gudev-1.0', version : '>= 145')
+gexiv2 = dependency('gexiv2', version: '>= 0.10.4')
+libraw = dependency('libraw', version : '>= 0.13.2')
+libexif = dependency('libexif', version : '>= 0.6.16')
+unity = dependency('unity', required : false)
+
+unity_available = false
+if unity.found() and get_option('enable-unity-support')
+  unity_available = true
+  add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
+endif
+
+foreach publisher : get_option('publishers').split(',')
+  add_global_arguments(['--define=HAVE_@0@'.format(publisher.to_upper())],
+                       language : 'vala')
+endforeach
+
+foreach trace : get_option('trace').split(',')
+  add_global_arguments(['--define=TRACE_@0@'.format(trace.to_upper().underscorify())],
+                       language : 'vala')
+endforeach
+
+foreach measure : get_option('measure').split(',')
+  add_global_arguments(['--define=MEASURE_@0@'.format(trace.to_upper().underscorify())],
+                       language : 'vala')
+endforeach
+
+if get_option('disable-dupe-detection')
+  add_global_arguments(['--define=NO_DUPE_DETECTION'], language : vala)
+endif
+
+json_glib = dependency('json-glib-1.0')
+gdata = dependency('libgdata')
+gcr = dependency('gcr-3')
+gcr_ui = dependency('gcr-ui-3')
+cairo = dependency('cairo')
+
+valac = meson.get_compiler('vala')
+posix = valac.find_library('posix')
+
+shotwell_resources = gnome.compile_resources('shotwell-resources',
+        'org.gnome.Shotwell.gresource.xml')
+
+subdir('src')
+subdir('plugins')
+subdir('po')
+subdir('help')
+subdir('misc')
+subdir('thumbnailer')
+subdir('settings-migrator')
+subdir('app-icons')
+
+if get_option('install-apport-hook')
+  subdir('apport')
+endif
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..0bcab8b
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,7 @@
+option('enable-unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
+option('publishers', type: 'string', value : 'facebook,flickr,picasa,piwigo,youtube,gallery3,tumblr', description: 'The list of publishing plugins to build')
+option('enable-extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of extra publishing plugins')
+option('trace', type: 'string', value : '', description: 'Enable various trace  options (available: dtors, import, md5, metadata-writer, monitoring, pixbuf-cache, reflow, reflow-items)')
+option('measure', type: 'string', value : '', description : 'Enable various timing measurements(available : enhance, import, pipeline, view-filtering, thumbnail-cache)')
+option('disable-dupe-detection', type: 'boolean', value : 'false', description: 'Disable duplicate checks')
+option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
diff --git a/misc/Makefile.am b/misc/Makefile.am
index aa9a2bd..803697d 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -12,9 +12,6 @@ desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 $(appstream_XML) : $(appstream_in_files)
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-%.desktop.in : %.desktop.in.in
-	$(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
 %.desktop : %.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
@@ -24,8 +21,8 @@ $(appstream_XML) : $(appstream_in_files)
 CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
 
 dist_noinst_DATA = \
-	$(srcdir)/shotwell.desktop.in.in \
-	$(srcdir)/shotwell-viewer.desktop.in.in \
+	$(srcdir)/shotwell.desktop.in \
+	$(srcdir)/shotwell-viewer.desktop.in \
 	$(gsettings_SCHEMAS) \
 	$(appstream_in_files)
 
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 0571904..9469c4b 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -353,8 +353,8 @@ desktopdir = $(datadir)/applications
 desktop_DATA = shotwell.desktop shotwell-viewer.desktop
 CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
 dist_noinst_DATA = \
-	$(srcdir)/shotwell.desktop.in.in \
-	$(srcdir)/shotwell-viewer.desktop.in.in \
+	$(srcdir)/shotwell.desktop.in \
+	$(srcdir)/shotwell-viewer.desktop.in \
 	$(gsettings_SCHEMAS) \
 	$(appstream_in_files)
 
@@ -579,9 +579,6 @@ uninstall-am: uninstall-desktopDATA
 $(appstream_XML) : $(appstream_in_files)
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-%.desktop.in : %.desktop.in.in
-	$(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
 %.desktop : %.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
diff --git a/misc/meson.build b/misc/meson.build
new file mode 100644
index 0000000..664ddb0
--- /dev/null
+++ b/misc/meson.build
@@ -0,0 +1,28 @@
+podir = join_paths('..', 'po')
+
+i18n.merge_file(input : 'shotwell.appdata.xml.in',
+                output : 'shotwell.appdata.xml',
+                po_dir : join_paths('..', 'po'),
+                type : 'xml',
+                install: true,
+                install_dir : join_paths(get_option('datadir'), 'metainfo'))
+
+i18n.merge_file(input : 'shotwell.desktop.in',
+                output: 'shotwell.desktop',
+                po_dir : podir,
+                type : 'desktop',
+                install : true,
+                install_dir : join_paths(get_option('datadir'), 'applications'))
+
+i18n.merge_file(input : 'shotwell-viewer.desktop.in',
+                output: 'shotwell-viewer.desktop',
+                po_dir : podir,
+                type : 'desktop',
+                install : true,
+                install_dir : join_paths(get_option('datadir'), 'applications'))
+
+install_data(['org.yorba.shotwell-extras.gschema.xml',
+              'org.yorba.shotwell.gschema.xml'],
+              install_dir : join_paths(get_option('datadir'), 'glib-2.0', 'schemas'))
+
+gnome.compile_schemas()
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index afd2f02..2bd9003 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -161,7 +161,19 @@
         <summary>background color</summary>
         <description>A grayscale color for use as the background color.</description>
     </key>
-    
+
+    <key name="transparent-background-type" type="s">
+        <default>'checkered'</default>
+        <summary>background for transparent images</summary>
+        <description>The background to use for transparent images.</description>
+    </key>
+
+    <key name="transparent-background-color" type="s">
+        <default>'#444'</default>
+        <summary>color for solid transparency background</summary>
+        <description>Color to use if background for transparent images is set to solid color</description>
+    </key>
+
     <key name="hide-photos-already-imported" type="b">
         <default>false</default>
         <summary>Selection state of “hide photos” option</summary>
diff --git a/misc/shotwell-viewer.desktop.in.in b/misc/shotwell-viewer.desktop.in
index b5e41f3..b5e41f3 100644
--- a/misc/shotwell-viewer.desktop.in.in
+++ b/misc/shotwell-viewer.desktop.in
diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in
index aa1ede2..aa1ede2 100644
--- a/misc/shotwell.desktop.in.in
+++ b/misc/shotwell.desktop.in
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 64335e8..ec04227 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -11,9 +11,12 @@
       <file preprocess="xml-stripblanks">ui/import_queue.ui</file>
       <file preprocess="xml-stripblanks">ui/import.ui</file>
       <file preprocess="xml-stripblanks">ui/media.ui</file>
+      <file preprocess="xml-stripblanks">ui/multitextentrydialog.ui</file>
+      <file preprocess="xml-stripblanks">ui/manifest_widget.ui</file>
       <file preprocess="xml-stripblanks">ui/offline.ui</file>
       <file preprocess="xml-stripblanks">ui/photo_context.ui</file>
       <file preprocess="xml-stripblanks">ui/photo.ui</file>
+      <file preprocess="xml-stripblanks">ui/preferences_dialog.ui</file>
       <file preprocess="xml-stripblanks">ui/printing_widget.ui</file>
       <file preprocess="xml-stripblanks">ui/savedsearch.ui</file>
       <file preprocess="xml-stripblanks">ui/search_bar.ui</file>
@@ -22,15 +25,17 @@
       <file preprocess="xml-stripblanks">ui/set_background_slideshow_dialog.ui</file>
       <file compressed="true">ui/shotwell.ui</file>
       <file preprocess="xml-stripblanks">ui/sidebar_default_context.ui</file>
+      <file preprocess="xml-stripblanks">ui/slideshow_settings.ui</file>
+      <file preprocess="xml-stripblanks">ui/saved_search_dialog.ui</file>
       <file preprocess="xml-stripblanks">ui/tag_sidebar_context.ui</file>
       <file preprocess="xml-stripblanks">ui/tags.ui</file>
+      <file preprocess="xml-stripblanks">ui/textentrydialog.ui</file>
       <file preprocess="xml-stripblanks">ui/trash.ui</file>
       <!-- Icons -->
-      <file>icons/about-aachen.jpg</file>
+      <file>icons/about-braunschweig.jpg</file>
       <file>icons/all-rejected.png</file>
       <file>icons/crop-pivot-reticle.png</file>
       <file>icons/crop.svg</file>
-      <file>icons/drag_nub.png</file>
       <file>icons/faces-tool.png</file>
       <file>icons/filter-flagged-disabled.png</file>
       <file>icons/filter-flagged.png</file>
@@ -69,6 +74,7 @@
       <file>icons/shotwell-16.png</file>
       <file>icons/shotwell-auto-enhance.png</file>
       <file>icons/shotwell.png</file>
+      <file preprocess="xml-stripblanks">icons/shotwell.svg</file>
       <file>icons/shotwell-street.jpg</file>
       <file>icons/slideshow-extension-point.png</file>
       <file>icons/sprocket.png</file>
diff --git a/pipeline.am b/pipeline.am
new file mode 100644
index 0000000..9f9969d
--- /dev/null
+++ b/pipeline.am
@@ -0,0 +1,47 @@
+src/shotwell-graphics-processor.vapi src/shotwell-graphics-processor.h: \
+	src_libgraphics_processor_la_vala.stamp
+
+noinst_LTLIBRARIES += \
+	src/libgraphics-processor.la
+
+src_libgraphics_processor_la_SOURCES = \
+	src/ColorTransformation.vala \
+	src/util/KeyValueMap.vala \
+	src/_transformation.c
+
+src_libgraphics_processor_la_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--disable-assert \
+	--pkg gio-2.0 \
+	--pkg gdk-3.0 \
+	--pkg gee-0.8 \
+	--pkg gdk-pixbuf-2.0 \
+	--vapi=src/shotwell-graphics-processor.vapi \
+	--header=src/shotwell-graphics-processor.h
+
+dist_noinst_DATA += \
+	src/shotwell-graphics-processor.vapi \
+	src/shotwell-graphics-processor.h
+
+src_libgraphics_processor_la_CFLAGS = $(SHOTWELL_CFLAGS) $(COMMON_CFLAGS)
+src_libgraphics_processor_la_CFLAGS += -DG_DISABLE_CAST_CHECKS
+
+noinst_PROGRAMS = \
+	src/shotwell-graphics-processor
+
+src_shotwell_graphics_processor_SOURCES = \
+	src/graphics-processor.vala \
+	src/shotwell-graphics-processor.vapi
+
+src_shotwell_graphics_processor_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--pkg gio-2.0 \
+	--pkg gdk-3.0 \
+	--pkg gee-0.8 \
+	--pkg gdk-pixbuf-2.0
+
+src_shotwell_graphics_processor_CFLAGS = $(SHOTWELL_CFLAGS) $(COMMON_CFLAGS)
+
+src_shotwell_graphics_processor_LDADD = \
+	src/libgraphics-processor.la \
+	$(SHOTWELL_LIBS)
diff --git a/plugins/authenticator/meson.build b/plugins/authenticator/meson.build
new file mode 100644
index 0000000..5b5fc73
--- /dev/null
+++ b/plugins/authenticator/meson.build
@@ -0,0 +1 @@
+subdir('shotwell')
diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi
index ed10082..8adc56c 100644
--- a/plugins/authenticator/shotwell-authenticator.vapi
+++ b/plugins/authenticator/shotwell-authenticator.vapi
@@ -9,6 +9,10 @@ namespace Publishing {
 			}
 			namespace Google {
 			}
+			namespace OAuth1 {
+			}
+			namespace Tumblr {
+			}
 		}
 		[CCode (cheader_filename = "shotwell-authenticator.h")]
 		public class Factory : Spit.Publishing.AuthenticatorFactory, GLib.Object {
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
index ab19db3..cfeb019 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -11,36 +11,13 @@
 #include <glib-object.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib/gi18n-lib.h>
 #include "shotwell-plugin-common.h"
-#include "shotwell-plugin-dev-1.0.h"
+#include <webkit2/webkit2.h>
 #include <libsoup/soup.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION (publishing_authenticator_shotwell_flickr_transaction_get_type ())
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransaction))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransactionClass))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransactionClass))
-
-typedef struct _PublishingAuthenticatorShotwellFlickrTransaction PublishingAuthenticatorShotwellFlickrTransaction;
-typedef struct _PublishingAuthenticatorShotwellFlickrTransactionClass PublishingAuthenticatorShotwellFlickrTransactionClass;
-typedef struct _PublishingAuthenticatorShotwellFlickrTransactionPrivate PublishingAuthenticatorShotwellFlickrTransactionPrivate;
-
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION (publishing_authenticator_shotwell_flickr_session_get_type ())
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSessionClass))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSessionClass))
+#include <gio/gio.h>
+#include "shotwell-plugin-dev-1.0.h"
 
-typedef struct _PublishingAuthenticatorShotwellFlickrSession PublishingAuthenticatorShotwellFlickrSession;
-typedef struct _PublishingAuthenticatorShotwellFlickrSessionClass PublishingAuthenticatorShotwellFlickrSessionClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
-typedef struct _PublishingAuthenticatorShotwellFlickrSessionPrivate PublishingAuthenticatorShotwellFlickrSessionPrivate;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION (publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction))
@@ -63,24 +40,38 @@ typedef struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransa
 typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction;
 typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass;
 typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
 
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE (publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type ())
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPaneClass))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPaneClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE (publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass))
 
-typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPane PublishingAuthenticatorShotwellFlickrPinEntryPane;
-typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass PublishingAuthenticatorShotwellFlickrPinEntryPaneClass;
-typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate;
+typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPane PublishingAuthenticatorShotwellFlickrWebAuthenticationPane;
+typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass;
+typedef struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
+#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL,
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL
 };
-static guint publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_LAST_SIGNAL] = {0};
+static guint publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+
+typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr))
@@ -92,138 +83,73 @@ static guint publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUB
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickr PublishingAuthenticatorShotwellFlickrFlickr;
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickrClass PublishingAuthenticatorShotwellFlickrFlickrClass;
 typedef struct _PublishingAuthenticatorShotwellFlickrFlickrPrivate PublishingAuthenticatorShotwellFlickrFlickrPrivate;
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 #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 _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _PublishingAuthenticatorShotwellFlickrTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingAuthenticatorShotwellFlickrTransactionPrivate * priv;
-};
-
-struct _PublishingAuthenticatorShotwellFlickrTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
-struct _PublishingAuthenticatorShotwellFlickrSession {
-	PublishingRESTSupportSession parent_instance;
-	PublishingAuthenticatorShotwellFlickrSessionPrivate * priv;
-};
-
-struct _PublishingAuthenticatorShotwellFlickrSessionClass {
-	PublishingRESTSupportSessionClass parent_class;
-};
-
-struct _PublishingAuthenticatorShotwellFlickrSessionPrivate {
-	gchar* request_phase_token;
-	gchar* request_phase_token_secret;
-	gchar* access_phase_token;
-	gchar* access_phase_token_secret;
-	gchar* username;
-	gchar* consumer_key;
-	gchar* consumer_secret;
-};
 
 struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction {
-	PublishingAuthenticatorShotwellFlickrTransaction parent_instance;
+	PublishingRESTSupportOAuth1Transaction parent_instance;
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionPrivate * priv;
 };
 
 struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass {
-	PublishingAuthenticatorShotwellFlickrTransactionClass parent_class;
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
 };
 
 struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction {
-	PublishingAuthenticatorShotwellFlickrTransaction parent_instance;
+	PublishingRESTSupportOAuth1Transaction parent_instance;
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate * priv;
 };
 
 struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass {
-	PublishingAuthenticatorShotwellFlickrTransactionClass parent_class;
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
 };
 
-struct _PublishingAuthenticatorShotwellFlickrPinEntryPane {
-	GObject parent_instance;
-	PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate * priv;
+struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPane {
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate * priv;
 };
 
-struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass {
-	GObjectClass parent_class;
+struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass {
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
 };
 
-struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate {
-	GtkBox* pane_widget;
-	GtkButton* continue_button;
-	GtkEntry* pin_entry;
-	GtkLabel* pin_entry_caption;
-	GtkLabel* explanatory_text;
-	GtkBuilder* builder;
+struct _PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate {
+	gchar* auth_code;
 };
 
-struct _PublishingAuthenticatorShotwellFlickrFlickr {
+struct _PublishingAuthenticatorShotwellOAuth1Authenticator {
 	GObject parent_instance;
-	PublishingAuthenticatorShotwellFlickrFlickrPrivate * priv;
+	PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate * priv;
+	GHashTable* params;
+	PublishingRESTSupportOAuth1Session* session;
+	SpitPublishingPluginHost* host;
 };
 
-struct _PublishingAuthenticatorShotwellFlickrFlickrClass {
+struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass {
 	GObjectClass parent_class;
+	void (*authenticate) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	gboolean (*can_logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*refresh) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 };
 
-struct _PublishingAuthenticatorShotwellFlickrFlickrPrivate {
-	GHashTable* params;
-	PublishingAuthenticatorShotwellFlickrSession* session;
-	SpitPublishingPluginHost* host;
+struct _PublishingAuthenticatorShotwellFlickrFlickr {
+	PublishingAuthenticatorShotwellOAuth1Authenticator parent_instance;
+	PublishingAuthenticatorShotwellFlickrFlickrPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrFlickrClass {
+	PublishingAuthenticatorShotwellOAuth1AuthenticatorClass parent_class;
 };
 
 
-static gpointer publishing_authenticator_shotwell_flickr_transaction_parent_class = NULL;
-static gpointer publishing_authenticator_shotwell_flickr_session_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = NULL;
-static gpointer publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface * publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static gpointer publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class = NULL;
 static gpointer publishing_authenticator_shotwell_flickr_flickr_parent_class = NULL;
-static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = NULL;
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
-GType publishing_authenticator_shotwell_flickr_transaction_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TRANSACTION_DUMMY_PROPERTY
-};
-GType publishing_authenticator_shotwell_flickr_session_get_type (void) G_GNUC_CONST;
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method);
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method);
-static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self);
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new_with_uri (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self);
-gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self);
-gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self);
-static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn);
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSessionPrivate))
-enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION_DUMMY_PROPERTY
-};
-PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_new (void);
-PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_construct (GType object_type);
-static gboolean publishing_authenticator_shotwell_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-void publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
-void publishing_authenticator_shotwell_flickr_session_deauthenticate (PublishingAuthenticatorShotwellFlickrSession* self);
-void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret);
-void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret);
-void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
-gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self);
-gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self);
-gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self);
-gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self);
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj);
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET "d0960565e03547c1"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Flickr.\n" \
@@ -234,58 +160,48 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_DUMMY_PROPERTY
 };
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session);
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session);
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session);
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
 GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
 };
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier);
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier);
-GType publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type (void) G_GNUC_CONST;
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate))
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier);
+GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate))
 enum  {
-	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_DUMMY_PROPERTY
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
 };
-PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_new (GtkBuilder* builder);
-PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder);
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self);
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self);
-static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj);
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=w" \
+"rite"
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token);
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request);
+static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+static void _vala_SoupURI_free (SoupURI* self);
+static guint8* _vala_array_dup1 (guint8* self, int length);
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj);
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
-#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrPrivate))
 enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_DUMMY_PROPERTY
 };
-static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
-static void _g_free0_ (gpointer var);
-static void _g_variant_unref0_ (gpointer var);
-static GVariant* _variant_new1 (const gchar* value);
-static GVariant* _variant_new2 (const gchar* value);
-void publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token);
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret);
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username);
-static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
 static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (SpitPublishingAuthenticator* base);
-static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
-static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base);
-static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPublishingAuthenticator* base);
+static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+static void publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
 static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self);
 static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self);
@@ -295,1303 +211,46 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
 static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
 static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret);
-static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token);
-static void publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self);
-static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin);
-static void _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed (PublishingAuthenticatorShotwellFlickrPinEntryPane* _sender, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token);
 static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin);
+static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
 static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response);
-static GVariant* _variant_new3 (gchar* value);
-static GVariant* _variant_new4 (gchar* value);
-static GVariant* _variant_new5 (gchar* value);
-static void publishing_authenticator_shotwell_flickr_flickr_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);
-
-
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-	PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
-#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = session;
-#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = method;
-#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
-#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return self;
-#line 331 "FlickrPublishingAuthenticator.c"
-}
 
 
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return publishing_authenticator_shotwell_flickr_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, method);
-#line 338 "FlickrPublishingAuthenticator.c"
-}
-
-
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-	PublishingAuthenticatorShotwellFlickrTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
-#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
-#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = session;
 #line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = uri;
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = method;
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrTransaction*) 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 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_transaction_setup_arguments (self);
-#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return self;
-#line 363 "FlickrPublishingAuthenticator.c"
-}
-
-
-PublishingAuthenticatorShotwellFlickrTransaction* publishing_authenticator_shotwell_flickr_transaction_new_with_uri (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 370 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self) {
-	PublishingAuthenticatorShotwellFlickrSession* session = NULL;
-	PublishingRESTSupportSession* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_TRANSACTION (self));
-#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	session = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (session);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = _tmp1_;
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp2_);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp2_);
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "oob");
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (session);
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_;
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp4_);
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp4_);
-#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = publishing_authenticator_shotwell_flickr_session_get_consumer_key (session);
-#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = _tmp5_;
-#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", _tmp6_);
-#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp6_);
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_publishing_rest_support_session_unref0 (session);
-#line 421 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingAuthenticatorShotwellFlickrTransaction * self;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, PublishingAuthenticatorShotwellFlickrTransaction);
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_authenticator_shotwell_flickr_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_propagate_error (error, _inner_error_);
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			return;
-#line 450 "FlickrPublishingAuthenticator.c"
-		} else {
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_clear_error (&_inner_error_);
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			return;
-#line 458 "FlickrPublishingAuthenticator.c"
-		}
-	}
-}
-
-
-static void publishing_authenticator_shotwell_flickr_transaction_class_init (PublishingAuthenticatorShotwellFlickrTransactionClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_authenticator_shotwell_flickr_transaction_real_execute;
-#line 469 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_transaction_instance_init (PublishingAuthenticatorShotwellFlickrTransaction * self) {
-}
-
-
-GType publishing_authenticator_shotwell_flickr_transaction_get_type (void) {
-	static volatile gsize publishing_authenticator_shotwell_flickr_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_transaction_instance_init, NULL };
-		GType publishing_authenticator_shotwell_flickr_transaction_type_id;
-		publishing_authenticator_shotwell_flickr_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellFlickrTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_authenticator_shotwell_flickr_transaction_type_id__volatile, publishing_authenticator_shotwell_flickr_transaction_type_id);
-	}
-	return publishing_authenticator_shotwell_flickr_transaction_type_id__volatile;
-}
-
-
-PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_construct (GType object_type) {
-	PublishingAuthenticatorShotwellFlickrSession* self = NULL;
-#line 54 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrSession*) publishing_rest_support_session_construct (object_type, NULL);
-#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return self;
-#line 495 "FlickrPublishingAuthenticator.c"
-}
-
-
-PublishingAuthenticatorShotwellFlickrSession* publishing_authenticator_shotwell_flickr_session_new (void) {
-#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return publishing_authenticator_shotwell_flickr_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION);
-#line 502 "FlickrPublishingAuthenticator.c"
-}
-
-
-static gboolean publishing_authenticator_shotwell_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base) {
-	PublishingAuthenticatorShotwellFlickrSession * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_;
-#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->access_phase_token;
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp2_ != NULL) {
-#line 518 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp3_;
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp3_ = self->priv->access_phase_token_secret;
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = _tmp3_ != NULL;
-#line 524 "FlickrPublishingAuthenticator.c"
-	} else {
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = FALSE;
-#line 528 "FlickrPublishingAuthenticator.c"
-	}
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp1_) {
-#line 532 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp4_;
-#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp4_ = self->priv->username;
-#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp0_ = _tmp4_ != NULL;
-#line 538 "FlickrPublishingAuthenticator.c"
-	} else {
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp0_ = FALSE;
-#line 542 "FlickrPublishingAuthenticator.c"
-	}
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp0_;
-#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 548 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (token != NULL);
-#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (secret != NULL);
-#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (username != NULL);
-#line 64 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 64 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 64 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 64 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = secret;
-#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = username;
-#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->username);
-#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->username = _tmp5_;
-#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 593 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_deauthenticate (PublishingAuthenticatorShotwellFlickrSession* self) {
-#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->username);
-#line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->username = NULL;
-#line 612 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (consumer_key != NULL);
-#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (consumer_secret != NULL);
-#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = consumer_key;
-#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->consumer_key);
-#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->consumer_key = _tmp1_;
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = consumer_secret;
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->consumer_secret);
-#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->consumer_secret = _tmp3_;
-#line 643 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn) {
-	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp6_;
-	gint _tmp7_;
-	PublishingRESTSupportArgument** _tmp8_;
-	gint base_string_arguments_length1;
-	gint _base_string_arguments_size_;
-	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp9_;
-	gint _tmp9__length1;
-	gint _tmp10_;
-	PublishingRESTSupportArgument** _tmp11_;
-	gint sorted_args_length1;
-	gint _sorted_args_size_;
-	gchar* arguments_string = NULL;
-	gchar* _tmp12_;
-	gchar* signing_key = NULL;
-	const gchar* _tmp35_;
-	gchar* signature_base_string = NULL;
-	const gchar* _tmp49_;
-	gchar* _tmp50_;
-	gchar* _tmp51_;
-	PublishingRESTSupportTransaction* _tmp52_;
-	gchar* _tmp53_;
-	gchar* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	gchar* _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	gchar* _tmp60_;
-	const gchar* _tmp61_;
-	gchar* _tmp62_;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	const gchar* _tmp66_;
-	gchar* signature = NULL;
-	const gchar* _tmp67_;
-	gchar* _tmp68_;
-	const gchar* _tmp69_;
-	gchar* _tmp70_;
-	const gchar* _tmp71_;
-	PublishingRESTSupportTransaction* _tmp72_;
-	const gchar* _tmp73_;
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = txn;
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	http_method = _tmp2_;
-#line 85 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:85: signing transaction with parame" \
-"ters:");
-#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = http_method;
-#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = _tmp4_;
-#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:86: %s", _tmp5_);
-#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp5_);
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = txn;
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	base_string_arguments = _tmp8_;
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	base_string_arguments_length1 = _tmp7_;
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = base_string_arguments;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9__length1 = base_string_arguments_length1;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = publishing_rest_support_argument_sort (_tmp9_, _tmp9__length1, &_tmp10_);
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	sorted_args = _tmp11_;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	sorted_args_length1 = _tmp10_;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_sorted_args_size_ = sorted_args_length1;
-#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = g_strdup ("");
-#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	arguments_string = _tmp12_;
-#line 749 "FlickrPublishingAuthenticator.c"
-	{
-		gint i = 0;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		i = 0;
-#line 754 "FlickrPublishingAuthenticator.c"
-		{
-			gboolean _tmp13_ = FALSE;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp13_ = TRUE;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			while (TRUE) {
-#line 761 "FlickrPublishingAuthenticator.c"
-				gint _tmp15_;
-				PublishingRESTSupportArgument** _tmp16_;
-				gint _tmp16__length1;
-				const gchar* _tmp17_;
-				PublishingRESTSupportArgument** _tmp18_;
-				gint _tmp18__length1;
-				gint _tmp19_;
-				PublishingRESTSupportArgument* _tmp20_;
-				const gchar* _tmp21_;
-				gchar* _tmp22_;
-				gchar* _tmp23_;
-				PublishingRESTSupportArgument** _tmp24_;
-				gint _tmp24__length1;
-				gint _tmp25_;
-				PublishingRESTSupportArgument* _tmp26_;
-				const gchar* _tmp27_;
-				gchar* _tmp28_;
-				gchar* _tmp29_;
-				gchar* _tmp30_;
-				gint _tmp31_;
-				PublishingRESTSupportArgument** _tmp32_;
-				gint _tmp32__length1;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				if (!_tmp13_) {
-#line 786 "FlickrPublishingAuthenticator.c"
-					gint _tmp14_;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					_tmp14_ = i;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					i = _tmp14_ + 1;
-#line 792 "FlickrPublishingAuthenticator.c"
-				}
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp13_ = FALSE;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp15_ = i;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp16_ = sorted_args;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp16__length1 = sorted_args_length1;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				if (!(_tmp15_ < _tmp16__length1)) {
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					break;
-#line 806 "FlickrPublishingAuthenticator.c"
-				}
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp17_ = arguments_string;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp18_ = sorted_args;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp18__length1 = sorted_args_length1;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp19_ = i;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp20_ = _tmp18_[_tmp19_];
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp21_ = _tmp20_->key;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp22_ = g_strconcat (_tmp21_, "=", NULL);
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp23_ = _tmp22_;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp24_ = sorted_args;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp24__length1 = sorted_args_length1;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp25_ = i;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp26_ = _tmp24_[_tmp25_];
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp27_ = _tmp26_->value;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp28_ = g_strconcat (_tmp23_, _tmp27_, NULL);
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp29_ = _tmp28_;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp30_ = g_strconcat (_tmp17_, _tmp29_, NULL);
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_g_free0 (arguments_string);
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				arguments_string = _tmp30_;
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_g_free0 (_tmp29_);
-#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_g_free0 (_tmp23_);
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp31_ = i;
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp32_ = sorted_args;
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				_tmp32__length1 = sorted_args_length1;
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-				if (_tmp31_ < (_tmp32__length1 - 1)) {
-#line 856 "FlickrPublishingAuthenticator.c"
-					const gchar* _tmp33_;
-					gchar* _tmp34_;
-#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					_tmp33_ = arguments_string;
-#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					_tmp34_ = g_strconcat (_tmp33_, "&", NULL);
-#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					_g_free0 (arguments_string);
-#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-					arguments_string = _tmp34_;
-#line 867 "FlickrPublishingAuthenticator.c"
-				}
-			}
-		}
-	}
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	signing_key = NULL;
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp35_ = self->priv->access_phase_token_secret;
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp35_ != NULL) {
-#line 878 "FlickrPublishingAuthenticator.c"
-		const gchar* _tmp36_;
-		gchar* _tmp37_;
-		gchar* _tmp38_;
-		const gchar* _tmp39_;
-		gchar* _tmp40_;
-#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_debug ("FlickrPublishingAuthenticator.vala:102: access phase token secret avai" \
-"lable; using it as signing key");
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp36_ = self->priv->consumer_secret;
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp37_ = g_strconcat (_tmp36_, "&", NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp38_ = _tmp37_;
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp39_ = self->priv->access_phase_token_secret;
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp40_ = g_strconcat (_tmp38_, _tmp39_, NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (signing_key);
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		signing_key = _tmp40_;
-#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp38_);
-#line 902 "FlickrPublishingAuthenticator.c"
-	} else {
-		const gchar* _tmp41_;
-#line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp41_ = self->priv->request_phase_token_secret;
-#line 105 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		if (_tmp41_ != NULL) {
-#line 909 "FlickrPublishingAuthenticator.c"
-			const gchar* _tmp42_;
-			gchar* _tmp43_;
-			gchar* _tmp44_;
-			const gchar* _tmp45_;
-			gchar* _tmp46_;
-#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_debug ("FlickrPublishingAuthenticator.vala:106: request phase token secret ava" \
-"ilable; using it as signing key");
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp42_ = self->priv->consumer_secret;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp43_ = g_strconcat (_tmp42_, "&", NULL);
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp44_ = _tmp43_;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp45_ = self->priv->request_phase_token_secret;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp46_ = g_strconcat (_tmp44_, _tmp45_, NULL);
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_g_free0 (signing_key);
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			signing_key = _tmp46_;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_g_free0 (_tmp44_);
-#line 933 "FlickrPublishingAuthenticator.c"
-		} else {
-			const gchar* _tmp47_;
-			gchar* _tmp48_;
-#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_debug ("FlickrPublishingAuthenticator.vala:110: %s", "neither access phase nor request phase token secrets available; using " \
-"API " "key as signing key");
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp47_ = self->priv->consumer_secret;
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_tmp48_ = g_strconcat (_tmp47_, "&", NULL);
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_g_free0 (signing_key);
-#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			signing_key = _tmp48_;
-#line 947 "FlickrPublishingAuthenticator.c"
-		}
-	}
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp49_ = http_method;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp50_ = g_strconcat (_tmp49_, "&", NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp51_ = _tmp50_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp52_ = txn;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp53_ = publishing_rest_support_transaction_get_endpoint_url (_tmp52_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp54_ = _tmp53_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp55_ = soup_uri_encode (_tmp54_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp56_ = _tmp55_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp57_ = g_strconcat (_tmp51_, _tmp56_, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp58_ = _tmp57_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp59_ = g_strconcat (_tmp58_, "&", NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp60_ = _tmp59_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp61_ = arguments_string;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp62_ = soup_uri_encode (_tmp61_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp63_ = _tmp62_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp64_ = g_strconcat (_tmp60_, _tmp63_, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp65_ = _tmp64_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp63_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp60_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp58_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp56_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp54_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp51_);
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	signature_base_string = _tmp65_;
-#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:120: signature base string = '%s'", signature_base_string);
-#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp66_ = signing_key;
-#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:122: signing key = '%s'", _tmp66_);
-#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp67_ = signing_key;
-#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp68_ = publishing_rest_support_hmac_sha1 (_tmp67_, signature_base_string);
-#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	signature = _tmp68_;
-#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp69_ = signature;
-#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp70_ = soup_uri_encode (_tmp69_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (signature);
-#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	signature = _tmp70_;
-#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp71_ = signature;
-#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:128: signature = '%s'", _tmp71_);
-#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp72_ = txn;
-#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp73_ = signature;
-#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_rest_support_transaction_add_argument (_tmp72_, "oauth_signature", _tmp73_);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (signature);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (signature_base_string);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (signing_key);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (arguments_string);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (http_method);
-#line 1042 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (token != NULL);
-#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (secret != NULL);
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->request_phase_token = _tmp1_;
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = secret;
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->request_phase_token_secret = _tmp3_;
-#line 1073 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self));
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (token != NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (secret != NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (username != NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = token;
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = secret;
-#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = username;
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->username);
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->username = _tmp5_;
-#line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 1118 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	GTimeVal currtime = {0};
-	GTimeVal _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	GTimeVal _tmp4_;
-	glong _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_get_current_time (&currtime);
-#line 148 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_get_current_time (&currtime);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = currtime;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = _tmp2_;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = currtime;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = _tmp4_.tv_usec;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = _tmp6_;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = _tmp8_;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = _tmp10_;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp9_);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp7_);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp3_);
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp11_;
-#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1177 "FlickrPublishingAuthenticator.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 1200 "FlickrPublishingAuthenticator.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1208 "FlickrPublishingAuthenticator.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1220 "FlickrPublishingAuthenticator.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 1244 "FlickrPublishingAuthenticator.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1250 "FlickrPublishingAuthenticator.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 1254 "FlickrPublishingAuthenticator.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 1258 "FlickrPublishingAuthenticator.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 1270 "FlickrPublishingAuthenticator.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 1280 "FlickrPublishingAuthenticator.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 1286 "FlickrPublishingAuthenticator.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1300 "FlickrPublishingAuthenticator.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1310 "FlickrPublishingAuthenticator.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 1316 "FlickrPublishingAuthenticator.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 1325 "FlickrPublishingAuthenticator.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 1345 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	gint64 _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = g_get_real_time ();
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = _tmp1_;
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_;
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp2_);
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp4_;
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1374 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->consumer_key;
-#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp0_ != NULL, "consumer_key != null");
-#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->consumer_key;
-#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp2_;
-#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1397 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->request_phase_token;
-#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp0_ != NULL, "request_phase_token != null");
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->request_phase_token;
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp2_;
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1420 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->access_phase_token;
-#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->access_phase_token;
-#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp2_;
-#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1443 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->access_phase_token_secret;
-#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
-#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->access_phase_token_secret;
-#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp2_;
-#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1466 "FlickrPublishingAuthenticator.c"
-}
-
-
-gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self) {
-	gchar* result = NULL;
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (self), NULL);
-#line 179 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 179 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp0_, "is_authenticated()");
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->username;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp2_;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1489 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_session_class_init (PublishingAuthenticatorShotwellFlickrSessionClass * klass) {
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_flickr_session_finalize;
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrSessionPrivate));
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
-#line 1502 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_session_instance_init (PublishingAuthenticatorShotwellFlickrSession * self) {
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SESSION_GET_PRIVATE (self);
-#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->request_phase_token = NULL;
-#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->request_phase_token_secret = NULL;
-#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token = NULL;
-#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->username = NULL;
-#line 50 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->consumer_key = NULL;
-#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->consumer_secret = NULL;
-#line 1523 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_session_finalize (PublishingRESTSupportSession * obj) {
-	PublishingAuthenticatorShotwellFlickrSession * self;
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_SESSION, PublishingAuthenticatorShotwellFlickrSession);
-#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->username);
-#line 50 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->consumer_key);
-#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (self->priv->consumer_secret);
-#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_flickr_session_parent_class)->finalize (obj);
-#line 1547 "FlickrPublishingAuthenticator.c"
-}
-
-
-GType publishing_authenticator_shotwell_flickr_session_get_type (void) {
-	static volatile gsize publishing_authenticator_shotwell_flickr_session_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_session_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrSession), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_session_instance_init, NULL };
-		GType publishing_authenticator_shotwell_flickr_session_type_id;
-		publishing_authenticator_shotwell_flickr_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingAuthenticatorShotwellFlickrSession", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_authenticator_shotwell_flickr_session_type_id__volatile, publishing_authenticator_shotwell_flickr_session_type_id);
-	}
-	return publishing_authenticator_shotwell_flickr_session_type_id__volatile;
-}
-
-
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session) {
-	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
-#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = session;
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1574 "FlickrPublishingAuthenticator.c"
+#line 236 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session) {
-#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_authentication_request_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 1581 "FlickrPublishingAuthenticator.c"
+#line 243 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass * klass) {
-#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1588 "FlickrPublishingAuthenticator.c"
+#line 250 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1604,59 +263,61 @@ GType publishing_authenticator_shotwell_flickr_authentication_request_transactio
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init, NULL };
 		GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id;
-		publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id = g_type_register_static (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction", &g_define_type_info, 0);
+		publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile, publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id);
 	}
 	return publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile;
 }
 
 
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* self = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
 	const gchar* _tmp1_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_SESSION (session), NULL);
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (user_verifier != NULL, NULL);
-#line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = session;
-#line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_authenticator_shotwell_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = user_verifier;
-#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = session;
-#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = publishing_authenticator_shotwell_flickr_session_get_request_phase_token (_tmp2_);
-#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = publishing_rest_support_oauth1_session_get_request_phase_token (_tmp2_);
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp4_ = _tmp3_;
-#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
-#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp4_);
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1639 "FlickrPublishingAuthenticator.c"
+#line 303 "FlickrPublishingAuthenticator.c"
 }
 
 
-PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session, const gchar* user_verifier) {
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* user_verifier) {
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 1646 "FlickrPublishingAuthenticator.c"
+#line 310 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass * klass) {
-#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1653 "FlickrPublishingAuthenticator.c"
+#line 317 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -1669,843 +330,509 @@ GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_ge
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init, NULL };
 		GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id;
-		publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction", &g_define_type_info, 0);
+		publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile, publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id);
 	}
 	return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile;
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
-#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1676 "FlickrPublishingAuthenticator.c"
-}
-
-
-PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self = NULL;
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-	GtkBuilder* _tmp2_;
-	GtkBuilder* _tmp3_;
-	GSList* _tmp4_;
-	GSList* _tmp5_;
-	guint _tmp6_;
-	GtkBuilder* _tmp7_;
-	GObject* _tmp8_;
-	GtkLabel* _tmp9_;
-	GtkBuilder* _tmp10_;
-	GObject* _tmp11_;
-	GtkLabel* _tmp12_;
-	GtkBuilder* _tmp13_;
-	GObject* _tmp14_;
-	GtkEntry* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkButton* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_;
-	GtkBox* _tmp21_;
-	GtkBox* _tmp22_;
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrPinEntryPane*) g_object_new (object_type, NULL);
-#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = builder;
-#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->builder = _tmp1_;
-#line 217 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = builder;
-#line 217 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = builder;
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = _tmp4_;
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = g_slist_length (_tmp5_);
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_slist_free0 (_tmp5_);
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = builder;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "explanatory_text");
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->explanatory_text = _tmp9_;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = builder;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "pin_entry_caption");
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp11_) : NULL);
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pin_entry_caption = _tmp12_;
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp13_ = builder;
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "pin_entry");
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pin_entry = _tmp15_;
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp16_ = builder;
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "continue_button");
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->continue_button = _tmp18_;
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp19_ = builder;
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "pane_widget");
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_box_get_type ()) ? ((GtkBox*) _tmp20_) : NULL);
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pane_widget = _tmp21_;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp22_ = self->priv->pane_widget;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (GType object_type, const gchar* token) {
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_return_val_if_fail (token != NULL, NULL);
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = token;
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = g_strdup_printf (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_LOGIN_URI, _tmp0_);
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = _tmp1_;
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp2_, NULL);
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (_tmp2_);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 1791 "FlickrPublishingAuthenticator.c"
-}
-
-
-PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_new (GtkBuilder* builder) {
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 1798 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
-	GtkEntry* _tmp0_;
-	const gchar* _tmp1_;
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->pin_entry;
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_emit (self, publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL], 0, self, _tmp1_);
-#line 1813 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
-	GtkButton* _tmp0_;
-	GtkEntry* _tmp1_;
-	guint _tmp2_;
-	guint _tmp3_;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = _tmp2_;
-#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 1834 "FlickrPublishingAuthenticator.c"
-}
-
-
-static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
-#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp1_;
-#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1853 "FlickrPublishingAuthenticator.c"
+#line 356 "FlickrPublishingAuthenticator.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 244 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
-#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 1866 "FlickrPublishingAuthenticator.c"
+PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* publishing_authenticator_shotwell_flickr_web_authentication_pane_new (const gchar* token) {
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return publishing_authenticator_shotwell_flickr_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, token);
+#line 363 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1873 "FlickrPublishingAuthenticator.c"
+static gpointer _g_object_ref0 (gpointer self) {
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 370 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingAuthenticatorShotwellFlickrPinEntryPane*) self);
-#line 1880 "FlickrPublishingAuthenticator.c"
+static void _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request, gpointer self) {
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb ((PublishingAuthenticatorShotwellFlickrWebAuthenticationPane*) self, request);
+#line 377 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	GtkButton* _tmp0_;
-	GtkEntry* _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_connect_object (_tmp0_, "clicked", (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self, 0);
-#line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 250 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 1898 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed (GObject* base) {
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
+	WebKitWebContext* ctx = NULL;
+	WebKitWebContext* _tmp0_;
+	WebKitWebContext* _tmp1_;
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane);
+#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), G_TYPE_OBJECT, GObject));
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = webkit_web_context_get_default ();
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	ctx = _tmp1_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	webkit_web_context_register_uri_scheme (ctx, "shotwell-auth", _publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback, g_object_ref (self), g_object_unref);
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_object_unref0 (ctx);
+#line 400 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-	GtkButton* _tmp0_;
-	guint _tmp1_;
-	GtkEntry* _tmp2_;
-	guint _tmp3_;
-#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
-#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self);
-#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->pin_entry;
-#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 1922 "FlickrPublishingAuthenticator.c"
+static void _vala_SoupURI_free (SoupURI* self) {
+#line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_boxed_free (soup_uri_get_type (), self);
+#line 407 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1, gpointer arg_1, const char* arg_2, gpointer data2);
-	register GMarshalFunc_VOID__OBJECT_STRING callback;
-	register GCClosure * cc;
-	register gpointer data1;
-	register gpointer data2;
-	cc = (GCClosure *) closure;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		data1 = closure->data;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 1941 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
+	SoupURI* uri = NULL;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
+	const gchar* _tmp2_;
+	SoupURI* _tmp3_;
+	SoupURI* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	SoupURI* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp9_;
+#line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane);
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = _tmp0_;
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = webkit_web_view_get_uri (_tmp1_);
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = soup_uri_new (_tmp2_);
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = _tmp3_;
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_object_unref0 (_tmp1_);
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	uri = _tmp4_;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp6_ = uri;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp7_ = _tmp6_->scheme;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (g_strcmp0 (_tmp7_, "shotwell-auth") == 0) {
+#line 445 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp8_;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp8_ = self->priv->auth_code;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp5_ = _tmp8_ == NULL;
+#line 451 "FlickrPublishingAuthenticator.c"
 	} else {
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		data2 = closure->data;
-#line 1947 "FlickrPublishingAuthenticator.c"
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp5_ = FALSE;
+#line 455 "FlickrPublishingAuthenticator.c"
 	}
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 1953 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_class_init (PublishingAuthenticatorShotwellFlickrPinEntryPaneClass * klass) {
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class = g_type_class_peek_parent (klass);
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate));
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_PROCEED_SIGNAL] = g_signal_new ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 1966 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_preferred_geometry;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 1981 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_instance_init (PublishingAuthenticatorShotwellFlickrPinEntryPane * self) {
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE (self);
-#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pane_widget = NULL;
-#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->continue_button = NULL;
-#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pin_entry = NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->pin_entry_caption = NULL;
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->explanatory_text = NULL;
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->builder = NULL;
-#line 2000 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_pin_entry_pane_finalize (GObject * obj) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingAuthenticatorShotwellFlickrPinEntryPane);
-#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 2022 "FlickrPublishingAuthenticator.c"
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp5_) {
+#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL], 0);
+#line 461 "FlickrPublishingAuthenticator.c"
+	}
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp9_ = self->priv->auth_code;
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp9_ != NULL) {
+#line 467 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp10_;
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp10_ = self->priv->auth_code;
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		g_signal_emit (self, publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp10_);
+#line 473 "FlickrPublishingAuthenticator.c"
+	}
+#line 55 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	__vala_SoupURI_free0 (uri);
+#line 477 "FlickrPublishingAuthenticator.c"
+}
+
+
+static guint8* string_get_data (const gchar* self, int* result_length1) {
+	guint8* result;
+	guint8* res = NULL;
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res = (guint8*) self;
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res_length1 = -1;
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_res_size_ = res_length1;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = strlen (self);
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = _tmp0_;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res_length1 = (gint) _tmp1_;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = res_length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = res;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3__length1 = res_length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp4_ = _tmp3_;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp4__length1 = _tmp3__length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (result_length1) {
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		*result_length1 = _tmp4__length1;
+#line 521 "FlickrPublishingAuthenticator.c"
+	}
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp4_;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 527 "FlickrPublishingAuthenticator.c"
 }
 
 
-GType publishing_authenticator_shotwell_flickr_pin_entry_pane_get_type (void) {
-	static volatile gsize publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrPinEntryPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_pin_entry_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrPinEntryPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_pin_entry_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id;
-		publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellFlickrPinEntryPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id__volatile, publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id);
-	}
-	return publishing_authenticator_shotwell_flickr_pin_entry_pane_type_id__volatile;
+static guint8* _vala_array_dup1 (guint8* self, int length) {
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 534 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
-#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2043 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* self, WebKitURISchemeRequest* request) {
+	SoupURI* uri = NULL;
+	WebKitURISchemeRequest* _tmp0_;
+	const gchar* _tmp1_;
+	SoupURI* _tmp2_;
+	GHashTable* form_data = NULL;
+	const gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gconstpointer _tmp5_;
+	gchar* _tmp6_;
+	gchar* response = NULL;
+	gchar* _tmp7_;
+	GMemoryInputStream* mins = NULL;
+	guint8* _tmp8_;
+	gint _tmp8__length1;
+	guint8* _tmp9_;
+	gint _tmp9__length1;
+	guint8* _tmp10_;
+	gint _tmp10__length1;
+	GMemoryInputStream* _tmp11_;
+	WebKitURISchemeRequest* _tmp12_;
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_WEB_AUTHENTICATION_PANE (self));
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_return_if_fail (WEBKIT_IS_URI_SCHEME_REQUEST (request));
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = request;
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = webkit_uri_scheme_request_get_uri (_tmp0_);
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = soup_uri_new (_tmp1_);
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	uri = _tmp2_;
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = uri->query;
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = soup_form_decode (_tmp3_);
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	form_data = _tmp4_;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp5_ = g_hash_table_lookup (form_data, "oauth_verifier");
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp6_ = g_strdup ((const gchar*) _tmp5_);
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (self->priv->auth_code);
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self->priv->auth_code = _tmp6_;
+#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp7_ = g_strdup ("");
+#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	response = _tmp7_;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp8_ = string_get_data (response, &_tmp8__length1);
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp9_ = _tmp8_;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp9__length1 = _tmp8__length1;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup1 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp10__length1 = _tmp9__length1;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp11_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp10_, _tmp10__length1, NULL);
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	mins = _tmp11_;
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp12_ = request;
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	webkit_uri_scheme_request_finish (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_object_unref0 (mins);
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (response);
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_hash_table_unref0 (form_data);
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	__vala_SoupURI_free0 (uri);
+#line 615 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	var = (g_free (var), NULL);
-#line 2050 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass * klass) {
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPanePrivate));
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_authenticator_shotwell_flickr_web_authentication_pane_real_constructed;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_flickr_web_authentication_pane_real_on_page_load;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL] = g_signal_new ("error", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 634 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _g_variant_unref0_ (gpointer var) {
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 2057 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self) {
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self->priv->auth_code = NULL;
+#line 643 "FlickrPublishingAuthenticator.c"
 }
 
 
-static GVariant* _variant_new1 (const gchar* value) {
-#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2064 "FlickrPublishingAuthenticator.c"
+static void publishing_authenticator_shotwell_flickr_web_authentication_pane_finalize (GObject * obj) {
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane * self;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFlickrWebAuthenticationPane);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (self->priv->auth_code);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_web_authentication_pane_parent_class)->finalize (obj);
+#line 655 "FlickrPublishingAuthenticator.c"
 }
 
 
-static GVariant* _variant_new2 (const gchar* value) {
-#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2071 "FlickrPublishingAuthenticator.c"
+GType publishing_authenticator_shotwell_flickr_web_authentication_pane_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_web_authentication_pane_instance_init, NULL };
+		GType publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id;
+		publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingAuthenticatorShotwellFlickrWebAuthenticationPane", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile, publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id);
+	}
+	return publishing_authenticator_shotwell_flickr_web_authentication_pane_type_id__volatile;
 }
 
 
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
 	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	GHashFunc _tmp2_;
-	GEqualFunc _tmp3_;
-	GHashTable* _tmp4_;
-	GHashTable* _tmp5_;
-	gchar* _tmp6_;
-	GVariant* _tmp7_;
-	GHashTable* _tmp8_;
-	gchar* _tmp9_;
-	GVariant* _tmp10_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp11_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp12_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp13_;
-#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = (PublishingAuthenticatorShotwellFlickrFlickr*) g_object_new (object_type, NULL);
-#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = host;
-#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->host);
-#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->host = _tmp1_;
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = g_str_hash;
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_str_equal;
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_hash_table_unref0 (self->priv->params);
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->params = _tmp4_;
-#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = self->priv->params;
-#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = g_strdup ("ConsumerKey");
-#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = _variant_new1 (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY);
-#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp5_, _tmp6_, _tmp7_);
-#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = self->priv->params;
-#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = g_strdup ("ConsumerSecret");
-#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = _variant_new2 (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET);
-#line 271 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp8_, _tmp9_, _tmp10_);
-#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = publishing_authenticator_shotwell_flickr_session_new ();
-#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv->session = _tmp11_;
-#line 274 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = self->priv->session;
-#line 274 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_session_set_api_credentials (_tmp12_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET);
-#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp13_ = self->priv->session;
-#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
-#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFlickrFlickr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_API_SECRET, _tmp0_);
+#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return self;
-#line 2145 "FlickrPublishingAuthenticator.c"
+#line 682 "FlickrPublishingAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
-#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 78 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
-#line 2152 "FlickrPublishingAuthenticator.c"
-}
-
-
-void publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (self, "");
-#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (self, "");
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (self, "");
-#line 2165 "FlickrPublishingAuthenticator.c"
-}
-
-
-static gboolean publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gboolean _tmp4_;
-#line 288 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), FALSE);
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (self);
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_ != NULL;
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp3_);
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp4_) {
-#line 2188 "FlickrPublishingAuthenticator.c"
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (self);
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = _tmp5_;
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = _tmp6_ != NULL;
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp6_);
-#line 2199 "FlickrPublishingAuthenticator.c"
-	} else {
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = FALSE;
-#line 2203 "FlickrPublishingAuthenticator.c"
-	}
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (_tmp1_) {
-#line 2207 "FlickrPublishingAuthenticator.c"
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (self);
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp8_ = _tmp7_;
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp0_ = _tmp8_ != NULL;
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp8_);
-#line 2218 "FlickrPublishingAuthenticator.c"
-	} else {
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp0_ = FALSE;
-#line 2222 "FlickrPublishingAuthenticator.c"
-	}
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp0_;
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 2228 "FlickrPublishingAuthenticator.c"
+#line 689 "FlickrPublishingAuthenticator.c"
 }
 
 
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", NULL);
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp1_;
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 2246 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (username != NULL);
-#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = username;
-#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 2263 "FlickrPublishingAuthenticator.c"
-}
-
-
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 302 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp1_;
-#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 2281 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (token != NULL);
-#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = token;
-#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 2298 "FlickrPublishingAuthenticator.c"
-}
-
-
-static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self), NULL);
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", NULL);
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp1_;
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 2316 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (secret != NULL);
-#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = secret;
-#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 2333 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base) {
+static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 	gboolean _tmp0_;
-#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = publishing_authenticator_shotwell_flickr_flickr_is_persistent_session_valid (self);
-#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp0_) {
-#line 2346 "FlickrPublishingAuthenticator.c"
-		PublishingAuthenticatorShotwellFlickrSession* _tmp1_;
+#line 702 "FlickrPublishingAuthenticator.c"
+		PublishingRESTSupportOAuth1Session* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_debug ("FlickrPublishingAuthenticator.vala:320: attempt start: a persistent se" \
-"ssion is available; using it");
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = self->priv->session;
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp2_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (self);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		g_debug ("FlickrPublishingAuthenticator.vala:84: attempt start: a persistent ses" \
+"sion is available; using it");
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp3_ = _tmp2_;
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp4_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (self);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp5_ = _tmp4_;
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (self);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp6_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp7_ = _tmp6_;
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		publishing_authenticator_shotwell_flickr_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp7_);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp5_);
-#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_free0 (_tmp3_);
-#line 2378 "FlickrPublishingAuthenticator.c"
+#line 734 "FlickrPublishingAuthenticator.c"
 	} else {
-#line 325 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_debug ("FlickrPublishingAuthenticator.vala:325: attempt start: no persistent s" \
-"ession available; showing login welcome pane");
-#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		g_debug ("FlickrPublishingAuthenticator.vala:89: attempt start: no persistent se" \
+"ssion available; showing login welcome pane");
+#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
-#line 2384 "FlickrPublishingAuthenticator.c"
+#line 740 "FlickrPublishingAuthenticator.c"
 	}
 }
 
 
-static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (SpitPublishingAuthenticator* base) {
+static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
 	gboolean result = FALSE;
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	result = TRUE;
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return result;
-#line 2398 "FlickrPublishingAuthenticator.c"
-}
-
-
-static gpointer _g_hash_table_ref0 (gpointer self) {
-#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return self ? g_hash_table_ref (self) : NULL;
-#line 2405 "FlickrPublishingAuthenticator.c"
-}
-
-
-static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
-	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	GHashTable* result = NULL;
-	GHashTable* _tmp0_;
-	GHashTable* _tmp1_;
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->params;
-#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
-#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	result = _tmp1_;
-#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	return result;
-#line 2424 "FlickrPublishingAuthenticator.c"
+#line 754 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base) {
+static void publishing_authenticator_shotwell_flickr_flickr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
-#line 338 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 98 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->session;
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_session_deauthenticate (_tmp0_);
-#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_invalidate_persistent_session (self);
-#line 2439 "FlickrPublishingAuthenticator.c"
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 769 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPublishingAuthenticator* base) {
+static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
 	PublishingAuthenticatorShotwellFlickrFlickr * self;
-#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 2447 "FlickrPublishingAuthenticator.c"
+#line 777 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
-#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
-#line 2454 "FlickrPublishingAuthenticator.c"
+#line 784 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-#line 347 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 348 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:348: ACTION: installing login welco" \
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:108: ACTION: installing login welco" \
 "me pane");
-#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->host;
-#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked_spit_publishing_login_callback, self);
-#line 2473 "FlickrPublishingAuthenticator.c"
+#line 803 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 355 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:355: EVENT: user clicked 'Login' bu" \
+#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:115: EVENT: user clicked 'Login' bu" \
 "tton in the welcome pane");
-#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
-#line 2484 "FlickrPublishingAuthenticator.c"
+#line 814 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 2491 "FlickrPublishingAuthenticator.c"
+#line 821 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 2498 "FlickrPublishingAuthenticator.c"
+#line 828 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2513,52 +840,52 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
 	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 361 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:361: ACTION: running authentication" \
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:121: ACTION: running authentication" \
 " request transaction");
-#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->host;
-#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->host;
-#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _ ("Preparing for login…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->session;
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp3_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp2_);
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	txn = _tmp3_;
-#line 367 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2531 "FlickrPublishingAuthenticator.c"
+#line 861 "FlickrPublishingAuthenticator.c"
 	{
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2539 "FlickrPublishingAuthenticator.c"
+#line 869 "FlickrPublishingAuthenticator.c"
 				goto __catch1_spit_publishing_publishing_error;
 			}
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_critical ("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 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_clear_error (&_inner_error_);
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 2550 "FlickrPublishingAuthenticator.c"
+#line 880 "FlickrPublishingAuthenticator.c"
 		}
 	}
 	goto __finally1;
@@ -2567,36 +894,36 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_run_authenticatio
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
 		GError* _tmp5_;
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		err = _inner_error_;
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp4_ = self->priv->host;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp5_ = err;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 2571 "FlickrPublishingAuthenticator.c"
+#line 901 "FlickrPublishingAuthenticator.c"
 	}
 	__finally1:
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_clear_error (&_inner_error_);
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 2584 "FlickrPublishingAuthenticator.c"
+#line 914 "FlickrPublishingAuthenticator.c"
 	}
-#line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2588 "FlickrPublishingAuthenticator.c"
+#line 918 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2611,44 +938,44 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
 	PublishingRESTSupportTransaction* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-#line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 377 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = txn;
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = txn;
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp4_ = txn;
-#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp6_ = _tmp5_;
-#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:381: EVENT: OAuth authentication re" \
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:141: EVENT: OAuth authentication re" \
 "quest transaction completed; response = '%s'", _tmp6_);
-#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp6_);
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp7_ = txn;
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp9_ = _tmp8_;
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (self, _tmp9_);
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp9_);
-#line 2639 "FlickrPublishingAuthenticator.c"
+#line 969 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2659,34 +986,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_
 	guint _tmp3_;
 	SpitPublishingPluginHost* _tmp4_;
 	GError* _tmp5_;
-#line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = txn;
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 390 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = txn;
-#line 390 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 390 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:392: EVENT: OAuth authentication re" \
+#line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:152: EVENT: OAuth authentication re" \
 "quest transaction caused a network error");
-#line 393 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = self->priv->host;
-#line 393 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = err;
-#line 393 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 2676 "FlickrPublishingAuthenticator.c"
+#line 1006 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -2707,412 +1034,207 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_
 	const gchar* _tmp10_;
 	const gchar* _tmp16_;
 	const gchar* _tmp17_;
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (response != NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = response;
-#line 399 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:399: ACTION: parsing authorization " \
+#line 159 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:159: ACTION: parsing authorization " \
 "request response '%s' into token and secret", _tmp0_);
-#line 401 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token = NULL;
-#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token_secret = NULL;
-#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = response;
-#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = soup_form_decode (_tmp1_);
-#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	data = _tmp2_;
-#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp3_ = data;
-#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token);
-#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token = _tmp5_;
-#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp6_ = data;
-#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token_secret);
-#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	oauth_token_secret = _tmp8_;
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp10_ = oauth_token;
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp10_ == NULL) {
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp9_ = TRUE;
-#line 2741 "FlickrPublishingAuthenticator.c"
+#line 1071 "FlickrPublishingAuthenticator.c"
 	} else {
 		const gchar* _tmp11_;
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp11_ = oauth_token_secret;
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp9_ = _tmp11_ == NULL;
-#line 2748 "FlickrPublishingAuthenticator.c"
+#line 1078 "FlickrPublishingAuthenticator.c"
 	}
-#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp9_) {
-#line 2752 "FlickrPublishingAuthenticator.c"
+#line 1082 "FlickrPublishingAuthenticator.c"
 		SpitPublishingPluginHost* _tmp12_;
 		const gchar* _tmp13_;
 		GError* _tmp14_;
 		GError* _tmp15_;
-#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp12_ = self->priv->host;
-#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp13_ = response;
-#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_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 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp15_ = _tmp14_;
-#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
-#line 409 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (_tmp15_);
-#line 2769 "FlickrPublishingAuthenticator.c"
+#line 1099 "FlickrPublishingAuthenticator.c"
 	}
-#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp16_ = oauth_token;
-#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp17_ = oauth_token_secret;
-#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (self, _tmp16_, _tmp17_);
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (data);
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token_secret);
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (oauth_token);
-#line 2783 "FlickrPublishingAuthenticator.c"
+#line 1113 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_on_authentication_token_available (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token, const gchar* token_secret) {
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
 	const gchar* _tmp5_;
-#line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (token != NULL);
-#line 416 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (token_secret != NULL);
-#line 417 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = token;
-#line 417 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = token_secret;
-#line 417 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:417: EVENT: OAuth authentication to" \
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:177: EVENT: OAuth authentication to" \
 "ken (%s) and token secret (%s) available", _tmp0_, _tmp1_);
-#line 420 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->session;
-#line 420 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp3_ = token;
-#line 420 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp4_ = token_secret;
-#line 420 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
-#line 422 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_rest_support_oauth1_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = token;
-#line 422 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (self, _tmp5_);
-#line 2818 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-#line 425 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 426 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:426: EVENT: system browser launched" \
-".");
-#line 428 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (self);
-#line 2829 "FlickrPublishingAuthenticator.c"
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (self, _tmp5_);
+#line 1148 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed (PublishingAuthenticatorShotwellFlickrPinEntryPane* _sender, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) {
-#line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, sender, authorization_pin);
-#line 2836 "FlickrPublishingAuthenticator.c"
+static void _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_flickr_do_verify_pin ((PublishingAuthenticatorShotwellFlickrFlickr*) self, auth_code);
+#line 1155 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin) {
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_;
-	guint _tmp1_;
-	const gchar* _tmp2_;
-#line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_PIN_ENTRY_PANE (sender));
-#line 431 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (pin != NULL);
-#line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = sender;
-#line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("proceed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_PIN_ENTRY_PANE, &_tmp1_, NULL, FALSE);
-#line 432 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self);
-#line 434 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:434: EVENT: user clicked 'Continue'" \
-" in PIN entry pane.");
-#line 436 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = pin;
-#line 436 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (self, _tmp2_);
-#line 2862 "FlickrPublishingAuthenticator.c"
+static void _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error (PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _sender, gpointer self) {
+#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_flickr_on_web_login_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
+#line 1162 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
-	gchar* login_uri = NULL;
+static void publishing_authenticator_shotwell_flickr_flickr_do_web_authentication (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* pane = NULL;
 	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	const gchar* _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	PublishingAuthenticatorShotwellFlickrWebAuthenticationPane* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (token != NULL);
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = token;
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strconcat ("https://www.flickr.com/services/oauth/authorize?oauth_token=", _tmp0_, NULL);
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = _tmp1_;
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = g_strconcat (_tmp2_, "&perms=write", NULL);
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_;
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp2_);
-#line 440 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	login_uri = _tmp4_;
-#line 443 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = login_uri;
-#line 443 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:443: ACTION: launching system brows" \
-"er with uri = '%s'", _tmp5_);
-#line 2897 "FlickrPublishingAuthenticator.c"
-	{
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = login_uri;
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp8_ = _tmp7_;
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_spawn_command_line_async (_tmp8_, &_inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (_tmp8_);
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 2916 "FlickrPublishingAuthenticator.c"
-				goto __catch2_g_spawn_error;
-			}
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			_g_free0 (login_uri);
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_critical ("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 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			g_clear_error (&_inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-			return;
-#line 2927 "FlickrPublishingAuthenticator.c"
-		}
-	}
-	goto __finally2;
-	__catch2_g_spawn_error:
-	{
-		GError* e = NULL;
-		SpitPublishingPluginHost* _tmp9_;
-		GError* _tmp10_;
-		GError* _tmp11_;
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		e = _inner_error_;
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_inner_error_ = NULL;
-#line 448 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp9_ = self->priv->host;
-#line 448 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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 448 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp11_ = _tmp10_;
-#line 448 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp9_, _tmp11_);
-#line 448 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp11_);
-#line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (e);
-#line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (login_uri);
-#line 450 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		return;
-#line 2957 "FlickrPublishingAuthenticator.c"
-	}
-	__finally2:
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_free0 (login_uri);
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_clear_error (&_inner_error_);
-#line 445 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		return;
-#line 2970 "FlickrPublishingAuthenticator.c"
-	}
-#line 453 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_on_system_browser_launched (self);
-#line 439 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (login_uri);
-#line 2976 "FlickrPublishingAuthenticator.c"
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = publishing_authenticator_shotwell_flickr_web_authentication_pane_new (_tmp0_);
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	pane = _tmp1_;
+#line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_signal_connect_object (pane, "authorized", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_do_verify_pin_publishing_authenticator_shotwell_flickr_web_authentication_pane_authorized, self, 0);
+#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_signal_connect_object (pane, "error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_web_login_error_publishing_authenticator_shotwell_flickr_web_authentication_pane_error, self, 0);
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_object_unref0 (pane);
+#line 1191 "FlickrPublishingAuthenticator.c"
 }
 
 
-static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* pin_entry_pane = NULL;
-	GtkBuilder* _tmp7_;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp8_;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_;
-	SpitPublishingPluginHost* _tmp10_;
-	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp11_;
-	GError * _inner_error_ = NULL;
-#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+static void publishing_authenticator_shotwell_flickr_flickr_on_web_login_error (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	SpitPublishingPluginHost* _tmp0_;
+	GError* _tmp1_;
+	GError* _tmp2_;
+#line 192 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 457 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:457: ACTION: showing PIN entry pane");
-#line 459 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = gtk_builder_new ();
-#line 459 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	builder = _tmp0_;
-#line 2998 "FlickrPublishingAuthenticator.c"
-	{
-		GtkBuilder* _tmp1_;
-#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp1_ = builder;
-#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
-#line 462 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3007 "FlickrPublishingAuthenticator.c"
-			goto __catch3_g_error;
-		}
-	}
-	goto __finally3;
-	__catch3_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-		SpitPublishingPluginHost* _tmp4_;
-		GError* _tmp5_;
-		GError* _tmp6_;
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		e = _inner_error_;
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_inner_error_ = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp2_ = e;
-#line 465 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp3_ = _tmp2_->message;
-#line 465 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_warning ("FlickrPublishingAuthenticator.vala:465: Could not parse UI file! Error" \
-": %s.", _tmp3_);
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp4_ = self->priv->host;
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue."));
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = _tmp5_;
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp6_);
-#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (_tmp6_);
-#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_error_free0 (e);
-#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_object_unref0 (builder);
-#line 469 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		return;
-#line 3046 "FlickrPublishingAuthenticator.c"
-	}
-	__finally3:
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_g_object_unref0 (builder);
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		g_clear_error (&_inner_error_);
-#line 461 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		return;
-#line 3059 "FlickrPublishingAuthenticator.c"
-	}
-#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = builder;
-#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp7_);
-#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	pin_entry_pane = _tmp8_;
-#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = pin_entry_pane;
-#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_connect_object (_tmp9_, "proceed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed_publishing_authenticator_shotwell_flickr_pin_entry_pane_proceed, self, 0);
-#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = self->priv->host;
-#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = pin_entry_pane;
-#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (pin_entry_pane);
-#line 456 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (builder);
-#line 3081 "FlickrPublishingAuthenticator.c"
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, _ ("Flickr authorization failed"));
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = _tmp1_;
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_post_error (_tmp0_, _tmp2_);
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_error_free0 (_tmp2_);
+#line 1211 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
-#line 3088 "FlickrPublishingAuthenticator.c"
+#line 1218 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
-#line 3095 "FlickrPublishingAuthenticator.c"
+#line 1225 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3121,97 +1243,97 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (Publi
 	SpitPublishingPluginHost* _tmp1_;
 	SpitPublishingPluginHost* _tmp2_;
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp3_;
 	const gchar* _tmp4_;
 	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (pin != NULL);
-#line 478 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = pin;
-#line 478 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:478: ACTION: validating authorizati" \
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:197: ACTION: validating authorizati" \
 "on PIN %s", _tmp0_);
-#line 480 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = self->priv->host;
-#line 480 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->host;
-#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 200 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _ ("Verifying authorization…"), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = self->priv->session;
-#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp4_ = pin;
-#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp3_, _tmp4_);
-#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	txn = _tmp5_;
-#line 484 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 485 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3136 "FlickrPublishingAuthenticator.c"
+#line 1266 "FlickrPublishingAuthenticator.c"
 	{
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3144 "FlickrPublishingAuthenticator.c"
-				goto __catch4_spit_publishing_publishing_error;
+#line 1274 "FlickrPublishingAuthenticator.c"
+				goto __catch2_spit_publishing_publishing_error;
 			}
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_critical ("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 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			g_clear_error (&_inner_error_);
-#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 			return;
-#line 3155 "FlickrPublishingAuthenticator.c"
+#line 1285 "FlickrPublishingAuthenticator.c"
 		}
 	}
-	goto __finally4;
-	__catch4_spit_publishing_publishing_error:
+	goto __finally2;
+	__catch2_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp6_;
 		GError* _tmp7_;
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		err = _inner_error_;
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp6_ = self->priv->host;
-#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp7_ = err;
-#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (err);
-#line 3176 "FlickrPublishingAuthenticator.c"
+#line 1306 "FlickrPublishingAuthenticator.c"
 	}
-	__finally4:
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	__finally2:
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_clear_error (&_inner_error_);
-#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		return;
-#line 3189 "FlickrPublishingAuthenticator.c"
+#line 1319 "FlickrPublishingAuthenticator.c"
 	}
-#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3193 "FlickrPublishingAuthenticator.c"
+#line 1323 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3223,36 +1345,36 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
 	PublishingRESTSupportTransaction* _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 494 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 495 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = txn;
-#line 495 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 496 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = txn;
-#line 496 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 496 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 498 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:498: EVENT: fetching OAuth access t" \
+#line 217 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:217: EVENT: fetching OAuth access t" \
 "oken over the network succeeded");
-#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp4_ = txn;
-#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp6_ = _tmp5_;
-#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (self, _tmp6_);
-#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (_tmp6_);
-#line 3233 "FlickrPublishingAuthenticator.c"
+#line 1363 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3263,34 +1385,34 @@ static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetc
 	guint _tmp3_;
 	SpitPublishingPluginHost* _tmp4_;
 	GError* _tmp5_;
-#line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 503 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 505 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = txn;
-#line 505 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 505 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 506 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = txn;
-#line 506 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 506 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 508 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:508: EVENT: fetching OAuth access t" \
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:227: EVENT: fetching OAuth access t" \
 "oken over the network caused an error.");
-#line 510 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = self->priv->host;
-#line 510 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = err;
-#line 510 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 511 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 3270 "FlickrPublishingAuthenticator.c"
+#line 1400 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3317,334 +1439,159 @@ static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_ph
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
 	const gchar* _tmp17_;
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_return_if_fail (response != NULL);
-#line 515 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp0_ = response;
-#line 515 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:515: ACTION: extracting access phas" \
+#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:234: ACTION: extracting access phas" \
 "e credentials from '%s'", _tmp0_);
-#line 517 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	token = NULL;
-#line 518 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	token_secret = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	username = NULL;
-#line 521 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp1_ = response;
-#line 521 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp2_ = soup_form_decode (_tmp1_);
-#line 521 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	data = _tmp2_;
-#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp3_ = data;
-#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token);
-#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	token = _tmp5_;
-#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp6_ = data;
-#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token_secret);
-#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	token_secret = _tmp8_;
-#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp9_ = data;
-#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
-#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (username);
-#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	username = _tmp11_;
-#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp12_ = token;
-#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp13_ = token_secret;
-#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp14_ = username;
-#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_debug ("FlickrPublishingAuthenticator.vala:526: access phase credentials: { to" \
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:245: access phase credentials: { to" \
 "ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_tmp17_ = token;
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp17_ == NULL) {
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp16_ = TRUE;
-#line 3361 "FlickrPublishingAuthenticator.c"
+#line 1491 "FlickrPublishingAuthenticator.c"
 	} else {
 		const gchar* _tmp18_;
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp18_ = token_secret;
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp16_ = _tmp18_ == NULL;
-#line 3368 "FlickrPublishingAuthenticator.c"
+#line 1498 "FlickrPublishingAuthenticator.c"
 	}
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp16_) {
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp15_ = TRUE;
-#line 3374 "FlickrPublishingAuthenticator.c"
+#line 1504 "FlickrPublishingAuthenticator.c"
 	} else {
 		const gchar* _tmp19_;
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp19_ = username;
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp15_ = _tmp19_ == NULL;
-#line 3381 "FlickrPublishingAuthenticator.c"
+#line 1511 "FlickrPublishingAuthenticator.c"
 	}
-#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	if (_tmp15_) {
-#line 3385 "FlickrPublishingAuthenticator.c"
+#line 1515 "FlickrPublishingAuthenticator.c"
 		SpitPublishingPluginHost* _tmp20_;
 		GError* _tmp21_;
 		GError* _tmp22_;
-#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp20_ = self->priv->host;
-#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp22_ = _tmp21_;
-#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
-#line 530 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_g_error_free0 (_tmp22_);
-#line 533 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
-#line 3401 "FlickrPublishingAuthenticator.c"
+#line 1531 "FlickrPublishingAuthenticator.c"
 	} else {
-		PublishingAuthenticatorShotwellFlickrSession* _tmp23_;
+		PublishingRESTSupportOAuth1Session* _tmp23_;
 		const gchar* _tmp24_;
 		const gchar* _tmp25_;
 		const gchar* _tmp26_;
-#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		_tmp23_ = self->priv->session;
-#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp24_ = token;
-#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp25_ = token_secret;
-#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 		_tmp26_ = username;
-#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-		publishing_authenticator_shotwell_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 3417 "FlickrPublishingAuthenticator.c"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
+#line 1547 "FlickrPublishingAuthenticator.c"
 	}
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_hash_table_unref0 (data);
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (username);
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token_secret);
-#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	_g_free0 (token);
-#line 3427 "FlickrPublishingAuthenticator.c"
-}
-
-
-static GVariant* _variant_new3 (gchar* value) {
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3434 "FlickrPublishingAuthenticator.c"
-}
-
-
-static GVariant* _variant_new4 (gchar* value) {
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3441 "FlickrPublishingAuthenticator.c"
-}
-
-
-static GVariant* _variant_new5 (gchar* value) {
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3448 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self) {
-	GHashTable* _tmp0_;
-	gchar* _tmp1_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	GVariant* _tmp5_;
-	GHashTable* _tmp6_;
-	gchar* _tmp7_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	GVariant* _tmp11_;
-	GHashTable* _tmp12_;
-	gchar* _tmp13_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp14_;
-	gchar* _tmp15_;
-	gchar* _tmp16_;
-	GVariant* _tmp17_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp18_;
-	gchar* _tmp19_;
-	gchar* _tmp20_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp21_;
-	gchar* _tmp22_;
-	gchar* _tmp23_;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp24_;
-	gchar* _tmp25_;
-	gchar* _tmp26_;
-#line 539 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR (self));
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->params;
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp1_ = g_strdup ("AuthToken");
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp2_ = self->priv->session;
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp3_ = publishing_authenticator_shotwell_flickr_session_get_access_phase_token (_tmp2_);
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp4_ = _tmp3_;
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp5_ = _variant_new3 (_tmp4_);
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp0_, _tmp1_, _tmp5_);
-#line 540 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp4_);
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp6_ = self->priv->params;
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp7_ = g_strdup ("AuthTokenSecret");
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp8_ = self->priv->session;
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp9_ = publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (_tmp8_);
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp10_ = _tmp9_;
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp11_ = _variant_new4 (_tmp10_);
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp6_, _tmp7_, _tmp11_);
-#line 541 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp10_);
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp12_ = self->priv->params;
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp13_ = g_strdup ("Username");
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp14_ = self->priv->session;
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp15_ = publishing_authenticator_shotwell_flickr_session_get_username (_tmp14_);
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp16_ = _tmp15_;
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp17_ = _variant_new5 (_tmp16_);
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_hash_table_insert (_tmp12_, _tmp13_, _tmp17_);
-#line 542 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp16_);
-#line 544 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp18_ = self->priv->session;
-#line 544 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp19_ = publishing_authenticator_shotwell_flickr_session_get_access_phase_token (_tmp18_);
-#line 544 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp20_ = _tmp19_;
-#line 544 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (self, _tmp20_);
-#line 544 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp20_);
-#line 545 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp21_ = self->priv->session;
-#line 545 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp22_ = publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (_tmp21_);
-#line 545 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp23_ = _tmp22_;
-#line 545 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (self, _tmp23_);
-#line 545 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp23_);
-#line 546 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp24_ = self->priv->session;
-#line 546 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp25_ = publishing_authenticator_shotwell_flickr_session_get_username (_tmp24_);
-#line 546 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp26_ = _tmp25_;
-#line 546 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (self, _tmp26_);
-#line 546 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_free0 (_tmp26_);
-#line 549 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
-#line 3562 "FlickrPublishingAuthenticator.c"
+#line 1557 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass) {
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
 	publishing_authenticator_shotwell_flickr_flickr_parent_class = g_type_class_peek_parent (klass);
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFlickrFlickrPrivate));
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_flickr_flickr_finalize;
-#line 3573 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter;
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
-#line 3590 "FlickrPublishingAuthenticator.c"
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->authenticate = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_authenticate;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->can_logout = (gboolean (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_can_logout;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_logout;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_flickr_flickr_real_refresh;
+#line 1572 "FlickrPublishingAuthenticator.c"
 }
 
 
 static void publishing_authenticator_shotwell_flickr_flickr_instance_init (PublishingAuthenticatorShotwellFlickrFlickr * self) {
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_PRIVATE (self);
-#line 3597 "FlickrPublishingAuthenticator.c"
-}
-
-
-static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject * obj) {
-	PublishingAuthenticatorShotwellFlickrFlickr * self;
-	PublishingAuthenticatorShotwellFlickrSession* _tmp0_;
-	guint _tmp1_;
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
-#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_tmp0_ = self->priv->session;
-#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
-#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated_publishing_rest_support_session_authenticated, self);
-#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_hash_table_unref0 (self->priv->params);
-#line 262 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	_g_object_unref0 (self->priv->host);
-#line 260 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
-	G_OBJECT_CLASS (publishing_authenticator_shotwell_flickr_flickr_parent_class)->finalize (obj);
-#line 3621 "FlickrPublishingAuthenticator.c"
 }
 
 
@@ -3652,32 +1599,12 @@ GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) {
 	static volatile gsize publishing_authenticator_shotwell_flickr_flickr_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_authenticator_shotwell_flickr_flickr_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFlickrFlickrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_flickr_flickr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFlickrFlickr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_flickr_flickr_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_authenticator_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_flickr_flickr_spit_publishing_authenticator_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_authenticator_shotwell_flickr_flickr_type_id;
-		publishing_authenticator_shotwell_flickr_flickr_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellFlickrFlickr", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_authenticator_shotwell_flickr_flickr_type_id, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &spit_publishing_authenticator_info);
+		publishing_authenticator_shotwell_flickr_flickr_type_id = g_type_register_static (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, "PublishingAuthenticatorShotwellFlickrFlickr", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_authenticator_shotwell_flickr_flickr_type_id__volatile, publishing_authenticator_shotwell_flickr_flickr_type_id);
 	}
 	return publishing_authenticator_shotwell_flickr_flickr_type_id__volatile;
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
 
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
index e389908..97629ed 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
@@ -4,318 +4,82 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+using Shotwell.Plugins;
+
 namespace Publishing.Authenticator.Shotwell.Flickr {
     internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
     internal const string EXPIRED_SESSION_ERROR_CODE = "98";
-    internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
-
-    internal class Transaction : Publishing.RESTSupport.Transaction {
-        public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
-                Publishing.RESTSupport.HttpMethod.POST) {
-            base(session, method);
-            setup_arguments();
-        }
-
-        public Transaction.with_uri(Session session, string uri,
-                Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
-            base.with_endpoint_url(session, uri, method);
-            setup_arguments();
-        }
-
-        private void setup_arguments() {
-            var session = (Session) get_parent_session();
-
-            add_argument("oauth_nonce", session.get_oauth_nonce());
-            add_argument("oauth_signature_method", "HMAC-SHA1");
-            add_argument("oauth_version", "1.0");
-            add_argument("oauth_callback", "oob");
-            add_argument("oauth_timestamp", session.get_oauth_timestamp());
-            add_argument("oauth_consumer_key", session.get_consumer_key());
-        }
-
-
-        public override void execute() throws Spit.Publishing.PublishingError {
-            ((Session) get_parent_session()).sign_transaction(this);
-
-            base.execute();
-        }
-    }
-
-    internal class Session : Publishing.RESTSupport.Session {
-        private string? request_phase_token = null;
-        private string? request_phase_token_secret = null;
-        private string? access_phase_token = null;
-        private string? access_phase_token_secret = null;
-        private string? username = null;
-        private string? consumer_key = null;
-        private string? consumer_secret = null;
-
-        public Session() {
-            base();
-        }
-
-        public override bool is_authenticated() {
-            return (access_phase_token != null && access_phase_token_secret != null &&
-                    username != null);
-        }
-
-        public void authenticate_from_persistent_credentials(string token, string secret,
-                string username) {
-            this.access_phase_token = token;
-            this.access_phase_token_secret = secret;
-            this.username = username;
-
-            this.authenticated();
-        }
-
-        public void deauthenticate() {
-            access_phase_token = null;
-            access_phase_token_secret = null;
-            username = null;
-        }
-
-        public void set_api_credentials(string consumer_key, string consumer_secret) {
-            this.consumer_key = consumer_key;
-            this.consumer_secret = consumer_secret;
-        }
-
-        public void sign_transaction(Publishing.RESTSupport.Transaction txn) {
-            string http_method = txn.get_method().to_string();
-
-            debug("signing transaction with parameters:");
-            debug("HTTP method = " + http_method);
-
-            Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
-
-            Publishing.RESTSupport.Argument[] sorted_args =
-                Publishing.RESTSupport.Argument.sort(base_string_arguments);
-
-            string arguments_string = "";
-            for (int i = 0; i < sorted_args.length; i++) {
-                arguments_string += (sorted_args[i].key + "=" + sorted_args[i].value);
-                if (i < sorted_args.length - 1)
-                    arguments_string += "&";
-            }
-
-            string? signing_key = null;
-            if (access_phase_token_secret != null) {
-                debug("access phase token secret available; using it as signing key");
-
-                signing_key = consumer_secret + "&" + access_phase_token_secret;
-            } else if (request_phase_token_secret != null) {
-                debug("request phase token secret available; using it as signing key");
-
-                signing_key = consumer_secret + "&" + request_phase_token_secret;
-            } else {
-                debug("neither access phase nor request phase token secrets available; using API " +
-                        "key as signing key");
-
-                signing_key = consumer_secret + "&";
-            }
-
-            string signature_base_string = http_method + "&" + Soup.URI.encode(
-                    txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
-                Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
-
-            debug("signature base string = '%s'", signature_base_string);
-
-            debug("signing key = '%s'", signing_key);
-
-            // compute the signature
-            string signature = RESTSupport.hmac_sha1(signing_key, signature_base_string);
-            signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
-
-            debug("signature = '%s'", signature);
-
-            txn.add_argument("oauth_signature", signature);
-        }
-
-        public void set_request_phase_credentials(string token, string secret) {
-            this.request_phase_token = token;
-            this.request_phase_token_secret = secret;
-        }
-
-        public void set_access_phase_credentials(string token, string secret, string username) {
-            this.access_phase_token = token;
-            this.access_phase_token_secret = secret;
-            this.username = username;
-
-            authenticated();
-        }
-
-        public string get_oauth_nonce() {
-            TimeVal currtime = TimeVal();
-            currtime.get_current_time();
-
-            return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
-                    currtime.tv_usec.to_string());
-        }
-
-        public string get_oauth_timestamp() {
-            return GLib.get_real_time().to_string().substring(0, 10);
-        }
-
-        public string get_consumer_key() {
-            assert(consumer_key != null);
-            return consumer_key;
-        }
-
-        public string get_request_phase_token() {
-            assert(request_phase_token != null);
-            return request_phase_token;
-        }
-
-        public string get_access_phase_token() {
-            assert(access_phase_token != null);
-            return access_phase_token;
-        }
 
-        public string get_access_phase_token_secret() {
-            assert(access_phase_token_secret != null);
-            return access_phase_token_secret;
-        }
-
-        public string get_username() {
-            assert(is_authenticated());
-            return username;
-        }
-    }
     internal const string API_KEY = "60dd96d4a2ad04888b09c9e18d82c26f";
     internal const string API_SECRET = "d0960565e03547c1";
 
     internal const string SERVICE_WELCOME_MESSAGE =
         _("You are not currently logged into Flickr.\n\nClick Log in to log into Flickr in your Web browser. You will have to authorize Shotwell Connect to link to your Flickr account.");
 
-    internal class AuthenticationRequestTransaction : Transaction {
-        public AuthenticationRequestTransaction(Session session) {
+    internal class AuthenticationRequestTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+        public AuthenticationRequestTransaction(Publishing.RESTSupport.OAuth1.Session session) {
             base.with_uri(session, "https://www.flickr.com/services/oauth/request_token",
                     Publishing.RESTSupport.HttpMethod.GET);
+            add_argument("oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
         }
     }
 
-    internal class AccessTokenFetchTransaction : Transaction {
-        public AccessTokenFetchTransaction(Session session, string user_verifier) {
+    internal class AccessTokenFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+        public AccessTokenFetchTransaction(Publishing.RESTSupport.OAuth1.Session session, string user_verifier) {
             base.with_uri(session, "https://www.flickr.com/services/oauth/access_token",
                     Publishing.RESTSupport.HttpMethod.GET);
             add_argument("oauth_verifier", user_verifier);
             add_argument("oauth_token", session.get_request_phase_token());
+            add_argument("oauth_callback", "shotwell-auth%3A%2F%2Flocal-callback");
         }
     }
 
-    internal class PinEntryPane : Spit.Publishing.DialogPane, GLib.Object {
-        private Gtk.Box pane_widget = null;
-        private Gtk.Button continue_button = null;
-        private Gtk.Entry pin_entry = null;
-        private Gtk.Label pin_entry_caption = null;
-        private Gtk.Label explanatory_text = null;
-        private Gtk.Builder builder = null;
-
-        public signal void proceed(PinEntryPane sender, string authorization_pin);
-
-        public PinEntryPane(Gtk.Builder builder) {
-            this.builder = builder;
-            assert(builder != null);
-            assert(builder.get_objects().length() > 0);
-
-            explanatory_text = builder.get_object("explanatory_text") as Gtk.Label;
-            pin_entry_caption = builder.get_object("pin_entry_caption") as Gtk.Label;
-            pin_entry = builder.get_object("pin_entry") as Gtk.Entry;
-            continue_button = builder.get_object("continue_button") as Gtk.Button;
-
-            pane_widget = builder.get_object("pane_widget") as Gtk.Box;
+    internal class WebAuthenticationPane : Common.WebAuthenticationPane {
+        private string? auth_code = null;
+        private const string LOGIN_URI = "https://www.flickr.com/services/oauth/authorize?oauth_token=%s&perms=write";
 
-            pane_widget.show_all();
+        public signal void authorized(string auth_code);
+        public signal void error();
 
-            on_pin_entry_contents_changed();
+        public WebAuthenticationPane(string token) {
+            Object(login_uri : LOGIN_URI.printf(token));
         }
 
-        private void on_continue_clicked() {
-            proceed(this, pin_entry.get_text());
-        }
+        public override void constructed() {
+            base.constructed();
 
-        private void on_pin_entry_contents_changed() {
-            continue_button.set_sensitive(pin_entry.text_length > 0);
+            var ctx = WebKit.WebContext.get_default();
+            ctx.register_uri_scheme("shotwell-auth", this.on_shotwell_auth_request_cb);
         }
 
-        public Gtk.Widget get_widget() {
-            return pane_widget;
-        }
+        public override void on_page_load() {
+            var uri = new Soup.URI(get_view().get_uri());
+            if (uri.scheme == "shotwell-auth" && this.auth_code == null) {
+                this.error();
+            }
 
-        public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-            return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+            if (this.auth_code != null) {
+                this.authorized(this.auth_code);
+            }
         }
 
-        public void on_pane_installed() {
-            continue_button.clicked.connect(on_continue_clicked);
-            pin_entry.changed.connect(on_pin_entry_contents_changed);
-        }
+        private void on_shotwell_auth_request_cb(WebKit.URISchemeRequest request) {
+            var uri = new Soup.URI(request.get_uri());
+            var form_data = Soup.Form.decode (uri.query);
+            this.auth_code = form_data.lookup("oauth_verifier");
 
-        public void on_pane_uninstalled() {
-            continue_button.clicked.disconnect(on_continue_clicked);
-            pin_entry.changed.disconnect(on_pin_entry_contents_changed);
+            var response = "";
+            var mins = new MemoryInputStream.from_data(response.data, null);
+            request.finish(mins, -1, "text/plain");
         }
     }
 
-
-    internal class Flickr : GLib.Object, Spit.Publishing.Authenticator {
-        private GLib.HashTable<string, Variant> params;
-        private Session session;
-        private Spit.Publishing.PluginHost host;
-
+    internal class Flickr : Publishing.Authenticator.Shotwell.OAuth1.Authenticator {
         public Flickr(Spit.Publishing.PluginHost host) {
-            base();
-
-            this.host = host;
-            params = new GLib.HashTable<string, Variant>(str_hash, str_equal);
-            params.insert("ConsumerKey", API_KEY);
-            params.insert("ConsumerSecret", API_SECRET);
-
-            session = new Session();
-            session.set_api_credentials(API_KEY, API_SECRET);
-            session.authenticated.connect(on_session_authenticated);
-        }
-
-        ~Flickr() {
-            session.authenticated.disconnect(on_session_authenticated);
-        }
-
-        public void invalidate_persistent_session() {
-            set_persistent_access_phase_token("");
-            set_persistent_access_phase_token_secret("");
-            set_persistent_access_phase_username("");
-        }
-
-        private bool is_persistent_session_valid() {
-            return (get_persistent_access_phase_username() != null &&
-                    get_persistent_access_phase_token() != null &&
-                    get_persistent_access_phase_token_secret() != null);
-        }
-
-        private string? get_persistent_access_phase_username() {
-            return host.get_config_string("access_phase_username", null);
-        }
-
-        private void set_persistent_access_phase_username(string username) {
-            host.set_config_string("access_phase_username", username);
-        }
-
-        private string? get_persistent_access_phase_token() {
-            return host.get_config_string("access_phase_token", null);
+            base(API_KEY, API_SECRET, host);
         }
 
-        private void set_persistent_access_phase_token(string token) {
-            host.set_config_string("access_phase_token", token);
-        }
-
-        private string? get_persistent_access_phase_token_secret() {
-            return host.get_config_string("access_phase_token_secret", null);
-        }
-
-        private void set_persistent_access_phase_token_secret(string secret) {
-            host.set_config_string("access_phase_token_secret", secret);
-        }
-
-        public void authenticate() {
+        public override void authenticate() {
             if (is_persistent_session_valid()) {
                 debug("attempt start: a persistent session is available; using it");
 
@@ -327,20 +91,16 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
             }
         }
 
-        public bool can_logout() {
+        public override bool can_logout() {
             return true;
         }
 
-        public GLib.HashTable<string, Variant> get_authentication_parameter() {
-            return this.params;
-        }
-
-        public void logout () {
+        public override void logout () {
             session.deauthenticate();
             invalidate_persistent_session();
         }
 
-        public void refresh() {
+        public override void refresh() {
             // No-Op with flickr
         }
 
@@ -419,59 +179,18 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
 
             session.set_request_phase_credentials(token, token_secret);
 
-            do_launch_system_browser(token);
+            do_web_authentication(token);
         }
 
-        private void on_system_browser_launched() {
-            debug("EVENT: system browser launched.");
-
-            do_show_pin_entry_pane();
+        private void do_web_authentication(string token) {
+            var pane = new WebAuthenticationPane(token);
+            host.install_dialog_pane(pane);
+            pane.authorized.connect(this.do_verify_pin);
+            pane.error.connect(this.on_web_login_error);
         }
 
-        private void on_pin_entry_proceed(PinEntryPane sender, string pin) {
-            sender.proceed.disconnect(on_pin_entry_proceed);
-
-            debug("EVENT: user clicked 'Continue' in PIN entry pane.");
-
-            do_verify_pin(pin);
-        }
-
-        private void do_launch_system_browser(string token) {
-            string login_uri = "https://www.flickr.com/services/oauth/authorize?oauth_token=" + token +
-                "&perms=write";
-
-            debug("ACTION: launching system browser with uri = '%s'", login_uri);
-
-            try {
-                Process.spawn_command_line_async("xdg-open " + login_uri);
-            } catch (SpawnError e) {
-                host.post_error(new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                            "couldn't launch system web browser to complete Flickr login"));
-                return;
-            }
-
-            on_system_browser_launched();
-        }
-
-        private void do_show_pin_entry_pane() {
-            debug("ACTION: showing PIN entry pane");
-
-            Gtk.Builder builder = new Gtk.Builder();
-
-            try {
-                builder.add_from_resource (Resources.RESOURCE_PATH + "/" +
-                        "flickr_pin_entry_pane.ui");
-            } catch (Error e) {
-                warning("Could not parse UI file! Error: %s.", e.message);
-                host.post_error(
-                        new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                            _("A file required for publishing is unavailable. Publishing to Flickr can’t continue.")));
-                return;
-            }
-
-            PinEntryPane pin_entry_pane = new PinEntryPane(builder);
-            pin_entry_pane.proceed.connect(on_pin_entry_proceed);
-            host.install_dialog_pane(pin_entry_pane);
+        private void on_web_login_error() {
+            host.post_error(new Spit.Publishing.PublishingError.PROTOCOL_ERROR(_("Flickr authorization failed")));
         }
 
         private void do_verify_pin(string pin) {
@@ -536,17 +255,5 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
             }
         }
 
-        private void on_session_authenticated() {
-            params.insert("AuthToken", session.get_access_phase_token());
-            params.insert("AuthTokenSecret", session.get_access_phase_token_secret());
-            params.insert("Username", session.get_username());
-
-            set_persistent_access_phase_token(session.get_access_phase_token());
-            set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
-            set_persistent_access_phase_username(session.get_username());
-
-
-            this.authenticated();
-        }
     }
 }
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index b531dd6..9f9972f 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -1373,7 +1373,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1368 "GoogleAuthenticator.c"
-				goto __catch5_spit_publishing_publishing_error;
+				goto __catch3_spit_publishing_publishing_error;
 			}
 #line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (tokens_txn);
@@ -1386,8 +1386,8 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 #line 1379 "GoogleAuthenticator.c"
 		}
 	}
-	goto __finally5;
-	__catch5_spit_publishing_publishing_error:
+	goto __finally3;
+	__catch3_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
@@ -1406,7 +1406,7 @@ static void publishing_authenticator_shotwell_google_google_do_get_access_tokens
 		_g_error_free0 (err);
 #line 1400 "GoogleAuthenticator.c"
 	}
-	__finally5:
+	__finally3:
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1562,11 +1562,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 #line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1554 "GoogleAuthenticator.c"
-			goto __catch6_g_error;
+			goto __catch4_g_error;
 		}
 	}
-	goto __finally6;
-	__catch6_g_error:
+	goto __finally4;
+	__catch4_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -1608,7 +1608,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_tokens (P
 		return;
 #line 1599 "GoogleAuthenticator.c"
 	}
-	__finally6:
+	__finally4:
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -1965,11 +1965,11 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 #line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1954 "GoogleAuthenticator.c"
-			goto __catch7_g_error;
+			goto __catch5_g_error;
 		}
 	}
-	goto __finally7;
-	__catch7_g_error:
+	goto __finally5;
+	__catch5_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
@@ -1988,7 +1988,7 @@ static void publishing_authenticator_shotwell_google_google_do_fetch_username (P
 		_g_error_free0 (err);
 #line 1976 "GoogleAuthenticator.c"
 	}
-	__finally7:
+	__finally5:
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2126,11 +2126,11 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 #line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2112 "GoogleAuthenticator.c"
-			goto __catch8_g_error;
+			goto __catch6_g_error;
 		}
 	}
-	goto __finally8;
-	__catch8_g_error:
+	goto __finally6;
+	__catch6_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2172,7 +2172,7 @@ static void publishing_authenticator_shotwell_google_google_do_extract_username
 		return;
 #line 2157 "GoogleAuthenticator.c"
 	}
-	__finally8:
+	__finally6:
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
@@ -2361,7 +2361,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 2346 "GoogleAuthenticator.c"
-				goto __catch9_spit_publishing_publishing_error;
+				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
@@ -2374,8 +2374,8 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 #line 2357 "GoogleAuthenticator.c"
 		}
 	}
-	goto __finally9;
-	__catch9_spit_publishing_publishing_error:
+	goto __finally7;
+	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
@@ -2394,7 +2394,7 @@ static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_
 		_g_error_free0 (err);
 #line 2378 "GoogleAuthenticator.c"
 	}
-	__finally9:
+	__finally7:
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.c b/plugins/authenticator/shotwell/OAuth1Authenticator.c
new file mode 100644
index 0000000..4fe57ef
--- /dev/null
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.c
@@ -0,0 +1,711 @@
+/* OAuth1Authenticator.c generated by valac 0.36.6, the Vala compiler
+ * generated from OAuth1Authenticator.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <stdlib.h>
+#include <string.h>
+#include "shotwell-plugin-common.h"
+
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+
+typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate;
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
+#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+struct _PublishingAuthenticatorShotwellOAuth1Authenticator {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate * priv;
+	GHashTable* params;
+	PublishingRESTSupportOAuth1Session* session;
+	SpitPublishingPluginHost* host;
+};
+
+struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass {
+	GObjectClass parent_class;
+	void (*authenticate) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	gboolean (*can_logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*refresh) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+};
+
+
+static gpointer publishing_authenticator_shotwell_oauth1_authenticator_parent_class = NULL;
+static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = NULL;
+
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_DUMMY_PROPERTY
+};
+void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+static void _g_free0_ (gpointer var);
+static void _g_variant_unref0_ (gpointer var);
+static GVariant* _variant_new1 (const gchar* value);
+static GVariant* _variant_new2 (const gchar* value);
+void publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static gboolean publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
+void publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret);
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username);
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static GVariant* _variant_new3 (gchar* value);
+static GVariant* _variant_new4 (gchar* value);
+static GVariant* _variant_new5 (gchar* value);
+static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj);
+
+
+static void _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated ((PublishingAuthenticatorShotwellOAuth1Authenticator*) self);
+#line 92 "OAuth1Authenticator.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 99 "OAuth1Authenticator.c"
+}
+
+
+static void _g_free0_ (gpointer var) {
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	var = (g_free (var), NULL);
+#line 106 "OAuth1Authenticator.c"
+}
+
+
+static void _g_variant_unref0_ (gpointer var) {
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
+#line 113 "OAuth1Authenticator.c"
+}
+
+
+static GVariant* _variant_new1 (const gchar* value) {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 120 "OAuth1Authenticator.c"
+}
+
+
+static GVariant* _variant_new2 (const gchar* value) {
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 127 "OAuth1Authenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorShotwellOAuth1Authenticator * self = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	GHashFunc _tmp2_;
+	GEqualFunc _tmp3_;
+	GHashTable* _tmp4_;
+	GHashTable* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	GVariant* _tmp8_;
+	GHashTable* _tmp9_;
+	gchar* _tmp10_;
+	const gchar* _tmp11_;
+	GVariant* _tmp12_;
+	PublishingRESTSupportOAuth1Session* _tmp13_;
+	PublishingRESTSupportOAuth1Session* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
+	PublishingRESTSupportOAuth1Session* _tmp17_;
+#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (api_key != NULL, NULL);
+#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (api_secret != NULL, NULL);
+#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self = (PublishingAuthenticatorShotwellOAuth1Authenticator*) g_object_new (object_type, NULL);
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = host;
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_object_unref0 (self->host);
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self->host = _tmp1_;
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp2_ = g_str_hash;
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp3_ = g_str_equal;
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_hash_table_unref0 (self->params);
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self->params = _tmp4_;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp5_ = self->params;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp6_ = g_strdup ("ConsumerKey");
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp7_ = api_key;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp8_ = _variant_new1 (_tmp7_);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_hash_table_insert (_tmp5_, _tmp6_, _tmp8_);
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp9_ = self->params;
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp10_ = g_strdup ("ConsumerSecret");
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp11_ = api_secret;
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp12_ = _variant_new2 (_tmp11_);
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_hash_table_insert (_tmp9_, _tmp10_, _tmp12_);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp13_ = publishing_rest_support_oauth1_session_new (NULL);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_publishing_rest_support_session_unref0 (self->session);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self->session = _tmp13_;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp14_ = self->session;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp15_ = api_key;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp16_ = api_secret;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp14_, _tmp15_, _tmp16_);
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp17_ = self->session;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
+#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return self;
+#line 217 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_authenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return;
+#line 226 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 33 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->authenticate (self);
+#line 235 "OAuth1Authenticator.c"
+}
+
+
+static gboolean publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	gboolean _tmp0_ = FALSE;
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_can_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return _tmp0_;
+#line 245 "OAuth1Authenticator.c"
+}
+
+
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), FALSE);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->can_logout (self);
+#line 254 "OAuth1Authenticator.c"
+}
+
+
+static gpointer _g_hash_table_ref0 (gpointer self) {
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return self ? g_hash_table_ref (self) : NULL;
+#line 261 "OAuth1Authenticator.c"
+}
+
+
+static GHashTable* publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellOAuth1Authenticator * self;
+	GHashTable* result = NULL;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->params;
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	result = _tmp1_;
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return result;
+#line 280 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return;
+#line 289 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->logout (self);
+#line 298 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_critical ("Type `%s' does not implement abstract method `publishing_authenticator_shotwell_oauth1_authenticator_refresh'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return;
+#line 307 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS (self)->refresh (self);
+#line 316 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (self, "");
+#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (self, "");
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (self, "");
+#line 329 "OAuth1Authenticator.c"
+}
+
+
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
+#line 50 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), FALSE);
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (self);
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp3_ = _tmp2_;
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp4_ = _tmp3_ != NULL;
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp3_);
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	if (_tmp4_) {
+#line 352 "OAuth1Authenticator.c"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp5_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (self);
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp6_ = _tmp5_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp1_ = _tmp6_ != NULL;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_g_free0 (_tmp6_);
+#line 363 "OAuth1Authenticator.c"
+	} else {
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp1_ = FALSE;
+#line 367 "OAuth1Authenticator.c"
+	}
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	if (_tmp1_) {
+#line 371 "OAuth1Authenticator.c"
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp7_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (self);
+#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp8_ = _tmp7_;
+#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp0_ = _tmp8_ != NULL;
+#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_g_free0 (_tmp8_);
+#line 382 "OAuth1Authenticator.c"
+	} else {
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+		_tmp0_ = FALSE;
+#line 386 "OAuth1Authenticator.c"
+	}
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	result = _tmp0_;
+#line 51 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return result;
+#line 392 "OAuth1Authenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	result = _tmp1_;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return result;
+#line 410 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* username) {
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
+#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (username != NULL);
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = username;
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
+#line 427 "OAuth1Authenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+#line 64 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), NULL);
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", NULL);
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	result = _tmp1_;
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return result;
+#line 445 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* token) {
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (token != NULL);
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = token;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
+#line 462 "OAuth1Authenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self), NULL);
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", NULL);
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	result = _tmp1_;
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return result;
+#line 480 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self, const gchar* secret) {
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
+#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (secret != NULL);
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->host;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = secret;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
+#line 497 "OAuth1Authenticator.c"
+}
+
+
+static GVariant* _variant_new3 (gchar* value) {
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 504 "OAuth1Authenticator.c"
+}
+
+
+static GVariant* _variant_new4 (gchar* value) {
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 511 "OAuth1Authenticator.c"
+}
+
+
+static GVariant* _variant_new5 (gchar* value) {
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 518 "OAuth1Authenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated (PublishingAuthenticatorShotwellOAuth1Authenticator* self) {
+	GHashTable* _tmp0_;
+	gchar* _tmp1_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GVariant* _tmp5_;
+	GHashTable* _tmp6_;
+	gchar* _tmp7_;
+	PublishingRESTSupportOAuth1Session* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	GVariant* _tmp11_;
+	GHashTable* _tmp12_;
+	gchar* _tmp13_;
+	PublishingRESTSupportOAuth1Session* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	GVariant* _tmp17_;
+	PublishingRESTSupportOAuth1Session* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	PublishingRESTSupportOAuth1Session* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	PublishingRESTSupportOAuth1Session* _tmp24_;
+	gchar* _tmp25_;
+	gchar* _tmp26_;
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR (self));
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->params;
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp1_ = g_strdup ("AuthToken");
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp2_ = self->session;
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp3_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp2_);
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp4_ = _tmp3_;
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp5_ = _variant_new3 (_tmp4_);
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_hash_table_insert (_tmp0_, _tmp1_, _tmp5_);
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp4_);
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp6_ = self->params;
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp7_ = g_strdup ("AuthTokenSecret");
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp8_ = self->session;
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp9_ = publishing_rest_support_oauth1_session_get_access_phase_token_secret (_tmp8_);
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp10_ = _tmp9_;
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp11_ = _variant_new4 (_tmp10_);
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_hash_table_insert (_tmp6_, _tmp7_, _tmp11_);
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp10_);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp12_ = self->params;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp13_ = g_strdup ("Username");
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp14_ = self->session;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp15_ = publishing_rest_support_oauth1_session_get_username (_tmp14_);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp16_ = _tmp15_;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp17_ = _variant_new5 (_tmp16_);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_hash_table_insert (_tmp12_, _tmp13_, _tmp17_);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp16_);
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp18_ = self->session;
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp19_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp18_);
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp20_ = _tmp19_;
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token (self, _tmp20_);
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp20_);
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp21_ = self->session;
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp22_ = publishing_rest_support_oauth1_session_get_access_phase_token_secret (_tmp21_);
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp23_ = _tmp22_;
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_token_secret (self, _tmp23_);
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp23_);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp24_ = self->session;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp25_ = publishing_rest_support_oauth1_session_get_username (_tmp24_);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp26_ = _tmp25_;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_set_persistent_access_phase_username (self, _tmp26_);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_free0 (_tmp26_);
+#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
+#line 632 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_class_init (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass * klass) {
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_parent_class = g_type_class_peek_parent (klass);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->authenticate = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_authenticate;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->can_logout = (gboolean (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_can_logout;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_logout;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_refresh;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_oauth1_authenticator_finalize;
+#line 649 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	iface->authenticate = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_authenticate;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	iface->can_logout = (gboolean (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_can_logout;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	iface->get_authentication_parameter = (GHashTable* (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_real_get_authentication_parameter;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	iface->logout = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_logout;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_oauth1_authenticator_refresh;
+#line 666 "OAuth1Authenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_instance_init (PublishingAuthenticatorShotwellOAuth1Authenticator * self) {
+}
+
+
+static void publishing_authenticator_shotwell_oauth1_authenticator_finalize (GObject * obj) {
+	PublishingAuthenticatorShotwellOAuth1Authenticator * self;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	guint _tmp1_;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator);
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_tmp0_ = self->session;
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_oauth1_authenticator_on_session_authenticated_publishing_rest_support_session_authenticated, self);
+#line 11 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_hash_table_unref0 (self->params);
+#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_publishing_rest_support_session_unref0 (self->session);
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	_g_object_unref0 (self->host);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/OAuth1Authenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_oauth1_authenticator_parent_class)->finalize (obj);
+#line 694 "OAuth1Authenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellOAuth1AuthenticatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellOAuth1Authenticator), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_authenticator_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_oauth1_authenticator_spit_publishing_authenticator_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_authenticator_shotwell_oauth1_authenticator_type_id;
+		publishing_authenticator_shotwell_oauth1_authenticator_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellOAuth1Authenticator", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+		g_type_add_interface_static (publishing_authenticator_shotwell_oauth1_authenticator_type_id, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &spit_publishing_authenticator_info);
+		g_once_init_leave (&publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile, publishing_authenticator_shotwell_oauth1_authenticator_type_id);
+	}
+	return publishing_authenticator_shotwell_oauth1_authenticator_type_id__volatile;
+}
+
+
+
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.vala b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
new file mode 100644
index 0000000..399b66f
--- /dev/null
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
@@ -0,0 +1,96 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+namespace Publishing.Authenticator.Shotwell.OAuth1 {
+
+    internal abstract class Authenticator : GLib.Object, Spit.Publishing.Authenticator {
+        protected GLib.HashTable<string, Variant> params;
+        protected Publishing.RESTSupport.OAuth1.Session session;
+        protected Spit.Publishing.PluginHost host;
+
+        public Authenticator(string api_key, string api_secret, Spit.Publishing.PluginHost host) {
+            base();
+            this.host = host;
+
+            params = new GLib.HashTable<string, Variant>(str_hash, str_equal);
+            params.insert("ConsumerKey", api_key);
+            params.insert("ConsumerSecret", api_secret);
+
+            session = new Publishing.RESTSupport.OAuth1.Session();
+            session.set_api_credentials(api_key, api_secret);
+            session.authenticated.connect(on_session_authenticated);
+        }
+
+        ~Authenticator() {
+            session.authenticated.disconnect(on_session_authenticated);
+        }
+
+        // Methods from Authenticator interface
+        public abstract void authenticate();
+
+        public abstract bool can_logout();
+
+        public GLib.HashTable<string, Variant> get_authentication_parameter() {
+            return this.params;
+        }
+
+        public abstract void logout ();
+
+        public abstract void refresh();
+
+        public void invalidate_persistent_session() {
+            set_persistent_access_phase_token("");
+            set_persistent_access_phase_token_secret("");
+            set_persistent_access_phase_username("");
+        }
+        protected bool is_persistent_session_valid() {
+            return (get_persistent_access_phase_username() != null &&
+                    get_persistent_access_phase_token() != null &&
+                    get_persistent_access_phase_token_secret() != null);
+        }
+
+        protected string? get_persistent_access_phase_username() {
+            return host.get_config_string("access_phase_username", null);
+        }
+
+        protected void set_persistent_access_phase_username(string username) {
+            host.set_config_string("access_phase_username", username);
+        }
+
+        protected string? get_persistent_access_phase_token() {
+            return host.get_config_string("access_phase_token", null);
+        }
+
+        protected void set_persistent_access_phase_token(string token) {
+            host.set_config_string("access_phase_token", token);
+        }
+
+        protected string? get_persistent_access_phase_token_secret() {
+            return host.get_config_string("access_phase_token_secret", null);
+        }
+
+        protected void set_persistent_access_phase_token_secret(string secret) {
+            host.set_config_string("access_phase_token_secret", secret);
+        }
+
+
+        protected void on_session_authenticated() {
+            params.insert("AuthToken", session.get_access_phase_token());
+            params.insert("AuthTokenSecret", session.get_access_phase_token_secret());
+            params.insert("Username", session.get_username());
+
+            set_persistent_access_phase_token(session.get_access_phase_token());
+            set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
+            set_persistent_access_phase_username(session.get_username());
+
+
+            this.authenticated();
+        }
+
+    }
+
+}
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
index 2d42463..6ac8485 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -23,6 +23,16 @@ typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFacto
 typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+
+typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
+
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR (publishing_authenticator_shotwell_flickr_flickr_get_type ())
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr))
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrClass))
@@ -53,6 +63,16 @@ typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingA
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
 typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
 
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR (publishing_authenticator_shotwell_tumblr_tumblr_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblr PublishingAuthenticatorShotwellTumblrTumblr;
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblrClass PublishingAuthenticatorShotwellTumblrTumblrClass;
+
 struct _PublishingAuthenticatorFactory {
 	GObject parent_instance;
 	PublishingAuthenticatorFactoryPrivate * priv;
@@ -79,6 +99,7 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host);
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
 GType publishing_authenticator_shotwell_flickr_flickr_get_type (void) G_GNUC_CONST;
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
@@ -86,13 +107,16 @@ GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC
 PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
 PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host);
 GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
+GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
 static void publishing_authenticator_factory_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 96 "ShotwellAuthenticatorFactory.c"
+#line 120 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -105,7 +129,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	_tmp0_ = publishing_authenticator_factory_instance;
 #line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	if (_tmp0_ == NULL) {
-#line 109 "ShotwellAuthenticatorFactory.c"
+#line 133 "ShotwellAuthenticatorFactory.c"
 		PublishingAuthenticatorFactory* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		_tmp1_ = publishing_authenticator_factory_new ();
@@ -113,7 +137,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 		_g_object_unref0 (publishing_authenticator_factory_instance);
 #line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		publishing_authenticator_factory_instance = _tmp1_;
-#line 117 "ShotwellAuthenticatorFactory.c"
+#line 141 "ShotwellAuthenticatorFactory.c"
 	}
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp2_ = publishing_authenticator_factory_instance;
@@ -123,7 +147,7 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (v
 	result = _tmp3_;
 #line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 127 "ShotwellAuthenticatorFactory.c"
+#line 151 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -146,11 +170,13 @@ static GeeList* publishing_authenticator_factory_real_get_available_authenticato
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "picasa");
 #line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "youtube");
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "tumblr");
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
-#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return result;
-#line 154 "ShotwellAuthenticatorFactory.c"
+#line 180 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -160,122 +186,143 @@ static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	static GQuark _tmp2_label4 = 0;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	g_return_val_if_fail (provider != NULL, NULL);
-#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp0_ = provider;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp1_ = _tmp0_;
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("flickr")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 188 "ShotwellAuthenticatorFactory.c"
+#line 216 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 				SpitPublishingPluginHost* _tmp4_;
 				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_;
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp4_ = host;
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp5_ = publishing_authenticator_shotwell_flickr_flickr_new (_tmp4_);
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 201 "ShotwellAuthenticatorFactory.c"
+#line 229 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("facebook")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 207 "ShotwellAuthenticatorFactory.c"
+#line 235 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 				SpitPublishingPluginHost* _tmp6_;
 				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp6_ = host;
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp7_ = publishing_authenticator_shotwell_facebook_facebook_new (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 220 "ShotwellAuthenticatorFactory.c"
+#line 248 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("picasa")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 226 "ShotwellAuthenticatorFactory.c"
+#line 254 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 				SpitPublishingPluginHost* _tmp8_;
 				PublishingAuthenticatorShotwellGoogleGoogle* _tmp9_;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp8_ = host;
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp9_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _ ("You are not currently logged into Picasa Web Albums.\n" \
 "\n" \
 "Click Log in to log into Picasa Web Albums in your Web browser. You wi" \
 "ll have to authorize Shotwell Connect to link to your Picasa Web Album" \
 "s account."), _tmp8_);
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 239 "ShotwellAuthenticatorFactory.c"
+#line 267 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("youtube")))) {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 245 "ShotwellAuthenticatorFactory.c"
+#line 273 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
 				SpitPublishingPluginHost* _tmp10_;
 				PublishingAuthenticatorShotwellGoogleGoogle* _tmp11_;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp10_ = host;
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				_tmp11_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _ ("You are not currently logged into YouTube.\n" \
 "\n" \
 "You must have already signed up for a Google account and set it up for" \
 " use with YouTube to continue. You can set up most accounts by using y" \
 "our browser to log into the YouTube site at least once."), _tmp10_);
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
-#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 286 "ShotwellAuthenticatorFactory.c"
+			}
+		}
+	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("tumblr")))) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+		switch (0) {
+#line 292 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				SpitPublishingPluginHost* _tmp12_;
+				PublishingAuthenticatorShotwellTumblrTumblr* _tmp13_;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp12_ = host;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp13_ = publishing_authenticator_shotwell_tumblr_tumblr_new (_tmp12_);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 258 "ShotwellAuthenticatorFactory.c"
+#line 305 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	} else {
-#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 		switch (0) {
-#line 264 "ShotwellAuthenticatorFactory.c"
+#line 311 "ShotwellAuthenticatorFactory.c"
 			default:
 			{
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				result = NULL;
-#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 				return result;
-#line 271 "ShotwellAuthenticatorFactory.c"
+#line 318 "ShotwellAuthenticatorFactory.c"
 			}
 		}
 	}
@@ -288,14 +335,14 @@ PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GTyp
 	self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return self;
-#line 284 "ShotwellAuthenticatorFactory.c"
+#line 331 "ShotwellAuthenticatorFactory.c"
 }
 
 
 PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void) {
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	return publishing_authenticator_factory_construct (PUBLISHING_AUTHENTICATOR_TYPE_FACTORY);
-#line 291 "ShotwellAuthenticatorFactory.c"
+#line 338 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -304,7 +351,7 @@ static void publishing_authenticator_factory_class_init (PublishingAuthenticator
 	publishing_authenticator_factory_parent_class = g_type_class_peek_parent (klass);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_factory_finalize;
-#line 300 "ShotwellAuthenticatorFactory.c"
+#line 347 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -315,7 +362,7 @@ static void publishing_authenticator_factory_spit_publishing_authenticator_facto
 	iface->get_available_authenticators = (GeeList* (*) (SpitPublishingAuthenticatorFactory *)) publishing_authenticator_factory_real_get_available_authenticators;
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	iface->create = (SpitPublishingAuthenticator* (*) (SpitPublishingAuthenticatorFactory *, const gchar*, SpitPublishingPluginHost*)) publishing_authenticator_factory_real_create;
-#line 311 "ShotwellAuthenticatorFactory.c"
+#line 358 "ShotwellAuthenticatorFactory.c"
 }
 
 
@@ -329,7 +376,7 @@ static void publishing_authenticator_factory_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
 #line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
 	G_OBJECT_CLASS (publishing_authenticator_factory_parent_class)->finalize (obj);
-#line 325 "ShotwellAuthenticatorFactory.c"
+#line 372 "ShotwellAuthenticatorFactory.c"
 }
 
 
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
index 17980e6..0d813ac 100644
--- a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
@@ -16,6 +16,7 @@ namespace Publishing.Authenticator {
             list.add("facebook");
             list.add("picasa");
             list.add("youtube");
+            list.add("tumblr");
 
             return list;
         }
@@ -32,6 +33,8 @@ namespace Publishing.Authenticator {
 
                 case "youtube":
                     return new Shotwell.Google.Google("https://gdata.youtube.com/", _("You are not currently logged into YouTube.\n\nYou must have already signed up for a Google account and set it up for use with YouTube to continue. You can set up most accounts by using your browser to log into the YouTube site at least once."), host);
+                case "tumblr":
+                    return new Shotwell.Tumblr.Tumblr(host);
                 default:
                     return null;
             }
diff --git a/plugins/authenticator/shotwell/TumblrAuthenticator.c b/plugins/authenticator/shotwell/TumblrAuthenticator.c
new file mode 100644
index 0000000..1ebc0f4
--- /dev/null
+++ b/plugins/authenticator/shotwell/TumblrAuthenticator.c
@@ -0,0 +1,1393 @@
+/* TumblrAuthenticator.c generated by valac 0.36.6, the Vala compiler
+ * generated from TumblrAuthenticator.vala, do not modify */
+
+/* Copyright 2012 BJA Electronics
+ * Copyright 2017 Jens Georg
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ * Author: Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+#include "shotwell-plugin-common.h"
+#include <libsoup/soup.h>
+
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE (publishing_authenticator_shotwell_tumblr_authentication_pane_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass))
+
+typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPane PublishingAuthenticatorShotwellTumblrAuthenticationPane;
+typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass;
+typedef struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_TYPE_MODE (publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type ())
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL
+};
+static guint publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction;
+typedef struct _PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionPrivate PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR (publishing_authenticator_shotwell_oauth1_authenticator_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_IS_AUTHENTICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_AUTHENTICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1AuthenticatorClass))
+
+typedef struct _PublishingAuthenticatorShotwellOAuth1Authenticator PublishingAuthenticatorShotwellOAuth1Authenticator;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass PublishingAuthenticatorShotwellOAuth1AuthenticatorClass;
+typedef struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR (publishing_authenticator_shotwell_tumblr_tumblr_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblrClass))
+
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblr PublishingAuthenticatorShotwellTumblrTumblr;
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblrClass PublishingAuthenticatorShotwellTumblrTumblrClass;
+typedef struct _PublishingAuthenticatorShotwellTumblrTumblrPrivate PublishingAuthenticatorShotwellTumblrTumblrPrivate;
+#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
+
+struct _PublishingAuthenticatorShotwellTumblrAuthenticationPane {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate {
+	GtkBox* pane_widget;
+	GtkBuilder* builder;
+	GtkEntry* username_entry;
+	GtkEntry* password_entry;
+	GtkButton* login_button;
+};
+
+typedef enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO,
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER
+} PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode;
+
+struct _PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction {
+	PublishingRESTSupportOAuth1Transaction parent_instance;
+	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass {
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellOAuth1Authenticator {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellOAuth1AuthenticatorPrivate * priv;
+	GHashTable* params;
+	PublishingRESTSupportOAuth1Session* session;
+	SpitPublishingPluginHost* host;
+};
+
+struct _PublishingAuthenticatorShotwellOAuth1AuthenticatorClass {
+	GObjectClass parent_class;
+	void (*authenticate) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	gboolean (*can_logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*logout) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+	void (*refresh) (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+};
+
+struct _PublishingAuthenticatorShotwellTumblrTumblr {
+	PublishingAuthenticatorShotwellOAuth1Authenticator parent_instance;
+	PublishingAuthenticatorShotwellTumblrTumblrPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellTumblrTumblrClass {
+	PublishingAuthenticatorShotwellOAuth1AuthenticatorClass parent_class;
+};
+
+
+static gpointer publishing_authenticator_shotwell_tumblr_authentication_pane_parent_class = NULL;
+static gchar* publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
+static gchar* publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE = NULL;
+static gchar* publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+static gchar* publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
+static SpitPublishingDialogPaneIface * publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static gpointer publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_tumblr_tumblr_parent_class = NULL;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
+GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_DUMMY_PROPERTY
+};
+GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) G_GNUC_CONST;
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self);
+static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
+static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj);
+GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
+};
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password);
+GType publishing_authenticator_shotwell_oauth1_authenticator_get_type (void) G_GNUC_CONST;
+GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TUMBLR_DUMMY_PROPERTY
+};
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellOAuth1Authenticator* publishing_authenticator_shotwell_oauth1_authenticator_construct (GType object_type, const gchar* api_key, const gchar* api_secret, SpitPublishingPluginHost* host);
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+gboolean publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+gchar* publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode);
+static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+void publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (PublishingAuthenticatorShotwellOAuth1Authenticator* self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err);
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response);
+
+
+GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile)) {
+		static const GEnumValue values[] = {{PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
+		GType publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id;
+		publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id = g_enum_register_static ("PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode", values);
+		g_once_init_leave (&publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile, publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id);
+	}
+	return publishing_authenticator_shotwell_tumblr_authentication_pane_mode_type_id__volatile;
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 221 "TumblrAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
+#line 228 "TumblrAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
+#line 235 "TumblrAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked ((PublishingAuthenticatorShotwellTumblrAuthenticationPane*) self);
+#line 242 "TumblrAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_construct (GType object_type, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self = NULL;
+	GtkBox* _tmp0_;
+	GError * _inner_error_ = NULL;
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellTumblrAuthenticationPane*) g_object_new (object_type, NULL);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_object_ref_sink (_tmp0_);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self->priv->pane_widget = _tmp0_;
+#line 260 "TumblrAuthenticator.c"
+	{
+		GtkBuilder* _tmp1_;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
+		GtkWidget* content = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GtkWidget* _tmp6_;
+		GtkLabel* message_label = NULL;
+		GtkBuilder* _tmp7_;
+		GObject* _tmp8_;
+		GtkLabel* _tmp9_;
+		PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp10_;
+		GtkBuilder* _tmp17_;
+		GObject* _tmp18_;
+		GtkEntry* _tmp19_;
+		GtkBuilder* _tmp20_;
+		GObject* _tmp21_;
+		GtkEntry* _tmp22_;
+		GtkBuilder* _tmp23_;
+		GObject* _tmp24_;
+		GtkButton* _tmp25_;
+		GtkEntry* _tmp26_;
+		GtkEntry* _tmp27_;
+		GtkButton* _tmp28_;
+		GtkWidget* _tmp29_;
+		GtkContainer* _tmp30_;
+		GtkContainer* _tmp31_;
+		GtkWidget* _tmp32_;
+		GtkBox* _tmp33_;
+		GtkWidget* _tmp34_;
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp1_ = gtk_builder_new ();
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (self->priv->builder);
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		self->priv->builder = _tmp1_;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp2_ = self->priv->builder;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 304 "TumblrAuthenticator.c"
+			goto __catch8_g_error;
+		}
+#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp3_ = self->priv->builder;
+#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		gtk_builder_connect_signals (_tmp3_, NULL);
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp4_ = self->priv->builder;
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		content = _tmp6_;
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp7_ = self->priv->builder;
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
+#line 45 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		message_label = _tmp9_;
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp10_ = mode;
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		switch (_tmp10_) {
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO:
+#line 333 "TumblrAuthenticator.c"
+			{
+				GtkLabel* _tmp11_;
+				const gchar* _tmp12_;
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp11_ = message_label;
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp12_ = publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE;
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				gtk_label_set_text (_tmp11_, _tmp12_);
+#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				break;
+#line 345 "TumblrAuthenticator.c"
+			}
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			case PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
+#line 349 "TumblrAuthenticator.c"
+			{
+				GtkLabel* _tmp13_;
+				const gchar* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp13_ = message_label;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp14_ = publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_tmp16_ = _tmp15_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				gtk_label_set_markup (_tmp13_, _tmp16_);
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				_g_free0 (_tmp16_);
+#line 54 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+				break;
+#line 369 "TumblrAuthenticator.c"
+			}
+			default:
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			break;
+#line 374 "TumblrAuthenticator.c"
+		}
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp17_ = self->priv->builder;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (self->priv->username_entry);
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		self->priv->username_entry = _tmp19_;
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp20_ = self->priv->builder;
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (self->priv->password_entry);
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		self->priv->password_entry = _tmp22_;
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp23_ = self->priv->builder;
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (self->priv->login_button);
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		self->priv->login_button = _tmp25_;
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp26_ = self->priv->username_entry;
+#line 65 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp27_ = self->priv->password_entry;
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp28_ = self->priv->login_button;
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp29_ = content;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp30_ = gtk_widget_get_parent (_tmp29_);
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp31_ = _tmp30_;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp32_ = content;
+#line 69 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		gtk_container_remove (_tmp31_, _tmp32_);
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp33_ = self->priv->pane_widget;
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp34_ = content;
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (message_label);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_object_unref0 (content);
+#line 438 "TumblrAuthenticator.c"
+	}
+	goto __finally8;
+	__catch8_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp35_;
+		const gchar* _tmp36_;
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		e = _inner_error_;
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp35_ = e;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp36_ = _tmp35_->message;
+#line 72 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_warning (_ ("Could not load UI: %s"), _tmp36_);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_error_free0 (e);
+#line 458 "TumblrAuthenticator.c"
+	}
+	__finally8:
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		return NULL;
+#line 469 "TumblrAuthenticator.c"
+	}
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return self;
+#line 473 "TumblrAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellTumblrAuthenticationPane* publishing_authenticator_shotwell_tumblr_authentication_pane_new (PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return publishing_authenticator_shotwell_tumblr_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, mode);
+#line 480 "TumblrAuthenticator.c"
+}
+
+
+GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+	GtkWidget* result = NULL;
+	GtkButton* _tmp0_;
+	GtkWidget* _tmp1_;
+#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self), NULL);
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = self->priv->login_button;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	result = _tmp1_;
+#line 77 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return result;
+#line 498 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_login_button_clicked (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
+#line 80 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = self->priv->username_entry;
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = gtk_entry_get_text (_tmp0_);
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = self->priv->password_entry;
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = gtk_entry_get_text (_tmp2_);
+#line 81 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_emit (self, publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
+#line 519 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_user_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+#line 86 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
+#line 87 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
+#line 528 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_on_password_changed (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
+#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
+#line 537 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (PublishingAuthenticatorShotwellTumblrAuthenticationPane* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkEntry* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
+	GtkButton* _tmp7_;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_AUTHENTICATION_PANE (self));
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = self->priv->username_entry;
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = _tmp2_;
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (_tmp3_ > ((guint) 0)) {
+#line 557 "TumblrAuthenticator.c"
+		GtkEntry* _tmp4_;
+		guint _tmp5_;
+		guint _tmp6_;
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp4_ = self->priv->password_entry;
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp5_ = gtk_entry_get_text_length (_tmp4_);
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp6_ = _tmp5_;
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp0_ = _tmp6_ > ((guint) 0);
+#line 569 "TumblrAuthenticator.c"
+	} else {
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp0_ = FALSE;
+#line 573 "TumblrAuthenticator.c"
+	}
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp7_ = self->priv->login_button;
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 579 "TumblrAuthenticator.c"
+}
+
+
+static GtkWidget* publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
+	GtkWidget* result = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = self->priv->pane_widget;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	result = _tmp1_;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return result;
+#line 598 "TumblrAuthenticator.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
+#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return result;
+#line 611 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
+	GtkEntry* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkButton* _tmp2_;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = self->priv->username_entry;
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = self->priv->password_entry;
+#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	gtk_entry_set_activates_default (_tmp1_, TRUE);
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = self->priv->login_button;
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_update_login_button_sensitivity (self);
+#line 636 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
+#line 644 "TumblrAuthenticator.c"
+}
+
+
+static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2);
+	register GMarshalFunc_VOID__STRING_STRING callback;
+	register GCClosure * cc;
+	register gpointer data1;
+	register gpointer data2;
+	cc = (GCClosure *) closure;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (n_param_values == 3);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (G_CCLOSURE_SWAP_DATA (closure)) {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		data1 = closure->data;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		data2 = param_values->data[0].v_pointer;
+#line 663 "TumblrAuthenticator.c"
+	} else {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		data1 = param_values->data[0].v_pointer;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		data2 = closure->data;
+#line 669 "TumblrAuthenticator.c"
+	}
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
+#line 675 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_class_init (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass * klass) {
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPanePrivate));
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_tumblr_authentication_pane_finalize;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = g_strdup (_ ("Enter the username and password associated with your Tumblr account."));
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_INTRO_MESSAGE = _tmp0_;
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
+#line 698 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_widget;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_get_preferred_geometry;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_installed;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_authenticator_shotwell_tumblr_authentication_pane_real_on_pane_uninstalled;
+#line 713 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init (PublishingAuthenticatorShotwellTumblrAuthenticationPane * self) {
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_GET_PRIVATE (self);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self->priv->pane_widget = NULL;
+#line 722 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_authentication_pane_finalize (GObject * obj) {
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane * self;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellTumblrAuthenticationPane);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->username_entry);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->password_entry);
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (self->priv->login_button);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_tumblr_authentication_pane_parent_class)->finalize (obj);
+#line 742 "TumblrAuthenticator.c"
+}
+
+
+/**
+     * The authentication pane used when asking service URL, user name and password
+     * from the user.
+     */
+GType publishing_authenticator_shotwell_tumblr_authentication_pane_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_tumblr_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_authenticator_shotwell_tumblr_authentication_pane_type_id;
+		publishing_authenticator_shotwell_tumblr_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellTumblrAuthenticationPane", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_authenticator_shotwell_tumblr_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile, publishing_authenticator_shotwell_tumblr_authentication_pane_type_id);
+	}
+	return publishing_authenticator_shotwell_tumblr_authentication_pane_type_id__volatile;
+}
+
+
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_val_if_fail (username != NULL, NULL);
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_val_if_fail (password != NULL, NULL);
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = session;
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = username;
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_ENCODE_RFC_3986_EXTRA);
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = _tmp2_;
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (_tmp3_);
+#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp4_ = password;
+#line 123 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
+#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return self;
+#line 799 "TumblrAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session, const gchar* username, const gchar* password) {
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
+#line 806 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass * klass) {
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 813 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_instance_init, NULL };
+		GType publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id;
+		publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile, publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id);
+	}
+	return publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_type_id__volatile;
+}
+
+
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_construct (GType object_type, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorShotwellTumblrTumblr * self = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = host;
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellTumblrTumblr*) publishing_authenticator_shotwell_oauth1_authenticator_construct (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_KEY, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_API_SECRET, _tmp0_);
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return self;
+#line 844 "TumblrAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellTumblrTumblr* publishing_authenticator_shotwell_tumblr_tumblr_new (SpitPublishingPluginHost* host) {
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return publishing_authenticator_shotwell_tumblr_tumblr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, host);
+#line 851 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+	PublishingAuthenticatorShotwellTumblrTumblr * self;
+	gboolean _tmp0_;
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
+#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_oauth1_authenticator_is_persistent_session_valid (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (_tmp0_) {
+#line 864 "TumblrAuthenticator.c"
+		PublishingRESTSupportOAuth1Session* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_debug ("TumblrAuthenticator.vala:135: attempt start: a persistent session is a" \
+"vailable; using it");
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp2_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp3_ = _tmp2_;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp4_ = publishing_authenticator_shotwell_oauth1_authenticator_get_persistent_access_phase_token_secret (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp5_ = _tmp4_;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, "");
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_free0 (_tmp5_);
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_free0 (_tmp3_);
+#line 888 "TumblrAuthenticator.c"
+	} else {
+#line 140 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_debug ("TumblrAuthenticator.vala:140: attempt start: no persistent session ava" \
+"ilable; showing login welcome pane");
+#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_AUTHENTICATION_PANE_MODE_INTRO);
+#line 894 "TumblrAuthenticator.c"
+	}
+}
+
+
+static gboolean publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+	PublishingAuthenticatorShotwellTumblrTumblr * self;
+	gboolean result = FALSE;
+#line 146 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
+#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	result = TRUE;
+#line 147 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	return result;
+#line 908 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_logout (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+	PublishingAuthenticatorShotwellTumblrTumblr * self;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
+#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_rest_support_oauth1_session_deauthenticate (_tmp0_);
+#line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_oauth1_authenticator_invalidate_persistent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator));
+#line 923 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_real_refresh (PublishingAuthenticatorShotwellOAuth1Authenticator* base) {
+	PublishingAuthenticatorShotwellTumblrTumblr * self;
+#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_TYPE_TUMBLR, PublishingAuthenticatorShotwellTumblrTumblr);
+#line 931 "TumblrAuthenticator.c"
+}
+
+
+/**
+         * Action that shows the authentication pane.
+         *
+         * This action method shows the authentication pane. It is shown at the
+         * very beginning of the interaction when no persistent parameters are found
+         * or after a failed login attempt using persisted parameters. It can be
+         * given a mode flag to specify whether it should be displayed in initial
+         * mode or in any of the error modes that it supports.
+         *
+         * @param mode the mode for the authentication pane
+         */
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login (PublishingAuthenticatorShotwellTumblrAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
+#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked ((PublishingAuthenticatorShotwellTumblrTumblr*) self, user, password);
+#line 949 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_show_authentication_pane (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode mode) {
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane* authentication_pane = NULL;
+	PublishingAuthenticatorShotwellTumblrAuthenticationPaneMode _tmp1_;
+	PublishingAuthenticatorShotwellTumblrAuthenticationPane* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
+#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:171: ACTION: installing authentication pane");
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = mode;
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = publishing_authenticator_shotwell_tumblr_authentication_pane_new (_tmp1_);
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	authentication_pane = _tmp2_;
+#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked_publishing_authenticator_shotwell_tumblr_authentication_pane_login, self, 0);
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp5_ = publishing_authenticator_shotwell_tumblr_authentication_pane_get_default_widget (authentication_pane);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp6_ = _tmp5_;
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (_tmp6_);
+#line 170 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_object_unref0 (authentication_pane);
+#line 994 "TumblrAuthenticator.c"
+}
+
+
+/**
+         * Event triggered when the login button in the authentication panel is
+         * clicked.
+         *
+         * This event is triggered when the login button in the authentication
+         * panel is clicked. It then triggers a network login interaction.
+         *
+         * @param username the name of the Tumblr user as entered in the dialog
+         * @param password the password of the Tumblr as entered in the dialog
+         */
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_authentication_pane_login_clicked (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (username != NULL);
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (password != NULL);
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:191: EVENT: on_authentication_pane_login_clic" \
+"ked");
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = username;
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = password;
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (self, _tmp0_, _tmp1_);
+#line 1025 "TumblrAuthenticator.c"
+}
+
+
+/**
+         * Action to perform a network login to a Tumblr blog.
+         *
+         * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
+         *
+         * @param username the name of the Tumblr user used to login
+         * @param password the password of the Tumblr user used to login
+         */
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender);
+#line 1040 "TumblrAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellTumblrTumblr*) self, _sender, err);
+#line 1047 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_network_login (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* username, const gchar* password) {
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* txn = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingAuthenticatorShotwellTumblrAccessTokenFetchTransaction* _tmp5_;
+	GError * _inner_error_ = NULL;
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (username != NULL);
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (password != NULL);
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:205: ACTION: logging in");
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = username;
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp4_ = password;
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp5_ = publishing_authenticator_shotwell_tumblr_access_token_fetch_transaction_new (_tmp2_, _tmp3_, _tmp4_);
+#line 209 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	txn = _tmp5_;
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 1090 "TumblrAuthenticator.c"
+	{
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 1098 "TumblrAuthenticator.c"
+				goto __catch9_spit_publishing_publishing_error;
+			}
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			_publishing_rest_support_transaction_unref0 (txn);
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			g_critical ("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 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			g_clear_error (&_inner_error_);
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+			return;
+#line 1109 "TumblrAuthenticator.c"
+		}
+	}
+	goto __finally9;
+	__catch9_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp6_;
+		GError* _tmp7_;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		err = _inner_error_;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp7_ = err;
+#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_error_free0 (err);
+#line 1130 "TumblrAuthenticator.c"
+	}
+	__finally9:
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		return;
+#line 1143 "TumblrAuthenticator.c"
+	}
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 1147 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingRESTSupportTransaction* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = txn;
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = txn;
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp4_ = txn;
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp6_ = _tmp5_;
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:224: EVENT: OAuth authentication request tran" \
+"saction completed; response = '%s'", _tmp6_);
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (_tmp6_);
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp7_ = txn;
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp9_ = _tmp8_;
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (self, _tmp9_);
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (_tmp9_);
+#line 1198 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error (PublishingAuthenticatorShotwellTumblrTumblr* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GError* _tmp5_;
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = txn;
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = txn;
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_authenticator_shotwell_tumblr_tumblr_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:235: EVENT: OAuth authentication request tran" \
+"saction caused a network error");
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp5_ = err;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+#line 1233 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellTumblrTumblr* self, const gchar* response) {
+	const gchar* _tmp0_;
+	gchar* token = NULL;
+	gchar* token_secret = NULL;
+	GHashTable* data = NULL;
+	const gchar* _tmp1_;
+	GHashTable* _tmp2_;
+	GHashTable* _tmp3_;
+	gconstpointer _tmp4_ = NULL;
+	gchar* _tmp5_;
+	GHashTable* _tmp6_;
+	gconstpointer _tmp7_ = NULL;
+	gchar* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	gboolean _tmp11_ = FALSE;
+	const gchar* _tmp12_;
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_TUMBLR_IS_TUMBLR (self));
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_return_if_fail (response != NULL);
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp0_ = response;
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:240: ACTION: extracting access phase credenti" \
+"als from '%s'", _tmp0_);
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	token = NULL;
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	token_secret = NULL;
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp1_ = response;
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp2_ = soup_form_decode (_tmp1_);
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	data = _tmp2_;
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp3_ = data;
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (token);
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	token = _tmp5_;
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp6_ = data;
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (token_secret);
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp8_ = g_strdup (_tmp7_);
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	token_secret = _tmp8_;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp9_ = token;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp10_ = token_secret;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	g_debug ("TumblrAuthenticator.vala:249: access phase credentials: { token = '%s'" \
+"; token_secret = '%s' }", _tmp9_, _tmp10_);
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_tmp12_ = token;
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (_tmp12_ == NULL) {
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp11_ = TRUE;
+#line 1304 "TumblrAuthenticator.c"
+	} else {
+		const gchar* _tmp13_;
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp13_ = token_secret;
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp11_ = _tmp13_ == NULL;
+#line 1311 "TumblrAuthenticator.c"
+	}
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	if (_tmp11_) {
+#line 1315 "TumblrAuthenticator.c"
+		SpitPublishingPluginHost* _tmp14_;
+		GError* _tmp15_;
+		GError* _tmp16_;
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->host;
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp15_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Expected " "access phase credentials to contain token and token secret but at " "least one of these is absent");
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp16_ = _tmp15_;
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp14_, _tmp16_);
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_g_error_free0 (_tmp16_);
+#line 256 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
+#line 1331 "TumblrAuthenticator.c"
+	} else {
+		PublishingRESTSupportOAuth1Session* _tmp17_;
+		const gchar* _tmp18_;
+		const gchar* _tmp19_;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, PublishingAuthenticatorShotwellOAuth1Authenticator)->session;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp18_ = token;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		_tmp19_ = token_secret;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+		publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp17_, _tmp18_, _tmp19_, "");
+#line 1344 "TumblrAuthenticator.c"
+	}
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_hash_table_unref0 (data);
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (token_secret);
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	_g_free0 (token);
+#line 1352 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_class_init (PublishingAuthenticatorShotwellTumblrTumblrClass * klass) {
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	publishing_authenticator_shotwell_tumblr_tumblr_parent_class = g_type_class_peek_parent (klass);
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->authenticate = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_authenticate;
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->can_logout = (gboolean (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_can_logout;
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->logout = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_logout;
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/TumblrAuthenticator.vala"
+	((PublishingAuthenticatorShotwellOAuth1AuthenticatorClass *) klass)->refresh = (void (*) (PublishingAuthenticatorShotwellOAuth1Authenticator *)) publishing_authenticator_shotwell_tumblr_tumblr_real_refresh;
+#line 1367 "TumblrAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_tumblr_tumblr_instance_init (PublishingAuthenticatorShotwellTumblrTumblr * self) {
+}
+
+
+GType publishing_authenticator_shotwell_tumblr_tumblr_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellTumblrTumblrClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellTumblrTumblr), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_tumblr_tumblr_instance_init, NULL };
+		GType publishing_authenticator_shotwell_tumblr_tumblr_type_id;
+		publishing_authenticator_shotwell_tumblr_tumblr_type_id = g_type_register_static (PUBLISHING_AUTHENTICATOR_SHOTWELL_OAUTH1_TYPE_AUTHENTICATOR, "PublishingAuthenticatorShotwellTumblrTumblr", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile, publishing_authenticator_shotwell_tumblr_tumblr_type_id);
+	}
+	return publishing_authenticator_shotwell_tumblr_tumblr_type_id__volatile;
+}
+
+
+
diff --git a/plugins/authenticator/shotwell/TumblrAuthenticator.vala b/plugins/authenticator/shotwell/TumblrAuthenticator.vala
new file mode 100644
index 0000000..35fdce9
--- /dev/null
+++ b/plugins/authenticator/shotwell/TumblrAuthenticator.vala
@@ -0,0 +1,262 @@
+/* Copyright 2012 BJA Electronics
+ * Copyright 2017 Jens Georg
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ * Author: Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+namespace Publishing.Authenticator.Shotwell.Tumblr {
+    internal const string ENDPOINT_URL = "https://www.tumblr.com/";
+    internal const string API_KEY = "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k";
+    internal const string API_SECRET = "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi";
+    internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
+
+    /**
+     * The authentication pane used when asking service URL, user name and password
+     * from the user.
+     */
+    internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
+        public enum Mode {
+            INTRO,
+            FAILED_RETRY_USER
+        }
+        private static string INTRO_MESSAGE = _("Enter the username and password associated with your Tumblr account.");
+        private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
+
+        private Gtk.Box pane_widget = null;
+        private Gtk.Builder builder;
+        private Gtk.Entry username_entry;
+        private Gtk.Entry password_entry;
+        private Gtk.Button login_button;
+
+        public signal void login(string user, string password);
+
+        public AuthenticationPane(Mode mode = Mode.INTRO) {
+            this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+
+            try {
+                builder = new Gtk.Builder();
+                builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
+                builder.connect_signals(null);
+                var content = builder.get_object ("content") as Gtk.Widget;
+
+                Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
+                switch (mode) {
+                    case Mode.INTRO:
+                        message_label.set_text(INTRO_MESSAGE);
+                        break;
+
+                    case Mode.FAILED_RETRY_USER:
+                        message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
+                                        "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
+                        break;
+                }
+
+                username_entry = builder.get_object ("username_entry") as Gtk.Entry;
+
+                password_entry = builder.get_object ("password_entry") as Gtk.Entry;
+
+
+
+                login_button = builder.get_object("login_button") as Gtk.Button;
+
+                username_entry.changed.connect(on_user_changed);
+                password_entry.changed.connect(on_password_changed);
+                login_button.clicked.connect(on_login_button_clicked);
+
+                content.parent.remove (content);
+                pane_widget.add (content);
+            } catch (Error e) {
+                warning(_("Could not load UI: %s"), e.message);
+            }
+        }
+
+        public Gtk.Widget get_default_widget() {
+            return login_button;
+        }
+
+        private void on_login_button_clicked() {
+            login(username_entry.get_text(),
+                    password_entry.get_text());
+        }
+
+
+        private void on_user_changed() {
+            update_login_button_sensitivity();
+        }
+
+        private void on_password_changed() {
+            update_login_button_sensitivity();
+        }
+
+        private void update_login_button_sensitivity() {
+            login_button.set_sensitive(username_entry.text_length > 0 &&
+                    password_entry.text_length > 0);
+        }
+
+        public Gtk.Widget get_widget() {
+            return pane_widget;
+        }
+
+        public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
+            return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+        }
+
+        public void on_pane_installed() {
+            username_entry.grab_focus();
+            password_entry.set_activates_default(true);
+            login_button.can_default = true;
+            update_login_button_sensitivity();
+        }
+
+        public void on_pane_uninstalled() {
+        }
+    }
+
+    internal class AccessTokenFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+        public AccessTokenFetchTransaction(Publishing.RESTSupport.OAuth1.Session session, string username, string password) {
+            base.with_uri(session, "https://www.tumblr.com/oauth/access_token",
+                    Publishing.RESTSupport.HttpMethod.POST);
+            add_argument("x_auth_username", Soup.URI.encode(username, ENCODE_RFC_3986_EXTRA));
+            add_argument("x_auth_password", password);
+            add_argument("x_auth_mode", "client_auth");
+        }
+    }
+
+    internal class Tumblr : Publishing.Authenticator.Shotwell.OAuth1.Authenticator {
+        public Tumblr(Spit.Publishing.PluginHost host) {
+            base(API_KEY, API_SECRET, host);
+        }
+
+        public override void authenticate() {
+            if (is_persistent_session_valid()) {
+                debug("attempt start: a persistent session is available; using it");
+
+                session.authenticate_from_persistent_credentials(get_persistent_access_phase_token(),
+                        get_persistent_access_phase_token_secret(), "");
+            } else {
+                debug("attempt start: no persistent session available; showing login welcome pane");
+
+                do_show_authentication_pane();
+            }
+        }
+
+        public override bool can_logout() {
+            return true;
+        }
+
+        public override void logout() {
+            this.session.deauthenticate();
+            invalidate_persistent_session();
+        }
+
+        public override void refresh() {
+            // No-op with Tumblr
+        }
+
+        /**
+         * Action that shows the authentication pane.
+         *
+         * This action method shows the authentication pane. It is shown at the
+         * very beginning of the interaction when no persistent parameters are found
+         * or after a failed login attempt using persisted parameters. It can be
+         * given a mode flag to specify whether it should be displayed in initial
+         * mode or in any of the error modes that it supports.
+         *
+         * @param mode the mode for the authentication pane
+         */
+        private void do_show_authentication_pane(AuthenticationPane.Mode mode = AuthenticationPane.Mode.INTRO) {
+            debug("ACTION: installing authentication pane");
+
+            host.set_service_locked(false);
+            AuthenticationPane authentication_pane = new AuthenticationPane(mode);
+            authentication_pane.login.connect(on_authentication_pane_login_clicked);
+            host.install_dialog_pane(authentication_pane, Spit.Publishing.PluginHost.ButtonMode.CLOSE);
+            host.set_dialog_default_widget(authentication_pane.get_default_widget());
+        }
+
+        /**
+         * Event triggered when the login button in the authentication panel is
+         * clicked.
+         *
+         * This event is triggered when the login button in the authentication
+         * panel is clicked. It then triggers a network login interaction.
+         *
+         * @param username the name of the Tumblr user as entered in the dialog
+         * @param password the password of the Tumblr as entered in the dialog
+         */
+        private void on_authentication_pane_login_clicked( string username, string password ) {
+            debug("EVENT: on_authentication_pane_login_clicked");
+
+            do_network_login(username, password);
+        }
+
+        /**
+         * Action to perform a network login to a Tumblr blog.
+         *
+         * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
+         *
+         * @param username the name of the Tumblr user used to login
+         * @param password the password of the Tumblr user used to login
+         */
+        private void do_network_login(string username, string password) {
+            debug("ACTION: logging in");
+            host.set_service_locked(true);
+            host.install_login_wait_pane();
+
+            AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session,username,password);
+            txn.completed.connect(on_auth_request_txn_completed);
+            txn.network_error.connect(on_auth_request_txn_error);
+
+            try {
+                txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_auth_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_auth_request_txn_completed);
+            txn.network_error.disconnect(on_auth_request_txn_error);
+
+            debug("EVENT: OAuth authentication request transaction completed; response = '%s'",
+                  txn.get_response());
+
+            do_parse_token_info_from_auth_request(txn.get_response());
+        }
+
+        private void on_auth_request_txn_error(Publishing.RESTSupport.Transaction txn,
+                                               Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_auth_request_txn_completed);
+            txn.network_error.disconnect(on_auth_request_txn_error);
+
+            debug("EVENT: OAuth authentication request transaction caused a network error");
+            host.post_error(err);
+        }
+
+        private void do_parse_token_info_from_auth_request(string response) {
+            debug("ACTION: extracting access phase credentials from '%s'", response);
+
+            string? token = null;
+            string? token_secret = null;
+
+            var data = Soup.Form.decode(response);
+            data.lookup_extended("oauth_token", null, out token);
+            data.lookup_extended("oauth_token_secret", null, out token_secret);
+
+            debug("access phase credentials: { token = '%s'; token_secret = '%s' }",
+                    token, token_secret);
+
+            if (token == null || token_secret == null) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("Expected " +
+                            "access phase credentials to contain token and token secret but at " +
+                            "least one of these is absent"));
+                this.authentication_failed();
+            } else {
+                session.set_access_phase_credentials(token, token_secret, "");
+            }
+        }
+    }
+}
diff --git a/plugins/authenticator/shotwell/flickr_pin_entry_pane.ui b/plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
deleted file mode 100644
index dd4c35c..0000000
--- a/plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="explanatory_text">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">16</property>
-        <property name="margin_right">16</property>
-        <property name="margin_top">48</property>
-        <property name="margin_bottom">16</property>
-        <property name="label" translatable="yes">Enter the confirmation number which appears after you log into Flickr in your Web browser.</property>
-        <property name="angle">0.0099999997764825821</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">center</property>
-        <property name="margin_bottom">80</property>
-        <child>
-          <object class="GtkLabel" id="pin_entry_caption">
-            <property name="visible">True</property>
-            <property name="can_focus">False</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>
-            <property name="mnemonic_widget">pin_entry</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="pin_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_left">8</property>
-            <property name="invisible_char">●</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</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="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_underline">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</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/authenticator/shotwell/meson.build b/plugins/authenticator/shotwell/meson.build
new file mode 100644
index 0000000..4404242
--- /dev/null
+++ b/plugins/authenticator/shotwell/meson.build
@@ -0,0 +1,28 @@
+authenticator_shotwell_sources = [
+        'ShotwellAuthenticatorFactory.vala',
+        'FacebookPublishingAuthenticator.vala',
+        'FlickrPublishingAuthenticator.vala',
+        'GoogleAuthenticator.vala',
+        'OAuth1Authenticator.vala',
+        'TumblrAuthenticator.vala'
+        ]
+
+authenticator_shotwell_resources = gnome.compile_resources('authenticator-resource',
+        'org.gnome.Shotwell.Authenticator.gresource.xml',
+        source_dir : meson.source_root())
+
+authenticator_shotwell_deps = [gee, gtk, gio, soup, json_glib, sw_plugin,
+                               sw_plugin_common_dep, json_glib, xml, webkit]
+
+authenticator = library('shotwell-authenticator',
+                        authenticator_shotwell_sources + authenticator_shotwell_resources,
+                        dependencies : authenticator_shotwell_deps,
+                        include_directories : config_incdir,
+                        version: meson.project_version(),
+                        vala_args : ['--gresources',
+                        'org.gnome.Shotwell.Authenticator.gresource.xml'],
+                        c_args :
+                        '-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Authenticator"',
+                        install: true)
+authenticator_dep = declare_dependency(include_directories : include_directories('.'),
+                                       link_with : authenticator)
diff --git a/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml b/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
index c40e700..5f25aab 100644
--- a/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
+++ b/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/Shotwell/Authenticator">
-      <file>flickr_pin_entry_pane.ui</file>
+      <file>tumblr_authentication_pane.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/authenticator/shotwell/tumblr_authentication_pane.ui
index 24a647f..24a647f 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/authenticator/shotwell/tumblr_authentication_pane.ui
diff --git a/plugins/common/OAuth1Support.c b/plugins/common/OAuth1Support.c
new file mode 100644
index 0000000..afa6905
--- /dev/null
+++ b/plugins/common/OAuth1Support.c
@@ -0,0 +1,1838 @@
+/* OAuth1Support.c generated by valac 0.36.6, the Vala compiler
+ * generated from OAuth1Support.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libsoup/soup.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gee.h>
+
+
+#define PUBLISHING_REST_SUPPORT_TYPE_SESSION (publishing_rest_support_session_get_type ())
+#define PUBLISHING_REST_SUPPORT_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))
+#define PUBLISHING_REST_SUPPORT_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionClass))
+#define PUBLISHING_REST_SUPPORT_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSessionClass))
+
+typedef struct _PublishingRESTSupportSession PublishingRESTSupportSession;
+typedef struct _PublishingRESTSupportSessionClass PublishingRESTSupportSessionClass;
+typedef struct _PublishingRESTSupportSessionPrivate PublishingRESTSupportSessionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION (publishing_rest_support_oauth1_session_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Session PublishingRESTSupportOAuth1Session;
+typedef struct _PublishingRESTSupportOAuth1SessionClass PublishingRESTSupportOAuth1SessionClass;
+typedef struct _PublishingRESTSupportOAuth1SessionPrivate PublishingRESTSupportOAuth1SessionPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION (publishing_rest_support_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction))
+#define PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionClass))
+#define PUBLISHING_REST_SUPPORT_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransactionClass))
+
+typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransaction;
+typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
+
+#define PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT (publishing_rest_support_argument_get_type ())
+#define PUBLISHING_REST_SUPPORT_ARGUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument))
+#define PUBLISHING_REST_SUPPORT_ARGUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgumentClass))
+#define PUBLISHING_REST_SUPPORT_IS_ARGUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT))
+#define PUBLISHING_REST_SUPPORT_IS_ARGUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT))
+#define PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgumentClass))
+
+typedef struct _PublishingRESTSupportArgument PublishingRESTSupportArgument;
+typedef struct _PublishingRESTSupportArgumentClass PublishingRESTSupportArgumentClass;
+
+#define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ())
+#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
+typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION (publishing_rest_support_oauth1_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1Transaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Transaction PublishingRESTSupportOAuth1Transaction;
+typedef struct _PublishingRESTSupportOAuth1TransactionClass PublishingRESTSupportOAuth1TransactionClass;
+typedef struct _PublishingRESTSupportOAuth1TransactionPrivate PublishingRESTSupportOAuth1TransactionPrivate;
+#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
+
+#define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction))
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransactionClass))
+#define PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransactionClass))
+
+typedef struct _PublishingRESTSupportUploadTransaction PublishingRESTSupportUploadTransaction;
+typedef struct _PublishingRESTSupportUploadTransactionClass PublishingRESTSupportUploadTransactionClass;
+typedef struct _PublishingRESTSupportUploadTransactionPrivate PublishingRESTSupportUploadTransactionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_oauth1_upload_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1UploadTransaction PublishingRESTSupportOAuth1UploadTransaction;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionClass PublishingRESTSupportOAuth1UploadTransactionClass;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionPrivate PublishingRESTSupportOAuth1UploadTransactionPrivate;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _PublishingRESTSupportSession {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingRESTSupportSessionPrivate * priv;
+};
+
+struct _PublishingRESTSupportSessionClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingRESTSupportSession *self);
+	gboolean (*is_authenticated) (PublishingRESTSupportSession* self);
+};
+
+struct _PublishingRESTSupportOAuth1Session {
+	PublishingRESTSupportSession parent_instance;
+	PublishingRESTSupportOAuth1SessionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1SessionClass {
+	PublishingRESTSupportSessionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1SessionPrivate {
+	gchar* request_phase_token;
+	gchar* request_phase_token_secret;
+	gchar* access_phase_token;
+	gchar* access_phase_token_secret;
+	gchar* username;
+	gchar* consumer_key;
+	gchar* consumer_secret;
+};
+
+typedef enum  {
+	PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET,
+	PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST,
+	PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT
+} PublishingRESTSupportHttpMethod;
+
+struct _PublishingRESTSupportTransaction {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingRESTSupportTransactionPrivate * priv;
+};
+
+struct _PublishingRESTSupportTransactionClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingRESTSupportTransaction *self);
+	void (*add_header) (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
+	void (*execute) (PublishingRESTSupportTransaction* self, GError** error);
+};
+
+struct _PublishingRESTSupportOAuth1Transaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingRESTSupportOAuth1TransactionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1TransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportUploadTransaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingRESTSupportUploadTransactionPrivate * priv;
+	GHashTable* binary_disposition_table;
+	SpitPublishingPublishable* publishable;
+	gchar* mime_type;
+	GeeHashMap* message_headers;
+};
+
+struct _PublishingRESTSupportUploadTransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransaction {
+	PublishingRESTSupportUploadTransaction parent_instance;
+	PublishingRESTSupportOAuth1UploadTransactionPrivate * priv;
+	PublishingRESTSupportOAuth1Session* session;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransactionClass {
+	PublishingRESTSupportUploadTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransactionPrivate {
+	PublishingRESTSupportArgument** auth_header_fields;
+	gint auth_header_fields_length1;
+	gint _auth_header_fields_size_;
+};
+
+
+static gpointer publishing_rest_support_oauth1_session_parent_class = NULL;
+static gpointer publishing_rest_support_oauth1_transaction_parent_class = NULL;
+static gpointer publishing_rest_support_oauth1_upload_transaction_parent_class = NULL;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
+gpointer publishing_rest_support_session_ref (gpointer instance);
+void publishing_rest_support_session_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void publishing_rest_support_value_set_session (GValue* value, gpointer v_object);
+void publishing_rest_support_value_take_session (GValue* value, gpointer v_object);
+gpointer publishing_rest_support_value_get_session (const GValue* value);
+GType publishing_rest_support_session_get_type (void) G_GNUC_CONST;
+GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionPrivate))
+enum  {
+	PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_DUMMY_PROPERTY
+};
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri);
+PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url);
+static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret);
+gpointer publishing_rest_support_transaction_ref (gpointer instance);
+void publishing_rest_support_transaction_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object);
+void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object);
+gpointer publishing_rest_support_value_get_transaction (const GValue* value);
+GType publishing_rest_support_transaction_get_type (void) G_GNUC_CONST;
+gpointer publishing_rest_support_argument_ref (gpointer instance);
+void publishing_rest_support_argument_unref (gpointer instance);
+GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object);
+void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object);
+gpointer publishing_rest_support_value_get_argument (const GValue* value);
+GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1);
+GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
+PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
+static void _vala_array_add2 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
+gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gboolean publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self);
+gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupportSession* self);
+static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj);
+GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_DUMMY_PROPERTY
+};
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
+static void publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
+void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
+static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error);
+GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
+GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionPrivate))
+enum  {
+	PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_DUMMY_PROPERTY
+};
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
+PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
+PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
+static void _vala_array_add3 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
+void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
+void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value);
+static void publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * 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);
+
+
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri) {
+	PublishingRESTSupportOAuth1Session* self = NULL;
+	const gchar* _tmp0_;
+#line 21 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = endpoint_uri;
+#line 21 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = (PublishingRESTSupportOAuth1Session*) publishing_rest_support_session_construct (object_type, _tmp0_);
+#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return self;
+#line 303 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri) {
+#line 20 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return publishing_rest_support_oauth1_session_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, endpoint_uri);
+#line 310 "OAuth1Support.c"
+}
+
+
+static gboolean publishing_rest_support_oauth1_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+	PublishingRESTSupportOAuth1Session * self;
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp2_;
+#line 24 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = self->priv->access_phase_token;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if (_tmp2_ != NULL) {
+#line 326 "OAuth1Support.c"
+		const gchar* _tmp3_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp3_ = self->priv->access_phase_token_secret;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp1_ = _tmp3_ != NULL;
+#line 332 "OAuth1Support.c"
+	} else {
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp1_ = FALSE;
+#line 336 "OAuth1Support.c"
+	}
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if (_tmp1_) {
+#line 340 "OAuth1Support.c"
+		const gchar* _tmp4_;
+#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp4_ = self->priv->username;
+#line 26 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp0_ = _tmp4_ != NULL;
+#line 346 "OAuth1Support.c"
+	} else {
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp0_ = FALSE;
+#line 350 "OAuth1Support.c"
+	}
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp0_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 356 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username) {
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (token != NULL);
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (secret != NULL);
+#line 29 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (username != NULL);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = token;
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token);
+#line 31 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token = _tmp1_;
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = secret;
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token_secret);
+#line 32 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token_secret = _tmp3_;
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = username;
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->username);
+#line 33 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->username = _tmp5_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
+#line 401 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self) {
+#line 38 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 39 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token);
+#line 39 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token = NULL;
+#line 40 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token_secret);
+#line 40 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token_secret = NULL;
+#line 41 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->username);
+#line 41 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->username = NULL;
+#line 420 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret) {
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (consumer_key != NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (consumer_secret != NULL);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = consumer_key;
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->consumer_key);
+#line 45 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->consumer_key = _tmp1_;
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = consumer_secret;
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->consumer_secret);
+#line 46 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->consumer_secret = _tmp3_;
+#line 451 "OAuth1Support.c"
+}
+
+
+static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return self ? publishing_rest_support_argument_ref (self) : NULL;
+#line 458 "OAuth1Support.c"
+}
+
+
+static void _vala_array_add2 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if ((*length) == (*size)) {
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
+#line 469 "OAuth1Support.c"
+	}
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	(*array)[(*length)++] = value;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	(*array)[*length] = NULL;
+#line 475 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1) {
+	gchar* result = NULL;
+	gchar* http_method = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingRESTSupportArgument** base_string_arguments = NULL;
+	PublishingRESTSupportTransaction* _tmp6_;
+	gint _tmp7_;
+	PublishingRESTSupportArgument** _tmp8_;
+	gint base_string_arguments_length1;
+	gint _base_string_arguments_size_;
+	PublishingRESTSupportArgument** _tmp9_;
+	gint _tmp9__length1;
+	PublishingRESTSupportArgument** sorted_args = NULL;
+	PublishingRESTSupportArgument** _tmp14_;
+	gint _tmp14__length1;
+	gint _tmp15_;
+	PublishingRESTSupportArgument** _tmp16_;
+	gint sorted_args_length1;
+	gint _sorted_args_size_;
+	gchar* arguments_string = NULL;
+	PublishingRESTSupportArgument** _tmp17_;
+	gint _tmp17__length1;
+	gchar* _tmp18_;
+	gchar* signing_key = NULL;
+	const gchar* _tmp19_;
+	gchar* signature_base_string = NULL;
+	const gchar* _tmp33_;
+	gchar* _tmp34_;
+	gchar* _tmp35_;
+	PublishingRESTSupportTransaction* _tmp36_;
+	gchar* _tmp37_;
+	gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	gchar* _tmp43_;
+	gchar* _tmp44_;
+	const gchar* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* signature = NULL;
+	const gchar* _tmp51_;
+	gchar* _tmp52_;
+	const gchar* _tmp53_;
+	gchar* _tmp54_;
+	const gchar* _tmp55_;
+#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = txn;
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
+#line 51 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	http_method = _tmp2_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:53: signing transaction with parameters:");
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = http_method;
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = _tmp4_;
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:54: %s", _tmp5_);
+#line 54 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp5_);
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp6_ = txn;
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	base_string_arguments = _tmp8_;
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	base_string_arguments_length1 = _tmp7_;
+#line 56 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_base_string_arguments_size_ = base_string_arguments_length1;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp9_ = extra_arguments;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp9__length1 = extra_arguments_length1;
+#line 572 "OAuth1Support.c"
+	{
+		PublishingRESTSupportArgument** arg_collection = NULL;
+		gint arg_collection_length1 = 0;
+		gint _arg_collection_size_ = 0;
+		gint arg_it = 0;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		arg_collection = _tmp9_;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		arg_collection_length1 = _tmp9__length1;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		for (arg_it = 0; arg_it < _tmp9__length1; arg_it = arg_it + 1) {
+#line 584 "OAuth1Support.c"
+			PublishingRESTSupportArgument* _tmp10_;
+			PublishingRESTSupportArgument* arg = NULL;
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp10_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			arg = _tmp10_;
+#line 591 "OAuth1Support.c"
+			{
+				PublishingRESTSupportArgument** _tmp11_;
+				gint _tmp11__length1;
+				PublishingRESTSupportArgument* _tmp12_;
+				PublishingRESTSupportArgument* _tmp13_;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_tmp11_ = base_string_arguments;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_tmp11__length1 = base_string_arguments_length1;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_tmp12_ = arg;
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_tmp13_ = _publishing_rest_support_argument_ref0 (_tmp12_);
+#line 59 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_vala_array_add2 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp13_);
+#line 58 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+				_publishing_rest_support_argument_unref0 (arg);
+#line 609 "OAuth1Support.c"
+			}
+		}
+	}
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp14_ = base_string_arguments;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp14__length1 = base_string_arguments_length1;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp16_ = publishing_rest_support_argument_sort (_tmp14_, _tmp14__length1, &_tmp15_);
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	sorted_args = _tmp16_;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	sorted_args_length1 = _tmp15_;
+#line 62 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_sorted_args_size_ = sorted_args_length1;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp17_ = sorted_args;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp17__length1 = sorted_args_length1;
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp18_ = publishing_rest_support_argument_serialize_list (_tmp17_, _tmp17__length1, FALSE, "&");
+#line 65 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	arguments_string = _tmp18_;
+#line 67 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signing_key = NULL;
+#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp19_ = self->priv->access_phase_token_secret;
+#line 68 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if (_tmp19_ != NULL) {
+#line 639 "OAuth1Support.c"
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		const gchar* _tmp23_;
+		gchar* _tmp24_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		g_debug ("OAuth1Support.vala:69: access phase token secret available; using it a" \
+"s signing key");
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp20_ = self->priv->consumer_secret;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp21_ = g_strconcat (_tmp20_, "&", NULL);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp22_ = _tmp21_;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp23_ = self->priv->access_phase_token_secret;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_g_free0 (signing_key);
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		signing_key = _tmp24_;
+#line 71 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_g_free0 (_tmp22_);
+#line 663 "OAuth1Support.c"
+	} else {
+		const gchar* _tmp25_;
+#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp25_ = self->priv->request_phase_token_secret;
+#line 72 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		if (_tmp25_ != NULL) {
+#line 670 "OAuth1Support.c"
+			const gchar* _tmp26_;
+			gchar* _tmp27_;
+			gchar* _tmp28_;
+			const gchar* _tmp29_;
+			gchar* _tmp30_;
+#line 73 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			g_debug ("OAuth1Support.vala:73: request phase token secret available; using it " \
+"as signing key");
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp26_ = self->priv->consumer_secret;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp27_ = g_strconcat (_tmp26_, "&", NULL);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp28_ = _tmp27_;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp29_ = self->priv->request_phase_token_secret;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_g_free0 (signing_key);
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			signing_key = _tmp30_;
+#line 75 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_g_free0 (_tmp28_);
+#line 694 "OAuth1Support.c"
+		} else {
+			const gchar* _tmp31_;
+			gchar* _tmp32_;
+#line 77 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			g_debug ("OAuth1Support.vala:77: %s", "neither access phase nor request phase token secrets available; using " \
+"API " "key as signing key");
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp31_ = self->priv->consumer_secret;
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_tmp32_ = g_strconcat (_tmp31_, "&", NULL);
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_g_free0 (signing_key);
+#line 80 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			signing_key = _tmp32_;
+#line 708 "OAuth1Support.c"
+		}
+	}
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp33_ = http_method;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp34_ = g_strconcat (_tmp33_, "&", NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp35_ = _tmp34_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp36_ = txn;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp37_ = publishing_rest_support_transaction_get_endpoint_url (_tmp36_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp38_ = _tmp37_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp39_ = soup_uri_encode (_tmp38_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp40_ = _tmp39_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp41_ = g_strconcat (_tmp35_, _tmp40_, NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp42_ = _tmp41_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp43_ = g_strconcat (_tmp42_, "&", NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp44_ = _tmp43_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp45_ = arguments_string;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp46_ = soup_uri_encode (_tmp45_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp47_ = _tmp46_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp49_ = _tmp48_;
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp47_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp44_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp42_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp40_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp38_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp35_);
+#line 83 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signature_base_string = _tmp49_;
+#line 87 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:87: signature base string = '%s'", signature_base_string);
+#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp50_ = signing_key;
+#line 89 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:89: signing key = '%s'", _tmp50_);
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp51_ = signing_key;
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp52_ = publishing_rest_support_hmac_sha1 (_tmp51_, signature_base_string);
+#line 92 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signature = _tmp52_;
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp53_ = signature;
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp54_ = soup_uri_encode (_tmp53_, PUBLISHING_REST_SUPPORT_OAUTH1_ENCODE_RFC_3986_EXTRA);
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (signature);
+#line 93 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signature = _tmp54_;
+#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp55_ = signature;
+#line 95 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:95: signature = '%s'", _tmp55_);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = signature;
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (signature_base_string);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (signing_key);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (arguments_string);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (http_method);
+#line 97 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 799 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret) {
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (token != NULL);
+#line 100 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (secret != NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = token;
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->request_phase_token);
+#line 101 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->request_phase_token = _tmp1_;
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = secret;
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->request_phase_token_secret);
+#line 102 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->request_phase_token_secret = _tmp3_;
+#line 830 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username) {
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	gchar* _tmp5_;
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self));
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (token != NULL);
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (secret != NULL);
+#line 105 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (username != NULL);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = token;
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token);
+#line 106 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token = _tmp1_;
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = secret;
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token_secret);
+#line 107 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token_secret = _tmp3_;
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = username;
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->username);
+#line 108 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->username = _tmp5_;
+#line 110 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
+#line 875 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	GTimeVal currtime = {0};
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+#line 113 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 114 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_get_current_time (&currtime);
+#line 115 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_get_current_time (&currtime);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = currtime;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = _tmp0_.tv_sec;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = _tmp2_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = currtime;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = _tmp4_.tv_usec;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp7_ = _tmp6_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp9_ = _tmp8_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp11_ = _tmp10_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp9_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp7_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp3_);
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp11_;
+#line 117 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 934 "OAuth1Support.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 957 "OAuth1Support.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 965 "OAuth1Support.c"
+	} else {
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 977 "OAuth1Support.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 1001 "OAuth1Support.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 1007 "OAuth1Support.c"
+	} else {
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 1011 "OAuth1Support.c"
+	}
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 1015 "OAuth1Support.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 1027 "OAuth1Support.c"
+	} else {
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 1037 "OAuth1Support.c"
+	}
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 1043 "OAuth1Support.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 1057 "OAuth1Support.c"
+	} else {
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 1067 "OAuth1Support.c"
+	}
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 1073 "OAuth1Support.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 1082 "OAuth1Support.c"
+	}
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 1102 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	gint64 _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+#line 121 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = g_get_real_time ();
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = _tmp1_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = _tmp3_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp2_);
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp4_;
+#line 122 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1131 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 125 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 126 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->consumer_key;
+#line 126 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_assert (_tmp0_ != NULL, "consumer_key != null");
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->consumer_key;
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp2_;
+#line 127 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1154 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 131 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->request_phase_token;
+#line 131 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_assert (_tmp0_ != NULL, "request_phase_token != null");
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->request_phase_token;
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp2_;
+#line 132 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1177 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 136 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->access_phase_token;
+#line 136 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->access_phase_token;
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp2_;
+#line 137 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1200 "OAuth1Support.c"
+}
+
+
+gboolean publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self) {
+	gboolean result = FALSE;
+	const gchar* _tmp0_;
+#line 140 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), FALSE);
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->access_phase_token;
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp0_ != NULL;
+#line 141 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1215 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 144 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 145 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->access_phase_token_secret;
+#line 145 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->access_phase_token_secret;
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp2_;
+#line 146 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1238 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self) {
+	gchar* result = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+#line 149 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (self), NULL);
+#line 150 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+#line 150 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_assert (_tmp0_, "is_authenticated()");
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->username;
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp2_;
+#line 151 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1261 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_session_class_init (PublishingRESTSupportOAuth1SessionClass * klass) {
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_session_parent_class = g_type_class_peek_parent (klass);
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_oauth1_session_finalize;
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1SessionPrivate));
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_oauth1_session_real_is_authenticated;
+#line 1274 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_session_instance_init (PublishingRESTSupportOAuth1Session * self) {
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_PRIVATE (self);
+#line 12 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->request_phase_token = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->request_phase_token_secret = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token = NULL;
+#line 15 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->access_phase_token_secret = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->username = NULL;
+#line 17 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->consumer_key = NULL;
+#line 18 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->consumer_secret = NULL;
+#line 1295 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_session_finalize (PublishingRESTSupportSession * obj) {
+	PublishingRESTSupportOAuth1Session * self;
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 12 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->request_phase_token);
+#line 13 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->request_phase_token_secret);
+#line 14 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token);
+#line 15 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->access_phase_token_secret);
+#line 16 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->username);
+#line 17 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->consumer_key);
+#line 18 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (self->priv->consumer_secret);
+#line 11 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_oauth1_session_parent_class)->finalize (obj);
+#line 1319 "OAuth1Support.c"
+}
+
+
+GType publishing_rest_support_oauth1_session_get_type (void) {
+	static volatile gsize publishing_rest_support_oauth1_session_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_rest_support_oauth1_session_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1SessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Session), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_session_instance_init, NULL };
+		GType publishing_rest_support_oauth1_session_type_id;
+		publishing_rest_support_oauth1_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingRESTSupportOAuth1Session", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_rest_support_oauth1_session_type_id__volatile, publishing_rest_support_oauth1_session_type_id);
+	}
+	return publishing_rest_support_oauth1_session_type_id__volatile;
+}
+
+
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method) {
+	PublishingRESTSupportOAuth1Transaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = session;
+#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = method;
+#line 158 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = (PublishingRESTSupportOAuth1Transaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
+#line 159 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_transaction_setup_arguments (self);
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return self;
+#line 1351 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method) {
+#line 156 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return publishing_rest_support_oauth1_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, method);
+#line 1358 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
+	PublishingRESTSupportOAuth1Transaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (uri != NULL, NULL);
+#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = session;
+#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = uri;
+#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = method;
+#line 164 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = (PublishingRESTSupportOAuth1Transaction*) 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 165 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_transaction_setup_arguments (self);
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return self;
+#line 1383 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
+#line 162 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return publishing_rest_support_oauth1_transaction_construct_with_uri (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, session, uri, method);
+#line 1390 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_transaction_setup_arguments (PublishingRESTSupportOAuth1Transaction* self) {
+	PublishingRESTSupportOAuth1Session* session = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingRESTSupportOAuth1Session* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PublishingRESTSupportOAuth1Session* _tmp10_;
+	gboolean _tmp11_;
+#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION (self));
+#line 169 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 169 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	session = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = session;
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = publishing_rest_support_oauth1_session_get_oauth_nonce (_tmp1_);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = _tmp2_;
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp3_);
+#line 171 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp3_);
+#line 172 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 173 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = session;
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (_tmp4_);
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp6_ = _tmp5_;
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp6_);
+#line 174 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp6_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp7_ = session;
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp8_ = publishing_rest_support_oauth1_session_get_consumer_key (_tmp7_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp9_ = _tmp8_;
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", _tmp9_);
+#line 175 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp9_);
+#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp10_ = session;
+#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp11_ = publishing_rest_support_oauth1_session_has_access_phase_token (_tmp10_);
+#line 176 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if (_tmp11_) {
+#line 1454 "OAuth1Support.c"
+		PublishingRESTSupportOAuth1Session* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp12_ = session;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp13_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp12_);
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_tmp14_ = _tmp13_;
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp14_);
+#line 177 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		_g_free0 (_tmp14_);
+#line 1468 "OAuth1Support.c"
+	}
+#line 168 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_publishing_rest_support_session_unref0 (session);
+#line 1472 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+	PublishingRESTSupportOAuth1Transaction * self;
+	gchar* signature = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GError * _inner_error_ = NULL;
+#line 182 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1Transaction);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = publishing_rest_support_oauth1_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), NULL, 0);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = _tmp2_;
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_publishing_rest_support_session_unref0 (_tmp1_);
+#line 183 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signature = _tmp3_;
+#line 184 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature", signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_oauth1_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			g_propagate_error (error, _inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_g_free0 (signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			return;
+#line 1512 "OAuth1Support.c"
+		} else {
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			_g_free0 (signature);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			g_clear_error (&_inner_error_);
+#line 186 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+			return;
+#line 1522 "OAuth1Support.c"
+		}
+	}
+#line 182 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (signature);
+#line 1527 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_transaction_class_init (PublishingRESTSupportOAuth1TransactionClass * klass) {
+#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 155 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_oauth1_transaction_real_execute;
+#line 1536 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_transaction_instance_init (PublishingRESTSupportOAuth1Transaction * self) {
+}
+
+
+GType publishing_rest_support_oauth1_transaction_get_type (void) {
+	static volatile gsize publishing_rest_support_oauth1_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_rest_support_oauth1_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1TransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1Transaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_transaction_instance_init, NULL };
+		GType publishing_rest_support_oauth1_transaction_type_id;
+		publishing_rest_support_oauth1_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingRESTSupportOAuth1Transaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_rest_support_oauth1_transaction_type_id__volatile, publishing_rest_support_oauth1_transaction_type_id);
+	}
+	return publishing_rest_support_oauth1_transaction_type_id__volatile;
+}
+
+
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri) {
+	PublishingRESTSupportOAuth1UploadTransaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument** _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp4_;
+	PublishingRESTSupportOAuth1Session* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingRESTSupportOAuth1Session* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	PublishingRESTSupportOAuth1Session* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	PublishingRESTSupportOAuth1Session* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (endpoint_uri != NULL, NULL);
+#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = session;
+#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = publishable;
+#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = endpoint_uri;
+#line 197 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = (PublishingRESTSupportOAuth1UploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->auth_header_fields = _tmp3_;
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->auth_header_fields_length1 = 0;
+#line 199 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
+#line 200 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = session;
+#line 200 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->session = _tmp4_;
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp5_ = session;
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp6_ = publishing_rest_support_oauth1_session_get_oauth_nonce (_tmp5_);
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp7_ = _tmp6_;
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp7_);
+#line 202 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp7_);
+#line 203 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
+#line 204 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp8_ = session;
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp9_ = publishing_rest_support_oauth1_session_get_oauth_timestamp (_tmp8_);
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp10_ = _tmp9_;
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp10_);
+#line 205 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp10_);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp11_ = session;
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp12_ = publishing_rest_support_oauth1_session_get_consumer_key (_tmp11_);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp13_ = _tmp12_;
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp13_);
+#line 206 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp13_);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp14_ = session;
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp15_ = publishing_rest_support_oauth1_session_get_access_phase_token (_tmp14_);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp16_ = _tmp15_;
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp16_);
+#line 207 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp16_);
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return self;
+#line 1649 "OAuth1Support.c"
+}
+
+
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri) {
+#line 194 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return publishing_rest_support_oauth1_upload_transaction_construct (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_uri);
+#line 1656 "OAuth1Support.c"
+}
+
+
+static void _vala_array_add3 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	if ((*length) == (*size)) {
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
+#line 1667 "OAuth1Support.c"
+	}
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	(*array)[(*length)++] = value;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	(*array)[*length] = NULL;
+#line 1673 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value) {
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument* _tmp3_;
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self));
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (key != NULL);
+#line 210 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (value != NULL);
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->auth_header_fields;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0__length1 = self->priv->auth_header_fields_length1;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = key;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = value;
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
+#line 211 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_vala_array_add3 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
+#line 1701 "OAuth1Support.c"
+}
+
+
+gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self) {
+	gchar* result = NULL;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+#line 214 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->priv->auth_header_fields;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0__length1 = self->priv->auth_header_fields_length1;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = publishing_rest_support_argument_serialize_list (_tmp0_, _tmp0__length1, TRUE, ", ");
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = _tmp1_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = g_strconcat ("OAuth ", _tmp2_, NULL);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp4_ = _tmp3_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (_tmp2_);
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	result = _tmp4_;
+#line 215 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	return result;
+#line 1733 "OAuth1Support.c"
+}
+
+
+void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self) {
+	gchar* signature = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar* authorization_header = NULL;
+	gchar* _tmp3_;
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION (self));
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp0_ = self->session;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1_ = self->priv->auth_header_fields;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp1__length1 = self->priv->auth_header_fields_length1;
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp2_ = publishing_rest_support_oauth1_session_sign_transaction (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp1_, _tmp1__length1);
+#line 219 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	signature = _tmp2_;
+#line 220 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (self, "oauth_signature", signature);
+#line 223 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_tmp3_ = publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (self);
+#line 223 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	authorization_header = _tmp3_;
+#line 225 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_debug ("OAuth1Support.vala:225: executing upload transaction: authorization he" \
+"ader string = '%s'", authorization_header);
+#line 227 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", authorization_header);
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (authorization_header);
+#line 218 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	_g_free0 (signature);
+#line 1771 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_upload_transaction_class_init (PublishingRESTSupportOAuth1UploadTransactionClass * klass) {
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	publishing_rest_support_oauth1_upload_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_oauth1_upload_transaction_finalize;
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	g_type_class_add_private (klass, sizeof (PublishingRESTSupportOAuth1UploadTransactionPrivate));
+#line 1782 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_upload_transaction_instance_init (PublishingRESTSupportOAuth1UploadTransaction * self) {
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self->priv = PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_PRIVATE (self);
+#line 1789 "OAuth1Support.c"
+}
+
+
+static void publishing_rest_support_oauth1_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
+	PublishingRESTSupportOAuth1UploadTransaction * self;
+#line 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction);
+#line 192 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.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 190 "/home/jens/Source/shotwell/plugins/common/OAuth1Support.vala"
+	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_oauth1_upload_transaction_parent_class)->finalize (obj);
+#line 1801 "OAuth1Support.c"
+}
+
+
+GType publishing_rest_support_oauth1_upload_transaction_get_type (void) {
+	static volatile gsize publishing_rest_support_oauth1_upload_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_rest_support_oauth1_upload_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportOAuth1UploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_oauth1_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportOAuth1UploadTransaction), 0, (GInstanceInitFunc) publishing_rest_support_oauth1_upload_transaction_instance_init, NULL };
+		GType publishing_rest_support_oauth1_upload_transaction_type_id;
+		publishing_rest_support_oauth1_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingRESTSupportOAuth1UploadTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_rest_support_oauth1_upload_transaction_type_id__volatile, publishing_rest_support_oauth1_upload_transaction_type_id);
+	}
+	return publishing_rest_support_oauth1_upload_transaction_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff --git a/plugins/common/OAuth1Support.vala b/plugins/common/OAuth1Support.vala
new file mode 100644
index 0000000..e5a8545
--- /dev/null
+++ b/plugins/common/OAuth1Support.vala
@@ -0,0 +1,233 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+namespace Publishing.RESTSupport.OAuth1 {
+    internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
+
+    public class Session : Publishing.RESTSupport.Session {
+        private string? request_phase_token = null;
+        private string? request_phase_token_secret = null;
+        private string? access_phase_token = null;
+        private string? access_phase_token_secret = null;
+        private string? username = null;
+        private string? consumer_key = null;
+        private string? consumer_secret = null;
+
+        public Session(string? endpoint_uri = null) {
+            base(endpoint_uri);
+        }
+
+        public override bool is_authenticated() {
+            return (access_phase_token != null && access_phase_token_secret != null &&
+                    username != null);
+        }
+
+        public void authenticate_from_persistent_credentials(string token, string secret,
+                string username) {
+            this.access_phase_token = token;
+            this.access_phase_token_secret = secret;
+            this.username = username;
+
+            this.authenticated();
+        }
+
+        public void deauthenticate() {
+            access_phase_token = null;
+            access_phase_token_secret = null;
+            username = null;
+        }
+
+        public void set_api_credentials(string consumer_key, string consumer_secret) {
+            this.consumer_key = consumer_key;
+            this.consumer_secret = consumer_secret;
+        }
+
+        public string sign_transaction(Publishing.RESTSupport.Transaction txn,
+                                     Publishing.RESTSupport.Argument[]? extra_arguments = null) {
+            string http_method = txn.get_method().to_string();
+
+            debug("signing transaction with parameters:");
+            debug("HTTP method = " + http_method);
+
+            Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
+
+            foreach (var arg in extra_arguments) {
+                base_string_arguments += arg;
+            }
+
+            Publishing.RESTSupport.Argument[] sorted_args =
+                Publishing.RESTSupport.Argument.sort(base_string_arguments);
+
+            var arguments_string = Argument.serialize_list(sorted_args);
+
+            string? signing_key = null;
+            if (access_phase_token_secret != null) {
+                debug("access phase token secret available; using it as signing key");
+
+                signing_key = consumer_secret + "&" + access_phase_token_secret;
+            } else if (request_phase_token_secret != null) {
+                debug("request phase token secret available; using it as signing key");
+
+                signing_key = consumer_secret + "&" + request_phase_token_secret;
+            } else {
+                debug("neither access phase nor request phase token secrets available; using API " +
+                        "key as signing key");
+
+                signing_key = consumer_secret + "&";
+            }
+
+            string signature_base_string = http_method + "&" + Soup.URI.encode(
+                    txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
+                Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
+
+            debug("signature base string = '%s'", signature_base_string);
+
+            debug("signing key = '%s'", signing_key);
+
+            // compute the signature
+            string signature = RESTSupport.hmac_sha1(signing_key, signature_base_string);
+            signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
+
+            debug("signature = '%s'", signature);
+
+            return signature;
+        }
+
+        public void set_request_phase_credentials(string token, string secret) {
+            this.request_phase_token = token;
+            this.request_phase_token_secret = secret;
+        }
+
+        public void set_access_phase_credentials(string token, string secret, string username) {
+            this.access_phase_token = token;
+            this.access_phase_token_secret = secret;
+            this.username = username;
+
+            authenticated();
+        }
+
+        public string get_oauth_nonce() {
+            TimeVal currtime = TimeVal();
+            currtime.get_current_time();
+
+            return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
+                    currtime.tv_usec.to_string());
+        }
+
+        public string get_oauth_timestamp() {
+            return GLib.get_real_time().to_string().substring(0, 10);
+        }
+
+        public string get_consumer_key() {
+            assert(consumer_key != null);
+            return consumer_key;
+        }
+
+        public string get_request_phase_token() {
+            assert(request_phase_token != null);
+            return request_phase_token;
+        }
+
+        public string get_access_phase_token() {
+            assert(access_phase_token != null);
+            return access_phase_token;
+        }
+
+        public bool has_access_phase_token() {
+            return access_phase_token != null;
+        }
+
+        public string get_access_phase_token_secret() {
+            assert(access_phase_token_secret != null);
+            return access_phase_token_secret;
+        }
+
+        public string get_username() {
+            assert(is_authenticated());
+            return username;
+        }
+    }
+
+    public class Transaction : Publishing.RESTSupport.Transaction {
+        public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
+                Publishing.RESTSupport.HttpMethod.POST) {
+            base(session, method);
+            setup_arguments();
+        }
+
+        public Transaction.with_uri(Session session, string uri,
+                Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
+            base.with_endpoint_url(session, uri, method);
+            setup_arguments();
+        }
+
+        private void setup_arguments() {
+            var session = (Session) get_parent_session();
+
+            add_argument("oauth_nonce", session.get_oauth_nonce());
+            add_argument("oauth_signature_method", "HMAC-SHA1");
+            add_argument("oauth_version", "1.0");
+            add_argument("oauth_timestamp", session.get_oauth_timestamp());
+            add_argument("oauth_consumer_key", session.get_consumer_key());
+            if (session.has_access_phase_token()) {
+                add_argument("oauth_token", session.get_access_phase_token());
+            }
+        }
+
+
+        public override void execute() throws Spit.Publishing.PublishingError {
+            var signature = ((Session) get_parent_session()).sign_transaction(this);
+            add_argument("oauth_signature", signature);
+
+            base.execute();
+        }
+    }
+
+    public class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+        protected unowned Publishing.RESTSupport.OAuth1.Session session;
+        private Publishing.RESTSupport.Argument[] auth_header_fields;
+
+        public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session,
+                                 Spit.Publishing.Publishable publishable,
+                                 string endpoint_uri) {
+            base.with_endpoint_url(session, publishable, endpoint_uri);
+
+            this.auth_header_fields = new Publishing.RESTSupport.Argument[0];
+            this.session = session;
+
+            add_authorization_header_field("oauth_nonce", session.get_oauth_nonce());
+            add_authorization_header_field("oauth_signature_method", "HMAC-SHA1");
+            add_authorization_header_field("oauth_version", "1.0");
+            add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
+            add_authorization_header_field("oauth_consumer_key", session.get_consumer_key());
+            add_authorization_header_field("oauth_token", session.get_access_phase_token());
+        }
+
+        public void add_authorization_header_field(string key, string value) {
+            auth_header_fields += new Publishing.RESTSupport.Argument(key, value);
+        }
+
+        public string get_authorization_header_string() {
+            return "OAuth " + Argument.serialize_list(auth_header_fields, true, ", ");
+        }
+
+        public void authorize() {
+            var signature = session.sign_transaction(this, auth_header_fields);
+            add_authorization_header_field("oauth_signature", signature);
+
+
+            string authorization_header = get_authorization_header_string();
+
+            debug("executing upload transaction: authorization header string = '%s'",
+                    authorization_header);
+            add_header("Authorization", authorization_header);
+
+        }
+    }
+}
+
+
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index f30430a..dcae2ed 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -59,6 +59,7 @@ typedef struct _PublishingRESTSupportArgument PublishingRESTSupportArgument;
 typedef struct _PublishingRESTSupportArgumentClass PublishingRESTSupportArgumentClass;
 typedef struct _PublishingRESTSupportArgumentPrivate PublishingRESTSupportArgumentPrivate;
 #define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 typedef struct _PublishingRESTSupportParamSpecArgument PublishingRESTSupportParamSpecArgument;
 
 #define PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION (publishing_rest_support_transaction_get_type ())
@@ -72,7 +73,6 @@ typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransactio
 typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
 typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction;
 enum  {
@@ -423,10 +423,11 @@ enum  {
 };
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
 PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape);
 gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
 PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
 static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self);
 static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj);
 gpointer publishing_rest_support_transaction_ref (gpointer instance);
 void publishing_rest_support_transaction_unref (gpointer instance);
@@ -634,13 +635,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 637 "RESTSupport.c"
+#line 638 "RESTSupport.c"
 	}
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 643 "RESTSupport.c"
+#line 644 "RESTSupport.c"
 }
 
 
@@ -702,7 +703,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 705 "RESTSupport.c"
+#line 706 "RESTSupport.c"
 }
 
 
@@ -734,7 +735,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 737 "RESTSupport.c"
+#line 738 "RESTSupport.c"
 }
 
 
@@ -748,7 +749,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 (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, _tmp0_);
-#line 751 "RESTSupport.c"
+#line 752 "RESTSupport.c"
 }
 
 
@@ -757,7 +758,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 (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL], 0);
-#line 760 "RESTSupport.c"
+#line 761 "RESTSupport.c"
 }
 
 
@@ -769,7 +770,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 (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, _tmp0_);
-#line 772 "RESTSupport.c"
+#line 773 "RESTSupport.c"
 }
 
 
@@ -779,7 +780,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 _tmp0_;
-#line 782 "RESTSupport.c"
+#line 783 "RESTSupport.c"
 }
 
 
@@ -788,7 +789,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 791 "RESTSupport.c"
+#line 792 "RESTSupport.c"
 }
 
 
@@ -806,7 +807,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 809 "RESTSupport.c"
+#line 810 "RESTSupport.c"
 }
 
 
@@ -820,7 +821,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 823 "RESTSupport.c"
+#line 824 "RESTSupport.c"
 }
 
 
@@ -835,14 +836,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 838 "RESTSupport.c"
+#line 839 "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 845 "RESTSupport.c"
+#line 846 "RESTSupport.c"
 }
 
 
@@ -863,7 +864,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 866 "RESTSupport.c"
+#line 867 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -881,7 +882,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 884 "RESTSupport.c"
+#line 885 "RESTSupport.c"
 }
 
 
@@ -898,14 +899,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 901 "RESTSupport.c"
+#line 902 "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 908 "RESTSupport.c"
+#line 909 "RESTSupport.c"
 }
 
 
@@ -914,7 +915,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 917 "RESTSupport.c"
+#line 918 "RESTSupport.c"
 	}
 }
 
@@ -924,11 +925,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 927 "RESTSupport.c"
+#line 928 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 931 "RESTSupport.c"
+#line 932 "RESTSupport.c"
 	}
 }
 
@@ -936,37 +937,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 939 "RESTSupport.c"
+#line 940 "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 946 "RESTSupport.c"
+#line 947 "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 953 "RESTSupport.c"
+#line 954 "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 957 "RESTSupport.c"
+#line 958 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 961 "RESTSupport.c"
+#line 962 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 965 "RESTSupport.c"
+#line 966 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 969 "RESTSupport.c"
+#line 970 "RESTSupport.c"
 }
 
 
@@ -977,25 +978,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 980 "RESTSupport.c"
+#line 981 "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 986 "RESTSupport.c"
+#line 987 "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 990 "RESTSupport.c"
+#line 991 "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 994 "RESTSupport.c"
+#line 995 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 998 "RESTSupport.c"
+#line 999 "RESTSupport.c"
 }
 
 
@@ -1009,7 +1010,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 1012 "RESTSupport.c"
+#line 1013 "RESTSupport.c"
 }
 
 
@@ -1018,7 +1019,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 1021 "RESTSupport.c"
+#line 1022 "RESTSupport.c"
 }
 
 
@@ -1038,17 +1039,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 1041 "RESTSupport.c"
+#line 1042 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1045 "RESTSupport.c"
+#line 1046 "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 1051 "RESTSupport.c"
+#line 1052 "RESTSupport.c"
 	}
 }
 
@@ -1067,17 +1068,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 1070 "RESTSupport.c"
+#line 1071 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1074 "RESTSupport.c"
+#line 1075 "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 1080 "RESTSupport.c"
+#line 1081 "RESTSupport.c"
 	}
 }
 
@@ -1097,7 +1098,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
 	publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL] = 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"
 	publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL] = 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 1100 "RESTSupport.c"
+#line 1101 "RESTSupport.c"
 }
 
 
@@ -1112,7 +1113,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 1115 "RESTSupport.c"
+#line 1116 "RESTSupport.c"
 }
 
 
@@ -1126,7 +1127,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 1129 "RESTSupport.c"
+#line 1130 "RESTSupport.c"
 }
 
 
@@ -1151,7 +1152,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 1154 "RESTSupport.c"
+#line 1155 "RESTSupport.c"
 }
 
 
@@ -1164,7 +1165,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 1167 "RESTSupport.c"
+#line 1168 "RESTSupport.c"
 	}
 }
 
@@ -1175,7 +1176,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 1178 "RESTSupport.c"
+#line 1179 "RESTSupport.c"
 		{
 			gchar* _tmp0_;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1184,11 +1185,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 1187 "RESTSupport.c"
+#line 1188 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1191 "RESTSupport.c"
+#line 1192 "RESTSupport.c"
 		{
 			gchar* _tmp1_;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1197,11 +1198,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 1200 "RESTSupport.c"
+#line 1201 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1204 "RESTSupport.c"
+#line 1205 "RESTSupport.c"
 		{
 			gchar* _tmp2_;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1210,13 +1211,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 1213 "RESTSupport.c"
+#line 1214 "RESTSupport.c"
 		}
 		default:
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1219 "RESTSupport.c"
+#line 1220 "RESTSupport.c"
 		}
 	}
 }
@@ -1235,7 +1236,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 1238 "RESTSupport.c"
+#line 1239 "RESTSupport.c"
 	} else {
 		const gchar* _tmp1_;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1246,7 +1247,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 1249 "RESTSupport.c"
+#line 1250 "RESTSupport.c"
 		} else {
 			const gchar* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1257,14 +1258,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 1260 "RESTSupport.c"
+#line 1261 "RESTSupport.c"
 			} else {
 				const gchar* _tmp3_;
 #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 1267 "RESTSupport.c"
+#line 1268 "RESTSupport.c"
 			}
 		}
 	}
@@ -1313,14 +1314,139 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	self->value = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1316 "RESTSupport.c"
+#line 1317 "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 1323 "RESTSupport.c"
+#line 1324 "RESTSupport.c"
+}
+
+
+static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return self ? publishing_rest_support_argument_ref (self) : NULL;
+#line 1331 "RESTSupport.c"
+}
+
+
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator) {
+	gchar* result = NULL;
+	GString* builder = NULL;
+	GString* _tmp0_;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	GString* _tmp10_;
+	gssize _tmp11_;
+	GString* _tmp18_;
+	const gchar* _tmp19_;
+	gchar* _tmp20_;
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp0_ = g_string_new ("");
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	builder = _tmp0_;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp1_ = args;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp1__length1 = args_length1;
+#line 1354 "RESTSupport.c"
+	{
+		PublishingRESTSupportArgument** arg_collection = NULL;
+		gint arg_collection_length1 = 0;
+		gint _arg_collection_size_ = 0;
+		gint arg_it = 0;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		arg_collection = _tmp1_;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		arg_collection_length1 = _tmp1__length1;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
+#line 1366 "RESTSupport.c"
+			PublishingRESTSupportArgument* _tmp2_;
+			PublishingRESTSupportArgument* arg = NULL;
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			arg = _tmp2_;
+#line 1373 "RESTSupport.c"
+			{
+				GString* _tmp3_;
+				PublishingRESTSupportArgument* _tmp4_;
+				gboolean _tmp5_;
+				gchar* _tmp6_;
+				gchar* _tmp7_;
+				GString* _tmp8_;
+				const gchar* _tmp9_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp3_ = builder;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp4_ = arg;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp5_ = escape;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp6_ = publishing_rest_support_argument_to_string (_tmp4_, _tmp5_);
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp7_ = _tmp6_;
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				g_string_append (_tmp3_, _tmp7_);
+#line 130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_g_free0 (_tmp7_);
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp8_ = builder;
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp9_ = separator;
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				g_string_append (_tmp8_, _tmp9_);
+#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_publishing_rest_support_argument_unref0 (arg);
+#line 1404 "RESTSupport.c"
+			}
+		}
+	}
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp10_ = builder;
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp11_ = _tmp10_->len;
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (_tmp11_ > ((gssize) 0)) {
+#line 1414 "RESTSupport.c"
+		GString* _tmp12_;
+		GString* _tmp13_;
+		gssize _tmp14_;
+		const gchar* _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp12_ = builder;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp13_ = builder;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp14_ = _tmp13_->len;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp15_ = separator;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp16_ = strlen (_tmp15_);
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp17_ = _tmp16_;
+#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_string_truncate (_tmp12_, (gsize) (_tmp14_ - _tmp17_));
+#line 1435 "RESTSupport.c"
+	}
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp18_ = builder;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp19_ = _tmp18_->str;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp20_ = g_strdup (_tmp19_);
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	result = _tmp20_;
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_string_free0 (builder);
+#line 137 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return result;
+#line 1449 "RESTSupport.c"
 }
 
 
@@ -1332,43 +1458,36 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	PublishingRESTSupportArgument* _tmp3_;
 	const gchar* _tmp4_;
 	gint _tmp5_;
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg2), 0);
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_strcmp0;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = arg1;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->key;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = arg2;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = _tmp3_->key;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp5_;
-#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1355 "RESTSupport.c"
+#line 1481 "RESTSupport.c"
 }
 
 
 static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1364 "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 1371 "RESTSupport.c"
+#line 1490 "RESTSupport.c"
 }
 
 
@@ -1383,98 +1502,126 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	gpointer* _tmp7_;
 	PublishingRESTSupportArgument** _tmp8_;
 	gint _tmp8__length1;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	sorted_args = _tmp0_;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = inputArray;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = inputArray_length1;
-#line 1394 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
 		gint _arg_collection_size_ = 0;
 		gint arg_it = 0;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection = _tmp1_;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection_length1 = _tmp1__length1;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1406 "RESTSupport.c"
+#line 1525 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp2_;
 			PublishingRESTSupportArgument* arg = NULL;
-#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/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"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp2_;
-#line 1413 "RESTSupport.c"
+#line 1532 "RESTSupport.c"
 			{
 				GeeTreeSet* _tmp3_;
 				PublishingRESTSupportArgument* _tmp4_;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = sorted_args;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = arg;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				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"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 1425 "RESTSupport.c"
+#line 1544 "RESTSupport.c"
 			}
 		}
 	}
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = sorted_args;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8__length1 = _tmp6_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp8__length1;
-#line 1441 "RESTSupport.c"
+#line 1560 "RESTSupport.c"
 	}
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (sorted_args);
-#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1449 "RESTSupport.c"
+#line 1568 "RESTSupport.c"
 }
 
 
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self) {
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape) {
 	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	const gchar* _tmp0_ = NULL;
+	gboolean _tmp1_;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->key;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->value;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = g_strdup_printf ("%s=%s", _tmp0_, _tmp1_);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp1_ = escape;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (_tmp1_) {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp0_ = "\"";
+#line 1589 "RESTSupport.c"
+	} else {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp0_ = "";
+#line 1593 "RESTSupport.c"
+	}
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp3_ = escape;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	if (_tmp3_) {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp2_ = "\"";
+#line 1601 "RESTSupport.c"
+	} else {
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		_tmp2_ = "";
+#line 1605 "RESTSupport.c"
+	}
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp4_ = self->key;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp5_ = self->value;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp6_ = g_strdup_printf ("%s=%s%s%s", _tmp4_, _tmp0_, _tmp5_, _tmp2_);
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	result = _tmp6_;
+#line 154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1470 "RESTSupport.c"
+#line 1617 "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 1477 "RESTSupport.c"
+#line 1624 "RESTSupport.c"
 }
 
 
@@ -1483,7 +1630,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 1486 "RESTSupport.c"
+#line 1633 "RESTSupport.c"
 	}
 }
 
@@ -1493,11 +1640,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 1496 "RESTSupport.c"
+#line 1643 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1500 "RESTSupport.c"
+#line 1647 "RESTSupport.c"
 	}
 }
 
@@ -1505,37 +1652,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 1508 "RESTSupport.c"
+#line 1655 "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 1515 "RESTSupport.c"
+#line 1662 "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 1522 "RESTSupport.c"
+#line 1669 "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 1526 "RESTSupport.c"
+#line 1673 "RESTSupport.c"
 		}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1530 "RESTSupport.c"
+#line 1677 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1534 "RESTSupport.c"
+#line 1681 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1538 "RESTSupport.c"
+#line 1685 "RESTSupport.c"
 }
 
 
@@ -1546,25 +1693,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 1549 "RESTSupport.c"
+#line 1696 "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 1555 "RESTSupport.c"
+#line 1702 "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 1559 "RESTSupport.c"
+#line 1706 "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 1563 "RESTSupport.c"
+#line 1710 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1567 "RESTSupport.c"
+#line 1714 "RESTSupport.c"
 }
 
 
@@ -1578,7 +1725,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 1581 "RESTSupport.c"
+#line 1728 "RESTSupport.c"
 }
 
 
@@ -1587,7 +1734,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 1590 "RESTSupport.c"
+#line 1737 "RESTSupport.c"
 }
 
 
@@ -1607,17 +1754,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 1610 "RESTSupport.c"
+#line 1757 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1614 "RESTSupport.c"
+#line 1761 "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 1620 "RESTSupport.c"
+#line 1767 "RESTSupport.c"
 	}
 }
 
@@ -1636,17 +1783,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 1639 "RESTSupport.c"
+#line 1786 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1643 "RESTSupport.c"
+#line 1790 "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 1649 "RESTSupport.c"
+#line 1796 "RESTSupport.c"
 	}
 }
 
@@ -1656,14 +1803,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 1659 "RESTSupport.c"
+#line 1806 "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 1666 "RESTSupport.c"
+#line 1813 "RESTSupport.c"
 }
 
 
@@ -1677,7 +1824,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 1680 "RESTSupport.c"
+#line 1827 "RESTSupport.c"
 }
 
 
@@ -1702,7 +1849,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 1705 "RESTSupport.c"
+#line 1852 "RESTSupport.c"
 }
 
 
@@ -1715,15 +1862,15 @@ 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 1718 "RESTSupport.c"
+#line 1865 "RESTSupport.c"
 	}
 }
 
 
 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"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1726 "RESTSupport.c"
+#line 1873 "RESTSupport.c"
 }
 
 
@@ -1741,60 +1888,60 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
 	gchar* _tmp9_;
 	SoupMessage* _tmp10_;
 	SoupMessage* _tmp11_;
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent_session;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp2_);
-#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = parent_session;
-#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = _tmp3_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = method;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = parent_session;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = soup_message_new (_tmp6_, _tmp9_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp10_;
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp6_);
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = self->priv->message;
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1790 "RESTSupport.c"
+#line 1937 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1797 "RESTSupport.c"
+#line 1944 "RESTSupport.c"
 }
 
 
@@ -1808,50 +1955,50 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	gchar* _tmp5_;
 	const gchar* _tmp6_;
 	SoupMessage* _tmp7_;
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent_session;
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = _tmp0_;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->endpoint_url = _tmp2_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = method;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = endpoint_url;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = soup_message_new (_tmp5_, _tmp6_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp7_;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1847 "RESTSupport.c"
+#line 1994 "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"
+#line 184 "/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 1854 "RESTSupport.c"
+#line 2001 "RESTSupport.c"
 }
 
 
@@ -1863,36 +2010,36 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
 	SoupMessage* _tmp4_;
 	SoupMessageBody* _tmp5_;
 	gint64 _tmp6_;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (written_data != NULL);
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->bytes_written;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = written_data;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->length;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->bytes_written;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->priv->message;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_->request_body;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_->length;
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
-#line 1888 "RESTSupport.c"
+#line 2035 "RESTSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1895 "RESTSupport.c"
+#line 2042 "RESTSupport.c"
 }
 
 
@@ -1900,40 +2047,40 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 	SoupMessage* _tmp0_;
 	SoupMessage* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = message;
-#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1915 "RESTSupport.c"
+#line 2062 "RESTSupport.c"
 	}
 	{
 		SoupMessage* _tmp2_;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = message;
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1927 "RESTSupport.c"
+#line 2074 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("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 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 1936 "RESTSupport.c"
+#line 2083 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
@@ -1946,54 +2093,54 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		gchar* _tmp6_;
 		GError* _tmp7_;
 		GError* _tmp8_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = err;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = _tmp3_->message;
-#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_warning ("RESTSupport.vala:188: Publishing error: %s", _tmp4_);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_warning ("RESTSupport.vala:203: Publishing error: %s", _tmp4_);
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (self);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_warning ("RESTSupport.vala:189: response validation failed. bad response = '%s'.", _tmp6_);
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_warning ("RESTSupport.vala:204: response validation failed. bad response = '%s'.", _tmp6_);
+#line 204 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp6_);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = err;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = _g_error_copy0 (_tmp7_);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (self->priv->err);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->err = _tmp8_;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 1977 "RESTSupport.c"
+#line 2124 "RESTSupport.c"
 	}
 	__finally0:
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/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);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1988 "RESTSupport.c"
+#line 2135 "RESTSupport.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "RESTSupport.c"
+#line 2143 "RESTSupport.c"
 }
 
 
@@ -2022,145 +2169,145 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	GString* _tmp40_;
 	const gchar* _tmp41_;
 	gchar* _tmp42_;
-#line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_get_https_status (_tmp0_, &_tmp1_, &_tmp2_);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (_vala_cert);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_cert = _tmp3_;
-#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	tls_errors = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	list = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = tls_errors;
-#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2047 "RESTSupport.c"
+#line 2194 "RESTSupport.c"
 		GeeArrayList* _tmp6_;
-#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = list;
-#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website presented identification that belongs to a different we" \
 "bsite."));
-#line 2053 "RESTSupport.c"
+#line 2200 "RESTSupport.c"
 	}
-#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = tls_errors;
-#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2059 "RESTSupport.c"
+#line 2206 "RESTSupport.c"
 		GeeArrayList* _tmp8_;
-#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = list;
-#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is too old to trust. Check the date on" \
 " your computer’s calendar."));
-#line 2065 "RESTSupport.c"
+#line 2212 "RESTSupport.c"
 	}
-#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = tls_errors;
-#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2071 "RESTSupport.c"
+#line 2218 "RESTSupport.c"
 		GeeArrayList* _tmp10_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp10_ = list;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification was not issued by a trusted organizati" \
 "on."));
-#line 2077 "RESTSupport.c"
+#line 2224 "RESTSupport.c"
 	}
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = tls_errors;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2083 "RESTSupport.c"
+#line 2230 "RESTSupport.c"
 		GeeArrayList* _tmp12_;
-#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp12_ = list;
-#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification could not be processed. It may be corr" \
 "upted."));
-#line 2089 "RESTSupport.c"
+#line 2236 "RESTSupport.c"
 	}
-#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = tls_errors;
-#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2095 "RESTSupport.c"
+#line 2242 "RESTSupport.c"
 		GeeArrayList* _tmp14_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = list;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification has been revoked by the trusted organi" \
 "zation that issued it."));
-#line 2101 "RESTSupport.c"
+#line 2248 "RESTSupport.c"
 	}
-#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = tls_errors;
-#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2107 "RESTSupport.c"
+#line 2254 "RESTSupport.c"
 		GeeArrayList* _tmp16_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp16_ = list;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification cannot be trusted because it uses very" \
 " weak encryption."));
-#line 2113 "RESTSupport.c"
+#line 2260 "RESTSupport.c"
 	}
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp17_ = tls_errors;
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2119 "RESTSupport.c"
+#line 2266 "RESTSupport.c"
 		GeeArrayList* _tmp18_;
-#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = list;
-#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is only valid for future dates. Check " \
 "the date on your computer’s calendar."));
-#line 2125 "RESTSupport.c"
+#line 2272 "RESTSupport.c"
 	}
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp19_ = g_string_new ("");
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	builder = _tmp19_;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = list;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = _tmp21_;
-#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp22_ == 1) {
-#line 2139 "RESTSupport.c"
+#line 2286 "RESTSupport.c"
 		GString* _tmp23_;
 		GeeArrayList* _tmp24_;
 		gpointer _tmp25_;
 		gchar* _tmp26_;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp23_ = builder;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = list;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp26_ = (gchar*) _tmp25_;
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_string_append (_tmp23_, _tmp26_);
-#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp26_);
-#line 2156 "RESTSupport.c"
+#line 2303 "RESTSupport.c"
 	} else {
 		{
 			GeeArrayList* _entry_list = NULL;
@@ -2171,25 +2318,25 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 			gint _tmp30_;
 			gint _tmp31_;
 			gint _entry_index = 0;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp27_ = list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_entry_list = _tmp28_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp29_ = _entry_list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_entry_size = _tmp31_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_entry_index = -1;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 2185 "RESTSupport.c"
+#line 2332 "RESTSupport.c"
 				gint _tmp32_;
 				gint _tmp33_;
 				gint _tmp34_;
@@ -2199,68 +2346,68 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 				gpointer _tmp37_;
 				GString* _tmp38_;
 				const gchar* _tmp39_;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp32_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_entry_index = _tmp32_ + 1;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp33_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp34_ = _entry_size;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!(_tmp33_ < _tmp34_)) {
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 2207 "RESTSupport.c"
+#line 2354 "RESTSupport.c"
 				}
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp35_ = _entry_list;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp36_ = _entry_index;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				entry = (gchar*) _tmp37_;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp38_ = builder;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp39_ = entry;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_string_append_printf (_tmp38_, "%s\n", _tmp39_);
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (entry);
-#line 2225 "RESTSupport.c"
+#line 2372 "RESTSupport.c"
 			}
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (_entry_list);
-#line 2229 "RESTSupport.c"
+#line 2376 "RESTSupport.c"
 		}
 	}
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp40_ = builder;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp41_ = _tmp40_->str;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp42_ = g_strdup (_tmp41_);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp42_;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (builder);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (list);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (cert) {
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*cert = _vala_cert;
-#line 2248 "RESTSupport.c"
+#line 2395 "RESTSupport.c"
 	} else {
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_vala_cert);
-#line 2252 "RESTSupport.c"
+#line 2399 "RESTSupport.c"
 	}
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2256 "RESTSupport.c"
+#line 2403 "RESTSupport.c"
 }
 
 
@@ -2274,33 +2421,33 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 	guint8* _tmp45_;
 	gint _tmp45__length1;
 	GError * _inner_error_ = NULL;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = message;
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	switch (_tmp2_) {
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_OK:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CREATED:
-#line 2286 "RESTSupport.c"
+#line 2433 "RESTSupport.c"
 		{
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2290 "RESTSupport.c"
+#line 2437 "RESTSupport.c"
 		}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2296 "RESTSupport.c"
+#line 2443 "RESTSupport.c"
 		{
 			gchar* _tmp3_;
 			gchar* _tmp4_;
@@ -2309,46 +2456,46 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			guint _tmp7_;
 			GError* _tmp8_;
 			GError* _tmp9_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = _tmp3_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = message;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp4_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp9_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2329 "RESTSupport.c"
+#line 2476 "RESTSupport.c"
 			} else {
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/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);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2337 "RESTSupport.c"
+#line 2484 "RESTSupport.c"
 			}
 		}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT:
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2344 "RESTSupport.c"
+#line 2491 "RESTSupport.c"
 		{
 			gchar* _tmp10_;
 			gchar* _tmp11_;
@@ -2357,76 +2504,76 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			guint _tmp14_;
 			GError* _tmp15_;
 			GError* _tmp16_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = message;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp14_ = _tmp13_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp15_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp11_, _tmp14_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp16_ = _tmp15_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp11_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp16_;
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2377 "RESTSupport.c"
+#line 2524 "RESTSupport.c"
 			} else {
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/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);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2385 "RESTSupport.c"
+#line 2532 "RESTSupport.c"
 			}
 		}
-#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2390 "RESTSupport.c"
+#line 2537 "RESTSupport.c"
 		{
 			gchar* _tmp17_;
 			gchar* _tmp18_;
 			GError* _tmp19_;
 			GError* _tmp20_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp18_ = _tmp17_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp19_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp18_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp20_ = _tmp19_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp18_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_inner_error_ = _tmp20_;
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2414 "RESTSupport.c"
+#line 2561 "RESTSupport.c"
 			} else {
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/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);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2422 "RESTSupport.c"
+#line 2569 "RESTSupport.c"
 			}
 		}
 		default:
@@ -2434,15 +2581,15 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			SoupMessage* _tmp21_;
 			guint _tmp22_;
 			guint _tmp23_;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp21_ = message;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp23_ = _tmp22_;
-#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_tmp23_ >= ((guint) 100)) {
-#line 2438 "RESTSupport.c"
+#line 2585 "RESTSupport.c"
 				gchar* _tmp24_;
 				gchar* _tmp25_;
 				SoupMessage* _tmp26_;
@@ -2454,49 +2601,49 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				gchar* _tmp32_;
 				GError* _tmp33_;
 				GError* _tmp34_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp25_ = _tmp24_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp26_ = message;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp28_ = _tmp27_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp29_ = message;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp31_ = _tmp30_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp32_ = _tmp31_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp25_, _tmp28_, _tmp32_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp34_ = _tmp33_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp32_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp25_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_inner_error_ = _tmp34_;
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2484 "RESTSupport.c"
+#line 2631 "RESTSupport.c"
 				} else {
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/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);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2492 "RESTSupport.c"
+#line 2639 "RESTSupport.c"
 				}
 			} else {
 				gchar* _tmp35_;
@@ -2506,107 +2653,107 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				guint _tmp39_;
 				GError* _tmp40_;
 				GError* _tmp41_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp36_ = _tmp35_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp37_ = message;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp39_ = _tmp38_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp40_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp36_, _tmp39_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp36_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_inner_error_ = _tmp41_;
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2526 "RESTSupport.c"
+#line 2673 "RESTSupport.c"
 				} else {
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/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);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2534 "RESTSupport.c"
+#line 2681 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp43_ = message;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp44_ = _tmp43_->response_body;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45_ = _tmp44_->data;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45__length1 = (gint) _tmp44_->length;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp45_ == NULL) {
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = TRUE;
-#line 2551 "RESTSupport.c"
+#line 2698 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp46_;
 		SoupMessageBody* _tmp47_;
 		guint8* _tmp48_;
 		gint _tmp48__length1;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp46_ = message;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp47_ = _tmp46_->response_body;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp48_ = _tmp47_->data;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp48__length1 = (gint) _tmp47_->length;
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp48__length1 == 0;
-#line 2567 "RESTSupport.c"
+#line 2714 "RESTSupport.c"
 	}
-#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2571 "RESTSupport.c"
+#line 2718 "RESTSupport.c"
 		gchar* _tmp49_;
 		gchar* _tmp50_;
 		GError* _tmp51_;
 		GError* _tmp52_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp50_ = _tmp49_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp50_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp52_ = _tmp51_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp50_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp52_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2594 "RESTSupport.c"
+#line 2741 "RESTSupport.c"
 		} else {
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/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);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2602 "RESTSupport.c"
+#line 2749 "RESTSupport.c"
 		}
 	}
 }
@@ -2615,21 +2762,21 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 2615 "RESTSupport.c"
+#line 2762 "RESTSupport.c"
 		PublishingRESTSupportArgument* _tmp0_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/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"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 2621 "RESTSupport.c"
+#line 2768 "RESTSupport.c"
 	}
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2625 "RESTSupport.c"
+#line 2772 "RESTSupport.c"
 }
 
 
@@ -2641,31 +2788,31 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
 	gint _tmp1__length1;
 	PublishingRESTSupportArgument** _tmp2_;
 	gint _tmp2__length1;
-#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->arguments;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->arguments_length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 2655 "RESTSupport.c"
+#line 2802 "RESTSupport.c"
 	}
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2661 "RESTSupport.c"
+#line 2808 "RESTSupport.c"
 }
 
 
@@ -2681,56 +2828,56 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
 	gint _tmp5__length1;
 	PublishingRESTSupportArgument** _tmp6_;
 	gint _tmp6__length1;
-#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_arguments (self, &_tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = _tmp0_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_argument_sort (_tmp2_, _tmp0_, &_tmp3_);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5__length1 = _tmp3_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (result_length1) {
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp6__length1;
-#line 2701 "RESTSupport.c"
+#line 2848 "RESTSupport.c"
 	}
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp6_;
-#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2707 "RESTSupport.c"
+#line 2854 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
 	gboolean _tmp0_;
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = is_executed;
-#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = _tmp0_;
-#line 2719 "RESTSupport.c"
+#line 2866 "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"
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2726 "RESTSupport.c"
+#line 2873 "RESTSupport.c"
 }
 
 
@@ -2746,78 +2893,78 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 	GError* _tmp8_;
 	GError* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->parent_session;
-#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect (_tmp0_, "wire-message-unqueued", (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect (_tmp1_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->parent_session;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->message;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_send_wire_message (_tmp2_, _tmp3_);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->priv->parent_session;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp5_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 316 "/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_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = self->priv->message;
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp7_, NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->err;
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ != NULL) {
-#line 2774 "RESTSupport.c"
+#line 2921 "RESTSupport.c"
 		GError* _tmp9_;
-#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->err;
-#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL], 0, _tmp9_);
-#line 2780 "RESTSupport.c"
+#line 2927 "RESTSupport.c"
 	} else {
-#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL], 0);
-#line 2784 "RESTSupport.c"
+#line 2931 "RESTSupport.c"
 	}
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = self->priv->err;
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp10_ != NULL) {
-#line 2790 "RESTSupport.c"
+#line 2937 "RESTSupport.c"
 		GError* _tmp11_;
 		GError* _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp11_ = self->priv->err;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp12_ = _g_error_copy0 (_tmp11_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2805 "RESTSupport.c"
+#line 2952 "RESTSupport.c"
 		} else {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/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);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2813 "RESTSupport.c"
+#line 2960 "RESTSupport.c"
 		}
 	}
 }
@@ -2831,27 +2978,27 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	gchar* _tmp3_;
 	PublishingRESTSupportHttpMethod _tmp4_;
 	PublishingRESTSupportHttpMethod _tmp5_;
-#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp0_, "method", &_tmp1_, NULL);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp3_);
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp5_;
-#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2847 "RESTSupport.c"
+#line 2994 "RESTSupport.c"
 }
 
 
@@ -2860,30 +3007,30 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
 	SoupMessageHeaders* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (key != NULL);
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->message;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _tmp0_->request_headers;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = key;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = value;
-#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 2870 "RESTSupport.c"
+#line 3017 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 2879 "RESTSupport.c"
+#line 3026 "RESTSupport.c"
 }
 
 
@@ -2901,104 +3048,104 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 	guint8* _tmp12_;
 	gint _tmp12__length1;
 	gulong _tmp13_;
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (payload_content_type != NULL);
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = custom_payload;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == NULL) {
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->use_custom_payload = FALSE;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2913 "RESTSupport.c"
+#line 3060 "RESTSupport.c"
 	}
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = payload_length;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ > ((gulong) 0)) {
-#line 2919 "RESTSupport.c"
+#line 3066 "RESTSupport.c"
 		gulong _tmp4_;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = payload_length;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = _tmp4_;
-#line 2925 "RESTSupport.c"
+#line 3072 "RESTSupport.c"
 	} else {
 		const gchar* _tmp5_;
 		gint _tmp6_;
 		gint _tmp7_;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = custom_payload;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = strlen (_tmp5_);
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = (gulong) _tmp7_;
-#line 2938 "RESTSupport.c"
+#line 3085 "RESTSupport.c"
 	}
-#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->message;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = payload_content_type;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = custom_payload;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = _tmp11_;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12__length1 = _tmp11__length1;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = length;
-#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 356 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->use_custom_payload = TRUE;
-#line 2960 "RESTSupport.c"
+#line 3107 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
 	SoupMessage* _tmp0_;
 	SoupMessage* _tmp1_;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = message;
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp1_;
-#line 2979 "RESTSupport.c"
+#line 3126 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->is_executed;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2994 "RESTSupport.c"
+#line 3141 "RESTSupport.c"
 }
 
 
@@ -3008,30 +3155,30 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
 	SoupMessage* _tmp1_;
 	guint _tmp2_;
 	guint _tmp3_;
-#line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp3_;
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3020 "RESTSupport.c"
+#line 3167 "RESTSupport.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3027 "RESTSupport.c"
+#line 3174 "RESTSupport.c"
 }
 
 
@@ -3045,69 +3192,69 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	gboolean _tmp19_ = FALSE;
 	PublishingRESTSupportHttpMethod _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->use_custom_payload;
-#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 367 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		self->priv->is_executed = TRUE;
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3057 "RESTSupport.c"
+#line 3204 "RESTSupport.c"
 			} else {
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/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);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3065 "RESTSupport.c"
+#line 3212 "RESTSupport.c"
 			}
 		}
-#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3070 "RESTSupport.c"
+#line 3217 "RESTSupport.c"
 	}
-#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 389 "/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"
+#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3076 "RESTSupport.c"
+#line 3223 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp2_;
 		gint _tmp2__length1;
-#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->arguments;
-#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2__length1 = self->priv->arguments_length1;
-#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3085 "RESTSupport.c"
+#line 3232 "RESTSupport.c"
 	}
-#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("");
-#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	formdata_string = _tmp3_;
-#line 3091 "RESTSupport.c"
+#line 3238 "RESTSupport.c"
 	{
 		gint i = 0;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 3096 "RESTSupport.c"
+#line 3243 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 3103 "RESTSupport.c"
+#line 3250 "RESTSupport.c"
 				gint _tmp6_;
 				PublishingRESTSupportArgument** _tmp7_;
 				gint _tmp7__length1;
@@ -3122,102 +3269,102 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				gint _tmp15_;
 				PublishingRESTSupportArgument** _tmp16_;
 				gint _tmp16__length1;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 3120 "RESTSupport.c"
+#line 3267 "RESTSupport.c"
 					gint _tmp5_;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = i;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					i = _tmp5_ + 1;
-#line 3126 "RESTSupport.c"
+#line 3273 "RESTSupport.c"
 				}
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = i;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = self->priv->arguments;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7__length1 = self->priv->arguments_length1;
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!(_tmp6_ < _tmp7__length1)) {
-#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 3140 "RESTSupport.c"
+#line 3287 "RESTSupport.c"
 				}
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = self->priv->arguments;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9__length1 = self->priv->arguments_length1;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = i;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp11_ = _tmp9_[_tmp10_];
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp12_ = publishing_rest_support_argument_to_string (_tmp11_);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+				_tmp12_ = publishing_rest_support_argument_to_string (_tmp11_, FALSE);
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp13_ = _tmp12_;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (formdata_string);
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				formdata_string = _tmp14_;
-#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (_tmp13_);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp15_ = i;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16_ = self->priv->arguments;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16__length1 = self->priv->arguments_length1;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3172 "RESTSupport.c"
+#line 3319 "RESTSupport.c"
 					const gchar* _tmp17_;
 					gchar* _tmp18_;
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = formdata_string;
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp18_ = g_strconcat (_tmp17_, "&", NULL);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_free0 (formdata_string);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					formdata_string = _tmp18_;
-#line 3183 "RESTSupport.c"
+#line 3330 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old_url = NULL;
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	url_with_query = NULL;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = publishing_rest_support_transaction_get_method (self);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3196 "RESTSupport.c"
+#line 3343 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp21_;
 		gint _tmp21__length1;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = self->priv->arguments;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21__length1 = self->priv->arguments_length1;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = _tmp21__length1 > 0;
-#line 3205 "RESTSupport.c"
+#line 3352 "RESTSupport.c"
 	} else {
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3209 "RESTSupport.c"
+#line 3356 "RESTSupport.c"
 	}
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3213 "RESTSupport.c"
+#line 3360 "RESTSupport.c"
 		SoupMessage* _tmp22_;
 		SoupURI* _tmp23_;
 		gchar* _tmp24_;
@@ -3231,49 +3378,49 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		const gchar* _tmp32_;
 		SoupURI* _tmp33_;
 		SoupURI* _tmp34_;
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp22_ = self->priv->message;
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp23_ = soup_message_get_uri (_tmp22_);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (old_url);
-#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		old_url = _tmp24_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_strconcat (_tmp26_, "?", NULL);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp29_ = formdata_string;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (url_with_query);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		url_with_query = _tmp30_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp28_);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp26_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp31_ = self->priv->message;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp32_ = url_with_query;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp33_ = soup_uri_new (_tmp32_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp34_ = _tmp33_;
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_uri (_tmp31_, _tmp34_);
-#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		__vala_SoupURI_free0 (_tmp34_);
-#line 3269 "RESTSupport.c"
+#line 3416 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp35_;
 		const gchar* _tmp36_;
@@ -3281,122 +3428,122 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		gint _tmp37__length1;
 		guint8* _tmp38_;
 		gint _tmp38__length1;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp35_ = self->priv->message;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp36_ = formdata_string;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38_ = _tmp37_;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38__length1 = _tmp37__length1;
-#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 410 "/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 3289 "RESTSupport.c"
+#line 3436 "RESTSupport.c"
 	}
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3293 "RESTSupport.c"
+#line 3440 "RESTSupport.c"
 	{
 		SoupMessage* _tmp39_;
 		SoupURI* _tmp40_;
 		gchar* _tmp41_;
 		gchar* _tmp42_;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp39_ = self->priv->message;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp40_ = soup_message_get_uri (_tmp39_);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp41_;
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_debug ("RESTSupport.vala:402: sending message to URI = '%s'", _tmp42_);
-#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+		g_debug ("RESTSupport.vala:417: sending message to URI = '%s'", _tmp42_);
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp42_);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3315 "RESTSupport.c"
+#line 3462 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
 	__finally1:
 	{
 		const gchar* _tmp43_;
-#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp43_ = old_url;
-#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp43_ != NULL) {
-#line 3326 "RESTSupport.c"
+#line 3473 "RESTSupport.c"
 			SoupMessage* _tmp44_;
 			const gchar* _tmp45_;
 			SoupURI* _tmp46_;
 			SoupURI* _tmp47_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp44_ = self->priv->message;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp45_ = old_url;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp46_ = soup_uri_new (_tmp45_);
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp47_ = _tmp46_;
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			soup_message_set_uri (_tmp44_, _tmp47_);
-#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupURI_free0 (_tmp47_);
-#line 3343 "RESTSupport.c"
+#line 3490 "RESTSupport.c"
 		}
 	}
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (old_url);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (formdata_string);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3360 "RESTSupport.c"
+#line 3507 "RESTSupport.c"
 		} else {
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (old_url);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (formdata_string);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/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);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3374 "RESTSupport.c"
+#line 3521 "RESTSupport.c"
 		}
 	}
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (url_with_query);
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (old_url);
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (formdata_string);
-#line 3383 "RESTSupport.c"
+#line 3530 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3392 "RESTSupport.c"
+#line 3539 "RESTSupport.c"
 }
 
 
@@ -3408,27 +3555,27 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	guint8* _tmp3_;
 	gint _tmp3__length1;
 	gchar* _tmp4_;
-#line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->response_body;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _tmp2_->data;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3__length1 = (gint) _tmp2_->length;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp4_;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3424 "RESTSupport.c"
+#line 3571 "RESTSupport.c"
 }
 
 
@@ -3437,21 +3584,21 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
 	gboolean _tmp0_;
 	SoupMessage* _tmp1_;
 	SoupMessageHeaders* _tmp2_;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp1_->response_headers;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3447 "RESTSupport.c"
+#line 3594 "RESTSupport.c"
 }
 
 
@@ -3460,38 +3607,38 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	gboolean _tmp0_;
 	SoupMessage* _tmp1_;
 	SoupMessage* _tmp2_;
-#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "get_is_executed()");
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->message;
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3470 "RESTSupport.c"
+#line 3617 "RESTSupport.c"
 }
 
 
 static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((*length) == (*size)) {
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3481 "RESTSupport.c"
+#line 3628 "RESTSupport.c"
 	}
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[(*length)++] = value;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[*length] = NULL;
-#line 3487 "RESTSupport.c"
+#line 3634 "RESTSupport.c"
 }
 
 
@@ -3501,25 +3648,25 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
 	const gchar* _tmp1_;
 	const gchar* _tmp2_;
 	PublishingRESTSupportArgument* _tmp3_;
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (name != NULL);
-#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->arguments;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->arguments_length1;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = name;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = value;
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3515 "RESTSupport.c"
+#line 3662 "RESTSupport.c"
 }
 
 
@@ -3527,49 +3674,49 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_;
-#line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->endpoint_url;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 3529 "RESTSupport.c"
+#line 3676 "RESTSupport.c"
 		const gchar* _tmp2_;
 		gchar* _tmp3_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->endpoint_url;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp0_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp3_;
-#line 3540 "RESTSupport.c"
+#line 3687 "RESTSupport.c"
 	} else {
 		PublishingRESTSupportSession* _tmp4_;
 		gchar* _tmp5_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = self->priv->parent_session;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = publishing_rest_support_session_get_endpoint_url (_tmp4_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp0_);
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp5_;
-#line 3552 "RESTSupport.c"
+#line 3699 "RESTSupport.c"
 	}
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3558 "RESTSupport.c"
+#line 3705 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3565 "RESTSupport.c"
+#line 3712 "RESTSupport.c"
 }
 
 
@@ -3577,17 +3724,17 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	PublishingRESTSupportSession* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingRESTSupportSession* _tmp1_;
-#line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->parent_session;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3583 "RESTSupport.c"
+#line 3730 "RESTSupport.c"
 }
 
 
@@ -3598,267 +3745,267 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = closure->data;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3602 "RESTSupport.c"
+#line 3749 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = closure->data;
-#line 3608 "RESTSupport.c"
+#line 3755 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/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 3614 "RESTSupport.c"
+#line 3761 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_init (GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3621 "RESTSupport.c"
+#line 3768 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_free_value (GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3630 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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 3640 "RESTSupport.c"
+#line 3787 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3644 "RESTSupport.c"
+#line 3791 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3652 "RESTSupport.c"
+#line 3799 "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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3659 "RESTSupport.c"
+#line 3806 "RESTSupport.c"
 		PublishingRESTSupportTransaction * object;
 		object = collect_values[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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"
+#line 158 "/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 3666 "RESTSupport.c"
+#line 3813 "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"
+#line 158 "/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 3670 "RESTSupport.c"
+#line 3817 "RESTSupport.c"
 		}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3674 "RESTSupport.c"
+#line 3821 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3678 "RESTSupport.c"
+#line 3825 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3682 "RESTSupport.c"
+#line 3829 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportTransaction ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/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 3693 "RESTSupport.c"
+#line 3840 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 3699 "RESTSupport.c"
+#line 3846 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3703 "RESTSupport.c"
+#line 3850 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3707 "RESTSupport.c"
+#line 3854 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3711 "RESTSupport.c"
+#line 3858 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecTransaction* spec;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3725 "RESTSupport.c"
+#line 3872 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3734 "RESTSupport.c"
+#line 3881 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
 	PublishingRESTSupportTransaction * old;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3754 "RESTSupport.c"
+#line 3901 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3758 "RESTSupport.c"
+#line 3905 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3764 "RESTSupport.c"
+#line 3911 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
 	PublishingRESTSupportTransaction * old;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3783 "RESTSupport.c"
+#line 3930 "RESTSupport.c"
 	} else {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3787 "RESTSupport.c"
+#line 3934 "RESTSupport.c"
 	}
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3793 "RESTSupport.c"
+#line 3940 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_transaction_finalize;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate));
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_transaction_real_execute;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL] = g_signal_new ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL] = 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"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL] = 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 3815 "RESTSupport.c"
+#line 3962 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE (self);
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = FALSE;
-#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->parent_session = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = NULL;
-#line 149 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->bytes_written = 0;
-#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->err = NULL;
-#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->endpoint_url = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 3836 "RESTSupport.c"
+#line 3983 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingRESTSupportTransaction * self;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->arguments = (_vala_array_free (self->priv->arguments, self->priv->arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->message);
-#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_error_free0 (self->priv->err);
-#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 3854 "RESTSupport.c"
+#line 4001 "RESTSupport.c"
 }
 
 
@@ -3879,24 +4026,24 @@ GType publishing_rest_support_transaction_get_type (void) {
 gpointer publishing_rest_support_transaction_ref (gpointer instance) {
 	PublishingRESTSupportTransaction * self;
 	self = instance;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 3879 "RESTSupport.c"
+#line 4026 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_unref (gpointer instance) {
 	PublishingRESTSupportTransaction * self;
 	self = instance;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3892 "RESTSupport.c"
+#line 4039 "RESTSupport.c"
 	}
 }
 
@@ -3911,54 +4058,54 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	gchar* _tmp5_;
 	GHashTable* _tmp6_;
 	GeeHashMap* _tmp7_;
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishable;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = _tmp2_;
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = publishable;
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->mime_type = _tmp5_;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp6_;
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = _tmp7_;
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 3947 "RESTSupport.c"
+#line 4094 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
-#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 3954 "RESTSupport.c"
+#line 4101 "RESTSupport.c"
 }
 
 
@@ -3973,58 +4120,58 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	gchar* _tmp6_;
 	GHashTable* _tmp7_;
 	GeeHashMap* _tmp8_;
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishable;
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = _tmp3_;
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishable;
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->mime_type = _tmp6_;
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = _tmp8_;
-#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4013 "RESTSupport.c"
+#line 4160 "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"
+#line 470 "/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 4020 "RESTSupport.c"
+#line 4167 "RESTSupport.c"
 }
 
 
@@ -4033,74 +4180,74 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
 	GeeHashMap* _tmp0_;
 	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (key != NULL);
-#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (value != NULL);
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->message_headers;
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = key;
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = value;
-#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 482 "/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 4043 "RESTSupport.c"
+#line 4190 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
 	gchar* result = NULL;
 	SpitPublishingPublisherMediaType _tmp0_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = media_type;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4054 "RESTSupport.c"
+#line 4201 "RESTSupport.c"
 		gchar* _tmp1_;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result = _tmp1_;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 4062 "RESTSupport.c"
+#line 4209 "RESTSupport.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp2_;
-#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = media_type;
-#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4069 "RESTSupport.c"
+#line 4216 "RESTSupport.c"
 			gchar* _tmp3_;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 4077 "RESTSupport.c"
+#line 4224 "RESTSupport.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp4_;
 			GEnumValue* _tmp5_;
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = media_type;
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_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 4087 "RESTSupport.c"
+#line 491 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+			g_error ("RESTSupport.vala:491: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
+#line 4234 "RESTSupport.c"
 		}
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	var = (g_free (var), NULL);
-#line 4096 "RESTSupport.c"
+#line 4243 "RESTSupport.c"
 }
 
 
@@ -4117,81 +4264,81 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
 	gchar* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-#line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_str_hash;
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_str_equal;
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, _g_free0_);
-#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_result_ = _tmp2_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("filename");
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = self->publishable;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = g_file_get_basename (_tmp6_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_hash_table_insert (_result_, _tmp3_, _tmp9_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp8_);
-#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (_tmp6_);
-#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _result_;
-#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4147 "RESTSupport.c"
+#line 4294 "RESTSupport.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 4154 "RESTSupport.c"
+#line 4301 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
 	GHashTable* _tmp0_;
 	GHashTable* _tmp1_;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (new_disp_table != NULL);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = new_disp_table;
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp1_;
-#line 4173 "RESTSupport.c"
+#line 4320 "RESTSupport.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4180 "RESTSupport.c"
+#line 4327 "RESTSupport.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4187 "RESTSupport.c"
+#line 4334 "RESTSupport.c"
 }
 
 
@@ -4251,71 +4398,71 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	gboolean _tmp48_;
 	SoupMessage* _tmp60_;
 	GError * _inner_error_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = _tmp1_;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments_length1 = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_request_arguments_size_ = request_arguments_length1;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = request_arguments;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2__length1 = request_arguments_length1;
-#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp2__length1 > 0, "request_arguments.length > 0");
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = soup_multipart_new ("multipart/form-data");
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	message_parts = _tmp3_;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = request_arguments;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4__length1 = request_arguments_length1;
-#line 4271 "RESTSupport.c"
+#line 4418 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
 		gint _arg_collection_size_ = 0;
 		gint arg_it = 0;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection = _tmp4_;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		arg_collection_length1 = _tmp4__length1;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4283 "RESTSupport.c"
+#line 4430 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp5_;
 			PublishingRESTSupportArgument* arg = NULL;
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/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"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp5_;
-#line 4290 "RESTSupport.c"
+#line 4437 "RESTSupport.c"
 			{
 				SoupMultipart* _tmp6_;
 				PublishingRESTSupportArgument* _tmp7_;
 				const gchar* _tmp8_;
 				PublishingRESTSupportArgument* _tmp9_;
 				const gchar* _tmp10_;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = message_parts;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = arg;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = _tmp7_->key;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = arg;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = _tmp9_->value;
-#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
-#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 4311 "RESTSupport.c"
+#line 4458 "RESTSupport.c"
 			}
 		}
 	}
@@ -4327,48 +4474,48 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		gchar* _tmp15_;
 		gchar* _tmp16_ = NULL;
 		gsize _tmp17_ = 0UL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp11_ = self->publishable;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp12_ = spit_publishing_publishable_get_serialized_file (_tmp11_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp13_ = _tmp12_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp15_ = _tmp14_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_file_get_contents (_tmp15_, &_tmp16_, &_tmp17_, &_inner_error_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (payload);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		payload = _tmp16_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		payload_length = _tmp17_;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp15_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_tmp13_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4349 "RESTSupport.c"
+#line 4496 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/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 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("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 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4364 "RESTSupport.c"
+#line 4511 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
@@ -4376,138 +4523,138 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	{
 		GError* e = NULL;
 		GError* _tmp18_;
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		e = _inner_error_;
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp18_;
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (e);
-#line 4382 "RESTSupport.c"
+#line 4529 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4400 "RESTSupport.c"
+#line 4547 "RESTSupport.c"
 		} else {
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/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);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4414 "RESTSupport.c"
+#line 4561 "RESTSupport.c"
 		}
 	}
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp19_ = message_parts;
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = soup_multipart_get_length (_tmp19_);
-#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	payload_part_num = _tmp20_;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = payload;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23__length1 = _tmp22__length1;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = payload_length;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	bindable_data = _tmp25_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = message_parts;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp27_ = self->publishable;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = _tmp28_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp30_ = g_file_get_path (_tmp29_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = self->mime_type;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33_ = bindable_data;
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp31_);
-#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (_tmp29_);
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp34_ = message_parts;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp35_ = payload_part_num;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_);
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	image_part_header = _tmp36_;
-#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	image_part_body = _tmp37_;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp38_ = image_part_header;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp39_ = self->binary_disposition_table;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp40_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp41_ = _tmp40_;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp42_ = message_parts;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp44_ = _tmp43_;
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp41_);
-#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	outbound_message = _tmp44_;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp45_ = self->message_headers;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp46_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	i = _tmp46_;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp47_ = i;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp48_ = gee_map_iterator_next (_tmp47_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	cont = _tmp48_;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 4503 "RESTSupport.c"
+#line 4650 "RESTSupport.c"
 		gboolean _tmp49_;
 		SoupMessage* _tmp50_;
 		SoupMessageHeaders* _tmp51_;
@@ -4519,150 +4666,150 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		gchar* _tmp57_;
 		GeeMapIterator* _tmp58_;
 		gboolean _tmp59_;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp49_ = cont;
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (!_tmp49_) {
-#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 4521 "RESTSupport.c"
+#line 4668 "RESTSupport.c"
 		}
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp50_ = outbound_message;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = _tmp50_->request_headers;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp52_ = i;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp53_ = gee_map_iterator_get_key (_tmp52_);
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp54_ = (gchar*) _tmp53_;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp55_ = i;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp56_ = gee_map_iterator_get_value (_tmp55_);
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp57_ = (gchar*) _tmp56_;
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_);
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp57_);
-#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp54_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp58_ = i;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp59_ = gee_map_iterator_next (_tmp58_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		cont = _tmp59_;
-#line 4551 "RESTSupport.c"
+#line 4698 "RESTSupport.c"
 	}
-#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp60_ = outbound_message;
-#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp60_);
-#line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (outbound_message);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4581 "RESTSupport.c"
+#line 4728 "RESTSupport.c"
 		} else {
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (outbound_message);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/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);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4601 "RESTSupport.c"
+#line 4748 "RESTSupport.c"
 		}
 	}
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (i);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (outbound_message);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	__vala_SoupBuffer_free0 (bindable_data);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (payload);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/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 4616 "RESTSupport.c"
+#line 4763 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute;
-#line 4629 "RESTSupport.c"
+#line 4776 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
-#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->publishable = NULL;
-#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = NULL;
-#line 4640 "RESTSupport.c"
+#line 4787 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingRESTSupportUploadTransaction * self;
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (self->binary_disposition_table);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->publishable);
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->mime_type);
-#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->message_headers);
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4658 "RESTSupport.c"
+#line 4805 "RESTSupport.c"
 }
 
 
@@ -4681,22 +4828,22 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
 	PublishingRESTSupportXmlDocument* self = NULL;
 	xmlDoc* _tmp0_;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = doc;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->document = _tmp0_;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4685 "RESTSupport.c"
+#line 4832 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4692 "RESTSupport.c"
+#line 4839 "RESTSupport.c"
 }
 
 
@@ -4704,17 +4851,17 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 	xmlNode* result = NULL;
 	xmlDoc* _tmp0_;
 	xmlNode* _tmp1_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->document;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = xmlDocGetRootElement (_tmp0_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4710 "RESTSupport.c"
+#line 4857 "RESTSupport.c"
 }
 
 
@@ -4726,92 +4873,92 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 	const gchar* _tmp10_;
 	GError* _tmp11_;
 	GError * _inner_error_ = NULL;
-#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (child_name != NULL, NULL);
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = parent;
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _tmp0_->children;
-#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc_node_iter = _tmp1_;
-#line 4732 "RESTSupport.c"
+#line 4879 "RESTSupport.c"
 	{
 		gboolean _tmp2_ = FALSE;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = TRUE;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		while (TRUE) {
-#line 4739 "RESTSupport.c"
+#line 4886 "RESTSupport.c"
 			xmlNode* _tmp5_;
 			xmlNode* _tmp6_;
 			const gchar* _tmp7_;
 			const gchar* _tmp8_;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!_tmp2_) {
-#line 4746 "RESTSupport.c"
+#line 4893 "RESTSupport.c"
 				xmlNode* _tmp3_;
 				xmlNode* _tmp4_;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = doc_node_iter;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = _tmp3_->next;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				doc_node_iter = _tmp4_;
-#line 4755 "RESTSupport.c"
+#line 4902 "RESTSupport.c"
 			}
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = doc_node_iter;
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!(_tmp5_ != NULL)) {
-#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				break;
-#line 4765 "RESTSupport.c"
+#line 4912 "RESTSupport.c"
 			}
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp6_->name;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = child_name;
-#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4775 "RESTSupport.c"
+#line 4922 "RESTSupport.c"
 				xmlNode* _tmp9_;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				result = _tmp9_;
-#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 4783 "RESTSupport.c"
+#line 4930 "RESTSupport.c"
 			}
 		}
 	}
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = child_name;
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_inner_error_ = _tmp11_;
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4799 "RESTSupport.c"
+#line 4946 "RESTSupport.c"
 	} else {
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/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);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4807 "RESTSupport.c"
+#line 4954 "RESTSupport.c"
 	}
 }
 
@@ -4824,63 +4971,63 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 	gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (property_key != NULL, NULL);
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = node;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = property_key;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value_string = _tmp2_;
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = value_string;
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 4836 "RESTSupport.c"
+#line 4983 "RESTSupport.c"
 		const gchar* _tmp4_;
 		xmlNode* _tmp5_;
 		const gchar* _tmp6_;
 		GError* _tmp7_;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = property_key;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = node;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = _tmp5_->name;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp7_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", _tmp4_, _tmp6_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp7_;
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4859 "RESTSupport.c"
+#line 5006 "RESTSupport.c"
 		} else {
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#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);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4869 "RESTSupport.c"
+#line 5016 "RESTSupport.c"
 		}
 	}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = value_string;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4876 "RESTSupport.c"
+#line 5023 "RESTSupport.c"
 }
 
 
@@ -4903,7 +5050,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4899 "RESTSupport.c"
+#line 5046 "RESTSupport.c"
 }
 
 
@@ -4926,7 +5073,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4922 "RESTSupport.c"
+#line 5069 "RESTSupport.c"
 }
 
 
@@ -4961,75 +5108,75 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	gchar* _tmp35_;
 	const gchar* _tmp36_;
 	GError * _inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = input_string;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == NULL) {
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = TRUE;
-#line 4963 "RESTSupport.c"
+#line 5110 "RESTSupport.c"
 	} else {
 		const gchar* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = input_string;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 4976 "RESTSupport.c"
+#line 5123 "RESTSupport.c"
 	}
-#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 4980 "RESTSupport.c"
+#line 5127 "RESTSupport.c"
 		GError* _tmp5_;
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/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");
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp5_;
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4992 "RESTSupport.c"
+#line 5139 "RESTSupport.c"
 		} else {
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#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);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5000 "RESTSupport.c"
+#line 5147 "RESTSupport.c"
 		}
 	}
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = input_string;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = string_chug (_tmp7_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = string_chomp (_tmp9_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = _tmp10_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = g_str_has_prefix (_tmp11_, "<");
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = !_tmp12_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp11_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp13_) {
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 5025 "RESTSupport.c"
+#line 5172 "RESTSupport.c"
 	} else {
 		const gchar* _tmp14_;
 		gchar* _tmp15_;
@@ -5037,395 +5184,395 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		gchar* _tmp17_;
 		gchar* _tmp18_;
 		gboolean _tmp19_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = input_string;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp15_ = string_chug (_tmp14_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp16_ = _tmp15_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp17_ = string_chomp (_tmp16_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp18_ = _tmp17_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = g_str_has_suffix (_tmp18_, ">");
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = !_tmp19_;
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp18_);
-#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp16_);
-#line 5051 "RESTSupport.c"
+#line 5198 "RESTSupport.c"
 	}
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 5055 "RESTSupport.c"
+#line 5202 "RESTSupport.c"
 		GError* _tmp20_;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/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");
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp20_;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5067 "RESTSupport.c"
+#line 5214 "RESTSupport.c"
 		} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#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);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5075 "RESTSupport.c"
+#line 5222 "RESTSupport.c"
 		}
 	}
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp21_ = input_string;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = input_string;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = strlen (_tmp22_);
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc = _tmp25_;
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = doc;
-#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp26_ == NULL) {
-#line 5094 "RESTSupport.c"
+#line 5241 "RESTSupport.c"
 		GError* _tmp27_;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/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");
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp27_;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5106 "RESTSupport.c"
+#line 5253 "RESTSupport.c"
 		} else {
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/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);
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5114 "RESTSupport.c"
+#line 5261 "RESTSupport.c"
 		}
 	}
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp28_ = doc;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = _tmp28_->children;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == NULL) {
-#line 5123 "RESTSupport.c"
+#line 5270 "RESTSupport.c"
 		GError* _tmp30_;
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/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");
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp30_;
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5135 "RESTSupport.c"
+#line 5282 "RESTSupport.c"
 		} else {
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/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);
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5143 "RESTSupport.c"
+#line 5290 "RESTSupport.c"
 		}
 	}
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp31_ = doc;
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
-#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	rest_doc = _tmp32_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33_ = check_for_error_response;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp33__target = check_for_error_response_target;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp34_ = rest_doc;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_result_ = _tmp35_;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp36_ = _result_;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp36_ != NULL) {
-#line 5166 "RESTSupport.c"
+#line 5313 "RESTSupport.c"
 		const gchar* _tmp37_;
 		GError* _tmp38_;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp37_ = _result_;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = _tmp38_;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5185 "RESTSupport.c"
+#line 5332 "RESTSupport.c"
 		} else {
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/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);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5197 "RESTSupport.c"
+#line 5344 "RESTSupport.c"
 		}
 	}
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = rest_doc;
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_result_);
-#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5206 "RESTSupport.c"
+#line 5353 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_init (GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5213 "RESTSupport.c"
+#line 5360 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5222 "RESTSupport.c"
+#line 5369 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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 5232 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5236 "RESTSupport.c"
+#line 5383 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5244 "RESTSupport.c"
+#line 5391 "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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5251 "RESTSupport.c"
+#line 5398 "RESTSupport.c"
 		PublishingRESTSupportXmlDocument * object;
 		object = collect_values[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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"
+#line 554 "/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 5258 "RESTSupport.c"
+#line 5405 "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"
+#line 554 "/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 5262 "RESTSupport.c"
+#line 5409 "RESTSupport.c"
 		}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5266 "RESTSupport.c"
+#line 5413 "RESTSupport.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5270 "RESTSupport.c"
+#line 5417 "RESTSupport.c"
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5274 "RESTSupport.c"
+#line 5421 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportXmlDocument ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/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 5285 "RESTSupport.c"
+#line 5432 "RESTSupport.c"
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 5291 "RESTSupport.c"
+#line 5438 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5295 "RESTSupport.c"
+#line 5442 "RESTSupport.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5299 "RESTSupport.c"
+#line 5446 "RESTSupport.c"
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5303 "RESTSupport.c"
+#line 5450 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecXmlDocument* spec;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5317 "RESTSupport.c"
+#line 5464 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5326 "RESTSupport.c"
+#line 5473 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
 	PublishingRESTSupportXmlDocument * old;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5346 "RESTSupport.c"
+#line 5493 "RESTSupport.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5350 "RESTSupport.c"
+#line 5497 "RESTSupport.c"
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5356 "RESTSupport.c"
+#line 5503 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
 	PublishingRESTSupportXmlDocument * old;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5375 "RESTSupport.c"
+#line 5522 "RESTSupport.c"
 	} else {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5379 "RESTSupport.c"
+#line 5526 "RESTSupport.c"
 	}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5385 "RESTSupport.c"
+#line 5532 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_xml_document_parent_class = g_type_class_peek_parent (klass);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5397 "RESTSupport.c"
+#line 5544 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 5406 "RESTSupport.c"
+#line 5553 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj) {
 	PublishingRESTSupportXmlDocument * self;
 	xmlDoc* _tmp0_;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->document;
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	xmlFreeDoc (_tmp0_);
-#line 5421 "RESTSupport.c"
+#line 5568 "RESTSupport.c"
 }
 
 
@@ -5446,24 +5593,24 @@ GType publishing_rest_support_xml_document_get_type (void) {
 gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
 	PublishingRESTSupportXmlDocument * self;
 	self = instance;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 5446 "RESTSupport.c"
+#line 5593 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_xml_document_unref (gpointer instance) {
 	PublishingRESTSupportXmlDocument * self;
 	self = instance;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5459 "RESTSupport.c"
+#line 5606 "RESTSupport.c"
 	}
 }
 
@@ -5478,21 +5625,21 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	GString* _tmp23_;
 	const gchar* _tmp24_;
 	gchar* _tmp25_;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (source != NULL, NULL);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = g_string_new ("");
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	encoded_str_builder = _tmp0_;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = source;
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	current_char = _tmp2_;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 5488 "RESTSupport.c"
+#line 5635 "RESTSupport.c"
 		gint current_char_value = 0;
 		const gchar* _tmp3_;
 		gunichar _tmp4_;
@@ -5504,146 +5651,146 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		const gchar* _tmp20_;
 		const gchar* _tmp21_;
 		gchar* _tmp22_;
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = current_char;
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char_value = (gint) _tmp4_;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = current_char_value;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp5_ < 1) {
-#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 5512 "RESTSupport.c"
+#line 5659 "RESTSupport.c"
 		}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = current_char_value;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp9_ < 128) {
-#line 5518 "RESTSupport.c"
+#line 5665 "RESTSupport.c"
 			gint _tmp10_;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = current_char_value;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5524 "RESTSupport.c"
+#line 5671 "RESTSupport.c"
 		} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5528 "RESTSupport.c"
+#line 5675 "RESTSupport.c"
 		}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5532 "RESTSupport.c"
+#line 5679 "RESTSupport.c"
 			gint _tmp11_;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = current_char_value;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5538 "RESTSupport.c"
+#line 5685 "RESTSupport.c"
 		} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5542 "RESTSupport.c"
+#line 5689 "RESTSupport.c"
 		}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5546 "RESTSupport.c"
+#line 5693 "RESTSupport.c"
 			gint _tmp12_;
-#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = current_char_value;
-#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5552 "RESTSupport.c"
+#line 5699 "RESTSupport.c"
 		} else {
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5556 "RESTSupport.c"
+#line 5703 "RESTSupport.c"
 		}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5560 "RESTSupport.c"
+#line 5707 "RESTSupport.c"
 			GString* _tmp13_;
 			const gchar* _tmp14_;
 			gunichar _tmp15_;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp13_ = encoded_str_builder;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp14_ = current_char;
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
-#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5572 "RESTSupport.c"
+#line 5719 "RESTSupport.c"
 		} else {
 			GString* _tmp16_;
 			gint _tmp17_;
 			gchar* _tmp18_;
 			gchar* _tmp19_;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp16_ = encoded_str_builder;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp17_ = current_char_value;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp18_ = g_strdup_printf ("&#%d;", _tmp17_);
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp19_ = _tmp18_;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append (_tmp16_, _tmp19_);
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 656 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp19_);
-#line 5590 "RESTSupport.c"
+#line 5737 "RESTSupport.c"
 		}
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = g_utf8_next_char (_tmp20_);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp22_ = g_strdup (_tmp21_);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (current_char);
-#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char = _tmp22_;
-#line 5602 "RESTSupport.c"
+#line 5749 "RESTSupport.c"
 	}
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24_ = _tmp23_->str;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp25_ = g_strdup (_tmp24_);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp25_;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (current_char);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (encoded_str_builder);
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5618 "RESTSupport.c"
+#line 5765 "RESTSupport.c"
 }
 
 
 static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 5629 "RESTSupport.c"
+#line 5776 "RESTSupport.c"
 		SpitPublishingPublishable* _tmp0_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 5635 "RESTSupport.c"
+#line 5782 "RESTSupport.c"
 	}
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5639 "RESTSupport.c"
+#line 5786 "RESTSupport.c"
 }
 
 
@@ -5655,44 +5802,44 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 	gint _tmp1__length1;
 	PublishingRESTSupportSession* _tmp2_;
 	PublishingRESTSupportSession* _tmp3_;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishables;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = publishables_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = _tmp1_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables_length1 = _tmp1__length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = session;
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = _tmp3_;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 5681 "RESTSupport.c"
+#line 5828 "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"
+#line 696 "/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 5688 "RESTSupport.c"
+#line 5835 "RESTSupport.c"
 }
 
 
@@ -5702,36 +5849,36 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	gint _tmp0__length1;
 	gboolean _tmp23_;
 	GError * _inner_error_ = NULL;
-#line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->current_file = 0;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	stop = FALSE;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 5708 "RESTSupport.c"
+#line 5855 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
 		gint _publishable_collection_size_ = 0;
 		gint publishable_it = 0;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishable_collection = _tmp0_;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishable_collection_length1 = _tmp0__length1;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5720 "RESTSupport.c"
+#line 5867 "RESTSupport.c"
 			SpitPublishingPublishable* _tmp1_;
 			SpitPublishingPublishable* publishable = NULL;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/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"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishable = _tmp1_;
-#line 5727 "RESTSupport.c"
+#line 5874 "RESTSupport.c"
 			{
 				GFile* file = NULL;
 				SpitPublishingPublishable* _tmp2_;
@@ -5754,104 +5901,104 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				guint _tmp20_;
 				gboolean _tmp21_;
 				gint _tmp22_;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp2_ = publishable;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = spit_publishing_publishable_get_serialized_file (_tmp2_);
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				file = _tmp3_;
-#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = file;
-#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp4_ == NULL) {
-#line 5760 "RESTSupport.c"
+#line 5907 "RESTSupport.c"
 					gint _tmp5_;
-#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
-#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					self->priv->current_file = _tmp5_ + 1;
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					continue;
-#line 5772 "RESTSupport.c"
+#line 5919 "RESTSupport.c"
 				}
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = self->priv->publishables;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7__length1 = self->priv->publishables_length1;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				fraction_complete = ((gdouble) _tmp6_) / _tmp7__length1;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = self->priv->status_updated;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8__target = self->priv->status_updated_target;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp8_ != NULL) {
-#line 5788 "RESTSupport.c"
+#line 5935 "RESTSupport.c"
 					SpitPublishingProgressCallback _tmp9_;
 					void* _tmp9__target;
 					gint _tmp10_;
 					gdouble _tmp11_;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ = self->priv->status_updated;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9__target = self->priv->status_updated_target;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp10_ = self->priv->current_file;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp11_ = fraction_complete;
-#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5803 "RESTSupport.c"
+#line 5950 "RESTSupport.c"
 				}
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12__length1 = self->priv->publishables_length1;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp13_ = self->priv->current_file;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp14_ = _tmp12_[_tmp13_];
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp15_ = publishing_rest_support_batch_uploader_create_transaction (self, _tmp14_);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				txn = _tmp15_;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp16_ = txn;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 696 "/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 5821 "RESTSupport.c"
+#line 5968 "RESTSupport.c"
 				{
 					PublishingRESTSupportTransaction* _tmp17_;
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = txn;
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					publishing_rest_support_transaction_execute (_tmp17_, &_inner_error_);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5832 "RESTSupport.c"
+#line 5979 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_publishing_rest_support_transaction_unref0 (txn);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_g_object_unref0 (file);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						_g_object_unref0 (publishable);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						g_critical ("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 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						g_clear_error (&_inner_error_);
-#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						return;
-#line 5847 "RESTSupport.c"
+#line 5994 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
@@ -5859,82 +6006,82 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				{
 					GError* err = NULL;
 					GError* _tmp18_;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					err = _inner_error_;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_inner_error_ = NULL;
-#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp18_ = err;
-#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp18_);
-#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					stop = TRUE;
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_error_free0 (err);
-#line 5867 "RESTSupport.c"
+#line 6014 "RESTSupport.c"
 				}
 				__finally3:
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_publishing_rest_support_transaction_unref0 (txn);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/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);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 5884 "RESTSupport.c"
+#line 6031 "RESTSupport.c"
 				}
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_parse_name ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp20_, NULL, FALSE);
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp21_ = stop;
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp21_) {
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_publishing_rest_support_transaction_unref0 (txn);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (file);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_object_unref0 (publishable);
-#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 5904 "RESTSupport.c"
+#line 6051 "RESTSupport.c"
 				}
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				self->priv->current_file = _tmp22_ + 1;
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_transaction_unref0 (txn);
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (file);
-#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (publishable);
-#line 5916 "RESTSupport.c"
+#line 6063 "RESTSupport.c"
 			}
 		}
 	}
-#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = stop;
-#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp23_) {
-#line 5924 "RESTSupport.c"
+#line 6071 "RESTSupport.c"
 		gint _tmp24_;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = self->priv->current_file;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp24_);
-#line 5930 "RESTSupport.c"
+#line 6077 "RESTSupport.c"
 	}
 }
 
@@ -5953,52 +6100,52 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 	gdouble _tmp6_;
 	SpitPublishingProgressCallback _tmp7_;
 	void* _tmp7__target;
-#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	file_span = 1.0 / _tmp0__length1;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = bytes_written_so_far;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = total_bytes;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = self->priv->current_file;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = file_span;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = this_file_fraction_complete;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = file_span;
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = self->priv->status_updated;
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7__target = self->priv->status_updated_target;
-#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5979 "RESTSupport.c"
+#line 6126 "RESTSupport.c"
 		SpitPublishingProgressCallback _tmp8_;
 		void* _tmp8__target;
 		gint _tmp9_;
 		gdouble _tmp10_;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = self->priv->status_updated;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8__target = self->priv->status_updated_target;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->current_file;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp10_ = fraction_complete;
-#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 5994 "RESTSupport.c"
+#line 6141 "RESTSupport.c"
 	}
 }
 
@@ -6007,17 +6154,17 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	PublishingRESTSupportSession* result = NULL;
 	PublishingRESTSupportSession* _tmp0_;
 	PublishingRESTSupportSession* _tmp1_;
-#line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->session;
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6013 "RESTSupport.c"
+#line 6160 "RESTSupport.c"
 }
 
 
@@ -6028,41 +6175,41 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
 	gint _tmp1_;
 	SpitPublishingPublishable* _tmp2_;
 	SpitPublishingPublishable* _tmp3_;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->publishables;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->current_file;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp3_;
-#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6040 "RESTSupport.c"
+#line 6187 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6049 "RESTSupport.c"
+#line 6196 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6058 "RESTSupport.c"
+#line 6205 "RESTSupport.c"
 }
 
 
@@ -6071,260 +6218,260 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 	void* _tmp0__target;
 	SpitPublishingPublishable** _tmp1_;
 	gint _tmp1__length1;
-#line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = status_updated;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__target = status_updated_target;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated = _tmp0_;
-#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated_target = _tmp0__target;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->publishables;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = self->priv->publishables_length1;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1__length1 > 0) {
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_send_files (self);
-#line 6085 "RESTSupport.c"
+#line 6232 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 6093 "RESTSupport.c"
+#line 6240 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6102 "RESTSupport.c"
+#line 6249 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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 6112 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
 	} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6116 "RESTSupport.c"
+#line 6263 "RESTSupport.c"
 	}
 }
 
 
 static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6124 "RESTSupport.c"
+#line 6271 "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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 6131 "RESTSupport.c"
+#line 6278 "RESTSupport.c"
 		PublishingRESTSupportBatchUploader * object;
 		object = collect_values[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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"
+#line 664 "/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 6138 "RESTSupport.c"
+#line 6285 "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"
+#line 664 "/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 6142 "RESTSupport.c"
+#line 6289 "RESTSupport.c"
 		}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6146 "RESTSupport.c"
+#line 6293 "RESTSupport.c"
 	} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6150 "RESTSupport.c"
+#line 6297 "RESTSupport.c"
 	}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6154 "RESTSupport.c"
+#line 6301 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRESTSupportBatchUploader ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/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 6165 "RESTSupport.c"
+#line 6312 "RESTSupport.c"
 	}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 6171 "RESTSupport.c"
+#line 6318 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6175 "RESTSupport.c"
+#line 6322 "RESTSupport.c"
 	} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6179 "RESTSupport.c"
+#line 6326 "RESTSupport.c"
 	}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6183 "RESTSupport.c"
+#line 6330 "RESTSupport.c"
 }
 
 
 GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRESTSupportParamSpecBatchUploader* spec;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 6197 "RESTSupport.c"
+#line 6344 "RESTSupport.c"
 }
 
 
 gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6206 "RESTSupport.c"
+#line 6353 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
 	PublishingRESTSupportBatchUploader * old;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6226 "RESTSupport.c"
+#line 6373 "RESTSupport.c"
 	} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6230 "RESTSupport.c"
+#line 6377 "RESTSupport.c"
 	}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6236 "RESTSupport.c"
+#line 6383 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
 	PublishingRESTSupportBatchUploader * old;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	old = value->data[0].v_pointer;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (v_object) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 6255 "RESTSupport.c"
+#line 6402 "RESTSupport.c"
 	} else {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6259 "RESTSupport.c"
+#line 6406 "RESTSupport.c"
 	}
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6265 "RESTSupport.c"
+#line 6412 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_rest_support_batch_uploader_finalize;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate));
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = 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"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL] = 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 6283 "RESTSupport.c"
+#line 6430 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE (self);
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->current_file = 0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables = NULL;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->publishables_length1 = 0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = NULL;
-#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated = NULL;
-#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated_target = self;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 6306 "RESTSupport.c"
+#line 6453 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingRESTSupportBatchUploader * self;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6320 "RESTSupport.c"
+#line 6467 "RESTSupport.c"
 }
 
 
@@ -6345,24 +6492,24 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
 gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
 	PublishingRESTSupportBatchUploader * self;
 	self = instance;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 6345 "RESTSupport.c"
+#line 6492 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_batch_uploader_unref (gpointer instance) {
 	PublishingRESTSupportBatchUploader * self;
 	self = instance;
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6358 "RESTSupport.c"
+#line 6505 "RESTSupport.c"
 	}
 }
 
@@ -6381,7 +6528,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6377 "RESTSupport.c"
+#line 6524 "RESTSupport.c"
 }
 
 
@@ -6395,181 +6542,181 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	GString* _tmp14_;
 	const gchar* _tmp15_;
 	gchar* _tmp16_;
-#line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = s;
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	t = _tmp1_;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_string_new ("");
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	b = _tmp2_;
-#line 6403 "RESTSupport.c"
+#line 6550 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
 		const gchar* _tmp3_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = t;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		u = _tmp3_;
-#line 6411 "RESTSupport.c"
+#line 6558 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 6418 "RESTSupport.c"
+#line 6565 "RESTSupport.c"
 				const gchar* _tmp7_;
 				gunichar _tmp8_;
 				gunichar c = 0U;
 				const gchar* _tmp9_;
 				gunichar _tmp10_;
 				gunichar _tmp11_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 6427 "RESTSupport.c"
+#line 6574 "RESTSupport.c"
 					const gchar* _tmp5_;
 					const gchar* _tmp6_;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = u;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp6_ = g_utf8_next_char (_tmp5_);
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					u = _tmp6_;
-#line 6436 "RESTSupport.c"
+#line 6583 "RESTSupport.c"
 				}
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp7_ = u;
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = string_get_char (_tmp7_, (glong) 0);
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!(_tmp8_ != ((gunichar) 0))) {
-#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6448 "RESTSupport.c"
+#line 6595 "RESTSupport.c"
 				}
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp10_ = string_get_char (_tmp9_, (glong) 0);
-#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				c = _tmp10_;
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp11_ = c;
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (((gint) _tmp11_) < 128) {
-#line 6460 "RESTSupport.c"
+#line 6607 "RESTSupport.c"
 					GString* _tmp12_;
 					gunichar _tmp13_;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp12_ = b;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp13_ = c;
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6469 "RESTSupport.c"
+#line 6616 "RESTSupport.c"
 				}
 			}
 		}
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = b;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = _tmp14_->str;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp16_;
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (b);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (t);
-#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6488 "RESTSupport.c"
+#line 6635 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6497 "RESTSupport.c"
+#line 6644 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6506 "RESTSupport.c"
+#line 6653 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6515 "RESTSupport.c"
+#line 6662 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6524 "RESTSupport.c"
+#line 6671 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6533 "RESTSupport.c"
+#line 6680 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6542 "RESTSupport.c"
+#line 6689 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type) {
 	PublishingRESTSupportGoogleSession* self = NULL;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6552 "RESTSupport.c"
+#line 6699 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_user_name;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate;
-#line 6565 "RESTSupport.c"
+#line 6712 "RESTSupport.c"
 }
 
 
@@ -6590,9 +6737,9 @@ GType publishing_rest_support_google_session_get_type (void) {
 
 
 static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self);
-#line 6588 "RESTSupport.c"
+#line 6735 "RESTSupport.c"
 }
 
 
@@ -6605,82 +6752,82 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
 	SpitPublishingPluginHost* _tmp4_;
 	SpitPublishingAuthenticator* _tmp5_;
 	SpitPublishingAuthenticator* _tmp6_;
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (scope != NULL, NULL);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = scope;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->scope = _tmp1_;
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = _tmp2_;
-#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = service;
-#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->service = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = host;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->host = _tmp4_;
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = publishing_rest_support_google_publisher_get_authenticator (self);
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->authenticator);
-#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->authenticator = _tmp5_;
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = self->priv->authenticator;
-#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6643 "RESTSupport.c"
+#line 6790 "RESTSupport.c"
 }
 
 
 static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6652 "RESTSupport.c"
+#line 6799 "RESTSupport.c"
 }
 
 
 SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
-#line 6661 "RESTSupport.c"
+#line 6808 "RESTSupport.c"
 }
 
 
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_;
-#line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6676 "RESTSupport.c"
+#line 6823 "RESTSupport.c"
 }
 
 
@@ -6688,108 +6835,108 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	PublishingRESTSupportGoogleSession* result = NULL;
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_;
 	PublishingRESTSupportGoogleSession* _tmp1_;
-#line 825 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->session;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _publishing_rest_support_session_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6694 "RESTSupport.c"
+#line 6841 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6703 "RESTSupport.c"
+#line 6850 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 6712 "RESTSupport.c"
+#line 6859 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6721 "RESTSupport.c"
+#line 6868 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 6730 "RESTSupport.c"
+#line 6877 "RESTSupport.c"
 }
 
 
 static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return _tmp0_;
-#line 6740 "RESTSupport.c"
+#line 6887 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 6749 "RESTSupport.c"
+#line 6896 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6758 "RESTSupport.c"
+#line 6905 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 6767 "RESTSupport.c"
+#line 6914 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6776 "RESTSupport.c"
+#line 6923 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 6785 "RESTSupport.c"
+#line 6932 "RESTSupport.c"
 }
 
 
@@ -6798,24 +6945,24 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
 	SpitPublishingService* _tmp1_;
-#line 839 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->service;
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6804 "RESTSupport.c"
+#line 6951 "RESTSupport.c"
 }
 
 
 static gpointer _g_variant_ref0 (gpointer self) {
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 6811 "RESTSupport.c"
+#line 6958 "RESTSupport.c"
 }
 
 
@@ -6844,120 +6991,120 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica
 	GVariant* _tmp17_;
 	const gchar* _tmp18_;
 	gchar* _tmp19_;
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	params = _tmp1_;
-#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	refresh_token = NULL;
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 861 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	access_token = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	user_name = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_hash_table_lookup_extended (params, "RefreshToken", NULL, &_tmp2_);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (refresh_token);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = _g_variant_ref0 (_tmp2_);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	refresh_token = _tmp3_;
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_hash_table_lookup_extended (params, "AccessToken", NULL, &_tmp4_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (access_token);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = _g_variant_ref0 (_tmp4_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	access_token = _tmp5_;
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_hash_table_lookup_extended (params, "UserName", NULL, &_tmp6_);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (user_name);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _g_variant_ref0 (_tmp6_);
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	user_name = _tmp7_;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->session;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = refresh_token;
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = g_variant_get_string (_tmp9_, NULL);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp8_->refresh_token);
-#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_->refresh_token = _tmp11_;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_ = self->priv->session;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp13_ = access_token;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = g_variant_get_string (_tmp13_, NULL);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp12_->access_token);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp12_->access_token = _tmp15_;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_ = self->priv->session;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp17_ = user_name;
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp18_ = g_variant_get_string (_tmp17_, NULL);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp19_ = g_strdup (_tmp18_);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp16_->user_name);
-#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp16_->user_name = _tmp19_;
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_login_flow_complete (self);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (user_name);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (access_token);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_variant_unref0 (refresh_token);
-#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (params);
-#line 6924 "RESTSupport.c"
+#line 7071 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6946 "RESTSupport.c"
+#line 7093 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
-#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/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 6953 "RESTSupport.c"
+#line 7100 "RESTSupport.c"
 }
 
 
@@ -6965,15 +7112,15 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->access_token;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_ != NULL;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6969 "RESTSupport.c"
+#line 7116 "RESTSupport.c"
 }
 
 
@@ -6983,21 +7130,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->user_name;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != NULL, "user_name != null");
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->user_name;
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6993 "RESTSupport.c"
+#line 7140 "RESTSupport.c"
 }
 
 
@@ -7007,58 +7154,58 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	gboolean _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->access_token;
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 7017 "RESTSupport.c"
+#line 7164 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 781 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 7037 "RESTSupport.c"
+#line 7184 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_google_session_impl_parent_class = g_type_class_peek_parent (klass);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 7054 "RESTSupport.c"
+#line 7201 "RESTSupport.c"
 }
 
 
@@ -7068,17 +7215,17 @@ static void publishing_rest_support_google_publisher_google_session_impl_instanc
 
 static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/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 7074 "RESTSupport.c"
+#line 7221 "RESTSupport.c"
 }
 
 
@@ -7099,28 +7246,28 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 	PublishingRESTSupportGoogleSession* _tmp0_;
 	const gchar* _tmp1_;
 	PublishingRESTSupportHttpMethod _tmp2_;
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 7109 "RESTSupport.c"
+#line 7256 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/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 7116 "RESTSupport.c"
+#line 7263 "RESTSupport.c"
 }
 
 
@@ -7136,57 +7283,57 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	gchar* _tmp7_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	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 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = session;
-#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp4_, "session.is_authenticated()");
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = session;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 7168 "RESTSupport.c"
+#line 7315 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/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 7175 "RESTSupport.c"
+#line 7322 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
-#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 7182 "RESTSupport.c"
+#line 7329 "RESTSupport.c"
 }
 
 
@@ -7207,63 +7354,63 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
 
 
 static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_get_authenticator;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_on_login_flow_complete;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_do_logout;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_is_running;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_start;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 7221 "RESTSupport.c"
+#line 7368 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_is_running;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_start;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service;
-#line 7236 "RESTSupport.c"
+#line 7383 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 7243 "RESTSupport.c"
+#line 7390 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
 	PublishingRESTSupportGooglePublisher * self;
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->authenticator);
-#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 7259 "RESTSupport.c"
+#line 7406 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index f06473c..d92c264 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -123,6 +123,20 @@ public class Argument {
         this.value = value;
     }
 
+    public static string serialize_list(Argument[] args, bool escape = false, string? separator = "&") {
+        var builder = new StringBuilder("");
+
+        foreach (var arg in args) {
+            builder.append(arg.to_string(escape));
+            builder.append(separator);
+        }
+
+        if (builder.len > 0)
+            builder.truncate(builder.len - separator.length);
+
+        return builder.str;
+    }
+
     public static int compare(Argument arg1, Argument arg2) {
         return strcmp(arg1.key, arg2.key);
     }
@@ -136,8 +150,8 @@ public class Argument {
         return sorted_args.to_array();
     }
 
-    public string to_string () {
-        return "%s=%s".printf (this.key, this.value);
+    public string to_string (bool escape = false) {
+        return "%s=%s%s%s".printf (this.key, escape ? "\"" : "", this.value, escape ? "\"" : "");
     }
 }
 
@@ -154,6 +168,7 @@ public class Transaction {
     public signal void chunk_transmitted(int bytes_written_so_far, int total_bytes);
     public signal void network_error(Spit.Publishing.PublishingError err);
     public signal void completed();
+
     
     public Transaction(Session parent_session, HttpMethod method = HttpMethod.POST) {
         // if our creator doesn't specify an endpoint url by using the Transaction.with_endpoint_url
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index fa81657..9558cc1 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -47,9 +47,9 @@
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 #define RESOURCES_TRANSLATORS _ ("translator-credits")
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
-static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
 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);
 
@@ -61,7 +61,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add4 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -199,7 +199,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp14_ = _g_object_ref0 (_tmp13_);
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
-		_vala_array_add2 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp14_);
+		_vala_array_add4 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp14_);
 #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp15_ = icon_pixbuf_set;
 #line 51 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -238,7 +238,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 }
 
 
-static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add5 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -357,7 +357,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
-		_vala_array_add3 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp9_);
+		_vala_array_add5 (&icon_pixbuf_set, &icon_pixbuf_set_length1, &_icon_pixbuf_set_size_, _tmp9_);
 #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp10_ = icon_pixbuf_set;
 #line 68 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
diff --git a/plugins/common/meson.build b/plugins/common/meson.build
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/plugins/common/meson.build
diff --git a/plugins/meson.build b/plugins/meson.build
new file mode 100644
index 0000000..66096c7
--- /dev/null
+++ b/plugins/meson.build
@@ -0,0 +1,24 @@
+# Plugin helper library
+
+sw_plugin_common = library('shotwell-plugin-common',
+                          ['common/RESTSupport.vala',
+                           'common/Resources.vala',
+                           'common/WebAuthenticationPane.vala',
+                           'common/BuilderPane.vala',
+                           'common/OAuth1Support.vala'],
+                          version: meson.project_version(),
+                          dependencies : [gtk, gee, webkit, soup, xml, sw_plugin],
+                          vala_header : 'shotwell-plugin-common.h',
+                          vala_vapi : 'shotwell-plugin-common.vapi',
+                          include_directories : config_incdir,
+                          install : true)
+
+sw_plugin_common_dep = declare_dependency(include_directories : include_directories('.'),
+                                          link_with : sw_plugin_common)
+
+subdir('authenticator')
+subdir('shotwell-publishing')
+if get_option('enable-extra-plugins')
+  subdir('shotwell-publishing-extras')
+endif
+subdir('shotwell-transitions')
diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c
deleted file mode 100644
index 617edb9..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabase.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/* FSpotDatabase.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotDatabase.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <sqlite3.h>
-#include <gio/gio.h>
-#include <shotwell-plugin-dev-1.0.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE (data_imports_fspot_db_fspot_database_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabaseClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabaseClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabase DataImportsFSpotDbFSpotDatabase;
-typedef struct _DataImportsFSpotDbFSpotDatabaseClass DataImportsFSpotDbFSpotDatabaseClass;
-typedef struct _DataImportsFSpotDbFSpotDatabasePrivate DataImportsFSpotDbFSpotDatabasePrivate;
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE (data_imports_fspot_db_fspot_photos_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosTable DataImportsFSpotDbFSpotPhotosTable;
-typedef struct _DataImportsFSpotDbFSpotPhotosTableClass DataImportsFSpotDbFSpotPhotosTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE (data_imports_fspot_db_fspot_photo_versions_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTable DataImportsFSpotDbFSpotPhotoVersionsTable;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTableClass DataImportsFSpotDbFSpotPhotoVersionsTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE (data_imports_fspot_db_fspot_tags_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagsTable DataImportsFSpotDbFSpotTagsTable;
-typedef struct _DataImportsFSpotDbFSpotTagsTableClass DataImportsFSpotDbFSpotTagsTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE (data_imports_fspot_db_fspot_rolls_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsTable DataImportsFSpotDbFSpotRollsTable;
-typedef struct _DataImportsFSpotDbFSpotRollsTableClass DataImportsFSpotDbFSpotRollsTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE (data_imports_fspot_db_fspot_meta_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotMetaTable DataImportsFSpotDbFSpotMetaTable;
-typedef struct _DataImportsFSpotDbFSpotMetaTableClass DataImportsFSpotDbFSpotMetaTableClass;
-#define _sqlite3_close0(var) ((var == NULL) ? NULL : (var = (sqlite3_close (var), NULL)))
-#define _importable_database_table_unref0(var) ((var == NULL) ? NULL : (var = (importable_database_table_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define UTILS_TYPE_VERSION_NUMBER (utils_version_number_get_type ())
-#define UTILS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber))
-#define UTILS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-#define UTILS_IS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_IS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_VERSION_NUMBER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-
-typedef struct _UtilsVersionNumber UtilsVersionNumber;
-typedef struct _UtilsVersionNumberClass UtilsVersionNumberClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-
-struct _DataImportsFSpotDbFSpotDatabase {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotDatabasePrivate * priv;
-	DataImportsFSpotDbFSpotPhotosTable* photos_table;
-	DataImportsFSpotDbFSpotPhotoVersionsTable* photo_versions_table;
-	DataImportsFSpotDbFSpotTagsTable* tags_table;
-	DataImportsFSpotDbFSpotRollsTable* rolls_table;
-	gint64 hidden_tag_id;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotDatabasePrivate {
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotMetaTable* meta_table;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-
-static gpointer data_imports_fspot_db_fspot_database_parent_class = NULL;
-
-#define DATA_IMPORTS_FSPOT_DB_NULL_ID ((gint64) 0)
-#define DATA_IMPORTS_FSPOT_DB_INVALID_ID ((gint64) -1)
-void data_imports_fspot_db_init (void);
-void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void);
-GType data_imports_fspot_db_fspot_database_get_type (void) G_GNUC_CONST;
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photos_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_versions_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_tags_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_rolls_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_meta_table_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabasePrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_DUMMY_PROPERTY
-};
-GQuark database_error_quark (void);
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile* db_file, GError** error);
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error);
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sqlite3* db);
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db);
-gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
-GType utils_version_number_get_type (void) G_GNUC_CONST;
-static UtilsVersionNumber* data_imports_fspot_db_fspot_database_get_version (DataImportsFSpotDbFSpotDatabase* self, GError** error);
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_new (UtilsVersionNumber* version, GError** error);
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error);
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
-UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator);
-UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator);
-static void data_imports_fspot_db_fspot_database_finalize (GObject * obj);
-
-
-/**
- * Initialization method for the whole module.
- */
-void data_imports_fspot_db_init (void) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	data_imports_fspot_db_fspot_database_behavior_create_behavior_map ();
-#line 209 "FSpotDatabase.c"
-}
-
-
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error) {
-	DataImportsFSpotDbFSpotDatabase * self = NULL;
-	gchar* filename = NULL;
-	GFile* _tmp0_;
-	gchar* _tmp1_;
-	gint res = 0;
-	sqlite3* _tmp2_ = NULL;
-	gint _tmp3_;
-	sqlite3* _tmp5_;
-	DataImportsFSpotDbFSpotMetaTable* _tmp6_;
-	gint64 _tmp7_ = 0LL;
-	DataImportsFSpotDbFSpotMetaTable* _tmp8_;
-	gint64 _tmp9_;
-	UtilsVersionNumber* _tmp10_ = NULL;
-	UtilsVersionNumber* _tmp11_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_;
-	sqlite3* _tmp13_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_;
-	DataImportsFSpotDbFSpotPhotosTable* _tmp15_;
-	sqlite3* _tmp16_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_;
-	DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_;
-	sqlite3* _tmp19_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_;
-	DataImportsFSpotDbFSpotTagsTable* _tmp21_;
-	sqlite3* _tmp22_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_;
-	DataImportsFSpotDbFSpotRollsTable* _tmp24_;
-	GError * _inner_error_ = NULL;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	g_return_val_if_fail (G_IS_FILE (db_file), NULL);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self = (DataImportsFSpotDbFSpotDatabase*) g_object_new (object_type, NULL);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp0_ = db_file;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp1_ = g_file_get_path (_tmp0_);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	filename = _tmp1_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp3_ = sqlite3_open_v2 (filename, &_tmp2_, SQLITE_OPEN_READONLY, NULL);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_sqlite3_close0 (self->priv->fspot_db);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->priv->fspot_db = _tmp2_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	res = _tmp3_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	if (res != SQLITE_OK) {
-#line 263 "FSpotDatabase.c"
-		GError* _tmp4_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		_tmp4_ = g_error_new (DATABASE_ERROR, DATABASE_ERROR_ERROR, "Unable to open F-Spot database %s: %d", filename, res);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		_inner_error_ = _tmp4_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		if ((_inner_error_->domain == DATABASE_ERROR) || (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR)) {
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_propagate_error (error, _inner_error_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (self);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 279 "FSpotDatabase.c"
-		} else {
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_clear_error (&_inner_error_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 289 "FSpotDatabase.c"
-		}
-	}
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp5_ = self->priv->fspot_db;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp6_ = data_imports_fspot_db_fspot_meta_table_new (_tmp5_);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->priv->meta_table);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->priv->meta_table = _tmp6_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp8_ = self->priv->meta_table;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp9_ = data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (_tmp8_, &_inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp7_ = _tmp9_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		if ((_inner_error_->domain == DATABASE_ERROR) || (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR)) {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_propagate_error (error, _inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (self);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 318 "FSpotDatabase.c"
-		} else {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_clear_error (&_inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 328 "FSpotDatabase.c"
-		}
-	}
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->hidden_tag_id = _tmp7_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp11_ = data_imports_fspot_db_fspot_database_get_version (self, &_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp10_ = _tmp11_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		if ((_inner_error_->domain == DATABASE_ERROR) || (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR)) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_propagate_error (error, _inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (self);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 349 "FSpotDatabase.c"
-		} else {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_clear_error (&_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 359 "FSpotDatabase.c"
-		}
-	}
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp12_ = data_imports_fspot_db_fspot_database_behavior_new (_tmp10_, &_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	db_behavior = _tmp12_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		if ((_inner_error_->domain == DATABASE_ERROR) || (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR)) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_propagate_error (error, _inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (_tmp10_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (self);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 380 "FSpotDatabase.c"
-		} else {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_object_unref0 (_tmp10_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			_g_free0 (filename);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_clear_error (&_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 392 "FSpotDatabase.c"
-		}
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp13_ = self->priv->fspot_db;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp14_ = db_behavior;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp15_ = data_imports_fspot_db_fspot_photos_table_new (_tmp13_, _tmp14_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->photos_table);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->photos_table = _tmp15_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp16_ = self->priv->fspot_db;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp17_ = db_behavior;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp18_ = data_imports_fspot_db_fspot_photo_versions_table_new (_tmp16_, _tmp17_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->photo_versions_table);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->photo_versions_table = _tmp18_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp19_ = self->priv->fspot_db;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp20_ = db_behavior;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp21_ = data_imports_fspot_db_fspot_tags_table_new (_tmp19_, _tmp20_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->tags_table);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->tags_table = _tmp21_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp22_ = self->priv->fspot_db;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp23_ = db_behavior;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp24_ = data_imports_fspot_db_fspot_rolls_table_new (_tmp22_, _tmp23_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->rolls_table);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->rolls_table = _tmp24_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_g_object_unref0 (db_behavior);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_g_object_unref0 (_tmp10_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_g_free0 (filename);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	return self;
-#line 443 "FSpotDatabase.c"
-}
-
-
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile* db_file, GError** error) {
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	return data_imports_fspot_db_fspot_database_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, db_file, error);
-#line 450 "FSpotDatabase.c"
-}
-
-
-static UtilsVersionNumber* data_imports_fspot_db_fspot_database_get_version (DataImportsFSpotDbFSpotDatabase* self, GError** error) {
-	UtilsVersionNumber* result = NULL;
-	gchar* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaTable* _tmp1_;
-	gchar* _tmp2_;
-	UtilsVersionNumber* _tmp3_;
-	GError * _inner_error_ = NULL;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE (self), NULL);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp1_ = self->priv->meta_table;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_meta_table_get_db_version (_tmp1_, &_inner_error_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp0_ = _tmp2_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_propagate_error (error, _inner_error_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 477 "FSpotDatabase.c"
-		} else {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			g_clear_error (&_inner_error_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-			return NULL;
-#line 485 "FSpotDatabase.c"
-		}
-	}
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_tmp3_ = utils_version_number_new_from_string (_tmp0_, ".");
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	result = _tmp3_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_g_free0 (_tmp0_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	return result;
-#line 496 "FSpotDatabase.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_class_init (DataImportsFSpotDbFSpotDatabaseClass * klass) {
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	data_imports_fspot_db_fspot_database_parent_class = g_type_class_peek_parent (klass);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotDatabasePrivate));
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_database_finalize;
-#line 507 "FSpotDatabase.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_instance_init (DataImportsFSpotDbFSpotDatabase * self) {
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_GET_PRIVATE (self);
-#line 514 "FSpotDatabase.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotDatabase * self;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_sqlite3_close0 (self->priv->fspot_db);
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->priv->meta_table);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->photos_table);
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->photo_versions_table);
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->tags_table);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	_importable_database_table_unref0 (self->rolls_table);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_database_parent_class)->finalize (obj);
-#line 536 "FSpotDatabase.c"
-}
-
-
-/**
- * An object that is able to read from the F-Spot
- * database and extract the relevant objects.
- */
-GType data_imports_fspot_db_fspot_database_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_database_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_database_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotDatabaseClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_database_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotDatabase), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_database_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_database_type_id;
-		data_imports_fspot_db_fspot_database_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotDatabase", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_database_type_id__volatile, data_imports_fspot_db_fspot_database_type_id);
-	}
-	return data_imports_fspot_db_fspot_database_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotDatabase.vala b/plugins/shotwell-data-imports/FSpotDatabase.vala
deleted file mode 100644
index 979171c..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabase.vala
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-public const int64 NULL_ID = 0;
-public const int64 INVALID_ID = -1;
-
-/**
- * Initialization method for the whole module.
- */
-public void init() {
-    FSpotDatabaseBehavior.create_behavior_map();
-}
-
-/**
- * An object that is able to read from the F-Spot
- * database and extract the relevant objects.
- */
-public class FSpotDatabase : Object {
-    private Sqlite.Database fspot_db;
-    private FSpotMetaTable meta_table;
-    public FSpotPhotosTable photos_table;
-    public FSpotPhotoVersionsTable photo_versions_table;
-    public FSpotTagsTable tags_table;
-    public FSpotRollsTable rolls_table;
-    public int64 hidden_tag_id;
-    
-    public FSpotDatabase(File db_file) throws DatabaseError, Spit.DataImports.DataImportError {
-        string filename = db_file.get_path();
-        int res = Sqlite.Database.open_v2(filename, out fspot_db,
-            Sqlite.OPEN_READONLY, null);
-        if (res != Sqlite.OK)
-            throw new DatabaseError.ERROR("Unable to open F-Spot database %s: %d", filename, res);
-        meta_table = new FSpotMetaTable(fspot_db);
-        hidden_tag_id = meta_table.get_hidden_tag_id();
-        
-        FSpotDatabaseBehavior db_behavior = new FSpotDatabaseBehavior(get_version());
-        
-        photos_table = new FSpotPhotosTable(fspot_db, db_behavior);
-        photo_versions_table = new FSpotPhotoVersionsTable(fspot_db, db_behavior);
-        tags_table = new FSpotTagsTable(fspot_db, db_behavior);
-        rolls_table = new FSpotRollsTable(fspot_db, db_behavior);
-    }
-    
-    ~FSpotDatabase() {
-    }
-    
-    private Utils.VersionNumber get_version() throws DatabaseError {
-        return new Utils.VersionNumber.from_string(meta_table.get_db_version());
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
deleted file mode 100644
index 74516f1..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
+++ /dev/null
@@ -1,2085 +0,0 @@
-/* FSpotDatabaseBehavior.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotDatabaseBehavior.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <gee.h>
-#include <shotwell-plugin-dev-1.0.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY (data_imports_fspot_db_fspot_behavior_entry_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntry))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntryClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntryClass))
-
-typedef struct _DataImportsFSpotDbFSpotBehaviorEntry DataImportsFSpotDbFSpotBehaviorEntry;
-typedef struct _DataImportsFSpotDbFSpotBehaviorEntryClass DataImportsFSpotDbFSpotBehaviorEntryClass;
-typedef struct _DataImportsFSpotDbFSpotBehaviorEntryPrivate DataImportsFSpotDbFSpotBehaviorEntryPrivate;
-
-#define UTILS_TYPE_VERSION_NUMBER (utils_version_number_get_type ())
-#define UTILS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber))
-#define UTILS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-#define UTILS_IS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_IS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_VERSION_NUMBER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-
-typedef struct _UtilsVersionNumber UtilsVersionNumber;
-typedef struct _UtilsVersionNumberClass UtilsVersionNumberClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-typedef struct _DataImportsFSpotDbParamSpecFSpotBehaviorEntry DataImportsFSpotDbParamSpecFSpotBehaviorEntry;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorPrivate DataImportsFSpotDbFSpotDatabaseBehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW (data_imports_fspot_db_fspot_photo_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoRow DataImportsFSpotDbFSpotPhotoRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoRowClass DataImportsFSpotDbFSpotPhotoRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW (data_imports_fspot_db_fspot_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagRow DataImportsFSpotDbFSpotTagRow;
-typedef struct _DataImportsFSpotDbFSpotTagRowClass DataImportsFSpotDbFSpotTagRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW (data_imports_fspot_db_fspot_photo_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRow DataImportsFSpotDbFSpotPhotoTagRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRowClass DataImportsFSpotDbFSpotPhotoTagRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW (data_imports_fspot_db_fspot_photo_version_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRow DataImportsFSpotDbFSpotPhotoVersionRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRowClass DataImportsFSpotDbFSpotPhotoVersionRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW (data_imports_fspot_db_fspot_roll_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollRow DataImportsFSpotDbFSpotRollRow;
-typedef struct _DataImportsFSpotDbFSpotRollRowClass DataImportsFSpotDbFSpotRollRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photos_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV0Behavior DataImportsFSpotDbFSpotPhotosV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV0BehaviorClass DataImportsFSpotDbFSpotPhotosV0BehaviorClass;
-#define _data_imports_fspot_db_fspot_behavior_entry_unref0(var) ((var == NULL) ? NULL : (var = (data_imports_fspot_db_fspot_behavior_entry_unref (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR (data_imports_fspot_db_fspot_photos_v5_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV5Behavior DataImportsFSpotDbFSpotPhotosV5Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV5BehaviorClass DataImportsFSpotDbFSpotPhotosV5BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR (data_imports_fspot_db_fspot_photos_v7_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V7_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V7_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV7Behavior DataImportsFSpotDbFSpotPhotosV7Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV7BehaviorClass DataImportsFSpotDbFSpotPhotosV7BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR (data_imports_fspot_db_fspot_photos_v11_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V11_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V11_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV11Behavior DataImportsFSpotDbFSpotPhotosV11Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV11BehaviorClass DataImportsFSpotDbFSpotPhotosV11BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR (data_imports_fspot_db_fspot_photos_v16_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV16Behavior DataImportsFSpotDbFSpotPhotosV16Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV16BehaviorClass DataImportsFSpotDbFSpotPhotosV16BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR (data_imports_fspot_db_fspot_photos_v17_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV17Behavior DataImportsFSpotDbFSpotPhotosV17Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV17BehaviorClass DataImportsFSpotDbFSpotPhotosV17BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR (data_imports_fspot_db_fspot_photos_v18_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV18Behavior DataImportsFSpotDbFSpotPhotosV18Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV18BehaviorClass DataImportsFSpotDbFSpotPhotosV18BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR (data_imports_fspot_db_fspot_tags_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagsV0Behavior DataImportsFSpotDbFSpotTagsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotTagsV0BehaviorClass DataImportsFSpotDbFSpotTagsV0BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsV0Behavior DataImportsFSpotDbFSpotPhotoTagsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV0Behavior DataImportsFSpotDbFSpotPhotoVersionsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV9Behavior DataImportsFSpotDbFSpotPhotoVersionsV9Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV16Behavior DataImportsFSpotDbFSpotPhotoVersionsV16Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV17Behavior DataImportsFSpotDbFSpotPhotoVersionsV17Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV18Behavior DataImportsFSpotDbFSpotPhotoVersionsV18Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR (data_imports_fspot_db_fspot_rolls_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsV0Behavior DataImportsFSpotDbFSpotRollsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotRollsV0BehaviorClass DataImportsFSpotDbFSpotRollsV0BehaviorClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR (data_imports_fspot_db_fspot_rolls_v5_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsV5Behavior DataImportsFSpotDbFSpotRollsV5Behavior;
-typedef struct _DataImportsFSpotDbFSpotRollsV5BehaviorClass DataImportsFSpotDbFSpotRollsV5BehaviorClass;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-struct _DataImportsFSpotDbFSpotBehaviorEntry {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	DataImportsFSpotDbFSpotBehaviorEntryPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotBehaviorEntryClass {
-	GTypeClass parent_class;
-	void (*finalize) (DataImportsFSpotDbFSpotBehaviorEntry *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotBehaviorEntryPrivate {
-	UtilsVersionNumber* version;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbParamSpecFSpotBehaviorEntry {
-	GParamSpec parent_instance;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseBehavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotDatabaseBehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseBehaviorPrivate {
-	DataImportsFSpotDbFSpotTableBehavior* photos_behavior;
-	DataImportsFSpotDbFSpotTableBehavior* tags_behavior;
-	DataImportsFSpotDbFSpotTableBehavior* photo_tags_behavior;
-	DataImportsFSpotDbFSpotTableBehavior* photo_versions_behavior;
-	DataImportsFSpotDbFSpotTableBehavior* rolls_behavior;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_behavior_entry_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_database_behavior_parent_class = NULL;
-extern UtilsVersionNumber* data_imports_fspot_db_fspot_database_behavior_MIN_UNSUPPORTED_VERSION;
-UtilsVersionNumber* data_imports_fspot_db_fspot_database_behavior_MIN_UNSUPPORTED_VERSION = NULL;
-static GeeMap* data_imports_fspot_db_fspot_database_behavior_behavior_map;
-static GeeMap* data_imports_fspot_db_fspot_database_behavior_behavior_map = NULL;
-
-gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance);
-void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance);
-GParamSpec* data_imports_fspot_db_param_spec_fspot_behavior_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpointer v_object);
-void data_imports_fspot_db_value_take_fspot_behavior_entry (GValue* value, gpointer v_object);
-gpointer data_imports_fspot_db_value_get_fspot_behavior_entry (const GValue* value);
-GType data_imports_fspot_db_fspot_behavior_entry_get_type (void) G_GNUC_CONST;
-GType utils_version_number_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntryPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_new (UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior);
-UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self);
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj);
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_DUMMY_PROPERTY
-};
-UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1);
-UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1);
-void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void);
-GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME "Photos"
-GType data_imports_fspot_db_fspot_tags_v0_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME "Tags"
-GType data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME "Photo_Tags"
-GType data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME "Photo_versions"
-GType data_imports_fspot_db_fspot_rolls_v0_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void);
-GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME "Rolls"
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_find_behavior (const gchar* table_name, UtilsVersionNumber* version);
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_new (UtilsVersionNumber* version, GError** error);
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error);
-gchar* utils_version_number_to_string (UtilsVersionNumber* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 410 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior) {
-	DataImportsFSpotDbFSpotBehaviorEntry* self = NULL;
-	UtilsVersionNumber* _tmp0_;
-	UtilsVersionNumber* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR (behavior), NULL);
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self = (DataImportsFSpotDbFSpotBehaviorEntry*) g_type_create_instance (object_type);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = version;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->version);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self->priv->version = _tmp1_;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_ = behavior;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->behavior);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self->priv->behavior = _tmp3_;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return self;
-#line 444 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_new (UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior) {
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return data_imports_fspot_db_fspot_behavior_entry_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, version, behavior);
-#line 451 "FSpotDatabaseBehavior.c"
-}
-
-
-UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self) {
-	UtilsVersionNumber* result = NULL;
-	UtilsVersionNumber* _tmp0_;
-	UtilsVersionNumber* _tmp1_;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->version;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 469 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->behavior;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 487 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_value_fspot_behavior_entry_init (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	value->data[0].v_pointer = NULL;
-#line 494 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_value_fspot_behavior_entry_free_value (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		data_imports_fspot_db_fspot_behavior_entry_unref (value->data[0].v_pointer);
-#line 503 "FSpotDatabaseBehavior.c"
-	}
-}
-
-
-static void data_imports_fspot_db_value_fspot_behavior_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (src_value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		dest_value->data[0].v_pointer = data_imports_fspot_db_fspot_behavior_entry_ref (src_value->data[0].v_pointer);
-#line 513 "FSpotDatabaseBehavior.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 517 "FSpotDatabaseBehavior.c"
-	}
-}
-
-
-static gpointer data_imports_fspot_db_value_fspot_behavior_entry_peek_pointer (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return value->data[0].v_pointer;
-#line 525 "FSpotDatabaseBehavior.c"
-}
-
-
-static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (collect_values[0].v_pointer) {
-#line 532 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotBehaviorEntry * object;
-		object = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 539 "FSpotDatabaseBehavior.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.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 543 "FSpotDatabaseBehavior.c"
-		}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = data_imports_fspot_db_fspot_behavior_entry_ref (object);
-#line 547 "FSpotDatabaseBehavior.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = NULL;
-#line 551 "FSpotDatabaseBehavior.c"
-	}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return NULL;
-#line 555 "FSpotDatabaseBehavior.c"
-}
-
-
-static gchar* data_imports_fspot_db_value_fspot_behavior_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataImportsFSpotDbFSpotBehaviorEntry ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (!object_p) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 566 "FSpotDatabaseBehavior.c"
-	}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (!value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		*object_p = NULL;
-#line 572 "FSpotDatabaseBehavior.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		*object_p = value->data[0].v_pointer;
-#line 576 "FSpotDatabaseBehavior.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		*object_p = data_imports_fspot_db_fspot_behavior_entry_ref (value->data[0].v_pointer);
-#line 580 "FSpotDatabaseBehavior.c"
-	}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return NULL;
-#line 584 "FSpotDatabaseBehavior.c"
-}
-
-
-GParamSpec* data_imports_fspot_db_param_spec_fspot_behavior_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	DataImportsFSpotDbParamSpecFSpotBehaviorEntry* spec;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY), NULL);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return G_PARAM_SPEC (spec);
-#line 598 "FSpotDatabaseBehavior.c"
-}
-
-
-gpointer data_imports_fspot_db_value_get_fspot_behavior_entry (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY), NULL);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return value->data[0].v_pointer;
-#line 607 "FSpotDatabaseBehavior.c"
-}
-
-
-void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry * old;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = v_object;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		data_imports_fspot_db_fspot_behavior_entry_ref (value->data[0].v_pointer);
-#line 627 "FSpotDatabaseBehavior.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = NULL;
-#line 631 "FSpotDatabaseBehavior.c"
-	}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		data_imports_fspot_db_fspot_behavior_entry_unref (old);
-#line 637 "FSpotDatabaseBehavior.c"
-	}
-}
-
-
-void data_imports_fspot_db_value_take_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry * old;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = v_object;
-#line 656 "FSpotDatabaseBehavior.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		value->data[0].v_pointer = NULL;
-#line 660 "FSpotDatabaseBehavior.c"
-	}
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		data_imports_fspot_db_fspot_behavior_entry_unref (old);
-#line 666 "FSpotDatabaseBehavior.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_behavior_entry_class_init (DataImportsFSpotDbFSpotBehaviorEntryClass * klass) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	data_imports_fspot_db_fspot_behavior_entry_parent_class = g_type_class_peek_parent (klass);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	((DataImportsFSpotDbFSpotBehaviorEntryClass *) klass)->finalize = data_imports_fspot_db_fspot_behavior_entry_finalize;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotBehaviorEntryPrivate));
-#line 678 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_behavior_entry_instance_init (DataImportsFSpotDbFSpotBehaviorEntry * self) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_GET_PRIVATE (self);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self->ref_count = 1;
-#line 687 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj) {
-	DataImportsFSpotDbFSpotBehaviorEntry * self;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntry);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_signal_handlers_destroy (self);
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->version);
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->behavior);
-#line 701 "FSpotDatabaseBehavior.c"
-}
-
-
-GType data_imports_fspot_db_fspot_behavior_entry_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_behavior_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_behavior_entry_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { data_imports_fspot_db_value_fspot_behavior_entry_init, data_imports_fspot_db_value_fspot_behavior_entry_free_value, data_imports_fspot_db_value_fspot_behavior_entry_copy_value, data_imports_fspot_db_value_fspot_behavior_entry_peek_pointer, "p", data_imports_fspot_db_value_fspot_behavior_entry_collect_value, "p", data_imports_fspot_db_value_fspot_behavior_entry_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotBehaviorEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_behavior_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotBehaviorEntry), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_behavior_entry_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType data_imports_fspot_db_fspot_behavior_entry_type_id;
-		data_imports_fspot_db_fspot_behavior_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "DataImportsFSpotDbFSpotBehaviorEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_behavior_entry_type_id__volatile, data_imports_fspot_db_fspot_behavior_entry_type_id);
-	}
-	return data_imports_fspot_db_fspot_behavior_entry_type_id__volatile;
-}
-
-
-gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return instance;
-#line 726 "FSpotDatabaseBehavior.c"
-}
-
-
-void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		DATA_IMPORTS_FSPOT_DB_FSPOT_BEHAVIOR_ENTRY_GET_CLASS (self)->finalize (self);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 739 "FSpotDatabaseBehavior.c"
-	}
-}
-
-
-void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
-	GeeHashMap* _tmp0_;
-	GeeList* photos_list = NULL;
-	GeeArrayList* _tmp1_;
-	gint* _tmp2_;
-	gint* _tmp3_;
-	gint _tmp3__length1;
-	UtilsVersionNumber* _tmp4_;
-	UtilsVersionNumber* _tmp5_;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_;
-	gint* _tmp10_;
-	gint* _tmp11_;
-	gint _tmp11__length1;
-	UtilsVersionNumber* _tmp12_;
-	UtilsVersionNumber* _tmp13_;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_;
-	gint* _tmp18_;
-	gint* _tmp19_;
-	gint _tmp19__length1;
-	UtilsVersionNumber* _tmp20_;
-	UtilsVersionNumber* _tmp21_;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_;
-	gint* _tmp26_;
-	gint* _tmp27_;
-	gint _tmp27__length1;
-	UtilsVersionNumber* _tmp28_;
-	UtilsVersionNumber* _tmp29_;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_;
-	gint* _tmp34_;
-	gint* _tmp35_;
-	gint _tmp35__length1;
-	UtilsVersionNumber* _tmp36_;
-	UtilsVersionNumber* _tmp37_;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_;
-	gint* _tmp42_;
-	gint* _tmp43_;
-	gint _tmp43__length1;
-	UtilsVersionNumber* _tmp44_;
-	UtilsVersionNumber* _tmp45_;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_;
-	gint* _tmp50_;
-	gint* _tmp51_;
-	gint _tmp51__length1;
-	UtilsVersionNumber* _tmp52_;
-	UtilsVersionNumber* _tmp53_;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_;
-	GeeMap* _tmp58_;
-	GeeList* tags_list = NULL;
-	GeeArrayList* _tmp59_;
-	gint* _tmp60_;
-	gint* _tmp61_;
-	gint _tmp61__length1;
-	UtilsVersionNumber* _tmp62_;
-	UtilsVersionNumber* _tmp63_;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_;
-	GeeMap* _tmp68_;
-	GeeList* photo_tags_list = NULL;
-	GeeArrayList* _tmp69_;
-	gint* _tmp70_;
-	gint* _tmp71_;
-	gint _tmp71__length1;
-	UtilsVersionNumber* _tmp72_;
-	UtilsVersionNumber* _tmp73_;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_;
-	GeeMap* _tmp78_;
-	GeeList* photo_versions_list = NULL;
-	GeeArrayList* _tmp79_;
-	gint* _tmp80_;
-	gint* _tmp81_;
-	gint _tmp81__length1;
-	UtilsVersionNumber* _tmp82_;
-	UtilsVersionNumber* _tmp83_;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_;
-	gint* _tmp88_;
-	gint* _tmp89_;
-	gint _tmp89__length1;
-	UtilsVersionNumber* _tmp90_;
-	UtilsVersionNumber* _tmp91_;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_;
-	gint* _tmp96_;
-	gint* _tmp97_;
-	gint _tmp97__length1;
-	UtilsVersionNumber* _tmp98_;
-	UtilsVersionNumber* _tmp99_;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_;
-	gint* _tmp104_;
-	gint* _tmp105_;
-	gint _tmp105__length1;
-	UtilsVersionNumber* _tmp106_;
-	UtilsVersionNumber* _tmp107_;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_;
-	gint* _tmp112_;
-	gint* _tmp113_;
-	gint _tmp113__length1;
-	UtilsVersionNumber* _tmp114_;
-	UtilsVersionNumber* _tmp115_;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_;
-	GeeMap* _tmp120_;
-	GeeList* rolls_list = NULL;
-	GeeArrayList* _tmp121_;
-	gint* _tmp122_;
-	gint* _tmp123_;
-	gint _tmp123__length1;
-	UtilsVersionNumber* _tmp124_;
-	UtilsVersionNumber* _tmp125_;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_;
-	gint* _tmp130_;
-	gint* _tmp131_;
-	gint _tmp131__length1;
-	UtilsVersionNumber* _tmp132_;
-	UtilsVersionNumber* _tmp133_;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_;
-	GeeMap* _tmp138_;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (data_imports_fspot_db_fspot_database_behavior_behavior_map);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	data_imports_fspot_db_fspot_database_behavior_behavior_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photos_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_ = g_new0 (gint, 1);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_[0] = 0;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp3_ = _tmp2_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp3__length1 = 1;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp4_ = utils_version_number_new (_tmp3_, 1);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp5_ = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp6_ = data_imports_fspot_db_fspot_photos_v0_behavior_get_instance ();
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp7_ = _tmp6_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp8_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp9_ = _tmp8_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp9_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp7_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp5_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp10_ = g_new0 (gint, 1);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp10_[0] = 5;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp11_ = _tmp10_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp11__length1 = 1;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp12_ = utils_version_number_new (_tmp11_, 1);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp13_ = _tmp12_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp14_ = data_imports_fspot_db_fspot_photos_v5_behavior_get_instance ();
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp15_ = _tmp14_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp16_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp17_ = _tmp16_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp17_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp15_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp13_);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp11_ = (g_free (_tmp11_), NULL);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp18_ = g_new0 (gint, 1);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp18_[0] = 7;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp19_ = _tmp18_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp19__length1 = 1;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp20_ = utils_version_number_new (_tmp19_, 1);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp21_ = _tmp20_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp22_ = data_imports_fspot_db_fspot_photos_v7_behavior_get_instance ();
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp23_ = _tmp22_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp24_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp25_ = _tmp24_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp25_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp23_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp21_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp19_ = (g_free (_tmp19_), NULL);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp26_ = g_new0 (gint, 1);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp26_[0] = 11;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp27_ = _tmp26_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp27__length1 = 1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp28_ = utils_version_number_new (_tmp27_, 1);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp29_ = _tmp28_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp30_ = data_imports_fspot_db_fspot_photos_v11_behavior_get_instance ();
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp31_ = _tmp30_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp32_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp33_ = _tmp32_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp33_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp31_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp29_);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp27_ = (g_free (_tmp27_), NULL);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp34_ = g_new0 (gint, 1);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp34_[0] = 16;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp35_ = _tmp34_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp35__length1 = 1;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp36_ = utils_version_number_new (_tmp35_, 1);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp37_ = _tmp36_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp38_ = data_imports_fspot_db_fspot_photos_v16_behavior_get_instance ();
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp39_ = _tmp38_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp40_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp41_ = _tmp40_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp41_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp39_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp37_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp35_ = (g_free (_tmp35_), NULL);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp42_ = g_new0 (gint, 1);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp42_[0] = 17;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp43_ = _tmp42_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp43__length1 = 1;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp44_ = utils_version_number_new (_tmp43_, 1);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp45_ = _tmp44_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp46_ = data_imports_fspot_db_fspot_photos_v17_behavior_get_instance ();
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp47_ = _tmp46_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp48_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp49_ = _tmp48_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp49_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp47_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp45_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp43_ = (g_free (_tmp43_), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp50_ = g_new0 (gint, 1);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp50_[0] = 18;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp51_ = _tmp50_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp51__length1 = 1;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp52_ = utils_version_number_new (_tmp51_, 1);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp53_ = _tmp52_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp54_ = data_imports_fspot_db_fspot_photos_v18_behavior_get_instance ();
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp55_ = _tmp54_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp56_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp57_ = _tmp56_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photos_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp57_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp55_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp53_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp51_ = (g_free (_tmp51_), NULL);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp58_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_map_set (_tmp58_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME, photos_list);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp59_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp60_ = g_new0 (gint, 1);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp60_[0] = 0;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp61_ = _tmp60_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp61__length1 = 1;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp62_ = utils_version_number_new (_tmp61_, 1);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp63_ = _tmp62_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp64_ = data_imports_fspot_db_fspot_tags_v0_behavior_get_instance ();
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp65_ = _tmp64_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp66_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp67_ = _tmp66_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (tags_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp67_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp67_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp65_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp63_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp61_ = (g_free (_tmp61_), NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp68_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_map_set (_tmp68_, DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME, tags_list);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp69_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photo_tags_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_LIST, GeeList);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp70_ = g_new0 (gint, 1);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp70_[0] = 0;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp71_ = _tmp70_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp71__length1 = 1;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp72_ = utils_version_number_new (_tmp71_, 1);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp73_ = _tmp72_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp74_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance ();
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp75_ = _tmp74_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp76_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp73_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp77_ = _tmp76_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_tags_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp77_);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp77_);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp75_);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp73_);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp71_ = (g_free (_tmp71_), NULL);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp78_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_map_set (_tmp78_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME, photo_tags_list);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp79_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photo_versions_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GEE_TYPE_LIST, GeeList);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp80_ = g_new0 (gint, 1);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp80_[0] = 0;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp81_ = _tmp80_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp81__length1 = 1;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp82_ = utils_version_number_new (_tmp81_, 1);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp83_ = _tmp82_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp84_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance ();
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp85_ = _tmp84_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp86_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp83_, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp87_ = _tmp86_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_versions_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp87_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp87_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp85_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp83_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp81_ = (g_free (_tmp81_), NULL);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp88_ = g_new0 (gint, 1);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp88_[0] = 9;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp89_ = _tmp88_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp89__length1 = 1;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp90_ = utils_version_number_new (_tmp89_, 1);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp91_ = _tmp90_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp92_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance ();
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp93_ = _tmp92_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp94_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp91_, G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp95_ = _tmp94_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_versions_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp95_);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp95_);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp93_);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp91_);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp89_ = (g_free (_tmp89_), NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp96_ = g_new0 (gint, 1);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp96_[0] = 16;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp97_ = _tmp96_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp97__length1 = 1;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp98_ = utils_version_number_new (_tmp97_, 1);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp99_ = _tmp98_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp100_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance ();
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp101_ = _tmp100_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp102_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp99_, G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp103_ = _tmp102_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_versions_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp103_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp103_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp101_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp99_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp97_ = (g_free (_tmp97_), NULL);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp104_ = g_new0 (gint, 1);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp104_[0] = 17;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp105_ = _tmp104_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp105__length1 = 1;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp106_ = utils_version_number_new (_tmp105_, 1);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp107_ = _tmp106_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp108_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance ();
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp109_ = _tmp108_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp110_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp111_ = _tmp110_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_versions_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp111_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp111_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp109_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp107_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp105_ = (g_free (_tmp105_), NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp112_ = g_new0 (gint, 1);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp112_[0] = 18;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp113_ = _tmp112_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp113__length1 = 1;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp114_ = utils_version_number_new (_tmp113_, 1);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp115_ = _tmp114_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp116_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance ();
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp117_ = _tmp116_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp118_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp119_ = _tmp118_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (photo_versions_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp119_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp119_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp117_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp115_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp113_ = (g_free (_tmp113_), NULL);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp120_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_map_set (_tmp120_, DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME, photo_versions_list);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp121_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, (GBoxedCopyFunc) data_imports_fspot_db_fspot_behavior_entry_ref, (GDestroyNotify) data_imports_fspot_db_fspot_behavior_entry_unref, NULL, NULL, NULL);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	rolls_list = G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_LIST, GeeList);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp122_ = g_new0 (gint, 1);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp122_[0] = 0;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp123_ = _tmp122_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp123__length1 = 1;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp124_ = utils_version_number_new (_tmp123_, 1);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp125_ = _tmp124_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp126_ = data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance ();
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp127_ = _tmp126_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp128_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp125_, G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp129_ = _tmp128_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (rolls_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp129_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp129_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp127_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp125_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp123_ = (g_free (_tmp123_), NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp130_ = g_new0 (gint, 1);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp130_[0] = 5;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp131_ = _tmp130_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp131__length1 = 1;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp132_ = utils_version_number_new (_tmp131_, 1);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp133_ = _tmp132_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp134_ = data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance ();
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp135_ = _tmp134_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp136_ = data_imports_fspot_db_fspot_behavior_entry_new (_tmp133_, G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp137_ = _tmp136_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (rolls_list, GEE_TYPE_COLLECTION, GeeCollection), _tmp137_);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_data_imports_fspot_db_fspot_behavior_entry_unref0 (_tmp137_);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp135_);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (_tmp133_);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp131_ = (g_free (_tmp131_), NULL);
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp138_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	gee_map_set (_tmp138_, DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME, rolls_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (rolls_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photo_versions_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photo_tags_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (tags_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photos_list);
-#line 1441 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_find_behavior (const gchar* table_name, UtilsVersionNumber* version) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* behavior = NULL;
-	GeeList* behavior_list = NULL;
-	GeeMap* _tmp0_;
-	const gchar* _tmp1_;
-	gpointer _tmp2_;
-	GeeList* _tmp3_;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (table_name != NULL, NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	behavior = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_database_behavior_behavior_map;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = table_name;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_ = gee_map_get (_tmp0_, _tmp1_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	behavior_list = (GeeList*) _tmp2_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp3_ = behavior_list;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp3_ != NULL) {
-#line 1471 "FSpotDatabaseBehavior.c"
-		{
-			GeeList* _entry_list = NULL;
-			GeeList* _tmp4_;
-			GeeList* _tmp5_;
-			gint _entry_size = 0;
-			GeeList* _tmp6_;
-			gint _tmp7_;
-			gint _tmp8_;
-			gint _entry_index = 0;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_tmp4_ = behavior_list;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_entry_list = _tmp5_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_tmp6_ = _entry_list;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_tmp8_ = _tmp7_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_entry_size = _tmp8_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_entry_index = -1;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			while (TRUE) {
-#line 1499 "FSpotDatabaseBehavior.c"
-				gint _tmp9_;
-				gint _tmp10_;
-				gint _tmp11_;
-				DataImportsFSpotDbFSpotBehaviorEntry* entry = NULL;
-				GeeList* _tmp12_;
-				gint _tmp13_;
-				gpointer _tmp14_;
-				UtilsVersionNumber* _tmp15_;
-				DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
-				UtilsVersionNumber* _tmp17_;
-				UtilsVersionNumber* _tmp18_;
-				gint _tmp19_;
-				gboolean _tmp20_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp9_ = _entry_index;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_entry_index = _tmp9_ + 1;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp10_ = _entry_index;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp11_ = _entry_size;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				if (!(_tmp10_ < _tmp11_)) {
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-					break;
-#line 1525 "FSpotDatabaseBehavior.c"
-				}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp12_ = _entry_list;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp13_ = _entry_index;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				entry = (DataImportsFSpotDbFSpotBehaviorEntry*) _tmp14_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp15_ = version;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp16_ = entry;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp17_ = data_imports_fspot_db_fspot_behavior_entry_get_version (_tmp16_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp18_ = _tmp17_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp19_ = gee_comparable_compare_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COMPARABLE, GeeComparable), _tmp18_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_tmp20_ = _tmp19_ >= 0;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_g_object_unref0 (_tmp18_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				if (_tmp20_) {
-#line 1551 "FSpotDatabaseBehavior.c"
-					DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_;
-					DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-					_tmp21_ = entry;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-					_tmp22_ = data_imports_fspot_db_fspot_behavior_entry_get_behavior (_tmp21_);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-					_g_object_unref0 (behavior);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-					behavior = _tmp22_;
-#line 1562 "FSpotDatabaseBehavior.c"
-				}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-				_data_imports_fspot_db_fspot_behavior_entry_unref0 (entry);
-#line 1566 "FSpotDatabaseBehavior.c"
-			}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (_entry_list);
-#line 1570 "FSpotDatabaseBehavior.c"
-		}
-	} else {
-		const gchar* _tmp23_;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp23_ = table_name;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		g_warning ("FSpotDatabaseBehavior.vala:155: Could not find behavior list for table" \
-" %s", _tmp23_);
-#line 1578 "FSpotDatabaseBehavior.c"
-	}
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = behavior;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (behavior_list);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 1586 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error) {
-	DataImportsFSpotDbFSpotDatabaseBehavior * self = NULL;
-	UtilsVersionNumber* _tmp0_;
-	UtilsVersionNumber* _tmp1_;
-	gint _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* photos_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp8_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp9_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp10_;
-	DataImportsFSpotDbFSpotTableBehavior* tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp13_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp14_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp15_;
-	DataImportsFSpotDbFSpotTableBehavior* photo_tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp18_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp19_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp20_;
-	DataImportsFSpotDbFSpotTableBehavior* photo_versions_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp23_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp24_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp25_;
-	DataImportsFSpotDbFSpotTableBehavior* rolls_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp28_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp29_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp30_;
-	gboolean _tmp33_ = FALSE;
-	gboolean _tmp34_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gboolean _tmp36_ = FALSE;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp37_;
-	GError * _inner_error_ = NULL;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self = (DataImportsFSpotDbFSpotDatabaseBehavior*) g_object_new (object_type, NULL);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = version;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_database_behavior_MIN_UNSUPPORTED_VERSION;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_ = gee_comparable_compare_to (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COMPARABLE, GeeComparable), _tmp1_);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp2_ >= 0) {
-#line 1633 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		GError* _tmp6_;
-		GError* _tmp7_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp3_ = version;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp4_ = utils_version_number_to_string (_tmp3_);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp5_ = _tmp4_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp6_ = g_error_new (SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR, SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR_UNSUPPORTED_VERSION, "Version %s is not yet supported", _tmp5_);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp7_ = _tmp6_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_free0 (_tmp5_);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_inner_error_ = _tmp7_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) {
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_propagate_error (error, _inner_error_);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (self);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			return NULL;
-#line 1661 "FSpotDatabaseBehavior.c"
-		} else {
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_clear_error (&_inner_error_);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			return NULL;
-#line 1669 "FSpotDatabaseBehavior.c"
-		}
-	}
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp8_ = version;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp9_ = data_imports_fspot_db_fspot_database_behavior_find_behavior (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME, _tmp8_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photos_generic_behavior = _tmp9_;
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp10_ = photos_generic_behavior;
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp10_ != NULL) {
-#line 1682 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp11_;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp12_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp11_ = photos_generic_behavior;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR) ? ((DataImportsFSpotDbFSpotTableBehavior*) _tmp11_) : NULL);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_object_unref0 (self->priv->photos_behavior);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		self->priv->photos_behavior = _tmp12_;
-#line 1693 "FSpotDatabaseBehavior.c"
-	}
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp13_ = version;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp14_ = data_imports_fspot_db_fspot_database_behavior_find_behavior (DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME, _tmp13_);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	tags_generic_behavior = _tmp14_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp15_ = tags_generic_behavior;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp15_ != NULL) {
-#line 1705 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp16_;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp17_;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp16_ = tags_generic_behavior;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR) ? ((DataImportsFSpotDbFSpotTableBehavior*) _tmp16_) : NULL);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_object_unref0 (self->priv->tags_behavior);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		self->priv->tags_behavior = _tmp17_;
-#line 1716 "FSpotDatabaseBehavior.c"
-	}
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp18_ = version;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp19_ = data_imports_fspot_db_fspot_database_behavior_find_behavior (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME, _tmp18_);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photo_tags_generic_behavior = _tmp19_;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp20_ = photo_tags_generic_behavior;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp20_ != NULL) {
-#line 1728 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp21_ = photo_tags_generic_behavior;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR) ? ((DataImportsFSpotDbFSpotTableBehavior*) _tmp21_) : NULL);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_object_unref0 (self->priv->photo_tags_behavior);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		self->priv->photo_tags_behavior = _tmp22_;
-#line 1739 "FSpotDatabaseBehavior.c"
-	}
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp23_ = version;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp24_ = data_imports_fspot_db_fspot_database_behavior_find_behavior (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME, _tmp23_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	photo_versions_generic_behavior = _tmp24_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp25_ = photo_versions_generic_behavior;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp25_ != NULL) {
-#line 1751 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp26_;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp27_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp26_ = photo_versions_generic_behavior;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR) ? ((DataImportsFSpotDbFSpotTableBehavior*) _tmp26_) : NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_object_unref0 (self->priv->photo_versions_behavior);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		self->priv->photo_versions_behavior = _tmp27_;
-#line 1762 "FSpotDatabaseBehavior.c"
-	}
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp28_ = version;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp29_ = data_imports_fspot_db_fspot_database_behavior_find_behavior (DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME, _tmp28_);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	rolls_generic_behavior = _tmp29_;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp30_ = rolls_generic_behavior;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp30_ != NULL) {
-#line 1774 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp31_;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp31_ = rolls_generic_behavior;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR) ? ((DataImportsFSpotDbFSpotTableBehavior*) _tmp31_) : NULL);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_object_unref0 (self->priv->rolls_behavior);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		self->priv->rolls_behavior = _tmp32_;
-#line 1785 "FSpotDatabaseBehavior.c"
-	}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp37_ = self->priv->photos_behavior;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp37_ == NULL) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp36_ = TRUE;
-#line 1793 "FSpotDatabaseBehavior.c"
-	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp38_;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp38_ = self->priv->tags_behavior;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp36_ = _tmp38_ == NULL;
-#line 1800 "FSpotDatabaseBehavior.c"
-	}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp36_) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp35_ = TRUE;
-#line 1806 "FSpotDatabaseBehavior.c"
-	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp39_;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp39_ = self->priv->photo_tags_behavior;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp35_ = _tmp39_ == NULL;
-#line 1813 "FSpotDatabaseBehavior.c"
-	}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp35_) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp34_ = TRUE;
-#line 1819 "FSpotDatabaseBehavior.c"
-	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp40_;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp40_ = self->priv->photo_versions_behavior;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp34_ = _tmp40_ == NULL;
-#line 1826 "FSpotDatabaseBehavior.c"
-	}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp34_) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp33_ = TRUE;
-#line 1832 "FSpotDatabaseBehavior.c"
-	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp41_;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp41_ = self->priv->rolls_behavior;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp33_ = _tmp41_ == NULL;
-#line 1839 "FSpotDatabaseBehavior.c"
-	}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	if (_tmp33_) {
-#line 1843 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp42_;
-		gchar* _tmp43_;
-		gchar* _tmp44_;
-		GError* _tmp45_;
-		GError* _tmp46_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp42_ = version;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp43_ = utils_version_number_to_string (_tmp42_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp44_ = _tmp43_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp45_ = g_error_new (SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR, SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR_UNSUPPORTED_VERSION, "Version %s is not supported", _tmp44_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_tmp46_ = _tmp45_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_g_free0 (_tmp44_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		_inner_error_ = _tmp46_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-		if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) {
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_propagate_error (error, _inner_error_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (rolls_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photo_versions_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photo_tags_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (tags_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photos_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (self);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			return NULL;
-#line 1881 "FSpotDatabaseBehavior.c"
-		} else {
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (rolls_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photo_versions_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photo_tags_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (tags_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			_g_object_unref0 (photos_generic_behavior);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			g_clear_error (&_inner_error_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-			return NULL;
-#line 1899 "FSpotDatabaseBehavior.c"
-		}
-	}
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (rolls_generic_behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photo_versions_generic_behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photo_tags_generic_behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (tags_generic_behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (photos_generic_behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return self;
-#line 1914 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_new (UtilsVersionNumber* version, GError** error) {
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return data_imports_fspot_db_fspot_database_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, version, error);
-#line 1921 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->photos_behavior;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 1939 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->tags_behavior;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 1957 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->photo_tags_behavior;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 1975 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->photo_versions_behavior;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 1993 "FSpotDatabaseBehavior.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = self->priv->rolls_behavior;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	result = _tmp1_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	return result;
-#line 2011 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_behavior_class_init (DataImportsFSpotDbFSpotDatabaseBehaviorClass * klass) {
-	gint* _tmp0_;
-	gint* _tmp1_;
-	gint _tmp1__length1;
-	UtilsVersionNumber* _tmp2_;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	data_imports_fspot_db_fspot_database_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotDatabaseBehaviorPrivate));
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_database_behavior_finalize;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_ = g_new0 (gint, 1);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp0_[0] = 19;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1_ = _tmp0_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp1__length1 = 1;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_tmp2_ = utils_version_number_new (_tmp1_, 1);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	data_imports_fspot_db_fspot_database_behavior_MIN_UNSUPPORTED_VERSION = _tmp2_;
-#line 2038 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_behavior_instance_init (DataImportsFSpotDbFSpotDatabaseBehavior * self) {
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_PRIVATE (self);
-#line 2045 "FSpotDatabaseBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotDatabaseBehavior * self;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->photos_behavior);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->tags_behavior);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->photo_tags_behavior);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->photo_versions_behavior);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	_g_object_unref0 (self->priv->rolls_behavior);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_database_behavior_parent_class)->finalize (obj);
-#line 2065 "FSpotDatabaseBehavior.c"
-}
-
-
-/**
- * A class that consolidates the behavior of all F-Spot tables (apart from meta)
- * and is the one place to check whether the database version is supported.
- */
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_database_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_database_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotDatabaseBehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_database_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotDatabaseBehavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_database_behavior_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_database_behavior_type_id;
-		data_imports_fspot_db_fspot_database_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotDatabaseBehavior", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_database_behavior_type_id__volatile, data_imports_fspot_db_fspot_database_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_database_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
deleted file mode 100644
index 6d669b3..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
+++ /dev/null
@@ -1,208 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-private class FSpotBehaviorEntry {
-    private Utils.VersionNumber version;
-    private FSpotTableBehavior behavior;
-    
-    public FSpotBehaviorEntry(Utils.VersionNumber version, FSpotTableBehavior behavior) {
-        this.version = version;
-        this.behavior = behavior;
-    }
-    
-    public Utils.VersionNumber get_version() {
-        return version;
-    }
-    
-    public FSpotTableBehavior get_behavior() {
-        return behavior;
-    }
-}
-
-/**
- * A class that consolidates the behavior of all F-Spot tables (apart from meta)
- * and is the one place to check whether the database version is supported.
- */
-public class FSpotDatabaseBehavior : Object {
-    // Minimum unsupported version: any database from that version and above
-    // is not supported as it's too new and support has not been provided
-    // In practice, the code may work with future versions but this cannot be
-    // guaranteed as it hasn't been tested so it's probably better to just
-    // bomb out at that point rather than risk importing incorrect data
-    public static Utils.VersionNumber MIN_UNSUPPORTED_VERSION =
-        new Utils.VersionNumber({ 19 });
-    private static Gee.Map<string, Gee.List<FSpotBehaviorEntry>> behavior_map;
-    
-    private FSpotTableBehavior<FSpotPhotoRow> photos_behavior;
-    private FSpotTableBehavior<FSpotTagRow> tags_behavior;
-    private FSpotTableBehavior<FSpotPhotoTagRow> photo_tags_behavior;
-    private FSpotTableBehavior<FSpotPhotoVersionRow> photo_versions_behavior;
-    private FSpotTableBehavior<FSpotRollRow> rolls_behavior;
-    
-    public static void create_behavior_map() {
-        behavior_map = new Gee.HashMap<string, Gee.List<FSpotBehaviorEntry>>();
-        // photos table
-        Gee.List<FSpotBehaviorEntry> photos_list = new Gee.ArrayList<FSpotBehaviorEntry>();
-        // v0-4
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 0 }),
-            FSpotPhotosV0Behavior.get_instance()
-        ));
-        // v5-6
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 5 }),
-            FSpotPhotosV5Behavior.get_instance()
-        ));
-        // v7-10
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 7 }),
-            FSpotPhotosV7Behavior.get_instance()
-        ));
-        // v11-15
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 11 }),
-            FSpotPhotosV11Behavior.get_instance()
-        ));
-        // v16
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 16 }),
-            FSpotPhotosV16Behavior.get_instance()
-        ));
-        // v17
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 17 }),
-            FSpotPhotosV17Behavior.get_instance()
-        ));
-        // v18+
-        photos_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 18 }),
-            FSpotPhotosV18Behavior.get_instance()
-        ));
-        behavior_map.set(FSpotPhotosTable.TABLE_NAME, photos_list);
-        // tags table
-        Gee.List<FSpotBehaviorEntry> tags_list = new Gee.ArrayList<FSpotBehaviorEntry>();
-        // v0+
-        tags_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 0 }),
-            FSpotTagsV0Behavior.get_instance()
-        ));
-        behavior_map.set(FSpotTagsTable.TABLE_NAME, tags_list);
-        // photo_tags table
-        Gee.List<FSpotBehaviorEntry> photo_tags_list = new Gee.ArrayList<FSpotBehaviorEntry>();
-        // v0+
-        photo_tags_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 0 }),
-            FSpotPhotoTagsV0Behavior.get_instance()
-        ));
-        behavior_map.set(FSpotPhotoTagsTable.TABLE_NAME, photo_tags_list);
-        // photo_versions table
-        Gee.List<FSpotBehaviorEntry> photo_versions_list = new Gee.ArrayList<FSpotBehaviorEntry>();
-        // v0-8
-        photo_versions_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 0 }),
-            FSpotPhotoVersionsV0Behavior.get_instance()
-        ));
-        // v9-15
-        photo_versions_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 9 }),
-            FSpotPhotoVersionsV9Behavior.get_instance()
-        ));
-        // v16
-        photo_versions_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 16 }),
-            FSpotPhotoVersionsV16Behavior.get_instance()
-        ));
-        // v17
-        photo_versions_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 17 }),
-            FSpotPhotoVersionsV17Behavior.get_instance()
-        ));
-        // v18+
-        photo_versions_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 18 }),
-            FSpotPhotoVersionsV18Behavior.get_instance()
-        ));
-        behavior_map.set(FSpotPhotoVersionsTable.TABLE_NAME, photo_versions_list);
-        // rolls table
-        Gee.List<FSpotBehaviorEntry> rolls_list = new Gee.ArrayList<FSpotBehaviorEntry>();
-        // v0-4
-        rolls_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 0 }),
-            FSpotRollsV0Behavior.get_instance()
-        ));
-        // v5+
-        rolls_list.add(new FSpotBehaviorEntry(
-            new Utils.VersionNumber({ 5 }),
-            FSpotRollsV5Behavior.get_instance()
-        ));
-        behavior_map.set(FSpotRollsTable.TABLE_NAME, rolls_list);
-    }
-    
-    public static FSpotTableBehavior? find_behavior(string table_name, Utils.VersionNumber version) {
-        FSpotTableBehavior behavior = null;
-        Gee.List<FSpotBehaviorEntry> behavior_list = behavior_map.get(table_name);
-        if (behavior_list != null)
-            foreach (FSpotBehaviorEntry entry in behavior_list) {
-                if (version.compare_to(entry.get_version()) >= 0)
-                    behavior = entry.get_behavior();
-            }
-        else
-            warning("Could not find behavior list for table %s", table_name);
-        return behavior;
-
-    }
-    public FSpotDatabaseBehavior(Utils.VersionNumber version) throws Spit.DataImports.DataImportError {
-        if (version.compare_to(MIN_UNSUPPORTED_VERSION) >= 0)
-            throw new Spit.DataImports.DataImportError.UNSUPPORTED_VERSION("Version %s is not yet supported", version.to_string());
-        
-        FSpotTableBehavior? photos_generic_behavior = find_behavior(FSpotPhotosTable.TABLE_NAME, version);
-        if (photos_generic_behavior != null)
-            photos_behavior = photos_generic_behavior as FSpotTableBehavior<FSpotPhotoRow>;
-        FSpotTableBehavior? tags_generic_behavior = find_behavior(FSpotTagsTable.TABLE_NAME, version);
-        if (tags_generic_behavior != null)
-            tags_behavior = tags_generic_behavior as FSpotTableBehavior<FSpotTagRow>;
-        FSpotTableBehavior? photo_tags_generic_behavior = find_behavior(FSpotPhotoTagsTable.TABLE_NAME, version);
-        if (photo_tags_generic_behavior != null)
-            photo_tags_behavior = photo_tags_generic_behavior as FSpotTableBehavior<FSpotPhotoTagRow>;
-        FSpotTableBehavior? photo_versions_generic_behavior = find_behavior(FSpotPhotoVersionsTable.TABLE_NAME, version);
-        if (photo_versions_generic_behavior != null)
-            photo_versions_behavior = photo_versions_generic_behavior as FSpotTableBehavior<FSpotPhotoVersionRow>;
-        FSpotTableBehavior? rolls_generic_behavior = find_behavior(FSpotRollsTable.TABLE_NAME, version);
-        if (rolls_generic_behavior != null)
-            rolls_behavior = rolls_generic_behavior as FSpotTableBehavior<FSpotRollRow>;
-        
-        if (photos_behavior == null || tags_behavior == null ||
-            photo_tags_behavior == null || photo_versions_behavior == null ||
-            rolls_behavior == null
-        )
-            throw new Spit.DataImports.DataImportError.UNSUPPORTED_VERSION("Version %s is not supported", version.to_string());
-    }
-    
-    public FSpotTableBehavior<FSpotPhotoRow> get_photos_behavior() {
-        return photos_behavior;
-    }
-    
-    public FSpotTableBehavior<FSpotTagRow> get_tags_behavior() {
-        return tags_behavior;
-    }
-    
-    public FSpotTableBehavior<FSpotPhotoTagRow> get_photo_tags_behavior() {
-        return photo_tags_behavior;
-    }
-    
-    public FSpotTableBehavior<FSpotPhotoVersionRow> get_photo_versions_behavior() {
-        return photo_versions_behavior;
-    }
-    
-    public FSpotTableBehavior<FSpotRollRow> get_rolls_behavior() {
-        return rolls_behavior;
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c
deleted file mode 100644
index 129b3c7..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c
+++ /dev/null
@@ -1,998 +0,0 @@
-/* FSpotDatabaseTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotDatabaseTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTablePrivate {
-	GType t_type;
-	GBoxedCopyFunc t_dup_func;
-	GDestroyNotify t_destroy_func;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-
-static gpointer data_imports_fspot_db_fspot_database_table_parent_class = NULL;
-
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTablePrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-ImportableDatabaseTable* importable_database_table_construct (GType object_type);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name);
-gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table_get_behavior (DataImportsFSpotDbFSpotDatabaseTable* self);
-gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table);
-gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-GQuark database_error_quark (void);
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * 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);
-
-
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db) {
-	DataImportsFSpotDbFSpotDatabaseTable* self = NULL;
-	sqlite3* _tmp0_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self = (DataImportsFSpotDbFSpotDatabaseTable*) importable_database_table_construct (object_type);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->priv->t_type = t_type;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->priv->t_dup_func = t_dup_func;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->priv->t_destroy_func = t_destroy_func;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp0_ = db;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->fspot_db = _tmp0_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	return self;
-#line 147 "FSpotDatabaseTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 154 "FSpotDatabaseTable.c"
-}
-
-
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior) {
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self));
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR (behavior));
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp0_ = behavior;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_g_object_unref0 (self->behavior);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->behavior = _tmp1_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp2_ = behavior;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp3_ = data_imports_fspot_db_fspot_table_behavior_get_table_name (_tmp2_);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp4_ = _tmp3_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	importable_database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable), _tmp4_);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_g_free0 (_tmp4_);
-#line 186 "FSpotDatabaseTable.c"
-}
-
-
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table_get_behavior (DataImportsFSpotDbFSpotDatabaseTable* self) {
-	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp0_ = self->behavior;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	result = _tmp1_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	return result;
-#line 204 "FSpotDatabaseTable.c"
-}
-
-
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		separator = "";
-#line 221 "FSpotDatabaseTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 231 "FSpotDatabaseTable.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 241 "FSpotDatabaseTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 247 "FSpotDatabaseTable.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 258 "FSpotDatabaseTable.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 270 "FSpotDatabaseTable.c"
-		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 274 "FSpotDatabaseTable.c"
-		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 278 "FSpotDatabaseTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 282 "FSpotDatabaseTable.c"
-		gint i = 0;
-		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
-		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = (gsize) 1;
-#line 305 "FSpotDatabaseTable.c"
-		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 314 "FSpotDatabaseTable.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 327 "FSpotDatabaseTable.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 333 "FSpotDatabaseTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 343 "FSpotDatabaseTable.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 355 "FSpotDatabaseTable.c"
-				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 359 "FSpotDatabaseTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 365 "FSpotDatabaseTable.c"
-				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 376 "FSpotDatabaseTable.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 391 "FSpotDatabaseTable.c"
-					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 395 "FSpotDatabaseTable.c"
-					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 399 "FSpotDatabaseTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 405 "FSpotDatabaseTable.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 417 "FSpotDatabaseTable.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 438 "FSpotDatabaseTable.c"
-				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 442 "FSpotDatabaseTable.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 448 "FSpotDatabaseTable.c"
-			}
-		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 455 "FSpotDatabaseTable.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return result;
-#line 463 "FSpotDatabaseTable.c"
-		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 501 "FSpotDatabaseTable.c"
-		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 510 "FSpotDatabaseTable.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 526 "FSpotDatabaseTable.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 532 "FSpotDatabaseTable.c"
-				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 546 "FSpotDatabaseTable.c"
-				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 566 "FSpotDatabaseTable.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 581 "FSpotDatabaseTable.c"
-				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 585 "FSpotDatabaseTable.c"
-				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 593 "FSpotDatabaseTable.c"
-			}
-		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 604 "FSpotDatabaseTable.c"
-	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 613 "FSpotDatabaseTable.c"
-	}
-}
-
-
-gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table) {
-	gchar* result = NULL;
-	gchar** columns = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	gint _tmp1_;
-	gchar** _tmp2_;
-	gint columns_length1;
-	gint _columns_size_;
-	gboolean _tmp3_;
-	gchar** _tmp16_;
-	gint _tmp16__length1;
-	gchar* _tmp17_;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp0_ = self->behavior;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_table_behavior_list_columns (_tmp0_, &_tmp1_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	columns = _tmp2_;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	columns_length1 = _tmp1_;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_columns_size_ = columns_length1;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp3_ = with_table;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	if (_tmp3_) {
-#line 646 "FSpotDatabaseTable.c"
-		{
-			gint i = 0;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-			i = 0;
-#line 651 "FSpotDatabaseTable.c"
-			{
-				gboolean _tmp4_ = FALSE;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_tmp4_ = TRUE;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				while (TRUE) {
-#line 658 "FSpotDatabaseTable.c"
-					gint _tmp6_;
-					gchar** _tmp7_;
-					gint _tmp7__length1;
-					gchar** _tmp8_;
-					gint _tmp8__length1;
-					gint _tmp9_;
-					const gchar* _tmp10_;
-					gchar** _tmp11_;
-					gint _tmp11__length1;
-					gint _tmp12_;
-					const gchar* _tmp13_;
-					gchar* _tmp14_;
-					gchar* _tmp15_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					if (!_tmp4_) {
-#line 674 "FSpotDatabaseTable.c"
-						gint _tmp5_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-						_tmp5_ = i;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-						i = _tmp5_ + 1;
-#line 680 "FSpotDatabaseTable.c"
-					}
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp4_ = FALSE;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp6_ = i;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp7_ = columns;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp7__length1 = columns_length1;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					if (!(_tmp6_ < _tmp7__length1)) {
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-						break;
-#line 694 "FSpotDatabaseTable.c"
-					}
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp8_ = columns;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp8__length1 = columns_length1;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp9_ = i;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp11_ = columns;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp11__length1 = columns_length1;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp12_ = i;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp13_ = _tmp11_[_tmp12_];
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp14_ = g_strdup_printf ("%s.%s", _tmp10_, _tmp13_);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_g_free0 (_tmp8_[_tmp9_]);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp8_[_tmp9_] = _tmp14_;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-					_tmp15_ = _tmp8_[_tmp9_];
-#line 720 "FSpotDatabaseTable.c"
-				}
-			}
-		}
-	}
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp16_ = columns;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp16__length1 = columns_length1;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp17_ = _vala_g_strjoinv (", ", _tmp16_, _tmp16__length1);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	result = _tmp17_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	return result;
-#line 737 "FSpotDatabaseTable.c"
-}
-
-
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error) {
-	sqlite3_stmt* _vala_stmt = NULL;
-	gint result = 0;
-	gchar* column_list = NULL;
-	gchar* _tmp0_;
-	gchar* sql = NULL;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint res = 0;
-	sqlite3* _tmp4_;
-	const gchar* _tmp5_;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp15_;
-	gint _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	gint _tmp18_;
-	GError * _inner_error_ = NULL;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), 0);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_database_table_get_joined_column_list (self, FALSE);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	column_list = _tmp0_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp1_ = column_list;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp3_ = g_strdup_printf ("SELECT %s FROM %s", _tmp1_, _tmp2_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	sql = _tmp3_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp4_ = self->fspot_db;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp5_ = sql;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp7_ = sqlite3_prepare_v2 (_tmp4_, _tmp5_, -1, &_tmp6_, NULL);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_sqlite3_finalize0 (_vala_stmt);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_vala_stmt = _tmp6_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	res = _tmp7_;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp8_ = res;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	if (_tmp8_ != SQLITE_OK) {
-#line 791 "FSpotDatabaseTable.c"
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		gint _tmp12_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp9_ = sql;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp10_ = g_strdup_printf ("Statement failed: %s", _tmp9_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp11_ = _tmp10_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp12_ = res;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		importable_database_table_throw_error (_tmp11_, _tmp12_, &_inner_error_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_g_free0 (_tmp11_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 812 "FSpotDatabaseTable.c"
-				gint _tmp13_ = 0;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (sql);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (column_list);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				return _tmp13_;
-#line 822 "FSpotDatabaseTable.c"
-			} else {
-				gint _tmp14_ = 0;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (sql);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (column_list);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				return _tmp14_;
-#line 835 "FSpotDatabaseTable.c"
-			}
-		}
-	}
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp15_ = _vala_stmt;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp16_ = sqlite3_step (_tmp15_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	res = _tmp16_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_tmp18_ = res;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	if (_tmp18_ != SQLITE_ROW) {
-#line 849 "FSpotDatabaseTable.c"
-		gint _tmp19_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp19_ = res;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp17_ = _tmp19_ != SQLITE_DONE;
-#line 855 "FSpotDatabaseTable.c"
-	} else {
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp17_ = FALSE;
-#line 859 "FSpotDatabaseTable.c"
-	}
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	if (_tmp17_) {
-#line 863 "FSpotDatabaseTable.c"
-		const gchar* _tmp20_;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
-		gchar* _tmp23_;
-		gint _tmp24_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp21_ = column_list;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp22_ = g_strdup_printf ("select_all %s %s", _tmp20_, _tmp21_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp23_ = _tmp22_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_tmp24_ = res;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		importable_database_table_throw_error (_tmp23_, _tmp24_, &_inner_error_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_g_free0 (_tmp23_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 887 "FSpotDatabaseTable.c"
-				gint _tmp25_ = 0;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (sql);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (column_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				return _tmp25_;
-#line 897 "FSpotDatabaseTable.c"
-			} else {
-				gint _tmp26_ = 0;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (sql);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				_g_free0 (column_list);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				g_clear_error (&_inner_error_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-				return _tmp26_;
-#line 910 "FSpotDatabaseTable.c"
-			}
-		}
-	}
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	result = res;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	if (stmt) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		*stmt = _vala_stmt;
-#line 924 "FSpotDatabaseTable.c"
-	} else {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-		_sqlite3_finalize0 (_vala_stmt);
-#line 928 "FSpotDatabaseTable.c"
-	}
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	return result;
-#line 932 "FSpotDatabaseTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_table_class_init (DataImportsFSpotDbFSpotDatabaseTableClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	data_imports_fspot_db_fspot_database_table_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	((ImportableDatabaseTableClass *) klass)->finalize = data_imports_fspot_db_fspot_database_table_finalize;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotDatabaseTablePrivate));
-#line 943 "FSpotDatabaseTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_table_instance_init (DataImportsFSpotDbFSpotDatabaseTable * self) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_PRIVATE (self);
-#line 950 "FSpotDatabaseTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * obj) {
-	DataImportsFSpotDbFSpotDatabaseTable * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	_g_object_unref0 (self->behavior);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
-	IMPORTABLE_DATABASE_TABLE_CLASS (data_imports_fspot_db_fspot_database_table_parent_class)->finalize (obj);
-#line 962 "FSpotDatabaseTable.c"
-}
-
-
-/**
- * This class represents a generic F-Spot table.
- */
-GType data_imports_fspot_db_fspot_database_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_database_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_database_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotDatabaseTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_database_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotDatabaseTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_database_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_database_table_type_id;
-		data_imports_fspot_db_fspot_database_table_type_id = g_type_register_static (TYPE_IMPORTABLE_DATABASE_TABLE, "DataImportsFSpotDbFSpotDatabaseTable", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&data_imports_fspot_db_fspot_database_table_type_id__volatile, data_imports_fspot_db_fspot_database_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_database_table_type_id__volatile;
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala b/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
deleted file mode 100644
index f2bcdc9..0000000
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.vala
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * This class represents a generic F-Spot table.
- */
-public abstract class FSpotDatabaseTable<T> : ImportableDatabaseTable {
-    protected unowned Sqlite.Database fspot_db;
-    protected FSpotTableBehavior<T> behavior;
-    
-    public FSpotDatabaseTable(Sqlite.Database db) {
-        this.fspot_db = db;
-    }
-    
-    public void set_behavior(FSpotTableBehavior<T> behavior) {
-        this.behavior = behavior;
-        set_table_name(behavior.get_table_name());
-    }
-    
-    public FSpotTableBehavior<T> get_behavior() {
-        return behavior;
-    }
-    
-    protected string get_joined_column_list(bool with_table = false) {
-        string[] columns = behavior.list_columns();
-        if (with_table)
-            for (int i = 0; i < columns.length; i++)
-                columns[i] = "%s.%s".printf(table_name, columns[i]);
-        return string.joinv(", ", columns);
-    }
-    
-    protected int select_all(out Sqlite.Statement stmt) throws DatabaseError {
-        string column_list = get_joined_column_list();
-        string sql = "SELECT %s FROM %s".printf(column_list, table_name);
-
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.step();
-        if (res != Sqlite.ROW && res != Sqlite.DONE)
-            throw_error("select_all %s %s".printf(table_name, column_list), res);
-        
-        return res;
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c
deleted file mode 100644
index cc05c99..0000000
--- a/plugins/shotwell-data-imports/FSpotImporter.c
+++ /dev/null
@@ -1,5334 +0,0 @@
-/* FSpotImporter.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotImporter.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <shotwell-plugin-dev-1.0.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include "shotwell-plugin-common.h"
-#include <glib/gi18n-lib.h>
-#include <time.h>
-#include <gee.h>
-#include <float.h>
-#include <math.h>
-
-
-#define TYPE_FSPOT_SERVICE (fspot_service_get_type ())
-#define FSPOT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FSPOT_SERVICE, FSpotService))
-#define FSPOT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FSPOT_SERVICE, FSpotServiceClass))
-#define IS_FSPOT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FSPOT_SERVICE))
-#define IS_FSPOT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FSPOT_SERVICE))
-#define FSPOT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FSPOT_SERVICE, FSpotServiceClass))
-
-typedef struct _FSpotService FSpotService;
-typedef struct _FSpotServiceClass FSpotServiceClass;
-typedef struct _FSpotServicePrivate FSpotServicePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER (data_imports_fspot_fspot_data_importer_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter))
-#define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER))
-#define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterClass))
-
-typedef struct _DataImportsFSpotFSpotDataImporter DataImportsFSpotFSpotDataImporter;
-typedef struct _DataImportsFSpotFSpotDataImporterClass DataImportsFSpotFSpotDataImporterClass;
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY (data_imports_fspot_fspot_importable_library_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibraryClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibraryClass))
-
-typedef struct _DataImportsFSpotFSpotImportableLibrary DataImportsFSpotFSpotImportableLibrary;
-typedef struct _DataImportsFSpotFSpotImportableLibraryClass DataImportsFSpotFSpotImportableLibraryClass;
-typedef struct _DataImportsFSpotFSpotImportableLibraryPrivate DataImportsFSpotFSpotImportableLibraryPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM (data_imports_fspot_fspot_importable_item_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItemClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItemClass))
-
-typedef struct _DataImportsFSpotFSpotImportableItem DataImportsFSpotFSpotImportableItem;
-typedef struct _DataImportsFSpotFSpotImportableItemClass DataImportsFSpotFSpotImportableItemClass;
-typedef struct _DataImportsFSpotFSpotImportableItemPrivate DataImportsFSpotFSpotImportableItemPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW (data_imports_fspot_db_fspot_photo_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoRow DataImportsFSpotDbFSpotPhotoRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoRowClass DataImportsFSpotDbFSpotPhotoRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW (data_imports_fspot_db_fspot_photo_version_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRow DataImportsFSpotDbFSpotPhotoVersionRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRowClass DataImportsFSpotDbFSpotPhotoVersionRowClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW (data_imports_fspot_db_fspot_roll_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollRow DataImportsFSpotDbFSpotRollRow;
-typedef struct _DataImportsFSpotDbFSpotRollRowClass DataImportsFSpotDbFSpotRollRowClass;
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG (data_imports_fspot_fspot_importable_tag_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagClass))
-
-typedef struct _DataImportsFSpotFSpotImportableTag DataImportsFSpotFSpotImportableTag;
-typedef struct _DataImportsFSpotFSpotImportableTagClass DataImportsFSpotFSpotImportableTagClass;
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT (data_imports_fspot_fspot_importable_event_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_EVENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventClass))
-
-typedef struct _DataImportsFSpotFSpotImportableEvent DataImportsFSpotFSpotImportableEvent;
-typedef struct _DataImportsFSpotFSpotImportableEventClass DataImportsFSpotFSpotImportableEventClass;
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING (data_imports_fspot_fspot_importable_rating_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_RATING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_RATING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING))
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingClass))
-
-typedef struct _DataImportsFSpotFSpotImportableRating DataImportsFSpotFSpotImportableRating;
-typedef struct _DataImportsFSpotFSpotImportableRatingClass DataImportsFSpotFSpotImportableRatingClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoRowPrivate DataImportsFSpotDbFSpotPhotoRowPrivate;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRowPrivate DataImportsFSpotDbFSpotPhotoVersionRowPrivate;
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
-typedef struct _DataImportsFSpotFSpotImportableTagPrivate DataImportsFSpotFSpotImportableTagPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW (data_imports_fspot_db_fspot_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagRow DataImportsFSpotDbFSpotTagRow;
-typedef struct _DataImportsFSpotDbFSpotTagRowClass DataImportsFSpotDbFSpotTagRowClass;
-typedef struct _DataImportsFSpotDbFSpotTagRowPrivate DataImportsFSpotDbFSpotTagRowPrivate;
-typedef struct _DataImportsFSpotFSpotImportableEventPrivate DataImportsFSpotFSpotImportableEventPrivate;
-typedef struct _DataImportsFSpotFSpotImportableRatingPrivate DataImportsFSpotFSpotImportableRatingPrivate;
-
-#define DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE (data_imports_fspot_fspot_tags_cache_get_type ())
-#define DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCache))
-#define DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCacheClass))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE))
-#define DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE))
-#define DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCacheClass))
-
-typedef struct _DataImportsFSpotFSpotTagsCache DataImportsFSpotFSpotTagsCache;
-typedef struct _DataImportsFSpotFSpotTagsCacheClass DataImportsFSpotFSpotTagsCacheClass;
-typedef struct _DataImportsFSpotFSpotTagsCachePrivate DataImportsFSpotFSpotTagsCachePrivate;
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE (data_imports_fspot_db_fspot_tags_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagsTable DataImportsFSpotDbFSpotTagsTable;
-typedef struct _DataImportsFSpotDbFSpotTagsTableClass DataImportsFSpotDbFSpotTagsTableClass;
-#define _importable_database_table_unref0(var) ((var == NULL) ? NULL : (var = (importable_database_table_unref (var), NULL)))
-typedef struct _DataImportsFSpotFSpotDataImporterPrivate DataImportsFSpotFSpotDataImporterPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE (data_imports_fspot_db_fspot_database_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabaseClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabaseClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabase DataImportsFSpotDbFSpotDatabase;
-typedef struct _DataImportsFSpotDbFSpotDatabaseClass DataImportsFSpotDbFSpotDatabaseClass;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-typedef struct _DataImportsFSpotDbFSpotDatabasePrivate DataImportsFSpotDbFSpotDatabasePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE (data_imports_fspot_db_fspot_photos_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosTable DataImportsFSpotDbFSpotPhotosTable;
-typedef struct _DataImportsFSpotDbFSpotPhotosTableClass DataImportsFSpotDbFSpotPhotosTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE (data_imports_fspot_db_fspot_photo_versions_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTable DataImportsFSpotDbFSpotPhotoVersionsTable;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTableClass DataImportsFSpotDbFSpotPhotoVersionsTableClass;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE (data_imports_fspot_db_fspot_rolls_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsTable DataImportsFSpotDbFSpotRollsTable;
-typedef struct _DataImportsFSpotDbFSpotRollsTableClass DataImportsFSpotDbFSpotRollsTableClass;
-
-struct _FSpotService {
-	GObject parent_instance;
-	FSpotServicePrivate * priv;
-};
-
-struct _FSpotServiceClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableLibrary {
-	GObject parent_instance;
-	DataImportsFSpotFSpotImportableLibraryPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotImportableLibraryClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableLibraryPrivate {
-	GFile* db_file;
-};
-
-struct _DataImportsFSpotFSpotImportableItem {
-	GObject parent_instance;
-	DataImportsFSpotFSpotImportableItemPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotImportableItemClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableItemPrivate {
-	DataImportsFSpotDbFSpotPhotoRow* photo_row;
-	DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row;
-	DataImportsFSpotDbFSpotRollRow* roll_row;
-	DataImportsFSpotFSpotImportableTag** tags;
-	gint tags_length1;
-	gint _tags_size_;
-	DataImportsFSpotFSpotImportableEvent* event;
-	DataImportsFSpotFSpotImportableRating* rating;
-	gchar* folder_path;
-	gchar* filename;
-	time_t* date_time;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoRowPrivate * priv;
-	gint64 photo_id;
-	time_t time;
-	GFile* base_path;
-	gchar* filename;
-	gchar* description;
-	gint64 roll_id;
-	gint64 default_version_id;
-	gint rating;
-	gchar* md5_sum;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoRowClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionRowPrivate * priv;
-	gint64 photo_id;
-	gint64 version_id;
-	gchar* name;
-	GFile* base_path;
-	gchar* filename;
-	gchar* md5_sum;
-	gboolean is_protected;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionRowClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableTag {
-	GObject parent_instance;
-	DataImportsFSpotFSpotImportableTagPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotImportableTagClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableTagPrivate {
-	DataImportsFSpotDbFSpotTagRow* row;
-	DataImportsFSpotFSpotImportableTag* parent;
-};
-
-struct _DataImportsFSpotDbFSpotTagRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotTagRowPrivate * priv;
-	gint64 tag_id;
-	gchar* name;
-	gint64 category_id;
-	gboolean is_category;
-	gint sort_priority;
-	gchar* stock_icon;
-};
-
-struct _DataImportsFSpotDbFSpotTagRowClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableEvent {
-	GObject parent_instance;
-	DataImportsFSpotFSpotImportableEventPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotImportableEventClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableEventPrivate {
-	DataImportsFSpotDbFSpotTagRow* row;
-};
-
-struct _DataImportsFSpotFSpotImportableRating {
-	GObject parent_instance;
-	DataImportsFSpotFSpotImportableRatingPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotImportableRatingClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotImportableRatingPrivate {
-	gint rating_value;
-};
-
-struct _DataImportsFSpotFSpotTagsCache {
-	GObject parent_instance;
-	DataImportsFSpotFSpotTagsCachePrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotTagsCacheClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotTagsCachePrivate {
-	DataImportsFSpotDbFSpotTagsTable* tags_table;
-	GeeHashMap* tags_map;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotFSpotDataImporter {
-	GObject parent_instance;
-	DataImportsFSpotFSpotDataImporterPrivate * priv;
-};
-
-struct _DataImportsFSpotFSpotDataImporterClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotFSpotDataImporterPrivate {
-	SpitDataImportsPluginHost* host;
-	SpitDataImportsService* service;
-	gboolean running;
-};
-
-struct _DataImportsFSpotDbFSpotDatabase {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotDatabasePrivate * priv;
-	DataImportsFSpotDbFSpotPhotosTable* photos_table;
-	DataImportsFSpotDbFSpotPhotoVersionsTable* photo_versions_table;
-	DataImportsFSpotDbFSpotTagsTable* tags_table;
-	DataImportsFSpotDbFSpotRollsTable* rolls_table;
-	gint64 hidden_tag_id;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer fspot_service_parent_class = NULL;
-static GdkPixbuf** fspot_service_icon_pixbuf_set;
-static gint fspot_service_icon_pixbuf_set_length1;
-static GdkPixbuf** fspot_service_icon_pixbuf_set = NULL;
-static gint fspot_service_icon_pixbuf_set_length1 = 0;
-static gint _fspot_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface * fspot_service_spit_pluggable_parent_iface = NULL;
-static SpitDataImportsServiceIface * fspot_service_spit_data_imports_service_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_importable_library_parent_class = NULL;
-static SpitDataImportsImportableLibraryIface * data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_importable_item_parent_class = NULL;
-static SpitDataImportsImportableMediaItemIface * data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_importable_tag_parent_class = NULL;
-static SpitDataImportsImportableTagIface * data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_importable_event_parent_class = NULL;
-static SpitDataImportsImportableEventIface * data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_importable_rating_parent_class = NULL;
-static SpitDataImportsImportableRatingIface * data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL;
-static gpointer data_imports_fspot_fspot_tags_cache_parent_class = NULL;
-static gpointer data_imports_fspot_fspot_data_importer_parent_class = NULL;
-static SpitDataImportsDataImporterIface * data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL;
-
-GType fspot_service_get_type (void) G_GNUC_CONST;
-enum  {
-	FSPOT_SERVICE_DUMMY_PROPERTY
-};
-#define FSPOT_SERVICE_ICON_FILENAME "f-spot-24.png"
-FSpotService* fspot_service_new (GFile* resource_directory);
-FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory);
-void data_imports_fspot_db_init (void);
-static gint fspot_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
-static const gchar* fspot_service_real_get_id (SpitPluggable* base);
-static const gchar* fspot_service_real_get_pluggable_name (SpitPluggable* base);
-static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length);
-static void fspot_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (SpitDataImportsService* base, SpitDataImportsPluginHost* host);
-DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host);
-DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host);
-GType data_imports_fspot_fspot_data_importer_get_type (void) G_GNUC_CONST;
-static void fspot_service_finalize (GObject * obj);
-#define DATA_IMPORTS_FSPOT_SERVICE_NAME "F-Spot"
-#define DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE _ ("Welcome to the F-Spot library import service.\n" \
-"\n" \
-"Please select a library to import, either by selecting one of the exis" \
-"ting libraries found by Shotwell or by selecting an alternative F-Spot" \
-" database file.")
-#define DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE_FILE_ONLY _ ("Welcome to the F-Spot library import service.\n" \
-"\n" \
-"Please select an F-Spot database file.")
-#define DATA_IMPORTS_FSPOT_FILE_IMPORT_LABEL _ ("Manually select an F-Spot database file to import:")
-#define DATA_IMPORTS_FSPOT_ERROR_CANT_OPEN_DB_FILE _ ("Cannot open the selected F-Spot database file: the file does not exist" \
-" or is not an F-Spot database")
-#define DATA_IMPORTS_FSPOT_ERROR_UNSUPPORTED_DB_VERSION _ ("Cannot open the selected F-Spot database file: this version of the F-S" \
-"pot database is not supported by Shotwell")
-#define DATA_IMPORTS_FSPOT_ERROR_CANT_READ_TAGS_TABLE _ ("Cannot read the selected F-Spot database file: error while reading tag" \
-"s table")
-#define DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE _ ("Cannot read the selected F-Spot database file: error while reading pho" \
-"tos table")
-#define DATA_IMPORTS_FSPOT_MESSAGE_FINAL_SCREEN _ ("Shotwell has found %d photos in the F-Spot library and is currently im" \
-"porting them. Duplicates will be automatically detected and removed.\n" \
-"\n" \
-"You can close this dialog and start using Shotwell while the import is" \
-" taking place in the background.")
-GType data_imports_fspot_fspot_importable_library_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibraryPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_DUMMY_PROPERTY
-};
-DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_new (GFile* db_file);
-DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file);
-GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self);
-static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base);
-static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj);
-GType data_imports_fspot_fspot_importable_item_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_fspot_importable_tag_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_fspot_importable_event_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_fspot_importable_rating_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItemPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_DUMMY_PROPERTY
-};
-DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_new (DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite);
-DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_construct (GType object_type, DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite);
-static DataImportsFSpotFSpotImportableTag** _vala_array_dup2 (DataImportsFSpotFSpotImportableTag** self, int length);
-static time_t* _time_t_dup (time_t* self);
-DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_new (gint rating_value);
-DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_construct (GType object_type, gint rating_value);
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED -1
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED 0
-static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url);
-static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_real_get_tags (SpitDataImportsImportableMediaItem* base, int* result_length1);
-static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value);
-static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base);
-static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base);
-static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base);
-static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataImportsImportableMediaItem* base);
-static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base);
-static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base);
-static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_DUMMY_PROPERTY
-};
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_new (DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent);
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent);
-gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImportableTag* self);
-static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImportsImportableTag* base);
-static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_real_get_parent (SpitDataImportsImportableTag* base);
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_fspot_parent (DataImportsFSpotFSpotImportableTag* self);
-gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotFSpotImportableTag* self);
-gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpotImportableTag* self);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_PREFIX_STOCK_ICON "stock_icon:"
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self);
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row);
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row);
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj);
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_DUMMY_PROPERTY
-};
-static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base);
-static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj);
-#define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_DUMMY_PROPERTY
-};
-static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base);
-static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base);
-static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base);
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj);
-GType data_imports_fspot_fspot_tags_cache_get_type (void) G_GNUC_CONST;
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_tags_table_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCachePrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_DUMMY_PROPERTY
-};
-GQuark database_error_quark (void);
-DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_new (DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error);
-DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (GType object_type, DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error);
-static gint64* _int64_dup (gint64* self);
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error);
-static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error);
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error);
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj);
-#define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterPrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_DUMMY_PROPERTY
-};
-static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitDataImportsDataImporter* base);
-static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_service (SpitDataImportsDataImporter* base);
-static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base);
-static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self);
-static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDataImporter* base);
-static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value);
-static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library);
-static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDataImportsDataImporter* base, GFile* file);
-GType data_imports_fspot_db_fspot_database_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile* db_file, GError** error);
-DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error);
-GType data_imports_fspot_db_fspot_photos_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_versions_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_rolls_table_get_type (void) G_GNUC_CONST;
-GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error);
-GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error);
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id);
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value);
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error);
-GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error);
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count);
-static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self);
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS "stock_icon:emblem-event"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV "stock_icon:emblem-favorite"
-static void data_imports_fspot_fspot_data_importer_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);
-
-
-FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory) {
-	FSpotService * self = NULL;
-	GdkPixbuf** _tmp0_;
-	gint _tmp0__length1;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (FSpotService*) g_object_new (object_type, NULL);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_db_init ();
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = fspot_service_icon_pixbuf_set;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0__length1 = fspot_service_icon_pixbuf_set_length1;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp0_ == NULL) {
-#line 617 "FSpotImporter.c"
-		gint _tmp1_;
-		GdkPixbuf** _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp2_ = resources_load_from_resource ("/org/gnome/Shotwell/Imports/" FSPOT_SERVICE_ICON_FILENAME, &_tmp1_);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		fspot_service_icon_pixbuf_set = (_vala_array_free (fspot_service_icon_pixbuf_set, fspot_service_icon_pixbuf_set_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		fspot_service_icon_pixbuf_set = _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		fspot_service_icon_pixbuf_set_length1 = _tmp1_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_fspot_service_icon_pixbuf_set_size_ = fspot_service_icon_pixbuf_set_length1;
-#line 630 "FSpotImporter.c"
-	}
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 634 "FSpotImporter.c"
-}
-
-
-FSpotService* fspot_service_new (GFile* resource_directory) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return fspot_service_construct (TYPE_FSPOT_SERVICE, resource_directory);
-#line 641 "FSpotImporter.c"
-}
-
-
-static gint fspot_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
-	FSpotService * self;
-	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = min_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = max_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_DATA_IMPORTS_CURRENT_INTERFACE);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp2_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 663 "FSpotImporter.c"
-}
-
-
-static const gchar* fspot_service_real_get_id (SpitPluggable* base) {
-	FSpotService * self;
-	const gchar* result = NULL;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = "org.yorba.shotwell.dataimports.fspot";
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 676 "FSpotImporter.c"
-}
-
-
-static const gchar* fspot_service_real_get_pluggable_name (SpitPluggable* base) {
-	FSpotService * self;
-	const gchar* result = NULL;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = "F-Spot";
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 689 "FSpotImporter.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 696 "FSpotImporter.c"
-}
-
-
-static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
-	GdkPixbuf** result;
-	int i;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = g_new0 (GdkPixbuf*, length + 1);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	for (i = 0; i < length; i++) {
-#line 707 "FSpotImporter.c"
-		GdkPixbuf* _tmp0_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result[i] = _tmp0_;
-#line 713 "FSpotImporter.c"
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 717 "FSpotImporter.c"
-}
-
-
-static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
-	FSpotService * self;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	GdkPixbuf** _tmp7_;
-	gint _tmp7__length1;
-	GdkPixbuf** _tmp8_;
-	gint _tmp8__length1;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_if_fail (info != NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = g_strdup ("Bruno Girin");
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).authors);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).authors = _tmp0_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).copyright);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).copyright = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).translators);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).translators = _tmp2_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strdup (_VERSION);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).version);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).version = _tmp3_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).website_name);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_name = _tmp4_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).website_url);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_url = _tmp5_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).is_license_wordwrapped = FALSE;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = g_strdup (RESOURCES_LICENSE);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 ((*info).license);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).license = _tmp6_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = fspot_service_icon_pixbuf_set;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7__length1 = fspot_service_icon_pixbuf_set_length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8__length1 = _tmp7__length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons = _tmp8_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons_length1 = _tmp8__length1;
-#line 796 "FSpotImporter.c"
-}
-
-
-static void fspot_service_real_activation (SpitPluggable* base, gboolean enabled) {
-	FSpotService * self;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 804 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (SpitDataImportsService* base, SpitDataImportsPluginHost* host) {
-	FSpotService * self;
-	SpitDataImportsDataImporter* result = NULL;
-	SpitDataImportsPluginHost* _tmp0_;
-	DataImportsFSpotFSpotDataImporter* _tmp1_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = host;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = data_imports_fspot_fspot_data_importer_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_SERVICE, SpitDataImportsService), _tmp0_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 825 "FSpotImporter.c"
-}
-
-
-static void fspot_service_class_init (FSpotServiceClass * klass) {
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	fspot_service_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = fspot_service_finalize;
-#line 834 "FSpotImporter.c"
-}
-
-
-static void fspot_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	fspot_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) fspot_service_real_get_pluggable_interface;
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_id = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_id;
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_pluggable_name;
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) fspot_service_real_get_info;
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->activation = (void (*) (SpitPluggable *, gboolean)) fspot_service_real_activation;
-#line 851 "FSpotImporter.c"
-}
-
-
-static void fspot_service_spit_data_imports_service_interface_init (SpitDataImportsServiceIface * iface) {
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	fspot_service_spit_data_imports_service_parent_iface = g_type_interface_peek_parent (iface);
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->create_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsService *, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer;
-#line 860 "FSpotImporter.c"
-}
-
-
-static void fspot_service_instance_init (FSpotService * self) {
-}
-
-
-static void fspot_service_finalize (GObject * obj) {
-	FSpotService * self;
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FSPOT_SERVICE, FSpotService);
-#line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (fspot_service_parent_class)->finalize (obj);
-#line 874 "FSpotImporter.c"
-}
-
-
-GType fspot_service_get_type (void) {
-	static volatile gsize fspot_service_type_id__volatile = 0;
-	if (g_once_init_enter (&fspot_service_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (FSpotServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) fspot_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FSpotService), 0, (GInstanceInitFunc) fspot_service_instance_init, NULL };
-		static const GInterfaceInfo spit_pluggable_info = { (GInterfaceInitFunc) fspot_service_spit_pluggable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		static const GInterfaceInfo spit_data_imports_service_info = { (GInterfaceInitFunc) fspot_service_spit_data_imports_service_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType fspot_service_type_id;
-		fspot_service_type_id = g_type_register_static (G_TYPE_OBJECT, "FSpotService", &g_define_type_info, 0);
-		g_type_add_interface_static (fspot_service_type_id, SPIT_TYPE_PLUGGABLE, &spit_pluggable_info);
-		g_type_add_interface_static (fspot_service_type_id, SPIT_DATA_IMPORTS_TYPE_SERVICE, &spit_data_imports_service_info);
-		g_once_init_leave (&fspot_service_type_id__volatile, fspot_service_type_id);
-	}
-	return fspot_service_type_id__volatile;
-}
-
-
-DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file) {
-	DataImportsFSpotFSpotImportableLibrary * self = NULL;
-	GFile* _tmp0_;
-	GFile* _tmp1_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (G_IS_FILE (db_file), NULL);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotImportableLibrary*) g_object_new (object_type, NULL);
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = db_file;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->db_file);
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->db_file = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 912 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_new (GFile* db_file) {
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_importable_library_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, db_file);
-#line 919 "FSpotImporter.c"
-}
-
-
-GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self) {
-	GFile* result = NULL;
-	GFile* _tmp0_;
-	GFile* _tmp1_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY (self), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->db_file;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 937 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base) {
-	DataImportsFSpotFSpotImportableLibrary * self;
-	gchar* result = NULL;
-	GFile* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->db_file;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = g_file_get_path (_tmp0_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = _tmp1_;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strdup_printf (_ ("F-Spot library: %s"), _tmp2_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = _tmp3_;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp2_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp4_;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 967 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_library_class_init (DataImportsFSpotFSpotImportableLibraryClass * klass) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_library_parent_class = g_type_class_peek_parent (klass);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableLibraryPrivate));
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_library_finalize;
-#line 978 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_interface_init (SpitDataImportsImportableLibraryIface * iface) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = g_type_interface_peek_parent (iface);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_display_name = (gchar* (*) (SpitDataImportsImportableLibrary *)) data_imports_fspot_fspot_importable_library_real_get_display_name;
-#line 987 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_library_instance_init (DataImportsFSpotFSpotImportableLibrary * self) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_PRIVATE (self);
-#line 994 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj) {
-	DataImportsFSpotFSpotImportableLibrary * self;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->db_file);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_library_parent_class)->finalize (obj);
-#line 1006 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_importable_library_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_importable_library_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_importable_library_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotImportableLibraryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_importable_library_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotImportableLibrary), 0, (GInstanceInitFunc) data_imports_fspot_fspot_importable_library_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_importable_library_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_importable_library_type_id;
-		data_imports_fspot_fspot_importable_library_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotImportableLibrary", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_importable_library_type_id, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_LIBRARY, &spit_data_imports_importable_library_info);
-		g_once_init_leave (&data_imports_fspot_fspot_importable_library_type_id__volatile, data_imports_fspot_fspot_importable_library_type_id);
-	}
-	return data_imports_fspot_fspot_importable_library_type_id__volatile;
-}
-
-
-static DataImportsFSpotFSpotImportableTag** _vala_array_dup2 (DataImportsFSpotFSpotImportableTag** self, int length) {
-	DataImportsFSpotFSpotImportableTag** result;
-	int i;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = g_new0 (DataImportsFSpotFSpotImportableTag*, length + 1);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	for (i = 0; i < length; i++) {
-#line 1031 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* _tmp0_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result[i] = _tmp0_;
-#line 1037 "FSpotImporter.c"
-	}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1041 "FSpotImporter.c"
-}
-
-
-static time_t* _time_t_dup (time_t* self) {
-	time_t* dup;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	dup = g_new0 (time_t, 1);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	memcpy (dup, self, sizeof (time_t));
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return dup;
-#line 1053 "FSpotImporter.c"
-}
-
-
-static gpointer __time_t_dup0 (gpointer self) {
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self ? _time_t_dup (self) : NULL;
-#line 1060 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_construct (GType object_type, DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
-	DataImportsFSpotFSpotImportableItem * self = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_;
-	DataImportsFSpotDbFSpotRollRow* _tmp4_;
-	DataImportsFSpotDbFSpotRollRow* _tmp5_;
-	DataImportsFSpotFSpotImportableTag** _tmp6_;
-	gint _tmp6__length1;
-	DataImportsFSpotFSpotImportableTag** _tmp7_;
-	gint _tmp7__length1;
-	DataImportsFSpotFSpotImportableEvent* _tmp8_;
-	DataImportsFSpotFSpotImportableEvent* _tmp9_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp10_;
-	time_t _tmp11_;
-	time_t* _tmp12_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp13_;
-	gint _tmp14_;
-	gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
-	gchar* _tmp31_;
-	const gchar* _tmp32_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_;
-	gchar* _tmp38_;
-	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW (photo_row), NULL);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail ((photo_version_row == NULL) || DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW (photo_version_row), NULL);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail ((roll_row == NULL) || DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW (roll_row), NULL);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail ((event == NULL) || DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_EVENT (event), NULL);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotImportableItem*) g_object_new (object_type, NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = photo_row;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->photo_row);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->photo_row = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = photo_version_row;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->photo_version_row);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->photo_version_row = _tmp3_;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = roll_row;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->roll_row);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->roll_row = _tmp5_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = tags;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6__length1 = tags_length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup2 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7__length1 = _tmp6__length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags = (_vala_array_free (self->priv->tags, self->priv->tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags = _tmp7_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags_length1 = _tmp7__length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->_tags_size_ = self->priv->tags_length1;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = event;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->event);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->event = _tmp9_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp10_ = photo_row;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp11_ = _tmp10_->time;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp12_ = __time_t_dup0 (&_tmp11_);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->date_time);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->date_time = _tmp12_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp13_ = photo_row;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp14_ = _tmp13_->rating;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp14_ > 0) {
-#line 1165 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp15_;
-		gint _tmp16_;
-		DataImportsFSpotFSpotImportableRating* _tmp17_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp15_ = photo_row;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp16_ = _tmp15_->rating;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp17_ = data_imports_fspot_fspot_importable_rating_new (_tmp16_);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (self->priv->rating);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		self->priv->rating = _tmp17_;
-#line 1179 "FSpotImporter.c"
-	} else {
-		gboolean _tmp18_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp18_ = is_hidden;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_tmp18_) {
-#line 1186 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableRating* _tmp19_;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp19_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (self->priv->rating);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			self->priv->rating = _tmp19_;
-#line 1194 "FSpotImporter.c"
-		} else {
-			gboolean _tmp20_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp20_ = is_favorite;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_tmp20_) {
-#line 1201 "FSpotImporter.c"
-				DataImportsFSpotFSpotImportableRating* _tmp21_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp21_ = data_imports_fspot_fspot_importable_rating_new (5);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (self->priv->rating);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				self->priv->rating = _tmp21_;
-#line 1209 "FSpotImporter.c"
-			} else {
-				DataImportsFSpotFSpotImportableRating* _tmp22_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp22_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (self->priv->rating);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				self->priv->rating = _tmp22_;
-#line 1218 "FSpotImporter.c"
-			}
-		}
-	}
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp24_ = photo_version_row;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp24_ != NULL) {
-#line 1226 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
-		GFile* _tmp26_;
-		gchar* _tmp27_;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp25_ = photo_version_row;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = _tmp25_->base_path;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp27_ = g_file_get_path (_tmp26_);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp23_);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp23_ = _tmp27_;
-#line 1240 "FSpotImporter.c"
-	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp28_;
-		GFile* _tmp29_;
-		gchar* _tmp30_;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp28_ = photo_row;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp29_ = _tmp28_->base_path;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp23_);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp23_ = _tmp30_;
-#line 1255 "FSpotImporter.c"
-	}
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp31_ = g_strdup (_tmp23_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->folder_path);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->folder_path = _tmp31_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp33_ = photo_version_row;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp33_ != NULL) {
-#line 1267 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_;
-		const gchar* _tmp35_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp34_ = photo_version_row;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp35_ = _tmp34_->filename;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp32_ = _tmp35_;
-#line 1276 "FSpotImporter.c"
-	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
-		const gchar* _tmp37_;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp36_ = photo_row;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp37_ = _tmp36_->filename;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp32_ = _tmp37_;
-#line 1286 "FSpotImporter.c"
-	}
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp38_ = g_strdup (_tmp32_);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->filename);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->filename = _tmp38_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp40_ = self->priv->folder_path;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp40_ != NULL) {
-#line 1298 "FSpotImporter.c"
-		const gchar* _tmp41_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp41_ = self->priv->filename;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp39_ = _tmp41_ != NULL;
-#line 1304 "FSpotImporter.c"
-	} else {
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp39_ = FALSE;
-#line 1308 "FSpotImporter.c"
-	}
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp39_) {
-#line 1312 "FSpotImporter.c"
-		GFile* photo = NULL;
-		const gchar* _tmp42_;
-		GFile* _tmp43_;
-		GFile* _tmp44_;
-		const gchar* _tmp45_;
-		GFile* _tmp46_;
-		GFile* _tmp47_;
-		GFile* _tmp48_;
-		gboolean _tmp49_;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp42_ = self->priv->folder_path;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp43_ = g_file_new_for_path (_tmp42_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp44_ = _tmp43_;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp45_ = self->priv->filename;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp46_ = g_file_get_child (_tmp44_, _tmp45_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp47_ = _tmp46_;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp44_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		photo = _tmp47_;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp48_ = photo;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp49_ = g_file_query_exists (_tmp48_, NULL);
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (!_tmp49_) {
-#line 1344 "FSpotImporter.c"
-			const gchar* _tmp50_;
-			gchar* _tmp51_;
-			const gchar* _tmp52_;
-			gchar* _tmp53_;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp50_ = self->priv->folder_path;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp51_ = data_imports_fspot_fspot_importable_item_decode_url (self, _tmp50_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_free0 (self->priv->folder_path);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			self->priv->folder_path = _tmp51_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp52_ = self->priv->filename;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp53_ = data_imports_fspot_fspot_importable_item_decode_url (self, _tmp52_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_free0 (self->priv->filename);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			self->priv->filename = _tmp53_;
-#line 1365 "FSpotImporter.c"
-		}
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (photo);
-#line 1369 "FSpotImporter.c"
-	}
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp23_);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 1375 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_new (DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_importable_item_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, photo_row, photo_version_row, roll_row, tags, tags_length1, event, is_hidden, is_favorite);
-#line 1382 "FSpotImporter.c"
-}
-
-
-static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value) {
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (SpitDataImportsImportableTag*, *array, (*size) + 1);
-#line 1393 "FSpotImporter.c"
-	}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 1399 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_real_get_tags (SpitDataImportsImportableMediaItem* base, int* result_length1) {
-	DataImportsFSpotFSpotImportableItem * self;
-	SpitDataImportsImportableTag** result = NULL;
-	SpitDataImportsImportableTag** importable_tags = NULL;
-	SpitDataImportsImportableTag** _tmp0_;
-	gint importable_tags_length1;
-	gint _importable_tags_size_;
-	DataImportsFSpotFSpotImportableTag** _tmp1_;
-	gint _tmp1__length1;
-	SpitDataImportsImportableTag** _tmp6_;
-	gint _tmp6__length1;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = g_new0 (SpitDataImportsImportableTag*, 0 + 1);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	importable_tags = _tmp0_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	importable_tags_length1 = 0;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_importable_tags_size_ = importable_tags_length1;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = self->priv->tags;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1__length1 = self->priv->tags_length1;
-#line 1428 "FSpotImporter.c"
-	{
-		DataImportsFSpotFSpotImportableTag** tag_collection = NULL;
-		gint tag_collection_length1 = 0;
-		gint _tag_collection_size_ = 0;
-		gint tag_it = 0;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		tag_collection = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		tag_collection_length1 = _tmp1__length1;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		for (tag_it = 0; tag_it < _tmp1__length1; tag_it = tag_it + 1) {
-#line 1440 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableTag* _tmp2_;
-			DataImportsFSpotFSpotImportableTag* tag = NULL;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp2_ = _g_object_ref0 (tag_collection[tag_it]);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tag = _tmp2_;
-#line 1447 "FSpotImporter.c"
-			{
-				SpitDataImportsImportableTag** _tmp3_;
-				gint _tmp3__length1;
-				DataImportsFSpotFSpotImportableTag* _tmp4_;
-				SpitDataImportsImportableTag* _tmp5_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp3_ = importable_tags;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp3__length1 = importable_tags_length1;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp4_ = tag;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_TAG, SpitDataImportsImportableTag));
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_vala_array_add1 (&importable_tags, &importable_tags_length1, &_importable_tags_size_, _tmp5_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag);
-#line 1465 "FSpotImporter.c"
-			}
-		}
-	}
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = importable_tags;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6__length1 = importable_tags_length1;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (result_length1) {
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*result_length1 = _tmp6__length1;
-#line 1477 "FSpotImporter.c"
-	}
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp6_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1483 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	SpitDataImportsImportableEvent* result = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp0_;
-	SpitDataImportsImportableEvent* _tmp1_;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->event;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_EVENT, SpitDataImportsImportableEvent));
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1502 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->folder_path;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1521 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->filename;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1540 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp8_;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = self->priv->photo_row;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _tmp2_->description;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp3_ == NULL) {
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp1_ = TRUE;
-#line 1562 "FSpotImporter.c"
-	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp4_;
-		const gchar* _tmp5_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp4_ = self->priv->photo_row;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = _tmp4_->description;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp1_ = g_strcmp0 (_tmp5_, "") == 0;
-#line 1572 "FSpotImporter.c"
-	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp1_) {
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = NULL;
-#line 1578 "FSpotImporter.c"
-	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
-		const gchar* _tmp7_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = self->priv->photo_row;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp7_ = _tmp6_->description;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = _tmp7_;
-#line 1588 "FSpotImporter.c"
-	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = g_strdup (_tmp0_);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp8_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1596 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	SpitDataImportsImportableRating* result = NULL;
-	DataImportsFSpotFSpotImportableRating* _tmp0_;
-	SpitDataImportsImportableRating* _tmp1_;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->rating;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_RATING, SpitDataImportsImportableRating));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1615 "FSpotImporter.c"
-}
-
-
-static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base) {
-	DataImportsFSpotFSpotImportableItem * self;
-	time_t* result = NULL;
-	time_t* _tmp0_;
-	time_t* _tmp1_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->date_time;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = __time_t_dup0 (_tmp0_);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 1634 "FSpotImporter.c"
-}
-
-
-static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_;
-	gunichar _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1659 "FSpotImporter.c"
-		gchar* _tmp4_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1667 "FSpotImporter.c"
-	} else {
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1673 "FSpotImporter.c"
-	}
-}
-
-
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_;
-	gint _tmp1_;
-	glong _tmp2_;
-	glong _tmp5_;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_;
-	glong _tmp16_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	gchar* _tmp21_;
-#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 1707 "FSpotImporter.c"
-		glong _tmp3_;
-		glong _tmp4_;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 1716 "FSpotImporter.c"
-	}
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 1722 "FSpotImporter.c"
-		glong _tmp6_;
-		glong _tmp7_;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 1731 "FSpotImporter.c"
-	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 1737 "FSpotImporter.c"
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1746 "FSpotImporter.c"
-	} else {
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 1750 "FSpotImporter.c"
-	}
-#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 1758 "FSpotImporter.c"
-		glong _tmp14_;
-		glong _tmp15_;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1767 "FSpotImporter.c"
-	} else {
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 1771 "FSpotImporter.c"
-	}
-#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 1793 "FSpotImporter.c"
-}
-
-
-static gchar string_get (const gchar* self, glong index) {
-	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 1811 "FSpotImporter.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 1834 "FSpotImporter.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1842 "FSpotImporter.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 1854 "FSpotImporter.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 1878 "FSpotImporter.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1884 "FSpotImporter.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 1888 "FSpotImporter.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 1892 "FSpotImporter.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 1904 "FSpotImporter.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 1914 "FSpotImporter.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 1920 "FSpotImporter.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1934 "FSpotImporter.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1944 "FSpotImporter.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 1950 "FSpotImporter.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 1959 "FSpotImporter.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 1979 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url) {
-	gchar* result = NULL;
-	GString* builder = NULL;
-	GString* _tmp0_;
-	GString* _tmp49_;
-	const gchar* _tmp50_;
-	gchar* _tmp51_;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM (self), NULL);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (url != NULL, NULL);
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = g_string_new ("");
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	builder = _tmp0_;
-#line 1998 "FSpotImporter.c"
-	{
-		gint idx = 0;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		idx = 0;
-#line 2003 "FSpotImporter.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp1_ = TRUE;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			while (TRUE) {
-#line 2010 "FSpotImporter.c"
-				gint _tmp2_;
-				const gchar* _tmp3_;
-				gint _tmp4_;
-				gint _tmp5_;
-				gint cidx = 0;
-				const gchar* _tmp6_;
-				gint _tmp7_;
-				gint _tmp8_;
-				gint _tmp9_;
-				gint _tmp10_;
-				gint _tmp17_;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (!_tmp1_) {
-#line 2024 "FSpotImporter.c"
-				}
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp1_ = FALSE;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp2_ = idx;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp3_ = url;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp4_ = strlen (_tmp3_);
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp5_ = _tmp4_;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (!(_tmp2_ < _tmp5_)) {
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					break;
-#line 2040 "FSpotImporter.c"
-				}
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp6_ = url;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp7_ = idx;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp8_ = string_index_of_char (_tmp6_, (gunichar) '%', _tmp7_);
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				cidx = _tmp8_;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp9_ = cidx;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp10_ = idx;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp9_ > _tmp10_) {
-#line 2056 "FSpotImporter.c"
-					GString* _tmp11_;
-					const gchar* _tmp12_;
-					gint _tmp13_;
-					gint _tmp14_;
-					gchar* _tmp15_;
-					gchar* _tmp16_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp11_ = builder;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp12_ = url;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp13_ = idx;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp14_ = cidx;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp15_ = string_slice (_tmp12_, (glong) _tmp13_, (glong) _tmp14_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp16_ = _tmp15_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_string_append (_tmp11_, _tmp16_);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_free0 (_tmp16_);
-#line 2079 "FSpotImporter.c"
-				}
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp17_ = cidx;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp17_ >= 0) {
-#line 2085 "FSpotImporter.c"
-					gint _tmp18_;
-					const gchar* _tmp19_;
-					gint _tmp20_;
-					gint _tmp21_;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp18_ = cidx;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp19_ = url;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp20_ = strlen (_tmp19_);
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp21_ = _tmp20_;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp18_ < (_tmp21_ - 2)) {
-#line 2100 "FSpotImporter.c"
-						gchar c1 = '\0';
-						const gchar* _tmp22_;
-						gint _tmp23_;
-						gchar _tmp24_;
-						gchar c2 = '\0';
-						const gchar* _tmp25_;
-						gint _tmp26_;
-						gchar _tmp27_;
-						gboolean _tmp28_ = FALSE;
-						gchar _tmp29_;
-						gboolean _tmp30_;
-						gint _tmp39_;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp22_ = url;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp23_ = cidx;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp24_ = string_get (_tmp22_, (glong) (_tmp23_ + 1));
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						c1 = _tmp24_;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp25_ = url;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp26_ = cidx;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp27_ = string_get (_tmp25_, (glong) (_tmp26_ + 2));
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						c2 = _tmp27_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp29_ = c1;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp30_ = g_ascii_isxdigit (_tmp29_);
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp30_) {
-#line 2135 "FSpotImporter.c"
-							gchar _tmp31_;
-							gboolean _tmp32_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp31_ = c1;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp32_ = g_ascii_isxdigit (_tmp31_);
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp28_ = _tmp32_;
-#line 2144 "FSpotImporter.c"
-						} else {
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp28_ = FALSE;
-#line 2148 "FSpotImporter.c"
-						}
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp28_) {
-#line 2152 "FSpotImporter.c"
-							gint ccode = 0;
-							gchar _tmp33_;
-							gint _tmp34_;
-							gchar _tmp35_;
-							gint _tmp36_;
-							GString* _tmp37_;
-							gint _tmp38_;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp33_ = c1;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp34_ = g_ascii_xdigit_value (_tmp33_);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp35_ = c2;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp36_ = g_ascii_xdigit_value (_tmp35_);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							ccode = (0x10 * _tmp34_) + _tmp36_;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp37_ = builder;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp38_ = ccode;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							g_string_append_c (_tmp37_, (gchar) _tmp38_);
-#line 2176 "FSpotImporter.c"
-						}
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp39_ = cidx;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						idx = _tmp39_ + 3;
-#line 2182 "FSpotImporter.c"
-					} else {
-						gint _tmp40_;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp40_ = cidx;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						idx = _tmp40_ + 1;
-#line 2189 "FSpotImporter.c"
-					}
-				} else {
-					GString* _tmp41_;
-					const gchar* _tmp42_;
-					gint _tmp43_;
-					gchar* _tmp44_;
-					gchar* _tmp45_;
-					const gchar* _tmp46_;
-					gint _tmp47_;
-					gint _tmp48_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp41_ = builder;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp42_ = url;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp43_ = idx;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp44_ = string_substring (_tmp42_, (glong) _tmp43_, (glong) -1);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp45_ = _tmp44_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_string_append (_tmp41_, _tmp45_);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_free0 (_tmp45_);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp46_ = url;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp47_ = strlen (_tmp46_);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp48_ = _tmp47_;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					idx = _tmp48_;
-#line 2222 "FSpotImporter.c"
-				}
-			}
-		}
-	}
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp49_ = builder;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp50_ = _tmp49_->str;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp51_ = g_strdup (_tmp50_);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp51_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_string_free0 (builder);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2239 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_item_class_init (DataImportsFSpotFSpotImportableItemClass * klass) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_item_parent_class = g_type_class_peek_parent (klass);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableItemPrivate));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_item_finalize;
-#line 2250 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_interface_init (SpitDataImportsImportableMediaItemIface * iface) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = g_type_interface_peek_parent (iface);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_tags = (SpitDataImportsImportableTag** (*) (SpitDataImportsImportableMediaItem *, int*)) data_imports_fspot_fspot_importable_item_real_get_tags;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_event = (SpitDataImportsImportableEvent* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_event;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_folder_path = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_folder_path;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_filename = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_filename;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_title = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_title;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_rating = (SpitDataImportsImportableRating* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_rating;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_exposure_time = (time_t* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_exposure_time;
-#line 2271 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_item_instance_init (DataImportsFSpotFSpotImportableItem * self) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_PRIVATE (self);
-#line 2278 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj) {
-	DataImportsFSpotFSpotImportableItem * self;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->photo_row);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->photo_version_row);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->roll_row);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags = (_vala_array_free (self->priv->tags, self->priv->tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->event);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->rating);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->folder_path);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->filename);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (self->priv->date_time);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_item_parent_class)->finalize (obj);
-#line 2306 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_importable_item_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_importable_item_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_importable_item_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotImportableItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_importable_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotImportableItem), 0, (GInstanceInitFunc) data_imports_fspot_fspot_importable_item_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_importable_media_item_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_importable_item_type_id;
-		data_imports_fspot_fspot_importable_item_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotImportableItem", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_importable_item_type_id, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, &spit_data_imports_importable_media_item_info);
-		g_once_init_leave (&data_imports_fspot_fspot_importable_item_type_id__volatile, data_imports_fspot_fspot_importable_item_type_id);
-	}
-	return data_imports_fspot_fspot_importable_item_type_id__volatile;
-}
-
-
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
-	DataImportsFSpotFSpotImportableTag * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_;
-	DataImportsFSpotFSpotImportableTag* _tmp2_;
-	DataImportsFSpotFSpotImportableTag* _tmp3_;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail ((parent == NULL) || DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (parent), NULL);
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotImportableTag*) g_object_new (object_type, NULL);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = row;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->row);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->row = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = parent;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->parent);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->parent = _tmp3_;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 2354 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_new (DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_importable_tag_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, row, parent);
-#line 2361 "FSpotImporter.c"
-}
-
-
-gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImportableTag* self) {
-	gint64 result = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	gint64 _tmp1_;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), 0LL);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _tmp0_->tag_id;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2379 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImportsImportableTag* base) {
-	DataImportsFSpotFSpotImportableTag * self;
-	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _tmp0_->name;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp2_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2401 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_real_get_parent (SpitDataImportsImportableTag* base) {
-	DataImportsFSpotFSpotImportableTag * self;
-	SpitDataImportsImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_;
-	SpitDataImportsImportableTag* _tmp1_;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->parent;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_TAG, SpitDataImportsImportableTag));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2420 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_fspot_parent (DataImportsFSpotFSpotImportableTag* self) {
-	DataImportsFSpotFSpotImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_;
-	DataImportsFSpotFSpotImportableTag* _tmp1_;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->parent;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2438 "FSpotImporter.c"
-}
-
-
-gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotFSpotImportableTag* self) {
-	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _tmp0_->stock_icon;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp2_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2459 "FSpotImporter.c"
-}
-
-
-gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpotImportableTag* self) {
-	gboolean result = FALSE;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), FALSE);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _tmp0_->stock_icon;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_str_has_prefix (_tmp1_, DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_PREFIX_STOCK_ICON);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp2_;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2480 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self) {
-	DataImportsFSpotFSpotImportableEvent* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	DataImportsFSpotFSpotImportableEvent* _tmp1_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = data_imports_fspot_fspot_importable_event_new (_tmp0_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2498 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_tag_class_init (DataImportsFSpotFSpotImportableTagClass * klass) {
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_tag_parent_class = g_type_class_peek_parent (klass);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableTagPrivate));
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_tag_finalize;
-#line 2509 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_interface_init (SpitDataImportsImportableTagIface * iface) {
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = g_type_interface_peek_parent (iface);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_name;
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_parent = (SpitDataImportsImportableTag* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_parent;
-#line 2520 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_tag_instance_init (DataImportsFSpotFSpotImportableTag * self) {
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE (self);
-#line 2527 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj) {
-	DataImportsFSpotFSpotImportableTag * self;
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->row);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->parent);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_tag_parent_class)->finalize (obj);
-#line 2541 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_importable_tag_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_importable_tag_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_importable_tag_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotImportableTagClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_importable_tag_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotImportableTag), 0, (GInstanceInitFunc) data_imports_fspot_fspot_importable_tag_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_importable_tag_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_importable_tag_type_id;
-		data_imports_fspot_fspot_importable_tag_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotImportableTag", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_importable_tag_type_id, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_TAG, &spit_data_imports_importable_tag_info);
-		g_once_init_leave (&data_imports_fspot_fspot_importable_tag_type_id__volatile, data_imports_fspot_fspot_importable_tag_type_id);
-	}
-	return data_imports_fspot_fspot_importable_tag_type_id__volatile;
-}
-
-
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row) {
-	DataImportsFSpotFSpotImportableEvent * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotImportableEvent*) g_object_new (object_type, NULL);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = row;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->row);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->row = _tmp1_;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 2577 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row) {
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_importable_event_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, row);
-#line 2584 "FSpotImporter.c"
-}
-
-
-static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base) {
-	DataImportsFSpotFSpotImportableEvent * self;
-	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->row;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _tmp0_->name;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp2_;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2606 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_event_class_init (DataImportsFSpotFSpotImportableEventClass * klass) {
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_event_parent_class = g_type_class_peek_parent (klass);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableEventPrivate));
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_event_finalize;
-#line 2617 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_interface_init (SpitDataImportsImportableEventIface * iface) {
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = g_type_interface_peek_parent (iface);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*) (SpitDataImportsImportableEvent *)) data_imports_fspot_fspot_importable_event_real_get_name;
-#line 2626 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_event_instance_init (DataImportsFSpotFSpotImportableEvent * self) {
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE (self);
-#line 2633 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj) {
-	DataImportsFSpotFSpotImportableEvent * self;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->row);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_event_parent_class)->finalize (obj);
-#line 2645 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_importable_event_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_importable_event_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_importable_event_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotImportableEventClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_importable_event_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotImportableEvent), 0, (GInstanceInitFunc) data_imports_fspot_fspot_importable_event_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_importable_event_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_importable_event_type_id;
-		data_imports_fspot_fspot_importable_event_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotImportableEvent", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_importable_event_type_id, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_EVENT, &spit_data_imports_importable_event_info);
-		g_once_init_leave (&data_imports_fspot_fspot_importable_event_type_id__volatile, data_imports_fspot_fspot_importable_event_type_id);
-	}
-	return data_imports_fspot_fspot_importable_event_type_id__volatile;
-}
-
-
-DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_construct (GType object_type, gint rating_value) {
-	DataImportsFSpotFSpotImportableRating * self = NULL;
-	gint _tmp0_;
-	gint _tmp2_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotImportableRating*) g_object_new (object_type, NULL);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = rating_value;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp0_ < -1) {
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		rating_value = -1;
-#line 2675 "FSpotImporter.c"
-	} else {
-		gint _tmp1_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp1_ = rating_value;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_tmp1_ > 5) {
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			rating_value = 5;
-#line 2684 "FSpotImporter.c"
-		}
-	}
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = rating_value;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->rating_value = _tmp2_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 2693 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_new (gint rating_value) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_importable_rating_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, rating_value);
-#line 2700 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base) {
-	DataImportsFSpotFSpotImportableRating * self;
-	gboolean result = FALSE;
-	gint _tmp0_;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->rating_value;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2716 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base) {
-	DataImportsFSpotFSpotImportableRating * self;
-	gboolean result = FALSE;
-	gint _tmp0_;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->rating_value;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2732 "FSpotImporter.c"
-}
-
-
-static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base) {
-	DataImportsFSpotFSpotImportableRating * self;
-	gint result = 0;
-	gint _tmp0_;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->rating_value;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp0_;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 2748 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_rating_class_init (DataImportsFSpotFSpotImportableRatingClass * klass) {
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_rating_parent_class = g_type_class_peek_parent (klass);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableRatingPrivate));
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_rating_finalize;
-#line 2759 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_interface_init (SpitDataImportsImportableRatingIface * iface) {
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = g_type_interface_peek_parent (iface);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_rejected = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_rejected;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_unrated = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_unrated;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_value = (gint (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_get_value;
-#line 2772 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_rating_instance_init (DataImportsFSpotFSpotImportableRating * self) {
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE (self);
-#line 2779 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj) {
-	DataImportsFSpotFSpotImportableRating * self;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_rating_parent_class)->finalize (obj);
-#line 2789 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_importable_rating_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_importable_rating_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_importable_rating_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotImportableRatingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_importable_rating_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotImportableRating), 0, (GInstanceInitFunc) data_imports_fspot_fspot_importable_rating_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_importable_rating_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_importable_rating_type_id;
-		data_imports_fspot_fspot_importable_rating_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotImportableRating", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_importable_rating_type_id, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_RATING, &spit_data_imports_importable_rating_info);
-		g_once_init_leave (&data_imports_fspot_fspot_importable_rating_type_id__volatile, data_imports_fspot_fspot_importable_rating_type_id);
-	}
-	return data_imports_fspot_fspot_importable_rating_type_id__volatile;
-}
-
-
-static gpointer _importable_database_table_ref0 (gpointer self) {
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self ? importable_database_table_ref (self) : NULL;
-#line 2810 "FSpotImporter.c"
-}
-
-
-static gint64* _int64_dup (gint64* self) {
-	gint64* dup;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	dup = g_new0 (gint64, 1);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	memcpy (dup, self, sizeof (gint64));
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return dup;
-#line 2822 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (GType object_type, DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
-	DataImportsFSpotFSpotTagsCache * self = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp0_;
-	DataImportsFSpotDbFSpotTagsTable* _tmp1_;
-	GeeHashMap* _tmp2_;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (tags_table), NULL);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotTagsCache*) g_object_new (object_type, NULL);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = tags_table;
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _importable_database_table_ref0 (_tmp0_);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_importable_database_table_unref0 (self->priv->tags_table);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags_table = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = gee_hash_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->tags_map);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->tags_map = _tmp2_;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 2851 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_new (DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_tags_cache_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, tags_table, error);
-#line 2858 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error) {
-	DataImportsFSpotFSpotImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp0_;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_;
-	gint64 _tmp2_;
-	gpointer _tmp3_;
-	DataImportsFSpotFSpotImportableTag* _tmp4_;
-	GError * _inner_error_ = NULL;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (tag_row), NULL);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->tags_map;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = tag_row;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = _tmp1_->tag_id;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp2_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	tag = (DataImportsFSpotFSpotImportableTag*) _tmp3_;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = tag;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp4_ != NULL) {
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result = tag;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return result;
-#line 2893 "FSpotImporter.c"
-	} else {
-		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp5_;
-		gint64 _tmp6_;
-		DataImportsFSpotFSpotImportableTag* _tmp7_;
-		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp8_;
-		DataImportsFSpotFSpotImportableTag* _tmp9_;
-		DataImportsFSpotFSpotImportableTag* _tmp10_;
-		GeeHashMap* _tmp11_;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_;
-		gint64 _tmp13_;
-		DataImportsFSpotFSpotImportableTag* _tmp14_;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = tag_row;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = _tmp5_->category_id;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp7_ = data_imports_fspot_fspot_tags_cache_get_tag_from_id (self, _tmp6_, &_inner_error_);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		parent_tag = _tmp7_;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_propagate_error (error, _inner_error_);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return NULL;
-#line 2925 "FSpotImporter.c"
-			} else {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_clear_error (&_inner_error_);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return NULL;
-#line 2935 "FSpotImporter.c"
-			}
-		}
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp8_ = tag_row;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp9_ = parent_tag;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp10_ = data_imports_fspot_fspot_importable_tag_new (_tmp8_, _tmp9_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		new_tag = _tmp10_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp11_ = self->priv->tags_map;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp12_ = tag_row;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp13_ = _tmp12_->tag_id;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp14_ = new_tag;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp13_, _tmp14_);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result = new_tag;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (parent_tag);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tag);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return result;
-#line 2964 "FSpotImporter.c"
-	}
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (tag);
-#line 2968 "FSpotImporter.c"
-}
-
-
-static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error) {
-	DataImportsFSpotFSpotImportableTag* result = NULL;
-	gint64 _tmp0_;
-	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp1_;
-	gint64 _tmp2_;
-	gpointer _tmp3_;
-	DataImportsFSpotFSpotImportableTag* _tmp4_;
-	DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp5_;
-	gint64 _tmp6_;
-	DataImportsFSpotDbFSpotTagRow* _tmp7_;
-	DataImportsFSpotDbFSpotTagRow* _tmp8_;
-	GError * _inner_error_ = NULL;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = tag_id;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp0_ < ((gint64) 1)) {
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result = NULL;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return result;
-#line 2996 "FSpotImporter.c"
-	}
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = self->priv->tags_map;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = tag_id;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp2_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	tag = (DataImportsFSpotFSpotImportableTag*) _tmp3_;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = tag;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp4_ != NULL) {
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result = tag;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return result;
-#line 3014 "FSpotImporter.c"
-	}
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = self->priv->tags_table;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = tag_id;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = data_imports_fspot_db_fspot_tags_table_get_by_id (_tmp5_, _tmp6_, &_inner_error_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	tag_row = _tmp7_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_propagate_error (error, _inner_error_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (tag);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			return NULL;
-#line 3034 "FSpotImporter.c"
-		} else {
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (tag);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_clear_error (&_inner_error_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			return NULL;
-#line 3044 "FSpotImporter.c"
-		}
-	}
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = tag_row;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp8_ != NULL) {
-#line 3051 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp9_;
-		gint64 _tmp10_;
-		DataImportsFSpotFSpotImportableTag* _tmp11_;
-		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_;
-		DataImportsFSpotFSpotImportableTag* _tmp13_;
-		DataImportsFSpotFSpotImportableTag* _tmp14_;
-		GeeHashMap* _tmp15_;
-		gint64 _tmp16_;
-		DataImportsFSpotFSpotImportableTag* _tmp17_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp9_ = tag_row;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp10_ = _tmp9_->category_id;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp11_ = data_imports_fspot_fspot_tags_cache_get_tag_from_id (self, _tmp10_, &_inner_error_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		parent_tag = _tmp11_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_propagate_error (error, _inner_error_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag_row);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return NULL;
-#line 3083 "FSpotImporter.c"
-			} else {
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag_row);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tag);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_clear_error (&_inner_error_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return NULL;
-#line 3095 "FSpotImporter.c"
-			}
-		}
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp12_ = tag_row;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp13_ = parent_tag;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp14_ = data_imports_fspot_fspot_importable_tag_new (_tmp12_, _tmp13_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		new_tag = _tmp14_;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp15_ = self->priv->tags_map;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp16_ = tag_id;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp17_ = new_tag;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), &_tmp16_, _tmp17_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		result = new_tag;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (parent_tag);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tag_row);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tag);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return result;
-#line 3124 "FSpotImporter.c"
-	}
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = NULL;
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (tag_row);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (tag);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 3134 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_tags_cache_class_init (DataImportsFSpotFSpotTagsCacheClass * klass) {
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_tags_cache_parent_class = g_type_class_peek_parent (klass);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotTagsCachePrivate));
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_tags_cache_finalize;
-#line 3145 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_tags_cache_instance_init (DataImportsFSpotFSpotTagsCache * self) {
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_PRIVATE (self);
-#line 3152 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj) {
-	DataImportsFSpotFSpotTagsCache * self;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCache);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_importable_database_table_unref0 (self->priv->tags_table);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (self->priv->tags_map);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_tags_cache_parent_class)->finalize (obj);
-#line 3166 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_tags_cache_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_tags_cache_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_tags_cache_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotTagsCacheClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_tags_cache_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotTagsCache), 0, (GInstanceInitFunc) data_imports_fspot_fspot_tags_cache_instance_init, NULL };
-		GType data_imports_fspot_fspot_tags_cache_type_id;
-		data_imports_fspot_fspot_tags_cache_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotTagsCache", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_fspot_tags_cache_type_id__volatile, data_imports_fspot_fspot_tags_cache_type_id);
-	}
-	return data_imports_fspot_fspot_tags_cache_type_id__volatile;
-}
-
-
-DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
-	DataImportsFSpotFSpotDataImporter * self = NULL;
-	SpitDataImportsService* _tmp0_;
-	SpitDataImportsPluginHost* _tmp1_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_PLUGIN_HOST (host), NULL);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = (DataImportsFSpotFSpotDataImporter*) g_object_new (object_type, NULL);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_debug ("FSpotImporter.vala:330: FSpotDataImporter instantiated.");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = service;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->service = _tmp0_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = host;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->host = _tmp1_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return self;
-#line 3204 "FSpotImporter.c"
-}
-
-
-DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return data_imports_fspot_fspot_data_importer_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, service, host);
-#line 3211 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitDataImportsDataImporter* base) {
-	DataImportsFSpotFSpotDataImporter * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->running;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp0_;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 3227 "FSpotImporter.c"
-}
-
-
-static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_service (SpitDataImportsDataImporter* base) {
-	DataImportsFSpotFSpotDataImporter * self;
-	SpitDataImportsService* result = NULL;
-	SpitDataImportsService* _tmp0_;
-	SpitDataImportsService* _tmp1_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->service;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp1_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 3246 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base) {
-	DataImportsFSpotFSpotDataImporter * self;
-	gboolean _tmp0_;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = spit_data_imports_data_importer_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter));
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp0_) {
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3261 "FSpotImporter.c"
-	}
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_debug ("FSpotImporter.vala:347: FSpotDataImporter: starting interaction.");
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->running = TRUE;
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (self);
-#line 3269 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDataImporter* base) {
-	DataImportsFSpotFSpotDataImporter * self;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_debug ("FSpotImporter.vala:355: FSpotDataImporter: stopping interaction.");
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->running = FALSE;
-#line 3281 "FSpotImporter.c"
-}
-
-
-/**
-     * Action that discovers importable libraries based on standard locations.
-     */
-static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value) {
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (SpitDataImportsImportableLibrary*, *array, (*size) + 1);
-#line 3295 "FSpotImporter.c"
-	}
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 3301 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self) {
-	SpitDataImportsImportableLibrary** discovered_libraries = NULL;
-	SpitDataImportsImportableLibrary** _tmp0_;
-	gint discovered_libraries_length1;
-	gint _discovered_libraries_size_;
-	GFile** db_files = NULL;
-	const gchar* _tmp1_;
-	GFile* _tmp2_;
-	GFile* _tmp3_;
-	GFile* _tmp4_;
-	GFile* _tmp5_;
-	GFile* _tmp6_;
-	const gchar* _tmp7_;
-	GFile* _tmp8_;
-	GFile* _tmp9_;
-	GFile* _tmp10_;
-	GFile* _tmp11_;
-	GFile* _tmp12_;
-	GFile* _tmp13_;
-	GFile* _tmp14_;
-	const gchar* _tmp15_;
-	GFile* _tmp16_;
-	GFile* _tmp17_;
-	GFile* _tmp18_;
-	GFile* _tmp19_;
-	GFile* _tmp20_;
-	GFile** _tmp21_;
-	GFile** _tmp22_;
-	gint _tmp22__length1;
-	gint db_files_length1;
-	gint _db_files_size_;
-	GFile** _tmp23_;
-	gint _tmp23__length1;
-	const gchar* _tmp33_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp34_;
-	gint _tmp34__length1;
-	SpitDataImportsPluginHost* _tmp35_;
-	SpitDataImportsImportableLibrary** _tmp36_;
-	gint _tmp36__length1;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = g_new0 (SpitDataImportsImportableLibrary*, 0 + 1);
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	discovered_libraries = _tmp0_;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	discovered_libraries_length1 = 0;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_discovered_libraries_size_ = discovered_libraries_length1;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = g_get_user_config_dir ();
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _tmp2_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_file_get_child (_tmp3_, "f-spot");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = _tmp4_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = g_file_get_child (_tmp5_, "photos.db");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = g_get_home_dir ();
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = g_file_new_for_path (_tmp7_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9_ = _tmp8_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp10_ = g_file_get_child (_tmp9_, ".gnome2");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp11_ = _tmp10_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp12_ = g_file_get_child (_tmp11_, "f-spot");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp13_ = _tmp12_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp14_ = g_file_get_child (_tmp13_, "photos.db");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp15_ = g_get_user_data_dir ();
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp16_ = g_file_new_for_path (_tmp15_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp17_ = _tmp16_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp18_ = g_file_get_child (_tmp17_, "f-spot");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp19_ = _tmp18_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp20_ = g_file_get_child (_tmp19_, "photos.db");
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp21_ = g_new0 (GFile*, 3 + 1);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp21_[0] = _tmp6_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp21_[1] = _tmp14_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp21_[2] = _tmp20_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp22_ = _tmp21_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp22__length1 = 3;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp19_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp17_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp13_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp11_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp9_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp5_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp3_);
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	db_files = _tmp22_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	db_files_length1 = _tmp22__length1;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_db_files_size_ = db_files_length1;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp23_ = db_files;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp23__length1 = db_files_length1;
-#line 3430 "FSpotImporter.c"
-	{
-		GFile** db_file_collection = NULL;
-		gint db_file_collection_length1 = 0;
-		gint _db_file_collection_size_ = 0;
-		gint db_file_it = 0;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		db_file_collection = _tmp23_;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		db_file_collection_length1 = _tmp23__length1;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		for (db_file_it = 0; db_file_it < _tmp23__length1; db_file_it = db_file_it + 1) {
-#line 3442 "FSpotImporter.c"
-			GFile* _tmp24_;
-			GFile* db_file = NULL;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp24_ = _g_object_ref0 (db_file_collection[db_file_it]);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			db_file = _tmp24_;
-#line 3449 "FSpotImporter.c"
-			{
-				GFile* _tmp25_;
-				gboolean _tmp26_;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp25_ = db_file;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp26_ = g_file_query_exists (_tmp25_, NULL);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp26_) {
-#line 3459 "FSpotImporter.c"
-					SpitDataImportsImportableLibrary** _tmp27_;
-					gint _tmp27__length1;
-					GFile* _tmp28_;
-					DataImportsFSpotFSpotImportableLibrary* _tmp29_;
-					GFile* _tmp30_;
-					gchar* _tmp31_;
-					gchar* _tmp32_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp27_ = discovered_libraries;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp27__length1 = discovered_libraries_length1;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp28_ = db_file;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp29_ = data_imports_fspot_fspot_importable_library_new (_tmp28_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_vala_array_add2 (&discovered_libraries, &discovered_libraries_length1, &_discovered_libraries_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_LIBRARY, SpitDataImportsImportableLibrary));
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp30_ = db_file;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp31_ = g_file_get_path (_tmp30_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp32_ = _tmp31_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_message ("FSpotImporter.vala:384: Discovered importable library: %s", _tmp32_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_free0 (_tmp32_);
-#line 3487 "FSpotImporter.c"
-				}
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (db_file);
-#line 3491 "FSpotImporter.c"
-			}
-		}
-	}
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp34_ = discovered_libraries;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp34__length1 = discovered_libraries_length1;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp34__length1 > 0) {
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE;
-#line 3503 "FSpotImporter.c"
-	} else {
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE_FILE_ONLY;
-#line 3507 "FSpotImporter.c"
-	}
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp35_ = self->priv->host;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp36_ = discovered_libraries;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp36__length1 = discovered_libraries_length1;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_install_library_selection_pane (_tmp35_, _tmp33_, _tmp36_, _tmp36__length1, DATA_IMPORTS_FSPOT_FILE_IMPORT_LABEL);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	db_files = (_vala_array_free (db_files, db_files_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	discovered_libraries = (_vala_array_free (discovered_libraries, discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3521 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library) {
-	DataImportsFSpotFSpotDataImporter * self;
-	SpitDataImportsImportableLibrary* _tmp0_;
-	GFile* _tmp1_;
-	GFile* _tmp2_;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_if_fail (SPIT_DATA_IMPORTS_IS_IMPORTABLE_LIBRARY (library));
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = library;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = data_imports_fspot_fspot_importable_library_get_db_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary));
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = _tmp1_;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_data_importer_on_file_selected (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter), _tmp2_);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (_tmp2_);
-#line 3544 "FSpotImporter.c"
-}
-
-
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) {
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (DataImportsFSpotFSpotImportableTag*, *array, (*size) + 1);
-#line 3555 "FSpotImporter.c"
-	}
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 3561 "FSpotImporter.c"
-}
-
-
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3572 "FSpotImporter.c"
-	}
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 3578 "FSpotImporter.c"
-}
-
-
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3589 "FSpotImporter.c"
-	}
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 3595 "FSpotImporter.c"
-}
-
-
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if ((*length) == (*size)) {
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3606 "FSpotImporter.c"
-	}
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[(*length)++] = value;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*array)[*length] = NULL;
-#line 3612 "FSpotImporter.c"
-}
-
-
-static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self) {
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_data_importer_on_imported_items_count ((DataImportsFSpotFSpotDataImporter*) self, imported_items_count);
-#line 3619 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDataImportsDataImporter* base, GFile* file) {
-	DataImportsFSpotFSpotDataImporter * self;
-	DataImportsFSpotDbFSpotDatabase* database = NULL;
-	DataImportsFSpotFSpotTagsCache* tags_cache = NULL;
-	GeeArrayList* all_photos = NULL;
-	gdouble progress_delta_per_photo = 0.0;
-	gdouble progress_plugin_to_host_ratio = 0.0;
-	gdouble current_progress = 0.0;
-	SpitDataImportsPluginHost* _tmp24_;
-	GeeArrayList* _tmp35_;
-	gint _tmp36_;
-	gint _tmp37_;
-	SpitDataImportsPluginHost* _tmp172_;
-	GError * _inner_error_ = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_if_fail (G_IS_FILE (file));
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	progress_delta_per_photo = 1.0;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	progress_plugin_to_host_ratio = 0.5;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	current_progress = 0.0;
-#line 3647 "FSpotImporter.c"
-	{
-		DataImportsFSpotDbFSpotDatabase* _tmp0_ = NULL;
-		GFile* _tmp1_;
-		DataImportsFSpotDbFSpotDatabase* _tmp2_;
-		DataImportsFSpotDbFSpotDatabase* _tmp3_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp1_ = file;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp2_ = data_imports_fspot_db_fspot_database_new (_tmp1_, &_inner_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = _tmp2_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3663 "FSpotImporter.c"
-				goto __catch0_database_error;
-			}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) {
-#line 3668 "FSpotImporter.c"
-				goto __catch0_spit_data_imports_data_import_error;
-			}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (all_photos);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (tags_cache);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (database);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_critical ("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 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_clear_error (&_inner_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			return;
-#line 3683 "FSpotImporter.c"
-		}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp3_ = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp0_ = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		database = _tmp3_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp0_);
-#line 3695 "FSpotImporter.c"
-	}
-	goto __finally0;
-	__catch0_database_error:
-	{
-		GError* e = NULL;
-		GError* _tmp4_;
-		const gchar* _tmp5_;
-		gchar* _tmp6_;
-		gchar* _tmp7_;
-		SpitDataImportsPluginHost* _tmp8_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		e = _inner_error_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_inner_error_ = NULL;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp4_ = e;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = _tmp4_->message;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = g_strdup_printf ("FSpotDataImporter: Can't open database file: %s", _tmp5_);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp7_ = _tmp6_;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:409: %s", _tmp7_);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp7_);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp8_ = self->priv->host;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp8_, DATA_IMPORTS_FSPOT_ERROR_CANT_OPEN_DB_FILE);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_error_free0 (e);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3736 "FSpotImporter.c"
-	}
-	goto __finally0;
-	__catch0_spit_data_imports_data_import_error:
-	{
-		GError* e = NULL;
-		GError* _tmp9_;
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-		gchar* _tmp12_;
-		SpitDataImportsPluginHost* _tmp13_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		e = _inner_error_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_inner_error_ = NULL;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp9_ = e;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp10_ = _tmp9_->message;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp11_ = g_strdup_printf ("FSpotDataImporter: Unsupported F-Spot database version: %s", _tmp10_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp12_ = _tmp11_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:413: %s", _tmp12_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp12_);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp13_ = self->priv->host;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp13_, DATA_IMPORTS_FSPOT_ERROR_UNSUPPORTED_DB_VERSION);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_error_free0 (e);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3777 "FSpotImporter.c"
-	}
-	__finally0:
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_clear_error (&_inner_error_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3794 "FSpotImporter.c"
-	}
-	{
-		DataImportsFSpotFSpotTagsCache* _tmp14_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp15_;
-		DataImportsFSpotDbFSpotTagsTable* _tmp16_;
-		DataImportsFSpotFSpotTagsCache* _tmp17_;
-		DataImportsFSpotFSpotTagsCache* _tmp18_;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp15_ = database;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp16_ = _tmp15_->tags_table;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp17_ = data_imports_fspot_fspot_tags_cache_new (_tmp16_, &_inner_error_);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp14_ = _tmp17_;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3814 "FSpotImporter.c"
-				goto __catch1_database_error;
-			}
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (all_photos);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (tags_cache);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (database);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_critical ("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 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_clear_error (&_inner_error_);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			return;
-#line 3829 "FSpotImporter.c"
-		}
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp18_ = _tmp14_;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp14_ = NULL;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		tags_cache = _tmp18_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp14_);
-#line 3841 "FSpotImporter.c"
-	}
-	goto __finally1;
-	__catch1_database_error:
-	{
-		GError* e = NULL;
-		GError* _tmp19_;
-		const gchar* _tmp20_;
-		gchar* _tmp21_;
-		gchar* _tmp22_;
-		SpitDataImportsPluginHost* _tmp23_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		e = _inner_error_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_inner_error_ = NULL;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp19_ = e;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp20_ = _tmp19_->message;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp21_ = g_strdup_printf ("FSpotDataImporter: Can't read tags table: %s", _tmp20_);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp22_ = _tmp21_;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:420: %s", _tmp22_);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp22_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp23_ = self->priv->host;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp23_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_TAGS_TABLE);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_error_free0 (e);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3882 "FSpotImporter.c"
-	}
-	__finally1:
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_clear_error (&_inner_error_);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3899 "FSpotImporter.c"
-	}
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp24_ = self->priv->host;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _ ("Preparing to import"));
-#line 3905 "FSpotImporter.c"
-	{
-		GeeArrayList* _tmp25_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp26_;
-		DataImportsFSpotDbFSpotPhotosTable* _tmp27_;
-		GeeArrayList* _tmp28_;
-		GeeArrayList* _tmp29_;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = database;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp27_ = _tmp26_->photos_table;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp28_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp27_, &_inner_error_);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp25_ = _tmp28_;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3924 "FSpotImporter.c"
-				goto __catch2_database_error;
-			}
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (all_photos);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (tags_cache);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (database);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_critical ("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 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			g_clear_error (&_inner_error_);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			return;
-#line 3939 "FSpotImporter.c"
-		}
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp29_ = _tmp25_;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp25_ = NULL;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		all_photos = _tmp29_;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp25_);
-#line 3951 "FSpotImporter.c"
-	}
-	goto __finally2;
-	__catch2_database_error:
-	{
-		GError* e = NULL;
-		GError* _tmp30_;
-		const gchar* _tmp31_;
-		gchar* _tmp32_;
-		gchar* _tmp33_;
-		SpitDataImportsPluginHost* _tmp34_;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		e = _inner_error_;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_inner_error_ = NULL;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp30_ = e;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp31_ = _tmp30_->message;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp32_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp31_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp33_ = _tmp32_;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:428: %s", _tmp33_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp33_);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp34_ = self->priv->host;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp34_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_error_free0 (e);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 3992 "FSpotImporter.c"
-	}
-	__finally2:
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (all_photos);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (tags_cache);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (database);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_clear_error (&_inner_error_);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		return;
-#line 4009 "FSpotImporter.c"
-	}
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp35_ = all_photos;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp37_ = _tmp36_;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp37_ > 0) {
-#line 4019 "FSpotImporter.c"
-		GeeArrayList* _tmp38_;
-		gint _tmp39_;
-		gint _tmp40_;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp38_ = all_photos;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp40_ = _tmp39_;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		progress_delta_per_photo = 1.0 / _tmp40_;
-#line 4031 "FSpotImporter.c"
-	}
-	{
-		GeeArrayList* _photo_row_list = NULL;
-		GeeArrayList* _tmp41_;
-		GeeArrayList* _tmp42_;
-		gint _photo_row_size = 0;
-		GeeArrayList* _tmp43_;
-		gint _tmp44_;
-		gint _tmp45_;
-		gint _photo_row_index = 0;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp41_ = all_photos;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp42_ = _g_object_ref0 (_tmp41_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_list = _tmp42_;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp43_ = _photo_row_list;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp44_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp45_ = _tmp44_;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_size = _tmp45_;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_index = -1;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		while (TRUE) {
-#line 4060 "FSpotImporter.c"
-			gint _tmp46_;
-			gint _tmp47_;
-			gint _tmp48_;
-			DataImportsFSpotDbFSpotPhotoRow* photo_row = NULL;
-			GeeArrayList* _tmp49_;
-			gint _tmp50_;
-			gpointer _tmp51_;
-			gboolean hidden = FALSE;
-			gboolean favorite = FALSE;
-			DataImportsFSpotFSpotImportableTag** tags = NULL;
-			DataImportsFSpotFSpotImportableTag** _tmp52_;
-			gint tags_length1;
-			gint _tags_size_;
-			DataImportsFSpotFSpotImportableEvent* event = NULL;
-			DataImportsFSpotDbFSpotRollRow* roll_row = NULL;
-			SpitDataImportsImportableMediaItem** importable_items = NULL;
-			SpitDataImportsImportableMediaItem** _tmp96_;
-			gint importable_items_length1;
-			gint _importable_items_size_;
-			gboolean _tmp160_;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp46_ = _photo_row_index;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_photo_row_index = _tmp46_ + 1;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp47_ = _photo_row_index;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp48_ = _photo_row_size;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (!(_tmp47_ < _tmp48_)) {
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				break;
-#line 4093 "FSpotImporter.c"
-			}
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp49_ = _photo_row_list;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp50_ = _photo_row_index;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp51_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp50_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp51_;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			hidden = FALSE;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			favorite = FALSE;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp52_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tags = _tmp52_;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tags_length1 = 0;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tags_size_ = tags_length1;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			event = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			roll_row = NULL;
-#line 4119 "FSpotImporter.c"
-			{
-				GeeArrayList* _tmp53_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp54_;
-				DataImportsFSpotDbFSpotTagsTable* _tmp55_;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp56_;
-				gint64 _tmp57_;
-				GeeArrayList* _tmp58_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp54_ = database;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp55_ = _tmp54_->tags_table;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp56_ = photo_row;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp57_ = _tmp56_->photo_id;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp58_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp55_, _tmp57_, &_inner_error_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp53_ = _tmp58_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4143 "FSpotImporter.c"
-						goto __catch3_database_error;
-					}
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (roll_row);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (event);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (photo_row);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (_photo_row_list);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (all_photos);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (tags_cache);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (database);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_critical ("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 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_clear_error (&_inner_error_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					return;
-#line 4168 "FSpotImporter.c"
-				}
-				{
-					GeeArrayList* _tag_row_list = NULL;
-					GeeArrayList* _tmp59_;
-					gint _tag_row_size = 0;
-					GeeArrayList* _tmp60_;
-					gint _tmp61_;
-					gint _tmp62_;
-					gint _tag_row_index = 0;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp59_ = _g_object_ref0 (_tmp53_);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_list = _tmp59_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp60_ = _tag_row_list;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp61_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp62_ = _tmp61_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_size = _tmp62_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_index = -1;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					while (TRUE) {
-#line 4194 "FSpotImporter.c"
-						gint _tmp63_;
-						gint _tmp64_;
-						gint _tmp65_;
-						DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-						GeeArrayList* _tmp66_;
-						gint _tmp67_;
-						gpointer _tmp68_;
-						DataImportsFSpotFSpotImportableTag* tag = NULL;
-						DataImportsFSpotFSpotTagsCache* _tmp69_;
-						DataImportsFSpotDbFSpotTagRow* _tmp70_;
-						DataImportsFSpotFSpotImportableTag* _tmp71_;
-						DataImportsFSpotFSpotImportableTag* _tmp72_;
-						DataImportsFSpotDbFSpotDatabase* _tmp73_;
-						gint64 _tmp74_;
-						gboolean _tmp75_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp63_ = _tag_row_index;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tag_row_index = _tmp63_ + 1;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp64_ = _tag_row_index;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp65_ = _tag_row_size;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp64_ < _tmp65_)) {
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							break;
-#line 4222 "FSpotImporter.c"
-						}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp66_ = _tag_row_list;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp67_ = _tag_row_index;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp68_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp67_);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp68_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp69_ = tags_cache;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp70_ = tag_row;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp71_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp69_, _tmp70_, &_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag = _tmp71_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (tag_row);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tag_row_list);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp53_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4250 "FSpotImporter.c"
-								goto __catch3_database_error;
-							}
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (tag_row);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tag_row_list);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp53_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (roll_row);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (event);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (photo_row);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_photo_row_list);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (all_photos);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (tags_cache);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (database);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							g_critical ("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 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							g_clear_error (&_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							return;
-#line 4281 "FSpotImporter.c"
-						}
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp72_ = tag;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp73_ = database;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp74_ = _tmp73_->hidden_tag_id;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp75_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp72_, _tmp74_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp75_) {
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							hidden = TRUE;
-#line 4295 "FSpotImporter.c"
-						} else {
-							DataImportsFSpotFSpotImportableTag* _tmp76_;
-							gboolean _tmp77_;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp76_ = tag;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp77_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp76_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							if (_tmp77_) {
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								favorite = TRUE;
-#line 4307 "FSpotImporter.c"
-							} else {
-								DataImportsFSpotFSpotImportableTag** _tmp78_;
-								gint _tmp78__length1;
-								DataImportsFSpotFSpotImportableTag* _tmp79_;
-								DataImportsFSpotFSpotImportableTag* _tmp80_;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp78_ = tags;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp78__length1 = tags_length1;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp79_ = tag;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp80_ = _g_object_ref0 (_tmp79_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp80_);
-#line 4323 "FSpotImporter.c"
-							}
-						}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_g_object_unref0 (tag);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_g_object_unref0 (tag_row);
-#line 4330 "FSpotImporter.c"
-					}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (_tag_row_list);
-#line 4334 "FSpotImporter.c"
-				}
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp53_);
-#line 4338 "FSpotImporter.c"
-			}
-			goto __finally3;
-			__catch3_database_error:
-			{
-				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp81_;
-				gint64 _tmp82_;
-				GError* _tmp83_;
-				const gchar* _tmp84_;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				e = _inner_error_;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_inner_error_ = NULL;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp81_ = photo_row;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp82_ = _tmp81_->photo_id;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp83_ = e;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp84_ = _tmp83_->message;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp82_, _tmp84_);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_error_free0 (e);
-#line 4364 "FSpotImporter.c"
-			}
-			__finally3:
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (roll_row);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (event);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (photo_row);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_photo_row_list);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (all_photos);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tags_cache);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (database);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_clear_error (&_inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return;
-#line 4391 "FSpotImporter.c"
-			}
-			{
-				DataImportsFSpotDbFSpotRollRow* _tmp85_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp86_;
-				DataImportsFSpotDbFSpotRollsTable* _tmp87_;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp88_;
-				gint64 _tmp89_;
-				DataImportsFSpotDbFSpotRollRow* _tmp90_;
-				DataImportsFSpotDbFSpotRollRow* _tmp91_;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp86_ = database;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp87_ = _tmp86_->rolls_table;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp88_ = photo_row;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp89_ = _tmp88_->roll_id;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp90_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp87_, _tmp89_, &_inner_error_);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp85_ = _tmp90_;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4417 "FSpotImporter.c"
-						goto __catch4_database_error;
-					}
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (roll_row);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (event);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (photo_row);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (_photo_row_list);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (all_photos);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (tags_cache);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (database);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_critical ("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 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_clear_error (&_inner_error_);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					return;
-#line 4442 "FSpotImporter.c"
-				}
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp91_ = _tmp85_;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp85_ = NULL;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (roll_row);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				roll_row = _tmp91_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp85_);
-#line 4454 "FSpotImporter.c"
-			}
-			goto __finally4;
-			__catch4_database_error:
-			{
-				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp92_;
-				gint64 _tmp93_;
-				GError* _tmp94_;
-				const gchar* _tmp95_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				e = _inner_error_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_inner_error_ = NULL;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp92_ = photo_row;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp93_ = _tmp92_->photo_id;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp94_ = e;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp95_ = _tmp94_->message;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp93_, _tmp95_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_error_free0 (e);
-#line 4480 "FSpotImporter.c"
-			}
-			__finally4:
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (roll_row);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (event);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (photo_row);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_photo_row_list);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (all_photos);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tags_cache);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (database);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_clear_error (&_inner_error_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return;
-#line 4507 "FSpotImporter.c"
-			}
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp96_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			importable_items = _tmp96_;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			importable_items_length1 = 0;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_importable_items_size_ = importable_items_length1;
-#line 4517 "FSpotImporter.c"
-			{
-				GeeArrayList* photo_versions = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp97_;
-				DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp98_;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp99_;
-				gint64 _tmp100_;
-				GeeArrayList* _tmp101_;
-				gboolean photo_versions_added = FALSE;
-				gboolean photo_versions_skipped = FALSE;
-				gboolean _tmp127_ = FALSE;
-				gboolean _tmp128_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp97_ = database;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp98_ = _tmp97_->photo_versions_table;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp99_ = photo_row;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp100_ = _tmp99_->photo_id;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp101_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp98_, _tmp100_, &_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				photo_versions = _tmp101_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4545 "FSpotImporter.c"
-						goto __catch5_database_error;
-					}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (roll_row);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (event);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (photo_row);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (_photo_row_list);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (all_photos);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (tags_cache);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (database);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_critical ("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 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					g_clear_error (&_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					return;
-#line 4572 "FSpotImporter.c"
-				}
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				photo_versions_added = FALSE;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				photo_versions_skipped = FALSE;
-#line 4578 "FSpotImporter.c"
-				{
-					GeeArrayList* _photo_version_row_list = NULL;
-					GeeArrayList* _tmp102_;
-					GeeArrayList* _tmp103_;
-					gint _photo_version_row_size = 0;
-					GeeArrayList* _tmp104_;
-					gint _tmp105_;
-					gint _tmp106_;
-					gint _photo_version_row_index = 0;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp102_ = photo_versions;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp103_ = _g_object_ref0 (_tmp102_);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_list = _tmp103_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp104_ = _photo_version_row_list;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp106_ = _tmp105_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_size = _tmp106_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_index = -1;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					while (TRUE) {
-#line 4606 "FSpotImporter.c"
-						gint _tmp107_;
-						gint _tmp108_;
-						gint _tmp109_;
-						DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row = NULL;
-						GeeArrayList* _tmp110_;
-						gint _tmp111_;
-						gpointer _tmp112_;
-						gboolean _tmp113_ = FALSE;
-						DataImportsFSpotDbFSpotPhotoVersionRow* _tmp114_;
-						GFile* _tmp115_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp107_ = _photo_version_row_index;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_photo_version_row_index = _tmp107_ + 1;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp108_ = _photo_version_row_index;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp109_ = _photo_version_row_size;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp108_ < _tmp109_)) {
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							break;
-#line 4629 "FSpotImporter.c"
-						}
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp110_ = _photo_version_row_list;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp111_ = _photo_version_row_index;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp112_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp111_);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp112_;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp114_ = photo_version_row;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp115_ = _tmp114_->base_path;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp115_ != NULL) {
-#line 4645 "FSpotImporter.c"
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp116_;
-							const gchar* _tmp117_;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp116_ = photo_version_row;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp117_ = _tmp116_->filename;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp113_ = _tmp117_ != NULL;
-#line 4654 "FSpotImporter.c"
-						} else {
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp113_ = FALSE;
-#line 4658 "FSpotImporter.c"
-						}
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp113_) {
-#line 4662 "FSpotImporter.c"
-							SpitDataImportsImportableMediaItem** _tmp118_;
-							gint _tmp118__length1;
-							DataImportsFSpotDbFSpotPhotoRow* _tmp119_;
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp120_;
-							DataImportsFSpotDbFSpotRollRow* _tmp121_;
-							DataImportsFSpotFSpotImportableTag** _tmp122_;
-							gint _tmp122__length1;
-							DataImportsFSpotFSpotImportableEvent* _tmp123_;
-							gboolean _tmp124_;
-							gboolean _tmp125_;
-							DataImportsFSpotFSpotImportableItem* _tmp126_;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp118_ = importable_items;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp118__length1 = importable_items_length1;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp119_ = photo_row;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp120_ = photo_version_row;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp121_ = roll_row;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp122_ = tags;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp122__length1 = tags_length1;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp123_ = event;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp124_ = hidden;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp125_ = favorite;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp126_ = data_imports_fspot_fspot_importable_item_new (_tmp119_, _tmp120_, _tmp121_, _tmp122_, _tmp122__length1, _tmp123_, _tmp124_, _tmp125_);
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							photo_versions_added = TRUE;
-#line 4700 "FSpotImporter.c"
-						} else {
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							photo_versions_skipped = TRUE;
-#line 4704 "FSpotImporter.c"
-						}
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_g_object_unref0 (photo_version_row);
-#line 4708 "FSpotImporter.c"
-					}
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_g_object_unref0 (_photo_version_row_list);
-#line 4712 "FSpotImporter.c"
-				}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp128_ = photo_versions_skipped;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp128_) {
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp127_ = TRUE;
-#line 4720 "FSpotImporter.c"
-				} else {
-					gboolean _tmp129_;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp129_ = photo_versions_added;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp127_ = !_tmp129_;
-#line 4727 "FSpotImporter.c"
-				}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp127_) {
-#line 4731 "FSpotImporter.c"
-					gboolean _tmp130_ = FALSE;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp131_;
-					GFile* _tmp132_;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp131_ = photo_row;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp132_ = _tmp131_->base_path;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp132_ != NULL) {
-#line 4741 "FSpotImporter.c"
-						DataImportsFSpotDbFSpotPhotoRow* _tmp133_;
-						const gchar* _tmp134_;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp133_ = photo_row;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp134_ = _tmp133_->filename;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp130_ = _tmp134_ != NULL;
-#line 4750 "FSpotImporter.c"
-					} else {
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp130_ = FALSE;
-#line 4754 "FSpotImporter.c"
-					}
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp130_) {
-#line 4758 "FSpotImporter.c"
-						SpitDataImportsImportableMediaItem** _tmp135_;
-						gint _tmp135__length1;
-						DataImportsFSpotDbFSpotPhotoRow* _tmp136_;
-						DataImportsFSpotDbFSpotRollRow* _tmp137_;
-						DataImportsFSpotFSpotImportableTag** _tmp138_;
-						gint _tmp138__length1;
-						DataImportsFSpotFSpotImportableEvent* _tmp139_;
-						gboolean _tmp140_;
-						gboolean _tmp141_;
-						DataImportsFSpotFSpotImportableItem* _tmp142_;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp135_ = importable_items;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp135__length1 = importable_items_length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp136_ = photo_row;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp137_ = roll_row;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp138_ = tags;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp138__length1 = tags_length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp139_ = event;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp140_ = hidden;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp141_ = favorite;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp142_ = data_imports_fspot_fspot_importable_item_new (_tmp136_, NULL, _tmp137_, _tmp138_, _tmp138__length1, _tmp139_, _tmp140_, _tmp141_);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4791 "FSpotImporter.c"
-					}
-				}
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (photo_versions);
-#line 4796 "FSpotImporter.c"
-			}
-			goto __finally5;
-			__catch5_database_error:
-			{
-				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp143_;
-				gint64 _tmp144_;
-				GError* _tmp145_;
-				const gchar* _tmp146_;
-				gboolean _tmp147_ = FALSE;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp148_;
-				GFile* _tmp149_;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				e = _inner_error_;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_inner_error_ = NULL;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp143_ = photo_row;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp144_ = _tmp143_->photo_id;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp145_ = e;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp146_ = _tmp145_->message;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:504: Failed to retrieve versions for photo ID %ld: " \
-"%s", (glong) _tmp144_, _tmp146_);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp148_ = photo_row;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp149_ = _tmp148_->base_path;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp149_ != NULL) {
-#line 4829 "FSpotImporter.c"
-					DataImportsFSpotDbFSpotPhotoRow* _tmp150_;
-					const gchar* _tmp151_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp150_ = photo_row;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp151_ = _tmp150_->filename;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp147_ = _tmp151_ != NULL;
-#line 4838 "FSpotImporter.c"
-				} else {
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp147_ = FALSE;
-#line 4842 "FSpotImporter.c"
-				}
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp147_) {
-#line 4846 "FSpotImporter.c"
-					SpitDataImportsImportableMediaItem** _tmp152_;
-					gint _tmp152__length1;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp153_;
-					DataImportsFSpotDbFSpotRollRow* _tmp154_;
-					DataImportsFSpotFSpotImportableTag** _tmp155_;
-					gint _tmp155__length1;
-					DataImportsFSpotFSpotImportableEvent* _tmp156_;
-					gboolean _tmp157_;
-					gboolean _tmp158_;
-					DataImportsFSpotFSpotImportableItem* _tmp159_;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp152_ = importable_items;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp152__length1 = importable_items_length1;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp153_ = photo_row;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp154_ = roll_row;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp155_ = tags;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp155__length1 = tags_length1;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp156_ = event;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp157_ = hidden;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp158_ = favorite;
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp159_ = data_imports_fspot_fspot_importable_item_new (_tmp153_, NULL, _tmp154_, _tmp155_, _tmp155__length1, _tmp156_, _tmp157_, _tmp158_);
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4879 "FSpotImporter.c"
-				}
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_error_free0 (e);
-#line 4883 "FSpotImporter.c"
-			}
-			__finally5:
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (roll_row);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (event);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (photo_row);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_photo_row_list);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (all_photos);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (tags_cache);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (database);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_clear_error (&_inner_error_);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				return;
-#line 4912 "FSpotImporter.c"
-			}
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp160_ = self->priv->running;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_tmp160_) {
-#line 4918 "FSpotImporter.c"
-				SpitDataImportsPluginHost* _tmp161_;
-				SpitDataImportsImportableMediaItem** _tmp162_;
-				gint _tmp162__length1;
-				gdouble _tmp163_;
-				gdouble _tmp164_;
-				gdouble _tmp165_;
-				gdouble _tmp166_;
-				gdouble _tmp167_;
-				gdouble _tmp168_;
-				gdouble _tmp169_;
-				SpitDataImportsPluginHost* _tmp170_;
-				gdouble _tmp171_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp161_ = self->priv->host;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp162_ = importable_items;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp162__length1 = importable_items_length1;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp163_ = current_progress;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp164_ = progress_delta_per_photo;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp165_ = progress_plugin_to_host_ratio;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp166_ = progress_delta_per_photo;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp167_ = progress_plugin_to_host_ratio;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp161_, _tmp162_, _tmp162__length1, _tmp163_ + (_tmp164_ * _tmp165_), _tmp166_ * (1 - _tmp167_), NULL);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp168_ = current_progress;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp169_ = progress_delta_per_photo;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				current_progress = _tmp168_ + _tmp169_;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp170_ = self->priv->host;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp171_ = current_progress;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_update_import_progress_pane (_tmp170_, _tmp171_, NULL);
-#line 4961 "FSpotImporter.c"
-			} else {
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (roll_row);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (event);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (photo_row);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				break;
-#line 4975 "FSpotImporter.c"
-			}
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (roll_row);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (event);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_g_object_unref0 (photo_row);
-#line 4987 "FSpotImporter.c"
-		}
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_photo_row_list);
-#line 4991 "FSpotImporter.c"
-	}
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp172_ = self->priv->host;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_finalize_import (_tmp172_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (all_photos);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (tags_cache);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_object_unref0 (database);
-#line 5003 "FSpotImporter.c"
-}
-
-
-void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count) {
-	SpitDataImportsPluginHost* _tmp0_;
-	gint _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = self->priv->host;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = imported_items_count;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup_printf (DATA_IMPORTS_FSPOT_MESSAGE_FINAL_SCREEN, _tmp1_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _tmp2_;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_install_static_message_pane (_tmp0_, _tmp3_, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp3_);
-#line 5026 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (tag), FALSE);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = tag;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = data_imports_fspot_fspot_importable_tag_get_stock_icon (_tmp0_);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = _tmp1_;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strcmp0 (DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS, _tmp2_) == 0;
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp2_);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_result_ = _tmp3_;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = _result_;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (!_tmp4_) {
-#line 5058 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_;
-		DataImportsFSpotFSpotImportableTag* _tmp6_;
-		DataImportsFSpotFSpotImportableTag* _tmp7_;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = tag;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = data_imports_fspot_fspot_importable_tag_get_fspot_parent (_tmp5_);
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		parent = _tmp6_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp7_ = parent;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_tmp7_ == NULL) {
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = FALSE;
-#line 5075 "FSpotImporter.c"
-		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_;
-			gboolean _tmp9_;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp8_ = parent;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_event (self, _tmp8_);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = _tmp9_;
-#line 5085 "FSpotImporter.c"
-		}
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (parent);
-#line 5089 "FSpotImporter.c"
-	}
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _result_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 5095 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id) {
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	gint64 _tmp0_;
-	DataImportsFSpotFSpotImportableTag* _tmp1_;
-	gint64 _tmp2_;
-	gboolean _tmp3_;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (tag), FALSE);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = hidden_tag_id;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = tag;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = data_imports_fspot_fspot_importable_tag_get_id (_tmp1_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_result_ = _tmp0_ == _tmp2_;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _result_;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (!_tmp3_) {
-#line 5122 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp4_;
-		DataImportsFSpotFSpotImportableTag* _tmp5_;
-		DataImportsFSpotFSpotImportableTag* _tmp6_;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp4_ = tag;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = data_imports_fspot_fspot_importable_tag_get_fspot_parent (_tmp4_);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		parent = _tmp5_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = parent;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_tmp6_ == NULL) {
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = FALSE;
-#line 5139 "FSpotImporter.c"
-		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp7_;
-			gint64 _tmp8_;
-			gboolean _tmp9_;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp7_ = parent;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp8_ = hidden_tag_id;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp7_, _tmp8_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = _tmp9_;
-#line 5152 "FSpotImporter.c"
-		}
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (parent);
-#line 5156 "FSpotImporter.c"
-	}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _result_;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 5162 "FSpotImporter.c"
-}
-
-
-static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (tag), FALSE);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = tag;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = data_imports_fspot_fspot_importable_tag_get_stock_icon (_tmp0_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = _tmp1_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strcmp0 (DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV, _tmp2_) == 0;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp2_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_result_ = _tmp3_;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = _result_;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (!_tmp4_) {
-#line 5194 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_;
-		DataImportsFSpotFSpotImportableTag* _tmp6_;
-		DataImportsFSpotFSpotImportableTag* _tmp7_;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp5_ = tag;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp6_ = data_imports_fspot_fspot_importable_tag_get_fspot_parent (_tmp5_);
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		parent = _tmp6_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp7_ = parent;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		if (_tmp7_ == NULL) {
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = FALSE;
-#line 5211 "FSpotImporter.c"
-		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_;
-			gboolean _tmp9_;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp8_ = parent;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp8_);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_result_ = _tmp9_;
-#line 5221 "FSpotImporter.c"
-		}
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (parent);
-#line 5225 "FSpotImporter.c"
-	}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _result_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	return result;
-#line 5231 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_class_init (DataImportsFSpotFSpotDataImporterClass * klass) {
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_data_importer_parent_class = g_type_class_peek_parent (klass);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotDataImporterPrivate));
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_data_importer_finalize;
-#line 5242 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_interface_init (SpitDataImportsDataImporterIface * iface) {
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = g_type_interface_peek_parent (iface);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_running = (gboolean (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_is_running;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_service = (SpitDataImportsService* (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_get_service;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->start = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_start;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->stop = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_stop;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_library_selected = (void (*) (SpitDataImportsDataImporter *, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_file_selected = (void (*) (SpitDataImportsDataImporter *, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected;
-#line 5261 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_instance_init (DataImportsFSpotFSpotDataImporter * self) {
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv = DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_PRIVATE (self);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->host = NULL;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->service = NULL;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self->priv->running = FALSE;
-#line 5274 "FSpotImporter.c"
-}
-
-
-static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj) {
-	DataImportsFSpotFSpotDataImporter * self;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	G_OBJECT_CLASS (data_imports_fspot_fspot_data_importer_parent_class)->finalize (obj);
-#line 5284 "FSpotImporter.c"
-}
-
-
-GType data_imports_fspot_fspot_data_importer_get_type (void) {
-	static volatile gsize data_imports_fspot_fspot_data_importer_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_fspot_data_importer_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotFSpotDataImporterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_fspot_data_importer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotFSpotDataImporter), 0, (GInstanceInitFunc) data_imports_fspot_fspot_data_importer_instance_init, NULL };
-		static const GInterfaceInfo spit_data_imports_data_importer_info = { (GInterfaceInitFunc) data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_fspot_data_importer_type_id;
-		data_imports_fspot_fspot_data_importer_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotFSpotDataImporter", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_fspot_data_importer_type_id, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, &spit_data_imports_data_importer_info);
-		g_once_init_leave (&data_imports_fspot_fspot_data_importer_type_id__volatile, data_imports_fspot_fspot_data_importer_type_id);
-	}
-	return data_imports_fspot_fspot_data_importer_type_id__volatile;
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala b/plugins/shotwell-data-imports/FSpotImporter.vala
deleted file mode 100644
index be04cf9..0000000
--- a/plugins/shotwell-data-imports/FSpotImporter.vala
+++ /dev/null
@@ -1,575 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-public class FSpotService : Object, Spit.Pluggable, Spit.DataImports.Service {
-    private const string ICON_FILENAME = "f-spot-24.png";
-
-    private static Gdk.Pixbuf[] icon_pixbuf_set = null;
-
-    public FSpotService(GLib.File resource_directory) {
-        // initialize the database layer
-        DataImports.FSpot.Db.init();
-        if (icon_pixbuf_set == null)
-            icon_pixbuf_set =
-                Resources.load_from_resource("/org/gnome/Shotwell/Imports/"
-                        + ICON_FILENAME);
-    }
-    
-    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
-        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
-            Spit.DataImports.CURRENT_INTERFACE);
-    }
-
-    public unowned string get_id() {
-        return "org.yorba.shotwell.dataimports.fspot";
-    }
-
-    public unowned string get_pluggable_name() {
-        return "F-Spot";
-    }
-
-    public void get_info(ref Spit.PluggableInfo info) {
-        info.authors = "Bruno Girin";
-        info.copyright = _("Copyright 2016 Software Freedom Conservancy Inc.");
-        info.translators = Resources.TRANSLATORS;
-        info.version = _VERSION;
-        info.website_name = Resources.WEBSITE_NAME;
-        info.website_url = Resources.WEBSITE_URL;
-        info.is_license_wordwrapped = false;
-        info.license = Resources.LICENSE;
-        info.icons = icon_pixbuf_set;
-    }
-
-    public void activation(bool enabled) {
-    }
-    
-    public Spit.DataImports.DataImporter create_data_importer(Spit.DataImports.PluginHost host) {
-        return new DataImports.FSpot.FSpotDataImporter(this, host);
-    }
-}
-
-namespace DataImports.FSpot {
-
-internal const string SERVICE_NAME = "F-Spot";
-internal const string SERVICE_WELCOME_MESSAGE =
-    _("Welcome to the F-Spot library import service.\n\nPlease select a library to import, either by selecting one of the existing libraries found by Shotwell or by selecting an alternative F-Spot database file.");
-internal const string SERVICE_WELCOME_MESSAGE_FILE_ONLY =
-    _("Welcome to the F-Spot library import service.\n\nPlease select an F-Spot database file.");
-internal const string FILE_IMPORT_LABEL =
-    _("Manually select an F-Spot database file to import:");
-internal const string ERROR_CANT_OPEN_DB_FILE =
-    _("Cannot open the selected F-Spot database file: the file does not exist or is not an F-Spot database");
-internal const string ERROR_UNSUPPORTED_DB_VERSION =
-    _("Cannot open the selected F-Spot database file: this version of the F-Spot database is not supported by Shotwell");
-internal const string ERROR_CANT_READ_TAGS_TABLE =
-    _("Cannot read the selected F-Spot database file: error while reading tags table");
-internal const string ERROR_CANT_READ_PHOTOS_TABLE =
-    _("Cannot read the selected F-Spot database file: error while reading photos table");
-internal const string MESSAGE_FINAL_SCREEN =
-    _("Shotwell has found %d photos in the F-Spot library and is currently importing them. Duplicates will be automatically detected and removed.\n\nYou can close this dialog and start using Shotwell while the import is taking place in the background.");
-
-public class FSpotImportableLibrary : Spit.DataImports.ImportableLibrary, GLib.Object {
-    private File db_file;
-    
-    public FSpotImportableLibrary(File db_file) {
-        this.db_file = db_file;
-    }
-    
-    public File get_db_file() {
-        return db_file;
-    }
-    
-    public string get_display_name() {
-        return _("F-Spot library: %s").printf(db_file.get_path());
-    }
-}
-
-public class FSpotImportableItem : Spit.DataImports.ImportableMediaItem, GLib.Object {
-    private DataImports.FSpot.Db.FSpotPhotoRow photo_row;
-    private DataImports.FSpot.Db.FSpotPhotoVersionRow? photo_version_row;
-    private DataImports.FSpot.Db.FSpotRollRow? roll_row;
-    private FSpotImportableTag[] tags;
-    private FSpotImportableEvent? event;
-    private FSpotImportableRating rating;
-    private string folder_path;
-    private string filename;
-    private time_t? date_time;
-    
-    public FSpotImportableItem(
-        DataImports.FSpot.Db.FSpotPhotoRow photo_row,
-        DataImports.FSpot.Db.FSpotPhotoVersionRow? photo_version_row,
-        DataImports.FSpot.Db.FSpotRollRow? roll_row,
-        FSpotImportableTag[] tags,
-        FSpotImportableEvent? event,
-        bool is_hidden,
-        bool is_favorite
-    ) {
-        this.photo_row = photo_row;
-        this.photo_version_row = photo_version_row;
-        this.roll_row = roll_row;
-        this.tags = tags;
-        this.event = event;
-        this.date_time = photo_row.time;
-        if (photo_row.rating > 0)
-            this.rating = new FSpotImportableRating(photo_row.rating);
-        else if (is_hidden)
-            this.rating = new FSpotImportableRating(FSpotImportableRating.REJECTED);
-        else if (is_favorite)
-            this.rating = new FSpotImportableRating(5);
-        else
-            this.rating = new FSpotImportableRating(FSpotImportableRating.UNRATED);
-            
-        // store path and filename
-        folder_path = (photo_version_row != null) ?
-            photo_version_row.base_path.get_path() :
-            photo_row.base_path.get_path();
-        filename = (photo_version_row != null) ?
-            photo_version_row.filename :
-            photo_row.filename;
-        
-        // In theory, neither field should be null at that point but belts
-        // and braces don't hurt
-        if (folder_path != null && filename != null) {
-            // check if file exist and if not decode as URL
-            File photo = File.new_for_path(folder_path).get_child(filename);
-                
-            // If file not found, parse as URI and store back
-            if (!photo.query_exists()) {
-                folder_path = decode_url(folder_path);
-                filename = decode_url(filename);
-            }
-        }
-    }
-    
-    public Spit.DataImports.ImportableTag[] get_tags() {
-        Spit.DataImports.ImportableTag[] importable_tags = new Spit.DataImports.ImportableTag[0];
-        foreach (FSpotImportableTag tag in tags)
-            importable_tags += tag;
-        return importable_tags;
-    }
-    
-    public Spit.DataImports.ImportableEvent? get_event() {
-        return event;
-    }
-    
-    public string get_folder_path() {
-        return folder_path;
-    }
-    
-    public string get_filename() {
-        return filename;
-    }
-    
-    public string? get_title() {
-        return (photo_row.description == null || photo_row.description == "") ? null : photo_row.description;
-    }
-    
-    public Spit.DataImports.ImportableRating get_rating() {
-        return rating;
-    }
-
-    public time_t? get_exposure_time() {
-        return date_time;
-    }
-    
-    private string decode_url(string url) {
-        StringBuilder builder = new StringBuilder();
-        for (int idx = 0; idx < url.length; ) {
-            int cidx = url.index_of_char('%', idx);
-            if (cidx > idx) {
-                builder.append(url.slice(idx, cidx));
-            }
-            if (cidx >= 0) {
-                if (cidx < url.length - 2) {
-                    char c1 = url.get(cidx + 1);
-                    char c2 = url.get(cidx + 2);
-                    if (c1.isxdigit() && c1.isxdigit()) {
-                        int ccode = 0x10 * c1.xdigit_value() + c2.xdigit_value();
-                        builder.append_c((char)ccode);
-                    }
-                    idx = cidx + 3;
-                } else {
-                    idx = cidx + 1;
-                }
-            } else {
-                builder.append(url.substring(idx));
-                idx = url.length;
-            }
-        }
-        return builder.str;
-    }
-}
-
-public class FSpotImportableTag : Spit.DataImports.ImportableTag, GLib.Object {
-    private DataImports.FSpot.Db.FSpotTagRow row;
-    private FSpotImportableTag? parent;
-    
-    public FSpotImportableTag(DataImports.FSpot.Db.FSpotTagRow row, FSpotImportableTag? parent) {
-        this.row = row;
-        this.parent = parent;
-    }
-    
-    public int64 get_id() {
-        return row.tag_id;
-    }
-    
-    public string get_name() {
-        return row.name;
-    }
-    
-    public Spit.DataImports.ImportableTag? get_parent() {
-        return parent;
-    }
-    
-    public FSpotImportableTag? get_fspot_parent() {
-        return parent;
-    }
-    
-    public string get_stock_icon() {
-        return row.stock_icon;
-    }
-    
-    public bool is_stock() {
-        return (row.stock_icon.has_prefix(DataImports.FSpot.Db.FSpotTagsTable.PREFIX_STOCK_ICON));
-    }
-    
-    public FSpotImportableEvent to_event() {
-        return new FSpotImportableEvent(this.row);
-    }
-}
-
-public class FSpotImportableEvent : Spit.DataImports.ImportableEvent, GLib.Object {
-    private DataImports.FSpot.Db.FSpotTagRow row;
-    
-    public FSpotImportableEvent(DataImports.FSpot.Db.FSpotTagRow row) {
-        this.row = row;
-    }
-    
-    public string get_name() {
-        return row.name;
-    }
-}
-
-public class FSpotImportableRating : Spit.DataImports.ImportableRating, GLib.Object {
-    public const int REJECTED = -1;
-    public const int UNRATED = 0;
-    
-    private int rating_value;
-    
-    public FSpotImportableRating(int rating_value) {
-        if (rating_value < -1)
-            rating_value = -1;
-        else if (rating_value > 5)
-            rating_value = 5;
-        this.rating_value = rating_value;
-    }
-    
-    public bool is_rejected() {
-        return (rating_value == REJECTED);
-    }
-    
-    public bool is_unrated() {
-        return (rating_value == UNRATED);
-    }
-    
-    public int get_value() {
-        return rating_value;
-    }
-}
-
-internal class FSpotTagsCache : Object {
-    private DataImports.FSpot.Db.FSpotTagsTable tags_table;
-    private Gee.HashMap<int64?, FSpotImportableTag> tags_map;
-    
-    public FSpotTagsCache(DataImports.FSpot.Db.FSpotTagsTable tags_table) throws DatabaseError {
-        this.tags_table = tags_table;
-        tags_map = new Gee.HashMap<int64?, FSpotImportableTag> ();
-    }
-    
-    public FSpotImportableTag get_tag(DataImports.FSpot.Db.FSpotTagRow tag_row) throws DatabaseError {
-        FSpotImportableTag? tag = tags_map.get(tag_row.tag_id);
-        if (tag != null) {
-            return tag;
-        } else {
-            FSpotImportableTag? parent_tag = get_tag_from_id(tag_row.category_id);
-            FSpotImportableTag new_tag = new FSpotImportableTag(tag_row, parent_tag);
-            tags_map[tag_row.tag_id] = new_tag;
-            return new_tag;
-        }
-    }
-    
-    private FSpotImportableTag? get_tag_from_id(int64 tag_id) throws DatabaseError {
-        // check whether the tag ID is valid first, otherwise return null
-        if (tag_id < 1)
-            return null;
-        FSpotImportableTag? tag = tags_map.get(tag_id);
-        if (tag != null)
-            return tag;
-        DataImports.FSpot.Db.FSpotTagRow? tag_row = tags_table.get_by_id(tag_id);
-        if (tag_row != null) {
-            FSpotImportableTag? parent_tag = get_tag_from_id(tag_row.category_id);
-            FSpotImportableTag new_tag = new FSpotImportableTag(tag_row, parent_tag);
-            tags_map[tag_id] = new_tag;
-            return new_tag;
-        }
-        return null;
-    }
-}
-
-public class FSpotDataImporter : Spit.DataImports.DataImporter, GLib.Object {
-
-    private weak Spit.DataImports.PluginHost host = null;
-    private weak Spit.DataImports.Service service = null;
-    private bool running = false;
-
-    public FSpotDataImporter(Spit.DataImports.Service service,
-        Spit.DataImports.PluginHost host) {
-        debug("FSpotDataImporter instantiated.");
-        this.service = service;
-        this.host = host;
-    }
-    
-    private bool is_running() {
-        return running;
-    }
-    
-    public Spit.DataImports.Service get_service() {
-        return service;
-    }
-
-    public void start() {
-        if (is_running())
-            return;
-        
-        debug("FSpotDataImporter: starting interaction.");
-        
-        running = true;
-        
-        do_discover_importable_libraries();
-    }
-
-    public void stop() {
-        debug("FSpotDataImporter: stopping interaction.");
-        
-        running = false;
-    }
-    
-    // Actions and event implementation
-    
-    /**
-     * Action that discovers importable libraries based on standard locations.
-     */
-    private void do_discover_importable_libraries() {
-        Spit.DataImports.ImportableLibrary[] discovered_libraries =
-            new Spit.DataImports.ImportableLibrary[0];
-        
-        File[] db_files = {
-            // where the DB is in Ubuntu Lucid
-            File.new_for_path(Environment.get_user_config_dir()).
-                get_child("f-spot").get_child("photos.db"),
-            // where it seems to be in Ubuntu Jaunty
-            File.new_for_path(Environment.get_home_dir()).get_child(".gnome2").
-                get_child("f-spot").get_child("photos.db"),
-            // where it should really be if it followed the XDG spec
-            File.new_for_path(Environment.get_user_data_dir()).
-                get_child("f-spot").get_child("photos.db")
-        };
-        
-        foreach (File db_file in db_files) {
-            if (db_file.query_exists(null)) {
-                discovered_libraries += new FSpotImportableLibrary(db_file);
-                message("Discovered importable library: %s", db_file.get_path());
-            }
-        }
-        
-        host.install_library_selection_pane(
-            (discovered_libraries.length > 0 ? SERVICE_WELCOME_MESSAGE : SERVICE_WELCOME_MESSAGE_FILE_ONLY),
-            discovered_libraries,
-            FILE_IMPORT_LABEL
-        );
-    }
-    
-    public void on_library_selected(Spit.DataImports.ImportableLibrary library) {
-        on_file_selected(((FSpotImportableLibrary)library).get_db_file());
-    }
-    
-    public void on_file_selected(File file) {
-        DataImports.FSpot.Db.FSpotDatabase database;
-        FSpotTagsCache tags_cache;
-        Gee.ArrayList<DataImports.FSpot.Db.FSpotPhotoRow> all_photos;
-        double progress_delta_per_photo = 1.0;
-        double progress_plugin_to_host_ratio = 0.5;
-        double current_progress = 0.0;
-        try {
-            database = new DataImports.FSpot.Db.FSpotDatabase(file);
-        } catch(DatabaseError e) {
-            debug("FSpotDataImporter: Can't open database file: %s".printf(e.message));
-            host.post_error_message(ERROR_CANT_OPEN_DB_FILE);
-            return;
-        } catch(Spit.DataImports.DataImportError e) {
-            debug("FSpotDataImporter: Unsupported F-Spot database version: %s".printf(e.message));
-            host.post_error_message(ERROR_UNSUPPORTED_DB_VERSION);
-            return;
-        }
-        try {
-            tags_cache = new FSpotTagsCache(database.tags_table);
-        } catch(DatabaseError e) {
-            debug("FSpotDataImporter: Can't read tags table: %s".printf(e.message));
-            host.post_error_message(ERROR_CANT_READ_TAGS_TABLE);
-            return;
-        }
-        host.install_import_progress_pane(_("Preparing to import"));
-        try {
-            all_photos = database.photos_table.get_all();
-        } catch(DatabaseError e) {
-            debug("FSpotDataImporter: Can't read photos table: %s".printf(e.message));
-            host.post_error_message(ERROR_CANT_READ_PHOTOS_TABLE);
-            return;
-        }
-        if (all_photos.size > 0)
-            progress_delta_per_photo = 1.0 / all_photos.size;
-        foreach (DataImports.FSpot.Db.FSpotPhotoRow photo_row in all_photos) {
-            bool hidden = false;
-            bool favorite = false;
-            FSpotImportableTag[] tags = new FSpotImportableTag[0];
-            FSpotImportableEvent? event = null;
-            DataImports.FSpot.Db.FSpotRollRow? roll_row = null;
-            
-            // TODO: We do not convert F-Spot events to Shotwell events because F-Spot's events
-            // are essentially tags.  We would need to detect if the tag is an event (use
-            // is_tag_event) and then assign the event to the photo ... since a photo can be
-            // in multiple F-Spot events, we would need to pick one, and since their tags
-            // are hierarchical, we would need to pick a name (probably the leaf)
-            try {
-                foreach (
-                    DataImports.FSpot.Db.FSpotTagRow tag_row in
-                    database.tags_table.get_by_photo_id(photo_row.photo_id)
-                ) {
-                    FSpotImportableTag tag = tags_cache.get_tag(tag_row);
-                    if (is_tag_hidden(tag, database.hidden_tag_id))
-                        hidden = true;
-                    else if (is_tag_favorite(tag))
-                        favorite = true;
-                    else
-                        tags += tag;
-                }
-            } catch(DatabaseError e) {
-                // log the error and leave the tag list empty
-                message("Failed to retrieve tags for photo ID %ld: %s", (long) photo_row.photo_id,
-                    e.message);
-            }
-            
-            try {
-                roll_row = database.rolls_table.get_by_id(photo_row.roll_id);
-            } catch (DatabaseError e) {
-                // log the error and leave the roll row null
-                message("Failed to retrieve roll for photo ID %ld: %s", (long) photo_row.photo_id,
-                    e.message);
-            }
-            
-            Spit.DataImports.ImportableMediaItem[] importable_items = new Spit.DataImports.ImportableMediaItem[0];
-            try {
-                Gee.ArrayList<DataImports.FSpot.Db.FSpotPhotoVersionRow> photo_versions =
-                    database.photo_versions_table.get_by_photo_id(photo_row.photo_id);
-                bool photo_versions_added = false;   // set to true if at least one version was added
-                bool photo_versions_skipped = false; // set to true if at least one version was skipped due to missing file details
-                foreach (DataImports.FSpot.Db.FSpotPhotoVersionRow photo_version_row in photo_versions) {
-                    if (photo_version_row.base_path != null && photo_version_row.filename != null) {
-                        importable_items += new FSpotImportableItem(
-                            photo_row, photo_version_row, roll_row, tags, event, hidden, favorite
-                        );
-                        photo_versions_added = true;
-                    } else {
-                        photo_versions_skipped = true;
-                    }
-                }
-                
-                // Older versions of F-Spot (0.4.3.1 at least, perhaps later) did not maintain photo_versions,
-                // this handles that case
-                // It also handles the case when we had to skip any photo version due to missing
-                // file details
-                if (photo_versions_skipped || !photo_versions_added) {
-                    if (photo_row.base_path != null && photo_row.filename != null) {
-                        importable_items += new FSpotImportableItem(
-                            photo_row, null, roll_row, tags, event, hidden, favorite
-                        );
-                    }
-                }
-            } catch (DatabaseError e) {
-                // if we can't load the different versions, do the best we can
-                // and create one photo from the photo row that was found earlier
-                message("Failed to retrieve versions for photo ID %ld: %s", (long) photo_row.photo_id,
-                    e.message);
-                if (photo_row.base_path != null && photo_row.filename != null) {
-                    importable_items += new FSpotImportableItem(
-                        photo_row, null, roll_row, tags, event, hidden, favorite
-                    );
-                }
-            }
-            // If the importer is still running, import the items and loop,
-            // otherwise break the loop
-            if (running) {
-                host.prepare_media_items_for_import(
-                    importable_items,
-                    current_progress + (progress_delta_per_photo * progress_plugin_to_host_ratio),
-                    progress_delta_per_photo * (1 - progress_plugin_to_host_ratio),
-                    null
-                );
-                current_progress += progress_delta_per_photo;
-                host.update_import_progress_pane(current_progress);
-            } else {
-                break;
-            }
-        }
-        host.finalize_import(on_imported_items_count);
-    }
-    
-    public void on_imported_items_count(int imported_items_count) {
-        host.install_static_message_pane(
-            MESSAGE_FINAL_SCREEN.printf(imported_items_count),
-            Spit.DataImports.PluginHost.ButtonMode.CLOSE
-        );
-    }
-    
-    private bool is_tag_event(FSpotImportableTag tag) {
-        bool result = (DataImports.FSpot.Db.FSpotTagsTable.STOCK_ICON_EVENTS == tag.get_stock_icon());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_event(parent);
-        }
-        return result;
-    }
-    
-    private bool is_tag_hidden(FSpotImportableTag tag, int64 hidden_tag_id) {
-        bool result = (hidden_tag_id == tag.get_id());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_hidden(parent, hidden_tag_id);
-        }
-        return result;
-    }
-    
-    private bool is_tag_favorite(FSpotImportableTag tag) {
-        bool result = (DataImports.FSpot.Db.FSpotTagsTable.STOCK_ICON_FAV == tag.get_stock_icon());
-        if (!result) {
-            FSpotImportableTag? parent = tag.get_fspot_parent();
-            if (parent == null)
-                result = false;
-            else
-                result = is_tag_favorite(parent);
-        }
-        return result;
-    }
-}
-
-} // namespace
-
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c
deleted file mode 100644
index 0b87d55..0000000
--- a/plugins/shotwell-data-imports/FSpotMetaTable.c
+++ /dev/null
@@ -1,1464 +0,0 @@
-/* FSpotMetaTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotMetaTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW (data_imports_fspot_db_fspot_meta_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotMetaRow DataImportsFSpotDbFSpotMetaRow;
-typedef struct _DataImportsFSpotDbFSpotMetaRowClass DataImportsFSpotDbFSpotMetaRowClass;
-typedef struct _DataImportsFSpotDbFSpotMetaRowPrivate DataImportsFSpotDbFSpotMetaRowPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE (data_imports_fspot_db_fspot_meta_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, DataImportsFSpotDbFSpotMetaTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotMetaTable DataImportsFSpotDbFSpotMetaTable;
-typedef struct _DataImportsFSpotDbFSpotMetaTableClass DataImportsFSpotDbFSpotMetaTableClass;
-typedef struct _DataImportsFSpotDbFSpotMetaTablePrivate DataImportsFSpotDbFSpotMetaTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR (data_imports_fspot_db_fspot_meta_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotMetaBehavior DataImportsFSpotDbFSpotMetaBehavior;
-typedef struct _DataImportsFSpotDbFSpotMetaBehaviorClass DataImportsFSpotDbFSpotMetaBehaviorClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-typedef struct _DataImportsFSpotDbFSpotMetaBehaviorPrivate DataImportsFSpotDbFSpotMetaBehaviorPrivate;
-
-struct _DataImportsFSpotDbFSpotMetaRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotMetaRowPrivate * priv;
-	gchar* name;
-	gchar* data;
-};
-
-struct _DataImportsFSpotDbFSpotMetaRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotMetaTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotMetaTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotMetaTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotDbFSpotMetaBehavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotMetaBehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotMetaBehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_meta_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_meta_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_meta_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance;
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_meta_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_META_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_new (void);
-DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_meta_table_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_META_TABLE_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sqlite3* db);
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-GType data_imports_fspot_db_fspot_meta_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_get_instance (void);
-GQuark database_error_quark (void);
-gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotMetaTable* self, const gchar* name, GError** error);
-gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
-gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
-gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR_TABLE_NAME "Meta"
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_new (void);
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_construct (GType object_type);
-static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_meta_behavior_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);
-
-
-DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotMetaRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = (DataImportsFSpotDbFSpotMetaRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return self;
-#line 214 "FSpotMetaTable.c"
-}
-
-
-DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return data_imports_fspot_db_fspot_meta_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW);
-#line 221 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_row_class_init (DataImportsFSpotDbFSpotMetaRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_meta_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_meta_row_finalize;
-#line 230 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_row_instance_init (DataImportsFSpotDbFSpotMetaRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotMetaRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRow);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (self->name);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (self->data);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_meta_row_parent_class)->finalize (obj);
-#line 248 "FSpotMetaTable.c"
-}
-
-
-/**
- * The value object for the "meta" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_meta_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_meta_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_meta_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotMetaRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_meta_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotMetaRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_meta_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_meta_row_type_id;
-		data_imports_fspot_db_fspot_meta_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotMetaRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_meta_row_type_id__volatile, data_imports_fspot_db_fspot_meta_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_meta_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db) {
-	DataImportsFSpotDbFSpotMetaTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = db;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = (DataImportsFSpotDbFSpotMetaTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_meta_behavior_get_instance ();
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = _tmp1_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior));
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_object_unref0 (_tmp2_);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return self;
-#line 288 "FSpotMetaTable.c"
-}
-
-
-DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sqlite3* db) {
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return data_imports_fspot_db_fspot_meta_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_TABLE, db);
-#line 295 "FSpotMetaTable.c"
-}
-
-
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		separator = "";
-#line 312 "FSpotMetaTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 322 "FSpotMetaTable.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 332 "FSpotMetaTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 338 "FSpotMetaTable.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 349 "FSpotMetaTable.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 361 "FSpotMetaTable.c"
-		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 365 "FSpotMetaTable.c"
-		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 369 "FSpotMetaTable.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 373 "FSpotMetaTable.c"
-		gint i = 0;
-		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
-		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = (gsize) 1;
-#line 396 "FSpotMetaTable.c"
-		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 405 "FSpotMetaTable.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 418 "FSpotMetaTable.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 424 "FSpotMetaTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 434 "FSpotMetaTable.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 446 "FSpotMetaTable.c"
-				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 450 "FSpotMetaTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 456 "FSpotMetaTable.c"
-				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 467 "FSpotMetaTable.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 482 "FSpotMetaTable.c"
-					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 486 "FSpotMetaTable.c"
-					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 490 "FSpotMetaTable.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 496 "FSpotMetaTable.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 508 "FSpotMetaTable.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 529 "FSpotMetaTable.c"
-				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 533 "FSpotMetaTable.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 539 "FSpotMetaTable.c"
-			}
-		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 546 "FSpotMetaTable.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return result;
-#line 554 "FSpotMetaTable.c"
-		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 592 "FSpotMetaTable.c"
-		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 601 "FSpotMetaTable.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 617 "FSpotMetaTable.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 623 "FSpotMetaTable.c"
-				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 637 "FSpotMetaTable.c"
-				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 657 "FSpotMetaTable.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 672 "FSpotMetaTable.c"
-				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 676 "FSpotMetaTable.c"
-				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 684 "FSpotMetaTable.c"
-			}
-		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 695 "FSpotMetaTable.c"
-	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 704 "FSpotMetaTable.c"
-	}
-}
-
-
-gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotMetaTable* self, const gchar* name, GError** error) {
-	gchar* result = NULL;
-	gchar** columns = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
-	gint _tmp1_;
-	gchar** _tmp2_;
-	gint columns_length1;
-	gint _columns_size_;
-	gchar* column_list = NULL;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	gchar* _tmp4_;
-	gchar* sql = NULL;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
-	gchar* _tmp7_;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3* _tmp8_;
-	const gchar* _tmp9_;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_;
-	gint _tmp12_;
-	sqlite3_stmt* _tmp17_;
-	const gchar* _tmp18_;
-	gchar* _tmp19_;
-	GDestroyNotify _tmp20_;
-	gint _tmp21_;
-	gint _tmp22_;
-	sqlite3_stmt* _tmp27_;
-	gint _tmp28_;
-	gint _tmp29_;
-	DataImportsFSpotDbFSpotMetaRow* row = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	gpointer _tmp34_ = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp35_;
-	const gchar* _tmp36_;
-	gchar* _tmp37_;
-	GError * _inner_error_ = NULL;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_table_behavior_list_columns (_tmp0_, &_tmp1_);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	columns = _tmp2_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	columns_length1 = _tmp1_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_columns_size_ = columns_length1;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3_ = columns;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3__length1 = columns_length1;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp4_ = _vala_g_strjoinv (", ", _tmp3_, _tmp3__length1);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	column_list = _tmp4_;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp5_ = column_list;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp7_ = g_strdup_printf ("SELECT %s FROM %s WHERE name=?", _tmp5_, _tmp6_);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	sql = _tmp7_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->fspot_db;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp9_ = sql;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp11_ = sqlite3_prepare_v2 (_tmp8_, _tmp9_, -1, &_tmp10_, NULL);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	stmt = _tmp10_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	res = _tmp11_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp12_ = res;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (_tmp12_ != SQLITE_OK) {
-#line 795 "FSpotMetaTable.c"
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-		gint _tmp16_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp13_ = sql;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp14_ = g_strdup_printf ("Statement failed: %s", _tmp13_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp15_ = _tmp14_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp16_ = res;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		importable_database_table_throw_error (_tmp15_, _tmp16_, &_inner_error_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (_tmp15_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (sql);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (column_list);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				return NULL;
-#line 828 "FSpotMetaTable.c"
-			} else {
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (sql);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (column_list);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_clear_error (&_inner_error_);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				return NULL;
-#line 844 "FSpotMetaTable.c"
-			}
-		}
-	}
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp17_ = stmt;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp18_ = name;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp19_ = g_strdup (_tmp18_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp20_ = g_free;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp21_ = sqlite3_bind_text (_tmp17_, 1, _tmp19_, -1, _tmp20_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	res = _tmp21_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp22_ = res;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (_tmp22_ != SQLITE_OK) {
-#line 864 "FSpotMetaTable.c"
-		const gchar* _tmp23_;
-		gchar* _tmp24_;
-		gchar* _tmp25_;
-		gint _tmp26_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp23_ = name;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp24_ = g_strdup_printf ("Bind failed for name %s", _tmp23_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp25_ = _tmp24_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp26_ = res;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		importable_database_table_throw_error (_tmp25_, _tmp26_, &_inner_error_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (_tmp25_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (sql);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (column_list);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				return NULL;
-#line 897 "FSpotMetaTable.c"
-			} else {
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (sql);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				_g_free0 (column_list);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				g_clear_error (&_inner_error_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				return NULL;
-#line 913 "FSpotMetaTable.c"
-			}
-		}
-	}
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp27_ = stmt;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp28_ = sqlite3_step (_tmp27_);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	res = _tmp28_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp29_ = res;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (_tmp29_ != SQLITE_ROW) {
-#line 927 "FSpotMetaTable.c"
-		gint _tmp30_;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp30_ = res;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (_tmp30_ != SQLITE_DONE) {
-#line 933 "FSpotMetaTable.c"
-			gint _tmp31_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			_tmp31_ = res;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			importable_database_table_throw_error ("FSpotMetaTable.get_data", _tmp31_, &_inner_error_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					g_propagate_error (error, _inner_error_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_g_free0 (sql);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_g_free0 (column_list);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					return NULL;
-#line 955 "FSpotMetaTable.c"
-				} else {
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_sqlite3_finalize0 (stmt);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_g_free0 (sql);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					_g_free0 (column_list);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					g_clear_error (&_inner_error_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-					return NULL;
-#line 971 "FSpotMetaTable.c"
-				}
-			}
-		}
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		result = NULL;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_sqlite3_finalize0 (stmt);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (sql);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (column_list);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		return result;
-#line 987 "FSpotMetaTable.c"
-	}
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp32_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp33_ = stmt;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_table_behavior_build_row (_tmp32_, _tmp33_, &_tmp34_, 0);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_object_unref0 (row);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	row = _tmp34_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp35_ = row;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp36_ = _tmp35_->data;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp37_ = g_strdup (_tmp36_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp37_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_object_unref0 (row);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (sql);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (column_list);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) g_free), NULL);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1019 "FSpotMetaTable.c"
-}
-
-
-gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
-	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_meta_table_get_data (self, "F-Spot Version", &_inner_error_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = _tmp1_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return NULL;
-#line 1043 "FSpotMetaTable.c"
-		} else {
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_clear_error (&_inner_error_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return NULL;
-#line 1051 "FSpotMetaTable.c"
-		}
-	}
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = _tmp0_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = NULL;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp2_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (_tmp0_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1064 "FSpotMetaTable.c"
-}
-
-
-gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
-	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_meta_table_get_data (self, "F-Spot Database Version", &_inner_error_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = _tmp1_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return NULL;
-#line 1088 "FSpotMetaTable.c"
-		} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_clear_error (&_inner_error_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return NULL;
-#line 1096 "FSpotMetaTable.c"
-		}
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = _tmp0_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = NULL;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp2_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (_tmp0_);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1109 "FSpotMetaTable.c"
-}
-
-
-static gint64 int64_parse (const gchar* str) {
-	gint64 result = 0LL;
-	const gchar* _tmp0_;
-	gint64 _tmp1_;
-#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (str != NULL, 0LL);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 1127 "FSpotMetaTable.c"
-}
-
-
-gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
-	gint64 result = 0LL;
-	gchar* id_str = NULL;
-	gchar* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), 0LL);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_meta_table_get_data (self, "Hidden Tag Id", &_inner_error_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	id_str = _tmp0_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1146 "FSpotMetaTable.c"
-			gint64 _tmp1_ = 0LL;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return _tmp1_;
-#line 1152 "FSpotMetaTable.c"
-		} else {
-			gint64 _tmp2_ = 0LL;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			g_clear_error (&_inner_error_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-			return _tmp2_;
-#line 1161 "FSpotMetaTable.c"
-		}
-	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (id_str != NULL) {
-#line 1166 "FSpotMetaTable.c"
-		gint64 _tmp3_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp3_ = int64_parse (id_str);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		result = _tmp3_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (id_str);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		return result;
-#line 1176 "FSpotMetaTable.c"
-	} else {
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		result = (gint64) -1;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_free0 (id_str);
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		return result;
-#line 1184 "FSpotMetaTable.c"
-	}
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (id_str);
-#line 1188 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_table_class_init (DataImportsFSpotDbFSpotMetaTableClass * klass) {
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_meta_table_parent_class = g_type_class_peek_parent (klass);
-#line 1195 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_table_instance_init (DataImportsFSpotDbFSpotMetaTable * self) {
-}
-
-
-/**
- * This class represents the F-Spot meta table, which stores some essential
- * meta-data for the whole database. It is implemented as a simple dictionary
- * where each row in the table is a key/value pair.
- *
- * The meta table implementation is the only one that throws a database error
- * if something goes wrong because:
- *  * it is essential to read the content of that table in order to identify
- *    the version of the database and select the correct behavior,
- *  * this table is read at the very beginning of the process so any failure
- *    will occur immediately,
- *  * failing to read this table means that there is no point in reading the
- *    attempting to read the rest of the database so we might as well abort.
- */
-GType data_imports_fspot_db_fspot_meta_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_meta_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_meta_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotMetaTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_meta_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotMetaTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_meta_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_meta_table_type_id;
-		data_imports_fspot_db_fspot_meta_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotMetaTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_meta_table_type_id__volatile, data_imports_fspot_db_fspot_meta_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_meta_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotMetaBehavior * self = NULL;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = (DataImportsFSpotDbFSpotMetaBehavior*) g_object_new (object_type, NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return self;
-#line 1235 "FSpotMetaTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_new (void) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return data_imports_fspot_db_fspot_meta_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR);
-#line 1242 "FSpotMetaTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1249 "FSpotMetaTable.c"
-}
-
-
-DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotMetaBehavior* result = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp0_;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp3_;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1262 "FSpotMetaTable.c"
-		DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new ();
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_meta_behavior_instance);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		data_imports_fspot_db_fspot_meta_behavior_instance = _tmp1_;
-#line 1270 "FSpotMetaTable.c"
-	}
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_meta_behavior_instance;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp3_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1280 "FSpotMetaTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotMetaBehavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_META_BEHAVIOR_TABLE_NAME);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp0_;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1296 "FSpotMetaTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotMetaBehavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = g_strdup ("name");
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp1_ = g_strdup ("data");
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = g_new0 (gchar*, 2 + 1);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_[0] = _tmp0_;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_[1] = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3_ = _tmp2_;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3__length1 = 2;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (result_length1) {
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		*result_length1 = _tmp3__length1;
-#line 1328 "FSpotMetaTable.c"
-	}
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	result = _tmp3_;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	return result;
-#line 1334 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotMetaBehavior * self;
-	DataImportsFSpotDbFSpotMetaRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp0_;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	sqlite3_stmt* _tmp5_;
-	gint _tmp6_;
-	const gchar* _tmp7_;
-	gchar* _tmp8_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_meta_row_new ();
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_vala_row = _tmp0_;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp1_ = stmt;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp2_ = offset;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp3_ = sqlite3_column_text (_tmp1_, _tmp2_ + 0);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (_vala_row->name);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_vala_row->name = _tmp4_;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp5_ = stmt;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp6_ = offset;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp7_ = sqlite3_column_text (_tmp5_, _tmp6_ + 1);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_g_free0 (_vala_row->data);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	_vala_row->data = _tmp8_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	if (row) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		*row = _vala_row;
-#line 1388 "FSpotMetaTable.c"
-	} else {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1392 "FSpotMetaTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_meta_behavior_class_init (DataImportsFSpotDbFSpotMetaBehaviorClass * klass) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_meta_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_meta_behavior_finalize;
-#line 1402 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row;
-#line 1415 "FSpotMetaTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_meta_behavior_instance_init (DataImportsFSpotDbFSpotMetaBehavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotMetaBehavior * self;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_meta_behavior_parent_class)->finalize (obj);
-#line 1429 "FSpotMetaTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_meta_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_meta_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_meta_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotMetaBehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_meta_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotMetaBehavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_meta_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_meta_behavior_type_id;
-		data_imports_fspot_db_fspot_meta_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotMetaBehavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_meta_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_meta_behavior_type_id__volatile, data_imports_fspot_db_fspot_meta_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_meta_behavior_type_id__volatile;
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.vala b/plugins/shotwell-data-imports/FSpotMetaTable.vala
deleted file mode 100644
index e28d2e6..0000000
--- a/plugins/shotwell-data-imports/FSpotMetaTable.vala
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "meta" table, representing a single database row.
- */
-public class FSpotMetaRow : Object {
-    // ignore the ID
-    public string name;
-    public string data;
-}
-
-/**
- * This class represents the F-Spot meta table, which stores some essential
- * meta-data for the whole database. It is implemented as a simple dictionary
- * where each row in the table is a key/value pair.
- *
- * The meta table implementation is the only one that throws a database error
- * if something goes wrong because:
- *  * it is essential to read the content of that table in order to identify
- *    the version of the database and select the correct behavior,
- *  * this table is read at the very beginning of the process so any failure
- *    will occur immediately,
- *  * failing to read this table means that there is no point in reading the
- *    attempting to read the rest of the database so we might as well abort.
- */
-public class FSpotMetaTable : FSpotDatabaseTable<FSpotMetaRow> {
-    
-    public FSpotMetaTable(Sqlite.Database db) {
-        base(db);
-        set_behavior(FSpotMetaBehavior.get_instance());
-    }
-    
-    public string? get_data(string name) throws DatabaseError {
-        string[] columns = behavior.list_columns();
-        string column_list = string.joinv(", ", columns);
-        string sql = "SELECT %s FROM %s WHERE name=?".printf(column_list, table_name);
-        Sqlite.Statement stmt;
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.bind_text(1, name);
-        if (res != Sqlite.OK)
-            throw_error("Bind failed for name %s".printf(name), res);
-        
-        res = stmt.step();
-        if (res != Sqlite.ROW) {
-            if (res != Sqlite.DONE)
-                throw_error("FSpotMetaTable.get_data", res);
-            
-            return null;
-        }
-        
-        FSpotMetaRow row;
-        behavior.build_row(stmt, out row);
-        return row.data;
-    }
-    
-    public string? get_app_version() throws DatabaseError {
-        return get_data("F-Spot Version");
-    }
-    
-    public string? get_db_version() throws DatabaseError {
-        return get_data("F-Spot Database Version");
-    }
-    
-    public int64 get_hidden_tag_id() throws DatabaseError {
-        string id_str = get_data("Hidden Tag Id");
-        if(id_str != null) {
-            return int64.parse(id_str);
-        } else {
-            return -1;
-        }
-    }
-}
-
-public class FSpotMetaBehavior : FSpotTableBehavior<FSpotMetaRow>, Object {
-    public const string TABLE_NAME = "Meta";
-    
-    private static FSpotMetaBehavior instance;
-    
-    private FSpotMetaBehavior() {
-    }
-    
-    public static FSpotMetaBehavior get_instance() {
-        if (instance == null)
-            instance = new FSpotMetaBehavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "name", "data" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotMetaRow row, int offset = 0) {
-        row = new FSpotMetaRow();
-        row.name = stmt.column_text(offset + 0);
-        row.data = stmt.column_text(offset + 1);
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
deleted file mode 100644
index 8865ca1..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* FSpotPhotoTagsTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotPhotoTagsTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW (data_imports_fspot_db_fspot_photo_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRow DataImportsFSpotDbFSpotPhotoTagRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRowClass DataImportsFSpotDbFSpotPhotoTagRowClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRowPrivate DataImportsFSpotDbFSpotPhotoTagRowPrivate;
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE (data_imports_fspot_db_fspot_photo_tags_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE, DataImportsFSpotDbFSpotPhotoTagsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE, DataImportsFSpotDbFSpotPhotoTagsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE, DataImportsFSpotDbFSpotPhotoTagsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsTable DataImportsFSpotDbFSpotPhotoTagsTable;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsTableClass DataImportsFSpotDbFSpotPhotoTagsTableClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsTablePrivate DataImportsFSpotDbFSpotPhotoTagsTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsV0Behavior DataImportsFSpotDbFSpotPhotoTagsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagsV0BehaviorPrivate DataImportsFSpotDbFSpotPhotoTagsV0BehaviorPrivate;
-
-struct _DataImportsFSpotDbFSpotPhotoTagRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoTagRowPrivate * priv;
-	gint64 photo_id;
-	gint64 tag_id;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoTagRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoTagsTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotPhotoTagsTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoTagsTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoTagsV0Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoTagsV0BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_photo_tag_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_tags_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_tags_v0_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_new (void);
-DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_tags_table_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME "Photo_Tags"
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-GType data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_V0_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj);
-
-
-DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoTagRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoTagRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return self;
-#line 205 "FSpotPhotoTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return data_imports_fspot_db_fspot_photo_tag_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW);
-#line 212 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tag_row_class_init (DataImportsFSpotDbFSpotPhotoTagRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	data_imports_fspot_db_fspot_photo_tag_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_tag_row_finalize;
-#line 221 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tag_row_instance_init (DataImportsFSpotDbFSpotPhotoTagRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoTagRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_tag_row_parent_class)->finalize (obj);
-#line 235 "FSpotPhotoTagsTable.c"
-}
-
-
-/**
- * The value object for the "photo_tags" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_tag_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_tag_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoTagRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_tag_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoTagRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_tag_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photo_tag_row_type_id;
-		data_imports_fspot_db_fspot_photo_tag_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoTagRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_tag_row_type_id__volatile, data_imports_fspot_db_fspot_photo_tag_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_tag_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-	DataImportsFSpotDbFSpotPhotoTagsTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (db_behavior), NULL);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp0_ = db;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp1_ = db_behavior;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (_tmp1_);
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), _tmp3_);
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_g_object_unref0 (_tmp3_);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return self;
-#line 280 "FSpotPhotoTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return data_imports_fspot_db_fspot_photo_tags_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_TABLE, db, db_behavior);
-#line 287 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_table_class_init (DataImportsFSpotDbFSpotPhotoTagsTableClass * klass) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	data_imports_fspot_db_fspot_photo_tags_table_parent_class = g_type_class_peek_parent (klass);
-#line 294 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_table_instance_init (DataImportsFSpotDbFSpotPhotoTagsTable * self) {
-}
-
-
-/**
- * This class represents the F-Spot photo_tags table.
- */
-GType data_imports_fspot_db_fspot_photo_tags_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_tags_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_tags_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoTagsTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_tags_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoTagsTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_tags_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photo_tags_table_type_id;
-		data_imports_fspot_db_fspot_photo_tags_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotPhotoTagsTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_tags_table_type_id__volatile, data_imports_fspot_db_fspot_photo_tags_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_tags_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self = NULL;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoTagsV0Behavior*) g_object_new (object_type, NULL);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return self;
-#line 323 "FSpotPhotoTagsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_new (void) {
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return data_imports_fspot_db_fspot_photo_tags_v0_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR);
-#line 330 "FSpotPhotoTagsTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 337 "FSpotPhotoTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp3_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 350 "FSpotPhotoTagsTable.c"
-		DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp1_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_new ();
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance = _tmp1_;
-#line 358 "FSpotPhotoTagsTable.c"
-	}
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	result = _tmp3_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return result;
-#line 368 "FSpotPhotoTagsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAGS_TABLE_TABLE_NAME);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	result = _tmp0_;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return result;
-#line 384 "FSpotPhotoTagsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp1_ = g_strdup ("tag_id");
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_ = g_new0 (gchar*, 2 + 1);
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_[0] = _tmp0_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_[1] = _tmp1_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp3__length1 = 2;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	if (result_length1) {
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		*result_length1 = _tmp3__length1;
-#line 416 "FSpotPhotoTagsTable.c"
-	}
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	result = _tmp3_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	return result;
-#line 422 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
-	DataImportsFSpotDbFSpotPhotoTagRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoTagRow* _tmp0_;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	gint64 _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	gint64 _tmp6_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_tag_row_new ();
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_vala_row = _tmp0_;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp1_ = stmt;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp2_ = offset;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp3_ = sqlite3_column_int64 (_tmp1_, _tmp2_ + 0);
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_vala_row->photo_id = _tmp3_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp4_ = stmt;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp5_ = offset;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_tmp6_ = sqlite3_column_int64 (_tmp4_, _tmp5_ + 1);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	_vala_row->tag_id = _tmp6_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	if (row) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		*row = _vala_row;
-#line 466 "FSpotPhotoTagsTable.c"
-	} else {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 470 "FSpotPhotoTagsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_class_init (DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass * klass) {
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	data_imports_fspot_db_fspot_photo_tags_v0_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize;
-#line 480 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row;
-#line 493 "FSpotPhotoTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance_init (DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_tags_v0_behavior_parent_class)->finalize (obj);
-#line 507 "FSpotPhotoTagsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoTagsV0BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_tags_v0_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoTagsV0Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoTagsV0Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_tags_v0_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
deleted file mode 100644
index afc67ec..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photo_tags" table, representing a single database row.
- */
-public class FSpotPhotoTagRow : Object {
-    public int64 photo_id;
-    public int64 tag_id;
-}
-
-/**
- * This class represents the F-Spot photo_tags table.
- */
-public class FSpotPhotoTagsTable : FSpotDatabaseTable<FSpotPhotoTagRow> {
-    public const string TABLE_NAME = "Photo_Tags";
-    
-    public FSpotPhotoTagsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base(db);
-        set_behavior(db_behavior.get_photo_tags_behavior());
-    }
-}
-
-public class FSpotPhotoTagsV0Behavior : FSpotTableBehavior<FSpotPhotoTagRow>, Object {
-    private static FSpotPhotoTagsV0Behavior instance;
-    
-    private FSpotPhotoTagsV0Behavior() {
-    }
-    
-    public static FSpotPhotoTagsV0Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoTagsV0Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoTagsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns() {
-        return { "photo_id", "tag_id" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoTagRow row, int offset = 0) {
-        row = new FSpotPhotoTagRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.tag_id = stmt.column_int64(offset + 1);
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
deleted file mode 100644
index d7b9079..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
+++ /dev/null
@@ -1,2440 +0,0 @@
-/* FSpotPhotoVersionsTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotPhotoVersionsTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include <sqlite3.h>
-#include <gee.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW (data_imports_fspot_db_fspot_photo_version_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSION_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRow DataImportsFSpotDbFSpotPhotoVersionRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRowClass DataImportsFSpotDbFSpotPhotoVersionRowClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionRowPrivate DataImportsFSpotDbFSpotPhotoVersionRowPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE (data_imports_fspot_db_fspot_photo_versions_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, DataImportsFSpotDbFSpotPhotoVersionsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTable DataImportsFSpotDbFSpotPhotoVersionsTable;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTableClass DataImportsFSpotDbFSpotPhotoVersionsTableClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsTablePrivate DataImportsFSpotDbFSpotPhotoVersionsTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV0Behavior DataImportsFSpotDbFSpotPhotoVersionsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorPrivate DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV9Behavior DataImportsFSpotDbFSpotPhotoVersionsV9Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorPrivate DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV16Behavior DataImportsFSpotDbFSpotPhotoVersionsV16Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorPrivate DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV17Behavior DataImportsFSpotDbFSpotPhotoVersionsV17Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorPrivate DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR (data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV18Behavior DataImportsFSpotDbFSpotPhotoVersionsV18Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorPrivate DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorPrivate;
-
-struct _DataImportsFSpotDbFSpotPhotoVersionRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionRowPrivate * priv;
-	gint64 photo_id;
-	gint64 version_id;
-	gchar* name;
-	GFile* base_path;
-	gchar* filename;
-	gchar* md5_sum;
-	gboolean is_protected;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotDbFSpotPhotoVersionsV0Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV9Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV16Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV17Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV18Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_photo_version_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSION_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_new (void);
-DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_versions_table_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME "Photo_versions"
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-GQuark database_error_quark (void);
-GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error);
-gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-GType data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj);
-
-
-DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 368 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_version_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW);
-#line 375 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_version_row_class_init (DataImportsFSpotDbFSpotPhotoVersionRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_version_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_version_row_finalize;
-#line 384 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_version_row_instance_init (DataImportsFSpotDbFSpotPhotoVersionRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (self->name);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (self->base_path);
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (self->filename);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (self->md5_sum);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_version_row_parent_class)->finalize (obj);
-#line 406 "FSpotPhotoVersionsTable.c"
-}
-
-
-/**
- * The value object for the "photo_versions" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_version_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_version_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_version_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_version_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photo_version_row_type_id;
-		data_imports_fspot_db_fspot_photo_version_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_version_row_type_id__volatile, data_imports_fspot_db_fspot_photo_version_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_version_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-	DataImportsFSpotDbFSpotPhotoVersionsTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (db_behavior), NULL);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = db;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = db_behavior;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (_tmp1_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), _tmp3_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_tmp3_);
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 451 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_TABLE, db, db_behavior);
-#line 458 "FSpotPhotoVersionsTable.c"
-}
-
-
-GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error) {
-	GeeArrayList* result = NULL;
-	GeeArrayList* rows = NULL;
-	GeeArrayList* _tmp0_;
-	sqlite3_stmt* stmt = NULL;
-	gchar* column_list = NULL;
-	gchar* _tmp1_;
-	gchar* sql = NULL;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gint res = 0;
-	sqlite3* _tmp5_;
-	const gchar* _tmp6_;
-	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_;
-	gint _tmp9_;
-	sqlite3_stmt* _tmp14_;
-	gint64 _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	sqlite3_stmt* _tmp19_;
-	gint _tmp20_;
-	GError * _inner_error_ = NULL;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	rows = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_database_table_get_joined_column_list (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), FALSE);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	column_list = _tmp1_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = column_list;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_strdup_printf ("SELECT %s FROM %s WHERE photo_id=?", _tmp2_, _tmp3_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	sql = _tmp4_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->fspot_db;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = sql;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_prepare_v2 (_tmp5_, _tmp6_, -1, &_tmp7_, NULL);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	stmt = _tmp7_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	res = _tmp8_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = res;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp9_ != SQLITE_OK) {
-#line 520 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-		gchar* _tmp12_;
-		gint _tmp13_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp10_ = sql;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp11_ = g_strdup_printf ("Statement failed: %s", _tmp10_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp12_ = _tmp11_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp13_ = res;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		importable_database_table_throw_error (_tmp12_, _tmp13_, &_inner_error_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp12_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (sql);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (column_list);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_object_unref0 (rows);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				return NULL;
-#line 553 "FSpotPhotoVersionsTable.c"
-			} else {
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (sql);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (column_list);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_object_unref0 (rows);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				return NULL;
-#line 569 "FSpotPhotoVersionsTable.c"
-			}
-		}
-	}
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = photo_id;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_bind_int64 (_tmp14_, 1, _tmp15_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	res = _tmp16_;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = res;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp17_ != SQLITE_OK) {
-#line 585 "FSpotPhotoVersionsTable.c"
-		gint _tmp18_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp18_ = res;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		importable_database_table_throw_error ("Bind failed for photo_id", _tmp18_, &_inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_object_unref0 (rows);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				return NULL;
-#line 607 "FSpotPhotoVersionsTable.c"
-			} else {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				_g_object_unref0 (rows);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-				return NULL;
-#line 623 "FSpotPhotoVersionsTable.c"
-			}
-		}
-	}
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp19_ = stmt;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp20_ = sqlite3_step (_tmp19_);
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	res = _tmp20_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	while (TRUE) {
-#line 635 "FSpotPhotoVersionsTable.c"
-		gint _tmp21_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
-		sqlite3_stmt* _tmp23_;
-		gpointer _tmp24_ = NULL;
-		GeeArrayList* _tmp25_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_;
-		sqlite3_stmt* _tmp27_;
-		gint _tmp28_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_ = res;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		if (!(_tmp21_ == SQLITE_ROW)) {
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-			break;
-#line 651 "FSpotPhotoVersionsTable.c"
-		}
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp23_ = stmt;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_table_behavior_build_row (_tmp22_, _tmp23_, &_tmp24_, 0);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (row);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		row = _tmp24_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = rows;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = row;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp27_ = stmt;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp28_ = sqlite3_step (_tmp27_);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		res = _tmp28_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (row);
-#line 677 "FSpotPhotoVersionsTable.c"
-	}
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = rows;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (sql);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (column_list);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 689 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_table_class_init (DataImportsFSpotDbFSpotPhotoVersionsTableClass * klass) {
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_table_parent_class = g_type_class_peek_parent (klass);
-#line 696 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_table_instance_init (DataImportsFSpotDbFSpotPhotoVersionsTable * self) {
-}
-
-
-/**
- * This class represents the F-Spot photo_versions table.
- */
-GType data_imports_fspot_db_fspot_photo_versions_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photo_versions_table_type_id;
-		data_imports_fspot_db_fspot_photo_versions_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotPhotoVersionsTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_table_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self = NULL;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsV0Behavior*) g_object_new (object_type, NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 725 "FSpotPhotoVersionsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_new (void) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_v0_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR);
-#line 732 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 739 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 752 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_new ();
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance = _tmp1_;
-#line 760 "FSpotPhotoVersionsTable.c"
-	}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp3_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 770 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 786 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar** _tmp4_;
-	gchar** _tmp5_;
-	gint _tmp5__length1;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = g_strdup ("version_id");
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = g_strdup ("name");
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = g_strdup ("uri");
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_new0 (gchar*, 4 + 1);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_[0] = _tmp0_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_[1] = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_[2] = _tmp2_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_[3] = _tmp3_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _tmp4_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5__length1 = 4;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (result_length1) {
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*result_length1 = _tmp5__length1;
-#line 828 "FSpotPhotoVersionsTable.c"
-	}
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp5_;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 834 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
-	gchar* _tmp28_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_version_row_new ();
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_vala_row = _tmp0_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = _vala_row;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = stmt;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = offset;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _vala_row;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = stmt;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = offset;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_->version_id = _tmp8_;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = _vala_row;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp10_ = stmt;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp11_ = offset;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp12_ = sqlite3_column_text (_tmp10_, _tmp11_ + 2);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp9_->name);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_->name = _tmp13_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = offset;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_column_text (_tmp14_, _tmp15_ + 3);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = g_strdup (_tmp16_);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	full_path = _tmp17_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp18_ = full_path;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp18_ != NULL) {
-#line 922 "FSpotPhotoVersionsTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp19_;
-		GFile* _tmp20_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
-		GFile* _tmp22_;
-		GFile* _tmp23_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
-		GFile* _tmp25_;
-		gchar* _tmp26_;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp19_ = full_path;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp20_ = g_file_new_for_uri (_tmp19_);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		uri = _tmp20_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_ = _vala_row;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = uri;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp23_ = g_file_get_parent (_tmp22_);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_tmp21_->base_path);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_->base_path = _tmp23_;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_ = _vala_row;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = uri;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = g_file_get_basename (_tmp25_);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp24_->filename);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_->filename = _tmp26_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (uri);
-#line 960 "FSpotPhotoVersionsTable.c"
-	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_ = _vala_row;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp28_ = g_strdup ("");
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp27_->md5_sum);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_->md5_sum = _tmp28_;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp29_ = _vala_row;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp29_->is_protected = FALSE;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (full_path);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (row) {
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*row = _vala_row;
-#line 980 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 984 "FSpotPhotoVersionsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_class_init (DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass * klass) {
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize;
-#line 994 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row;
-#line 1007 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance_init (DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class)->finalize (obj);
-#line 1021 "FSpotPhotoVersionsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsV0BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_v0_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsV0Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionsV0Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_v0_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsV9Behavior*) g_object_new (object_type, NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 1045 "FSpotPhotoVersionsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_new (void) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_v9_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR);
-#line 1052 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1065 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_new ();
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance = _tmp1_;
-#line 1073 "FSpotPhotoVersionsTable.c"
-	}
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp3_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1083 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME);
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp0_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1099 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar** _tmp5_;
-	gchar** _tmp6_;
-	gint _tmp6__length1;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = g_strdup ("version_id");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = g_strdup ("name");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = g_strdup ("uri");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_strdup ("protected");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = g_new0 (gchar*, 5 + 1);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_[0] = _tmp0_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_[1] = _tmp1_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_[2] = _tmp2_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_[3] = _tmp3_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_[4] = _tmp4_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = _tmp5_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6__length1 = 5;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (result_length1) {
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*result_length1 = _tmp6__length1;
-#line 1146 "FSpotPhotoVersionsTable.c"
-	}
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp6_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1152 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
-	gchar* _tmp28_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
-	sqlite3_stmt* _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_version_row_new ();
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_vala_row = _tmp0_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = _vala_row;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = stmt;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = offset;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _vala_row;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = stmt;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = offset;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_->version_id = _tmp8_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = _vala_row;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp10_ = stmt;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp11_ = offset;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp12_ = sqlite3_column_text (_tmp10_, _tmp11_ + 2);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp9_->name);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_->name = _tmp13_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = offset;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_column_text (_tmp14_, _tmp15_ + 3);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = g_strdup (_tmp16_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	full_path = _tmp17_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp18_ = full_path;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp18_ != NULL) {
-#line 1243 "FSpotPhotoVersionsTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp19_;
-		GFile* _tmp20_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
-		GFile* _tmp22_;
-		GFile* _tmp23_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
-		GFile* _tmp25_;
-		gchar* _tmp26_;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp19_ = full_path;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp20_ = g_file_new_for_uri (_tmp19_);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		uri = _tmp20_;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_ = _vala_row;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = uri;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp23_ = g_file_get_parent (_tmp22_);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_tmp21_->base_path);
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_->base_path = _tmp23_;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_ = _vala_row;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = uri;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = g_file_get_basename (_tmp25_);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp24_->filename);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_->filename = _tmp26_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (uri);
-#line 1281 "FSpotPhotoVersionsTable.c"
-	}
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_ = _vala_row;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp28_ = g_strdup ("");
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp27_->md5_sum);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_->md5_sum = _tmp28_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp29_ = _vala_row;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp30_ = stmt;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_ = offset;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp32_ = sqlite3_column_int (_tmp30_, _tmp31_ + 4);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp29_->is_protected = _tmp32_ > 0;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (full_path);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (row) {
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*row = _vala_row;
-#line 1307 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1311 "FSpotPhotoVersionsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_class_init (DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass * klass) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize;
-#line 1321 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row;
-#line 1334 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance_init (DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class)->finalize (obj);
-#line 1348 "FSpotPhotoVersionsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsV9BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_v9_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsV9Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionsV9Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_v9_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self = NULL;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsV16Behavior*) g_object_new (object_type, NULL);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 1372 "FSpotPhotoVersionsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_new (void) {
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_v16_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR);
-#line 1379 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1392 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_new ();
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance = _tmp1_;
-#line 1400 "FSpotPhotoVersionsTable.c"
-	}
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp3_;
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1410 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp0_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1426 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar** _tmp6_;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = g_strdup ("version_id");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = g_strdup ("name");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = g_strdup ("uri");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_strdup ("md5_sum");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = g_strdup ("protected");
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = g_new0 (gchar*, 6 + 1);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[0] = _tmp0_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[1] = _tmp1_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[2] = _tmp2_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[3] = _tmp3_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[4] = _tmp4_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_[5] = _tmp5_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = _tmp6_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7__length1 = 6;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (result_length1) {
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*result_length1 = _tmp7__length1;
-#line 1478 "FSpotPhotoVersionsTable.c"
-	}
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp7_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1484 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	gint _tmp29_;
-	const gchar* _tmp30_;
-	gchar* _tmp31_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	gint _tmp34_;
-	gint _tmp35_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_version_row_new ();
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_vala_row = _tmp0_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = _vala_row;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = stmt;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = offset;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _vala_row;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = stmt;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = offset;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_->version_id = _tmp8_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = _vala_row;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp10_ = stmt;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp11_ = offset;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp12_ = sqlite3_column_text (_tmp10_, _tmp11_ + 2);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp9_->name);
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_->name = _tmp13_;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = offset;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_column_text (_tmp14_, _tmp15_ + 3);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = g_strdup (_tmp16_);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	full_path = _tmp17_;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp18_ = full_path;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp18_ != NULL) {
-#line 1578 "FSpotPhotoVersionsTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp19_;
-		GFile* _tmp20_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
-		GFile* _tmp22_;
-		GFile* _tmp23_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
-		GFile* _tmp25_;
-		gchar* _tmp26_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp19_ = full_path;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp20_ = g_file_new_for_uri (_tmp19_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		uri = _tmp20_;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_ = _vala_row;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = uri;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp23_ = g_file_get_parent (_tmp22_);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_tmp21_->base_path);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp21_->base_path = _tmp23_;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_ = _vala_row;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = uri;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = g_file_get_basename (_tmp25_);
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp24_->filename);
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_->filename = _tmp26_;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (uri);
-#line 1616 "FSpotPhotoVersionsTable.c"
-	}
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_ = _vala_row;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp28_ = stmt;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp29_ = offset;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp30_ = sqlite3_column_text (_tmp28_, _tmp29_ + 4);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_ = g_strdup (_tmp30_);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp27_->md5_sum);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp27_->md5_sum = _tmp31_;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp32_ = _vala_row;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp33_ = stmt;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp34_ = offset;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp35_ = sqlite3_column_int (_tmp33_, _tmp34_ + 5);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp32_->is_protected = _tmp35_ > 0;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (full_path);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (row) {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*row = _vala_row;
-#line 1648 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1652 "FSpotPhotoVersionsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_class_init (DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass * klass) {
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize;
-#line 1662 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row;
-#line 1675 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance_init (DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class)->finalize (obj);
-#line 1689 "FSpotPhotoVersionsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsV16BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_v16_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsV16Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionsV16Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_v16_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self = NULL;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsV17Behavior*) g_object_new (object_type, NULL);
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 1713 "FSpotPhotoVersionsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_new (void) {
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_v17_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR);
-#line 1720 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1733 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_new ();
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance = _tmp1_;
-#line 1741 "FSpotPhotoVersionsTable.c"
-	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp3_;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1751 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp0_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1767 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar** _tmp7_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = g_strdup ("version_id");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = g_strdup ("name");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = g_strdup ("base_uri");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_strdup ("filename");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = g_strdup ("md5_sum");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = g_strdup ("protected");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = g_new0 (gchar*, 7 + 1);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[0] = _tmp0_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[1] = _tmp1_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[2] = _tmp2_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[3] = _tmp3_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[4] = _tmp4_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[5] = _tmp5_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[6] = _tmp6_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = _tmp7_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8__length1 = 7;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (result_length1) {
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 1824 "FSpotPhotoVersionsTable.c"
-	}
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp8_;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 1830 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_;
-	gint _tmp19_;
-	const gchar* _tmp20_;
-	gchar* _tmp21_;
-	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	const gchar* _tmp34_;
-	gchar* _tmp35_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
-	sqlite3_stmt* _tmp37_;
-	gint _tmp38_;
-	gint _tmp39_;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_version_row_new ();
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_vala_row = _tmp0_;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = _vala_row;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = stmt;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = offset;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _vala_row;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = stmt;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = offset;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_->version_id = _tmp8_;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = _vala_row;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp10_ = stmt;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp11_ = offset;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp12_ = sqlite3_column_text (_tmp10_, _tmp11_ + 2);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp9_->name);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_->name = _tmp13_;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = offset;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_column_text (_tmp14_, _tmp15_ + 3);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = g_strdup (_tmp16_);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	base_path = _tmp17_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp18_ = stmt;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp19_ = offset;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp20_ = sqlite3_column_text (_tmp18_, _tmp19_ + 4);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp21_ = g_strdup (_tmp20_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	filename = _tmp21_;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp23_ = base_path;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp23_ != NULL) {
-#line 1940 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_ = filename;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = _tmp24_ != NULL;
-#line 1946 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = FALSE;
-#line 1950 "FSpotPhotoVersionsTable.c"
-	}
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp22_) {
-#line 1954 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
-		const gchar* _tmp26_;
-		GFile* _tmp27_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
-		const gchar* _tmp29_;
-		gchar* _tmp30_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = _vala_row;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = base_path;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp27_ = g_file_new_for_uri (_tmp26_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_tmp25_->base_path);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_->base_path = _tmp27_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp28_ = _vala_row;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp29_ = filename;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp30_ = g_strdup (_tmp29_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp28_->filename);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp28_->filename = _tmp30_;
-#line 1981 "FSpotPhotoVersionsTable.c"
-	}
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_ = _vala_row;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp32_ = stmt;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp33_ = offset;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp34_ = sqlite3_column_text (_tmp32_, _tmp33_ + 5);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp35_ = g_strdup (_tmp34_);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp31_->md5_sum);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_->md5_sum = _tmp35_;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp36_ = _vala_row;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp37_ = stmt;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp38_ = offset;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp39_ = sqlite3_column_int (_tmp37_, _tmp38_ + 6);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp36_->is_protected = _tmp39_ > 0;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (filename);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (base_path);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (row) {
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*row = _vala_row;
-#line 2015 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 2019 "FSpotPhotoVersionsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_class_init (DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass * klass) {
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize;
-#line 2029 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row;
-#line 2042 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance_init (DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class)->finalize (obj);
-#line 2056 "FSpotPhotoVersionsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsV17BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_v17_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsV17Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionsV17Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_v17_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self = NULL;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoVersionsV18Behavior*) g_object_new (object_type, NULL);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return self;
-#line 2080 "FSpotPhotoVersionsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_new (void) {
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return data_imports_fspot_db_fspot_photo_versions_v18_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR);
-#line 2087 "FSpotPhotoVersionsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_;
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 2100 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_new ();
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance = _tmp1_;
-#line 2108 "FSpotPhotoVersionsTable.c"
-	}
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp3_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 2118 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_TABLE_TABLE_NAME);
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp0_;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 2134 "FSpotPhotoVersionsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar** _tmp7_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = g_strdup ("photo_id");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = g_strdup ("version_id");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = g_strdup ("name");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = g_strdup ("base_uri");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = g_strdup ("filename");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = g_strdup ("import_md5");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = g_strdup ("protected");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = g_new0 (gchar*, 7 + 1);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[0] = _tmp0_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[1] = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[2] = _tmp2_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[3] = _tmp3_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[4] = _tmp4_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[5] = _tmp5_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_[6] = _tmp6_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = _tmp7_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8__length1 = 7;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (result_length1) {
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 2191 "FSpotPhotoVersionsTable.c"
-	}
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	result = _tmp8_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	return result;
-#line 2197 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
-	sqlite3_stmt* _tmp10_;
-	gint _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_;
-	gint _tmp15_;
-	const gchar* _tmp16_;
-	gchar* _tmp17_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_;
-	gint _tmp19_;
-	const gchar* _tmp20_;
-	gchar* _tmp21_;
-	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	const gchar* _tmp34_;
-	gchar* _tmp35_;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
-	sqlite3_stmt* _tmp37_;
-	gint _tmp38_;
-	gint _tmp39_;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_version_row_new ();
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_vala_row = _tmp0_;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_ = _vala_row;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp2_ = stmt;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp3_ = offset;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_ = _vala_row;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp6_ = stmt;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp7_ = offset;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp5_->version_id = _tmp8_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_ = _vala_row;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp10_ = stmt;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp11_ = offset;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp12_ = sqlite3_column_text (_tmp10_, _tmp11_ + 2);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp13_ = g_strdup (_tmp12_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp9_->name);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp9_->name = _tmp13_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp14_ = stmt;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp15_ = offset;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp16_ = sqlite3_column_text (_tmp14_, _tmp15_ + 3);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp17_ = g_strdup (_tmp16_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	base_path = _tmp17_;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp18_ = stmt;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp19_ = offset;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp20_ = sqlite3_column_text (_tmp18_, _tmp19_ + 4);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp21_ = g_strdup (_tmp20_);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	filename = _tmp21_;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp23_ = base_path;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp23_ != NULL) {
-#line 2307 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp24_ = filename;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = _tmp24_ != NULL;
-#line 2313 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp22_ = FALSE;
-#line 2317 "FSpotPhotoVersionsTable.c"
-	}
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (_tmp22_) {
-#line 2321 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
-		const gchar* _tmp26_;
-		GFile* _tmp27_;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
-		const gchar* _tmp29_;
-		gchar* _tmp30_;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_ = _vala_row;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp26_ = base_path;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp27_ = g_file_new_for_uri (_tmp26_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_tmp25_->base_path);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp25_->base_path = _tmp27_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp28_ = _vala_row;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp29_ = filename;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp30_ = g_strdup (_tmp29_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_free0 (_tmp28_->filename);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_tmp28_->filename = _tmp30_;
-#line 2348 "FSpotPhotoVersionsTable.c"
-	}
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_ = _vala_row;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp32_ = stmt;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp33_ = offset;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp34_ = sqlite3_column_text (_tmp32_, _tmp33_ + 5);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp35_ = g_strdup (_tmp34_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (_tmp31_->md5_sum);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp31_->md5_sum = _tmp35_;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp36_ = _vala_row;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp37_ = stmt;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp38_ = offset;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp39_ = sqlite3_column_int (_tmp37_, _tmp38_ + 6);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_tmp36_->is_protected = _tmp39_ > 0;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (filename);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	_g_free0 (base_path);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	if (row) {
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		*row = _vala_row;
-#line 2382 "FSpotPhotoVersionsTable.c"
-	} else {
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 2386 "FSpotPhotoVersionsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_class_init (DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass * klass) {
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize;
-#line 2396 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row;
-#line 2409 "FSpotPhotoVersionsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance_init (DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class)->finalize (obj);
-#line 2423 "FSpotPhotoVersionsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoVersionsV18BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_versions_v18_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoVersionsV18Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id;
-		data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoVersionsV18Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id__volatile, data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_versions_v18_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
deleted file mode 100644
index 4c500fe..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photo_versions" table, representing a single database row.
- */
-public class FSpotPhotoVersionRow : Object {
-    public int64 photo_id;
-    public int64 version_id;
-    public string name;
-    public File? base_path;
-    public string? filename;
-    public string md5_sum;
-    public bool is_protected;
-}
-
-/**
- * This class represents the F-Spot photo_versions table.
- */
-public class FSpotPhotoVersionsTable : FSpotDatabaseTable<FSpotPhotoVersionRow> {
-    public const string TABLE_NAME = "Photo_versions";
-
-    public FSpotPhotoVersionsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base(db);
-        set_behavior(db_behavior.get_photo_versions_behavior());
-    }
-    
-    public Gee.ArrayList<FSpotPhotoVersionRow> get_by_photo_id(int64 photo_id) throws DatabaseError {
-        Gee.ArrayList<FSpotPhotoVersionRow> rows = new Gee.ArrayList<FSpotPhotoVersionRow?>();
-        
-        Sqlite.Statement stmt;
-        
-        string column_list = get_joined_column_list();
-        string sql = "SELECT %s FROM %s WHERE photo_id=?".printf(
-            column_list, table_name
-        );
-
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.bind_int64(1, photo_id);
-        if (res != Sqlite.OK)
-            throw_error("Bind failed for photo_id", res);
-        
-        res = stmt.step();
-        while (res == Sqlite.ROW) {
-            FSpotPhotoVersionRow row;
-            behavior.build_row(stmt, out row);
-            rows.add(row);
-            res = stmt.step();
-        }
-        
-        return rows;
-    }
-}
-
-// Photo_versions table behavior for v0-8
-// Note: there is a change in the URI format in version 8 but the File.new_for_uri
-// constructor should be able to deal with the variation, so the v8 behavior should
-// be handled in a way identical to v0-7
-public class FSpotPhotoVersionsV0Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV0Behavior instance;
-    
-    private FSpotPhotoVersionsV0Behavior() {
-    }
-    
-    public static FSpotPhotoVersionsV0Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV0Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }    
-    
-    public string[] list_columns() {
-        return { "photo_id", "version_id", "name", "uri" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.version_id = stmt.column_int64(offset + 1);
-        row.name = stmt.column_text(offset + 2);
-
-        string? full_path = stmt.column_text(offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.md5_sum = "";
-        row.is_protected = false;
-    }
-}
-
-// Photo_versions table behavior for v9-15
-// add protected field
-public class FSpotPhotoVersionsV9Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV9Behavior instance;
-    
-    private FSpotPhotoVersionsV9Behavior() {
-    }
-    
-    public static FSpotPhotoVersionsV9Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV9Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }    
-    
-    public string[] list_columns() {
-        return { "photo_id", "version_id", "name", "uri",
-            "protected" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.version_id = stmt.column_int64(offset + 1);
-        row.name = stmt.column_text(offset + 2);
-
-        string? full_path = stmt.column_text(offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.md5_sum = "";
-        row.is_protected = (stmt.column_int(offset + 4) > 0);
-    }
-}
-
-// Photo_versions table behavior for v16
-// add md5_sum in photo_versions
-public class FSpotPhotoVersionsV16Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV16Behavior instance;
-    
-    private FSpotPhotoVersionsV16Behavior() {
-    }
-    
-    public static FSpotPhotoVersionsV16Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV16Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }    
-    
-    public string[] list_columns() {
-        return { "photo_id", "version_id", "name", "uri",
-            "md5_sum", "protected" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.version_id = stmt.column_int64(offset + 1);
-        row.name = stmt.column_text(offset + 2);
-
-        string? full_path = stmt.column_text(offset + 3);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.md5_sum = stmt.column_text(offset + 4);
-        row.is_protected = (stmt.column_int(offset + 5) > 0);
-    }
-}
-
-// Photo_versions table behavior for v17
-// v17 split the URI into base_uri and filename (reverting back to the original
-// design introduced in v0, albeit with a URI rather than a file system path)
-public class FSpotPhotoVersionsV17Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV17Behavior instance;
-    
-    private FSpotPhotoVersionsV17Behavior() {
-    }
-    
-    public static FSpotPhotoVersionsV17Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV17Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }    
-    
-    public string[] list_columns() {
-        return { "photo_id", "version_id", "name", "base_uri", "filename",
-            "md5_sum", "protected" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.version_id = stmt.column_int64(offset + 1);
-        row.name = stmt.column_text(offset + 2);
-        
-        string? base_path = stmt.column_text(offset + 3);
-        string? filename = stmt.column_text(offset + 4);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.md5_sum = stmt.column_text(offset + 5);
-        row.is_protected = (stmt.column_int(offset + 6) > 0);
-    }
-}
-
-// Photo_versions table behavior for v18
-// md5_sum renamed import_md5
-public class FSpotPhotoVersionsV18Behavior : FSpotTableBehavior<FSpotPhotoVersionRow>, Object {
-    private static FSpotPhotoVersionsV18Behavior instance;
-    
-    private FSpotPhotoVersionsV18Behavior() {
-    }
-    
-    public static FSpotPhotoVersionsV18Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotoVersionsV18Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotoVersionsTable.TABLE_NAME;
-    }    
-    
-    public string[] list_columns() {
-        return { "photo_id", "version_id", "name", "base_uri", "filename",
-            "import_md5", "protected" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoVersionRow row, int offset = 0) {
-        row = new FSpotPhotoVersionRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.version_id = stmt.column_int64(offset + 1);
-        row.name = stmt.column_text(offset + 2);
-        
-        string? base_path = stmt.column_text(offset + 3);
-        string? filename = stmt.column_text(offset + 4);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.md5_sum = stmt.column_text(offset + 5);
-        row.is_protected = (stmt.column_int(offset + 6) > 0);
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c
deleted file mode 100644
index 4eb3d76..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.c
+++ /dev/null
@@ -1,3295 +0,0 @@
-/* FSpotPhotosTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotPhotosTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <time.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <gee.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW (data_imports_fspot_db_fspot_photo_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoRow DataImportsFSpotDbFSpotPhotoRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoRowClass DataImportsFSpotDbFSpotPhotoRowClass;
-typedef struct _DataImportsFSpotDbFSpotPhotoRowPrivate DataImportsFSpotDbFSpotPhotoRowPrivate;
-#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_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE (data_imports_fspot_db_fspot_photos_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, DataImportsFSpotDbFSpotPhotosTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosTable DataImportsFSpotDbFSpotPhotosTable;
-typedef struct _DataImportsFSpotDbFSpotPhotosTableClass DataImportsFSpotDbFSpotPhotosTableClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosTablePrivate DataImportsFSpotDbFSpotPhotosTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR (data_imports_fspot_db_fspot_photos_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV0Behavior DataImportsFSpotDbFSpotPhotosV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV0BehaviorClass DataImportsFSpotDbFSpotPhotosV0BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV0BehaviorPrivate DataImportsFSpotDbFSpotPhotosV0BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR (data_imports_fspot_db_fspot_photos_v5_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV5Behavior DataImportsFSpotDbFSpotPhotosV5Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV5BehaviorClass DataImportsFSpotDbFSpotPhotosV5BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV5BehaviorPrivate DataImportsFSpotDbFSpotPhotosV5BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR (data_imports_fspot_db_fspot_photos_v7_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V7_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V7_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV7Behavior DataImportsFSpotDbFSpotPhotosV7Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV7BehaviorClass DataImportsFSpotDbFSpotPhotosV7BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV7BehaviorPrivate DataImportsFSpotDbFSpotPhotosV7BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR (data_imports_fspot_db_fspot_photos_v11_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V11_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V11_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV11Behavior DataImportsFSpotDbFSpotPhotosV11Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV11BehaviorClass DataImportsFSpotDbFSpotPhotosV11BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV11BehaviorPrivate DataImportsFSpotDbFSpotPhotosV11BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR (data_imports_fspot_db_fspot_photos_v16_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V16_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V16_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV16Behavior DataImportsFSpotDbFSpotPhotosV16Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV16BehaviorClass DataImportsFSpotDbFSpotPhotosV16BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV16BehaviorPrivate DataImportsFSpotDbFSpotPhotosV16BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR (data_imports_fspot_db_fspot_photos_v17_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V17_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V17_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV17Behavior DataImportsFSpotDbFSpotPhotosV17Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV17BehaviorClass DataImportsFSpotDbFSpotPhotosV17BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV17BehaviorPrivate DataImportsFSpotDbFSpotPhotosV17BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR (data_imports_fspot_db_fspot_photos_v18_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V18_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_V18_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotosV18Behavior DataImportsFSpotDbFSpotPhotosV18Behavior;
-typedef struct _DataImportsFSpotDbFSpotPhotosV18BehaviorClass DataImportsFSpotDbFSpotPhotosV18BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotPhotosV18BehaviorPrivate DataImportsFSpotDbFSpotPhotosV18BehaviorPrivate;
-
-struct _DataImportsFSpotDbFSpotPhotoRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotoRowPrivate * priv;
-	gint64 photo_id;
-	time_t time;
-	GFile* base_path;
-	gchar* filename;
-	gchar* description;
-	gint64 roll_id;
-	gint64 default_version_id;
-	gint rating;
-	gchar* md5_sum;
-};
-
-struct _DataImportsFSpotDbFSpotPhotoRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotPhotosTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotDbFSpotPhotosV0Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV0BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV0BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV5Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV5BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV5BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV7Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV7BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV7BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV11Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV11BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV11BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV16Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV16BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV16BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV17Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV17BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV17BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV18Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotPhotosV18BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotPhotosV18BehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_photo_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v0_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v5_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v7_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v11_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v16_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v17_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_photos_v18_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance;
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_new (void);
-DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photos_table_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME "Photos"
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-GQuark database_error_quark (void);
-GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error);
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V0_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-#define DATA_IMPORTS_FSPOT_DB_INVALID_ID ((gint64) -1)
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_new (void);
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj);
-
-
-DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotoRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotoRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 441 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photo_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW);
-#line 448 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_row_class_init (DataImportsFSpotDbFSpotPhotoRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photo_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photo_row_finalize;
-#line 457 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photo_row_instance_init (DataImportsFSpotDbFSpotPhotoRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotoRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (self->base_path);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (self->filename);
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (self->description);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (self->md5_sum);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photo_row_parent_class)->finalize (obj);
-#line 479 "FSpotPhotosTable.c"
-}
-
-
-/**
- * The value object for the "photos" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_photo_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photo_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photo_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotoRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photo_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotoRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photo_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photo_row_type_id;
-		data_imports_fspot_db_fspot_photo_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotoRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photo_row_type_id__volatile, data_imports_fspot_db_fspot_photo_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_photo_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-	DataImportsFSpotDbFSpotPhotosTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (db_behavior), NULL);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = db;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = db_behavior;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (_tmp1_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _tmp2_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), _tmp3_);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_tmp3_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 524 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_TABLE, db, db_behavior);
-#line 531 "FSpotPhotosTable.c"
-}
-
-
-GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error) {
-	GeeArrayList* result = NULL;
-	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp0_;
-	sqlite3_stmt* stmt = NULL;
-	gint res = 0;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_;
-	GError * _inner_error_ = NULL;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE (self), NULL);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	all = _tmp0_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_table_select_all (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), &_tmp1_, &_inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	stmt = _tmp1_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	res = _tmp2_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			g_propagate_error (error, _inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			_g_object_unref0 (all);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			return NULL;
-#line 570 "FSpotPhotosTable.c"
-		} else {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			_sqlite3_finalize0 (stmt);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			_g_object_unref0 (all);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			g_clear_error (&_inner_error_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			return NULL;
-#line 582 "FSpotPhotosTable.c"
-		}
-	}
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	while (TRUE) {
-#line 587 "FSpotPhotosTable.c"
-		gint _tmp3_;
-		DataImportsFSpotDbFSpotPhotoRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp4_;
-		gpointer _tmp5_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
-		gint _tmp7_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp3_ = res;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		if (!(_tmp3_ == SQLITE_ROW)) {
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-			break;
-#line 600 "FSpotPhotosTable.c"
-		}
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_table_behavior_build_row (_tmp4_, stmt, &_tmp5_, 0);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (row);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		row = _tmp5_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp6_ = row;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (all, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp7_ = sqlite3_step (stmt);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		res = _tmp7_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (row);
-#line 620 "FSpotPhotosTable.c"
-	}
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = all;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 628 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_table_class_init (DataImportsFSpotDbFSpotPhotosTableClass * klass) {
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_table_parent_class = g_type_class_peek_parent (klass);
-#line 635 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_table_instance_init (DataImportsFSpotDbFSpotPhotosTable * self) {
-}
-
-
-/**
- * This class represents the F-Spot photos table.
- */
-GType data_imports_fspot_db_fspot_photos_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_photos_table_type_id;
-		data_imports_fspot_db_fspot_photos_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotPhotosTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_table_type_id__volatile, data_imports_fspot_db_fspot_photos_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior * self = NULL;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV0Behavior*) g_object_new (object_type, NULL);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 664 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_new (void) {
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v0_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR);
-#line 671 "FSpotPhotosTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 678 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v0_behavior_instance;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 691 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v0_behavior_new ();
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v0_behavior_instance);
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v0_behavior_instance = _tmp1_;
-#line 699 "FSpotPhotosTable.c"
-	}
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v0_behavior_instance;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 709 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 725 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar** _tmp6_;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("directory_path");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("name");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("description");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("default_version_id");
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_new0 (gchar*, 6 + 1);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[0] = _tmp0_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[1] = _tmp1_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[2] = _tmp2_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[3] = _tmp3_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[4] = _tmp4_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[5] = _tmp5_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = _tmp6_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7__length1 = 6;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp7__length1;
-#line 777 "FSpotPhotosTable.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp7_;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 783 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_;
-	gint _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	gint _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp32_;
-	sqlite3_stmt* _tmp33_;
-	gint _tmp34_;
-	gint64 _tmp35_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp37_;
-	gchar* _tmp38_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	base_path = _tmp12_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = stmt;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp14_ = offset;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp15_ = sqlite3_column_text (_tmp13_, _tmp14_ + 3);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	filename = _tmp16_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp18_ = base_path;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp18_ != NULL) {
-#line 878 "FSpotPhotosTable.c"
-		const gchar* _tmp19_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = filename;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = _tmp19_ != NULL;
-#line 884 "FSpotPhotosTable.c"
-	} else {
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = FALSE;
-#line 888 "FSpotPhotosTable.c"
-	}
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp17_) {
-#line 892 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
-		const gchar* _tmp21_;
-		GFile* _tmp22_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
-		const gchar* _tmp24_;
-		gchar* _tmp25_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = _vala_row;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = base_path;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp20_->base_path);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_->base_path = _tmp22_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_ = _vala_row;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp24_ = filename;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp25_ = g_strdup (_tmp24_);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp23_->filename);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_->filename = _tmp25_;
-#line 919 "FSpotPhotosTable.c"
-	}
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = _vala_row;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = stmt;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = offset;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = sqlite3_column_text (_tmp27_, _tmp28_ + 4);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = g_strdup (_tmp29_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp26_->description);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_->description = _tmp30_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->roll_id = DATA_IMPORTS_FSPOT_DB_INVALID_ID;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = _vala_row;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = stmt;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = offset;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = sqlite3_column_int64 (_tmp33_, _tmp34_ + 5);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_->default_version_id = _tmp35_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = _vala_row;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_->rating = 0;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = _vala_row;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = g_strdup ("");
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp37_->md5_sum);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_->md5_sum = _tmp38_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (filename);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (base_path);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 969 "FSpotPhotosTable.c"
-	} else {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 973 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v0_behavior_class_init (DataImportsFSpotDbFSpotPhotosV0BehaviorClass * klass) {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v0_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v0_behavior_finalize;
-#line 983 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row;
-#line 996 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v0_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV0Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v0_behavior_parent_class)->finalize (obj);
-#line 1010 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v0_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v0_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV0BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v0_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV0Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v0_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v0_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v0_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV0Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v0_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v0_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v0_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v0_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior * self = NULL;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV5Behavior*) g_object_new (object_type, NULL);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 1034 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_new (void) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v5_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR);
-#line 1041 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v5_behavior_instance;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1054 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v5_behavior_new ();
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v5_behavior_instance);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v5_behavior_instance = _tmp1_;
-#line 1062 "FSpotPhotosTable.c"
-	}
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v5_behavior_instance;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1072 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1088 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar** _tmp7_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("directory_path");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("name");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("description");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("roll_id");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_strdup ("default_version_id");
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = g_new0 (gchar*, 7 + 1);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[0] = _tmp0_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[1] = _tmp1_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[2] = _tmp2_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[3] = _tmp3_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[4] = _tmp4_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[5] = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[6] = _tmp6_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = _tmp7_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8__length1 = 7;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 1145 "FSpotPhotosTable.c"
-	}
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp8_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1151 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_;
-	gint _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	gint _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	gint _tmp37_;
-	gint64 _tmp38_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp40_;
-	gchar* _tmp41_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	base_path = _tmp12_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = stmt;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp14_ = offset;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp15_ = sqlite3_column_text (_tmp13_, _tmp14_ + 3);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	filename = _tmp16_;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp18_ = base_path;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp18_ != NULL) {
-#line 1249 "FSpotPhotosTable.c"
-		const gchar* _tmp19_;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = filename;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = _tmp19_ != NULL;
-#line 1255 "FSpotPhotosTable.c"
-	} else {
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = FALSE;
-#line 1259 "FSpotPhotosTable.c"
-	}
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp17_) {
-#line 1263 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
-		const gchar* _tmp21_;
-		GFile* _tmp22_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
-		const gchar* _tmp24_;
-		gchar* _tmp25_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = _vala_row;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = base_path;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp20_->base_path);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_->base_path = _tmp22_;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_ = _vala_row;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp24_ = filename;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp25_ = g_strdup (_tmp24_);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp23_->filename);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_->filename = _tmp25_;
-#line 1290 "FSpotPhotosTable.c"
-	}
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = _vala_row;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = stmt;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = offset;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = sqlite3_column_text (_tmp27_, _tmp28_ + 4);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = g_strdup (_tmp29_);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp26_->description);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_->description = _tmp30_;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->roll_id = _tmp34_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = stmt;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = offset;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = sqlite3_column_int64 (_tmp36_, _tmp37_ + 6);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->default_version_id = _tmp38_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_ = _vala_row;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_->rating = 0;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_ = _vala_row;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp41_ = g_strdup ("");
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp40_->md5_sum);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_->md5_sum = _tmp41_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (filename);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (base_path);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 1346 "FSpotPhotosTable.c"
-	} else {
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1350 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v5_behavior_class_init (DataImportsFSpotDbFSpotPhotosV5BehaviorClass * klass) {
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v5_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v5_behavior_finalize;
-#line 1360 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row;
-#line 1373 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v5_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV5Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v5_behavior_parent_class)->finalize (obj);
-#line 1387 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v5_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v5_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV5BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v5_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV5Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v5_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v5_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v5_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV5Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v5_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v5_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v5_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v5_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior * self = NULL;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV7Behavior*) g_object_new (object_type, NULL);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 1411 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_new (void) {
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v7_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR);
-#line 1418 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v7_behavior_instance;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1431 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v7_behavior_new ();
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v7_behavior_instance);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v7_behavior_instance = _tmp1_;
-#line 1439 "FSpotPhotosTable.c"
-	}
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v7_behavior_instance;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1449 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1465 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar** _tmp6_;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("uri");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("description");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("roll_id");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("default_version_id");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_new0 (gchar*, 6 + 1);
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[0] = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[1] = _tmp1_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[2] = _tmp2_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[3] = _tmp3_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[4] = _tmp4_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_[5] = _tmp5_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = _tmp6_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7__length1 = 6;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp7__length1;
-#line 1517 "FSpotPhotosTable.c"
-	}
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp7_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1523 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	const gchar* _tmp13_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	gint _tmp24_;
-	const gchar* _tmp25_;
-	gchar* _tmp26_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	gint _tmp29_;
-	gint64 _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
-	gchar* _tmp37_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	full_path = _tmp12_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = full_path;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp13_ != NULL) {
-#line 1605 "FSpotPhotosTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp14_;
-		GFile* _tmp15_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
-		GFile* _tmp17_;
-		GFile* _tmp18_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
-		GFile* _tmp20_;
-		gchar* _tmp21_;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp14_ = full_path;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp15_ = g_file_new_for_uri (_tmp14_);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		uri = _tmp15_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_ = _vala_row;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = uri;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp18_ = g_file_get_parent (_tmp17_);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp16_->base_path);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_->base_path = _tmp18_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = _vala_row;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = uri;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = g_file_get_basename (_tmp20_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp19_->filename);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_->filename = _tmp21_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (uri);
-#line 1643 "FSpotPhotosTable.c"
-	}
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_ = _vala_row;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp23_ = stmt;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp24_ = offset;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp25_ = sqlite3_column_text (_tmp23_, _tmp24_ + 3);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = g_strdup (_tmp25_);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp22_->description);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_->description = _tmp26_;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = _vala_row;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = stmt;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = offset;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = sqlite3_column_int64 (_tmp28_, _tmp29_ + 4);
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_->roll_id = _tmp30_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->default_version_id = _tmp34_;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->rating = 0;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = _vala_row;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = g_strdup ("");
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp36_->md5_sum);
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_->md5_sum = _tmp37_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (full_path);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 1697 "FSpotPhotosTable.c"
-	} else {
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1701 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v7_behavior_class_init (DataImportsFSpotDbFSpotPhotosV7BehaviorClass * klass) {
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v7_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v7_behavior_finalize;
-#line 1711 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row;
-#line 1724 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v7_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV7Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v7_behavior_parent_class)->finalize (obj);
-#line 1738 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v7_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v7_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV7BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v7_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV7Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v7_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v7_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v7_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV7Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v7_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v7_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v7_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v7_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior * self = NULL;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV11Behavior*) g_object_new (object_type, NULL);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 1762 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_new (void) {
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v11_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR);
-#line 1769 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v11_behavior_instance;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 1782 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v11_behavior_new ();
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v11_behavior_instance);
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v11_behavior_instance = _tmp1_;
-#line 1790 "FSpotPhotosTable.c"
-	}
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v11_behavior_instance;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1800 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1816 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar** _tmp7_;
-	gchar** _tmp8_;
-	gint _tmp8__length1;
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("uri");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("description");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("roll_id");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("default_version_id");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_strdup ("rating");
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = g_new0 (gchar*, 7 + 1);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[0] = _tmp0_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[1] = _tmp1_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[2] = _tmp2_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[3] = _tmp3_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[4] = _tmp4_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[5] = _tmp5_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_[6] = _tmp6_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = _tmp7_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8__length1 = 7;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp8__length1;
-#line 1873 "FSpotPhotosTable.c"
-	}
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp8_;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 1879 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	const gchar* _tmp13_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	gint _tmp24_;
-	const gchar* _tmp25_;
-	gchar* _tmp26_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	gint _tmp29_;
-	gint64 _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	gint _tmp37_;
-	gint _tmp38_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
-	gchar* _tmp40_;
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	full_path = _tmp12_;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = full_path;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp13_ != NULL) {
-#line 1964 "FSpotPhotosTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp14_;
-		GFile* _tmp15_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
-		GFile* _tmp17_;
-		GFile* _tmp18_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
-		GFile* _tmp20_;
-		gchar* _tmp21_;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp14_ = full_path;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp15_ = g_file_new_for_uri (_tmp14_);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		uri = _tmp15_;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_ = _vala_row;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = uri;
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp18_ = g_file_get_parent (_tmp17_);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp16_->base_path);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_->base_path = _tmp18_;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = _vala_row;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = uri;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = g_file_get_basename (_tmp20_);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp19_->filename);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_->filename = _tmp21_;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (uri);
-#line 2002 "FSpotPhotosTable.c"
-	}
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_ = _vala_row;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp23_ = stmt;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp24_ = offset;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp25_ = sqlite3_column_text (_tmp23_, _tmp24_ + 3);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = g_strdup (_tmp25_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp22_->description);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_->description = _tmp26_;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = _vala_row;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = stmt;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = offset;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = sqlite3_column_int64 (_tmp28_, _tmp29_ + 4);
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_->roll_id = _tmp30_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->default_version_id = _tmp34_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = stmt;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = offset;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = sqlite3_column_int (_tmp36_, _tmp37_ + 6);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->rating = _tmp38_;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_ = _vala_row;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_ = g_strdup ("");
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp39_->md5_sum);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_->md5_sum = _tmp40_;
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (full_path);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 2062 "FSpotPhotosTable.c"
-	} else {
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 2066 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v11_behavior_class_init (DataImportsFSpotDbFSpotPhotosV11BehaviorClass * klass) {
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v11_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v11_behavior_finalize;
-#line 2076 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row;
-#line 2089 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v11_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV11Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v11_behavior_parent_class)->finalize (obj);
-#line 2103 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v11_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v11_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV11BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v11_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV11Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v11_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v11_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v11_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV11Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v11_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v11_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v11_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v11_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior * self = NULL;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV16Behavior*) g_object_new (object_type, NULL);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 2127 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_new (void) {
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v16_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR);
-#line 2134 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v16_behavior_instance;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 2147 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v16_behavior_new ();
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v16_behavior_instance);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v16_behavior_instance = _tmp1_;
-#line 2155 "FSpotPhotosTable.c"
-	}
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v16_behavior_instance;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2165 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2181 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar** _tmp8_;
-	gchar** _tmp9_;
-	gint _tmp9__length1;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("uri");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("description");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("roll_id");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("default_version_id");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_strdup ("rating");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = g_strdup ("md5_sum");
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = g_new0 (gchar*, 8 + 1);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[0] = _tmp0_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[1] = _tmp1_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[2] = _tmp2_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[3] = _tmp3_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[4] = _tmp4_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[5] = _tmp5_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[6] = _tmp6_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[7] = _tmp7_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = _tmp8_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9__length1 = 8;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp9__length1;
-#line 2243 "FSpotPhotosTable.c"
-	}
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp9_;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2249 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	const gchar* _tmp13_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
-	sqlite3_stmt* _tmp23_;
-	gint _tmp24_;
-	const gchar* _tmp25_;
-	gchar* _tmp26_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
-	sqlite3_stmt* _tmp28_;
-	gint _tmp29_;
-	gint64 _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	gint _tmp37_;
-	gint _tmp38_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
-	sqlite3_stmt* _tmp40_;
-	gint _tmp41_;
-	const gchar* _tmp42_;
-	gchar* _tmp43_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	full_path = _tmp12_;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = full_path;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp13_ != NULL) {
-#line 2337 "FSpotPhotosTable.c"
-		GFile* uri = NULL;
-		const gchar* _tmp14_;
-		GFile* _tmp15_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
-		GFile* _tmp17_;
-		GFile* _tmp18_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
-		GFile* _tmp20_;
-		gchar* _tmp21_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp14_ = full_path;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp15_ = g_file_new_for_uri (_tmp14_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		uri = _tmp15_;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_ = _vala_row;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = uri;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp18_ = g_file_get_parent (_tmp17_);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp16_->base_path);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp16_->base_path = _tmp18_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = _vala_row;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = uri;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = g_file_get_basename (_tmp20_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp19_->filename);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_->filename = _tmp21_;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (uri);
-#line 2375 "FSpotPhotosTable.c"
-	}
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_ = _vala_row;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp23_ = stmt;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp24_ = offset;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp25_ = sqlite3_column_text (_tmp23_, _tmp24_ + 3);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = g_strdup (_tmp25_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp22_->description);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp22_->description = _tmp26_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = _vala_row;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = stmt;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = offset;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = sqlite3_column_int64 (_tmp28_, _tmp29_ + 4);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_->roll_id = _tmp30_;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->default_version_id = _tmp34_;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = stmt;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = offset;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = sqlite3_column_int (_tmp36_, _tmp37_ + 6);
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->rating = _tmp38_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_ = _vala_row;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_ = stmt;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp41_ = offset;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp42_ = sqlite3_column_text (_tmp40_, _tmp41_ + 7);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp43_ = g_strdup (_tmp42_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp39_->md5_sum);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_->md5_sum = _tmp43_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (full_path);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 2441 "FSpotPhotosTable.c"
-	} else {
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 2445 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v16_behavior_class_init (DataImportsFSpotDbFSpotPhotosV16BehaviorClass * klass) {
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v16_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v16_behavior_finalize;
-#line 2455 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row;
-#line 2468 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v16_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV16Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v16_behavior_parent_class)->finalize (obj);
-#line 2482 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v16_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v16_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV16BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v16_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV16Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v16_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v16_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v16_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV16Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v16_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v16_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v16_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v16_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior * self = NULL;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV17Behavior*) g_object_new (object_type, NULL);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 2506 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_new (void) {
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v17_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR);
-#line 2513 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v17_behavior_instance;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 2526 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v17_behavior_new ();
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v17_behavior_instance);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v17_behavior_instance = _tmp1_;
-#line 2534 "FSpotPhotosTable.c"
-	}
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v17_behavior_instance;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2544 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2560 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar** _tmp9_;
-	gchar** _tmp10_;
-	gint _tmp10__length1;
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("base_uri");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("filename");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("description");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("roll_id");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_strdup ("default_version_id");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = g_strdup ("rating");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = g_strdup ("md5_sum");
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = g_new0 (gchar*, 9 + 1);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[0] = _tmp0_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[1] = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[2] = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[3] = _tmp3_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[4] = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[5] = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[6] = _tmp6_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[7] = _tmp7_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_[8] = _tmp8_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = _tmp9_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10__length1 = 9;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp10__length1;
-#line 2627 "FSpotPhotosTable.c"
-	}
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp10_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2633 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_;
-	gint _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	gint _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	gint _tmp37_;
-	gint64 _tmp38_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
-	sqlite3_stmt* _tmp40_;
-	gint _tmp41_;
-	gint _tmp42_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
-	sqlite3_stmt* _tmp44_;
-	gint _tmp45_;
-	const gchar* _tmp46_;
-	gchar* _tmp47_;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	base_path = _tmp12_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = stmt;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp14_ = offset;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp15_ = sqlite3_column_text (_tmp13_, _tmp14_ + 3);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	filename = _tmp16_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp18_ = base_path;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp18_ != NULL) {
-#line 2737 "FSpotPhotosTable.c"
-		const gchar* _tmp19_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = filename;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = _tmp19_ != NULL;
-#line 2743 "FSpotPhotosTable.c"
-	} else {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = FALSE;
-#line 2747 "FSpotPhotosTable.c"
-	}
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp17_) {
-#line 2751 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
-		const gchar* _tmp21_;
-		GFile* _tmp22_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
-		const gchar* _tmp24_;
-		gchar* _tmp25_;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = _vala_row;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = base_path;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp20_->base_path);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_->base_path = _tmp22_;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_ = _vala_row;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp24_ = filename;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp25_ = g_strdup (_tmp24_);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp23_->filename);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_->filename = _tmp25_;
-#line 2778 "FSpotPhotosTable.c"
-	}
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = _vala_row;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = stmt;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = offset;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = sqlite3_column_text (_tmp27_, _tmp28_ + 4);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = g_strdup (_tmp29_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp26_->description);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_->description = _tmp30_;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->roll_id = _tmp34_;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = stmt;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = offset;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = sqlite3_column_int64 (_tmp36_, _tmp37_ + 6);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->default_version_id = _tmp38_;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_ = _vala_row;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_ = stmt;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp41_ = offset;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp42_ = sqlite3_column_int (_tmp40_, _tmp41_ + 7);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_->rating = _tmp42_;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp43_ = _vala_row;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp44_ = stmt;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp45_ = offset;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp46_ = sqlite3_column_text (_tmp44_, _tmp45_ + 8);
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp47_ = g_strdup (_tmp46_);
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp43_->md5_sum);
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp43_->md5_sum = _tmp47_;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (filename);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (base_path);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 2846 "FSpotPhotosTable.c"
-	} else {
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 2850 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v17_behavior_class_init (DataImportsFSpotDbFSpotPhotosV17BehaviorClass * klass) {
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v17_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v17_behavior_finalize;
-#line 2860 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row;
-#line 2873 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v17_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV17Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v17_behavior_parent_class)->finalize (obj);
-#line 2887 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v17_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v17_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV17BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v17_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV17Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v17_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v17_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v17_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV17Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v17_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v17_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v17_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v17_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior * self = NULL;
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = (DataImportsFSpotDbFSpotPhotosV18Behavior*) g_object_new (object_type, NULL);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return self;
-#line 2911 "FSpotPhotosTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_new (void) {
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return data_imports_fspot_db_fspot_photos_v18_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR);
-#line 2918 "FSpotPhotosTable.c"
-}
-
-
-DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photos_v18_behavior_instance;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp0_ == NULL) {
-#line 2931 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_photos_v18_behavior_new ();
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_photos_v18_behavior_instance);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		data_imports_fspot_db_fspot_photos_v18_behavior_instance = _tmp1_;
-#line 2939 "FSpotPhotosTable.c"
-	}
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_photos_v18_behavior_instance;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp3_;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2949 "FSpotPhotosTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_TABLE_TABLE_NAME);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 2965 "FSpotPhotosTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar** _tmp8_;
-	gchar** _tmp9_;
-	gint _tmp9__length1;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = g_strdup ("base_uri");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = g_strdup ("filename");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = g_strdup ("description");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = g_strdup ("roll_id");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = g_strdup ("default_version_id");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = g_strdup ("rating");
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = g_new0 (gchar*, 8 + 1);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[0] = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[1] = _tmp1_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[2] = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[3] = _tmp3_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[4] = _tmp4_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[5] = _tmp5_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[6] = _tmp6_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_[7] = _tmp7_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = _tmp8_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9__length1 = 8;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (result_length1) {
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*result_length1 = _tmp9__length1;
-#line 3027 "FSpotPhotosTable.c"
-	}
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	result = _tmp9_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	return result;
-#line 3033 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
-	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	gint64 _tmp8_;
-	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_;
-	gint _tmp10_;
-	const gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_;
-	gint _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
-	sqlite3_stmt* _tmp27_;
-	gint _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
-	sqlite3_stmt* _tmp32_;
-	gint _tmp33_;
-	gint64 _tmp34_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
-	sqlite3_stmt* _tmp36_;
-	gint _tmp37_;
-	gint64 _tmp38_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
-	sqlite3_stmt* _tmp40_;
-	gint _tmp41_;
-	gint _tmp42_;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
-	gchar* _tmp44_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_photo_row_new ();
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_vala_row = _tmp0_;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_ = _vala_row;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp2_ = stmt;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp3_ = offset;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp1_->photo_id = _tmp4_;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_ = _vala_row;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp6_ = stmt;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp7_ = offset;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp8_ = sqlite3_column_int64 (_tmp6_, _tmp7_ + 1);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp5_->time = (time_t) _tmp8_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp9_ = stmt;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp10_ = offset;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp11_ = sqlite3_column_text (_tmp9_, _tmp10_ + 2);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp12_ = g_strdup (_tmp11_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	base_path = _tmp12_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp13_ = stmt;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp14_ = offset;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp15_ = sqlite3_column_text (_tmp13_, _tmp14_ + 3);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	filename = _tmp16_;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp18_ = base_path;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp18_ != NULL) {
-#line 3134 "FSpotPhotosTable.c"
-		const gchar* _tmp19_;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp19_ = filename;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = _tmp19_ != NULL;
-#line 3140 "FSpotPhotosTable.c"
-	} else {
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp17_ = FALSE;
-#line 3144 "FSpotPhotosTable.c"
-	}
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (_tmp17_) {
-#line 3148 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
-		const gchar* _tmp21_;
-		GFile* _tmp22_;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
-		const gchar* _tmp24_;
-		gchar* _tmp25_;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_ = _vala_row;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp21_ = base_path;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_tmp20_->base_path);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp20_->base_path = _tmp22_;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_ = _vala_row;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp24_ = filename;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp25_ = g_strdup (_tmp24_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_free0 (_tmp23_->filename);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_tmp23_->filename = _tmp25_;
-#line 3175 "FSpotPhotosTable.c"
-	}
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_ = _vala_row;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp27_ = stmt;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp28_ = offset;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp29_ = sqlite3_column_text (_tmp27_, _tmp28_ + 4);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp30_ = g_strdup (_tmp29_);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp26_->description);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp26_->description = _tmp30_;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_ = _vala_row;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp32_ = stmt;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp33_ = offset;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp34_ = sqlite3_column_int64 (_tmp32_, _tmp33_ + 5);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp31_->roll_id = _tmp34_;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_ = _vala_row;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp36_ = stmt;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp37_ = offset;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp38_ = sqlite3_column_int64 (_tmp36_, _tmp37_ + 6);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp35_->default_version_id = _tmp38_;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_ = _vala_row;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp40_ = stmt;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp41_ = offset;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp42_ = sqlite3_column_int (_tmp40_, _tmp41_ + 7);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp39_->rating = _tmp42_;
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp43_ = _vala_row;
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp44_ = g_strdup ("");
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (_tmp43_->md5_sum);
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_tmp43_->md5_sum = _tmp44_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (filename);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	_g_free0 (base_path);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	if (row) {
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		*row = _vala_row;
-#line 3237 "FSpotPhotosTable.c"
-	} else {
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 3241 "FSpotPhotosTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v18_behavior_class_init (DataImportsFSpotDbFSpotPhotosV18BehaviorClass * klass) {
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v18_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_photos_v18_behavior_finalize;
-#line 3251 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row;
-#line 3264 "FSpotPhotosTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v18_behavior_instance_init (DataImportsFSpotDbFSpotPhotosV18Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_photos_v18_behavior_parent_class)->finalize (obj);
-#line 3278 "FSpotPhotosTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_photos_v18_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_photos_v18_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotPhotosV18BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_photos_v18_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotPhotosV18Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_photos_v18_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_photos_v18_behavior_type_id;
-		data_imports_fspot_db_fspot_photos_v18_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotPhotosV18Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_photos_v18_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_photos_v18_behavior_type_id__volatile, data_imports_fspot_db_fspot_photos_v18_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_photos_v18_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.vala b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
deleted file mode 100644
index 39329d4..0000000
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.vala
+++ /dev/null
@@ -1,356 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "photos" table, representing a single database row.
- */
-public class FSpotPhotoRow : Object {
-    public int64 photo_id;
-    public time_t time;
-    public File? base_path;
-    public string? filename;
-    public string description;
-    public int64 roll_id;
-    public int64 default_version_id;
-    public int rating;
-    public string md5_sum;
-}
-
-/**
- * This class represents the F-Spot photos table.
- */
-public class FSpotPhotosTable : FSpotDatabaseTable<FSpotPhotoRow> {
-    public const string TABLE_NAME = "Photos";
-    
-    public FSpotPhotosTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base(db);
-        set_behavior(db_behavior.get_photos_behavior());
-    }
-    
-    public Gee.ArrayList<FSpotPhotoRow> get_all() throws DatabaseError {
-        Gee.ArrayList<FSpotPhotoRow> all = new Gee.ArrayList<FSpotPhotoRow?>();
-        
-        Sqlite.Statement stmt;
-        int res = select_all(out stmt);
-        while (res == Sqlite.ROW) {
-            FSpotPhotoRow row;
-            behavior.build_row(stmt, out row);
-            all.add(row);
-            res = stmt.step();
-        }
-        
-        return all;
-    }
-}
-
-// Photos table behavior for v0-4
-// The original table format
-public class FSpotPhotosV0Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV0Behavior instance;
-    
-    private FSpotPhotosV0Behavior() {
-    }
-    
-    public static FSpotPhotosV0Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV0Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "directory_path", "name", "description",
-            "default_version_id" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-        
-        string? base_path = stmt.column_text(offset + 2);
-        string? filename = stmt.column_text(offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.description = stmt.column_text(offset + 4);
-        row.roll_id = INVALID_ID;
-        row.default_version_id = stmt.column_int64(offset + 5);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v5-6
-// v5 introduced a roll_id to reference the imported roll (rolls were a new
-// table migrated from imports)
-public class FSpotPhotosV5Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV5Behavior instance;
-    
-    private FSpotPhotosV5Behavior() {
-    }
-    
-    public static FSpotPhotosV5Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV5Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "directory_path", "name", "description", "roll_id",
-            "default_version_id" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-        
-        string? base_path = stmt.column_text(offset + 2);
-        string? filename = stmt.column_text(offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.description = stmt.column_text(offset + 4);
-        row.roll_id = stmt.column_int64(offset + 5);
-        row.default_version_id = stmt.column_int64(offset + 6);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v7-10
-// v7 merged directory_path and name into a single URI value with a file://
-// prefix; presumaly this is meant to be able to handle remote files using a
-// different URI prefix such as remote files
-public class FSpotPhotosV7Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV7Behavior instance;
-    
-    private FSpotPhotosV7Behavior() {
-    }
-    
-    public static FSpotPhotosV7Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV7Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "uri", "description", "roll_id",
-            "default_version_id" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-
-        string? full_path = stmt.column_text(offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.description = stmt.column_text(offset + 3);
-        row.roll_id = stmt.column_int64(offset + 4);
-        row.default_version_id = stmt.column_int64(offset + 5);
-        row.rating = 0;
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v11-15
-// v11 introduced the concept of rating so add this to the list of fields
-public class FSpotPhotosV11Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV11Behavior instance;
-    
-    private FSpotPhotosV11Behavior() {
-    }
-    
-    public static FSpotPhotosV11Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV11Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "uri", "description", "roll_id",
-            "default_version_id", "rating" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-
-        string? full_path = stmt.column_text(offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.description = stmt.column_text(offset + 3);
-        row.roll_id = stmt.column_int64(offset + 4);
-        row.default_version_id = stmt.column_int64(offset + 5);
-        row.rating = stmt.column_int(offset + 6);
-        row.md5_sum = "";
-    }
-}
-
-// Photos table behavior for v16
-// v16 introduced the MD5 sum so add this to the list of fields
-public class FSpotPhotosV16Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV16Behavior instance;
-    
-    private FSpotPhotosV16Behavior() {
-    }
-    
-    public static FSpotPhotosV16Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV16Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "uri", "description", "roll_id",
-            "default_version_id", "rating", "md5_sum" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-
-        string? full_path = stmt.column_text(offset + 2);
-        if (full_path != null) {
-            File uri = File.new_for_uri(full_path);
-            row.base_path = uri.get_parent();
-            row.filename = uri.get_basename();
-        }
-
-        row.description = stmt.column_text(offset + 3);
-        row.roll_id = stmt.column_int64(offset + 4);
-        row.default_version_id = stmt.column_int64(offset + 5);
-        row.rating = stmt.column_int(offset + 6);
-        row.md5_sum = stmt.column_text(offset + 7);
-    }
-}
-
-// Photos table behavior for v17
-// v17 split the URI into base_uri and filename (reverting back to the original
-// design introduced in v0, albeit with a URI rather than a file system path)
-public class FSpotPhotosV17Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV17Behavior instance;
-    
-    private FSpotPhotosV17Behavior() {
-    }
-    
-    public static FSpotPhotosV17Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV17Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "base_uri", "filename", "description", "roll_id",
-            "default_version_id", "rating", "md5_sum" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-        
-        string? base_path = stmt.column_text(offset + 2);
-        string? filename = stmt.column_text(offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.description = stmt.column_text(offset + 4);
-        row.roll_id = stmt.column_int64(offset + 5);
-        row.default_version_id = stmt.column_int64(offset + 6);
-        row.rating = stmt.column_int(offset + 7);
-        row.md5_sum = stmt.column_text(offset + 8);
-    }
-}
-
-// v18: no more MD5 hash in the photos table: moved to photo_versions table
-public class FSpotPhotosV18Behavior : FSpotTableBehavior<FSpotPhotoRow>, Object {
-    private static FSpotPhotosV18Behavior instance;
-    
-    private FSpotPhotosV18Behavior() {
-    }
-    
-    public static FSpotPhotosV18Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotPhotosV18Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotPhotosTable.TABLE_NAME;
-    }
-    
-    public string[] list_columns() {
-        return { "id", "time", "base_uri", "filename", "description", "roll_id",
-            "default_version_id", "rating" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotPhotoRow row, int offset = 0) {
-        row = new FSpotPhotoRow();
-        row.photo_id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-        
-        string? base_path = stmt.column_text(offset + 2);
-        string? filename = stmt.column_text(offset + 3);
-        if (base_path != null && filename != null) {
-            row.base_path = File.new_for_uri(base_path);
-            row.filename = filename;
-        }
-        
-        row.description = stmt.column_text(offset + 4);
-        row.roll_id = stmt.column_int64(offset + 5);
-        row.default_version_id = stmt.column_int64(offset + 6);
-        row.rating = stmt.column_int(offset + 7);
-        row.md5_sum = "";
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c
deleted file mode 100644
index 3b3e3e4..0000000
--- a/plugins/shotwell-data-imports/FSpotRollsTable.c
+++ /dev/null
@@ -1,995 +0,0 @@
-/* FSpotRollsTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotRollsTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW (data_imports_fspot_db_fspot_roll_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollRow DataImportsFSpotDbFSpotRollRow;
-typedef struct _DataImportsFSpotDbFSpotRollRowClass DataImportsFSpotDbFSpotRollRowClass;
-typedef struct _DataImportsFSpotDbFSpotRollRowPrivate DataImportsFSpotDbFSpotRollRowPrivate;
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE (data_imports_fspot_db_fspot_rolls_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, DataImportsFSpotDbFSpotRollsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsTable DataImportsFSpotDbFSpotRollsTable;
-typedef struct _DataImportsFSpotDbFSpotRollsTableClass DataImportsFSpotDbFSpotRollsTableClass;
-typedef struct _DataImportsFSpotDbFSpotRollsTablePrivate DataImportsFSpotDbFSpotRollsTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR (data_imports_fspot_db_fspot_rolls_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsV0Behavior DataImportsFSpotDbFSpotRollsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotRollsV0BehaviorClass DataImportsFSpotDbFSpotRollsV0BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotRollsV0BehaviorPrivate DataImportsFSpotDbFSpotRollsV0BehaviorPrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR (data_imports_fspot_db_fspot_rolls_v5_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V5_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_V5_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotRollsV5Behavior DataImportsFSpotDbFSpotRollsV5Behavior;
-typedef struct _DataImportsFSpotDbFSpotRollsV5BehaviorClass DataImportsFSpotDbFSpotRollsV5BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotRollsV5BehaviorPrivate DataImportsFSpotDbFSpotRollsV5BehaviorPrivate;
-
-struct _DataImportsFSpotDbFSpotRollRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotRollRowPrivate * priv;
-	gint64 id;
-	time_t time;
-};
-
-struct _DataImportsFSpotDbFSpotRollRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotRollsTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotRollsTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotRollsTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotDbFSpotRollsV0Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotRollsV0BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotRollsV0BehaviorClass {
-	GObjectClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotRollsV5Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotRollsV5BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotRollsV5BehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_roll_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_rolls_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-static gpointer data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLL_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_new (void);
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_rolls_table_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME "Rolls"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME_PRE_V5 "Imports"
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-GQuark database_error_quark (void);
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error);
-gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-GType data_imports_fspot_db_fspot_rolls_v0_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V0_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_new (void);
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj);
-GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_new (void);
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj);
-
-
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotRollRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = (DataImportsFSpotDbFSpotRollRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return self;
-#line 258 "FSpotRollsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return data_imports_fspot_db_fspot_roll_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW);
-#line 265 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_roll_row_class_init (DataImportsFSpotDbFSpotRollRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_roll_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_roll_row_finalize;
-#line 274 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_roll_row_instance_init (DataImportsFSpotDbFSpotRollRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotRollRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_roll_row_parent_class)->finalize (obj);
-#line 288 "FSpotRollsTable.c"
-}
-
-
-/**
- * The value object for the "rolls" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_roll_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_roll_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_roll_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotRollRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_roll_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotRollRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_roll_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_roll_row_type_id;
-		data_imports_fspot_db_fspot_roll_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotRollRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_roll_row_type_id__volatile, data_imports_fspot_db_fspot_roll_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_roll_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-	DataImportsFSpotDbFSpotRollsTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (db_behavior), NULL);
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = db;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = (DataImportsFSpotDbFSpotRollsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = db_behavior;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (_tmp1_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), _tmp3_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_g_object_unref0 (_tmp3_);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return self;
-#line 333 "FSpotRollsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return data_imports_fspot_db_fspot_rolls_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_TABLE, db, db_behavior);
-#line 340 "FSpotRollsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error) {
-	DataImportsFSpotDbFSpotRollRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	DataImportsFSpotDbFSpotRollRow* row = NULL;
-	gchar* column_list = NULL;
-	gchar* _tmp0_;
-	gchar* sql = NULL;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint res = 0;
-	sqlite3* _tmp4_;
-	const gchar* _tmp5_;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp13_;
-	gint64 _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	sqlite3_stmt* _tmp18_;
-	gint _tmp19_;
-	gint _tmp20_;
-	GError * _inner_error_ = NULL;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE (self), NULL);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	row = NULL;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_database_table_get_joined_column_list (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), FALSE);
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	column_list = _tmp0_;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = column_list;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp1_, _tmp2_);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	sql = _tmp3_;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->fspot_db;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp5_ = sql;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp7_ = sqlite3_prepare_v2 (_tmp4_, _tmp5_, -1, &_tmp6_, NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	stmt = _tmp6_;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	res = _tmp7_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp8_ = res;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (_tmp8_ != SQLITE_OK) {
-#line 400 "FSpotRollsTable.c"
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		gint _tmp12_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp9_ = sql;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp10_ = g_strdup_printf ("Statement failed: %s", _tmp9_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp11_ = _tmp10_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp12_ = res;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		importable_database_table_throw_error (_tmp11_, _tmp12_, &_inner_error_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_free0 (_tmp11_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (sql);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (column_list);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_object_unref0 (row);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				return NULL;
-#line 433 "FSpotRollsTable.c"
-			} else {
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (sql);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (column_list);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_object_unref0 (row);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				return NULL;
-#line 449 "FSpotRollsTable.c"
-			}
-		}
-	}
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp13_ = stmt;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp14_ = roll_id;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp15_ = sqlite3_bind_int64 (_tmp13_, 1, _tmp14_);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	res = _tmp15_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp16_ = res;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (_tmp16_ != SQLITE_OK) {
-#line 465 "FSpotRollsTable.c"
-		gint _tmp17_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp17_ = res;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		importable_database_table_throw_error ("Bind failed for roll_id", _tmp17_, &_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (sql);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (column_list);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_object_unref0 (row);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				return NULL;
-#line 487 "FSpotRollsTable.c"
-			} else {
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (sql);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_free0 (column_list);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_g_object_unref0 (row);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-				return NULL;
-#line 503 "FSpotRollsTable.c"
-			}
-		}
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp18_ = stmt;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp19_ = sqlite3_step (_tmp18_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	res = _tmp19_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp20_ = res;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (_tmp20_ == SQLITE_ROW) {
-#line 517 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
-		sqlite3_stmt* _tmp22_;
-		gpointer _tmp23_ = NULL;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp22_ = stmt;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		data_imports_fspot_db_fspot_table_behavior_build_row (_tmp21_, _tmp22_, &_tmp23_, 0);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_object_unref0 (row);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		row = _tmp23_;
-#line 531 "FSpotRollsTable.c"
-	} else {
-		gint _tmp24_;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp24_ = res;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		if (_tmp24_ == SQLITE_DONE) {
-#line 538 "FSpotRollsTable.c"
-			gint64 _tmp25_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-			_tmp25_ = roll_id;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-			g_message ("FSpotRollsTable.vala:47: Could not find roll row with ID %d", (gint) _tmp25_);
-#line 544 "FSpotRollsTable.c"
-		}
-	}
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = row;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 557 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_table_class_init (DataImportsFSpotDbFSpotRollsTableClass * klass) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_rolls_table_parent_class = g_type_class_peek_parent (klass);
-#line 564 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_table_instance_init (DataImportsFSpotDbFSpotRollsTable * self) {
-}
-
-
-/**
- * This class represents the F-Spot rolls table.
- */
-GType data_imports_fspot_db_fspot_rolls_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_rolls_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_rolls_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotRollsTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_rolls_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotRollsTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_rolls_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_rolls_table_type_id;
-		data_imports_fspot_db_fspot_rolls_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotRollsTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_rolls_table_type_id__volatile, data_imports_fspot_db_fspot_rolls_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_rolls_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotRollsV0Behavior * self = NULL;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = (DataImportsFSpotDbFSpotRollsV0Behavior*) g_object_new (object_type, NULL);
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return self;
-#line 593 "FSpotRollsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_new (void) {
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return data_imports_fspot_db_fspot_rolls_v0_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR);
-#line 600 "FSpotRollsTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 607 "FSpotRollsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotRollsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
-#line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 620 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_rolls_v0_behavior_new ();
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_rolls_v0_behavior_instance);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		data_imports_fspot_db_fspot_rolls_v0_behavior_instance = _tmp1_;
-#line 628 "FSpotRollsTable.c"
-	}
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp3_;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 638 "FSpotRollsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotRollsV0Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME_PRE_V5);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp0_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 654 "FSpotRollsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotRollsV0Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = g_new0 (gchar*, 2 + 1);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_[0] = _tmp0_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_[1] = _tmp1_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3__length1 = 2;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (result_length1) {
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		*result_length1 = _tmp3__length1;
-#line 686 "FSpotRollsTable.c"
-	}
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp3_;
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 692 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotRollsV0Behavior * self;
-	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	gint64 _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	gint64 _tmp6_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_roll_row_new ();
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row = _tmp0_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = stmt;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = offset;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = sqlite3_column_int64 (_tmp1_, _tmp2_ + 0);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row->id = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp4_ = stmt;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp5_ = offset;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp6_ = sqlite3_column_int64 (_tmp4_, _tmp5_ + 1);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row->time = (time_t) _tmp6_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (row) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		*row = _vala_row;
-#line 736 "FSpotRollsTable.c"
-	} else {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 740 "FSpotRollsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_class_init (DataImportsFSpotDbFSpotRollsV0BehaviorClass * klass) {
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_rolls_v0_behavior_finalize;
-#line 750 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row;
-#line 763 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_instance_init (DataImportsFSpotDbFSpotRollsV0Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotRollsV0Behavior * self;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class)->finalize (obj);
-#line 777 "FSpotRollsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_rolls_v0_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_rolls_v0_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_rolls_v0_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotRollsV0BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_rolls_v0_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotRollsV0Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_rolls_v0_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_rolls_v0_behavior_type_id;
-		data_imports_fspot_db_fspot_rolls_v0_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotRollsV0Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_rolls_v0_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_rolls_v0_behavior_type_id__volatile, data_imports_fspot_db_fspot_rolls_v0_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_rolls_v0_behavior_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotRollsV5Behavior * self = NULL;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = (DataImportsFSpotDbFSpotRollsV5Behavior*) g_object_new (object_type, NULL);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return self;
-#line 801 "FSpotRollsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_new (void) {
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return data_imports_fspot_db_fspot_rolls_v5_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR);
-#line 808 "FSpotRollsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotRollsV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 821 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_rolls_v5_behavior_new ();
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_rolls_v5_behavior_instance);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		data_imports_fspot_db_fspot_rolls_v5_behavior_instance = _tmp1_;
-#line 829 "FSpotRollsTable.c"
-	}
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp3_;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 839 "FSpotRollsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotRollsV5Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_TABLE_TABLE_NAME);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp0_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 855 "FSpotRollsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotRollsV5Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = g_strdup ("time");
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = g_new0 (gchar*, 2 + 1);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_[0] = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_[1] = _tmp1_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3__length1 = 2;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (result_length1) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		*result_length1 = _tmp3__length1;
-#line 887 "FSpotRollsTable.c"
-	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	result = _tmp3_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	return result;
-#line 893 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotRollsV5Behavior * self;
-	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_;
-	sqlite3_stmt* _tmp1_;
-	gint _tmp2_;
-	gint64 _tmp3_;
-	sqlite3_stmt* _tmp4_;
-	gint _tmp5_;
-	gint64 _tmp6_;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_roll_row_new ();
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row = _tmp0_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp1_ = stmt;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp2_ = offset;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp3_ = sqlite3_column_int64 (_tmp1_, _tmp2_ + 0);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row->id = _tmp3_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp4_ = stmt;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp5_ = offset;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_tmp6_ = sqlite3_column_int64 (_tmp4_, _tmp5_ + 1);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	_vala_row->time = (time_t) _tmp6_;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	if (row) {
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		*row = _vala_row;
-#line 937 "FSpotRollsTable.c"
-	} else {
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 941 "FSpotRollsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_class_init (DataImportsFSpotDbFSpotRollsV5BehaviorClass * klass) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_rolls_v5_behavior_finalize;
-#line 951 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row;
-#line 964 "FSpotRollsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_instance_init (DataImportsFSpotDbFSpotRollsV5Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotRollsV5Behavior * self;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class)->finalize (obj);
-#line 978 "FSpotRollsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_rolls_v5_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_rolls_v5_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotRollsV5BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_rolls_v5_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotRollsV5Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_rolls_v5_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_rolls_v5_behavior_type_id;
-		data_imports_fspot_db_fspot_rolls_v5_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotRollsV5Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_rolls_v5_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_rolls_v5_behavior_type_id__volatile, data_imports_fspot_db_fspot_rolls_v5_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_rolls_v5_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.vala b/plugins/shotwell-data-imports/FSpotRollsTable.vala
deleted file mode 100644
index 8a5ee8c..0000000
--- a/plugins/shotwell-data-imports/FSpotRollsTable.vala
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "rolls" table, representing a single database row.
- */
-public class FSpotRollRow : Object {
-    public int64 id;
-    public time_t time;
-}
-
-/**
- * This class represents the F-Spot rolls table.
- */
-public class FSpotRollsTable : FSpotDatabaseTable<FSpotRollRow> {
-    public const string TABLE_NAME = "Rolls";
-    public const string TABLE_NAME_PRE_V5 = "Imports";
-    
-    public FSpotRollsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base(db);
-        set_behavior(db_behavior.get_rolls_behavior());
-    }
-    
-    public FSpotRollRow? get_by_id(int64 roll_id) throws DatabaseError {
-        Sqlite.Statement stmt;
-        FSpotRollRow? row = null;
-        string column_list = get_joined_column_list();
-        string sql = "SELECT %s FROM %s WHERE id=?".printf(column_list, table_name);
-
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.bind_int64(1, roll_id);
-        if (res != Sqlite.OK)
-            throw_error("Bind failed for roll_id", res);
-        
-        res = stmt.step();
-        if (res == Sqlite.ROW)
-            behavior.build_row(stmt, out row);
-        else if (res == Sqlite.DONE)
-            message("Could not find roll row with ID %d", (int)roll_id);
-        
-        return row;
-    }
-}
-
-// Rolls table behavior for v0-4
-public class FSpotRollsV0Behavior : FSpotTableBehavior<FSpotRollRow>, Object {
-    private static FSpotRollsV0Behavior instance;
-    
-    private FSpotRollsV0Behavior() {
-    }
-    
-    public static FSpotRollsV0Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotRollsV0Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotRollsTable.TABLE_NAME_PRE_V5;
-    }
-
-    public string[] list_columns() {
-        return { "id", "time" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotRollRow row, int offset = 0) {
-        row = new FSpotRollRow();
-        row.id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-    }
-}
-
-// Rolls table behavior for v5+
-// Table name changed from "imports" to "rolls"
-public class FSpotRollsV5Behavior : FSpotTableBehavior<FSpotRollRow>, Object {
-    private static FSpotRollsV5Behavior instance;
-    
-    private FSpotRollsV5Behavior() {
-    }
-    
-    public static FSpotRollsV5Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotRollsV5Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotRollsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns() {
-        return { "id", "time" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotRollRow row, int offset = 0) {
-        row = new FSpotRollRow();
-        row.id = stmt.column_int64(offset + 0);
-        row.time = (time_t) stmt.column_int64(offset + 1);
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c
deleted file mode 100644
index 016fee8..0000000
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* FSpotTableBehavior.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotTableBehavior.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-
-
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self);
-gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-
-
-gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR (self), NULL);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	return DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE (self)->get_table_name (self);
-#line 46 "FSpotTableBehavior.c"
-}
-
-
-gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1) {
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR (self), NULL);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	return DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE (self)->list_columns (self, result_length1);
-#line 55 "FSpotTableBehavior.c"
-}
-
-
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset) {
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	g_return_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR (self));
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE (self)->build_row (self, stmt, row, offset);
-#line 64 "FSpotTableBehavior.c"
-}
-
-
-static void data_imports_fspot_db_fspot_table_behavior_base_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	static gboolean initialized = FALSE;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-	if (!initialized) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTableBehavior.vala"
-		initialized = TRUE;
-#line 75 "FSpotTableBehavior.c"
-	}
-}
-
-
-/**
- * This class defines a generic table behavior. In practice, it implements
- * the concept of a DAO (Data Access Object) in ORM terms and is responsible
- * for transforming the data extracted from a relational statement into a
- * lightweight value object.
- *
- * The type T defined in the generic is the value object type a behavior
- * implementation is designed to handle. Value object types are designed to
- * contain the data for a single database row.
- */
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_table_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_table_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotTableBehaviorIface), (GBaseInitFunc) data_imports_fspot_db_fspot_table_behavior_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-		GType data_imports_fspot_db_fspot_table_behavior_type_id;
-		data_imports_fspot_db_fspot_table_behavior_type_id = g_type_register_static (G_TYPE_INTERFACE, "DataImportsFSpotDbFSpotTableBehavior", &g_define_type_info, 0);
-		g_type_interface_add_prerequisite (data_imports_fspot_db_fspot_table_behavior_type_id, G_TYPE_OBJECT);
-		g_once_init_leave (&data_imports_fspot_db_fspot_table_behavior_type_id__volatile, data_imports_fspot_db_fspot_table_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_table_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.vala b/plugins/shotwell-data-imports/FSpotTableBehavior.vala
deleted file mode 100644
index 0922912..0000000
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.vala
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * This class defines a generic table behavior. In practice, it implements
- * the concept of a DAO (Data Access Object) in ORM terms and is responsible
- * for transforming the data extracted from a relational statement into a
- * lightweight value object.
- *
- * The type T defined in the generic is the value object type a behavior
- * implementation is designed to handle. Value object types are designed to
- * contain the data for a single database row.
- */
-public interface FSpotTableBehavior<T> : Object {
-    public abstract string get_table_name();
-    
-    public abstract string[] list_columns();
-    
-    public abstract void build_row(Sqlite.Statement stmt, out T row, int offset = 0);
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c
deleted file mode 100644
index 54fe7c6..0000000
--- a/plugins/shotwell-data-imports/FSpotTagsTable.c
+++ /dev/null
@@ -1,1169 +0,0 @@
-/* FSpotTagsTable.c generated by valac 0.36.6, the Vala compiler
- * generated from FSpotTagsTable.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <gee.h>
-
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW (data_imports_fspot_db_fspot_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagRow DataImportsFSpotDbFSpotTagRow;
-typedef struct _DataImportsFSpotDbFSpotTagRowClass DataImportsFSpotDbFSpotTagRowClass;
-typedef struct _DataImportsFSpotDbFSpotTagRowPrivate DataImportsFSpotDbFSpotTagRowPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE (data_imports_fspot_db_fspot_database_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseTable DataImportsFSpotDbFSpotDatabaseTable;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTableClass DataImportsFSpotDbFSpotDatabaseTableClass;
-typedef struct _DataImportsFSpotDbFSpotDatabaseTablePrivate DataImportsFSpotDbFSpotDatabaseTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR (data_imports_fspot_db_fspot_table_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehavior))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TABLE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TABLE_BEHAVIOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, DataImportsFSpotDbFSpotTableBehaviorIface))
-
-typedef struct _DataImportsFSpotDbFSpotTableBehavior DataImportsFSpotDbFSpotTableBehavior;
-typedef struct _DataImportsFSpotDbFSpotTableBehaviorIface DataImportsFSpotDbFSpotTableBehaviorIface;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE (data_imports_fspot_db_fspot_tags_table_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTableClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagsTable DataImportsFSpotDbFSpotTagsTable;
-typedef struct _DataImportsFSpotDbFSpotTagsTableClass DataImportsFSpotDbFSpotTagsTableClass;
-typedef struct _DataImportsFSpotDbFSpotTagsTablePrivate DataImportsFSpotDbFSpotTagsTablePrivate;
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW (data_imports_fspot_db_fspot_photo_tag_row_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_TAG_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_TAG_ROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRowClass))
-
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRow DataImportsFSpotDbFSpotPhotoTagRow;
-typedef struct _DataImportsFSpotDbFSpotPhotoTagRowClass DataImportsFSpotDbFSpotPhotoTagRowClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR (data_imports_fspot_db_fspot_database_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_DATABASE_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehavior DataImportsFSpotDbFSpotDatabaseBehavior;
-typedef struct _DataImportsFSpotDbFSpotDatabaseBehaviorClass DataImportsFSpotDbFSpotDatabaseBehaviorClass;
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-
-#define DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR (data_imports_fspot_db_fspot_tags_v0_behavior_get_type ())
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0BehaviorClass))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_V0_BEHAVIOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_V0_BEHAVIOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR))
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0BehaviorClass))
-
-typedef struct _DataImportsFSpotDbFSpotTagsV0Behavior DataImportsFSpotDbFSpotTagsV0Behavior;
-typedef struct _DataImportsFSpotDbFSpotTagsV0BehaviorClass DataImportsFSpotDbFSpotTagsV0BehaviorClass;
-typedef struct _DataImportsFSpotDbFSpotTagsV0BehaviorPrivate DataImportsFSpotDbFSpotTagsV0BehaviorPrivate;
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _DataImportsFSpotDbFSpotTagRow {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotTagRowPrivate * priv;
-	gint64 tag_id;
-	gchar* name;
-	gint64 category_id;
-	gboolean is_category;
-	gint sort_priority;
-	gchar* stock_icon;
-};
-
-struct _DataImportsFSpotDbFSpotTagRowClass {
-	GObjectClass parent_class;
-};
-
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _DataImportsFSpotDbFSpotTableBehaviorIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_table_name) (DataImportsFSpotDbFSpotTableBehavior* self);
-	gchar** (*list_columns) (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
-	void (*build_row) (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTable {
-	ImportableDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotDatabaseTablePrivate * priv;
-	sqlite3* fspot_db;
-	DataImportsFSpotDbFSpotTableBehavior* behavior;
-};
-
-struct _DataImportsFSpotDbFSpotDatabaseTableClass {
-	ImportableDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotTagsTable {
-	DataImportsFSpotDbFSpotDatabaseTable parent_instance;
-	DataImportsFSpotDbFSpotTagsTablePrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotTagsTableClass {
-	DataImportsFSpotDbFSpotDatabaseTableClass parent_class;
-};
-
-struct _DataImportsFSpotDbFSpotTagsTablePrivate {
-	DataImportsFSpotDbFSpotTableBehavior* photo_tags_behavior;
-};
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _DataImportsFSpotDbFSpotTagsV0Behavior {
-	GObject parent_instance;
-	DataImportsFSpotDbFSpotTagsV0BehaviorPrivate * priv;
-};
-
-struct _DataImportsFSpotDbFSpotTagsV0BehaviorClass {
-	GObjectClass parent_class;
-};
-
-
-static gpointer data_imports_fspot_db_fspot_tag_row_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_tags_table_parent_class = NULL;
-static gpointer data_imports_fspot_db_fspot_tags_v0_behavior_parent_class = NULL;
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance;
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
-
-GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_TAG_ROW_DUMMY_PROPERTY
-};
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_new (void);
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_database_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_table_behavior_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_tags_table_get_type (void) G_GNUC_CONST;
-GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) G_GNUC_CONST;
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTablePrivate))
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_DUMMY_PROPERTY
-};
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME "Tags"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_PREFIX_STOCK_ICON "stock_icon:"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV "stock_icon:emblem-favorite"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_PEOPLE "stock_icon:emblem-people"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_PLACES "stock_icon:emblem-places"
-#define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS "stock_icon:emblem-event"
-GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior);
-DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db);
-void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-GQuark database_error_quark (void);
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error);
-gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
-GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error);
-gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self);
-static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj);
-GType data_imports_fspot_db_fspot_tags_v0_behavior_get_type (void) G_GNUC_CONST;
-enum  {
-	DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_DUMMY_PROPERTY
-};
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_new (void);
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_construct (GType object_type);
-DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void);
-static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
-static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset);
-static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj);
-
-
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type) {
-	DataImportsFSpotDbFSpotTagRow * self = NULL;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotTagRow*) g_object_new (object_type, NULL);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return self;
-#line 255 "FSpotTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_new (void) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return data_imports_fspot_db_fspot_tag_row_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW);
-#line 262 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tag_row_class_init (DataImportsFSpotDbFSpotTagRowClass * klass) {
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	data_imports_fspot_db_fspot_tag_row_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_tag_row_finalize;
-#line 271 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tag_row_instance_init (DataImportsFSpotDbFSpotTagRow * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotTagRow * self;
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (self->name);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (self->stock_icon);
-#line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_tag_row_parent_class)->finalize (obj);
-#line 289 "FSpotTagsTable.c"
-}
-
-
-/**
- * The value object for the "tags" table, representing a single database row.
- */
-GType data_imports_fspot_db_fspot_tag_row_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_tag_row_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_tag_row_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotTagRowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_tag_row_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotTagRow), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_tag_row_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_tag_row_type_id;
-		data_imports_fspot_db_fspot_tag_row_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotTagRow", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_tag_row_type_id__volatile, data_imports_fspot_db_fspot_tag_row_type_id);
-	}
-	return data_imports_fspot_db_fspot_tag_row_type_id__volatile;
-}
-
-
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-	DataImportsFSpotDbFSpotTagsTable* self = NULL;
-	sqlite3* _tmp0_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp4_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp5_;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_return_val_if_fail (db != NULL, NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (db_behavior), NULL);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = db;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotTagsTable*) data_imports_fspot_db_fspot_database_table_construct (object_type, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tmp0_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_ = db_behavior;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (_tmp1_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = _tmp2_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	data_imports_fspot_db_fspot_database_table_set_behavior (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), _tmp3_);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_object_unref0 (_tmp3_);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp4_ = db_behavior;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_ = data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (_tmp4_);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_object_unref0 (self->priv->photo_tags_behavior);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self->priv->photo_tags_behavior = _tmp5_;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return self;
-#line 344 "FSpotTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_new (sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return data_imports_fspot_db_fspot_tags_table_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, db, db_behavior);
-#line 351 "FSpotTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error) {
-	DataImportsFSpotDbFSpotTagRow* result = NULL;
-	sqlite3_stmt* stmt = NULL;
-	DataImportsFSpotDbFSpotTagRow* row = NULL;
-	gchar* column_list = NULL;
-	gchar* _tmp0_;
-	gchar* sql = NULL;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint res = 0;
-	sqlite3* _tmp4_;
-	const gchar* _tmp5_;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_;
-	gint _tmp8_;
-	sqlite3_stmt* _tmp13_;
-	gint64 _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	sqlite3_stmt* _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	GError * _inner_error_ = NULL;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	row = NULL;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_database_table_get_joined_column_list (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), FALSE);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	column_list = _tmp0_;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_ = column_list;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp1_, _tmp2_);
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	sql = _tmp3_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->fspot_db;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_ = sql;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp7_ = sqlite3_prepare_v2 (_tmp4_, _tmp5_, -1, &_tmp6_, NULL);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	stmt = _tmp6_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp7_;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp8_ = res;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp8_ != SQLITE_OK) {
-#line 411 "FSpotTagsTable.c"
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		gint _tmp12_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp9_ = sql;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp10_ = g_strdup_printf ("Statement failed: %s", _tmp9_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp11_ = _tmp10_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp12_ = res;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		importable_database_table_throw_error (_tmp11_, _tmp12_, &_inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_free0 (_tmp11_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (row);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 444 "FSpotTagsTable.c"
-			} else {
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (row);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 460 "FSpotTagsTable.c"
-			}
-		}
-	}
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp13_ = stmt;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp14_ = tag_id;
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp15_ = sqlite3_bind_int64 (_tmp13_, 1, _tmp14_);
-#line 51 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp15_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp16_ = res;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp17_ = stmt;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp18_ = sqlite3_step (_tmp17_);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp18_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp19_ = res;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp19_ == SQLITE_ROW) {
-#line 486 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp20_;
-		sqlite3_stmt* _tmp21_;
-		gpointer _tmp22_ = NULL;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp21_ = stmt;
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		data_imports_fspot_db_fspot_table_behavior_build_row (_tmp20_, _tmp21_, &_tmp22_, 0);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_object_unref0 (row);
-#line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		row = _tmp22_;
-#line 500 "FSpotTagsTable.c"
-	} else {
-		gint _tmp23_;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp23_ = res;
-#line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		if (_tmp23_ == SQLITE_DONE) {
-#line 507 "FSpotTagsTable.c"
-			gint64 _tmp24_;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			_tmp24_ = tag_id;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			g_message ("FSpotTagsTable.vala:58: Could not find tag row with ID %d", (gint) _tmp24_);
-#line 513 "FSpotTagsTable.c"
-		}
-	}
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	result = row;
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (sql);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (column_list);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return result;
-#line 526 "FSpotTagsTable.c"
-}
-
-
-GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error) {
-	GeeArrayList* result = NULL;
-	GeeArrayList* rows = NULL;
-	GeeArrayList* _tmp0_;
-	sqlite3_stmt* stmt = NULL;
-	gchar* column_list = NULL;
-	gchar* _tmp1_;
-	gchar* sql = NULL;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gint res = 0;
-	sqlite3* _tmp9_;
-	const gchar* _tmp10_;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_;
-	gint _tmp13_;
-	sqlite3_stmt* _tmp18_;
-	gint64 _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	sqlite3_stmt* _tmp23_;
-	gint _tmp24_;
-	GError * _inner_error_ = NULL;
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = gee_array_list_new (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	rows = _tmp0_;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_ = data_imports_fspot_db_fspot_database_table_get_joined_column_list (G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable), TRUE);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	column_list = _tmp1_;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = column_list;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp4_ = self->priv->photo_tags_behavior;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_ = data_imports_fspot_db_fspot_table_behavior_get_table_name (_tmp4_);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_ = _tmp5_;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp7_ = g_strdup_printf ("SELECT %1$s FROM %2$s, %3$s WHERE %3$s.photo_id=? AND %3$s.tag_id = %2" \
-"$s.id", _tmp2_, _tmp3_, _tmp6_);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp8_ = _tmp7_;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (_tmp6_);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	sql = _tmp8_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->fspot_db;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp10_ = sql;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp12_ = sqlite3_prepare_v2 (_tmp9_, _tmp10_, -1, &_tmp11_, NULL);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	stmt = _tmp11_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp12_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp13_ = res;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp13_ != SQLITE_OK) {
-#line 602 "FSpotTagsTable.c"
-		const gchar* _tmp14_;
-		gchar* _tmp15_;
-		gchar* _tmp16_;
-		gint _tmp17_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp14_ = sql;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp15_ = g_strdup_printf ("Statement failed: %s", _tmp14_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp16_ = _tmp15_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp17_ = res;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		importable_database_table_throw_error (_tmp16_, _tmp17_, &_inner_error_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_free0 (_tmp16_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (rows);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 635 "FSpotTagsTable.c"
-			} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (rows);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 651 "FSpotTagsTable.c"
-			}
-		}
-	}
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp18_ = stmt;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp19_ = photo_id;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp20_ = sqlite3_bind_int64 (_tmp18_, 1, _tmp19_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp20_;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp21_ = res;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp21_ != SQLITE_OK) {
-#line 667 "FSpotTagsTable.c"
-		gint _tmp22_;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp22_ = res;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		importable_database_table_throw_error ("Bind failed for photo_id", _tmp22_, &_inner_error_);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_propagate_error (error, _inner_error_);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (rows);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 689 "FSpotTagsTable.c"
-			} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (sql);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_free0 (column_list);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_sqlite3_finalize0 (stmt);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				_g_object_unref0 (rows);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				g_clear_error (&_inner_error_);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-				return NULL;
-#line 705 "FSpotTagsTable.c"
-			}
-		}
-	}
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp23_ = stmt;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp24_ = sqlite3_step (_tmp23_);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	res = _tmp24_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	while (TRUE) {
-#line 717 "FSpotTagsTable.c"
-		gint _tmp25_;
-		DataImportsFSpotDbFSpotTagRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp26_;
-		sqlite3_stmt* _tmp27_;
-		gpointer _tmp28_ = NULL;
-		GeeArrayList* _tmp29_;
-		DataImportsFSpotDbFSpotTagRow* _tmp30_;
-		sqlite3_stmt* _tmp31_;
-		gint _tmp32_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp25_ = res;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		if (!(_tmp25_ == SQLITE_ROW)) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-			break;
-#line 733 "FSpotTagsTable.c"
-		}
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp27_ = stmt;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		data_imports_fspot_db_fspot_table_behavior_build_row (_tmp26_, _tmp27_, &_tmp28_, 0);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_object_unref0 (row);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		row = _tmp28_;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp29_ = rows;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp30_ = row;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp30_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp31_ = stmt;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp32_ = sqlite3_step (_tmp31_);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		res = _tmp32_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_object_unref0 (row);
-#line 759 "FSpotTagsTable.c"
-	}
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	result = rows;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (sql);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (column_list);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_sqlite3_finalize0 (stmt);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return result;
-#line 771 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_table_class_init (DataImportsFSpotDbFSpotTagsTableClass * klass) {
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	data_imports_fspot_db_fspot_tags_table_parent_class = g_type_class_peek_parent (klass);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	((ImportableDatabaseTableClass *) klass)->finalize = data_imports_fspot_db_fspot_tags_table_finalize;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_type_class_add_private (klass, sizeof (DataImportsFSpotDbFSpotTagsTablePrivate));
-#line 782 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_table_instance_init (DataImportsFSpotDbFSpotTagsTable * self) {
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self->priv = DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_GET_PRIVATE (self);
-#line 789 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj) {
-	DataImportsFSpotDbFSpotTagsTable * self;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable);
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_object_unref0 (self->priv->photo_tags_behavior);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	IMPORTABLE_DATABASE_TABLE_CLASS (data_imports_fspot_db_fspot_tags_table_parent_class)->finalize (obj);
-#line 801 "FSpotTagsTable.c"
-}
-
-
-/**
- * This class represents the F-Spot tags table.
- */
-GType data_imports_fspot_db_fspot_tags_table_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_tags_table_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_tags_table_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotTagsTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_tags_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotTagsTable), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_tags_table_instance_init, NULL };
-		GType data_imports_fspot_db_fspot_tags_table_type_id;
-		data_imports_fspot_db_fspot_tags_table_type_id = g_type_register_static (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, "DataImportsFSpotDbFSpotTagsTable", &g_define_type_info, 0);
-		g_once_init_leave (&data_imports_fspot_db_fspot_tags_table_type_id__volatile, data_imports_fspot_db_fspot_tags_table_type_id);
-	}
-	return data_imports_fspot_db_fspot_tags_table_type_id__volatile;
-}
-
-
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_construct (GType object_type) {
-	DataImportsFSpotDbFSpotTagsV0Behavior * self = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = (DataImportsFSpotDbFSpotTagsV0Behavior*) g_object_new (object_type, NULL);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return self;
-#line 826 "FSpotTagsTable.c"
-}
-
-
-static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_new (void) {
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return data_imports_fspot_db_fspot_tags_v0_behavior_construct (DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR);
-#line 833 "FSpotTagsTable.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 840 "FSpotTagsTable.c"
-}
-
-
-DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void) {
-	DataImportsFSpotDbFSpotTagsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp0_;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp2_;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp3_;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_tags_v0_behavior_instance;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp0_ == NULL) {
-#line 853 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTagsV0Behavior* _tmp1_;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp1_ = data_imports_fspot_db_fspot_tags_v0_behavior_new ();
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_object_unref0 (data_imports_fspot_db_fspot_tags_v0_behavior_instance);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		data_imports_fspot_db_fspot_tags_v0_behavior_instance = _tmp1_;
-#line 861 "FSpotTagsTable.c"
-	}
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = data_imports_fspot_db_fspot_tags_v0_behavior_instance;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	result = _tmp3_;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return result;
-#line 871 "FSpotTagsTable.c"
-}
-
-
-static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
-	DataImportsFSpotDbFSpotTagsV0Behavior * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = g_strdup (DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_TABLE_NAME);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	result = _tmp0_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return result;
-#line 887 "FSpotTagsTable.c"
-}
-
-
-static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
-	DataImportsFSpotDbFSpotTagsV0Behavior * self;
-	gchar** result = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar** _tmp6_;
-	gchar** _tmp7_;
-	gint _tmp7__length1;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = g_strdup ("id");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_ = g_strdup ("name");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = g_strdup ("category_id");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = g_strdup ("is_category");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp4_ = g_strdup ("sort_priority");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_ = g_strdup ("icon");
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_ = g_new0 (gchar*, 6 + 1);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[0] = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[1] = _tmp1_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[2] = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[3] = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[4] = _tmp4_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_[5] = _tmp5_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp7_ = _tmp6_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp7__length1 = 6;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (result_length1) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		*result_length1 = _tmp7__length1;
-#line 939 "FSpotTagsTable.c"
-	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	result = _tmp7_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	return result;
-#line 945 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset) {
-	DataImportsFSpotDbFSpotTagsV0Behavior * self;
-	DataImportsFSpotDbFSpotTagRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_;
-	sqlite3_stmt* _tmp2_;
-	gint _tmp3_;
-	gint64 _tmp4_;
-	DataImportsFSpotDbFSpotTagRow* _tmp5_;
-	sqlite3_stmt* _tmp6_;
-	gint _tmp7_;
-	const gchar* _tmp8_;
-	gchar* _tmp9_;
-	DataImportsFSpotDbFSpotTagRow* _tmp10_;
-	sqlite3_stmt* _tmp11_;
-	gint _tmp12_;
-	gint64 _tmp13_;
-	DataImportsFSpotDbFSpotTagRow* _tmp14_;
-	sqlite3_stmt* _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	DataImportsFSpotDbFSpotTagRow* _tmp18_;
-	sqlite3_stmt* _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	gchar* icon_str = NULL;
-	sqlite3_stmt* _tmp22_;
-	gint _tmp23_;
-	const gchar* _tmp24_;
-	gchar* _tmp25_;
-	gboolean _tmp26_ = FALSE;
-	const gchar* _tmp27_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	g_return_if_fail (stmt != NULL);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp0_ = data_imports_fspot_db_fspot_tag_row_new ();
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_object_unref0 (_vala_row);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_vala_row = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_ = _vala_row;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp2_ = stmt;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp3_ = offset;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp4_ = sqlite3_column_int64 (_tmp2_, _tmp3_ + 0);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp1_->tag_id = _tmp4_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_ = _vala_row;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp6_ = stmt;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp7_ = offset;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp8_ = sqlite3_column_text (_tmp6_, _tmp7_ + 1);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp9_ = g_strdup (_tmp8_);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (_tmp5_->name);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp5_->name = _tmp9_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp10_ = _vala_row;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp11_ = stmt;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp12_ = offset;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp13_ = sqlite3_column_int64 (_tmp11_, _tmp12_ + 2);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp10_->category_id = _tmp13_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp14_ = _vala_row;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp15_ = stmt;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp16_ = offset;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp17_ = sqlite3_column_int (_tmp15_, _tmp16_ + 3);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp14_->is_category = _tmp17_ > 0;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp18_ = _vala_row;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp19_ = stmt;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp20_ = offset;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp21_ = sqlite3_column_int (_tmp19_, _tmp20_ + 4);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp18_->sort_priority = _tmp21_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp22_ = stmt;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp23_ = offset;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp24_ = sqlite3_column_text (_tmp22_, _tmp23_ + 5);
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp25_ = g_strdup (_tmp24_);
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	icon_str = _tmp25_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_tmp27_ = icon_str;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp27_ != NULL) {
-#line 1059 "FSpotTagsTable.c"
-		const gchar* _tmp28_;
-		gboolean _tmp29_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp28_ = icon_str;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp29_ = g_str_has_prefix (_tmp28_, DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_PREFIX_STOCK_ICON);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp26_ = _tmp29_;
-#line 1068 "FSpotTagsTable.c"
-	} else {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp26_ = FALSE;
-#line 1072 "FSpotTagsTable.c"
-	}
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (_tmp26_) {
-#line 1076 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTagRow* _tmp30_;
-		const gchar* _tmp31_;
-		gchar* _tmp32_;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp30_ = _vala_row;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp31_ = icon_str;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp32_ = g_strdup (_tmp31_);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_free0 (_tmp30_->stock_icon);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp30_->stock_icon = _tmp32_;
-#line 1090 "FSpotTagsTable.c"
-	} else {
-		DataImportsFSpotDbFSpotTagRow* _tmp33_;
-		gchar* _tmp34_;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp33_ = _vala_row;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp34_ = g_strdup ("");
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_free0 (_tmp33_->stock_icon);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_tmp33_->stock_icon = _tmp34_;
-#line 1102 "FSpotTagsTable.c"
-	}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	_g_free0 (icon_str);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	if (row) {
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		*row = _vala_row;
-#line 1110 "FSpotTagsTable.c"
-	} else {
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-		_g_object_unref0 (_vala_row);
-#line 1114 "FSpotTagsTable.c"
-	}
-}
-
-
-static void data_imports_fspot_db_fspot_tags_v0_behavior_class_init (DataImportsFSpotDbFSpotTagsV0BehaviorClass * klass) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	data_imports_fspot_db_fspot_tags_v0_behavior_parent_class = g_type_class_peek_parent (klass);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_db_fspot_tags_v0_behavior_finalize;
-#line 1124 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init (DataImportsFSpotDbFSpotTableBehaviorIface * iface) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row;
-#line 1137 "FSpotTagsTable.c"
-}
-
-
-static void data_imports_fspot_db_fspot_tags_v0_behavior_instance_init (DataImportsFSpotDbFSpotTagsV0Behavior * self) {
-}
-
-
-static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj) {
-	DataImportsFSpotDbFSpotTagsV0Behavior * self;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	G_OBJECT_CLASS (data_imports_fspot_db_fspot_tags_v0_behavior_parent_class)->finalize (obj);
-#line 1151 "FSpotTagsTable.c"
-}
-
-
-GType data_imports_fspot_db_fspot_tags_v0_behavior_get_type (void) {
-	static volatile gsize data_imports_fspot_db_fspot_tags_v0_behavior_type_id__volatile = 0;
-	if (g_once_init_enter (&data_imports_fspot_db_fspot_tags_v0_behavior_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DataImportsFSpotDbFSpotTagsV0BehaviorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) data_imports_fspot_db_fspot_tags_v0_behavior_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DataImportsFSpotDbFSpotTagsV0Behavior), 0, (GInstanceInitFunc) data_imports_fspot_db_fspot_tags_v0_behavior_instance_init, NULL };
-		static const GInterfaceInfo data_imports_fspot_db_fspot_table_behavior_info = { (GInterfaceInitFunc) data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType data_imports_fspot_db_fspot_tags_v0_behavior_type_id;
-		data_imports_fspot_db_fspot_tags_v0_behavior_type_id = g_type_register_static (G_TYPE_OBJECT, "DataImportsFSpotDbFSpotTagsV0Behavior", &g_define_type_info, 0);
-		g_type_add_interface_static (data_imports_fspot_db_fspot_tags_v0_behavior_type_id, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TABLE_BEHAVIOR, &data_imports_fspot_db_fspot_table_behavior_info);
-		g_once_init_leave (&data_imports_fspot_db_fspot_tags_v0_behavior_type_id__volatile, data_imports_fspot_db_fspot_tags_v0_behavior_type_id);
-	}
-	return data_imports_fspot_db_fspot_tags_v0_behavior_type_id__volatile;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.vala b/plugins/shotwell-data-imports/FSpotTagsTable.vala
deleted file mode 100644
index 7660154..0000000
--- a/plugins/shotwell-data-imports/FSpotTagsTable.vala
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace DataImports.FSpot.Db {
-
-/**
- * The value object for the "tags" table, representing a single database row.
- */
-public class FSpotTagRow : Object {
-    public int64 tag_id;
-    public string name;
-    public int64 category_id;
-    public bool is_category;
-    public int sort_priority;
-    public string stock_icon; // only store stock icons
-}
-
-/**
- * This class represents the F-Spot tags table.
- */
-public class FSpotTagsTable : FSpotDatabaseTable<FSpotTagRow> {
-    public const string TABLE_NAME = "Tags";
-    
-    public const string PREFIX_STOCK_ICON = "stock_icon:";
-    public const string STOCK_ICON_FAV    = "stock_icon:emblem-favorite";
-    public const string STOCK_ICON_PEOPLE = "stock_icon:emblem-people";
-    public const string STOCK_ICON_PLACES = "stock_icon:emblem-places";
-    public const string STOCK_ICON_EVENTS = "stock_icon:emblem-event";
-    
-    private FSpotTableBehavior<FSpotPhotoTagRow> photo_tags_behavior;
-    
-    public FSpotTagsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
-        base(db);
-        set_behavior(db_behavior.get_tags_behavior());
-        photo_tags_behavior = db_behavior.get_photo_tags_behavior();
-    }
-    
-    public FSpotTagRow? get_by_id(int64 tag_id) throws DatabaseError {
-        Sqlite.Statement stmt;
-        FSpotTagRow? row = null;
-        string column_list = get_joined_column_list();
-        string sql = "SELECT %s FROM %s WHERE id=?".printf(column_list, table_name);
-
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.bind_int64(1, tag_id);
-        assert(res == Sqlite.OK);
-        
-        res = stmt.step();
-        if (res == Sqlite.ROW)
-            behavior.build_row(stmt, out row);
-        else if (res == Sqlite.DONE)
-            message("Could not find tag row with ID %d", (int)tag_id);
-        
-        return row;
-    }
-    
-    public Gee.ArrayList<FSpotTagRow> get_by_photo_id(int64 photo_id) throws DatabaseError {
-        Gee.ArrayList<FSpotTagRow> rows = new Gee.ArrayList<FSpotTagRow?>();
-        
-        Sqlite.Statement stmt;
-        
-        string column_list = get_joined_column_list(true);
-        string sql = "SELECT %1$s FROM %2$s, %3$s WHERE %3$s.photo_id=? AND %3$s.tag_id = %2$s.id".printf(
-            column_list, table_name, photo_tags_behavior.get_table_name()
-        );
-
-        int res = fspot_db.prepare_v2(sql, -1, out stmt);
-        if (res != Sqlite.OK)
-            throw_error("Statement failed: %s".printf(sql), res);
-        
-        res = stmt.bind_int64(1, photo_id);
-        if (res != Sqlite.OK)
-            throw_error("Bind failed for photo_id", res);
-        
-        res = stmt.step();
-        while (res == Sqlite.ROW) {
-            FSpotTagRow row;
-            behavior.build_row(stmt, out row);
-            rows.add(row);
-            res = stmt.step();
-        }
-        
-        return rows;
-    }
-}
-
-public class FSpotTagsV0Behavior : FSpotTableBehavior<FSpotTagRow>, Object {
-    private static FSpotTagsV0Behavior instance;
-    
-    private FSpotTagsV0Behavior() {
-    }
-    
-    public static FSpotTagsV0Behavior get_instance() {
-        if (instance == null)
-            instance = new FSpotTagsV0Behavior();
-        return instance;
-    }
-    
-    public string get_table_name() {
-        return FSpotTagsTable.TABLE_NAME;
-    }
-
-    public string[] list_columns() {
-        return { "id", "name", "category_id", "is_category", "sort_priority", "icon" };
-    }
-    
-    public void build_row(Sqlite.Statement stmt, out FSpotTagRow row, int offset = 0) {
-        row = new FSpotTagRow();
-        row.tag_id = stmt.column_int64(offset + 0);
-        row.name = stmt.column_text(offset + 1);
-        row.category_id = stmt.column_int64(offset + 2);
-        row.is_category = (stmt.column_int(offset + 3) > 0);
-        row.sort_priority = stmt.column_int(offset + 4);
-        string icon_str = stmt.column_text(offset + 5);
-        if (icon_str != null && icon_str.has_prefix(FSpotTagsTable.PREFIX_STOCK_ICON))
-            row.stock_icon = icon_str;
-        else
-            row.stock_icon = "";
-    }
-}
-
-}
-
diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c
deleted file mode 100644
index eb9eec2..0000000
--- a/plugins/shotwell-data-imports/SqliteSupport.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/* SqliteSupport.c generated by valac 0.36.6, the Vala compiler
- * generated from SqliteSupport.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sqlite3.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_IMPORTABLE_DATABASE_TABLE (importable_database_table_get_type ())
-#define IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable))
-#define IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-#define IS_IMPORTABLE_DATABASE_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IS_IMPORTABLE_DATABASE_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMPORTABLE_DATABASE_TABLE))
-#define IMPORTABLE_DATABASE_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTableClass))
-
-typedef struct _ImportableDatabaseTable ImportableDatabaseTable;
-typedef struct _ImportableDatabaseTableClass ImportableDatabaseTableClass;
-typedef struct _ImportableDatabaseTablePrivate ImportableDatabaseTablePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _ParamSpecImportableDatabaseTable ParamSpecImportableDatabaseTable;
-
-typedef enum  {
-	DATABASE_ERROR_ERROR,
-	DATABASE_ERROR_BACKING,
-	DATABASE_ERROR_MEMORY,
-	DATABASE_ERROR_ABORT,
-	DATABASE_ERROR_LIMITS,
-	DATABASE_ERROR_TYPESPEC
-} DatabaseError;
-#define DATABASE_ERROR database_error_quark ()
-struct _ImportableDatabaseTable {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ImportableDatabaseTablePrivate * priv;
-	gchar* table_name;
-};
-
-struct _ImportableDatabaseTableClass {
-	GTypeClass parent_class;
-	void (*finalize) (ImportableDatabaseTable *self);
-};
-
-struct _ParamSpecImportableDatabaseTable {
-	GParamSpec parent_instance;
-};
-
-
-static gpointer importable_database_table_parent_class = NULL;
-extern sqlite3* importable_database_table_db;
-sqlite3* importable_database_table_db = NULL;
-
-GQuark database_error_quark (void);
-gpointer importable_database_table_ref (gpointer instance);
-void importable_database_table_unref (gpointer instance);
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_importable_database_table (GValue* value, gpointer v_object);
-void value_take_importable_database_table (GValue* value, gpointer v_object);
-gpointer value_get_importable_database_table (const GValue* value);
-GType importable_database_table_get_type (void) G_GNUC_CONST;
-enum  {
-	IMPORTABLE_DATABASE_TABLE_DUMMY_PROPERTY
-};
-void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name);
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-ImportableDatabaseTable* importable_database_table_construct (GType object_type);
-static void importable_database_table_finalize (ImportableDatabaseTable * obj);
-
-
-GQuark database_error_quark (void) {
-	return g_quark_from_static_string ("database_error-quark");
-}
-
-
-void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_if_fail (IS_IMPORTABLE_DATABASE_TABLE (self));
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_if_fail (table_name != NULL);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp0_ = table_name;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_g_free0 (self->table_name);
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	self->table_name = _tmp1_;
-#line 99 "SqliteSupport.c"
-}
-
-
-void importable_database_table_throw_error (const gchar* method, gint res, GError** error) {
-	gchar* msg = NULL;
-	const gchar* _tmp0_;
-	gint _tmp1_;
-	sqlite3* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gint _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_if_fail (method != NULL);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp0_ = method;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp1_ = res;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp2_ = importable_database_table_db;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp4_ = g_strdup_printf ("(%s) [%d] - %s", _tmp0_, _tmp1_, _tmp3_);
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	msg = _tmp4_;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_tmp5_ = res;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	switch (_tmp5_) {
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_OK:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_DONE:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_ROW:
-#line 136 "SqliteSupport.c"
-		{
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_g_free0 (msg);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			return;
-#line 142 "SqliteSupport.c"
-		}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_PERM:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_BUSY:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_READONLY:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_IOERR:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_CORRUPT:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_CANTOPEN:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_NOLFS:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_AUTH:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_FORMAT:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_NOTADB:
-#line 164 "SqliteSupport.c"
-		{
-			const gchar* _tmp6_;
-			GError* _tmp7_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp6_ = msg;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp7_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp6_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp7_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 182 "SqliteSupport.c"
-			} else {
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 192 "SqliteSupport.c"
-			}
-		}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_NOMEM:
-#line 197 "SqliteSupport.c"
-		{
-			const gchar* _tmp8_;
-			GError* _tmp9_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp8_ = msg;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp9_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp8_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp9_;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 215 "SqliteSupport.c"
-			} else {
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 225 "SqliteSupport.c"
-			}
-		}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_ABORT:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_LOCKED:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_INTERRUPT:
-#line 234 "SqliteSupport.c"
-		{
-			const gchar* _tmp10_;
-			GError* _tmp11_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp10_ = msg;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp11_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp10_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp11_;
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 252 "SqliteSupport.c"
-			} else {
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 262 "SqliteSupport.c"
-			}
-		}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_FULL:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_EMPTY:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_TOOBIG:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_CONSTRAINT:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_RANGE:
-#line 275 "SqliteSupport.c"
-		{
-			const gchar* _tmp12_;
-			GError* _tmp13_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp12_ = msg;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp13_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp12_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp13_;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 293 "SqliteSupport.c"
-			} else {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 303 "SqliteSupport.c"
-			}
-		}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_SCHEMA:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_MISMATCH:
-#line 310 "SqliteSupport.c"
-		{
-			const gchar* _tmp14_;
-			GError* _tmp15_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp14_ = msg;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp15_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp14_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp15_;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 328 "SqliteSupport.c"
-			} else {
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 338 "SqliteSupport.c"
-			}
-		}
-		default:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_ERROR:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_INTERNAL:
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		case SQLITE_MISUSE:
-#line 348 "SqliteSupport.c"
-		{
-			const gchar* _tmp16_;
-			GError* _tmp17_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp16_ = msg;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_tmp17_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp16_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			_inner_error_ = _tmp17_;
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_propagate_error (error, _inner_error_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 366 "SqliteSupport.c"
-			} else {
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				_g_free0 (msg);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				g_clear_error (&_inner_error_);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-				return;
-#line 376 "SqliteSupport.c"
-			}
-		}
-	}
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_g_free0 (msg);
-#line 382 "SqliteSupport.c"
-}
-
-
-ImportableDatabaseTable* importable_database_table_construct (GType object_type) {
-	ImportableDatabaseTable* self = NULL;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	self = (ImportableDatabaseTable*) g_type_create_instance (object_type);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return self;
-#line 392 "SqliteSupport.c"
-}
-
-
-static void value_importable_database_table_init (GValue* value) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	value->data[0].v_pointer = NULL;
-#line 399 "SqliteSupport.c"
-}
-
-
-static void value_importable_database_table_free_value (GValue* value) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (value->data[0].v_pointer) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		importable_database_table_unref (value->data[0].v_pointer);
-#line 408 "SqliteSupport.c"
-	}
-}
-
-
-static void value_importable_database_table_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (src_value->data[0].v_pointer) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		dest_value->data[0].v_pointer = importable_database_table_ref (src_value->data[0].v_pointer);
-#line 418 "SqliteSupport.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 422 "SqliteSupport.c"
-	}
-}
-
-
-static gpointer value_importable_database_table_peek_pointer (const GValue* value) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return value->data[0].v_pointer;
-#line 430 "SqliteSupport.c"
-}
-
-
-static gchar* value_importable_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (collect_values[0].v_pointer) {
-#line 437 "SqliteSupport.c"
-		ImportableDatabaseTable * object;
-		object = collect_values[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 444 "SqliteSupport.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.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 448 "SqliteSupport.c"
-		}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = importable_database_table_ref (object);
-#line 452 "SqliteSupport.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = NULL;
-#line 456 "SqliteSupport.c"
-	}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return NULL;
-#line 460 "SqliteSupport.c"
-}
-
-
-static gchar* value_importable_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ImportableDatabaseTable ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (!object_p) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 471 "SqliteSupport.c"
-	}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (!value->data[0].v_pointer) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		*object_p = NULL;
-#line 477 "SqliteSupport.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		*object_p = value->data[0].v_pointer;
-#line 481 "SqliteSupport.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		*object_p = importable_database_table_ref (value->data[0].v_pointer);
-#line 485 "SqliteSupport.c"
-	}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return NULL;
-#line 489 "SqliteSupport.c"
-}
-
-
-GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecImportableDatabaseTable* spec;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_IMPORTABLE_DATABASE_TABLE), NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return G_PARAM_SPEC (spec);
-#line 503 "SqliteSupport.c"
-}
-
-
-gpointer value_get_importable_database_table (const GValue* value) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE), NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return value->data[0].v_pointer;
-#line 512 "SqliteSupport.c"
-}
-
-
-void value_set_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable * old;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	old = value->data[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (v_object) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_IMPORTABLE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = v_object;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		importable_database_table_ref (value->data[0].v_pointer);
-#line 532 "SqliteSupport.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = NULL;
-#line 536 "SqliteSupport.c"
-	}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (old) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		importable_database_table_unref (old);
-#line 542 "SqliteSupport.c"
-	}
-}
-
-
-void value_take_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable * old;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	old = value->data[0].v_pointer;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (v_object) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_IMPORTABLE_DATABASE_TABLE));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = v_object;
-#line 561 "SqliteSupport.c"
-	} else {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		value->data[0].v_pointer = NULL;
-#line 565 "SqliteSupport.c"
-	}
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (old) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		importable_database_table_unref (old);
-#line 571 "SqliteSupport.c"
-	}
-}
-
-
-static void importable_database_table_class_init (ImportableDatabaseTableClass * klass) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	importable_database_table_parent_class = g_type_class_peek_parent (klass);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	((ImportableDatabaseTableClass *) klass)->finalize = importable_database_table_finalize;
-#line 581 "SqliteSupport.c"
-}
-
-
-static void importable_database_table_instance_init (ImportableDatabaseTable * self) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	self->table_name = NULL;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	self->ref_count = 1;
-#line 590 "SqliteSupport.c"
-}
-
-
-static void importable_database_table_finalize (ImportableDatabaseTable * obj) {
-	ImportableDatabaseTable * self;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_signal_handlers_destroy (self);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	_g_free0 (self->table_name);
-#line 602 "SqliteSupport.c"
-}
-
-
-GType importable_database_table_get_type (void) {
-	static volatile gsize importable_database_table_type_id__volatile = 0;
-	if (g_once_init_enter (&importable_database_table_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_importable_database_table_init, value_importable_database_table_free_value, value_importable_database_table_copy_value, value_importable_database_table_peek_pointer, "p", value_importable_database_table_collect_value, "p", value_importable_database_table_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ImportableDatabaseTableClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) importable_database_table_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportableDatabaseTable), 0, (GInstanceInitFunc) importable_database_table_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType importable_database_table_type_id;
-		importable_database_table_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ImportableDatabaseTable", &g_define_type_info, &g_define_type_fundamental_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&importable_database_table_type_id__volatile, importable_database_table_type_id);
-	}
-	return importable_database_table_type_id__volatile;
-}
-
-
-gpointer importable_database_table_ref (gpointer instance) {
-	ImportableDatabaseTable * self;
-	self = instance;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	return instance;
-#line 627 "SqliteSupport.c"
-}
-
-
-void importable_database_table_unref (gpointer instance) {
-	ImportableDatabaseTable * self;
-	self = instance;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		IMPORTABLE_DATABASE_TABLE_GET_CLASS (self)->finalize (self);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 640 "SqliteSupport.c"
-	}
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/SqliteSupport.vala b/plugins/shotwell-data-imports/SqliteSupport.vala
deleted file mode 100644
index 859dc84..0000000
--- a/plugins/shotwell-data-imports/SqliteSupport.vala
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-public errordomain DatabaseError {
-    ERROR,
-    BACKING,
-    MEMORY,
-    ABORT,
-    LIMITS,
-    TYPESPEC
-}
-
-public abstract class ImportableDatabaseTable {
-
-    protected static Sqlite.Database db;
-
-    public string table_name = null;
-
-    protected void set_table_name(string table_name) {
-        this.table_name = table_name;
-    }
-
-    // This method will throw an error on an SQLite return code unless it's OK, DONE, or ROW, which
-    // are considered normal results.
-    protected static void throw_error(string method, int res) throws DatabaseError {
-        string msg = "(%s) [%d] - %s".printf(method, res, db.errmsg());
-
-        switch (res) {
-            case Sqlite.OK:
-            case Sqlite.DONE:
-            case Sqlite.ROW:
-                return;
-
-            case Sqlite.PERM:
-            case Sqlite.BUSY:
-            case Sqlite.READONLY:
-            case Sqlite.IOERR:
-            case Sqlite.CORRUPT:
-            case Sqlite.CANTOPEN:
-            case Sqlite.NOLFS:
-            case Sqlite.AUTH:
-            case Sqlite.FORMAT:
-            case Sqlite.NOTADB:
-                throw new DatabaseError.BACKING(msg);
-
-            case Sqlite.NOMEM:
-                throw new DatabaseError.MEMORY(msg);
-
-            case Sqlite.ABORT:
-            case Sqlite.LOCKED:
-            case Sqlite.INTERRUPT:
-                throw new DatabaseError.ABORT(msg);
-
-            case Sqlite.FULL:
-            case Sqlite.EMPTY:
-            case Sqlite.TOOBIG:
-            case Sqlite.CONSTRAINT:
-            case Sqlite.RANGE:
-                throw new DatabaseError.LIMITS(msg);
-
-            case Sqlite.SCHEMA:
-            case Sqlite.MISMATCH:
-                throw new DatabaseError.TYPESPEC(msg);
-
-            case Sqlite.ERROR:
-            case Sqlite.INTERNAL:
-            case Sqlite.MISUSE:
-            default:
-                throw new DatabaseError.ERROR(msg);
-        }
-    }
-}
diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c
deleted file mode 100644
index dd5f414..0000000
--- a/plugins/shotwell-data-imports/VersionNumber.c
+++ /dev/null
@@ -1,1053 +0,0 @@
-/* VersionNumber.c generated by valac 0.36.6, the Vala compiler
- * generated from VersionNumber.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gee.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define UTILS_TYPE_VERSION_NUMBER (utils_version_number_get_type ())
-#define UTILS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber))
-#define UTILS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-#define UTILS_IS_VERSION_NUMBER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_IS_VERSION_NUMBER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UTILS_TYPE_VERSION_NUMBER))
-#define UTILS_VERSION_NUMBER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberClass))
-
-typedef struct _UtilsVersionNumber UtilsVersionNumber;
-typedef struct _UtilsVersionNumberClass UtilsVersionNumberClass;
-typedef struct _UtilsVersionNumberPrivate UtilsVersionNumberPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-struct _UtilsVersionNumber {
-	GObject parent_instance;
-	UtilsVersionNumberPrivate * priv;
-};
-
-struct _UtilsVersionNumberClass {
-	GObjectClass parent_class;
-};
-
-struct _UtilsVersionNumberPrivate {
-	gint* version;
-	gint version_length1;
-	gint _version_size_;
-};
-
-
-static gpointer utils_version_number_parent_class = NULL;
-static GeeComparableIface * utils_version_number_gee_comparable_parent_iface = NULL;
-
-GType utils_version_number_get_type (void) G_GNUC_CONST;
-#define UTILS_VERSION_NUMBER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberPrivate))
-enum  {
-	UTILS_VERSION_NUMBER_DUMMY_PROPERTY
-};
-UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1);
-UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1);
-static gint* _vala_array_dup3 (gint* self, int length);
-UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator);
-UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator);
-gchar* utils_version_number_to_string (UtilsVersionNumber* self);
-static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVersionNumber* other);
-static void utils_version_number_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 gint _vala_array_length (gpointer array);
-
-
-static gint* _vala_array_dup3 (gint* self, int length) {
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return g_memdup (self, length * sizeof (gint));
-#line 70 "VersionNumber.c"
-}
-
-
-UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1) {
-	UtilsVersionNumber * self = NULL;
-	gint* _tmp0_;
-	gint _tmp0__length1;
-	gint* _tmp1_;
-	gint _tmp1__length1;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self = (UtilsVersionNumber*) g_object_new (object_type, NULL);
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp0_ = version;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp0__length1 = version_length1;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version = (g_free (self->priv->version), NULL);
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version = _tmp1_;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version_length1 = _tmp1__length1;
-#line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->_version_size_ = self->priv->version_length1;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return self;
-#line 100 "VersionNumber.c"
-}
-
-
-UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1) {
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return utils_version_number_construct (UTILS_TYPE_VERSION_NUMBER, version, version_length1);
-#line 107 "VersionNumber.c"
-}
-
-
-UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator) {
-	UtilsVersionNumber * self = NULL;
-	gchar** version_items = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint version_items_length1;
-	gint _version_items_size_;
-	gchar** _tmp4_;
-	gint _tmp4__length1;
-	gint* _tmp5_;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	g_return_val_if_fail (str_version != NULL, NULL);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	g_return_val_if_fail (separator != NULL, NULL);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self = (UtilsVersionNumber*) g_object_new (object_type, NULL);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp0_ = str_version;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1_ = separator;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items = _tmp3_;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items_length1 = _vala_array_length (_tmp2_);
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_version_items_size_ = version_items_length1;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp4_ = version_items;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp4__length1 = version_items_length1;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp5_ = g_new0 (gint, _tmp4__length1);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version = (g_free (self->priv->version), NULL);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version = _tmp5_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version_length1 = _tmp4__length1;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->_version_size_ = self->priv->version_length1;
-#line 155 "VersionNumber.c"
-	{
-		gint i = 0;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		i = 0;
-#line 160 "VersionNumber.c"
-		{
-			gboolean _tmp6_ = FALSE;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			_tmp6_ = TRUE;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			while (TRUE) {
-#line 167 "VersionNumber.c"
-				gint _tmp8_;
-				gchar** _tmp9_;
-				gint _tmp9__length1;
-				gint* _tmp10_;
-				gint _tmp10__length1;
-				gint _tmp11_;
-				gchar** _tmp12_;
-				gint _tmp12__length1;
-				gint _tmp13_;
-				const gchar* _tmp14_;
-				gint _tmp15_;
-				gint _tmp16_;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!_tmp6_) {
-#line 182 "VersionNumber.c"
-					gint _tmp7_;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp7_ = i;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					i = _tmp7_ + 1;
-#line 188 "VersionNumber.c"
-				}
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp6_ = FALSE;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp8_ = i;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp9_ = version_items;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp9__length1 = version_items_length1;
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!(_tmp8_ < _tmp9__length1)) {
-#line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					break;
-#line 202 "VersionNumber.c"
-				}
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp10_ = self->priv->version;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp10__length1 = self->priv->version_length1;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp11_ = i;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp12_ = version_items;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp12__length1 = version_items_length1;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp13_ = i;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp14_ = _tmp12_[_tmp13_];
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp15_ = atoi (_tmp14_);
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp10_[_tmp11_] = _tmp15_;
-#line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp16_ = _tmp10_[_tmp11_];
-#line 224 "VersionNumber.c"
-			}
-		}
-	}
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items = (_vala_array_free (version_items, version_items_length1, (GDestroyNotify) g_free), NULL);
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return self;
-#line 232 "VersionNumber.c"
-}
-
-
-UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return utils_version_number_construct_from_string (UTILS_TYPE_VERSION_NUMBER, str_version, separator);
-#line 239 "VersionNumber.c"
-}
-
-
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		separator = "";
-#line 256 "VersionNumber.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 266 "VersionNumber.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 276 "VersionNumber.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 282 "VersionNumber.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 293 "VersionNumber.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 305 "VersionNumber.c"
-		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 309 "VersionNumber.c"
-		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 313 "VersionNumber.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 317 "VersionNumber.c"
-		gint i = 0;
-		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
-		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = (gsize) 1;
-#line 340 "VersionNumber.c"
-		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 349 "VersionNumber.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 362 "VersionNumber.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 368 "VersionNumber.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 378 "VersionNumber.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 390 "VersionNumber.c"
-				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 394 "VersionNumber.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 400 "VersionNumber.c"
-				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 411 "VersionNumber.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 426 "VersionNumber.c"
-					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 430 "VersionNumber.c"
-					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 434 "VersionNumber.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 440 "VersionNumber.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 452 "VersionNumber.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 473 "VersionNumber.c"
-				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 477 "VersionNumber.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 483 "VersionNumber.c"
-			}
-		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 490 "VersionNumber.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return result;
-#line 498 "VersionNumber.c"
-		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 536 "VersionNumber.c"
-		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 545 "VersionNumber.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 561 "VersionNumber.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 567 "VersionNumber.c"
-				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 581 "VersionNumber.c"
-				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 601 "VersionNumber.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 616 "VersionNumber.c"
-				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 620 "VersionNumber.c"
-				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 628 "VersionNumber.c"
-			}
-		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 639 "VersionNumber.c"
-	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 648 "VersionNumber.c"
-	}
-}
-
-
-gchar* utils_version_number_to_string (UtilsVersionNumber* self) {
-	gchar* result = NULL;
-	gchar** version_items = NULL;
-	gint* _tmp0_;
-	gint _tmp0__length1;
-	gchar** _tmp1_;
-	gint version_items_length1;
-	gint _version_items_size_;
-	gchar** _tmp13_;
-	gint _tmp13__length1;
-	gchar* _tmp14_;
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (self), NULL);
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp0_ = self->priv->version;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp0__length1 = self->priv->version_length1;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1_ = g_new0 (gchar*, _tmp0__length1 + 1);
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items = _tmp1_;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items_length1 = _tmp0__length1;
-#line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_version_items_size_ = version_items_length1;
-#line 678 "VersionNumber.c"
-	{
-		gint i = 0;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		i = 0;
-#line 683 "VersionNumber.c"
-		{
-			gboolean _tmp2_ = FALSE;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			_tmp2_ = TRUE;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			while (TRUE) {
-#line 690 "VersionNumber.c"
-				gint _tmp4_;
-				gint* _tmp5_;
-				gint _tmp5__length1;
-				gchar** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
-				gint* _tmp8_;
-				gint _tmp8__length1;
-				gint _tmp9_;
-				gint _tmp10_;
-				gchar* _tmp11_;
-				gchar* _tmp12_;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!_tmp2_) {
-#line 705 "VersionNumber.c"
-					gint _tmp3_;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp3_ = i;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					i = _tmp3_ + 1;
-#line 711 "VersionNumber.c"
-				}
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp2_ = FALSE;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp4_ = i;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp5_ = self->priv->version;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp5__length1 = self->priv->version_length1;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!(_tmp4_ < _tmp5__length1)) {
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					break;
-#line 725 "VersionNumber.c"
-				}
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp6_ = version_items;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp6__length1 = version_items_length1;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp7_ = i;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp8_ = self->priv->version;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp8__length1 = self->priv->version_length1;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp9_ = i;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp10_ = _tmp8_[_tmp9_];
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp11_ = g_strdup_printf ("%i", _tmp10_);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_g_free0 (_tmp6_[_tmp7_]);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp6_[_tmp7_] = _tmp11_;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp12_ = _tmp6_[_tmp7_];
-#line 749 "VersionNumber.c"
-			}
-		}
-	}
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp13_ = version_items;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp13__length1 = version_items_length1;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp14_ = _vala_g_strjoinv (".", _tmp13_, _tmp13__length1);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	result = _tmp14_;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	version_items = (_vala_array_free (version_items, version_items_length1, (GDestroyNotify) g_free), NULL);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return result;
-#line 765 "VersionNumber.c"
-}
-
-
-static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVersionNumber* other) {
-	UtilsVersionNumber * self;
-	gint result = 0;
-	gint _tmp0_ = 0;
-	gint* _tmp1_;
-	gint _tmp1__length1;
-	UtilsVersionNumber* _tmp2_;
-	gint* _tmp3_;
-	gint _tmp3__length1;
-	gint max_len = 0;
-	gint res = 0;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (other), 0);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1_ = self->priv->version;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp1__length1 = self->priv->version_length1;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp2_ = other;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp3_ = _tmp2_->priv->version;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	_tmp3__length1 = _tmp2_->priv->version_length1;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	if (_tmp1__length1 > _tmp3__length1) {
-#line 796 "VersionNumber.c"
-		gint* _tmp4_;
-		gint _tmp4__length1;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp4_ = self->priv->version;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp4__length1 = self->priv->version_length1;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp0_ = _tmp4__length1;
-#line 805 "VersionNumber.c"
-	} else {
-		UtilsVersionNumber* _tmp5_;
-		gint* _tmp6_;
-		gint _tmp6__length1;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp5_ = other;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp6_ = _tmp5_->priv->version;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp6__length1 = _tmp5_->priv->version_length1;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		_tmp0_ = _tmp6__length1;
-#line 818 "VersionNumber.c"
-	}
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	max_len = _tmp0_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	res = 0;
-#line 824 "VersionNumber.c"
-	{
-		gint i = 0;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-		i = 0;
-#line 829 "VersionNumber.c"
-		{
-			gboolean _tmp7_ = FALSE;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			_tmp7_ = TRUE;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-			while (TRUE) {
-#line 836 "VersionNumber.c"
-				gint _tmp9_;
-				gint _tmp10_;
-				gint _tmp11_ = 0;
-				gint _tmp12_;
-				gint* _tmp13_;
-				gint _tmp13__length1;
-				gint this_v = 0;
-				gint _tmp17_ = 0;
-				gint _tmp18_;
-				UtilsVersionNumber* _tmp19_;
-				gint* _tmp20_;
-				gint _tmp20__length1;
-				gint other_v = 0;
-				gint _tmp25_;
-				gint _tmp26_;
-				gint _tmp27_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!_tmp7_) {
-#line 855 "VersionNumber.c"
-					gint _tmp8_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp8_ = i;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					i = _tmp8_ + 1;
-#line 861 "VersionNumber.c"
-				}
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp7_ = FALSE;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp9_ = i;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp10_ = max_len;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (!(_tmp9_ < _tmp10_)) {
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					break;
-#line 873 "VersionNumber.c"
-				}
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp12_ = i;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp13_ = self->priv->version;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp13__length1 = self->priv->version_length1;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (_tmp12_ < _tmp13__length1) {
-#line 883 "VersionNumber.c"
-					gint* _tmp14_;
-					gint _tmp14__length1;
-					gint _tmp15_;
-					gint _tmp16_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp14_ = self->priv->version;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp14__length1 = self->priv->version_length1;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp15_ = i;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp16_ = _tmp14_[_tmp15_];
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp11_ = _tmp16_;
-#line 898 "VersionNumber.c"
-				} else {
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp11_ = 0;
-#line 902 "VersionNumber.c"
-				}
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				this_v = _tmp11_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp18_ = i;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp19_ = other;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp20_ = _tmp19_->priv->version;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp20__length1 = _tmp19_->priv->version_length1;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (_tmp18_ < _tmp20__length1) {
-#line 916 "VersionNumber.c"
-					UtilsVersionNumber* _tmp21_;
-					gint* _tmp22_;
-					gint _tmp22__length1;
-					gint _tmp23_;
-					gint _tmp24_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp21_ = other;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp22_ = _tmp21_->priv->version;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp22__length1 = _tmp21_->priv->version_length1;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp23_ = i;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp24_ = _tmp22_[_tmp23_];
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp17_ = _tmp24_;
-#line 934 "VersionNumber.c"
-				} else {
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					_tmp17_ = 0;
-#line 938 "VersionNumber.c"
-				}
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				other_v = _tmp17_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp25_ = this_v;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp26_ = other_v;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				res = _tmp25_ - _tmp26_;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				_tmp27_ = res;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-				if (_tmp27_ != 0) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-					break;
-#line 954 "VersionNumber.c"
-				}
-			}
-		}
-	}
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	result = res;
-#line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	return result;
-#line 963 "VersionNumber.c"
-}
-
-
-static void utils_version_number_class_init (UtilsVersionNumberClass * klass) {
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	utils_version_number_parent_class = g_type_class_peek_parent (klass);
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	g_type_class_add_private (klass, sizeof (UtilsVersionNumberPrivate));
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	G_OBJECT_CLASS (klass)->finalize = utils_version_number_finalize;
-#line 974 "VersionNumber.c"
-}
-
-
-static void utils_version_number_gee_comparable_interface_init (GeeComparableIface * iface) {
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	utils_version_number_gee_comparable_parent_iface = g_type_interface_peek_parent (iface);
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	iface->compare_to = (gint (*) (GeeComparable *, gconstpointer)) utils_version_number_real_compare_to;
-#line 983 "VersionNumber.c"
-}
-
-
-static void utils_version_number_instance_init (UtilsVersionNumber * self) {
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv = UTILS_VERSION_NUMBER_GET_PRIVATE (self);
-#line 990 "VersionNumber.c"
-}
-
-
-static void utils_version_number_finalize (GObject * obj) {
-	UtilsVersionNumber * self;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	self->priv->version = (g_free (self->priv->version), NULL);
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	G_OBJECT_CLASS (utils_version_number_parent_class)->finalize (obj);
-#line 1002 "VersionNumber.c"
-}
-
-
-/**
- * A class that represents a version number in the form x.y.z and is able to compare
- * different versions.
- */
-GType utils_version_number_get_type (void) {
-	static volatile gsize utils_version_number_type_id__volatile = 0;
-	if (g_once_init_enter (&utils_version_number_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (UtilsVersionNumberClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) utils_version_number_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (UtilsVersionNumber), 0, (GInstanceInitFunc) utils_version_number_instance_init, NULL };
-		static const GInterfaceInfo gee_comparable_info = { (GInterfaceInitFunc) utils_version_number_gee_comparable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType utils_version_number_type_id;
-		utils_version_number_type_id = g_type_register_static (G_TYPE_OBJECT, "UtilsVersionNumber", &g_define_type_info, 0);
-		g_type_add_interface_static (utils_version_number_type_id, GEE_TYPE_COMPARABLE, &gee_comparable_info);
-		g_once_init_leave (&utils_version_number_type_id__volatile, utils_version_number_type_id);
-	}
-	return utils_version_number_type_id__volatile;
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/VersionNumber.vala b/plugins/shotwell-data-imports/VersionNumber.vala
deleted file mode 100644
index 7077597..0000000
--- a/plugins/shotwell-data-imports/VersionNumber.vala
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-namespace Utils {
-
-/**
- * A class that represents a version number in the form x.y.z and is able to compare
- * different versions.
- */
-public class VersionNumber : Object, Gee.Comparable<VersionNumber> {
-    private int[] version;
-
-    public VersionNumber(int[] version) {
-        this.version = version;
-    }
-
-    public VersionNumber.from_string(string str_version, string separator = ".") {
-        string[] version_items = str_version.split(separator);
-        this.version = new int[version_items.length];
-        for (int i = 0; i < version_items.length; i++)
-            this.version[i] = int.parse(version_items[i]);
-    }
-
-    public string to_string() {
-        string[] version_items = new string[this.version.length];
-        for (int i = 0; i < this.version.length; i++)
-            version_items[i] = this.version[i].to_string();
-        return string.joinv(".", version_items);
-    }
-
-    public int compare_to(VersionNumber other) {
-        int max_len = ((this.version.length > other.version.length) ?
-                       this.version.length : other.version.length);
-        int res = 0;
-        for(int i = 0; i < max_len; i++) {
-            int this_v = (i < this.version.length ? this.version[i] : 0);
-            int other_v = (i < other.version.length ? other.version[i] : 0);
-            res = this_v - other_v;
-            if (res != 0)
-                break;
-        }
-        return res;
-    }
-}
-
-}
diff --git a/plugins/shotwell-data-imports/f-spot-24.png b/plugins/shotwell-data-imports/f-spot-24.png
deleted file mode 100644
index fda9672..0000000
--- a/plugins/shotwell-data-imports/f-spot-24.png
+++ /dev/null
diff --git a/plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml b/plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
deleted file mode 100644
index 0c77317..0000000
--- a/plugins/shotwell-data-imports/org.gnome.Shotwell.Imports.gresource.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Shotwell/Imports">
-    <file>f-spot-24.png</file>
-  </gresource>
-</gresources>
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c
deleted file mode 100644
index 467066b..0000000
--- a/plugins/shotwell-data-imports/shotwell-data-imports.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* shotwell-data-imports.c generated by valac 0.36.6, the Vala compiler
- * generated from shotwell-data-imports.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <shotwell-plugin-dev-1.0.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib/gi18n-lib.h>
-
-
-#define TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES (shotwell_data_imports_core_services_get_type ())
-#define SHOTWELL_DATA_IMPORTS_CORE_SERVICES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices))
-#define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesClass))
-#define IS_SHOTWELL_DATA_IMPORTS_CORE_SERVICES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES))
-#define IS_SHOTWELL_DATA_IMPORTS_CORE_SERVICES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES))
-#define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesClass))
-
-typedef struct _ShotwellDataImportsCoreServices ShotwellDataImportsCoreServices;
-typedef struct _ShotwellDataImportsCoreServicesClass ShotwellDataImportsCoreServicesClass;
-typedef struct _ShotwellDataImportsCoreServicesPrivate ShotwellDataImportsCoreServicesPrivate;
-
-#define TYPE_FSPOT_SERVICE (fspot_service_get_type ())
-#define FSPOT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FSPOT_SERVICE, FSpotService))
-#define FSPOT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FSPOT_SERVICE, FSpotServiceClass))
-#define IS_FSPOT_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FSPOT_SERVICE))
-#define IS_FSPOT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FSPOT_SERVICE))
-#define FSPOT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FSPOT_SERVICE, FSpotServiceClass))
-
-typedef struct _FSpotService FSpotService;
-typedef struct _FSpotServiceClass FSpotServiceClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-struct _ShotwellDataImportsCoreServices {
-	GObject parent_instance;
-	ShotwellDataImportsCoreServicesPrivate * priv;
-};
-
-struct _ShotwellDataImportsCoreServicesClass {
-	GObjectClass parent_class;
-};
-
-struct _ShotwellDataImportsCoreServicesPrivate {
-	SpitPluggable** pluggables;
-	gint pluggables_length1;
-	gint _pluggables_size_;
-};
-
-
-static gpointer shotwell_data_imports_core_services_parent_class = NULL;
-static SpitModuleIface * shotwell_data_imports_core_services_spit_module_parent_iface = NULL;
-
-GType shotwell_data_imports_core_services_get_type (void) G_GNUC_CONST;
-#define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesPrivate))
-enum  {
-	SHOTWELL_DATA_IMPORTS_CORE_SERVICES_DUMMY_PROPERTY
-};
-ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_new (GFile* module_file);
-ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (GType object_type, GFile* module_file);
-FSpotService* fspot_service_new (GFile* resource_directory);
-FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory);
-GType fspot_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
-static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base);
-static const gchar* shotwell_data_imports_core_services_real_get_version (SpitModule* base);
-static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* base);
-static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
-static void shotwell_data_imports_core_services_finalize (GObject * obj);
-SpitModule* spit_entry_point (SpitEntryPointParams* params);
-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 void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	if ((*length) == (*size)) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 89 "shotwell-data-imports.c"
-	}
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	(*array)[(*length)++] = value;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	(*array)[*length] = NULL;
-#line 95 "shotwell-data-imports.c"
-}
-
-
-ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (GType object_type, GFile* module_file) {
-	ShotwellDataImportsCoreServices * self = NULL;
-	GFile* resource_directory = NULL;
-	GFile* _tmp0_;
-	GFile* _tmp1_;
-	SpitPluggable** _tmp2_;
-	gint _tmp2__length1;
-	FSpotService* _tmp3_;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = (ShotwellDataImportsCoreServices*) g_object_new (object_type, NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0_ = module_file;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp1_ = g_file_get_parent (_tmp0_);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	resource_directory = _tmp1_;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp2_ = self->priv->pluggables;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp3_ = fspot_service_new (resource_directory);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_vala_array_add7 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_g_object_unref0 (resource_directory);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return self;
-#line 129 "shotwell-data-imports.c"
-}
-
-
-ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_new (GFile* module_file) {
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return shotwell_data_imports_core_services_construct (TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, module_file);
-#line 136 "shotwell-data-imports.c"
-}
-
-
-static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base) {
-	ShotwellDataImportsCoreServices * self;
-	const gchar* result = NULL;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = _ ("Core Data Import Services");
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return result;
-#line 149 "shotwell-data-imports.c"
-}
-
-
-static const gchar* shotwell_data_imports_core_services_real_get_version (SpitModule* base) {
-	ShotwellDataImportsCoreServices * self;
-	const gchar* result = NULL;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = _VERSION;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return result;
-#line 162 "shotwell-data-imports.c"
-}
-
-
-static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* base) {
-	ShotwellDataImportsCoreServices * self;
-	const gchar* result = NULL;
-#line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = "org.yorba.shotwell.data_imports.core_services";
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return result;
-#line 175 "shotwell-data-imports.c"
-}
-
-
-static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
-	ShotwellDataImportsCoreServices * self;
-	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_;
-	gint _tmp0__length1;
-	SpitPluggable** _tmp1_;
-	gint _tmp1__length1;
-#line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0_ = self->priv->pluggables;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0__length1 = self->priv->pluggables_length1;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp1_ = _tmp0_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	if (result_length1) {
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		*result_length1 = _tmp1__length1;
-#line 200 "shotwell-data-imports.c"
-	}
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = _tmp1_;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return result;
-#line 206 "shotwell-data-imports.c"
-}
-
-
-static void shotwell_data_imports_core_services_class_init (ShotwellDataImportsCoreServicesClass * klass) {
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	shotwell_data_imports_core_services_parent_class = g_type_class_peek_parent (klass);
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	g_type_class_add_private (klass, sizeof (ShotwellDataImportsCoreServicesPrivate));
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	G_OBJECT_CLASS (klass)->finalize = shotwell_data_imports_core_services_finalize;
-#line 217 "shotwell-data-imports.c"
-}
-
-
-static void shotwell_data_imports_core_services_spit_module_interface_init (SpitModuleIface * iface) {
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	shotwell_data_imports_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_module_name;
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_version;
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_id;
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_data_imports_core_services_real_get_pluggables;
-#line 232 "shotwell-data-imports.c"
-}
-
-
-static void shotwell_data_imports_core_services_instance_init (ShotwellDataImportsCoreServices * self) {
-	SpitPluggable** _tmp0_;
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self->priv = SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE (self);
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0_ = g_new0 (SpitPluggable*, 0 + 1);
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self->priv->pluggables = _tmp0_;
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self->priv->pluggables_length1 = 0;
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 248 "shotwell-data-imports.c"
-}
-
-
-static void shotwell_data_imports_core_services_finalize (GObject * obj) {
-	ShotwellDataImportsCoreServices * self;
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
-#line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	G_OBJECT_CLASS (shotwell_data_imports_core_services_parent_class)->finalize (obj);
-#line 260 "shotwell-data-imports.c"
-}
-
-
-GType shotwell_data_imports_core_services_get_type (void) {
-	static volatile gsize shotwell_data_imports_core_services_type_id__volatile = 0;
-	if (g_once_init_enter (&shotwell_data_imports_core_services_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (ShotwellDataImportsCoreServicesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_data_imports_core_services_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellDataImportsCoreServices), 0, (GInstanceInitFunc) shotwell_data_imports_core_services_instance_init, NULL };
-		static const GInterfaceInfo spit_module_info = { (GInterfaceInitFunc) shotwell_data_imports_core_services_spit_module_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType shotwell_data_imports_core_services_type_id;
-		shotwell_data_imports_core_services_type_id = g_type_register_static (G_TYPE_OBJECT, "ShotwellDataImportsCoreServices", &g_define_type_info, 0);
-		g_type_add_interface_static (shotwell_data_imports_core_services_type_id, SPIT_TYPE_MODULE, &spit_module_info);
-		g_once_init_leave (&shotwell_data_imports_core_services_type_id__volatile, shotwell_data_imports_core_services_type_id);
-	}
-	return shotwell_data_imports_core_services_type_id__volatile;
-}
-
-
-SpitModule* spit_entry_point (SpitEntryPointParams* params) {
-	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_;
-	gint _tmp1_;
-	SpitEntryPointParams* _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
-	ShotwellDataImportsCoreServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_;
-	gint _tmp7_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0_ = params;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp2_ = params;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	(*params).module_spit_interface = _tmp4_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp6_ = params;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 306 "shotwell-data-imports.c"
-		SpitEntryPointParams* _tmp8_;
-		GFile* _tmp9_;
-		ShotwellDataImportsCoreServices* _tmp10_;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_tmp8_ = params;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_tmp9_ = (*_tmp8_).module_file;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_tmp10_ = shotwell_data_imports_core_services_new (_tmp9_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_g_object_unref0 (_tmp5_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_tmp5_ = _tmp10_;
-#line 320 "shotwell-data-imports.c"
-	} else {
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_g_object_unref0 (_tmp5_);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-		_tmp5_ = NULL;
-#line 326 "shotwell-data-imports.c"
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	return result;
-#line 332 "shotwell-data-imports.c"
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.vala b/plugins/shotwell-data-imports/shotwell-data-imports.vala
deleted file mode 100644
index 78dace0..0000000
--- a/plugins/shotwell-data-imports/shotwell-data-imports.vala
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-extern const string _VERSION;
-
-// "core services" are: F-Spot
-private class ShotwellDataImportsCoreServices : Object, Spit.Module {
-    private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
-
-    // we need to get a module file handle because our pluggables have to load resources from the
-    // module file directory
-    public ShotwellDataImportsCoreServices(GLib.File module_file) {
-        GLib.File resource_directory = module_file.get_parent();
-        
-        pluggables += new FSpotService(resource_directory);
-    }
-    
-    public unowned string get_module_name() {
-        return _("Core Data Import Services");
-    }
-    
-    public unowned string get_version() {
-        return _VERSION;
-    }
-    
-    public unowned string get_id() {
-        return "org.yorba.shotwell.data_imports.core_services";
-    }
-    
-    public unowned Spit.Pluggable[]? get_pluggables() {
-        return pluggables;
-    }
-}
-
-// This entry point is required for all SPIT modules.
-public Spit.Module? spit_entry_point(Spit.EntryPointParams *params) {
-    params->module_spit_interface = Spit.negotiate_interfaces(params->host_min_spit_interface,
-        params->host_max_spit_interface, Spit.CURRENT_INTERFACE);
-    
-    return (params->module_spit_interface != Spit.UNSUPPORTED_INTERFACE)
-        ? new ShotwellDataImportsCoreServices(params->module_file) : null;
-}
-
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index 797b04e..a4e0d62 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -122,6 +122,39 @@ typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransaction Pub
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass;
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate;
 
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION (publishing_rest_support_oauth1_session_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1SessionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Session PublishingRESTSupportOAuth1Session;
+typedef struct _PublishingRESTSupportOAuth1SessionClass PublishingRESTSupportOAuth1SessionClass;
+typedef struct _PublishingRESTSupportOAuth1SessionPrivate PublishingRESTSupportOAuth1SessionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION (publishing_rest_support_oauth1_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1Transaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, PublishingRESTSupportOAuth1TransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1Transaction PublishingRESTSupportOAuth1Transaction;
+typedef struct _PublishingRESTSupportOAuth1TransactionClass PublishingRESTSupportOAuth1TransactionClass;
+typedef struct _PublishingRESTSupportOAuth1TransactionPrivate PublishingRESTSupportOAuth1TransactionPrivate;
+
+#define PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_oauth1_upload_transaction_get_type ())
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_REST_SUPPORT_OAUTH1_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransactionClass))
+
+typedef struct _PublishingRESTSupportOAuth1UploadTransaction PublishingRESTSupportOAuth1UploadTransaction;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionClass PublishingRESTSupportOAuth1UploadTransactionClass;
+typedef struct _PublishingRESTSupportOAuth1UploadTransactionPrivate PublishingRESTSupportOAuth1UploadTransactionPrivate;
+
 #define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
 #define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
 #define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
@@ -261,6 +294,34 @@ struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass {
 	PublishingRESTSupportTransactionClass parent_class;
 };
 
+struct _PublishingRESTSupportOAuth1Session {
+	PublishingRESTSupportSession parent_instance;
+	PublishingRESTSupportOAuth1SessionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1SessionClass {
+	PublishingRESTSupportSessionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1Transaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingRESTSupportOAuth1TransactionPrivate * priv;
+};
+
+struct _PublishingRESTSupportOAuth1TransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransaction {
+	PublishingRESTSupportUploadTransaction parent_instance;
+	PublishingRESTSupportOAuth1UploadTransactionPrivate * priv;
+	PublishingRESTSupportOAuth1Session* session;
+};
+
+struct _PublishingRESTSupportOAuth1UploadTransactionClass {
+	PublishingRESTSupportUploadTransactionClass parent_class;
+};
+
 struct _ShotwellPluginsCommonWebAuthenticationPane {
 	GObject parent_instance;
 	ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
@@ -314,9 +375,10 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value);
 GType publishing_rest_support_argument_get_type (void) G_GNUC_CONST;
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value);
 PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value);
+gchar* publishing_rest_support_argument_serialize_list (PublishingRESTSupportArgument** args, int args_length1, gboolean escape, const gchar* separator);
 gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2);
 PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
-gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self);
+gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self, gboolean escape);
 gpointer publishing_rest_support_transaction_ref (gpointer instance);
 void publishing_rest_support_transaction_unref (gpointer instance);
 GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -396,6 +458,34 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP
 GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+GType publishing_rest_support_oauth1_session_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_new (const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1Session* publishing_rest_support_oauth1_session_construct (GType object_type, const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_session_authenticate_from_persistent_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+void publishing_rest_support_oauth1_session_deauthenticate (PublishingRESTSupportOAuth1Session* self);
+void publishing_rest_support_oauth1_session_set_api_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* consumer_key, const gchar* consumer_secret);
+gchar* publishing_rest_support_oauth1_session_sign_transaction (PublishingRESTSupportOAuth1Session* self, PublishingRESTSupportTransaction* txn, PublishingRESTSupportArgument** extra_arguments, int extra_arguments_length1);
+void publishing_rest_support_oauth1_session_set_request_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret);
+void publishing_rest_support_oauth1_session_set_access_phase_credentials (PublishingRESTSupportOAuth1Session* self, const gchar* token, const gchar* secret, const gchar* username);
+gchar* publishing_rest_support_oauth1_session_get_oauth_nonce (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_oauth_timestamp (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_consumer_key (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_request_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gboolean publishing_rest_support_oauth1_session_has_access_phase_token (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_access_phase_token_secret (PublishingRESTSupportOAuth1Session* self);
+gchar* publishing_rest_support_oauth1_session_get_username (PublishingRESTSupportOAuth1Session* self);
+GType publishing_rest_support_oauth1_transaction_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_new_with_uri (PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+PublishingRESTSupportOAuth1Transaction* publishing_rest_support_oauth1_transaction_construct_with_uri (GType object_type, PublishingRESTSupportOAuth1Session* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
+GType publishing_rest_support_oauth1_upload_transaction_get_type (void) G_GNUC_CONST;
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
+PublishingRESTSupportOAuth1UploadTransaction* publishing_rest_support_oauth1_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* endpoint_uri);
+void publishing_rest_support_oauth1_upload_transaction_add_authorization_header_field (PublishingRESTSupportOAuth1UploadTransaction* self, const gchar* key, const gchar* value);
+gchar* publishing_rest_support_oauth1_upload_transaction_get_authorization_header_string (PublishingRESTSupportOAuth1UploadTransaction* self);
+void publishing_rest_support_oauth1_upload_transaction_authorize (PublishingRESTSupportOAuth1UploadTransaction* self);
 #define RESOURCES_WEBSITE_NAME _ ("Visit the Shotwell home page")
 #define RESOURCES_WEBSITE_URL "https://wiki.gnome.org/Apps/Shotwell"
 #define RESOURCES_LICENSE "\n" \
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 9fc93eb..f07c2c7 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -2,14 +2,50 @@
 
 namespace Publishing {
 	namespace RESTSupport {
+		namespace OAuth1 {
+			[CCode (cheader_filename = "shotwell-plugin-common.h")]
+			public class Session : Publishing.RESTSupport.Session {
+				public Session (string? endpoint_uri = null);
+				public void authenticate_from_persistent_credentials (string token, string secret, string username);
+				public void deauthenticate ();
+				public string get_access_phase_token ();
+				public string get_access_phase_token_secret ();
+				public string get_consumer_key ();
+				public string get_oauth_nonce ();
+				public string get_oauth_timestamp ();
+				public string get_request_phase_token ();
+				public string get_username ();
+				public bool has_access_phase_token ();
+				public override bool is_authenticated ();
+				public void set_access_phase_credentials (string token, string secret, string username);
+				public void set_api_credentials (string consumer_key, string consumer_secret);
+				public void set_request_phase_credentials (string token, string secret);
+				public string sign_transaction (Publishing.RESTSupport.Transaction txn, Publishing.RESTSupport.Argument[]? extra_arguments = null);
+			}
+			[CCode (cheader_filename = "shotwell-plugin-common.h")]
+			public class Transaction : Publishing.RESTSupport.Transaction {
+				public Transaction (Publishing.RESTSupport.OAuth1.Session session, Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST);
+				public override void execute () throws Spit.Publishing.PublishingError;
+				public Transaction.with_uri (Publishing.RESTSupport.OAuth1.Session session, string uri, Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST);
+			}
+			[CCode (cheader_filename = "shotwell-plugin-common.h")]
+			public class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+				protected weak Publishing.RESTSupport.OAuth1.Session session;
+				public UploadTransaction (Publishing.RESTSupport.OAuth1.Session session, Spit.Publishing.Publishable publishable, string endpoint_uri);
+				public void add_authorization_header_field (string key, string value);
+				public void authorize ();
+				public string get_authorization_header_string ();
+			}
+		}
 		[CCode (cheader_filename = "shotwell-plugin-common.h")]
 		public class Argument {
 			public string key;
 			public string value;
 			public Argument (string key, string value);
 			public static int compare (Publishing.RESTSupport.Argument arg1, Publishing.RESTSupport.Argument arg2);
+			public static string serialize_list (Publishing.RESTSupport.Argument[] args, bool escape = false, string? separator = "&");
 			public static Publishing.RESTSupport.Argument[] sort (Publishing.RESTSupport.Argument[] inputArray);
-			public string to_string ();
+			public string to_string (bool escape = false);
 		}
 		[CCode (cheader_filename = "shotwell-plugin-common.h")]
 		public abstract class BatchUploader {
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
deleted file mode 100644
index 8749112..0000000
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ /dev/null
@@ -1,8447 +0,0 @@
-/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler
- * generated from TumblrPublishing.vala, do not modify */
-
-/* Copyright 2012 BJA Electronics
- * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <shotwell-plugin-dev-1.0.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include "shotwell-plugin-common.h"
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <json-glib/json-glib.h>
-#include <gee.h>
-#include <float.h>
-#include <math.h>
-#include <libsoup/soup.h>
-#include <glib/gstdio.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
-#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
-#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
-#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
-#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
-#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
-
-typedef struct _TumblrService TumblrService;
-typedef struct _TumblrServiceClass TumblrServiceClass;
-typedef struct _TumblrServicePrivate TumblrServicePrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER (publishing_tumblr_tumblr_publisher_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
-#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
-#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
-
-typedef struct _PublishingTumblrTumblrPublisher PublishingTumblrTumblrPublisher;
-typedef struct _PublishingTumblrTumblrPublisherClass PublishingTumblrTumblrPublisherClass;
-
-#define PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY (publishing_tumblr_blog_entry_get_type ())
-#define PUBLISHING_TUMBLR_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry))
-#define PUBLISHING_TUMBLR_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
-#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
-#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
-#define PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
-
-typedef struct _PublishingTumblrBlogEntry PublishingTumblrBlogEntry;
-typedef struct _PublishingTumblrBlogEntryClass PublishingTumblrBlogEntryClass;
-typedef struct _PublishingTumblrBlogEntryPrivate PublishingTumblrBlogEntryPrivate;
-typedef struct _PublishingTumblrParamSpecBlogEntry PublishingTumblrParamSpecBlogEntry;
-
-#define PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY (publishing_tumblr_size_entry_get_type ())
-#define PUBLISHING_TUMBLR_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry))
-#define PUBLISHING_TUMBLR_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
-#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
-#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
-#define PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
-
-typedef struct _PublishingTumblrSizeEntry PublishingTumblrSizeEntry;
-typedef struct _PublishingTumblrSizeEntryClass PublishingTumblrSizeEntryClass;
-typedef struct _PublishingTumblrSizeEntryPrivate PublishingTumblrSizeEntryPrivate;
-typedef struct _PublishingTumblrParamSpecSizeEntry PublishingTumblrParamSpecSizeEntry;
-typedef struct _PublishingTumblrTumblrPublisherPrivate PublishingTumblrTumblrPublisherPrivate;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION (publishing_tumblr_tumblr_publisher_session_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherSession PublishingTumblrTumblrPublisherSession;
-typedef struct _PublishingTumblrTumblrPublisherSessionClass PublishingTumblrTumblrPublisherSessionClass;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE (publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
-
-typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPane PublishingTumblrTumblrPublisherPublishingOptionsPane;
-typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass PublishingTumblrTumblrPublisherPublishingOptionsPaneClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_TYPE_MODE (publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type ())
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE (publishing_tumblr_tumblr_publisher_authentication_pane_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPaneClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPaneClass))
-
-typedef struct _PublishingTumblrTumblrPublisherAuthenticationPane PublishingTumblrTumblrPublisherAuthenticationPane;
-typedef struct _PublishingTumblrTumblrPublisherAuthenticationPaneClass PublishingTumblrTumblrPublisherAuthenticationPaneClass;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION (publishing_tumblr_tumblr_publisher_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherTransaction PublishingTumblrTumblrPublisherTransaction;
-typedef struct _PublishingTumblrTumblrPublisherTransactionClass PublishingTumblrTumblrPublisherTransactionClass;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransaction PublishingTumblrTumblrPublisherAccessTokenFetchTransaction;
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass;
-#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 PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION (publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction PublishingTumblrTumblrPublisherUserInfoFetchTransaction;
-typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass;
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-#define _json_object_unref0(var) ((var == NULL) ? NULL : (var = (json_object_unref (var), NULL)))
-#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
-#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER (publishing_tumblr_tumblr_publisher_uploader_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
-
-typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPublisherUploader;
-typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass;
-#define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
-typedef struct _PublishingTumblrTumblrPublisherAuthenticationPanePrivate PublishingTumblrTumblrPublisherAuthenticationPanePrivate;
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL
-};
-static guint publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
-typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
-#define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL)))
-#define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL)))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
-};
-static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
-typedef struct _PublishingTumblrTumblrPublisherTransactionPrivate PublishingTumblrTumblrPublisherTransactionPrivate;
-typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate;
-typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate;
-
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION (publishing_tumblr_tumblr_publisher_upload_transaction_get_type ())
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
-
-typedef struct _PublishingTumblrTumblrPublisherUploadTransaction PublishingTumblrTumblrPublisherUploadTransaction;
-typedef struct _PublishingTumblrTumblrPublisherUploadTransactionClass PublishingTumblrTumblrPublisherUploadTransactionClass;
-typedef struct _PublishingTumblrTumblrPublisherUploadTransactionPrivate PublishingTumblrTumblrPublisherUploadTransactionPrivate;
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
-typedef struct _PublishingTumblrTumblrPublisherUploaderPrivate PublishingTumblrTumblrPublisherUploaderPrivate;
-typedef struct _PublishingTumblrTumblrPublisherSessionPrivate PublishingTumblrTumblrPublisherSessionPrivate;
-#define _publishing_rest_support_argument_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_argument_unref (var), NULL)))
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _TumblrService {
-	GObject parent_instance;
-	TumblrServicePrivate * priv;
-};
-
-struct _TumblrServiceClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingTumblrBlogEntry {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PublishingTumblrBlogEntryPrivate * priv;
-	gchar* blog;
-	gchar* url;
-};
-
-struct _PublishingTumblrBlogEntryClass {
-	GTypeClass parent_class;
-	void (*finalize) (PublishingTumblrBlogEntry *self);
-};
-
-struct _PublishingTumblrParamSpecBlogEntry {
-	GParamSpec parent_instance;
-};
-
-struct _PublishingTumblrSizeEntry {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PublishingTumblrSizeEntryPrivate * priv;
-	gchar* title;
-	gint size;
-};
-
-struct _PublishingTumblrSizeEntryClass {
-	GTypeClass parent_class;
-	void (*finalize) (PublishingTumblrSizeEntry *self);
-};
-
-struct _PublishingTumblrParamSpecSizeEntry {
-	GParamSpec parent_instance;
-};
-
-struct _PublishingTumblrTumblrPublisher {
-	GObject parent_instance;
-	PublishingTumblrTumblrPublisherPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherPrivate {
-	SpitPublishingService* service;
-	SpitPublishingPluginHost* host;
-	SpitPublishingProgressCallback progress_reporter;
-	gpointer progress_reporter_target;
-	GDestroyNotify progress_reporter_target_destroy_notify;
-	gboolean running;
-	gboolean was_started;
-	PublishingTumblrTumblrPublisherSession* session;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane;
-	PublishingTumblrSizeEntry** sizes;
-	gint sizes_length1;
-	gint _sizes_size_;
-	PublishingTumblrBlogEntry** blogs;
-	gint blogs_length1;
-	gint _blogs_size_;
-	gchar* username;
-};
-
-typedef enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO,
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER
-} PublishingTumblrTumblrPublisherAuthenticationPaneMode;
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPane {
-	GObject parent_instance;
-	PublishingTumblrTumblrPublisherAuthenticationPanePrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherAuthenticationPanePrivate {
-	GtkBox* pane_widget;
-	GtkBuilder* builder;
-	GtkEntry* username_entry;
-	GtkEntry* password_entry;
-	GtkButton* login_button;
-};
-
-struct _PublishingTumblrTumblrPublisherPublishingOptionsPane {
-	GObject parent_instance;
-	PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate {
-	GtkBuilder* builder;
-	GtkBox* pane_widget;
-	GtkLabel* upload_info_label;
-	GtkLabel* size_label;
-	GtkLabel* blog_label;
-	GtkButton* logout_button;
-	GtkButton* publish_button;
-	GtkComboBoxText* size_combo;
-	GtkComboBoxText* blog_combo;
-	PublishingTumblrSizeEntry** sizes;
-	gint sizes_length1;
-	gint _sizes_size_;
-	PublishingTumblrBlogEntry** blogs;
-	gint blogs_length1;
-	gint _blogs_size_;
-	gchar* username;
-	PublishingTumblrTumblrPublisher* publisher;
-	SpitPublishingPublisherMediaType media_type;
-};
-
-struct _PublishingTumblrTumblrPublisherTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingTumblrTumblrPublisherTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransaction {
-	PublishingTumblrTumblrPublisherTransaction parent_instance;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass {
-	PublishingTumblrTumblrPublisherTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction {
-	PublishingTumblrTumblrPublisherTransaction parent_instance;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass {
-	PublishingTumblrTumblrPublisherTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransaction {
-	PublishingRESTSupportUploadTransaction parent_instance;
-	PublishingTumblrTumblrPublisherUploadTransactionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransactionClass {
-	PublishingRESTSupportUploadTransactionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploadTransactionPrivate {
-	PublishingTumblrTumblrPublisherSession* session;
-	PublishingRESTSupportArgument** auth_header_fields;
-	gint auth_header_fields_length1;
-	gint _auth_header_fields_size_;
-};
-
-struct _PublishingTumblrTumblrPublisherUploader {
-	PublishingRESTSupportBatchUploader parent_instance;
-	PublishingTumblrTumblrPublisherUploaderPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherUploaderClass {
-	PublishingRESTSupportBatchUploaderClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherUploaderPrivate {
-	gchar* blog_url;
-};
-
-struct _PublishingTumblrTumblrPublisherSession {
-	PublishingRESTSupportSession parent_instance;
-	PublishingTumblrTumblrPublisherSessionPrivate * priv;
-};
-
-struct _PublishingTumblrTumblrPublisherSessionClass {
-	PublishingRESTSupportSessionClass parent_class;
-};
-
-struct _PublishingTumblrTumblrPublisherSessionPrivate {
-	gchar* access_phase_token;
-	gchar* access_phase_token_secret;
-};
-
-
-static gpointer tumblr_service_parent_class = NULL;
-static GdkPixbuf** tumblr_service_icon_pixbuf_set;
-static gint tumblr_service_icon_pixbuf_set_length1;
-static GdkPixbuf** tumblr_service_icon_pixbuf_set = NULL;
-static gint tumblr_service_icon_pixbuf_set_length1 = 0;
-static gint _tumblr_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface * tumblr_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface * tumblr_service_spit_publishing_service_parent_iface = NULL;
-static gpointer publishing_tumblr_blog_entry_parent_class = NULL;
-static gpointer publishing_tumblr_size_entry_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_authentication_pane_parent_class = NULL;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = NULL;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_transaction_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL;
-static gpointer publishing_tumblr_tumblr_publisher_session_parent_class = NULL;
-static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
-
-GType tumblr_service_get_type (void) G_GNUC_CONST;
-enum  {
-	TUMBLR_SERVICE_DUMMY_PROPERTY
-};
-#define TUMBLR_SERVICE_ICON_FILENAME "tumblr.png"
-TumblrService* tumblr_service_new (GFile* resource_directory);
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
-static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
-static const gchar* tumblr_service_real_get_id (SpitPluggable* base);
-static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base);
-static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length);
-static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled);
-static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
-GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
-static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
-static void tumblr_service_finalize (GObject * obj);
-#define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr"
-#define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
-#define PUBLISHING_TUMBLR_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k"
-#define PUBLISHING_TUMBLR_API_SECRET "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi"
-#define PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
-#define PUBLISHING_TUMBLR_ORIGINAL_SIZE -1
-gpointer publishing_tumblr_blog_entry_ref (gpointer instance);
-void publishing_tumblr_blog_entry_unref (gpointer instance);
-GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object);
-void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object);
-gpointer publishing_tumblr_value_get_blog_entry (const GValue* value);
-GType publishing_tumblr_blog_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_TUMBLR_BLOG_ENTRY_DUMMY_PROPERTY
-};
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url);
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url);
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj);
-gpointer publishing_tumblr_size_entry_ref (gpointer instance);
-void publishing_tumblr_size_entry_unref (gpointer instance);
-GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object);
-void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object);
-gpointer publishing_tumblr_value_get_size_entry (const GValue* value);
-GType publishing_tumblr_size_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	PUBLISHING_TUMBLR_SIZE_ENTRY_DUMMY_PROPERTY
-};
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size);
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj);
-GType publishing_tumblr_tumblr_publisher_session_get_type (void) G_GNUC_CONST;
-GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST;
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_DUMMY_PROPERTY
-};
-static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
-static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1);
-static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1);
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void);
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type);
-static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (PublishingTumblrTumblrPublisher* self);
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token);
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret);
-static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base);
-SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self);
-static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base);
-static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self);
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self);
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self);
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size);
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog);
-GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void) G_GNUC_CONST;
-static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode);
-static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password);
-static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self);
-GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password);
-GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) G_GNUC_CONST;
-GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password);
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password);
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
-void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret);
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self);
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self);
-static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self);
-GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session);
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session);
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
-static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self);
-static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value);
-void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self);
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self);
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self);
-static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self);
-gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
-static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) G_GNUC_CONST;
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
-static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
-static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
-static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
-static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction);
-static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
-static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self);
-void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret);
-static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base);
-static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPanePrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self);
-static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
-};
-static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length);
-static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** self, int length);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
-static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self);
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self);
-static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn);
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) G_GNUC_CONST;
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_DUMMY_PROPERTY
-};
-static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
-void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value);
-static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length);
-gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY
-};
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
-#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionPrivate))
-enum  {
-	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_DUMMY_PROPERTY
-};
-static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj);
-static void publishing_tumblr_tumblr_publisher_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 gint _vala_array_length (gpointer array);
-
-
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
-	TumblrService * self = NULL;
-	GdkPixbuf** _tmp0_;
-	gint _tmp0__length1;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (TumblrService*) g_object_new (object_type, NULL);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = tumblr_service_icon_pixbuf_set;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ == NULL) {
-#line 660 "TumblrPublishing.c"
-		gint _tmp1_;
-		GdkPixbuf** _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tumblr_service_icon_pixbuf_set = (_vala_array_free (tumblr_service_icon_pixbuf_set, tumblr_service_icon_pixbuf_set_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tumblr_service_icon_pixbuf_set = _tmp2_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
-#line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
-#line 673 "TumblrPublishing.c"
-	}
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 677 "TumblrPublishing.c"
-}
-
-
-TumblrService* tumblr_service_new (GFile* resource_directory) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
-#line 684 "TumblrPublishing.c"
-}
-
-
-static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
-	TumblrService * self;
-	gint result = 0;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = min_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = max_host_interface;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp2_;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 706 "TumblrPublishing.c"
-}
-
-
-static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
-	TumblrService * self;
-	const gchar* result = NULL;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = "org.yorba.shotwell.publishing.tumblr";
-#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 719 "TumblrPublishing.c"
-}
-
-
-static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base) {
-	TumblrService * self;
-	const gchar* result = NULL;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = "Tumblr";
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 732 "TumblrPublishing.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 739 "TumblrPublishing.c"
-}
-
-
-static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length) {
-	GdkPixbuf** result;
-	int i;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (GdkPixbuf*, length + 1);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 750 "TumblrPublishing.c"
-		GdkPixbuf* _tmp0_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 756 "TumblrPublishing.c"
-	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 760 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
-	TumblrService * self;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-	GdkPixbuf** _tmp7_;
-	gint _tmp7__length1;
-	GdkPixbuf** _tmp8_;
-	gint _tmp8__length1;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (info != NULL);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("Jeroen Arnoldus");
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).authors);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).authors = _tmp0_;
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics"));
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).copyright);
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).copyright = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).translators);
-#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).translators = _tmp2_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_VERSION);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).version);
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).version = _tmp3_;
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).website_name);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_name = _tmp4_;
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).website_url);
-#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_url = _tmp5_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).is_license_wordwrapped = FALSE;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_LICENSE);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 ((*info).license);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).license = _tmp6_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = tumblr_service_icon_pixbuf_set;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup6 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = _tmp7__length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons = _tmp8_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons_length1 = _tmp8__length1;
-#line 839 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled) {
-	TumblrService * self;
-#line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 847 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
-	TumblrService * self;
-	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisher* _tmp1_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = host;
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
-#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 868 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base) {
-	TumblrService * self;
-	SpitPublishingPublisherMediaType result = 0;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 881 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_class_init (TumblrServiceClass * klass) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_parent_class = g_type_class_peek_parent (klass);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
-#line 890 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
-#line 907 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
-#line 918 "TumblrPublishing.c"
-}
-
-
-static void tumblr_service_instance_init (TumblrService * self) {
-}
-
-
-static void tumblr_service_finalize (GObject * obj) {
-	TumblrService * self;
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
-#line 932 "TumblrPublishing.c"
-}
-
-
-GType tumblr_service_get_type (void) {
-	static volatile gsize tumblr_service_type_id__volatile = 0;
-	if (g_once_init_enter (&tumblr_service_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (TumblrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tumblr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TumblrService), 0, (GInstanceInitFunc) tumblr_service_instance_init, NULL };
-		static const GInterfaceInfo spit_pluggable_info = { (GInterfaceInitFunc) tumblr_service_spit_pluggable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		static const GInterfaceInfo spit_publishing_service_info = { (GInterfaceInitFunc) tumblr_service_spit_publishing_service_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType tumblr_service_type_id;
-		tumblr_service_type_id = g_type_register_static (G_TYPE_OBJECT, "TumblrService", &g_define_type_info, 0);
-		g_type_add_interface_static (tumblr_service_type_id, SPIT_TYPE_PLUGGABLE, &spit_pluggable_info);
-		g_type_add_interface_static (tumblr_service_type_id, SPIT_PUBLISHING_TYPE_SERVICE, &spit_publishing_service_info);
-		g_once_init_leave (&tumblr_service_type_id__volatile, tumblr_service_type_id);
-	}
-	return tumblr_service_type_id__volatile;
-}
-
-
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) {
-	PublishingTumblrBlogEntry* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_blog != NULL, NULL);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_url != NULL, NULL);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrBlogEntry*) g_type_create_instance (object_type);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = creator_blog;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->blog);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->blog = _tmp1_;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = creator_url;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->url);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->url = _tmp3_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 982 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) {
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
-#line 989 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_blog_entry_init (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 996 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
-#line 1005 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
-#line 1015 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1019 "TumblrPublishing.c"
-	}
-}
-
-
-static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1027 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 1034 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry * object;
-		object = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1041 "TumblrPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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 1045 "TumblrPublishing.c"
-		}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
-#line 1049 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1053 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1057 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingTumblrBlogEntry ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!object_p) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1068 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = NULL;
-#line 1074 "TumblrPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1078 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1082 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1086 "TumblrPublishing.c"
-}
-
-
-GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	PublishingTumblrParamSpecBlogEntry* spec;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 1100 "TumblrPublishing.c"
-}
-
-
-gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1109 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry * old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1129 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1133 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (old);
-#line 1139 "TumblrPublishing.c"
-	}
-}
-
-
-void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry * old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 1158 "TumblrPublishing.c"
-	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1162 "TumblrPublishing.c"
-	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_blog_entry_unref (old);
-#line 1168 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
-#line 1178 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->ref_count = 1;
-#line 1185 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) {
-	PublishingTumblrBlogEntry * self;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->blog);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->url);
-#line 1199 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_blog_entry_get_type (void) {
-	static volatile gsize publishing_tumblr_blog_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_blog_entry_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_blog_entry_init, publishing_tumblr_value_blog_entry_free_value, publishing_tumblr_value_blog_entry_copy_value, publishing_tumblr_value_blog_entry_peek_pointer, "p", publishing_tumblr_value_blog_entry_collect_value, "p", publishing_tumblr_value_blog_entry_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrBlogEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_blog_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrBlogEntry), 0, (GInstanceInitFunc) publishing_tumblr_blog_entry_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType publishing_tumblr_blog_entry_type_id;
-		publishing_tumblr_blog_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrBlogEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&publishing_tumblr_blog_entry_type_id__volatile, publishing_tumblr_blog_entry_type_id);
-	}
-	return publishing_tumblr_blog_entry_type_id__volatile;
-}
-
-
-gpointer publishing_tumblr_blog_entry_ref (gpointer instance) {
-	PublishingTumblrBlogEntry * self;
-	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return instance;
-#line 1224 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_blog_entry_unref (gpointer instance) {
-	PublishingTumblrBlogEntry * self;
-	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1237 "TumblrPublishing.c"
-	}
-}
-
-
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
-	PublishingTumblrSizeEntry* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrSizeEntry*) g_type_create_instance (object_type);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = creator_title;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->title);
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->title = _tmp1_;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = creator_size;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->size = _tmp2_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 1265 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 1272 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_size_entry_init (GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 1279 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
-#line 1288 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
-#line 1298 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1302 "TumblrPublishing.c"
-	}
-}
-
-
-static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1310 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 1317 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry * object;
-		object = collect_values[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1324 "TumblrPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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 1328 "TumblrPublishing.c"
-		}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
-#line 1332 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1336 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1340 "TumblrPublishing.c"
-}
-
-
-static gchar* publishing_tumblr_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingTumblrSizeEntry ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!object_p) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1351 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = NULL;
-#line 1357 "TumblrPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1361 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1365 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return NULL;
-#line 1369 "TumblrPublishing.c"
-}
-
-
-GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	PublishingTumblrParamSpecSizeEntry* spec;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 1383 "TumblrPublishing.c"
-}
-
-
-gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return value->data[0].v_pointer;
-#line 1392 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry * old;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1412 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1416 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (old);
-#line 1422 "TumblrPublishing.c"
-	}
-}
-
-
-void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry * old;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (v_object) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 1441 "TumblrPublishing.c"
-	} else {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 1445 "TumblrPublishing.c"
-	}
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (old) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_size_entry_unref (old);
-#line 1451 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
-#line 1461 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->ref_count = 1;
-#line 1468 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) {
-	PublishingTumblrSizeEntry * self;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->title);
-#line 1480 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_size_entry_get_type (void) {
-	static volatile gsize publishing_tumblr_size_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_size_entry_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_size_entry_init, publishing_tumblr_value_size_entry_free_value, publishing_tumblr_value_size_entry_copy_value, publishing_tumblr_value_size_entry_peek_pointer, "p", publishing_tumblr_value_size_entry_collect_value, "p", publishing_tumblr_value_size_entry_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrSizeEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_size_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrSizeEntry), 0, (GInstanceInitFunc) publishing_tumblr_size_entry_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType publishing_tumblr_size_entry_type_id;
-		publishing_tumblr_size_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrSizeEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&publishing_tumblr_size_entry_type_id__volatile, publishing_tumblr_size_entry_type_id);
-	}
-	return publishing_tumblr_size_entry_type_id__volatile;
-}
-
-
-gpointer publishing_tumblr_size_entry_ref (gpointer instance) {
-	PublishingTumblrSizeEntry * self;
-	self = instance;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return instance;
-#line 1505 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_size_entry_unref (gpointer instance) {
-	PublishingTumblrSizeEntry * self;
-	self = instance;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1518 "TumblrPublishing.c"
-	}
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_session_authenticated ((PublishingTumblrTumblrPublisher*) self);
-#line 1526 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1537 "TumblrPublishing.c"
-	}
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1543 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1554 "TumblrPublishing.c"
-	}
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1560 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1571 "TumblrPublishing.c"
-	}
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 1577 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1) {
-	PublishingTumblrSizeEntry** result = NULL;
-	PublishingTumblrSizeEntry** _result_ = NULL;
-	PublishingTumblrSizeEntry** _tmp0_;
-	gint _result__length1;
-	gint __result__size_;
-	PublishingTumblrSizeEntry** _tmp1_;
-	gint _tmp1__length1;
-	PublishingTumblrSizeEntry* _tmp2_;
-	PublishingTumblrSizeEntry** _tmp3_;
-	gint _tmp3__length1;
-	PublishingTumblrSizeEntry* _tmp4_;
-	PublishingTumblrSizeEntry** _tmp5_;
-	gint _tmp5__length1;
-	PublishingTumblrSizeEntry* _tmp6_;
-	PublishingTumblrSizeEntry** _tmp7_;
-	gint _tmp7__length1;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_new0 (PublishingTumblrSizeEntry*, 0 + 1);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result__length1 = 0;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	__result__size_ = _result__length1;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _result_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _result__length1;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _result_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__length1 = _result__length1;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _result_;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5__length1 = _result__length1;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _result_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _result__length1;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp7__length1;
-#line 1640 "TumblrPublishing.c"
-	}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp7_;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1646 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1) {
-	PublishingTumblrBlogEntry** result = NULL;
-	PublishingTumblrBlogEntry** _result_ = NULL;
-	PublishingTumblrBlogEntry** _tmp0_;
-	gint _result__length1;
-	gint __result__size_;
-	PublishingTumblrBlogEntry** _tmp1_;
-	gint _tmp1__length1;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_new0 (PublishingTumblrBlogEntry*, 0 + 1);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result__length1 = 0;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	__result__size_ = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _result_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp1__length1;
-#line 1676 "TumblrPublishing.c"
-	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1682 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
-	PublishingTumblrTumblrPublisher * self = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-	SpitPublishingPluginHost* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	PublishingTumblrTumblrPublisherSession* _tmp4_;
-	gint _tmp5_;
-	PublishingTumblrSizeEntry** _tmp6_;
-	gint _tmp7_;
-	PublishingTumblrBlogEntry** _tmp8_;
-	PublishingTumblrTumblrPublisherSession* _tmp9_;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisher*) g_object_new (object_type, NULL);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:125: TumblrPublisher instantiated.");
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = service;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->service);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->service = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = host;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->host);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->host = _tmp3_;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_new ();
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = _tmp4_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp5_);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = _tmp5_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp7_);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = _tmp8_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = _tmp7_;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = self->priv->session;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 1754 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
-#line 1761 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (PublishingTumblrTumblrPublisher* self) {
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, "");
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, "");
-#line 1772 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_;
-	SpitPublishingService* _tmp1_;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->service;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1791 "TumblrPublishing.c"
-}
-
-
-SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1809 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp0_;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1825 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self) {
-	gboolean result = FALSE;
-	gchar* access_phase_token = NULL;
-	gchar* _tmp0_;
-	gchar* access_phase_token_secret = NULL;
-	gchar* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_;
-	gboolean valid = FALSE;
-	gboolean _tmp5_;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), FALSE);
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (self);
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	access_phase_token = _tmp0_;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (self);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	access_phase_token_secret = _tmp1_;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = access_phase_token;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp3_ != NULL) {
-#line 1853 "TumblrPublishing.c"
-		const gchar* _tmp4_;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = access_phase_token_secret;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = _tmp4_ != NULL;
-#line 1859 "TumblrPublishing.c"
-	} else {
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = FALSE;
-#line 1863 "TumblrPublishing.c"
-	}
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	valid = _tmp2_;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = valid;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp5_) {
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:163: existing Tumblr session found in configurat" \
-"ion database; using it.");
-#line 1873 "TumblrPublishing.c"
-	} else {
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:165: no persisted Tumblr session exists.");
-#line 1877 "TumblrPublishing.c"
-	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = valid;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (access_phase_token_secret);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (access_phase_token);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1887 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", NULL);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1905 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = token;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_);
-#line 1920 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_;
-	gchar* _tmp1_;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", NULL);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1938 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret) {
-	SpitPublishingPluginHost* _tmp0_;
-	const gchar* _tmp1_;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = token_secret;
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", _tmp1_);
-#line 1953 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
-	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 1971 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = size;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 1986 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
-	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 2004 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
-	SpitPublishingPluginHost* _tmp0_;
-	gint _tmp1_;
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = blog;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_);
-#line 2019 "TumblrPublishing.c"
-}
-
-
-/**
-     * Action that shows the authentication pane.
-     *
-     * This action method shows the authentication pane. It is shown at the
-     * very beginning of the interaction when no persistent parameters are found
-     * or after a failed login attempt using persisted parameters. It can be
-     * given a mode flag to specify whether it should be displayed in initial
-     * mode or in any of the error modes that it supports.
-     *
-     * @param mode the mode for the authentication pane
-     */
-static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked ((PublishingTumblrTumblrPublisher*) self, user, password);
-#line 2037 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisherAuthenticationPane* authentication_pane = NULL;
-	PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_;
-	PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_;
-	SpitPublishingPluginHost* _tmp3_;
-	SpitPublishingPluginHost* _tmp4_;
-	GtkWidget* _tmp5_;
-	GtkWidget* _tmp6_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:219: ACTION: installing authentication pane");
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = mode;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_tumblr_publisher_authentication_pane_new (self, _tmp1_);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	authentication_pane = _tmp2_;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login, self, 0);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->host;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->host;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (authentication_pane);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (_tmp6_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (authentication_pane);
-#line 2082 "TumblrPublishing.c"
-}
-
-
-/**
-     * Event triggered when the login button in the authentication panel is
-     * clicked.
-     *
-     * This event is triggered when the login button in the authentication
-     * panel is clicked. It then triggers a network login interaction.
-     *
-     * @param username the name of the Tumblr user as entered in the dialog
-     * @param password the password of the Tumblr as entered in the dialog
-     */
-static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (password != NULL);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:240: EVENT: on_authentication_pane_login_clicked");
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2114 "TumblrPublishing.c"
-	}
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = password;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_network_login (self, _tmp1_, _tmp2_);
-#line 2122 "TumblrPublishing.c"
-}
-
-
-/**
-     * Action to perform a network login to a Tumblr blog.
-     *
-     * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
-     *
-     * @param username the name of the Tumblr user used to login
-     * @param password the password of the Tumblr user used to login
-     */
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2137 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_auth_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2144 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp2_;
-	const gchar* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_;
-	GError * _inner_error_ = NULL;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (password != NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:256: ACTION: logging in");
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = username;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = password;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (_tmp2_, _tmp3_, _tmp4_);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	txn = _tmp5_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2187 "TumblrPublishing.c"
-	{
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2195 "TumblrPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
-			}
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 2206 "TumblrPublishing.c"
-		}
-	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_;
-		GError* _tmp7_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->host;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = err;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 2227 "TumblrPublishing.c"
-	}
-	__finally32:
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2240 "TumblrPublishing.c"
-	}
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2244 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingRESTSupportTransaction* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2282 "TumblrPublishing.c"
-	}
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = txn;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:280: EVENT: OAuth authentication request transac" \
-"tion completed; response = '%s'", _tmp7_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = txn;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 2304 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	SpitPublishingPluginHost* _tmp5_;
-	GError* _tmp6_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2338 "TumblrPublishing.c"
-	}
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:294: EVENT: OAuth authentication request transac" \
-"tion caused a network error");
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = err;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2348 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_;
-	gchar* oauth_token = NULL;
-	gchar* oauth_token_secret = NULL;
-	gchar** key_value_pairs = NULL;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint key_value_pairs_length1;
-	gint _key_value_pairs_size_;
-	gchar** _tmp4_;
-	gint _tmp4__length1;
-	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_;
-	PublishingTumblrTumblrPublisherSession* _tmp31_;
-	const gchar* _tmp32_;
-	const gchar* _tmp33_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = response;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:300: ACTION: parsing authorization request respo" \
-"nse '%s' into token and secret", _tmp0_);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	oauth_token = NULL;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	oauth_token_secret = NULL;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = response;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp1_, "&", 0);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs = _tmp3_;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs_length1 = _vala_array_length (_tmp2_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_key_value_pairs_size_ = key_value_pairs_length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = key_value_pairs;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = key_value_pairs_length1;
-#line 2395 "TumblrPublishing.c"
-	{
-		gchar** pair_collection = NULL;
-		gint pair_collection_length1 = 0;
-		gint _pair_collection_size_ = 0;
-		gint pair_it = 0;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		pair_collection = _tmp4_;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		pair_collection_length1 = _tmp4__length1;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) {
-#line 2407 "TumblrPublishing.c"
-			gchar* _tmp5_;
-			gchar* pair = NULL;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp5_ = g_strdup (pair_collection[pair_it]);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			pair = _tmp5_;
-#line 2414 "TumblrPublishing.c"
-			{
-				gchar** split_pair = NULL;
-				const gchar* _tmp6_;
-				gchar** _tmp7_;
-				gchar** _tmp8_;
-				gint split_pair_length1;
-				gint _split_pair_size_;
-				gchar** _tmp9_;
-				gint _tmp9__length1;
-				gchar** _tmp14_;
-				gint _tmp14__length1;
-				const gchar* _tmp15_;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6_ = pair;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp8_ = _tmp7_ = g_strsplit (_tmp6_, "=", 0);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair = _tmp8_;
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair_length1 = _vala_array_length (_tmp7_);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_split_pair_size_ = split_pair_length1;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9_ = split_pair;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9__length1 = split_pair_length1;
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp9__length1 != 2) {
-#line 2443 "TumblrPublishing.c"
-					SpitPublishingPluginHost* _tmp10_;
-					const gchar* _tmp11_;
-					GError* _tmp12_;
-					GError* _tmp13_;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp10_ = self->priv->host;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = response;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_error_free0 (_tmp13_);
-#line 2460 "TumblrPublishing.c"
-				}
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = split_pair;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14__length1 = split_pair_length1;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = _tmp14_[0];
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (g_strcmp0 (_tmp15_, "oauth_token") == 0) {
-#line 2470 "TumblrPublishing.c"
-					gchar** _tmp16_;
-					gint _tmp16__length1;
-					const gchar* _tmp17_;
-					gchar* _tmp18_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16_ = split_pair;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16__length1 = split_pair_length1;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = _tmp16_[1];
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = g_strdup (_tmp17_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (oauth_token);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					oauth_token = _tmp18_;
-#line 2487 "TumblrPublishing.c"
-				} else {
-					gchar** _tmp19_;
-					gint _tmp19__length1;
-					const gchar* _tmp20_;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = split_pair;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19__length1 = split_pair_length1;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = _tmp19_[0];
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) {
-#line 2500 "TumblrPublishing.c"
-						gchar** _tmp21_;
-						gint _tmp21__length1;
-						const gchar* _tmp22_;
-						gchar* _tmp23_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21_ = split_pair;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21__length1 = split_pair_length1;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22_ = _tmp21_[1];
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp23_ = g_strdup (_tmp22_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_g_free0 (oauth_token_secret);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						oauth_token_secret = _tmp23_;
-#line 2517 "TumblrPublishing.c"
-					}
-				}
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (pair);
-#line 2524 "TumblrPublishing.c"
-			}
-		}
-	}
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = oauth_token;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp25_ == NULL) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = TRUE;
-#line 2534 "TumblrPublishing.c"
-	} else {
-		const gchar* _tmp26_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = oauth_token_secret;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = _tmp26_ == NULL;
-#line 2541 "TumblrPublishing.c"
-	}
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp24_) {
-#line 2545 "TumblrPublishing.c"
-		SpitPublishingPluginHost* _tmp27_;
-		const gchar* _tmp28_;
-		GError* _tmp29_;
-		GError* _tmp30_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->host;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = response;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.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 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = _tmp29_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (_tmp30_);
-#line 2562 "TumblrPublishing.c"
-	}
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp31_ = self->priv->session;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp32_ = oauth_token;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = oauth_token_secret;
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 2578 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	PublishingTumblrTumblrPublisherSession* _tmp4_;
-	gchar* _tmp5_;
-	gchar* _tmp6_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2598 "TumblrPublishing.c"
-	}
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \
-"come available");
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->session;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp1_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, _tmp3_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (_tmp4_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, _tmp6_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
-#line 2624 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2631 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2638 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:340: ACTION: obtain all blogs of the tumblr user");
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (_tmp0_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	txn = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2661 "TumblrPublishing.c"
-	{
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2669 "TumblrPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
-			}
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 2680 "TumblrPublishing.c"
-		}
-	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp2_;
-		GError* _tmp3_;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->host;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = err;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 2701 "TumblrPublishing.c"
-	}
-	__finally33:
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2714 "TumblrPublishing.c"
-	}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2718 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingRESTSupportTransaction* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingRESTSupportTransaction* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 2756 "TumblrPublishing.c"
-	}
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = txn;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:362: EVENT: user info request transaction comple" \
-"ted; response = '%s'", _tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = txn;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp10_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
-#line 2780 "TumblrPublishing.c"
-}
-
-
-static gpointer _json_object_ref0 (gpointer self) {
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? json_object_ref (self) : NULL;
-#line 2787 "TumblrPublishing.c"
-}
-
-
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
-	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 2806 "TumblrPublishing.c"
-	} else {
-		const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 2813 "TumblrPublishing.c"
-	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = TRUE;
-#line 2819 "TumblrPublishing.c"
-	} else {
-		const gchar* _tmp3_;
-		const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 2829 "TumblrPublishing.c"
-	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 2833 "TumblrPublishing.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 2841 "TumblrPublishing.c"
-	}
-	{
-		GRegex* regex = NULL;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		GRegex* _tmp9_;
-		GRegex* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		GRegex* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2873 "TumblrPublishing.c"
-				goto __catch35_g_regex_error;
-			}
-#line 1412 "/usr/share/vala-0.36/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 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return NULL;
-#line 2882 "TumblrPublishing.c"
-		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2898 "TumblrPublishing.c"
-				goto __catch35_g_regex_error;
-			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/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 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return NULL;
-#line 2909 "TumblrPublishing.c"
-		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 2923 "TumblrPublishing.c"
-	}
-	goto __finally35;
-	__catch35_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 2937 "TumblrPublishing.c"
-	}
-	__finally35:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return NULL;
-#line 2948 "TumblrPublishing.c"
-	}
-}
-
-
-static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
-#line 2960 "TumblrPublishing.c"
-	}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 2966 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = response;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \
-"into list of available blogs", _tmp0_);
-#line 2981 "TumblrPublishing.c"
-	{
-		JsonParser* parser = NULL;
-		JsonParser* _tmp1_;
-		const gchar* _tmp2_;
-		JsonObject* root_object = NULL;
-		JsonNode* _tmp3_;
-		JsonObject* _tmp4_;
-		JsonObject* _tmp5_;
-		JsonObject* _tmp6_;
-		JsonObject* _tmp7_;
-		JsonObject* _tmp8_;
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-		const gchar* _tmp11_;
-		JsonObject* _tmp12_;
-		JsonObject* _tmp13_;
-		JsonObject* _tmp14_;
-		JsonArray* _tmp15_;
-		GList* _tmp16_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = json_parser_new ();
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		parser = _tmp1_;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = response;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		json_parser_load_from_data (parser, _tmp2_, (gssize) -1, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (parser);
-#line 3013 "TumblrPublishing.c"
-			goto __catch34_g_error;
-		}
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = json_parser_get_root (parser);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = json_node_get_object (_tmp3_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = _json_object_ref0 (_tmp4_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		root_object = _tmp5_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = root_object;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = json_object_get_object_member (_tmp6_, "response");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = json_object_get_object_member (_tmp7_, "user");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = json_object_get_string_member (_tmp8_, "name");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = g_strdup (_tmp9_);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (self->priv->username);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->username = _tmp10_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = self->priv->username;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:376: Got user name: %s", _tmp11_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = root_object;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = json_object_get_object_member (_tmp12_, "response");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = json_object_get_object_member (_tmp13_, "user");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = json_array_get_elements (_tmp15_);
-#line 3052 "TumblrPublishing.c"
-		{
-			GList* blognode_collection = NULL;
-			GList* blognode_it = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			blognode_collection = _tmp16_;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
-#line 3060 "TumblrPublishing.c"
-				JsonNode* blognode = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				blognode = (JsonNode*) blognode_it->data;
-#line 3064 "TumblrPublishing.c"
-				{
-					JsonObject* blog = NULL;
-					JsonNode* _tmp17_;
-					JsonObject* _tmp18_;
-					JsonObject* _tmp19_;
-					gchar* name = NULL;
-					JsonObject* _tmp20_;
-					const gchar* _tmp21_;
-					gchar* _tmp22_;
-					gchar* url = NULL;
-					JsonObject* _tmp23_;
-					const gchar* _tmp24_;
-					gchar* _tmp25_;
-					gchar* _tmp26_;
-					gchar* _tmp27_;
-					gchar* _tmp28_;
-					const gchar* _tmp29_;
-					const gchar* _tmp30_;
-					PublishingTumblrBlogEntry** _tmp31_;
-					gint _tmp31__length1;
-					const gchar* _tmp32_;
-					const gchar* _tmp33_;
-					PublishingTumblrBlogEntry* _tmp34_;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = blognode;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = json_node_get_object (_tmp17_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = _json_object_ref0 (_tmp18_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					blog = _tmp19_;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = blog;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp21_ = json_object_get_string_member (_tmp20_, "name");
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22_ = g_strdup (_tmp21_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					name = _tmp22_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp23_ = blog;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp24_ = json_object_get_string_member (_tmp23_, "url");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp25_ = string_replace (_tmp24_, "http://", "");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp26_ = _tmp25_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp27_ = string_replace (_tmp26_, "/", "");
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp28_ = _tmp27_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_tmp26_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					url = _tmp28_;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp29_ = name;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp30_ = url;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_debug ("TumblrPublishing.vala:381: Got blog name: %s and url: %s", _tmp29_, _tmp30_);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp31_ = self->priv->blogs;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp31__length1 = self->priv->blogs_length1;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp32_ = name;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp33_ = url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp34_ = publishing_tumblr_blog_entry_new (_tmp32_, _tmp33_);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_vala_array_add21 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp34_);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (url);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (name);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_json_object_unref0 (blog);
-#line 3144 "TumblrPublishing.c"
-				}
-			}
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_list_free0 (blognode_collection);
-#line 3149 "TumblrPublishing.c"
-		}
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_json_object_unref0 (root_object);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (parser);
-#line 3155 "TumblrPublishing.c"
-	}
-	goto __finally34;
-	__catch34_g_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp35_;
-		GError* _tmp36_;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		err = _inner_error_;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = self->priv->host;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = err;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (err);
-#line 3175 "TumblrPublishing.c"
-	}
-	__finally34:
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3186 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_;
-	guint _tmp1_;
-	PublishingRESTSupportTransaction* _tmp2_;
-	guint _tmp3_;
-	gboolean _tmp4_;
-	PublishingTumblrTumblrPublisherSession* _tmp5_;
-	SpitPublishingPluginHost* _tmp6_;
-	GError* _tmp7_;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = txn;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp4_) {
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3222 "TumblrPublishing.c"
-	}
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->session;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_deauthenticate (_tmp5_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_invalidate_persistent_session (self);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:399: EVENT: user info request transaction caused" \
-" a network error");
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->host;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = err;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 3238 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
-#line 3245 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
-#line 3252 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
-	SpitPublishingPluginHost* _tmp1_;
-	SpitPublishingPublisherMediaType _tmp2_;
-	PublishingTumblrSizeEntry** _tmp3_;
-	gint _tmp3__length1;
-	PublishingTumblrBlogEntry** _tmp4_;
-	gint _tmp4__length1;
-	const gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:404: ACTION: displaying publishing options pane");
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp1_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->sizes;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__length1 = self->priv->sizes_length1;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->blogs;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = self->priv->blogs_length1;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = self->priv->username;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, _tmp2_, _tmp3_, _tmp3__length1, _tmp4_, _tmp4__length1, _tmp5_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_options_pane = _tmp6_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->host;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (publishing_options_pane);
-#line 3304 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
-	gboolean _tmp5_;
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publishing_options_pane;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 3317 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
-		guint _tmp2_;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
-		guint _tmp4_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->publishing_options_pane;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->publishing_options_pane;
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3334 "TumblrPublishing.c"
-	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp5_) {
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3342 "TumblrPublishing.c"
-	}
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \
-" the publishing options pane");
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_publish (self);
-#line 3348 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
-	gboolean _tmp5_;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publishing_options_pane;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 3361 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
-		guint _tmp2_;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
-		guint _tmp4_;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->publishing_options_pane;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->publishing_options_pane;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3378 "TumblrPublishing.c"
-	}
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp5_) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3386 "TumblrPublishing.c"
-	}
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \
-"the publishing options pane");
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_logout (self);
-#line 3392 "TumblrPublishing.c"
-}
-
-
-gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
-	gint result = 0;
-	SpitPublishingPublishable* _tmp0_;
-	GDateTime* _tmp1_;
-	GDateTime* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	GDateTime* _tmp4_;
-	GDateTime* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = a;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = b;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_date_time_unref0 (_tmp5_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_date_time_unref0 (_tmp2_);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp7_;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 3434 "TumblrPublishing.c"
-}
-
-
-static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
-	gint result;
-	result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 3443 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
-#line 3450 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 3457 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
-#line 3464 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-	PublishingTumblrSizeEntry** _tmp2_;
-	gint _tmp2__length1;
-	gint _tmp3_;
-	PublishingTumblrSizeEntry* _tmp4_;
-	gint _tmp5_;
-	void* _tmp6_;
-	GDestroyNotify _tmp7_;
-	SpitPublishingProgressCallback _tmp8_;
-	gboolean _tmp9_;
-	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_;
-	gint _tmp11_;
-	SpitPublishingPublishable** _tmp12_;
-	gint publishables_length1;
-	gint _publishables_size_;
-	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_;
-	SpitPublishingPublishable** _tmp14_;
-	gint _tmp14__length1;
-	GeeArrayList* _tmp18_;
-	gchar* blog_url = NULL;
-	PublishingTumblrBlogEntry** _tmp19_;
-	gint _tmp19__length1;
-	gint _tmp20_;
-	PublishingTumblrBlogEntry* _tmp21_;
-	const gchar* _tmp22_;
-	gchar* _tmp23_;
-	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp24_;
-	GeeArrayList* _tmp25_;
-	gint _tmp26_;
-	gpointer* _tmp27_;
-	SpitPublishingPublishable** _tmp28_;
-	gint _tmp28__length1;
-	const gchar* _tmp29_;
-	PublishingTumblrTumblrPublisherUploader* _tmp30_;
-	PublishingTumblrTumblrPublisherUploader* _tmp31_;
-	PublishingTumblrTumblrPublisherUploader* _tmp32_;
-	PublishingTumblrTumblrPublisherUploader* _tmp33_;
-	PublishingTumblrTumblrPublisherUploader* _tmp34_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:448: ACTION: uploading media items to remote ser" \
-"ver.");
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->sizes;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = self->priv->sizes_length1;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (self);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp2_[_tmp3_];
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_->size;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp5_, FALSE, &_tmp6_, &_tmp7_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = _tmp8_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = _tmp6_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp9_) {
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3553 "TumblrPublishing.c"
-	}
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = self->priv->host;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables = _tmp12_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables_length1 = _tmp11_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishables_size_ = publishables_length1;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_list = _tmp13_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = publishables;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14__length1 = publishables_length1;
-#line 3573 "TumblrPublishing.c"
-	{
-		SpitPublishingPublishable** p_collection = NULL;
-		gint p_collection_length1 = 0;
-		gint _p_collection_size_ = 0;
-		gint p_it = 0;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		p_collection = _tmp14_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		p_collection_length1 = _tmp14__length1;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 3585 "TumblrPublishing.c"
-			SpitPublishingPublishable* _tmp15_;
-			SpitPublishingPublishable* p = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			p = _tmp15_;
-#line 3592 "TumblrPublishing.c"
-			{
-				GeeArrayList* _tmp16_;
-				SpitPublishingPublishable* _tmp17_;
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				g_debug ("TumblrPublishing.vala:466: ACTION: add publishable");
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = sorted_list;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = p;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_object_unref0 (p);
-#line 3606 "TumblrPublishing.c"
-			}
-		}
-	}
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp18_ = sorted_list;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp19_ = self->priv->blogs;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp19__length1 = self->priv->blogs_length1;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp20_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp21_ = _tmp19_[_tmp20_];
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp22_ = _tmp21_->url;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp23_ = g_strdup (_tmp22_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	blog_url = _tmp23_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp24_ = self->priv->session;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = sorted_list;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp27_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp26_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = _tmp27_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28__length1 = _tmp26_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp29_ = blog_url;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp30_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp24_, _tmp28_, _tmp26_, _tmp29_);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp31_ = _tmp30_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	uploader = _tmp31_;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp32_ = uploader;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = uploader;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = uploader;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (blog_url);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (sorted_list);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3668 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_;
-	SpitPublishingPluginHost* _tmp1_;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:479: ACTION: showing success pane.");
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3687 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_;
-	gdouble _tmp1_;
-	SpitPublishingProgressCallback _tmp2_;
-	void* _tmp2__target;
-	SpitPublishingProgressCallback _tmp3_;
-	void* _tmp3__target;
-	gint _tmp4_;
-	gdouble _tmp5_;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3708 "TumblrPublishing.c"
-	}
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = completed_fraction;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:490: EVENT: uploader reports upload %.2f percent" \
-" complete.", 100.0 * _tmp1_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->progress_reporter;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__target = self->priv->progress_reporter_target;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->progress_reporter;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3__target = self->priv->progress_reporter_target;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = file_number;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = completed_fraction;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 3730 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	PublishingRESTSupportBatchUploader* _tmp2_;
-	guint _tmp3_;
-	PublishingRESTSupportBatchUploader* _tmp4_;
-	guint _tmp5_;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3751 "TumblrPublishing.c"
-	}
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = num_published;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:502: EVENT: uploader reports upload complete; %d" \
-" items published.", _tmp1_);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = uploader;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = uploader;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
-#line 3771 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_;
-	GError* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportBatchUploader* _tmp3_;
-	guint _tmp4_;
-	PublishingRESTSupportBatchUploader* _tmp5_;
-	guint _tmp6_;
-	SpitPublishingPluginHost* _tmp7_;
-	GError* _tmp8_;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (!_tmp0_) {
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3795 "TumblrPublishing.c"
-	}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = err;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_->message;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:515: EVENT: uploader reports upload error = '%s'" \
-".", _tmp2_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = uploader;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = uploader;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->host;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = err;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3821 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:525: ACTION: logging user out, deauthenticating " \
-"session, and erasing stored credentials");
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_deauthenticate (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_invalidate_persistent_session (self);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3841 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_) {
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3856 "TumblrPublishing.c"
-	}
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction.");
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = TRUE;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self);
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_) {
-#line 3866 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp2_;
-		gchar* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:543: attempt start: a persistent session is avai" \
-"lable; using it");
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->session;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (self);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = _tmp3_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (self);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (_tmp2_, _tmp4_, _tmp6_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp6_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp4_);
-#line 3890 "TumblrPublishing.c"
-	} else {
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \
-"ble; showing login welcome pane");
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3896 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return;
-#line 3913 "TumblrPublishing.c"
-	}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->was_started;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_) {
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_error ("TumblrPublishing.vala:559: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
-"ble."));
-#line 3921 "TumblrPublishing.c"
-	}
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction.");
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3927 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base) {
-	PublishingTumblrTumblrPublisher * self;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked.");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 3939 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile)) {
-		static const GEnumValue values[] = {{PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO, "PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO", "intro"}, {PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER, "PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER", "failed-retry-user"}, {0, NULL, NULL}};
-		GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id;
-		publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id = g_enum_register_static ("PublishingTumblrTumblrPublisherAuthenticationPaneMode", values);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile, publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_authentication_pane_mode_type_id__volatile;
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3958 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3965 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3972 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherAuthenticationPane*) g_object_new (object_type, NULL);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 3992 "TumblrPublishing.c"
-	{
-		GtkBuilder* _tmp1_;
-		GtkBuilder* _tmp2_;
-		GtkBuilder* _tmp3_;
-		GtkWidget* content = NULL;
-		GtkBuilder* _tmp4_;
-		GObject* _tmp5_;
-		GtkWidget* _tmp6_;
-		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_;
-		GObject* _tmp8_;
-		GtkLabel* _tmp9_;
-		PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_;
-		GtkBuilder* _tmp17_;
-		GObject* _tmp18_;
-		GtkEntry* _tmp19_;
-		GtkBuilder* _tmp20_;
-		GObject* _tmp21_;
-		GtkEntry* _tmp22_;
-		GtkBuilder* _tmp23_;
-		GObject* _tmp24_;
-		GtkButton* _tmp25_;
-		GtkEntry* _tmp26_;
-		GtkEntry* _tmp27_;
-		GtkButton* _tmp28_;
-		GtkWidget* _tmp29_;
-		GtkContainer* _tmp30_;
-		GtkContainer* _tmp31_;
-		GtkWidget* _tmp32_;
-		GtkBox* _tmp33_;
-		GtkWidget* _tmp34_;
-		PublishingTumblrTumblrPublisher* _tmp35_;
-		SpitPublishingPluginHost* _tmp36_;
-		SpitPublishingPluginHost* _tmp37_;
-		GtkButton* _tmp38_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = gtk_builder_new ();
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->builder = _tmp1_;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->builder;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4040 "TumblrPublishing.c"
-			goto __catch36_g_error;
-		}
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp3_ = self->priv->builder;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_connect_signals (_tmp3_, NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = self->priv->builder;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		content = _tmp6_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->builder;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		message_label = _tmp9_;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = mode;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		switch (_tmp10_) {
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO:
-#line 4069 "TumblrPublishing.c"
-			{
-				GtkLabel* _tmp11_;
-				const gchar* _tmp12_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp11_ = message_label;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp12_ = publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_text (_tmp11_, _tmp12_);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				break;
-#line 4081 "TumblrPublishing.c"
-			}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 4085 "TumblrPublishing.c"
-			{
-				GtkLabel* _tmp13_;
-				const gchar* _tmp14_;
-				gchar* _tmp15_;
-				gchar* _tmp16_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp13_ = message_label;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp15_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp16_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp16_);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				break;
-#line 4105 "TumblrPublishing.c"
-			}
-			default:
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			break;
-#line 4110 "TumblrPublishing.c"
-		}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = self->priv->builder;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->username_entry);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->username_entry = _tmp19_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = self->priv->builder;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->password_entry);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->password_entry = _tmp22_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = self->priv->builder;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->login_button);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->login_button = _tmp25_;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = self->priv->username_entry;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->password_entry;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->login_button;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = content;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = gtk_widget_get_parent (_tmp29_);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = content;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_remove (_tmp31_, _tmp32_);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = self->priv->pane_widget;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = content;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = publisher;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = publishing_tumblr_tumblr_publisher_get_host (_tmp35_);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = _tmp36_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = self->priv->login_button;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp37_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (message_label);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (content);
-#line 4186 "TumblrPublishing.c"
-	}
-	goto __finally36;
-	__catch36_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp39_;
-		const gchar* _tmp40_;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = e;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = _tmp39_->message;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_ ("Could not load UI: %s"), _tmp40_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 4206 "TumblrPublishing.c"
-	}
-	__finally36:
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return NULL;
-#line 4217 "TumblrPublishing.c"
-	}
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 4221 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 4228 "TumblrPublishing.c"
-}
-
-
-GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkWidget* result = NULL;
-	GtkButton* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->login_button;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4246 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkEntry* _tmp0_;
-	const gchar* _tmp1_;
-	GtkEntry* _tmp2_;
-	const gchar* _tmp3_;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->username_entry;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->password_entry;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
-#line 4267 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4276 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4285 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_;
-	guint _tmp2_;
-	guint _tmp3_;
-	GtkButton* _tmp7_;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->username_entry;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp3_ > ((guint) 0)) {
-#line 4305 "TumblrPublishing.c"
-		GtkEntry* _tmp4_;
-		guint _tmp5_;
-		guint _tmp6_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp4_ = self->priv->password_entry;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = gtk_entry_get_text_length (_tmp4_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 4317 "TumblrPublishing.c"
-	} else {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 4321 "TumblrPublishing.c"
-	}
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = self->priv->login_button;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 4327 "TumblrPublishing.c"
-}
-
-
-static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4346 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4359 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkEntry* _tmp0_;
-	GtkEntry* _tmp1_;
-	GtkButton* _tmp2_;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->username_entry;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->password_entry;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_entry_set_activates_default (_tmp1_, TRUE);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = self->priv->login_button;
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4384 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 4392 "TumblrPublishing.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2);
-	register GMarshalFunc_VOID__STRING_STRING callback;
-	register GCClosure * cc;
-	register gpointer data1;
-	register gpointer data2;
-	cc = (GCClosure *) closure;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data1 = closure->data;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 4411 "TumblrPublishing.c"
-	} else {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		data2 = closure->data;
-#line 4417 "TumblrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4423 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (PublishingTumblrTumblrPublisherAuthenticationPaneClass * klass) {
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherAuthenticationPanePrivate));
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_authentication_pane_finalize;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup (_ ("Enter the username and password associated with your Tumblr account."));
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp0_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
-#line 4446 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
-#line 4461 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init (PublishingTumblrTumblrPublisherAuthenticationPane * self) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 4470 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->username_entry);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->password_entry);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->login_button);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj);
-#line 4490 "TumblrPublishing.c"
-}
-
-
-/**
- * The authentication pane used when asking service URL, user name and password
- * from the user.
- */
-GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherAuthenticationPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_tumblr_tumblr_publisher_authentication_pane_type_id;
-		publishing_tumblr_tumblr_publisher_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisherAuthenticationPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile, publishing_tumblr_tumblr_publisher_authentication_pane_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_authentication_pane_type_id__volatile;
-}
-
-
-static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
-#line 4515 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length) {
-	PublishingTumblrSizeEntry** result;
-	int i;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4526 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* _tmp0_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4532 "TumblrPublishing.c"
-	}
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4536 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
-#line 4543 "TumblrPublishing.c"
-}
-
-
-static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** self, int length) {
-	PublishingTumblrBlogEntry** result;
-	int i;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4554 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* _tmp0_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4560 "TumblrPublishing.c"
-	}
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 4564 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4571 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4578 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4585 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4592 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL;
-	GtkBox* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingTumblrTumblrPublisher* _tmp3_;
-	PublishingTumblrTumblrPublisher* _tmp4_;
-	SpitPublishingPublisherMediaType _tmp5_;
-	PublishingTumblrSizeEntry** _tmp6_;
-	gint _tmp6__length1;
-	PublishingTumblrSizeEntry** _tmp7_;
-	gint _tmp7__length1;
-	PublishingTumblrBlogEntry** _tmp8_;
-	gint _tmp8__length1;
-	PublishingTumblrBlogEntry** _tmp9_;
-	gint _tmp9__length1;
-	GError * _inner_error_ = NULL;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (username != NULL, NULL);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp2_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publisher;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publisher);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publisher = _tmp4_;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = media_type;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->media_type = _tmp5_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = sizes;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6__length1 = sizes_length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup7 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _tmp6__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = _tmp7_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = _tmp7__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = blogs;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = blogs_length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = _tmp9_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = _tmp9__length1;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 4679 "TumblrPublishing.c"
-	{
-		GtkBuilder* _tmp10_;
-		GtkBuilder* _tmp11_;
-		GtkBuilder* _tmp12_;
-		GtkBuilder* _tmp13_;
-		GObject* _tmp14_;
-		GtkBox* _tmp15_;
-		GtkBuilder* _tmp16_;
-		GObject* _tmp17_;
-		GtkLabel* _tmp18_;
-		GtkBuilder* _tmp19_;
-		GObject* _tmp20_;
-		GtkButton* _tmp21_;
-		GtkBuilder* _tmp22_;
-		GObject* _tmp23_;
-		GtkButton* _tmp24_;
-		GtkBuilder* _tmp25_;
-		GObject* _tmp26_;
-		GtkComboBoxText* _tmp27_;
-		GtkBuilder* _tmp28_;
-		GObject* _tmp29_;
-		GtkLabel* _tmp30_;
-		GtkBuilder* _tmp31_;
-		GObject* _tmp32_;
-		GtkComboBoxText* _tmp33_;
-		GtkBuilder* _tmp34_;
-		GObject* _tmp35_;
-		GtkLabel* _tmp36_;
-		gchar* upload_label_text = NULL;
-		const gchar* _tmp37_;
-		gchar* _tmp38_;
-		GtkLabel* _tmp39_;
-		const gchar* _tmp40_;
-		GtkComboBoxText* _tmp41_;
-		SpitPublishingPublisherMediaType _tmp42_;
-		GtkButton* _tmp46_;
-		GtkButton* _tmp47_;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = gtk_builder_new ();
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->builder = _tmp10_;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = self->priv->builder;
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4729 "TumblrPublishing.c"
-			goto __catch37_g_error;
-		}
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = self->priv->builder;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_builder_connect_signals (_tmp12_, NULL);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = self->priv->builder;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane");
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->pane_widget);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->pane_widget = _tmp15_;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = self->priv->builder;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label");
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->upload_info_label);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->upload_info_label = _tmp18_;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = self->priv->builder;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button");
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->logout_button);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->logout_button = _tmp21_;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = self->priv->builder;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->publish_button);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->publish_button = _tmp24_;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = self->priv->builder;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->size_combo);
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_combo = _tmp27_;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->builder;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->size_label);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_label = _tmp30_;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = self->priv->builder;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo");
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->blog_combo);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->blog_combo = _tmp33_;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = self->priv->builder;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label");
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel));
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (self->priv->blog_label);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->blog_label = _tmp36_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = self->priv->username;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		upload_label_text = _tmp38_;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = self->priv->upload_info_label;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = upload_label_text;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_label_set_label (_tmp39_, _tmp40_);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = self->priv->blog_combo;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp42_ = media_type;
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4838 "TumblrPublishing.c"
-			GtkComboBoxText* _tmp43_;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp43_ = self->priv->size_combo;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 4846 "TumblrPublishing.c"
-		} else {
-			GtkComboBoxText* _tmp44_;
-			GtkLabel* _tmp45_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp44_ = self->priv->size_combo;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp45_ = self->priv->size_label;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4858 "TumblrPublishing.c"
-		}
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp46_ = self->priv->logout_button;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp47_ = self->priv->publish_button;
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (upload_label_text);
-#line 4870 "TumblrPublishing.c"
-	}
-	goto __finally37;
-	__catch37_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp48_;
-		const gchar* _tmp49_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp48_ = e;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp49_ = _tmp48_->message;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_ ("Could not load UI: %s"), _tmp49_);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 4890 "TumblrPublishing.c"
-	}
-	__finally37:
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		return NULL;
-#line 4901 "TumblrPublishing.c"
-	}
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 4905 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
-#line 4912 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 4921 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 4930 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrBlogEntry** _tmp0_;
-	gint _tmp0__length1;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->blogs;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->blogs_length1;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 4945 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry** _tmp1_;
-		gint _tmp1__length1;
-		GtkComboBoxText* _tmp6_;
-		PublishingTumblrTumblrPublisher* _tmp7_;
-		gint _tmp8_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->blogs;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1__length1 = self->priv->blogs_length1;
-#line 4955 "TumblrPublishing.c"
-		{
-			PublishingTumblrBlogEntry** b_collection = NULL;
-			gint b_collection_length1 = 0;
-			gint _b_collection_size_ = 0;
-			gint b_it = 0;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			b_collection = _tmp1_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			b_collection_length1 = _tmp1__length1;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
-#line 4967 "TumblrPublishing.c"
-				PublishingTumblrBlogEntry* _tmp2_;
-				PublishingTumblrBlogEntry* b = NULL;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				b = _tmp2_;
-#line 4974 "TumblrPublishing.c"
-				{
-					GtkComboBoxText* _tmp3_;
-					PublishingTumblrBlogEntry* _tmp4_;
-					const gchar* _tmp5_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp3_ = self->priv->blog_combo;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp4_ = b;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp5_ = _tmp4_->blog;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_tumblr_blog_entry_unref0 (b);
-#line 4989 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->blog_combo;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->publisher;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5001 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publisher;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->blog_combo;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
-#line 5020 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrSizeEntry** _tmp0_;
-	gint _tmp0__length1;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->sizes;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->sizes_length1;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp0_ != NULL) {
-#line 5035 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry** _tmp1_;
-		gint _tmp1__length1;
-		GtkComboBoxText* _tmp6_;
-		PublishingTumblrTumblrPublisher* _tmp7_;
-		gint _tmp8_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1_ = self->priv->sizes;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp1__length1 = self->priv->sizes_length1;
-#line 5045 "TumblrPublishing.c"
-		{
-			PublishingTumblrSizeEntry** e_collection = NULL;
-			gint e_collection_length1 = 0;
-			gint _e_collection_size_ = 0;
-			gint e_it = 0;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			e_collection = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			e_collection_length1 = _tmp1__length1;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
-#line 5057 "TumblrPublishing.c"
-				PublishingTumblrSizeEntry* _tmp2_;
-				PublishingTumblrSizeEntry* e = NULL;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				e = _tmp2_;
-#line 5064 "TumblrPublishing.c"
-				{
-					GtkComboBoxText* _tmp3_;
-					PublishingTumblrSizeEntry* _tmp4_;
-					const gchar* _tmp5_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp3_ = self->priv->size_combo;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp4_ = e;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp5_ = _tmp4_->title;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_tumblr_size_entry_unref0 (e);
-#line 5079 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = self->priv->size_combo;
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = self->priv->publisher;
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5091 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->publisher;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->size_combo;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5110 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
-#line 5119 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 5128 "TumblrPublishing.c"
-}
-
-
-static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_;
-	GtkWidget* _tmp1_;
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5147 "TumblrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5160 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5167 "TumblrPublishing.c"
-}
-
-
-static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5174 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
-#line 5186 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	guint _tmp0_;
-	guint _tmp1_;
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 5204 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate));
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5219 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
-#line 5234 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
-	gchar* _tmp0_;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->upload_info_label = NULL;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_label = NULL;
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_label = NULL;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->logout_button = NULL;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publish_button = NULL;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_combo = NULL;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_combo = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = 0;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = NULL;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = 0;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp0_;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publisher = NULL;
-#line 5276 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->upload_info_label);
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_label);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_label);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->logout_button);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_combo);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_combo);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publisher);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
-#line 5312 "TumblrPublishing.c"
-}
-
-
-/**
- * The publishing options pane.
- */
-GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id;
-		publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisherPublishingOptionsPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile, publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
-	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = method;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5347 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method);
-#line 5354 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
-	PublishingTumblrTumblrPublisherSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	PublishingTumblrTumblrPublisherSession* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	gboolean _tmp12_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = uri;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = method;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = session;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp3_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = session;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp6_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = session;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp9_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp12_ = _tmp11_ != NULL;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp11_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp12_) {
-#line 5423 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = session;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp14_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp13_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp15_);
-#line 5437 "TumblrPublishing.c"
-	}
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5441 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method);
-#line 5448 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingTumblrTumblrPublisherTransaction * self;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 5477 "TumblrPublishing.c"
-		} else {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 5485 "TumblrPublishing.c"
-		}
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_class_init (PublishingTumblrTumblrPublisherTransactionClass * klass) {
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute;
-#line 5496 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_transaction_instance_init (PublishingTumblrTumblrPublisherTransaction * self) {
-}
-
-
-GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_transaction_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (username != NULL, NULL);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (password != NULL, NULL);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = username;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = password;
-#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5551 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 5558 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5565 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction * self) {
-}
-
-
-GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherAccessTokenFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) {
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5596 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) {
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
-#line 5603 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5610 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherUserInfoFetchTransaction * self) {
-}
-
-
-GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherUserInfoFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile;
-}
-
-
-static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) {
-	gchar* result = NULL;
-	GString* s = NULL;
-	GString* _tmp0_;
-	gchar* bytes = NULL;
-	gchar* _tmp1_;
-	gint bytes_length1;
-	gint _bytes_size_;
-	gchar* _tmp2_;
-	gint _tmp2__length1;
-	gchar _tmp3_;
-	guint8* _tmp4_;
-	gint _tmp4__length1;
-	GString* _tmp14_;
-	const gchar* _tmp15_;
-	gchar* _tmp16_;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_string_new ("");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	s = _tmp0_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_new0 (gchar, 2);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes = _tmp1_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes_length1 = 2;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_bytes_size_ = bytes_length1;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = bytes;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = bytes_length1;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_[1] = (gchar) 0;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_[1];
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = data;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = data_length1;
-#line 5672 "TumblrPublishing.c"
-	{
-		guint8* byte_collection = NULL;
-		gint byte_collection_length1 = 0;
-		gint _byte_collection_size_ = 0;
-		gint byte_it = 0;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		byte_collection = _tmp4_;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		byte_collection_length1 = _tmp4__length1;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
-#line 5684 "TumblrPublishing.c"
-			guint8 byte = 0U;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			byte = byte_collection[byte_it];
-#line 5688 "TumblrPublishing.c"
-			{
-				guint8 _tmp5_;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp5_ = byte;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (((gint) _tmp5_) == 0) {
-#line 5695 "TumblrPublishing.c"
-					GString* _tmp6_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp6_ = s;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_string_append (_tmp6_, "%00");
-#line 5701 "TumblrPublishing.c"
-				} else {
-					gchar* _tmp7_;
-					gint _tmp7__length1;
-					guint8 _tmp8_;
-					gchar _tmp9_;
-					GString* _tmp10_;
-					gchar* _tmp11_;
-					gint _tmp11__length1;
-					gchar* _tmp12_;
-					gchar* _tmp13_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7_ = bytes;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7__length1 = bytes_length1;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp8_ = byte;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp7_[0] = (gchar) _tmp8_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp9_ = _tmp7_[0];
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp10_ = s;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = bytes;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11__length1 = bytes_length1;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = _tmp12_;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					g_string_append (_tmp10_, _tmp13_);
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_tmp13_);
-#line 5736 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = s;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp15_ = _tmp14_->str;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp16_ = g_strdup (_tmp15_);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp16_;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	bytes = (g_free (bytes), NULL);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_string_free0 (s);
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5755 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5762 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
-	PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	SpitPublishingPublishable* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherSession* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:898: Init upload transaction");
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishable;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = blog_url;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", _tmp2_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = session;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = _publishing_rest_support_session_ref0 (_tmp5_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = _tmp6_;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 5807 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
-#line 5814 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5825 "TumblrPublishing.c"
-	}
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 5831 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportArgument* _tmp3_;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self));
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (key != NULL);
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (value != NULL);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = key;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = value;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5859 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5866 "TumblrPublishing.c"
-}
-
-
-static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
-	PublishingRESTSupportArgument** result;
-	int i;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 5877 "TumblrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		result[i] = _tmp0_;
-#line 5883 "TumblrPublishing.c"
-	}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5887 "TumblrPublishing.c"
-}
-
-
-PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1) {
-	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	PublishingRESTSupportArgument** _tmp1_;
-	gint _tmp1__length1;
-	PublishingRESTSupportArgument** _tmp2_;
-	gint _tmp2__length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2__length1 = _tmp1__length1;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (result_length1) {
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp2__length1;
-#line 5917 "TumblrPublishing.c"
-	}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 5923 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("OAuth ");
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_result_ = _tmp0_;
-#line 5937 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 5942 "TumblrPublishing.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp1_ = TRUE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 5949 "TumblrPublishing.c"
-				gint _tmp3_;
-				PublishingRESTSupportArgument** _tmp4_;
-				gint _tmp4__length1;
-				const gchar* _tmp5_;
-				PublishingRESTSupportArgument** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
-				PublishingRESTSupportArgument* _tmp8_;
-				const gchar* _tmp9_;
-				gchar* _tmp10_;
-				const gchar* _tmp11_;
-				gchar* _tmp12_;
-				const gchar* _tmp13_;
-				PublishingRESTSupportArgument** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				PublishingRESTSupportArgument* _tmp16_;
-				const gchar* _tmp17_;
-				gchar* _tmp18_;
-				gchar* _tmp19_;
-				gchar* _tmp20_;
-				gchar* _tmp21_;
-				gchar* _tmp22_;
-				gint _tmp23_;
-				PublishingRESTSupportArgument** _tmp24_;
-				gint _tmp24__length1;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp1_) {
-#line 5978 "TumblrPublishing.c"
-					gint _tmp2_;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp2_ = i;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp2_ + 1;
-#line 5984 "TumblrPublishing.c"
-				}
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp1_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp3_ = i;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp4_ = self->priv->auth_header_fields;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp3_ < _tmp4__length1)) {
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 5998 "TumblrPublishing.c"
-				}
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp5_ = _result_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6_ = self->priv->auth_header_fields;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp7_ = i;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp8_ = _tmp6_[_tmp7_];
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp9_ = _tmp8_->key;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp10_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp11_ = _result_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp12_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp13_ = _result_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = self->priv->auth_header_fields;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = i;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp14_[_tmp15_];
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = _tmp16_->value;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp19_ = _tmp18_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp21_ = _tmp20_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_result_);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp22_;
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp21_);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp19_);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp23_ = i;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp24_ = self->priv->auth_header_fields;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6064 "TumblrPublishing.c"
-					const gchar* _tmp25_;
-					gchar* _tmp26_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp25_ = _result_;
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (_result_);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_result_ = _tmp26_;
-#line 6075 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _result_;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 6084 "TumblrPublishing.c"
-}
-
-
-static guint8* string_get_data (const gchar* self, int* result_length1) {
-	guint8* result;
-	guint8* res = NULL;
-	gint res_length1;
-	gint _res_size_;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	guint8* _tmp3_;
-	gint _tmp3__length1;
-	guint8* _tmp4_;
-	gint _tmp4__length1;
-#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	res = (guint8*) self;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	res_length1 = -1;
-#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_res_size_ = res_length1;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	res_length1 = (gint) _tmp1_;
-#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = res;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = res_length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp4_ = _tmp3_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _tmp3__length1;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp4__length1;
-#line 6128 "TumblrPublishing.c"
-	}
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp4_;
-#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 6134 "TumblrPublishing.c"
-}
-
-
-static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = separator;
-#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_ == NULL) {
-#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		separator = "";
-#line 6151 "TumblrPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = TRUE;
-#line 6161 "TumblrPublishing.c"
-	} else {
-		gchar** _tmp4_;
-		gint _tmp4__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp4__length1 > 0;
-#line 6171 "TumblrPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp2_) {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = TRUE;
-#line 6177 "TumblrPublishing.c"
-	} else {
-		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp6__length1 == -1) {
-#line 6188 "TumblrPublishing.c"
-			gchar** _tmp7_;
-			gint _tmp7__length1;
-			const gchar* _tmp8_;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7_ = str_array;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp7__length1 = str_array_length1;
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp8_ = _tmp7_[0];
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = _tmp8_ != NULL;
-#line 6200 "TumblrPublishing.c"
-		} else {
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp5_ = FALSE;
-#line 6204 "TumblrPublishing.c"
-		}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = _tmp5_;
-#line 6208 "TumblrPublishing.c"
-	}
-#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_) {
-#line 6212 "TumblrPublishing.c"
-		gint i = 0;
-		gsize len = 0UL;
-		gint _tmp31_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gsize _tmp35_;
-		const gchar* _tmp36_;
-		gint _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* res = NULL;
-		gsize _tmp40_;
-		void* _tmp41_;
-		void* ptr = NULL;
-		const gchar* _tmp42_;
-		gchar** _tmp43_;
-		gint _tmp43__length1;
-		const gchar* _tmp44_;
-		void* _tmp45_;
-		const gchar* _tmp62_;
-#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = (gsize) 1;
-#line 6235 "TumblrPublishing.c"
-		{
-			gboolean _tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 0;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp9_ = TRUE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 6244 "TumblrPublishing.c"
-				gboolean _tmp11_ = FALSE;
-				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp21_ = 0;
-				gchar** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				const gchar* _tmp24_;
-				gsize _tmp30_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp9_) {
-#line 6257 "TumblrPublishing.c"
-					gint _tmp10_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp10_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp10_ + 1;
-#line 6263 "TumblrPublishing.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp9_ = FALSE;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp13__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp13__length1 != -1) {
-#line 6273 "TumblrPublishing.c"
-					gint _tmp14_;
-					gchar** _tmp15_;
-					gint _tmp15__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp14_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp15__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 6285 "TumblrPublishing.c"
-				} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp12_ = FALSE;
-#line 6289 "TumblrPublishing.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp12_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = TRUE;
-#line 6295 "TumblrPublishing.c"
-				} else {
-					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_;
-					gint _tmp17__length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp17__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					if (_tmp17__length1 == -1) {
-#line 6306 "TumblrPublishing.c"
-						gchar** _tmp18_;
-						gint _tmp18__length1;
-						gint _tmp19_;
-						const gchar* _tmp20_;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18_ = str_array;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp18__length1 = str_array_length1;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp19_ = i;
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp20_ = _tmp18_[_tmp19_];
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = _tmp20_ != NULL;
-#line 6321 "TumblrPublishing.c"
-					} else {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-						_tmp16_ = FALSE;
-#line 6325 "TumblrPublishing.c"
-					}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp11_ = _tmp16_;
-#line 6329 "TumblrPublishing.c"
-				}
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp11_) {
-#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 6335 "TumblrPublishing.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp22__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp23_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp24_ = _tmp22_[_tmp23_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp24_ != NULL) {
-#line 6347 "TumblrPublishing.c"
-					gchar** _tmp25_;
-					gint _tmp25__length1;
-					gint _tmp26_;
-					const gchar* _tmp27_;
-					gint _tmp28_;
-					gint _tmp29_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25_ = str_array;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp25__length1 = str_array_length1;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp26_ = i;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp27_ = _tmp25_[_tmp26_];
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp29_ = _tmp28_;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = _tmp29_;
-#line 6368 "TumblrPublishing.c"
-				} else {
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp21_ = 0;
-#line 6372 "TumblrPublishing.c"
-				}
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp30_ = len;
-#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				len = _tmp30_ + _tmp21_;
-#line 6378 "TumblrPublishing.c"
-			}
-		}
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp31_ = i;
-#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		if (_tmp31_ == 0) {
-#line 6385 "TumblrPublishing.c"
-			gchar* _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp32_ = g_strdup ("");
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			result = _tmp32_;
-#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			return result;
-#line 6393 "TumblrPublishing.c"
-		}
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp33_ = i;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		str_array_length1 = _tmp33_;
-#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp34_ = str_array_length1;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp35_ = len;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp36_ = separator;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp38_ = _tmp37_;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp39_ = i;
-#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp40_ = len;
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp41_ = g_malloc (_tmp40_);
-#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = _tmp41_;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp42_ = res;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43_ = str_array;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp43__length1 = str_array_length1;
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp44_ = _tmp43_[0];
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		ptr = _tmp45_;
-#line 6431 "TumblrPublishing.c"
-		{
-			gboolean _tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			i = 1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			_tmp46_ = TRUE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-			while (TRUE) {
-#line 6440 "TumblrPublishing.c"
-				gint _tmp48_;
-				gchar** _tmp49_;
-				gint _tmp49__length1;
-				void* _tmp50_;
-				const gchar* _tmp51_;
-				void* _tmp52_;
-				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_;
-				gint _tmp54__length1;
-				gint _tmp55_;
-				const gchar* _tmp56_;
-				void* _tmp60_;
-				void* _tmp61_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!_tmp46_) {
-#line 6456 "TumblrPublishing.c"
-					gint _tmp47_;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp47_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					i = _tmp47_ + 1;
-#line 6462 "TumblrPublishing.c"
-				}
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp46_ = FALSE;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp48_ = i;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49_ = str_array;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp49__length1 = str_array_length1;
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					break;
-#line 6476 "TumblrPublishing.c"
-				}
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp50_ = ptr;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp51_ = separator;
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp52_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp54__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp55_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp56_ = _tmp54_[_tmp55_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				if (_tmp56_ != NULL) {
-#line 6496 "TumblrPublishing.c"
-					gchar** _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					const gchar* _tmp59_;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57_ = str_array;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp57__length1 = str_array_length1;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp58_ = i;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = (const gchar*) _tmp59_;
-#line 6511 "TumblrPublishing.c"
-				} else {
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-					_tmp53_ = "";
-#line 6515 "TumblrPublishing.c"
-				}
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp60_ = ptr;
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-				ptr = _tmp61_;
-#line 6523 "TumblrPublishing.c"
-			}
-		}
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp62_ = res;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		res = NULL;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gchar*) _tmp62_;
-#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 6534 "TumblrPublishing.c"
-	} else {
-		gchar* _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp63_ = g_strdup ("");
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp63_;
-#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 6543 "TumblrPublishing.c"
-	}
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingTumblrTumblrPublisherUploadTransaction * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	PublishingTumblrTumblrPublisherSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingTumblrTumblrPublisherSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* payload = NULL;
-	gsize payload_length = 0UL;
-	PublishingTumblrTumblrPublisherSession* _tmp33_;
-	gchar* authorization_header = NULL;
-	gchar* _tmp34_;
-	const gchar* _tmp35_;
-	const gchar* _tmp36_;
-	PublishingRESTSupportArgument** request_arguments = NULL;
-	gint _tmp37_;
-	PublishingRESTSupportArgument** _tmp38_;
-	gint request_arguments_length1;
-	gint _request_arguments_size_;
-	PublishingRESTSupportArgument** _tmp39_;
-	gint _tmp39__length1;
-	gchar* request_data = NULL;
-	gchar* _tmp40_;
-	SoupMessage* outbound_message = NULL;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	SoupMessage* _tmp65_;
-	SoupMessage* _tmp66_;
-	SoupMessage* _tmp67_;
-	const gchar* _tmp68_;
-	guint8* _tmp69_;
-	gint _tmp69__length1;
-	guint8* _tmp70_;
-	gint _tmp70__length1;
-	GeeMapIterator* i = NULL;
-	GeeHashMap* _tmp71_;
-	GeeMapIterator* _tmp72_;
-	gboolean cont = FALSE;
-	GeeMapIterator* _tmp73_;
-	gboolean _tmp74_;
-	SoupMessage* _tmp86_;
-	GError * _inner_error_ = NULL;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp0_);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = self->priv->session;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp3_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp5_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->session;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp6_);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 6632 "TumblrPublishing.c"
-	{
-		SpitPublishingPublishable* _tmp9_;
-		GFile* _tmp10_;
-		GFile* _tmp11_;
-		gchar* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_ = NULL;
-		gsize _tmp15_ = 0UL;
-		gchar* reqdata = NULL;
-		const gchar* _tmp16_;
-		guint8* _tmp17_;
-		gint _tmp17__length1;
-		guint8* _tmp18_;
-		gint _tmp18__length1;
-		gsize _tmp19_;
-		gchar* _tmp20_;
-		const gchar* _tmp21_;
-		gchar** keywords = NULL;
-		SpitPublishingPublishable* _tmp22_;
-		gint _tmp23_;
-		gchar** _tmp24_;
-		gint keywords_length1;
-		gint _keywords_size_;
-		gchar* tags = NULL;
-		gchar* _tmp25_;
-		gchar** _tmp26_;
-		gint _tmp26__length1;
-		const gchar* _tmp29_;
-		gchar* _tmp30_;
-		gchar* _tmp31_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp11_ = _tmp10_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp12_ = g_file_get_path (_tmp11_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp13_ = _tmp12_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_file_get_contents (_tmp13_, &_tmp14_, &_tmp15_, &_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (payload);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		payload = _tmp14_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		payload_length = _tmp15_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp13_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp11_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 6689 "TumblrPublishing.c"
-				goto __catch38_g_file_error;
-			}
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6700 "TumblrPublishing.c"
-		}
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp16_ = payload;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = string_get_data (_tmp16_, &_tmp17__length1);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = _tmp17_;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18__length1 = _tmp17__length1;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = payload_length;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp18_ + 0, ((gint) _tmp19_) - 0);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		reqdata = _tmp20_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = reqdata;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = spit_publishing_publishable_get_publishing_keywords (_tmp22_, &_tmp23_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords = _tmp24_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords_length1 = _tmp23_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_keywords_size_ = keywords_length1;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = g_strdup ("");
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tags = _tmp25_;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = keywords;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26__length1 = keywords_length1;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp26_ != NULL) {
-#line 6742 "TumblrPublishing.c"
-			gchar** _tmp27_;
-			gint _tmp27__length1;
-			gchar* _tmp28_;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp27_ = keywords;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp27__length1 = keywords_length1;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp28_ = _vala_g_strjoinv (",", _tmp27_, _tmp27__length1);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (tags);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			tags = _tmp28_;
-#line 6756 "TumblrPublishing.c"
-		}
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = tags;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = soup_uri_encode (_tmp29_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp31_);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp31_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (tags);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (reqdata);
-#line 6774 "TumblrPublishing.c"
-	}
-	goto __finally38;
-	__catch38_g_file_error:
-	{
-		GError* e = NULL;
-		GError* _tmp32_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		e = _inner_error_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = NULL;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = _tmp32_;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (e);
-#line 6791 "TumblrPublishing.c"
-		goto __finally38;
-	}
-	__finally38:
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6805 "TumblrPublishing.c"
-		} else {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 6815 "TumblrPublishing.c"
-		}
-	}
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = self->priv->session;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	authorization_header = _tmp34_;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp35_ = authorization_header;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \
-" header string = '%s'", _tmp35_);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp36_ = authorization_header;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp36_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp38_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp37_);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments = _tmp38_;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments_length1 = _tmp37_;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_request_arguments_size_ = request_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp39_ = request_arguments;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp39__length1 = request_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp39__length1 > 0, "request_arguments.length > 0");
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp40_ = g_strdup ("");
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_data = _tmp40_;
-#line 6852 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 6857 "TumblrPublishing.c"
-		{
-			gboolean _tmp41_ = FALSE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp41_ = TRUE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 6864 "TumblrPublishing.c"
-				gint _tmp43_;
-				PublishingRESTSupportArgument** _tmp44_;
-				gint _tmp44__length1;
-				const gchar* _tmp45_;
-				PublishingRESTSupportArgument** _tmp46_;
-				gint _tmp46__length1;
-				gint _tmp47_;
-				PublishingRESTSupportArgument* _tmp48_;
-				const gchar* _tmp49_;
-				gchar* _tmp50_;
-				gchar* _tmp51_;
-				PublishingRESTSupportArgument** _tmp52_;
-				gint _tmp52__length1;
-				gint _tmp53_;
-				PublishingRESTSupportArgument* _tmp54_;
-				const gchar* _tmp55_;
-				gchar* _tmp56_;
-				gchar* _tmp57_;
-				gchar* _tmp58_;
-				gint _tmp59_;
-				PublishingRESTSupportArgument** _tmp60_;
-				gint _tmp60__length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp41_) {
-#line 6889 "TumblrPublishing.c"
-					gint _tmp42_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp42_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp42_ + 1;
-#line 6895 "TumblrPublishing.c"
-				}
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp41_ = FALSE;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp43_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = request_arguments;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44__length1 = request_arguments_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp43_ < _tmp44__length1)) {
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 6909 "TumblrPublishing.c"
-				}
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = request_data;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = request_arguments;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46__length1 = request_arguments_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = _tmp46_[_tmp47_];
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp49_ = _tmp48_->key;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp50_ = g_strconcat (_tmp49_, "=", NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp51_ = _tmp50_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52_ = request_arguments;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52__length1 = request_arguments_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp54_ = _tmp52_[_tmp53_];
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp55_ = _tmp54_->value;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp56_ = g_strconcat (_tmp51_, _tmp55_, NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp57_ = _tmp56_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp58_ = g_strconcat (_tmp45_, _tmp57_, NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (request_data);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				request_data = _tmp58_;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp57_);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp51_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp59_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60_ = request_arguments;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60__length1 = request_arguments_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp59_ < (_tmp60__length1 - 1)) {
-#line 6959 "TumblrPublishing.c"
-					const gchar* _tmp61_;
-					gchar* _tmp62_;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp61_ = request_data;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp62_ = g_strconcat (_tmp61_, "&", NULL);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (request_data);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					request_data = _tmp62_;
-#line 6970 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp63_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp65_ = soup_message_new ("POST", _tmp64_);
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = _tmp65_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp64_);
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	outbound_message = _tmp66_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = outbound_message;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = request_data;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = string_get_data (_tmp68_, &_tmp69__length1);
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = _tmp69_;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70__length1 = _tmp69__length1;
-#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	soup_message_set_request (_tmp67_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp70_, (gsize) _tmp70__length1);
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp72_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	i = _tmp72_;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp73_ = i;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = gee_map_iterator_next (_tmp73_);
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	cont = _tmp74_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	while (TRUE) {
-#line 7013 "TumblrPublishing.c"
-		gboolean _tmp75_;
-		SoupMessage* _tmp76_;
-		SoupMessageHeaders* _tmp77_;
-		GeeMapIterator* _tmp78_;
-		gpointer _tmp79_;
-		gchar* _tmp80_;
-		GeeMapIterator* _tmp81_;
-		gpointer _tmp82_;
-		gchar* _tmp83_;
-		GeeMapIterator* _tmp84_;
-		gboolean _tmp85_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp75_ = cont;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (!_tmp75_) {
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			break;
-#line 7031 "TumblrPublishing.c"
-		}
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp76_ = outbound_message;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp77_ = _tmp76_->request_headers;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = i;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = gee_map_iterator_get_key (_tmp78_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = (gchar*) _tmp79_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = i;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp82_ = gee_map_iterator_get_value (_tmp81_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp83_ = (gchar*) _tmp82_;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		soup_message_headers_append (_tmp77_, _tmp80_, _tmp83_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp83_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp80_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp84_ = i;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp85_ = gee_map_iterator_next (_tmp84_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		cont = _tmp85_;
-#line 7061 "TumblrPublishing.c"
-	}
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp86_ = outbound_message;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp86_);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (i);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (request_data);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 7091 "TumblrPublishing.c"
-		} else {
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (i);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (request_data);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_g_free0 (payload);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			return;
-#line 7111 "TumblrPublishing.c"
-		}
-	}
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (i);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (outbound_message);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (request_data);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (authorization_header);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (payload);
-#line 7126 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) {
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_upload_transaction_finalize;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate));
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
-#line 7139 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 7146 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
-	PublishingTumblrTumblrPublisherUploadTransaction * self;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
-#line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj);
-#line 7160 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploadTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_upload_transaction_type_id;
-		publishing_tumblr_tumblr_publisher_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingTumblrTumblrPublisherUploadTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_upload_transaction_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
-	PublishingTumblrTumblrPublisherUploader* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	SpitPublishingPublishable** _tmp1_;
-	gint _tmp1__length1;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = session;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishables;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1__length1 = publishables_length1;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = blog_url;
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->blog_url);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_url = _tmp3_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 7205 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
-#line 7212 "TumblrPublishing.c"
-}
-
-
-static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
-	PublishingTumblrTumblrPublisherUploader * self;
-	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingTumblrTumblrPublisherSession* _tmp1_;
-	SpitPublishingPublishable* _tmp2_;
-	SpitPublishingPublishable* _tmp3_;
-	const gchar* _tmp4_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_;
-	PublishingRESTSupportTransaction* _tmp6_;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1012: Create upload transaction");
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = self->priv->blog_url;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp6_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7254 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) {
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
-#line 7267 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
-	gchar* _tmp0_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_url = _tmp0_;
-#line 7279 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
-	PublishingTumblrTumblrPublisherUploader * self;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->blog_url);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
-#line 7291 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_uploader_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploader), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_uploader_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_uploader_type_id;
-		publishing_tumblr_tumblr_publisher_uploader_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, "PublishingTumblrTumblrPublisherUploader", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile, publishing_tumblr_tumblr_publisher_uploader_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_uploader_type_id__volatile;
-}
-
-
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type) {
-	PublishingTumblrTumblrPublisherSession* self = NULL;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self;
-#line 7313 "TumblrPublishing.c"
-}
-
-
-PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) {
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION);
-#line 7320 "TumblrPublishing.c"
-}
-
-
-static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base) {
-	PublishingTumblrTumblrPublisherSession * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp1_ != NULL) {
-#line 7335 "TumblrPublishing.c"
-		const gchar* _tmp2_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = self->priv->access_phase_token_secret;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = _tmp2_ != NULL;
-#line 7341 "TumblrPublishing.c"
-	} else {
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 7345 "TumblrPublishing.c"
-	}
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp0_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7351 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = token;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = secret;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7384 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self) {
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 7399 "TumblrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 7406 "TumblrPublishing.c"
-}
-
-
-static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 7417 "TumblrPublishing.c"
-	}
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 7423 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn) {
-	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gchar* signing_key = NULL;
-	const gchar* _tmp6_;
-	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp11_;
-	gint _tmp12_;
-	PublishingRESTSupportArgument** _tmp13_;
-	gint base_string_arguments_length1;
-	gint _base_string_arguments_size_;
-	PublishingTumblrTumblrPublisherUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp14_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_;
-	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp25_;
-	gint _tmp25__length1;
-	gint _tmp26_;
-	PublishingRESTSupportArgument** _tmp27_;
-	gint sorted_args_length1;
-	gint _sorted_args_size_;
-	gchar* arguments_string = NULL;
-	gchar* _tmp28_;
-	gchar* signature_base_string = NULL;
-	const gchar* _tmp51_;
-	gchar* _tmp52_;
-	gchar* _tmp53_;
-	PublishingRESTSupportTransaction* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	gchar* _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	gchar* _tmp60_;
-	gchar* _tmp61_;
-	gchar* _tmp62_;
-	const gchar* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	gchar* _tmp66_;
-	gchar* _tmp67_;
-	const gchar* _tmp68_;
-	const gchar* _tmp69_;
-	gchar* signature = NULL;
-	const gchar* _tmp70_;
-	const gchar* _tmp71_;
-	gchar* _tmp72_;
-	const gchar* _tmp73_;
-	const gchar* _tmp74_;
-	gchar* _tmp75_;
-	const gchar* _tmp76_;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = txn;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	http_method = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1051: signing transaction with parameters:");
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = http_method;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1052: %s", _tmp5_);
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signing_key = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = self->priv->access_phase_token_secret;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp6_ != NULL) {
-#line 7515 "TumblrPublishing.c"
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \
-" it as signing key");
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (self);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp9_ = g_strconcat (PUBLISHING_TUMBLR_API_SECRET "&", _tmp8_, NULL);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (signing_key);
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		signing_key = _tmp9_;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 7533 "TumblrPublishing.c"
-	} else {
-		gchar* _tmp10_;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key");
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp10_ = g_strdup (PUBLISHING_TUMBLR_API_SECRET "&");
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (signing_key);
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		signing_key = _tmp10_;
-#line 7544 "TumblrPublishing.c"
-	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = txn;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp13_ = publishing_rest_support_transaction_get_arguments (_tmp11_, &_tmp12_);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments = _tmp13_;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments_length1 = _tmp12_;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp14_ = txn;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp15_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION) ? ((PublishingTumblrTumblrPublisherUploadTransaction*) _tmp14_) : NULL);
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	upload_txn = _tmp15_;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp16_ = upload_txn;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp16_ != NULL) {
-#line 7566 "TumblrPublishing.c"
-		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_;
-		gint _tmp18_;
-		PublishingRESTSupportArgument** _tmp19_;
-		gint auth_header_args_length1;
-		gint _auth_header_args_size_;
-		PublishingRESTSupportArgument** _tmp20_;
-		gint _tmp20__length1;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \
-"er " "fields in signature base string");
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp17_ = upload_txn;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (_tmp17_, &_tmp18_);
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args = _tmp19_;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args_length1 = _tmp18_;
-#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_auth_header_args_size_ = auth_header_args_length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = auth_header_args;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20__length1 = auth_header_args_length1;
-#line 7591 "TumblrPublishing.c"
-		{
-			PublishingRESTSupportArgument** arg_collection = NULL;
-			gint arg_collection_length1 = 0;
-			gint _arg_collection_size_ = 0;
-			gint arg_it = 0;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			arg_collection = _tmp20_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			arg_collection_length1 = _tmp20__length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) {
-#line 7603 "TumblrPublishing.c"
-				PublishingRESTSupportArgument* _tmp21_;
-				PublishingRESTSupportArgument* arg = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				arg = _tmp21_;
-#line 7610 "TumblrPublishing.c"
-				{
-					PublishingRESTSupportArgument** _tmp22_;
-					gint _tmp22__length1;
-					PublishingRESTSupportArgument* _tmp23_;
-					PublishingRESTSupportArgument* _tmp24_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22_ = base_string_arguments;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp22__length1 = base_string_arguments_length1;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp23_ = arg;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp24_ = _publishing_rest_support_argument_ref0 (_tmp23_);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_publishing_rest_support_argument_unref0 (arg);
-#line 7628 "TumblrPublishing.c"
-				}
-			}
-		}
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 7634 "TumblrPublishing.c"
-	}
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = base_string_arguments;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25__length1 = base_string_arguments_length1;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp27_ = publishing_rest_support_argument_sort (_tmp25_, _tmp25__length1, &_tmp26_);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args = _tmp27_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args_length1 = _tmp26_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_sorted_args_size_ = sorted_args_length1;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp28_ = g_strdup ("");
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	arguments_string = _tmp28_;
-#line 7652 "TumblrPublishing.c"
-	{
-		gint i = 0;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		i = 0;
-#line 7657 "TumblrPublishing.c"
-		{
-			gboolean _tmp29_ = FALSE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp29_ = TRUE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			while (TRUE) {
-#line 7664 "TumblrPublishing.c"
-				gint _tmp31_;
-				PublishingRESTSupportArgument** _tmp32_;
-				gint _tmp32__length1;
-				const gchar* _tmp33_;
-				PublishingRESTSupportArgument** _tmp34_;
-				gint _tmp34__length1;
-				gint _tmp35_;
-				PublishingRESTSupportArgument* _tmp36_;
-				const gchar* _tmp37_;
-				gchar* _tmp38_;
-				gchar* _tmp39_;
-				PublishingRESTSupportArgument** _tmp40_;
-				gint _tmp40__length1;
-				gint _tmp41_;
-				PublishingRESTSupportArgument* _tmp42_;
-				const gchar* _tmp43_;
-				gchar* _tmp44_;
-				gchar* _tmp45_;
-				gchar* _tmp46_;
-				gint _tmp47_;
-				PublishingRESTSupportArgument** _tmp48_;
-				gint _tmp48__length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp29_) {
-#line 7689 "TumblrPublishing.c"
-					gint _tmp30_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp30_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp30_ + 1;
-#line 7695 "TumblrPublishing.c"
-				}
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp29_ = FALSE;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp31_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp32_ = sorted_args;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp32__length1 = sorted_args_length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp31_ < _tmp32__length1)) {
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					break;
-#line 7709 "TumblrPublishing.c"
-				}
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp33_ = arguments_string;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp34_ = sorted_args;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp34__length1 = sorted_args_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp35_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp36_ = _tmp34_[_tmp35_];
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp37_ = _tmp36_->key;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp38_ = g_strconcat (_tmp37_, "=", NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp39_ = _tmp38_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp40_ = sorted_args;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp40__length1 = sorted_args_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp41_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp42_ = _tmp40_[_tmp41_];
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp43_ = _tmp42_->value;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = g_strconcat (_tmp39_, _tmp43_, NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = _tmp44_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = g_strconcat (_tmp33_, _tmp45_, NULL);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (arguments_string);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				arguments_string = _tmp46_;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp45_);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp39_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = i;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = sorted_args;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48__length1 = sorted_args_length1;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp47_ < (_tmp48__length1 - 1)) {
-#line 7759 "TumblrPublishing.c"
-					const gchar* _tmp49_;
-					gchar* _tmp50_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp49_ = arguments_string;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp50_ = g_strconcat (_tmp49_, "&", NULL);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_free0 (arguments_string);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					arguments_string = _tmp50_;
-#line 7770 "TumblrPublishing.c"
-				}
-			}
-		}
-	}
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp51_ = http_method;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp52_ = g_strconcat (_tmp51_, "&", NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp53_ = _tmp52_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp54_ = txn;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp55_ = publishing_rest_support_transaction_get_endpoint_url (_tmp54_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp57_ = soup_uri_encode (_tmp56_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp59_ = g_strconcat (_tmp53_, _tmp58_, NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp60_ = _tmp59_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp61_ = g_strconcat (_tmp60_, "&", NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp62_ = _tmp61_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp63_ = arguments_string;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = soup_uri_encode (_tmp63_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp65_ = _tmp64_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = g_strconcat (_tmp62_, _tmp65_, NULL);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = _tmp66_;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp65_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp62_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp60_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp58_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp56_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp53_);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature_base_string = _tmp67_;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = signature_base_string;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1095: signature base string = '%s'", _tmp68_);
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = signing_key;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1096: signing key = '%s'", _tmp69_);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = signing_key;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = signature_base_string;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp72_ = publishing_rest_support_hmac_sha1 (_tmp70_, _tmp71_);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature = _tmp72_;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp73_ = signature;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1100: signature = '%s'", _tmp73_);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = signature;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp75_ = soup_uri_encode (_tmp74_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature);
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature = _tmp75_;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp76_ = signature;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1103: signature after RFC encode = '%s'", _tmp76_);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp77_ = upload_txn;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp77_ != NULL) {
-#line 7859 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_;
-		const gchar* _tmp79_;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = upload_txn;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = signature;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_);
-#line 7868 "TumblrPublishing.c"
-	} else {
-		PublishingRESTSupportTransaction* _tmp80_;
-		const gchar* _tmp81_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = txn;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = signature;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_);
-#line 7878 "TumblrPublishing.c"
-	}
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signature_base_string);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (arguments_string);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (signing_key);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (http_method);
-#line 7896 "TumblrPublishing.c"
-}
-
-
-void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = token;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = secret;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7929 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7947 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp1_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 7965 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	GTimeVal currtime = {0};
-	GTimeVal _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	GTimeVal _tmp4_;
-	glong _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = currtime;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = currtime;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _tmp4_.tv_usec;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp11_;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 8024 "TumblrPublishing.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 8047 "TumblrPublishing.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 8055 "TumblrPublishing.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 8067 "TumblrPublishing.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 8091 "TumblrPublishing.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8097 "TumblrPublishing.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 8101 "TumblrPublishing.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 8105 "TumblrPublishing.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 8117 "TumblrPublishing.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 8127 "TumblrPublishing.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 8133 "TumblrPublishing.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8147 "TumblrPublishing.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8157 "TumblrPublishing.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 8163 "TumblrPublishing.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 8172 "TumblrPublishing.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 8192 "TumblrPublishing.c"
-}
-
-
-gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self) {
-	gchar* result = NULL;
-	gint64 _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_get_real_time ();
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp4_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	return result;
-#line 8221 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTumblrTumblrPublisherSessionClass * klass) {
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_parent_class = g_type_class_peek_parent (klass);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_session_finalize;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate));
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
-#line 8234 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_instance_init (PublishingTumblrTumblrPublisherSession * self) {
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 8245 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj) {
-	PublishingTumblrTumblrPublisherSession * self;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj);
-#line 8259 "TumblrPublishing.c"
-}
-
-
-/**
- * Session class that keeps track of the authentication status and of the
- * user token tumblr.
- */
-GType publishing_tumblr_tumblr_publisher_session_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_session_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_session_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherSession), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_session_instance_init, NULL };
-		GType publishing_tumblr_tumblr_publisher_session_type_id;
-		publishing_tumblr_tumblr_publisher_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingTumblrTumblrPublisherSession", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_session_type_id__volatile, publishing_tumblr_tumblr_publisher_session_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_session_type_id__volatile;
-}
-
-
-static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
-#line 8286 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
-#line 8301 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) {
-	gchar* _tmp0_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = self;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->running = FALSE;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->was_started = FALSE;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->session = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publishing_options_pane = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes_length1 = 0;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = NULL;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs_length1 = 0;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp0_;
-#line 8339 "TumblrPublishing.c"
-}
-
-
-static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
-	PublishingTumblrTumblrPublisher * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_;
-	guint _tmp1_;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->service);
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->host);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
-#line 8379 "TumblrPublishing.c"
-}
-
-
-GType publishing_tumblr_tumblr_publisher_get_type (void) {
-	static volatile gsize publishing_tumblr_tumblr_publisher_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisher), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_publisher_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_tumblr_tumblr_publisher_type_id;
-		publishing_tumblr_tumblr_publisher_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisher", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_type_id, SPIT_PUBLISHING_TYPE_PUBLISHER, &spit_publishing_publisher_info);
-		g_once_init_leave (&publishing_tumblr_tumblr_publisher_type_id__volatile, publishing_tumblr_tumblr_publisher_type_id);
-	}
-	return publishing_tumblr_tumblr_publisher_type_id__volatile;
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
-static gint _vala_array_length (gpointer array) {
-	int length;
-	length = 0;
-	if (array) {
-		while (((gpointer*) array)[length]) {
-			length++;
-		}
-	}
-	return length;
-}
-
-
-
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
deleted file mode 100644
index 12b4ade..0000000
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ /dev/null
@@ -1,1148 +0,0 @@
-/* Copyright 2012 BJA Electronics
- * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {
-   private const string ICON_FILENAME = "tumblr.png";
-
-    private static Gdk.Pixbuf[] icon_pixbuf_set = null;
-    
-    public TumblrService(GLib.File resource_directory) {
-        if (icon_pixbuf_set == null)
-            icon_pixbuf_set =
-                Resources.load_from_resource(Resources.RESOURCE_PATH + "/" +
-                        ICON_FILENAME);
-    }
-
-    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
-        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
-            Spit.Publishing.CURRENT_INTERFACE);
-    }
-    
-    public unowned string get_id() {
-        return "org.yorba.shotwell.publishing.tumblr";
-    }
-    
-    public unowned string get_pluggable_name() {
-        return "Tumblr";
-    }
-    
-    public void get_info(ref Spit.PluggableInfo info) {
-        info.authors = "Jeroen Arnoldus";
-        info.copyright = _("Copyright 2012 BJA Electronics");
-        info.translators = Resources.TRANSLATORS;
-        info.version = _VERSION;
-        info.website_name = Resources.WEBSITE_NAME;
-        info.website_url = Resources.WEBSITE_URL;
-        info.is_license_wordwrapped = false;
-        info.license = Resources.LICENSE;
-        info.icons = icon_pixbuf_set;
-    }
-
-    public void activation(bool enabled) {
-    }
-
-    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
-        return new Publishing.Tumblr.TumblrPublisher(this, host);
-    }
-    
-    public Spit.Publishing.Publisher.MediaType get_supported_media() {
-        return (Spit.Publishing.Publisher.MediaType.PHOTO |
-            Spit.Publishing.Publisher.MediaType.VIDEO);
-    }
-}
-
-namespace Publishing.Tumblr {
-
-internal const string SERVICE_NAME = "Tumblr";
-internal const string ENDPOINT_URL = "https://www.tumblr.com/";
-internal const string API_KEY = "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k";
-internal const string API_SECRET = "BN0Uoig0MwbeD27OgA0IwYlp3Uvonyfsrl9pf1cnnMj1QoEUvi";
-internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
-internal const int ORIGINAL_SIZE = -1;
-
-
-
-private class BlogEntry {
-   public string blog;
-   public string url;
-   public BlogEntry(string creator_blog, string creator_url) {
-     blog = creator_blog;
-     url = creator_url;
-   }
-}
-
-private class SizeEntry {
-   public string title;
-   public int size;
-
-   public SizeEntry(string creator_title, int creator_size) {
-     title = creator_title;
-     size = creator_size;
-   }
-}
-
-public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
-    private Spit.Publishing.Service service;
-    private Spit.Publishing.PluginHost host;
-    private Spit.Publishing.ProgressCallback progress_reporter = null;
-    private bool running = false;
-    private bool was_started = false;
-    private Session session = null;
-    private PublishingOptionsPane publishing_options_pane = null;
-    private SizeEntry[] sizes = null;
-    private BlogEntry[] blogs = null;
-	private string username = "";
-
-    
-    private SizeEntry[] create_sizes() {
-        SizeEntry[] result = new SizeEntry[0];
-
-        result += new SizeEntry(_("500 × 375 pixels"), 500);
-        result += new SizeEntry(_("1024 × 768 pixels"), 1024);
-        result += new SizeEntry(_("1280 × 853 pixels"), 1280);
-//Larger images make no sense for Tumblr
-//        result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
-//        result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
-//        result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
-
-        return result;
-    }
-
-    private BlogEntry[] create_blogs() {
-        BlogEntry[] result = new BlogEntry[0];
-
-
-        return result;
-    }
-
-    public TumblrPublisher(Spit.Publishing.Service service,
-        Spit.Publishing.PluginHost host) {
-        debug("TumblrPublisher instantiated.");
-        this.service = service;
-        this.host = host;
-        this.session = new Session();
-		this.sizes = this.create_sizes();
-		this.blogs = this.create_blogs();
-        session.authenticated.connect(on_session_authenticated);
-    }
-    
-    ~TumblrPublisher() {
-        session.authenticated.disconnect(on_session_authenticated);
-    }
-    
-    private void invalidate_persistent_session() {
-        set_persistent_access_phase_token("");
-        set_persistent_access_phase_token_secret("");
-    }
-    // Publisher interface implementation
-    
-    public Spit.Publishing.Service get_service() {
-        return service;
-    }
-    
-    public Spit.Publishing.PluginHost get_host() {
-        return host;
-    }
-
-    public bool is_running() {
-        return running;
-    }
-
-    private bool is_persistent_session_valid() {
-        string? access_phase_token = get_persistent_access_phase_token();
-        string? access_phase_token_secret = get_persistent_access_phase_token_secret();
-
-        bool valid = ((access_phase_token != null) && (access_phase_token_secret != null));
-
-        if (valid)
-            debug("existing Tumblr session found in configuration database; using it.");
-        else
-            debug("no persisted Tumblr session exists.");
-
-        return valid;
-    }
-
-
-
-
-    public string? get_persistent_access_phase_token() {
-        return host.get_config_string("token", null);
-    }
-    
-    private void set_persistent_access_phase_token(string? token) {
-        host.set_config_string("token", token);
-    } 
-    
-    public string? get_persistent_access_phase_token_secret() {
-        return host.get_config_string("token_secret", null);
-    }
-    
-    private void set_persistent_access_phase_token_secret(string? token_secret) {
-        host.set_config_string("token_secret", token_secret);
-    } 
-
-    internal int get_persistent_default_size() {
-        return host.get_config_int("default_size", 1);
-    }
-    
-    internal void set_persistent_default_size(int size) {
-        host.set_config_int("default_size", size);
-    }
-
-    internal int get_persistent_default_blog() {
-        return host.get_config_int("default_blog", 0);
-    }
-    
-    internal void set_persistent_default_blog(int blog) {
-        host.set_config_int("default_blog", blog);
-    }
-
-    // Actions and events implementation
-    
-    /**
-     * Action that shows the authentication pane.
-     *
-     * This action method shows the authentication pane. It is shown at the
-     * very beginning of the interaction when no persistent parameters are found
-     * or after a failed login attempt using persisted parameters. It can be
-     * given a mode flag to specify whether it should be displayed in initial
-     * mode or in any of the error modes that it supports.
-     *
-     * @param mode the mode for the authentication pane
-     */
-    private void do_show_authentication_pane(AuthenticationPane.Mode mode = AuthenticationPane.Mode.INTRO) {
-        debug("ACTION: installing authentication pane");
-
-        host.set_service_locked(false);
-        AuthenticationPane authentication_pane =
-            new AuthenticationPane(this, mode);
-        authentication_pane.login.connect(on_authentication_pane_login_clicked);
-        host.install_dialog_pane(authentication_pane, Spit.Publishing.PluginHost.ButtonMode.CLOSE);
-        host.set_dialog_default_widget(authentication_pane.get_default_widget()); 
-    } 
-
-    /**
-     * Event triggered when the login button in the authentication panel is
-     * clicked.
-     *
-     * This event is triggered when the login button in the authentication
-     * panel is clicked. It then triggers a network login interaction.
-     *
-     * @param username the name of the Tumblr user as entered in the dialog
-     * @param password the password of the Tumblr as entered in the dialog
-     */
-    private void on_authentication_pane_login_clicked( string username, string password ) {
-        debug("EVENT: on_authentication_pane_login_clicked");
-        if (!running)
-            return;
-
-        do_network_login(username, password); 
-    }
-    
-    /**
-     * Action to perform a network login to a Tumblr blog.
-     *
-     * This action performs a network login a Tumblr blog specified the given user name and password as credentials.
-     *
-     * @param username the name of the Tumblr user used to login
-     * @param password the password of the Tumblr user used to login
-     */
-    private void do_network_login(string username, string password) {
-        debug("ACTION: logging in");
-        host.set_service_locked(true);
-        host.install_login_wait_pane();
-        
-
-        AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session,username,password);
-        txn.completed.connect(on_auth_request_txn_completed);
-        txn.network_error.connect(on_auth_request_txn_error);
-       
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-      
-
-    private void on_auth_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction completed; response = '%s'",
-            txn.get_response());
-
-        do_parse_token_info_from_auth_request(txn.get_response());
-    }
-
-    private void on_auth_request_txn_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_auth_request_txn_completed);
-        txn.network_error.disconnect(on_auth_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: OAuth authentication request transaction caused a network error");
-        host.post_error(err);
-    }
-
-
-    private void do_parse_token_info_from_auth_request(string response) {
-        debug("ACTION: parsing authorization request response '%s' into token and secret", response);
-        
-        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];
-        }
-        
-        if (oauth_token == null || oauth_token_secret == null)
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                _("“%s” isn’t a valid response to an OAuth authentication request"), response));
-        
-        session.set_access_phase_credentials(oauth_token, oauth_token_secret);
-    }
-
-
-
-    private void on_session_authenticated() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: a fully authenticated session has become available");             
-        set_persistent_access_phase_token(session.get_access_phase_token());
-        set_persistent_access_phase_token_secret(session.get_access_phase_token_secret());
-		do_get_blogs();
-
-}
-
-    private void do_get_blogs() {
-        debug("ACTION: obtain all blogs of the tumblr user");
-        UserInfoFetchTransaction txn = new UserInfoFetchTransaction(session);
-        txn.completed.connect(on_info_request_txn_completed);
-        txn.network_error.connect(on_info_request_txn_error);
-       
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-
-
-    }
-
-
-    private void on_info_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_info_request_txn_completed);
-        txn.network_error.disconnect(on_info_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: user info request transaction completed; response = '%s'",
-            txn.get_response());
-        do_parse_token_info_from_user_request(txn.get_response());
-        do_show_publishing_options_pane();
-    }
-
-
-    private void do_parse_token_info_from_user_request(string response) {
-        debug("ACTION: parsing info request response '%s' into list of available blogs", response);
-        try {
-			var parser = new Json.Parser();
-			parser.load_from_data (response, -1);
-			var root_object = parser.get_root().get_object();
-			this.username = root_object.get_object_member("response").get_object_member("user").get_string_member ("name");
-			debug("Got user name: %s",username);
-		    foreach (var blognode in root_object.get_object_member("response").get_object_member("user").get_array_member("blogs").get_elements ()) {
-		        var blog = blognode.get_object ();
-				string name = blog.get_string_member ("name");
-				string url = blog.get_string_member ("url").replace("http://","").replace("/","");
-		        debug("Got blog name: %s and url: %s", name, url);
-		        this.blogs += new BlogEntry(name,url);
-		    }
-		} catch (Error err) {
-        	host.post_error(err);
-    	}
-    }
-
-    private void on_info_request_txn_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_info_request_txn_completed);
-        txn.network_error.disconnect(on_info_request_txn_error);
-
-        if (!is_running())
-            return;
-
-        session.deauthenticate();
-        invalidate_persistent_session();
-        debug("EVENT: user info request transaction caused a network error");
-        host.post_error(err);
-    }
-
-    private void do_show_publishing_options_pane() {
-        debug("ACTION: displaying publishing options pane");
-        host.set_service_locked(false);
-        PublishingOptionsPane publishing_options_pane =
-            new PublishingOptionsPane(this, host.get_publishable_media_type(), this.sizes, this.blogs, this.username);
-        publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
-        publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
-        host.install_dialog_pane(publishing_options_pane);
-    }
-
-
-
-    private void on_publishing_options_pane_publish() {
-        if (publishing_options_pane != null) {
-            publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
-            publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
-        }
-        
-        if (!is_running())
-            return;
-
-        debug("EVENT: user clicked the 'Publish' button in the publishing options pane");
-        do_publish();
-    }
-
-    private void on_publishing_options_pane_logout() {
-        if (publishing_options_pane != null) {
-            publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
-            publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
-        }
-
-        if (!is_running())
-            return;
-
-        debug("EVENT: user clicked the 'Logout' button in the publishing options pane");
-
-        do_logout();
-    }
-
-    public static int tumblr_date_time_compare_func(Spit.Publishing.Publishable a, 
-        Spit.Publishing.Publishable b) {
-        return a.get_exposure_date_time().compare(b.get_exposure_date_time());
-    }
-
-    private void do_publish() {
-        debug("ACTION: uploading media items to remote server.");
-
-        host.set_service_locked(true);
-
-        progress_reporter = host.serialize_publishables(sizes[get_persistent_default_size()].size);
-
-        // Serialization is a long and potentially cancellable operation, so before we use
-        // the publishables, make sure that the publishing interaction is still running. If it
-        // isn't the publishing environment may be partially torn down so do a short-circuit
-        // return
-        if (!is_running())
-            return;
-
-        // Sort publishables in reverse-chronological order.
-        Spit.Publishing.Publishable[] publishables = host.get_publishables();
-        Gee.ArrayList<Spit.Publishing.Publishable> sorted_list =
-            new Gee.ArrayList<Spit.Publishing.Publishable>();
-        foreach (Spit.Publishing.Publishable p in publishables) {
-	    	debug("ACTION: add publishable");
-            sorted_list.add(p);
-        }
-        sorted_list.sort(tumblr_date_time_compare_func);
-		string blog_url = this.blogs[get_persistent_default_blog()].url;
-    
-        Uploader uploader = new Uploader(session, sorted_list.to_array(),blog_url);
-        uploader.upload_complete.connect(on_upload_complete);
-        uploader.upload_error.connect(on_upload_error);
-        uploader.upload(on_upload_status_updated);
-    }
-
-    private void do_show_success_pane() {
-        debug("ACTION: showing success pane.");
-
-        host.set_service_locked(false);
-        host.install_success_pane();
-    }
-
-
-    private void on_upload_status_updated(int file_number, double completed_fraction) {
-        if (!is_running())
-            return;
-
-        debug("EVENT: uploader reports upload %.2f percent complete.", 100.0 * completed_fraction);
-
-        assert(progress_reporter != null);
-
-        progress_reporter(file_number, completed_fraction);
-    }
-
-    private void on_upload_complete(Publishing.RESTSupport.BatchUploader uploader,
-        int num_published) {
-        if (!is_running())
-            return;
-
-        debug("EVENT: uploader reports upload complete; %d items published.", num_published);
-
-        uploader.upload_complete.disconnect(on_upload_complete);
-        uploader.upload_error.disconnect(on_upload_error);
-
-        do_show_success_pane();
-    }
-
-    private void on_upload_error(Publishing.RESTSupport.BatchUploader uploader,
-        Spit.Publishing.PublishingError err) {
-        if (!is_running())
-            return;
-
-        debug("EVENT: uploader reports upload error = '%s'.", err.message);
-
-        uploader.upload_complete.disconnect(on_upload_complete);
-        uploader.upload_error.disconnect(on_upload_error);
-
-        host.post_error(err);
-    }
-
-
-    private void do_logout() {
-        debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
-
-        session.deauthenticate();
-        invalidate_persistent_session();
-
-        running = false;
-
-        attempt_start();
-    } 
-
-    public void attempt_start() {
-        if (is_running())
-            return;
-        
-        debug("TumblrPublisher: starting interaction.");
-        
-        running = true;
-        if (is_persistent_session_valid()) {
-            debug("attempt start: a persistent session is available; using it");
-
-            session.authenticate_from_persistent_credentials(get_persistent_access_phase_token(),
-                get_persistent_access_phase_token_secret());
-        } else {
-            debug("attempt start: no persistent session available; showing login welcome pane");
-
-            do_show_authentication_pane();
-        }
-    }
-
-    public void start() {
-        if (is_running())
-            return;
-        
-        if (was_started)
-            error(_("TumblrPublisher: start( ): can’t start; this publisher is not restartable."));
-        
-        debug("TumblrPublisher: starting interaction.");
-        
-        attempt_start();
-    }
-    
-    public void stop() {
-        debug("TumblrPublisher: stop( ) invoked.");
-
-//        if (session != null)
-//            session.stop_transactions();
-
-        running = false;
-    }
-
-
-// UI elements
-
-/**
- * The authentication pane used when asking service URL, user name and password
- * from the user.
- */
-internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
-    public enum Mode {
-        INTRO,
-        FAILED_RETRY_USER
-    }
-    private static string INTRO_MESSAGE = _("Enter the username and password associated with your Tumblr account.");
-    private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
-
-    private Gtk.Box pane_widget = null;
-    private Gtk.Builder builder;
-    private Gtk.Entry username_entry;
-    private Gtk.Entry password_entry;
-    private Gtk.Button login_button;
-
-    public signal void login(string user, string password);
-
-    public AuthenticationPane(TumblrPublisher publisher, Mode mode = Mode.INTRO) {
-        this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
-        try {
-            builder = new Gtk.Builder();
-            builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
-            builder.connect_signals(null);
-            var content = builder.get_object ("content") as Gtk.Widget;
-            
-            Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
-            switch (mode) {
-                case Mode.INTRO:
-                    message_label.set_text(INTRO_MESSAGE);
-                    break;
-
-                case Mode.FAILED_RETRY_USER:
-                    message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
-                        "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
-                    break;
-            }
-
-            username_entry = builder.get_object ("username_entry") as Gtk.Entry;
-
-            password_entry = builder.get_object ("password_entry") as Gtk.Entry;
-    
-
-
-            login_button = builder.get_object("login_button") as Gtk.Button;
-
-            username_entry.changed.connect(on_user_changed);
-            password_entry.changed.connect(on_password_changed);
-            login_button.clicked.connect(on_login_button_clicked);
-
-            content.parent.remove (content);
-            pane_widget.add (content);
-            publisher.get_host().set_dialog_default_widget(login_button);
-        } catch (Error e) {
-            warning(_("Could not load UI: %s"), e.message);
-        }
-    }
-    
-    public Gtk.Widget get_default_widget() {
-        return login_button;
-    }
-
-    private void on_login_button_clicked() {
-        login(username_entry.get_text(),
-            password_entry.get_text());
-    }
-
-
-    private void on_user_changed() {
-        update_login_button_sensitivity();
-    }
-
-    private void on_password_changed() {
-        update_login_button_sensitivity();
-    }
-    
-    private void update_login_button_sensitivity() {
-        login_button.set_sensitive(username_entry.text_length > 0 &&
-                                   password_entry.text_length > 0);
-    }
-    
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-    
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-    
-    public void on_pane_installed() {
-        username_entry.grab_focus();
-        password_entry.set_activates_default(true);
-        login_button.can_default = true;
-        update_login_button_sensitivity();
-    }
-    
-    public void on_pane_uninstalled() {
-    }
-}
-
-
-/**
- * The publishing options pane.
- */
-
-
-internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
-
-
-
-    private Gtk.Builder builder;
-    private Gtk.Box pane_widget = null;
-    private Gtk.Label upload_info_label = null;
-    private Gtk.Label size_label = null;
-    private Gtk.Label blog_label = null;
-    private Gtk.Button logout_button = null;
-    private Gtk.Button publish_button = null;
-    private Gtk.ComboBoxText size_combo = null;
-    private Gtk.ComboBoxText blog_combo = null;
-    private SizeEntry[] sizes = null;
-    private BlogEntry[] blogs = null;
-	private string username = "";
-    private TumblrPublisher publisher = null;
-    private Spit.Publishing.Publisher.MediaType media_type;
-
-    public signal void publish();
-    public signal void logout();
-
-    public PublishingOptionsPane(TumblrPublisher publisher, Spit.Publishing.Publisher.MediaType media_type, SizeEntry[] sizes, BlogEntry[] blogs, string username) {
-
-        this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		this.username = username;
-		this.publisher = publisher;
-		this.media_type = media_type;
-		this.sizes = sizes;
-		this.blogs=blogs;
-
-        try {
-			builder = new Gtk.Builder();
-			builder.add_from_resource (Resources.RESOURCE_PATH +
-                    "/tumblr_publishing_options_pane.ui");
-			builder.connect_signals(null);
-
-			// pull in the necessary widgets from the glade file
-			pane_widget = (Gtk.Box) this.builder.get_object("tumblr_pane");
-			upload_info_label = (Gtk.Label) this.builder.get_object("upload_info_label");
-			logout_button = (Gtk.Button) this.builder.get_object("logout_button");
-			publish_button = (Gtk.Button) this.builder.get_object("publish_button");
-			size_combo = (Gtk.ComboBoxText) this.builder.get_object("size_combo");
-			size_label = (Gtk.Label) this.builder.get_object("size_label");
-			blog_combo = (Gtk.ComboBoxText) this.builder.get_object("blog_combo");
-			blog_label = (Gtk.Label) this.builder.get_object("blog_label");
-
-
-			string upload_label_text = _("You are logged into Tumblr as %s.\n\n").printf(this.username);
-			upload_info_label.set_label(upload_label_text);
-
-			populate_blog_combo();
-			blog_combo.changed.connect(on_blog_changed);
-
-			if ((media_type != Spit.Publishing.Publisher.MediaType.VIDEO)) {
-				populate_size_combo();
-				size_combo.changed.connect(on_size_changed);
-			} else {
-			// publishing -only- video - don't let the user manipulate the photo size choices.
-				size_combo.set_sensitive(false);
-				size_label.set_sensitive(false);
-			}
-
-			logout_button.clicked.connect(on_logout_clicked);
-			publish_button.clicked.connect(on_publish_clicked);
-        } catch (Error e) {
-			warning(_("Could not load UI: %s"), e.message);
-        }
-    }
-
-
-
-
-
-    private void on_logout_clicked() {
-        logout();
-    }
-
-    private void on_publish_clicked() {
-
-
-        publish();
-    }
-
-
-    private void populate_blog_combo() {
-        if (blogs != null) {
-          foreach (BlogEntry b in blogs)
-            blog_combo.append_text(b.blog);
-          blog_combo.set_active(publisher.get_persistent_default_blog());
-		}
-    }
-
-    private void on_blog_changed() {
-        publisher.set_persistent_default_blog(blog_combo.get_active());
-    }
-
-    private void populate_size_combo() {
-        if (sizes != null) {
-          foreach (SizeEntry e in sizes)
-            size_combo.append_text(e.title);
-          size_combo.set_active(publisher.get_persistent_default_size());
-		}
-    }
-
-    private void on_size_changed() {
-        publisher.set_persistent_default_size(size_combo.get_active());
-    }
-
-
-    protected void notify_publish() {
-        publish();
-    }
-    
-    protected void notify_logout() {
-        logout();
-    }
-
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-    
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-    
-    public void on_pane_installed() {        
-        publish.connect(notify_publish);
-        logout.connect(notify_logout);
-    }
-    
-    public void on_pane_uninstalled() {
-        publish.disconnect(notify_publish);
-        logout.disconnect(notify_logout);
-    }
-}
-
-
-// REST support classes
-internal class Transaction : Publishing.RESTSupport.Transaction {
-    public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
-        Publishing.RESTSupport.HttpMethod.POST) {
-        base(session, method);
-        
-    }
-
-    public Transaction.with_uri(Session session, string uri,
-        Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
-        base.with_endpoint_url(session, uri, method);
-
-        add_argument("oauth_nonce", session.get_oauth_nonce());
-        add_argument("oauth_signature_method", "HMAC-SHA1");
-        add_argument("oauth_version", "1.0");
-        add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
-		if (session.get_access_phase_token() != null) {
-            add_argument("oauth_token", session.get_access_phase_token());
-        }
-    } 
-
-    public override void execute() throws Spit.Publishing.PublishingError {
-        ((Session) get_parent_session()).sign_transaction(this);
-        
-        base.execute();
-    }
-
-}
-
-
-internal class AccessTokenFetchTransaction : Transaction {
-    public AccessTokenFetchTransaction(Session session, string username, string password) {
-        base.with_uri(session, "https://www.tumblr.com/oauth/access_token",
-            Publishing.RESTSupport.HttpMethod.POST);
-        add_argument("x_auth_username", Soup.URI.encode(username, ENCODE_RFC_3986_EXTRA));
-        add_argument("x_auth_password", password);
-        add_argument("x_auth_mode", "client_auth");
-    }
-}
-
-internal class UserInfoFetchTransaction : Transaction {
-    public UserInfoFetchTransaction(Session session) {
-        base.with_uri(session, "https://api.tumblr.com/v2/user/info",
-            Publishing.RESTSupport.HttpMethod.POST);
-    }
-}
-
-
-internal class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
-    private Session session;
-    private Publishing.RESTSupport.Argument[] auth_header_fields;
-
-
-//Workaround for Soup.URI.encode() to support binary data (i.e. string with \0) 
-    private string encode( uint8[] data ){
-	var s = new StringBuilder();
-	char[] bytes = new char[2];
-	bytes[1] = 0;
-        foreach( var byte in data )
-        {
-	   if(byte == 0) {
-                s.append( "%00" );
-	   } else { 
-		bytes[0] = (char)byte;
-		s.append( Soup.URI.encode((string) bytes, ENCODE_RFC_3986_EXTRA) );
-	   }
-        }
-	return s.str;
-    }
-
-
-    public UploadTransaction(Session session,Spit.Publishing.Publishable publishable, string blog_url)  {
-		debug("Init upload transaction");
-        base.with_endpoint_url(session, publishable,"https://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
-        this.session = session;
-
-    }
-    
-
-  
-    public void add_authorization_header_field(string key, string value) {
-        auth_header_fields += new Publishing.RESTSupport.Argument(key, value);
-    }
-    
-    public Publishing.RESTSupport.Argument[] get_authorization_header_fields() {
-        return auth_header_fields;
-    }
-    
-    public string get_authorization_header_string() {
-        string result = "OAuth ";
-        
-        for (int i = 0; i < auth_header_fields.length; i++) {
-            result += auth_header_fields[i].key;
-            result += "=";
-            result += ("\"" + auth_header_fields[i].value + "\"");
-            
-            if (i < auth_header_fields.length - 1)
-                result += ", ";
-        }
-        
-        return result;
-    }
-    
-    public override void execute() throws Spit.Publishing.PublishingError {
-        add_authorization_header_field("oauth_nonce", session.get_oauth_nonce());
-        add_authorization_header_field("oauth_signature_method", "HMAC-SHA1");
-        add_authorization_header_field("oauth_version", "1.0");
-        add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
-        add_authorization_header_field("oauth_consumer_key", API_KEY);
-        add_authorization_header_field("oauth_token", session.get_access_phase_token());
-
-
-        string payload;
-        size_t payload_length;
-        try {
-            FileUtils.get_contents(base.publishable.get_serialized_file().get_path(), out payload,
-		            out payload_length);
-
-			string reqdata = this.encode(payload.data[0:payload_length]);
-
-
-
-			add_argument("data[0]", reqdata);
-			add_argument("type", "photo");
-			string[] keywords = base.publishable.get_publishing_keywords();
-			string tags = "";
-			if (keywords != null) {
-                tags = string.joinv (",", keywords);
-			}
-			add_argument("tags", Soup.URI.encode(tags, ENCODE_RFC_3986_EXTRA));
-
-        } catch (FileError e) {
-            throw new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
-                _("A temporary file needed for publishing is unavailable"));
-
-		}
-
-
-        session.sign_transaction(this);
-        
-        string authorization_header = get_authorization_header_string();
-        
-        debug("executing upload transaction: authorization header string = '%s'",
-            authorization_header);
-        add_header("Authorization", authorization_header);
-        
-        Publishing.RESTSupport.Argument[] request_arguments = get_arguments();
-        assert(request_arguments.length > 0);
-
-		string request_data = "";
-		for (int i = 0; i < request_arguments.length; i++) {
-		        request_data += (request_arguments[i].key + "=" + request_arguments[i].value);
-		        if (i < request_arguments.length - 1)
-		            request_data += "&";
-		 }
-        Soup.Message outbound_message = new Soup.Message( "POST", get_endpoint_url());
-		outbound_message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, request_data.data);
-
-        // TODO: there must be a better way to iterate over a map
-        Gee.MapIterator<string, string> i = base.message_headers.map_iterator();
-        bool cont = i.next();
-        while(cont) {
-            outbound_message.request_headers.append(i.get_key(), i.get_value());
-            cont = i.next();
-        }
-        set_message(outbound_message);
-    
-        set_is_executed(true);
-
-        send();
-    }
-}
-
-
-
-internal class Uploader : Publishing.RESTSupport.BatchUploader {
-	private string blog_url = "";
-    public Uploader(Session session, Spit.Publishing.Publishable[] publishables, string blog_url) {
-        base(session, publishables);
-		this.blog_url=blog_url;
-
-    }
-    
-
-    protected override Publishing.RESTSupport.Transaction create_transaction(
-        Spit.Publishing.Publishable publishable) {
-		debug("Create upload transaction");
-        return new UploadTransaction((Session) get_session(), get_current_publishable(), this.blog_url);
-
-    }
-}
-
-/**
- * Session class that keeps track of the authentication status and of the
- * user token tumblr.
- */
-internal class Session : Publishing.RESTSupport.Session {
-    private string? access_phase_token = null;
-    private string? access_phase_token_secret = null;
-
-
-    public Session() {
-        base(ENDPOINT_URL);
-    }
-
-    public override bool is_authenticated() {
-        return (access_phase_token != null && access_phase_token_secret != null);
-    }
-
-    public void authenticate_from_persistent_credentials(string token, string secret) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-
-        
-        authenticated();
-    }
-    
-    public void deauthenticate() {
-        access_phase_token = null;
-        access_phase_token_secret = null;
-    } 
-    
-    public void sign_transaction(Publishing.RESTSupport.Transaction txn) {
-        string http_method = txn.get_method().to_string();
-        
-        debug("signing transaction with parameters:");
-        debug("HTTP method = " + http_method);
-		string? signing_key = null;
-        if (access_phase_token_secret != null) {
-            debug("access phase token secret available; using it as signing key");
-
-            signing_key = API_SECRET + "&" + this.get_access_phase_token_secret();
-        } else {
-            debug("Access phase token secret not available; using API " +
-                "key as signing key");
-
-            signing_key = API_SECRET + "&";
-        }
-
-
-        Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
-	
-        UploadTransaction? upload_txn = txn as UploadTransaction;
-        if (upload_txn != null) {
-            debug("this transaction is an UploadTransaction; including Authorization header " +
-                "fields in signature base string");
-            
-            Publishing.RESTSupport.Argument[] auth_header_args =
-                upload_txn.get_authorization_header_fields();
-
-            foreach (Publishing.RESTSupport.Argument arg in auth_header_args)
-                base_string_arguments += arg;
-        }
-        
-        Publishing.RESTSupport.Argument[] sorted_args =
-            Publishing.RESTSupport.Argument.sort(base_string_arguments);
-        
-        string arguments_string = "";
-        for (int i = 0; i < sorted_args.length; i++) {
-            arguments_string += (sorted_args[i].key + "=" + sorted_args[i].value);
-            if (i < sorted_args.length - 1)
-                arguments_string += "&";
-        }
-
-
-        string signature_base_string = http_method + "&" + Soup.URI.encode(
-            txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
-            Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature base string = '%s'", signature_base_string);
-        debug("signing key = '%s'", signing_key);
-
-        // compute the signature
-        string signature = Publishing.RESTSupport.hmac_sha1(signing_key, signature_base_string);
-        debug("signature = '%s'", signature);
-        signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature after RFC encode = '%s'", signature);
-
-        if (upload_txn != null)
-            upload_txn.add_authorization_header_field("oauth_signature", signature);
-        else
-            txn.add_argument("oauth_signature", signature);
-
-
-    }
-    
-    public void set_access_phase_credentials(string token, string secret) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-
-        
-        authenticated();
-    } 
-
-    public string get_access_phase_token() {
-        return access_phase_token;
-    }
-
-
-    public string get_access_phase_token_secret() {
-        return access_phase_token_secret;
-    }
-
-    public string get_oauth_nonce() {
-        TimeVal currtime = TimeVal();
-        currtime.get_current_time();
-        
-        return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
-            currtime.tv_usec.to_string());
-    }
-    
-    public string get_oauth_timestamp() {
-        return GLib.get_real_time().to_string().substring(0, 10);
-    }
-
-}
-
-
-} //class TumblrPublisher
-
-} //namespace Publishing.Tumblr
-
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 492f100..10482e3 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -1012,7 +1012,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1015 "YandexPublishing.c"
-				goto __catch39_g_regex_error;
+				goto __catch32_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1034,8 +1034,8 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		_g_regex_unref0 (_tmp0_);
 #line 1036 "YandexPublishing.c"
 	}
-	goto __finally39;
-	__catch39_g_regex_error:
+	goto __finally32;
+	__catch32_g_regex_error:
 	{
 		GError* e = NULL;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1048,7 +1048,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		_g_error_free0 (e);
 #line 1050 "YandexPublishing.c"
 	}
-	__finally39:
+	__finally32:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1761,7 +1761,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1764 "YandexPublishing.c"
-			goto __catch40_g_error;
+			goto __catch33_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = self->priv->builder;
@@ -1902,8 +1902,8 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		_g_object_unref0 (content);
 #line 1904 "YandexPublishing.c"
 	}
-	goto __finally40;
-	__catch40_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp38_;
@@ -1922,7 +1922,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		_g_error_free0 (e);
 #line 1924 "YandexPublishing.c"
 	}
-	__finally40:
+	__finally33:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2532,7 +2532,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
 #line 2535 "YandexPublishing.c"
-				goto __catch41_g_file_error;
+				goto __catch34_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_free0 (photo_data);
@@ -2547,8 +2547,8 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 #line 2548 "YandexPublishing.c"
 		}
 	}
-	goto __finally41;
-	__catch41_g_file_error:
+	goto __finally34;
+	__catch34_g_file_error:
 	{
 		GError* e = NULL;
 		SpitPublishingPublishable* _tmp33_;
@@ -2586,7 +2586,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		_g_error_free0 (e);
 #line 2588 "YandexPublishing.c"
 	}
-	__finally41:
+	__finally34:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3408,7 +3408,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3411 "YandexPublishing.c"
-				goto __catch42_spit_publishing_publishing_error;
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3419,8 +3419,8 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 #line 3420 "YandexPublishing.c"
 		}
 	}
-	goto __finally42;
-	__catch42_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_;
@@ -3441,7 +3441,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		return;
 #line 3443 "YandexPublishing.c"
 	}
-	__finally42:
+	__finally35:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3540,7 +3540,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3542 "YandexPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+				goto __catch36_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -3557,8 +3557,8 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 #line 3557 "YandexPublishing.c"
 		}
 	}
-	goto __finally43;
-	__catch43_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_;
@@ -3577,7 +3577,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		_g_error_free0 (err);
 #line 3578 "YandexPublishing.c"
 	}
-	__finally43:
+	__finally36:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4052,7 +4052,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4053 "YandexPublishing.c"
-				goto __catch44_spit_publishing_publishing_error;
+				goto __catch37_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4063,8 +4063,8 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 #line 4062 "YandexPublishing.c"
 		}
 	}
-	goto __finally44;
-	__catch44_spit_publishing_publishing_error:
+	goto __finally37;
+	__catch37_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp10_;
@@ -4083,7 +4083,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		_g_error_free0 (err);
 #line 4083 "YandexPublishing.c"
 	}
-	__finally44:
+	__finally37:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4159,7 +4159,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4160 "YandexPublishing.c"
-				goto __catch45_spit_publishing_publishing_error;
+				goto __catch38_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -4172,8 +4172,8 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 #line 4171 "YandexPublishing.c"
 		}
 	}
-	goto __finally45;
-	__catch45_spit_publishing_publishing_error:
+	goto __finally38;
+	__catch38_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp5_;
@@ -4192,7 +4192,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		_g_error_free0 (err);
 #line 4192 "YandexPublishing.c"
 	}
-	__finally45:
+	__finally38:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4323,7 +4323,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4324 "YandexPublishing.c"
-				goto __catch46_spit_publishing_publishing_error;
+				goto __catch39_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4508,8 +4508,8 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 4508 "YandexPublishing.c"
 	}
-	goto __finally46;
-	__catch46_spit_publishing_publishing_error:
+	goto __finally39;
+	__catch39_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp40_;
@@ -4528,7 +4528,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		_g_error_free0 (err);
 #line 4528 "YandexPublishing.c"
 	}
-	__finally46:
+	__finally39:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4578,7 +4578,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4579 "YandexPublishing.c"
-				goto __catch47_spit_publishing_publishing_error;
+				goto __catch40_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (t);
@@ -4591,8 +4591,8 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 #line 4590 "YandexPublishing.c"
 		}
 	}
-	goto __finally47;
-	__catch47_spit_publishing_publishing_error:
+	goto __finally40;
+	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
@@ -4611,7 +4611,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		_g_error_free0 (err);
 #line 4611 "YandexPublishing.c"
 	}
-	__finally47:
+	__finally40:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
diff --git a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
index 8662f8c..f27fd2d 100644
--- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
@@ -156,7 +156,7 @@
             <property name="can_focus">False</property>
             <items>
               <item translatable="yes">Original size</item>
-              <item translatable="yes">Width or height</item>
+              <item translatable="yes">Longest edge</item>
             </items>
           </object>
           <packing>
diff --git a/plugins/shotwell-publishing-extras/meson.build b/plugins/shotwell-publishing-extras/meson.build
new file mode 100644
index 0000000..34f3e12
--- /dev/null
+++ b/plugins/shotwell-publishing-extras/meson.build
@@ -0,0 +1,21 @@
+shotwell_publishing_extra_sources = [
+    'GalleryConnector.vala',
+    'RajcePublishing.vala',
+    'shotwell-publishing-extras.vala',
+    'YandexPublishing.vala'
+    ]
+
+shotwell_publishing_extra_resources = gnome.compile_resources('publishing-extra-resource',
+        'org.gnome.Shotwell.Publishing.Extras.gresource.xml')
+
+shared_module('shotwell-publishing-extras',
+              shotwell_publishing_extra_sources + shotwell_publishing_extra_resources,
+              dependencies : [gee, gtk, xml, soup, gdk_pixbuf, sw_plugin,
+                              sw_plugin_common_dep, json_glib, webkit],
+              vala_args : [
+                  '--gresources', 'org.gnome.Shotwell.Publishing.Extras.gresource.xml'
+                  ],
+              c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing/Extras"',
+                        '-DGCR_API_SUBJECT_TO_CHANGE'],
+              install: true,
+              install_dir : shotwell_plugin_dir)
diff --git a/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml b/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
index ab8a367..5916f82 100644
--- a/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
+++ b/plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
@@ -3,13 +3,10 @@
     <gresource prefix="/org/gnome/Shotwell/Publishing/Extras">
         <file>gallery3.png</file>
         <file>rajce.png</file>
-        <file>tumblr.png</file>
         <file>gallery3_authentication_pane.ui</file>
         <file>gallery3_publishing_options_pane.ui</file>
         <file>rajce_authentication_pane.ui</file>
         <file>rajce_publishing_options_pane.ui</file>
-        <file>tumblr_authentication_pane.ui</file>
-        <file>tumblr_publishing_options_pane.ui</file>
         <file>yandex_publish_model.ui</file>
     </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index 04cf9d3..c4556dd 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
@@ -27,37 +27,6 @@ typedef struct _ShotwellPublishingExtraServices ShotwellPublishingExtraServices;
 typedef struct _ShotwellPublishingExtraServicesClass ShotwellPublishingExtraServicesClass;
 typedef struct _ShotwellPublishingExtraServicesPrivate ShotwellPublishingExtraServicesPrivate;
 
-#define TYPE_YANDEX_SERVICE (yandex_service_get_type ())
-#define YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_YANDEX_SERVICE, YandexService))
-#define YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_YANDEX_SERVICE, YandexServiceClass))
-#define IS_YANDEX_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_YANDEX_SERVICE))
-#define IS_YANDEX_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_YANDEX_SERVICE))
-#define YANDEX_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_YANDEX_SERVICE, YandexServiceClass))
-
-typedef struct _YandexService YandexService;
-typedef struct _YandexServiceClass YandexServiceClass;
-
-#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
-#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
-#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
-#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
-#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
-#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
-
-typedef struct _TumblrService TumblrService;
-typedef struct _TumblrServiceClass TumblrServiceClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define TYPE_RAJCE_SERVICE (rajce_service_get_type ())
-#define RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RAJCE_SERVICE, RajceService))
-#define RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RAJCE_SERVICE, RajceServiceClass))
-#define IS_RAJCE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RAJCE_SERVICE))
-#define IS_RAJCE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RAJCE_SERVICE))
-#define RAJCE_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RAJCE_SERVICE, RajceServiceClass))
-
-typedef struct _RajceService RajceService;
-typedef struct _RajceServiceClass RajceServiceClass;
-
 #define TYPE_GALLERY3_SERVICE (gallery3_service_get_type ())
 #define GALLERY3_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GALLERY3_SERVICE, Gallery3Service))
 #define GALLERY3_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GALLERY3_SERVICE, Gallery3ServiceClass))
@@ -67,6 +36,7 @@ typedef struct _RajceServiceClass RajceServiceClass;
 
 typedef struct _Gallery3Service Gallery3Service;
 typedef struct _Gallery3ServiceClass Gallery3ServiceClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _ShotwellPublishingExtraServices {
 	GObject parent_instance;
@@ -94,22 +64,10 @@ enum  {
 };
 ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file);
 ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (GType object_type, GFile* module_file);
-YandexService* yandex_service_new (void);
-YandexService* yandex_service_construct (GType object_type);
-GType yandex_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
-TumblrService* tumblr_service_new (GFile* resource_directory);
-TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
-GType tumblr_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
-RajceService* rajce_service_new (GFile* resource_directory);
-RajceService* rajce_service_construct (GType object_type, GFile* resource_directory);
-GType rajce_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 Gallery3Service* gallery3_service_new (GFile* resource_directory);
 Gallery3Service* gallery3_service_construct (GType object_type, GFile* resource_directory);
 GType gallery3_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base);
@@ -121,70 +79,19 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static void _vala_array_add14 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 131 "shotwell-publishing-extras.c"
-	}
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 137 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add15 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 148 "shotwell-publishing-extras.c"
-	}
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 154 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add16 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if ((*length) == (*size)) {
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 165 "shotwell-publishing-extras.c"
+#line 89 "shotwell-publishing-extras.c"
 	}
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[(*length)++] = value;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[*length] = NULL;
-#line 171 "shotwell-publishing-extras.c"
-}
-
-
-static void _vala_array_add17 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	if ((*length) == (*size)) {
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 182 "shotwell-publishing-extras.c"
-	}
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[(*length)++] = value;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	(*array)[*length] = NULL;
-#line 188 "shotwell-publishing-extras.c"
+#line 95 "shotwell-publishing-extras.c"
 }
 
 
@@ -192,134 +99,79 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G
 	ShotwellPublishingExtraServices * self = NULL;
 	SpitPluggable** _tmp0_;
 	gint _tmp0__length1;
-	YandexService* _tmp1_;
-	SpitPluggable** _tmp2_;
-	gint _tmp2__length1;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 	GFile* _tmp3_;
-	GFile* _tmp4_;
-	GFile* _tmp5_;
-	TumblrService* _tmp6_;
-	SpitPluggable** _tmp7_;
-	gint _tmp7__length1;
-	GFile* _tmp8_;
-	GFile* _tmp9_;
-	GFile* _tmp10_;
-	RajceService* _tmp11_;
-	SpitPluggable** _tmp12_;
-	gint _tmp12__length1;
-	GFile* _tmp13_;
-	GFile* _tmp14_;
-	GFile* _tmp15_;
-	Gallery3Service* _tmp16_;
+	Gallery3Service* _tmp4_;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = (ShotwellPublishingExtraServices*) g_object_new (object_type, NULL);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0_ = self->priv->pluggables;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp0__length1 = self->priv->pluggables_length1;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp1_ = yandex_service_new ();
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp2_ = self->priv->pluggables;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp3_ = module_file;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp4_ = g_file_get_parent (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp6_ = tumblr_service_new (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add15 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp7_ = self->priv->pluggables;
+	_tmp0_ = self->priv->pluggables;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp7__length1 = self->priv->pluggables_length1;
+	_tmp0__length1 = self->priv->pluggables_length1;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp8_ = module_file;
+	_tmp1_ = module_file;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp9_ = g_file_get_parent (_tmp8_);
+	_tmp2_ = g_file_get_parent (_tmp1_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp10_ = _tmp9_;
+	_tmp3_ = _tmp2_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp11_ = rajce_service_new (_tmp10_);
+	_tmp4_ = gallery3_service_new (_tmp3_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add16 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_vala_array_add14 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp10_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp12_ = self->priv->pluggables;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp12__length1 = self->priv->pluggables_length1;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp13_ = module_file;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp14_ = g_file_get_parent (_tmp13_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp15_ = _tmp14_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_tmp16_ = gallery3_service_new (_tmp15_);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_vala_array_add17 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp3_);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return self;
-#line 277 "shotwell-publishing-extras.c"
+#line 129 "shotwell-publishing-extras.c"
 }
 
 
 ShotwellPublishingExtraServices* shotwell_publishing_extra_services_new (GFile* module_file) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return shotwell_publishing_extra_services_construct (TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, module_file);
-#line 284 "shotwell-publishing-extras.c"
+#line 136 "shotwell-publishing-extras.c"
 }
 
 
 static const gchar* shotwell_publishing_extra_services_real_get_module_name (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _ ("Shotwell Extra Publishing Services");
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 297 "shotwell-publishing-extras.c"
+#line 149 "shotwell-publishing-extras.c"
 }
 
 
 static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _VERSION;
-#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 310 "shotwell-publishing-extras.c"
+#line 162 "shotwell-publishing-extras.c"
 }
 
 
 static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = "org.yorba.shotwell.publishing.extras";
-#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 323 "shotwell-publishing-extras.c"
+#line 175 "shotwell-publishing-extras.c"
 }
 
 
@@ -330,27 +182,27 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S
 	gint _tmp0__length1;
 	SpitPluggable** _tmp1_;
 	gint _tmp1__length1;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_EXTRA_SERVICES, ShotwellPublishingExtraServices);
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1_ = _tmp0_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if (result_length1) {
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*result_length1 = _tmp1__length1;
-#line 348 "shotwell-publishing-extras.c"
+#line 200 "shotwell-publishing-extras.c"
 	}
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _tmp1_;
-#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 354 "shotwell-publishing-extras.c"
+#line 206 "shotwell-publishing-extras.c"
 }
 
 
@@ -361,7 +213,7 @@ static void shotwell_publishing_extra_services_class_init (ShotwellPublishingExt
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingExtraServicesPrivate));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_extra_services_finalize;
-#line 365 "shotwell-publishing-extras.c"
+#line 217 "shotwell-publishing-extras.c"
 }
 
 
@@ -376,7 +228,7 @@ static void shotwell_publishing_extra_services_spit_module_interface_init (SpitM
 	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_extra_services_real_get_id;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_extra_services_real_get_pluggables;
-#line 380 "shotwell-publishing-extras.c"
+#line 232 "shotwell-publishing-extras.c"
 }
 
 
@@ -392,7 +244,7 @@ static void shotwell_publishing_extra_services_instance_init (ShotwellPublishing
 	self->priv->pluggables_length1 = 0;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 396 "shotwell-publishing-extras.c"
+#line 248 "shotwell-publishing-extras.c"
 }
 
 
@@ -404,7 +256,7 @@ static void shotwell_publishing_extra_services_finalize (GObject * obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	G_OBJECT_CLASS (shotwell_publishing_extra_services_parent_class)->finalize (obj);
-#line 408 "shotwell-publishing-extras.c"
+#line 260 "shotwell-publishing-extras.c"
 }
 
 
@@ -432,51 +284,51 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	ShotwellPublishingExtraServices* _tmp5_ = NULL;
 	SpitEntryPointParams* _tmp6_;
 	gint _tmp7_;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = params;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp2_ = params;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*params).module_spit_interface = _tmp4_;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp6_ = params;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 454 "shotwell-publishing-extras.c"
+#line 306 "shotwell-publishing-extras.c"
 		SpitEntryPointParams* _tmp8_;
 		GFile* _tmp9_;
 		ShotwellPublishingExtraServices* _tmp10_;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp8_ = params;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp9_ = (*_tmp8_).module_file;
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp10_ = shotwell_publishing_extra_services_new (_tmp9_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_g_object_unref0 (_tmp5_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp5_ = _tmp10_;
-#line 468 "shotwell-publishing-extras.c"
+#line 320 "shotwell-publishing-extras.c"
 	} else {
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_g_object_unref0 (_tmp5_);
-#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp5_ = NULL;
-#line 474 "shotwell-publishing-extras.c"
+#line 326 "shotwell-publishing-extras.c"
 	}
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
-#line 480 "shotwell-publishing-extras.c"
+#line 332 "shotwell-publishing-extras.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
index 2f47771..fb622fa 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
@@ -14,10 +14,6 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module {
         pluggables += new YandexService();
 #endif
 
-#if HAVE_TUMBLR
-        pluggables += new TumblrService(module_file.get_parent());
-#endif
-
 #if HAVE_RAJCE
         pluggables += new RajceService(module_file.get_parent());
 #endif
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index a1d00b4..12575cb 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -575,7 +575,7 @@ enum  {
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void);
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type);
 void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPublishingParameters* self, const gchar* name, const gchar* id);
-static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value);
+static void _vala_array_add7 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value);
 void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name);
 gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self);
 gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self);
@@ -709,11 +709,11 @@ static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_com
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self);
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting);
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, const gchar* privacy_setting);
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
 static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
 static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
+static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value);
 static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
+static void _vala_array_add12 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value);
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self);
 static void publishing_facebook_publishing_options_pane_notify_publish (PublishingFacebookPublishingOptionsPane* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution);
@@ -1544,7 +1544,7 @@ static gpointer _publishing_facebook_album_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add6 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) {
+static void _vala_array_add7 (PublishingFacebookAlbum** * array, int* length, int* size, PublishingFacebookAlbum* value) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -1612,7 +1612,7 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _publishing_facebook_album_ref0 (new_album);
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
+	_vala_array_add7 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
 #line 1619 "FacebookPublishing.c"
@@ -5278,7 +5278,7 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 }
 
 
-static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5295,7 +5295,7 @@ static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5312,7 +5312,7 @@ static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add10 (PublishingFacebookPublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5363,7 +5363,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Just me"), "{ 'value' : 'SELF' }");
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5371,7 +5371,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Friends"), "{ 'value' : 'ALL_FRIENDS' }");
 #line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _result_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5379,7 +5379,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_ ("Everyone"), "{ 'value' : 'EVERYONE' }");
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _result_;
 #line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5398,7 +5398,7 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 }
 
 
-static void _vala_array_add10 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5413,7 +5413,7 @@ static void _vala_array_add10 (PublishingFacebookResolution* * array, int* lengt
 }
 
 
-static void _vala_array_add11 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
+static void _vala_array_add12 (PublishingFacebookResolution* * array, int* length, int* size, PublishingFacebookResolution value) {
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -5455,13 +5455,13 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
+	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _result_;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _result__length1;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index 25f2d69..fb7e9a3 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -77,16 +77,6 @@ typedef struct _PublishingFlickrPublishingParametersPrivate PublishingFlickrPubl
 typedef struct _PublishingFlickrParamSpecPublishingParameters PublishingFlickrParamSpecPublishingParameters;
 typedef struct _PublishingFlickrFlickrPublisherPrivate PublishingFlickrFlickrPublisherPrivate;
 
-#define PUBLISHING_FLICKR_TYPE_SESSION (publishing_flickr_session_get_type ())
-#define PUBLISHING_FLICKR_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession))
-#define PUBLISHING_FLICKR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass))
-#define PUBLISHING_FLICKR_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_SESSION))
-#define PUBLISHING_FLICKR_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_SESSION))
-#define PUBLISHING_FLICKR_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionClass))
-
-typedef struct _PublishingFlickrSession PublishingFlickrSession;
-typedef struct _PublishingFlickrSessionClass PublishingFlickrSessionClass;
-
 #define PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE (publishing_flickr_publishing_options_pane_get_type ())
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane))
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPaneClass))
@@ -102,16 +92,6 @@ typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPubli
 #define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 
-#define PUBLISHING_FLICKR_TYPE_TRANSACTION (publishing_flickr_transaction_get_type ())
-#define PUBLISHING_FLICKR_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction))
-#define PUBLISHING_FLICKR_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass))
-#define PUBLISHING_FLICKR_IS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_TRANSACTION))
-#define PUBLISHING_FLICKR_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransactionClass))
-
-typedef struct _PublishingFlickrTransaction PublishingFlickrTransaction;
-typedef struct _PublishingFlickrTransactionClass PublishingFlickrTransactionClass;
-
 #define PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION (publishing_flickr_account_info_fetch_transaction_get_type ())
 #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransaction))
 #define PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, PublishingFlickrAccountInfoFetchTransactionClass))
@@ -136,7 +116,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionClass PublishingFlick
 typedef struct _PublishingFlickrUploader PublishingFlickrUploader;
 typedef struct _PublishingFlickrUploaderClass PublishingFlickrUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
-typedef struct _PublishingFlickrTransactionPrivate PublishingFlickrTransactionPrivate;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFlickrAccountInfoFetchTransactionPrivate;
 
 #define PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION (publishing_flickr_upload_transaction_get_type ())
@@ -149,8 +128,6 @@ typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFli
 typedef struct _PublishingFlickrUploadTransaction PublishingFlickrUploadTransaction;
 typedef struct _PublishingFlickrUploadTransactionClass PublishingFlickrUploadTransactionClass;
 typedef struct _PublishingFlickrUploadTransactionPrivate PublishingFlickrUploadTransactionPrivate;
-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;
 
 #define PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY (publishing_flickr_publishing_options_pane_visibility_entry_get_type ())
@@ -260,62 +237,32 @@ struct _PublishingFlickrFlickrPublisherPrivate {
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	gboolean running;
 	gboolean was_started;
-	PublishingFlickrSession* session;
+	PublishingRESTSupportOAuth1Session* session;
 	PublishingFlickrPublishingOptionsPane* publishing_options_pane;
 	SpitPublishingAuthenticator* authenticator;
 	PublishingFlickrPublishingParameters* parameters;
 };
 
-struct _PublishingFlickrTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingFlickrTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
 struct _PublishingFlickrAccountInfoFetchTransaction {
-	PublishingFlickrTransaction parent_instance;
+	PublishingRESTSupportOAuth1Transaction parent_instance;
 	PublishingFlickrAccountInfoFetchTransactionPrivate * priv;
 };
 
 struct _PublishingFlickrAccountInfoFetchTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
 };
 
 struct _PublishingFlickrUploadTransaction {
-	PublishingRESTSupportUploadTransaction parent_instance;
+	PublishingRESTSupportOAuth1UploadTransaction parent_instance;
 	PublishingFlickrUploadTransactionPrivate * priv;
 };
 
 struct _PublishingFlickrUploadTransactionClass {
-	PublishingRESTSupportUploadTransactionClass parent_class;
+	PublishingRESTSupportOAuth1UploadTransactionClass parent_class;
 };
 
 struct _PublishingFlickrUploadTransactionPrivate {
 	PublishingFlickrPublishingParameters* parameters;
-	PublishingFlickrSession* session;
-	PublishingRESTSupportArgument** auth_header_fields;
-	gint auth_header_fields_length1;
-	gint _auth_header_fields_size_;
-};
-
-struct _PublishingFlickrSession {
-	PublishingRESTSupportSession parent_instance;
-	PublishingFlickrSessionPrivate * priv;
-};
-
-struct _PublishingFlickrSessionClass {
-	PublishingRESTSupportSessionClass parent_class;
-};
-
-struct _PublishingFlickrSessionPrivate {
-	gchar* access_phase_token;
-	gchar* access_phase_token_secret;
-	gchar* username;
-	gchar* consumer_key;
-	gchar* consumer_secret;
 };
 
 struct _PublishingFlickrPublishingOptionsPane {
@@ -410,10 +357,8 @@ static gpointer publishing_flickr_visibility_specification_parent_class = NULL;
 static gpointer publishing_flickr_publishing_parameters_parent_class = NULL;
 static gpointer publishing_flickr_flickr_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface * publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = NULL;
-static gpointer publishing_flickr_transaction_parent_class = NULL;
 static gpointer publishing_flickr_account_info_fetch_transaction_parent_class = NULL;
 static gpointer publishing_flickr_upload_transaction_parent_class = NULL;
-static gpointer publishing_flickr_session_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_size_entry_parent_class = NULL;
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_parent_class = NULL;
@@ -443,7 +388,6 @@ static void flickr_service_finalize (GObject * obj);
 #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
 #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1
 #define PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
-#define PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
 GType publishing_flickr_user_kind_get_type (void) G_GNUC_CONST;
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance);
 void publishing_flickr_visibility_specification_unref (gpointer instance);
@@ -471,7 +415,6 @@ enum  {
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void);
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type);
 static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj);
-GType publishing_flickr_session_get_type (void) G_GNUC_CONST;
 GType publishing_flickr_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisherPrivate))
 enum  {
@@ -479,14 +422,9 @@ enum  {
 };
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self);
 static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
-PublishingFlickrSession* publishing_flickr_session_new (void);
-PublishingFlickrSession* publishing_flickr_session_construct (GType object_type);
 SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self);
 static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self);
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata);
-void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret);
-void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
-gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self);
 static void publishing_flickr_flickr_publisher_do_fetch_account_info (PublishingFlickrFlickrPublisher* self);
 static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
@@ -507,10 +445,9 @@ static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_re
 static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self);
-GType publishing_flickr_transaction_get_type (void) G_GNUC_CONST;
 GType publishing_flickr_account_info_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session);
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session);
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
 PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error);
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self);
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
@@ -518,8 +455,8 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
 static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 GType publishing_flickr_uploader_get_type (void) G_GNUC_CONST;
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
+PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
+PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata);
 static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
 gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFlickrFlickrPublisher* self);
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis);
@@ -530,46 +467,21 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base);
 static void publishing_flickr_flickr_publisher_finalize (GObject * obj);
-enum  {
-	PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY
-};
-PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method);
-PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method);
-gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self);
-gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self);
-gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self);
-PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method);
-static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn);
 gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
 static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
 enum  {
 	PUBLISHING_FLICKR_ACCOUNT_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
 };
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self);
 GType publishing_flickr_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransactionPrivate))
 enum  {
 	PUBLISHING_FLICKR_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
-void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 static void _g_free0_ (gpointer var);
-static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length);
-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);
-#define PUBLISHING_FLICKR_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSessionPrivate))
-enum  {
-	PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY
-};
-static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
-static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj);
 static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref (gpointer instance);
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance);
 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) G_GNUC_UNUSED;
@@ -602,18 +514,18 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_construct (GType object_type, const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification);
+static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size);
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
-static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value);
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self);
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self);
 static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
@@ -636,7 +548,7 @@ enum  {
 	PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
 };
 static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value);
 static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -658,7 +570,7 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = flickr_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 662 "FlickrPublishing.c"
+#line 574 "FlickrPublishing.c"
 		gint _tmp1_;
 		GdkPixbuf** _tmp2_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -671,18 +583,18 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire
 		flickr_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1;
-#line 675 "FlickrPublishing.c"
+#line 587 "FlickrPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 679 "FlickrPublishing.c"
+#line 591 "FlickrPublishing.c"
 }
 
 
 FlickrService* flickr_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory);
-#line 686 "FlickrPublishing.c"
+#line 598 "FlickrPublishing.c"
 }
 
 
@@ -704,7 +616,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 708 "FlickrPublishing.c"
+#line 620 "FlickrPublishing.c"
 }
 
 
@@ -717,7 +629,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.flickr";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 721 "FlickrPublishing.c"
+#line 633 "FlickrPublishing.c"
 }
 
 
@@ -730,14 +642,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Flickr";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 734 "FlickrPublishing.c"
+#line 646 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 741 "FlickrPublishing.c"
+#line 653 "FlickrPublishing.c"
 }
 
 
@@ -748,17 +660,17 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 752 "FlickrPublishing.c"
+#line 664 "FlickrPublishing.c"
 		GdkPixbuf* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 758 "FlickrPublishing.c"
+#line 670 "FlickrPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 762 "FlickrPublishing.c"
+#line 674 "FlickrPublishing.c"
 }
 
 
@@ -837,7 +749,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp8_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).icons_length1 = _tmp8__length1;
-#line 841 "FlickrPublishing.c"
+#line 753 "FlickrPublishing.c"
 }
 
 
@@ -845,7 +757,7 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable
 	FlickrService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService);
-#line 849 "FlickrPublishing.c"
+#line 761 "FlickrPublishing.c"
 }
 
 
@@ -866,7 +778,7 @@ static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 870 "FlickrPublishing.c"
+#line 782 "FlickrPublishing.c"
 }
 
 
@@ -879,7 +791,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 883 "FlickrPublishing.c"
+#line 795 "FlickrPublishing.c"
 }
 
 
@@ -888,7 +800,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) {
 	flickr_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize;
-#line 892 "FlickrPublishing.c"
+#line 804 "FlickrPublishing.c"
 }
 
 
@@ -905,7 +817,7 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) flickr_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->activation = (void (*) (SpitPluggable *, gboolean)) flickr_service_real_activation;
-#line 909 "FlickrPublishing.c"
+#line 821 "FlickrPublishing.c"
 }
 
 
@@ -916,7 +828,7 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) flickr_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) flickr_service_real_get_supported_media;
-#line 920 "FlickrPublishing.c"
+#line 832 "FlickrPublishing.c"
 }
 
 
@@ -930,7 +842,7 @@ static void flickr_service_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj);
-#line 934 "FlickrPublishing.c"
+#line 846 "FlickrPublishing.c"
 }
 
 
@@ -967,236 +879,236 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat
 	gint _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = friends_level;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->friends_level = _tmp0_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = family_level;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->family_level = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = everyone_level;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->everyone_level = _tmp2_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 987 "FlickrPublishing.c"
+#line 899 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level);
-#line 994 "FlickrPublishing.c"
+#line 906 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_init (GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1001 "FlickrPublishing.c"
+#line 913 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_free_value (GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 1010 "FlickrPublishing.c"
+#line 922 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer);
-#line 1020 "FlickrPublishing.c"
+#line 932 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1024 "FlickrPublishing.c"
+#line 936 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1032 "FlickrPublishing.c"
+#line 944 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1039 "FlickrPublishing.c"
+#line 951 "FlickrPublishing.c"
 		PublishingFlickrVisibilitySpecification * object;
 		object = collect_values[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1046 "FlickrPublishing.c"
+#line 958 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1050 "FlickrPublishing.c"
+#line 962 "FlickrPublishing.c"
 		}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 1054 "FlickrPublishing.c"
+#line 966 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1058 "FlickrPublishing.c"
+#line 970 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1062 "FlickrPublishing.c"
+#line 974 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrVisibilitySpecification ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 1073 "FlickrPublishing.c"
+#line 985 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1079 "FlickrPublishing.c"
+#line 991 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1083 "FlickrPublishing.c"
+#line 995 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1087 "FlickrPublishing.c"
+#line 999 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1091 "FlickrPublishing.c"
+#line 1003 "FlickrPublishing.c"
 }
 
 
 GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrParamSpecVisibilitySpecification* spec;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1105 "FlickrPublishing.c"
+#line 1017 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1114 "FlickrPublishing.c"
+#line 1026 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification * old;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1134 "FlickrPublishing.c"
+#line 1046 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1138 "FlickrPublishing.c"
+#line 1050 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1144 "FlickrPublishing.c"
+#line 1056 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification * old;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION));
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/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 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1163 "FlickrPublishing.c"
+#line 1075 "FlickrPublishing.c"
 	} else {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1167 "FlickrPublishing.c"
+#line 1079 "FlickrPublishing.c"
 	}
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1173 "FlickrPublishing.c"
+#line 1085 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1183 "FlickrPublishing.c"
+#line 1095 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1190 "FlickrPublishing.c"
+#line 1102 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification * obj) {
 	PublishingFlickrVisibilitySpecification * self;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1200 "FlickrPublishing.c"
+#line 1112 "FlickrPublishing.c"
 }
 
 
@@ -1217,252 +1129,252 @@ GType publishing_flickr_visibility_specification_get_type (void) {
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1225 "FlickrPublishing.c"
+#line 1137 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_visibility_specification_unref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification * self;
 	self = instance;
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
-#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1238 "FlickrPublishing.c"
+#line 1150 "FlickrPublishing.c"
 	}
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) {
 	PublishingFlickrPublishingParameters* self = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1249 "FlickrPublishing.c"
+#line 1161 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1256 "FlickrPublishing.c"
+#line 1168 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1263 "FlickrPublishing.c"
+#line 1175 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1272 "FlickrPublishing.c"
+#line 1184 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1282 "FlickrPublishing.c"
+#line 1194 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1286 "FlickrPublishing.c"
+#line 1198 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1294 "FlickrPublishing.c"
+#line 1206 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1301 "FlickrPublishing.c"
+#line 1213 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters * object;
 		object = collect_values[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1308 "FlickrPublishing.c"
+#line 1220 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1312 "FlickrPublishing.c"
+#line 1224 "FlickrPublishing.c"
 		}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1316 "FlickrPublishing.c"
+#line 1228 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1320 "FlickrPublishing.c"
+#line 1232 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1324 "FlickrPublishing.c"
+#line 1236 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFlickrPublishingParameters ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 1335 "FlickrPublishing.c"
+#line 1247 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1341 "FlickrPublishing.c"
+#line 1253 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1345 "FlickrPublishing.c"
+#line 1257 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1349 "FlickrPublishing.c"
+#line 1261 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1353 "FlickrPublishing.c"
+#line 1265 "FlickrPublishing.c"
 }
 
 
 GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFlickrParamSpecPublishingParameters* spec;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1367 "FlickrPublishing.c"
+#line 1279 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1376 "FlickrPublishing.c"
+#line 1288 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters * old;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1396 "FlickrPublishing.c"
+#line 1308 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1400 "FlickrPublishing.c"
+#line 1312 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1406 "FlickrPublishing.c"
+#line 1318 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters * old;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS));
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/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 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1425 "FlickrPublishing.c"
+#line 1337 "FlickrPublishing.c"
 	} else {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1429 "FlickrPublishing.c"
+#line 1341 "FlickrPublishing.c"
 	}
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1435 "FlickrPublishing.c"
+#line 1347 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1445 "FlickrPublishing.c"
+#line 1357 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1452 "FlickrPublishing.c"
+#line 1364 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters * obj) {
 	PublishingFlickrPublishingParameters * self;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->username);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1466 "FlickrPublishing.c"
+#line 1378 "FlickrPublishing.c"
 }
 
 
@@ -1483,32 +1395,32 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
 	PublishingFlickrPublishingParameters * self;
 	self = instance;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1491 "FlickrPublishing.c"
+#line 1403 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_parameters_unref (gpointer instance) {
 	PublishingFlickrPublishingParameters * self;
 	self = instance;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1504 "FlickrPublishing.c"
+#line 1416 "FlickrPublishing.c"
 	}
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1512 "FlickrPublishing.c"
+#line 1424 "FlickrPublishing.c"
 }
 
 
@@ -1518,77 +1430,77 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G
 	SpitPublishingService* _tmp1_;
 	SpitPublishingPluginHost* _tmp2_;
 	SpitPublishingPluginHost* _tmp3_;
-	PublishingFlickrSession* _tmp4_;
+	PublishingRESTSupportOAuth1Session* _tmp4_;
 	PublishingFlickrPublishingParameters* _tmp5_;
 	PublishingAuthenticatorFactory* _tmp6_;
 	PublishingAuthenticatorFactory* _tmp7_;
 	SpitPublishingPluginHost* _tmp8_;
 	SpitPublishingAuthenticator* _tmp9_;
 	SpitPublishingAuthenticator* _tmp10_;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrFlickrPublisher*) g_object_new (object_type, NULL);
+#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:106: FlickrPublisher instantiated.");
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:107: FlickrPublisher instantiated.");
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = service;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->service = _tmp1_;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = host;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->host = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_session_new ();
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = publishing_rest_support_oauth1_session_new (PUBLISHING_FLICKR_ENDPOINT_URL);
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_parameters_new ();
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_authenticator_factory_get_instance ();
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = host;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "flickr", _tmp8_);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->authenticator);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->authenticator = _tmp9_;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp7_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->authenticator;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp10_, "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self, 0);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1585 "FlickrPublishing.c"
+#line 1497 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1592 "FlickrPublishing.c"
+#line 1504 "FlickrPublishing.c"
 }
 
 
@@ -1596,17 +1508,17 @@ SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticato
 	SpitPublishingAuthenticator* result = NULL;
 	SpitPublishingAuthenticator* _tmp0_;
 	SpitPublishingAuthenticator* _tmp1_;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1610 "FlickrPublishing.c"
+#line 1522 "FlickrPublishing.c"
 }
 
 
@@ -1614,39 +1526,39 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_;
 	gboolean _tmp1_;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1628 "FlickrPublishing.c"
+#line 1540 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_;
 	gboolean _tmp1_;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 1643 "FlickrPublishing.c"
+#line 1555 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_variant_ref0 (gpointer self) {
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 1650 "FlickrPublishing.c"
+#line 1562 "FlickrPublishing.c"
 }
 
 
@@ -1666,7 +1578,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
 	GHashTable* _tmp6_;
 	gconstpointer _tmp7_ = NULL;
 	GVariant* _tmp8_;
-	PublishingFlickrSession* _tmp9_;
+	PublishingRESTSupportOAuth1Session* _tmp9_;
 	GVariant* _tmp10_;
 	const gchar* _tmp11_;
 	GVariant* _tmp12_;
@@ -1680,7 +1592,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
 	GHashTable* _tmp20_;
 	gconstpointer _tmp21_ = NULL;
 	GVariant* _tmp22_;
-	PublishingFlickrSession* _tmp23_;
+	PublishingRESTSupportOAuth1Session* _tmp23_;
 	GVariant* _tmp24_;
 	const gchar* _tmp25_;
 	GVariant* _tmp26_;
@@ -1688,154 +1600,154 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish
 	GVariant* _tmp28_;
 	const gchar* _tmp29_;
 	PublishingFlickrPublishingParameters* _tmp30_;
-	PublishingFlickrSession* _tmp31_;
+	PublishingRESTSupportOAuth1Session* _tmp31_;
 	gchar* _tmp32_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 133 "/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 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1702 "FlickrPublishing.c"
+#line 1614 "FlickrPublishing.c"
 	}
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:136: EVENT: a fully authenticated session has be" \
 "come available");
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->authenticator;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	params = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	consumer_key = NULL;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	consumer_secret = NULL;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token = NULL;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token_secret = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	username = NULL;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = params;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (consumer_key);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _g_variant_ref0 (_tmp4_);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	consumer_key = _tmp5_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = params;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (consumer_secret);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _g_variant_ref0 (_tmp7_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	consumer_secret = _tmp8_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->session;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = consumer_key;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = g_variant_get_string (_tmp10_, NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = consumer_secret;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = g_variant_get_string (_tmp12_, NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = params;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (auth_token);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _g_variant_ref0 (_tmp15_);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token = _tmp16_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = params;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (auth_token_secret);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _g_variant_ref0 (_tmp18_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	auth_token_secret = _tmp19_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = params;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_hash_table_lookup_extended (_tmp20_, "Username", NULL, &_tmp21_);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (username);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = _g_variant_ref0 (_tmp21_);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	username = _tmp22_;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = self->priv->session;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = auth_token;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = g_variant_get_string (_tmp24_, NULL);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = auth_token_secret;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = g_variant_get_string (_tmp26_, NULL);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = username;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = g_variant_get_string (_tmp28_, NULL);
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp23_, _tmp25_, _tmp27_, _tmp29_);
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = self->priv->parameters;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = self->priv->session;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = publishing_flickr_session_get_username (_tmp31_);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp32_ = publishing_rest_support_oauth1_session_get_username (_tmp31_);
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp30_->username);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_->username = _tmp32_;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_fetch_account_info (self);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (username);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (auth_token_secret);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (auth_token);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (consumer_secret);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_variant_unref0 (consumer_key);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (params);
-#line 1824 "FlickrPublishing.c"
+#line 1736 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1831 "FlickrPublishing.c"
+#line 1743 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1838 "FlickrPublishing.c"
+#line 1750 "FlickrPublishing.c"
 }
 
 
@@ -1848,44 +1760,44 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P
 	PublishingRESTSupportTransaction* _tmp5_;
 	gchar* _tmp6_;
 	gchar* _tmp7_;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/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_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1873 "FlickrPublishing.c"
+#line 1785 "FlickrPublishing.c"
 	}
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:167: EVENT: account fetch transaction response r" \
 "eceived over the network");
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = txn;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1887 "FlickrPublishing.c"
+#line 1799 "FlickrPublishing.c"
 }
 
 
@@ -1897,75 +1809,75 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi
 	gboolean _tmp4_;
 	SpitPublishingPluginHost* _tmp5_;
 	GError* _tmp6_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 173 "/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_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1921 "FlickrPublishing.c"
+#line 1833 "FlickrPublishing.c"
 	}
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:179: EVENT: account fetch transaction caused a n" \
 "etwork error");
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = self->priv->host;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = err;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 1931 "FlickrPublishing.c"
+#line 1843 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 184 "/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 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1945 "FlickrPublishing.c"
+#line 1857 "FlickrPublishing.c"
 	}
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:187: EVENT: account information has become avail" \
 "able");
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 1951 "FlickrPublishing.c"
+#line 1863 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) {
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 1958 "FlickrPublishing.c"
+#line 1870 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 1965 "FlickrPublishing.c"
+#line 1877 "FlickrPublishing.c"
 }
 
 
@@ -1976,36 +1888,36 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
 	guint _tmp3_;
 	gboolean _tmp4_;
 	gboolean _tmp5_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/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_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 1996 "FlickrPublishing.c"
+#line 1908 "FlickrPublishing.c"
 	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:198: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 2004 "FlickrPublishing.c"
+#line 1916 "FlickrPublishing.c"
 }
 
 
@@ -2015,34 +1927,34 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout
 	PublishingFlickrPublishingOptionsPane* _tmp2_;
 	guint _tmp3_;
 	gboolean _tmp4_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/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_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self);
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2034 "FlickrPublishing.c"
+#line 1946 "FlickrPublishing.c"
 	}
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:209: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_logout (self);
-#line 2040 "FlickrPublishing.c"
+#line 1952 "FlickrPublishing.c"
 }
 
 
@@ -2055,52 +1967,52 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target;
 	gint _tmp4_;
 	gdouble _tmp5_;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 215 "/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 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2061 "FlickrPublishing.c"
+#line 1973 "FlickrPublishing.c"
 	}
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:219: EVENT: uploader reports upload %.2f percent" \
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:218: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = file_number;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2083 "FlickrPublishing.c"
+#line 1995 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2090 "FlickrPublishing.c"
+#line 2002 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2097 "FlickrPublishing.c"
+#line 2009 "FlickrPublishing.c"
 }
 
 
@@ -2111,38 +2023,38 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli
 	guint _tmp3_;
 	PublishingRESTSupportBatchUploader* _tmp4_;
 	guint _tmp5_;
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 227 "/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 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2118 "FlickrPublishing.c"
+#line 2030 "FlickrPublishing.c"
 	}
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = num_published;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:231: EVENT: uploader reports upload complete; %d" \
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:230: EVENT: uploader reports upload complete; %d" \
 " items published.", _tmp1_);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = uploader;
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = uploader;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2138 "FlickrPublishing.c"
+#line 2050 "FlickrPublishing.c"
 }
 
 
@@ -2156,44 +2068,44 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr
 	guint _tmp6_;
 	SpitPublishingPluginHost* _tmp7_;
 	GError* _tmp8_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 240 "/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 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2162 "FlickrPublishing.c"
+#line 2074 "FlickrPublishing.c"
 	}
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = err;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_->message;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:244: EVENT: uploader reports upload error = '%s'" \
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:243: EVENT: uploader reports upload error = '%s'" \
 ".", _tmp2_);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = uploader;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = uploader;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = err;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2188 "FlickrPublishing.c"
+#line 2100 "FlickrPublishing.c"
 }
 
 
@@ -2201,52 +2113,52 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
 	PublishingFlickrAccountInfoFetchTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp2_;
+	PublishingRESTSupportOAuth1Session* _tmp2_;
 	PublishingFlickrAccountInfoFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:253: ACTION: running network transaction to fetc" \
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:252: ACTION: running network transaction to fetc" \
 "h account information");
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp3_;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/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 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 259 "/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 2221 "FlickrPublishing.c"
+#line 2133 "FlickrPublishing.c"
 	{
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2229 "FlickrPublishing.c"
+#line 2141 "FlickrPublishing.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/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 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2240 "FlickrPublishing.c"
+#line 2152 "FlickrPublishing.c"
 		}
 	}
 	goto __finally13;
@@ -2255,36 +2167,36 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
 		GError* _tmp5_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = err;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 2261 "FlickrPublishing.c"
+#line 2173 "FlickrPublishing.c"
 	}
 	__finally13:
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (txn);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/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 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2274 "FlickrPublishing.c"
+#line 2186 "FlickrPublishing.c"
 	}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2278 "FlickrPublishing.c"
+#line 2190 "FlickrPublishing.c"
 }
 
 
@@ -2302,23 +2214,23 @@ static gint64 int64_parse (const gchar* str) {
 	result = _tmp1_;
 #line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2296 "FlickrPublishing.c"
+#line 2208 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
 	const gchar* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (xml != NULL);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = xml;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:269: ACTION: parsing account information from xm" \
 "l = '%s'", _tmp0_);
-#line 2311 "FlickrPublishing.c"
+#line 2223 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
 		const gchar* _tmp1_;
@@ -2351,222 +2263,222 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		gint64 _tmp23_;
 		PublishingFlickrPublishingParameters* _tmp24_;
 		PublishingFlickrUserKind _tmp25_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		response_doc = _tmp2_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2354 "FlickrPublishing.c"
+#line 2266 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/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 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2363 "FlickrPublishing.c"
+#line 2275 "FlickrPublishing.c"
 		}
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		root_node = _tmp4_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = response_doc;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = root_node;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		user_node = _tmp7_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2385 "FlickrPublishing.c"
+#line 2297 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/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 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2396 "FlickrPublishing.c"
+#line 2308 "FlickrPublishing.c"
 		}
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = response_doc;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = user_node;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		is_pro_str = _tmp10_;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2412 "FlickrPublishing.c"
+#line 2324 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/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 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2423 "FlickrPublishing.c"
+#line 2335 "FlickrPublishing.c"
 		}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = response_doc;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = user_node;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		bandwidth_node = _tmp13_;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2441 "FlickrPublishing.c"
+#line 2353 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/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 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2454 "FlickrPublishing.c"
+#line 2366 "FlickrPublishing.c"
 		}
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = response_doc;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = bandwidth_node;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		remaining_kb_str = _tmp16_;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2472 "FlickrPublishing.c"
+#line 2384 "FlickrPublishing.c"
 				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/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 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2485 "FlickrPublishing.c"
+#line 2397 "FlickrPublishing.c"
 		}
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp17_ = is_pro_str;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_strcmp0 (_tmp17_, "0") == 0) {
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 2493 "FlickrPublishing.c"
+#line 2405 "FlickrPublishing.c"
 		} else {
 			const gchar* _tmp18_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp18_ = is_pro_str;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (g_strcmp0 (_tmp18_, "1") == 0) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 2502 "FlickrPublishing.c"
+#line 2414 "FlickrPublishing.c"
 			} else {
 				GError* _tmp19_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_inner_error_ = _tmp19_;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2517 "FlickrPublishing.c"
+#line 2429 "FlickrPublishing.c"
 					goto __catch14_spit_publishing_publishing_error;
 				}
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/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 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 2532 "FlickrPublishing.c"
+#line 2444 "FlickrPublishing.c"
 			}
 		}
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = remaining_kb_str;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = int64_parse (_tmp20_);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		quota_bytes_left = _tmp21_ * 1024;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = self->priv->parameters;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = quota_bytes_left;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_->quota_free_bytes = _tmp23_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_ = self->priv->parameters;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp25_ = user_kind;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_->user_kind = _tmp25_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (remaining_kb_str);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (is_pro_str);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2559 "FlickrPublishing.c"
+#line 2471 "FlickrPublishing.c"
 	}
 	goto __finally14;
 	__catch14_spit_publishing_publishing_error:
@@ -2575,78 +2487,78 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		GError* _tmp26_;
 		SpitPublishingPluginHost* _tmp27_;
 		GError* _tmp28_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = err;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 300 "/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 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			publishing_flickr_flickr_publisher_do_logout (self);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 2582 "FlickrPublishing.c"
+#line 2494 "FlickrPublishing.c"
 		}
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = self->priv->host;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = err;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2594 "FlickrPublishing.c"
+#line 2506 "FlickrPublishing.c"
 	}
 	__finally14:
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/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 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2605 "FlickrPublishing.c"
+#line 2517 "FlickrPublishing.c"
 	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 2609 "FlickrPublishing.c"
+#line 2521 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingAuthenticator* _tmp0_;
 	gboolean _tmp1_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:314: ACTION: logging user out, deauthenticating " \
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:313: ACTION: logging user out, deauthenticating " \
 "session, and erasing stored credentials");
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 2626 "FlickrPublishing.c"
+#line 2538 "FlickrPublishing.c"
 		SpitPublishingAuthenticator* _tmp2_;
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = self->priv->authenticator;
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_authenticator_logout (_tmp2_);
-#line 2632 "FlickrPublishing.c"
+#line 2544 "FlickrPublishing.c"
 	}
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 2638 "FlickrPublishing.c"
+#line 2550 "FlickrPublishing.c"
 }
 
 
@@ -2665,28 +2577,28 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp16_;
 	PublishingFlickrPublishingOptionsPane* _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:326: ACTION: displaying publishing options pane");
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:325: ACTION: displaying publishing options pane");
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 2669 "FlickrPublishing.c"
+#line 2581 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp2_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/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 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2678 "FlickrPublishing.c"
+#line 2590 "FlickrPublishing.c"
 			goto __catch15_g_error;
 		}
 	}
@@ -2699,81 +2611,81 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		SpitPublishingPluginHost* _tmp5_;
 		GError* _tmp6_;
 		GError* _tmp7_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = e;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = _tmp3_->message;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:337: Could not parse UI file! Error: %s.", _tmp4_);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:338: Could not parse UI file! Error: %s.", _tmp4_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/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, _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue."));
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2717 "FlickrPublishing.c"
+#line 2629 "FlickrPublishing.c"
 	}
 	__finally15:
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/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 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2730 "FlickrPublishing.c"
+#line 2642 "FlickrPublishing.c"
 	}
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->parameters;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->host;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp9_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = builder;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_publishing_options_pane_new (self, _tmp8_, _tmp10_, _tmp11_, _tmp12_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = _tmp13_;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->publishing_options_pane;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp14_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = self->priv->publishing_options_pane;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp15_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->host;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = self->priv->publishing_options_pane;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2764 "FlickrPublishing.c"
+#line 2676 "FlickrPublishing.c"
 }
 
 
@@ -2787,51 +2699,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli
 	GDateTime* _tmp5_;
 	gint _tmp6_;
 	gint _tmp7_;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = a;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = b;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp2_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp7_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 2806 "FlickrPublishing.c"
+#line 2718 "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 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 2815 "FlickrPublishing.c"
+#line 2727 "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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 2822 "FlickrPublishing.c"
+#line 2734 "FlickrPublishing.c"
 }
 
 
@@ -2858,7 +2770,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 	gint _tmp14__length1;
 	GeeArrayList* _tmp18_;
 	PublishingFlickrUploader* uploader = NULL;
-	PublishingFlickrSession* _tmp19_;
+	PublishingRESTSupportOAuth1Session* _tmp19_;
 	GeeArrayList* _tmp20_;
 	gint _tmp21_;
 	gpointer* _tmp22_;
@@ -2871,168 +2783,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 	PublishingFlickrUploader* _tmp28_;
 	PublishingFlickrUploader* _tmp29_;
 	PublishingFlickrUploader* _tmp30_;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:359: ACTION: uploading media items to remote ser" \
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:358: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->parameters;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_->photo_major_axis_size;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/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 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 367 "/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 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp9_) {
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2904 "FlickrPublishing.c"
+#line 2816 "FlickrPublishing.c"
 	}
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = _tmp12_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_list = _tmp13_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishables;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 2924 "FlickrPublishing.c"
+#line 2836 "FlickrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection = _tmp14_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection_length1 = _tmp14__length1;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 2936 "FlickrPublishing.c"
+#line 2848 "FlickrPublishing.c"
 			SpitPublishingPublishable* _tmp15_;
 			SpitPublishingPublishable* p = NULL;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			p = _tmp15_;
-#line 2943 "FlickrPublishing.c"
+#line 2855 "FlickrPublishing.c"
 			{
 				GeeArrayList* _tmp16_;
 				SpitPublishingPublishable* _tmp17_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = sorted_list;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = p;
-#line 376 "/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 375 "/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 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_object_unref0 (p);
-#line 2955 "FlickrPublishing.c"
+#line 2867 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = sorted_list;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 377 "/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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->session;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = sorted_list;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23__length1 = _tmp21_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = self->priv->parameters;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = strip_metadata;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	uploader = _tmp27_;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = uploader;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/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 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = uploader;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 381 "/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 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = uploader;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/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 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (sorted_list);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3003 "FlickrPublishing.c"
+#line 2915 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 385 "/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"
-	g_debug ("FlickrPublishing.vala:387: ACTION: showing success pane.");
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:386: ACTION: showing success pane.");
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3022 "FlickrPublishing.c"
+#line 2934 "FlickrPublishing.c"
 }
 
 
@@ -3040,32 +2952,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/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 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3040 "FlickrPublishing.c"
+#line 2952 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = vis;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/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 3055 "FlickrPublishing.c"
+#line 2967 "FlickrPublishing.c"
 }
 
 
@@ -3073,32 +2985,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/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 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3073 "FlickrPublishing.c"
+#line 2985 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_;
 	gint _tmp1_;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = size;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/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 3088 "FlickrPublishing.c"
+#line 3000 "FlickrPublishing.c"
 }
 
 
@@ -3107,17 +3019,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_;
 	SpitPublishingService* _tmp1_;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3107 "FlickrPublishing.c"
+#line 3019 "FlickrPublishing.c"
 }
 
 
@@ -3125,31 +3037,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3123 "FlickrPublishing.c"
+#line 3035 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingAuthenticator* _tmp0_;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = TRUE;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = TRUE;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_authenticator_authenticate (_tmp0_);
-#line 3139 "FlickrPublishing.c"
+#line 3051 "FlickrPublishing.c"
 }
 
 
@@ -3157,106 +3069,106 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish
 	PublishingFlickrFlickrPublisher * self;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 426 "/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 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3155 "FlickrPublishing.c"
+#line 3067 "FlickrPublishing.c"
 	}
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_error ("FlickrPublishing.vala:431: FlickrPublisher: start( ): can't start; thi" \
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_error ("FlickrPublishing.vala:430: FlickrPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 3163 "FlickrPublishing.c"
+#line 3075 "FlickrPublishing.c"
 	}
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:433: FlickrPublisher: starting interaction.");
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:432: FlickrPublisher: starting interaction.");
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 3169 "FlickrPublishing.c"
+#line 3081 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
-	PublishingFlickrSession* _tmp0_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:439: FlickrPublisher: stop( ) invoked.");
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:438: FlickrPublisher: stop( ) invoked.");
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3184 "FlickrPublishing.c"
-		PublishingFlickrSession* _tmp1_;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 3096 "FlickrPublishing.c"
+		PublishingRESTSupportOAuth1Session* _tmp1_;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 441 "/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 3190 "FlickrPublishing.c"
+#line 3102 "FlickrPublishing.c"
 	}
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 3194 "FlickrPublishing.c"
+#line 3106 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 3205 "FlickrPublishing.c"
+#line 3117 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_get_service;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_is_running;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_start;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_flickr_flickr_publisher_real_stop;
-#line 3220 "FlickrPublishing.c"
+#line 3132 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) {
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = self;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = FALSE;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = NULL;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->authenticator = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 3245 "FlickrPublishing.c"
+#line 3157 "FlickrPublishing.c"
 }
 
 
@@ -3264,37 +3176,37 @@ static void publishing_flickr_flickr_publisher_finalize (GObject * obj) {
 	PublishingFlickrFlickrPublisher * self;
 	SpitPublishingAuthenticator* _tmp0_;
 	guint _tmp1_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->authenticator;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &_tmp1_, NULL, FALSE);
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 117 "/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_flickr_publisher_on_session_authenticated_spit_publishing_authenticator_authenticated, self);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/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 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->authenticator);
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 3283 "FlickrPublishing.c"
+#line 3195 "FlickrPublishing.c"
 }
 
 
@@ -3312,190 +3224,6 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
 }
 
 
-PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	PublishingFlickrSession* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	PublishingFlickrSession* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	PublishingFlickrSession* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = method;
-#line 451 "/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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = session;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 453 "/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 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 454 "/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 455 "/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 456 "/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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = session;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 457 "/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 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = session;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_flickr_session_get_consumer_key (_tmp8_);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 458 "/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", _tmp10_);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 3360 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 3367 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (GType object_type, PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-	PublishingFlickrTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	const gchar* _tmp1_;
-	PublishingRESTSupportHttpMethod _tmp2_;
-	PublishingFlickrSession* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingFlickrSession* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	PublishingFlickrSession* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (uri != NULL, NULL);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = uri;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = method;
-#line 463 "/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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = session;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 465 "/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 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 466 "/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 467 "/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 468 "/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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = session;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 469 "/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 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = session;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = publishing_flickr_session_get_consumer_key (_tmp9_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 470 "/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", _tmp11_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp11_);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 3435 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method);
-#line 3442 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
-	PublishingFlickrTransaction * self;
-	PublishingRESTSupportSession* _tmp0_;
-	PublishingFlickrSession* _tmp1_;
-	GError * _inner_error_ = NULL;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
-#line 474 "/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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 474 "/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 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 476 "/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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3471 "FlickrPublishing.c"
-		} else {
-#line 476 "/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 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3479 "FlickrPublishing.c"
-		}
-	}
-}
-
-
 gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
 	gchar* result = NULL;
 	xmlNode* root = NULL;
@@ -3516,152 +3244,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_;
 	gchar* _tmp19_;
 	GError * _inner_error_ = NULL;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = doc;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	root = _tmp1_;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = root;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	status = _tmp3_;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = status;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 3523 "FlickrPublishing.c"
+#line 3251 "FlickrPublishing.c"
 		gchar* _tmp5_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp5_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3533 "FlickrPublishing.c"
+#line 3261 "FlickrPublishing.c"
 	}
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = status;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = NULL;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3545 "FlickrPublishing.c"
+#line 3273 "FlickrPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_;
 		xmlNode* _tmp9_;
 		xmlNode* _tmp10_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = doc;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = root;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3564 "FlickrPublishing.c"
+#line 3292 "FlickrPublishing.c"
 				goto __catch16_spit_publishing_publishing_error;
 			}
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (status);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/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 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3575 "FlickrPublishing.c"
+#line 3303 "FlickrPublishing.c"
 		}
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		errcode = _tmp7_;
-#line 3579 "FlickrPublishing.c"
+#line 3307 "FlickrPublishing.c"
 	}
 	goto __finally16;
 	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp11_;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 3600 "FlickrPublishing.c"
+#line 3328 "FlickrPublishing.c"
 	}
 	__finally16:
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/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 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 3613 "FlickrPublishing.c"
+#line 3341 "FlickrPublishing.c"
 	}
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = errcode;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = errcode;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp19_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (status);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3641 "FlickrPublishing.c"
+#line 3369 "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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3650 "FlickrPublishing.c"
+#line 3378 "FlickrPublishing.c"
 }
 
 
@@ -3681,14 +3409,14 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3670 "FlickrPublishing.c"
+#line 3398 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 3677 "FlickrPublishing.c"
+#line 3405 "FlickrPublishing.c"
 }
 
 
@@ -3696,50 +3424,50 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 	PublishingRESTSupportXmlDocument* result = NULL;
 	PublishingRESTSupportXmlDocument* _result_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (xml != NULL, NULL);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 3689 "FlickrPublishing.c"
+#line 3417 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		const gchar* _tmp1_;
 		PublishingRESTSupportXmlDocument* _tmp2_;
 		PublishingRESTSupportXmlDocument* _tmp3_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp2_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3705 "FlickrPublishing.c"
+#line 3433 "FlickrPublishing.c"
 				goto __catch17_spit_publishing_publishing_error;
 			}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/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 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3716 "FlickrPublishing.c"
+#line 3444 "FlickrPublishing.c"
 		}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp0_;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = NULL;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_result_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_result_ = _tmp3_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 3728 "FlickrPublishing.c"
+#line 3456 "FlickrPublishing.c"
 	}
 	goto __finally17;
 	__catch17_spit_publishing_publishing_error:
@@ -3751,158 +3479,120 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		gchar* _tmp7_;
 		gboolean _tmp8_;
 		gboolean _tmp9_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = e;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _tmp4_->message;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = string_contains (_tmp5_, _tmp7_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp9_) {
-#line 3760 "FlickrPublishing.c"
+#line 3488 "FlickrPublishing.c"
 			GError* _tmp10_;
 			const gchar* _tmp11_;
 			GError* _tmp12_;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp10_ = e;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp11_ = _tmp10_->message;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/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 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp12_;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3774 "FlickrPublishing.c"
+#line 3502 "FlickrPublishing.c"
 			goto __finally17;
 		} else {
 			GError* _tmp13_;
 			GError* _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp13_ = e;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 3787 "FlickrPublishing.c"
+#line 3515 "FlickrPublishing.c"
 			goto __finally17;
 		}
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 3792 "FlickrPublishing.c"
+#line 3520 "FlickrPublishing.c"
 	}
 	__finally17:
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3805 "FlickrPublishing.c"
+#line 3533 "FlickrPublishing.c"
 		} else {
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/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 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 3815 "FlickrPublishing.c"
+#line 3543 "FlickrPublishing.c"
 		}
 	}
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 3822 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) {
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_transaction_real_execute;
-#line 3831 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_transaction_instance_init (PublishingFlickrTransaction * self) {
+#line 3550 "FlickrPublishing.c"
 }
 
 
-GType publishing_flickr_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrTransaction), 0, (GInstanceInitFunc) publishing_flickr_transaction_instance_init, NULL };
-		GType publishing_flickr_transaction_type_id;
-		publishing_flickr_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingFlickrTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_transaction_type_id__volatile, publishing_flickr_transaction_type_id);
-	}
-	return publishing_flickr_transaction_type_id__volatile;
-}
-
-
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) {
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
 	PublishingFlickrAccountInfoFetchTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
-	PublishingFlickrSession* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 530 "/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 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self = (PublishingFlickrAccountInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+#line 500 "/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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = session;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 532 "/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 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 3877 "FlickrPublishing.c"
+#line 3567 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+#line 498 "/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 3884 "FlickrPublishing.c"
+#line 3574 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3891 "FlickrPublishing.c"
+#line 3581 "FlickrPublishing.c"
 }
 
 
@@ -3915,7 +3605,7 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 	if (g_once_init_enter (&publishing_flickr_account_info_fetch_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccountInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_account_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccountInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_account_info_fetch_transaction_instance_init, NULL };
 		GType publishing_flickr_account_info_fetch_transaction_type_id;
-		publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0);
+		publishing_flickr_account_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingFlickrAccountInfoFetchTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_flickr_account_info_fetch_transaction_type_id__volatile, publishing_flickr_account_info_fetch_transaction_type_id);
 	}
 	return publishing_flickr_account_info_fetch_transaction_type_id__volatile;
@@ -3923,651 +3613,270 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 
 
 static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 3914 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3921 "FlickrPublishing.c"
+#line 3604 "FlickrPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 3928 "FlickrPublishing.c"
+#line 3611 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingFlickrUploadTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
 	SpitPublishingPublishable* _tmp1_;
 	PublishingFlickrPublishingParameters* _tmp2_;
 	PublishingFlickrPublishingParameters* _tmp3_;
-	PublishingFlickrSession* _tmp4_;
-	PublishingFlickrSession* _tmp5_;
-	PublishingRESTSupportArgument** _tmp6_;
-	PublishingFlickrSession* _tmp7_;
+	PublishingFlickrPublishingParameters* _tmp4_;
+	PublishingFlickrVisibilitySpecification* _tmp5_;
+	gint _tmp6_;
+	gchar* _tmp7_;
 	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PublishingFlickrSession* _tmp10_;
-	gchar* _tmp11_;
+	PublishingFlickrPublishingParameters* _tmp9_;
+	PublishingFlickrVisibilitySpecification* _tmp10_;
+	gint _tmp11_;
 	gchar* _tmp12_;
-	PublishingFlickrSession* _tmp13_;
-	gchar* _tmp14_;
-	gchar* _tmp15_;
-	PublishingFlickrSession* _tmp16_;
+	gchar* _tmp13_;
+	PublishingFlickrPublishingParameters* _tmp14_;
+	PublishingFlickrVisibilitySpecification* _tmp15_;
+	gint _tmp16_;
 	gchar* _tmp17_;
 	gchar* _tmp18_;
-	PublishingFlickrPublishingParameters* _tmp19_;
-	PublishingFlickrVisibilitySpecification* _tmp20_;
-	gint _tmp21_;
-	gchar* _tmp22_;
+	GHashTable* disposition_table = NULL;
+	GHashFunc _tmp19_;
+	GEqualFunc _tmp20_;
+	GHashTable* _tmp21_;
+	gchar* filename = NULL;
+	SpitPublishingPublishable* _tmp22_;
 	gchar* _tmp23_;
-	PublishingFlickrPublishingParameters* _tmp24_;
-	PublishingFlickrVisibilitySpecification* _tmp25_;
-	gint _tmp26_;
-	gchar* _tmp27_;
-	gchar* _tmp28_;
-	PublishingFlickrPublishingParameters* _tmp29_;
-	PublishingFlickrVisibilitySpecification* _tmp30_;
-	gint _tmp31_;
+	gboolean _tmp24_ = FALSE;
+	const gchar* _tmp25_;
+	GHashTable* _tmp29_;
+	gchar* _tmp30_;
+	SpitPublishingPublishable* _tmp31_;
 	gchar* _tmp32_;
 	gchar* _tmp33_;
-	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp34_;
-	GEqualFunc _tmp35_;
-	GHashTable* _tmp36_;
-	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp37_;
-	gchar* _tmp38_;
-	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_;
-	GHashTable* _tmp44_;
-	gchar* _tmp45_;
-	SpitPublishingPublishable* _tmp46_;
-	gchar* _tmp47_;
-	gchar* _tmp48_;
-	gchar* _tmp49_;
-	GHashTable* _tmp50_;
-	gchar* _tmp51_;
-	gchar* _tmp52_;
-	GHashTable* _tmp53_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp34_;
+	GHashTable* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	GHashTable* _tmp38_;
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishable;
-#line 543 "/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 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self = (PublishingFlickrUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, _tmp0_, _tmp1_, "https://api.flickr.com/services/upload");
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = session;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->session = _tmp5_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
-#line 547 "/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 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->auth_header_fields = _tmp6_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->auth_header_fields_length1 = 0;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = session;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_);
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob");
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = session;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _tmp11_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp12_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = session;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishing_flickr_session_get_consumer_key (_tmp13_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = _tmp14_;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", _tmp15_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp15_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = session;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = publishing_flickr_session_get_access_phase_token (_tmp16_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp4_ = parameters;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp5_ = _tmp4_->visibility_specification;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = _tmp5_->everyone_level;
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = _tmp7_;
+#line 513 "/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", _tmp8_);
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp8_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = parameters;
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = _tmp9_->visibility_specification;
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp11_ = _tmp10_->friends_level;
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp13_ = _tmp12_;
+#line 514 "/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", _tmp13_);
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp13_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp14_ = parameters;
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp15_ = _tmp14_->visibility_specification;
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp16_ = _tmp15_->family_level;
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = g_strdup_printf ("%d", _tmp16_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = _tmp17_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp18_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/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", _tmp18_);
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp18_);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = parameters;
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = _tmp19_->visibility_specification;
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = _tmp20_->everyone_level;
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = g_strdup_printf ("%d", _tmp21_);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = _tmp22_;
-#line 557 "/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", _tmp23_);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp23_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = parameters;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = _tmp24_->visibility_specification;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = _tmp25_->friends_level;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp27_ = g_strdup_printf ("%d", _tmp26_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp28_ = _tmp27_;
-#line 558 "/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", _tmp28_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp28_);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp29_ = parameters;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp30_ = _tmp29_->visibility_specification;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp31_ = _tmp30_->family_level;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = g_strdup_printf ("%d", _tmp31_);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp33_ = _tmp32_;
-#line 559 "/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", _tmp33_);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp33_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp34_ = g_str_hash;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp35_ = g_str_equal;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp36_ = g_hash_table_new_full (_tmp34_, _tmp35_, _g_free0_, _g_free0_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	disposition_table = _tmp36_;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = publishable;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp38_ = spit_publishing_publishable_get_publishing_name (_tmp37_);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	filename = _tmp38_;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp40_ = filename;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp40_ == NULL) {
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp39_ = TRUE;
-#line 4133 "FlickrPublishing.c"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp19_ = g_str_hash;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = g_str_equal;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, _g_free0_);
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	disposition_table = _tmp21_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp22_ = publishable;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = spit_publishing_publishable_get_publishing_name (_tmp22_);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	filename = _tmp23_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp25_ = filename;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp25_ == NULL) {
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp24_ = TRUE;
+#line 3737 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp41_;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp41_ = filename;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp39_ = g_strcmp0 (_tmp41_, "") == 0;
-#line 4140 "FlickrPublishing.c"
+		const gchar* _tmp26_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp26_ = filename;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp24_ = g_strcmp0 (_tmp26_, "") == 0;
+#line 3744 "FlickrPublishing.c"
 	}
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp39_) {
-#line 4144 "FlickrPublishing.c"
-		SpitPublishingPublishable* _tmp42_;
-		gchar* _tmp43_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp42_ = publishable;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp43_ = spit_publishing_publishable_get_param_string (_tmp42_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp24_) {
+#line 3748 "FlickrPublishing.c"
+		SpitPublishingPublishable* _tmp27_;
+		gchar* _tmp28_;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp27_ = publishable;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp28_ = spit_publishing_publishable_get_param_string (_tmp27_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (filename);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		filename = _tmp43_;
-#line 4155 "FlickrPublishing.c"
-	}
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp44_ = disposition_table;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp45_ = g_strdup ("filename");
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = publishable;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp47_ = spit_publishing_publishable_get_param_string (_tmp46_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp48_ = _tmp47_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp49_ = soup_uri_encode (_tmp48_, NULL);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp44_, _tmp45_, _tmp49_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp48_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp50_ = disposition_table;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp51_ = g_strdup ("name");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp52_ = g_strdup ("photo");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp50_, _tmp51_, _tmp52_);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp53_ = disposition_table;
-#line 574 "/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), _tmp53_);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		filename = _tmp28_;
+#line 3759 "FlickrPublishing.c"
+	}
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp29_ = disposition_table;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_ = g_strdup ("filename");
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp31_ = publishable;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp32_ = spit_publishing_publishable_get_param_string (_tmp31_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp33_ = _tmp32_;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp34_ = soup_uri_encode (_tmp33_, NULL);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp29_, _tmp30_, _tmp34_);
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_free0 (_tmp33_);
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp35_ = disposition_table;
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp36_ = g_strdup ("name");
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp37_ = g_strdup ("photo");
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_hash_table_insert (_tmp35_, _tmp36_, _tmp37_);
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp38_ = disposition_table;
+#line 530 "/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), _tmp38_);
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (filename);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 4191 "FlickrPublishing.c"
+#line 3795 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 4198 "FlickrPublishing.c"
-}
-
-
-static void _vala_array_add19 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4209 "FlickrPublishing.c"
-	}
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 4215 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_upload_transaction_add_authorization_header_field (PublishingFlickrUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PublishingRESTSupportArgument* _tmp3_;
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (key != NULL);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (value != NULL);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = key;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = value;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add19 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 4243 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 4250 "FlickrPublishing.c"
-}
-
-
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
-	PublishingRESTSupportArgument** result;
-	int i;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 4261 "FlickrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		result[i] = _tmp0_;
-#line 4267 "FlickrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4271 "FlickrPublishing.c"
-}
-
-
-PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1) {
-	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_;
-	gint _tmp0__length1;
-	PublishingRESTSupportArgument** _tmp1_;
-	gint _tmp1__length1;
-	PublishingRESTSupportArgument** _tmp2_;
-	gint _tmp2__length1;
-#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->auth_header_fields;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2__length1 = _tmp1__length1;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (result_length1) {
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*result_length1 = _tmp2__length1;
-#line 4301 "FlickrPublishing.c"
-	}
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4307 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = g_strdup ("OAuth ");
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_result_ = _tmp0_;
-#line 4321 "FlickrPublishing.c"
-	{
-		gint i = 0;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		i = 0;
-#line 4326 "FlickrPublishing.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp1_ = TRUE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			while (TRUE) {
-#line 4333 "FlickrPublishing.c"
-				gint _tmp3_;
-				PublishingRESTSupportArgument** _tmp4_;
-				gint _tmp4__length1;
-				const gchar* _tmp5_;
-				PublishingRESTSupportArgument** _tmp6_;
-				gint _tmp6__length1;
-				gint _tmp7_;
-				PublishingRESTSupportArgument* _tmp8_;
-				const gchar* _tmp9_;
-				gchar* _tmp10_;
-				const gchar* _tmp11_;
-				gchar* _tmp12_;
-				const gchar* _tmp13_;
-				PublishingRESTSupportArgument** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				PublishingRESTSupportArgument* _tmp16_;
-				const gchar* _tmp17_;
-				gchar* _tmp18_;
-				gchar* _tmp19_;
-				gchar* _tmp20_;
-				gchar* _tmp21_;
-				gchar* _tmp22_;
-				gint _tmp23_;
-				PublishingRESTSupportArgument** _tmp24_;
-				gint _tmp24__length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!_tmp1_) {
-#line 4362 "FlickrPublishing.c"
-					gint _tmp2_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp2_ = i;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					i = _tmp2_ + 1;
-#line 4368 "FlickrPublishing.c"
-				}
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp1_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp3_ = i;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp4_ = self->priv->auth_header_fields;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!(_tmp3_ < _tmp4__length1)) {
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					break;
-#line 4382 "FlickrPublishing.c"
-				}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp5_ = _result_;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6_ = self->priv->auth_header_fields;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp7_ = i;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp8_ = _tmp6_[_tmp7_];
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp9_ = _tmp8_->key;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp10_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp11_ = _result_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp12_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp13_ = _result_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14_ = self->priv->auth_header_fields;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp15_ = i;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = _tmp14_[_tmp15_];
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp17_ = _tmp16_->value;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp19_ = _tmp18_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp21_ = _tmp20_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_result_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_result_ = _tmp22_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp21_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp19_);
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp23_ = i;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24_ = self->priv->auth_header_fields;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 4448 "FlickrPublishing.c"
-					const gchar* _tmp25_;
-					gchar* _tmp26_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp25_ = _result_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (_result_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_result_ = _tmp26_;
-#line 4459 "FlickrPublishing.c"
-				}
-			}
-		}
-	}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _result_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4468 "FlickrPublishing.c"
+#line 3802 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingFlickrUploadTransaction * self;
-	PublishingFlickrSession* _tmp0_;
-	gchar* authorization_header = NULL;
-	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 601 "/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 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	authorization_header = _tmp1_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:605: executing upload transaction: authorization" \
-" header string = '%s'", authorization_header);
-#line 607 "/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 609 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	publishing_rest_support_oauth1_upload_transaction_authorize (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction));
+#line 535 "/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_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4504 "FlickrPublishing.c"
+#line 3823 "FlickrPublishing.c"
 		} else {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (authorization_header);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/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 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 4514 "FlickrPublishing.c"
+#line 3831 "FlickrPublishing.c"
 		}
 	}
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (authorization_header);
-#line 4519 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_flickr_upload_transaction_real_execute;
-#line 4532 "FlickrPublishing.c"
+#line 3846 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4539 "FlickrPublishing.c"
+#line 3853 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingFlickrUploadTransaction * self;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 539 "/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 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 4555 "FlickrPublishing.c"
+#line 3865 "FlickrPublishing.c"
 }
 
 
@@ -4576,1068 +3885,38 @@ GType publishing_flickr_upload_transaction_get_type (void) {
 	if (g_once_init_enter (&publishing_flickr_upload_transaction_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrUploadTransaction), 0, (GInstanceInitFunc) publishing_flickr_upload_transaction_instance_init, NULL };
 		GType publishing_flickr_upload_transaction_type_id;
-		publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0);
+		publishing_flickr_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, "PublishingFlickrUploadTransaction", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_flickr_upload_transaction_type_id__volatile, publishing_flickr_upload_transaction_type_id);
 	}
 	return publishing_flickr_upload_transaction_type_id__volatile;
 }
 
 
-PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) {
-	PublishingFlickrSession* self = NULL;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 4577 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrSession* publishing_flickr_session_new (void) {
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 4584 "FlickrPublishing.c"
-}
-
-
-static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base) {
-	PublishingFlickrSession * self;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->access_phase_token;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp2_ != NULL) {
-#line 4600 "FlickrPublishing.c"
-		const gchar* _tmp3_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = self->priv->access_phase_token_secret;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = _tmp3_ != NULL;
-#line 4606 "FlickrPublishing.c"
-	} else {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = FALSE;
-#line 4610 "FlickrPublishing.c"
-	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 4614 "FlickrPublishing.c"
-		const gchar* _tmp4_;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = self->priv->username;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _tmp4_ != NULL;
-#line 4620 "FlickrPublishing.c"
-	} else {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 4624 "FlickrPublishing.c"
-	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp0_;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4630 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (consumer_key != NULL);
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (consumer_secret != NULL);
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = consumer_key;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->consumer_key);
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->consumer_key = _tmp1_;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = consumer_secret;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->consumer_secret);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->consumer_secret = _tmp3_;
-#line 4661 "FlickrPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 4668 "FlickrPublishing.c"
-}
-
-
-static void _vala_array_add20 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if ((*length) == (*size)) {
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 4679 "FlickrPublishing.c"
-	}
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[(*length)++] = value;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	(*array)[*length] = NULL;
-#line 4685 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, PublishingRESTSupportTransaction* txn) {
-	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_;
-	PublishingRESTSupportHttpMethod _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp6_;
-	gint _tmp7_;
-	PublishingRESTSupportArgument** _tmp8_;
-	gint base_string_arguments_length1;
-	gint _base_string_arguments_size_;
-	PublishingFlickrUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp9_;
-	PublishingFlickrUploadTransaction* _tmp10_;
-	PublishingFlickrUploadTransaction* _tmp11_;
-	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp20_;
-	gint _tmp20__length1;
-	gint _tmp21_;
-	PublishingRESTSupportArgument** _tmp22_;
-	gint sorted_args_length1;
-	gint _sorted_args_size_;
-	gchar* arguments_string = NULL;
-	gchar* _tmp23_;
-	gchar* signing_key = NULL;
-	const gchar* _tmp46_;
-	gchar* signature_base_string = NULL;
-	const gchar* _tmp54_;
-	gchar* _tmp55_;
-	gchar* _tmp56_;
-	PublishingRESTSupportTransaction* _tmp57_;
-	gchar* _tmp58_;
-	gchar* _tmp59_;
-	gchar* _tmp60_;
-	gchar* _tmp61_;
-	gchar* _tmp62_;
-	gchar* _tmp63_;
-	gchar* _tmp64_;
-	gchar* _tmp65_;
-	const gchar* _tmp66_;
-	gchar* _tmp67_;
-	gchar* _tmp68_;
-	gchar* _tmp69_;
-	gchar* _tmp70_;
-	const gchar* _tmp71_;
-	const gchar* _tmp72_;
-	gchar* signature = NULL;
-	const gchar* _tmp73_;
-	const gchar* _tmp74_;
-	gchar* _tmp75_;
-	const gchar* _tmp76_;
-	gchar* _tmp77_;
-	const gchar* _tmp78_;
-	PublishingFlickrUploadTransaction* _tmp79_;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	http_method = _tmp2_;
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:637: signing transaction with parameters:");
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = http_method;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:638: %s", _tmp5_);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp5_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = txn;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	base_string_arguments = _tmp8_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	base_string_arguments_length1 = _tmp7_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = txn;
-#line 642 "/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 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_txn = _tmp10_;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = upload_txn;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp11_ != NULL) {
-#line 4790 "FlickrPublishing.c"
-		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingFlickrUploadTransaction* _tmp12_;
-		gint _tmp13_;
-		PublishingRESTSupportArgument** _tmp14_;
-		gint auth_header_args_length1;
-		gint _auth_header_args_size_;
-		PublishingRESTSupportArgument** _tmp15_;
-		gint _tmp15__length1;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:644: %s", "this transaction is an UploadTransaction; including Authorization head" \
-"er " "fields in signature base string");
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = upload_txn;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		auth_header_args = _tmp14_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		auth_header_args_length1 = _tmp13_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_auth_header_args_size_ = auth_header_args_length1;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = auth_header_args;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15__length1 = auth_header_args_length1;
-#line 4815 "FlickrPublishing.c"
-		{
-			PublishingRESTSupportArgument** arg_collection = NULL;
-			gint arg_collection_length1 = 0;
-			gint _arg_collection_size_ = 0;
-			gint arg_it = 0;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			arg_collection = _tmp15_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			arg_collection_length1 = _tmp15__length1;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) {
-#line 4827 "FlickrPublishing.c"
-				PublishingRESTSupportArgument* _tmp16_;
-				PublishingRESTSupportArgument* arg = NULL;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				arg = _tmp16_;
-#line 4834 "FlickrPublishing.c"
-				{
-					PublishingRESTSupportArgument** _tmp17_;
-					gint _tmp17__length1;
-					PublishingRESTSupportArgument* _tmp18_;
-					PublishingRESTSupportArgument* _tmp19_;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17_ = base_string_arguments;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp17__length1 = base_string_arguments_length1;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp18_ = arg;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_);
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_vala_array_add20 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_publishing_rest_support_argument_unref0 (arg);
-#line 4852 "FlickrPublishing.c"
-				}
-			}
-		}
-#line 643 "/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 4858 "FlickrPublishing.c"
-	}
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = base_string_arguments;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20__length1 = base_string_arguments_length1;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	sorted_args = _tmp22_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	sorted_args_length1 = _tmp21_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_sorted_args_size_ = sorted_args_length1;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = g_strdup ("");
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	arguments_string = _tmp23_;
-#line 4876 "FlickrPublishing.c"
-	{
-		gint i = 0;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		i = 0;
-#line 4881 "FlickrPublishing.c"
-		{
-			gboolean _tmp24_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp24_ = TRUE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			while (TRUE) {
-#line 4888 "FlickrPublishing.c"
-				gint _tmp26_;
-				PublishingRESTSupportArgument** _tmp27_;
-				gint _tmp27__length1;
-				const gchar* _tmp28_;
-				PublishingRESTSupportArgument** _tmp29_;
-				gint _tmp29__length1;
-				gint _tmp30_;
-				PublishingRESTSupportArgument* _tmp31_;
-				const gchar* _tmp32_;
-				gchar* _tmp33_;
-				gchar* _tmp34_;
-				PublishingRESTSupportArgument** _tmp35_;
-				gint _tmp35__length1;
-				gint _tmp36_;
-				PublishingRESTSupportArgument* _tmp37_;
-				const gchar* _tmp38_;
-				gchar* _tmp39_;
-				gchar* _tmp40_;
-				gchar* _tmp41_;
-				gint _tmp42_;
-				PublishingRESTSupportArgument** _tmp43_;
-				gint _tmp43__length1;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!_tmp24_) {
-#line 4913 "FlickrPublishing.c"
-					gint _tmp25_;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp25_ = i;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					i = _tmp25_ + 1;
-#line 4919 "FlickrPublishing.c"
-				}
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp24_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp26_ = i;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp27_ = sorted_args;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp27__length1 = sorted_args_length1;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (!(_tmp26_ < _tmp27__length1)) {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					break;
-#line 4933 "FlickrPublishing.c"
-				}
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp28_ = arguments_string;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp29_ = sorted_args;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp29__length1 = sorted_args_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp30_ = i;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp31_ = _tmp29_[_tmp30_];
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp32_ = _tmp31_->key;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp33_ = g_strconcat (_tmp32_, "=", NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp34_ = _tmp33_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp35_ = sorted_args;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp35__length1 = sorted_args_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp36_ = i;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp37_ = _tmp35_[_tmp36_];
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp38_ = _tmp37_->value;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp40_ = _tmp39_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (arguments_string);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				arguments_string = _tmp41_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp40_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_g_free0 (_tmp34_);
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp42_ = i;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp43_ = sorted_args;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				_tmp43__length1 = sorted_args_length1;
-#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 4983 "FlickrPublishing.c"
-					const gchar* _tmp44_;
-					gchar* _tmp45_;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp44_ = arguments_string;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_tmp45_ = g_strconcat (_tmp44_, "&", NULL);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_g_free0 (arguments_string);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					arguments_string = _tmp45_;
-#line 4994 "FlickrPublishing.c"
-				}
-			}
-		}
-	}
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signing_key = NULL;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = self->priv->access_phase_token_secret;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp46_ != NULL) {
-#line 5005 "FlickrPublishing.c"
-		const gchar* _tmp47_;
-		gchar* _tmp48_;
-		gchar* _tmp49_;
-		const gchar* _tmp50_;
-		gchar* _tmp51_;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:666: access phase token secret available; using " \
-"it as signing key");
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp47_ = self->priv->consumer_secret;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp48_ = g_strconcat (_tmp47_, "&", NULL);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp49_ = _tmp48_;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp50_ = self->priv->access_phase_token_secret;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp51_ = g_strconcat (_tmp49_, _tmp50_, NULL);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (signing_key);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		signing_key = _tmp51_;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp49_);
-#line 5029 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp52_;
-		gchar* _tmp53_;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:670: %s", "neither access phase nor request phase token secrets available; using " \
-"API " "key as signing key");
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp52_ = self->priv->consumer_secret;
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp53_ = g_strconcat (_tmp52_, "&", NULL);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (signing_key);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		signing_key = _tmp53_;
-#line 5043 "FlickrPublishing.c"
-	}
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp54_ = http_method;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp55_ = g_strconcat (_tmp54_, "&", NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp57_ = txn;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (_tmp57_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp59_ = _tmp58_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp60_ = soup_uri_encode (_tmp59_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp61_ = _tmp60_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp62_ = g_strconcat (_tmp56_, _tmp61_, NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp63_ = _tmp62_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp64_ = g_strconcat (_tmp63_, "&", NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp65_ = _tmp64_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp66_ = arguments_string;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp67_ = soup_uri_encode (_tmp66_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp68_ = _tmp67_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp69_ = g_strconcat (_tmp65_, _tmp68_, NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp70_ = _tmp69_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp68_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp65_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp63_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp61_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp59_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp56_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature_base_string = _tmp70_;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = signature_base_string;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:680: signature base string = '%s'", _tmp71_);
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp72_ = signing_key;
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:682: signing key = '%s'", _tmp72_);
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = signing_key;
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = signature_base_string;
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp75_ = publishing_rest_support_hmac_sha1 (_tmp73_, _tmp74_);
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp75_;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp76_ = signature;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp77_ = soup_uri_encode (_tmp76_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signature);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp77_;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp78_ = signature;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:688: signature = '%s'", _tmp78_);
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp79_ = upload_txn;
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp79_ != NULL) {
-#line 5125 "FlickrPublishing.c"
-		PublishingFlickrUploadTransaction* _tmp80_;
-		const gchar* _tmp81_;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp80_ = upload_txn;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp81_ = signature;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp80_, "oauth_signature", _tmp81_);
-#line 5134 "FlickrPublishing.c"
-	} else {
-		PublishingRESTSupportTransaction* _tmp82_;
-		const gchar* _tmp83_;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp82_ = txn;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp83_ = signature;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (_tmp82_, "oauth_signature", _tmp83_);
-#line 5144 "FlickrPublishing.c"
-	}
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signature);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signature_base_string);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (signing_key);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (arguments_string);
-#line 634 "/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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 634 "/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 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (http_method);
-#line 5162 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = username;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = _tmp5_;
-#line 701 "/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 5207 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	GTimeVal currtime = {0};
-	GTimeVal _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	GTimeVal _tmp4_;
-	glong _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_get_current_time (&currtime);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = currtime;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _tmp0_.tv_sec;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = currtime;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_.tv_usec;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp11_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5266 "FlickrPublishing.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 5289 "FlickrPublishing.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 5297 "FlickrPublishing.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 5309 "FlickrPublishing.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 5333 "FlickrPublishing.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 5339 "FlickrPublishing.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 5343 "FlickrPublishing.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 5347 "FlickrPublishing.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 5359 "FlickrPublishing.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 5369 "FlickrPublishing.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 5375 "FlickrPublishing.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 5389 "FlickrPublishing.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 5399 "FlickrPublishing.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 5405 "FlickrPublishing.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 5414 "FlickrPublishing.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 5434 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	gint64 _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = g_get_real_time ();
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp4_;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5463 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->consumer_key;
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "consumer_key != null");
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->consumer_key;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5486 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5509 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	gboolean _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 727 "/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 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_, "is_authenticated()");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->username;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 5532 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_flickr_session_real_is_authenticated;
-#line 5545 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = NULL;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->consumer_key = NULL;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->consumer_secret = NULL;
-#line 5562 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_session_finalize (PublishingRESTSupportSession * obj) {
-	PublishingFlickrSession * self;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->consumer_key);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->consumer_secret);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj);
-#line 5582 "FlickrPublishing.c"
-}
-
-
-GType publishing_flickr_session_get_type (void) {
-	static volatile gsize publishing_flickr_session_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_session_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrSession), 0, (GInstanceInitFunc) publishing_flickr_session_instance_init, NULL };
-		GType publishing_flickr_session_type_id;
-		publishing_flickr_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingFlickrSession", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_session_type_id__volatile, publishing_flickr_session_type_id);
-	}
-	return publishing_flickr_session_type_id__volatile;
-}
-
-
 static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5601 "FlickrPublishing.c"
+#line 3884 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5608 "FlickrPublishing.c"
+#line 3891 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5615 "FlickrPublishing.c"
+#line 3898 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 5622 "FlickrPublishing.c"
+#line 3905 "FlickrPublishing.c"
 }
 
 
@@ -5710,214 +3989,214 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 	gboolean _tmp82_;
 	GtkButton* _tmp83_;
 	GtkButton* _tmp84_;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = builder;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = builder;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = builder;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->builder;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/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 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = _tmp9_;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->builder;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/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 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = _tmp12_;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = self->priv->builder;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/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 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = _tmp15_;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->builder;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/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 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = _tmp18_;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->builder;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/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 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = _tmp21_;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = self->priv->builder;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/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 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = _tmp24_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = self->priv->builder;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/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 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = _tmp27_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = self->priv->builder;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/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 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = _tmp30_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = self->priv->builder;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/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 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = _tmp33_;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp34_ = publisher;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp35_ = publishing_flickr_flickr_publisher_get_authenticator (_tmp34_);
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp36_ = _tmp35_;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp37_ = spit_publishing_authenticator_can_logout (_tmp36_);
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp38_ = !_tmp37_;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp36_);
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp38_) {
-#line 5831 "FlickrPublishing.c"
+#line 4114 "FlickrPublishing.c"
 		GtkButton* _tmp39_;
 		GtkContainer* _tmp40_;
 		GtkContainer* _tmp41_;
 		GtkButton* _tmp42_;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp39_ = self->priv->logout_button;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp41_ = _tmp40_;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp42_ = self->priv->logout_button;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 5846 "FlickrPublishing.c"
+#line 4129 "FlickrPublishing.c"
 	}
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp43_ = parameters;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp44_ = _publishing_flickr_publishing_parameters_ref0 (_tmp43_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp44_;
-#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp45_ = publisher;
-#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = _g_object_ref0 (_tmp45_);
-#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = _tmp46_;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp47_ = media_type;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->media_type = _tmp47_;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp49_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp48_);
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 604 "/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 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = _tmp49_;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = _tmp48_;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp51_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp50_);
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/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 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = _tmp51_;
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = _tmp50_;
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp52_ = parameters;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp53_ = _tmp52_->username;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp54_ = g_strdup_printf (_ ("You are logged into Flickr as %s.\n\n"), _tmp53_);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	upload_label_text = _tmp54_;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp55_ = parameters;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp56_ = _tmp55_->user_kind;
-#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp56_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 5902 "FlickrPublishing.c"
+#line 4185 "FlickrPublishing.c"
 		const gchar* _tmp57_;
 		PublishingFlickrPublishingParameters* _tmp58_;
 		gint64 _tmp59_;
@@ -5926,168 +4205,168 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 		gchar* _tmp62_;
 		gchar* _tmp63_;
 		gchar* _tmp64_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = upload_label_text;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = parameters;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = _tmp58_->quota_free_bytes;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = g_format_size_full ((guint64) _tmp59_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61_ = _tmp60_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp62_ = g_strdup_printf (_ ("Your free Flickr account limits how much data you can upload per month" \
 ".\n" \
 "This month you have %s remaining in your upload quota."), _tmp61_);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp63_ = _tmp62_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp64_ = g_strconcat (_tmp57_, _tmp63_, NULL);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		upload_label_text = _tmp64_;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp63_);
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp61_);
-#line 5935 "FlickrPublishing.c"
+#line 4218 "FlickrPublishing.c"
 	} else {
 		const gchar* _tmp65_;
 		gchar* _tmp66_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp65_ = upload_label_text;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp66_ = g_strconcat (_tmp65_, _ ("Your Flickr Pro account entitles you to unlimited uploads."), NULL);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		upload_label_text = _tmp66_;
-#line 5947 "FlickrPublishing.c"
+#line 4230 "FlickrPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp67_ = self->priv->upload_info_label;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp68_ = upload_label_text;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_label_set_label (_tmp67_, _tmp68_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp69_ = g_strdup (_ ("Photos _visible to:"));
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	visibility_label_text = _tmp69_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp70_ = media_type;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp70_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 5963 "FlickrPublishing.c"
+#line 4246 "FlickrPublishing.c"
 		gchar* _tmp71_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp71_ = g_strdup (_ ("Videos _visible to:"));
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		visibility_label_text = _tmp71_;
-#line 5971 "FlickrPublishing.c"
+#line 4254 "FlickrPublishing.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp72_;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp72_ = media_type;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp72_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 5978 "FlickrPublishing.c"
+#line 4261 "FlickrPublishing.c"
 			gchar* _tmp73_;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp73_ = g_strdup (_ ("Photos and videos _visible to:"));
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			visibility_label_text = _tmp73_;
-#line 5986 "FlickrPublishing.c"
+#line 4269 "FlickrPublishing.c"
 		}
 	}
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp74_ = self->priv->visibility_label;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp75_ = visibility_label_text;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_label_set_label (_tmp74_, _tmp75_);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp76_ = self->priv->visibility_combo;
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp77_ = media_type;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp77_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 6005 "FlickrPublishing.c"
+#line 4288 "FlickrPublishing.c"
 		GtkComboBoxText* _tmp78_;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp78_ = self->priv->size_combo;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 6013 "FlickrPublishing.c"
+#line 4296 "FlickrPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp79_;
 		GtkLabel* _tmp80_;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp79_ = self->priv->size_combo;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp80_ = self->priv->size_label;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6025 "FlickrPublishing.c"
+#line 4308 "FlickrPublishing.c"
 	}
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp81_ = self->priv->strip_metadata_check;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp82_ = strip_metadata;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp82_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp83_ = self->priv->logout_button;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp83_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp84_ = self->priv->publish_button;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp84_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (visibility_label_text);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6047 "FlickrPublishing.c"
+#line 4330 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 579 "/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 6054 "FlickrPublishing.c"
+#line 4337 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 6063 "FlickrPublishing.c"
+#line 4346 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 6070 "FlickrPublishing.c"
+#line 4353 "FlickrPublishing.c"
 }
 
 
@@ -6103,33 +4382,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 	SpitPublishingPublisherMediaType _tmp7_;
 	GtkCheckButton* _tmp14_;
 	gboolean _tmp15_;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibilities;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = self->priv->visibilities_length1;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->visibility_combo;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/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 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_->specification;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_->visibility_specification = _tmp6_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->media_type;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 6112 "FlickrPublishing.c"
+#line 4395 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* _tmp8_;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_;
 		gint _tmp9__length1;
@@ -6137,116 +4416,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 		gint _tmp11_;
 		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_;
 		gint _tmp13_;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = self->priv->parameters;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = self->priv->sizes;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9__length1 = self->priv->sizes_length1;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/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 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = _tmp9_[_tmp11_];
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_->size;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 6136 "FlickrPublishing.c"
+#line 4419 "FlickrPublishing.c"
 	}
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->strip_metadata_check;
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 655 "/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 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp15_);
-#line 6144 "FlickrPublishing.c"
+#line 4427 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6155 "FlickrPublishing.c"
+#line 4438 "FlickrPublishing.c"
 	}
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6161 "FlickrPublishing.c"
+#line 4444 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6172 "FlickrPublishing.c"
+#line 4455 "FlickrPublishing.c"
 	}
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6178 "FlickrPublishing.c"
+#line 4461 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6189 "FlickrPublishing.c"
+#line 4472 "FlickrPublishing.c"
 	}
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6195 "FlickrPublishing.c"
+#line 4478 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6206 "FlickrPublishing.c"
+#line 4489 "FlickrPublishing.c"
 	}
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6212 "FlickrPublishing.c"
+#line 4495 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 6223 "FlickrPublishing.c"
+#line 4506 "FlickrPublishing.c"
 	}
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6229 "FlickrPublishing.c"
+#line 4512 "FlickrPublishing.c"
 }
 
 
@@ -6283,108 +4562,108 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp20_;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp21_;
 	gint _tmp21__length1;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_visibility_specification_new (1, 1, 1);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Everyone"), _tmp3_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp3_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _result_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5__length1 = _result__length1;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends & family only"), _tmp7_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp7_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _result_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9__length1 = _result__length1;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_visibility_specification_new (0, 1, 0);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Family only"), _tmp11_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp11_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = _result_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_visibility_specification_new (1, 0, 0);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = _tmp14_;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Friends only"), _tmp15_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp16_);
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp16_);
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp15_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _result_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17__length1 = _result__length1;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = publishing_flickr_visibility_specification_new (0, 0, 0);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_ ("Just me"), _tmp19_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _result_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21__length1 = _result__length1;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp21__length1;
-#line 6354 "FlickrPublishing.c"
+#line 4637 "FlickrPublishing.c"
 	}
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp21_;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6360 "FlickrPublishing.c"
+#line 4643 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 6367 "FlickrPublishing.c"
+#line 4650 "FlickrPublishing.c"
 }
 
 
@@ -6396,165 +4675,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	GtkComboBoxText* _tmp8_;
 	PublishingFlickrFlickrPublisher* _tmp9_;
 	gint _tmp10_;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->visibilities;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->visibilities_length1;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6387 "FlickrPublishing.c"
+#line 4670 "FlickrPublishing.c"
 		gint _tmp1_;
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/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 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = _tmp2_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities_length1 = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 6400 "FlickrPublishing.c"
+#line 4683 "FlickrPublishing.c"
 	}
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 6406 "FlickrPublishing.c"
+#line 4689 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
 		gint _v_collection_size_ = 0;
 		gint v_it = 0;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection = _tmp3_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection_length1 = _tmp3__length1;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 6418 "FlickrPublishing.c"
+#line 4701 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 6425 "FlickrPublishing.c"
+#line 4708 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_;
 				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_;
 				const gchar* _tmp7_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = v;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 6440 "FlickrPublishing.c"
+#line 4723 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->visibility_combo;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 677 "/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 6452 "FlickrPublishing.c"
+#line 4735 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6463 "FlickrPublishing.c"
+#line 4746 "FlickrPublishing.c"
 	}
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6469 "FlickrPublishing.c"
+#line 4752 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6480 "FlickrPublishing.c"
+#line 4763 "FlickrPublishing.c"
 	}
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6486 "FlickrPublishing.c"
+#line 4769 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6497 "FlickrPublishing.c"
+#line 4780 "FlickrPublishing.c"
 	}
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6503 "FlickrPublishing.c"
+#line 4786 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6514 "FlickrPublishing.c"
+#line 4797 "FlickrPublishing.c"
 	}
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6520 "FlickrPublishing.c"
+#line 4803 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry** * array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 6531 "FlickrPublishing.c"
+#line 4814 "FlickrPublishing.c"
 	}
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6537 "FlickrPublishing.c"
+#line 4820 "FlickrPublishing.c"
 }
 
 
@@ -6581,78 +4860,78 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp10_;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp11_;
 	gint _tmp11__length1;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("500 × 375 pixels"), 500);
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _result_;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = _result__length1;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("1024 × 768 pixels"), 1024);
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _result_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5__length1 = _result__length1;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("2048 × 1536 pixels"), 2048);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _result_;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("4096 × 3072 pixels"), 4096);
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _result_;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9__length1 = _result__length1;
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_publishing_options_pane_size_entry_new (_ ("Original size"), PUBLISHING_FLICKR_ORIGINAL_SIZE);
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _result_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11__length1 = _result__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp11__length1;
-#line 6622 "FlickrPublishing.c"
+#line 4905 "FlickrPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp11_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6628 "FlickrPublishing.c"
+#line 4911 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 6635 "FlickrPublishing.c"
+#line 4918 "FlickrPublishing.c"
 }
 
 
@@ -6664,80 +4943,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	GtkComboBoxText* _tmp8_;
 	PublishingFlickrFlickrPublisher* _tmp9_;
 	gint _tmp10_;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 6655 "FlickrPublishing.c"
+#line 4938 "FlickrPublishing.c"
 		gint _tmp1_;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/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 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = _tmp2_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes_length1 = _tmp1_;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 6668 "FlickrPublishing.c"
+#line 4951 "FlickrPublishing.c"
 	}
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 6674 "FlickrPublishing.c"
+#line 4957 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
 		gint _e_collection_size_ = 0;
 		gint e_it = 0;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection = _tmp3_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection_length1 = _tmp3__length1;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 6686 "FlickrPublishing.c"
+#line 4969 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 6693 "FlickrPublishing.c"
+#line 4976 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_;
 				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_;
 				const gchar* _tmp7_;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = e;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 6708 "FlickrPublishing.c"
+#line 4991 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->size_combo;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/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 6720 "FlickrPublishing.c"
+#line 5003 "FlickrPublishing.c"
 }
 
 
@@ -6745,17 +5024,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
 	PublishingFlickrFlickrPublisher* _tmp0_;
 	GtkComboBoxText* _tmp1_;
 	gint _tmp2_;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/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 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 6738 "FlickrPublishing.c"
+#line 5021 "FlickrPublishing.c"
 }
 
 
@@ -6763,41 +5042,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
 	PublishingFlickrFlickrPublisher* _tmp0_;
 	GtkComboBoxText* _tmp1_;
 	gint _tmp2_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/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 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 6756 "FlickrPublishing.c"
+#line 5039 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
 	GtkCheckButton* _tmp0_;
 	gboolean _tmp1_;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata_check;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 711 "/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 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0, _tmp1_);
-#line 6771 "FlickrPublishing.c"
+#line 5054 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
-#line 907 "/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_PUBLISHING_OPTIONS_PANE (self));
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit (self, publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
-#line 6780 "FlickrPublishing.c"
+#line 5063 "FlickrPublishing.c"
 }
 
 
@@ -6806,56 +5085,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/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 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6799 "FlickrPublishing.c"
+#line 5082 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 915 "/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_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6812 "FlickrPublishing.c"
+#line 5095 "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 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6819 "FlickrPublishing.c"
+#line 5102 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 6826 "FlickrPublishing.c"
+#line 5109 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 919 "/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_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/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 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/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 6838 "FlickrPublishing.c"
+#line 5121 "FlickrPublishing.c"
 }
 
 
@@ -6863,17 +5142,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingFlickrPublishingOptionsPane * self;
 	guint _tmp0_;
 	guint _tmp1_;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 6856 "FlickrPublishing.c"
+#line 5139 "FlickrPublishing.c"
 }
 
 
@@ -6882,240 +5161,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	gint _tmp2_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_title;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp1_;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_size;
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->size = _tmp2_;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6883 "FlickrPublishing.c"
+#line 5166 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 544 "/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 6890 "FlickrPublishing.c"
+#line 5173 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6897 "FlickrPublishing.c"
+#line 5180 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 6906 "FlickrPublishing.c"
+#line 5189 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6916 "FlickrPublishing.c"
+#line 5199 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6920 "FlickrPublishing.c"
+#line 5203 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6928 "FlickrPublishing.c"
+#line 5211 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6935 "FlickrPublishing.c"
+#line 5218 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneSizeEntry * object;
 		object = collect_values[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6942 "FlickrPublishing.c"
+#line 5225 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6946 "FlickrPublishing.c"
+#line 5229 "FlickrPublishing.c"
 		}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 6950 "FlickrPublishing.c"
+#line 5233 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6954 "FlickrPublishing.c"
+#line 5237 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 6958 "FlickrPublishing.c"
+#line 5241 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6969 "FlickrPublishing.c"
+#line 5252 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 6975 "FlickrPublishing.c"
+#line 5258 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6979 "FlickrPublishing.c"
+#line 5262 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 6983 "FlickrPublishing.c"
+#line 5266 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 6987 "FlickrPublishing.c"
+#line 5270 "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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7001 "FlickrPublishing.c"
+#line 5284 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7010 "FlickrPublishing.c"
+#line 5293 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 7030 "FlickrPublishing.c"
+#line 5313 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7034 "FlickrPublishing.c"
+#line 5317 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7040 "FlickrPublishing.c"
+#line 5323 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * old;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7059 "FlickrPublishing.c"
+#line 5342 "FlickrPublishing.c"
 	} else {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7063 "FlickrPublishing.c"
+#line 5346 "FlickrPublishing.c"
 	}
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 7069 "FlickrPublishing.c"
+#line 5352 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 7079 "FlickrPublishing.c"
+#line 5362 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7086 "FlickrPublishing.c"
+#line 5369 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry * obj) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7098 "FlickrPublishing.c"
+#line 5381 "FlickrPublishing.c"
 }
 
 
@@ -7136,24 +5415,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 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7123 "FlickrPublishing.c"
+#line 5406 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
 	self = instance;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7136 "FlickrPublishing.c"
+#line 5419 "FlickrPublishing.c"
 	}
 }
 
@@ -7164,248 +5443,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
 	PublishingFlickrVisibilitySpecification* _tmp1_;
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_specification;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->specification = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_title;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp3_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7171 "FlickrPublishing.c"
+#line 5454 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/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 7178 "FlickrPublishing.c"
+#line 5461 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7185 "FlickrPublishing.c"
+#line 5468 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 7194 "FlickrPublishing.c"
+#line 5477 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7204 "FlickrPublishing.c"
+#line 5487 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7208 "FlickrPublishing.c"
+#line 5491 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7216 "FlickrPublishing.c"
+#line 5499 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7223 "FlickrPublishing.c"
+#line 5506 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry * object;
 		object = collect_values[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7230 "FlickrPublishing.c"
+#line 5513 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7234 "FlickrPublishing.c"
+#line 5517 "FlickrPublishing.c"
 		}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 7238 "FlickrPublishing.c"
+#line 5521 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7242 "FlickrPublishing.c"
+#line 5525 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7246 "FlickrPublishing.c"
+#line 5529 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7257 "FlickrPublishing.c"
+#line 5540 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 7263 "FlickrPublishing.c"
+#line 5546 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7267 "FlickrPublishing.c"
+#line 5550 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 7271 "FlickrPublishing.c"
+#line 5554 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 7275 "FlickrPublishing.c"
+#line 5558 "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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7289 "FlickrPublishing.c"
+#line 5572 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7298 "FlickrPublishing.c"
+#line 5581 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 7318 "FlickrPublishing.c"
+#line 5601 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7322 "FlickrPublishing.c"
+#line 5605 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7328 "FlickrPublishing.c"
+#line 5611 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * old;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7347 "FlickrPublishing.c"
+#line 5630 "FlickrPublishing.c"
 	} else {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7351 "FlickrPublishing.c"
+#line 5634 "FlickrPublishing.c"
 	}
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 7357 "FlickrPublishing.c"
+#line 5640 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 7367 "FlickrPublishing.c"
+#line 5650 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 7374 "FlickrPublishing.c"
+#line 5657 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry * obj) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 7388 "FlickrPublishing.c"
+#line 5671 "FlickrPublishing.c"
 }
 
 
@@ -7426,134 +5705,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 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 7413 "FlickrPublishing.c"
+#line 5696 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
 	self = instance;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7426 "FlickrPublishing.c"
+#line 5709 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate));
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = 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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_signals[PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = 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 7442 "FlickrPublishing.c"
+#line 5725 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_flickr_publishing_options_pane_real_get_widget;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/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 7457 "FlickrPublishing.c"
+#line 5740 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = NULL;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = NULL;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = NULL;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = 0;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 7498 "FlickrPublishing.c"
+#line 5781 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_finalize (GObject * obj) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 570 "/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 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 571 "/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 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 7536 "FlickrPublishing.c"
+#line 5819 "FlickrPublishing.c"
 }
 
 
@@ -7571,65 +5850,65 @@ GType publishing_flickr_publishing_options_pane_get_type (void) {
 }
 
 
-PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
+PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
 	PublishingFlickrUploader* self = NULL;
-	PublishingFlickrSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
 	SpitPublishingPublishable** _tmp1_;
 	gint _tmp1__length1;
 	PublishingFlickrPublishingParameters* _tmp2_;
 	PublishingFlickrPublishingParameters* _tmp3_;
 	gboolean _tmp4_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishables;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = strip_metadata;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata = _tmp4_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7588 "FlickrPublishing.c"
+#line 5871 "FlickrPublishing.c"
 }
 
 
-PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
+#line 741 "/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 7595 "FlickrPublishing.c"
+#line 5878 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add31 (gchar** * array, int* length, int* size, gchar* value) {
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add30 (gchar** * array, int* length, int* size, gchar* value) {
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 7606 "FlickrPublishing.c"
+#line 5889 "FlickrPublishing.c"
 	}
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7612 "FlickrPublishing.c"
+#line 5895 "FlickrPublishing.c"
 }
 
 
@@ -7647,25 +5926,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	GExiv2Metadata* _tmp32_;
 	gboolean _tmp33_;
 	GError * _inner_error_ = NULL;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishable;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7642 "FlickrPublishing.c"
+#line 5925 "FlickrPublishing.c"
 	}
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gexiv2_metadata_new ();
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishable_metadata = _tmp2_;
-#line 7648 "FlickrPublishing.c"
+#line 5931 "FlickrPublishing.c"
 	{
 		GExiv2Metadata* _tmp3_;
 		SpitPublishingPublishable* _tmp4_;
@@ -7673,27 +5952,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = publishable_metadata;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishable;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp6_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7676 "FlickrPublishing.c"
+#line 5959 "FlickrPublishing.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -7706,129 +5985,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = publishable;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:950: couldn't read metadata from file '%s' for u" \
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_warning ("FlickrPublishing.vala:757: couldn't read metadata from file '%s' for u" \
 "pload preprocessing.", _tmp13_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp11_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 7711 "FlickrPublishing.c"
+#line 5994 "FlickrPublishing.c"
 	}
 	__finally18:
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/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 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7724 "FlickrPublishing.c"
+#line 6007 "FlickrPublishing.c"
 	}
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishable_metadata;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp15_) {
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 7736 "FlickrPublishing.c"
+#line 6019 "FlickrPublishing.c"
 	}
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishable_metadata;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp17_) {
-#line 7744 "FlickrPublishing.c"
+#line 6027 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp18_;
 		GExiv2Metadata* _tmp19_;
 		gchar* _tmp20_;
 		gchar* _tmp21_;
 		gchar* _tmp22_;
 		gchar* _tmp23_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp18_ = publishable_metadata;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp19_ = publishable_metadata;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = _tmp20_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp23_);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp21_);
-#line 7769 "FlickrPublishing.c"
+#line 6052 "FlickrPublishing.c"
 	}
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = publishable_metadata;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp25_) {
-#line 7777 "FlickrPublishing.c"
+#line 6060 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp26_;
 		GExiv2Metadata* _tmp27_;
 		gchar* _tmp28_;
 		gchar* _tmp29_;
 		gchar* _tmp30_;
 		gchar* _tmp31_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = publishable_metadata;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = publishable_metadata;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp29_ = _tmp28_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp31_);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp29_);
-#line 7802 "FlickrPublishing.c"
+#line 6085 "FlickrPublishing.c"
 	}
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = publishable_metadata;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp33_) {
-#line 7810 "FlickrPublishing.c"
+#line 6093 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
 		GeeHashSet* _tmp34_;
 		gchar** iptc_keywords = NULL;
@@ -7868,179 +6147,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GExiv2Metadata* _tmp60_;
 		gchar** _tmp61_;
 		gint _tmp61__length1;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp35_ = publishable_metadata;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = _tmp37_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords_length1 = _vala_array_length (_tmp36_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_iptc_keywords_size_ = iptc_keywords_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38_ = iptc_keywords;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38__length1 = iptc_keywords_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 7870 "FlickrPublishing.c"
+#line 6153 "FlickrPublishing.c"
 			gchar** _tmp39_;
 			gint _tmp39__length1;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39_ = iptc_keywords;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39__length1 = iptc_keywords_length1;
-#line 7877 "FlickrPublishing.c"
+#line 6160 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp39_;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp39__length1;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 7889 "FlickrPublishing.c"
+#line 6172 "FlickrPublishing.c"
 					gchar* _tmp40_;
 					gchar* keyword = NULL;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 7896 "FlickrPublishing.c"
+#line 6179 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp41_;
 						const gchar* _tmp42_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp42_ = keyword;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 7908 "FlickrPublishing.c"
+#line 6191 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp43_ = publishable_metadata;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = _tmp45_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords_length1 = _vala_array_length (_tmp44_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_xmp_keywords_size_ = xmp_keywords_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46_ = xmp_keywords;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46__length1 = xmp_keywords_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp46_ != NULL) {
-#line 7929 "FlickrPublishing.c"
+#line 6212 "FlickrPublishing.c"
 			gchar** _tmp47_;
 			gint _tmp47__length1;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47_ = xmp_keywords;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47__length1 = xmp_keywords_length1;
-#line 7936 "FlickrPublishing.c"
+#line 6219 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp47_;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp47__length1;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 7948 "FlickrPublishing.c"
+#line 6231 "FlickrPublishing.c"
 					gchar* _tmp48_;
 					gchar* keyword = NULL;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp48_;
-#line 7955 "FlickrPublishing.c"
+#line 6238 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp49_;
 						const gchar* _tmp50_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp49_ = keyword_set;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp50_ = keyword;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 7967 "FlickrPublishing.c"
+#line 6250 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp51_ = keyword_set;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/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 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = _tmp53_;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords_length1 = _tmp52_;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_all_keywords_size_ = all_keywords_length1;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54_ = all_keywords;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54__length1 = all_keywords_length1;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_vala_array_add31 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp55_ = g_new0 (gchar*, 1 + 1);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = _tmp55_;
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords_length1 = 1;
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_no_keywords_size_ = no_keywords_length1;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_ = no_keywords;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56__length1 = no_keywords_length1;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp56_[0]);
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_[0] = NULL;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = _tmp56_[0];
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = publishable_metadata;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = all_keywords;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59__length1 = all_keywords_length1;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = publishable_metadata;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61_ = no_keywords;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61__length1 = no_keywords_length1;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 8022 "FlickrPublishing.c"
+#line 6305 "FlickrPublishing.c"
 		{
 			GExiv2Metadata* _tmp62_;
 			SpitPublishingPublishable* _tmp63_;
@@ -8048,27 +6327,27 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp65_;
 			gchar* _tmp66_;
 			gchar* _tmp67_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp62_ = publishable_metadata;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp63_ = publishable;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp65_ = _tmp64_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp66_ = g_file_get_path (_tmp65_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp67_ = _tmp66_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp67_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp65_);
-#line 1001 "/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 8050 "FlickrPublishing.c"
+#line 6333 "FlickrPublishing.c"
 				goto __catch19_g_error;
 			}
 		}
@@ -8081,69 +6360,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp70_;
 			gchar* _tmp71_;
 			gchar* _tmp72_;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp68_ = publishable;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp70_ = _tmp69_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp71_ = g_file_get_path (_tmp70_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp72_ = _tmp71_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_warning ("FlickrPublishing.vala:1003: couldn't write metadata to file '%s' for u" \
-"pload preprocessing.", _tmp72_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			g_warning ("FlickrPublishing.vala:810: couldn't write metadata to file '%s' for up" \
+"load preprocessing.", _tmp72_);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp72_);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp70_);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 8085 "FlickrPublishing.c"
+#line 6368 "FlickrPublishing.c"
 		}
 		__finally19:
-#line 1000 "/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 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (keyword_set);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (publishable_metadata);
-#line 1000 "/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 1000 "/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 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 8108 "FlickrPublishing.c"
+#line 6391 "FlickrPublishing.c"
 		}
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 8120 "FlickrPublishing.c"
+#line 6403 "FlickrPublishing.c"
 	}
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 8124 "FlickrPublishing.c"
+#line 6407 "FlickrPublishing.c"
 }
 
 
@@ -8153,79 +6432,79 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
 	SpitPublishingPublishable* _tmp0_;
 	SpitPublishingPublishable* _tmp1_;
 	PublishingRESTSupportSession* _tmp2_;
-	PublishingFlickrSession* _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp3_;
 	PublishingFlickrPublishingParameters* _tmp4_;
 	SpitPublishingPublishable* _tmp5_;
 	SpitPublishingPublishable* _tmp6_;
 	PublishingFlickrUploadTransaction* _tmp7_;
 	PublishingRESTSupportTransaction* _tmp8_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/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 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_preprocess_publishable (self, _tmp1_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->parameters;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/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 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp8_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8174 "FlickrPublishing.c"
+#line 6457 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_flickr_uploader_real_create_transaction;
-#line 8187 "FlickrPublishing.c"
+#line 6470 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 8194 "FlickrPublishing.c"
+#line 6477 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingFlickrUploader * self;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 8206 "FlickrPublishing.c"
+#line 6489 "FlickrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index 24b2b61..5a80284 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -59,7 +59,6 @@ internal const string SERVICE_NAME = "Flickr";
 internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
 internal const int ORIGINAL_SIZE = -1;
 internal const string EXPIRED_SESSION_ERROR_CODE = "98";
-internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
 
 internal enum UserKind {
     PRO,
@@ -96,7 +95,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private Spit.Publishing.ProgressCallback progress_reporter = null;
     private bool running = false;
     private bool was_started = false;
-    private Session session = null;
+    private Publishing.RESTSupport.OAuth1.Session session = null;
     private PublishingOptionsPane publishing_options_pane = null;
     private Spit.Publishing.Authenticator authenticator = null;
    
@@ -107,7 +106,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         debug("FlickrPublisher instantiated.");
         this.service = service;
         this.host = host;
-        this.session = new Session();
+        this.session = new Publishing.RESTSupport.OAuth1.Session(ENDPOINT_URL);
         this.parameters = new PublishingParameters();
         this.authenticator = Publishing.Authenticator.Factory.get_instance().create("flickr", host);
 
@@ -445,37 +444,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-internal class Transaction : Publishing.RESTSupport.Transaction {
-    public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
-        Publishing.RESTSupport.HttpMethod.POST) {
-        base(session, method);
-        
-        add_argument("oauth_nonce", session.get_oauth_nonce());
-        add_argument("oauth_signature_method", "HMAC-SHA1");
-        add_argument("oauth_version", "1.0");
-        add_argument("oauth_callback", "oob");
-        add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", session.get_consumer_key());
-    }
-    
-    public Transaction.with_uri(Session session, string uri,
-        Publishing.RESTSupport.HttpMethod method = Publishing.RESTSupport.HttpMethod.POST) {
-        base.with_endpoint_url(session, uri, method);
-
-        add_argument("oauth_nonce", session.get_oauth_nonce());
-        add_argument("oauth_signature_method", "HMAC-SHA1");
-        add_argument("oauth_version", "1.0");
-        add_argument("oauth_callback", "oob");
-        add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", session.get_consumer_key());
-    }
-
-    public override void execute() throws Spit.Publishing.PublishingError {
-        ((Session) get_parent_session()).sign_transaction(this);
-        
-        base.execute();
-    }
-
+namespace Transaction {
     public static string? validate_xml(Publishing.RESTSupport.XmlDocument doc) {
         Xml.Node* root = doc.get_root_node();
         string? status = root->get_prop("stat");
@@ -525,35 +494,22 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
     }
 }
 
-internal class AccountInfoFetchTransaction : Transaction {
-    public AccountInfoFetchTransaction(Session session) {
+internal class AccountInfoFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+    public AccountInfoFetchTransaction(Publishing.RESTSupport.OAuth1.Session session) {
         base(session, Publishing.RESTSupport.HttpMethod.GET);
         add_argument("method", "flickr.people.getUploadStatus");
-        add_argument("oauth_token", session.get_access_phase_token());
     }
 }
 
-private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
+private class UploadTransaction : Publishing.RESTSupport.OAuth1.UploadTransaction {
     private PublishingParameters parameters;
-    private Session session;
-    private Publishing.RESTSupport.Argument[] auth_header_fields;
 
-    public UploadTransaction(Session session, PublishingParameters parameters,
+    public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session, PublishingParameters parameters,
         Spit.Publishing.Publishable publishable) {
-        base.with_endpoint_url(session, publishable, "https://api.flickr.com/services/upload");
+        base(session, publishable, "https://api.flickr.com/services/upload");
 
         this.parameters = parameters;
-        this.session = session;
-        this.auth_header_fields = new Publishing.RESTSupport.Argument[0];
-
-        add_authorization_header_field("oauth_nonce", session.get_oauth_nonce());
-        add_authorization_header_field("oauth_signature_method", "HMAC-SHA1");
-        add_authorization_header_field("oauth_version", "1.0");
-        add_authorization_header_field("oauth_callback", "oob");
-        add_authorization_header_field("oauth_timestamp", session.get_oauth_timestamp());
-        add_authorization_header_field("oauth_consumer_key", session.get_consumer_key());
-        add_authorization_header_field("oauth_token", session.get_access_phase_token());
-        
+
         add_argument("is_public", ("%d".printf(parameters.visibility_specification.everyone_level)));
         add_argument("is_friend", ("%d".printf(parameters.visibility_specification.friends_level)));
         add_argument("is_family", ("%d".printf(parameters.visibility_specification.family_level)));
@@ -573,162 +529,13 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
 
         set_binary_disposition_table(disposition_table);
     }
-    
-    public void add_authorization_header_field(string key, string value) {
-        auth_header_fields += new Publishing.RESTSupport.Argument(key, value);
-    }
-    
-    public Publishing.RESTSupport.Argument[] get_authorization_header_fields() {
-        return auth_header_fields;
-    }
-    
-    public string get_authorization_header_string() {
-        string result = "OAuth ";
-        
-        for (int i = 0; i < auth_header_fields.length; i++) {
-            result += auth_header_fields[i].key;
-            result += "=";
-            result += ("\"" + auth_header_fields[i].value + "\"");
-            
-            if (i < auth_header_fields.length - 1)
-                result += ", ";
-        }
-        
-        return result;
-    }
-    
+
     public override void execute() throws Spit.Publishing.PublishingError {
-        session.sign_transaction(this);
-        
-        string authorization_header = get_authorization_header_string();
-        
-        debug("executing upload transaction: authorization header string = '%s'",
-            authorization_header);
-        add_header("Authorization", authorization_header);
-        
+        this.authorize();
         base.execute();
     }
 }
 
-internal class Session : Publishing.RESTSupport.Session {
-    private string? access_phase_token = null;
-    private string? access_phase_token_secret = null;
-    private string? username = null;
-    private string? consumer_key = null;
-    private string? consumer_secret = null;
-
-    public Session() {
-        base(ENDPOINT_URL);
-    }
-
-    public override bool is_authenticated() {
-        return (access_phase_token != null && access_phase_token_secret != null &&
-            username != null);
-    }
-
-    public void set_api_credentials(string consumer_key, string consumer_secret) {
-        this.consumer_key = consumer_key;
-        this.consumer_secret = consumer_secret;
-    }
-    
-    public void sign_transaction(Publishing.RESTSupport.Transaction txn) {
-        string http_method = txn.get_method().to_string();
-        
-        debug("signing transaction with parameters:");
-        debug("HTTP method = " + http_method);
-
-        Publishing.RESTSupport.Argument[] base_string_arguments = txn.get_arguments();
-
-        UploadTransaction? upload_txn = txn as UploadTransaction;
-        if (upload_txn != null) {
-            debug("this transaction is an UploadTransaction; including Authorization header " +
-                "fields in signature base string");
-            
-            Publishing.RESTSupport.Argument[] auth_header_args =
-                upload_txn.get_authorization_header_fields();
-
-            foreach (Publishing.RESTSupport.Argument arg in auth_header_args)
-                base_string_arguments += arg;
-        }
-        
-        Publishing.RESTSupport.Argument[] sorted_args =
-            Publishing.RESTSupport.Argument.sort(base_string_arguments);
-        
-        string arguments_string = "";
-        for (int i = 0; i < sorted_args.length; i++) {
-            arguments_string += (sorted_args[i].key + "=" + sorted_args[i].value);
-            if (i < sorted_args.length - 1)
-                arguments_string += "&";
-        }
-
-        string? signing_key = null;
-        if (access_phase_token_secret != null) {
-            debug("access phase token secret available; using it as signing key");
-
-            signing_key = consumer_secret + "&" + access_phase_token_secret;
-        } else {
-            debug("neither access phase nor request phase token secrets available; using API " +
-                "key as signing key");
-
-            signing_key = consumer_secret + "&";
-        }
-        
-        string signature_base_string = http_method + "&" + Soup.URI.encode(
-            txn.get_endpoint_url(), ENCODE_RFC_3986_EXTRA) + "&" +
-            Soup.URI.encode(arguments_string, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature base string = '%s'", signature_base_string);
-        
-        debug("signing key = '%s'", signing_key);
-
-        // compute the signature
-        string signature = RESTSupport.hmac_sha1(signing_key, signature_base_string);
-        signature = Soup.URI.encode(signature, ENCODE_RFC_3986_EXTRA);
-
-        debug("signature = '%s'", signature);
-
-        if (upload_txn != null)
-            upload_txn.add_authorization_header_field("oauth_signature", signature);
-        else
-            txn.add_argument("oauth_signature", signature);
-    }
-    
-    public void set_access_phase_credentials(string token, string secret, string username) {
-        this.access_phase_token = token;
-        this.access_phase_token_secret = secret;
-        this.username = username;
-        
-        authenticated();
-    }
-
-    public string get_oauth_nonce() {
-        TimeVal currtime = TimeVal();
-        currtime.get_current_time();
-        
-        return Checksum.compute_for_string(ChecksumType.MD5, currtime.tv_sec.to_string() +
-            currtime.tv_usec.to_string());
-    }
-    
-    public string get_oauth_timestamp() {
-        return GLib.get_real_time().to_string().substring(0, 10);
-    }
-
-    public string get_consumer_key() {
-        assert(consumer_key != null);
-        return consumer_key;
-    }
-
-    public string get_access_phase_token() {
-        assert(access_phase_token != null);
-        return access_phase_token;
-    }
-    
-    public string get_username() {
-        assert(is_authenticated());
-        return username;
-    }
-}
-
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private class SizeEntry {
         public string title;
@@ -931,7 +738,7 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
     private PublishingParameters parameters;
     private bool strip_metadata;
 
-    public Uploader(Session session, Spit.Publishing.Publishable[] publishables,
+    public Uploader(Publishing.RESTSupport.OAuth1.Session session, Spit.Publishing.Publishable[] publishables,
         PublishingParameters parameters, bool strip_metadata) {
         base(session, publishables);
         
@@ -1009,7 +816,7 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
     protected override Publishing.RESTSupport.Transaction create_transaction(
         Spit.Publishing.Publishable publishable) {
         preprocess_publishable(get_current_publishable());
-        return new UploadTransaction((Session) get_session(), parameters,
+        return new UploadTransaction((Publishing.RESTSupport.OAuth1.Session) get_session(), parameters,
             get_current_publishable());
     }
 }
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 286f53b..2c4cce2 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -372,8 +372,8 @@ GType publishing_picasa_album_get_type (void) G_GNUC_CONST;
 static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums_helper (PublishingPicasaPicasaPublisher* self, xmlNode* document_root, int* result_length1, GError** error);
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url);
 PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, const gchar* name, const gchar* url);
-static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
 static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
+static void _vala_array_add14 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value);
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id);
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata);
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name);
@@ -471,12 +471,12 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels);
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_construct (GType object_type, const gchar* name, gint major_axis_pixels);
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
-#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
 static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
+#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
+static void _vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublishingOptionsPane* self);
 static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
@@ -924,7 +924,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPub
 }
 
 
-static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -941,7 +941,7 @@ static void _vala_array_add12 (PublishingPicasaAlbum** * array, int* length, int
 }
 
 
-static void _vala_array_add13 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
+static void _vala_array_add14 (PublishingPicasaAlbum** * array, int* length, int* size, PublishingPicasaAlbum* value) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1052,7 +1052,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_picasa_album_new (_ ("Default album"), PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1052 "PicasaPublishing.c"
 	{
 		gboolean _tmp11_ = FALSE;
@@ -1233,7 +1233,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp38_ = publishing_picasa_album_new (_tmp36_, _tmp37_);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp38_);
+			_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp38_);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (url_val);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5003,7 +5003,7 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish
 }
 
 
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5020,7 +5020,7 @@ static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescript
 }
 
 
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5037,7 +5037,7 @@ static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescript
 }
 
 
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5054,7 +5054,7 @@ static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescript
 }
 
 
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5071,7 +5071,7 @@ static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescript
 }
 
 
-static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+static void _vala_array_add19 (PublishingPicasaPublishingOptionsPaneSizeDescription** * array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5128,7 +5128,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Small (640 × 480 pixels)"), 640);
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _result_;
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5136,7 +5136,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Medium (1024 × 768 pixels)"), 1024);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _result_;
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5144,7 +5144,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Recommended (1600 × 1200 pixels)"), 1600);
 #line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5152,7 +5152,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Google+ (2048 × 1536 pixels)"), 2048);
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _result_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5160,7 +5160,7 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_picasa_publishing_options_pane_size_description_new (_ ("Original Size"), PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _result_;
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index 2323b7f..ed0eee0 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -599,7 +599,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
 static const gchar* piwigo_service_real_get_id (SpitPluggable* base);
 static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base);
 static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup12 (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);
@@ -753,7 +753,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* txn);
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value);
+static void _vala_array_add38 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value);
 static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (PublishingPiwigoPiwigoPublisher* self);
 GType publishing_piwigo_publishing_options_pane_get_type (void) G_GNUC_CONST;
 PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled);
@@ -862,7 +862,7 @@ enum  {
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES_PROPERTY,
 	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT_PROPERTY
 };
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length);
+static PublishingPiwigoCategory** _vala_array_dup13 (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);
@@ -884,16 +884,16 @@ static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed
 static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
-static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
-static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
+static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add46 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add48 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
@@ -1058,7 +1058,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup12 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1145,7 +1145,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup10 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup12 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3472,7 +3472,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3473 "PiwigoPublishing.c"
-				goto __catch23_spit_publishing_publishing_error;
+				goto __catch28_spit_publishing_publishing_error;
 			}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
@@ -3485,8 +3485,8 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 3484 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally23;
-	__catch23_spit_publishing_publishing_error:
+	goto __finally28;
+	__catch28_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -3521,7 +3521,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		_g_error_free0 (err);
 #line 3521 "PiwigoPublishing.c"
 	}
-	__finally23:
+	__finally28:
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3735,7 +3735,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3736 "PiwigoPublishing.c"
-				goto __catch24_spit_publishing_publishing_error;
+				goto __catch29_spit_publishing_publishing_error;
 			}
 #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3746,8 +3746,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3745 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally24;
-	__catch24_spit_publishing_publishing_error:
+	goto __finally29;
+	__catch29_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3780,7 +3780,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 3781 "PiwigoPublishing.c"
-					goto __catch25_spit_publishing_publishing_error;
+					goto __catch30_spit_publishing_publishing_error;
 				}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
@@ -3793,8 +3793,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3792 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally25;
-		__catch25_spit_publishing_publishing_error:
+		goto __finally30;
+		__catch30_spit_publishing_publishing_error:
 		{
 			GError* code = NULL;
 			gint code_int = 0;
@@ -3837,7 +3837,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			_g_error_free0 (code);
 #line 3837 "PiwigoPublishing.c"
 		}
-		__finally25:
+		__finally30:
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3858,7 +3858,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		return;
 #line 3858 "PiwigoPublishing.c"
 	}
-	__finally24:
+	__finally29:
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4051,7 +4051,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4052 "PiwigoPublishing.c"
-					goto __catch26_spit_publishing_publishing_error;
+					goto __catch31_spit_publishing_publishing_error;
 				}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4064,8 +4064,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4063 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally26;
-		__catch26_spit_publishing_publishing_error:
+		goto __finally31;
+		__catch31_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp11_;
@@ -4084,7 +4084,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4083 "PiwigoPublishing.c"
 		}
-		__finally26:
+		__finally31:
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4132,7 +4132,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4132 "PiwigoPublishing.c"
-					goto __catch27_spit_publishing_publishing_error;
+					goto __catch32_spit_publishing_publishing_error;
 				}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4145,8 +4145,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4143 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally27;
-		__catch27_spit_publishing_publishing_error:
+		goto __finally32;
+		__catch32_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp17_;
@@ -4165,7 +4165,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4163 "PiwigoPublishing.c"
 		}
-		__finally27:
+		__finally32:
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4279,7 +4279,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4278 "PiwigoPublishing.c"
-					goto __catch28_spit_publishing_publishing_error;
+					goto __catch33_spit_publishing_publishing_error;
 				}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
@@ -4332,7 +4332,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4331 "PiwigoPublishing.c"
-						goto __catch29_spit_publishing_publishing_error;
+						goto __catch34_spit_publishing_publishing_error;
 					}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
@@ -4396,8 +4396,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_g_free0 (username);
 #line 4394 "PiwigoPublishing.c"
 			}
-			goto __finally29;
-			__catch29_spit_publishing_publishing_error:
+			goto __finally34;
+			__catch34_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
 				GError* _tmp35_;
@@ -4424,7 +4424,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				return;
 #line 4421 "PiwigoPublishing.c"
 			}
-			__finally29:
+			__finally34:
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4432,7 +4432,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4430 "PiwigoPublishing.c"
-					goto __catch28_spit_publishing_publishing_error;
+					goto __catch33_spit_publishing_publishing_error;
 				}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
@@ -4452,8 +4452,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 4449 "PiwigoPublishing.c"
 		}
-		goto __finally28;
-		__catch28_spit_publishing_publishing_error:
+		goto __finally33;
+		__catch33_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp36_;
@@ -4478,7 +4478,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			return;
 #line 4474 "PiwigoPublishing.c"
 		}
-		__finally28:
+		__finally33:
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4602,7 +4602,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4599 "PiwigoPublishing.c"
-				goto __catch30_spit_publishing_publishing_error;
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
@@ -4615,8 +4615,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 #line 4610 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally30;
-	__catch30_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -4634,7 +4634,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		_g_error_free0 (err);
 #line 4630 "PiwigoPublishing.c"
 	}
-	__finally30:
+	__finally35:
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4660,7 +4660,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
      * populates the categories list. It then triggers the display of the
      * publishing options pane.
      */
-static void _vala_array_add35 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void _vala_array_add38 (PublishingPiwigoCategory** * array, int* length, int* size, PublishingPiwigoCategory* value) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -4777,7 +4777,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4774 "PiwigoPublishing.c"
-				goto __catch31_spit_publishing_publishing_error;
+				goto __catch36_spit_publishing_publishing_error;
 			}
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4902,7 +4902,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4899 "PiwigoPublishing.c"
-						goto __catch31_spit_publishing_publishing_error;
+						goto __catch36_spit_publishing_publishing_error;
 					}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -4955,7 +4955,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 4952 "PiwigoPublishing.c"
-						goto __catch31_spit_publishing_publishing_error;
+						goto __catch36_spit_publishing_publishing_error;
 					}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -5036,7 +5036,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_vala_array_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
+				_vala_array_add38 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
 #line 5035 "PiwigoPublishing.c"
 			}
 		}
@@ -5240,8 +5240,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 5236 "PiwigoPublishing.c"
 	}
-	goto __finally31;
-	__catch31_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp82_;
@@ -5261,7 +5261,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		return;
 #line 5257 "PiwigoPublishing.c"
 	}
-	__finally31:
+	__finally36:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5450,7 +5450,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5446 "PiwigoPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
+				goto __catch37_spit_publishing_publishing_error;
 			}
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
@@ -5463,8 +5463,8 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 #line 5457 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
+	goto __finally37;
+	__catch37_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_;
@@ -5483,7 +5483,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		_g_error_free0 (err);
 #line 5477 "PiwigoPublishing.c"
 	}
-	__finally32:
+	__finally37:
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5808,7 +5808,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5802 "PiwigoPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
+				goto __catch38_spit_publishing_publishing_error;
 			}
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
@@ -5821,8 +5821,8 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 5813 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
+	goto __finally38;
+	__catch38_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp24_;
@@ -5840,7 +5840,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		_g_error_free0 (err);
 #line 5833 "PiwigoPublishing.c"
 	}
-	__finally33:
+	__finally38:
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -5935,7 +5935,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5929 "PiwigoPublishing.c"
-				goto __catch34_spit_publishing_publishing_error;
+				goto __catch39_spit_publishing_publishing_error;
 			}
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5966,7 +5966,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 5960 "PiwigoPublishing.c"
-				goto __catch34_spit_publishing_publishing_error;
+				goto __catch39_spit_publishing_publishing_error;
 			}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -6010,8 +6010,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 6003 "PiwigoPublishing.c"
 	}
-	goto __finally34;
-	__catch34_spit_publishing_publishing_error:
+	goto __finally39;
+	__catch39_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp23_;
@@ -6029,7 +6029,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_g_error_free0 (err);
 #line 6022 "PiwigoPublishing.c"
 	}
-	__finally34:
+	__finally39:
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8284,7 +8284,7 @@ static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
 }
 
 
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
+static PublishingPiwigoCategory** _vala_array_dup13 (PublishingPiwigoCategory** self, int length) {
 	PublishingPiwigoCategory** result;
 	int i;
 #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8350,7 +8350,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_dup11 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup13 (_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"
@@ -8697,7 +8697,7 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 }
 
 
-static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8714,7 +8714,7 @@ static void _vala_array_add36 (PublishingPiwigoPermissionLevel** * array, int* l
 }
 
 
-static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8731,7 +8731,7 @@ static void _vala_array_add37 (PublishingPiwigoPermissionLevel** * array, int* l
 }
 
 
-static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add41 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8748,7 +8748,7 @@ static void _vala_array_add38 (PublishingPiwigoPermissionLevel** * array, int* l
 }
 
 
-static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add42 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8765,7 +8765,7 @@ static void _vala_array_add39 (PublishingPiwigoPermissionLevel** * array, int* l
 }
 
 
-static void _vala_array_add40 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add43 (PublishingPiwigoPermissionLevel** * array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8822,7 +8822,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_permission_level_new (0, _ ("Everyone"));
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _result_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8830,7 +8830,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_permission_level_new (1, _ ("Admins, Family, Friends, Contacts"));
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _result_;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8838,7 +8838,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (2, _ ("Admins, Family, Friends"));
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8846,7 +8846,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_permission_level_new (4, _ ("Admins, Family"));
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _result_;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8854,7 +8854,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = publishing_piwigo_permission_level_new (8, _ ("Admins"));
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _result_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8873,7 +8873,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 }
 
 
-static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8890,7 +8890,7 @@ static void _vala_array_add41 (PublishingPiwigoSizeEntry** * array, int* length,
 }
 
 
-static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8907,7 +8907,7 @@ static void _vala_array_add42 (PublishingPiwigoSizeEntry** * array, int* length,
 }
 
 
-static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add46 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8924,7 +8924,7 @@ static void _vala_array_add43 (PublishingPiwigoSizeEntry** * array, int* length,
 }
 
 
-static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add47 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8941,7 +8941,7 @@ static void _vala_array_add44 (PublishingPiwigoSizeEntry** * array, int* length,
 }
 
 
-static void _vala_array_add45 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add48 (PublishingPiwigoSizeEntry** * array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8998,7 +8998,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_size_entry_new (500, _ ("500 × 375 pixels"));
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _result_;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9006,7 +9006,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_size_entry_new (1024, _ ("1024 × 768 pixels"));
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _result_;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9014,7 +9014,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (2048, _ ("2048 × 1536 pixels"));
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add46 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9022,7 +9022,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_size_entry_new (4096, _ ("4096 × 3072 pixels"));
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+	_vala_array_add47 (&_result_, &_result__length1, &__result__size_, _tmp8_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _result_;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9030,7 +9030,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _ ("Original size"));
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add48 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _result_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11583,7 +11583,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 11571 "PiwigoPublishing.c"
-				goto __catch35_spit_publishing_publishing_error;
+				goto __catch40_spit_publishing_publishing_error;
 			}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
@@ -11599,8 +11599,8 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		errcode = _tmp7_;
 #line 11586 "PiwigoPublishing.c"
 	}
-	goto __finally35;
-	__catch35_spit_publishing_publishing_error:
+	goto __finally40;
+	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_;
@@ -11620,7 +11620,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		return result;
 #line 11607 "PiwigoPublishing.c"
 	}
-	__finally35:
+	__finally40:
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11699,7 +11699,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 11687 "PiwigoPublishing.c"
-				goto __catch36_spit_publishing_publishing_error;
+				goto __catch41_spit_publishing_publishing_error;
 			}
 #line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11713,8 +11713,8 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		errcode = _tmp2_;
 #line 11700 "PiwigoPublishing.c"
 	}
-	goto __finally36;
-	__catch36_spit_publishing_publishing_error:
+	goto __finally41;
+	__catch41_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp6_;
@@ -11732,7 +11732,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		return result;
 #line 11719 "PiwigoPublishing.c"
 	}
-	__finally36:
+	__finally41:
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11791,7 +11791,11 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	PublishingPiwigoSession* _tmp0_;
 	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11811,28 +11815,40 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
 #line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_);
+	_tmp3_ = g_uri_escape_string (_tmp2_, NULL, TRUE);
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp4_);
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp4_);
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = password;
+	_tmp5_ = password;
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = g_uri_escape_string (_tmp5_, NULL, TRUE);
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = _tmp6_;
 #line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp7_);
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp7_);
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11807 "PiwigoPublishing.c"
+#line 11823 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
 #line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11814 "PiwigoPublishing.c"
+#line 11830 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11821 "PiwigoPublishing.c"
+#line 11837 "PiwigoPublishing.c"
 }
 
 
@@ -11865,7 +11881,7 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	_tmp4_ = other;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11854 "PiwigoPublishing.c"
+#line 11870 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportArgument** argument_collection = NULL;
 		gint argument_collection_length1 = 0;
@@ -11877,14 +11893,14 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 		argument_collection_length1 = _tmp5_;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11866 "PiwigoPublishing.c"
+#line 11882 "PiwigoPublishing.c"
 			PublishingRESTSupportArgument* _tmp7_;
 			PublishingRESTSupportArgument* argument = NULL;
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			argument = _tmp7_;
-#line 11873 "PiwigoPublishing.c"
+#line 11889 "PiwigoPublishing.c"
 			{
 				PublishingRESTSupportArgument* _tmp8_;
 				const gchar* _tmp9_;
@@ -11902,30 +11918,30 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_argument_unref0 (argument);
-#line 11891 "PiwigoPublishing.c"
+#line 11907 "PiwigoPublishing.c"
 			}
 		}
 #line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11896 "PiwigoPublishing.c"
+#line 11912 "PiwigoPublishing.c"
 	}
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11900 "PiwigoPublishing.c"
+#line 11916 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
 #line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11907 "PiwigoPublishing.c"
+#line 11923 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
 #line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11914 "PiwigoPublishing.c"
+#line 11930 "PiwigoPublishing.c"
 }
 
 
@@ -11989,14 +12005,14 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11978 "PiwigoPublishing.c"
+#line 11994 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
 #line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 11985 "PiwigoPublishing.c"
+#line 12001 "PiwigoPublishing.c"
 }
 
 
@@ -12013,21 +12029,21 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12002 "PiwigoPublishing.c"
+#line 12018 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
 #line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 12009 "PiwigoPublishing.c"
+#line 12025 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
 #line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12016 "PiwigoPublishing.c"
+#line 12032 "PiwigoPublishing.c"
 }
 
 
@@ -12065,21 +12081,21 @@ PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_l
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12054 "PiwigoPublishing.c"
+#line 12070 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
 #line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 12061 "PiwigoPublishing.c"
+#line 12077 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
 #line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12068 "PiwigoPublishing.c"
+#line 12084 "PiwigoPublishing.c"
 }
 
 
@@ -12115,21 +12131,21 @@ PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_trans
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12104 "PiwigoPublishing.c"
+#line 12120 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
 #line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 12111 "PiwigoPublishing.c"
+#line 12127 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
 #line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12118 "PiwigoPublishing.c"
+#line 12134 "PiwigoPublishing.c"
 }
 
 
@@ -12173,7 +12189,7 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 	_tmp2_ = parent_id;
 #line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != 0) {
-#line 12162 "PiwigoPublishing.c"
+#line 12178 "PiwigoPublishing.c"
 		gint _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -12187,37 +12203,37 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
 #line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 12176 "PiwigoPublishing.c"
+#line 12192 "PiwigoPublishing.c"
 	}
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = comment;
 #line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 12182 "PiwigoPublishing.c"
+#line 12198 "PiwigoPublishing.c"
 		const gchar* _tmp7_;
 #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = comment;
 #line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 12188 "PiwigoPublishing.c"
+#line 12204 "PiwigoPublishing.c"
 	}
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12192 "PiwigoPublishing.c"
+#line 12208 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
 #line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 12199 "PiwigoPublishing.c"
+#line 12215 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
 #line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 12206 "PiwigoPublishing.c"
+#line 12222 "PiwigoPublishing.c"
 }
 
 
@@ -12250,7 +12266,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 12239 "PiwigoPublishing.c"
+#line 12255 "PiwigoPublishing.c"
 	}
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -12260,7 +12276,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 12249 "PiwigoPublishing.c"
+#line 12265 "PiwigoPublishing.c"
 	} else {
 		gchar** _tmp4_;
 		gint _tmp4__length1;
@@ -12270,13 +12286,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 12259 "PiwigoPublishing.c"
+#line 12275 "PiwigoPublishing.c"
 	}
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 12265 "PiwigoPublishing.c"
+#line 12281 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_;
@@ -12287,7 +12303,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 12276 "PiwigoPublishing.c"
+#line 12292 "PiwigoPublishing.c"
 			gchar** _tmp7_;
 			gint _tmp7__length1;
 			const gchar* _tmp8_;
@@ -12299,19 +12315,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 12288 "PiwigoPublishing.c"
+#line 12304 "PiwigoPublishing.c"
 		} else {
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 12292 "PiwigoPublishing.c"
+#line 12308 "PiwigoPublishing.c"
 		}
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 12296 "PiwigoPublishing.c"
+#line 12312 "PiwigoPublishing.c"
 	}
 #line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 12300 "PiwigoPublishing.c"
+#line 12316 "PiwigoPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_;
@@ -12334,7 +12350,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_;
 #line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 12323 "PiwigoPublishing.c"
+#line 12339 "PiwigoPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12343,7 +12359,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12332 "PiwigoPublishing.c"
+#line 12348 "PiwigoPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_;
@@ -12356,13 +12372,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 12345 "PiwigoPublishing.c"
+#line 12361 "PiwigoPublishing.c"
 					gint _tmp10_;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 12351 "PiwigoPublishing.c"
+#line 12367 "PiwigoPublishing.c"
 				}
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -12372,7 +12388,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 12361 "PiwigoPublishing.c"
+#line 12377 "PiwigoPublishing.c"
 					gint _tmp14_;
 					gchar** _tmp15_;
 					gint _tmp15__length1;
@@ -12384,17 +12400,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 12373 "PiwigoPublishing.c"
+#line 12389 "PiwigoPublishing.c"
 				} else {
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 12377 "PiwigoPublishing.c"
+#line 12393 "PiwigoPublishing.c"
 				}
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 12383 "PiwigoPublishing.c"
+#line 12399 "PiwigoPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_;
@@ -12405,7 +12421,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 12394 "PiwigoPublishing.c"
+#line 12410 "PiwigoPublishing.c"
 						gchar** _tmp18_;
 						gint _tmp18__length1;
 						gint _tmp19_;
@@ -12420,21 +12436,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 12409 "PiwigoPublishing.c"
+#line 12425 "PiwigoPublishing.c"
 					} else {
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 12413 "PiwigoPublishing.c"
+#line 12429 "PiwigoPublishing.c"
 					}
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 12417 "PiwigoPublishing.c"
+#line 12433 "PiwigoPublishing.c"
 				}
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 12423 "PiwigoPublishing.c"
+#line 12439 "PiwigoPublishing.c"
 				}
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -12446,7 +12462,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 12435 "PiwigoPublishing.c"
+#line 12451 "PiwigoPublishing.c"
 					gchar** _tmp25_;
 					gint _tmp25__length1;
 					gint _tmp26_;
@@ -12467,24 +12483,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 12456 "PiwigoPublishing.c"
+#line 12472 "PiwigoPublishing.c"
 				} else {
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 12460 "PiwigoPublishing.c"
+#line 12476 "PiwigoPublishing.c"
 				}
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 12466 "PiwigoPublishing.c"
+#line 12482 "PiwigoPublishing.c"
 			}
 		}
 #line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 12473 "PiwigoPublishing.c"
+#line 12489 "PiwigoPublishing.c"
 			gchar* _tmp32_;
 #line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -12492,7 +12508,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 12481 "PiwigoPublishing.c"
+#line 12497 "PiwigoPublishing.c"
 		}
 #line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -12530,7 +12546,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 12519 "PiwigoPublishing.c"
+#line 12535 "PiwigoPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12539,7 +12555,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12528 "PiwigoPublishing.c"
+#line 12544 "PiwigoPublishing.c"
 				gint _tmp48_;
 				gchar** _tmp49_;
 				gint _tmp49__length1;
@@ -12555,13 +12571,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_;
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 12544 "PiwigoPublishing.c"
+#line 12560 "PiwigoPublishing.c"
 					gint _tmp47_;
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 12550 "PiwigoPublishing.c"
+#line 12566 "PiwigoPublishing.c"
 				}
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -12575,7 +12591,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 12564 "PiwigoPublishing.c"
+#line 12580 "PiwigoPublishing.c"
 				}
 #line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -12595,7 +12611,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 12584 "PiwigoPublishing.c"
+#line 12600 "PiwigoPublishing.c"
 					gchar** _tmp57_;
 					gint _tmp57__length1;
 					gint _tmp58_;
@@ -12610,11 +12626,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 12599 "PiwigoPublishing.c"
+#line 12615 "PiwigoPublishing.c"
 				} else {
 #line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 12603 "PiwigoPublishing.c"
+#line 12619 "PiwigoPublishing.c"
 				}
 #line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -12622,7 +12638,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 12611 "PiwigoPublishing.c"
+#line 12627 "PiwigoPublishing.c"
 			}
 		}
 #line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12633,7 +12649,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12622 "PiwigoPublishing.c"
+#line 12638 "PiwigoPublishing.c"
 	} else {
 		gchar* _tmp63_;
 #line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12642,7 +12658,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 12631 "PiwigoPublishing.c"
+#line 12647 "PiwigoPublishing.c"
 	}
 }
 
@@ -12650,7 +12666,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 static void _g_free0_ (gpointer var) {
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	var = (g_free (var), NULL);
-#line 12639 "PiwigoPublishing.c"
+#line 12655 "PiwigoPublishing.c"
 }
 
 
@@ -12753,7 +12769,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 12742 "PiwigoPublishing.c"
+#line 12758 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -12775,7 +12791,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 12764 "PiwigoPublishing.c"
+#line 12780 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
@@ -12805,7 +12821,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 12794 "PiwigoPublishing.c"
+#line 12810 "PiwigoPublishing.c"
 		gchar** _tmp19_;
 		gint _tmp19__length1;
 		gchar* _tmp20_;
@@ -12819,7 +12835,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 12808 "PiwigoPublishing.c"
+#line 12824 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
@@ -12868,18 +12884,18 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	if (_tmp37_ == NULL) {
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = TRUE;
-#line 12856 "PiwigoPublishing.c"
+#line 12872 "PiwigoPublishing.c"
 	} else {
 		const gchar* _tmp38_;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12863 "PiwigoPublishing.c"
+#line 12879 "PiwigoPublishing.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp36_) {
-#line 12867 "PiwigoPublishing.c"
+#line 12883 "PiwigoPublishing.c"
 		SpitPublishingPublishable* _tmp39_;
 		gchar* _tmp40_;
 		const gchar* _tmp41_;
@@ -12901,27 +12917,27 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp43_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp43_ != NULL) {
-#line 12889 "PiwigoPublishing.c"
+#line 12905 "PiwigoPublishing.c"
 			const gchar* _tmp44_;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = comment;
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = g_strcmp0 (_tmp44_, "") != 0;
-#line 12895 "PiwigoPublishing.c"
+#line 12911 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = FALSE;
-#line 12899 "PiwigoPublishing.c"
+#line 12915 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp42_) {
-#line 12903 "PiwigoPublishing.c"
+#line 12919 "PiwigoPublishing.c"
 			const gchar* _tmp45_;
 #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_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", _tmp45_);
-#line 12909 "PiwigoPublishing.c"
+#line 12925 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp46_ = FALSE;
@@ -12930,21 +12946,21 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp47_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp47_ != NULL) {
-#line 12918 "PiwigoPublishing.c"
+#line 12934 "PiwigoPublishing.c"
 			const gchar* _tmp48_;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp48_ = comment;
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = g_strcmp0 (_tmp48_, "") != 0;
-#line 12924 "PiwigoPublishing.c"
+#line 12940 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = FALSE;
-#line 12928 "PiwigoPublishing.c"
+#line 12944 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp46_) {
-#line 12932 "PiwigoPublishing.c"
+#line 12948 "PiwigoPublishing.c"
 			const gchar* _tmp49_;
 			const gchar* _tmp50_;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12955,7 +12971,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 			_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", _tmp50_);
-#line 12943 "PiwigoPublishing.c"
+#line 12959 "PiwigoPublishing.c"
 		} else {
 			PublishingPiwigoPublishingParameters* _tmp51_;
 			gboolean _tmp52_;
@@ -12965,20 +12981,20 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 			_tmp52_ = _tmp51_->title_as_comment;
 #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp52_) {
-#line 12953 "PiwigoPublishing.c"
+#line 12969 "PiwigoPublishing.c"
 				const gchar* _tmp53_;
 #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_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", _tmp53_);
-#line 12959 "PiwigoPublishing.c"
+#line 12975 "PiwigoPublishing.c"
 			} else {
 				const gchar* _tmp54_;
 #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_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", _tmp54_);
-#line 12966 "PiwigoPublishing.c"
+#line 12982 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -13018,19 +13034,19 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_tmp66_ = _tmp65_->no_upload_tags;
 #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp66_) {
-#line 13006 "PiwigoPublishing.c"
+#line 13022 "PiwigoPublishing.c"
 		const gchar* _tmp67_;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp67_ = tags;
 #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp67_, "") != 0) {
-#line 13012 "PiwigoPublishing.c"
+#line 13028 "PiwigoPublishing.c"
 			const gchar* _tmp68_;
 #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_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", _tmp68_);
-#line 13018 "PiwigoPublishing.c"
+#line 13034 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13061,7 +13077,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	_g_free0 (_tmp77_);
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp79_) {
-#line 13049 "PiwigoPublishing.c"
+#line 13065 "PiwigoPublishing.c"
 		const gchar* _tmp80_;
 		gchar* _tmp81_;
 		gchar* _tmp82_;
@@ -13078,15 +13094,15 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_tmp74_ = !_tmp83_;
 #line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp82_);
-#line 13066 "PiwigoPublishing.c"
+#line 13082 "PiwigoPublishing.c"
 	} else {
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp74_ = FALSE;
-#line 13070 "PiwigoPublishing.c"
+#line 13086 "PiwigoPublishing.c"
 	}
 #line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp74_) {
-#line 13074 "PiwigoPublishing.c"
+#line 13090 "PiwigoPublishing.c"
 		const gchar* _tmp84_;
 		gchar* _tmp85_;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13097,7 +13113,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 		_g_free0 (basename);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		basename = _tmp85_;
-#line 13085 "PiwigoPublishing.c"
+#line 13101 "PiwigoPublishing.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp86_ = disposition_table;
@@ -13135,14 +13151,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 13123 "PiwigoPublishing.c"
+#line 13139 "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 13130 "PiwigoPublishing.c"
+#line 13146 "PiwigoPublishing.c"
 }
 
 
@@ -13153,7 +13169,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 13141 "PiwigoPublishing.c"
+#line 13157 "PiwigoPublishing.c"
 }
 
 
@@ -13162,7 +13178,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 13150 "PiwigoPublishing.c"
+#line 13166 "PiwigoPublishing.c"
 }
 
 
@@ -13174,7 +13190,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 13162 "PiwigoPublishing.c"
+#line 13178 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 15d118b..fcd0aee 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1643,8 +1643,8 @@ internal class SessionLoginTransaction : Transaction {
         base.with_endpoint_url(session, url);
 
         add_argument("method", "pwg.session.login");
-        add_argument("username", username);
-        add_argument("password", password);
+        add_argument("username", Uri.escape_string(username));
+        add_argument("password", Uri.escape_string(password));
     }
 
     public SessionLoginTransaction.from_other (Session session, Transaction other) {
diff --git a/plugins/shotwell-publishing/TumblrPublishing.c b/plugins/shotwell-publishing/TumblrPublishing.c
new file mode 100644
index 0000000..0a3643f
--- /dev/null
+++ b/plugins/shotwell-publishing/TumblrPublishing.c
@@ -0,0 +1,5336 @@
+/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler
+ * generated from TumblrPublishing.vala, do not modify */
+
+/* Copyright 2012 BJA Electronics
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <shotwell-plugin-dev-1.0.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gio/gio.h>
+#include "shotwell-plugin-common.h"
+#include <glib/gi18n-lib.h>
+#include "shotwell-authenticator.h"
+#include <json-glib/json-glib.h>
+#include <gee.h>
+#include <float.h>
+#include <math.h>
+#include <gtk/gtk.h>
+#include <libsoup/soup.h>
+#include <glib/gstdio.h>
+#include <gobject/gvaluecollector.h>
+
+
+#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
+#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
+#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
+#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
+#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+
+typedef struct _TumblrService TumblrService;
+typedef struct _TumblrServiceClass TumblrServiceClass;
+typedef struct _TumblrServicePrivate TumblrServicePrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER (publishing_tumblr_tumblr_publisher_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
+#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
+#define PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherClass))
+
+typedef struct _PublishingTumblrTumblrPublisher PublishingTumblrTumblrPublisher;
+typedef struct _PublishingTumblrTumblrPublisherClass PublishingTumblrTumblrPublisherClass;
+
+#define PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY (publishing_tumblr_blog_entry_get_type ())
+#define PUBLISHING_TUMBLR_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry))
+#define PUBLISHING_TUMBLR_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
+#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
+#define PUBLISHING_TUMBLR_IS_BLOG_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY))
+#define PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntryClass))
+
+typedef struct _PublishingTumblrBlogEntry PublishingTumblrBlogEntry;
+typedef struct _PublishingTumblrBlogEntryClass PublishingTumblrBlogEntryClass;
+typedef struct _PublishingTumblrBlogEntryPrivate PublishingTumblrBlogEntryPrivate;
+typedef struct _PublishingTumblrParamSpecBlogEntry PublishingTumblrParamSpecBlogEntry;
+
+#define PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY (publishing_tumblr_size_entry_get_type ())
+#define PUBLISHING_TUMBLR_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry))
+#define PUBLISHING_TUMBLR_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
+#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
+#define PUBLISHING_TUMBLR_IS_SIZE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY))
+#define PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntryClass))
+
+typedef struct _PublishingTumblrSizeEntry PublishingTumblrSizeEntry;
+typedef struct _PublishingTumblrSizeEntryClass PublishingTumblrSizeEntryClass;
+typedef struct _PublishingTumblrSizeEntryPrivate PublishingTumblrSizeEntryPrivate;
+typedef struct _PublishingTumblrParamSpecSizeEntry PublishingTumblrParamSpecSizeEntry;
+typedef struct _PublishingTumblrTumblrPublisherPrivate PublishingTumblrTumblrPublisherPrivate;
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE (publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPaneClass))
+
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPane PublishingTumblrTumblrPublisherPublishingOptionsPane;
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass PublishingTumblrTumblrPublisherPublishingOptionsPaneClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION (publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransaction))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_USER_INFO_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction PublishingTumblrTumblrPublisherUserInfoFetchTransaction;
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass;
+#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_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define _json_object_unref0(var) ((var == NULL) ? NULL : (var = (json_object_unref (var), NULL)))
+#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
+#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER (publishing_tumblr_tumblr_publisher_uploader_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPublisherUploader;
+typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass;
+#define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
+typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
+#define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL)))
+#define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL)))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
+typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate;
+
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION (publishing_tumblr_tumblr_publisher_upload_transaction_get_type ())
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION))
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransactionClass))
+
+typedef struct _PublishingTumblrTumblrPublisherUploadTransaction PublishingTumblrTumblrPublisherUploadTransaction;
+typedef struct _PublishingTumblrTumblrPublisherUploadTransactionClass PublishingTumblrTumblrPublisherUploadTransactionClass;
+typedef struct _PublishingTumblrTumblrPublisherUploadTransactionPrivate PublishingTumblrTumblrPublisherUploadTransactionPrivate;
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
+typedef struct _PublishingTumblrTumblrPublisherUploaderPrivate PublishingTumblrTumblrPublisherUploaderPrivate;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _TumblrService {
+	GObject parent_instance;
+	TumblrServicePrivate * priv;
+};
+
+struct _TumblrServiceClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrBlogEntry {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingTumblrBlogEntryPrivate * priv;
+	gchar* blog;
+	gchar* url;
+};
+
+struct _PublishingTumblrBlogEntryClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingTumblrBlogEntry *self);
+};
+
+struct _PublishingTumblrParamSpecBlogEntry {
+	GParamSpec parent_instance;
+};
+
+struct _PublishingTumblrSizeEntry {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingTumblrSizeEntryPrivate * priv;
+	gchar* title;
+	gint size;
+};
+
+struct _PublishingTumblrSizeEntryClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingTumblrSizeEntry *self);
+};
+
+struct _PublishingTumblrParamSpecSizeEntry {
+	GParamSpec parent_instance;
+};
+
+struct _PublishingTumblrTumblrPublisher {
+	GObject parent_instance;
+	PublishingTumblrTumblrPublisherPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherPrivate {
+	SpitPublishingService* service;
+	SpitPublishingPluginHost* host;
+	SpitPublishingProgressCallback progress_reporter;
+	gpointer progress_reporter_target;
+	GDestroyNotify progress_reporter_target_destroy_notify;
+	gboolean running;
+	gboolean was_started;
+	PublishingRESTSupportOAuth1Session* session;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane;
+	PublishingTumblrSizeEntry** sizes;
+	gint sizes_length1;
+	gint _sizes_size_;
+	PublishingTumblrBlogEntry** blogs;
+	gint blogs_length1;
+	gint _blogs_size_;
+	gchar* username;
+	SpitPublishingAuthenticator* authenticator;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPane {
+	GObject parent_instance;
+	PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPaneClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate {
+	GtkBuilder* builder;
+	GtkBox* pane_widget;
+	GtkLabel* upload_info_label;
+	GtkLabel* size_label;
+	GtkLabel* blog_label;
+	GtkButton* logout_button;
+	GtkButton* publish_button;
+	GtkComboBoxText* size_combo;
+	GtkComboBoxText* blog_combo;
+	PublishingTumblrSizeEntry** sizes;
+	gint sizes_length1;
+	gint _sizes_size_;
+	PublishingTumblrBlogEntry** blogs;
+	gint blogs_length1;
+	gint _blogs_size_;
+	gchar* username;
+	PublishingTumblrTumblrPublisher* publisher;
+	SpitPublishingPublisherMediaType media_type;
+};
+
+struct _PublishingTumblrTumblrPublisherUserInfoFetchTransaction {
+	PublishingRESTSupportOAuth1Transaction parent_instance;
+	PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass {
+	PublishingRESTSupportOAuth1TransactionClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploadTransaction {
+	PublishingRESTSupportOAuth1UploadTransaction parent_instance;
+	PublishingTumblrTumblrPublisherUploadTransactionPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUploadTransactionClass {
+	PublishingRESTSupportOAuth1UploadTransactionClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploader {
+	PublishingRESTSupportBatchUploader parent_instance;
+	PublishingTumblrTumblrPublisherUploaderPrivate * priv;
+};
+
+struct _PublishingTumblrTumblrPublisherUploaderClass {
+	PublishingRESTSupportBatchUploaderClass parent_class;
+};
+
+struct _PublishingTumblrTumblrPublisherUploaderPrivate {
+	gchar* blog_url;
+};
+
+
+static gpointer tumblr_service_parent_class = NULL;
+static GdkPixbuf** tumblr_service_icon_pixbuf_set;
+static gint tumblr_service_icon_pixbuf_set_length1;
+static GdkPixbuf** tumblr_service_icon_pixbuf_set = NULL;
+static gint tumblr_service_icon_pixbuf_set_length1 = 0;
+static gint _tumblr_service_icon_pixbuf_set_size_ = 0;
+static SpitPluggableIface * tumblr_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * tumblr_service_spit_publishing_service_parent_iface = NULL;
+static gpointer publishing_tumblr_blog_entry_parent_class = NULL;
+static gpointer publishing_tumblr_size_entry_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = NULL;
+static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL;
+static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
+
+GType tumblr_service_get_type (void) G_GNUC_CONST;
+enum  {
+	TUMBLR_SERVICE_DUMMY_PROPERTY
+};
+#define TUMBLR_SERVICE_ICON_FILENAME "tumblr.png"
+TumblrService* tumblr_service_new (GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
+static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface);
+static const gchar* tumblr_service_real_get_id (SpitPluggable* base);
+static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base);
+static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length);
+static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled);
+static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
+GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
+static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
+static void tumblr_service_finalize (GObject * obj);
+#define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr"
+#define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
+#define PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
+#define PUBLISHING_TUMBLR_ORIGINAL_SIZE -1
+gpointer publishing_tumblr_blog_entry_ref (gpointer instance);
+void publishing_tumblr_blog_entry_unref (gpointer instance);
+GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object);
+void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object);
+gpointer publishing_tumblr_value_get_blog_entry (const GValue* value);
+GType publishing_tumblr_blog_entry_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_TUMBLR_BLOG_ENTRY_DUMMY_PROPERTY
+};
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url);
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url);
+static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj);
+gpointer publishing_tumblr_size_entry_ref (gpointer instance);
+void publishing_tumblr_size_entry_unref (gpointer instance);
+GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object);
+void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object);
+gpointer publishing_tumblr_value_get_size_entry (const GValue* value);
+GType publishing_tumblr_size_entry_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_TUMBLR_SIZE_ENTRY_DUMMY_PROPERTY
+};
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size);
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
+static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj);
+GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_DUMMY_PROPERTY
+};
+static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1);
+static void _vala_array_add31 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static void _vala_array_add32 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static void _vala_array_add33 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1);
+static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base);
+SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self);
+static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base);
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size);
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog);
+static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self);
+GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) G_GNUC_CONST;
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session);
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
+static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self);
+static void _vala_array_add34 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self);
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self);
+static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self);
+gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b);
+static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) G_GNUC_CONST;
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
+static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
+static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
+static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction);
+static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
+static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self);
+void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self);
+static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base);
+static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base);
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
+};
+static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self, int length);
+static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self, int length);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self);
+static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
+static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_USER_INFO_FETCH_TRANSACTION_DUMMY_PROPERTY
+};
+GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_DUMMY_PROPERTY
+};
+static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
+static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+#define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY
+};
+static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
+static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
+static void publishing_tumblr_tumblr_publisher_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);
+
+
+TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
+	TumblrService * self = NULL;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (TumblrService*) g_object_new (object_type, NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = tumblr_service_icon_pixbuf_set;
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 462 "TumblrPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_);
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set = (_vala_array_free (tumblr_service_icon_pixbuf_set, tumblr_service_icon_pixbuf_set_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set = _tmp2_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
+#line 475 "TumblrPublishing.c"
+	}
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 479 "TumblrPublishing.c"
+}
+
+
+TumblrService* tumblr_service_new (GFile* resource_directory) {
+#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
+#line 486 "TumblrPublishing.c"
+}
+
+
+static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
+	TumblrService * self;
+	gint result = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = min_host_interface;
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = max_host_interface;
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = spit_negotiate_interfaces (_tmp0_, _tmp1_, SPIT_PUBLISHING_CURRENT_INTERFACE);
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp2_;
+#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 508 "TumblrPublishing.c"
+}
+
+
+static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
+	TumblrService * self;
+	const gchar* result = NULL;
+#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = "org.yorba.shotwell.publishing.tumblr";
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 521 "TumblrPublishing.c"
+}
+
+
+static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base) {
+	TumblrService * self;
+	const gchar* result = NULL;
+#line 29 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = "Tumblr";
+#line 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 534 "TumblrPublishing.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 541 "TumblrPublishing.c"
+}
+
+
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length) {
+	GdkPixbuf** result;
+	int i;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (GdkPixbuf*, length + 1);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 552 "TumblrPublishing.c"
+		GdkPixbuf* _tmp0_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _g_object_ref0 (self[i]);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 558 "TumblrPublishing.c"
+	}
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 562 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
+	TumblrService * self;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (info != NULL);
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("Jeroen Arnoldus");
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).authors);
+#line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).authors = _tmp0_;
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics"));
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).copyright);
+#line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).copyright = _tmp1_;
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).translators);
+#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).translators = _tmp2_;
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = g_strdup (_VERSION);
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).version);
+#line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).version = _tmp3_;
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).website_name);
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).website_name = _tmp4_;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).website_url);
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).website_url = _tmp5_;
+#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).is_license_wordwrapped = FALSE;
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 ((*info).license);
+#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).license = _tmp6_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = tumblr_service_icon_pixbuf_set;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup8 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8__length1 = _tmp7__length1;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons = _tmp8_;
+#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*info).icons_length1 = _tmp8__length1;
+#line 641 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_real_activation (SpitPluggable* base, gboolean enabled) {
+	TumblrService * self;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 649 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
+	TumblrService * self;
+	SpitPublishingPublisher* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingTumblrTumblrPublisher* _tmp1_;
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = host;
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = publishing_tumblr_tumblr_publisher_new (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService), _tmp0_);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
+#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 670 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base) {
+	TumblrService * self;
+	SpitPublishingPublisherMediaType result = 0;
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 683 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_class_init (TumblrServiceClass * klass) {
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
+#line 692 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * iface) {
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
+#line 709 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_spit_publishing_service_interface_init (SpitPublishingServiceIface * iface) {
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
+#line 720 "TumblrPublishing.c"
+}
+
+
+static void tumblr_service_instance_init (TumblrService * self) {
+}
+
+
+static void tumblr_service_finalize (GObject * obj) {
+	TumblrService * self;
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
+#line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
+#line 734 "TumblrPublishing.c"
+}
+
+
+GType tumblr_service_get_type (void) {
+	static volatile gsize tumblr_service_type_id__volatile = 0;
+	if (g_once_init_enter (&tumblr_service_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (TumblrServiceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) tumblr_service_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TumblrService), 0, (GInstanceInitFunc) tumblr_service_instance_init, NULL };
+		static const GInterfaceInfo spit_pluggable_info = { (GInterfaceInitFunc) tumblr_service_spit_pluggable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		static const GInterfaceInfo spit_publishing_service_info = { (GInterfaceInitFunc) tumblr_service_spit_publishing_service_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType tumblr_service_type_id;
+		tumblr_service_type_id = g_type_register_static (G_TYPE_OBJECT, "TumblrService", &g_define_type_info, 0);
+		g_type_add_interface_static (tumblr_service_type_id, SPIT_TYPE_PLUGGABLE, &spit_pluggable_info);
+		g_type_add_interface_static (tumblr_service_type_id, SPIT_PUBLISHING_TYPE_SERVICE, &spit_publishing_service_info);
+		g_once_init_leave (&tumblr_service_type_id__volatile, tumblr_service_type_id);
+	}
+	return tumblr_service_type_id__volatile;
+}
+
+
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) {
+	PublishingTumblrBlogEntry* self = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_blog != NULL, NULL);
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_url != NULL, NULL);
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrBlogEntry*) g_type_create_instance (object_type);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = creator_blog;
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->blog);
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->blog = _tmp1_;
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = creator_url;
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->url);
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->url = _tmp3_;
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 784 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) {
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
+#line 791 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_value_blog_entry_init (GValue* value) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	value->data[0].v_pointer = NULL;
+#line 798 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
+#line 807 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (src_value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
+#line 817 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 821 "TumblrPublishing.c"
+	}
+}
+
+
+static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 829 "TumblrPublishing.c"
+}
+
+
+static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (collect_values[0].v_pointer) {
+#line 836 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry * object;
+		object = collect_values[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 843 "TumblrPublishing.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 847 "TumblrPublishing.c"
+		}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
+#line 851 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 855 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 859 "TumblrPublishing.c"
+}
+
+
+static gchar* publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	PublishingTumblrBlogEntry ** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!object_p) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 870 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!value->data[0].v_pointer) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = NULL;
+#line 876 "TumblrPublishing.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = value->data[0].v_pointer;
+#line 880 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
+#line 884 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 888 "TumblrPublishing.c"
+}
+
+
+GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	PublishingTumblrParamSpecBlogEntry* spec;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return G_PARAM_SPEC (spec);
+#line 902 "TumblrPublishing.c"
+}
+
+
+gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 911 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
+	PublishingTumblrBlogEntry * old;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
+#line 931 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 935 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (old);
+#line 941 "TumblrPublishing.c"
+	}
+}
+
+
+void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
+	PublishingTumblrBlogEntry * old;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 960 "TumblrPublishing.c"
+	} else {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 964 "TumblrPublishing.c"
+	}
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_blog_entry_unref (old);
+#line 970 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryClass * klass) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
+#line 980 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->ref_count = 1;
+#line 987 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) {
+	PublishingTumblrBlogEntry * self;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_destroy (self);
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->blog);
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->url);
+#line 1001 "TumblrPublishing.c"
+}
+
+
+GType publishing_tumblr_blog_entry_get_type (void) {
+	static volatile gsize publishing_tumblr_blog_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_blog_entry_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_blog_entry_init, publishing_tumblr_value_blog_entry_free_value, publishing_tumblr_value_blog_entry_copy_value, publishing_tumblr_value_blog_entry_peek_pointer, "p", publishing_tumblr_value_blog_entry_collect_value, "p", publishing_tumblr_value_blog_entry_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrBlogEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_blog_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrBlogEntry), 0, (GInstanceInitFunc) publishing_tumblr_blog_entry_instance_init, &g_define_type_value_table };
+		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		GType publishing_tumblr_blog_entry_type_id;
+		publishing_tumblr_blog_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrBlogEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&publishing_tumblr_blog_entry_type_id__volatile, publishing_tumblr_blog_entry_type_id);
+	}
+	return publishing_tumblr_blog_entry_type_id__volatile;
+}
+
+
+gpointer publishing_tumblr_blog_entry_ref (gpointer instance) {
+	PublishingTumblrBlogEntry * self;
+	self = instance;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return instance;
+#line 1026 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_blog_entry_unref (gpointer instance) {
+	PublishingTumblrBlogEntry * self;
+	self = instance;
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1039 "TumblrPublishing.c"
+	}
+}
+
+
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
+	PublishingTumblrSizeEntry* self = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (creator_title != NULL, NULL);
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrSizeEntry*) g_type_create_instance (object_type);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = creator_title;
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->title);
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->title = _tmp1_;
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = creator_size;
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->size = _tmp2_;
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 1067 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) {
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
+#line 1074 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_value_size_entry_init (GValue* value) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	value->data[0].v_pointer = NULL;
+#line 1081 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
+#line 1090 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (src_value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
+#line 1100 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 1104 "TumblrPublishing.c"
+	}
+}
+
+
+static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 1112 "TumblrPublishing.c"
+}
+
+
+static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (collect_values[0].v_pointer) {
+#line 1119 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry * object;
+		object = collect_values[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1126 "TumblrPublishing.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.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 1130 "TumblrPublishing.c"
+		}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
+#line 1134 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1138 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1142 "TumblrPublishing.c"
+}
+
+
+static gchar* publishing_tumblr_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	PublishingTumblrSizeEntry ** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!object_p) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1153 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!value->data[0].v_pointer) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = NULL;
+#line 1159 "TumblrPublishing.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = value->data[0].v_pointer;
+#line 1163 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
+#line 1167 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return NULL;
+#line 1171 "TumblrPublishing.c"
+}
+
+
+GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	PublishingTumblrParamSpecSizeEntry* spec;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return G_PARAM_SPEC (spec);
+#line 1185 "TumblrPublishing.c"
+}
+
+
+gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return value->data[0].v_pointer;
+#line 1194 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
+	PublishingTumblrSizeEntry * old;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
+#line 1214 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1218 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (old);
+#line 1224 "TumblrPublishing.c"
+	}
+}
+
+
+void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
+	PublishingTumblrSizeEntry * old;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	old = value->data[0].v_pointer;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (v_object) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = v_object;
+#line 1243 "TumblrPublishing.c"
+	} else {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		value->data[0].v_pointer = NULL;
+#line 1247 "TumblrPublishing.c"
+	}
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (old) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_size_entry_unref (old);
+#line 1253 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryClass * klass) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
+#line 1263 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->ref_count = 1;
+#line 1270 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) {
+	PublishingTumblrSizeEntry * self;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_destroy (self);
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->title);
+#line 1282 "TumblrPublishing.c"
+}
+
+
+GType publishing_tumblr_size_entry_get_type (void) {
+	static volatile gsize publishing_tumblr_size_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_size_entry_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { publishing_tumblr_value_size_entry_init, publishing_tumblr_value_size_entry_free_value, publishing_tumblr_value_size_entry_copy_value, publishing_tumblr_value_size_entry_peek_pointer, "p", publishing_tumblr_value_size_entry_collect_value, "p", publishing_tumblr_value_size_entry_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrSizeEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_size_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrSizeEntry), 0, (GInstanceInitFunc) publishing_tumblr_size_entry_instance_init, &g_define_type_value_table };
+		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		GType publishing_tumblr_size_entry_type_id;
+		publishing_tumblr_size_entry_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingTumblrSizeEntry", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&publishing_tumblr_size_entry_type_id__volatile, publishing_tumblr_size_entry_type_id);
+	}
+	return publishing_tumblr_size_entry_type_id__volatile;
+}
+
+
+gpointer publishing_tumblr_size_entry_ref (gpointer instance) {
+	PublishingTumblrSizeEntry * self;
+	self = instance;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return instance;
+#line 1307 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_size_entry_unref (gpointer instance) {
+	PublishingTumblrSizeEntry * self;
+	self = instance;
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1320 "TumblrPublishing.c"
+	}
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_authenticator_authenticated ((PublishingTumblrTumblrPublisher*) self);
+#line 1328 "TumblrPublishing.c"
+}
+
+
+static void _vala_array_add31 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1339 "TumblrPublishing.c"
+	}
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1345 "TumblrPublishing.c"
+}
+
+
+static void _vala_array_add32 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1356 "TumblrPublishing.c"
+	}
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1362 "TumblrPublishing.c"
+}
+
+
+static void _vala_array_add33 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
+#line 1373 "TumblrPublishing.c"
+	}
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 1379 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1) {
+	PublishingTumblrSizeEntry** result = NULL;
+	PublishingTumblrSizeEntry** _result_ = NULL;
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrSizeEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingTumblrSizeEntry* _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrSizeEntry* _tmp4_;
+	PublishingTumblrSizeEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingTumblrSizeEntry* _tmp6_;
+	PublishingTumblrSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_new0 (PublishingTumblrSizeEntry*, 0 + 1);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result_ = _tmp0_;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result__length1 = 0;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	__result__size_ = _result__length1;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _result_;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__length1 = _result__length1;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500);
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _result_;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__length1 = _result__length1;
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _result_;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5__length1 = _result__length1;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = _result_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7__length1 = _result__length1;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (result_length1) {
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*result_length1 = _tmp7__length1;
+#line 1442 "TumblrPublishing.c"
+	}
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp7_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1448 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1) {
+	PublishingTumblrBlogEntry** result = NULL;
+	PublishingTumblrBlogEntry** _result_ = NULL;
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrBlogEntry** _tmp1_;
+	gint _tmp1__length1;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_new0 (PublishingTumblrBlogEntry*, 0 + 1);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result_ = _tmp0_;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_result__length1 = 0;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	__result__size_ = _result__length1;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _result_;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__length1 = _result__length1;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (result_length1) {
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*result_length1 = _tmp1__length1;
+#line 1478 "TumblrPublishing.c"
+	}
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1484 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
+	PublishingTumblrTumblrPublisher * self = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingRESTSupportOAuth1Session* _tmp4_;
+	gint _tmp5_;
+	PublishingTumblrSizeEntry** _tmp6_;
+	gint _tmp7_;
+	PublishingTumblrBlogEntry** _tmp8_;
+	PublishingAuthenticatorFactory* _tmp9_;
+	PublishingAuthenticatorFactory* _tmp10_;
+	SpitPublishingPluginHost* _tmp11_;
+	SpitPublishingAuthenticator* _tmp12_;
+	SpitPublishingAuthenticator* _tmp13_;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisher*) g_object_new (object_type, NULL);
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:123: TumblrPublisher instantiated.");
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = service;
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->service);
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->service = _tmp1_;
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = host;
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->host);
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->host = _tmp3_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = publishing_rest_support_oauth1_session_new (PUBLISHING_TUMBLR_ENDPOINT_URL);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->session = _tmp4_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_tumblr_tumblr_publisher_create_sizes (self, &_tmp5_);
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = _tmp6_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = _tmp5_;
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = publishing_tumblr_tumblr_publisher_create_blogs (self, &_tmp7_);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = _tmp8_;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = _tmp7_;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = publishing_authenticator_factory_get_instance ();
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = _tmp9_;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp11_ = host;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "tumblr", _tmp11_);
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->authenticator = _tmp12_;
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (_tmp10_);
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp13_ = self->priv->authenticator;
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (_tmp13_, "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 1574 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
+#line 1581 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
+	PublishingTumblrTumblrPublisher * self;
+	SpitPublishingService* result = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->service;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1600 "TumblrPublishing.c"
+}
+
+
+SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
+	SpitPublishingPluginHost* result = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1618 "TumblrPublishing.c"
+}
+
+
+static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
+	PublishingTumblrTumblrPublisher * self;
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->running;
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp0_;
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1634 "TumblrPublishing.c"
+}
+
+
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
+	gint result = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 1);
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1652 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = size;
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
+#line 1667 "TumblrPublishing.c"
+}
+
+
+gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
+	gint result = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", 0);
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 1685 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = blog;
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_);
+#line 1700 "TumblrPublishing.c"
+}
+
+
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 1707 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_authenticator_authenticated (PublishingTumblrTumblrPublisher* self) {
+	gboolean _tmp0_;
+	GHashTable* params = NULL;
+	SpitPublishingAuthenticator* _tmp1_;
+	GHashTable* _tmp2_;
+	GVariant* consumer_key = NULL;
+	GVariant* consumer_secret = NULL;
+	GVariant* auth_token = NULL;
+	GVariant* auth_token_secret = NULL;
+	GHashTable* _tmp3_;
+	gconstpointer _tmp4_ = NULL;
+	GVariant* _tmp5_;
+	GHashTable* _tmp6_;
+	gconstpointer _tmp7_ = NULL;
+	GVariant* _tmp8_;
+	PublishingRESTSupportOAuth1Session* _tmp9_;
+	GVariant* _tmp10_;
+	const gchar* _tmp11_;
+	GVariant* _tmp12_;
+	const gchar* _tmp13_;
+	GHashTable* _tmp14_;
+	gconstpointer _tmp15_ = NULL;
+	GVariant* _tmp16_;
+	GHashTable* _tmp17_;
+	gconstpointer _tmp18_ = NULL;
+	GVariant* _tmp19_;
+	PublishingRESTSupportOAuth1Session* _tmp20_;
+	GVariant* _tmp21_;
+	const gchar* _tmp22_;
+	GVariant* _tmp23_;
+	const gchar* _tmp24_;
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp0_) {
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 1750 "TumblrPublishing.c"
+	}
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:174: EVENT: a fully authenticated session has be" \
+"come available");
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = spit_publishing_authenticator_get_authentication_parameter (_tmp1_);
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	params = _tmp2_;
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_key = NULL;
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_secret = NULL;
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token = NULL;
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token_secret = NULL;
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = params;
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp3_, "ConsumerKey", NULL, &_tmp4_);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _g_variant_ref0 (_tmp4_);
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_key = _tmp5_;
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = params;
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp6_, "ConsumerSecret", NULL, &_tmp7_);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = _g_variant_ref0 (_tmp7_);
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	consumer_secret = _tmp8_;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = self->priv->session;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = consumer_key;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp11_ = g_variant_get_string (_tmp10_, NULL);
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12_ = consumer_secret;
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp13_ = g_variant_get_string (_tmp12_, NULL);
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_api_credentials (_tmp9_, _tmp11_, _tmp13_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp14_ = params;
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp14_, "AuthToken", NULL, &_tmp15_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp16_ = _g_variant_ref0 (_tmp15_);
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token = _tmp16_;
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp17_ = params;
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_hash_table_lookup_extended (_tmp17_, "AuthTokenSecret", NULL, &_tmp18_);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp19_ = _g_variant_ref0 (_tmp18_);
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	auth_token_secret = _tmp19_;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp20_ = self->priv->session;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp21_ = auth_token;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp22_ = g_variant_get_string (_tmp21_, NULL);
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp23_ = auth_token_secret;
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp24_ = g_variant_get_string (_tmp23_, NULL);
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_set_access_phase_credentials (_tmp20_, _tmp22_, _tmp24_, "");
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token_secret);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (auth_token);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_secret);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_variant_unref0 (consumer_key);
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_hash_table_unref0 (params);
+#line 1844 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
+#line 1851 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
+#line 1858 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
+	GError * _inner_error_ = NULL;
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:196: ACTION: obtain all blogs of the tumblr user");
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->session;
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (_tmp0_);
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	txn = _tmp1_;
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 1881 "TumblrPublishing.c"
+	{
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 1889 "TumblrPublishing.c"
+				goto __catch20_spit_publishing_publishing_error;
+			}
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_publishing_rest_support_transaction_unref0 (txn);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 1900 "TumblrPublishing.c"
+		}
+	}
+	goto __finally20;
+	__catch20_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		err = _inner_error_;
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = self->priv->host;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = err;
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (err);
+#line 1921 "TumblrPublishing.c"
+	}
+	__finally20:
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 1934 "TumblrPublishing.c"
+	}
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 1938 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingRESTSupportTransaction* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = txn;
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = txn;
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp4_) {
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 1976 "TumblrPublishing.c"
+	}
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = txn;
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = _tmp6_;
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:218: EVENT: user info request transaction comple" \
+"ted; response = '%s'", _tmp7_);
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp7_);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = txn;
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = _tmp9_;
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (self, _tmp10_);
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp10_);
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
+#line 2000 "TumblrPublishing.c"
+}
+
+
+static gpointer _json_object_ref0 (gpointer self) {
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? json_object_ref (self) : NULL;
+#line 2007 "TumblrPublishing.c"
+}
+
+
+static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (old != NULL, NULL);
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (replacement != NULL, NULL);
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 2026 "TumblrPublishing.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 2033 "TumblrPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 2039 "TumblrPublishing.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 2049 "TumblrPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2053 "TumblrPublishing.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 2061 "TumblrPublishing.c"
+	}
+	{
+		GRegex* regex = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 2093 "TumblrPublishing.c"
+				goto __catch22_g_regex_error;
+			}
+#line 1412 "/usr/share/vala-0.36/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 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			return NULL;
+#line 2102 "TumblrPublishing.c"
+		}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 2118 "TumblrPublishing.c"
+				goto __catch22_g_regex_error;
+			}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/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 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			return NULL;
+#line 2129 "TumblrPublishing.c"
+		}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 2143 "TumblrPublishing.c"
+	}
+	goto __finally22;
+	__catch22_g_regex_error:
+	{
+		GError* e = NULL;
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		e = _inner_error_;
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_inner_error_ = NULL;
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_assert_not_reached ();
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_error_free0 (e);
+#line 2157 "TumblrPublishing.c"
+	}
+	__finally22:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1411 "/usr/share/vala-0.36/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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_clear_error (&_inner_error_);
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return NULL;
+#line 2168 "TumblrPublishing.c"
+	}
+}
+
+
+static void _vala_array_add34 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) {
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if ((*length) == (*size)) {
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
+#line 2180 "TumblrPublishing.c"
+	}
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(*array)[*length] = NULL;
+#line 2186 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
+	const gchar* _tmp0_;
+	GError * _inner_error_ = NULL;
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (response != NULL);
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = response;
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:226: ACTION: parsing info request response '%s' " \
+"into list of available blogs", _tmp0_);
+#line 2201 "TumblrPublishing.c"
+	{
+		JsonParser* parser = NULL;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
+		JsonObject* root_object = NULL;
+		JsonNode* _tmp3_;
+		JsonObject* _tmp4_;
+		JsonObject* _tmp5_;
+		JsonObject* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
+		JsonObject* _tmp12_;
+		JsonObject* _tmp13_;
+		JsonObject* _tmp14_;
+		JsonArray* _tmp15_;
+		GList* _tmp16_;
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = json_parser_new ();
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		parser = _tmp1_;
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = response;
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		json_parser_load_from_data (parser, _tmp2_, (gssize) -1, &_inner_error_);
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (parser);
+#line 2233 "TumblrPublishing.c"
+			goto __catch21_g_error;
+		}
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = json_parser_get_root (parser);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp4_ = json_node_get_object (_tmp3_);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp5_ = _json_object_ref0 (_tmp4_);
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		root_object = _tmp5_;
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = root_object;
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = json_object_get_object_member (_tmp6_, "response");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = json_object_get_object_member (_tmp7_, "user");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9_ = json_object_get_string_member (_tmp8_, "name");
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = g_strdup (_tmp9_);
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (self->priv->username);
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->username = _tmp10_;
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = self->priv->username;
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_debug ("TumblrPublishing.vala:232: Got user name: %s", _tmp11_);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = root_object;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = json_object_get_object_member (_tmp12_, "response");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp14_ = json_object_get_object_member (_tmp13_, "user");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp16_ = json_array_get_elements (_tmp15_);
+#line 2272 "TumblrPublishing.c"
+		{
+			GList* blognode_collection = NULL;
+			GList* blognode_it = NULL;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			blognode_collection = _tmp16_;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
+#line 2280 "TumblrPublishing.c"
+				JsonNode* blognode = NULL;
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				blognode = (JsonNode*) blognode_it->data;
+#line 2284 "TumblrPublishing.c"
+				{
+					JsonObject* blog = NULL;
+					JsonNode* _tmp17_;
+					JsonObject* _tmp18_;
+					JsonObject* _tmp19_;
+					gchar* name = NULL;
+					JsonObject* _tmp20_;
+					const gchar* _tmp21_;
+					gchar* _tmp22_;
+					gchar* url = NULL;
+					JsonObject* _tmp23_;
+					const gchar* _tmp24_;
+					gchar* _tmp25_;
+					gchar* _tmp26_;
+					gchar* _tmp27_;
+					gchar* _tmp28_;
+					const gchar* _tmp29_;
+					const gchar* _tmp30_;
+					PublishingTumblrBlogEntry** _tmp31_;
+					gint _tmp31__length1;
+					const gchar* _tmp32_;
+					const gchar* _tmp33_;
+					PublishingTumblrBlogEntry* _tmp34_;
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp17_ = blognode;
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp18_ = json_node_get_object (_tmp17_);
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp19_ = _json_object_ref0 (_tmp18_);
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					blog = _tmp19_;
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp20_ = blog;
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp21_ = json_object_get_string_member (_tmp20_, "name");
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp22_ = g_strdup (_tmp21_);
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					name = _tmp22_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp23_ = blog;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp24_ = json_object_get_string_member (_tmp23_, "url");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp25_ = string_replace (_tmp24_, "http://", "");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp26_ = _tmp25_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp27_ = string_replace (_tmp26_, "/", "");
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp28_ = _tmp27_;
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (_tmp26_);
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					url = _tmp28_;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp29_ = name;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp30_ = url;
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_debug ("TumblrPublishing.vala:237: Got blog name: %s and url: %s", _tmp29_, _tmp30_);
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp31_ = self->priv->blogs;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp31__length1 = self->priv->blogs_length1;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp32_ = name;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp33_ = url;
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp34_ = publishing_tumblr_blog_entry_new (_tmp32_, _tmp33_);
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_vala_array_add34 (&self->priv->blogs, &self->priv->blogs_length1, &self->priv->_blogs_size_, _tmp34_);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (url);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (name);
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_json_object_unref0 (blog);
+#line 2364 "TumblrPublishing.c"
+				}
+			}
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_list_free0 (blognode_collection);
+#line 2369 "TumblrPublishing.c"
+		}
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_json_object_unref0 (root_object);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (parser);
+#line 2375 "TumblrPublishing.c"
+	}
+	goto __finally21;
+	__catch21_g_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp35_;
+		GError* _tmp36_;
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		err = _inner_error_;
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp35_ = self->priv->host;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp36_ = err;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (err);
+#line 2395 "TumblrPublishing.c"
+	}
+	__finally21:
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2406 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportOAuth1Session* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	GError* _tmp7_;
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = txn;
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = txn;
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self);
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp4_) {
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2442 "TumblrPublishing.c"
+	}
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = self->priv->session;
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_session_deauthenticate (_tmp5_);
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:255: EVENT: user info request transaction caused" \
+" a network error");
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = self->priv->host;
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = err;
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
+#line 2456 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
+#line 2463 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
+#line 2470 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPublisherMediaType _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrBlogEntry** _tmp4_;
+	gint _tmp4__length1;
+	const gchar* _tmp5_;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:260: ACTION: displaying publishing options pane");
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp1_);
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = self->priv->sizes;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__length1 = self->priv->sizes_length1;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = self->priv->blogs;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4__length1 = self->priv->blogs_length1;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = self->priv->username;
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = publishing_tumblr_tumblr_publisher_publishing_options_pane_new (self, _tmp2_, _tmp3_, _tmp3__length1, _tmp4_, _tmp4__length1, _tmp5_);
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_options_pane = _tmp6_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = self->priv->host;
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (publishing_options_pane);
+#line 2522 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+	gboolean _tmp5_;
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publishing_options_pane;
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 2535 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->publishing_options_pane;
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = self->priv->publishing_options_pane;
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 2552 "TumblrPublishing.c"
+	}
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp5_) {
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2560 "TumblrPublishing.c"
+	}
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:280: EVENT: user clicked the 'Publish' button in" \
+" the publishing options pane");
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_publish (self);
+#line 2566 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+	gboolean _tmp5_;
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publishing_options_pane;
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 2579 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->publishing_options_pane;
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp2_, NULL, FALSE);
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = self->priv->publishing_options_pane;
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 2596 "TumblrPublishing.c"
+	}
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp5_) {
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2604 "TumblrPublishing.c"
+	}
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:293: EVENT: user clicked the 'Logout' button in " \
+"the publishing options pane");
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_logout (self);
+#line 2610 "TumblrPublishing.c"
+}
+
+
+gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
+	gint result = 0;
+	SpitPublishingPublishable* _tmp0_;
+	GDateTime* _tmp1_;
+	GDateTime* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	GDateTime* _tmp4_;
+	GDateTime* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = a;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = _tmp1_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = b;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = _tmp6_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_date_time_unref0 (_tmp5_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_date_time_unref0 (_tmp2_);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp7_;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 2652 "TumblrPublishing.c"
+}
+
+
+static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+	gint result;
+	result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 2661 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
+#line 2668 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
+#line 2675 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
+#line 2682 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingTumblrSizeEntry** _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	PublishingTumblrSizeEntry* _tmp4_;
+	gint _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	SpitPublishingProgressCallback _tmp8_;
+	gboolean _tmp9_;
+	SpitPublishingPublishable** publishables = NULL;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
+	GeeArrayList* sorted_list = NULL;
+	GeeArrayList* _tmp13_;
+	SpitPublishingPublishable** _tmp14_;
+	gint _tmp14__length1;
+	GeeArrayList* _tmp18_;
+	gchar* blog_url = NULL;
+	PublishingTumblrBlogEntry** _tmp19_;
+	gint _tmp19__length1;
+	gint _tmp20_;
+	PublishingTumblrBlogEntry* _tmp21_;
+	const gchar* _tmp22_;
+	gchar* _tmp23_;
+	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp24_;
+	GeeArrayList* _tmp25_;
+	gint _tmp26_;
+	gpointer* _tmp27_;
+	SpitPublishingPublishable** _tmp28_;
+	gint _tmp28__length1;
+	const gchar* _tmp29_;
+	PublishingTumblrTumblrPublisherUploader* _tmp30_;
+	PublishingTumblrTumblrPublisherUploader* _tmp31_;
+	PublishingTumblrTumblrPublisherUploader* _tmp32_;
+	PublishingTumblrTumblrPublisherUploader* _tmp33_;
+	PublishingTumblrTumblrPublisherUploader* _tmp34_;
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:304: ACTION: uploading media items to remote ser" \
+"ver.");
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = self->priv->sizes;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__length1 = self->priv->sizes_length1;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (self);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = _tmp2_[_tmp3_];
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = _tmp4_->size;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp5_, FALSE, &_tmp6_, &_tmp7_);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = _tmp8_;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = _tmp6_;
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp9_) {
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2771 "TumblrPublishing.c"
+	}
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp10_ = self->priv->host;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables = _tmp12_;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables_length1 = _tmp11_;
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishables_size_ = publishables_length1;
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	sorted_list = _tmp13_;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp14_ = publishables;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp14__length1 = publishables_length1;
+#line 2791 "TumblrPublishing.c"
+	{
+		SpitPublishingPublishable** p_collection = NULL;
+		gint p_collection_length1 = 0;
+		gint _p_collection_size_ = 0;
+		gint p_it = 0;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		p_collection = _tmp14_;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		p_collection_length1 = _tmp14__length1;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
+#line 2803 "TumblrPublishing.c"
+			SpitPublishingPublishable* _tmp15_;
+			SpitPublishingPublishable* p = NULL;
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			p = _tmp15_;
+#line 2810 "TumblrPublishing.c"
+			{
+				GeeArrayList* _tmp16_;
+				SpitPublishingPublishable* _tmp17_;
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				g_debug ("TumblrPublishing.vala:322: ACTION: add publishable");
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp16_ = sorted_list;
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp17_ = p;
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_g_object_unref0 (p);
+#line 2824 "TumblrPublishing.c"
+			}
+		}
+	}
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp18_ = sorted_list;
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	gee_list_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_LIST, GeeList), _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gcompare_data_func, NULL, NULL);
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp19_ = self->priv->blogs;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp19__length1 = self->priv->blogs_length1;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp20_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (self);
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp21_ = _tmp19_[_tmp20_];
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp22_ = _tmp21_->url;
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp23_ = g_strdup (_tmp22_);
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	blog_url = _tmp23_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp24_ = self->priv->session;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25_ = sorted_list;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp26_);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28_ = _tmp27_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28__length1 = _tmp26_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp29_ = blog_url;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp30_ = publishing_tumblr_tumblr_publisher_uploader_new (_tmp24_, _tmp28_, _tmp26_, _tmp29_);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp31_ = _tmp30_;
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28_ = (_vala_array_free (_tmp28_, _tmp28__length1, (GDestroyNotify) g_object_unref), NULL);
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	uploader = _tmp31_;
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp32_ = uploader;
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp33_ = uploader;
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp34_ = uploader;
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_batch_uploader_unref0 (uploader);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (blog_url);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (sorted_list);
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 2886 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:335: ACTION: showing success pane.");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->host;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->host;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_install_success_pane (_tmp1_);
+#line 2905 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) {
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp0_) {
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2926 "TumblrPublishing.c"
+	}
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = completed_fraction;
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:346: EVENT: uploader reports upload %.2f percent" \
+" complete.", 100.0 * _tmp1_);
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = self->priv->progress_reporter;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__target = self->priv->progress_reporter_target;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = self->priv->progress_reporter;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3__target = self->priv->progress_reporter_target;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = file_number;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = completed_fraction;
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
+#line 2948 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
+	gboolean _tmp0_;
+	gint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportBatchUploader* _tmp4_;
+	guint _tmp5_;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp0_) {
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 2969 "TumblrPublishing.c"
+	}
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = num_published;
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:358: EVENT: uploader reports upload complete; %d" \
+" items published.", _tmp1_);
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = uploader;
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = uploader;
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
+#line 2989 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
+	gboolean _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportBatchUploader* _tmp3_;
+	guint _tmp4_;
+	PublishingRESTSupportBatchUploader* _tmp5_;
+	guint _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (!_tmp0_) {
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3013 "TumblrPublishing.c"
+	}
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = err;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = _tmp1_->message;
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:371: EVENT: uploader reports upload error = '%s'" \
+".", _tmp2_);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = uploader;
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = uploader;
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = self->priv->host;
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = err;
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+#line 3039 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
+	SpitPublishingAuthenticator* _tmp0_;
+	gboolean _tmp1_;
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:381: ACTION: logging user out, deauthenticating " \
+"session, and erasing stored credentials");
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp1_) {
+#line 3056 "TumblrPublishing.c"
+		SpitPublishingAuthenticator* _tmp2_;
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = self->priv->authenticator;
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp2_);
+#line 3062 "TumblrPublishing.c"
+	}
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_attempt_start (self);
+#line 3068 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
+	gboolean _tmp0_;
+	SpitPublishingAuthenticator* _tmp1_;
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_) {
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3083 "TumblrPublishing.c"
+	}
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:396: TumblrPublisher: starting interaction.");
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = TRUE;
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp1_);
+#line 3093 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
+	PublishingTumblrTumblrPublisher * self;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_) {
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return;
+#line 3109 "TumblrPublishing.c"
+	}
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->was_started;
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp1_) {
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_error ("TumblrPublishing.vala:407: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
+"ble."));
+#line 3117 "TumblrPublishing.c"
+	}
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:409: TumblrPublisher: starting interaction.");
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_attempt_start (self);
+#line 3123 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublisher* base) {
+	PublishingTumblrTumblrPublisher * self;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:415: TumblrPublisher: stop( ) invoked.");
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 3135 "TumblrPublishing.c"
+}
+
+
+static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
+#line 3142 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrSizeEntry** _vala_array_dup9 (PublishingTumblrSizeEntry** self, int length) {
+	PublishingTumblrSizeEntry** result;
+	int i;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 3153 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry* _tmp0_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 3159 "TumblrPublishing.c"
+	}
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3163 "TumblrPublishing.c"
+}
+
+
+static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
+#line 3170 "TumblrPublishing.c"
+}
+
+
+static PublishingTumblrBlogEntry** _vala_array_dup10 (PublishingTumblrBlogEntry** self, int length) {
+	PublishingTumblrBlogEntry** result;
+	int i;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 3181 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry* _tmp0_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		result[i] = _tmp0_;
+#line 3187 "TumblrPublishing.c"
+	}
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3191 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3198 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3205 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3212 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3219 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL;
+	GtkBox* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingTumblrTumblrPublisher* _tmp3_;
+	PublishingTumblrTumblrPublisher* _tmp4_;
+	SpitPublishingPublisherMediaType _tmp5_;
+	PublishingTumblrSizeEntry** _tmp6_;
+	gint _tmp6__length1;
+	PublishingTumblrSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+	PublishingTumblrBlogEntry** _tmp8_;
+	gint _tmp8__length1;
+	PublishingTumblrBlogEntry** _tmp9_;
+	gint _tmp9__length1;
+	GError * _inner_error_ = NULL;
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (username != NULL, NULL);
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_object_ref_sink (_tmp0_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->pane_widget = _tmp0_;
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = username;
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = g_strdup (_tmp1_);
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp2_;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = publisher;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publisher);
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publisher = _tmp4_;
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = media_type;
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->media_type = _tmp5_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = sizes;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6__length1 = sizes_length1;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup9 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp7__length1 = _tmp6__length1;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = _tmp7_;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = _tmp7__length1;
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8_ = blogs;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp8__length1 = blogs_length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp9__length1 = _tmp8__length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = _tmp9_;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = _tmp9__length1;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 3306 "TumblrPublishing.c"
+	{
+		GtkBuilder* _tmp10_;
+		GtkBuilder* _tmp11_;
+		GtkBuilder* _tmp12_;
+		GtkBuilder* _tmp13_;
+		GObject* _tmp14_;
+		GtkBox* _tmp15_;
+		GtkBuilder* _tmp16_;
+		GObject* _tmp17_;
+		GtkLabel* _tmp18_;
+		GtkBuilder* _tmp19_;
+		GObject* _tmp20_;
+		GtkButton* _tmp21_;
+		GtkBuilder* _tmp22_;
+		GObject* _tmp23_;
+		GtkButton* _tmp24_;
+		GtkBuilder* _tmp25_;
+		GObject* _tmp26_;
+		GtkComboBoxText* _tmp27_;
+		GtkBuilder* _tmp28_;
+		GObject* _tmp29_;
+		GtkLabel* _tmp30_;
+		GtkBuilder* _tmp31_;
+		GObject* _tmp32_;
+		GtkComboBoxText* _tmp33_;
+		GtkBuilder* _tmp34_;
+		GObject* _tmp35_;
+		GtkLabel* _tmp36_;
+		gchar* upload_label_text = NULL;
+		const gchar* _tmp37_;
+		gchar* _tmp38_;
+		GtkLabel* _tmp39_;
+		const gchar* _tmp40_;
+		GtkComboBoxText* _tmp41_;
+		SpitPublishingPublisherMediaType _tmp42_;
+		GtkButton* _tmp46_;
+		GtkButton* _tmp47_;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = gtk_builder_new ();
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->builder);
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->builder = _tmp10_;
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = self->priv->builder;
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3356 "TumblrPublishing.c"
+			goto __catch23_g_error;
+		}
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = self->priv->builder;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_builder_connect_signals (_tmp12_, NULL);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = self->priv->builder;
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane");
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox));
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->pane_widget);
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->pane_widget = _tmp15_;
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp16_ = self->priv->builder;
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label");
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->upload_info_label);
+#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->upload_info_label = _tmp18_;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp19_ = self->priv->builder;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button");
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->logout_button);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->logout_button = _tmp21_;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp22_ = self->priv->builder;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button");
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->publish_button);
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->publish_button = _tmp24_;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp25_ = self->priv->builder;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->size_combo);
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->size_combo = _tmp27_;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp28_ = self->priv->builder;
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->size_label);
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->size_label = _tmp30_;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp31_ = self->priv->builder;
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo");
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->blog_combo);
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->blog_combo = _tmp33_;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp34_ = self->priv->builder;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label");
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel));
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (self->priv->blog_label);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		self->priv->blog_label = _tmp36_;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp37_ = self->priv->username;
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_);
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		upload_label_text = _tmp38_;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp39_ = self->priv->upload_info_label;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp40_ = upload_label_text;
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_label_set_label (_tmp39_, _tmp40_);
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp41_ = self->priv->blog_combo;
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp42_ = media_type;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 3465 "TumblrPublishing.c"
+			GtkComboBoxText* _tmp43_;
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp43_ = self->priv->size_combo;
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 3473 "TumblrPublishing.c"
+		} else {
+			GtkComboBoxText* _tmp44_;
+			GtkLabel* _tmp45_;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp44_ = self->priv->size_combo;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp45_ = self->priv->size_label;
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 3485 "TumblrPublishing.c"
+		}
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp46_ = self->priv->logout_button;
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp47_ = self->priv->publish_button;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (upload_label_text);
+#line 3497 "TumblrPublishing.c"
+	}
+	goto __finally23;
+	__catch23_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp48_;
+		const gchar* _tmp49_;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		e = _inner_error_;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp48_ = e;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp49_ = _tmp48_->message;
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_warning (_ ("Could not load UI: %s"), _tmp49_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (e);
+#line 3517 "TumblrPublishing.c"
+	}
+	__finally23:
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		return NULL;
+#line 3528 "TumblrPublishing.c"
+	}
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 3532 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
+#line 3539 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 3548 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 3557 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _tmp0__length1;
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->blogs;
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = self->priv->blogs_length1;
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 3572 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+		gint _tmp8_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->blogs;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1__length1 = self->priv->blogs_length1;
+#line 3582 "TumblrPublishing.c"
+		{
+			PublishingTumblrBlogEntry** b_collection = NULL;
+			gint b_collection_length1 = 0;
+			gint _b_collection_size_ = 0;
+			gint b_it = 0;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			b_collection = _tmp1_;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			b_collection_length1 = _tmp1__length1;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
+#line 3594 "TumblrPublishing.c"
+				PublishingTumblrBlogEntry* _tmp2_;
+				PublishingTumblrBlogEntry* b = NULL;
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				b = _tmp2_;
+#line 3601 "TumblrPublishing.c"
+				{
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrBlogEntry* _tmp4_;
+					const gchar* _tmp5_;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp3_ = self->priv->blog_combo;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp4_ = b;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp5_ = _tmp4_->blog;
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_publishing_tumblr_blog_entry_unref0 (b);
+#line 3616 "TumblrPublishing.c"
+				}
+			}
+		}
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = self->priv->blog_combo;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = self->priv->publisher;
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
+#line 3628 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publisher;
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->blog_combo;
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
+#line 3647 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _tmp0__length1;
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->sizes;
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0__length1 = self->priv->sizes_length1;
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (_tmp0_ != NULL) {
+#line 3662 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+		gint _tmp8_;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = self->priv->sizes;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1__length1 = self->priv->sizes_length1;
+#line 3672 "TumblrPublishing.c"
+		{
+			PublishingTumblrSizeEntry** e_collection = NULL;
+			gint e_collection_length1 = 0;
+			gint _e_collection_size_ = 0;
+			gint e_it = 0;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			e_collection = _tmp1_;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			e_collection_length1 = _tmp1__length1;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
+#line 3684 "TumblrPublishing.c"
+				PublishingTumblrSizeEntry* _tmp2_;
+				PublishingTumblrSizeEntry* e = NULL;
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				e = _tmp2_;
+#line 3691 "TumblrPublishing.c"
+				{
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrSizeEntry* _tmp4_;
+					const gchar* _tmp5_;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp3_ = self->priv->size_combo;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp4_ = e;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp5_ = _tmp4_->title;
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_publishing_tumblr_size_entry_unref0 (e);
+#line 3706 "TumblrPublishing.c"
+				}
+			}
+		}
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp6_ = self->priv->size_combo;
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = self->priv->publisher;
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
+#line 3718 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->publisher;
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = self->priv->size_combo;
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
+#line 3737 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 3746 "TumblrPublishing.c"
+}
+
+
+void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 3755 "TumblrPublishing.c"
+}
+
+
+static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	GtkWidget* result = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->pane_widget;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp1_;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3774 "TumblrPublishing.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 3787 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3794 "TumblrPublishing.c"
+}
+
+
+static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
+#line 3801 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
+#line 3813 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+	guint _tmp0_;
+	guint _tmp1_;
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
+#line 3831 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) {
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate));
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3846 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
+#line 3861 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
+	gchar* _tmp0_;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->pane_widget = NULL;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->upload_info_label = NULL;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->size_label = NULL;
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_label = NULL;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->logout_button = NULL;
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publish_button = NULL;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->size_combo = NULL;
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_combo = NULL;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = NULL;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = 0;
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = NULL;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = 0;
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp0_;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publisher = NULL;
+#line 3903 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) {
+	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->pane_widget);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->upload_info_label);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->size_label);
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->blog_label);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->logout_button);
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publish_button);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->size_combo);
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->blog_combo);
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publisher);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
+#line 3939 "TumblrPublishing.c"
+}
+
+
+/**
+         * The publishing options pane.
+         */
+GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) {
+	static volatile gsize publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id;
+		publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisherPublishingOptionsPane", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile, publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_publishing_options_pane_type_id__volatile;
+}
+
+
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session) {
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = session;
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_rest_support_oauth1_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 3971 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingRESTSupportOAuth1Session* session) {
+#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
+#line 3978 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 3985 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init (PublishingTumblrTumblrPublisherUserInfoFetchTransaction * self) {
+}
+
+
+GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (void) {
+	static volatile gsize publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUserInfoFetchTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id;
+		publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_TRANSACTION, "PublishingTumblrTumblrPublisherUserInfoFetchTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_type_id__volatile;
+}
+
+
+static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) {
+	gchar* result = NULL;
+	GString* s = NULL;
+	GString* _tmp0_;
+	gchar* bytes = NULL;
+	gchar* _tmp1_;
+	gint bytes_length1;
+	gint _bytes_size_;
+	gchar* _tmp2_;
+	gint _tmp2__length1;
+	gchar _tmp3_;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+	GString* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_string_new ("");
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	s = _tmp0_;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = g_new0 (gchar, 2);
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes = _tmp1_;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes_length1 = 2;
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_bytes_size_ = bytes_length1;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = bytes;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2__length1 = bytes_length1;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_[1] = (gchar) 0;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_[1];
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = data;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4__length1 = data_length1;
+#line 4047 "TumblrPublishing.c"
+	{
+		guint8* byte_collection = NULL;
+		gint byte_collection_length1 = 0;
+		gint _byte_collection_size_ = 0;
+		gint byte_it = 0;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		byte_collection = _tmp4_;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		byte_collection_length1 = _tmp4__length1;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
+#line 4059 "TumblrPublishing.c"
+			guint8 byte = 0U;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			byte = byte_collection[byte_it];
+#line 4063 "TumblrPublishing.c"
+			{
+				guint8 _tmp5_;
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				_tmp5_ = byte;
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+				if (((gint) _tmp5_) == 0) {
+#line 4070 "TumblrPublishing.c"
+					GString* _tmp6_;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp6_ = s;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_string_append (_tmp6_, "%00");
+#line 4076 "TumblrPublishing.c"
+				} else {
+					gchar* _tmp7_;
+					gint _tmp7__length1;
+					guint8 _tmp8_;
+					gchar _tmp9_;
+					GString* _tmp10_;
+					gchar* _tmp11_;
+					gint _tmp11__length1;
+					gchar* _tmp12_;
+					gchar* _tmp13_;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp7_ = bytes;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp7__length1 = bytes_length1;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp8_ = byte;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp7_[0] = (gchar) _tmp8_;
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp9_ = _tmp7_[0];
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp10_ = s;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp11_ = bytes;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp11__length1 = bytes_length1;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_tmp13_ = _tmp12_;
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					g_string_append (_tmp10_, _tmp13_);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+					_g_free0 (_tmp13_);
+#line 4111 "TumblrPublishing.c"
+				}
+			}
+		}
+	}
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp14_ = s;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp15_ = _tmp14_->str;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp16_ = g_strdup (_tmp15_);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp16_;
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	bytes = (g_free (bytes), NULL);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_string_free0 (s);
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 4130 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
+	PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (blog_url != NULL, NULL);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:596: Init upload transaction");
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = session;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = publishable;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = blog_url;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = g_strdup_printf ("https://api.tumblr.com/v2/blog/%s/post", _tmp2_);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_oauth1_upload_transaction_construct (object_type, _tmp0_, _tmp1_, _tmp4_);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp4_);
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 4165 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
+#line 4172 "TumblrPublishing.c"
+}
+
+
+static guint8* string_get_data (const gchar* self, int* result_length1) {
+	guint8* result;
+	guint8* res = NULL;
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res = (guint8*) self;
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res_length1 = -1;
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_res_size_ = res_length1;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = strlen (self);
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = _tmp0_;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	res_length1 = (gint) _tmp1_;
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = res_length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = res;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3__length1 = res_length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp4_ = _tmp3_;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp4__length1 = _tmp3__length1;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (result_length1) {
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		*result_length1 = _tmp4__length1;
+#line 4216 "TumblrPublishing.c"
+	}
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp4_;
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 4222 "TumblrPublishing.c"
+}
+
+
+static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = separator;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_ == NULL) {
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		separator = "";
+#line 4239 "TumblrPublishing.c"
+	}
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = str_array;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3__length1 = str_array_length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = TRUE;
+#line 4249 "TumblrPublishing.c"
+	} else {
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = str_array;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4__length1 = str_array_length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp4__length1 > 0;
+#line 4259 "TumblrPublishing.c"
+	}
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp2_) {
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 4265 "TumblrPublishing.c"
+	} else {
+		gboolean _tmp5_ = FALSE;
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = str_array;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6__length1 = str_array_length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (_tmp6__length1 == -1) {
+#line 4276 "TumblrPublishing.c"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp7_ = str_array;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp7__length1 = str_array_length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp8_ = _tmp7_[0];
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp5_ = _tmp8_ != NULL;
+#line 4288 "TumblrPublishing.c"
+		} else {
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp5_ = FALSE;
+#line 4292 "TumblrPublishing.c"
+		}
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = _tmp5_;
+#line 4296 "TumblrPublishing.c"
+	}
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 4300 "TumblrPublishing.c"
+		gint i = 0;
+		gsize len = 0UL;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
+		const gchar* res = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
+		void* ptr = NULL;
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = (gsize) 1;
+#line 4323 "TumblrPublishing.c"
+		{
+			gboolean _tmp9_ = FALSE;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			i = 0;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp9_ = TRUE;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 4332 "TumblrPublishing.c"
+				gboolean _tmp11_ = FALSE;
+				gboolean _tmp12_ = FALSE;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
+				gint _tmp21_ = 0;
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (!_tmp9_) {
+#line 4345 "TumblrPublishing.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp10_ = i;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					i = _tmp10_ + 1;
+#line 4351 "TumblrPublishing.c"
+				}
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp9_ = FALSE;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp13_ = str_array;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp13__length1 = str_array_length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (_tmp13__length1 != -1) {
+#line 4361 "TumblrPublishing.c"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp14_ = i;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp15_ = str_array;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp15__length1 = str_array_length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp12_ = _tmp14_ < _tmp15__length1;
+#line 4373 "TumblrPublishing.c"
+				} else {
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp12_ = FALSE;
+#line 4377 "TumblrPublishing.c"
+				}
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (_tmp12_) {
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp11_ = TRUE;
+#line 4383 "TumblrPublishing.c"
+				} else {
+					gboolean _tmp16_ = FALSE;
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp17_ = str_array;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp17__length1 = str_array_length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					if (_tmp17__length1 == -1) {
+#line 4394 "TumblrPublishing.c"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp18_ = str_array;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp18__length1 = str_array_length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp19_ = i;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp20_ = _tmp18_[_tmp19_];
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp16_ = _tmp20_ != NULL;
+#line 4409 "TumblrPublishing.c"
+					} else {
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+						_tmp16_ = FALSE;
+#line 4413 "TumblrPublishing.c"
+					}
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp11_ = _tmp16_;
+#line 4417 "TumblrPublishing.c"
+				}
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (!_tmp11_) {
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					break;
+#line 4423 "TumblrPublishing.c"
+				}
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp22_ = str_array;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp22__length1 = str_array_length1;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp23_ = i;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp24_ = _tmp22_[_tmp23_];
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (_tmp24_ != NULL) {
+#line 4435 "TumblrPublishing.c"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp25_ = str_array;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp25__length1 = str_array_length1;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp26_ = i;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp27_ = _tmp25_[_tmp26_];
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp28_ = strlen ((const gchar*) _tmp27_);
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp29_ = _tmp28_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp21_ = _tmp29_;
+#line 4456 "TumblrPublishing.c"
+				} else {
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp21_ = 0;
+#line 4460 "TumblrPublishing.c"
+				}
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp30_ = len;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				len = _tmp30_ + _tmp21_;
+#line 4466 "TumblrPublishing.c"
+			}
+		}
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp31_ = i;
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (_tmp31_ == 0) {
+#line 4473 "TumblrPublishing.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp32_ = g_strdup ("");
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			result = _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			return result;
+#line 4481 "TumblrPublishing.c"
+		}
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp33_ = i;
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		str_array_length1 = _tmp33_;
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp34_ = str_array_length1;
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp35_ = len;
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp36_ = separator;
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp37_ = strlen ((const gchar*) _tmp36_);
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp38_ = _tmp37_;
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp39_ = i;
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp40_ = len;
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp41_ = g_malloc (_tmp40_);
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		res = _tmp41_;
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp42_ = res;
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp43_ = str_array;
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp43__length1 = str_array_length1;
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp44_ = _tmp43_[0];
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		ptr = _tmp45_;
+#line 4519 "TumblrPublishing.c"
+		{
+			gboolean _tmp46_ = FALSE;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			i = 1;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_tmp46_ = TRUE;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			while (TRUE) {
+#line 4528 "TumblrPublishing.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
+				const gchar* _tmp53_ = NULL;
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (!_tmp46_) {
+#line 4544 "TumblrPublishing.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp47_ = i;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					i = _tmp47_ + 1;
+#line 4550 "TumblrPublishing.c"
+				}
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp46_ = FALSE;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp48_ = i;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp49_ = str_array;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp49__length1 = str_array_length1;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (!(_tmp48_ < _tmp49__length1)) {
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					break;
+#line 4564 "TumblrPublishing.c"
+				}
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp50_ = ptr;
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp51_ = separator;
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				ptr = _tmp52_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp54_ = str_array;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp54__length1 = str_array_length1;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp55_ = i;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp56_ = _tmp54_[_tmp55_];
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				if (_tmp56_ != NULL) {
+#line 4584 "TumblrPublishing.c"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp57_ = str_array;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp57__length1 = str_array_length1;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp58_ = i;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp59_ = _tmp57_[_tmp58_];
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp53_ = (const gchar*) _tmp59_;
+#line 4599 "TumblrPublishing.c"
+				} else {
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+					_tmp53_ = "";
+#line 4603 "TumblrPublishing.c"
+				}
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp60_ = ptr;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+				ptr = _tmp61_;
+#line 4611 "TumblrPublishing.c"
+			}
+		}
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp62_ = res;
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		res = NULL;
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (gchar*) _tmp62_;
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 4622 "TumblrPublishing.c"
+	} else {
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp63_ = g_strdup ("");
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 4631 "TumblrPublishing.c"
+	}
+}
+
+
+static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+	PublishingTumblrTumblrPublisherUploadTransaction * self;
+	gchar* payload = NULL;
+	gsize payload_length = 0UL;
+	PublishingRESTSupportArgument** request_arguments = NULL;
+	gint _tmp24_;
+	PublishingRESTSupportArgument** _tmp25_;
+	gint request_arguments_length1;
+	gint _request_arguments_size_;
+	PublishingRESTSupportArgument** _tmp26_;
+	gint _tmp26__length1;
+	gchar* request_data = NULL;
+	PublishingRESTSupportArgument** _tmp27_;
+	gint _tmp27__length1;
+	gchar* _tmp28_;
+	SoupMessage* outbound_message = NULL;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	SoupMessage* _tmp31_;
+	SoupMessage* _tmp32_;
+	SoupMessage* _tmp33_;
+	const gchar* _tmp34_;
+	guint8* _tmp35_;
+	gint _tmp35__length1;
+	guint8* _tmp36_;
+	gint _tmp36__length1;
+	GeeMapIterator* i = NULL;
+	GeeHashMap* _tmp37_;
+	GeeMapIterator* _tmp38_;
+	gboolean cont = FALSE;
+	GeeMapIterator* _tmp39_;
+	gboolean _tmp40_;
+	SoupMessage* _tmp52_;
+	GError * _inner_error_ = NULL;
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
+#line 4672 "TumblrPublishing.c"
+	{
+		SpitPublishingPublishable* _tmp0_;
+		GFile* _tmp1_;
+		GFile* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_ = NULL;
+		gsize _tmp6_ = 0UL;
+		gchar* reqdata = NULL;
+		const gchar* _tmp7_;
+		guint8* _tmp8_;
+		gint _tmp8__length1;
+		guint8* _tmp9_;
+		gint _tmp9__length1;
+		gsize _tmp10_;
+		gchar* _tmp11_;
+		const gchar* _tmp12_;
+		gchar** keywords = NULL;
+		SpitPublishingPublishable* _tmp13_;
+		gint _tmp14_;
+		gchar** _tmp15_;
+		gint keywords_length1;
+		gint _keywords_size_;
+		gchar* tags = NULL;
+		gchar* _tmp16_;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp1_ = spit_publishing_publishable_get_serialized_file (_tmp0_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp3_ = g_file_get_path (_tmp2_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp4_ = _tmp3_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		g_file_get_contents (_tmp4_, &_tmp5_, &_tmp6_, &_inner_error_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (payload);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		payload = _tmp5_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		payload_length = _tmp6_;
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp4_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			if (_inner_error_->domain == G_FILE_ERROR) {
+#line 4729 "TumblrPublishing.c"
+				goto __catch24_g_file_error;
+			}
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 4740 "TumblrPublishing.c"
+		}
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp7_ = payload;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp8_ = string_get_data (_tmp7_, &_tmp8__length1);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9_ = _tmp8_;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp9__length1 = _tmp8__length1;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp10_ = payload_length;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp11_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp9_ + 0, ((gint) _tmp10_) - 0);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		reqdata = _tmp11_;
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp12_ = reqdata;
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp12_);
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp15_ = spit_publishing_publishable_get_publishing_keywords (_tmp13_, &_tmp14_);
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords = _tmp15_;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords_length1 = _tmp14_;
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_keywords_size_ = keywords_length1;
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp16_ = g_strdup ("");
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		tags = _tmp16_;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17_ = keywords;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp17__length1 = keywords_length1;
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_tmp17_ != NULL) {
+#line 4782 "TumblrPublishing.c"
+			gchar** _tmp18_;
+			gint _tmp18__length1;
+			gchar* _tmp19_;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp18_ = keywords;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp18__length1 = keywords_length1;
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_tmp19_ = _vala_g_strjoinv (",", _tmp18_, _tmp18__length1);
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (tags);
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			tags = _tmp19_;
+#line 4796 "TumblrPublishing.c"
+		}
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp20_ = tags;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp21_ = soup_uri_encode (_tmp20_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp22_ = _tmp21_;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp22_);
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp22_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (tags);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (reqdata);
+#line 4814 "TumblrPublishing.c"
+	}
+	goto __finally24;
+	__catch24_g_file_error:
+	{
+		GError* e = NULL;
+		GError* _tmp23_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		e = _inner_error_;
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp23_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_inner_error_ = _tmp23_;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_error_free0 (e);
+#line 4831 "TumblrPublishing.c"
+		goto __finally24;
+	}
+	__finally24:
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_propagate_error (error, _inner_error_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 4845 "TumblrPublishing.c"
+		} else {
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 4855 "TumblrPublishing.c"
+		}
+	}
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_oauth1_upload_transaction_authorize (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction));
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp25_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp24_);
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments = _tmp25_;
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments_length1 = _tmp24_;
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_request_arguments_size_ = request_arguments_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp26_ = request_arguments;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp26__length1 = request_arguments_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_vala_assert (_tmp26__length1 > 0, "request_arguments.length > 0");
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27_ = request_arguments;
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp27__length1 = request_arguments_length1;
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp28_ = publishing_rest_support_argument_serialize_list (_tmp27_, _tmp27__length1, FALSE, "&");
+#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_data = _tmp28_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp29_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp30_ = _tmp29_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp31_ = soup_message_new ("POST", _tmp30_);
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp32_ = _tmp31_;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (_tmp30_);
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	outbound_message = _tmp32_;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp33_ = outbound_message;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp34_ = request_data;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp35_ = string_get_data (_tmp34_, &_tmp35__length1);
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp36_ = _tmp35_;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp36__length1 = _tmp35__length1;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	soup_message_set_request (_tmp33_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp36_, (gsize) _tmp36__length1);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportOAuth1UploadTransaction), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp38_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	i = _tmp38_;
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp39_ = i;
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp40_ = gee_map_iterator_next (_tmp39_);
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	cont = _tmp40_;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	while (TRUE) {
+#line 4920 "TumblrPublishing.c"
+		gboolean _tmp41_;
+		SoupMessage* _tmp42_;
+		SoupMessageHeaders* _tmp43_;
+		GeeMapIterator* _tmp44_;
+		gpointer _tmp45_;
+		gchar* _tmp46_;
+		GeeMapIterator* _tmp47_;
+		gpointer _tmp48_;
+		gchar* _tmp49_;
+		GeeMapIterator* _tmp50_;
+		gboolean _tmp51_;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp41_ = cont;
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (!_tmp41_) {
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			break;
+#line 4938 "TumblrPublishing.c"
+		}
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp42_ = outbound_message;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp43_ = _tmp42_->request_headers;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp44_ = i;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp45_ = gee_map_iterator_get_key (_tmp44_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp46_ = (gchar*) _tmp45_;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp47_ = i;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp48_ = gee_map_iterator_get_value (_tmp47_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp49_ = (gchar*) _tmp48_;
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		soup_message_headers_append (_tmp43_, _tmp46_, _tmp49_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp49_);
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_g_free0 (_tmp46_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp50_ = i;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		_tmp51_ = gee_map_iterator_next (_tmp50_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		cont = _tmp51_;
+#line 4968 "TumblrPublishing.c"
+	}
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp52_ = outbound_message;
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp52_);
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_propagate_error (error, _inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (i);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (outbound_message);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (request_data);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 4996 "TumblrPublishing.c"
+		} else {
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (i);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_object_unref0 (outbound_message);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (request_data);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			_g_free0 (payload);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+			return;
+#line 5014 "TumblrPublishing.c"
+		}
+	}
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (i);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (outbound_message);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (request_data);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (payload);
+#line 5027 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) {
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
+#line 5036 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
+}
+
+
+GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
+	static volatile gsize publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploadTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploadTransaction), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_upload_transaction_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_upload_transaction_type_id;
+		publishing_tumblr_tumblr_publisher_upload_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_UPLOAD_TRANSACTION, "PublishingTumblrTumblrPublisherUploadTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile, publishing_tumblr_tumblr_publisher_upload_transaction_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_upload_transaction_type_id__volatile;
+}
+
+
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
+	PublishingTumblrTumblrPublisherUploader* self = NULL;
+	PublishingRESTSupportOAuth1Session* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_OAUTH1_IS_SESSION (session), NULL);
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (blog_url != NULL, NULL);
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = session;
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = publishables;
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1__length1 = publishables_length1;
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = blog_url;
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->blog_url);
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_url = _tmp3_;
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return self;
+#line 5085 "TumblrPublishing.c"
+}
+
+
+PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingRESTSupportOAuth1Session* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
+#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
+#line 5092 "TumblrPublishing.c"
+}
+
+
+static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
+	PublishingTumblrTumblrPublisherUploader * self;
+	PublishingRESTSupportTransaction* result = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportOAuth1Session* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:665: Create upload transaction");
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_OAUTH1_TYPE_SESSION, PublishingRESTSupportOAuth1Session);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp2_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp4_ = self->priv->blog_url;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (_tmp3_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp1_);
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	result = _tmp6_;
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	return result;
+#line 5134 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) {
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
+#line 5147 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
+	gchar* _tmp0_;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blog_url = _tmp0_;
+#line 5159 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
+	PublishingTumblrTumblrPublisherUploader * self;
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->blog_url);
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
+#line 5171 "TumblrPublishing.c"
+}
+
+
+GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) {
+	static volatile gsize publishing_tumblr_tumblr_publisher_uploader_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherUploaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_uploader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisherUploader), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_uploader_instance_init, NULL };
+		GType publishing_tumblr_tumblr_publisher_uploader_type_id;
+		publishing_tumblr_tumblr_publisher_uploader_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, "PublishingTumblrTumblrPublisherUploader", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_uploader_type_id__volatile, publishing_tumblr_tumblr_publisher_uploader_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_uploader_type_id__volatile;
+}
+
+
+static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumblrPublisherClass * klass) {
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_parent_class = g_type_class_peek_parent (klass);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
+#line 5194 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
+#line 5209 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) {
+	gchar* _tmp0_;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->running = FALSE;
+#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->was_started = FALSE;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->session = NULL;
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->publishing_options_pane = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes_length1 = 0;
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = NULL;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs_length1 = 0;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = g_strdup ("");
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->username = _tmp0_;
+#line 5247 "TumblrPublishing.c"
+}
+
+
+static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
+	PublishingTumblrTumblrPublisher * self;
+	SpitPublishingAuthenticator* _tmp0_;
+	guint _tmp1_;
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_parse_name ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &_tmp1_, NULL, FALSE);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self);
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->service);
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->host);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = NULL;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->publishing_options_pane);
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/TumblrPublishing.vala"
+	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
+#line 5289 "TumblrPublishing.c"
+}
+
+
+GType publishing_tumblr_tumblr_publisher_get_type (void) {
+	static volatile gsize publishing_tumblr_tumblr_publisher_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_tumblr_tumblr_publisher_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingTumblrTumblrPublisherClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_tumblr_tumblr_publisher_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingTumblrTumblrPublisher), 0, (GInstanceInitFunc) publishing_tumblr_tumblr_publisher_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_publisher_info = { (GInterfaceInitFunc) publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_tumblr_tumblr_publisher_type_id;
+		publishing_tumblr_tumblr_publisher_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingTumblrTumblrPublisher", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_tumblr_tumblr_publisher_type_id, SPIT_PUBLISHING_TYPE_PUBLISHER, &spit_publishing_publisher_info);
+		g_once_init_leave (&publishing_tumblr_tumblr_publisher_type_id__volatile, publishing_tumblr_tumblr_publisher_type_id);
+	}
+	return publishing_tumblr_tumblr_publisher_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff --git a/plugins/shotwell-publishing/TumblrPublishing.vala b/plugins/shotwell-publishing/TumblrPublishing.vala
new file mode 100644
index 0000000..1da9c61
--- /dev/null
+++ b/plugins/shotwell-publishing/TumblrPublishing.vala
@@ -0,0 +1,673 @@
+/* Copyright 2012 BJA Electronics
+ * Author: Jeroen Arnoldus (b.j.arnoldus@bja-electronics.nl)
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {
+    private const string ICON_FILENAME = "tumblr.png";
+
+    private static Gdk.Pixbuf[] icon_pixbuf_set = null;
+
+    public TumblrService(GLib.File resource_directory) {
+        if (icon_pixbuf_set == null)
+            icon_pixbuf_set =
+                Resources.load_from_resource(Resources.RESOURCE_PATH + "/" +
+                        ICON_FILENAME);
+    }
+
+    public int get_pluggable_interface(int min_host_interface, int max_host_interface) {
+        return Spit.negotiate_interfaces(min_host_interface, max_host_interface,
+                Spit.Publishing.CURRENT_INTERFACE);
+    }
+
+    public unowned string get_id() {
+        return "org.yorba.shotwell.publishing.tumblr";
+    }
+
+    public unowned string get_pluggable_name() {
+        return "Tumblr";
+    }
+
+    public void get_info(ref Spit.PluggableInfo info) {
+        info.authors = "Jeroen Arnoldus";
+        info.copyright = _("Copyright 2012 BJA Electronics");
+        info.translators = Resources.TRANSLATORS;
+        info.version = _VERSION;
+        info.website_name = Resources.WEBSITE_NAME;
+        info.website_url = Resources.WEBSITE_URL;
+        info.is_license_wordwrapped = false;
+        info.license = Resources.LICENSE;
+        info.icons = icon_pixbuf_set;
+    }
+
+    public void activation(bool enabled) {
+    }
+
+    public Spit.Publishing.Publisher create_publisher(Spit.Publishing.PluginHost host) {
+        return new Publishing.Tumblr.TumblrPublisher(this, host);
+    }
+
+    public Spit.Publishing.Publisher.MediaType get_supported_media() {
+        return (Spit.Publishing.Publisher.MediaType.PHOTO |
+                Spit.Publishing.Publisher.MediaType.VIDEO);
+    }
+}
+
+namespace Publishing.Tumblr {
+
+    internal const string SERVICE_NAME = "Tumblr";
+    internal const string ENDPOINT_URL = "https://www.tumblr.com/";
+    internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
+    internal const int ORIGINAL_SIZE = -1;
+
+
+
+    private class BlogEntry {
+        public string blog;
+        public string url;
+        public BlogEntry(string creator_blog, string creator_url) {
+            blog = creator_blog;
+            url = creator_url;
+        }
+    }
+
+    private class SizeEntry {
+        public string title;
+        public int size;
+
+        public SizeEntry(string creator_title, int creator_size) {
+            title = creator_title;
+            size = creator_size;
+        }
+    }
+
+    public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
+        private Spit.Publishing.Service service;
+        private Spit.Publishing.PluginHost host;
+        private Spit.Publishing.ProgressCallback progress_reporter = null;
+        private bool running = false;
+        private bool was_started = false;
+        private Publishing.RESTSupport.OAuth1.Session session = null;
+        private PublishingOptionsPane publishing_options_pane = null;
+        private SizeEntry[] sizes = null;
+        private BlogEntry[] blogs = null;
+        private string username = "";
+        private Spit.Publishing.Authenticator authenticator;
+
+
+        private SizeEntry[] create_sizes() {
+            SizeEntry[] result = new SizeEntry[0];
+
+            result += new SizeEntry(_("500 × 375 pixels"), 500);
+            result += new SizeEntry(_("1024 × 768 pixels"), 1024);
+            result += new SizeEntry(_("1280 × 853 pixels"), 1280);
+            //Larger images make no sense for Tumblr
+            //        result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
+            //        result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
+            //        result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
+
+            return result;
+        }
+
+        private BlogEntry[] create_blogs() {
+            BlogEntry[] result = new BlogEntry[0];
+
+
+            return result;
+        }
+
+        public TumblrPublisher(Spit.Publishing.Service service,
+                Spit.Publishing.PluginHost host) {
+            debug("TumblrPublisher instantiated.");
+            this.service = service;
+            this.host = host;
+            this.session = new Publishing.RESTSupport.OAuth1.Session(ENDPOINT_URL);
+            this.sizes = this.create_sizes();
+            this.blogs = this.create_blogs();
+
+            this.authenticator = Publishing.Authenticator.Factory.get_instance().create("tumblr", host);
+            this.authenticator.authenticated.connect(on_authenticator_authenticated);
+        }
+
+        ~TumblrPublisher() {
+            this.authenticator.authenticated.disconnect(on_authenticator_authenticated);
+        }
+
+        // Publisher interface implementation
+
+        public Spit.Publishing.Service get_service() {
+            return service;
+        }
+
+        public Spit.Publishing.PluginHost get_host() {
+            return host;
+        }
+
+        public bool is_running() {
+            return running;
+        }
+
+        internal int get_persistent_default_size() {
+            return host.get_config_int("default_size", 1);
+        }
+
+        internal void set_persistent_default_size(int size) {
+            host.set_config_int("default_size", size);
+        }
+
+        internal int get_persistent_default_blog() {
+            return host.get_config_int("default_blog", 0);
+        }
+
+        internal void set_persistent_default_blog(int blog) {
+            host.set_config_int("default_blog", blog);
+        }
+
+        // Actions and events implementation
+
+        private void on_authenticator_authenticated() {
+            if (!is_running())
+                return;
+
+            debug("EVENT: a fully authenticated session has become available");
+
+            var params = this.authenticator.get_authentication_parameter();
+            Variant consumer_key = null;
+            Variant consumer_secret = null;
+            Variant auth_token = null;
+            Variant auth_token_secret = null;
+
+            params.lookup_extended("ConsumerKey", null, out consumer_key);
+            params.lookup_extended("ConsumerSecret", null, out consumer_secret);
+            session.set_api_credentials(consumer_key.get_string(), consumer_secret.get_string());
+
+            params.lookup_extended("AuthToken", null, out auth_token);
+            params.lookup_extended("AuthTokenSecret", null, out auth_token_secret);
+            session.set_access_phase_credentials(auth_token.get_string(),
+                    auth_token_secret.get_string(), "");
+
+
+            do_get_blogs();
+        }
+
+        private void do_get_blogs() {
+            debug("ACTION: obtain all blogs of the tumblr user");
+            UserInfoFetchTransaction txn = new UserInfoFetchTransaction(session);
+            txn.completed.connect(on_info_request_txn_completed);
+            txn.network_error.connect(on_info_request_txn_error);
+
+            try {
+                txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                host.post_error(err);
+            }
+
+
+        }
+
+
+        private void on_info_request_txn_completed(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_info_request_txn_completed);
+            txn.network_error.disconnect(on_info_request_txn_error);
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user info request transaction completed; response = '%s'",
+                    txn.get_response());
+            do_parse_token_info_from_user_request(txn.get_response());
+            do_show_publishing_options_pane();
+        }
+
+
+        private void do_parse_token_info_from_user_request(string response) {
+            debug("ACTION: parsing info request response '%s' into list of available blogs", response);
+            try {
+                var parser = new Json.Parser();
+                parser.load_from_data (response, -1);
+                var root_object = parser.get_root().get_object();
+                this.username = root_object.get_object_member("response").get_object_member("user").get_string_member ("name");
+                debug("Got user name: %s",username);
+                foreach (var blognode in root_object.get_object_member("response").get_object_member("user").get_array_member("blogs").get_elements ()) {
+                    var blog = blognode.get_object ();
+                    string name = blog.get_string_member ("name");
+                    string url = blog.get_string_member ("url").replace("http://","").replace("/","");
+                    debug("Got blog name: %s and url: %s", name, url);
+                    this.blogs += new BlogEntry(name,url);
+                }
+            } catch (Error err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_info_request_txn_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_info_request_txn_completed);
+            txn.network_error.disconnect(on_info_request_txn_error);
+
+            if (!is_running())
+                return;
+
+            session.deauthenticate();
+            //invalidate_persistent_session();
+            debug("EVENT: user info request transaction caused a network error");
+            host.post_error(err);
+        }
+
+        private void do_show_publishing_options_pane() {
+            debug("ACTION: displaying publishing options pane");
+            host.set_service_locked(false);
+            PublishingOptionsPane publishing_options_pane =
+                new PublishingOptionsPane(this, host.get_publishable_media_type(), this.sizes, this.blogs, this.username);
+            publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
+            publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
+            host.install_dialog_pane(publishing_options_pane);
+        }
+
+
+
+        private void on_publishing_options_pane_publish() {
+            if (publishing_options_pane != null) {
+                publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+                publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+            }
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user clicked the 'Publish' button in the publishing options pane");
+            do_publish();
+        }
+
+        private void on_publishing_options_pane_logout() {
+            if (publishing_options_pane != null) {
+                publishing_options_pane.publish.disconnect(on_publishing_options_pane_publish);
+                publishing_options_pane.logout.disconnect(on_publishing_options_pane_logout);
+            }
+
+            if (!is_running())
+                return;
+
+            debug("EVENT: user clicked the 'Logout' button in the publishing options pane");
+
+            do_logout();
+        }
+
+        public static int tumblr_date_time_compare_func(Spit.Publishing.Publishable a,
+                Spit.Publishing.Publishable b) {
+            return a.get_exposure_date_time().compare(b.get_exposure_date_time());
+        }
+
+        private void do_publish() {
+            debug("ACTION: uploading media items to remote server.");
+
+            host.set_service_locked(true);
+
+            progress_reporter = host.serialize_publishables(sizes[get_persistent_default_size()].size);
+
+            // Serialization is a long and potentially cancellable operation, so before we use
+            // the publishables, make sure that the publishing interaction is still running. If it
+            // isn't the publishing environment may be partially torn down so do a short-circuit
+            // return
+            if (!is_running())
+                return;
+
+            // Sort publishables in reverse-chronological order.
+            Spit.Publishing.Publishable[] publishables = host.get_publishables();
+            Gee.ArrayList<Spit.Publishing.Publishable> sorted_list =
+                new Gee.ArrayList<Spit.Publishing.Publishable>();
+            foreach (Spit.Publishing.Publishable p in publishables) {
+                debug("ACTION: add publishable");
+                sorted_list.add(p);
+            }
+            sorted_list.sort(tumblr_date_time_compare_func);
+            string blog_url = this.blogs[get_persistent_default_blog()].url;
+
+            Uploader uploader = new Uploader(session, sorted_list.to_array(),blog_url);
+            uploader.upload_complete.connect(on_upload_complete);
+            uploader.upload_error.connect(on_upload_error);
+            uploader.upload(on_upload_status_updated);
+        }
+
+        private void do_show_success_pane() {
+            debug("ACTION: showing success pane.");
+
+            host.set_service_locked(false);
+            host.install_success_pane();
+        }
+
+
+        private void on_upload_status_updated(int file_number, double completed_fraction) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload %.2f percent complete.", 100.0 * completed_fraction);
+
+            assert(progress_reporter != null);
+
+            progress_reporter(file_number, completed_fraction);
+        }
+
+        private void on_upload_complete(Publishing.RESTSupport.BatchUploader uploader,
+                int num_published) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload complete; %d items published.", num_published);
+
+            uploader.upload_complete.disconnect(on_upload_complete);
+            uploader.upload_error.disconnect(on_upload_error);
+
+            do_show_success_pane();
+        }
+
+        private void on_upload_error(Publishing.RESTSupport.BatchUploader uploader,
+                Spit.Publishing.PublishingError err) {
+            if (!is_running())
+                return;
+
+            debug("EVENT: uploader reports upload error = '%s'.", err.message);
+
+            uploader.upload_complete.disconnect(on_upload_complete);
+            uploader.upload_error.disconnect(on_upload_error);
+
+            host.post_error(err);
+        }
+
+
+        private void do_logout() {
+            debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
+
+            if (this.authenticator.can_logout()) {
+                this.authenticator.logout();
+            }
+
+            running = false;
+
+            attempt_start();
+        }
+
+        public void attempt_start() {
+            if (is_running())
+                return;
+
+            debug("TumblrPublisher: starting interaction.");
+
+            running = true;
+            this.authenticator.authenticate();
+        }
+
+        public void start() {
+            if (is_running())
+                return;
+
+            if (was_started)
+                error(_("TumblrPublisher: start( ): can’t start; this publisher is not restartable."));
+
+            debug("TumblrPublisher: starting interaction.");
+
+            attempt_start();
+        }
+
+        public void stop() {
+            debug("TumblrPublisher: stop( ) invoked.");
+
+            //        if (session != null)
+            //            session.stop_transactions();
+
+            running = false;
+        }
+
+
+        // UI elements
+
+
+        /**
+         * The publishing options pane.
+         */
+
+
+        internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
+
+
+
+            private Gtk.Builder builder;
+            private Gtk.Box pane_widget = null;
+            private Gtk.Label upload_info_label = null;
+            private Gtk.Label size_label = null;
+            private Gtk.Label blog_label = null;
+            private Gtk.Button logout_button = null;
+            private Gtk.Button publish_button = null;
+            private Gtk.ComboBoxText size_combo = null;
+            private Gtk.ComboBoxText blog_combo = null;
+            private SizeEntry[] sizes = null;
+            private BlogEntry[] blogs = null;
+            private string username = "";
+            private TumblrPublisher publisher = null;
+            private Spit.Publishing.Publisher.MediaType media_type;
+
+            public signal void publish();
+            public signal void logout();
+
+            public PublishingOptionsPane(TumblrPublisher publisher, Spit.Publishing.Publisher.MediaType media_type, SizeEntry[] sizes, BlogEntry[] blogs, string username) {
+
+                this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+                this.username = username;
+                this.publisher = publisher;
+                this.media_type = media_type;
+                this.sizes = sizes;
+                this.blogs=blogs;
+
+                try {
+                    builder = new Gtk.Builder();
+                    builder.add_from_resource (Resources.RESOURCE_PATH +
+                            "/tumblr_publishing_options_pane.ui");
+                    builder.connect_signals(null);
+
+                    // pull in the necessary widgets from the glade file
+                    pane_widget = (Gtk.Box) this.builder.get_object("tumblr_pane");
+                    upload_info_label = (Gtk.Label) this.builder.get_object("upload_info_label");
+                    logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+                    publish_button = (Gtk.Button) this.builder.get_object("publish_button");
+                    size_combo = (Gtk.ComboBoxText) this.builder.get_object("size_combo");
+                    size_label = (Gtk.Label) this.builder.get_object("size_label");
+                    blog_combo = (Gtk.ComboBoxText) this.builder.get_object("blog_combo");
+                    blog_label = (Gtk.Label) this.builder.get_object("blog_label");
+
+
+                    string upload_label_text = _("You are logged into Tumblr as %s.\n\n").printf(this.username);
+                    upload_info_label.set_label(upload_label_text);
+
+                    populate_blog_combo();
+                    blog_combo.changed.connect(on_blog_changed);
+
+                    if ((media_type != Spit.Publishing.Publisher.MediaType.VIDEO)) {
+                        populate_size_combo();
+                        size_combo.changed.connect(on_size_changed);
+                    } else {
+                        // publishing -only- video - don't let the user manipulate the photo size choices.
+                        size_combo.set_sensitive(false);
+                        size_label.set_sensitive(false);
+                    }
+
+                    logout_button.clicked.connect(on_logout_clicked);
+                    publish_button.clicked.connect(on_publish_clicked);
+                } catch (Error e) {
+                    warning(_("Could not load UI: %s"), e.message);
+                }
+            }
+
+
+
+
+
+            private void on_logout_clicked() {
+                logout();
+            }
+
+            private void on_publish_clicked() {
+
+
+                publish();
+            }
+
+
+            private void populate_blog_combo() {
+                if (blogs != null) {
+                    foreach (BlogEntry b in blogs)
+                        blog_combo.append_text(b.blog);
+                    blog_combo.set_active(publisher.get_persistent_default_blog());
+                }
+            }
+
+            private void on_blog_changed() {
+                publisher.set_persistent_default_blog(blog_combo.get_active());
+            }
+
+            private void populate_size_combo() {
+                if (sizes != null) {
+                    foreach (SizeEntry e in sizes)
+                        size_combo.append_text(e.title);
+                    size_combo.set_active(publisher.get_persistent_default_size());
+                }
+            }
+
+            private void on_size_changed() {
+                publisher.set_persistent_default_size(size_combo.get_active());
+            }
+
+
+            protected void notify_publish() {
+                publish();
+            }
+
+            protected void notify_logout() {
+                logout();
+            }
+
+            public Gtk.Widget get_widget() {
+                return pane_widget;
+            }
+
+            public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
+                return Spit.Publishing.DialogPane.GeometryOptions.NONE;
+            }
+
+            public void on_pane_installed() {
+                publish.connect(notify_publish);
+                logout.connect(notify_logout);
+            }
+
+            public void on_pane_uninstalled() {
+                publish.disconnect(notify_publish);
+                logout.disconnect(notify_logout);
+            }
+        }
+
+        internal class UserInfoFetchTransaction : Publishing.RESTSupport.OAuth1.Transaction {
+            public UserInfoFetchTransaction(Publishing.RESTSupport.OAuth1.Session session) {
+                base.with_uri(session, "https://api.tumblr.com/v2/user/info",
+                        Publishing.RESTSupport.HttpMethod.POST);
+            }
+        }
+
+        internal class UploadTransaction : Publishing.RESTSupport.OAuth1.UploadTransaction {
+            //Workaround for Soup.URI.encode() to support binary data (i.e. string with \0)
+            private string encode( uint8[] data ){
+                var s = new StringBuilder();
+                char[] bytes = new char[2];
+                bytes[1] = 0;
+                foreach( var byte in data )
+                {
+                    if(byte == 0) {
+                        s.append( "%00" );
+                    } else {
+                        bytes[0] = (char)byte;
+                        s.append( Soup.URI.encode((string) bytes, ENCODE_RFC_3986_EXTRA) );
+                    }
+                }
+                return s.str;
+            }
+
+
+            public UploadTransaction(Publishing.RESTSupport.OAuth1.Session session,Spit.Publishing.Publishable publishable, string blog_url)  {
+                debug("Init upload transaction");
+                base(session, publishable,"https://api.tumblr.com/v2/blog/%s/post".printf(blog_url) );
+
+            }
+
+            public override void execute() throws Spit.Publishing.PublishingError {
+                string payload;
+                size_t payload_length;
+                try {
+                    FileUtils.get_contents(base.publishable.get_serialized_file().get_path(), out payload,
+                            out payload_length);
+
+                    string reqdata = this.encode(payload.data[0:payload_length]);
+
+
+
+                    add_argument("data[0]", reqdata);
+                    add_argument("type", "photo");
+                    string[] keywords = base.publishable.get_publishing_keywords();
+                    string tags = "";
+                    if (keywords != null) {
+                        tags = string.joinv (",", keywords);
+                    }
+                    add_argument("tags", Soup.URI.encode(tags, ENCODE_RFC_3986_EXTRA));
+
+                } catch (FileError e) {
+                    throw new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
+                            _("A temporary file needed for publishing is unavailable"));
+
+                }
+
+                this.authorize();
+
+                Publishing.RESTSupport.Argument[] request_arguments = get_arguments();
+                assert(request_arguments.length > 0);
+
+                var request_data = Publishing.RESTSupport.Argument.serialize_list(request_arguments);
+
+                Soup.Message outbound_message = new Soup.Message( "POST", get_endpoint_url());
+                outbound_message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, request_data.data);
+
+                // TODO: there must be a better way to iterate over a map
+                Gee.MapIterator<string, string> i = base.message_headers.map_iterator();
+                bool cont = i.next();
+                while(cont) {
+                    outbound_message.request_headers.append(i.get_key(), i.get_value());
+                    cont = i.next();
+                }
+                set_message(outbound_message);
+
+                set_is_executed(true);
+
+                send();
+            }
+        }
+
+
+
+        internal class Uploader : Publishing.RESTSupport.BatchUploader {
+            private string blog_url = "";
+            public Uploader(Publishing.RESTSupport.OAuth1.Session session, Spit.Publishing.Publishable[] publishables, string blog_url) {
+                base(session, publishables);
+                this.blog_url=blog_url;
+
+            }
+
+
+            protected override Publishing.RESTSupport.Transaction create_transaction(
+                    Spit.Publishing.Publishable publishable) {
+                debug("Create upload transaction");
+                return new UploadTransaction((Publishing.RESTSupport.OAuth1.Session) get_session(), get_current_publishable(), this.blog_url);
+
+            }
+        }
+
+    } //class TumblrPublisher
+
+} //namespace Publishing.Tumblr
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 4be28b4..c94360b 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -349,7 +349,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
 static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
 static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup11 (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);
@@ -437,9 +437,9 @@ static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
@@ -576,7 +576,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -663,7 +663,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup9 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup11 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1742,11 +1742,11 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1740 "YouTubePublishing.c"
-			goto __catch20_g_error;
+			goto __catch25_g_error;
 		}
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
@@ -1783,7 +1783,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		return;
 #line 1779 "YouTubePublishing.c"
 	}
-	__finally20:
+	__finally25:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2469,7 +2469,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2486,7 +2486,7 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2503,7 +2503,7 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2554,7 +2554,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public listed"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _result_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2562,7 +2562,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public unlisted"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _result_;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2570,7 +2570,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Private"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = _result_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3143,11 +3143,11 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3139 "YouTubePublishing.c"
-			goto __catch22_g_error;
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp1_;
@@ -3166,7 +3166,7 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 		_g_error_free0 (_error_);
 #line 3161 "YouTubePublishing.c"
 	}
-	__finally22:
+	__finally27:
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3350,7 +3350,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3346 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp24_ = self->priv->youtube_service;
@@ -3375,7 +3375,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3371 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp30_ = file;
@@ -3394,7 +3394,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3390 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp32_ = g_main_loop_new (NULL, FALSE);
@@ -3433,7 +3433,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3429 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp41_ = _tmp37_;
@@ -3457,8 +3457,8 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_data1_ = NULL;
 #line 3452 "YouTubePublishing.c"
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp42_;
@@ -3477,7 +3477,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_g_error_free0 (_error_);
 #line 3472 "YouTubePublishing.c"
 	}
-	__finally21:
+	__finally26:
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
diff --git a/plugins/shotwell-publishing/meson.build b/plugins/shotwell-publishing/meson.build
new file mode 100644
index 0000000..45058b8
--- /dev/null
+++ b/plugins/shotwell-publishing/meson.build
@@ -0,0 +1,25 @@
+shotwell_publishing_sources = [
+    'shotwell-publishing.vala',
+    'FacebookPublishing.vala',
+    'PicasaPublishing.vala',
+    'FlickrPublishing.vala',
+    'TumblrPublishing.vala',
+    'YouTubePublishing.vala',
+    'PiwigoPublishing.vala']
+
+shotwell_publishing_resources = gnome.compile_resources('publishing-resource',
+        'org.gnome.Shotwell.Publishing.gresource.xml',
+        source_dir : meson.source_root())
+
+shared_module('shotwell-publishing',
+              shotwell_publishing_sources + shotwell_publishing_resources,
+              dependencies : [gtk, soup, gexiv2, gee, sw_plugin, json_glib,
+                              webkit, sw_plugin_common_dep, xml, gdata, gcr,
+                              gcr_ui, authenticator_dep],
+              vala_args : [
+                  '--gresources', 'org.gnome.Shotwell.Publishing.gresource.xml'
+                  ],
+              c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing"',
+                        '-DGCR_API_SUBJECT_TO_CHANGE'],
+              install: true,
+              install_dir : shotwell_plugin_dir)
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index b09902e..5e8ce1c 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -6,6 +6,7 @@
       <file>picasa.png</file>
       <file>piwigo.png</file>
       <file>youtube.png</file>
+      <file>tumblr.png</file>
       <file>facebook_publishing_options_pane.ui</file>
       <file>flickr_publishing_options_pane.ui</file>
       <file>picasa_publishing_options_pane.ui</file>
@@ -13,5 +14,6 @@
       <file>piwigo_publishing_options_pane.ui</file>
       <file>piwigo_ssl_failure_pane.ui</file>
       <file>youtube_publishing_options_pane.ui</file>
+      <file>tumblr_publishing_options_pane.ui</file>
   </gresource>
 </gresources>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 8d7d080..21056e4 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -79,6 +79,16 @@ typedef struct _YouTubeServiceClass YouTubeServiceClass;
 
 typedef struct _PiwigoService PiwigoService;
 typedef struct _PiwigoServiceClass PiwigoServiceClass;
+
+#define TYPE_TUMBLR_SERVICE (tumblr_service_get_type ())
+#define TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TUMBLR_SERVICE, TumblrService))
+#define TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+#define IS_TUMBLR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TUMBLR_SERVICE))
+#define IS_TUMBLR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TUMBLR_SERVICE))
+#define TUMBLR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TUMBLR_SERVICE, TumblrServiceClass))
+
+typedef struct _TumblrService TumblrService;
+typedef struct _TumblrServiceClass TumblrServiceClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _ShotwellPublishingCoreServices {
@@ -127,6 +137,10 @@ PiwigoService* piwigo_service_new (GFile* resource_directory);
 PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_directory);
 GType piwigo_service_get_type (void) G_GNUC_CONST;
 static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
+TumblrService* tumblr_service_new (GFile* resource_directory);
+TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory);
+GType tumblr_service_get_type (void) G_GNUC_CONST;
+static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base);
@@ -144,13 +158,13 @@ static void _vala_array_add1 (SpitPluggable** * array, int* length, int* size, S
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 148 "shotwell-publishing.c"
+#line 162 "shotwell-publishing.c"
 	}
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 154 "shotwell-publishing.c"
+#line 168 "shotwell-publishing.c"
 }
 
 
@@ -161,13 +175,13 @@ static void _vala_array_add2 (SpitPluggable** * array, int* length, int* size, S
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 165 "shotwell-publishing.c"
+#line 179 "shotwell-publishing.c"
 	}
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 171 "shotwell-publishing.c"
+#line 185 "shotwell-publishing.c"
 }
 
 
@@ -178,13 +192,13 @@ static void _vala_array_add3 (SpitPluggable** * array, int* length, int* size, S
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 182 "shotwell-publishing.c"
+#line 196 "shotwell-publishing.c"
 	}
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 188 "shotwell-publishing.c"
+#line 202 "shotwell-publishing.c"
 }
 
 
@@ -195,13 +209,13 @@ static void _vala_array_add4 (SpitPluggable** * array, int* length, int* size, S
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 199 "shotwell-publishing.c"
+#line 213 "shotwell-publishing.c"
 	}
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 205 "shotwell-publishing.c"
+#line 219 "shotwell-publishing.c"
 }
 
 
@@ -212,13 +226,30 @@ static void _vala_array_add5 (SpitPluggable** * array, int* length, int* size, S
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 216 "shotwell-publishing.c"
+#line 230 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 222 "shotwell-publishing.c"
+#line 236 "shotwell-publishing.c"
+}
+
+
+static void _vala_array_add6 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	if ((*length) == (*size)) {
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
+#line 247 "shotwell-publishing.c"
+	}
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[(*length)++] = value;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	(*array)[*length] = NULL;
+#line 253 "shotwell-publishing.c"
 }
 
 
@@ -250,6 +281,12 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	gint _tmp31__length1;
 	GFile* _tmp32_;
 	PiwigoService* _tmp33_;
+	SpitPluggable** _tmp34_;
+	gint _tmp34__length1;
+	GFile* _tmp35_;
+	GFile* _tmp36_;
+	GFile* _tmp37_;
+	TumblrService* _tmp38_;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -294,7 +331,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp12_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection), "facebook");
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp12_) {
-#line 298 "shotwell-publishing.c"
+#line 335 "shotwell-publishing.c"
 		SpitPluggable** _tmp13_;
 		gint _tmp13__length1;
 		GFile* _tmp14_;
@@ -309,7 +346,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 		_tmp15_ = facebook_service_new (_tmp14_);
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_vala_array_add1 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 313 "shotwell-publishing.c"
+#line 350 "shotwell-publishing.c"
 	}
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp16_ = authenicators;
@@ -317,7 +354,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp17_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), "picasa");
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp17_) {
-#line 321 "shotwell-publishing.c"
+#line 358 "shotwell-publishing.c"
 		SpitPluggable** _tmp18_;
 		gint _tmp18__length1;
 		GFile* _tmp19_;
@@ -332,7 +369,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 		_tmp20_ = picasa_service_new (_tmp19_);
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_vala_array_add2 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 336 "shotwell-publishing.c"
+#line 373 "shotwell-publishing.c"
 	}
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp21_ = authenicators;
@@ -340,7 +377,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp22_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection), "flickr");
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp22_) {
-#line 344 "shotwell-publishing.c"
+#line 381 "shotwell-publishing.c"
 		SpitPluggable** _tmp23_;
 		gint _tmp23__length1;
 		GFile* _tmp24_;
@@ -355,7 +392,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 		_tmp25_ = flickr_service_new (_tmp24_);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_vala_array_add3 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 359 "shotwell-publishing.c"
+#line 396 "shotwell-publishing.c"
 	}
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp26_ = authenicators;
@@ -363,7 +400,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp27_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), "youtube");
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp27_) {
-#line 367 "shotwell-publishing.c"
+#line 404 "shotwell-publishing.c"
 		SpitPluggable** _tmp28_;
 		gint _tmp28__length1;
 		GFile* _tmp29_;
@@ -378,7 +415,7 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 		_tmp30_ = you_tube_service_new (_tmp29_);
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_vala_array_add4 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 382 "shotwell-publishing.c"
+#line 419 "shotwell-publishing.c"
 	}
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp31_ = self->priv->pluggables;
@@ -390,6 +427,22 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp33_ = piwigo_service_new (_tmp32_);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_vala_array_add5 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp34_ = self->priv->pluggables;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp34__length1 = self->priv->pluggables_length1;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp35_ = module_file;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp36_ = g_file_get_parent (_tmp35_);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp37_ = _tmp36_;
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp38_ = tumblr_service_new (_tmp37_);
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_vala_array_add6 (&self->priv->pluggables, &self->priv->pluggables_length1, &self->priv->_pluggables_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_object_unref0 (_tmp37_);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_g_object_unref0 (authenicators);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
@@ -398,53 +451,53 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_g_object_unref0 (resource_directory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return self;
-#line 402 "shotwell-publishing.c"
+#line 455 "shotwell-publishing.c"
 }
 
 
 ShotwellPublishingCoreServices* shotwell_publishing_core_services_new (GFile* module_file) {
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return shotwell_publishing_core_services_construct (TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, module_file);
-#line 409 "shotwell-publishing.c"
+#line 462 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_module_name (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _ ("Core Publishing Services");
-#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 422 "shotwell-publishing.c"
+#line 475 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _VERSION;
-#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 435 "shotwell-publishing.c"
+#line 488 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = "org.yorba.shotwell.publishing.core_services";
-#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 448 "shotwell-publishing.c"
+#line 501 "shotwell-publishing.c"
 }
 
 
@@ -455,27 +508,27 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp
 	gint _tmp0__length1;
 	SpitPluggable** _tmp1_;
 	gint _tmp1__length1;
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = _tmp0_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (result_length1) {
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 473 "shotwell-publishing.c"
+#line 526 "shotwell-publishing.c"
 	}
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
-#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 479 "shotwell-publishing.c"
+#line 532 "shotwell-publishing.c"
 }
 
 
@@ -486,7 +539,7 @@ static void shotwell_publishing_core_services_class_init (ShotwellPublishingCore
 	g_type_class_add_private (klass, sizeof (ShotwellPublishingCoreServicesPrivate));
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_publishing_core_services_finalize;
-#line 490 "shotwell-publishing.c"
+#line 543 "shotwell-publishing.c"
 }
 
 
@@ -501,7 +554,7 @@ static void shotwell_publishing_core_services_spit_module_interface_init (SpitMo
 	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_publishing_core_services_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_publishing_core_services_real_get_pluggables;
-#line 505 "shotwell-publishing.c"
+#line 558 "shotwell-publishing.c"
 }
 
 
@@ -517,7 +570,7 @@ static void shotwell_publishing_core_services_instance_init (ShotwellPublishingC
 	self->priv->pluggables_length1 = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 521 "shotwell-publishing.c"
+#line 574 "shotwell-publishing.c"
 }
 
 
@@ -529,7 +582,7 @@ static void shotwell_publishing_core_services_finalize (GObject * obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	G_OBJECT_CLASS (shotwell_publishing_core_services_parent_class)->finalize (obj);
-#line 533 "shotwell-publishing.c"
+#line 586 "shotwell-publishing.c"
 }
 
 
@@ -557,51 +610,51 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	ShotwellPublishingCoreServices* _tmp5_ = NULL;
 	SpitEntryPointParams* _tmp6_;
 	gint _tmp7_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp2_ = params;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*params).module_spit_interface = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp6_ = params;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 579 "shotwell-publishing.c"
+#line 632 "shotwell-publishing.c"
 		SpitEntryPointParams* _tmp8_;
 		GFile* _tmp9_;
 		ShotwellPublishingCoreServices* _tmp10_;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp8_ = params;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp9_ = (*_tmp8_).module_file;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = _tmp10_;
-#line 593 "shotwell-publishing.c"
+#line 646 "shotwell-publishing.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = NULL;
-#line 599 "shotwell-publishing.c"
+#line 652 "shotwell-publishing.c"
 	}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 605 "shotwell-publishing.c"
+#line 658 "shotwell-publishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index dce5954..3515f5f 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -49,6 +49,10 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
 #if HAVE_PIWIGO
         pluggables += new PiwigoService(resource_directory);
 #endif
+
+#if HAVE_TUMBLR
+        pluggables += new TumblrService(module_file.get_parent());
+#endif
     }
     
     public unowned string get_module_name() {
diff --git a/plugins/shotwell-publishing-extras/tumblr.png b/plugins/shotwell-publishing/tumblr.png
index d5bf02b..d5bf02b 100644
--- a/plugins/shotwell-publishing-extras/tumblr.png
+++ b/plugins/shotwell-publishing/tumblr.png
diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
index acc5459..acc5459 100644
--- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
diff --git a/plugins/shotwell-transitions/meson.build b/plugins/shotwell-transitions/meson.build
new file mode 100644
index 0000000..8134292
--- /dev/null
+++ b/plugins/shotwell-transitions/meson.build
@@ -0,0 +1,29 @@
+shotwell_transitions_sources = [
+    'BlindsEffect.vala',
+    'ChessEffect.vala',
+    'CircleEffect.vala',
+    'CirclesEffect.vala',
+    'ClockEffect.vala',
+    'CrumbleEffect.vala',
+    'FadeEffect.vala',
+    'shotwell-transitions.vala',
+    'SlideEffect.vala',
+    'SquaresEffect.vala',
+    'StripesEffect.vala']
+
+shotwell_transitions_resources = gnome.compile_resources('transitions-resource',
+        'org.gnome.Shotwell.Transitions.gresource.xml')
+
+cc = meson.get_compiler('c')
+libm = cc.find_library('m', required : false)
+
+shared_module('shotwell-transitions',
+              shotwell_transitions_sources + shotwell_transitions_resources,
+              dependencies : [gio, gdk_pixbuf, cairo, gtk, gdk, xml, sw_plugin,
+                              sw_plugin_common_dep, gee, soup, webkit, libm],
+              vala_args : [
+                  '--gresources', 'org.gnome.Shotwell.Transitions.gresource.xml',
+                  ],
+              c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Transitions"'],
+              install: true,
+              install_dir : shotwell_plugin_dir)
diff --git a/po/Makevars b/po/Makevars
index c4ecf22..9480715 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -25,7 +25,7 @@ COPYRIGHT_HOLDER = Translation copyright holder
 # Possible values are "yes", "no", or empty.  If it is empty, try to
 # detect it automatically by scanning the files in $(top_srcdir) for
 # "GNU packagename" string.
-PACKAGE_GNU =
+PACKAGE_GNU = no
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
@@ -51,7 +51,7 @@ EXTRA_LOCALE_CATEGORIES =
 # context.  Possible values are "yes" and "no".  Set this to yes if the
 # package uses functions taking also a message context, like pgettext(), or
 # if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
+USE_MSGCTXT = yes
 
 # These options get passed to msgmerge.
 # Useful options are in particular:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d8d341..fb03e9e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,19 +1,18 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 misc/shotwell.appdata.xml.in
-misc/shotwell.desktop.in.in
-misc/shotwell-viewer.desktop.in.in
+misc/shotwell.desktop.in
+misc/shotwell-viewer.desktop.in
 misc/org.yorba.shotwell-extras.gschema.xml
 misc/org.yorba.shotwell.gschema.xml
 plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
-plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
 plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
 plugins/authenticator/shotwell/GoogleAuthenticator.vala
 plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+plugins/authenticator/shotwell/tumblr_authentication_pane.ui
+plugins/authenticator/shotwell/TumblrAuthenticator.vala
 plugins/common/Resources.vala
 plugins/common/RESTSupport.vala
-plugins/shotwell-data-imports/FSpotImporter.vala
-plugins/shotwell-data-imports/shotwell-data-imports.vala
 plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
 plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -21,9 +20,6 @@ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
 plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/RajcePublishing.vala
 plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
-plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
-plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
-plugins/shotwell-publishing-extras/TumblrPublishing.vala
 plugins/shotwell-publishing-extras/YandexPublishing.vala
 plugins/shotwell-publishing-extras/yandex_publish_model.ui
 plugins/shotwell-publishing/facebook_publishing_options_pane.ui
@@ -37,6 +33,8 @@ plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
 plugins/shotwell-publishing/PiwigoPublishing.vala
 plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
 plugins/shotwell-publishing/shotwell-publishing.vala
+plugins/shotwell-publishing/tumblr_publishing_options_pane.ui
+plugins/shotwell-publishing/TumblrPublishing.vala
 plugins/shotwell-publishing/youtube_publishing_options_pane.ui
 plugins/shotwell-publishing/YouTubePublishing.vala
 plugins/shotwell-transitions/BlindsEffect.vala
@@ -53,7 +51,8 @@ plugins/shotwell-transitions/StripesEffect.vala
 src/AppDirs.vala
 src/AppWindow.vala
 src/BatchImport.vala
-src/camera/Branch.vala
+src/camera/CameraBranch.vala
+src/camera/CameraTable.vala
 src/camera/ImportPage.vala
 src/CollectionPage.vala
 src/Commands.vala
@@ -66,19 +65,25 @@ src/Dialogs.vala
 src/Dimensions.vala
 src/direct/DirectPhotoPage.vala
 src/DirectoryMonitor.vala
+src/dialogs/AdjustDateTimeDialog.vala
+src/dialogs/ExportDialog.vala
+src/dialogs/Preferences.vala
+src/dialogs/ProgressDialog.vala
+src/dialogs/SetBackgroundSlideshow.vala
+src/dialogs/WelcomeDialog.vala
 src/editing_tools/EditingTools.vala
 src/editing_tools/StraightenTool.vala
-src/events/Branch.vala
 src/events/EventDirectoryItem.vala
 src/events/EventPage.vala
+src/events/EventsBranch.vala
 src/events/EventsDirectoryPage.vala
 src/Event.vala
 src/Exporter.vala
-src/folders/Branch.vala
-src/library/Branch.vala
+src/folders/FoldersBranch.vala
 src/library/FlaggedPage.vala
 src/library/ImportQueuePage.vala
 src/library/LastImportPage.vala
+src/library/LibraryBranch.vala
 src/library/LibraryWindow.vala
 src/library/OfflinePage.vala
 src/library/TrashPage.vala
@@ -100,14 +105,14 @@ src/publishing/PublishingUI.vala
 src/publishing/Publishing.vala
 src/Resources.vala
 src/Screensaver.vala
-src/searches/Branch.vala
 src/searches/SavedSearchDialog.vala
 src/searches/SearchBoolean.vala
+src/searches/SearchesBranch.vala
 src/SearchFilter.vala
 src/SlideshowPage.vala
 src/slideshow/Slideshow.vala
 src/slideshow/TransitionEffects.vala
-src/tags/Branch.vala
+src/tags/TagsBranch.vala
 src/Tag.vala
 src/VideoSupport.vala
 ui/collection.ui
@@ -117,11 +122,15 @@ ui/events_directory.ui
 ui/event.ui
 ui/import_queue.ui
 ui/import.ui
+ui/manifest_widget.ui
 ui/media.ui
+ui/multitextentrydialog.ui
 ui/offline.ui
 ui/photo_context.ui
 ui/photo.ui
+ui/preferences_dialog.ui
 ui/printing_widget.ui
+ui/saved_search_dialog.ui
 ui/savedsearch.ui
 ui/search_bar.ui
 ui/search_sidebar_context.ui
@@ -129,6 +138,8 @@ ui/set_background_dialog.ui
 ui/set_background_slideshow_dialog.ui
 ui/shotwell.ui
 ui/sidebar_default_context.ui
+ui/slideshow_settings.ui
 ui/tag_sidebar_context.ui
 ui/tags.ui
+ui/textentrydialog.ui
 ui/trash.ui
diff --git a/po/ca.gmo b/po/ca.gmo
index 12d82f2..4cba08f 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index eaa2bca..43f269e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,92 +5,1506 @@
 #
 #
 # Translators:
-# jesjimher <jesjimenez@gmail.com>, 2012
-# jodufi <jodufi@gmail.com>, 2011, 2012
-# prottoman <marc@marcrafols.com>, 2013
-# verayin <vera@yorba.org>, 2011
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2012
-# jodufi <jodufi@gmail.com>, 2012
-# jodufi <jodufi@gmail.com>, 2011
-# lsbeeler <lucas@yorba.org>, 2011
+# jesjimher <jesjimenez@gmail.com>, 2012.
+# jodufi <jodufi@gmail.com>, 2011, 2012.
+# prottoman <marc@marcrafols.com>, 2013.
+# verayin <vera@yorba.org>, 2011.
+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2012.
+# jodufi <jodufi@gmail.com>, 2012.
+# jodufi <jodufi@gmail.com>, 2011.
+# lsbeeler <lucas@yorba.org>, 2011.
+# Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2017.
+# Jordi Serratosa <jordis@softcatala.cat>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2016-10-09 19:59+0200\n"
-"PO-Revision-Date: 2016-10-08 17:13+0200\n"
-"Last-Translator: Jordi Mas <paugnu@gmail.com>\n"
-"Language-Team: ca_ES <tradgnome@softcatala.net>\n"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-01-20 21:59+0100\n"
+"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
+"Language-Team: Catalan <info@softcatala.org>\n"
 "Language: ca\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: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.4\n"
 
-#: ../plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Visiteu la pàgina web del Shotwell"
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
+#: ui/tags.ui:356
+msgid "Shotwell"
+msgstr "Shotwell"
 
-#: ../plugins/common/Resources.vala:31 ../src/AppWindow.vala:679
-msgid "translator-credits"
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Gestor de fotografies popular"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
 msgstr ""
-"Pau Iranzo <paugnu@gmail.com>, 2015\n"
-"Jordi Mas <jmas@softcatala.org>, 2016"
+"Shotwell és un ràpid organitzador de fotografies fàcil d'usar, dissenyat per "
+"a l'escriptori GNOME. Es poden importar imatges des de la seva càmera o "
+"disc, organitzar-les per data i tema, fins i tot qualificar-les. També "
+"ofereix funcions bàsiques d'edició, com retallar, correcció d'ulls vermells, "
+"ajustaments de color, i redreçar. L'editor de fotografies Shotwell no "
+"destrueix ni altera les seves imatges mestres, per tant,  és fàcil "
+"d'experimentar i corregir errors."
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+"Quan estigui llest, Shotwell pot pujar les seves fotografies a diversos "
+"llocs web, com Facebook, Flickr, Picasa (Google Plus), i més."
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:202
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr ""
+"Shotwell és compatible amb JPEG, PNG, TIFF, i una varietat de formats de "
+"fitxer RAW."
+
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Desenvolupadors del Shotwell"
+
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Gestor de fotografies"
+
+#: misc/shotwell.desktop.in:6
+msgid "Organize your photos"
+msgstr "Organitzeu les vostres fotografies"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in:8
 msgid ""
-"⚫ This website presented identification that belongs to a different website."
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
 msgstr ""
+"àlbum;càmera;càmeres;cultiu;edició;millorar;exportació;galeria;imatge;"
+"imatges;importar;organitzar;foto;fotògrafs;fotos;imatge;imatges;fotografia;"
+"impressió;publicar;girar;compartir;etiquetes;vídeo;facebook;flickr;picasa;"
+"youtube;Piwigo;"
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:207
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in:4
+msgid "Shotwell Viewer"
+msgstr "Visualitzador del Shotwell"
+
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Visualitzador de fotografies"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "testimoni d'autenticació"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Testimoni d'autenticació si et connectes a Yandex-Fotki."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Testimoni"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "El testimoni per accedir a tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Testimoni secret"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr "El testimoni secret per firmar les sol·licituds oauth"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:498
+msgid "default size"
+msgstr "mida per defecte"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
 msgid ""
-"⚫ This website’s identification is too old to trust. Check the date on your "
-"computer’s calendar."
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+"Un codi numèric que representa la mida per defecte de fotos pujades a Tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "blog per defecte"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr "El nom del blog per defecte de l'usuari, si és el cas"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "L'URL de Rajce"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+msgid "URL of the Rajce server."
+msgstr "L'URL del servidor de Rajce."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "username"
+msgstr "nom d'usuari"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Si estàs connectat amb nom d'usuari de Rajce"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "testimoni"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr "Si recordaves el testimoni d'usuari."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:542
+msgid "last category"
+msgstr "Darrera categoria"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr "La darrera categoria Rajce seleccionada."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:554
+msgid "last photo size"
+msgstr "Mida de la darrera imatge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
 msgstr ""
+"Un codi numèric que representa l'última mida de la imatge preestablerta "
+"utilitzada al publicar a Rajce."
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:212
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "recorda"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "Si és veritat, recorda l'últim inici de sessió."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "amaga l'àlbum"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr "Si és veritat, amaga l'àlbum acabat de crear a Rajce."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "obre l'àlbum al navegador"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
 msgid ""
-"⚫ This website’s identification was not issued by a trusted organization."
+"If true, open target album in the web browser just after uploading photos"
 msgstr ""
+"Si és veritat, obre l'àlbum de destí al navegador web solament després de "
+"pujar les fotografies"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "remove sensitive info from uploads"
+msgstr "suprimeix les dades confidencials de les pujades"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+"Abans de carregar les imatges a Rajce hauria d'haver suprimit les seves "
+"metadades primer"
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:217
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr "mostra les propietats bàsiques"
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr ""
+"Veritat si es vol mostrar el panell de propietats bàsiques, fals en cas "
+"contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+msgstr "Mostra propietats ampliades"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
-"⚫ This website’s identification could not be processed. It may be corrupted."
+"True if the extended properties window is to be displayed, false otherwise."
 msgstr ""
+"Veritat si es vol mostrar la finestra de propietats ampliades, fals en cas "
+"contrari."
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:222
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "mostra la barra lateral"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr "Veritat si es vol mostrar la barra lateral, fals en cas contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "mostra la barra d'eines"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr ""
+"Veritat si es vol mostrar la barra d'eines inferior, fals en cas contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "mostra la barra de cerca"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr ""
+"Veritat si la barra d'eines de cerca/filtre ha de ser mostrada, fals en cas "
+"contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr "mostra els títols de la imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
 msgid ""
-"⚫ This website’s identification has been revoked by the trusted organization "
-"that issued it."
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
 msgstr ""
+"Veritat si els títols de la fotografia s'ha de mostrar a sota de les "
+"miniatures en les visualitzacions de la col·lecció, fals en cas contrari."
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:227
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr "mostra els comentaris de la fotografia"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
 msgid ""
-"⚫ This website’s identification cannot be trusted because it uses very weak "
-"encryption."
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
 msgstr ""
+"Veritat si els comentaris de la fotografia s'han de mostrar a sota de les "
+"miniatures en les visualitzacions de la col·lecció, fals en cas contrari."
 
-#. Possible error message when a site presents a bad certificate.
-#: ../plugins/common/RESTSupport.vala:232
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr "mostra els comentaris de l'esdeveniment"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
 msgid ""
-"⚫ This website’s identification is only valid for future dates. Check the "
-"date on your computer’s calendar."
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
 msgstr ""
+"Veritat si els comentaris d'esdeveniments s'han de mostrar a sota de les "
+"miniatures en les vistes d'esdeveniments, fals en cas contrari."
 
-#: ../plugins/common/RESTSupport.vala:509
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "No està disponible un fitxer temporal que cal per publicar"
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr "mostra les etiquetes de la fotografia"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+"Veritat si les etiquetes de la fotografia apareixen a sota les miniatures en "
+"les visualitzacions de la col·lecció, fals en cas contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr "mostra la qualificació de la fotografia"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+"Veritat si la qualificació de la fotografia s'ha de mostrar com retall "
+"superposat, fals en cas contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr "filtre de valoració de nivell"
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+"Determina com filtrar les fotografies segons la seva classificació. 1: "
+"Rebutjat o millor, 2: Sense valoració o millor, 3: Un o millor, 4: Dos o "
+"millor, 5: Tres o millor, 6: Quatre o millor, 7: Cinc o millor."
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr "Ordena esdeveniments de forma ascendent"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+"Veritat si els esdeveniments s'ordenen de forma ascendent, fals si és de "
+"forma descendent."
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "sort library photos ascending"
+msgstr "Ordena les fotografies de la biblioteca de forma ascendent"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+"Veritat si les fotografies de la biblioteca s'han de classificar de forma "
+"ascendent, fals si és de forma descendent."
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr "Criteris de classificació de les fotografies de la biblioteca"
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+"Un codi numèric que especifica els criteris de classificació per a les "
+"fotografies en les vistes de la biblioteca."
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "sort event photos ascending"
+msgstr "Ordena els esdeveniments de les fotografies de forma ascendent"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+"Veritat si les fotografies de l'esdeveniment s'han de classificar de forma "
+"ascendent, fals si és de forma descendent."
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "sort event photos criteria"
+msgstr "criteris per classificar fotografies d'esdeveniments"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+"Especifica els criteris de classificació de les fotografies de "
+"l'esdeveniment."
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "utilitza temps de vint-i-quatre hores "
+
+#: 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 ""
+"Veritat si el temps s'ha de mostrar com un rellotge de vint-i-quatre hores, "
+"fals si el temps s'ha d'utilitzar amb l'anotació d'AM/PM."
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr "manté el temps relatiu entre fotografies"
+
+#: 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 ""
+"Veritat si s'ajusta l'hora/data de les fotografies, s'ha de mantenir el "
+"temps relativament. Fals si totes les imatges s'han de classificar al mateix "
+"temps."
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid "modify original photo files"
+msgstr "modifica els fitxers originals de les fotografies"
+
+#: 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 ""
+"Veritat si a l'ajustar la data/hora de les fotografies, els fitxers "
+"originals també han de ser modificats. Fals si els canvis s'han de realitzar "
+"solament a la base de dades."
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr "Mostra diàleg de benvinguda a l'inici"
+
+#: 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 ""
+"Veritat si, a l'iniciar-se, s'ha de mostrar un diàleg de benvinguda. Fals si "
+"no s'ha de mostrar."
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "sidebar position"
+msgstr "Posició de la barra lateral"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr "L'amplada, en píxels, de la barra lateral"
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr "fotografia a escala miniatura"
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr "L'escala de miniatures de la fotografia, entre 72 i 360."
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "pin toolbar state"
+msgstr "estat del pin de la barra d'eines"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr "Pin de la barra d'eines a pantalla completa, o no."
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+msgid "background color"
+msgstr "color de fons"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr "Un color en l'escala de grisos per al seu ús com el color de fons."
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "Fons per les imatges transparents"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "El fons a utilitzar per imatges transparents."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "Color per al fons de transparència sòlida"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Color a usar si el fons per imatges transparents està establert com a color "
+"sòlid"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr "Estat de la selecció d'opció \"ocultar imatges\""
+
+#: misc/org.yorba.shotwell.gschema.xml:180
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+"Últim estat de selecció utilitzat de l'opció \"ocultar imatges ja importades"
+"\" en la pàgina d'importació."
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+msgid "delay"
+msgstr "retard"
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr "Retard (en segons) entre imatges a la presentació."
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "transition delay"
+msgstr "retard de transició:"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+"El temps (en segons) que s'executa una transició entre imatges en una "
+"presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:199
+msgid "transition effect id"
+msgstr "identificació d'efecte de transició:"
+
+#: misc/org.yorba.shotwell.gschema.xml:200
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+"El nom de l'efecte de transició que s'utilitzarà entre les imatges quan "
+"s'executa una presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:205
+msgid "Show title"
+msgstr "Mostra el títol"
+
+#: misc/org.yorba.shotwell.gschema.xml:206
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+"Si es mostra el títol d'una fotografia durant la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "maximize library window"
+msgstr "maximitzar la finestra de la biblioteca"
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+"Veritat si l'aplicació de la biblioteca està maximitzada, fals en cas "
+"contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "width of library window"
+msgstr "amplada de la finestra de la biblioteca"
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "The last recorded width of the library application window."
+msgstr ""
+"L'última amplada registrada de la finestra de l'aplicació de la biblioteca."
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "height of library window"
+msgstr "alçada de la finestra de la biblioteca"
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded height of the library application window."
+msgstr ""
+"L'última amplada registrada de la finestra de l'aplicació de la biblioteca."
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "maximize direct-edit window"
+msgstr "Maximitza la finestra d'edició directa"
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+"Veritat si l'aplicació d'edició directa està maximitzada, fals en cas "
+"contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "width of direct-edit window"
+msgstr "amplada de la finestra d'edició directa"
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+"L'última amplada registrada de la finestra de l'aplicació d'edició directa."
+
+#: misc/org.yorba.shotwell.gschema.xml:243
+msgid "height of direct-edit window"
+msgstr "alçada de la finestra d'edició directa"
+
+#: misc/org.yorba.shotwell.gschema.xml:244
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+"L'última alçada registrada de la finestra de l'aplicació d'edició directa."
+
+#: misc/org.yorba.shotwell.gschema.xml:249
+msgid "sidebar divider position"
+msgstr "posició del divisor de la barra lateral"
 
-#: ../plugins/common/RESTSupport.vala:1167
+#: misc/org.yorba.shotwell.gschema.xml:250
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+"L'última posició registrada del divisor entre la barra lateral i la vista en "
+"la finestra de l'aplicació de la biblioteca."
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+msgid "import directory"
+msgstr "importa al directori"
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid "Directory in which imported photo files are placed."
+msgstr "Directori on es col·loquen els fitxers d'imatges importades."
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "watch library directory for new files"
+msgstr "veure el directori de la biblioteca per als fitxers nous"
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+"Veritat si, els fitxers afegits al directori de la biblioteca s'importen "
+"automàticament."
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid "write metadata to master files"
+msgstr "s'estan escrivint les metadades als fitxers mestres..."
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+"Veritat si, els canvis a les metadades (etiquetes, títols, etc.) s'escriuen "
+"en el fitxer de la imatge mestra."
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "use lowercase filenames"
+msgstr "utilitza minúscules en noms de fitxer"
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+"Veritat si, Shotwell converteix tots els noms de fitxer a minúscules en "
+"importar fitxers de fotografies"
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+msgid "directory pattern"
+msgstr "patró de directori"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+"Una cadena que codifica un patró de nomenclatura que utilitzarà per anomenar "
+"directoris de la fotografia a la importació."
+
+#: misc/org.yorba.shotwell.gschema.xml:287
+msgid "directory pattern custom"
+msgstr "patró de directori personalitzat"
+
+#: misc/org.yorba.shotwell.gschema.xml:288
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+"Una cadena que codifica un patró de nomenclatura personalitzat que "
+"s'utilitza per anomenar directoris de la fotografia a la importació."
+
+#: misc/org.yorba.shotwell.gschema.xml:293
+msgid "RAW developer default"
+msgstr "Desenvolupador RAW per defecte"
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+"Opció per defecte per al qual el desenvolupador RAW utilitzarà Shotwell."
+
+#: misc/org.yorba.shotwell.gschema.xml:301
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+"Més recentment utilitzat de l'escapçament de l'aspecte del menú a escollir."
+
+#: misc/org.yorba.shotwell.gschema.xml:302
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+"Un codi numèric que representa l'última opció del menú del cultiu que "
+"realitza de l'usuari."
+
+#: misc/org.yorba.shotwell.gschema.xml:306
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+"Més recentment utilitzat de l'escapçament personalitzat de l'aspecte "
+"enumerat."
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+"Un nombre sencer positiu diferent de zero que representa la part ample de "
+"l'última proporció del cultiu personalitzat que l'usuari va introduir."
+
+#: misc/org.yorba.shotwell.gschema.xml:311
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+"Més recentment utilitzat de l'escapçament personalitzat de l'aspecte "
+"denominador."
+
+#: misc/org.yorba.shotwell.gschema.xml:312
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+"Un nombre sencer positiu diferent de zero, que representa la part de "
+"l'alçada de l'última proporció del cultiu personalitzat que l'usuari va "
+"introduir."
+
+#: misc/org.yorba.shotwell.gschema.xml:319
+msgid "external photo editor"
+msgstr "editor extern d'imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:320
+msgid "External application used to edit photos."
+msgstr "Aplicació externa utilitzada per a l'edició de fotografies."
+
+#: misc/org.yorba.shotwell.gschema.xml:325
+msgid "external raw editor"
+msgstr "Editor extern RAW"
+
+#: misc/org.yorba.shotwell.gschema.xml:326
+msgid "External application used to edit RAW photos."
+msgstr "Aplicació externa utilitzada per a l'edició de fotografies RAW."
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: how to trim images"
+msgstr "Configuració de diàleg d'exportació: com retallar imatges"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "export metadata"
+msgstr "exporta les metadades"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: option to export metadata"
+msgstr "Configuració de diàleg d'exportació: opció per exportar metadades"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "format setting, special value"
+msgstr "ajust del format, valor especial"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: format setting, special value"
+msgstr "Configuració de diàleg d'exportació: ajust del format, valor especial"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "format setting, type value"
+msgstr "ajust del format, tipus de valor"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: format setting, type value"
+msgstr "Configuració de diàleg d'exportació: ajust del format, tipus de valor"
+
+#: misc/org.yorba.shotwell.gschema.xml:388
+msgid "JPEG quality option"
+msgstr "Opció de qualitat JPEG"
+
+#: misc/org.yorba.shotwell.gschema.xml:389
+msgid "Setting in export dialog: jpeg quality option"
+msgstr "Configuració de diàleg d'exportació: opció de qualitat JPEG"
+
+#: misc/org.yorba.shotwell.gschema.xml:394
+msgid "maximal size of image"
+msgstr "mida màxima de la imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:395
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Configuració de diàleg d'exportació: mida màxima de la imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:402
+msgid "last used publishing service"
+msgstr "últim servei de publicació utilitzats"
+
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+"Un codi numèric que representa l'últim servei al que es van publicar les "
+"imatges"
+
+#: misc/org.yorba.shotwell.gschema.xml:408
+msgid "default publishing service"
+msgstr "serveis de publicació per defecte"
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "access token"
+msgstr "testimoni d'accés"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+"Testimoni OAuth de Facebook per la sessió actualment connectada, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+msgid "user i.d."
+msgstr "ID d'usuari"
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr "ID d'usuari de Facebook per a l'usuari actualment connectat, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:434
+msgid "user name"
+msgstr "nom d'usuari"
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "Nom de l'usuari de Facebook actualment connectat, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
+msgid "default size code"
+msgstr "codi de mida per defecte"
+
+#: misc/org.yorba.shotwell.gschema.xml:441
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+"Un codi numèric que representa la mida per defecte per a les fotografies "
+"publicades a Facebook"
+
+#: misc/org.yorba.shotwell.gschema.xml:447
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+"Si les imatges que es carreguen a Facebook han de tenir les seves metadades "
+"eliminades primer"
+
+#: misc/org.yorba.shotwell.gschema.xml:454
+msgid "OAuth Access Phase Token"
+msgstr "Testimoni de la fase d'accés OAuth"
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+"El testimoni d'autorització per a l'usuari actualment connectat a Flickr, si "
+"escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "OAuth Access Phase Token Secret"
+msgstr "Testimoni de la fase d'accés secreta OAuth"
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+"El secret criptogràfic utilitzat per signar peticions contra el testimoni "
+"d'autorització per a l'usuari actualment connectat a Flickr, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr "El nom d'usuari de l'usuari actualment connectat Flickr, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+"Un codi numèric que representa la mida per defecte per a les imatges "
+"publicades a Flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:478
+msgid "default visibility"
+msgstr "visibilitat per defecte"
+
+#: misc/org.yorba.shotwell.gschema.xml:479
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+"Un codi numèric que representa la visibilitat predeterminada per les imatges "
+"publicades a Flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:485
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+"Si les imatges que es carreguen a Flickr han de tenir les seves metadades "
+"eliminades primer"
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
+msgid "refresh token"
+msgstr "testimoni d'actualització"
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+"El testimoni d'OAuth utilitzat per actualitzar la sessió d'Àlbums web de "
+"Picasa per a l'usuari que ha iniciat sessió actualment, si escau."
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+"Un codi numèric que representa la mida per defecte de les fotografies "
+"pujades als àlbums web de Picasa"
+
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "last album"
+msgstr "últim àlbum"
+
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+"El nom del últim àlbum de fotografies que l'usuari publica per, si escau"
+
+#: misc/org.yorba.shotwell.gschema.xml:511
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+"Si les imatges que es carreguen a Picasa han de tenir les seves metadades "
+"eliminades primer"
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "Piwigo URL"
+msgstr "L'URL de Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "URL of the Piwigo server."
+msgstr "Servidor URL del Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "Piwigo username, if logged in."
+msgstr "Nom d'usuari Piwigo, si s'ha connectat."
+
+#: misc/org.yorba.shotwell.gschema.xml:530
+msgid "password"
+msgstr "contrasenya"
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "Piwigo password, if logged in."
+msgstr "contrasenya Piwigo, si s'ha connectat."
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "remember password"
+msgstr "recorda la contrasenya"
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "If true, remember the Piwigo password."
+msgstr "Si és veritat, recorda la contrasenya de Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid "The last selected Piwigo category."
+msgstr "L'última categoria seleccionada de Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:548
+msgid "last permission level"
+msgstr "últim nivell de permís"
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid "The last chosen Piwigo permission level."
+msgstr "L'últim nivell de permís triat de Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+"Un codi numèric que representa l'última mida de la foto predeterminada que "
+"s'utilitza en publicar a Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+"Si les imatges que es carreguen a Piwigo han de tenir les seves metadades "
+"eliminades primer"
+
+#: misc/org.yorba.shotwell.gschema.xml:566
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+"si el títol està conjunt i el comentari desactivat, utilitzeu títol com a "
+"comentari per pujades a Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:567
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+"Si les imatges que es pugen a Piwigo han de tenir el comentari establert des "
+"del títol o si el títol està establert i el comentari desactivat"
+
+#: misc/org.yorba.shotwell.gschema.xml:572
+msgid "do not upload tags when uploading to Piwigo"
+msgstr "No pugi etiquetes al pujar a Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:573
+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 ""
+"Si les imatges que es pugen a Piwigo han de tenir les seves etiquetes "
+"eliminades en la càrrega, de manera que aquestes etiquetes no apareixeran en "
+"el servidor remot de Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 username"
+msgstr "nom d'usuari de Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "API key"
+msgstr "clau d'API:"
+
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "Gallery3 API key"
+msgstr "Clau d'API de Gallery3:"
+
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid "Gallery3 site URL"
+msgstr "Lloc URL de Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+"Indica si les imatges que es carreguen a Gallery3 han de tenir les seves "
+"metadades eliminades primer"
+
+#: misc/org.yorba.shotwell.gschema.xml:610
+msgid "scaling constraint of uploaded picture"
+msgstr "restricció de la imatge escalada carregada"
+
+#: misc/org.yorba.shotwell.gschema.xml:611
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+"La identificació de l'escalat restringit de la imatge que es va a carregar"
+
+#: misc/org.yorba.shotwell.gschema.xml:616
+msgid "pixels of the major axis uploaded picture"
+msgstr "Píxels de l'eix principal de la imatge carregada"
+
+#: misc/org.yorba.shotwell.gschema.xml:617
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+"Els píxels de l'eix principal de la imatge per ser carregats; utilitza només "
+"si un valor adequat és escalat en restriccions identificades"
+
+#: misc/org.yorba.shotwell.gschema.xml:625
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+"El testimoni d'OAuth utilitzat per actualitzar la sessió de YouTube per "
+"l'usuari actualment connectat, si escau."
+
+#: misc/org.yorba.shotwell.gschema.xml:632
+msgid "last used import service"
+msgstr "últim servei d'importació utilitzat"
+
+#: misc/org.yorba.shotwell.gschema.xml:633
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+"Un codi numèric que representa l'últim servei del qual es van importar "
+"imatges"
+
+#: misc/org.yorba.shotwell.gschema.xml:640
+msgid "interpreter state cookie"
+msgstr "estat de la galeta d'intèrpret"
+
+#: misc/org.yorba.shotwell.gschema.xml:641
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+"Un codi numèric que captura l'estat del medi ambient del plug-in de GStreamer"
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content layout mode"
+msgstr "el mode del disseny del contingut"
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+"Un codi numèric que descriu com es disposen les imatges a la pàgina durant "
+"la impressió"
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+msgid "content ppi"
+msgstr "contingut ppi"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+"El nombre de píxels per polzada (ppi) envia a la impressora durant la "
+"impressió"
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+msgid "content width"
+msgstr "l'amplada del contingut"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid "The width of the printed emulsion on the page when printing"
+msgstr "L'amplada de l'emulsió d'imprès a la pàgina en imprimir"
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+msgid "content height"
+msgstr "l'alçada del contingut"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid "The height of the printed emulsion on the page when printing"
+msgstr "L'alçada de l'emulsió d'imprès a la pàgina quan s'imprimeix"
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "content units"
+msgstr "els blocs del contingut"
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+"Un codi numèric que representa la unitat de mesura (polzades o centímetres) "
+"utilitzats en imprimir"
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+msgid "images per page code"
+msgstr "imatges per codi de la pàgina"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+"Un codi numèric que representa les imatges seleccionades per la manera de "
+"pàgina que utilitza quan s'imprimeix"
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+msgid "size selection"
+msgstr "selecció de la mida"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+"L'índex de la mida d'impressió actual en una llista predeterminada de mides "
+"estàndard"
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "match aspect ratio"
+msgstr "relació d'aspecte de la imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+"Determina si les mides d'impressió personalitzades han de coincidir amb la "
+"relació d'aspecte de la imatge original"
+
+#: misc/org.yorba.shotwell.gschema.xml:696
+msgid "print titles"
+msgstr "Imprimeix els títols de la imatge"
+
+#: misc/org.yorba.shotwell.gschema.xml:697
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+"Veritat si el títol d'una imatge ha de ser impresa quan s'imprimeix, fals en "
+"cas contrari."
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "titles font"
+msgstr "títols de la font"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+"El nom de la font que s'utilitza per als títols de les imatges quan "
+"s'imprimeixen."
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable facebook publishing plugin"
+msgstr "Habilita el complement de publicació de Facebook"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Facebook està habilitat, fals "
+"en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+msgid "enable flickr publishing plugin"
+msgstr "Habilita el complement de publicació de flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Flickr està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable picasa publishing plugin"
+msgstr "Habilita el complement de publicació de picasa"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació d'Àlbums Web Picasa està "
+"habilitat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable youtube publishing plugin"
+msgstr "Habilita el complement de publicació de youtube"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de YouTube està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+msgid "enable piwigo publishing plugin"
+msgstr "Habilita el complement de publicació de piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Piwigo està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+msgid "enable yandex publishing plugin"
+msgstr "Habilita el complement de publicació de yandex"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Yandex.Fotki està habilitat, "
+"fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+msgid "enable tumblr publishing plugin"
+msgstr "Habilita el complement de publicació de tumblr"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Tumblr està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable rajce publishing plugin"
+msgstr "Habilita el complement de publicació de rajce"
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Rajce està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+msgid "enable gallery3 publishing plugin"
+msgstr "Habilita el complement de publicació de gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de Gallery3 està habilitat, fals "
+"en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+msgid "enable F-Spot import plugin"
+msgstr "Habilita el complement de publicació de F-Spot"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el complement de la publicació de F-Spot està habilitat, fals en "
+"cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+msgid "enable slideshow crumble transition"
+msgstr "Activa la transició d'engruna de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de l'engruna està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+msgid "enable slideshow fade transition"
+msgstr "Activa la transició de destenyir de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de destenyir està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+msgid "enable slideshow slide transition"
+msgstr "Activa la transició de diapositiva de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de la diapositiva "
+"està activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow clock transition"
+msgstr "Activa la transició de rellotge de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació del rellotge està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow circle transition"
+msgstr "Activa la transició de cercle de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació del cercle està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+msgid "enable slideshow circles transition"
+msgstr "Activa la transició de cercles de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació dels cercles està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+msgid "enable slideshow blinds transition"
+msgstr "Activa la transició de ceguera de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de la ceguera està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+msgid "enable slideshow squares transition"
+msgstr "Activa la transició de quadrícula de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de la quadrícula està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:822
+msgid "enable slideshow stripes transition"
+msgstr "Activa la transició de ratlles de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:823
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació de les ratlles està "
+"activat, fals en cas contrari"
+
+#: misc/org.yorba.shotwell.gschema.xml:828
+msgid "enable slideshow chess transition"
+msgstr "Activa la transició d'escacs de la presentació de diapositives"
+
+#: misc/org.yorba.shotwell.gschema.xml:829
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+"Veritat si el connector de transició de la presentació del tauler d'escacs "
+"està activat, fals en cas contrari"
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Actualment no esteu connectat al Facebook.\n"
+"\n"
+"Si encara no teniu un compte al Facebook, podeu crear-ne un durant el procés "
+"de connexió. Durant la connexió, el Shotwell Connect pot ser que us demani "
+"permís per pujar fotografies i publicar-les al mur. Aquests permisos són "
+"necessaris perquè el Shotwell Connect funcioni."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Ja us heu connectat i desconnectat al Facebook en aquesta sessió del "
+"Shotwell.\n"
+"Per continuar publicant al Facebook, sortiu i reinicieu el Shotwell i a "
+"continuació, proveu de publicar de nou."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Actualment no esteu connectat al Flickr.\n"
+"\n"
+"Feu clic a connecta per connectar-vos al Flickr en el navegador web.  Haureu "
+"d'autoritzar al Shotwell Connect per enllaçar al vostre compte del Flickr."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
+msgid "Preparing for login…"
+msgstr "Preparant-se per connectar..."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Ha fallat l'autorització de Flickr "
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
+msgid "Verifying authorization…"
+msgstr " Verificant l'autorització..."
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -104,109 +1518,243 @@ msgstr ""
 "Per continuar publicant als serveis de Google, sortiu i reinicieu el "
 "Shotwell i proveu a publicar de nou."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:33
-#: ../src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
-"Welcome to the F-Spot library import service.\n"
+"You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
+"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 ""
-"Benvingut al servei d'importació de biblioteques de F-Spot\n"
+"No esteu connectat a Picasa Web Albums.\n"
 "\n"
-"Trieu una biblioteca a importar, ja sigui triant una de les biblioteques "
-"trobades per Shotwell o bé seleccionant alternativament un fitxer de base de "
-"dades de l'F-Spot."
+"Feu clic en «Entra» per connectar-vos a Picasa Web Albums del navegador web. "
+"Haureu d'autoritzar Shotwell Connect per poder enllaçar amb el vostre compte "
+"Picasa Web Albums."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
-"Welcome to the F-Spot library import service.\n"
+"You are not currently logged into YouTube.\n"
 "\n"
-"Please select an F-Spot database file."
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
 msgstr ""
-"Benvingut al servei d'importació de biblioteques de l'F-Spot.\n"
+"No esteu connectat al YouTube.\n"
 "\n"
-"Seleccioneu un fitxer de base de dades de l'F-Spot."
+"Per continuar heu de tenir un compte al Google i configurar-lo per poder "
+"continuar utilitzant-lo amb el YouTube. Podeu configurar la majoria dels "
+"comptes utilitzant el navegador i entrant almenys un cop al YouTube."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Seleccionar manualment un fitxer de biblioteca F-Spot a importar:"
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Adreça _electrònica"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Contrasenya"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "inici de sessió"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Introduïu el nom d'usuari i contrasenya associats amb el vostre compte de "
+"Tumblr."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "El nom d'usuari i/o la contrasenya no són vàlids. Proveu de nou"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Nom d'usuari o contrasenya no són vàlides"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "No s'ha pogut carregar la interfície: %s"
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "Visiteu la pàgina web del Shotwell"
+
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
+msgid "translator-credits"
+msgstr ""
+"Pau Iranzo <paugnu@gmail.com>, 2015\n"
+"Jordi Mas <jmas@softcatala.org>, 2016"
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
 msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
+"⚫ This website presented identification that belongs to a different website."
 msgstr ""
-"No es pot obrir el fitxer de base de dades F-Spot seleccionat: el fitxer no "
-"existeix o no és una base de dades F-Spot correcta"
+"⚫ Aquest lloc web presenta una identificació que pertany a un lloc web "
+"diferent."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
 msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
 msgstr ""
-"No es pot obrir el fitxer de base de dades F-Spot seleccionat: Shotwell no "
-"suporta aquesta versió de F-Spot"
+"⚫ La identificació d'aquest lloc web és massa antic per a confiar-hi. "
+"Comprovi la data en el calendari del seu equip."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
+"⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
-"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
-"llegint taula d'etiquetes"
+"⚫ La identificació d'aquest lloc web no va ser emesa per una organització de "
+"confiança."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
+"⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
-"No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
-"llegint taula d'imatges"
+"⚫ La identificació d'aquest lloc web no es va poder processar. Pot estar "
+"danyat."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:237
 msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
 msgstr ""
-"Shotwell ha trobat %d imatges dins la biblioteca F-Spot i les està "
-"important. Les imatges duplicades seran automàticament detectades i "
-"eliminades.\n"
-"\n"
-"Podeu tancar aquest diàleg i començar a emprar el Shotwell mentre la "
-"importació té lloc en segon pla."
+"⚫ La identificació d'aquest lloc web ha estat revocat per l'organització de "
+"confiança que el va emetre."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Biblioteca F-Spot: %s"
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:242
+msgid ""
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
+msgstr ""
+"⚫ La identificació d'aquest lloc web no pot ser de confiança, ja que "
+"utilitza el xifrat molt feble."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Preparant per importar"
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:247
+msgid ""
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
+msgstr ""
+"⚫ La identificació d'aquest lloc web només és vàlida en dates futures. "
+"Comprovi la data al calendari del seu equip."
+
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "No està disponible un fitxer temporal que cal per publicar"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr "URL _Gallery3:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "Nom d'us_uari:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "_Contrasenya:"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Serveis d'importació Core Data"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Enrere"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:76
+msgid "_Log in"
+msgstr "_Connecta"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr "_Clau API:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
+msgstr "o"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Un àlbum _existent"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "Un àlbum _nou"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"Sup_rimeix les dades d'ubicació, d'etiquetes i d'identificació de la càmera "
+"abans de la càrrega."
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+msgid "Scaling constraint:"
+msgstr "Constant d'escala:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr " píxels"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Mida original"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
+#: src/Dimensions.vala:20
+msgid "Longest edge"
+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/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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Surt"
+
+#: 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/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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Publica"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Mòdul de publicació Gallery3"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -218,17 +1766,12 @@ msgstr ""
 "Per completar el procés d'identificació heu d'estar inscrits a Gallery3 i "
 "tenir un compte per accedir-hi."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
 msgstr "Directori per defecte del Shotwell"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, fuzzy, c-format
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -237,10 +1780,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"El fitxer «%s» pot no ser compatible o massa gran per a aquesta instància de "
-"Gallery3."
+"El fitxer «%s» pot no ser compatible o pot ser massa gran per a aquesta "
+"instància de Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
@@ -249,32 +1792,32 @@ msgstr ""
 "Tingueu en compte que Gallery3 només és compatible amb els mateixos tipus de "
 "vídeo que són compatibles amb el Flowplayer."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
-#, fuzzy, c-format
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
+#, c-format
 msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
-"Un fitxer necessari per la publicació no està disponible. No es pot "
+"Un fitxer necessari per a la publicació no està disponible. No es pot "
 "continuar amb la publicació a %s."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "S'està publicant a %s com a %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
 msgstr ""
 "Introduïu l'URL del vostre lloc Gallery3 i el nom d'usuari i contrasenya (o "
-"clau API) per al vostre compte Gallery3."
+"clau API) per al vostre compte de Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -282,244 +1825,190 @@ msgstr ""
 "El nom d'usuari i contrasenya o la clau API són incorrectes. Proveu de nou, "
 "torneu a introduir el vostre nom d'usuari i contrasenya a continuació."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
 "trailing components (e.g., index.php)."
 msgstr ""
 "L'URL que s'ha introduït no forma part del directori principal d'una "
-"instància Gallery3. Assegureu-vos que l'heu introduït correctament i que no "
-"conté cap component al final (p. ex. index.php)."
+"instància de Gallery3. Assegureu-vos que l'heu introduït correctament i que "
+"no conté cap component al final (per exemple, index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Usuari no reconegut"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr "No s'ha trobat el lloc"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#, fuzzy
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
+msgid "_Remember"
+msgstr "_Recorda"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+msgid "An _existing album:"
+msgstr "Un àlbum e_xistent:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+msgid "A _new album named:"
+msgstr "Un àlbum _nou anomenat:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+msgid "_Hide album"
+msgstr "A_maga l'àlbum"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+msgid "Open target _album in browser"
+msgstr "Obre l'_àlbum al navegador"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
 msgid "Copyright © 2013 rajce.net"
 msgstr "Copyright (C) 2013 rajce.net"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr "S'ha produït un error en publicar a Rajce. Proveu de nou."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
 msgid "Enter email and password associated with your Rajce account."
 msgstr ""
 "Introduïu l'adreça de correu i la contrasenya associades amb el vostre "
-"compte Rajce."
+"compte de Rajce."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
 msgid "Invalid email and/or password. Please try again"
 msgstr "L'adreça electrònica o la contrasenya no són vàlides. Proveu de nou"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
 msgid "Invalid User Email or Password"
-msgstr "Nom d'usuari o contrasenya incorrectes"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-msgid "_Email address"
-msgstr "_Adreça electrònica"
+msgstr "Nom d'usuari o contrasenya d'Email incorrectes"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-msgid "_Password"
-msgstr "_Contrasenya"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:894
-msgid "_Remember"
-msgstr "_Recorda"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#, fuzzy
-msgid "Log in"
-msgstr "S'està entrant..."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
-msgid "_Hide album"
-msgstr "A_maga l'àlbum"
-
-#: ../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 "Actualment esteu connectat al Rajce com a %s."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
-msgstr "Les fotografies apareixeran a:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-msgid "An _existing album:"
-msgstr "Un àlbum e_xistent:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-msgid "A _new album named:"
-msgstr "Un àlbum _nou anomenat:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-msgid "Open target _album in browser"
-msgstr "Obre l'_àlbum al navegador"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-msgid "_Publish"
-msgstr "_Publica"
+msgstr "Les imatges apareixeran a:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-msgid "_Logout"
-msgstr "_Surt"
-
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Serveis de publicació addicionals del Shotwell"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1325
-#, fuzzy
-msgid "500 × 375 pixels"
-msgstr "500 x 375 píxels"
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1326
-#, fuzzy
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 píxels"
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+msgid "Visit the Yandex.Fotki web site"
+msgstr "Vés al lloc web del Yandex.Fotki"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#, fuzzy
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 píxels"
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
+msgid "You are not currently logged into Yandex.Fotki."
+msgstr "Actualment no esteu connectat al Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, fuzzy, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "«%s» no és una resposta vàlida per a una petició d'autenticació OAuth"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Públic"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#, fuzzy
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): no es pot iniciar; aquest editor no es pot "
-"reiniciar."
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Amics"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Introduïu el nom i contrasenya associats amb el vostre compte Tumblr."
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Privat"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1087
-msgid "Username and/or password invalid. Please try again"
-msgstr "L'usuari i/o la contrasenya no són vàlids. Proveu de nou"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
+msgid "_Albums (or write new):"
+msgstr "_Àlbums (o escriviu-ne un de nou):"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1121
-msgid "Invalid User Name or Password"
-msgstr "Nom d'usuari o contrasenya incorrectes"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
+msgid "Access _type:"
+msgstr "_Tipus d'accés:"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "No s'ha pogut carregar la interfície: %s"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
+msgid "Disable _comments"
+msgstr "Inhabilita els _comentaris"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Esteu connectat a Tumblr com %s.\n"
-"\n"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
+msgid "_Forbid downloading original photo"
+msgstr "Prohibeix baixar la _fotografia original"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "Publica a un àlbum e_xistent:"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Vés al lloc web del Yandex.Fotki"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "Crea un àlbum _nou anomenat:"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:609
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Actualment no esteu connectat al Yandex.Fotki."
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+msgid "Upload _size:"
+msgstr "Mida de _pujada:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1209
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
+msgid "Videos and new photo albums _visible to:"
+msgstr "Els vídeos i els àlbums nous de fotografies són _visibles per a:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:64
-#, fuzzy
+#: 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:59
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 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."
+"_Remove location, camera, and other identifying information before uploading"
 msgstr ""
-"Actualment no esteu connectat al Facebook.\n"
-"\n"
-"Si encara no teniu un compte al Facebook, podeu crear-ne un durant el procés "
-"de connexió. Durant la connexió, el Shotwell Connect pot ser que us demani "
-"permís per pujar fotografies i publicar-les al mur. Aquests permisos són "
-"necessaris perquè el Shotwell Connect funcioni."
+"Sup_rimeix la ubicació, càmera i qualsevol altra informació identificativa "
+"abans de la càrrega"
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ja us heu connectat i desconnectat al Facebook en aquesta sessió del "
-"Shotwell.\n"
-"Per continuar publicant al Facebook, sortiu, reinicieu el Shotwell i torneu "
-"a intentar-ho."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Estàndard (720 píxels)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Gran (2048 píxels)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:255
-#, fuzzy
-msgid "Testing connection to Facebook…"
-msgstr "S'està comprovant la connexió amb el Facebook..."
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-#, fuzzy
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "S'està creant l'àlbum..."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
-#, fuzzy
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
-"Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
+"Un fitxer necessari per a la publicació no està disponible. No es pot "
 "continuar amb la publicació a Facebook."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -528,74 +2017,35 @@ msgstr ""
 "Actualment esteu connectat al Facebook com a %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:983
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "On us agradaria publicar les fotografies seleccionades?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:984
-msgid "Upload _size:"
-msgstr "Mida de _pujada:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Només jo"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Amics"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Tothom"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:60
-#, fuzzy
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Actualment no esteu connectat al Flickr.\n"
-"\n"
-"Feu clic a connecta per connectar-vos al Flickr en el navegador web.  Haureu "
-"d'autoritzar al Shotwell Connect per enllaçar el vostre compte del Flickr."
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Mida de la fotografia:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ja us heu connectat i desconnectat al Flickr en aquesta sessió del "
-"Shotwell.\n"
-"Per continuar publicant al Flickr, sortiu, reinicieu el Shotwell i torneu a "
-"intentar-ho."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:374
-#, fuzzy
-msgid "Preparing for login…"
-msgstr "S'està preparant per connectar..."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:594
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
-"Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
-"continuar amb la publicació a Flickr."
+"Un fitxer requerit per a la publicació no està disponible. La publicació a "
+"Flickr no pot continuar."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-#, fuzzy
-msgid "Verifying authorization…"
-msgstr "S'està verificant l'autorització..."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -604,202 +2054,290 @@ msgstr ""
 "Heu entrat al Flickr com a %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, 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] ""
-"El vostre compte gratuït del Flickr restringeix la quantitat de dades que "
-"podeu pujar cada mes.\n"
-"Aquest mes, us queden %d megabyte de quota de pujada."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "El vostre compte gratuït del Flickr restringeix la quantitat de dades que "
 "podeu pujar cada mes.\n"
-"Aquest mes, us queden %d megabytes de quota de pujada."
+"Aquest mes, us queden %s de la vostra quota de pujada."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "El vostre compte del Flickr Pro us permet pujades il·limitades."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Les fotografies són _visibles per:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Els vídeos són _visibles per:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Les fotografies i els vídeos són _visibles per:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Només els amics i la família"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Només família"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Només amics"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1327
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 x 375 píxels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 píxels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 x 1536 píxels"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1328
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 x 3072 píxels"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1329
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Mida original"
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+msgid "Photo _size preset:"
+msgstr "Mida predeterminada de les fotografie_s:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#, fuzzy
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"No esteu connectat a Picasa Web Albums.\n"
-"\n"
-"Feu clic en «Entra» per connectar-vos a Picasa Web Albums al navegador web. "
-"Haureu d'autoritzar Shotwell Connect per poder enllaçar amb el vostre compte "
-"Picasa Web Albums."
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+msgid "Default album"
+msgstr "àlbum per defecte"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
-#, fuzzy
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
 "Un fitxer necessari per la publicació no està disponible. No es pot dur a "
-"terme la publicació cap a Picasa."
+"terme la publicació a Picasa."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Heu entrat als àlbums web del Picasa com a %s."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Els vídeos apareixeran a:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-#, fuzzy
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Petita (640 x 480 píxels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-#, fuzzy
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
-msgstr "Mitjana (1024 x 768 píxels)"
+msgstr "Mitja (1024 x 768 píxels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-#, fuzzy
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Recomanada (1600 x 1200 píxels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-#, fuzzy
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 x 1536 píxels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
-msgstr "Mida original"
+msgstr "Mida Original"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL de la biblioteca de fotografies Piwigo"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+msgid "User _name"
+msgstr "_Nom d'usuari"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Recorda la contrasenya"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Una categoria _existent"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:775
-#, fuzzy, c-format
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "Un _nou àlbum anomenat"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "a la categoria"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Comentari de l'àlbum"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Les fotografies seran _visibles per a"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Mida de la fotografia"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"S_i el títol està definit i el comentari no ho està, es farà servir el títol "
+"com a comentari"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "_No pugis les etiquetes"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "Surt"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:296 ui/collection.ui:192
+msgid "Publish"
+msgstr "Publica"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
+#, c-format
 msgid "Creating album %s…"
-msgstr "Creant àlbum %s..."
+msgstr "Creant l'àlbum %s..."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "S'ha produït un error en connectar-se a Piwigo. Proveu de nou."
 
 #. %s is the host name that we tried to connect to
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
 "steal or alter information going to or from this site (for example, private "
 "messages, credit card information, or passwords)."
 msgstr ""
+"Això no sembla real <b>%s</b>. Els atacants poden estar tractant de robar o "
+"alterar la informació que surt d'aquest lloc (per exemple, missatges "
+"privats, informació de targetes de crèdit o contrasenyes)."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certificat de %s"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
+msgid "_OK"
+msgstr "D'ac_ord"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
-"Introduïu l'URL de la vostra biblioteca fotogràfica Piwigo i també el nom "
-"d'usuari i contrasenya associats amb el vostre compte Piwigo per aquesta "
+"Introduïu l'URL de la vostra biblioteca d'imatges de Piwigo i també el nom "
+"d'usuari i contrasenya associats amb el vostre compte Piwigo per a aquesta "
 "biblioteca."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
 msgstr ""
-"El Shotwell no pot contactar amb la vostra biblioteca fotogràfica Piwigo. "
+"El Shotwell no pot contactar amb la vostra biblioteca d'imatges de Piwigo. "
 "Comproveu l'URL que heu introduït"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
-msgstr "Adreça incorrecta"
+msgstr "URL invàlid"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
-msgstr "Administradors, família, amics, contactes"
+msgstr "Administradors, Família, Amics, Contactes"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
-msgstr "Administradors, família, amics"
+msgstr "Administradors, Família, Amics"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
-msgstr "Administradors, família"
+msgstr "Administradors, Família"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administradors"
 
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Aquesta connexió no és segura"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Mostra el certificat..."
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Entenc, si us plau _procedeixi."
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Serveis de publicació principals"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 píxels"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
 msgid ""
-"You are not currently logged into YouTube.\n"
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): no es pot iniciar; aquesta publicació no es pot "
+"reiniciar."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
 "\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
 msgstr ""
-"Actualment no esteu connectat al YouTube.\n"
+"Esteu connectat a Tumblr com %s.\n"
 "\n"
-"Per continuar heu de tenir un compte al Google i configurar-lo per poder "
-"utilitzar-lo amb el YoutTube. Podeu configurar la majoria de comtes "
-"utilitzant el navegador i entrant almenys un cop al lloc YouTube."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:363
-#, fuzzy
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Paràmetre_s de la privacitat dels vídeos:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
@@ -807,61 +2345,52 @@ msgstr ""
 "Un dels fitxers necessaris per a la publicació no està disponible. No es pot "
 "continuar amb la publicació a Youtube."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Actualment esteu connectat al YouTube com a %s."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, fuzzy, c-format
-msgid "Videos will appear in “%s”"
-msgstr "Els vídeos apareixeran a «%s»"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
-msgstr "Llistat públicament"
+msgstr "Llistat públic"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
-msgstr "Sense llistar públicament"
+msgstr "Sense llistar públic"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privat"
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Persiana"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Escacs"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Cercle"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Cercles"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Rellotge"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Esmicolament"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Esvaïment"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
 msgid "Core Slideshow Transitions"
 msgstr "Transicions principals de la projecció de diapositives"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:76
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -869,86 +2398,76 @@ msgstr ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "Diapositiva"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "Quadrats"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "Ratlles"
 
-#: ../src/AppDirs.vala:64 ../src/AppDirs.vala:115
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
-msgstr "Impossible crear el directori de memòria cau %s: %s"
+msgstr "No s'ha pogut crear el directori de memòria cau %s: %s"
 
-#: ../src/AppDirs.vala:74 ../src/AppDirs.vala:104
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "No s'ha pogut crear el directori de dades %s: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:168
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Imatges"
 
-#: ../src/AppDirs.vala:206
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "No s'ha pogut crear el directori temporal %s: %s"
 
-#: ../src/AppDirs.vala:223 ../src/AppDirs.vala:254
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "No s'ha pogut crear el subdirectori de dades %s: %s"
 
-#: ../src/AppDirs.vala:236
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
 msgstr "No s'ha pogut fer que es pugui escriure al directori %s"
 
-#: ../src/AppDirs.vala:239
+#: src/AppDirs.vala:239
 #, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr "No s'ha pogut fer que es pugui escriure al directori %s: %s"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
-msgstr "Mantén la barra d'eines"
+msgstr "Manté la barra d'eines"
 
-#: ../src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
-msgstr "Mantén la barra d'eines oberta"
+msgstr "Manté la barra d'eines oberta"
 
-#: ../src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Surt de la pantalla completa"
 
-#: ../src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "C_ontingut"
-
-#: ../src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Preguntes més freqüents"
-
-#: ../src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "Info_rma d'un problema…"
-
-#: ../src/AppWindow.vala:608 ../src/AppWindow.vala:629
-#: ../src/AppWindow.vala:646 ../src/data_imports/DataImportsUI.vala:413
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1441
-#: ../src/Dialogs.vala:1464 ../src/publishing/PublishingUI.vala:512
-#: ../src/Resources.vala:157
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/AppWindow.vala:656
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -961,101 +2480,112 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:676
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Visiteu la pàgina web del Shotwell"
 
-#: ../src/AppWindow.vala:688
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "No s'ha pogut mostrar l'ajuda: %s"
 
-#: ../src/AppWindow.vala:696
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "No es pot navegar a causa d'un error a la base de dades: %s"
 
-#: ../src/AppWindow.vala:704
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "No s'han pogut mostrar les PMF: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
-msgstr "Correcte"
+msgstr "Èxit"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "S'ha produït un error de fitxer"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "No s'ha pogut descodificar el fitxer"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
-msgstr "S'ha produït un error de la base de dades"
+msgstr "S'ha produït un error a la base de dades"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "L'usuari ha interromput la importació"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "No és un fitxer"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "El fitxer ja existeix a la base de dades"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "El format de fitxer no és compatible"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "No és un fitxer d'imatge"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Ha fallat el disc"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "El disc està ple"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "S'ha produït un error a la càmera"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "S'ha produït un error en escriure el fitxer"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
-msgstr "Fitxer d'imatge corromput"
+msgstr "Fitxer d'imatge danyat"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Ha fallat la importació (%d)"
 
-#: ../src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Càmeres"
 
-#: ../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/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Llista tots els dispositius càmera descoberts"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Càmera"
 
-#: ../src/camera/ImportPage.vala:311 ../src/Properties.vala:227
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 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 ""
@@ -1063,50 +2593,34 @@ msgstr ""
 "fitxers."
 
 #. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Amaga les fotografies que ja s'hagin importat"
 
-#: ../src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Mostra només les fotografies que no s'hagin importat"
 
-#: ../src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importa les _seleccionades"
+
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Import_a-les totes"
+
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Sembla que la càmera està buida. No s'han trobat fotografies o vídeos per "
 "importar."
 
-#: ../src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
-msgstr "No s'han trobat fotografies o vídeos nous a la càmera."
-
-#: ../src/camera/ImportPage.vala:873 ../src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Títols"
-
-#: ../src/camera/ImportPage.vala:874 ../src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Mostra el títol de cada fotografia"
-
-#: ../src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importa les _seleccionades"
-
-#: ../src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importa les fotografies seleccionades a la biblioteca"
-
-#: ../src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importa-les _totes"
-
-#: ../src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importa totes les fotografies a la biblioteca"
+msgstr "No s'ha trobat fotografies o vídeos nous a la càmera."
 
 #. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -1114,29 +2628,29 @@ msgstr ""
 "Cal que el Shotwell desmunti la càmera del sistema de fitxers per poder-hi "
 "accedir. Voleu continuar?"
 
-#: ../src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
-msgstr "_Desmunta-la"
+msgstr "_Desmunta"
 
-#: ../src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Desmunteu la càmera."
 
-#: ../src/camera/ImportPage.vala:1029
+#: src/camera/ImportPage.vala:1041
 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 ""
 "Una altra aplicació està blocant la càmera. El Shotwell només pot accedir a "
-"la càmera si no està blocada. Tanqueu qualsevol altra aplicació que "
-"l'estigui utilitzant i torneu-ho a intentar."
+"la càmera si no està blocada. Tanqueu qualsevol altra aplicació que estigueu "
+"utilitzant i torneu-ho a intentar."
 
-#: ../src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Tanqueu qualsevol altra aplicació que estigui utilitzant la càmera."
 
-#: ../src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -1145,65 +2659,69 @@ msgstr ""
 "No es poden obtenir previsualitzacions de la càmera:\n"
 "%s"
 
-#: ../src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "S'està desmuntant…"
 
-#: ../src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "S'està connectant amb la càmera, espereu…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "S'està iniciant la importació, espereu…"
 
-#: ../src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "S'està recollint la informació de les fotografies"
 
-#: ../src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "S'està recollint la previsualització de %s"
 
-#: ../src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "No es pot blocar la càmera: %s"
 
-#: ../src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Voleu suprimir aquesta fotografia de la càmera?"
 msgstr[1] "Voleu suprimir aquestes %d fotografies de la càmera?"
 
-#: ../src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Voleu suprimir aquest vídeo de la càmera?"
 msgstr[1] "Voleu suprimir aquests %d vídeos de la càmera?"
 
-#: ../src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Voleu suprimir aquesta fotografia/vídeo de la càmera?"
 msgstr[1] "Voleu suprimir aquestes %d fotografies/vídeos de la càmera?"
 
-#: ../src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Voleu suprimir aquest fitxer de la càmera?"
 msgstr[1] "Voleu suprimir aquests %d fitxers de la càmera?"
 
-#: ../src/camera/ImportPage.vala:1745 ../src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Manté"
 
-#: ../src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "S'estan suprimint les fotografies/vídeos de la càmera"
 
-#: ../src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -1212,112 +2730,184 @@ msgstr[0] ""
 msgstr[1] ""
 "No s'han pogut suprimir %d fotografies/vídeos de la càmera a causa d'errors."
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
+msgid "_Print"
+msgstr "Im_primeix"
+
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "_Envia a…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
+msgid "Set as _Desktop Background"
+msgstr "Estableix com a fons _d'escriptori"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:287
+msgid "_Duplicate"
+msgstr "_Duplica"
+
+#: src/CollectionPage.vala:100
+msgid "Fullscreen"
+msgstr "Pantalla completa"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Presentació de diapositives"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Reprodueix una presentació de diapositives"
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Gi_ra a la dreta"
 
-#: ../src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exporta la fotografia/vídeo"
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Gira a _l'esquerra"
 
-#: ../src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exporta les fotografies/vídeos"
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Inverteix horit_zontalment"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:59
-#: ../src/PhotoPage.vala:3209
-msgid "Export Photo"
-msgstr "Exporta les fotografies"
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Inverteix verti_calment"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Exporta les fotografies"
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Millora"
+
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "_Reverteix a l'original"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Copia els ajustaments de color"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Enganxa els ajustaments de color"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr "Ajusta la data i l'hora…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
+msgid "Open With E_xternal Editor"
+msgstr "Obre amb un editor e_xtern"
+
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
+msgid "Open With RA_W Editor"
+msgstr "Obre amb un editor d'imatges RA_W"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:149 src/Resources.vala:168
+msgid "_Play"
+msgstr "Re_produeix"
+
+#: src/CollectionPage.vala:410
+msgid "Export Photo/Video"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Exporta la fotografia/vídeo"
+msgstr[1] "Exporta les fotografies/vídeos"
+
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+msgid "Export Photo"
+msgid_plural "Export Photos"
+msgstr[0] "Exporta la fotografia"
+msgstr[1] "Exporta les fotografies"
+
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "S'està girant"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "S'està desfent la rotació"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "S'està invertint horitzontalment"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "S'està desfent la inversió horitzontal"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "S'està invertint verticalment"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "S'està desfent la inversió verticalment"
 
-#: ../src/Commands.vala:737
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "S'està revertint"
 
-#: ../src/Commands.vala:737
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "S'està desfent la reversió"
 
-#: ../src/Commands.vala:781
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "S'està millorant"
 
-#: ../src/Commands.vala:781
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "S'està desfent la millora"
 
-#: ../src/Commands.vala:857
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "S'estan aplicant les transformacions de colors"
 
-#: ../src/Commands.vala:857
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "S'estan desfent les transformacions de color"
 
-#: ../src/Commands.vala:1007
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "S'està creant un esdeveniment nou"
 
-#: ../src/Commands.vala:1008
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "S'està suprimint l'esdeveniment"
 
-#: ../src/Commands.vala:1017
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "S'estan movent les fotografies a l'esdeveniment nou"
 
-#: ../src/Commands.vala:1018
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "S'estan establint les fotografies a l'esdeveniment anterior"
 
-#: ../src/Commands.vala:1075
+#: src/Commands.vala:1075
 msgid "Merging"
-msgstr "S'està combinant"
+msgstr "S'està fusionant"
 
-#: ../src/Commands.vala:1076
+#: src/Commands.vala:1076
 msgid "Unmerging"
-msgstr "S'està desfent la combinació"
+msgstr "S'està desfent la fusió"
 
-#: ../src/Commands.vala:1085
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "S'estan duplicant les fotografies"
 
-#: ../src/Commands.vala:1085
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "S'estan suprimint les fotografies duplicades"
 
-#: ../src/Commands.vala:1108
+#: src/Commands.vala:1108
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
@@ -1326,53 +2916,53 @@ msgstr[0] ""
 msgstr[1] ""
 "No s'han pogut duplicar %d fotografies a causa d'errors en els fitxers"
 
-#: ../src/Commands.vala:1195
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
-msgstr "S'està restaurant la valoració anterior"
+msgstr "S'està restaurant la puntuació anterior"
 
-#: ../src/Commands.vala:1205 ../src/Commands.vala:1206
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "S'estan incrementant les puntuacions"
 
-#: ../src/Commands.vala:1205 ../src/Commands.vala:1206
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "S'estan reduint les puntuacions"
 
-#: ../src/Commands.vala:1256
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
-msgstr "S'està establint el revelador RAW"
+msgstr "S'està establint el revelador de RAW"
 
-#: ../src/Commands.vala:1256
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "S'està restaurant el revelador RAW anterior"
 
-#: ../src/Commands.vala:1257
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Estableix el desenvolupador"
 
-#: ../src/Commands.vala:1347
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "La fotografia original no s'ha pogut ajustar."
 
-#: ../src/Commands.vala:1368
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
-msgstr "S'està ajustant la data i l'hora"
+msgstr "S'està ajustant la Data i l'Hora"
 
-#: ../src/Commands.vala:1368
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
-msgstr "S'està desfent l'ajustament de la data i l'hora"
+msgstr "S'està desfent l'Ajustament de la Data i l'Hora"
 
-#: ../src/Commands.vala:1399
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "La fotografia original no s'ha pogut ajustar."
 msgstr[1] "Les fotografies originals no s'han pogut ajustar."
 
-#: ../src/Commands.vala:1401 ../src/Commands.vala:1425
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
-msgstr "S'ha produït un error en ajustar l'hora"
+msgstr "S'ha produït un Error en Ajustar l'Hora"
 
-#: ../src/Commands.vala:1423
+#: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
@@ -1383,82 +2973,82 @@ msgstr[1] ""
 "Els ajustaments de l'hora no s'han pogut desfer en els fitxers de "
 "fotografies següents."
 
-#: ../src/Commands.vala:1637 ../src/Commands.vala:1660
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Crea una etiqueta"
 
-#: ../src/Commands.vala:1695
+#: src/Commands.vala:1695
 #, c-format
 msgid "Move Tag “%s”"
 msgstr "Mou l'etiqueta «%s» "
 
-#: ../src/Commands.vala:2347
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
-msgstr "Mou les fotografies a la paperera"
+msgstr "Mou les fotografies a la Paperera"
 
-#: ../src/Commands.vala:2347
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
-msgstr "Restaura les fotografies de la paperera"
+msgstr "Restaura les fotografies de la Paperera"
 
-#: ../src/Commands.vala:2348
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Mou les fotografies a la paperera del Shotwell"
 
-#: ../src/Commands.vala:2348
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Restaura les fotografies cap a la biblioteca del Shotwell"
 
-#: ../src/Commands.vala:2367
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
-msgstr "S'estan movent les fotografies a la paperera"
+msgstr "S'estan movent les fotografies a la Paperera"
 
-#: ../src/Commands.vala:2367
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
-msgstr "S'estan restaurant les fotografies de la paperera"
+msgstr "S'estan restaurant les fotografies de la Paperera"
 
-#: ../src/Commands.vala:2453
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
-msgstr "Senyala les fotografies seleccionades"
+msgstr "Marca les fotografies seleccionades"
 
-#: ../src/Commands.vala:2454
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
-msgstr "Treu el senyalador a les fotografies seleccionades"
+msgstr "Desmarca les fotografies seleccionades"
 
-#: ../src/Commands.vala:2455
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
-msgstr "S'estan marcant les fotos seleccionades"
+msgstr "S'estan marcant les fotografies seleccionades"
 
-#: ../src/Commands.vala:2456
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
-msgstr "S'estan desmarcant les fotos seleccionades"
+msgstr "S'estan desmarcant les fotografies seleccionades"
 
-#: ../src/Commands.vala:2463
+#: src/Commands.vala:2463
 msgid "Flag"
-msgstr "Senyala"
+msgstr "Marca"
 
-#: ../src/Commands.vala:2463
+#: src/Commands.vala:2463
 msgid "Unflag"
-msgstr "Treu el senyalador"
+msgstr "Desmarca"
 
 #. Send an empty job to the queue to mark the end of the import
-#: ../src/data_imports/DataImportsPluginHost.vala:65
-#: ../src/data_imports/DataImportsPluginHost.vala:78
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
 #, c-format
 msgid "%s Database"
 msgstr "Base de dades %s"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:148
-#: ../src/data_imports/DataImportsPluginHost.vala:294
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
 msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "No pot continuar la importació des de %s perquè s'ha produït un error:"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:151
+#: src/data_imports/DataImportsPluginHost.vala:151
 msgid "To try importing from another service, select one from the above menu."
 msgstr ""
 "Intenteu importar des d'un altre servei, seleccioneu-ne un del menú següent."
 
-#: ../src/data_imports/DataImportsUI.vala:10
+#: src/data_imports/DataImportsUI.vala:10
 msgid ""
 "You do not have any data imports plugins enabled.\n"
 "\n"
@@ -1472,49 +3062,47 @@ msgstr ""
 "de tenir com a mínim un connector d'importació de dades habilitat. Podeu "
 "habilitar els connectors al diàleg de preferències."
 
-#: ../src/data_imports/DataImportsUI.vala:100
+#: src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
 msgstr "Fitxer de base de dades:"
 
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importa"
 
-#: ../src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
-msgstr "Importa des de l'aplicació"
+msgstr "Importa des de l'Aplicació"
 
-#: ../src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
-msgstr "Importar mitjans _de:"
+msgstr "_Importa mitjans de:"
 
-#: ../src/data_imports/DataImportsUI.vala:408
-#: ../src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../src/data_imports/DataImports.vala:22
+#: src/data_imports/DataImports.vala:22
 msgid "Data Imports"
 msgstr "Dades de les importacions"
 
-#: ../src/db/DatabaseTable.vala:37
+#: src/db/DatabaseTable.vala:37
 #, c-format
 msgid "Unable to open/create photo database %s: error code %d"
 msgstr ""
-"No s'ha pogut obrir o crear la base de dades de fotografies %s: codi d'error "
-"%d"
+"No s'ha pogut obrir o crear la base de dades de les fotografies %s: codi "
+"d'error %d"
 
-#: ../src/db/DatabaseTable.vala:46
+#: src/db/DatabaseTable.vala:46
 #, c-format
 msgid ""
 "Unable to write to photo database file:\n"
 " %s"
 msgstr ""
-"No s'ha pogut escriure al fitxer de la base de dades de fotografies:\n"
+"No s'ha pogut escriure al fitxer de la base de dades de les fotografies:\n"
 " %s"
 
-#: ../src/db/DatabaseTable.vala:48
+#: src/db/DatabaseTable.vala:48
 #, c-format
 msgid ""
 "Error accessing database file:\n"
@@ -1529,50 +3117,52 @@ msgstr ""
 "L'error ha estat: \n"
 "%s"
 
-#: ../src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
-msgstr "No s'ha pogut restaurar la base de dades de fotografies %s"
+msgstr "No s'ha pogut restaurar la base de dades de les fotografies %s"
 
-#: ../src/DesktopIntegration.vala:121
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "No s'ha pogut executar el Nautilus Send-To: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Envia a"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "No s'ha pogut exportar el fons a %s: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr ""
 "No s'ha pogut preparar la presentació de diapositives de l'escriptori: %s"
 
-#: ../src/Dialogs.vala:16
+#: src/Dialogs.vala:16
 #, c-format
 msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Això suprimirà l'etiqueta «%s» d'una fotografia. Voleu continuar?"
-msgstr[1] "Això suprimirà l'etiqueta «%s» de %d fotografies. Voleu continuar?"
+msgstr[1] ""
+"Això suprimirà l'etiqueta «%s» de %d les fotografies. Voleu continuar?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1409
-#: ../src/Resources.vala:158 ../src/Resources.vala:361
-#: ../src/Resources.vala:409 ../src/Resources.vala:674
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Això suprimirà la cerca desada «%s». Voleu continuar?"
 
-#: ../src/Dialogs.vala:36
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1581,25 +3171,29 @@ msgid_plural ""
 "Shotwell"
 msgstr[0] ""
 "En canviar els desenvolupadors es desfaran tots els canvis que heu fet a "
-"aquesta foto al Shotwell"
+"aquesta fotografia al Shotwell"
 msgstr[1] ""
 "En canviar els desenvolupadors es desfaran tots els canvis que heu fet a "
-"aquestes fotos al Shotwell"
+"aquestes fotografies al Shotwell"
 
-#: ../src/Dialogs.vala:40
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
-msgstr "_Canvia el desenvolupador"
+msgstr "Canvia el de_senvolupador"
 
-#: ../src/Dialogs.vala:59
+#: src/Dialogs.vala:59
 msgid "Export Video"
-msgstr "Exporta vídeos"
+msgstr "Exporta vídeo"
+
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Exporta les fotografies"
 
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:112
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
 "Shotwell couldn’t create a file for editing this photo because you do not "
@@ -1608,7 +3202,7 @@ msgstr ""
 "El Shotwell no ha pogut crear un fitxer per editar aquesta fotografia perquè "
 "no teniu permís per escriure a %s."
 
-#: ../src/Dialogs.vala:121
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1617,7 +3211,7 @@ msgstr ""
 "fitxer.\n"
 "\n"
 
-#: ../src/Dialogs.vala:127
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1627,128 +3221,95 @@ msgstr ""
 "\n"
 "Voleu continuar exportant?"
 
-#: ../src/Dialogs.vala:128
+#: src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "Con_tinua"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Sense modificar"
-
-#: ../src/Dialogs.vala:145
-msgid "Current"
-msgstr "Actual"
-
-#. layout controls
-#: ../src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Format:"
-
-#: ../src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Qualitat:"
-
-#: ../src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "Restricció d'e_scala:"
-
-#: ../src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr " _Píxels:"
-
-#: ../src/Dialogs.vala:234
-#, fuzzy
-msgid "Export _metadata:"
-msgstr "Exporta les metadades"
-
-#: ../src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Desa els detalls…"
 
-#: ../src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Desa els detalls"
 
-#: ../src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(i %d més)\n"
 
-#: ../src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
-msgstr "Importa l'informe de resultats"
+msgstr "L'informe de resultats d'importació"
 
-#: ../src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] "S'ha intentat importar %d fitxer."
-msgstr[1] "S'han intentat importar %d fitxers."
+msgstr[0] "S'ha intentat importar el fitxer %d."
+msgstr[1] "S'ha intentat importar els fitxers %d."
 
-#: ../src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] "D'aquests, s'ha importat correctament %d fitxer."
-msgstr[1] "D'aquests, s'han importat correctament %d fitxers."
+msgstr[0] "D'aquests, s'ha importat correctament el fitxer %d."
+msgstr[1] "D'aquests, s'ha importat correctament els fitxers %d."
 
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Fotos/Vídeos duplicats que no s'han importat:"
+msgstr "Fotos/Vídeos duplicats que no s'ha importat:"
 
-#: ../src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "duplica un element multimèdia existent"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr "Fotos/Vídeos que no s'han importat a causa d'errors de la càmera:"
+msgstr "Fotos/Vídeos que no s'ha importat a causa d'errors de la càmera:"
 
-#: ../src/Dialogs.vala:584 ../src/Dialogs.vala:599 ../src/Dialogs.vala:614
-#: ../src/Dialogs.vala:630 ../src/Dialogs.vala:645 ../src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "missatge d'error:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
-"Fitxers que no s'han importat perquè no s'han reconegut com a fotos o vídeos:"
+"Fitxers que no s'ha importat perquè no s'ha reconegut com a fotos o vídeos:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
-"Fotos i vídeos que no s'han importat perquè no estaven en un format que el "
+"Fotos i vídeos que no s'ha importat perquè no estaven en un format que el "
 "Shotwell pugui comprendre:"
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
-"Fotos i vídeos que no s'han importat perquè el Shotwell no ha pogut copiar-"
+"Fotos i vídeos que no s'ha importat perquè el Shotwell no ha pogut copiar-"
 "los a la biblioteca:"
 
-#: ../src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -1760,40 +3321,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr ""
-"Fotos/Vídeos que no s'han importat perquè els fitxers estan corromputs:"
+msgstr "Fotos/Vídeos que no s'ha importat perquè els fitxers estan corromputs:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr "Fotos/Vídeos que no s'han importat per altres raons:"
+msgstr "Fotos/Vídeos que no s'ha importat per altres raons:"
 
-#: ../src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "No s'ha importat una fotografia duplicada:\n"
-msgstr[1] "No s'han importat %d fotografies duplicades:\n"
+msgstr[1] "No s'ha importat unes fotografies %d duplicades:\n"
 
-#: ../src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "No s'ha importat un vídeo duplicat:\n"
-msgstr[1] "No s'han importat %d vídeos duplicats:\n"
+msgstr[1] "No s'ha importat uns vídeos %d duplicats:\n"
 
-#: ../src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "No s'ha importat una fotografia/vídeo duplicat:\n"
-msgstr[1] "No s'han importat %d fotografies/vídeos duplicats:\n"
+msgstr[1] "No s'ha importat unes fotografies/vídeos %d duplicats:\n"
 
-#: ../src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -1801,10 +3361,10 @@ msgstr[0] ""
 "Ha fallat la importació d'una fotografia a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies a causa d'un error de fitxer o de "
-"maquinari:\n"
+"Ha fallat la importació d'unes fotografies %d a causa d'un error de fitxer o "
+"de maquinari:\n"
 
-#: ../src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -1812,10 +3372,10 @@ msgstr[0] ""
 "Ha fallat la importació d'un vídeo a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d vídeos a causa d'un error de fitxer o de "
+"Ha fallat la importació d'uns vídeos %d a causa d'un error de fitxer o de "
 "maquinari:\n"
 
-#: ../src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1824,10 +3384,10 @@ msgstr[0] ""
 "Ha fallat la importació d'una fotografia/vídeo a causa d'un error de fitxer "
 "o de maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies/vídeos a causa d'un error de "
+"Ha fallat la importació d'unes fotografies/vídeos %d a causa d'un error de "
 "fitxer o de maquinari:\n"
 
-#: ../src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -1835,10 +3395,10 @@ msgstr[0] ""
 "Ha fallat la importació d'un fitxer a causa d'un error de fitxer o de "
 "maquinari:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fitxers a causa d'un error de fitxer o de "
+"Ha fallat la importació d'uns fitxers %d a causa d'un error de fitxer o de "
 "maquinari:\n"
 
-#: ../src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1849,10 +3409,10 @@ msgstr[0] ""
 "Ha fallat la importació d'una fotografia perquè no es pot escriure a la "
 "carpeta de la biblioteca de fotografies:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies perquè no es pot escriure a la "
+"Ha fallat la importació d'unes fotografies %d perquè no es pot escriure a la "
 "carpeta de la biblioteca de fotografies:\n"
 
-#: ../src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1863,10 +3423,10 @@ msgstr[0] ""
 "Ha fallat la importació d'un vídeo perquè no es pot escriure a la carpeta de "
 "la biblioteca de fotografies:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d vídeos perquè no es pot escriure a la carpeta "
-"de la biblioteca de fotografies:\n"
+"Ha fallat la importació d'uns vídeos %d perquè no es pot escriure a la "
+"carpeta de la biblioteca de fotografies:\n"
 
-#: ../src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1878,10 +3438,10 @@ msgstr[0] ""
 "Ha fallat la importació d'una fotografia/vídeo perquè no es pot escriure a "
 "la carpeta de la biblioteca de fotografies:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies/vídeos perquè no es pot escriure a "
-"la carpeta de la biblioteca de fotografies:\n"
+"Ha fallat la importació de unes fotografies/vídeos %d perquè no es pot "
+"escriure a la carpeta de la biblioteca de fotografies:\n"
 
-#: ../src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1892,28 +3452,29 @@ msgstr[0] ""
 "Ha fallat la importació d'un fitxer perquè no es pot escriure a la carpeta "
 "de la biblioteca de fotografies:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fitxers perquè no es pot escriure a la carpeta "
-"de la biblioteca de fotografies:\n"
+"Ha fallat la importació d'uns fitxers %d perquè no es pot escriure a la "
+"carpeta de la biblioteca de fotografies:\n"
 
-#: ../src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] ""
 "Ha fallat la importació d'una fotografia a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies a causa d'un error de la càmera:\n"
+"Ha fallat la importació d'unes fotografies %d a causa d'un error de la "
+"càmera:\n"
 
-#: ../src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] ""
 "Ha fallat la importació d'un vídeo a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d vídeos a causa d'un error de la càmera:\n"
+"Ha fallat la importació d'uns vídeos %d a causa d'un error de la càmera:\n"
 
-#: ../src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -1921,56 +3482,58 @@ msgstr[0] ""
 "Ha fallat la importació d'una fotografia/vídeo a causa d'un error de la "
 "càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fotografies/vídeos a causa d'un error de la "
-"càmera:\n"
+"Ha fallat la importació d'unes fotografies/vídeos %d a causa d'un error de "
+"la càmera:\n"
 
-#: ../src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] ""
 "Ha fallat la importació d'un fitxer a causa d'un error de la càmera:\n"
 msgstr[1] ""
-"Ha fallat la importació de %d fitxers a causa d'un error de la càmera:\n"
+"Ha fallat la importació d'uns fitxers %d a causa d'un error de la càmera:\n"
 
-#: ../src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] "No s'ha pogut importar 1 foto perquè el fitxer està corromput:\n"
+msgstr[0] ""
+"No s'ha pogut importar una fotografia perquè el fitxer està danyat:\n"
 msgstr[1] ""
-"No s'han pogut importar %d fotos perquè els fitxers estan corromputs:\n"
+"No s'ha pogut importar unes fotografies %d perquè els fitxers estan "
+"danyats:\n"
 
-#: ../src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] "No s'ha pogut importar 1 vídeo perquè el fitxer està corromput:\n"
+msgstr[0] "No s'ha pogut importar un vídeo perquè el fitxer està danyat:\n"
 msgstr[1] ""
-"No s'han pogut importar %d vídeos perquè els fitxers estan corromputs:\n"
+"No s'ha pogut importar uns vídeos %d perquè els fitxers estan danyats:\n"
 
-#: ../src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
-"No s'ha pogut importar 1 foto/vídeo perquè el fitxer està corromput:\n"
+"No s'ha pogut importar un foto/vídeo perquè el fitxer està danyat:\n"
 msgstr[1] ""
-"No s'han pogut importar %d fotos/vídeos perquè els fitxers estan "
-"corromputs:\n"
+"No s'ha pogut importar unes fotografies/vídeos %d perquè els fitxers estan "
+"danyats:\n"
 
-#: ../src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] "No s'ha pogut importar 1 fitxer perquè està corromput:\n"
-msgstr[1] "No s'han pogut importar %d fitxers perquè estan corromputs:\n"
+msgstr[0] "No s'ha pogut importar un fitxer perquè està danyat:\n"
+msgstr[1] "No s'ha pogut importar uns fitxers %d perquè estan danyats:\n"
 
 #. we have no notion of "unsupported" video files right now in Shotwell (all
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1979,28 +3542,28 @@ msgstr[1] "S'han omès %d fotografies no compatibles:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "S'ha omès un fitxer que no era d'imatge.\n"
 msgstr[1] "S'han omès %d fitxers que no eren d'imatge.\n"
 
-#: ../src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "S'ha omès una fotografia a causa de la cancel·lació de l'usuari:\n"
 msgstr[1] "S'han omès %d fotografies a causa de la cancel·lació de l'usuari:\n"
 
-#: ../src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "S'ha omès un vídeo a causa de la cancel·lació de l'usuari:\n"
 msgstr[1] "S'han omès %d vídeos a causa de la cancel·lació de l'usuari:\n"
 
-#: ../src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -2009,119 +3572,94 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han omès %d fotografies/vídeos a causa de la cancel·lació de l'usuari:\n"
 
-#: ../src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "S'ha omès un fitxer a causa de la cancel·lació de l'usuari:\n"
 msgstr[1] "S'han omès %d fitxers a causa de la cancel·lació de l'usuari:\n"
 
-#: ../src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "S'ha importat una fotografia correctament.\n"
 msgstr[1] "S'han importat %d fotografies correctament.\n"
 
-#: ../src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "S'ha importat un vídeo correctament.\n"
 msgstr[1] "S'han importat %d vídeos correctament.\n"
 
-#: ../src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
 msgstr[0] "S'ha importat una fotografia/vídeo correctament.\n"
-msgstr[1] "S'han importat %d fotografies/vídeos correctament.\n"
+msgstr[1] "S'ha importat unes fotografies/vídeos %d correctament.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "No s'ha importat cap vídeo o fotografia.\n"
 
-#: ../src/Dialogs.vala:869 ../src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "S'ha completat la importació"
 
-#: ../src/Dialogs.vala:1174
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segon"
-msgstr[1] "%d segons"
-
-#: ../src/Dialogs.vala:1177
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuts"
-
-#: ../src/Dialogs.vala:1181
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d hores"
-
-#: ../src/Dialogs.vala:1184
-msgid "1 day"
-msgstr "1 dia"
-
-#: ../src/Dialogs.vala:1338 ../src/Resources.vala:231
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
-msgstr "Canvia el nom de l'esdeveniment"
+msgstr "Canvia el nom a l'esdeveniment"
 
-#: ../src/Dialogs.vala:1338
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Nom:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1349
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
-msgstr "Edita el títol"
+msgstr "Edita el títol [Diàleg del títol]"
 
-#: ../src/Dialogs.vala:1350 ../src/Properties.vala:340
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Títol:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1366 ../src/Resources.vala:307
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Edita el comentari de l'esdeveniment"
 
-#: ../src/Dialogs.vala:1367
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
-msgstr "Edita el comentari de la foto/vídeo"
+msgstr "Edita el comentari de la fotografia/vídeo"
 
-#: ../src/Dialogs.vala:1368 ../src/Properties.vala:628
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: ../src/Dialogs.vala:1384
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
-msgstr[0] "Suprimeix i _envia el fitxer a la paperera"
-msgstr[1] "Suprimeix i _envia els fitxers a la paperera"
+msgstr[0] "Suprimeix i envia el fi_txer a la paperera"
+msgstr[1] "Suprimeix i envia els fi_txers a la paperera"
 
-#: ../src/Dialogs.vala:1388
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
-msgstr "_Suprimeix de la biblioteca"
+msgstr "Sup_rimeix de la biblioteca"
 
-#: ../src/Dialogs.vala:1431
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Voleu revertir l'edició externa?"
 
-#: ../src/Dialogs.vala:1431
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Voleu revertir les edicions externes?"
 
-#: ../src/Dialogs.vala:1433
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -2129,131 +3667,37 @@ msgid_plural ""
 msgstr[0] ""
 "Això suprimirà tots els canvis fets al fitxer extern. Voleu continuar?"
 msgstr[1] ""
-"Això suprimirà tots els canvis fets als %d fitxers externs. Voleu continuar?"
+"Això suprimirà tots els canvis fets als fitxers %d externs. Voleu continuar?"
 
-#: ../src/Dialogs.vala:1437
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
-msgstr "_Reverteix l'edició externa"
+msgstr "Re_verteix l'edició externa"
 
-#: ../src/Dialogs.vala:1437
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
-msgstr "_Reverteix les edicions externes"
+msgstr "Re_verteix les edicions externes"
 
-#: ../src/Dialogs.vala:1458
+#: src/Dialogs.vala:770
 #, 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] "Això suprimirà la fotografia de la biblioteca. Voleu continuar?"
-msgstr[1] "Això suprimirà %d fotografies de la biblioteca. Voleu continuar?"
+msgstr[1] ""
+"Això suprimirà les fotografies %d de la biblioteca. Voleu continuar?"
 
-#: ../src/Dialogs.vala:1465 ../src/Resources.vala:173
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
-msgstr "_Suprimeix"
+msgstr "Sup_rimeix"
 
-#: ../src/Dialogs.vala:1466
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Suprimeix la fotografia de la biblioteca"
 
-#: ../src/Dialogs.vala:1466
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Suprimeix les fotografies de la biblioteca"
 
-#: ../src/Dialogs.vala:1559
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: ../src/Dialogs.vala:1713
-msgid "AM"
-msgstr "AM"
-
-#: ../src/Dialogs.vala:1714
-msgid "PM"
-msgstr "PM"
-
-#: ../src/Dialogs.vala:1715
-msgid "24 Hr"
-msgstr "24 h"
-
-#: ../src/Dialogs.vala:1730
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Desplaça les fotografies/vídeos amb la mateixa quantitat"
-
-#: ../src/Dialogs.vala:1735
-msgid "Set _all photos/videos to this time"
-msgstr "Estableix _totes les fotografies/vídeos a aquesta hora"
-
-#: ../src/Dialogs.vala:1742
-msgid "_Modify original photo file"
-msgstr "_Modifica el fitxer d'imatge original"
-
-#: ../src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr "_Modifica els fitxers d'imatges originals"
-
-#: ../src/Dialogs.vala:1745
-msgid "_Modify original file"
-msgstr "_Modifica el fitxer original"
-
-#: ../src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr "_Modifica els fitxers originals"
-
-#: ../src/Dialogs.vala:1831
-msgid "Original: "
-msgstr "Original: "
-
-#: ../src/Dialogs.vala:1832
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: ../src/Dialogs.vala:1833
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %I:%M:%S %p"
-
-#: ../src/Dialogs.vala:1922
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El temps d'exposició es desplaçarà cap endavant per\n"
-"%d %s, %d %s, %d %s i %d %s."
-
-#: ../src/Dialogs.vala:1923
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El temps d'exposició es desplaçarà cap enrere per\n"
-"%d %s, %d %s, %d %s i %d %s."
-
-#: ../src/Dialogs.vala:1925
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dia"
-msgstr[1] "dies"
-
-#: ../src/Dialogs.vala:1926
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "hores"
-
-#: ../src/Dialogs.vala:1927
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuts"
-
-#: ../src/Dialogs.vala:1928
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segon"
-msgstr[1] "segons"
-
-#: ../src/Dialogs.vala:1972
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -2266,99 +3710,19 @@ msgid_plural ""
 msgstr[0] ""
 "\n"
 "\n"
-"I una altra."
+"I una altra %d."
 msgstr[1] ""
 "\n"
 "\n"
-"I %d altres."
+"I unes altres %d."
 
-#: ../src/Dialogs.vala:1996 ../src/Dialogs.vala:2023
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Etiquetes (separades per comes):"
 
-#: ../src/Dialogs.vala:2103
-msgid "Welcome!"
-msgstr "Us donem la benvinguda"
-
-#: ../src/Dialogs.vala:2110
-msgid "Welcome to Shotwell!"
-msgstr "Us donem la benvinguda al Shotwell"
-
-#: ../src/Dialogs.vala:2114
-msgid "To get started, import photos in any of these ways:"
-msgstr ""
-"Per començar, importeu fotografies de qualsevol de les següents formes:"
-
-#: ../src/Dialogs.vala:2133
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Trieu <span weight=\"bold\">Fitxer %s Importa des d'una carpeta</span>"
-
-#: ../src/Dialogs.vala:2134
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Arrossegueu i deixeu anar fotografies a la finestra del Shotwell"
-
-#: ../src/Dialogs.vala:2135
-msgid "Connect a camera to your computer and import"
-msgstr "Connecteu una càmera al vostre ordinador i importeu-ne les fotografies"
-
-#: ../src/Dialogs.vala:2145
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importa les fotografies de la carpeta %s"
-
-#: ../src/Dialogs.vala:2152
-msgid "You can also import photos in any of these ways:"
-msgstr "També podeu importar fotografies de qualsevol d'aquestes maneres:"
-
-#: ../src/Dialogs.vala:2162
-msgid "_Don’t show this message again"
-msgstr "_No tornis a mostrar aquest missatge"
-
-#: ../src/Dialogs.vala:2197
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Importa fotografies de la 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:2344 ../src/Dialogs.vala:2348
-msgid "(Help)"
-msgstr "(ajuda)"
-
-#: ../src/Dialogs.vala:2357
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Any%sMes%sDia"
-
-#: ../src/Dialogs.vala:2359
-#, c-format
-msgid "Year%sMonth"
-msgstr "Any%sMes"
-
-#: ../src/Dialogs.vala:2361
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Any%sMes-Dia"
-
-#: ../src/Dialogs.vala:2363
-msgid "Year-Month-Day"
-msgstr "Any-Mes-Dia"
-
-# N.T.: femení
-#: ../src/Dialogs.vala:2364 ../src/editing_tools/EditingTools.vala:781
-msgid "Custom"
-msgstr "Personalitzada"
-
-#. Invalid pattern.
-#: ../src/Dialogs.vala:2601
-msgid "Invalid pattern"
-msgstr "Patró no vàlid"
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2703
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2366,31 +3730,31 @@ msgstr ""
 "El Shotwell pot copiar les fotografies a la carpeta de la biblioteca o les "
 "pot importar sense copiar-les."
 
-#: ../src/Dialogs.vala:2708
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Co_pia les fotografies"
 
-#: ../src/Dialogs.vala:2709
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importa-les a la ubicació"
 
-#: ../src/Dialogs.vala:2710
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Importa a la biblioteca"
 
-#: ../src/Dialogs.vala:2720 ../src/PhotoPage.vala:3085
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Suprimeix de la biblioteca"
 
-#: ../src/Dialogs.vala:2721 ../src/PhotoPage.vala:3085
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "S'està suprimint la fotografia de la biblioteca"
 
-#: ../src/Dialogs.vala:2721
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "S'estan suprimint les fotografies de la biblioteca"
 
-#: ../src/Dialogs.vala:2735
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -2408,12 +3772,12 @@ msgstr[0] ""
 "\n"
 "Aquesta acció no es pot desfer."
 msgstr[1] ""
-"Això suprimirà %d fotografies/vídeos de la biblioteca del Shotwell. Voleu "
-"moure els fitxers a la paperera de l'escriptori?\n"
+"Això suprimirà les fotografies/vídeos %d de la biblioteca del Shotwell. "
+"Voleu moure els fitxers a la paperera de l'escriptori?\n"
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: ../src/Dialogs.vala:2739
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -2431,12 +3795,12 @@ msgstr[0] ""
 "\n"
 "Aquesta acció no es pot desfer."
 msgstr[1] ""
-"Això suprimirà %d vídeos de la biblioteca del Shotwell. Voleu moure els "
+"Això suprimirà els vídeos %d de la biblioteca del Shotwell. Voleu moure els "
 "fitxers a la paperera de l'escriptori?\n"
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: ../src/Dialogs.vala:2743
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -2454,12 +3818,12 @@ msgstr[0] ""
 "\n"
 "Aquesta acció no es pot desfer."
 msgstr[1] ""
-"Això suprimirà %d fotografies de la biblioteca del Shotwell. Voleu moure els "
-"fitxers a la paperera de l'escriptori?\n"
+"Això suprimirà les fotografies %d de la biblioteca del Shotwell. Voleu moure "
+"els fitxers a la paperera de l'escriptori?\n"
 "\n"
 "Aquesta acció no es pot desfer."
 
-#: ../src/Dialogs.vala:2775
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -2469,663 +3833,675 @@ msgstr[0] ""
 "La fotografia o el vídeo no es pot moure a la paperera de l'escriptori. "
 "Voleu suprimir aquest fitxer?"
 msgstr[1] ""
-"%d fotografies/vídeos no es poden moure a la paperera de l'escriptori. Voleu "
-"suprimir aquests fitxers?"
+"Les fotografies/vídeos %d no es poden moure a la paperera de l'escriptori. "
+"Voleu suprimir aquests fitxers?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2792
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "La fotografia o vídeo no es pot suprimir."
-msgstr[1] "%d fotografies/vídeos no es poden suprimir."
-
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Amplada o alçada"
+msgstr[1] "Les fotografies/vídeos %d no es poden suprimir."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Amplada"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Alçada"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Fitxer"
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "No existeix %s."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s no és un fitxer."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s no és compatible amb el format de fitxer de\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr "No s'ha pogut obrir la fotografia %s."
 
-#: ../src/direct/DirectPhotoPage.vala:51 ../src/direct/DirectPhotoPage.vala:432
-#: ../src/Resources.vala:175
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "De_sa"
 
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Desa la fotografia"
+#: src/direct/DirectPhotoPage.vala:316
+msgid "_Save a Copy"
+msgstr "De_sa'n una còpia"
 
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "_Anomena i desa"
+#: src/direct/DirectPhotoPage.vala:319
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Voleu descartar els canvis a %s?"
 
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Desa la fotografia amb un nom diferent"
+#: src/direct/DirectPhotoPage.vala:320
+msgid "Close _without Saving"
+msgstr "Tanca _sense desar"
 
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprimeix la fotografia a una impressora connectada a l'ordinador"
+#: src/direct/DirectPhotoPage.vala:353
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "S'ha produït un error en desar a %s: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:339
-#: ../src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Edita"
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
+msgid "Save As"
+msgstr "Anomena i desa"
 
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotografia"
+#. verify this is a directory
+#: src/DirectoryMonitor.vala:891
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "No s'ha pogut fer un seguiment de %s: No és un directori (%s)"
 
-#: ../src/direct/DirectPhotoPage.vala:81 ../src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "Ei_nes"
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
 
-#: ../src/direct/DirectPhotoPage.vala:86 ../src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Fotografia an_terior"
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
 
-#: ../src/direct/DirectPhotoPage.vala:87 ../src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Fotografia anterior"
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 hores"
 
-#: ../src/direct/DirectPhotoPage.vala:92 ../src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "Fotografia _següent"
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "De_splaça les fotografies/vídeos amb la mateixa quantitat"
 
-#: ../src/direct/DirectPhotoPage.vala:93 ../src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Fotografia següent"
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Est_ableix totes les fotografies/vídeos a aquesta hora"
 
-#: ../src/direct/DirectPhotoPage.vala:165 ../src/library/LibraryWindow.vala:343
-#: ../src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Visualitza"
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Modifica el fitxers de les imatges originals"
+msgstr[1] "_Modifica el fitxer de la imatge original"
 
-#: ../src/direct/DirectPhotoPage.vala:169 ../src/library/LibraryWindow.vala:363
-#: ../src/Resources.vala:162
-msgid "_Help"
-msgstr "A_juda"
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Modifica el fitxer original"
+msgstr[1] "_Modifica els fitxers originals"
 
-#: ../src/direct/DirectPhotoPage.vala:174 ../src/MediaPage.vala:340
-#: ../src/PhotoPage.vala:2591 ../src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "_Amplia"
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Original: "
 
-#: ../src/direct/DirectPhotoPage.vala:175 ../src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Incrementa l'ampliació de la fotografia"
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/direct/DirectPhotoPage.vala:180 ../src/MediaPage.vala:346
-#: ../src/PhotoPage.vala:2597 ../src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "_Redueix"
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/direct/DirectPhotoPage.vala:181 ../src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Redueix l'ampliació de la fotografia"
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"El temps d'exposició es desplaçarà cap endavant per\n"
+"%d %s, %d %s, %d %s i %d %s."
 
-#: ../src/direct/DirectPhotoPage.vala:186 ../src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Ajusta a l'amplada de la _pàgina"
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"El temps d'exposició es desplaçarà cap enrere per\n"
+"%d %s, %d %s, %d %s i %d %s."
 
-#: ../src/direct/DirectPhotoPage.vala:187 ../src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Amplia la fotografia per ajustar-la a la pantalla"
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dies"
 
-#: ../src/direct/DirectPhotoPage.vala:193 ../src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Ampliació _100%"
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "hores"
 
-#: ../src/direct/DirectPhotoPage.vala:195 ../src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Amplia la fotografia al 100%"
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minuts"
 
-#: ../src/direct/DirectPhotoPage.vala:201 ../src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Ampliació _200%"
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segon"
+msgstr[1] "segons"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Sense modificació"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Actual"
 
-#: ../src/direct/DirectPhotoPage.vala:203 ../src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Amplia la fotografia al 200%"
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Format:"
 
-#: ../src/direct/DirectPhotoPage.vala:227
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Qualitat:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "Restricció d'e_scala:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr " _Píxels:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Exporta les _metadades:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Ajuda)"
+
+#: src/dialogs/Preferences.vala:123
 #, c-format
-msgid "%s does not exist."
-msgstr "No existeix %s."
+msgid "Year%sMonth%sDay"
+msgstr "Any%sMes%sDia"
 
-#: ../src/direct/DirectPhotoPage.vala:229
+#: src/dialogs/Preferences.vala:125
 #, c-format
-msgid "%s is not a file."
-msgstr "%s no és un fitxer."
+msgid "Year%sMonth"
+msgstr "Any%sMes"
 
-#: ../src/direct/DirectPhotoPage.vala:231
+#: src/dialogs/Preferences.vala:127
 #, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s no és compatible amb el format de fitxer de\n"
-"%s."
+msgid "Year%sMonth-Day"
+msgstr "Any%sMes-Dia"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Any-Mes-Dia"
+
+# N.T.: femení
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Personalitza"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Patró no vàlid"
 
-#: ../src/direct/DirectPhotoPage.vala:248
+#: src/dialogs/ProgressDialog.vala:97
 #, c-format
-msgid "Unable open photo %s. Sorry."
-msgstr "No s'ha pogut obrir la fotografia %s."
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../src/direct/DirectPhotoPage.vala:432
-msgid "_Save a Copy"
-msgstr "De_sa'n una còpia"
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segon"
+msgstr[1] "%d segons"
 
-#: ../src/direct/DirectPhotoPage.vala:435
+#: src/dialogs/SetBackgroundSlideshow.vala:52
 #, c-format
-msgid "Lose changes to %s?"
-msgstr "Voleu descartar els canvis a %s?"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuts"
 
-#: ../src/direct/DirectPhotoPage.vala:436
-msgid "Close _without Saving"
-msgstr "Tanca _sense desar"
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d hores"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 dia"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Us donem la benvinguda!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Us donem la benvinguda al Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr ""
+"Per començar, importeu fotografies de qualsevol de les següents formes:"
 
-#: ../src/direct/DirectPhotoPage.vala:469
+#: src/dialogs/WelcomeDialog.vala:67
 #, c-format
-msgid "Error while saving to %s: %s"
-msgstr "S'ha produït un error en desar a %s: %s"
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Trieu <span weight=\"bold\">Fitxer %s Importa des d'una carpeta</span>"
 
-#: ../src/direct/DirectPhotoPage.vala:497
-#: ../src/direct/DirectPhotoPage.vala:518
-msgid "Save As"
-msgstr "Anomena i desa"
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Arrossegueu i deixeu anar fotografies a la finestra del Shotwell"
 
-#. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Connecteu una càmera al vostre ordinador i importeu-ne les fotografies"
+
+#: src/dialogs/WelcomeDialog.vala:80
 #, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "No s'ha pogut fer un seguiment de %s: no és un directori (%s)"
+msgid "_Import photos from your %s folder"
+msgstr "_Importa les fotografies de la carpeta %s"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "També podeu importar fotografies de qualsevol d'aquestes maneres:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_No tornis a mostrar aquest missatge"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Importa fotografies de la biblioteca %s"
 
-#: ../src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Torna a la mida actual de la fotografia"
 
-#: ../src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Estableix l'escapçament d'aquesta fotografia"
 
-#: ../src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Pivota el rectangle d'escapçament entre les orientacions vertical i apaïsada"
 
-#: ../src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
-msgstr "Sense límits"
+msgstr "Sense restriccions"
 
-#: ../src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Quadrat"
 
-#: ../src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Pantalla"
 
-#: ../src/editing_tools/EditingTools.vala:757
-#: ../src/editing_tools/EditingTools.vala:760
-#: ../src/editing_tools/EditingTools.vala:770
-#: ../src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: ../src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Vídeo SD (4 ∶ 3)"
 
-#: ../src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Vídeo HD (16 ∶ 9)"
 
-#: ../src/editing_tools/EditingTools.vala:761 ../src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Cartera (2 × 3 polzades)"
 
-#: ../src/editing_tools/EditingTools.vala:762 ../src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Targeta (3 × 5 polzades)"
 
-#: ../src/editing_tools/EditingTools.vala:763 ../src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 polzades"
 
-#: ../src/editing_tools/EditingTools.vala:764 ../src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 polzades"
 
-#: ../src/editing_tools/EditingTools.vala:765 ../src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 polzades"
 
-#: ../src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Carta (8.5 × 11 polzades)"
 
-#: ../src/editing_tools/EditingTools.vala:767 ../src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 polzades"
 
-#: ../src/editing_tools/EditingTools.vala:768
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloide (11 × 17 polzades)"
 
-#: ../src/editing_tools/EditingTools.vala:769 ../src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 polzades"
 
-#: ../src/editing_tools/EditingTools.vala:771 ../src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Cartera en sistema mètric (9 × 13 cm)"
 
-#: ../src/editing_tools/EditingTools.vala:772 ../src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postal (10 × 15 cm)"
 
-#: ../src/editing_tools/EditingTools.vala:773 ../src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: ../src/editing_tools/EditingTools.vala:774 ../src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: ../src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: ../src/editing_tools/EditingTools.vala:776 ../src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: ../src/editing_tools/EditingTools.vala:777 ../src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: ../src/editing_tools/EditingTools.vala:778 ../src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: ../src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:758
 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:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Mida:"
 
-#: ../src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Tanca l'eina d'ulls vermells"
 
-#: ../src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Suprimeix tots els efectes d'ulls vermells de la regió seleccionada"
 
-#: ../src/editing_tools/EditingTools.vala:2229
-#: ../src/editing_tools/StraightenTool.vala:102
+#: src/editing_tools/EditingTools.vala:2216
+#: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Reinicia"
 
 #. fit both on the top line, emit and move on
-#: ../src/editing_tools/EditingTools.vala:2243 ../src/Properties.vala:436
-#: ../src/Properties.vala:440 ../src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Exposició:"
 
-#: ../src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Contrast:"
 
-#: ../src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Saturació:"
 
-#: ../src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Tint:"
 
-#: ../src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: ../src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Ombres:"
 
-#: ../src/editing_tools/EditingTools.vala:2292
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Realçats:"
 
-#: ../src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Reinicialitza els colors"
 
-#: ../src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Reinicialitza tots els ajustaments de color a l'original"
 
-#: ../src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: ../src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Tint"
 
-#: ../src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Saturació"
 
-#: ../src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Exposició"
 
-#: ../src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Ombres"
 
-#: ../src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Realçats"
 
-#: ../src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Expansió del contrast"
 
-#: ../src/editing_tools/StraightenTool.vala:99
+#: src/editing_tools/StraightenTool.vala:99
 msgid "Angle:"
 msgstr "Angle:"
 
-#: ../src/editing_tools/StraightenTool.vala:100 ../src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
-msgstr "_Adreça"
-
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Esdeveniments"
+msgstr "_Redreça"
 
-#: ../src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d fotografia/vídeo"
 msgstr[1] "%d fotografies/vídeos"
 
-#: ../src/events/EventDirectoryItem.vala:85 ../src/Properties.vala:355
+#: src/events/EventDirectoryItem.vala:99 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:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
 msgstr[0] "Una fotografia"
 msgstr[1] "%d fotografies"
 
-#: ../src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Cap esdeveniment"
 
-#: ../src/events/EventsDirectoryPage.vala:130 ../src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Comentaris"
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Esdeveniments"
 
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Mostra el comentari per cada esdeveniment"
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Navegueu els esdeveniments"
 
-#: ../src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Sense esdeveniments"
 
-#: ../src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "No s'han trobat esdeveniments"
 
-#: ../src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Tots els esdeveniments"
 
-#: ../src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Sense data"
 
-#: ../src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: ../src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
 #. if no name, pretty up the start time
-#: ../src/Event.vala:753
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Esdeveniment %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "No s'ha pogut generar un fitxer temporal per a %s: %s"
 
 # N.T.: Títol d'una secció d'un diàleg
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
-msgstr "Exportació"
+msgstr "Exportant"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
 msgid "File %s already exists. Replace?"
 msgstr "Ja existeix el fitxer %s. Voleu reemplaçar-lo?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "_Omet-lo"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Reemplaça'l"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "Reempl_aça'ls tots"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Exporta"
 
-#: ../src/folders/Branch.vala:141
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Carpetes"
 
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-msgid "Library"
-msgstr "Biblioteca"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Navegueu l'estructura de carpetes de la biblioteca"
 
-#: ../src/library/Branch.vala:97 ../src/SearchFilter.vala:608
-#: ../src/SearchFilter.vala:609
-msgid "Photos"
-msgstr "Fotografies"
-
-#: ../src/library/FlaggedPage.vala:8 ../src/SearchFilter.vala:602
-#: ../src/SearchFilter.vala:603 ../src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
-msgstr "Senyalat"
+msgstr "Marcats"
 
 # N.T.: Títol d'una secció a un quadre de diàleg
-#: ../src/library/ImportQueuePage.vala:8
+#: src/library/ImportQueuePage.vala:8
 msgid "Importing…"
 msgstr "S'està important…"
 
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "A_tura la importació"
-
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Atura la importació de fotografies"
-
-#: ../src/library/ImportQueuePage.vala:124
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "S'està preparant per importar…"
 
-#: ../src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "S'ha importat %s"
 
-#: ../src/library/LastImportPage.vala:8
+#: src/library/LastImportPage.vala:8
 msgid "Last Import"
 msgstr "Darrera importació"
 
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr "Importa des d'una carpeta"
-
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importa fotografies des del disc a la biblioteca"
-
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr "Importa des de l'aplicació"
-
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Ordena els es_deveniments"
-
-#: ../src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Buida la _paperera"
-
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Suprimeix totes les fotografies de la paperera"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Visualitza l'_esdeveniment de la fotografia"
-
-#: ../src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Cerca"
-
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Cerca fotografies i vídeos per criteri de cerca"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr "Cerca no_va desada…"
-
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotografies"
-
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "E_sdeveniments"
-
-#: ../src/library/LibraryWindow.vala:359 ../src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Eti_quetes"
-
-#: ../src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Informació _bàsica"
-
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Mostra informació bàsica sobre la selecció"
-
-#: ../src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Informació am_pliada"
-
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Mostra informació ampliada sobre la selecció"
-
-#: ../src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Barra de _cerca"
-
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Mostra la barra de cerca"
-
-#: ../src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "_Barra lateral"
-
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Mostra la barra lateral"
-
-#: ../src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "_Barra d'eines"
-
-#: ../src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Mostra la barra d'eines"
-
-#: ../src/library/LibraryWindow.vala:411 ../src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Ascendent"
-
-#: ../src/library/LibraryWindow.vala:412 ../src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Ordena les fotografies en ordre ascendent"
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Biblioteca"
 
-#: ../src/library/LibraryWindow.vala:418 ../src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "D_escendent"
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organitzeu i navegueu les fotografies"
 
-#: ../src/library/LibraryWindow.vala:419 ../src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Ordena les fotografies en ordre descendent"
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotografies"
 
-#: ../src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importa des d'una carpeta"
 
-#: ../src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Recursivament dins les subcarpetes"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Buida la paperera"
 
-#: ../src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "S'està buidant la paperera…"
 
-#: ../src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -3133,68 +4509,67 @@ msgid ""
 "span>.\n"
 "Do you want to continue importing photos?"
 msgstr ""
-"El Shotwell està configurat per importar les fotos al vostre directori "
+"El Shotwell està configurat per importar les fotografies al vostre directori "
 "d'inici.\n"
-"Us recomanem canviar això a <span weight=\"bold\">Edita %s Preferències</"
-"span>.\n"
-"Voleu continuar la importació de les fotos?"
+"Us recomanem el canvi d'aquest a <span weight=\"bold\">Edita %s "
+"Preferències</span>.\n"
+"Voleu continuar la importació de les fotografies?"
 
-#: ../src/library/LibraryWindow.vala:904
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Ubicació de la biblioteca"
 
 #. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "No es poden importar fotografies des d'aquest directori."
 
-#: ../src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: ../src/library/LibraryWindow.vala:1247
-#: ../src/library/LibraryWindow.vala:1258
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "S'està actualitzant la biblioteca…"
 
-#: ../src/library/LibraryWindow.vala:1264
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "S'està preparant la importació automàtica de fotografies…"
 
-#: ../src/library/LibraryWindow.vala:1269
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "S'estan important automàticament les fotografies…"
 
-#: ../src/library/LibraryWindow.vala:1277
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "S'estan escrivint les metadades als fitxers…"
 
-#: ../src/library/OfflinePage.vala:8
+#: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Manquen fitxers"
 
-#: ../src/library/OfflinePage.vala:106
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "S'està suprimint…"
 
-#: ../src/library/TrashPage.vala:8
+#: src/library/TrashPage.vala:8
 msgid "Trash"
 msgstr "Paperera"
 
-#: ../src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "La paperera està buida"
 
-#: ../src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "S'estan suprimint les fotografies"
 
-#: ../src/main.vala:54
+#: src/main.vala:54
 #, c-format
 msgid ""
 "Your photo library is not compatible with this version of Shotwell. It "
@@ -3203,9 +4578,9 @@ msgid ""
 msgstr ""
 "La biblioteca de fotografies no és compatible amb aquesta versió del "
 "Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
-"versió és la %s (esquema %d). Utilitzeu l'última versió del Shotwell."
+"versió és la %s (schema %d). Utilitzeu l'última versió del Shotwell."
 
-#: ../src/main.vala:59
+#: src/main.vala:59
 #, c-format
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
@@ -3213,10 +4588,10 @@ msgid ""
 "at %s"
 msgstr ""
 "El Shotwell no ha pogut actualitzar la biblioteca de fotografies de la "
-"versió %s (esquema %d) a la %s (esquema %d). Per obtenir més informació "
+"versió %s (schema %d) a la %s (schema %d). Per obtenir més informació "
 "comproveu el Wiki del Shotwell a %s."
 
-#: ../src/main.vala:65
+#: src/main.vala:65
 #, c-format
 msgid ""
 "Your photo library is not compatible with this version of Shotwell. It "
@@ -3225,128 +4600,67 @@ msgid ""
 "photos."
 msgstr ""
 "La biblioteca de fotografies no és compatible amb aquesta versió del "
-"Shotwell. Sembla que es va crear amb el Shotwell %s (esquema %d). Aquesta "
-"versió és la %s (esquema %d). Netegeu la biblioteca mitjançant la supressió "
+"Shotwell. Sembla que es va crear amb el Shotwell %s (schema %d). Aquesta "
+"versió és la %s (schema %d). Netegeu la biblioteca mitjançant la supressió "
 "de %s i torneu a importar les fotografies."
 
-#: ../src/main.vala:71
+#: src/main.vala:71
 #, c-format
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr ""
 "S'ha produït un error desconegut en intentar verificar la base de dades del "
 "Shotwell: %s"
 
-#: ../src/main.vala:104
+#: src/main.vala:104
 msgid "Loading Shotwell"
 msgstr "S'està carregant el Shotwell"
 
-#: ../src/main.vala:294
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Camí a les dades privades del Shotwell"
 
-#: ../src/main.vala:294
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIRECTORI"
 
-#: ../src/main.vala:298
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
-msgstr ""
-"No monitoritzis el directori de la biblioteca en mode d'execució per canvis"
+msgstr "No vigilis el directori de la biblioteca en mode d'execució per canvis"
 
-#: ../src/main.vala:302
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "No mostris la barra de progrés d'inici"
 
-#: ../src/main.vala:306
+#: src/main.vala:315
 msgid "Show the application’s version"
-msgstr "Mostra la versió de l'aplicació"
+msgstr "Mostra la versió de les aplicacions"
+
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Inicia l'aplicació en mode de pantalla completa"
 
 #. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[FITXER]"
 
-#: ../src/main.vala:342
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
 "Executeu «%s --help» per veure una llista completa de les opcions "
 "disponibles de la línia d'ordres.\n"
 
-#: ../src/MediaMonitor.vala:400
+#: src/MediaMonitor.vala:400
 #, c-format
 msgid "Unable to process monitoring updates: %s"
-msgstr "No s'han pogut processar les actualitzacions de seguiment: %s"
+msgstr "No s'ha pogut processar les actualitzacions de seguiment: %s"
 
-#: ../src/MediaPage.vala:158
+#: src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Ajusta la mida de les miniatures"
 
-#: ../src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Augmenta la mida de les miniatures"
-
-#: ../src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Redueix la mida de les miniatures"
-
-#: ../src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Ordena les _fotografies"
-
-#: ../src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Reprodueix el vídeo"
-
-#: ../src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Obre els vídeos seleccionats en el reproductor de vídeo del sistema"
-
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Desenvolupador"
-
-#: ../src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Mostra el comentari de cada foto"
-
-#: ../src/MediaPage.vala:470
-msgid "Display each photo’s tags"
-msgstr "Mostra les etiquetes de cada fotografia"
-
-#: ../src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Per _títol"
-
-#: ../src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Ordena les fotografies per títol"
-
-#: ../src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Per _data d'exposició"
-
-#: ../src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Ordena les fotografies per data d'exposició"
-
-#: ../src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Per _puntuació"
-
-#: ../src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Ordena les fotografies per puntuació"
-
-#: ../src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Per nom de _fitxer"
-
-#: ../src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Ordena les fotografies per nom de fitxer"
-
-#: ../src/MediaPage.vala:723
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -3355,127 +4669,119 @@ msgstr ""
 "El Shotwell no ha pogut reproduir el vídeo seleccionat:\n"
 "%s"
 
-#: ../src/Page.vala:1266
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Cap fotografia/vídeo"
 
-#: ../src/Page.vala:1270
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
-msgstr "No s'han trobat fotos o vídeos que coincideixin amb el filtre actual"
+msgstr "No s'ha trobat fotos o vídeos que coincideixin amb el filtre actual"
 
-#: ../src/Page.vala:2576
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "No es poden exportar fotografies a aquest directori."
 
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Fotografia anterior"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Fotografia següent"
 
-#: ../src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Manca el fitxer font de la fotografia: %s"
 
-#: ../src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "No s'ha pogut exportar %s: %s"
 
-#: ../src/photos/BmpSupport.vala:32
+#: src/photos/BmpSupport.vala:32
 msgid "BMP"
 msgstr "BMP"
 
-#: ../src/photos/JfifSupport.vala:84
+#: src/photos/JfifSupport.vala:84
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../src/photos/JfifSupport.vala:185
+#: src/photos/JfifSupport.vala:185
 #, c-format
 msgid "Low (%d%%)"
 msgstr "Baixa (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:188
+#: src/photos/JfifSupport.vala:188
 #, c-format
 msgid "Medium (%d%%)"
-msgstr "Mitjana (%d%%)"
+msgstr "Mitja (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:191
+#: src/photos/JfifSupport.vala:191
 #, c-format
 msgid "High (%d%%)"
 msgstr "Alta (%d%%)"
 
-#: ../src/photos/JfifSupport.vala:194
+#: src/photos/JfifSupport.vala:194
 #, c-format
 msgid "Maximum (%d%%)"
 msgstr "Màxima (%d%%)"
 
-#: ../src/photos/PngSupport.vala:30
+#: src/photos/PngSupport.vala:30
 msgid "PNG"
 msgstr "PNG"
 
-#: ../src/photos/RawSupport.vala:134
+#: src/photos/RawSupport.vala:134
 msgid "RAW"
 msgstr "RAW"
 
-#: ../src/photos/TiffSupport.vala:86
+#: src/photos/TiffSupport.vala:86
 msgid "TIFF"
 msgstr "TIFF"
 
-#: ../src/Photo.vala:3753
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "modificat"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Omple tota la pàgina"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 imatges per pàgina"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 imatges per pàgina"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 imatges per pàgina"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 imatges per pàgina"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 imatges per pàgina"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 imatges per pàgina"
 
-#: ../src/Printing.vala:348
-msgid "in."
-msgstr "polzades"
-
-#: ../src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: ../src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Paràmetres de la imatge"
 
-#: ../src/Printing.vala:889
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "S'està imprimint..."
 
-#: ../src/Printing.vala:909 ../src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -3486,206 +4792,204 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Avui"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Elements:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
-msgstr[0] "%d esdeveniment"
-msgstr[1] "%d esdeveniments"
+msgstr[0] "Esdeveniment %d"
+msgstr[1] "Esdeveniments %d"
 
 #. 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 "Des de:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "A:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Durada:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segons"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Revelador:"
 
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Mida del fitxer:"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Desenvolupament actual:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Mida original:"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Fabricant de la càmera:"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Model de la càmera:"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Flaix:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Distància focal:"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Data d'exposició:"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Temps d'exposició:"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Desplaçament de l'exposició:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Latitud GPS:"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Longitud 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 "Programari:"
 
-#: ../src/Properties.vala:641
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Informació ampliada"
 
-#: ../src/publishing/PublishingPluginHost.vala:11
+#: src/publishing/PublishingPluginHost.vala:11
 msgid "Preparing for upload"
 msgstr "S'està preparant per pujar"
 
-#: ../src/publishing/PublishingPluginHost.vala:12
+#: src/publishing/PublishingPluginHost.vala:12
 #, c-format
 msgid "Uploading %d of %d"
 msgstr "S'està pujant %d de %d"
 
-#: ../src/publishing/PublishingPluginHost.vala:81
+#: src/publishing/PublishingPluginHost.vala:81
 #, c-format
 msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "La publicació a %s no pot continuar perquè s'ha produït un error:"
 
-#: ../src/publishing/PublishingPluginHost.vala:84
+#: src/publishing/PublishingPluginHost.vala:84
 msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
 "Si voleu intentar publicar les fotografies a un altre servei, seleccioneu-ne "
 "un del menú de sobre."
 
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "S'han publicat correctament les fotografies/vídeos seleccionats."
-
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "S'han publicat correctament els vídeos seleccionats."
-
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "S'han publicat correctament les fotografies seleccionades."
-
-#: ../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
 msgid "The selected video was successfully published."
-msgstr "S'ha publicat correctament el vídeo seleccionat."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "S'ha publicat correctament el vídeo seleccionat."
+msgstr[1] "S'ha publicat correctament els vídeos seleccionats."
 
-#: ../src/publishing/PublishingUI.vala:114
+#: src/publishing/PublishingUI.vala:109
 msgid "The selected photo was successfully published."
-msgstr "S'ha publicat correctament la fotografia seleccionada."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "S'ha publicat correctament la fotografia seleccionada."
+msgstr[1] "S'ha publicat correctament les fotografies seleccionades."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "S'ha publicat correctament les fotografies/vídeos seleccionats."
 
-#: ../src/publishing/PublishingUI.vala:122
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
 msgstr "S'està recollint la informació del compte…"
 
-#: ../src/publishing/PublishingUI.vala:128
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
 msgstr "S'està entrant…"
 
-#: ../src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Publica les fotografies"
 
-#: ../src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
-msgstr "Publica les fotografies _a:"
+msgstr "Publica les fo_tografies a:"
 
-#: ../src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Publica vídeos"
 
-#: ../src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Publica vídeos _a:"
 
-#: ../src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Publica fotografies i vídeos"
 
-#: ../src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
-msgstr "Publica fotografies i vídeos _a"
+msgstr "Publica fo_tografies i vídeos a"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: ../src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "No s'ha pogut publicar"
 
-#: ../src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -3699,768 +5003,743 @@ msgstr ""
 "publicació a la pestanya <b>Connectors</b>."
 
 # N.T.: Títol d'un grup de connectors
-#: ../src/publishing/Publishing.vala:16
+#: src/publishing/Publishing.vala:16
 msgid "Publishing"
 msgstr "Publicació"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Gestor fotogràfic"
-
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Visualitzador fotogràfic"
-
-#: ../src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Gi_ra a la dreta"
-
-#: ../src/Resources.vala:140 ../src/Resources.vala:145
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Gira"
 
-#: ../src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../src/Resources.vala:142
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Gira les fotografies cap a la dreta (premeu Ctrl per girar cap a l'esquerra)"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Gira a _l'esquerra"
-
-#: ../src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Gira les fotografies cap a l'esquerra"
 
-#: ../src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Inverteix horit_zontalment"
-
-#: ../src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Inverteix horitzontalment"
 
-#: ../src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Inverteix verti_calment"
-
-#: ../src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Inverteix verticalment"
 
-#: ../src/Resources.vala:155
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
-msgstr "_Quant a"
+msgstr "Quant _a"
 
-#: ../src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Aplica"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:160 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/trash.ui:37
+msgid "_Edit"
+msgstr "_Edita"
+
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_Endavant"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
-msgstr "_Pantalla completa"
+msgstr "Pantalla _completa"
+
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "A_juda"
 
-#: ../src/Resources.vala:163
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Surt de la _pantalla completa"
 
-#: ../src/Resources.vala:164 ../src/Resources.vala:363
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
-msgstr "_Nova"
+msgstr "_Nou"
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Següent"
 
-#: ../src/Resources.vala:166
-msgid "_OK"
-msgstr "_D'acord"
-
-#: ../src/Resources.vala:167
-msgid "_Play"
-msgstr "_Reprodueix"
-
-#: ../src/Resources.vala:168 ../src/Resources.vala:317
+#: src/Resources.vala:169 src/Resources.vala:318 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
-msgstr "Preferè_ncies"
+msgstr "_Preferències"
 
-#: ../src/Resources.vala:169
+#: src/Resources.vala:170
 msgid "_Previous"
-msgstr "An_terior"
-
-#: ../src/Resources.vala:170
-msgid "_Print"
-msgstr "_Imprimeix"
+msgstr "_Anterior"
 
-#: ../src/Resources.vala:171
+#: src/Resources.vala:172 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 "_Surt"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "Actualit_za"
 
-#: ../src/Resources.vala:174
+#: src/Resources.vala:175
 msgid "_Revert"
-msgstr "Rever_teix"
+msgstr "_Reverteix"
 
-#: ../src/Resources.vala:176
+#: src/Resources.vala:177
 msgid "Save _As"
-msgstr "_Anomena i desa"
+msgstr "An_omena i desa"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Ordre _ascendent"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:179
 msgid "Sort _Descending"
-msgstr "Ordre d_escendent"
+msgstr "Ordre _descendent"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "A_tura"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "Rec_upera"
 
-#: ../src/Resources.vala:181
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "Mida _normal"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "Millor e_ncaix"
 
-#: ../src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Millora"
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "_Amplia"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "_Redueix"
+
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Millora"
 
-#: ../src/Resources.vala:188
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Millora automàticament l'aparença de la fotografia"
 
-#: ../src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Copia els ajustaments de color"
-
-#: ../src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Copia els ajustaments de color"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Copia els ajustaments de color aplicats a la foto"
 
-#: ../src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Enganxa els ajustaments de color"
-
-#: ../src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Enganxa els ajustaments de color"
 
-#: ../src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
-msgstr "Aplica els ajustaments de color copiats a les fotos seleccionades"
+msgstr ""
+"Aplica els ajustaments de color copiats a les fotografies seleccionades"
 
-#: ../src/Resources.vala:198
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "Es_capça"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Escapça"
 
-#: ../src/Resources.vala:200
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
 msgstr "Escapça la mida de la fotografia"
 
-#: ../src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
-msgstr "Adreça"
+msgstr "Redreça"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
-msgstr "Adreça la fotografia"
+msgstr "Redreça la fotografia"
 
-#: ../src/Resources.vala:206
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
-msgstr "_Ulls vermells"
+msgstr "Ulls ve_rmells"
 
-#: ../src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Ulls vermells"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr "Redueix o suprimeix qualsevol efecte d'ulls vermells a la fotografia"
+msgstr "Redueix o elimina qualsevol efecte d'ulls vermells a la fotografia"
 
-#: ../src/Resources.vala:210
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Ajusta"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Ajusta"
 
-#: ../src/Resources.vala:212
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
 msgstr "Ajusta el color i el to de la fotografia"
 
-#: ../src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Reverteix a l'original"
-
-#: ../src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Reverteix a l'original"
 
-#: ../src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
-msgstr "Reverteix les edicions e_xternes"
+msgstr "Reverteix les e_dicions externes"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Reverteix a la fotografia mestra"
 
-#: ../src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Estableix com a fons d'_escriptori"
-
-#: ../src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Estableix la imatge seleccionada com a fons de l'escriptori"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
-msgstr "Estableix com a presentació de diapositives de l'escriptori…"
+msgstr "Estableix com a presentació de _diapositives de l'escriptori…"
 
-#: ../src/Resources.vala:224
+#: src/Resources.vala:225 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 "_Desfés"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Desfés"
 
-#: ../src/Resources.vala:227
+#: src/Resources.vala:228 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 "_Refés"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Refés"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
-msgstr "Canvia el nom de l'esdeveniment…"
+msgstr "Canvia el _nom de l'esdeveniment…"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
-msgstr "Fes-la la fotografia _principal de l'esdeveniment"
+msgstr "Fes la fotografia _principal de l'esdeveniment"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
-msgstr "Fes-la la fotografia principal de l'esdeveniment"
+msgstr "Fes la fotografia principal de l'esdeveniment"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "Esdeveniment _nou"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Esdeveniment nou"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Mou les fotografies"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Mou les fotografies cap a un esdeveniment"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
-msgstr "_Combina els esdeveniments"
+msgstr "Fusiona els esdeveni_ments"
 
-#: ../src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
-msgstr "Combina"
+msgstr "Fusiona"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Combina els esdeveniments en un únic esdeveniment"
 
-#: ../src/Resources.vala:246
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
-msgstr "_Estableix la puntuació"
+msgstr "E_stableix la puntuació"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Estableix la puntuació"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Canvia la puntuació de la fotografia"
 
-#: ../src/Resources.vala:250
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Incrementa"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Incrementa la puntuació"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
-msgstr "_Redueix"
+msgstr "Re_dueix"
 
-#: ../src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Redueix la puntuació"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Sense puntuació"
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Sense puntuació"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Puntua les fotografies sense puntuació"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "S'està establint com sense puntuació"
 
-#: ../src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Suprimeix totes les puntuacions"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Rebutjada"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Rebutjada"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Puntua com a rebutjada"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "S'està establint com a rebutjada"
 
-#: ../src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Estableix la puntuació com a rebutjada"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:269 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 "Només les _rebutjades"
+msgstr "N_omés les rebutjades"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Només les rebutjades"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Mostra només les fotografies rebutjades"
 
-#: ../src/Resources.vala:272
+#: src/Resources.vala:273 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 "Totes més les _rebutjades"
 
-#: ../src/Resources.vala:273
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Mostra totes les fotografies, incloses les rebutjades"
 
-#: ../src/Resources.vala:275
+#: src/Resources.vala:276 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 "_Totes les fotografies"
+msgstr "Totes les fotogr_afies"
 
 #. Button tooltip
-#: ../src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Mostra totes les fotografies"
 
-#: ../src/Resources.vala:279
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Puntuacions"
 
-#: ../src/Resources.vala:280
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
 msgstr "Mostra la puntuació de cada fotografia"
 
-#: ../src/Resources.vala:282
+#: src/Resources.vala:283 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 "_Filtra les fotografies"
 
-#: ../src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Filtra les fotografies"
 
-#: ../src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Limita el nombre de fotografies mostrades basant-se en un filtre"
 
-#: ../src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Duplica"
-
-#: ../src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
-msgstr "Duplica"
+msgstr "Duplicada"
 
-#: ../src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Fes un duplicat de la fotografia"
 
-#: ../src/Resources.vala:290
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
-msgstr "Exporta…"
+msgstr "_Exporta…"
 
-#: ../src/Resources.vala:292
+#: src/Resources.vala:293
 msgid "_Print…"
-msgstr "_Imprimeix…"
+msgstr "Im_primeix…"
 
-#: ../src/Resources.vala:294
+#: src/Resources.vala:295
 msgid "Pu_blish…"
-msgstr "Publica…"
+msgstr "Pu_blica…"
 
-#: ../src/Resources.vala:295
-msgid "Publish"
-msgstr "Publica"
-
-#: ../src/Resources.vala:296
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Publica a diversos llocs web"
 
-#: ../src/Resources.vala:298
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
-msgstr "Edita el títol…"
+msgstr "Edita el _títol…"
 
 #. Button label
-#: ../src/Resources.vala:300
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Edita el títol"
 
-#: ../src/Resources.vala:302
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
-msgstr "Edita el comentari…"
+msgstr "Edita el _comentari…"
 
 #. Button label
-#: ../src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Edita el comentari..."
 
-#: ../src/Resources.vala:306
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
-msgstr "Edita el comentari de l'esdeveniment…"
+msgstr "Edita el _comentari de l'esdeveniment…"
 
-#: ../src/Resources.vala:309
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
-msgstr "Ajusta la data i l'hora…"
+msgstr "_Ajusta la data i l'hora…"
 
-#: ../src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Ajusta la data i l'hora"
 
-#: ../src/Resources.vala:312
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
-msgstr "Afegeix etiquetes…"
+msgstr "Afegeix e_tiquetes…"
 
-#: ../src/Resources.vala:313
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
-msgstr "Afegeix etiquetes…"
+msgstr "_Afegeix etiquetes…"
 
 #. Dialog title
-#: ../src/Resources.vala:315
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Afegeix etiquetes"
 
-#: ../src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Obre amb un editor e_xtern"
-
-#: ../src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Obre amb un editor d'imatges RA_W"
-
-#: ../src/Resources.vala:323
-msgid "Send _To…"
-msgstr "Envia a…"
-
-#: ../src/Resources.vala:324
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
-msgstr "Envia a…"
+msgstr "_Envia a…"
 
-#: ../src/Resources.vala:326
+#: src/Resources.vala:327
 msgid "_Find…"
 msgstr "_Cerca…"
 
-#: ../src/Resources.vala:327
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Cerca"
 
-#: ../src/Resources.vala:328
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Cerqueu una imatge escrivint text que aparegui en el seu nom o les seves "
 "etiquetes"
 
-#: ../src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Senyala"
 
-#: ../src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "_Treu el senyalador"
 
-#: ../src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "No s'ha pogut executar l'editor: %s"
 
-#: ../src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
 msgid "Add Tag “%s”"
 msgstr "Afegeix l'etiqueta «%s»"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
 msgid "Add Tags “%s” and “%s”"
 msgstr "Afegeix les etiquetes «%s» i «%s»"
 
 #. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:348
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Afegeix etiquetes"
 
-#: ../src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
 msgid "_Delete Tag “%s”"
 msgstr "_Suprimeix l'etiqueta «%s»"
 
-#: ../src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
 msgid "Delete Tag “%s”"
 msgstr "Suprimeix l'etiqueta «%s»"
 
-#: ../src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Suprimeix l'etiqueta"
 
-#: ../src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
 msgid "Re_name Tag “%s”…"
-msgstr "Can_via el nom de l'etiqueta «%s»…"
+msgstr "Canvia el _nom de l'etiqueta «%s»…"
 
-#: ../src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Canvia el nom de l'etiqueta «%s» a «%s»"
 
-#: ../src/Resources.vala:373
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
 msgstr "_Canvia el nom…"
 
-#: ../src/Resources.vala:375
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Modifica les etiquetes…"
 
-#: ../src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Modifica les etiquetes"
 
-#: ../src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
 msgid "Tag Photo as “%s”"
-msgstr "Etiqueta la fotografia com a «%s»"
-
-#: ../src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as “%s”"
-msgstr "Etiqueta les fotografies com a «%s»"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Etiqueta la fotografia com a «%s»"
+msgstr[1] "Etiqueta les fotografies com a «%s»"
 
-#: ../src/Resources.vala:383
+#: src/Resources.vala:386
 #, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr "Etiqueta la fotografia seleccionada com a «%s»"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Etiqueta la fotografia seleccionada com a «%s»"
+msgstr[1] "Etiqueta les fotografies seleccionades com a «%s»"
 
-#: ../src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as “%s”"
-msgstr "Etiqueta les fotografies seleccionades com a «%s»"
-
-#: ../src/Resources.vala:388
+#: src/Resources.vala:392
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Suprimeix l'etiqueta «%s» de la _fotografia"
-
-#: ../src/Resources.vala:389
-#, c-format
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Suprimeix l'etiqueta «%s» de les _fotografies"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Su_primeix l'etiqueta «%s» de la fotografia"
+msgstr[1] "Su_primeix l'etiqueta «%s» de les fotografies"
 
-#: ../src/Resources.vala:393
+#: src/Resources.vala:398
 #, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr "Suprimeix l'etiqueta «%s» de la fotografia"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Suprimeix l'etiqueta «%s» de la fotografia"
+msgstr[1] "Suprimeix l'etiqueta «%s» de les fotografies"
 
-#: ../src/Resources.vala:394
-#, c-format
-msgid "Remove Tag “%s” From Photos"
-msgstr "Suprimeix l'etiqueta «%s» de les fotografies"
-
-#: ../src/Resources.vala:398
+#: src/Resources.vala:404
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "No s'ha pogut canviar el nom de l'etiqueta a «%s» perquè l'etiqueta ja "
 "existeix."
 
-#: ../src/Resources.vala:402
+#: src/Resources.vala:408
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "No s'ha pogut canviar el nom de la cerca a «%s» perquè aquesta ja existeix."
 
 #. Saved search button
-#: ../src/Resources.vala:405 ../src/SearchFilter.vala:1210
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Cerca desada"
 
-#: ../src/Resources.vala:407
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Suprimeix la cerca"
 
-#: ../src/Resources.vala:410
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Edita…"
 
-#: ../src/Resources.vala:411
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Ca_nvia el nom…"
 
-#: ../src/Resources.vala:414
+#: src/Resources.vala:420
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr "Canvia el nom de la cerca «%s» a «%s»"
 
-#: ../src/Resources.vala:418
+#: src/Resources.vala:424
 #, c-format
 msgid "Delete Search “%s”"
 msgstr "Suprimeix la cerca «%s»"
 
-#: ../src/Resources.vala:576
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Puntua com a %s"
 
-#: ../src/Resources.vala:577
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Estableix la puntuació a %s"
 
-#: ../src/Resources.vala:578
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "S'està establint la puntuació a %s"
 
-#: ../src/Resources.vala:580
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Mostra %s"
 
-#: ../src/Resources.vala:581
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Mostra només les fotografies amb una puntuació de %s"
 
-#: ../src/Resources.vala:582
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s o millor"
 
-#: ../src/Resources.vala:583
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Mostra només les de %s o millors"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Mostra només les fotografies amb una puntuació de %s o millor"
 
-#: ../src/Resources.vala:675
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Suprimeix les fotografies seleccionades de la paperera"
 
-#: ../src/Resources.vala:676
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Suprimeix les fotografies seleccionades de la biblioteca"
 
-#: ../src/Resources.vala:678
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Restaura"
 
-#: ../src/Resources.vala:679
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Torna les fotografies seleccionades a la biblioteca"
 
-#: ../src/Resources.vala:681
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Mostra al nave_gador de fitxers"
 
-#: ../src/Resources.vala:682
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Obre el directori de la fotografia seleccionada al gestor de fitxers"
 
-#: ../src/Resources.vala:685
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "No s'ha pogut obrir en el gestor de fitxers: %s"
 
-#: ../src/Resources.vala:688
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
-msgstr "_Suprimeix de la biblioteca"
+msgstr "Suprim_eix de la biblioteca"
 
-#: ../src/Resources.vala:690
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Mou a la paperera"
 
-#: ../src/Resources.vala:692
+#: src/Resources.vala:677 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 "Selecciona-ho _tot"
+msgstr "Seleccion_a-ho tot"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Selecciona tots els elements"
 
@@ -4473,777 +5752,779 @@ msgstr "Selecciona tots els elements"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:782
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
-msgstr "%a, %d de %b de %Y"
+msgstr "%a %b %d %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:787
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
-msgstr "%a, %d"
+msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:792
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
-msgstr "%d de %b de %Y"
+msgstr "%d de %Y"
 
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:797
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
-msgstr "%a, %d de %b"
+msgstr "%a, %b de %d"
 
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:802
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
-msgstr "%a, %d de %b de %Y"
+msgstr "%a, %d %b de %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Projecció de diapositives"
 
-#: ../src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Cerques desades"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "conté"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:169
-#: ../src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "és exactament"
 
-#: ../src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "comença amb"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "acaba amb"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "no conté"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "no està establert"
 
-#: ../src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "està establert"
 
 #. 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:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "és"
 
-#: ../src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "no és"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "qualsevol fotografia"
 
-#: ../src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "una fotografia RAW"
 
-#: ../src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "un vídeo"
 
-#: ../src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
-msgstr "conté"
+msgstr "té"
 
-#: ../src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
-msgstr "no conté"
+msgstr "no té"
 
-#: ../src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "modificacions"
 
-#: ../src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "modificacions internes"
 
-#: ../src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "modificacions externes"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "senyalat"
 
-#: ../src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "sense senyalar"
 
-#: ../src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "i superior"
 
-#: ../src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "només"
 
-#: ../src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "i inferior"
 
-#: ../src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "està després"
 
-#: ../src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "està abans"
 
-#: ../src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "està entre"
 
-#: ../src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "i"
 
-#: ../src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Cerca"
-
-#: ../src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: ../src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "D'acord"
-
-#: ../src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "qualsevol"
-
-#: ../src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "tots"
-
-#: ../src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "cap"
-
-#: ../src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Qualsevol text"
 
-#: ../src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:160
 msgid "Title"
 msgstr "Títol"
 
-#: ../src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:163
 msgid "Tag"
 msgstr "Etiqueta"
 
-#: ../src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:166
 msgid "Comment"
 msgstr "Comentari"
 
-#: ../src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:169
 msgid "Event name"
 msgstr "Nom de l'esdeveniment"
 
-#: ../src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:172
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: ../src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:175
 msgid "Media type"
 msgstr "Tipus de suport"
 
-#: ../src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
 msgstr "Estat del senyalador"
 
-#: ../src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:181
 msgid "Photo state"
-msgstr "Estat de la foto"
+msgstr "Estat de la fotografia"
 
-#. Rating button
-#: ../src/searches/SearchBoolean.vala:184 ../src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Valoració"
 
-#: ../src/searches/SearchBoolean.vala:187
+#: src/searches/SearchBoolean.vala:187
 msgid "Date"
 msgstr "Data"
 
-#: ../src/SearchFilter.vala:614 ../src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Vídeos"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Cerques desades"
 
-#: ../src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Fotografies RAW"
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organitzeu les vostres cerques desades"
 
-#: ../src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Fotografies RAW"
+#: src/SearchFilter.vala:811
+msgid "★+ Rating"
+msgstr "★ + Valoració"
+
+#: src/SearchFilter.vala:814
+msgid "★★+ Rating"
+msgstr "★★ + Valoració"
+
+#: src/SearchFilter.vala:817
+msgid "★★★+ Rating"
+msgstr "★★★+ Valoració"
+
+#: src/SearchFilter.vala:820
+msgid "★★★★+ Rating"
+msgstr "★★★★+ Valoració"
 
-#: ../src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:824
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ Valoració"
+
+#: src/SearchFilter.vala:1060
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr ""
-"S'ha produït un error en carregar el fitxer d'interfície d'usuari %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Error al carregar la barra de cerca UI: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: ../src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Tanca"
 
 #. Type label and toggles
-#: ../src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tipus"
 
-#: ../src/SearchFilter.vala:1211
-msgid "Use a saved search to filter items in the current view"
-msgstr "Utilitza una cerca desada per filtrar els elements de la vista actual"
+#: src/SearchFilter.vala:1082
+msgid "Videos"
+msgstr "Vídeos"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag…"
-msgstr "_Etiqueta nova…"
+#: src/SearchFilter.vala:1085
+msgid "RAW Photos"
+msgstr "Fotografies RAW"
 
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Paràmetres"
+#: src/SearchFilter.vala:1121
+msgid "Use a saved search to filter items in the current view"
+msgstr "Utilitza una cerca desada per filtrar els elements de la vista actual"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
-msgstr "Enrere"
+msgstr "Fons"
 
-#: ../src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Vés a la fotografia anterior"
 
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Fes una pausa a la presentació de diapositives"
 
-#: ../src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Següent"
 
-#: ../src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Vés a la fotografia següent"
 
-#: ../src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Paràmetres"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Canvia els paràmetres de la presentació de diapositives"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Manquen tots els fitxers d'origen de les fotografies."
 
-#: ../src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Reprodueix"
 
-#: ../src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Continua la presentació de diapositives"
 
-#: ../src/slideshow/Slideshow.vala:22
+#: src/slideshow/Slideshow.vala:22
 msgid "Slideshow Transitions"
 msgstr "Transicions de la presentació de diapositives"
 
-#: ../src/slideshow/TransitionEffects.vala:98
+#: src/slideshow/TransitionEffects.vala:98
 msgid "(None)"
 msgstr "(Cap)"
 
-#: ../src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Cap"
 
-#: ../src/slideshow/TransitionEffects.vala:339
+#: src/slideshow/TransitionEffects.vala:339
 msgid "Random"
 msgstr "Aleatori"
 
-#: ../src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: ../src/Tag.vala:830
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organitzeu i navegueu les etiquetes de les fotografies"
+
+#: src/Tag.vala:830
 msgid "untitled"
 msgstr "sense títol"
 
 #. multiple videos
-#: ../src/VideoSupport.vala:490
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Exporta vídeos"
 
-#~ msgid "Popular photo manager"
-#~ msgstr "Gestor fotogràfic popular"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "_Palanca marcada"
 
-#~ msgid "Organize your photos"
-#~ msgstr "Organitzeu les vostres fotografies"
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
+msgid "_Developer"
+msgstr "_Desenvolupador"
 
-#~ msgid "Shotwell Viewer"
-#~ msgstr "Visualitzador del Shotwell"
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
+msgid "View Eve_nt for Photo"
+msgstr "Visualitza l'esdeve_niment de la fotografia"
 
-#, fuzzy
-#~| msgid "User _name"
-#~ msgid "username"
-#~ msgstr "_Nom d'usuari"
+#: 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/trash.ui:5
+msgid "_File"
+msgstr "_Fitxer"
 
-#, fuzzy
-#~| msgid "within category:"
-#~ msgid "last category"
-#~ msgstr "a la categoria:"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "Des_a com..."
 
-#, fuzzy
-#~| msgid "Photo size:"
-#~ msgid "last photo size"
-#~ msgstr "Mida de la fotografia:"
+#: 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/trash.ui:87
+msgid "_View"
+msgstr "_Visualitza"
 
-#, fuzzy
-#~| msgid "_Remember"
-#~ msgid "remember"
-#~ msgstr "_Recorda"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Ajusta a l'amplada de la _pàgina"
 
-#, fuzzy
-#~| msgid "_Hide album"
-#~ msgid "hide album"
-#~ msgstr "A_maga l'àlbum"
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Ampliació _100%"
 
-#, fuzzy
-#~| msgid "Open target _album in browser"
-#~ msgid "open album in web browser"
-#~ msgstr "Obre l'_àlbum al navegador"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Ampliació _200%"
 
-#, fuzzy
-#~| msgid "Display extended information for the selection"
-#~ msgid "display extended properties"
-#~ msgstr "Mostra informació ampliada sobre la selecció"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Fotografia"
 
-#, fuzzy
-#~| msgid "Display the sidebar"
-#~ msgid "display sidebar"
-#~ msgstr "Mostra la barra lateral"
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "Fotografia an_terior"
 
-#, fuzzy
-#~| msgid "Display the tool bar"
-#~ msgid "display toolbar"
-#~ msgstr "Mostra la barra d'eines"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "Fotografia següe_nt"
 
-#, fuzzy
-#~| msgid "Display the search bar"
-#~ msgid "display search bar"
-#~ msgstr "Mostra la barra de cerca"
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Eines"
 
-#, fuzzy
-#~| msgid "Display each photo's tags"
-#~ msgid "display photo titles"
-#~ msgstr "Mostra les etiquetes de cada fotografia"
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "Preguntes _freqüents"
 
-#, fuzzy
-#~| msgid "Display each photo's tags"
-#~ msgid "display photo comments"
-#~ msgstr "Mostra les etiquetes de cada fotografia"
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "Info_rma d'un problema…"
 
-#, fuzzy
-#~| msgid "Edit Event Comment"
-#~ msgid "display event comments"
-#~ msgstr "Edita el comentari de l'esdeveniment"
+#: 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 "_Importa des d'una carpeta…"
 
-#, fuzzy
-#~| msgid "Display each photo's tags"
-#~ msgid "display photo tags"
-#~ msgstr "Mostra les etiquetes de cada fotografia"
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Importa des de l'_aplicació…"
 
-#, fuzzy
-#~| msgid "Display each photo's rating"
-#~ msgid "display photo ratings"
-#~ msgstr "Mostra la puntuació de cada fotografia"
+#: 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 "Buida la pape_rera"
 
-#, fuzzy
-#~| msgid "Sort _Descending"
-#~ msgid "sort events ascending"
-#~ msgstr "Ordre d_escendent"
+#: 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 "_Cerca"
 
-#, fuzzy
-#~| msgid "Sort photos in an ascending order"
-#~ msgid "sort library photos ascending"
-#~ msgstr "Ordena les fotografies en ordre ascendent"
+#: 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 "_Nova cerca desada…"
 
-#, fuzzy
-#~| msgid "Sort photos in an ascending order"
-#~ msgid "sort event photos ascending"
-#~ msgstr "Ordena les fotografies en ordre ascendent"
+#: 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 "Informació _bàsica"
 
-#, fuzzy
-#~| msgid "Sort photos by title"
-#~ msgid "sort event photos criteria"
-#~ msgstr "Ordena les fotografies per títol"
+#: 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 "Informació am_pliada"
 
-#, fuzzy
-#~| msgid "_Modify original photo files"
-#~ msgid "modify original photo files"
-#~ msgstr "_Modifica els fitxers d'imatges originals"
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "Barra de _cerca"
 
-#, fuzzy
-#~| msgid "Library Location"
-#~ msgid "sidebar position"
-#~ msgstr "Ubicació de la biblioteca"
+#: 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 "_Barra lateral"
 
-#, fuzzy
-#~| msgid "Pin the toolbar open"
-#~ msgid "pin toolbar state"
-#~ msgstr "Mantén la barra d'eines oberta"
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "_Barra d'eines"
 
-#, fuzzy
-#~| msgid "_Background:"
-#~ msgid "background color"
-#~ msgstr "_Fons:"
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Comentaris"
 
-#, fuzzy
-#~| msgid "_Delay:"
-#~ msgid "delay"
-#~ msgstr "_Retard:"
+#: 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 "Ordena els _esdeveniments"
 
-#, fuzzy
-#~| msgid "Transition d_elay:"
-#~ msgid "transition delay"
-#~ msgstr "R_etard de transició:"
+#: 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 "_Ascendent"
 
-#, fuzzy
-#~| msgid "_Transition effect:"
-#~ msgid "transition effect id"
-#~ msgstr "Efecte de _transició:"
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "D_escendent"
 
-#, fuzzy
-#~| msgid "Show t_itle"
-#~ msgid "Show title"
-#~ msgstr "Mostra el t_ítol"
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+msgid "Even_ts"
+msgstr "Esdevenimen_ts"
 
-#, fuzzy
-#~| msgid "Import to Library"
-#~ msgid "import directory"
-#~ msgstr "Importa a la biblioteca"
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Títols"
 
-#, fuzzy
-#~| msgid "_Watch library directory for new files"
-#~ msgid "watch library directory for new files"
-#~ msgstr "_Vigila si hi ha fitxers nous al directori de la biblioteca"
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
+msgid "Ta_gs"
+msgstr "Eti_quetes"
 
-#, fuzzy
-#~| msgid "Writing metadata to files..."
-#~ msgid "write metadata to master files"
-#~ msgstr "S'estan escrivint les metadades als fitxers..."
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Ordena les _fotografies"
 
-#, fuzzy
-#~| msgid "_Directory structure:"
-#~ msgid "directory pattern"
-#~ msgstr "_Estructura dels directoris:"
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Per _títol"
 
-#, fuzzy
-#~| msgid "RAW Developer"
-#~ msgid "RAW developer default"
-#~ msgstr "Revelador RAW"
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Per nom de _fitxer"
 
-#, fuzzy
-#~| msgid "E_xternal photo editor:"
-#~ msgid "external photo editor"
-#~ msgstr "Editor fotogràfic e_xtern:"
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Per _data d'exposició"
 
-#, fuzzy
-#~| msgid "External _RAW editor:"
-#~ msgid "external raw editor"
-#~ msgstr "Editor d'imatges _RAW extern:"
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Pe_r puntuació"
 
-#, fuzzy
-#~| msgid "Export metadata"
-#~ msgid "export metadata"
-#~ msgstr "Exporta les metadades"
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Descendent"
 
-#, fuzzy
-#~| msgid "Core Publishing Services"
-#~ msgid "last used publishing service"
-#~ msgstr "Serveis de publicació principals"
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Fotografies"
 
-#, fuzzy
-#~| msgid "Core Publishing Services"
-#~ msgid "default publishing service"
-#~ msgstr "Serveis de publicació principals"
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "A_tura la importació"
 
-#, fuzzy
-#~| msgid "Access _type:"
-#~ msgid "access token"
-#~ msgstr "_Tipus d'accés:"
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "blanc"
 
-#, fuzzy
-#~| msgid "User _name"
-#~ msgid "user name"
-#~ msgstr "_Nom d'usuari"
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "negre"
 
-#, fuzzy
-#~| msgid "You are not currently logged into Yandex.Fotki."
-#~ msgid "The name of the currently logged in Facebook user, if any"
-#~ msgstr "Actualment no esteu connectat al Yandex.Fotki."
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Mostra"
 
-#, fuzzy
-#~| msgid "_Password"
-#~ msgid "password"
-#~ msgstr "_Contrasenya"
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Fons:"
 
-#, fuzzy
-#~| msgid "_Remember Password"
-#~ msgid "remember password"
-#~ msgstr "_Recorda la contrasenya"
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Importa fotografies a:"
 
-#, 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 ""
-#~ "S_i el títol està definit i el comentari no ho està, es farà servir el "
-#~ "títol com a comentari"
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Vigila si hi ha fitxers nous al directori de la biblioteca"
 
-#, fuzzy
-#~| msgid "Gallery3 publishing module"
-#~ msgid "Gallery3 username"
-#~ msgstr "Mòdul de publicació Gallery3"
+# N.T.: Títol d'una secció a un quadre de diàleg
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Importador"
 
-#, fuzzy
-#~| msgid "API _Key:"
-#~ msgid "API key"
-#~ msgstr "_Clau API:"
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Estructura dels _directoris:"
 
-#, fuzzy
-#~| msgid "_Gallery3 URL:"
-#~ msgid "Gallery3 API key"
-#~ msgstr "URL _Gallery3:"
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Exemple:"
 
-#, fuzzy
-#~| msgid "_Gallery3 URL:"
-#~ msgid "Gallery3 site URL"
-#~ msgstr "URL _Gallery3:"
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "Canvia _el nom dels fitxers importats a minúscules"
 
-#, fuzzy
-#~| msgid "Core Data Import Services"
-#~ msgid "last used import service"
-#~ msgstr "Serveis d'importació Core Data"
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadades"
 
-#, fuzzy
-#~| msgid "_Contents"
-#~ msgid "content ppi"
-#~ msgstr "C_ontingut"
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr ""
+"Escriu etiquetes, títols i altres _metadades als fitxers de fotografies"
 
-#, fuzzy
-#~| msgid "Rotate Right"
-#~ msgid "content height"
-#~ msgstr "Gira a la dreta"
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Revelador RAW"
 
-#, fuzzy
-#~| msgid "_Contents"
-#~ msgid "content units"
-#~ msgstr "C_ontingut"
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "Per de_fecte:"
 
-#, fuzzy
-#~| msgid "2 images per page"
-#~ msgid "images per page code"
-#~ msgstr "2 imatges per pàgina"
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Patró:"
 
-#, fuzzy
-#~| msgid "_Match photo aspect ratio"
-#~ msgid "match aspect ratio"
-#~ msgstr "_Coincideix la relació d'aspecte de la fotografia"
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Fons transparent:"
 
-#, fuzzy
-#~| msgid "Print image _title"
-#~ msgid "print titles"
-#~ msgstr "Imprimeix el _títol de la imatge"
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Escacada"
 
-#, fuzzy
-#~| msgid "Unable to publish"
-#~ msgid "enable facebook publishing plugin"
-#~ msgstr "No s'ha pogut publicar"
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Color sòlid"
 
-#, fuzzy
-#~| msgid "Unable to publish"
-#~ msgid "enable youtube publishing plugin"
-#~ msgstr "No s'ha pogut publicar"
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "Editor fotogràfic e_xtern:"
 
-#, fuzzy
-#~| msgid "Unable to publish"
-#~ msgid "enable piwigo publishing plugin"
-#~ msgstr "No s'ha pogut publicar"
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Editor d'imatges _RAW extern:"
 
-#, fuzzy
-#~| msgid "Unable to publish"
-#~ msgid "enable tumblr publishing plugin"
-#~ msgstr "No s'ha pogut publicar"
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Editors externs"
 
-#, fuzzy
-#~| msgid "Gallery3 publishing module"
-#~ msgid "enable rajce publishing plugin"
-#~ msgstr "Mòdul de publicació Gallery3"
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Connectors"
 
-#, fuzzy
-#~| msgid "Gallery3 publishing module"
-#~ msgid "enable gallery3 publishing plugin"
-#~ msgstr "Mòdul de publicació Gallery3"
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Preferències del Shotwell"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow crumble transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Mida de la imatge impresa</b>"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow fade transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "Utilitza una mida e_stàndard:"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow slide transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "Utilitza una mida _personalitzada:"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow clock transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "polzades"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow circle transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow squares transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "_Coincideix la relació d'aspecte de la fotografia"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow stripes transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "Mida _automàtica:"
 
-#, fuzzy
-#~| msgid "Core Slideshow Transitions"
-#~ msgid "enable slideshow chess transition"
-#~ msgstr "Transicions principals de la projecció de diapositives"
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Títols</b>"
 
-#~ msgid "Go _Back"
-#~ msgstr "_Enrere"
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Imprimeix el _títol de la imatge"
 
-#, fuzzy
-#~| msgid "_Login"
-#~ msgid "_Log in"
-#~ msgstr "_Connecta"
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Resolució de píxels</b>"
 
-#~ msgid "_Gallery3 URL:"
-#~ msgstr "URL _Gallery3:"
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "S_ortida de la fotografia en:"
 
-#~ msgid "_User name:"
-#~ msgstr "_Nom d'usuari:"
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "píxels per polzada"
 
-#~ msgid "_Password:"
-#~ msgstr "_Contrasenya:"
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Cerca"
 
-#~ msgid "API _Key:"
-#~ msgstr "_Clau API:"
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#~ msgid "or"
-#~ msgstr "o"
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "D'acord"
 
-#~ msgid "A _new album"
-#~ msgstr "Un àlbum _nou"
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "_Nom de la cerca:"
 
-#~ msgid "An _existing album"
-#~ msgstr "Un àlbum e_xistent"
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "_Coincideix"
 
-#~ msgid "_Remove location, tag and camera-identifying data before uploading"
-#~ msgstr ""
-#~ "Sup_rimeix les dades d'ubicació, d'etiquetes i d'identificació de la "
-#~ "càmera abans de la càrrega."
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "qualsevol"
 
-#~ msgid "Scaling constraint:"
-#~ msgstr "Constant d'e_scala:"
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "tot"
 
-#~ msgid "pixels"
-#~ msgstr " píxels"
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "cap"
 
-#~ msgid "Blogs:"
-#~ msgstr "Blogs:"
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "amb el següent:"
 
-#~ msgid "Photo _size:"
-#~ msgstr "_Mida de la fotografia:"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Estableix com a fons d'escriptori"
 
-#~ msgid "_Albums (or write new):"
-#~ msgstr "À_lbums (o escriviu-ne un de nou):"
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Utilitza per a l'escriptori"
 
-#~ msgid "Access _type:"
-#~ msgstr "_Tipus d'accés:"
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Utilitza per a la pantalla de bloqueig"
 
-#~ msgid "Disable _comments"
-#~ msgstr "Inhabilita els _comentaris"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Estableix com a presentació de diapositives de l'escriptori"
 
-#~ msgid "_Forbid downloading original photo"
-#~ msgstr "_Prohibeix baixar la fotografia original"
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Genera la presentació de diapositives del fons de l'escriptori"
 
-#~ msgid "Public"
-#~ msgstr "Públic"
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Mostra cada fotografia per"
 
-#~ msgid "Publish to an e_xisting album:"
-#~ msgstr "Public_a a un àlbum existent:"
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "període de temps"
 
-#~ msgid "Create a _new album named:"
-#~ msgstr "Crea un àlbum _nou anomenat:"
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Quant de temps es mostra cada fotografia en el fons de l'escriptori"
 
-#~ msgid "Videos and new photo albums _visible to:"
-#~ msgstr "Els vídeos i els àlbums de fotografies nous són _visibles per a:"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "E_tiqueta nova…"
 
-#~ msgid ""
-#~ "_Remove location, camera, and other identifying information before "
-#~ "uploading"
-#~ msgstr ""
-#~ "Sup_rimeix la ubicació, càmera i qualsevol altra informació "
-#~ "identificativa abans de la càrrega"
+#: ui/slideshow_settings.ui:91
+msgid "_Delay:"
+msgstr "_Retard:"
+
+#: ui/slideshow_settings.ui:105
+msgid "_Transition effect:"
+msgstr "Efecte de _transició:"
+
+#: ui/slideshow_settings.ui:119
+msgid "Transition d_elay:"
+msgstr "R_etard de transició:"
+
+#: ui/slideshow_settings.ui:129
+msgid "Show t_itle"
+msgstr "Mostra el t_ítol"
+
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
+msgid "seconds"
+msgstr "segons"
+
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "etiqueta"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Suprimeix totes les fotografies de la paperera"
 
 #~ msgid ""
 #~ "Enter the confirmation number which appears after you log into Flickr in "
@@ -5255,192 +6536,254 @@ msgstr "Exporta vídeos"
 #~ msgid "Authorization _Number:"
 #~ msgstr "_Número d'autorització:"
 
-#~ msgid "L_ist album in public gallery"
-#~ msgstr "_Llista l'àlbum en una galeria pública"
+#~ msgid "Width or height"
+#~ msgstr "Amplada o alçada"
 
-#~ msgid "Photo _size preset:"
-#~ msgstr "Mida p_redeterminada de les fotografies:"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "«%s» no és una resposta vàlida per a una petició d'autenticació al OAuth"
 
-#~ msgid "_URL of your Piwigo photo library"
-#~ msgstr "_URL de la biblioteca de fotografies Piwigo"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Exporta les fotografies/vídeos"
 
-#~ msgid "User _name"
-#~ msgstr "_Nom d'usuari"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Obre amb un Editor E_xtern"
 
-#~ msgid "_Remember Password"
-#~ msgstr "_Recorda la contrasenya"
+#~ msgid "R_emove from Library"
+#~ msgstr "Suprim_eix de la biblioteca"
 
-#~ msgid "An _existing category:"
-#~ msgstr "Una categoria _existent:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Benvingut al servei d'importació de biblioteques de F-Spot\n"
+#~ "\n"
+#~ "Trieu una biblioteca a importar, ja sigui triant una de les biblioteques "
+#~ "trobades per Shotwell o bé seleccionant alternativament un fitxer de base "
+#~ "de dades de l'F-Spot."
 
-#~ msgid "Photos will be _visible by:"
-#~ msgstr "Les fotografies seran _visibles per a:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Benvingut al servei d'importació de biblioteques de l'F-Spot.\n"
+#~ "\n"
+#~ "Seleccioneu un fitxer de base de dades de l'F-Spot."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Seleccionar manualment un fitxer de biblioteca F-Spot a importar:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "No es pot obrir el fitxer de base de dades F-Spot seleccionat: el fitxer "
+#~ "no existeix o no és una base de dades F-Spot correcta"
 
-#~ msgid "Photo size:"
-#~ msgstr "Mida de la fotografia:"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "No es pot obrir el fitxer de base de dades F-Spot seleccionat: Shotwell "
+#~ "no suporta aquesta versió de F-Spot"
 
-#~ msgid "within category:"
-#~ msgstr "a la categoria:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
+#~ "llegint taula d'etiquetes"
 
-#~ msgid "Album comment:"
-#~ msgstr "Comentari de l'àlbum:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "No es pot llegir el fitxer de base de dades F-Spot seleccionat: error "
+#~ "llegint taula d'imatges"
 
-#~ msgid "_If a title is set and comment unset, use title as comment"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
 #~ msgstr ""
-#~ "S_i el títol està definit i el comentari no ho està, es farà servir el "
-#~ "títol com a comentari"
+#~ "Shotwell ha trobat %d imatges dins la biblioteca F-Spot i les està "
+#~ "important. Les imatges duplicades seran automàticament detectades i "
+#~ "eliminades.\n"
+#~ "\n"
+#~ "Podeu tancar aquest diàleg i començar a emprar el Shotwell mentre la "
+#~ "importació té lloc en segon pla."
 
-#~ msgid "_Do no upload tags"
-#~ msgstr "_No pugis les etiquetes"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Biblioteca F-Spot: %s"
 
-#~ msgid "Logout"
-#~ msgstr "Surt"
+#~ msgid "Preparing to import"
+#~ msgstr "Preparant per importar"
 
-#~ msgid "Video privacy _setting:"
-#~ msgstr "_Paràmetres de la privacitat dels vídeos:"
+#~ msgid "Core Data Import Services"
+#~ msgstr "Serveis d'importació Core Data"
 
-#~ msgid "Set as Desktop Background"
-#~ msgstr "Estableix com a fons d'escriptori"
+#, fuzzy
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "S'està comprovant la connexió amb el Facebook..."
 
-#~ msgid "Use for Desktop"
-#~ msgstr "Utilitza per a l'escriptori"
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Ja us heu connectat i desconnectat al Flickr en aquesta sessió del "
+#~ "Shotwell.\n"
+#~ "Per continuar publicant al Flickr, sortiu, reinicieu el Shotwell i torneu "
+#~ "a intentar-ho."
 
-#~ msgid "Use for Lock Screen"
-#~ msgstr "Utilitza per a la pantalla de bloqueig"
+#, fuzzy
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Els vídeos apareixeran a «%s»"
 
-#~ msgid "Set as Desktop Slideshow"
-#~ msgstr "Estableix com a presentació de diapositives de l'escriptori"
+#~ msgid "_Contents"
+#~ msgstr "C_ontingut"
 
-#~ msgid "Show each photo for"
-#~ msgstr "Mostra cada fotografia durant"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Mostra el títol de cada fotografia"
 
-#~ msgid "period of time"
-#~ msgstr "període de temps"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Importa les fotografies seleccionades a la biblioteca"
 
-#~ msgid "Generate desktop background slideshow"
-#~ msgstr "Genera la presentació de diapositives del fons de l'escriptori"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Importa totes les fotografies a la biblioteca"
 
-#~ msgid "How long each photo is shown on the desktop background"
-#~ msgstr "Quan de temps es mostra cada fotografia en el fons de l'escriptori"
+#~ msgid "Play a slideshow"
+#~ msgstr "Reprodueix una presentació de diapositives"
 
-#~ msgid "_Name of search:"
-#~ msgstr "_Nom de la cerca:"
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Modifica els fitxers d'imatges originals"
 
-#~ msgid "_Match"
-#~ msgstr "_Coincideix"
+#~ msgid "_Modify original files"
+#~ msgstr "_Modifica els fitxers originals"
 
-#~ msgid "of the following:"
-#~ msgstr "amb el següent:"
+#~ msgid "Save photo"
+#~ msgstr "Desa la fotografia"
 
-#~ msgid "<b>Printed Image Size</b>"
-#~ msgstr "<b>Mida de la imatge impresa</b>"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Desa la fotografia amb un nom diferent"
 
-#~ msgid "Use a _standard size:"
-#~ msgstr "Utilitza una mida es_tàndard:"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Imprimeix la fotografia a una impressora connectada a l'ordinador"
 
-#~ msgid "Use a c_ustom size:"
-#~ msgstr "Utilitza una mida _personalitzada:"
+#~ msgid "Previous Photo"
+#~ msgstr "Fotografia anterior"
 
-#~ msgid "_Match photo aspect ratio"
-#~ msgstr "_Coincideix la relació d'aspecte de la fotografia"
+#~ msgid "Next Photo"
+#~ msgstr "Fotografia següent"
 
-#~ msgid "_Autosize:"
-#~ msgstr "Mida _automàtica:"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Incrementa l'ampliació de la fotografia"
 
-#~ msgid "<b>Titles</b>"
-#~ msgstr "<b>Títols</b>"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Redueix l'ampliació de la fotografia"
 
-#~ msgid "Print image _title"
-#~ msgstr "Imprimeix el _títol de la imatge"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Amplia la fotografia per ajustar-la a la pantalla"
 
-#~ msgid "<b>Pixel Resolution</b>"
-#~ msgstr "<b>Resolució de píxels</b>"
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Amplia la fotografia al 100%"
 
-#~ msgid "_Output photo at:"
-#~ msgstr "_Imprimeix la fotografia en:"
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Amplia la fotografia al 200%"
 
-#~ msgid "pixels per inch"
-#~ msgstr "píxels per polzada"
+#~ msgid "Display the comment of each event"
+#~ msgstr "Mostra el comentari per cada esdeveniment"
 
-#~ msgid "label"
-#~ msgstr "etiqueta"
+#~ msgid "Stop importing photos"
+#~ msgstr "Atura la importació de fotografies"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Preferències del Shotwell"
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Importa fotografies des del disc a la biblioteca"
 
-#~ msgid "white"
-#~ msgstr "blanc"
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Cerca fotografies i vídeos per criteri de cerca"
 
-#~ msgid "black"
-#~ msgstr "negre"
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Mostra informació bàsica sobre la selecció"
 
-#~ msgid "_Watch library directory for new files"
-#~ msgstr "_Vigila si hi ha fitxers nous al directori de la biblioteca"
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Mostra informació ampliada sobre la selecció"
 
-#~ msgid "Metadata"
-#~ msgstr "Metadades"
+#~ msgid "Display the search bar"
+#~ msgstr "Mostra la barra de cerca"
 
-#~ msgid "Write tags, titles, and other _metadata to photo files"
-#~ msgstr ""
-#~ "Escriu etiquetes, títols i altres _metadades als fitxers de fotografies"
+#~ msgid "Display the sidebar"
+#~ msgstr "Mostra la barra lateral"
 
-#~ msgid "Display"
-#~ msgstr "Mostra"
+#~ msgid "Display the tool bar"
+#~ msgstr "Mostra la barra d'eines"
 
-#~ msgid "_Import photos to:"
-#~ msgstr "_Importa fotografies a:"
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Ordena les fotografies en ordre ascendent"
 
-#~ msgid "_Background:"
-#~ msgstr "_Fons:"
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Ordena les fotografies en ordre descendent"
 
-# N.T.: Títol d'una secció a un quadre de diàleg
-#~ msgid "Importing"
-#~ msgstr "Importació"
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Augmenta la mida de les miniatures"
 
-#~ msgid "_Directory structure:"
-#~ msgstr "_Estructura dels directoris:"
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Redueix la mida de les miniatures"
 
-#~ msgid "_Pattern:"
-#~ msgstr "_Patró:"
+#~ msgid "_Play Video"
+#~ msgstr "_Reprodueix el vídeo"
 
-#~ msgid "Example:"
-#~ msgstr "Exemple:"
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Obre els vídeos seleccionats en el reproductor de vídeo del sistema"
 
-#~ msgid "R_ename imported files to lowercase"
-#~ msgstr "_Canvia el nom dels fitxers importats a minúscules"
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Mostra el comentari de cada foto"
 
-#~ msgid "RAW Developer"
-#~ msgstr "Revelador RAW"
+#~ msgid "Display each photo’s tags"
+#~ msgstr "Mostra les etiquetes de cada fotografia"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Ordena les fotografies per títol"
 
-#~ msgid "De_fault:"
-#~ msgstr "Per de_fecte:"
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Ordena les fotografies per data d'exposició"
 
-#~ msgid "E_xternal photo editor:"
-#~ msgstr "Editor fotogràfic e_xtern:"
+#~ msgid "Sort photos by rating"
+#~ msgstr "Ordena les fotografies per puntuació"
 
-#~ msgid "External _RAW editor:"
-#~ msgstr "Editor d'imatges _RAW extern:"
+#~ msgid "Sort photos by filename"
+#~ msgstr "Ordena les fotografies per nom de fitxer"
 
-#~ msgid "External Editors"
-#~ msgstr "Editors externs"
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "S'han publicat correctament els vídeos seleccionats."
 
-#~ msgid "Plugins"
-#~ msgstr "Connectors"
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "S'han publicat correctament les fotografies seleccionades."
 
-#~ msgid "_Delay:"
-#~ msgstr "_Retard:"
+#~ msgid "Tag Photos as “%s”"
+#~ msgstr "Etiqueta les fotografies com a «%s»"
 
-#~ msgid "_Transition effect:"
-#~ msgstr "Efecte de _transició:"
+#~ msgid "Tag the selected photos as “%s”"
+#~ msgstr "Etiqueta les fotografies seleccionades com a «%s»"
 
-#~ msgid "Transition d_elay:"
-#~ msgstr "R_etard de transició:"
+#~ msgid "Remove Tag “%s” From _Photos"
+#~ msgstr "Suprimeix l'etiqueta «%s» de les _fotografies"
 
-#~ msgid "Show t_itle"
-#~ msgstr "Mostra el t_ítol"
+#~ msgid "Remove Tag “%s” From Photos"
+#~ msgstr "Suprimeix l'etiqueta «%s» de les fotografies"
 
-#~ msgid "seconds"
-#~ msgstr "segons"
+#~ msgid "RAW photos"
+#~ msgstr "Fotografies RAW"
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "_Llista l'àlbum en una galeria pública"
 
 #~ msgid "Login"
 #~ msgstr "Entra"
diff --git a/po/cs.gmo b/po/cs.gmo
index 3091dc3..dfcf60f 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index f6b9537..a7f78c8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,15 +10,15 @@
 # David Štancl <dstancl@gmail.com>, 2011, 2012
 # jui <appukonrad@gmail.com>, 2012
 # petr.simacek <petr.simacek@gmail.com>, 2012, 2013.
-# Marek Černocký <marek@manet.cz>, 2014, 2015, 2016, 2017.
+# Marek Černocký <marek@manet.cz>, 2014, 2015, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-06-24 10:35+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-01-26 21:57+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -28,10 +28,10 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
@@ -75,16 +75,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "Vývojáři aplikace Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Správce fotografií"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Roztřiďte si své fotografie"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -96,15 +96,15 @@ msgstr ""
 "youtube;piwigo;rajče;"
 
 #. 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Prohlížeč Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Prohlížeč fotografií"
 
@@ -133,7 +133,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Tajný tiket k podepisování požadavků protokolu OAuth."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "Výchozí velikost"
 
@@ -161,9 +161,9 @@ msgid "URL of the Rajce server."
 msgstr "Adresa URL vedoucí na server Rajče."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "Uživatelské jméno"
 
@@ -180,7 +180,7 @@ msgid "user token, if remembered."
 msgstr "Uživatelský tiket, pokud je zapamatován."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "Poslední kategorie"
 
@@ -189,7 +189,7 @@ msgid "The last selected Rajce category."
 msgstr "Poslední vybraná kategorie na Rajčeti."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "Poslední velikost fotografie"
 
@@ -229,11 +229,11 @@ msgstr ""
 "prohlížeči."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "Odstranit citlivé informace z nahrávaného obsahu"
 
@@ -487,10 +487,28 @@ msgid "A grayscale color for use as the background color."
 msgstr "Odstín šedé, který se má použít jako barva pozadí."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "Pozadí pro průhledné obrázky"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Pozadí, které se má používat pro obrázky s průhledností."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "Barva pro plnobarevné pozadí průhlednosti"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Barva, která se má použít, když je pozadí pro průhledné obrázky nastavené na "
+"plnobarevnou výplň."
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Stav volby „Skrýt fotky“"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -498,30 +516,30 @@ msgstr ""
 "Poslední použitý stav volby „Skrýt již naimportované fotky“ na stránce "
 "importu."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "Doba zobrazení"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Prodleva (v sekundách) mezi jednotlivými fotografiemi při prezentaci."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "Trvání přechodu"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Čas (v sekundách), po který běží přechod mezi jednotlivými fotografiemi při "
 "promítání."
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "ID přechodového efektu"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -529,67 +547,67 @@ msgstr ""
 "Název přechodového efektu, který bude použit mezi jednotlivými fotografiemi "
 "při promítání."
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Zobrazovat název"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Zda při promítání prezentace zobrazovat název fotografie."
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "Maximalizace okna knihovny"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Zapnuto, když má být aplikační okno knihovny maximalizováno."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "Šířka okna knihovny"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Poslední zaznamenaná šířka aplikačního okna knihovny."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "Výška okna knihovny"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Poslední zaznamenaná výška aplikačního okna knihovny."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "Maximalizace okna pro přímé úpravy"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "Zapnuto, když má být aplikační okno pro přímé úpravy maximalizováno."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "Šířka okna pro přímé úpravy"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Poslední zaznamenaná šířka aplikačního okna pro přímé úpravy."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "Výška okna pro přímé úpravy"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Poslední zaznamenaná výška aplikačního okna pro přímé úpravy."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "Pozice dělicí čáry postranního panelu"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -597,30 +615,30 @@ msgstr ""
 "Poslední zaznamenaná pozice dělicí čáry mezi postranním panelem a zobrazením "
 "v aplikačním okně knihovny."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "Složka pro import"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Složka, do které jsou umístěny naimportované soubory s fotografiemi."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "Sledovat složku knihovny ohledně nových souborů"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Když je zapnuto, jsou soubory přidané do složky knihovny automaticky "
 "importovány."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "Zapisovat metadata do hlavních souborů"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -628,11 +646,11 @@ msgstr ""
 "Kdy jsou zapnuto, jsou změněná metadata (štítky, názvy apod.) zapisována do "
 "hlavního souboru s fotografií."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "Používat názvy souborů malými písmeny"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -640,11 +658,11 @@ msgstr ""
 "Když je zapnuto, převede Shotwell při importu fotografií všechny názvy "
 "souborů na malá písmena."
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "Vzor složky"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -652,11 +670,11 @@ msgstr ""
 "Řetězce, ve kterém je ukryt vzor pro pojmenování složek s fotografiemi při "
 "jejich importu."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "Vlastní vzor složky"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -664,29 +682,29 @@ msgstr ""
 "Řetězce, ve kterém je ukryt vzor pro vlastní pojmenování složek s "
 "fotografiemi při jejich importu."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "Výchozí vývojka RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Výchozí volba určující, kterou vývojku RAW má Shotwell používat."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Poslední použitá volba z nabídky pro poměr stran pro ořez"
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Číselná hodnota představující poslední volbu provedenou uživatelem v nabídce "
 "pro ořez."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Čitatel z posledního použitého vlastního poměru stran pro ořez"
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -694,11 +712,11 @@ msgstr ""
 "Nenulové celé kladné číslo představující šířku ve vlastní poměru stran "
 "zadaném uživatelem pro ořez."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Jmenovatel z posledního použitého vlastního poměru stran pro ořez"
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -706,123 +724,123 @@ msgstr ""
 "Nenulové celé kladné číslo představující výšku ve vlastní poměru stran "
 "zadaném uživatelem pro ořez."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "Externí editor fotografií"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Externí aplikace používaná pro úpravy fotografií."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "Externí editor RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Externí aplikace používaná pro úpravy fotografií v surovém formátu."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Nastavení v dialogovém okně pro export: jak ořezávat obrázky"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "Exportovat metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Nastavení v dialogovém okně pro export: volba exportu metadat"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "Nastavení formátu, speciální hodnota"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Nastavení v dialogovém okně pro export:  nastavení formátu, speciální hodnota"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "Nastaven formátu, typ hodnoty"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Nastavení v dialogovém okně pro export: nastavení formátu, typ hodnoty"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Volba kvality JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Nastavení v dialogovém okně pro export: volba kvality jpeg"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "Maximální velikost obrázku"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Nastavení v dialogovém okně pro export: maximální velikost obrázku"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "Poslední použitá služba pro zveřejňování"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Číselná hodnota představující službu použitou jako poslední pro zveřejnění "
 "fotografií."
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "Výchozí zveřejňovací služba"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "Přístupový tiket"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Tiket OAuth pro aktuálně přihlášené sezení na Facebooku, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "ID uživatele"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "ID uživatele Facebooku pro právě přihlášeného uživatele, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "Uživatelské jméno"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Jméno právě přihlášeného uživatele na Facebook, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "Výchozí velikost"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Číselná hodnota představující výchozí velikost pro fotografie nahrávané na "
 "Facebook."
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -830,21 +848,21 @@ msgstr ""
 "Zda se mají u obrázků nahrávaných na Facebook nejdříve odstranit jejich "
 "metadata."
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Tiket pro přístupovou fázi OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Ověřovací tiket pro právě přihlášeného uživatele do služby Flickr, pokud "
 "existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Tajemství tiketu pro přístupovou fázi OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -852,24 +870,24 @@ msgstr ""
 "Kryptografické tajemství použité pro požadavek na podpis vůči ověřovacímu "
 "tiketu pro právě přihlášeného uživatele do služby Flickr, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 "Uživatelské jméno z aktuálního přihlášení uživatele na Flickr, pokud "
 "existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Číselná hodnota představující výchozí velikost pro fotografie nahrávané na "
 "Flickr."
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "Výchozí viditelnost"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -877,7 +895,7 @@ msgstr ""
 "Číselná hodnota představující výchozí viditelnost pro fotografie nahrávané "
 "na Flickr."
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
@@ -885,12 +903,12 @@ msgstr ""
 "Zda se mají u obrázků nahrávaných na Flickr nejdříve odstranit jejich "
 "metadata."
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "Aktualizační tiket"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -898,7 +916,7 @@ msgstr ""
 "Tiket protokolu OAuth používaný pro občerstvení sezení služby Picasa Web "
 "Albums pro právě přihlášeného uživatele, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -906,19 +924,19 @@ msgstr ""
 "Číselná hodnota představující výchozí velikost fotografií nahrávaných na "
 "Picasa Web Album."
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "Poslední album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Název posledního alba, pokud existuje, na které uživatel zveřejnil "
 "fotografie."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
@@ -926,47 +944,47 @@ msgstr ""
 "Zda se mají u obrázků nahrávaných do služby Picasa nejdříve odstranit "
 "metadata."
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Adresa URL na Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Adresa URL vedoucí na server Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Uživatelské jméno na Piwigo, pokud je uživatel přihlášen."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "Heslo"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Heslo na Piwigo, pokud je uživatel přihlášen."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "Pamatovat si heslo"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Když je zapnuto, bude se pamatovat heslo pro Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Naposledy vybraná kategorie na Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "Poslední úroveň oprávnění"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Naposledy zvolená úroveň oprávnění na Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -974,7 +992,7 @@ msgstr ""
 "Číselná hodnota představující poslední přednastavenou velikost fotografie "
 "použitou při nahrávání na Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
@@ -982,14 +1000,14 @@ msgstr ""
 "Zda se mají u obrázků nahrávaných na Piwigo nejdříve odstranit jejich "
 "metadata."
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "Když je nastaven název a není nastaven komentář použít název jako komentář "
 "pro nahrání na Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -997,11 +1015,11 @@ msgstr ""
 "Zda se má u obrázků nahrávaných na Piwigo, v případě že nemají nastavený "
 "komentář, nastavit komentář podle názvu, pokud ten nastavený je."
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "Při nahrávání na Piwigo nenahrávat štítky"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1009,27 +1027,27 @@ msgstr ""
 "Zda se mají u obrázků nahrávaných na Piwigo nejdříve odstranit jejich "
 "štítky, takže se pak tyto štítky neobjeví na vzdáleném serveru Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Uživatelské jméno pro Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "Klíč k API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Klíč k API služby Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Adresa URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Adresa URL webu Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1037,19 +1055,19 @@ msgstr ""
 "Udává, zda se mají u obrázků nahrávaných na Gallery3 nejdříve odstranit "
 "jejich metadata."
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "Škálovací omezení nahrávaného obrázku"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "ID škálovacího omezení pro nahrávaný obrázek."
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "Pixely na hlavní ose nahrávaného obrázku"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1057,7 +1075,7 @@ msgstr ""
 "Počet pixelů na hlavní ose obrázku, který bude nahrán. Použije se, jen když "
 "má klíč scaling-constraint-id příslušnou hodnotu."
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1065,32 +1083,32 @@ msgstr ""
 "Tiket protokolu OAuth používaný pro občerstvení sezení služby YouTube pro "
 "právě přihlášeného uživatele, pokud existuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "Poslední použitá služba pro import"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Číselná hodnota představující poslední použitou službu, ze které byly "
 "importovány fotografie."
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "Cookie stavu interpretru"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Číselná hodnota, která zachycuje stav prostředí zásuvného modulu GStreamer."
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "Režim rozvržení obsahu"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1098,35 +1116,35 @@ msgstr ""
 "Číselná hodnota, která popisuje, jak jsou fotografie při tisku rozvržené na "
 "papíře."
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "PPI obsahu"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Počet pixelů na palec (PPI) posílaných při tisku do tiskárny."
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "Šířka obsahu"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Šířka fotografie při tisku stránky."
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "Výška obsahu"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Výška fotografie při tisku stránky."
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "Jednotky obsahu"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1134,11 +1152,11 @@ msgstr ""
 "Číselná hodnota představující měrné jednotky (palce nebo centimetry) použité "
 "při tisku."
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "Obrázků na stránku"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1146,22 +1164,22 @@ msgstr ""
 "Číselná hodnota představující vybraný režim počtu obrázků na stránku při "
 "tisku."
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "Vybraná velikost"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Index aktuální velikosti tisku odkazující do předdefinovaného seznamu "
 "standardních velikostí."
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "Dodržet poměr stran"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1169,221 +1187,221 @@ msgstr ""
 "Určuje, zda vlastní velikosti tisku musí vyhovovat poměru stran originální "
 "fotografie."
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "Tisknout názvy"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr "Zapnuto, když má být při tisku fotografie vytištěn i její název."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "Font pro názvy"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Název fontu požívaného při tisku pro názvy fotografií."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Facebooku"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Facebook."
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Flickru"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Flickr."
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Picasa "
 "Web Albums."
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na YouTube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě YouTube."
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Yandexu"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Yandex."
 "Fotki."
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Tumblr."
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Rajčeti"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Rajče."
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "Povolit zásuvný modul Publikování na Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro publikování na službě Gallery3."
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "Povolit zásuvný modul Import z F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul pro import z aplikace F-Spot."
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "Povolit rozpadací přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Rozpad pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "Povolit blednoucí přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Blednutí pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "Povolit postrkávací přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Postrčení pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "Povolit hodinový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Hodiny pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "Povolit kruhový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt Kruh "
 "pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "Povolit několikakruhový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt Kruhy "
 "pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "Povolit roletový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Žaluzie pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "Povolit čtvercový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Čtverce pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "Povolit proužkový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Proužky pro promítání snímků."
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "Povolit šachovnicový přechod prezentace"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1419,23 +1437,7 @@ msgstr ""
 "Pro pokračování ve zveřejňování na Facebooku ukončete a opět spusťte "
 "Shotwell a pak zkuste zveřejnění znovu."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Vložte ověřovací kód, který se vám zobrazí po přihlášení ke službě Flickr."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Ověřovací _kód:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Pokračova_t"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1448,20 +1450,15 @@ msgstr ""
 "prohlížeči. Pak musíte ve svém účtu Flickr povolit přístup pro Shotwell "
 "Connect."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Připravuje se přihlášení…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na Flickr nemůže "
-"pokračovat."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Selhala autorizace na službě Flickr"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Ověřuje se autorizace…"
 
@@ -1479,7 +1476,7 @@ msgstr ""
 "Pro pokračování ve zveřejňování na službě Google ukončete a opět spusťte "
 "Shotwell a pak zkuste zveřejnění znovu."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1492,7 +1489,7 @@ msgstr ""
 "prohlížeči. Pak musíte ve svém účtu Picasa Web Albums povolit přístup pro "
 "Shotwell Connect."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1506,11 +1503,51 @@ msgstr ""
 "nastavený pro používání s YouTube. Ve svém webovém prohlížeči můžete "
 "nastavit většinu účtů, aby se přihlašovaly ke službě YouTube naráz."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-mailová adresa"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Heslo"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Přihlásit se"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Zadejte uživatelské jméno a heslo ke svému účtu Tumblr."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Neplatné uživatelské jméno a/nebo heslo. Zkuste to prosím znovu"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Neplatné uživatelské jméno nebo heslo"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Nelze načíst uživatelské rozhraní: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
@@ -1520,7 +1557,7 @@ msgstr ""
 "Marek Černocký <marek@manet.cz>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
@@ -1528,7 +1565,7 @@ msgstr ""
 "stránkám."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1537,21 +1574,21 @@ msgstr ""
 "důvěřovat. Zkontrolujte si nastavení data na svém počítači."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
 "⚫ Identifikace těchto webových stránek nebyla vydána důvěryhodnou organizací."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
 "⚫ Identifikaci těchto webových stránek nelze zpracovat. Možná je poškozená."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1560,7 +1597,7 @@ msgstr ""
 "organizací, která ji původně vydala."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1569,7 +1606,7 @@ msgstr ""
 "velmi slabé šifrování."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1577,107 +1614,11 @@ msgstr ""
 "⚫ Identifikace těchto webových stránek je platná až v budoucnu. Zkontrolujte "
 "si nastavení data na svém počítači."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Dočasný soubor potřebný pro zveřejnění není k dispozici"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Vítejte ve službě sloužící k importu knihoven z aplikace F-Spot. \n"
-"\n"
-"Vyberte prosím knihovnu pro import, a to buď výběrem jedné ze stávajících "
-"knihoven nalezených aplikací Shotwell nebo výběrem souboru s alternativní "
-"databází F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Vítejte ve službě pro import knihoven z aplikace F-Spot. \n"
-"\n"
-"Vyberte prosím soubor s databází F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Ručně vybrat soubor s databází F-Spot k importu:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Nelze otevřít vybraný soubor s databází F-Spot: soubor neexistuje nebo se "
-"nejedná o databázi F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Nelze otevřít vybraný soubor s databází F-Spot: tato verze databáze F-Spot "
-"není v aplikaci Shotwell podporována"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Nelze číst vybraný soubor s databází F-Spot: chyba při čtení tabulky se "
-"štítky"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Nelze číst vybraný soubor s databází F-Spot: chyba při čtení tabulky s "
-"fotografiemi"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell našel %d fotek v knihovně F-Spot a momentálne je importuje. "
-"Duplikáty budou automaticky zjištěny a vynechány.\n"
-"\n"
-"Můžete zavřít toto okno a začít používat aplikaci Shotwell, zatím co import "
-"bude probíhat na pozadí."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Knihovna F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Připravuje se k importu"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Hlavní služby importu dat"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adresa URL _Gallery3:"
@@ -1695,7 +1636,7 @@ msgid "Go _Back"
 msgstr "Jít _zpět"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Přihlásit se"
 
@@ -1730,7 +1671,7 @@ msgid "pixels"
 msgstr "pixely"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1738,17 +1679,17 @@ msgstr "Původní velikost"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Šířka nebo výška"
+msgid "Longest edge"
+msgstr "Delší strana"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Odhlásit"
@@ -1756,11 +1697,11 @@ 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1858,31 +1799,11 @@ msgstr "Nerozpoznaný uživatel"
 msgid " Site Not Found"
 msgstr " Server nenalezen"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_E-mailová adresa"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Za_pamatovat"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1934,81 +1855,10 @@ msgstr "Jste přihlášeni k Rajčeti jako %s."
 msgid "Photos will appear in:"
 msgstr "Fotky se objeví:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Doplňkové zveřejňovací služby Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogy:"
-
-#: 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:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: 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:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 pixelů"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 pixelů"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "„%s“ není platná odpověď na požadavek ověření protokolu OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start (): Nelze spustit a tuto zveřejňovací službu nelze "
-"restartovat."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Zadejte uživatelské jméno a heslo ke svému účtu Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Neplatné uživatelské jméno a/nebo heslo. Zkuste to prosím znovu"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Neplatné uživatelské jméno nebo heslo"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Nelze načíst uživatelské rozhraní: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Jste přihlášeni k Tumblr jako %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2078,6 +1928,14 @@ msgstr ""
 "Před nahráním odstranit identifikační údaje, jako místo, model fotoaparátu "
 "apod."
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2118,17 +1976,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Kde chcete vybrané fotografie zveřejnit?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "mě výhradně"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "všem"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Veliko_st fotografie:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+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:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2137,7 +2008,7 @@ msgstr ""
 "Jste přihlášeni ke službě Flickr jako %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2146,40 +2017,52 @@ 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á %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Účet Flickr Pro umožňuje nahrávat neomezeně."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotky _viditelné pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotky a videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "přátele a rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "přátele výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pixelů"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pixelů"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixelů"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixelů"
@@ -2231,7 +2114,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixelů)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Původní velikost"
 
@@ -2316,7 +2199,8 @@ msgid "Certificate of %s"
 msgstr "Certifikát serveru %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_Budiž"
 
@@ -2368,10 +2252,38 @@ msgstr "Zobrazit certifikát…"
 msgid "I understand, please _proceed."
 msgstr "Rozumím, přesto prosím _pokračovat."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Základní zveřejňovací služby"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogy:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pixelů"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start (): Nelze spustit a tuto zveřejňovací službu nelze "
+"restartovat."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Jste přihlášeni k Tumblr jako %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Na_stavení soukromí videa:"
@@ -2496,16 +2408,17 @@ 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/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:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2518,27 +2431,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – „Cáchy“"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nelze zobrazit nápovědu: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nelze se připojit k databázi chyb: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nelze zobrazit časté dotazy a odpovědi: %s"
@@ -2604,17 +2511,27 @@ msgstr "Soubor s obrázkem je poškozený"
 msgid "Imported failed (%d)"
 msgstr "Import selhal (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Vypsat všechny nalezené fotoaparáty a kamery"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Fotoaparát"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW + JPEG"
@@ -2627,34 +2544,34 @@ msgstr ""
 "správce souborů."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Skrýt již naimportované fotky"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Zobrazit jen fotografie, které ještě nebyly naimportovány"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importovat vy_brané"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importovat _vše"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 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:861
+#: src/camera/ImportPage.vala:854
 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:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2662,15 +2579,15 @@ msgstr ""
 "Shotwell potřebuje kvůli přístupu odpojit fotoaparát ze souborového systému. "
 "Pokračovat?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Odpojit"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Odpojte prosím fotoaparát."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2680,11 +2597,11 @@ msgstr ""
 "který není blokovaný jinou aplikací. Ukončete všechny aplikace, které ho "
 "používají, a zkuste to znovu."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 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:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2693,29 +2610,33 @@ msgstr ""
 "Nelze načíst náhledy z fotoaparátu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Odpojuje se…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Připojuje se k fotoaparátu, čekejte prosím…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Začíná import, čekejte prosím…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Získávají se informace o fotografii"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získává se náhled pro %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nelze uzamknout fotoaparát: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2723,7 +2644,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:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2731,7 +2652,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:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2739,7 +2660,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:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2747,15 +2668,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:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Zachovat"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňují se fotografie/videa z fotoaparátu"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2769,7 +2690,7 @@ msgid "_Print"
 msgstr "_Tisk"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Odesla_t…"
 
@@ -2811,13 +2732,13 @@ msgid "Flip Verti_cally"
 msgstr "Překlopit s_visle"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Vylepšit"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Vrátit zpět na původní"
@@ -2834,12 +2755,13 @@ msgstr "Vložit ú_pravu barev"
 msgid "Adjust Date and Time…"
 msgstr "Nastavit datum a čas…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Otevřít v e_xterním editoru"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Otevřít v editoru RA_W"
 
@@ -2847,43 +2769,41 @@ msgstr "Otevřít v editoru RA_W"
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Export fotografie/videa"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Export fotografií/videí"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Export fotografie/videa"
+msgstr[1] "Export fotografií/videí"
+msgstr[2] "Export fotografií/videí"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Export fotografie"
+msgid_plural "Export Photos"
+msgstr[0] "Export fotografie"
+msgstr[1] "Export fotografií"
+msgstr[2] "Export fotografií"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Export fotografií"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Otáčí se"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Vrací se zpět otočení"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Překlápí se vodorovně"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Vrací se zpět vodorovné překlopení"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Překlápí se svisle"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Vrací se zpět svislé překlopení"
 
@@ -3100,19 +3020,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Databázový soubor:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Import"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Import z aplikace"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Importovat _multimédia z:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -3181,9 +3101,9 @@ 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:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "S_mazat"
@@ -3218,6 +3138,10 @@ msgstr "_Přepnout vývojku"
 msgid "Export Video"
 msgstr "Export videa"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Export fotografií"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3250,56 +3174,28 @@ msgstr ""
 "\n"
 "Chcete v exportu pokračovat?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Beze změny"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Stávající"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Formát:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Kvalita:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "Přešká_lovat:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Pixely:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "Exportovat _metadata:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Pokračova_t"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Uložit podrobnosti…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Uložit podrobnosti"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(a %d dalších)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Zpráva o výsledcích importu"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3307,7 +3203,7 @@ msgstr[0] "Pokus o import %d souboru."
 msgstr[1] "Pokus o import %d souborů."
 msgstr[2] "Pokus o import %d souborů"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3318,37 +3214,37 @@ msgstr[2] "Z toho bylo %d souborů úspěšně importováno."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplicitní fotografie/videa nejsou importovány:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "Zduplikuje existující položky"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotografie/videa nelze importovat kvůli chybě fotoaparátu:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "chybová zpráva:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Soubory nebyly importovány, protože nejde o fotografie nebo videa:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3359,7 +3255,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3367,7 +3263,7 @@ msgstr ""
 "Fotografie/videa nelze importovat, protože Shotwell je nemůže zkopírovat do "
 "své knihovny:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3379,18 +3275,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografie/videa nelze importovat, protože soubory jsou poškozené:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografie/videa nelze importovat z jiných důvodů:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3398,7 +3294,7 @@ msgstr[0] "Jedna duplicitní fotografie nebyla naimportována:\n"
 msgstr[1] "%d duplicitní fotografie nebyly naimportovány:\n"
 msgstr[2] "%d duplicitních fotografií nebylo naimportováno:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3406,7 +3302,7 @@ msgstr[0] "Jedno duplicitní video nebylo naimportováno:\n"
 msgstr[1] "%d duplicitní videa nebyla naimportováno:\n"
 msgstr[2] "%d duplicitních videí nebylo naimportováno:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3414,7 +3310,7 @@ msgstr[0] "Jedna duplicitní fotografie/video nebylo naimportováno:\n"
 msgstr[1] "%d duplicitní fotografie/videa nebyly naimportovány:\n"
 msgstr[2] "%d duplicitní fotografií/videí nebylo naimportováno:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3423,7 +3319,7 @@ msgstr[0] ""
 msgstr[1] "U %d fotografií selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d fotografií selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3431,7 +3327,7 @@ msgstr[0] "U jednoho videa selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[1] "U %d videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3443,7 +3339,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d fotografií/videí selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3452,7 +3348,7 @@ msgstr[0] ""
 msgstr[1] "U %d souborů selhal import kvůli chybě souboru nebo hardwaru:\n"
 msgstr[2] "U %d souborů selhal import kvůli chybě souboru nebo hardwaru:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3466,7 +3362,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d fotografií selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3480,7 +3376,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d videí selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3498,7 +3394,7 @@ msgstr[2] ""
 "U %d fotografií/videí selhal import, protože složka knihovny neumožňila "
 "zápis:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3512,7 +3408,7 @@ msgstr[1] ""
 msgstr[2] ""
 "U %d souborů selhal import, protože složka knihovny neumožňila zápis:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, 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"
@@ -3520,7 +3416,7 @@ msgstr[0] "U jedné fotografie selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d fotografií selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d fotografií selhal import kvůli chybě fotoaparátu:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3528,7 +3424,7 @@ msgstr[0] "U jednoho videa selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d videí selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d videí selhal import kvůli chybě fotoaparátu:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3536,7 +3432,7 @@ msgstr[0] "U jedné fotografie/videa selhal import kvůli chybě fotoaparátu:\n
 msgstr[1] "U %d fotografií/videí selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d fotografií/videí selhal import kvůli chybě fotoaparátu:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3544,7 +3440,7 @@ msgstr[0] "U jednoho souboru selhal import kvůli chybě fotoaparátu:\n"
 msgstr[1] "U %d souborů selhal import kvůli chybě fotoaparátu:\n"
 msgstr[2] "U %d souborů selhal import kvůli chybě fotoaparátu:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, 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"
@@ -3552,7 +3448,7 @@ msgstr[0] "U jedné fotografie selhal import protože byla poškozená:\n"
 msgstr[1] "U %d fotografií selhal import protože byly poškozené:\n"
 msgstr[2] "U %d fotografií selhal import protože byly poškozené:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, 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"
@@ -3560,7 +3456,7 @@ msgstr[0] "U jednoho videa selhal import protože bylo poškozené:\n"
 msgstr[1] "U %d videí selhal import protože byly poškozená:\n"
 msgstr[2] "U %d videí selhal import protože byly poškozená:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3568,7 +3464,7 @@ msgstr[0] "U jedné fotografie/videa selhal import protože bylo poškozené:\n"
 msgstr[1] "U %d fotografií/videí selhal import protože byly poškozené:\n"
 msgstr[2] "U %d fotografií/videí selhal import protože byly poškozené:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3580,7 +3476,7 @@ msgstr[2] "U %d souborů selhal import protože byly poškozené:\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3590,7 +3486,7 @@ msgstr[2] "%d nepodporovaných fotografií bylo vynecháno:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3598,7 +3494,7 @@ msgstr[0] "Jeden neobrázkový soubor byl vynechán.\n"
 msgstr[1] "%d neobrázkové soubory byly vynechány.\n"
 msgstr[2] "%d neobrázkových souborů bylo vynecháno.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -3607,7 +3503,7 @@ msgstr[0] ""
 msgstr[1] "%d fotografie byly vynechány kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d fotografií bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -3615,7 +3511,7 @@ msgstr[0] "Jedno video bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 msgstr[1] "%d videa byla vynechána kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d videí bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -3626,7 +3522,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotografií/videí bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3634,7 +3530,7 @@ msgstr[0] "Jeden soubor byl vynechán kvůli zrušení ze strany uživatele:\n"
 msgstr[1] "%d soubory byly vynechány kvůli zrušení ze strany uživatele:\n"
 msgstr[2] "%d souborů bylo vynecháno kvůli zrušení ze strany uživatele:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3642,7 +3538,7 @@ msgstr[0] "Jedna fotografie byla úspěšně naimportována.\n"
 msgstr[1] "%d fotografie byly úspěšně naimportovány.\n"
 msgstr[2] "%d fotografií bylo úspěšně naimportováno.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3650,7 +3546,7 @@ msgstr[0] "Jedno video bylo úspěšně naimportováno.\n"
 msgstr[1] "%d videa byla úspěšně naimportována.\n"
 msgstr[2] "%d videí bylo úspěšně naimportováno.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3660,93 +3556,65 @@ msgstr[2] "%d fotografií/videí bylo úspěšně naimportováno.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Žádné fotografie ani videa nebyly naimportovány.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Import dokončen"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunda"
-msgstr[1] "%d sekundy"
-msgstr[2] "%d sekund"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuta"
-msgstr[1] "%d minuty"
-msgstr[2] "%d minut"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hodina"
-msgstr[1] "%d hodiny"
-msgstr[2] "%d hodin"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 den"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Přejmenovat událost"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Název:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Úprava názvu"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Název:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Úprava komentáře k události"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Úprava komentáře k fotografii/videu"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentář:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 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:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "Odst_ranit z knihovny"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Vrátit zpět externí úpravu?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Vrátit zpět externí úpravy?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3758,15 +3626,15 @@ msgstr[1] ""
 msgstr[2] ""
 "Tím se odstraní všechny změny provedené v %d externích souborech. Pokračovat?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "_Vrátit zpět externí úpravu"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "_Vrátit zpět externí úpravy"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3774,116 +3642,19 @@ 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:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "Odeb_rat"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Odstranit fotografii z knihovny"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Odstranit fotografie z knihovny"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d %%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "dop."
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "odp."
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24hod"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Posunout fotografie/videa o tu samou hodnotu"
-
-#: 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: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: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:1817
-msgid "Original: "
-msgstr "Originál:"
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y, %k∶%M∶%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y, %l∶%M∶%S %p"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Čas expozice bude posunut dopředu\n"
-"o %d %s, %d %s, %d %s a %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Čas expozice bude posunut dozadu\n"
-"o %d %s, %d %s, %d %s a %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "den"
-msgstr[1] "dny"
-msgstr[2] "dní"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hodinu"
-msgstr[1] "hodiny"
-msgstr[2] "hodin"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minutu"
-msgstr[1] "minuty"
-msgstr[2] "minut"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekundu"
-msgstr[1] "sekundy"
-msgstr[2] "sekund"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3906,92 +3677,13 @@ msgstr[2] ""
 "\n"
 "A %d dalších."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Štítky (oddělené čárkou):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Vítejte!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Vítejte v aplikaci Shotwell"
-
-#: 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: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: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: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:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importovat fotografie ze složky %s"
-
-#: 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:2152
-msgid "_Don’t show this message again"
-msgstr "Příště _nezobrazovat"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(nápověda)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "rok%směsíc%sden"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "rok%směsíc"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "rok%směsíc-den"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "rok-měsíc-den"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Vlastní"
-
-#. Invalid pattern.
-#: 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3999,31 +3691,31 @@ msgstr ""
 "Shotwell může zkopírovat fotky do knihovny nebo je může importovat bez "
 "kopírování."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Ko_pírovat fotky"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importovat bez kopírování"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Import do knihovny"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Odstranění z knihovny"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje se fotografie z knihovny"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Odstraňují se fotografie z knihovny"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4051,7 +3743,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4079,7 +3771,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4107,7 +3799,7 @@ msgstr[2] ""
 "\n"
 "Tuto operaci nelze vrátit zpět."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4120,7 +3812,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:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4159,6 +3851,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Nelze otevřít fotografii %s."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Uložit"
 
@@ -4185,206 +3878,444 @@ msgid "Save As"
 msgstr "Uložení jako"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nelze sledovat %s: nejedná se o složku (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "dop."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "odp."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24hod"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Posunout fotografie/videa o tu samou hodnotu"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Nastavit tento čas _všem fotkám/videím"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+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/AdjustDateTimeDialog.vala:110
+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/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Originál:"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y, %k∶%M∶%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y, %l∶%M∶%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Čas expozice bude posunut dopředu\n"
+"o %d %s, %d %s, %d %s a %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Čas expozice bude posunut dozadu\n"
+"o %d %s, %d %s, %d %s a %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "den"
+msgstr[1] "dny"
+msgstr[2] "dní"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hodinu"
+msgstr[1] "hodiny"
+msgstr[2] "hodin"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutu"
+msgstr[1] "minuty"
+msgstr[2] "minut"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekundu"
+msgstr[1] "sekundy"
+msgstr[2] "sekund"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Beze změny"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Stávající"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Formát:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Kvalita:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "Přešká_lovat:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Počet pixelů:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Exportovat _metadata:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(nápověda)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "rok%směsíc%sden"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "rok%směsíc"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "rok%směsíc-den"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "rok-měsíc-den"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Vlastní"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Neplatný vzor"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d %%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekundy"
+msgstr[2] "%d sekund"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodina"
+msgstr[1] "%d hodiny"
+msgstr[2] "%d hodin"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 den"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Vítejte!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Vítejte v aplikaci Shotwell"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Pro začátek naimportujte fotky libovolným postupem:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, 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/WelcomeDialog.vala:68
+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/WelcomeDialog.vala:69
+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/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Importovat fotografie ze složky %s"
+
+#: src/dialogs/WelcomeDialog.vala:87
+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/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "Příště _nezobrazovat"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Importovat fotky z knihovny %s"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Vrátit se k původním rozměrům fotky"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Nastaví oříznutí fotografie"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 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:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Neomezeně"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Čtverec"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD video (4:3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD video (16:9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Do peněženky (2 × 3 palce)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Poznámková karta (3 × 5 palců)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 palců"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 palců"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 palců"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5 x 11 palců)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 palců"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 palců)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 palců"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Do peněženky (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Pohlednice (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Zavřít nástroj pro odstranění červených očí"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Odstranit efekt červených očí ve vybrané oblasti"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: 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:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Expozice:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Sytost:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Odstín:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Tmavé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Světlé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Původní barvy"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Obnovit nastavení barev na původní"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Odstín"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Sytost"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Expozice"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Tmavé tóny"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Světlé tóny"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Zvýšení kontrastu"
 
@@ -4397,11 +4328,7 @@ msgstr "Úhel:"
 msgid "_Straighten"
 msgstr "_Vyrovnat"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Události"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4409,7 +4336,7 @@ msgstr[0] "%d fotka/video"
 msgstr[1] "%d fotky/videa"
 msgstr[2] "%d fotek/videí"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4417,7 +4344,7 @@ msgstr[0] "%d video"
 msgstr[1] "%d videa"
 msgstr[2] "%d videí"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4429,27 +4356,35 @@ msgstr[2] "%d fotografií"
 msgid "No Event"
 msgstr "Žádná událost"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Události"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Procházet své události"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Žádné události"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nebyly nalezeny žádné události"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Všechny události"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Bez data"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4489,20 +4424,16 @@ msgstr "Přepsat _vše"
 msgid "Export"
 msgstr "Export"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Složky"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Knihovna"
-
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Fotografie"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Procházet strukturu složek knihovny"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Označeno"
 
@@ -4523,19 +4454,36 @@ msgstr "Naimportováno %s"
 msgid "Last Import"
 msgstr "Poslední import"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Knihovna"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Roztřídit a procházet své fotografie"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotografie"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Import ze složky"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Zanořovat se do podsložek"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Vyprázdnění koše"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Vyprazdňuje se koš…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4547,33 +4495,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:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Umístění knihovny"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Z této složky nemohou být fotografie importovány."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d %%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Aktualizuje se knihovna…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Připravuje se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Provádí se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Zapisují se metadata do souborů…"
 
@@ -4589,15 +4537,15 @@ msgstr "Maže se…"
 msgid "Trash"
 msgstr "Koš"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Koš je prázdný"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Smazání"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Mažou se fotografie"
 
@@ -4644,32 +4592,36 @@ msgstr "Neznámá chyba při přístupu k databázi Shotwell: %s"
 msgid "Loading Shotwell"
 msgstr "Načítá se Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Cesta k soukromým datům aplikace Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "SLOŽKA"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Nesledovat průběžné změny ve složce s knihovnou"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Při spuštění nezobrazovat ukazatel průběhu"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Zobrazit verzi aplikace"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Spustit aplikaci v režimu celé obrazovky"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[SOUBOR]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4684,7 +4636,7 @@ msgstr "Nelze sledovat změny: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Nastavit velikost náhledů"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4693,16 +4645,16 @@ msgstr ""
 "Nelze přehrát vybrané video:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Žádné fotografie/videa"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 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:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nelze exportovat do této složky."
 
@@ -4766,7 +4718,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "změněno"
 
@@ -4935,7 +4887,7 @@ msgstr "Copyright:"
 msgid "Software:"
 msgstr "Software:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Doplňující informace"
 
@@ -4985,37 +4937,37 @@ msgstr "Získávají se informace o účtu…"
 msgid "Logging in…"
 msgstr "Přihlašuje se…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Zveřejnit fotografie"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Zveřejni_t fotografie na"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Zveřejnit videa"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Zveřejni_t videa na"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Zveřejnit fotografie a videa"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Zveřejni_t fotografie a videa na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Nelze zveřejnit"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5060,9 +5012,10 @@ msgstr "Překlopit vodorovně"
 msgid "Flip Vertically"
 msgstr "Překlopit svisle"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "O _aplikaci"
 
@@ -5085,11 +5038,11 @@ msgstr "V_před"
 msgid "Fulls_creen"
 msgstr "_Celá obrazovka"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Nápověda"
@@ -5505,7 +5458,7 @@ msgid "Adjust Date and Time"
 msgstr "Nastavení data a času"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Přidat š_títky…"
 
@@ -5596,7 +5549,7 @@ msgid "_Rename…"
 msgstr "_Přejmenovat…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Změn_it štítky…"
 
@@ -5647,7 +5600,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:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Uložené hledání"
 
@@ -5655,11 +5608,11 @@ msgstr "Uložené hledání"
 msgid "Delete Search"
 msgstr "Smazat hledání"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Upravit…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Přejme_novat…"
 
@@ -5729,7 +5682,7 @@ msgstr "O_bnovit"
 msgid "Move the selected photos back into the library"
 msgstr "Přesunout vybrané fotografie zpět do knihovny"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5745,7 +5698,8 @@ msgstr "Otevřít vybranou složku s fotografiemi ve správci souborů"
 msgid "Unable to open in file manager: %s"
 msgstr "Nelze otevřít ve správci souborů: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "O_dstranit z knihovny"
 
@@ -5808,151 +5762,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Prezentace"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Uložená hledání"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "obsahuje"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "je přesně"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "začíná"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "končí"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "není nastaveno"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "je nastaveno"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "je"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "není"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "libovolná fotka"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "fotka RAW"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "video"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "má"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "nemá"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "změny"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "interní změny"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "externí změny"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "označeno"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "neoznačeno"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "a více"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "jen"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "a méně"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "je po"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "je před"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "je mezi"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "a"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Hledání"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "Budiž"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "cokoliv"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "vše"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "nic"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Kterýkoliv text"
@@ -5989,8 +5915,8 @@ msgstr "Stav označení"
 msgid "Photo state"
 msgstr "Stav fotky"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Hodnocení"
 
@@ -5998,27 +5924,35 @@ msgstr "Hodnocení"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Uložená hledání"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Roztřídit své uložené fotografie"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Hodnocení ★+"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Hodnocení ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Hodnocení ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Hodnocení ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Hodnocení ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, 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"
@@ -6028,71 +5962,71 @@ 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Zavřít"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Videa"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Fotografie RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Použít uložené hledání k filtrování položek v aktuálním zobrazení"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Nastavení"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Předchozí"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Přejít na předchozí fotografii"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pozastavit promítání"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Následující"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Přejít na následující fotografii"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Nastavení"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Změnit nastavení prezentace"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Chybí všechny zdrojové soubory s fotografiemi."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Pokračovat v promítání"
 
@@ -6104,7 +6038,7 @@ msgstr "Přechody mezi snímky"
 msgid "(None)"
 msgstr "(žádný)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Žádný"
 
@@ -6112,16 +6046,20 @@ msgstr "Žádný"
 msgid "Random"
 msgstr "Náhodně"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Štítky"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Roztřidit a procházet štítky svých fotografií"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Export videí"
 
@@ -6131,14 +6069,10 @@ msgid "Toggle _Flag"
 msgstr "_Přepnout označení"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Vývojka"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Otevřít v e_xterním editoru"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6188,21 +6122,21 @@ msgstr "_Následující fotka"
 msgid "T_ools"
 msgstr "Nástr_oje"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "Ča_sté dotazy a odpovědi"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Nahlásit problém…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Import ze složky…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6280,17 +6214,12 @@ msgstr "_Sestupně"
 msgid "Even_ts"
 msgstr "Událos_ti"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr "O_dstranit z knihovny"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Názvy"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "Štít_ky"
 
@@ -6327,204 +6256,259 @@ msgstr "_Fotografie"
 msgid "_Stop Import"
 msgstr "Za_stavit import"
 
-#: ui/printing_widget.ui:19
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Velikost tištěného obrázku</b>"
-
-#: ui/printing_widget.ui:36
-msgid "Use a _standard size:"
-msgstr "Použít _standardní velikost:"
-
-#: ui/printing_widget.ui:80
-msgid "Use a c_ustom size:"
-msgstr "Použít _vlastní velikost:"
-
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
-msgstr "palců"
-
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-msgid "cm"
-msgstr "cm"
-
-#: ui/printing_widget.ui:173
-msgid "_Match photo aspect ratio"
-msgstr "Zachovat po_měr stran"
-
-#: ui/printing_widget.ui:197
-msgid "_Autosize:"
-msgstr "_Automatická velikost:"
-
-#: ui/printing_widget.ui:237
-msgid "<b>Titles</b>"
-msgstr "<b>Názvy</b>"
-
-#: ui/printing_widget.ui:254
-msgid "Print image _title"
-msgstr "Tisknout _název obrázku"
-
-#: ui/printing_widget.ui:297
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Rozlišení</b>"
-
-#: ui/printing_widget.ui:317
-msgid "_Output photo at:"
-msgstr "Vytiskn_out v rozlišení:"
-
-#: ui/printing_widget.ui:351
-msgid "pixels per inch"
-msgstr "bodů na palec"
-
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "Nastavit jako pozadí plochy"
-
-#: 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: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:16
-msgid "Set as Desktop Slideshow"
-msgstr "Nastavit jako prezentaci na ploše"
-
-#: 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:94
-msgid "period of time"
-msgstr "násobků času"
-
-#: 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"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "bílé"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "černé"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Zobrazení"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Pozadí:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Importovat fotografie do:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "S_ledovat, jestli nejsou do knihovny přidány nové soubory"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Import"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "Struktura _složek:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Příklad:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "Př_evádět názvy importovaných souborů na malá písmena"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Zapisovat štítky, názvy a další _metadata do souborů s fotografiemi"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "Vývojka RAW"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Výchozí:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "_Vzor:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Průhledné pozadí:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Šachovnice"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Plná barva"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "E_xterní editor fotografií:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Externí editor _RAW:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Externí editory"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ui/shotwell.ui:590
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Předvolby aplikace Shotwell"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Velikost tištěného obrázku</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "Použít _standardní velikost:"
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "Použít _vlastní velikost:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "palců"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "Zachovat po_měr stran"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "_Automatická velikost:"
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Názvy</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Tisknout _název obrázku"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Rozlišení</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "Vytiskn_out v rozlišení:"
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "bodů na palec"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Hledání"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "Budiž"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "_Název hledání:"
 
-#: ui/shotwell.ui:644
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "_Shoduje se"
 
-#: ui/shotwell.ui:671
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "cokoliv"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "vše"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "nic"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "z následujícího:"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "štítek"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Nastavit jako pozadí plochy"
 
-#: ui/shotwell.ui:903
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Použít pro pracovní plochu"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Použít pro zamykací obrazovku"
+
+#: 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:54
+msgid "Generate desktop background slideshow"
+msgstr "Vytvořit promítání snímků na pozadí plochy"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Každou fotku zobrazit na"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "násobků času"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Na jak dlouho se má zobrazit jedna fotografie"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nový š_títek…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Doba zobrazení:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Efek_t přechodu:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Trvání př_echodu:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Zobrazovat n_ázev"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekund"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nový š_títek…"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "štítek"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Vymazat všechny fotografie v koši"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Vložte ověřovací kód, který se vám zobrazí po přihlášení ke službě Flickr."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Ověřovací _kód:"
+
+#~ msgid "Width or height"
+#~ msgstr "Šířka nebo výška"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "„%s“ není platná odpověď na požadavek ověření protokolu OAuth"
diff --git a/po/da.gmo b/po/da.gmo
index 26b8986..4e5fbde 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 08bb41b..aab5951 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 2017 Software Freedom Conservancy Inc.
+# Copyright 2018 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, 2017.
+# Alan Mortensen <alanmortensen.am@gmail.com>, 2016-18.
 #
 # Konventioner:
 # slideshow -> slideshow (accepteret af RO; MicroSoft har forladt diasshow; dias relaterer sig til lysbilleder)
@@ -20,10 +20,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-02-06 12:17+0000\n"
-"PO-Revision-Date: 2017-02-11 15:40+0100\n"
+"POT-Creation-Date: 2018-03-03 08:52+0000\n"
+"PO-Revision-Date: 2018-03-08 17:26+0100\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/shotwell/language/"
 "da/)\n"
@@ -35,11 +35,11 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-04-09 13:12+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: 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
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -80,16 +80,16 @@ msgstr "Shotwell understøtter JPEG, PNG, TIFF og en række RAW-filformater."
 msgid "The Shotwell developers"
 msgstr "Udviklerne af Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Billedhåndtering"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organisér dine billeder"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -101,15 +101,15 @@ msgstr ""
 "publicér;"
 
 #. 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell-fremviser"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Billedvisning"
 
@@ -138,7 +138,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Hemmeligt token til at underskrive oauth-forespørgsler"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "standardstørrelse"
 
@@ -166,9 +166,9 @@ msgid "URL of the Rajce server."
 msgstr "Rajce-serverens URL."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "brugernavn"
 
@@ -185,7 +185,7 @@ msgid "user token, if remembered."
 msgstr "brugertoken, hvis det huskes."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "seneste kategori"
 
@@ -194,7 +194,7 @@ msgid "The last selected Rajce category."
 msgstr "Den sidst valgte Rajce-kategori."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "seneste billedstørrelse"
 
@@ -232,11 +232,11 @@ msgid ""
 msgstr "Hvis sand, åbn målalbummet i webbrowseren, når billederne er overført"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "fjern følsom information fra overførte billeder"
 
@@ -493,106 +493,124 @@ msgid "A grayscale color for use as the background color."
 msgstr "Gråskalafarve til brug som baggrundsfarve."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
-msgid "Selection state of “hide photos” option"
-msgstr "Tilstand for indstillingen \"skjul billeder\""
+msgid "background for transparent images"
+msgstr "baggrund til gennemsigtige billeder"
 
 #: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Baggrunden der skal bruges til gennemsigtige billeder."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "baggrundsfarve bag gennemsigtige billeder"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Farven der skal bruges, hvis baggrunden til gennemsigtige billeder er sat "
+"til uigennemsigtig farve"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr "Tilstand for indstillingen “skjul billeder”"
+
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
-"Sidst valgte tilstand af indstillingen \"skjul allerede importerede billeder"
-"\" på importsiden."
+"Sidst valgte tilstand af indstillingen “skjul allerede importerede billeder” "
+"på importsiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "forsinkelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Forsinkelse (i sekunder) mellem billederne i slideshowet."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "forsinkelse i overgang"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "Varigheden (i sekunder) af en overgang mellem billeder i et slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "overgangseffekt-id"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr "Navnet på overgangseffekten der vises mellem billederne i et slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Vis titel"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Om billedets titel skal vises under et slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maksimér biblioteksvindue"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Sand hvis biblioteksprogrammet er maksimeret, ellers falsk."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "biblioteksvinduets bredde"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Biblioteksprogrammets vindues sidst registrerede bredde."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "biblioteksvinduets højde"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Biblioteksprogrammets vindues sidst registrerede højde."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maksimér vinduet til direkte redigering"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Sand hvis programmet til direkte redigering er maksimeret, ellers falsk."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "bredde på vinduet til direkte redigering"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Den sidst registrerede bredde på vinduet til direkte redigering."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "højde på vinduet til direkte redigering"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Den sidst registrerede højde på vinduet til direkte redigering."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "placering af sidebjælkeadskilleren"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -600,40 +618,40 @@ msgstr ""
 "Den sidst registrerede placering af adskilleren mellem sidebjælken og "
 "visningsområdet i biblioteksprogrammets vindue."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importmappe"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Mappen som importerede billeder placeres i."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "overvåg biblioteksmappe for nye filer"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr "Hvis sand importeres filer, der tilføjes biblioteksmappen, automatisk."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "skriv metadata til oprindelige filer"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
 msgstr ""
 "Hvis sand ændres metadata (mærker, titler m.v.) i den oprindelige billedfil."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "brug filnavne med småt"
 
 # Har sat slutpunktum, da det bruges i lignende sætninger.
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -641,11 +659,11 @@ msgstr ""
 "Hvis sand vil Shotwell ændre alle filnavne til små bogstaver, når billeder "
 "importeres."
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "mappemønster"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -653,11 +671,11 @@ msgstr ""
 "En streng der koder for navngivningsmønster, som bruges til at navngive "
 "billedmapper ved import."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "tilpasset mappemønster"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -665,29 +683,29 @@ msgstr ""
 "En streng der koder for et tilpasset navngivningsmønster, som bruges til at "
 "navngive billedmapper ved import."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "Standardfremkalder til RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Standardindstilling for hvilken RAW-fremkalder Shotwell vil bruge."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Sidst brugte valg for højde-/breddeforhold i beskæringsmenuen."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "En numerisk kode som repræsenterer det sidste valg, brugeren foretog i "
 "beskæringsmenuen."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Tælleren for det sidst brugte beskæringsforhold."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -695,11 +713,11 @@ msgstr ""
 "Et heltal større end nul som repræsenterer bredden på det sidste "
 "beskæringsforhold, som brugeren indtastede."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Nævneren for det sidst brugte beskæringsforhold."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -707,120 +725,120 @@ msgstr ""
 "Et heltal større end nul som repræsenterer højden på det sidste "
 "beskæringsforhold, som brugeren indtastede."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "eksternt billedbehandlingsprogram"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Eksternt program til at redigere billeder i."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "eksternt RAW-billedbehandlingsprogram"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Eksternt program til at redigere RAW-billeder i."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Indstilling i eksportér-dialog: hvordan man trimmer billeder"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "eksportér metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Indstilling i eksportér-dialog: mulighed for at eksportere metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "formatindstilling, specialværdi"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Indstilling i eksportér-dialog: formatindstilling, speciel værdi"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "formatindstilling, typeværdi"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Indstilling i eksportér-dialog: formatindstilling, typeværdi"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "kvalitetsindstilling for JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Indstilling i eksportér-dialog: kvalitetsindstilling for JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "billedets maksimale størrelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Indstilling i eksportér-dialog: billedets maksimale størrelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "sidst brugte tjeneste til udgivelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "En numerisk kode der repræsenterer den sidst brugte tjeneste til udgivelse "
 "af billeder"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "standardtjeneste til udgivelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "adgangstoken"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "OAuth-token til den nuværende Facebook-session, om nogen"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "bruger-id"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "Bruger-id for den aktuelle Facebook-bruger, hvis nogen"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "brugernavn"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Den aktuelle Facebook-brugers navn, hvis nogen"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "kode for standardstørrelse"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "En numerisk kode som repræsenterer standardstørrelsen på billeder, der "
 "udgives på Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -828,19 +846,19 @@ msgstr ""
 "Om billeder, der overføres til Facebook, først skal have fjernet deres "
 "metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth-adgangsfasetoken"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Autorisationstoken for den aktuelle Flickr-bruger, hvis nogen"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Hemmelighed til OAuth-adgangsfasetoken"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -848,22 +866,22 @@ msgstr ""
 "Den kryptografiske hemmelighed til at signere forespørgsler mod "
 "autorisationstoken for den aktuelle Flickr-bruger, hvis nogen"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Den aktuelle Flickr-brugers brugernavn, hvis noget"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "En numerisk kode som repræsenterer standardstørrelsen på billeder, der "
 "udgives på Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "standardsynlighed"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -871,19 +889,19 @@ msgstr ""
 "En numerisk kode som repræsenterer standardsynligheden på billeder, der "
 "udgives på Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "Om billeder, der overføres til Flickr, først skal have fjernet deres metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "genopfrisk token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -891,7 +909,7 @@ msgstr ""
 "Det OAuth-token der bruges til at genopfriske den aktuelle brugers Picasa "
 "Webalbums-session, hvis nogen."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -899,64 +917,64 @@ msgstr ""
 "En numerisk kode som repræsenterer standardstørrelsen på billeder, der "
 "overføres til Picasa Webalbums"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "sidste album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Navnet på det sidste album som brugeren udgav billeder til, hvis noget"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "Om billeder, der overføres til Picasa, skal have fjernet deres metadata først"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo-URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Piwigo-serverens URL."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo-brugernavn, hvis logget på."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "adgangskode"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo-adgangskode, hvis logget på."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "husk adgangskode"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Hvis sand, husk adgangskode til Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Den sidst valgte Piwigo-kategori."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "sidste tilladelsesniveau"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Det sidst valgte Piwigo-tilladelsesniveau."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -964,21 +982,21 @@ msgstr ""
 "En numerisk kode som repræsenterer den sidst brugte forudindstilling for "
 "billedstørrelse, når der udgives til Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "Om billeder, der overføres til Piwigo, skal have fjernet deres metadata først"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "hvis der er angivet en titel, men ikke en kommentar, så brug titel som "
 "kommentar ved overførsler til Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -986,11 +1004,11 @@ msgstr ""
 "Om billeder, der overføres til Piwigo, skal overføre titlen til kommentaren, "
 "hvis der er angivet en titel, men ikke en kommentar"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "overfør ikke mærker, når billeder sendes til Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -998,28 +1016,28 @@ msgstr ""
 "Om billeder, der sendes til Piwigo, skal have fjernet deres mærker, så "
 "mærkerne ikke forekommer på Piwigo-fjernserveren."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3-brugernavn"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API-nøgle"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "API-nøgle til Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3-webstedets URL"
 
 # Har ikke oversat "indicates", da det ikke optræder i lignende strenge
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1027,19 +1045,19 @@ msgstr ""
 "Om billeder, der overføres til Gallery3, skal have fjernet deres metadata "
 "først"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "skaleringsbegrænsning på sendte billeder"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Det sendte billedes skaleringsbegrænsnings-id"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "overførte billedes hovedakses billedpunkter"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1047,7 +1065,7 @@ msgstr ""
 "Hovedaksens billedpunkter på det billede, der skal overføres; bruges kun "
 "hvis skaleringsbegrænsnings-id'et er en passende værdi"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1055,32 +1073,32 @@ msgstr ""
 "Det OAuth-token der bruges til at genopfriske den aktuelle brugers YouTube-"
 "session, hvis nogen."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "sidst brugte importtjeneste"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "En numerisk kode som repræsenterer den sidste tjeneste, som billeder blev "
 "importeret fra"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "cookie for fortolkertilstand"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "En numerisk kode som opsamler tilstanden for GStreamers udvidelsesmodulmiljø"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "tilstand for indholdslayout"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1088,38 +1106,38 @@ msgstr ""
 "En numerisk kode som beskriver, hvordan billeder sættes op på siden under "
 "udskrivning"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "indholds-ppi"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 "Antallet af billedpunkter pr. tomme (ppi) som sendes til printeren under "
 "udskrivning"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "indholdsbredde"
 
 # fotografisk emulsion? Fotoemulsion til "Screen printing"?
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Den udskrevne emulsions bredde på siden ved udskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "indholdshøjde"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Den udskrevne emulsions højde på siden ved udskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "indholdsenheder"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1127,11 +1145,11 @@ msgstr ""
 "En numerisk kode som repræsenterer måleenheder (tommer eller centimeter) "
 "brugt til udskrivning"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "kode for billeder pr. side"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1139,22 +1157,22 @@ msgstr ""
 "En numerisk kode som repræsenterer den aktuelle billeder pr. side-tilstand "
 "brugt ved udskrivning"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "størrelsesudvalg"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Den aktuelle udskriftsstørrelses index i en prædefineret liste over "
 "standardstørrelser"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "match højde-/breddeforhold"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1162,11 +1180,11 @@ msgstr ""
 "Bestemmer om tilpassede udskriftsstørrelser skal matche det oprindelige "
 "billedes højde-/breddeforhold"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "udskriv titler"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1174,213 +1192,351 @@ msgstr ""
 "Sand hvis billedets titel skal udskrives, når billedet udskrives, ellers "
 "falsk."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "titlens skrifttype"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Navn på skrifttypen brugt til billedtitler, når de udskrives."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Facebook skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Flickr skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Picasa Webalbums skal "
 "aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på YouTube skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Piwigo skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Yandex.Fotki skal aktiveres, "
 "ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Tumblr skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Rajce skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "aktivér udvidelsesmodul til udgivelse på gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis udvidelsesmodulet til udgivelse på Gallery3 skal aktiveres, ellers "
 "falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "aktivér importudvidelsesmodul til F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis importudvidelsesmodulet til F-Spot skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "aktivér smuldre-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Smuldre skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "aktivér falme-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Falme skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "aktivér glide-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Glide skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "aktivér ur-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "Sand hvis slideshowudvidelsesmodulet Ur skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "aktivér cirkel-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Cirkel skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:804
+msgid "enable slideshow circles transition"
+msgstr "aktivér cirkel-overgang i slideshow"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Cirkler skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:810
+msgid "enable slideshow blinds transition"
+msgstr "aktivér persienne-overgang i slideshow"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Persienne skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "aktivér kvadrater-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Kvadrater skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "aktivér striber-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Striber skal aktiveres, ellers falsk"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "aktivér skaktern-overgang i slideshow"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
 msgstr ""
 "Sand hvis slideshowudvidelsesmodulet Skaktern skal aktiveres, ellers falsk"
 
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Du er i øjeblikket ikke logget ind på Facebook.\n"
+"\n"
+"Hvis du endnu ikke har en Facebook-konto, kan du oprette en under "
+"loginprocessen. Under login kan det være, at Shotwell Connect spørger dig om "
+"tilladelse til at overføre billeder og udgive i din nyhedskilde. Disse "
+"rettigheder er nødvendige for at Shotwell Connect skal kunne fungere."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Du har allerede logget dig ind og ud af Facebook i denne Shotwellsession.\n"
+"For at udgive på Facebook igen så afslut og genstart Shotwell, forsøg så "
+"udgivelse igen."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Du er ikke logget på Flickr i øjeblikket.\n"
+"\n"
+"Klik Log ind for at logge ind i din webbrowser. Du vil skulle godkende "
+"Shotwell Connect for at linke til din Flickr-konto."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
+msgid "Preparing for login…"
+msgstr "Forbereder på login …"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Flickr-godkendelse mislykkedes"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
+msgid "Verifying authorization…"
+msgstr "Bekræfter godkendelse …"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Du har allerede logget ind og ud af en Google-tjeneste under denne Shotwell-"
+"session.\n"
+"\n"
+"Afslut og start Shotwell på ny for at fortsætte med at udgive til Google-"
+"tjenester."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Du er ikke logget ind på Picasa Webalbums.\n"
+"\n"
+"Klik på Log ind for at logge ind på Picasa Webalbums i din internetbrowser. "
+"Du skal godkende Shotwell Connect for at forbinde til din konto på Picasa "
+"Webalbums."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
+msgid ""
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
+msgstr ""
+"Du er ikke logget ind på YouTube. \n"
+"\n"
+"Du skal allerede have åbnet en Google-konto og sat den op til brug med "
+"YouTube for at kunne fortsætte. Du kan sætte de fleste konti op ved at logge "
+"ind på YouTube-webstedet mindst en gang med din browser."
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-mail-adresse"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Adgangskode"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Log ind"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Indtast e-mail og adgangskode tilknyttet din Tumblr-konto."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Brugernavn og/eller adgangskode er ugyldig. Prøv venligst igen"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Ugyldigt brugernavn eller adgangskode"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Kunne ikke indlæse UI: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Besøg Shotwells hjemmeside"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Joe Hansen <joedalton2@yahoo.dk>\n"
@@ -1392,14 +1548,14 @@ msgstr ""
 "Mere info: http://www.dansk-gruppen.dk"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
 "⚫ Dette websted fremviste identifikation som tilhører et andet websted."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1408,21 +1564,21 @@ msgstr ""
 "din computers kalender."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
 "⚫ Dette websteds identifikation var ikke udstedt af en betroet organisation."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
 "⚫ Dette websteds identifikation kunne ikke behandles. Den kan være ødelagt."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1431,7 +1587,7 @@ msgstr ""
 "som udstedte den."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1440,7 +1596,7 @@ msgstr ""
 "krypteringen er meget svag."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1448,122 +1604,12 @@ msgstr ""
 "⚫ Dette websteds identifikation er kun gyldig for fremtidige datoer. Tjek "
 "datoen i din computers kalender."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 "En midlertidig fil, som er nødvendig for udgivelse, er ikke tilgængelig"
 
-#: plugins/common/RESTSupport.vala:1167
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Du har allerede logget ind og ud af en Google-tjeneste under denne Shotwell-"
-"session.\n"
-"\n"
-"Afslut og start Shotwell på ny for at fortsætte med at udgive til Google-"
-"tjenester."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Velkommen til tjenesten til import af biblioteker for F-Spot.\n"
-"\n"
-"Vælg venligst et bibliotek som skal importeres, enten ved at vælge ét af de "
-"eksisterende biblioteker, som Shotwell finder, eller ved at vælge en anden F-"
-"Spot-databasefil."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Velkommen til tjenesten til import af biblioteker for F-Spot.\n"
-"\n"
-"Vælg venligst en F-Spot-databasefil."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Vælg manuelt en F-Spot-database som skal importeres:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Kan ikke åbne den valgte F-Spot-databasefil: filen findes ikke eller er ikke "
-"en F-Spot-database"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Kan ikke åbne den valgte F-Spot-databasefil: denne version af F-Spot-"
-"databasen understøttes ikke af Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Kan ikke læse den valgte F-Spot-databasefil: fejl under læsning af "
-"mærketabellen"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Kan ikke læse den valgte F-Spot-databasefil: fejl under læsning af "
-"billedtabellen"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell har fundet %d billeder i F-Spot-biblioteket og er i gang med at "
-"importere dem. Dubletter vil automatisk blive opdaget og fjernet.\n"
-"\n"
-"Du kan lukke dette vindue og begynde at anvende Shotwell, mens importen "
-"foregår i baggrunden."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot-bibliotek: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Forbereder import"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Kerne-tjenester til dataimport"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3-URL:"
@@ -1581,7 +1627,7 @@ msgid "Go _Back"
 msgstr "Gå _tilbage"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Log ind"
 
@@ -1616,7 +1662,7 @@ msgid "pixels"
 msgstr "billedpunkter"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1624,17 +1670,17 @@ msgstr "Oprindelig størrelse"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Bredde eller højde"
+msgid "Longest edge"
+msgstr "Længste kant"
 
 #: 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/picasa_publishing_options_pane.ui:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Log ud"
@@ -1642,13 +1688,13 @@ 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/picasa_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
 msgstr "_Udgiv"
 
@@ -1682,7 +1728,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Filen \"%s\" er muligvis ikke understøttet eller kan være for stor til denne "
+"Filen “%s” er muligvis ikke understøttet eller kan være for stor til denne "
 "forekomst af Gallery3."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
@@ -1744,40 +1790,18 @@ msgstr "Bruger ikke genkendt"
 msgid " Site Not Found"
 msgstr "Websted kunne ikke findes"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_E-mail-adresse"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Husk"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: 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:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:87
 msgid "A _new album named:"
 msgstr "Et _nyt album med navnet:"
 
@@ -1818,86 +1842,15 @@ msgid "You are logged into Rajce as %s."
 msgstr "Du er logget ind på Rajce som %s."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Billeder vil blive vist i:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwells ekstra udgivelsestjenester"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: 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:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala: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:1206
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 billedpunkter"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 billedpunkter"
-
-#: 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” er ikke et gyldigt svar på en forespørgsel om OAuth-godkendelse"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): kan ikke starte; denne udgiver kan ikke "
-"genstartes."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Indtast e-mail og adgangskode tilknyttet din Tumblr-konto."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Brugernavn og/eller adgangskode er ugyldig. Prøv venligst igen"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Ugyldigt brugernavn eller adgangskode"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Kunne ikke indlæse UI: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"D uer logget på Tumblr som %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -1915,12 +1868,12 @@ msgid "Public"
 msgstr "Offentlig"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Venner"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Privat"
 
@@ -1949,7 +1902,7 @@ msgid "Create a _new album named:"
 msgstr "Opret et _nyt album med navnet:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
-#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "Overførsels_størrelse:"
 
@@ -1959,64 +1912,40 @@ msgstr "Videoer og nye fotoalbum _synlige for:"
 
 #: 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/picasa_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 "_Fjern sted, kamera og anden identificerende information før overførsel"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Shotwell Connect"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don’t yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Du er i øjeblikket ikke logget ind på Facebook.\n"
-"\n"
-"Hvis du endnu ikke har en Facebook-konto, kan du oprette en under "
-"loginprocessen. Under login kan det være, at Shotwell Connect spørger dig om "
-"tilladelse til at overføre billeder og udgive i din nyhedskilde. Disse "
-"rettigheder er nødvendige for at Shotwell Connect skal kunne fungere."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Du har allerede logget dig ind og ud af Facebook i denne Shotwellsession.\n"
-"For at udgive på Facebook igen så afslut og genstart Shotwell, forsøg så "
-"udgivelse igen."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standard (720 billedpunkter)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Stor (2048 billedpunkter)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr "Tester forbindelse til Facebook …"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Opretter album …"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
@@ -2024,7 +1953,7 @@ msgstr ""
 "En fil, som kræves for at udgive, mangler. Udgivelse til Facebook kan ikke "
 "fortsætte."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2033,65 +1962,27 @@ msgstr ""
 "Du er logget ind på Facebook som %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:983
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 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:1187
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Kun mig"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Alle"
 
-#: 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."
-msgstr ""
-"Indtast bekræftelsestallet, der fremkommer efter du logger ind i Flickr i "
-"din webbrowser."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Godkendelses_nummer:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "For_tsæt"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Du er ikke logget på Flickr i øjeblikket.\n"
-"\n"
-"Klik Log ind for at logge ind i din webbrowser. Du vil skulle godkende "
-"Shotwell Connect for at linke til din Flickr-konto."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Du har allerede logget ind og ud af Flickr i denne Shotwell-session.\n"
-"For at udgive på Flickr igen så afslut og genstart Shotwell og prøv så at "
-"udgive igen."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Forbereder på login …"
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Billedstørrelse:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:434
-#: plugins/shotwell-publishing/FlickrPublishing.vala:571
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
@@ -2099,11 +1990,7 @@ msgstr ""
 "En fil, som kræves for at udgive, mangler. Udgivelse til Flickr kan ikke "
 "fortsætte."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:447
-msgid "Verifying authorization…"
-msgstr "Bekræfter godkendelse …"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2112,7 +1999,7 @@ msgstr ""
 "Du er logget på Flickr som %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2122,66 +2009,69 @@ msgstr ""
 "måned.\n"
 "Denne måned har du %s tilbage i din overførselskvote."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 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:1138
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Billeder _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Videoer _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Billeder og videoer _synlige for:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Kun venner & familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Kun familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Kun venner"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 billedpunkter"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 billedpunkter"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 billedpunkter"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 billedpunkter"
 
-#: 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:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "_Standardstørrelse på billede:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Du er ikke logget ind på Picasa Webalbums.\n"
-"\n"
-"Klik på Log ind for at logge ind på Picasa Webalbums i din internetbrowser. "
-"Du skal godkende Shotwell Connect for at forbinde til din konto på Picasa "
-"Webalbums."
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+msgid "Default album"
+msgstr "Standardalbum"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
@@ -2190,33 +2080,33 @@ msgstr ""
 "ikke fortsætte."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Du er logget på Picasa Webalbums som %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Video vil blive vist i:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Lille (640 × 480 billedpunkter)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Mellem (1024 × 768 billedpunkter)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Anbefalet (1600 × 1200 billedpunkter)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 billedpunkter)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:757
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Oprindelig størrelse"
 
@@ -2271,7 +2161,7 @@ msgid "Logout"
 msgstr "Log ud"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
-#: src/Resources.vala:295 ui/collection.ui:190
+#: src/Resources.vala:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Udgiv"
 
@@ -2303,7 +2193,8 @@ msgid "Certificate of %s"
 msgstr "Certifikat fra %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:166
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2355,29 +2246,43 @@ msgstr "Vis certifikatet …"
 msgid "I understand, please _proceed."
 msgstr "Jeg er indforstået, fortsæt _venligst."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Kernetjenester til udgivelse"
 
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-msgid "Video privacy _setting:"
-msgstr "Video-ind_stilinger for privatliv:"
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 billedpunkter"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
 msgid ""
-"You are not currently logged into YouTube.\n"
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): kan ikke starte; denne udgiver kan ikke "
+"genstartes."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
 "\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
 msgstr ""
-"Du er ikke logget ind på YouTube. \n"
+"D uer logget på Tumblr som %s.\n"
 "\n"
-"Du skal allerede have åbnet en Google-konto og sat den op til brug med "
-"YouTube for at kunne fortsætte. Du kan sætte de fleste konti op ved at logge "
-"ind på YouTube-webstedet mindst en gang med din browser."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Video-ind_stilinger for privatliv:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
@@ -2385,21 +2290,16 @@ msgstr ""
 "En fil, som kræves for at udgive, mangler. Udgivelse til Youtube kan ikke "
 "fortsætte."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Du er logget ind på YouTube som %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr "Videoer vil blive vist i \"%s\""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Vises offentligt"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Vises ikke offentligt"
 
@@ -2504,16 +2404,17 @@ msgstr "Fastgør værktøjsbjælken åben"
 msgid "Leave fullscreen"
 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:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:157
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2526,21 +2427,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:600
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Besøg Shotwells websted"
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Kan ikke vise hjælp: %s"
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Kan ikke navigere til fejldatase: %s"
 
-#: src/AppWindow.vala:628
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Ikke i stand til at vise OSS: %s"
@@ -2606,17 +2507,27 @@ msgstr "Beskadiget billedfil"
 msgid "Imported failed (%d)"
 msgstr "Import mislykkedes (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: 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
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Oversigt over alle detekterede kameraenheder"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2629,33 +2540,33 @@ msgstr ""
 "filhåndteringen."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Skjul allerede importerede billeder"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Vis kun billeder som endnu ikke er blevet importeret"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 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
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importér a_lle"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 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:861
+#: src/camera/ImportPage.vala:854
 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:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2663,15 +2574,15 @@ msgstr ""
 "Shotwell har brug for at afmontere kameraet fra filsystemet for at få adgang "
 "til det. Fortsæt?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "A_fmontér"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Afmontér venligst kameraet."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2681,11 +2592,11 @@ msgstr ""
 "det ikke er låst. Luk venligst alle andre programmer, som bruger kameraet, "
 "og forsøg igen."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Luk venligst alle andre programmer, som bruger kameraet."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2694,192 +2605,193 @@ msgstr ""
 "Kunne ikke indhente forhåndsvisninger fra kameraet:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Afmonterer …"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Forbinder til kamera. Vent venligst …"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Begynder import. Vent venligst …"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Indhenter billedinformation"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Indhenter forhåndsvisning for %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kan ikke låse kamera: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, 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:1739
+#: src/camera/ImportPage.vala:1759
 #, 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:1742
+#: src/camera/ImportPage.vala:1762
 #, 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:1745
+#: src/camera/ImportPage.vala:1765
 #, 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:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Behold"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Fjern billeder/videoer fra kameraet"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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:85
-#: src/PhotoPage.vala:2460 src/Resources.vala:170
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
 msgid "_Print"
 msgstr "_Udskriv"
 
-#: 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
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Send _til …"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
-#: src/PhotoPage.vala:2470 src/Resources.vala:220
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
 msgid "Set as _Desktop Background"
 msgstr "Angiv som skrivebords_baggrund"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:287
 msgid "_Duplicate"
 msgstr "_Duplikér"
 
-#: src/CollectionPage.vala:94
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "S_lideshow"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Vend _vandret"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Vend _lodret"
 
-#: 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
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Gør skarpere"
 
-#: 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
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Gendan til oprindelig"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Kopiér farvetilpasninger"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Indsæt farvetilpasninger"
 
-#: src/CollectionPage.vala:129
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Justér dato og tid …"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Åbn med e_ksternt redigeringsprogram"
 
-#: 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
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Åbn med RA_W-redigeringsprogram"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:168
 msgid "_Play"
 msgstr "_Afspil"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Eksportér billede/video"
-
-#: src/CollectionPage.vala:409
-msgid "Export Photos/Videos"
-msgstr "Eksportér billeder/videoer"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Eksportér billede/video"
+msgstr[1] "Eksportér billeder/videoer"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Eksportér billede"
-
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Eksportér billeder"
+msgid_plural "Export Photos"
+msgstr[0] "Eksportér billede"
+msgstr[1] "Eksportér billeder"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Roterer"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Fortryder rotering"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Vender vandret"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Fortryder vandret vending"
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Vender lodret"
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Fortryder lodret vending"
 
@@ -3006,7 +2918,7 @@ msgstr "Opret mærke"
 #: src/Commands.vala:1695
 #, c-format
 msgid "Move Tag “%s”"
-msgstr "Flyt mærket \"%s\""
+msgstr "Flyt mærket “%s”"
 
 #: src/Commands.vala:2347
 msgid "Move Photos to Trash"
@@ -3093,19 +3005,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Database-fil:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importér"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Importér fra program"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Importér medie _fra:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Luk"
 
@@ -3170,12 +3082,12 @@ msgstr "Kunne ikke forberede skrivebordsslideshow: %s"
 #, c-format
 msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
-msgstr[0] "Dette vil fjerne mærket \"%s\" fra et billede. Fortsæt?"
-msgstr[1] "Dette vil fjerne mærket \"%s\" fra %d billeder. Fortsæt?"
+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: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
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Slet"
@@ -3183,7 +3095,7 @@ msgstr "_Slet"
 #: src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search “%s”. Continue?"
-msgstr "Dette vil fjerne den gemte søgning \"%s\". Fortsæt?"
+msgstr "Dette vil fjerne den gemte søgning “%s”. Fortsæt?"
 
 #: src/Dialogs.vala:36
 msgid ""
@@ -3207,6 +3119,10 @@ msgstr "_Skift udvikler"
 msgid "Export Video"
 msgstr "Eksportér video"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Eksportér billeder"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3239,63 +3155,35 @@ msgstr ""
 "\n"
 "Vil du fortsætte med at eksportere?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Umodificeret"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Nuværende"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Format:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Kvalitet:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Skaleringsbegrænsning:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr " _Billedpunkter:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "Eksportér _metadata:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "For_tsæt"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Gem detaljer …"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Gem detaljer"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(og %d flere)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Rapport over resultat af import"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Forsøgte at importere %d fil."
 msgstr[1] "Forsøgte at importere %d filer."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3305,30 +3193,30 @@ msgstr[1] "Ud af disse blev import af %d filer gennemført."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikerede billeder/videoer blev ikke importeret:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "duplikerer eksisterende medieelement"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Billeder/videoer blev ikke importeret på grund af kamerafejl:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "fejlbesked:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Billeder/videoer blev ikke importeret, fordi de ikke blev genkendt som "
@@ -3337,7 +3225,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3348,7 +3236,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3356,7 +3244,7 @@ msgstr ""
 "Billeder/videoer blev ikke importeret, fordi Shotwell ikke kunne kopiere dem "
 "til dets bibliotek:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3368,39 +3256,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Billeder/videoer blev ikke importeret, fordi filerne er beskadigede:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Billeder/videoer blev ikke importeret af andre grunde:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 dubletbillede blev ikke importeret:\n"
 msgstr[1] "%d dubletbilleder blev ikke importeret:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 dubletvideo blev ikke importeret:\n"
 msgstr[1] "%d dubletvideoer blev ikke importeret:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 dubletbillede/-video blev ikke importeret:\n"
 msgstr[1] "%d dubletbilleder/-videoer blev ikke importeret:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3409,14 +3297,14 @@ msgstr[0] ""
 msgstr[1] ""
 "%d billeder kunne ikke importeres på grund af en fil- eller hardwarefejl.\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] "1 video kunne ikke importeres pga. en fil- eller hardwarefejl:\n"
 msgstr[1] "%d videoer kunne ikke importeres pga. en fil- eller hardwarefejl:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3426,14 +3314,14 @@ msgstr[0] ""
 msgstr[1] ""
 "%d billeder/videoer kunne ikke importeres pga. en fil- eller hardwarefejl:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "1 fil kunne ikke importeres pga. en fil- eller hardwarefejl:\n"
 msgstr[1] "%d filer kunne ikke importeres pga. en fil- eller hardwarefejl:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3445,7 +3333,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d billeder kunne ikke importeres, da billedmappen er skrivebeskyttet:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3457,7 +3345,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d videoer kunne ikke importeres, da billedmappen er skrivebeskyttet:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3472,7 +3360,7 @@ msgstr[1] ""
 "%d billeder/videoer kunne ikke importeres, da fotomappen er "
 "skrivebeskyttet:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3487,49 +3375,49 @@ msgstr[1] ""
 "billedbiblioteksmappen:\n"
 "\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "1 billede kunne ikke importeres på grund af en kamerafejl:\n"
 msgstr[1] "%d billeder kunne ikke importeres på grund af en kamerafejl:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "1 video kunne ikke importeres pga. en kamerafejl:\n"
 msgstr[1] "%d videoer kunne ikke importeres pga. en kamerafejl:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "1 billede/video kunne ikke importeres pga. en kamerafejl:\n"
 msgstr[1] "%d billeder/videoer kunne ikke importeres pga. en kamerafejl:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "1 fil kunne ikke importeres pga. en kamerafejl:\n"
 msgstr[1] "%d filer kunne ikke importeres pga. en kamerafejl:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 billede blev ikke importeret, fordi det var beskadiget:\n"
 msgstr[1] "%d billeder blev ikke importeret, fordi de var beskadiget:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 video blev ikke importeret, fordi den var beskadiget:\n"
 msgstr[1] "%d videoer blev ikke importeret, fordi de var beskadiget:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3538,7 +3426,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d billeder/videoer blev ikke importeret, fordi de var beskadiget:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3549,7 +3437,7 @@ msgstr[1] "%d filer blev ikke importeret, fordi de var beskadiget:\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3558,35 +3446,35 @@ msgstr[1] "%d billeder, som ikke understøttes, blev udeladt:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "1 fil, der ikke var et billede, blev udeladt.\n"
 msgstr[1] "%d filer, der ikke var billeder, blev udeladt.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "1 billede udeladt, fordi brugeren afbrød:\n"
 msgstr[1] "%d billeder udeladt, fordi brugeren afbrød:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 video udeladt, fordi brugeren afbrød:\n"
 msgstr[1] "%d videoer udeladt, fordi brugeren afbrød:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "1 billede/video udeladt, fordi brugeren afbrød:\n"
 msgstr[1] "%d billeder/videoer udeladt, fordi brugeren afbrød:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3595,21 +3483,21 @@ msgstr[1] ""
 "%d filer udeladt, fordi brugeren afbrød:\n"
 "\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 billede importeret.\n"
 msgstr[1] "%d billeder importeret.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 video importeret.\n"
 msgstr[1] "%d videoer importeret.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3618,89 +3506,64 @@ msgstr[1] "%d billeder/videoer importeret.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Ingen billeder eller videoer importeret.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Import færdig"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekunder"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minutter"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 dag"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:231
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Omdøb begivenhed"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Navn:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Redigér titel"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:307
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Redigér kommentar til begivenhed"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Redigér kommentar til billede/video"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 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:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Fjern fra biblioteket"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Fortryd ekstern redigering?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Fortryd eksterne redigeringer?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3708,125 +3571,34 @@ 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:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "For_tryd ekstern redigering"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "For_tryd eksterne redigeringer"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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:1444 src/Resources.vala:173
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Fjern billede fra biblioteket"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Fjern billeder fra biblioteket"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "AM"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "PM"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 t."
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Flyt billeder/videoer på samme måde"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Sæt _alle billeder til denne tid"
-
-#: 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:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Ændr oprindelig fil"
-msgstr[1] "_Ændr oprindelige filer"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Oprindelig: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Belysningstidspunkt vil blive flyttet fremad med\n"
-"%d %s, %d %s, %d %s, og %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Belysningstidspunkt vil blive flyttet tilbage med\n"
-"%d %s, %d %s, %d %s, og %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dage"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "time"
-msgstr[1] "timer"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minutter"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekund"
-msgstr[1] "sekunder"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3845,91 +3617,13 @@ msgstr[1] ""
 "\n"
 "Og %d andre."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Mærker (adskilt af kommaer):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Velkommen!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Velkommen til Shotwell!"
-
-#: 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: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:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Træk og slip billeder i Shotwell-vinduet"
-
-#: 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:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importér billeder fra din mappe %s"
-
-#: 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:2152
-msgid "_Don’t show this message again"
-msgstr "_Vis ikke denne besked igen"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Hjælp)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "År%småned%sdag"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "År%småned"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "År%småned-dag"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "År-måned-dag"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Tilpasset"
-
-#. Invalid pattern.
-#: 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3937,31 +3631,31 @@ msgstr ""
 "Shotwell kan kopiere billederne ind i din biblioteksmappe eller det kan "
 "importere dem uden at kopiere."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Ko_piér billeder"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importér uden at kopiere"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Importér til bibliotek"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Fjern fra biblioteket"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Fjerner billede fra biblioteket"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Fjerner billeder fra bibliotek"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3984,7 +3678,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4007,7 +3701,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4030,7 +3724,7 @@ msgstr[1] ""
 "\n"
 "Denne handling kan ikke fortrydes."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4041,7 +3735,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:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4080,233 +3774,462 @@ msgstr ""
 msgid "Unable open photo %s. Sorry."
 msgstr "Kunne ikke åbne billedet %s. Beklager."
 
-#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/direct/DirectPhotoPage.vala:304
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "_Gem en kopi"
 
-#: src/direct/DirectPhotoPage.vala:307
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Mist ændringer til %s?"
 
-#: src/direct/DirectPhotoPage.vala:308
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Luk _uden at gemme"
 
-#: src/direct/DirectPhotoPage.vala:341
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Fejl i forsøget på at gemme til %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Gem som"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 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:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 t."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Flyt billeder/videoer på samme måde"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Sæt _alle billeder til denne tid"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Ændr oprindelig billedfil"
+msgstr[1] "_Ændr oprindelige billedfiler"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Ændr oprindelig fil"
+msgstr[1] "_Ændr oprindelige filer"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Oprindelig: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d/%m/%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d/%m/%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Belysningstidspunkt vil blive flyttet fremad med\n"
+"%d %s, %d %s, %d %s, og %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Belysningstidspunkt vil blive flyttet tilbage med\n"
+"%d %s, %d %s, %d %s, og %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dage"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "time"
+msgstr[1] "timer"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minutter"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekund"
+msgstr[1] "sekunder"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Umodificeret"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Nuværende"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Format:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Kvalitet:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Skaleringsbegrænsning:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr " _Billedpunkter:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Eksportér _metadata:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Hjælp)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "År%småned%sdag"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "År%småned"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "År%småned-dag"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "År-måned-dag"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Tilpasset"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Ugyldigt mønster"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekunder"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minutter"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d time"
+msgstr[1] "%d timer"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 dag"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Velkommen!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Velkommen til Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+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/WelcomeDialog.vala:67
+#, 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/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Træk og slip billeder i Shotwell-vinduet"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Forbind et kamera til din computer og importér"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Importér billeder fra din mappe %s"
+
+#: src/dialogs/WelcomeDialog.vala:87
+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/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Vis ikke denne besked igen"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Importér billeder fra dit %s-bibliotek"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Gendan aktuelle billeddimensioner"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Angiv beskæring på dette billede"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Drej beskæringsrektanglen mellem stående og liggende"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Ubegrænset"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Firkant"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Skærm"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD-video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD-video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Tegnebog (2 × 3 in.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Noteskort (3 × 5 in.)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 in."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 in."
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 in."
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8.5 × 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 in."
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 in."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrisk tegnebog (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postkort (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Luk værktøjet til rødøje"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 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:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: 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:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Belysning:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Mætning:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Nuance:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Skygger:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Højlys:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Nulstil farver"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Nulstil alle farvejusteringer til oprindelige farver"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Nuance"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Mætning"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Belysning"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Skygger"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Højlys"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Kontrastudvidelse"
 
@@ -4314,30 +4237,26 @@ msgstr "Kontrastudvidelse"
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
 #: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "Ud_jævn"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Begivenheder"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d billede/video"
 msgstr[1] "%d billeder/videoer"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d video"
 msgstr[1] "%d videoer"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4348,27 +4267,35 @@ msgstr[1] "%d billeder"
 msgid "No Event"
 msgstr "Ingen begivenhed"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Begivenheder"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Gennemse dine begivenheder"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Ingen begivenheder"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Ingen begivenheder fundet"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Alle begivenheder"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Uden dato"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4408,20 +4335,16 @@ msgstr "Overskriv _alle"
 msgid "Export"
 msgstr "Eksportér"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Mapper"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Bibliotek"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Gennemse bibliotekets mappestruktur"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Billeder"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Med flag på"
 
@@ -4442,19 +4365,37 @@ msgstr "Importerede %s"
 msgid "Last Import"
 msgstr "Sidste import"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Bibliotek"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organisér og gennemse dine billeder"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Billeder"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importér fra mappe"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+# Bruges i regexxer
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Tilgå undermapper rekursivt"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Tømmer papirkurven …"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4467,33 +4408,33 @@ msgstr ""
 "Indstillinger</span>.\n"
 "Vil du fortsætte med at importere billeder?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Bibliotekets placering"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Billeder kan ikke importeres fra denne mappe."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Opdaterer bibliotek …"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Forbereder auto-import af billeder …"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Auto-importerer billeder …"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Skriver metadata til filer …"
 
@@ -4509,15 +4450,15 @@ msgstr "Sletter …"
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Papirkurven er tom"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Slet"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Sletter billeder"
 
@@ -4564,36 +4505,40 @@ msgstr "Ukendt fejl under forsøg på at kontrollere Shotwells database: %s"
 msgid "Loading Shotwell"
 msgstr "Indlæser Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Sti til Shotwells private data"
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "MAPPE"
 
-#: src/main.vala:298
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Undlad at overvåge biblioteksmappe for ændringer ved kørselstid"
 
-#: src/main.vala:302
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Undlad at vise statusforløb for opstart"
 
-#: src/main.vala:306
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Vis programmets version"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Start programmet i fuldskærmstilstand"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[FIL]"
 
-#: src/main.vala:342
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
-"Kør \"%s --help\" for at se en fuldstændig liste over tilgængelige "
+"Kør “%s --help” for at se en fuldstændig liste over tilgængelige "
 "kommandolinjetilvalg.\n"
 
 #: src/MediaMonitor.vala:400
@@ -4605,7 +4550,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:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4614,35 +4559,35 @@ msgstr ""
 "Shotwell kunne ikke afspille den valgte video:\n"
 "%s"
 
-#: src/Page.vala:1312
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Ingen billeder/videoer"
 
-#: src/Page.vala:1316
+#: src/Page.vala:1331
 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:2622
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Billeder kan ikke eksporteres til denne mappe."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Forrige billede"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Næste billede"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Kildefil for billede mangler: %s"
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Kunne ikke eksportere %s: %s"
@@ -4687,7 +4632,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "forandret"
 
@@ -4719,23 +4664,15 @@ msgstr "16 billeder per side"
 msgid "32 images per page"
 msgstr "32 billeder per side"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "in."
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Billedopsætning"
 
-#: src/Printing.vala:889
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Udskriver …"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -4863,7 +4800,7 @@ msgstr "Ophavsret:"
 msgid "Software:"
 msgstr "Program:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Udvidet information"
 
@@ -4913,37 +4850,37 @@ msgstr "Indhenter kontoinformation …"
 msgid "Logging in…"
 msgstr "Logger ind …"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Udgiv billeder"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Udgiv billeder _til:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Udgiv videoer"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Udgiv videoer _til"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Udgiv billeder og videoer"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Udgiv billeder og videoer _til"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Ikke i stand til at udgive"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4960,731 +4897,733 @@ msgstr ""
 msgid "Publishing"
 msgstr "Udgiver"
 
-#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Rotér"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Rotér mod højre"
 
-#: src/Resources.vala:142 ui/collection.ui:146
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Rotér billederne til højre (tryk på Ctrl for at rotere til venstre)"
 
-#: src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Rotér mod venstre"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Rotér billederne mod venstre"
 
-#: src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Vend vandret"
 
-#: src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Vend lodret"
 
-#: 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
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Om"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "An_vend"
 
-#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: src/Resources.vala:160 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
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: src/Resources.vala:160
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_Frem"
 
-#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
 #: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Fuldskærm"
 
-#: 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
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Forlad _fuldskærm"
 
-#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "_Nyt"
 
-#: src/Resources.vala:165
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Næste"
 
-#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Indstillinger"
 
-#: src/Resources.vala:169
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "_Forrige"
 
-#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: src/Resources.vala:172 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 "_Afslut"
 
-#: src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "_Opdatér"
 
-#: src/Resources.vala:174
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "_Forkast"
 
-#: src/Resources.vala:176
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "Gem _som"
 
-#: src/Resources.vala:177
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Sortér _stigende"
 
-#: src/Resources.vala:178
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Sortér _faldende"
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/Resources.vala:180
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "_Gendan"
 
-#: src/Resources.vala:181
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "_Normal størrelse"
 
-#: src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "Bedste _tilpasning"
 
-#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
 #: ui/photo.ui:144 ui/tags.ui:260
 msgid "Zoom _In"
 msgstr "Zoom _ind"
 
-#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
 #: ui/photo.ui:149 ui/tags.ui:265
 msgid "Zoom _Out"
 msgstr "Zoom _ud"
 
-#: src/Resources.vala:187 ui/collection.ui:165
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Gør skarpere"
 
-#: src/Resources.vala:188 ui/collection.ui:162
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Forbedr automatisk billedets fremtoning"
 
-#: src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Kopiér farvetilpasninger"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopiér farvetilpasningerne som er anvendt på billedet"
 
-#: src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Indsæt farvetilpasninger"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Anvend de kopierede farvetilpasninger på de valgte billeder"
 
-#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "Besk_ær"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/Resources.vala:200
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
 msgstr "Beskær billedets størrelse"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Udjævn"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Udjævn billedet"
 
-#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Rødøje"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Rødøje"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Reducér eller eliminér rødøjeeffekter i billedet"
 
-#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Justér"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Justér"
 
-#: src/Resources.vala:212
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
 msgstr "Justér billedets farve og tone"
 
-#: src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Gendan til oprindelig"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Gendan eksterne _ændringer"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Gendan til det oprindelige billede"
 
-#: src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Angiv det valgte billede som den nye skrivebordsbaggrund"
 
-#: src/Resources.vala:222
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
 msgstr "_Sæt som slideshow på skrivebord …"
 
-#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: src/Resources.vala:225 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 "_Genskab"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Genskab"
 
-#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: src/Resources.vala:228 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 "_Omgør"
 
-#: src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
-#: ui/event.ui:391 ui/event.ui:584
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
 msgstr "_Omdøb begivenhed …"
 
-#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Gør til _nøglebillede for begivenhed"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Gør til nøglebillede begivenhed"
 
-#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "_Ny begivenhed"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Ny begivenhed"
 
-#: src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Flyt billeder"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Flyt billeder til en begivenhed"
 
-#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Flet begivenheder"
 
-#: src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Flet"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Kombinér begivenheder til én samlet begivenhed"
 
-#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Angiv bedømmelse"
 
-#: src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Angiv bedømmelse"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Ændr bedømmelsen på dit billede"
 
-#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Øg"
 
-#: src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Øg bedømmelse"
 
-#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Formindsk"
 
-#: src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Formindsk bedømmelse"
 
-#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Ikke bedømt"
 
-#: src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Ikke bedømt"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Bedøm de ikke bedømte"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Angiver som ikke bedømt"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Fjern alle bedømmelser"
 
-#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Afvist"
 
-#: src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Afvist"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Bedømmelse afvist"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Angiver som afvist"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Angiv bedømmelse som afvist"
 
-#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: src/Resources.vala:269 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 "Kun _afviste"
 
-#: src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Kun afviste"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Vis kun afviste billeder"
 
-#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: src/Resources.vala:273 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 "Alle + _afviste"
 
-#: src/Resources.vala:273
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Vis alle billeder, inklusive afviste"
 
-#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: src/Resources.vala:276 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 "_Alle billeder"
 
 #. Button tooltip
-#: src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Vis alle billeder"
 
-#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
 #: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Bedømmelser"
 
-#: src/Resources.vala:280
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
 msgstr "Vis hvert billedes bedømmelse"
 
-#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: src/Resources.vala:283 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 "_Filtrér billeder"
 
-#: src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Filtrér billeder"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Begræns antallet af viste billeder baseret på et filter"
 
-#: src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Duplikér"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Lav en dublet af billedet"
 
-#: src/Resources.vala:290
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Eksportér …"
 
-#: src/Resources.vala:292
+#: src/Resources.vala:293
 msgid "_Print…"
 msgstr "_Udskriv …"
 
-#: src/Resources.vala:294
+#: src/Resources.vala:295
 msgid "Pu_blish…"
 msgstr "_Udgiv …"
 
-#: src/Resources.vala:296 ui/collection.ui:187
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Udgiv til forskellige hjemmesider"
 
-#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Redigér _titel …"
 
 #. Button label
-#: src/Resources.vala:300
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Redigér titel"
 
-#: 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
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
 msgstr "Redigér _kommentar …"
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Redigér kommentar"
 
-#: src/Resources.vala:306 ui/event.ui:588
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
 msgstr "Redigér kommentar til begivenhed …"
 
-#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
 msgstr "_Justér dato og tid …"
 
-#: src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Justér dato og tid"
 
-#: 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
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Tilføj _mærker …"
 
-#: src/Resources.vala:313 ui/photo_context.ui:17
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "_Tilføj mærker …"
 
 #. Dialog title
-#: src/Resources.vala:315
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Tilføj mærker"
 
-#: src/Resources.vala:324 ui/photo_context.ui:133
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
 msgstr "Send t_il …"
 
-#: src/Resources.vala:326
+#: src/Resources.vala:327
 msgid "_Find…"
 msgstr "_Find …"
 
-#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
 #: ui/trash.ui:312
 msgid "Find"
 msgstr "Find"
 
-#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
 #: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Find et billede ved at indtaste tekst som indgår i navnet eller mærkerne"
 
-#: src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Sæt flag på"
 
-#: src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "_Fjern flag"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Kan ikke starte redigeringsprogram: %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
 msgid "Add Tag “%s”"
-msgstr "Tilføj mærket \"%s\""
+msgstr "Tilføj mærket “%s”"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
 msgid "Add Tags “%s” and “%s”"
-msgstr "Tilføj mærkerne \"%s\" og \"%s\""
+msgstr "Tilføj mærkerne “%s” og “%s”"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Tilføj mærker"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
 msgid "_Delete Tag “%s”"
-msgstr "_Slet mærke \"%s\""
+msgstr "_Slet mærke “%s”"
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
 msgid "Delete Tag “%s”"
-msgstr "Slet mærke \"%s\""
+msgstr "Slet mærke “%s”"
 
-#: src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Slet mærke"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
 msgid "Re_name Tag “%s”…"
-msgstr "Om_døb mærke \"%s\" …"
+msgstr "Om_døb mærke “%s” …"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
 msgid "Rename Tag “%s” to “%s”"
-msgstr "Omdøb mærke \"%s\" til \"%s\""
+msgstr "Omdøb mærke “%s” til “%s”"
 
-#: src/Resources.vala:373 ui/tags.ui:454
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
 msgstr "_Omdøb …"
 
-#: 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
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "_Ændr mærker …"
 
-#: src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Ændr mærker"
 
-#: src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
-msgstr[0] "Mærk billede som \"%s\""
-msgstr[1] "Mærk billeder som \"%s\""
+msgstr[0] "Mærk billede som “%s”"
+msgstr[1] "Mærk billeder som “%s”"
 
-#: src/Resources.vala:385
+#: src/Resources.vala:386
 #, c-format
 msgid "Tag the selected photo as “%s”"
 msgid_plural "Tag the selected photos as “%s”"
-msgstr[0] "Mærk det valgte billede som \"%s\""
-msgstr[1] "Mærk de valgte billeder som \"%s\""
+msgstr[0] "Mærk det valgte billede som “%s”"
+msgstr[1] "Mærk de valgte billeder som “%s”"
 
-#: src/Resources.vala:391
+#: src/Resources.vala:392
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
-msgstr[0] "Fjern mærket \"%s\" fra _billedet"
-msgstr[1] "Fjern mærket \"%s\" fra _billederne"
+msgstr[0] "Fjern mærket “%s” fra _billedet"
+msgstr[1] "Fjern mærket “%s” fra _billederne"
 
-#: src/Resources.vala:397
+#: src/Resources.vala:398
 #, c-format
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
-msgstr[0] "Fjern mærket \"%s\" fra billedet"
-msgstr[1] "Fjern mærket \"%s\" fra billederne"
+msgstr[0] "Fjern mærket “%s” fra billedet"
+msgstr[1] "Fjern mærket “%s” fra billederne"
 
-#: src/Resources.vala:403
+#: src/Resources.vala:404
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
-msgstr "Kunne ikke omdøbe mærket til \"%s\", da mærket allerede findes."
+msgstr "Kunne ikke omdøbe mærket til “%s”, da mærket allerede findes."
 
-#: src/Resources.vala:407
+#: src/Resources.vala:408
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
-msgstr ""
-"Kunne ikke omdøbe søgningen til \"%s\", fordi søgningen allerede findes."
+msgstr "Kunne ikke omdøbe søgningen til “%s”, fordi søgningen allerede findes."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Gemt søgning"
 
-#: src/Resources.vala:412
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Slet søgning"
 
-#: src/Resources.vala:415 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Redigér …"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Omdøb …"
 
-#: src/Resources.vala:419
+#: src/Resources.vala:420
 #, c-format
 msgid "Rename Search “%s” to “%s”"
-msgstr "Omdøb søgning \"%s\" til \"%s\""
+msgstr "Omdøb søgning “%s” til “%s”"
 
-#: src/Resources.vala:423
+#: src/Resources.vala:424
 #, c-format
 msgid "Delete Search “%s”"
-msgstr "Slet søgningen \"%s\""
+msgstr "Slet søgningen “%s”"
 
-#: src/Resources.vala:560
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Bedøm %s"
 
-#: src/Resources.vala:561
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Angiv bedømmelse til %s"
 
-#: src/Resources.vala:562
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Angiver bedømmelse til %s"
 
-#: src/Resources.vala:564
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Vis %s"
 
-#: src/Resources.vala:565
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Vis kun billeder med en bedømmelse på %s"
 
-#: src/Resources.vala:566
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s eller bedre"
 
-#: src/Resources.vala:567
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Vis %s eller bedre"
 
-#: src/Resources.vala:568
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Vis kun billeder med en bedømmelse på %s eller bedre"
 
-#: src/Resources.vala:659 ui/trash.ui:255
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Fjern de valgte billeder fra papirkurven"
 
-#: src/Resources.vala:660 ui/offline.ui:221
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Fjern de valgte billeder fra biblioteket"
 
-#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Nulstil"
 
-#: src/Resources.vala:663 ui/trash.ui:270
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Flyt de valgte billeder tilbage til biblioteket"
 
-#: 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
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Vis i _filhåndteringen"
 
-#: src/Resources.vala:666
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Åbn mappen for det valgte billede i et filhåndteringsprogram"
 
-#: src/Resources.vala:669
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Kan ikke åbne i filhåndteringsprogram: %s"
 
-#: src/Resources.vala:672 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Fj_ern fra biblioteket"
 
-#: 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
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Flyt til papirkurven"
 
-#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: src/Resources.vala:677 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 "Vælg _alle"
 
-#: src/Resources.vala:677
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Vælg alle elementer"
 
@@ -5733,151 +5672,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b. %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Slideshow"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Gemte søgninger"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "indeholder"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "er nøjagtigt"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "begynder med"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "slutter med"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "er ikke sat"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "er sat"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "er"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "er ikke"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "et hvilket som helst billede"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "et raw-billede"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "en video"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "har"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "har ingen"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "modifikationer"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "interne modifikationer"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "eksterne modifikationer"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "med flag"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "uden flag"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "og højere"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "kun"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "og lavere"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "er efter"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "er før"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "er mellem"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "og"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Søgning"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Annullér"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "OK"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "enhver"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "alle"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "ingen"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Hvilken som helst tekst"
@@ -5914,8 +5825,8 @@ msgstr "Flagstatus"
 msgid "Photo state"
 msgstr "Billedtilstand"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Bedømmelse"
 
@@ -5923,27 +5834,35 @@ msgstr "Bedømmelse"
 msgid "Date"
 msgstr "Dato"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Gemte søgninger"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organisér dine gemte søgninger"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Bedømmelse ★+"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Bedømmelse ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Bedømmelse ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Bedømmelse ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Bedømmelse ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Fejl under indlæsning af brugerflade til søgebjælke: %s"
@@ -5953,72 +5872,72 @@ 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Luk"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Type"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Videoer"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW-billeder"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 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"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Opsætning"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Tilbage"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Gå til det forrige billede"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pause"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Sæt slideshow på pause"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Næste"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Gå til det næste billede"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Opsætning"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Ændr slideshowopsætning"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Alle billedkildefiler mangler."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Afspil"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Fortsæt slideshowet"
 
@@ -6030,7 +5949,7 @@ msgstr "Slideshowovergange"
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Ingen"
 
@@ -6038,51 +5957,51 @@ msgstr "Ingen"
 msgid "Random"
 msgstr "Tilfældig"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Mærker"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organisér og gennemse dine billeders mærker"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "unavngivet"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Eksportér videoer"
 
-#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
 msgid "Toggle _Flag"
 msgstr "Sæt/fjern _flag"
 
-#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
-#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Udvikler"
 
-#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
-msgid "Open with E_xternal Editor"
-msgstr "Åbn med e_ksternt redigeringsprogram"
-
-#: 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
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
 msgstr "Se begive_nhed for billede"
 
 #: 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
+#: ui/trash.ui:5
 msgid "_File"
 msgstr "_Fil"
 
-#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+#: ui/direct.ui:13
 msgid "Save _As…"
 msgstr "Gem _som …"
 
 #: 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
+#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "_Vis"
 
@@ -6098,7 +6017,7 @@ msgstr "Zoom _100 %"
 msgid "Zoom _200%"
 msgstr "Zoom _200 %"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Billede"
 
@@ -6114,21 +6033,21 @@ msgstr "_Næste billede"
 msgid "T_ools"
 msgstr "_Værktøjer"
 
-#: 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
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "O_ftest stillede spørgsmål"
 
-#: 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
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Rapportér et problem …"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Importér fra mappe …"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6202,22 +6121,16 @@ msgstr "_Stigende"
 msgid "D_escending"
 msgstr "_Faldende"
 
-#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
 msgid "Even_ts"
 msgstr "Be_givenheder"
 
-#: 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 "Fj_ern fra biblioteket"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Titler"
 
-#: 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
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "_Mærker"
 
@@ -6246,7 +6159,7 @@ msgstr "Efter _bedømmelse"
 msgid "_Descending"
 msgstr "_Faldende"
 
-#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
 msgid "_Photos"
 msgstr "_Billeder"
 
@@ -6254,198 +6167,368 @@ msgstr "_Billeder"
 msgid "_Stop Import"
 msgstr "_Stop import"
 
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "Angiv som skrivebordsbaggrund"
-
-#: 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: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:16
-msgid "Set as Desktop Slideshow"
-msgstr "Angiv som slideshow på skrivebord"
-
-#: 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:94
-msgid "period of time"
-msgstr "tidsrum"
-
-#: 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"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "hvid"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "sort"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Fremvisning"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Baggrund:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Importér billeder til:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "O_vervåg biblioteksmappe for nye filer"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Importerer"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Mappestruktur:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Eksempel:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "O_mdøb importerede filer til små bogstaver"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Skriv mærker, titler og anden _metadata til billedfiler"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW-udvikler"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "S_tandard:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "M_ønster:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Gennemsigtig baggrund:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Ternet"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Uigennemsigtig farve"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "E_ksternt billedbehandlingsprogram:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Ekstern _RAW editor:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Eksterne redigeringsprogrammer"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: ui/shotwell.ui:583
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell Præferancer"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Billedstørrelse for udskrift</b>"
 
-#: ui/shotwell.ui:600
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Brug en _standardstørrelse:"
 
-#: ui/shotwell.ui:643
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Brug en _tilpasset størrelse:"
 
-#: ui/shotwell.ui:731
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "in."
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Afbalancér dimensionsforhold for billede"
 
-#: ui/shotwell.ui:755
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Auto-størrelse:"
 
-#: ui/shotwell.ui:795
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Titler</b>"
 
-#: ui/shotwell.ui:812
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Udskriv billed_titel"
 
-#: ui/shotwell.ui:855
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Opløsning i billedpunkter</b>"
 
-#: ui/shotwell.ui:875
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Send billede til:"
 
-#: ui/shotwell.ui:909
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "billedpunkter per tomme"
 
-#: ui/shotwell.ui:949
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Søgning"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Annullér"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "OK"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "Søgningens _navn:"
 
-#: ui/shotwell.ui:1003
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "_Find tilsvarende"
 
-#: ui/shotwell.ui:1030
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "enhver"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "alle"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "ingen"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "af følgende:"
 
-#: ui/shotwell.ui:1111
-msgid "label"
-msgstr "etiket"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Angiv som skrivebordsbaggrund"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Anvend til skrivebordet"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Anvend til låseskærmen"
 
-#: ui/shotwell.ui:1262
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Angiv som slideshow på skrivebord"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Opret slideshow til skrivebordets baggrund"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Vis hvert billede i"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "tidsrum"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Det tidsrum som hvert billede vises i på skrivebordets baggrund"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nyt _mærke …"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Varighed:"
 
-#: ui/shotwell.ui:1276
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "_Overgangseffekt:"
 
-#: ui/shotwell.ui:1290
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Varighed af o_vergang:"
 
-#: ui/shotwell.ui:1300
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Vis t_itel"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekunder"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nyt _mærke …"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "etiket"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Slet alle billeder i papirkurven"
 
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Indtast bekræftelsestallet, der fremkommer efter du logger ind i Flickr i "
+#~ "din webbrowser."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Godkendelses_nummer:"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "“%s” er ikke et gyldigt svar på en forespørgsel om OAuth-godkendelse"
+
+#~ msgid "Width or height"
+#~ msgstr "Bredde eller højde"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Eksportér billeder/videoer"
+
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Åbn med e_ksternt redigeringsprogram"
+
+#~ msgid "R_emove from Library"
+#~ msgstr "Fj_ern fra biblioteket"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Velkommen til tjenesten til import af biblioteker for F-Spot.\n"
+#~ "\n"
+#~ "Vælg venligst et bibliotek som skal importeres, enten ved at vælge ét af "
+#~ "de eksisterende biblioteker, som Shotwell finder, eller ved at vælge en "
+#~ "anden F-Spot-databasefil."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Velkommen til tjenesten til import af biblioteker for F-Spot.\n"
+#~ "\n"
+#~ "Vælg venligst en F-Spot-databasefil."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Vælg manuelt en F-Spot-database som skal importeres:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Kan ikke åbne den valgte F-Spot-databasefil: filen findes ikke eller er "
+#~ "ikke en F-Spot-database"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Kan ikke åbne den valgte F-Spot-databasefil: denne version af F-Spot-"
+#~ "databasen understøttes ikke af Shotwell"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Kan ikke læse den valgte F-Spot-databasefil: fejl under læsning af "
+#~ "mærketabellen"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Kan ikke læse den valgte F-Spot-databasefil: fejl under læsning af "
+#~ "billedtabellen"
+
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell har fundet %d billeder i F-Spot-biblioteket og er i gang med at "
+#~ "importere dem. Dubletter vil automatisk blive opdaget og fjernet.\n"
+#~ "\n"
+#~ "Du kan lukke dette vindue og begynde at anvende Shotwell, mens importen "
+#~ "foregår i baggrunden."
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot-bibliotek: %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Forbereder import"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Kerne-tjenester til dataimport"
+
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "Tester forbindelse til Facebook …"
+
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Du har allerede logget ind og ud af Flickr i denne Shotwell-session.\n"
+#~ "For at udgive på Flickr igen så afslut og genstart Shotwell og prøv så at "
+#~ "udgive igen."
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "V_is album i offentlig galleri"
+
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Videoer vil blive vist i “%s”"
+
 #, fuzzy
 #~ msgid "A file required for publishing is unavailable. Publishing to "
 #~ msgstr ""
@@ -6469,7 +6552,7 @@ msgstr "Slet alle billeder i papirkurven"
 #~ msgstr "Afspil et diasshow"
 
 #~ msgid "Save Details..."
-#~ msgstr "Gem detaljer..."
+#~ msgstr "Gem detaljer …"
 
 #~ msgid "_Modify original files"
 #~ msgstr "_Modifiser originale filer"
@@ -6523,61 +6606,61 @@ msgstr "Slet alle billeder i papirkurven"
 #~ msgstr "Zoom billedet til 200 %"
 
 #~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Sæt som _Desktop Slideshow..."
+#~ msgstr "Sæt som _Desktop Slideshow …"
 
 #~ msgid "Re_name Event..."
-#~ msgstr "_Omdøb hændelse..."
+#~ msgstr "_Omdøb hændelse …"
 
 #~ msgid "_Export..."
-#~ msgstr "_Eksporterer..."
+#~ msgstr "_Eksporterer …"
 
 #~ msgid "Pu_blish..."
-#~ msgstr "Ud_giv..."
+#~ msgstr "Ud_giv …"
 
 #~ msgid "Edit _Title..."
-#~ msgstr "Redigér _title..."
+#~ msgstr "Redigér _title …"
 
 #~ msgid "Edit _Comment..."
-#~ msgstr "Redigér _kommentar..."
+#~ msgstr "Redigér _kommentar …"
 
 #~ msgid "Edit Event _Comment..."
-#~ msgstr "Redigér _kommentar for hændelse..."
+#~ msgstr "Redigér _kommentar for hændelse …"
 
 #~ msgid "_Adjust Date and Time..."
-#~ msgstr "_Juster dato og tid..."
+#~ msgstr "_Juster dato og tid …"
 
 #~ msgid "Add _Tags..."
-#~ msgstr "Tilføj _mærker..."
+#~ msgstr "Tilføj _mærker …"
 
 #~ msgid "_Add Tags..."
-#~ msgstr "_Tilføj mærker..."
+#~ msgstr "_Tilføj mærker …"
 
 #~ msgid "Send _To..."
-#~ msgstr "Send _til..."
+#~ msgstr "Send _til …"
 
 #~ msgid "Send T_o..."
-#~ msgstr "Send t_il..."
+#~ msgstr "Send t_il …"
 
 #~ msgid "_Find..."
-#~ msgstr "_Find..."
+#~ msgstr "_Find …"
 
 #~ msgid "Modif_y Tags..."
-#~ msgstr "_Ændre mærker..."
+#~ msgstr "_Ændre mærker …"
 
 #~ msgid "Tag Photos as \"%s\""
-#~ msgstr "Mærk billede som \"%s\""
+#~ msgstr "Mærk billede som “%s”"
 
 #~ msgid "Tag the selected photos as \"%s\""
-#~ msgstr "Mærk de udvalgte billeder som \"%s\""
+#~ msgstr "Mærk de udvalgte billeder som “%s”"
 
 #~ msgid "Remove Tag \"%s\" From _Photos"
-#~ msgstr "_Fjern mærke \"%s\" fra billeder"
+#~ msgstr "_Fjern mærke “%s” fra billeder"
 
 #~ msgid "Remove Tag \"%s\" From Photos"
-#~ msgstr "Fjern mærke \"%s\" fra billeder"
+#~ msgstr "Fjern mærke “%s” fra billeder"
 
 #~ msgid "_Edit..."
-#~ msgstr "R_edigér..."
+#~ msgstr "R_edigér …"
 
 #~ msgid "%-I:%M %p"
 #~ msgstr "%-H:%M"
@@ -6598,7 +6681,7 @@ msgstr "Slet alle billeder i papirkurven"
 #~ msgstr "Gem billede"
 
 #~ msgid "Save _As..."
-#~ msgstr "Gem _som..."
+#~ msgstr "Gem _som …"
 
 #~ msgid "Save photo with a different name"
 #~ msgstr "Gem billede med et andet navn"
@@ -6610,22 +6693,22 @@ msgstr "Slet alle billeder i papirkurven"
 #~ msgstr "Vis kommentaren for hver hændelse"
 
 #~ msgid "Importing..."
-#~ msgstr "Importerer..."
+#~ msgstr "Importerer …"
 
 #~ msgid "Stop importing photos"
 #~ msgstr "Stop importering af billeder"
 
 #~ msgid "Preparing to import..."
-#~ msgstr "Forbereder til at importere ..."
+#~ msgstr "Forbereder til at importere …"
 
 #~ msgid "_Import From Folder..."
-#~ msgstr "_Importer fra mappe..."
+#~ msgstr "_Importer fra mappe …"
 
 #~ msgid "Import photos from disk to library"
 #~ msgstr "Importer billeder fra harddisken til biblioteket"
 
 #~ msgid "Import From _Application..."
-#~ msgstr "Importér fra progr_am..."
+#~ msgstr "Importér fra progr_am …"
 
 #~ msgid "Find photos and videos by search criteria"
 #~ msgstr "Find fotos og videoer med søgekriterier"
@@ -6638,6 +6721,3 @@ msgstr "Slet alle billeder i papirkurven"
 
 #~ msgid "The selected photos were successfully published."
 #~ msgstr "De valgte billeder blev udgivet."
-
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Shotwell Præferancer"
diff --git a/po/de.gmo b/po/de.gmo
index 04ff944..23eb8ea 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index ab913bd..c899fdc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -38,26 +38,27 @@
 # Bernd Homuth <dev@hmt.im>, 2016.
 # Benedikt M. Thoma <gnome@thomba.net>, 2016.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2016.
+# Tim Sabsch <tim@sabsch.com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-04-04 13:55+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-27 16:59+0100\n"
+"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\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: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
@@ -102,16 +103,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "Die Shotwell-Entwickler"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fotoverwaltung"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Ihre Fotos organisieren"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -123,15 +124,15 @@ msgstr ""
 "Picasa;Youtube;Piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell Fotobetrachter"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Fotobetrachter"
 
@@ -161,7 +162,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Geheimer Token zum Signieren von OAuth-Anfragen"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "Standardgröße"
 
@@ -186,12 +187,12 @@ msgstr "Rajce-Adresse"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:41
 msgid "URL of the Rajce server."
-msgstr "Adresse des Rajce-Servers"
+msgstr "Adresse des Rajce-Servers."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "Benutzername"
 
@@ -208,7 +209,7 @@ msgid "user token, if remembered."
 msgstr "Benutzer-Token, falls gespeichert."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "Letzte Kategorie"
 
@@ -217,7 +218,7 @@ msgid "The last selected Rajce category."
 msgstr "Die zuletzt in Rajce ausgewählte Kategorie."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "Letzte Bildgröße"
 
@@ -257,11 +258,11 @@ msgstr ""
 "geöffnet werden soll."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "Sensible Informationen entfernen"
 
@@ -530,10 +531,27 @@ msgstr ""
 "soll."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "Hintergrund für transparente Bilder"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Der für transparente Bilder zu verwendende Hintergrund."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "Farbe für einfarbigen Transparenzhintergrund"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Die für transparente Bilder zu verwendende Hintergrundfarbe, wenn einfarbig."
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Auswahlstatus für »Bereits importierte Fotos verbergen«"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -541,29 +559,29 @@ msgstr ""
 "Der zuletzt verwendete Status der Option »Bereits importierte Fotos "
 "verbergen« der Importseite."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "Verzögerung"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Verzögerung des Bildwechsels in einer Diaschau (in Sekunden)."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "Übergangsverzögerung"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Die Dauer eines Übergangs zwischen Fotos (in Sekunden) in einer Diaschau"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "Übergangseffekt-Kennung"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -571,71 +589,71 @@ msgstr ""
 "Der Name des Übergangseffekts, der zwischen Fotos während einer Diaschau "
 "angewendet werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Titel anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 "Legt fest, ob der Titel einer Bildes in einer Diaschau angezeigt werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "Bibliotheksfenster maximieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Legt fest, ob das Bibliotheksfenster maximiert ist oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "Breite des Bibliotheksfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Die zuletzt gespeicherte Breite des Bibliotheksfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "Höhe des Bibliotheksfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Die zuletzt gespeicherte Höhe des Bibliotheksfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "Direktbearbeitungsfenster maximieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Legt fest, ob das Direktbearbeitungsfenster maximiert werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "Breite des Direktbearbeitungsfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr ""
 "Die zuletzt gespeicherte Breite des Direktbearbeitungsfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "Höhe des Direktbearbeitungsfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr ""
 "Die zuletzt gespeicherte Höhe des Direktbearbeitungsfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "Position des Seitenleistentrenners"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -643,30 +661,30 @@ msgstr ""
 "Die zuletzt gespeicherte Position des Trenners zwischen der Werkzeugleiste "
 "und der Ansicht im Bibliotheksfenster der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "Import-Ordner"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Ordner, in dem die importierten Fotodateien abgelegt werden."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "Bibliotheksordner auf neue Dateien überwachen"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Legt fest, ob die zum Bibliotheksordner hinzugefügten Dateien automatisch "
 "importiert werden sollen."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "Metadaten in Master-Dateien schreiben"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -674,11 +692,11 @@ msgstr ""
 "Legt fest, ob geänderte Metadaten (Stichworte, Titel usw.) in die Master-"
 "Datei geschrieben werden sollen."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "Dateinamen in Kleinschreibung"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -686,11 +704,11 @@ msgstr ""
 "Legt fest, ob Shotwell beim Import von Fotodateien alle Dateinamen in "
 "Kleinbuchstaben umwandeln soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "Muster für Ordnernamen"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -698,11 +716,11 @@ msgstr ""
 "Eine Zeichenkette, die als Namensmuster beim Benennen der importierten Foto-"
 "Ordner verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "Benutzerdefiniertes Muster für Ordnernamen"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -710,32 +728,32 @@ msgstr ""
 "Eine Zeichenkette, die als benutzerdefiniertes Namensmuster beim Benennen "
 "der importierten Foto-Ordner verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "Standard-RAW-Entwickler"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Vorgabe für den durch Shotwell zu verwendenden RAW-Entwickler."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 "Das im Menü am häufigsten ausgewählte Seitenverhältnis beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Ein Zahlencode, der das im Menü am häufigsten ausgewählte Seitenverhältnis "
 "beim Zuschneiden darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Erster Wert (Zähler) des am häufigsten verwendeten benutzerdefinierten "
 "Seitenverhältnisses beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -743,13 +761,13 @@ msgstr ""
 "Eine von Null verschiedene, positive Ganzzahl, die die zuletzt genutzte und "
 "gespeicherte Höhe des Zuschnittverhältnisses darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Zweiter Wert (Nenner) des am häufigsten verwendeten benutzerdefinierten "
 "Seitenverhältnisses beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -757,142 +775,142 @@ msgstr ""
 "Eine von Null verschiedene, positive Ganzzahl, die das zuletzt genutzte und "
 "gespeicherte Zuschnittverhältnis darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "Externer Foto-Editor"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Externe Anwendung zum Bearbeiten von Fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "Externer RAW-Editor"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Externe Anwendung zum Bearbeiten von RAW-Fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Einstellung im Exportdialog: Zuschneiden von Bildern"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "Metadaten exportieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Einstellung im Exportdialog: Option zum Exportieren von Metadaten"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "Formatierungseinstellung, spezieller Wert"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Einstellung im Exportdialog: Formatierungseinstellung, spezieller Wert"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "Formatierungseinstellung, Typwert"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Einstellung im Exportdialog: Formatierungseinstellung, Typwert"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "JPEG-Qualitätsoption"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Einstellung im Exportdialog: JPEG-Qualitätsoption"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "Maximale Bildgröße"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Einstellung im Exportdialog: Maximale Bildgröße"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "Zuletzt genutzter Veröffentlichungsdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Ein Zahlencode, der den letzten Dienst darstellt, bei dem Fotos "
 "veröffentlicht wurden"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "Standard-Veröffentlichungsdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "Zugriffs-Token"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "OAuth-Token für die aktuell laufende Facebook-Sitzung, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "Benutzerkennung"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "Benutzerkennung für die aktuell laufende Facebook-Sitzung, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "Benutzername"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Name des aktuell angemeldeten Facebook-Benutzers, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "Code für Standardgröße"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Facebook "
 "hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Facebook entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth-Token für die Zugriffsphase"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Authentifizierungs-Token für den aktuell angemeldeten Facebook-Benutzer, "
 "falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth-Token-Geheimnis für die Zugriffsphase"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -901,22 +919,22 @@ msgstr ""
 "Authentifizierungs-Token des zur Zeit angemeldeten Flickr-Benutzers "
 "verwendet wird, soweit vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Name des aktuell angemeldeten Flickr-Benutzers, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Flickr "
 "hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "Standard-Sichtbarkeit"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -924,19 +942,19 @@ msgstr ""
 "Ein Zahlencode, der die Standard-Sichtbarkeit für Fotos darstellt, die zu "
 "Flickr hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Flickr entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "Auffrischungs-Token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -944,7 +962,7 @@ msgstr ""
 "Der OAuth-Token, der beim Auffrischen der Picasa-Web-Album-Sitzung des "
 "aktuell angemeldeten Benutzers verwendet wird, soweit vorhanden."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -952,68 +970,68 @@ msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Picasa "
 "Webalben hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "Letztes Album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Der Name des letzten Albums, in dem der Benutzer Fotos veröffentlicht hat, "
 "falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Picasa entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo-Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
-msgstr "Adresse des Piwigo-Servers"
+msgstr "Adresse des Piwigo-Servers."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
-msgstr "Piwigo-Benutzername für die Anmeldung"
+msgstr "Piwigo-Benutzername für die Anmeldung."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "Passwort"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
-msgstr "Piwigo-Passwort für die Anmeldung"
+msgstr "Piwigo-Passwort für die Anmeldung."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "Passwort speichern"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr ""
 "Legt fest, ob das Piwigo-Passwort für weitere Anmeldungen gespeichert werden "
 "soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Die zuletzt in Piwigo ausgewählte Kategorie."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "Letzte Zugriffsstufe"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Die zuletzt gewählte Zugriffsstufe bei Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -1021,21 +1039,21 @@ msgstr ""
 "Ein Zahlencode, der die Größe des letzten Fotos darstellt, das zu Piwigo "
 "hochgeladen wurde."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Piwigo entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "Falls ein Titel und kein Kommentar gesetzt ist, den Titel als Kommentar beim "
 "Hochladen zu Piwigo verwenden"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -1043,11 +1061,11 @@ msgstr ""
 "Legt fest, ob beim Hochladen von Bildern zu Piwigo die Kommentare aus den "
 "Titeln erzeugt werden, sofern Titel, aber keine Kommentare festgelegt sind"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "Keine Stichworte zu Piwigo hochladen"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1056,46 +1074,46 @@ msgstr ""
 "werden sollen, so dass diese auf dem entfernten Piwigo-Server nicht "
 "erscheinen."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3-Benutzername"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API-Schlüssel"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3-API-Schlüssel"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3-Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Gallery3 entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "Skalierungsbeschränkung des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Die Kennung der Skalierungsbeschränkung des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "Pixel der Hauptachse des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1103,7 +1121,7 @@ msgstr ""
 "Pixel der Hauptachse des hochzuladenden Bildes. Dies wird nur verwendet, "
 "wenn scaling-constraint-id auf einen entsprechenden Wert gesetzt ist"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1111,32 +1129,32 @@ msgstr ""
 "Der OAuth-Token, der beim Auffrischen der YouTube-Sitzung des aktuell "
 "angemeldeten Benutzers verwendet wird, soweit vorhanden."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "Zuletzt verwendeter Importdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Ein Zahlencode, der den letzten Dienst darstellt, von dem Fotos importiert "
 "wurden"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "Cookie für Interpreter-Status"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Ein Zahlencode, der den Status der Plugin-Umgebung von GStreamer darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "Anordnungsmodus"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1144,35 +1162,35 @@ msgstr ""
 "Ein Zahlencode, der darstellt, wie Fotos auf dem Medium beim Druck "
 "angeordnet werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "PPI für den Inhalt"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Wert für Pixel pro Zoll (ppi), der an den Drucker gesendet werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "Breite des Inhalts"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Die Breite des Druckbereiches auf der Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "Höhe des Inhalts"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Die Höhe des Druckbereiches auf der Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "Einheiten für Inhalte"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1180,11 +1198,11 @@ msgstr ""
 "Ein Zahlencode, der die beim Drucken verwendete Maßeinheit (Zoll oder "
 "Millimeter) darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "Anzahl der Bilder pro Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1192,22 +1210,22 @@ msgstr ""
 "Ein Zahlencode, der den aktuell ausgewählten Bilder-pro-Seite-Modus beim "
 "Drucken darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "Größenauswahl"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Der Index der aktuellen Druckgröße aus einer vordefinierten Liste von "
 "Standardgrößen"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "Seitenverhältnis beibehalten"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1215,211 +1233,211 @@ msgstr ""
 "Legt fest, ob benutzerdefinierte Druckgrößen dem Seitenverhältnis des "
 "Originalfotos entsprechen müssen"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "Bildtitel drucken"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "Legt fest, ob der Bildtitel beim Drucken mit gedruckt werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "Titelschrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Der Name der Schrift, die beim Drucken für Bildtitel verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "Facebook-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Facebook-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "Flickr-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Flickr-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "Picasa-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Picasa-Webalben-Veröffentlichungs-Plugin aktiviert ist "
 "oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "Youtube-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Youtube-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "Piwigo-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Piwigo-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "Yandex-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Yandex.Fotki-Veröffentlichungs-Plugin aktiviert ist oder "
 "nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "Tumblr-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Tumblr-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "Rajce-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Rajce-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "Gallery3-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Gallery3-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "F-Spot-Import-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Legt fest, ob das F-Spot-Import-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "Zerfallen-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Zerfallen-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "Überblendung für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr "Legt fest, ob die Überbledung für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "Gleiten-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Gleiten-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "Uhr-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "Legt fest, ob der Uhr-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "Kreis-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "Kreis-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "Vorhang-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Vorhang-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "Quadrat-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Quadrat-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "Streifen-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Streifen-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "Schachbrett-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1456,24 +1474,7 @@ msgstr ""
 "Um weiterhin auf Facebook zu veröffentlichen, beenden Sie Shotwell, starten "
 "es neu und versuchen es dann erneut."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Geben Sie zur Bestätigung die Zahl ein, die nach der Anmeldung bei Flickr in "
-"Ihrem Webbrowser angezeigt wird."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Autorisierungsnummer:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "For_tsetzen"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1486,20 +1487,15 @@ msgstr ""
 "anzumelden. Sie müssen »Shotwell Connect« autorisieren, um sich mit Flickr "
 "zu verbinden."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Anmeldung wird vorbereitet …"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
-"Veröffentlichung auf Flickr ist nicht möglich."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Legitimierung für Flickr ist fehlgeschlagen"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Legitimierung wird bestätigt …"
 
@@ -1517,7 +1513,7 @@ msgstr ""
 "Um weitere Veröffentlichungen durchführen zu können, müssen Sie Shotwell "
 "schließen und erneut starten. Versuchen Sie es danach erneut."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1530,7 +1526,7 @@ msgstr ""
 "anzumelden. Sie müssen Shotwell Connect gestatten, sich mit Ihrem Konto bei "
 "Picasa Webalben zu verbinden."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1544,19 +1540,63 @@ msgstr ""
 "haben, um fortzufahren. Sie können die meisten Konten anlegen, indem Sie "
 "sich mindestens einmal auf der YouTube-Seite anmelden."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-Mail-Adresse"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Passwort"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Anmelden in"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Geben Sie den Benutzernamen und Ihr Passwort für das mit Tumblr verbundene "
+"Konto ein."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr ""
+"Benutzername und/oder Passwort sind ungültig. Bitte versuchen Sie es erneut"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Ungültiger Benutzername oder Passwort"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "UI konnte nicht geladen werden: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Die Shotwell-Webseite besuchen"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Christian Kirbach <Christian.Kirbach@gmail.com>\n"
 "Mario Blättermann <mario.blaettermann@gmail.com>\n"
-"Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>"
+"Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>\n"
+"Tim Sabsch <tim@sabsch.com>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
@@ -1564,7 +1604,7 @@ msgstr ""
 "Webseite."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1574,7 +1614,7 @@ msgstr ""
 "Ihres Rechners."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
@@ -1582,7 +1622,7 @@ msgstr ""
 "vertrauenswürdigen Organisation herausgegeben."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1590,7 +1630,7 @@ msgstr ""
 "werden. Sie könnte beschädigt sein."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1599,7 +1639,7 @@ msgstr ""
 "vertrauenswürdigen Organisation zurückgezogen, von der sie ausgegeben wurde."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1608,7 +1648,7 @@ msgstr ""
 "vertrauenswürdig, weil die Verschlüsselung zu schwach ist."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1617,110 +1657,13 @@ msgstr ""
 "in der Zukunft. Überprüfen Sie das Datum mithilfe des Kalenders Ihres "
 "Rechners."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 "Eine temporäre Datei, die für das Veröffentlichen benötigt wird, ist nicht "
 "verfügbar"
 
-# Ich würde lieber bei »Copyright« bleiben.
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Herzlich willkommen zum Importdienst für F-Spot-Bibliotheken.\n"
-"\n"
-"Bitte wählen Sie eine zu importierende Bibliothek, entweder durch das "
-"Auswählen einer von Shotwell automatisch erkannten Datenbank, oder durch ein "
-"manuelles Auswählen einer F-Spot-Datenbankdatei."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Herzlich Willkommen zum Importdienst für F-Spot-Bibliotheken.\n"
-"\n"
-"Bitte wählen Sie eine F-Spot-Datenbankdatei."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Manuell eine zu importierende F-Spot-Datenbank wählen:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Die ausgewählte F-Spot-Datenbank konnte nicht geöffnet werden: Diese Datei "
-"existiert nicht oder ist keine F-Spot-Datenbank."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Die ausgewählte F-Spot-Datenbank konnte nicht geöffnet werden: Diese "
-"Datenbankversion wird aktuell noch nicht unterstützt."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Beim Lesen der ausgewählten F-Spot-Datenbank trat ein Fehler auf: Die "
-"Tabelle »Tags« konnte nicht gelesen werden."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Beim Lesen der ausgewählten F-Spot-Datenbank trat ein Fehler auf: Die "
-"Tabelle »Fotos« konnte nicht gelesen werden."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell hat %d Fotos in der F-Spot-Datenbank gefunden und importiert diese "
-"zurzeit. Duplikate werden automatisch erkannt und entfernt.\n"
-"\n"
-"Sie können diesen Dialog schließen und Shotwell nun benutzen, während im "
-"Hintergrund noch der Import läuft."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot-Bibliothek: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Import wird vorbereitet"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Kerndaten-Importdienst"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3-Adresse:"
@@ -1738,7 +1681,7 @@ msgid "Go _Back"
 msgstr "_Zurück gehen"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Anmelden"
 
@@ -1773,7 +1716,7 @@ msgid "pixels"
 msgstr "Pixel"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1781,17 +1724,17 @@ msgstr "Ursprüngliche Größe"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Breite oder Höhe"
+msgid "Longest edge"
+msgstr "Längste Seite"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "A_bmelden"
@@ -1799,11 +1742,11 @@ msgstr "A_bmelden"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1904,31 +1847,11 @@ msgstr "Unbekannter Benutzer"
 msgid " Site Not Found"
 msgstr " Seite nicht gefunden"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_E-Mail-Adresse"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Passwort"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Dauerhaft _merken"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Anmelden in"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1982,85 +1905,10 @@ msgstr "Sie sind bei Rajce als %s angemeldet."
 msgid "Photos will appear in:"
 msgstr "Fotos werden erscheinen in:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Zusätzliche Shotwell-Veröffentlichungsdienste"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Bild_größe:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: 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:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 Pixel"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 Pixel"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr ""
-"»%s« ist keine gültige Antwort auf eine OAuth-Authentifizierungsanfrage"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): kann nicht gestartet werden; das Werkzeug zum "
-"Veröffentlichen ist nicht neu startbar."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Geben Sie den Benutzernamen und Ihr Passwort für das mit Tumblr verbundene "
-"Konto ein."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"Benutzername und/oder Passwort sind ungültig. Bitte versuchen Sie es erneut"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Ungültiger Benutzername oder Passwort"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "UI konnte nicht geladen werden: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Sie als %s bei Tumblr angemeldet.\n"
-"\n"
-
 # Ich nehme mir hier mal die Freiheit, die im Deutschen übliche Transkription der kyrillischen Schrift anstelle der englischen zu verwenden.
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2131,6 +1979,15 @@ msgstr ""
 "Ort, Kame_ra, und andere identifizierende Informationen vor dem Hochladen "
 "entfernen"
 
+# Ich würde lieber bei »Copyright« bleiben.
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2171,17 +2028,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Wo möchten Sie die ausgewählten Fotos veröffentlichen?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Nur mich"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Alle"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Bild_größe:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
+"Veröffentlichung auf Flickr ist nicht möglich."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2190,7 +2060,7 @@ msgstr ""
 "Sie sind bei Flickr als %s angemeldet.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2200,40 +2070,52 @@ msgstr ""
 "limitiert.\n"
 "Diesen Monat können Sie noch %s hochladen."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ihr Flickr-Pro-Konto erlaubt unbeschränkte Uploads."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Videos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotos und Videos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Nur Freunde und Familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Nur Familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Nur Freunde"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 Pixel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 Pixel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 Pixel"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 Pixel"
@@ -2285,7 +2167,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 Pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Ursprungsgröße"
 
@@ -2374,7 +2256,8 @@ msgid "Certificate of %s"
 msgstr "Zertifikat von %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2392,7 +2275,7 @@ msgid ""
 "entered"
 msgstr ""
 "Shotwell kann sich nicht mit Ihrer Piwigo-Fotobibliothek verbinden. Bitte "
-"überprüfen Sie Ihre angegebene Adresse."
+"überprüfen Sie Ihre angegebene Adresse"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
@@ -2426,10 +2309,38 @@ msgstr "Zertifikat anzeigen …"
 msgid "I understand, please _proceed."
 msgstr "Verstanden, bitte _fortfahren."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Standard-Veröffentlichungsdienste"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 Pixel"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): kann nicht gestartet werden; das Werkzeug zum "
+"Veröffentlichen ist nicht neu startbar."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Sie als %s bei Tumblr angemeldet.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Privatsphärenein_stellungen für Videos:"
@@ -2555,16 +2466,17 @@ msgstr "Werkzeugleiste immer geöffnet"
 msgid "Leave fullscreen"
 msgstr "Vollbild verlassen"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2577,27 +2489,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – »Aachen«"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Besuchen Sie die Shotwell-Internetseite"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Die Hilfe kann nicht angezeigt werden: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Zur Datenbank von Fehlerberichten kann nicht gewechselt werden: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Die oft gestellten Fragen können nicht angezeigt werden: %s"
@@ -2663,17 +2569,27 @@ msgstr "Defekte Bilddatei"
 msgid "Imported failed (%d)"
 msgstr "Import fehlgeschlagen (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kameras"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Liste aller erkannten Kameras"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2686,34 +2602,34 @@ msgstr ""
 "die Dateiverwaltung."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Bereits importierte Fotos verbergen"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Nur Fotos zeigen, die noch nicht importiert wurden"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "A_usgewählte importieren"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "_Alle importieren"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Die Kamera scheint leer zu sein. Es wurden keine Fotos oder Videos zum "
-"Importieren gefunden."
+"Importieren gefunden"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Keine neuen Fotos/Videos auf der Kamera gefunden"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2721,15 +2637,15 @@ msgstr ""
 "Shotwell muss die Kamera aus dem Dateisystem aushängen, um auf sie zugreifen "
 "zu können. Möchten Sie fortsetzen?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Aushängen"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Bitte hängen Sie die Kamera aus."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2739,12 +2655,12 @@ msgstr ""
 "die Kamera zugreifen, wenn sie frei ist. Bitte schließen Sie die andere "
 "Anwendung und versuchen Sie es nochmals."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr ""
 "Bitte schließen Sie alle anderen Anwendungen, die die Kamera verwenden."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2753,65 +2669,69 @@ msgstr ""
 "Es können keine Vorschaubilder von der Kamera abgerufen werden:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Aushängen läuft …"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Kamera wird verbunden, bitte warten …"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Import wird gestartet, bitte warten …"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Foto-Informationen werden abgerufen"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Vorschaubild für %s wird abgerufen"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kamera kann nicht reserviert werden: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Soll dieses Foto von der Kamera gelöscht werden?"
 msgstr[1] "Sollen diese %d Fotos von der Kamera gelöscht werden?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Soll dieses Video von der Kamera gelöscht werden?"
 msgstr[1] "Sollen diese %d Videos von der Kamera gelöscht werden?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Soll dieses Foto/Video von der Kamera gelöscht werden?"
 msgstr[1] "Sollen diese %d Fotos/Videos von der Kamera gelöscht werden?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Sollen diese Dateien von der Kamera gelöscht werden?"
 msgstr[1] "Sollen diese %d Dateien von der Kamera gelöscht werden?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Fotos/Videos werden von der Kamera entfernt"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2826,7 +2746,7 @@ msgid "_Print"
 msgstr "_Drucken"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Senden _an …"
 
@@ -2868,13 +2788,13 @@ msgid "Flip Verti_cally"
 msgstr "Verti_kal spiegeln"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Verbessern"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Zurück zum Original"
@@ -2891,12 +2811,13 @@ msgstr "Farbanpassungen _einfügen"
 msgid "Adjust Date and Time…"
 msgstr "Datum und Zeit anpassen …"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Mit e_xternem Editor öffnen"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Mit RA_W-Editor öffnen"
 
@@ -2904,43 +2825,39 @@ msgstr "Mit RA_W-Editor öffnen"
 msgid "_Play"
 msgstr "_Wiedergabe"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Foto/Video exportieren"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Foto/Video exportieren"
+msgstr[1] "Fotos/Videos exportieren"
 
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Fotos/Videos exportieren"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Foto exportieren"
+msgid_plural "Export Photos"
+msgstr[0] "Foto exportieren"
+msgstr[1] "Fotos exportieren"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Fotos exportieren"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Drehen läuft"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Drehen wird zurück genommen"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Horizontal spiegeln"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "»Horizontal spiegeln« wird zurück genommen"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Vertikal spiegeln"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "»Vertikal spiegeln« wird zurück genommen"
 
@@ -3154,21 +3071,21 @@ msgstr ""
 
 #: src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
-msgstr "Datenbank"
+msgstr "Datenbankdatei:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Import"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Importieren von Anwendung"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Importieren _von:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Schließen"
 
@@ -3238,9 +3155,9 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Dies wird das Stichwort »%s« von einem Foto entfernen. Fortsetzen?"
 msgstr[1] "Dies wird das Stichwort »%s« von %d Fotos entfernen. Fortsetzen?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Löschen"
@@ -3260,10 +3177,10 @@ msgid_plural ""
 "Shotwell"
 msgstr[0] ""
 "Durch das Wechseln des Entwicklers gehen alle Änderungen verloren, die Sie "
-"an diesem Foto in Shotwell vorgenommen haben."
+"an diesem Foto in Shotwell vorgenommen haben"
 msgstr[1] ""
 "Durch das Wechseln des Entwicklers gehen alle Änderungen verloren, die Sie "
-"an diesen Fotos in Shotwell vorgenommen haben."
+"an diesen Fotos in Shotwell vorgenommen haben"
 
 #: src/Dialogs.vala:40
 msgid "_Switch Developer"
@@ -3273,6 +3190,10 @@ msgstr "Entwickler _wechseln"
 msgid "Export Video"
 msgstr "Video exportieren"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Fotos exportieren"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3305,64 +3226,35 @@ msgstr ""
 "\n"
 "Möchten Sie mit dem Exportieren fortfahren?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Unverändert"
-
-# Bildformat
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Aktuelles"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Format:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Qualität:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Skalierungsbeschränkung:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Pixel:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "_Metadaten exportieren:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "For_tsetzen"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Details speichern …"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Details speichern"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(und %d andere)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Importergebnisse anzeigen"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "%d Datei zu importieren versucht."
 msgstr[1] "%d Dateien zu importieren versucht."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3372,30 +3264,30 @@ msgstr[1] "Davon wurden %d Dateien erfolgreich importiert."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikate von Fotos und Videos wurden nicht importiert:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "dupliziert bestehendes Medienelement"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotos/Videos wurden aufgrund von Kamera-Fehlern nicht importiert:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "Fehlermeldung:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Diese Dateien wurden nicht importiert, da Sie nicht als Foto oder Video "
@@ -3404,7 +3296,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3415,7 +3307,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3423,7 +3315,7 @@ msgstr ""
 "Dateien wurden nicht importiert, da Sie nicht in die Bibliothek kopiert "
 "werden konnten:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3435,7 +3327,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 "Fotos/Videos konnten nicht importiert werden, da die Dateien beschädigt sind:"
@@ -3443,32 +3335,32 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Foto/Videos wurden aus anderen Gründen nicht importiert:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 Duplikat des Fotos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate des Fotos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 Duplikat des Videos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate des Videos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 Duplikat des Fotos/Videos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate der Fotos/Videos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3478,7 +3370,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos konnten wegen Datei- oder Hardwarefehlern nicht importiert werden:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3489,7 +3381,7 @@ msgstr[1] ""
 "%d Videos konnten wegen Datei- oder Hardwarefehlern nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3501,7 +3393,7 @@ msgstr[1] ""
 "%d Fotos/Videos konnten wegen Datei- oder Hardwarefehlern nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3512,7 +3404,7 @@ msgstr[1] ""
 "%d Dateien konnten wegen eines Datei- oder Hardwarefehlers nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3526,7 +3418,7 @@ msgstr[1] ""
 "%d Fotos wurden nicht importiert, weil der Ordner der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3540,7 +3432,7 @@ msgstr[1] ""
 "%d Videos wurden nicht importiert, weil der Ordner mit der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3555,7 +3447,7 @@ msgstr[1] ""
 "%d Fotos/Videos wurden nicht importiert, weil der Ordner mit der Foto-"
 "Bibliothek schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3569,7 +3461,7 @@ msgstr[1] ""
 "%d Dateien wurden nicht importiert, weil der Ordner mit der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, 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"
@@ -3578,7 +3470,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3587,7 +3479,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Videos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3596,7 +3488,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos/Videos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3605,7 +3497,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Dateien konnte wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, 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"
@@ -3615,7 +3507,7 @@ msgstr[1] ""
 "%d Fotos konnten nicht importiert werden, weil die Dateien beschädigt "
 "waren:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, 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"
@@ -3624,7 +3516,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Videos konnten nicht importiert werden, weil die Datei beschädigt war:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3635,7 +3527,7 @@ msgstr[1] ""
 "%d Fotos/Videos konnten nicht importiert werden, weil die Datei beschädigt "
 "war:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3648,7 +3540,7 @@ msgstr[1] ""
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3657,56 +3549,56 @@ msgstr[1] "%d Fotos mit nicht unterstütztem Format wurden übersprungen:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Eine Nicht-Bilddatei wurde übersprungen.\n"
 msgstr[1] "%d Nicht-Bilddateien wurde übersprungen.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "Ein Foto wurde wegen Abbruchs durch den Benutzer übersprungen:\n"
 msgstr[1] "%d Fotos wurden wegen Abbruchs durch den Benutzer übersprungen:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "Ein Video wurde wegen Abbruchs durch den Benutzer übersprungen:\n"
 msgstr[1] "%d Videos wurden wegen Abbruchs durch den Benutzer übersprungen:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "Ein Foto/Video wegen Abbruchs durch den Benutzer übersprungen.\n"
 msgstr[1] "%d Fotos/Videos wegen Abbruchs durch den Benutzer übersprungen.\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "Eine Datei wegen Abbruchs durch den Benutzer übersprungen.\n"
 msgstr[1] "%d Dateien wegen Abbruchs durch den Benutzer übersprungen.\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "Ein Foto wurde erfolgreich importiert.\n"
 msgstr[1] "%d Fotos wurden erfolgreich importiert.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "Ein Video wurde erfolgreich importiert.\n"
 msgstr[1] "%d Videos wurden erfolgreich importiert.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3715,89 +3607,64 @@ msgstr[1] "%d Fotos/Videos wurden erfolgreich importiert.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Es wurden keine Fotos oder Videos importiert.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Import abgeschlossen"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d Sekunde"
-msgstr[1] "%d Sekunden"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d Minute"
-msgstr[1] "%d Minuten"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d Stunde"
-msgstr[1] "%d Stunden"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 Tag"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Ereignis umbenennen"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Name:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Titel bearbeiten"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Kommentar des Ereignisses bearbeiten"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Foto-/Video-Kommentar bearbeiten"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Datei entfernen und _löschen"
 msgstr[1] "Dateien entfernen und _löschen"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "Aus der Bibliothek _entfernen"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Externe Veränderung zurücknehmen?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Externe Veränderungen zurücknehmen?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3807,125 +3674,34 @@ msgstr[0] ""
 msgstr[1] ""
 "Dies wird alle Veränderungen der %d externen Dateien zerstören. Fortfahren?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "Externe _Veränderung zurücknehmen"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "Externe _Veränderungen zurücknehmen"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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] "Dies wird das Foto aus der Bibliothek entfernen. Fortsetzen?"
 msgstr[1] "Dies wird %d Fotos aus der Bibliothek entfernen. Fortsetzen?"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "Entfe_rnen"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Foto aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Fotos aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "Vormittag"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "Nachmittag"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 Stunden"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "Fotos/Videos um den gleichen Betrag _versetzen"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Zeit für _alle Fotos/Videos setzen"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "Originale Bilddatei _verändern"
-msgstr[1] "Originale Bilddateien _verändern"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "Originaldatei _bearbeiten"
-msgstr[1] "Originaldateien _bearbeiten"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Ursprüngliche Größe:"
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y, %I:%M:%S %p"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Aufnahmezeit wird um \n"
-"%d %s, %d %s, %d %s, und %d %s nach vorne verlegt."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Aufnahmezeit wird um \n"
-"%d %s, %d %s, %d %s, und %d %s nach hinten verlegt."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "Tag"
-msgstr[1] "Tage"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "Stunde"
-msgstr[1] "Stunden"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "Minute"
-msgstr[1] "Minuten"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "Sekunde"
-msgstr[1] "Sekunden"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3944,92 +3720,13 @@ msgstr[1] ""
 "\n"
 "und %d andere."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Stichworte (getrennt durch Kommata):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Willkommen!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Willkommen zu Shotwell!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "Importieren Sie zunächst Fotos auf eine der folgenden Arten:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr ""
-"Wählen Sie <span weight=\"bold\">Datei %s aus Ordner importieren</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Verschieben Sie Fotos per Ziehen und Ablegen in das Shotwell-Fenster"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "Verbinden Sie die Kamera mit Ihrem Rechner und importieren Sie"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "Fotos aus dem Ordner »%s« _importieren"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "Sie können Fotos auch auf eine der folgenden Weisen importieren:"
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr "Diese Meldung nicht noch einmal _zeigen"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Bilder aus der %s-Bibliothek importieren"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Hilfe)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Jahr%sMonat%sTag"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Jahr%sMonat"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Jahr%sMonat-Tag"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Jahr-Monat-Tag"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Ungültiges Muster"
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4037,31 +3734,31 @@ msgstr ""
 "Shotwell kann die Fotos aus dem Ordner in die Bibliothek kopieren oder sie "
 "können verknüpft werden, ohne sie zu kopieren."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Fotos ko_pieren"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Import durch Verknüpfen"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "In Bibliothek importieren"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Aus Bibliothek entfernen"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Foto wird aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Fotos werden aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4084,7 +3781,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4107,7 +3804,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4130,7 +3827,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4144,7 +3841,7 @@ msgstr[1] ""
 "löschen?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4184,6 +3881,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Das Foto %s kann nicht geöffnet werden. Entschuldigung."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -4210,206 +3908,436 @@ msgid "Save As"
 msgstr "Speichern unter"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "%s kann nicht überwacht werden, es ist kein Ordner (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "Vormittag"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "Nachmittag"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 Stunden"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "Fotos/Videos um den gleichen Betrag _versetzen"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Zeit für _alle Fotos/Videos setzen"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "Originale Bilddatei _verändern"
+msgstr[1] "Originale Bilddateien _verändern"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "Originaldatei _bearbeiten"
+msgstr[1] "Originaldateien _bearbeiten"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Ursprüngliche Größe: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y, %I:%M:%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Aufnahmezeit wird um \n"
+"%d %s, %d %s, %d %s, und %d %s nach vorne verlegt."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Aufnahmezeit wird um \n"
+"%d %s, %d %s, %d %s, und %d %s nach hinten verlegt."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Tag"
+msgstr[1] "Tage"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "Stunde"
+msgstr[1] "Stunden"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "Minute"
+msgstr[1] "Minuten"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "Sekunde"
+msgstr[1] "Sekunden"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Unverändert"
+
+# Bildformat
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Aktuelles"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Format:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Qualität:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Skalierungsbeschränkung:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Pixel:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "_Metadaten exportieren:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Hilfe)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Jahr%sMonat%sTag"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Jahr%sMonat"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Jahr%sMonat-Tag"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Jahr-Monat-Tag"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Ungültiges Muster"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d Sekunde"
+msgstr[1] "%d Sekunden"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d Stunde"
+msgstr[1] "%d Stunden"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 Tag"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Willkommen!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Willkommen zu Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Importieren Sie zunächst Fotos auf eine der folgenden Arten:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr ""
+"Wählen Sie <span weight=\"bold\">Datei %s aus Ordner importieren</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Verschieben Sie Fotos per Ziehen und Ablegen in das Shotwell-Fenster"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Verbinden Sie die Kamera mit Ihrem Rechner und importieren Sie"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "Fotos aus dem Ordner »%s« _importieren"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Sie können Fotos auch auf eine der folgenden Weisen importieren:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "Diese Meldung nicht noch einmal _zeigen"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Bilder aus der %s-Bibliothek importieren"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Zurück zu den aktuellen Fotoabmessungen"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Foto zuschneiden"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Ausschnittsformat zwischen Hoch- und Querformat wechseln"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Unbeschränkt"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Quadrat"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD-Video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD-Video (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Brieftasche (2 × 3 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notizzettel (3 × 5 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 Zoll"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 Zoll"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 Zoll"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "US-Letter (8.5 × 11 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 Zoll"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Boulevardblatt (11 × 17 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 Zoll"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrische Brieftasche (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postkarte (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Rote-Augen-Entferner schließen"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Rote-Augen-Effekt im ausgewählten Bereich beseitigen"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Zurücksetzen"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Belichtung:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Sättigung:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Farbton:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Schatten:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Spitzlichter:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Farben zurücksetzen"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Alle Farbanpassungen auf Ursprungswerte zurücksetzen"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Farbton"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Belichtung"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Schatten"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Spitzlichter"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Kontrastanhebung"
 
@@ -4422,25 +4350,21 @@ msgstr "Winkel:"
 msgid "_Straighten"
 msgstr "Au_srichten"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Ereignisse"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d Foto/Video"
 msgstr[1] "%d Fotos/Videos"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d Film"
 msgstr[1] "%d Filme"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4451,27 +4375,35 @@ msgstr[1] "%d Fotos"
 msgid "No Event"
 msgstr "Ereignislos"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Ereignisse"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Ihre Ereignisse durchsuchen"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Keine Ereignisse"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Keine Ereignisse gefunden"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Alle Ereignisse"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Nicht datiert"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4511,20 +4443,16 @@ msgstr "_Alle ersetzen"
 msgid "Export"
 msgstr "Exportieren"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Ordner"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Bibliothek"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Die Ordnerstruktur der Bibliothek durchsuchen"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Fotos"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Markiert"
 
@@ -4545,19 +4473,36 @@ msgstr "%s importiert"
 msgid "Last Import"
 msgstr "Letzter Import"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Bibliothek"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Ihre Fotos durchsuchen und organisieren"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotos"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Aus Ordner importieren"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Unterordner einbeziehen"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Papierkorb leeren"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Papierkorb wird geleert …"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4571,33 +4516,33 @@ msgstr ""
 "bearbeiten</span> zu ändern.\n"
 "Möchten Sie mit dem Importieren der Fotos fortfahren?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Speicherort der Bibliothek"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Aus diesem Ordner können keine Fotos importiert werden."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Bibliothek wird aktualisiert …"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Preparing to auto-import photos…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Fotos werden automatisch importiert …"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Metadaten werden in die Dateien geschrieben …"
 
@@ -4613,15 +4558,15 @@ msgstr "Löschen läuft …"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Der Papierkorb ist leer"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Fotos werden gelöscht"
 
@@ -4670,32 +4615,36 @@ msgstr "Unbekannter Fehler bei der Überprüfung von Shotwells Datenbank: %s"
 msgid "Loading Shotwell"
 msgstr "Shotwell wird geladen"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Pfad zu Shotwells Verwaltungsinformation"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "ORDNER"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Bibliotheksordner nicht laufend auf Veränderungen prüfen"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Fortschrittsbalken beim Start nicht anzeigen"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Versionsnummer anzeigen"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Anwendung im Vollbildmodus starten"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[DATEI]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4711,7 +4660,7 @@ msgstr "Überwachungsaktualisierungen können nicht verarbeitet werden: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Die Größe der Vorschaubilder anpassen"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4720,15 +4669,15 @@ msgstr ""
 "Shotwell konnte das ausgewählte Video nicht abspielen:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Keine Fotos/Videos"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Keine Fotos oder Videos gefunden, die auf den aktuellen Filter passen"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos können nicht in diesen Ordner exportiert werden."
 
@@ -4792,7 +4741,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "verändert"
 
@@ -4960,7 +4909,7 @@ msgstr "Copyright:"
 msgid "Software:"
 msgstr "Software:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Erweiterte Informationen"
 
@@ -5012,37 +4961,37 @@ msgstr "Konto-Information wird abgerufen …"
 msgid "Logging in…"
 msgstr "Anmelden …"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Fotos veröffentlichen"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Fotos veröffentlichen _auf:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Videos veröffentlichen"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
-msgstr "Videos veröffentlichen _auf:"
+msgstr "Videos veröffentlichen _auf"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Fotos und Videos veröffentlichen"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
-msgstr "Fotos und Videos veröffentlichen _auf:"
+msgstr "Fotos und Videos veröffentlichen _auf"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Veröffentlichen ist nicht möglich"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5088,9 +5037,10 @@ msgstr "Horizontal spiegeln"
 msgid "Flip Vertically"
 msgstr "Vertikal spiegeln"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Info"
 
@@ -5113,11 +5063,11 @@ msgstr "_Vor"
 msgid "Fulls_creen"
 msgstr "Bilds_chirmfüllend"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Hilfe"
@@ -5533,7 +5483,7 @@ msgid "Adjust Date and Time"
 msgstr "Datum und Zeit anpassen"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Stichwor_te hinzufügen …"
 
@@ -5626,7 +5576,7 @@ msgid "_Rename…"
 msgstr "_Umbenennen …"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Stichworte _ändern …"
 
@@ -5677,7 +5627,7 @@ msgstr ""
 "vorhanden ist."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Gespeicherte Suche"
 
@@ -5685,11 +5635,11 @@ msgstr "Gespeicherte Suche"
 msgid "Delete Search"
 msgstr "Suche löschen"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Bearbeiten …"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Umbenennen …"
 
@@ -5759,7 +5709,7 @@ msgstr "_Wiederherstellen"
 msgid "Move the selected photos back into the library"
 msgstr "Die ausgewählten Bilder zurück in die Bibliothek verschieben"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5776,7 +5726,8 @@ msgstr ""
 msgid "Unable to open in file manager: %s"
 msgstr "Speicherort konnte nicht in der Dateiverwaltung geöffnet werden: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Aus Bibliothek _entfernen"
 
@@ -5839,151 +5790,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b, %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Diaschau"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchen"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "enthält"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "entspricht genau"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "endet auf"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "ist nicht gesetzt"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "ist gesetzt"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "ist"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "ist nicht"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "ein beliebiges Foto"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "ein RAW-Foto"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "ein Video"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "hat"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "hat keine"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "Bearbeitungen"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "internen Bearbeitungen"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "externen Bearbeitungen"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "markiert"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "nicht markiert"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "und höher"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "nur"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "und niedriger"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "ist nach"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "ist vor"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "ist zwischen"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "und"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Suchen"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "OK"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "beliebig"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "alle"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "keine"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Beliebiger Text"
@@ -6020,8 +5943,8 @@ msgstr "Markierungsstatus"
 msgid "Photo state"
 msgstr "Status des Fotos"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Bewertung"
 
@@ -6029,27 +5952,35 @@ msgstr "Bewertung"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchen"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Ihre gespeicherten Suchvorgänge verwalten"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ Bewertung"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ Bewertung"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ Bewertung"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ Bewertung"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Bewertung"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Fehler beim Laden der UI-Datei der Suchzeile: %s"
@@ -6059,73 +5990,73 @@ msgstr "Fehler beim Laden der UI-Datei der Suchzeile: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Schließen"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Videos"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW-Fotos"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Eine gespeicherte Suche verwenden, um Objekte in der aktuellen Ansicht zu "
 "filtern"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Einstellungen"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Zurück"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Zum vorherigen Foto"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pause"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Diaschau pausieren"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Nächstes"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Zum nächsten Foto"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Diaschau konfigurieren"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Es gibt keine Foto-Quelldateien."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Diaschau fortsetzen"
 
@@ -6137,7 +6068,7 @@ msgstr "Diaschau-Übergänge"
 msgid "(None)"
 msgstr "(Keine)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Keine"
 
@@ -6145,16 +6076,20 @@ msgstr "Keine"
 msgid "Random"
 msgstr "Zufällig"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Stichworte"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Stichworte Ihrer Fotos durchsuchen und organisieren"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "unbenannt"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Videos exportieren"
 
@@ -6164,14 +6099,10 @@ msgid "Toggle _Flag"
 msgstr "Markierung _umschalten"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Entwickler"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Mit e_xternem Editor öffnen"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6221,21 +6152,21 @@ msgstr "_Nächstes Foto"
 msgid "T_ools"
 msgstr "_Werkzeuge"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "Oft gestellte _Fragen"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Ein Problem melden …"
 
 #: 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…"
+msgid "_Import From Folder…"
 msgstr "Aus Ordner _importieren …"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6313,17 +6244,12 @@ msgstr "A_bsteigend"
 msgid "Even_ts"
 msgstr "_Ereignisse"
 
-#: 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 "Aus Bibliothek _entfernen"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Titel"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "S_tichworte"
 
@@ -6360,204 +6286,261 @@ msgstr "_Fotos"
 msgid "_Stop Import"
 msgstr "Import _abbrechen"
 
-#: ui/printing_widget.ui:19
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Auflösung für Druck</b>"
-
-#: ui/printing_widget.ui:36
-msgid "Use a _standard size:"
-msgstr "_Standardgröße verwenden:"
-
-#: ui/printing_widget.ui:80
-msgid "Use a c_ustom size:"
-msgstr "_Angepasste Größe verwenden:"
-
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
-msgstr "Zoll"
-
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-msgid "cm"
-msgstr "cm"
-
-#: ui/printing_widget.ui:173
-msgid "_Match photo aspect ratio"
-msgstr "_Seitenverhältnis beibehalten"
-
-#: ui/printing_widget.ui:197
-msgid "_Autosize:"
-msgstr "_Automatische Größe:"
-
-#: ui/printing_widget.ui:237
-msgid "<b>Titles</b>"
-msgstr "<b>Titel</b>"
-
-#: ui/printing_widget.ui:254
-msgid "Print image _title"
-msgstr "Bild_titel drucken"
-
-#: ui/printing_widget.ui:297
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Auflösung</b>"
-
-#: ui/printing_widget.ui:317
-msgid "_Output photo at:"
-msgstr "_Foto ausgeben auf:"
-
-#: ui/printing_widget.ui:351
-msgid "pixels per inch"
-msgstr "Pixel pro Zoll"
-
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "Als Schreibtischhintergrund verwenden"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
-msgstr "Als Schreibtisch verwenden"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
-msgstr "Auf dem Sperrbildschirm verwenden"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr "Als Hintergrund-Bildvorführung setzen"
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr "Hintergrund-Bildvorführung erstellen"
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr "Jedes Foto anzeigen für"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr "Zeitintervall"
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "Wie lange soll jedes Foto als Hintergrundbild gezeigt werden?"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "weiß"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "schwarz"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Anzeige"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Fotos importieren nach:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "Bibliotheksordner auf neue Dateien _überwachen"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Importieren"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Ordnerstruktur:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "Namen von importierten Dateien in K_leinbuchstaben ändern"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Stichworte, Titel und andere _Metadaten in die Fotodateien schreiben"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW-Entwickler"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Vorgabe:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "_Muster:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Transparenter Hintergrund:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Schachbrettmuster"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Einfarbig"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "E_xterner Foto-Editor:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Externer _RAW-Editor:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Externe Editoren"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: ui/shotwell.ui:590
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell-Einstellungen"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Auflösung für Druck</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "_Standardgröße verwenden:"
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "_Angepasste Größe verwenden:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "Zoll"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "_Seitenverhältnis beibehalten"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "_Automatische Größe:"
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Titel</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Bild_titel drucken"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Auflösung</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "_Foto ausgeben auf:"
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "Pixel pro Zoll"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Suchen"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "OK"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "_Name der Suche:"
 
-#: ui/shotwell.ui:644
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "_Treffer finden"
 
-#: ui/shotwell.ui:671
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "beliebig"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "alle"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "keine"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "von den folgenden:"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "Beschriftung"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Als Schreibtischhintergrund verwenden"
 
-#: ui/shotwell.ui:903
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Als Schreibtisch verwenden"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Auf dem Sperrbildschirm verwenden"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Als Hintergrund-Bildvorführung setzen"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Hintergrund-Bildvorführung erstellen"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Jedes Foto anzeigen für"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "Zeitintervall"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Wie lange soll jedes Foto als Hintergrundbild gezeigt werden?"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Neues S_tichwort …"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Verzögerung:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "_Übergangseffekt:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Übergangsv_erzögerung:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "T_itel anzeigen"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "Sekunden"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Neues S_tichwort …"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "Beschriftung"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Alle Fotos im Papierkorb löschen"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Geben Sie zur Bestätigung die Zahl ein, die nach der Anmeldung bei Flickr "
+#~ "in Ihrem Webbrowser angezeigt wird."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Autorisierungsnummer:"
+
+#~ msgid "Width or height"
+#~ msgstr "Breite oder Höhe"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "»%s« ist keine gültige Antwort auf eine OAuth-Authentifizierungsanfrage"
diff --git a/po/es.gmo b/po/es.gmo
index 0c6b4a5..ea02923 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index c6b0df6..7fd7a83 100644
--- a/po/es.po
+++ b/po/es.po
@@ -23,15 +23,15 @@
 # 

 # 

 # 

-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2016.
, 2017.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-04-17 12:52+0200\n"
+"POT-Creation-Date: 2017-11-24 20:46+0000\n"
+"PO-Revision-Date: 2017-12-14 14:14+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -41,9 +41,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
 #: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
 #: ui/tags.ui:356
 msgid "Shotwell"
@@ -82,20 +82,19 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Shotwell soporta JPEG, PNG, TIFF, y varios formatos de archivos RAW."
 
 #: misc/shotwell.appdata.xml.in:52
-#| msgid "Shotwell Viewer"
 msgid "The Shotwell developers"
 msgstr "Los desarrolladores de Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Gestor de fotos"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organice sus fotos"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -107,15 +106,15 @@ msgstr ""
 "piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Visor de fotos Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Visor de fotos"
 
@@ -144,7 +143,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "El testigo secreto para firmar peticiones oauth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "tamaño predeterminado"
 
@@ -172,9 +171,9 @@ msgid "URL of the Rajce server."
 msgstr "URL del servidor Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -191,7 +190,7 @@ msgid "user token, if remembered."
 msgstr "testigo de usuario, si se recuerda."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "última categoría"
 
@@ -200,7 +199,7 @@ msgid "The last selected Rajce category."
 msgstr "La última categoría de Rajce seleccionada."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "último tamaño de foto"
 
@@ -240,11 +239,11 @@ msgstr ""
 "subir las fotos"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "eliminar contenido comprometido de las subidas"
 
@@ -506,10 +505,27 @@ msgid "A grayscale color for use as the background color."
 msgstr "La escala de color que usar como color de fondo."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "fondo para imágenes transparentes"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "El fondo que usar para imágenes transparentes."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "color para fondo de transparencia sólida"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Color que usar si el fondo para imágenes transparentes es un color sólido"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Estado de la selección de la opción «ocultar fotos»"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -517,30 +533,30 @@ msgstr ""
 "Último estado de selección usado de la opción «ocultar fotos ya importadas» "
 "en la página de importación."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "retardo"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Retardo (en segundos) entre fotos en la presentación de diapositivas."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "retraso de la transición"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "El tiempo (en segundos) que transcurre entre las fotos en una presentación "
 "de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "ID del efecto de transición"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -548,73 +564,73 @@ msgstr ""
 "El nombre del efecto de transición que se usará entre fotos al hacer una "
 "presentación"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Mostrar título"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 "Indica si se debe mostrar el título de una foto durante la presentación de "
 "diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maximizar ventana de biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 "Cierto si la aplicación de biblioteca está maximizada, falso en otro caso."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "anchura de la ventana de biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr ""
 "La última anchura guardada de la ventana de la aplicación de biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "altura de la ventana de biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr ""
 "La última altura guardada de la ventana de la aplicación de biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maximizar ventana de edición directa"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Cierto si la ventana de edición directa está maximizada, falso en otro caso."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "anchura de la ventana de edición directa"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "La última anchura guardada de la ventana de edición directa."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "altura de la ventana de edición directa"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "La última altura guardada de la ventana de edición directa."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "posición del divisor de la barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -622,30 +638,30 @@ msgstr ""
 "La última posición registrada del divisor entre la barra lateral y la vista "
 "de la ventana de la aplicación de la biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importar carpeta"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Carpeta en la que se guardan los archivos de fotos importadas."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "vigilar carpeta de biblioteca en busca de archivos nuevos"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Si es cierto si los archivos añadidos a la carpeta de la biblioteca se "
 "importan automáticamente."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "escribir metadatos en archivos maestros"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -653,11 +669,11 @@ msgstr ""
 "Si es cierto, los cambios en los metadatos (etiquetas, títulos, etc.) se "
 "escriben al archivo de foto maestro."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "usar nombres de archivos en minúscula"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -665,11 +681,11 @@ msgstr ""
 "Si es cierto, Shotwell convertirá todos los nombres de archivos en "
 "minúsculas cuando importe archivos de fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "patrón de carpetas"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -677,11 +693,11 @@ msgstr ""
 "Una cadena que codifica un patrón de nombre que se utilizará para nombrar "
 "las carpetas de fotos en la importación."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "Patrón de carpetas personalizadas"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -689,31 +705,31 @@ msgstr ""
 "Una cadena que codifica un patrón de nombre que se utilizará para nombrar "
 "las carpetas de fotos en la importación."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "desarrollador RAW predeterminado"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opción predeterminada que utilizará el desarrollador RAW Shotwell."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Elección más reciente del menú de relación de aspecto del recorte."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Un código numérico que representa la última elección del menú de recortar "
 "que hizo el usuario."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Numerador utilizado más recientemente de relación de aspecto del recorte "
 "personalizado."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -721,13 +737,13 @@ msgstr ""
 "Un número entero positivo no cero que representa el ancho de la última "
 "relación del recorte personalizado que el usuario introdujo."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Denominador utilizado más recientemente de relación de aspecto del recorte "
 "personalizado."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -735,134 +751,134 @@ msgstr ""
 "Un número entero positivo no cero que representa la altura de la última "
 "relación del recorte personalizado que el usuario introdujo."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "editor de fotos externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Aplicación externa usada para editar fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "editor RAW externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Aplicación externa usada para editar fotos RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: cómo recortar imágenes"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "exportar metadatos"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: opción para exportar "
 "metadatos"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "configuración de formato, valor especial"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: configuración de formato, "
 "valor especial"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "configuración de formato, valor de tipo"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: configuración de formato, "
 "valor de tipo"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Opción de calidad JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: opción de calidad JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "tamaño máximo de la imagen"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 "Configurando el cuadro de diálogo de exportación: tamaño máximo de la imagen"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "último servicio de publicación usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Un código numérico que representa el último servicio en el que se publicaron "
 "las fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "servicio de publicación predeterminado"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "testigo de acceso"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Testigo OAuth de Facebook para el usuario que ha iniciado sesión "
 "actualmente, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "ID de usuario"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "ID del usuario de Facebook que ha iniciado sesión actualmente, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "nombre de usuario"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr ""
 "El nombre del usuario que actualmente ha iniciado sesión en Facebook, si "
 "existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "código de tamaño predeterminado"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Un código numérico que representa el tamaño predeterminado de las fotos "
 "publicadas en Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -870,21 +886,21 @@ msgstr ""
 "Indica si se deben eliminar los metadatos antes de subir las imágenes a "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Fase de acceso de testigo OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "El testigo de autenticación para el usuario que actualmente ha iniciado "
 "sesión en Flickr, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Fase de acceso del testigo secreto OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -893,23 +909,23 @@ msgstr ""
 "autenticación para el usuario que actualmente ha iniciado sesión en Flickr, "
 "si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 "El nombre del usuario que actualmente ha iniciado sesión en Flickr, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Un código numérico que representa el tamaño predeterminado de las fotos "
 "publicadas en Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "visibilidad predeterminada"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -917,7 +933,7 @@ msgstr ""
 "Un código numérico que representa la visibilidad predeterminada de las fotos "
 "publicadas en Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
@@ -925,12 +941,12 @@ msgstr ""
 "Indica si se deben eliminar los metadatos antes de subir las imágenes a "
 "Flicrk"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "actualizar testigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -938,7 +954,7 @@ msgstr ""
 "El testigo OAuth utilizado para actualizar la sesión de álbumes web de "
 "Picasa para el usuario que actualmente ha iniciado sesión, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -946,18 +962,18 @@ msgstr ""
 "Un código numérico que representa el tamaño predeterminado de las fotos "
 "subidas a álbumes web Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "último álbum"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "El nombre del último álbum en el que el usuario publicó fotos, si existe"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
@@ -965,47 +981,47 @@ msgstr ""
 "Indica si se deben eliminar los metadatos antes de subir las imágenes a "
 "Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "URL de Pigwio"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "URL del servidor Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Nombre de usuario de Piwigo, si ha iniciado sesión."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "contraseña"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Contraseña de Piwigo, si ha iniciado sesión."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "recortar contraseña"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Si es cierto, recordar la contraseña de Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "La última categoría de Piwigo seleccionada."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "último nivel de permisos"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "El último nivel de privilegios elegido el Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -1013,7 +1029,7 @@ msgstr ""
 "Un código numérico que representa el último tamaño de foto predefinido usado "
 "para publicar en Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
@@ -1021,14 +1037,14 @@ msgstr ""
 "Indica si se deben eliminar los metadatos antes de subir las imágenes a "
 "Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "si se definió el titulo pero no un comentario, usar el título como "
 "comentario para las subidas a Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -1036,11 +1052,11 @@ msgstr ""
 "Indica si las imágenes que se vayan a subir a Piwigo deben tener un "
 "comentario a partir del título, si tiene, y no tiene comentario"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "no subir etiquetas al subir a Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1048,27 +1064,27 @@ msgstr ""
 "Indica si se deben eliminar las etiquetas antes de subir las imágenes a "
 "Piwigo, para que esas etiquetas no aparezcan en el servidor remoto de Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Nombre de usuario de Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "Clave de la API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Clave de la API de Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "URL de Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1076,19 +1092,19 @@ msgstr ""
 "Indica si se deben eliminar los metadatos antes de subir las imágenes a "
 "Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "restricción de escala de una foto subida"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "El ID de la restricción de escala de la foto que se subirá"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "píxeles del eje principal de la foto subida"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1096,7 +1112,7 @@ msgstr ""
 "Los píxeles del eje principal de la foto que se subirá; usados solo si el ID "
 "de la restricción de escala tiene un valor adecuado"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1104,33 +1120,33 @@ msgstr ""
 "El testigo OAuth usado para actualizar la sesión de Youtube para el usuario "
 "que ha iniciado sesión actualmente, si existe."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "último servicio de importación usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Un código numérico que representa el último servicio del que se importaron "
 "fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "cookie de estado del intérprete"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Un código numérico que captura el estado del entorno del complemento "
 "GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "modo de distribución del contenido"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1138,36 +1154,36 @@ msgstr ""
 "Un código numérico que representa cuántas fotos aparecen en la página al "
 "imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppp del contenido"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 "El número de píxeles por pulgada (ppp) enviado a la impresora al imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "anchura del contenido"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "La anchura de la emulsión impresa en la página al imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "altura del contenido"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "La altura de la emulsión impresa en la página al imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "unidades del contenido"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1175,11 +1191,11 @@ msgstr ""
 "Un código numérico que representa la unidad de medida (pulgadas o "
 "centímetros) usada al imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "código de imágenes por página"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1187,22 +1203,22 @@ msgstr ""
 "Un código numérico que representa el modo usado de imágenes por página "
 "seleccionadas actualmente al imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "tamaño de la selección"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "El índice del tamaño de impresión actual en una lista de tamaños estándar "
 "predefinidos"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "coincidir con relación de aspecto"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1210,11 +1226,11 @@ msgstr ""
 "Determina si los tamaños de impresión personalizados deben coincidir con la "
 "relación de aspecto de la fotografía original"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "imprimir títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1222,221 +1238,219 @@ msgstr ""
 "Cierto si se debe imprimir el título de la foto al imprimirla, falso en otro "
 "caso."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "tipografía de los títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "El nombre de la tipografía que usar cuando se imprimen los títulos."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "activar complemento de publicación en Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Facebook está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "activar complemento de publicación en Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Flickr está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "activar complemento de publicación en Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en álbumes web Picasa está activado, "
 "falso en otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "activar complemento de publicación en Youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Youtube está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "activar complemento de publicación en Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Piwigo está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "activar complemento de publicación en Yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Yandex.Fotki está activado, falso "
 "en otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "activar complemento de publicación en Tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Tumblr está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "activar complemento de publicación en Rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Rajce está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "activar complemento de publicación en Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de publicación en Gallery3 está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "activar complemento de importación de F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de importación de F-Spot está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "activar transición de desmenuzado del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de desmoronar está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "activar transición de fundido del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de fundido está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "activar transición lateral del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición lateral está activado, falso en otro "
 "caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "activar transición de reloj del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de reloj está activado, falso en otro "
 "caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "activar transición circular del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición circular está activado, falso en otro "
 "caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
-#| msgid "enable slideshow circle transition"
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "activar transición circular del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición en círculos está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
-#| msgid "enable slideshow slide transition"
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "activar transición de persianas del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de persianas está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "activar transición de cuadros del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de cuadros está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "activar transición de bandas del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Cierto si el complemento de transición de bandas está activado, falso en "
 "otro caso"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "activar transición de ajedrez del pase de diapositivas"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1472,24 +1486,7 @@ msgstr ""
 "Para seguir publicando en Facebook, cierre y reinicie Shotwell, e intente "
 "publicar de nuevo."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Introduzca el número de confirmación que aparece en su navegador web después "
-"de iniciar sesión en Flickr."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Número de autorización:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Con_tinuar"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1502,20 +1499,15 @@ msgstr ""
 "Tendrá que autorizar a Shotwell Connect para que se enlace a su cuenta de "
 "Flickr."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Preparándose para iniciar sesión…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Flickr no puede continuar."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Falló la autorización de Flickr"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Comprobando la autorización…"
 
@@ -1531,7 +1523,7 @@ msgstr ""
 "Para seguir publicando en servicios de Google, cierre y reinicie Shotwell, e "
 "intente publicar de nuevo."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1544,7 +1536,7 @@ msgstr ""
 "navegador web. Tendrá que autorizar a Shotwell Connect para que se enlace a "
 "su cuenta de Álbumes web de Picasa."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1559,11 +1551,52 @@ msgstr ""
 "el uso de su navegador para registrarse en el sitio de YouTube al menos una "
 "vez."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Dirección de correo _electrónico"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Contraseña"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Iniciando sesión…"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Nombre de usuario o contraseña no válidos"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "No se pudo cargar la IU: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Visite la página web de Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2016\n"
@@ -1574,7 +1607,7 @@ msgstr ""
 "José Luis Navarro <jlnavarro111@gmail.com>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
@@ -1582,7 +1615,7 @@ msgstr ""
 "diferente."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1591,7 +1624,7 @@ msgstr ""
 "confiar. Compruebe la fecha en el calendario de su equipo."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
@@ -1599,7 +1632,7 @@ msgstr ""
 "organización de confianza."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1607,7 +1640,7 @@ msgstr ""
 "dañada."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1616,7 +1649,7 @@ msgstr ""
 "de confianza que la emitió."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1625,7 +1658,7 @@ msgstr ""
 "un cifrado muy débil."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1633,107 +1666,11 @@ msgstr ""
 "⚫ La identificación de este sitio web sólo es válida para fechas futuras. "
 "Compruebe la fecha en el calendario de su equipo."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "No está disponible un archivo temporal necesario para la publicación"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Bienvenido/a al servicio de importación de F-Spot.\n"
-"\n"
-"Seleccione una colección a importar, ya sea eligiendo una de las colecciones "
-"existentes encontradas por Shotwell o eligiendo un archivo de base de datos "
-"de F-Spot alternativo."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Bienvenido/a al servicio de importación de colecciones de F-Spot.\n"
-"\n"
-"Seleccione un archivo de colección de F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Seleccionar manualmente una colección de F-Spot para importar:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe o "
-"no es un archivo de colección de F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-Spot "
-"no está soportada por Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de etiquetas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de fotos"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell encontró %d fotos en la colección de F-Spot y está importándolas "
-"ahora. Los duplicados se detectarán y eliminarán automáticamente.\n"
-"\n"
-"Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el proceso "
-"de importación ocurre en segundo plano."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Colección de F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Preparando para importar"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Servicios de importación de datos de núcleo"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL de _Gallery3:"
@@ -1751,7 +1688,7 @@ msgid "Go _Back"
 msgstr "A_trás"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:363
 msgid "_Log in"
 msgstr "Iniciar _sesión"
 
@@ -1784,7 +1721,7 @@ msgid "pixels"
 msgstr "píxeles"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1792,17 +1729,17 @@ msgstr "Tamaño original"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Anchura o altura"
+msgid "Longest edge"
+msgstr "Borde más largo"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "Cerrar _sesión"
@@ -1810,11 +1747,11 @@ msgstr "Cerrar _sesión"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1913,31 +1850,11 @@ msgstr "Usuario no reconocido"
 msgid " Site Not Found"
 msgstr " Sitio no encontrado"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "Dirección de correo _electrónico"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Contraseña"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Recordar"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Iniciando sesión…"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1990,82 +1907,10 @@ msgstr "Ha iniciado sesión en Rajce como %s."
 msgid "Photos will appear in:"
 msgstr "Las fotos aparecen en:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Servicios de publicación adicionales de Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "_Tamaño de la foto:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 × 375 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "«%s» no es una respuesta válida a una solicitud de autenticación OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): no puede iniciar, este publicador no es "
-"reiniciable."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Nombre de usuario o contraseña no válidos"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "No se pudo cargar la IU: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Tumblr como %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2133,6 +1978,14 @@ msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr "_Quitar ubicación, cámara y otra información antes de subir"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2173,17 +2026,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "¿Dónde quiere publicar las fotos seleccionadas?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Solo yo"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Todos"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Tamaño de la foto:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"No está disponible un archivo necesario para publicar. La publicación en "
+"Flickr no puede continuar."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2192,14 +2058,8 @@ msgstr ""
 "Ha iniciado sesión en Flickr como %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, 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 %s remaining in your upload quota."
@@ -2208,40 +2068,52 @@ msgstr ""
 "mes.\n"
 "Este mes le quedan %s de su límite de subida."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Su cuenta de Flickr Pro le permite subidas ilimitadas."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotos _visibles para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Vídeos _visibles para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotos y vídeos _visibles para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Solo amigos y familia"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Solo familia"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Solo amigos"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 píxeles"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 píxeles"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 píxeles"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 píxeles"
@@ -2255,7 +2127,6 @@ msgstr "_Tamaño de foto predefinido:"
 #. or the new "Default album" album for Google Photos
 #: plugins/shotwell-publishing/PicasaPublishing.vala:96
 #: plugins/shotwell-publishing/PicasaPublishing.vala:630
-#| msgid "last album"
 msgid "Default album"
 msgstr "Álbum predeterminado"
 
@@ -2294,7 +2165,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 píxeles)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Tamaño original"
 
@@ -2307,37 +2178,30 @@ msgid "User _name"
 msgstr "_Nombre de usuario"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
-#| msgid "_Remember Password"
 msgid "Remember Password"
 msgstr "_Recortar contraseña"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
-#| msgid "An _existing category:"
 msgid "An _existing category"
 msgstr "Una categoría _existente"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
-#| msgid "A _new album named:"
 msgid "A _new album named"
 msgstr "Un álbum _nuevo llamado:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
-#| msgid "within category:"
 msgid "within category"
 msgstr "en la categoría"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
-#| msgid "Album comment:"
 msgid "Album comment"
 msgstr "Comentario del álbum"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
-#| msgid "Photos will be _visible by:"
 msgid "Photos will be _visible by"
 msgstr "Las fotos serán _visibles para"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
-#| msgid "Photo size:"
 msgid "Photo size"
 msgstr "Tamaño de la foto"
 
@@ -2387,7 +2251,7 @@ msgid "Certificate of %s"
 msgstr "Certificado de %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -2439,10 +2303,38 @@ msgstr "Mostrar el certificado…"
 msgid "I understand, please _proceed."
 msgstr "Lo entiendo, _continuar."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Servicios de publicación"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 píxeles"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): no puede iniciar, este publicador no es "
+"reiniciable."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Ha iniciado sesión en Tumblr como %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Co_nfiguración de privacidad de vídeos:"
@@ -2567,16 +2459,16 @@ msgstr "Mantener abierta la barra de herramientas"
 msgid "Leave fullscreen"
 msgstr "Salir de pantalla completa"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 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:158
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2589,27 +2481,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – «Aachen»"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Visite la página web de Shotwell"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "No se puede mostrar la ayuda: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "No se pudo navegar en la base de datos de errores: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "No se pudieron mostrar las P+F: %s"
@@ -2675,17 +2561,28 @@ msgstr "Archivo de imagen dañado"
 msgid "Imported failed (%d)"
 msgstr "Fallo de importación (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Cámaras"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Lista de todos los dispositivos de cámara descubiertos"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
 #: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Cámara"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2698,32 +2595,32 @@ msgstr ""
 "de archivos."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Ocultar fotos ya importadas"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Mostrar solo las fotos que no han sido importadas"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importar _seleccionadas"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importar tod_as"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "La cámara parece estar vacía. No se han importado fotos/vídeos"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "No se encontraron fotos/vídeos en la cámara"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2731,15 +2628,15 @@ msgstr ""
 "Shotwell necesita desmontar la cámara del sistema de archivos con el fin de "
 "acceder a ella. ¿Continuar?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Desmonte la cámara."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2749,11 +2646,11 @@ msgstr ""
 "la cámara cuando está desbloqueada. Cierre cualquier otra aplicación que "
 "esté utilizando la cámara e inténtelo de nuevo."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Cierre cualquier otra aplicación que esté utilizando la cámara."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2762,65 +2659,69 @@ msgstr ""
 "No se pueden obtener previsualizaciones de la cámara:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Desmontando…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Conectando a la cámara, espere…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Iniciando la importación, espere un momento…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Obteniendo información de la foto"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obteniendo previsualización para %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "No se puede bloquear la cámara: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
 msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
 msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "¿Quiere eliminar esta foto/vídeo de la cámara?"
 msgstr[1] "¿Quiere eliminar estas %d fotos/vídeos de la cámara?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "¿Eliminar este archivo de la cámara?"
 msgstr[1] "¿Eliminar estos %d archivos de la cámara?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Mantener"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Eliminando fotos/vídeos de la cámara"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2834,7 +2735,7 @@ msgid "_Print"
 msgstr "_Imprimir"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "En_viar a…"
 
@@ -2848,7 +2749,6 @@ msgid "_Duplicate"
 msgstr "_Duplicar"
 
 #: src/CollectionPage.vala:100
-#| msgid "Fulls_creen"
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
@@ -2877,13 +2777,13 @@ msgid "Flip Verti_cally"
 msgstr "Voltear _verticalmente"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "M_ejorar"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Volver al original"
@@ -2897,11 +2797,11 @@ msgid "_Paste Color Adjustments"
 msgstr "_Pegar ajustes de color"
 
 #: src/CollectionPage.vala:135
-#| msgid "_Adjust Date and Time…"
 msgid "Adjust Date and Time…"
 msgstr "Ajustar fecha y hora…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
 msgid "Open With E_xternal Editor"
 msgstr "Abrir con editor e_xterno"
 
@@ -2914,43 +2814,39 @@ msgstr "Abrir con editor RA_W"
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Exportar foto o vídeo"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Exportar foto o vídeo"
+msgstr[1] "Exportar fotos o vídeos"
 
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Exportar fotos/vídeos"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Exportar foto"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Exportar fotos"
+msgid_plural "Export Photos"
+msgstr[0] "Exportar foto"
+msgstr[1] "Exportar fotos"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Girando"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Deshaciendo el giro"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Volteando horizontalmente"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Deshaciendo volteo horizontal"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Volteando verticalmente"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Deshaciendo volteo vertical"
 
@@ -3167,7 +3063,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Archivo de base de datos:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importar"
 
@@ -3179,8 +3075,8 @@ msgstr "Importar desde aplicación"
 msgid "Import media _from:"
 msgstr "Importar medios _desde:"
 
-#: src/data_imports/DataImportsUI.vala:414
-#: src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:416
+#: src/publishing/PublishingUI.vala:522
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -3250,7 +3146,7 @@ msgstr[1] "Esto eliminará la etiqueta «%s» de %d fotos. ¿Continuar?"
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Eliminar"
@@ -3282,6 +3178,10 @@ msgstr "_Cambiar de revelador"
 msgid "Export Video"
 msgstr "Exportar vídeo"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Exportar fotos"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3312,6 +3212,10 @@ msgstr ""
 "\n"
 "¿Quiere continuar la exportación?"
 
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Con_tinuar"
+
 #. "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."
@@ -3840,14 +3744,12 @@ msgid "Set _all photos/videos to this time"
 msgstr "Ajustar _todas las fotos y/o vídeos a esta hora"
 
 #: src/Dialogs.vala:1725
-#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "_Modificar archivo de foto original"
 msgstr[1] "_Modificar archivos de fotos originales"
 
 #: src/Dialogs.vala:1729
-#| msgid "_Modify original file"
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "_Modificar el archivo original"
@@ -3976,41 +3878,41 @@ msgstr "Importar fotos desde su colección %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(Ayuda)"
 
-#: src/Dialogs.vala:2346
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Año%sMes%sDía"
 
-#: src/Dialogs.vala:2348
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Año%sMes"
 
-#: src/Dialogs.vala:2350
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Año%sMes-Día"
 
-#: src/Dialogs.vala:2352
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Año-Mes-Día"
 
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Personalizado"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2590
+#: src/Dialogs.vala:2627
 msgid "Invalid pattern"
 msgstr "Patrón no válido"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4018,31 +3920,31 @@ msgstr ""
 "Shotwell puede copiar las fotos en su colección o puede importarlas sin "
 "copiarlas."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "C_opiar fotos"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "_Importar en el lugar"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Importar a la colección"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Quitar de la colección"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Quitando la foto de la colección"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
 msgstr "Quitando fotos de la colección"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:2763
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4065,7 +3967,7 @@ msgstr[1] ""
 "\n"
 "Esta acción no se puede deshacer."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:2767
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4088,7 +3990,7 @@ msgstr[1] ""
 "\n"
 "Esta acción no se puede deshacer."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:2771
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4111,7 +4013,7 @@ msgstr[1] ""
 "\n"
 "Esta acción no se puede deshacer."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:2803
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4125,7 +4027,7 @@ msgstr[1] ""
 "¿Eliminar estos archivos?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4191,207 +4093,207 @@ msgid "Save As"
 msgstr "Guardar como"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "No se puede monitorizar %s: No es un directorio (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Volver a las dimensiones actuales de la foto"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Establecer el corte para esta foto"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Girar el rectángulo de corte entre las orientaciones vertical y horizontal"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Sin restricciones"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Cuadrado"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Vídeo SD (4:3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Vídeo HD (16:9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Cartera (2 × 3 pulg.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Tarjeta de notas (3 × 5 pulg.)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 pulg."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 pulg."
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 pulg."
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Carta (8.5 × 11 pulg.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 pulg."
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloide (11 × 17 pulg.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 pulg."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Cartera métrica (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Tarjeta postal (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Cerrar la herramienta de ojos rojos"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Quitar cualquier efecto de ojos rojos en la región seleccionada"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Restablecer"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Exposición:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Contraste:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Saturación:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Matiz:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Sombras:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#: src/editing_tools/EditingTools.vala:2285
 msgid "Highlights:"
 msgstr "Resaltadas:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset Colors"
 msgstr "Restablecer colores"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset all color adjustments to original"
 msgstr "Restablecer todos los ajustes de color al original"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2700
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2712
 msgid "Tint"
 msgstr "Matiz"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2724
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2738
 msgid "Saturation"
 msgstr "Saturación"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2751
 msgid "Exposure"
 msgstr "Exposición"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2764
 msgid "Shadows"
 msgstr "Sombras"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2777
 msgid "Highlights"
 msgstr "Resaltadas"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2787
 msgid "Contrast Expansion"
 msgstr "Expansión de contraste"
 
@@ -4404,25 +4306,21 @@ msgstr "Ángulo:"
 msgid "_Straighten"
 msgstr "_Enderezar"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Eventos"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d foto/vídeo"
 msgstr[1] "%d fotos/vídeos"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 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:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4433,27 +4331,35 @@ msgstr[1] "%d fotos"
 msgid "No Event"
 msgstr "No hay eventos"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Eventos"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Explorar sus eventos"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "No hay eventos"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "No se encontraron eventos"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Todos los eventos"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Sin fecha"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4493,20 +4399,16 @@ msgstr "Reempla_zar todo"
 msgid "Export"
 msgstr "Exportar"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Carpetas"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Colección"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Explorar la estructura de carpetas de la biblioteca"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Fotos"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Marcada"
 
@@ -4527,19 +4429,37 @@ msgstr "Importada %s"
 msgid "Last Import"
 msgstr "Última importación"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Colección"
+
+#: src/library/LibraryBranch.vala:30
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Organizar y examinar sus fotos"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotos"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importar desde carpeta"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Entrar en subcarpetas"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Vaciar la papelera"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Vaciando la papelera…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4552,33 +4472,33 @@ msgstr ""
 "span>.\n"
 "¿Quiere seguir importando fotos?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Ubicación de la colección"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Las fotos no pueden importarse desde esta carpeta."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Actualizando la colección…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Preparando para importar fotos automáticamente…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Importando fotos automáticamente…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Escribiendo metadatos en los archivos…"
 
@@ -4594,15 +4514,15 @@ msgstr "Eliminando…"
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "La papelera está vacía"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Eliminando fotos"
 
@@ -4651,34 +4571,38 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr "Cargando Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Ruta a los datos privados de Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIRECTORIO"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 "No monitorear el directorio de la colección en tiempo de ejecución para "
 "buscar cambios"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "No mostrar medidor de progreso de inicio"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Mostrar la versión de la aplicación"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Iniciar la aplicación en modo de pantalla completa"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[ARCHIVO]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4694,7 +4618,7 @@ msgstr "No se pueden procesar las actualizaciones de la monitorización %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Ajustar el tamaño de las miniaturas"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4703,15 +4627,15 @@ msgstr ""
 "Shotwell no pudo reproducir el vídeo seleccionado:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "No hay fotos/vídeos"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "No se han encontrado fotos/vídeos que coincidan con el filtro actual"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "No se pueden exportar las fotos a este directorio."
 
@@ -4775,7 +4699,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "modificada"
 
@@ -4969,14 +4893,12 @@ msgstr ""
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
 #: src/publishing/PublishingUI.vala:104
-#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "El vídeo seleccionado se publicó correctamente."
 msgstr[1] "Los vídeos seleccionado se publicaron correctamente."
 
 #: 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] "La foto seleccionada se publicó correctamente."
@@ -4994,37 +4916,37 @@ msgstr "Obteniendo información de la cuenta…"
 msgid "Logging in…"
 msgstr "Iniciando sesión…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish Photos"
 msgstr "Publicar fotos"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish photos _to:"
 msgstr "Publicar fo_tos en:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish Videos"
 msgstr "Publicar vídeos"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish videos _to"
 msgstr "Publicar vídeos _en"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish Photos and Videos"
 msgstr "Publicar fotos y vídeos"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:202
 msgid "Publish photos and videos _to"
 msgstr "Publicar fotos y vídeos _en"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:412
 msgid "Unable to publish"
 msgstr "No se pudo publicar"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:413
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5654,7 +5576,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "No se pudo renombrar la búsqueda «%s» porque la búsqueda ya existe."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Búsqueda guardada"
 
@@ -5662,11 +5584,11 @@ msgstr "Búsqueda guardada"
 msgid "Delete Search"
 msgstr "Eliminar búsqueda"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Editar…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Re_nombrar…"
 
@@ -5736,7 +5658,7 @@ msgstr "_Restaurar"
 msgid "Move the selected photos back into the library"
 msgstr "Mover las fotos seleccionadas de vuelta a la colección"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5752,7 +5674,8 @@ msgstr "Abrir el directorio de la foto seleccionada en el gestor de archivos"
 msgid "Unable to open in file manager: %s"
 msgstr "No se puede abrir el gestor de archivos: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "_Quitar de la colección"
 
@@ -5816,14 +5739,10 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d de %b de %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Diapositivas"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
 #. Ordering must correspond with SearchConditionText.Context
 #: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
@@ -5997,8 +5916,8 @@ msgstr "Estado de la opción"
 msgid "Photo state"
 msgstr "Estado de la foto"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Puntuación"
 
@@ -6006,31 +5925,37 @@ msgstr "Puntuación"
 msgid "Date"
 msgstr "Fecha"
 
-#: src/SearchFilter.vala:815
-#| msgid "Rating"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: src/searches/SearchesBranch.vala:68
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Organizar sus búsquedas guardadas"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Puntuación ★+"
 
-#: src/SearchFilter.vala:818
-#| msgid "Rating"
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Puntuación ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Puntuación ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Puntuación ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Puntuación ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
-#| msgid "Error loading UI file %s: %s"
 msgid "Error loading search bar UI: %s"
 msgstr "Error al cargar la IU de la barra de búsqueda: %s"
 
@@ -6039,72 +5964,72 @@ msgstr "Error al cargar la IU de la barra de búsqueda: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Cerrar"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tipo"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Fotos RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Utilizar una búsqueda guardada para filtrar elementos en la vista actual"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Configuración"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Atrás"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Ir a la foto anterior"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pausar la presentación"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Ir a la siguiente foto"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Configuración"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Cambiar la configuración de la presentación"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Todos los archivos origen de fotos están perdidos."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Continuar la presentación"
 
@@ -6116,7 +6041,7 @@ msgstr "Transiciones de diapositiva"
 msgid "(None)"
 msgstr "(Ninguna)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Ninguna"
 
@@ -6124,16 +6049,21 @@ msgstr "Ninguna"
 msgid "Random"
 msgstr "Aleatorio"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Etiquetas"
 
+#: src/tags/TagsBranch.vala:131
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Organizar y examinar las etiquetas de sus fotos"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "sin título"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Exportar vídeos"
 
@@ -6147,12 +6077,6 @@ msgstr "Cambiar _opción"
 msgid "_Developer"
 msgstr "_Revelador"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115
-#: ui/photo.ui:360
-#| msgid "Open With E_xternal Editor"
-msgid "Open with E_xternal Editor"
-msgstr "Abrir con editor e_xterno"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6216,8 +6140,7 @@ msgstr "_Informar de un problema…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-#| msgid "_Import From Folder…"
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Importar desde carpeta…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6295,12 +6218,6 @@ msgstr "D_escendente"
 msgid "Even_ts"
 msgstr "Even_tos"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-#| msgid "R_emove From Library"
-msgid "R_emove from Library"
-msgstr "_Quitar de la colección"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Títulos"
@@ -6332,7 +6249,6 @@ msgstr "Por p_untuación"
 
 #: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
 #: ui/tags.ui:251
-#| msgid "D_escending"
 msgid "_Descending"
 msgstr "D_escendente"
 
@@ -6344,53 +6260,146 @@ msgstr "_Fotos"
 msgid "_Stop Import"
 msgstr "_Detener importación"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "blanco"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "negro"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Mostrar"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Fondo:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Importar fotos a:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Vigilar mi colección en busca de archivos nuevos"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Importando"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Estructura de _carpetas:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Ejemplo:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "R_enombrar los archivos importados a minúsculas"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr ""
+"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Revelador RAW"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "_Predeterminado:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Patrón:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Fondo transparente:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "A cuadros"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Color sólido"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "Editor de fotos e_xterno:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Editor _RAW externo:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Editores externos"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Preferencias de Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Tamaño de imagen impresa</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Utilizar un tamaño e_stándar:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Utilizar un tamaño p_ersonalizado:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "pulg."
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "E_mparejar relación de aspecto de la foto"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "Tamaño _automático:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Títulos</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Imprimir el _título de la imagen"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Resolución de píxeles</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Salida de foto en:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "píxeles por pulgada"
 
@@ -6398,11 +6407,11 @@ msgstr "píxeles por pulgada"
 msgid "Set as Desktop Background"
 msgstr "Establecer como fondo de escritorio"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Usar para el escritorio"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Usar para la pantalla de bloqueo"
 
@@ -6410,143 +6419,172 @@ msgstr "Usar para la pantalla de bloqueo"
 msgid "Set as Desktop Slideshow"
 msgstr "Establecer como pase de diapositivas de escritorio"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Generar un pase de diapositivas de fondo de escritorio"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Mostrar cada foto para"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "periodo de tiempo"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr "Cuánto tiempo se muestra cada foto en el fondo de escritorio"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "blanco"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "negro"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Mostrar"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Fondo:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Importar fotos a:"
-
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Vigilar mi colección en busca de archivos nuevos"
-
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Importando"
-
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Estructura de _carpetas:"
-
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Ejemplo:"
-
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "R_enombrar los archivos importados a minúsculas"
-
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metadatos"
-
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos"
-
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Revelador RAW"
-
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "_Predeterminado:"
-
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Patrón:"
-
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "Editor de fotos e_xterno:"
-
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Editor _RAW externo:"
-
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Editores externos"
-
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ui/shotwell.ui:590
+#: ui/shotwell.ui:22
 msgid "_Name of search:"
 msgstr "_Nombre de la búsqueda:"
 
-#: ui/shotwell.ui:644
+#: ui/shotwell.ui:76
 msgid "_Match"
 msgstr "_Coincidir"
 
-#: ui/shotwell.ui:671
+#: ui/shotwell.ui:103
 msgid "of the following:"
 msgstr "de los siguientes:"
 
-#: ui/shotwell.ui:752
+#: ui/shotwell.ui:184
 msgid "label"
 msgstr "etiqueta"
 
-#: ui/shotwell.ui:903
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "E_tiqueta nueva…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Retardo:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Efecto de _transición:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "R_etraso de transición:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Mostrar tít_ulo"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "segundos"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "E_tiqueta nueva…"
-
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Eliminar todas las fotos en la papelera"
 
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Introduzca el número de confirmación que aparece en su navegador web "
+#~ "después de iniciar sesión en Flickr."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Número de autorización:"
+
+#~ msgid "Width or height"
+#~ msgstr "Anchura o altura"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "«%s» no es una respuesta válida a una solicitud de autenticación OAuth"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Bienvenido/a al servicio de importación de F-Spot.\n"
+#~ "\n"
+#~ "Seleccione una colección a importar, ya sea eligiendo una de las "
+#~ "colecciones existentes encontradas por Shotwell o eligiendo un archivo de "
+#~ "base de datos de F-Spot alternativo."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Bienvenido/a al servicio de importación de colecciones de F-Spot.\n"
+#~ "\n"
+#~ "Seleccione un archivo de colección de F-Spot."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Seleccionar manualmente una colección de F-Spot para importar:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe "
+#~ "o no es un archivo de colección de F-Spot"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-"
+#~ "Spot no está soportada por Shotwell"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "No se puede abrir el archivo seleccionado de F-Spot: error al leer la "
+#~ "tabla de etiquetas"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "No se puede abrir el archivo seleccionado de F-Spot: error al leer la "
+#~ "tabla de fotos"
+
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell encontró %d fotos en la colección de F-Spot y está importándolas "
+#~ "ahora. Los duplicados se detectarán y eliminarán automáticamente.\n"
+#~ "\n"
+#~ "Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el "
+#~ "proceso de importación ocurre en segundo plano."
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Colección de F-Spot: %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Preparando para importar"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Servicios de importación de datos de núcleo"
+
+#~ msgid "%s – “Aachen”"
+#~ msgstr "%s – «Aachen»"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Exportar fotos/vídeos"
+
+#~| msgid "Open With E_xternal Editor"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Abrir con editor e_xterno"
+
+#~| msgid "R_emove From Library"
+#~ msgid "R_emove from Library"
+#~ msgstr "_Quitar de la colección"
+
 #~| msgid "Testing connection to Facebook..."
 #~ msgid "Testing connection to Facebook…"
 #~ msgstr "Comprobando la conexión a Facebook…"
@@ -6694,9 +6732,6 @@ msgstr "Eliminar todas las fotos en la papelera"
 #~ msgid "RAW photos"
 #~ msgstr "Fotos RAW"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Preferencias de Shotwell"
-
 #, fuzzy
 #~| msgid "Tag Photos as \"%s\""
 #~ msgid "Tag Photos as “%s”"
diff --git a/po/fi.gmo b/po/fi.gmo
index 8712852..0eb2046 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 4a10d7f..0c84ea0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-02-21 22:03+0000\n"
-"PO-Revision-Date: 2017-02-22 20:49+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-10 19:57+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -29,18 +29,17 @@ msgstr ""
 "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.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: 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
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
 #: misc/shotwell.appdata.xml.in:9
-#| msgid "Photo Manager"
 msgid "Popular photo manager"
 msgstr "Suosittu sovellus valokuvien hallintaan"
 
@@ -53,33 +52,43 @@ msgid ""
 "Shotwell’s non-destructive photo editor does not alter your master photos, "
 "making it easy to experiment and correct errors."
 msgstr ""
+"Shotwell on helppokäyttöinen ja nopea sovellus kuvien hallintaan. Sen avulla "
+"voit tuoda kuvasi esimerkiksi kamerasta, kiintolevyltä tai muistitikulta, ja "
+"hallita kuvia useiden eri ominaisuuksien perusteella. Sovellus tarjoaa myös "
+"kuvien perusmuokkaustoiminnot, kuten rajauksen, punasilmäisyyden korjauksen, "
+"värisäätimet ja suoristuksen. Shotwellin kuvamuokkain ei tee "
+"peruuttamattomia muutoksia alkuperäisiin kuviin, joten erilaiset kokeilut "
+"kuvilla ja palaaminen aiempaan tilaan on vaivatonta."
 
 #: misc/shotwell.appdata.xml.in:18
 msgid ""
 "When ready, Shotwell can upload your photos to various web sites, such as "
 "Facebook, Flickr, Picasa (Google Plus), and more."
 msgstr ""
+"Kun kuva on julkaisuvalmis, Shotwell voi lähettää kuvasi useisiin "
+"verkkopalveluihin kuten Facebookiin, Flickriin, Picasaan (Google+) ja moniin "
+"muihin eri palveluihin."
 
 #: misc/shotwell.appdata.xml.in:22
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr ""
+"Shotwell tukee useita kuvamuotoja: JPEG, PNG, TIFF ja monet RAW-"
+"tiedostomuodot."
 
 #: misc/shotwell.appdata.xml.in:52
-#| msgid "Set Developer"
 msgid "The Shotwell developers"
 msgstr "Shotwell-kehittäjät"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Valokuvien hallinta"
 
-#: misc/shotwell.desktop.in.in:6
-#| msgid "any photo"
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Hallitse kuviasi"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -87,17 +96,15 @@ msgid ""
 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"
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
-#| msgid "Photo Viewer"
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell-katselin"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Valokuvien katselin"
 
@@ -126,9 +133,9 @@ msgid "The secret token to sign oauth requests"
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
-msgstr ""
+msgstr "oletuskoko"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:27
 msgid ""
@@ -149,19 +156,18 @@ msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:41
 msgid "URL of the Rajce server."
-msgstr ""
+msgstr "Rajce-palvelimen URL."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "käyttäjätunnus"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:47
 msgid "Rajce username, if logged in."
-msgstr ""
+msgstr "Rajce-käyttäjätunnus, jos kirjautuneena."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:52
 msgid "token"
@@ -172,7 +178,7 @@ msgid "user token, if remembered."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 #, fuzzy
 #| msgid "An _existing category:"
 msgid "last category"
@@ -183,7 +189,7 @@ msgid "The last selected Rajce category."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 #, fuzzy
 #| msgid "Photo size:"
 msgid "last photo size"
@@ -196,7 +202,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:70
-#| msgid "_Remember"
 msgid "remember"
 msgstr "muista"
 
@@ -205,7 +210,6 @@ msgid "If true, remember last login."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:76
-#| msgid "_Hide album"
 msgid "hide album"
 msgstr "piilota albumi"
 
@@ -214,10 +218,8 @@ msgid "If true, hide the newly created Rajce album."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:82
-#, fuzzy
-#| msgid "Open target _album in browser"
 msgid "open album in web browser"
-msgstr "A_vaa kohdealbumi selaimessa"
+msgstr "avaa albumi verkkoselaimessa"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:83
 msgid ""
@@ -225,11 +227,11 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr ""
 
@@ -248,10 +250,8 @@ msgid "True if the basic properties pane is to be displayed, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:29
-#, fuzzy
-#| msgid "Display extended information for the selection"
 msgid "display extended properties"
-msgstr "Näytä lisätiedot valinnasta"
+msgstr "näytä laajennetut ominaisuudet"
 
 #: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
@@ -259,7 +259,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:35
-#| msgid "Display the sidebar"
 msgid "display sidebar"
 msgstr "näytä sivupalkki"
 
@@ -268,7 +267,6 @@ msgid "True if the sidebar is to be displayed, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:41
-#| msgid "Display the sidebar"
 msgid "display toolbar"
 msgstr "näytä työkalupalkki"
 
@@ -277,7 +275,6 @@ msgid "True if the bottom toolbar is to be displayed, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:47
-#| msgid "Display the search bar"
 msgid "display search bar"
 msgstr "näytä hakupalkki"
 
@@ -286,7 +283,6 @@ msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:53
-#| msgid "Display each photo's tags"
 msgid "display photo titles"
 msgstr "näytä kuvien nimet"
 
@@ -297,7 +293,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:59
-#| msgid "Display each photo's tags"
 msgid "display photo comments"
 msgstr "näytä kuvan tunnisteet"
 
@@ -308,7 +303,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:65
-#| msgid "Edit Event Comment"
 msgid "display event comments"
 msgstr "näytä tapahtuman kommentit"
 
@@ -319,7 +313,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:71
-#| msgid "Display each photo's tags"
 msgid "display photo tags"
 msgstr "näytä kuvien tunnisteet"
 
@@ -330,7 +323,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:77
-#| msgid "Display each photo's rating"
 msgid "display photo ratings"
 msgstr "näytä kuvien arvostelut"
 
@@ -443,13 +435,12 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:143
-#| msgid "Library Location"
 msgid "sidebar position"
 msgstr "sivupalkin sijainti"
 
 #: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
-msgstr ""
+msgstr "Sivupalkin leveys pikseleissä"
 
 #: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
@@ -470,7 +461,6 @@ msgid "Pin toolbar in fullscreen, or not."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:161
-#| msgid "_Background:"
 msgid "background color"
 msgstr "taustaväri"
 
@@ -479,473 +469,479 @@ msgid "A grayscale color for use as the background color."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "tausta läpinäkyville kuville"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:175
-#| msgid "_Delay:"
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "viive"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
-msgstr ""
+msgstr "Viive (sekunneissa) kuvien välillä diaesityksessä."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
-#| msgid "Transition d_elay:"
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "siirtymän viive"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 #, fuzzy
 #| msgid "_Transition effect:"
 msgid "transition effect id"
 msgstr "_Siirtymän tehoste:"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:193
-#| msgid "Show t_itle"
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Näytä nimi"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
-msgstr ""
+msgstr "suurenna kirjastoikkuna"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
-msgstr ""
+msgstr "kirjastoikkunan leveys"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
-msgstr ""
+msgstr "kirjastoikkunan korkeus"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 #, fuzzy
 #| msgid "Import to Library"
 msgid "import directory"
 msgstr "Tuo kirjastoon"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 #, fuzzy
 #| msgid "_Watch library directory for new files"
 msgid "watch library directory for new files"
 msgstr "_Tarkkaile kirjastoa uusien tiedostojen varalta"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 #, fuzzy
 #| msgid "Writing metadata to files..."
 msgid "write metadata to master files"
 msgstr "Kirjoitetaan metadataa tiedostoihin..."
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 #, fuzzy
 #| msgid "_Directory structure:"
 msgid "directory pattern"
 msgstr "_Kansiorakenne:"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 #, fuzzy
 #| msgid "RAW Developer"
 msgid "RAW developer default"
 msgstr "RAW-kehitin"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:307
-#| msgid "E_xternal photo editor:"
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "ulkoinen kuvamuokkain"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:313
-#| msgid "External _RAW editor:"
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "ulkoinen raw-muokkain"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 #, fuzzy
 #| msgid "Export metadata"
 msgid "export metadata"
 msgstr "Vie metatiedot"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "JPEG-laatuvalinta"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
-msgstr ""
+msgstr "kuvan enimmäiskoko"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:390
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "viimeksi käytetty julkaisupalvelu"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:396
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "oletusarvoinen julkaisupalvelu"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 #, fuzzy
 #| msgid "Access _type:"
 msgid "access token"
 msgstr "Pääsy_tyyppi:"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:422
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "käyttäjätunnus"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 #, fuzzy
 #| msgid "You are not currently logged into Yandex.Fotki."
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Et ole kirjautuneena palveluun Yandex.Fotki."
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "oletusnäkyvyys"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "viimeisin albumi"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo-osoite"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Piwigo-palvelimen osoite."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
-msgstr ""
+msgstr "Piwigo-käyttäjätunnus, jos kirjautuneena."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
-#| msgid "_Password"
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "salasana"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
-msgstr ""
+msgstr "Piwigo-salasana, jos kirjautuneena."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
-#| msgid "_Remember Password"
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "muista salasana"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Jos tosi, muista Piwigo-salasana."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 #, fuzzy
 #| msgid "_If a title is set and comment unset, use title as comment"
 msgid ""
@@ -953,377 +949,374 @@ msgid ""
 msgstr ""
 "_Jos nimi on asetettu ja kommentti asettamatta, käytä nimeä kommenttina"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 msgid ""
 "Whether images being uploaded to Piwigo should have their tags removed on "
 "upload, such that these tags will not appear on the remote Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:569
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3-käyttäjätunnus"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
-#| msgid "API _Key:"
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API-avain"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3:n API-avain"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Osoite"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3-sivun osoite"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "viimeisin tuontipalvelu"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 #, fuzzy
 #| msgid "_Contents"
 msgid "content ppi"
 msgstr "_Sisältö"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
-msgstr ""
+msgstr "sisällön leveys"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 #, fuzzy
 #| msgid "Rotate Right"
 msgid "content height"
 msgstr "Kierrä oikealle"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:660
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "sisältöyksiköt"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 #, fuzzy
 #| msgid "2 images per page"
 msgid "images per page code"
 msgstr "2 kuvaa sivulla"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "koon valinta"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:678
-#| msgid "_Match photo aspect ratio"
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "vastaa kuvasuhdetta"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:684
-#| msgid "Print image _title"
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "tulosta nimet"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "nimissä käytettävä fontti"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:702
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "käytä facebook-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "käytä flickr-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "käytä picassa-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:720
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "käytä youtube-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:726
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "käytä piwigo-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "käytä yandex-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:738
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "käytä tumblr-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:744
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "käytä rajce-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:750
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "käytä gallery3-julkaisulaajennusta"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow crumble transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow fade transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:786
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow slide transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow clock transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:798
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circle transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:804
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow circles transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:810
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow blinds transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow squares transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow stripes transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow chess transition"
 msgstr "Keskeiset diaesityssiirtymät"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1364,23 +1357,7 @@ msgstr ""
 "aikana.\n"
 "Käynnistä Shotwell uudelleen ja yritä sitten kuvien lähettämistä uudelleen."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Anna Flickriin kirjauduttasi verkkoselaimessasi näkyvä valtuutusnumero."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Valtuutus_numero:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "_Jatka"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1388,29 +1365,19 @@ msgid ""
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
-#| msgid "Preparing for login..."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Valmistaudutaan kirjautumiseen…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Flickriin ei "
-"voi jatkaa."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Flickr-valtuutus epäonnistui"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
-#| msgid "Verifying authorization..."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Vahvistetaan valtuutusta…"
 
-#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:116
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1423,7 +1390,7 @@ msgstr ""
 "\n"
 "Jatka julkaisua Google-palveluihin käynnistämällä Shotwell uudelleen."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1431,7 +1398,7 @@ msgid ""
 "have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1445,151 +1412,105 @@ msgstr ""
 "asetettu toimimaan YouTuben kanssa. Useimpien tilien asetukset voi tehdä "
 "kirjautumalla selaimella YouTube-sivustolle ainakin kerran."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_Sähköpostiosoite"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Salasana"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Kirjaudu sisään"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Anna Tumblr-tilisi käyttäjätunnus ja salasana."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Käyttäjätunnus ja/tai salasana on virheellinen. Yritä uudelleen"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Virheellinen käyttäjätunnus tai salasana"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Käyttöliittymän lataus epäonnistui: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Vieraile Shotwellin verkkosivustolla"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr "⚫ Tämä sivusto esitti identiteetin, joka kuuluu toiselle sivustolle."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 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
+#: plugins/common/RESTSupport.vala:227
 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
+#: plugins/common/RESTSupport.vala:232
 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
+#: plugins/common/RESTSupport.vala:237
 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
+#: plugins/common/RESTSupport.vala:242
 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
+#: plugins/common/RESTSupport.vala:247
 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
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Julkaisemisessa tarvittava väliaikainen tiedosto ei ole saatavilla"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Tervetuloa F-Spot-kirjaston tuontipalveluun.\n"
-"\n"
-"Valitse F-Spot-tietokantatiedosto."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Valitse itse tuotava F-Spot-tietokantatiedosto:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Valitun F-Spot-tietokantatiedoston avaus epäonnistui: tiedostoa ei ole "
-"olemassa tai se ei ole F-Spot-tietokanta"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Valitun F-Spot-tietokantatiedoston avaus epäonnistui: Shotwell ei tue F-Spot-"
-"tietokannan versiota"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
-"tunnistetaulua"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
-"kuvataulua"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot-kirjasto: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Valmistaudutaan tuontiin"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr ""
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3-osoite:"
@@ -1607,8 +1528,7 @@ msgid "Go _Back"
 msgstr "Takais_in"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
-#| msgid "_Login"
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Kirjaudu"
 
@@ -1642,7 +1562,7 @@ msgid "pixels"
 msgstr "pikseliä"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1650,17 +1570,17 @@ msgstr "Alkuperäinen koko"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Leveys tai korkeus"
+msgid "Longest edge"
+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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Kirjaudu ulos"
@@ -1668,13 +1588,13 @@ msgstr "_Kirjaudu ulos"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
 msgstr "_Julkaise"
 
@@ -1724,9 +1644,6 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to %s can't "
-#| "continue."
 msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
@@ -1773,32 +1690,11 @@ msgstr "Tunnistamaton käyttäjä"
 msgid " Site Not Found"
 msgstr " Sivustoa ei löytynyt"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_Sähköpostiosoite"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Salasana"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Muista"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-#| msgid "Logging in..."
-msgid "Log in"
-msgstr "Kirjaudu sisään"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1820,7 +1716,6 @@ msgid "Open target _album in browser"
 msgstr "A_vaa kohdealbumi selaimessa"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#| msgid "Copyright (C) 2013 rajce.net"
 msgid "Copyright © 2013 rajce.net"
 msgstr "Tekijänoikeus © 2013 rajce.net"
 
@@ -1846,93 +1741,15 @@ msgid "You are logged into Rajce as %s."
 msgstr "Olet kirjautunut Rajceen käyttäjänä %s."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/PicasaPublishing.vala:566
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Kuvat menevät:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-#| msgid "Core Publishing Services"
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwellin lisäjulkaisupalvelut"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogit:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Kuvan kok_o:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Tekijänoikeus 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-#| msgid "500 x 375 pixels"
-msgid "500 × 375 pixels"
-msgstr "500 × 375 pikseliä"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-#| msgid "1024 x 768 pixels"
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 pikseliä"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#| msgid "1280 x 853 pixels"
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 pikseliä"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-#| msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "“%s” ei ole kelvollinen vastaus OAuth-tunnistautumispyyntöön"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#| msgid ""
-#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): käynnistys epäonnistui; tätä julkaisijaa ei voi "
-"käynnistää uudelleen."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Anna Tumblr-tilisi käyttäjätunnus ja salasana."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Käyttäjätunnus ja/tai salasana on virheellinen. Yritä uudelleen"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Virheellinen käyttäjätunnus tai salasana"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Käyttöliittymän lataus epäonnistui: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Olet kirjautuneena Tumblriin käyttäjänä %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Tekijänoikeus 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -1955,7 +1772,7 @@ msgid "Friends"
 msgstr "Kaverit"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:486
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Yksityinen"
 
@@ -2001,6 +1818,14 @@ msgid ""
 msgstr ""
 "_Poista sijainti- ja kameratiedot sekä muut yksilöivät tiedot ennen lähetystä"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Tekijänoikeus 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2016,14 +1841,10 @@ msgid "Large (2048 pixels)"
 msgstr "Suuri (2048 pikseliä)"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:314
-#| msgid "Creating album..."
 msgid "Creating album…"
 msgstr "Luodaan albumia…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:340
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Facebook "
-#| "can't continue."
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
@@ -2045,17 +1866,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Minne haluat julkaista valitut kuvat?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Vain minulle"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Kaikille"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Kuvan kok_o:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Flickriin ei "
+"voi jatkaa."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2064,14 +1898,8 @@ msgstr ""
 "Olet kirjautunut Flickriin käyttäjänä %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, 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 %s remaining in your upload quota."
@@ -2079,43 +1907,53 @@ msgstr ""
 "Ilmaisessa Flickr-tilissä on kuukausittainen rajoitus datan lähetykselle.\n"
 "Tässä kuussa voit vielä lähettää %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Flickr Pro -tili sallii kuvien lähettämisen ilman rajoituksia."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Kuvat _näkyvät:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Videot _näkyvät:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Kuvat ja videot _näkyvät:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Vain kavereille ja perheelle"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Vain perhe"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Vain kaverit"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pikseliä"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pikseliä"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
-#| msgid "2048 x 1536 pixels"
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pikseliä"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
-#| msgid "4096 x 3072 pixels"
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pikseliä"
 
@@ -2127,15 +1965,11 @@ msgstr "Kuvan _koon esiasetus:"
 #. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
 #. or the new "Default album" album for Google Photos
 #: plugins/shotwell-publishing/PicasaPublishing.vala:96
-#: plugins/shotwell-publishing/PicasaPublishing.vala:625
-#| msgid "De_fault:"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
 msgid "Default album"
 msgstr "Oletusalbumi"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:286
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
@@ -2144,37 +1978,33 @@ msgstr ""
 "voi jatkaa."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:555
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Olet kirjautuneena Picasa-verkkoalbumeihin nimellä %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:561
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Videot ilmestyvät sijaintiin:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:605
-#| msgid "Small (640 x 480 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Pieni (640 × 480 pikseliä)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:606
-#| msgid "Medium (1024 x 768 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Keskikoko (1024 × 768 pikseliä)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:607
-#| msgid "Recommended (1600 x 1200 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Suositeltu (1600 × 1200 pikseliä)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:608
-#| msgid "Google+ (2048 x 1536 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pikseliä)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:609
-#: src/editing_tools/EditingTools.vala:757
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Alkuperäinen koko"
 
@@ -2187,17 +2017,14 @@ msgid "User _name"
 msgstr "_Käyttäjätunnus"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
-#| msgid "_Remember Password"
 msgid "Remember Password"
 msgstr "Muista salasana"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
-#| msgid "An _existing category:"
 msgid "An _existing category"
 msgstr "_Olemassa oleva kategoria"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
-#| msgid "A _new album named:"
 msgid "A _new album named"
 msgstr "_Uuteen albumiin nimeltä"
 
@@ -2208,7 +2035,6 @@ msgid "within category"
 msgstr "_Olemassa oleva kategoria:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
-#| msgid "Album comment:"
 msgid "Album comment"
 msgstr "Albumin kommentti"
 
@@ -2219,7 +2045,6 @@ msgid "Photos will be _visible by"
 msgstr "_Valokuvat näkyvät:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
-#| msgid "Photo size:"
 msgid "Photo size"
 msgstr "Kuvan koko"
 
@@ -2237,13 +2062,12 @@ msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
-#: src/Resources.vala:295 ui/collection.ui:190
+#: src/Resources.vala:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Julkaise"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-#| msgid "Creating album %s..."
 msgid "Creating album %s…"
 msgstr "Luodaan albumia %s…"
 
@@ -2266,7 +2090,8 @@ msgid "Certificate of %s"
 msgstr "Palvelun %s varmenne"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:166
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2317,18 +2142,43 @@ msgstr "Näytä varmenne…"
 msgid "I understand, please _proceed."
 msgstr "Ymmärrän, _jatketaan."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:40
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Keskeiset julkaisupalvelut"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogit:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Tekijänoikeus 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pikseliä"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): käynnistys epäonnistui; tätä julkaisijaa ei voi "
+"käynnistää uudelleen."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Olet kirjautuneena Tumblriin käyttäjänä %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Videoiden _yksityisyysasetukset:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:340
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Youtube "
-#| "can't continue."
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
@@ -2336,22 +2186,16 @@ msgstr ""
 "Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Youtubeen ei "
 "voi jatkaa."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:450
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Olet kirjautunut YouTubeen käyttäjänä %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:452
-#, c-format
-#| msgid "Videos will appear in '%s'"
-msgid "Videos will appear in “%s”"
-msgstr "Videot ilmestyvät sijaintiin “%s”"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:484
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Julkinen, luetteloitu"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:485
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Julkinen, luettelematon"
 
@@ -2388,7 +2232,6 @@ msgid "Core Slideshow Transitions"
 msgstr "Keskeiset diaesityssiirtymät"
 
 #: plugins/shotwell-transitions/shotwell-transitions.vala:76
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -2455,16 +2298,17 @@ msgstr "Kiinnitä työkalurivi auki"
 msgid "Leave fullscreen"
 msgstr "Poistu koko näytön tilasta"
 
-#: 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
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:586
 #, fuzzy, c-format
 #| msgid ""
 #| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
@@ -2482,22 +2326,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:600
-#| msgid "Visit the Shotwell home page"
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Vieraile Shotwellin verkkosivustolla"
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Ohjeiden näyttäminen ei onnistu: %s"
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr ""
 
-#: src/AppWindow.vala:628
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Usein kysyttyjen kysymysten näyttäminen epäonnistui: %s"
@@ -2563,25 +2406,32 @@ msgstr "Rikkinäinen kuvatiedosto"
 msgid "Imported failed (%d)"
 msgstr "Tuonti epäonnistui (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kamerat"
 
-#: 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
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr ""
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
 #: src/camera/ImportPage.vala:466
-#| msgid ""
-#| "Unable to unmount camera.  Try unmounting the camera from the file "
-#| "manager."
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
@@ -2589,37 +2439,33 @@ msgstr ""
 "tiedostonhallintaohjelman kautta."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Piilota jo tuodut kuvat"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Näytä vai kuvat joita ei ole tuotu"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Tuo _valitut"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Tuo _kaikki"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Kamera vaikuttaa olevan tyhjä. Kuvia tai videoita ei löytynyt tuotavaksi"
 
-#: src/camera/ImportPage.vala:861
-#| msgid "No photos/videos found"
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Uusia kuvia tai videoita ei löytynyt kamerasta"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it.  Continue?"
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2627,19 +2473,15 @@ msgstr ""
 "Shotwellin on irrotettava kamera tiedostojärjestelmästä, jotta kameraa "
 "voidaan käyttää. Jatketaanko?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Irrota"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Irrota kamera."
 
-#: 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."
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2649,11 +2491,11 @@ msgstr ""
 "sitä ei ole lukittu. Sulje muut kameraa käyttävät ohjelmat ja yritä "
 "uudelleen."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Sulje muut kameraa käyttävät ohjelmat."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2662,197 +2504,193 @@ msgstr ""
 "Esikatselukuvien noutaminen kamerasta ei onnistu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
-#| msgid "Unmounting..."
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Irrotetaan…"
 
-#: src/camera/ImportPage.vala:1160
-#| msgid "Starting import, please wait..."
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Yhdistetään kameraan, odota hetki…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Käynnistetään tuonti, odota…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Noudetaan kuvan tietoja"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Noudetaan esikatseluversiota kuvasta %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kameraa ei voitu lukita: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Poistetaanko tämä kuva kamerasta?"
 msgstr[1] "Poistetaanko nämä %d kuvaa kamerasta?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Poistetaanko tämä video kamerasta?"
 msgstr[1] "Poistetaanko nämä %d videota kamerasta?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Poistetaanko tämä kuva tai video kamerasta?"
 msgstr[1] "Poistetaanko nämä %d kuvaa tai videota kamerasta?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Poistetaanko nämä tiedostot kamerasta?"
 msgstr[1] "Poistetaanko nämä %d tiedostoa kamerasta?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Säilytä"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Poistetaan kuvia ja videoita kamerasta"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
 msgstr[0] "%d kuvaa tai videota ei voida poistaa kamerasta virheiden vuoksi."
 msgstr[1] "%d kuvaa tai videota ei voida poistaa kamerasta virheiden vuoksi."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
-#: src/PhotoPage.vala:2460 src/Resources.vala:170
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: 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"
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Lähe_tä…"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
-#: src/PhotoPage.vala:2470 src/Resources.vala:220
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
 msgid "Set as _Desktop Background"
 msgstr "Aseta _työpöydän taustakuvaksi"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:287
 msgid "_Duplicate"
 msgstr "_Kopioi"
 
-#: src/CollectionPage.vala:94
-#| msgid "Fulls_creen"
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Koko näyttö"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Diaesitys"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Kääntö _vaakasuunnassa"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Kääntö _pystysuunnassa"
 
-#: 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
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Paranna"
 
-#: 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
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Palauta alkuperäinen"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Kopioi värisäädöt"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Liitä värisäädöt"
 
-#: src/CollectionPage.vala:129
-#| msgid "Adjust Date and Time"
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Muuta päiväystä ja kellonaikaa…"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Avaa ulkoisella _muokkaimella"
 
-#: 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
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Avaa _RAW-muokkaimessa"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:168
 msgid "_Play"
 msgstr "T_oista"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Vie kuvia tai videoita"
-
-#: src/CollectionPage.vala:409
-msgid "Export Photos/Videos"
-msgstr "Vie kuvia/videoita"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Vie kuva tai video"
+msgstr[1] "Vie kuvia tai videoita"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Vie kuvat"
-
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Vie kuvia"
+msgid_plural "Export Photos"
+msgstr[0] "Vie kuva"
+msgstr[1] "Vie kuvat"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Kierretään"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Kumotaan kierto"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Kääntö vaakasuunnassa"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Kumotaan vaakasuuntainen kääntö"
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Kääntö pystysuunnassa"
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Kumotaan pystysuuntainen kääntö"
 
@@ -2978,7 +2816,6 @@ msgstr "Luo tunniste"
 
 #: src/Commands.vala:1695
 #, c-format
-#| msgid "Move Tag \"%s\""
 msgid "Move Tag “%s”"
 msgstr "Siirrä tunniste “%s”"
 
@@ -3040,7 +2877,6 @@ msgstr "%s-tietokanta"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-#| msgid "Importing from %s can't continue because an error occurred:"
 msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "Tuontia kohteesta %s ei voi jatkaa virheen vuoksi:"
 
@@ -3063,19 +2899,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Tietokantatiedosto:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Tuo"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Tuo sovelluksesta"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Tuo media _kohteesta:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Sulje"
 
@@ -3143,23 +2979,20 @@ msgstr "Työpöydän diaesitystä ei voida valmistella: %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Tämä poistaa tunnisteen “%s” yhdestä kuvasta. Jatketaanko?"
 msgstr[1] "Tämä poistaa tunnisteen “%s” %d kuvasta. Jatketaanko?"
 
-#: 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
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Poista"
 
 #: src/Dialogs.vala:25
 #, c-format
-#| msgid "This will remove the saved search \"%s\".  Continue?"
 msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Tämä poistaa tallennetun haun “%s”. Jatketaanko?"
 
@@ -3181,6 +3014,10 @@ msgstr "_Vaihda kehitintä"
 msgid "Export Video"
 msgstr "Vie video"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Vie kuvia"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3211,65 +3048,35 @@ msgstr ""
 "\n"
 "Jatketaanko vientiä?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Muokkaamaton"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Nykyinen"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Muoto:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Laatu:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Skaalausrajoite:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Pikselit:"
-
-#: src/Dialogs.vala:234
-#| msgid "Export metadata"
-msgid "Export _metadata:"
-msgstr "Vie _metatiedot:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "_Jatka"
 
-#: src/Dialogs.vala:478
-#| msgid "Save Details"
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Tallenna tiedot…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Tallenna tiedot"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(ja %d muuta)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Tuontitulosten raportti"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Yritettiin tuoda %d tiedosto."
 msgstr[1] "Yritettiin tuoda %d tiedostoa."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3279,32 +3086,30 @@ msgstr[1] "Niistä %d tiedostoa tuotiin onnistuneesti."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Kuvien/videoiden tuomatta jätetyt kaksoiskappaleet:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr ""
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Kameravirheiden vuoksi tuomatta jääneet kuvat/videot:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "virheviesti:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Tuomatta jääneet tiedostot, koska niitä ei tunnistettu kuviksi tai videoiksi:"
@@ -3312,10 +3117,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3326,10 +3128,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3337,7 +3136,7 @@ msgstr ""
 "Tuomatta jääneet kuvat ja videot, koska Shotwell ei voinut kopioida niitä "
 "kirjastoonsa:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3347,46 +3146,46 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Kuvat ja videoita, joita ei tuotu, koska ne ovat rikki:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Muiden syiden vuoksi tuomatta jääneet kuvat ja videot:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "Yhtä kuvan kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d kuvan kaksoiskappaletta ei tuotu:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "Yhtä videon kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d videon kaksoiskappaletta ei tuotu:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "Yhtä kuvan tai videon kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d kuvan tai videon kaksoiskappaletta ei tuotu:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] "Yhden kuvan tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\n"
 msgstr[1] "%d kuvan tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3394,7 +3193,7 @@ msgstr[0] ""
 "Yhden videon tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\n"
 msgstr[1] "%d videon tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3405,7 +3204,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d kuvan tai videon tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3414,7 +3213,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d tiedoston tuonti epäonnistui tiedosto- tai laitteistovirheen takia:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3428,7 +3227,7 @@ msgstr[1] ""
 "%d:n kuvan tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3442,7 +3241,7 @@ msgstr[1] ""
 "%d:n videon tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3457,7 +3256,7 @@ msgstr[1] ""
 "%d:n kuvan/videon tuominen epäonnistui, koska kuvakirjaston kansioon ei "
 "ollut kirjoitusoikeutta:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3471,56 +3270,56 @@ msgstr[1] ""
 "%d:n tiedoston tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "Yhden kuvan tuonti epäonnistui kameravirheen vuoksi:\n"
 msgstr[1] "%d kuvan tuonti epäonnistui kameravirheen vuoksi:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "Yhden videon tuonti epäonnistui kameravirheen vuoksi:\n"
 msgstr[1] "%d videon tuonti epäonnistui kameravirheen vuoksi:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "Yhden kuvan tai videon tuonti epäonnistui kameravirheen vuoksi:\n"
 msgstr[1] "%d kuvan tai videon tuonti epäonnistui kameravirheen vuoksi:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "1 tiedoston tuonti epäonnistui kameravirheen takia:\n"
 msgstr[1] "%d tiedoston tuonti epäonnistui kameravirheen takia:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 kuvan tuominen epäonnistui, koska se oli rikki:\n"
 msgstr[1] "%d kuvan tuominen epäonnistui, koska ne olivat rikki:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 videon tuominen epäonnistui, koska se oli rikki:\n"
 msgstr[1] "%d videon tuominen epäonnistui, koska ne ovat rikki:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "1 kuvan/videon tuominen epäonnistui, koska se on rikki:\n"
 msgstr[1] "%d kuvan/videon tuominen epäonnistui, koska ne ovat rikki:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3531,7 +3330,7 @@ msgstr[1] "%d tiedoston tuominen epäonnistui, koska ne ovat rikki:\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3540,56 +3339,56 @@ msgstr[1] "Ohitettiin %d kuvaa, joita ei tueta:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Ohitettiin yksi tiedosto, joka ei ollut kuva.\n"
 msgstr[1] "Ohitettiin %d tiedostoa, jotka eivät olleet kuvia.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "Ohitettiin yksi kuva, koska käyttäjä perui:\n"
 msgstr[1] "Ohitettiin %d kuvaa, koska käyttäjä perui:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "Ohitettiin yksi video, koska käyttäjä perui:\n"
 msgstr[1] "Ohitettiin %d videota, koska käyttäjä perui:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "Ohitettiin yksi kuva tai video, koska käyttäjä perui:\n"
 msgstr[1] "Ohitettiin %d kuvaa tai videota, koska käyttäjä perui:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 tiedosto ohitettu käyttäjän peruttua:\n"
 msgstr[1] "%d tiedostoa ohitettu käyttäjän peruttua:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "Yhden kuvan tuonti onnistui.\n"
 msgstr[1] "%d kuvan tuonti onnistui.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "Yhden videon tuonti onnistui.\n"
 msgstr[1] "%d videon tuonti onnistui.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3598,94 +3397,65 @@ msgstr[1] "%d kuvan tai videon tuonti onnistui.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Yhtään kuvaa tai videota ei tuotu.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Tuonti on valmis"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunti"
-msgstr[1] "%d sekuntia"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuutti"
-msgstr[1] "%d minuuttia"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tunti"
-msgstr[1] "%d tuntia"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 päivä"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:231
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Nimeä tapahtuma uudelleen"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
-#| msgid "Edit Title"
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Muokkaa nimeä"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Nimi:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:307
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Muokkaa tapahtuman kommenttia"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Muokkaa kuvan tai videon kommenttia"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Siirrä tiedosto roskakoriin"
 msgstr[1] "_Siirtä tiedostot roskakoriin"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "Poista k_irjastosta"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Kumotaanko ulkoinen muokkaus?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Kumotaanko ulkoiset muokkaukset?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, 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?"
@@ -3694,129 +3464,34 @@ msgstr[0] ""
 msgstr[1] ""
 "Tämä tuhoaa kaikki %d ulkoiseen tiedostoon tehdyt muutokset. Haluatko jatkaa?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "_Kumoa ulkoiset muokkaukset"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "_Kumoa ulkoiset muokkaukset"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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ämä poistaa kuvan kirjastosta. Jatketaanko?"
 msgstr[1] "Tämä poistaa %d kuvaa kirjastosta. Jatketaanko?"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:173
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Poista kuvia kirjastosta"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Poista kuvat kirjastosta"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "AM"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "PM"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 h"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Siirrä kuvia ja videoita saman verran"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "_Aseta kaikki kuvat ja videot valittuun aikaan"
-
-#: src/Dialogs.vala:1725
-#| msgid "_Modify original photo file"
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "M_uokkaa alkuperäistä kuvatiedostoa"
-msgstr[1] "M_uokkaa alkuperäisiä kuvatiedostoja"
-
-#: src/Dialogs.vala:1729
-#| msgid "_Modify original file"
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Muokkaa alkuperäistä tiedostoa"
-msgstr[1] "_Muokkaa alkuperäisiä tiedostoja"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Alkuperäinen: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y, %H.%M.%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y, %H.%M.%S"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Kuvausaikaa siirretään eteenpäin\n"
-"%d %s, %d %s, %d %s, ja %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Kuvausaikaa siirretään taaksepäin\n"
-"%d %s, %d %s, %d %s, ja %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "päivä"
-msgstr[1] "päivää"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "tunti"
-msgstr[1] "tuntia"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuutti"
-msgstr[1] "minuuttia"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekunti"
-msgstr[1] "sekuntia"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3835,123 +3510,44 @@ msgstr[1] ""
 "\n"
 "ja %d muuta."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Tunnisteet (pilkulla erotettuna):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Tervetuloa!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Tervetuloa Shotwelliin!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "Kuvia voi tuoda millä tahansa näistä tavoista:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Valitse <span weight=\"bold\">Tiedosto %s Tuo kansiosta</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Vedä ja pudota kuvia Shotwellin ikkunaan"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "Tuo kuvia tietokoneeseen liitetystä kamerasta"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Tuo kuvia %s-hakemistosta"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "Kuvia voi tuoda myös millä tahansa näistä tavoista:"
-
-#: src/Dialogs.vala:2152
-#| msgid "_Don't show this message again"
-msgid "_Don’t show this message again"
-msgstr "_Älä näytä tätä viestiä uudestaan"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Tuo kuvasi %s-kirjastostasi"
-
-#. 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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Ohje)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Vuosi%sKuukausi%sPäivä"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Vuosi%sKuukausi"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Vuosi%sKuukausi-Päivä"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Vuosi-Kuukausi-Päivä"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Oma koko"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Virheellinen kaava"
-
 #. 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 "Shotwell voi kopioida kuvat kirjastokansioon tai tuoda ne ilman kopiointia."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "_Kopioi kuvat"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Tuo vanhasta sijainnista"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Tuo kirjastoon"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Poista kirjastosta"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Poistetaan kuvia kirjastosta"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Poistetaan kuvia kirjastosta"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the photo/video from your Shotwell library.  Would you "
@@ -3984,7 +3580,7 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the video from your Shotwell library.  Would you also "
@@ -4017,7 +3613,7 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the photo from your Shotwell library.  Would you also "
@@ -4050,14 +3646,8 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
-#| msgid ""
-#| "The photo or video cannot be moved to your desktop trash.  Delete this "
-#| "file?"
-#| msgid_plural ""
-#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
-#| "files?"
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
@@ -4070,7 +3660,7 @@ msgstr[1] ""
 "tiedostot?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4104,261 +3694,465 @@ msgstr "%s ei tue tiedoston %s tiedostomuotoa."
 
 #: src/direct/DirectPhotoPage.vala:120
 #, c-format
-#| msgid ""
-#| "Unable to print photo:\n"
-#| "\n"
-#| "%s"
 msgid "Unable open photo %s. Sorry."
 msgstr "Valitettavsti kuvaa %s ei voi avata."
 
-#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/direct/DirectPhotoPage.vala:304
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "_Tallenna kopio"
 
-#: src/direct/DirectPhotoPage.vala:307
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Hävitetäänkö tiedostoon %s tehdyt muutokset?"
 
-#: src/direct/DirectPhotoPage.vala:308
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Sulje _tallentamatta"
 
-#: src/direct/DirectPhotoPage.vala:341
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Virhe tallennettaessa tiedostoon %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Tallenna nimellä"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Kohdetta %s ei voida seurata, koska se ei ole hakemisto (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 h"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Siirrä kuvia ja videoita saman verran"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "_Aseta kaikki kuvat ja videot valittuun aikaan"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "M_uokkaa alkuperäistä kuvatiedostoa"
+msgstr[1] "M_uokkaa alkuperäisiä kuvatiedostoja"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Muokkaa alkuperäistä tiedostoa"
+msgstr[1] "_Muokkaa alkuperäisiä tiedostoja"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Alkuperäinen: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y, %H.%M.%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y, %H.%M.%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Kuvausaikaa siirretään eteenpäin\n"
+"%d %s, %d %s, %d %s, ja %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Kuvausaikaa siirretään taaksepäin\n"
+"%d %s, %d %s, %d %s, ja %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "päivä"
+msgstr[1] "päivää"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "tunti"
+msgstr[1] "tuntia"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuutti"
+msgstr[1] "minuuttia"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekunti"
+msgstr[1] "sekuntia"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Muokkaamaton"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Nykyinen"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Muoto:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Laatu:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Skaalausrajoite:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Pikselit:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Vie _metatiedot:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Ohje)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Vuosi%sKuukausi%sPäivä"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Vuosi%sKuukausi"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Vuosi%sKuukausi-Päivä"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Vuosi-Kuukausi-Päivä"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Oma koko"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Virheellinen kaava"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 päivä"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Tervetuloa!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Tervetuloa Shotwelliin!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Kuvia voi tuoda millä tahansa näistä tavoista:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Valitse <span weight=\"bold\">Tiedosto %s Tuo kansiosta</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Vedä ja pudota kuvia Shotwellin ikkunaan"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Tuo kuvia tietokoneeseen liitetystä kamerasta"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Tuo kuvia %s-hakemistosta"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Kuvia voi tuoda myös millä tahansa näistä tavoista:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Älä näytä tätä viestiä uudestaan"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Tuo kuvasi %s-kirjastostasi"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Palaa kuvan nykyisiin mittoihin"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Aseta kuvan rajaus"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Käännä rajauskulmiota pysty- ja vaakasuunnan välillä"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Rajoittamaton"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Neliö"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Näyttö"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
-#| msgid "SD Video (4 : 3)"
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Standardipiirto (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
-#| msgid "HD Video (16 : 9)"
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Teräväpiirto (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
-#| msgid "Wallet (2 x 3 in.)"
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Lompakkokoko (2 × 3 tuumaa)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
-#| msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Muistivihkokoko (3 × 5 tuumaa)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
-#| msgid "4 x 6 in."
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 tuumaa"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
-#| msgid "5 x 7 in."
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 tuumaa"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
-#| msgid "8 x 10 in."
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 tuumaa"
 
-#: src/editing_tools/EditingTools.vala:767
-#| msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Kirje (8.5 × 11 tuumaa)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
-#| msgid "11 x 14 in."
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 tuumaa"
 
-#: src/editing_tools/EditingTools.vala:769
-#| msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloidi (11 × 17 tuumaa)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
-#| msgid "16 x 20 in."
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 tuumaa"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
-#| msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrinen lompakkokoko (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
-#| msgid "Postcard (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postikortti (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
-#| msgid "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
-#| msgid "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
-#| msgid "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:754
 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"
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
-#| msgid "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
-#| msgid "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
-#| msgid "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Koko:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Sulje punasilmäisyyden korjaustyökalu"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Poista punasilmäisyyttä valitulta alueelta"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Palauta alkuperäiset arvot"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Valotus:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Värikylläisyys:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Värisävy:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Lämpötila:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Varjot:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Korostukset:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
-msgstr "Palauta alkuperäiset värit "
+msgstr "Palauta alkuperäiset värit"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Palauta kaikkien värisäätöjen alkuperäiset arvot"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Värisävy"
 
-#: src/editing_tools/EditingTools.vala:2746
-#| msgid "Contrast Expansion"
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Värikylläisyys"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Valotus"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Varjot"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Korostukset"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Kontrastin laajennus"
 
@@ -4366,30 +4160,26 @@ msgstr "Kontrastin laajennus"
 msgid "Angle:"
 msgstr "Kulma:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
 #: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Suorista"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Tapahtumat"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d kuvaa/videota"
 msgstr[1] "%d kuva/video"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d video"
 msgstr[1] "%d videota"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4400,27 +4190,35 @@ msgstr[1] "%d valokuvaa"
 msgid "No Event"
 msgstr "Ei tapahtumaa"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Tapahtumat"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Selaa tapahtumia"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Ei tapahtumia"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Tapahtumia ei löytynyt"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Kaikki tapahtumat"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Ei päiväystä"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4441,7 +4239,6 @@ msgstr "Viedään"
 
 #: src/Exporter.vala:317
 #, c-format
-#| msgid "File %s already exists.  Replace?"
 msgid "File %s already exists. Replace?"
 msgstr "Tiedosto %s on jo olemassa. Korvataanko?"
 
@@ -4461,30 +4258,24 @@ msgstr "Korvaa k_aikki"
 msgid "Export"
 msgstr "Vie"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Kansiot"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Kirjasto"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Selaa kirjaston kansiorakennetta"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Kuvat"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Merkitty"
 
 #: src/library/ImportQueuePage.vala:8
-#| msgid "Importing"
 msgid "Importing…"
 msgstr "Tuodaan…"
 
 #: src/library/ImportQueuePage.vala:129
-#| msgid "Preparing to import"
 msgid "Preparing to import…"
 msgstr "Valmistaudutaan tuontiin…"
 
@@ -4497,20 +4288,36 @@ msgstr "Tuotiin %s"
 msgid "Last Import"
 msgstr "Edellinen tuonti"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Kirjasto"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Hallitse ja selaa kuviasi"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Kuvat"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Tuo kansiosta"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr ""
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Tyhjennä roskakori"
 
-#: src/library/LibraryWindow.vala:576
-#| msgid "Emptying Trash..."
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Tyhjennetään roskakori…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4523,37 +4330,33 @@ msgstr ""
 "\">Muokkaa %s Asetukset</span>.\n"
 "Haluatko jatkaa kuvien tuomista?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Kirjaston sijainti"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Tästä hakemistosta ei voi tuoda kuvia."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d %%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
-#| msgid "Updating library..."
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Päivitetään kirjastoa…"
 
-#: src/library/LibraryWindow.vala:1129
-#| msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Valmistellaan kuvien automaattista tuontia…"
 
-#: src/library/LibraryWindow.vala:1134
-#| msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Tuodaan kuvia automaattisesti…"
 
-#: src/library/LibraryWindow.vala:1142
-#| msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Kirjoitetaan metadataa tiedostoihin…"
 
@@ -4562,7 +4365,6 @@ msgid "Missing Files"
 msgstr "Puutuvia tiedostoja"
 
 #: src/library/OfflinePage.vala:110
-#| msgid "Deleting..."
 msgid "Deleting…"
 msgstr "Poistetaan…"
 
@@ -4570,17 +4372,17 @@ msgstr "Poistetaan…"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Roskakori on tyhjä"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Poista"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
-msgstr "poistetaan kuvia"
+msgstr "Poistetaan kuvia"
 
 #: src/main.vala:54
 #, fuzzy, c-format
@@ -4612,12 +4414,7 @@ msgstr ""
 "versioon %s (skeema %d). Lisätietoja on Shotwellin wikissä: %s"
 
 #: src/main.vala:65
-#, fuzzy, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please clear your library by deleting %s and re-import your "
-#| "photos."
+#, 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 "
@@ -4630,8 +4427,7 @@ msgstr ""
 "uudelleen."
 
 #: src/main.vala:71
-#, fuzzy, c-format
-#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+#, c-format
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Tuntematon virhe varmistettaessa Shotwellin tietokantaa: %s"
 
@@ -4639,36 +4435,37 @@ msgstr "Tuntematon virhe varmistettaessa Shotwellin tietokantaa: %s"
 msgid "Loading Shotwell"
 msgstr "Ladataan Shotwelliä"
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr ""
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr ""
 
-#: src/main.vala:298
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 
-#: src/main.vala:302
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr ""
 
-#: src/main.vala:306
-#| msgid "Show the application's version"
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Näytä sovelluksen versio"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr ""
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[TIEDOSTO]"
 
-#: src/main.vala:342
+#: src/main.vala:360
 #, 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 ""
 "Komento “%s --help” näyttää luettelon kaikista komentorivivalitsimista.\n"
@@ -4682,7 +4479,7 @@ msgstr ""
 msgid "Adjust the size of the thumbnails"
 msgstr "Säädä pienoiskuvien kokoa"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4691,34 +4488,34 @@ msgstr ""
 "Shotwell ei voinut soittaa valittua videota:\n"
 "%s"
 
-#: src/Page.vala:1312
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Ei kuvia/videoita"
 
-#: src/Page.vala:1316
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Nykyistä suodatint vstaavia kuvia tai videoita ei löytynyt"
 
-#: src/Page.vala:2622
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Tähän hakemistoon ei voi viedä kuvia."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Edellinen kuva"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Seuraava kuva"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Kuvan lähdetiedosto puuttuu: %s"
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Tiedostoa %s ei voitu viedä: %s"
@@ -4763,7 +4560,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "muokattu"
 
@@ -4795,24 +4592,15 @@ msgstr "16 kuvaa sivulla"
 msgid "32 images per page"
 msgstr "32 kuvaa sivulla"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "tuumaa"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Kuvan asetukset"
 
-#: src/Printing.vala:889
-#| msgid "Printing..."
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Tulostetaan…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -4940,7 +4728,7 @@ msgstr "Tekijänoikeus:"
 msgid "Software:"
 msgstr "Ohjelmisto:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Lisätiedot"
 
@@ -4955,7 +4743,6 @@ msgstr "Lähetetään %d/%d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
 msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "Julkaisemista palveluun %s ei voida jatkaa virheen vuoksi:"
 
@@ -4968,14 +4755,12 @@ msgstr ""
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
 #: src/publishing/PublishingUI.vala:104
-#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "Valittu video julkaistiin onnistuneesti."
 msgstr[1] "Valitut videot julkaistiin onnistuneesti."
 
 #: 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] "Valittu kuva julkaistiin onnistuneesti."
@@ -4986,46 +4771,44 @@ msgid "The selected photos/videos were successfully published."
 msgstr "Valittujen kuvien tai videoiden julkaisu onnistui."
 
 #: src/publishing/PublishingUI.vala:127
-#| msgid "Fetching account information..."
 msgid "Fetching account information…"
 msgstr "Noudetaan tilin tietoja…"
 
 #: src/publishing/PublishingUI.vala:133
-#| msgid "Logging in..."
 msgid "Logging in…"
 msgstr "Kirjaudutaan…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Julkaise valokuvia"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Julkaise valokuvia _palveluun:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Julkaise videoita"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Julkaise videoita _palveluun"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Julkaise kuvia ja videoita"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Julkaise kuvia ja videoita _palveluun"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Julkaisu ei onnistunut"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5038,774 +4821,737 @@ msgstr ""
 msgid "Publishing"
 msgstr "Julkaisu"
 
-#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Kierrä"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: src/Resources.vala:142 ui/collection.ui:146
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Kierrä kuvia oikealle (paina Ctrl kuvien kiertämiseksi vasemmalle)"
 
-#: src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Kierrä kuvia vasemmalle"
 
-#: src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Kääntö vaakasuunnassa"
 
-#: src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Kääntö pystysuunnassa"
 
-#: 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
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Tietoja"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Toteuta"
 
-#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: src/Resources.vala:160 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
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: src/Resources.vala:160
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_Eteenpäin"
 
-#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
 #: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Koko näyttö"
 
-#: 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
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Ohje"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Poistu _koko näytön tilasta"
 
-#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "_Uusi"
 
-#: src/Resources.vala:165
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Asetukset"
 
-#: src/Resources.vala:169
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: src/Resources.vala:172 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 "_Lopeta"
 
-#: src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: src/Resources.vala:174
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "Pa_lauta"
 
-#: src/Resources.vala:176
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "Tallenna nim_ellä"
 
-#: src/Resources.vala:177
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Järjestä _nousevasti"
 
-#: src/Resources.vala:178
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: src/Resources.vala:180
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "_Peru poistaminen"
 
-#: src/Resources.vala:181
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "Paras so_vitus"
 
-#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
 #: ui/photo.ui:144 ui/tags.ui:260
 msgid "Zoom _In"
 msgstr "_Lähennä"
 
-#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
 #: ui/photo.ui:149 ui/tags.ui:265
 msgid "Zoom _Out"
 msgstr "_Loitonna"
 
-#: src/Resources.vala:187 ui/collection.ui:165
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Paranna"
 
-#: src/Resources.vala:188 ui/collection.ui:162
-#| msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Paranna kuvan ulkoasua automaattisesti"
 
-#: src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Kopioi värisäädöt"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopioi kuvaan toteutetut värisäädöt"
 
-#: src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Liitä värisäädöt"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Toteuta kopioidut värisäädöt valittuun kuvaan"
 
-#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Rajaa"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Rajaa"
 
-#: src/Resources.vala:200
-#| msgid "Crop the photo's size"
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
 msgstr "Rajaa kuvan kokoa"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Suorista"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Suorista kuva"
 
-#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Punasilmäisyys"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Punasilmäisyys"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Vähennä tai poista punasilmäisyyttä kuvasta"
 
-#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Säädä"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Säädä"
 
-#: src/Resources.vala:212
-#| msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
 msgstr "Säädä kuvan värejä ja sävyä"
 
-#: src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Palauta alkuperäinen"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Kumoa ulkoiset _muokkaukset"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Palauta pääkuva"
 
-#: src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Aseta valittu kuva uudeksi työpöydän taustakuvaksi"
 
-#: src/Resources.vala:222
-#| msgid "Set as Desktop Slideshow"
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
 msgstr "Aseta työpöydän _diaesitykseksi…"
 
-#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: src/Resources.vala:225 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 "_Kumoa"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Kumoa"
 
-#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: src/Resources.vala:228 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 "_Tee uudelleen"
 
-#: src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
-#: ui/event.ui:391 ui/event.ui:584
-#| msgid "Rename Event"
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
 msgstr "Nimeä tapa_htuma uudelleen…"
 
-#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Aseta tapahtuman _pienoiskuvaksi"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Aseta tapahtuman pienoiskuvaksi"
 
-#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "_Uusi tapahtuma"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Siirrä kuvia"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Siirrä kuvia tapahtumaan"
 
-#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Yhdistä tapahtumat"
 
-#: src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Yhdistä"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Yhdistä tapahtumat yhdeksi tapahtumaksi"
 
-#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Aseta arvostelu"
 
-#: src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Aseta arvostelu"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Muuta kuvan arvostelua"
 
-#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Korota"
 
-#: src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Korota arvostelua"
 
-#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Laske"
 
-#: src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Laske arvostelua"
 
-#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Ei arvostelua"
 
-#: src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Ei arvostelua"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Jätä arvostelematta"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Asetetaan arvostelemattomaksi"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Poista kaikki arvostelut"
 
-#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Hylätty"
 
-#: src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Hylätty"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Arvostele hylätyksi"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Asetetaan hylätyksi"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Aseta arvostelu hylätyksi"
 
-#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: src/Resources.vala:269 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 "_Vain hylätyt"
 
-#: src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Vain hylätyt"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Näytä vain hylätyt kuvat"
 
-#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: src/Resources.vala:273 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 "Kaikki + _Hylätyt"
 
-#: src/Resources.vala:273
-#| msgid "Show all photos, including rejected"
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Näytä kaikki kuvat, myös hylätyt"
 
-#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: src/Resources.vala:276 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 "_Kaikki kuvat"
 
 #. Button tooltip
-#: src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Näytä kaikki kuvat"
 
-#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
 #: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Arvostelut"
 
-#: src/Resources.vala:280
-#| msgid "Display each photo's rating"
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
 msgstr "Näytä jokaisen kuvan arvostelu"
 
-#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: src/Resources.vala:283 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 "_Suodata kuvia"
 
-#: src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Suodata kuvia"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Rajaa näytettävien kuvien määriä suodattimella"
 
-#: src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Kopioi"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Tee tästä valokuvasta kopio"
 
-#: src/Resources.vala:290
-#| msgid "Export"
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Vie…"
 
-#: src/Resources.vala:292
-#| msgid "_Print"
+#: src/Resources.vala:293
 msgid "_Print…"
 msgstr "_Tulosta…"
 
-#: src/Resources.vala:294
-#| msgid "Publish"
+#: src/Resources.vala:295
 msgid "Pu_blish…"
 msgstr "Julkai_se…"
 
-#: src/Resources.vala:296 ui/collection.ui:187
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Julkaise eri verkkosivuille"
 
-#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
-#| msgid "Edit Title"
 msgid "Edit _Title…"
 msgstr "Muokkaa ni_meä…"
 
 #. Button label
-#: src/Resources.vala:300
-#| msgid "Edit Title"
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Muokkaa nimeä"
 
-#: 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"
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
 msgstr "Muokkaa _kommenttia…"
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Muokkaa kommenttia"
 
-#: src/Resources.vala:306 ui/event.ui:588
-#| msgid "Edit Event Comment"
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
 msgstr "Muokkaa ta_pahtuman kommenttia…"
 
-#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
-#| msgid "Adjust Date and Time"
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
 msgstr "Muut_a päiväystä ja kellonaikaa…"
 
-#: src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Muuta päiväystä ja kellonaikaa..."
 
-#: 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"
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Lisää tunn_isteita…"
 
-#: src/Resources.vala:313 ui/photo_context.ui:17
-#| msgid "Add Tags"
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "Li_sää tunnisteita…"
 
 #. Dialog title
-#: src/Resources.vala:315
-#| msgid "Add Tags"
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Lisää tunnisteita"
 
-#: src/Resources.vala:324 ui/photo_context.ui:133
-#| msgid "Send To"
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
 msgstr "L_ähetä…"
 
-#: src/Resources.vala:326
-#| msgid "_Find"
+#: src/Resources.vala:327
 msgid "_Find…"
 msgstr "_Etsi…"
 
-#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
 #: ui/trash.ui:312
 msgid "Find"
 msgstr "Etsi"
 
-#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
 #: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Etsi kuva kirjoittamalla sen nimessä tai tunnisteissa esiintyvää tekstiä"
 
-#: src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Merkitse"
 
-#: src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "Poista _merkintä"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Muokkaimen käynnistäminen ei onnistu: %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
-#| msgid "Add Tag \"%s\""
 msgid "Add Tag “%s”"
 msgstr "Lisää tunniste “%s”"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
 msgid "Add Tags “%s” and “%s”"
 msgstr "Lisää tunnisteet “%s” ja “%s”"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-#| msgid "Add Tags"
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Lisää tunnisteita"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
-#| msgid "_Delete Tag \"%s\""
 msgid "_Delete Tag “%s”"
 msgstr "_Poista tunniste “%s”"
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
-#| msgid "Delete Tag \"%s\""
 msgid "Delete Tag “%s”"
 msgstr "Poista tunniste “%s”"
 
-#: src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Poista tunniste"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
-#| msgid "Re_name Tag \"%s\"..."
 msgid "Re_name Tag “%s”…"
-msgstr "_Nimeä tunniste “%s” uudelleen..."
+msgstr "_Nimeä tunniste “%s” uudelleen…"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Nimeä tunniste “%s” muotoon “%s”"
 
-#: src/Resources.vala:373 ui/tags.ui:454
-#| msgid "_Rename..."
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
 msgstr "Ni_meä uudelleen…"
 
-#: 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 "Modify Tags"
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Muokkaa tu_nnisteita…"
 
-#: src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Muokkaa tunnisteita"
 
-#: src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
-#| msgid "Tag Photo as \"%s\""
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
 msgstr[0] "Aseta kuvalle tunniste “%s”"
 msgstr[1] "Aseta kuville tunniste “%s”"
 
-#: src/Resources.vala:385
+#: src/Resources.vala:386
 #, 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] "Aseta valitulle kuvalle tunniste “%s”"
 msgstr[1] "Aseta valituille kuville tunniste “%s”"
 
-#: src/Resources.vala:391
+#: src/Resources.vala:392
 #, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
 msgstr[0] "Poista _kuvasta tunniste “%s”"
 msgstr[1] "Poista _kuvista tunniste “%s”"
 
-#: src/Resources.vala:397
+#: src/Resources.vala:398
 #, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
 msgstr[0] "Poista kuvasta tunniste “%s”"
 msgstr[1] "Poista kuvista tunniste “%s”"
 
-#: src/Resources.vala:403
+#: src/Resources.vala:404
 #, 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 ""
 "Tunnisteelle ei voida antaa nimeä “%s”, koska sillä nimellä on jo olemassa "
 "tunniste."
 
-#: src/Resources.vala:407
+#: src/Resources.vala:408
 #, 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 ""
 "Haun nimen muuttaminen muotoon “%s” epäonnistui, koska saman niminen haku on "
 "jo olemassa."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Tallennettu haku"
 
-#: src/Resources.vala:412
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Poista haku"
 
-#: src/Resources.vala:415 ui/savedsearch.ui:11
-#| msgid "_Edit"
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Muokkaa…"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:7
-#| msgid "Re_name..."
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Nimeä uudelleen…"
 
-#: src/Resources.vala:419
+#: src/Resources.vala:420
 #, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
 msgid "Rename Search “%s” to “%s”"
 msgstr "Muuta haun “%s” nimi muotoon “%s”"
 
-#: src/Resources.vala:423
+#: src/Resources.vala:424
 #, c-format
-#| msgid "Delete Search \"%s\""
 msgid "Delete Search “%s”"
 msgstr "Poista haku “%s”"
 
-#: src/Resources.vala:560
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Arvostele %s"
 
-#: src/Resources.vala:561
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Aseta arvostelu %s"
 
-#: src/Resources.vala:562
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Asetetaan arvostelu %s"
 
-#: src/Resources.vala:564
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Näytä %s"
 
-#: src/Resources.vala:565
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Näytä vain kuvat, joilla on arvostelu %s"
 
-#: src/Resources.vala:566
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s tai parempi"
 
-#: src/Resources.vala:567
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Näytä %s tai parempi"
 
-#: src/Resources.vala:568
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Näytä vain kuvat, joilla on arvostelu %s tai parempi"
 
-#: src/Resources.vala:659 ui/trash.ui:255
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Poista valitut kuvat roskakorista"
 
-#: src/Resources.vala:660 ui/offline.ui:221
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Poista valitut kuvat kirjastosta"
 
-#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Palauta"
 
-#: src/Resources.vala:663 ui/trash.ui:270
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Siirrä valitut kuvat takaisin kirjastoon"
 
-#: 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
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Avaa _tiedostonhallintaohjelmalla"
 
-#: src/Resources.vala:666
-#| msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Avaa valitun valokuvan sisältävä kansio tiedostonhallinnassa"
 
-#: src/Resources.vala:669
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Tiedostonhallinnan avaaminen ei onnistu: %s"
 
-#: src/Resources.vala:672 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "_Poista kirjastosta"
 
-#: 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
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Siirrä roskakoriin"
 
-#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: src/Resources.vala:677 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 "Valitse _kaikki"
 
-#: src/Resources.vala:677
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Valitse kaikki"
 
@@ -5826,7 +5572,6 @@ msgstr "%a %d. %b %Y"
 #. / 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:744
-#| msgid "%a %b %d"
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
@@ -5835,7 +5580,6 @@ msgstr "%a, %e. %b"
 #. / 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:749
-#| msgid "%d, %Y"
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e., %Y"
@@ -5844,7 +5588,6 @@ msgstr "%e., %Y"
 #. / 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
-#| msgid "%a %b %d"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
@@ -5853,156 +5596,127 @@ msgstr "%a, %e. %b"
 #. / 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
-#| msgid "%a %b %d, %Y"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Diaesitys"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Tallennetut haut"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "sisältää"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "on tarkalleen"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "alkaa"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "päättyy"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "ei ole asetettu"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "on asetettu"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "on"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "ei ole"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "mikä tahansa kuva"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "raakavalokuva"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "video"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "sisältää"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "ei sisällä"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "muokkauksia"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "sisäisiä muokkauksia"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "ulkoisia muokkauksia"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "merkitty"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "ei merkitty"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "ja ylempi"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "vain"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "ja alempi"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "jälkeen"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "ennen"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "on välillä"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "ja"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Etsi"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "OK"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "mikä tahansa"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "kaikki"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "ei mikään"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Mikä tahansa teksti"
@@ -6039,8 +5753,8 @@ msgstr "Merkinnän tila"
 msgid "Photo state"
 msgstr "Kuvan tila"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Arvostelu"
 
@@ -6048,31 +5762,36 @@ msgstr "Arvostelu"
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: src/SearchFilter.vala:815
-#| msgid "Rating"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Tallennetut haut"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Hallitse tallennettuja hakujasi"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ -arvostelu"
 
-#: src/SearchFilter.vala:818
-#| msgid "Rating"
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ -arvostelu"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ -arvostelu"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ -arvostelu"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ -arvostelu"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
-#| msgid "Error loading UI file %s: %s"
 msgid "Error loading search bar UI: %s"
 msgstr "Virhe ladatessa hakupalkin käyttöliittymää: %s"
 
@@ -6081,71 +5800,71 @@ msgstr "Virhe ladatessa hakupalkin käyttöliittymää: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Sulje"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Videot"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW-kuvat"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Käytä tallennettua hkua suodattaaksesi kohteita nykyisessä näkymässä"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Asetukset"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Siirry edelliseen kuvaan"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Tauko"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Laita diaesitys tauolle"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Siirry seuraavaan kuvaan"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Asetukset"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Muuta diaesityksen asetuksia"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Kaikki kuvien lähdetiedostot puuttuvat."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Toista"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Jatka diaesitystä"
 
@@ -6157,7 +5876,7 @@ msgstr "Diaesityksen siirtymät"
 msgid "(None)"
 msgstr "(Ei mitään)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Ei mitään"
 
@@ -6165,53 +5884,51 @@ msgstr "Ei mitään"
 msgid "Random"
 msgstr "Satunnainen"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Tunnisteet"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Hallitse ja selaa kuvien tunnisteita"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "nimetön"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Vie videoita"
 
-#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
 msgid "Toggle _Flag"
 msgstr "Li_ppu päälle/pois"
 
-#: 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
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Kehitin"
 
-#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
-#| msgid "Open With E_xternal Editor"
-msgid "Open with E_xternal Editor"
-msgstr "Avaa ulkoisella _muokkaimella"
-
-#: 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
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
 msgstr "Näytä kuvan _tapahtuma"
 
 #: 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
+#: ui/trash.ui:5
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
-#| msgid "Save _As"
+#: ui/direct.ui:13
 msgid "Save _As…"
 msgstr "Tallenna nim_ellä…"
 
 #: 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
+#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "_Näytä"
 
@@ -6227,7 +5944,7 @@ msgstr "Zoomaus _100 %"
 msgid "Zoom _200%"
 msgstr "Zoomaus _200 %"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Kuva"
 
@@ -6243,29 +5960,26 @@ msgstr "_Seuraava kuva"
 msgid "T_ools"
 msgstr "T_yökalut"
 
-#: 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
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Usein kysytyt kysymykset"
 
-#: 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..."
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Ilmoita ongelmasta…"
 
 #: 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"
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "Tuo kan_siosta…"
 
 #: 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"
 msgid "Import From _Application…"
 msgstr "Tuo so_velluksesta…"
 
@@ -6283,7 +5997,6 @@ msgstr "_Etsi"
 #: 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..."
 msgid "Ne_w Saved Search…"
 msgstr "Uu_si tallennettu haku…"
 
@@ -6310,7 +6023,6 @@ msgstr "S_ivupalkki"
 
 #: 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 "Pin Toolbar"
 msgid "T_oolbar"
 msgstr "T_yökalupalkki"
 
@@ -6336,23 +6048,16 @@ msgstr "_Nousevasti"
 msgid "D_escending"
 msgstr "_Laskevasti"
 
-#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
 msgid "Even_ts"
 msgstr "_Tapahtumat"
 
-#: 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"
-msgid "R_emove from Library"
-msgstr "_Poista kirjastosta"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Nimet"
 
-#: 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
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "_Tunnisteet"
 
@@ -6378,11 +6083,10 @@ msgstr "_Arvostelun mukaan"
 
 #: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
 #: ui/tags.ui:251
-#| msgid "D_escending"
 msgid "_Descending"
 msgstr "_Laskevasti"
 
-#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
 msgid "_Photos"
 msgstr "_Kuvat"
 
@@ -6390,199 +6094,324 @@ msgstr "_Kuvat"
 msgid "_Stop Import"
 msgstr "_Keskeytä tuonti"
 
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "Aseta työpöydän taustakuvaksi"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
-msgstr "Käytä työpöydällä"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
-msgstr "Käytä lukitusnäytössä"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr "Aseta työpöydän diaesitykseksi"
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr "Luo työpöydän taustakuvan diaesitys"
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr "Näytä jokaista kuvaa"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr "ajan"
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "Kuinka kauan tiettyä kuvaa näytetään työpöydän taustakuvana"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "valkoinen"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "musta"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Näyttö"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Taustakuva:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Tuo kuvia:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "_Tarkkaile kirjastoa uusien tiedostojen varalta"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Tuonti"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Kansiorakenne:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Esimerkki:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "Ni_meä tuodut tiedostot uudelleen käyttäen pieniä kirjaimia"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metatiedot"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Kirjoita tunnisteet, nimet ja muut _metatiedot kuvatiedostoihin"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW-kehitin"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Oletus:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "Kaa_va:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Läpinäkyvä tausta:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr ""
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Kiinteä väri"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "_Ulkoinen kuvamuokkain:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Ulkoinen _RAW-muokkain:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Ulkoiset muokkaimet"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ui/shotwell.ui:583
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwellin asetukset"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Tulostetun kuvan koko</b>"
 
-#: ui/shotwell.ui:600
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Käytä _standardikokoa:"
 
-#: ui/shotwell.ui:643
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Käytä _omaa kokoa:"
 
-#: ui/shotwell.ui:731
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "tuumaa"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Vastaa kuvan kuvasuhdetta"
 
-#: ui/shotwell.ui:755
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Automaattinen koko:"
 
-#: ui/shotwell.ui:795
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Nimet</b>"
 
-#: ui/shotwell.ui:812
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Tulosta kuvan _nimi"
 
-#: ui/shotwell.ui:855
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Pikselitarkkuus</b>"
 
-#: ui/shotwell.ui:875
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Tulosta kuva muodossa:"
 
-#: ui/shotwell.ui:909
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "pikseliä tuumalla"
 
-#: ui/shotwell.ui:949
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Etsi"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Peru"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "OK"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
-msgstr "_Haun nimi"
+msgstr "_Haun nimi:"
 
-#: ui/shotwell.ui:1003
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "_Vastaavuus"
 
-#: ui/shotwell.ui:1030
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "mikä tahansa"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "kaikki"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "ei mikään"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "seuraavista:"
 
-#: ui/shotwell.ui:1111
-msgid "label"
-msgstr "nimike"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Aseta työpöydän taustakuvaksi"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Käytä työpöydällä"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Käytä lukitusnäytössä"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Aseta työpöydän diaesitykseksi"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Luo työpöydän taustakuvan diaesitys"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Näytä jokaista kuvaa"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "ajan"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Kuinka kauan tiettyä kuvaa näytetään työpöydän taustakuvana"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Uusi _tunniste…"
 
-#: ui/shotwell.ui:1262
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
-msgstr "_Viive"
+msgstr "_Viive:"
 
-#: ui/shotwell.ui:1276
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "_Siirtymän tehoste:"
 
-#: ui/shotwell.ui:1290
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Siirt_ymän viive:"
 
-#: ui/shotwell.ui:1300
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "N_äytä nimi"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekuntia"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "Uusi _tunniste…"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "nimike"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Poista kaikki kuvat roskakorista"
 
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Anna Flickriin kirjauduttasi verkkoselaimessasi näkyvä valtuutusnumero."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Valtuutus_numero:"
+
+#~ msgid "Width or height"
+#~ msgstr "Leveys tai korkeus"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "“%s” ei ole kelvollinen vastaus OAuth-tunnistautumispyyntöön"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Tervetuloa F-Spot-kirjaston tuontipalveluun.\n"
+#~ "\n"
+#~ "Valitse F-Spot-tietokantatiedosto."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Valitse itse tuotava F-Spot-tietokantatiedosto:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Valitun F-Spot-tietokantatiedoston avaus epäonnistui: tiedostoa ei ole "
+#~ "olemassa tai se ei ole F-Spot-tietokanta"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Valitun F-Spot-tietokantatiedoston avaus epäonnistui: Shotwell ei tue F-"
+#~ "Spot-tietokannan versiota"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
+#~ "tunnistetaulua"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
+#~ "kuvataulua"
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot-kirjasto: %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Valmistaudutaan tuontiin"
+
+#~| msgid "Videos will appear in '%s'"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Videot ilmestyvät sijaintiin “%s”"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Vie kuvia/videoita"
+
+#~| msgid "Open With E_xternal Editor"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Avaa ulkoisella _muokkaimella"
+
+#~| msgid "R_emove From Library"
+#~ msgid "R_emove from Library"
+#~ msgstr "_Poista kirjastosta"
+
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Tekijänoikeus 2009-2015 Yorba Foundation"
 
@@ -6806,9 +6635,6 @@ msgstr "Poista kaikki kuvat roskakorista"
 #~ msgid "The selected photos were successfully published."
 #~ msgstr "Valittujen kuvien julkaisu onnistui."
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Shotwellin asetukset"
-
 #, fuzzy
 #~| msgid ""
 #~| "A file required for publishing is unavailable. Publishing to Flickr "
diff --git a/po/fr.gmo b/po/fr.gmo
index f1b32e2..2d3e11f 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 1057222..415b5e6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 # Translators:
 # Alexandre Franke <alexandre.franke@gmail.com>, 2011, 2015.
 # ttoine <ttoine@ttoine.net>, 2013.
-# Claude Paroz <claude@2xlibre.net>, 2011-2012, 2016.
+# Claude Paroz <claude@2xlibre.net>, 2011-2012, 2016-2017.
 # hellsdark <hellsdark@gmail.com>, 2013.
 # esunyer <emmanuel.sunyer@gmail.com>, 2012.
 # fbourigault <fabien@bourigault.fr>, 2013.
@@ -24,10 +24,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-03-30 02:05+0000\n"
-"PO-Revision-Date: 2016-03-30 08:56+0200\n"
+"POT-Creation-Date: 2017-05-01 18:34+0000\n"
+"PO-Revision-Date: 2017-05-04 22:07+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: français <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -36,13 +36,1453 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../plugins/common/RESTSupport.vala:425
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: ui/tags.ui:356
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Un gestionnaire de photos répandu"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
 msgstr ""
-"Un fichier temporaire nécessaire pour la publication n'est pas disponible"
+"Shotwell est un organiseur de photos simple d'utilisation et rapide, conçu "
+"pour le bureau GNOME. Il permet d'importer des photos à partir d'appareils "
+"photo ou de disques, de les organiser par date et par thème, et même par "
+"notation. Il offre également des fonctionnalités d'édition basiques telles "
+"que le rognage, la correction des yeux rouges, l'ajustement des couleurs et "
+"le redressement. L'éditeur d'image non destructif de Shotwell ne touche pas "
+"aux photos originales, ce qui facilite les essais et la correction d'erreurs."
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+"Lorsque vos photos sont prêtes, Shotwell sait les envoyer à différents sites "
+"Web, tels que Facebook, Flickr, Picasa (Google Plus) et d'autres encore."
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr ""
+"Shotwell prend en charge les formats JPEG, PNG, TIFF ainsi qu'une variété de "
+"formats de fichier RAW."
+
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Les développeurs de Shotwell"
+
+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Gestionnaire de photos"
+
+#: misc/shotwell.desktop.in.in:6
+msgid "Organize your photos"
+msgstr "Organisez vos photos"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in.in:8
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+"album;appareil;appareils;caméra;rognage;édition;amélioration;exporter;"
+"galerie;image;images;importer;organiser;photo;photographies;photos;"
+"impression;publication;rotation;partage;étiquettess;vidéo;facebook;flickr;"
+"picasa;youtube;piwigo;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+msgid "Shotwell Viewer"
+msgstr "Visionneur Shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Visionneur de photos"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "jeton d'authentification"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Jeton d'authentification Yandex-Fotki, si connecté."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Jeton"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "Le jeton pour accéder à tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Jeton secret"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr "Le jeton secret pour signer les requêtes Oauth"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:498
+msgid "default size"
+msgstr "taille par défaut"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+"Un code numérique représentant la taille par défaut pour les photos envoyées "
+"vers Tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "blog par défaut"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr "Le nom du blog par défaut de l'utilisateur, le cas échéant"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "URL de Racje"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+msgid "URL of the Rajce server."
+msgstr "URL du serveur Racje."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "username"
+msgstr "nom d'utilisateur"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Nom d'utilisateur Racje, si connecté."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "jeton"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr "jeton utilisateur, s'il faut s'en souvenir."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:542
+msgid "last category"
+msgstr "dernière catégorie"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr "La dernière catégorie Racje sélectionnée."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:554
+msgid "last photo size"
+msgstr "dernière taille de photo"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+"Un code numérique représentant la dernière taille prédéfinie de photo lors "
+"de la publication vers Rajce."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "se souvenir"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "Si vrai, se souvenir de la dernière connexion."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "masquer l'album"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr "Si vrai, masquer l'album Racje nouvellement créé."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "ouvrir l'album dans le navigateur Web"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+"Si vrai, ouvrir l'album cible dans le navigateur Web juste après l'envoi des "
+"photos"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "remove sensitive info from uploads"
+msgstr "enlever les informations sensibles dans les envois"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+"Indique si les images envoyées vers Racje doivent être préalablement privées "
+"de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr "afficher les propriétés de base"
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr "Si vrai, le volet des propriétés de base est affiché, sinon pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+msgstr "afficher les propriétés étendues"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr "Si vrai, la fenêtre des propriétés étendues est affichée, sinon pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "afficher le panneau latéral"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr "Si vrai, le panneau latéral est affiché, sinon pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "afficher la barre d'outils"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr "Si vrai, la barre d'outils inférieure est affichée, sinon pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "afficher la barre de recherche"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr "Si vrai, la barre d'outils rechercher/filtrer est affichée, sinon pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr "afficher les titres des photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"Si vrai, les titres des photos sont affichés sous les vignettes dans les "
+"vues par collection."
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr "afficher les commentaires des photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"Si vrai, les commentaires des photos sont affichés sous les vignettes dans "
+"les vues par collection."
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr "afficher les commentaire des événements"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+"Si vrai, les commentaires des événements sont affichés sous les vignettes "
+"dans les vues par événement."
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr "afficher les étiquettes des photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+"Si vrai, les étiquettes des photos sont affichés sous les vignettes dans les "
+"vues par collection."
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr "afficher les notes des photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr "Si vrai, les notes des photos sont affichées en surimpression."
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr "niveau de filtrage des notes"
+
+#: 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 ""
+"Détermine le filtrage des photos en fonction de leur notation. 1 : rejetée "
+"ou mieux, 2 : non notée ou mieux, 3 : un ou mieux, 4 : deux ou mieux, 5 : "
+"trois ou mieux, 6 : quatre ou mieux, 7 : cinq ou mieux."
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr "trier les événements par ordre croissant"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+"Si vrai, les événements sont triés par ordre croissant, sinon décroissant."
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "sort library photos ascending"
+msgstr "trier les photos de la bibliothèque par ordre croissant"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+"Si vrai, les photos de la bibliothèque sont triées par ordre croissant, "
+"sinon décroissant."
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr "critères de tri des photos de la bibliothèque"
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+"Un code numérique indiquant les critères de tri des photos dans les vues de "
+"la bibliothèque."
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "sort event photos ascending"
+msgstr "trier les photos des événements par ordre croissant"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+"Si vrai, les photos des événements sont triées par ordre croissant, sinon "
+"décroissant."
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "sort event photos criteria"
+msgstr "critères de tri des photos des événements"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr "Indique les critères de tri des photos des événements."
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "utiliser le format 24 heures"
+
+#: 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 ""
+"Si vrai, les heures sont affichées dans un format 24 heures, sinon elles "
+"utilisent la notation am/pm sur 12 heures."
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr "conserver le temps relatif entre les photos"
+
+#: 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 ""
+"Si vrai, le temps relatif est maintenu lors de l'ajustement de l'heure et de "
+"la date des photos. Sinon, toutes les photos reçoivent la même date/heure."
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid "modify original photo files"
+msgstr "modifier les photos d'origine"
+
+#: 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 ""
+"Si vrai, les fichiers originaux sont aussi modifiés lors de l'ajustement de "
+"l'heure et de la date des photos. Sinon, les modifications ne sont faites "
+"que dans la base de données."
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr "afficher la boîte de dialogue de bienvenue au démarrage"
+
+#: 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 ""
+"Si vrai, une boîte de dialogue de bienvenue apparaît lors du démarrage. "
+"Sinon, elle n'apparaît pas."
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "sidebar position"
+msgstr "position de la barre latérale"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr "La largeur de la barre latérale en pixels"
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr "échelle de vignette des photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr "L'échelle des vignettes de photos, de 72 à 360."
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "pin toolbar state"
+msgstr "état figé de la barre d'outils"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr "Indique si la barre d'outils est figée en mode plein écran."
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+msgid "background color"
+msgstr "couleur d'arrière-plan"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr "Une couleur en niveaux de gris comme couleur d'arrière-plan."
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "arrière-plan pour les images transparentes"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "L'arrière-plan à utiliser pour les images transparentes."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "couleur pour l'arrière-plan de transparence uni"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Couleur à utiliser si l'arrière-plan des images transparentes est défini à "
+"une couleur unie"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr "État de sélection de l'option « masquer les photos »"
+
+#: misc/org.yorba.shotwell.gschema.xml:180
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+"Dernier état de sélection de l'option « masquer les photos déjà importées » "
+"sur la page d'importation."
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+msgid "delay"
+msgstr "délai"
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr "Délai (en secondes) entre les photos en mode diaporama."
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "transition delay"
+msgstr "délai de transition"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+"Temps (en secondes) que dure la transition entre les photos en mode diaporama"
+
+#: misc/org.yorba.shotwell.gschema.xml:199
+msgid "transition effect id"
+msgstr "id d'effet de transition"
+
+#: misc/org.yorba.shotwell.gschema.xml:200
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+"Le nom de l'effet de transition utilisé entre les photos lors du "
+"functionnement en mode diaporama"
+
+#: misc/org.yorba.shotwell.gschema.xml:205
+msgid "Show title"
+msgstr "Afficher le titre"
+
+#: misc/org.yorba.shotwell.gschema.xml:206
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr "Indique si le titre des photos est affiché en mode diaporama"
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "maximize library window"
+msgstr "fenêtre de bibliothèque maximisée"
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "True if library application is maximized, false otherwise."
+msgstr "Si vrai, la fenêtre de la bibliothèque est maximisée."
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "width of library window"
+msgstr "largeur de la fenêtre de bibliothèque"
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "The last recorded width of the library application window."
+msgstr ""
+"Dernière largeur mémorisée de la fenêtre de l'application bibliothèque."
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "height of library window"
+msgstr "hauteur de la fenêtre de bibliothèque"
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded height of the library application window."
+msgstr ""
+"Dernière hauteur mémorisée de la fenêtre de l'application bibliothèque."
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "maximize direct-edit window"
+msgstr "maximiser la fenêtre édition directe"
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr "Si vrai, l'application d'édition directe est maximisée."
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "width of direct-edit window"
+msgstr "largeur de la fenêtre édition directe"
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+"Dernière largeur enregistrée pour la fenêtre d'application d'édition directe."
+
+#: misc/org.yorba.shotwell.gschema.xml:243
+msgid "height of direct-edit window"
+msgstr "hauteur de la fenêtre édition directe"
+
+#: misc/org.yorba.shotwell.gschema.xml:244
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+"Dernière hauteur enregistrée pour la fenêtre d'application d'édition directe."
+
+#: misc/org.yorba.shotwell.gschema.xml:249
+msgid "sidebar divider position"
+msgstr "position de la division de barre latérale"
+
+#: misc/org.yorba.shotwell.gschema.xml:250
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+"Dernière position enregistrée de la division entre la barre latérale et la "
+"zone d'affichage dans la fenêtre d'application photothèque."
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+msgid "import directory"
+msgstr "répertoire d'importation"
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid "Directory in which imported photo files are placed."
+msgstr "Répertoire dans lequel sont placées les photos importées."
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "watch library directory for new files"
+msgstr "détecter les nouveaux fichiers dans le dossier de la photothèque"
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+"Si vrai, les fichiers ajoutés dans le dossier de la photothèque sont "
+"automatiquement importés."
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid "write metadata to master files"
+msgstr "écrire les métadonnées dans les fichiers principaux"
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+"Si vrai, les modifications de métadonnées (étiquettes, titres, etc.) sont "
+"écrites dans le fichier photo principal."
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "use lowercase filenames"
+msgstr "utiliser des noms de fichiers en minuscules"
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+"Si vrai, Shotwell convertit tous les noms de fichiers en minuscules lors de "
+"l'importation de fichiers photos"
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+msgid "directory pattern"
+msgstr "motif de répertoire"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+"Une chaîne contenant un motif de nommage qui sera utilisé pour nommer les "
+"répertoires de photos lors des importations."
+
+#: misc/org.yorba.shotwell.gschema.xml:287
+msgid "directory pattern custom"
+msgstr "motif de répertoire personnalisé"
+
+#: misc/org.yorba.shotwell.gschema.xml:288
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+"Une chaîne contenant un motif de nommage personnalisé qui sera utilisé pour "
+"nommer les répertoires de photos lors des importations."
+
+#: misc/org.yorba.shotwell.gschema.xml:293
+msgid "RAW developer default"
+msgstr "révélateur RAW par défaut"
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr "Option par défaut indiquant quel révélateur RAW Shotwell va utiliser."
+
+#: misc/org.yorba.shotwell.gschema.xml:301
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+"Dernier choix de menu utilisé concernant les proportions lors du rognage."
+
+#: misc/org.yorba.shotwell.gschema.xml:302
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+"Un code numérique représentant le dernier choix de menu de rognage par "
+"l'utilisateur."
+
+#: misc/org.yorba.shotwell.gschema.xml:306
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+"Dernier choix personnalisé de numérateur de proportions lors du rognage."
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+"Un entier positif plus grand que zéro représentant la largeur des "
+"proportions de rognage que l'utilisateur a saisi en dernier."
+
+#: misc/org.yorba.shotwell.gschema.xml:311
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+"Dernier choix personnalisé de dénominateur de proportions lors du rognage."
+
+#: misc/org.yorba.shotwell.gschema.xml:312
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+"Un entier positif plus grand que zéro représentant la hauteur des "
+"proportions de rognage que l'utilisateur a saisi en dernier."
+
+#: misc/org.yorba.shotwell.gschema.xml:319
+msgid "external photo editor"
+msgstr "éditeur de photo externe"
+
+#: misc/org.yorba.shotwell.gschema.xml:320
+msgid "External application used to edit photos."
+msgstr "Application externe pour modifier les photos."
+
+#: misc/org.yorba.shotwell.gschema.xml:325
+msgid "external raw editor"
+msgstr "éditeur raw externe"
+
+#: misc/org.yorba.shotwell.gschema.xml:326
+msgid "External application used to edit RAW photos."
+msgstr "Application externe pour l'édition des photos RAW."
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: how to trim images"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : comment découper les images"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "export metadata"
+msgstr "exporter les métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: option to export metadata"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : option pour exporter les "
+"métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "format setting, special value"
+msgstr "paramètre de format, valeur spéciale"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : paramètre de format, "
+"valeur spéciale"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "format setting, type value"
+msgstr "paramètre de format, valeur de type"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : paramètre de format, "
+"valeur de type"
+
+#: misc/org.yorba.shotwell.gschema.xml:388
+msgid "JPEG quality option"
+msgstr "option de qualité JPEG"
+
+#: misc/org.yorba.shotwell.gschema.xml:389
+msgid "Setting in export dialog: jpeg quality option"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : option de qualité JPEG"
+
+#: misc/org.yorba.shotwell.gschema.xml:394
+msgid "maximal size of image"
+msgstr "taille d'image maximale"
+
+#: misc/org.yorba.shotwell.gschema.xml:395
+msgid "Setting in export dialog: maximal size of image"
+msgstr ""
+"Paramètre de la boîte de dialogue d'exportation : taille d'image maximale"
+
+#: misc/org.yorba.shotwell.gschema.xml:402
+msgid "last used publishing service"
+msgstr "dernier service de publication utilisé"
+
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+"Un code numérique représentant le dernier service sur lequel des photos ont "
+"été publiées"
+
+#: misc/org.yorba.shotwell.gschema.xml:408
+msgid "default publishing service"
+msgstr "service de publication par défaut"
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "access token"
+msgstr "jeton d'accès"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+"Jeton OAuth Facebook pour la session actuellement connectée, le cas échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+msgid "user i.d."
+msgstr "identifiant utilisateur"
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+"Identifiant utilisateur Facebook pour l'utilisateur actuellement connecté, "
+"le cas échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:434
+msgid "user name"
+msgstr "nom d'utilisateur"
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "Le nom de l'utilisateur Facebook actuellement connecté, le cas échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
+msgid "default size code"
+msgstr "code de taille par défaut"
+
+#: misc/org.yorba.shotwell.gschema.xml:441
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+"Un code numérique représentant la taille par défaut des photos publiées sur "
+"Facebook"
+
+#: misc/org.yorba.shotwell.gschema.xml:447
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+"Indique si les images envoyées vers Facebook doivent être préalablement "
+"privées de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:454
+msgid "OAuth Access Phase Token"
+msgstr "Jeton de phase d'accès OAuth"
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+"Le jeton d'autorisation de l'utilisateur Flickr actuellement connecté, le "
+"cas échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "OAuth Access Phase Token Secret"
+msgstr "Élément secret du jeton de phase d'accès OAuth"
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+"Le secret cryptographique utilisé pour signer les requêtes du jeton "
+"d'autorisation pour l'utilisateur Flickr actuellement connecté, le cas "
+"échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+"Le nom d'utilisateur de l'utilisateur Flickr actuellement connecté, le cas "
+"échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+"Un code numérique représentant la taille par défaut des photos publiées sur "
+"Flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:478
+msgid "default visibility"
+msgstr "visibilité par défaut"
+
+#: misc/org.yorba.shotwell.gschema.xml:479
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+"Un code numérique représentant la visibilité par défaut des photos publiées "
+"sur Flickr"
 
-#: ../plugins/common/RESTSupport.vala:1145
+#: misc/org.yorba.shotwell.gschema.xml:485
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+"Indique si les images envoyées vers Flickr doivent être préalablement "
+"privées de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
+msgid "refresh token"
+msgstr "jeton d'actualisation"
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+"Le jeton OAuth utilisé pour actualiser la session Picasa Web Albums pour "
+"l'utilisateur actuellement connecté, le cas échéant."
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+"Un code numérique représentant la taille par défaut des photos publiées sur "
+"Picasa Web Albums"
+
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "last album"
+msgstr "dernier album"
+
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+"Le nom du dernier album dans lequel l'utilisateur a publié des photos, le "
+"cas échéant"
+
+#: misc/org.yorba.shotwell.gschema.xml:511
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+"Indique si les images envoyées vers Picasa doivent être préalablement "
+"privées de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "Piwigo URL"
+msgstr "URL Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "URL of the Piwigo server."
+msgstr "URL du serveur Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "Piwigo username, if logged in."
+msgstr "Nom d'utilisateur Piwigo, si connecté."
+
+#: misc/org.yorba.shotwell.gschema.xml:530
+msgid "password"
+msgstr "mot de passe"
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "Piwigo password, if logged in."
+msgstr "Mot de passe Piwigo, si connecté."
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "remember password"
+msgstr "se souvenir du mot de passe"
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "If true, remember the Piwigo password."
+msgstr "Si vrai, se souvenir du mot de passe Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid "The last selected Piwigo category."
+msgstr "La dernière catégorie Piwigo sélectionnée."
+
+#: misc/org.yorba.shotwell.gschema.xml:548
+msgid "last permission level"
+msgstr "dernier niveau de permission"
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid "The last chosen Piwigo permission level."
+msgstr "Le dernier niveau de permission Piwigo choisi."
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+"Un code numérique représentant la dernière taille prédéfinie de photo lors "
+"de la publication vers Piwigo."
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+"Indique si les images envoyées vers Piwigo doivent être préalablement "
+"privées de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:566
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+"si un titre est défini et qu'il n'y a pas de commentaire, utiliser le titre "
+"comme commentaire pour les envois vers Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:567
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+"Indique si le commentaire des images envoyées à Piwigo doit être déduit du "
+"titre lorsque le titre est défini alors que le commentaire ne l'est pas"
+
+#: misc/org.yorba.shotwell.gschema.xml:572
+msgid "do not upload tags when uploading to Piwigo"
+msgstr "ne pas envoyer les étiquettes lors des envois vers Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:573
+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 ""
+"Indique si les étiquettes des images sont retirées avant d'envoyer celles-ci "
+"vers Piwigo pour que ces étiquettes ne figurent pas sur le serveur Piwigo "
+"distant."
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 username"
+msgstr "Nom d'utilisateur Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "API key"
+msgstr "clé d'API"
+
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "Gallery3 API key"
+msgstr "Clé d'API de Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid "Gallery3 site URL"
+msgstr "URL du site Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+"Indique si les images envoyées vers Gallery3 doivent être préalablement "
+"privées de leurs métadonnées"
+
+#: misc/org.yorba.shotwell.gschema.xml:610
+msgid "scaling constraint of uploaded picture"
+msgstr "contrainte de mise à l'échelle des images envoyées"
+
+#: misc/org.yorba.shotwell.gschema.xml:611
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr "L'identifiant de contrainte d'échelle de l'image à envoyer"
+
+#: misc/org.yorba.shotwell.gschema.xml:616
+msgid "pixels of the major axis uploaded picture"
+msgstr "pixels de l'axe principal des images envoyées"
+
+#: misc/org.yorba.shotwell.gschema.xml:617
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+"Les pixels de l'axe principal des images à envoyer ; utilisé seulement quand "
+"scaling-constraint-id contient une valeur appropriée"
+
+#: misc/org.yorba.shotwell.gschema.xml:625
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+"Le jeton OAuth utilisé pour actualiser la session YouTube pour l'utilisateur "
+"actuellement connecté, le cas échéant."
+
+#: misc/org.yorba.shotwell.gschema.xml:632
+msgid "last used import service"
+msgstr "dernier service d'importation utilisé"
+
+#: misc/org.yorba.shotwell.gschema.xml:633
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+"Un code numérique représentant le dernier service à partir duquel des photos "
+"ont été importées"
+
+#: misc/org.yorba.shotwell.gschema.xml:640
+msgid "interpreter state cookie"
+msgstr "cookie d'état d'interpréteur"
+
+#: misc/org.yorba.shotwell.gschema.xml:641
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+"Un code numérique qui capture l'état de l'environnement des greffons de "
+"GStreamer"
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content layout mode"
+msgstr "mode de disposition de contenu"
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+"Un code numérique décrivant la disposition des photos sur une page lors de "
+"l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+msgid "content ppi"
+msgstr "ppp de contenu"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+"Nombre de pixels par pouce (ppp) envoyé à l'imprimante durant l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+msgid "content width"
+msgstr "largeur de contenu"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid "The width of the printed emulsion on the page when printing"
+msgstr "La largeur de l'émulsion imprimée sur la page durant l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+msgid "content height"
+msgstr "hauteur de contenu"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid "The height of the printed emulsion on the page when printing"
+msgstr "La hauteur de l'émulsion imprimée sur la page durant l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "content units"
+msgstr "unités de contenu"
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+"Un code numérique représentant l'unité de mesure (pouces ou centimètres) "
+"utilisée lors de l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+msgid "images per page code"
+msgstr "code d'images par page"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+"Un code numérique représentant le mode d'images par page actuellement "
+"sélectionné utilisé pour l'impression"
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+msgid "size selection"
+msgstr "sélection de taille"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+"L'indice de la taille d'impression actuelle dans une liste prédéfinie de "
+"tailles standard"
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "match aspect ratio"
+msgstr "conserver les proportions"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+"Détermine si les tailles d'impression personnalisées doivent correspondre "
+"aux proportions de la photo d'origine"
+
+#: misc/org.yorba.shotwell.gschema.xml:696
+msgid "print titles"
+msgstr "imprimer les titres"
+
+#: misc/org.yorba.shotwell.gschema.xml:697
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr "Si vrai, le titre des photos est imprimé lors de l'impression."
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "titles font"
+msgstr "police des titres"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+"Le nom de la police à utiliser pour les titres des photos lors de leur "
+"impression."
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable facebook publishing plugin"
+msgstr "activer le greffon de publication vers Facebook"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Facebook est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+msgid "enable flickr publishing plugin"
+msgstr "activer le greffon de publication vers Flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Flickr est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable picasa publishing plugin"
+msgstr "activer le greffon de publication vers Picasa"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Picasa Web Albums est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable youtube publishing plugin"
+msgstr "activer le greffon de publication vers YouTube"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers YouTube est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+msgid "enable piwigo publishing plugin"
+msgstr "activer le greffon de publication vers Piwigo"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Piwigo est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+msgid "enable yandex publishing plugin"
+msgstr "activer le greffon de publication vers Yandex"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Yandex.Fotki est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+msgid "enable tumblr publishing plugin"
+msgstr "activer le greffon de publication vers Tumblr"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Tumblr est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable rajce publishing plugin"
+msgstr "activer le greffon de publication vers Racje"
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Racje est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+msgid "enable gallery3 publishing plugin"
+msgstr "activer le greffon de publication vers Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de publication vers Gallery3 est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+msgid "enable F-Spot import plugin"
+msgstr "activer le greffon d'importation F-Spot"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon d'importation F-Spot est activé"
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+msgid "enable slideshow crumble transition"
+msgstr "activer la transition de diaporama Dissolution"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Dissolution est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+msgid "enable slideshow fade transition"
+msgstr "activer la transition de diaporama Fondu"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Fondu est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+msgid "enable slideshow slide transition"
+msgstr "activer la transition de diaporama Glissement"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Glissement est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow clock transition"
+msgstr "activer la transition de diaporama Horloge"
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Horloge est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow circle transition"
+msgstr "activer la transition de diaporama Cercle"
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Cercle est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+msgid "enable slideshow circles transition"
+msgstr "activer la transition de diaporama Cercle"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Cercles est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+msgid "enable slideshow blinds transition"
+msgstr "activer la transition de diaporama Stores"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Stores est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+msgid "enable slideshow squares transition"
+msgstr "activer la transition de diaporama Carrés"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Carrés est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:822
+msgid "enable slideshow stripes transition"
+msgstr "activer la transition de diaporama Rayures"
+
+#: misc/org.yorba.shotwell.gschema.xml:823
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Rayures est activé."
+
+#: misc/org.yorba.shotwell.gschema.xml:828
+msgid "enable slideshow chess transition"
+msgstr "activer la transition de diaporama Damier"
+
+#: misc/org.yorba.shotwell.gschema.xml:829
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr "Si vrai, le greffon de transition de diaporama Damier est activé."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Vous n'êtes actuellement pas connecté sur Facebook.\n"
+"\n"
+"Si vous n'avez pas encore de compte Facebook, vous pouvez en créer un durant "
+"le processus de connexion. Lors de la connexion, Shotwell Connect pourrait "
+"vous demander la permission d'envoyer des photos et de les publier sur votre "
+"flux de diffusion. Ces permissions sont nécessaires pour que Shotwell "
+"Connect fonctionne correctement."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Vous vous êtes déjà connecté et déconnecté de Facebook durant cette session "
+"de Shotwell.\n"
+"Pour continuer à publier sur Facebook, quittez et redémarrez Shotwell, puis "
+"essayez de publier à nouveau."
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"Saisissez le numéro de confirmation qui apparaît dans votre navigateur Web "
+"après vous être connecté à Flickr."
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
+msgid "Authorization _Number:"
+msgstr "_Numéro d'autorisation :"
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Pour_suivre"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Vous n'êtes actuellement pas connecté à Flickr.\n"
+"\n"
+"Cliquez sur « Se connecter » pour lancer la connexion dans votre navigateur "
+"Web. Vous devrez autoriser Shotwell Connect à se lier à votre compte Flickr."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+msgid "Preparing for login…"
+msgstr "Préparation de la connexion…"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
+#: plugins/shotwell-publishing/FlickrPublishing.vala:341
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Un fichier requis pour la publication est indisponible. Impossible de "
+"continuer la publication vers Flickr."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+msgid "Verifying authorization…"
+msgstr "Vérification de l'autorisation…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -53,14 +1493,41 @@ msgstr ""
 "Vous vous êtes déjà connecté et déconnecté d'un service Google durant cette "
 "session Shotwell.\n"
 "\n"
-"Pour continuer à publier vers les services Google, quittez et redémarrez "
+"Pour continuer à publier sur les services Google, quittez et redémarrez "
 "Shotwell, puis essayez à nouveau de publier."
 
-#: ../plugins/common/Resources.vala:9
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Vous n'êtes actuellement pas connecté à Picasa Web Albums.\n"
+"\n"
+"Cliquez sur « Se connecter » pour vous connecter à Picasa Web Albums avec "
+"votre navigateur. Vous devrez autoriser Shotwell Connect à communiquer avec "
+"votre compte Picasa Web Albums."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+msgid ""
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
+msgstr ""
+"Vous n'êtes actuellement pas connecté à YouTube.\n"
+"\n"
+"Vous devez déjà avoir un compte Google dont l'accès à YouTube a été activé "
+"pour continuer. Vous pouvez activer la plupart des comptes en vous "
+"connectant au moins une fois au site de YouTube à l'aide d'un navigateur."
+
+#: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Visiter la page du projet Shotwell"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:604
 msgid "translator-credits"
 msgstr ""
 "Gabriel Bousquet <gbousque@clipper.ens.fr>\n"
@@ -70,109 +1537,164 @@ msgstr ""
 "Emmanuel Sunyer <emmanuel.sunyer@gmail.com>\n"
 "Guillaume Bernard <translate@filorin.fr>"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: ../src/Resources.vala:27
-msgid "Copyright 2009-2015 Yorba Foundation"
-msgstr "Copyright 2009-2015 Fondation Yorba"
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
 msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
+"⚫ This website presented identification that belongs to a different website."
 msgstr ""
-"Bienvenue dans le service d'importation de photothèques F-Spot.\n"
-"\n"
-"Veuillez sélectionner une photothèque à importer, soit en sélectionnant une "
-"parmi celles trouvées par Shotwell, soit en sélectionnant un autre fichier "
-"de base de données F-Spot."
+"⚫ Ce site Web a présenté une identification appartenant à un autre site."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
 msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
 msgstr ""
-"Bienvenue dans le service d'importation de photothèques F-Spot.\n"
-"\n"
-"Veuillez sélectionner un fichier de base de données F-Spot."
+"⚫ L'identification de ce site Web est trop ancienne. Vérifiez la date sur "
+"l'agenda de votre ordinateur."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
+msgid ""
+"⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
-"Sélectionnez manuellement un fichier de base de données F-Spot à importer :"
+"⚫ L'identification de ce site Web n'a pas été émise par une organisation "
+"certifiée."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
 msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
+"⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
-"Impossible d'ouvrir le fichier de base de données F-Spot sélectionné : le "
-"fichier n'existe pas ou n'est pas une base de données F-Spot"
+"⚫ L'identification de ce site Web n'a pas pu être examinée. Elle pourrait "
+"être endommagée."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
 msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
 msgstr ""
-"Impossible d'ouvrir le fichier de base de données F-Spot sélectionné : cette "
-"version de base de données F-Spot n'est pas prise en charge par Shotwell"
+"⚫ L'identification de ce site Web a été révoquée par l'organisation "
+"certifiée qui l'a émise."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
 msgstr ""
-"Impossible d'ouvrir le fichier de base de données F-Spot sélectionné : "
-"erreur lors de la lecture de la table des étiquettes"
+"⚫ L'identification de ce site Web n'est pas fiable car elle utilise un "
+"chiffrement très faible."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
 msgstr ""
-"Impossible d'ouvrir le fichier de base de données F-Spot sélectionné : "
-"erreur lors de la lecture de la table des photos"
+"⚫ L'identification de ce site Web n'est valide que pour le futur. Vérifiez "
+"la date sur l'agenda de votre ordinateur."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
+#: plugins/common/RESTSupport.vala:509
+#: plugins/shotwell-publishing/TumblrPublishing.vala:959
+msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
-"Shotwell a trouvé %d photos dans la photothèque F-Spot et est en train de "
-"les importer. Les doublons seront automatiquement détectés et supprimés.\n"
-"\n"
-"Vous pouvez fermer cette fenêtre et commencer à utiliser Shotwell pendant "
-"que l'importation se poursuit en tâche de fond."
+"Un fichier temporaire nécessaire pour la publication n'est pas disponible"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Photothèque F-Spot : %s"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr "URL de Gallery3 :"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
-msgid "Preparing to import"
-msgstr "Importation en préparation"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "_Identifiant :"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Services de base d'importation de données"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "_Mot de passe :"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Revenir en arrière"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:363
+msgid "_Log in"
+msgstr "_Se connecter"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr "Clé API :"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
+msgstr "ou"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Un album e_xistant :"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "Un _nouvel album :"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Supprimer l'emplacement, les étiquettes et autres informations permettant "
+"d'identifier l'appareil avant d'envoyer les photos"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+msgid "Scaling constraint:"
+msgstr "Contrainte d'échelle :"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr "pixels"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Taille originale"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Largeur ou hauteur"
+
+#: 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/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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "Se _déconnecter"
+
+#: 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/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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Publier"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Module de publication Gallery3"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -184,29 +1706,24 @@ msgstr ""
 "Vous devez déjà avoir un compte Gallery3 pour continuer la procédure de "
 "connexion."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
 msgstr "Répertoire par défaut de Shotwell"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
 "Le fichier « %s » est peut-être non pris en charge ou trop gros pour cette "
 "instance de Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
@@ -215,11 +1732,11 @@ msgstr ""
 "Veuillez noter que Gallery3 ne prend en charge que les formats vidéos que "
 "Flowplayer prend en charge."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Un fichier requis pour la publication est indisponible. Impossible de "
@@ -227,12 +1744,12 @@ msgstr ""
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "Publier sur %s en tant que %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -240,7 +1757,7 @@ msgstr ""
 "Entrez l'URL pour votre site Gallery3 et les identifiants (ou la clé API) "
 "pour votre compte Gallery3."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -249,7 +1766,7 @@ msgstr ""
 "ré-essayer entrez à nouveau votre mot de passe et nom d'utilisateur ci-"
 "dessous."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -259,389 +1776,202 @@ msgstr ""
 "Gallery3. Assurez-vous de l'avoir renseignée correctement et qu'elle n'ait "
 "pas d'autres composants (ex : index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Utilisateur non reconnu"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
-msgstr "Site non trouvé"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Copyright (C) 2013 rajce.net"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
-msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr ""
-"Un message d'erreur est apparu lors de la publication sur Rajce. Veuillez "
-"réessayer."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-msgid "Enter email and password associated with your Rajce account."
-msgstr ""
-"Saisissez le nom d'utilisateur et le mot de passe de votre compte Racje."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
-msgid "Invalid email and/or password. Please try again"
-msgstr "Adresse de courriel et/ou mot de passe non valide. Veuillez réessayer."
+msgstr " Site non trouvé"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
-msgid "Invalid User Email or Password"
-msgstr ""
-"L'adresse de courriel de l'utilisateur ou le mot de passe n'est pas valide."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "Adresse él_ectronique"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:82
 msgid "_Password"
 msgstr "_Mot de passe"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Se souvenir de moi"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Connexion"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
-msgid "_Hide album"
-msgstr "_Cacher l'album"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#, c-format
-msgid "You are logged into Rajce as %s."
-msgstr "Vous êtes connecté sur Rajce en tant que %s."
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:104
+msgid "Log in"
+msgstr "Se connecter"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Les photos apparaîtront dans :"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
 msgstr "Un album e_xistant :"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 msgid "A _new album named:"
 msgstr "Un _nouvel album appelé :"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+msgid "_Hide album"
+msgstr "_Cacher l'album"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Ouverture de l'_album cible dans le navigateur"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "_Publier"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "Se _déconnecter"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 pixels"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 pixels"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 pixels"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+msgid "Copyright © 2013 rajce.net"
+msgstr "Copyright © 2013 rajce.net"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr ""
-"« %s » n'est pas une réponse valide à une demande d'authentification OAuth"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr ""
-"TumblrPublisher: start( ): impossible de démarrer ; cette publication n'est "
-"pas redémarrable."
+"Un message d'erreur est apparu lors de la publication sur Rajce. Veuillez "
+"réessayer."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
-msgid "Enter the username and password associated with your Tumblr account."
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+msgid "Enter email and password associated with your Rajce account."
 msgstr ""
-"Saisissez le nom d'utilisateur et le mot de passe de votre compte Tumblr."
+"Saisissez le nom d'utilisateur et le mot de passe de votre compte Racje."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-msgid "Username and/or password invalid. Please try again"
-msgstr "Identifiant et/ou mot de passe non valide. Veuillez réessayer."
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+msgid "Invalid email and/or password. Please try again"
+msgstr "Adresse de courriel et/ou mot de passe non valide. Veuillez réessayer."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-msgid "Invalid User Name or Password"
-msgstr "Le nom d'utilisateur ou le mot de passe n'est pas valide."
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+msgid "Invalid User Email or Password"
+msgstr ""
+"L'adresse de courriel de l'utilisateur ou le mot de passe n'est pas valide."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Could not load UI: %s"
-msgstr "Impossible de charger l'IHM : %s"
+msgid "You are logged into Rajce as %s."
+msgstr "Vous êtes connecté sur Rajce en tant que %s."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Vous êtes connecté à Tumblr comme %s.\n"
-"\n"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
+msgid "Photos will appear in:"
+msgstr "Les photos apparaîtront dans :"
+
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
+msgid "Shotwell Extra Publishing Services"
+msgstr "Services annexes de publication Shotwell"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Visitez le site Web Yandex.Fotki"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:659
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Vous n'êtes actuellement pas connecté à Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Services annexes de publication Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "_Revenir en arrière"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:42
-msgid "_Login"
-msgstr "_Se connecter"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr "Message d'accueil remplacé à l'exécution"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "URL de Gallery3 :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "_Identifiant :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "_Mot de passe :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "Clé API :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "ou"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "Un _nouvel album :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "Un album e_xistant :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr ""
-"_Supprimer l'emplacement, les étiquettes et autres informations permettant "
-"d'identifier l'appareil avant d'envoyer les photos"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr ""
-"'Publication vers $url en tant que $username' (rempli dans le code de "
-"l'application)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "Contrainte d'échelle :"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "pixels"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Taille originale"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Largeur ou hauteur"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:14
-msgid "label"
-msgstr "étiquette"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Blogs :"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
-msgid "Photo _size:"
-msgstr "_Taille de la photo :"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Public"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "Vous êtes connecté sur rajce en tant que $name"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Amis"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-msgid "$mediatype will appear in"
-msgstr "Les $mediatype apparaîtront dans"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Privées"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albums (ou créer un nouveau) :"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Type d'accès :"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Désactiver les _commentaires"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Interdire le téléchargement de la photo originale"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "Public"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "Publier sur un album e_xistant :"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1195
-msgid "Friends"
-msgstr "Amis"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "Créer un _nouvel album nommé :"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privées"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+msgid "Upload _size:"
+msgstr "_Taille d'envoi :"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
+msgid "Videos and new photo albums _visible to:"
+msgstr "Vidéos et nouveaux albums photos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: 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:59
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 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."
+"_Remove location, camera, and other identifying information before uploading"
 msgstr ""
-"Vous n'êtes actuellement pas connecté sur Facebook.\n"
-"\n"
-"Si vous n'avez pas encore de compte Facebook, vous pouvez en créer un durant "
-"le processus de connexion. Lors de la connexion, Shotwell Connect pourrait "
-"vous demander la permission d'envoyer des photos et de les publier sur votre "
-"flux de diffusion. Ces permissions sont nécessaires pour que Shotwell "
-"Connect fonctionne correctement."
+"_Supprimer l'emplacement, l'appareil et d'autres informations "
+"d'identification avant d'envoyer les photos"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Vous vous êtes déjà connecté et déconnecté de Facebook durant cette session "
-"de Shotwell.\n"
-"Pour continuer à publier sur Facebook, quittez et redémarrez Shotwell, puis "
-"essayez de publier à nouveau."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
+msgid "Shotwell Connect"
+msgstr "Shotwell Connect"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standard (720 pixels)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Grand (2048 pixels)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Test de la connexion avec Facebook..."
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Création d'un album..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
+msgstr "Création d'un album…"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 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 ""
 "Un fichier requis pour la publication est indisponible. Impossible de "
 "continuer la publication vers Facebook"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -650,67 +1980,27 @@ msgstr ""
 "Vous êtes connecté sur Facebook en tant que %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Où voulez-vous publier les photos sélectionnées ?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1035
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "_Taille d'envoi :"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1194
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Seulement moi"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1196
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Tout le monde"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:61
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Vous n'êtes actuellement pas connecté à Flickr.\n"
-"\n"
-"Cliquez sur « Se connecter » pour lancer la connexion dans votre navigateur "
-"Web. Vous devrez autoriser Shotwell Connect à se lier à votre compte Flickr."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Vous vous êtes déjà connecté et déconnecté de Flickr durant cette session de "
-"Shotwell.\n"
-"Pour continuer à publier sur Flickr, quittez et redémarrez Shotwell, puis "
-"essayez de publier à nouveau."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Préparation de la connexion…"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"Un fichier requis pour la publication est indisponible. Impossible de "
-"continuer la publication vers Flickr"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Vérification de l'autorisation…"
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Taille de la photo :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -719,129 +2009,209 @@ msgstr ""
 "Vous êtes connecté sur Flickr en tant que %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#: plugins/shotwell-publishing/FlickrPublishing.vala:802
 #, 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] ""
-"Votre compte Flickr gratuit limite la quantité de données que vous pouvez "
-"envoyer par mois.\n"
-"Ce mois-ci, vous pouvez encore envoyer %d mégaoctet avant d'atteindre votre "
-"quota."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Votre compte Flickr gratuit limite la quantité de données que vous pouvez "
 "envoyer par mois.\n"
-"Ce mois-ci, vous pouvez encore envoyer %d mégaoctets avant d'atteindre votre "
-"quota."
+"Ce mois-ci, vous pouvez encore envoyer %s avant d'atteindre votre quota."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Votre compte Fickr Pro vous donne droit d'envoyer autant de photos que vous "
 "le voulez."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Photos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Vidéos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Photos et vidéos _visibles pour :"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Seulement les amis et la famille"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Uniquement la famille"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Uniquement les amis"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 pixels"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:876
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pixels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:106
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pixels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 pixels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 pixels"
+
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+msgid "Photo _size preset:"
+msgstr "_Taille prédéfinie des photos :"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Vous n'êtes actuellement pas connecté à Picasa Web Albums.\n"
-"\n"
-"Cliquez sur « Se connecter » pour vous connecter à Picasa Web Albums avec "
-"votre navigateur. Vous devrez autoriser Shotwell Connect à communiquer avec "
-"votre compte Picasa Web Albums"
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+msgid "Default album"
+msgstr "Album par défaut"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 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 ""
 "Un fichier requis pour la publication est indisponible. Impossible de "
 "continuer la publication vers Picasa."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Vous êtes connecté sur Picasa Web Albums en tant que %s."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Les vidéos apparaîtront dans :"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Petit (640 x 480 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+msgid "Small (640 × 480 pixels)"
+msgstr "Petit (640 × 480 pixels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Moyen (1024x 768 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Moyen (1024 × 768 pixels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Recommandé (1600 x 1200 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Recommandé (1600 × 1200 pixels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 pixels)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Taille originale"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL de votre photothèque Piwigo"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+msgid "User _name"
+msgstr "_Nom d'utilisateur"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Se souvenir du mot de passe"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Une catégorie _existante"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "Un _nouvel album appelé"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "dans la catégorie"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Commentaire d'album"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Les photos seront _visibles par"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Taille de la photo"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Si un titre est défini et qu'il n'y a pas de commentaire, utiliser le titre "
+"comme commentaire"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "Ne _pas envoyer les étiquettes"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:296 ui/collection.ui:192
+msgid "Publish"
+msgstr "Publier"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
+msgid "Creating album %s…"
 msgstr "Album %s en cours de création…"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 "Un message d'erreur est apparu lors de la publication sur Piwigo. Veuillez "
 "réessayer."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#. %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 ""
+"Cela n'a pas l'air d'être le vrai <b>%s</b>. Il se pourrait que des "
+"attaquants essaient de voler ou de modifier des informations vers ou en "
+"provenance de ce site (par exemple, des messages privés, des informations de "
+"carte de crédit ou des mots de passe)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certificat de %s"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
+msgid "_OK"
+msgstr "_Valider"
+
+#: 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."
@@ -849,7 +2219,7 @@ msgstr ""
 "Saisissez l'URL de la photothèque Piwigo ainsi que le nom d'utilisateur et "
 "le mot de passe associés à votre compte Piwigo pour cette photothèque."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -857,291 +2227,235 @@ msgstr ""
 "Shotwell n'arrive pas à atteindre votre photothèque Piwigo. Veuillez "
 "vérifier l'URL saisie"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+#: plugins/shotwell-publishing/TumblrPublishing.vala:588
+msgid "Username and/or password invalid. Please try again"
+msgstr "Nom d'utilisateur et/ou mot de passe non valide. Veuillez réessayer."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "L'URL n'est pas valide."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+#: plugins/shotwell-publishing/TumblrPublishing.vala:615
+msgid "Invalid User Name or Password"
+msgstr "Le nom d'utilisateur ou le mot de passe n'est pas valide."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administrateurs, Famille, Amis, Contacts"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administrateurs, Famille, Amis"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administrateurs, Famille"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administrateurs"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"You are not currently logged into YouTube.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
-msgstr ""
-"Vous n'êtes actuellement pas connecté à YouTube.\n"
-"\n"
-"Vous devez déjà avoir un compte Google dont l'accès à YouTube a été activé "
-"pour continuer. Vous pouvez activer la plupart des comptes en vous "
-"connectant au moins une fois au site de YouTube à l'aide d'un navigateur."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Cette connexion n'est pas sûre"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"Un fichier requis pour la publication est indisponible. Impossible de "
-"continuer la publication vers Youtube."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Afficher le certificat…"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Vous êtes connecté à YouTube en tant que %s."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Je comprends et je souhaite _poursuivre."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Les vidéos apparaîtront dans « %s »"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Publiques"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Non répertoriées"
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
+msgid "Core Publishing Services"
+msgstr "Services de publication principaux"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "Publier vers un album e_xistant :"
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs :"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Créer un _nouvel album nommé :"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:36
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Vidéos et nouveaux albums photos _visibles pour :"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:107
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pixels"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:311
+#: plugins/shotwell-publishing/TumblrPublishing.vala:321
+#, c-format
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
 msgstr ""
-"_Supprimer l'emplacement, l'appareil et d'autres informations "
-"d'identification avant d'envoyer les photos"
+"« %s » n'est pas une réponse valide à une demande d'authentification OAuth"
 
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+#: plugins/shotwell-publishing/TumblrPublishing.vala:559
 msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
-"Saisissez le numéro de confirmation qui apparaît dans votre navigateur Web "
-"après vous être connecté à Flickr."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "_Numéro d'autorisation :"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Pour_suivre"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "L_ister l'album dans la galerie publique"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "_Taille préétablie des photos :"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL de votre photothèque Piwigo"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "_Identifiant"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Se souvenir du mot de passe"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "Une catégorie _existante :"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Les photos seront _visibles par :"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Taille de la photo :"
+"TumblrPublisher: start( ): impossible de démarrer ; cette publication n'est "
+"pas redémarrable."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "dans la catégorie :"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:587
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Saisissez le nom d'utilisateur et le mot de passe de votre compte Tumblr."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Commentaire d'album :"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing/TumblrPublishing.vala:753
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Impossible de charger l'IHM : %s"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:735
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
 msgstr ""
-"_Si un titre est défini et qu'il n'y a pas de commentaire, utiliser le titre "
-"comme commentaire"
+"Vous êtes connecté à Tumblr comme %s.\n"
+"\n"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "Ne _pas envoyer les étiquettes"
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Paramètre de _confidentialité des vidéos :"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Déconnexion"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
+msgid ""
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
+"continue."
+msgstr ""
+"Un fichier requis pour la publication est indisponible. Impossible de "
+"continuer la publication vers Youtube."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:303
-msgid "Publish"
-msgstr "Publier"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
+#, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "Vous êtes connecté à YouTube en tant que %s."
 
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Services de publication principaux"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
+msgid "Public listed"
+msgstr "Publiques"
 
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "Paramètre de _confidentialité des vidéos :"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
+msgid "Public unlisted"
+msgstr "Non répertoriées"
 
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Stores"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Damier"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Cercle"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Cercles"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Horloge"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Dissolution"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Fondu"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Transitions de diaporama principales"
+
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
+msgid ""
+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
+"Inc."
+msgstr ""
+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
+"Inc."
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "Glissement"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "Carrés"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "Rayures"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Transitions de diaporama principales"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Fondation Yorba"
-
-#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "Impossible de créer le dossier de cache %s : %s"
 
-#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "Impossible de créer le dossier de données %s : %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Images"
 
-#: ../src/AppDirs.vala:190
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Impossible de créer le dossier temporaire %s : %s"
 
-#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:238
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Impossible de créer le sous-dossier de données %s : %s"
 
-#: ../src/AppDirs.vala:220
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
 msgstr "Impossible de rendre le dossier %s accessible en écriture"
 
-#: ../src/AppDirs.vala:223
+#: src/AppDirs.vala:239
 #, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr "Impossible de rendre le dossier %s accessible en écriture : %s"
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Fixer la barre d'outils"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Fixe la barre d'outils visible"
 
-#: ../src/AppWindow.vala:59
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Quitte le mode plein écran"
 
-#: ../src/AppWindow.vala:525
-msgid "_Contents"
-msgstr "_Sommaire"
-
-#: ../src/AppWindow.vala:530
-msgid "_Frequently Asked Questions"
-msgstr "_Foire aux questions"
-
-#: ../src/AppWindow.vala:535
-msgid "_Report a Problem..."
-msgstr "_Signaler un problème…"
-
-#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
-#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
-#: ../src/data_imports/DataImportsUI.vala:374
-#: ../src/publishing/PublishingUI.vala:475
+#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/AppWindow.vala:682
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -1151,245 +2465,478 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:702
-msgid "Visit the Yorba web site"
-msgstr "Visitez le site Web de Yorba"
+#: src/AppWindow.vala:600
+msgid "Visit the Shotwell web site"
+msgstr "Visiter le site Web du projet Shotwell"
 
-#: ../src/AppWindow.vala:714
+#: src/AppWindow.vala:613
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Impossible d'afficher l'aide : %s"
 
-#: ../src/AppWindow.vala:722
+#: src/AppWindow.vala:621
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Impossible de parcourir la base de donnée des anomalies : %s"
 
-#: ../src/AppWindow.vala:730
+#: src/AppWindow.vala:629
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Impossible d'afficher la FAQ : %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Succès"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Erreur de fichier"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Impossible de décoder le fichier"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "L'utilisateur a interrompu l'importation"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Ce n'est pas un fichier"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Le fichier existe déjà dans la base de données"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Format de fichier non pris en charge"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Ce n'est pas un fichier image"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Défaillance du disque"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Disque plein"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Erreur de l'appareil photo"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Erreur d'écriture de fichier"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Fichier image corrompu"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Échec de l'importation (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+#: src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Appareils photos"
+
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+msgid "Camera"
+msgstr "Appareil photo"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
+
+#: src/camera/ImportPage.vala:466
+msgid ""
+"Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr ""
+"Impossible de démonter l'appareil photo. Essayez de démonter l'appareil "
+"photo à partir du gestionnaire de fichiers."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+msgid "Hide photos already imported"
+msgstr "Masquer les photos déjà importées"
+
+#: src/camera/ImportPage.vala:784
+msgid "Only display photos that have not been imported"
+msgstr "Montre seulement les photos qui n'ont pas déjà été importées"
+
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importer la _sélection"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "_Tout importer"
+
+#: src/camera/ImportPage.vala:857
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+"L'appareil photo semble être vide. Aucune photo ou vidéo trouvée pour "
+"l'importation"
+
+#: src/camera/ImportPage.vala:861
+msgid "No new photos/videos found on camera"
+msgstr "Aucune photo ou vidéo trouvée sur l'appareil"
+
+#. it's mounted, offer to unmount for the user
+#: src/camera/ImportPage.vala:1021
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+msgstr ""
+"Shotwell doit démonter l'appareil photo du système de fichiers pour pouvoir "
+"y accéder. Poursuivre ?"
+
+#: src/camera/ImportPage.vala:1027
+msgid "_Unmount"
+msgstr "_Démonter"
+
+#: src/camera/ImportPage.vala:1032
+msgid "Please unmount the camera."
+msgstr "Veuillez démonter l'appareil photo."
+
+#: 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 ""
+"L'appareil photo est verrouillé par une autre application. Shotwell ne peut "
+"accéder à l'appareil photo que lorsqu'il est déverrouillé. Veuillez fermer "
+"toute autre application utilisant l'appareil photo puis réessayez."
+
+#: src/camera/ImportPage.vala:1047
+msgid "Please close any other application using the camera."
+msgstr "Veuillez fermer toute autre application utilisant l'appareil photo."
+
+#: src/camera/ImportPage.vala:1052
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Impossible de récupérer les aperçus depuis l'appareil photo :\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr "Démontage…"
+
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr "Démarrage de l'importation, veuillez patienter…"
+
+#: src/camera/ImportPage.vala:1177
+msgid "Fetching photo information"
+msgstr "Récupération des informations sur les photos"
+
+#: src/camera/ImportPage.vala:1535
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Récupération de l'aperçu de %s"
+
+#: src/camera/ImportPage.vala:1651
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Impossible de verrouiller l'appareil photo : %s"
+
+#: src/camera/ImportPage.vala:1736
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Supprimer cette photo de l'appareil photo ?"
+msgstr[1] "Supprimer ces %d photos de l'appareil photo ?"
+
+#: src/camera/ImportPage.vala:1739
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Supprimer cette vidéo de l'appareil photo ?"
+msgstr[1] "Supprimer ces %d vidéos de l'appareil photo ?"
+
+#: 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] "Supprimer cette photo/vidéo de l'appareil photo ?"
+msgstr[1] "Supprimer ces %d photos/vidéos de l'appareil photo ?"
+
+#: src/camera/ImportPage.vala:1745
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Supprimer ces fichiers de l'appareil ?"
+msgstr[1] "Supprimer ces %d fichiers de l'appareil ?"
+
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+msgid "_Keep"
+msgstr "_Garder"
+
+#: src/camera/ImportPage.vala:1772
+msgid "Removing photos/videos from camera"
+msgstr "Effacement des photos/vidéos de l'appareil photo"
+
+#: 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] ""
+"Impossible de supprimer %d photo/vidéo de l'appareil photo en raison "
+"d'erreurs."
+msgstr[1] ""
+"Impossible de supprimer %d photos/vidéos de l'appareil photo en raison "
+"d'erreurs."
+
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
+msgid "_Print"
+msgstr "Impri_mer"
+
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Envoyer _vers…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
+msgid "Set as _Desktop Background"
+msgstr "Définir comme fond d'_écran"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:287
+msgid "_Duplicate"
+msgstr "_Dupliquer"
+
+#: src/CollectionPage.vala:100
+msgid "Fullscreen"
+msgstr "Plein écran"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "Diapora_ma"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
-msgid "Play a slideshow"
-msgstr "Lancer un diaporama"
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Pivoter à d_roite"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Pivoter à _gauche"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Miroir _horizontal"
+
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Miroir _vertical"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Améliorer"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Re_venir à l'original"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Copier les ajustements de couleur"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Coller les ajustements de couleur"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr "Ajuster la date et l'heure…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:320
+msgid "Open With E_xternal Editor"
+msgstr "Ouvrir avec un éditeur e_xterne"
+
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+msgid "Open With RA_W Editor"
+msgstr "Ouvrir avec l'éditeur RA_W"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:168
+msgid "_Play"
+msgstr "_Lancer"
+
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
 msgstr "Exporter la photo/vidéo"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:410
 msgid "Export Photos/Videos"
 msgstr "Exporter les photos/vidéos"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3211
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Exporter la photo"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:412 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exporter les photos"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Rotation"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Annuler la rotation"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Miroir horizontal"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Annuler le miroir horizontal"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Miroir vertical"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Annuler le miroir vertical"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "Rétablissement"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "Annuler le rétablissement"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "Amélioration"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "Annuler l'amélioration"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "Application des transformations de couleurs"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "Annuler les transformations de couleurs"
 
-#: ../src/Commands.vala:1003
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "Création d'un nouvel événement"
 
-#: ../src/Commands.vala:1004
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "Effacement de l'événement"
 
-#: ../src/Commands.vala:1013
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "Déplacer les photos vers le nouvel événement"
 
-#: ../src/Commands.vala:1014
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "Déplacer les photos vers l'événement précédent"
 
-#: ../src/Commands.vala:1071
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "Fusion"
 
-#: ../src/Commands.vala:1072
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "Annuler la fusion"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "Duplication des photos"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "Effacement des photos dupliquées"
 
-#: ../src/Commands.vala:1104
+#: src/Commands.vala:1108
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "Impossible de dupliquer une photo suite à une erreur de fichier"
 msgstr[1] "Impossible de dupliquer %d photos suite à des erreurs de fichier"
 
-#: ../src/Commands.vala:1191
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Rétablissement de la note précédente"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "Amélioration des notes"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "Diminution des notes"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "Configurer le révélateur RAW"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Rétablir le révélateur RAW précédent"
 
-#: ../src/Commands.vala:1253
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Définir le révélateur"
 
-#: ../src/Commands.vala:1343
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "La photo originale n'a pas pu être ajustée."
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "Ajustement de la date et de l'heure"
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "Annuler l'ajustement de la date et de l'heure"
 
-#: ../src/Commands.vala:1395
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Une photo originale n'a pas pu être ajustée."
 msgstr[1] "Les photos originales suivantes n'ont pas pu être ajustées."
 
-#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Erreur de l'ajustement de la date"
 
-#: ../src/Commands.vala:1419
+#: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
@@ -1399,101 +2946,196 @@ msgstr[1] ""
 "L'ajustement de l'heure n'a pas pu être annulé sur les fichiers photo "
 "suivants."
 
-#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Créer une étiquette"
 
-#: ../src/Commands.vala:1691
+#: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Déplacer l'étiquette « %s »"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Mettre les photos dans la corbeille"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Restaurer les photos contenues dans la corbeille"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Déplacer les photos dans la corbeille de Shotwell"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
-msgstr "Réintègrer les photos dans la photothèque de Shotwell"
+msgstr "Réintégrer les photos dans la photothèque de Shotwell"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "Déplacement des photos dans la corbeille"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Restauration des photos de la corbeille"
 
-#: ../src/Commands.vala:2449
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "Marquer les photos sélectionnées"
 
-#: ../src/Commands.vala:2450
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "Enlever la marque des photos sélectionnées"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
 msgstr "Marquage des photos sélectionnées"
 
-#: ../src/Commands.vala:2452
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
 msgstr "Suppression de la marque des photos sélectionnées"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "Marquer"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "Enlever la marque"
 
-#: ../src/DesktopIntegration.vala:121
+#. Send an empty job to the queue to mark the end of the import
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "Base de données %s"
+
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
+#, c-format
+msgid "Importing from %s can’t continue because an error occurred:"
+msgstr ""
+"L'importation à partir de %s ne peut continuer car une erreur est survenue :"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Pour tenter d'importer à partir d'un autre service, faites votre choix dans "
+"le menu ci-dessus."
+
+#: src/data_imports/DataImportsUI.vala:10
+msgid ""
+"You do not have any data imports plugins enabled.\n"
+"\n"
+"In order to use the Import From Application functionality, you need to have "
+"at least one data imports plugin enabled. Plugins can be enabled in the "
+"Preferences dialog."
+msgstr ""
+"Aucun greffon d'importation de données n'est activé.\n"
+"\n"
+"Pour pouvoir utiliser l'importation à partir d'une application, au moins un "
+"greffon doit être disponible. Ils peuvent être activés dans la fenêtre des "
+"Préférences."
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Fichier de base de données :"
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+msgid "_Import"
+msgstr "_Importer"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Importer à partir d'une application"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Importer du contenu à _partir de :"
+
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:522
+msgid "_Close"
+msgstr "_Fermer"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Importations de données"
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr ""
+"Impossible d'ouvrir ou créer la base de données de photos %s : code d'erreur "
+"%d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Impossible d'écrire dans le fichier de base de données de photos :\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Erreur d'accès au fichier de base de données :\n"
+" %s\n"
+"\n"
+"L'erreur est : \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, c-format
+msgid "Unable to restore photo database %s"
+msgstr "Impossible de restaurer la base de données de photos %s"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Impossible de lancer Nautilus Send-To : %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Envoyer vers"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Impossible d'exporter le fond d'écran vers %s : %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Impossible de préparer le diaporama d'écran : %s"
 
-#: ../src/Dialogs.vala:16
+#: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Ceci enlèvera l'étiquette « %s » d'une photo. Poursuivre ?"
 msgstr[1] "Ceci enlèvera l'étiquette « %s » de %d photos. Poursuivre ?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
-#: ../src/Resources.vala:163 ../src/Resources.vala:369
-#: ../src/Resources.vala:417 ../src/Resources.vala:682
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Ceci enlèvera la recherche enregistrée « %s ». Poursuivre ?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1507,11 +3149,11 @@ msgstr[1] ""
 "Changer de révélateur annulera toutes les modifications effectuées sur ces "
 "photos dans Shotwell"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Changer de révélateur"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Exporter la vidéo"
 
@@ -1520,16 +3162,16 @@ msgstr "Exporter la vidéo"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:115
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Shotwell n'a pas pu créer de fichier pour modifier cette photo car vous "
 "n'avez pas les permissions d'écriture dans %s."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1537,7 +3179,7 @@ msgstr ""
 "Impossible d'exporter la photo suivante suite à une erreur de fichier.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1550,60 +3192,60 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:147
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "Non modifié"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Actuel"
 
 #. layout controls
-#: ../src/Dialogs.vala:213
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Format :"
 
-#: ../src/Dialogs.vala:216
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Qualité :"
 
-#: ../src/Dialogs.vala:219
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Contrainte d'échelle :"
 
-#: ../src/Dialogs.vala:222
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Pixels :"
 
-#: ../src/Dialogs.vala:225
-msgid "Export metadata"
-msgstr "Exporter les métadonnées"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "Exporter les _métadonnées :"
 
-#: ../src/Dialogs.vala:459
-msgid "Save Details..."
-msgstr "Enregistrer les détails..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Enregistrer les détails…"
 
-#: ../src/Dialogs.vala:460
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Enregistrer les détails"
 
-#: ../src/Dialogs.vala:475
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(et %d autres)\n"
 
-#: ../src/Dialogs.vala:528
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Importer les résultats du rapport"
 
-#: ../src/Dialogs.vala:532
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Tentative d'importation de %d fichier."
 msgstr[1] "Tentative d'importation de %d fichiers."
 
-#: ../src/Dialogs.vala:535
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1613,31 +3255,31 @@ msgstr[1] "Parmi ces derniers, %d fichiers ont été importés avec succès."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:547
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Photos/vidéos à double non importées :"
 
-#: ../src/Dialogs.vala:551
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "est identique à un média existant"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:562
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Photos/vidéos non importées à cause d'une erreur de l'appareil photo :"
 
-#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
-#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
+#: 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 "message d'erreur :"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:576
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Fichiers non importés car ils n'ont pas été reconnus en tant que photos ou "
 "vidéos :"
@@ -1645,9 +3287,9 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:591
+#: src/Dialogs.vala:610
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Photos/vidéos non importées car elles n'étaient pas dans un format reconnu "
@@ -1656,18 +3298,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:606
+#: src/Dialogs.vala:625
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Photos/vidéos non importées car Shotwell n'a pas pu les copier dans sa "
 "bibliothèque :"
 
-#: ../src/Dialogs.vala:610
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "impossible de copier %s\n"
@@ -1676,39 +3318,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:622
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Photos/vidéos non importées car les fichiers sont corrompus :"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:637
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Photos/vidéos non importées pour d'autres raisons :"
 
-#: ../src/Dialogs.vala:657
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 photo dupliquée non importée :\n"
 msgstr[1] "%d photos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:660
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 vidéo dupliquée non importée :\n"
 msgstr[1] "%d vidéos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:663
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 photo/vidéo dupliquée non importée :\n"
 msgstr[1] "%d photos/vidéos dupliquées non importées :\n"
 
-#: ../src/Dialogs.vala:677
+#: 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"
@@ -1719,7 +3361,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:680
+#: 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"
@@ -1730,7 +3372,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:683
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1742,7 +3384,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:686
+#: 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"
@@ -1753,7 +3395,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué suite à une erreur de fichier ou "
 "matérielle :\n"
 
-#: ../src/Dialogs.vala:700
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1767,7 +3409,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:703
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1781,7 +3423,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:706
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1796,7 +3438,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué car le dossier de la photothèque "
 "n'est pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:709
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1810,7 +3452,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué car le dossier de la photothèque n'est "
 "pas accessible en écriture :\n"
 
-#: ../src/Dialogs.vala:723
+#: 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"
@@ -1820,7 +3462,7 @@ msgstr[1] ""
 "L'importation de %d photos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:726
+#: 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"
@@ -1830,7 +3472,7 @@ msgstr[1] ""
 "L'importation de %d vidéos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:729
+#: 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"
@@ -1841,7 +3483,7 @@ msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:732
+#: 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"
@@ -1852,7 +3494,7 @@ msgstr[1] ""
 "L'importation de %d fichiers a échoué suite à une erreur de l'appareil "
 "photo :\n"
 
-#: ../src/Dialogs.vala:746
+#: 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"
@@ -1860,7 +3502,7 @@ msgstr[0] "L'importation d'une photo a échoué car elle était corrompue :\n"
 msgstr[1] ""
 "L'importation de %d photos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:749
+#: 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"
@@ -1868,7 +3510,7 @@ msgstr[0] "L'importation d'une vidéo a échoué car elle était corrompue :\n"
 msgstr[1] ""
 "L'importation de %d vidéos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:752
+#: 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"
@@ -1877,7 +3519,7 @@ msgstr[0] ""
 msgstr[1] ""
 "L'importation de %d photos/vidéos a échoué car elles étaient corrompues :\n"
 
-#: ../src/Dialogs.vala:755
+#: 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"
@@ -1888,7 +3530,7 @@ msgstr[1] "L'importation de %d fichiers a échoué car ils étaient corrompus :
 #. 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:772
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1897,14 +3539,14 @@ msgstr[1] "%d photos non prises en charge ont été omises :\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:787
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "1 fichier non-image omis.\n"
 msgstr[1] "%d fichiers non-images omis.\n"
 
-#: ../src/Dialogs.vala:798
+#: 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"
@@ -1912,7 +3554,7 @@ msgstr[0] "L'annulation de l'utilisateur a provoqué l'omission d'une photo :\n
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d photos :\n"
 
-#: ../src/Dialogs.vala:801
+#: 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"
@@ -1920,7 +3562,7 @@ msgstr[0] "L'annulation de l'utilisateur a provoqué l'omission d'une vidéo :\
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d vidéos :\n"
 
-#: ../src/Dialogs.vala:804
+#: 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"
@@ -1929,28 +3571,28 @@ msgstr[0] ""
 msgstr[1] ""
 "L'annulation de l'utilisateur a provoqué l'omission de %d photos/vidéos :\n"
 
-#: ../src/Dialogs.vala:807
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 fichier omis par annulation de l'utilisateur :\n"
 msgstr[1] "%d fichiers omis par annulation de l'utilisateur :\n"
 
-#: ../src/Dialogs.vala:821
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "Une photo importée avec succès.\n"
 msgstr[1] "%d photos importées avec succès.\n"
 
-#: ../src/Dialogs.vala:824
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "Une vidéo importée avec succès.\n"
 msgstr[1] "%d vidéos importées avec succès.\n"
 
-#: ../src/Dialogs.vala:827
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1959,184 +3601,176 @@ msgstr[1] "%d photos/vidéos importées avec succès.\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:843
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Aucune photo ou vidéo importée.\n"
 
-#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Importation achevée"
 
-#: ../src/Dialogs.vala:1155
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../src/Dialogs.vala:1158
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../src/Dialogs.vala:1162
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../src/Dialogs.vala:1165
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 jour"
 
-#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
+#: src/Dialogs.vala:1317 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Renommer l'événement"
 
-#: ../src/Dialogs.vala:1315
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Nom :"
 
 #. Dialog title
-#. Button label
-#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
+#: src/Dialogs.vala:1328
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Modifier le titre"
 
-#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titre :"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
+#: src/Dialogs.vala:1345 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Modifier le commentaire de l'événement"
 
-#: ../src/Dialogs.vala:1344
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Modifier le commentaire de la photo/vidéo"
 
-#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: ../src/Dialogs.vala:1361
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Supprimer et me_ttre le fichier à la corbeille"
 msgstr[1] "Supprimer et me_ttre les fichiers à la corbeille"
 
-#: ../src/Dialogs.vala:1365
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Supp_rimer de la photothèque"
 
-#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
-msgid "_Keep"
-msgstr "_Garder"
-
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Annuler l'édition externe ?"
 
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Annuler les éditions externes ?"
 
-#: ../src/Dialogs.vala:1410
+#: src/Dialogs.vala:1412
 #, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
 "Ceci détruira tous les changements appliqués au fichier externe. Poursuivre ?"
 msgstr[1] ""
 "Ceci détruira tous les changements appliqués aux %d fichiers externes. "
 "Poursuivre ?"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "A_nnuler l'édition externe"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "A_nnuler les éditions externes"
 
-#: ../src/Dialogs.vala:1435
+#: 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?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Ceci enlèvera la photo de la photothèque. Poursuivre ?"
 msgstr[1] "Ceci enlèvera %d photos de la photothèque. Poursuivre ?"
 
-#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
+#: src/Dialogs.vala:1444 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Enlever la photo de la photothèque"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Enlever les photos de la photothèque"
 
-#: ../src/Dialogs.vala:1536
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1688
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "Matin"
 
-#: ../src/Dialogs.vala:1689
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "Après-midi"
 
-#: ../src/Dialogs.vala:1690
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
-msgstr "24 Hr"
+msgstr "24 H"
 
-#: ../src/Dialogs.vala:1705
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Décaler les photos/vidéos de la même durée"
 
-#: ../src/Dialogs.vala:1710
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Dé_finir cette date pour toutes les photos/vidéos"
 
-#: ../src/Dialogs.vala:1717
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "_Modifier la photo d'origine"
-
-#: ../src/Dialogs.vala:1717
-msgid "_Modify original photo files"
-msgstr "_Modifier les photos d'origine"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Modifier la photo d'origine"
+msgstr[1] "_Modifier les photos d'origine"
 
-#: ../src/Dialogs.vala:1720
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "_Modifier le fichier original"
+msgid_plural "_Modify original files"
+msgstr[0] "_Modifier le fichier d'origine"
+msgstr[1] "_Modifier les fichiers d'origine"
 
-#: ../src/Dialogs.vala:1720
-msgid "_Modify original files"
-msgstr "_Modifier les fichiers originaux"
-
-#: ../src/Dialogs.vala:1806
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Original : "
 
-#: ../src/Dialogs.vala:1807
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1808
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1897
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2145,7 +3779,7 @@ msgstr ""
 "La date de la prise de vue sera avancée de\n"
 "%d %s, %d %s, %d %s et %d %s."
 
-#: ../src/Dialogs.vala:1898
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2154,31 +3788,31 @@ msgstr ""
 "La date de la prise de vue sera reculée de\n"
 "%d %s, %d %s, %d %s et %d %s."
 
-#: ../src/Dialogs.vala:1900
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: ../src/Dialogs.vala:1901
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../src/Dialogs.vala:1902
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../src/Dialogs.vala:1903
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "seconde"
 msgstr[1] "secondes"
 
-#: ../src/Dialogs.vala:1947
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -2197,93 +3831,93 @@ msgstr[1] ""
 "\n"
 "Et %d autres."
 
-#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Étiquettes (séparées par des virgules) :"
 
-#: ../src/Dialogs.vala:2076
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Bienvenue !"
 
-#: ../src/Dialogs.vala:2083
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Bienvenue sur Shotwell"
 
-#: ../src/Dialogs.vala:2087
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Pour commencer, importez des photos d'une des manières suivantes :"
 
-#: ../src/Dialogs.vala:2106
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "Choisissez <span weight=\"bold\">Fichier %s Importer depuis un dossier</span>"
 
-#: ../src/Dialogs.vala:2107
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Faites glisser des photos dans la fenêtre de Shotwell"
 
-#: ../src/Dialogs.vala:2108
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Connectez un appareil photo à votre ordinateur et importez des photos"
 
-#: ../src/Dialogs.vala:2118
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importer des photos du dossier %s"
 
-#: ../src/Dialogs.vala:2125
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr ""
 "Vous pouvez également importer des photos avec les méthodes suivantes :"
 
-#: ../src/Dialogs.vala:2135
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "_Ne plus afficher ce message"
 
-#: ../src/Dialogs.vala:2170
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importer des photos de la photothèque %s"
 
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(aide)"
 
-#: ../src/Dialogs.vala:2324
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Année%sMois%sJour"
 
-#: ../src/Dialogs.vala:2326
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Année%sMois"
 
-#: ../src/Dialogs.vala:2328
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Année%sMois-Jour"
 
-#: ../src/Dialogs.vala:2330
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Année-Mois-Jour"
 
-#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2568
+#: src/Dialogs.vala:2627
 msgid "Invalid pattern"
 msgstr "Modèle non valable"
 
 #. 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:2670
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2291,40 +3925,40 @@ msgstr ""
 "Shotwell peut copier les photos dans votre photothèque ou les importer sans "
 "les copier."
 
-#: ../src/Dialogs.vala:2675
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "Co_pier les photos"
 
-#: ../src/Dialogs.vala:2676
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "Importer _sans copier"
 
-#: ../src/Dialogs.vala:2677
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Importer dans la photothèque"
 
-#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Enlever de la photothèque"
 
-#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Effacement de la photo de la photothèque"
 
-#: ../src/Dialogs.vala:2688
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
 msgstr "Effacement des photos de la photothèque"
 
-#: ../src/Dialogs.vala:2702
+#: src/Dialogs.vala:2763
 #, c-format
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -2338,15 +3972,15 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2706
+#: src/Dialogs.vala:2767
 #, c-format
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2361,15 +3995,15 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2710
+#: src/Dialogs.vala:2771
 #, c-format
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2384,12 +4018,12 @@ msgstr[1] ""
 "\n"
 "Cette action n'est pas réversible."
 
-#: ../src/Dialogs.vala:2742
+#: src/Dialogs.vala:2803
 #, c-format
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] ""
 "La photo ou la vidéo ne peut pas être mise à la corbeille. Faut-il supprimer "
 "le fichier ?"
@@ -2398,185 +4032,579 @@ msgstr[1] ""
 "supprimer les fichiers ?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2759
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "La photo ou la vidéo ne peut pas être supprimée."
 msgstr[1] "%d photos ou vidéos ne peuvent pas être supprimées."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Largeur"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Hauteur"
 
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "%s n'existe pas."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s n'est pas un fichier."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s ne prend pas en charge le format du fichier\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr "Impossible d'ouvrir la photo %s. Désolé."
+
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+msgid "_Save"
+msgstr "Enre_gistrer"
+
+#: src/direct/DirectPhotoPage.vala:316
+msgid "_Save a Copy"
+msgstr "_Enregistrer une copie"
+
+#: src/direct/DirectPhotoPage.vala:319
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Perdre les modifications apportées à %s ?"
+
+#: src/direct/DirectPhotoPage.vala:320
+msgid "Close _without Saving"
+msgstr "Fermer _sans enregistrer"
+
+#: src/direct/DirectPhotoPage.vala:353
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Erreur lors de l'enregistrement de %s : %s"
+
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
+msgid "Save As"
+msgstr "Enregistrer sous"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Impossible de surveiller %s : ce n'est pas un dossier (%s)"
 
+#: src/editing_tools/EditingTools.vala:644
+msgid "Return to current photo dimensions"
+msgstr "Revenir aux dimensions actuelles de la photo"
+
+#: src/editing_tools/EditingTools.vala:647
+msgid "Set the crop for this photo"
+msgstr "Effectuer l'action de rognage"
+
+#: src/editing_tools/EditingTools.vala:659
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr ""
+"Pivoter le rectangle de rognage entre les orientations portrait et paysage"
+
+#: src/editing_tools/EditingTools.vala:732
+msgid "Unconstrained"
+msgstr "Sans contrainte"
+
+#: src/editing_tools/EditingTools.vala:733
+msgid "Square"
+msgstr "Carré"
+
+#: src/editing_tools/EditingTools.vala:734
+msgid "Screen"
+msgstr "Écran"
+
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:737
+msgid "SD Video (4 ∶ 3)"
+msgstr "Vidéo SD (4 : 3)"
+
+#: src/editing_tools/EditingTools.vala:738
+msgid "HD Video (16 ∶ 9)"
+msgstr "Vidéo HD (16 : 9)"
+
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
+msgid "Wallet (2 × 3 in.)"
+msgstr "Portefeuille (2 × 3 po.)"
+
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
+msgid "Notecard (3 × 5 in.)"
+msgstr "Notecard (3 × 5 po.)"
+
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
+msgid "4 × 6 in."
+msgstr "4 × 6 po."
+
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
+msgid "5 × 7 in."
+msgstr "5 × 7 po."
+
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
+msgid "8 × 10 in."
+msgstr "8 × 10 po."
+
+#: src/editing_tools/EditingTools.vala:745
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Format Lettre (8.5 × 11 pouces)"
+
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
+msgid "11 × 14 in."
+msgstr "11 × 14 po."
+
+#: src/editing_tools/EditingTools.vala:747
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Format Tabloïd (11 × 17 pouces)"
+
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
+msgid "16 × 20 in."
+msgstr "16 × 20 po."
+
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Portefeuille métrique (9 × 13 cm)"
+
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
+msgid "Postcard (10 × 15 cm)"
+msgstr "Carte postale (10 × 15 cm)"
+
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
+
+#: src/editing_tools/EditingTools.vala:754
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
+
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm "
+
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:758
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
+
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
+msgid "Size:"
+msgstr "Taille :"
+
+#: src/editing_tools/EditingTools.vala:1873
+msgid "Close the red-eye tool"
+msgstr "Fermer l'outil yeux rouges"
+
+#: src/editing_tools/EditingTools.vala:1876
+msgid "Remove any red-eye effects in the selected region"
+msgstr "Enlever ou réduire l'effet yeux rouges dans la zone de sélection"
+
+#: src/editing_tools/EditingTools.vala:2216
+#: src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Réinitialiser"
+
+#. fit both on the top line, emit and move on
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
+msgid "Exposure:"
+msgstr "Exposition :"
+
+#: src/editing_tools/EditingTools.vala:2239
+msgid "Contrast:"
+msgstr "Contraste :"
+
+#: src/editing_tools/EditingTools.vala:2248
+msgid "Saturation:"
+msgstr "Saturation :"
+
+#: src/editing_tools/EditingTools.vala:2257
+msgid "Tint:"
+msgstr "Teinte :"
+
+#: src/editing_tools/EditingTools.vala:2267
+msgid "Temperature:"
+msgstr "Température :"
+
+#: src/editing_tools/EditingTools.vala:2276
+msgid "Shadows:"
+msgstr "Ombres :"
+
+#: src/editing_tools/EditingTools.vala:2285
+msgid "Highlights:"
+msgstr "Luminosité :"
+
+#: src/editing_tools/EditingTools.vala:2341
+msgid "Reset Colors"
+msgstr "Réinitialiser les couleurs"
+
+#: src/editing_tools/EditingTools.vala:2341
+msgid "Reset all color adjustments to original"
+msgstr "Réinitialise tous les ajustements colorimétriques à l'original"
+
+#: src/editing_tools/EditingTools.vala:2700
+msgid "Temperature"
+msgstr "Température"
+
+#: src/editing_tools/EditingTools.vala:2712
+msgid "Tint"
+msgstr "Teinte"
+
+#: src/editing_tools/EditingTools.vala:2724
+msgid "Contrast"
+msgstr "Contraste"
+
+#: src/editing_tools/EditingTools.vala:2738
+msgid "Saturation"
+msgstr "Saturation"
+
+#: src/editing_tools/EditingTools.vala:2751
+msgid "Exposure"
+msgstr "Exposition"
+
+#: src/editing_tools/EditingTools.vala:2764
+msgid "Shadows"
+msgstr "Ombres"
+
+#: src/editing_tools/EditingTools.vala:2777
+msgid "Highlights"
+msgstr "Luminosité"
+
+#: src/editing_tools/EditingTools.vala:2787
+msgid "Contrast Expansion"
+msgstr "Expansion du contrate"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Angle :"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
+#: ui/direct.ui:144 ui/photo.ui:233
+msgid "_Straighten"
+msgstr "Redre_sser"
+
+#: src/events/Branch.vala:25
+msgid "Events"
+msgstr "Événements"
+
+#: src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d photo/vidéo"
+msgstr[1] "%d photos/vidéos"
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d vidéo"
+msgstr[1] "%d vidéos"
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d photo"
+msgstr[1] "%d photos"
+
+#: src/events/EventPage.vala:128
+msgid "No Event"
+msgstr "Aucun événement"
+
+#: src/events/EventsDirectoryPage.vala:149
+msgid "No events"
+msgstr "Aucun événement"
+
+#: src/events/EventsDirectoryPage.vala:153
+msgid "No events found"
+msgstr "Aucun événement trouvé"
+
+#: src/events/EventsDirectoryPage.vala:226
+msgid "All Events"
+msgstr "Tous les événements"
+
+#: src/events/EventsDirectoryPage.vala:240
+msgid "Undated"
+msgstr "Non datée"
+
+#: src/events/EventsDirectoryPage.vala:241
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:242
+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 "Événement %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "Impossible de créer un fichier temporaire pour %s : %s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Exportation"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
 msgstr "Le fichier %s existe déjà. Faut-il le remplacer ?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "_Omettre"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "_Tout remplacer"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Exporter"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.vala:144
+msgid "Folders"
+msgstr "Dossiers"
+
+#: src/library/Branch.vala:30 src/library/Branch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Photothèque"
+
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
+msgid "Photos"
+msgstr "Photos"
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
+msgid "Flagged"
+msgstr "Marquées"
+
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing…"
+msgstr "Importation…"
+
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "Importation en préparation…"
+
+#: src/library/ImportQueuePage.vala:156
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Impossible de vérifier les mises à jour : %s"
+msgid "Imported %s"
+msgstr "%s importé"
 
-#: ../src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Agrandir ou réduire les miniatures"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Dernière importation"
 
-#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
-#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "Zoom _avant"
+#: src/library/LibraryWindow.vala:507
+msgid "Import From Folder"
+msgstr "Importation d'un dossier"
 
-#: ../src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Agrandit les miniatures"
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+msgid "Empty Trash"
+msgstr "Vider la corbeille"
 
-#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
-#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "Zoom a_rrière"
+#: src/library/LibraryWindow.vala:576
+msgid "Emptying Trash…"
+msgstr "Suppression du contenu de la corbeille…"
 
-#: ../src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Réduit les miniatures"
+#: src/library/LibraryWindow.vala:772
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Shotwell est configuré pour importer les photos dans votre dossier "
+"personnel.\n"
+"Nous recommandons de changer cela dans <span weight=\"bold\">Édition %s "
+"Préférences</span>.\n"
+"Voulez-vous continuer d'importer les photos ?"
 
-#: ../src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Trier les _photos"
+#: src/library/LibraryWindow.vala:775 ui/preferences_dialog.ui:142
+msgid "Library Location"
+msgstr "Emplacement de la photothèque"
 
-#: ../src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Lire la vidéo"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:788
+msgid "Photos cannot be imported from this directory."
+msgstr "Les photos ne peuvent pas être importées depuis ce dossier."
 
-#: ../src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Ouvre les vidéos sélectionnées dans le lecteur vidéo du système"
+#: src/library/LibraryWindow.vala:1068
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d %%)"
 
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
-msgid "_Developer"
-msgstr "_Révélateur"
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+msgid "Updating library…"
+msgstr "Mise à jour de la photothèque…"
 
-#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Appareil photo"
+#: src/library/LibraryWindow.vala:1129
+msgid "Preparing to auto-import photos…"
+msgstr "Préparation de l'importation automatique de photos…"
 
-#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
-msgid "_Titles"
-msgstr "_Titres"
+#: src/library/LibraryWindow.vala:1134
+msgid "Auto-importing photos…"
+msgstr "Importation automatique de photos…"
 
-#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
-msgid "Display the title of each photo"
-msgstr "Affiche le titre de chaque photo"
+#: src/library/LibraryWindow.vala:1142
+msgid "Writing metadata to files…"
+msgstr "Écriture des métadonnées dans les fichiers…"
 
-#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Commentaires"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Fichiers manquants"
 
-#: ../src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Afficher le commentaire de chaque photo"
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Suppression…"
 
-#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:359
-msgid "Ta_gs"
-msgstr "É_tiquettes"
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Corbeille"
 
-#: ../src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Afficher les étiquettes de chaque photo"
+#: src/library/TrashPage.vala:106
+msgid "Trash is empty"
+msgstr "La corbeille est vide"
 
-#: ../src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Par _titre"
+#: src/library/TrashPage.vala:110
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Trie les photos par titre"
+#: src/library/TrashPage.vala:111
+msgid "Deleting Photos"
+msgstr "Suppression de photos"
 
-#: ../src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Par _date"
+#: src/main.vala:54
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
+msgstr ""
+"Votre photothèque n'est pas compatible avec cette version de Shotwell. Il "
+"semble qu'elle a été créée par Shotwell %s (schéma %d). Cette version est la "
+"%s (schéma %d). Veuillez utiliser la dernière version de Shotwell."
+
+#: src/main.vala:59
+#, c-format
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
+"at %s"
+msgstr ""
+"Shotwell est dans l'impossibilité de mettre à niveau votre photothèque de la "
+"version %s (schéma %d) à la version %s (schéma %d). Pour plus "
+"d'informations, veuillez consulter le wiki de Shotwell sur %s"
 
-#: ../src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Trie les photos par date de prise de vue"
+#: src/main.vala:65
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
+"photos."
+msgstr ""
+"Votre photothèque n'est pas compatible avec cette version de Shotwell. Il "
+"semble qu'elle a été créée par Shotwell %s (schéma %d). Cette version est la "
+"%s (schéma %d). Veuillez effacer votre photothèque en supprimant %s puis "
+"réimportez vos photos."
 
-#: ../src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Par _note"
+#: src/main.vala:71
+#, c-format
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr ""
+"Erreur inconnue lors de la tentative de vérification de la base de données "
+"de Shotwell : %s"
 
-#: ../src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Trie les photos par note"
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Chargement de Shotwell"
 
-#: ../src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Par nom de _fichier"
+#: src/main.vala:293
+msgid "Path to Shotwell’s private data"
+msgstr "Chemin vers les données privées de Shotwell"
 
-#: ../src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Trie les photos par nom de fichier"
+#: src/main.vala:293
+msgid "DIRECTORY"
+msgstr "DOSSIER"
 
-#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:405
-msgid "_Ascending"
-msgstr "Ordre croiss_ant"
+#: src/main.vala:297
+msgid "Do not monitor library directory at runtime for changes"
+msgstr ""
+"Ne pas surveiller le répertoire de la photothèque pour détecter des "
+"changements"
 
-#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:406
-msgid "Sort photos in an ascending order"
-msgstr "Trie les photos par ordre croissant"
+#: src/main.vala:301
+msgid "Don’t display startup progress meter"
+msgstr "Ne pas afficher l'indicateur de progression du démarrage"
 
-#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:412
-msgid "D_escending"
-msgstr "Ordr_e décroissant"
+#: src/main.vala:305
+msgid "Show the application’s version"
+msgstr "Afficher la version de l'application"
+
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:342
+msgid "[FILE]"
+msgstr "[FICHIER]"
+
+#: src/main.vala:346
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+"Exécutez « %s --help » pour voir la liste complète des options disponibles "
+"en ligne de commande.\n"
 
-#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:413
-msgid "Sort photos in a descending order"
-msgstr "Trie les photos par ordre décroissant"
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Impossible de vérifier les mises à jour : %s"
 
-#: ../src/MediaPage.vala:723
+#: src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Agrandir ou réduire les miniatures"
+
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2585,204 +4613,119 @@ msgstr ""
 "Shotwell n'a pas pu lire la vidéo sélectionnée :\n"
 "%s"
 
-#: ../src/Page.vala:1263
+#: src/Page.vala:1306
 msgid "No photos/videos"
 msgstr "Aucune photo/vidéo"
 
-#: ../src/Page.vala:1267
-msgid "No photos/videos found"
-msgstr "Aucune photo/vidéo trouvée"
+#: src/Page.vala:1310
+msgid "No photos/videos found which match the current filter"
+msgstr "Aucune photo ou vidéo ne correspond au filtre actuel"
 
-#: ../src/Page.vala:2565
+#: src/Page.vala:2623
 msgid "Photos cannot be exported to this directory."
 msgstr "Les photos ne peuvent pas être exportées dans ce dossier."
 
-#: ../src/Photo.vala:3753
-msgid "modified"
-msgstr "modifiée"
-
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Photo précédente"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Photo suivante"
 
-#: ../src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Fichier source de la photo manquant : %s"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:343
-msgid "_View"
-msgstr "_Affichage"
-
-#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "_Outils"
-
-#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "Photo _précédente"
-
-#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Photo précédente"
-
-#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "Photo _suivante"
+#: src/PhotoPage.vala:3018
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Impossible d'exporter %s : %s"
 
-#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Photo suivante"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Augmente l'agrandissement de la photo"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Réduit l'agrandissement de la photo"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Faible (%d%%)"
 
-#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "Adapter à la _page"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Moyen (%d%%)"
 
-#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Zoom pour adapter la photo à taille de l'écran"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Fort (%d%%)"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Zoom _100 %"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Maximum (%d%%)"
 
-#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Zoom pour afficher la photo à sa taille réelle (100 %)"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Zoom _200 %"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Zoom pour afficher la photo au double de sa taille réelle (200 %)"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3231
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Impossible d'exporter %s : %s"
+#: src/Photo.vala:3755
+msgid "modified"
+msgstr "modifiée"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Remplir la page entière"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 images par page"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 images par page"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 images par page"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 images par page"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 images par page"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 images par page"
 
-#: ../src/Printing.vala:348
-msgid "in."
-msgstr "po."
-
-#: ../src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
-msgid "Wallet (2 x 3 in.)"
-msgstr "Portefeuille (2 x 3 po.)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Notecard (3 x 5 po.)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 po."
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 po."
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 po."
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 po."
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 po."
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Portefeuille métrique (9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Carte postale (10 x 15 cm)"
-
-#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
-
-#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
-
-#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
-
-#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm "
-
-#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
-
-#: ../src/Printing.vala:875
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Paramètres de l'image"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
-msgstr "Impression..."
+#: src/Printing.vala:864
+msgid "Printing…"
+msgstr "Impression…"
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2793,915 +4736,951 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Hier"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Éléments :"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d événement"
 msgstr[1] "%d événements"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d photo"
-msgstr[1] "%d photos"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d vidéo"
-msgstr[1] "%d vidéos"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Date :"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Heure :"
 
 #. 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 "À :"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1872
-msgid "Size:"
-msgstr "Taille :"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Durée :"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f secondes"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Révélateur :"
 
-#. fit both on the top line, emit and move on
-#: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2240
-msgid "Exposure:"
-msgstr "Exposition :"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Taille du fichier :"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Développement actuel :"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Dimensions originales :"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Fabricant de l'appareil photo :"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Modèle de l'appareil photo :"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Flash :"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Distance focale :"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Date d'exposition :"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Heure d'exposition :"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Correction de l'exposition :"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Latitude GPS :"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Longitude GPS :"
 
-#: ../src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Auteur :"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Copyright :"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Logiciel :"
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Informations étendues"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Gestionnaire de photos"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Préparation de l'envoi"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Visionneur de photos"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "Envoi de l'élément %d sur %d"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "Pivoter à d_roite"
+#: src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr ""
+"La publication vers %s ne peut pas continuer car une erreur est survenue :"
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"Pour essayer de publier sur un autre service, sélectionnez-en un depuis le "
+"menu ci-dessus."
+
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104
+msgid "The selected video was successfully published."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "La vidéo sélectionnée a été publiée avec succès."
+msgstr[1] "Les vidéos sélectionnées ont été publiées avec succès."
+
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "La photo sélectionnée a été publiée avec succès."
+msgstr[1] "Les photos sélectionnées ont été publiées avec succès."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Les photos/vidéos sélectionnées ont été publiées avec succès."
+
+#: src/publishing/PublishingUI.vala:127
+msgid "Fetching account information…"
+msgstr "Récupération des informations sur le compte…"
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Connexion…"
+
+#: src/publishing/PublishingUI.vala:195
+msgid "Publish Photos"
+msgstr "Publier les photos"
+
+#: src/publishing/PublishingUI.vala:196
+msgid "Publish photos _to:"
+msgstr "Publier les photos _sur :"
+
+#: src/publishing/PublishingUI.vala:198
+msgid "Publish Videos"
+msgstr "Publier les vidéos"
+
+#: src/publishing/PublishingUI.vala:199
+msgid "Publish videos _to"
+msgstr "Publier les vidéos _sur"
+
+#: src/publishing/PublishingUI.vala:201
+msgid "Publish Photos and Videos"
+msgstr "Publier des photos et des vidéos"
+
+#: src/publishing/PublishingUI.vala:202
+msgid "Publish photos and videos _to"
+msgstr "Publier les photos et les vidéos _sur"
+
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: src/publishing/PublishingUI.vala:412
+msgid "Unable to publish"
+msgstr "Impossible de publier"
+
+#: src/publishing/PublishingUI.vala:413
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
+msgstr ""
+"Shotwell ne peut pas publier les éléments sélectionnés car aucun greffon de "
+"publication compatible n'est activé. Pour corriger cela, choisissez "
+"<b>Édition %s Préférences</b> et activez un ou plusieurs greffons de "
+"publication dans l'onglet <b>Greffons</b>."
+
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Publication"
+
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Pivoter"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Pivoter à droite"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Pivote les photos vers la droite (appuyer sur Ctrl pour pivoter vers la "
 "gauche)"
 
-#: ../src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "Pivoter à _gauche"
-
-#: ../src/Resources.vala:151
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Pivote les photos vers la gauche"
 
-#: ../src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "Miroir _horizontal"
-
-#: ../src/Resources.vala:155
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Retourner horizontalement"
 
-#: ../src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "Miroir _vertical"
-
-#: ../src/Resources.vala:158
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Retourner verticalement"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
+#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
-#: ../src/library/LibraryWindow.vala:339
+#: src/Resources.vala:160 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/trash.ui:37
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_En avant"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Plein écran"
 
-#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:363
+#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../src/Resources.vala:168
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Quitter le mode _plein écran"
 
-#: ../src/Resources.vala:169 ../src/Resources.vala:371
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../src/Resources.vala:170
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Suivante"
 
-#: ../src/Resources.vala:171
-msgid "_OK"
-msgstr "_Valider"
-
-#: ../src/Resources.vala:172
-msgid "_Play"
-msgstr "_Lancer"
-
-#: ../src/Resources.vala:173 ../src/Resources.vala:325
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Préférences"
 
-#: ../src/Resources.vala:174
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "_Précédente"
 
-#: ../src/Resources.vala:175
-msgid "_Print"
-msgstr "Impri_mer"
-
-#: ../src/Resources.vala:176
+#: src/Resources.vala:172 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 "_Quitter"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "A_ctualiser"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "_Rétablir"
 
-#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save"
-msgstr "Enre_gistrer"
-
-#: ../src/Resources.vala:181
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "Enregistrer _sous"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Trier dans l'ordre croiss_ant"
 
-#: ../src/Resources.vala:183
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Trier dans l'ordre _décroissant"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "A_rrêter"
 
-#: ../src/Resources.vala:185
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "_Récupérer"
 
-#: ../src/Resources.vala:186
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "Taille _normale"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "Taille _idéale"
 
-#: ../src/Resources.vala:191
-msgid "_Enhance"
-msgstr "_Améliorer"
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Zoom _avant"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "Zoom a_rrière"
+
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Améliorer"
 
-#: ../src/Resources.vala:193
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:189 ui/collection.ui:164
+msgid "Automatically improve the photo’s appearance"
 msgstr "Rehausse automatiquement la qualité de la photo"
 
-#: ../src/Resources.vala:195
-msgid "_Copy Color Adjustments"
-msgstr "_Copier les ajustements de couleur"
-
-#: ../src/Resources.vala:196
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Copier les ajustements de couleur"
 
-#: ../src/Resources.vala:197
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Copie les ajustements de couleur appliqués à la photo"
 
-#: ../src/Resources.vala:199
-msgid "_Paste Color Adjustments"
-msgstr "_Coller les ajustements de couleur"
-
-#: ../src/Resources.vala:200
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Coller les ajustements de couleur"
 
-#: ../src/Resources.vala:201
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Applique les ajustements de couleur copiés aux photos sélectionnées"
 
-#: ../src/Resources.vala:203
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Rogner"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Rogner"
 
-#: ../src/Resources.vala:205
-msgid "Crop the photo's size"
+#: src/Resources.vala:201
+msgid "Crop the photo’s size"
 msgstr "Effectue un rognage de la photo"
 
-#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "Redre_sser"
-
-#: ../src/Resources.vala:208
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Redresser"
 
-#: ../src/Resources.vala:209
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Redresse la photo"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Yeux rouges"
 
-#: ../src/Resources.vala:212
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Yeux rouges"
 
-#: ../src/Resources.vala:213
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Réduit ou supprime complètement l'effet yeux rouges"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Ajuster"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Ajuster"
 
-#: ../src/Resources.vala:217
-msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
+msgid "Adjust the photo’s color and tone"
 msgstr "Ajuste les couleurs et les tonalités de la photo"
 
-#: ../src/Resources.vala:219
-msgid "Re_vert to Original"
-msgstr "Re_venir à l'original"
-
-#: ../src/Resources.vala:220
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Revenir à l'original"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Annuler les é_ditions externes"
 
-#: ../src/Resources.vala:223
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Revient à la photo originale"
 
-#: ../src/Resources.vala:225
-msgid "Set as _Desktop Background"
-msgstr "Définir comme fond d'_écran"
-
-#: ../src/Resources.vala:226
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Définit l'image sélectionnée comme le nouveau fond d'écran"
 
-#: ../src/Resources.vala:227
-msgid "Set as _Desktop Slideshow..."
-msgstr "Définir comme _diaporama d'écran..."
+#: src/Resources.vala:223
+msgid "Set as _Desktop Slideshow…"
+msgstr "Définir comme _diaporama d'écran…"
 
-#: ../src/Resources.vala:229
+#: src/Resources.vala:225 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 "A_nnuler"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Annuler"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:228 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 "_Rétablir"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Rétablir"
 
-#: ../src/Resources.vala:235
-msgid "Re_name Event..."
-msgstr "Re_nommer l'événement..."
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
+msgid "Re_name Event…"
+msgstr "Re_nommer l'événement…"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Faire de la photo une photo _clé de l'événement"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
-msgstr "Faire de la photo une photo clé de l'événement"
+msgstr "Faire de la photo la photo clé de l'événement"
 
-#: ../src/Resources.vala:241
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "_Nouvel événement"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Nouvel événement"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Déplacer les photos"
 
-#: ../src/Resources.vala:245
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Déplace les photos vers un événement"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Fusionner les événements"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Fusionner"
 
-#: ../src/Resources.vala:249
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Combine plusieurs événements en un seul"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Noter"
 
-#: ../src/Resources.vala:252
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Attribuer une note"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Changer la note de cette photo"
 
-#: ../src/Resources.vala:255
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Augmenter"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Augmenter la note"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "A_baisser"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Abaisser la note"
 
-#: ../src/Resources.vala:261
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Sans note"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Sans note"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Enlever la note"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Supprimer la note"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Enlève toute note"
 
-#: ../src/Resources.vala:267
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "Re_jeter"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Rejetée"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Noter pour rejeter"
 
-#: ../src/Resources.vala:273
+#: src/Resources.vala:269 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 "Rejetées _uniquement"
 
-#: ../src/Resources.vala:274
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Rejetées uniquement"
 
-#: ../src/Resources.vala:275
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Afficher uniquement les photos rejetées"
 
-#: ../src/Resources.vala:277
+#: src/Resources.vala:273 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 "Toutes + re_jetées"
 
-#: ../src/Resources.vala:278 ../src/Resources.vala:279
+#: src/Resources.vala:274
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Afficher toutes les photos, y compris les rejetées"
 
-#: ../src/Resources.vala:281
+#: src/Resources.vala:276 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 "_Toutes les photos"
 
-#. Button label
 #. Button tooltip
-#: ../src/Resources.vala:283 ../src/Resources.vala:285
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Afficher toutes les photos"
 
-#: ../src/Resources.vala:287
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Notes"
 
-#: ../src/Resources.vala:288
-msgid "Display each photo's rating"
+#: src/Resources.vala:281
+msgid "Display each photo’s rating"
 msgstr "Affiche la note de chaque photo"
 
-#: ../src/Resources.vala:290
+#: src/Resources.vala:283 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 "_Filtrer les photos"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Filtrer les photos"
 
-#: ../src/Resources.vala:292
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Restreindre les photos affichées en utilisant un filtre"
 
-#: ../src/Resources.vala:294
-msgid "_Duplicate"
-msgstr "_Dupliquer"
-
-#: ../src/Resources.vala:295
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: ../src/Resources.vala:296
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Crée un duplicata de la photo"
 
-#: ../src/Resources.vala:298
-msgid "_Export..."
-msgstr "_Exporter..."
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+msgid "_Export…"
+msgstr "_Exporter…"
 
-#: ../src/Resources.vala:300
-msgid "_Print..."
-msgstr "Impri_mer..."
+#: src/Resources.vala:293
+msgid "_Print…"
+msgstr "Impri_mer…"
 
-#: ../src/Resources.vala:302
-msgid "Pu_blish..."
-msgstr "Pu_blier..."
+#: src/Resources.vala:295
+msgid "Pu_blish…"
+msgstr "Pu_blier…"
 
-#: ../src/Resources.vala:304
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Publie sur différents sites Web"
 
-#: ../src/Resources.vala:306
-msgid "Edit _Title..."
-msgstr "Modifier le _titre..."
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr "Modifier le _titre…"
+
+#. Button label
+#: src/Resources.vala:301
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "Modifier le titre"
 
-#: ../src/Resources.vala:310
-msgid "Edit _Comment..."
-msgstr "Modifier le _commentaire..."
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
+msgid "Edit _Comment…"
+msgstr "Modifier le _commentaire…"
 
 #. Button label
-#: ../src/Resources.vala:312
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Modifier le commentaire"
 
-#: ../src/Resources.vala:314
-msgid "Edit Event _Comment..."
-msgstr "Modifier le _commentaire de l'événement..."
+#: src/Resources.vala:307 ui/event.ui:592
+msgid "Edit Event _Comment…"
+msgstr "Modifier le _commentaire de l'événement…"
 
-#: ../src/Resources.vala:317
-msgid "_Adjust Date and Time..."
-msgstr "Aj_uster la date et l'heure..."
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
+msgid "_Adjust Date and Time…"
+msgstr "_Ajuster la date et l'heure…"
 
-#: ../src/Resources.vala:318
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Ajuster la date et l'heure"
 
-#: ../src/Resources.vala:320
-msgid "Add _Tags..."
-msgstr "Ajouter des é_tiquettes..."
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+msgid "Add _Tags…"
+msgstr "Ajouter des é_tiquettes…"
 
-#: ../src/Resources.vala:321
-msgid "_Add Tags..."
-msgstr "Ajouter des étiquettes"
+#: src/Resources.vala:314 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr "_Ajouter des étiquettes…"
 
 #. Dialog title
-#. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:323 ../src/Resources.vala:356
+#: src/Resources.vala:316
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Ajouter des étiquettes"
 
-#: ../src/Resources.vala:327
-msgid "Open With E_xternal Editor"
-msgstr "Ouvrir avec un éditeur e_xterne"
-
-#: ../src/Resources.vala:329
-msgid "Open With RA_W Editor"
-msgstr "Ouvrir avec l'éditeur RA_W"
-
-#: ../src/Resources.vala:331
-msgid "Send _To..."
-msgstr "Envoyer _vers..."
-
-#: ../src/Resources.vala:332
-msgid "Send T_o..."
-msgstr "Env_oyer à ..."
+#: src/Resources.vala:325 ui/photo_context.ui:135
+msgid "Send T_o…"
+msgstr "Envo_yer vers…"
 
-#: ../src/Resources.vala:334
-msgid "_Find..."
-msgstr "_Rechercher..."
+#: src/Resources.vala:327
+msgid "_Find…"
+msgstr "_Rechercher…"
 
-#: ../src/Resources.vala:335
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Rechercher"
 
-#: ../src/Resources.vala:336
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Rechercher une image en saisissant du texte se trouvant dans son nom ou ses "
 "étiquettes"
 
-#: ../src/Resources.vala:338
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Marquer"
 
-#: ../src/Resources.vala:340
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "_Enlever la marque"
 
-#: ../src/Resources.vala:343
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Impossible de lancer l'éditeur : %s"
 
-#: ../src/Resources.vala:348
+#: src/Resources.vala:341
 #, c-format
-msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Ajouter l'étiquette « %s »"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:351
+#: src/Resources.vala:344
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Ajouter les étiquettes « %s » et « %s »"
 
-#: ../src/Resources.vala:361
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:349
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Ajouter des étiquettes"
+
+#: src/Resources.vala:354
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "_Supprimer l'étiquette « %s »"
 
-#: ../src/Resources.vala:365
+#: src/Resources.vala:358
 #, c-format
-msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "Supprimer l'étiquette « %s »"
 
-#: ../src/Resources.vala:368
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Supprimer l'étiquette"
 
-#: ../src/Resources.vala:374
+#: src/Resources.vala:367
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "Re_nommer l'étiquette « %s »..."
+msgid "Re_name Tag “%s”…"
+msgstr "Re_nommer l'étiquette « %s »…"
 
-#: ../src/Resources.vala:378
+#: src/Resources.vala:371
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "Renommer l'étiquette « %s » en « %s »"
 
-#: ../src/Resources.vala:381
-msgid "_Rename..."
-msgstr "_Renommer..."
+#: src/Resources.vala:374 ui/tags.ui:456
+msgid "_Rename…"
+msgstr "_Renommer…"
 
-#: ../src/Resources.vala:383
-msgid "Modif_y Tags..."
-msgstr "Modifie_r les étiquettes..."
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+msgid "Modif_y Tags…"
+msgstr "Mod_ifier les étiquettes…"
 
-#: ../src/Resources.vala:384
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Modifier les étiquettes"
 
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Étiqueter la photo avec « %s »"
-
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Étiqueter les photos avec « %s »"
-
-#: ../src/Resources.vala:391
+#: src/Resources.vala:380
 #, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Étiqueter la photo sélectionnée avec « %s »"
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Étiqueter la photo avec « %s »"
+msgstr[1] "Étiqueter les photos avec « %s »"
 
-#: ../src/Resources.vala:392
+#: src/Resources.vala:386
 #, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Étiqueter les photos sélectionnées avec « %s »"
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Étiqueter la photo sélectionnée avec « %s »"
+msgstr[1] "Étiqueter les photos sélectionnées avec « %s »"
 
-#: ../src/Resources.vala:396
+#: src/Resources.vala:392
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Enlever l'étiquette « %s » de la _photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Enlever l'étiquette « %s » de la _photo"
+msgstr[1] "Enlever l'étiquette « %s » des _photos"
 
-#: ../src/Resources.vala:397
+#: src/Resources.vala:398
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Enlever l'étiquette « %s » des _photos"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Enlever l'étiquette « %s » de la photo"
+msgstr[1] "Enlever l'étiquette « %s » des photos"
 
-#: ../src/Resources.vala:401
+#: src/Resources.vala:404
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Enlever l'étiquette « %s » de la photo"
-
-#: ../src/Resources.vala:402
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Enlever l'étiquette « %s » des photos"
-
-#: ../src/Resources.vala:406
-#, 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 "Impossible de renommer l'étiquette en « %s » car ce nom existe déjà."
 
-#: ../src/Resources.vala:410
+#: src/Resources.vala:408
 #, 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 ""
 "Impossible de renommer la recherche en « %s » parce que ce nom existe déjà."
 
-#: ../src/Resources.vala:413
+#. Saved search button
+#: src/Resources.vala:411 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Recherche enregistrée"
 
-#: ../src/Resources.vala:415
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Supprimer la recherche"
 
-#: ../src/Resources.vala:418
-msgid "_Edit..."
-msgstr "_Éditer..."
+#: src/Resources.vala:416 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr "É_dition…"
 
-#: ../src/Resources.vala:419
-msgid "Re_name..."
-msgstr "Re_nommer..."
+#: src/Resources.vala:417 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr "Re_nommer…"
 
-#: ../src/Resources.vala:422
+#: src/Resources.vala:420
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Renommer la recherche « %s » en « %s »"
 
-#: ../src/Resources.vala:426
+#: src/Resources.vala:424
 #, c-format
-msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Supprimer la recherche « %s »"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Noter %s"
 
-#: ../src/Resources.vala:585
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Donner une note à %s"
 
-#: ../src/Resources.vala:586
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Attribution de note à %s"
 
-#: ../src/Resources.vala:588
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Afficher %s"
 
-#: ../src/Resources.vala:589
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Montrer uniquement les photos avec une note de %s"
 
-#: ../src/Resources.vala:590
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s ou plus"
 
-#: ../src/Resources.vala:591
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Afficher %s ou plus"
 
-#: ../src/Resources.vala:592
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "N'afficher que les photos avec une note de %s ou plus"
 
-#: ../src/Resources.vala:683
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Enlève les photos sélectionnées de la corbeille"
 
-#: ../src/Resources.vala:684
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Enlève les photos sélectionnées de la photothèque"
 
-#: ../src/Resources.vala:686
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Restaurer"
 
-#: ../src/Resources.vala:687
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Réintègre les photos dans la photothèque"
 
-#: ../src/Resources.vala:689
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Ouvrir dans le _gestionnaire de fichiers"
 
-#: ../src/Resources.vala:690
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:667
+msgid "Open the selected photo’s directory in the file manager"
 msgstr ""
 "Ouvre le dossier des photos sélectionnées dans le gestionnaire de fichiers"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Impossible d'ouvrir dans le gestionnaire de fichiers : %s"
 
-#: ../src/Resources.vala:696
+#: src/Resources.vala:673 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "Su_pprimer de la photothèque"
 
-#: ../src/Resources.vala:698
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "Déplacer dans la cor_beille"
 
-#: ../src/Resources.vala:700
+#: src/Resources.vala:677 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 "_Tout sélectionner"
 
-#: ../src/Resources.vala:701
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Sélectionner tous les éléments"
 
@@ -3709,1424 +5688,781 @@ msgstr "Sélectionner tous les éléments"
 #. / 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:780
-msgid "%-I:%M %p"
-msgstr "%-I:%M %p"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:785
-msgid "%-I:%M:%S %p"
-msgstr "%-I:%M:%S %p"
-
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:789
+#: 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:794 ../src/Resources.vala:804
+#: src/Resources.vala:744
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
-msgstr "%a %d %b"
+msgstr "%a %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:799
+#: src/Resources.vala:749
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d %b %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Diaporama"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Marquées"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-#: ../src/library/Branch.vala:97
-msgid "Photos"
-msgstr "Photos"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Vidéos"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "Photos RAW"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Photos RAW"
-
-#: ../src/SearchFilter.vala:934
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Erreur de chargement du fichier d'interface %s : %s"
-
-#. Ticket #3260 - Add a 'close' context menu to
-#. the searchbar.
-#. Prepare the close menu for use, but don't
-#. display it yet; we'll connect it to secondary
-#. click later on.
-#: ../src/SearchFilter.vala:945
-msgid "Close"
-msgstr "Fermer"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:951
-msgid "Type"
-msgstr "Type"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Note"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Paramètres"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Précédente"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Revient à la photo précédente"
-
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Met le diaporama en pause"
-
-#: ../src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Suivante"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Passe à la photo suivante"
-
-#: ../src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Configurer le diaporama"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Tous les fichiers sources des photos sont manquants."
-
-#: ../src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Lancer"
-
-#: ../src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Poursuit le diaporama"
-
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "sans nom"
-
-#. multiple videos
-#: ../src/VideoSupport.vala:489
-msgid "Export Videos"
-msgstr "Exporter les vidéos"
-
-#: ../src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Appareils photos"
-
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"Impossible de démonter l'appareil photo. Essayez de démonter l'appareil "
-"photo à partir du gestionnaire de fichiers."
-
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Masquer les photos déjà importées"
-
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Montre seulement les photos qui n'ont pas déjà été importées"
-
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:847
-msgid "Starting import, please wait..."
-msgstr "Démarrage de l'importation, veuillez patienter…"
-
-#: ../src/camera/ImportPage.vala:886
-msgid "Import _Selected"
-msgstr "Importer la _sélection"
-
-#: ../src/camera/ImportPage.vala:887
-msgid "Import the selected photos into your library"
-msgstr "Importe les photos sélectionnées dans la photothèque"
-
-#: ../src/camera/ImportPage.vala:892
-msgid "Import _All"
-msgstr "_Tout importer"
-
-#: ../src/camera/ImportPage.vala:893
-msgid "Import all the photos into your library"
-msgstr "Importe toutes les photos dans la photothèque"
-
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1014
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell doit démonter l'appareil photo du système de fichiers pour pouvoir "
-"y accéder. Poursuivre ?"
-
-#: ../src/camera/ImportPage.vala:1020
-msgid "_Unmount"
-msgstr "_Démonter"
-
-#: ../src/camera/ImportPage.vala:1025
-msgid "Please unmount the camera."
-msgstr "Veuillez démonter l'appareil photo."
-
-#: ../src/camera/ImportPage.vala:1030
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
-msgstr ""
-"L'appareil photo est verrouillé par une autre application. Shotwell ne peut "
-"accéder à l'appareil photo que lorsqu'il est déverrouillé. Veuillez fermer "
-"toute autre application utilisant l'appareil photo puis réessayez."
-
-#: ../src/camera/ImportPage.vala:1040
-msgid "Please close any other application using the camera."
-msgstr "Veuillez fermer toute autre application utilisant l'appareil photo."
-
-#: ../src/camera/ImportPage.vala:1045
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Impossible de récupérer les aperçus depuis l'appareil photo :\n"
-"%s"
-
-#: ../src/camera/ImportPage.vala:1062
-msgid "Unmounting..."
-msgstr "Démontage..."
-
-#: ../src/camera/ImportPage.vala:1168
-msgid "Fetching photo information"
-msgstr "Récupération des informations sur les photos"
-
-#: ../src/camera/ImportPage.vala:1523
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Récupération de l'aperçu de %s"
-
-#: ../src/camera/ImportPage.vala:1639
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Impossible de verrouiller l'appareil photo : %s"
-
-#: ../src/camera/ImportPage.vala:1724
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Supprimer cette photo de l'appareil photo ?"
-msgstr[1] "Supprimer ces %d photos de l'appareil photo ?"
-
-#: ../src/camera/ImportPage.vala:1727
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Supprimer cette vidéo de l'appareil photo ?"
-msgstr[1] "Supprimer ces %d vidéos de l'appareil photo ?"
-
-#: ../src/camera/ImportPage.vala:1730
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Supprimer cette photo/vidéo de l'appareil photo ?"
-msgstr[1] "Supprimer ces %d photos/vidéos de l'appareil photo ?"
-
-#: ../src/camera/ImportPage.vala:1733
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Supprimer ces fichiers de l'appareil ?"
-msgstr[1] "Supprimer ces %d fichiers de l'appareil ?"
-
-#: ../src/camera/ImportPage.vala:1760
-msgid "Removing photos/videos from camera"
-msgstr "Effacement des photos/vidéos de l'appareil photo"
-
-#: ../src/camera/ImportPage.vala:1764
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] ""
-"Impossible de supprimer %d photo/vidéo de l'appareil photo en raison "
-"d'erreurs."
-msgstr[1] ""
-"Impossible de supprimer %d photos/vidéos de l'appareil photo en raison "
-"d'erreurs."
-
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Importations de données"
-
-#. Send an empty job to the queue to mark the end of the import
-#: ../src/data_imports/DataImportsPluginHost.vala:65
-#: ../src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Base de données %s"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:148
-#: ../src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-msgid "Importing from %s can't continue because an error occurred:"
-msgstr ""
-"L'importation à partir de %s ne peut continuer car une erreur est survenue :"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Pour tenter d'importer à partir d'un autre service, faites votre choix dans "
-"le menu ci-dessus."
-
-#: ../src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
-msgstr ""
-"Aucun greffon d'importation de données n'est activé.\n"
-"\n"
-"Pour pouvoir utiliser l'importation à partir d'une application, au moins un "
-"greffon doit être disponible. Ils peuvent être activés dans la fenêtre des "
-"Préférences."
-
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Fichier de base de données :"
-
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:882
-msgid "_Import"
-msgstr "_Importer"
-
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import From Application"
-msgstr "Importer à partir d'une application"
-
-#: ../src/data_imports/DataImportsUI.vala:369
-#: ../src/publishing/PublishingUI.vala:470
-msgid "_Close"
-msgstr "_Fermer"
-
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr ""
-"Impossible d'ouvrir ou créer la base de données de photos %s : code d'erreur "
-"%d"
-
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Impossible d'écrire dans le fichier de base de données de photos :\n"
-" %s"
-
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Erreur d'accès au fichier de base de données :\n"
-" %s\n"
-"\n"
-"L'erreur est : \n"
-"%s"
-
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Fichier"
-
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Enregistre la photo"
-
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Enregistrer _sous..."
-
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Enregistre la photo sous un autre nom"
-
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprime la photo sur une imprimante connectée à votre ordinateur"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Photo"
-
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s n'existe pas."
-
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s n'est pas un fichier."
-
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s ne prend pas en charge le format du fichier\n"
-"%s."
-
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save a Copy"
-msgstr "_Enregistrer une copie"
-
-#: ../src/direct/DirectPhotoPage.vala:425
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Perdre les modifications apportées à %s ?"
-
-#: ../src/direct/DirectPhotoPage.vala:426
-msgid "Close _without Saving"
-msgstr "Fermer _sans enregistrer"
-
-#: ../src/direct/DirectPhotoPage.vala:459
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Erreur lors de l'enregistrement de %s : %s"
-
-#: ../src/direct/DirectPhotoPage.vala:487
-#: ../src/direct/DirectPhotoPage.vala:508
-msgid "Save As"
-msgstr "Enregistrer sous"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Revenir aux dimensions actuelles de la photo"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Effectuer l'action de rognage"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
-"Pivoter le rectangle de rognage entre les orientations portrait et paysage"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Sans contrainte"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Carré"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Écran"
-
-#: ../src/editing_tools/EditingTools.vala:757
-#: ../src/editing_tools/EditingTools.vala:760
-#: ../src/editing_tools/EditingTools.vala:770
-#: ../src/editing_tools/EditingTools.vala:780
-msgid "-"
-msgstr "-"
-
-#: ../src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
-msgstr "Vidéo SD (4 : 3)"
-
-#: ../src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "Vidéo HD (16 : 9)"
-
-#: ../src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Format Lettre (8.5 x 11 pouces)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Format Tabloïd (11 x 17 pouces)"
-
-#: ../src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
-
-#: ../src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
-
-#: ../src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Fermer l'outil yeux rouges"
-
-#: ../src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Enlever ou réduire l'effet yeux rouges dans la zone de sélection"
-
-#: ../src/editing_tools/EditingTools.vala:2226
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Réinitialiser"
-
-#: ../src/editing_tools/EditingTools.vala:2248
-msgid "Saturation:"
-msgstr "Saturation :"
-
-#: ../src/editing_tools/EditingTools.vala:2256
-msgid "Tint:"
-msgstr "Teinte :"
-
-#: ../src/editing_tools/EditingTools.vala:2265
-msgid "Temperature:"
-msgstr "Température :"
-
-#: ../src/editing_tools/EditingTools.vala:2273
-msgid "Shadows:"
-msgstr "Ombres :"
-
-#: ../src/editing_tools/EditingTools.vala:2281
-msgid "Highlights:"
-msgstr "Luminosité :"
-
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset Colors"
-msgstr "Réinitialiser les couleurs"
-
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset all color adjustments to original"
-msgstr "Réinitialise tous les ajustements colorimétriques à l'original"
-
-#: ../src/editing_tools/EditingTools.vala:2687
-msgid "Temperature"
-msgstr "Température"
-
-#: ../src/editing_tools/EditingTools.vala:2700
-msgid "Tint"
-msgstr "Teinte"
-
-#: ../src/editing_tools/EditingTools.vala:2713
-msgid "Saturation"
-msgstr "Saturation"
-
-#: ../src/editing_tools/EditingTools.vala:2726
-msgid "Exposure"
-msgstr "Exposition"
-
-#: ../src/editing_tools/EditingTools.vala:2739
-msgid "Shadows"
-msgstr "Ombres"
-
-#: ../src/editing_tools/EditingTools.vala:2752
-msgid "Highlights"
-msgstr "Luminosité"
-
-#: ../src/editing_tools/EditingTools.vala:2762
-msgid "Contrast Expansion"
-msgstr "Expansion du contrate"
-
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Angle :"
-
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Événements"
-
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d photo/vidéo"
-msgstr[1] "%d photos/vidéos"
-
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Aucun événement"
-
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Afficher le commentaire de chaque événement"
-
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Aucun événement"
-
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Aucun événement trouvé"
-
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Tous les événements"
-
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Non datée"
-
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
-
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
-
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Dossiers"
-
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-#: ../ui/shotwell.glade.h:32
-msgid "Library"
-msgstr "Photothèque"
-
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Importation..."
-
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Arrêter l'importation"
-
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Arrête l'importation des photos"
-
-#: ../src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Préparation de l'importation..."
-
-#: ../src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "%s importé"
-
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Dernière importation"
-
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "Importer un _dossier..."
-
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importe des photos d'un disque vers la photothèque"
-
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Importer à partir d'une _application…"
-
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Trier les évén_ements"
-
-#: ../src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Vider la co_rbeille"
-
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Supprime toutes les photos de la corbeille"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Afficher l'é_vénement de la photo"
-
-#: ../src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Rechercher"
-
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Recherche des photos et des vidéos par critères"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Nou_velle recherche enregistrée..."
-
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Photos"
-
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "É_vénements"
-
-#: ../src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Informations _basiques"
-
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Affiche les informations basiques pour la sélection"
-
-#: ../src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Informations étend_ues"
-
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Affiche les informations étendues pour la sélection"
-
-#: ../src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Barre de _recherche"
-
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Affiche la barre de recherche"
-
-#: ../src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Barre _latérale"
-
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Afficher le panneau latéral"
-
-#: ../src/library/LibraryWindow.vala:651
-msgid "Import From Folder"
-msgstr "Importation d'un dossier"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Empty Trash"
-msgstr "Vider la corbeille"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Emptying Trash..."
-msgstr "Suppression du contenu de la corbeille..."
-
-#: ../src/library/LibraryWindow.vala:879
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell est configuré pour importer les photos dans votre dossier "
-"personnel.\n"
-"Nous recommandons de changer cela dans <span weight=\"bold\">Édition %s "
-"Préférences</span>.\n"
-"Voulez-vous continuer d'importer les photos ?"
-
-#: ../src/library/LibraryWindow.vala:882 ../ui/shotwell.glade.h:18
-msgid "Library Location"
-msgstr "Emplacement de la photothèque"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:895
-msgid "Photos cannot be imported from this directory."
-msgstr "Les photos ne peuvent pas être importées depuis ce dossier."
-
-#: ../src/library/LibraryWindow.vala:1183
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d %%)"
-
-#: ../src/library/LibraryWindow.vala:1227
-#: ../src/library/LibraryWindow.vala:1238
-msgid "Updating library..."
-msgstr "Mise à jour de la photothèque..."
-
-#: ../src/library/LibraryWindow.vala:1244
-msgid "Preparing to auto-import photos..."
-msgstr "Préparation de l'importation automatique de photos..."
-
-#: ../src/library/LibraryWindow.vala:1249
-msgid "Auto-importing photos..."
-msgstr "Importation automatique de photos..."
-
-#: ../src/library/LibraryWindow.vala:1257
-msgid "Writing metadata to files..."
-msgstr "Écriture des métadonnées dans les fichiers..."
-
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Fichiers manquants"
-
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Suppression..."
-
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Corbeille"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "La corbeille est vide"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Suppression de photos"
-
-#: ../src/main.vala:54
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
-msgstr ""
-"Votre photothèque n'est pas compatible avec cette version de Shotwell. Il "
-"semble qu'elle a été créée par Shotwell %s (schéma %d). Cette version est la "
-"%s (schéma %d). Veuillez utiliser la dernière version de Shotwell."
-
-#: ../src/main.vala:59
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
-msgstr ""
-"Shotwell est dans l'impossibilité de mettre à niveau votre photothèque de la "
-"version %s (schéma %d) à la version %s (schéma %d). Pour plus "
-"d'informations, veuillez consulter le wiki de Shotwell sur %s"
-
-#: ../src/main.vala:65
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Votre photothèque n'est pas compatible avec cette version de Shotwell. Il "
-"semble qu'elle a été créée par Shotwell %s (schéma %d). Cette version est la "
-"%s (schéma %d). Veuillez effacer votre photothèque en supprimant %s puis "
-"réimportez vos photos."
-
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr ""
-"Erreur inconnue lors de la tentative de vérification de la base de données "
-"de Shotwell : %s"
-
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Chargement de Shotwell"
-
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Chemin vers les données privées de Shotwell"
-
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DOSSIER"
-
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr ""
-"Ne pas surveiller le répertoire de la photothèque pour détecter des "
-"changements"
-
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Ne pas afficher l'indicateur de progression du démarrage"
-
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Afficher la version de l'application"
-
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[FICHIER]"
-
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Exécutez « %s --help » pour voir la liste complète des options disponibles "
-"en ligne de commande.\n"
-
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Faible (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Moyen (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Fort (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Maximum (%d%%)"
-
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Publication"
-
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Préparation de l'envoi"
-
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Envoi de l'élément %d sur %d"
-
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr ""
-"La publication vers %s ne peut pas continuer car une erreur est survenue :"
-
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Pour essayer de publier sur un autre service, sélectionnez-en un depuis le "
-"menu ci-dessus."
-
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Les photos/vidéos sélectionnées ont été publiées avec succès."
-
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Les vidéos sélectionnées ont été publiées avec succès."
-
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Les photos sélectionnées ont été publiées avec succès."
-
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "La vidéo sélectionnée a été publiée avec succès."
-
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "La photo sélectionnée a été publiée avec succès."
-
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Récupération des informations sur le compte..."
-
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Connexion..."
-
-#: ../src/publishing/PublishingUI.vala:185
-msgid "Publish Photos"
-msgstr "Publier les photos"
-
-#: ../src/publishing/PublishingUI.vala:186
-msgid "Publish photos _to:"
-msgstr "Publier les photos _sur :"
-
-#: ../src/publishing/PublishingUI.vala:188
-msgid "Publish Videos"
-msgstr "Publier les vidéos"
-
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish videos _to"
-msgstr "Publier les vidéos _sur"
-
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Photos and Videos"
-msgstr "Publier des photos et des vidéos"
-
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish photos and videos _to"
-msgstr "Publier les photos et les vidéos _sur"
+#. / 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 %d %b"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:360
-msgid "Unable to publish"
-msgstr "Impossible de publier"
+#. / 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 %d %b %Y"
 
-#: ../src/publishing/PublishingUI.vala:361
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell ne peut pas publier les éléments sélectionnés car aucun greffon de "
-"publication compatible n'est activé. Pour corriger cela, choisissez "
-"<b>Édition %s Préférences</b> et activez un ou plusieurs greffons de "
-"publication dans l'onglet <b>Greffons</b>."
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
+msgid "Slideshow"
+msgstr "Diaporama"
 
-#: ../src/searches/Branch.vala:68
+#: src/searches/Branch.vala:68
 msgid "Saved Searches"
 msgstr "Recherches enregistrées"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "contient"
 
 #. 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 "vaut exactement"
 
-#: ../src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "commence par"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "se termine par"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "ne contient pas"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "n'est pas défini"
 
-#: ../src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "est défini"
 
 #. 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 "est"
 
-#: ../src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "n'est pas"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "toute photo"
 
-#: ../src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "une photo brute"
 
-#: ../src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "une vidéo"
 
-#: ../src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "a"
 
-#: ../src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "n'a pas"
 
-#: ../src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "modifications"
 
-#: ../src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "modifications internes"
 
-#: ../src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "modifications externes"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "marquée"
 
-#: ../src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "non marquée"
 
-#: ../src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "et plus"
 
-#: ../src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "précisément"
 
-#: ../src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "et moins"
 
-#: ../src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "est après"
 
-#: ../src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "est avant"
 
-#: ../src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "est entre"
 
-#: ../src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "et"
 
-#: ../src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "Valider"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "n'importe quel"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "toutes"
 
-#: ../src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "aucune"
 
-#: ../src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "N'importe quel texte"
 
-#: ../src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:160
 msgid "Title"
 msgstr "Titre"
 
-#: ../src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:163
 msgid "Tag"
 msgstr "Étiquette"
 
-#: ../src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:166
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:169
 msgid "Event name"
 msgstr "Nom d'événement"
 
-#: ../src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:172
 msgid "File name"
 msgstr "Nom de fichier"
 
-#: ../src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:175
 msgid "Media type"
 msgstr "Type de média"
 
-#: ../src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
 msgstr "État marqué"
 
-#: ../src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:181
 msgid "Photo state"
 msgstr "État de la photo"
 
-#: ../src/searches/SearchBoolean.vala:187
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+msgid "Rating"
+msgstr "Note"
+
+#: src/searches/SearchBoolean.vala:187
 msgid "Date"
 msgstr "Date"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Nouvelle é_tiquette…"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "Note *+"
+
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "Note ★★+"
+
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "Note ★★★+"
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "Note ★★★★+"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "Note ★★★★★+"
+
+#: src/SearchFilter.vala:1064
+#, c-format
+msgid "Error loading search bar UI: %s"
+msgstr "Erreur de chargement de l'interface de la barre de recherche : %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: src/SearchFilter.vala:1073
+msgid "Close"
+msgstr "Fermer"
+
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+msgid "Type"
+msgstr "Type"
+
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Vidéos"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "Photos RAW"
+
+# Button tooltip
+#: src/SearchFilter.vala:1125
+msgid "Use a saved search to filter items in the current view"
+msgstr ""
+"Utilisez une recherche enregistrée pour filtrer les éléments de l'affichage "
+"actuel"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:134
+msgid "Back"
+msgstr "Précédente"
+
+#: src/SlideshowPage.vala:136
+msgid "Go to the previous photo"
+msgstr "Revient à la photo précédente"
+
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
+msgid "Pause"
+msgstr "Pause"
+
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
+msgid "Pause the slideshow"
+msgstr "Met le diaporama en pause"
+
+#: src/SlideshowPage.vala:148
+msgid "Next"
+msgstr "Suivante"
+
+#: src/SlideshowPage.vala:150
+msgid "Go to the next photo"
+msgstr "Passe à la photo suivante"
+
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Paramètres"
+
+#: src/SlideshowPage.vala:158
+msgid "Change slideshow settings"
+msgstr "Configurer le diaporama"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:212
+msgid "All photo source files are missing."
+msgstr "Tous les fichiers sources des photos sont manquants."
+
+#: src/SlideshowPage.vala:244
+msgid "Play"
+msgstr "Lancer"
 
-#: ../src/slideshow/Slideshow.vala:22
+#: src/SlideshowPage.vala:245
+msgid "Continue the slideshow"
+msgstr "Poursuit le diaporama"
+
+#: src/slideshow/Slideshow.vala:22
 msgid "Slideshow Transitions"
 msgstr "Transitions de diaporama"
 
-#: ../src/slideshow/TransitionEffects.vala:98
+#: src/slideshow/TransitionEffects.vala:98
 msgid "(None)"
 msgstr "(aucun)"
 
-#: ../src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/slideshow/TransitionEffects.vala:339
+#: src/slideshow/TransitionEffects.vala:339
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../src/tags/Branch.vala:131
+#: src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Background"
-msgstr "Définir comme fond d'écran"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "sans nom"
 
-#: ../ui/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
-msgid "Use for Desktop"
-msgstr "Utiliser pour le bureau"
+#. multiple videos
+#: src/VideoSupport.vala:520
+msgid "Export Videos"
+msgstr "Exporter les vidéos"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
-msgid "Use for Lock Screen"
-msgstr "Utiliser pour l'écran de vérouillage"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Ajouter/enlever la _marque"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Définir comme diaporama d'écran"
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+msgid "_Developer"
+msgstr "_Révélateur"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
-msgid "Show each photo for"
-msgstr "Afficher chaque photos pendant"
+#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
+msgid "Open with E_xternal Editor"
+msgstr "Ouvrir avec un éditeur e_xterne"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
-msgid "period of time"
-msgstr "intervalle de temps"
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
+msgid "View Eve_nt for Photo"
+msgstr "Afficher l'é_vénement de la photo"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
-msgid "Generate desktop background slideshow"
-msgstr "Générer un diaporama de fond d'écran"
+#: 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/trash.ui:5
+msgid "_File"
+msgstr "_Fichier"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "Durée d'affichage des photos en fond d'écran"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "Enregistrer _sous…"
 
-#: ../ui/shotwell.glade.h:1
-msgid "_Name of search:"
-msgstr "_Nom de la recherche :"
+#: 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/trash.ui:87
+msgid "_View"
+msgstr "_Affichage"
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Match"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Adapter à la _page"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Zoom _100 %"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Zoom _200 %"
+
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Photo"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "Photo _précédente"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "Photo _suivante"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Outils"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Foire aux questions"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Signaler un problème…"
+
+#: 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 "_Importer depuis un dossier…"
+
+#: 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 "Importer à partir d'une _application…"
+
+#: 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 "Vider la co_rbeille"
+
+#: 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 "_Rechercher"
 
-#: ../ui/shotwell.glade.h:3
-msgid "of the following:"
-msgstr "parmi ce qui suit :"
+#: 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 "Nou_velle recherche enregistrée…"
 
-#: ../ui/shotwell.glade.h:4
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Taille de l'image imprimée</b>"
+#: 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 "Informations _basiques"
 
-#: ../ui/shotwell.glade.h:5
-msgid "Use a _standard size:"
-msgstr "Utiliser une taille _standard :"
+#: 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 "Informations étend_ues"
 
-#: ../ui/shotwell.glade.h:6
-msgid "Use a c_ustom size:"
-msgstr "Utiliser une taille _personnalisée :"
+#: 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 "Barre de _recherche"
 
-#: ../ui/shotwell.glade.h:7
-msgid "_Match photo aspect ratio"
-msgstr "_Conserver les proportions de la photo"
+#: 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 "Barre _latérale"
 
-#: ../ui/shotwell.glade.h:8
-msgid "_Autosize:"
-msgstr "Taille _automatique :"
+#: 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 "Barre d'_outils"
 
-#: ../ui/shotwell.glade.h:9
-msgid "<b>Titles</b>"
-msgstr "<b>Titres</b>"
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Commentaires"
 
-#: ../ui/shotwell.glade.h:10
-msgid "Print image _title"
-msgstr "Imprimer le _titre de l'image"
+#: 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 "Trier les évén_ements"
 
-#: ../ui/shotwell.glade.h:11
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Résolution en pixels</b>"
+#: 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 "Ordre croiss_ant"
 
-#: ../ui/shotwell.glade.h:12
-msgid "_Output photo at:"
-msgstr "_Imprimer la photo à :"
+#: 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 "Ordr_e décroissant"
 
-#: ../ui/shotwell.glade.h:13
-msgid "pixels per inch"
-msgstr "pixels par pouce"
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+msgid "Even_ts"
+msgstr "É_vénements"
+
+#: 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 "Su_pprimer de la photothèque"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Titres"
+
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+msgid "Ta_gs"
+msgstr "É_tiquettes"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Trier les _photos"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Par _titre"
 
-#: ../ui/shotwell.glade.h:15
-msgid "Shotwell Preferences"
-msgstr "Préférences de Shotwell"
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Par nom de _fichier"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Par _date"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Par _note"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "Ordre _décroissant"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Photos"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Arrêter l'importation"
 
-#: ../ui/shotwell.glade.h:16
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "blanc"
 
-#: ../ui/shotwell.glade.h:17
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "noir"
 
-#: ../ui/shotwell.glade.h:19
-msgid "_Watch library directory for new files"
-msgstr "_Détecter les nouveaux fichiers dans le dossier de la photothèque"
-
-#: ../ui/shotwell.glade.h:20
-msgid "Metadata"
-msgstr "Métadonnées"
-
-#: ../ui/shotwell.glade.h:21
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Écrire les étiquettes, titres et autres _métadonnées dans les fichiers des "
-"photos"
-
-#: ../ui/shotwell.glade.h:22
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Affichage"
 
-#: ../ui/shotwell.glade.h:23
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Arrière-plan :"
+
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Importer les photos dans :"
 
-#: ../ui/shotwell.glade.h:24
-msgid "_Background:"
-msgstr "_Arrière-plan :"
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Détecter les nouveaux fichiers dans le dossier de la photothèque"
 
-#: ../ui/shotwell.glade.h:25
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Importation"
 
-#: ../ui/shotwell.glade.h:26
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "Structure de _dossier :"
 
-#: ../ui/shotwell.glade.h:27
-msgid "_Pattern:"
-msgstr "_Modèle :"
-
-#: ../ui/shotwell.glade.h:28
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Exemple :"
 
-#: ../ui/shotwell.glade.h:29
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "R_enommer les fichiers importés en minuscules"
 
-#: ../ui/shotwell.glade.h:30
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Métadonnées"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr ""
+"Écrire les étiquettes, titres et autres _métadonnées dans les fichiers des "
+"photos"
+
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "Révélateur RAW"
 
-#: ../ui/shotwell.glade.h:31
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "Par dé_faut :"
 
-#: ../ui/shotwell.glade.h:33
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Modèle :"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Arrière-plan transparent :"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Damier"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Couleur unie"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "Éditeur d'image e_xterne :"
 
-#: ../ui/shotwell.glade.h:34
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Éditeur _RAW externe :"
 
-#: ../ui/shotwell.glade.h:35
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Éditeurs externes"
 
-#: ../ui/shotwell.glade.h:36
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../ui/shotwell.glade.h:37
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Taille de l'image imprimée</b>"
+
+#: ui/printing_widget.ui:36
+msgid "Use a _standard size:"
+msgstr "Utiliser une taille _standard :"
+
+#: ui/printing_widget.ui:80
+msgid "Use a c_ustom size:"
+msgstr "Utiliser une taille _personnalisée :"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:146
+msgid "in."
+msgstr "po."
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:147
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:173
+msgid "_Match photo aspect ratio"
+msgstr "_Conserver les proportions de la photo"
+
+#: ui/printing_widget.ui:197
+msgid "_Autosize:"
+msgstr "Taille _automatique :"
+
+#: ui/printing_widget.ui:237
+msgid "<b>Titles</b>"
+msgstr "<b>Titres</b>"
+
+#: ui/printing_widget.ui:254
+msgid "Print image _title"
+msgstr "Imprimer le _titre de l'image"
+
+#: ui/printing_widget.ui:297
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Résolution en pixels</b>"
+
+#: ui/printing_widget.ui:317
+msgid "_Output photo at:"
+msgstr "_Imprimer la photo à :"
+
+#: ui/printing_widget.ui:351
+msgid "pixels per inch"
+msgstr "pixels par pouce"
+
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Définir comme fond d'écran"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Utiliser pour le bureau"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Utiliser pour l'écran de vérouillage"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Définir comme diaporama d'écran"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Générer un diaporama de fond d'écran"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Afficher chaque photos pendant"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "intervalle de temps"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Durée d'affichage des photos en fond d'écran"
+
+#: ui/shotwell.ui:22
+msgid "_Name of search:"
+msgstr "_Nom de la recherche :"
+
+#: ui/shotwell.ui:76
+msgid "_Match"
+msgstr "_Rechercher"
+
+#: ui/shotwell.ui:103
+msgid "of the following:"
+msgstr "parmi ce qui suit :"
+
+#: ui/shotwell.ui:184
+msgid "label"
+msgstr "étiquette"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nouvelle é_tiquette…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Délai :"
 
-#: ../ui/shotwell.glade.h:38
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Effet de _transition :"
 
-#: ../ui/shotwell.glade.h:39
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Déla_i de transition :"
 
-#: ../ui/shotwell.glade.h:40
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Afficher le t_itre"
 
-#: ../ui/shotwell.glade.h:41
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "secondes"
 
-#~ msgid "Import media _from:"
-#~ msgstr "Importer du contenu à _partir de :"
-
-#~ msgid "Only _Remove"
-#~ msgstr "_Enlever seulement"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Supprime toutes les photos de la corbeille"
diff --git a/po/gd.gmo b/po/gd.gmo
index f627472..a87bfce 100644
--- a/po/gd.gmo
+++ b/po/gd.gmo
diff --git a/po/gd.po b/po/gd.po
index a7d7e74..7b6c95b 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -2,14 +2,14 @@
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the shotwell package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-# GunChleoc <fios@foramnagaidhlig.net>, 2014, 2017.
+# GunChleoc <fios@foramnagaidhlig.net>, 2014, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotw"
 "ell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-03-04 09:41+0000\n"
-"PO-Revision-Date: 2017-03-10 10:16+0100\n"
+"POT-Creation-Date: 2017-04-02 16:28+0000\n"
+"PO-Revision-Date: 2018-03-02 12:09+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -24,12 +24,13 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
 #: misc/shotwell.appdata.xml.in:9
-#| msgid "Photo Manager"
 msgid "Popular photo manager"
 msgstr "Manaidsear dhealbhan mòr-chòrdte"
 
@@ -39,7 +40,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 ""
 
@@ -54,7 +55,6 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr ""
 
 #: misc/shotwell.appdata.xml.in:52
-#| msgid "Set Developer"
 msgid "The Shotwell developers"
 msgstr "Luchd-leasachaidh Shotwell"
 
@@ -63,7 +63,6 @@ msgid "Photo Manager"
 msgstr "Manaidsear dhealbhan"
 
 #: misc/shotwell.desktop.in.in:6
-#| msgid "any photo"
 msgid "Organize your photos"
 msgstr "Cuir rian air na dealbhan agad"
 
@@ -77,12 +76,10 @@ msgstr ""
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
-#| msgid "Shotwell"
 msgid "shotwell"
 msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
-#| msgid "Photo Viewer"
 msgid "Shotwell Viewer"
 msgstr "Sealladair Shotwell"
 
@@ -115,7 +112,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 ""
 
@@ -141,10 +138,9 @@ msgid "URL of the Rajce server."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:384
-#: misc/org.yorba.shotwell.gschema.xml:442
-#: misc/org.yorba.shotwell.gschema.xml:498
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
 msgid "username"
 msgstr "ainm-cleachdaiche"
 
@@ -161,8 +157,7 @@ msgid "user token, if remembered."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:460
-#| msgid "within category:"
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "last category"
 msgstr "an roinn-seòrsa mu dheireadh"
 
@@ -171,8 +166,7 @@ msgid "The last selected Rajce category."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:472
-#| msgid "Photo size:"
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last photo size"
 msgstr "meud an deilbh mu dheireadh"
 
@@ -183,7 +177,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:70
-#| msgid "_Remember"
 msgid "remember"
 msgstr "cuimhnich"
 
@@ -192,7 +185,6 @@ msgid "If true, remember last login."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:76
-#| msgid "_Hide album"
 msgid "hide album"
 msgstr "falaich an t-albam"
 
@@ -201,7 +193,6 @@ msgid "If true, hide the newly created Rajce album."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:82
-#| msgid "Open target _album in browser"
 msgid "open album in web browser"
 msgstr "fosgal an t-albam ann am brabhsair-lìn"
 
@@ -211,11 +202,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,1052 +216,1128 @@ msgid ""
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr ""
 
-#: 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
-#| msgid "Display extended information for the selection"
+#: misc/org.yorba.shotwell.gschema.xml:29
 msgid "display extended properties"
 msgstr "seall buadhan leudaichte"
 
-#: 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
-#| msgid "Display the sidebar"
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "seall am bàr-taoibh"
 
-#: 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
-#| msgid "Display the sidebar"
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "seall am bàr-inneal"
 
-#: 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
-#| msgid "Display the search bar"
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "seall am bàr-luirg"
 
-#: 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
-#| msgid "Display each photo's tags"
+#: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
 msgstr "seall tiotalan nan dealbhan"
 
-#: 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
-#| msgid "Display each photo's tags"
+#: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
 msgstr "seall beachdan air dealbhan"
 
-#: 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 ""
 
-#: misc/org.yorba.shotwell.gschema.xml:64
-#| msgid "Edit Event Comment"
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "seall beachdan air tachartasan"
 
-#: 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
-#| msgid "Display each photo's tags"
+#: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
 msgstr "seall tagaichean nan dealbhan"
 
-#: 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
-#| msgid "Display each photo's rating"
+#: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
 msgstr "seall rangachaidhean nan dealbhan"
 
-#: 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
-#| msgid "No events found"
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
-msgstr "seòrsaich na tachartasan a' dìreadh"
+msgstr "seòrsaich na tachartasan a’ dìreadh"
 
-#: 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
-#| msgid "Sort photos in an ascending order"
+#: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
-msgstr "seòrsaich dealbhan na tasglainn a' dìreadh"
+msgstr "seòrsaich dealbhan na tasglainn a’ dìreadh"
 
-#: 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
-#| msgid "Sort photos in an ascending order"
+#: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
-msgstr "seòrsaich dealbhan nan tachartasan a' dìreadh"
+msgstr "seòrsaich dealbhan nan tachartasan a’ dìreadh"
 
-#: 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
-#| msgid "Sort photos by title"
+#: misc/org.yorba.shotwell.gschema.xml:113
 msgid "sort event photos criteria"
 msgstr ""
 
-#: 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
-#| msgid "_Modify original photo files"
+#: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
 msgstr "atharraich faidhlichean tùsail nan dealbhan"
 
-#: 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
-#| msgid "Library Location"
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
-msgstr "ionad a' bhàir-thaoibh"
+msgstr "ionad a’ bhàir-thaoibh"
 
-#: 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
-#| msgid "Pin the toolbar open"
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
-msgstr "prìnich staid a' bhàir-inneal"
+msgstr "prìnich staid a’ bhàir-inneal"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:160
-#| msgid "_Background:"
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
-msgstr "dath a' chùlaibh"
+msgstr "dath a’ chùlaibh"
 
-#: 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
-#| msgid "_Delay:"
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "dàil"
 
-#: 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
-#| msgid "Transition d_elay:"
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "dàil an tar-mhùthaidh"
 
-#: 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
-#| msgid "_Transition effect:"
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "id èifeachd an tar-mhùthaidh"
 
-#: 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
-#| msgid "Show t_itle"
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "Seall an tiotal"
 
-#: 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
-#| msgid "Import to Library"
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "ion-phortaich pasgan"
 
-#: 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
-#| msgid "_Watch library directory for new files"
+#: misc/org.yorba.shotwell.gschema.xml:251
 msgid "watch library directory for new files"
 msgstr "cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
 
-#: 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
-#| msgid "Writing metadata to files..."
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "write metadata to master files"
 msgstr "sgrìobh am meata-dàta dha na faidhlichean-maighstir"
 
-#: 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
-#| msgid "_Directory structure:"
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "pàtran nam pasgan"
 
-#: 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
-#| msgid "RAW Developer"
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "Bun-roghainn an leasaicheir RAW"
 
-#: 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
-#| msgid "E_xternal photo editor:"
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid "external photo editor"
 msgstr "deasaiche dhealbhan air an taobh a-muigh"
 
-#: 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
-#| msgid "External _RAW editor:"
+#: misc/org.yorba.shotwell.gschema.xml:313
 msgid "external raw editor"
 msgstr "deasaiche raw air an taobh a-muigh"
 
-#: 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
-#| msgid "Core Publishing Services"
+#: 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
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "às-phortaich am meata-dàta"
+
+#: 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
 msgid "last used publishing service"
 msgstr "an t-seirbheis foillseachaidh mu dheireadh"
 
-#: 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
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:396
 msgid "default publishing service"
 msgstr "an t-seirbheis foillseachaidh thùsail"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
-#| msgid "Access _type:"
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "tòcan inntrigidh"
 
-#: 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
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "ainm-cleachdaiche"
 
-#: misc/org.yorba.shotwell.gschema.xml:353
-#| msgid "You are not currently logged into Yandex.Fotki."
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr ""
 
-#: 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
+#: 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
-#| msgid "_Password"
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "facal-faire"
 
-#: 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
-#| msgid "_Remember Password"
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "cuimhnich am facal-faire"
 
-#: 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
-#| msgid "_If a title is set and comment unset, use title as comment"
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ma chaidh tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an "
 "tiotal mar bheachd le luchdaidhean suas gu Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:485
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
 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
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Ainm-cleachdaiche Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
-#| msgid "API _Key:"
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "Iuchair API"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "Iuchair API Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "URL làrach 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
-#| msgid "Core Data Import Services"
+#: misc/org.yorba.shotwell.gschema.xml:620
 msgid "last used import service"
 msgstr "an t-seirbheis ion-phortaidh mu dheireadh"
 
-#: 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
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr ""
 
-#: 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
-#| msgid "Rotate Right"
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "àirde na susbainte"
 
-#: 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
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "aonad na susbainte"
 
-#: 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
-#| msgid "2 images per page"
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "images per page code"
 msgstr ""
 
-#: 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
-#| msgid "_Match photo aspect ratio"
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "match aspect ratio"
 msgstr "maidsich co-mheas an deilbh"
 
-#: 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
-#| msgid "Print image _title"
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "clò-bhuail tiotalan"
 
-#: 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
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "enable facebook publishing plugin"
 msgstr ""
 
-#: 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
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable youtube publishing plugin"
 msgstr ""
 
-#: 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
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable piwigo publishing plugin"
 msgstr ""
 
-#: 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
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable tumblr publishing plugin"
 msgstr ""
 
-#: 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
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable rajce publishing plugin"
 msgstr ""
 
-#: 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
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable gallery3 publishing plugin"
 msgstr ""
 
-#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow slide transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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
 #, fuzzy
 #| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circle transition"
 msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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:792
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow circles transition"
+msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
+
+#: 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:798
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow blinds transition"
+msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
+
+#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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 "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
 
-#: 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"
 msgstr ""
 
-#: plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Tadhail air an duilleag-dhachaigh aig Shotwell"
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+#| msgid ""
+#| "You are not currently logged into Facebook.\n"
+#| "\n"
+#| "If you don't yet have a Facebook account, you can create one during the "
+#| "login process. During login, Shotwell Connect may ask you for permission "
+#| "to upload photos and publish to your feed. These permissions are required "
+#| "for Shotwell Connect to function."
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Cha do rinn thu clàradh a-steach air Facebook.\n"
+"\n"
+"Mur eil cunntas Facebook agad, bidh cothrom agad fear a chruthachadh rè a’ "
+"chlàraidh a-steach. Dh’fhaoidte gun iarr Ceangal Shotwell cead ort dealbhan "
+"a luchdadh suas agus foillseachadh a dhèanamh gun inbhir agad. Feumaidh "
+"Ceangal Shotwell an cead seo mus obraich e."
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
-msgid "translator-credits"
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
 msgstr ""
-"Launchpad Contributions:\n"
-"  Akerbeltz https://launchpad.net/~fios\n"
-"  GunChleoc https://launchpad.net/~gunchleoc\n"
-"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
+"Rinn thu clàradh a-steach is a-mach air Facebook san t-seisean Shotwell seo "
+"mu thràth.\n"
+"Ma tha thu airson leantainn air foillseachadh air Facebook, fàg an-seo, ath-"
+"thòisich Shotwell is feuch ri fhoillseachadh às ùr."
 
-#: plugins/common/RESTSupport.vala:451
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
 msgstr ""
-"Tha feum air faidhle sealach mus gabh foillseachadh a dhèanamh ach chan eil "
-"e ri làimh"
+"Cuir a-steach an àireamh-dhearbhaidh a nochdas an dèidh dhut clàradh a-"
+"steach dhan Flickr sa bhrabhsair-lìn agad."
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
+msgid "Authorization _Number:"
+msgstr "_Àireamh ùghdarrais:"
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Lean air adhar_t"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#| msgid ""
+#| "You are not currently logged into Flickr.\n"
+#| "\n"
+#| "Click Login to log into Flickr in your Web browser.  You will have to "
+#| "authorize Shotwell Connect to link to your Flickr account."
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Cha do rinn thu clàradh a-steach air Flickr.\n"
+"\n"
+"Clàraich a-steach air Flickr sa bhrabhsair-lìn agad. Bidh agad ri cead a "
+"thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris a’ chunntas Flickr "
+"agad."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#| msgid "Preparing for login..."
+msgid "Preparing for login…"
+msgstr "Ag ullachadh gus do chlàradh a-steach…"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
+#: plugins/shotwell-publishing/FlickrPublishing.vala:341
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
+"Chan urrainn dhuinn foillseachadh air Flickr dhut."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#| msgid "Verifying authorization..."
+msgid "Verifying authorization…"
+msgstr "A’ dearbhadh an ùghdarrais…"
 
-#: plugins/common/RESTSupport.vala:1157
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1284,6 +1351,106 @@ msgstr ""
 "Airson leantainn air adhart leis an obair-fhoillseachaidh air seirbheisean "
 "Google, fàg Shotwell, ath-thòisich e is feuch ris a-rithist."
 
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#| msgid ""
+#| "You are not currently logged into Picasa Web Albums.\n"
+#| "\n"
+#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
+#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
+#| "account."
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Cha do rinn thu clàradh a-steach air Picasa Web Albums.\n"
+"\n"
+"Briog air “Clàraich a-steach” gus sin a dhèanamh sa bhrabhsair-lìn agad. "
+"Bidh agad ri cead a thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris "
+"a’ chunntas agad air Picasa Web Albums."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+msgid ""
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
+msgstr ""
+"Cha do rinn thu clàradh a-steach air YouTube.\n"
+"\n"
+"Feumaidh cunntas Google a bhith agad ro làimh ’s e air a shuidheachadh "
+"airson ’s gun gabh a chleachdadh airson YouTube mus urrainn dhut leantainn "
+"air adhart. ’S urrainn dhut, mar is trice, sin a chur air dòigh ma "
+"chlàraicheas tu a-steach air YouTube sa bhrabhsair-lìn agad co-dhiù aon "
+"turas."
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "Tadhail air an duilleag-dhachaigh aig Shotwell"
+
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Akerbeltz https://launchpad.net/~fios\n"
+"  GunChleoc https://launchpad.net/~gunchleoc\n"
+"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
+
+#. 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 ""
+"Tha feum air faidhle sealach mus gabh foillseachadh a dhèanamh ach chan eil "
+"e ri làimh"
+
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1303,8 +1470,8 @@ msgid ""
 msgstr ""
 "Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
 "\n"
-"Tagh leabhar-lann a bu mhath leat ion-phortadh 's tu a' taghadh leabharlann "
-"a lorg Shotwell no a' taghadh faidhle stòr-dàta F-Spot eile."
+"Tagh leabhar-lann a bu mhath leat ion-phortadh ’s tu a’ taghadh leabharlann "
+"a lorg Shotwell no a’ taghadh faidhle stòr-dàta F-Spot eile."
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
@@ -1334,14 +1501,14 @@ msgid ""
 "database is not supported by Shotwell"
 msgstr ""
 "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil "
-"Shotwell a' cur taic dhan tionndadh seo de stòr-dàta F-Spot"
+"Shotwell a’ cur taic dhan tionndadh seo de stòr-dàta F-Spot"
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
 "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair "
-"mearachd fhad 's a bha sinn a' leughadh clàr nan tagaichean"
+"mearachd fhad ’s a bha sinn a’ leughadh clàr nan tagaichean"
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
@@ -1349,7 +1516,7 @@ msgid ""
 "table"
 msgstr ""
 "Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu a leughadh: thachair "
-"mearachd fhad 's a bha sinn a' leughadh clàr nan dealbhan"
+"mearachd fhad ’s a bha sinn a’ leughadh clàr nan dealbhan"
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
@@ -1360,12 +1527,12 @@ msgid ""
 "You can close this dialog and start using Shotwell while the import is "
 "taking place in the background."
 msgstr ""
-"Lorg Shotwell %d dealbh(an) san leabhar-lann F-Spot agus tha e 'gan ion-"
+"Lorg Shotwell %d dealbh(an) san leabhar-lann F-Spot agus tha e ’gan ion-"
 "phortadh. Mothaichidh sinn do dhealbhan a tha ann iomadh turas gu fèin-"
 "obrachail is bheir sinn air falbh iad.\n"
 "\n"
-"'S urrainn dhut an còmhradh seo a dhùnadh agus tòiseachadh air Shotwell a "
-"chleachdadh fhad 's a tha sinne 'ga ion-phortadh fhathast sa chùlaibh."
+"’S urrainn dhut an còmhradh seo a dhùnadh agus tòiseachadh air Shotwell a "
+"chleachdadh fhad ’s a tha sinne ’ga ion-phortadh fhathast sa chùlaibh."
 
 #: plugins/shotwell-data-imports/FSpotImporter.vala:86
 #, c-format
@@ -1380,95 +1547,95 @@ msgstr "Ag ullachadh airson ion-phortadh"
 msgid "Core Data Import Services"
 msgstr "Seirbheisean ion-phortadh prìomh-dhàta"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Ai_r ais"
-
-#: 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 "_Clàraich a-steach"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL _Gallery3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "_Ainm-cleachdaiche:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Facal-faire:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Ai_r ais"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1105
+#| msgid "_Login"
+msgid "_Log in"
+msgstr "C_làraich a-steach"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "_Iuchair API:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "no"
 
-#: 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:142
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "_Clàraich a-mach"
-
-#: 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:156
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-msgid "_Publish"
-msgstr "_Foillsich"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Albam a tha _ann"
 
-#: 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 "Alba_m ùr"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Albam a tha _ann"
-
-#: 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 ""
-"Thoi_r air falbh an t-ionad, an taga agus fiosrachadh a dh'aithnicheadh an "
+"Thoi_r air falbh an t-ionad, an taga agus fiosrachadh a dh’aithnicheadh an "
 "camara mus luchdaich thu seo suas"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Bacadh sgèilidh:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "piogsail"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Meud tùsail"
 
-#: 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 "Leud no àirde"
 
+#: 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:142
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Clàraich a-mach"
+
+#: 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:156
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Foillsich"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Mòideal foillseachaidh Gallery3"
@@ -1480,7 +1647,7 @@ msgid ""
 "You must have already signed up for a Gallery3 account to complete the login "
 "process."
 msgstr ""
-"Cha do rinn thu clàradh a-steach air a' ghailearaidh agad.\n"
+"Cha do rinn thu clàradh a-steach air a’ ghailearaidh agad.\n"
 "\n"
 "Feumaidh cunntas Gallery3 a bhith agad ro làimh ach an urrainn dhut an "
 "clàradh a-steach a choileanadh."
@@ -1491,15 +1658,20 @@ msgstr "Pasgan tùsail Shotwell"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "The file \"%s\" may not be supported by or may be too large for this "
+#| "instance of Gallery3."
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
-"Cha chuirear taic ris an fhaidhle \"%s\" no tha e ro mhòr airson an ionstans "
+"Cha chuirear taic ris an fhaidhle “%s” no tha e ro mhòr airson an ionstans "
 "seo de Gallery3."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
@@ -1515,10 +1687,10 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 #| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "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 ""
 "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
@@ -1529,15 +1701,15 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
 msgid "Publishing to %s as %s."
-msgstr "'Ga fhoillseachadh gu %s mar %s."
+msgstr "’Ga fhoillseachadh gu %s mar %s."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
 msgstr ""
-"Cuir a-steach an URL airson an làrach Gallery3 agad 's an t-ainm-"
-"cleachdaiche 's am facal-faire (no iuchair API) airson a' chunntais Gallery3 "
+"Cuir a-steach an URL airson an làrach Gallery3 agad ’s an t-ainm-"
+"cleachdaiche ’s am facal-faire (no iuchair API) airson a’ chunntais Gallery3 "
 "agad."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
@@ -1545,8 +1717,8 @@ msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
 msgstr ""
-"Cha robh an t-ainm-cleachdaiche 's facal-faire no an iuchair API mar bu "
-"chòir. Cuir a-steach d' ainm-cleachdaiche 's facal-faire gu h-ìosal gus "
+"Cha robh an t-ainm-cleachdaiche ’s facal-faire no an iuchair API mar bu "
+"chòir. Cuir a-steach d’ ainm-cleachdaiche ’s facal-faire gu h-ìosal gus "
 "feuchainn ris a-rithist."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
@@ -1557,7 +1729,7 @@ msgid ""
 msgstr ""
 "Chan e am prìomh phasgan aig an ionstans de Gallery3 agad a tha san URL a "
 "chuir thu a-steach a-rèir coltais. Dèan cinnteach gun do sgrìobh thu gu "
-"ceart e 's nach eil co-phàirtean aig an deireadh (m.e. index.php)."
+"ceart e ’s nach eil co-phàirtean aig an deireadh (m.e. index.php)."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
@@ -1567,67 +1739,68 @@ msgstr "Cleachdaiche nach aithne dhuinn"
 msgid " Site Not Found"
 msgstr " Cha deach an làrach a lorg"
 
-#: 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 "Seòladh _puist-d"
 
-#: 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 "_Facal-faire"
 
-#: 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 "_Cuimhnich"
 
-#: 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"
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+#| msgid "Logging in..."
+msgid "Log in"
 msgstr "Clàraich a-steach"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
 msgstr "Albam a tha _ann:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: 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
 msgid "A _new album named:"
 msgstr "Albam _ùr air a bhios:"
 
-#: 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 "Falaic_h an t-albam"
 
-#: 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 "Fosgal an t-_albam-uidhe sa bhrabhsair"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Còir-lethbhreac (C) 2013 rajce.net"
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Còir-lethbhreac © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr ""
-"Thachair mearachd nuair a bha sinn a' foillsicheadh air Rajce. Nach fheuch "
+"Thachair mearachd nuair a bha sinn a’ foillsicheadh air Rajce. Nach fheuch "
 "thu ris a-rithist?"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
 msgid "Enter email and password associated with your Rajce account."
 msgstr ""
 "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
-"cheangailte ris a' chunntas Rajce agad."
+"cheangailte ris a’ chunntas Rajce agad."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
 msgid "Invalid email and/or password. Please try again"
@@ -1636,28 +1809,28 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
 msgid "Invalid User Email or Password"
-msgstr "Post-d a' chleachdaiche no facal-faire cearr"
+msgstr "Post-d a’ chleachdaiche no facal-faire cearr"
 
-#: 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 "Chlàraich thu a-steach air Rajce mar %s."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#: plugins/shotwell-publishing/PicasaPublishing.vala:577
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Nochdaidh na dealbhan ann an:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Seirbheisean foillseachaidh Shotwell a bharrachd"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogaichean:"
 
-#: 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 "_Meud an deilbh:"
@@ -1667,31 +1840,36 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Còir-lethbhreac 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1230
-msgid "500 x 375 pixels"
-msgstr "500 x 375 piogsail"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:876
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#| msgid "500 x 375 pixels"
+msgid "500 × 375 pixels"
+msgstr "500 × 375 piogsail"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 piogsail"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#| msgid "1024 x 768 pixels"
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 piogsail"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 piogsail"
+#| msgid "1280 x 853 pixels"
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 piogsail"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
 #, c-format
-#| msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn't a valid response to an OAuth authentication request"
-msgstr "Chan e freagairt cheart air iarratas dearbhaidh OAuth a tha ann \"%s\""
+#| 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 "Chan e freagairt cheart air iarratas dearbhaidh OAuth a tha ann “%s”"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
+#| msgid ""
+#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
 "TumblrPublisher: start( ): Chan urrainn dha tòiseachadh; cha ghabh am "
 "foillsichear seo a thòiseachadh às ùr."
@@ -1700,27 +1878,27 @@ msgstr ""
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr ""
 "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
-"cheangailte ris a' chunntas Tumblr agad."
+"cheangailte ris a’ chunntas Tumblr agad."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr ""
 "Tha an t-ainm-cleachdaiche agus/no am facal-faire cearr. Nach fheuch thu ris "
 "a-rithist?"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Ainm-cleachdaiche no facal-faire cearr"
 
-#: 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 "Cha b' urrainn dhuinn an eadar-aghaidh a luchdadh: %s"
+msgstr "Cha b’ urrainn dhuinn an eadar-aghaidh a luchdadh: %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"
@@ -1737,126 +1915,98 @@ msgstr "Còir-lethbhreac 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Tadhail air làrach-lìn 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 "Cha do chlàraich thu a-steach air Yandex.Fotki."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Poblach"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Caraidean"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Prìobhaideach"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albaman (no sgrìobh fear ùr):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Seòrsa an _inntrigidh:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "C_uir beachdan à comas"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Toirmisg luchdadh a-nuas deilbh thùsail"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Poblach"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
-msgid "Friends"
-msgstr "Caraidean"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Prìobhaideach"
-
-#: 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 "Foillsich gu albam a tha _ann:"
 
-#: 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 "Cruthaich albam _ùr air a bhios:"
 
-#: 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:725
 msgid "Upload _size:"
 msgstr "_Meud an luchdaidh suas:"
 
-#: 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 "Cò chì albaman videothan agus dealbhan ùra:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
+#: 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:59
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
-"Thoi_r air falbh fiosrachadh an ionaid 's a' chamara agus fiosrachadh "
+"Thoi_r air falbh fiosrachadh an ionaid ’s a’ chamara agus fiosrachadh "
 "aithneachaidh eile mus luchdaich thu seo suas"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1114
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Ceangal Shotwell"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Cha do rinn thu clàradh a-steach air Facebook.\n"
-"\n"
-"Mur eil cunntas Facebook agad, bidh cothrom agad fear a chruthachadh rè a' "
-"chlàraidh a-steach. Dh'fhaoidte gun iarr Ceangal Shotwell cead ort dealbhan "
-"a luchdadh suas agus foillseachadh a dhèanamh gun inbhir agad. Feumaidh "
-"Ceangal Shotwell an cead seo mus obraich e."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Rinn thu clàradh a-steach is a-mach air Facebook san t-seisean Shotwell seo "
-"mu thràth.\n"
-"Ma tha thu airson leantainn air foillseachadh air Facebook, fàg an-seo, ath-"
-"thòisich Shotwell is feuch ri fhoillseachadh às ùr."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Stannardach (720 piogsail)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Mòr (2048 piogsail)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
-msgstr "A' cur fo dheuchainn a' cheangail ri Facebook..."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-msgid "Creating album..."
-msgstr "A' cruthachadh an albaim..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+#| msgid "Creating album..."
+msgid "Creating album…"
+msgstr "A’ cruthachadh an albaim…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
+#| 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 ""
 "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
 "Chan urrainn dhuinn foillseachadh air Facebook dhut."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1865,79 +2015,22 @@ msgstr ""
 "Chlàraich thu a-steach air Facebook mar %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Càit a bheil thu airson na dealbhan a thagh thu fhoillseachadh?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Mi fhìn a-mhàin"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "A h-uile duine"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Cuir a-steach an àireamh-dhearbhaidh a nochdas an dèidh dhut clàradh "
-"a-steach dhan Flickr sa bhrabhsair-lìn agad."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Àireamh ùghdarrais:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
-msgid "Con_tinue"
-msgstr "Lean air adhar_t"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Cha do rinn thu clàradh a-steach air Flickr.\n"
-"\n"
-"Clàraich a-steach air Flickr sa bhrabhsair-lìn agad. Bidh agad ri cead a "
-"thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris a' chunntas Flickr "
-"agad."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Rinn thu clàradh a-steach is a-mach air Flickr san t-seisean Shotwell seo mu "
-"thràth.\n"
-"Ma tha thu airson leantainn air foillseachadh air Flickr, fàg an-seo, ath-"
-"thòisich Shotwell is feuch ri fhoillseachadh às ùr."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
-msgstr "Ag ullachadh gus clàradh a-steach..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
-"Chan urrainn dhuinn foillseachadh air Flickr dhut."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "A' dearbhadh an ùghdarrais..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -1946,211 +2039,225 @@ msgstr ""
 "Chlàraich thu a-steach air Flickr mar %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:802
 #, c-format
 #| msgid ""
 #| "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."
+#| "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] ""
-"Tha cunntas saor agad air Flickr agus tha sin a' cuingeachadh uiread a dhàta "
-"as urrainn dhut luchdadh suas gach mìos.\n"
-"Tha %d mheaga-baidht dheth air fhàgail agad am mìos-sa."
-msgstr[1] ""
-"Tha cunntas saor agad air Flickr agus tha sin a' cuingeachadh uiread a dhàta "
-"as urrainn dhut luchdadh suas gach mìos.\n"
-"Tha %d mheaga-baidht dheth air fhàgail agad am mìos-sa."
-msgstr[2] ""
-"Tha cunntas saor agad air Flickr agus tha sin a' cuingeachadh uiread a dhàta "
-"as urrainn dhut luchdadh suas gach mìos.\n"
-"Tha %d meaga-baidhtean dheth air fhàgail agad am mìos-sa."
-msgstr[3] ""
-"Tha cunntas saor agad air Flickr agus tha sin a' cuingeachadh uiread a dhàta "
+"This month you have %s remaining in your upload quota."
+msgstr ""
+"Tha cunntas saor agad air Flickr agus tha sin a’ cuingeachadh uiread a dhàta "
 "as urrainn dhut luchdadh suas gach mìos.\n"
-"Tha %d meaga-baidht dheth air fhàgail agad am mìos-sa."
+"Tha %s dheth air fhàgail agad am mìos-sa."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Tha cunntas Flickr Pro agad agus is urrainn dhut na lùigeas tu a dhàta a "
 "luchdadh suas gach mìos."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Chì na _daoine a leanas na dealbhan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Chì na _daoine a leanas na videothan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
-msgstr "Chì na _daoine a leanas na dealbhan 's na videothan:"
+msgstr "Chì na _daoine a leanas na dealbhan ’s na videothan:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Mo theaghlach ⁊ mo charaidean a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Mo theaghlach a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Mo charaidean a-mhàin"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 piogsail"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 piogsail"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 piogsail"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 piogsail"
 
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Ro-shocraich _meud nan dealbh:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Cha do rinn thu clàradh a-steach air Picasa Web Albums.\n"
-"\n"
-"Briog air \"Clàraich a-steach\" gus sin a dhèanamh sa bhrabhsair-lìn agad. "
-"Bidh agad ri cead a thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris "
-"a' chunntas agad air Picasa Web Albums."
-
 #. Add album that will push to the default feed for all the new users
 #. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
 #. or the new "Default album" album for Google Photos
-#: plugins/shotwell-publishing/PicasaPublishing.vala:99
-#: plugins/shotwell-publishing/PicasaPublishing.vala:636
-#| msgid "De_fault:"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
 msgid "Default album"
 msgstr "An t-albam tùsail"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:305
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
+#| 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 ""
 "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
 "Chan urrainn dhuinn foillseachadh air Picasa dhut."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:566
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Chlàraich thu a-steach air Picasa Web Albums mar %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:572
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Nochdaidh na videothan ann an:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:616
-msgid "Small (640 x 480 pixels)"
-msgstr "Beag (640 x 480 piogsail)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+#| msgid "Small (640 x 480 pixels)"
+msgid "Small (640 × 480 pixels)"
+msgstr "Beag (640 × 480 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:617
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Meadhanach (1024 x 768 piogsail)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Meadhanach (1024 × 768 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:618
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Na mholamaid (1600 x 1200 piogsail)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Na mholamaid (1600 × 1200 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:619
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 piogsail)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 piogsail)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:620
-#: src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Am meud tùsail"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "_URL na leabhar-lainn dealbhan Piwigo agad"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "_Ainm-cleachdaiche"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Cuimhnich am facal-faire"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+#| msgid "_Remember Password"
+msgid "Remember Password"
+msgstr "Cuimhnich am facal-faire"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Roinn-seòrsa a tha _ann:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+#| msgid "An _existing category:"
+msgid "An _existing category"
+msgstr "Roinn-seòrsa a tha _ann"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Chì na daoine a leanas na _dealbhan:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+#| msgid "A _new album named:"
+msgid "A _new album named"
+msgstr "Albam _ùr air a bhios"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Meud an deilbh:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#| msgid "within category:"
+msgid "within category"
+msgstr "san roinn-seòrsa"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "san roinn-seòrsa:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+#| msgid "Album comment:"
+msgid "Album comment"
+msgstr "Beachd mun albam"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Beachd mun albam:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+#| msgid "Photos will be _visible by:"
+msgid "Photos will be _visible by"
+msgstr "Chì na daoine a leanas na _dealbhan:"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+#| msgid "Photo size:"
+msgid "Photo size"
+msgstr "Meud an deilbh"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "Ma thè_id tiotal a shuidheachadh agus beachd a dhì-shuidheachadh, cleachd an "
 "tiotal mar bheachd"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "Na luch_daich suas na tagaichean"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Clàraich a-mach"
 
-#: 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:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Foillsich"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "A' cruthachadh an albaim %s..."
+#| msgid "Creating album %s..."
+msgid "Creating album %s…"
+msgstr "A’ cruthachadh an albaim %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:920
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
-"Thachair mearachd nuair a bha sinn a' foillsicheadh air Piwigo. Nach fheuch "
+"Thachair mearachd nuair a bha sinn a’ foillsicheadh air Piwigo. Nach fheuch "
 "thu ris a-rithist?"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
+#. %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 ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:167
+msgid "_OK"
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
 "Cuir a-steach URL leabhar-lann na dealbhan agad air Piwigo agus an t-ainm-"
-"cleachdaiche 's am facal-faire agad airson a' cunntais Piwigo agad a tha co-"
+"cleachdaiche ’s am facal-faire agad airson a’ cunntais Piwigo agad a tha co-"
 "cheangailte ris an leabharlann sin."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:991
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2158,27 +2265,39 @@ msgstr ""
 "Chan urrainn dha Shotwell conaltradh a dhèanamh ri leabhar-lann nan dealbhan "
 "agad air Piwigo. Thoir sùil air an URL a chuir thu a-steach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "URL mì-dhligheach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Rianairean, mo theaghlach, mo charaidean is an luchd-aithne agam"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Rianairean, mo theaghlach is mo charaidean"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
-msgstr "Rianairean 's mo theaghlach"
+msgstr "Rianairean ’s mo theaghlach"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Rianairean"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr ""
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Prìomh-sheirbheisean foillseachaidh"
 
@@ -2186,45 +2305,27 @@ msgstr "Prìomh-sheirbheisean foillseachaidh"
 msgid "Video privacy _setting:"
 msgstr "Roghainnean _prìobhaideachd video:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
-msgid ""
-"You are not currently logged into YouTube.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
-msgstr ""
-"Cha do rinn thu clàradh a-steach air YouTube.\n"
-"\n"
-"Feumaidh cunntas Google a bhith agad ro làimh 's e air a shuidheachadh "
-"airson 's gun gabh a chleachdadh airson YouTube mus urrainn dhut leantainn "
-"air adhart. 'S urrainn dhut, mar is trice, sin a chur air dòigh ma "
-"chlàraicheas tu a-steach air YouTube sa bhrabhsair-lìn agad co-dhiù aon "
-"turas."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
+#| 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 ""
 "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
 "Chan urrainn dhuinn foillseachadh air YouTube dhut."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Chlàraich thu a-steach air YouTube mar %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Nochdaidh na videothan ann an \"%s\""
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Air a liostadh gu poblach"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Chan eil e air a liostadh gu poblach"
 
@@ -2261,7 +2362,6 @@ msgid "Core Slideshow Transitions"
 msgstr "Prìomh thar-mhùthaidhean nan taisbeanaidhean-shleamhnagan"
 
 #: plugins/shotwell-transitions/shotwell-transitions.vala:76
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -2317,41 +2417,36 @@ msgstr ""
 msgid "Could not make directory %s writable: %s"
 msgstr "Cha ghabh pasgan an tasgadain %s a chruthachadh: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Prìnich am bàr-inneal"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Prìnich am bàr-inneal fosgailte"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Fàg an làn-sgrìn"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Susbaint"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Ceistean àbhaisteach"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem..."
-msgstr "Dèan aith_ris air duilgheadas..."
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:158
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:579
 #, 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"
@@ -2361,22 +2456,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
-#| msgid "Visit the Shotwell home page"
+#. translators: %s will be replaced by application version
+#: src/AppWindow.vala:596
+#, c-format
+msgid "%s – “Aachen”"
+msgstr "%s – “Aachen”"
+
+#: src/AppWindow.vala:601
 msgid "Visit the Shotwell web site"
 msgstr "Tadhail air làrach-lìn Shotwell"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:614
 #, c-format
 msgid "Unable to display help: %s"
-msgstr "Chan urrainn dhuinn a' chobhair a shealltainn: %s"
+msgstr "Chan urrainn dhuinn a’ chobhair a shealltainn: %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:622
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Cha ruig sinn stòr-dàta nam bugaichean: %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:630
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Chan urrainn dhuinn na CÀBHA a shealltainn: %s"
@@ -2419,7 +2519,7 @@ msgstr "Chan e faidhle deilbh a tha ann"
 
 #: src/BatchImport.vala:53
 msgid "Disk failure"
-msgstr "Dh'fhàillig an diosg"
+msgstr "Dh’fhàillig an diosg"
 
 #: src/BatchImport.vala:56
 msgid "Disk full"
@@ -2427,7 +2527,7 @@ msgstr "Tha an diosg làn"
 
 #: src/BatchImport.vala:59
 msgid "Camera error"
-msgstr "Mearachd a' chamara"
+msgstr "Mearachd a’ chamara"
 
 #: src/BatchImport.vala:62
 msgid "File write error"
@@ -2440,25 +2540,29 @@ msgstr "Tha faidhle an deilbh coirbte"
 #: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
-msgstr "Dh'fhàillig ion-phortadh (%d)"
+msgstr "Dh’fhàillig ion-phortadh (%d)"
 
 #: src/camera/Branch.vala:85
 msgid "Cameras"
 msgstr "Camarathan"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Camara"
 
-#: 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:466
+#| 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 ""
 "Cha ghabh an camara a dhì-mhunntachadh. Feuch is dì-mhunntaich an camara o "
 "mhanaidsear nam faidhlichean."
@@ -2472,47 +2576,33 @@ msgstr "Falaich dealbhan a chaidh ion-phortadh mar-thà"
 msgid "Only display photos that have not been imported"
 msgstr "Na seall ach dealbhan nach deach ion-phortadh fhathast"
 
-#: src/camera/ImportPage.vala:850
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr ""
-
-#: src/camera/ImportPage.vala:854
-#| msgid "No photos/videos found"
-msgid "No new photos/videos found on camera"
-msgstr "Cha deach dealbhan/videothan ùra a lorg air a' chamara"
-
-#: src/camera/ImportPage.vala:881 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Tiotalan"
-
-#: src/camera/ImportPage.vala:882 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Seall an tiotal aig gach dealbh"
-
-#: src/camera/ImportPage.vala:893
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Ion-phortaich na _thagh thu"
 
-#: src/camera/ImportPage.vala:894
-msgid "Import the selected photos into your library"
-msgstr "Ion-phortaich na dealbhan a thagh thu dhan leabhar-lann agad"
-
-#: src/camera/ImportPage.vala:899
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Ion-phortaich na _h-uile"
 
-#: src/camera/ImportPage.vala:900
-msgid "Import all the photos into your library"
-msgstr "Ion-phortaich na dealbhan uile dhan leabhar-lann agad"
+#: src/camera/ImportPage.vala:857
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+
+#: src/camera/ImportPage.vala:861
+msgid "No new photos/videos found on camera"
+msgstr "Cha deach dealbhan/videothan ùra a lorg air a’ chamara"
 
 #. it's mounted, offer to unmount for the user
 #: src/camera/ImportPage.vala:1021
+#| 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 ""
 "Feumaidh Shotwell an camara a dhì-mhunntachadh o shiostam nam faidhlichean "
-"mus gabh e cothrom air.  A bheil thu airson leantainn air adhart?"
+"mus gabh e cothrom air. A bheil thu airson leantainn air adhart?"
 
 #: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
@@ -2523,18 +2613,22 @@ msgid "Please unmount the camera."
 msgstr "Dì-mhunntaich an camara."
 
 #: 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."
 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 ""
 "Chaidh an camara a ghlasadh le aplacaid eile. Chan fhaigh Shotwell cothrom "
-"air a' chamara ach mur eil glas ris. Dùin aplacaid sam bith eile a tha a' "
-"cleachdadh a' chamara agus feuch ris a-rithist."
+"air a’ chamara ach mur eil glas ris. Dùin aplacaid sam bith eile a tha a’ "
+"cleachdadh a’ chamara agus feuch ris a-rithist."
 
 #: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
-msgstr "Dùin aplacaid sam bith eile a tha a' cleachdadh a' chamara."
+msgstr "Dùin aplacaid sam bith eile a tha a’ cleachdadh a’ chamara."
 
 #: src/camera/ImportPage.vala:1052
 #, c-format
@@ -2542,25 +2636,27 @@ msgid ""
 "Unable to fetch previews from the camera:\n"
 "%s"
 msgstr ""
-"Cha b' urrainn dhuinn ro-shealladh fhaighinn on chamara:\n"
+"Cha b’ urrainn dhuinn ro-shealladh fhaighinn on chamara:\n"
 "%s"
 
 #: src/camera/ImportPage.vala:1069
-msgid "Unmounting..."
-msgstr "'Ga dhì-mhunntachadh..."
+#| msgid "Unmounting..."
+msgid "Unmounting…"
+msgstr "’Ga dhì-mhunntachadh…"
 
 #: src/camera/ImportPage.vala:1160
-msgid "Starting import, please wait..."
-msgstr "A' tòiseachadh air ion-phortadh, fuirich ort..."
+#| msgid "Starting import, please wait..."
+msgid "Starting import, please wait…"
+msgstr "A’ tòiseachadh air ion-phortadh, fuirich ort…"
 
 #: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
-msgstr "A' faighinn fiosrachadh an deilbh"
+msgstr "A’ faighinn fiosrachadh an deilbh"
 
 #: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
-msgstr "A' faighinn ro-shealladh air %s"
+msgstr "A’ faighinn ro-shealladh air %s"
 
 #: src/camera/ImportPage.vala:1651
 #, c-format
@@ -2571,167 +2667,248 @@ msgstr "Chan urrainn dhuinn an camara a ghlasadh: %s"
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "A bheil thu airson an %d dealbh seo a sguabadh às a' chamara?"
-msgstr[1] "A bheil thu airson an %d dhealbh seo a sguabadh às a' chamara?"
-msgstr[2] "A bheil thu airson na %d dealbhan seo a sguabadh às a' chamara?"
-msgstr[3] "A bheil thu airson na %d dealbh seo a sguabadh às a' chamara?"
+msgstr[0] "A bheil thu airson an %d dealbh seo a sguabadh às a’ chamara?"
+msgstr[1] "A bheil thu airson an %d dhealbh seo a sguabadh às a’ chamara?"
+msgstr[2] "A bheil thu airson na %d dealbhan seo a sguabadh às a’ chamara?"
+msgstr[3] "A bheil thu airson na %d dealbh seo a sguabadh às a’ chamara?"
 
 #: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "A bheil thu airson an %d video seo a sguabadh às a' chamara?"
-msgstr[1] "A bheil thu airson an %d video seo a sguabadh às a' chamara?"
-msgstr[2] "A bheil thu airson na %d videothan seo a sguabadh às a' chamara?"
-msgstr[3] "A bheil thu airson na %d video seo a sguabadh às a' chamara?"
+msgstr[0] "A bheil thu airson an %d video seo a sguabadh às a’ chamara?"
+msgstr[1] "A bheil thu airson an %d video seo a sguabadh às a’ chamara?"
+msgstr[2] "A bheil thu airson na %d videothan seo a sguabadh às a’ chamara?"
+msgstr[3] "A bheil thu airson na %d video seo a sguabadh às a’ chamara?"
 
 #: 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] "A bheil thu airson an %d dealbh/video seo a sguabadh às a' chamara?"
-msgstr[1] "A bheil thu airson an %d dhealbh/video seo a sguabadh às a' chamara?"
+msgstr[0] "A bheil thu airson an %d dealbh/video seo a sguabadh às a’ chamara?"
+msgstr[1] "A bheil thu airson an %d dhealbh/video seo a sguabadh às a’ chamara?"
 msgstr[2] ""
-"A bheil thu airson na %d dealbhan/videothan seo a sguabadh às a' chamara?"
-msgstr[3] "A bheil thu airson na %d dealbh/video seo a sguabadh às a' chamara?"
+"A bheil thu airson na %d dealbhan/videothan seo a sguabadh às a’ chamara?"
+msgstr[3] "A bheil thu airson na %d dealbh/video seo a sguabadh às a’ chamara?"
 
 #: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
-msgstr[0] "A bheil thu airson an %d fhaidhle seo a sguabadh às a' chamara?"
-msgstr[1] "A bheil thu airson an %d fhaidhle seo a sguabadh às a' chamara?"
-msgstr[2] "A bheil thu airson na %d faidhlichean seo a sguabadh às a' chamara?"
-msgstr[3] "A bheil thu airson na %d faidhle seo a sguabadh às a' chamara?"
+msgstr[0] "A bheil thu airson an %d fhaidhle seo a sguabadh às a’ chamara?"
+msgstr[1] "A bheil thu airson an %d fhaidhle seo a sguabadh às a’ chamara?"
+msgstr[2] "A bheil thu airson na %d faidhlichean seo a sguabadh às a’ chamara?"
+msgstr[3] "A bheil thu airson na %d faidhle seo a sguabadh às a’ chamara?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Cum iad"
 
 #: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
-msgstr "A' toirt air falbh nan dealbhan/videothan on chamara"
+msgstr "A’ toirt air falbh nan dealbhan/videothan on chamara"
 
 #: 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] ""
-"Tha %d dealbh/video air a' chamara nach urrainn dhuinn sguabadh às ri linn "
+"Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
 "mhearachdan."
 msgstr[1] ""
-"Tha %d dhealbh/video air a' chamara nach urrainn dhuinn sguabadh às ri linn "
+"Tha %d dhealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
 "mhearachdan."
 msgstr[2] ""
-"Tha %d dealbhan/videothan air a' chamara nach urrainn dhuinn sguabadh às ri "
+"Tha %d dealbhan/videothan air a’ chamara nach urrainn dhuinn sguabadh às ri "
 "linn mhearachdan."
 msgstr[3] ""
-"Tha %d dealbh/video air a' chamara nach urrainn dhuinn sguabadh às ri linn "
+"Tha %d dealbh/video air a’ chamara nach urrainn dhuinn sguabadh às ri linn "
 "mhearachdan."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2636
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
+#| msgid "_Print..."
+msgid "_Print"
+msgstr "Clò-_bhuail…"
+
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#| msgid "Send To"
+msgid "Send _To…"
+msgstr "Cuir _gu…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
+msgid "Set as _Desktop Background"
+msgstr "Suidhich mar chùlaibh an _deasga"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:287
+msgid "_Duplicate"
+msgstr "_Dùblaich"
+
+#: src/CollectionPage.vala:100
+#| msgid "Fulls_creen"
+msgid "Fullscreen"
+msgstr "Làn-sgrìn"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "T_aisbeanadh-shleamhnagan"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2637
-msgid "Play a slideshow"
-msgstr "Cluich taisbeanadh-shleamhnagan"
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Cuairtich gu _deiseil"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Cuairtich gu _tuathail"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Thoir flip air a’ chòmh_nard"
+
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Thoir flip gu _h-inghearach"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Leasaich"
+
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Ti_ll an tionndadh tùsail"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "Dèan lethbhrea_c de dh’atharraichean nan dathan"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "Cuir ann atharraichean nan _dathan"
+
+#: src/CollectionPage.vala:135
+#| msgid "Adjust Date and Time"
+msgid "Adjust Date and Time…"
+msgstr "Cuir air gleus an ceann-là agus an t-àm…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:320
+msgid "Open With E_xternal Editor"
+msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
+
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+msgid "Open With RA_W Editor"
+msgstr "Fosgail le deasaiche RA_W"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:168
+#| msgid "Play"
+msgid "_Play"
+msgstr "_Cluich"
+
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Às-phortaich an dealbh/video"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Às-phortaich dealbhan/videothan"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3210
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Às-phortaich an dealbh"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Às-phortaich dealbhan"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
-msgstr "'Ga cuairteachadh"
+msgstr "’Ga cuairteachadh"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
-msgstr "A' neo-dhèanamh a' chuairteachaidh"
+msgstr "A’ neo-dhèanamh a’ chuairteachaidh"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
-msgstr "'Ga fhlipeadh air a' chòmhnard"
+msgstr "’Ga fhlipeadh air a’ chòmhnard"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
-msgstr "A' neo-dhèanamh flipeadh air a' chòmhnard"
+msgstr "A’ neo-dhèanamh flipeadh air a’ chòmhnard"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
-msgstr "'Ga fhlipeadh gu h-inghearach"
+msgstr "’Ga fhlipeadh gu h-inghearach"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
-msgstr "A' neo-dhèanamh flipeadh inghearach"
+msgstr "A’ neo-dhèanamh flipeadh inghearach"
 
 #: src/Commands.vala:737
 msgid "Reverting"
-msgstr "'Ga thilleadh"
+msgstr "’Ga thilleadh"
 
 #: src/Commands.vala:737
 msgid "Undoing Revert"
-msgstr "A' neo-dhèanamh a thillidh"
+msgstr "A’ neo-dhèanamh a thillidh"
 
 #: src/Commands.vala:781
 msgid "Enhancing"
-msgstr "'Ga leasachadh"
+msgstr "’Ga leasachadh"
 
 #: src/Commands.vala:781
 msgid "Undoing Enhance"
-msgstr "A' neo-dhèanamh a leasachaidh"
+msgstr "A’ neo-dhèanamh a leasachaidh"
 
 #: src/Commands.vala:857
 msgid "Applying Color Transformations"
-msgstr "A' cur an sàs atharraichean nan dathan"
+msgstr "A’ cur an sàs atharraichean nan dathan"
 
 #: src/Commands.vala:857
 msgid "Undoing Color Transformations"
-msgstr "A' neo-dhèanamh atharraichean nan dathan"
+msgstr "A’ neo-dhèanamh atharraichean nan dathan"
 
 #: src/Commands.vala:1007
 msgid "Creating New Event"
-msgstr "A' cruthachadh tachartas ùr"
+msgstr "A’ cruthachadh tachartas ùr"
 
 #: src/Commands.vala:1008
 msgid "Removing Event"
-msgstr "A' toirt air falbh an tachartais"
+msgstr "A’ toirt air falbh an tachartais"
 
 #: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
-msgstr "A' gluasad nan dealbhan gun tachartas ùr"
+msgstr "A’ gluasad nan dealbhan gun tachartas ùr"
 
 #: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
-msgstr "A' suidheachadh nan dealbhan gun tachartas roimhe"
+msgstr "A’ suidheachadh nan dealbhan gun tachartas roimhe"
 
 #: src/Commands.vala:1075
 msgid "Merging"
-msgstr "'Gan co-aonadh"
+msgstr "’Gan co-aonadh"
 
 #: src/Commands.vala:1076
 msgid "Unmerging"
-msgstr "A' neo-dhèanamh an co-aonadh"
+msgstr "A’ neo-dhèanamh an co-aonadh"
 
 #: src/Commands.vala:1085
 msgid "Duplicating photos"
-msgstr "A' dùblachadh nan dealbhan"
+msgstr "A’ dùblachadh nan dealbhan"
 
 #: src/Commands.vala:1085
 msgid "Removing duplicated photos"
-msgstr "A' toirt air falbh nan dealbhan dùblaichte"
+msgstr "A’ toirt air falbh nan dealbhan dùblaichte"
 
 #: src/Commands.vala:1108
 #, c-format
@@ -2740,8 +2917,7 @@ msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] ""
 "Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mearachd faidhle"
 msgstr[1] ""
-"Tha %d dhealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan "
-"faidhle"
+"Tha %d dhealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
 msgstr[2] ""
 "Tha %d dealbhan ann nach urrainn dhuinn dùblachadh ri linn mhearachdan "
 "faidhle"
@@ -2754,15 +2930,15 @@ msgstr "Ag aiseag an rangachadh roimhe"
 
 #: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
-msgstr "A' meudachadh nan rangachaidhean"
+msgstr "A’ meudachadh nan rangachaidhean"
 
 #: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
-msgstr "A' lùghdachadh nan rangachaidhean"
+msgstr "A’ lùghdachadh nan rangachaidhean"
 
 #: src/Commands.vala:1256
 msgid "Setting RAW developer"
-msgstr "A' suidheachadh an leasaicheir RAW"
+msgstr "A’ suidheachadh an leasaicheir RAW"
 
 #: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
@@ -2774,45 +2950,45 @@ msgstr "Suidhich an leasaichear"
 
 #: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
-msgstr "Cha b' urrainn dhuinn an dealbh tùsail a chur air gleus."
+msgstr "Cha b’ urrainn dhuinn an dealbh tùsail a chur air gleus."
 
 #: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
-msgstr "A' cur air gleus a' chinn-là agus an ama"
+msgstr "A’ cur air gleus a’ chinn-là agus an ama"
 
 #: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
-msgstr "A' neo-dhèanamh gleusadh a' chinn-là agus an ama"
+msgstr "A’ neo-dhèanamh gleusadh a’ chinn-là agus an ama"
 
 #: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] ""
-"Bha %d dealbh ann nach b' urrainn dhuinn an tionndadh tùsail aige a chur air "
+"Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aige a chur air "
 "gleus"
 msgstr[1] ""
-"Bha %d dhealbh ann nach b' urrainn dhuinn an tionndadh tùsail aca a chur air "
+"Bha %d dhealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air "
 "gleus"
 msgstr[2] ""
-"Bha %d dealbhan ann nach b' urrainn dhuinn an tionndadh tùsail aca a chur "
+"Bha %d dealbhan ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur "
 "air gleus"
 msgstr[3] ""
-"Bha %d dealbh ann nach b' urrainn dhuinn an tionndadh tùsail aca a chur air "
+"Bha %d dealbh ann nach b’ urrainn dhuinn an tionndadh tùsail aca a chur air "
 "gleus"
 
 #: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
-msgstr "Mearachd a' cur air gleus an ama"
+msgstr "Mearachd a’ cur air gleus an ama"
 
 #: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
-msgstr[0] "Bha %d dealbh ann nach b' urrainn dhuinn an t-àm aige a chur air gleus."
-msgstr[1] "Bha %d dhealbh ann nach b' urrainn dhuinn an t-àm aca a chur air gleus."
+msgstr[0] "Bha %d dealbh ann nach b’ urrainn dhuinn an t-àm aige a chur air gleus."
+msgstr[1] "Bha %d dhealbh ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
 msgstr[2] ""
-"Bha %d dealbhan ann nach b' urrainn dhuinn an t-àm aca a chur air gleus."
-msgstr[3] "Bha %d dealbh ann nach b' urrainn dhuinn an t-àm aca a chur air gleus."
+"Bha %d dealbhan ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
+msgstr[3] "Bha %d dealbh ann nach b’ urrainn dhuinn an t-àm aca a chur air gleus."
 
 #: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
@@ -2820,8 +2996,9 @@ msgstr "Cruthaich taga"
 
 #: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
-msgstr "Gluais an taga \"%s\""
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
+msgstr "Gluais an taga “%s”"
 
 #: src/Commands.vala:2347
 msgid "Move Photos to Trash"
@@ -2841,7 +3018,7 @@ msgstr "Aisig na dealbhan do leabhar-lann Shotwell"
 
 #: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
-msgstr "A' gluasad nan dealbhan dhan sgudal"
+msgstr "A’ gluasad nan dealbhan dhan sgudal"
 
 #: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
@@ -2857,11 +3034,11 @@ msgstr "Thoir air falbh na brataichean o na dealbhan a thagh thu"
 
 #: src/Commands.vala:2455
 msgid "Flagging selected photos"
-msgstr "A' cur bratach ris na dealbhan a thagh thu"
+msgstr "A’ cur bratach ris na dealbhan a thagh thu"
 
 #: src/Commands.vala:2456
 msgid "Unflagging selected photos"
-msgstr "A' toirt air falbh nam brataichean o na dealbhan a thagh thu"
+msgstr "A’ toirt air falbh nam brataichean o na dealbhan a thagh thu"
 
 #: src/Commands.vala:2463
 msgid "Flag"
@@ -2869,7 +3046,7 @@ msgstr "Cuir bratach ris"
 
 #: src/Commands.vala:2463
 msgid "Unflag"
-msgstr "Thoir a' bhratach air falbh"
+msgstr "Thoir a’ bhratach air falbh"
 
 #. Send an empty job to the queue to mark the end of the import
 #: src/data_imports/DataImportsPluginHost.vala:65
@@ -2881,7 +3058,8 @@ msgstr "Stòr-dàta %s"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-msgid "Importing from %s can't continue because an error occurred:"
+#| msgid "Importing from %s can't continue because an error occurred:"
+msgid "Importing from %s can’t continue because an error occurred:"
 msgstr ""
 "Chan urrainn dhuinn leantainn air an ion-phortadh o %s oir thachair "
 "mearachd:"
@@ -2902,15 +3080,15 @@ msgid ""
 msgstr ""
 "Chan eil plugain sam bith an comas leis an urrainn dhut dàta ion-phortadh.\n"
 "\n"
-"Mus urrainn dhut an gleus \"Ion-phortaich o aplacaid\" a chleachdadh, "
-"feumaidh tu co-dhiù aon phlugan a chur an comas a nì ion-phortadh dàta dhut. "
-"'S urrainn dhut plugain a chur an comas ann an còmhradh nan roghainnean."
+"Mus urrainn dhut an gleus “Ion-phortaich o aplacaid” a chleachdadh, feumaidh "
+"tu co-dhiù aon phlugan a chur an comas a nì ion-phortadh dàta dhut. ’S "
+"urrainn dhut plugain a chur an comas ann an còmhradh nan roghainnean."
 
 #: src/data_imports/DataImportsUI.vala:100
 msgid "Database file:"
 msgstr "Faidhle stòir-dhàta:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "_Ion-phortaich"
 
@@ -2922,7 +3100,7 @@ msgstr "Ion-phortaich o aplacaid"
 msgid "Import media _from:"
 msgstr "Ion-phortaich meadhan _o:"
 
-#: 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 "_Dùin"
 
@@ -2934,7 +3112,7 @@ msgstr "Ion-phortadh dàta"
 #, c-format
 msgid "Unable to open/create photo database %s: error code %d"
 msgstr ""
-"Cha b' urrainn dhuinn stòr-dàta nan dealbhan fhosgladh no a chruthachadh %s: "
+"Cha b’ urrainn dhuinn stòr-dàta nan dealbhan fhosgladh no a chruthachadh %s: "
 "còd mearachd %d"
 
 #: src/db/DatabaseTable.vala:46
@@ -2943,7 +3121,7 @@ msgid ""
 "Unable to write to photo database file:\n"
 " %s"
 msgstr ""
-"Cha b' urrainn dhuinn sgrìobhadh gu faidhle stòr-dàta nan dealbhan:\n"
+"Cha b’ urrainn dhuinn sgrìobhadh gu faidhle stòr-dàta nan dealbhan:\n"
 " %s"
 
 #: src/db/DatabaseTable.vala:48
@@ -2958,16 +3136,13 @@ msgstr ""
 "Mearachd faighinn cothrom air faidhle stòr-dàta:\n"
 " %s\n"
 "\n"
-"'S e am mearachd: \n"
+"’S e am mearachd: \n"
 "%s"
 
 #: src/db/DatabaseTable.vala:92
 #, c-format
-#| msgid ""
-#| "Unable to write to photo database file:\n"
-#| " %s"
 msgid "Unable to restore photo database %s"
-msgstr "Cha b' urrainn dhuinn faidhle stòr-dàta nan dealbhan %s aiseag"
+msgstr "Cha b’ urrainn dhuinn faidhle stòr-dàta nan dealbhan %s aiseag"
 
 #: src/DesktopIntegration.vala:121
 #, c-format
@@ -2990,32 +3165,36 @@ msgstr "Chan urrainn dhuinn taisbeanadh-shleamhnagan an deasga ullachadh: %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] ""
-"Bheir seo air falbh a' bhratach \"%s\" o %d dealbh. A bheil thu airson "
+"Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson "
 "leantainn air adhart?"
 msgstr[1] ""
-"Bheir seo air falbh a' bhratach \"%s\" o %d dhealbh. A bheil thu airson "
+"Bheir seo air falbh a’ bhratach “%s” o %d dhealbh. A bheil thu airson "
 "leantainn air adhart?"
 msgstr[2] ""
-"Bheir seo air falbh a' bhratach \"%s\" o %d dealbhan. A bheil thu airson "
+"Bheir seo air falbh a’ bhratach “%s” o %d dealbhan. A bheil thu airson "
 "leantainn air adhart?"
 msgstr[3] ""
-"Bheir seo air falbh a' bhratach \"%s\" o %d dealbh. A bheil thu airson "
+"Bheir seo air falbh a’ bhratach “%s” o %d dealbh. A bheil thu airson "
 "leantainn air adhart?"
 
-#: 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:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Sguab às"
 
 #: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#| msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr ""
-"Bheir seo air falbh an lorg %s a shàbhail thu roimhe. A bheil thu airson "
+"Bheir seo air falbh an lorg “%s” a shàbhail thu roimhe. A bheil thu airson "
 "leantainn air adhart?"
 
 #: src/Dialogs.vala:36
@@ -3044,23 +3223,26 @@ msgstr "_Cleachd an leasaichear eile"
 
 #: src/Dialogs.vala:59
 msgid "Export Video"
-msgstr "Às-phortaich a' video"
+msgstr "Às-phortaich a’ video"
 
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
+#: src/Dialogs.vala:112
 #, c-format
+#| msgid ""
+#| "Shotwell couldn't create a file for editing this photo because you do not "
+#| "have permission to write to %s."
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
-"Cha b' urrainn dha Shotwell faidhle a chruthachadh gus an dealbh seo a "
-"dheasachadh air sgàth 's nach eil cead-sgrìobhaidh agad ann an %s."
+"Cha b’ urrainn dha Shotwell faidhle a chruthachadh gus an dealbh seo a "
+"dheasachadh air sgàth ’s nach eil cead-sgrìobhaidh agad ann an %s."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -3069,7 +3251,7 @@ msgstr ""
 "faidhle.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -3082,64 +3264,65 @@ 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 "Gun atharrachadh"
 
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Làithreach"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Fòrmat:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Càileachd:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Bacadh sgèilidh:"
 
-#: src/Dialogs.vala:225
-#, fuzzy
+#: src/Dialogs.vala:230
 #| msgid " _pixels"
 msgid "_Pixels:"
-msgstr " _piogsailean"
+msgstr "_Piogsailean:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Às-phortaich am metadata"
+#: src/Dialogs.vala:234
+#| msgid "Export metadata"
+msgid "Export _metadata:"
+msgstr "Às-phortaich am _meata-dàta:"
 
-#: src/Dialogs.vala:462
-msgid "Save Details..."
-msgstr "Sàbhail am mion-fhiosrachadh..."
+#: src/Dialogs.vala:478
+#| msgid "Save Details"
+msgid "Save Details…"
+msgstr "Sàbhail am mion-fhiosrachadh…"
 
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Sàbhail am mion-fhiosrachadh"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(agus %d a bharrachd)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "An aithris air coileanas an ion-phortaidh"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] "Dh'fheuch sinn ri %d fhaidhle ion-phortadh."
-msgstr[1] "Dh'fheuch sinn ri %d fhaidhle ion-phortadh."
-msgstr[2] "Dh'fheuch sinn ri %d faidhlichean ion-phortadh."
-msgstr[3] "Dh'fheuch sinn ri %d faidhle ion-phortadh."
+msgstr[0] "Dh’fheuch sinn ri %d fhaidhle ion-phortadh."
+msgstr[1] "Dh’fheuch sinn ri %d fhaidhle ion-phortadh."
+msgstr[2] "Dh’fheuch sinn ri %d faidhlichean ion-phortadh."
+msgstr[3] "Dh’fheuch sinn ri %d faidhle ion-phortadh."
 
-#: 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."
@@ -3151,87 +3334,98 @@ msgstr[3] "Chaidh %d dhiubh seo ion-phortadh gu soirbheachail."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr ""
 "Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "a dhùblaicheadh ball a tha ann mu thràth"
 
 #.
 #. 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 ""
 "Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh ri "
-"linn mearachd a' chamara:"
+"linn mearachd a’ chamara:"
 
-#: 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 "teachdaireachd na mearachd:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+#| msgid ""
+#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
-"Cha deach na faidhlichean ion-phortadh air sgàth 's nach deach an "
+"Cha deach na faidhlichean ion-phortadh air sgàth ’s nach deach an "
 "aithneachadh mar dhealbhan no videothan:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:594
+#: src/Dialogs.vala:610
+#| msgid ""
+#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+#| "Understands:"
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
-"Cha deach na dealbhan/videothan ion-phortadh air sgàth 's nach eil iad ann "
+"Cha deach na dealbhan/videothan ion-phortadh air sgàth ’s nach eil iad ann "
 "am fòrmat a thuigeas Shotwell:"
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:625
+#| msgid ""
+#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+#| "Library:"
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
-"Cha deach na dealbhan/videothan ion-phortadh air sgàth 's nach b' urrainn "
+"Cha deach na dealbhan/videothan ion-phortadh air sgàth ’s nach b’ urrainn "
 "dha Shotwell lethbhreac dhiubh a chur dhan leabhar-lann aige."
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
+#| msgid ""
+#| "couldn't copy %s\n"
+#| "\tto %s"
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
-"nach b' urrainn dha lethbhreac de %s a chur \n"
+"nach b’ urrainn dha lethbhreac de %s a chur \n"
 "\tdha %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 ""
-"Cha deach na dealbhan/videothan ion-phortadh a chionn 's gu bheil na "
+"Cha deach na dealbhan/videothan ion-phortadh a chionn ’s gu bheil na "
 "faidhlichean coirbte:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr ""
 "Dealbhan/videothan nach deach an ion-phortadh air sgàth adhbharan eile:"
 
-#: 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"
@@ -3240,7 +3434,7 @@ msgstr[1] "Bha %d dhealbh dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d dealbhan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d dealbh dùblaichte ann nach deach ion-phortadh:\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"
@@ -3249,7 +3443,7 @@ msgstr[1] "Bha %d video dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d videothan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d video dùblaichte ann nach deach ion-phortadh:\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"
@@ -3258,7 +3452,7 @@ msgstr[1] "Bha %d dhealbh/video dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[2] "Bha %d dealbhan/videothan dùblaichte ann nach deach ion-phortadh:\n"
 msgstr[3] "Bha %d dealbh/video dùblaichte ann nach deach ion-phortadh:\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"
@@ -3275,7 +3469,7 @@ msgstr[3] ""
 "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\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"
@@ -3292,7 +3486,7 @@ msgstr[3] ""
 "Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\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 ""
@@ -3310,7 +3504,7 @@ msgstr[3] ""
 "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\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"
@@ -3327,47 +3521,39 @@ msgstr[3] ""
 "Bha %d faidhle ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\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"
 msgid_plural ""
 "%d photos failed to import because the photo library folder was not "
 "writable:\n"
-msgstr[0] ""
-"Bha %d dealbh ann nach deach ion-phortadh a chionn 's nach b' urrainn dhuinn "
+msgstr[0] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
 "sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] ""
-"Bha %d dhealbh ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] ""
-"Bha %d dealbhan ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] ""
-"Bha %d dealbh ann nach deach ion-phortadh a chionn 's nach b' urrainn dhuinn "
+msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
 "sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\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"
 msgid_plural ""
 "%d videos failed to import because the photo library folder was not "
 "writable:\n"
-msgstr[0] ""
-"Bha %d video ann nach deach ion-phortadh a chionn 's nach b' urrainn dhuinn "
+msgstr[0] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
 "sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] ""
-"Bha %d video ann nach deach ion-phortadh a chionn 's nach b' urrainn dhuinn "
+msgstr[1] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
 "sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] ""
-"Bha %d videothan ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[2] "Bha %d videothan ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] ""
-"Bha %d video ann nach deach ion-phortadh a chionn 's nach b' urrainn dhuinn "
+msgstr[3] "Bha %d video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn dhuinn "
 "sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\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 "
@@ -3375,150 +3561,111 @@ msgid ""
 msgid_plural ""
 "%d photos/videos failed to import because the photo library folder was not "
 "writable:\n"
-msgstr[0] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[0] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] ""
-"Bha %d dhealbh/video ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] ""
-"Bha %d dealbhan/videothan ann nach deach ion-phortadh a chionn 's nach b' "
+msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh a chionn ’s nach b’ "
 "urrainn dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\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"
 msgid_plural ""
 "%d files failed to import because the photo library folder was not "
 "writable:\n"
-msgstr[0] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[0] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[1] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[2] ""
-"Bha %d faidhlichean ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\n"
-msgstr[3] ""
-"Bha %d faidhle ann nach deach ion-phortadh a chionn 's nach b' urrainn "
+msgstr[3] "Bha %d faidhle ann nach deach ion-phortadh a chionn ’s nach b’ urrainn "
 "dhuinn sgrìobhadh ann am pasgan leabhar-lann nan dealbhan:\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"
-msgstr[0] ""
-"Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[1] ""
-"Bha %d dhealbh ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[2] ""
-"Bha %d dealbhan ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[3] ""
-"Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
+msgstr[0] "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[1] "Bha %d dhealbh ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[2] "Bha %d dealbhan ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[3] "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a’ chamara:\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"
-msgstr[0] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[1] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[2] ""
-"Bha %d videothan ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[3] ""
-"Bha %d video ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
+msgstr[0] "Bha %d video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[1] "Bha %d video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[2] "Bha %d videothan ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[3] "Bha %d video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\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"
-msgstr[0] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a' "
-"chamara:\n"
-msgstr[1] ""
-"Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd a' "
-"chamara:\n"
-msgstr[2] ""
-"Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd a' "
+msgstr[0] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[1] "Bha %d dhealbh/video ann nach deach ion-phortadh ri linn mearachd a’ "
 "chamara:\n"
-msgstr[3] ""
-"Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a' "
+msgstr[2] "Bha %d dealbhan/videothan ann nach deach ion-phortadh ri linn mearachd a’ "
 "chamara:\n"
+msgstr[3] "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a’ chamara:\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"
-msgstr[0] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[1] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
-msgstr[2] ""
-"Bha %d faidhlichean ann nach deach ion-phortadh ri linn mearachd a' "
-"chamara:\n"
-msgstr[3] ""
-"Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
+msgstr[0] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[1] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[2] "Bha %d faidhlichean ann nach deach ion-phortadh ri linn mearachd a’ chamara:\n"
+msgstr[3] "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a’ chamara:\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"
-msgstr[0] "Cha deach %d dealbh ion-phortadh a chionn 's gu bheil e coirbte:\n"
-msgstr[1] ""
-"Cha deach %d dhealbh ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[2] ""
-"Cha deach %d dealbhan ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[3] ""
-"Cha deach %d dealbh ion-phortadh a chionn 's gu bheil iad coirbte:\n"
+msgstr[0] "Cha deach %d dealbh ion-phortadh a chionn ’s gu bheil e coirbte:\n"
+msgstr[1] "Cha deach %d dhealbh ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[2] "Cha deach %d dealbhan ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[3] "Cha deach %d dealbh ion-phortadh a chionn ’s gu bheil iad coirbte:\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"
-msgstr[0] "Cha deach %d video ion-phortadh a chionn 's gu bheil e coirbte:\n"
-msgstr[1] ""
-"Cha deach %d videothan ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[2] "Cha deach %d video ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[3] "Cha deach %d video ion-phortadh a chionn 's gu bheil iad coirbte:\n"
+msgstr[0] "Cha deach %d video ion-phortadh a chionn ’s gu bheil e coirbte:\n"
+msgstr[1] "Cha deach %d videothan ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[2] "Cha deach %d video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[3] "Cha deach %d video ion-phortadh a chionn ’s gu bheil iad coirbte:\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"
-msgstr[0] ""
-"Cha deach %d dealbh/video ion-phortadh a chionn 's gu bheil e coirbte:\n"
-msgstr[1] ""
-"Cha deach %d dhealbh/video ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[2] ""
-"Cha deach %d dealbhan/videothan ion-phortadh a chionn 's gu bheil iad "
+msgstr[0] "Cha deach %d dealbh/video ion-phortadh a chionn ’s gu bheil e coirbte:\n"
+msgstr[1] "Cha deach %d dhealbh/video ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[2] "Cha deach %d dealbhan/videothan ion-phortadh a chionn ’s gu bheil iad "
 "coirbte:\n"
-msgstr[3] ""
-"Cha deach %d dealbh/video ion-phortadh a chionn 's gu bheil iad coirbte:\n"
+msgstr[3] "Cha deach %d dealbh/video ion-phortadh a chionn ’s gu bheil iad coirbte:\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"
-msgstr[0] ""
-"Cha deach %d fhaidhle ion-phortadh a chionn 's gu bheil e coirbte:\n"
-msgstr[1] ""
-"Cha deach %d fhaidhle ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[2] ""
-"Cha deach %d faidhlichean ion-phortadh a chionn 's gu bheil iad coirbte:\n"
-msgstr[3] ""
-"Cha deach %d faidhle ion-phortadh a chionn 's gu bheil iad coirbte:\n"
+msgstr[0] "Cha deach %d fhaidhle ion-phortadh a chionn ’s gu bheil e coirbte:\n"
+msgstr[1] "Cha deach %d fhaidhle ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[2] "Cha deach %d faidhlichean ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
+msgstr[3] "Cha deach %d faidhle ion-phortadh a chionn ’s gu bheil iad coirbte:\n"
 
 #. we have no notion of "unsupported" video files right now in Shotwell (all
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:775
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3530,20 +3677,16 @@ msgstr[3] "Chaidh leum a ghearradh thairis air %d dealbh ris nach eil taic:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:790
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
-msgstr[0] ""
-"Chaidh leum a ghearradh thairis air %d fhaidhle nach eil 'na dhealbh:\n"
-msgstr[1] ""
-"Chaidh leum a ghearradh thairis air %d fhaidhle nach eil 'nan dealbhan:\n"
-msgstr[2] ""
-"Chaidh leum a ghearradh thairis air %d faidhlichean nach eil 'nan dealbhan:\n"
-msgstr[3] ""
-"Chaidh leum a ghearradh thairis air %d faidhle nach eil 'nan dealbhan:\n"
+msgstr[0] "Chaidh leum a ghearradh thairis air %d fhaidhle nach eil ’na dhealbh:\n"
+msgstr[1] "Chaidh leum a ghearradh thairis air %d fhaidhle nach eil ’nan dealbhan:\n"
+msgstr[2] "Chaidh leum a ghearradh thairis air %d faidhlichean nach eil ’nan dealbhan:\n"
+msgstr[3] "Chaidh leum a ghearradh thairis air %d faidhle nach eil ’nan dealbhan:\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"
@@ -3560,7 +3703,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche "
 "dhiubh:\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"
@@ -3577,7 +3720,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche "
 "dhiubh:\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"
@@ -3594,7 +3737,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an "
 "cleachdaiche dhiubh:\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"
@@ -3611,7 +3754,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d faidhle oir sguir an cleachdaiche "
 "dhiubh:\n"
 
-#: src/Dialogs.vala:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3620,7 +3763,7 @@ msgstr[1] "Chaidh %d dhealbh ion-phortadh.\n"
 msgstr[2] "Chaidh %d dealbhan ion-phortadh.\n"
 msgstr[3] "Chaidh %d dealbh ion-phortadh.\n"
 
-#: src/Dialogs.vala:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3629,7 +3772,7 @@ msgstr[1] "Chaidh %d video ion-phortadh.\n"
 msgstr[2] "Chaidh %d videothan ion-phortadh.\n"
 msgstr[3] "Chaidh %d video ion-phortadh.\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"
@@ -3640,15 +3783,15 @@ msgstr[3] "Chaidh %d dealbh/video ion-phortadh.\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 "Cha deach dealbh no video sam bith ion-phortadh.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Deiseil leis an ion-phortadh"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3657,7 +3800,7 @@ msgstr[1] "%d dhiog"
 msgstr[2] "%d diogan"
 msgstr[3] "%d diog"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3666,7 +3809,7 @@ msgstr[1] "%d mhionaid"
 msgstr[2] "%d mionaidean"
 msgstr[3] "%d mionaid"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3675,71 +3818,73 @@ msgstr[1] "%d uair a thìde"
 msgstr[2] "%d uairean a thìde"
 msgstr[3] "%d uair a thìde"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 latha"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Thoir ainm ùr air an tachartas"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Aimn:"
 
 #. Dialog title
-#: src/Dialogs.vala:1333
-#, fuzzy
+#: src/Dialogs.vala:1328
 #| msgid "Edit Title"
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Deasaich an tiotal"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Tiotal:"
 
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Deasaich beachd an tachartais"
 
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Deasaich beachd an deilbh/video"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Beachd:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
-msgstr[0] "Thoir am _faidhle air falbh 's cur san sgudal e"
-msgstr[1] "Thoir na _faidhlichean air falbh 's cur san sgudal iad"
-msgstr[2] "Thoir na _faidhlichean air falbh 's cur san sgudal iad"
-msgstr[3] "Thoir na _faidhlichean air falbh 's cur san sgudal iad"
+msgstr[0] "Thoir am _faidhle air falbh ’s cur san sgudal e"
+msgstr[1] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
+msgstr[2] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
+msgstr[3] "Thoir na _faidhlichean air falbh ’s cur san sgudal iad"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Thoi_r air falbh on leabhar-lann"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr ""
 "A bheil thu airson an deasachadh a rinneadh air taobh a-muigh a thilleadh?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr ""
 "A bheil thu airson na deasachaidhean a rinneadh air an taobh a-muigh a "
 "thilleadh?"
 
-#: src/Dialogs.vala:1417
+#: src/Dialogs.vala:1412
 #, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid_plural ""
+#| "This will destroy all changes made to %d external files.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
 "Cuiridh seo gu neoini gach atharrachadh a rinneadh air an %d fhaidhle air an "
 "taobh a-muigh. A bheil thu airson leantainn air adhart?"
@@ -3753,18 +3898,20 @@ msgstr[3] ""
 "Cuiridh seo gu neoini gach atharrachadh a rinneadh air na %d faidhle air an "
 "taobh a-muigh. A bheil thu airson leantainn air adhart?"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Till an deasachadh a rinneadh air an taobh a-_muigh"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Till na deasachaidhean a rinneadh air an taobh a-_muigh"
 
-#: src/Dialogs.vala:1442
+#: 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?"
+#| 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] ""
 "Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn "
 "air adhart?"
@@ -3778,15 +3925,15 @@ msgstr[3] ""
 "Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn "
 "air adhart?"
 
-#: src/Dialogs.vala:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Thoir air falbh"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Thoir air falbh an dealbh on leabhar-lann"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Thoir air falbh na dealbhan on leabhar-lann"
 
@@ -3815,35 +3962,37 @@ msgstr "_Gluais na dealbhan/videothan an aon astar"
 msgid "Set _all photos/videos to this time"
 msgstr "Cleachd _an t-àm seo airson gach dealbh/video"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1725
+#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
-msgstr "_Atharraich faidhle tùsail an deilbh"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo files"
-msgstr "_Atharraich faidhlichean tùsail an deilbh"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Atharraich faidhle tùsail an deilbh"
+msgstr[1] "_Atharraich faidhlichean tùsail an deilbh"
+msgstr[2] "_Atharraich faidhlichean tùsail an deilbh"
+msgstr[3] "_Atharraich faidhlichean tùsail an deilbh"
 
 #: src/Dialogs.vala:1729
+#| msgid "_Modify original file"
 msgid "_Modify original file"
-msgstr "_Atharraich am faidhle tùsail"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original files"
-msgstr "_Atharraich na faidhlichean tùsail"
+msgid_plural "_Modify original files"
+msgstr[0] "_Atharraich am faidhle tùsail"
+msgstr[1] "_Atharraich na faidhlichean tùsail"
+msgstr[2] "_Atharraich na faidhlichean tùsail"
+msgstr[3] "_Atharraich na faidhlichean tùsail"
 
-#: src/Dialogs.vala:1815
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Am feat tùsail: "
 
-#: src/Dialogs.vala:1816
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1817
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3852,7 +4001,7 @@ msgstr ""
 "Thèid àm an deisearais a ghluasad air adhart le\n"
 "%d %s, %d %s, %d %s agus %d %s."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3861,7 +4010,7 @@ msgstr ""
 "Thèid àm an deisearais a ghluasad air ais le\n"
 "%d %s, %d %s, %d %s agus %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "latha"
@@ -3869,7 +4018,7 @@ msgstr[1] "latha"
 msgstr[2] "làithean"
 msgstr[3] "latha"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uair"
@@ -3877,7 +4026,7 @@ msgstr[1] "uairean"
 msgstr[2] "uairean a thìde"
 msgstr[3] "uair a thìde"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "mhionaid"
@@ -3885,7 +4034,7 @@ msgstr[1] "mhionaid"
 msgstr[2] "mionaidean"
 msgstr[3] "mionaid"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "diog"
@@ -3893,7 +4042,7 @@ msgstr[1] "dhiog"
 msgstr[2] "diogan"
 msgstr[3] "diog"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3920,53 +4069,54 @@ msgstr[3] ""
 "\n"
 "Agus %d eile."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Tagaichean (air an sgaradh le cromagan):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Fàilte!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Fàilte gu Shotwell!"
 
-#: src/Dialogs.vala:2098
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Dèan toiseach tòiseachaidh is ion-phortaich dealbhan air gin dhe na dòighean "
 "a leanas:"
 
-#: src/Dialogs.vala:2117
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Tagh <span weight=\"bold\">Ion-phortadh faidhle %s o phasgan</span>"
 
-#: src/Dialogs.vala:2118
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Slaod is leig às dealbhan air uinneag Shotwell"
 
-#: src/Dialogs.vala:2119
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
-msgstr "Ceangail camara ris a' choimpiutair agad agus dèan ion-phortadh"
+msgstr "Ceangail camara ris a’ choimpiutair agad agus dèan ion-phortadh"
 
-#: src/Dialogs.vala:2129
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Ion-phortaich dealbhan on phasgan %s agad"
 
-#: src/Dialogs.vala:2136
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr ""
-"'S urrainn dhut dealbhan ion-phortadh air gin dhe na dòighean seo leanas "
+"’S urrainn dhut dealbhan ion-phortadh air gin dhe na dòighean seo leanas "
 "cuideachd:"
 
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
-msgstr "_ Na seall an teachdaireachd seo a-rithist"
+#: src/Dialogs.vala:2152
+#| msgid "_Don't show this message again"
+msgid "_Don’t show this message again"
+msgstr "_Na seall an teachdaireachd seo a-rithist"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Ion-phortaich dealbhan on leabhar-lann %s agad"
@@ -3974,83 +4124,93 @@ msgstr "Ion-phortaich dealbhan on leabhar-lann %s agad"
 #. 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 "(Cobhair)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Bliadhna%sMìos%sLatha"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Bliadhna%sMìos"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Bliadhna%sMìos-Latha"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Bliadhna-Mìos-Latha"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Gnàthaichte"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: src/Dialogs.vala:2590
 msgid "Invalid pattern"
 msgstr "Pàtran mì-dhligheach"
 
 #. 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."
 msgstr ""
-"'S urrainn dha Shotwell lethbhreacan dhe na dealbhan a chur do phasgan na "
-"leabhar-lainn agad no an ion-phortadh gun a bhith a' dèanamh lethbhreacan "
+"’S urrainn dha Shotwell lethbhreacan dhe na dealbhan a chur do phasgan na "
+"leabhar-lainn agad no an ion-phortadh gun a bhith a’ dèanamh lethbhreacan "
 "dhiubh."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Dèan le_thbhreacan dhe na dealbhan"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
-msgstr "_Ion-phortaich 'na àite"
+msgstr "_Ion-phortaich ’na àite"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Ion-phortaich dhan leabhar-lann"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3086
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Thoir air falbh on leabhar-lann"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3086
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
-msgstr "A' toirt air falbh an deilbh on leabhar-lann"
+msgstr "A’ toirt air falbh an deilbh on leabhar-lann"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
-msgstr "A' toirt air falbh dealbhan on leabhar-lann"
+msgstr "A’ toirt air falbh dealbhan on leabhar-lann"
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2724
 #, c-format
+#| msgid ""
+#| "This will remove the photo/video from your Shotwell library.  Would you "
+#| "also like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos/videos from your Shotwell library.  Would you "
+#| "also like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -4074,15 +4234,25 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2728
 #, c-format
+#| msgid ""
+#| "This will remove the video from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d videos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -4107,15 +4277,25 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2727
+#: src/Dialogs.vala:2732
 #, c-format
+#| msgid ""
+#| "This will remove the photo from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -4140,12 +4320,18 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: src/Dialogs.vala:2759
+#: 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?"
 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] ""
 "Cha ghabh an %d dealbh no video seo a ghluasad dhan sgudal air an deasg. A "
 "bheil thu airson a sguabadh às?"
@@ -4160,7 +4346,7 @@ msgstr[3] ""
 "bheil thu airson an sguabadh às?"
 
 #. 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."
@@ -4177,138 +4363,26 @@ msgstr "Leud"
 msgid "Height"
 msgstr "Àirde"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Faidhle"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Sàbhail"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Sàbhail an dealbh"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Sàbhail _mar..."
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Sàbhail an dealbh fo ainm eile"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr ""
-"Clò-bhuail an dealbh air clò-bhualadair a tha ceangailte ris a' choimpiutair "
-"agad"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "D_easaich"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Dealbh"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2417
-msgid "T_ools"
-msgstr "I_nnealan"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2422
-msgid "_Previous Photo"
-msgstr "An dealbh _roimhe"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2423
-msgid "Previous Photo"
-msgstr "An dealbh roimhe"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2428
-msgid "_Next Photo"
-msgstr "_An ath-dhealbh"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2429
-msgid "Next Photo"
-msgstr "An ath-dhealbh"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2413
-msgid "_View"
-msgstr "_Sealladh"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "_Cobhair"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2592 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Sù_m a-steach"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2593
-msgid "Increase the magnification of the photo"
-msgstr "Iomadaich meudachadh an deilbh"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2598 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Sùm _a-mach"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2599
-msgid "Decrease the magnification of the photo"
-msgstr "Lùghdaich meudachadh an deilbh"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2604
-msgid "Fit to _Page"
-msgstr "Co-fhreagair ris an _duilleag"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2605
-msgid "Zoom the photo to fit on the screen"
-msgstr "Sùm an dealbh ach am freagair e ris an sgrìn"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2611
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "_100% de shùm"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2613
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Cuir sùm an deilbh gu 100%"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2619
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "_200% de shùm"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2621
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Sùm an dealbh gun mheudachadh 200%"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "Chan eill %s ann."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
-msgstr "Chan e faidhle a tha ann an \"%s\"."
+msgstr "Chan e faidhle a tha ann an “%s”."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
 "%s."
 msgstr ""
-"Chan eil %s a' cur taic ris an fhòrmat fhaidhle aig\n"
+"Chan eil %s a’ cur taic ris an fhòrmat fhaidhle aig\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:120
 #, fuzzy, c-format
 #| msgid ""
 #| "Unable to print photo:\n"
@@ -4319,25 +4393,29 @@ msgstr ""
 "Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
 "%s"
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Sàbhail"
+
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "_Sàbhail lethbhreac dheth"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
-msgstr "A bheil thu airson na dh'atharraich thu air %s a chall?"
+msgstr "A bheil thu airson na dh’atharraich thu air %s a chall?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Dùin _gun a shàbhaladh"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
-msgstr "Thachair mearachd fhad 's a bha sinn a' sàbhaladh ann an %s: %s"
+msgstr "Thachair mearachd fhad ’s a bha sinn a’ sàbhaladh ann an %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:499 src/direct/DirectPhotoPage.vala:520
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Sàbhail mar"
 
@@ -4347,194 +4425,223 @@ msgstr "Sàbhail mar"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Chan urrainn dhuinn sùil a chumail air %s: Chan e pasgan a tha ann(%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Till do mheudachd an deilbh làithrich"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Suidhich bearradh an deilbh seo"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Cuairtich an ceart-cheàrnach bearraidh eadar comhair portraid is dreach-tìre"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Gun chuingeachadh"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Ceàrnagach"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Sgrìn"
 
-#: 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)"
-
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-msgid "Wallet (2 x 3 in.)"
-msgstr "Meud sporain (2 x 3 òirlich)"
-
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Cairt-nòta (3 x 5 òirlich)"
-
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 x 6 òirlich"
-
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 x 7 òirlich"
-
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 x 10 òirlich"
-
-#: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Litir (8.5 x 11 òirlich)"
-
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 x 14 òirlich"
-
-#: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloid (11 x 17 òirlich)"
-
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 x 20 òirlich"
-
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Meud sporain (meatrach, 9 x 13 cm)"
-
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Cairt-phuist (10 x 15 cm)"
-
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
+#| msgid "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
+msgstr "SD Video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 x 24 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:854
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
-
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
-
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:760
+#| msgid "HD Video (16 : 9)"
+msgid "HD Video (16 ∶ 9)"
+msgstr "HD Video (16 ∶ 9)"
+
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#| msgid "Wallet (2 x 3 in.)"
+msgid "Wallet (2 × 3 in.)"
+msgstr "Meud sporain (2 × 3 òirlich)"
+
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#| msgid "Notecard (3 x 5 in.)"
+msgid "Notecard (3 × 5 in.)"
+msgstr "Cairt-nòta (3 × 5 òirlich)"
+
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#| msgid "4 x 6 in."
+msgid "4 × 6 in."
+msgstr "4 × 6 òirlich"
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#| msgid "5 x 7 in."
+msgid "5 × 7 in."
+msgstr "5 × 7 òirlich"
+
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#| msgid "8 x 10 in."
+msgid "8 × 10 in."
+msgstr "8 × 10 òirlich"
+
+#: src/editing_tools/EditingTools.vala:767
+#| msgid "Letter (8.5 x 11 in.)"
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Litir (8.5 × 11 òirlich)"
+
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#| msgid "11 x 14 in."
+msgid "11 × 14 in."
+msgstr "11 × 14 òirlich"
+
+#: src/editing_tools/EditingTools.vala:769
+#| msgid "Tabloid (11 x 17 in.)"
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Tabloid (11 × 17 òirlich)"
+
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#| msgid "16 x 20 in."
+msgid "16 × 20 in."
+msgstr "16 × 20 òirlich"
+
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#| msgid "Metric Wallet (9 x 13 cm)"
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Meud sporain (meatrach, 9 × 13 cm)"
+
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#| msgid "Postcard (10 x 15 cm)"
+msgid "Postcard (10 × 15 cm)"
+msgstr "Cairt-phuist (10 × 15 cm)"
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#| msgid "13 x 18 cm"
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#| 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:828
+#| msgid "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#| msgid "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#| msgid "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
+#: 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 "Meud:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Dùin inneal nan sùilean dearga"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Thoir air falbh sùil dhearg sam bith san raon a thagh thu"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: src/editing_tools/EditingTools.vala:2238
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Ath-shuidhich"
 
 #. 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 "Deisearas:"
 
-#: src/editing_tools/EditingTools.vala:2248
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Iomsgaradh:"
+
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Sàthachd:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Tuar:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Teothachd:"
 
-#: src/editing_tools/EditingTools.vala:2273
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Sgàilean:"
 
-#: src/editing_tools/EditingTools.vala:2281
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Soillseachadh:"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Ath-shuidhich na dathan"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Ath-shuidhich gach rèiteachadh datha gu roghainn thùsail aige"
 
-#: src/editing_tools/EditingTools.vala:2687
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Teothachd"
 
-#: src/editing_tools/EditingTools.vala:2700
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Tuar"
 
-#: src/editing_tools/EditingTools.vala:2713
+#: src/editing_tools/EditingTools.vala:2746
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "Iomsgaradh"
+
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Sàthachd"
 
-#: src/editing_tools/EditingTools.vala:2726
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Deisearas"
 
-#: src/editing_tools/EditingTools.vala:2739
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Sgàilean"
 
-#: src/editing_tools/EditingTools.vala:2752
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Soillseachadh"
 
-#: src/editing_tools/EditingTools.vala:2762
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Leudachadh an iomsgaraidh"
 
@@ -4542,7 +4649,8 @@ msgstr "Leudachadh an iomsgaraidh"
 msgid "Angle:"
 msgstr "Ceàrn:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Dèan dìreach"
 
@@ -4559,7 +4667,7 @@ msgstr[1] "%d dhealbh/video"
 msgstr[2] "%d dealbhan/videothan"
 msgstr[3] "%d dealbh/video"
 
-#: 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"
@@ -4568,7 +4676,7 @@ msgstr[1] "%d video"
 msgstr[2] "%d videothan"
 msgstr[3] "%d video"
 
-#: 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"
@@ -4577,41 +4685,32 @@ msgstr[1] "%d dhealbh"
 msgstr[2] "%d dealbhan"
 msgstr[3] "%d dealbh"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Chan eil tachartas ann"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Beachdan"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Seall na beachdan a tha ri gach tachartas"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Chan eil tachartas sam bith ann"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Cha deach tachartas sam bith a lorg"
 
-#: src/events/EventsDirectoryPage.vala:230
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:227
 #| msgid "Events"
 msgid "All Events"
-msgstr "Tachartasan"
+msgstr "A h-uile tachartas"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Gun cheann-là"
 
-#: 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"
 
@@ -4624,7 +4723,7 @@ msgstr "Tachartas %s"
 #: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
-msgstr "Cha b' urrainn dhuinn faidhle sealach airson %s a chruthachadh: %s"
+msgstr "Cha b’ urrainn dhuinn faidhle sealach airson %s a chruthachadh: %s"
 
 #: src/Exporter.vala:299
 msgid "Exporting"
@@ -4632,9 +4731,10 @@ msgstr "Ag às-phortadh"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
+#| msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
 msgstr ""
-"Tha am faidhle %s ann mu thràth. A bheil thu airson am fear ùr a chur 'na "
+"Tha am faidhle %s ann mu thràth. A bheil thu airson am fear ùr a chur ’na "
 "àite?"
 
 #: src/Exporter.vala:319
@@ -4643,7 +4743,7 @@ msgstr "Gearr leum thairi_s air"
 
 #: src/Exporter.vala:319
 msgid "_Replace"
-msgstr "_Cuir 'na àite"
+msgstr "_Cuir ’na àite"
 
 #: src/Exporter.vala:319
 msgid "Replace _All"
@@ -4653,41 +4753,34 @@ msgstr "Cuir an àite n_a h-uile"
 msgid "Export"
 msgstr "Às-phortaich"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Pasganan"
 
-#: 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 "Leabhar-lann"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Dealbhan"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Le bratach"
 
 #: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Ag ion-phortadh..."
-
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "Thoir _stad air an ion-phortadh"
+#| msgid "Importing"
+msgid "Importing…"
+msgstr "’Ga ion-phortadh…"
 
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Thoir stad air ion-phortadh na dealbhan"
+#: src/library/ImportQueuePage.vala:129
+#| msgid "Preparing to import"
+msgid "Preparing to import…"
+msgstr "Ag ullachadh airson ion-phortadh…"
 
-#: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Ag ullachadh an ion-phortadh..."
-
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Chaidh %s ion-phortadh"
@@ -4696,132 +4789,20 @@ msgstr "Chaidh %s ion-phortadh"
 msgid "Last Import"
 msgstr "An t-ion-phortadh mu dheireadh"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Ion-phortaich o phasgan..."
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Ion-phortaich dealbhan o dhiosg dha leabhar-lann"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Ion-phortaich o _aplacaid..."
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Seòrsaich na _tachartasan"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Falamhaich an s_gudal"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Sguab às na dealbhan uile a tha san sgudal"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Seall an tac_hartas aig an dealbh"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Lorg"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Lorg dealbhan agus videothan a-rèir cuspairean-deuchainn"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Lorg ù_r a chaidh a shàbhaladh..."
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Dealbhan"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Tach_artasan"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Ta_gaichean"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Fiosrachadh bunasach"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Seall fiosrachadh bunasach mun rug a thagh thu"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "F_iosrachdadh leudaichte"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Seall fiosrachadh leudaichte mun rug a thagh thu"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Bàr nan lorg"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Seall bàr nan lorg"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Bàr-_taoibh"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Seall am bàr-taoibh"
-
-#: src/library/LibraryWindow.vala:398
-#, fuzzy
-#| msgid "Pin Toolbar"
-msgid "T_oolbar"
-msgstr "Prìnich am bàr-inneal"
-
-#: src/library/LibraryWindow.vala:399
-#, fuzzy
-#| msgid "Display the sidebar"
-msgid "Display the tool bar"
-msgstr "Seall am bàr-taoibh"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "A' _dìreadh"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Seòrsaich na dealbhan a' dìreadh"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "A' teàrna_dh"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Seòrsaich na dealbhan a' teàrnadh"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Ion-phortaich o phasgan"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Falamhaich an sgudal"
 
-#: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash..."
-msgstr "A' falamhadh an sgudail..."
+#: src/library/LibraryWindow.vala:576
+#| msgid "Emptying Trash..."
+msgid "Emptying Trash…"
+msgstr "A’ falamhachadh an sgudail…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4835,43 +4816,48 @@ msgstr ""
 "roghainnean %s</span>.\n"
 "A bheil thu airson leantainn air adhart le ion-phortachadh nan dealbhan?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Ionad na leabhar-lainn"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Cha ghabh dealbhan ion-phortadh on phasgan seo."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-msgid "Updating library..."
-msgstr "Ag ùrachadh na leabhar-lainn..."
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#| msgid "Updating library..."
+msgid "Updating library…"
+msgstr "Ag ùrachadh na leabhar-lainn…"
 
-#: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos..."
-msgstr "Ag ullachadh airson ion-phortadh gu fèin-obrach de dhealbhan..."
+#: src/library/LibraryWindow.vala:1129
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
+msgstr "Ag ullachadh airson ion-phortadh gu fèin-obrach de dhealbhan…"
 
-#: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos..."
-msgstr "Ag ion-phortadh nan dealbhan gu fèin-obrachail..."
+#: src/library/LibraryWindow.vala:1134
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
+msgstr "Ag ion-phortadh nan dealbhan gu fèin-obrachail…"
 
-#: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files..."
-msgstr "A' sgrìobhadh a' metadata sna faidhlichean..."
+#: src/library/LibraryWindow.vala:1142
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
+msgstr "A’ sgrìobhadh am meata-dàta sna faidhlichean…"
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Faidhlichean a tha a dhìth"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "'Ga(n) sguabadh às..."
+#: src/library/OfflinePage.vala:110
+#| msgid "Deleting..."
+msgid "Deleting…"
+msgstr "’Ga sguabadh às…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4887,14 +4873,18 @@ msgstr "Sguab às"
 
 #: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
-msgstr "A' sguabadh às nan dealbhan"
+msgstr "A’ sguabadh às nan dealbhan"
 
 #: src/main.vala:54
 #, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please use the latest version of Shotwell."
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
 msgstr ""
 "Chan eil leabhar-lann nan dealbhan agad co-chòrdail leis an tionndadh seo de "
 "Shotwell. Tha coltas gun deach a chruthachadh le Shotwell %s (sgeama %d). "
@@ -4903,21 +4893,30 @@ msgstr ""
 
 #: src/main.vala:59
 #, c-format
+#| msgid ""
+#| "Shotwell was unable to upgrade your photo library from version %s (schema "
+#| "%d) to %s (schema %d).  For more information please check the Shotwell "
+#| "Wiki at %s"
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
-"Cha b' urrainn dha Shotwell leabhar-lann nan dealbhan agad àrdachadh o "
+"Cha b’ urrainn dha Shotwell leabhar-lann nan dealbhan agad àrdachadh o "
 "thionndadh %s (sgeama %d) gu %s (sgeama %d). Airson barrachd fiosrachaidh, "
 "thoir sùil air an uicipeid aig Shotwell aig %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 "
+#| 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 ""
 "Chan eil leabhar-lann nan dealbh agad co-chòrdail leis an tionndadh seo de "
@@ -4927,46 +4926,51 @@ msgstr ""
 
 #: src/main.vala:71
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr ""
-"Thachair mearachd nach aithne dhuinn nuair a dh'fheuch sinn ri stòr-dàta "
+"Thachair mearachd nach aithne dhuinn nuair a dh’fheuch sinn ri stòr-dàta "
 "Shotwell a dhearbhadh: %s"
 
 #: src/main.vala:104
 msgid "Loading Shotwell"
-msgstr "A' luchdadh Shotwell"
+msgstr "A’ luchdadh Shotwell"
 
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
+#: src/main.vala:293
+#| msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "An t-slighe dhan dàta phrìobhaideach aig Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "PASGAN"
 
-#: src/main.vala:298
+#: src/main.vala:297
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 "Na cum sùil air pasgan na leabhar-lainn airson atharraichean aig àm ruith"
 
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
+#: src/main.vala:301
+#| msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Na seall an t-adhartas tòiseachaidh nuair a thòisicheas e"
 
-#: src/main.vala:306
-msgid "Show the application's version"
+#: src/main.vala:305
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Seall tionndadh na h-aplacaid"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[FAIDHLE]"
 
-#: src/main.vala:342
+#: src/main.vala:346
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Cleachd \"%s –help\" airson liosta shlàn de roghainnean na loidhne-àithne "
+#| 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 "Cleachd “%s --help” airson liosta shlàn de roghainnean na loidhne-àithne "
 "fhaicinn a tha ri làimh.\n"
 
 #: src/MediaMonitor.vala:400
@@ -4978,112 +4982,43 @@ msgstr "Chan urrainn dhuinn na h-ùrachaidhean marasglaidh a làimhseachadh: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Cuir air gleus meud nan dealbhagan"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Cuir an àirde meudachadh nan dealbhagan"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Lùghdaich meudachadh nan dealbhagan"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Seòrsaich na _dealbhan"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Cluich a' video"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr ""
-"Fosgail na videothan a thagh thu ann an cluicheadair video an t-siostaim"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2641
-msgid "_Developer"
-msgstr "_Leasaichear"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Seall na beachdan aig gach dealbh"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Seall na tagaichean aig gach dealbh"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "A-rèir _tiotail"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Seòrsaich na dealbhan a-rèir tiotail"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "A-rèir _ceann-là an deisearais"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Seòrsaich na dealbhan a-rèir ceann-là an deisearais"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "A-rèir _rangachaidh"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Seòrsaich na dealbhan a-rèir rangachaidh"
-
-#: src/MediaPage.vala:504
-#, fuzzy
-#| msgid "File name"
-msgid "By _Filename"
-msgstr "Ainm an fhaidhle"
-
-#: src/MediaPage.vala:505
-#, fuzzy
-#| msgid "Sort photos by title"
-msgid "Sort photos by filename"
-msgstr "Seòrsaich na dealbhan a-rèir tiotail"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
 msgstr ""
-"Cha b' urrainn dha Shotwell a' video a thagh thu a chluich:\n"
+"Cha b’ urrainn dha Shotwell a’ video a thagh thu a chluich:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Chan eil dealbhan/videothan ann"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1322
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2576
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Cha ghabh dealbhan às-phortadh dhan phasgan seo."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "An dealbh roimhe"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "An ath-dhealbh"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Tha faidhle bun-tùs an deilbh a dhìth: %s"
 
-#: src/PhotoPage.vala:3230
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Cha ghabh %s às-phortadh: %s"
@@ -5128,7 +5063,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "air atharrachadh"
 
@@ -5160,23 +5095,16 @@ msgstr "16 ìomhaighean air gach duilleag"
 msgid "32 images per page"
 msgstr "32 ìomhaigh air gach duilleag"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "òir."
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Roghainnean an deilbh"
 
-#: src/Printing.vala:889
-msgid "Printing..."
-msgstr "'Ga chlò-bhualadh..."
+#: src/Printing.vala:864
+#| msgid "Printing..."
+msgid "Printing…"
+msgstr "’Ga chlò-bhualadh…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5186,19 +5114,19 @@ msgstr ""
 "Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "An-diugh"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "An-dè"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Nithean"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -5208,104 +5136,104 @@ msgstr[2] "%d tachartasan"
 msgstr[3] "%d tachartas"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Ceann-là:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Àm:"
 
 #. 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 "O:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Gu:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Faid:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f diogan"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Leasaichear:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Ionad:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Meud an fhaidhle:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Obair-leasachaidh làithreach:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Am meud tùsail:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
-msgstr "Brannd a' chamara:"
+msgstr "Brannd a’ chamara:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
-msgstr "Modail a' chamara:"
+msgstr "Modail a’ chamara:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Solas-boillsgidh:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Faid an fhòcais:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Ceann-là deisearais:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Faid an deisearais"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Bias an deisearais:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Domhan-leud GPS:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Domhan-fhad GPS:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Neach-ealain:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Còir-lethbhreac:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Bathar-bog:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Fiosrachadh leudaichte"
 
@@ -5316,11 +5244,12 @@ msgstr "Ag ullachadh airson luchdadh suas"
 #: src/publishing/PublishingPluginHost.vala:12
 #, c-format
 msgid "Uploading %d of %d"
-msgstr "A' luchdadh suas %d à %d"
+msgstr "A’ luchdadh suas %d à %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
+#| msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr ""
 "Chan urrainn leantainn air adhart leis an fhoillseachadh air %s oir thachair "
 "mearachd:"
@@ -5328,68 +5257,74 @@ msgstr ""
 #: src/publishing/PublishingPluginHost.vala:84
 msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
-"A' feuchainn ri fhoillseachadh air seirbhis eile, tagh aonan sa chlàr-taice "
+"A’ feuchainn ri fhoillseachadh air seirbhis eile, tagh aonan sa chlàr-taice "
 "gu h-àrd."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Chaidh na dealbhan/videothan a thagh thu fhoillseachadh."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Chaidh na videothan a thagh thu fhoillseachadh."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Chaidh na dealbhan a thagh thu fhoillseachadh."
-
-#: 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
+#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
-msgstr "Chaidh a' video a thagh thu fhoillseachadh."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Chaidh a’ video a thagh thu fhoillseachadh."
+msgstr[1] "Chaidh na videothan a thagh thu fhoillseachadh."
+msgstr[2] "Chaidh na videothan a thagh thu fhoillseachadh."
+msgstr[3] "Chaidh na videothan a thagh thu fhoillseachadh."
 
-#: src/publishing/PublishingUI.vala:114
+#: src/publishing/PublishingUI.vala:109
+#| msgid "The selected photo was successfully published."
 msgid "The selected photo was successfully published."
-msgstr "Chaidh an dealbh a thagh thu fhoillseachadh."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Chaidh an dealbh a thagh thu fhoillseachadh."
+msgstr[1] "Chaidh na dealbhan a thagh thu fhoillseachadh."
+msgstr[2] "Chaidh na dealbhan a thagh thu fhoillseachadh."
+msgstr[3] "Chaidh na dealbhan a thagh thu fhoillseachadh."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Chaidh na dealbhan/videothan a thagh thu fhoillseachadh."
 
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "A' faighinn fiosrachadh a' chunntais..."
+#: src/publishing/PublishingUI.vala:127
+#| msgid "Fetching account information..."
+msgid "Fetching account information…"
+msgstr "A’ faighinn fiosrachadh a’ chunntais…"
 
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "'Gad chlàradh a-steach..."
+#: src/publishing/PublishingUI.vala:133
+#| msgid "Logging in..."
+msgid "Logging in…"
+msgstr "’Gad chlàradh a-steach…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Foillsich na dealbhan"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Foillsich na d_ealbhan air:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Foillsich na videothan"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Foillsich na videothan _air"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Foillsich na dealbhan agus videothan"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Foillsich na dealbhan agus _videothan air"
 
 #. 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 "Chan urrainn dhuinn foillseachadh"
 
-#: 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 "
@@ -5397,797 +5332,807 @@ msgid ""
 "Preferences</b> and enable one or more of the publishing plugins on the "
 "<b>Plugins</b> tab."
 msgstr ""
-"Chan urrainn dha Shotwell na nithean a thagh thu fhoillseachadh air sgàth 's "
+"Chan urrainn dha Shotwell na nithean a thagh thu fhoillseachadh air sgàth ’s "
 "nach eil plugan foillseachaidh freagarrach an comas agad. Airson seo a chur "
 "ceart, tagh <b>Deasaich roghainnean %s</b> agus cuir an comas co-dhiù aon "
 "phlugan foillseachaidh air an taba <b>Plugain</b>"
 
 #: src/publishing/Publishing.vala:16
 msgid "Publishing"
-msgstr "'Ga fhoillseachadh"
-
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Cuairtich gu _deiseil"
+msgstr "’Ga fhoillseachadh"
 
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Cuairtich"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Cuairtich na dealbhan gu deiseil (brùth Ctrl gus a chuairteachadh gu "
 "tuathail)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Cuairtich gu _tuathail"
-
-#: src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Cuairtich na dealbhan gu tuathail"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Thoir flip air a' chòmh_nard"
-
-#: src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
-msgstr "Thoir flip air a' chòmhnard"
-
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Thoir flip gu _h-inghearach"
+msgstr "Thoir flip air a’ chòmhnard"
 
-#: src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Thoir flip gu h-inghearach"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
+#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
-msgstr ""
+msgstr "Cuir _an sàs"
 
-#: src/Resources.vala:160
-#, fuzzy
+#: src/Resources.vala:160 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/trash.ui:37
+msgid "_Edit"
+msgstr "D_easaich"
+
+#: src/Resources.vala:161
 #| msgid "_Format:"
 msgid "_Forward"
-msgstr "_Fòrmat:"
+msgstr "Air a_dhart"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Làn-sgrìn"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "_Cobhair"
+
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "_Fàg an làn-sgrìn"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "Ù_r"
 
-#: src/Resources.vala:165
-#, fuzzy
+#: src/Resources.vala:166
 #| msgid "Next"
 msgid "_Next"
-msgstr "Air adhart"
+msgstr "Ai_r adhart"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr ""
-
-#: src/Resources.vala:167
-#, fuzzy
-#| msgid "Play"
-msgid "_Play"
-msgstr "Cluich"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Roghainnean"
 
-#: src/Resources.vala:169
-#, fuzzy
+#: src/Resources.vala:170
 #| msgid "_Previous Photo"
 msgid "_Previous"
-msgstr "An dealbh _roimhe"
-
-#: src/Resources.vala:170
-#, fuzzy
-#| msgid "_Print..."
-msgid "_Print"
-msgstr "Clò-_bhuail..."
+msgstr "_Air ais"
 
-#: src/Resources.vala:171
+#: src/Resources.vala:172 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 "_Fàg an-seo"
 
-#: src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
-msgstr ""
+msgstr "_Ath-nuadhaich"
 
-#: src/Resources.vala:174
-#, fuzzy
+#: src/Resources.vala:175
 #| msgid "Reverting"
 msgid "_Revert"
-msgstr "'Ga thilleadh"
+msgstr "_Till"
 
-#: src/Resources.vala:176
-#, fuzzy
+#: src/Resources.vala:177
 #| msgid "Save As"
 msgid "Save _As"
-msgstr "Sàbhail mar"
+msgstr "Sàbhail _mar"
 
-#: src/Resources.vala:177
-#, fuzzy
+#: src/Resources.vala:178
 #| msgid "_Ascending"
 msgid "Sort _Ascending"
-msgstr "A' _dìreadh"
+msgstr "Seòrsaich a’ _dìreadh"
 
-#: src/Resources.vala:178
-#, fuzzy
+#: src/Resources.vala:179
 #| msgid "D_escending"
 msgid "Sort _Descending"
-msgstr "A' teàrna_dh"
+msgstr "Seòrsaich a’ _teàrnadh"
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
-msgstr ""
+msgstr "Cuir _stad air"
 
-#: src/Resources.vala:180
-#, fuzzy
+#: src/Resources.vala:181
 #| msgid "_Delete"
 msgid "_Undelete"
-msgstr "_Sguab às"
+msgstr "_Neo-dhèan an sguabadh às"
 
-#: src/Resources.vala:181
-#, fuzzy
+#: src/Resources.vala:182
 #| msgid "Original Size"
 msgid "_Normal Size"
-msgstr "Am meud tùsail"
+msgstr "Meud _abhàisteach"
 
-#: src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
-msgstr ""
+msgstr "_Meud as fhearr"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Leasaich"
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Sù_m a-steach"
+
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "Sùm _a-mach"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Leasaich"
 
-#: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:189 ui/collection.ui:164
+#| msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
 msgstr "Leasaich dreach an deilbh gu fèin-obrachail"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "Dèan lethbhrea_c de dh'atharraichean nan dathan"
-
-#: src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
-msgstr "Dèan lethbhreac de dh'atharraichean nan dathan"
+msgstr "Dèan lethbhreac de dh’atharraichean nan dathan"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr ""
-"Dèan lethbhreac de dh'atharraichean nan dathan a chaidh a chur air an dealbh"
+"Dèan lethbhreac de dh’atharraichean nan dathan a chaidh a chur air an dealbh"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "Cuir ann atharraichean nan _dathan"
-
-#: src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Cuir ann atharraichean nan dathan"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr ""
 "Cuir ann atharraichean nan dathan a chaidh a chur air na dealbhan a thagh thu"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Bearr"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Bearr"
 
-#: src/Resources.vala:200
-msgid "Crop the photo's size"
+#: src/Resources.vala:201
+#| msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Bearr meud an deilbh"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Dèan dìreach"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Dèan dìreach an dealbh"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Sùil dhearg"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Sùil dhearg"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Lughdaich no thoir air falbh sùil dhearg sam bith anns an dealbh"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "C_uir air gleus"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Cuir air gleus"
 
-#: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Cuir air gleus dath agus tòna an deilbh"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "Ti_ll an tionndadh tùsail"
-
-#: src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Till an tionndadh tùsail"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Neo-dhèan d_easachadh a-muigh sam bith"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Till maighstir an deilbh"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Suidhich mar chùlaibh an _deasga"
-
-#: src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Suidhich an dealbh a thagh thu mar chùlaibh an deasga"
 
-#: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Suidhich mar thaisbeanadh-shleamhnagan an _deasga..."
+#: src/Resources.vala:223
+#| msgid "Set as Desktop Slideshow"
+msgid "Set as _Desktop Slideshow…"
+msgstr "Suidhich mar thaisbeanadh-shleamhnagan an _deasga…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:225 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 "_Neo-dhèan"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Neo-dhèan"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:228 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 "_Ath-dhèan"
 
-#: src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Ath-dhèan"
 
-#: src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "Thoir ai_nm ùr air an tachartas..."
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
+#| msgid "Rename Event"
+msgid "Re_name Event…"
+msgstr "Thoir ai_nm ùr air an tachartas…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Cleachd _seo mar phrìomh-dhealbh an tachartais"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Cleachd seo mar phrìomh-dhealbh an tachartais"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "Tachartas ù_r"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Tachartas ùr"
 
-#: src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Gluais na dealbhan"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Gluais na dealbhan gu tachartas"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Co-aonaich na tachartasan"
 
-#: src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Co-aonaich"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Cuir còmhla na tachartasan san aon tachartas"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Suidhich rangachadh"
 
-#: src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Suidhich rangachadh"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Atharraich rangachadh an deilbh agad"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Cuir am meud"
 
-#: src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Cuir am meud an rangachadh"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Lùghdaich"
 
-#: src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Lùghdaich an rangachadh"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Gun rangachadh"
 
-#: src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Gun rangachadh"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
-msgstr "A' toirt air falbh rangachadh sam bith"
+msgstr "A’ toirt air falbh rangachadh sam bith"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "Air a _dhiùltadh"
 
-#: src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Air a dhiùltadh"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
-msgstr "Thoir rangachadh \"Air a dhiùltadh\" dha"
+msgstr "Thoir rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
-msgstr "A' toirt rangachadh \"Air a dhiùltadh\" dha"
+msgstr "A’ toirt rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
-msgstr "Thoir rangachadh \"Air a dhiùltadh\" dha"
+msgstr "Thoir rangachadh “Air a dhiùltadh” dha"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:269 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 "Na chaidh a dhiùltadh a-_mhàin"
 
-#: src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Na chaidh a dhiùltadh a-mhàin"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Na seall ach dealbhan a chaidh a dhiùltadh"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:273 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 "Na h-uile ⁊ feadhainn air _dhiùltadh"
 
-#: src/Resources.vala:273
-#, fuzzy
+#: src/Resources.vala:274
 #| msgid "Show all photos, including rejected"
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
-msgstr "Seall gach dealbh, a' toirt a-steach feadhainn a chaidh a dhiùltadh"
+msgstr "Seall gach dealbh, a’ toirt a-steach feadhainn a chaidh a dhiùltadh"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:276 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 "_Na h-uile dealbh"
 
 #. Button tooltip
-#: src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Seall a h-uile dealbh"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Rangachaidhean"
 
-#: src/Resources.vala:280
-msgid "Display each photo's rating"
+#: src/Resources.vala:281
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Seall an rangachadh aig gach dealbh"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:283 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 "_Criathraich na dealbhan"
 
-#: src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Criathraich na dealbhan"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Cuingich àireamh nan dealbhan a chithear le criathrag"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Dùblaich"
-
-#: src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Dùblaich"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Dùblaich an dealbh"
 
-#: src/Resources.vala:290
-msgid "_Export..."
-msgstr "Às-p_hortaich"
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+#| msgid "Export"
+msgid "_Export…"
+msgstr "Às-p_hortaich…"
 
-#: src/Resources.vala:292
-msgid "_Print..."
-msgstr "Clò-_bhuail..."
+#: src/Resources.vala:293
+#| msgid "_Print..."
+msgid "_Print…"
+msgstr "_Clò-bhuail…"
 
-#: src/Resources.vala:294
-msgid "Pu_blish..."
-msgstr "_Foillsich..."
+#: src/Resources.vala:295
+#| msgid "Publish"
+msgid "Pu_blish…"
+msgstr "_Foillsich…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Foillsich air iomadh làrach-lìn"
 
-#: src/Resources.vala:298
-msgid "Edit _Title..."
-msgstr "Deasaich an _tiotal..."
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+#| msgid "Edit Title"
+msgid "Edit _Title…"
+msgstr "Deasaich an _tiotal…"
 
 #. Button label
-#: src/Resources.vala:300
-#, fuzzy
+#: src/Resources.vala:301
 #| msgid "Edit Title"
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Deasaich an tiotal"
 
-#: src/Resources.vala:302
-msgid "Edit _Comment..."
-msgstr "Deasaich am _beachd..."
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
+#| msgid "Edit Comment"
+msgid "Edit _Comment…"
+msgstr "Deasaich am _beachd…"
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Deasaich am beachd"
 
-#: src/Resources.vala:306
-msgid "Edit Event _Comment..."
-msgstr "Deasaich beachd an _tachartais..."
+#: src/Resources.vala:307 ui/event.ui:592
+#| msgid "Edit Event Comment"
+msgid "Edit Event _Comment…"
+msgstr "Deasaich _beachd an tachartais…"
 
-#: src/Resources.vala:309
-msgid "_Adjust Date and Time..."
-msgstr "Cu_ir air gleus an ceann-là agus an t-àm..."
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
+#| msgid "Adjust Date and Time"
+msgid "_Adjust Date and Time…"
+msgstr "Cuir _air gleus an ceann-là agus an t-àm…"
 
-#: src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Cuir air gleus an ceann-là agus an t-àm"
 
-#: src/Resources.vala:312
-msgid "Add _Tags..."
-msgstr "Cuir _tagaichean ris..."
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#| msgid "Add Tags"
+msgid "Add _Tags…"
+msgstr "Cuir _tagaichean ris…"
 
-#: src/Resources.vala:313
-msgid "_Add Tags..."
-msgstr "Cuir t_agaichean ris..."
+#: src/Resources.vala:314 ui/photo_context.ui:17
+#| msgid "Add Tags"
+msgid "_Add Tags…"
+msgstr "Cuir t_agaichean ris…"
 
 #. Dialog title
-#: src/Resources.vala:315
-#, fuzzy
+#: src/Resources.vala:316
 #| msgid "Add Tags"
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Cuir tagaichean ris"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Fosgail le deasaiche RA_W"
-
-#: src/Resources.vala:323
-msgid "Send _To..."
-msgstr "C_uir gu..."
-
-#: src/Resources.vala:324
-msgid "Send T_o..."
-msgstr "Cui_r gu..."
-
-#: src/Resources.vala:326
-msgid "_Find..."
-msgstr "_Lorg..."
+#: src/Resources.vala:325 ui/photo_context.ui:135
+#| msgid "Send To"
+msgid "Send T_o…"
+msgstr "Cuir _gu…"
 
 #: src/Resources.vala:327
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "_Lorg…"
+
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Lorg"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
-"Lorg dealbh 's tu a' cur a-steach teacsa a tha a' nochdadh 'na ainm no sna "
+"Lorg dealbh ’s tu a’ cur a-steach teacsa a tha a’ nochdadh ’na ainm no sna "
 "tagaichean aige."
 
-#: src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "Cuir _bratach ris"
 
-#: src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
-msgstr "Thoir a' bhratach air _falbh"
+msgstr "Thoir a’ bhratach air _falbh"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Chan urrainn dhuinn an deasaiche a chur gu dol: %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
-msgid "Add Tag \"%s\""
-msgstr "Cuir an taga \"%s\" ris"
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
+msgstr "Cuir an taga “%s” ris"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Cuir na tagaichean \"%s\" agus \"%s\" ris"
+#| msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
+msgstr "Cuir na tagaichean “%s” agus “%s” ris"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-#, fuzzy
+#: src/Resources.vala:349
 #| msgid "Add Tags"
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Cuir tagaichean ris"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
-msgid "_Delete Tag \"%s\""
-msgstr "_Sguab às an taga \"%s\""
+#| msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
+msgstr "_Sguab às an taga “%s”"
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Sguab às an taga \"%s\""
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
+msgstr "Sguab às an taga “%s”"
 
-#: src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Sguab às an taga"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "Thoir ai_nm eile air an taga \"%s\"..."
+#| msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
+msgstr "Thoir ai_nm eile air an taga “%s”…"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Thoir \"%2s\" air \"%1s\""
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
+msgstr "Thoir “%2$s” air an taga “%1$s”"
 
-#: src/Resources.vala:373
-msgid "_Rename..."
-msgstr "_Thoir ainm ùr air..."
+#: src/Resources.vala:374 ui/tags.ui:456
+#| msgid "_Rename..."
+msgid "_Rename…"
+msgstr "_Thoir ainm ùr air…"
 
-#: src/Resources.vala:375
-msgid "Modif_y Tags..."
-msgstr "Athar_raich na tagaichean..."
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#| msgid "Modify Tags"
+msgid "Modif_y Tags…"
+msgstr "Atharraich na ta_gaichean…"
 
-#: src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Atharraich na tagaichean"
 
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Cuir an taga \"%s\" ris an dealbh"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Cuir an taga \"%s\" ris na dealbhan"
-
-#: src/Resources.vala:383
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Cuir an taga \"%s\" ris an dealbh a thagh thu"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Cuir an taga \"%s\" ris na dealbhan a thagh thu"
-
-#: src/Resources.vala:388
+#: src/Resources.vala:380
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Thoir air falbh an taga \"%s\" on _dealbh"
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Cuir an taga “%s” ris an dealbh"
+msgstr[1] "Cuir an taga “%s” ris na dealbhan"
+msgstr[2] "Cuir an taga “%s” ris na dealbhan"
+msgstr[3] "Cuir an taga “%s” ris na dealbhan"
 
-#: src/Resources.vala:389
+#: src/Resources.vala:386
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Thoir air falbh an taga \"%s\" on na _dealbhan"
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Cuir an taga “%s” ris an dealbh a thagh thu"
+msgstr[1] "Cuir an taga “%s” ris na dealbhan a thagh thu"
+msgstr[2] "Cuir an taga “%s” ris na dealbhan a thagh thu"
+msgstr[3] "Cuir an taga “%s” ris na dealbhan a thagh thu"
 
-#: src/Resources.vala:393
+#: src/Resources.vala:392
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Thoir air falbh an taga \"%s\" on dealbh"
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Thoir air falbh an taga “%s” on _dealbh"
+msgstr[1] "Thoir air falbh an taga “%s” o na _dealbhan"
+msgstr[2] "Thoir air falbh an taga “%s” o na _dealbhan"
+msgstr[3] "Thoir air falbh an taga “%s” o na _dealbhan"
 
-#: src/Resources.vala:394
+#: src/Resources.vala:398
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Thoir air falbh an taga \"%s\" on na dealbhan"
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Thoir air falbh an taga “%s” on dealbh"
+msgstr[1] "Thoir air falbh an taga “%s” o na dealbhan"
+msgstr[2] "Thoir air falbh an taga “%s” o na dealbhan"
+msgstr[3] "Thoir air falbh an taga “%s” o na dealbhan"
 
-#: src/Resources.vala:398
+#: src/Resources.vala:404
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
-"Chan urrainn dhuinn \"%s\" a thoirt air an taga a chionn 's gu bheil an taga "
+"Chan urrainn dhuinn “%s” a thoirt air an taga a chionn ’s gu bheil an taga "
 "sin ann mu thràth."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:408
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#| msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
-"Chan urrainn dhuinn \"%s\" a thoirt air an lorg air sgàth 's gu bheil a "
+"Chan urrainn dhuinn “%s” a thoirt air an lorg air sgàth ’s gu bheil a "
 "leithid ann mar-thà."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:411 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Lorg a chaidh a shàbhaladh"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Sguab às an lorg"
 
-#: src/Resources.vala:410
-msgid "_Edit..."
-msgstr "D_easaich..."
+#: src/Resources.vala:416 ui/savedsearch.ui:11
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "D_easaich…"
 
-#: src/Resources.vala:411
-msgid "Re_name..."
-msgstr "Thoir ain_m ùr air..."
+#: src/Resources.vala:417 ui/savedsearch.ui:7
+#| msgid "Re_name..."
+msgid "Re_name…"
+msgstr "Thoir ai_nm ùr air…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:420
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
-msgstr "Thoir \"%2s\" air an lorg \"%1s\""
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
+msgstr "Thoir “%2$s” air an lorg “%1$s”"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:424
 #, c-format
-msgid "Delete Search \"%s\""
-msgstr "Sguab às an lorg \"%s\""
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
+msgstr "Sguab às an lorg “%s”"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
-msgstr "A' toirt an rangachadh %s dha"
+msgstr "A’ toirt an rangachadh %s dha"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Seall %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Na seall ach dealbhan aig a bheil an rangachadh %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s no nas fhearr"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Seall %s no feadhainn nas fhearr"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr ""
 "Na seall dealbhan ach feadhainn aig a bheil rangachadh %s no fear nas fhearr"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Thoir na dealbhan a thagh thu air falbh on sgudal"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Thoir na dealbhan a thagh thu air falbh on leabhar-lann"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Aisig"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Gluais na dealbhan a thagh thu air ais dhan leabhar-lann"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Seall ann am manai_dsear nam faidhlichean"
 
-#: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
-msgstr ""
-"Fosgail pasgan an deilbh a thagh thu ann am manaidsear nam faidhlichean"
+#: src/Resources.vala:667
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
+msgstr "Fosgail pasgan an deilbh a thagh thu ann am manaidsear nam faidhlichean"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Cha ghabh fhosgladh manaidsear nam faidhlichean: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:673 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "T_hoir air falbh on leabhar-lann"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Gluais dhan sgudal"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:677 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 "Tagh n_a h-uile"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Tagh a h-uile nì"
 
@@ -6200,15 +6145,14 @@ msgstr "Tagh a h-uile nì"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala: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:787
-#, fuzzy
+#: src/Resources.vala:744
 #| msgid "%a %b %d"
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
@@ -6217,8 +6161,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:792
-#, fuzzy
+#: src/Resources.vala:749
 #| msgid "%d, %Y"
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
@@ -6227,8 +6170,7 @@ msgstr "%d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
-#, fuzzy
+#: src/Resources.vala:754
 #| msgid "%a %b %d"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
@@ -6237,8 +6179,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:802
-#, fuzzy
+#: src/Resources.vala:759
 #| msgid "%a %b %d, %Y"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
@@ -6253,143 +6194,141 @@ msgid "Saved Searches"
 msgstr "Luirg a shàbhail thu"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
-msgstr "is na leanas 'na bhroinn"
+msgstr "is na leanas ’na bhroinn"
 
 #. 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 "a tha gu pongail"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
-msgstr "a tha a' tòiseachadh le"
+msgstr "a tha a’ tòiseachadh le"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
-msgstr "a tha a' crìochnachadh le"
+msgstr "a tha a’ crìochnachadh le"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "anns nach eil"
 
-#: 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 "nach deach a shuidheachadh"
 
-#: src/searches/SavedSearchDialog.vala:174
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:168
 #| msgid "is not set"
 msgid "is set"
-msgstr "nach deach a shuidheachadh"
+msgstr "a chaidh a shuidheachadh"
 
 #. 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 "a tha 'na"
+msgstr "a tha ’na"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
-msgstr "nach eil 'na"
+msgstr "nach eil ’na"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "dealbh sam bith"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "dhealbh amh"
 
-#: 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 "Chaidh"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "Cha deach"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "atharrachadh a dhèanamh air"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "atharrachadh inntearnail a dhèanamh air"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "atharrachadh on taobh a-muigh a dhèanamh air"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "a tha bratach ris"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "nach eil bratach ris"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "agus nas àirde"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "a-mhàin"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "agus nas lugha"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "a tha àn dèidh"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "a tha ro"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "a tha eadar"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "agus"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Lorg"
 
-#: src/searches/SavedSearchDialog.vala:702
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:696
 #| msgid "_Cancel"
 msgid "Cancel"
-msgstr "_Sguir dheth"
+msgstr "Sguir dheth"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
-msgstr ""
+msgstr "Ceart ma-thà"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "gin sam bith"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "na h-uile"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "chan eil gin"
 
@@ -6419,7 +6358,7 @@ msgstr "Ainm an fhaidhle"
 
 #: src/searches/SearchBoolean.vala:175
 msgid "Media type"
-msgstr "Seòrsa a' mheadhain"
+msgstr "Seòrsa a’ mheadhain"
 
 #: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
@@ -6429,8 +6368,8 @@ msgstr "Staid na brataich"
 msgid "Photo state"
 msgstr "Staid an deilbh:"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Rangachadh"
 
@@ -6438,47 +6377,61 @@ msgstr "Rangachadh"
 msgid "Date"
 msgstr "Ceann-là"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Videothan"
+#: src/SearchFilter.vala:815
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "Rangachadh ★+"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Dealbhan RAW"
+#: src/SearchFilter.vala:818
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "Rangachadh ★★+"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Dealbhan RAW"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "Rangachadh ★★★+"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "Rangachadh ★★★★+"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "Rangachadh ★★★★★+"
+
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Mearachd a' luchdadh faidhle an UI %s: %s"
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Mearachd a’ luchdadh eadar-aghaidh a’ bhàir-luirg: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
-#, fuzzy
+#: src/SearchFilter.vala:1073
 #| msgid "_Close"
 msgid "Close"
-msgstr "_Dùin"
+msgstr "Dùin"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Seòrsa"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Videothan"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "Dealbhan RAW"
+
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "_Taga ùr..."
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Roghainnean"
@@ -6495,11 +6448,11 @@ msgstr "Air ais dhan dealbh roimhe"
 
 #: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
 msgid "Pause"
-msgstr "Cuir 'na stad"
+msgstr "Cuir ’na stad"
 
 #: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
 msgid "Pause the slideshow"
-msgstr "Cuir an taisbeanadh-shleamhnagan 'na stad"
+msgstr "Cuir an taisbeanadh-shleamhnagan ’na stad"
 
 #: src/SlideshowPage.vala:174
 msgid "Next"
@@ -6555,195 +6508,653 @@ msgstr "gun tiotal"
 msgid "Export Videos"
 msgstr "Às-phortaich videothan"
 
-#: ui/set_background_dialog.ui:15
-msgid "Set as Desktop Background"
-msgstr "Suidhich mar chùlaibh an deasga"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr ""
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
-msgid "Use for Desktop"
-msgstr "Cleachd airson an deasga"
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+msgid "_Developer"
+msgstr "_Leasaichear"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
-msgid "Use for Lock Screen"
-msgstr "Cleachd airson na sgrìn-glasaidh"
+#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
+#| msgid "Open With E_xternal Editor"
+msgid "Open with E_xternal Editor"
+msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
 
-#: ui/set_background_slideshow_dialog.ui:15
-msgid "Set as Desktop Slideshow"
-msgstr "Suidhich mar thaisbeanadh-shleamhnagan an deasga"
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
+msgid "View Eve_nt for Photo"
+msgstr "Seall an tac_hartas aig an dealbh"
 
-#: ui/set_background_slideshow_dialog.ui:33
-msgid "Show each photo for"
-msgstr "Seall gach dealbh"
+#: 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/trash.ui:5
+msgid "_File"
+msgstr "_Faidhle"
 
-#: ui/set_background_slideshow_dialog.ui:45
-msgid "period of time"
-msgstr "fad greiseig"
+#: ui/direct.ui:13
+#| msgid "Save As"
+msgid "Save _As…"
+msgstr "Sàbhail m_ar…"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Cruthaich taisbeanadh-shleamhnagan a' chùlaibh"
+#: 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/trash.ui:87
+msgid "_View"
+msgstr "_Sealladh"
 
-#: ui/set_background_slideshow_dialog.ui:115
-msgid "How long each photo is shown on the desktop background"
-msgstr "Dè cho fad 's a thèid gach dealbh a shealltainn air cùlaibh an deasga"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Co-fhreagair ris an _duilleag"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Ainm an luirg:"
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "_100% de shùm"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Maidsich"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "_200% de shùm"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "dhe na leanas:"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Dealbh"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "An dealbh _roimhe"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_An ath-dhealbh"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "I_nnealan"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Ceistean àbhaisteach"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#| msgid "_Report a Problem..."
+msgid "_Report a Problem…"
+msgstr "Dèan aith_ris air duilgheadas…"
+
+#: 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"
+msgid "_Import from Folder…"
+msgstr "_Ion-phortaich o phasgan…"
+
+#: 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"
+msgid "Import From _Application…"
+msgstr "_Ion-phortaich o aplacaid…"
+
+#: 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 "Falamhaich an s_gudal"
+
+#: 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 "_Lorg"
+
+#: 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..."
+msgid "Ne_w Saved Search…"
+msgstr "Lorg ù_r a chaidh a shàbhaladh…"
+
+#: 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 "_Fiosrachadh bunasach"
+
+#: 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 "F_iosrachdadh leudaichte"
+
+#: 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 "_Bàr nan lorg"
+
+#: 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 "Bàr-_taoibh"
+
+#: 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 "Pin Toolbar"
+msgid "T_oolbar"
+msgstr "_Bàr-inneal"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Beachdan"
+
+#: 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 "Seòrsaich na _tachartasan"
+
+#: 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 "A’ _dìreadh"
+
+#: 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 "A’ teàrna_dh"
+
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+msgid "Even_ts"
+msgstr "Tach_artasan"
+
+#: 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"
+msgid "R_emove from Library"
+msgstr "T_hoir air falbh on leabhar-lann"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Tiotalan"
+
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+msgid "Ta_gs"
+msgstr "Ta_gaichean"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Seòrsaich na _dealbhan"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "A-rèir _tiotail"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+#| msgid "File name"
+msgid "By _Filename"
+msgstr "A-rèir ainm an _fhaidhle"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "A-rèir _ceann-là an deisearais"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "A-rèir _rangachaidh"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+#| msgid "D_escending"
+msgid "_Descending"
+msgstr "A’ teàrna_dh"
 
-#: ui/shotwell.ui:195
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Dealbhan"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "Thoir _stad air an ion-phortadh"
+
+#: ui/printing_widget.ui:19
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Meud an deilbh chlò-bhuailte</b>"
 
-#: ui/shotwell.ui:212
+#: ui/printing_widget.ui:36
 msgid "Use a _standard size:"
 msgstr "Cleachd meud _stannardach:"
 
-#: ui/shotwell.ui:255
+#: ui/printing_widget.ui:80
 msgid "Use a c_ustom size:"
 msgstr "Cleachd meud g_nàthaichte:"
 
-#: ui/shotwell.ui:345
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:146
+msgid "in."
+msgstr "òir."
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:147
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:173
 msgid "_Match photo aspect ratio"
 msgstr "_Maidsich co-mheas an deilbh"
 
-#: ui/shotwell.ui:369
+#: ui/printing_widget.ui:197
 msgid "_Autosize:"
 msgstr "Meud fèin-_obrachail:"
 
-#: ui/shotwell.ui:409
+#: ui/printing_widget.ui:237
 msgid "<b>Titles</b>"
 msgstr "<b>Tiotalan</b>"
 
-#: ui/shotwell.ui:426
+#: ui/printing_widget.ui:254
 msgid "Print image _title"
 msgstr "Clo-bhuail _tiotal an deilbh"
 
-#: ui/shotwell.ui:470
+#: ui/printing_widget.ui:297
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Dùmhlachd-bhreacaidh nam piogsailean</b>"
 
-#: ui/shotwell.ui:490
+#: ui/printing_widget.ui:317
 msgid "_Output photo at:"
 msgstr "Dèan de_albh aig:"
 
-#: ui/shotwell.ui:525
+#: ui/printing_widget.ui:351
 msgid "pixels per inch"
 msgstr "piogsailean gach òirleach"
 
-#: ui/shotwell.ui:559
-msgid "label"
-msgstr "leubail"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Suidhich mar chùlaibh an deasga"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+msgid "Use for Desktop"
+msgstr "Cleachd airson an deasga"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+msgid "Use for Lock Screen"
+msgstr "Cleachd airson na sgrìn-glasaidh"
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Roghainnean Shotwell"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Suidhich mar thaisbeanadh-shleamhnagan an deasga"
+
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Cruthaich taisbeanadh-shleamhnagan a’ chùlaibh"
+
+#: ui/set_background_slideshow_dialog.ui:82
+msgid "Show each photo for"
+msgstr "Seall gach dealbh"
 
-#: ui/shotwell.ui:730
+#: ui/set_background_slideshow_dialog.ui:94
+msgid "period of time"
+msgstr "fad greiseig"
+
+#: ui/set_background_slideshow_dialog.ui:116
+msgid "How long each photo is shown on the desktop background"
+msgstr "Dè cho fad ’s a thèid gach dealbh a shealltainn air cùlaibh an deasga"
+
+#: ui/shotwell.ui:65
 msgid "white"
 msgstr "geal"
 
-#: ui/shotwell.ui:757
+#: ui/shotwell.ui:92
 msgid "black"
 msgstr "dubh"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Meata-dàta"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Sgrìobh tagaichean, tiotalan agus _meata-dàta eile ann am faidhlichean deilbh"
-
-#: ui/shotwell.ui:880
+#: ui/shotwell.ui:123
 msgid "Display"
 msgstr "Sealladh"
 
-#: ui/shotwell.ui:901
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "Cùlai_bh:"
+
+#: ui/shotwell.ui:175
 msgid "_Import photos to:"
 msgstr "_Ion-phortaich dealbhan dha:"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "Cùlai_bh:"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Cum sùil air pasgan na leabhar-lainn airson faidhlichean ùra"
 
-#: ui/shotwell.ui:947
+#: ui/shotwell.ui:209
 msgid "Importing"
 msgstr "Ag ion-phortadh"
 
-#: ui/shotwell.ui:970
+#: ui/shotwell.ui:226
 msgid "_Directory structure:"
-msgstr "Structar a' p_hasgain:"
-
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Pàtran:"
+msgstr "Structar a’ p_hasgain:"
 
-#: ui/shotwell.ui:1091
+#: ui/shotwell.ui:240
 msgid "Example:"
 msgstr "Ball-eisimpleir:"
 
-#: ui/shotwell.ui:1108
+#: ui/shotwell.ui:249
 msgid "R_ename imported files to lowercase"
 msgstr "_Sparr litrichean beaga air ainmean fhaidhlichean a thèid ion-phortadh"
 
-#: ui/shotwell.ui:1137
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Meata-dàta"
+
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr ""
+"Sgrìobh tagaichean, tiotalan agus _meata-dàta eile ann am faidhlichean deilbh"
+
+#: ui/shotwell.ui:306
 msgid "RAW Developer"
 msgstr "Leasaichear RAW"
 
-#: ui/shotwell.ui:1172
+#: ui/shotwell.ui:323
 msgid "De_fault:"
 msgstr "B_un-roghainn"
 
-#: ui/shotwell.ui:1226
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Pàtran:"
+
+#: ui/shotwell.ui:439
 msgid "E_xternal photo editor:"
 msgstr "Deasaiche dhealbhan air an taobh a-m_uigh:"
 
-#: ui/shotwell.ui:1242
+#: ui/shotwell.ui:456
 msgid "External _RAW editor:"
 msgstr "Deasaiche _RAW air an taobh a-muigh:"
 
-#: ui/shotwell.ui:1307
+#: ui/shotwell.ui:517
 msgid "External Editors"
 msgstr "Deasaichean air an taobh a-muigh:"
 
-#: ui/shotwell.ui:1334
+#: ui/shotwell.ui:542
 msgid "Plugins"
 msgstr "Plugain"
 
-#: ui/shotwell.ui:1400
+#: ui/shotwell.ui:590
+msgid "_Name of search:"
+msgstr "_Ainm an luirg:"
+
+#: ui/shotwell.ui:644
+msgid "_Match"
+msgstr "_Maidsich"
+
+#: ui/shotwell.ui:671
+msgid "of the following:"
+msgstr "dhe na leanas:"
+
+#: ui/shotwell.ui:752
+msgid "label"
+msgstr "leubail"
+
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Dàil:"
 
-#: ui/shotwell.ui:1416
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "Èifeachd an _tar-mhùthaidh:"
 
-#: ui/shotwell.ui:1432
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Dàil an tar-mhùthaidh:"
 
-#: ui/shotwell.ui:1444
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "Seall an t_iotal"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "diogan"
 
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+#| msgid "New _Tag..."
+msgid "New _Tag…"
+msgstr "_Taga ùr…"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Sguab às na dealbhan uile a tha san sgudal"
+
+#~ msgid "Login"
+#~ msgstr "Clàraich a-steach"
+
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "A' cur fo dheuchainn a' cheangail ri Facebook..."
+
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Rinn thu clàradh a-steach is a-mach air Flickr san t-seisean Shotwell seo "
+#~ "mu thràth.\n"
+#~ "Ma tha thu airson leantainn air foillseachadh air Flickr, fàg an-seo, ath-"
+#~ "thòisich Shotwell is feuch ri fhoillseachadh às ùr."
+
+#~ msgid "Videos will appear in '%s'"
+#~ msgstr "Nochdaidh na videothan ann an \"%s\""
+
+#~ msgid "_Contents"
+#~ msgstr "_Susbaint"
+
+#~ msgid "Display the title of each photo"
+#~ msgstr "Seall an tiotal aig gach dealbh"
+
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Ion-phortaich na dealbhan a thagh thu dhan leabhar-lann agad"
+
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Ion-phortaich na dealbhan uile dhan leabhar-lann agad"
+
+#~ msgid "Play a slideshow"
+#~ msgstr "Cluich taisbeanadh-shleamhnagan"
+
+#~ msgid "Save Details..."
+#~ msgstr "Sàbhail am mion-fhiosrachadh..."
+
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Atharraich faidhlichean tùsail an deilbh"
+
+#~ msgid "_Modify original files"
+#~ msgstr "_Atharraich na faidhlichean tùsail"
+
+#~ msgid "Save photo"
+#~ msgstr "Sàbhail an dealbh"
+
+#~ msgid "Save _As..."
+#~ msgstr "Sàbhail _mar..."
+
+#~ msgid "Save photo with a different name"
+#~ msgstr "Sàbhail an dealbh fo ainm eile"
+
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr ""
+#~ "Clò-bhuail an dealbh air clò-bhualadair a tha ceangailte ris a' "
+#~ "choimpiutair agad"
+
+#~ msgid "Previous Photo"
+#~ msgstr "An dealbh roimhe"
+
+#~ msgid "Next Photo"
+#~ msgstr "An ath-dhealbh"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Iomadaich meudachadh an deilbh"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Lùghdaich meudachadh an deilbh"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Sùm an dealbh ach am freagair e ris an sgrìn"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Cuir sùm an deilbh gu 100%"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Sùm an dealbh gun mheudachadh 200%"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Seall na beachdan a tha ri gach tachartas"
+
+#~ msgid "Importing..."
+#~ msgstr "Ag ion-phortadh..."
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Thoir stad air ion-phortadh na dealbhan"
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Ag ullachadh an ion-phortadh..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Ion-phortaich o phasgan..."
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Ion-phortaich dealbhan o dhiosg dha leabhar-lann"
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Ion-phortaich o _aplacaid..."
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Lorg dealbhan agus videothan a-rèir cuspairean-deuchainn"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Seall fiosrachadh bunasach mun rug a thagh thu"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Seall fiosrachadh leudaichte mun rug a thagh thu"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Seall bàr nan lorg"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Seall am bàr-taoibh"
+
+#, fuzzy
+#~| msgid "Display the sidebar"
+#~ msgid "Display the tool bar"
+#~ msgstr "Seall am bàr-taoibh"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Seòrsaich na dealbhan a' dìreadh"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Seòrsaich na dealbhan a' teàrnadh"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Cuir an àirde meudachadh nan dealbhagan"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Lùghdaich meudachadh nan dealbhagan"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Cluich a' video"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr ""
+#~ "Fosgail na videothan a thagh thu ann an cluicheadair video an t-siostaim"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Seall na beachdan aig gach dealbh"
+
+#~ msgid "Display each photo's tags"
+#~ msgstr "Seall na tagaichean aig gach dealbh"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Seòrsaich na dealbhan a-rèir tiotail"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Seòrsaich na dealbhan a-rèir ceann-là an deisearais"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Seòrsaich na dealbhan a-rèir rangachaidh"
+
+#, fuzzy
+#~| msgid "Sort photos by title"
+#~ msgid "Sort photos by filename"
+#~ msgstr "Seòrsaich na dealbhan a-rèir tiotail"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Chaidh na videothan a thagh thu fhoillseachadh."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Chaidh na dealbhan a thagh thu fhoillseachadh."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Suidhich mar thaisbeanadh-shleamhnagan an _deasga..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "Thoir ai_nm ùr air an tachartas..."
+
+#~ msgid "_Export..."
+#~ msgstr "Às-p_hortaich"
+
+#~ msgid "_Print..."
+#~ msgstr "Clò-_bhuail..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "_Foillsich..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Deasaich an _tiotal..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Deasaich am _beachd..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Deasaich beachd an _tachartais..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "Cu_ir air gleus an ceann-là agus an t-àm..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Cuir _tagaichean ris..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "Cuir t_agaichean ris..."
+
+#~ msgid "Send _To..."
+#~ msgstr "C_uir gu..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Cui_r gu..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Lorg..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Athar_raich na tagaichean..."
+
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Cuir an taga \"%s\" ris na dealbhan"
+
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Cuir an taga \"%s\" ris na dealbhan a thagh thu"
+
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Thoir air falbh an taga \"%s\" on na _dealbhan"
+
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Thoir air falbh an taga \"%s\" on na dealbhan"
+
+#~ msgid "_Edit..."
+#~ msgstr "D_easaich..."
+
+#~ msgid "RAW photos"
+#~ msgstr "Dealbhan RAW"
+
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Roghainnean Shotwell"
+
 #~ msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgstr "Còir-lethbhreac 2009-2014 Yorba Foundation"
 
diff --git a/po/gl.gmo b/po/gl.gmo
index 65d50d6..f3b43ee 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index 76f31f2..29cb9e3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -30,8 +30,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2017-08-03 19:56+0000\n"
-"X-Generator: Launchpad (build 18441)\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
diff --git a/po/hr.gmo b/po/hr.gmo
index 7aa1e73..1919b2c 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index 3075e96..5997016 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,25 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-03-14 22:52+0100\n"
-"PO-Revision-Date: 2017-03-14 23:40+0100\n"
+"Report-Msgid-Bugs-To: "
+"https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell&keywords=I18N+L10N&"
+"component=Internationalization\n"
+"POT-Creation-Date: 2018-03-13 00:49+0000\n"
+"PO-Revision-Date: 2018-03-21 22:51+0000\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: gogo <trebelnik2@gmail.com>\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2018-03-21 23:00+0000\n"
+"X-Generator: Launchpad (build 18573)\n"
 "Language: hr\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 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
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -61,39 +63,37 @@ msgstr ""
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Shotwell podržava JPEG, PNG, TIFF, i razne RAW formate datoteka."
 
-#: misc/shotwell.appdata.xml.in:52
-msgid "The Shotwell developers"
-msgstr "Shotwell razvijatelji"
-
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+# GNOME Application Class ("Generic Name")
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Upravitelj fotografija"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organizirajte svoje fotografije"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
-"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
-"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
-"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;org"
+"anize;photo;photographs;photos;picture;pictures;photography;print;publish;rot"
+"ate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
 msgstr ""
 "album;kamera;kamere;obreži;uredi;poboljšaj;izvezi;galerija;slika;slike;uvezi;"
-"organiziraj;fotografija;fotografije;slika;slike;ispis;objavi;zakreni;dijeli;"
-"oznake;video snimka;facebook;flickr;picasa;youtube;piwigo;"
+"organiziraj;fotografija;fotografije;slika;slike;ispis;objavi;zakreni;dijeli;o"
+"znake;video snimka;facebook;flickr;picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell preglednik"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+# GNOME Application Class for Direct Edit Mode
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Preglednik fotografija"
 
@@ -122,7 +122,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Tajni token za prijavu oauth zahtjeva"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "zadana veličina"
 
@@ -149,9 +149,9 @@ msgid "URL of the Rajce server."
 msgstr "URL Rajce poslužitelja."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "korisničko ime"
 
@@ -168,7 +168,7 @@ msgid "user token, if remembered."
 msgstr "korisnikov token , ako je zapamćen."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "Posljednja kategorija"
 
@@ -177,7 +177,7 @@ msgid "The last selected Rajce category."
 msgstr "Posljednja odabrana Rajce kategorija"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "posljednja veličina fotografije"
 
@@ -216,11 +216,11 @@ msgstr ""
 "Ako je odabrano, otvori album u web pregledniku nakon slanja fotografije"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "ukloni osjetljive informacije iz slanja"
 
@@ -236,7 +236,8 @@ msgid "display basic properties"
 msgstr "prikaži osnovna svojstva"
 
 #: misc/org.yorba.shotwell.gschema.xml:24
-msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgid ""
+"True if the basic properties pane is to be displayed, false otherwise."
 msgstr "Ako je odabrano, panel osnovnih svojstava će biti prikazan."
 
 #: misc/org.yorba.shotwell.gschema.xml:29
@@ -246,7 +247,7 @@ msgstr "prikaži proširena svojstva"
 #: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
 "True if the extended properties window is to be displayed, false otherwise."
-msgstr "Ako je odabrano, panel proširenih svojstava će biti prikazan."
+msgstr "Ako je odabrano, prozor proširenih svojstava će biti prikazan."
 
 #: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
@@ -262,69 +263,80 @@ msgstr "prikaži alatnu traku"
 
 #: misc/org.yorba.shotwell.gschema.xml:42
 msgid "True if the bottom toolbar is to be displayed, false otherwise."
-msgstr ""
+msgstr "Ako je odabrano, donja alatna traka će biti prikazana."
 
 #: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
-msgstr ""
+msgstr "prikaži traku pretrage"
 
 #: misc/org.yorba.shotwell.gschema.xml:48
-msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
-msgstr ""
+msgid ""
+"True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr "Ako je odabrano, alatna traka pretrage/filtra će biti prikazana."
 
 #: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
-msgstr ""
+msgstr "prikaži naslov fotografije"
 
 #: misc/org.yorba.shotwell.gschema.xml:54
 msgid ""
 "True if photo titles are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
 msgstr ""
+"Ako je odabrano, naslov fotografije će biti prikazan ispod minijatura u "
+"pogledu kolekcija."
 
 #: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
-msgstr ""
+msgstr "prikaži komentar fotografije"
 
 #: misc/org.yorba.shotwell.gschema.xml:60
 msgid ""
 "True if photo comments are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
 msgstr ""
+"Ako je odabrano, komentar fotografije će biti prikazan ispod minijatura u "
+"pogledu kolekcija."
 
 #: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
-msgstr ""
+msgstr "prikaži komentar događaja"
 
 #: misc/org.yorba.shotwell.gschema.xml:66
 msgid ""
 "True if event comments are to be displayed beneath thumbnails in event "
 "views, false otherwise."
 msgstr ""
+"Ako je odabrano, komentar događaja će biti prikazan ispod minijatura u "
+"pogledu kolekcija."
 
 #: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
-msgstr ""
+msgstr "prikaži oznake fotografije"
 
 #: misc/org.yorba.shotwell.gschema.xml:72
 msgid ""
 "True if photo tags are to be listed beneath thumbnails in collection views, "
 "false otherwise."
 msgstr ""
+"Ako je odabrano, oznake fotografije će biti prikazane ispod minijatura u "
+"pogledu kolekcija."
 
 #: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
-msgstr ""
+msgstr "prikaži ocjene fotografija"
 
 #: misc/org.yorba.shotwell.gschema.xml:78
 msgid ""
 "True if a photo’s rating should be displayed as overlaid trinket, false "
 "otherwise."
 msgstr ""
+"Ako je odabrano, ocjene fotografija će biti prikazane kao prekrivene "
+"trićarije."
 
 #: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
-msgstr ""
+msgstr "razina filtra ocjena"
 
 #: misc/org.yorba.shotwell.gschema.xml:84
 msgid ""
@@ -332,911 +344,1031 @@ msgid ""
 "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 ""
+"Otkriva kako filtrirati fotografije temeljem njihovih ocjena. 1: Odbijeno "
+"ili bolje, 2: Neocjenjeno ili bolje, 3: Jedan ili bolje, 4: Dva ili bolje, "
+"5: Tri ili bolje, 6: Četiri ili bolje, 7: Pet ili bolje."
 
 #: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
-msgstr ""
+msgstr "razvrstaj događaje rastući"
 
 #: misc/org.yorba.shotwell.gschema.xml:90
 msgid "True if events should be sorted ascending, false if descending."
 msgstr ""
+"Ako je odabrano, događaji bi trebali biti razvrstani rastući, u suprotnom "
+"padajući."
 
 #: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
-msgstr ""
+msgstr "razvrstaj fotografije u fototeci rastući"
 
 #: misc/org.yorba.shotwell.gschema.xml:96
-msgid "True if library photos should be sorted ascending, false if descending."
+msgid ""
+"True if library photos should be sorted ascending, false if descending."
 msgstr ""
+"Ako je odabrano, fotografije u fototeci bi trebale biti razvrstane rastući, "
+"u suprotnom padajući."
 
 #: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
-msgstr ""
+msgstr "kriterij razvrstavanja fotografija u fototeci"
 
 #: misc/org.yorba.shotwell.gschema.xml:102
 msgid ""
 "A numeric code that specifies the sort criteria for photos in library views."
 msgstr ""
+"Brojčani kôd koji određuje vrstu kriterija za fotografije u pogledu fototeke."
 
 #: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
-msgstr ""
+msgstr "razvrstaj događaje fotografija rastući"
 
 #: misc/org.yorba.shotwell.gschema.xml:108
 msgid "True if event photos should be sorted ascending, false if descending."
 msgstr ""
+"Ako je odabrano događaji fotografija bi trebali biti razvrstani rastući, u "
+"suprotnom padajući."
 
 #: misc/org.yorba.shotwell.gschema.xml:113
 msgid "sort event photos criteria"
-msgstr ""
+msgstr "kriterij razvrstavanja događaja fotografija"
 
 #: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
-msgstr ""
+msgstr "Određuje vrstu kriterija za događaje fotografija."
 
 #: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
-msgstr ""
+msgstr "koristi 24-satno vrijeme"
 
 #: 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 ""
+"Ako je odabrano, prikazivat će se 24-satno vrijeme, u suprotnom će se "
+"prikazivati AM/PM pribilješka."
 
 #: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
-msgstr ""
+msgstr "zadrži relativno vrijeme između fotografija"
 
 #: 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 ""
+"Ako je odabrano, pri prilagodbi vremena/datuma fotografija, relativno "
+"vrijeme bi se trebalo održavati. U suprotnome sve fotografije će imati isto "
+"vrijeme."
 
 #: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
-msgstr ""
+msgstr "promjeni izvorne datoteke fotografije"
 
 #: 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 ""
+"Ako je odabrano, pri prilagodbi vremena/datuma fotografija, izvorne datoteke "
+"bi trebale isto biti promijenjene. U suprotnome promjena je samo učinjena u "
+"bazi podataka."
 
 #: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
-msgstr ""
+msgstr "prikaži prozor dobrodošlice pri pokretanju"
 
 #: 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 ""
+"Ako je doabrano, pri pokretanju, prozor dobrodošlice bi se trebao prikazati."
 
 #: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
-msgstr ""
+msgstr "položaj bočne trake"
 
 #: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
-msgstr ""
+msgstr "Širina bočne trake u pikselima"
 
 #: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
-msgstr ""
+msgstr "Promjena veličine fotografije minijature"
 
 #: misc/org.yorba.shotwell.gschema.xml:150
 msgid "The scale of photo thumbnails, ranging from 72 to 360."
-msgstr ""
+msgstr "Promjena veličine fotografije minijature, u rasponu od 72 do 360."
 
 #: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
-msgstr ""
+msgstr "pričvrščuje stanje alatne trake"
 
 #: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
-msgstr ""
+msgstr "Pričvrsti alatnu traku u cjelozaslonskom prikazu, ili ne."
 
 #: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
-msgstr ""
+msgstr "boja pozadine"
 
 #: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
-msgstr ""
+msgstr "Siva boja kao boja pozadine."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
-msgid "Selection state of “hide photos” option"
-msgstr ""
+msgid "background for transparent images"
+msgstr "pozadina za prozirne slike"
 
 #: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Pozadina koja će se koristiti za prozirne slike."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "boja za pozadinu potpune prozirnosti"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid ""
+"Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Boja koja će se koristiti ako je pozadina za prozirne slike postavljena na "
+"jednobojno"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr "Stanje odabira za “sakrij fotografije” mogućnost"
+
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
+"Posljednje korišteno stanje odabira “sakrij fotografije koje su već uvezene” "
+"mogućnosti u stranici uvoza."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
-msgstr ""
+msgstr "odgoda"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
-msgstr ""
+msgstr "Odgoda (u sekundama) između fotografija u prezentacijama."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
-msgstr ""
+msgstr "odgoda prijelaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
+"Vrijeme (u sekundama) trajanja prijelaza između fotografija u prezentaciji."
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
-msgstr ""
+msgstr "id efekta prijelaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
+"Naziv efekta prijelaza koji će se koristiti između fotografija kada je "
+"pokrenuta prezentacija"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
-#, fuzzy
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Prikaži naziv"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
-msgstr ""
+msgstr "Treba li prikazati naslov fotografije tijekom prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
-msgstr ""
+msgstr "uvećaj prozor fototeke"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
-msgstr ""
+msgstr "Ako je odabrano, biblioteka aplikacije je uvećana."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
-msgstr ""
+msgstr "širina prozora fototeke"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
-msgstr ""
+msgstr "Posljednje spremljena širina biblioteke prozora aplikacije."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
-msgstr ""
+msgstr "visina prozora fototeke"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
-msgstr ""
+msgstr "Posljednje spremljena visina biblioteke prozora aplikacije."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
-msgstr ""
+msgstr "uvećava izravno uređivanje prozora"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
-msgstr ""
+msgstr "Ako je odabrano, aplikacija izravnog uređivanja prozora je uvećana."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
-msgstr ""
+msgstr "širina izravnog uređivanja prozora"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
-msgstr ""
+msgstr "Posljednje spremljena širina izravnog uređivanja prozora aplikacije."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
-msgstr ""
+msgstr "visina izravnog uređivanja prozora"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
-msgstr ""
+msgstr "Posljednje spremljena visina izravnog uređivanja prozora aplikacije."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
-msgstr ""
+msgstr "položaj razdjelnika bočne trake"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
 msgstr ""
+"Posljednji spremljeni položaj razdjelnika između bočne trake i prikaza "
+"fototeke prozora aplikacije."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
-msgstr ""
+msgstr "uvezi mapu"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
-msgstr ""
+msgstr "Direktorij u kojemu su smještene datoteke fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
-msgstr ""
+msgstr "nadziri mapu fototeke za nove datoteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
+"Ako je odabrano, datoteke dodane u direktorij fototeke su automatski uvezene."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
-msgstr ""
+msgstr "zapiši metapodatke u glavne datoteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
 msgstr ""
+"Ako je odabrano, promjene metapodatka (oznake, naslovi, itd.) su zapisane u "
+"glavnu datoteku fotografije."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
-msgstr ""
+msgstr "koristi mala slova u nazivima datoteka"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
 msgstr ""
+"Ako je odabrano, Shotwell će pretvoriti sva slova naziva u mala pri uvozu "
+"datoteka fotografije"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
-msgstr ""
+msgstr "uzorak direktorija"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
+"Izraz kôdiranja uzorka naziva koji će se koristiti za imenovanje direktorija "
+"fotografija pri uvozu."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
-msgstr ""
+msgstr "prilagođeni uzorak direktorija"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
+"Izraz kôdiranja uzorka prilagođenog naziva koji će se koristiti za "
+"imenovanje direktorija fotografija pri uvozu."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
-msgstr ""
+msgstr "Zadani RAW razvijatelj"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
-msgstr ""
+msgstr "Zadana mogućnost za kojeg će se RAW razvijatelja Shotwell koristiti."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
-msgstr ""
+msgstr "Izbornik odabira najčešće nedavno korištenog omjera obrezivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
+"Brojčani kôd koji predstavlja izbornik odabira nedavno korištenog omjera "
+"obrezivanja kojeg je korisnik odabrao."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
-msgstr ""
+msgstr "Najčešće nedavno korišteni brojnik prilagođenog omjera slike."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
 msgstr ""
+"Vrijednost koja nije nulta, pozitivni cijeli broj koji predstavlja širinu "
+"posljednjeg prilagođenog omjera obrezivanja kojeg je korisnik upisao."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
-msgstr ""
+msgstr "Najčešće nedavno korišteno nazivnik obrezivanja prilagođenog omjera"
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
 msgstr ""
+"Vrijednost koja nije nulta, pozitivni cijeli broj koji predstavlja visinu "
+"posljednjeg prilagođenog omjera obrezivanja kojeg je korisnik upisao."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
-msgstr ""
+msgstr "vanjski uređivač fotografija"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
-msgstr ""
+msgstr "Vanjska aplikacija korištena za uređivanje fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
-msgstr ""
+msgstr "vanjski uređivač raw datoteka"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
-msgstr ""
+msgstr "Vanjska aplikacija korištena za uređivanje RAW fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: kako obrezati slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
-msgstr ""
+msgstr "izvoz metapodataka"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: mogućnost izvoza metapodataka"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
-msgstr ""
+msgstr "postavka formata, posebna vrijednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: postavka formata, posebna vrijednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
-msgstr ""
+msgstr "postavka formata, vrsta vrijednosti"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: postavka formata, vrsta vrijednosti"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
-msgstr ""
+msgstr "Mogućnost JPEG kvalitete"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: mogućnost JPEG kvalitete"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
-msgstr ""
+msgstr "najveća veličina slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
-msgstr ""
+msgstr "Postavka dijaloga izvoza: najveća veličina slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
-msgstr ""
+msgstr "posljednja korištena usluga objavljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
+"Brojčani kôd koji predstavlja posljednju uslugu na koju su slike objavljene"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
-msgstr ""
+msgstr "zadana usluga objavljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
-msgstr ""
+msgstr "token pristupa"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
+"Facebook OAuth token za trenutnu prijavljenu sesiju, ako postoji, if any"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
-msgstr ""
+msgstr "ID korisnika"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
+"ID Facebook korisnika za trenutno prijavljenog korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
-msgstr ""
+msgstr "korisničko ime"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
-msgstr ""
+msgstr "Ime trenutno prijavljenog Facebook korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
-msgstr ""
+msgstr "Kôd zadane veličine"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
+"Brojčani kôd predstavlja zadanu veličinu za fotografije objavljene na "
+"Facebooku"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
+"Treba li sa slika koje se šalju na Facebook prvo ukloniti njihove metapodatke"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
-msgstr ""
+msgstr "OAuth token pristupa"
 
-#: 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:455
+msgid ""
+"The authorization token for the currently logged in Flickr user, if any"
+msgstr "Token ovjere za trenutno prijavljenog Flickr korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
-msgstr ""
+msgstr "Tajni token za prijavu oauth zahtjeva"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
 msgstr ""
+"Kriptografska tajna koja se koristi za prijavu zahtjeva umjesto ovjere "
+"tokena za trenutno prijavljenog Flickr korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
-msgstr ""
+msgstr "Korisničko ime trenutno prijavljenog Flickr korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
+"Brojčani kôd predstavlja zadanu veličinu za fotografije objavljene na Flickru"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
-msgstr ""
+msgstr "zadana vidljivost"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
 msgstr ""
+"Brojčani kôd koji predstavlja zadanu vidljivost za fotografije objavljene na "
+"Flickru"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
+"Treba li sa slika koje se šalju na Flickr prvo ukloniti njihove metapodatke"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
-msgstr ""
+msgstr "token osvježavanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
 msgstr ""
+"OAuth token korištena za osvježavanje sesije Picasa web albuma za trenutno "
+"prijavljenog korisnika, ako postoji."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr ""
+"Brojčani kôd koji predstavlja zadanu veličinu za fotografije poslane na "
+"Picasa web albume"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
-msgstr ""
+msgstr "posljednji album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
+"Naziv posljednjeg albuma na kojemu je korisnik objavio fotografije, ako "
+"postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
+"Treba li sa slika koje se šalju na Picasau prvo ukloniti njihove metapodatke"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
-msgstr ""
+msgstr "Piwigo URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
-msgstr ""
+msgstr "URL Piwigo poslužitelja."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
-msgstr ""
+msgstr "Piwigo korisničko ime, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
-msgstr ""
+msgstr "lozinka"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
-msgstr ""
+msgstr "Piwigo lozinka, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
-msgstr ""
+msgstr "zapamti lozinku"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
-msgstr ""
+msgstr "Ako je odabrano, zapamti Piwigo lozinku."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
-msgstr ""
+msgstr "Posljednja odabrana Piwigo kategorija"
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
-msgstr ""
+msgstr "posljednja razina dozvole"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
-msgstr ""
+msgstr "Posljednja odabrana Piwigo razina dozvole"
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
 msgstr ""
+"Brojčani kôd predstavlja zadani predložak veličine za fotografije pri "
+"objavljivanju na Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
+"Treba li sa slika koje se šalju na Piwigo prvo ukloniti njihove metapodatke"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
+"ako je naslov postavljen a komentar nije, koristi naslov kao komentar za "
+"slanje na Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
 msgstr ""
+"Trebaju li slike poslane na Piwigo imati komentar postavljen iz naslova ako "
+"naslov postoji a komentar ne postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
-msgstr ""
+msgstr "ne šalji oznake pri slanju na Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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 ""
+"Trebaju li slike poslane na Piwigo ukloniti svoje oznake pri slanju, tada se "
+"oznake neće pojaviti na udaljenom Piwigo poslužitelju."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
-msgstr ""
+msgstr "Gallery3 korisničko ime"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
-msgstr ""
+msgstr "API ključ"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
-msgstr ""
+msgstr "Gallery3 API ključ"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
-msgstr ""
+msgstr "Gallery3 URL stranice"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
+"Treba li sa slika koje se šalju na Gallery3 prvo ukloniti njihove metapodatke"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
-msgstr ""
+msgstr "ograničenje promjene veličine poslanih slika"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
-msgstr ""
+msgstr "ID ograničenja promjene veličine slika koje trebaju poslati"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
-msgstr ""
+msgstr "pikseli glavne osi poslanih slika"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
 msgstr ""
+"Pikseli glavne osi slika koje treba poslati; koristi se samo ako je ID "
+"ograničenja promjene veličine slika odgovarajuća vrijednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
 msgstr ""
+"OAuth token korišten za osvježavanje YouTube sesije za trenutno prijavljenog "
+"korisnika, ako postoji."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
-msgstr ""
+msgstr "posljedni korištena usluga uvoza"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
+"Brojčani kôd koji predstavlja posljednju uslugu iz koje su fotografije "
+"uvezene"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
-msgstr ""
+msgstr "kolačić stanja tumača"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
-msgstr ""
+msgstr "Brojčani kôd koji sprema stanje okruženja GStreamer priključka"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
-msgstr ""
+msgstr "način rasporeda sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr ""
+"Brojčani kôd koji koji opisuje kako su fotografije postavljene na stranici "
+"tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
-msgstr ""
+msgstr "ppi sadržaja"
 
-#: 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:655
+msgid ""
+"The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr "Broj piksela po inču (ppi) poslanih u pisač tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
-msgstr ""
+msgstr "širina sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
-msgstr ""
+msgstr "Širina ispisane emulzije na stranici tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
-msgstr ""
+msgstr "visina sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
-msgstr ""
+msgstr "Visina ispisane emulzije na stranici tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
-msgstr ""
+msgstr "jedinica sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
 msgstr ""
+"Brojčani kôd koji predstavlja mjernu jedinicu (inči ili centimetri) "
+"korištenu tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
-msgstr ""
+msgstr "broj fotografija po stranici"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
 msgstr ""
+"Brojčani kôd koji predstavlja broj fotografija po stranici tijekom ispisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
-msgstr ""
+msgstr "odabir veličine"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
+"Sadržaj trenutne veličine ispisa u unaprijed određenom popisu standardnih "
+"veličina"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
-msgstr ""
+msgstr "poklapa sa omjerom slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
 msgstr ""
+"Određuje treba li se prilagođena veličina ispisa mora poklapati sa omjerom "
+"slike izvorne fotografije"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
-msgstr ""
+msgstr "ispisuje naslove"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
+"Ako je odabrano, naslov fotografije će se ispisati kada se fotografija "
+"ispisuje."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
-msgstr ""
+msgstr "slova naslova"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
-msgstr ""
+msgstr "Naziv slova koja se koriste za naslove fotografija tijekom ispisa."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
-msgstr ""
+msgstr "omogući priključak facebook objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Facebook objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
-msgstr ""
+msgstr "omogući priključak flickr objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Flickr objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
-msgstr ""
+msgstr "omogući priključak picasa objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak Picasa web albuma objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
-msgstr ""
+msgstr "omogući priključak flickr objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak YouTube objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
-msgstr ""
+msgstr "omogući priključak piwigo objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Piwigo objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
-msgstr ""
+msgstr "omogući priključak yandex objvaljivanja"
 
-#: 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:745
+msgid ""
+"True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr "Ako je odabrano, priključak Yandex.Fotki objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
-msgstr ""
+msgstr "omogući priključak tumblr objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Tumblr objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
-msgstr ""
+msgstr "omogući priključak rajce objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Rajce objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
-msgstr ""
+msgstr "omogući priključak gallery3 objvaljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak Gallery3 objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
-msgstr ""
+msgstr "omogući priključak F-Spot uvoza"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
-msgstr ""
+msgstr "Ako je odabrano, priključak F-Spot objavljivanja je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
-msgstr ""
+msgstr "omogućuju raspad prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak raspada prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
-msgstr ""
+msgstr "omogući izbljeđivanje prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak izbljeđivanja prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
-msgstr ""
+msgstr "omogući klizanje prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak klizanja prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
-msgstr ""
+msgstr "omogući satni prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak satnog prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
-msgstr ""
+msgstr "omogući kružni prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak kružnog prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
-msgstr ""
+msgstr "omogućuju kružni prijelaz prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak kružnih prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
-msgstr ""
+msgstr "omogućuju zasjenjeni prijelaz prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak zasjenjenog prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
-msgstr ""
+msgstr "omogućuju kvadratni prijelaz prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak kvadratnog prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
-msgstr ""
+msgstr "omogućuju trakasti prijelaz prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
+"Ako je odabrano, priključak trakastog prijelaza prezentacije je omogućen"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
-msgstr ""
+msgstr "omogućuju šahovski prijelaza prezentacije"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
 msgstr ""
+"Ako je odabrano, priključak šahovskog prijelaza prezentacije je omogućen"
 
 #: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
 msgid ""
@@ -1247,6 +1379,12 @@ msgid ""
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
 msgstr ""
+"Trenutno niste prijavljenu u Facebook.\n"
+"\n"
+"Ukoliko nemafe Facebook korisnički račun možete ga stvoriti kroz proces "
+"prijave. Kod prijave, Shotwell Connect vas može tražiti dopuštenja za slanje "
+"fotografija i objavu u vašim Novostima. Ta dopuštenja su nužna za "
+"funkcioniranje Shotwell Connecta."
 
 #: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
 msgid ""
@@ -1255,52 +1393,36 @@ msgid ""
 "To continue publishing to Facebook, quit and restart Shotwell, then try "
 "publishing again."
 msgstr ""
+"Već ste se prijavili i odjavili s Facebooka tijekom korištenja Shotwella.\n"
+"Za nastavak objavljivanja na Facebooku, zatvorite i ponovno pokrenite "
+"Shotwell, zatim probajte ponovno objaviti."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-#, fuzzy
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Upiši potvrdni broj koji se pojavi nakon što se prijavite na Flickr putem "
-"vašeg web preglednika."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-#, fuzzy
-msgid "Authorization _Number:"
-msgstr "_Broj ovlasti:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-#, fuzzy
-msgid "Con_tinue"
-msgstr "_Nastavi"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
 "Click Log in to log into Flickr in your Web browser. You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
+"Trenutno niste prijavljeni na Flickr.\n"
+"\n"
+"Kliknite na \"Prijava\" kako biste se prijavili na Flickr putem web "
+"preglednika. Morati ćete ovlastiti Shotwell Connect kako biste se povezali "
+"na vaš Flickr račun."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
-msgstr ""
+msgstr "Pripremanje za prijavu…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Neuspjela Flickr ovjera"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
-msgstr ""
+msgstr "Provjeravanje ovjere…"
 
 #: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
-#, fuzzy
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1313,16 +1435,20 @@ msgstr ""
 "Za nastavak objavljivanja u Googlove usluge, ponovno pokrenite Shotwell i "
 "pokušajte ponovno objaviti."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
 "Click Log in to log into Picasa Web Albums in your Web browser. You will "
 "have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
+"Trenutno niste prijavljeni na Picasa web album.\n"
+"\n"
+"Kliknite na \"Prijava\" kako biste se prijavili u Picasa web albume u vašem "
+"web pregledniku. Morati ćete ovlastiti Shotwell Connect kako biste se "
+"povezali na vaš račun Picasa web albuma."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
-#, fuzzy
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1336,13 +1462,51 @@ msgstr ""
 "je podešen za korištenje istog. Za podešavanje računa, prijavite se barem "
 "jednom na YouTube uslugu sa svojim Google korisničkim računom."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_Adresa e-pošte"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Lozinka"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Prijava"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Upišite korisničko ime i lozinku povezanu s Tumblr računom."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Korisničko ime/lozinka nisu ispravni. Pokušajte ponovno"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Neispravno korisničko ime ili lozinka"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Neuspješno učitavanje korisničkog sučelja: %s"
+
 #: plugins/common/Resources.vala:12
-#, fuzzy
 msgid "Visit the Shotwell home page"
 msgstr "Posjetite Shotwell web stranicu"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
-#, fuzzy
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Krešo Kunjas <deresh@gmail.com>\n"
@@ -1357,268 +1521,161 @@ msgstr ""
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
+"⚫ Ova web stranica je predstavila identifikaciju koja pripada drugoj web "
+"stranici."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
 msgstr ""
+"⚫ Identifikacija ove web stranice je prestara da bi joj se vjerovalo. "
+"Provjerite datum na svojemu računalu."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
+"⚫ Identifikacija ove web stranice nije izdana od strane ovjerene "
+"organizacije."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
+"⚫ Identifikacija ove web stranice se ne može nastaviti. Možda je oštećena."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
 msgstr ""
+"⚫ Identifikacija ove web stranice je opozvana od strane ovjerene "
+"organizacije koja ju je izdala."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
 msgstr ""
+"⚫ Identifikaciji ove web stranice se ne može vjerovati jer koristi vrlo "
+"slabo šifriranje."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
 msgstr ""
+"⚫ Identifikacija ove web stranice je valjana samo za buduće datume. "
+"Provjerite datum na svojemu računalu."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
-#, fuzzy
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Privremena datoteka, potrebna za objavu, nije dostupna."
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-#, fuzzy
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Dobrodošli u uslugu za uvoz fototeke iz F-Spota.\n"
-"\n"
-"Odaberite fototeku za uvoz, odabirući jednu od fototeka koju je već otkrio "
-"Shotwell ili odabirući alternativnu datoteku F-Spot baze podataka."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-#, fuzzy
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Dobrodošli u uslugu za uvoz fototeke iz F-Spota.\n"
-"\n"
-"Odaberite datoteku F-Spot baze podataka."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-#, fuzzy
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Ručno odredi uvoz datoteke F-Spot baze podataka:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-#, fuzzy
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Nemoguće otvoriti odabranu datoteku F-Spot baze podataka: datoteka ne "
-"postoji ili nije F-Spot baza podataka"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-#, fuzzy
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Nemoguće otvoriti odabranu datoteku F-Spot baze podataka: ovu inačicu F-Spot "
-"baze podataka Shotwell ne podržava"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-#, fuzzy
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Nemoguće pročitati odabranu datoteku F-Spot baze podataka: greška pri "
-"čitanju tablice oznaka"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-#, fuzzy
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Nemoguće pročitati odabranu datoteku F-Spot baze podataka: greška pri "
-"čitanju tablice fotografija"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, fuzzy, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell je pronašao %d fotografija u F-Spot fototeci te ih trenutno uvozi. "
-"Duplikati će se automatski otkriti i ukloniti.\n"
-"\n"
-"Možete zatvoriti ovaj okvir i započeti s korištenjem Shotwell dok se uvoz "
-"obavlja u pozadini."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, fuzzy, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot fototeka: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-#, fuzzy
-msgid "Preparing to import"
-msgstr "Pripremanje za uvoz"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-#, fuzzy
-msgid "Core Data Import Services"
-msgstr "Usluge za uvoz ključnih podataka"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
-#, fuzzy
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
-#, fuzzy
 msgid "_User name:"
 msgstr "_Korisničko ime:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
-#, fuzzy
 msgid "_Password:"
 msgstr "_Lozinka:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
-#, fuzzy
 msgid "Go _Back"
 msgstr "_Povratak"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
-msgstr ""
+msgstr "_Prijava"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
-#, fuzzy
 msgid "API _Key:"
 msgstr "API _ključ:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
-#, fuzzy
 msgid "An _existing album"
 msgstr "Postojeći _ album"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
-#, fuzzy
 msgid "A _new album"
 msgstr "Novi _album"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
-#, fuzzy
 msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "_Ukloni lokaciju, oznaku i podatke identifikacije kamere prije slanja"
+msgstr ""
+"_Ukloni lokaciju, oznaku i podatke identifikacije kamere prije slanja"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
-#, fuzzy
 msgid "Scaling constraint:"
 msgstr "Ograničenje promjene veličine:"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
-#, fuzzy
 msgid "pixels"
 msgstr "pikseli"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
-#, fuzzy
 msgid "Original size"
-msgstr "Originalna veličina"
+msgstr "Izvorna veličina"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-#, fuzzy
-msgid "Width or height"
-msgstr "Širina ili visina"
+msgid "Longest edge"
+msgstr "Dulji rub"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-#, fuzzy
 msgid "_Logout"
 msgstr "_Odjava"
 
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
-#, fuzzy
 msgid "_Publish"
 msgstr "_Objavi"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
-#, fuzzy
 msgid "Gallery3 publishing module"
 msgstr "Gallery3 modul objavljivanja"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-#, fuzzy
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -1631,7 +1688,6 @@ msgstr ""
 "prijave."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-#, fuzzy
 msgid "Shotwell default directory"
 msgstr "Shotwell zadana mapa"
 
@@ -1643,9 +1699,12 @@ msgid ""
 "The file “%s” may not be supported by or may be too large for this instance "
 "of Gallery3."
 msgstr ""
+"\n"
+"\n"
+"Datoteka \"%s\" možda nije podržana ili je prevelika za ovaj primjerak "
+"Gallery3."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
-#, fuzzy
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
@@ -1660,16 +1719,17 @@ msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objavljivanje na %s se ne "
+"može nastaviti."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
-#, fuzzy, c-format
+#, c-format
 msgid "Publishing to %s as %s."
 msgstr "Objavljivanje na %s kao %s."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
-#, fuzzy
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -1678,7 +1738,6 @@ msgstr ""
 "za vaš Gallery3 račun."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
-#, fuzzy
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -1687,7 +1746,6 @@ msgstr ""
 "ponovno, ponovno upišite svoje korisničko ime i lozinku ispod."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
-#, fuzzy
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -1697,253 +1755,129 @@ msgstr ""
 "je ispravno upisan i ne sadrži zaostale komponente (npr., index.php)."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
-#, fuzzy
 msgid "Unrecognized User"
 msgstr "Korisnik nije prepoznat"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
-#, fuzzy
 msgid " Site Not Found"
 msgstr " Stranica nije pronađena"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-#, fuzzy
-msgid "_Email address"
-msgstr "_Adresa e-pošte"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-#, fuzzy
-msgid "_Password"
-msgstr "_Lozinka"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
-#, fuzzy
 msgid "_Remember"
 msgstr "_Zapamti"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#, fuzzy
 msgid "An _existing album:"
 msgstr "_Postojećem albumu:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#, fuzzy
 msgid "A _new album named:"
 msgstr "_Novom albumu naziva:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
-#, fuzzy
 msgid "_Hide album"
 msgstr "_Sakrij album"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#, fuzzy
 msgid "Open target _album in browser"
 msgstr "Otvori odredišni _album u pregledniku."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
 msgid "Copyright © 2013 rajce.net"
-msgstr ""
+msgstr "Autorsko pravo (C) 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
-#, fuzzy
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr "Došlo je do greške pri objavi na Rajce. Pokušajte ponovno."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
-#, fuzzy
 msgid "Enter email and password associated with your Rajce account."
 msgstr "Upišite adresu e-pošte povezanu s vašem Rajce računom."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
-#, fuzzy
 msgid "Invalid email and/or password. Please try again"
 msgstr "Neispravna adresa e-pošte/ili lozinka. Pokušajte ponovno"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
-#, fuzzy
 msgid "Invalid User Email or Password"
 msgstr "Neispravna adresa e-pošte korisnika ili lozinka"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#, fuzzy, c-format
+#, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Prijavljeni ste na Rajce kao %s."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: plugins/shotwell-publishing/PicasaPublishing.vala:571
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
-#, fuzzy
 msgid "Photos will appear in:"
 msgstr "Fotografije će biti objavljene u:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
-#, fuzzy
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell dodatne usluge objave"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-#, fuzzy
-msgid "Blogs:"
-msgstr "Blogovi:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-#, fuzzy
-msgid "Photo _size:"
-msgstr "_Veličina fotografija:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-#, fuzzy
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Autorsko pravo 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#, fuzzy
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Upišite korisničko ime i lozinku povezanu s Tumblr računom."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-#, fuzzy
-msgid "Username and/or password invalid. Please try again"
-msgstr "Korisničko ime/lozinka nisu ispravni. Pokušajte ponovno"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-#, fuzzy
-msgid "Invalid User Name or Password"
-msgstr "Neispravno korisničko ime ili lozinka"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, fuzzy, c-format
-msgid "Could not load UI: %s"
-msgstr "Neuspješno učitavanje korisničkog sučelja: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, fuzzy, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Prijavljeni ste na Tumblr kao %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
-#, fuzzy
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Sva prava pridržana 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
-#, fuzzy
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Posjeti Yandex.Fotki internet stranicu"
 
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
-#, fuzzy
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Trenutno niste prijavljeni u Yandex.Fotki."
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
-#, fuzzy
 msgid "Public"
 msgstr "Javna"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
 #: plugins/shotwell-publishing/FacebookPublishing.vala:888
-#, fuzzy
 msgid "Friends"
 msgstr "Prijatelji"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
 #: plugins/shotwell-publishing/YouTubePublishing.vala:378
-#, fuzzy
 msgid "Private"
 msgstr "Privatna"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
-#, fuzzy
 msgid "_Albums (or write new):"
 msgstr "_Albumi ( ili napravi novi):"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
-#, fuzzy
 msgid "Access _type:"
 msgstr "Način _pristupa:"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
-#, fuzzy
 msgid "Disable _comments"
 msgstr "Onemogući _komentare"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
-#, fuzzy
 msgid "_Forbid downloading original photo"
 msgstr "_Zabrani preuzimanje izvorne fotografije"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
-#, fuzzy
 msgid "Publish to an e_xisting album:"
 msgstr "Objavi u _postojećem albumu:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
-#, fuzzy
 msgid "Create a _new album named:"
 msgstr "Stvori _novi album naziva:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
 #: plugins/shotwell-publishing/FacebookPublishing.vala:725
-#, fuzzy
 msgid "Upload _size:"
 msgstr "Veličina _slanja:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
-#, fuzzy
 msgid "Videos and new photo albums _visible to:"
 msgstr "Video snimke i novi albumi s fotografijama su vidljivi:"
 
@@ -1951,41 +1885,47 @@ msgstr "Video snimke i novi albumi s fotografijama su vidljivi:"
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
-#, fuzzy
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 "_Ukloni lokaciju, kameru, i ostale informacije identifikacije prije slanja"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Autorsko pravo 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
-#, fuzzy
 msgid "Shotwell Connect"
 msgstr "Shotwell Connect"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:81
-#, fuzzy
 msgid "Standard (720 pixels)"
 msgstr "Standardno ( 720 piksela )"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:84
-#, fuzzy
 msgid "Large (2048 pixels)"
 msgstr "Veliko ( 2048 piksela )"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
-msgstr ""
+msgstr "Stvaranje albuma…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objava na Facebooku se ne "
+"može nastaviti."
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:723
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
@@ -1994,25 +1934,35 @@ msgstr ""
 "\n"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:724
-#, fuzzy
 msgid "Where would you like to publish the selected photos?"
 msgstr "Želite li objaviti odabrane fotografije?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Samo meni"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
-#, fuzzy
 msgid "Everyone"
 msgstr "Svima"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
-#, fuzzy, c-format
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Veličina fotografija:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objava na Flickru se ne "
+"može nastaviti."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
+#, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
@@ -2020,61 +1970,68 @@ msgstr ""
 "Prijavljeni ste na Flickr kao %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month you have %s remaining in your upload quota."
 msgstr ""
+"Vaš besplatan Flickr račun ima ograničenje koliko podataka možete poslati "
+"mjesečno.\n"
+"Ovaj mjesec vam je preostalo %s od vaše kvote slanja."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "Vaš Flickr Pro korisnički račun nema ograničenje mjesečnog slanja podataka."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotografije _vidljive:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Video snimke _vidljive:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotografije i video snimke _vidljive:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Samo prijateljima i obitelji"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Samo obitelji"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
-#, fuzzy
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Samo prijateljima"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 x 375 piksela"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 x 768 piksela"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
-msgstr ""
+msgstr "2048 x 1536 piksela"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
-msgstr ""
+msgstr "4096 x 3072 piksela"
 
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
-#, fuzzy
 msgid "Photo _size preset:"
 msgstr "Predlošci veličina fotografija:"
 
@@ -2084,114 +2041,109 @@ msgstr "Predlošci veličina fotografija:"
 #: plugins/shotwell-publishing/PicasaPublishing.vala:96
 #: plugins/shotwell-publishing/PicasaPublishing.vala:630
 msgid "Default album"
-msgstr ""
+msgstr "Zadani album"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objava na Picasu se ne "
+"može nastaviti."
 
 #. populate any widgets whose contents are programmatically-generated.
 #: plugins/shotwell-publishing/PicasaPublishing.vala:560
-#, fuzzy, c-format
+#, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Prijavljeni ste u Picasa Web album kao %s."
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:566
-#, fuzzy
 msgid "Videos will appear in:"
 msgstr "Video snimke će se objaviti u:"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
-msgstr ""
+msgstr "Mala ( 640 x 480 piksela)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
-msgstr ""
+msgstr "Srednja (1024 x 768 piksela)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
-msgstr ""
+msgstr "Preporučeno ( 1600 x 1200 piksela )"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
-msgstr ""
+msgstr "Google+ (2048 x 1536 piksela)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Izvorna veličina"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
-#, fuzzy
 msgid "_URL of your Piwigo photo library"
 msgstr "_URL vaše Piwigo fototeke slika"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
-#, fuzzy
 msgid "User _name"
 msgstr "Korisničko _ime"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
 msgid "Remember Password"
-msgstr ""
+msgstr "Zapamti lozinku"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
 msgid "An _existing category"
-msgstr ""
+msgstr "_Postojećoj kategoriji"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
 msgid "A _new album named"
-msgstr ""
+msgstr "_Novom albumu naziva"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
 msgid "within category"
-msgstr ""
+msgstr "unutar kategorije"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
 msgid "Album comment"
-msgstr ""
+msgstr "Komentar albuma"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
 msgid "Photos will be _visible by"
-msgstr ""
+msgstr "Fotografije će biti _vidljive"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
 msgid "Photo size"
-msgstr ""
+msgstr "Veličina fotografije"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
-#, fuzzy
 msgid "_If a title is set and comment unset, use title as comment"
-msgstr "_Ako je naslov postavljen a komentar nije, koristi naslov kao komentar"
+msgstr ""
+"_Ako je naslov postavljen a komentar nije, koristi naslov kao komentar"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
-#, fuzzy
 msgid "_Do no upload tags"
 msgstr "_Ne šalji oznake"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
-#, fuzzy
 msgid "Logout"
 msgstr "Odjava"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
-#: src/Resources.vala:295 ui/collection.ui:190
-#, fuzzy
+#: src/Resources.vala:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Objavi"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
-msgstr ""
+msgstr "Stvaranje albuma %s…"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:946
-#, fuzzy
-msgid "An error message occurred when publishing to Piwigo. Please try again."
+msgid ""
+"An error message occurred when publishing to Piwigo. Please try again."
 msgstr "Nastala je greška prilikom prijave na Piwigo. Pokušajte ponovno."
 
 #. %s is the host name that we tried to connect to
@@ -2202,20 +2154,22 @@ msgid ""
 "steal or alter information going to or from this site (for example, private "
 "messages, credit card information, or passwords)."
 msgstr ""
+"Ovo ne izgleda kao stvaran <b>%s</b>. Napadači možda pokušavaju ukrasti ili "
+"promijeniti informacije koje odlaze ili dolaze sa ove stranice (na primjer, "
+"privatne poruke, informacije kreditnih kartica ili lozinke)."
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
 #, c-format
 msgid "Certificate of %s"
-msgstr ""
+msgstr "Vjerodajnica od %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:166
-#, fuzzy
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_U redu"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
-#, fuzzy
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2224,7 +2178,6 @@ msgstr ""
 "računa za tu fototeku."
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
-#, fuzzy
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2233,49 +2186,70 @@ msgstr ""
 "upisali"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
-#, fuzzy
 msgid "Invalid URL"
 msgstr "Nevažeći URL"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
-#, fuzzy
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratori, Obitelj, Prijatelji, Kontakti"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
-#, fuzzy
 msgid "Admins, Family, Friends"
 msgstr "Administratori, prijatelji, obitelj"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
-#, fuzzy
 msgid "Admins, Family"
 msgstr "Administratori, obitelj"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
-#, fuzzy
 msgid "Admins"
 msgstr "Administratori"
 
 #: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
 msgid "This connection is not secure"
-msgstr ""
+msgstr "Ovo povezivanje nije sigurno"
 
 #: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
 msgid "Show the certificate…"
-msgstr ""
+msgstr "Prikaži vjerodajnicu"
 
 #: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
 msgid "I understand, please _proceed."
-msgstr ""
+msgstr "Razumijem, molim _nastavi."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
-#, fuzzy
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Jezgra usluge za objavu"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogovi:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Autorsko pravo 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 x 853 piksela"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start(): je nemoguće pokrenuti; ovaj izdavač se ne može "
+"ponovno pokrenuti."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Prijavljeni ste na Tumblr kao %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-#, fuzzy
 msgid "Video privacy _setting:"
 msgstr "Postavke _privatnosti video snimki:"
 
@@ -2284,59 +2258,51 @@ msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
+"Datoteka potrebna za objavljivanje je nedostupna. Objava na Youtube se ne "
+"može nastaviti."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:344
-#, fuzzy, c-format
+#, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Prijavljeni ste u YouTube kao %s."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:376
-#, fuzzy
 msgid "Public listed"
 msgstr "Javno dostupan"
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:377
-#, fuzzy
 msgid "Public unlisted"
 msgstr "Javno, ali nedostupan"
 
 #: plugins/shotwell-transitions/BlindsEffect.vala:20
-#, fuzzy
 msgid "Blinds"
 msgstr "Zastor"
 
 #: plugins/shotwell-transitions/ChessEffect.vala:20
-#, fuzzy
 msgid "Chess"
 msgstr "Šah"
 
 #: plugins/shotwell-transitions/CircleEffect.vala:20
-#, fuzzy
 msgid "Circle"
 msgstr "Krug"
 
 #: plugins/shotwell-transitions/CirclesEffect.vala:20
-#, fuzzy
 msgid "Circles"
 msgstr "Krugovi"
 
 #: plugins/shotwell-transitions/ClockEffect.vala:20
-#, fuzzy
 msgid "Clock"
 msgstr "Sat"
 
 #: plugins/shotwell-transitions/CrumbleEffect.vala:20
-#, fuzzy
 msgid "Crumble"
 msgstr "Raspadanje"
 
 #: plugins/shotwell-transitions/FadeEffect.vala:20
-#, fuzzy
 msgid "Fade"
 msgstr "Izblijedi"
 
 #: plugins/shotwell-transitions/shotwell-transitions.vala:28
-#, fuzzy
 msgid "Core Slideshow Transitions"
 msgstr "Jezgra prezentacijskog prijelaza"
 
@@ -2345,84 +2311,79 @@ msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
 msgstr ""
+"Autorsko pravo 2010 Maxim Kartashev, Autorsko pravo 2016 Software Freedom "
+"Conservancy Inc."
 
 #: plugins/shotwell-transitions/SlideEffect.vala:20
-#, fuzzy
 msgid "Slide"
 msgstr "Prezentacija"
 
 #: plugins/shotwell-transitions/SquaresEffect.vala:20
-#, fuzzy
 msgid "Squares"
 msgstr "Kvadrati"
 
 #: plugins/shotwell-transitions/StripesEffect.vala:20
-#, fuzzy
 msgid "Stripes"
 msgstr "Trake"
 
 #: src/AppDirs.vala:64 src/AppDirs.vala:115
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "Nemoguće čitanje mape predmemorije %s: %s"
 
 #: src/AppDirs.vala:74 src/AppDirs.vala:104
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "Nemoguće stvaranje mape podataka %s: %s"
 
 #. If XDG yarfed, use ~/Pictures
 #: src/AppDirs.vala:168
-#, fuzzy
 msgid "Pictures"
 msgstr "Fotografije"
 
 #: src/AppDirs.vala:206
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Nemoguće stvaranje privremene mape %s: %s"
 
 #: src/AppDirs.vala:223 src/AppDirs.vala:254
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Nemoguće stvaranje podmape podataka %s: %s"
 
 #: src/AppDirs.vala:236
-#, fuzzy, c-format
+#, c-format
 msgid "Could not make directory %s writable"
 msgstr "Nemoguće postaviti mapu %s kao zapisivu"
 
 #: src/AppDirs.vala:239
-#, fuzzy, c-format
+#, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr "Nemoguće postaviti mapu %s kao zapisivu: %s"
 
 #: src/AppWindow.vala:47
-#, fuzzy
 msgid "Pin Toolbar"
 msgstr "Prikvaći traku sa alatima"
 
 #: src/AppWindow.vala:48
-#, fuzzy
 msgid "Pin the toolbar open"
 msgstr "Otkvaći traku sa alatima"
 
 #: src/AppWindow.vala:53
-#, fuzzy
 msgid "Leave fullscreen"
 msgstr "Napusti cjelozaslonski prikaz"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:157
-#, fuzzy
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2430,116 +2391,113 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Greška pri pristupanju Shotwell fototeci. Shotwell ne može nastaviti s "
+"radom.\n"
+"\n"
+"%s"
 
-#: src/AppWindow.vala:599
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
-msgstr ""
+msgstr "Posjetite Shotwell web stranicu"
 
-#: src/AppWindow.vala:611
-#, fuzzy, c-format
+#: src/AppWindow.vala:620
+#, c-format
 msgid "Unable to display help: %s"
 msgstr "Nemoguć prikaz pomoći: %s"
 
-#: src/AppWindow.vala:619
-#, fuzzy, c-format
+#: src/AppWindow.vala:628
+#, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nemoguće upravljanje bazom podataka greške: %s"
 
-#: src/AppWindow.vala:627
-#, fuzzy, c-format
+#: src/AppWindow.vala:636
+#, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nemoguć prikaz često postavljanih pitanja: %s"
 
 #: src/BatchImport.vala:26
-#, fuzzy
 msgid "Success"
 msgstr "Uspješno"
 
 #: src/BatchImport.vala:29
-#, fuzzy
 msgid "File error"
 msgstr "Greška datoteke"
 
 #: src/BatchImport.vala:32
-#, fuzzy
 msgid "Unable to decode file"
 msgstr "Nemoguće dekôdiranje datoteke"
 
 #: src/BatchImport.vala:35
-#, fuzzy
 msgid "Database error"
 msgstr "Greška baze podataka"
 
 #: src/BatchImport.vala:38
-#, fuzzy
 msgid "User aborted import"
 msgstr "Prekinut uvoz od strane korisnika"
 
 #: src/BatchImport.vala:41
-#, fuzzy
 msgid "Not a file"
 msgstr "Nije datoteka"
 
 #: src/BatchImport.vala:44
-#, fuzzy
 msgid "File already exists in database"
 msgstr "Datoteka već postoji u bazi podataka"
 
 #: src/BatchImport.vala:47
-#, fuzzy
 msgid "Unsupported file format"
 msgstr "Nepodržani format datoteke"
 
 #: src/BatchImport.vala:50
-#, fuzzy
 msgid "Not an image file"
 msgstr "Nije datoteka fotografije"
 
 #: src/BatchImport.vala:53
-#, fuzzy
 msgid "Disk failure"
 msgstr "Greška diska"
 
 #: src/BatchImport.vala:56
-#, fuzzy
 msgid "Disk full"
 msgstr "Disk je pun"
 
 #: src/BatchImport.vala:59
-#, fuzzy
 msgid "Camera error"
 msgstr "Greška kamere"
 
 #: src/BatchImport.vala:62
-#, fuzzy
 msgid "File write error"
 msgstr "Greška pri zapisivanju"
 
 #: src/BatchImport.vala:65
-#, fuzzy
 msgid "Corrupt image file"
 msgstr "Oštećena datoteka slike"
 
 #: src/BatchImport.vala:68
-#, fuzzy, c-format
+#, c-format
 msgid "Imported failed (%d)"
 msgstr "Neuspješni uvoz (%d)."
 
-#: src/camera/Branch.vala:85
-#, fuzzy
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kamere"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
-#: 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
-#, fuzzy
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Popis otkrivenih uređaja kamere"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
-#, fuzzy
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
@@ -2547,67 +2505,67 @@ msgstr "RAW+JPEG"
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
+"Nemoguće odmontirati kameru. Pokušajte je odmontirati iz upravitelja "
+"datoteka."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
-#, fuzzy
+#: src/camera/ImportPage.vala:798
 msgid "Hide photos already imported"
 msgstr "Sakrij fotografije koje su već uvezene."
 
-#: src/camera/ImportPage.vala:784
-#, fuzzy
+#: src/camera/ImportPage.vala:799
 msgid "Only display photos that have not been imported"
 msgstr "Prikaži samo fotografije koje nisu uvezene."
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
-#, fuzzy
+#: src/camera/ImportPage.vala:838 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Uvezi _odabrane"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
-#, fuzzy
+#: src/camera/ImportPage.vala:848 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Uvezi _sve"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:872
 msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr ""
+msgstr "Izgleda da je kamera prazna. Nema fotografija/video snimaka za uvoz"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:876
 msgid "No new photos/videos found on camera"
-msgstr ""
+msgstr "Nema pronađenih novih fotografija/video snimaka na kameri"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1047
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr ""
+"Shotwell treba odmontirati kameru iz datotečnog sustava kako bi joj mogao "
+"pristupiti. Želite li nastaviti?"
 
-#: src/camera/ImportPage.vala:1027
-#, fuzzy
+#: src/camera/ImportPage.vala:1053
 msgid "_Unmount"
 msgstr "_Odmontiraj"
 
-#: src/camera/ImportPage.vala:1032
-#, fuzzy
+#: src/camera/ImportPage.vala:1058
 msgid "Please unmount the camera."
 msgstr "Odmontirajte kameru."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1063
 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 ""
+"Druga aplikacija koristi kameru. Shotwell može koristiti kameru samo kad je "
+"ni jedna druga aplikacija ne koristi. Zatvorite druge aplikacije koje bi "
+"mogle koristiti kameru, te nakon toga pokušajte ponovno."
 
-#: src/camera/ImportPage.vala:1047
-#, fuzzy
+#: src/camera/ImportPage.vala:1073
 msgid "Please close any other application using the camera."
 msgstr "Zatvorite druge aplikacije koje bi mogle koristiti kameru."
 
-#: src/camera/ImportPage.vala:1052
-#, fuzzy, c-format
+#: src/camera/ImportPage.vala:1078
+#, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
 "%s"
@@ -2615,296 +2573,261 @@ msgstr ""
 "Nemoguće preuzeti predpregled s kamere: \n"
 " %s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1095
 msgid "Unmounting…"
-msgstr ""
+msgstr "Odmontiravanje…"
+
+#: src/camera/ImportPage.vala:1188
+msgid "Connecting to camera, please wait…"
+msgstr "Povezivanje s kamerom, malo pričekajte…"
 
-#: src/camera/ImportPage.vala:1160
+#. reset claim_timeout to initial value
+#: src/camera/ImportPage.vala:1223
 msgid "Starting import, please wait…"
-msgstr ""
+msgstr "Pokretanje uvoza, pričekajte…"
 
-#: src/camera/ImportPage.vala:1177
-#, fuzzy
+#: src/camera/ImportPage.vala:1229
 msgid "Fetching photo information"
 msgstr "Preuzimanje informacija fotografija"
 
-#: src/camera/ImportPage.vala:1535
-#, fuzzy, c-format
+#: src/camera/ImportPage.vala:1590
+#, c-format
 msgid "Fetching preview for %s"
 msgstr "Preuzimanje predpregleda za %s"
 
-#: src/camera/ImportPage.vala:1651
-#, fuzzy, c-format
+#: src/camera/ImportPage.vala:1701
+#, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nemoguće zaključavanje kamere: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1787
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obriši ovu %d fotografiju iz kamere?"
+msgstr[1] "Obriši ove %d fotografije iz kamere?"
+msgstr[2] "Obriši ovih %d fotografija iz kamere?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1790
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obriši ovu %d video snimku iz kamere?"
+msgstr[1] "Obriši ove %d video snimke iz kamere?"
+msgstr[2] "Obriši ovih %d video snimaka iz kamere?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1793
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obriši ovu %d fotografiju/video snimu iz kamere?"
+msgstr[1] "Obriši ove %d fotografije/video snimke iz kamere?"
+msgstr[2] "Obriši ovih %d fotografija/video snimaka iz kamere?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1796
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Obriši ovu %d datoteku iz kamere?"
+msgstr[1] "Obriši ove %d datoteke iz kamere?"
+msgstr[2] "Obriši ovih %d datoteka iz kamere?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
-#, fuzzy
+#: src/camera/ImportPage.vala:1804 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: src/camera/ImportPage.vala:1772
-#, fuzzy
+#: src/camera/ImportPage.vala:1823
 msgid "Removing photos/videos from camera"
 msgstr "Uklanjanje fotografija/video snimaka s kamere"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1827
 #, 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."
+msgid_plural ""
+"Unable to delete %d photos/videos from the camera due to errors."
 msgstr[0] ""
+"Nemoguće brisanje %d fotografije/video snimke iz kamere zbog grešaka."
 msgstr[1] ""
+"Nemoguće brisanje %d fotografije/video snimke iz kamere zbog grešaka."
 msgstr[2] ""
+"Nemoguće brisanje %d fotografija/video snimaka iz kamere zbog grešaka."
 
 #: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
-#: src/PhotoPage.vala:2464 src/Resources.vala:170
-#, fuzzy
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
 msgid "_Print"
 msgstr "_Ispis"
 
-#: src/CollectionPage.vala:83 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
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
-msgstr ""
+msgstr "Pošalji _u…"
 
 #: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
-#: src/PhotoPage.vala:2474 src/Resources.vala:220
-#, fuzzy
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
 msgid "Set as _Desktop Background"
 msgstr "Postavi kao pozadinu _radne površine"
 
-#: src/CollectionPage.vala:92 src/Resources.vala:286
-#, fuzzy
+#: src/CollectionPage.vala:92 src/Resources.vala:287
 msgid "_Duplicate"
 msgstr "_Duplikat"
 
 #: src/CollectionPage.vala:100
-#, fuzzy
 msgid "Fullscreen"
 msgstr "Cijeli zaslon"
 
 #: src/CollectionPage.vala:102 ui/photo.ui:180
-#, fuzzy
 msgid "S_lideshow"
 msgstr "P_rezentacija"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
 #: ui/photo.ui:200
-#, fuzzy
 msgid "Rotate _Right"
 msgstr "Zakreni _desno"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
 #: ui/photo.ui:205
-#, fuzzy
 msgid "Rotate _Left"
 msgstr "Zakreni _lijevo"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
 #: ui/photo.ui:210
-#, fuzzy
 msgid "Flip Hori_zontally"
 msgstr "Okreni _vodoravno"
 
-#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
 #: ui/photo.ui:214
-#, fuzzy
 msgid "Flip Verti_cally"
 msgstr "Okreni _okomito"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:186 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
-#, fuzzy
 msgid "_Enhance"
 msgstr "_Poboljšaj"
 
-#: src/CollectionPage.vala:120 src/Resources.vala:214 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
-#, fuzzy
 msgid "Re_vert to Original"
 msgstr "_Vrati na izvorno"
 
-#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
-#, fuzzy
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Kopiraj prilagodbe boje"
 
-#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
-#, fuzzy
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Zalijepi prilagodbe boje"
 
 #: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
-msgstr ""
+msgstr "Prilagodi datum i vrijeme"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:319
-#, fuzzy
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Otvori s v_anjskim uređivačem"
 
-#: src/CollectionPage.vala:146 src/Resources.vala:321 ui/collection.ui:111
-#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
-#, fuzzy
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Otvori s _RAW uređivačem"
 
-#: src/CollectionPage.vala:149 src/Resources.vala:167
-#, fuzzy
+#: src/CollectionPage.vala:149 src/Resources.vala:168
 msgid "_Play"
 msgstr "_Reproduciraj"
 
-#: src/CollectionPage.vala:415
-#, fuzzy
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Izvezi fotografiju/video snimku"
-
-#: src/CollectionPage.vala:415
-#, fuzzy
-msgid "Export Photos/Videos"
-msgstr "Izvezi fotografije/video snimke"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Izvezi fotografiju/video snimku"
+msgstr[1] "Izvezi fotografije/video snimke"
+msgstr[2] "Izvezi fotografije/video snimke"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
-#, fuzzy
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Izvezi fotografiju"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-#, fuzzy
-msgid "Export Photos"
-msgstr "Izvezi fotografije"
+msgid_plural "Export Photos"
+msgstr[0] "Izvezi fotografiju"
+msgstr[1] "Izvezi fotografije"
+msgstr[2] "Izvezi fotografije"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
-#, fuzzy
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Zakretanje"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
-#, fuzzy
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Prekidam zakretanje"
 
-#: src/CollectionPage.vala:529
-#, fuzzy
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Okreni vodoravno"
 
-#: src/CollectionPage.vala:530
-#, fuzzy
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Poništi vodoravno okretanje"
 
-#: src/CollectionPage.vala:539
-#, fuzzy
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Okreni okomito"
 
-#: src/CollectionPage.vala:540
-#, fuzzy
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Poništi okomito okretanje"
 
 #: src/Commands.vala:737
-#, fuzzy
 msgid "Reverting"
 msgstr "Vraćam promjene"
 
 #: src/Commands.vala:737
-#, fuzzy
 msgid "Undoing Revert"
 msgstr "Poništi vraćanje promjena"
 
 #: src/Commands.vala:781
-#, fuzzy
 msgid "Enhancing"
 msgstr "Poboljšanje"
 
 #: src/Commands.vala:781
-#, fuzzy
 msgid "Undoing Enhance"
 msgstr "Poništavanje poboljšavanja"
 
 #: src/Commands.vala:857
-#, fuzzy
 msgid "Applying Color Transformations"
 msgstr "Primjenjivanje transformacija boje"
 
 #: src/Commands.vala:857
-#, fuzzy
 msgid "Undoing Color Transformations"
 msgstr "Poništavanje transformacija boje"
 
 #: src/Commands.vala:1007
-#, fuzzy
 msgid "Creating New Event"
 msgstr "Stvaranje novog događaja"
 
 #: src/Commands.vala:1008
-#, fuzzy
 msgid "Removing Event"
 msgstr "Uklanjanje događaja"
 
 #: src/Commands.vala:1017
-#, fuzzy
 msgid "Moving Photos to New Event"
 msgstr "Premještanje fotografija u novi događaj"
 
 #: src/Commands.vala:1018
-#, fuzzy
 msgid "Setting Photos to Previous Event"
 msgstr "Postavljanje fotografija u prijašnji događaj"
 
 #: src/Commands.vala:1075
-#, fuzzy
 msgid "Merging"
 msgstr "Spajanje"
 
 #: src/Commands.vala:1076
-#, fuzzy
 msgid "Unmerging"
 msgstr "Razdvajanje"
 
 #: src/Commands.vala:1085
-#, fuzzy
 msgid "Duplicating photos"
 msgstr "Dupliciranje fotografija"
 
 #: src/Commands.vala:1085
-#, fuzzy
 msgid "Removing duplicated photos"
 msgstr "Uklanjanje duplikata fotografija"
 
@@ -2912,64 +2835,54 @@ msgstr "Uklanjanje duplikata fotografija"
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nemoguće napraviti duplikat %d fotografije zbog greške u datoteci"
+msgstr[1] "Nemoguće napraviti duplikat %d fotografije zbog greške u datoteci"
+msgstr[2] "Nemoguće napraviti duplikat %d fotografija zbog greške u datoteci"
 
 #: src/Commands.vala:1195
-#, fuzzy
 msgid "Restoring previous rating"
 msgstr "Vraćanje prijašnje ocjene"
 
 #: src/Commands.vala:1205 src/Commands.vala:1206
-#, fuzzy
 msgid "Increasing ratings"
 msgstr "Povećanje ocjena"
 
 #: src/Commands.vala:1205 src/Commands.vala:1206
-#, fuzzy
 msgid "Decreasing ratings"
 msgstr "Smanjenje ocjena"
 
 #: src/Commands.vala:1256
-#, fuzzy
 msgid "Setting RAW developer"
 msgstr "Postavljanje RAW razvijatelja"
 
 #: src/Commands.vala:1256
-#, fuzzy
 msgid "Restoring previous RAW developer"
 msgstr "Vraćanje prijašnjeg RAW razvijatelja"
 
 #: src/Commands.vala:1257
-#, fuzzy
 msgid "Set Developer"
 msgstr "Postavi razvijatelja"
 
 #: src/Commands.vala:1347
-#, fuzzy
 msgid "Original photo could not be adjusted."
 msgstr "Izvorna fotografija se ne može prilagoditi"
 
 #: src/Commands.vala:1368
-#, fuzzy
 msgid "Adjusting Date and Time"
 msgstr "Podešavanje vremena i datuma"
 
 #: src/Commands.vala:1368
-#, fuzzy
 msgid "Undoing Date and Time Adjustment"
 msgstr "Poništavanje podešavanje datuma i vremena"
 
 #: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Sljedeća izvorna fotografija se ne može prilagoditi."
+msgstr[1] "Sljedeće izvorne fotografije se ne mogu prilagoditi."
+msgstr[2] "Sljedeće izvorne fotografije se ne mogu prilagoditi."
 
 #: src/Commands.vala:1401 src/Commands.vala:1425
-#, fuzzy
 msgid "Time Adjustment Error"
 msgstr "Greška podešavanje vremena"
 
@@ -2978,83 +2891,73 @@ msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
 msgstr[0] ""
+"Podešavanje vremena se ne može poništiti na sljedećoj fotografiji."
 msgstr[1] ""
+"Podešavanje vremena se ne može poništiti na sljedećim fotografijama."
 msgstr[2] ""
+"Podešavanje vremena se ne može poništiti na sljedećim fotografijama."
 
 #: src/Commands.vala:1637 src/Commands.vala:1660
-#, fuzzy
 msgid "Create Tag"
 msgstr "Stvori oznaku"
 
 #: src/Commands.vala:1695
 #, c-format
 msgid "Move Tag “%s”"
-msgstr ""
+msgstr "Premjesti oznaku \"%s\""
 
 #: src/Commands.vala:2347
-#, fuzzy
 msgid "Move Photos to Trash"
 msgstr "Premjesti fotografije u smeće"
 
 #: src/Commands.vala:2347
-#, fuzzy
 msgid "Restore Photos from Trash"
 msgstr "Vrati fotografije iz smeća"
 
 #: src/Commands.vala:2348
-#, fuzzy
 msgid "Move the photos to the Shotwell trash"
 msgstr "Premjesti fotografije u Shotwell smeće"
 
 #: src/Commands.vala:2348
-#, fuzzy
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Vrati fotografije natrag u Shotwell fototeku"
 
 #: src/Commands.vala:2367
-#, fuzzy
 msgid "Moving Photos to Trash"
 msgstr "Premještanje fotografija u smeće"
 
 #: src/Commands.vala:2367
-#, fuzzy
 msgid "Restoring Photos From Trash"
 msgstr "Vraćanje fotografija iz smeća"
 
 #: src/Commands.vala:2453
-#, fuzzy
 msgid "Flag selected photos"
 msgstr "Označi odabrane fotografije"
 
 #: src/Commands.vala:2454
-#, fuzzy
 msgid "Unflag selected photos"
 msgstr "Ukloni oznaku odabrane fotografije"
 
 #: src/Commands.vala:2455
-#, fuzzy
 msgid "Flagging selected photos"
 msgstr "Označavanje odabrane fotografije"
 
 #: src/Commands.vala:2456
-#, fuzzy
 msgid "Unflagging selected photos"
 msgstr "Uklanjanje oznake odabrane fotografije"
 
 #: src/Commands.vala:2463
-#, fuzzy
 msgid "Flag"
 msgstr "Označi"
 
 #: src/Commands.vala:2463
-#, fuzzy
 msgid "Unflag"
 msgstr "Ukloni oznaku"
 
 #. Send an empty job to the queue to mark the end of the import
 #: src/data_imports/DataImportsPluginHost.vala:65
 #: src/data_imports/DataImportsPluginHost.vala:78
-#, fuzzy, c-format
+#, c-format
 msgid "%s Database"
 msgstr "%s baza podataka"
 
@@ -3062,17 +2965,16 @@ msgstr "%s baza podataka"
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
 msgid "Importing from %s can’t continue because an error occurred:"
-msgstr ""
+msgstr "Uvoz iz %s se ne može nastaviti zbog greške:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
-#, fuzzy
-msgid "To try importing from another service, select one from the above menu."
+msgid ""
+"To try importing from another service, select one from the above menu."
 msgstr ""
 "Kako bi pokušali uvesti iz neke druge usluge, odaberite jednu iz gornjeg "
 "izbornika."
 
 #: src/data_imports/DataImportsUI.vala:10
-#, fuzzy
 msgid ""
 "You do not have any data imports plugins enabled.\n"
 "\n"
@@ -3086,42 +2988,37 @@ msgstr ""
 "jedan takav priključak. Oni se mogu omogućiti u dijalogu \"Osobitosti\"."
 
 #: src/data_imports/DataImportsUI.vala:100
-#, fuzzy
 msgid "Database file:"
 msgstr "Datoteka baze podataka:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
-#, fuzzy
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Uvoz"
 
-#: src/data_imports/DataImportsUI.vala:220
-#, fuzzy
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Uvezi iz aplikacije"
 
-#: src/data_imports/DataImportsUI.vala:221
-#, fuzzy
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Uvezi medije _iz:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
-#, fuzzy
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Zatvori"
 
 #: src/data_imports/DataImports.vala:22
-#, fuzzy
 msgid "Data Imports"
 msgstr "Uvoz podataka"
 
 #: src/db/DatabaseTable.vala:37
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Nemoguće otvoriti/stvoriti bazu podataka fotografije %s: kôd greške %d"
+msgstr ""
+"Nemoguće otvoriti/stvoriti bazu podataka fotografije %s: kôd greške %d"
 
 #: src/db/DatabaseTable.vala:46
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to write to photo database file:\n"
 " %s"
@@ -3130,7 +3027,7 @@ msgstr ""
 " %s"
 
 #: src/db/DatabaseTable.vala:48
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error accessing database file:\n"
 " %s\n"
@@ -3147,25 +3044,24 @@ msgstr ""
 #: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
-msgstr ""
+msgstr "Nemoguće je obnoviti bazu podataka fotografije: %s"
 
 #: src/DesktopIntegration.vala:121
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Nemoguće pokretanje Nautilusovog Pošalji-u: %s"
 
 #: src/DesktopIntegration.vala:129
-#, fuzzy
 msgid "Send To"
 msgstr "Pošalji u"
 
 #: src/DesktopIntegration.vala:174
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Nemoguć izvoz pozadine  u %s: %s"
 
 #: src/DesktopIntegration.vala:311
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Nemoguće pripremanje prezentacije na radnoj površini: %s"
 
@@ -3174,21 +3070,23 @@ msgstr "Nemoguće pripremanje prezentacije na radnoj površini: %s"
 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] ""
+"Ovo će ukloniti oznaku “%s” iz %d fotografije. Želite li nastaviti?"
 msgstr[1] ""
+"Ovo će ukloniti oznaku “%s” iz %d fotografije. Želite li nastaviti?"
 msgstr[2] ""
+"Ovo će ukloniti oznaku “%s” iz %d fotografija. Želite li nastaviti?"
 
-#: 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
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
-#, fuzzy
 msgid "_Delete"
 msgstr "_Obriši"
 
 #: src/Dialogs.vala:25
 #, c-format
 msgid "This will remove the saved search “%s”. Continue?"
-msgstr ""
+msgstr "Ovo će ukloniti spremljeno pretraživanje %s. Nastavi?"
 
 #: src/Dialogs.vala:36
 msgid ""
@@ -3198,19 +3096,27 @@ msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
 msgstr[0] ""
+"Zamjena razvijatelja će poništiti sve promjene koje ste napravili na ovoj "
+"fotografiji u Shotwellu"
 msgstr[1] ""
+"Zamjena razvijatelja će poništiti sve promjene koje ste napravili na ovim "
+"fotografijama u Shotwellu"
 msgstr[2] ""
+"Zamjena razvijatelja će poništiti sve promjene koje ste napravili na ovim "
+"fotografijama u Shotwellu"
 
 #: src/Dialogs.vala:40
-#, fuzzy
 msgid "_Switch Developer"
 msgstr "_Zamijeni razvijatelja"
 
 #: src/Dialogs.vala:59
-#, fuzzy
 msgid "Export Video"
 msgstr "Izvoz video snimke"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Izvezi fotografije"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3222,9 +3128,10 @@ msgid ""
 "Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
+"Shotwell nije mogao stvoriti datoteku za uređivanje ove fotografije jer "
+"nemate dozvole za pisanje u %s."
 
 #: src/Dialogs.vala:121
-#, fuzzy
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -3233,7 +3140,6 @@ msgstr ""
 "\n"
 
 #: src/Dialogs.vala:127
-#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -3243,211 +3149,190 @@ msgstr ""
 "\n"
 "Želite li nastaviti s izvozom?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-#, fuzzy
-msgid "Unmodified"
-msgstr "Nepromijenjeni"
-
-#: src/Dialogs.vala:145
-#, fuzzy
-msgid "Current"
-msgstr "Trenutni"
-
-#. layout controls
-#: src/Dialogs.vala:221
-#, fuzzy
-msgid "_Format:"
-msgstr "_Format:"
-
-#: src/Dialogs.vala:224
-#, fuzzy
-msgid "_Quality:"
-msgstr "_Kvaliteta:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr ""
-
-#: src/Dialogs.vala:230
-#, fuzzy
-msgid "_Pixels:"
-msgstr "_Piksela:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr ""
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "_Nastavi"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
-msgstr ""
+msgstr "Spremi pojedinosti…"
 
-#: src/Dialogs.vala:479
-#, fuzzy
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Spremi pojedinosti"
 
-#: src/Dialogs.vala:494
-#, fuzzy, c-format
+#: src/Dialogs.vala:155
+#, c-format
 msgid "(and %d more)\n"
 msgstr "(i još %d).\n"
 
-#: src/Dialogs.vala:547
-#, fuzzy
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Uvezi izvještaj rezultata"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Pokušaj uvoza %d datoteke."
+msgstr[1] "Pokušaj uvoza %d datoteke."
+msgstr[2] "Pokušaj uvoza %d datoteka."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Od tih datoteka, %d datoteka je uspješno uvezena."
+msgstr[1] "Od tih datoteka, %d datoteke su uspješno uvezene."
+msgstr[2] "Od tih datoteka, %d datoteka je uspješno uvezeno."
 
-#.
+#. 
 #. Duplicates
-#.
-#: src/Dialogs.vala:566
-#, fuzzy
+#. 
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikati fotografija/video snimka nisu uvezeni:"
 
-#: src/Dialogs.vala:570
-#, fuzzy
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "napravi duplikat postojeće medijske stavke"
 
-#.
+#. 
 #. Files Not Imported Due to Camera Errors
-#.
-#: src/Dialogs.vala:581
-#, fuzzy
+#. 
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotografije/Video snimke nisu uvezene zbog greške na kameri:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
-#, fuzzy
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "poruka greške:"
 
-#.
+#. 
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
-#.
-#: src/Dialogs.vala:595
-msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
+#. 
+#: src/Dialogs.vala:256
+msgid ""
+"Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
+"Datoteke nisu uvezene jer nisu prepoznate kao fotografije ili video snimke:"
 
-#.
+#. 
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
-#.
-#: src/Dialogs.vala:610
+#. 
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
+"Fotografije/Video snimke nisu uvezene jer nisu u formatu koji Shotwell "
+"prepoznaje:"
 
-#.
+#. 
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
-#.
-#: src/Dialogs.vala:625
+#. 
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
+"Fotografije/Video snimke nisu uvezene zato jer ih Shotwell nije mogao "
+"kopirati u fototeku:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
+"Nemoguće je kopirati: %s\n"
+"\tu %s"
 
-#.
+#. 
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
-#.
-#: src/Dialogs.vala:641
-#, fuzzy
+#. 
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografije/Video snimke nisu uvezene zato jer su oštećene:"
 
-#.
+#. 
 #. Photos/Videos Not Imported for Other Reasons
-#.
-#: src/Dialogs.vala:656
-#, fuzzy
+#. 
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografije/Video snimke nisu uvezene zbog drugih razloga:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d duplikat fotografije nije uvezen\n"
+msgstr[1] "%d duplikata fotografije nisu uvezena\n"
+msgstr[2] "%d duplikata fotografije nije uvezeno\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d duplikat video snimke nije uvezen:\n"
+msgstr[1] "%d duplikata video snimaka nije uvezeno:\n"
+msgstr[2] "%d duplikata video snimaka nije uvezeno:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d duplikat fotografije/video snimke nije uvezen:\n"
+msgstr[1] "%d duplikata fotografija/video snimaka nije uvezeno:\n"
+msgstr[2] "%d duplikata fotografija/video snimaka nije uvezeno:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
+"%d fotografija nije uvezena zbog greške na datoteci ili hardveru:\n"
 msgstr[1] ""
+"%d fotografije nisu uvezene zbog greške na datoteci ili hardveru:\n"
 msgstr[2] ""
+"%d fotografija nije uvezeno zbog greške na datoteci ili hardveru:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
+"%d video snimka nije uvezena zbog greške na datoteci ili hardveru:\n"
 msgstr[1] ""
+"%d video snimke nisu uvezene zbog greške na datoteci ili hardveru:\n"
 msgstr[2] ""
+"%d video snimaka nije uvezeno zbog greške na datoteci ili hardveru:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
 "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
+"%d fotografija/video snimka nije uvezena zbog greške na datoteci ili "
+"hardveru:\n"
 msgstr[1] ""
+"%d fotografija/video snimke nisu uvezene zbog greške na datoteci ili "
+"hardveru:\n"
 msgstr[2] ""
+"%d fotografija/video snimaka nije uvezeno zbog greške na datoteci ili "
+"hardveru:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d datoteka nije uvezena zbog greške na datoteci ili hardveru:\n"
+msgstr[1] "%d datoteke nisu uvezene zbog greške na datoteci ili hardveru:\n"
+msgstr[2] "%d datoteka nije uvezeno zbog greške na datoteci ili hardveru:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3455,10 +3340,13 @@ msgid_plural ""
 "%d photos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
+"%d fotografija nije uvezena zato jer mapa fototeke nije zapisiva:\n"
 msgstr[1] ""
+"%d fotografije nisu uvezene zato jer mapa fototeke nije zapisiva:\n"
 msgstr[2] ""
+"%d fotografija nije uvezeno zato jer mapa fototeke nije zapisiva:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3466,10 +3354,13 @@ msgid_plural ""
 "%d videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
+"%d video snimka nije uvezena zato jer mapa fototeke nije zapisiva:\n"
 msgstr[1] ""
+"%d video snimke nisu uvezene zato jer mapa fototeke nije zapisiva:\n"
 msgstr[2] ""
+"%d video snimaka nije uvezeno zato jer mapa fototeke nije zapisiva:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3478,410 +3369,276 @@ msgid_plural ""
 "%d photos/videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
+"%d fotografija/video snimka nije uvezena zato jer mapa fototeke nije "
+"zapisiva:\n"
 msgstr[1] ""
+"%d fotografije/video snimke nisu uvezene zato jer mapa fototeke nije "
+"zapisiva:\n"
 msgstr[2] ""
+"%d fotografija/video snimaka nije uvezeno zato jer mapa fototeke nije "
+"zapisiva:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
 msgid_plural ""
 "%d files failed to import because the photo library folder was not "
 "writable:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d datoteka nije uvezena zato jer mapa fototeke nije zapisiva:\n"
+msgstr[1] "%d datoteke nisu uvezene zato jer mapa fototeke nije zapisiva:\n"
+msgstr[2] "%d datoteka nije uvezeno zato jer mapa fototeke nije zapisiva:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija nije uvezena - greška na kameri:\n"
+msgstr[1] "%d fotografije nisu uvezene - greška na kameri:\n"
+msgstr[2] "%d fotografija nije uvezeno - greška na kameri:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d video snimka nije uvezena zbog greške na kameri:\n"
+msgstr[1] "%d video snimke nisu uvezene zbog greške na kameri:\n"
+msgstr[2] "%d video snimaka nije uvezeno zbog greške na kameri:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d fotografija/video snimka nije uvezena zbog greške na kameri:\n"
+msgstr[1] "%d fotografije/video snimke nisu uvezene zbog greške na kameri:\n"
 msgstr[2] ""
+"%d fotografija/video snimaka nije uvezeno zbog greške na kameri:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d datoteka nije uvezena zbog greške na kameri:\n"
+msgstr[1] "%d datoteke nisu uvezene zbog greške na kameri:\n"
+msgstr[2] "%d datoteka nije uvezeno zbog greške na kameri:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija se nije uvezla zato jer je oštećena:\n"
+msgstr[1] "%d fotografije se nisu uvezle zato jer su oštećene:\n"
+msgstr[2] "%d fotografija se nije uvezlo zato jer su oštećene:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d video snimka se nije uvezla zato jer je oštećena:\n"
+msgstr[1] "%d video snimke se nisu uvezle zato jer su oštećene:\n"
+msgstr[2] "%d video snimaka se nije uvezlo zato jer su oštećene:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
+"%d fotografija/video snimka se nije uvezla zato jer je oštećena:\n"
 msgstr[1] ""
+"%d  fotografije/video snimke se nisu uvezle zato jer su oštećene:\n"
 msgstr[2] ""
+"%d  fotografija/video snimaka se nije uvezlo zato jer su oštećene:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d datoteka se nije uvezla zato jer je oštećena:\n"
+msgstr[1] "%d datoteke se nisu uvezle zato jer su oštećene:\n"
+msgstr[2] "%d datoteka se nije uvezlo zato jer su oštećene:\n"
 
 #. we have no notion of "unsupported" video files right now in Shotwell (all
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija preskočena, format nije podržan:\n"
+msgstr[1] "%d fotografije preskočene, format nije podržan:\n"
+msgstr[2] "%d fotografija preskočeno, format nije podržan:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Preskočena %d datoteka koja nije slika.\n"
+msgstr[1] "Preskočene %d datoteke koje nisu slike.\n"
+msgstr[2] "Preskočeno %d datoteka koje nisu slike.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d preskočena fotografije uslijed korisnikovog prekida.\n"
+msgstr[1] "%d preskočene fotografije uslijed korisnikovog prekida.\n"
+msgstr[2] "%d preskočenih fotografija uslijed korisnikovog prekida.\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d video snimka preskočena uslijed korisnikovog prekida.\n"
+msgstr[1] "%d video snimke preskočena uslijed korisnikovog prekida.\n"
+msgstr[2] "%d video snimaka preskočeno uslijed korisnikovog prekida.\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] ""
+"%d fotografija/video snimka preskočena uslijed korisnikovog prekida.\n"
 msgstr[1] ""
+"%d fotografije/video snimke preskočene uslijed korisnikovog prekida.\n"
 msgstr[2] ""
+"%d fotografija/video snimaka preskočeno uslijed korisnikovog prekida.\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d datoteka preskočena uslijed korisnikova prekida:\n"
+msgstr[1] "%d datoteke preskočene uslijed korisnikova prekida:\n"
+msgstr[2] "%d datoteka preskočeno uslijed korisnikova prekida:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija uspješno uvezena.\n"
+msgstr[1] "%d fotografije uspješno uvezeno.\n"
+msgstr[2] "%d fotografija uspješno uvezenih.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d video snimka uspješno uvezena.\n"
+msgstr[1] "%d video snimke uspješno uvezene.\n"
+msgstr[2] "%d video snimaka uspješno uvezeno\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija/video snimka uspješno uvezena.\n"
+msgstr[1] "%d fotografije/video snimke uspješno uvezene.\n"
+msgstr[2] "%d fotografija/video snimaka uspješno uvezeno.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
-#, fuzzy
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Niti jedna fotografija nije uvezena.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
-#, fuzzy
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Uvoz završen"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1170
-#, fuzzy
-msgid "1 day"
-msgstr "jedan dan"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:231
-#, fuzzy
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Preimenuj događaj"
 
-#: src/Dialogs.vala:1317
-#, fuzzy
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Naziv:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
-msgstr ""
+msgstr "Uredi naslov"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
-#, fuzzy
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Naslov:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:307
-#, fuzzy
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Uredi komentar događaja"
 
-#: src/Dialogs.vala:1346
-#, fuzzy
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Uredi komentar fotografije/video snimke"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
-#, fuzzy
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ukloni i _premjesti u smeće datoteku"
+msgstr[1] "Ukloni i _premjesti u smeće datoteke"
+msgstr[2] "Ukloni i _premjesti u smeće datoteke"
 
-#: src/Dialogs.vala:1367
-#, fuzzy
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: src/Dialogs.vala:1410
-#, fuzzy
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Poništi vanjsku promjenu?"
 
-#: src/Dialogs.vala:1410
-#, fuzzy
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Poništi vanjske promjene?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
 "This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
+"Ovo će uništiti sve promjene učinjene na %d vanjskoj datoteci. Nastavi?"
 msgstr[1] ""
+"Ovo će uništiti sve promjene učinjene na %d vanjske datoteke. Nastavi?"
 msgstr[2] ""
+"Ovo će uništiti sve promjene učinjene na %d vanjskih datoteka. Nastavi?"
 
-#: src/Dialogs.vala:1416
-#, fuzzy
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "_Poništi vanjsku promjenu"
 
-#: src/Dialogs.vala:1416
-#, fuzzy
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "_Poništi vanjske promjene"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ovo će ukloniti %d fotografiju iz fototeke. Nastavi!"
+msgstr[1] "Ovo će ukloniti %d fotografije iz fototeke. Nastavi!"
+msgstr[2] "Ovo će ukloniti %d fotografija iz fototeke. Nastavi!"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:173
-#, fuzzy
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: src/Dialogs.vala:1445
-#, fuzzy
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Ukloni fotografiju iz fototeke"
 
-#: src/Dialogs.vala:1445
-#, fuzzy
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Ukloni fotografije iz fototeke"
 
-#: src/Dialogs.vala:1543
-#, fuzzy, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-#, fuzzy
-msgid "AM"
-msgstr "AM"
-
-#: src/Dialogs.vala:1698
-#, fuzzy
-msgid "PM"
-msgstr "PM"
-
-#: src/Dialogs.vala:1699
-#, fuzzy
-msgid "24 Hr"
-msgstr "24 sata"
-
-#: src/Dialogs.vala:1714
-#, fuzzy
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Prebaci fotografije/video snimke za jednaki iznos"
-
-#: src/Dialogs.vala:1719
-#, fuzzy
-msgid "Set _all photos/videos to this time"
-msgstr "Postavi _sve fotografije/video snimke na ovo vrijeme"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1817
-#, fuzzy
-msgid "Original: "
-msgstr "Orginal: "
-
-#: src/Dialogs.vala:1818
-#, fuzzy
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y., %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-#, fuzzy
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y., %I:%M:%S %p"
-
-#: src/Dialogs.vala:1908
-#, fuzzy, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Vrijeme ekspozicije će biti pomaknuto unaprijed za\n"
-"%d %s, %d %s, %d %s, i %d %s."
-
-#: src/Dialogs.vala:1909
-#, fuzzy, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Vrijeme ekspozicije će biti pomaknuto unatrag za\n"
-"%d %s, %d %s, %d %s, i %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3892,108 +3649,25 @@ msgid_plural ""
 "\n"
 "And %d others."
 msgstr[0] ""
+"\n"
+"\n"
+"I %d preostali."
 msgstr[1] ""
+"\n"
+"\n"
+"I %d preostala."
 msgstr[2] ""
+"\n"
+"\n"
+"I %d preostalih."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
-#, fuzzy
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Oznake (odvojene zarezom):"
 
-#: src/Dialogs.vala:2089
-#, fuzzy
-msgid "Welcome!"
-msgstr "Dobrodošli!"
-
-#: src/Dialogs.vala:2096
-#, fuzzy
-msgid "Welcome to Shotwell!"
-msgstr "Dobrodošli u Shotwell!"
-
-#: src/Dialogs.vala:2101
-#, fuzzy
-msgid "To get started, import photos in any of these ways:"
-msgstr ""
-"Kako bi započeli rad s fotografijama, uvezite fotografije na jedan od "
-"sljedećih načina:"
-
-#: src/Dialogs.vala:2121
-#, fuzzy, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Odaberite <span weight=\"bold\"> Datoteka %s Uvezi iz mape</span>"
-
-#: src/Dialogs.vala:2122
-#, fuzzy
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Dovucite i ispustite fotografije u Shotwell prozor"
-
-#: src/Dialogs.vala:2123
-#, fuzzy
-msgid "Connect a camera to your computer and import"
-msgstr "Spojite kameru s računalom i pokrenite uvoz."
-
-#: src/Dialogs.vala:2134
-#, fuzzy, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Uvezi fotografije iz mape %s"
-
-#: src/Dialogs.vala:2141
-#, fuzzy
-msgid "You can also import photos in any of these ways:"
-msgstr "Isto tako možete uvesti fotografije na jedan od sljedećih načina:"
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr ""
-
-#: src/Dialogs.vala:2189
-#, fuzzy, c-format
-msgid "Import photos from your %s library"
-msgstr "Uvezite fotografije iz vaše %s fototeke"
-
-#. 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:2335 src/Dialogs.vala:2339
-#, fuzzy
-msgid "(Help)"
-msgstr "(Pomoć)"
-
-#: src/Dialogs.vala:2346
-#, fuzzy, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Godina%sMjesec%sDan"
-
-#: src/Dialogs.vala:2348
-#, fuzzy, c-format
-msgid "Year%sMonth"
-msgstr "Godina%sMjesec"
-
-#: src/Dialogs.vala:2350
-#, fuzzy, c-format
-msgid "Year%sMonth-Day"
-msgstr "Godina%sMjesec-Dan"
-
-#: src/Dialogs.vala:2352
-#, fuzzy
-msgid "Year-Month-Day"
-msgstr "Godina-Mjesec-Dan"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-#, fuzzy
-msgid "Custom"
-msgstr "Prilagođeno"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-#, fuzzy
-msgid "Invalid pattern"
-msgstr "Neispravan uzorak"
-
 #. 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:2692
-#, fuzzy
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4001,37 +3675,31 @@ msgstr ""
 "Shotwell može dodati fotografije u fototeku kopiranjem u mapu ili samo "
 "uvozom."
 
-#: src/Dialogs.vala:2697
-#, fuzzy
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "_Kopiraj fotografije"
 
-#: src/Dialogs.vala:2698
-#, fuzzy
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Uvezi"
 
-#: src/Dialogs.vala:2699
-#, fuzzy
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Uvezi u fototeku"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
-#, fuzzy
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Ukloni iz fototeke"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
-#, fuzzy
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Uklanjanje fotografije iz fototeke"
 
-#: src/Dialogs.vala:2710
-#, fuzzy
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Uklanjanje fotografija iz fototeke"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4044,10 +3712,22 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Ovo će ukloniti %d fotografiju/video snimku iz vaše Shotwell fototeke. "
+"Želite li isto premjestiti datoteku u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[1] ""
+"Ovo će ukloniti %d fotografije/video snimke iz vaše Shotwell fototeke. "
+"Želite li isto premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[2] ""
+"Ovo će ukloniti %d fotografija/video snimaka iz vaše Shotwell fototeke. "
+"Želite li isto premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4060,10 +3740,22 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Ovo će ukloniti %d video snimku iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteku u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[1] ""
+"Ovo će ukloniti %d video snimke iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[2] ""
+"Ovo će ukloniti %d video snimaka iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4076,50 +3768,66 @@ msgid_plural ""
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
+"Ovo će ukloniti %d fotografiju iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteku u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[1] ""
+"Ovo će ukloniti %d fotografije iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 msgstr[2] ""
+"Ovo će ukloniti %d fotografija iz vaše Shotwell fototeke. Želite li isto "
+"premjestiti datoteke u smeće?\n"
+"\n"
+"Ova radnja se ne može poništiti."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, 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] ""
+"%d fotografija ili video snimka se ne može premjestiti u smeće. Obriši ovu "
+"datoteku?"
 msgstr[1] ""
+"%d fotografije ili video snimke se ne mogu premjestiti u smeće. Obriši ove "
+"datoteke?"
 msgstr[2] ""
+"%d fotografija ili video snimaka se ne može premjestiti u smeće. Obriši ove "
+"datoteke?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija ili video snimka se ne može obrisati."
+msgstr[1] "%d fotografije ili video snimke se ne mogu obrisati."
+msgstr[2] "%d fotografija ili video snimaka se ne može obrisati."
 
 #: src/Dimensions.vala:23
-#, fuzzy
 msgid "Width"
 msgstr "Širina"
 
 #: src/Dimensions.vala:26
-#, fuzzy
 msgid "Height"
 msgstr "Visina"
 
 #: src/direct/DirectPhotoPage.vala:99
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not exist."
 msgstr "%s ne postoji."
 
 #: src/direct/DirectPhotoPage.vala:101
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not a file."
 msgstr "%s nije datoteka."
 
 #: src/direct/DirectPhotoPage.vala:103
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s does not support the file format of\n"
 "%s."
@@ -4130,508 +3838,720 @@ msgstr ""
 #: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
-msgstr ""
+msgstr "Nemoguće otvaranje fotografije %s. Isprika."
 
-#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
-#, fuzzy
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Spremi"
 
 #: src/direct/DirectPhotoPage.vala:316
-#, fuzzy
 msgid "_Save a Copy"
 msgstr "_Spremi kopiju"
 
 #: src/direct/DirectPhotoPage.vala:319
-#, fuzzy, c-format
+#, c-format
 msgid "Lose changes to %s?"
 msgstr "Poništavanje promjena na %s?"
 
 #: src/direct/DirectPhotoPage.vala:320
-#, fuzzy
 msgid "Close _without Saving"
 msgstr "Zatvori _bez spremanja"
 
 #: src/direct/DirectPhotoPage.vala:353
-#, fuzzy, c-format
+#, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Greška pri spremanju u %s: %s"
 
 #: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
-#, fuzzy
 msgid "Save As"
 msgstr "Spremi kao"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
-#, fuzzy, c-format
+#: src/DirectoryMonitor.vala:891
+#, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nemoguće nadziranje %s: Nije mapa (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
-#, fuzzy
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 sata"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Prebaci fotografije/video snimke za jednaki iznos"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Postavi _sve fotografije/video snimke na ovo vrijeme"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Promijeni izvornu datoteku fotografije"
+msgstr[1] "_Promijeni izvorne datoteke fotografije"
+msgstr[2] "_Promijeni izvorne datoteke fotografije"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Izmjeni orginalnu datototeku"
+msgstr[1] "_Izmjeni orginalne datototeku"
+msgstr[2] "_Izmjeni orginalnih datototeka"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Orginal: "
+
+# The string %m/%d/%y, %H:%M:%S is a format string that describes a U.S.-style
+# 24 hour date and time (e.g. 9/22/2009, 13:15:04). You should translate
+# %m/%d/%y, %H:%M:%S so that it describes the 24 hour date and time format
+# used in your language and region. The format string you enter should conform
+# to POSIX date and time formatting conventions. See the strftime manpage for
+# a list of format specifiers and their meanings.
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y., %H:%M:%S"
+
+# The string %m/%d/%y, %I:%M:%S %p is a format string that describes a
+# U.S.-style 12 hour date and time (e.g. 9/22/2009, 1:15:04 PM). You should
+# translate %m/%d/%y, %H:%M:%S so that it describes the 12 hour date and time
+# format used in your language and region. The format string you enter should
+# conform to POSIX date and time formatting conventions. See the strftime
+# manpage for a list of format specifiers and their meanings.
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y., %I:%M:%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Vrijeme ekspozicije će biti pomaknuto unaprijed za\n"
+"%d %s, %d %s, %d %s, i %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Vrijeme ekspozicije će biti pomaknuto unatrag za\n"
+"%d %s, %d %s, %d %s, i %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dan"
+msgstr[1] "dana"
+msgstr[2] "dana"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "sat"
+msgstr[1] "sata"
+msgstr[2] "sati"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuta"
+msgstr[1] "minute"
+msgstr[2] "minuta"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekunda"
+msgstr[1] "sekunde"
+msgstr[2] "sekundi"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Nepromijenjeni"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Trenutni"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Format:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Kvaliteta:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Ograničenje promjene veličine:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Piksela:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Izvezi _metapodatke:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Pomoć)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Godina%sMjesec%sDan"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Godina%sMjesec"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Godina%sMjesec-Dan"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Godina-Mjesec-Dan"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Prilagođena"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Neispravan uzorak"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minute"
+msgstr[2] "%d minuta"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "jedan dan"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Dobrodošli!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Dobrodošli u Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr ""
+"Kako bi započeli rad s fotografijama, uvezite fotografije na jedan od "
+"sljedećih načina:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Odaberite <span weight=\"bold\"> Datoteka %s Uvezi iz mape</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Dovucite i ispustite fotografije u Shotwell prozor"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Spojite kameru s računalom i pokrenite uvoz."
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Uvezi fotografije iz mape %s"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Isto tako možete uvesti fotografije na jedan od sljedećih načina:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Ne prikazuj više ovu poruku"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Uvezite fotografije iz vaše %s fototeke"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Vrati na trenutne dimenzije fotografije"
 
-#: src/editing_tools/EditingTools.vala:669
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Postavi obrezivanje za ovu fotografiju"
 
-#: src/editing_tools/EditingTools.vala:681
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Okreni pravokutnik obrezivanja fotografije između vodoravne i horizontalne "
 "orijentacije."
 
-#: src/editing_tools/EditingTools.vala:754
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Neograničeno"
 
-#: src/editing_tools/EditingTools.vala:755
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kvadrat"
 
-#: src/editing_tools/EditingTools.vala:756
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
-msgstr ""
+msgstr "."
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
-msgstr ""
+msgstr "SD Video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
-msgstr ""
+msgstr "HD Video (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
-msgstr ""
+msgstr "Novčanik (2 x 3 in.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
-msgstr ""
+msgstr "Bilješka (3 x 5 in.)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
-msgstr ""
+msgstr "Indeks 4×6 vanjski"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
-msgstr ""
+msgstr "5×7"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
-msgstr ""
+msgstr "8×10 omotnica"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
-msgstr ""
+msgstr "Pismo (8.5 x 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
-msgstr ""
+msgstr "11 x 14 in."
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
-msgstr ""
+msgstr "Tabloid (11 x 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
-msgstr ""
+msgstr "16 x 20 in."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
-msgstr ""
+msgstr "Metrički novčanik (9 x 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
-msgstr ""
+msgstr "Razglednica (10 x 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
-msgstr ""
+msgstr "13 x 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
-msgstr ""
+msgstr "18 x 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
-msgstr ""
+msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
-msgstr ""
+msgstr "20 x 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
-msgstr ""
+msgstr "24 x 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
-msgstr ""
+msgstr "30 x 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
-msgstr ""
+msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Veličina:"
 
-#: src/editing_tools/EditingTools.vala:1895
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Zatvori alat za uklanjanje crvenih očiju"
 
-#: src/editing_tools/EditingTools.vala:1898
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Ukloni efekt crvenih očiju iz odabranog područja"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
-#, fuzzy
 msgid "_Reset"
 msgstr "_Vrati izvorno"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
-#, fuzzy
 msgid "Exposure:"
 msgstr "Ekspozicija:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Zasićenje:"
 
-#: src/editing_tools/EditingTools.vala:2279
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Nijansa:"
 
-#: src/editing_tools/EditingTools.vala:2289
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2298
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Sjenke:"
 
-#: src/editing_tools/EditingTools.vala:2307
-#, fuzzy
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Osvjetljenje:"
 
-#: src/editing_tools/EditingTools.vala:2363
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Vrati izvorne boje"
 
-#: src/editing_tools/EditingTools.vala:2363
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Vrati sve boje na izvorne postavke"
 
-#: src/editing_tools/EditingTools.vala:2722
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2734
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Nijansa"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
-msgstr ""
+msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Zasićenje"
 
-#: src/editing_tools/EditingTools.vala:2773
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Ekspozicija"
 
-#: src/editing_tools/EditingTools.vala:2786
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Sjenke"
 
-#: src/editing_tools/EditingTools.vala:2799
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Osvjetljenje"
 
-#: src/editing_tools/EditingTools.vala:2809
-#, fuzzy
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Proširenje kontrasta"
 
 #: src/editing_tools/StraightenTool.vala:99
-#, fuzzy
 msgid "Angle:"
 msgstr "Kut:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
 #: ui/direct.ui:144 ui/photo.ui:233
-#, fuzzy
 msgid "_Straighten"
 msgstr "_Ispravi"
 
-#: src/events/Branch.vala:25
-#, fuzzy
-msgid "Events"
-msgstr "Događaji"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija/video snimka"
+msgstr[1] "%d fotografije/video snimke"
+msgstr[2] "%d fotografija/video snimaka"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d video snimka"
+msgstr[1] "%d video snimke"
+msgstr[2] "%d video snimaka"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d fotografija"
+msgstr[1] "%d fotografije"
+msgstr[2] "%d fotografija"
 
 #: src/events/EventPage.vala:128
-#, fuzzy
 msgid "No Event"
 msgstr "Nema događaja"
 
-#: src/events/EventsDirectoryPage.vala:150
-#, fuzzy
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Događaji"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Pregledajte svoje događaje"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Nema događaja"
 
-#: src/events/EventsDirectoryPage.vala:154
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nema pronađenih događaja"
 
-#: src/events/EventsDirectoryPage.vala:227
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Svi događaji"
 
-#: src/events/EventsDirectoryPage.vala:241
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Bez datuma"
 
-#: src/events/EventsDirectoryPage.vala:242
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
-#, fuzzy
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
 #. if no name, pretty up the start time
 #: src/Event.vala:753
-#, fuzzy, c-format
+#, c-format
 msgid "Event %s"
 msgstr "Događaj %s"
 
 #: src/Exporter.vala:232
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "Nemoguće stvaranje privremene datoteke za %s: %s"
 
 #: src/Exporter.vala:299
-#, fuzzy
 msgid "Exporting"
 msgstr "Izvoz"
 
 #: src/Exporter.vala:317
 #, c-format
 msgid "File %s already exists. Replace?"
-msgstr ""
+msgstr "Datoteka %s već postoji. Zamijeni?"
 
 #: src/Exporter.vala:319
-#, fuzzy
 msgid "_Skip"
 msgstr "_Preskoči"
 
 #: src/Exporter.vala:319
-#, fuzzy
 msgid "_Replace"
 msgstr "_Zamijeni"
 
 #: src/Exporter.vala:319
-#, fuzzy
 msgid "Replace _All"
 msgstr "Zamijeni _sve"
 
 #: src/Exporter.vala:319
-#, fuzzy
 msgid "Export"
 msgstr "Izvoz"
 
-#: src/folders/Branch.vala:144
-#, fuzzy
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Mape"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-#, fuzzy
-msgid "Library"
-msgstr "Fototeka"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Pregledajte strukturu mapa fototeke"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-#, fuzzy
-msgid "Photos"
-msgstr "Fotografije"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
-#, fuzzy
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Označeno"
 
 #: src/library/ImportQueuePage.vala:8
 msgid "Importing…"
-msgstr ""
+msgstr "Uvoz…"
 
 #: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
-msgstr ""
+msgstr "Pripremanje uvoza…"
 
 #: src/library/ImportQueuePage.vala:156
-#, fuzzy, c-format
+#, c-format
 msgid "Imported %s"
 msgstr "Uvezeno %s"
 
 #: src/library/LastImportPage.vala:8
-#, fuzzy
 msgid "Last Import"
 msgstr "Posljednji uvoz"
 
-#: src/library/LibraryWindow.vala:507
-#, fuzzy
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Fototeka"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organizirajte i pregledajte svoje fotografije"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotografije"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Uvozi iz mape"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
-#, fuzzy
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Vraćaj se u podmape"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
-msgstr ""
+msgstr "Pražnjenje smeća…"
 
-#: src/library/LibraryWindow.vala:772
-#, fuzzy, c-format
+#: src/library/LibraryWindow.vala:779
+#, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s "
+"Preferences</span>.\n"
 "Do you want to continue importing photos?"
 msgstr ""
 "Shotwell je podešen za uvoz fotografija u vašu osobnu mapu.\n"
-"Preporučujemo promjenu ovoga u <span weight=\"bold\">Uredi %s Osobitosti</"
-"span>.\n"
+"Preporučujemo promjenu ovoga u <span weight=\"bold\">Uredi %s "
+"Osobitosti</span>.\n"
 "Želite li nastaviti s uvozom fotografija?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
-#, fuzzy
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Lokacija fototeke"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
-#, fuzzy
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotografije se ne mogu uvesti iz ove mape."
 
-#: src/library/LibraryWindow.vala:1068
-#, fuzzy, c-format
+#: src/library/LibraryWindow.vala:1075
+#, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
-msgstr ""
+msgstr "Nadopunjavanje fototeke…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
-msgstr ""
+msgstr "Priprema za automatski uvoz fotografija…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
-msgstr ""
+msgstr "Automatski uvoz fotografija…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
-msgstr ""
+msgstr "Zapisujem metapodatke u datoteke…"
 
 #: src/library/OfflinePage.vala:8
-#, fuzzy
 msgid "Missing Files"
 msgstr "Datoteke koje nedostaju"
 
 #: src/library/OfflinePage.vala:110
 msgid "Deleting…"
-msgstr ""
+msgstr "Brisanje…"
 
 #: src/library/TrashPage.vala:8
-#, fuzzy
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/library/TrashPage.vala:108
-#, fuzzy
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Smeće je prazno"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
-#: src/library/TrashPage.vala:113
-#, fuzzy
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Brisanje fotografija"
 
@@ -4642,6 +4562,9 @@ msgid ""
 "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 fototeka fotografija nije kompatibilna sa ovom inačicom Shotwella. "
+"Stvorena je sa Shotwell %s ( shema %d). Ta inačica je %s ( shema %d). "
+"Koristite najnoviju inačicu Shotwella."
 
 #: src/main.vala:59
 #, c-format
@@ -4650,6 +4573,8 @@ msgid ""
 "%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
+"Shotwell nije uspio nadograditi vašu fototeku fotografija s inačice %s ( "
+"shema %d) na %s ( shema %d). Za više informacija pogledajte Shotwell Wiki %s"
 
 #: src/main.vala:65
 #, c-format
@@ -4659,62 +4584,67 @@ msgid ""
 "(schema %d). Please clear your library by deleting %s and re-import your "
 "photos."
 msgstr ""
+"Vaša fototeka fotografija nije kompatibilna s ovom inačicom Shotwella. "
+"Stvorena je sa Shotwell %s ( shema %d). Ta inačica je %s ( shema %d). "
+"Očistite vašu fototeku brisanjem %s , te zatim ponovno uvezite fotografije."
 
 #: src/main.vala:71
 #, c-format
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
-msgstr ""
+msgstr "Nepoznata greška pri provjeri Shotwellove baze podataka: %s"
 
 #: src/main.vala:104
-#, fuzzy
 msgid "Loading Shotwell"
 msgstr "Učitavanje Shotwella"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
-msgstr ""
+msgstr "Putanja do Shotwellovih privatnih podataka"
 
-#: src/main.vala:293
-#, fuzzy
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "MAPA"
 
-#: src/main.vala:297
-#, fuzzy
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Ne nadziri mapu fototeke u vremenu izvršavanja promjena"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
-msgstr ""
+msgstr "Ne prikazuj prikaz napretka pokretanja"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
-msgstr ""
+msgstr "Prikaži inačicu aplikacije"
+
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Pokreni aplikaciju u cjelozaslonskom prikazu"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
-#, fuzzy
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[DATOTEKA]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, 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 ""
+"Pokrenite '%s --help'  kako bi vidjeli popis svih dostupnih mogućnosti "
+"naredbenog redka.\n"
 
 #: src/MediaMonitor.vala:400
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to process monitoring updates: %s"
 msgstr "Nemoguće obraditi nadopune nadzora: %s"
 
 #: src/MediaPage.vala:158
-#, fuzzy
 msgid "Adjust the size of the thumbnails"
 msgstr "Prilagodi veličinu minijatura"
 
-#: src/MediaPage.vala:503
-#, fuzzy, c-format
+#: src/MediaPage.vala:502
+#, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
@@ -4722,138 +4652,122 @@ msgstr ""
 "Shotwell nije uspio prikazati video snimku:\n"
 " %s"
 
-#: src/Page.vala:1318
-#, fuzzy
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Nema fotografija/video snimaka"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr ""
+"Nema pronađenih fotografija/video snimaka koje se poduraju s trenutnim "
+"filtrom."
 
-#: src/Page.vala:2628
-#, fuzzy
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografije ne mogu biti izvezene u ovu mapu."
 
 #. previous button
 #: src/PhotoPage.vala:538
-#, fuzzy
 msgid "Previous photo"
 msgstr "Prijašnja fotografija"
 
 #. next button
 #: src/PhotoPage.vala:544
-#, fuzzy
 msgid "Next photo"
 msgstr "Sljedeća fotografija"
 
 #: src/PhotoPage.vala:1850
-#, fuzzy, c-format
+#, c-format
 msgid "Photo source file missing: %s"
 msgstr "Nedostaje izvorišna datoteka: %s"
 
 #: src/PhotoPage.vala:3018
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nemoguće izvesti %s: %s"
 
 #: src/photos/BmpSupport.vala:32
-#, fuzzy
 msgid "BMP"
 msgstr "BMP"
 
 #: src/photos/JfifSupport.vala:84
-#, fuzzy
 msgid "JPEG"
 msgstr "JPEG"
 
 #: src/photos/JfifSupport.vala:185
-#, fuzzy, c-format
+#, c-format
 msgid "Low (%d%%)"
 msgstr "Nisko (%d%%)"
 
 #: src/photos/JfifSupport.vala:188
-#, fuzzy, c-format
+#, c-format
 msgid "Medium (%d%%)"
 msgstr "Srednje (%d%%)"
 
 #: src/photos/JfifSupport.vala:191
-#, fuzzy, c-format
+#, c-format
 msgid "High (%d%%)"
 msgstr "Visoko (%d%%)"
 
 #: src/photos/JfifSupport.vala:194
-#, fuzzy, c-format
+#, c-format
 msgid "Maximum (%d%%)"
 msgstr "Najveće (%d%%)"
 
 #: src/photos/PngSupport.vala:30
-#, fuzzy
 msgid "PNG"
 msgstr "PNG"
 
 #: src/photos/RawSupport.vala:134
-#, fuzzy
 msgid "RAW"
 msgstr "RAW"
 
 #: src/photos/TiffSupport.vala:86
-#, fuzzy
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
-#, fuzzy
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "promjenjeno"
 
 #: src/Printing.vala:255
-#, fuzzy
 msgid "Fill the entire page"
 msgstr "Popuni cijelu stranicu"
 
 #: src/Printing.vala:256
-#, fuzzy
 msgid "2 images per page"
 msgstr "2 slike po stranici"
 
 #: src/Printing.vala:257
-#, fuzzy
 msgid "4 images per page"
 msgstr "4 slike po stranici"
 
 #: src/Printing.vala:258
-#, fuzzy
 msgid "6 images per page"
 msgstr "6 slika po stranici"
 
 #: src/Printing.vala:259
-#, fuzzy
 msgid "8 images per page"
 msgstr "8 slika po stranici"
 
 #: src/Printing.vala:260
-#, fuzzy
 msgid "16 images per page"
 msgstr "16 slika po stranici"
 
 #: src/Printing.vala:261
-#, fuzzy
 msgid "32 images per page"
 msgstr "32 slike po stranici"
 
 #: src/Printing.vala:851
-#, fuzzy
 msgid "Image Settings"
 msgstr "Postavke slike"
 
 #: src/Printing.vala:864
 msgid "Printing…"
-msgstr ""
+msgstr "Ispisivanje…"
 
 #: src/Printing.vala:884 src/Printing.vala:1087
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to print photo:\n"
 "\n"
@@ -4864,17 +4778,14 @@ msgstr ""
 "%s"
 
 #: src/Properties.vala:87
-#, fuzzy
 msgid "Today"
 msgstr "Danas"
 
 #: src/Properties.vala:89
-#, fuzzy
 msgid "Yesterday"
 msgstr "Jučer"
 
 #: src/Properties.vala:346
-#, fuzzy
 msgid "Items:"
 msgstr "Stavke:"
 
@@ -4882,151 +4793,127 @@ msgstr "Stavke:"
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d događaj"
+msgstr[1] "%d događaja"
+msgstr[2] "%d događaja"
 
 #. display only one date if start and end are the same
 #: src/Properties.vala:380
-#, fuzzy
 msgid "Date:"
 msgstr "Datum:"
 
 #. display only one time if start and end are the same
 #: src/Properties.vala:384
-#, fuzzy
 msgid "Time:"
 msgstr "Vrijeme:"
 
 #. display time range
 #. display date range
 #: src/Properties.vala:387 src/Properties.vala:392
-#, fuzzy
 msgid "From:"
 msgstr "Od:"
 
 #: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
-msgstr ""
+msgstr "Do:"
 
 #: src/Properties.vala:407
-#, fuzzy
 msgid "Duration:"
 msgstr "Trajanje:"
 
 #: src/Properties.vala:407
-#, fuzzy, c-format
+#, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunda"
 
 #: src/Properties.vala:411
-#, fuzzy
 msgid "Developer:"
 msgstr "Razvijatelj:"
 
 #. nothing special to be done for now for Events
 #: src/Properties.vala:586
-#, fuzzy
 msgid "Location:"
 msgstr "Lokacija:"
 
 #: src/Properties.vala:589
-#, fuzzy
 msgid "File size:"
 msgstr "Veličina datoteke:"
 
 #: src/Properties.vala:593
-#, fuzzy
 msgid "Current Development:"
 msgstr "Trenutni razvoj:"
 
 #: src/Properties.vala:595
-#, fuzzy
 msgid "Original dimensions:"
-msgstr "Izvorna razlučivost:"
+msgstr "Izvorne dimenzije:"
 
 #: src/Properties.vala:598
-#, fuzzy
 msgid "Camera make:"
 msgstr "Proizvođač kamere:"
 
 #: src/Properties.vala:601
-#, fuzzy
 msgid "Camera model:"
 msgstr "Model kamere:"
 
 #: src/Properties.vala:604
-#, fuzzy
 msgid "Flash:"
 msgstr "Bljeskalica:"
 
 #: src/Properties.vala:606
-#, fuzzy
 msgid "Focal length:"
 msgstr "Žarišna duljina:"
 
 #: src/Properties.vala:609
-#, fuzzy
 msgid "Exposure date:"
 msgstr "Datum ekspozicije:"
 
 #: src/Properties.vala:612
-#, fuzzy
 msgid "Exposure time:"
 msgstr "Vrijeme ekspozicije:"
 
 #: src/Properties.vala:615
-#, fuzzy
 msgid "Exposure bias:"
 msgstr "Kompenzacija ekspozicije:"
 
 #: src/Properties.vala:617
-#, fuzzy
 msgid "GPS latitude:"
 msgstr "GPS širina:"
 
 #: src/Properties.vala:620
-#, fuzzy
 msgid "GPS longitude:"
 msgstr "GPS dužina:"
 
 #: src/Properties.vala:623
-#, fuzzy
 msgid "Artist:"
 msgstr "Umjetnik:"
 
 #: src/Properties.vala:625
-#, fuzzy
 msgid "Copyright:"
 msgstr "Autorsko pravo:"
 
 #: src/Properties.vala:627
-#, fuzzy
 msgid "Software:"
 msgstr "Softver:"
 
-#: src/Properties.vala:644
-#, fuzzy
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Dodatne informacije"
 
 #: src/publishing/PublishingPluginHost.vala:11
-#, fuzzy
 msgid "Preparing for upload"
 msgstr "Pripremanje za slanje"
 
 #: src/publishing/PublishingPluginHost.vala:12
-#, fuzzy, c-format
+#, c-format
 msgid "Uploading %d of %d"
 msgstr "Šaljem %d od %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
 msgid "Publishing to %s can’t continue because an error occurred:"
-msgstr ""
+msgstr "Objavljivanje na %s nije moguće zbog greške:"
 
 #: src/publishing/PublishingPluginHost.vala:84
-#, fuzzy
 msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
 "Za objavu na nekoj drugoj usluzi, odaberite jednu iz gornjeg izbornika."
@@ -5036,69 +4923,61 @@ msgstr ""
 #: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Odabrana video snimka je uspješno objavljena."
+msgstr[1] "Odabrane video snimke su uspješno objavljene."
+msgstr[2] "Odabrane video snimke su uspješno objavljene."
 
 #: src/publishing/PublishingUI.vala:109
 msgid "The selected photo was successfully published."
 msgid_plural "The selected photos were successfully published."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Odabrana fotografija je uspješno objavljena."
+msgstr[1] "Odabrane fotografije su uspješno objavljene."
+msgstr[2] "Odabrane fotografije su uspješno objavljene."
 
 #: src/publishing/PublishingUI.vala:115
-#, fuzzy
 msgid "The selected photos/videos were successfully published."
 msgstr "Odabrane fotografije/video snimke su uspješno objavljene."
 
 #: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
-msgstr ""
+msgstr "Preuzimanje informacija računa…"
 
 #: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
-msgstr ""
+msgstr "Prijava…"
 
-#: src/publishing/PublishingUI.vala:193
-#, fuzzy
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Objavi fotografije"
 
-#: src/publishing/PublishingUI.vala:194
-#, fuzzy
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Objavi fotografije _na:"
 
-#: src/publishing/PublishingUI.vala:196
-#, fuzzy
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Objavi video snimke"
 
-#: src/publishing/PublishingUI.vala:197
-#, fuzzy
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Objavi video snimke _na"
 
-#: src/publishing/PublishingUI.vala:199
-#, fuzzy
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Objavi fotografije i video snimke"
 
-#: src/publishing/PublishingUI.vala:200
-#, fuzzy
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Objavi fotografije i video snimke _na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
-#, fuzzy
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Nije moguće objaviti"
 
-#: src/publishing/PublishingUI.vala:411
-#, fuzzy, c-format
+#: src/publishing/PublishingUI.vala:415
+#, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
 "compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
@@ -5111,851 +4990,739 @@ msgstr ""
 "kartici <b>Priključci</b>."
 
 #: src/publishing/Publishing.vala:16
-#, fuzzy
 msgid "Publishing"
 msgstr "Objavljivanje"
 
-#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
-#, fuzzy
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Zakreni"
 
-#: src/Resources.vala:141
-#, fuzzy
+#: src/Resources.vala:142
 msgid "Rotate Right"
-msgstr "Zakreni udesno"
+msgstr "Zakreni desno"
 
-#: src/Resources.vala:142 ui/collection.ui:146
-#, fuzzy
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Zakreni fotografije udesno ( pritisni Ctrl za zakretanje ulijevo)"
 
-#: src/Resources.vala:146
-#, fuzzy
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Zakreni lijevo"
 
-#: src/Resources.vala:147
-#, fuzzy
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Zakreni fotografije ulijevo"
 
-#: src/Resources.vala:150
-#, fuzzy
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Okreni vodoravno"
 
-#: src/Resources.vala:153
-#, fuzzy
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Okreni okomito"
 
-#: 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
-#, fuzzy
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_O programu"
 
-#: src/Resources.vala:156
-#, fuzzy
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Primijeni"
 
-#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: src/Resources.vala:160 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/trash.ui:37
-#, fuzzy
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: src/Resources.vala:160
-#, fuzzy
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
 #: ui/photo.ui:173
-#, fuzzy
 msgid "Fulls_creen"
-msgstr "Cijelozaslonski prikaz"
-
-#: 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/trash.ui:189 ui/trash.ui:192
-#, fuzzy
+msgstr "Cjelozaslonski _prikaz"
+
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: src/Resources.vala:163
-#, fuzzy
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
-msgstr "Napusti _cijelozaslonski prikaz"
+msgstr "Napusti _cjelozaslonski prikaz"
 
-#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
-#, fuzzy
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "_Novo"
 
-#: src/Resources.vala:165
-#, fuzzy
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Sljedeće"
 
-#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: src/Resources.vala:169 src/Resources.vala:318 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
-#, fuzzy
 msgid "_Preferences"
 msgstr "_Osobitosti"
 
-#: src/Resources.vala:169
-#, fuzzy
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "_Prijašnje"
 
-#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: src/Resources.vala:172 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
-#, fuzzy
 msgid "_Quit"
 msgstr "_Zatvori"
 
-#: src/Resources.vala:172
-#, fuzzy
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "_Osvježi"
 
-#: src/Resources.vala:174
-#, fuzzy
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "_Vrati"
 
-#: src/Resources.vala:176
-#, fuzzy
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "Spremi _kao"
 
-#: src/Resources.vala:177
-#, fuzzy
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Poredaj _rastući"
 
-#: src/Resources.vala:178
-#, fuzzy
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Poredaj _padajući"
 
-#: src/Resources.vala:179
-#, fuzzy
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "_Zaustavi"
 
-#: src/Resources.vala:180
-#, fuzzy
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "_Vrati obrisano"
 
-#: src/Resources.vala:181
-#, fuzzy
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "_Normalna veličina"
 
-#: src/Resources.vala:182
-#, fuzzy
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "_Najbolja prilagodba"
 
-#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
 #: ui/photo.ui:144 ui/tags.ui:260
-#, fuzzy
 msgid "Zoom _In"
 msgstr "_Povećaj"
 
-#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
 #: ui/photo.ui:149 ui/tags.ui:265
-#, fuzzy
 msgid "Zoom _Out"
 msgstr "Smanji"
 
-#: src/Resources.vala:187 ui/collection.ui:165
-#, fuzzy
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Poboljšaj"
 
-#: src/Resources.vala:188 ui/collection.ui:162
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
-msgstr ""
+msgstr "Automatski poboljšaj izgled fotografije"
 
-#: src/Resources.vala:191
-#, fuzzy
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Kopiraj prilagodbe boje"
 
-#: src/Resources.vala:192
-#, fuzzy
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopiraj prilagodbe boje primijenjene na fotografiju"
 
-#: src/Resources.vala:195
-#, fuzzy
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Zalijepi prilagodbe boje"
 
-#: src/Resources.vala:196
-#, fuzzy
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Primijeni kopirane prilagodbe boje na odabrane fotografije"
 
-#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
-#, fuzzy
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Obreži"
 
-#: src/Resources.vala:199
-#, fuzzy
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Obreži"
 
-#: src/Resources.vala:200
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
-msgstr ""
+msgstr "Obreži fotografiju na odabranu veličinu"
 
-#: src/Resources.vala:203
-#, fuzzy
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Ispravi"
 
-#: src/Resources.vala:204
-#, fuzzy
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Ispravi fotografiju"
 
-#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
-#, fuzzy
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Crvene oči"
 
-#: src/Resources.vala:207
-#, fuzzy
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Crvene oči"
 
-#: src/Resources.vala:208
-#, fuzzy
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Uklanjanje ili smanjenje efekta crvenih očiju na fotografiji"
 
-#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
-#, fuzzy
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Prilagodi"
 
-#: src/Resources.vala:211
-#, fuzzy
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Prilagodi"
 
-#: src/Resources.vala:212
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
-msgstr ""
+msgstr "Prilagodi boju i tonalitet fotografije"
 
-#: src/Resources.vala:215
-#, fuzzy
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Vrati na izvorno"
 
-#: src/Resources.vala:217
-#, fuzzy
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Poništi _vanjska uređivanja fotografije"
 
-#: src/Resources.vala:218
-#, fuzzy
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Vrati na izvornu fotografiju"
 
-#: src/Resources.vala:221
-#, fuzzy
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Postavi odabranu sliku kao pozadinu radne površine"
 
-#: src/Resources.vala:222
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
-msgstr ""
+msgstr "Postavi kao prezentaciju _radne površine…"
 
-#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: src/Resources.vala:225 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
-#, fuzzy
 msgid "_Undo"
 msgstr "_Vrati"
 
-#: src/Resources.vala:225
-#, fuzzy
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Vrati"
 
-#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: src/Resources.vala:228 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
-#, fuzzy
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: src/Resources.vala:228
-#, fuzzy
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Ponovi"
 
-#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
-#: ui/event.ui:391 ui/event.ui:584
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
-msgstr ""
+msgstr "P_reimenuj događaj…"
 
-#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
-#, fuzzy
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Napravi _glavnu fotografiju za događaj"
 
-#: src/Resources.vala:234
-#, fuzzy
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Napravi glavnu fotografiju za događaj"
 
-#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
-#, fuzzy
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "_Novi događaj"
 
-#: src/Resources.vala:237
-#, fuzzy
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Novi događaj"
 
-#: src/Resources.vala:239
-#, fuzzy
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Premjesti fotografije"
 
-#: src/Resources.vala:240
-#, fuzzy
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Premjesti fotografije u događaj"
 
-#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
-#, fuzzy
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Spoji događaje"
 
-#: src/Resources.vala:243
-#, fuzzy
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Spoji"
 
-#: src/Resources.vala:244
-#, fuzzy
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Kombiniraj više događaja u jedan događaj"
 
-#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
-#, fuzzy
 msgid "_Set Rating"
 msgstr "_Postavi ocjenu"
 
-#: src/Resources.vala:247
-#, fuzzy
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Postavi ocijenu"
 
-#: src/Resources.vala:248
-#, fuzzy
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Promijeni ocjenu fotografije"
 
-#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
-#, fuzzy
 msgid "_Increase"
 msgstr "_Povećaj"
 
-#: src/Resources.vala:251
-#, fuzzy
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Povećaj ocjenu"
 
-#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
-#, fuzzy
 msgid "_Decrease"
 msgstr "_Smanji"
 
-#: src/Resources.vala:254
-#, fuzzy
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Smanji ocjenu"
 
-#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
-#, fuzzy
 msgid "_Unrated"
 msgstr "_Neocijenjeno"
 
-#: src/Resources.vala:257
-#, fuzzy
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Neocjenjeno"
 
-#: src/Resources.vala:258
-#, fuzzy
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Ocijeni neocjenjeno"
 
-#: src/Resources.vala:259
-#, fuzzy
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Postavljanje kao neocjenjeno"
 
-#: src/Resources.vala:260
-#, fuzzy
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Ukloni sve ocjene"
 
-#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
-#, fuzzy
 msgid "_Rejected"
 msgstr "_Odbačene"
 
-#: src/Resources.vala:263
-#, fuzzy
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Odbačene"
 
-#: src/Resources.vala:264
-#, fuzzy
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Ocjeni odbačene"
 
-#: src/Resources.vala:265
-#, fuzzy
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Postavljanje kao odbačeno"
 
-#: src/Resources.vala:266
-#, fuzzy
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Postavi ocjenu kao odbačenu"
 
-#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: src/Resources.vala:269 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
-#, fuzzy
 msgid "Rejected _Only"
 msgstr "Samo _odbačene"
 
-#: src/Resources.vala:269
-#, fuzzy
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Samo odbačene"
 
-#: src/Resources.vala:270
-#, fuzzy
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Prikaži samo odbačene fotografije"
 
-#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: src/Resources.vala:273 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
-#, fuzzy
 msgid "All + _Rejected"
 msgstr "Sve + _Odbačene"
 
-#: src/Resources.vala:273
-#, fuzzy
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Prikaži sve fotografije, zajedno s odbačenima"
 
-#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: src/Resources.vala:276 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
-#, fuzzy
 msgid "_All Photos"
 msgstr "_Sve fotografije"
 
 #. Button tooltip
-#: src/Resources.vala:277
-#, fuzzy
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Prikaži sve fotografije"
 
-#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
 #: ui/tags.ui:144
-#, fuzzy
 msgid "_Ratings"
 msgstr "_Ocjene"
 
-#: src/Resources.vala:280
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
-msgstr ""
+msgstr "Prikaži ocjene svake fotografije"
 
-#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: src/Resources.vala:283 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
 #: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
-#, fuzzy
 msgid "_Filter Photos"
 msgstr "_Filtriraj fotografije"
 
-#: src/Resources.vala:283
-#, fuzzy
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Filtriraj fotografije"
 
-#: src/Resources.vala:284
-#, fuzzy
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ograniči broj prikaza fotografija temeljeno na filteru"
 
-#: src/Resources.vala:287
-#, fuzzy
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: src/Resources.vala:288
-#, fuzzy
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Napravi duplikat fotografije"
 
-#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
 #: ui/tags.ui:17
 msgid "_Export…"
-msgstr ""
+msgstr "_Izvoz…"
 
-#: src/Resources.vala:292
+#: src/Resources.vala:293
 msgid "_Print…"
-msgstr ""
+msgstr "_Ispis…"
 
-#: src/Resources.vala:294
+#: src/Resources.vala:295
 msgid "Pu_blish…"
-msgstr ""
+msgstr "O_bjavi…"
 
-#: src/Resources.vala:296 ui/collection.ui:187
-#, fuzzy
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Objavi na raznim web stranicama"
 
-#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
-msgstr ""
+msgstr "Uredi _naslov…"
 
 #. Button label
-#: src/Resources.vala:300
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
-msgstr ""
+msgstr "Uredi naslov"
 
-#: 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
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
-msgstr ""
+msgstr "Uredi _komentar…"
 
 #. Button label
-#: src/Resources.vala:304
-#, fuzzy
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Uredi komentar"
 
-#: src/Resources.vala:306 ui/event.ui:588
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
-msgstr ""
+msgstr "Uredi događaj _komentara…"
 
-#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
-msgstr ""
+msgstr "_Prilagodi datum i vrijeme…"
 
-#: src/Resources.vala:310
-#, fuzzy
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Podesi datum i vrijeme"
 
-#: 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
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
-msgstr ""
+msgstr "Dodaj _oznake…"
 
-#: src/Resources.vala:313 ui/photo_context.ui:17
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
-msgstr ""
+msgstr "_Dodaj oznake…"
 
 #. Dialog title
-#: src/Resources.vala:315
-#, fuzzy
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Dodaj oznake"
 
-#: src/Resources.vala:324 ui/photo_context.ui:133
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
-msgstr ""
+msgstr "Pošalj_i u…"
 
-#: src/Resources.vala:326
+#: src/Resources.vala:327
 msgid "_Find…"
-msgstr ""
+msgstr "_Pretraži…"
 
-#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
 #: ui/trash.ui:312
-#, fuzzy
 msgid "Find"
 msgstr "Pretraži"
 
-#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
 #: ui/trash.ui:309
-#, fuzzy
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Potraži sliku pomoću teksta u njezinom nazivu ili oznakama."
 
-#: src/Resources.vala:330
-#, fuzzy
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Označi"
 
-#: src/Resources.vala:332
-#, fuzzy
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "_Ukloni oznaku"
 
-#: src/Resources.vala:335
-#, fuzzy, c-format
+#: src/Resources.vala:336
+#, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nemoguće pokretanje uređivača: %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
 msgid "Add Tag “%s”"
-msgstr ""
+msgstr "Dodaj oznaku \"%s\""
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
 msgid "Add Tags “%s” and “%s”"
-msgstr ""
+msgstr "Dodaj oznake \"%s\" i \"%s\""
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-#, fuzzy
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Dodaj oznake"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
 msgid "_Delete Tag “%s”"
-msgstr ""
+msgstr "_Obriši oznaku \"%s\""
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
 msgid "Delete Tag “%s”"
-msgstr ""
+msgstr "Obriši oznaku \"%s\""
 
-#: src/Resources.vala:360
-#, fuzzy
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Obriši oznaku"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
 msgid "Re_name Tag “%s”…"
-msgstr ""
+msgstr "_Preimenuj oznaku \"%s\"”…"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
 msgid "Rename Tag “%s” to “%s”"
-msgstr ""
+msgstr "Preimenuj oznaku \"%s\" u \"%s\""
 
-#: src/Resources.vala:373 ui/tags.ui:454
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
-msgstr ""
+msgstr "_Preimenuj…"
 
-#: 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
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
-msgstr ""
+msgstr "Promijen_i oznake…"
 
-#: src/Resources.vala:376
-#, fuzzy
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Promijeni oznake"
 
-#: src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Označi fotografiju kao “%s”"
+msgstr[1] "Označi fotografije kao “%s”"
+msgstr[2] "Označi fotografije kao “%s”"
 
-#: src/Resources.vala:385
+#: src/Resources.vala:386
 #, c-format
 msgid "Tag the selected photo as “%s”"
 msgid_plural "Tag the selected photos as “%s”"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Označi odabranu fotografiju kao “%s”"
+msgstr[1] "Označi odabrane fotografije kao “%s”"
+msgstr[2] "Označi odabrane fotografije kao “%s”"
 
-#: src/Resources.vala:391
+#: src/Resources.vala:392
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ukloni oznaku “%s” iz _fotografije"
+msgstr[1] "Ukloni oznaku “%s” iz _fotografija"
+msgstr[2] "Ukloni oznaku “%s” iz _fotografija"
 
-#: src/Resources.vala:397
+#: src/Resources.vala:398
 #, c-format
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Ukloni oznaku “%s” iz fotografije"
+msgstr[1] "Ukloni oznaku “%s” iz fotografija"
+msgstr[2] "Ukloni oznaku “%s” iz fotografija"
 
-#: src/Resources.vala:403
+#: src/Resources.vala:404
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
-msgstr ""
+msgstr "Nemoguće preimenovati oznaku u \"%s\" jer ta oznaka već postoji."
 
-#: src/Resources.vala:407
+#: src/Resources.vala:408
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
-msgstr ""
+msgstr "Nemoguće preimenovati pretragu u \"%s\" jer ta pretraga već postoji."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1124
-#, fuzzy
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Spremljena pretraga"
 
-#: src/Resources.vala:412
-#, fuzzy
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Obriši pretragu"
 
-#: src/Resources.vala:415 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
-msgstr ""
+msgstr "_Uredi…"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
-msgstr ""
+msgstr "Pre_imenuj…"
 
-#: src/Resources.vala:419
+#: src/Resources.vala:420
 #, c-format
 msgid "Rename Search “%s” to “%s”"
-msgstr ""
+msgstr "Preimenuj pretragu \"%s\" u \"%s\""
 
-#: src/Resources.vala:423
+#: src/Resources.vala:424
 #, c-format
 msgid "Delete Search “%s”"
-msgstr ""
+msgstr "Obriši pretragu \"%s\""
 
-#: src/Resources.vala:560
-#, fuzzy, c-format
+#: src/Resources.vala:561
+#, c-format
 msgid "Rate %s"
 msgstr "Ocjeni %s"
 
-#: src/Resources.vala:561
-#, fuzzy, c-format
+#: src/Resources.vala:562
+#, c-format
 msgid "Set rating to %s"
 msgstr "Postavi ocjenu na %s"
 
-#: src/Resources.vala:562
-#, fuzzy, c-format
+#: src/Resources.vala:563
+#, c-format
 msgid "Setting rating to %s"
 msgstr "Postavljanje ocjene na %s"
 
-#: src/Resources.vala:564
-#, fuzzy, c-format
+#: src/Resources.vala:565
+#, c-format
 msgid "Display %s"
 msgstr "Prikaži %s"
 
-#: src/Resources.vala:565
-#, fuzzy, c-format
+#: src/Resources.vala:566
+#, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Prikaži samo fotografije sa ocjenom %s"
 
-#: src/Resources.vala:566
-#, fuzzy, c-format
+#: src/Resources.vala:567
+#, c-format
 msgid "%s or Better"
 msgstr "%s ili bolje"
 
-#: src/Resources.vala:567
-#, fuzzy, c-format
+#: src/Resources.vala:568
+#, c-format
 msgid "Display %s or Better"
 msgstr "Prikaži %s ili bolje"
 
-#: src/Resources.vala:568
-#, fuzzy, c-format
+#: src/Resources.vala:569
+#, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Prikaži samo fotografije koje imaju bolju ocijenu od %s"
 
-#: src/Resources.vala:659 ui/trash.ui:255
-#, fuzzy
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Ukloni odabrane fotografije iz smeća"
 
-#: src/Resources.vala:660 ui/offline.ui:221
-#, fuzzy
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Ukloni odabrane fotografije iz fototeke"
 
-#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
-#, fuzzy
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Vrati natrag"
 
-#: src/Resources.vala:663 ui/trash.ui:270
-#, fuzzy
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Vrati odabrane fotografije natrag u fototeku"
 
-#: 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
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
-#, fuzzy
 msgid "Show in File Mana_ger"
 msgstr "Prikaži u upravitelju _datoteka"
 
-#: src/Resources.vala:666
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
-msgstr ""
+msgstr "Otvori odabranu mapu fotografija u upravitelju datoteka"
 
-#: src/Resources.vala:669
-#, fuzzy, c-format
+#: src/Resources.vala:670
+#, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nemoguće otvaranje u upravitelju datoteka: %s"
 
-#: src/Resources.vala:672 ui/offline.ui:224
-#, fuzzy
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: 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
-#, fuzzy
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Premjesti u smeće"
 
-#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: src/Resources.vala:677 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
-#, fuzzy
 msgid "Select _All"
 msgstr "Odaberi _sve"
 
-#: src/Resources.vala:677
-#, fuzzy
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Odaberi sve stavke"
 
@@ -5968,16 +5735,14 @@ msgstr "Odaberi sve stavke"
 #. / 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:738
-#, fuzzy
+#: 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:743
-#, fuzzy
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -5985,8 +5750,7 @@ msgstr "%a %b %d"
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:748
-#, fuzzy
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -5994,8 +5758,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:753
-#, fuzzy
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6003,501 +5766,403 @@ msgstr "%a %b %d"
 #. / 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:758
-#, fuzzy
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %d %b , %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
-#, fuzzy
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Prezentacija"
 
-#: src/searches/Branch.vala:68
-#, fuzzy
-msgid "Saved Searches"
-msgstr "Spremljene pretrage"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "sadrži"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "je točno"
 
-#: src/searches/SavedSearchDialog.vala:164
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "počinje s"
 
-#: src/searches/SavedSearchDialog.vala:165
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "završava s"
 
-#: src/searches/SavedSearchDialog.vala:166
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "nije postavljeno"
 
-#: src/searches/SavedSearchDialog.vala:168
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "je postavljen"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
-msgstr ""
+msgstr "je"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
-msgstr ""
+msgstr "nije"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "bilo koja fotografija"
 
-#: src/searches/SavedSearchDialog.vala:250
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "raw fotografija"
 
-#: src/searches/SavedSearchDialog.vala:251
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "video snimka"
 
-#: src/searches/SavedSearchDialog.vala:305
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "ima"
 
-#: src/searches/SavedSearchDialog.vala:306
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "nema"
 
-#: src/searches/SavedSearchDialog.vala:311
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "promjene"
 
-#: src/searches/SavedSearchDialog.vala:312
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "unutrašnje promjene"
 
-#: src/searches/SavedSearchDialog.vala:313
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "vanjske promjene"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "oznečeno"
 
-#: src/searches/SavedSearchDialog.vala:368
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "neoznačeno"
 
-#: src/searches/SavedSearchDialog.vala:431
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "i više"
 
-#: src/searches/SavedSearchDialog.vala:432
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "samo"
 
-#: src/searches/SavedSearchDialog.vala:433
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "i niže"
 
-#: src/searches/SavedSearchDialog.vala:495
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "je nakon"
 
-#: src/searches/SavedSearchDialog.vala:496
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "je prije"
 
-#: src/searches/SavedSearchDialog.vala:497
-#, fuzzy
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "je između"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:691
-#, fuzzy
-msgid "Search"
-msgstr "Pretraga"
-
-#: src/searches/SavedSearchDialog.vala:696
-#, fuzzy
-msgid "Cancel"
-msgstr "Odustani"
-
-#: src/searches/SavedSearchDialog.vala:697
-#, fuzzy
-msgid "OK"
-msgstr "U redu"
-
-#: src/searches/SavedSearchDialog.vala:716
-#, fuzzy
-msgid "any"
-msgstr "bilo koje"
-
-#: src/searches/SavedSearchDialog.vala:717
-#, fuzzy
-msgid "all"
-msgstr "sve"
-
-#: src/searches/SavedSearchDialog.vala:718
-#, fuzzy
-msgid "none"
-msgstr "nijedan"
+msgstr "i"
 
 #: src/searches/SearchBoolean.vala:157
-#, fuzzy
 msgid "Any text"
 msgstr "Bilo koji tekst"
 
 #: src/searches/SearchBoolean.vala:160
-#, fuzzy
 msgid "Title"
 msgstr "Naziv"
 
 #: src/searches/SearchBoolean.vala:163
-#, fuzzy
 msgid "Tag"
 msgstr "Oznaka"
 
 #: src/searches/SearchBoolean.vala:166
-#, fuzzy
 msgid "Comment"
 msgstr "Komentar"
 
 #: src/searches/SearchBoolean.vala:169
-#, fuzzy
 msgid "Event name"
 msgstr "Naziv događaja"
 
 #: src/searches/SearchBoolean.vala:172
-#, fuzzy
 msgid "File name"
 msgstr "Naziv datoteke"
 
 #: src/searches/SearchBoolean.vala:175
-#, fuzzy
 msgid "Media type"
 msgstr "Vrsta medija"
 
 #: src/searches/SearchBoolean.vala:178
-#, fuzzy
 msgid "Flag state"
 msgstr "Stanje oznake"
 
 #: src/searches/SearchBoolean.vala:181
-#, fuzzy
 msgid "Photo state"
 msgstr "Stanje fotografije"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
-#, fuzzy
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Ocjena"
 
 #: src/searches/SearchBoolean.vala:187
-#, fuzzy
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Spremljene pretrage"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organizirajte svoje spremljene pretrage"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
-msgstr ""
+msgstr "★+ Ocjena"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
-msgstr ""
+msgstr "★★+ Ocjena"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
-msgstr ""
+msgstr "★★★+ Ocjena"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
-msgstr ""
+msgstr "★★★★+ Ocjena"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
-msgstr ""
+msgstr "★★★★★+ Ocjena"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
-msgstr ""
+msgstr "Greška učitavanja grafičkog sučelja trake pretrage %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1073
-#, fuzzy
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Zatvori"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
-#, fuzzy
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/SearchFilter.vala:1086
-#, fuzzy
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Video snimke"
 
-#: src/SearchFilter.vala:1089
-#, fuzzy
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW fotografije"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-#, fuzzy
-msgid "Settings"
-msgstr "Postavke"
+"Koristi spremljene pretrage za filtriranje stavki u trenutnom prikazu"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
-#, fuzzy
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Natrag"
 
-#: src/SlideshowPage.vala:162
-#, fuzzy
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Idi na prijašnju fotografiju"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
-#, fuzzy
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pauziraj"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
-#, fuzzy
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pauziraj prezentaciju"
 
-#: src/SlideshowPage.vala:174
-#, fuzzy
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Sljedeća"
 
-#: src/SlideshowPage.vala:176
-#, fuzzy
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Idi na sljedeću fotografiju"
 
-#: src/SlideshowPage.vala:184
-#, fuzzy
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Postavke"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Promijeni postavke prezentacije"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
-#, fuzzy
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Nedostaju sve izvorne datoteke fotografije."
 
-#: src/SlideshowPage.vala:270
-#, fuzzy
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Reproduciraj"
 
-#: src/SlideshowPage.vala:271
-#, fuzzy
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Nastavi prezentaciju"
 
 #: src/slideshow/Slideshow.vala:22
-#, fuzzy
 msgid "Slideshow Transitions"
 msgstr "Prijelazi prezentacije"
 
 #: src/slideshow/TransitionEffects.vala:98
-#, fuzzy
 msgid "(None)"
 msgstr "(nema)"
 
-#: src/slideshow/TransitionEffects.vala:287
-#, fuzzy
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Nepoznato"
 
 #: src/slideshow/TransitionEffects.vala:339
-#, fuzzy
 msgid "Random"
 msgstr "Naizmjenično"
 
-#: src/tags/Branch.vala:131
-#, fuzzy
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Oznake"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organizirajte i pregledajte oznake svojih fotografija"
+
 #: src/Tag.vala:830
-#, fuzzy
 msgid "untitled"
 msgstr "neimenovano"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
-#, fuzzy
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Izvezi video snimke"
 
-#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
 msgid "Toggle _Flag"
-msgstr ""
+msgstr "Uklj/Isklj oznaku"
 
-#: 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
-#, fuzzy
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Razvijatelj"
 
-#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
-msgid "Open with E_xternal Editor"
-msgstr ""
-
-#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
-#: ui/photo_context.ui:124 ui/tags.ui:379
-#, fuzzy
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
 msgstr "Prikaži dog_ađaj fotografije"
 
 #: 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/trash.ui:5
-#, fuzzy
 msgid "_File"
 msgstr "_Datoteka"
 
 #: ui/direct.ui:13
 msgid "Save _As…"
-msgstr ""
+msgstr "Spremi _kao…"
 
 #: 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/trash.ui:87
-#, fuzzy
 msgid "_View"
 msgstr "_Pogled"
 
 #: ui/direct.ui:81 ui/photo.ui:156
-#, fuzzy
 msgid "Fit to _Page"
 msgstr "Prilagodi po _stranici"
 
 #: ui/direct.ui:86 ui/photo.ui:161
-#, fuzzy
 msgid "Zoom _100%"
 msgstr "Prilagodi na _100%"
 
 #: ui/direct.ui:91 ui/photo.ui:166
-#, fuzzy
 msgid "Zoom _200%"
 msgstr "Prilagodi na _200%"
 
 #: ui/direct.ui:98 ui/photo.ui:187
-#, fuzzy
 msgid "_Photo"
 msgstr "_Fotografija"
 
 #: ui/direct.ui:101 ui/photo.ui:190
-#, fuzzy
 msgid "_Previous Photo"
 msgstr "_Prijašnja fotografija"
 
 #: ui/direct.ui:105 ui/photo.ui:194
-#, fuzzy
 msgid "_Next Photo"
 msgstr "_Sljedeća fotografija"
 
 #: ui/direct.ui:131 ui/photo.ui:220
-#, fuzzy
 msgid "T_ools"
 msgstr "A_lati"
 
-#: 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
-#, fuzzy
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Često postavljana pitanja"
 
-#: 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
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
-msgstr ""
+msgstr "_Prijavi problem…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
-msgstr ""
+msgid "_Import From Folder…"
+msgstr "_Uvezi iz mape…"
 
 #: 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 ""
+msgstr "Uvezi iz _aplikacije…"
 
 #: 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
-#, fuzzy
 msgid "Empty T_rash"
 msgstr "Isprazni _smeće"
 
 #: 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
-#, fuzzy
 msgid "_Find"
 msgstr "_Pretraži"
 
@@ -6505,47 +6170,41 @@ msgstr "_Pretraži"
 #: 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 ""
+msgstr "No_va spremljena pretraga…"
 
 #: 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
-#, fuzzy
 msgid "_Basic Information"
 msgstr "_Osnovne informacije"
 
 #: 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
-#, fuzzy
 msgid "E_xtended Information"
 msgstr "_Proširene informacije"
 
 #: 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
-#, fuzzy
 msgid "_Search Bar"
 msgstr "T_raka pretrage"
 
 #: 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
-#, fuzzy
 msgid "S_idebar"
 msgstr "B_očna traka"
 
 #: 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 ""
+msgstr "A_latna traka"
 
 #: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
-#, fuzzy
 msgid "_Comments"
 msgstr "_Komentari"
 
 #: 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
-#, fuzzy
 msgid "Sort _Events"
 msgstr "Razvrstaj _događaje"
 
@@ -6553,318 +6212,406 @@ msgstr "Razvrstaj _događaje"
 #: 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
-#, fuzzy
 msgid "_Ascending"
 msgstr "_Rastući"
 
 #: 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
-#, fuzzy
 msgid "D_escending"
 msgstr "_Padajući"
 
-#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#, fuzzy
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
 msgid "Even_ts"
 msgstr "Događaji"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr ""
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
-#, fuzzy
 msgid "_Titles"
 msgstr "Nas_lovi"
 
-#: 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
-#, fuzzy
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "O_znake"
 
 #: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
-#, fuzzy
 msgid "Sort _Photos"
 msgstr "Razvrstaj _fotografije"
 
 #: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
-#, fuzzy
 msgid "By _Title"
 msgstr "Po _Naslovu"
 
 #: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
-#, fuzzy
 msgid "By _Filename"
 msgstr "Po _nazivu datoteke"
 
 #: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
-#, fuzzy
 msgid "By Exposure _Date"
 msgstr "Po datumu _ekspozicije"
 
 #: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
-#, fuzzy
 msgid "By _Rating"
 msgstr "Po _ocjeni"
 
 #: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
 #: ui/tags.ui:251
 msgid "_Descending"
-msgstr ""
+msgstr "_Padajući"
 
 #: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
-#, fuzzy
 msgid "_Photos"
 msgstr "_Fotografije"
 
 #: ui/import_queue.ui:8
-#, fuzzy
 msgid "_Stop Import"
 msgstr "_Zaustavi uvoz"
 
-#: ui/printing_widget.ui:19
-#, fuzzy
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Veličina ispisa slike</b>"
-
-#: ui/printing_widget.ui:36
-#, fuzzy
-msgid "Use a _standard size:"
-msgstr "Koristi _standardnu veličinu:"
-
-#: ui/printing_widget.ui:80
-#, fuzzy
-msgid "Use a c_ustom size:"
-msgstr "Koristi _prilagođenu veličinu:"
-
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
-msgstr ""
-
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-#, fuzzy
-msgid "cm"
-msgstr "cm"
-
-#: ui/printing_widget.ui:173
-#, fuzzy
-msgid "_Match photo aspect ratio"
-msgstr "_Uskladi omjer fotografije"
-
-#: ui/printing_widget.ui:197
-#, fuzzy
-msgid "_Autosize:"
-msgstr "_Automatska veličina:"
-
-#: ui/printing_widget.ui:237
-#, fuzzy
-msgid "<b>Titles</b>"
-msgstr "<b>Naslovi</b>"
-
-#: ui/printing_widget.ui:254
-#, fuzzy
-msgid "Print image _title"
-msgstr "Ispiši naslov _slike"
-
-#: ui/printing_widget.ui:297
-#, fuzzy
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Razlučivost u pikselima</b>"
-
-#: ui/printing_widget.ui:317
-#, fuzzy
-msgid "_Output photo at:"
-msgstr "_Izlaz slike na:"
-
-#: ui/printing_widget.ui:351
-#, fuzzy
-msgid "pixels per inch"
-msgstr "piksela po inču"
-
-#: ui/set_background_dialog.ui:9
-#, fuzzy
-msgid "Set as Desktop Background"
-msgstr "Postavi kao pozadinu radne površine"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-#, fuzzy
-msgid "Use for Desktop"
-msgstr "Koristi za radnu površinu"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-#, fuzzy
-msgid "Use for Lock Screen"
-msgstr "Koristi za zaključani zaslon"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr ""
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr ""
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr ""
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr ""
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr ""
-
-#: ui/shotwell.ui:65
-#, fuzzy
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "bijela"
 
-#: ui/shotwell.ui:92
-#, fuzzy
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "crna"
 
-#: ui/shotwell.ui:123
-#, fuzzy
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Prikaz"
 
-#: ui/shotwell.ui:160
-#, fuzzy
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Pozadina:"
 
-#: ui/shotwell.ui:175
-#, fuzzy
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Uvezi fotografije u:"
 
-#: ui/shotwell.ui:186
-#, fuzzy
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "_Nadziri mapu fototeke za nove datoteke"
 
-#: ui/shotwell.ui:209
-#, fuzzy
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Uvažanje"
 
-#: ui/shotwell.ui:226
-#, fuzzy
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Struktura mape:"
 
-#: ui/shotwell.ui:240
-#, fuzzy
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Primjer:"
 
-#: ui/shotwell.ui:249
-#, fuzzy
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "P_reimenuj uvezene datoteke u mala slova"
 
-#: ui/shotwell.ui:271
-#, fuzzy
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metapodaci"
 
-#: ui/shotwell.ui:284
-#, fuzzy
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Zapiši oznake, naslove i ostale _metapodatke u fotografije"
 
-#: ui/shotwell.ui:306
-#, fuzzy
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW razvijatelj"
 
-#: ui/shotwell.ui:323
-#, fuzzy
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Uobičajeno:"
 
-#: ui/shotwell.ui:377
-#, fuzzy
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "_Uzorak:"
 
-#: ui/shotwell.ui:439
-#, fuzzy
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Prozirna pozadina:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Kockasta"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Jednobojno"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "Vanjs_ki uređivač fotografija:"
 
-#: ui/shotwell.ui:456
-#, fuzzy
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Vanjski uređivač _RAW datoteka:"
 
-#: ui/shotwell.ui:517
-#, fuzzy
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Vanjski uređivači"
 
-#: ui/shotwell.ui:542
-#, fuzzy
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Priključci"
 
-#: ui/shotwell.ui:590
-#, fuzzy
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell osobitosti"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Veličina ispisa slike</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "Koristi _standardnu veličinu:"
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "Koristi _prilagođenu veličinu:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "in."
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "_Uskladi omjer fotografije"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "_Automatska veličina:"
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Naslovi</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Ispiši naslov _slike"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Razlučivost u pikselima</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "_Izlaz slike na:"
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "piksela po inču"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Pretraga"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Odustani"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "U redu"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "_Naziv pretrage:"
 
-#: ui/shotwell.ui:644
-#, fuzzy
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "_Podudara se"
 
-#: ui/shotwell.ui:671
-#, fuzzy
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "bilo koje"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "sve"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "nijedan"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "od sljedećih:"
 
-#: ui/shotwell.ui:752
-#, fuzzy
-msgid "label"
-msgstr "naslov"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Postavi kao pozadinu radne površine"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Koristi za radnu površinu"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Koristi za zaključani zaslon"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Postavi kao prezentaciju radne površine"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Generiraj prezentaciju za pozadinu radne površine"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Prikaži svaku fotografiju za"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "razdoblje vremena"
 
-#: ui/shotwell.ui:903
-#, fuzzy
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr ""
+"Koliko će dugo svaka fotografija biti prikazana kao pozadina radne površine"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova _oznaka…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Odgoda:"
 
-#: ui/shotwell.ui:917
-#, fuzzy
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Efekt _prijelaza:"
 
-#: ui/shotwell.ui:931
-#, fuzzy
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "O_dgoda prijelaza:"
 
-#: ui/shotwell.ui:941
-#, fuzzy
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Prikaži n_aslov"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
-#, fuzzy
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekunda"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nova _oznaka…"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "naslov"
 
 #: ui/trash.ui:285
-#, fuzzy
 msgid "Delete all photos in the trash"
 msgstr "Obriši sve fotografije u smeću"
+
+#~ msgid "Width or height"
+#~ msgstr "Širina ili visina"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Usluge za uvoz ključnih podataka"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Nemoguće pročitati odabranu datoteku F-Spot baze podataka: greška pri "
+#~ "čitanju tablice fotografija"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags table"
+#~ msgstr ""
+#~ "Nemoguće pročitati odabranu datoteku F-Spot baze podataka: greška pri "
+#~ "čitanju tablice oznaka"
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Ručno odredi uvoz datoteke F-Spot baze podataka:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Nemoguće otvoriti odabranu datoteku F-Spot baze podataka: ovu inačicu F-Spot "
+#~ "baze podataka Shotwell ne podržava"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or is "
+#~ "not an F-Spot database"
+#~ msgstr ""
+#~ "Nemoguće otvoriti odabranu datoteku F-Spot baze podataka: datoteka ne "
+#~ "postoji ili nije F-Spot baza podataka"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Pripremanje za uvoz"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Dobrodošli u uslugu za uvoz fototeke iz F-Spota.\n"
+#~ "\n"
+#~ "Odaberite datoteku F-Spot baze podataka."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the existing "
+#~ "libraries found by Shotwell or by selecting an alternative F-Spot database "
+#~ "file."
+#~ msgstr ""
+#~ "Dobrodošli u uslugu za uvoz fototeke iz F-Spota.\n"
+#~ "\n"
+#~ "Odaberite fototeku za uvoz, odabirući jednu od fototeka koju je već otkrio "
+#~ "Shotwell ili odabirući alternativnu datoteku F-Spot baze podataka."
+
+#, c-format
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell je pronašao %d fotografija u F-Spot fototeci te ih trenutno uvozi. "
+#~ "Duplikati će se automatski otkriti i ukloniti.\n"
+#~ "\n"
+#~ "Možete zatvoriti ovaj okvir i započeti s korištenjem Shotwell dok se uvoz "
+#~ "obavlja u pozadini."
+
+#, c-format
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot fototeka: %s"
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Broj ovlasti:"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Upiši potvrdni broj koji se pojavi nakon što se prijavite na Flickr putem "
+#~ "vašeg web preglednika."
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Izvezi fotografije/video snimke"
+
+#~ msgid "The Shotwell developers"
+#~ msgstr "Shotwell razvijatelji"
+
+#, c-format
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "'%s' nije valjani odgovor na OAuth zahtjev ovjere"
+
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Otvori s v_anjskim uređivačem"
+
+#~ msgid "_Import from Folder…"
+#~ msgstr "_Uvezi iz mape..."
+
+#~ msgid "R_emove from Library"
+#~ msgstr "U_kloni iz fototeke"
diff --git a/po/hu.gmo b/po/hu.gmo
index fb93e22..50570c5 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 32429e2..85121bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,32 +1,32 @@
 # Hungarian translation for shotwell.
-# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017. Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the shotwell package.
 #
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2011, 2012, 2014, 2015, 2016, 2017.
-# L. Csordas <csola48@gmail.com>, 2012.
-# lsbeeler <lucas@yorba.org>, 2011.
-# Balázs Úr <urbalazs at gmail dot com>, 2014, 2016, 2017.
-# Meskó Balázs <meskobalazs@gmail.com>, 2016.
+# Gábor Kelemen <kelemeng at gnome dot hu>, 2011, 2012, 2014, 2015, 2016, 2017.
+# László Csordás <csola48 at gmail dot com>, 2012.
+# lsbeeler <lucas at yorba dot org>, 2011.
+# Balázs Úr <urbalazs at gmail dot com>, 2014, 2016, 2017, 2018.
+# Balázs Meskó <meskobalazs at gmail dot com>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-08-31 04:36+0000\n"
-"PO-Revision-Date: 2017-09-10 14:37+0200\n"
-"Last-Translator: Meskó Balázs <meskobalazs@fedoraproject.org>\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-26 23:42+0100\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\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: Poedit 2.0.3\n"
+"X-Generator: Lokalize 1.2\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
@@ -70,16 +70,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "A Shotwell fejlesztői"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fényképkezelő"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Rendszerezze a fényképeit"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -91,15 +91,15 @@ msgstr ""
 "piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell megjelenítő"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Fénykép-megjelenítő"
 
@@ -128,7 +128,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "A titkos token az oauth kérések aláírására"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "alapértelmezett méret"
 
@@ -156,9 +156,9 @@ msgid "URL of the Rajce server."
 msgstr "A Rajce kiszolgáló URL-e."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "felhasználónév"
 
@@ -175,7 +175,7 @@ msgid "user token, if remembered."
 msgstr "felhasználói token, ha meg lett jegyezve."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "legutóbbi kategória"
 
@@ -184,7 +184,7 @@ msgid "The last selected Rajce category."
 msgstr "A legutóbb választott Rajce kategória."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "legutóbbi fényképméret"
 
@@ -224,11 +224,11 @@ msgstr ""
 "után"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "érzékeny adatok eltávolítása a feltöltésekből"
 
@@ -488,10 +488,27 @@ msgid "A grayscale color for use as the background color."
 msgstr "Háttérszínként használandó szürkeárnyalatos szín."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "az átlátszó képek háttere"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Az átlátszó képekhez használt háttér."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "az átlátszó homogén háttér színe"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"A használandó szín, ha az átlátszó képek háttere homogén színre van állítva"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "A „Fényképek elrejtése” beállítás bejelölési állapota."
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -499,29 +516,29 @@ msgstr ""
 "A „már importált fényképek elrejtése” beállítás legutóbbi állapota az "
 "importálási oldalon."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "késleltetés"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "A fényképek közti késleltetés (másodpercekben) diavetítéskor."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "átmenet késleltetése"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "A fényképek közti átmenetek futásának ideje (másodpercekben) diavetítéskor."
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "átmenet effektus azonosító"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -529,67 +546,67 @@ msgstr ""
 "Az átmeneti effektus azonosítója, amely a fényképek közti váltás során lesz "
 "használva diavetítéskor"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Cím megjelenítése"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Megjelenjen-e a fénykép címe diavetítés alatt"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "gyűjtemény alkalmazásablak maximalizálása"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Igaz, ha maximalizált a gyűjtemény alkalmazásablak, különben hamis."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "a gyűjtemény alkalmazásablak szélessége"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "A gyűjtemény alkalmazásablak legutóbb mentett szélessége."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "a gyűjtemény alkalmazásablak magassága"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "A gyűjtemény alkalmazásablak legutóbb mentett magassága."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "közvetlen szerkesztés ablak maximalizálása"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "Igaz, ha maximalizált a közvetlen szerkesztés ablak, különben hamis."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "közvetlen szerkesztés ablak szélessége"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "A közvetlen szerkesztés alkalmazásablak legutóbb mentett szélessége."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "közvetlen szerkesztés ablak magassága"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "A közvetlen szerkesztés alkalmazásablak legutóbb mentett magassága."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "oldalsáv elválasztó pozíciója"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -597,30 +614,30 @@ msgstr ""
 "Az elválasztó legutóbb mentett pozíciója az oldalsáv és a gyűjteménynézet "
 "ablaka között."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importálási könyvtár"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Könyvtár, amelybe az importált fényképfájlok kerülnek."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "új fájlok figyelése a gyűjteménykönyvtárban"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Ha igaz, akkor a gyűjteménykönyvtárba helyezett fájlok automatikus "
 "importálásra kerülnek."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "metaadatok írása az eredeti fájlokba"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -628,11 +645,11 @@ msgstr ""
 "Ha igaz, akkor a metaadatok (címkék, címek stb.) beírásra kerülnek az "
 "eredeti fényképfájlokba."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "kisbetűs fájlnevek használata"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -640,11 +657,11 @@ msgstr ""
 "Ha igaz, akkor a Shotwell átalakít minden fájlnevet kisbetűsre a fényképek "
 "importálásakor"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "könyvtárminta"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -652,11 +669,11 @@ msgstr ""
 "A névmintát kódoló karakterlánc, amely a fényképkönyvtárak elnevezésekor "
 "kerül használatra importáláskor."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "egyéni könyvtárminta"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -664,30 +681,30 @@ msgstr ""
 "A névmintát kódoló egyéni karakterlánc, amely a fényképkönyvtárak "
 "elnevezésekor kerül használatra importáláskor."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "RAW előhívó alapbeállítás"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr ""
 "Az alapértelmezett beállítás, hogy melyik RAW előhívót használja a Shotwell."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "A legutóbb használt vágás egyéni képarány menüpontja."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Numerikus kód, amely a felhasználó által legutóbb választott vágás "
 "menüpontot jelöli."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "A legutóbb használt vágás egyéni képarányának számlálója."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -695,11 +712,11 @@ msgstr ""
 "Egy pozitív egész, amely a felhasználó által megadott, legutóbb használt "
 "egyéni vágási arány szélesség komponensét jelöli."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "A legutóbb használt vágás egyéni képarányának nevezője."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -707,144 +724,144 @@ msgstr ""
 "Egy pozitív egész, amely a felhasználó által megadott, legutóbb használt "
 "egyéni vágási arány magasság komponensét jelöli."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "külső fényképszerkesztő"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "A fényképek szerkesztéséhez használt külső alkalmazás."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "külső RAW szerkesztő"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "A RAW fájlok szerkesztésére használt külső alkalmazás."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Beállítás az exportálási párbeszédablakon: hogyan vágja le a képeket"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "metaadatok exportálása"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Beállítás az exportálási párbeszédablakon: metaadatok exportálása"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "formátumbeállítás, különleges érték"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Beállítás az exportálási párbeszédablakon: formátumbeállítás, különleges "
 "érték"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "formátumbeállítás, típusérték"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 "Beállítás az exportálási párbeszédablakon: formátumbeállítás, típusérték"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "JPEG minőség beállítás"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Beállítás az exportálási párbeszédablakon: jpeg minőség beállítás"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "maximális képméret"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Beállítás az exportálási párbeszédablakon: maximális képméret"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "legutóbb használt közzétételi szolgáltatás"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Numerikus kód, amely a legutóbbi fénykép-közzétételi szolgáltatást képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "alapértelmezett közzétételi szolgáltatás"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "hozzáférési token"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "A pillanatnyilag bejelentkezett munkamenet Facebook OAuth tokenje, ha van"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "felhasználóazonosító"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "A pillanatnyilag bejelentkezett Facebook felhasználó azonosítója, ha van"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "felhasználónév"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "A pillanatnyilag bejelentkezett Facebook felhasználó neve, ha van"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "alapértelmezett méretkód"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Numerikus kód, amely a Facebookon közzétett fényképek alapértelmezett "
 "méretét képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 "A Facebookra feltöltött képek metaadatai előbb eltávolításra kerüljenek-e"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth hozzáférési fázis token"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
-"A jelenleg bejelentkezett Flickr felhasználó engedélyezési tokene, ha van"
+"A jelenleg bejelentkezett Flickr felhasználó engedélyezési tokenje, ha van"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth hozzáférési fázis token titka"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -852,23 +869,23 @@ msgstr ""
 "A bejelentkezett Flickr felhasználó engedélyezési tokenje felé érkező "
 "kérések aláírására használt kriptográfiai titok, ha van"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 "A jelenleg bejelentkezett Flickr felhasználó felhasználóneve, ha van ilyen"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Numerikus kód, amely a Flickr-re feltöltött képek alapértelmezett méretét "
 "képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "alapértelmezett láthatóság"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -876,19 +893,19 @@ msgstr ""
 "Numerikus kód, amely a Flickr-re feltöltött képek alapértelmezett "
 "láthatóságát képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "A Flickr-re feltöltött képek metaadatai előbb eltávolításra kerüljenek-e"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "frissítési token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -896,7 +913,7 @@ msgstr ""
 "Az OAuth token, amelyet a jelenleg bejelentkezett felhasználó Picasa "
 "Webalbumok munkamenetének frissítésére használ."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -904,66 +921,66 @@ msgstr ""
 "Numerikus kód, amely a legutóbb, a Picasa Webalbumokba történő feltöltéskor "
 "használt alapértelmezett fényképméretet képviseli."
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "legutóbbi album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "A legutóbbi album neve, ahová a felhasználó képeket töltött fel, ha van "
 "ilyen."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "A Picasára feltöltött képek metaadatai előbb eltávolításra kerüljenek-e"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "A Piwigo kiszolgáló URL-e."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo felhasználónév, ha be van jelentkezve."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "jelszó"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo jelszó, ha be van jelentkezve."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "jelszó megjegyzése"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Ha igaz, megjegyzi a Piwigo jelszót."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "A legutóbb választott Piwigo kategória."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "legutóbbi engedélyszint"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "A legutóbb választott Piwigo engedélyszint."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -971,21 +988,21 @@ msgstr ""
 "Numerikus kód, amely a legutóbbi, Piwigóra történő feltöltéskor használt "
 "fényképméret előbeállítást képviseli."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "A Piwigóra feltöltött képek metaadatai előbb eltávolításra kerüljenek-e"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ha be van állítva cím, de megjegyzés nincs, akkor a cím használata "
 "megjegyzésként a Piwigo feltöltéseknél"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -993,11 +1010,11 @@ msgstr ""
 "A Piwigóra feltöltött fájlok megjegyzése legyen-e beállítva a címből, ha a "
 "cím meg van adva, de a megjegyzés nincs"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "ne töltse fel a címkéket a Piwigora feltöltéskor"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1005,46 +1022,46 @@ msgstr ""
 "A Piwigóra feltöltött képek metaadatai előbb eltávolításra kerüljenek-e, így "
 "ezek a címkék nem fognak megjelenni a távoli Piwigo kiszolgálón."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3 felhasználónév"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API kulcs"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3 API kulcs"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3 oldal URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
 "A Gallery3-ra feltöltött képek metaadatai előbb eltávolításra kerüljenek-e"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "a feltöltött kép méretezési megszorítása"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "A feltöltendő kép méretezési megszorításának azonosítója"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "a feltöltött kép fő tengelyeinek pixelei"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1052,7 +1069,7 @@ msgstr ""
 "A feltöltendő képek fő tengelyeinek pixelei; csak akkor használt, ha a "
 "scaling-constraint-id egy megfelelő érték"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1060,65 +1077,65 @@ msgstr ""
 "Az OAuth token, amely a pillanatnyilag bejelentkezett felhasználó YouTube "
 "munkamenetének frissítésére használt, ha van ilyen."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "legutóbb használt importálási szolgáltatás"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Numerikus kód, amely a fényképek legutóbbi importálási forrását képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "értelmező állapot sütije"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Numerikus kód, amely lementi a GStreamer bővítmény környezeti állapotát"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "tartalomelrendezési mód"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr "Numerikus kód, amely leírja a képek elrendezését nyomtatáskor"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "tartalom ppi"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "A nyomtatónak nyomtatáskor kiküldött pixelek száma hüvelykenként (ppi)"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "tartalom szélessége"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "A nyomtatott emulzió szélessége az oldalon nyomtatáskor"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "tartalom magassága"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "A nyomtatott emulzió magassága az oldalon nyomtatáskor"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "tartalom mértékegysége"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1126,11 +1143,11 @@ msgstr ""
 "Numerikus kód, amely a nyomtatás során használt mértékegységet képviseli "
 "(hüvelyk vagy centiméter)"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "kép / oldal kód"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1138,22 +1155,22 @@ msgstr ""
 "Numerikus kód, amely a jelenleg kiválasztott, nyomtatás során érvényes kép / "
 "oldal módot képviseli"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "méret kiválasztása"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "A jelenlegi nyomtatási méret indexe a szabványos méretek előre meghatározott "
 "listájában"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "méretarány megtartása"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1161,11 +1178,11 @@ msgstr ""
 "Meghatározza, hogy az egyéni nyomtatási méretek képátlója megegyezzen-e az "
 "eredeti képével"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "címek nyomtatása"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1173,189 +1190,189 @@ msgstr ""
 "Igaz, ha a fénykép neve is nyomtatásra kerül a kinyomtatott fényképre, "
 "különben hamis."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "címek betűkészlete"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Nyomtatáskor, a fénykép címekhez használt betűkészlet neve."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "facebook közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha a Facebook közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "flickr közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Flickr közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "picasa közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha a Picasa Webalbumok közzétételi bővítmény engedélyezett, különben "
 "hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "youtube közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "Igaz, ha a YouTube közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "piwigo közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Piwigo közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "yandex közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha a Yandex.Fotki közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "tumblr közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Tumblr közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "rajce közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Rajce közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "gallery3 közzétételi bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha a Gallery3 közzétételi bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "F-Spot importálás bővítmény engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Igaz, ha az F-Spot importálás bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "összecsuklás diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha az Összecsuklás diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "elhalványodás diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha az Elhalványodás diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "csúszás diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Csúszás diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "óra diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha az Óra diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "kör diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Kör diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "körök diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Körök diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "lamellák diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Lamellák diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "négyzetek diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Igaz, ha a Négyzetek diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "csíkok diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr "Igaz, ha a Csíkok diaátmenet bővítmény engedélyezett, különben hamis"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "sakktábla diaátmenet engedélyezése"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1389,24 +1406,7 @@ msgstr ""
 "A Facebookra való feltöltés folytatásához indítsa újra a Shotwellt, és "
 "próbálja újra a feltöltést."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Írja be a megerősítési számot, amely a Flickr-be való bejelentkezés után "
-"jelenik meg a böngészőjében."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Hitelesítési szám:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Foly_tatás"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1419,20 +1419,15 @@ msgstr ""
 "böngészőből. A bejelentkezés során jogosultságot kell adnia a Shotwell "
 "Connectnek, hogy hozzáférjen a Flickr fiókjához."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Felkészülés a bejelentkezésre…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel a Flickrre "
-"nem folytatódhat."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "A Flickr felhatalmazás meghiúsult"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Felhatalmazás ellenőrzése…"
 
@@ -1450,7 +1445,7 @@ msgstr ""
 "A Google szolgáltatásra való feltöltés folytatásához indítsa újra a "
 "Shotwellt, és próbálja újra a feltöltést."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1463,7 +1458,7 @@ msgstr ""
 "böngészőből. A bejelentkezés során jogosultságot kell adnia a Shotwell "
 "Connectnek, hogy hozzáférjen a Picasa Webalbumokhoz."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1477,11 +1472,51 @@ msgstr ""
 "állítania a YouTube-bal való használathoz. A legtöbb fiókot a böngészőből is "
 "beállíthatja, ha bejelentkezik a YouTube oldalon legalább egyszer."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-mail cím"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Jelszó"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Bejelentkezés"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Adja meg a Tumblr fiókjához tartozó felhasználónevet és jelszót."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "A felhasználónév és/vagy jelszó érvénytelen. Próbálja újra"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Érvénytelen felhasználónév vagy jelszó"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "A felület nem tölthető be: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "A Shotwell weboldalának meglátogatása"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Peter Bojtos <ptr at ulx dot hu>\n"
@@ -1505,7 +1540,7 @@ msgstr ""
 "  csola48 https://launchpad.net/~mail-csordaslaszlo"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
@@ -1513,7 +1548,7 @@ msgstr ""
 "tartozik."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1522,20 +1557,20 @@ msgstr ""
 "Ellenőrizze a dátumot a számítógépe naptárában."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr "⚫ A weboldal tanúsítványát nem egy megbízható szervezet állította ki."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
 "⚫ A weboldal tanúsítványát nem sikerült feldolgozni. Lehet, hogy sérült."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1543,7 +1578,7 @@ msgstr ""
 "⚫ A weboldal tanúsítványát visszavonta az azt kiállító megbízható szervezet."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1552,7 +1587,7 @@ msgstr ""
 "titkosítást használ."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1560,106 +1595,11 @@ msgstr ""
 "⚫ A weboldal tanúsítványa csak jövőbeli dátumokra érvényes. Ellenőrizze a "
 "dátumot a számítógépe naptárában."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "A közzétételhez szükséges ideiglenes fájl nem érhető el"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Üdvözli az F-Spot gyűjteményimportáló szolgáltatás.\n"
-"\n"
-"Válasszon egy importálandó gyűjteményt a Shotwell által talált egyik meglévő "
-"gyűjtemény kiválasztásával, vagy egy alternatív F-Spot adatbázisfájl "
-"kiválasztásával."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Üdvözli az F-Spot gyűjteményimportáló szolgáltatás.\n"
-"\n"
-"Válasszon egy F-Spot adatbázisfájlt."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Importálandó F-Spot adatbázisfájl kiválasztása:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"A kijelölt F-Spot adatbázisfájl nem nyitható meg: a fájl nem létezik, vagy "
-"nem F-Spot adatbázis"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"A kijelölt F-Spot adatbázisfájl nem nyitható meg: a Shotwell nem támogatja "
-"az F-Spot adatbázis ezen verzióját"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"A kijelölt F-Spot adatbázisfájl nem olvasható: hiba a címketábla olvasásakor"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"A kijelölt F-Spot adatbázisfájl nem olvasható: hiba a fényképtábla "
-"olvasásakor"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"A Shotwell %d fényképet talált az F-Spot gyűjteményben, és éppen importálja "
-"ezeket. A többször szereplő képek felismerésre és eltávolításra kerülnek.\n"
-"\n"
-"Bezárhatja ezt az ablakot, és megkezdheti a Shotwell használatát mialatt az "
-"importálás a háttérben folytatódik."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot gyűjtemény: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Importálás előkészítése"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Alap adatimportáló szolgáltatások"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL:"
@@ -1677,7 +1617,7 @@ msgid "Go _Back"
 msgstr "_Vissza"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "Bejele_ntkezés"
 
@@ -1712,7 +1652,7 @@ msgid "pixels"
 msgstr "képpont"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1720,17 +1660,17 @@ msgstr "Eredeti méret"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Szélesség vagy magasság"
+msgid "Longest edge"
+msgstr "Leghosszabb él"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Kijelentkezés"
@@ -1738,11 +1678,11 @@ msgstr "_Kijelentkezés"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1840,31 +1780,11 @@ msgstr "Ismeretlen felhasználó"
 msgid " Site Not Found"
 msgstr " Az oldal nem található"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_E-mail cím"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Jelszó"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Megjegyzés"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Bejelentkezés"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1916,81 +1836,10 @@ msgstr "Bejelentkezett a Rajce-ra %s néven."
 msgid "Photos will appear in:"
 msgstr "A fényképek itt fognak megjelenni:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell extra közzétételi szolgáltatások"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogok:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Fénykép _mérete:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 × 375 képpont"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 képpont"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 képpont"
-
-#: 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” nem érvényes válasz OAuth hitelesítési kérésre"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): nem lehet elindítani, ez a közzétevő nem "
-"indítható újra."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Adja meg a Tumblr fiókjához tartozó felhasználónevet és jelszót."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "A felhasználónév és/vagy jelszó érvénytelen. Próbálja újra"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Érvénytelen felhasználónév vagy jelszó"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "A felület nem tölthető be: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Bejelentkezett a Tumblr-re %s néven.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2060,6 +1909,14 @@ msgstr ""
 "_Hely-, fényképezőgép- és más azonosításra alkalmas adatok eltávolítása a "
 "feltöltés előtt"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2100,17 +1957,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Hová szeretné feltölteni a kijelölt fényképeket?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Csak én"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Mindenki"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Fénykép _mérete:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel a Flickrre "
+"nem folytatódhat."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2119,7 +1989,7 @@ msgstr ""
 "Bejelentkezett a Flickr-re %s néven.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2128,40 +1998,52 @@ msgstr ""
 "Az ingyenes Flickr fiókja korlátozza a havonta feltölthető adatmennyiséget.\n"
 "Ebben a hónapban még %s feltöltésére van lehetősége."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Az Ön Flickr Pro fiókja korlátlan feltöltést engedélyez."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "A _fényképeket láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "A _videókat láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "A _fényképeket/videókat láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Csak barátok és család"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Csak család"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Csak barátok"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 képpont"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 képpont"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 képpont"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 képpont"
@@ -2213,7 +2095,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 képpont)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Eredeti méret"
 
@@ -2300,7 +2182,8 @@ msgid "Certificate of %s"
 msgstr "%s tanúsítványa"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2352,10 +2235,38 @@ msgstr "Tanúsítvány megjelenítése…"
 msgid "I understand, please _proceed."
 msgstr "Megértettem, _folytatás."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Alap közzétételi szolgáltatások"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogok:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 képpont"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): nem lehet elindítani, ez a közzétevő nem "
+"indítható újra."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Bejelentkezett a Tumblr-re %s néven.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Videók _magánszféra-beállítása:"
@@ -2480,16 +2391,17 @@ msgstr "Eszköztár rögzítése nyitva"
 msgid "Leave fullscreen"
 msgstr "Teljes képernyő elhagyása"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:303
-#: src/data_imports/DataImportsUI.vala:421 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "Mé_gse"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2502,27 +2414,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – „Aachen”"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "A Shotwell weboldalának meglátogatása"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nem lehet megjeleníteni a súgót: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nem nyitható meg a hibaadatbázis: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nem jeleníthető meg a GyIK: %s"
@@ -2588,17 +2494,27 @@ msgstr "Sérült képfájl"
 msgid "Imported failed (%d)"
 msgstr "Az importálás meghiúsult (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Fényképezőgépek"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Az összes felfedezett fényképezőgép eszköz listája"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Fényképezőgép"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2611,34 +2527,34 @@ msgstr ""
 "leválasztani."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Már importált fényképek elrejtése"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Csak a nem importált fényképek megjelenítése"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "_Kijelöltek importálása"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Összes im_portálása"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "A fényképezőgép üresnek tűnik. Nem találhatók fényképek vagy videók az "
 "importáláshoz."
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Nem találhatók új fényképek vagy videók a fényképezőgépen"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2646,15 +2562,15 @@ msgstr ""
 "A Shotwellnek le kell választania a fényképezőgépet a fájlrendszerről az "
 "eléréséhez. Folytatja?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Leválasztás"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Válassza le a fényképezőgépet."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2664,11 +2580,11 @@ msgstr ""
 "használni. Zárja be a fényképezőgépet használó összes alkalmazást, majd "
 "próbálja újra."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Zárja be a fényképezőgépet használó összes alkalmazást."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2677,65 +2593,69 @@ msgstr ""
 "Nem tölthetők le az előnézetek a fényképezőgépről:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Leválasztás…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Kapcsolódás a fényképezőgéphez, kis türelmet…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Importálás kezdése, kis türelmet…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Fénykép-információk lekérése"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "%s előnézetének lekérése"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "A fényképezőgép nem zárolható: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Törli a fényképet a fényképezőgépről?"
 msgstr[1] "Töröl %d fényképet a fényképezőgépről?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Törli a videót a fényképezőgépről?"
 msgstr[1] "Töröl %d videót a fényképezőgépről?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Törli a fényképet vagy videót a fényképezőgépről?"
 msgstr[1] "Töröl %d fényképet vagy videót a fényképezőgépről?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Törli ezt a fájlt a fényképezőgépről?"
 msgstr[1] "Törli ezt a(z) %d fájlt a fényképezőgépről?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Megtartás"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Fényképek vagy videók eltávolítása a fényképezőgépről"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2750,7 +2670,7 @@ msgid "_Print"
 msgstr "_Nyomtatás"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Kül_dés…"
 
@@ -2792,13 +2712,13 @@ msgid "Flip Verti_cally"
 msgstr "_Függőleges tükrözés"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Feljavítás"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Vissza az eredetihez"
@@ -2815,12 +2735,13 @@ msgstr "_Színbeállítások beillesztése"
 msgid "Adjust Date and Time…"
 msgstr "Dátum és idő módosítása…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Megnyitás külső _szerkesztővel"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Megnyitás RA_W szerkesztővel"
 
@@ -2828,43 +2749,39 @@ msgstr "Megnyitás RA_W szerkesztővel"
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Fényképek vagy videók exportálása"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Fénykép vagy videó exportálása"
+msgstr[1] "Fényképek vagy videók exportálása"
 
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Fényképek vagy videók exportálása"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Fényképek exportálása"
+msgid_plural "Export Photos"
+msgstr[0] "Fénykép exportálása"
+msgstr[1] "Fényképek exportálása"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Fényképek exportálása"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Forgatás"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Forgatás visszavonása"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Tükrözés vízszintesen"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Vízszintes tükrözés visszavonása"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Tükrözés függőlegesen"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Függőleges tükrözés visszavonása"
 
@@ -3077,19 +2994,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Adatbázisfájl:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importálás"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Importálás alkalmazásból"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Mé_dia importálása innen:"
 
-#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -3157,9 +3074,9 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Ez eltávolítja a(z) „%s” címkét egy fényképről. Folytatja?"
 msgstr[1] "Ez eltávolítja a(z) „%s” címkét %d fényképről. Folytatja?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Törlés"
@@ -3191,6 +3108,10 @@ msgstr "_Előhívó váltása"
 msgid "Export Video"
 msgstr "Videó exportálása"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Fényképek exportálása"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3223,63 +3144,35 @@ msgstr ""
 "\n"
 "Szeretné folytatni az exportálást?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Módosítatlan"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Jelenlegi"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Formátum:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Minőség:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Méretezési megszorítás:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "Ké_ppont:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "_Metaadatok exportálása:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Foly_tatás"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Részletek mentése…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Részletek mentése"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(és még %d)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Importálás eredményei jelentés"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Kísérlet történt %d fájl importálására."
 msgstr[1] "Kísérlet történt %d fájl importálására."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3289,30 +3182,30 @@ msgstr[1] "Ebből %d fájl lett sikeresen importálva."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Nem importált, kettőzött fényképek vagy videók:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "lemásolja a meglévő médiaelemet"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "A fényképezőgép hibája miatt nem importált fényképek vagy videók:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "hibaüzenet:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Fényképként vagy videóként fel nem ismert, és emiatt nem importált fájlok:"
@@ -3320,7 +3213,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3331,7 +3224,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3339,7 +3232,7 @@ msgstr ""
 "A Shotwell által a gyűjteménybe nem másolható, és emiatt nem importált "
 "fényképek vagy videók:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3351,7 +3244,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 "A fényképek vagy videók importálása sikertelen volt, mert néhány fájl sérült:"
@@ -3359,32 +3252,32 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Más okból nem importált fényképek vagy videók:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d kettőzött fénykép nem lett importálva:\n"
 msgstr[1] "%d kettőzött fénykép nem lett importálva:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d kettőzött videó nem lett importálva:\n"
 msgstr[1] "%d kettőzött videó nem lett importálva:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d kettőzött fénykép vagy videó nem lett importálva:\n"
 msgstr[1] "%d kettőzött fénykép vagy videó nem lett importálva:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3393,14 +3286,14 @@ msgstr[0] ""
 msgstr[1] ""
 "%d fényképet nem sikerült importálni fájl- vagy hardverhiba miatt:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d videót nem sikerült importálni fájl- vagy hardverhiba miatt:\n"
 msgstr[1] "%d videót nem sikerült importálni fájl- vagy hardverhiba miatt:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3412,14 +3305,14 @@ msgstr[1] ""
 "%d fényképet vagy videót nem sikerült importálni fájl- vagy hardverhiba "
 "miatt:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "%d fájlt nem sikerült importálni hardver- vagy fájlhiba miatt:\n"
 msgstr[1] "%d fájlt nem sikerült importálni hardver- vagy fájlhiba miatt:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3433,7 +3326,7 @@ msgstr[1] ""
 "%d fényképet nem sikerült importálni, mert a fényképgyűjtemény mappája nem "
 "írható:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3447,7 +3340,7 @@ msgstr[1] ""
 "%d fényképet nem sikerült importálni, mert a fényképgyűjtemény mappája nem "
 "írható:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3462,7 +3355,7 @@ msgstr[1] ""
 "%d fényképet vagy videót nem sikerült importálni, mert a fényképgyűjtemény "
 "mappája nem írható:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3476,21 +3369,21 @@ msgstr[1] ""
 "A fényképgyűjtemény mappája nem írható, emiatt %d fájl importálása nem "
 "sikerült:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "%d fényképet nem sikerült importálni fényképezőgép-hiba miatt:\n"
 msgstr[1] "%d fényképet nem sikerült importálni fényképezőgép-hiba miatt:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "1 videót nem sikerült importálni fényképezőgép-hiba miatt:\n"
 msgstr[1] "%d videót nem sikerült importálni fényképezőgép-hiba miatt:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3499,35 +3392,35 @@ msgstr[0] ""
 msgstr[1] ""
 "%d fényképet vagy videót nem sikerült importálni fényképezőgép-hiba miatt:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "1 fájlt nem sikerült importálni fényképezőgép-hiba miatt:\n"
 msgstr[1] "%d fájlt nem sikerült importálni fényképezőgép-hiba miatt:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 fénykép importálása sikertelen, mert sérült:\n"
 msgstr[1] "%d fénykép importálása sikertelen, mert sérült:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 videó importálása sikertelen, mert sérült:\n"
 msgstr[1] "%d videó importálása sikertelen, mert sérült:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "1 fénykép vagy videó importálása sikertelen, mert sérült:\n"
 msgstr[1] "%d fénykép vagy videó importálása sikertelen, mert sérült:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3538,7 +3431,7 @@ msgstr[1] "%d fájl importálása sikertelen, mert sérült:\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3547,56 +3440,56 @@ msgstr[1] "%d nem támogatott formátumú fénykép kihagyva:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "%d nem képfájl kihagyva.\n"
 msgstr[1] "%d nem képfájl kihagyva.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "%d fénykép a felhasználó utasítására kihagyva.\n"
 msgstr[1] "%d fénykép a felhasználó utasítására kihagyva.\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "%d videó a felhasználó utasítására kihagyva:\n"
 msgstr[1] "%d videó a felhasználó utasítására kihagyva:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "%d fénykép vagy videó a felhasználó utasítására kihagyva:\n"
 msgstr[1] "%d fénykép vagy videó a felhasználó utasítására kihagyva:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d fájl a felhasználó utasítására kihagyva:\n"
 msgstr[1] "%d fájl a felhasználó utasítására kihagyva:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d fénykép sikeresen importálva.\n"
 msgstr[1] "%d fénykép sikeresen importálva.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "%d videó sikeresen importálva.\n"
 msgstr[1] "%d videó sikeresen importálva.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3605,89 +3498,64 @@ msgstr[1] "%d fénykép vagy videó sikeresen importálva.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Nem lettek importálva fényképek vagy videók.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Importálás kész"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d másodperc"
-msgstr[1] "%d másodperc"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d perc"
-msgstr[1] "%d perc"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d óra"
-msgstr[1] "%d óra"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 nap"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Esemény átnevezése"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Név:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Cím szerkesztése"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Cím:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Eseménymegjegyzés szerkesztése"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Fénykép vagy videó megjegyzésének szerkesztése"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Fájl eltávolítása és a Kukába helyezése"
 msgstr[1] "_Fájlok eltávolítása és a Kukába helyezésük"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Visszavonja a külső szerkesztést?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Visszavonja a külső szerkesztéseket?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3695,125 +3563,34 @@ msgid_plural ""
 msgstr[0] "Ezzel a külső fájlon végzett minden változtatás elvész. Folytatja?"
 msgstr[1] "Ezzel %d külső fájlon végzett minden változtatás elvész. Folytatja?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "Külső szerkesztés _visszavonása"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "Külső szerkesztések _visszavonása"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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] "Ezzel eltávolítja a fényképet a gyűjteményből. Folytatja?"
 msgstr[1] "Ezzel eltávolít %d fényképet a gyűjteményből. Folytatja?"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Fénykép eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "DE"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "DU"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 óra"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "Fényképek vagy videók _eltolása azonos mennyiséggel"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Min_den fénykép vagy videó beállítása erre az időre"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "Eredeti fényképfájl _módosítása"
-msgstr[1] "Eredeti fényképfájlok _módosítása"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "Eredeti fájl _módosítása"
-msgstr[1] "Eredeti fájlok _módosítása"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Eredeti: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%Y. %m. %d., %k.%M.%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%Y. %m. %d., %l.%M.%S %p"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"A képek készítése előre lesz tolva ennyivel:\n"
-"%d %s, %d %s, %d %s, és %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"A képek készítése vissza lesz tolva ennyivel:\n"
-"%d %s, %d %s, %d %s, és %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "nap"
-msgstr[1] "nap"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "óra"
-msgstr[1] "óra"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "perc"
-msgstr[1] "perc"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "másodperc"
-msgstr[1] "másodperc"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3832,95 +3609,13 @@ msgstr[1] ""
 "\n"
 "És %d egyéb."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Címkék (vesszővel elválasztva):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Üdvözöljük!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Üdvözöljük a Shotwellben!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "Az alábbi módokon importálhatja fényképeit:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr ""
-"Válassza a <span weight=\"bold\">Fájl %s Importálás mappából</span> "
-"menüpontot"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Húzza fényképeit a Shotwell ablakába"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr ""
-"Csatlakoztasson egy fényképezőgépet a számítógéphez, és importálja a "
-"fényképeit"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "Fényképek i_mportálása a(z) %s mappájából"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "Fényképeket a következő módokon is importálhat:"
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr "_Ne jelenjen meg ez az üzenet többé"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Fényképek importálása a(z) %s gyűjteményéből"
-
-#. 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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Súgó)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Év%sHónap%sNap"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Év%sHónap"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Év%sHónap-Nap"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Év-Hónap-Nap"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Egyéni"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Érvénytelen minta"
-
 #. 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3928,31 +3623,31 @@ msgstr ""
 "A Shotwell átmásolhatja a fényképeket a gyűjtemény könyvtárába, vagy "
 "importálhatja azokat másolás nélkül is."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Fény_képek másolása"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importálás"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Importálás a gyűjteménybe"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Eltávolítás a gyűjteményből"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Fényképek eltávolítás a gyűjteményből"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3975,7 +3670,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3998,7 +3693,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4021,7 +3716,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4031,7 +3726,7 @@ msgstr[0] "A fénykép vagy videó nem helyezhető át a Kukába. Törli a fájl
 msgstr[1] "%d fénykép vagy videó nem helyezhető át a Kukába. Törli a fájlokat?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4071,6 +3766,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Elnézést, a(z) %s fénykép nem nyitható meg."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "M_entés"
 
@@ -4102,201 +3798,433 @@ msgstr "Mentés másként"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "%s nem figyelhető: nem könyvtár (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "DE"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "DU"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 óra"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "Fényképek vagy videók _eltolása azonos mennyiséggel"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Min_den fénykép vagy videó beállítása erre az időre"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "Eredeti fényképfájl _módosítása"
+msgstr[1] "Eredeti fényképfájlok _módosítása"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "Eredeti fájl _módosítása"
+msgstr[1] "Eredeti fájlok _módosítása"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Eredeti: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%Y. %m. %d., %k.%M.%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%Y. %m. %d., %l.%M.%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"A képek készítése előre lesz tolva ennyivel:\n"
+"%d %s, %d %s, %d %s, és %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"A képek készítése vissza lesz tolva ennyivel:\n"
+"%d %s, %d %s, %d %s, és %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "nap"
+msgstr[1] "nap"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "óra"
+msgstr[1] "óra"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "perc"
+msgstr[1] "perc"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "másodperc"
+msgstr[1] "másodperc"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Módosítatlan"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Jelenlegi"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Formátum:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Minőség:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Méretezési megszorítás:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "Ké_ppont:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "_Metaadatok exportálása:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Súgó)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Év%sHónap%sNap"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Év%sHónap"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Év%sHónap-Nap"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Év-Hónap-Nap"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Egyéni"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Érvénytelen minta"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d másodperc"
+msgstr[1] "%d másodperc"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d perc"
+msgstr[1] "%d perc"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d óra"
+msgstr[1] "%d óra"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 nap"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Üdvözöljük!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Üdvözöljük a Shotwellben!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Az alábbi módokon importálhatja fényképeit:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr ""
+"Válassza a <span weight=\"bold\">Fájl %s Importálás mappából</span> "
+"menüpontot"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Húzza fényképeit a Shotwell ablakába"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr ""
+"Csatlakoztasson egy fényképezőgépet a számítógéphez, és importálja a "
+"fényképeit"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "Fényképek i_mportálása a(z) %s mappájából"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Fényképeket a következő módokon is importálhat:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Ne jelenjen meg ez az üzenet többé"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Fényképek importálása a(z) %s gyűjteményéből"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Aktuális fényképméretek visszaállítása"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Képkivágás beállítása a képhez"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "A kivágási téglalap forgatása az álló és fekvő tájolások között"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Korlátlan"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Négyzet"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD videó (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD videó (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Tárca (2 × 3 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Jegyzettömb (3 × 5 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8.5 × 11 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrikus tárca (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Képeslap (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Méret:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Vörösszem-effektus eszköz bezárása"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Minden vörösszem-effektus eltávolítása a kijelölt területről"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Visszaállítás"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Expozíció:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontraszt:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Telítettség:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Árnyalat:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Hőmérséklet:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Árnyékok:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Kiemelések:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Színek visszaállítása"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Minden színmódosítás elvetése"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Hőmérséklet"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Árnyalat"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Telítettség"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Expozíció"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Árnyékok"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Kiemelések"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Kontraszt növelése"
 
@@ -4309,25 +4237,21 @@ msgstr "Szög:"
 msgid "_Straighten"
 msgstr "Ki_egyenesítés"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Események"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d fénykép vagy videó"
 msgstr[1] "%d fénykép vagy videó"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d videó"
 msgstr[1] "%d videó"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4338,27 +4262,35 @@ msgstr[1] "%d fénykép"
 msgid "No Event"
 msgstr "Nincs esemény"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Események"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Tallózás az események között"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Nincsenek események"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nem találhatók események"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Minden esemény"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Keltezetlen"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4398,20 +4330,16 @@ msgstr "Öss_zes cseréje"
 msgid "Export"
 msgstr "Exportálás"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Mappák"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Gyűjtemény"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Tallózás a gyűjtemény mappaszerkezetében"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Fényképek"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Megjelölve"
 
@@ -4432,19 +4360,36 @@ msgstr "%s importálva"
 msgid "Last Import"
 msgstr "Utolsó importálás"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Gyűjtemény"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Rendszerezze fényképeit és tallózzon köztük"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fényképek"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importálás mappából"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Belépés az almappákba is"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Kuka ürítése"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Kuka ürítése…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4457,33 +4402,33 @@ msgstr ""
 "szerkesztése</span> alatt.\n"
 "Szeretné folytatni a fényképek importálását?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Gyűjtemény helye"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Ebből a könyvtárból nem importálhatók fényképek."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Gyűjtemény frissítése…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Felkészülés fényképek automatikus importáláshoz…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Fényképek automatikus importálása…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Metaadatok írása a fájlokba…"
 
@@ -4499,15 +4444,15 @@ msgstr "Törlés…"
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "A Kuka üres"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Fényképek törlése"
 
@@ -4555,32 +4500,36 @@ msgstr "Ismeretlen hiba a Shotwell adatbázisának ellenőrzésekor: %s"
 msgid "Loading Shotwell"
 msgstr "A Shotwell betöltése"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "A Shotwell privát adatainak útvonala"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "KÖNYVTÁR"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Ne figyelje a változásokat a gyűjteménykönyvtárban futás közben"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Ne jelenítse meg az indítási folyamatjelzőt"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Az alkalmazás verziószámának megjelenítése"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Az alkalmazás indítása teljes képernyős módban"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[FÁJL]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4596,7 +4545,7 @@ msgstr "A megfigyelés frissítései nem dolgozhatók fel: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "A bélyegképek méretének beállítása"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4605,15 +4554,15 @@ msgstr ""
 "A Shotwell nem tudta lejátszani a kijelölt videót:\n"
 "%s"
 
-#: src/Page.vala:1319
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Nincsenek fényképek vagy videók"
 
-#: src/Page.vala:1323
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Nem található fénykép vagy videó, amely megfelel a jelenlegi szűrőnek"
 
-#: src/Page.vala:2629
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Nem exportálhatók fényképek ebbe a könyvtárba."
 
@@ -4677,7 +4626,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "módosítva"
 
@@ -4845,7 +4794,7 @@ msgstr "Copyright:"
 msgid "Software:"
 msgstr "Szoftver:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Bővebb információk"
 
@@ -4894,37 +4843,37 @@ msgstr "Fiókinformációk letöltése…"
 msgid "Logging in…"
 msgstr "Bejelentkezés…"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Fényképek közzététele"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "_Fényképek közzététele ide:"
 
-#: src/publishing/PublishingUI.vala:198
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Videók közzététele"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "_Videók közzététele ide:"
 
-#: src/publishing/PublishingUI.vala:201
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Fényképek és videók közzététele"
 
-#: src/publishing/PublishingUI.vala:202
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Fényképek és vi_deók közzététele ide:"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:412
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Nem sikerült közzétenni"
 
-#: src/publishing/PublishingUI.vala:413
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4969,9 +4918,10 @@ msgstr "Tükrözés vízszintesen"
 msgid "Flip Vertically"
 msgstr "Tükrözés függőlegesen"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Névjegy"
 
@@ -4994,11 +4944,11 @@ msgstr "_Előre"
 msgid "Fulls_creen"
 msgstr "Teljes ké_pernyő"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Súgó"
@@ -5414,7 +5364,7 @@ msgid "Adjust Date and Time"
 msgstr "Dátum és idő módosítása"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "_Címkék hozzáadása…"
 
@@ -5505,7 +5455,7 @@ msgid "_Rename…"
 msgstr "Át_nevezés…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Cí_mkék módosítása…"
 
@@ -5552,7 +5502,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Nem lehet átnevezni a keresést erre: „%s”, mert a keresés már létezik."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Mentett keresés"
 
@@ -5560,11 +5510,11 @@ msgstr "Mentett keresés"
 msgid "Delete Search"
 msgstr "Keresés törlése"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "S_zerkesztés…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Át_nevezés…"
 
@@ -5634,7 +5584,7 @@ msgstr "_Visszaállítás"
 msgid "Move the selected photos back into the library"
 msgstr "Kijelölt fényképek visszaállítása a gyűjteménybe"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5650,7 +5600,8 @@ msgstr "Kijelölt fénykép könyvtárának megnyitása a fájlkezelőben"
 msgid "Unable to open in file manager: %s"
 msgstr "Nem nyitható meg a fájlkezelőben: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
@@ -5713,151 +5664,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%Y. %b. %d., %a"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Diavetítés"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Mentett keresések"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "tartalmazza"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "pontosan ez"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "ezzel kezdődik"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "ezzel végződik"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "nem tartalmazza"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "nincs beállítva"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "beállítva"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "="
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "nem"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "bármely fénykép"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "nyers fénykép"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "videó"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "van"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "nincs"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "változtatások"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "belső változtatások"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "külső változtatások"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "megjelölt"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "jelöletlen"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "és nagyobb"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "csak"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "és kisebb"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "után volt"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "előtte volt"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "ezek közt"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "és"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Keresés"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Mégse"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "OK"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "bármely"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "összes"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "nincs"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Bármilyen szöveg"
@@ -5894,8 +5817,8 @@ msgstr "Jelölő állapota"
 msgid "Photo state"
 msgstr "Fénykép állapota"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Értékelés"
 
@@ -5903,27 +5826,35 @@ msgstr "Értékelés"
 msgid "Date"
 msgstr "Dátum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Mentett keresések"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Rendszerezze mentett kereséseit"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ Értékelés"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ Értékelés"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ Értékelés"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ Értékelés"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Értékelés"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Hiba a keresősáv felületének betöltésekor: %s"
@@ -5933,71 +5864,71 @@ msgstr "Hiba a keresősáv felületének betöltésekor: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Bezárás"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Típus"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Videók"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW fényképek"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Mentett keresés használata a jelenlegi nézetben történő szűréshez"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Beállítások"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Vissza"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Ugrás az előző fényképre"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Szünet"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Diavetítés szüneteltetése"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Következő"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Ugrás a következő fényképre"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Beállítások"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Diavetítés beállításainak módosítása"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Az összes fénykép forrásfájlja elveszett."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Diavetítés folytatása"
 
@@ -6009,7 +5940,7 @@ msgstr "Diavetítés átmenetei"
 msgid "(None)"
 msgstr "(Nincs)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Nincs"
 
@@ -6017,16 +5948,20 @@ msgstr "Nincs"
 msgid "Random"
 msgstr "Véletlenszerű"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Címkék"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Rendszerezze fényképei címkéit, és tallózzon köztük"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "névtelen"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Videók exportálása"
 
@@ -6036,14 +5971,10 @@ msgid "Toggle _Flag"
 msgstr "_Jelző átváltása"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Előhívó"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Megnyitás külső _szerkesztővel"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6093,21 +6024,21 @@ msgstr "_Következő fénykép"
 msgid "T_ools"
 msgstr "_Eszközök"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Gyakran ismételt kérdések"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Hiba jelentése…"
 
 #: 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…"
+msgid "_Import From Folder…"
 msgstr "_Importálás mappából…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6185,17 +6116,12 @@ msgstr "_Csökkenő"
 msgid "Even_ts"
 msgstr "_Események"
 
-#: 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 "_Eltávolítás a gyűjteményből"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Címek"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "Cí_mkék"
 
@@ -6232,204 +6158,245 @@ msgstr "Fény_képek"
 msgid "_Stop Import"
 msgstr "Importálás l_eállítása"
 
-#: ui/printing_widget.ui:19
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Nyomtatott képméret</b>"
-
-#: ui/printing_widget.ui:36
-msgid "Use a _standard size:"
-msgstr "_Szabványos méret használata:"
-
-#: ui/printing_widget.ui:80
-msgid "Use a c_ustom size:"
-msgstr "_Egyéni méret használata:"
-
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
-msgstr "hüvelyk"
-
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-msgid "cm"
-msgstr "cm"
-
-#: ui/printing_widget.ui:173
-msgid "_Match photo aspect ratio"
-msgstr "Fénykép _méretarányának megtartása"
-
-#: ui/printing_widget.ui:197
-msgid "_Autosize:"
-msgstr "_Automatikus méret:"
-
-#: ui/printing_widget.ui:237
-msgid "<b>Titles</b>"
-msgstr "<b>Címek</b>"
-
-#: ui/printing_widget.ui:254
-msgid "Print image _title"
-msgstr "Kép _címének nyomtatása"
-
-#: ui/printing_widget.ui:297
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Felbontás képpontban</b>"
-
-#: ui/printing_widget.ui:317
-msgid "_Output photo at:"
-msgstr "_Kimenő fénykép:"
-
-#: ui/printing_widget.ui:351
-msgid "pixels per inch"
-msgstr "képpont hüvelykenként"
-
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "Beállítás asztalháttérként"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
-msgstr "Használat az asztalhoz"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
-msgstr "Használat a zárolási képernyőhöz"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr "Beállítás asztali diavetítésként"
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr "Asztalháttér-diavetítés készítése"
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr "Minden fénykép megjelenítése"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr "ennyi ideig"
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "Az egyes fényképek meddig jelenjenek meg asztalháttérként"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "fehér"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "fekete"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Háttér:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "Fényképek i_mportálása ide:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "Új _fájlok figyelése a gyűjteménykönyvtárban"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Importálás"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Könyvtárszerkezet:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Példa:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "_Importált fájlok átnevezése kisbetűssé"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Metaadatok"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "_Címkék, címek és más metaadatok fényképfájlokba írása"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW előhívó"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Alapértelmezett:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "_Minta:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Átlátszó háttér:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Kockás"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Homogén szín"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "Külső _fényképszerkesztő:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Külső _RAW szerkesztő:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Külső szerkesztők"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ui/shotwell.ui:590
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell beállításai"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Nyomtatott képméret</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "_Szabványos méret használata:"
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "_Egyéni méret használata:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "hüvelyk"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "Fénykép _méretarányának megtartása"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "_Automatikus méret:"
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Címek</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Kép _címének nyomtatása"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Felbontás képpontban</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "_Kimenő fénykép:"
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "képpont hüvelykenként"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Keresés"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Mégse"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "OK"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "Keresés _neve:"
 
-#: ui/shotwell.ui:644
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "Illes_zkedjen"
 
-#: ui/shotwell.ui:671
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "bármely"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "összes"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "nincs"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "a következőkkel:"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "címke"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Beállítás asztalháttérként"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Használat az asztalhoz"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Használat a zárolási képernyőhöz"
 
-#: ui/shotwell.ui:903
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Beállítás asztali diavetítésként"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Asztalháttér-diavetítés készítése"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Minden fénykép megjelenítése"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "ennyi ideig"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Az egyes fényképek meddig jelenjenek meg asztalháttérként"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Új _címke…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Késleltetés:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Átmenet _effektus:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Átmenet _késleltetése:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "_Cím megjelenítése"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "másodperc"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Új _címke…"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "címke"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Minden fénykép törlése a Kukában"
+
diff --git a/po/id.gmo b/po/id.gmo
index 6c34f03..d8f5f57 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index a55bc27..2abf30c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -16,23 +16,23 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell shotwell-0.26\n"
+"Project-Id-Version: shotwell master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-18 10:17+0000\n"
-"PO-Revision-Date: 2017-04-30 17:02+0000\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
+"POT-Creation-Date: 2017-11-24 20:46+0000\n"
+"PO-Revision-Date: 2017-11-30 13:56+0700\n"
+"Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.4\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
 #: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
 #: ui/tags.ui:356
 msgid "Shotwell"
@@ -77,16 +77,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "Para pengembang Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Manajer Foto"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organisasikan foto Anda"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -97,15 +97,15 @@ msgstr ""
 "picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell Penampil"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Penampil Foto"
 
@@ -134,7 +134,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Token rahasia untuk menandatangani permintaan oauth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "ukuran bawaan"
 
@@ -162,9 +162,9 @@ msgid "URL of the Rajce server."
 msgstr "URL dari server Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "nama pengguna"
 
@@ -181,7 +181,7 @@ msgid "user token, if remembered."
 msgstr "token pengguna, jika ingat."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "kategori terakhir"
 
@@ -190,7 +190,7 @@ msgid "The last selected Rajce category."
 msgstr "Kategori Racje yang terakhir dipilih."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "ukuran foto terakhir"
 
@@ -230,11 +230,11 @@ msgstr ""
 "mengunggah foto"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "hilangkan informasi senitif dari unggahan"
 
@@ -487,10 +487,28 @@ msgid "A grayscale color for use as the background color."
 msgstr "Warna hitam-putih digunakan sebagai warna latar belakang."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "latar belakang untuk citra transparan"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Latar belakang yang akan dipakai bagi citra-citra transparan."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "warna untuk latar belakang transparan rata"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Warna yang akan dipakai bila latar belakang untuk citra-citra transparan "
+"ditata ke warna rata"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Keadaan pemilihan dari opsi \"sembunyikan foto\""
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -498,30 +516,30 @@ msgstr ""
 "Keadaan pemilihan yang terakhir dipakai dari opsi \"sembunyikan foto yang "
 "telah diimpor\" dalam halaman impor."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "tundaan"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Penundaan (dalam detik) antar foto pada pertunjukan salindia."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "tundaan transisi"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Waktu (dalam detik) transisi yang berjalan antar foto pada pertunjukan "
 "salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "id efek transisi"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -529,67 +547,67 @@ msgstr ""
 "Nama efek transisi yang akan digunakan ketika menjalankan pertunjukan "
 "salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Tampilkan judul"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Apakah tampilkan judul dari foto pada saat pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maksimumkan jendela pustaka"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "True jika pustaka aplikasi dimaksimalkan, false jika sebaliknya."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "lebar dari jendela pustaka"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Lebar yang tersimpan dari jendela pustaka aplikasi sebelumnya."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "tinggi dari jendela pustaka"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Tinggi yang tersimpan dari jendela pustaka aplikasi sebelumnya."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maksimalkan jendela sunting-langsung"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "True bila aplikasi sunting-langsung dimaksimalkan, false bila tidak."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "lebar jendela sunting-langsung"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Lebar yang terakhir terrekam dari jendela aplikasi sunting-langsung."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "tinggi dari jendela sunting-langsung"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Tinggi yang terakhir terrekam dari jendela aplikasi sunting-langsung."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "posisi pemisah bilah sisi"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -597,30 +615,30 @@ msgstr ""
 "Posisi yang terakhir terrekam dari pemisah antara bilah sisi dan tilikan "
 "dalam jendela aplikasi pustaka."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "direktori impor"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Direktori tempat meletakkan berkas foto yang diimpor."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "pantau berkas baru di direktori pustaka"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Bila true, berkas yang ditambahkan ke direktori pustaka secara otomatis "
 "diimpor."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "menulis metadata ke berkas"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -628,11 +646,11 @@ msgstr ""
 "Bila true, perubahan ke metadata (tag, judul, dsb.) ditulis ke berkas foto "
 "induk."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "gunakan huruf kecil untuk nama berkas"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -640,11 +658,11 @@ msgstr ""
 "Jika bernilai benar, Shotwell akan mengubah semua nama berkas menjadi huruf "
 "kecil ketika mengimpor berkas foto"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "pola direktori"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -652,11 +670,11 @@ msgstr ""
 "Kalimat yang mengkodekan pola penamaan yang akan dipakai untuk menamai "
 "direktori foto saat impor."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "pola direktori ubahan"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -664,29 +682,29 @@ msgstr ""
 "Kalimat yang mengkodekan pola penamaan ubahan yang akan dipakai untuk "
 "menamai direktori foto saat impor."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "Baku pengembang RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opsi baku yang akan dipakai oleh Shotwell bagi pengembang RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Pilihan menu rasio aspek pangkas yang terakhir dipakai."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Kode numerik yang mewakili pilihan menu pangkas yang terakhir diambil oleh "
 "pengguna."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Numerator rasio aspek ubahan pemangkasan yang terakhir dipakai."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -694,11 +712,11 @@ msgstr ""
 "Suatu bilangan bulat positif yang mewakili bagian lebar dari rasio pangkas "
 "ubahan yang terakhir dimasukkan oleh pengguna."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Denominator rasio aspek ubahan pemangkasan yang terakhir dipakai."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -706,120 +724,120 @@ msgstr ""
 "Suatu bilangan bulat positif yang mewakili bagian tinggi dari rasio pangkas "
 "ubahan yang terakhir dimasukkan oleh pengguna."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "penyunting foto eksternal"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Aplikasi ekternal untuk menyunting foto."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "penyunting raw eksternal"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Aplikasi eksternal untuk menyunting foto RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Pengaturan dalam dialog ekspor: bagaimana memangkas citra"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "ekspor metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Pengaturan dalam dialog ekspor: opsi untuk mengekspor metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "pengaturan format, nilai khusus"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Pengaturan dalam dialog ekspor: pengaturan format, nilai khusus"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "pengaturan format, nilai tipe"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Pengaturan dalam dialog ekspor: pengaturan format, nilai tipe"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Opsi kualitas JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Pengaturan dalam dialog ekspor: opsi kualitas jpeg"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "ukuran maksimum citra"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Pengaturan dalam dialog ekspor: ukuran maksimum citra"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "layanan penerbitan yang terakhir digunakan"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Suatu kode numerik yang mewakili layanan yang terakhir dipakai untuk "
 "mempublikasikan foto"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "layanan penerbitan bawaan"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "token akses"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Token OAuth Facebook untuk sesi log masuk saat ini, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "ID pengguna"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "ID pengguna Facebook yang sedang dipakai masuk, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "nama pengguna"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Nama pengguna Facebook yang sedang dipakai masuk, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "kode ukuran baku"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Kode numerik yang mewakili ukuran baku bagi foto yang dipublikasikan ke "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -827,19 +845,19 @@ msgstr ""
 "Apakah citra yang diunggah ke Facebook mesti dihapus terlebih dahulu "
 "metadatanya"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Token Fasa Akses OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Token otorisasi untuk pengguna Flickr yang sedang log masuk, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Rahasia Token Fasa Akses OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -847,21 +865,21 @@ msgstr ""
 "Rahasia kriptografis yang dipakai untuk menandatangani permintaan atas token "
 "otorisasi bagi pengguna Flickr yang sedang log masuk, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Nama pengguna dari pengguna Flicker yang sedang log masuk, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Kode numerik yang mewakili ukuran foto baku yang dipublikasikan ke Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "visibilitas bawaan"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -869,7 +887,7 @@ msgstr ""
 "Kode numerik yang mewakili kenampakan baku bagi foto yang dipublikasikan ke "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
@@ -877,12 +895,12 @@ msgstr ""
 "Apakah gambar yang sedang diunggah ke Flickr mesti terlebih dahulu dihapus "
 "metadatanya"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "segarkan token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -890,24 +908,24 @@ msgstr ""
 "Token OAuth yang dipakai untuk menyegarkan sesi Album Web Picasa bagi "
 "pengguna yang sedang log masuk, bila ada."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr ""
 "Kode numerik yang mewakili ukuran foto baku yang diunggah ke Album Web Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "album terakhir"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Nama dari album terakhir tempat pengguna mempublikasi foto, bila ada"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
@@ -915,47 +933,47 @@ msgstr ""
 "Apakah gambar yang sedang diunggah ke Picasa mesti terlebih dahulu dihapus "
 "metadatanya"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "URL Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "URL dari server Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Nama pengguna Piwigo, bila log masuk."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "kata sandi"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Kata sandi Piwigo, bila log masuk."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "ingat Sandi"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Jika bernilai true, maka akan mengingat kata sandi Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Kategori Piwigio yang terakhir dipilih."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "tingkatan hak akses yang terakhir digunakan"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Tingkatan hak akses Piwigio yang terakhir dipilih."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -963,7 +981,7 @@ msgstr ""
 "Kode numerik yang mewakili pratata ukuran foto terakhir yang dipakai ketika "
 "mempublikasikan ke Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
@@ -971,14 +989,14 @@ msgstr ""
 "Apakah gambar yang sedang diunggah ke Piwigo mesti terlebih dahulu dihapus "
 "metadatanya"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "bila judul diatur dan komentar kosong, pakai judul sebagai komentar untuk "
 "diunggah ke Piwigio"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -986,11 +1004,11 @@ msgstr ""
 "Apakah citra yang sedang diunggap ke Piwigo komentarnya mesti disalin dari "
 "judul bila judul terisi dan komentar kosong"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "jangan unggah tanda ketika mengunggah ke Piwigio"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -998,27 +1016,27 @@ msgstr ""
 "Apakah citra yang sedang diunggah ke Piwigo mesti dihapus terlebih dahulu "
 "tagnya, sehingga tag-tag ini tidak akan muncul pada server Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Nama pengguna Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "Kunci API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Kunci API Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "URL situs Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1026,19 +1044,19 @@ msgstr ""
 "Apakah citra yang diunggah ke Gallery3 mesti dihapus terlebih dahulu "
 "metadatanya"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "kendala pengaturan skala dari gambar yang diunggah"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "ID kendala pengaturan skala dari gambar yang diunggah"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "piksel sumbu mayor dari gambar yang diunggah"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1046,7 +1064,7 @@ msgstr ""
 "Piksel dari sumbu mayor gambar yang akan diunggah; hanya dipakai bila "
 "scaling-constraint-id adalah nilai yang sesuai"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1054,31 +1072,31 @@ msgstr ""
 "Token OAuth yang dipakai untuk menyegarkan sesi YouTube bagi pengguna yang "
 "sedang log masuk, bila ada."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "layanan impor yang terakhir digunakan"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Suatu kode numerik yang mewakili layanan yang terakhir dipakai sebagai "
 "sumber impor foto"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "cookie keadaan interpreter"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Kode numerik yang menangkap keadaan dari lingkungan pengaya GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "mode tata letak isi"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1086,35 +1104,35 @@ msgstr ""
 "Kode numerik yang menjelaskan bagaimana foto disusun pada halaman saat "
 "pencetakan"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppi isi"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Angka piksel per inci (ppi) yang dikirim ke pencetak selama pencetakan"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "lebar konten"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Lebar dari emulsi yang dicetak pada halaman ketika mencetak"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "tinggi konten"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Tinggi dari emulsi yang dicetak pada halaman ketika mencetak"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "satuan isi"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1122,11 +1140,11 @@ msgstr ""
 "Kode numerik yang mewakili satuan pengukuran (inci atau sentimeter) yang "
 "dipakai ketika mencetak"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "gambar per kode halaman"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1134,22 +1152,22 @@ msgstr ""
 "Kode numerik yang mewakili mode cacah citra per halaman yang kini dipakai "
 "ketika mencetak"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "pemilihan ukuran"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Indeks dari ukuran cetak saat ini dalam daftar terpradefinisi dari ukuran-"
 "ukuran standar"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "cocok rasio aspek"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1157,202 +1175,202 @@ msgstr ""
 "Menentukan apakah ukuran cetak ubahan mesti cocok dengan rasio aspek dari "
 "foto asli"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "cetak judul"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "True bila judul foto mesti dicetak ketika foto dicetak, false bila tidak."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "fonta judul"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Nama fonta yang dipakai untuk judul foto ketika mereka dicetak."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "aktifkan plugin penerbitan facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Facebook difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "aktifkan plugin penerbitan flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Flickr difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "aktifkan plugin penerbitan picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya publikasi Album Web Picasa difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "aktifkan plugin penerbitan youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi YouTube difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "aktifkan plugin penerbitan piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Piwigo difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "aktifkan plugin penerbitan yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Yandex.Fotki difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "aktifkan plugin penerbitan tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Tumblr difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "aktifkan plugin penerbitan rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Rajce difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "aktifkan plugin penerbitan gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr "True bila pengaya publikasi Gallery3 difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "aktifkan plugin impor F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "True bila pengaya impor F-Spot difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "aktifkan transisi rontok pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Rontok difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "aktifkan transisi memudar pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Memudar difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "aktifkan transisi geser pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Geser difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "aktifkan transisi jam pada pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "True bila pengaya transisi salindia Jam difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "aktifkan transisi lingkaran pada pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Lingkaran difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "aktifkan transisi lingkaran pertunjukan salindia"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Lingkaran difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "aktifkan transisi tirai jajar pada tampilan slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Tirai Jajar difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "aktifkan transisi bujur sangkar pada tampilan slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Bujur Sangkar difungsikan, false bila "
 "tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "aktifkan transisi bergaris pada tampilan slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True bila pengaya transisi salindia Garis-garis difungsikan, false bila tidak"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "aktifkan transisi papan catur pada tampilan slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1387,24 +1405,7 @@ msgstr ""
 "Untuk dapat mengirim foto ke Facebook, silakan keluar dan jalankan Shotwell "
 "kembali, kemudian ulangi proses pengiriman."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Masukkan nomor konfirmasi yang muncul setelah Anda log masuk ke Flickr dalam "
-"peramban Web Anda."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Nomor Otorisasi:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Lanju_tkan"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1416,20 +1417,15 @@ msgstr ""
 "Klik Masuk untuk masuk ke Flickr pada peramban Web Anda. Anda mesti memberi "
 "izin Shotwell Connect untuk menyambungkan ke akun Flickr Anda."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Mempersiapkan log masuk…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Berkas penting untuk penerbitan tidak tersedia. Tak bisa lanjutkan "
-"menerbitkan ke Flickr."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Autorisasi Flickr gagal"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Memverifikasi otorisasi…"
 
@@ -1447,7 +1443,7 @@ msgstr ""
 "Untuk melanjutkan penerbitan ke layanan Google, keluar dan jalankan lagi "
 "Shotwell, lalu cobalah mempublikasikan lagi."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1460,7 +1456,7 @@ msgstr ""
 "perlu memberi wewenang Shotwell Connect menyambung ke akun Album Web Picasa "
 "Anda."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1472,11 +1468,53 @@ msgstr ""
 "\n"
 "Anda harus memiliki akun Google/YouTube untuk melanjutkan."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_Alamat Email"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Kata Sandi"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Log masuk"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Masukkan nama pengguna dan kata sandi yang berhubungan dengan akun Tumblr "
+"anda."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Nama pengguna dan/atau kata sandi tak valid. Harap coba lagi"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Nama Pengguna atau Kata Sandi Tak Valid"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Tidak dapat membuka UI: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Kunjungi laman serambi Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Mohammad Anwari <mdamt@di.blankon.in>, 2010\n"
@@ -1487,16 +1525,17 @@ msgstr ""
 "Malsasa <teknoloid@gmail.com>, 2012\n"
 "Mohamad Hasan Al Banna, 2013\n"
 "Rahman Yusri Aftian <aftian@yahoo.com>, 2012, 2013\n"
-"Andika Triwidada <andika@gmail.com>, 2011, 2014, 2017"
+"Andika Triwidada <andika@gmail.com>, 2011, 2014, 2017.\n"
+"Kukuh Syafaat <syafaatkukuh@gmail.com>, 2017."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr "⚫ Situs web ini menyajikan identifikasi milik situs web lain."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1505,7 +1544,7 @@ msgstr ""
 "pada kalender komputer Anda."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
@@ -1513,13 +1552,13 @@ msgstr ""
 "terpercaya."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr "⚫ Identifikasi situs web ini tak dapat diproses. Mungkin itu rusak."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1528,7 +1567,7 @@ msgstr ""
 "menerbitkannya."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1537,7 +1576,7 @@ msgstr ""
 "yang sangat lemah."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1545,107 +1584,11 @@ msgstr ""
 "⚫ Identifikasi situs web ini hanya valid pada tanggal di masa depan. Periksa "
 "tanggal pada kalender komputer Anda."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Berkas sementara yang diperlukan untuk penerbitan tidak tersedia"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Hak Cipta 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Selamat datang ke layanan impor pustaka F-Spot.\n"
-"\n"
-"Harap pilih pustaka yang akan diimpor, bisa dengan memilih pustaka yang "
-"ditemukan oleh Shotwell atau dengan memilih berkas basis data F-Spot "
-"alternatif."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Selamat datang di perpustakaan layanan impor F-Spot.\n"
-"\n"
-"Silahkan pilih berkas basis data F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Pilih manual basis data F-Spot untuk di impor:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Tidak dapat membuka berkas basis data F-Spot terpilih: berkas tidak ada atau "
-"bukan basis data F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Tidak dapat membuka berkas basis data F-Spot terpilih: versi basis data F-"
-"Spot ini tidak didukung oleh Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Tidak dapat membaca berkas basis data F-Spot terpilih: kesalahan saat "
-"membaca tabel tag"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Tidak dapat membaca berkas basis data F-Spot terpilih: kesalahan saat "
-"membaca tabel foto"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell menemukan %d foto pada daftar F-Spot dan sedang mengimpornya. Foto "
-"yang sama akan otomatis terdeteksi dan dihapus.\n"
-"\n"
-"Anda dapat menutup dialog ini dan mulai menggunakan Shotwell saat proses "
-"impor berlangsung di belakang."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Pustaka F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Bersiap mengimpor"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Servis Impor Data Inti"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL _Gallery3:"
@@ -1663,7 +1606,7 @@ msgid "Go _Back"
 msgstr "_Mundur"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:363
 msgid "_Log in"
 msgstr "_Log masuk"
 
@@ -1697,7 +1640,7 @@ msgid "pixels"
 msgstr "piksel"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1705,17 +1648,17 @@ msgstr "Ukuran asal"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Lebar atau tinggi"
+msgid "Longest edge"
+msgstr "Tepi terpanjang"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Keluar"
@@ -1723,11 +1666,11 @@ msgstr "_Keluar"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1823,33 +1766,13 @@ msgstr "Pengguna Tak Dikenal"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
-msgstr "Situs Tak Ditemukan"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_Alamat Email"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Kata Sandi"
+msgstr " Situs Tidak Ditemukan"
 
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Ingat"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Log masuk"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1903,83 +1826,10 @@ msgstr "Anda masuk  ke Rajce sebagai %s."
 msgid "Photos will appear in:"
 msgstr "Foto akan muncul di:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Layanan Penerbit Ekstra Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blog:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Ukuran _foto:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Hak Cipta 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 x 375 piksel"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 x 768 piksel"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 x 853 piksel"
-
-#: 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\" bukan jawaban yang valid ke permintaan otentikasi OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start(): tak bisa memulai, penerbit ini tidak bisa di-start "
-"ulang."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Masukkan nama pengguna dan kata sandi yang berhubungan dengan akun Tumblr "
-"anda."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Nama pengguna dan/atau kata sandi tak valid. Harap coba lagi"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Nama Pengguna atau Kata Sandi Tak Valid"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Tidak dapat membuka UI: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Anda belum masuk ke Tumblr sebagai %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Hak Cipta 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2048,6 +1898,14 @@ msgid ""
 msgstr ""
 "Hapus lokasi, kame_ra, dan informasi pengidentifikasi lain sebelum mengunggah"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Hak Cipta 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2088,17 +1946,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Kirim foto ke mana?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Saya sendiri saja"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Semua orang"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Ukuran _foto:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Berkas penting untuk penerbitan tidak tersedia. Tak bisa lanjutkan "
+"menerbitkan ke Flickr."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2107,7 +1978,7 @@ msgstr ""
 "Anda sudah login ke Flickr atas nama %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2117,40 +1988,52 @@ msgstr ""
 "bulan.\n"
 "Bulan ini Anda punya sisa jatah kuota unggah %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Anda memiliki akun Flickr Pro yang tidak memiliki batas pengiriman."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Foto ini dapat _dilihat oleh:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Video ini dapat _dilihat oleh:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Foto dan video ini dapat _dilihat oleh:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Teman dan keluarga saja"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Hanya keluarga"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Hanya teman"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 x 375 piksel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 x 768 piksel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 x 1536 piksel"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 x 3072 piksel"
@@ -2202,7 +2085,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 x 1536 pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Ukuran Asli"
 
@@ -2287,7 +2170,7 @@ msgid "Certificate of %s"
 msgstr "Sertifikat dari %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2339,10 +2222,38 @@ msgstr "Tampilkan sertifikat…"
 msgid "I understand, please _proceed."
 msgstr "Saya _paham, harap lanjutkan."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Layanan Penerbit Utama"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blog:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Hak Cipta 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 x 853 piksel"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start(): tak bisa memulai, penerbit ini tidak bisa di-start "
+"ulang."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Anda belum masuk ke Tumblr sebagai %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Pengaturan priva_si video:"
@@ -2467,16 +2378,16 @@ msgstr "Sematkan batang alat terbuka"
 msgid "Leave fullscreen"
 msgstr "Tinggalkan layar penuh"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 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:158
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2489,27 +2400,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – \"Aachen\""
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Kunjungi situs web Shotwell"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Pedoman penggunaan tidak dapat ditampilkan: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Gagal menavigasi basis data bug: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Gagal menampilkan FAQ: %s"
@@ -2575,17 +2480,27 @@ msgstr "Berkas citra rusak"
 msgid "Imported failed (%d)"
 msgstr "Impor yang gagal (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kamera"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Daftar semua peranti kamera yang ditemukan"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
 #: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2597,33 +2512,33 @@ msgstr ""
 "Kamera tidak dapat dilepas. Silakan lepas melalui program pengelola berkas."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Sembunyikan foto yang sudah selesai diimpor"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Hanya tampilkan foto yang belum diimpor"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Impor Foto _Terpilih"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Impor Semu_a"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 "Kamera tampaknya kosong. Tidak ada foto/video yang ditemukan untuk diimpor"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Tidak ditemukan foto/video baru pada kamera"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2631,15 +2546,15 @@ msgstr ""
 "Shotwell perlu melepaskan kamera dari sistem berkas agar dapat mengaksesnya. "
 "Lanjutkan?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Lepas"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Silakan lepaskan kamera."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2649,11 +2564,11 @@ msgstr ""
 "pada saat tidak terkunci. Silakan matikan aplikasi yang sedang menggunakan "
 "kamera ini dan coba kembali."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Mohon segera mematikan aplikasi lain yang sedang menggunakan kamera."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2662,61 +2577,65 @@ msgstr ""
 "Gambar pratayang tidak dapat diambil dari kamera:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Melepas kaitan…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Menyambung ke kamera, mohon tunggu…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Mulai mengimpor, mohon tunggu…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Mengambil informasi foto"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Mengambil gambar pratayang %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kamera tidak dapat dikunci: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Hapus %d foto ini dari kamera?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Hapus %d video ini dari kamera?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Hapus %d foto/video ini dari kamera?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Hapus %d berkas ini dari kamera?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Simpan"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Menghapus foto/video dari kamera"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2729,7 +2648,7 @@ msgid "_Print"
 msgstr "_Cetak"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Kirim _Ke…"
 
@@ -2771,13 +2690,13 @@ msgid "Flip Verti_cally"
 msgstr "Balik Verti_kal"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "Taja_mkan"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "K_embalikan ke Asal"
@@ -2794,7 +2713,8 @@ msgstr "Tem_pel Penyetelan Warna"
 msgid "Adjust Date and Time…"
 msgstr "Atur Jam dan Tanggal…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
 msgid "Open With E_xternal Editor"
 msgstr "Buka Oleh Penyunting E_ksternal"
 
@@ -2807,43 +2727,37 @@ msgstr "Buka Dengan Penyunting RA_W"
 msgid "_Play"
 msgstr "_Putar"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Ekspor Foto/Video"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Ekspor Foto-foto/Video-video"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Ekspor Foto/Video"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Ekspor Foto"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Ekspor Foto-foto"
+msgid_plural "Export Photos"
+msgstr[0] "Ekspor Foto"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Memutar"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Batalkan Pemutaran"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Balikkan Horizontal"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Batalkan Batal Horizontal"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Balikkan Vertikal"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Batalkan Balik Vertikal"
 
@@ -3052,7 +2966,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Berkas basis data:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Impor"
 
@@ -3064,7 +2978,7 @@ msgstr "Impor Dari Aplikasi"
 msgid "Import media _from:"
 msgstr "Impor media _dari:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -3133,7 +3047,7 @@ msgstr[0] "Ini akan menghapus tag \"%s\" dari %d foto. Teruskan?"
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Hapus"
@@ -3162,6 +3076,10 @@ msgstr "_Ganti Pengembang"
 msgid "Export Video"
 msgstr "Ekspor Video"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Ekspor Foto-foto"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3194,6 +3112,10 @@ msgstr ""
 "\n"
 "Lanjutkan proses ekspor foto?"
 
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Lanju_tkan"
+
 #. "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."
@@ -3429,8 +3351,7 @@ msgstr[0] ""
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
-msgstr[0] ""
-"Ada %d foto gagal diimpor karena kesalahan pada kamera:\n"
+msgstr[0] "Ada %d foto gagal diimpor karena kesalahan pada kamera:\n"
 
 #: src/Dialogs.vala:745
 #, c-format
@@ -3482,8 +3403,7 @@ msgstr[0] "%d berkas gagal diimpor karena rusak:\n"
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
-msgstr[0] ""
-"Ada %d foto yang tidak dapat dibuka:\n"
+msgstr[0] "Ada %d foto yang tidak dapat dibuka:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
@@ -3800,41 +3720,41 @@ msgstr "Impor foto dari %s pustakamu"
 #. 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:2335 src/Dialogs.vala:2339
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(Bantuan)"
 
-#: src/Dialogs.vala:2346
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Tahun%sBulan%sHari"
 
-#: src/Dialogs.vala:2348
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Tahun%sBulan"
 
-#: src/Dialogs.vala:2350
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Tahun%sBulan-Hari"
 
-#: src/Dialogs.vala:2352
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Tahun-Bulan-Hari"
 
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Bebas"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2590
+#: src/Dialogs.vala:2627
 msgid "Invalid pattern"
 msgstr "Pola tak sah"
 
 #. 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:2692
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3842,31 +3762,31 @@ msgstr ""
 "Shotwell dapat menyalin foto ke dalam folder pustaka atau mengimpor mereka "
 "tanpa menyalin."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "Sa_lin Foto"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "_Impor di Lokasi"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Impor ke Album"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Hapus Dari Album"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Hapus Foto dari Album"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
 msgstr "Hapus Foto Dari Album"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:2763
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3884,7 +3804,7 @@ msgstr[0] ""
 "\n"
 "Aksi ini tidak dapat dikembalikan ke semula."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:2767
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3902,7 +3822,7 @@ msgstr[0] ""
 "\n"
 "Aksi ini tidak dapat dikembalikan ke semula."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:2771
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -3920,7 +3840,7 @@ msgstr[0] ""
 "\n"
 "Aksi ini tidak dapat dikembalikan ke semula."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:2803
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -3931,7 +3851,7 @@ msgstr[0] ""
 "berkas ini?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3996,206 +3916,206 @@ msgid "Save As"
 msgstr "Simpan Sebagai"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Gagal memantau %s: Bukan direktori (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Kembalikan ukuran foto saat ini"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Atur pemotongan foto ini"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Atur kotak pemotongan antara orientasi mendatar dan berdiri"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Tanpa batas"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kotak"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Seukuran Layar"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Video SD (4:3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Video HD (16:9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Dompet (2 x 3 in.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Kertas catatan (3 x 5 in.)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 x 6 in."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 x 7 in."
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 x 10 in."
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8.5 x 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 x 14 in."
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 x 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 in."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Dompet Metrik (9 x 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Kartupos (10 x 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 x 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 x 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 x 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 x 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 x 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 x 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 x 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Ukuran:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Tutup penghilang mata merah"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Hilangkan efek mata merah pada area yang diinginkan"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Reset"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Bukaan:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontras:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Saturasi:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Tint:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Suhu:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Kegelapan:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#: src/editing_tools/EditingTools.vala:2285
 msgid "Highlights:"
 msgstr "Highlight:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset Colors"
 msgstr "Reset Warna"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset all color adjustments to original"
 msgstr "Kembalikan warna ke nilai aslinya"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2700
 msgid "Temperature"
 msgstr "Suhu"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2712
 msgid "Tint"
 msgstr "Tint"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2724
 msgid "Contrast"
 msgstr "Kontras"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2738
 msgid "Saturation"
 msgstr "Saturasi"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2751
 msgid "Exposure"
 msgstr "Bukaan"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2764
 msgid "Shadows"
 msgstr "Kegelapan"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2777
 msgid "Highlights"
 msgstr "Highlight"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2787
 msgid "Contrast Expansion"
 msgstr "Naikkan Kontras"
 
@@ -4208,23 +4128,19 @@ msgstr "Sudut:"
 msgid "_Straighten"
 msgstr "_Luruskan"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Rangkaian"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d Foto/Video"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d Video"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4234,27 +4150,35 @@ msgstr[0] "%d Foto"
 msgid "No Event"
 msgstr "Tidak Ada Rangkaian"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Rangkaian"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Meramban peristiwa-peristiwa Anda"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Tidak ada rangkaian"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Tidak ada rangkaian ditemukan"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Semua Kejadian"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Tidak bertanggal"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4294,20 +4218,16 @@ msgstr "Timpa Semu_a"
 msgid "Export"
 msgstr "Ekspor"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Folder"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Album"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Meramban struktur folder pustaka"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Foto"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Ditandai"
 
@@ -4328,19 +4248,36 @@ msgstr "%s diimpor"
 msgid "Last Import"
 msgstr "Impor terakhir"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Album"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organisasikan dan ramban foto Anda"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Foto"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Impor Dari Folder"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Rekursi Dalam Sub Folder"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Hapus Permanen Foto Buangan"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Mengosongkan Tong Sampah…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4353,33 +4290,33 @@ msgstr ""
 "Preferensi %s</span>.\n"
 "Apakah Anda ingin melanjutkan mengimpor foto?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Lokasi Pustaka"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Foto tidak dapat diimpor dari direktori tersebut."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Memutakhirkan pustaka…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Bersiap mengimpor otomatis foto…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Mengimpor otomatis foto…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Menulis metadata ke berkas…"
 
@@ -4395,15 +4332,15 @@ msgstr "Menghapus…"
 msgid "Trash"
 msgstr "Tempat Pembuangan"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Tempat Pembuangan kosong"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Menghapus foto-foto"
 
@@ -4451,32 +4388,36 @@ msgstr "Kesalahan tak dikenal saat mencoba verifikasi basis data Shotwell: %s"
 msgid "Loading Shotwell"
 msgstr "Menjalankan Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Path ke data privat Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIREKTORI"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Jangan pantau perubahan direktori pustaka saat runtime"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Jangan tampilkan meter kemajuan awal mula"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Tampilkan versi aplikasi"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Mulai aplikasi dalam mode layar penuh"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[FILE]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4492,7 +4433,7 @@ msgstr "Gagal memroses pembaruan pemantauan: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Atur ukuran gambar mini"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4501,15 +4442,15 @@ msgstr ""
 "Shotwell gagal memutar video terpilih:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Tidak ada foto/video"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Tidak ditemukan foto/video yang cocok dengan penyaring saat ini"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Foto tidak dapat diekspor ke direktori tersebut."
 
@@ -4573,7 +4514,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "berubah"
 
@@ -4786,37 +4727,37 @@ msgstr "Mengambil informasi akun…"
 msgid "Logging in…"
 msgstr "Sedang log masuk…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish Photos"
 msgstr "Kirim Foto"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish photos _to:"
 msgstr "Kirim foto _ke:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish Videos"
 msgstr "Kirim Video"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish videos _to"
 msgstr "Kirim video _ke"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish Photos and Videos"
 msgstr "Kirim Foto dan Video"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:202
 msgid "Publish photos and videos _to"
 msgstr "Kirim Foto dan Video _ke"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:412
 msgid "Unable to publish"
 msgstr "Tidak dapat mengirim"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:413
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5440,7 +5381,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Tidak bisa mengubah nama pencarian ke \"%s\" karena sudah ada."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Pencarian Tersimpan"
 
@@ -5448,11 +5389,11 @@ msgstr "Pencarian Tersimpan"
 msgid "Delete Search"
 msgstr "Hapus Pencarian"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "S_unting…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Ganti _nama…"
 
@@ -5522,7 +5463,7 @@ msgstr "_Kembalikan"
 msgid "Move the selected photos back into the library"
 msgstr "Kembalikan foto-foto ke album"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5538,7 +5479,8 @@ msgstr "Buka direktori foto yang dipilih dalam manajer berkas"
 msgid "Unable to open in file manager: %s"
 msgstr "Program pengatur berkas tidak dapat dibuka: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Hapus _Dari Album"
 
@@ -5601,14 +5543,10 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b, %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Pertunjukan salindia"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Pencarian Tersimpan"
-
 #. Ordering must correspond with SearchConditionText.Context
 #: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
@@ -5782,8 +5720,8 @@ msgstr "Status tanda"
 msgid "Photo state"
 msgstr "Status foto"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Rating"
 
@@ -5791,27 +5729,35 @@ msgstr "Rating"
 msgid "Date"
 msgstr "Tanggal"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Pencarian Tersimpan"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organisasikan pencarian Anda yang telah tersimpan"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Peringkat ★+"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Peringkat ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Peringkat ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Peringkat ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Peringkat ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Gagal memuat UI bilah pencarian:%s"
@@ -5821,73 +5767,73 @@ msgstr "Gagal memuat UI bilah pencarian:%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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Tutup"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tipe"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Video"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Foto RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Gunakan pencarian tersimpan untuk menyaring butir-butir dalam tilikan saat "
 "ini"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Pengaturan"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Mundur"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Mundur ke foto sebelumnya"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Hentikan"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Hentikan tampilan salindia"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Berikutnya"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Maju ke foto berikutnya"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Pengaturan"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Atur tampilan salindia"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Semua sumber foto telah lenyap."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Jalankan"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Teruskan tampilan salindia"
 
@@ -5899,7 +5845,7 @@ msgstr "Transisi Salindia"
 msgid "(None)"
 msgstr "(Tidak ada)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Tidak ada"
 
@@ -5907,16 +5853,20 @@ msgstr "Tidak ada"
 msgid "Random"
 msgstr "Acak"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Tag"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organisasikan dan ramban tag foto Anda"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "tanpa judul"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Ekspor Video"
 
@@ -5930,10 +5880,6 @@ msgstr "Jungki_tkan Bendera"
 msgid "_Developer"
 msgstr "_Developer"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Buka dengan Penyunting E_ksternal"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -5997,7 +5943,7 @@ msgstr "Lapo_r Masalah…"
 
 #: 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…"
+msgid "_Import From Folder…"
 msgstr "_Impor Dari Folder…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6075,11 +6021,6 @@ msgstr "T_urun"
 msgid "Even_ts"
 msgstr "Peris_tiwa"
 
-#: 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 "Hapus _Dari Pustaka"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Judul"
@@ -6122,53 +6063,145 @@ msgstr "_Foto-foto"
 msgid "_Stop Import"
 msgstr "_Hentikan Impor"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "putih"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "hitam"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Tampilan"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "Latar _Belakang:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Impor foto ke:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Pantau berkas baru di direktori album"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Mengimpor"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "_Struktur direktori:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Contoh:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "Ubah n_ama berkas impor ke huruf kecil"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Tulis tanda, judul dan metadata lainnya ke berkas foto"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "RAW Developer"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "De_fault:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Pola:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Latar Belakang Transparan:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Kotak-kotak"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Warna rata"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "Penyunting foto e_ksternal:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Penyunting _RAW eksternal:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Penyunting eksternal"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Pengaya"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Preferensi Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Ukuran Foto Tercetak</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Gunakan ukuran _standar:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Gunakan _ukuran bebas:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "in."
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Sesuaikan dengan rasio foto"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "Ukur_an otomatis:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Judul</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Ce_tak judul gambar"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Resolusi Piksel</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "Tampilkan f_oto pada:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "piksel per inci"
 
@@ -6176,11 +6209,11 @@ msgstr "piksel per inci"
 msgid "Set as Desktop Background"
 msgstr "Jadikan Latar Desktop"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Gunakan untuk Desktop"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Gunakan untuk Layar Kunci"
 
@@ -6188,138 +6221,78 @@ msgstr "Gunakan untuk Layar Kunci"
 msgid "Set as Desktop Slideshow"
 msgstr "Atur sebagai Salindia Destop"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Membuat salindia latar destop"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Tampilkan tiap foto untuk"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "jangka waktu"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr "Berapa lama tiap foto ditampilkan di latar destop"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "putih"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "hitam"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Tampilan"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "Latar _Belakang:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Impor foto ke:"
-
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Pantau berkas baru di direktori album"
-
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Mengimpor"
-
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "_Struktur direktori:"
-
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Contoh:"
-
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "Ubah n_ama berkas impor ke huruf kecil"
-
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Tulis tanda, judul dan metadata lainnya ke berkas foto"
-
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "RAW Developer"
-
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "De_fault:"
-
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Pola:"
-
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "Penyunting foto e_ksternal:"
-
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Penyunting _RAW eksternal:"
-
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Penyunting eksternal"
-
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Pengaya"
-
-#: ui/shotwell.ui:590
+#: ui/shotwell.ui:22
 msgid "_Name of search:"
 msgstr "_Nama pencarian:"
 
-#: ui/shotwell.ui:644
+#: ui/shotwell.ui:76
 msgid "_Match"
 msgstr "_Cocokkan"
 
-#: ui/shotwell.ui:671
+#: ui/shotwell.ui:103
 msgid "of the following:"
 msgstr "yang berikut ini:"
 
-#: ui/shotwell.ui:752
+#: ui/shotwell.ui:184
 msgid "label"
 msgstr "label"
 
-#: ui/shotwell.ui:903
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "_Tag Baru…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "Tun_daan:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Efek _Transisi:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Tundaan p_eralihan:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Tampilkan _judul"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "detik"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "_Tag Baru…"
-
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Hapus semua foto yang pernah dibuang"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Masukkan nomor konfirmasi yang muncul setelah Anda log masuk ke Flickr "
+#~ "dalam peramban Web Anda."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Nomor Otorisasi:"
+
+#~ msgid "Width or height"
+#~ msgstr "Lebar atau tinggi"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "\"%s\" bukan jawaban yang valid ke permintaan otentikasi OAuth"
diff --git a/po/lv.gmo b/po/lv.gmo
index 53399d5..e6aaf44 100644
--- a/po/lv.gmo
+++ b/po/lv.gmo
diff --git a/po/lv.po b/po/lv.po
index 1ac9446..4eadaff 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,14 +6,14 @@
 #
 # Translators:
 #
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011-2016.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011-2016, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwell"
-"&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-10-08 14:29+0000\n"
-"PO-Revision-Date: 2016-11-08 22:33+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
+"l&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2018-03-11 09:05+0000\n"
+"PO-Revision-Date: 2018-03-15 22:14+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -24,9 +24,11 @@ msgstr ""
 " 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -35,13 +37,6 @@ msgid "Popular photo manager"
 msgstr "Populārs fotogrāfiju pārvaldnieks"
 
 #: misc/shotwell.appdata.xml.in:11
-#| msgid ""
-#| "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
-#| "desktop. It allows you to import photos from your camera or disk, "
-#| "organize them by date and subject matter, even ratings. It also offers "
-#| "basic photo editing, like crop, red-eye correction, color adjustments, "
-#| "and straighten. Shotwell's non-destructive photo editor does not alter "
-#| "your master photos, making it easy to experiment and correct errors."
 msgid ""
 "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
 "desktop. It allows you to import photos from your camera or disk, organize "
@@ -70,16 +65,21 @@ msgstr ""
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Shotwell atbalsta JPEG, PNG, TIFF un dažādus jēlo datņu formātus."
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.appdata.xml.in:52
+#| msgid "Shotwell Viewer"
+msgid "The Shotwell developers"
+msgstr "Shotwell izstrādātāji"
+
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fotogrāfiju pārvaldnieks"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organizē savas fotogrāfijas"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -90,15 +90,15 @@ msgstr ""
 "publicēt;pagriezt;dalīties;tagi;video;facebook;flickr;picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell skatītājs"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Fotogrāfiju skatītājs"
 
@@ -127,7 +127,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Slepenais marķieris, ar ko parakstīt oauth pieprasījumus"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "noklusējuma izmērs"
 
@@ -155,9 +155,9 @@ msgid "URL of the Rajce server."
 msgstr "Rajce servera URL."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "lietotājvārds"
 
@@ -174,7 +174,7 @@ msgid "user token, if remembered."
 msgstr "lietotāja marķieris, ja ir iegaumēts."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "pēdējā kategorija"
 
@@ -183,7 +183,7 @@ msgid "The last selected Rajce category."
 msgstr "Pēdējā izvēlētā Rajce kategorija."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "pēdējais fotogrāfijas izmērs"
 
@@ -223,11 +223,11 @@ msgstr ""
 "augšupielādēšanas."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "Izņemt sensitīvo informāciju pirms augšupielādēt"
 
@@ -331,9 +331,6 @@ msgid "display photo ratings"
 msgstr "rādīt fotogrāfiju vērtējumus"
 
 #: misc/org.yorba.shotwell.gschema.xml:78
-#| msgid ""
-#| "True if a photo's rating should be displayed as overlaid trinket, false "
-#| "otherwise."
 msgid ""
 "True if a photo’s rating should be displayed as overlaid trinket, false "
 "otherwise."
@@ -483,14 +480,26 @@ msgid "A grayscale color for use as the background color."
 msgstr "Pelēktoņu krāsa, ko izmantot kā fona krāsu."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
-#| msgid "Selection state of \"hide photos\" option"
+msgid "background for transparent images"
+msgstr "fons caurspīdīgiem attēliem"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Fons, ko izmantot caurspīdīgiem attēliem."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "vienlaidu krāsa caurspīdīgam fonam"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr "Krāsa, ko izmantot fonam caurspīdīgiem attēliem, ir vienlaidu krāsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Izvēles stāvoklis opcijai “slēpt fotogrāfijas”"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
-#| msgid ""
-#| "Last used selection state of the \"hide photos already imported\" option "
-#| "in the import page."
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -498,95 +507,95 @@ msgstr ""
 "Pēdējais izmantotais stāvoklis opcijai “Slēpt jau importētās fotogrāfijas” "
 "importēšanas lapā."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "aizture"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Aizture (sekundēs) starp fotogrāfijām slaidrādē."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "pārejas aizture"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "Laiks (sekundēs), cik ilgi notiek pāreja starp fotogrāfijām slaidrādē"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "pārejas efekta id"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
 "Pārejas efekta nosaukums, kas tiks izmantots starp fotogrāfijām slaidrādē."
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "rādīt virsrakstu"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Vai slaidrādes laikā rādīt fotogrāfijas virsrakstu"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maksimizēt bibliotēkas logu"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Patiess, ja bibliotēkas lietotne ir maksimizēta, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "bibliotēkas loga platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Pēdējais saglabātais bibliotēkas lietotnes loga platums."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "bibliotēkas loga augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Pēdējais saglabātais bibliotēkas lietotnes loga augstums."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maksimizēt tiešās rediģēšanas logu"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "Patiess, ja tiešās rediģēšanas lietotne ir maksimizēta, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "tiešās rediģēšanas loga platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Pēdējais saglabātais tiešās rediģēšanas lietotnes loga platums."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "tiešās rediģēšanas loga augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Pēdējais saglabātais tiešās rediģēšanas lietotnes loga augstums."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "sānu joslas atdalītāja novietojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -594,30 +603,30 @@ msgstr ""
 "Pēdējais saglabātais atdalītāja novietojums starp sānu joslu un skatu "
 "lietotnes logā."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importēšanas direktorija"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Direktorija, kurā tiks novietotas importētās fotogrāfiju datnes."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "sekot līdzi jaunām datnēm manā bibliotēkā"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Ja patiess, bibliotēkas direktorijā pievienotās datnes tiks automātiski "
 "importētas."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "metadatus rakstīt datnēs"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -625,11 +634,11 @@ msgstr ""
 "Ja patiess, izmaiņas metadatos (tagi, nosaukumi u.c.) tiks rakstīti "
 "oriģinālajā fotogrāfijas datnē."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "lietot mazos burtus datņu nosaukumos"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -637,11 +646,11 @@ msgstr ""
 "Ja patiess, importējot fotogrāfiju datnes, Shotwell pārveidos visus burtus "
 "datņu nosaukumā uz mazajiem burtiem"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "direktoriju struktūra"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -649,11 +658,11 @@ msgstr ""
 "Virkne, kas iekodē nosaukšanas struktūru, ko izmantos fotogrāfiju "
 "direktoriju nosaukšanai importēšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "direktoriju struktūra pielāgota"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -661,30 +670,29 @@ msgstr ""
 "Virkne, kas iekodē pielāgotu nosaukšanas struktūru, ko izmantos fotogrāfiju "
 "direktoriju nosaukšanai importēšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "RAW attīstītājs noklusējuma"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opcija RAW attīstītājam, kuru pēc noklusējuma izmantos Shotwell."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Pēdējā izmantotā kadrēšanas malu attiecība."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Skaitlisks kods, kas attēlo pēdējo izmantoto kadrēšanas izvēlnes izvēli, ko "
 "ir veicis lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
-#| msgid "Most-recently-used crop custom aspect ratio's numerator."
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Pēdējās izmantotās pielāgotās kadrēšanas malu attiecības skaitītājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -692,12 +700,11 @@ msgstr ""
 "Pozitīvs vesels skaitlis, kas attēlo platuma daļu pielāgotajai kadrēšanas "
 "malu attiecībai, ko ievadīja lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
-#| msgid "Most-recently-used crop custom aspect ratio's denominator."
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Pēdējās izmantotās pielāgotās kadrēšanas malu attiecības saucējs."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -705,141 +712,140 @@ msgstr ""
 "Pozitīvs vesels skaitlis, kas attēlo augstuma daļu pielāgotajai kadrēšanas "
 "malu attiecībai, ko ievadīja lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "ārējais fotogrāfiju redaktors"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Ārējā lietotne, ko izmantot fotogrāfiju rediģēšanai."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "ārējais raw redaktors"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Ārējā lietotne, ko izmantot jēlo fotogrāfiju rediģēšanai."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Iestatījums eksportēšanas dialoglodziņā: kā kadrēt attēlus"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#| msgid "Export metadata"
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "eksportēt metadatus"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Iestatījums eksportēšanas dialoglodziņā: opcija metadatu eksportēšanā"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "formāta iestatījums, īpaša vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Iestatījums eksportēšanas dialoglodziņā: formāta iestatījums, īpaša vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "formāta iestatījums, tipa vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 "Iestatījums eksportēšanas dialoglodziņā: formāta iestatījums, tipa vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "JPEG kvalitātes opcija"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Iestatījums eksportēšanas dialoglodziņā: jpeg kvalitātes opcijas"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "maksimālais attēla izmērs"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Iestatījums eksportēšanas dialoglodziņā: maksimālais attēla izmērs"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "pēdējais izmantotais publicēšanas pakalpojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Skaitlisks kods, kas reprezentē pēdējo pakalpojumu, uz kuru publicēja "
 "fotogrāfijas"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "noklusējuma publicēšanas pakalpojumi"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "piekļuves marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Facebook OAuth marķieris šai sesijai, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "lietotāja i.d."
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "Facebook lietotāja identifikācija šai sesijai, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "lietotājvārds"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Vārds pašlaik autorizētajam Facebook lietotājam, ja tāds ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "noklusējuma izmērs kodam"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Facebook augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth piekļuves fāzes marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Autorizācijas marķieris pašlaik autorizētajam Flickr lietotājam, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth piekļuves fāzes marķiera noslēpums"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -847,22 +853,22 @@ msgstr ""
 "Kriptogrāfiskais noslēpums, ko izmanto pieprasījumu parakstīšanai pret "
 "autorizācijas marķieri pašlaik autorizētam Flickr lietotājam, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Lietotājvārds pašlaik autorizētajam Flickr lietotājam, ja tāds ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "noklusējuma redzamība"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -870,18 +876,18 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma redzamību fotogrāfijām, ko "
 "publicēs Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Flickr augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "atsvaidzināšanas marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -889,7 +895,7 @@ msgstr ""
 "OAuth marķieris, ko izmanto Picasa Web Albums sesijas atsvaidzināšanai šīs "
 "sesijas lietotājam, ja ir."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -897,63 +903,63 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "pēdējais albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Nosaukums albumam, uz kuru pēdējo reizi lietotājs publicēja, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Picasa augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Piwigo servera URL."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo lietotājvārds, ja ir ierakstījies."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "parole"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo parole, ja ir ierakstījies."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "atcerēties paroli"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Ja patiess, atcerēties Piwigo paroli."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Pēdējā izvēlētā Piwigo kategorija."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "pēdējais atļauju līmenis"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Pēdējais izvēlētais Piwigo atļauju līmenis."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -961,20 +967,20 @@ msgstr ""
 "Skaitlisks kods, kas attēlo pēdējo izmantoto priekšiestatījumu, kad "
 "publicēja uz Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Piwigo augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ja ir iestatīs nosaukums un nav komentāru, izmantot nosaukumu kā komentārus, "
 "kad augšupielādē uz Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -982,11 +988,11 @@ msgstr ""
 "Vai pirms uz Piwigo augšupielādēt attēlus, vai komentārus jāņem no "
 "nosaukuma, ja ir iestatīs nosaukums, bet ne komentāri"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "neiekļaut tagus, kad augšupielādē uz Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -994,45 +1000,45 @@ msgstr ""
 "Vai pirms uz Piwigo augšupielādēt attēlus, no tiem jāizņem tagi tā, lai tie "
 "neparādītos attālinātos Piwigo serveros."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3 lietotājvārds"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API atslēga"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3 API atslēga"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3 vietnes URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr "Vai pirms uz Gallery3 augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "mērogošanas ierobežojumi augšupielādētajam attēlam"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Mērogošanas ierobežojuma ID attēlam, kas tiks augšupielādēts"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "pikseļi galvenās ass augšupielādētajam attēlam"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1040,7 +1046,7 @@ msgstr ""
 "Pikseļi galvenās ass attēlam, ko augšupielādēs; izmanto tikai, ja scaling-"
 "constraint-id ir atbilstoša vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1048,31 +1054,31 @@ msgstr ""
 "OAuth marķieris, ko izmanto YouTube sesijas atsvaidzināšanai šīs sesijas "
 "lietotājam, ja ir."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "pēdējais izmantotais importēšanas pakalpojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Skaitlisks kods, kas reprezentē pēdējo pakalpojumu, no kura importēja "
 "fotogrāfijas"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "interpretatora stāvokļa sīkdatne"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Skaitlisks kods, kas ietver GStreamer spraudņa vides stāvokli"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "satura izkārtojuma režīms"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1080,35 +1086,35 @@ msgstr ""
 "Skaitlisks kods, kas apraksta, kā drukāšanas laikā fotogrāfijas tiek "
 "izkārtotas uz papīra."
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "satura punkti collā"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Pikseļu skaits collā (ppi), ko drukāšanas laikā sūtīt printerim"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "satura platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Platums izdrukātajai emulsijai uz papīra"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "satura augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Augstums izdrukātajai emulsijai uz papīra"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "satura vienības"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1116,11 +1122,11 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē mērvienības (collas vai centimetri), ko "
 "izmantot drukājot"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "attēli lappusē, kods"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1128,22 +1134,22 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē kodu pašlaik izvēlēto attēlu skaitam "
 "lappusē, kad drukā"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "izmēra izvēle"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Pašreizējā drukāšanas izmēra indekss iepriekš noteiktā standarta izmēru "
 "sarakstā"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "atbilst malu attiecībām"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1151,232 +1157,373 @@ msgstr ""
 "Nosaka, vai pielāgotie drukāšanas izmēri atbilst sākotnējās fotogrāfijas "
 "malu attiecībām"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "drukāt nosaukumus"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "Patiess, ja drukāšanas laikā jādrukā fotogrāfijas virsraksts, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "virsrakstu nosaukumi"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Nosaukums fontam, ko izmantot fotogrāfiju virsrakstiem to drukāšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "ieslēgt facebook publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Facebook publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "ieslēgt flickr publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Flickr publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "ieslēgt picasa publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt Picasa Web Albums publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "ieslēgt youtube publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt YouTube publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "ieslēgt piwigo publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Piwigo publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "ieslēgt yandex publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Yandex.Fotki publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "ieslēgt tumblr publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Tumblr publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "ieslēgt rajce publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Rajce publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "ieslēgt gallery3 publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Gallery3 publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "ieslēgt  F-Spot importēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt F-Spot importēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "ieslēgt slaidrādes sairšanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt sairšanas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "ieslēgt slaidrādes izgaišanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt izgaišanas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "ieslēgt slaidrādes slīdēšanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt slaidrādes slīdrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "ieslēgt slaidrādes pulksteņa pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt pulksteņa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "ieslēgt slaidrādes apļa pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt apļa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:804
+#| msgid "enable slideshow circle transition"
+msgid "enable slideshow circles transition"
+msgstr "ieslēgt slaidrādes apļu pāreju"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt apļa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:810
+#| msgid "enable slideshow slide transition"
+msgid "enable slideshow blinds transition"
+msgstr "ieslēgt slaidrādes žalūziju pāreju"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt žalūziju slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "ieslēgt slaidrādes kvadrātu pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt kvadrātu slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "ieslēgt slaidrādes strīpas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt strīpas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "ieslēgt slaidrādes šaha pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
 msgstr ""
 "Ja patiess, ieslēgt šaha galdiņa slaidrādes pāreju spraudni, citādi aplams"
 
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Jūs pašlaik neesat ierakstījies Facebook.\n"
+"\n"
+"Ja jums vēl nav Facebook konta, jūs to varat izveidot ierakstīšanās procesā. "
+"Tās laikā Shotwell Connect var jums prasīt atļauju augšupielādēt "
+"fotogrāfijas un publicēt tās jūsu plūsmā. Šīs atļaujas ir nepieciešamas, lai "
+"Shotwell Connect varētu darboties."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Jūs jau esat ierakstījies un izrakstījies no Facebook sistēmas Shotwell "
+"sesijas laikā.\n"
+"Lai turpinātu publicēšanu Facebook sistēmā, izejiet no Shotwell un "
+"pārlaidiet to vēlreiz."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Jūs pašlaik neesat ierakstījies Flickr vietnē.\n"
+"\n"
+"Spiediet “Log in”, lai ierakstītos Flickr vietnē tīmekļa pārlūkā. Jums "
+"vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Flickr kontu."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
+msgid "Preparing for login…"
+msgstr "Gatavojas ierakstīties…"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Flickr pilnvarošana neizdevās"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
+msgid "Verifying authorization…"
+msgstr "Pārbauda pilnvarojumu…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Jūs jau esat ierakstījies un izrakstījies no Google pakalpojuma Shotwell "
+"sesijas laikā.\n"
+"Lai turpinātu publicēšanu Google pakalpojumos, izejiet no Shotwell un "
+"pārlaidiet to vēlreiz."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Jūs pašlaik neesat ierakstījies Picasa Web Albums vietnē.\n"
+"\n"
+"Spiediet “Log in”, lai ierakstītos Picasa Web Albums vietnē tīmekļa pārlūkā. "
+"Jums vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Picasa "
+"Web Albums kontu."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
+msgid ""
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
+msgstr ""
+"Jūs pašlaik neesat ierakstījies YouTube\n"
+"\n"
+"Jums jau ir jābūt izveidotam Google kontam un tur ir jābūt iestatītai "
+"YouTube izmantošanai, lai turpinātu. Lielāko daļu kontu varat iestatīt, "
+"izmantojot pārlūku un ierakstoties YouTube vismaz vienreiz."
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-pasta adrese"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Parole"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Ierakstīties"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Ievadiet lietotājvārdu un paroli, kas ir saistītas ar jūsu Tumblr kontu."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Lietotājvārds un / vai parole nav pareiza. Lūdzu, mēģiniet vēlreiz"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Nederīgs lietotājvārds vai parole"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Nevarēja ielādēt lietotāja saskarni — %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Apmeklēt Shotwell mājas lapu"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Pēteris Krišjānis <pecisk@gmail.com>\n"
 "Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
 "⚫ Šī tīmekļa vietne sniedza identifikāciju, kas pieder citai tīmekļa vietnei."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
 msgstr ""
-"⚫ Tīmekļa vietnes identifikācija ir pārāk veca, lai tai uzticētos. Pārbaudiet "
-"sava datora kalendāra datumu."
+"⚫ Tīmekļa vietnes identifikācija ir pārāk veca, lai tai uzticētos. "
+"Pārbaudiet sava datora kalendāra datumu."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr "⚫ Šīs tīmekļa vietnes identifikāciju neizdeva uzticama institūcija."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1384,15 +1531,16 @@ msgstr ""
 "bojāta."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
 msgstr ""
-"⚫ Šīs tīmekļa vietnes identifikāciju atsauca institūcija, kura to ir izdevusi."
+"⚫ Šīs tīmekļa vietnes identifikāciju atsauca institūcija, kura to ir "
+"izdevusi."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1401,217 +1549,106 @@ msgstr ""
 "šifrēšanu."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
 msgstr ""
-"⚫ Tīmekļa vietnes identifikācija ir derīga tikai nākotnes datumiem."
-" Pārbaudiet "
-"datumu sava datora kalendārā."
+"⚫ Tīmekļa vietnes identifikācija ir derīga tikai nākotnes datumiem. "
+"Pārbaudiet datumu sava datora kalendārā."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Publicēšanai nepieciešama pagaidu datne"
 
-#: plugins/common/RESTSupport.vala:1167
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Jūs jau esat ierakstījies un izrakstījies no Google pakalpojuma Shotwell "
-"sesijas laikā.\n"
-"Lai turpinātu publicēšanu Google pakalpojumos, izejiet no Shotwell un "
-"pārlaidiet to vēlreiz."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Autortiesības 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Laipni lūdzam F-Spot bibliotēkas importēšanas servisā.\n"
-"\n"
-"Lūdzu, izvēlieties bibliotēku, ko importēt, vai nu izvēloties kādu no "
-"bibliotēkām, ko ir atradis Shotwell, vai arī izvēloties alternatīvu F-Spot "
-"datubāzes datni."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Laipni lūdzam F-Spot bibliotēkas importēšanas servisā.\n"
-"\n"
-"Lūdzu, izvēlieties F-Spot datubāzes datni."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Manuāli izvēlieties F-Spot datubāzes datni, ko importēt:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Nevar atvērt izvēlēto F-Spot datubāzes datni — datne neeksistē vai nav F-"
-"Spot datubāze"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Nevar atvērt izvēlēto F-Spot datubāzes datni — šo F-Spot datubāzes datnes "
-"versiju Shotwell neatbalsta"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Nevar nolasīt izvēlēto F-Spot datubāzes datni — kļūda, nolasot tagu tabulu"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Nevar nolasīt izvēlēto F-Spot datubāzes datni — kļūda, nolasot fotogrāfiju "
-"tabulu"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell ir atradis %d fotogrāfijas F-Spot bibliotēkā un tās pašlaik "
-"importē. Dublikāti tiks automātiski atrasti un izņemti.\n"
-"\n"
-"Jūs varat aizvērt šo dialoglodziņu un sākt lietot Shotwell, kamēr fonā "
-"notiek importēšana."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot bibliotēka — %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Gatavojas importēt"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Kodola datu importēšanas servisi"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Iet _atpakaļ"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
-#| msgid "_Login"
-msgid "_Log in"
-msgstr "_Ierakstīties"
-
-#: 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 "_Lietotājvārds:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Parole:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Iet _atpakaļ"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:76
+msgid "_Log in"
+msgstr "_Ierakstīties"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API _atslēga:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "vai"
 
-#: 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 "_Izrakstīties"
-
-#: 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 "_Publicēt"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Esošs albums"
 
-#: 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 "Jau_ns albums"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Esošs albums"
-
-#: 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 ""
 "_Izņemt uzņemšanas vietu, tagus un kameru identificējošus datus pirms "
 "augšupielādēt"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Mērogošanas ierobežojums:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "pikseļi"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Sākotnējais izmērs"
 
-#: 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 "Platums vai augstums"
+msgid "Longest edge"
+msgstr "Garākā mala"
+
+#: 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/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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Izrakstīties"
+
+#: 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/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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Publicēt"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
@@ -1635,11 +1672,6 @@ msgstr "Shotwell noklusējuma direktorija"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "The file \"%s\" may not be supported by or may be too large for this "
-#| "instance of Gallery3."
 msgid ""
 "\n"
 "\n"
@@ -1663,9 +1695,6 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to %s can't "
-#| "continue."
 msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
@@ -1713,57 +1742,32 @@ msgstr "Neatpazīts lietotājs"
 msgid " Site Not Found"
 msgstr "Vietne nav atrasta"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
-msgid "_Email address"
-msgstr "_E-pasta adrese"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
-msgid "_Password"
-msgstr "_Parole"
-
-#: 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 "Atce_rēties"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
-#| msgid "Logging in..."
-msgid "Log in"
-msgstr "Ierakstīties"
-
-#: 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
 msgid "An _existing album:"
 msgstr "_Esošs albums:"
 
-#: 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
 msgid "A _new album named:"
 msgstr "Jau_ns albums ar nosaukumu:"
 
-#: 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 "_Slēpt albumu"
 
-#: 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 "Atvērt mērķa _albumu pārlūkā"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#| msgid "Copyright (C) 2013 rajce.net"
 msgid "Copyright © 2013 rajce.net"
 msgstr "Autortiesības © 2013 rajce.net"
 
@@ -1784,98 +1788,21 @@ msgstr "E-pasta adrese un / vai parole nav pareiza. Lūdzu, mēģiniet vēlreiz"
 msgid "Invalid User Email or Password"
 msgstr "Nederīga lietotāja e-pasta adrese vai parole"
 
-#: 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 "Jūs esat ierakstījies Rajce kā “%s”."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Fotogrāfijas parādīsies:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell papildu publicēšanas pakalpojumi"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
-msgid "Blogs:"
-msgstr "Emuāri:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Fotogrāfiju izmēr_s:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Autortiesības 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
-#| msgid "500 x 375 pixels"
-msgid "500 × 375 pixels"
-msgstr "500 × 375 pikseļi"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
-#| msgid "1024 x 768 pixels"
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 pikseļi"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#| msgid "1280 x 853 pixels"
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 pikseļi"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-#| msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "“%s” nav derīga atbilde OAuth autentifikācijas pieprasījumam"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#| msgid ""
-#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): nevar startēt; publicētājs nav pārstartējams."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Ievadiet lietotājvārdu un paroli, kas ir saistītas ar jūsu Tumblr kontu."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
-msgid "Username and/or password invalid. Please try again"
-msgstr "Lietotājvārds un / vai parole nav pareiza. Lūdzu, mēģiniet vēlreiz"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
-msgid "Invalid User Name or Password"
-msgstr "Nederīgs lietotājvārds vai parole"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Nevarēja ielādēt lietotāja saskarni — %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Jūs esat ierakstījies Tumblr kā %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Autortiesības 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -1888,127 +1815,90 @@ msgstr "Apmeklējiet Yandex.Fotki tīmekļa vietni"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Jūs šobrīd neesat ierakstījies Yandex.Fotki."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Publisks"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Draugi"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Privāts"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albums (vai rakstīt jaunu):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Piekļuves _tips:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Izslēgt _komentārus"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Aizliegt lejupielādēt sākotnējo _fotogrāfiju"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Publisks"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Draugi"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privāts"
-
-#: 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 "Publicēt _esošā 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 "Izveidot jau_nu albumu ar nosaukumu:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "Augšupielāde_s izmērs:"
 
-#: 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 "_Video un jaunie fotogrāfiju albumi ir redzami:"
 
-#: 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:59
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 "_Izņemt uzņemšanas vietu, kameru un citu identificējošu informāciju pirms "
 "augšupielādēt"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Autortiesības 2016 Software Freedom Conservancy Inc."
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Shotwell savienojumi"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-#| msgid ""
-#| "You are not currently logged into Facebook.\n"
-#| "\n"
-#| "If you don't yet have a Facebook account, you can create one during the "
-#| "login process. During login, Shotwell Connect may ask you for permission "
-#| "to upload photos and publish to your feed. These permissions are required "
-#| "for Shotwell Connect to function."
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don’t yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Jūs pašlaik neesat ierakstījies Facebook.\n"
-"\n"
-"Ja jums vēl nav Facebook konta, jūs to varat izveidot ierakstīšanās procesā. "
-"Tās laikā Shotwell Connect var jums prasīt atļauju augšupielādēt "
-"fotogrāfijas un publicēt tās jūsu plūsmā. Šīs atļaujas ir nepieciešamas, lai "
-"Shotwell Connect varētu darboties."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Jūs jau esat ierakstījies un izrakstījies no Facebook sistēmas Shotwell "
-"sesijas laikā.\n"
-"Lai turpinātu publicēšanu Facebook sistēmā, izejiet no Shotwell un "
-"pārlaidiet to vēlreiz."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standarta (720 pikseļi)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Liels (2048 pikseļi)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-#| msgid "Testing connection to Facebook..."
-msgid "Testing connection to Facebook…"
-msgstr "Pārbauda savienojumu ar Facebook…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#| msgid "Creating album..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Veido albumu…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Facebook "
-#| "can't continue."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
@@ -2016,7 +1906,7 @@ msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz "
 "Facebook."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2025,87 +1915,34 @@ msgstr ""
 "Jūs esat ierakstījies Facebook kā %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:983
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Kur vēlaties publicēt izvēlētās fotogrāfijas?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Tikai es"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Ikviens"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Ievadiet apstiprināšanas skaitli, kas parādīsies pēc tam, kad būsiet "
-"ierakstījies Flickr vietnē."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Autorizācijas _skaitlis:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Turpinā_t"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-#| msgid ""
-#| "You are not currently logged into Flickr.\n"
-#| "\n"
-#| "Click Login to log into Flickr in your Web browser.  You will have to "
-#| "authorize Shotwell Connect to link to your Flickr account."
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Jūs pašlaik neesat ierakstījies Flickr vietnē.\n"
-"\n"
-"Spiediet “Log in”, lai ierakstītos Flickr vietnē tīmekļa pārlūkā. Jums "
-"vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Flickr kontu."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Jūs jau esat ierakstījies un izrakstījies no Flickr sistēmas Shotwell "
-"sesijas laikā.\n"
-"Lai turpinātu publicēšanu Flickr sistēmā, izejiet no Shotwell un pārlaidiet "
-"to vēlreiz."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-#| msgid "Preparing for login..."
-msgid "Preparing for login…"
-msgstr "Gatavojas ierakstīties…"
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Fotogrāfiju izmēr_s:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz Flickr."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-#| msgid "Verifying authorization..."
-msgid "Verifying authorization…"
-msgstr "Pārbauda pilnvarojumu…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2114,95 +1951,85 @@ msgstr ""
 "Jūs esat ierakstījies Flickr kā %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, 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] ""
-"Jūsu bezmaksas Flickr konts ierobežo mēnesī augšupielādējamo datu apjomu.\n"
-"Šomēnes jums ir atlicis %d megabaits augšupielādēšanas kvotas."
-msgstr[1] ""
-"Jūsu bezmaksas Flickr konts ierobežo mēnesī augšupielādējamo datu apjomu.\n"
-"Šomēnes jums ir atlikuši %d megabaiti augšupielādēšanas kvotas."
-msgstr[2] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Jūsu bezmaksas Flickr konts ierobežo mēnesī augšupielādējamo datu apjomu.\n"
-"Šomēnes jums ir atlikuši %d megabaiti augšupielādēšanas kvotas."
+"Šomēnes jums ir atlicis %s augšupielādēšanas kvotas."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Jūsu Flickr Pro konts ļauj jums izmantot neierobežotu datu apjomu."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotogrāfijas, _kas redzamas:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Video, _kas redzami:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotogrāfijas un video, _kas redzami:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Tikai draugiem un ģimenei"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Tikai ģimenei"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Tikai draugiem"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
-#| msgid "2048 x 1536 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pikseļi"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pikseļi"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pikseļi"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
-#| msgid "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pikseļi"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "L_ikt albumu publiskā galerijā"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Fotogrāfiju izmēru priekšiestatījumus:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#| msgid ""
-#| "You are not currently logged into Picasa Web Albums.\n"
-#| "\n"
-#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
-#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
-#| "account."
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Jūs pašlaik neesat ierakstījies Picasa Web Albums vietnē.\n"
-"\n"
-"Spiediet “Log in”, lai ierakstītos Picasa Web Albums vietnē tīmekļa pārlūkā. "
-"Jums vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Picasa "
-"Web Albums kontu."
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+#| msgid "last album"
+msgid "Default album"
+msgstr "Noklusējuma albums"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
@@ -2210,113 +2037,130 @@ msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz Picasa."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Jūs esat ierakstījies Picasa Web Albums kā “%s”."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Video parādīsies:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-#| msgid "Small (640 x 480 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Mazs (640 × 480 pikseļi)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-#| msgid "Medium (1024 x 768 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Vidējs (1024 × 768 pikseļi)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-#| msgid "Recommended (1600 x 1200 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Ieteiktais (1600 × 1200 pikseļi)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-#| msgid "Google+ (2048 x 1536 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pikseļi)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Sākotnējais izmērs"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "Jūsu Piwigo _URL fotogrāfiju bibliotēka"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "_Lietotājvārds"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "Atce_rēties paroli"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "_Esoša kategorija:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Fotogrāfijas _varēs redzēt:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Fotogrāfijas izmērs:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "kategorijā:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Albuma komentārs:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+#| msgid "_Remember Password"
+msgid "Remember Password"
+msgstr "Atcerēties paroli"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+#| msgid "An _existing category:"
+msgid "An _existing category"
+msgstr "_Esoša kategorija"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+#| msgid "A _new album named:"
+msgid "A _new album named"
+msgstr "Jau_ns albums ar nosaukumu"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#| msgid "within category:"
+msgid "within category"
+msgstr "kategorijā"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+#| msgid "Album comment:"
+msgid "Album comment"
+msgstr "Albuma komentārs"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+#| msgid "Photos will be _visible by:"
+msgid "Photos will be _visible by"
+msgstr "Fotogrāfijas _varēs redzēt"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+#| msgid "Photo size:"
+msgid "Photo size"
+msgstr "Fotogrāfijas izmērs"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "_Ja ir iestatīs nosaukums un nav komentāru, izmantot nosaukumu kā komentārus"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Nevajag augšupielādēt tagus"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Izrakstīties"
 
-#: 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:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Publicēt"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-#| msgid "Creating album %s..."
 msgid "Creating album %s…"
 msgstr "Veido albumu %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "Gadījās kļūda, publicējot uz Piwigo. Lūdzu, mēģiniet vēlreiz."
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
 "steal or alter information going to or from this site (for example, private "
 "messages, credit card information, or passwords)."
 msgstr ""
-"Šī neizskatās pēc īstas <b>%s</b> vietnes. Iespējams, ka "
-"uzbrucēji mēģina nozagt vai mainīt informāciju, kas iet uz vai no šīs "
-"vietnes (piemēram, privātie ziņojumi, kredītkaršu informācija vai paroles)."
+"Šī neizskatās pēc īstas <b>%s</b> vietnes. Iespējams, ka uzbrucēji mēģina "
+"nozagt vai mainīt informāciju, kas iet uz vai no šīs vietnes (piemēram, "
+"privātie ziņojumi, kredītkaršu informācija vai paroles)."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "%s sertifikāts"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
+msgid "_OK"
+msgstr "_Labi"
+
+#: 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."
@@ -2324,7 +2168,7 @@ msgstr ""
 "Ievadiet savas fotogrāfiju bibliotēkas URL, kā arī lietotājvārdu un paroli, "
 "kas ir saistīta ar Piwigo kontu tai bibliotēkai."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2332,23 +2176,23 @@ msgstr ""
 "Shotwell nevar sazināties ar jūsu Piwigo fotogrāfiju bibliotēku. Lūdzu, "
 "pārbaudiet ievadīto URL."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Nederīgs URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratori, ģimene, draugi, kontakti"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administratori, ģimene, draugi"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administratori, ģimene"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administratori"
 
@@ -2364,32 +2208,42 @@ msgstr "Rādīt sertifikātu…"
 msgid "I understand, please _proceed."
 msgstr "Es saprotu, lūdzu, _turpiniet."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Pamata publicēšanas servisi"
 
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-msgid "Video privacy _setting:"
-msgstr "Video privātuma ie_statījumi:"
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Emuāri:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Autortiesības 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pikseļi"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
 msgid ""
-"You are not currently logged into YouTube.\n"
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): nevar startēt; publicētājs nav pārstartējams."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
 "\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
 msgstr ""
-"Jūs pašlaik neesat ierakstījies YouTube\n"
+"Jūs esat ierakstījies Tumblr kā %s.\n"
 "\n"
-"Jums jau ir jābūt izveidotam Google kontam un tur ir jābūt iestatītai "
-"YouTube izmantošanai, lai turpinātu. Lielāko daļu kontu varat iestatīt, "
-"izmantojot pārlūku un ierakstoties YouTube vismaz vienreiz."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Youtube "
-#| "can't continue."
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Video privātuma ie_statījumi:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
@@ -2397,22 +2251,16 @@ msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz "
 "YouTube."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Jūs esat ierakstījies YouTube kā “%s”."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-#| msgid "Videos will appear in '%s'"
-msgid "Videos will appear in “%s”"
-msgstr "Video parādīsies pēc “%s”"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Publiskā sarakstā"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Nav publiskā sarakstā"
 
@@ -2503,45 +2351,30 @@ msgstr "Neizdevās padarīt direktoriju %s rakstāmu"
 msgid "Could not make directory %s writable: %s"
 msgstr "Neizdevās padarīt direktoriju %s rakstāmu — %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Nofiksēt rīkjoslu"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Nofiksēt rīkjoslu atvērtu"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Iziet no pilnekrāna režīma"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Saturs"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Biežāk uzdotie jautājumi"
-
-#: src/AppWindow.vala:509
-#| msgid "_Report a Problem..."
-msgid "_Report a Problem…"
-msgstr "_Ziņot par problēmu…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:586
 #, c-format
-#| msgid ""
-#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
-#| "cannot continue.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
@@ -2553,21 +2386,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Apmeklējiet Shotwell tīmekļa vietni"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nevar parādīt palīdzību — %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nevar pārvietoties pa kļūdu datubāzi — %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nevar parādīt BUJ — %s"
@@ -2633,96 +2466,81 @@ msgstr "Bojāta attēla datne"
 msgid "Imported failed (%d)"
 msgstr "Neizdevās importēt (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kameras"
 
-#: 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/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Sarakts ar visām atklātajām kameru ierīcēm"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:458
-#| msgid ""
-#| "Unable to unmount camera.  Try unmounting the camera from the file "
-#| "manager."
+#: src/camera/ImportPage.vala:466
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
 "Neizdevās nomontēt kameru. Mēģiniet nomontēt kameru no datņu pārvaldnieka."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Slēpt jau importētās fotogrāfijas"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Rādīt tikai fotogrāfijas, kas nav importētas"
 
-#: src/camera/ImportPage.vala:842
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr ""
-"Izskatās, ka kamera ir tukša. Netika atrastas fotogrāfijas/video, ko importēt"
-
-#: src/camera/ImportPage.vala:846
-#| msgid "Removing photos/videos from camera"
-msgid "No new photos/videos found on camera"
-msgstr "Kamerā nav atrastu jaunu fotogrāfiju/video"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Nosaukumi"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Rādīt nosaukumu katrai fotogrāfijai"
-
-#: src/camera/ImportPage.vala:885
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importēt izvēlētā_s"
 
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importēt izvēlētās fotogrāfijās savā bibliotēkā"
-
-#: src/camera/ImportPage.vala:891
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importēt vis_as"
 
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importēt visas fotogrāfijas savā bibliotēkā"
+#: src/camera/ImportPage.vala:850
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+"Izskatās, ka kamera ir tukša. Netika atrastas fotogrāfijas/video, ko importēt"
+
+#: src/camera/ImportPage.vala:854
+msgid "No new photos/videos found on camera"
+msgstr "Kamerā nav atrastu jaunu fotogrāfiju/video"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it.  Continue?"
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr ""
 "Shotwell ir jānomontē kamera no datņu sistēmas, lai tai piekļūtu. Turpināt?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "No_montēt"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Lūdzu, nomontējiet kameru."
 
-#: src/camera/ImportPage.vala:1029
-#| msgid ""
-#| "The camera is locked by another application.  Shotwell can only access "
-#| "the camera when it's unlocked.  Please close any other application using "
-#| "the camera and try again."
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2732,11 +2550,11 @@ msgstr ""
 "kad tā nav noslēgta. Lūdzu, aizveriet jebkuru citu lietotni, kas izmanto "
 "kameru, un mēģiniet vēlreiz."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Lūdzu, aizveriet jebkuru citu lietotni, kas izmanto kameru."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2745,31 +2563,34 @@ msgstr ""
 "Neizdevās iegūt priekšskatījumus no kameras:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
-#| msgid "Unmounting..."
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Nomontē…"
 
-#: src/camera/ImportPage.vala:1152
-#| msgid "Starting import, please wait..."
+#: src/camera/ImportPage.vala:1166
+#| msgid "Starting import, please wait…"
+msgid "Connecting to camera, please wait…"
+msgstr "Savienojas ar kameru, lūdzu, uzgaidiet…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Sāk importēšanu. Lūdzu, uzgaidiet…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Iegūst informāciju par fotogrāfiju"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Iegūst %s priekšskatījumu"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Neizdevās noslēgt kameru — %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2777,7 +2598,7 @@ msgstr[0] "Izdzēst šo %d fotogrāfiju no kameras?"
 msgstr[1] "Izdzēst šīs %d fotogrāfijas no kameras?"
 msgstr[2] "Izdzēst šīs %d fotogrāfijas no kameras?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2785,7 +2606,7 @@ msgstr[0] "Dzēst šo %d video no kameras?"
 msgstr[1] "Dzēst šos %d video no kameras?"
 msgstr[2] "Dzēst šos %d video no kameras?"
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2793,7 +2614,7 @@ msgstr[0] "Dzēst šo %d fotogrāfiju/video no kameras?"
 msgstr[1] "Dzēst šīs %d fotogrāfijas/video no kameras?"
 msgstr[2] "Dzēst šīs %d fotogrāfijas/video no kameras?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2801,15 +2622,15 @@ msgstr[0] "Dzēst šo %d datni no kameras?"
 msgstr[1] "Dzēst šīs %d datnes no kameras?"
 msgstr[2] "Dzēst šīs %d datnes no kameras?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Paturēt"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Izņem fotogrāfijas/video no kameras"
 
-#: src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2817,51 +2638,130 @@ msgstr[0] "Neizdevās dzēst %d fotogrāfiju/video no kameras, jo bija kļūdas.
 msgstr[1] "Neizdevās dzēst %d fotogrāfijas/video no kameras, jo bija kļūdas."
 msgstr[2] "Neizdevās dzēst %d fotogrāfijas/video no kameras, jo bija kļūdas."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
+msgid "_Print"
+msgstr "_Drukāt"
+
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Sū_tīt uz…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
+msgid "Set as _Desktop Background"
+msgstr "Iestatīt kā _darbvirsmas fonu"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:287
+msgid "_Duplicate"
+msgstr "_Dublēt"
+
+#: src/CollectionPage.vala:100
+#| msgid "Fulls_creen"
+msgid "Fullscreen"
+msgstr "Pilnekrāns"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "S_laidrāde"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Rādīt slaidrādi"
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Pag_riezt pa labi"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Eksportēt fotogrāfijas/video"
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Pagriezt pa _kreisi"
 
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Eksportēt fotogrāfijas/video"
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Apmest hori_zontāli"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
-msgid "Export Photo"
-msgstr "Eksportēt fotogrāfiju"
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Apmest verti_kāli"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Eksportēt fotogrāfijas"
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Uzlabot"
+
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "At_griezties pie oriģināla"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Kopēt krāsu labojumus"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Ielīmēt krāsu labojumus"
+
+#: src/CollectionPage.vala:135
+#| msgid "_Adjust Date and Time…"
+msgid "Adjust Date and Time…"
+msgstr "Pielāgot datumu un laiku…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
+msgid "Open With E_xternal Editor"
+msgstr "Atvērt ar ārēju reda_ktoru"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
+msgid "Open With RA_W Editor"
+msgstr "Atvērt ar RA_W redaktoru"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:168
+msgid "_Play"
+msgstr "_Atskaņot"
+
+#: src/CollectionPage.vala:410
+#| msgid "Export Photo/Video"
+msgid "Export Photo/Video"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Eksportēt fotogrāfiju/video"
+msgstr[1] "Eksportēt fotogrāfijas/video"
+msgstr[2] "Eksportēt fotogrāfijas/video"
+
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#| msgid "Export Photo"
+msgid "Export Photo"
+msgid_plural "Export Photos"
+msgstr[0] "Eksportēt fotogrāfiju"
+msgstr[1] "Eksportēt fotogrāfijas"
+msgstr[2] "Eksportēt fotogrāfijas"
+
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Pagriešana"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Atsauc pagriešanu"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Apmet horizontāli"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Atsauc horizontālo apmešanu"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Apmet vertikāli"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Atsauc vertikālo apmešanu"
 
@@ -2990,7 +2890,6 @@ msgstr "Izveidot tagu"
 
 #: src/Commands.vala:1695
 #, c-format
-#| msgid "Move Tag \"%s\""
 msgid "Move Tag “%s”"
 msgstr "Pārvietot tagu “%s”"
 
@@ -3052,7 +2951,6 @@ msgstr "%s datubāze"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-#| msgid "Importing from %s can't continue because an error occurred:"
 msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "Nevar turpināt importēt no %s, jo gadījās kļūda:"
 
@@ -3080,19 +2978,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Datubāzes datne:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importēt"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Importēt no lietotnes"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Importēt datu _nesēju no:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Aizvērt"
 
@@ -3129,7 +3027,7 @@ msgstr ""
 "Kļūda bija: \n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "Nevar atjaunot fotogrāfiju datubāzi %s"
@@ -3155,23 +3053,21 @@ msgstr "Neizdevās sagatavot darbvirsmu slaidrādei — %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Tiks izņemts tags “%s” no %d fotogrāfijas. Turpināt?"
 msgstr[1] "Tiks izņemts tags “%s” no %d fotogrāfijām. Turpināt?"
 msgstr[2] "Tiks izņemts tags “%s” no %d fotogrāfijām. Turpināt?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Dzēst"
 
 #: src/Dialogs.vala:25
 #, c-format
-#| msgid "This will remove the saved search \"%s\".  Continue?"
 msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Šī darbība izņems saglabāto meklēšanu “%s”. Turpināt?"
 
@@ -3200,6 +3096,10 @@ msgstr "Pār_slēgt attīstītāju"
 msgid "Export Video"
 msgstr "Eksportēt video"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Eksportēt fotogrāfijas"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3207,9 +3107,6 @@ msgstr "Eksportēt video"
 #. Yes - display an alternate error message here.
 #: src/Dialogs.vala:112
 #, c-format
-#| msgid ""
-#| "Shotwell couldn't create a file for editing this photo because you do not "
-#| "have permission to write to %s."
 msgid ""
 "Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
@@ -3235,58 +3132,28 @@ msgstr ""
 "\n"
 "Vai vēlaties turpināt eksportēšanu?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Nemainīts"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Pašreizējais"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Formāts:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Kvalitāte:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Mērogošanas ierobežojums:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr " _Pikseļi:"
-
-#: src/Dialogs.vala:234
-#| msgid "Export metadata"
-msgid "Export _metadata:"
-msgstr "Eksportēt _metadatus:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Turpinā_t"
 
-#: src/Dialogs.vala:478
-#| msgid "Save Details"
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Saglabāt detaļas…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Saglabāt detaļas"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(un vēl %d)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Importēšanas rezultātu pārskats"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3294,7 +3161,7 @@ msgstr[0] "Mēģināja importēt %d datni."
 msgstr[1] "Mēģināja importēt %d datnes."
 msgstr[2] "Mēģināja importēt %d datņu."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3305,32 +3172,30 @@ msgstr[2] "No tām, %d tika sekmīgi importētas."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Neimportētie fotogrāfiju/video dublikāti:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "dublē esošo datu nesēju vienumus"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Neimportētās fotogrāfijas/video, jo bija kameras kļūdas:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "kļūdas paziņojums:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Datnes nav importētas, jo tās netika atpazītas kā fotogrāfijas vai video:"
@@ -3338,10 +3203,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3352,10 +3214,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3363,11 +3222,8 @@ msgstr ""
 "Fotogrāfijas/video netika importētas, jo Shotwell nevarēja tās importēt "
 "bibliotēkā:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
-#| msgid ""
-#| "couldn't copy %s\n"
-#| "\tto %s"
 msgid ""
 "couldn’t copy %s\n"
 "\tto %s"
@@ -3378,18 +3234,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotogrāfijas/video netika importētas, jo datnes ir bojātas:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotogrāfijas/video netika importētas citu iemeslu dēļ:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3397,7 +3253,7 @@ msgstr[0] "Netika importēta %d dublējoša fotogrāfija:\n"
 msgstr[1] "Netika importētas %d dublējošas fotogrāfijas:\n"
 msgstr[2] "Netika importētas %d dublējošu fotogrāfijas:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3405,7 +3261,7 @@ msgstr[0] "Netika importēts %d dublējošs video:\n"
 msgstr[1] "Netika importēti %d dublējoši video:\n"
 msgstr[2] "Netika importēti %d dublējošu video:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3413,7 +3269,7 @@ msgstr[0] "Netika importēta %d dublējoša fotogrāfija/video:\n"
 msgstr[1] "Netika importētas %d dublējošas fotogrāfijas/video:\n"
 msgstr[2] "Netika importētas %d dublējošu fotogrāfijas/video:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3424,7 +3280,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotogrāfiju importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3432,7 +3288,7 @@ msgstr[0] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūd
 msgstr[1] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 msgstr[2] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3447,7 +3303,7 @@ msgstr[2] ""
 "%d fotogrāfiju/video importēšana neizdevās dēļ datnes vai aparatūras "
 "kļūdas:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3455,7 +3311,7 @@ msgstr[0] "%d datnes importēšana neizdevās dēļ datnes vai aparatūras kļū
 msgstr[1] "%d datņu importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 msgstr[2] "%d datņu importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3469,7 +3325,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotogrāfiju importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3480,7 +3336,7 @@ msgstr[0] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma
 msgstr[1] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 msgstr[2] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3498,7 +3354,7 @@ msgstr[2] ""
 "%d fotogrāfiju/video importēšana neizdevās, jo fotogrāfiju mape nav "
 "rakstāma:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3510,7 +3366,7 @@ msgstr[0] ""
 msgstr[1] "%d datņu importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 msgstr[2] "%d datņu importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, 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"
@@ -3518,7 +3374,7 @@ msgstr[0] "%d fotogrāfijas importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d fotogrāfiju importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d fotogrāfiju importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3526,7 +3382,7 @@ msgstr[0] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3534,7 +3390,7 @@ msgstr[0] "%d fotogrāfijas/video importēšana neizdevās dēļ kameras kļūda
 msgstr[1] "%d fotogrāfiju/video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d fotogrāfiju/video importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3542,7 +3398,7 @@ msgstr[0] "%d datnes importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d datņu importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d datņu importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, 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"
@@ -3550,7 +3406,7 @@ msgstr[0] "%d fotogrāfijas importēšana neizdevās, jo tā ir bojāta:\n"
 msgstr[1] "%d fotogrāfiju importēšana neizdevās, jo tās ir bojātas:\n"
 msgstr[2] "%d fotogrāfiju importēšana neizdevās, jo tās ir bojātas:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, 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"
@@ -3558,7 +3414,7 @@ msgstr[0] "%d video importēšana neizdevās, jo tas ir bojāts:\n"
 msgstr[1] "%d video importēšana neizdevās, jo tie ir bojāti:\n"
 msgstr[2] "%d video importēšana neizdevās, jo tie ir bojāti:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3566,7 +3422,7 @@ msgstr[0] "%d fotogrāfijas/video importēšana neizdevās, jo tā ir bojāta:\n
 msgstr[1] "%d fotogrāfiju/video importēšana neizdevās, jo tās ir bojātas:\n"
 msgstr[2] "%d fotogrāfiju/video importēšana neizdevās, jo tās ir bojātas:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3578,7 +3434,7 @@ msgstr[2] "%d datņu importēšana neizdevās, jo tās ir bojātas:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3588,7 +3444,7 @@ msgstr[2] "Izlaistas %d neatbalstītas fotogrāfijas:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3596,7 +3452,7 @@ msgstr[0] "Izlaista %d ne-attēla datne.\n"
 msgstr[1] "Izlaistas %d ne-attēla datnes.\n"
 msgstr[2] "Izlaistu %d ne-attēla datņu.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -3604,7 +3460,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta fotogrāfija:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas fotogrāfijas:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas fotogrāfijas:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -3612,7 +3468,7 @@ msgstr[0] "Izlaists %d lietotāja atcelts video:\n"
 msgstr[1] "Izlaisti %d lietotāja atcelti video:\n"
 msgstr[2] "Izlaisti %d lietotāja atcelti video:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -3620,7 +3476,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta fotogrāfija/video:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas fotogrāfijas/video:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas fotogrāfijas/video:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3628,7 +3484,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta datne:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas datnes:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas datnes:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3636,7 +3492,7 @@ msgstr[0] "%d fotogrāfija veiksmīgi importēta.\n"
 msgstr[1] "%d fotogrāfijas veiksmīgi importētas.\n"
 msgstr[2] "%d fotogrāfijas veiksmīgi importētas.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3644,7 +3500,7 @@ msgstr[0] "%d video veiksmīgi importēts.\n"
 msgstr[1] "%d video veiksmīgi importēti.\n"
 msgstr[2] "%d video veiksmīgi importēti.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3654,97 +3510,66 @@ msgstr[2] "%d fotogrāfijas/video veiksmīgi importēti.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Neviena fotogrāfija netika importēta.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Importēšana pabeigta"
 
-#: src/Dialogs.vala:1174
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunde"
-msgstr[1] "%d sekundes"
-msgstr[2] "%d sekunžu"
-
-#: src/Dialogs.vala:1177
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minūte"
-msgstr[1] "%d minūtes"
-msgstr[2] "%d minūšu"
-
-#: src/Dialogs.vala:1181
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d stunda"
-msgstr[1] "%d stundas"
-msgstr[2] "%d stundu"
-
-#: src/Dialogs.vala:1184
-msgid "1 day"
-msgstr "1 diena"
-
-#: src/Dialogs.vala:1338 src/Resources.vala:231
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Pārdēvēt notikumu"
 
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Nosaukums:"
 
 #. Dialog title
-#: src/Dialogs.vala:1349
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Rediģēt nosaukumu"
 
-#: src/Dialogs.vala:1350 src/Properties.vala:340
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Nosaukums:"
 
 #. Dialog title
-#: src/Dialogs.vala:1366 src/Resources.vala:307
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Rediģēt notikuma komentāru"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Drukāt fotogrāfijas/video komentāru"
 
-#: src/Dialogs.vala:1368 src/Properties.vala:628
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Komentārs:"
 
-#: src/Dialogs.vala:1384
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Izņem_t uz izmest datni"
 msgstr[1] "Izņem_t uz izmest datnes"
 msgstr[2] "Izņem_t uz izmest datnes"
 
-#: src/Dialogs.vala:1388
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Izņemt no bibliotēkas"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Atgriezt ārējo izmaiņu?"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Atgriezt ārējās izmaiņas?"
 
-#: src/Dialogs.vala:1433
+#: src/Dialogs.vala:745
 #, 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?"
@@ -3758,136 +3583,35 @@ msgstr[2] ""
 "Šī darbība iznīcinās visas izmaiņas, kas ir veiktas ar %d ārējām datnēm. "
 "Turpināt?"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "At_griezt ārējo izmaiņu"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "At_griezt ārējās izmaiņas"
 
-#: src/Dialogs.vala:1458
+#: src/Dialogs.vala:770
 #, 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] "Šī darbība izņems %d fotogrāfiju no bibliotēkas. Turpināt?"
 msgstr[1] "Šī darbība izņems %d fotogrāfijas no bibliotēkas. Turpināt?"
 msgstr[2] "Šī darbība izņems %d fotogrāfijas no bibliotēkas. Turpināt?"
 
-#: src/Dialogs.vala:1465 src/Resources.vala:173
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Izņemt fotogrāfiju no bibliotēkas"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Izņemt fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:1559
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1713
-msgid "AM"
-msgstr "AM"
-
-#: src/Dialogs.vala:1714
-msgid "PM"
-msgstr "PM"
-
-#: src/Dialogs.vala:1715
-msgid "24 Hr"
-msgstr "24 st"
-
-#: src/Dialogs.vala:1730
-msgid "_Shift photos/videos by the same amount"
-msgstr "Pabīdīt fotogrāfija_s/video par vienādu attālumu"
-
-#: src/Dialogs.vala:1735
-msgid "Set _all photos/videos to this time"
-msgstr "Iest_atīt visas fotogrāfijas/video uz šo laiku"
-
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo file"
-msgstr "_Mainīt sākotnējo fotogrāfijas datni"
-
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr "_Mainīt sākotnējās fotogrāfijas datnes"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original file"
-msgstr "_Mainīt sākotnējo datni"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr "_Mainīt sākotnējās datnes"
-
-#: src/Dialogs.vala:1831
-msgid "Original: "
-msgstr "Oriģināls: "
-
-#: src/Dialogs.vala:1832
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1833
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1922
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Ekspozīcijas laiks tiks pabīdīts uz priekšu par\n"
-"%d %s, %d %s, %d %s un %d %s."
-
-#: src/Dialogs.vala:1923
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Ekspozīcijas laiks tiks pabīdīts atpakaļ par\n"
-"%d %s, %d %s, %d %s un %d %s."
-
-#: src/Dialogs.vala:1925
-msgid "day"
-msgid_plural "days"
-msgstr[0] "diena"
-msgstr[1] "dienas"
-msgstr[2] "dienu"
-
-#: src/Dialogs.vala:1926
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "stunda"
-msgstr[1] "stundas"
-msgstr[2] "stundu"
-
-#: src/Dialogs.vala:1927
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minūte"
-msgstr[1] "minūtes"
-msgstr[2] "minūšu"
-
-#: src/Dialogs.vala:1928
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekunde"
-msgstr[1] "sekundes"
-msgstr[2] "sekunžu"
-
-#: src/Dialogs.vala:1972
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3910,92 +3634,13 @@ msgstr[2] ""
 "\n"
 "Un %d citu."
 
-#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Tagi (atdalītas ar komatu):"
 
-#: src/Dialogs.vala:2103
-msgid "Welcome!"
-msgstr "Laipni lūdzam!"
-
-#: src/Dialogs.vala:2110
-msgid "Welcome to Shotwell!"
-msgstr "Laipni lūdzam Shotwell!"
-
-#: src/Dialogs.vala:2114
-msgid "To get started, import photos in any of these ways:"
-msgstr "Lai sāktu, importējiet fotogrāfijas kādā no šiem veidiem:"
-
-#: src/Dialogs.vala:2133
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Izvēlieties <span weight=\"bold\">Datne %s Importēt no mapes</span>"
-
-#: src/Dialogs.vala:2134
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Velciet un nometiet fotogrāfijas Shotwell logā"
-
-#: src/Dialogs.vala:2135
-msgid "Connect a camera to your computer and import"
-msgstr "Pievienojiet kameru datoram un importējiet"
-
-#: src/Dialogs.vala:2145
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importēt fotogrāfijas no savas %s mapes"
-
-#: src/Dialogs.vala:2152
-msgid "You can also import photos in any of these ways:"
-msgstr "Jūs varat arī importēt fotogrāfijas kādā no šiem veidiem:"
-
-#: src/Dialogs.vala:2162
-#| msgid "_Don't show this message again"
-msgid "_Don’t show this message again"
-msgstr "_Vairs nerādīt šo ziņojumu"
-
-#: src/Dialogs.vala:2197
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Importēt fotogrāfijas no %s bibliotēkas"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
-msgid "(Help)"
-msgstr "(Palīdzība)"
-
-#: src/Dialogs.vala:2357
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Gads%sMēnesis%sDiena"
-
-#: src/Dialogs.vala:2359
-#, c-format
-msgid "Year%sMonth"
-msgstr "Gads%sMēnesis"
-
-#: src/Dialogs.vala:2361
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Gads%sMēnesis-Diena"
-
-#: src/Dialogs.vala:2363
-msgid "Year-Month-Day"
-msgstr "Gads-Mēnesis-Diena"
-
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
-msgid "Custom"
-msgstr "Pielāgots"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2601
-msgid "Invalid pattern"
-msgstr "Nederīgs raksts"
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2703
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4003,42 +3648,32 @@ msgstr ""
 "Shotwell var kopēt fotogrāfijas jūsu bibliotēkas mapē, vai tās var tikt "
 "importētas bez kopēšanas."
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Ko_pēt fotogrāfijas"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importēt vietā"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Importēt bibliotēkā"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Izņemt no bibliotēkas"
 
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Izņem fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:2721
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Izņem fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:2735
+#: src/Dialogs.vala:940
 #, 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"
@@ -4065,18 +3700,8 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2739
+#: src/Dialogs.vala:944
 #, 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"
@@ -4103,18 +3728,8 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2743
+#: src/Dialogs.vala:948
 #, 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"
@@ -4141,14 +3756,8 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2775
+#: src/Dialogs.vala:980
 #, c-format
-#| msgid ""
-#| "The photo or video cannot be moved to your desktop trash.  Delete this "
-#| "file?"
-#| msgid_plural ""
-#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
-#| "files?"
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
@@ -4161,7 +3770,7 @@ msgstr[2] ""
 "Šīs %d fotogrāfijas vai video nevar pārvietot uz miskasti. Dzēst šīs datnes?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2792
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4177,383 +3786,495 @@ msgstr "Platums"
 msgid "Height"
 msgstr "Augstums"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Datne"
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "%s neeksistē."
 
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s nav datne."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr "%s neatbalsta %s datnes formātu."
+
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr "Nevar atvērt fotogrāfiju %s."
+
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Saglabāt fotogrāfiju"
+#: src/direct/DirectPhotoPage.vala:316
+msgid "_Save a Copy"
+msgstr "_Saglabāt kopiju"
 
-#: src/direct/DirectPhotoPage.vala:57
-#| msgid "Save _As"
-msgid "Save _As…"
-msgstr "S_aglabāt kā…"
+#: src/direct/DirectPhotoPage.vala:319
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Zaudēt %s izmaiņas?"
 
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Saglabāt fotogrāfiju ar citu nosaukumu"
+#: src/direct/DirectPhotoPage.vala:320
+msgid "Close _without Saving"
+msgstr "Aizvērt _nesaglabājot"
 
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Drukāt fotogrāfiju ar printeri, kas ir pievienots pie datora"
+#: src/direct/DirectPhotoPage.vala:353
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Kļūda, saglabājot kā %s — %s"
 
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "R_ediģēt"
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
+msgid "Save As"
+msgstr "Saglabāt kā"
 
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotogrāfija"
+#. verify this is a directory
+#: src/DirectoryMonitor.vala:891
+#, c-format
+msgid "Unable to monitor %s: Not a directory (%s)"
+msgstr "Nevar pārraudzīt %s — nav direktorija (%s)"
 
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Rīki"
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
 
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Ie_priekšējā fotogrāfija"
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
 
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Iepriekšējā fotogrāfija"
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 st"
 
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Nākamā fotogrāfija"
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "Pabīdīt fotogrāfija_s/video par vienādu attālumu"
 
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Nākamā fotogrāfija"
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Iest_atīt visas fotogrāfijas/video uz šo laiku"
 
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Skats"
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+#| msgid "_Modify original photo file"
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Mainīt sākotnējo fotogrāfijas datni"
+msgstr[1] "_Mainīt sākotnējās fotogrāfiju datnes"
+msgstr[2] "_Mainīt sākotnējās fotogrāfiju datnes"
 
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "_Palīdzība"
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+#| msgid "_Modify original file"
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Mainīt sākotnējo datni"
+msgstr[1] "_Mainīt sākotnējās datnes"
+msgstr[2] "_Mainīt sākotnējās datnes"
 
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Tuv_ināt"
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Oriģināls: "
 
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Palielināt fotogrāfijas palielinājumu"
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Tā_lināt"
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Ekspozīcijas laiks tiks pabīdīts uz priekšu par\n"
+"%d %s, %d %s, %d %s un %d %s."
 
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Samazināt fotogrāfijas palielinājumu"
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Ekspozīcijas laiks tiks pabīdīts atpakaļ par\n"
+"%d %s, %d %s, %d %s un %d %s."
 
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Ietil_pināt lapā"
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "diena"
+msgstr[1] "dienas"
+msgstr[2] "dienu"
 
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Mainīt mērogu, lai fotogrāfija ietilptu ekrānā"
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "stunda"
+msgstr[1] "stundas"
+msgstr[2] "stundu"
 
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Mērogs _100%"
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minūte"
+msgstr[1] "minūtes"
+msgstr[2] "minūšu"
 
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Mainīt fotogrāfijas mērogu uz 100% palielinājumu"
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekunde"
+msgstr[1] "sekundes"
+msgstr[2] "sekunžu"
 
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Mērogs _200%"
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Nemainīts"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Pašreizējais"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Formāts:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Kvalitāte:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Mērogošanas ierobežojums:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr " _Pikseļi:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Eksportēt _metadatus:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Palīdzība)"
 
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Mainīt fotogrāfijas mērogu uz 200% palielinājumu"
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Gads%sMēnesis%sDiena"
 
-#: src/direct/DirectPhotoPage.vala:227
+#: src/dialogs/Preferences.vala:125
 #, c-format
-msgid "%s does not exist."
-msgstr "%s neeksistē."
+msgid "Year%sMonth"
+msgstr "Gads%sMēnesis"
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/dialogs/Preferences.vala:127
 #, c-format
-msgid "%s is not a file."
-msgstr "%s nav datne."
+msgid "Year%sMonth-Day"
+msgstr "Gads%sMēnesis-Diena"
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Gads-Mēnesis-Diena"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Pielāgots"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Nederīgs raksts"
+
+#: src/dialogs/ProgressDialog.vala:97
 #, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr "%s neatbalsta %s datnes formātu."
+msgid "%d%%"
+msgstr "%d%%"
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/dialogs/SetBackgroundSlideshow.vala:49
 #, c-format
-msgid "Unable open photo %s. Sorry."
-msgstr "Nevar atvērt fotogrāfiju %s."
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunde"
+msgstr[1] "%d sekundes"
+msgstr[2] "%d sekunžu"
 
-#: src/direct/DirectPhotoPage.vala:432
-msgid "_Save a Copy"
-msgstr "_Saglabāt kopiju"
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minūte"
+msgstr[1] "%d minūtes"
+msgstr[2] "%d minūšu"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/dialogs/SetBackgroundSlideshow.vala:56
 #, c-format
-msgid "Lose changes to %s?"
-msgstr "Zaudēt %s izmaiņas?"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d stunda"
+msgstr[1] "%d stundas"
+msgstr[2] "%d stundu"
 
-#: src/direct/DirectPhotoPage.vala:436
-msgid "Close _without Saving"
-msgstr "Aizvērt _nesaglabājot"
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 diena"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Laipni lūdzam!"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Laipni lūdzam Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Lai sāktu, importējiet fotogrāfijas kādā no šiem veidiem:"
+
+#: src/dialogs/WelcomeDialog.vala:67
 #, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Kļūda, saglabājot kā %s — %s"
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Izvēlieties <span weight=\"bold\">Datne %s Importēt no mapes</span>"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
-msgid "Save As"
-msgstr "Saglabāt kā"
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Velciet un nometiet fotogrāfijas Shotwell logā"
 
-#. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Pievienojiet kameru datoram un importējiet"
+
+#: src/dialogs/WelcomeDialog.vala:80
 #, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "Nevar pārraudzīt %s — nav direktorija (%s)"
+msgid "_Import photos from your %s folder"
+msgstr "_Importēt fotogrāfijas no savas %s mapes"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Jūs varat arī importēt fotogrāfijas kādā no šiem veidiem:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Vairs nerādīt šo ziņojumu"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Importēt fotogrāfijas no %s bibliotēkas"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Atgriezties uz pašreizējiem fotogrāfijas izmēriem"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Iestatīt kadrēšanu šai fotogrāfijai"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Pārslēgt kadrēšanas četrstūri starp portreta un ainavas novietojumiem"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Neierobežots"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kvadrāts"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Ekrāns"
 
-#: 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:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:758
-#| msgid "SD Video (4 : 3)"
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:759
-#| msgid "HD Video (16 : 9)"
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-#| msgid "Wallet (2 x 3 in.)"
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Maks (2 × 3 collas)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-#| msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Piezīmjkartiņa (3 × 5 collas)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-#| msgid "4 x 6 in."
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 collas"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-#| msgid "5 x 7 in."
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 collas"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-#| msgid "8 x 10 in."
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 collas"
 
-#: src/editing_tools/EditingTools.vala:766
-#| msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Vēstule (8,5 × 11 collas)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-#| msgid "11 x 14 in."
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 collas"
 
-#: src/editing_tools/EditingTools.vala:768
-#| msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloīds (11 × 17 collas)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-#| msgid "16 x 20 in."
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 collas"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-#| msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metriskais maks (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-#| msgid "Postcard (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Pastkarte (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-#| msgid "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-#| msgid "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
-#| msgid "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-#| msgid "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-#| msgid "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-#| msgid "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779
-#| msgid "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:758
 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:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Izmērs:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Aizvērt sarkano acu rīku"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Izņemt sarkano acu efektu izvēlētajā reģionā"
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Atiestatīt"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Ekspozīcija:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrasts:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Piesātinājums:"
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Tonis:"
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatūra:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Ēnas:"
 
-#: src/editing_tools/EditingTools.vala:2292
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Gaišās vietas:"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Atiestatīt krāsas"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Atiestatīt visus krāsu pielāgojumu atpakaļ uz sākotnējo"
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatūra"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Tonis"
 
-#: src/editing_tools/EditingTools.vala:2729
-#| msgid "Contrast Expansion"
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrasts"
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Piesātinājums"
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Ekspozīcija"
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Ēnas"
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Gaišās vietas"
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Kontrasta palielināšana"
 
@@ -4561,15 +4282,12 @@ msgstr "Kontrasta palielināšana"
 msgid "Angle:"
 msgstr "Leņķis:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "Iztai_snot"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Notikumi"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4577,7 +4295,7 @@ msgstr[0] "%d fotogrāfija/video"
 msgstr[1] "%d fotogrāfijas/video"
 msgstr[2] "%d fotogrāfiju/video"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4585,7 +4303,7 @@ msgstr[0] "%d video"
 msgstr[1] "%d video"
 msgstr[2] "%d video"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4593,39 +4311,39 @@ msgstr[0] "%d fotogrāfija"
 msgstr[1] "%d fotogrāfijas"
 msgstr[2] "%d fotogrāfiju"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Nav notikuma"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Komentāri"
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Notikumi"
 
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Rādīt komentāru katram notikumam"
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Pārlūkot savus notikumus"
 
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Nav notikumu"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nav atrastu notikumu"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Visi notikumi"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Nav datēts"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4646,7 +4364,6 @@ msgstr "Eksportē"
 
 #: src/Exporter.vala:317
 #, c-format
-#| msgid "File %s already exists.  Replace?"
 msgid "File %s already exists. Replace?"
 msgstr "Datne %s jau eksistē. Aizvietot?"
 
@@ -4666,43 +4383,28 @@ msgstr "Aizvietot _visu"
 msgid "Export"
 msgstr "Eksportēt"
 
-#: src/folders/Branch.vala:141
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Mapes"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
-msgid "Library"
-msgstr "Bibliotēka"
-
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
-msgid "Photos"
-msgstr "Fotogrāfijas"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Pārlūkot bibliotēkas mapju struktūru"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Ar karodziņu"
 
 #: src/library/ImportQueuePage.vala:8
-#| msgid "Importing"
 msgid "Importing…"
 msgstr "Importē…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Apturēt importēšanu"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Apturēt fotogrāfiju importēšanu"
-
-#: src/library/ImportQueuePage.vala:124
-#| msgid "Preparing to import"
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "Gatavojas importēt…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Importētas %s"
@@ -4711,132 +4413,37 @@ msgstr "Importētas %s"
 msgid "Last Import"
 msgstr "Pēdējais imports"
 
-#: src/library/LibraryWindow.vala:285
-#| msgid "Import From Folder"
-msgid "_Import From Folder…"
-msgstr "_Importēt no mapes…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importēt fotogrāfijas no diska uz bibliotēku"
-
-#: src/library/LibraryWindow.vala:293
-#| msgid "Import From Application"
-msgid "Import From _Application…"
-msgstr "Importēt no _lietotnes…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Kārtot _notikumus"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Iztukšot _miskasti"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Dzēst visas fotogrāfijas no miskastes"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Skatīt fotogrāfijas _notikumu"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Meklēt"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Meklēt fotogrāfijas un video pēc meklēšanas kritērija"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-#| msgid "Ne_w Saved Search..."
-msgid "Ne_w Saved Search…"
-msgstr "_Jauna saglabātā meklēšana…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotogrāfijas"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "No_tikumi"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Ta_gi"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Pamatinformācija"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Rādīt pamatinformāciju par izvēli"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Pa_plašināta informācija"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Rādīt paplašinātu informāciju par izvēli"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Meklēšana_s josla"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Rādīt meklēšanas joslu"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Sānu _josla"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Rādīt sānu joslu"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "Rīkj_osla"
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Rādīt rīkjoslu"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Augošā"
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Bibliotēka"
 
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Kārtot fotogrāfijas augošā secībā"
+#: src/library/LibraryBranch.vala:30
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Organizē un pārlūko savas fotogrāfijas"
 
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "_Dilstošā"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Kārtot fotogrāfijas dilstošā secībā"
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotogrāfijas"
 
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importēt no mapes"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Rekursīvi apakšmapēs"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Iztukšot miskasti"
 
-#: src/library/LibraryWindow.vala:726
-#| msgid "Emptying Trash..."
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Iztukšo miskasti…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4849,37 +4456,33 @@ msgstr ""
 "Mēs iesakām to mainīt <span weight=\"bold\">Rediģēt %s Iestatījumi</span>.\n"
 "Vai vēlaties turpināt importēt fotogrāfijas?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Bibliotēkas atrašanās vieta"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "No šīs direktorijas fotogrāfijas nevar importēt."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-#| msgid "Updating library..."
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Atjaunina bibliotēku…"
 
-#: src/library/LibraryWindow.vala:1264
-#| msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Gatavojas automātiski importēt fotogrāfijas…"
 
-#: src/library/LibraryWindow.vala:1269
-#| msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Automātiski importē fotogrāfijas…"
 
-#: src/library/LibraryWindow.vala:1277
-#| msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Datnēs raksta metadatus…"
 
@@ -4887,8 +4490,7 @@ msgstr "Datnēs raksta metadatus…"
 msgid "Missing Files"
 msgstr "Iztrūkstošās datnes"
 
-#: src/library/OfflinePage.vala:106
-#| msgid "Deleting..."
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "Dzēš…"
 
@@ -4896,24 +4498,20 @@ msgstr "Dzēš…"
 msgid "Trash"
 msgstr "Miskaste"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Miskaste ir tukša"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Dzēst"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Dzēš fotogrāfijas"
 
 #: src/main.vala:54
 #, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please use the latest version of Shotwell."
 msgid ""
 "Your photo library is not compatible with this version of Shotwell. It "
 "appears it was created by Shotwell %s (schema %d). This version is %s "
@@ -4925,10 +4523,6 @@ msgstr ""
 
 #: src/main.vala:59
 #, c-format
-#| msgid ""
-#| "Shotwell was unable to upgrade your photo library from version %s (schema "
-#| "%d) to %s (schema %d).  For more information please check the Shotwell "
-#| "Wiki at %s"
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
 "%d) to %s (schema %d). For more information please check the Shotwell Wiki "
@@ -4939,11 +4533,6 @@ msgstr ""
 
 #: src/main.vala:65
 #, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please clear your library by deleting %s and re-import your "
-#| "photos."
 msgid ""
 "Your photo library is not compatible with this version of Shotwell. It "
 "appears it was created by Shotwell %s (schema %d). This version is %s "
@@ -4956,7 +4545,6 @@ msgstr ""
 
 #: src/main.vala:71
 #, c-format
-#| msgid "Unknown error attempting to verify Shotwell's database: %s"
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Nezināma kļūda, mēģinot pārbaudīt Shotwell datubāzi — %s"
 
@@ -4964,38 +4552,37 @@ msgstr "Nezināma kļūda, mēģinot pārbaudīt Shotwell datubāzi — %s"
 msgid "Loading Shotwell"
 msgstr "Ielādē Shotwell"
 
-#: src/main.vala:294
-#| msgid "Path to Shotwell's private data"
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Ceļš uz Shotwell privātajiem datiem"
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIREKTORIJA"
 
-#: src/main.vala:298
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Nesekot līdzi bibliotēkas direktorijas izmaiņām"
 
-#: src/main.vala:302
-#| msgid "Don't display startup progress meter"
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Nerādīt palaišanās progresu"
 
-#: src/main.vala:306
-#| msgid "Show the application's version"
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Rādīt lietotnes versiju"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Palaist lietotni pilnekrāna režīmā"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[DATNE]"
 
-#: src/main.vala:342
+#: src/main.vala:360
 #, 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 ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
@@ -5010,72 +4597,7 @@ msgstr "Nevar apstrādāt pārraudzības atjauninājumus — %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Pielāgot sīktēlu izmēru"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Palielināt sīktēlu palielinājumu"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Samazināt sīktēlu palielinājumu"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Kārtot _fotogrāfijas"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Atskaņot video"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Atvērt izvēlētos video sistēmas video atskaņotājā"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Attīstītājs"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Rādīt komentāru katrai fotogrāfijai"
-
-#: src/MediaPage.vala:470
-#| msgid "Display each photo's tags"
-msgid "Display each photo’s tags"
-msgstr "Rādīt katras fotogrāfijas tagu"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Pēc _nosaukuma"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Kārtot fotogrāfijas pēc nosaukuma"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Pēc uzņemšanas _datuma"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Kārtot fotogrāfijas pēc uzņemšanas datuma"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Pēc vē_rtējuma"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Kārtot fotogrāfijas pēc vērtējuma"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Pēc _datņu nosaukuma"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Kārtot fotogrāfijas pēc datņu nosaukuma"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -5084,34 +4606,34 @@ msgstr ""
 "Shotwell nevar atskaņot izvēlēto video:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Nav fotogrāfijas/video"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Netika atrastas fotogrāfijas/video, kas atbilst dotajam filtram"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Uz šo mapi nevar eksportēt fotogrāfijas."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Iepriekšējā fotogrāfija"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Nākamā fotogrāfija"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Pazudusi fotogrāfijas avota datne — %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Neizdevās eksportēt %s — %s"
@@ -5156,7 +4678,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "modificēts"
 
@@ -5188,24 +4710,15 @@ msgstr "16 attēli uz lapas"
 msgid "32 images per page"
 msgstr "32 attēli uz lapas"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "colla"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Attēla iestatījumi"
 
-#: src/Printing.vala:889
-#| msgid "Printing..."
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Drukā…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5216,19 +4729,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Šodiena"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Vakardiena"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Vienumi:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -5237,104 +4750,104 @@ msgstr[1] "%d notikumi"
 msgstr[2] "%d notikumu"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Datums:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Laiks:"
 
 #. 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 "No:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Uz:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Ilgums:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundes"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Attīstītājs:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Atrašanās vieta:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Datnes izmērs:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Pašreizējais attīstījums:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Sākotnējās dimensijas:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Kameras ražotājs:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Kameras modelis:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Zibspuldze:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Fokusa attālums:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Uzņemšanas datums:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Ekspozīcijas laiks:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Ekspozīcijas nobīde:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS platums:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS garums:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Mākslinieks:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Autortiesības:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Programmatūra:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Paplašināta informācija"
 
@@ -5349,7 +4862,6 @@ msgstr "Augšupielādē %d no %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
 msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "Nevar turpināt publicēšanu uz %s, jo gadījās kļūda:"
 
@@ -5359,67 +4871,67 @@ msgstr ""
 "Lai mēģinātu publicēt citā servisā, izvēlieties to no augstāk redzamās "
 "izvēlnes."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Izvēlētās fotogrāfijas/video tika veiksmīgi publicētas."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Izvēlētie video tika veiksmīgi publicēti."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Izvēlētās fotogrāfijas tika veiksmīgi publicētas."
-
-#: 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
+#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
-msgstr "Izvēlētais video tika veiksmīgi publicēts."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Izvēlētais video tika veiksmīgi publicēts."
+msgstr[1] "Izvēlētie video tika veiksmīgi publicēti."
+msgstr[2] "Izvēlētie video tika veiksmīgi publicēti."
 
-#: src/publishing/PublishingUI.vala:114
+#: src/publishing/PublishingUI.vala:109
+#| msgid "The selected photo was successfully published."
 msgid "The selected photo was successfully published."
-msgstr "Izvēlētā fotogrāfija tika veiksmīgi publicēta."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Izvēlētā fotogrāfija tika veiksmīgi publicēta."
+msgstr[1] "Izvēlētās fotogrāfijas tika veiksmīgi publicētas."
+msgstr[2] "Izvēlētās fotogrāfijas tika veiksmīgi publicētas."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Izvēlētās fotogrāfijas/video tika veiksmīgi publicētas."
 
-#: src/publishing/PublishingUI.vala:122
-#| msgid "Fetching account information..."
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
 msgstr "Saņem konta informāciju…"
 
-#: src/publishing/PublishingUI.vala:128
-#| msgid "Logging in..."
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
 msgstr "Ierakstās…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Publicēt fotogrāfijas"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Publicēt fo_togrāfijas uz:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Publicēt video"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Publicē_t video uz"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Publicēt fotogrāfijas un video"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Publicēt fo_togrāfijas un video uz"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Nevar publicēt"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5436,791 +4948,741 @@ msgstr ""
 msgid "Publishing"
 msgstr "Publicē"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Pag_riezt pa labi"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Pagriezt"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Pagriezt pa labi"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 "Pagriezt fotogrāfijas pa labi (piespiediet Ctrl, lai pagrieztu pa kreisi)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Pagriezt pa _kreisi"
-
-#: src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Pagriezt pa kreisi"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Pagriezt fotogrāfijas pa kreisi"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Apmest hori_zontāli"
-
-#: src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Apmest horizontāli"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Apmest verti_kāli"
-
-#: src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Apmest vertikāli"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "P_ar"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Pielietot"
 
-#: src/Resources.vala:160
+#: src/Resources.vala:160 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/trash.ui:37
+msgid "_Edit"
+msgstr "R_ediģēt"
+
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "Uz _priekšu"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Pilnekrāns"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "_Palīdzība"
+
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Iziet no _pilnekrāna režīma"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "Jau_ns"
 
-#: src/Resources.vala:165
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Nākamais"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_Labi"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Atskaņot"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Iestatījumi"
 
-#: src/Resources.vala:169
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "Ie_priekšējais"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Drukāt"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:172 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 "_Iziet"
 
-#: src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "_Atsvaidzināt"
 
-#: src/Resources.vala:174
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "Atg_riezt"
 
-#: src/Resources.vala:176
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "S_aglabāt kā"
 
-#: src/Resources.vala:177
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Kārtot _augoši"
 
-#: src/Resources.vala:178
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Kārtot _dilstoši"
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "_Apturēt"
 
-#: src/Resources.vala:180
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "Atja_unot"
 
-#: src/Resources.vala:181
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "_Normāls izmērs"
 
-#: src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "Labākā _iekļaušanās"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Uzlabot"
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Tuv_ināt"
+
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "Tā_lināt"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Uzlabot"
 
-#: src/Resources.vala:188
-#| msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Automātiski uzlabot fotogrāfijas izskatu"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Kopēt krāsu labojumus"
-
-#: src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Kopēt krāsu labojumus"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopēt krāsu labojumus, kar ir izmantoti fotogrāfijā"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Ielīmēt krāsu labojumus"
-
-#: src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Ielīmēt krāsu labojumus"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Izmantot kopētos krāsu labojumus izvēlētajās fotogrāfijās"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Kadrēt"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Kadrēt"
 
-#: src/Resources.vala:200
-#| msgid "Crop the photo's size"
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
 msgstr "Kadrēt fotogrāfijas izmēru"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Iztaisnot"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Iztaisnot fotogrāfiju"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "Sa_rkanās acis"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Sarkanās acis"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Samazināt vai likvidēt sarkano acu efektu fotogrāfijā"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "Pielāg_ot"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Pielāgot"
 
-#: src/Resources.vala:212
-#| msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
 msgstr "Pielāgot fotogrāfijas krāsu un toni"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "At_griezties pie oriģināla"
-
-#: src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Atgriezties pie oriģināla"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "At_griezt ārējās izmaiņas"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Atgriezt uz sākotnējo fotogrāfiju"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Iestatīt kā _darbvirsmas fonu"
-
-#: src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Iestatīt izvēlētos attēlus kā jaunos darbvirsmas fonus"
 
-#: src/Resources.vala:222
-#| msgid "Set as Desktop Slideshow"
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
 msgstr "Iestatīt kā _darbvirsmas slaidrādi…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:225 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 "Atsa_ukt"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Atsaukt"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:228 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 "Ata_tsaukt"
 
-#: src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Atatsaukt"
 
-#: src/Resources.vala:230
-#| msgid "Rename Event"
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
 msgstr "Pārdēvēt _notikumu…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Izvēlēties kā _atslēgas fotogrāfiju notikumam"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Izvēlēties kā atslēgas fotogrāfiju notikumam"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "Jau_ns notikums"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Jauns notikums"
 
-#: src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Pārvietot fotogrāfijas"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Pārvietot fotogrāfijas uz notikumu"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "Apvienot notiku_mus"
 
-#: src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Apvienot"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Apvienot notikumus vienā notikumā"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "Ie_statīt vērtējumu"
 
-#: src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Iestatīt vērtējumu"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Mainīt savas fotogrāfijas vērtējumu"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "Pal_ielināt"
 
-#: src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Palielināt vērtējumu"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Samazināt"
 
-#: src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Samazināt vērtējumu"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Nav vērtēts"
 
-#: src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Nav vērtēts"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Vērtējums nevērtēts"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Iestata kā nevērtētu"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Noņem jebkuru vērtējumu"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "No_raidīts"
 
-#: src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Noraidīts"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Vērtējums noraidīts"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Iestata kā noraidītu"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Iestatīt vērtējumu uz “noraidīts”"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:269 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 "Tikai n_oraidītās"
 
-#: src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Tikai noraidītās"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Rādīt tikai noraidītās fotogrāfijas"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:273 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 "Visas un no_raidītās"
 
-#: src/Resources.vala:273
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Rādīt visas fotogrāfijas, tai skaita noraidītās"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:276 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 "Vis_as fotogrāfijas"
 
 #. Button tooltip
-#: src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Rādīt visas fotogrāfijas"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "Vē_rtējumi"
 
-#: src/Resources.vala:280
-#| msgid "Display each photo's rating"
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
 msgstr "Rādīt katras fotogrāfijas vērtējumu"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:283 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 "_Filtrēt fotogrāfijas"
 
-#: src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Filtrēt fotogrāfijas"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ierobežot fotogrāfiju skaitu, ko rādīt pēc filtrēšanas"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Dublēt"
-
-#: src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Dublēt"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Izveidot fotogrāfijas dublikātu"
 
-#: src/Resources.vala:290
-#| msgid "Export"
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Eksportēt…"
 
-#: src/Resources.vala:292
-#| msgid "_Print"
+#: src/Resources.vala:293
 msgid "_Print…"
 msgstr "_Drukāt…"
 
-#: src/Resources.vala:294
-#| msgid "Publish"
+#: src/Resources.vala:295
 msgid "Pu_blish…"
 msgstr "Pu_blicēt…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Publicēt uz dažādām tīmekļa vietnēm"
 
-#: src/Resources.vala:298
-#| msgctxt "Dialog Title"
-#| msgid "Edit Title"
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Rediģēt _nosaukumu…"
 
 #. Button label
-#: src/Resources.vala:300
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Rediģēt nosaukumu"
 
-#: src/Resources.vala:302
-#| msgid "Edit Comment"
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
 msgstr "Rediģēt _komentāru…"
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Rediģēt komentāru"
 
-#: src/Resources.vala:306
-#| msgid "Edit Event Comment"
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
 msgstr "Rediģēt notikuma _komentāru…"
 
-#: src/Resources.vala:309
-#| msgid "Adjust Date and Time"
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
 msgstr "_Pielāgot datumu un laiku…"
 
-#: src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Pielāgot datumu un laiku"
 
-#: src/Resources.vala:312
-#| msgctxt "Dialog Title"
-#| msgid "Add Tags"
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Pievienot _tagus…"
 
-#: src/Resources.vala:313
-#| msgctxt "Dialog Title"
-#| msgid "Add Tags"
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "Pievienot _tagus…"
 
 #. Dialog title
-#: src/Resources.vala:315
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Pievienot tagus"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Atvērt ar ārēju reda_ktoru"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Atvērt ar RA_W redaktoru"
-
-#: src/Resources.vala:323
-#| msgid "Send To"
-msgid "Send _To…"
-msgstr "Sū_tīt uz…"
-
-#: src/Resources.vala:324
-#| msgid "Send To"
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
 msgstr "Sūtīt _uz…"
 
-#: src/Resources.vala:326
-#| msgid "_Find"
+#: src/Resources.vala:327
 msgid "_Find…"
 msgstr "_Meklēt…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Meklēt"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Meklēt attēlu, ierakstot tekstu, kas parādās tā nosaukumā vai tagos"
 
-#: src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Marķēt"
 
-#: src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "Noņemt _marķējumu"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Nevar palaist redaktoru — %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
-#| msgid "Add Tag \"%s\""
 msgid "Add Tag “%s”"
 msgstr "Pievienot tagu “%s”"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
 msgid "Add Tags “%s” and “%s”"
 msgstr "Pievienot tagus “%s” un “%s”"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Pievienot tagus"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
-#| msgid "_Delete Tag \"%s\""
 msgid "_Delete Tag “%s”"
 msgstr "_Dzēst tagu “%s”"
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
-#| msgid "Delete Tag \"%s\""
 msgid "Delete Tag “%s”"
 msgstr "Dzēst tagu “%s”"
 
-#: src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Dzēst tagu"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
-#| msgid "Re_name Tag \"%s\"..."
 msgid "Re_name Tag “%s”…"
 msgstr "_Pārdēvēt tagu “%s”…"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Pārdēvēt tagu “%s” uz “%s”"
 
-#: src/Resources.vala:373
-#| msgid "_Rename..."
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
 msgstr "Pā_rdēvēt…"
 
-#: src/Resources.vala:375
-#| msgid "Modify Tags"
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Mod_ificēt tagus…"
 
-#: src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Modificēt tagus"
 
-#: src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
-#| msgid "Tag Photo as \"%s\""
+#| msgid "Tag Photo as “%s”"
 msgid "Tag Photo as “%s”"
-msgstr "Tagot fotogrāfiju kā “%s”…"
-
-#: src/Resources.vala:379
-#, c-format
-#| msgid "Tag Photos as \"%s\""
-msgid "Tag Photos as “%s”"
-msgstr "Tagot fotogrāfijas kā “%s”…"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Tagot fotogrāfiju kā “%s”"
+msgstr[1] "Tagot fotogrāfijas kā “%s”"
+msgstr[2] "Tagot fotogrāfijas kā “%s”"
 
-#: src/Resources.vala:383
+#: src/Resources.vala:386
 #, c-format
-#| msgid "Tag the selected photo as \"%s\""
+#| msgid "Tag the selected photo as “%s”"
 msgid "Tag the selected photo as “%s”"
-msgstr "Tagot izvēlēto fotogrāfiju kā “%s”"
-
-#: src/Resources.vala:384
-#, c-format
-#| msgid "Tag the selected photos as \"%s\""
-msgid "Tag the selected photos as “%s”"
-msgstr "Tagot izvēlētās fotogrāfijas kā “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Tagot izvēlēto fotogrāfiju kā “%s”"
+msgstr[1] "Tagot izvēlētās fotogrāfijas kā “%s”"
+msgstr[2] "Tagot izvēlētās fotogrāfijas kā “%s”"
 
-#: src/Resources.vala:388
+#: src/Resources.vala:392
 #, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
+#| msgid "Remove Tag “%s” From _Photo"
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Izņemt tagu “%s” no _fotogrāfijas"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Izņemt tagu “%s” no _fotogrāfijas"
+msgstr[1] "Izņemt tagu “%s” no _fotogrāfijām"
+msgstr[2] "Izņemt tagu “%s” no _fotogrāfijām"
 
-#: src/Resources.vala:389
-#, c-format
-#| msgid "Remove Tag \"%s\" From _Photos"
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Izņemt tagu “%s” no _fotogrāfijām"
-
-#: src/Resources.vala:393
+#: src/Resources.vala:398
 #, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
+#| msgid "Remove Tag “%s” From Photo"
 msgid "Remove Tag “%s” From Photo"
-msgstr "Izņemt tagu “%s” no fotogrāfijas"
-
-#: src/Resources.vala:394
-#, c-format
-#| msgid "Remove Tag \"%s\" From Photos"
-msgid "Remove Tag “%s” From Photos"
-msgstr "Izņemt tagu “%s” no fotogrāfijām"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Izņemt tagu “%s” no fotogrāfijas"
+msgstr[1] "Izņemt tagu “%s” no fotogrāfijām"
+msgstr[2] "Izņemt tagu “%s” no fotogrāfijām"
 
-#: src/Resources.vala:398
+#: src/Resources.vala:404
 #, 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 "Tagu “%s” nevar pārdēvēt, jo tāds tags jau eksistē."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:408
 #, 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 "Nevar pārdēvēt meklēšanu uz “%s”, jo tāda jau eksistē."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Saglabātais meklējums"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Dzēst meklēšanu"
 
-#: src/Resources.vala:410
-#| msgid "_Edit"
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "R_ediģēt…"
 
-#: src/Resources.vala:411
-#| msgid "Re_name..."
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Pārdēvēt…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:420
 #, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
 msgid "Rename Search “%s” to “%s”"
 msgstr "Pārdēvēt meklēšanu “%s” uz “%s”"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:424
 #, c-format
-#| msgid "Delete Search \"%s\""
 msgid "Delete Search “%s”"
 msgstr "Dzēst meklēšanu “%s”"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Vērtēt %s"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Iestatīt vērtējumu uz %s"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Iestata vērtējumu uz %s"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Rādīt %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Rādīt tikai bildes ar vērtējumu %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s vai labāka"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Rādīt %s vai labākas"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Rādīt tikai bildes ar vērtējumu %s vai labāku"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Izņemt izvēlētās fotogrāfijas no miskastes"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Izņemt izvēlētās fotogrāfijas no bibliotēkas"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Atjaunot"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Pārvietot izvēlētās fotogrāfijas atpakaļ bibliotēkā"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Rādīt datņu _pārvaldniekā"
 
-#: src/Resources.vala:682
-#| msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Atvērt izvēlētās fotogrāfijas mapi datņu pārvaldniekā"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Neizdevās atvērt datņu pārvaldniekā — %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Izņ_emt no bibliotēkas"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "Pārvietot uz _miskasti"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:677 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 "Izvēlēties vis_as"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Izvēlēties visus vienumus"
 
@@ -6233,14 +5695,14 @@ msgstr "Izvēlēties visus vienumus"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6248,7 +5710,7 @@ msgstr "%a %b %d"
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -6256,7 +5718,7 @@ msgstr "%d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6264,156 +5726,128 @@ msgstr "%a %b %d"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Slaidrāde"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Saglabātās meklēšanas"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "satur"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "ir tieši"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "sākas ar"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "beidzas ar"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "nesatur"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "nav iestatīts"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "ir iestatīts"
 
 #. 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:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "ir"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "nav"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "jebkura fotogrāfija"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "raw fotogrāfija"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "video"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "ir"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "nav"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "modifikācijas"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "iekšējās modifikācijas"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "ārējās modifikācijas"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "atzīmēts"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "neatzīmēts"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "un vairāk"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "tikai "
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "un mazāk"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "ir pēc"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "ir pirms"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "ir starp"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "un"
 
-#: src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Meklēt"
-
-#: src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "Labi"
-
-#: src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "jebkurš"
-
-#: src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "visi"
-
-#: src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "nekas"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Jebkurš teksts"
@@ -6450,8 +5884,8 @@ msgstr "Atzīmes stāvoklis"
 msgid "Photo state"
 msgstr "Fotogrāfijas stāvoklis"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Vērtējums"
 
@@ -6459,90 +5893,113 @@ msgstr "Vērtējums"
 msgid "Date"
 msgstr "Datums"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Video"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Saglabātās meklēšanas"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "RAW fotogrāfijas"
+#: src/searches/SearchesBranch.vala:68
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Organizēt saglabātās meklēšanas"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "RAW fotogrāfijas"
+#: src/SearchFilter.vala:811
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "★+ vērtējums"
+
+#: src/SearchFilter.vala:814
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "★★+ vērtējums"
+
+#: src/SearchFilter.vala:817
+msgid "★★★+ Rating"
+msgstr "★★★+ vērtējums"
+
+#: src/SearchFilter.vala:820
+msgid "★★★★+ Rating"
+msgstr "★★★★+ vērtējums"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:824
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ vērtējums"
+
+#: src/SearchFilter.vala:1060
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Kļūda, ielādējot UI datni “%s” — %s"
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Kļūda, ielādējot meklēšanas joslas saskarni — %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Aizvērt"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tips"
 
-#: src/SearchFilter.vala:1211
-msgid "Use a saved search to filter items in the current view"
-msgstr "Izmantot saglabātu meklējumu, lai filtrētu vienumus šajā skatā"
+#: src/SearchFilter.vala:1082
+msgid "Videos"
+msgstr "Video"
 
-#: src/sidebar/Tree.vala:203
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "Jauns _tags…"
+#: src/SearchFilter.vala:1085
+msgid "RAW Photos"
+msgstr "RAW fotogrāfijas"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Iestatījumi"
+#: src/SearchFilter.vala:1121
+msgid "Use a saved search to filter items in the current view"
+msgstr "Izmantot saglabātu meklējumu, lai filtrētu vienumus šajā skatā"
 
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Atpakaļ"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Doties uz iepriekšējo fotogrāfiju"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pauzēt"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pauzēt slaidrādi"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Nākamais"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Doties uz nākamo fotogrāfiju"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Iestatījumi"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Izmainīt slaidrādes iestatījumus"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Trūkst visas fotogrāfiju avotu datnes."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Rādīt"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Turpināt slaidrādi"
 
@@ -6554,7 +6011,7 @@ msgstr "Slaidrādes pārejas"
 msgid "(None)"
 msgstr "(Nekādas)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Nekādas"
 
@@ -6562,207 +6019,717 @@ msgstr "Nekādas"
 msgid "Random"
 msgstr "Nejaušs"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Tagi"
 
+#: src/tags/TagsBranch.vala:131
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Organizē un pārlūko savu fotogrāfiju tagus"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "nenosaukts"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Eksportēt video"
 
-#: ui/set_background_dialog.ui:15
-msgid "Set as Desktop Background"
-msgstr "Iestatīt kā darbvirsmas fonu"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Pārslēgt _atzīmi"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
-msgid "Use for Desktop"
-msgstr "Izmantot darbvirsmai"
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
+msgid "_Developer"
+msgstr "_Attīstītājs"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
-msgid "Use for Lock Screen"
-msgstr "Izmantot ekrāna bloķēšanai"
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
+msgid "View Eve_nt for Photo"
+msgstr "Skatīt fotogrāfijas _notikumu"
 
-#: ui/set_background_slideshow_dialog.ui:15
-msgid "Set as Desktop Slideshow"
-msgstr "Iestatīt kā darbvirsmas slaidrādi"
+#: 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/trash.ui:5
+msgid "_File"
+msgstr "_Datne"
 
-#: ui/set_background_slideshow_dialog.ui:33
-msgid "Show each photo for"
-msgstr "Rādīt katru fotogrāfiju"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "S_aglabāt kā…"
 
-#: ui/set_background_slideshow_dialog.ui:45
-msgid "period of time"
-msgstr "laika periods"
+#: 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/trash.ui:87
+msgid "_View"
+msgstr "_Skats"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Veidot darbvirsmu no fona slaidrādes"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Ietil_pināt lapā"
 
-#: ui/set_background_slideshow_dialog.ui:115
-msgid "How long each photo is shown on the desktop background"
-msgstr "Cik ilgi katra fotogrāfija tiek rādīta uz darbvirsmas fona"
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Mērogs _100%"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "Meklēšanas _nosaukums"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Mērogs _200%"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Sakrīt"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Fotogrāfija"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "no sekojošajiem:"
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "Ie_priekšējā fotogrāfija"
 
-#: ui/shotwell.ui:195
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Izdrukāta attēla izmērs</b>"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Nākamā fotogrāfija"
 
-#: ui/shotwell.ui:212
-msgid "Use a _standard size:"
-msgstr "Lietot _standarta izmēru:"
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Rīki"
 
-#: ui/shotwell.ui:255
-msgid "Use a c_ustom size:"
-msgstr "Lietot pielāgot_u izmēru:"
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Biežāk uzdotie jautājumi"
 
-#: ui/shotwell.ui:345
-msgid "_Match photo aspect ratio"
-msgstr "Atbilst fotogrāfijas sa_mēram"
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Ziņot par problēmu…"
 
-#: ui/shotwell.ui:369
-msgid "_Autosize:"
-msgstr "_Automātisks izmērs:"
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import From Folder…"
+msgstr "_Importēt no mapes…"
 
-#: ui/shotwell.ui:409
-msgid "<b>Titles</b>"
-msgstr "<b>Nosaukumi</b>"
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Importēt no _lietotnes…"
 
-#: ui/shotwell.ui:426
-msgid "Print image _title"
-msgstr "Drukā_t attēla nosaukumu"
+#: 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 "Iztukšot _miskasti"
 
-#: ui/shotwell.ui:470
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Pikseļu izšķirtspēja</b>"
+#: 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 "_Meklēt"
 
-#: ui/shotwell.ui:490
-msgid "_Output photo at:"
-msgstr "Izvadīt f_otogrāfiju uz:"
+#: 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 "_Jauna saglabātā meklēšana…"
 
-#: ui/shotwell.ui:525
-msgid "pixels per inch"
-msgstr "pikseļi uz collu"
+#: 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 "_Pamatinformācija"
 
-#: ui/shotwell.ui:559
-msgid "label"
-msgstr "etiķete"
+#: 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 "Pa_plašināta informācija"
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Shotwell iestatījumi"
+#: 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 "Meklēšana_s josla"
+
+#: 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 "Sānu _josla"
+
+#: 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 "Rīkj_osla"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Komentāri"
+
+#: 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 "Kārtot _notikumus"
+
+#: 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 "_Augošā"
+
+#: 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 "_Dilstošā"
+
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+msgid "Even_ts"
+msgstr "No_tikumi"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Nosaukumi"
+
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
+msgid "Ta_gs"
+msgstr "Ta_gi"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Kārtot _fotogrāfijas"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Pēc _nosaukuma"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Pēc _datņu nosaukuma"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Pēc uzņemšanas _datuma"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Pēc vē_rtējuma"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+#| msgid "D_escending"
+msgid "_Descending"
+msgstr "_Dilstoši"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Fotogrāfijas"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Apturēt importēšanu"
 
-#: ui/shotwell.ui:730
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "balts"
 
-#: ui/shotwell.ui:757
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "melns"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Sekot līdzi jaunām datnēm manā bibliotēkā"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Metadati"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Rakstīt tagus, nosaukumus un citus _metadatus fotogrāfiju datnēs"
-
-#: ui/shotwell.ui:880
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Attēlot"
 
-#: ui/shotwell.ui:901
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Fons:"
+
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Importēt fotogrāfijas uz:"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Fons:"
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Sekot līdzi jaunām datnēm manā bibliotēkā"
 
-#: ui/shotwell.ui:947
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Importē"
 
-#: ui/shotwell.ui:970
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "_Direktoriju struktūra:"
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "Šabl_ons:"
-
-#: ui/shotwell.ui:1091
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Piemērs:"
 
-#: ui/shotwell.ui:1108
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "Pārdēvēt importētās datnes uz mazajiem burti_em"
 
-#: ui/shotwell.ui:1137
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadati"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Rakstīt tagus, nosaukumus un citus _metadatus fotogrāfiju datnēs"
+
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW attīstītājs"
 
-#: ui/shotwell.ui:1172
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "No_klusējuma:"
 
-#: ui/shotwell.ui:1226
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "Šabl_ons:"
+
+#: ui/preferences_dialog.ui:414
+#| msgid "_Background:"
+msgid "Transparent Background:"
+msgstr "Caurspīdīgs fons"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Rūtains"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Viendabīga krāsa"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "Ārējais fotogrāfiju r_edaktors:"
 
-#: ui/shotwell.ui:1242
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Ārējais _RAW redaktors:"
 
-#: ui/shotwell.ui:1307
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Ārējie redaktori"
 
-#: ui/shotwell.ui:1334
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Spraudņi"
 
-#: ui/shotwell.ui:1400
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell iestatījumi"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Izdrukāta attēla izmērs</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "Lietot _standarta izmēru:"
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "Lietot pielāgot_u izmēru:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "colla"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "Atbilst fotogrāfijas sa_mēram"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "_Automātisks izmērs:"
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>Nosaukumi</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "Drukā_t attēla nosaukumu"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Pikseļu izšķirtspēja</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "Izvadīt f_otogrāfiju uz:"
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "pikseļi uz collu"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Meklēt"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "Labi"
+
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "Meklēšanas _nosaukums"
+
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "_Sakrīt"
+
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "jebkurš"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "visi"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "nekas"
+
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "no sekojošajiem:"
+
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Iestatīt kā darbvirsmas fonu"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Izmantot darbvirsmai"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Izmantot ekrāna bloķēšanai"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Iestatīt kā darbvirsmas slaidrādi"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Veidot darbvirsmu no fona slaidrādes"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Rādīt katru fotogrāfiju"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "laika periods"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Cik ilgi katra fotogrāfija tiek rādīta uz darbvirsmas fona"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Jauns _tags…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "Ai_zture:"
 
-#: ui/shotwell.ui:1416
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Pārejas efek_ti:"
 
-#: ui/shotwell.ui:1432
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Pār_ejas aizture:"
 
-#: ui/shotwell.ui:1444
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Rādīt v_irsrakstu"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekundes"
 
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "etiķete"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Dzēst visas fotogrāfijas no miskastes"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Laipni lūdzam F-Spot bibliotēkas importēšanas servisā.\n"
+#~ "\n"
+#~ "Lūdzu, izvēlieties bibliotēku, ko importēt, vai nu izvēloties kādu no "
+#~ "bibliotēkām, ko ir atradis Shotwell, vai arī izvēloties alternatīvu F-"
+#~ "Spot datubāzes datni."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Laipni lūdzam F-Spot bibliotēkas importēšanas servisā.\n"
+#~ "\n"
+#~ "Lūdzu, izvēlieties F-Spot datubāzes datni."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Manuāli izvēlieties F-Spot datubāzes datni, ko importēt:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Nevar atvērt izvēlēto F-Spot datubāzes datni — datne neeksistē vai nav F-"
+#~ "Spot datubāze"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Nevar atvērt izvēlēto F-Spot datubāzes datni — šo F-Spot datubāzes datnes "
+#~ "versiju Shotwell neatbalsta"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Nevar nolasīt izvēlēto F-Spot datubāzes datni — kļūda, nolasot tagu tabulu"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Nevar nolasīt izvēlēto F-Spot datubāzes datni — kļūda, nolasot "
+#~ "fotogrāfiju tabulu"
+
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell ir atradis %d fotogrāfijas F-Spot bibliotēkā un tās pašlaik "
+#~ "importē. Dublikāti tiks automātiski atrasti un izņemti.\n"
+#~ "\n"
+#~ "Jūs varat aizvērt šo dialoglodziņu un sākt lietot Shotwell, kamēr fonā "
+#~ "notiek importēšana."
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot bibliotēka — %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Gatavojas importēt"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Kodola datu importēšanas servisi"
+
+#~ msgid "Width or height"
+#~ msgstr "Platums vai augstums"
+
+#~| msgid "'%s' isn't a valid response to an OAuth authentication request"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "“%s” nav derīga atbilde OAuth autentifikācijas pieprasījumam"
+
+#~| msgid "Testing connection to Facebook..."
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "Pārbauda savienojumu ar Facebook…"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Ievadiet apstiprināšanas skaitli, kas parādīsies pēc tam, kad būsiet "
+#~ "ierakstījies Flickr vietnē."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Autorizācijas _skaitlis:"
+
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Jūs jau esat ierakstījies un izrakstījies no Flickr sistēmas Shotwell "
+#~ "sesijas laikā.\n"
+#~ "Lai turpinātu publicēšanu Flickr sistēmā, izejiet no Shotwell un "
+#~ "pārlaidiet to vēlreiz."
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "L_ikt albumu publiskā galerijā"
+
+#~| msgid "Videos will appear in '%s'"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Video parādīsies pēc “%s”"
+
+#~ msgid "_Contents"
+#~ msgstr "_Saturs"
+
+#~ msgid "Display the title of each photo"
+#~ msgstr "Rādīt nosaukumu katrai fotogrāfijai"
+
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Importēt izvēlētās fotogrāfijās savā bibliotēkā"
+
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Importēt visas fotogrāfijas savā bibliotēkā"
+
+#~ msgid "Play a slideshow"
+#~ msgstr "Rādīt slaidrādi"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Eksportēt fotogrāfijas/video"
+
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Mainīt sākotnējās fotogrāfijas datnes"
+
+#~ msgid "_Modify original files"
+#~ msgstr "_Mainīt sākotnējās datnes"
+
+#~ msgid "Save photo"
+#~ msgstr "Saglabāt fotogrāfiju"
+
+#~ msgid "Save photo with a different name"
+#~ msgstr "Saglabāt fotogrāfiju ar citu nosaukumu"
+
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Drukāt fotogrāfiju ar printeri, kas ir pievienots pie datora"
+
+#~ msgid "Previous Photo"
+#~ msgstr "Iepriekšējā fotogrāfija"
+
+#~ msgid "Next Photo"
+#~ msgstr "Nākamā fotogrāfija"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Palielināt fotogrāfijas palielinājumu"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Samazināt fotogrāfijas palielinājumu"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Mainīt mērogu, lai fotogrāfija ietilptu ekrānā"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Mainīt fotogrāfijas mērogu uz 100% palielinājumu"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Mainīt fotogrāfijas mērogu uz 200% palielinājumu"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Rādīt komentāru katram notikumam"
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Apturēt fotogrāfiju importēšanu"
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Importēt fotogrāfijas no diska uz bibliotēku"
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Meklēt fotogrāfijas un video pēc meklēšanas kritērija"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Rādīt pamatinformāciju par izvēli"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Rādīt paplašinātu informāciju par izvēli"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Rādīt meklēšanas joslu"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Rādīt sānu joslu"
+
+#~ msgid "Display the tool bar"
+#~ msgstr "Rādīt rīkjoslu"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Kārtot fotogrāfijas augošā secībā"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Kārtot fotogrāfijas dilstošā secībā"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Palielināt sīktēlu palielinājumu"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Samazināt sīktēlu palielinājumu"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Atskaņot video"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Atvērt izvēlētos video sistēmas video atskaņotājā"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Rādīt komentāru katrai fotogrāfijai"
+
+#~| msgid "Display each photo's tags"
+#~ msgid "Display each photo’s tags"
+#~ msgstr "Rādīt katras fotogrāfijas tagu"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Kārtot fotogrāfijas pēc nosaukuma"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Kārtot fotogrāfijas pēc uzņemšanas datuma"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Kārtot fotogrāfijas pēc vērtējuma"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Kārtot fotogrāfijas pēc datņu nosaukuma"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Izvēlētie video tika veiksmīgi publicēti."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Izvēlētās fotogrāfijas tika veiksmīgi publicētas."
+
+#~| msgid "Tag Photos as \"%s\""
+#~ msgid "Tag Photos as “%s”"
+#~ msgstr "Tagot fotogrāfijas kā “%s”…"
+
+#~| msgid "Tag the selected photos as \"%s\""
+#~ msgid "Tag the selected photos as “%s”"
+#~ msgstr "Tagot izvēlētās fotogrāfijas kā “%s”"
+
+#~| msgid "Remove Tag \"%s\" From _Photos"
+#~ msgid "Remove Tag “%s” From _Photos"
+#~ msgstr "Izņemt tagu “%s” no _fotogrāfijām"
+
+#~| msgid "Remove Tag \"%s\" From Photos"
+#~ msgid "Remove Tag “%s” From Photos"
+#~ msgstr "Izņemt tagu “%s” no fotogrāfijām"
+
+#~ msgid "RAW photos"
+#~ msgstr "RAW fotogrāfijas"
+
 #~ msgid "Login"
 #~ msgstr "Ierakstīties"
 
diff --git a/po/meson.build b/po/meson.build
new file mode 100644
index 0000000..5523e75
--- /dev/null
+++ b/po/meson.build
@@ -0,0 +1 @@
+i18n.gettext('shotwell', preset: 'glib')
diff --git a/po/pl.gmo b/po/pl.gmo
index 817ce45..0c0872c 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index c6d9d15..6b31841 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-04-03 10:25+0200\n"
+"POT-Creation-Date: 2017-11-24 20:46+0000\n"
+"PO-Revision-Date: 2017-11-26 18:47+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -22,9 +22,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
 #: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
 #: ui/tags.ui:356
 msgid "Shotwell"
@@ -69,16 +69,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "Programiści projektu Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Menedżer zdjęć"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organizowanie zdjęć"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -94,15 +94,15 @@ msgstr ""
 "piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Przeglądarka Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Przeglądarka zdjęć"
 
@@ -131,7 +131,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Tajny token do podpisywania żądań OAuth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "domyślne wymiary"
 
@@ -159,9 +159,9 @@ msgid "URL of the Rajce server."
 msgstr "Adres URL serwera Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "nazwa użytkownika"
 
@@ -178,7 +178,7 @@ msgid "user token, if remembered."
 msgstr "token użytkownika, jeśli jest zapamiętany."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "ostatnia kategoria"
 
@@ -187,7 +187,7 @@ msgid "The last selected Rajce category."
 msgstr "Ostatnio zaznaczona kategoria serwera Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "ostatnie wymiary zdjęcia"
 
@@ -229,11 +229,11 @@ msgstr ""
 "w przeglądarce WWW od razu po wysłaniu zdjęć"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "usuwanie informacji osobistych z wysyłanych zdjęć"
 
@@ -496,10 +496,28 @@ msgid "A grayscale color for use as the background color."
 msgstr "Kolor w skali szarości używany jako kolor tła."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "tło przezroczystych obrazów"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Tło przezroczystych obrazów."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "kolor tła przezroczystych obrazów"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Kolor używany, jeśli tło przezroczystych obrazów jest ustawione na jeden "
+"kolor"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Stan zaznaczenia opcji ukrywania zdjęć"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -507,98 +525,98 @@ msgstr ""
 "Ostatnio używany stan zaznaczenia opcji ukrywania już zaimportowanych zdjęć "
 "na stronie importowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "opóźnienie"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Opóźnienie między zdjęciami w pokazie slajdów w sekundach."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "opóźnienie przejścia"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "Czas przejścia między zdjęciami w pokazie slajdów w sekundach"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "identyfikator efektu przejścia"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
 "Nazwa efektu przejścia używanego między zdjęciami podczas pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Wyświetlanie tytułu"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Czy wyświetlać tytuł zdjęcia podczas pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maksymalizacja okna kolekcji"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, okno kolekcji jest zmaksymalizowane."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "szerokość okna kolekcji"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Ostatnio zapisana szerokość okna kolekcji."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "wysokość okna kolekcji"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Ostatnio zapisana wysokość okna kolekcji."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maksymalizacja okna bezpośredniego modyfikowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, okno bezpośredniego modyfikowania "
 "jest zmaksymalizowane."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "szerokość okna bezpośredniego modyfikowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Ostatnio zapisana szerokość okna bezpośredniego modyfikowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "wysokość okna bezpośredniego modyfikowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Ostatnio zapisana wysokość okna bezpośredniego modyfikowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "położenie przegrody panelu bocznego"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -606,30 +624,30 @@ msgstr ""
 "Ostatnio zapisane położenie przegrody między panelem bocznym a widokiem "
 "w oknie kolekcji."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "katalog importu"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Katalog, w którym umieszczać zaimportowane pliki zdjęć."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "obserwowanie katalogu kolekcji pod kątem nowych plików"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, pliki dodane do katalogu kolekcji są "
 "automatycznie importowane."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "zapisywanie metadanych do głównych plików"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -637,11 +655,11 @@ msgstr ""
 "Jeśli jest ustawione na wartość „true”, zmiany metadanych (etykiety, tytuły "
 "itp.) są zapisywane do głównych plików zdjęć."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "małe litery nazw plików"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -649,11 +667,11 @@ msgstr ""
 "Jeśli jest ustawione na wartość „true”, program Shotwell będzie konwertował "
 "wszystkie nazwy plików na małe litery podczas importowania plików zdjęć"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "wzorzec katalogów"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -661,11 +679,11 @@ msgstr ""
 "Ciąg kodujący wzorzec nazw używany do nazywania katalogów zdjęć podczas "
 "importowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "niestandardowy wzorzec katalogów"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -673,27 +691,27 @@ msgstr ""
 "Ciąg kodujący niestandardowy wzorzec nazw używany do nazywania katalogów "
 "zdjęć podczas importowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "domyślne wywoływacza RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Domyślna opcja używana dla wywoływacza RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Najczęściej używane proporcje kadrowania w menu."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr "Kod numeryczny przedstawiający ostatnio wybrane proporcje kadrowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Numerator najczęściej używanych niestandardowych proporcji kadrowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -701,12 +719,12 @@ msgstr ""
 "Niezerowa, dodatnia liczba całkowita przedstawiająca szerokość ostatnio "
 "wprowadzonych niestandardowych proporcji kadrowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Denominator najczęściej używanych niestandardowych proporcji kadrowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -714,139 +732,139 @@ msgstr ""
 "Niezerowa, dodatnia liczba całkowita przedstawiająca wysokość ostatnio "
 "wprowadzonych niestandardowych proporcji kadrowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "zewnętrzny edytor zdjęć"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Zewnętrzny program używany do modyfikowania zdjęć."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "zewnętrzny edytor plików RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Zewnętrzny program używany do modyfikowania zdjęć RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Ustawienie w oknie eksportu: jak przycinać obrazy"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "eksport metadanych"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Ustawienie w oknie eksportu: opcja eksportu metadanych"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "ustawienie formatu, specjalna wartość"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Ustawienie w oknie eksportu: ustawienie formatu, specjalna wartość"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "ustawienie formatu, wartość typu"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Ustawienie w oknie eksportu: ustawienie formatu, wartość typu"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "opcja jakości JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Ustawienie w oknie eksportu: opcja jakości JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "maksymalny rozmiar obrazu"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Ustawienie w oknie eksportu: maksymalny rozmiar obrazu"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "ostatnio używana usługa publikowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Kod numeryczny przedstawiający ostatnią usługę, w której zdjęcia były "
 "publikowane"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "domyślna usługa publikowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "token dostępu"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Token OAuth serwisu Facebook obecnie zalogowanej sesji"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "identyfikator użytkownika"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "Identyfikator serwisu Facebook dla obecnie zalogowanego użytkownika"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "nazwa użytkownika"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Nazwa obecnie zalogowanego użytkownika serwisu Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "kod domyślnych wymiarów"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Kod numeryczny przedstawiający domyślne wymiary zdjęć publikowanych "
 "w serwisie Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 "Czy obrazy wysyłane do serwisu Facebook mają mieć najpierw usuwane metadane"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Token etapu dostępu OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Token upoważnienia obecnie zalogowanego użytkownika serwisu Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Hasło tokenu etapu dostępu OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -854,22 +872,22 @@ msgstr ""
 "Hasło kryptograficzne używane do podpisywania żądań dla tokenu upoważnienia "
 "dla obecnie zalogowanego użytkownika serwisu Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Nazwa obecnie zalogowanego użytkownika serwisu Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Kod numeryczny przedstawiający domyślne wymiary zdjęć publikowanych "
 "w serwisie Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "domyślna widoczność"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -877,19 +895,19 @@ msgstr ""
 "Kod numeryczny przedstawiający domyślną widoczność zdjęć publikowanych "
 "w serwisie Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "Czy obrazy wysyłane do serwisu Flickr mają mieć najpierw usuwane metadane"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "token odświeżania"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -897,7 +915,7 @@ msgstr ""
 "Token OAuth używany do odświeżania sesji serwisu Picasa Web Albums dla "
 "obecnie zalogowanego użytkownika."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -905,65 +923,65 @@ msgstr ""
 "Kod numeryczny przedstawiający domyślne wymiary zdjęć wysyłanych do serwisu "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "ostatni album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Nazwa albumu, w którym ostatnio publikowano zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "Czy obrazy wysyłane do serwisu Picasa mają mieć najpierw usuwane metadane"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Adres URL serwera Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Adres URL serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Nazwa użytkownika serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "hasło"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Hasło serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "zapamiętanie hasła"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, zapamiętuje hasło serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Ostatnio wybrana kategoria serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "ostatni poziom uprawnień"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Ostatnio wybrany poziom uprawnień serwera Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -971,21 +989,21 @@ msgstr ""
 "Kod numeryczny przedstawiający ostatnie ustawienie wymiarów zdjęcia używane "
 "podczas publikowania na serwerze Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "Czy obrazy wysyłane do serwera Piwigo mają mieć najpierw usuwane metadane"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "jeśli tytuł jest ustawiony, a komentarz nie, to używanie tytułu jako "
 "komentarz podczas wysyłania do serwera Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -993,11 +1011,11 @@ msgstr ""
 "Czy obrazy wysłane do serwera Piwigo mają mieć ustawiany komentarz z tytułu, "
 "jeśli tytuł jest ustawiony, a komentarz nie"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "bez wysyłania etykiet podczas wysyłania do serwera Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1005,27 +1023,27 @@ msgstr ""
 "Czy obrazy wysłane do serwera Piwigo mają mieć usuwane etykiety podczas "
 "wysyłania, aby nie pojawiały się na zdalnym serwerze Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Nazwa użytkownika serwisu Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "klucz API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Klucz API serwisu Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Adres URL witryny Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1033,19 +1051,19 @@ msgstr ""
 "Wskazuje, czy obrazy wysyłane do serwisu Gallery3 mają mieć najpierw usuwane "
 "metadane"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "ograniczenie skalowania wysyłanego zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Identyfikator ograniczenia skalowania wysyłanego zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "piksele głównej osi wysyłanego zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1053,7 +1071,7 @@ msgstr ""
 "Piksele głównej osi wysyłanego zdjęcia. Używane tylko, jeśli „scaling-"
 "constraint-id” ma odpowiednią wartość"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1061,65 +1079,65 @@ msgstr ""
 "Token OAuth używany do odświeżania sesji serwisu YouTube dla obecnie "
 "zalogowanego użytkownika."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "ostatnio używana usługa importowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Kod numeryczny przedstawiający ostatnią usługę, z której importowano zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "ciasteczko stanu interpretatora"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Kod numeryczny przechwytujący stan środowiska wtyczki GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "tryb układu treści"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr ""
 "Kod numeryczny opisujący sposób ułożenia zdjęć na stronie podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppi treści"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Liczba pikseli na cal (ppi) wysyłanych do drukarki podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "szerokość treści"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Szerokość drukowanej emulsji na stronie podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "wysokość treści"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Wysokość drukowanej emulsji na stronie podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "jednostki treści"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1127,11 +1145,11 @@ msgstr ""
 "Kod numeryczny przedstawiający jednostkę miary (cale lub centymetry) używaną "
 "podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "kod obrazów na stronę"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1139,22 +1157,22 @@ msgstr ""
 "Kod numeryczny przedstawiający obecnie wybrany tryb obrazów na stronę "
 "używany podczas drukowania"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "wybór rozmiaru"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Indeks bieżącego rozmiaru drukowania na wcześniej określonej liście "
 "standardowych rozmiarów"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "utrzymywanie proporcji"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1162,11 +1180,11 @@ msgstr ""
 "Określa, czy niestandardowe rozmiary drukowania muszą pasować do proporcji "
 "oryginalnego zdjęcia"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "drukowanie tytułów"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1174,219 +1192,219 @@ msgstr ""
 "Jeśli jest ustawione na wartość „true”, tytuł zdjęcia jest drukowany podczas "
 "drukowania zdjęcia."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "czcionka tytułów"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Nazwa czcionki używanej dla tytułów zdjęć podczas drukowania."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Facebook jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Flickr jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Picasa Web Albums jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie YouTube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "YouTube jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "włączenie wtyczki publikowania na serwerze Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania na serwerze "
 "Piwigo jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Yandex.Fotki jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Tumblr jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Rajce jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "włączenie wtyczki publikowania w serwisie Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka publikowania w serwisie "
 "Gallery3 jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "włączenie wtyczki importu z programu F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka importowania z programu F-"
 "Spot jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "włączenie przejścia wykruszania pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia wykruszania pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "włączenie przejścia przenikania pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia przenikania pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "włączenie przejścia osunięcia pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia osunięcia pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "włączenie przejścia zegara pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia zegara pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "włączenie przejścia okręgu pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia okręgu pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "włączenie przejścia okręgów pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia okręgów pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "włączenie przejścia żaluzji pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia żaluzji pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "włączenie przejścia kwadratów pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia kwadratów pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "włączenie przejścia pasków pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia pasków pokazu "
 "slajdów jest włączona"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "włączenie przejścia szachownicy pokazu slajdów"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1423,24 +1441,7 @@ msgstr ""
 "i ponownie uruchomić program Shotwell, a następnie ponownie spróbować "
 "publikacji."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Proszę podać numer potwierdzenia pojawiający się po zalogowaniu do serwisu "
-"Flickr w przeglądarce WWW."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Numer upoważnienia:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Ko_ntynuuj"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1453,20 +1454,15 @@ msgstr ""
 "w przeglądarce WWW. Następnie należy upoważnić Shotwell Connect na "
 "dowiązanie do konta serwisu Flickr."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Przygotowywanie do zalogowania…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
-"publikowania do serwisu Flickr."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Upoważnienie w serwisie Flickr się nie powiodło"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Sprawdzanie upoważnienia…"
 
@@ -1484,7 +1480,7 @@ msgstr ""
 "Aby kontynuować publikowanie do serwisów Google, należy zakończyć i ponownie "
 "uruchomić program Shotwell, a następnie ponownie spróbować publikacji."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1497,7 +1493,7 @@ msgstr ""
 "w przeglądarce WWW. Należy upoważnić program Shotwell Connect do powiązania "
 "z kontem serwisu Picasa Web Albums."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1512,11 +1508,52 @@ msgstr ""
 "ustawić za pomocą przeglądarki WWW do zalogowania się do serwisu YouTube co "
 "najmniej raz."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Adres _e-mail"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Hasło"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Zaloguj"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Proszę podać nazwę użytkownika i hasło powiązane z kontem serwisu Tumblr."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło. Proszę spróbować ponownie"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Nie można wczytać interfejsu użytkownika: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Witryna programu Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "verayin <vera@yorba.org>, 2011\n"
@@ -1525,13 +1562,13 @@ msgstr ""
 "Aviary.pl <community-poland@mozilla.org>, 2014-2017"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr "• Ta strona przedstawiła identyfikację należącą do innej strony."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1540,20 +1577,20 @@ msgstr ""
 "sprawdzić poprawność daty w kalendarzu komputera."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
 "• Identyfikacja tej strony nie została wydana przez zaufaną organizację."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr "• Nie można przetworzyć identyfikacji tej strony. Może być uszkodzona."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1562,7 +1599,7 @@ msgstr ""
 "która ją wydała."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1571,7 +1608,7 @@ msgstr ""
 "szyfrowania."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1579,107 +1616,11 @@ msgstr ""
 "• Identyfikacja tej strony jest ważna tylko w przyszłości. Proszę sprawdzić "
 "poprawność daty w kalendarzu komputera."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Plik tymczasowy wymagany do publikacji jest niedostępny"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Witamy w usłudze importu kolekcji programu F-Spot.\n"
-"\n"
-"Proszę wybrać kolekcję do zaimportowania, wybierając jedną z istniejących "
-"kolekcji odnalezionych przez program Shotwell lub wybierając alternatywny "
-"plik bazy danych programu F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Witamy w usłudze importu kolekcji programu F-Spot.\n"
-"\n"
-"Proszę wybrać plik bazy danych programu F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Ręczny wybór pliku bazy danych programu F-Spot do zaimportowania:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Nie można otworzyć wybranego pliku bazy danych programu F-Spot: plik nie "
-"istnieje lub nie jest bazą danych programu F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Nie można otworzyć wybranego pliku bazy danych programu F-Spot: ta wersja "
-"bazy danych programu F-Spot nie jest obsługiwana przez program Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Nie można otworzyć wybranego pliku bazy danych programu F-Spot: błąd podczas "
-"odczytywania tablicy etykiet"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Nie można otworzyć wybranego pliku bazy danych programu F-Spot: błąd podczas "
-"odczytywania tablicy zdjęć"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Program Shotwell odnalazł %d zdjęć w kolekcji programu F-Spot i obecnie je "
-"importuje. Podwójne kopie zostaną automatycznie wykryte i usunięte.\n"
-"\n"
-"Można zamknąć to okno i używać programu Shotwell, podczas gdy import jest "
-"przeprowadzany w tle."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Kolekcja programu F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Przygotowywanie importu"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Usługi importowania głównych danych"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adres URL witryny _Gallery3:"
@@ -1697,7 +1638,7 @@ msgid "Go _Back"
 msgstr "_Wstecz"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:363
 msgid "_Log in"
 msgstr "Za_loguj"
 
@@ -1732,7 +1673,7 @@ msgid "pixels"
 msgstr "piksele"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1740,17 +1681,17 @@ msgstr "Oryginalny rozmiar"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Szerokość lub wysokość"
+msgid "Longest edge"
+msgstr "Najdłuższa krawędź"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Wyloguj"
@@ -1758,11 +1699,11 @@ 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1860,31 +1801,11 @@ msgstr "Nierozpoznany użytkownik"
 msgid " Site Not Found"
 msgstr " Nie odnaleziono witryny"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "Adres _e-mail"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Zapamiętanie"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1938,82 +1859,10 @@ msgstr "Zalogowano w serwisie Rajce jako użytkownik %s."
 msgid "Photos will appear in:"
 msgstr "Zdjęcia pojawią się w:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Dodatkowe usługi publikowania programu Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogi:"
-
-#: 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:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: 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:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024×768 pikseli"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280×853 piksele"
-
-#: 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 jest prawidłową odpowiedzią na żądanie uwierzytelnienia OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): nie można uruchomić; tego modułu publikującego "
-"nie można uruchamiać ponownie."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Proszę podać nazwę użytkownika i hasło powiązane z kontem serwisu Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło. Proszę spróbować ponownie"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Nie można wczytać interfejsu użytkownika: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Zalogowano w serwisie Tumblr jako %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2083,6 +1932,14 @@ msgstr ""
 "_Usunięcie położenia, aparatu i innych informacji identyfikacyjnych przed "
 "wysłaniem"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2123,17 +1980,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Gdzie opublikować wybrane zdjęcia?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Tylko dla mnie"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Wszystkich"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Rozmiar zdjęcia:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
+"publikowania do serwisu Flickr."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2142,50 +2012,62 @@ msgstr ""
 "Zalogowano w serwisie Flickr jako użytkownik %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month you have %s remaining in your upload quota."
 msgstr ""
-"Darmowe konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
+"Bezpłatne konto w serwisie Flickr ogranicza ilość przesyłanych danych na "
 "miesiąc.\n"
 "W tym miesiącu pozostało %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Konto Flickr Pro umożliwia nieograniczone wysyłanie."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Zdjęcia _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Zdjęcia i nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Tylko przyjaciół i rodziny"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Tylko rodzina"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Tylko przyjaciele"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500×375 pikseli"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024×768 pikseli"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048×1536 pikseli"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096×3072 piksele"
@@ -2237,7 +2119,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048×1536 pikseli)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Oryginalny rozmiar"
 
@@ -2325,7 +2207,7 @@ msgid "Certificate of %s"
 msgstr "Certyfikat „%s”"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2377,10 +2259,38 @@ msgstr "Wyświetl certyfikat…"
 msgid "I understand, please _proceed."
 msgstr "_Rozumiem, proszę kontynuować."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Główne usługi publikowania"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogi:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280×853 piksele"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): nie można uruchomić; tego modułu publikującego "
+"nie można uruchamiać ponownie."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Zalogowano w serwisie Tumblr jako %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "U_stawienia prywatności nagrań wideo:"
@@ -2505,16 +2415,16 @@ msgstr "Przypina pasek narzędziowy"
 msgid "Leave fullscreen"
 msgstr "Opuszcza pełny ekran"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 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:158
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2527,27 +2437,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s — „Aachen”"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Witryna programu Shotwell"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nie można wyświetlić pomocy: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nie można przejść do bazy danych błędów: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nie można wyświetlić dokumentu FAQ: %s"
@@ -2613,17 +2517,27 @@ msgstr "Uszkodzony plik obrazu"
 msgid "Imported failed (%d)"
 msgstr "Zaimportowanie się nie powiodło (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Aparaty"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Lista wszystkich wykrytych aparatów"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
 #: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Aparat"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s — %s"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2636,34 +2550,34 @@ msgstr ""
 "w menedżerze plików."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Ukrywa już zaimportowane zdjęcia"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 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:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "_Zaimportuj wybrane"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Z_aimportuj wszystkie"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 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:861
+#: src/camera/ImportPage.vala:854
 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:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2671,15 +2585,15 @@ msgstr ""
 "Program Shotwell musi odmontować aparat z systemu plików, aby uzyskać do "
 "niego dostęp. Kontynuować?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "Odmont_uj"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Proszę odmontować aparat."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2689,11 +2603,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:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Proszę zamknąć inne programy używające aparatu."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2702,29 +2616,33 @@ msgstr ""
 "Nie można pobrać podglądu z aparatu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Odmontowywanie…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Łączenie z aparatem, proszę czekać…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Rozpoczynanie importowania, proszę czekać…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Pobieranie informacji o zdjęciach"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Pobieranie podglądu dla %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nie można zablokować aparatu: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2732,7 +2650,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:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2740,7 +2658,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:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2748,7 +2666,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:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2756,15 +2674,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:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Zatrzymaj"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Usuwanie zdjęć/nagrań wideo z aparatu"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2779,7 +2697,7 @@ msgid "_Print"
 msgstr "Wy_drukuj"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Wyślij _do…"
 
@@ -2821,13 +2739,13 @@ msgid "Flip Verti_cally"
 msgstr "Odwróć pi_onowo"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Uwydatnij"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "Przy_wróć oryginalne"
@@ -2844,7 +2762,8 @@ msgstr "_Wklej dostosowania kolorów"
 msgid "Adjust Date and Time…"
 msgstr "Dostosuj datę i czas…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
 msgid "Open With E_xternal Editor"
 msgstr "_Otwórz za pomocą zewnętrznego edytora"
 
@@ -2857,43 +2776,41 @@ msgstr "Otwórz za pomocą edytora plików _RAW"
 msgid "_Play"
 msgstr "Od_twórz"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Eksport zdjęcia/nagrania wideo"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Eksport zdjęcia/nagrania wideo"
+msgstr[1] "Eksport zdjęć/nagrań wideo"
+msgstr[2] "Eksport zdjęć/nagrań wideo"
 
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Eksport zdjęć/nagrań wideo"
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Eksport zdjęcia"
+msgid_plural "Export Photos"
+msgstr[0] "Eksport zdjęcia"
+msgstr[1] "Eksport zdjęć"
+msgstr[2] "Eksport zdjęć"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Eksport zdjęć"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Obracanie"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Cofanie obrotu"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Odwracanie poziome"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Cofanie odwrócenia poziomego"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Odwracanie pionowe"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Cofanie odwrócenia pionowego"
 
@@ -3111,7 +3028,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Plik bazy danych:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "Zai_mportuj"
 
@@ -3123,7 +3040,7 @@ msgstr "Import z programu"
 msgid "Import media _from:"
 msgstr "Importowanie multimediów _z:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
 msgid "_Close"
 msgstr "Zam_knij"
 
@@ -3194,7 +3111,7 @@ msgstr[2] "Etykieta „%s” zostanie usunięta z %d zdjęć. Kontynuować?"
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Usuń"
@@ -3229,6 +3146,10 @@ msgstr "_Przełącz wywoływacz"
 msgid "Export Video"
 msgstr "Eksport nagrań wideo"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Eksport zdjęć"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3261,6 +3182,10 @@ msgstr ""
 "\n"
 "Kontynuować eksportowanie?"
 
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Ko_ntynuuj"
+
 #. "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."
@@ -4029,41 +3954,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:2335 src/Dialogs.vala:2339
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(Pomoc)"
 
-#: src/Dialogs.vala:2346
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%sMiesiąc%sDzień"
 
-#: src/Dialogs.vala:2348
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%sMiesiąc"
 
-#: src/Dialogs.vala:2350
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%sMiesiąc-Dzień"
 
-#: src/Dialogs.vala:2352
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Rok-Miesiąc-Dzień"
 
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Niestandardowy"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2590
+#: src/Dialogs.vala:2627
 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:2692
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4071,31 +3996,31 @@ msgstr ""
 "Program Shotwell może skopiować zdjęcia do katalogu kolekcji lub może "
 "zaimportować je bez tworzenia ich kopii."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "_Skopiowanie zdjęć"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "_Zaimportowanie"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Zaimportuj do kolekcji"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Usuń z kolekcji"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:2763
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4123,7 +4048,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:2767
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4151,7 +4076,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:2771
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4179,7 +4104,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:2803
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4193,7 +4118,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:2781
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4260,206 +4185,206 @@ msgid "Save As"
 msgstr "Zapisz jako"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nie można monitorować %s: nie jest katalogiem (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Powraca do bieżących wymiarów zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Ustawia przycięcie tego zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 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:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Niewymuszony"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kwadratowy"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Plik wideo SD (4∶3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Plik wideo HD (16∶9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Portfel (2×3 cale)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notatka (3×5 cali)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4×6 cali"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5×7 cali"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8×10 cali"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5×11 cali)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11×14 cali"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11×17 cali)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16×20 cali"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Portfel metryczny (9×13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Kartka pocztowa (10×15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13×18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18×24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210×297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20×30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24×40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30×40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297×420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Zamyka narzędzie usuwania czerwonych oczu"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Usuwa wszystkie efekty czerwonych oczu na wybranym obszarze"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: 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:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Ekspozycja:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Nasycenie:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Odcień:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Cienie:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#: src/editing_tools/EditingTools.vala:2285
 msgid "Highlights:"
 msgstr "Wyróżnienia:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset Colors"
 msgstr "Przywróć kolory"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset all color adjustments to original"
 msgstr "Przywraca wszystkie dostosowania kolorów do oryginalnych"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2700
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2712
 msgid "Tint"
 msgstr "Odcień"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2724
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2738
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2751
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2764
 msgid "Shadows"
 msgstr "Cienie"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2777
 msgid "Highlights"
 msgstr "Wyróżnienia"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2787
 msgid "Contrast Expansion"
 msgstr "Rozszerzenie kontrastu"
 
@@ -4472,11 +4397,7 @@ msgstr "Kąt:"
 msgid "_Straighten"
 msgstr "_Wyrównaj"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Wydarzenia"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4484,7 +4405,7 @@ msgstr[0] "%d zdjęcie/nagranie wideo"
 msgstr[1] "%d zdjęcia/nagrania wideo"
 msgstr[2] "%d zdjęć/nagrań wideo"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4492,7 +4413,7 @@ msgstr[0] "%d nagranie wideo"
 msgstr[1] "%d nagrania wideo"
 msgstr[2] "%d nagrań wideo"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4504,27 +4425,35 @@ msgstr[2] "%d zdjęć"
 msgid "No Event"
 msgstr "Brak wydarzenia"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Wydarzenia"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Przegląda wydarzenia"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Brak wydarzeń"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nie odnaleziono wydarzeń"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Wszystkie wydarzenia"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Niedatowane"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4564,20 +4493,16 @@ msgstr "Z_astąp wszystkie"
 msgid "Export"
 msgstr "Eksport"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Katalogi"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Kolekcja"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Przegląda strukturę katalogów kolekcji"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Zdjęcia"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Oznaczone flagą"
 
@@ -4598,19 +4523,36 @@ msgstr "Zaimportowano %s"
 msgid "Last Import"
 msgstr "Ostatni import"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Kolekcja"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Przegląda i organizuje zdjęcia"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Zdjęcia"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importowanie z katalogu"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Także podkatalogi"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Opróżnianie kosza…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4624,33 +4566,33 @@ msgstr ""
 "Preferencje</span>.\n"
 "Kontynuować importowanie zdjęć?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Położenie kolekcji"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Nie można importować zdjęć z tego katalogu."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Aktualizowanie kolekcji…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Przygotowywanie do automatycznego zaimportowania zdjęć…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Automatyczne importowanie zdjęć…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Zapisywanie metadanych do plików…"
 
@@ -4666,15 +4608,15 @@ msgstr "Usuwanie…"
 msgid "Trash"
 msgstr "Kosz"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Kosz jest pusty"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Usuwanie zdjęć"
 
@@ -4723,32 +4665,36 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr "Wczytywanie programu Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Ścieżka do prywatnych danych programu Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Bez monitorowania zmian w katalogu kolekcji podczas uruchamiania"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Bez wyświetlania paska postępu uruchamiania"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Wyświetla wersję programu"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Uruchamia program w trybie pełnoekranowym"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[PLIK]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4764,7 +4710,7 @@ msgstr "Nie można przetworzyć aktualizacji monitorowania: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Dopasowuje rozmiar miniatur"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4773,15 +4719,15 @@ msgstr ""
 "Program Shotwell nie może odtworzyć wybranego nagrania wideo:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Brak zdjęć/nagrań wideo"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 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:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Nie można eksportować zdjęć do tego katalogu."
 
@@ -4845,7 +4791,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "zmodyfikowany"
 
@@ -5025,7 +4971,7 @@ msgstr "Przygotowywanie do wysłania"
 #: src/publishing/PublishingPluginHost.vala:12
 #, c-format
 msgid "Uploading %d of %d"
-msgstr "Wysyłanie %d z %d"
+msgstr "Wysyłanie %d. z %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
@@ -5066,37 +5012,37 @@ msgstr "Pobieranie informacji o koncie…"
 msgid "Logging in…"
 msgstr "Logowanie…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish Photos"
 msgstr "Publikacja zdjęć"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish photos _to:"
 msgstr "Publikowanie zdjęć _do:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish Videos"
 msgstr "Publikacja nagrań wideo"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish videos _to"
 msgstr "Publikowanie nagrań wideo _do"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish Photos and Videos"
 msgstr "Publikacja zdjęć i nagrań wideo"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:202
 msgid "Publish photos and videos _to"
 msgstr "Publikowanie zdjęć i nagrań wideo _do"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:412
 msgid "Unable to publish"
 msgstr "Nie można opublikować"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:413
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5733,7 +5679,7 @@ msgstr ""
 "już istnieje."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Zapisane wyszukiwanie"
 
@@ -5741,11 +5687,11 @@ msgstr "Zapisane wyszukiwanie"
 msgid "Delete Search"
 msgstr "Usunięcie wyszukiwania"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Modyfikuj…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Zmień _nazwę…"
 
@@ -5815,7 +5761,7 @@ msgstr "P_rzywróć"
 msgid "Move the selected photos back into the library"
 msgstr "Przenosi wybrane zdjęcia z powrotem do kolekcji"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5831,7 +5777,8 @@ msgstr "Otwiera wybrany katalog zdjęć w menedżerze plików"
 msgid "Unable to open in file manager: %s"
 msgstr "Nie można otworzyć w menedżerze plików: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "_Usuń z kolekcji"
 
@@ -5894,14 +5841,10 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %-d %b %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Pokaz slajdów"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Zapisane wyszukiwania"
-
 #. Ordering must correspond with SearchConditionText.Context
 #: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
@@ -6075,8 +6018,8 @@ msgstr "Stan flagi"
 msgid "Photo state"
 msgstr "Stan zdjęcia"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Ocena"
 
@@ -6084,27 +6027,35 @@ msgstr "Ocena"
 msgid "Date"
 msgstr "Data"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Zapisane wyszukiwania"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organizuje zapisane wyszukiwania"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Ocena ★+"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Ocena ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Ocena ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Ocena ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Ocena ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Błąd podczas wczytywania interfejsu użytkownika paska wyszukiwania: %s"
@@ -6114,72 +6065,72 @@ 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Zamknij"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Nagrania wideo"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Zdjęcia RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Używa zapisanego wyszukiwania do filtrowania elementów w bieżącym widoku"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Ustawienia"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Przechodzi do poprzedniego zdjęcia"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Wstrzymuje pokaz slajdów"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Dalej"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Przechodzi do następnego zdjęcia"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Zmienia ustawienia pokazu slajdów"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Brak wszystkich plików źródłowych zdjęć."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Odtwórz"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Kontynuuje pokaz slajdów"
 
@@ -6191,7 +6142,7 @@ msgstr "Przejścia pokazu slajdów"
 msgid "(None)"
 msgstr "(Brak)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Brak"
 
@@ -6199,16 +6150,20 @@ msgstr "Brak"
 msgid "Random"
 msgstr "Losowe"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Etykiety"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Przegląda i organizuje etykiety zdjęcia"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "bez nazwy"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Eksport nagrań wideo"
 
@@ -6222,10 +6177,6 @@ msgstr "_Przełącz flagę"
 msgid "_Developer"
 msgstr "_Wywoływacz"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "_Otwórz za pomocą zewnętrznego edytora"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6289,7 +6240,7 @@ msgstr "_Zgłoś problem…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Zaimportuj z katalogu…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6367,11 +6318,6 @@ msgstr "Mal_ejąco"
 msgid "Even_ts"
 msgstr "Wy_darzenia"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr "_Usuń z kolekcji"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Tytuły"
@@ -6414,53 +6360,145 @@ msgstr "_Zdjęcia"
 msgid "_Stop Import"
 msgstr "_Zatrzymaj importowanie"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "biały"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "czarny"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Ekran"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Tło:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Importowanie zdjęć do:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Obserwacja katalogu kolekcji pod kątem nowych plików"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Importowanie"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Struktura _katalogów:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Przykład:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "_Zmienianie nazw importowanych plików na małe litery"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadane"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Zapisywanie etykiet, tytułów i innych _metadanych do plików zdjęć"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Wywoływacz RAW"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "_Domyślnie:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Wzór:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Przezroczyste tło:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Szachownica"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Jeden kolor"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "_Zewnętrzny edytor zdjęć:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Zewnętrzny edytor plików _RAW:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Zewnętrzne edytory"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Preferencje"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Rozmiar wydrukowanego obrazu</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "_Standardowy rozmiar:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "_Niestandardowy rozmiar:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "cale"
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "Utrzy_mywanie proporcji zdjęcia"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "Rozmiar _automatyczny:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Tytuły</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Drukowanie _tytułów obrazów"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rozdzielczość w pikselach</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Wyjście zdjęcia na:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "piksele na cal"
 
@@ -6468,11 +6506,11 @@ msgstr "piksele na cal"
 msgid "Set as Desktop Background"
 msgstr "Ustaw jako tło pulpitu"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Użycie na pulpicie"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Użycie na ekranie blokady"
 
@@ -6480,138 +6518,62 @@ msgstr "Użycie na ekranie blokady"
 msgid "Set as Desktop Slideshow"
 msgstr "Ustaw jako pokaz slajdów pulpitu"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Utwórz pokaz slajdów tła pulpitu"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Wyświetlanie każdego zdjęcia przez"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "czas"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 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"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "biały"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "czarny"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Ekran"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Tło:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Importowanie zdjęć do:"
-
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Obserwacja katalogu kolekcji pod kątem nowych plików"
-
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Importowanie"
-
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Struktura _katalogów:"
-
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Przykład:"
-
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "_Zmienianie nazw importowanych plików na małe litery"
-
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metadane"
-
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Zapisywanie etykiet, tytułów i innych _metadanych do plików zdjęć"
-
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Wywoływacz RAW"
-
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "_Domyślnie:"
-
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Wzór:"
-
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "_Zewnętrzny edytor zdjęć:"
-
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Zewnętrzny edytor plików _RAW:"
-
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Zewnętrzne edytory"
-
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: ui/shotwell.ui:590
+#: ui/shotwell.ui:22
 msgid "_Name of search:"
 msgstr "_Nazwa wyszukiwania:"
 
-#: ui/shotwell.ui:644
+#: ui/shotwell.ui:76
 msgid "_Match"
 msgstr "_Dopasowanie"
 
-#: ui/shotwell.ui:671
+#: ui/shotwell.ui:103
 msgid "of the following:"
 msgstr "następujących:"
 
-#: ui/shotwell.ui:752
+#: ui/shotwell.ui:184
 msgid "label"
 msgstr "etykieta"
 
-#: ui/shotwell.ui:903
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nowa _etykieta…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Opóźnienie:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "_Efekt przejścia:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Opóźnienie prz_ejścia:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Wyświetlanie tyt_ułu"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "s"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nowa _etykieta…"
-
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Usuwa wszystkie zdjęcia z kosza"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 19b6345..1ef9823 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f0e90fc..dfa6c37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation of shotwell.
-# Copyright 2017 Software Freedom Conservancy Inc.
+# Copyright 2018 Software Freedom Conservancy Inc.
 # This file is distributed under the same license as the shotwell package.
 # Translators from Transifex (until 2014):
 # Djavan Fagundes <djavan@comum.org>, 2011-2012
@@ -12,14 +12,15 @@
 # Translators from GNOME Translation Project (2014 forward):
 # Felipe Braga <fbobraga@gmail.com>, 2015.
 # Enrico Nicoletto <liverig@gmail.com>, 2016.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2014-2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2014-2018.
+# Isaac Ferreira Filho <isaacmob@riseup.net>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe"
 "ll&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-30 10:05+0000\n"
-"PO-Revision-Date: 2017-04-30 17:11-0200\n"
+"POT-Creation-Date: 2017-12-24 15:23+0000\n"
+"PO-Revision-Date: 2018-01-13 12:23-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"
@@ -30,10 +31,10 @@ msgstr ""
 "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
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
@@ -52,11 +53,11 @@ msgid ""
 "making it easy to experiment and correct errors."
 msgstr ""
 "Shotwell é um organizador de fotos rápido e fácil de usar, projetado para o "
-"ambiente GNOME. Ele permite que você importe fotos de sua câmera ou sue "
+"ambiente GNOME. Ele permite que você importe fotos de sua câmera ou seu "
 "disco, organize-os por data e assunto, e até mesmo avalie-as. Também oferece "
-"edição básica de fotos, como corte, correção de olho vermelho, ajuste de cor "
-"e correções. O editor de fotos não-destrutível do Shotwell não altera suas "
-"fotos mestres, tornando mais fácil experimentar e corrigir erros."
+"edição básica de fotos, como corte, correção de olhos vermelhos, ajuste de "
+"cor e endireitar. O editor de fotos Shotwell não as destrói pois não altera "
+"suas fotos mestres, tornando mais fácil experimentar e corrigir erros."
 
 #: misc/shotwell.appdata.xml.in:18
 msgid ""
@@ -76,16 +77,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr "Os desenvolvedores do Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Organizador de fotos"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organize suas fotos"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -97,15 +98,15 @@ msgstr ""
 "picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Visualizador do Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Visualizador de fotos"
 
@@ -134,7 +135,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "O token secreto para assinar requisições oauth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "tamanho padrão"
 
@@ -162,9 +163,9 @@ msgid "URL of the Rajce server."
 msgstr "URL do servidor Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "nome de usuário"
 
@@ -181,7 +182,7 @@ msgid "user token, if remembered."
 msgstr "token do usuário, se memorizado."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "última categoria"
 
@@ -190,7 +191,7 @@ msgid "The last selected Rajce category."
 msgstr "A última categoria Rajce selecionada."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "tamanho da última foto"
 
@@ -220,21 +221,22 @@ msgstr "Se verdadeiro, oculta o álbum recém-criado no Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:82
 msgid "open album in web browser"
-msgstr "abrir álbum no navegador"
+msgstr "abrir álbum no navegador de internet"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:83
 msgid ""
 "If true, open target album in the web browser just after uploading photos"
-msgstr "Se verdadeiro, abre álbum alvo no navegador só depois de enviar fotos"
+msgstr ""
+"Se verdadeiro, abre o álbum alvo no navegador só depois de enviar fotos"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
-msgstr "remover informações sensíveis das fotos"
+msgstr "remover informações sensíveis dos envios"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:89
 msgid ""
@@ -488,17 +490,35 @@ msgstr "Fixa a barra de ferramentas em tela cheia, ou não."
 
 #: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
-msgstr "cor de fundo"
+msgstr "cor do plano de fundo"
 
 #: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
-msgstr "Uma cor de escala de cinza para usar como cor de fundo."
+msgstr "Uma cor em escala de cinza para usar como plano de fundo."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "plano de fundo para imagens transparentes"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "O plano de fundo a ser usado para imagens transparentes."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "cor para plano de fundo de transparência sólida"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Cor a ser usada se o plano de fundo para imagens transparentes estiver "
+"definido como cor sólida"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Estado de seleção da opção “ocultar fotos”"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -506,30 +526,30 @@ msgstr ""
 "Estado da última seleção usada da opção “ocultar fotos já importadas” na "
 "página de importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "atraso"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Atraso (em segundos) entre fotos na apresentação de slides."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "atraso de transição"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "A hora (em segundos) que uma transição realiza entre fotos em uma "
 "apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "id de efeito de transição"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -537,71 +557,71 @@ msgstr ""
 "O nome do efeito de transição que será usado entre fotos quando apresentando "
 "slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Mostrar título"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Se deve mostrar o título de uma fotos durante a apresentação de slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maximizar janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
-"Verdadeiro se o aplicativo da biblioteca está maximizado. Falso, do "
-"contrário."
+"Verdadeiro se o aplicativo da biblioteca está maximizado; do contrário, "
+"falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "largura da janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "A última largura registrada da janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "altura da janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "A última altura registrada da janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maximizar janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Verdadeiro se o aplicativo de edição direta está maximizado; do contrário, "
 "falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "largura da janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "A última largura registrada da janela do aplicativo de edição direta."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "altura da janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "A última altura registrada da janela do aplicativo de edição direta."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "posição do divisor da barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -609,30 +629,30 @@ msgstr ""
 "A última posição registrada do divisor entre a barra lateral e a visão na "
 "janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importar diretório"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Diretório no qual arquivos de fotos importadas são colocadas."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "monitorar diretório da biblioteca por novos arquivos"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Se verdadeiro, arquivos adicionados ao diretório da biblioteca são "
 "importados automaticamente."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "escrever metadados para arquivos mestres"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -640,11 +660,11 @@ msgstr ""
 "Se verdadeiro, alterações a metadados (etiquetas, títulos, etc.) são "
 "escritos ao arquivo mestre de fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "usar nomes de arquivos em minúsculo"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -652,11 +672,11 @@ msgstr ""
 "Se verdadeiro, Shotwell vai converter todos os nomes de arquivos para "
 "minúsculo ao importar arquivos de fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "padrão de diretório"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -664,11 +684,11 @@ msgstr ""
 "Um texto codificando um padrão de nomes que será usado para nomear "
 "diretórios de fotos na importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "padrão de diretório personalizado"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -676,32 +696,32 @@ msgstr ""
 "Um texto codificando um padrão de nomes personalizado que será usado para "
 "nomear diretórios de fotos na importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "desenvolvedor RAW padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opção padrão para qual desenvolvedor RAW o Shotwell vai usar."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 "Escolha de menu de proporção de aspecto de corte usado mais recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Um código numérico representando a última escolhe do menu de corte feita "
 "pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Numerador da proporção de aspecto personalizado de corte usado mais "
 "recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -709,13 +729,13 @@ msgstr ""
 "Um inteiro positivo não-zero representando uma parte da largura da última "
 "proporção de corte personalizado inserida pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Denominador da proporção de aspecto personalizado de corte usado mais "
 "recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -723,126 +743,126 @@ msgstr ""
 "Um inteiro positivo não-zero representando uma parte da altura da última "
 "proporção de corte personalizado inserida pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "editor de foto externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Aplicativo externo usado para editar fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "editor raw externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Aplicativo externo usado para editar fotos RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Configuração no diálogo de exportação: como aparar imagens"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "exportar metadados"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Configuração no diálogo de exportação: opção para exportar metadados"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "configuração de formatação, valor especial"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Configuração no diálogo de exportação: configuração de formatação, valor "
 "especial"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "configuração de formatação, valor de tipo"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 "Configuração no diálogo de exportação: configuração de formatação, valor de "
 "tipo"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "opção de qualidade JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Configuração no diálogo de exportação: opção de qualidade jpeg"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "tamanho máximo da imagem"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Configuração no diálogo de exportação: tamanho máximo da imagem"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "último serviço de publicação usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Um código numérico representando o último serviço para os quais as fotos "
 "serão publicadas"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "serviço de publicação padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "token de acesso"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Token de Oauth do Facebook para a sessão atualmente autenticada, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "id do usuário"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "id do usuário do Facebook para o usuário atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "nome de usuário"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "O nome do usuário Facebook atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "código de tamanho padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Um código numérico representando o tamanho padrão para fotos publicadas ao "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -850,21 +870,21 @@ msgstr ""
 "Se as imagens sendo enviadas para Facebook devem possuir seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Token de fase de acesso Oauth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "O token de autorização para o usuário Flickr atualmente autenticado, se "
 "houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Segredo de token de fase de acesso Oauth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -872,22 +892,22 @@ msgstr ""
 "O segredo criptográfico usado para assinar requisições com o token de "
 "autorização para o usuário Flickr atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "O nome do usuário Flickr atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Um código numérico representando o tamanho padrão para fotos publicadas ao "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "visibilidade padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -895,7 +915,7 @@ msgstr ""
 "Um código numérico representando o visibilidade padrão para fotos publicadas "
 "ao Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
@@ -903,12 +923,12 @@ msgstr ""
 "Se as imagens sendo enviadas para Flickr devem possuir seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "atualizar token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -916,7 +936,7 @@ msgstr ""
 "O token Oauth usado para atualizar a sessão do Picasa Web Albums para o "
 "usuário atualmente autenticado, se houver."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -924,17 +944,17 @@ msgstr ""
 "um código numérico representando o tamanho padrão para fotos enviadas ao "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "último álbum"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "O nome do último álbum para o qual o usuário publicou fotos, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
@@ -942,47 +962,47 @@ msgstr ""
 "Se imagens sendo enviadas para o Picasa devem ter primeiro seus metadados "
 "removidos"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "URL do Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "URL do servidor Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Nome de usuário Piwigo, se autenticado."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "senha"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Senha Piwigo, se autenticado."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "memorizar senha"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Se verdadeiro, memoria a senha Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "A última categoria Piwigo selecionada."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "último nível de permissão"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "O último nível de permissão escolhido do Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -990,7 +1010,7 @@ msgstr ""
 "Um código numérico representando a predefinição de tamanho da última foto "
 "usada ao publicar para Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
@@ -998,14 +1018,14 @@ msgstr ""
 "Se imagens sendo enviadas para o Piwigo devem ter primeiro seus metadados "
 "removidos"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "se um título for definido e comentário não, use título como comentário para "
 "envios ao Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -1013,11 +1033,11 @@ msgstr ""
 "Se imagens sendo enviadas para Piwigo devem ter seus comentário definido do "
 "título, se título estiver definido e comentário não"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "não enviar etiquetas ao enviar para o Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1026,27 +1046,27 @@ msgstr ""
 "envio, de forma que essas etiquetas não vão aparecer no servidor remoto do "
 "Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Nome de usuário Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "Chave de API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Chave de API Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "URL do site Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1054,19 +1074,19 @@ msgstr ""
 "Indica se as imagens sendo enviadas para Gallery3 devem ter seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "restrição de dimensionamento de imagem enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "O ID de restrição de dimensionamento da imagem a ser enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "pixels do eixo maior da imagem enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1074,7 +1094,7 @@ msgstr ""
 "Os pixels do eixo maior da imagem a ser enviada; usado apenas se scaling-"
 "constraint-id for um valor apropriado"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1082,32 +1102,32 @@ msgstr ""
 "O token Oauth usado para atualizar a sessão do YouTube para o usuário "
 "atualmente autenticado, se houver."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "último serviço de importação usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Um código numérico representando o último serviço por meio do qual fotos "
 "foram importadas"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "interpretar cookie de estado"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Um código de numérico que captura o estado do ambiente do plug-in GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "modo de layout do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1115,37 +1135,37 @@ msgstr ""
 "Um código numérico que descreve como fotos são posicionadas na página "
 "durante a impressão"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppi do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 "O número de pixels por polegada (ppi) enviado para a impressora durante a "
 "impressão"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "largura do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "A largura da emulsão impressa na página ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "altura do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "A altura da emulsão impressa na página ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "unidades do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1153,11 +1173,11 @@ msgstr ""
 "Um código numérico representando unidade de medida (polegadas ou "
 "centímetros) usada ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "imagens por código de página"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1165,22 +1185,22 @@ msgstr ""
 "Um código numérico representando as imagens atualmente selecionadas para "
 "modo de página usada ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "seleção de tamanho"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "O índice do tamanho de impressão atual em uma lista predefinida dos tamanhos "
 "padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "correspondência de proporção de aspecto"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1188,11 +1208,11 @@ msgstr ""
 "Determina se tamanhos de impressão personalizados devem corresponder à "
 "proporção de aspecto da foto original"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "imprimir títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1200,219 +1220,219 @@ msgstr ""
 "Verdadeiro se o título de uma foto deveria ser impresso quando a foto é "
 "impressa; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "fonte dos títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "O nome da fonte usada para títulos de fotos quando elas são impressas."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "habilitar plug-in de publicação no facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Facebook está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "habilitar plug-in de publicação no flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Flickr está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "habilitar plug-in de publicação no picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Picasa Web Albums está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "habilitar plug-in de publicação no youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no YouTube está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "habilitar plug-in de publicação no piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Piwigo está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "habilitar plug-in de publicação no yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Yandex.Fotki está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "habilitar plug-in de publicação no tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Tumblr está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "habilitar plug-in de publicação no rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Rajce está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "habilitar plug-in de publicação no gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Gallery3 está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "habilitar plug-in de importação do F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de importação do F-Spot está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "habilitar transição de desmoronar de apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de desmoronamento de apresentação de "
 "slides está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "habilitar transição de esmaecer de apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de esmaecimento de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "habilitar transição de deslizar de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de deslizamento de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "habilitar transição de relógio de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Relógio de apresentação de slides está "
 "habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
-msgstr "habilitar transição circular de apresentações de slides"
+msgstr "habilitar transição de círculo de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
-"Verdadeiro se plug-in de transição de círculos de apresentação de slides "
-"está habilitado; do contrário, falso"
+"Verdadeiro se plug-in de transição de círculo de apresentação de slides está "
+"habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "habilitar transição de círculos de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
-"Verdadeiro se plug-in de transição de Círculos de apresentação de slides "
+"Verdadeiro se plug-in de transição de círculos de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
-msgstr "habilitar transição de enscurecimento de apresentações de slides"
+msgstr "habilitar transição de escurecimento de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de escurecimento de apresentação de "
 "slides está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "habilitar transição de quadrado de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Quadrados de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "habilitar transição de listras de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Listras de apresentação de slides está "
 "habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "habilitar transição de xadrez de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1447,24 +1467,7 @@ msgstr ""
 "Para continuar publicando no Facebook, encerre e abra novamente o Shotwell, "
 "e então tente publicar novamente."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Insira o número de confirmação que apareceu depois que você efetuou login no "
-"Flickr no navegador de internet."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Número de autorização:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Con_tinuar"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1476,20 +1479,15 @@ msgstr ""
 "Clique em Autenticar para entrar no Flickr no seu navegador de internet. "
 "Você terá que autorizar o Shotwell para conectar a sua conta do Flickr."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Preparando para iniciar sessão…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"O arquivo necessário para a publicação não está disponível. A publicação "
-"para o Flickr não pode continuar."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Falha de autorização no Flickr"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Verificando autorização…"
 
@@ -1507,7 +1505,7 @@ msgstr ""
 "Para continuar a publicação para serviços do Google, saia e reinicie o "
 "Shotwell e, então, tente publicar novamente."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1519,7 +1517,7 @@ msgstr ""
 "Clique em Autenticar para entrar no Picasa Web Albums em seu navegador. Você "
 "terá que autorizar a conexão do Shotwell à sua conta Picasa Web Albums."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1533,11 +1531,51 @@ msgstr ""
 "de continuar. Você pode configurar sua conta usando seu navegador para "
 "entrar no site do Youtube."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_Endereço de e-mail"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Senha"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Autenticar"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Digite o nome de usuário e senha associados à sua conta Tumblr."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Nome de usuário e/ou senha inválida. Por favor, tente novamente"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Usuário ou senha inválida"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Não foi possível carregar a UI: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Visitar o site do Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
@@ -1548,16 +1586,17 @@ msgstr ""
 "Samuel Raffo <samuelrafo@gmail.com>\n"
 "Glaucia Cintra <gcintra@redhat.com>\n"
 "Rafael Fontenelle <rafaelff@gnome.org>\n"
-"Felipe Braga <fbobraga@gmail.com>"
+"Felipe Braga <fbobraga@gmail.com>\n"
+"Enrico Nicoletto <liverig@gmail.com>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 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
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1566,14 +1605,14 @@ msgstr ""
 "data no calendário de seu computador."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 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."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1581,7 +1620,7 @@ msgstr ""
 "corrompida."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1590,7 +1629,7 @@ msgstr ""
 "emitiu."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1599,7 +1638,7 @@ msgstr ""
 "codificação muito fraca."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1607,107 +1646,11 @@ msgstr ""
 "⚫ 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
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Um arquivo temporário necessário para a publicação não está disponível"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Bem-vindo ao serviço de importação de biblioteca F-Spot .\n"
-"\n"
-"Por favor, selecione uma biblioteca para importação, selecionando uma das "
-"bibliotecas existentes encontrados pelo Shotwell ou selecionando um arquivo "
-"de banco de dados alternativo F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Bem vindo ao serviço de importação de biblioteca do F-Spot.\n"
-"\n"
-"Por favor selecione um banco de dados do F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Selecionar manualmente um banco de dados do F-Spot para importar:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Não é possível abrir o arquivo de banco de dados F-Spot selecionado: o "
-"arquivo não existe ou não é um banco de dados F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Não é possível abrir o arquivo de banco de dados F-Spot selecionado: esta "
-"versão do banco de dados F-Spot não é suportado pelo Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Não é possível ler o arquivo de banco de dados F-Spot selecionado: Erro ao "
-"ler tabela etiquetas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Não é possível ler o arquivo de banco de dados F-Spot selecionado: Erro ao "
-"ler tabela de fotos"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell encontrou %d fotos na biblioteca F-Spot e está atualmente a importá-"
-"los. Duplicatas serão automaticamente detectadas e removidas.\n"
-"\n"
-"Você pode fechar este diálogo e começar a usar o Shotwell enquanto a "
-"importação é feita em segundo plano."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Biblioteca F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Preparando para importar"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Núcleo serviços de importação de dados"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "URL de _Gallery3:"
@@ -1725,7 +1668,7 @@ msgid "Go _Back"
 msgstr "_Voltar"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "A_utenticar"
 
@@ -1760,7 +1703,7 @@ msgid "pixels"
 msgstr "pixels"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1768,17 +1711,17 @@ msgstr "Tamanho original"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Largura ou altura"
+msgid "Longest edge"
+msgstr "Borda longa"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Sair"
@@ -1786,11 +1729,11 @@ 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1889,31 +1832,11 @@ msgstr "Usuário não reconhecido"
 msgid " Site Not Found"
 msgstr " Site não encontrado"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: 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:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Lemb_rar"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1966,80 +1889,10 @@ msgstr "Você está autenticado no Rajce como %s."
 msgid "Photos will appear in:"
 msgstr "As fotos irão aparecer em:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Serviços extras de publicação do Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: 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:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: 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:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 pixels"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 pixels"
-
-#: 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” não é uma resposta válida para o pedido de autenticação OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): não pode iniciar, o editor não é reiniciável."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Digite o nome de usuário e senha associados à sua conta Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Nome de usuário e/ou senha inválida. Por favor, tente novamente"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Usuário ou senha inválida"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Não foi possível carregar a interface gráfica: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Você está autenticado no Tumblr como %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2109,6 +1962,14 @@ msgstr ""
 "_Remover localização, câmera e outras informações identificadoras antes de "
 "enviar"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2149,17 +2010,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Onde você gostaria de publicar as fotos selecionadas?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Somente para mim"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Todos"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Tamanho da _foto:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"O arquivo necessário para a publicação não está disponível. A publicação "
+"para o Flickr não pode continuar."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2168,7 +2042,7 @@ msgstr ""
 "Você está autenticado no Flickr como %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2177,40 +2051,52 @@ msgstr ""
 "Sua conta gratuita do Flickr limita quantos dados você pode enviar por mês.\n"
 "Este mês, ainda há %s na sua cota de envio."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 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:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Vídeos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotos e vídeos _visíveis para:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Somente amigos e família"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Somente família"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Somente amigos"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pixels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 pixels"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixels"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixels"
@@ -2262,7 +2148,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixels)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Tamanho original"
 
@@ -2348,7 +2234,8 @@ msgid "Certificate of %s"
 msgstr "Certificado de %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2398,12 +2285,39 @@ msgstr "Mostrar o certificado…"
 
 #: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
 msgid "I understand, please _proceed."
-msgstr "Eu entendo, por favor prosseguir."
+msgstr "Eu entendo, por favor _prossiga."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Principais serviços de publicação"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogs:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 pixels"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): não pode iniciar, o editor não é reiniciável."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Você está autenticado no Tumblr como %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "De_finições de privacidade de vídeo:"
@@ -2528,16 +2442,17 @@ msgstr "Fixar a barra de ferramentas aberta"
 msgid "Leave fullscreen"
 msgstr "Sai da tela cheia"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:302 src/publishing/PublishingUI.vala:526
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2550,27 +2465,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – “Aachen”"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Visitar o página web do Shotwell"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Não foi possível exibir a ajuda: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, 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:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Não foi possível exibir FAQ: %s"
@@ -2636,17 +2545,27 @@ msgstr "Arquivo de imagem corrompido"
 msgid "Imported failed (%d)"
 msgstr "A importação falhou (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Câmeras"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Lista de todos os dispositivos de câmera encontrados"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Câmera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2659,32 +2578,32 @@ msgstr ""
 "gerenciador de arquivos."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Ocultar fotos já importadas"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Somente exibir fotos que não foram importadas"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importar _selecionadas"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importar _todas"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 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:861
+#: src/camera/ImportPage.vala:854
 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:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2692,15 +2611,15 @@ msgstr ""
 "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-la. "
 "Continuar?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Por favor, desmonte a câmera."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2708,14 +2627,14 @@ msgid ""
 msgstr ""
 "A câmera está travada por outro aplicativo. O Shotwell somente pode acessar "
 "a câmera quando ela está destravada. Por favor, feche qualquer outro "
-"aplicativo que estiver usando a câmera e tente novamente."
+"aplicativo que esteja usando a câmera e tente novamente."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 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:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2724,65 +2643,69 @@ msgstr ""
 "Não foi possível obter pré-visualizações da câmera:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Desmontando…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Conexão com a câmera, por favor aguarde…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Iniciando importação, por favor, aguarde…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Obtendo informação da foto"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obtendo visualização para %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Não foi possível travar a câmera: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, 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:1739
+#: src/camera/ImportPage.vala:1759
 #, 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:1742
+#: src/camera/ImportPage.vala:1762
 #, 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:1745
+#: src/camera/ImportPage.vala:1765
 #, 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:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Manter"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Excluindo fotos/vídeos da câmera"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2795,7 +2718,7 @@ msgid "_Print"
 msgstr "Im_primir"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Enviar _para…"
 
@@ -2837,13 +2760,13 @@ msgid "Flip Verti_cally"
 msgstr "Inverter verti_calmente"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Melhorar"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "Re_verter para o original"
@@ -2860,12 +2783,13 @@ msgstr "C_olar ajustes de cor"
 msgid "Adjust Date and Time…"
 msgstr "Ajustar a data e hora…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "Abrir com o editor e_xterno"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Abrir com editor de RA_W"
 
@@ -2873,43 +2797,39 @@ msgstr "Abrir com editor de RA_W"
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Exportar foto/vídeo"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Exportar fotos/vídeos"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Exportar foto/vídeo"
+msgstr[1] "Exportar fotos/vídeos"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Exportar fotos"
+msgid_plural "Export Photos"
+msgstr[0] "Exportar foto"
+msgstr[1] "Exportar fotos"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Exportar fotos"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Girando"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Desfazendo rotação"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Invertendo horizontalmente"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Desfazendo inversão horizontal"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Invertendo verticalmente"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Desfazendo inversão vertical"
 
@@ -3123,19 +3043,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Arquivo de banco de dados:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "Parar _importação"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Importação de aplicativo"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Impo_rtação de mídia de:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:521
 msgid "_Close"
 msgstr "Fe_char"
 
@@ -3190,7 +3110,7 @@ msgstr "Enviar para"
 #: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
-msgstr "Não foi possível exportar em segundo plano %s: %s"
+msgstr "Não foi possível exportar o plano de fundo para %s: %s"
 
 #: src/DesktopIntegration.vala:311
 #, c-format
@@ -3205,9 +3125,9 @@ 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:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Apagar"
@@ -3239,6 +3159,10 @@ msgstr "_Mudar Desenvolvedor"
 msgid "Export Video"
 msgstr "Exportar vídeo"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Exportar fotos"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3271,63 +3195,35 @@ msgstr ""
 "\n"
 "Você deseja continuar exportando?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Não modificado"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Atual"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Formato:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Qualidade:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "Re_strição de dimensionamento:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Pixels:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "Exportar _metadados:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Con_tinuar"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Salvar detalhes…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Salvar Detalhes"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(e %d outras)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Importar Formulários de Resultados"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Tentada a importação de %d arquivo."
 msgstr[1] "Tentada a importação de %d arquivos."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3337,30 +3233,30 @@ msgstr[1] "Dessa tentativa, %d arquivos foram importados com sucesso."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplicar Fotos/Vídeos Não importados:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "duplica itens de mídia existentes"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "As Fotos/Vídeos não forma Importadas devido à erros com a Câmera:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "mensagem de erro:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Arquivos não foram importados porque não foram reconhecidos como Fotos ou "
@@ -3369,7 +3265,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3380,7 +3276,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3388,7 +3284,7 @@ msgstr ""
 "As Fotos/Vídeos não foram importadas pois o Shotwell não pôde copiá-las para "
 "sua Biblioteca:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3400,39 +3296,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotos/Vídeos não importados porque os arquivos estão corrompidos:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "As Fotos/Vídeos não foram importadas por outras razões:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 foto duplicada não foi importada:\n"
 msgstr[1] "%d fotos duplicadas não foram importadas:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 vídeo duplicado não foi importado:\n"
 msgstr[1] "%d vídeos duplicados não foram importados:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 foto/vídeo duplicado não foi importado:\n"
 msgstr[1] "%d fotos/vídeos duplicados não foram importados:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3442,7 +3338,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas, ocorreu um erro de arquivo ou de "
 "hardware:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3452,7 +3348,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3464,7 +3360,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3474,7 +3370,7 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3488,7 +3384,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3502,7 +3398,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3517,7 +3413,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados pelo fato da pasta de "
 "biblioteca de fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3531,14 +3427,14 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "1 foto falhou ao ser importada, ocorreu um erro de câmera:\n"
 msgstr[1] "%d fotos falharam ao serem importadas, ocorreu um erro de câmera:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3546,7 +3442,7 @@ msgstr[0] "1 vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3554,7 +3450,7 @@ msgstr[0] "1 foto/vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3562,21 +3458,21 @@ msgstr[0] "1 arquivo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 foto falhou na importação porque estava corrompida:\n"
 msgstr[1] "%d fotos falharam na importação porque estavam corrompidas:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 vídeo falhou na importação porque estava corrompido:\n"
 msgstr[1] "%d vídeos falharam na importação porque estavam corrompidos:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3584,7 +3480,7 @@ msgstr[0] "1 foto/vídeo falhou na importação porque estava corrompido(a):\n"
 msgstr[1] ""
 "%d vídeos/fotos falharam na importação porque estavam corrompidos:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3595,7 +3491,7 @@ msgstr[1] "%d arquivos falharam na importação porque estavam corrompidos:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3604,56 +3500,56 @@ msgstr[1] "%d fotos sem suporte foram puladas:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Pulando um arquivo não-imagem.\n"
 msgstr[1] "Pulando %d arquivos não-imagem.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "1 foto pulada pelo cancelamento do usuário:\n"
 msgstr[1] "%d fotos puladas pelo cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d vídeos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "1 foto/vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d fotos/vídeos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 arquivo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d arquivos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 foto foi importada com sucesso.\n"
 msgstr[1] "%d fotos foram importadas com sucesso.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 vídeo importado com sucesso.\n"
 msgstr[1] "%d vídeos importados com sucesso.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3662,89 +3558,64 @@ msgstr[1] "%d fotos/vídeos importados com sucesso.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Sem fotos ou vídeos importados.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Importação concluída"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutes"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 dia"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Renomear evento"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Nome:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Editar título"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Título:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Editar comentário de evento"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Editar comentário de foto/vídeo"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 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:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Remover da biblioteca"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Reverter edição externa?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Reverter edições externas?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3756,125 +3627,34 @@ msgstr[1] ""
 "Isto irá destruir todas as alterações feitas para %d arquivos externos. "
 "Continuar?"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "Re_verter edição externa"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "Re_verter edições externas"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "AM"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "PM"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 Hr"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "De_slocar fotos/vídeos pelo mesmo montante"
-
-#: 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: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:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Modificar original"
-msgstr[1] "_Modificar originais"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Original: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %I:%M:%S %p"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-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:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-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:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dia"
-msgstr[1] "dias"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3893,91 +3673,13 @@ msgstr[1] ""
 "\n"
 "e %d outras."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Etiquetas (separadas por vírgulas):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Bem-vindo!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Bem-vindo ao Shotwell!"
-
-#: 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: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:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Arraste e solte fotos para dentro da janela do Shotwell"
-
-#: 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:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importar fotos de seu diretório %s"
-
-#: 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:2152
-msgid "_Don’t show this message again"
-msgstr "_Não mostrar esta mensagem novamente"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Ajuda)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Ano%sMês%sDia"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Ano%sMês"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Ano%sMês-Dia"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Ano-Mês-Dia"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Personalizar"
-
-#. Invalid pattern.
-#: 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3985,31 +3687,31 @@ msgstr ""
 "Shotwell pode copiar as fotos na sua pasta de biblioteca ou pode importá-los "
 "sem copiar."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "Co_piar fotos"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "_Importar no local"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Importar para a biblioteca"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Remover da biblioteca"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4032,7 +3734,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4055,7 +3757,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4078,7 +3780,7 @@ msgstr[1] ""
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4090,7 +3792,7 @@ 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:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4130,6 +3832,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Não foi possível abrir a foto %s. Desculpe-me."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -4156,206 +3859,434 @@ msgid "Save As"
 msgstr "Salvar como"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 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:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "AM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PM"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 Hr"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "De_slocar fotos/vídeos pelo mesmo montante"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Definir tod_as fotos/vídeos para a mesma hora"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+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/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Modificar original"
+msgstr[1] "_Modificar originais"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Original: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d/%m/%Y, %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d/%m/%Y, %I:%M:%S %p"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"O tempo de exposição irá ser mudado para frente, por\n"
+"%d %s, %d %s, %d %s, e %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+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/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dias"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segundo"
+msgstr[1] "segundos"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Não modificado"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Atual"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Formato:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Qualidade:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "Re_strição de dimensionamento:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Pixels:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Exportar _metadados:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Ajuda)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Ano%sMês%sDia"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Ano%sMês"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Ano%sMês-Dia"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Ano-Mês-Dia"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Personalizar"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Padrão inválido"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutes"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 dia"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Bem-vindo!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Bem-vindo ao Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Para iniciar, importe fotos de alguma destas formas:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, 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/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Arraste e solte fotos para dentro da janela do Shotwell"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Conectar uma câmera no seu computador e importe"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Importar fotos de seu diretório %s"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Você também pode importar fotos de alguma destas formas:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Não mostrar esta mensagem novamente"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Importar fotos de sua biblioteca %s"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Retornar a foto para as dimensões atuais"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Definir o corte para esta foto"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 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:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Sem restrições"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Quadrado"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Tela"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD Video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD Video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Carteira (2 × 3 pol.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Cartão de notas (3 × 5 pol.)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 pol."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 pol."
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 pol."
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Carta (8.5 × 11 pol.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 pol."
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloide (11 × 17 pol.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 pol."
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Carteira métrica (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Cartão postal (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Fechar ferramenta de olhos vermelhos"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 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:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: 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:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Exposição:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Contraste:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Saturação:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Colorir:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Sombras:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Destaques:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Reiniciar cores"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Reiniciar todos os ajustes de cores para o original"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Colorir"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Saturação"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Exposição"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Sombras"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Destaques"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Expansão de contraste"
 
@@ -4368,25 +4299,21 @@ msgstr "Ângulo:"
 msgid "_Straighten"
 msgstr "En_direitar"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Eventos"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 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:358
+#: src/events/EventDirectoryItem.vala:99 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:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4397,27 +4324,35 @@ msgstr[1] "%d fotos"
 msgid "No Event"
 msgstr "Nenhum Evento"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Eventos"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Navegue pelos seus eventos"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Sem eventos"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Sem eventos encontrados"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Todos eventos"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Sem data"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4457,20 +4392,16 @@ msgstr "Sobrescrever _todas"
 msgid "Export"
 msgstr "Exportar"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Pastas"
 
-#: 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:1083
-msgid "Photos"
-msgstr "Fotos"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Navegue na estrutura de pasta da biblioteca"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Marcadas"
 
@@ -4491,19 +4422,36 @@ msgstr "Importado %s"
 msgid "Last Import"
 msgstr "Última importação"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Biblioteca"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organize e navegue por suas fotos"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotos"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importa da pasta"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Recursividade em subpastas"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Esvaziando lixeira…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4516,33 +4464,33 @@ msgstr ""
 "%s</span>.\n"
 "Você deseja continuar a importação de fotos?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Localização da biblioteca"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotos não podem ser importadas deste diretório."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Atualizando biblioteca…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Preparando para auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Escrevendo metadados para arquivos…"
 
@@ -4558,15 +4506,15 @@ msgstr "Excluindo…"
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "A lixeira está vazia"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Apagando fotos"
 
@@ -4614,34 +4562,38 @@ msgstr "Erro desconhecido ao tentar verificar o banco de dados do Shotwell: %s"
 msgid "Loading Shotwell"
 msgstr "Carregando Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Caminho para os dados privados do Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIRETÓRIO"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 "Não monitora o diretório da biblioteca durante o tempo de execução para "
 "mudanças"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Não exibe a medida do progresso de inicialização"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Mostra a versão do aplicativo"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Inicia o aplicativo em modo tela cheia"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[ARQUIVO]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4657,7 +4609,7 @@ msgstr "Não foi possível processar as atualizações monitoradas: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Ajustar o tamanho das miniaturas"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4666,15 +4618,15 @@ msgstr ""
 "Shotwell foi incapaz de reproduzir o vídeo selecionado:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Sem fotos/vídeos"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 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:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos não podem ser exportadas para este diretório."
 
@@ -4738,7 +4690,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "modificado"
 
@@ -4906,7 +4858,7 @@ msgstr "Copyright:"
 msgid "Software:"
 msgstr "Software:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Informações estendidas"
 
@@ -4954,37 +4906,37 @@ msgstr "Obtendo informação da conta…"
 msgid "Logging in…"
 msgstr "Autenticando…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish Photos"
 msgstr "Publicar fotos"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish photos _to:"
 msgstr "Publicar fotos pa_ra:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Videos"
 msgstr "Publicar vídeos"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish videos _to"
 msgstr "Publicar vídeos pa_ra"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Photos and Videos"
 msgstr "Publicar fotos e vídeos"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish photos and videos _to"
 msgstr "Publicar fotos e vídeos pa_ra"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:411
 msgid "Unable to publish"
 msgstr "Não é possível publicar"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:412
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5029,9 +4981,10 @@ msgstr "Inverter horizontalmente"
 msgid "Flip Vertically"
 msgstr "Inverter verticalmente"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "S_obre"
 
@@ -5054,11 +5007,11 @@ msgstr "A_vançar"
 msgid "Fulls_creen"
 msgstr "Tela _cheia"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "A_juda"
@@ -5220,7 +5173,7 @@ msgstr "Reverter para a foto mestre"
 #: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr ""
-"Definir a imagem selecionada como um novo plano de fundo da área de trabalho"
+"Definir a imagem selecionada como novo plano de fundo da área de trabalho"
 
 #: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
@@ -5475,7 +5428,7 @@ msgid "Adjust Date and Time"
 msgstr "Ajustar a data e hora"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Adicionar e_tiquetas…"
 
@@ -5567,7 +5520,7 @@ msgid "_Rename…"
 msgstr "_Renomear…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "_Modificar etiquetas…"
 
@@ -5618,7 +5571,7 @@ msgstr ""
 "existir."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Pesquisa salva"
 
@@ -5626,11 +5579,11 @@ msgstr "Pesquisa salva"
 msgid "Delete Search"
 msgstr "Apagar pesquisa"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Editar…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Re_nomear…"
 
@@ -5700,7 +5653,7 @@ msgstr "_Restaurar"
 msgid "Move the selected photos back into the library"
 msgstr "Mover as fotos selecionadas para a biblioteca"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5716,7 +5669,8 @@ msgstr "Abre o diretório da foto selecionada no gerenciador de arquivos"
 msgid "Unable to open in file manager: %s"
 msgstr "Não foi possível abrir no gerenciador de arquivos: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "R_emover da biblioteca"
 
@@ -5779,151 +5733,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Apresentação de slides"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Pesquisas salvas"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "contém"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "é exatamente"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "inicia com"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "termina com"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "não contém"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "não está definido"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "está definido"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "é"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "não é"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "qualquer foto"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "uma foto raw"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "um vídeo"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "tem"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "não tem"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "modificações"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "modificações internas"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "modificações externas"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "marcada"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "não marcada"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "e maior"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "somente"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "e baixo"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "é depois"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "é antes"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "é entre"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "e"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Pesquisa"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "OK"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "qualquer"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "todos"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "nenhum"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Qualquer texto"
@@ -5960,8 +5886,8 @@ msgstr "Marcada"
 msgid "Photo state"
 msgstr "Estado da foto"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Avaliação"
 
@@ -5969,27 +5895,35 @@ msgstr "Avaliação"
 msgid "Date"
 msgstr "Data"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Pesquisas salvas"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organize suas pesquisas salvas"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ Avaliação"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ Avaliação"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ Avaliação"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ Avaliação"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Avaliação"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Erro ao carregar barra de pesquisa de UI: %s"
@@ -5999,71 +5933,71 @@ 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Fechar"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Tipo"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Vídeos"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Fotos RAW"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Use uma pesquisa salva para filtrar itens na visão atual"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Configurações"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Voltar"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Ir para a foto anterior"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pausar"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pausar apresentação de slides"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Próxima"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Ir para a próxima foto"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Configurações"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Alterar configuração da apresentação de slides"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Faltam arquivos fonte de todas as fotos."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Reproduzir"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Continuar a apresentação de slides"
 
@@ -6075,7 +6009,7 @@ msgstr "Transição de apresentação de slides"
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Nenhum"
 
@@ -6083,16 +6017,20 @@ msgstr "Nenhum"
 msgid "Random"
 msgstr "Aleatório"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Etiquetas"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organize e navegue por suas etiquetas de fotos"
+
 #: src/Tag.vala:830
 msgid "untitled"
-msgstr "Sem título"
+msgstr "sem título"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Exportar vídeos"
 
@@ -6102,14 +6040,10 @@ msgid "Toggle _Flag"
 msgstr "Alternar _marca"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Desenvolvedor"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Abrir com editor e_xterno"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6159,21 +6093,21 @@ msgstr "Próxi_ma foto"
 msgid "T_ools"
 msgstr "F_erramentas"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "Perguntas _frequentes (FAQ)"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Relate um problema…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Importar da pasta…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6251,17 +6185,12 @@ msgstr "D_escendente"
 msgid "Even_ts"
 msgstr "Even_tos"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr "R_emover da biblioteca"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Títulos"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "Eti_quetas"
 
@@ -6298,65 +6227,193 @@ msgstr "_Fotos"
 msgid "_Stop Import"
 msgstr "Pa_rar importação"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "branco"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "preto"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Exibição"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Plano de fundo:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Importar fotos para:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Monitorar diretório da biblioteca por novos arquivos"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Importando"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Estrutura de _diretório:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Exemplo:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "R_enomear arquivos importados para letra minúscula"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadados"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Gravar etiquetas, títulos e outros _metadados para arquivos de fotos"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Desenvolvedor RAW"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "Pa_drão:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Padrão:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Plano de fundo transparente:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Quadriculado"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Cor sólida"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "Editor de foto e_xterno:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Editor _RAW externo:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Editores externos"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Preferências do Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Tamanho da imagem impressa</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Usar um taman_ho padrão:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Usar um tamanho _personalizado:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "pol."
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Correspondência de proporção de aspecto da foto"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "Tamanho _automático:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Títulos</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Imprimir _título da imagem"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Resolução em pixel</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Saída da foto em:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "pixels por polegada"
 
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Pesquisa"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "OK"
+
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "_Nome da pesquisa:"
+
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "Co_mbinação"
+
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "qualquer"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "todos"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "nenhum"
+
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "do seguinte:"
+
 #: 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:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Usar para área de trabalho"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Usar para tela de bloqueio"
 
@@ -6364,142 +6421,154 @@ msgstr "Usar para tela de bloqueio"
 msgid "Set as Desktop Slideshow"
 msgstr "Definir apresentação de slides da área de trabalho"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 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
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Exibe cada foto para"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "período de tempo"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 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:65
-msgid "white"
-msgstr "branco"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "preto"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Exibição"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Plano de fundo:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Importar fotos para:"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova etique_ta…"
 
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Monitorar diretório da biblioteca por novos arquivos"
+#: ui/slideshow_settings.ui:91
+msgid "_Delay:"
+msgstr "A_traso:"
 
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Importando"
+#: ui/slideshow_settings.ui:105
+msgid "_Transition effect:"
+msgstr "Efeito de _transição:"
 
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Estrutura de _diretório:"
+#: ui/slideshow_settings.ui:119
+msgid "Transition d_elay:"
+msgstr "A_traso de transição:"
 
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Exemplo:"
+#: ui/slideshow_settings.ui:129
+msgid "Show t_itle"
+msgstr "Mostrar títul_o"
 
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "R_enomear arquivos importados para letra minúscula"
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
+msgid "seconds"
+msgstr "segundos"
 
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metadados"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "rótulo"
 
-#: 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/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Apaga todas as fotos na lixeira"
 
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Desenvolvedor RAW"
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Insira o número de confirmação que apareceu depois que você efetuou login "
+#~ "no Flickr no navegador de internet."
 
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "Pa_drão:"
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Número de autorização:"
 
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Padrão:"
+#~ msgid "Width or height"
+#~ msgstr "Largura ou altura"
 
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "Editor de foto e_xterno:"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "“%s” não é uma resposta válida para o pedido de autenticação OAuth"
 
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Editor _RAW externo:"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Exportar fotos/vídeos"
 
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Editores externos"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Abrir com editor e_xterno"
 
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Plug-ins"
+#~ msgid "R_emove from Library"
+#~ msgstr "R_emover da biblioteca"
 
-#: ui/shotwell.ui:590
-msgid "_Name of search:"
-msgstr "_Nome da pesquisa:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Bem-vindo ao serviço de importação de biblioteca F-Spot .\n"
+#~ "\n"
+#~ "Por favor, selecione uma biblioteca para importação, selecionando uma das "
+#~ "bibliotecas existentes encontrados pelo Shotwell ou selecionando um "
+#~ "arquivo de banco de dados alternativo F-Spot."
 
-#: ui/shotwell.ui:644
-msgid "_Match"
-msgstr "Co_mbinação"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Bem vindo ao serviço de importação de biblioteca do F-Spot.\n"
+#~ "\n"
+#~ "Por favor selecione um banco de dados do F-Spot."
 
-#: ui/shotwell.ui:671
-msgid "of the following:"
-msgstr "do seguinte:"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Selecionar manualmente um banco de dados do F-Spot para importar:"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "rótulo"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Não é possível abrir o arquivo de banco de dados F-Spot selecionado: o "
+#~ "arquivo não existe ou não é um banco de dados F-Spot"
 
-#: ui/shotwell.ui:903
-msgid "_Delay:"
-msgstr "A_traso:"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Não é possível abrir o arquivo de banco de dados F-Spot selecionado: esta "
+#~ "versão do banco de dados F-Spot não é suportado pelo Shotwell"
 
-#: ui/shotwell.ui:917
-msgid "_Transition effect:"
-msgstr "Efeito de _transição:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Não é possível ler o arquivo de banco de dados F-Spot selecionado: Erro "
+#~ "ao ler tabela etiquetas"
 
-#: ui/shotwell.ui:931
-msgid "Transition d_elay:"
-msgstr "A_traso de transição:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Não é possível ler o arquivo de banco de dados F-Spot selecionado: Erro "
+#~ "ao ler tabela de fotos"
 
-#: ui/shotwell.ui:941
-msgid "Show t_itle"
-msgstr "Mostrar títul_o"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell encontrou %d fotos na biblioteca F-Spot e está atualmente a "
+#~ "importá-los. Duplicatas serão automaticamente detectadas e removidas.\n"
+#~ "\n"
+#~ "Você pode fechar este diálogo e começar a usar o Shotwell enquanto a "
+#~ "importação é feita em segundo plano."
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
-msgid "seconds"
-msgstr "segundos"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Biblioteca F-Spot: %s"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nova etique_ta…"
+#~ msgid "Preparing to import"
+#~ msgstr "Preparando para importar"
 
-#: ui/trash.ui:285
-msgid "Delete all photos in the trash"
-msgstr "Apaga todas as fotos na lixeira"
+#~ msgid "Core Data Import Services"
+#~ msgstr "Núcleo serviços de importação de dados"
 
 #~ msgid "Testing connection to Facebook…"
 #~ msgstr "Testando conexão com o Facebook…"
@@ -6526,9 +6595,6 @@ msgstr "Apaga todas as fotos na lixeira"
 #~ 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, "
diff --git a/po/shotwell.pot b/po/shotwell.pot
index da7c1c3..b2aa775 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.26.4\n"
+"Project-Id-Version: shotwell 0.28.2\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2017-11-10 17:36+0100\n"
+"POT-Creation-Date: 2018-04-09 20:28+0200\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"
@@ -19,10 +19,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr ""
@@ -55,16 +55,16 @@ msgstr ""
 msgid "The Shotwell developers"
 msgstr ""
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr ""
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr ""
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -72,15 +72,15 @@ msgid ""
 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr ""
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr ""
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgid "The secret token to sign oauth requests"
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr ""
 
@@ -135,9 +135,9 @@ msgid "URL of the Rajce server."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgid "user token, if remembered."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgid "The last selected Rajce category."
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr ""
 
@@ -199,11 +199,11 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr ""
 
@@ -429,791 +429,807 @@ msgid "A grayscale color for use as the background color."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:167
-msgid "Selection state of “hide photos” option"
+msgid "background for transparent images"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 msgid ""
 "Whether images being uploaded to Piwigo should have their tags removed on "
 "upload, such that these tags will not appear on the remote Piwigo server."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr ""
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1237,22 +1253,7 @@ msgid ""
 "publishing again."
 msgstr ""
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr ""
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr ""
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1260,18 +1261,15 @@ msgid ""
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr ""
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
 msgstr ""
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr ""
 
@@ -1284,7 +1282,7 @@ msgid ""
 "try publishing again."
 msgstr ""
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1292,7 +1290,7 @@ msgid ""
 "have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1301,140 +1299,105 @@ msgid ""
 "to log into the YouTube site at least once."
 msgstr ""
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr ""
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr ""
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr ""
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr ""
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr ""
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr ""
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr ""
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 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
+#: plugins/common/RESTSupport.vala:222
 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
+#: plugins/common/RESTSupport.vala:227
 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
+#: plugins/common/RESTSupport.vala:232
 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
+#: plugins/common/RESTSupport.vala:237
 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
+#: plugins/common/RESTSupport.vala:242
 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
+#: plugins/common/RESTSupport.vala:247
 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
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr ""
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr ""
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr ""
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr ""
@@ -1452,7 +1415,7 @@ msgid "Go _Back"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr ""
 
@@ -1485,7 +1448,7 @@ msgid "pixels"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1493,17 +1456,17 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
+msgid "Longest edge"
 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr ""
@@ -1511,11 +1474,11 @@ 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1594,31 +1557,11 @@ msgstr ""
 msgid " Site Not Found"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1670,77 +1613,10 @@ msgstr ""
 msgid "Photos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr ""
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr ""
@@ -1808,6 +1684,14 @@ msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr ""
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -1844,64 +1728,87 @@ msgid "Where would you like to publish the selected photos?"
 msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr ""
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month you have %s remaining in your upload quota."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr ""
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr ""
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr ""
@@ -1951,7 +1858,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr ""
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr ""
 
@@ -2032,7 +1939,8 @@ msgid "Certificate of %s"
 msgstr ""
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr ""
 
@@ -2080,10 +1988,34 @@ msgstr ""
 msgid "I understand, please _proceed."
 msgstr ""
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr ""
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr ""
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr ""
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr ""
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr ""
@@ -2204,16 +2136,17 @@ msgstr ""
 msgid "Leave fullscreen"
 msgstr ""
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:303
-#: src/data_imports/DataImportsUI.vala:421 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr ""
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2222,27 +2155,21 @@ msgid ""
 "%s"
 msgstr ""
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr ""
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr ""
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr ""
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr ""
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr ""
@@ -2308,17 +2235,27 @@ msgstr ""
 msgid "Imported failed (%d)"
 msgstr ""
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr ""
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr ""
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr ""
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr ""
@@ -2329,122 +2266,126 @@ msgid ""
 msgstr ""
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr ""
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr ""
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 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
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr ""
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr ""
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
 "%s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr ""
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, 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:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2457,7 +2398,7 @@ msgid "_Print"
 msgstr ""
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr ""
 
@@ -2499,13 +2440,13 @@ msgid "Flip Verti_cally"
 msgstr ""
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr ""
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr ""
@@ -2522,12 +2463,13 @@ msgstr ""
 msgid "Adjust Date and Time…"
 msgstr ""
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr ""
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr ""
 
@@ -2535,43 +2477,39 @@ msgstr ""
 msgid "_Play"
 msgstr ""
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr ""
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr ""
+msgid_plural "Export Photos/Videos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr ""
-
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr ""
+msgid_plural "Export Photos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr ""
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr ""
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr ""
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr ""
 
@@ -2778,19 +2716,19 @@ msgstr ""
 msgid "Database file:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr ""
 
@@ -2851,7 +2789,7 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
 #: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
@@ -2881,6 +2819,10 @@ msgstr ""
 msgid "Export Video"
 msgstr ""
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr ""
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -2906,63 +2848,35 @@ msgid ""
 "Would you like to continue exporting?"
 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:144
-msgid "Unmodified"
-msgstr ""
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr ""
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr ""
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr ""
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr ""
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr ""
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
 msgstr ""
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr ""
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr ""
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr ""
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr ""
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -2972,37 +2886,37 @@ msgstr[1] ""
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr ""
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr ""
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr ""
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr ""
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3011,13 +2925,13 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3027,53 +2941,53 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr ""
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3081,14 +2995,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3098,7 +3012,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3108,7 +3022,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3119,7 +3033,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3129,56 +3043,56 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3189,7 +3103,7 @@ msgstr[1] ""
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3198,56 +3112,56 @@ msgstr[1] ""
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3256,89 +3170,64 @@ msgstr[1] ""
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr ""
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr ""
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr ""
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr ""
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr ""
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr ""
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr ""
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr ""
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr ""
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr ""
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3346,121 +3235,34 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr ""
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr ""
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr ""
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr ""
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr ""
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr ""
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr ""
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr ""
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr ""
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr ""
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr ""
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr ""
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3473,121 +3275,43 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr ""
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr ""
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr ""
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr ""
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr ""
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr ""
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr ""
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr ""
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr ""
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr ""
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr ""
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr ""
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr ""
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr ""
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr ""
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr ""
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr ""
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr ""
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr ""
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr ""
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr ""
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3602,7 +3326,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3617,7 +3341,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -3632,7 +3356,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -3642,7 +3366,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3680,6 +3404,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr ""
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr ""
 
@@ -3711,201 +3436,425 @@ msgstr ""
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr ""
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr ""
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr ""
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr ""
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr ""
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr ""
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr ""
+
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/dialogs/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr ""
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr ""
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr ""
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr ""
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr ""
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr ""
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr ""
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr ""
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr ""
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr ""
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr ""
 
@@ -3918,10 +3867,6 @@ msgstr ""
 msgid "_Straighten"
 msgstr ""
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr ""
-
 #: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
@@ -3947,27 +3892,35 @@ msgstr[1] ""
 msgid "No Event"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr ""
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr ""
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr ""
 
@@ -4007,16 +3960,12 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr ""
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr ""
-
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1079
-msgid "Photos"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
 msgstr ""
 
 #: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
@@ -4041,19 +3990,36 @@ msgstr ""
 msgid "Last Import"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr ""
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr ""
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr ""
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr ""
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4062,33 +4028,33 @@ msgid ""
 "Do you want to continue importing photos?"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr ""
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr ""
 
@@ -4104,15 +4070,15 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr ""
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr ""
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr ""
 
@@ -4150,32 +4116,36 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr ""
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr ""
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr ""
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr ""
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr ""
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr ""
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr ""
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4189,22 +4159,22 @@ msgstr ""
 msgid "Adjust the size of the thumbnails"
 msgstr ""
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
 msgstr ""
 
-#: src/Page.vala:1339
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr ""
 
-#: src/Page.vala:1343
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2649
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr ""
 
@@ -4268,7 +4238,7 @@ msgstr ""
 msgid "TIFF"
 msgstr ""
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr ""
 
@@ -4433,7 +4403,7 @@ msgstr ""
 msgid "Software:"
 msgstr ""
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr ""
 
@@ -4481,37 +4451,37 @@ msgstr ""
 msgid "Logging in…"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:198
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:201
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:202
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr ""
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:412
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:413
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4552,9 +4522,10 @@ msgstr ""
 msgid "Flip Vertically"
 msgstr ""
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr ""
 
@@ -4577,11 +4548,11 @@ msgstr ""
 msgid "Fulls_creen"
 msgstr ""
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr ""
@@ -4997,7 +4968,7 @@ msgid "Adjust Date and Time"
 msgstr ""
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr ""
 
@@ -5088,7 +5059,7 @@ msgid "_Rename…"
 msgstr ""
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr ""
 
@@ -5217,7 +5188,7 @@ msgstr ""
 msgid "Move the selected photos back into the library"
 msgstr ""
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5233,7 +5204,8 @@ msgstr ""
 msgid "Unable to open in file manager: %s"
 msgstr ""
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr ""
 
@@ -5296,151 +5268,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr ""
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr ""
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr ""
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr ""
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr ""
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr ""
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr ""
@@ -5486,6 +5430,14 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr ""
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr ""
+
 #: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr ""
@@ -5537,50 +5489,50 @@ msgstr ""
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr ""
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr ""
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr ""
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr ""
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr ""
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr ""
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr ""
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr ""
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr ""
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr ""
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr ""
 
@@ -5592,7 +5544,7 @@ msgstr ""
 msgid "(None)"
 msgstr ""
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr ""
 
@@ -5600,16 +5552,20 @@ msgstr ""
 msgid "Random"
 msgstr ""
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr ""
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr ""
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr ""
 
 #. multiple videos
-#: src/VideoSupport.vala:524
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr ""
 
@@ -5619,14 +5575,10 @@ msgid "Toggle _Flag"
 msgstr ""
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr ""
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr ""
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -5676,21 +5628,21 @@ msgstr ""
 msgid "T_ools"
 msgstr ""
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr ""
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 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…"
+msgid "_Import From Folder…"
 msgstr ""
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -5768,17 +5720,12 @@ msgstr ""
 msgid "Even_ts"
 msgstr ""
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr ""
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr ""
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr ""
 
@@ -5815,202 +5762,242 @@ msgstr ""
 msgid "_Stop Import"
 msgstr ""
 
-#: ui/printing_widget.ui:19
-msgid "<b>Printed Image Size</b>"
-msgstr ""
-
-#: ui/printing_widget.ui:36
-msgid "Use a _standard size:"
+#: ui/preferences_dialog.ui:65
+msgid "white"
 msgstr ""
 
-#: ui/printing_widget.ui:80
-msgid "Use a c_ustom size:"
+#: ui/preferences_dialog.ui:92
+msgid "black"
 msgstr ""
 
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
+#: ui/preferences_dialog.ui:123
+msgid "Display"
 msgstr ""
 
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-msgid "cm"
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
 msgstr ""
 
-#: ui/printing_widget.ui:173
-msgid "_Match photo aspect ratio"
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
 msgstr ""
 
-#: ui/printing_widget.ui:197
-msgid "_Autosize:"
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
 msgstr ""
 
-#: ui/printing_widget.ui:237
-msgid "<b>Titles</b>"
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
 msgstr ""
 
-#: ui/printing_widget.ui:254
-msgid "Print image _title"
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
 msgstr ""
 
-#: ui/printing_widget.ui:297
-msgid "<b>Pixel Resolution</b>"
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
 msgstr ""
 
-#: ui/printing_widget.ui:317
-msgid "_Output photo at:"
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
 msgstr ""
 
-#: ui/printing_widget.ui:351
-msgid "pixels per inch"
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
 msgstr ""
 
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
 msgstr ""
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
 msgstr ""
 
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
 msgstr ""
 
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
 msgstr ""
 
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
 msgstr ""
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
 msgstr ""
 
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
 msgstr ""
 
-#: ui/shotwell.ui:65
-msgid "white"
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
 msgstr ""
 
-#: ui/shotwell.ui:92
-msgid "black"
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
 msgstr ""
 
-#: ui/shotwell.ui:123
-msgid "Display"
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
 msgstr ""
 
-#: ui/shotwell.ui:160
-msgid "_Background:"
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
 msgstr ""
 
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
 msgstr ""
 
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
 msgstr ""
 
-#: ui/shotwell.ui:209
-msgid "Importing"
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
 msgstr ""
 
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
 msgstr ""
 
-#: ui/shotwell.ui:240
-msgid "Example:"
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
 msgstr ""
 
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
 msgstr ""
 
-#: ui/shotwell.ui:271
-msgid "Metadata"
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
 msgstr ""
 
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
 msgstr ""
 
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
 msgstr ""
 
-#: ui/shotwell.ui:323
-msgid "De_fault:"
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
 msgstr ""
 
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
 msgstr ""
 
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
 msgstr ""
 
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
 msgstr ""
 
-#: ui/shotwell.ui:517
-msgid "External Editors"
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
 msgstr ""
 
-#: ui/shotwell.ui:542
-msgid "Plugins"
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
 msgstr ""
 
-#: ui/shotwell.ui:590
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr ""
 
-#: ui/shotwell.ui:644
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr ""
 
-#: ui/shotwell.ui:671
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr ""
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr ""
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr ""
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr ""
 
-#: ui/shotwell.ui:752
-msgid "label"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr ""
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr ""
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr ""
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr ""
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
 msgstr ""
 
-#: ui/shotwell.ui:903
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr ""
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr ""
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr ""
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr ""
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr ""
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr ""
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr ""
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr ""
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr ""
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
+#: ui/textentrydialog.ui:66
+msgid "label"
 msgstr ""
 
 #: ui/trash.ui:285
diff --git a/po/sr.gmo b/po/sr.gmo
index 1a21891..215e526 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 5d832b4..dc6add5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,16 +1,16 @@
 # Serbian translation of shotwell.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2017.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2018.
 # Copyright 2016 Software Freedom Conservancy Inc.
 # Mitko Krstev <m.krstev@hotmail.com>, 2011.
 # Nikola Radovanović <nrad@eunet.rs>, 2011—2013.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2017.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe"
 "ll&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-05-05 06:58+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-21 07:54+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
@@ -21,10 +21,10 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Фото-бунар"
@@ -66,16 +66,16 @@ msgstr "Фото-бунар подржава ЈПЕГ, ПНГ, ТИФФ и ра�
 msgid "The Shotwell developers"
 msgstr "Програмери Фото-бунара"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Управник фотографија"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Организујте ваше фотографије"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -86,15 +86,15 @@ 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Фото-бунар прегледач фотографија"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Прегледач фотографија"
 
@@ -123,7 +123,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Тајни симбол за пријављивање захтева отвореног потврђивања"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "основна величина"
 
@@ -151,9 +151,9 @@ msgid "URL of the Rajce server."
 msgstr "Адреса Рајце сервера."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "корисник"
 
@@ -170,7 +170,7 @@ msgid "user token, if remembered."
 msgstr "корисников симбол, ако је запамћен."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "последња категорија"
 
@@ -179,7 +179,7 @@ msgid "The last selected Rajce category."
 msgstr "Последња изабрана Рајце категорија."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "последња величина фотографије"
 
@@ -219,11 +219,11 @@ msgstr ""
 "фотографија"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "уклања осетљиве податке из отпремања"
 
@@ -485,10 +485,26 @@ msgid "A grayscale color for use as the background color."
 msgstr "Боја нијансе сиве за употребу као боја позадине."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "позадина за провидне слике"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Позадина која ће се користити за провидне слике."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "боја за позадину пуне провидности"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr "Боја која ће се користити за провидне слике је подешена на пуну боју"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Стање избора опције „сакриј фотографије“"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -496,29 +512,29 @@ msgstr ""
 "Последње коришћено стање избора опције „сакриј већ увезене фотографије“ на "
 "страници увоза."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "застој"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Застој (у секундама) између фотографија у покретном приказу."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "застој прелаза"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Време (у секундама) трајања прелаза између фотографија у покретном приказу"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "ид дејства прелаза"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -526,69 +542,69 @@ msgstr ""
 "Назив дејства прелаза које ће се користити између фотографија приликом "
 "трајања покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "приказује наслов"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Да ли ће приказивати наслов фотографије за време покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "увеличава прозор библитеке"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Изабрано ако је програм библиотеке увеличан, поништено у супротном."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "ширина прозора библиотеке"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Последња прибележена ширина прозора програма библиотеке."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "висина прозора библиотеке"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Последња прибележена висина прозора програма библиотеке."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "увеличава прозор непосредног уређивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Изабрано ако је програм непосредног уређивања увеличан, поништено у "
 "супротном."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "ширина прозора непосредног уређивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Последња прибележена ширина прозора програма непосредног уређивања."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "висина прозора непосредног уређивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Последња прибележена висина прозора програма непосредног уређивања."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "положај разделника бочне површи"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -596,29 +612,29 @@ msgstr ""
 "Последњи запамћени положај разделника између бочне површи и прегледа у "
 "прозору програма библиотеке."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "директоријум увоза"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Директоријум у коме се стављају датотеке увезених фотографија."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "прати приспеће нових датотека у фасцикли фототеке"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Ако је изабрано, датотеке додате у директоријум библиотеке се одмах увозе."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "уписује метаподатке у главне датотеке"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -626,11 +642,11 @@ msgstr ""
 "Ако је изабрано, измене у метаподацима (ознаке, наслови, итд.) се записују у "
 "датотеку главне фотографије."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "користи називе датотека малим словима"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -638,11 +654,11 @@ msgstr ""
 "Ако је изабрано, Фото-бунар ће пребацити све називе датотека на мала слова "
 "приликом увоза датотека фотографија"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "шаблон директоријума"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -650,11 +666,11 @@ msgstr ""
 "Ниска која кодира шаблон именовања који ће бити коришћен за именовање "
 "директоријума фотографија при увозу."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "произвољни шаблон директоријума"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -662,30 +678,30 @@ msgstr ""
 "Ниска која кодира произвољни шаблон именовања који ће бити коришћен за "
 "именовање директоријума фотографија при увозу."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "основни сирови развијач"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Основна опција за коју ће сировог развијача Фото-бунар користити."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Најчешће скоро коришћен избор изборника односа сразмере одсецања."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Бројчани код који представља последњи избор изборника одсецања који је "
 "начинио корисник."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Најчешће скоро коришћен нумератор произвољног односа сразмере одсецања."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -693,12 +709,12 @@ msgstr ""
 "Не-нулти, позитивни цео број који представља део ширине последње сразмере "
 "произвољног одсецања који је унео корисник."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Најчешће скоро коришћен деномератор произвољног односа сразмере одсецања."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -706,143 +722,143 @@ msgstr ""
 "Не-нулти, позитивни цео број који представља део висине последње сразмере "
 "произвољног одсецања који је унео корисник."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "спољни уређивач фотографија"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Спољни програм коришћен за уређивање фотографија."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "спољни сирови уређивач"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Спољни програм коришћен за уређивање сирових фотографија."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Подешавање у прозорчету извоза: како да скрати слике"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "извоз метаподатака"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Подешавање у прозорчету извоза: опција за извоз метаподатака"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "подешавање формата, посебна вредност"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Подешавање у прозорчету извоза: подешавање формата, посебна вредност"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "подешавање формата, вредност врсте"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Подешавање у прозорчету извоза: подешавање формата, вредност врсте"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Опција ЈПЕГ квалитета"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Подешавање у прозорчету извоза: опција јпег квалитета"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "највећа величина слике"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Подешавање у прозорчету извоза: највећа величина слике"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "последња коришћена услуга објављивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Бројчани код који представља последњу услугу на којој су фотографије "
 "објављене"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "основна услуга објављивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "симбол приступа"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Симбол отвореног потврђивања Фејсбука за тренутно пријављену сесију, ако "
 "постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "и.д. корисника"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "и.д. корисника Фејсбука, за тренутно пријављеног корисника, ако постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "корисник"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Име тренутно пријављеног корисника Фејсбука, ако га има"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "шифра основне величине"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Бројчани код који представља основну величину за фотографије објављене на "
 "Фејсбуку"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr "Да ли ће са слика отпремљених на Фејсбук бити прво уклоњени метаподаци"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Симбол отвореног потврђивања фазе приступа"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Симбол потврђивања идентитета за тренутно пријављеног корисника Фликра, ако "
 "постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Тајна симбола отвореног потврђивања фазе приступа"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -850,22 +866,22 @@ msgstr ""
 "Криптографска тајна која се користи за означавање захтева над симболом "
 "потврђивања идентитета за тренутно пријављеног корисника Фликра, ако постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Име тренутно пријављеног корисника Фликра, ако га има"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Бројчани код који представља основну величину за фотографије објављене на "
 "Фликру"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "основна видљивост"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -873,18 +889,18 @@ msgstr ""
 "Бројчани код који представља основну видљивост за фотографије објављене на "
 "Фликру"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "Да ли ће са слика отпремљених на Фликр бити прво уклоњени метаподаци"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "симбол освежавања"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -892,7 +908,7 @@ msgstr ""
 "Симбол отвореног потврђивања који се користи за освежавање сесије Пикаса веб "
 "албума за тренутно пријављеног корисника, ако постоји."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -900,64 +916,64 @@ msgstr ""
 "Бројчани код који представља основну величину за фотографије отпремљене на "
 "Пикаса веб албуме"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "последњи албум"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Назив последњег албума на који је корисник објавио фотографије, ако постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "Да ли ће са слика отпремљених на Пикасу бити прво уклоњени метаподаци"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Адреса Пивига"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Адреса Пивиго сервера."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Корисничко име за Пивиго, ако сте пријављени."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "лозинка"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Лозинка за Пивиго, ако сте пријављени."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "запамти лозинку"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Ако је изабрано, памтиће лозинку за Пивиго."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Последња изабрана категорија за Пивиго."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "последњи ниво овлашћења"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Последњи изабрани ниво овлашћења за Пивиго."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -965,20 +981,20 @@ msgstr ""
 "Бројчани код који представља подешеност величине последње фотографије која "
 "је коришћена приликом објављивања на Пивиго."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "Да ли ће са слика отпремљених на Пивиго бити прво уклоњени метаподаци"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ако је наслов подешен а напомена није, користи наслов као напомену за "
 "отпремања на Пивиго"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -986,11 +1002,11 @@ msgstr ""
 "Да ли ће слике отпремљене на Пивиго имати своје напомене постављене из "
 "наслова ако је исти постављен а напомена поништена"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "не отпрема ознаке када отпрема на Пивиго"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -998,27 +1014,27 @@ msgstr ""
 "Да ли из слика које се отпремају на Пивиго треба да се уклоне њихове ознаке "
 "при отпремању, тако да се те ознаке неће појавити на удаљеном серверу Пивига."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Корисничко име Галерије 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "АПИ кључ"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "АПИ кључ Галерије 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Адреса"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Адреса сајта Галерије 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1026,19 +1042,19 @@ msgstr ""
 "Назначава да ли ће са слика отпремљених на Галерију 3 бити прво уклоњени "
 "метаподаци"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "ограничење сразмеравања отпремљене слике"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "ИД ограничења сразмеравања слике која се отпрема"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "пиксели веће осе отпремљене слике"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1046,7 +1062,7 @@ msgstr ""
 "Пиксели веће осе слике која се отпрема; користи се само ако је ид ограничења "
 "сразмеравања одговарајућа вредност"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1054,30 +1070,30 @@ msgstr ""
 "Симбол отвореног потврђивања који се користи за освежавање сесије Јутуба за "
 "тренутно пријављеног корисника, ако постоји."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "последња коришћена услуга увоза"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Бројчани код који представља последњу услугу са које су фотографије увезене"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "колачић стања тумача"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Бројчани код који хвата стање окружења прикључка Гстримера"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "режим распореда садржаја"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1085,35 +1101,35 @@ msgstr ""
 "Бројчани код који описује како се фотографије ређају на страници за време "
 "штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ппи садржаја"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Број пиксела по инчу (ппи) послатих штампачу за време штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "ширина садржаја"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Ширина штампаног материјала на страници приликом штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "висина садржаја"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Висина штампаног материјала на страници приликом штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "јединице садржаја"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1121,11 +1137,11 @@ msgstr ""
 "Бројчани код који представља јединицу мере (инчи или центиметри) која се "
 "користи приликом штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "број фотографија по страници"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1133,22 +1149,22 @@ msgstr ""
 "Бројчани код који представља тренутно изабрани режим броја слика по страници "
 "приликом штампања"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "избор величине"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Индекс тренутне величине штампања у унапред одређеном списку стандардних "
 "величина"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "одговара односу сразмере"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1156,11 +1172,11 @@ msgstr ""
 "Одређује да ли произвољне величине штампања морају да одговарају односу "
 "сразмере изворне фотографије"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "штампа наслове"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1168,221 +1184,219 @@ msgstr ""
 "Изабрано ако наслов фотографије треба да се одштампа приликом штампања, у "
 "супротном поништено."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "слова наслова"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Назив словне групе која ће се користити за наслове фотографија приликом "
 "штампања."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "укључује прикључак објављивања на фејсбук"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Фејсбук, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "укључује прикључак објављивања на фликр"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Фликр, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "укључује прикључак објављивања на пикасу"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Пикасу, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "укључује прикључак објављивања на јутуб"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Јутуб, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "укључује прикључак објављивања на пивиго"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Пивиго, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "укључује прикључак објављивања на јандекс"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Јандекс.Фотки, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "укључује прикључак објављивања на тумблр"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Тумблр, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "укључује прикључак објављивања на рајце"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Рајсе, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "укључује прикључак објављивања на галерију 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак за објављивање на Галерију 3, у супротном "
 "поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "укључује прикључак увоза Ф-броја"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Изабрано ако је укључен прикључак увоза Ф-боја, у супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "укључује распадање прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак распадања прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "укључује ишчезавање прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак ишчезавања прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "укључује клизање прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак клизања прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "укључује сат прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак сата прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "укључује круг прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак круга прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
-#| msgid "enable slideshow circle transition"
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
-msgstr "укључује кружне прелазе покретног приказа"
+msgstr "укључује кругове прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
-"Изабрано ако је укључен прикључак кружних прелаза покретног приказа, у "
+"Изабрано ако је укључен прикључак кругова прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
-#| msgid "enable slideshow slide transition"
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
-msgstr "укључује засторе прелаза покретног приказа"
+msgstr "укључује клизање прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак застора прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "укључује квадрате прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак квадрата прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "укључује штрафте прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак штрафти прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "укључује шах прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1418,24 +1432,7 @@ msgstr ""
 "Да наставите објављивање фотографија на Фејсбуку, изађите и поново покрените "
 "Фото-бунар, па покушајте поново."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Унесите број потврђивања који се појављује након пријављивања на Фликр у "
-"вашем интернет прегледнику."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Број овлашћења:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "_Настави"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1447,20 +1444,15 @@ msgstr ""
 "Пријавите се на Фликр у вашем интернет прегледнику. Мораћете да овластите "
 "Повезивање Фото-бунара да направи везу до вашег налога Фликра."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Припремам се за пријављивање…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Датотека за објављивање није доступна. Објављивање на Фликр не може да се "
-"настави."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Није успело овлашћење Фликра"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Проверавам овлашћење…"
 
@@ -1478,7 +1470,7 @@ msgstr ""
 "Да наставите објављивање на Гугловим услугама, изађите и поново покрените "
 "Фото-бунар, па покушајте поново."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1491,7 +1483,7 @@ msgstr ""
 "овластите Повезивање Фото-бунара да направи везу до вашег налога Веб албума "
 "Пикасе."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1505,11 +1497,51 @@ msgstr ""
 "коришћење са Јутубом. Можете да подесите већину налога користећи ваш "
 "прегледник да се пријавите на сајт Јутуба барем једном."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Адреса _ел. поште"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Лозинка"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Пријави ме"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Унесите корисничко име и лозинку придружену вашем налогу Тумблр-а."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Корисничко име и/или лозинка нису исправни. Покушајте поново"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Неисправно корисничко име или лозинка"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Не могу да учитам корисничко сучеље: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Посетите веб страницу Фото-бунара"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Никола Радовановић <nrad@eunet.rs>\n"
@@ -1518,14 +1550,14 @@ msgstr ""
 "http://prevod.org — превод на српски језик"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 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
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1534,20 +1566,20 @@ msgstr ""
 "календару вашег рачунара."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 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
+#: plugins/common/RESTSupport.vala:232
 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
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1556,7 +1588,7 @@ msgstr ""
 "која га је издала."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1565,7 +1597,7 @@ msgstr ""
 "шифровање."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1573,106 +1605,11 @@ msgstr ""
 "⚫ Распознавање овог веб сајта је важеће само за будуће датуме. Проверите "
 "датум на календару вашег рачунара."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Привремена датотека неопходна за објављивање није доступна"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Ауторска права 2016 Друштво за Очување Слободе Софтвера"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Добро дошли у услугу увоза фототеке Ф-броја.\n"
-"\n"
-"Изаберите фототеку за увоз, било избором неке постојеће фототеке коју је "
-"пронашао Фото-бунар било избором неке друге датотеке из збирке Ф-броја."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Добро дошли у услугу увоза фототеке Ф-броја.\n"
-"\n"
-"Изаберите датотеку из збирке Ф-броја."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Ручно изаберите датотеку збирке Ф-броја за увоз:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Не могу да отворим датотеку збирке Ф-броја: датотека не постоји или није "
-"збирка Ф-броја"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Не могу да отворим датотеку збирке Ф-броја: Фото-бунар не подржава ово "
-"издање збирке Ф-броја"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Не могу да прочитам изабрану датотеку збирке Ф-броја: грешка приликом читања "
-"табеле ознака"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Не могу да прочитам изабрану датотеку збирке Ф-броја: грешка приликом читања "
-"табеле фотографија"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Фото-бунар је пронашао %d фотографије/а у фототеци Ф-броја и тренутно их "
-"увози. Дупликати ће самостално бити пронађени и уклоњени.\n"
-"\n"
-"Можете затворити ово прозорче и почети да користите Фото-бунар док ће се "
-"увоз фотографија наставити у позадини."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Фототека Ф-броја: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Припремам за увоз"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Услуге увоза кључних података"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Адреса _Галерије 3:"
@@ -1690,7 +1627,7 @@ msgid "Go _Back"
 msgstr "_Назад"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Пријави ме"
 
@@ -1724,7 +1661,7 @@ msgid "pixels"
 msgstr "тачкица"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1732,17 +1669,17 @@ msgstr "Изворна величина"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Ширина и висина"
+msgid "Longest edge"
+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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Одјави ме"
@@ -1750,11 +1687,11 @@ 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1762,7 +1699,7 @@ msgstr "_Објави"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
-msgstr "Модулобјављивања Галерије 3"
+msgstr "Модул објављивања Галерије 3"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
@@ -1852,31 +1789,11 @@ msgstr "Непознати корисник"
 msgid " Site Not Found"
 msgstr " Нисам пронашао сајт"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "Адреса _ел. поште"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Запамти"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1928,83 +1845,10 @@ msgstr "Пријављени сте на Рајс као %s."
 msgid "Photos will appear in:"
 msgstr "Фотографије ће се појавити у:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Фото-бунарове додатне услуге објављивања"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Блогови:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Величина _фотографије:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Ауторска права 2012 БЈА Електроника"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 × 375 пиксела"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 пиксела"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 пиксела"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr ""
-"„%s“ није исправан одговор на захтев потврђивања идентитета отвореног "
-"потврђивања"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"„TumblrPublisher: start( ):“ не може да се покрене; овај објављивач није за "
-"поновно покретање."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Унесите корисничко име и лозинку придружену вашем налогу Тумблр-а."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Корисничко име и/или лозинка нису исправни. Покушајте поново"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Неисправно корисничко име или лозинка"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Не могу да учитам корисничко сучеље: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Пријављени сте на Тумблр као %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Ауторска права 2010+ Јевгениј Полјаков <zbr@ioremap.net>"
@@ -2072,6 +1916,14 @@ msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr "_Уклони место, фото-апарат, и друге податке препознавања пре отпремања"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Ауторска права 2016 Друштво за Очување Слободе Софтвера"
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2112,17 +1964,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Где желите да објавите изабране фотографије?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Само мени"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Свима"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Величина _фотографије:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Датотека за објављивање није доступна. Објављивање на Фликр не може да се "
+"настави."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2131,7 +1996,7 @@ msgstr ""
 "Пријављени сте на Фликр као %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2141,40 +2006,52 @@ msgstr ""
 "да отпремите.\n"
 "За овај месец имате само још %s за отпремање."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ваш налог Фликра Про вам омогућава неограничена отпремања."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Фотографије могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Видео снимке могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Фотографије и снимке могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Само пријатељи и породица"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Само породица"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Само пријатељи"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 пиксела"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 пиксела"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 пиксела"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 пиксела"
@@ -2226,7 +2103,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Гугл+ (2048 × 1536 пиксела)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Изворна величина"
 
@@ -2310,7 +2187,8 @@ msgid "Certificate of %s"
 msgstr "Уверење „%sд"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "У _реду"
 
@@ -2362,10 +2240,38 @@ msgstr "Прикажи уверење…"
 msgid "I understand, please _proceed."
 msgstr "Разумем, _настави"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Кључне услуге објављивања"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Блогови:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Ауторска права 2012 БЈА Електроника"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 пиксела"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"„TumblrPublisher: start( ):“ не може да се покрене; овај објављивач није за "
+"поновно покретање."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Пријављени сте на Тумблр као %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Подешавање _приватности снимка:"
@@ -2490,16 +2396,17 @@ msgstr "Прибодите отворену траку лата"
 msgid "Leave fullscreen"
 msgstr "Напустите приказ преко целог екрана"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2512,27 +2419,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – „Ахен“"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Посетите веб страницу Фото-бунара"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Не могу да прикажем помоћ: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Не могу да приступим бази података грешака: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Не могу да прикажем ЧПП: %s"
@@ -2598,17 +2499,28 @@ msgstr "Оштећена датотека фотографије"
 msgid "Imported failed (%d)"
 msgstr "Увоз није успео (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Фото-апарати"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Списак свих откривених фото-апарата"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Фото-апарат"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2621,32 +2533,32 @@ msgstr ""
 "управника датотека."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Сакриј већ увезене фотографије"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Прикажи само фотографије које нису увезене"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 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
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Увези _све"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "Изгледа да је фото-апарат празан. Нема фотографија/снимака за увоз"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Нисам пронашао нове фотографије/снимке на фото-апарату"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2654,15 +2566,15 @@ msgstr ""
 "Фото-бунар мора да откачи фото-апарат са система да би му приступио. Да "
 "наставим?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Откачи"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Откачите фото-апарат."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2672,11 +2584,11 @@ msgstr ""
 "апарату само када је откључан. Затворите све друге програме који користе "
 "фото-апарат и покушајте поново."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Затворите све друге програме који користе фото-апарат."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2685,29 +2597,33 @@ msgstr ""
 "Не могу да довучем претпрегледе фотографија са фото-апарата:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Откачињем…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Повезујем се на фото-апарат, сачекајте мало…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Започињем увоз, сачекајте мало…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Преузимам податке о фотографији"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Преузимам претпреглед за „%s“"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Не могу да закључам фото-апарат: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2716,7 +2632,7 @@ msgstr[1] "Да обришем ове %d фотографије са фото-а
 msgstr[2] "Да обришем ових %d фотографија са фото-апарата?"
 msgstr[3] "Да обришем ову %d фотографију са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2725,7 +2641,7 @@ msgstr[1] "Да обришем ова %d снимка са фото-апарат
 msgstr[2] "Да обришем ових %d снимака са фото-апарата?"
 msgstr[3] "Да обришем овај %d снимак са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2734,7 +2650,7 @@ msgstr[1] "Да обришем ове %d фотографије/снимка с�
 msgstr[2] "Да обришем ових %d фотографија/снимака са фото-апарата?"
 msgstr[3] "Да обришем ову %d фотографију/снимак са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2743,15 +2659,15 @@ msgstr[1] "Да обришем ове %d датотеке са фото-апар
 msgstr[2] "Да обришем ових %d датотека са фото-апарата?"
 msgstr[3] "Да обришем ову %d датотеку са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Задржи"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Уклањам фотографије/снимке са фото-апарата"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2770,7 +2686,7 @@ msgid "_Print"
 msgstr "_Штампај"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Пошаљи _у…"
 
@@ -2812,13 +2728,13 @@ msgid "Flip Verti_cally"
 msgstr "Изврни _усправно"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Побољшај"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Врати на изворно"
@@ -2835,12 +2751,13 @@ msgstr "_Убаци дотеривања боје"
 msgid "Adjust Date and Time…"
 msgstr "Подесите датум и време…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "_Отвори спољним уређивачем"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Отвори уређивачем _сирових"
 
@@ -2848,43 +2765,43 @@ msgstr "Отвори уређивачем _сирових"
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Извезите фотографију/снимак"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Извезите фотографије/снимке"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Извезите фотографију/снимак"
+msgstr[1] "Извезите фотографије/снимке"
+msgstr[2] "Извезите фотографије/снимке"
+msgstr[3] "Извезите фотографију/снимак"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Извезите фотографију"
+msgid_plural "Export Photos"
+msgstr[0] "Извезите фотографију"
+msgstr[1] "Извезите фотографије"
+msgstr[2] "Извезите фотографије"
+msgstr[3] "Извезите фотографију"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Извезите фотографије"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Окрећем"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Поништавам окретање"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Изврћем водоравно"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Поништавам водоравно извртање"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Изврћем усправно"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Поништавам усправно извртање"
 
@@ -3106,19 +3023,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Датотека збирке:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Увези"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Увезите из програма"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Увези медијум _из:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -3189,9 +3106,9 @@ msgstr[1] "Ово ће уклонити ознаку „%s“ из %d фотог
 msgstr[2] "Ово ће уклонити ознаку „%s“ из %d фотографија. Да наставим?"
 msgstr[3] "    "
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Избриши"
@@ -3229,6 +3146,10 @@ msgstr "_Промени развијача"
 msgid "Export Video"
 msgstr "Извези снимак"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Извезите фотографије"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3261,56 +3182,28 @@ msgstr ""
 "\n"
 "Да ли желите да наставите извоз?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Неизмењено"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Текуће"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Запис:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Квалитет:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Однос промене величине:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Тачкица:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "Извези _метаподатке:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "_Настави"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Сачувај појединости…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Сачувај појединости"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(и још %d)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Извештај резултата увоза"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3319,7 +3212,7 @@ msgstr[1] "Покушах да увезем %d датотеке."
 msgstr[2] "Покушах да увезем %d датотека."
 msgstr[3] "Покушах да увезем %d датотеку."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3331,37 +3224,37 @@ msgstr[3] "Од ових, %d датотека је успешно увезена
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Удвостручене фотографије/снимци нису увезени:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "удвостручава постојећу ставку медијума"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Фотографије/снимци нису увезени због грешке фото-апарата:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "порука грешке:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Датотеке нису увезене јер нису препознате као фотографије или снимци:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3372,7 +3265,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3380,7 +3273,7 @@ msgstr ""
 "Фотографије/снимци нису увезени јер Фото-бунар не може да их умножи у својој "
 "фототеци:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3392,18 +3285,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Фотографије/снимци нису увезени јер су датотеке оштећене:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Фотографије/снимци нису увезени из других разлога:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3412,7 +3305,7 @@ msgstr[1] "%d удвостручене фотографије нису увез�
 msgstr[2] "%d удвостручених фотографија није увезено:\n"
 msgstr[3] "%d удвостручена фотографија није увезена:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3421,7 +3314,7 @@ msgstr[1] "%d удвостручена снимка нису увезена:\n"
 msgstr[2] "%d удвостручених снимака није увезено:\n"
 msgstr[3] "%d удвостручени снимак није увезен:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3430,7 +3323,7 @@ msgstr[1] "%d удвостручене фотографије/снимка ни�
 msgstr[2] "%d удвостручених фотографија/снимака није увезено:\n"
 msgstr[3] "%d удвостручена фотографија/снимак није увезенa:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3445,7 +3338,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију због грешке у датотеци или на уређају:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3458,7 +3351,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d снимак због грешке у датотеци или на уређају:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3476,7 +3369,7 @@ msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак због грешке у датотеци или на "
 "уређају:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3489,7 +3382,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d датотеку због грешке у датотеци или на уређају:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3505,7 +3398,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију јер фасцикла фототеке није уписива:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3521,7 +3414,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d снимак јер фасцикла фототеке није уписива:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3542,7 +3435,7 @@ msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак јер фасцикла фототеке није "
 "уписива:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3558,7 +3451,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d датотеку јер фасцикла фототеке није уписива:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, 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"
@@ -3567,7 +3460,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије з�
 msgstr[2] "Нисам успео да увезем %d фотографија због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију због грешке на фото-апарату:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3576,7 +3469,7 @@ msgstr[1] "Нисам успео да увезем %d снимка због гр
 msgstr[2] "Нисам успео да увезем %d снимака због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d снимак због грешке на фото-апарату:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3589,7 +3482,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак због грешке на фото-апарату:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3598,7 +3491,7 @@ msgstr[1] "Нисам успео да увезем %d датотеке због
 msgstr[2] "Нисам успео да увезем %d датотека због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d датотеку због грешке на фото-апарату:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, 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"
@@ -3607,7 +3500,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије ј�
 msgstr[2] "Нисам успео да увезем %d фотографија јер су оштећене:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију јер је оштећена:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, 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"
@@ -3616,7 +3509,7 @@ msgstr[1] "Нисам успео да увезем %d снимка јер су �
 msgstr[2] "Нисам успео да увезем %d снимка јер су оштећени:\n"
 msgstr[3] "Нисам успео да увезем %d снимак јер је оштећен:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3625,7 +3518,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије/с�
 msgstr[2] "Нисам успео да увезем %d фотографија/снимака јер су оштећене:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију/снимак јер је оштећена:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3638,7 +3531,7 @@ msgstr[3] "Нисам успео да увезем %d датотеку јер ј
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3649,7 +3542,7 @@ msgstr[3] "Прескочио сам %d неподржану фотографи�
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3658,7 +3551,7 @@ msgstr[1] "Прескочио сам %d датотеке које нису фо�
 msgstr[2] "Прескочио сам %d датотека које нису фотографије.\n"
 msgstr[3] "Прескочио сам %d датотеку која није фотографија.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -3667,7 +3560,7 @@ msgstr[1] "Прескочио сам %d фотографије јер је ко�
 msgstr[2] "Прескочио сам %d фотографија јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d фотографију јер је корисник отказао:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -3676,7 +3569,7 @@ msgstr[1] "Прескочио сам %d снимка јер је корисни�
 msgstr[2] "Прескочио сам %d снимака јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d снимак јер је корисник отказао:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -3685,7 +3578,7 @@ msgstr[1] "Прескочио сам %d фотографије/снимка је
 msgstr[2] "Прескочио сам %d фотографија/снимака јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d фотографију/снимак јер је корисник отказао:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3694,7 +3587,7 @@ msgstr[1] "Прескочио сам %d датотеке јер је корис�
 msgstr[2] "Прескочио сам %d датотека јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d датотеку јер је корисник отказао:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3703,7 +3596,7 @@ msgstr[1] "Успешно сам увезао %d фотографије.\n"
 msgstr[2] "Успешно сам увезао %d фотографија.\n"
 msgstr[3] "Успешно сам увезао %d фотографију.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3712,7 +3605,7 @@ msgstr[1] "Успешно сам увезао %d снимка.\n"
 msgstr[2] "Успешно сам увезао %d снимака.\n"
 msgstr[3] "Успешно сам увезао %d снимак.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3723,77 +3616,46 @@ msgstr[3] "Успешно сам увезао %d фотографију/сним
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Није увезена ниједна фотографија ни снимак.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Увоз је завршен"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d секунда"
-msgstr[1] "%d секунде"
-msgstr[2] "%d секунди"
-msgstr[3] "%d секунда"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d минут"
-msgstr[1] "%d минута"
-msgstr[2] "%d минута"
-msgstr[3] "%d минут"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d сат"
-msgstr[1] "%d сата"
-msgstr[2] "%d сати"
-msgstr[3] "%d сат"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 дан"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Преименујте догађај"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Назив:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Уредите наслов"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Наслов:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Уредите напомену догађаја"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Уредите напомену фотографије/снимка"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Напомена:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Уклони и _oбриши фотографију"
@@ -3801,19 +3663,19 @@ msgstr[1] "Уклони и _oбриши фотографије"
 msgstr[2] "Уклони и _oбриши фотографије"
 msgstr[3] "Уклони и _oбриши фотографију"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Уклони из фототеке"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Да ли да вратим спољну измену?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Да ли да вратим спољне измене?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3826,15 +3688,15 @@ msgstr[2] ""
 "Ова радња ће уништити све измене на %d спољних датотека. Да наставим?"
 msgstr[3] " "
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "_Врати спољну измену"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "_Врати спољне измене"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3843,122 +3705,19 @@ msgstr[1] "Ово ће уклонити %d фотографије из фото�
 msgstr[2] "Ово ће уклонити %d фотографија из фототеке. Да наставим?"
 msgstr[3] "     "
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Уклоните фотографију из фототеке"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Уклоните фотографије из фототеке"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "ПрП"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "ПоП"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 сата"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Помери фотографије/снимке за исти износ"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Постави _све фотографије/снимке на ово време"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "_Измени изворну фотографију"
-msgstr[1] "_Измени изворне фотографије"
-msgstr[2] "_Измени изворне фотографије"
-msgstr[3] "_Измени изворну фотографију"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Измени изворну датотеку"
-msgstr[1] "_Измени изворне датотеке"
-msgstr[2] "_Измени изворне датотеке"
-msgstr[3] "_Измени изворну датотеку"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Изворно: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y. %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y. %H:%M:%S"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Време излагања ће бити померено унапред за\n"
-"%d %s, %d %s, %d %s, и %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Вреем излагања ће бити померено уназад за\n"
-"%d %s, %d %s, %d %s, и %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "дан"
-msgstr[1] "дана"
-msgstr[2] "дана"
-msgstr[3] "дан"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "сат"
-msgstr[1] "сата"
-msgstr[2] "сати"
-msgstr[3] "сат"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "минут"
-msgstr[1] "минута"
-msgstr[2] "минута"
-msgstr[3] "минут"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "секунду"
-msgstr[1] "секунде"
-msgstr[2] "секунди"
-msgstr[3] "секунду"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3985,91 +3744,13 @@ msgstr[3] ""
 "\n"
 "И %d друга."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Ознаке (раздвојене запетом):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Добро дошли!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Добро дошли у Фото-бунар!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "Да започнете, увезите фотографије на један од следећих начина:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Изаберите <span weight=\"bold\">Датотека %s Увези из фасцикле</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Превуците и убаците фотографију у прозор Фото-бунара"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "Повежите фото-апарат на рачунар и увезите фотографије"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Увези фотографије из фасцикле „%s“"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "Можете увести фотографије на неки од следећих начина:"
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr "_Не приказуј више ову поруку"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Увезите фотографије из фототеке „%s“"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Помоћ)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Година%sмесец%sдан"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Година%sмесец"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Година%sмесец-дан"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Година-месец-дан"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Произвољно"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Неисправан образац"
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4077,31 +3758,31 @@ msgstr ""
 "Фото-бунар може да умножи фотографије у фасциклу фототеке или да их увезе "
 "без умножавања."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "_Умножи фотографије"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "Увези _на месту"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Увезите у фототеку"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Уклоните из фототеке"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Уклањам фотографију из фототеке"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Уклањам фотографије из фототеке"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4130,7 +3811,7 @@ msgstr[2] ""
 "Ова радња не може бити поништена."
 msgstr[3] "   "
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4159,7 +3840,7 @@ msgstr[2] ""
 "Ова радња не може бити поништена."
 msgstr[3] "  "
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4188,7 +3869,7 @@ msgstr[2] ""
 "Ова радња не може бити поништена."
 msgstr[3] "       "
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4203,7 +3884,7 @@ msgstr[2] ""
 msgstr[3] "      "
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4245,6 +3926,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Не могу да отворим фотографију „%s“. Извините."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Сачувај"
 
@@ -4271,206 +3953,452 @@ msgid "Save As"
 msgstr "Сачувајте као"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Не могу да пратим „%s“: Није директоријум (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "ПрП"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "ПоП"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 сата"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Помери фотографије/снимке за исти износ"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Постави _све фотографије/снимке на ово време"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Измени изворну фотографију"
+msgstr[1] "_Измени изворне фотографије"
+msgstr[2] "_Измени изворне фотографије"
+msgstr[3] "_Измени изворну фотографију"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Измени изворну датотеку"
+msgstr[1] "_Измени изворне датотеке"
+msgstr[2] "_Измени изворне датотеке"
+msgstr[3] "_Измени изворну датотеку"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Изворно: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Време излагања ће бити померено унапред за\n"
+"%d %s, %d %s, %d %s, и %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Вреем излагања ће бити померено уназад за\n"
+"%d %s, %d %s, %d %s, и %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "дан"
+msgstr[1] "дана"
+msgstr[2] "дана"
+msgstr[3] "дан"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "сат"
+msgstr[1] "сата"
+msgstr[2] "сати"
+msgstr[3] "сат"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "минут"
+msgstr[1] "минута"
+msgstr[2] "минута"
+msgstr[3] "минут"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "секунду"
+msgstr[1] "секунде"
+msgstr[2] "секунди"
+msgstr[3] "секунду"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Неизмењено"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Текуће"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Запис:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Квалитет:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Однос промене величине:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Тачкица:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Извези _метаподатке:"
+
+#. We're installed system-wide, so use the system help.
+#. We're being run from the build directory; we'll have to handle clicks to this
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/dialogs/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Помоћ)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Година%sмесец%sдан"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Година%sмесец"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Година%sмесец-дан"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Година-месец-дан"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Произвољно"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Неисправан образац"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунде"
+msgstr[2] "%d секунди"
+msgstr[3] "%d секунда"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минут"
+msgstr[1] "%d минута"
+msgstr[2] "%d минута"
+msgstr[3] "%d минут"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d сат"
+msgstr[1] "%d сата"
+msgstr[2] "%d сати"
+msgstr[3] "%d сат"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 дан"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Добро дошли!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Добро дошли у Фото-бунар!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Да започнете, увезите фотографије на један од следећих начина:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Изаберите <span weight=\"bold\">Датотека %s Увези из фасцикле</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Превуците и убаците фотографију у прозор Фото-бунара"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Повежите фото-апарат на рачунар и увезите фотографије"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Увези фотографије из фасцикле „%s“"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Можете увести фотографије на неки од следећих начина:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Не приказуј више ову поруку"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Увезите фотографије из фототеке „%s“"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Врати на постојећу величину фотографије"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Подесите исецање за ову фотографију"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Заокрените правоугаоник исецања између водоравног и усправног усмерења"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Невезано"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Квадратно"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Екранско"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "—"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "СД видео (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "ХД видео (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Новчаник (2 × 3 инча)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Забелешка (3 × 5 инча)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 инча"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 инча"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 инча"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Писмо (8.5 × 11 ин.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 инча"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Таблоид (11 × 17 ин.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 инча"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Метрички новчаник (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Честитка (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Величина:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Затворите алат за уклањање црвених очију"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Уклоните ефекат црвених очију у изабраном делу фотографије"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Поново постави"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Излагање:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Контраст:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Засићење:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Боја:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Сенке:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Истицања:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Поврати боје"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Вратите сва дотеривања боје на изворна"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Боја"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Контраст"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Засићеност"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Изложеност"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Сенке"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Истицања"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Повећање контраста"
 
@@ -4483,11 +4411,7 @@ msgstr "Угао:"
 msgid "_Straighten"
 msgstr "_Исправи"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Догађаји"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4496,7 +4420,7 @@ msgstr[1] "%d фотографије/снимка"
 msgstr[2] "%d фотографија/снимака"
 msgstr[3] "%d фотографија/снимак"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4505,7 +4429,7 @@ msgstr[1] "%d снимка"
 msgstr[2] "%d снимака"
 msgstr[3] "%d снимак"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4518,27 +4442,35 @@ msgstr[3] "%d фотографија"
 msgid "No Event"
 msgstr "Без догађаја"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Догађаји"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Разгледајте вађе догађаје"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Нема догађаја"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Нисам пронашао догађаје"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Сви догађаји"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Без датума"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y."
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4578,20 +4510,16 @@ msgstr "Замени _све"
 msgid "Export"
 msgstr "Извези"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Фасцикле"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Фототека"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Разгледајте структуру фасцикле библиотеке"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Фотографије"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Обележенe"
 
@@ -4612,19 +4540,37 @@ msgstr "Увезао сам „%s“"
 msgid "Last Import"
 msgstr "Последњи увоз"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Фототека"
+
+#: src/library/LibraryBranch.vala:30
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Средите и разгледајте ваше фотографије"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Фотографије"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Увезите из фасцикле"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Дубачи по подфасциклама"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Испразни корпу"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Празним корпу…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4637,33 +4583,33 @@ msgstr ""
 "%s Поставке</span>.\n"
 "Да ли желите да наставите увоз фотографија?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Место фототеке"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Не могу да увезем фотографије из овог директоријума."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Освежавам фототеку…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Припремам фотографије за самостални увоз…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Самостално увозим фотографије…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Уписујем метаподатке у датотеке…"
 
@@ -4679,15 +4625,15 @@ msgstr "Бришем…"
 msgid "Trash"
 msgstr "Корпа"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Корпа је празна"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Обришите"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Бришем фотографије"
 
@@ -4734,32 +4680,36 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr "Учитавам Фото-бунар"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Путања до личних података Фото-бунара"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "ДИРЕКТОРИЈУМ"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Не прати директоријум фототеке за изменама у време покретања"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Не приказује мерач напредовања покретања"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Приказује издање програма"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Покреће програм у режиму преко целог екрана"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[ДАТОТЕКА]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4775,7 +4725,7 @@ msgstr "Не могу да обрадим освежења праћења: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Измените величину минијатура"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4784,15 +4734,15 @@ msgstr ""
 "Фото-бунар није успео да пусти изабрани снимак:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Нема фотографија/снимака"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Нисам пронашао фотографије/снимке који одговарају текућем филтеру"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Не могу да извезем фотографије у овај директоријум."
 
@@ -4856,7 +4806,7 @@ msgstr "Сирово"
 msgid "TIFF"
 msgstr "ТИФФ"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "измењено"
 
@@ -5026,7 +4976,7 @@ msgstr "Ауторско право:"
 msgid "Software:"
 msgstr "Софтвер:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Додатни подаци"
 
@@ -5080,37 +5030,37 @@ msgstr "Прибављам податаке о налогу…"
 msgid "Logging in…"
 msgstr "Пријављујем се…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Објавите фотографије"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Објави фотографије _на:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Објавите снимке"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Објави снимке _на"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Објавите фотографије и снимке"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Објави фотографије и снимке _на"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Објављивање није успело"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5155,9 +5105,10 @@ msgstr "Изврните водоравно"
 msgid "Flip Vertically"
 msgstr "Изврните усправно"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_О програму"
 
@@ -5180,11 +5131,11 @@ msgstr "Просл_еди"
 msgid "Fulls_creen"
 msgstr "Преко _целог екрана"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "По_моћ"
@@ -5600,7 +5551,7 @@ msgid "Adjust Date and Time"
 msgstr "Подесите датум и време"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Додај _ознаке…"
 
@@ -5691,7 +5642,7 @@ msgid "_Rename…"
 msgstr "_Преименуј…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Измени _ознаке…"
 
@@ -5746,7 +5697,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Не могу да преименујем претрагу „%s“ јер већ постоји та претрага."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Сачуване претраге"
 
@@ -5754,11 +5705,11 @@ msgstr "Сачуване претраге"
 msgid "Delete Search"
 msgstr "Избриши претрагу"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Уреди…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Преименуј…"
 
@@ -5828,7 +5779,7 @@ msgstr "_Поврати"
 msgid "Move the selected photos back into the library"
 msgstr "Преместите изабране фотографије назад у фототеку"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5844,7 +5795,8 @@ msgstr "Отворите директоријум изабраних фотог�
 msgid "Unable to open in file manager: %s"
 msgstr "Не могу да отворим управника датотека: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Уклони из _фототеке"
 
@@ -5907,151 +5859,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Покретни приказ"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Сачуване претраге"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "садржи"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "је тачно"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "почиње на"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "завршава се на"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "не садржи"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "није подешено"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "подешено"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "јесте"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "није"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "фотографија"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "сирова фотографија"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "снимак"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "има"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "нема"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "измене"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "унутрашње измене"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "спољне измене"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "обележена"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "необележена"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "и више"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "само"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "и ниже"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "после"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "пре"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "између"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "и"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Претрага"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "У реду"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "било која"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "све"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "ништа"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Било који текст"
@@ -6088,8 +6012,8 @@ msgstr "Врста обележја"
 msgid "Photo state"
 msgstr "Стање фотографије"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Оцена"
 
@@ -6097,27 +6021,36 @@ msgstr "Оцена"
 msgid "Date"
 msgstr "Датум"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Сачуване претраге"
+
+#: src/searches/SearchesBranch.vala:68
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Организујте ваше сачуване претраге"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ оцена"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ оцена"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ оцена"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ оцена"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ оцена"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Грешка учитавања корисничког сучеља траке претраге: %s"
@@ -6127,71 +6060,71 @@ 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Затвори"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Врста"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Снимци"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Сирове фотографије"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Користите сачувану претрагу да издвојите ставке у текућем прегледу"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Подешавања"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Претходна"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Идите на претходну фотографију"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Застани"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Зауставите покретни приказ"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Следећа"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Идите на следећу фотографију"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Подешавања"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Измените подешавања покретног приказа"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Недостају изворне датотеке свих фотографија."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Пусти"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Наставите пуштање покретног приказа"
 
@@ -6203,7 +6136,7 @@ msgstr "Прелази покретног приказа"
 msgid "(None)"
 msgstr "(Ниједна)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Ниједан"
 
@@ -6211,16 +6144,21 @@ msgstr "Ниједан"
 msgid "Random"
 msgstr "Насумично"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Ознаке"
 
+#: src/tags/TagsBranch.vala:131
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Средите и разгледајте ознаке ваших фотографија"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "безимено"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Извезите снимке"
 
@@ -6230,14 +6168,10 @@ msgid "Toggle _Flag"
 msgstr "Окини _заставицу"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Развијач"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "_Отвори спољним уређивачем"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6287,21 +6221,21 @@ msgstr "_Следећа фотографија"
 msgid "T_ools"
 msgstr "_Алати"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Често постаљана питања"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 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…"
+msgid "_Import From Folder…"
 msgstr "_Увези из фасцикле…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6379,17 +6313,12 @@ msgstr "_Опадајуће"
 msgid "Even_ts"
 msgstr "_Догађаји"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-msgid "R_emove from Library"
-msgstr "Уклони из _фототеке"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Наслови"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "_Ознаке"
 
@@ -6426,65 +6355,193 @@ msgstr "_Фотографије"
 msgid "_Stop Import"
 msgstr "_Заустави увоз"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "бела"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "црна"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Приказ"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Позадина:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Увези фотографије у:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Прати приспеће нових датотека у фасцикли фототеке"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Увозим"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Структура _директоријума:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Пример:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "_Промени назив увезених датотека на мала слова"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Метаподаци"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Уписуј ознаке, наслове и остале _метаподатке у датотеке фотографија"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Сирови развијач"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "_Основно:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Шаблон:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Провидна позадина:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Коцкаста"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Једнобојна"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "_Спољни уређивач фотографија:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Спољни _сирови уређивач:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Спољни уређивачи"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Прикључци"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Поставке Фото-бунара"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Величина одштампане фотографије</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Користи _уобичајену величину:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Користи _произвољну величину:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "инч"
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Одговара сразмери фотографије"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Самостална величина:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Наслови</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Штампај _називе фотографија"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Резолуција у тачкицама</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Штампај фотографије у:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "тачкица по инчу"
 
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Претрага"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Откажи"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "У реду"
+
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "_Назив претраге:"
+
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "_Поклапа"
+
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "било која"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "све"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "ништа"
+
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "од следећег:"
+
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Постави за позадину"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Користи за радну површ"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Користи за екран закључавања"
 
@@ -6492,142 +6549,155 @@ msgstr "Користи за екран закључавања"
 msgid "Set as Desktop Slideshow"
 msgstr "Постави као смењиву позадину радне површи"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Направи смењиву позадину радне површи"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Прикажи сваку фотографију за"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "време"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "Колико дуго ће свака фотографија бити приказана као позадина радне површи"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "бела"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "црна"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Приказ"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Позадина:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Увези фотографије у:"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Нова _ознака…"
 
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Прати приспеће нових датотека у фасцикли фототеке"
+#: ui/slideshow_settings.ui:91
+msgid "_Delay:"
+msgstr "_Застој:"
 
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Увозим"
+#: ui/slideshow_settings.ui:105
+msgid "_Transition effect:"
+msgstr "_Дејство прелаза:"
 
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Структура _директоријума:"
+#: ui/slideshow_settings.ui:119
+msgid "Transition d_elay:"
+msgstr "_Застој прелаза:"
 
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Пример:"
+#: ui/slideshow_settings.ui:129
+msgid "Show t_itle"
+msgstr "Прикажи _наслов"
 
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "_Промени назив увезених датотека на мала слова"
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
+msgid "seconds"
+msgstr "секунде"
 
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Метаподаци"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "натпис"
 
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Уписуј ознаке, наслове и остале _метаподатке у датотеке фотографија"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Обришите све фотографије из корпе"
 
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Сирови развијач"
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Унесите број потврђивања који се појављује након пријављивања на Фликр у "
+#~ "вашем интернет прегледнику."
 
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "_Основно:"
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Број овлашћења:"
 
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Шаблон:"
+#~ msgid "Width or height"
+#~ msgstr "Ширина и висина"
 
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "_Спољни уређивач фотографија:"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "„%s“ није исправан одговор на захтев потврђивања идентитета отвореног "
+#~ "потврђивања"
 
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Спољни _сирови уређивач:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Добро дошли у услугу увоза фототеке Ф-броја.\n"
+#~ "\n"
+#~ "Изаберите фототеку за увоз, било избором неке постојеће фототеке коју је "
+#~ "пронашао Фото-бунар било избором неке друге датотеке из збирке Ф-броја."
 
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Спољни уређивачи"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Добро дошли у услугу увоза фототеке Ф-броја.\n"
+#~ "\n"
+#~ "Изаберите датотеку из збирке Ф-броја."
 
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Прикључци"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Ручно изаберите датотеку збирке Ф-броја за увоз:"
 
-#: ui/shotwell.ui:590
-msgid "_Name of search:"
-msgstr "_Назив претраге:"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Не могу да отворим датотеку збирке Ф-броја: датотека не постоји или није "
+#~ "збирка Ф-броја"
 
-#: ui/shotwell.ui:644
-msgid "_Match"
-msgstr "_Поклапа"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Не могу да отворим датотеку збирке Ф-броја: Фото-бунар не подржава ово "
+#~ "издање збирке Ф-броја"
 
-#: ui/shotwell.ui:671
-msgid "of the following:"
-msgstr "од следећег:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Не могу да прочитам изабрану датотеку збирке Ф-броја: грешка приликом "
+#~ "читања табеле ознака"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "натпис"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Не могу да прочитам изабрану датотеку збирке Ф-броја: грешка приликом "
+#~ "читања табеле фотографија"
 
-#: ui/shotwell.ui:903
-msgid "_Delay:"
-msgstr "_Застој:"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Фото-бунар је пронашао %d фотографије/а у фототеци Ф-броја и тренутно их "
+#~ "увози. Дупликати ће самостално бити пронађени и уклоњени.\n"
+#~ "\n"
+#~ "Можете затворити ово прозорче и почети да користите Фото-бунар док ће се "
+#~ "увоз фотографија наставити у позадини."
 
-#: ui/shotwell.ui:917
-msgid "_Transition effect:"
-msgstr "_Дејство прелаза:"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Фототека Ф-броја: %s"
 
-#: ui/shotwell.ui:931
-msgid "Transition d_elay:"
-msgstr "_Застој прелаза:"
+#~ msgid "Preparing to import"
+#~ msgstr "Припремам за увоз"
 
-#: ui/shotwell.ui:941
-msgid "Show t_itle"
-msgstr "Прикажи _наслов"
+#~ msgid "Core Data Import Services"
+#~ msgstr "Услуге увоза кључних података"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
-msgid "seconds"
-msgstr "секунде"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Извезите фотографије/снимке"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Нова _ознака…"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "_Отвори спољним уређивачем"
 
-#: ui/trash.ui:285
-msgid "Delete all photos in the trash"
-msgstr "Обришите све фотографије из корпе"
+#~ msgid "R_emove from Library"
+#~ msgstr "Уклони из _фототеке"
 
 #~ msgid "L_ist album in public gallery"
 #~ msgstr "_Испиши албум у јавној галерији"
@@ -6855,9 +6925,6 @@ msgstr "Обришите све фотографије из корпе"
 #~ msgid "RAW photos"
 #~ msgstr "Сирове фотографије"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Поставке Фото-бунара"
-
 #~| msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Ауторска права 2009-2015 Јорба фондација"
diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo
index aa61ffe..24021c9 100644
--- a/po/sr@latin.gmo
+++ b/po/sr@latin.gmo
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 463cf51..c5066ee 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,16 +1,16 @@
 # Serbian translation of shotwell.
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2017.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2018.
 # Copyright 2016 Software Freedom Conservancy Inc.
 # Mitko Krstev <m.krstev@hotmail.com>, 2011.
 # Nikola Radovanović <nrad@eunet.rs>, 2011—2013.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2014—2017.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2014—2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwe"
 "ll&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-05-05 06:58+0200\n"
+"POT-Creation-Date: 2018-01-17 19:38+0000\n"
+"PO-Revision-Date: 2018-02-21 07:54+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: srpski <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
@@ -21,10 +21,10 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Foto-bunar"
@@ -66,16 +66,16 @@ msgstr "Foto-bunar podržava JPEG, PNG, TIFF i razne sirove zapise datoteka."
 msgid "The Shotwell developers"
 msgstr "Programeri Foto-bunara"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Upravnik fotografija"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organizujte vaše fotografije"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -86,15 +86,15 @@ msgstr ""
 "okreni;deli;oznake;video;fejsbuk;flikr;pikasa;jutub;pivigo;"
 
 #. 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Foto-bunar pregledač fotografija"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Pregledač fotografija"
 
@@ -123,7 +123,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Tajni simbol za prijavljivanje zahteva otvorenog potvrđivanja"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "osnovna veličina"
 
@@ -151,9 +151,9 @@ msgid "URL of the Rajce server."
 msgstr "Adresa Rajce servera."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "korisnik"
 
@@ -170,7 +170,7 @@ msgid "user token, if remembered."
 msgstr "korisnikov simbol, ako je zapamćen."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "poslednja kategorija"
 
@@ -179,7 +179,7 @@ msgid "The last selected Rajce category."
 msgstr "Poslednja izabrana Rajce kategorija."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "poslednja veličina fotografije"
 
@@ -219,11 +219,11 @@ msgstr ""
 "fotografija"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "uklanja osetljive podatke iz otpremanja"
 
@@ -485,10 +485,26 @@ msgid "A grayscale color for use as the background color."
 msgstr "Boja nijanse sive za upotrebu kao boja pozadine."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "pozadina za providne slike"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Pozadina koja će se koristiti za providne slike."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "boja za pozadinu pune providnosti"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr "Boja koja će se koristiti za providne slike je podešena na punu boju"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Stanje izbora opcije „sakrij fotografije“"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -496,29 +512,29 @@ msgstr ""
 "Poslednje korišćeno stanje izbora opcije „sakrij već uvezene fotografije“ na "
 "stranici uvoza."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "zastoj"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Zastoj (u sekundama) između fotografija u pokretnom prikazu."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "zastoj prelaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Vreme (u sekundama) trajanja prelaza između fotografija u pokretnom prikazu"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "id dejstva prelaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -526,69 +542,69 @@ msgstr ""
 "Naziv dejstva prelaza koje će se koristiti između fotografija prilikom "
 "trajanja pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "prikazuje naslov"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Da li će prikazivati naslov fotografije za vreme pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "uveličava prozor bibliteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "Izabrano ako je program biblioteke uveličan, poništeno u suprotnom."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "širina prozora biblioteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Poslednja pribeležena širina prozora programa biblioteke."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "visina prozora biblioteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Poslednja pribeležena visina prozora programa biblioteke."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "uveličava prozor neposrednog uređivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Izabrano ako je program neposrednog uređivanja uveličan, poništeno u "
 "suprotnom."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "širina prozora neposrednog uređivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Poslednja pribeležena širina prozora programa neposrednog uređivanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "visina prozora neposrednog uređivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Poslednja pribeležena visina prozora programa neposrednog uređivanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "položaj razdelnika bočne površi"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -596,29 +612,29 @@ msgstr ""
 "Poslednji zapamćeni položaj razdelnika između bočne površi i pregleda u "
 "prozoru programa biblioteke."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "direktorijum uvoza"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Direktorijum u kome se stavljaju datoteke uvezenih fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "prati prispeće novih datoteka u fascikli fototeke"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Ako je izabrano, datoteke dodate u direktorijum biblioteke se odmah uvoze."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "upisuje metapodatke u glavne datoteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -626,11 +642,11 @@ msgstr ""
 "Ako je izabrano, izmene u metapodacima (oznake, naslovi, itd.) se zapisuju u "
 "datoteku glavne fotografije."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "koristi nazive datoteka malim slovima"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -638,11 +654,11 @@ msgstr ""
 "Ako je izabrano, Foto-bunar će prebaciti sve nazive datoteka na mala slova "
 "prilikom uvoza datoteka fotografija"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "šablon direktorijuma"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -650,11 +666,11 @@ msgstr ""
 "Niska koja kodira šablon imenovanja koji će biti korišćen za imenovanje "
 "direktorijuma fotografija pri uvozu."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "proizvoljni šablon direktorijuma"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -662,30 +678,30 @@ msgstr ""
 "Niska koja kodira proizvoljni šablon imenovanja koji će biti korišćen za "
 "imenovanje direktorijuma fotografija pri uvozu."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "osnovni sirovi razvijač"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Osnovna opcija za koju će sirovog razvijača Foto-bunar koristiti."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Najčešće skoro korišćen izbor izbornika odnosa srazmere odsecanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Brojčani kod koji predstavlja poslednji izbor izbornika odsecanja koji je "
 "načinio korisnik."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Najčešće skoro korišćen numerator proizvoljnog odnosa srazmere odsecanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -693,12 +709,12 @@ msgstr ""
 "Ne-nulti, pozitivni ceo broj koji predstavlja deo širine poslednje srazmere "
 "proizvoljnog odsecanja koji je uneo korisnik."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Najčešće skoro korišćen denomerator proizvoljnog odnosa srazmere odsecanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -706,143 +722,143 @@ msgstr ""
 "Ne-nulti, pozitivni ceo broj koji predstavlja deo visine poslednje srazmere "
 "proizvoljnog odsecanja koji je uneo korisnik."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "spoljni uređivač fotografija"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Spoljni program korišćen za uređivanje fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "spoljni sirovi uređivač"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Spoljni program korišćen za uređivanje sirovih fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Podešavanje u prozorčetu izvoza: kako da skrati slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "izvoz metapodataka"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Podešavanje u prozorčetu izvoza: opcija za izvoz metapodataka"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "podešavanje formata, posebna vrednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Podešavanje u prozorčetu izvoza: podešavanje formata, posebna vrednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "podešavanje formata, vrednost vrste"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Podešavanje u prozorčetu izvoza: podešavanje formata, vrednost vrste"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Opcija JPEG kvaliteta"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Podešavanje u prozorčetu izvoza: opcija jpeg kvaliteta"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "najveća veličina slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Podešavanje u prozorčetu izvoza: najveća veličina slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "poslednja korišćena usluga objavljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Brojčani kod koji predstavlja poslednju uslugu na kojoj su fotografije "
 "objavljene"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "osnovna usluga objavljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "simbol pristupa"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Simbol otvorenog potvrđivanja Fejsbuka za trenutno prijavljenu sesiju, ako "
 "postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "i.d. korisnika"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "i.d. korisnika Fejsbuka, za trenutno prijavljenog korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "korisnik"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Ime trenutno prijavljenog korisnika Fejsbuka, ako ga ima"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "šifra osnovne veličine"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Brojčani kod koji predstavlja osnovnu veličinu za fotografije objavljene na "
 "Fejsbuku"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr "Da li će sa slika otpremljenih na Fejsbuk biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Simbol otvorenog potvrđivanja faze pristupa"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Simbol potvrđivanja identiteta za trenutno prijavljenog korisnika Flikra, ako "
 "postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Tajna simbola otvorenog potvrđivanja faze pristupa"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -850,22 +866,22 @@ msgstr ""
 "Kriptografska tajna koja se koristi za označavanje zahteva nad simbolom "
 "potvrđivanja identiteta za trenutno prijavljenog korisnika Flikra, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Ime trenutno prijavljenog korisnika Flikra, ako ga ima"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Brojčani kod koji predstavlja osnovnu veličinu za fotografije objavljene na "
 "Flikru"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "osnovna vidljivost"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -873,18 +889,18 @@ msgstr ""
 "Brojčani kod koji predstavlja osnovnu vidljivost za fotografije objavljene na "
 "Flikru"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "Da li će sa slika otpremljenih na Flikr biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "simbol osvežavanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -892,7 +908,7 @@ msgstr ""
 "Simbol otvorenog potvrđivanja koji se koristi za osvežavanje sesije Pikasa veb "
 "albuma za trenutno prijavljenog korisnika, ako postoji."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -900,64 +916,64 @@ msgstr ""
 "Brojčani kod koji predstavlja osnovnu veličinu za fotografije otpremljene na "
 "Pikasa veb albume"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "poslednji album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Naziv poslednjeg albuma na koji je korisnik objavio fotografije, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "Da li će sa slika otpremljenih na Pikasu biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Adresa Piviga"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Adresa Pivigo servera."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Korisničko ime za Pivigo, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "lozinka"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Lozinka za Pivigo, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "zapamti lozinku"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Ako je izabrano, pamtiće lozinku za Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Poslednja izabrana kategorija za Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "poslednji nivo ovlašćenja"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Poslednji izabrani nivo ovlašćenja za Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -965,20 +981,20 @@ msgstr ""
 "Brojčani kod koji predstavlja podešenost veličine poslednje fotografije koja "
 "je korišćena prilikom objavljivanja na Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "Da li će sa slika otpremljenih na Pivigo biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ako je naslov podešen a napomena nije, koristi naslov kao napomenu za "
 "otpremanja na Pivigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -986,11 +1002,11 @@ msgstr ""
 "Da li će slike otpremljene na Pivigo imati svoje napomene postavljene iz "
 "naslova ako je isti postavljen a napomena poništena"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "ne otprema oznake kada otprema na Pivigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -998,27 +1014,27 @@ msgstr ""
 "Da li iz slika koje se otpremaju na Pivigo treba da se uklone njihove oznake "
 "pri otpremanju, tako da se te oznake neće pojaviti na udaljenom serveru Piviga."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Korisničko ime Galerije 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API ključ"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "API ključ Galerije 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Adresa"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Adresa sajta Galerije 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -1026,19 +1042,19 @@ msgstr ""
 "Naznačava da li će sa slika otpremljenih na Galeriju 3 biti prvo uklonjeni "
 "metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "ograničenje srazmeravanja otpremljene slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "ID ograničenja srazmeravanja slike koja se otprema"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "pikseli veće ose otpremljene slike"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1046,7 +1062,7 @@ msgstr ""
 "Pikseli veće ose slike koja se otprema; koristi se samo ako je id ograničenja "
 "srazmeravanja odgovarajuća vrednost"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1054,30 +1070,30 @@ msgstr ""
 "Simbol otvorenog potvrđivanja koji se koristi za osvežavanje sesije Jutuba za "
 "trenutno prijavljenog korisnika, ako postoji."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "poslednja korišćena usluga uvoza"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Brojčani kod koji predstavlja poslednju uslugu sa koje su fotografije uvezene"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "kolačić stanja tumača"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Brojčani kod koji hvata stanje okruženja priključka Gstrimera"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "režim rasporeda sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1085,35 +1101,35 @@ msgstr ""
 "Brojčani kod koji opisuje kako se fotografije ređaju na stranici za vreme "
 "štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppi sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Broj piksela po inču (ppi) poslatih štampaču za vreme štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "širina sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Širina štampanog materijala na stranici prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "visina sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Visina štampanog materijala na stranici prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "jedinice sadržaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1121,11 +1137,11 @@ msgstr ""
 "Brojčani kod koji predstavlja jedinicu mere (inči ili centimetri) koja se "
 "koristi prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "broj fotografija po stranici"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1133,22 +1149,22 @@ msgstr ""
 "Brojčani kod koji predstavlja trenutno izabrani režim broja slika po stranici "
 "prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "izbor veličine"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Indeks trenutne veličine štampanja u unapred određenom spisku standardnih "
 "veličina"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "odgovara odnosu srazmere"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1156,11 +1172,11 @@ msgstr ""
 "Određuje da li proizvoljne veličine štampanja moraju da odgovaraju odnosu "
 "srazmere izvorne fotografije"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "štampa naslove"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1168,221 +1184,219 @@ msgstr ""
 "Izabrano ako naslov fotografije treba da se odštampa prilikom štampanja, u "
 "suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "slova naslova"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Naziv slovne grupe koja će se koristiti za naslove fotografija prilikom "
 "štampanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "uključuje priključak objavljivanja na fejsbuk"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Fejsbuk, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "uključuje priključak objavljivanja na flikr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Flikr, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "uključuje priključak objavljivanja na pikasu"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Pikasu, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "uključuje priključak objavljivanja na jutub"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Jutub, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "uključuje priključak objavljivanja na pivigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Pivigo, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "uključuje priključak objavljivanja na jandeks"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Jandeks.Fotki, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "uključuje priključak objavljivanja na tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Tumblr, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "uključuje priključak objavljivanja na rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Rajse, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "uključuje priključak objavljivanja na galeriju 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Galeriju 3, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "uključuje priključak uvoza F-broja"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Izabrano ako je uključen priključak uvoza F-boja, u suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "uključuje raspadanje prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak raspadanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "uključuje iščezavanje prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak iščezavanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "uključuje klizanje prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak klizanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "uključuje sat prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak sata prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "uključuje krug prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak kruga prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
-#| msgid "enable slideshow circle transition"
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
-msgstr "uključuje kružne prelaze pokretnog prikaza"
+msgstr "uključuje krugove prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
-"Izabrano ako je uključen priključak kružnih prelaza pokretnog prikaza, u "
+"Izabrano ako je uključen priključak krugova prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
-#| msgid "enable slideshow slide transition"
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
-msgstr "uključuje zastore prelaza pokretnog prikaza"
+msgstr "uključuje klizanje prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak zastora prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "uključuje kvadrate prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak kvadrata prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "uključuje štrafte prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak štrafti prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "uključuje šah prelaza pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1418,24 +1432,7 @@ msgstr ""
 "Da nastavite objavljivanje fotografija na Fejsbuku, izađite i ponovo pokrenite "
 "Foto-bunar, pa pokušajte ponovo."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Unesite broj potvrđivanja koji se pojavljuje nakon prijavljivanja na Flikr u "
-"vašem internet pregledniku."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Broj ovlašćenja:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "_Nastavi"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1447,20 +1444,15 @@ msgstr ""
 "Prijavite se na Flikr u vašem internet pregledniku. Moraćete da ovlastite "
 "Povezivanje Foto-bunara da napravi vezu do vašeg naloga Flikra."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Pripremam se za prijavljivanje…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Datoteka za objavljivanje nije dostupna. Objavljivanje na Flikr ne može da se "
-"nastavi."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Nije uspelo ovlašćenje Flikra"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Proveravam ovlašćenje…"
 
@@ -1478,7 +1470,7 @@ msgstr ""
 "Da nastavite objavljivanje na Guglovim uslugama, izađite i ponovo pokrenite "
 "Foto-bunar, pa pokušajte ponovo."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1491,7 +1483,7 @@ msgstr ""
 "ovlastite Povezivanje Foto-bunara da napravi vezu do vašeg naloga Veb albuma "
 "Pikase."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1505,11 +1497,51 @@ msgstr ""
 "korišćenje sa Jutubom. Možete da podesite većinu naloga koristeći vaš "
 "preglednik da se prijavite na sajt Jutuba barem jednom."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "Adresa _el. pošte"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Lozinka"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Prijavi me"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Unesite korisničko ime i lozinku pridruženu vašem nalogu Tumblr-a."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Korisničko ime i/ili lozinka nisu ispravni. Pokušajte ponovo"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Neispravno korisničko ime ili lozinka"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Ne mogu da učitam korisničko sučelje: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Posetite veb stranicu Foto-bunara"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Nikola Radovanović <nrad@eunet.rs>\n"
@@ -1518,14 +1550,14 @@ msgstr ""
 "http://prevod.org — prevod na srpski jezik"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
 "⚫ Ovaj veb sajt je predstavio raspoznavanje koje pripada drugom veb sajtu."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1534,20 +1566,20 @@ msgstr ""
 "kalendaru vašeg računara."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
 "⚫ Raspoznavanje ovog veb sajta nije izdato od strane poverljive organizacije."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr "⚫ Raspoznavanje ovog veb sajta se ne može obraditi. Možda je oštećeno."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1556,7 +1588,7 @@ msgstr ""
 "koja ga je izdala."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1565,7 +1597,7 @@ msgstr ""
 "šifrovanje."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1573,106 +1605,11 @@ msgstr ""
 "⚫ Raspoznavanje ovog veb sajta je važeće samo za buduće datume. Proverite "
 "datum na kalendaru vašeg računara."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Privremena datoteka neophodna za objavljivanje nije dostupna"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Autorska prava 2016 Društvo za Očuvanje Slobode Softvera"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Dobro došli u uslugu uvoza fototeke F-broja.\n"
-"\n"
-"Izaberite fototeku za uvoz, bilo izborom neke postojeće fototeke koju je "
-"pronašao Foto-bunar bilo izborom neke druge datoteke iz zbirke F-broja."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Dobro došli u uslugu uvoza fototeke F-broja.\n"
-"\n"
-"Izaberite datoteku iz zbirke F-broja."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Ručno izaberite datoteku zbirke F-broja za uvoz:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Ne mogu da otvorim datoteku zbirke F-broja: datoteka ne postoji ili nije "
-"zbirka F-broja"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Ne mogu da otvorim datoteku zbirke F-broja: Foto-bunar ne podržava ovo "
-"izdanje zbirke F-broja"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Ne mogu da pročitam izabranu datoteku zbirke F-broja: greška prilikom čitanja "
-"tabele oznaka"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Ne mogu da pročitam izabranu datoteku zbirke F-broja: greška prilikom čitanja "
-"tabele fotografija"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Foto-bunar je pronašao %d fotografije/a u fototeci F-broja i trenutno ih "
-"uvozi. Duplikati će samostalno biti pronađeni i uklonjeni.\n"
-"\n"
-"Možete zatvoriti ovo prozorče i početi da koristite Foto-bunar dok će se "
-"uvoz fotografija nastaviti u pozadini."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Fototeka F-broja: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Pripremam za uvoz"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Usluge uvoza ključnih podataka"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adresa _Galerije 3:"
@@ -1690,7 +1627,7 @@ msgid "Go _Back"
 msgstr "_Nazad"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "_Prijavi me"
 
@@ -1724,7 +1661,7 @@ msgid "pixels"
 msgstr "tačkica"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1732,17 +1669,17 @@ msgstr "Izvorna veličina"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Širina i visina"
+msgid "Longest edge"
+msgstr "Duža ivica"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Odjavi me"
@@ -1750,11 +1687,11 @@ msgstr "_Odjavi me"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1762,7 +1699,7 @@ msgstr "_Objavi"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
-msgstr "Modulobjavljivanja Galerije 3"
+msgstr "Modul objavljivanja Galerije 3"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
@@ -1852,31 +1789,11 @@ msgstr "Nepoznati korisnik"
 msgid " Site Not Found"
 msgstr " Nisam pronašao sajt"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "Adresa _el. pošte"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Lozinka"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Zapamti"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Prijavi me"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1928,83 +1845,10 @@ msgstr "Prijavljeni ste na Rajs kao %s."
 msgid "Photos will appear in:"
 msgstr "Fotografije će se pojaviti u:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Foto-bunarove dodatne usluge objavljivanja"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Blogovi:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Veličina _fotografije:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Autorska prava 2012 BJA Elektronika"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 × 375 piksela"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 piksela"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 piksela"
-
-#: 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“ nije ispravan odgovor na zahtev potvrđivanja identiteta otvorenog "
-"potvrđivanja"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"„TumblrPublisher: start( ):“ ne može da se pokrene; ovaj objavljivač nije za "
-"ponovno pokretanje."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Unesite korisničko ime i lozinku pridruženu vašem nalogu Tumblr-a."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Korisničko ime i/ili lozinka nisu ispravni. Pokušajte ponovo"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Neispravno korisničko ime ili lozinka"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Ne mogu da učitam korisničko sučelje: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Prijavljeni ste na Tumblr kao %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Autorska prava 2010+ Jevgenij Poljakov <zbr@ioremap.net>"
@@ -2072,6 +1916,14 @@ msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr "_Ukloni mesto, foto-aparat, i druge podatke prepoznavanja pre otpremanja"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Autorska prava 2016 Društvo za Očuvanje Slobode Softvera"
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2112,17 +1964,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Gde želite da objavite izabrane fotografije?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Samo meni"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Svima"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Veličina _fotografije:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Datoteka za objavljivanje nije dostupna. Objavljivanje na Flikr ne može da se "
+"nastavi."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2131,7 +1996,7 @@ msgstr ""
 "Prijavljeni ste na Flikr kao %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2141,40 +2006,52 @@ msgstr ""
 "da otpremite.\n"
 "Za ovaj mesec imate samo još %s za otpremanje."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Vaš nalog Flikra Pro vam omogućava neograničena otpremanja."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Fotografije mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Video snimke mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Fotografije i snimke mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Samo prijatelji i porodica"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Samo porodica"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Samo prijatelji"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 piksela"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 piksela"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 piksela"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 piksela"
@@ -2226,7 +2103,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Gugl+ (2048 × 1536 piksela)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Izvorna veličina"
 
@@ -2310,7 +2187,8 @@ msgid "Certificate of %s"
 msgstr "Uverenje „%sd"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "U _redu"
 
@@ -2362,10 +2240,38 @@ msgstr "Prikaži uverenje…"
 msgid "I understand, please _proceed."
 msgstr "Razumem, _nastavi"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Ključne usluge objavljivanja"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Blogovi:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Autorska prava 2012 BJA Elektronika"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 piksela"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"„TumblrPublisher: start( ):“ ne može da se pokrene; ovaj objavljivač nije za "
+"ponovno pokretanje."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Prijavljeni ste na Tumblr kao %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "Podešavanje _privatnosti snimka:"
@@ -2490,16 +2396,17 @@ msgstr "Pribodite otvorenu traku lata"
 msgid "Leave fullscreen"
 msgstr "Napustite prikaz preko celog ekrana"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:305 src/publishing/PublishingUI.vala:529
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2512,27 +2419,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – „Ahen“"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Posetite veb stranicu Foto-bunara"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Ne mogu da prikažem pomoć: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Ne mogu da pristupim bazi podataka grešaka: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Ne mogu da prikažem ČPP: %s"
@@ -2598,17 +2499,28 @@ msgstr "Oštećena datoteka fotografije"
 msgid "Imported failed (%d)"
 msgstr "Uvoz nije uspeo (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Foto-aparati"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Spisak svih otkrivenih foto-aparata"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "Foto-aparat"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2621,32 +2533,32 @@ msgstr ""
 "upravnika datoteka."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Sakrij već uvezene fotografije"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Prikaži samo fotografije koje nisu uvezene"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Uvezi _izabrano"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Uvezi _sve"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "Izgleda da je foto-aparat prazan. Nema fotografija/snimaka za uvoz"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Nisam pronašao nove fotografije/snimke na foto-aparatu"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2654,15 +2566,15 @@ msgstr ""
 "Foto-bunar mora da otkači foto-aparat sa sistema da bi mu pristupio. Da "
 "nastavim?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Otkači"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Otkačite foto-aparat."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2672,11 +2584,11 @@ msgstr ""
 "aparatu samo kada je otključan. Zatvorite sve druge programe koji koriste "
 "foto-aparat i pokušajte ponovo."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Zatvorite sve druge programe koji koriste foto-aparat."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2685,29 +2597,33 @@ msgstr ""
 "Ne mogu da dovučem pretpreglede fotografija sa foto-aparata:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Otkačinjem…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Povezujem se na foto-aparat, sačekajte malo…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Započinjem uvoz, sačekajte malo…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Preuzimam podatke o fotografiji"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Preuzimam pretpregled za „%s“"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Ne mogu da zaključam foto-aparat: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2716,7 +2632,7 @@ msgstr[1] "Da obrišem ove %d fotografije sa foto-aparata?"
 msgstr[2] "Da obrišem ovih %d fotografija sa foto-aparata?"
 msgstr[3] "Da obrišem ovu %d fotografiju sa foto-aparata?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2725,7 +2641,7 @@ msgstr[1] "Da obrišem ova %d snimka sa foto-aparata?"
 msgstr[2] "Da obrišem ovih %d snimaka sa foto-aparata?"
 msgstr[3] "Da obrišem ovaj %d snimak sa foto-aparata?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2734,7 +2650,7 @@ msgstr[1] "Da obrišem ove %d fotografije/snimka sa foto-aparata?"
 msgstr[2] "Da obrišem ovih %d fotografija/snimaka sa foto-aparata?"
 msgstr[3] "Da obrišem ovu %d fotografiju/snimak sa foto-aparata?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2743,15 +2659,15 @@ msgstr[1] "Da obrišem ove %d datoteke sa foto-aparata?"
 msgstr[2] "Da obrišem ovih %d datoteka sa foto-aparata?"
 msgstr[3] "Da obrišem ovu %d datoteku sa foto-aparata?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Uklanjam fotografije/snimke sa foto-aparata"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2770,7 +2686,7 @@ msgid "_Print"
 msgstr "_Štampaj"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Pošalji _u…"
 
@@ -2812,13 +2728,13 @@ msgid "Flip Verti_cally"
 msgstr "Izvrni _uspravno"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Poboljšaj"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Vrati na izvorno"
@@ -2835,12 +2751,13 @@ msgstr "_Ubaci doterivanja boje"
 msgid "Adjust Date and Time…"
 msgstr "Podesite datum i vreme…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "_Otvori spoljnim uređivačem"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "Otvori uređivačem _sirovih"
 
@@ -2848,43 +2765,43 @@ msgstr "Otvori uređivačem _sirovih"
 msgid "_Play"
 msgstr "Pu_sti"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Izvezite fotografiju/snimak"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Izvezite fotografije/snimke"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Izvezite fotografiju/snimak"
+msgstr[1] "Izvezite fotografije/snimke"
+msgstr[2] "Izvezite fotografije/snimke"
+msgstr[3] "Izvezite fotografiju/snimak"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Izvezite fotografiju"
+msgid_plural "Export Photos"
+msgstr[0] "Izvezite fotografiju"
+msgstr[1] "Izvezite fotografije"
+msgstr[2] "Izvezite fotografije"
+msgstr[3] "Izvezite fotografiju"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Izvezite fotografije"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Okrećem"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Poništavam okretanje"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Izvrćem vodoravno"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Poništavam vodoravno izvrtanje"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Izvrćem uspravno"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Poništavam uspravno izvrtanje"
 
@@ -3106,19 +3023,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "Datoteka zbirke:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Uvezi"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "Uvezite iz programa"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "Uvezi medijum _iz:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:524
 msgid "_Close"
 msgstr "_Zatvori"
 
@@ -3189,9 +3106,9 @@ msgstr[1] "Ovo će ukloniti oznaku „%s“ iz %d fotografije. Da nastavim?"
 msgstr[2] "Ovo će ukloniti oznaku „%s“ iz %d fotografija. Da nastavim?"
 msgstr[3] "    "
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Izbriši"
@@ -3229,6 +3146,10 @@ msgstr "_Promeni razvijača"
 msgid "Export Video"
 msgstr "Izvezi snimak"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Izvezite fotografije"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3261,56 +3182,28 @@ msgstr ""
 "\n"
 "Da li želite da nastavite izvoz?"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "Neizmenjeno"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "Tekuće"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "_Zapis:"
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "_Kvalitet:"
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "_Odnos promene veličine:"
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "_Tačkica:"
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "Izvezi _metapodatke:"
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "_Nastavi"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "Sačuvaj pojedinosti…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "Sačuvaj pojedinosti"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(i još %d)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "Izveštaj rezultata uvoza"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3319,7 +3212,7 @@ msgstr[1] "Pokušah da uvezem %d datoteke."
 msgstr[2] "Pokušah da uvezem %d datoteka."
 msgstr[3] "Pokušah da uvezem %d datoteku."
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3331,37 +3224,37 @@ msgstr[3] "Od ovih, %d datoteka je uspešno uvezena."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Udvostručene fotografije/snimci nisu uvezeni:"
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "udvostručava postojeću stavku medijuma"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotografije/snimci nisu uvezeni zbog greške foto-aparata:"
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "poruka greške:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Datoteke nisu uvezene jer nisu prepoznate kao fotografije ili snimci:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3372,7 +3265,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3380,7 +3273,7 @@ msgstr ""
 "Fotografije/snimci nisu uvezeni jer Foto-bunar ne može da ih umnoži u svojoj "
 "fototeci:"
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3392,18 +3285,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografije/snimci nisu uvezeni jer su datoteke oštećene:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografije/snimci nisu uvezeni iz drugih razloga:"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3412,7 +3305,7 @@ msgstr[1] "%d udvostručene fotografije nisu uvezene:\n"
 msgstr[2] "%d udvostručenih fotografija nije uvezeno:\n"
 msgstr[3] "%d udvostručena fotografija nije uvezena:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3421,7 +3314,7 @@ msgstr[1] "%d udvostručena snimka nisu uvezena:\n"
 msgstr[2] "%d udvostručenih snimaka nije uvezeno:\n"
 msgstr[3] "%d udvostručeni snimak nije uvezen:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3430,7 +3323,7 @@ msgstr[1] "%d udvostručene fotografije/snimka nisu uvezene:\n"
 msgstr[2] "%d udvostručenih fotografija/snimaka nije uvezeno:\n"
 msgstr[3] "%d udvostručena fotografija/snimak nije uvezena:\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, 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"
@@ -3445,7 +3338,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju zbog greške u datoteci ili na uređaju:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, 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"
@@ -3458,7 +3351,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d snimak zbog greške u datoteci ili na uređaju:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3476,7 +3369,7 @@ msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak zbog greške u datoteci ili na "
 "uređaju:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, 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"
@@ -3489,7 +3382,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d datoteku zbog greške u datoteci ili na uređaju:\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3505,7 +3398,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju jer fascikla fototeke nije upisiva:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3521,7 +3414,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d snimak jer fascikla fototeke nije upisiva:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3542,7 +3435,7 @@ msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak jer fascikla fototeke nije "
 "upisiva:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3558,7 +3451,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d datoteku jer fascikla fototeke nije upisiva:\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, 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"
@@ -3567,7 +3460,7 @@ msgstr[1] "Nisam uspeo da uvezem %d fotografije zbog greške na foto-aparatu:\n"
 msgstr[2] "Nisam uspeo da uvezem %d fotografija zbog greške na foto-aparatu:\n"
 msgstr[3] "Nisam uspeo da uvezem %d fotografiju zbog greške na foto-aparatu:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, 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"
@@ -3576,7 +3469,7 @@ msgstr[1] "Nisam uspeo da uvezem %d snimka zbog greške na foto-aparatu:\n"
 msgstr[2] "Nisam uspeo da uvezem %d snimaka zbog greške na foto-aparatu:\n"
 msgstr[3] "Nisam uspeo da uvezem %d snimak zbog greške na foto-aparatu:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, 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"
@@ -3589,7 +3482,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak zbog greške na foto-aparatu:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, 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"
@@ -3598,7 +3491,7 @@ msgstr[1] "Nisam uspeo da uvezem %d datoteke zbog greške na foto-aparatu:\n"
 msgstr[2] "Nisam uspeo da uvezem %d datoteka zbog greške na foto-aparatu:\n"
 msgstr[3] "Nisam uspeo da uvezem %d datoteku zbog greške na foto-aparatu:\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, 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"
@@ -3607,7 +3500,7 @@ msgstr[1] "Nisam uspeo da uvezem %d fotografije jer su oštećene:\n"
 msgstr[2] "Nisam uspeo da uvezem %d fotografija jer su oštećene:\n"
 msgstr[3] "Nisam uspeo da uvezem %d fotografiju jer je oštećena:\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, 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"
@@ -3616,7 +3509,7 @@ msgstr[1] "Nisam uspeo da uvezem %d snimka jer su oštećeni:\n"
 msgstr[2] "Nisam uspeo da uvezem %d snimka jer su oštećeni:\n"
 msgstr[3] "Nisam uspeo da uvezem %d snimak jer je oštećen:\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, 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"
@@ -3625,7 +3518,7 @@ msgstr[1] "Nisam uspeo da uvezem %d fotografije/snimka jer su oštećene:\n"
 msgstr[2] "Nisam uspeo da uvezem %d fotografija/snimaka jer su oštećene:\n"
 msgstr[3] "Nisam uspeo da uvezem %d fotografiju/snimak jer je oštećena:\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3638,7 +3531,7 @@ msgstr[3] "Nisam uspeo da uvezem %d datoteku jer je oštećena:\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3649,7 +3542,7 @@ msgstr[3] "Preskočio sam %d nepodržanu fotografiju:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3658,7 +3551,7 @@ msgstr[1] "Preskočio sam %d datoteke koje nisu fotografije.\n"
 msgstr[2] "Preskočio sam %d datoteka koje nisu fotografije.\n"
 msgstr[3] "Preskočio sam %d datoteku koja nije fotografija.\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -3667,7 +3560,7 @@ msgstr[1] "Preskočio sam %d fotografije jer je korisnik otkazao:\n"
 msgstr[2] "Preskočio sam %d fotografija jer je korisnik otkazao:\n"
 msgstr[3] "Preskočio sam %d fotografiju jer je korisnik otkazao:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -3676,7 +3569,7 @@ msgstr[1] "Preskočio sam %d snimka jer je korisnik otkazao:\n"
 msgstr[2] "Preskočio sam %d snimaka jer je korisnik otkazao:\n"
 msgstr[3] "Preskočio sam %d snimak jer je korisnik otkazao:\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -3685,7 +3578,7 @@ msgstr[1] "Preskočio sam %d fotografije/snimka jer je korisnik otkazao:\n"
 msgstr[2] "Preskočio sam %d fotografija/snimaka jer je korisnik otkazao:\n"
 msgstr[3] "Preskočio sam %d fotografiju/snimak jer je korisnik otkazao:\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3694,7 +3587,7 @@ msgstr[1] "Preskočio sam %d datoteke jer je korisnik otkazao:\n"
 msgstr[2] "Preskočio sam %d datoteka jer je korisnik otkazao:\n"
 msgstr[3] "Preskočio sam %d datoteku jer je korisnik otkazao:\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3703,7 +3596,7 @@ msgstr[1] "Uspešno sam uvezao %d fotografije.\n"
 msgstr[2] "Uspešno sam uvezao %d fotografija.\n"
 msgstr[3] "Uspešno sam uvezao %d fotografiju.\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3712,7 +3605,7 @@ msgstr[1] "Uspešno sam uvezao %d snimka.\n"
 msgstr[2] "Uspešno sam uvezao %d snimaka.\n"
 msgstr[3] "Uspešno sam uvezao %d snimak.\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3723,77 +3616,46 @@ msgstr[3] "Uspešno sam uvezao %d fotografiju/snimak.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "Nije uvezena nijedna fotografija ni snimak.\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "Uvoz je završen"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunda"
-msgstr[1] "%d sekunde"
-msgstr[2] "%d sekundi"
-msgstr[3] "%d sekunda"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuta"
-msgstr[2] "%d minuta"
-msgstr[3] "%d minut"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d sat"
-msgstr[1] "%d sata"
-msgstr[2] "%d sati"
-msgstr[3] "%d sat"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 dan"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Preimenujte događaj"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "Naziv:"
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Uredite naslov"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "Naslov:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Uredite napomenu događaja"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "Uredite napomenu fotografije/snimka"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Napomena:"
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Ukloni i _obriši fotografiju"
@@ -3801,19 +3663,19 @@ msgstr[1] "Ukloni i _obriši fotografije"
 msgstr[2] "Ukloni i _obriši fotografije"
 msgstr[3] "Ukloni i _obriši fotografiju"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "Da li da vratim spoljnu izmenu?"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "Da li da vratim spoljne izmene?"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3826,15 +3688,15 @@ msgstr[2] ""
 "Ova radnja će uništiti sve izmene na %d spoljnih datoteka. Da nastavim?"
 msgstr[3] " "
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "_Vrati spoljnu izmenu"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "_Vrati spoljne izmene"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3843,122 +3705,19 @@ msgstr[1] "Ovo će ukloniti %d fotografije iz fototeke. Da nastavim?"
 msgstr[2] "Ovo će ukloniti %d fotografija iz fototeke. Da nastavim?"
 msgstr[3] "     "
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "Uklonite fotografiju iz fototeke"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "Uklonite fotografije iz fototeke"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "PrP"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "PoP"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 sata"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Pomeri fotografije/snimke za isti iznos"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Postavi _sve fotografije/snimke na ovo vreme"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "_Izmeni izvornu fotografiju"
-msgstr[1] "_Izmeni izvorne fotografije"
-msgstr[2] "_Izmeni izvorne fotografije"
-msgstr[3] "_Izmeni izvornu fotografiju"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "_Izmeni izvornu datoteku"
-msgstr[1] "_Izmeni izvorne datoteke"
-msgstr[2] "_Izmeni izvorne datoteke"
-msgstr[3] "_Izmeni izvornu datoteku"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "Izvorno: "
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d.%m.%Y. %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d.%m.%Y. %H:%M:%S"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Vreme izlaganja će biti pomereno unapred za\n"
-"%d %s, %d %s, %d %s, i %d %s."
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"Vreem izlaganja će biti pomereno unazad za\n"
-"%d %s, %d %s, %d %s, i %d %s."
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dana"
-msgstr[2] "dana"
-msgstr[3] "dan"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "sat"
-msgstr[1] "sata"
-msgstr[2] "sati"
-msgstr[3] "sat"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuta"
-msgstr[2] "minuta"
-msgstr[3] "minut"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekundu"
-msgstr[1] "sekunde"
-msgstr[2] "sekundi"
-msgstr[3] "sekundu"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3985,91 +3744,13 @@ msgstr[3] ""
 "\n"
 "I %d druga."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "Oznake (razdvojene zapetom):"
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "Dobro došli!"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "Dobro došli u Foto-bunar!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "Da započnete, uvezite fotografije na jedan od sledećih načina:"
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Izaberite <span weight=\"bold\">Datoteka %s Uvezi iz fascikle</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Prevucite i ubacite fotografiju u prozor Foto-bunara"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "Povežite foto-aparat na računar i uvezite fotografije"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Uvezi fotografije iz fascikle „%s“"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "Možete uvesti fotografije na neki od sledećih načina:"
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr "_Ne prikazuj više ovu poruku"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Uvezite fotografije iz fototeke „%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:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(Pomoć)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Godina%smesec%sdan"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "Godina%smesec"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Godina%smesec-dan"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "Godina-mesec-dan"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "Proizvoljno"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "Neispravan obrazac"
-
 #. 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:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4077,31 +3758,31 @@ msgstr ""
 "Foto-bunar može da umnoži fotografije u fasciklu fototeke ili da ih uveze "
 "bez umnožavanja."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "_Umnoži fotografije"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "Uvezi _na mestu"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "Uvezite u fototeku"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Uklonite iz fototeke"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Uklanjam fotografiju iz fototeke"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "Uklanjam fotografije iz fototeke"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4130,7 +3811,7 @@ msgstr[2] ""
 "Ova radnja ne može biti poništena."
 msgstr[3] "   "
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4159,7 +3840,7 @@ msgstr[2] ""
 "Ova radnja ne može biti poništena."
 msgstr[3] "  "
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4188,7 +3869,7 @@ msgstr[2] ""
 "Ova radnja ne može biti poništena."
 msgstr[3] "       "
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4203,7 +3884,7 @@ msgstr[2] ""
 msgstr[3] "      "
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4245,6 +3926,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "Ne mogu da otvorim fotografiju „%s“. Izvinite."
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "_Sačuvaj"
 
@@ -4271,206 +3953,452 @@ msgid "Save As"
 msgstr "Sačuvajte kao"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Ne mogu da pratim „%s“: Nije direktorijum (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "PrP"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "PoP"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 sata"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "_Pomeri fotografije/snimke za isti iznos"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "Postavi _sve fotografije/snimke na ovo vreme"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Izmeni izvornu fotografiju"
+msgstr[1] "_Izmeni izvorne fotografije"
+msgstr[2] "_Izmeni izvorne fotografije"
+msgstr[3] "_Izmeni izvornu fotografiju"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "_Izmeni izvornu datoteku"
+msgstr[1] "_Izmeni izvorne datoteke"
+msgstr[2] "_Izmeni izvorne datoteke"
+msgstr[3] "_Izmeni izvornu datoteku"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "Izvorno: "
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%d.%m.%Y. %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Vreme izlaganja će biti pomereno unapred za\n"
+"%d %s, %d %s, %d %s, i %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"Vreem izlaganja će biti pomereno unazad za\n"
+"%d %s, %d %s, %d %s, i %d %s."
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dan"
+msgstr[1] "dana"
+msgstr[2] "dana"
+msgstr[3] "dan"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "sat"
+msgstr[1] "sata"
+msgstr[2] "sati"
+msgstr[3] "sat"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minuta"
+msgstr[2] "minuta"
+msgstr[3] "minut"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekundu"
+msgstr[1] "sekunde"
+msgstr[2] "sekundi"
+msgstr[3] "sekundu"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "Neizmenjeno"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "Tekuće"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "_Zapis:"
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "_Kvalitet:"
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "_Odnos promene veličine:"
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "_Tačkica:"
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "Izvezi _metapodatke:"
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(Pomoć)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "Godina%smesec%sdan"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "Godina%smesec"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "Godina%smesec-dan"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "Godina-mesec-dan"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "Proizvoljno"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "Neispravan obrazac"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+msgstr[3] "%d sekunda"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuta"
+msgstr[2] "%d minuta"
+msgstr[3] "%d minut"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+msgstr[3] "%d sat"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 dan"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "Dobro došli!"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "Dobro došli u Foto-bunar!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "Da započnete, uvezite fotografije na jedan od sledećih načina:"
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "Izaberite <span weight=\"bold\">Datoteka %s Uvezi iz fascikle</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "Prevucite i ubacite fotografiju u prozor Foto-bunara"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "Povežite foto-aparat na računar i uvezite fotografije"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "_Uvezi fotografije iz fascikle „%s“"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "Možete uvesti fotografije na neki od sledećih načina:"
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "_Ne prikazuj više ovu poruku"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "Uvezite fotografije iz fototeke „%s“"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Vrati na postojeću veličinu fotografije"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Podesite isecanje za ovu fotografiju"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Zaokrenite pravougaonik isecanja između vodoravnog i uspravnog usmerenja"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Nevezano"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kvadratno"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Ekransko"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "—"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD video (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Novčanik (2 × 3 inča)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Zabeleška (3 × 5 inča)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 inča"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 inča"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 inča"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Pismo (8.5 × 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 inča"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 inča"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrički novčanik (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Čestitka (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Veličina:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Zatvorite alat za uklanjanje crvenih očiju"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Uklonite efekat crvenih očiju u izabranom delu fotografije"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Ponovo postavi"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Izlaganje:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Zasićenje:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Boja:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Senke:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "Isticanja:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "Povrati boje"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "Vratite sva doterivanja boje na izvorna"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "Boja"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "Zasićenost"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "Izloženost"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "Senke"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "Isticanja"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "Povećanje kontrasta"
 
@@ -4483,11 +4411,7 @@ msgstr "Ugao:"
 msgid "_Straighten"
 msgstr "_Ispravi"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Događaji"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4496,7 +4420,7 @@ msgstr[1] "%d fotografije/snimka"
 msgstr[2] "%d fotografija/snimaka"
 msgstr[3] "%d fotografija/snimak"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4505,7 +4429,7 @@ msgstr[1] "%d snimka"
 msgstr[2] "%d snimaka"
 msgstr[3] "%d snimak"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4518,27 +4442,35 @@ msgstr[3] "%d fotografija"
 msgid "No Event"
 msgstr "Bez događaja"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Događaji"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Razgledajte vađe događaje"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Nema događaja"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Nisam pronašao događaje"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Svi događaji"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Bez datuma"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y."
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4578,20 +4510,16 @@ msgstr "Zameni _sve"
 msgid "Export"
 msgstr "Izvezi"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Fascikle"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Fototeka"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Razgledajte strukturu fascikle biblioteke"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Fotografije"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Obeležene"
 
@@ -4612,19 +4540,37 @@ msgstr "Uvezao sam „%s“"
 msgid "Last Import"
 msgstr "Poslednji uvoz"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Fototeka"
+
+#: src/library/LibraryBranch.vala:30
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Sredite i razgledajte vaše fotografije"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Fotografije"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Uvezite iz fascikle"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Dubači po podfasciklama"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Isprazni korpu"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Praznim korpu…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4637,33 +4583,33 @@ msgstr ""
 "%s Postavke</span>.\n"
 "Da li želite da nastavite uvoz fotografija?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Mesto fototeke"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Ne mogu da uvezem fotografije iz ovog direktorijuma."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Osvežavam fototeku…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Pripremam fotografije za samostalni uvoz…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Samostalno uvozim fotografije…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Upisujem metapodatke u datoteke…"
 
@@ -4679,15 +4625,15 @@ msgstr "Brišem…"
 msgid "Trash"
 msgstr "Korpa"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Korpa je prazna"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Obrišite"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Brišem fotografije"
 
@@ -4734,32 +4680,36 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr "Učitavam Foto-bunar"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Putanja do ličnih podataka Foto-bunara"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "DIREKTORIJUM"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Ne prati direktorijum fototeke za izmenama u vreme pokretanja"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Ne prikazuje merač napredovanja pokretanja"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Prikazuje izdanje programa"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Pokreće program u režimu preko celog ekrana"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[DATOTEKA]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4775,7 +4725,7 @@ msgstr "Ne mogu da obradim osveženja praćenja: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Izmenite veličinu minijatura"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4784,15 +4734,15 @@ msgstr ""
 "Foto-bunar nije uspeo da pusti izabrani snimak:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Nema fotografija/snimaka"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Nisam pronašao fotografije/snimke koji odgovaraju tekućem filteru"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Ne mogu da izvezem fotografije u ovaj direktorijum."
 
@@ -4856,7 +4806,7 @@ msgstr "Sirovo"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "izmenjeno"
 
@@ -5026,7 +4976,7 @@ msgstr "Autorsko pravo:"
 msgid "Software:"
 msgstr "Softver:"
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "Dodatni podaci"
 
@@ -5080,37 +5030,37 @@ msgstr "Pribavljam podatake o nalogu…"
 msgid "Logging in…"
 msgstr "Prijavljujem se…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Photos"
 msgstr "Objavite fotografije"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish photos _to:"
 msgstr "Objavi fotografije _na:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Videos"
 msgstr "Objavite snimke"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish videos _to"
 msgstr "Objavi snimke _na"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:203
 msgid "Publish Photos and Videos"
 msgstr "Objavite fotografije i snimke"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:204
 msgid "Publish photos and videos _to"
 msgstr "Objavi fotografije i snimke _na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:414
 msgid "Unable to publish"
 msgstr "Objavljivanje nije uspelo"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:415
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5155,9 +5105,10 @@ msgstr "Izvrnite vodoravno"
 msgid "Flip Vertically"
 msgstr "Izvrnite uspravno"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_O programu"
 
@@ -5180,11 +5131,11 @@ msgstr "Prosl_edi"
 msgid "Fulls_creen"
 msgstr "Preko _celog ekrana"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "Po_moć"
@@ -5600,7 +5551,7 @@ msgid "Adjust Date and Time"
 msgstr "Podesite datum i vreme"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Dodaj _oznake…"
 
@@ -5691,7 +5642,7 @@ msgid "_Rename…"
 msgstr "_Preimenuj…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "Izmeni _oznake…"
 
@@ -5746,7 +5697,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Ne mogu da preimenujem pretragu „%s“ jer već postoji ta pretraga."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Sačuvane pretrage"
 
@@ -5754,11 +5705,11 @@ msgstr "Sačuvane pretrage"
 msgid "Delete Search"
 msgstr "Izbriši pretragu"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Uredi…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "_Preimenuj…"
 
@@ -5828,7 +5779,7 @@ msgstr "_Povrati"
 msgid "Move the selected photos back into the library"
 msgstr "Premestite izabrane fotografije nazad u fototeku"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5844,7 +5795,8 @@ msgstr "Otvorite direktorijum izabranih fotografija u upravniku datoteka"
 msgid "Unable to open in file manager: %s"
 msgstr "Ne mogu da otvorim upravnika datoteka: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Ukloni iz _fototeke"
 
@@ -5907,151 +5859,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Pokretni prikaz"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Sačuvane pretrage"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "sadrži"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "je tačno"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "počinje na"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "završava se na"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "nije podešeno"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "podešeno"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "jeste"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "nije"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "fotografija"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "sirova fotografija"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "snimak"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "ima"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "nema"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "izmene"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "unutrašnje izmene"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "spoljne izmene"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "obeležena"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "neobeležena"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "i više"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "samo"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "i niže"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "posle"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "pre"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "između"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "i"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "Pretraga"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "Otkaži"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "U redu"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "bilo koja"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "sve"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "ništa"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Bilo koji tekst"
@@ -6088,8 +6012,8 @@ msgstr "Vrsta obeležja"
 msgid "Photo state"
 msgstr "Stanje fotografije"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Ocena"
 
@@ -6097,27 +6021,36 @@ msgstr "Ocena"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Sačuvane pretrage"
+
+#: src/searches/SearchesBranch.vala:68
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Organizujte vaše sačuvane pretrage"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ ocena"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ ocena"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ ocena"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ ocena"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ ocena"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Greška učitavanja korisničkog sučelja trake pretrage: %s"
@@ -6127,71 +6060,71 @@ msgstr "Greška učitavanja korisničkog sučelja trake pretrage: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Zatvori"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Snimci"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Sirove fotografije"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Koristite sačuvanu pretragu da izdvojite stavke u tekućem pregledu"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Podešavanja"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Prethodna"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Idite na prethodnu fotografiju"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Zastani"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Zaustavite pokretni prikaz"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Sledeća"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Idite na sledeću fotografiju"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Podešavanja"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Izmenite podešavanja pokretnog prikaza"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Nedostaju izvorne datoteke svih fotografija."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Pusti"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Nastavite puštanje pokretnog prikaza"
 
@@ -6203,7 +6136,7 @@ msgstr "Prelazi pokretnog prikaza"
 msgid "(None)"
 msgstr "(Nijedna)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Nijedan"
 
@@ -6211,16 +6144,21 @@ msgstr "Nijedan"
 msgid "Random"
 msgstr "Nasumično"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Oznake"
 
+#: src/tags/TagsBranch.vala:131
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Sredite i razgledajte oznake vaših fotografija"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "bezimeno"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Izvezite snimke"
 
@@ -6230,14 +6168,10 @@ msgid "Toggle _Flag"
 msgstr "Okini _zastavicu"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "_Razvijač"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "_Otvori spoljnim uređivačem"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6287,21 +6221,21 @@ msgstr "_Sledeća fotografija"
 msgid "T_ools"
 msgstr "_Alati"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "_Često postaljana pitanja"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "_Prijavi problem…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Uvezi iz fascikle…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6379,17 +6313,12 @@ msgstr "_Opadajuće"
 msgid "Even_ts"
 msgstr "_Događaji"
 
-#: 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 "Ukloni iz _fototeke"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Naslovi"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "_Oznake"
 
@@ -6426,65 +6355,193 @@ msgstr "_Fotografije"
 msgid "_Stop Import"
 msgstr "_Zaustavi uvoz"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "bela"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "crna"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Prikaz"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Pozadina:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Uvezi fotografije u:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Prati prispeće novih datoteka u fascikli fototeke"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Uvozim"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "Struktura _direktorijuma:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Primer:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "_Promeni naziv uvezenih datoteka na mala slova"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metapodaci"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Upisuj oznake, naslove i ostale _metapodatke u datoteke fotografija"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "Sirovi razvijač"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "_Osnovno:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Šablon:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Providna pozadina:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Kockasta"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Jednobojna"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "_Spoljni uređivač fotografija:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Spoljni _sirovi uređivač:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Spoljni uređivači"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Priključci"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Postavke Foto-bunara"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Veličina odštampane fotografije</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Koristi _uobičajenu veličinu:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Koristi _proizvoljnu veličinu:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "inč"
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Odgovara srazmeri fotografije"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Samostalna veličina:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Naslovi</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Štampaj _nazive fotografija"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rezolucija u tačkicama</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Štampaj fotografije u:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "tačkica po inču"
 
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "Pretraga"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "U redu"
+
+#: ui/saved_search_dialog.ui:74
+msgid "_Name of search:"
+msgstr "_Naziv pretrage:"
+
+#: ui/saved_search_dialog.ui:132
+msgid "_Match"
+msgstr "_Poklapa"
+
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "bilo koja"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "sve"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "ništa"
+
+#: ui/saved_search_dialog.ui:165
+msgid "of the following:"
+msgstr "od sledećeg:"
+
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Postavi za pozadinu"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Koristi za radnu površ"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Koristi za ekran zaključavanja"
 
@@ -6492,142 +6549,155 @@ msgstr "Koristi za ekran zaključavanja"
 msgid "Set as Desktop Slideshow"
 msgstr "Postavi kao smenjivu pozadinu radne površi"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Napravi smenjivu pozadinu radne površi"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Prikaži svaku fotografiju za"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "vreme"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "Koliko dugo će svaka fotografija biti prikazana kao pozadina radne površi"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "bela"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "crna"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Prikaz"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Pozadina:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Uvezi fotografije u:"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova _oznaka…"
 
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Prati prispeće novih datoteka u fascikli fototeke"
+#: ui/slideshow_settings.ui:91
+msgid "_Delay:"
+msgstr "_Zastoj:"
 
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Uvozim"
+#: ui/slideshow_settings.ui:105
+msgid "_Transition effect:"
+msgstr "_Dejstvo prelaza:"
 
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "Struktura _direktorijuma:"
+#: ui/slideshow_settings.ui:119
+msgid "Transition d_elay:"
+msgstr "_Zastoj prelaza:"
 
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Primer:"
+#: ui/slideshow_settings.ui:129
+msgid "Show t_itle"
+msgstr "Prikaži _naslov"
 
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "_Promeni naziv uvezenih datoteka na mala slova"
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
+msgid "seconds"
+msgstr "sekunde"
 
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metapodaci"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "natpis"
 
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Upisuj oznake, naslove i ostale _metapodatke u datoteke fotografija"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Obrišite sve fotografije iz korpe"
 
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "Sirovi razvijač"
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Unesite broj potvrđivanja koji se pojavljuje nakon prijavljivanja na Flikr u "
+#~ "vašem internet pregledniku."
 
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "_Osnovno:"
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Broj ovlašćenja:"
 
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Šablon:"
+#~ msgid "Width or height"
+#~ msgstr "Širina i visina"
 
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "_Spoljni uređivač fotografija:"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr ""
+#~ "„%s“ nije ispravan odgovor na zahtev potvrđivanja identiteta otvorenog "
+#~ "potvrđivanja"
 
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Spoljni _sirovi uređivač:"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Dobro došli u uslugu uvoza fototeke F-broja.\n"
+#~ "\n"
+#~ "Izaberite fototeku za uvoz, bilo izborom neke postojeće fototeke koju je "
+#~ "pronašao Foto-bunar bilo izborom neke druge datoteke iz zbirke F-broja."
 
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Spoljni uređivači"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Dobro došli u uslugu uvoza fototeke F-broja.\n"
+#~ "\n"
+#~ "Izaberite datoteku iz zbirke F-broja."
 
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Priključci"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Ručno izaberite datoteku zbirke F-broja za uvoz:"
 
-#: ui/shotwell.ui:590
-msgid "_Name of search:"
-msgstr "_Naziv pretrage:"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Ne mogu da otvorim datoteku zbirke F-broja: datoteka ne postoji ili nije "
+#~ "zbirka F-broja"
 
-#: ui/shotwell.ui:644
-msgid "_Match"
-msgstr "_Poklapa"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Ne mogu da otvorim datoteku zbirke F-broja: Foto-bunar ne podržava ovo "
+#~ "izdanje zbirke F-broja"
 
-#: ui/shotwell.ui:671
-msgid "of the following:"
-msgstr "od sledećeg:"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Ne mogu da pročitam izabranu datoteku zbirke F-broja: greška prilikom "
+#~ "čitanja tabele oznaka"
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "natpis"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Ne mogu da pročitam izabranu datoteku zbirke F-broja: greška prilikom "
+#~ "čitanja tabele fotografija"
 
-#: ui/shotwell.ui:903
-msgid "_Delay:"
-msgstr "_Zastoj:"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Foto-bunar je pronašao %d fotografije/a u fototeci F-broja i trenutno ih "
+#~ "uvozi. Duplikati će samostalno biti pronađeni i uklonjeni.\n"
+#~ "\n"
+#~ "Možete zatvoriti ovo prozorče i početi da koristite Foto-bunar dok će se "
+#~ "uvoz fotografija nastaviti u pozadini."
 
-#: ui/shotwell.ui:917
-msgid "_Transition effect:"
-msgstr "_Dejstvo prelaza:"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Fototeka F-broja: %s"
 
-#: ui/shotwell.ui:931
-msgid "Transition d_elay:"
-msgstr "_Zastoj prelaza:"
+#~ msgid "Preparing to import"
+#~ msgstr "Pripremam za uvoz"
 
-#: ui/shotwell.ui:941
-msgid "Show t_itle"
-msgstr "Prikaži _naslov"
+#~ msgid "Core Data Import Services"
+#~ msgstr "Usluge uvoza ključnih podataka"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
-msgid "seconds"
-msgstr "sekunde"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Izvezite fotografije/snimke"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "Nova _oznaka…"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "_Otvori spoljnim uređivačem"
 
-#: ui/trash.ui:285
-msgid "Delete all photos in the trash"
-msgstr "Obrišite sve fotografije iz korpe"
+#~ msgid "R_emove from Library"
+#~ msgstr "Ukloni iz _fototeke"
 
 #~ msgid "L_ist album in public gallery"
 #~ msgstr "_Ispiši album u javnoj galeriji"
@@ -6855,9 +6925,6 @@ msgstr "Obrišite sve fotografije iz korpe"
 #~ msgid "RAW photos"
 #~ msgstr "Sirove fotografije"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Postavke Foto-bunara"
-
 #~| msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Autorska prava 2009-2015 Jorba fondacija"
diff --git a/po/sv.gmo b/po/sv.gmo
index cf227da..1800b7e 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 87af5c4..05da572 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,21 +16,21 @@ msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-04-02 16:28+0000\n"
-"PO-Revision-Date: 2017-04-05 16:12+0200\n"
-"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+"POT-Creation-Date: 2017-11-27 19:54+0000\n"
+"PO-Revision-Date: 2017-11-27 18:57+0100\n"
+"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\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: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.4\n"
 "X-Project-Style: gnome\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
 #: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
 #: ui/tags.ui:356
 msgid "Shotwell"
@@ -73,16 +73,16 @@ msgstr "Shotwell stödjer JPEG, PNG, TIFF och flera varianter av RAW-filformat."
 msgid "The Shotwell developers"
 msgstr "Shotwells utvecklare"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Bildhanterare"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Organisera dina bilder"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -93,15 +93,15 @@ msgstr ""
 "dela;taggar;video;facebook;flickr;picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell bildvisare"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Bildvisare"
 
@@ -130,7 +130,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Det hemliga token som signerar oauth-begäran"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "standardstorlek"
 
@@ -157,9 +157,9 @@ msgid "URL of the Rajce server."
 msgstr "URL för Rajce-server."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "användarnamn"
 
@@ -176,7 +176,7 @@ msgid "user token, if remembered."
 msgstr "användartoken, om ihågkommen."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "senaste kategori"
 
@@ -185,7 +185,7 @@ msgid "The last selected Rajce category."
 msgstr "Senast valda Rajce-kategori."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "senaste bildstorlek"
 
@@ -224,11 +224,11 @@ msgstr ""
 "Om true, öppna målalbumet i webbläsaren efter att ha skickat upp bilder"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "ta bort känslig information från sändningar"
 
@@ -475,10 +475,28 @@ msgid "A grayscale color for use as the background color."
 msgstr "En gråskalefärg att använda som bakgrundsfärg."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "bakgrund för transparenta bilder"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Bakgrund att använda för transparenta bilder."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "färg för heltäckande transparent bakgrund"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Färgen att använda om bakgrunden för transparenta bilder är satt till solid "
+"färg"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Valtillstånd för alternativet ”dölj bilder”"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -486,28 +504,28 @@ msgstr ""
 "Senast använda tillstånd för ”dölj bilder som redan importerats” på "
 "importsidan."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "fördröjning"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Fördröjning (i sekunder) mellan bilder i bildspelet."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "övergångsfördröjning"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "Tiden (i sekunder) som en övergång körs mellan bilder i ett bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "övergångseffekt-ID"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -515,67 +533,67 @@ msgstr ""
 "Namnet på övergångseffekten som kommer att användas mellan bilder vid "
 "körning av ett bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Visa titel"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Huruvida titel för en bild ska visas under bildspelet"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "maximera biblioteksfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "True om biblioteksprogrammet är maximerat, annars false."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "bredd på biblioteksfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Den senast lagrade bredden på bibliotekprogrammets fönster."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "höjden på biblioteksfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Den senast lagrade höjden på bibliotekprogrammets fönster."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "maximera direktredigeringsfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "True om direktredigeringsprogrammet är maximerat, annars false."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "bredd på direktredigeringsfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Den senast lagrade bredden på direktredigeringsprogrammets fönster."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "höjd på direktredigeringsfönstret"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Den senast lagrade höjden på direktredigeringsprogrammets fönster."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "position på sidopanelens avdelare"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -583,28 +601,28 @@ msgstr ""
 "Den senast lagrade positionen på avdelaren mellan sidopanelen och vyn i "
 "biblioteksprogrammets fönster."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "importkatalog"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Katalog i vilken importerade bildfiler placeras."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "bevaka bibliotekskatalogen efter nya filer"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr "Om true importeras filer tillagda i bibliotekskatalogen automatiskt."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "skriver metadata till huvudfiler"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -612,11 +630,11 @@ msgstr ""
 "Om true skrivs ändringar i metadata (taggar, titlar och så vidare) till "
 "huvudbildfilen."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "använd filnamn i gemener"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -624,11 +642,11 @@ msgstr ""
 "Om true kommer Shotwell att konvertera alla filnamn till gemener vid import "
 "av bildfiler"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "katalogmönster"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -636,11 +654,11 @@ msgstr ""
 "En sträng med namnmönster som kommer att användas för att namnge "
 "bildkataloger vid import."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "anpassat katalogmönster"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -648,29 +666,29 @@ msgstr ""
 "En sträng med ett anpassat namnmönster som kommer att användas för att "
 "namnge bildkataloger vid import."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "standard-RAW-framkallare"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Standardalternativ för vilken RAW-framkallare Shotwell ska använda."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Menyval för senast använda bildförhållande vid beskärning."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "En sifferkod representerande det senast använda beskärningsmenyvalet en "
 "användare gjorde."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Täljare för senast använda anpassade bildförhållande vid beskärning."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -678,11 +696,11 @@ msgstr ""
 "Ett nollskilt, positivt heltal motsvarande bredd-delen för det senast "
 "använda anpassade bildförhållandet för beskärning användaren valde."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Nämnare för senast använda anpassade bildförhållande vid beskärning."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -690,138 +708,138 @@ msgstr ""
 "Ett nollskilt, positivt heltal motsvarande höjddelen för det senast använda "
 "anpassade bildförhållandet för beskärning användaren valde."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "extern bildredigerare"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Externt program att använda för att redigera bilder."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "extern RAW-redigerare"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "Externt program att använda för att redigera RAW-bilder."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Inställning i exportdialogen: hur bilder justeras"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "exportera metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "Inställning i exportdialogen: exportalternativ för metadata"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "formatinställning, specialvärde"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "Inställning i exportdialogen: formatinställning, specialvärde"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "formatinställning, typvärde"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "Inställning i exportdialogen: formatinställning, typvärde"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "Alternativ för JPEG-kvalitet"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "Inställning i exportdialogen: alternativ för jpeg-kvalitet"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "maximal bildstorlek"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "Inställning i exportdialogen: maximal bildstorlek"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "senast använda publiceringstjänst"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "En sifferkod representerande senaste tjänsten till vilken bilder publicerades"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "standardtjänst för publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "åtkomsttoken"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Facebook OAuth-token för den inloggade sessionen, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "användar-id"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "Facebook-användar-id för den inloggade användaren, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "användarnamn"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Namnet på den inloggade Facebook-användaren, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "standardstorlekskod"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "En sifferkod representerande standardstorleken för bilder publicerade till "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 "Huruvida bilder som skickas upp till Facebook ska rensas på metadata först"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth-token för åtkomstfas"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Autentiseringstoken för inloggad Flickr-användare, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth-hemlighet för åtkomstfas"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -829,22 +847,22 @@ msgstr ""
 "Den kryptografiska hemligheten använd för att signera begäran mot "
 "auktoriseringstoken för den inloggade Flickr-användaren, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Användarnamnet för den inloggade Flickr-användaren, om någon"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "En sifferkod representerande standardstorleken för bilder publicerade till "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "standardsynlighet"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -852,18 +870,18 @@ msgstr ""
 "En sifferkod representerande standardsynlighet för bilder publicerade till "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "Huruvida bilder uppskickade till Flickr ska rensas på metadata först"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "uppdatera token"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -871,7 +889,7 @@ msgstr ""
 "OAuth-token använd för att uppdatera Picasa Web Album-sessionen för den "
 "inloggade användaren, om någon."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -879,63 +897,63 @@ msgstr ""
 "En sifferkod representerande standardstorleken för bilder uppskickade till "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "senaste album"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Namnet på senaste albumet användaren publicerade bilder till, om något"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "Huruvida bilder uppskickade till Picasa ska rensas på metadata först"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo-URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "URL till Piwigo-servern."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo-användarnamn om inloggad."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "lösenord"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo-lösenord om inloggad."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "kom ihåg lösenord"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Om true, kom ihåg Piwigo-lösenordet."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Senaste valda Piwigo-kategori."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "senaste rättighetsnivå"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Den senast valda Piwigo-rättighetsnivån."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -943,20 +961,20 @@ msgstr ""
 "En sifferkod representerande den senaste förinställningen för bildstorlek "
 "använd vid publicering till Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "Huruvida bilder uppskickade till Piwigo ska rensas på metadata först"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "om en titel är angiven men inte kommentaren, använd titeln som kommentar för "
 "sändningar till Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -964,11 +982,11 @@ msgstr ""
 "Huruvida bilder uppskickade till Piwigo ska ha sin kommentar satt från "
 "titeln om titel är angivet och kommentar tomt"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "skicka inte upp taggar vid sändning till Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -976,45 +994,45 @@ msgstr ""
 "Huruvida bilder som skickas upp till Piwigo ska rensas på taggar innan, så "
 "att dessa taggar inte uppstår på fjärr-Piwigo-servern."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3-användarnamn"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API-nyckel"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3-API-nyckel"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3-webbplats-URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr "Huruvida bilder uppskickade till Gallery3 ska rensas på metadata först"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "skalningsbegränsning för den uppskickade bilden"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Skalningsbegränsnings-ID för den uppskickade bilden"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "bildpunkter för storaxeln på den uppskickade bilden"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1022,7 +1040,7 @@ msgstr ""
 "Bildpunkterna för storaxeln för bilden att skickas upp; används endast om "
 "skalningsbegränsnings-id är ett passande värde"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1030,64 +1048,64 @@ msgstr ""
 "OAuth-token använd för att uppdatera YouTube-sessionen för den inloggade "
 "användaren, om någon."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "senast använda importtjänst"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "En sifferkod representerande senaste tjänsten till vilken bilder importerades"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "kaka för tillståndstolkare"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "En sifferkod som fångar upp tillståndet för GStreamers insticksmiljö"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "Layoutläge för innehåll"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr "En sifferkod som beskriver hur bilder läggs ut på sidan vid utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "innehålls-ppi"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Antalet bildpunkter per tum (ppi) skickat till skrivaren vid utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "innehållsbredd"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Bredden på den utskrivna emulsionen för sidan vid utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "innehållshöjd"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Höjden på den utskrivna emulsionen för sidan vid utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "innehållenheter"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1095,11 +1113,11 @@ msgstr ""
 "En sifferkod representerande mätningsenhet (tum eller centimeter) använd vid "
 "utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "bilder per sidkod"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1107,22 +1125,22 @@ msgstr ""
 "En sifferkod representerande aktuellt valda bilder per sidoläge använt vid "
 "utskrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "storleksval"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Indexet för den aktuella utskriftsstorleken i en fördefinierad lista över "
 "standardstorlekar"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "matcha bildförhållande"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1130,221 +1148,221 @@ msgstr ""
 "Avgör huruvida anpassade utskriftsstorlekar måste matcha bildförhållandet "
 "för originalbilden"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "skriv ut titlar"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "True om en bildtitel ska skrivas ut när bilden skrivs ut, annars false."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "titeltypsnitt"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "Namnet på typsnittet att använda för bildtitlar när de skrivs ut."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "aktivera insticksmodulen för Facebook-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Facebook-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "aktivera insticksmodulen för Flickr-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Flickr-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "aktivera insticksmodulen för Picasa-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Picasa Web Albums-publicering är aktiverad, "
 "annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "aktivera insticksmodulen för YouTube-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för YouTube-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "aktivera insticksmodulen för Piwigo-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Piwigo-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "aktivera insticksmodulen för Yandex-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Yandex.Fotki-publicering är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "aktivera insticksmodulen för Tumblr-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Tumblr-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "aktivera insticksmodulen för Rajce-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Rajce-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "aktivera insticksmodulen för Gallery3-publicering"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen för Gallery3-publicering är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "aktivera insticksmodulen för F-Spot-import"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "True om insticksmodulen för F-Spot-import är aktiverad, annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "aktivera söndersmulningsövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Smula sönder för bildspelsövergångar är aktiverad, "
 "annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "aktivera uttoningsövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Tona ut för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "aktivera glidövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Glid för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "aktivera klockövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Klocka för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "aktivera cirkelövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Cirkel för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "aktivera övergång med cirklar för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Cirklar för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "aktivera persiennövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Persienner för bildspelsövergångar är aktiverad, "
 "annars false"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "aktivera rutövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Rutor för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "aktivera randövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True om insticksmodulen Randig för bildspelsövergångar är aktiverad, annars "
 "false"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "aktivera schackövergång för bildspel"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1379,24 +1397,7 @@ msgstr ""
 "För att fortsätta att publicera på Facebook, starta om Shotwell och försök "
 "att publicera igen."
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Ange bekräftelsesiffrorna som visas efter att du loggat in till Flickr i din "
-"webbläsare."
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Autentiserings_nummer:"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "_Fortsätt"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1408,20 +1409,15 @@ msgstr ""
 "Klicka på Logga in för att logga in på Flickr med din webbläsare. Du måste "
 "specifikt godkänna att Shotwell Connect kan länka till ditt Flickr-konto."
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "Förbereder inloggning…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"Flickr inte fortsätta."
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Misslyckades med Flickr-auktorisering"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "Verifierar behörighet…"
 
@@ -1437,7 +1433,7 @@ msgstr ""
 "För att fortsätta att publicera till Google så måste du starta om Shotwell "
 "och försök att publicera igen."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1450,7 +1446,7 @@ msgstr ""
 "Du måste specifikt godkänna att Shotwell Connect kan länka till ditt Picasa "
 "Web Albums-konto."
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1464,11 +1460,51 @@ msgstr ""
 "användning med YouTube för att fortsätta. Du kan konfigurera de flesta "
 "konton genom att logga in på YouTube med din webbläsare."
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_E-postadress"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Lösenord"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Logga in"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "Användarnamn och/eller lösenord ogiltigt. Var god försök igen"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Ogiltigt användarnamn eller lösenord"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Kunde inte ladda användargränssnittet: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Besök Shotwells webbplats"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -1478,7 +1514,7 @@ msgstr ""
 "Josef Andersson <josef.andersson@fripost.org>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
 msgstr ""
@@ -1486,7 +1522,7 @@ msgstr ""
 "webbplats."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:207
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1495,7 +1531,7 @@ msgstr ""
 "Kontrollera datumet i din dators kalender."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
@@ -1503,7 +1539,7 @@ msgstr ""
 "organisation."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:217
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1511,7 +1547,7 @@ msgstr ""
 "trasig."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1520,7 +1556,7 @@ msgstr ""
 "organisation som utfärdade den."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1529,7 +1565,7 @@ msgstr ""
 "en väldigt svag kryptering."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1537,106 +1573,11 @@ msgstr ""
 "⚫ Den här webbplatsens identifiering är endast giltig för framtida datum. "
 "Kontrollera datumet i din dators kalender."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "En temporärfil som krävs för publicering är inte tillgänglig"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Välkommen till tjänsten för import av F-Spot-bibliotek.\n"
-"\n"
-"Välj ett bibliotek att importera, antingen det som Shotwell automatiskt "
-"hittar, eller genom att välja en alternativ F-Spot-databas."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Välkommen till tjänsten för import av F-Spot-bibliotek.\n"
-"\n"
-"Välj en F-Spot-databasfil."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Välj manuellt den F-Spot-databasfil du vill importera:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Det går inte att öppna den F-Spot-databasfil som du har valt: antingen "
-"saknas filen, eller så är det inte en F-Spot-databas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Det går inte att öppna den valda F-Spot-databasfilen: den här versionen av F-"
-"Spot-databasen stöds inte av Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
-"taggtabellen skulle läsas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
-"bildtabellen skulle läsas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell har hittat %d bilder i F-Spot-biblioteket och importerar dem nu. "
-"Dubbletter kommer att hittas och tas bort automatiskt.\n"
-"\n"
-"Du kan stänga den här dialogrutan. Importen kommer att fortsätta i "
-"bakgrunden."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot-bibliotek: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Förbereder import"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Core Data-importtjänster"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL:"
@@ -1654,7 +1595,7 @@ msgid "Go _Back"
 msgstr "_Bakåt"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:363
 msgid "_Log in"
 msgstr "_Logga in"
 
@@ -1689,7 +1630,7 @@ msgid "pixels"
 msgstr "bildpunkter"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1697,17 +1638,17 @@ msgstr "Ursprungsstorlek"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Bredd eller höjd"
+msgid "Longest edge"
+msgstr "Längsta kanten"
 
 #: 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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Logga ut"
@@ -1715,11 +1656,11 @@ msgstr "_Logga ut"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1816,31 +1757,11 @@ msgstr "Okänd användare"
 msgid " Site Not Found"
 msgstr " Webbplatsen hittades inte"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_E-postadress"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "_Lösenord"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Kom ihåg"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-msgid "Log in"
-msgstr "Logga in"
-
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1892,81 +1813,10 @@ msgstr "Du är inloggad på Rajce som %s."
 msgid "Photos will appear in:"
 msgstr "Bilder kommer att visas i:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell extra publiceringstjänster"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Bloggar:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "Bild_storlek:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 × 375 bildpunkter"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 bildpunkter"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 bildpunkter"
-
-#: 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' är inte ett giltigt svar på autentiseringsbegäran med OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): går inte att starta; detta publiceringsverktyg "
-"går inte att starta om."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "Användarnamn och/eller lösenord ogiltigt. Var god försök igen"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Ogiltigt användarnamn eller lösenord"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Kunde inte ladda användargränssnittet: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Du är inloggad på Tumblr som %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -2036,6 +1886,14 @@ msgstr ""
 "_Ta bort plats, kamera och annan identifierande information innan bilden "
 "skickas"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -2076,17 +1934,30 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "Var vill du publicera de markerade bilderna?"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Bara jag"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Alla"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Bild_storlek:"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
+"Flickr inte fortsätta."
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2095,7 +1966,7 @@ msgstr ""
 "Du är inloggad på Flickr som %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2104,40 +1975,52 @@ msgstr ""
 "Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
 "upp per månad. Denna månad har du %s kvar att skicka upp."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ditt Flickr Pro-konto låter dig skicka upp obegränsat med data."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Bilderna _visas för:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Filmerna _visas för:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Bilder och filmer _visas för:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Endast vänner och familj"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Endast familj"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Endast vänner"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 bildpunkter"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 bildpunkter"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 bildpunkter"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 bildpunkter"
@@ -2189,7 +2072,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 bildpunkter)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Ursprungsstorlek"
 
@@ -2274,7 +2157,7 @@ msgid "Certificate of %s"
 msgstr "Certifikat för %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_OK"
 
@@ -2325,10 +2208,38 @@ msgstr "Visa certifikatet…"
 msgid "I understand, please _proceed."
 msgstr "Jag förstår, _fortsätt."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Standardtjänster för publicering"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Bloggar:"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 bildpunkter"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): går inte att starta; detta publiceringsverktyg "
+"går inte att starta om."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"Du är inloggad på Tumblr som %s.\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "_Sekretessinställningar för film:"
@@ -2453,16 +2364,16 @@ msgstr "Fäst verktygsfältet i öppet läge"
 msgid "Leave fullscreen"
 msgstr "Avsluta helskärmsläge"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:301
-#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 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:158
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2475,27 +2386,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – ”Aachen”"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Besök Shotwells webbplats"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Kunde inte visa hjälp: %s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Det går inte att komma åt feldatabasen: %s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Kunde inte visa återkommande frågor: %s"
@@ -2561,17 +2466,27 @@ msgstr "Korrupt bildfil"
 msgid "Imported failed (%d)"
 msgstr "Importen misslyckades (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Kameror"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Lista över identifierade kameraenheter"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
 #: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Kamera"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2584,32 +2499,32 @@ msgstr ""
 "filhanteraren."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Dölj bilder som redan importerats"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Visa enbart bilder som inte har importerats"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importera _markerade"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Importera _alla"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "Kameran verkar vara tom. Inga bilder/videor hittades för import"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "Inga bilder eller filmer hittades på kameran"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2617,15 +2532,15 @@ msgstr ""
 "Shotwell behöver avmontera kameran från filsystemet för att kunna komma åt "
 "den. Vill du fortsätta?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "A_vmontera"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Avmontera kameran."
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2635,11 +2550,11 @@ msgstr ""
 "när den är olåst. Stäng alla andra program som använder kameran och försök "
 "igen."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "Stäng alla andra program som använder kameran."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2648,65 +2563,69 @@ msgstr ""
 "Kunde inte hämta förhandsvisningar från kameran:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Avmonterar…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "Ansluter till kamera, vänta…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Påbörjar importen, var god vänta…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Hämtar bildinformation"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Hämtar förhandsvisning av %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kunde inte låsa kameran: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Radera denna bild från kameran?"
 msgstr[1] "Radera dessa %d bilder från kameran?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Radera denna film från kameran?"
 msgstr[1] "Radera dessa %d filmer från kameran?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Radera denna bild och film från kameran?"
 msgstr[1] "Radera dessa %d bilder och filmer från kameran?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Radera denna fil från kameran?"
 msgstr[1] "Radera dessa %d filer från kameran?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Behåll"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Tar bort bilder och filmer från kameran"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2721,7 +2640,7 @@ msgid "_Print"
 msgstr "Skriv _ut"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "Skicka t_ill…"
 
@@ -2763,13 +2682,13 @@ msgid "Flip Verti_cally"
 msgstr "Vänd verti_kalt"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "Förbä_ttra"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Återställ till original"
@@ -2786,7 +2705,8 @@ msgstr "_Klistra in färgjusteringar"
 msgid "Adjust Date and Time…"
 msgstr "Justera datum och tid…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
 msgid "Open With E_xternal Editor"
 msgstr "Öppna med e_xtern redigerare"
 
@@ -2799,43 +2719,39 @@ msgstr "Öppna i RA_W-redigerare"
 msgid "_Play"
 msgstr "_Spela"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "Exportera bild/film"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "Exportera bilder/filmer"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Exportera bild/film"
+msgstr[1] "Exportera bilder/filmer"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "Exportera bild"
+msgid_plural "Export Photos"
+msgstr[0] "Exportera bild"
+msgstr[1] "Exportera bilder"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Exportera bilder"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Roterar"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Ångrar rotationen"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Vänder horisontellt"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Ångrar horisontell vändning"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Vänder vertikalt"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Ångrar vertikal vändning"
 
@@ -3049,7 +2965,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Databasfil:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Importera"
 
@@ -3061,7 +2977,7 @@ msgstr "Importera från program"
 msgid "Import media _from:"
 msgstr "Importera mediafiler från:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
 msgid "_Close"
 msgstr "S_täng"
 
@@ -3133,7 +3049,7 @@ msgstr[1] ""
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Radera"
@@ -3165,6 +3081,10 @@ msgstr "_Byt råbildsframkallare"
 msgid "Export Video"
 msgstr "Exportera film"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Exportera bilder"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3197,6 +3117,10 @@ msgstr ""
 "\n"
 "Vill du fortsätta att exportera?"
 
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "_Fortsätt"
+
 #. "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."
@@ -3713,51 +3637,51 @@ msgstr "Ta bort bilder från bibliotek"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1697
+#: src/Dialogs.vala:1698
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1698
+#: src/Dialogs.vala:1699
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1699
+#: src/Dialogs.vala:1700
 msgid "24 Hr"
 msgstr "24 timmar"
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1715
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Förskjut bilder/filmer med samma värde"
 
-#: src/Dialogs.vala:1719
+#: src/Dialogs.vala:1720
 msgid "Set _all photos/videos to this time"
 msgstr "Ställ in _alla bilder/filmer till denna tid"
 
-#: src/Dialogs.vala:1725
+#: src/Dialogs.vala:1726
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "_Modifiera originalbilden"
 msgstr[1] "_Modifiera originalbilderna"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1730
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "Än_dra originalfil"
 msgstr[1] "Än_dra originalfilerna"
 
-#: src/Dialogs.vala:1817
+#: src/Dialogs.vala:1833
 msgid "Original: "
 msgstr "Original: "
 
-#: src/Dialogs.vala:1818
+#: src/Dialogs.vala:1834
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y-%m-%d, %H:%M:%S"
 
-#: src/Dialogs.vala:1819
+#: src/Dialogs.vala:1835
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y-%m-%d, %H:%M:%S"
 
-#: src/Dialogs.vala:1908
+#: src/Dialogs.vala:1924
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3766,7 +3690,7 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas framåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1925
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3775,31 +3699,31 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas bakåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1927
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1928
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: src/Dialogs.vala:1913
+#: src/Dialogs.vala:1929
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/Dialogs.vala:1914
+#: src/Dialogs.vala:1930
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:1974
 #, c-format
 msgid ""
 "\n"
@@ -3818,49 +3742,49 @@ msgstr[1] ""
 "\n"
 "och %d andra."
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:1998 src/Dialogs.vala:2025
 msgid "Tags (separated by commas):"
 msgstr "Taggar (separerade med kommatecken):"
 
-#: src/Dialogs.vala:2089
+#: src/Dialogs.vala:2105
 msgid "Welcome!"
 msgstr "Välkommen!"
 
-#: src/Dialogs.vala:2096
+#: src/Dialogs.vala:2112
 msgid "Welcome to Shotwell!"
 msgstr "Välkommen till Shotwell!"
 
-#: src/Dialogs.vala:2101
+#: src/Dialogs.vala:2117
 msgid "To get started, import photos in any of these ways:"
 msgstr "Importera bilder på något av dessa sätt för att komma igång:"
 
-#: src/Dialogs.vala:2121
+#: src/Dialogs.vala:2137
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Välj <span weight=\"bold\">Arkiv %s Importera från mapp</span>"
 
-#: src/Dialogs.vala:2122
+#: src/Dialogs.vala:2138
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Dra och släpp bilder till Shotwell-fönstret"
 
-#: src/Dialogs.vala:2123
+#: src/Dialogs.vala:2139
 msgid "Connect a camera to your computer and import"
 msgstr "Anslut en kamera till din dator och importera"
 
-#: src/Dialogs.vala:2134
+#: src/Dialogs.vala:2150
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importera bilder från din %s-mapp"
 
-#: src/Dialogs.vala:2141
+#: src/Dialogs.vala:2157
 msgid "You can also import photos in any of these ways:"
 msgstr "Du kan även importera bilder på något av dessa sätt:"
 
-#: src/Dialogs.vala:2152
+#: src/Dialogs.vala:2168
 msgid "_Don’t show this message again"
 msgstr "Visa _inte detta meddelande igen"
 
-#: src/Dialogs.vala:2189
+#: src/Dialogs.vala:2205
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importera bilder från ditt %s-bibliotek"
@@ -3868,41 +3792,41 @@ msgstr "Importera bilder från ditt %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:2335 src/Dialogs.vala:2339
+#: src/Dialogs.vala:2389 src/Dialogs.vala:2393
 msgid "(Help)"
 msgstr "(Hjälp)"
 
-#: src/Dialogs.vala:2346
+#: src/Dialogs.vala:2397
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "År%sMånad%sDag"
 
-#: src/Dialogs.vala:2348
+#: src/Dialogs.vala:2399
 #, c-format
 msgid "Year%sMonth"
 msgstr "År%sMånad"
 
-#: src/Dialogs.vala:2350
+#: src/Dialogs.vala:2401
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "År%sMånad-Dag"
 
-#: src/Dialogs.vala:2352
+#: src/Dialogs.vala:2403
 msgid "Year-Month-Day"
 msgstr "År-Månad-Dag"
 
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#: src/Dialogs.vala:2404 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Anpassad"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2590
+#: src/Dialogs.vala:2643
 msgid "Invalid pattern"
 msgstr "Ogiltigt 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:2692
+#: src/Dialogs.vala:2747
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3910,31 +3834,31 @@ msgstr ""
 "Shotwell kan kopiera bilderna till din biblioteksmapp eller importera dem "
 "utan att kopiera dem."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:2752
 msgid "Co_py Photos"
 msgstr "Ko_piera bilder"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:2753
 msgid "_Import in Place"
 msgstr "_Importera på plats"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:2754
 msgid "Import to Library"
 msgstr "Importera till biblioteket"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2764 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Ta bort från biblioteket"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:2765 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Tar bort bild från bibliotek"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2765
 msgid "Removing Photos From Library"
 msgstr "Tar bort bilder från bibliotek"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:2779
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3957,7 +3881,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:2783
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3980,7 +3904,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärd kan inte ångras."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:2787
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4003,7 +3927,7 @@ msgstr[1] ""
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:2819
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4017,7 +3941,7 @@ msgstr[1] ""
 "dessa filer direkt?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:2836
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4083,206 +4007,206 @@ msgid "Save As"
 msgstr "Spara som"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Kunde inte övervaka %s: Det är inte en mapp (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Återgå till befintliga bilddimensioner"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Ställ in beskärningen för den här bilden"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Växla mellan porträtt- och landskapsläge"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Obegränsad"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Kvadrat"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD-video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD-video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Plånbokstorlek (2 × 3 tum)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Anteckningskort (3 × 5 tum)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 tum"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 tum"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 tum"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5 × 11 tum)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 tum"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 tum)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 tum"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Plånboksstorlek i centimeter (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Vykortsstorlek (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Stäng röda ögon-verktyget"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Ta bort eventuella röda ögon i det markerade området"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "Åt_erställ"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Exponering:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Mättnad:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Färgton:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Färgtemperatur:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Skuggor:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#: src/editing_tools/EditingTools.vala:2285
 msgid "Highlights:"
 msgstr "Höjdpunkter:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset Colors"
 msgstr "Återställ färger"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset all color adjustments to original"
 msgstr "Återställ alla färgjusteringar till de ursprungliga värdena"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2700
 msgid "Temperature"
 msgstr "Färgtemperatur"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2712
 msgid "Tint"
 msgstr "Färgton"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2724
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2738
 msgid "Saturation"
 msgstr "Mättnad"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2751
 msgid "Exposure"
 msgstr "Exponering"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2764
 msgid "Shadows"
 msgstr "Skuggor"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2777
 msgid "Highlights"
 msgstr "Höjdpunkter"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2787
 msgid "Contrast Expansion"
 msgstr "Kontrastökning"
 
@@ -4295,25 +4219,21 @@ msgstr "Vinkel:"
 msgid "_Straighten"
 msgstr "_Räta ut"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Händelser"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d bild/film"
 msgstr[1] "%d bilder/filmer"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d film"
 msgstr[1] "%d filmer"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4324,27 +4244,35 @@ msgstr[1] "%d bilder"
 msgid "No Event"
 msgstr "Ingen händelse"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Händelser"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Bläddra genom dina händelser"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Inga händelser"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Inga händelser hittades"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Alla händelser"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Odaterade"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4384,20 +4312,16 @@ msgstr "Ersätt _alla"
 msgid "Export"
 msgstr "Exportera"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Mappar"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Bibliotek"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Bläddra genom bibliotekets mappstruktur"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Bilder"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Flaggade"
 
@@ -4418,19 +4342,36 @@ msgstr "Importerade %s"
 msgid "Last Import"
 msgstr "Senaste import"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Bibliotek"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "Organisera och visa dina bilder"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Bilder"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Importera från mapp"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Gå rekursivt in i undermappar"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Tömmer papperskorgen…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4443,33 +4384,33 @@ msgstr ""
 "inställningar</span>.\n"
 "Vill du fortsätta att importera bilder?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Biblioteksplats"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Bilder kan inte importeras från denna mapp."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Uppdaterar biblioteket…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Förbereder automatisk import av bilder…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Importerar bilder automatiskt…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Skriver metadata till filer…"
 
@@ -4485,15 +4426,15 @@ msgstr "Raderar…"
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Papperskorgen är tom"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Radera"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Raderar bilder"
 
@@ -4541,32 +4482,36 @@ msgstr "Okänt fel vid försök att verifiera Shotwells databas: %s"
 msgid "Loading Shotwell"
 msgstr "Läser in Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Sökväg till Shotwells privata data"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Sök inte efter ändringar i biblioteket medan programmet används"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Visa inte hur uppstarten framskrider"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Visa programversion"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Starta programmet i helskärmsläge"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[FIL]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
@@ -4582,7 +4527,7 @@ msgstr "Kunde inte behandla övervakningsuppdateringar: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Justera storleken på miniatyrbilderna"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4591,15 +4536,15 @@ msgstr ""
 "Shotwell kunde inte spela upp den markerade filmen:\n"
 "%s"
 
-#: src/Page.vala:1318
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Inga bilder eller filmer"
 
-#: src/Page.vala:1322
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "Inga bilder/videor hittades som matchar nuvarande filter"
 
-#: src/Page.vala:2628
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Bilderna kan inte exporteras till denna mapp."
 
@@ -4663,7 +4608,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "ändrad"
 
@@ -4882,37 +4827,37 @@ msgstr "Hämtar kontoinformation…"
 msgid "Logging in…"
 msgstr "Loggar in…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish Photos"
 msgstr "Publicera bilder"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish photos _to:"
 msgstr "Publicera bilder _till:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish Videos"
 msgstr "Publicera filmer"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish videos _to"
 msgstr "Publicera filmer _till"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish Photos and Videos"
 msgstr "Publicera bilder och filmer"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:202
 msgid "Publish photos and videos _to"
 msgstr "Publicera bilder och filmer _till"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:412
 msgid "Unable to publish"
 msgstr "Kunde inte publicera"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:413
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5542,7 +5487,7 @@ msgstr ""
 "Kunde inte byta namn på sökningen till ”%s” eftersom sökningen redan finns."
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Sparad sökning"
 
@@ -5550,11 +5495,11 @@ msgstr "Sparad sökning"
 msgid "Delete Search"
 msgstr "Ta bort sökning"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "_Redigera…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Byt _namn…"
 
@@ -5624,7 +5569,7 @@ msgstr "Åt_erställ"
 msgid "Move the selected photos back into the library"
 msgstr "Flytta tillbaka markerade bilder till biblioteket"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:20
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5640,7 +5585,8 @@ msgstr "Öppna mappen för den markerade bilden i filhanteraren"
 msgid "Unable to open in file manager: %s"
 msgstr "Kunde inte öppna i filhanterare: %s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Ta _bort från biblioteket"
 
@@ -5704,14 +5650,10 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b, %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Bildspel"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Sparade sökningar"
-
 #. Ordering must correspond with SearchConditionText.Context
 #: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
@@ -5885,8 +5827,8 @@ msgstr "Tillstånd på flagga"
 msgid "Photo state"
 msgstr "Bildtillstånd"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Betyg"
 
@@ -5894,27 +5836,35 @@ msgstr "Betyg"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Sparade sökningar"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "Organisera dina sparade sökningar"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ i betyg"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ i betyg"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ i betyg"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ i betyg"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ i betyg"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Fel vid inläsning av sökfältet: %s"
@@ -5924,71 +5874,71 @@ msgstr "Fel vid inläsning av sökfältet: %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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Stäng"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Filmer"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW-bilder"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "Använd en sparad sökning för att filtrera objekt i aktuell vy"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Inställningar"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Bakåt"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Gå till föregående bild"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Pausa bildspelet"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Nästa"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Gå till nästa bild"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Inställningar"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Ändra inställningar för bildspel"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Alla källbildfiler saknas."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Spela upp"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Fortsätt bildspelet"
 
@@ -6000,7 +5950,7 @@ msgstr "Bildspelsövergångar"
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Ingen"
 
@@ -6008,16 +5958,20 @@ msgstr "Ingen"
 msgid "Random"
 msgstr "Slumpmässigt"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Taggar"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "Organisera och visa dina bilders taggar"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "namnlös"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Exportera filmer"
 
@@ -6031,10 +5985,6 @@ msgstr "_Växla flagga"
 msgid "_Developer"
 msgstr "_Framkallare"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "Öppna med e_xtern redigerare"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -6098,7 +6048,7 @@ msgstr "_Rapportera ett problem…"
 
 #: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
 #: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
-msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Importera från mapp…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -6176,11 +6126,6 @@ msgstr "_Fallande"
 msgid "Even_ts"
 msgstr "_Händelser"
 
-#: 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 "Ta _bort från biblioteket"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Titlar"
@@ -6223,53 +6168,145 @@ msgstr "_Bilder"
 msgid "_Stop Import"
 msgstr "_Avbryt importen"
 
-#: ui/printing_widget.ui:19
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "vit"
+
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "svart"
+
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Visning"
+
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Bakgrund:"
+
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Importera bilder till:"
+
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Bevaka bibliotekskatalogen efter nya filer"
+
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "Import"
+
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "_Katalogstruktur:"
+
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Exempel:"
+
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "B_yt namn på importerade filer till enbart gemener"
+
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Skriv taggar, titlar och annan _metadata till bildfilerna"
+
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "RAW-framkallare"
+
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "_Standard:"
+
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Mönster:"
+
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "_Transparent bakgrund:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Rutig"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Enfärgad"
+
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "E_xtern bildredigerare:"
+
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Extern _RAW-redigerare:"
+
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Externa redigerare"
+
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Inställningar för Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Storlek på utskriften</b>"
 
-#: ui/printing_widget.ui:36
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Använd en _standardstorlek:"
 
-#: ui/printing_widget.ui:80
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Använd en _anpassad storlek:"
 
 #. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
+#: ui/printing_widget.ui:128
 msgid "in."
 msgstr "tum"
 
 #. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
+#: ui/printing_widget.ui:129
 msgid "cm"
 msgstr "cm"
 
-#: ui/printing_widget.ui:173
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "_Matcha bildförhållande"
 
-#: ui/printing_widget.ui:197
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Automatisk storlek:"
 
-#: ui/printing_widget.ui:237
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Titlar</b>"
 
-#: ui/printing_widget.ui:254
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Skriv ut bild_titel"
 
-#: ui/printing_widget.ui:297
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Upplösning</b>"
 
-#: ui/printing_widget.ui:317
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Skriv ut bild till:"
 
-#: ui/printing_widget.ui:351
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "pixlar per tum"
 
@@ -6277,11 +6314,11 @@ msgstr "pixlar per tum"
 msgid "Set as Desktop Background"
 msgstr "Ange som skrivbordsbakgrund"
 
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Använd för skrivbord"
 
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
 msgid "Use for Lock Screen"
 msgstr "Använd för låsskärm"
 
@@ -6289,142 +6326,165 @@ msgstr "Använd för låsskärm"
 msgid "Set as Desktop Slideshow"
 msgstr "Ange som skrivbordsbildspel"
 
-#: ui/set_background_slideshow_dialog.ui:56
+#: ui/set_background_slideshow_dialog.ui:54
 msgid "Generate desktop background slideshow"
 msgstr "Skapa bildspel för skrivbordsbakgrunden"
 
-#: ui/set_background_slideshow_dialog.ui:82
+#: ui/set_background_slideshow_dialog.ui:80
 msgid "Show each photo for"
 msgstr "Visa varje bild i"
 
-#: ui/set_background_slideshow_dialog.ui:94
+#: ui/set_background_slideshow_dialog.ui:92
 msgid "period of time"
 msgstr "tidsperiod"
 
-#: ui/set_background_slideshow_dialog.ui:116
+#: ui/set_background_slideshow_dialog.ui:114
 msgid "How long each photo is shown on the desktop background"
 msgstr "Hur länge varje bild ska visas på skrivbordsbakgrunden"
 
-#: ui/shotwell.ui:65
-msgid "white"
-msgstr "vit"
-
-#: ui/shotwell.ui:92
-msgid "black"
-msgstr "svart"
-
-#: ui/shotwell.ui:123
-msgid "Display"
-msgstr "Visning"
-
-#: ui/shotwell.ui:160
-msgid "_Background:"
-msgstr "_Bakgrund:"
-
-#: ui/shotwell.ui:175
-msgid "_Import photos to:"
-msgstr "_Importera bilder till:"
-
-#: ui/shotwell.ui:186
-msgid "_Watch library directory for new files"
-msgstr "_Bevaka bibliotekskatalogen efter nya filer"
-
-#: ui/shotwell.ui:209
-msgid "Importing"
-msgstr "Import"
-
-#: ui/shotwell.ui:226
-msgid "_Directory structure:"
-msgstr "_Katalogstruktur:"
-
-#: ui/shotwell.ui:240
-msgid "Example:"
-msgstr "Exempel:"
-
-#: ui/shotwell.ui:249
-msgid "R_ename imported files to lowercase"
-msgstr "B_yt namn på importerade filer till enbart gemener"
-
-#: ui/shotwell.ui:271
-msgid "Metadata"
-msgstr "Metadata"
-
-#: ui/shotwell.ui:284
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Skriv taggar, titlar och annan _metadata till bildfilerna"
-
-#: ui/shotwell.ui:306
-msgid "RAW Developer"
-msgstr "RAW-framkallare"
-
-#: ui/shotwell.ui:323
-msgid "De_fault:"
-msgstr "_Standard:"
-
-#: ui/shotwell.ui:377
-msgid "_Pattern:"
-msgstr "_Mönster:"
-
-#: ui/shotwell.ui:439
-msgid "E_xternal photo editor:"
-msgstr "E_xtern bildredigerare:"
-
-#: ui/shotwell.ui:456
-msgid "External _RAW editor:"
-msgstr "Extern _RAW-redigerare:"
-
-#: ui/shotwell.ui:517
-msgid "External Editors"
-msgstr "Externa redigerare"
-
-#: ui/shotwell.ui:542
-msgid "Plugins"
-msgstr "Insticksmoduler"
-
-#: ui/shotwell.ui:590
+#: ui/shotwell.ui:22
 msgid "_Name of search:"
 msgstr "_Namn på sökningen:"
 
-#: ui/shotwell.ui:644
+#: ui/shotwell.ui:76
 msgid "_Match"
 msgstr "_Matcha"
 
-#: ui/shotwell.ui:671
+#: ui/shotwell.ui:103
 msgid "of the following:"
 msgstr "följande:"
 
-#: ui/shotwell.ui:752
+#: ui/shotwell.ui:184
 msgid "label"
 msgstr "etikett"
 
-#: ui/shotwell.ui:903
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "_Ny tagg…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "_Fördröjning:"
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "_Övergångseffekt:"
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "_Övergångsfördröjning:"
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "_Visa titel"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "sekunder"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "_Ny tagg…"
-
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Radera alla bilder från papperskorgen"
 
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Ange bekräftelsesiffrorna som visas efter att du loggat in till Flickr i "
+#~ "din webbläsare."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "Autentiserings_nummer:"
+
+#~ msgid "Width or height"
+#~ msgstr "Bredd eller höjd"
+
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "'%s' är inte ett giltigt svar på autentiseringsbegäran med OAuth"
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Välkommen till tjänsten för import av F-Spot-bibliotek.\n"
+#~ "\n"
+#~ "Välj ett bibliotek att importera, antingen det som Shotwell automatiskt "
+#~ "hittar, eller genom att välja en alternativ F-Spot-databas."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Välkommen till tjänsten för import av F-Spot-bibliotek.\n"
+#~ "\n"
+#~ "Välj en F-Spot-databasfil."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Välj manuellt den F-Spot-databasfil du vill importera:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Det går inte att öppna den F-Spot-databasfil som du har valt: antingen "
+#~ "saknas filen, eller så är det inte en F-Spot-databas"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Det går inte att öppna den valda F-Spot-databasfilen: den här versionen "
+#~ "av F-Spot-databasen stöds inte av Shotwell"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
+#~ "taggtabellen skulle läsas"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Det går inte att läsa den valda F-Spot-databasfilen: ett fel uppstod när "
+#~ "bildtabellen skulle läsas"
+
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell har hittat %d bilder i F-Spot-biblioteket och importerar dem nu. "
+#~ "Dubbletter kommer att hittas och tas bort automatiskt.\n"
+#~ "\n"
+#~ "Du kan stänga den här dialogrutan. Importen kommer att fortsätta i "
+#~ "bakgrunden."
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot-bibliotek: %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Förbereder import"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Core Data-importtjänster"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Exportera bilder/filmer"
+
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Öppna med e_xtern redigerare"
+
+#~ msgid "R_emove from Library"
+#~ msgstr "Ta _bort från biblioteket"
+
 #~ msgid "Testing connection to Facebook…"
 #~ msgstr "Testar anslutningen till Facebook…"
 
@@ -6567,9 +6627,6 @@ msgstr "Radera alla bilder från papperskorgen"
 #~ msgid "RAW photos"
 #~ msgstr "RAW-bilder"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Inställningar för Shotwell"
-
 #~ msgid "Tag Photos as “%s”"
 #~ msgstr "Lägg till taggen ”%s” till bilderna"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 9b9cbd0..92cdb67 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 6bc95e9..f527032 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,30 +12,1419 @@
 # verayin <vera@yorba.org>, 2011
 # İşbaran Akçayır <isbaran@gmail.com>, 2015.
 # Muhammet Kara <muhammetk@gmail.com>, 2011, 2016.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2015-12-08 16:42+0000\n"
-"PO-Revision-Date: 2016-03-19 14:52+0200\n"
-"Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
-"Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"POT-Creation-Date: 2017-06-07 14:23+0300\n"
+"PO-Revision-Date: 2017-06-07 14:32+0300\n"
+"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
+"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "X-POOTLE-MTIME: 1427298590.000000\n"
 
-#: ../plugins/common/RESTSupport.vala:425
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Yayımlama için gerekli geçici bir dosya kullanılamıyor"
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: ui/tags.ui:356
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Gözde fotoğraf düzenleyici"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
+msgstr ""
+"Shotwell, GNOME masaüstü için tasarlanmış kullanımı kolay ve hızlı fotoğraf "
+"yöneticisidir. Kameranızdan veya diskinizden fotoğraf aktarmanızı, onları "
+"tarih veya konuya hatta puana göre yönetmenizi sağlar. Ayrıca; kırpma, "
+"kırmızı göz giderme, renk düzeltmeleri, doğrultma gibi basit fotoğraf "
+"düzenlemeleri sunar. Shotwell’in yok edici olmayan fotoğraf düzenleyicisi "
+"ana fotoğraflarınızı başkalaştırmaz, hataları düzeltmeyi ve denemeyi "
+"kolaylaştırır."
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+"Hazır olduğunda; Shotwell fotoğraflarınızı Facebook, Flickr, Picasa (Google "
+"Plus) gibi daha çok web sitesine yükleyebilir."
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr "Shotwell; JPG, PNG, TIFF ve değişik RAW dosya biçimlerini destekler."
+
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Shotwell geliştiricileri"
+
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Fotoğraf Yöneticisi"
+
+#: misc/shotwell.desktop.in:6
+msgid "Organize your photos"
+msgstr "Fotoğraflarınızı yönetin"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in:8
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+"albüm;kamera;kameralar;kırp;düzenle;güzelleştir;dışa aktar;galeri;görüntü;"
+"görüntüler;içe aktar;yerleştir;foto;fotoğraflar;fotolar;resim;resimler;"
+"fotoğrafçılık;yazdır;baskı;yayımlamak;döndür;paylaş;etiketler;video;facebook;"
+"flickr;picasa;youtube;piwigo"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in:4
+msgid "Shotwell Viewer"
+msgstr "Shotwell Görüntüleyici"
+
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Fotoğraf Görüntüleyici"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "yetkilendirme simgesi"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Eğer giriş yapıldıysa, Yandex-Fotki yetkilendirme simgesi."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Simge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "Tumblr’a erişmek için simge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Gizli simge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr "Oauth isteklerini imzalamak için gizli simge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:498
+msgid "default size"
+msgstr "öntanımlı boyut"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+"Tumblr’a yüklenen fotoğraflar için öntanımlı boyutu temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "öntanımlı blog"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr "Eğer varsa, kullanıcının öntanımlı blogunun adı"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "Rajce URL’si"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+msgid "URL of the Rajce server."
+msgstr "Rajce sunucusunun URL’si."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "username"
+msgstr "kullanıcı adı"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Eğer giriş yapıldıysa, Rajce kullanıcı adı."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "simge"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr "eğer anımsandıysa, kullanıcı simgesi."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:542
+msgid "last category"
+msgstr "son kategori"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr "Son seçilen Rajce kategorisi."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:554
+msgid "last photo size"
+msgstr "son fotoğraf boyutu"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+"Rajce’ye yayımlanırken kullanılan son fotoğraf boyutu ön ayarını temsil eden "
+"sayısal kod."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "anımsa"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "Eğer doğruysa, son oturum açmayı anımsa."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "albümü gizle"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr "Eğer doğruysa, yeni oluşturulan Rajce albümünü gizle."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "albümü tarayıcıda aç"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+"Eğer doğruysa, fotoğraflar yüklendikten hemen sonra hedef albümü web "
+"tarayıcısında aç"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "remove sensitive info from uploads"
+msgstr "yüklemelerden hassas bilgiyi kaldır"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+"Rajce’ye yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr "basit özellikleri göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr "Eğer basit özellikler bölmesi gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+msgstr "ayrıntılı özellikleri göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr ""
+"Eğer ayrıntılı özellikler penceresi gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "kenar çubuğunu göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr "Eğer kenar çubuğu gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "araç çubuğunu göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr "Eğer alt araç çubuğu gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "arama çubuğunu göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr "Eğer Arama/Süzme Araç Çubuğu gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr "fotoğraf başlıklarını göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"Eğer koleksiyon görünümlerinde fotoğraf başlıkları küçük resimlerin altında "
+"gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr "fotoğraf yorumlarını göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"Eğer koleksiyon görünümlerinde fotoğraf yorumları küçük resimlerin altında "
+"gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr "olay yorumlarını göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+"Eğer etkinlik görünümlerinde etkinlik yorumları küçük resimlerin altında "
+"gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr "fotoğraf etiketlerini göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+"Eğer koleksiyon görünümlerinde fotoğraf etiketleri küçük resimlerin altında "
+"gösterilecekse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr "fotoğraf puanlarını göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr "puan süzme düzeyi"
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr "olayları artan biçimde sırala"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr "Eğer etkinlikler artan biçimde sıralanmalıysa doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "sort library photos ascending"
+msgstr "kitaplık fotoğraflarını artan biçimde sırala"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+"Eğer kitaplık fotoğrafları artan biçimde sıralanmalıysa doğru, değilse "
+"yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr "kitaplık fotoğraflarını sıralama ölçütü"
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+"Kitaplık görünümlerinde fotoğraflar için sıralama ölçütünü belirten sayısal "
+"kod."
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "sort event photos ascending"
+msgstr "olay fotoğraflarını artan biçimde sırala"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+"Eğer etkinlik fotoğrafları artan biçimde sıralanmalıysa doğru, değilse "
+"yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "sort event photos criteria"
+msgstr "olay fotoğraflarını sıralama ölçütü"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr "Etkinlik fotoğrafları için sıralama ölçütünü belirtir."
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "24 saat zamanı kullan"
+
+#: 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 ""
+"Eğer saatler 24 saatlik dilimle gösterilmeliyse doğru, eğer saatler ÖÖ/ÖS "
+"gösterimini kullanmalıysa yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:126
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid "modify original photo files"
+msgstr "özgün fotoğraf dosyalarını değiştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:132
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr "başlangıçta karşılama kutusunu göster"
+
+#: 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 ""
+"Eğer başlangıçta bir karşılama kutusu gösterilmeliyse doğru. Eğer "
+"gösterilmemeliyse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "sidebar position"
+msgstr "kenar çubuğu konumu"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr "Kenar çubuğunun piksel türünden genişliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr "fotoğraf küçük resimi ölçeği"
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr "Fotoğraf küçük resimlerinin ölçeği, 72’den 360’a doğru değişir."
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "pin toolbar state"
+msgstr "araç çubuğunu sabitleme durumu"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr "Tam ekranda araç çubuğunu sabitle ya da sabitleme."
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+msgid "background color"
+msgstr "arka plan rengi"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr "Arka plan rengi olarak kullanmak için gri tonda bir renk."
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "saydam fotoğraflar için arka plan"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Saydam resimler için kullanılacak arka plan."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "düz saydam arka plan için renk"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Eğer saydam resimler için arka plan düz bir renge belirlendiyse kullanılacak "
+"renk"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
+msgid "Selection state of “hide photos” option"
+msgstr "“Fotoğrafları gizle” seçeneğinin seçim durumu"
+
+#: misc/org.yorba.shotwell.gschema.xml:180
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+"İçe aktarma sayfasındaki “içe aktarılmış fotoğrafları gizle” seçeneğinin son "
+"kullanılan seçim durumu."
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+msgid "delay"
+msgstr "gecikme"
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr "Slayt gösterisindeki fotoğraflar arası gecikme (saniye türünde)"
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "transition delay"
+msgstr "geçiş gecikmesi"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr "Slayt gösterisindeki fotoğraflar arası geçiş zamanı (saniye türünde)"
+
+#: misc/org.yorba.shotwell.gschema.xml:199
+msgid "transition effect id"
+msgstr "geçiş etkisi kimliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:200
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+"Slayt gösterisi çalıştırılırken fotoğraflar arasında kullanılacak geçiş "
+"etkisinin adı"
+
+#: misc/org.yorba.shotwell.gschema.xml:205
+msgid "Show title"
+msgstr "Başlığı göster"
+
+#: misc/org.yorba.shotwell.gschema.xml:206
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+"Slayt gösterisi sırasında bir fotoğrafın başlığının gösterilip "
+"gösterilmeyeceği"
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "maximize library window"
+msgstr "kitaplık penceresini büyült"
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "True if library application is maximized, false otherwise."
+msgstr "Eğer kitaplık uygulaması büyültüldüyse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "width of library window"
+msgstr "kitaplık penceresinin genişliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "The last recorded width of the library application window."
+msgstr "Kitaplık uygulaması penceresinin kaydedilen son genişliği."
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "height of library window"
+msgstr "Kitaplık penceresinin yüksekliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded height of the library application window."
+msgstr "Kitaplık uygulaması penceresinin kaydedilen son yüksekliği."
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "maximize direct-edit window"
+msgstr "doğrudan düzenleme penceresini büyült"
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr "Eğer doğrudan düzenleme penceresi büyültüldüyse doğru, değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "width of direct-edit window"
+msgstr "doğrudan düzenleme penceresinin genişliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid "The last recorded width of the direct-edit application window."
+msgstr "Doğrudan düzenleme uygulaması penceresinin son kaydedilen genişliği."
+
+#: misc/org.yorba.shotwell.gschema.xml:243
+msgid "height of direct-edit window"
+msgstr "doğrudan düzenleme penceresinin yüksekliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:244
+msgid "The last recorded height of the direct-edit application window."
+msgstr "Doğrudan düzenleme uygulaması penceresinin son kaydedilen yüksekliği."
+
+#: misc/org.yorba.shotwell.gschema.xml:249
+msgid "sidebar divider position"
+msgstr "kenar çubuğu bölücüsü konumu"
+
+#: misc/org.yorba.shotwell.gschema.xml:250
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+"Kenar çubuğu ve kitaplıkta gör uygulama penceresi arasındaki ayracın "
+"kaydedilen son konumu."
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+msgid "import directory"
+msgstr "içe aktarma dizini"
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid "Directory in which imported photo files are placed."
+msgstr "İçe aktarılan fotoğrafların konumlanacağı dizin."
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "watch library directory for new files"
+msgstr "yeni dosyalar için kitaplık dizinini izle"
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+"Eğer doğruysa, kitaplık dizinine eklenen dosyalar kendiliğinden içe "
+"aktarılır."
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid "write metadata to master files"
+msgstr "üstveriyi ana dosyalara yaz"
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+"Eğer doğruysa, üstveriye yapılan değişiklikler (etiketler, başlıklar, vb.) "
+"ana fotoğraf dosyasına da yazılır."
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "use lowercase filenames"
+msgstr "küçük harfli dosya adları kullan"
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+"Eğer doğruysa, Shotwell fotoğraflar içe aktarırken tüm dosya adlarını küçük "
+"harfe çevirir"
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+msgid "directory pattern"
+msgstr "dizin yapısı"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:287
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:288
+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:293
+msgid "RAW developer default"
+msgstr "RAW geliştirici öntanımlısı"
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr "Shotwell’in kullanacağı RAW geliştiricisi için öntanımlı seçenek"
+
+#: misc/org.yorba.shotwell.gschema.xml:301
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr "En son kullanılan kırpma en/boy oranı menü seçeneği."
+
+#: misc/org.yorba.shotwell.gschema.xml:302
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+"Kullanıcının yaptığı son kırpma menüsü seçimini temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:306
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+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:311
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:312
+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:319
+msgid "external photo editor"
+msgstr "harici fotoğraf düzenleyici"
+
+#: misc/org.yorba.shotwell.gschema.xml:320
+msgid "External application used to edit photos."
+msgstr "Fotoğrafları düzenlemek için kullanılan harici uygulama."
+
+#: misc/org.yorba.shotwell.gschema.xml:325
+msgid "external raw editor"
+msgstr "harici raw düzenleyici"
+
+#: misc/org.yorba.shotwell.gschema.xml:326
+msgid "External application used to edit RAW photos."
+msgstr "RAW fotoğrafları düzenlemek için kullanılan harici uygulama."
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: how to trim images"
+msgstr "Dışa aktarma kutusunda ayar: resimler nasıl kırpılsın"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "export metadata"
+msgstr "üstveriyi dışa aktar"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: option to export metadata"
+msgstr "Dışa aktarma kutusunda ayar: üstveriyi dışa aktarma seçeneği"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "format setting, special value"
+msgstr "biçim ayarı, özel değer"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: format setting, special value"
+msgstr "Dışa aktarma kutusunda ayar: biçim ayarı, özel değer"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "format setting, type value"
+msgstr "biçim ayarı, tür değeri"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: format setting, type value"
+msgstr "Dışa aktarma kutusunda ayar: biçim ayarı, tür değeri"
+
+#: misc/org.yorba.shotwell.gschema.xml:388
+msgid "JPEG quality option"
+msgstr "JPEG kalite seçeneği"
+
+#: misc/org.yorba.shotwell.gschema.xml:389
+msgid "Setting in export dialog: jpeg quality option"
+msgstr "Dışa aktarma kutusunda ayar: jpeg kalitesi seçeneği"
+
+#: misc/org.yorba.shotwell.gschema.xml:394
+msgid "maximal size of image"
+msgstr "resmin en büyük boyutu"
+
+#: misc/org.yorba.shotwell.gschema.xml:395
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Dışa aktarma kutusunda ayar: resmin en büyük boyutu"
+
+#: misc/org.yorba.shotwell.gschema.xml:402
+msgid "last used publishing service"
+msgstr "son kullanılan yayımlama hizmeti"
+
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr "Fotoğrafların yayımlandığı son hizmeti temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:408
+msgid "default publishing service"
+msgstr "öntanımlı yayımlama hizmeti"
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "access token"
+msgstr "erişim simgesi"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr "Şu anda giriş yapılmış oturum için Facebook OAuth simgesi, eğer varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+msgid "user i.d."
+msgstr "kullanıcı kimliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+"Şu anda oturum açmış kullanıcı için Facebook kullanıcı kimliği, eğer varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:434
+msgid "user name"
+msgstr "kullanıcı adı"
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "Şu anda Facebook’ta oturum açmış kullanıcının adı, eğer varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
+msgid "default size code"
+msgstr "öntanımlı boyut kodu"
+
+#: misc/org.yorba.shotwell.gschema.xml:441
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+"Facebook’a yüklenen fotoğraflar için öntanımlı boyutu temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:447
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+"Facebook’a yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:454
+msgid "OAuth Access Phase Token"
+msgstr "OAuth Erişim Aşaması Simgesi"
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+"Şu anda oturum açmış Flickr kullanıcısı için yetkilendirme simgesi, eğer "
+"varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "OAuth Access Phase Token Secret"
+msgstr "OAuth Erişim Aşaması Simgesi Gizi"
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+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:467
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr "Şu anda oturum açmış Flickr kullanıcısının kullanıcı adı, eğer varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+"Flickr’a yüklenen fotoğraflar için öntanımlı boyutu temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:478
+msgid "default visibility"
+msgstr "öntanımlı görünürlük"
+
+#: misc/org.yorba.shotwell.gschema.xml:479
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+"Flickr’a yayımlanmış fotoğraflar için öntanımlı görünürlüğü temsil eden "
+"sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:485
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+"Flickr’a yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
+msgid "refresh token"
+msgstr "simgeyi yenile"
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+"Şu anda oturum açmış kullanıcı için Picasa Web Albümleri oturumunu "
+"yenilemekte kullanılan OAuth simgesi, eğer varsa."
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+"Picasa Web Albums’e yüklenen fotoğraflar için öntanımlı boyutu temsil eden "
+"sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "last album"
+msgstr "son albüm"
+
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The name of the last album the user published photos to, if any"
+msgstr "Kullanıcının fotoğraflarını yayımladığı son albümün adı, eğer varsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:511
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+"Picasa’ya yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "Piwigo URL"
+msgstr "Piwigo URL’si"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "URL of the Piwigo server."
+msgstr "Piwigo sunucusunun URL’si."
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "Piwigo username, if logged in."
+msgstr "Eğer giriş yapıldıysa, Piwigo kullanıcı adı."
+
+#: misc/org.yorba.shotwell.gschema.xml:530
+msgid "password"
+msgstr "şifre"
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "Piwigo password, if logged in."
+msgstr "Eğer giriş yapıldıysa, Piwigo parolası."
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "remember password"
+msgstr "şifreyi anımsa"
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "If true, remember the Piwigo password."
+msgstr "Eğer doğruysa, Piwigo parolasını anımsa."
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid "The last selected Piwigo category."
+msgstr "Son seçilen Piwigo kategorisi."
+
+#: misc/org.yorba.shotwell.gschema.xml:548
+msgid "last permission level"
+msgstr "son izin düzeyi"
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid "The last chosen Piwigo permission level."
+msgstr "Son seçilen Piwigo izin düzeyi."
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+"Piwigo’ya yayımlanırken kullanılan son fotoğraf boyutu önayarını temsil eden "
+"sayısal kod."
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+"Piwigo’ya yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:566
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+"eğer başlık ayarlanmış ve bir yorum kaldırılmışsa, Piwigo’ya yüklemelerde "
+"başlığı yorum olarak kullan"
+
+#: misc/org.yorba.shotwell.gschema.xml:567
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+"Eğer başlık ayarlı yorum değilse, Piwigo’ya yüklenecek resimlerin "
+"yorumlarının başlıktan belirlenip belirlenmeyeceği."
+
+#: misc/org.yorba.shotwell.gschema.xml:572
+msgid "do not upload tags when uploading to Piwigo"
+msgstr "Piwigo’ya yüklerken etiketleri yükleme"
+
+#: misc/org.yorba.shotwell.gschema.xml:573
+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 ""
+"Piwigo’ya yüklenecek resimlerin etiketlerinin silinip silinmeyeceği, bu "
+"etiketler uzak Piwigo sunucusunda gözükmeyecektir."
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 username"
+msgstr "Gallery3 kullanıcı adı"
+
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "API key"
+msgstr "API anahtarı"
+
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "Gallery3 API key"
+msgstr "Gallery3 API anahtarı"
+
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid "Gallery3 site URL"
+msgstr "Gallery3 site URL’si:"
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+"Gallery3’ye yüklenecek resimlerin öncelikle üstverilerinin kaldırılmasının "
+"gerekip gerekmediği"
+
+#: misc/org.yorba.shotwell.gschema.xml:610
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:611
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:616
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:617
+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:625
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+"Şu anda oturum açmış kullanıcı için YouTube oturumunu yenilemekte kullanılan "
+"OAuth simgesi, eğer varsa."
+
+#: misc/org.yorba.shotwell.gschema.xml:632
+msgid "last used import service"
+msgstr "son kullanılan içe aktarma hizmeti"
+
+#: misc/org.yorba.shotwell.gschema.xml:633
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr "Fotoğrafların içe aktarıldığı son hizmeti temsil eden sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:640
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:641
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr "GStreamer eklenti ortamının durumunu yakalayan sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content layout mode"
+msgstr "içerik yerleşim kipi"
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+msgid "content ppi"
+msgstr "içeriğin inç başına piksel sayısı"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr "Yazdırma sırasında yazıcıya gönderilen inç başına piksel (ppi) sayısı"
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+msgid "content width"
+msgstr "içerik genişliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+msgid "content height"
+msgstr "içerik yüksekliği"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "content units"
+msgstr "içerik birimleri"
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+"Yazdırma sırasıda kulanılan ölçü birimini (inç veya santimetre) temsil eden "
+"sayısal kod"
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+msgid "images per page code"
+msgstr "sayfa başına resim kodu"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+msgid "size selection"
+msgstr "boyut seçimi"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "match aspect ratio"
+msgstr "en-boy oranını eşleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+"Özel yazdırma boyutlarının, özgün fotoğrafın en-boy oranına eşleşmesinin "
+"gerekip gerekmediğini saptar"
+
+#: misc/org.yorba.shotwell.gschema.xml:696
+msgid "print titles"
+msgstr "başlıkları yazdır"
+
+#: misc/org.yorba.shotwell.gschema.xml:697
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+"Eğer bir fotoğraf yazdırıldığında fotoğraf başlığı yazdırılmalıysa doğru, "
+"değilse yanlış."
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "titles font"
+msgstr "başlıkların yazı tipi"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr "Baskı sırasında fotoğraf başlıkları için kullanılacak yazı tipinin adı"
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable facebook publishing plugin"
+msgstr "facebook’ta yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr "Eğer Facebook’a yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+msgid "enable flickr publishing plugin"
+msgstr "flickr’a yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr "Eğer Flickr’e yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable picasa publishing plugin"
+msgstr "picasa’ya yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Picasa Web Albums’e yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable youtube publishing plugin"
+msgstr "youtube’ta yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr "Eğer Youtube’a yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+msgid "enable piwigo publishing plugin"
+msgstr "piwigo’da yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr "Eğer Piwigo’ya yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+msgid "enable yandex publishing plugin"
+msgstr "yandex’e yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr "Eğer Yandex.Fotki’ye yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+msgid "enable tumblr publishing plugin"
+msgstr "tumblr’da yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr "Eğer Tumblr’a yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable rajce publishing plugin"
+msgstr "rajce’de yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr "Eğer Rajce’ye yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+msgid "enable gallery3 publishing plugin"
+msgstr "gallery3’de yayımlama eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr "Eğer Gallery3’e yayımlama eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+msgid "enable F-Spot import plugin"
+msgstr "F-Spot’tan içe aktarma eklentisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr "Eğer F-Spot’tan içe aktarma eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+msgid "enable slideshow crumble transition"
+msgstr "ufala slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Ufala slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+msgid "enable slideshow fade transition"
+msgstr "soldur slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Soldur slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+msgid "enable slideshow slide transition"
+msgstr "kaydır slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Kaydır slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow clock transition"
+msgstr "saat slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Saat slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow circle transition"
+msgstr "daire slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Daire slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+msgid "enable slideshow circles transition"
+msgstr "çemberler slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Çemberler slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+msgid "enable slideshow blinds transition"
+msgstr "panjurlar slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Panjurlar slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+msgid "enable slideshow squares transition"
+msgstr "kareler slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Kareler slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:822
+msgid "enable slideshow stripes transition"
+msgstr "şeritler slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:823
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+"Eğer Şeritler slayt gösterisi geçiş eklentisi etkinse doğru, değilse yanlış"
+
+#: misc/org.yorba.shotwell.gschema.xml:828
+msgid "enable slideshow chess transition"
+msgstr "satranç tahtası slayt gösterisi geçisini etkinleştir"
+
+#: misc/org.yorba.shotwell.gschema.xml:829
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+"Eğer Satranç Tahtası slayt gösterisi geçiş eklentisi etkinse doğru, değilse "
+"yanlış"
 
-#: ../plugins/common/RESTSupport.vala:1145
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Facebook’ta oturum açmadınız.\n"
+"\n"
+"Henüz bir Facebook hesabınız yoksa, oturum açma sürecinde bir tane "
+"oluşturabilirsiniz. Oturum açma sırasında, Shotwell Connect fotoğraflarınızı "
+"karşıya yüklemek ve beslemelerinizde yayımlamak için izin isteyebilir. "
+"Shotwell Connect’in işlevini yerine getirmesi için bu izinler gereklidir."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Bu Shotwell oturumu süresince zaten Facebook’ta oturum açıp kapattınız.\n"
+"Facebook’ta yayımlamaya devam etmek için, Shotwell’i kapatın ve yeniden "
+"başlatın, daha sonra yeniden yayımlamayı deneyin."
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"Flickr’a Web tarayıcınızdan girdikten sonra çıkan doğrulama sayısını girin:"
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
+msgid "Authorization _Number:"
+msgstr "Yetkilendirme _Numarası:"
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Devam _Et"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Şu anda Flickr’da oturum açmış bulunmuyorsunuz.\n"
+"\n"
+"Flickr’a giriş yapmak için web tarayıcınızda Oturum Aç’a tıklayın. Flickr "
+"hesabınıza Shotwell Connect’i bağlamak için yetki vermeniz gerekiyor."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+msgid "Preparing for login…"
+msgstr "Giriş için hazırlanıyor…"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
+#: plugins/shotwell-publishing/FlickrPublishing.vala:341
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr ""
+"Yayımlama için gerekli bir dosya kullanılamıyor. Flickr’da yayımlama devam "
+"edemiyor."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+msgid "Verifying authorization…"
+msgstr "Yetkilendirme doğrulanıyor…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -46,120 +1435,198 @@ msgstr ""
 "Bu Shotwell oturumu boyunca zaten bir Google servisine giriş çıkış "
 "yaptınız.\n"
 "\n"
-"Google servislerine yayımlamaya devam etmek için, çıkın ve Shotwell'i "
-"yeniden başlatın, ardından yayımlamayı tekrar deneyin."
+"Google servislerine yayımlamaya devam etmek için, çıkın ve Shotwell’i "
+"yeniden başlatın, ardından yayımlamayı yeniden deneyin."
 
-#: ../plugins/common/Resources.vala:9
-msgid "Visit the Shotwell home page"
-msgstr "Shotwell ev sayfasınnı ziyaret et"
-
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
-msgid "translator-credits"
-msgstr ""
-"Yiğit Ateş <yigitates52@gmail.com>\n"
-"Hüseyin Demirtaş <h.demirtas.l10n@gmail.com>\n"
-"Ferhat Tunçtan <ferhattnctn19@yahoo.com.tr>"
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: ../src/Resources.vala:27
-#| msgid "Copyright 2009-2014 Yorba Foundation"
-msgid "Copyright 2009-2015 Yorba Foundation"
-msgstr "Telif Hakkı 2009-2015 Yorba Foundation"
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
-msgid ""
-"Welcome to the F-Spot library import service.\n"
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
+"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 ""
-"F-Spot kütüphanesi içe aktarma hizmetine hoşgeldiniz.\n"
+"Şu anda Picasa Web Albümleri’nde oturum açmış bulunmuyorsunuz.\n"
 "\n"
-"Lüften içe aktarım için ya Shotwell'in bulduğu mevcut kütüphanelerden birini "
-"veya alternatif bir F-Spot veritabanı dosyasını seçin."
+"Picasa Web Albümleri’ne giriş yapmak için web tarayıcınızda Oturum Aç’a "
+"tıklayın. Picasa Web Albümleri’nize Shotwell Connect’i bağlamak için yetki "
+"vermeniz gerekiyor."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
 msgid ""
-"Welcome to the F-Spot library import service.\n"
+"You are not currently logged into YouTube.\n"
 "\n"
-"Please select an F-Spot database file."
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
 msgstr ""
-"F-Spot kütüphanesi içe aktarma hizmetine hoşgeldiniz.\n"
+"Şu anda YouTube’da oturum açmış bulunmuyorsunuz.\n"
 "\n"
-"Lütfen bir F-Spot veritabanı dosyası seçin."
+"Devam etmek için YouTube’la birlikte kullanabilecek şekilde ayarlanmış bir "
+"Google hesabınız olmalı. Tarayıcınızı kullanıp en az bir kez YouTube "
+"sitesinde oturum açarak pek çok hesap kurabilirsiniz.  "
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "Shotwell ev sayfasınnı ziyaret et"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid "Manually select an F-Spot database file to import:"
-msgstr "İçe aktarma için el ile bir F-Spot veritabanı dosyası seçin:"
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:604
+msgid "translator-credits"
+msgstr ""
+"Yiğit Ateş <yigitates52@gmail.com>\n"
+"Hüseyin Demirtaş <h.demirtas.l10n@gmail.com>\n"
+"Ferhat Tunçtan <ferhattnctn19@yahoo.com.tr>\n"
+"Emin Tufan Çetin <etcetin@gmail.com>"
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr "⚫ Bu web sitesi bir başka web sitesine ait olan kimlik sundu."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
 msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
 msgstr ""
-"Seçilen F-Spot veritabanı dosyası açılamıyor: dosya yok ya da bir F-Spot "
-"veritabanı değil"
+"⚫ Bu web sitesinin kimliği güvenmek için çok eski. Bilgisayarınızdaki "
+"takvimi gözden geçirin."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
 msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
+"⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
-"Seçilen F-Spot veritabanı dosyası açılamıyor: F-Spot veritabanının bu sürümü "
-"Shotwell tarafından desteklenmiyor"
+"⚫ Bu web sitesinin kimliği güvenilen bir kuruluş tarafından verilmemiş."
+
+#. 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 "⚫ Bu web sitesinin kimliği işlenemedi. Bozulmuş olabilir."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
 msgstr ""
-"Seçilen F-Spot veritabanı dosyası okunamıyor: etiket tablosu okurken hata"
+"⚫ Bu web sitesinin kimliği, kimliği veren güvenilir kuruluş tarafından iptal "
+"edilmiş."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
 msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
 msgstr ""
-"Seçilen F-Spot veritabanı dosyası okunamıyor: fotoğraf tablosu okunurken hata"
+"⚫ Bu web sitesinin kimliği güvenilmez çünkü çok düşük şifreleme kullanıyor."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
-#, c-format
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
 msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
 msgstr ""
-"Shotwell F-Spot kitaplığında %d fotoğraf buldu ve şu anda bunları içe "
-"aktarmakta. Yinelemeler otomatik olarak algılanır ve kaldırılır.\n"
-"\n"
-"Bu iletişim kutusunu kapatıp içe aktarma arka planda sürerken Shotwell "
-"kullanmaya başlayabilirsiniz."
+"⚫ Bu web sitesinin kimliği yalnızca ileri tarihler için geçerli. "
+"Bilgisayarınızdaki takvimi gözden geçirin."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot kütüphanesi: %s"
+#: plugins/common/RESTSupport.vala:509
+#: plugins/shotwell-publishing/TumblrPublishing.vala:959
+msgid "A temporary file needed for publishing is unavailable"
+msgstr "Yayımlama için gerekli geçici bir dosya kullanılamıyor"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 URL’si:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "_Kullanıcı adı:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "_Parola:"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
-msgid "Preparing to import"
-msgstr "İçe aktarım için hazırlanıyor"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Geri _Git"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Çekirdek Veri İçe Aktarma Hizmetleri"
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:363
+msgid "_Log in"
+msgstr "_Oturum aç"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr "API _Anahtarı:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
+msgstr "veya"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Varolan bir albüm"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "Yeni _bir albüm"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr "Yüklemeden önce konum, etiket ve kamera-tanımlayıcı veriyi _kaldır"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+msgid "Scaling constraint:"
+msgstr "Ölçekleme kısıtlaması:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr "piksel"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Özgün boyut"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Genişlik veya yükseklik"
+
+#: 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/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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Çıkış"
+
+#: 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/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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Yayımla"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
-msgstr "Gallery3 yayımlama birimi"
+msgstr "Gallery3 yayımlama modülü"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -171,55 +1638,49 @@ msgstr ""
 "Giriş sürecini tamamlamak için bir Gallery3 hesabına kaydolmuş olmanız "
 "gerekiyor."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
-msgstr "Shotwell varsayılan dizin"
+msgstr "Shotwell öntaımlı dizin"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
-"\"%s\" dosyası bu Gallery3 örneği için çok büyük veya desteklenmiyor "
-"olabilir."
+"“%s” dosyası bu Gallery3 örneği için çok büyük veya desteklenmiyor olabilir."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
 msgstr ""
 "\n"
-"Gallery3'ün yalnızca Flowplayer'in desteklediği video türlerini "
+"Gallery3’ün yalnızca Flowplayer’in desteklediği video türlerini "
 "desteklediğini unutmayın."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
-"Yayımlama için gerekli bir dosya kullanılamıyor. %s'e yayımlama devam "
+"Yayımlama için gerekli bir dosya kullanılamıyor. %s’e yayımlama devam "
 "edemiyor."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
 msgid "Publishing to %s as %s."
-msgstr "%s'e %s olarak yayımlanıyor."
+msgstr "%s’e %s olarak yayımlanıyor."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -227,7 +1688,7 @@ msgstr ""
 "Gallery3 siteniz için URL ve Gallery3 hesabınız için kullanıcı ve parola "
 "(veya API anahtarı) girin."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -235,7 +1696,7 @@ msgstr ""
 "Kullanıcı adı ve parola veya API anahtarı geçersizdi. Tekrar denemek için, "
 "aşağıya kullanıcı adı ve parolanızı girin."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -244,1220 +1705,1335 @@ msgstr ""
 "Girilen URL bir Gallery3 örneğinin ana dizini gibi görünmüyor. Lütfen doğru "
 "yazdığınıza ve sonunda bileşen olmadığına (örn., index.php) emin olun."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Tanınmayan Kullanıcı"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Site Bulunamadı"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Telif hakkı (C) 2013 raje.net"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
-msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr ""
-"Rajce'ye yayımlama sırasında bir hata iletisi oluştu. Lütfen tekrar deneyin."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-msgid "Enter email and password associated with your Rajce account."
-msgstr "Rajce hesabınızla ilişkili e-posta ve parolanızı girin."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
-msgid "Invalid email and/or password. Please try again"
-msgstr "Geçersiz e-posta ve/veya parola. Lütfen tekrar deneyin"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
-msgid "Invalid User Email or Password"
-msgstr "Geçersiz Kullanıcı E-postası veya Parola"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_Eposta adresi"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:82
 msgid "_Password"
 msgstr "_Şifre"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Hatırla"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Giriş"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
-msgid "_Hide album"
-msgstr "Albümü _gizle"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#, c-format
-msgid "You are logged into Rajce as %s."
-msgstr "Rajce'ye %s olarak giriş yapmış bulunmaktasınız."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Fotoğrafların görüneceği yer:"
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+#: plugins/shotwell-publishing/tumblr_authentication_pane.ui:104
+msgid "Log in"
+msgstr "Oturum aç"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
 msgstr "_Varolan bir albüm:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 msgid "A _new album named:"
 msgstr "_Yeni bir albüm adlandırıldı"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
+msgid "_Hide album"
+msgstr "Albümü _gizle"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Hedef _albümü tarayıcıda aç"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "_Yayımla"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "_Çıkış"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Telif Hakkı 2012 BJA Electronics"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 piksel"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 piksel"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+msgid "Copyright © 2013 rajce.net"
+msgstr "Telif Hakkı © 2013 rajce.net"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 piksel"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr ""
-"'% s' bir OAuth kimlik doğrulama isteği için geçerli bir yanıt değildir"
+"Rajce’ye yayımlama sırasında bir hata iletisi oluştu. Lütfen yeniden deneyin."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): başlatılamıyor; bu yayımcı yeniden başlatılabilir "
-"değildir."
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Lütfen Tumblr hesabınızla ilişkili kullanıcı adınızı ve şifrenizi giriniz."
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Rajce hesabınızla ilişkili e-posta ve parolanızı girin."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
-msgid "Username and/or password invalid. Please try again"
-msgstr "Kullanıcı adı ve/veya şifre geçersiz. Lütfen tekrar deneyin"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+msgid "Invalid email and/or password. Please try again"
+msgstr "Geçersiz e-posta ve/veya parola. Lütfen tekrar deneyin"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
-msgid "Invalid User Name or Password"
-msgstr "Geçersiz Kullanıcı Adı veya Şifre"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+msgid "Invalid User Email or Password"
+msgstr "Geçersiz Kullanıcı E-postası veya Parola"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "Could not load UI: %s"
-msgstr "Kullanıcı arayüzü yüklenemedi: %s"
+msgid "You are logged into Rajce as %s."
+msgstr "Rajce’ye %s olarak giriş yapmış bulunmaktasınız."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"%s olarak Tumblr'a giriş yaptınız.\n"
-"\n"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
+msgid "Photos will appear in:"
+msgstr "Fotoğrafların görüneceği yer:"
+
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
+msgid "Shotwell Extra Publishing Services"
+msgstr "Shotwell Ek Yayımlama Servisleri"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Telif Hakkı 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Yandex.Fotki web sitesini ziyaret edin"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:659
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Şu anda Yandex.Fotki için oturum açmış değilsiniz."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Shotwell Ek Yayımlama Servisleri"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "Geri _Git"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:42
-msgid "_Login"
-msgstr "_Oturum Aç"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr "Giriş iletisi çalışma zamanında değiştirildi"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "_Gallery3 URL'si:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "_Kullanıcı adı:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "_Parola:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "API _Anahtarı:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "veya"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "Yeni _bir albüm"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "_Varolan bir albüm"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "Yüklemeden önce konum, etiket ve kamera-tanımlayıcı veriyi _kaldır"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr "'$url'ye $username olarak yayımlanıyor' (uygulama kodundan dolduruldu)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "Ölçekleme kısıtlaması:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "piksel"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Özgün boyut"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Genişlik veya yükseklik"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:14
-msgid "label"
-msgstr "etiket"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Bloglar:"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
-msgid "Photo _size:"
-msgstr "Fotoğraf _boyutu:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Genel"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "rajce'ye $name olarak giriş yapmış bulunmaktasınız"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Arkadaşlar"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-msgid "$mediatype will appear in"
-msgstr "$mediatype şurada belirecek"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Özel"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albümler (ya da yeni bir tane yaz):"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Erişim _türü:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Yorumları devre _dışı bırak"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Özgün fotoğrafı indirmeyi yasakla"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "Genel"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "_Varolan bir albümde yayımla:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1195
-msgid "Friends"
-msgstr "Arkadaşlar"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "Şu ada sahip _yeni bir albüm oluştur:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Özel"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+msgid "Upload _size:"
+msgstr "Yükleme _boyutu:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-msgid "Shotwell Connect"
-msgstr "Shotwell Bağlantısı"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
+msgid "Videos and new photo albums _visible to:"
+msgstr "Videolar ve yeni fotoğraf albümleri şunlara _görülebilirdir:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: 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:59
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Facebook'ta oturum açmadınız.\n"
-"\n"
-"Henüz bir Facebook hesabınız yoksa, oturum açma sürecinde bir tane "
-"oluşturabilirsiniz. Oturum açma sırasında, Shotwell Bağlantısı "
-"fotoğraflarınızı karşıya yüklemek ve beslemelerinizde yayımlamak için izin "
-"isteyebilir. Shotwell Bağlantısı'nın işlevini yerine getirmesi için bu "
-"izinler gereklidir."
+"_Remove location, camera, and other identifying information before uploading"
+msgstr "Yüklemeden önce konum, kamera, ve diğer tanımlayıcı bilgileri _kaldır"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Bu Shotwell oturumu süresince zaten Facebook'ta oturum açıp kapattınız.\n"
-"Facebook'ta yayımlamaya devam etmek için, Shotwell'i kapatın ve yeniden "
-"başlatın, daha sonra tekrar yayımlamayı deneyin."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Telif Hakkı 2016 Software Freedom Conservancy Inc."
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
+msgid "Shotwell Connect"
+msgstr "Shotwell Bağlantısı"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standart (720 piksel)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Geniş (2048 piksel)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Facebook bağlantısı sınanıyor..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
+msgstr "Albüm oluşturuluyor…"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Albüm oluşturuluyor..."
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 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 ""
-"Yayımlama için gerekli bir dosya kullanılamıyor. Facebook'ta yayımlama devam "
+"Yayımlama için gerekli bir dosya kullanılamıyor. Facebook’ta yayımlama devam "
 "edemiyor."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
 msgstr ""
-"Facebook'a %s olarak giriş yaptınız.\n"
+"Facebook’a %s olarak giriş yaptınız.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Seçilen fotoğrafları nerede yayımlamak istersiniz?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1035
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "Yükleme _boyutu:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1194
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Yalnızca ben"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1196
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Herkes"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:61
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Şu anda Flickr'da oturum açmış bulunmuyorsunuz.\n"
-"\n"
-"Flickr'a giriş yapmak için web tarayıcınızda Oturum Aç'a tıklayın. Flickr "
-"hesabınıza Shotwell Connect'i bağlamak için yetki vermeniz gerekiyor."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Bu Shotwell oturumu süresince zaten Flickr'da oturum açıp kapattınız.\n"
-"Flickr'da yayımlamaya devam etmek için, Shotwell'i kapatın ve yeniden "
-"başlatın, daha sonra tekrar yayımlamayı deneyin."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Giriş için hazırlanıyor..."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"Yayımlama için gerekli bir dosya kullanılamıyor. Flickr'da yayımlama devam "
-"edemiyor."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Yetkilendirme doğrulanıyor..."
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "Fotoğraf _boyutu:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
-"Flickr'da %s olarak oturum açtınız.\n"
+"Flickr’da %s olarak oturum açtınız.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#: plugins/shotwell-publishing/FlickrPublishing.vala:802
 #, 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] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Ücretsiz Flickr hesabınız her ay ne kadar veri gönderebilceğinizi "
 "sınırlandırır.\n"
-"Bu ay, %d megabayt karşıya yükleme kotanız kaldı."
+"Bu ay, %s karşıya yükleme kotanız kaldı."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Flickr Pro hesabınız, sınırsız karşıya yükleme yapmanıza olanak tanır."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Fotoğrafları _görebilecekler:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Videolar şunlara _görülebilir:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Fotoğraflar ve videolar _şunlara görülebilir:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Yalnızca aile & arkadaşlar"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Aileye özel"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Arkadaşlara özel"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 benek"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 benek"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:876
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "500 × 375 pixels"
+msgstr "500 × 375 piksel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:106
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 piksel"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 benek"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 benek"
+
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+msgid "Photo _size preset:"
+msgstr "Fotoğraf _boyutu önayarı:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Şu anda Picasa Web Albümlerinde oturum açmış bulunmuyorsunuz.\n"
-"\n"
-"Picasa Web Albümleri'ne giriş yapmak için web tarayıcınızda Oturum Aç'a "
-"tıklayın. Picasa Web Albümlerinize Shotwell Connect'i bağlamak için yetki "
-"vermeniz gerekiyor."
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+msgid "Default album"
+msgstr "Öntanımlı albüm"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 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 ""
-"Yayımlama için gerekli bir dosya kullanılamıyor. Picasa'ya yayımlama devam "
+"Yayımlama için gerekli bir dosya kullanılamıyor. Picasa’ya yayımlama devam "
 "edemiyor."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Picasa Web Albümleri'nde %s olarak oturum açtınız."
+msgstr "Picasa Web Albümleri’nde %s olarak oturum açtınız."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Videolar şurada görünecektir:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Küçük (640 x 480 benek)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+msgid "Small (640 × 480 pixels)"
+msgstr "Küçük (640 × 480 benek)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Orta (1024 x 768 benek)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Orta (1024 × 768 benek)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Önerilen (1600 x 1200 benek)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Önerilen (1600 × 1200 benek)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 piksel)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 piksel)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Özgün Boyut"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "Piwigo fotoğraf kitaplığı _URL’niz"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+msgid "User _name"
+msgstr "Kullanıcı _adı"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Parolayı Anımsa"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Var _olan bir kategori"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+#, fuzzy
+#| msgid "A _new album named:"
+msgid "A _new album named"
+msgstr "_Yeni bir albüm adlandırıldı"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#, fuzzy
+#| msgid "within category:"
+msgid "within category"
+msgstr "kategoride:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Albüm yorumu"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Fotoğraflar şunlarca _görülebilir olacak:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Fotoğraf boyutu"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"Bir başlık ayarlanmış ve bir yorum kaldırılmışsa, başlığı yorum olarak "
+"_kullan"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "Etiketleri _yükleme"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "Çıkış"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:296 ui/collection.ui:192
+msgid "Publish"
+msgstr "Yayımla"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "%s albümü oluşturuluyor..."
+msgid "Creating album %s…"
+msgstr "%s albümü oluşturuluyor…"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
-"Piwigo'ya yayımlama sırasında bir hata iletisi oluştu. Lütfen tekrar deneyin."
+"Piwigo’ya yayımlama sırasında bir hata iletisi oluştu. Lütfen yeniden "
+"deneyin."
+
+#. %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 ""
+"Bu gerçek <b>%s</b> gibi görünmüyor. Saldırganlar bu siteye giden veya gelen "
+"bilgiyi (örneğin; özel iletiler, kredi kartı bilgisi veya parolalar gibi) "
+"çalmak veya başkalaştırmak istiyor olabilir."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "%s’in sertifikası"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
+msgid "_OK"
+msgstr "_Tamam"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
-"Piwigo fotoğraf kitaplığınızın URL'sinin yanı sıra bu kütüphane için Piwigo "
+"Piwigo fotoğraf kitaplığınızın URL’sinin yanı sıra bu kitaplık için Piwigo "
 "hesabınızla ilişkili kullanıcı adınızı ve şifrenizi giriniz."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
 msgstr ""
-"Shotwell Piwigo fotoğraf kütüphanenizle bağlantı kuramıyor. Lüften "
-"girdiğiniz URL'yi kontrol edin"
+"Shotwell Piwigo fotoğraf kitaplığınızla bağlantı kuramıyor. Lüften "
+"girdiğiniz URL’yi denetleyin"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+#: plugins/shotwell-publishing/TumblrPublishing.vala:588
+msgid "Username and/or password invalid. Please try again"
+msgstr "Kullanıcı adı ve/veya şifre geçersiz. Lütfen tekrar deneyin"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Geçersiz URL"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+#: plugins/shotwell-publishing/TumblrPublishing.vala:615
+msgid "Invalid User Name or Password"
+msgstr "Geçersiz Kullanıcı Adı veya Şifre"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Yöneticiler, Aile, Arkadaşlar, Bağlantılar"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Yöneticiler, Aile, Arkadaşlar"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Yöneticiler, Aile"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Yöneticiler"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
-msgid ""
-"You are not currently logged into YouTube.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
-msgstr ""
-"Şu anda YouTube'da oturum açmış bulunmuyorsunuz.\n"
-"\n"
-"Devam etmek için YouTube'la birlikte kullanabilecek şekilde ayarlanmış bir "
-"Google hesabınız olmalı. Tarayıcınızı kullanıp en az bir kez YouTube "
-"sitesinde oturum açarak pek çok hesap kurabilirsiniz.  "
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"Yayımlama için gerekli bir dosya kullanılamıyor. YouTube'da yayımlama devam "
-"edemiyor."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Bu bağlantı güvenli değil"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "YouTube'a %s olarak oturum açtınız."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Sertifikayı göster…"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Videolar '%s' içinde görülecek"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Genel listelenmiş"
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Anlıyorum, lütfen _devam et."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Genel listelenmemiş"
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
+msgid "Core Publishing Services"
+msgstr "Çekirdek Yayımlama Hizmetleri"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "_Varolan bir albümde yayımla:"
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Bloglar:"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Şu ada sahip _yeni bir albüm oluştur:"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:36
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Telif Hakkı 2012 BJA Electronics"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Videolar ve yeni fotoğraf albümleri şunlara _görülebilirdir:"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:107
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 piksel"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "Yüklemeden önce konum, kamera, ve diğer tanımlayıcı bilgileri _kaldır"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:311
+#: plugins/shotwell-publishing/TumblrPublishing.vala:321
+#, c-format
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
+msgstr "“%s” bir OAuth kimlik doğrulama isteği için geçerli bir yanıt değildir"
 
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+#: plugins/shotwell-publishing/TumblrPublishing.vala:559
 msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
-"Flickr'a Web tarayıcınızdan girdikten sonra çıkan doğrulama sayısını girin:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "Yetkilendirme _Numarası:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Devam _Et"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "Albümü herkese açık galeride l_istele"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Fotoğraf _boyutu varsayılanı:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "Piwigo fotoğraf kitaplığı _URL'niz"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "Kullanıcı _adı"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Parolayı Hatırla"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "Mevcut bir _kategori:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Fotoğraflar şunlarca g_örülebilir olacak:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Fotoğraf boyutu:"
+"TumblrPublisher: start( ): başlatılamıyor; bu yayımcı yeniden başlatılabilir "
+"değildir."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "kategoride:"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:587
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Lütfen Tumblr hesabınızla ilişkili kullanıcı adınızı ve şifrenizi giriniz."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Albüm yorumu:"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing/TumblrPublishing.vala:753
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Kullanıcı arayüzü yüklenemedi: %s"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
+#: plugins/shotwell-publishing/TumblrPublishing.vala:735
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
 msgstr ""
-"Bir başlık ayarlanmış ve bir yorum kaldırılmışsa, başlığı yorum olarak "
-"_kullan"
+"Tumblr’a %s olarak giriş yaptınız.\n"
+"\n"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "Etiketleri _yükleme"
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Video gizlilik _ayarları:"
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Çıkış"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
+msgid ""
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
+"continue."
+msgstr ""
+"Yayımlama için gerekli bir dosya kullanılamıyor. YouTube’da yayımlama devam "
+"edemiyor."
 
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:303
-msgid "Publish"
-msgstr "Yayımla"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
+#, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "YouTube’a %s olarak oturum açtınız."
 
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Çekirdek Yayımlama Hizmetleri"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
+msgid "Public listed"
+msgstr "Genel listelenmiş"
 
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "Video gizlilik _ayarları:"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
+msgid "Public unlisted"
+msgstr "Genel listelenmemiş"
 
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Panjurlar"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Satranç"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Daire"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Çemberler"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Saat"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Ufala"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Soldur"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+msgid "Core Slideshow Transitions"
+msgstr "Çekirdek Slayt Gösterisi Geçişleri"
+
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
+msgid ""
+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
+"Inc."
+msgstr ""
+"Telif Hakkı 2010 Maxim Kartashev, Telif Hakkı 2016 Software Freedom "
+"Conservancy Inc."
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "Kaydır"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "Kareler"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "Şeritler"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Çekirdek Slayt Gösterisi Geçişleri"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-#, fuzzy
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
-msgstr ""
-"Telif hakkı 2010 Maxim Kartashev, Telif Hakkı 2011-2014 Yorba Foundation"
-
-#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "Önbellek dizini oluşturulamıyor %s: %s"
 
-#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "Veri klasörü oluşturulamadı %s: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Resimler"
 
-#: ../src/AppDirs.vala:190
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Geçici klasör oluşturulamadı  %s: %s"
 
-#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:238
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Altklasör oluşturulamadı  %s: %s"
 
-#: ../src/AppDirs.vala:220
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
-msgstr ""
+msgstr "%s dizini yazılabilir yapılamıyor"
 
-#: ../src/AppDirs.vala:223
-#, fuzzy, c-format
-#| msgid "Unable to create cache directory %s: %s"
+#: src/AppDirs.vala:239
+#, c-format
 msgid "Could not make directory %s writable: %s"
-msgstr "Önbellek dizini oluşturulamıyor %s: %s"
+msgstr "%s dizini yazılabilir yapılamıyor: %s"
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Araç Çubuğunu Sabitle"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Araç çubuğunu açık olarak sabitle"
 
-#: ../src/AppWindow.vala:59
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Tam ekrandan çık"
 
-#: ../src/AppWindow.vala:525
-msgid "_Contents"
-msgstr "_İçindekiler"
-
-#: ../src/AppWindow.vala:530
-msgid "_Frequently Asked Questions"
-msgstr "_Sıkça Sorulan Sorular"
-
-#: ../src/AppWindow.vala:535
-msgid "_Report a Problem..."
-msgstr "_Bir Sorun Bildirin..."
-
-#: ../src/AppWindow.vala:634 ../src/AppWindow.vala:655
-#: ../src/AppWindow.vala:672 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1418 ../src/Dialogs.vala:1441 ../src/Resources.vala:162
-#: ../src/data_imports/DataImportsUI.vala:374
-#: ../src/publishing/PublishingUI.vala:475
+#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "İ_ptal"
 
-#: ../src/AppWindow.vala:682
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
 msgstr ""
-"Shotwell kütüphanesine erişim sırasında kritik bir hata meydana geldi.  "
-"Shotwell işlemi sürdüremiyor.\n"
+"Shotwell’in kitaplığına erişilirken ölümcül bir hata meydana geldi. Shotwell "
+"işlemi sürdüremiyor.\n"
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:702
-msgid "Visit the Yorba web site"
-msgstr "Yorba web sitesini ziyaret edin"
+#: src/AppWindow.vala:600
+msgid "Visit the Shotwell web site"
+msgstr "Shotwell web sitesini ziyaret et"
 
-#: ../src/AppWindow.vala:714
+#: src/AppWindow.vala:613
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Yardım görüntülenemiyor: %s"
 
-#: ../src/AppWindow.vala:722
+#: src/AppWindow.vala:621
 #, c-format
 msgid "Unable to navigate to bug database: %s"
-msgstr "Hata veritabanına yönlendirme başarısız: %s"
+msgstr "Hata veri tabanına yönlendirme başarısız: %s"
 
-#: ../src/AppWindow.vala:730
+#: src/AppWindow.vala:629
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "SSS gösterilemiyor: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Başarılı"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Dosya hatası"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Dosya şifresi çözülemedi"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
-msgstr "Veritabanı hatası"
+msgstr "Veri tabanı hatası"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Kullanıcı içe aktarma işlemini iptal etti"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Bir dosya değil"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
-msgstr "Dosya zaten veritabanında mevcut"
+msgstr "Dosya veri tabanında zaten var"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Desteklenmeyen dosya biçimi"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Bir görüntü dosyası değil"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Disk hatası"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Disk dolu"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Kamera hatası"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Dosya yazma hatası"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Bozuk resim dosyası"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "İçe aktarılamadı (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+#: src/camera/CameraBranch.vala:85
+msgid "Cameras"
+msgstr "Kameralar"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+msgid "Camera"
+msgstr "Kamera"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
+
+#: src/camera/ImportPage.vala:466
+msgid ""
+"Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr "Kamera ayrılamadı. Kamerayı dosya yöneticisinden ayırmayı deneyin."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+msgid "Hide photos already imported"
+msgstr "İçe aktarılmış fotoğrafları gizle"
+
+#: src/camera/ImportPage.vala:784
+msgid "Only display photos that have not been imported"
+msgstr "Yalnızca içe aktarılmamış fotoğrafları görüntüle"
+
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "_Seçili Ögeleri İçe Aktar"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "_Tümünü İçe Aktar"
+
+#: src/camera/ImportPage.vala:857
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr "Kamera boş gözüküyor. İçe aktarılacak fotoğraf/video bulunamadı"
+
+#: src/camera/ImportPage.vala:861
+msgid "No new photos/videos found on camera"
+msgstr "Kamerada hiç yeni fotoğraf/video bulunamadı"
+
+#. it's mounted, offer to unmount for the user
+#: src/camera/ImportPage.vala:1021
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+msgstr ""
+"Shotwell, erişim sağlamak için kameranın dosya sisteminden ayrılmasına "
+"gereksiniyor. Devam edilsin mi?"
+
+#: src/camera/ImportPage.vala:1027
+msgid "_Unmount"
+msgstr "_Ayır"
+
+#: src/camera/ImportPage.vala:1032
+msgid "Please unmount the camera."
+msgstr "Lütfen kamerayı ayırın."
+
+#: 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 ""
+"Kamera, başka bir uygulama tarafından kullanılıyor. Shotwell, kameraya "
+"yalnızca boştayken erişebilir. Lütfen kamerayı kullanan diğer uygulamayı "
+"kapatın ve yeniden deneyin."
+
+#: src/camera/ImportPage.vala:1047
+msgid "Please close any other application using the camera."
+msgstr "Lütfen kamerayı kullanırken diğer programları kapatın."
+
+#: src/camera/ImportPage.vala:1052
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Kameradan önizlemeler alınamadı:\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr "Ayrılıyor…"
+
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr "İçe aktarım başlıyor, lütfen bekleyin…"
+
+#: src/camera/ImportPage.vala:1177
+msgid "Fetching photo information"
+msgstr "Fotoğraf bilgisi alınıyor"
+
+#: src/camera/ImportPage.vala:1535
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "%s için önizleme alınıyor"
+
+#: src/camera/ImportPage.vala:1649
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Kamera kilitlenemedi: %s"
+
+#: src/camera/ImportPage.vala:1734
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Bu %d fotoğraf kameradan silinsin mi?"
+
+#: src/camera/ImportPage.vala:1737
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Bu %d video kameradan silinsin mi?"
+
+#: src/camera/ImportPage.vala:1740
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Bu %d fotoğraf/video kameradan silinsin mi?"
+
+#: src/camera/ImportPage.vala:1743
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Bu %d dosya kameradan silinsin mi?"
+
+#: src/camera/ImportPage.vala:1751 src/Dialogs.vala:1387
+msgid "_Keep"
+msgstr "_Koru"
+
+#: src/camera/ImportPage.vala:1770
+msgid "Removing photos/videos from camera"
+msgstr "Fotoğraflar/Videolar kameradan kaldırılıyor"
+
+#: src/camera/ImportPage.vala:1774
+#, c-format
+msgid "Unable to delete %d photo/video from the camera due to errors."
+msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
+msgstr[0] "%d fotoğraf/video hatalar sebebiyle kameradan silinemiyor."
+
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
+msgid "_Print"
+msgstr "_Baskı"
+
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "_Gönder…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
+msgid "Set as _Desktop Background"
+msgstr "_Masaüstü Arkapılan olarak ayarla"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:287
+msgid "_Duplicate"
+msgstr "_Kopya Oluştur"
+
+#: src/CollectionPage.vala:100
+msgid "Fullscreen"
+msgstr "Tam ekran"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "S_layt Gösterisi"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
-msgid "Play a slideshow"
-msgstr "Bir slayt gösterisi oynat"
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "_Sağa Döndür"
 
-#: ../src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Resimleri/Videoları Dışa Aktar"
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "S_ola Döndür"
 
-#: ../src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Fotoğrafları/Videoları Dışa Aktar"
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Ya_tay Döndür"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3211
-msgid "Export Photo"
-msgstr "Fotoğrafları Dışa Aktar"
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Di_key Döndür"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
-msgid "Export Photos"
-msgstr "Fotoğrafları Dışa Aktar"
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_İyileştir"
+
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Özgün Haline Dö_ndür"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "Renk Düzenlemelerini _Kopyala"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "Renk Düzenlemelerini _Yapıştır"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr "Tarih ve Zamanı Ayarla…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
+msgid "Open With E_xternal Editor"
+msgstr "_Harici Düzenleyici ile Aç"
+
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+msgid "Open With RA_W Editor"
+msgstr "RA_W Düzenleyici İle Aç"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:168
+msgid "_Play"
+msgstr "_Oynat"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:410
+msgid "Export Photo/Video"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Resimleri/Videoları Dışa Aktar"
+
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+msgid "Export Photo"
+msgid_plural "Export Photos"
+msgstr[0] "Fotoğrafları Dışa Aktar"
+
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Döndürülüyor"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Döndürme İşlemi Geri Alınıyor"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Yatay Olarak Çevriliyor"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
-msgstr "Yatay Olarak Çevirme Geri Alınıyor"
+msgstr "Yatay Olarak Döndürme Geri Alınıyor"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Dikey Olarak Çevriliyor"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
-msgstr "Dikey Olarak Çevirme Geri Alınıyor"
+msgstr "Dikey Olarak Döndürme Geri Alınıyor"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "Ters Çevriliyor"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
-msgstr "Ters Çevirme İşlemi Geri Alınıyor"
+msgstr "Ters Döndürme İşlemi Geri Alınıyor"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "İyileştiriliyor"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "İyileştirme İşlemi Geri Alınıyor"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "Renk Dönüşümleri Uygulanıyor"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "Renk Dönüşümleri Geri Alınıyor"
 
-#: ../src/Commands.vala:1003
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "Yeni Olay Oluşturuluyor"
 
-#: ../src/Commands.vala:1004
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "Olay Kaldırılıyor"
 
-#: ../src/Commands.vala:1013
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "Fotoğraflar Yeni Olaya Taşınıyor"
 
-#: ../src/Commands.vala:1014
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "Fotoğraflar Önceki Olayla İlişkilendiriliyor"
 
-#: ../src/Commands.vala:1071
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "Birleştiriliyor"
 
-#: ../src/Commands.vala:1072
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "Ayrılıyor"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "Fotoğraflar çoğaltılıyor"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "Yinelenen fotoğraflar kaldırılıyor"
 
-#: ../src/Commands.vala:1104
+#: src/Commands.vala:1108
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "%d fotoğraf, dosya hatası nedeniyle çoğaltılamadı"
 
-#: ../src/Commands.vala:1191
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Önceki puanlamaya geri dön"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "Puanlandırmalar artırılıyor"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "Puanlandırmalar düşürülüyor"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "RAW geliştiricisi ayarlanıyor"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Önceki RAW geliştirici onarılıyor"
 
-#: ../src/Commands.vala:1253
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Geliştirici Ayarla"
 
-#: ../src/Commands.vala:1343
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "Özgün fotoğraf ayarlanamadı."
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "Tarih ve Saat Ayarlanıyor"
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "Tarih ve Saat Ayarlama İşlemi Geri Alınıyor"
 
-#: ../src/Commands.vala:1395
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Özgün fotoğraf(lar) ayarlanamadı."
 
-#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Saat Ayarlama Hatası"
 
-#: ../src/Commands.vala:1419
+#: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
 msgstr[0] ""
 "Zaman ayarlamaları sonraki fotoğraf dosyası(ları) üzerine geri alınamaz."
 
-#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Etiket Oluştur"
 
-#: ../src/Commands.vala:1691
+#: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
-msgstr "Etiketi Taşı \"%s\""
+msgid "Move Tag “%s”"
+msgstr "“%s” Etiketini Taşı"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Fotoğrafları Çöpe Taşı"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Çöpteki Fotoğrafları Geri Getir"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Fotoğrafları Shotwell çöp kutusuna taşı"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Shotwell kitaplığındaki fotoğrafları geri getir"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "Fotoğraflar Çöp Kutusuna Taşınıyor"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Fotoğraflar Çöp Kutusundan Geri Getiriliyor"
 
-#: ../src/Commands.vala:2449
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
-msgstr "Şeçili uygunsuz olarak fotoğrafları bildir"
+msgstr "Seçili fotoğrafları işaretle"
 
-#: ../src/Commands.vala:2450
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
-msgstr "Seçili fotoğrafları uygunsuz olarak bildirme"
+msgstr "Seçili fotoğrafların işaretini kaldır"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
-msgstr "Seçili fotoğraflar bayraklanıyor"
+msgstr "Seçili fotoğraflar işaretleniyor"
 
-#: ../src/Commands.vala:2452
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
-msgstr "Seçili fotoğraflardan bayraklar kaldırılıyor"
+msgstr "Seçili fotoğrafların işaretleri kaldırılıyor"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Flag"
-msgstr "Bildir"
+msgstr "İşaretle"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Unflag"
-msgstr "Bildirme"
+msgstr "İşaretleme"
 
-#: ../src/DesktopIntegration.vala:121
+#. Send an empty job to the queue to mark the end of the import
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s Veri Tabanı"
+
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
+#, c-format
+msgid "Importing from %s can’t continue because an error occurred:"
+msgstr "%s’den içe aktarım devam edemez çünkü bir hata oluştu:"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Başka bir hizmetten içe aktarmayı denemek için, yukarıdaki menüden birini "
+"seçin."
+
+#: src/data_imports/DataImportsUI.vala:10
+msgid ""
+"You do not have any data imports plugins enabled.\n"
+"\n"
+"In order to use the Import From Application functionality, you need to have "
+"at least one data imports plugin enabled. Plugins can be enabled in the "
+"Preferences dialog."
+msgstr ""
+"Herhangi bir etkinleştirilmiş veri içe aktarma eklentiniz yok.\n"
+"\n"
+"Uygulamadan İçe Aktar işlevselliğini kullanmak için, en azından bir veri içe "
+"aktarma eklentiniz etkin olmalı. Eklentiler Tercihler bölümünden "
+"etkinleştirilebilinir."
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Veri tabanı dosyası:"
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:781
+msgid "_Import"
+msgstr "_İçe Aktar"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Uygulamadan İçe Aktar"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Ortamı _şuradan içe aktar:"
+
+#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
+msgid "_Close"
+msgstr "_Kapat"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Veri İçe Aktarımları"
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Fotoğraf veri tabanı açılmadı/oluşturulamadı %s: hata kodu %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Fotoğraf veri tabanı dosyasına yazılamıyor:\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Veri tabanı dosyasına erişirken hata:\n"
+" %s\n"
+"\n"
+"Hata şuydu: \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, c-format
+msgid "Unable to restore photo database %s"
+msgstr "%s fotoğraf veri tabanı geri yüklenemiyor"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Nautilus Send-To başlatılamadı: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Gönder"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Artalan dışa aktarılamadı %s: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Masaüstü slayt gösterisi hazırlanamadı: %s"
 
-#: ../src/Dialogs.vala:16
+#: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] ""
-"Bu işlem \"%s\" etiketini  %d fotoğraf(lar)dan kaldıracak.  Devam edilsin "
-"mi? "
+"Bu işlem “%s” etiketini %d fotoğraftan kaldıracak. Devam edilsin mi? "
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1386
-#: ../src/Resources.vala:163 ../src/Resources.vala:369
-#: ../src/Resources.vala:417 ../src/Resources.vala:682
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Sil"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Bu işlem kayıtlı \"%s\" aramasını kaldıracak.  Devam edilsin mi?"
+msgid "This will remove the saved search “%s”. Continue?"
+msgstr "Bu işlem kayıtlı “%s” aramasını kaldıracak. Devam edilsin mi?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1465,32 +3041,36 @@ msgid_plural ""
 "Switching developers will undo all changes you have made to these photos in "
 "Shotwell"
 msgstr[0] ""
-"Geliştiricileri değiştirmek Shotwell'de bu fotoğraf(lar)a yapmış olduğunuz "
+"Geliştiricileri değiştirmek Shotwell’de bu fotoğraf(lar)a yapmış olduğunuz "
 "tüm değişiklikleri geri alacak"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Geliştirici Değiştir"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Video Ihracatı"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Fotoğrafları Dışa Aktar"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:115
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
-"Shotwell bu fotoğrafı düzenlemek için bir dosya oluşturamıyor çünkü %s ye "
+"Shotwell bu fotoğrafı düzenlemek için bir dosya oluşturamıyor çünkü %s’e "
 "yazmaya izniniz yok."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1498,7 +3078,7 @@ msgstr ""
 "İzleyen fotoğraf bir dosya hatası nedeniyle dışa aktarılamadı.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1511,59 +3091,59 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:147
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "Değiştirilmemiş"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Mevcut"
 
 #. layout controls
-#: ../src/Dialogs.vala:213
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Biçim:"
 
-#: ../src/Dialogs.vala:216
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Kalite:"
 
-#: ../src/Dialogs.vala:219
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Baskı ölçeklendiriliyor:"
 
-#: ../src/Dialogs.vala:222
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Piksel:"
 
-#: ../src/Dialogs.vala:225
-msgid "Export metadata"
-msgstr "Metadata'yı dışa aktar"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "_Üstveriyi dışa aktar:"
 
-#: ../src/Dialogs.vala:459
-msgid "Save Details..."
-msgstr "Detayları Kaydet..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Ayrıntıları Kaydet…"
 
-#: ../src/Dialogs.vala:460
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Detayları Kaydet"
 
-#: ../src/Dialogs.vala:475
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(ve %d tane daha)\n"
 
-#: ../src/Dialogs.vala:528
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Sonuç Raporunu İçe Aktar"
 
-#: ../src/Dialogs.vala:532
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "%d dosya içe aktarılmaya çalışıldı."
 
-#: ../src/Dialogs.vala:535
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1572,111 +3152,111 @@ msgstr[0] "Bunlardan, %d dosya başarıyla içe aktarıldı."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:547
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "İçe Aktarılmayan Fotoğraf/Videoları çoğalt:"
 
-#: ../src/Dialogs.vala:551
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
-msgstr "mevcut ortam öğesini çoğaltır"
+msgstr "mevcut ortam ögesini çoğaltır"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:562
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Kamera Hataları Sebebiyle İçe Aktarılmayan Fotoğraflar/Videolar:"
 
-#: ../src/Dialogs.vala:565 ../src/Dialogs.vala:580 ../src/Dialogs.vala:595
-#: ../src/Dialogs.vala:611 ../src/Dialogs.vala:626 ../src/Dialogs.vala:640
+#: 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 "hata mesajı:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:576
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
-msgstr "Fotoğraf veya Video Olarak Tanınmadığı için İçe Aktarılmayan Dosyalar:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
+msgstr "Fotoğraf Veya Video Olarak Tanınmadığı İçin İçe Aktarılmayan Dosyalar:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:591
+#: src/Dialogs.vala:610
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
-"Shotwell'in Anlayabildiği bir Biçimde Olmadıklarından İçe Aktarılmayan "
+"Shotwell’in Anlayabildiği Bir Biçimde Olmadıklarından İçe Aktarılmayan "
 "Fotoğraflar/Videolar:"
 
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:606
+#: src/Dialogs.vala:625
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
-"Shotwell Kendi Kitaplığına Kopyalayamadığı için İçe Aktarılmayan Fotoğraflar/"
+"Shotwell Kendi Kitaplığına Kopyalayamadığı İçin İçe Aktarılmayan Fotoğraflar/"
 "Videolar:"
 
-#: ../src/Dialogs.vala:610
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "%s\n"
-"\t%s üzerine kopyalanamadı"
+"\t%s’e kopyalanamadı"
 
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:622
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Dosyalar Bozuk Olduğundan Fotoğraflar/Videolar İçe Aktarılmadı:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:637
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Başka Sebeplerden İçe Aktarılmayan Fotoğraflar/Videolar:"
 
-#: ../src/Dialogs.vala:657
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d fotoğraf kopyası içe aktarılmadı:\n"
 
-#: ../src/Dialogs.vala:660
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d video kopyası içe aktarılmadı:\n"
 
-#: ../src/Dialogs.vala:663
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d fotoğraf/video kopyası içe aktarılmadı:\n"
 
-#: ../src/Dialogs.vala:677
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 "%d fotoğrafın dosya veya donanım hatası dolayısıyla içe aktarımı başarısız:\n"
 
-#: ../src/Dialogs.vala:680
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 "%d videonun dosya veya donanım hatası dolayısıyla içe aktarımı başarısız:\n"
 
-#: ../src/Dialogs.vala:683
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1685,14 +3265,14 @@ msgstr[0] ""
 "%d fotoğrafın/videonun dosya veya donanım hatası dolayısıyla içe aktarımı "
 "başarısız:\n"
 
-#: ../src/Dialogs.vala:686
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] ""
 "%d dosyanın içe aktarımı dosya veya donanım hatası dolayısıyla başarısız:\n"
 
-#: ../src/Dialogs.vala:700
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1700,10 +3280,10 @@ msgid_plural ""
 "%d photos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d fotoğrafın içe aktarımı başarısız çünkü fotoğraf kütüphanesi klasörü "
+"%d fotoğrafın içe aktarımı başarısız çünkü fotoğraf kitaplığı klasörü "
 "yazılabilir değildi:\n"
 
-#: ../src/Dialogs.vala:703
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1711,10 +3291,10 @@ msgid_plural ""
 "%d videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d videonun içe aktarımı başarısız çünkü fotoğraf kütüphanesi klasörü "
+"%d videonun içe aktarımı başarısız çünkü fotoğraf kitaplığı klasörü "
 "yazılabilir değildi:\n"
 
-#: ../src/Dialogs.vala:706
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1723,10 +3303,10 @@ msgid_plural ""
 "%d photos/videos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d fotoğrafın/videonun içe aktarımı başarısız çünkü fotoğraf kütüphanesi "
+"%d fotoğrafın/videonun içe aktarımı başarısız çünkü fotoğraf kitaplığı "
 "klasörü yazılabilir değildi:\n"
 
-#: ../src/Dialogs.vala:709
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1734,53 +3314,53 @@ msgid_plural ""
 "%d files failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d dosyanın içe aktarımı başarısız çünkü fotoğraf kütüphanesi klasörü "
+"%d dosyanın içe aktarımı başarısız çünkü fotoğraf kitaplığı klasörü "
 "yazılabilir değildi:\n"
 
-#: ../src/Dialogs.vala:723
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "%d fotoğrafın içe aktarımı kamera hatası dolayısıyla başarısız:\n"
 
-#: ../src/Dialogs.vala:726
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "%d videonun içe aktarımı kamera hatası dolayısıyla başarısız:\n"
 
-#: ../src/Dialogs.vala:729
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] ""
 "%d fotoğrafın/videonun içe aktarımı kamera hatası dolayısıyla başarısız:\n"
 
-#: ../src/Dialogs.vala:732
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "%d dosyanın içe aktarımı kamera hatası dolayısıyla başarısız:\n"
 
-#: ../src/Dialogs.vala:746
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d fotoğraf bozuk olduğundan içe aktarılamadı:\n"
 
-#: ../src/Dialogs.vala:749
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d video bozuk olduğundan içe aktarılamadı:\n"
 
-#: ../src/Dialogs.vala:752
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d fotoğraf/video bozuk olduğundan içe aktarılamadı:\n"
 
-#: ../src/Dialogs.vala:755
+#: 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"
@@ -1790,7 +3370,7 @@ msgstr[0] "%d dosya bozuk olduğundan içe aktarılamadı:\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:772
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1798,49 +3378,49 @@ msgstr[0] "%d desteklenmeyen fotoğraf atlandı:\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:787
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "%d resim olmayan dosya atlandı:\n"
 
-#: ../src/Dialogs.vala:798
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "%d fotoğraf kulanıcının iptali dolayısıyla atlandı:\n"
 
-#: ../src/Dialogs.vala:801
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "%d video kulanıcının iptali dolayısıyla atlandı:\n"
 
-#: ../src/Dialogs.vala:804
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "%d fotoğraf/video kulanıcının iptali dolayısıyla atlandı:\n"
 
-#: ../src/Dialogs.vala:807
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d dosya kulanıcının iptali dolayısıyla atlandı:\n"
 
-#: ../src/Dialogs.vala:821
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d fotoğraf başarıyla içe aktarıldı.\n"
 
-#: ../src/Dialogs.vala:824
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "%d video başarıyla içe aktarıldı.\n"
 
-#: ../src/Dialogs.vala:827
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1848,177 +3428,167 @@ msgstr[0] "%d fotoğraf/video başarıyla içe aktarıldı.\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:843
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Alınan resim ve videolar yok.\n"
 
-#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "İçe Aktarma Tamamlandı"
 
-#: ../src/Dialogs.vala:1155
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 
-#: ../src/Dialogs.vala:1158
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: ../src/Dialogs.vala:1162
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: ../src/Dialogs.vala:1165
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 gün"
 
-#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
+#: src/Dialogs.vala:1317 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Olayı Yeniden Adlandır"
 
-#: ../src/Dialogs.vala:1315
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Ad:"
 
 #. Dialog title
-#. Button label
-#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
+#: src/Dialogs.vala:1328
+msgctxt "Dialog Title"
 msgid "Edit Title"
-msgstr "Başlık Düzenle"
+msgstr "Başlığı Düzenle"
 
-#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Başlık:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
+#: src/Dialogs.vala:1345 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Olay Yorumunu Düzenle"
 
-#: ../src/Dialogs.vala:1344
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Fotoğraf/Video Yorumu Düzenle"
 
-#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Yorum:"
 
-#: ../src/Dialogs.vala:1361
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Dosyayı Sil ve _Çöpe Gönder"
 
-#: ../src/Dialogs.vala:1365
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Kitaplıktan Kaldır"
 
-#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
-msgid "_Keep"
-msgstr "_Koru"
-
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Harici Düzenlemeye Dönsün mü?"
 
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Harici Düzenlemelere Dönsün mü?"
 
-#: ../src/Dialogs.vala:1410
+#: src/Dialogs.vala:1412
 #, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
-"Bu işlem %d harici dosyaya yapılan tüm değişiklikleri yok edecek.  Devam "
+"Bu işlem %d harici dosyaya yapılan tüm değişiklikleri yok edecek. Devam "
 "edilsin mi?"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Harici Düzenlemeye D_ön"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Harici Düzenlemelere D_ön"
 
-#: ../src/Dialogs.vala:1435
+#: 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] "Bu işlem kütüphaneden %d fotoğrafı kaldıracak.  Devam edilsin mi? "
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
+msgstr[0] "Bu işlem kitaplıktan %d fotoğrafı kaldıracak. Devam edilsin mi? "
 
-#: ../src/Dialogs.vala:1442 ../src/Resources.vala:178
+#: src/Dialogs.vala:1444 src/Resources.vala:174
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
-msgstr "Kütüphaneden Fotoğraf Kaldır"
+msgstr "Kitaplıktan Fotoğrafı Kaldır"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
-msgstr "Kütüphaneden Fotoğraflar Kaldır"
+msgstr "Kitaplıktan Fotoğrafları Kaldır"
 
-#: ../src/Dialogs.vala:1536
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1688
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "ÖÖ"
 
-#: ../src/Dialogs.vala:1689
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "ÖS"
 
-#: ../src/Dialogs.vala:1690
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 Saat"
 
-#: ../src/Dialogs.vala:1705
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Aynı değerde olan fotoğrafları/videoları değiştir"
 
-#: ../src/Dialogs.vala:1710
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Tüm fotoğrafları/videoları bu zamana _ayarla"
 
-#: ../src/Dialogs.vala:1717
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "_Özgün fotoğraf dosyasını değiştir"
+msgid_plural "_Modify original photo files"
+msgstr[0] "Özgün fotoğraf dosyasını _değiştir"
 
-#: ../src/Dialogs.vala:1717
-msgid "_Modify original photo files"
-msgstr "_Özgün fotoğraf dosyalarını değiştir"
-
-#: ../src/Dialogs.vala:1720
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "_Özgün dosyayı değiştir"
-
-#: ../src/Dialogs.vala:1720
-msgid "_Modify original files"
-msgstr "_Özgün dosyaları değiştir"
+msgid_plural "_Modify original files"
+msgstr[0] "Özgün dosyayı _değiştir"
 
-#: ../src/Dialogs.vala:1806
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Özgün:"
 
-#: ../src/Dialogs.vala:1807
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1808
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1897
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2027,7 +3597,7 @@ msgstr ""
 "Çekim tarihi ileri ötelenecek\n"
 "%d %s, %d %s, %d %s, and %d %s."
 
-#: ../src/Dialogs.vala:1898
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2036,27 +3606,27 @@ msgstr ""
 "Çekim tarihi ötelenecek\n"
 "%d %s, %d %s, %d %s, and %d %s."
 
-#: ../src/Dialogs.vala:1900
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "gün"
 
-#: ../src/Dialogs.vala:1901
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
 
-#: ../src/Dialogs.vala:1902
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakika"
 
-#: ../src/Dialogs.vala:1903
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "saniye"
 
-#: ../src/Dialogs.vala:1947
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -2071,576 +3641,879 @@ msgstr[0] ""
 "\n"
 "Ve %d diğer(ler)i."
 
-#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Etiketler (virgülle ayrılmış):"
 
-#: ../src/Dialogs.vala:2076
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Hoşgeldiniz!"
 
-#: ../src/Dialogs.vala:2083
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
-msgstr "Shotwell'e Hoşgeldiniz!"
+msgstr "Shotwell’e Hoş Geldiniz!"
 
-#: ../src/Dialogs.vala:2087
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Başlangıç olarak, fotoğraflarınızı şu yöntemlerden birini kullanarak içe "
 "aktarabilirsiniz:"
 
-#: ../src/Dialogs.vala:2106
+#: src/Dialogs.vala:2121
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Seç <span weight=\"bold\">Dosya %s Dizinden İçeri Aktar</span>"
 
-#: ../src/Dialogs.vala:2107
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Fotoğrafları sürükleyip Shotwell penceresine bırakın"
 
-#: ../src/Dialogs.vala:2108
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Bilgisayarınıza bir kamera bağlayın ve içe aktarın"
 
-#: ../src/Dialogs.vala:2118
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_%s klasörünüzden fotoğrafları içe aktarın"
 
-#: ../src/Dialogs.vala:2125
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr ""
 "Ayrıca fotoğrafları bu yollardan herhangi biriyle içe aktarabilirsiniz:"
 
-#: ../src/Dialogs.vala:2135
-msgid "_Don't show this message again"
-msgstr "_Bu iletiyi tekrar gösterme"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
+msgstr "Bu iletiyi yeniden göster_me"
 
-#: ../src/Dialogs.vala:2170
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
-msgstr "%s kütüphanenizden fotoğraflar içe aktarın"
+msgstr "%s kitaplığınızdan fotoğrafları içe aktarın"
 
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(Yardım)"
 
-#: ../src/Dialogs.vala:2324
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Yıl%sAy%sGün"
 
-#: ../src/Dialogs.vala:2326
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Yıl%sAy"
 
-#: ../src/Dialogs.vala:2328
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Yıl%sAy-Gün"
 
-#: ../src/Dialogs.vala:2330
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Yıl-Ay-Gün"
 
-#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Özel"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2568
+#: src/Dialogs.vala:2627
 msgid "Invalid pattern"
 msgstr "Geçersiz şablon"
 
 #. 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:2670
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
-"Shotwell fotoğrafları kütüphane klasörünün içine kopyalayabilir ya da "
+"Shotwell fotoğrafları kitaplık klasörünün içine kopyalayabilir ya da "
 "kopyalama olmadan içe aktarabilir."
 
-#: ../src/Dialogs.vala:2675
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "Fotoğrafları K_opyala"
 
-#: ../src/Dialogs.vala:2676
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "_Yerin içine aktar"
 
-#: ../src/Dialogs.vala:2677
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Kitaplığa Aktar"
 
-#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Kitaplıktan Kaldır"
 
-#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
-msgstr "Kütüphaneden Fotoğraf Kaldırılıyor"
+msgstr "Kitaplıktan Fotoğraf Kaldırılıyor"
 
-#: ../src/Dialogs.vala:2688
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
-msgstr "Kütüphaneden Fotoğraflar Kaldırılıyor"
+msgstr "Kitaplıktan Fotoğraflar Kaldırılıyor"
 
-#: ../src/Dialogs.vala:2702
+#: src/Dialogs.vala:2763
 #, c-format
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Bu işlem %d fotoğrafı/videoyu Shotwell kütüphanenizden kaldıracak.  Ayrıca "
+"Bu işlem %d fotoğrafı/videoyu Shotwell kitaplığınızdan kaldıracak. Ayrıca "
 "dosyaları masaüstünüzdeki çöp kutusuna taşımak ister misiniz?\n"
 "\n"
 "Bu eylem geri alınamaz."
 
-#: ../src/Dialogs.vala:2706
+#: src/Dialogs.vala:2767
 #, c-format
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Bu işlem %d videoyu Shotwell kütüphanenizden kaldıracak.  Ayrıca dosyaları "
+"Bu işlem %d videoyu Shotwell kitaplığınızdan kaldıracak. Ayrıca dosyaları "
 "masaüstünüzdeki çöp kutusuna taşımak ister misiniz?\n"
 "\n"
 "Bu eylem geri alınamaz."
 
-#: ../src/Dialogs.vala:2710
+#: src/Dialogs.vala:2771
 #, c-format
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
-"Bu işlem %d fotoğrafı Shotwell kütüphanenizden kaldıracak.  Ayrıca dosyaları "
+"Bu işlem %d fotoğrafı Shotwell kitaplığınızdan kaldıracak. Ayrıca dosyaları "
 "masaüstünüzdeki çöp kutusuna taşımak ister misiniz?\n"
 "\n"
 "Bu eylem geri alınamaz."
 
-#: ../src/Dialogs.vala:2742
+#: src/Dialogs.vala:2803
 #, c-format
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] ""
-"%d fotoğraf/video masaüstünüzdeki çöp kutusuna taşınamıyor.  Bu dosyalar "
+"%d fotoğraf/video masaüstünüzdeki çöp kutusuna taşınamıyor. Bu dosyalar "
 "silinsin mi?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2759
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "%d fotoğraf/video silinemiyor."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Genişlik"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Yükseklik"
 
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "%s bulunamadı."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s bir dosya değil."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s şu dosya biçimini desteklemiyor:\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr "%s fotoğrafı açılamıyor. Üzgünüm."
+
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Kaydet"
+
+#: src/direct/DirectPhotoPage.vala:316
+msgid "_Save a Copy"
+msgstr "Bir Kopya _Kaydet"
+
+#: src/direct/DirectPhotoPage.vala:319
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "%s dosyasındaki değişiklikler kaybedilsin mi?"
+
+#: src/direct/DirectPhotoPage.vala:320
+msgid "Close _without Saving"
+msgstr "_Kaydetmeden Kapat"
+
+#: src/direct/DirectPhotoPage.vala:353
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "%s dosyasına kaydedilirken hata: %s"
+
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
+msgid "Save As"
+msgstr "Farklı Kaydet"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "İzlenemiyor %s: Bir dizin değil (%s)"
 
+#: src/editing_tools/EditingTools.vala:644
+msgid "Return to current photo dimensions"
+msgstr "Geçerli fotoğraf boyutlarına dön"
+
+#: src/editing_tools/EditingTools.vala:647
+msgid "Set the crop for this photo"
+msgstr "Bu fotoğraf için kırpmayı ayarla"
+
+#: src/editing_tools/EditingTools.vala:659
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr "Kırpma dikdörtgenini yatay ve düşey eksenler etrafında döndür"
+
+#: src/editing_tools/EditingTools.vala:732
+msgid "Unconstrained"
+msgstr "Sınırlandırılmamış"
+
+#: src/editing_tools/EditingTools.vala:733
+msgid "Square"
+msgstr "Kare"
+
+#: src/editing_tools/EditingTools.vala:734
+msgid "Screen"
+msgstr "Ekran"
+
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:737
+msgid "SD Video (4 ∶ 3)"
+msgstr "SD Video (4 : 3)"
+
+#: src/editing_tools/EditingTools.vala:738
+msgid "HD Video (16 ∶ 9)"
+msgstr "HD Video (16 : 9)"
+
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
+msgid "Wallet (2 × 3 in.)"
+msgstr "Cüzdan (2 × 3 inç)"
+
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
+msgid "Notecard (3 × 5 in.)"
+msgstr "Not kartı (3 × 5 inç)"
+
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
+msgid "4 × 6 in."
+msgstr "4 × 6 inç"
+
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
+msgid "5 × 7 in."
+msgstr "5 × 7 inç"
+
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
+msgid "8 × 10 in."
+msgstr "8 × 10 inç"
+
+#: src/editing_tools/EditingTools.vala:745
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Mektup (8.5 × 11 inç)"
+
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
+msgid "11 × 14 in."
+msgstr "11 × 14 inç"
+
+#: src/editing_tools/EditingTools.vala:747
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Tabloid (11 × 17 inç)"
+
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
+msgid "16 × 20 in."
+msgstr "16 × 20 inç"
+
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Metrik Cüzdan (9 × 13 cm)"
+
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
+msgid "Postcard (10 × 15 cm)"
+msgstr "Kartpostal (10 × 15 cm)"
+
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
+
+#: src/editing_tools/EditingTools.vala:754
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
+
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:758
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
+
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
+msgid "Size:"
+msgstr "Boyut:"
+
+#: src/editing_tools/EditingTools.vala:1873
+msgid "Close the red-eye tool"
+msgstr "Kırmızı-göz aracını kapat"
+
+#: src/editing_tools/EditingTools.vala:1876
+msgid "Remove any red-eye effects in the selected region"
+msgstr "Seçili bölgedeki kırmızı-göz etkilerini kaldır"
+
+#: src/editing_tools/EditingTools.vala:2216
+#: src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Sıfırla"
+
+#. fit both on the top line, emit and move on
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
+msgid "Exposure:"
+msgstr "Pozlandırma:"
+
+#: src/editing_tools/EditingTools.vala:2239
+msgid "Contrast:"
+msgstr "Karşıtlık:"
+
+#: src/editing_tools/EditingTools.vala:2248
+msgid "Saturation:"
+msgstr "Renk doygunluğu:"
+
+#: src/editing_tools/EditingTools.vala:2257
+msgid "Tint:"
+msgstr "Renk tonu:"
+
+#: src/editing_tools/EditingTools.vala:2267
+msgid "Temperature:"
+msgstr "Sıcaklık:"
+
+#: src/editing_tools/EditingTools.vala:2276
+msgid "Shadows:"
+msgstr "Gölgeler:"
+
+#: src/editing_tools/EditingTools.vala:2285
+msgid "Highlights:"
+msgstr "Vurgulamalar:"
+
+#: src/editing_tools/EditingTools.vala:2341
+msgid "Reset Colors"
+msgstr "Renkleri Sıfırla"
+
+#: src/editing_tools/EditingTools.vala:2341
+msgid "Reset all color adjustments to original"
+msgstr "Tüm renk ayarlamalarını özgün haline getir"
+
+#: src/editing_tools/EditingTools.vala:2700
+msgid "Temperature"
+msgstr "Sıcaklık"
+
+#: src/editing_tools/EditingTools.vala:2712
+msgid "Tint"
+msgstr "Renk tonu"
+
+#: src/editing_tools/EditingTools.vala:2724
+msgid "Contrast"
+msgstr "Karşıtlık"
+
+#: src/editing_tools/EditingTools.vala:2738
+msgid "Saturation"
+msgstr "Renk doygunluğu"
+
+#: src/editing_tools/EditingTools.vala:2751
+msgid "Exposure"
+msgstr "Pozlandırma"
+
+#: src/editing_tools/EditingTools.vala:2764
+msgid "Shadows"
+msgstr "Gölgeler"
+
+#: src/editing_tools/EditingTools.vala:2777
+msgid "Highlights"
+msgstr "Vurgulamalar"
+
+#: src/editing_tools/EditingTools.vala:2787
+msgid "Contrast Expansion"
+msgstr "Karşıtlık Genişlemesi"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Açı:"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
+#: ui/direct.ui:144 ui/photo.ui:233
+msgid "_Straighten"
+msgstr "_Düzleştir"
+
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Olaylar"
+
+#: src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d Photoğraf/Video"
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d videolar"
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d Fotoğraf"
+
+#: src/events/EventPage.vala:128
+msgid "No Event"
+msgstr "Olay yok"
+
+#: src/events/EventsDirectoryPage.vala:149
+msgid "No events"
+msgstr "Olaylar yok"
+
+#: src/events/EventsDirectoryPage.vala:153
+msgid "No events found"
+msgstr "Hiçbir olay bulunamadı"
+
+#: src/events/EventsDirectoryPage.vala:226
+msgid "All Events"
+msgstr "Tüm Olaylar"
+
+#: src/events/EventsDirectoryPage.vala:240
+msgid "Undated"
+msgstr "Tarih Belirlenmemiş"
+
+#: src/events/EventsDirectoryPage.vala:241
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:242
+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 "Olay %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "%s: %s için geçici bir dosya oluşturulamıyor"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Dışa Aktarılıyor"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "%s dosyası zaten mevcut.  Yer değiştirilsin mi?"
+msgid "File %s already exists. Replace?"
+msgstr "%s dosyası zaten var. Yer değiştirilsin mi?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "_Atla"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "_Tümünü Değiştir"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Dışa Aktar"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/FoldersBranch.vala:144
+msgid "Folders"
+msgstr "Klasörler"
+
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Kitaplık"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1083
+msgid "Photos"
+msgstr "Fotoğraflar"
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
+msgid "Flagged"
+msgstr "İşaretli"
+
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing…"
+msgstr "İçe aktarılıyor…"
+
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "İçe aktarım için hazırlanıyor…"
+
+#: src/library/ImportQueuePage.vala:156
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "İzleme güncellemeleri işlenemedi: %s"
+msgid "Imported %s"
+msgstr "İçe Aktarıldı %s"
 
-#: ../src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Önizleme boyutunu ayarla"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Son İçe Aktarılanlar"
 
-#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
-#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "_Yakınlaştır"
+#: src/library/LibraryWindow.vala:508
+msgid "Import From Folder"
+msgstr "Dizinden İçe Aktar"
 
-#: ../src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Önizleme oranını artır"
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Alt Klasörler İçine Yinele"
 
-#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
-#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "_Uzaklaştır"
+#: src/library/LibraryWindow.vala:582 ui/trash.ui:288
+msgid "Empty Trash"
+msgstr "Çöp Kutusunu Boşalt"
 
-#: ../src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Önizleme oranını azalt"
+#: src/library/LibraryWindow.vala:582
+msgid "Emptying Trash…"
+msgstr "Çöp Kutusu boşaltılıyor…"
 
-#: ../src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "_Fotoğrafları Sırala"
+#: src/library/LibraryWindow.vala:778
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Shotwell fotoğrafları ev dizininize kopyalamak üzere yapılandırılmıştır.\n"
+"Bunu <span weight=\"bold\">%s Tercihlerini Düzenle</span> içinden "
+"değiştirmenizi tavsiye\n"
+"ederiz. Fotoğrafları içe aktarmaya devam etmek istiyor musunuz?"
 
-#: ../src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "Videoyu _Oynat"
+#: src/library/LibraryWindow.vala:781 ui/preferences_dialog.ui:142
+msgid "Library Location"
+msgstr "Kitaplık Konumu"
 
-#: ../src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Seçili videolrı varsayılan video oynatıcıda aç"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:794
+msgid "Photos cannot be imported from this directory."
+msgstr "Fotoğraflar, bu dizinden içe aktarılamadı."
 
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
-msgid "_Developer"
-msgstr "_Geliştirici"
+#: src/library/LibraryWindow.vala:1074
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Kamera"
+#: src/library/LibraryWindow.vala:1118 src/library/LibraryWindow.vala:1129
+msgid "Updating library…"
+msgstr "Kitaplık güncelleniyor…"
 
-#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
-msgid "_Titles"
-msgstr "_Başlıklar"
+#: src/library/LibraryWindow.vala:1135
+msgid "Preparing to auto-import photos…"
+msgstr "Fotoğraflar kendiliğinden içe aktarmaya hazırlanıyor…"
 
-#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
-msgid "Display the title of each photo"
-msgstr "Tüm fotoğrafların başlığını görüntüle"
+#: src/library/LibraryWindow.vala:1140
+msgid "Auto-importing photos…"
+msgstr "Fotoğraflar kendiliğinden içe aktarılıyor…"
 
-#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Yorumlar"
+#: src/library/LibraryWindow.vala:1148
+msgid "Writing metadata to files…"
+msgstr "Dosyalara üstveri yazılıyor…"
 
-#: ../src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Her fotoğrafın yorumunu görüntüle"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Eksik Dosyalar"
 
-#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:359
-msgid "Ta_gs"
-msgstr "E_tiketler"
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Siliniyor…"
 
-#: ../src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Tüm fotoğrafların etiketlerini görüntüle "
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Çöp"
 
-#: ../src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "_Başlığa Göre"
+#: src/library/TrashPage.vala:106
+msgid "Trash is empty"
+msgstr "Çöp boş"
 
-#: ../src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Fotoğrafları başlıklarına göre sırala"
+#: src/library/TrashPage.vala:110
+msgid "Delete"
+msgstr "Sil"
 
-#: ../src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Çekim _Tarihine Göre"
+#: src/library/TrashPage.vala:111
+msgid "Deleting Photos"
+msgstr "Fotoğraflar Siliniyor"
 
-#: ../src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Fotoğrafları çekim tarihine göre sırala"
+#: src/main.vala:54
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
+msgstr ""
+"Fotoğraf kitaplığınız Shotwell’in bu sürümüyle uyumlu değil. Shotwell %s (%d "
+"şeması) ile oluşturulduğu görünüyor. Bu sürüm ise %s (%d şeması). Lütfen "
+"Shotwell’in son sürümünü kullanın."
 
-#: ../src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Puanlamaya Gö_re"
+#: src/main.vala:59
+#, c-format
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
+"at %s"
+msgstr ""
+"Shotwell fotoğraf kitaplığınızı sürüm %s (%d şeması)’den %s (%d şeması)’e "
+"güncellemeyi başaramadı. Daha çok bilgi için lütfen Shotwelll Wiki’yi "
+"buradan %s gözden geçirin."
 
-#: ../src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Fotoğrafları puanlmaya göre sırala"
+#: src/main.vala:65
+#, c-format
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
+"photos."
+msgstr ""
+"Fotoğraf kitaplığınız Shotwell’in bu sürümüyle uyumlu değil. Shotwell %s (%d "
+"şeması) ile oluşturulduğu görünüyor. Bu sürüm ise %s (%d şeması). Lütfen "
+"kitaplığınızı %s’i silerek temizleyin ve resimlerini yeniden içe aktarın."
 
-#: ../src/MediaPage.vala:504
-#, fuzzy
-#| msgid "File name"
-msgid "By _Filename"
-msgstr "Dosya adı"
+#: src/main.vala:71
+#, c-format
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr "Shotwell veri tabanını doğrulama denenirken bilinmeyen hata: %s"
 
-#: ../src/MediaPage.vala:505
-#, fuzzy
-#| msgid "Sort photos by title"
-msgid "Sort photos by filename"
-msgstr "Fotoğrafları başlıklarına göre sırala"
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Shotwell Yükleniyor"
 
-#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:405
-msgid "_Ascending"
-msgstr "_Artan"
+#: src/main.vala:303
+msgid "Path to Shotwell’s private data"
+msgstr "Shotwell’in gizli veri yolu"
 
-#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:406
-msgid "Sort photos in an ascending order"
-msgstr "Fotoğrafları artan düzene göre sırala"
+#: src/main.vala:303
+msgid "DIRECTORY"
+msgstr "DİZİN"
 
-#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:412
-msgid "D_escending"
-msgstr "A_zalan"
+#: src/main.vala:307
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Kitaplık dizinini çalışırken değişiklikler için izleme"
 
-#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:413
-msgid "Sort photos in a descending order"
-msgstr "Fotoğrafarı azalan düzene göre sırala"
+#: src/main.vala:311
+msgid "Don’t display startup progress meter"
+msgstr "Başlangıç ilerleme metresini gösterme"
 
-#: ../src/MediaPage.vala:723
+#: src/main.vala:315
+msgid "Show the application’s version"
+msgstr "Uygulama sürümünü göster"
+
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Uygulamayı tam ekran kipinde başlat"
+
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:356
+msgid "[FILE]"
+msgstr "[DOSYA]"
+
+#: src/main.vala:360
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+"Kullanılabilir komut satırı seçeneklerinin tam bir listesini görmek için “%s "
+"--help” komutunu çalıştır.\n"
+
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "İzleme güncellemeleri işlenemedi: %s"
+
+#: src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Önizleme boyutunu ayarla"
+
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
 msgstr "Shotwell seçili videoyu oynatamadı: %s"
 
-#: ../src/Page.vala:1263
+#: src/Page.vala:1306
 msgid "No photos/videos"
 msgstr "Resim/Video Yok"
 
-#: ../src/Page.vala:1267
-msgid "No photos/videos found"
-msgstr "Hiç Resim/Video bulunamadı"
+#: src/Page.vala:1310
+msgid "No photos/videos found which match the current filter"
+msgstr "Geçerli süzgeçle eşleşen video/fotoğraf yok"
 
-#: ../src/Page.vala:2565
+#: src/Page.vala:2623
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotoğraflar, bu dizinden dışa aktarılamadı."
 
-#: ../src/Photo.vala:3753
-msgid "modified"
-msgstr "değiştirilmiş"
-
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Önceki fotoğraf"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Sonraki fotoğraf"
 
-#: ../src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Fotoğraf kaynağı bulunamadı: %s"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:343
-msgid "_View"
-msgstr "_Görünüm"
-
-#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "A_raçlar"
-
-#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "_Önceki Fotoğraf"
-
-#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Önceki Fotoğraf"
-
-#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "_Sonraki Fotoğraf"
+#: src/PhotoPage.vala:3018
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Dışa aktarılamadı %s: %s"
 
-#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Sonraki Fotoğraf"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Fotoğrafı büyüt"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Fotoğrafı küçült"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Düşük (%d%%)"
 
-#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "_Sayfaya sığdır"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Orta (%d%%)"
 
-#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Fotoğrafı ekrana sığacak şekilde büyült"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Yüksek (%d%%)"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Yakınlaştır _100%"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "En Yüksek (%d%%)"
 
-#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Fotoğrafı 100% büyütmeye getir"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Yakınlaştır _200% "
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Fotoğrafı 200% büyütmeye getir"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3231
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Dışa aktarılamadı %s: %s"
+#: src/Photo.vala:3755
+msgid "modified"
+msgstr "değiştirilmiş"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Sayfanın tamamını doldur"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "Sayfa başına 2 resim"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "Sayfa başına 4 resim"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "Sayfa başına 6 resim"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "Sayfa başına 8 resim"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "Sayfa başına 16 resim"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "Sayfa başına 32 resim"
 
-#: ../src/Printing.vala:348
-msgid "in."
-msgstr "inç"
-
-#: ../src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
-msgid "Wallet (2 x 3 in.)"
-msgstr "Cüzdan (2 x 3 inç)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Not kartı (3 x 5 inç)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 inç"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 inç"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 inç"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 inç"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 inç"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metrik Cüzdan (9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Kartpostal (10 x 15 cm)"
-
-#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
-
-#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
-
-#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
-
-#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
-
-#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
-
-#: ../src/Printing.vala:875
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Görüntü Ayarları"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
-msgstr "Yazdırılıyor..."
+#: src/Printing.vala:864
+msgid "Printing…"
+msgstr "Yazdırılıyor…"
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2651,2335 +4524,2008 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Bugün"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Dün"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
-msgstr "Öğeler:"
+msgstr "Ögeler:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d Olaylar"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d Fotoğraf"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d videolar"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Tarih:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Zaman:"
 
 #. 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 "İlk Tarih"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Son Tarih:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1872
-msgid "Size:"
-msgstr "Boyut:"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Süre:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f saniye"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Geliştirici:"
 
-#. fit both on the top line, emit and move on
-#: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2240
-msgid "Exposure:"
-msgstr "Pozlandırma:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Konum:"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Dosya boyutu:"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Mevcut Geliştirme:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Özgün boyutlar:"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Kamera yapımı:"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Kamera modeli:"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Flaş:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Odak uzaklığı:"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Poz tarihi:"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Poz zamanı:"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Pozlandırma sapması:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS enlemi:"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS boylamı:"
 
-#: ../src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Sanatçı:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Telif hakkı:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Yazılım:"
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Ayrıntılı Bilgi"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Fotoğraf Yöneticisi"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Yükleme için hazırlanıyor"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Fotoğraf Görüntüleyici"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "%d in %d si yükleniyor"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "_Sağa Çevir"
+#: src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr "%s’e yayımlamaya devam edilemiyor çünkü bir hata oluştu:"
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"Başka bir serviste yayımlamayı denemek için yukarıdaki menüden bir tane "
+"seçin."
+
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104
+msgid "The selected video was successfully published."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Seçili video(lar) başarıyla yayımlandı."
+
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Seçili fotoğraf(lar) başarıyla yayımlandı."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Seçili fotoğraflar/videolar başarıyla yayımlandı."
+
+#: src/publishing/PublishingUI.vala:127
+msgid "Fetching account information…"
+msgstr "Hesap bilgisi alınıyor…"
+
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Oturum açılıyor…"
+
+#: src/publishing/PublishingUI.vala:195
+msgid "Publish Photos"
+msgstr "Fotoğrafları Yayımla"
+
+#: src/publishing/PublishingUI.vala:196
+msgid "Publish photos _to:"
+msgstr "Fotoğrafları ş_urada yayımla:"
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#: src/publishing/PublishingUI.vala:198
+msgid "Publish Videos"
+msgstr "Videoları Yayımla"
+
+#: src/publishing/PublishingUI.vala:199
+msgid "Publish videos _to"
+msgstr "Videoları _şuraya yayımla"
+
+#: src/publishing/PublishingUI.vala:201
+msgid "Publish Photos and Videos"
+msgstr "Resimler ve Videoları Yayımla"
+
+#: src/publishing/PublishingUI.vala:202
+msgid "Publish photos and videos _to"
+msgstr "Resimleri ve videoları _şuraya yayımla"
+
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: src/publishing/PublishingUI.vala:412
+msgid "Unable to publish"
+msgstr "Yayımlanamıyor"
+
+#: src/publishing/PublishingUI.vala:413
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
+msgstr ""
+"Shotwell seçili ögeleri yayımlayamaz çünkü uyumlu bir yayımlama eklentiniz "
+"etkinleştirilmemiş. Bunu düzeltmek için, <b> Düzenle %s Tercihler</b>’i "
+"seçin ve <b>Eklentiler</b> sekmesinden bir veya daha çok yayımlama "
+"eklentisini etkinleştirin."
+
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Yayımlanıyor"
+
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
-msgstr "Çevir"
+msgstr "Döndür"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:142
 msgid "Rotate Right"
-msgstr "Sağa Çevir"
+msgstr "Sağa Döndür"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr "Fotoğrafları sağa döndür (Sola döndürmek için Ctrl'ye basın)"
-
-#: ../src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "S_ola Çevir"
+msgstr "Fotoğrafları sağa döndür (Sola döndürmek için Ctrl’ye bas)"
 
-#: ../src/Resources.vala:151
+#: src/Resources.vala:147
 msgid "Rotate Left"
-msgstr "Sola Çevir"
+msgstr "Sola Döndür"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
-msgstr "Fotoğrafları sola çevir"
+msgstr "Fotoğrafları sola döndür"
 
-#: ../src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "Ya_tay Çevir"
-
-#: ../src/Resources.vala:155
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
-msgstr "Yatay Çevir"
+msgstr "Yatay Döndür"
 
-#: ../src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "Di_key Çevir"
-
-#: ../src/Resources.vala:158
+#: src/Resources.vala:154
 msgid "Flip Vertically"
-msgstr "Dikey Çevir"
+msgstr "Dikey Döndür"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
+#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:157
 msgid "_Apply"
-msgstr ""
+msgstr "_Uygula"
 
-#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
-#: ../src/library/LibraryWindow.vala:339
+#: src/Resources.vala:160 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/trash.ui:37
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: ../src/Resources.vala:165
-#, fuzzy
-#| msgid "_Format:"
+#: src/Resources.vala:161
 msgid "_Forward"
-msgstr "_Biçim:"
+msgstr "_İleri"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "Tam e_kran"
 
-#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:363
+#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/Resources.vala:168
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "_Tam Ekrandan Çık"
 
-#: ../src/Resources.vala:169 ../src/Resources.vala:371
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "_Yeni"
 
-#: ../src/Resources.vala:170
-#, fuzzy
-#| msgid "Next"
+#: src/Resources.vala:166
 msgid "_Next"
-msgstr "Sonraki"
+msgstr "_Sonraki"
 
-#: ../src/Resources.vala:171
-#, fuzzy
-#| msgid "OK"
-msgid "_OK"
-msgstr "Tamam"
-
-#: ../src/Resources.vala:172
-#, fuzzy
-#| msgid "Play"
-msgid "_Play"
-msgstr "Oynat"
-
-#: ../src/Resources.vala:173 ../src/Resources.vala:325
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Tercihler"
 
-#: ../src/Resources.vala:174
-#, fuzzy
-#| msgid "_Previous Photo"
+#: src/Resources.vala:170
 msgid "_Previous"
-msgstr "_Önceki Fotoğraf"
-
-#: ../src/Resources.vala:175
-#, fuzzy
-#| msgid "_Print..."
-msgid "_Print"
-msgstr "_Baskı..."
+msgstr "_Önceki"
 
-#: ../src/Resources.vala:176
+#: src/Resources.vala:172 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 "_Çık"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:173
 msgid "_Refresh"
-msgstr ""
+msgstr "_Yenile"
 
-#: ../src/Resources.vala:179
-#, fuzzy
-#| msgid "Reverting"
+#: src/Resources.vala:175
 msgid "_Revert"
-msgstr "Ters Çevriliyor"
+msgstr "_Ters Döndür"
 
-#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save"
-msgstr "_Kaydet"
-
-#: ../src/Resources.vala:181
-#, fuzzy
-#| msgid "Save As"
+#: src/Resources.vala:177
 msgid "Save _As"
-msgstr "Farklı Kaydet"
+msgstr "_Farklı Kaydet"
 
-#: ../src/Resources.vala:182
-#, fuzzy
-#| msgid "_Ascending"
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
-msgstr "_Artan"
+msgstr "_Artan Şekilde Sırala"
 
-#: ../src/Resources.vala:183
-#, fuzzy
-#| msgid "D_escending"
+#: src/Resources.vala:179
 msgid "Sort _Descending"
-msgstr "A_zalan"
+msgstr "A_zalan Şekilde Sırala"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:180
 msgid "_Stop"
-msgstr ""
+msgstr "_Durdur"
 
-#: ../src/Resources.vala:185
-#, fuzzy
-#| msgid "_Delete"
+#: src/Resources.vala:181
 msgid "_Undelete"
-msgstr "_Sil"
+msgstr "_Silmeyi Geri Al"
 
-#: ../src/Resources.vala:186
-#, fuzzy
-#| msgid "Original Size"
+#: src/Resources.vala:182
 msgid "_Normal Size"
-msgstr "Özgün Boyut"
+msgstr "_Özgün Boyut"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:183
 msgid "Best _Fit"
-msgstr ""
+msgstr "En _Uygun"
 
-#: ../src/Resources.vala:191
-msgid "_Enhance"
-msgstr "_İyileştir"
+#: src/Resources.vala:184 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "_Yakınlaştır"
+
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "_Uzaklaştır"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "İyileştir"
 
-#: ../src/Resources.vala:193
-msgid "Automatically improve the photo's appearance"
-msgstr "Fotoğraf görünüşünü otomatik olarak iyileştir"
-
-#: ../src/Resources.vala:195
-msgid "_Copy Color Adjustments"
-msgstr "Renk Düzenlemelerini _Kopyala"
+#: src/Resources.vala:189 ui/collection.ui:164
+msgid "Automatically improve the photo’s appearance"
+msgstr "Fotoğraf görünüşünü kendiliğinden iyileştir"
 
-#: ../src/Resources.vala:196
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Renk Düzenlemelerini Kopyala"
 
-#: ../src/Resources.vala:197
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Fotoğrafa uygulanan renk düzenlemelerini kopyala"
 
-#: ../src/Resources.vala:199
-msgid "_Paste Color Adjustments"
-msgstr "Renk Düzenlemelerini _Yapıştır"
-
-#: ../src/Resources.vala:200
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Renk Düzenlemelerini Yapıştır"
 
-#: ../src/Resources.vala:201
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Kopyalanan renk ayarlamalarını seçili fotoğraflara uygula"
 
-#: ../src/Resources.vala:203
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Kırp"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Kırp"
 
-#: ../src/Resources.vala:205
-msgid "Crop the photo's size"
+#: src/Resources.vala:201
+msgid "Crop the photo’s size"
 msgstr "Fotoğrafın boyutunu kırp"
 
-#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "_Düzleştir"
-
-#: ../src/Resources.vala:208
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Düzleştir"
 
-#: ../src/Resources.vala:209
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Fotoğrafı düzleştir"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Kırmızı-göz"
 
-#: ../src/Resources.vala:212
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Kırmızı-göz"
 
-#: ../src/Resources.vala:213
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Fotoğraftaki kırmızı-göz etkilerini azalt veya kaldır"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Ayarla"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Ayarla"
 
-#: ../src/Resources.vala:217
-msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
+msgid "Adjust the photo’s color and tone"
 msgstr "Fotoğrafın rengini ve tonunu ayarla"
 
-#: ../src/Resources.vala:219
-msgid "Re_vert to Original"
-msgstr "Özgün Haline Dö_ndür"
-
-#: ../src/Resources.vala:220
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Özgün Haline Döndür"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Harici Değ_işiklikleri Geri Al"
 
-#: ../src/Resources.vala:223
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Esas fotoğrafa döndür"
 
-#: ../src/Resources.vala:225
-msgid "Set as _Desktop Background"
-msgstr "_Masaüstü Arkapılan olarak ayarla"
-
-#: ../src/Resources.vala:226
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Seçili görüntüyü yeni masaüstü artalanı olarak ayarla"
 
-#: ../src/Resources.vala:227
-msgid "Set as _Desktop Slideshow..."
-msgstr "_Masaüstü Slayt gösterisi olarak ayarla..."
+#: src/Resources.vala:223
+msgid "Set as _Desktop Slideshow…"
+msgstr "_Masaüstü Slayt Gösterisi Olarak Ayarla…"
 
-#: ../src/Resources.vala:229
+#: src/Resources.vala:225 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 "_Geri Al"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Geri Al"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:228 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 "_Yinele"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Yinele"
 
-#: ../src/Resources.vala:235
-msgid "Re_name Event..."
-msgstr "Olayı Yeniden _Adlandır..."
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
+msgid "Re_name Event…"
+msgstr "Olayı Ye_niden Adlandır…"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Olay İçin _Anahtar Fotoğraf Oluştur"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Olay İçin Anahtar Fotoğraf Oluştur"
 
-#: ../src/Resources.vala:241
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "_Yeni Olay"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Yeni Olay"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Fotoğrafları Taşı"
 
-#: ../src/Resources.vala:245
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Fotoğrafları bir olaya taşı"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "Olayları _Birleştir"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Birleştir"
 
-#: ../src/Resources.vala:249
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Olayları tek bir olay içinde birleştir"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Derecelendirmeyi Ayarla"
 
-#: ../src/Resources.vala:252
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Derecelendirmeyi Ayarla"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Fotoğrafınızın derecelendirmesini değiştirin"
 
-#: ../src/Resources.vala:255
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Derecelendirmeyi arttır"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Derecelendirmeyi Arttır"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Derecelendirmeyi Azalt"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Derecelendirmeyi Azalt"
 
-#: ../src/Resources.vala:261
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Derecesiz"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Değerlenmemiş"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Derecesiz Oran"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Derecelendirilmemiş olarak ayarla"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Derecelendirilmeyi kaldır"
 
-#: ../src/Resources.vala:267
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Reddedilmiş"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Reddedilmiş"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Reddedilmiş Oran"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Reddedilen olarak ayarla"
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Reddedilmiş derecelendirmeyi ayarla"
 
-#: ../src/Resources.vala:273
+#: src/Resources.vala:269 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 "_Sadece Reddedilmiş"
 
-#: ../src/Resources.vala:274
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Sadece Reddedilmiş"
 
-#: ../src/Resources.vala:275
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Sadece reddedilen fotoğraf"
 
-#: ../src/Resources.vala:277
+#: src/Resources.vala:273 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 "Tüm + _Reddedilen"
 
-#: ../src/Resources.vala:278 ../src/Resources.vala:279
+#: src/Resources.vala:274
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
-msgstr "Reddedilen dahil olmak üzere, tüm fotoğrafları göster"
+msgstr "Reddedilen dahil tüm fotoğrafları göster"
 
-#: ../src/Resources.vala:281
+#: src/Resources.vala:276 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 "_Tüm Fotoğraflar"
 
-#. Button label
 #. Button tooltip
-#: ../src/Resources.vala:283 ../src/Resources.vala:285
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Tüm fotoğrafları göster"
 
-#: ../src/Resources.vala:287
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Değerlemeler"
 
-#: ../src/Resources.vala:288
-msgid "Display each photo's rating"
-msgstr "Ekran ve fotoğrafı derecelendir"
+#: src/Resources.vala:281
+msgid "Display each photo’s rating"
+msgstr "Her fotoğrafın puanını göster"
 
-#: ../src/Resources.vala:290
+#: src/Resources.vala:283 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 "_Filtreli Fotoğraflar"
+msgstr "Fotoğrafları _Süz"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:284
 msgid "Filter Photos"
-msgstr "Filtreli Fotoğraflar"
+msgstr "Fotoğrafları Süz"
 
-#: ../src/Resources.vala:292
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
-msgstr "Fotoğrafları sınırlı sayıda filtreye dayalı görüntüle"
-
-#: ../src/Resources.vala:294
-msgid "_Duplicate"
-msgstr "_Kopya Oluştur"
+msgstr "Süzgece dayalı gösterilen fotoğrafların sayısını sınırla"
 
-#: ../src/Resources.vala:295
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Kopya Oluştur"
 
-#: ../src/Resources.vala:296
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Fotoğrafın bir kopyasını oluştur"
 
-#: ../src/Resources.vala:298
-msgid "_Export..."
-msgstr "_Dışa Aktar..."
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+msgid "_Export…"
+msgstr "_Dışa Aktar…"
 
-#: ../src/Resources.vala:300
-msgid "_Print..."
-msgstr "_Baskı..."
+#: src/Resources.vala:293
+msgid "_Print…"
+msgstr "_Baskı…"
 
-#: ../src/Resources.vala:302
-msgid "Pu_blish..."
-msgstr "Ya_yımla..."
+#: src/Resources.vala:295
+msgid "Pu_blish…"
+msgstr "Yayı_mla…"
 
-#: ../src/Resources.vala:304
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Çeşitli web sitelerinde yayımla"
 
-#: ../src/Resources.vala:306
-msgid "Edit _Title..."
-msgstr "Başlığı _Düzenle..."
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr "Başlığı _Düzenle…"
 
-#: ../src/Resources.vala:310
-msgid "Edit _Comment..."
-msgstr "_Yorumu Düzenle..."
+#. Button label
+#: src/Resources.vala:301
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "Başlığı Düzenle"
+
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
+msgid "Edit _Comment…"
+msgstr "_Yorumu Düzenle…"
 
 #. Button label
-#: ../src/Resources.vala:312
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Yorumu Düzenle"
 
-#: ../src/Resources.vala:314
-msgid "Edit Event _Comment..."
-msgstr "Olay _Yorumunu Düzenle..."
+#: src/Resources.vala:307 ui/event.ui:592
+msgid "Edit Event _Comment…"
+msgstr "Olay _Yorumunu Düzenle…"
 
-#: ../src/Resources.vala:317
-msgid "_Adjust Date and Time..."
-msgstr "_Tarih ve Zamanı Ayarla..."
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
+msgid "_Adjust Date and Time…"
+msgstr "Tarih ve Zamanı _Ayarla…"
 
-#: ../src/Resources.vala:318
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Tarih ve Zamanı Ayarla"
 
-#: ../src/Resources.vala:320
-msgid "Add _Tags..."
-msgstr "_Etiket Ekle..."
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+msgid "Add _Tags…"
+msgstr "E_tiket Ekle…"
 
-#: ../src/Resources.vala:321
-msgid "_Add Tags..."
-msgstr "_Etiketler Ekle..."
+#: src/Resources.vala:314 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr "Etiket _Ekle…"
 
 #. Dialog title
-#. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:323 ../src/Resources.vala:356
+#: src/Resources.vala:316
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Etiket Ekle"
 
-#: ../src/Resources.vala:327
-msgid "Open With E_xternal Editor"
-msgstr "_Harici Düzenleyici ile Aç"
-
-#: ../src/Resources.vala:329
-msgid "Open With RA_W Editor"
-msgstr "RA_W Düzenleyicisi İle Aç"
-
-#: ../src/Resources.vala:331
-msgid "Send _To..."
-msgstr "Gön _der..."
-
-#: ../src/Resources.vala:332
-msgid "Send T_o..."
-msgstr "e_ Gönder..."
+#: src/Resources.vala:325 ui/photo_context.ui:135
+msgid "Send T_o…"
+msgstr "G_önder…"
 
-#: ../src/Resources.vala:334
-msgid "_Find..."
-msgstr "_Bul..."
+#: src/Resources.vala:327
+msgid "_Find…"
+msgstr "_Bul…"
 
-#: ../src/Resources.vala:335
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Bul"
 
-#: ../src/Resources.vala:336
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Metin yazarak adında veya etiketlerinde görünen bi resmi bul"
 
-#: ../src/Resources.vala:338
+#: src/Resources.vala:331
 msgid "_Flag"
-msgstr "_Bayrak"
+msgstr "_İşaretle"
 
-#: ../src/Resources.vala:340
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "İşareti _Kaldır"
 
-#: ../src/Resources.vala:343
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Düzenleyici çalıştırılamadı: %s"
 
-#: ../src/Resources.vala:348
+#: src/Resources.vala:341
 #, c-format
-msgid "Add Tag \"%s\""
-msgstr "Etiket Ekle \"%s\""
+msgid "Add Tag “%s”"
+msgstr "“%s” Etiketini Ekle"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:351
+#: src/Resources.vala:344
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Etiketler Ekle \"%s\" ve \"%s\""
+msgid "Add Tags “%s” and “%s”"
+msgstr "“%s” ve “%s” Etiketini Ekle"
 
-#: ../src/Resources.vala:361
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:349
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Etiket Ekle"
+
+#: src/Resources.vala:354
 #, c-format
-msgid "_Delete Tag \"%s\""
-msgstr "Etiketi _Sil \"%s\""
+msgid "_Delete Tag “%s”"
+msgstr "“%s” Etiketini _Sil"
 
-#: ../src/Resources.vala:365
+#: src/Resources.vala:358
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Etiketi Sil \"%s\""
+msgid "Delete Tag “%s”"
+msgstr "“%s” Etiketini Sil"
 
-#: ../src/Resources.vala:368
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Etiketi Sil"
 
-#: ../src/Resources.vala:374
+#: src/Resources.vala:367
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "\"%s\" Etiketini Yeniden _Adlandır..."
+msgid "Re_name Tag “%s”…"
+msgstr "“%s” Etiketini Yeniden _Adlandır…"
 
-#: ../src/Resources.vala:378
+#: src/Resources.vala:371
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "\"%s\" Etiketini \"%s\" Olarak Yeniden Adlandır"
+msgid "Rename Tag “%s” to “%s”"
+msgstr "“%s” Etiketini “%s” Olarak Yeniden Adlandır"
 
-#: ../src/Resources.vala:381
-msgid "_Rename..."
-msgstr "_Yeniden Adlandır..."
+#: src/Resources.vala:374 ui/tags.ui:456
+msgid "_Rename…"
+msgstr "_Yeniden Adlandır…"
 
-#: ../src/Resources.vala:383
-msgid "Modif_y Tags..."
-msgstr "Etiketleri Düzenl_e..."
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+msgid "Modif_y Tags…"
+msgstr "Etiketleri Düzenl_e…"
 
-#: ../src/Resources.vala:384
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Etiketleri Düzenle"
 
-#: ../src/Resources.vala:387
+#: src/Resources.vala:380
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Fotoğrafı \"%s\" olarak etiketle"
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Fotoğrafı “%s” olarak etiketle"
 
-#: ../src/Resources.vala:387
+#: src/Resources.vala:386
 #, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Fotoğrafları \"%s\" olarak etiketle"
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Seçili fotoğrafı “%s” olarak etiketle"
 
-#: ../src/Resources.vala:391
+#: src/Resources.vala:392
 #, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Seçili fotoğrafı \"%s\" olarak etiketle"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "“%s” Etiketini _Fotoğraftan Kaldır"
 
-#: ../src/Resources.vala:392
+#: src/Resources.vala:398
 #, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Seçili fotoğrafları \"%s\" olarak etiketle"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "“%s” Etiketini Fotoğraftan Kaldır"
 
-#: ../src/Resources.vala:396
+#: src/Resources.vala:404
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "\"%s\" Etiketini _Fotoğraftan Kaldır"
+msgid "Unable to rename tag to “%s” because the tag already exists."
+msgstr "Etiket “%s” olarak adlandırılamadı çünkü etiket zaten var."
 
-#: ../src/Resources.vala:397
+#: src/Resources.vala:408
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "\"%s\" Etiketini _Fotoğraflardan Kaldır"
+msgid "Unable to rename search to “%s” because the search already exists."
+msgstr "Arama “%s” olarak yeniden adlandırılamıyor çünkü bu arama zaten var."
 
-#: ../src/Resources.vala:401
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "\"%s\" Etiketini Fotoğraftan Kaldır"
-
-#: ../src/Resources.vala:402
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "\"%s\" Etiketini Fotoğraflardan Kaldır"
-
-#: ../src/Resources.vala:406
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr "Etiket \"%s\" olarak adlandırılamadı, çünkü etiket zaten mevcut."
-
-#: ../src/Resources.vala:410
-#, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
-msgstr ""
-"Aramayı \"% s \" olarak yeniden adlandırma başarısız çünkü bu isimle bir "
-"arama zaten var, "
-
-#: ../src/Resources.vala:413
+#. Saved search button
+#: src/Resources.vala:411 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Kayıtlı Arama"
 
-#: ../src/Resources.vala:415
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Aramayı Sil"
 
-#: ../src/Resources.vala:418
-msgid "_Edit..."
-msgstr "_Düzenle..."
+#: src/Resources.vala:416 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr "_Düzenle…"
 
-#: ../src/Resources.vala:419
-msgid "Re_name..."
-msgstr "Ye_niden Adlandır..."
+#: src/Resources.vala:417 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr "Ye_niden Adlandır…"
 
-#: ../src/Resources.vala:422
+#: src/Resources.vala:420
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
-msgstr "\"%s\" i \"%s\" Olarak Yeniden Adlandır"
+msgid "Rename Search “%s” to “%s”"
+msgstr "“%s” Aramasını “%s” Olarak Yeniden Adlandır"
 
-#: ../src/Resources.vala:426
+#: src/Resources.vala:424
 #, c-format
-msgid "Delete Search \"%s\""
-msgstr "\"%s\" Aramasını Sil"
+msgid "Delete Search “%s”"
+msgstr "“%s” Aramasını Sil"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "%s i Değerle"
 
-#: ../src/Resources.vala:585
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Değerlemeyi %s e ayarla"
 
-#: ../src/Resources.vala:586
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Değerleme %s e ayarlanıyor"
 
-#: ../src/Resources.vala:588
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "%s i Göster"
 
-#: ../src/Resources.vala:589
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Değerlemesi yalnızca %s olan fotoğrafları göster"
 
-#: ../src/Resources.vala:590
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s veya Daha İyisi "
 
-#: ../src/Resources.vala:591
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s veya Daha İyisini Göster"
 
-#: ../src/Resources.vala:592
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Değerlemesi yalnızca %s veya daha iyisi olan fotoğrafları göster"
 
-#: ../src/Resources.vala:683
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Seçili fotoğrafları çöp kutusundan geri getir"
 
-#: ../src/Resources.vala:684
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Seçili fotoğrafları kitaplıktan çıkar"
 
-#: ../src/Resources.vala:686
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Geri Getir"
 
-#: ../src/Resources.vala:687
+#: src/Resources.vala:664 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Seçili fotoğrafları kitaplığa geri taşı"
 
-#: ../src/Resources.vala:689
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Dosya Yö_neticisinde Göster "
 
-#: ../src/Resources.vala:690
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:667
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Seçili fotoğrafın ait olduğu dizini dosya yöneticisinde aç"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Dosya yöneticisinde açılamıyor: %s"
 
-#: ../src/Resources.vala:696
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Kitaplıktan K_aldır"
 
-#: ../src/Resources.vala:698
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Çöpe Taşı"
 
-#: ../src/Resources.vala:700
+#: src/Resources.vala:677 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 "_Tümünü Seç"
 
-#: ../src/Resources.vala:701
+#: src/Resources.vala:678
 msgid "Select all items"
-msgstr "Tüm öğeleri seç"
+msgstr "Tüm ögeleri seç"
 
 #. ...precache the timestamp string...
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:780
-msgid "%-I:%M %p"
-msgstr "%-I:%M %p"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:785
-msgid "%-I:%M:%S %p"
-msgstr "%-I:%M:%S %p"
-
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:789
+#: src/Resources.vala:739
 msgid "%a %b %d, %Y"
-msgstr "%a %d %b, %Y"
+msgstr "%d %b %Y %a"
 
 #. / 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:794 ../src/Resources.vala:804
+#: src/Resources.vala:744
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
-msgstr "%a %b %d"
+msgstr "%d %b %a"
 
 #. / 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:799
+#: src/Resources.vala:749
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Slayt gösterisi"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "İşaretli"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-#: ../src/library/Branch.vala:97
-msgid "Photos"
-msgstr "Fotoğraflar"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Videolar"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW Fotoğraflar"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Raw fotoğraflar"
-
-#: ../src/SearchFilter.vala:934
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Kullanıcı arayüz dosyası yükleme hatası %s: %s"
-
-#. Ticket #3260 - Add a 'close' context menu to
-#. the searchbar.
-#. Prepare the close menu for use, but don't
-#. display it yet; we'll connect it to secondary
-#. click later on.
-#: ../src/SearchFilter.vala:945
-#, fuzzy
-#| msgid "_Close"
-msgid "Close"
-msgstr "_Kapat"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:951
-msgid "Type"
-msgstr "Cins"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Değerleme"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Ayarlar"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Geri"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Önceki fotoğrafa git"
-
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Durdur"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Slayt gösterisini durdur"
-
-#: ../src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Sonraki"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Sonraki fotoğrafa git"
+#. / 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 "%d %b %a"
 
-#: ../src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Slayt gösterisi ayarlarını değiştir"
+#. / 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 "%d %b %Y %a"
 
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Fotoğraf kaynak dosyaları bulunamıyor."
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
+msgid "Slideshow"
+msgstr "Slayt gösterisi"
 
-#: ../src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Oynat"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Kaydedilmiş Aramalar"
 
-#: ../src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Slayt gösterisine devam et"
+#. Ordering must correspond with SearchConditionText.Context
+#: src/searches/SavedSearchDialog.vala:162
+msgid "contains"
+msgstr "içerir"
 
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "başlıksız"
+#. Ordering must correspond with Context
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
+msgid "is exactly"
+msgstr "tam olarak"
 
-#. multiple videos
-#: ../src/VideoSupport.vala:489
-msgid "Export Videos"
-msgstr "Videoları Dışa Aktar"
+#: src/searches/SavedSearchDialog.vala:164
+msgid "starts with"
+msgstr "ile başlar"
 
-#: ../src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Kameralar"
+#: src/searches/SavedSearchDialog.vala:165
+msgid "ends with"
+msgstr "ile biter"
 
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr "Kamera ayrılamadı. Kamerayı, dosya yöneticisinden ayırmayı deneyin."
+#: src/searches/SavedSearchDialog.vala:166
+msgid "does not contain"
+msgstr "içermez"
 
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "İçe aktarılmış fotoğrafları gizle"
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
+msgid "is not set"
+msgstr "ayarlı değil"
 
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Yalnızca içe aktarılmamış fotoğrafları görüntüle"
+#: src/searches/SavedSearchDialog.vala:168
+#, fuzzy
+#| msgid "is not set"
+msgid "is set"
+msgstr "ayarlı"
 
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:847
-msgid "Starting import, please wait..."
-msgstr "İçe aktarım başlıyor, lütfen bekleyin..."
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
+msgid "is"
+msgstr "dir"
 
-#: ../src/camera/ImportPage.vala:886
-msgid "Import _Selected"
-msgstr "_Seçili Öğeleri İçe Aktar"
+#: src/searches/SavedSearchDialog.vala:243
+msgid "is not"
+msgstr "değildir"
 
-#: ../src/camera/ImportPage.vala:887
-msgid "Import the selected photos into your library"
-msgstr "Şeçili fotoğrafları kütüphaneye aktar"
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: src/searches/SavedSearchDialog.vala:249
+msgid "any photo"
+msgstr "herhangi bir fotoğraf"
 
-#: ../src/camera/ImportPage.vala:892
-msgid "Import _All"
-msgstr "_Tümünü İçe Aktar"
+#: src/searches/SavedSearchDialog.vala:250
+msgid "a raw photo"
+msgstr "işenmemiş (raw) bir fotoğraf"
 
-#: ../src/camera/ImportPage.vala:893
-msgid "Import all the photos into your library"
-msgstr "Tüm fotoğrafları kütüphaneye aktar"
+#: src/searches/SavedSearchDialog.vala:251
+msgid "a video"
+msgstr "bir video"
 
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1014
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell, erişim sağlamak için kameranın dosya sisteminden ayrılmasına "
-"ihtiyaç duyuyor. Devam edilsin mi?"
+#: src/searches/SavedSearchDialog.vala:305
+msgid "has"
+msgstr "içerir"
 
-#: ../src/camera/ImportPage.vala:1020
-msgid "_Unmount"
-msgstr "_Ayır"
+#: src/searches/SavedSearchDialog.vala:306
+msgid "has no"
+msgstr "içermez"
 
-#: ../src/camera/ImportPage.vala:1025
-msgid "Please unmount the camera."
-msgstr "Lütfen kamerayı ayırın."
+#: src/searches/SavedSearchDialog.vala:311
+msgid "modifications"
+msgstr "değişiklikler"
 
-#: ../src/camera/ImportPage.vala:1030
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
-msgstr ""
-"Kamera, başka bir uygulama tarafından kullanılıyor. Shotwell, kameraya "
-"yalnızca boştayken erişebilir. Lütfen kamerayı kullanan diğer uygulamayı "
-"kapatın ve yeniden deneyin."
+#: src/searches/SavedSearchDialog.vala:312
+msgid "internal modifications"
+msgstr "dahili değişiklikler"
 
-#: ../src/camera/ImportPage.vala:1040
-msgid "Please close any other application using the camera."
-msgstr "Lütfen kamerayı kullanırken diğer programları kapatın."
+#: src/searches/SavedSearchDialog.vala:313
+msgid "external modifications"
+msgstr "harici düzenlemeler"
 
-#: ../src/camera/ImportPage.vala:1045
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Kameradan önizlemeler alınamadı:\n"
-"%s"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: src/searches/SavedSearchDialog.vala:367
+msgid "flagged"
+msgstr "işaretli"
 
-#: ../src/camera/ImportPage.vala:1062
-msgid "Unmounting..."
-msgstr "Ayrılıyor..."
+#: src/searches/SavedSearchDialog.vala:368
+msgid "not flagged"
+msgstr "işaretsiz"
 
-#: ../src/camera/ImportPage.vala:1168
-msgid "Fetching photo information"
-msgstr "Fotoğraf bilgisi alınıyor"
+#: src/searches/SavedSearchDialog.vala:431
+msgid "and higher"
+msgstr "ve daha yüksek"
 
-#: ../src/camera/ImportPage.vala:1523
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "%s için önizleme alınıyor"
+#: src/searches/SavedSearchDialog.vala:432
+msgid "only"
+msgstr "yalnızca"
 
-#: ../src/camera/ImportPage.vala:1639
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Kamera kilitlenemedi: %s"
+#: src/searches/SavedSearchDialog.vala:433
+msgid "and lower"
+msgstr "ve daha alçak"
 
-#: ../src/camera/ImportPage.vala:1724
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Bu %d fotoğraf kameradan silinsin mi?"
+#: src/searches/SavedSearchDialog.vala:495
+msgid "is after"
+msgstr "sonrakidir"
 
-#: ../src/camera/ImportPage.vala:1727
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Bu %d video kameradan silinsin mi?"
+#: src/searches/SavedSearchDialog.vala:496
+msgid "is before"
+msgstr "öncekidir"
 
-#: ../src/camera/ImportPage.vala:1730
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Bu %d fotoğraf/video kameradan silinsin mi?"
+#: src/searches/SavedSearchDialog.vala:497
+msgid "is between"
+msgstr "arasındadır"
 
-#: ../src/camera/ImportPage.vala:1733
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Bu %d dosya kameradan silinsin mi?"
+#: src/searches/SavedSearchDialog.vala:510
+msgid "and"
+msgstr "ve"
 
-#: ../src/camera/ImportPage.vala:1760
-msgid "Removing photos/videos from camera"
-msgstr "Fotoğraflar/Videolar kameradan kaldırılıyor"
+#: src/searches/SavedSearchDialog.vala:691
+msgid "Search"
+msgstr "Ara"
 
-#: ../src/camera/ImportPage.vala:1764
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "%d fotoğraf/video hatalar sebebiyle kameradan silinemiyor."
+#: src/searches/SavedSearchDialog.vala:696
+msgid "Cancel"
+msgstr "İptal"
 
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Veri İçe Aktarımları"
+#: src/searches/SavedSearchDialog.vala:697
+msgid "OK"
+msgstr "Tamam"
 
-#. Send an empty job to the queue to mark the end of the import
-#: ../src/data_imports/DataImportsPluginHost.vala:65
-#: ../src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "%s Veritabanı"
+#: src/searches/SavedSearchDialog.vala:716
+msgid "any"
+msgstr "herhangi"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:148
-#: ../src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-msgid "Importing from %s can't continue because an error occurred:"
-msgstr "%s den içe aktarım devam edemez çünkü bir hata oluştu:"
+#: src/searches/SavedSearchDialog.vala:717
+msgid "all"
+msgstr "tümü"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Başka bir hizmetten içe aktarmayı denemek için, yukarıdaki menüden birini "
-"seçin."
+#: src/searches/SavedSearchDialog.vala:718
+msgid "none"
+msgstr "hiçbiri"
 
-#: ../src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
-msgstr ""
-"Herhangi bir etkinleştirilmiş veri içe aktarma eklentiniz yok.\n"
-"\n"
-"Uygulamadan İçe Aktar işlevselliğini kullanmak için, en azından bir veri içe "
-"aktarma eklentiniz etkin olmalı. Eklentiler Tercihler bölümünden "
-"etkinleştirilebilinir."
+#: src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Herhangi bir metin"
 
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Veritabanı dosyası:"
+#: src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Başlık"
 
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:882
-msgid "_Import"
-msgstr "_İçe Aktar"
+#: src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Etiket"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import From Application"
-msgstr "Uygulamadan İçe Aktar"
+#: src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Yorum"
 
-#: ../src/data_imports/DataImportsUI.vala:369
-#: ../src/publishing/PublishingUI.vala:470
-msgid "_Close"
-msgstr "_Kapat"
+#: src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Etkinlik adı"
 
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Fotoğraf veri tabanı açılmadı/oluşturulamadı %s: hata kodu %d"
+#: src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Dosya adı"
 
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Fotoğraf veritabanı dosyasına yazılamıyor:\n"
-" %s"
+#: src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Ortam türü"
 
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Veritabanı dosyasına erişirken hata:\n"
-" %s\n"
-"\n"
-"Hata şuydu: \n"
-"%s"
+#: src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "İşaret durumu"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Dosya"
+#: src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Fotoğraf durumu"
 
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Fotoğrafı kaydet"
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+msgid "Rating"
+msgstr "Değerleme"
 
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Farklı _Kaydet..."
+#: src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Tarih"
 
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Fotoğrafı farklı bir adla kaydet"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "★+ Puan"
 
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Bigisayarınıza bağlı bir yazıcı ile fotoğrafı bastırın"
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "★★+ Puan"
 
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotoğraf"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ Puan"
 
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s bulunamadı."
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ Puan"
 
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s bir dosya değil."
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ Puan"
 
-#: ../src/direct/DirectPhotoPage.vala:231
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s şu dosya biçimini desteklemiyor:\n"
-"%s."
+msgid "Error loading search bar UI: %s"
+msgstr "Arama çubuğu kullanıcı arayüzü yüklenirken hata: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save a Copy"
-msgstr "Bir Kopya _Kaydet"
-
-#: ../src/direct/DirectPhotoPage.vala:425
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "%s dosyasındaki değişiklikler kaybedilsin mi?"
-
-#: ../src/direct/DirectPhotoPage.vala:426
-msgid "Close _without Saving"
-msgstr "_Kaydetmeden Kapat"
-
-#: ../src/direct/DirectPhotoPage.vala:459
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "%s dosyasına kaydedilirken hata: %s"
-
-#: ../src/direct/DirectPhotoPage.vala:487
-#: ../src/direct/DirectPhotoPage.vala:508
-msgid "Save As"
-msgstr "Farklı Kaydet"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Geçerli fotoğraf boyutlarına dön"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Bu fotoğraf için kırpmayı ayarla"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "Kırpma dikdörtgenini yatay ve düşey eksenler etrafında döndür"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Sınırlandırılmamış"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Kare"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Ekran"
-
-#: ../src/editing_tools/EditingTools.vala:757
-#: ../src/editing_tools/EditingTools.vala:760
-#: ../src/editing_tools/EditingTools.vala:770
-#: ../src/editing_tools/EditingTools.vala:780
-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)"
-
-#: ../src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Letter (8.5 x 11 in.)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloid (11 x 17 in.)"
-
-#: ../src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
-
-#: ../src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
-
-#: ../src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Kırmızı-göz aracını kapat"
-
-#: ../src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Seçili bölgedeki kırmızı-göz etkilerini kaldır"
-
-#: ../src/editing_tools/EditingTools.vala:2226
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Sıfırla"
-
-#: ../src/editing_tools/EditingTools.vala:2248
-msgid "Saturation:"
-msgstr "Renk doygunluğu:"
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: src/SearchFilter.vala:1073
+msgid "Close"
+msgstr "Kapat"
 
-#: ../src/editing_tools/EditingTools.vala:2256
-msgid "Tint:"
-msgstr "Renk tonu:"
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+msgid "Type"
+msgstr "Tür"
 
-#: ../src/editing_tools/EditingTools.vala:2265
-msgid "Temperature:"
-msgstr "Sıcaklık:"
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Videolar"
 
-#: ../src/editing_tools/EditingTools.vala:2273
-msgid "Shadows:"
-msgstr "Gölgeler:"
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW Fotoğraflar"
 
-#: ../src/editing_tools/EditingTools.vala:2281
-msgid "Highlights:"
-msgstr "Vurgulamalar:"
+#: src/SearchFilter.vala:1125
+msgid "Use a saved search to filter items in the current view"
+msgstr "Geçerli görünümde ögeleri süzmek için kayıtlı bir arama kullan"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset Colors"
-msgstr "Renkleri Sıfırla"
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:134
+msgid "Back"
+msgstr "Geri"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset all color adjustments to original"
-msgstr "Tüm renk ayarlamalarını özgün haline getir"
+#: src/SlideshowPage.vala:136
+msgid "Go to the previous photo"
+msgstr "Önceki fotoğrafa git"
 
-#: ../src/editing_tools/EditingTools.vala:2687
-msgid "Temperature"
-msgstr "Sıcaklık"
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
+msgid "Pause"
+msgstr "Durdur"
 
-#: ../src/editing_tools/EditingTools.vala:2700
-msgid "Tint"
-msgstr "Renk tonu"
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
+msgid "Pause the slideshow"
+msgstr "Slayt gösterisini durdur"
 
-#: ../src/editing_tools/EditingTools.vala:2713
-msgid "Saturation"
-msgstr "Renk doygunluğu"
+#: src/SlideshowPage.vala:148
+msgid "Next"
+msgstr "Sonraki"
 
-#: ../src/editing_tools/EditingTools.vala:2726
-msgid "Exposure"
-msgstr "Pozlandırma"
+#: src/SlideshowPage.vala:150
+msgid "Go to the next photo"
+msgstr "Sonraki fotoğrafa git"
 
-#: ../src/editing_tools/EditingTools.vala:2739
-msgid "Shadows"
-msgstr "Gölgeler"
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Ayarlar"
 
-#: ../src/editing_tools/EditingTools.vala:2752
-msgid "Highlights"
-msgstr "Vurgulamalar"
+#: src/SlideshowPage.vala:158
+msgid "Change slideshow settings"
+msgstr "Slayt gösterisi ayarlarını değiştir"
 
-#: ../src/editing_tools/EditingTools.vala:2762
-msgid "Contrast Expansion"
-msgstr "Karşıtlık Genişlemesi"
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:212
+msgid "All photo source files are missing."
+msgstr "Fotoğraf kaynak dosyaları bulunamıyor."
 
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Açı:"
+#: src/SlideshowPage.vala:244
+msgid "Play"
+msgstr "Oynat"
 
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Olaylar"
+#: src/SlideshowPage.vala:245
+msgid "Continue the slideshow"
+msgstr "Slayt gösterisine devam et"
 
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d Photoğraf/Video"
+#: src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Slayt Gösterisi Geçişleri"
 
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Olay yok"
+#: src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Hiçbiri)"
 
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Her olayın yorumunu göster"
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
+msgid "None"
+msgstr "Hiçbiri"
 
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Olaylar yok"
+#: src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Rastgele"
 
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Hiçbir olay bulunamadı"
+#: src/tags/TagsBranch.vala:131
+msgid "Tags"
+msgstr "Etiketler"
 
-#: ../src/events/EventsDirectoryPage.vala:230
-#, fuzzy
-#| msgid "Events"
-msgid "All Events"
-msgstr "Olaylar"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "başlıksız"
 
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Tarih Belirlenmemiş"
+#. multiple videos
+#: src/VideoSupport.vala:520
+msgid "Export Videos"
+msgstr "Videoları Dışa Aktar"
 
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "İşareti _Aç/Kapat"
 
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+msgid "_Developer"
+msgstr "_Geliştirici"
 
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Klasörler"
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
+msgid "View Eve_nt for Photo"
+msgstr "Resmin Etki_nliğine Bak"
 
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-#: ../ui/shotwell.glade.h:32
-msgid "Library"
-msgstr "Kütüphane"
+#: 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/trash.ui:5
+msgid "_File"
+msgstr "_Dosya"
 
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "İçe aktarılıyor..."
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "_Farklı Kaydet…"
 
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "İçe Aktarmayı _Durdur"
+#: 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/trash.ui:87
+msgid "_View"
+msgstr "_Görünüm"
 
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Fotoğrafları içe aktarmayı durdur"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "_Sayfaya sığdır"
 
-#: ../src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "İçe Aktarmaya Hazırlanıyor..."
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "%_100 Yakınlaştır"
 
-#: ../src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "İçe Aktarıldı %s"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "%_200 Yakınlaştır"
 
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Son İçe Aktarılanlar"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Fotoğraf"
 
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "Dizinden İçe _Aktar..."
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Önceki Fotoğraf"
 
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Fotoğrafları diskten kitaplığa aktar"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Sonraki Fotoğraf"
 
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "_Uygulamadan İçe Aktar"
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "A_raçlar"
 
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "_Olayları Sırala"
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Sıkça Sorulan Sorular"
 
-#: ../src/library/LibraryWindow.vala:307
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "Bir Sorun _Bildir…"
+
+#: 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 "Dizinden _İçe Aktar…"
+
+#: 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 "_Uygulamadan İçe Aktar…"
+
+#: 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 "Çö_p Kutusunu Boşalt"
 
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Çöp kutusundaki tüm fotoğrafları sil"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Resmin Etki_nliğine Bak"
-
-#: ../src/library/LibraryWindow.vala:317
+#: 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 "_Bul"
 
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Arama kriterlerine göre fotoğraf ve videoları bulun"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Ye_ni Kaydedilmiş Arama..."
-
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotoğraflar"
-
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Ola_ylar"
+#: 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 "Ye_ni Kaydedilmiş Arama…"
 
-#: ../src/library/LibraryWindow.vala:374
+#: 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 "_Temel Bilgiler"
 
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Seçili öğe için temel bilgileri görüntüle"
-
-#: ../src/library/LibraryWindow.vala:380
+#: 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 "A_yrıntılı Bilgiler"
 
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Seçili öğe için ayrıntılı bilgileri görüntüle"
-
-#: ../src/library/LibraryWindow.vala:386
+#: 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 "_Arama Çubuğu"
 
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Arama çubuğunu göster"
-
-#: ../src/library/LibraryWindow.vala:392
+#: 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 "Kenarçubuğ_u"
-
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Kenar çubuğunu göster"
+msgstr "Kenar Çubuğ_u"
 
-#: ../src/library/LibraryWindow.vala:651
-msgid "Import From Folder"
-msgstr "Dizinden İçe Aktar"
+#: 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 "Araç Ç_ubuğunu"
 
-#: ../src/library/LibraryWindow.vala:720
-msgid "Empty Trash"
-msgstr "Çöp Kutusunu Boşalt"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Emptying Trash..."
-msgstr "Çöp Kutusu Boşaltılıyor..."
-
-#: ../src/library/LibraryWindow.vala:879
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell fotoğrafları ev dizininize kopyalamak üzere yapılandırılmıştır.\n"
-"Bunu <span weight=\"bold\">%s Tercihlerini Düzenle</span> içinden "
-"değiştirmenizi tavsiye\n"
-"ederiz. Fotoğrafları içe aktarmaya devam etmek istiyor musunuz?"
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Yorumlar"
 
-#: ../src/library/LibraryWindow.vala:882 ../ui/shotwell.glade.h:18
-msgid "Library Location"
-msgstr "Kitaplık Konumu"
+#: 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 "_Olayları Sırala"
 
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:895
-msgid "Photos cannot be imported from this directory."
-msgstr "Fotoğraflar, bu dizinden içe aktarılamadı."
+#: 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 "_Artan"
 
-#: ../src/library/LibraryWindow.vala:1183
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
+#: 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 "A_zalan"
 
-#: ../src/library/LibraryWindow.vala:1227
-#: ../src/library/LibraryWindow.vala:1238
-msgid "Updating library..."
-msgstr "Kütüphane güncelleniyor..."
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
+msgid "Even_ts"
+msgstr "Ola_ylar"
 
-#: ../src/library/LibraryWindow.vala:1244
-msgid "Preparing to auto-import photos..."
-msgstr "Fotoğraflar otomatik olarak içe aktarmaya hazırlanıyor..."
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Başlıklar"
 
-#: ../src/library/LibraryWindow.vala:1249
-msgid "Auto-importing photos..."
-msgstr "Fotoğraflar otomatik olarak içe aktarılıyor..."
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+msgid "Ta_gs"
+msgstr "E_tiketler"
 
-#: ../src/library/LibraryWindow.vala:1257
-msgid "Writing metadata to files..."
-msgstr "Meta dosyaları yazılıyor..."
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "_Fotoğrafları Sırala"
 
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Eksik Dosyalar"
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "_Başlığa Göre"
 
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Siliniyor..."
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "_Dosya Adına Göre"
 
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Çöp"
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Çekim _Tarihine Göre"
 
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Çöp boş"
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Puanlamaya Gö_re"
 
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Sil"
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "A_zalan"
 
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Fotoğraflar Siliniyor"
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Fotoğraflar"
 
-#: ../src/main.vala:54
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
-msgstr ""
-"Fotoğraf kütüphaneniz Shotwell'in bu sürümüyle uyumlu değil. Shotwell %s "
-"(schema %d) ile oluşturulduğu görünüyor. Bu sürüm ise %s (schema %d). Lütfen "
-"Shotwell'in son sürümünü kullanın."
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "İçe Aktarmayı _Durdur"
 
-#: ../src/main.vala:59
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
-msgstr ""
-"Shotwell fotoğraf kütüphanenizi sürüm %s (schema %d) den %s (schema %d) 'e "
-"güncellemeyi başaramadı. Daha fazla bilgi için lütfen Shotwelll Wiki'yi "
-"buradan %s kontrol edin."
+#: ui/preferences_dialog.ui:65
+msgid "white"
+msgstr "beyaz"
 
-#: ../src/main.vala:65
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Fotoğraf kütüphaneniz Shotwell'in bu sürümüyle uyumlu değil. Shotwell %s "
-"(schema %d) ile oluşturulduğu görünüyor. Bu sürüm ise %s (schema %d). Lütfen "
-"kütüphanenizi %s i silerek temizleyin ve resimlerini tekrar içe aktarın."
+#: ui/preferences_dialog.ui:92
+msgid "black"
+msgstr "siyah"
 
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Shotwell veritabanı doğrulamayı deneyen bilinmeyen hata: %s"
+#: ui/preferences_dialog.ui:123
+msgid "Display"
+msgstr "Göster"
 
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Shotwell Yükleniyor"
+#: ui/preferences_dialog.ui:160
+msgid "_Background:"
+msgstr "_Arka plan"
 
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Shotwell'in gizli veri yolu"
+#: ui/preferences_dialog.ui:175
+msgid "_Import photos to:"
+msgstr "_Fotoğrafları şunun içine aktar:"
 
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DİZİN"
+#: ui/preferences_dialog.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Yeni dosyalar için kitaplık dizinini izle"
 
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Kitaplık dizinini çalışırken değişiklikler için izleme"
+#: ui/preferences_dialog.ui:209
+msgid "Importing"
+msgstr "İçe Aktarılıyor"
 
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Başlangıç ilerleme metresini gösterme"
+#: ui/preferences_dialog.ui:226
+msgid "_Directory structure:"
+msgstr "_Dizin yapısı:"
 
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Uygulama sürümünü göster"
+#: ui/preferences_dialog.ui:241
+msgid "Example:"
+msgstr "Örnek:"
 
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[DOSYA]"
+#: ui/preferences_dialog.ui:250
+msgid "R_ename imported files to lowercase"
+msgstr "İçe aktarılan dosyaları küçük harfe y_eniden adlandır"
 
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Kullanılabilir komut satırı seçeneklerinin tam bir listesini görmek için '%s "
-"--help' komutunu çalıştırın.\n"
+#: ui/preferences_dialog.ui:272
+msgid "Metadata"
+msgstr "Üstveri"
 
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
+#: ui/preferences_dialog.ui:285
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Fotoğraf dosyalarına etiketleri, başlıkları ve diğer _üstveriyi yaz"
 
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
+#: ui/preferences_dialog.ui:307
+msgid "RAW Developer"
+msgstr "RAW Geliştirici"
 
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Düşük (%d%%)"
+#: ui/preferences_dialog.ui:324
+msgid "De_fault:"
+msgstr "Öntanım_lı:"
 
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Orta (%d%%)"
+#: ui/preferences_dialog.ui:378
+msgid "_Pattern:"
+msgstr "_Şablon:"
 
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Yüksek (%d%%)"
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "Saydam Arka Plan:"
 
-#: ../src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "En Yüksek (%d%%)"
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Damalı"
 
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Katı renk"
 
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
+#: ui/preferences_dialog.ui:539
+msgid "E_xternal photo editor:"
+msgstr "H_arici fotoğraf düzenleyici:"
 
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
+#: ui/preferences_dialog.ui:556
+msgid "External _RAW editor:"
+msgstr "Harici _RAW düzenleyici:"
 
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Yayımlanıyor"
+#: ui/preferences_dialog.ui:617
+msgid "External Editors"
+msgstr "Harici Düzenleyiciler"
 
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Yükleme için hazırlanıyor"
+#: ui/preferences_dialog.ui:642
+msgid "Plugins"
+msgstr "Eklentiler"
 
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "%d in %d si yükleniyor"
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Yazdırılmış Resim Boyutu</b>"
 
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "%s e yayımlamaya devam edilemiyor çünkü bir hata oluştu:"
+#: ui/printing_widget.ui:36
+msgid "Use a _standard size:"
+msgstr "_Standart bir boyut kullan:"
 
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Başka bir serviste yayımlamayı denemek için yukarıdaki menüden bir tane "
-"seçin."
+#: ui/printing_widget.ui:80
+msgid "Use a c_ustom size:"
+msgstr "Ö_zel bir boyut kullan:"
 
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Seçili fotoğraflar/videolar başarıyla yayımlandı."
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:146
+msgid "in."
+msgstr "inç"
 
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Seçili videolar başarıyla yayımlandı."
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:147
+msgid "cm"
+msgstr "cm"
 
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Seçili fotoğraflar başarıyla yayımlandı."
+#: ui/printing_widget.ui:173
+msgid "_Match photo aspect ratio"
+msgstr "Fotoğraf en-boy oranını _eşleştir"
 
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "Seçili video başarıyla yayımlandı."
+#: ui/printing_widget.ui:197
+msgid "_Autosize:"
+msgstr "_Otomatik Ölçütlendirme:"
 
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Seçili fotoğraf başarıyla yayımlandı."
+#: ui/printing_widget.ui:237
+msgid "<b>Titles</b>"
+msgstr "<b>Başlıklar</b>"
 
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Hesap bilgileri alınıyor..."
+#: ui/printing_widget.ui:254
+msgid "Print image _title"
+msgstr "Resim _başlığını yazdır"
 
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Oturum açılıyor..."
+#: ui/printing_widget.ui:297
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Piksel Çözünürlüğü</b>"
 
-#: ../src/publishing/PublishingUI.vala:185
-msgid "Publish Photos"
-msgstr "Fotoğrafları Yayımla"
+#: ui/printing_widget.ui:317
+msgid "_Output photo at:"
+msgstr "Dosya çıktısı _konumu:"
 
-#: ../src/publishing/PublishingUI.vala:186
-msgid "Publish photos _to:"
-msgstr "Fotoğrafları ş_urada yayımla:"
+#: ui/printing_widget.ui:351
+msgid "pixels per inch"
+msgstr "inç başına benek miktarı"
 
-#: ../src/publishing/PublishingUI.vala:188
-msgid "Publish Videos"
-msgstr "Videoları Yayımla"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Masaüstü Arka Planı Olarak Ayarla"
 
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish videos _to"
-msgstr "Videoları _şuraya yayımla"
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Masaüstü İçin Kullan"
 
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Photos and Videos"
-msgstr "Resimler ve Videoları Yayımla"
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Kilit Ekranı İçin Kullan"
 
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish photos and videos _to"
-msgstr "Resimleri ve videoları _şuraya yayımla"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Masaüstü Slayt Gösterisi Olarak Ayarla"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:360
-msgid "Unable to publish"
-msgstr "Yayımlanamıyor"
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Masaüstü arka planı slayt gösterisi oluştur"
 
-#: ../src/publishing/PublishingUI.vala:361
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell seçili öğeleri yayımlayamaz çünkü uyumlu bir yayımlama eklentiniz "
-"etkinleştirilmemiş. Bunu düzeltmek için, <b> Düzenle %s Tercihler </b> yi "
-"seçin ve <b> Eklentiler</b> sekmesinden bir veya daha fazla yayımlama "
-"eklentisini etkinleştirin."
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Her bir fotoğrafı şunun için göster"
 
-#: ../src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Kaydedilmiş Aramalar"
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "zaman dilimi"
 
-#. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
-msgid "contains"
-msgstr "içerir"
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Her fotoğrafın masaüstü arka planı üzerinde ne kadar süre gösterildiği"
 
-#. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:169
-#: ../src/searches/SavedSearchDialog.vala:500
-msgid "is exactly"
-msgstr "tam olarak"
+#: ui/shotwell.ui:22
+msgid "_Name of search:"
+msgstr "_Arama adı:"
 
-#: ../src/searches/SavedSearchDialog.vala:170
-msgid "starts with"
-msgstr "ile başlar"
+#: ui/shotwell.ui:76
+msgid "_Match"
+msgstr "_Eşleşen"
 
-#: ../src/searches/SavedSearchDialog.vala:171
-msgid "ends with"
-msgstr "ile biter"
+#: ui/shotwell.ui:103
+msgid "of the following:"
+msgstr "aşağıdakilerden:"
 
-#: ../src/searches/SavedSearchDialog.vala:172
-msgid "does not contain"
-msgstr "içermez"
+#: ui/shotwell.ui:184
+msgid "label"
+msgstr "etiket"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
-msgid "is not set"
-msgstr "ayarlı değil"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Yeni _Etiket…"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#, fuzzy
-#| msgid "is not set"
-msgid "is set"
-msgstr "ayarlı değil"
+#: ui/slideshow_settings.ui:91
+msgid "_Delay:"
+msgstr "_Gecikme:"
 
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:248
-#: ../src/searches/SavedSearchDialog.vala:379
-#: ../src/searches/SavedSearchDialog.vala:444
-msgid "is"
-msgstr "dir"
+#: ui/slideshow_settings.ui:105
+msgid "_Transition effect:"
+msgstr "_Geçiş etkisi:"
 
-#: ../src/searches/SavedSearchDialog.vala:249
-msgid "is not"
-msgstr "değildir"
+#: ui/slideshow_settings.ui:119
+msgid "Transition d_elay:"
+msgstr "Geçiş G_ecikmesi:"
 
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
-msgid "any photo"
-msgstr "herhangi bir fotoğraf"
+#: ui/slideshow_settings.ui:129
+msgid "Show t_itle"
+msgstr "Başlığı g_öster"
 
-#: ../src/searches/SavedSearchDialog.vala:256
-msgid "a raw photo"
-msgstr "işenmemiş (raw) bir fotoğraf"
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
+msgid "seconds"
+msgstr "saniye"
 
-#: ../src/searches/SavedSearchDialog.vala:257
-msgid "a video"
-msgstr "bir video"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Çöp kutusundaki tüm fotoğrafları sil"
 
-#: ../src/searches/SavedSearchDialog.vala:311
-msgid "has"
-msgstr "içerir"
+#~| msgid "Copyright 2009-2014 Yorba Foundation"
+#~ msgid "Copyright 2009-2015 Yorba Foundation"
+#~ msgstr "Telif Hakkı 2009-2015 Yorba Foundation"
 
-#: ../src/searches/SavedSearchDialog.vala:312
-msgid "has no"
-msgstr "içermez"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "F-Spot kütüphanesi içe aktarma hizmetine hoşgeldiniz.\n"
+#~ "\n"
+#~ "Lüften içe aktarım için ya Shotwell'in bulduğu mevcut kütüphanelerden "
+#~ "birini veya alternatif bir F-Spot veritabanı dosyasını seçin."
 
-#: ../src/searches/SavedSearchDialog.vala:317
-msgid "modifications"
-msgstr "değişiklikler"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "F-Spot kütüphanesi içe aktarma hizmetine hoşgeldiniz.\n"
+#~ "\n"
+#~ "Lütfen bir F-Spot veritabanı dosyası seçin."
 
-#: ../src/searches/SavedSearchDialog.vala:318
-msgid "internal modifications"
-msgstr "dahili değişiklikler"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "İçe aktarma için el ile bir F-Spot veritabanı dosyası seçin:"
 
-#: ../src/searches/SavedSearchDialog.vala:319
-msgid "external modifications"
-msgstr "harici düzenlemeler"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Seçilen F-Spot veritabanı dosyası açılamıyor: dosya yok ya da bir F-Spot "
+#~ "veritabanı değil"
 
-#. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
-msgid "flagged"
-msgstr "işaretli"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Seçilen F-Spot veritabanı dosyası açılamıyor: F-Spot veritabanının bu "
+#~ "sürümü Shotwell tarafından desteklenmiyor"
 
-#: ../src/searches/SavedSearchDialog.vala:374
-msgid "not flagged"
-msgstr "işaretsiz"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Seçilen F-Spot veritabanı dosyası okunamıyor: etiket tablosu okurken hata"
 
-#: ../src/searches/SavedSearchDialog.vala:437
-msgid "and higher"
-msgstr "ve daha yüksek"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Seçilen F-Spot veritabanı dosyası okunamıyor: fotoğraf tablosu okunurken "
+#~ "hata"
 
-#: ../src/searches/SavedSearchDialog.vala:438
-msgid "only"
-msgstr "sadece"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell F-Spot kitaplığında %d fotoğraf buldu ve şu anda bunları içe "
+#~ "aktarmakta. Yinelemeler otomatik olarak algılanır ve kaldırılır.\n"
+#~ "\n"
+#~ "Bu iletişim kutusunu kapatıp içe aktarma arka planda sürerken Shotwell "
+#~ "kullanmaya başlayabilirsiniz."
 
-#: ../src/searches/SavedSearchDialog.vala:439
-msgid "and lower"
-msgstr "ve daha alçak"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot kütüphanesi: %s"
 
-#: ../src/searches/SavedSearchDialog.vala:501
-msgid "is after"
-msgstr "sonrakidir"
+#~ msgid "Login"
+#~ msgstr "Giriş"
 
-#: ../src/searches/SavedSearchDialog.vala:502
-msgid "is before"
-msgstr "öncekidir"
+#~ msgid "Intro message replaced at runtime"
+#~ msgstr "Giriş iletisi çalışma zamanında değiştirildi"
 
-#: ../src/searches/SavedSearchDialog.vala:503
-msgid "is between"
-msgstr "arasındadır"
+#~ msgid "'Publishing to $url as $username' (populated in application code)"
+#~ msgstr ""
+#~ "'$url'ye $username olarak yayımlanıyor' (uygulama kodundan dolduruldu)"
 
-#: ../src/searches/SavedSearchDialog.vala:516
-msgid "and"
-msgstr "ve"
+#~ msgid "you are logged in rajce as $name"
+#~ msgstr "rajce'ye $name olarak giriş yapmış bulunmaktasınız"
 
-#: ../src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Ara"
+#~ msgid "$mediatype will appear in"
+#~ msgstr "$mediatype şurada belirecek"
 
-#: ../src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "İptal"
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "Facebook bağlantısı sınanıyor..."
 
-#: ../src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "Tamam"
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Bu Shotwell oturumu süresince zaten Flickr'da oturum açıp kapattınız.\n"
+#~ "Flickr'da yayımlamaya devam etmek için, Shotwell'i kapatın ve yeniden "
+#~ "başlatın, daha sonra tekrar yayımlamayı deneyin."
 
-#: ../src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "herhangi"
+#~ msgid "Videos will appear in '%s'"
+#~ msgstr "Videolar '%s' içinde görülecek"
 
-#: ../src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "hepsi"
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "Albümü herkese açık galeride l_istele"
 
-#: ../src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "hiçbiri"
+#~ msgid "Visit the Yorba web site"
+#~ msgstr "Yorba web sitesini ziyaret edin"
 
-#: ../src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Herhangibir metin"
+#~ msgid "Play a slideshow"
+#~ msgstr "Bir slayt gösterisi oynat"
 
-#: ../src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Başlık"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Fotoğrafları/Videoları Dışa Aktar"
 
-#: ../src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etiket"
+#~ msgid "Save Details..."
+#~ msgstr "Detayları Kaydet..."
 
-#: ../src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Yorum"
+#~ msgid "_Modify original files"
+#~ msgstr "_Özgün dosyaları değiştir"
 
-#: ../src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Etkinlik adı"
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Önizleme oranını artır"
 
-#: ../src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Dosya adı"
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Önizleme oranını azalt"
 
-#: ../src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Ortam türü"
+#~ msgid "_Play Video"
+#~ msgstr "Videoyu _Oynat"
 
-#: ../src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "İşaret durumu"
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Seçili videolrı varsayılan video oynatıcıda aç"
 
-#: ../src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Fotoğraf durumu"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Tüm fotoğrafların başlığını görüntüle"
 
-#: ../src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Tarih"
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Her fotoğrafın yorumunu görüntüle"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Yeni _Etiket..."
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Fotoğrafları çekim tarihine göre sırala"
 
-#: ../src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Slayt Gösterisi Geçişleri"
+#~ msgid "Sort photos by rating"
+#~ msgstr "Fotoğrafları puanlmaya göre sırala"
 
-#: ../src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Hiçbiri)"
+#, fuzzy
+#~| msgid "Sort photos by title"
+#~ msgid "Sort photos by filename"
+#~ msgstr "Fotoğrafları başlıklarına göre sırala"
 
-#: ../src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Hiçbiri"
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Fotoğrafarı azalan düzene göre sırala"
 
-#: ../src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Rastgele"
+#~ msgid "Previous Photo"
+#~ msgstr "Önceki Fotoğraf"
 
-#: ../src/tags/Branch.vala:131
-msgid "Tags"
-msgstr "Etiketler"
+#~ msgid "Next Photo"
+#~ msgstr "Sonraki Fotoğraf"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Background"
-msgstr "Masaüstü Arkapılan olarak ayarla"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Fotoğrafı büyüt"
 
-#: ../ui/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
-msgid "Use for Desktop"
-msgstr "Masaüstü için Kullan"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Fotoğrafı küçült"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
-msgid "Use for Lock Screen"
-msgstr "Kilit Ekranı için Kullan"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Fotoğrafı ekrana sığacak şekilde büyült"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Masaüstü Slayt Gösterisi olarak ayarla"
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Fotoğrafı 100% büyütmeye getir"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
-msgid "Show each photo for"
-msgstr "Her bir fotoğrafı şunun için göster"
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Fotoğrafı 200% büyütmeye getir"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
-msgid "period of time"
-msgstr "zaman dilimi"
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "_Masaüstü Slayt gösterisi olarak ayarla..."
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
-msgid "Generate desktop background slideshow"
-msgstr "Masaüstü arka planı slayt gösterisi oluştur"
+#~ msgid "Re_name Event..."
+#~ msgstr "Olayı Yeniden _Adlandır..."
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "Her fotoğrafın masaüstü arka plan üzerinde ne kadar süre gösterildiği"
+#~ msgid "_Export..."
+#~ msgstr "_Dışa Aktar..."
 
-#: ../ui/shotwell.glade.h:1
-msgid "_Name of search:"
-msgstr "_Arama adı:"
+#~ msgid "_Print..."
+#~ msgstr "_Baskı..."
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Match"
-msgstr "_Eşleşen"
+#~ msgid "Pu_blish..."
+#~ msgstr "Ya_yımla..."
 
-#: ../ui/shotwell.glade.h:3
-msgid "of the following:"
-msgstr "aşağıdakilerden:"
+#~ msgid "Edit _Title..."
+#~ msgstr "Başlığı _Düzenle..."
 
-#: ../ui/shotwell.glade.h:4
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Yazdırılmış Resim Boyutu</b>"
+#~ msgid "Edit _Comment..."
+#~ msgstr "_Yorumu Düzenle..."
 
-#: ../ui/shotwell.glade.h:5
-msgid "Use a _standard size:"
-msgstr "_Standart bir boyut kullan:"
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Olay _Yorumunu Düzenle..."
 
-#: ../ui/shotwell.glade.h:6
-msgid "Use a c_ustom size:"
-msgstr "Ö_zel bir boyut kullan:"
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Tarih ve Zamanı Ayarla..."
 
-#: ../ui/shotwell.glade.h:7
-msgid "_Match photo aspect ratio"
-msgstr "Fotoğraf en-boy oranını _eşleştir"
+#~ msgid "Add _Tags..."
+#~ msgstr "_Etiket Ekle..."
 
-#: ../ui/shotwell.glade.h:8
-msgid "_Autosize:"
-msgstr "_Otomatik Ölçütlendirme:"
+#~ msgid "_Add Tags..."
+#~ msgstr "_Etiketler Ekle..."
 
-#: ../ui/shotwell.glade.h:9
-msgid "<b>Titles</b>"
-msgstr "<b>Başlıklar</b>"
+#~ msgid "Send _To..."
+#~ msgstr "Gön _der..."
 
-#: ../ui/shotwell.glade.h:10
-msgid "Print image _title"
-msgstr "Resim _başlığını yazdır"
+#~ msgid "Send T_o..."
+#~ msgstr "e_ Gönder..."
 
-#: ../ui/shotwell.glade.h:11
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Piksel Çözünürlüğü</b>"
+#~ msgid "_Find..."
+#~ msgstr "_Bul..."
 
-#: ../ui/shotwell.glade.h:12
-msgid "_Output photo at:"
-msgstr "Dosya çıktısı _konumu:"
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Etiketleri Düzenl_e..."
 
-#: ../ui/shotwell.glade.h:13
-msgid "pixels per inch"
-msgstr "inç başına benek miktarı"
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Fotoğrafları \"%s\" olarak etiketle"
 
-#: ../ui/shotwell.glade.h:15
-msgid "Shotwell Preferences"
-msgstr "Shotwell Tercihleri"
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Seçili fotoğrafları \"%s\" olarak etiketle"
 
-#: ../ui/shotwell.glade.h:16
-msgid "white"
-msgstr "beyaz"
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "\"%s\" Etiketini _Fotoğraflardan Kaldır"
 
-#: ../ui/shotwell.glade.h:17
-msgid "black"
-msgstr "siyah"
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "\"%s\" Etiketini Fotoğraflardan Kaldır"
 
-#: ../ui/shotwell.glade.h:19
-msgid "_Watch library directory for new files"
-msgstr "_Yeni dosyalar için kütüphane dizinini izle"
+#~ msgid "_Edit..."
+#~ msgstr "_Düzenle..."
 
-#: ../ui/shotwell.glade.h:20
-msgid "Metadata"
-msgstr "Metadata"
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-I:%M %p"
 
-#: ../ui/shotwell.glade.h:21
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Fotoğraf dosyalara etiketler, başlıklar ve diğer _metadata yı yazın"
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-I:%M:%S %p"
 
-#: ../ui/shotwell.glade.h:22
-msgid "Display"
-msgstr "Göster"
+#~ msgid "RAW photos"
+#~ msgstr "Raw fotoğraflar"
 
-#: ../ui/shotwell.glade.h:23
-msgid "_Import photos to:"
-msgstr "_Fotoğrafları şunun içine aktar:"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Şeçili fotoğrafları kütüphaneye aktar"
 
-#: ../ui/shotwell.glade.h:24
-msgid "_Background:"
-msgstr "_Arka plan"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Tüm fotoğrafları kütüphaneye aktar"
 
-#: ../ui/shotwell.glade.h:25
-msgid "Importing"
-msgstr "İçe Aktarılıyor"
+#~ msgid "Save photo"
+#~ msgstr "Fotoğrafı kaydet"
 
-#: ../ui/shotwell.glade.h:26
-msgid "_Directory structure:"
-msgstr "_Dizin yapısı:"
+#~ msgid "Save _As..."
+#~ msgstr "Farklı _Kaydet..."
 
-#: ../ui/shotwell.glade.h:27
-msgid "_Pattern:"
-msgstr "_Şablon:"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Fotoğrafı farklı bir adla kaydet"
 
-#: ../ui/shotwell.glade.h:28
-msgid "Example:"
-msgstr "Örnek:"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Bigisayarınıza bağlı bir yazıcı ile fotoğrafı bastırın"
 
-#: ../ui/shotwell.glade.h:29
-msgid "R_ename imported files to lowercase"
-msgstr "İçe aktarılan dosyaları küçük harfe y_eniden adlandırın"
+#~ msgid "Display the comment of each event"
+#~ msgstr "Her olayın yorumunu göster"
 
-#: ../ui/shotwell.glade.h:30
-msgid "RAW Developer"
-msgstr "RAW Geliştirici"
+#~ msgid "Importing..."
+#~ msgstr "İçe aktarılıyor..."
 
-#: ../ui/shotwell.glade.h:31
-msgid "De_fault:"
-msgstr "Var_sayılan:"
+#~ msgid "Stop importing photos"
+#~ msgstr "Fotoğrafları içe aktarmayı durdur"
 
-#: ../ui/shotwell.glade.h:33
-msgid "E_xternal photo editor:"
-msgstr "H_arici fotoğraf düzenleyici:"
+#~ msgid "Preparing to import..."
+#~ msgstr "İçe Aktarmaya Hazırlanıyor..."
 
-#: ../ui/shotwell.glade.h:34
-msgid "External _RAW editor:"
-msgstr "Harici _RAW düzenleyici:"
+#~ msgid "_Import From Folder..."
+#~ msgstr "Dizinden İçe _Aktar..."
 
-#: ../ui/shotwell.glade.h:35
-msgid "External Editors"
-msgstr "Harici Düzenleyiciler"
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Fotoğrafları diskten kitaplığa aktar"
 
-#: ../ui/shotwell.glade.h:36
-msgid "Plugins"
-msgstr "Eklentiler"
+#~ msgid "Import From _Application..."
+#~ msgstr "_Uygulamadan İçe Aktar"
 
-#: ../ui/shotwell.glade.h:37
-msgid "_Delay:"
-msgstr "_Gecikme:"
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Arama kriterlerine göre fotoğraf ve videoları bulun"
 
-#: ../ui/shotwell.glade.h:38
-msgid "_Transition effect:"
-msgstr "_Geçiş etkisi:"
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Seçili öğe için temel bilgileri görüntüle"
 
-#: ../ui/shotwell.glade.h:39
-msgid "Transition d_elay:"
-msgstr "Geçiş G_ecikmesi:"
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Seçili videolar başarıyla yayımlandı."
 
-#: ../ui/shotwell.glade.h:40
-msgid "Show t_itle"
-msgstr "Başlığı g_öster"
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Seçili fotoğraflar başarıyla yayımlandı."
 
-#: ../ui/shotwell.glade.h:41
-msgid "seconds"
-msgstr "saniye"
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Shotwell Tercihleri"
 
 #~| msgid ""
 #~| "A file required for publishing is unavailable. Publishing to Flickr "
@@ -4991,9 +6537,6 @@ msgstr "saniye"
 #~ msgid "Only _Remove"
 #~ msgstr "Yalnızca _Kaldır"
 
-#~ msgid "Import media _from:"
-#~ msgstr "Ortamı _şuradan içe aktar:"
-
 #~ msgid "Shotwell is configured to import photos to your home directory.\n"
 #~ msgstr ""
 #~ "Shotwell, fotoğrafları içe aktarmak için ev dizinini kullanacak şekilde "
diff --git a/po/uk.gmo b/po/uk.gmo
index dfc10a6..25d8c17 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 5f9b289..95127bc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@
 # Translators:
 # verayin <vera@yorba.org>, 2011.
 # Yuri Chornoivan <yurchor@ukr.net>, 2011-2013.
-# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2014, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2014, 2017, 2018.
 # lsbeeler <lucas@yorba.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-01-18 21:36+0000\n"
-"PO-Revision-Date: 2017-01-23 21:03+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
+"l&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2017-11-24 20:46+0000\n"
+"PO-Revision-Date: 2018-02-21 19:11+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -24,18 +24,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: 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
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
 
 #: misc/shotwell.appdata.xml.in:9
-#| msgid "Photo Manager"
 msgid "Popular photo manager"
 msgstr "Популярний впорядник фотографій"
 
@@ -48,15 +47,15 @@ msgid ""
 "Shotwell’s non-destructive photo editor does not alter your master photos, "
 "making it easy to experiment and correct errors."
 msgstr ""
-"Shotwell — проста у користуванні, швидка програма для керування фотографіями, "
-"розроблена для стільничного середовища GNOME. За її допомогою ви можете "
-"імпортувати фотографії з вашого фотоапарата або диска, упорядкувати їх за "
-"датою або темою, навіть оцінками. У програмі також передбачено базові "
-"можливості з редагування фотографій, зокрема обрізання, виправлення наслідків "
-"ефекту «червоних очей», коригування рівнів кольорів та згладжування. "
-"Неруйнівний фоторедактор Shotwell не вносить змін до початкових файлів "
-"фотографій, що спростить вам експерименти з редагуванням та виправлення "
-"помилок."
+"Shotwell — проста у користуванні, швидка програма для керування "
+"фотографіями, розроблена для стільничного середовища GNOME. За її допомогою "
+"ви можете імпортувати фотографії з вашого фотоапарата або диска, "
+"упорядкувати їх за датою або темою, навіть оцінками. У програмі також "
+"передбачено базові можливості з редагування фотографій, зокрема обрізання, "
+"виправлення наслідків ефекту «червоних очей», коригування рівнів кольорів та "
+"згладжування. Неруйнівний фоторедактор Shotwell не вносить змін до "
+"початкових файлів фотографій, що спростить вам експерименти з редагуванням "
+"та виправлення помилок."
 
 #: misc/shotwell.appdata.xml.in:18
 msgid ""
@@ -73,21 +72,19 @@ msgstr ""
 "та різноманітних форматах цифрових негативів (RAW)."
 
 #: misc/shotwell.appdata.xml.in:52
-#| msgid "Set Developer"
 msgid "The Shotwell developers"
 msgstr "Розробники Shotwell"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Впорядник фотографій"
 
-#: misc/shotwell.desktop.in.in:6
-#| msgid "any photo"
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "Впорядкуйте ваші фотографії"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -95,24 +92,23 @@ msgid ""
 msgstr ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
-"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;альбом;камера;фо"
-"тоапарат;камери;фотоапарати;обрізати;редагувати;виправити;експортувати;галерея"
-";зображення;фото;імпортувати;імпорт;упорядкувати;упорядковування;фотографія;фо"
-"тографії;картинка;картинки;друк;надрукувати;оприлюднити;обернути;обертання;под"
-"ілитися;мітки;теґи;фейсбук;флікр;пікаса;ютьюб;півіго;півіґо;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;альбом;камера;"
+"фотоапарат;камери;фотоапарати;обрізати;редагувати;виправити;експортувати;"
+"галерея;зображення;фото;імпортувати;імпорт;упорядкувати;упорядковування;"
+"фотографія;фотографії;картинка;картинки;друк;надрукувати;оприлюднити;"
+"обернути;обертання;поділитися;мітки;теґи;фейсбук;флікр;пікаса;ютьюб;півіго;"
+"півіґо;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
-#| msgid "Shotwell"
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
-#| msgid "Photo Viewer"
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Переглядач Shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "Переглядач фотографій"
 
@@ -141,7 +137,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Закритий ключ для підписування запитів oauth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "типовий розмір"
 
@@ -169,10 +165,9 @@ msgid "URL of the Rajce server."
 msgstr "Адреса сервера Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "користувач"
 
@@ -189,8 +184,7 @@ msgid "user token, if remembered."
 msgstr "ключ користувача, якщо його слід пам’ятати."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
-#| msgid "within category:"
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "остання категорія"
 
@@ -199,8 +193,7 @@ msgid "The last selected Rajce category."
 msgstr "Остання вибрана категорія Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
-#| msgid "Photo size:"
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "останній розмір фотографії"
 
@@ -240,11 +233,11 @@ msgstr ""
 "одразу після вивантаження фотографій"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "вилучати конфіденційні дані з вивантаженого"
 
@@ -265,7 +258,6 @@ msgstr ""
 "True, якщо слід показувати панель основних властивостей; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:29
-#| msgid "Display extended information for the selection"
 msgid "display extended properties"
 msgstr "показувати розширені властивості"
 
@@ -276,7 +268,6 @@ msgstr ""
 "True, якщо слід показувати вікно розширених властивостей; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:35
-#| msgid "Display the sidebar"
 msgid "display sidebar"
 msgstr "показувати бічну панель"
 
@@ -285,7 +276,6 @@ msgid "True if the sidebar is to be displayed, false otherwise."
 msgstr "True, якщо слід показувати бічну панель; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:41
-#| msgid "Display the sidebar"
 msgid "display toolbar"
 msgstr "показувати панель інструментів"
 
@@ -294,18 +284,16 @@ msgid "True if the bottom toolbar is to be displayed, false otherwise."
 msgstr "True, якщо слід показувати нижню панель інструментів; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:47
-#| msgid "Display the search bar"
 msgid "display search bar"
 msgstr "показувати панель пошуку"
 
 #: misc/org.yorba.shotwell.gschema.xml:48
 msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
 msgstr ""
-"True, якщо слід показувати панель інструментів пошуку та фільтрування; false, "
-"якщо ні."
+"True, якщо слід показувати панель інструментів пошуку та фільтрування; "
+"false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:53
-#| msgid "Display each photo's tags"
 msgid "display photo titles"
 msgstr "показувати заголовки фотографій"
 
@@ -318,7 +306,6 @@ msgstr ""
 "мініатюрами; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:59
-#| msgid "Display each photo's tags"
 msgid "display photo comments"
 msgstr "показувати коментарі до фотографій"
 
@@ -331,7 +318,6 @@ msgstr ""
 "мініатюрами; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:65
-#| msgid "Edit Event Comment"
 msgid "display event comments"
 msgstr "показувати коментарі до подій"
 
@@ -344,7 +330,6 @@ msgstr ""
 "мініатюрами; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:71
-#| msgid "Display each photo's tags"
 msgid "display photo tags"
 msgstr "показувати мітки фотографій"
 
@@ -357,7 +342,6 @@ msgstr ""
 "мініатюрами; false, якщо ні."
 
 #: misc/org.yorba.shotwell.gschema.xml:77
-#| msgid "Display each photo's rating"
 msgid "display photo ratings"
 msgstr "показувати оцінки фотографій"
 
@@ -379,12 +363,12 @@ msgid ""
 "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 ""
-"Визначає, як слід фільтрувати фотографії на основі їхніх оцінок. 1: відкинуті "
-"і кращі, 2: без оцінки і кращі, 3: одна зірка і кращі, 4: дві зірки і кращі, "
-"5: три зірки і кращі, 6: чотири зірки і кращі, 7: п’ять зірок і кращі."
+"Визначає, як слід фільтрувати фотографії на основі їхніх оцінок. 1: "
+"відкинуті і кращі, 2: без оцінки і кращі, 3: одна зірка і кращі, 4: дві "
+"зірки і кращі, 5: три зірки і кращі, 6: чотири зірки і кращі, 7: п’ять зірок "
+"і кращі."
 
 #: misc/org.yorba.shotwell.gschema.xml:89
-#| msgid "No events found"
 msgid "sort events ascending"
 msgstr "упорядкувати події за зростанням"
 
@@ -394,7 +378,6 @@ msgstr ""
 "True, якщо події слід упорядкувати за зростанням; false, якщо за спаданням."
 
 #: misc/org.yorba.shotwell.gschema.xml:95
-#| msgid "Sort photos in an ascending order"
 msgid "sort library photos ascending"
 msgstr "упорядкувати фотографії у бібліотеці за зростанням"
 
@@ -416,7 +399,6 @@ msgstr ""
 "бібліотек."
 
 #: misc/org.yorba.shotwell.gschema.xml:107
-#| msgid "Sort photos in an ascending order"
 msgid "sort event photos ascending"
 msgstr "упорядкувати фотографії події за зростанням"
 
@@ -427,7 +409,6 @@ msgstr ""
 "спаданням."
 
 #: misc/org.yorba.shotwell.gschema.xml:113
-#| msgid "Sort photos by title"
 msgid "sort event photos criteria"
 msgstr "критерій упорядковування фотографій події"
 
@@ -462,7 +443,6 @@ msgstr ""
 "фотографій слід встановити однакову позначку часу."
 
 #: misc/org.yorba.shotwell.gschema.xml:131
-#| msgid "_Modify original photo files"
 msgid "modify original photo files"
 msgstr "змінювати початкові файли фотографій"
 
@@ -488,7 +468,6 @@ msgstr ""
 "якщо таке вікно не слід показувати."
 
 #: misc/org.yorba.shotwell.gschema.xml:143
-#| msgid "Library Location"
 msgid "sidebar position"
 msgstr "розташування бічної панелі"
 
@@ -505,7 +484,6 @@ msgid "The scale of photo thumbnails, ranging from 72 to 360."
 msgstr "Розмір мініатюр фотографій, значення від 72 до 360."
 
 #: misc/org.yorba.shotwell.gschema.xml:155
-#| msgid "Pin the toolbar open"
 msgid "pin toolbar state"
 msgstr "стан пришпилювання панелі інструментів"
 
@@ -515,7 +493,6 @@ msgstr ""
 "Визначає, чи слід пришпилювати панель інструментів у повноекранному режимі."
 
 #: misc/org.yorba.shotwell.gschema.xml:161
-#| msgid "_Background:"
 msgid "background color"
 msgstr "колір тла"
 
@@ -524,10 +501,28 @@ msgid "A grayscale color for use as the background color."
 msgstr "Визначає тон сірого кольору, який слід використовувати як колір тла."
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "тло для прозорих зображень"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "Тло, яке слід використовувати для прозорих зображень."
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "колір для суцільного прозорого тла"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr ""
+"Колір, яким слід скористатися, якщо для заповнення тла прозорих зображень"
+" вибрано суцільний колір"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "Стан вибору параметра «приховати фотографії»"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -535,101 +530,97 @@ msgstr ""
 "Останній використаний стан вибору параметра «Ховати фотографії, які вже "
 "імпортовано» на сторінці імпортування."
 
-#: misc/org.yorba.shotwell.gschema.xml:175
-#| msgid "_Delay:"
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "затримка"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Затримка (у секундах) між фотографіями у показі слайдів."
 
-#: misc/org.yorba.shotwell.gschema.xml:181
-#| msgid "Transition d_elay:"
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "затримка переходу"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Тривалість (у секундах) переходу між фотографіями під час показу слайдів."
 
-#: misc/org.yorba.shotwell.gschema.xml:187
-#| msgid "_Transition effect:"
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "ідентифікатор ефекту переходу"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr "Назва ефекту переходу, який буде використано під час показу слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
-#| msgid "Show t_itle"
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "Показувати заголовок"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 "Визначає, чи слід показувати заголовок фотографії під час показу слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "максимізація вікна бібліотеки"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "True, якщо вікно бібліотеки максимізовано; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "ширина вікна бібліотеки"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "Останнє записане значення ширини вікна бібліотеки."
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "висота вікна бібліотеки"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "Останнє записане значення висоти вікна бібліотеки."
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "максимізація вікна безпосереднього редагування"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "True, якщо вікно безпосереднього редагування максимізовано; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "ширина вікна безпосереднього редагування"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Остання записана ширина вікна програми безпосереднього редагування."
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "висота вікна безпосереднього редагування"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Остання записана висота вікна програми безпосереднього редагування."
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "розташування роздільника бічної панелі"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -637,32 +628,29 @@ msgstr ""
 "Останнє записане розташування роздільника між бічною панеллю та областю "
 "перегляду у вікні бібліотеки."
 
-#: misc/org.yorba.shotwell.gschema.xml:245
-#| msgid "Import to Library"
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "каталог імпортування"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "Каталог, у якому зберігатимуться імпортовані файли фотографій."
 
-#: misc/org.yorba.shotwell.gschema.xml:251
-#| msgid "_Watch library directory for new files"
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "виявляти нові файли у каталозі бібліотеки"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Якщо true, файли, додані до каталогу бібліотеки, автоматично імпортуються."
 
-#: misc/org.yorba.shotwell.gschema.xml:257
-#| msgid "Writing metadata to files..."
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "записувати метадані до початкових файлів"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -670,11 +658,11 @@ msgstr ""
 "Якщо true, зміни у метаданих (мітках, заголовках тощо) записуватимуться до "
 "основного файла фотографії."
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "використовувати назви файлів малими літерами"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -682,12 +670,11 @@ msgstr ""
 "Якщо true, Shotwell перетворить усі літери назв файлів на літери нижнього "
 "регістру (малі) під час імпортування файлів фотографій"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
-#| msgid "_Directory structure:"
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "взірець для каталогів"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -695,11 +682,11 @@ msgstr ""
 "Рядок-код взірця найменування, який буде використано для назв каталогів під "
 "час імпортування."
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "нетиповий взірець каталогів"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -707,32 +694,32 @@ msgstr ""
 "Рядок-код нетипового взірця найменування, який буде використано для назв "
 "каталогів під час імпортування."
 
-#: misc/org.yorba.shotwell.gschema.xml:281
-#| msgid "RAW Developer"
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "типовий обробник RAW"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr ""
-"Типовий варіант проявника цифрових негативів, який використовуватиме Shotwell."
+"Типовий варіант проявника цифрових негативів, який використовуватиме "
+"Shotwell."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Останній використаний пункт пропорцій обрізання у меню."
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Числовий код, який відповідає останньому вибраному пункту меню обрізання "
 "фотографій, який було вибрано користувачем."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Останній використаний чисельник нетипового дробу співвідношення розмірів."
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -740,12 +727,12 @@ msgstr ""
 "Додатне ціле число, що відповідає частині ширини у останньому введеному "
 "користувачем нетиповому співвідношенні розмірів для обрізання."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Останній використаний знаменник нетипового дробу співвідношення розмірів."
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -753,158 +740,151 @@ msgstr ""
 "Додатне ціле число, що відповідає частині висоти у останньому введеному "
 "користувачем нетиповому співвідношенні розмірів для обрізання."
 
-#: misc/org.yorba.shotwell.gschema.xml:307
-#| msgid "E_xternal photo editor:"
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "зовнішній фоторедактор"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "Зовнішня програм, яку буде використано для редагування фотографій."
 
-#: misc/org.yorba.shotwell.gschema.xml:313
-#| msgid "External _RAW editor:"
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "зовнішній редактор негативів"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr ""
 "Зовнішня програм, яку буде використано для редагування цифрових негативів "
 "фотографій (RAW)."
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "Параметр у діалоговому вікні експортування: як обрізати зображення"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#| msgid "Export metadata"
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "експортувати метадані"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr ""
 "Параметр у діалоговому вікні експортування: параметр експортування метаданих"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "параметр формату, спеціальне значення"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr ""
 "Параметр у діалоговому вікні експортування: параметр формату, спеціальне "
 "значення"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "параметр формату, значення типу"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr ""
 "Параметр у діалоговому вікні експортування: параметр формату, значення типу"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "параметр якості JPEG"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr ""
 "Параметр у діалоговому вікні експортування: якість перетворення на jpeg"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "максимальний розмір зображення"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 "Параметр у діалоговому вікні експортування: максимальний розмір зображення"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "остання використана служба оприлюднення"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Числовий код, що відповідає останній службі, на якій оприлюднювалися "
 "фотографії"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "типова служба оприлюднення"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
-#| msgid "Access _type:"
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "ключ доступу"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Ключ OAuth Facebook для поточного сеансу у системі, якщо такий існує"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "ідентифікатор користувача"
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
-"Ідентифікатор користувача Facebook для поточного сеансу у системі, якщо такий "
-"існує"
+"Ідентифікатор користувача Facebook для поточного сеансу у системі, якщо "
+"такий існує"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "ім’я користувача"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
-#| msgid "You are not currently logged into Yandex.Fotki."
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Поточне ім’я у системі Facebook, якщо є"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "код типового розміру"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Числовий код, що відповідає типовому розміру фотографій, які оприлюднюються "
 "на Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
-"Визначає, чи слід вилучати метадані фотографій перед вивантаженням на Facebook"
+"Визначає, чи слід вилучати метадані фотографій перед вивантаженням на "
+"Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "Ключ фази доступу OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Ключ уповноваження для поточного сеансу у системі Flickr, якщо такий існує"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "Пароль до ключа фази доступу OAuth"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -912,43 +892,42 @@ msgstr ""
 "Криптографічний пароль, що використовується для підписування запитів щодо "
 "ключа уповноваження для поточного сеансу у системі Flickr, якщо такий існує"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Поточне ім’я користувача у системі Flickr, якщо є"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Числовий код, що відповідає типовому розміру фотографій, які оприлюднюються "
 "на Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "типова видимість"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
 msgstr ""
 "Числовий код, що відповідає типовому стану видимості фотографій, які "
-"оприлюднюються "
-"на Flickr"
+"оприлюднюються на Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "Визначає, чи слід вилучати метадані фотографій перед вивантаженням на Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "ключ освіження"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -956,7 +935,7 @@ msgstr ""
 "Ключ OAuth, який використовується для оновлення сеансу Альбомів Picasa для "
 "поточного користувача у системі, якщо такий є."
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -964,68 +943,66 @@ msgstr ""
 "Числовий код, що відповідає типовому розміру фотографій, які вивантажуються "
 "на Альбомах Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "останній альбом"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Назва останнього альбому, у якому користувач оприлюднював фотографії, якщо "
 "такий є"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "Визначає, чи слід вилучати метадані фотографій перед вивантаженням на Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "адреса Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Адреса сервера Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Ім’я користувача Piwigo, якщо здійснено вхід."
 
-#: misc/org.yorba.shotwell.gschema.xml:518
-#| msgid "_Password"
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "пароль"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Пароль до Piwigo, якщо здійснено вхід до системи."
 
-#: misc/org.yorba.shotwell.gschema.xml:524
-#| msgid "_Remember Password"
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "запам’ятати пароль"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "Якщо true, пам’ятати пароль до Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "Остання вибрана категорія на Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "останній рівень доступу"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "Останній вибраний рівень доступу на Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -1033,22 +1010,21 @@ msgstr ""
 "Числовий код, який відповідає останньому вибраному шаблону розміру "
 "фотографій, що використовується для оприлюднення на Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "Визначає, чи слід вилучати метадані фотографій перед вивантаженням на Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
-#| msgid "_If a title is set and comment unset, use title as comment"
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "якщо вказано заголовок і не вказано коментаря, використовувати заголовок як "
 "коментар для вивантажень на Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -1057,11 +1033,11 @@ msgstr ""
 "Piwigo, на основі заголовка зображення, якщо заголовок встановлено, а "
 "коментар — ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "не вивантажувати мітки під час вивантаження на Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -1069,46 +1045,47 @@ msgstr ""
 "Визначає, чи слід вилучати мітки фотографій перед вивантаженням на Piwigo, "
 "так, щоб їх не можна було бачити на віддаленому сервері Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "ім’я користувача Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "ключ API"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Ключ до програмного інтерфейсу Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "Адреса"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Адреса сайта Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
-"Визначає, чи слід вилучати метадані фотографій перед вивантаженням на Gallery3"
+"Визначає, чи слід вилучати метадані фотографій перед вивантаженням на "
+"Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "обмеження масштабування вивантажуваного зображення"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Ідентифікатор обмеження розмірів для зображень, які вивантажують"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "пікселі за великою віссю вивантажуваного зображення"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1117,7 +1094,7 @@ msgstr ""
 "використовується, лише якщо ідентифікатор обмежень масштабування має "
 "неприйнятне значення"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1125,31 +1102,30 @@ msgstr ""
 "Ключ OAuth, який використовується для оновлення сеансу YouTube для поточного "
 "користувача у системі, якщо такий є."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
-#| msgid "Core Data Import Services"
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "остання використана служба імпортування"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Числовий код, що відповідає останній службі, з якої імпортувалися фотографії"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "кука стану інтерпретатора"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Числовий код, який зберігає стан середовища додатків GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "режим компонування вмісту"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1157,40 +1133,37 @@ msgstr ""
 "Числовий код, який описує, як слід розташовувати фотографії на сторінці під "
 "час друку"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "ppi даних"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 "Кількість пікселів на дюйм (ppi) у даних, які буде надіслано на принтер під "
 "час друку"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "ширина вмісту"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Ширина зони друку на сторінці"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
-#| msgid "Rotate Right"
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "висота вмісту"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Висота зони друку на сторінці"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "одиниці вмісту"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1198,12 +1171,11 @@ msgstr ""
 "Числовий код, який відповідає одиниці виміру (дюймам або сантиметрам), яку "
 "буде використано під час друку"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
-#| msgid "2 images per page"
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "код кількості зображень на сторінку"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1211,23 +1183,22 @@ msgstr ""
 "Числовий код поточного вибраного режиму кількості фотографій на аркуші під "
 "час друку"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "вибір розміру"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Індекс поточного розміру для друку у попередньо визначеному списку "
 "стандартних розмірів"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
-#| msgid "_Match photo aspect ratio"
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "відповідність пропорцій"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1235,220 +1206,215 @@ msgstr ""
 "Визначає, чи мають нетипові розміри друку відповідати пропорціям початкової "
 "фотографії"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
-#| msgid "Print image _title"
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "друк заголовків"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "True, якщо слід друкувати заголовок разом із фотографією; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "шрифт заголовків"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Назва шрифту, яким слід скористатися для заголовків фотографій під час друку."
 
-#: misc/org.yorba.shotwell.gschema.xml:702
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "увімкнути додаток оприлюднення на facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Facebook увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "увімкнути додаток оприлюднення на flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Flickr увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "увімкнути додаток оприлюднення на picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо додаток оприлюднення у Альбомах Picasa увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "увімкнути додаток оприлюднення на youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на YouTube увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "увімкнути додаток оприлюднення на piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Piwigo увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "увімкнути додаток оприлюднення на Яндекс"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо додаток оприлюднення на Яндекс.Фоткі увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "увімкнути додаток оприлюднення на tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Tumblr увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "увімкнути додаток оприлюднення на rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Rajce увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "увімкнути додаток оприлюднення на gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr "True, якщо додаток оприлюднення на Gallery3 увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "увімкнути додаток імпортування з F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "True, якщо додаток імпортування з F-Spot увімкнено; false, якщо ні"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "увімкнути перехід з розпадом у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
-"True, якщо увімкнено додаток переходу із ефектом розпаду у перегляді слайдів; "
-"false, якщо ні."
+"True, якщо увімкнено додаток переходу із ефектом розпаду у перегляді "
+"слайдів; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:768
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "увімкнути перехід зі згасанням у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом згасання у перегляді "
 "слайдів; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "увімкнути перехід з ковзанням у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом ковзання у перегляді "
 "слайдів; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:780
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "увімкнути перехід з ефектом годинника у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом стрілки годинника у "
 "перегляді слайдів; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "увімкнути перехід з колами у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом кола у перегляді слайдів; "
 "false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:804
+#| msgid "enable slideshow circle transition"
+msgid "enable slideshow circles transition"
+msgstr "увімкнути перехід з колами у показі слайдів"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом кіл у перегляді слайдів; "
 "false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:810
+#| msgid "enable slideshow slide transition"
+msgid "enable slideshow blinds transition"
+msgstr "увімкнути перехід з завісами у показі слайдів"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом жалюзі у перегляді слайдів; "
 "false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:804
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "увімкнути перехід із квадратами у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом квадратів у перегляді "
 "слайдів; false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:810
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "увімкнути перехід зі смугами у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом смуг у перегляді слайдів; "
 "false, якщо ні."
 
-#: misc/org.yorba.shotwell.gschema.xml:816
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "увімкнути перехід з шахівницею у показі слайдів"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1456,23 +1422,164 @@ msgstr ""
 "True, якщо увімкнено додаток переходу із ефектом шахівниці у перегляді "
 "слайдів; false, якщо ні."
 
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"login process. During login, Shotwell Connect may ask you for permission to "
+"upload photos and publish to your feed. These permissions are required for "
+"Shotwell Connect to function."
+msgstr ""
+"Ви ще не увійшли до системи Facebook.\n"
+"\n"
+"Якщо у вас ще немає облікового запису Facebook, ви можете створити таких "
+"запис під час виконання процедури з входу до системи. Під час входу до "
+"системи Shotwell може попросити у вас дозволу на вивантаження фотографій та "
+"їх оприлюднення за допомогою подачі. Ці дозволи потрібні для нормальної "
+"роботи Shotwell."
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:168
+msgid ""
+"You have already logged in and out of Facebook during this Shotwell "
+"session.\n"
+"To continue publishing to Facebook, quit and restart Shotwell, then try "
+"publishing again."
+msgstr ""
+"Ви вже входили і виходили з системи Facebook протягом цього сеансу роботи у "
+"Shotwell.\n"
+"Щоб продовжити оприлюднення фотографій на Facebook, завершіть роботу "
+"Shotwell і запустіть програму знову, а потім повторіть спробу оприлюднення."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
+msgid ""
+"You are not currently logged into Flickr.\n"
+"\n"
+"Click Log in to log into Flickr in your Web browser. You will have to "
+"authorize Shotwell Connect to link to your Flickr account."
+msgstr ""
+"Ви не увійшли до служби Flickr.\n"
+"\n"
+"Натисніть кнопку входу до Flickr (Login) у вашій програмі для перегляду "
+"інтернету. Вам слід уповноважити інструмент Shotwell Connect, щоб встановити "
+"зв’язок програми з вашим обліковим записом Flickr."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
+msgid "Preparing for login…"
+msgstr "Приготування до входу…"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Не вдалося пройти розпізнавання на Flickr"
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
+msgid "Verifying authorization…"
+msgstr "Перевіряємо уповноваження…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+msgid ""
+"You have already logged in and out of a Google service during this Shotwell "
+"session.\n"
+"\n"
+"To continue publishing to Google services, quit and restart Shotwell, then "
+"try publishing again."
+msgstr ""
+"Ви вже входили і виходили зі служб Google протягом цього сеансу роботи у "
+"Shotwell.\n"
+"\n"
+"Щоб продовжити оприлюднення фотографій на службах Google, завершіть роботу "
+"Shotwell і запустіть програму знову, а потім повторіть спробу оприлюднення."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
+msgid ""
+"You are not currently logged into Picasa Web Albums.\n"
+"\n"
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
+msgstr ""
+"Ви не увійшли до служби вебальбомів Picasa\n"
+"\n"
+"Натисніть кнопку входу (Login) у вашій програмі для перегляду інтернету, щоб "
+"увійти до служби вебальбомів Picasa. Вам слід уповноважити інструмент "
+"Shotwell Connect, щоб встановити зв’язок програми з вашим обліковим записом "
+"вебальбомів Picasa."
+
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
+msgid ""
+"You are not currently logged into YouTube.\n"
+"\n"
+"You must have already signed up for a Google account and set it up for use "
+"with YouTube to continue. You can set up most accounts by using your browser "
+"to log into the YouTube site at least once."
+msgstr ""
+"Ви ще не увійшли до системи веб-альбомів YouTube.\n"
+"\n"
+"Щоб продовжити процес вивантаження вам слід мати зареєстрований і "
+"налаштований на використання YouTube обліковий запис Google. Для "
+"налаштування більшості облікових записів достатньо скористатися ними "
+"принаймні один раз для входу до системи YouTube."
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "_Адреса ел. пошти"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "_Пароль"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "Увійти"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr ""
+"Вкажіть ім’я користувача і пароль, пов’язані з вашим обліковим записом "
+"Tumblr."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr ""
+"Некоректні значення імені користувача і/або пароля. Будь ласка, повторіть "
+"спробу."
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "Некоректне ім’я користувача або пароль"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "Не вдалося завантажити інтерфейс: %s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Відвідати домашню сторінку Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr "Юрій Чорноіван <yurchor@ukr.net>"
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 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
+#: plugins/common/RESTSupport.vala:222
 msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
@@ -1481,13 +1588,13 @@ msgstr ""
 "Перевірте, чи правильно вказано дату на календарі вашого комп’ютера."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:212
+#: plugins/common/RESTSupport.vala:227
 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
+#: plugins/common/RESTSupport.vala:232
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
@@ -1495,7 +1602,7 @@ msgstr ""
 "пошкоджено."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:222
+#: plugins/common/RESTSupport.vala:237
 msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
@@ -1504,7 +1611,7 @@ msgstr ""
 "їх було випущено."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:227
+#: plugins/common/RESTSupport.vala:242
 msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
@@ -1513,7 +1620,7 @@ msgstr ""
 "використовується дуже слабкий спосіб шифрування."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:232
+#: plugins/common/RESTSupport.vala:247
 msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
@@ -1521,144 +1628,29 @@ msgstr ""
 "⚫ Дані розпізнавання сайта набудуть чинності лише у майбутньому. Перевірте, "
 "чи правильно вказано дату на календарі вашого комп’ютера."
 
-#: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Тимчасовий файл, потрібний для оприлюднення, недоступний"
 
-#: plugins/common/RESTSupport.vala:1167
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Ви вже входили і виходили зі служб Google протягом цього сеансу роботи у "
-"Shotwell.\n"
-"\n"
-"Щоб продовжити оприлюднення фотографій на службах Google, завершіть роботу "
-"Shotwell і запустіть програму знову, а потім повторіть спробу оприлюднення."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "© Software Freedom Conservancy Inc., 2016"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Ласкаво просимо до служби імпортування бібліотеки F-Spot.\n"
-"\n"
-"Будь ласка, виберіть бібліотеку для імпортування. Можна скористатися однією "
-"з вже створених бібліотек, виявлених Shotwell, або вибрати інший файл бази "
-"даних F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Ласкаво просимо до служби імпортування бібліотеки F-Spot.\n"
-"\n"
-"Будь ласка, виберіть файл бази даних F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Виберіть файл бази даних F-Spot для імпортування вручну:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"Не вдалося виконати читання вибраного файла бази даних F-Spot: файла не "
-"існує або вказаний файл не є файлом бази даних F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"Не вдалося виконати читання вибраного файла бази даних F-Spot: підтримки "
-"цієї версії бази даних F-Spot у Shotwell не передбачено"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"Не вдалося виконати читання вибраного файла бази даних F-Spot: помилка під "
-"час читання таблиці міток"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"Не вдалося виконати читання вибраного файла бази даних F-Spot: помилка під "
-"час читання таблиці фотографій"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"У бібліотеці F-Spot було виявлено %d фотографій. Зараз виконується "
-"імпортування цих фотографій. Під час імпортування буде автоматично виявлено "
-"і вилучено дублікати.\n"
-"\n"
-"Ви можете закрити це діалогове вікно і продовжити користування Shotwell. "
-"Імпортування відбуватиметься у фоновому режимі."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Бібліотека F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Готуємося до імпортування"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Служби імпортування основних даних"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Адреса Gallery3:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
-#| msgid "User _name"
 msgid "_User name:"
 msgstr "_Користувач:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
-#| msgid "_Password"
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
-#| msgid "Back"
 msgid "Go _Back"
 msgstr "_Назад"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
-#| msgid "_Login"
+#: ui/shotwell.ui:363
 msgid "_Log in"
 msgstr "_Увійти"
 
@@ -1667,42 +1659,33 @@ msgid "API _Key:"
 msgstr "_Ключ API:"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
-#| msgid "hour"
-#| msgid_plural "hours"
 msgid "or"
 msgstr "або"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
-#| msgid "An _existing album:"
 msgid "An _existing album"
 msgstr "_Наявному альбомі"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
-#| msgid "A _new album named:"
 msgid "A _new album"
 msgstr "_Новому альбомі"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
-#| msgid ""
-#| "_Remove location, camera, and other identifying information before "
-#| "uploading"
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "Ви_лучити дані щодо місця, мітки та інші ідентифікаційні дані перед "
 "вивантаженням"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
-#| msgid "_Scaling constraint:"
 msgid "Scaling constraint:"
 msgstr "Обмеження масштабування:"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
-#| msgid " _pixels"
 msgid "pixels"
 msgstr "пікселів"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1710,17 +1693,17 @@ msgstr "Початковий розмір"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Ширина або висота"
+msgid "Longest edge"
+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/picasa_publishing_options_pane.ui:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "Ви_йти з системи"
@@ -1728,13 +1711,13 @@ 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/picasa_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
 msgstr "_Оприлюднити"
 
@@ -1743,12 +1726,6 @@ msgid "Gallery3 publishing module"
 msgstr "Модуль оприлюднення на Gallery3"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-#| msgid ""
-#| "You are not currently logged into YouTube.\n"
-#| "\n"
-#| "You must have already signed up for a Google account and set it up for "
-#| "use with YouTube to continue. You can set up most accounts by using your "
-#| "browser to log into the YouTube site at least once."
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -1761,7 +1738,6 @@ msgstr ""
 "Galery."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-#| msgid "Shotwell Preferences"
 msgid "Shotwell default directory"
 msgstr "Типовий каталог Shotwell"
 
@@ -1790,28 +1766,21 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
 msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
-"Не виявлено потрібного для оприлюднення файла. Продовження дій з оприлюднення "
-"на %s неможливе."
+"Не виявлено потрібного для оприлюднення файла. Продовження дій з "
+"оприлюднення на %s неможливе."
 
 #. populate any widgets whose contents are
 #. programmatically-generated
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
-#| msgid "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
 msgstr "Оприлюднення на %s як %s."
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
-#| msgid ""
-#| "Enter the URL of your Piwigo photo library as well as the username and "
-#| "password associated with your Piwigo account for that library."
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -1846,42 +1815,18 @@ msgstr "Нерозпізнаний користувач"
 msgid " Site Not Found"
 msgstr " Сайт не знайдено"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "_Адреса ел. пошти"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: 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:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
-#| msgid "_Remember Password"
 msgid "_Remember"
 msgstr "_Запам’ятати"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
-#| msgid "Logging in..."
-msgid "Log in"
-msgstr "Увійти"
-
 #: 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 "_Існуючому альбомі:"
 
 #: 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 "_Новому альбомі з назвою:"
 
@@ -1900,132 +1845,42 @@ msgid "Copyright © 2013 rajce.net"
 msgstr "© rajce.net, 2013"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
-#| msgid ""
-#| "An error message occurred when publishing to Piwigo. Please try again."
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr ""
 "Під час спроби оприлюднення даних на Rajce сталася помилка. Будь ласка, "
 "повторіть спробу."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
-#| msgid "Enter the username and password associated with your Tumblr account."
 msgid "Enter email and password associated with your Rajce account."
 msgstr ""
 "Вкажіть адресу електронної пошти і пароль, пов’язані з вашим обліковим "
 "записом Rajce."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
-#| msgid "Username and/or password invalid. Please try again"
 msgid "Invalid email and/or password. Please try again"
 msgstr ""
 "Некоректні значення адреси електронної пошти і/або пароля. Будь ласка, "
-"повторіть "
-"спробу."
+"повторіть спробу."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
-#| msgid "Invalid User Name or Password"
 msgid "Invalid User Email or Password"
 msgstr "Некоректна адреса ел. пошти користувача або пароль"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-#| msgid ""
-#| "You are logged into Facebook as %s.\n"
-#| "\n"
 msgid "You are logged into Rajce as %s."
 msgstr "Ви увійшли до облікового запису %s на Rajce."
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Фотографії з’являться у:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Додаткові служби оприлюднення Shotwell"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "Блоги:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "_Розмір фотографії:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "© BJA Electronics, 2012"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1205
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-#| msgid "500 x 375 pixels"
-msgid "500 × 375 pixels"
-msgstr "500 × 375 пікселів"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1206
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-#| msgid "1024 x 768 pixels"
-msgid "1024 × 768 pixels"
-msgstr "1024 × 768 пікселів"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-#| msgid "1280 x 853 pixels"
-msgid "1280 × 853 pixels"
-msgstr "1280 × 853 пікселів"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-#| msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "«%s» не є коректною відповіддю на запит щодо розпізнавання OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#| msgid ""
-#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): не вдалося розпочати; цей засіб оприлюднення не "
-"можна перезапускати."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Вкажіть ім’я користувача і пароль, пов’язані з вашим обліковим записом "
-"Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr ""
-"Некоректні значення імені користувача і/або пароля. Будь ласка, повторіть "
-"спробу."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "Некоректне ім’я користувача або пароль"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "Не вдалося завантажити інтерфейс: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Ви увійшли до системи Tumblr від імені %s.\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "© Evgeniy Polyakov <zbr@ioremap.net>, 2010+"
@@ -2043,12 +1898,12 @@ msgid "Public"
 msgstr "Відкритий доступ"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Друзі"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Конфіденційне"
 
@@ -2077,7 +1932,7 @@ msgid "Create a _new album named:"
 msgstr "Створити _альбом з назвою:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
-#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "_Розміри вивантаженого:"
 
@@ -2087,7 +1942,7 @@ msgstr "Відео і нові фотоальбоми зможуть _бачит
 
 #: 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/picasa_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2095,79 +1950,41 @@ msgstr ""
 "Ви_лучити дані щодо місця, фотоапарата та інші ідентифікаційні дані перед "
 "вивантаженням"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "© Software Freedom Conservancy Inc., 2016"
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "З’єднувач Shotwell"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-#| msgid ""
-#| "You are not currently logged into Facebook.\n"
-#| "\n"
-#| "If you don't yet have a Facebook account, you can create one during the "
-#| "login process. During login, Shotwell Connect may ask you for permission "
-#| "to upload photos and publish to your feed. These permissions are required "
-#| "for Shotwell Connect to function."
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don’t yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Ви ще не увійшли до системи Facebook.\n"
-"\n"
-"Якщо у вас ще немає облікового запису Facebook, ви можете створити таких "
-"запис під час виконання процедури з входу до системи. Під час входу до "
-"системи Shotwell може попросити у вас дозволу на вивантаження фотографій та "
-"їх оприлюднення за допомогою подачі. Ці дозволи потрібні для нормальної "
-"роботи Shotwell."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ви вже входили і виходили з системи Facebook протягом цього сеансу роботи у "
-"Shotwell.\n"
-"Щоб продовжити оприлюднення фотографій на Facebook, завершіть роботу "
-"Shotwell і запустіть програму знову, а потім повторіть спробу оприлюднення."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Стандартний (720 пікселів)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Велика (2048 пікселів)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-#| msgid "Testing connection to Facebook..."
-msgid "Testing connection to Facebook…"
-msgstr "Перевірка з’єднання з Facebook…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-#| msgid "Creating album..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Створення альбому…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Facebook "
-#| "can't continue."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
-"Не виявлено потрібного для оприлюднення файла. Продовження дій з оприлюднення "
-"на Facebook неможливе."
+"Не виявлено потрібного для оприлюднення файла. Продовження дій з "
+"оприлюднення на Facebook неможливе."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2176,89 +1993,35 @@ msgstr ""
 "Ви увійшли до облікового запису %s на Facebook.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:983
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Де ви бажаєте оприлюднити позначені фотографії?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "Лише я"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Будь-хто"
 
-#: 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."
-msgstr ""
-"Введіть число підтвердження, яке було показано після входу до служби Flickr "
-"за допомогою вашої програми для перегляду інтернету."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Число розпізнавання:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "П_родовжити"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-#| msgid ""
-#| "You are not currently logged into Flickr.\n"
-#| "\n"
-#| "Click Login to log into Flickr in your Web browser.  You will have to "
-#| "authorize Shotwell Connect to link to your Flickr account."
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Ви не увійшли до служби Flickr.\n"
-"\n"
-"Натисніть кнопку входу до Flickr (Login) у вашій програмі для перегляду "
-"інтернету. Вам слід уповноважити інструмент Shotwell Connect, щоб встановити "
-"зв’язок програми з вашим обліковим записом Flickr."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ви вже входили і виходили з системи Flickr протягом цього сеансу роботи у "
-"Shotwell.\n"
-"Щоб продовжити оприлюднення фотографій на Flickr, завершіть роботу Shotwell "
-"і запустіть програму знову, а потім повторіть спробу оприлюднення."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-#| msgid "Preparing for login..."
-msgid "Preparing for login…"
-msgstr "Приготування до входу…"
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "_Розмір фотографії:"
 
-#: 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."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
 msgid ""
 "A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
-"Не виявлено потрібного для оприлюднення файла. Продовження дій з оприлюднення "
-"на Flickr неможливе."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:447
-#| msgid "Verifying authorization..."
-msgid "Verifying authorization…"
-msgstr "Перевіряємо уповноваження…"
+"Не виявлено потрібного для оприлюднення файла. Продовження дій з "
+"оприлюднення на Flickr неможливе."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2267,11 +2030,8 @@ msgstr ""
 "Ви увійшли до облікового запису %s на Flickr.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
-#| msgid ""
-#| "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 %s remaining in your upload quota."
@@ -2280,119 +2040,107 @@ msgstr ""
 "об’єм даних, які ви можете вивантажувати протягом місяця.\n"
 "Цього місяця від вашої квоти залишилося %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 "За допомогою вашого облікового запису Flickr Pro ви зможете вивантажувати "
 "довільний об’єм даних."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "Фотографії зможе _бачити:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "Відео зможуть _бачити:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "Фотографії і відео зможуть _бачити:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "Лише друзі і родичі"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "Лише родичі"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "Лише друзі"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 × 375 пікселів"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 пікселів"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
-#| msgid "2048 x 1536 pixels"
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 пікселів"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
-#| msgid "4096 x 3072 pixels"
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 пікселів"
 
-#: 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:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Шаблон _розміру фотографій:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#| msgid ""
-#| "You are not currently logged into Picasa Web Albums.\n"
-#| "\n"
-#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
-#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
-#| "account."
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Ви не увійшли до служби вебальбомів Picasa\n"
-"\n"
-"Натисніть кнопку входу (Login) у вашій програмі для перегляду інтернету, щоб "
-"увійти до служби вебальбомів Picasa. Вам слід уповноважити інструмент "
-"Shotwell Connect, щоб встановити зв’язок програми з вашим обліковим записом "
-"вебальбомів Picasa."
+#. Add album that will push to the default feed for all the new users
+#. Activate last known album id. If none was chosen, either use the old default (Shotwell connect)
+#. or the new "Default album" album for Google Photos
+#: plugins/shotwell-publishing/PicasaPublishing.vala:96
+#: plugins/shotwell-publishing/PicasaPublishing.vala:630
+#| msgid "last album"
+msgid "Default album"
+msgstr "Типовий альбом"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Picasa can't "
-#| "continue."
+#: plugins/shotwell-publishing/PicasaPublishing.vala:291
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
-"Не виявлено потрібного для оприлюднення файла. Продовження дій з оприлюднення "
-"на Picasa неможливе."
+"Не виявлено потрібного для оприлюднення файла. Продовження дій з "
+"оприлюднення на Picasa неможливе."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Ви увійшли до облікового запису %s веб-альбомів Picasa."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Відео з’являться у:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-#| msgid "Small (640 x 480 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Малий (640 × 480 пікселів)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-#| msgid "Medium (1024 x 768 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Середній (1024 × 768 пікселів)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-#| msgid "Recommended (1600 x 1200 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Рекомендований (1600 ⨯ 1200 пікселів)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-#| msgid "Google+ (2048 x 1536 pixels)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 ⨯ 1536 пікселів)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:757
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "Початковий розмір"
 
@@ -2405,37 +2153,30 @@ msgid "User _name"
 msgstr "_Користувач"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
-#| msgid "_Remember Password"
 msgid "Remember Password"
 msgstr "Запам'ятати пароль"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
-#| msgid "An _existing category:"
 msgid "An _existing category"
 msgstr "_Вже створеній категорії"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
-#| msgid "A _new album named:"
 msgid "A _new album named"
 msgstr "_Новому альбомі з назвою:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
-#| msgid "within category:"
 msgid "within category"
 msgstr "у категорії"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
-#| msgid "Album comment:"
 msgid "Album comment"
 msgstr "Коментар до альбому"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
-#| msgid "Photos will be _visible by:"
 msgid "Photos will be _visible by"
 msgstr "Фотографії зможуть _бачити"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
-#| msgid "Photo size:"
 msgid "Photo size"
 msgstr "Розмір фотографії"
 
@@ -2454,13 +2195,12 @@ msgid "Logout"
 msgstr "Вийти"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
-#: src/Resources.vala:295 ui/collection.ui:190
+#: src/Resources.vala:296 ui/collection.ui:192
 msgid "Publish"
 msgstr "Оприлюднити"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-#| msgid "Creating album %s..."
 msgid "Creating album %s…"
 msgstr "Створюємо альбом %s…"
 
@@ -2479,8 +2219,9 @@ msgid ""
 "messages, credit card information, or passwords)."
 msgstr ""
 "Здається, це не <b>%s</b>. Зловмисники можуть спробувати викрасти або "
-"замінити інформацію, яка надходить до цього сайта або з нього (це стосується, "
-"наприклад, особистих повідомлень, даних щодо кредитних карток або паролів)."
+"замінити інформацію, яка надходить до цього сайта або з нього (це "
+"стосується, наприклад, особистих повідомлень, даних щодо кредитних карток "
+"або паролів)."
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
 #, c-format
@@ -2488,7 +2229,7 @@ msgid "Certificate of %s"
 msgstr "Сертифікат %s"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:166
+#: src/Resources.vala:167 ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "_Гаразд"
 
@@ -2541,56 +2282,60 @@ msgstr "Показати сертифікат…"
 msgid "I understand, please _proceed."
 msgstr "Зрозуміло, будь ласка, п_родовжуйте."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "Основні служби оприлюднення"
 
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-msgid "Video privacy _setting:"
-msgstr "_Конфіденційність відео:"
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Блоги:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "© BJA Electronics, 2012"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 пікселів"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
 msgid ""
-"You are not currently logged into YouTube.\n"
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr ""
+"TumblrPublisher: start( ): не вдалося розпочати; цей засіб оприлюднення не "
+"можна перезапускати."
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
 "\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
 msgstr ""
-"Ви ще не увійшли до системи веб-альбомів YouTube.\n"
+"Ви увійшли до системи Tumblr від імені %s.\n"
 "\n"
-"Щоб продовжити процес вивантаження вам слід мати зареєстрований і "
-"налаштований на використання YouTube обліковий запис Google. Для "
-"налаштування більшості облікових записів достатньо скористатися ними "
-"принаймні один раз для входу до системи YouTube."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Youtube "
-#| "can't continue."
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "_Конфіденційність відео:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
 "A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
-"Не виявлено потрібного для оприлюднення файла. Продовження дій з оприлюднення "
-"на Youtube неможливе."
+"Не виявлено потрібного для оприлюднення файла. Продовження дій з "
+"оприлюднення на Youtube неможливе."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Ви увійшли до облікового запису %s на YouTube."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-#| msgid "Videos will appear in '%s'"
-msgid "Videos will appear in “%s”"
-msgstr "Відео з’являться у «%s»"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Відкрите у списку"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Відкрите без показу у списку"
 
@@ -2627,7 +2372,6 @@ msgid "Core Slideshow Transitions"
 msgstr "Основні переходи під час показу слайдів"
 
 #: plugins/shotwell-transitions/shotwell-transitions.vala:76
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -2677,7 +2421,6 @@ msgstr "Не вдалося зробити каталог %s придатним
 
 #: src/AppDirs.vala:239
 #, c-format
-#| msgid "Unable to create cache directory %s: %s"
 msgid "Could not make directory %s writable: %s"
 msgstr "Не вдалося зробити каталог %s придатним до запису: %s"
 
@@ -2693,22 +2436,17 @@ msgstr "Зафіксувати панель відкритою"
 msgid "Leave fullscreen"
 msgstr "Вийти з повноекранного режиму"
 
-#: 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/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:303
+#: src/data_imports/DataImportsUI.vala:421 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
+#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
+#: src/Resources.vala:158 ui/slideshow_settings.ui:35
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:586
 #, c-format
-#| msgid ""
-#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
-#| "cannot continue.\n"
-#| "\n"
-#| "%s"
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
@@ -2720,22 +2458,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:600
-#| msgid "Visit the Yorba web site"
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "Відвідати сайт Shotwell"
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Не вдалося показати довідку: %s"
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Не вдалося перейти до сторінки бази даних вад: %s"
 
-#: src/AppWindow.vala:628
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Не вдалося показати сторінку поширених питань: %s"
@@ -2801,25 +2538,33 @@ msgstr "Пошкоджений файл зображення"
 msgid "Imported failed (%d)"
 msgstr "Спроба імпортування зазнала невдачі (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "Фотоапарати"
 
-#: 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
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "Список усіх виявлених пристроїв фотоапаратів"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
+#: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
 msgid "Camera"
 msgstr "Фотоапарат"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+#| msgid "%s (%d%%)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
 #: src/camera/ImportPage.vala:466
-#| msgid ""
-#| "Unable to unmount camera.  Try unmounting the camera from the file "
-#| "manager."
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
@@ -2827,38 +2572,34 @@ msgstr ""
 "фотоапарат за допомогою менеджера файлів."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "Ховати фотографії, які вже імпортовано"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "Показувати лише фотографії, які ще не було імпортовано"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 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
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Імпортувати _всі"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr ""
-"Здається, носій на фотоапараті порожній. Не виявлено фотографій або відео для "
-"імпортування."
+"Здається, носій на фотоапараті порожній. Не виявлено фотографій або відео "
+"для імпортування."
 
-#: src/camera/ImportPage.vala:861
-#| msgid "No photos/videos found"
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "На фотоапараті не виявлено нових фотографій або відео"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it.  Continue?"
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2866,19 +2607,15 @@ msgstr ""
 "Shotwell потрібно демонтувати пристрій фотоапарата з файлової системи, щоб "
 "отримати до нього доступ. Продовжити?"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "_Демонтувати"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "Будь ласка, демонтуйте пристрій фотоапарата."
 
-#: 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."
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2889,13 +2626,13 @@ msgstr ""
 "завершіть роботу будь-яких інших програм, які працюють з фотоапаратом, і "
 "повторіть спробу."
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr ""
 "Будь ласка, завершіть роботу будь-яких сторонніх програми, які працюють з "
 "фотоапаратом."
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2904,31 +2641,34 @@ msgstr ""
 "Не вдалося отримати дані мініатюр з фотоапарата:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
-#| msgid "Unmounting..."
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "Демонтування…"
 
-#: src/camera/ImportPage.vala:1160
-#| msgid "Starting import, please wait..."
+#: src/camera/ImportPage.vala:1166
+#| msgid "Starting import, please wait…"
+msgid "Connecting to camera, please wait…"
+msgstr "Встановлюємо з'єднання із фотоапаратом, зачекайте…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "Розпочинаємо імпортування, зачекайте…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "Отримання даних щодо фотографій"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Отримання мініатюри %s"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Не вдалося заблокувати пристрій фотоапарата: %s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2937,7 +2677,7 @@ msgstr[1] "Вилучити %d фотографії з фотоапарата?"
 msgstr[2] "Вилучити %d фотографій з фотоапарата?"
 msgstr[3] "Вилучити %d фотографію з фотоапарата?"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2946,7 +2686,7 @@ msgstr[1] "Вилучити %d відео з фотоапарата?"
 msgstr[2] "Вилучити %d відео з фотоапарата?"
 msgstr[3] "Вилучити %d відео з фотоапарата?"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2955,24 +2695,24 @@ msgstr[1] "Вилучити %d фотографії або відео з фот�
 msgstr[2] "Вилучити %d фотографій або відео з фотоапарата?"
 msgstr[3] "Вилучити %d фотографію або відео з фотоапарата?"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Вилучити ці %d файл з фотоапарата?"
+msgstr[0] "Вилучити цей %d файл з фотоапарата?"
 msgstr[1] "Вилучити ці %d файли з фотоапарата?"
 msgstr[2] "Вилучити ці %d файлів з фотоапарата?"
 msgstr[3] "Вилучити ці %d файл з фотоапарата?"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Не вилучати"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "Вилучення фотографій або відео з фотоапарата"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2985,132 +2725,130 @@ msgstr[2] ""
 msgstr[3] ""
 "Не вдалося вилучити з фотоапарата %d фотографію або відео через помилки."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
-#: src/PhotoPage.vala:2460 src/Resources.vala:170
-#| msgid "_Print..."
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:171
 msgid "_Print"
 msgstr "_Надрукувати"
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
-#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
-#| msgid "Send To"
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "_Надіслати…"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
-#: src/PhotoPage.vala:2470 src/Resources.vala:220
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:221
 msgid "Set as _Desktop Background"
 msgstr "Зробити _тлом стільниці"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:287
 msgid "_Duplicate"
 msgstr "_Дублювати"
 
-#: src/CollectionPage.vala:94
-#| msgid "Fulls_creen"
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "На весь екран"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "По_каз слайдів"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:140 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:145 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:150 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Віддзеркалити _горизонтально"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:153 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Віддзеркалити _вертикально"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
-#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "По_кращити"
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
-#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "Пове_рнутися до початкової"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:191 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Копіювати коригування кольорів"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:195 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Вставити коригування кольорів"
 
-#: src/CollectionPage.vala:129
-#| msgid "Adjust Date and Time"
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Скоригувати дату і час…"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
 msgid "Open With E_xternal Editor"
 msgstr "Відкрити за допомогою з_овнішнього редактора"
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
-#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
 msgid "Open With RA_W Editor"
 msgstr "Відкрити за допомогою р_едактора цифрових негативів"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
-#| msgid "Play"
+#: src/CollectionPage.vala:149 src/Resources.vala:168
 msgid "_Play"
 msgstr "_Відтворити"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:410
+#| msgid "Export Photo/Video"
 msgid "Export Photo/Video"
-msgstr "Експортувати фотографію/відео"
-
-#: src/CollectionPage.vala:409
-msgid "Export Photos/Videos"
-msgstr "Експортувати фотографії/відео"
-
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+msgid_plural "Export Photos/Videos"
+msgstr[0] "Експортувати фотографії/відео"
+msgstr[1] "Експортувати фотографії/відео"
+msgstr[2] "Експортувати фотографії/відео"
+msgstr[3] "Експортувати фотографію/відео"
+
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#| msgid "Export Photo"
 msgid "Export Photo"
-msgstr "Експортувати фотографію"
+msgid_plural "Export Photos"
+msgstr[0] "Експортувати фотографії"
+msgstr[1] "Експортувати фотографії"
+msgstr[2] "Експортувати фотографії"
+msgstr[3] "Експортувати фотографію"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "Експорт фотографій"
-
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "Обертання"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "Скасування обертання"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "Віддзеркалення горизонтально"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "Скасування горизонтального віддзеркалення"
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "Віддзеркалити вертикально"
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "Скасування вертикального віддзеркалення"
 
@@ -3176,7 +2914,7 @@ msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "Не вдалося створити дублікати %d фотографії через помилки у файлах"
 msgstr[1] "Не вдалося створити дублікати %d фотографій через помилки у файлах"
-msgstr[2] "Не вдалося створити дублікат %d фотографії через помилку у файлі"
+msgstr[2] "Не вдалося створити дублікати %d фотографії через помилку у файлі"
 msgstr[3] "Не вдалося створити дублікати %d фотографії через помилки у файлах"
 
 #: src/Commands.vala:1195
@@ -3220,8 +2958,8 @@ msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Фотографії з наведеними нижче назвами не вдалося скоригувати."
 msgstr[1] "Фотографії з наведеними нижче назвами не вдалося скоригувати."
-msgstr[2] "Не вдалося скоригувати одну фотографію."
-msgstr[3] "Фотографії з наведеними нижче назвами не вдалося скоригувати."
+msgstr[2] "Фотографії з наведеними нижче назвами не вдалося скоригувати."
+msgstr[3] "Не вдалося скоригувати одну фотографію."
 
 #: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
@@ -3238,10 +2976,10 @@ msgstr[1] ""
 "Для файлів фотографій з наведеного нижче списку не вдалося скасувати "
 "коригування часу."
 msgstr[2] ""
-"Для файла фотографії з наведеною нижче назвою не вдалося скасувати "
+"Для файлів фотографій з наведеною нижче назвою не вдалося скасувати "
 "коригування часу."
 msgstr[3] ""
-"Для файлів фотографій з наведеного нижче списку не вдалося скасувати "
+"Для файла фотографії з наведеного нижче списку не вдалося скасувати "
 "коригування часу."
 
 #: src/Commands.vala:1637 src/Commands.vala:1660
@@ -3250,7 +2988,6 @@ msgstr "Створити мітку"
 
 #: src/Commands.vala:1695
 #, c-format
-#| msgid "Move Tag \"%s\""
 msgid "Move Tag “%s”"
 msgstr "Пересунути мітку «%s»"
 
@@ -3312,7 +3049,6 @@ msgstr "База даних %s"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-#| msgid "Importing from %s can't continue because an error occurred:"
 msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "Неможливо продовжувати імпортування з %s, оскільки сталася помилка:"
 
@@ -3340,7 +3076,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Файл бази даних:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "_Імпортувати"
 
@@ -3352,7 +3088,7 @@ msgstr "Імпортування з програми"
 msgid "Import media _from:"
 msgstr "Імпортувати дані _з:"
 
-#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
 msgid "_Close"
 msgstr "За_крити"
 
@@ -3392,9 +3128,6 @@ msgstr ""
 
 #: src/db/DatabaseTable.vala:92
 #, c-format
-#| msgid ""
-#| "Unable to write to photo database file:\n"
-#| " %s"
 msgid "Unable to restore photo database %s"
 msgstr "Не вдалося відновити базу даних фотографій %s"
 
@@ -3419,25 +3152,22 @@ msgstr "Не вдалося створити показ слайдів на ст
 
 #: src/Dialogs.vala:16
 #, c-format
-#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
 msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Буде вилучено мітку «%s» з %d фотографії. Продовжувати?"
 msgstr[1] "Буде вилучено мітку «%s» з %d фотографій. Продовжувати?"
 msgstr[2] "Буде вилучено мітку «%s» з %d фотографій. Продовжувати?"
-msgstr[3] "Буде вилучено мітку «%s» з %d фотографії. Продовжувати?"
+msgstr[3] "Буде вилучено мітку «%s» з однієї фотографії. Продовжувати?"
 
 #: 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
+#: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "В_илучити"
 
 #: src/Dialogs.vala:25
 #, c-format
-#| msgid "This will remove the saved search \"%s\".  Continue?"
 msgid "This will remove the saved search “%s”. Continue?"
 msgstr ""
 "У результаті виконання дії буде вилучено збережений пошук «%s». Продовжити?"
@@ -3451,7 +3181,7 @@ msgid_plural ""
 "Shotwell"
 msgstr[0] ""
 "Перемикання обробника призведе до скасування всіх змін, які було внесено у "
-"цю фотографію за допомогою Shotwell"
+"ці фотографії за допомогою Shotwell"
 msgstr[1] ""
 "Перемикання обробника призведе до скасування всіх змін, які було внесено у "
 "ці фотографії за допомогою Shotwell"
@@ -3470,6 +3200,10 @@ msgstr "П_еремкнути обробник"
 msgid "Export Video"
 msgstr "Експортування відео"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "Експорт фотографій"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3477,9 +3211,6 @@ msgstr "Експортування відео"
 #. Yes - display an alternate error message here.
 #: src/Dialogs.vala:112
 #, c-format
-#| msgid ""
-#| "Shotwell couldn't create a file for editing this photo because you do not "
-#| "have permission to write to %s."
 msgid ""
 "Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
@@ -3506,6 +3237,10 @@ msgstr ""
 "\n"
 "Бажаєте продовжити експортування?"
 
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+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."
@@ -3531,17 +3266,14 @@ msgid "_Scaling constraint:"
 msgstr "Обмеження _масштабування:"
 
 #: src/Dialogs.vala:230
-#| msgid " _pixels"
 msgid "_Pixels:"
 msgstr "_Пікселі:"
 
 #: src/Dialogs.vala:234
-#| msgid "Export metadata"
 msgid "Export _metadata:"
 msgstr "Експорт _метаданих:"
 
 #: src/Dialogs.vala:478
-#| msgid "Save Details"
 msgid "Save Details…"
 msgstr "Зберегти параметри…"
 
@@ -3604,8 +3336,6 @@ msgstr "повідомлення про помилку:"
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
 #: src/Dialogs.vala:595
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Файли, які не було імпортовано через те, що ці файли не є файлами фотографій "
@@ -3615,9 +3345,6 @@ msgstr ""
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
 #: src/Dialogs.vala:610
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3629,9 +3356,6 @@ msgstr ""
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
 #: src/Dialogs.vala:625
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3641,9 +3365,6 @@ msgstr ""
 
 #: src/Dialogs.vala:629
 #, c-format
-#| msgid ""
-#| "couldn't copy %s\n"
-#| "\tto %s"
 msgid ""
 "couldn’t copy %s\n"
 "\tto %s"
@@ -4063,7 +3784,7 @@ msgstr[3] "%d година"
 msgid "1 day"
 msgstr "1 день"
 
-#: src/Dialogs.vala:1317 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "Перейменувати подію"
 
@@ -4073,7 +3794,6 @@ msgstr "Назва:"
 
 #. Dialog title
 #: src/Dialogs.vala:1328
-#| msgid "Edit Title"
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Змінити заголовок"
@@ -4083,7 +3803,7 @@ msgid "Title:"
 msgstr "Заголовок:"
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "Змінити коментар до події"
 
@@ -4096,8 +3816,6 @@ msgid "Comment:"
 msgstr "Коментар:"
 
 #: src/Dialogs.vala:1363
-#| msgid "_Trash File"
-#| msgid_plural "_Trash Files"
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Вилучити файли до с_мітника"
@@ -4106,7 +3824,6 @@ msgstr[2] "Вилучити файли до с_мітника"
 msgstr[3] "Вилучити файл до с_мітника"
 
 #: src/Dialogs.vala:1367
-#| msgid "Remove From Library"
 msgid "_Remove From Library"
 msgstr "Ви_лучити з бібліотеки"
 
@@ -4120,9 +3837,6 @@ msgstr "Скасувати зовнішні зміни?"
 
 #: src/Dialogs.vala:1412
 #, 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?"
@@ -4149,8 +3863,6 @@ msgstr "С_касувати зовнішні зміни"
 
 #: 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?"
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "З бібліотеки буде вилучено %d фотографію. Продовжувати?"
@@ -4158,7 +3870,7 @@ msgstr[1] "З бібліотеки буде вилучено %d фотограф
 msgstr[2] "З бібліотеки буде вилучено %d фотографій. Продовжувати?"
 msgstr[3] "З бібліотеки буде вилучено %d фотографію. Продовжувати?"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:174
 msgid "_Remove"
 msgstr "В_илучити"
 
@@ -4196,7 +3908,6 @@ msgid "Set _all photos/videos to this time"
 msgstr "Встановити цей час для всі_х фотографій або відео"
 
 #: src/Dialogs.vala:1725
-#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
 msgid_plural "_Modify original photo files"
 msgstr[0] "З_мінити початкові файли фотографій"
@@ -4205,7 +3916,6 @@ msgstr[2] "З_мінити початкові файли фотографій"
 msgstr[3] "З_мінити початковий файл фотографії"
 
 #: src/Dialogs.vala:1729
-#| msgid "_Modify original file"
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "З_мінити початковий файл"
@@ -4346,7 +4056,6 @@ msgid "You can also import photos in any of these ways:"
 msgstr "Крім того, ви можете імпортувати фотографії у один з таких способів:"
 
 #: src/Dialogs.vala:2152
-#| msgid "_Don't show this message again"
 msgid "_Don’t show this message again"
 msgstr "_Не показувати надалі це повідомлення"
 
@@ -4358,41 +4067,41 @@ msgstr "Імпортувати фотографії з вашої бібліот
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
+#: src/Dialogs.vala:2373 src/Dialogs.vala:2377
 msgid "(Help)"
 msgstr "(Довідка)"
 
-#: src/Dialogs.vala:2346
+#: src/Dialogs.vala:2381
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Рік%sМісяць%sДень"
 
-#: src/Dialogs.vala:2348
+#: src/Dialogs.vala:2383
 #, c-format
 msgid "Year%sMonth"
 msgstr "Рік%sМісяць"
 
-#: src/Dialogs.vala:2350
+#: src/Dialogs.vala:2385
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Рік%sМісяць-День"
 
-#: src/Dialogs.vala:2352
+#: src/Dialogs.vala:2387
 msgid "Year-Month-Day"
 msgstr "Рік-Місяць-День"
 
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#: src/Dialogs.vala:2388 src/editing_tools/EditingTools.vala:760
 msgid "Custom"
 msgstr "Нетиповий"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2590
+#: src/Dialogs.vala:2627
 msgid "Invalid pattern"
 msgstr "Некоректний шаблон"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2731
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4400,42 +4109,32 @@ msgstr ""
 "Shotwell може копіювати файли фотографій до вашої теки бібліотеки або може "
 "просто імпортувати їх без безпосереднього копіювання."
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:2736
 msgid "Co_py Photos"
 msgstr "_Копіювати фотографії"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:2737
 msgid "_Import in Place"
 msgstr "І_мпортувати сюди"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:2738
 msgid "Import to Library"
 msgstr "Імпорт до бібліотеки"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2748 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Вилучити з бібліотеки"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2749 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Вилучення фотографії з бібліотеки"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2749
 msgid "Removing Photos From Library"
 msgstr "Вилучення фотографій з бібліотеки"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:2763
 #, 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"
@@ -4465,24 +4164,14 @@ msgstr[2] ""
 "\n"
 "Результати виконання дії не можна буде скасувати."
 msgstr[3] ""
-"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено %d "
-"фотографію або відео. Бажаєте, щоб програма пересунула файл вилучених "
+"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено"
+" фотографію або відео. Бажаєте, щоб програма пересунула файл вилучених "
 "фотографій до теки смітника?\n"
 "\n"
 "Результати виконання дії не можна буде скасувати."
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:2767
 #, 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"
@@ -4512,24 +4201,14 @@ msgstr[2] ""
 "\n"
 "Результати виконання дії не можна буде скасувати."
 msgstr[3] ""
-"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено %d "
-"відео. Бажаєте, щоб програма пересунула файл вилучених фотографій до теки "
+"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено одне"
+" відео. Бажаєте, щоб програма пересунула файл вилучених фотографій до теки "
 "смітника?\n"
 "\n"
 "Результати виконання дії не можна буде скасувати."
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:2771
 #, 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"
@@ -4554,25 +4233,19 @@ msgstr[1] ""
 "Результати виконання дії не можна буде скасувати."
 msgstr[2] ""
 "Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено %d "
-"фотографію. Бажаєте, щоб програма пересунула файл вилученої фотографії до "
+"фотографій. Бажаєте, щоб програма пересунула файл вилученої фотографії до "
 "теки смітника?\n"
 "\n"
 "Результати виконання дії не можна буде скасувати."
 msgstr[3] ""
-"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено %d "
-"фотографію. Бажаєте, щоб програма пересунула файл вилучених фотографій до "
+"Внаслідок виконання цієї дії з вашої бібліотеки Shotwell буде вилучено одну"
+" фотографію. Бажаєте, щоб програма пересунула файл вилучених фотографій до "
 "теки смітника?\n"
 "\n"
 "Результати виконання дії не можна буде скасувати."
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:2803
 #, c-format
-#| msgid ""
-#| "The photo or video cannot be moved to your desktop trash.  Delete this "
-#| "file?"
-#| msgid_plural ""
-#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
-#| "files?"
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
@@ -4584,14 +4257,14 @@ msgstr[1] ""
 "%d файли фотографій або відеофайли не вдалося пересунути до теки смітника "
 "стільниці. Вилучити ці файли?"
 msgstr[2] ""
-"%d файл фотографії або відеофайл не вдалося пересунути до теки смітника "
+"%d файлів фотографій або відеофайлів не вдалося пересунути до теки смітника "
 "стільниці. Вилучити цей файл?"
 msgstr[3] ""
-"%d файл фотографій або відеофайл не вдалося пересунути до теки смітника "
+"Один файл фотографії або відеофайл не вдалося пересунути до теки смітника "
 "стільниці. Вилучити ці файли?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:2820
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4629,262 +4302,237 @@ msgstr ""
 
 #: src/direct/DirectPhotoPage.vala:120
 #, c-format
-#| msgid ""
-#| "Unable to print photo:\n"
-#| "\n"
-#| "%s"
 msgid "Unable open photo %s. Sorry."
 msgstr "Не вдалося відкрити фотографію %s. Вибачте."
 
-#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
 msgid "_Save"
 msgstr "З_берегти"
 
-#: src/direct/DirectPhotoPage.vala:304
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "_Зберегти копію"
 
-#: src/direct/DirectPhotoPage.vala:307
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Відкинути зміни до %s?"
 
-#: src/direct/DirectPhotoPage.vala:308
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "_Не зберігати"
 
-#: src/direct/DirectPhotoPage.vala:341
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Помилка під час спроби збереження до %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Зберегти як"
 
 #. verify this is a directory
-#: src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:891
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Неможливо стежити за %s: це не каталог (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "Повернутися до поточних розмірів фотографії"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "Встановити параметри обрізання цієї фотографії"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 "Перемикач прямокутника обрізання між книжковою та альбомною орієнтацією"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "Без обмеження"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "Квадрат"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "Екран"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
-#| msgid "SD Video (4 : 3)"
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "Стандартне відео (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
-#| msgid "HD Video (16 : 9)"
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "Відео високої роздільності (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
-#| msgid "Wallet (2 x 3 in.)"
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Записник (2 ⨯ 3 дюйми)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
-#| msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Картка (3 ⨯ 5 дюймів)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
-#| msgid "4 x 6 in."
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 дюймів"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
-#| msgid "5 x 7 in."
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 дюймів"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
-#| msgid "8 x 10 in."
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 дюймів"
 
-#: src/editing_tools/EditingTools.vala:767
-#| msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Лист (8,5 ⨯ 11 дюймів)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
-#| msgid "11 x 14 in."
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 дюймів"
 
-#: src/editing_tools/EditingTools.vala:769
-#| msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Таблоїд (11 ⨯ 17 дюймів)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
-#| msgid "16 x 20 in."
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 дюймів"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
-#| msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Записник (9 ⨯ 13 см)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
-#| msgid "Postcard (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Листівка (10 ⨯ 15 см)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
-#| msgid "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 см"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
-#| msgid "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 см"
 
-#: src/editing_tools/EditingTools.vala:776
-#| msgid "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 мм)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
-#| msgid "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 см"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
-#| msgid "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 см"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
-#| msgid "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 см"
 
-#: src/editing_tools/EditingTools.vala:780
-#| msgid "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 ⨯ 420 мм)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "Розмір:"
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "Закрити вікно інструменту усування ефекту «червоних очей»"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Вилучити будь-які наслідки ефекту «червоних очей» у позначеній області"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "Від_новити"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Експозиція:"
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "Контрастність:"
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "Насиченість:"
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "Відтінок:"
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "Тіні:"
 
-#: src/editing_tools/EditingTools.vala:2307
+#: src/editing_tools/EditingTools.vala:2285
 msgid "Highlights:"
 msgstr "Підсвічування:"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset Colors"
 msgstr "Відновити кольори"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2341
 msgid "Reset all color adjustments to original"
 msgstr "Скасувати будь-які зміни кольорів і повернутися до початкових значень"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2700
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2712
 msgid "Tint"
 msgstr "Затінення"
 
-#: src/editing_tools/EditingTools.vala:2746
-#| msgid "Contrast Expansion"
+#: src/editing_tools/EditingTools.vala:2724
 msgid "Contrast"
 msgstr "Контрастність"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2738
 msgid "Saturation"
 msgstr "Насиченість"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2751
 msgid "Exposure"
 msgstr "Експозиція"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2764
 msgid "Shadows"
 msgstr "Тіні"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2777
 msgid "Highlights"
 msgstr "Підсвічування"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2787
 msgid "Contrast Expansion"
 msgstr "Розширення контрастності"
 
@@ -4892,16 +4540,12 @@ msgstr "Розширення контрастності"
 msgid "Angle:"
 msgstr "Кут:"
 
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:203
 #: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Розтягнути"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Події"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
@@ -4910,7 +4554,7 @@ msgstr[1] "%d фотографії/відео"
 msgstr[2] "%d фотографій/відео"
 msgstr[3] "%d фотографія/відео"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
@@ -4919,7 +4563,7 @@ msgstr[1] "%d відео"
 msgstr[2] "%d відео"
 msgstr[3] "%d відео"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4932,28 +4576,35 @@ msgstr[3] "%d фотографія"
 msgid "No Event"
 msgstr "Без події"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "Події"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "Навігація списком подій"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "Немає подій"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "Подій не виявлено"
 
-#: src/events/EventsDirectoryPage.vala:227
-#| msgid "Events"
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "Всі події"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "Оновлено"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%B"
 
@@ -4974,7 +4625,6 @@ msgstr "Експортування"
 
 #: src/Exporter.vala:317
 #, c-format
-#| msgid "File %s already exists.  Replace?"
 msgid "File %s already exists. Replace?"
 msgstr "Файл з назвою %s вже існує. Замінити його?"
 
@@ -4994,30 +4644,24 @@ msgstr "Замінити вс_і"
 msgid "Export"
 msgstr "Експорт"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "Теки"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "Бібліотека"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "Навігація структурою тек бібліотеки"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "Фотографії"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "Позначені"
 
 #: src/library/ImportQueuePage.vala:8
-#| msgid "Importing"
 msgid "Importing…"
 msgstr "Імпортування…"
 
 #: src/library/ImportQueuePage.vala:129
-#| msgid "Preparing to import"
 msgid "Preparing to import…"
 msgstr "Приготування до імпортування…"
 
@@ -5030,20 +4674,37 @@ msgstr "Імпортовано %s"
 msgid "Last Import"
 msgstr "Попереднє імпортування"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "Бібліотека"
+
+#: src/library/LibraryBranch.vala:30
+#| msgid "Organize your photos"
+msgid "Organize and browse your photos"
+msgstr "Впорядкуйте ваші фотографії і переглядайте їх"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "Фотографії"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "Імпортувати з теки"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "Рекурсивно у підтеках"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Спорожнити смітник"
 
-#: src/library/LibraryWindow.vala:576
-#| msgid "Emptying Trash..."
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "Спорожнення смітника…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -5057,37 +4718,33 @@ msgstr ""
 "\"bold\">Зміни %s Налаштування</span>.\n"
 "Хочете продовжити імпортування фотографій?"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "Розташування бібліотеки"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "Імпорт фотографій з цього каталогу неможливий."
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
-#| msgid "Updating library..."
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "Оновлення бібліотеки…"
 
-#: src/library/LibraryWindow.vala:1129
-#| msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "Приготування до автоматичного імпортування фотографій…"
 
-#: src/library/LibraryWindow.vala:1134
-#| msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "Автоматичне імпортування фотографій…"
 
-#: src/library/LibraryWindow.vala:1142
-#| msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "Запис метаданих до файлів…"
 
@@ -5096,7 +4753,6 @@ msgid "Missing Files"
 msgstr "Немає файлів"
 
 #: src/library/OfflinePage.vala:110
-#| msgid "Deleting..."
 msgid "Deleting…"
 msgstr "Вилучення…"
 
@@ -5104,24 +4760,20 @@ msgstr "Вилучення…"
 msgid "Trash"
 msgstr "Смітник"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "Смітник порожній"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "Вилучення фотографій"
 
 #: src/main.vala:54
 #, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please use the latest version of Shotwell."
 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 "
@@ -5133,10 +4785,6 @@ msgstr ""
 
 #: src/main.vala:59
 #, c-format
-#| msgid ""
-#| "Shotwell was unable to upgrade your photo library from version %s (schema "
-#| "%d) to %s (schema %d).  For more information please check the Shotwell "
-#| "Wiki at %s"
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
 "%d) to %s (schema %d). For more information please check the Shotwell Wiki "
@@ -5148,11 +4796,6 @@ msgstr ""
 
 #: src/main.vala:65
 #, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please clear your library by deleting %s and re-import your "
-#| "photos."
 msgid ""
 "Your photo library is not compatible with this version of Shotwell. It "
 "appears it was created by Shotwell %s (schema %d). This version is %s "
@@ -5166,7 +4809,6 @@ msgstr ""
 
 #: src/main.vala:71
 #, c-format
-#| msgid "Unknown error attempting to verify Shotwell's database: %s"
 msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Невідома помилка під час спроби перевірки бази даних Shotwell: %s"
 
@@ -5174,38 +4816,37 @@ msgstr "Невідома помилка під час спроби переві�
 msgid "Loading Shotwell"
 msgstr "Завантаження Shotwell"
 
-#: src/main.vala:294
-#| msgid "Path to Shotwell's private data"
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Шлях до конфіденційних даних Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "КАТАЛОГ"
 
-#: src/main.vala:298
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Не стежити за змінами у каталозі бібліотеки під час роботи програми"
 
-#: src/main.vala:302
-#| msgid "Don't display startup progress meter"
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "Не показувати панель поступу під час завантаження"
 
-#: src/main.vala:306
-#| msgid "Show the application's version"
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "Показати дані щодо версії програми"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "Запускати програму у повноекранному режимі"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[ФАЙЛ]"
 
-#: src/main.vala:342
+#: src/main.vala:360
 #, 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 ""
 "Щоб переглянути повний список можливих параметрів командного рядка, віддайте "
@@ -5220,7 +4861,7 @@ msgstr "Не вдалося обробити поточні оновлення:
 msgid "Adjust the size of the thumbnails"
 msgstr "Скоригувати розміри мініатюр"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -5229,36 +4870,36 @@ msgstr ""
 "Shotwell не вдалося відтворити позначені відео:\n"
 "%s"
 
-#: src/Page.vala:1312
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "Немає фотографій або відео"
 
-#: src/Page.vala:1316
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 "Не знайдено фотографій або відео, які відповідають поточним умовам "
 "фільтрування"
 
-#: src/Page.vala:2622
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "Експорт фотографій до цього каталогу неможливий."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Попередня фотографія"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Наступна фотографія"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Не виявлено файла джерела фотографії: %s"
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Не вдалося експортувати %s: %s"
@@ -5303,7 +4944,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "змінено"
 
@@ -5335,24 +4976,15 @@ msgstr "16 зображень на сторінку"
 msgid "32 images per page"
 msgstr "32 зображення на сторінку"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "дюйми"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "см"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Параметри зображення"
 
-#: src/Printing.vala:889
-#| msgid "Printing..."
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Друк…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5381,7 +5013,7 @@ msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d подія"
 msgstr[1] "%d події"
-msgstr[2] "%d подія"
+msgstr[2] "%d подій"
 msgstr[3] "%d подія"
 
 #. display only one date if start and end are the same
@@ -5497,7 +5129,6 @@ msgstr "Вивантаження %d з %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
 msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "Неможливо продовжувати оприлюднення на %s, оскільки сталася помилка:"
 
@@ -5510,68 +5141,64 @@ msgstr ""
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
 #: src/publishing/PublishingUI.vala:104
-#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "Позначені відео було успішно оприлюднено."
 msgstr[1] "Позначені відео було успішно оприлюднено."
 msgstr[2] "Позначені відео було успішно оприлюднено."
-msgstr[3] "Позначені відео було успішно оприлюднено."
+msgstr[3] "Позначене відео було успішно оприлюднено."
 
 #: 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] "Позначені фотографії було успішно оприлюднено."
 msgstr[1] "Позначені фотографії було успішно оприлюднено."
 msgstr[2] "Позначені фотографії було успішно оприлюднено."
-msgstr[3] "Позначені фотографії було успішно оприлюднено."
+msgstr[3] "Позначену фотографію було успішно оприлюднено."
 
 #: src/publishing/PublishingUI.vala:115
 msgid "The selected photos/videos were successfully published."
 msgstr "Позначені фотографії або відео було успішно оприлюднено."
 
 #: src/publishing/PublishingUI.vala:127
-#| msgid "Fetching account information..."
 msgid "Fetching account information…"
 msgstr "Отримання відомостей щодо облікового запису…"
 
 #: src/publishing/PublishingUI.vala:133
-#| msgid "Logging in..."
 msgid "Logging in…"
 msgstr "Вхід до системи…"
 
-#: src/publishing/PublishingUI.vala:193
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish Photos"
 msgstr "Оприлюднення фотографій"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish photos _to:"
 msgstr "Оприлюднити фотографії _на:"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish Videos"
 msgstr "Оприлюднення відео"
 
-#: src/publishing/PublishingUI.vala:197
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish videos _to"
 msgstr "Оприлюднити відео _на"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish Photos and Videos"
 msgstr "Оприлюднення фотографій і відео"
 
-#: src/publishing/PublishingUI.vala:200
+#: src/publishing/PublishingUI.vala:202
 msgid "Publish photos and videos _to"
 msgstr "Оприлюднити фотографії і відео _на:"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:410
+#: src/publishing/PublishingUI.vala:412
 msgid "Unable to publish"
 msgstr "Не вдалося оприлюднити"
 
-#: src/publishing/PublishingUI.vala:411
+#: src/publishing/PublishingUI.vala:413
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5588,639 +5215,599 @@ msgstr ""
 msgid "Publishing"
 msgstr "Оприлюднення"
 
-#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
+#: src/Resources.vala:141 src/Resources.vala:146 ui/collection.ui:151
 msgid "Rotate"
 msgstr "Обертати"
 
-#: src/Resources.vala:141
+#: src/Resources.vala:142
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: src/Resources.vala:142 ui/collection.ui:146
+#: src/Resources.vala:143 ui/collection.ui:148
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Обернути фотографії праворуч (натисніть Ctrl для обертання ліворуч)"
 
-#: src/Resources.vala:146
+#: src/Resources.vala:147
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
-#: src/Resources.vala:147
+#: src/Resources.vala:148
 msgid "Rotate the photos left"
 msgstr "Обернути фотографії ліворуч"
 
-#: src/Resources.vala:150
+#: src/Resources.vala:151
 msgid "Flip Horizontally"
 msgstr "Віддзеркалити горизонтально"
 
-#: src/Resources.vala:153
+#: src/Resources.vala:154
 msgid "Flip Vertically"
 msgstr "Віддзеркалити вертикально"
 
-#: 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
+#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
+#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "_Про програму"
 
-#: src/Resources.vala:156
+#: src/Resources.vala:157
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: src/Resources.vala:160 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
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "З_міни"
 
-#: src/Resources.vala:160
-#| msgid "_Format:"
+#: src/Resources.vala:161
 msgid "_Forward"
 msgstr "_Далі"
 
-#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: src/Resources.vala:162 ui/direct.ui:62 ui/events_directory.ui:125
 #: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "На весь _екран"
 
-#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
-#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
-#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
-#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
-#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
+#: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Довідка"
 
-#: src/Resources.vala:163
+#: src/Resources.vala:164
 msgid "Leave _Fullscreen"
 msgstr "Вийти з _повноекранного режиму"
 
-#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
+#: src/Resources.vala:165 src/Resources.vala:364 ui/tags.ui:450
 msgid "_New"
 msgstr "С_творити"
 
-#: src/Resources.vala:165
-#| msgid "Next"
+#: src/Resources.vala:166
 msgid "_Next"
 msgstr "_Далі"
 
-#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: src/Resources.vala:169 src/Resources.vala:318 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 "_Налаштування"
 
-#: src/Resources.vala:169
-#| msgid "_Previous Photo"
+#: src/Resources.vala:170
 msgid "_Previous"
 msgstr "_Назад"
 
-#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: src/Resources.vala:172 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 "Ви_йти"
 
-#: src/Resources.vala:172
+#: src/Resources.vala:173
 msgid "_Refresh"
 msgstr "_Оновити"
 
-#: src/Resources.vala:174
-#| msgid "Reverting"
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr "_Відновити"
 
-#: src/Resources.vala:176
-#| msgid "Save As"
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr "Зберегти _як"
 
-#: src/Resources.vala:177
-#| msgid "_Ascending"
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr "Впорядкувати за з_ростанням"
 
-#: src/Resources.vala:178
-#| msgid "D_escending"
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr "Впорядкувати за сп_аданням"
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr "З_упинити"
 
-#: src/Resources.vala:180
-#| msgid "_Delete"
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr "Від_новити"
 
-#: src/Resources.vala:181
-#| msgid "Original Size"
+#: src/Resources.vala:182
 msgid "_Normal Size"
 msgstr "З_вичайний розмір"
 
-#: src/Resources.vala:182
+#: src/Resources.vala:183
 msgid "Best _Fit"
 msgstr "П_ідібрати розмір"
 
-#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: src/Resources.vala:184 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:74 ui/event.ui:265 ui/media.ui:265
+#: src/Resources.vala:185 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
 #: ui/photo.ui:149 ui/tags.ui:265
 msgid "Zoom _Out"
 msgstr "З_меншити"
 
-#: src/Resources.vala:187 ui/collection.ui:165
+#: src/Resources.vala:188 ui/collection.ui:167
 msgid "Enhance"
 msgstr "Підвищити якість"
 
-#: src/Resources.vala:188 ui/collection.ui:162
-#| msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:189 ui/collection.ui:164
 msgid "Automatically improve the photo’s appearance"
 msgstr "Автоматично покращити вигляд фотографій"
 
-#: src/Resources.vala:191
+#: src/Resources.vala:192
 msgid "Copy Color Adjustments"
 msgstr "Копіювати коригування кольорів"
 
-#: src/Resources.vala:192
+#: src/Resources.vala:193
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Копіювати коригування кольорів, застосоване до фотографії"
 
-#: src/Resources.vala:195
+#: src/Resources.vala:196
 msgid "Paste Color Adjustments"
 msgstr "Вставити коригування кольорів"
 
-#: src/Resources.vala:196
+#: src/Resources.vala:197
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Застосувати скопійоване коригування кольорів до позначених фотографій"
 
-#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
+#: src/Resources.vala:199 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Обрізати"
 
-#: src/Resources.vala:199
+#: src/Resources.vala:200
 msgid "Crop"
 msgstr "Обрізати"
 
-#: src/Resources.vala:200
-#| msgid "Crop the photo's size"
+#: src/Resources.vala:201
 msgid "Crop the photo’s size"
 msgstr "Обрізати фотографію"
 
-#: src/Resources.vala:203
+#: src/Resources.vala:204
 msgid "Straighten"
 msgstr "Розтягнути"
 
-#: src/Resources.vala:204
+#: src/Resources.vala:205
 msgid "Straighten the photo"
 msgstr "Виправити фотографію"
 
-#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
+#: src/Resources.vala:207 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Усування червоних очей"
 
-#: src/Resources.vala:207
+#: src/Resources.vala:208
 msgid "Red-eye"
 msgstr "Червоні очі"
 
-#: src/Resources.vala:208
+#: src/Resources.vala:209
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr ""
 "Зменшити або усунути будь-які наслідки ефекту «червоних очей» на фотографії"
 
-#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
+#: src/Resources.vala:211 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "С_коригувати"
 
-#: src/Resources.vala:211
+#: src/Resources.vala:212
 msgid "Adjust"
 msgstr "Скоригувати"
 
-#: src/Resources.vala:212
-#| msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:213
 msgid "Adjust the photo’s color and tone"
 msgstr "Скоригувати колір і тон фотографії"
 
-#: src/Resources.vala:215
+#: src/Resources.vala:216
 msgid "Revert to Original"
 msgstr "Повернутися до початкової"
 
-#: src/Resources.vala:217
+#: src/Resources.vala:218
 msgid "Revert External E_dits"
 msgstr "Скасувати зовнішні з_міни"
 
-#: src/Resources.vala:218
+#: src/Resources.vala:219
 msgid "Revert to the master photo"
 msgstr "Повернутися до початкової фотографії"
 
-#: src/Resources.vala:221
+#: src/Resources.vala:222
 msgid "Set selected image to be the new desktop background"
 msgstr "Зробити позначене зображення новим зображенням тла стільниці"
 
-#: src/Resources.vala:222
-#| msgid "Set as Desktop Slideshow"
+#: src/Resources.vala:223
 msgid "Set as _Desktop Slideshow…"
 msgstr "Зробити _показом слайдів стільниці…"
 
-#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: src/Resources.vala:225 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 "В_ернути"
 
-#: src/Resources.vala:225
+#: src/Resources.vala:226
 msgid "Undo"
 msgstr "Вернути"
 
-#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: src/Resources.vala:228 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 "Повт_орити"
 
-#: src/Resources.vala:228
+#: src/Resources.vala:229
 msgid "Redo"
 msgstr "Повторити"
 
-#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
-#: ui/event.ui:391 ui/event.ui:584
-#| msgid "Rename Event"
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:393 ui/event.ui:588
 msgid "Re_name Event…"
 msgstr "Пере_йменувати подію…"
 
-#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
+#: src/Resources.vala:234 ui/event.ui:373 ui/event.ui:580
 msgid "Make _Key Photo for Event"
 msgstr "Зробити _ключовою фотографією події"
 
-#: src/Resources.vala:234
+#: src/Resources.vala:235
 msgid "Make Key Photo for Event"
 msgstr "Зробити ключовою фотографією події"
 
-#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
+#: src/Resources.vala:237 ui/event.ui:382 ui/media.ui:376 ui/tags.ui:376
 msgid "_New Event"
 msgstr "С_творити запис події"
 
-#: src/Resources.vala:237
+#: src/Resources.vala:238
 msgid "New Event"
 msgstr "Створити запис події"
 
-#: src/Resources.vala:239
+#: src/Resources.vala:240
 msgid "Move Photos"
 msgstr "Пересунути фотографії"
 
-#: src/Resources.vala:240
+#: src/Resources.vala:241
 msgid "Move photos to an event"
 msgstr "Пересунути фотографії до події"
 
-#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
+#: src/Resources.vala:243 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Об’єднати події"
 
-#: src/Resources.vala:243
+#: src/Resources.vala:244
 msgid "Merge"
 msgstr "Об’єднати"
 
-#: src/Resources.vala:244
+#: src/Resources.vala:245
 msgid "Combine events into a single event"
 msgstr "Поєднати події у спільну групу подій"
 
-#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: src/Resources.vala:247 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:478
 #: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Оцінити"
 
-#: src/Resources.vala:247
+#: src/Resources.vala:248
 msgid "Set Rating"
 msgstr "Оцінити"
 
-#: src/Resources.vala:248
+#: src/Resources.vala:249
 msgid "Change the rating of your photo"
 msgstr "Змінити оцінку вашої фотографії"
 
-#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: src/Resources.vala:251 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:511
 #: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "З_більшити"
 
-#: src/Resources.vala:251
+#: src/Resources.vala:252
 msgid "Increase Rating"
 msgstr "Збільшити оцінку"
 
-#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: src/Resources.vala:254 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:515
 #: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "З_меншити"
 
-#: src/Resources.vala:254
+#: src/Resources.vala:255
 msgid "Decrease Rating"
 msgstr "Зменшити оцінку"
 
-#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: src/Resources.vala:257 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:501
 #: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Без оцінки"
 
-#: src/Resources.vala:257
+#: src/Resources.vala:258
 msgid "Unrated"
 msgstr "Без оцінки"
 
-#: src/Resources.vala:258
+#: src/Resources.vala:259
 msgid "Rate Unrated"
 msgstr "Оцінити фотографії без оцінки"
 
-#: src/Resources.vala:259
+#: src/Resources.vala:260
 msgid "Setting as unrated"
 msgstr "Зняти оцінки"
 
-#: src/Resources.vala:260
+#: src/Resources.vala:261
 msgid "Remove any ratings"
 msgstr "Вилучити всі оцінки"
 
-#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: src/Resources.vala:263 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:505
 #: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "Від_кинуті"
 
-#: src/Resources.vala:263
+#: src/Resources.vala:264
 msgid "Rejected"
 msgstr "Відкинуто"
 
-#: src/Resources.vala:264
+#: src/Resources.vala:265
 msgid "Rate Rejected"
 msgstr "Оцінку відкинуто"
 
-#: src/Resources.vala:265
+#: src/Resources.vala:266
 msgid "Setting as rejected"
 msgstr "Позначити як відкинуту"
 
-#: src/Resources.vala:266
+#: src/Resources.vala:267
 msgid "Set rating to rejected"
 msgstr "Позначити оцінку як відкинуту"
 
-#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: src/Resources.vala:269 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 "Лише від_кинуті"
 
-#: src/Resources.vala:269
+#: src/Resources.vala:270
 msgid "Rejected Only"
 msgstr "Лише відкинуті"
 
-#: src/Resources.vala:270
+#: src/Resources.vala:271
 msgid "Show only rejected photos"
 msgstr "Показати лише відкинуті фотографії"
 
-#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: src/Resources.vala:273 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 "Всі + в_ідкинуті"
 
-#: src/Resources.vala:273
-#| msgid "Show all photos, including rejected"
+#: src/Resources.vala:274
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Показати всі фотографії, зокрема відкинуті"
 
-#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: src/Resources.vala:276 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 "Вс_і фотографії"
 
 #. Button tooltip
-#: src/Resources.vala:277
+#: src/Resources.vala:278
 msgid "Show all photos"
 msgstr "Показати всі фотографії"
 
-#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: src/Resources.vala:280 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
 #: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Оцінки"
 
-#: src/Resources.vala:280
-#| msgid "Display each photo's rating"
+#: src/Resources.vala:281
 msgid "Display each photo’s rating"
 msgstr "Показувати оцінки всіх фотографій"
 
-#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: src/Resources.vala:283 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 "_Фільтрувати фотографії"
 
-#: src/Resources.vala:283
+#: src/Resources.vala:284
 msgid "Filter Photos"
 msgstr "Фільтрувати фотографії"
 
-#: src/Resources.vala:284
+#: src/Resources.vala:285
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Обмежити кількість показаних фотографій за допомогою фільтра"
 
-#: src/Resources.vala:287
+#: src/Resources.vala:288
 msgid "Duplicate"
 msgstr "Дублювати"
 
-#: src/Resources.vala:288
+#: src/Resources.vala:289
 msgid "Make a duplicate of the photo"
 msgstr "Створити дублікат фотографії"
 
-#: src/Resources.vala:290
-#| msgid "Export"
+#: src/Resources.vala:291 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Експортувати…"
 
-#: src/Resources.vala:292
-#| msgid "_Print..."
+#: src/Resources.vala:293
 msgid "_Print…"
 msgstr "Над_рукувати…"
 
-#: src/Resources.vala:294
-#| msgid "Publish"
+#: src/Resources.vala:295
 msgid "Pu_blish…"
 msgstr "О_прилюднити…"
 
-#: src/Resources.vala:296 ui/collection.ui:187
+#: src/Resources.vala:297 ui/collection.ui:189
 msgid "Publish to various websites"
 msgstr "Оприлюднити на одному з сайтів"
 
-#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: src/Resources.vala:299 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:537
 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
-#| msgid "Edit Title"
 msgid "Edit _Title…"
 msgstr "Змінити за_головок…"
 
 #. Button label
-#: src/Resources.vala:300
-#| msgid "Edit Title"
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Змінити заголовок"
 
-#: 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"
+#: src/Resources.vala:303 ui/collection.ui:103 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:345 ui/event.ui:398 ui/event.ui:542
+#: ui/media.ui:345 ui/photo_context.ui:110 ui/photo.ui:332 ui/tags.ui:345
 msgid "Edit _Comment…"
 msgstr "Змінити _коментар…"
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr "Зміна коментаря"
 
-#: src/Resources.vala:306 ui/event.ui:588
-#| msgid "Edit Event Comment"
+#: src/Resources.vala:307 ui/event.ui:592
 msgid "Edit Event _Comment…"
 msgstr "Змінити _коментар до події…"
 
-#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
-#| msgid "Adjust Date and Time"
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:337
 msgid "_Adjust Date and Time…"
 msgstr "С_коригувати дату і час…"
 
-#: src/Resources.vala:310
+#: src/Resources.vala:311
 msgid "Adjust Date and Time"
 msgstr "Скоригувати дату і час"
 
-#: 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"
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
+#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "Додати _мітки…"
 
-#: src/Resources.vala:313 ui/photo_context.ui:17
-#| msgid "Add Tags"
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "_Додати мітки…"
 
 #. Dialog title
-#: src/Resources.vala:315
-#| msgid "Add Tags"
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Додавання міток"
 
-#: src/Resources.vala:324 ui/photo_context.ui:133
-#| msgid "Send To"
+#: src/Resources.vala:325 ui/photo_context.ui:135
 msgid "Send T_o…"
 msgstr "Надіс_лати…"
 
-#: src/Resources.vala:326
-#| msgid "_Find"
+#: src/Resources.vala:327
 msgid "_Find…"
 msgstr "З_найти…"
 
-#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: src/Resources.vala:328 ui/collection.ui:217 ui/offline.ui:239
 #: ui/trash.ui:312
 msgid "Find"
 msgstr "Знайти"
 
-#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: src/Resources.vala:329 ui/collection.ui:214 ui/offline.ui:236
 #: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Знайти зображення за вказаним рядком з назви або міток зображення"
 
-#: src/Resources.vala:330
+#: src/Resources.vala:331
 msgid "_Flag"
 msgstr "_Позначити"
 
-#: src/Resources.vala:332
+#: src/Resources.vala:333
 msgid "Un_flag"
 msgstr "Зн_яти позначення"
 
-#: src/Resources.vala:335
+#: src/Resources.vala:336
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Не вдалося запустити редактор: %s"
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
-#| msgid "Add Tag \"%s\""
 msgid "Add Tag “%s”"
 msgstr "Додати мітку «%s»"
 
 #. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
+#: src/Resources.vala:344
 #, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
 msgid "Add Tags “%s” and “%s”"
 msgstr "Додати мітки «%s» і «%s»"
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-#| msgid "Add Tags"
+#: src/Resources.vala:349
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "додавання міток"
 
-#: src/Resources.vala:353
+#: src/Resources.vala:354
 #, c-format
-#| msgid "_Delete Tag \"%s\""
 msgid "_Delete Tag “%s”"
 msgstr "Ви_лучити мітку «%s»"
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
-#| msgid "Delete Tag \"%s\""
 msgid "Delete Tag “%s”"
 msgstr "Вилучити мітку «%s»"
 
-#: src/Resources.vala:360
+#: src/Resources.vala:361
 msgid "Delete Tag"
 msgstr "Вилучити мітку"
 
-#: src/Resources.vala:366
+#: src/Resources.vala:367
 #, c-format
-#| msgid "Re_name Tag \"%s\"..."
 msgid "Re_name Tag “%s”…"
 msgstr "Пере_йменувати мітку «%s»…"
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Перейменувати мітку «%s» на «%s»"
 
-#: src/Resources.vala:373 ui/tags.ui:454
-#| msgid "_Rename..."
+#: src/Resources.vala:374 ui/tags.ui:456
 msgid "_Rename…"
 msgstr "Пере_йменувати…"
 
-#: 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 "Modify Tags"
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "З_мінити мітки…"
 
-#: src/Resources.vala:376
+#: src/Resources.vala:377
 msgid "Modify Tags"
 msgstr "Змінити мітки"
 
-#: src/Resources.vala:379
+#: src/Resources.vala:380
 #, c-format
-#| msgid "Tag Photo as \"%s\""
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
-msgstr[0] "Додати до фотографії мітку «%s»"
+msgstr[0] "Додати до фотографій мітку «%s»"
 msgstr[1] "Додати до фотографій мітку «%s»"
 msgstr[2] "Додати до фотографій мітку «%s»"
 msgstr[3] "Додати до фотографії мітку «%s»"
 
-#: src/Resources.vala:385
+#: src/Resources.vala:386
 #, 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] "Додати до позначених фотографій мітку «%s»"
 msgstr[1] "Додати до позначених фотографій мітку «%s»"
 msgstr[2] "Додати до позначених фотографій мітку «%s»"
-msgstr[3] "Додати до позначених фотографій мітку «%s»"
+msgstr[3] "Додати до позначеної фотографії мітку «%s»"
 
-#: src/Resources.vala:391
+#: src/Resources.vala:392
 #, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
 msgstr[0] "Вилучити мітку «%s» з _фотографій"
@@ -6228,9 +5815,8 @@ msgstr[1] "Вилучити мітку «%s» з _фотографій"
 msgstr[2] "Вилучити мітку «%s» з _фотографій"
 msgstr[3] "Вилучити мітку «%s» з _фотографії"
 
-#: src/Resources.vala:397
+#: src/Resources.vala:398
 #, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
 msgstr[0] "Вилучення мітки «%s» з фотографій"
@@ -6238,141 +5824,135 @@ msgstr[1] "Вилучення мітки «%s» з фотографій"
 msgstr[2] "Вилучення мітки «%s» з фотографій"
 msgstr[3] "Вилучення мітки «%s» з фотографії"
 
-#: src/Resources.vala:403
+#: src/Resources.vala:404
 #, c-format
-#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Не вдалося перейменувати мітку на «%s», оскільки мітка з такою назвою вже "
 "існує."
 
-#: src/Resources.vala:407
+#: src/Resources.vala:408
 #, c-format
-#| msgid "Unable to rename search to \"%s\" because the search already exists."
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "Не вдалося перейменувати пошук на «%s», оскільки пошук з такою назвою вже "
 "існує."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "Збережений пошук"
 
-#: src/Resources.vala:412
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr "Вилучити пошук"
 
-#: src/Resources.vala:415 ui/savedsearch.ui:11
-#| msgid "_Edit"
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "З_мінити…"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:7
-#| msgid "Re_name..."
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "Пере_йменувати…"
 
-#: src/Resources.vala:419
+#: src/Resources.vala:420
 #, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
 msgid "Rename Search “%s” to “%s”"
 msgstr "Перейменувати пошук «%s» на «%s»"
 
-#: src/Resources.vala:423
+#: src/Resources.vala:424
 #, c-format
-#| msgid "Delete Search \"%s\""
 msgid "Delete Search “%s”"
 msgstr "Вилучити пошук «%s»"
 
-#: src/Resources.vala:560
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr "Оцінка %s"
 
-#: src/Resources.vala:561
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr "Встановити оцінку %s"
 
-#: src/Resources.vala:562
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Встановлення оцінки %s"
 
-#: src/Resources.vala:564
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr "Показати %s"
 
-#: src/Resources.vala:565
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Показати лише фотографії з оцінкою %s"
 
-#: src/Resources.vala:566
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr "%s або краща"
 
-#: src/Resources.vala:567
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr "Показати %s або кращі"
 
-#: src/Resources.vala:568
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Показати лише фотографії з оцінкою %s або кращою"
 
-#: src/Resources.vala:659 ui/trash.ui:255
+#: src/Resources.vala:660 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Вилучити позначені фотографії до смітника"
 
-#: src/Resources.vala:660 ui/offline.ui:221
+#: src/Resources.vala:661 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Вилучити позначені фотографії з бібліотеки"
 
-#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
+#: src/Resources.vala:663 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "Від_новити"
 
-#: src/Resources.vala:663 ui/trash.ui:270
+#: src/Resources.vala:664 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:558 ui/media.ui:27
-#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
+#: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Показати у _менеджері файлів"
 
-#: src/Resources.vala:666
-#| msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:667
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Відкрити вказаний каталог фотографій у програмі для керування файлами"
 
-#: src/Resources.vala:669
+#: src/Resources.vala:670
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Не вдалося відкрити у програмі для керування файлами: %s"
 
-#: src/Resources.vala:672 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "Ви_лучити з бібліотеки"
 
-#: 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
+#: src/Resources.vala:675 ui/collection.ui:134 ui/event.ui:79 ui/event.ui:573
+#: ui/media.ui:79 ui/photo_context.ui:141 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "П_ересунути до смітника"
 
-#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: src/Resources.vala:677 ui/events_directory.ui:58 ui/event.ui:86
 #: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Позначити _всі"
 
-#: src/Resources.vala:677
+#: src/Resources.vala:678
 msgid "Select all items"
 msgstr "Позначити всі пункти"
 
@@ -6393,7 +5973,6 @@ msgstr "%a %b %d %Y"
 #. / 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:744
-#| msgid "%a %b %d"
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6402,7 +5981,6 @@ msgstr "%a %b %d"
 #. / 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:749
-#| msgid "%d, %Y"
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -6411,7 +5989,6 @@ msgstr "%d, %Y"
 #. / 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
-#| msgid "%a %b %d"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6420,19 +5997,14 @@ msgstr "%a %b %d"
 #. / 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
-#| msgid "%a %b %d, %Y"
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d %Y"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "Перегляд слайдів"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Збережені пошуки"
-
 #. Ordering must correspond with SearchConditionText.Context
 #: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
@@ -6462,7 +6034,6 @@ msgid "is not set"
 msgstr "не встановлено"
 
 #: src/searches/SavedSearchDialog.vala:168
-#| msgid "is not set"
 msgid "is set"
 msgstr "встановлено"
 
@@ -6552,7 +6123,6 @@ msgid "Search"
 msgstr "Пошук"
 
 #: src/searches/SavedSearchDialog.vala:696
-#| msgid "_Cancel"
 msgid "Cancel"
 msgstr "Скасувати"
 
@@ -6608,8 +6178,8 @@ msgstr "Стан позначення"
 msgid "Photo state"
 msgstr "Стан фотографії"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "Оцінка"
 
@@ -6617,31 +6187,37 @@ msgstr "Оцінка"
 msgid "Date"
 msgstr "Дата"
 
-#: src/SearchFilter.vala:815
-#| msgid "Rating"
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "Збережені пошуки"
+
+#: src/searches/SearchesBranch.vala:68
+#| msgid "Organize your photos"
+msgid "Organize your saved searches"
+msgstr "Впорядкуйте ваші збережені пошуки"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "Оцінка ★+"
 
-#: src/SearchFilter.vala:818
-#| msgid "Rating"
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "Оцінка ★★+"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "Оцінка ★★★+"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "Оцінка ★★★★+"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "Оцінка ★★★★★+"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
-#| msgid "Error loading UI file %s: %s"
 msgid "Error loading search bar UI: %s"
 msgstr "Помилка під час спроби завантажити інтерфейс панелі пошуку: %s"
 
@@ -6650,74 +6226,73 @@ 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:1073
-#| msgid "_Close"
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "Закрити"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "Тип"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "Відео"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "Цифрові негативи"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Використати збережений пошук для фільтрування записів у поточній області "
 "перегляду"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Параметри"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "Назад"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "Перейти до попередньої фотографії"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "Призупинити показ слайдів"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "Далі"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "Перейти до наступної фотографії"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "Параметри"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "Змінити параметри показу слайдів"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "Не виявлено всіх файлів джерел даних фотографій."
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "Пуск"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "Продовжити показ слайдів"
 
@@ -6729,7 +6304,7 @@ msgstr "Переходи показу слайдів"
 msgid "(None)"
 msgstr "(Немає)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "Немає"
 
@@ -6737,53 +6312,52 @@ msgstr "Немає"
 msgid "Random"
 msgstr "Випадковий"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "Мітки"
 
+#: src/tags/TagsBranch.vala:131
+#| msgid "Organize your photos"
+msgid "Organize and browse your photo’s tags"
+msgstr "Впорядкуйте мітки ваших фотографій і використовуйте їх"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "без назви"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "Експорт відео"
 
-#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:472 ui/media.ui:281
 #: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
 msgid "Toggle _Flag"
 msgstr "Перемкнути п_рапорець"
 
-#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
-#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+#: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
 msgid "_Developer"
 msgstr "П_роявник"
 
-#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
-#| msgid "Open With E_xternal Editor"
-msgid "Open with E_xternal Editor"
-msgstr "Відкрити за допомогою з_овнішнього редактора"
-
-#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
-#: ui/photo_context.ui:124 ui/tags.ui:379
+#: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
+#: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
 msgstr "Переглянути п_одію, пов’язану з фотографією"
 
 #: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
 #: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
-#: ui/top.ui:5 ui/trash.ui:5
+#: ui/trash.ui:5
 msgid "_File"
 msgstr "_Файл"
 
-#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
-#| msgid "Save As"
+#: ui/direct.ui:13
 msgid "Save _As…"
 msgstr "Зберегти _як…"
 
 #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
-#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "П_ерегляд"
 
@@ -6799,7 +6373,7 @@ msgstr "Масштаб _100%"
 msgid "Zoom _200%"
 msgstr "Масштаб _200%"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Фотографія"
 
@@ -6815,29 +6389,27 @@ msgstr "_Наступна фотографія"
 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
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
+#: ui/photo.ui:394 ui/tags.ui:430 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..."
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
+#: ui/photo.ui:398 ui/tags.ui:434 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"
-msgid "_Import from Folder…"
+#| msgid "_Import from Folder…"
+msgid "_Import From Folder…"
 msgstr "_Імпортувати з теки…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
 #: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
 #: ui/trash.ui:13
-#| msgid "Import From Application"
 msgid "Import From _Application…"
 msgstr "Імпортувати з п_рограми…"
 
@@ -6855,7 +6427,6 @@ msgstr "З_найти"
 #: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
 #: ui/photo.ui:70 ui/search_sidebar_context.ui:6
 #: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
-#| msgid "Ne_w Saved Search..."
 msgid "Ne_w Saved Search…"
 msgstr "С_творити збережений пошук…"
 
@@ -6882,7 +6453,6 @@ msgstr "_Бічна панель"
 
 #: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
 #: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
-#| msgid "Pin Toolbar"
 msgid "T_oolbar"
 msgstr "П_анель інструментів"
 
@@ -6908,23 +6478,16 @@ msgstr "За з_ростанням"
 msgid "D_escending"
 msgstr "За с_паданням"
 
-#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
+#: ui/events_directory.ui:132 ui/event.ui:379 ui/media.ui:373 ui/tags.ui:373
 msgid "Even_ts"
 msgstr "Поді_ї"
 
-#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
-#: ui/photo.ui:77 ui/tags.ui:74
-#| msgid "R_emove From Library"
-msgid "R_emove from Library"
-msgstr "Ви_лучити з бібліотеки"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "_Заголовки"
 
-#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
-#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+#: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
+#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "_Мітки"
 
@@ -6937,7 +6500,6 @@ msgid "By _Title"
 msgstr "За _заголовком"
 
 #: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
-#| msgid "File name"
 msgid "By _Filename"
 msgstr "За _назвою файла"
 
@@ -6951,11 +6513,10 @@ msgstr "За _оцінкою"
 
 #: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
 #: ui/tags.ui:251
-#| msgid "D_escending"
 msgid "_Descending"
 msgstr "За с_паданням"
 
-#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
 msgid "_Photos"
 msgstr "_Фотографії"
 
@@ -6963,200 +6524,353 @@ msgstr "_Фотографії"
 msgid "_Stop Import"
 msgstr "П_рипинити імпортування"
 
-#: ui/set_background_dialog.ui:9
-#| msgid "Set as _Desktop Background"
-msgid "Set as Desktop Background"
-msgstr "Зробити тлом стільниці"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
-msgstr "Використати для стільниці"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
-msgstr "Використати для вікна блокування"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr "Зробити показом слайдів стільниці"
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr "Створити показ слайдів у тлі стільниці"
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr "Показувати кожну фотографію"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr "період часу"
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "Тривалість показу кожної з фотографій на тлі стільниці"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "білий"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "чорний"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "Показ"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "_Тло:"
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "_Імпортувати фотографії до:"
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "_Шукати нові файли у каталозі бібліотеки"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "Імпортування"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "Стр_уктура каталогів:"
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "Приклад:"
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "За_мінити літери у назвах імпортованих файлів на малі"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "Метадані"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Записувати мітки, заголовки та інші _метадані до файлів фотографій"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "Обробник RAW"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "_Типовий:"
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "_Шаблон:"
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+#| msgid "_Background:"
+msgid "Transparent Background:"
+msgstr "Прозоре тло:"
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "Картате"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "Суцільний колір"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "З_овнішній фоторедактор:"
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "Зовнішній редактор н_егативів:"
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "Зовнішні редактори"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "Додатки"
 
-#: ui/shotwell.ui:583
+#: ui/preferences_dialog.ui:668
+#| msgid "_Preferences"
+msgid "Shotwell Preferences"
+msgstr "Налаштування Shotwell"
+
+#: ui/printing_widget.ui:18
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Розміри друкованих зображень</b>"
 
-#: ui/shotwell.ui:600
+#: ui/printing_widget.ui:38
 msgid "Use a _standard size:"
 msgstr "Використовувати с_тандартні:"
 
-#: ui/shotwell.ui:643
+#: ui/printing_widget.ui:65
 msgid "Use a c_ustom size:"
 msgstr "Використовувати н_етипові:"
 
-#: ui/shotwell.ui:731
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "дюйми"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "см"
+
+#: ui/printing_widget.ui:146
 msgid "_Match photo aspect ratio"
 msgstr "З_берігати пропорції фотографій"
 
-#: ui/shotwell.ui:755
+#: ui/printing_widget.ui:161
 msgid "_Autosize:"
 msgstr "_Авторозмір:"
 
-#: ui/shotwell.ui:795
+#: ui/printing_widget.ui:202
 msgid "<b>Titles</b>"
 msgstr "<b>Заголовки</b>"
 
-#: ui/shotwell.ui:812
+#: ui/printing_widget.ui:219
 msgid "Print image _title"
 msgstr "Друкувати за_головок зображення"
 
-#: ui/shotwell.ui:855
+#: ui/printing_widget.ui:262
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Роздільність у пікселях</b>"
 
-#: ui/shotwell.ui:875
+#: ui/printing_widget.ui:282
 msgid "_Output photo at:"
 msgstr "_Вивести з роздільністю:"
 
-#: ui/shotwell.ui:909
+#: ui/printing_widget.ui:316
 msgid "pixels per inch"
 msgstr "пікселів на дюйм"
 
-#: ui/shotwell.ui:949
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Зробити тлом стільниці"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "Використати для стільниці"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "Використати для вікна блокування"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Зробити показом слайдів стільниці"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "Створити показ слайдів у тлі стільниці"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "Показувати кожну фотографію"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "період часу"
+
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "Тривалість показу кожної з фотографій на тлі стільниці"
+
+#: ui/shotwell.ui:22
 msgid "_Name of search:"
 msgstr "_Назва пошуку:"
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:76
 msgid "_Match"
 msgstr "Ві_дповідність"
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:103
 msgid "of the following:"
 msgstr "за такими ознаками:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:184
 msgid "label"
 msgstr "мітка"
 
-#: ui/shotwell.ui:1262
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Створити _мітку…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "За_тримка:"
 
-#: ui/shotwell.ui:1276
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "Е_фект переходу:"
 
-#: ui/shotwell.ui:1290
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "Затри_мка переходу:"
 
-#: ui/shotwell.ui:1300
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "Показати за_головок"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "секунд"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "Створити _мітку…"
-
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Вилучити всі фотографії до смітника"
 
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "Ласкаво просимо до служби імпортування бібліотеки F-Spot.\n"
+#~ "\n"
+#~ "Будь ласка, виберіть бібліотеку для імпортування. Можна скористатися "
+#~ "однією з вже створених бібліотек, виявлених Shotwell, або вибрати інший "
+#~ "файл бази даних F-Spot."
+
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "Ласкаво просимо до служби імпортування бібліотеки F-Spot.\n"
+#~ "\n"
+#~ "Будь ласка, виберіть файл бази даних F-Spot."
+
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "Виберіть файл бази даних F-Spot для імпортування вручну:"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr ""
+#~ "Не вдалося виконати читання вибраного файла бази даних F-Spot: файла не "
+#~ "існує або вказаний файл не є файлом бази даних F-Spot"
+
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "Не вдалося виконати читання вибраного файла бази даних F-Spot: підтримки "
+#~ "цієї версії бази даних F-Spot у Shotwell не передбачено"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr ""
+#~ "Не вдалося виконати читання вибраного файла бази даних F-Spot: помилка "
+#~ "під час читання таблиці міток"
+
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr ""
+#~ "Не вдалося виконати читання вибраного файла бази даних F-Spot: помилка "
+#~ "під час читання таблиці фотографій"
+
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "У бібліотеці F-Spot було виявлено %d фотографій. Зараз виконується "
+#~ "імпортування цих фотографій. Під час імпортування буде автоматично "
+#~ "виявлено і вилучено дублікати.\n"
+#~ "\n"
+#~ "Ви можете закрити це діалогове вікно і продовжити користування Shotwell. "
+#~ "Імпортування відбуватиметься у фоновому режимі."
+
+#~ msgid "F-Spot library: %s"
+#~ msgstr "Бібліотека F-Spot: %s"
+
+#~ msgid "Preparing to import"
+#~ msgstr "Готуємося до імпортування"
+
+#~ msgid "Core Data Import Services"
+#~ msgstr "Служби імпортування основних даних"
+
+#~ msgid "Width or height"
+#~ msgstr "Ширина або висота"
+
+#~| 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» не є коректною відповіддю на запит щодо розпізнавання OAuth"
+
+#~| msgid "Testing connection to Facebook..."
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "Перевірка з’єднання з Facebook…"
+
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr ""
+#~ "Введіть число підтвердження, яке було показано після входу до служби "
+#~ "Flickr за допомогою вашої програми для перегляду інтернету."
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "_Число розпізнавання:"
+
+#~ msgid ""
+#~ "You have already logged in and out of Flickr during this Shotwell "
+#~ "session.\n"
+#~ "To continue publishing to Flickr, quit and restart Shotwell, then try "
+#~ "publishing again."
+#~ msgstr ""
+#~ "Ви вже входили і виходили з системи Flickr протягом цього сеансу роботи у "
+#~ "Shotwell.\n"
+#~ "Щоб продовжити оприлюднення фотографій на Flickr, завершіть роботу "
+#~ "Shotwell і запустіть програму знову, а потім повторіть спробу "
+#~ "оприлюднення."
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "По_казувати альбом у відкритій галереї"
+
+#~| msgid "Videos will appear in '%s'"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Відео з’являться у «%s»"
+
+#~ msgid "Export Photos/Videos"
+#~ msgstr "Експортувати фотографії/відео"
+
+#~| msgid "Open With E_xternal Editor"
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "Відкрити за допомогою з_овнішнього редактора"
+
+#~| msgid "R_emove From Library"
+#~ msgid "R_emove from Library"
+#~ msgstr "Ви_лучити з бібліотеки"
+
 #~| msgid "Copyright 2009-2013 Yorba Foundation"
 #~ msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgstr "© Yorba Foundation, 2009–2014"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 773eb5e..82b5dca 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 07d5b8d..0fac1eb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-08-15 19:01+0000\n"
-"PO-Revision-Date: 2017-08-31 12:28+0800\n"
+"POT-Creation-Date: 2017-12-24 15:23+0000\n"
+"PO-Revision-Date: 2018-01-02 19:21+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -26,10 +26,10 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.3\n"
 
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:313 ui/collection.ui:85 ui/event.ui:356
-#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:346
+#: src/photos/RawSupport.vala:308 ui/collection.ui:85 ui/event.ui:356
+#: ui/event.ui:524 ui/media.ui:356 ui/photo_context.ui:91 ui/photo.ui:347
 #: ui/tags.ui:356
 msgid "Shotwell"
 msgstr "Shotwell"
@@ -68,16 +68,16 @@ msgstr "Shotwell 支援 JPEG、PNG、TIFF、和多種 RAW 檔案格式。"
 msgid "The Shotwell developers"
 msgstr "Shotwell 開發者群"
 
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+#: misc/shotwell.desktop.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "相片管理員"
 
-#: misc/shotwell.desktop.in.in:6
+#: misc/shotwell.desktop.in:6
 msgid "Organize your photos"
 msgstr "整理您的相片"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
+#: misc/shotwell.desktop.in:8
 msgid ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
@@ -86,19 +86,19 @@ msgstr ""
 "album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
 "rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;相簿;相機;攝影"
-"機;裁切;裁剪;增強;匯出;藝廊;畫廊;圖庫;影像;照片;匯入;整理;統整;圖片;攝影;發"
+"機;裁切;裁剪;補強;匯出;藝廊;畫廊;圖庫;影像;照片;匯入;整理;統整;圖片;攝影;發"
 "佈;發布;發表;旋轉;標記;標籤;視訊;影片;"
 
 #. 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
+#: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
 msgid "shotwell"
 msgstr "shotwell"
 
-#: misc/shotwell-viewer.desktop.in.in:4
+#: misc/shotwell-viewer.desktop.in:4
 msgid "Shotwell Viewer"
 msgstr "Shotwell 檢視器"
 
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+#: misc/shotwell-viewer.desktop.in:5 src/Resources.vala:18
 msgid "Photo Viewer"
 msgstr "相片檢視器"
 
@@ -127,7 +127,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "登入 oauth 請求的祕密驗符"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:486
+#: misc/org.yorba.shotwell.gschema.xml:498
 msgid "default size"
 msgstr "預設大小"
 
@@ -153,9 +153,9 @@ msgid "URL of the Rajce server."
 msgstr "Rajce 伺服器的 URL。"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:454
-#: misc/org.yorba.shotwell.gschema.xml:512
-#: misc/org.yorba.shotwell.gschema.xml:568
+#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "username"
 msgstr "username"
 
@@ -172,7 +172,7 @@ msgid "user token, if remembered."
 msgstr "使用者驗符，若已記住的話。"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:530
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last category"
 msgstr "上個類別"
 
@@ -181,7 +181,7 @@ msgid "The last selected Rajce category."
 msgstr "上個選取的 Rajce 類別。"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid "last photo size"
 msgstr "上次相片大小"
 
@@ -217,11 +217,11 @@ msgid ""
 msgstr "若為真，則在上傳相片後以網頁瀏覽器開啟目標相簿"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:434
-#: misc/org.yorba.shotwell.gschema.xml:472
-#: misc/org.yorba.shotwell.gschema.xml:498
-#: misc/org.yorba.shotwell.gschema.xml:548
-#: misc/org.yorba.shotwell.gschema.xml:592
+#: misc/org.yorba.shotwell.gschema.xml:446
+#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "remove sensitive info from uploads"
 msgstr "移除上傳內容中的敏感資訊"
 
@@ -453,451 +453,467 @@ msgid "A grayscale color for use as the background color."
 msgstr "作為背景色使用的灰階色彩。"
 
 #: misc/org.yorba.shotwell.gschema.xml:167
+msgid "background for transparent images"
+msgstr "透明影像的背景"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid "The background to use for transparent images."
+msgstr "透明影像使用的背景。"
+
+#: misc/org.yorba.shotwell.gschema.xml:173
+msgid "color for solid transparency background"
+msgstr "透明背景的單一色彩"
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+msgid "Color to use if background for transparent images is set to solid color"
+msgstr "若透明影像背景設為單一色彩時要使用的顏色"
+
+#: misc/org.yorba.shotwell.gschema.xml:179
 msgid "Selection state of “hide photos” option"
 msgstr "「隱藏相片」選項的選取狀態"
 
-#: misc/org.yorba.shotwell.gschema.xml:168
+#: misc/org.yorba.shotwell.gschema.xml:180
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr "匯入頁面中「隱藏已經匯入的相片」選項上次使用的選取狀態。"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "delay"
 msgstr "延遲"
 
-#: misc/org.yorba.shotwell.gschema.xml:176
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "在投影片秀中各相片之間的延遲間隔（秒）。"
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "transition delay"
 msgstr "轉場延遲"
 
-#: misc/org.yorba.shotwell.gschema.xml:182
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "在投影片秀中相片轉場所花費的時間（秒）"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:199
 msgid "transition effect id"
 msgstr "轉場效果 ID"
 
-#: misc/org.yorba.shotwell.gschema.xml:188
+#: misc/org.yorba.shotwell.gschema.xml:200
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr "播放投影片秀時各相片之間使用的轉場效果名稱"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:205
 msgid "Show title"
 msgstr "顯示標題"
 
-#: misc/org.yorba.shotwell.gschema.xml:194
+#: misc/org.yorba.shotwell.gschema.xml:206
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "是否要在投影片秀中顯示相片的標題"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "maximize library window"
 msgstr "最大化珍藏館視窗"
 
-#: misc/org.yorba.shotwell.gschema.xml:202
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "True if library application is maximized, false otherwise."
 msgstr "若珍藏館應用程式要最大化則為真，否則為假。"
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "width of library window"
 msgstr "珍藏館視窗寬度"
 
-#: misc/org.yorba.shotwell.gschema.xml:208
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "The last recorded width of the library application window."
 msgstr "珍藏館應用程式視窗上次紀錄的寬度。"
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "height of library window"
 msgstr "珍藏館視窗寬度"
 
-#: misc/org.yorba.shotwell.gschema.xml:214
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded height of the library application window."
 msgstr "珍藏館應用程式視窗上次紀錄的高度。"
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "maximize direct-edit window"
 msgstr "最大化直接編輯視窗"
 
-#: misc/org.yorba.shotwell.gschema.xml:220
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "若直接編輯應用程式要最大化則為真，否則為假。"
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "width of direct-edit window"
 msgstr "直接編輯視窗的寬度"
 
-#: misc/org.yorba.shotwell.gschema.xml:226
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid "The last recorded width of the direct-edit application window."
 msgstr "直接編輯應用程式視窗上次紀錄的寬度。"
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:243
 msgid "height of direct-edit window"
 msgstr "直接編輯視窗的高度"
 
-#: misc/org.yorba.shotwell.gschema.xml:232
+#: misc/org.yorba.shotwell.gschema.xml:244
 msgid "The last recorded height of the direct-edit application window."
 msgstr "直接編輯應用程式視窗上次紀錄的高度。"
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:249
 msgid "sidebar divider position"
 msgstr "側邊欄分割棒位置"
 
-#: misc/org.yorba.shotwell.gschema.xml:238
+#: misc/org.yorba.shotwell.gschema.xml:250
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
 msgstr "珍藏館視窗中上次紀錄的側邊欄和檢視區之間的分割棒位置。"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "import directory"
 msgstr "匯入目錄"
 
-#: misc/org.yorba.shotwell.gschema.xml:246
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid "Directory in which imported photo files are placed."
 msgstr "匯入相片檔案的所在目錄。"
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "watch library directory for new files"
 msgstr "監視珍藏館目錄是否有新檔案"
 
-#: misc/org.yorba.shotwell.gschema.xml:252
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr "若為真，加入珍藏館目錄中的檔案會自動匯入。"
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "write metadata to master files"
 msgstr "寫入中介資料至主檔案"
 
-#: misc/org.yorba.shotwell.gschema.xml:258
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
 msgstr "若為真，中介資料（標籤、標題等）之修改會寫入主相片檔案中。"
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "use lowercase filenames"
 msgstr "使用小寫檔名"
 
-#: misc/org.yorba.shotwell.gschema.xml:264
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
 msgstr "若為真，Shotwell 會在匯入相片檔案時將所有檔名轉為小寫"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "directory pattern"
 msgstr "目錄樣式"
 
-#: misc/org.yorba.shotwell.gschema.xml:270
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
 msgstr "命名樣式的編碼字串，用來命名匯入時的相片目錄。"
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:287
 msgid "directory pattern custom"
 msgstr "目錄樣式自訂"
 
-#: misc/org.yorba.shotwell.gschema.xml:276
+#: misc/org.yorba.shotwell.gschema.xml:288
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
 msgstr "命名樣式的自訂編碼字串，用來命名匯入時的相片目錄。"
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:293
 msgid "RAW developer default"
 msgstr "RAW 顯影器預設值"
 
-#: misc/org.yorba.shotwell.gschema.xml:282
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Shotwell 會使用的 RAW 顯影器預設選項。"
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:301
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "最近使用的裁切寬長比選項。"
 
-#: misc/org.yorba.shotwell.gschema.xml:290
+#: misc/org.yorba.shotwell.gschema.xml:302
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr "代表使用者上次裁切選項的數字碼。"
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:306
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "最近使用的裁切自訂寬長比分子。"
 
-#: misc/org.yorba.shotwell.gschema.xml:295
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
 msgstr "非零、正整數，代表上次使用者輸入的自訂寬長比寬度部分。"
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:311
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "最近使用的裁切自訂寬長比分母。"
 
-#: misc/org.yorba.shotwell.gschema.xml:300
+#: misc/org.yorba.shotwell.gschema.xml:312
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
 msgstr "非零、正整數，代表上次使用者輸入的自訂寬長比高度部分。"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:319
 msgid "external photo editor"
 msgstr "外部相片編輯器"
 
-#: misc/org.yorba.shotwell.gschema.xml:308
+#: misc/org.yorba.shotwell.gschema.xml:320
 msgid "External application used to edit photos."
 msgstr "用來編輯相片的外部應用程式。"
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:325
 msgid "external raw editor"
 msgstr "外部 RAW 編輯器"
 
-#: misc/org.yorba.shotwell.gschema.xml:314
+#: misc/org.yorba.shotwell.gschema.xml:326
 msgid "External application used to edit RAW photos."
 msgstr "用來編輯 RAW 相片的外部應用程式。"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:365
 msgid "Setting in export dialog: how to trim images"
 msgstr "匯出對話盒中的設定：修剪影像的方法"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:370
 msgid "export metadata"
 msgstr "匯出中介資料"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:371
 msgid "Setting in export dialog: option to export metadata"
 msgstr "匯出對話盒中的設定：匯出中介資料的選項"
 
-#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:376
 msgid "format setting, special value"
 msgstr "格式設定，特殊值"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:377
 msgid "Setting in export dialog: format setting, special value"
 msgstr "匯出對話盒中的設定：格式設定，特殊值"
 
-#: misc/org.yorba.shotwell.gschema.xml:370
+#: misc/org.yorba.shotwell.gschema.xml:382
 msgid "format setting, type value"
 msgstr "格式設定，類型值"
 
-#: misc/org.yorba.shotwell.gschema.xml:371
+#: misc/org.yorba.shotwell.gschema.xml:383
 msgid "Setting in export dialog: format setting, type value"
 msgstr "匯出對話盒中的設定：格式設定，類型值"
 
-#: misc/org.yorba.shotwell.gschema.xml:376
+#: misc/org.yorba.shotwell.gschema.xml:388
 msgid "JPEG quality option"
 msgstr "JPEG 品質選項"
 
-#: misc/org.yorba.shotwell.gschema.xml:377
+#: misc/org.yorba.shotwell.gschema.xml:389
 msgid "Setting in export dialog: jpeg quality option"
 msgstr "匯出對話盒中的設定：匯出中介資料的選項"
 
-#: misc/org.yorba.shotwell.gschema.xml:382
+#: misc/org.yorba.shotwell.gschema.xml:394
 msgid "maximal size of image"
 msgstr "最大影像大小"
 
-#: misc/org.yorba.shotwell.gschema.xml:383
+#: misc/org.yorba.shotwell.gschema.xml:395
 msgid "Setting in export dialog: maximal size of image"
 msgstr "匯出對話盒中的設定：影像的最大大小"
 
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:402
 msgid "last used publishing service"
 msgstr "上次使用的發布服務"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:409
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr "代表上次發布相片的服務數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:408
 msgid "default publishing service"
 msgstr "預設發布服務"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "access token"
 msgstr "存取代符"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "目前工作階段中登入的 Facebook OAuth 代符，若有的話。"
 
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:428
 msgid "user i.d."
 msgstr "使用者 i.d."
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "目前登入使用者的 Facebook 使用者 i.d.，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:434
 msgid "user name"
 msgstr "使用者名稱"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "目前登入至 Facebook 的使用者名稱，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:440
+#: misc/org.yorba.shotwell.gschema.xml:472
 msgid "default size code"
 msgstr "預設大小碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:441
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr "代表發布至 Facebook 的預設相片大小數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:435
+#: misc/org.yorba.shotwell.gschema.xml:447
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr "是否應該先移除影像的中介資料再上傳至 Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:442
+#: misc/org.yorba.shotwell.gschema.xml:454
 msgid "OAuth Access Phase Token"
 msgstr "OAuth 存取階段代符"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "目前登入的 Flickr 使用者授權代符，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth 存取階段代符暗記"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
 msgstr "簽署目前登入之 Flickr 使用者授權代符請求用的密碼學暗記，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "目前登入 Flickr 的使用者名稱，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr "代表發布至 Flickr 的相片預設大小數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:478
 msgid "default visibility"
 msgstr "預設可見性"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:479
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
 msgstr "代表發布至 Flickr 的相片預設可見性數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:485
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "是否應該先移除影像的中介資料再上傳至 Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:480
-#: misc/org.yorba.shotwell.gschema.xml:612
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:624
 msgid "refresh token"
 msgstr "重整代符"
 
-#: misc/org.yorba.shotwell.gschema.xml:481
+#: misc/org.yorba.shotwell.gschema.xml:493
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
 msgstr ""
 "用來重整目前登入使用者的 Picasa 網頁相簿工作階段 OAuth 代符，若有的話。"
 
-#: misc/org.yorba.shotwell.gschema.xml:487
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr "代表發布至 Picasa 網頁相簿的相片預設大小數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:492
-#: misc/org.yorba.shotwell.gschema.xml:586
+#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "last album"
 msgstr "上次相簿"
 
-#: misc/org.yorba.shotwell.gschema.xml:493
-#: misc/org.yorba.shotwell.gschema.xml:587
+#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The name of the last album the user published photos to, if any"
 msgstr "使用者上次發布相片時的相簿名稱，若有的話"
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:511
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "是否應該先移除影像的中介資料再上傳至 Picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:506
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "Piwigo URL"
 msgstr "Piwigo 網址"
 
-#: misc/org.yorba.shotwell.gschema.xml:507
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "URL of the Piwigo server."
 msgstr "Piwigo 伺服器的網址。"
 
-#: misc/org.yorba.shotwell.gschema.xml:513
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo 使用者名稱，若有登入。"
 
-#: misc/org.yorba.shotwell.gschema.xml:518
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "password"
 msgstr "密碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:519
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo 密碼，若有登入。"
 
-#: misc/org.yorba.shotwell.gschema.xml:524
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "remember password"
 msgstr "記住密碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:525
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "If true, remember the Piwigo password."
 msgstr "若為真，則記住 Piwigo 密碼。"
 
-#: misc/org.yorba.shotwell.gschema.xml:531
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid "The last selected Piwigo category."
 msgstr "上次選取的 Piwigo 類別。"
 
-#: misc/org.yorba.shotwell.gschema.xml:536
+#: misc/org.yorba.shotwell.gschema.xml:548
 msgid "last permission level"
 msgstr "上次權限層級"
 
-#: misc/org.yorba.shotwell.gschema.xml:537
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid "The last chosen Piwigo permission level."
 msgstr "上次選擇的 Piwigo 權限層級。"
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
 msgstr "代表發布至 Piwigo 時使用的上次相片大小預先設定數字碼。"
 
-#: misc/org.yorba.shotwell.gschema.xml:549
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "是否應該先移除影像的中介資料再上傳至 Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:554
+#: misc/org.yorba.shotwell.gschema.xml:566
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr "如果有設定標題但未設定評註，則使用標題作為上傳至 Piwigo 時的評註"
 
-#: misc/org.yorba.shotwell.gschema.xml:555
+#: misc/org.yorba.shotwell.gschema.xml:567
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -905,11 +921,11 @@ msgstr ""
 "上傳影像至 Piwigo 時，是否在有設定標題但未設定評註的狀況下，將其標題設為評"
 "註。"
 
-#: misc/org.yorba.shotwell.gschema.xml:560
+#: misc/org.yorba.shotwell.gschema.xml:572
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "上傳至 Piwigo 時不要上傳標籤"
 
-#: misc/org.yorba.shotwell.gschema.xml:561
+#: misc/org.yorba.shotwell.gschema.xml:573
 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."
@@ -917,332 +933,332 @@ msgstr ""
 "上傳影像至 Piwigo 時，是否要先將影像的標籤移除，這樣一來那些標籤就不會出現在"
 "遠端 Piwigo 伺服器上。"
 
-#: misc/org.yorba.shotwell.gschema.xml:569
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 username"
 msgstr "Gallery3 使用者名稱"
 
-#: misc/org.yorba.shotwell.gschema.xml:574
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "API key"
 msgstr "API 金鑰"
 
-#: misc/org.yorba.shotwell.gschema.xml:575
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "Gallery3 API key"
 msgstr "Gallery3 API 金鑰"
 
-#: misc/org.yorba.shotwell.gschema.xml:580
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "URL"
 msgstr "網址"
 
-#: misc/org.yorba.shotwell.gschema.xml:581
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid "Gallery3 site URL"
 msgstr "Gallery3 網站 URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:593
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr "是否應該先移除影像的中介資料再上傳至 Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:598
+#: misc/org.yorba.shotwell.gschema.xml:610
 msgid "scaling constraint of uploaded picture"
 msgstr "上傳圖片的縮放約束"
 
-#: misc/org.yorba.shotwell.gschema.xml:599
+#: misc/org.yorba.shotwell.gschema.xml:611
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "上傳圖片的縮放約束 ID"
 
-#: misc/org.yorba.shotwell.gschema.xml:604
+#: misc/org.yorba.shotwell.gschema.xml:616
 msgid "pixels of the major axis uploaded picture"
 msgstr "上傳的相片主軸像素數"
 
-#: misc/org.yorba.shotwell.gschema.xml:605
+#: misc/org.yorba.shotwell.gschema.xml:617
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
 msgstr "上傳圖片的主軸像素；只在縮放約束 id 為適當數值時使用"
 
-#: misc/org.yorba.shotwell.gschema.xml:613
+#: misc/org.yorba.shotwell.gschema.xml:625
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
 msgstr "用來重整目前登入使用者的 YouTube 工作階段 OAuth 代符，若有的話。"
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:632
 msgid "last used import service"
 msgstr "上次使用的匯入服務"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:633
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr "代表上次匯入相片的服務數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:628
+#: misc/org.yorba.shotwell.gschema.xml:640
 msgid "interpreter state cookie"
 msgstr "解譯器狀態訊餅"
 
-#: misc/org.yorba.shotwell.gschema.xml:629
+#: misc/org.yorba.shotwell.gschema.xml:641
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "捕捉 GStreamer 插件環境狀態的數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:636
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content layout mode"
 msgstr "內容版面配置模式"
 
-#: misc/org.yorba.shotwell.gschema.xml:637
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
 msgstr "描述相片在列印頁面中如何編排的版面配置數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:642
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content ppi"
 msgstr "內容 ppi"
 
-#: misc/org.yorba.shotwell.gschema.xml:643
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "列印時傳送給印表機的每英吋像素數"
 
-#: misc/org.yorba.shotwell.gschema.xml:648
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content width"
 msgstr "內容寬度"
 
-#: misc/org.yorba.shotwell.gschema.xml:649
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "列印時頁面中列印乳劑的寬度"
 
-#: misc/org.yorba.shotwell.gschema.xml:654
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "content height"
 msgstr "內容高度"
 
-#: misc/org.yorba.shotwell.gschema.xml:655
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "列印時頁面中列印乳劑的高度"
 
-#: misc/org.yorba.shotwell.gschema.xml:660
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "content units"
 msgstr "內容單位"
 
-#: misc/org.yorba.shotwell.gschema.xml:661
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
 msgstr "代表列印時量測單位（英吋或公分）的數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:666
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "images per page code"
 msgstr "每頁相片數"
 
-#: misc/org.yorba.shotwell.gschema.xml:667
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
 msgstr "代表目前列印時每頁所選影像數模式的數字碼"
 
-#: misc/org.yorba.shotwell.gschema.xml:672
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "size selection"
 msgstr "大小選擇"
 
-#: misc/org.yorba.shotwell.gschema.xml:673
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr "預先定義的標準大小清單中的目前列印大小索引"
 
-#: misc/org.yorba.shotwell.gschema.xml:678
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "match aspect ratio"
 msgstr "符合寬高比"
 
-#: misc/org.yorba.shotwell.gschema.xml:679
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
 msgstr "判斷自訂的列印大小是否必須符合原始相片的寬高比"
 
-#: misc/org.yorba.shotwell.gschema.xml:684
+#: misc/org.yorba.shotwell.gschema.xml:696
 msgid "print titles"
 msgstr "列印標題"
 
-#: misc/org.yorba.shotwell.gschema.xml:685
+#: misc/org.yorba.shotwell.gschema.xml:697
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr "若相片的標題應該在列印相片時一同列印出來則為真，否則為假。"
 
-#: misc/org.yorba.shotwell.gschema.xml:690
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "titles font"
 msgstr "標題字型"
 
-#: misc/org.yorba.shotwell.gschema.xml:691
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "列印相片標題時採用的字型名稱"
 
-#: misc/org.yorba.shotwell.gschema.xml:702
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable facebook publishing plugin"
 msgstr "啟用 facebook 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:703
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Facebook 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:708
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable flickr publishing plugin"
 msgstr "啟用 flickr 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:709
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Flickr 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:714
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable picasa publishing plugin"
 msgstr "啟用 picasa 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:715
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Picasa 網頁相簿發布插件則為真，否則為假。"
 
-#: misc/org.yorba.shotwell.gschema.xml:720
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable youtube publishing plugin"
 msgstr "啟用 youtube 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:721
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 YouTube 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:726
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable piwigo publishing plugin"
 msgstr "啟用 piwigo 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:727
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Piwigo 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:732
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable yandex publishing plugin"
 msgstr "啟用 yandex 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:733
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Yandex.Fotki 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:738
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable tumblr publishing plugin"
 msgstr "啟用 tumblr 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:739
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Tumblr 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:744
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable rajce publishing plugin"
 msgstr "啟用 rajce 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:745
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Rajce 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:750
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable gallery3 publishing plugin"
 msgstr "啟用 gallery3 發布插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:751
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr "若有啟用 Gallery3 發布插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:756
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable F-Spot import plugin"
 msgstr "啟用 F-Spot 匯入插件"
 
-#: misc/org.yorba.shotwell.gschema.xml:757
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "若有啟用 F-Spot 匯入插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:762
+#: misc/org.yorba.shotwell.gschema.xml:774
 msgid "enable slideshow crumble transition"
 msgstr "啟用崩解投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:763
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用崩解投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:768
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow fade transition"
 msgstr "啟用淡化投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:769
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用淡化投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:786
 msgid "enable slideshow slide transition"
 msgstr "啟用滑過投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:775
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用滑過投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:780
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow clock transition"
 msgstr "啟用時鐘投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:781
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用時鐘投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow circle transition"
 msgstr "啟用圓點投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:787
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用圓點投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:792
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow circles transition"
 msgstr "啟用圓點投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:793
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用圓點投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:798
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow blinds transition"
 msgstr "啟用百葉窗投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:799
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用百葉窗投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:804
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow squares transition"
 msgstr "啓用方塊投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:805
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用方塊投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:810
+#: misc/org.yorba.shotwell.gschema.xml:822
 msgid "enable slideshow stripes transition"
 msgstr "啟用條帶投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:811
+#: misc/org.yorba.shotwell.gschema.xml:823
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr "若有啟用條帶投影片秀轉場插件則為真，否則為假"
 
-#: misc/org.yorba.shotwell.gschema.xml:816
+#: misc/org.yorba.shotwell.gschema.xml:828
 msgid "enable slideshow chess transition"
 msgstr "啟用棋盤投影秀轉場"
 
-#: misc/org.yorba.shotwell.gschema.xml:817
+#: misc/org.yorba.shotwell.gschema.xml:829
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1273,22 +1289,7 @@ msgstr ""
 "您已經在此 Shotwell 作業階段內登入過並接著登出 Facebook。\n"
 "若要繼續發布至 Facebook，請退出並重新啟動 Shotwell，接著再次嘗試發布。"
 
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:17
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr "請輸入您登入 Flickr 後在您瀏覽器中出現的確認號碼。"
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "授權號碼(_N)："
-
-#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
-#: src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "繼續(_T)"
-
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:187
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:17
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
@@ -1300,18 +1301,15 @@ msgstr ""
 "點擊「登入」來從您的網路瀏覽器中登入 Flickr。您必須授權 Shotwell Connect 連結"
 "您的 Flickr 帳號。"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:124
 msgid "Preparing for login…"
 msgstr "正在準備登入…"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:468
-#: plugins/shotwell-publishing/FlickrPublishing.vala:341
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr "發布所需的某個檔案無法使用。無法繼續發布至 Flickr。"
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:193
+msgid "Flickr authorization failed"
+msgstr "Flickr 授權失敗"
 
-#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:481
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:200
 msgid "Verifying authorization…"
 msgstr "正在驗證授權…"
 
@@ -1327,7 +1325,7 @@ msgstr ""
 "\n"
 "若要繼續發布至 Google 服務，請先退出 Shotwell 並重新啟動，接著再重試發布。"
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:31
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:32
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
@@ -1339,7 +1337,7 @@ msgstr ""
 "請在您的網頁瀏覽器中點擊「登入」以登入 Picasa 網頁相簿。您必須授權 Shotwell "
 "Connect 連結您的 Picasa 網頁相簿帳戶。"
 
-#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:35
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -1352,153 +1350,106 @@ msgstr ""
 "您必須已經註冊 Google 帳號並將它設定好可以使用 YouTube 才能繼續。對大多數的帳"
 "號來說，您都可以使用瀏覽器登入 YouTube 至少一次來將它設定好。"
 
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+msgid "_Email address"
+msgstr "電子郵件位址(_E)"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
+msgid "_Password"
+msgstr "密碼(_P)"
+
+#: plugins/authenticator/shotwell/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
+msgid "Log in"
+msgstr "登入"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:25
+msgid "Enter the username and password associated with your Tumblr account."
+msgstr "請輸入與您 Tumblr 帳戶相關聯的使用者名稱與密碼。"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:26
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
+msgid "Username and/or password invalid. Please try again"
+msgstr "使用者名稱與/或密碼無效。請重試"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:53
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
+msgid "Invalid User Name or Password"
+msgstr "無效的使用者名稱或密碼"
+
+#: plugins/authenticator/shotwell/TumblrAuthenticator.vala:72
+#: plugins/shotwell-publishing/TumblrPublishing.vala:498
+#, c-format
+msgid "Could not load UI: %s"
+msgstr "無法載入使用者介面：%s"
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "造訪 Shotwell 網頁"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:605
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:611
 msgid "translator-credits"
 msgstr ""
 "Cheng-Chia Tseng <pswo10680@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2017."
 
 #. Possible error message when a site presents a bad certificate.
-#: plugins/common/RESTSupport.vala:202
+#: plugins/common/RESTSupport.vala:217
 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
+#: plugins/common/RESTSupport.vala:222
 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
+#: plugins/common/RESTSupport.vala:227
 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
+#: plugins/common/RESTSupport.vala:232
 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
+#: plugins/common/RESTSupport.vala:237
 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
+#: plugins/common/RESTSupport.vala:242
 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
+#: plugins/common/RESTSupport.vala:247
 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
+#: plugins/common/RESTSupport.vala:524
+#: plugins/shotwell-publishing/TumblrPublishing.vala:623
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "發布所需的某暫存檔無法使用"
 
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"歡迎光臨 F-Spot 珍藏館匯入服務。\n"
-"\n"
-"請選取要匯入的珍藏館，您可以選取 Shotwell 找到的既有珍藏館之一，或是選取其他 "
-"F-Spot 資料庫檔案。"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"歡迎光臨 F-Spot 珍藏館匯入服務。\n"
-"\n"
-"請選取一個 F-Spot 資料庫檔案。"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "手動選取要匯入的 F-Spot 資料庫檔案："
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr "無法開啟所選的 F-Spot 資料庫檔案：檔案不存在或不是 F-Spot 資料庫"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"無法開啟所選的 F-Spot 資料庫檔案：這個版本的 F-Spot 資料庫不受 Shotwell 支援"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取標籤表時發生錯誤"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取相片表時發生錯誤"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell 已從 F-Spot 珍藏館中找到 %d 張相片，目前正在匯入。複本會被自動偵測出"
-"來並移除。\n"
-"\n"
-"您可以關閉對話盒並繼續使用 Shotwell，匯入程序會在背景執行。"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "F-Spot 珍藏館：%s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "正在準備匯入"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "核心資料匯入服務"
-
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3 URL："
@@ -1516,7 +1467,7 @@ msgid "Go _Back"
 msgstr "返回(_B)"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1105
+#: ui/shotwell.ui:76
 msgid "_Log in"
 msgstr "登入(_L)"
 
@@ -1549,7 +1500,7 @@ msgid "pixels"
 msgstr "畫素"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:880
+#: plugins/shotwell-publishing/FlickrPublishing.vala:687
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1557,17 +1508,17 @@ msgstr "原始大小"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "寬度或高度"
+msgid "Longest edge"
+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:142
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:105
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "登出(_L)"
@@ -1575,11 +1526,11 @@ msgstr "登出(_L)"
 #: 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:156
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:121
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
 #: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
 msgid "_Publish"
@@ -1672,31 +1623,11 @@ msgstr "無法辨認的使用者"
 msgid " Site Not Found"
 msgstr " 找不到網站"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
-msgid "_Email address"
-msgstr "電子郵件位址(_E)"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
-msgid "_Password"
-msgstr "密碼(_P)"
-
 #: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "記住(_R)"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: 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:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 msgid "An _existing album:"
@@ -1748,79 +1679,10 @@ msgstr "您正以 %s 身分登入 Rajce。"
 msgid "Photos will appear in:"
 msgstr "相片將顯現於："
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:27
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell 額外發布服務"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
-msgid "Blogs:"
-msgstr "網誌："
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "相片大小(_S)："
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:876
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
-msgid "500 × 375 pixels"
-msgstr "500 x 375 畫素"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:877
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
-msgid "1024 × 768 pixels"
-msgstr "1024 x 768 畫素"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 × 853 pixels"
-msgstr "1280 x 853 畫素"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "“%s” isn’t a valid response to an OAuth authentication request"
-msgstr "「%s」不是個對 OAuth 身份核對請求的有效回應"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
-msgstr "TumblrPublisher: start( )：無法啟動；此發布器不能重新啟動。"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr "請輸入與您 Tumblr 帳戶相關聯的使用者名稱與密碼。"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
-msgid "Username and/or password invalid. Please try again"
-msgstr "使用者名稱與/或密碼無效。請重試"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
-msgid "Invalid User Name or Password"
-msgstr "無效的使用者名稱或密碼"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "無法載入使用者介面：%s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"您正以 %s 的身份登入 Tumblr。\n"
-"\n"
-
 #: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "著作權所有 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
@@ -1888,6 +1750,14 @@ msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr "上傳前先移除地理位置、相機、以及其他可供辨識的資訊(_R)"
 
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
 #: plugins/shotwell-publishing/FacebookPublishing.vala:61
 #: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
@@ -1926,17 +1796,28 @@ msgid "Where would you like to publish the selected photos?"
 msgstr "您想要在何處發布所選的相片？"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:887
-#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#: plugins/shotwell-publishing/FlickrPublishing.vala:665
 msgid "Just me"
 msgstr "只有我"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:889
-#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/FlickrPublishing.vala:661
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "每個人"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:59
+msgid "Photo _size:"
+msgstr "相片大小(_S)："
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:340
+msgid ""
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
+"continue."
+msgstr "發布所需的某個檔案無法使用。無法繼續發布至 Flickr。"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:607
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -1945,7 +1826,7 @@ msgstr ""
 "您正在以 %s 身分登入 Flickr。\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:802
+#: plugins/shotwell-publishing/FlickrPublishing.vala:609
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -1954,40 +1835,52 @@ msgstr ""
 "您的免費 Flickr 帳號限制您每月只能上傳某個量的資料。\n"
 "這個月您的上傳配額還剩 %s。"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#: plugins/shotwell-publishing/FlickrPublishing.vala:611
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "您的 Flickr Pro 帳號賦予您無限制的上傳量。"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#: plugins/shotwell-publishing/FlickrPublishing.vala:616
 msgid "Photos _visible to:"
 msgstr "誰能看見這些相片(_V)："
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#: plugins/shotwell-publishing/FlickrPublishing.vala:618
 msgid "Videos _visible to:"
 msgstr "誰能看見這些視訊(_V)："
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#: plugins/shotwell-publishing/FlickrPublishing.vala:621
 msgid "Photos and videos _visible to:"
 msgstr "誰能看見這些相片與視訊(_V)："
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#: plugins/shotwell-publishing/FlickrPublishing.vala:662
 msgid "Friends & family only"
 msgstr "僅朋友與家人"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#: plugins/shotwell-publishing/FlickrPublishing.vala:663
 msgid "Family only"
 msgstr "僅家人"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#: plugins/shotwell-publishing/FlickrPublishing.vala:664
 msgid "Friends only"
 msgstr "僅朋友"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/FlickrPublishing.vala:683
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
+#: plugins/shotwell-publishing/TumblrPublishing.vala:103
+msgid "500 × 375 pixels"
+msgstr "500 x 375 畫素"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:684
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
+#: plugins/shotwell-publishing/TumblrPublishing.vala:104
+msgid "1024 × 768 pixels"
+msgstr "1024 x 768 畫素"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:685
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 x 1536 畫素"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/FlickrPublishing.vala:686
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 x 3072 畫素"
@@ -2037,7 +1930,7 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 x 1536 畫素)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:614
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:735
 msgid "Original Size"
 msgstr "原始比例"
 
@@ -2120,7 +2013,8 @@ msgid "Certificate of %s"
 msgstr "%s 的憑證"
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:167
+#: src/Resources.vala:167 ui/multitextentrydialog.ui:40
+#: ui/slideshow_settings.ui:49
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -2170,10 +2064,36 @@ msgstr "顯示憑證…"
 msgid "I understand, please _proceed."
 msgstr "我瞭解，請繼續(_P)。"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#: plugins/shotwell-publishing/shotwell-publishing.vala:59
 msgid "Core Publishing Services"
 msgstr "核心發布服務"
 
+#: plugins/shotwell-publishing/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "網誌："
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:35
+msgid "Copyright 2012 BJA Electronics"
+msgstr "Copyright 2012 BJA Electronics"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:105
+msgid "1280 × 853 pixels"
+msgstr "1280 x 853 畫素"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:407
+msgid ""
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
+msgstr "TumblrPublisher: start( )：無法啟動；此發布器不能重新啟動。"
+
+#: plugins/shotwell-publishing/TumblrPublishing.vala:480
+#, c-format
+msgid ""
+"You are logged into Tumblr as %s.\n"
+"\n"
+msgstr ""
+"您正以 %s 的身份登入 Tumblr。\n"
+"\n"
+
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
 msgid "Video privacy _setting:"
 msgstr "視訊隱私設定值(_S)："
@@ -2295,16 +2215,17 @@ msgstr "開啟釘住工具列功能"
 msgid "Leave fullscreen"
 msgstr "離開全螢幕"
 
-#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
-#: src/data_imports/DataImportsUI.vala:303
-#: src/data_imports/DataImportsUI.vala:421 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
-#: src/publishing/PublishingUI.vala:303 src/publishing/PublishingUI.vala:527
-#: src/Resources.vala:158
+#: src/AppWindow.vala:538 src/AppWindow.vala:559 src/AppWindow.vala:576
+#: src/data_imports/DataImportsUI.vala:302
+#: src/data_imports/DataImportsUI.vala:420 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:753 src/Dialogs.vala:776
+#: src/publishing/PublishingUI.vala:302 src/publishing/PublishingUI.vala:526
+#: src/Resources.vala:158 ui/multitextentrydialog.ui:25
+#: ui/slideshow_settings.ui:35 ui/textentrydialog.ui:19
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/AppWindow.vala:579
+#: src/AppWindow.vala:586
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2316,27 +2237,21 @@ msgstr ""
 "\n"
 "%s"
 
-#. translators: %s will be replaced by application version
-#: src/AppWindow.vala:596
-#, c-format
-msgid "%s – “Aachen”"
-msgstr "%s – “Aachen”"
-
-#: src/AppWindow.vala:601
+#: src/AppWindow.vala:607
 msgid "Visit the Shotwell web site"
 msgstr "造訪 Shotwell 網頁"
 
-#: src/AppWindow.vala:614
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "無法顯示幫助：%s"
 
-#: src/AppWindow.vala:622
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "無法瀏覽臭蟲資料庫：%s"
 
-#: src/AppWindow.vala:630
+#: src/AppWindow.vala:636
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "無法顯示 FAQ：%s"
@@ -2402,17 +2317,27 @@ msgstr "損毀影像檔"
 msgid "Imported failed (%d)"
 msgstr "匯入失敗 (%d)"
 
-#: src/camera/Branch.vala:85
+#: src/camera/CameraBranch.vala:85
 msgid "Cameras"
 msgstr "相機"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:316
+#: src/camera/CameraBranch.vala:85
+msgid "List of all discovered camera devices"
+msgstr "列出所有探查到的相機裝置"
+
+#: src/camera/CameraBranch.vala:99 src/camera/ImportPage.vala:711
+#: src/camera/ImportPage.vala:727 src/photos/RawSupport.vala:311
 #: ui/collection.ui:90 ui/event.ui:361 ui/event.ui:529 ui/media.ui:361
-#: ui/photo_context.ui:96 ui/photo.ui:351 ui/tags.ui:361
+#: ui/photo_context.ui:96 ui/photo.ui:352 ui/tags.ui:361
 msgid "Camera"
 msgstr "相機"
 
+#. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+#: src/camera/CameraTable.vala:351
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
@@ -2423,46 +2348,46 @@ msgid ""
 msgstr "無法卸載相機。請從檔案管理員內嘗試卸載該相機。"
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:783
+#: src/camera/ImportPage.vala:776
 msgid "Hide photos already imported"
 msgstr "隱藏已經匯入的相片"
 
-#: src/camera/ImportPage.vala:784
+#: src/camera/ImportPage.vala:777
 msgid "Only display photos that have not been imported"
 msgstr "只顯示尚未匯入的相片"
 
-#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:816 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "匯入所選(_S)"
 
-#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#: src/camera/ImportPage.vala:826 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "匯入全部(_A)"
 
-#: src/camera/ImportPage.vala:857
+#: src/camera/ImportPage.vala:850
 msgid "The camera seems to be empty. No photos/videos found to import"
 msgstr "相機似乎空白。找不到要匯入的相片/視訊"
 
-#: src/camera/ImportPage.vala:861
+#: src/camera/ImportPage.vala:854
 msgid "No new photos/videos found on camera"
 msgstr "相機上找不到新相片/視訊"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1021
+#: src/camera/ImportPage.vala:1025
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr "Shotwell 需要從檔案系統卸載相機才能存取它。要繼續嗎？"
 
-#: src/camera/ImportPage.vala:1027
+#: src/camera/ImportPage.vala:1031
 msgid "_Unmount"
 msgstr "卸載(_U)"
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1036
 msgid "Please unmount the camera."
 msgstr "請卸載該相機。"
 
-#: src/camera/ImportPage.vala:1037
+#: src/camera/ImportPage.vala:1041
 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 "
@@ -2471,11 +2396,11 @@ msgstr ""
 "相機已被另一個應用程式鎖住。Shotwell 只能在相機沒被鎖住的情況下存取它。請關閉"
 "任何其它正在使用該相機的應用程式並重試。"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1051
 msgid "Please close any other application using the camera."
 msgstr "請關閉任何其它正在使用相機的應用程式。"
 
-#: src/camera/ImportPage.vala:1052
+#: src/camera/ImportPage.vala:1056
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2484,61 +2409,65 @@ msgstr ""
 "無法從相機擷取預覽：\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1069
+#: src/camera/ImportPage.vala:1073
 msgid "Unmounting…"
 msgstr "正在卸載…"
 
-#: src/camera/ImportPage.vala:1160
+#: src/camera/ImportPage.vala:1166
+msgid "Connecting to camera, please wait…"
+msgstr "正在連接相機，請稍候…"
+
+#: src/camera/ImportPage.vala:1198
 msgid "Starting import, please wait…"
 msgstr "正開始匯入，請稍候…"
 
-#: src/camera/ImportPage.vala:1177
+#: src/camera/ImportPage.vala:1204
 msgid "Fetching photo information"
 msgstr "正在擷取相片資訊"
 
-#: src/camera/ImportPage.vala:1535
+#: src/camera/ImportPage.vala:1563
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "正在為 %s 擷取預覽"
 
-#: src/camera/ImportPage.vala:1651
+#: src/camera/ImportPage.vala:1671
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "無法鎖住相機：%s"
 
-#: src/camera/ImportPage.vala:1736
+#: src/camera/ImportPage.vala:1756
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "要從相機刪除這 %d 張相片嗎？"
 
-#: src/camera/ImportPage.vala:1739
+#: src/camera/ImportPage.vala:1759
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "要從相機刪除這 %d 份視訊嗎？"
 
-#: src/camera/ImportPage.vala:1742
+#: src/camera/ImportPage.vala:1762
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "要從相機刪除這 %d 份相片/視訊嗎？"
 
-#: src/camera/ImportPage.vala:1745
+#: src/camera/ImportPage.vala:1765
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "要從相機刪除這 %d 份檔案嗎？"
 
-#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1773 src/Dialogs.vala:720
 msgid "_Keep"
 msgstr "保留(_K)"
 
-#: src/camera/ImportPage.vala:1772
+#: src/camera/ImportPage.vala:1792
 msgid "Removing photos/videos from camera"
 msgstr "正在從相機移除相片/視訊"
 
-#: src/camera/ImportPage.vala:1776
+#: src/camera/ImportPage.vala:1796
 #, 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."
@@ -2550,7 +2479,7 @@ msgid "_Print"
 msgstr "列印(_P)"
 
 #: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:128
-#: ui/direct_context.ui:24 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
+#: ui/direct_context.ui:23 ui/direct.ui:23 ui/event.ui:567 ui/photo.ui:28
 msgid "Send _To…"
 msgstr "傳送至(_T)…"
 
@@ -2592,13 +2521,13 @@ msgid "Flip Verti_cally"
 msgstr "垂直翻轉(_C)"
 
 #: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
-#: ui/direct_context.ui:8 ui/direct.ui:134 ui/event.ui:447
+#: ui/direct_context.ui:7 ui/direct.ui:134 ui/event.ui:447
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
-msgstr "優化(_E)"
+msgstr "補強(_E)"
 
 #: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
-#: ui/direct_context.ui:13 ui/direct.ui:161 ui/event.ui:452
+#: ui/direct_context.ui:12 ui/direct.ui:161 ui/event.ui:452
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "還原至原始(_V)"
@@ -2615,12 +2544,13 @@ msgstr "貼上色彩調整(_P)"
 msgid "Adjust Date and Time…"
 msgstr "調整日期與時間…"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:320
+#: src/CollectionPage.vala:143 src/Resources.vala:320 ui/collection.ui:108
+#: ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:361
 msgid "Open With E_xternal Editor"
 msgstr "以外部編輯器開啟(_X)"
 
 #: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:113
-#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:365
+#: ui/event.ui:552 ui/photo_context.ui:120 ui/photo.ui:366
 msgid "Open With RA_W Editor"
 msgstr "以 RA_W 編輯器開啟"
 
@@ -2628,43 +2558,37 @@ msgstr "以 RA_W 編輯器開啟"
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/CollectionPage.vala:415
+#: src/CollectionPage.vala:410
 msgid "Export Photo/Video"
-msgstr "匯出相片/視訊"
-
-#: src/CollectionPage.vala:415
-msgid "Export Photos/Videos"
-msgstr "匯出相片/視訊"
+msgid_plural "Export Photos/Videos"
+msgstr[0] "匯出相片/視訊"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#: src/CollectionPage.vala:412 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
-msgstr "匯出相片"
+msgid_plural "Export Photos"
+msgstr[0] "匯出相片"
 
-#: src/CollectionPage.vala:417 src/Dialogs.vala:84
-msgid "Export Photos"
-msgstr "匯出相片"
-
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Rotating"
 msgstr "正在旋轉"
 
-#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#: src/CollectionPage.vala:499 src/CollectionPage.vala:515
 msgid "Undoing Rotate"
 msgstr "正在復原旋轉"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:524
 msgid "Flipping Horizontally"
 msgstr "正在水平翻轉"
 
-#: src/CollectionPage.vala:530
+#: src/CollectionPage.vala:525
 msgid "Undoing Flip Horizontally"
 msgstr "正在復原水平翻轉"
 
-#: src/CollectionPage.vala:539
+#: src/CollectionPage.vala:534
 msgid "Flipping Vertically"
 msgstr "正在垂直翻轉"
 
-#: src/CollectionPage.vala:540
+#: src/CollectionPage.vala:535
 msgid "Undoing Flip Vertically"
 msgstr "正在復原垂直翻轉"
 
@@ -2678,11 +2602,11 @@ msgstr "正在復原還原"
 
 #: src/Commands.vala:781
 msgid "Enhancing"
-msgstr "正在優化"
+msgstr "正在補強"
 
 #: src/Commands.vala:781
 msgid "Undoing Enhance"
-msgstr "正在復原優化"
+msgstr "正在復原補強"
 
 #: src/Commands.vala:857
 msgid "Applying Color Transformations"
@@ -2872,19 +2796,19 @@ msgstr ""
 msgid "Database file:"
 msgstr "資料庫檔案："
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
 msgid "_Import"
 msgstr "匯入(_I)"
 
-#: src/data_imports/DataImportsUI.vala:220
+#: src/data_imports/DataImportsUI.vala:219
 msgid "Import From Application"
 msgstr "從應用程式匯入"
 
-#: src/data_imports/DataImportsUI.vala:221
+#: src/data_imports/DataImportsUI.vala:220
 msgid "Import media _from:"
 msgstr "從何處匯入媒體(_F)："
 
-#: src/data_imports/DataImportsUI.vala:416 src/publishing/PublishingUI.vala:522
+#: src/data_imports/DataImportsUI.vala:415 src/publishing/PublishingUI.vala:521
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -2951,9 +2875,9 @@ msgid "This will remove the tag “%s” from one photo. Continue?"
 msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "這會移除「%s」標籤，共 %d 張相片。要繼續嗎？"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:721
 #: src/Resources.vala:159 src/Resources.vala:362 src/Resources.vala:415
-#: src/Resources.vala:659 ui/savedsearch.ui:15 ui/tags.ui:460 ui/trash.ui:63
+#: src/Resources.vala:659 ui/savedsearch.ui:14 ui/tags.ui:460 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "刪除(_D)"
@@ -2980,6 +2904,10 @@ msgstr "切換顯影器(_S)"
 msgid "Export Video"
 msgstr "匯出視訊"
 
+#: src/Dialogs.vala:84
+msgid "Export Photos"
+msgstr "匯出相片"
+
 #. Ticket #3023
 #. Attempt to replace the system error with something friendlier
 #. if we can't copy an image over for editing in an external tool.
@@ -3010,62 +2938,34 @@ msgstr ""
 "\n"
 "您想要繼續匯出嗎？"
 
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:144
-msgid "Unmodified"
-msgstr "未修改"
-
-#: src/Dialogs.vala:145
-msgid "Current"
-msgstr "目前"
-
-#. layout controls
-#: src/Dialogs.vala:221
-msgid "_Format:"
-msgstr "格式(_F)："
-
-#: src/Dialogs.vala:224
-msgid "_Quality:"
-msgstr "品質(_Q)："
-
-#: src/Dialogs.vala:227
-msgid "_Scaling constraint:"
-msgstr "縮放限制(_S)："
-
-#: src/Dialogs.vala:230
-msgid "_Pixels:"
-msgstr "畫素(_P)："
-
-#: src/Dialogs.vala:234
-msgid "Export _metadata:"
-msgstr "匯出中介資料(_M)："
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "繼續(_T)"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:139
 msgid "Save Details…"
 msgstr "儲存細節…"
 
-#: src/Dialogs.vala:479
+#: src/Dialogs.vala:140
 msgid "Save Details"
 msgstr "儲存細節"
 
-#: src/Dialogs.vala:494
+#: src/Dialogs.vala:155
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(還有 %d 項)\n"
 
-#: src/Dialogs.vala:547
+#: src/Dialogs.vala:208
 msgid "Import Results Report"
 msgstr "匯入成果報告"
 
-#: src/Dialogs.vala:551
+#: src/Dialogs.vala:212
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "試圖匯入 %d 份檔案。"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:215
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3074,37 +2974,37 @@ msgstr[0] "其中有 %d 份檔案已成功匯入。"
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:566
+#: src/Dialogs.vala:227
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "重複的相片/視訊並未匯入："
 
-#: src/Dialogs.vala:570
+#: src/Dialogs.vala:231
 msgid "duplicates existing media item"
 msgstr "媒體項目與既有媒體重複"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:581
+#: src/Dialogs.vala:242
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "相片/視訊因相機錯誤而未匯入："
 
-#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
-#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
+#: src/Dialogs.vala:245 src/Dialogs.vala:260 src/Dialogs.vala:275
+#: src/Dialogs.vala:291 src/Dialogs.vala:306 src/Dialogs.vala:320
 msgid "error message:"
 msgstr "錯誤訊息："
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:595
+#: src/Dialogs.vala:256
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "檔案因無法辨別為相片或視訊而未匯入："
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:610
+#: src/Dialogs.vala:271
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3113,13 +3013,13 @@ msgstr "相片/視訊因格式非 Shotwell 所能認識而未匯入："
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:286
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr "相片/視訊因 Shotwell 無法將它們複製到珍藏館中而未匯入："
 
-#: src/Dialogs.vala:629
+#: src/Dialogs.vala:290
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3131,61 +3031,61 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:641
+#: src/Dialogs.vala:302
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "相片/視訊因檔案損毀而未匯入："
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:317
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "相片/視訊因其他原因而未匯入："
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:337
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d 份相片複本未被匯入：\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:340
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d 份視訊複本未被匯入：\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:343
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d 份相片/視訊複本未被匯入：\n"
 
-#: src/Dialogs.vala:696
+#: src/Dialogs.vala:357
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] "由於檔案或硬體錯誤，%d 張相片匯入失敗：\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:360
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] "由於檔案或硬體錯誤，%d 份視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:363
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
 "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] "由於檔案或硬體錯誤，%d 份相片/視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:366
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "由於檔案或硬體錯誤，%d 份檔案未能匯入：\n"
 
-#: src/Dialogs.vala:719
+#: src/Dialogs.vala:380
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3194,7 +3094,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:383
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3203,7 +3103,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:386
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3213,7 +3113,7 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份相片/視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:389
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3222,49 +3122,49 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "因為相片珍藏館資料夾無法寫入，%d 份檔案未能匯入：\n"
 
-#: src/Dialogs.vala:742
+#: src/Dialogs.vala:403
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "由於相機錯誤，%d 張相片匯入失敗：\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:406
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "由於相機錯誤，%d 份視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:409
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "由於相機錯誤，%d 份相片/視訊匯入失敗：\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:412
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "%d 份檔案因相機錯誤而未能匯入：\n"
 
-#: src/Dialogs.vala:765
+#: src/Dialogs.vala:426
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d 張相片因相片損毀而未能匯入：\n"
 
-#: src/Dialogs.vala:768
+#: src/Dialogs.vala:429
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 份視訊因視訊損毀而未能匯入：\n"
 
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:432
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d 份相片/視訊因損毀而未能匯入：\n"
 
-#: src/Dialogs.vala:774
+#: src/Dialogs.vala:435
 #, 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"
@@ -3274,7 +3174,7 @@ msgstr[0] "%d 份檔案因損毀而未能匯入：\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:791
+#: src/Dialogs.vala:452
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3282,49 +3182,49 @@ msgstr[0] "已略過 %d 張未支援相片：\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:467
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "已略過 %d 份非影像檔案。\n"
 
-#: src/Dialogs.vala:817
+#: src/Dialogs.vala:478
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "由於使用者取消，已略過 %d 張相片：\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:481
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "由於使用者取消，已略過 %d 份視訊：\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:484
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "由於使用者取消，已略過 %d 份相片/視訊：\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:487
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d 檔案已略過，因為使用者取消：\n"
 
-#: src/Dialogs.vala:840
+#: src/Dialogs.vala:501
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "已成功匯入 %d 張相片。\n"
 
-#: src/Dialogs.vala:843
+#: src/Dialogs.vala:504
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "已成功匯入 %d 份視訊。\n"
 
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:507
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3332,203 +3232,96 @@ msgstr[0] "已成功匯入 %d 份相片/視訊。\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:862
+#: src/Dialogs.vala:523
 msgid "No photos or videos imported.\n"
 msgstr "沒有匯入相片或視訊。\n"
 
-#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#: src/Dialogs.vala:530 src/Dialogs.vala:549
 msgid "Import Complete"
 msgstr "完成匯入"
 
-#: src/Dialogs.vala:1160
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-
-#: src/Dialogs.vala:1163
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分鐘"
-
-#: src/Dialogs.vala:1167
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 小時"
-
-#: src/Dialogs.vala:1170
-msgid "1 day"
-msgstr "1 天"
-
-#: src/Dialogs.vala:1317 src/Resources.vala:232
+#: src/Dialogs.vala:650 src/Resources.vala:232
 msgid "Rename Event"
 msgstr "重新命名事件"
 
-#: src/Dialogs.vala:1317
+#: src/Dialogs.vala:650
 msgid "Name:"
 msgstr "名稱："
 
 #. Dialog title
-#: src/Dialogs.vala:1328
+#: src/Dialogs.vala:661
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "編輯標題"
 
-#: src/Dialogs.vala:1329 src/Properties.vala:343
+#: src/Dialogs.vala:662 src/Properties.vala:343
 msgid "Title:"
 msgstr "標題："
 
 #. Dialog title
-#: src/Dialogs.vala:1345 src/Resources.vala:308
+#: src/Dialogs.vala:678 src/Resources.vala:308
 msgid "Edit Event Comment"
 msgstr "編輯事件評註"
 
-#: src/Dialogs.vala:1346
+#: src/Dialogs.vala:679
 msgid "Edit Photo/Video Comment"
 msgstr "編輯相片/視訊評註"
 
-#: src/Dialogs.vala:1347 src/Properties.vala:631
+#: src/Dialogs.vala:680 src/Properties.vala:631
 msgid "Comment:"
 msgstr "評註："
 
-#: src/Dialogs.vala:1363
+#: src/Dialogs.vala:696
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "移除並將檔案移至回收筒(_T)"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:700
 msgid "_Remove From Library"
 msgstr "從珍藏館移除(_R)"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edit?"
 msgstr "是否還原外部編輯？"
 
-#: src/Dialogs.vala:1410
+#: src/Dialogs.vala:743
 msgid "Revert External Edits?"
 msgstr "要還原外部編輯嗎？"
 
-#: src/Dialogs.vala:1412
+#: src/Dialogs.vala:745
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
 "This will destroy all changes made to %d external files. Continue?"
 msgstr[0] "這會破壞 %d 份外部檔案已做的所有變更。要繼續嗎？"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edit"
 msgstr "還原外部編輯(_V)"
 
-#: src/Dialogs.vala:1416
+#: src/Dialogs.vala:749
 msgid "Re_vert External Edits"
 msgstr "還原外部編輯(_V)"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:770
 #, 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] "這會從珍藏館移除 %d 張相片。要繼續嗎？"
 
-#: src/Dialogs.vala:1444 src/Resources.vala:174
+#: src/Dialogs.vala:777 src/Resources.vala:174
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photo From Library"
 msgstr "從珍藏館移除相片"
 
-#: src/Dialogs.vala:1445
+#: src/Dialogs.vala:778
 msgid "Remove Photos From Library"
 msgstr "從珍藏館移除相片"
 
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "上午"
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "下午"
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 時制"
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "以相同的量挪動相片/視訊(_S)"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "將全部相片/視訊設定為本時間(_A)"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original photo file"
-msgid_plural "_Modify original photo files"
-msgstr[0] "修改原始相片檔案(_M)"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgid_plural "_Modify original files"
-msgstr[0] "修改原始檔案(_M)"
-
-#: src/Dialogs.vala:1817
-msgid "Original: "
-msgstr "原始："
-
-#: src/Dialogs.vala:1818
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%Y/%m/%d %H:%M:%S"
-
-#: src/Dialogs.vala:1819
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%Y/%m/%d %p %I:%M:%S"
-
-#: src/Dialogs.vala:1908
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"曝光時間將往前挪動\n"
-"%d %s、%d %s、%d %s、%d %s。"
-
-#: src/Dialogs.vala:1909
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"曝光時間將往後挪動\n"
-"%d %s、%d %s、%d %s、%d %s。"
-
-#: src/Dialogs.vala:1911
-msgid "day"
-msgid_plural "days"
-msgstr[0] "天"
-
-#: src/Dialogs.vala:1912
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小時"
-
-#: src/Dialogs.vala:1913
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分鐘"
-
-#: src/Dialogs.vala:1914
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "秒"
-
-#: src/Dialogs.vala:1958
+#: src/Dialogs.vala:798
 #, c-format
 msgid ""
 "\n"
@@ -3543,121 +3336,43 @@ msgstr[0] ""
 "\n"
 "與其它 %d 項。"
 
-#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#: src/Dialogs.vala:822 src/Dialogs.vala:849
 msgid "Tags (separated by commas):"
 msgstr "標籤 (以半形逗號 \",\" 隔開)："
 
-#: src/Dialogs.vala:2089
-msgid "Welcome!"
-msgstr "歡迎！"
-
-#: src/Dialogs.vala:2096
-msgid "Welcome to Shotwell!"
-msgstr "歡迎使用 Shotwell!"
-
-#: src/Dialogs.vala:2101
-msgid "To get started, import photos in any of these ways:"
-msgstr "若要開始操作，請以這些方式之一匯入相片："
-
-#: src/Dialogs.vala:2121
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "選擇 <span weight=\"bold\">檔案 %s 從資料夾匯入</span>"
-
-#: src/Dialogs.vala:2122
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "將相片拖放至 Shotwell 視窗"
-
-#: src/Dialogs.vala:2123
-msgid "Connect a camera to your computer and import"
-msgstr "將相機連接至您的電腦並匯入"
-
-#: src/Dialogs.vala:2134
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "從您的 %s 目錄匯入相片(_I)"
-
-#: src/Dialogs.vala:2141
-msgid "You can also import photos in any of these ways:"
-msgstr "您可以藉這些方式之一匯入相片："
-
-#: src/Dialogs.vala:2152
-msgid "_Don’t show this message again"
-msgstr "別再顯示這則訊息(_D)"
-
-#: src/Dialogs.vala:2189
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "從您的 %s 珍藏館匯入相片"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
-msgid "(Help)"
-msgstr "(幫助)"
-
-#: src/Dialogs.vala:2346
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "年%s月%s日"
-
-#: src/Dialogs.vala:2348
-#, c-format
-msgid "Year%sMonth"
-msgstr "年%s月"
-
-#: src/Dialogs.vala:2350
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "年%s月-日"
-
-#: src/Dialogs.vala:2352
-msgid "Year-Month-Day"
-msgstr "年-月-日"
-
-#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
-msgid "Custom"
-msgstr "自訂"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2590
-msgid "Invalid pattern"
-msgstr "無效的樣式"
-
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:908
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr "Shotwell 可以複製相片至您的珍藏館，或是直接將它們匯入而不必複製。"
 
-#: src/Dialogs.vala:2697
+#: src/Dialogs.vala:913
 msgid "Co_py Photos"
 msgstr "複製相片(_P)"
 
-#: src/Dialogs.vala:2698
+#: src/Dialogs.vala:914
 msgid "_Import in Place"
 msgstr "匯入位置(_I)"
 
-#: src/Dialogs.vala:2699
+#: src/Dialogs.vala:915
 msgid "Import to Library"
 msgstr "匯入至珍藏館"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:925 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "從珍藏館移除"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#: src/Dialogs.vala:926 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "正在從珍藏館移除相片"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:926
 msgid "Removing Photos From Library"
 msgstr "正在從珍藏館移除相片"
 
-#: src/Dialogs.vala:2724
+#: src/Dialogs.vala:940
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3675,7 +3390,7 @@ msgstr[0] ""
 "\n"
 "這個動作無法還原。"
 
-#: src/Dialogs.vala:2728
+#: src/Dialogs.vala:944
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3693,7 +3408,7 @@ msgstr[0] ""
 "\n"
 "這個動作無法還原。"
 
-#: src/Dialogs.vala:2732
+#: src/Dialogs.vala:948
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -3711,7 +3426,7 @@ msgstr[0] ""
 "\n"
 "這個動作無法還原。"
 
-#: src/Dialogs.vala:2764
+#: src/Dialogs.vala:980
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -3720,7 +3435,7 @@ msgid_plural ""
 msgstr[0] "%d 份相片/視訊無法移至您的桌面回收筒。要刪除這些檔案嗎？"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2781
+#: src/Dialogs.vala:997
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3759,6 +3474,7 @@ msgid "Unable open photo %s. Sorry."
 msgstr "無法列印相片 %s。抱歉。"
 
 #: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:176 ui/direct.ui:8
+#: ui/textentrydialog.ui:33
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -3790,201 +3506,420 @@ msgstr "另存新檔"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "無法監視 %s：非目錄 (%s)"
 
-#: src/editing_tools/EditingTools.vala:666
+#: src/dialogs/AdjustDateTimeDialog.vala:78
+msgid "AM"
+msgstr "上午"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:79
+msgid "PM"
+msgstr "下午"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:80
+msgid "24 Hr"
+msgstr "24 時制"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:95
+msgid "_Shift photos/videos by the same amount"
+msgstr "以相同的量挪動相片/視訊(_S)"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:100
+msgid "Set _all photos/videos to this time"
+msgstr "將全部相片/視訊設定為本時間(_A)"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:106
+msgid "_Modify original photo file"
+msgid_plural "_Modify original photo files"
+msgstr[0] "修改原始相片檔案(_M)"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:110
+msgid "_Modify original file"
+msgid_plural "_Modify original files"
+msgstr[0] "修改原始檔案(_M)"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:213
+msgid "Original: "
+msgstr "原始："
+
+#: src/dialogs/AdjustDateTimeDialog.vala:214
+msgid "%m/%d/%Y, %H:%M:%S"
+msgstr "%Y/%m/%d %H:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:215
+msgid "%m/%d/%Y, %I:%M:%S %p"
+msgstr "%Y/%m/%d %p %I:%M:%S"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:306
+#, c-format
+msgid ""
+"Exposure time will be shifted forward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"曝光時間將往後挪動\n"
+"%d %s、%d %s、%d %s、%d %s。"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:307
+#, c-format
+msgid ""
+"Exposure time will be shifted backward by\n"
+"%d %s, %d %s, %d %s, and %d %s."
+msgstr ""
+"曝光時間將往前挪動\n"
+"%d %s、%d %s、%d %s、%d %s。"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:309
+msgid "day"
+msgid_plural "days"
+msgstr[0] "天"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:310
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "小時"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:311
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分鐘"
+
+#: src/dialogs/AdjustDateTimeDialog.vala:312
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "秒"
+
+#. "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/ExportDialog.vala:15
+msgid "Unmodified"
+msgstr "未修改"
+
+#: src/dialogs/ExportDialog.vala:16
+msgid "Current"
+msgstr "目前"
+
+#. layout controls
+#: src/dialogs/ExportDialog.vala:90
+msgid "_Format:"
+msgstr "格式(_F)："
+
+#: src/dialogs/ExportDialog.vala:93
+msgid "_Quality:"
+msgstr "品質(_Q)："
+
+#: src/dialogs/ExportDialog.vala:96
+msgid "_Scaling constraint:"
+msgstr "縮放限制(_S)："
+
+#: src/dialogs/ExportDialog.vala:99
+msgid "_Pixels:"
+msgstr "畫素(_P)："
+
+#: src/dialogs/ExportDialog.vala:103
+msgid "Export _metadata:"
+msgstr "匯出中介資料(_M)："
+
+#. 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/Preferences.vala:115 src/dialogs/Preferences.vala:119
+msgid "(Help)"
+msgstr "(幫助)"
+
+#: src/dialogs/Preferences.vala:123
+#, c-format
+msgid "Year%sMonth%sDay"
+msgstr "年%s月%s日"
+
+#: src/dialogs/Preferences.vala:125
+#, c-format
+msgid "Year%sMonth"
+msgstr "年%s月"
+
+#: src/dialogs/Preferences.vala:127
+#, c-format
+msgid "Year%sMonth-Day"
+msgstr "年%s月-日"
+
+#: src/dialogs/Preferences.vala:129
+msgid "Year-Month-Day"
+msgstr "年-月-日"
+
+#: src/dialogs/Preferences.vala:130 src/editing_tools/EditingTools.vala:760
+msgid "Custom"
+msgstr "自訂"
+
+#. Invalid pattern.
+#: src/dialogs/Preferences.vala:369
+msgid "Invalid pattern"
+msgstr "無效的樣式"
+
+#: src/dialogs/ProgressDialog.vala:97
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:49
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:52
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分鐘"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:56
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小時"
+
+#: src/dialogs/SetBackgroundSlideshow.vala:59
+msgid "1 day"
+msgstr "1 天"
+
+#: src/dialogs/WelcomeDialog.vala:35
+msgid "Welcome!"
+msgstr "歡迎！"
+
+#: src/dialogs/WelcomeDialog.vala:42
+msgid "Welcome to Shotwell!"
+msgstr "歡迎使用 Shotwell!"
+
+#: src/dialogs/WelcomeDialog.vala:47
+msgid "To get started, import photos in any of these ways:"
+msgstr "若要開始操作，請以這些方式之一匯入相片："
+
+#: src/dialogs/WelcomeDialog.vala:67
+#, c-format
+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
+msgstr "選擇 <span weight=\"bold\">檔案 %s 從資料夾匯入</span>"
+
+#: src/dialogs/WelcomeDialog.vala:68
+msgid "Drag and drop photos onto the Shotwell window"
+msgstr "將相片拖放至 Shotwell 視窗"
+
+#: src/dialogs/WelcomeDialog.vala:69
+msgid "Connect a camera to your computer and import"
+msgstr "將相機連接至您的電腦並匯入"
+
+#: src/dialogs/WelcomeDialog.vala:80
+#, c-format
+msgid "_Import photos from your %s folder"
+msgstr "從您的 %s 目錄匯入相片(_I)"
+
+#: src/dialogs/WelcomeDialog.vala:87
+msgid "You can also import photos in any of these ways:"
+msgstr "您可以藉這些方式之一匯入相片："
+
+#: src/dialogs/WelcomeDialog.vala:98
+msgid "_Don’t show this message again"
+msgstr "別再顯示這則訊息(_D)"
+
+#: src/dialogs/WelcomeDialog.vala:135
+#, c-format
+msgid "Import photos from your %s library"
+msgstr "從您的 %s 珍藏館匯入相片"
+
+#: src/editing_tools/EditingTools.vala:644
 msgid "Return to current photo dimensions"
 msgstr "返回目前相片維度"
 
-#: src/editing_tools/EditingTools.vala:669
+#: src/editing_tools/EditingTools.vala:647
 msgid "Set the crop for this photo"
 msgstr "為此相片設定裁切"
 
-#: src/editing_tools/EditingTools.vala:681
+#: src/editing_tools/EditingTools.vala:659
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "在肖像與風景方向之間旋轉裁切矩形"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:732
 msgid "Unconstrained"
 msgstr "未限制"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:733
 msgid "Square"
 msgstr "方形"
 
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:734
 msgid "Screen"
 msgstr "螢幕畫面"
 
-#: src/editing_tools/EditingTools.vala:758
-#: src/editing_tools/EditingTools.vala:761
-#: src/editing_tools/EditingTools.vala:771
-#: src/editing_tools/EditingTools.vala:781
+#: src/editing_tools/EditingTools.vala:736
+#: src/editing_tools/EditingTools.vala:739
+#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:759
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:737
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD 視訊 (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:738
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD 視訊 (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+#: src/editing_tools/EditingTools.vala:740 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "皮夾 (2 x 3 英吋)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+#: src/editing_tools/EditingTools.vala:741 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "短柬 (3 x 5 英吋)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+#: src/editing_tools/EditingTools.vala:742 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 x 6 英吋"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+#: src/editing_tools/EditingTools.vala:743 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 x 7 英吋"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+#: src/editing_tools/EditingTools.vala:744 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 x 10 英吋"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:745
 msgid "Letter (8.5 × 11 in.)"
 msgstr "信紙 (8.5 x 11 英吋)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+#: src/editing_tools/EditingTools.vala:746 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 x 14 英吋"
 
-#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:747
 msgid "Tabloid (11 × 17 in.)"
 msgstr "小報紙 (11 x 17 英吋)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+#: src/editing_tools/EditingTools.vala:748 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 x 20 英吋"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+#: src/editing_tools/EditingTools.vala:750 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "公制皮夾 (9 x 13 公分)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+#: src/editing_tools/EditingTools.vala:751 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "明信片 (10 x 15 公分)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+#: src/editing_tools/EditingTools.vala:752 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 x 18 公分"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+#: src/editing_tools/EditingTools.vala:753 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 x 24 公分"
 
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:754
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 x 297 公釐)"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+#: src/editing_tools/EditingTools.vala:755 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 x 30 公分"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+#: src/editing_tools/EditingTools.vala:756 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 x 40 公分"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 x 40 公分"
 
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:758
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 x 420 公釐)"
 
-#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1858 src/Properties.vala:398
 msgid "Size:"
 msgstr "大小："
 
-#: src/editing_tools/EditingTools.vala:1895
+#: src/editing_tools/EditingTools.vala:1873
 msgid "Close the red-eye tool"
 msgstr "關閉紅眼工具"
 
-#: src/editing_tools/EditingTools.vala:1898
+#: src/editing_tools/EditingTools.vala:1876
 msgid "Remove any red-eye effects in the selected region"
 msgstr "移除所選區域內的紅眼效應"
 
-#: src/editing_tools/EditingTools.vala:2238
+#: src/editing_tools/EditingTools.vala:2216
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "重設(_R)"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2230 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "曝光："
 
-#: src/editing_tools/EditingTools.vala:2261
+#: src/editing_tools/EditingTools.vala:2239
 msgid "Contrast:"
 msgstr "對比："
 
-#: src/editing_tools/EditingTools.vala:2270
+#: src/editing_tools/EditingTools.vala:2248
 msgid "Saturation:"
 msgstr "飽和："
 
-#: src/editing_tools/EditingTools.vala:2279
+#: src/editing_tools/EditingTools.vala:2257
 msgid "Tint:"
 msgstr "色相："
 
-#: src/editing_tools/EditingTools.vala:2289
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Temperature:"
 msgstr "色溫："
 
-#: src/editing_tools/EditingTools.vala:2298
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Shadows:"
 msgstr "陰影："
 
-#: src/editing_tools/EditingTools.vala:2307
+#. FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+#. Differently (probably because it only has positive values)
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Highlights:"
 msgstr "高亮："
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset Colors"
 msgstr "重設色彩"
 
-#: src/editing_tools/EditingTools.vala:2363
+#: src/editing_tools/EditingTools.vala:2344
 msgid "Reset all color adjustments to original"
 msgstr "重設所有色彩調整為原始狀態"
 
-#: src/editing_tools/EditingTools.vala:2722
+#: src/editing_tools/EditingTools.vala:2703
 msgid "Temperature"
 msgstr "色溫"
 
-#: src/editing_tools/EditingTools.vala:2734
+#: src/editing_tools/EditingTools.vala:2715
 msgid "Tint"
 msgstr "色相"
 
-#: src/editing_tools/EditingTools.vala:2746
+#: src/editing_tools/EditingTools.vala:2727
 msgid "Contrast"
 msgstr "對比"
 
-#: src/editing_tools/EditingTools.vala:2760
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Saturation"
 msgstr "飽和"
 
-#: src/editing_tools/EditingTools.vala:2773
+#: src/editing_tools/EditingTools.vala:2754
 msgid "Exposure"
 msgstr "曝光"
 
-#: src/editing_tools/EditingTools.vala:2786
+#: src/editing_tools/EditingTools.vala:2767
 msgid "Shadows"
 msgstr "陰影"
 
-#: src/editing_tools/EditingTools.vala:2799
+#: src/editing_tools/EditingTools.vala:2780
 msgid "Highlights"
 msgstr "高亮"
 
-#: src/editing_tools/EditingTools.vala:2809
+#: src/editing_tools/EditingTools.vala:2790
 msgid "Contrast Expansion"
 msgstr "對比擴展"
 
@@ -3997,23 +3932,19 @@ msgstr "角度："
 msgid "_Straighten"
 msgstr "拉直(_S)"
 
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "事件"
-
-#: src/events/EventDirectoryItem.vala:83
+#: src/events/EventDirectoryItem.vala:97
 #, c-format
 msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d 份相片/視訊"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#: src/events/EventDirectoryItem.vala:99 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d 份視訊"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
+#: src/events/EventDirectoryItem.vala:101 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
@@ -4023,27 +3954,35 @@ msgstr[0] "%d 張相片"
 msgid "No Event"
 msgstr "無事件"
 
-#: src/events/EventsDirectoryPage.vala:150
+#: src/events/EventsBranch.vala:25
+msgid "Events"
+msgstr "事件"
+
+#: src/events/EventsBranch.vala:25
+msgid "Browse through your events"
+msgstr "瀏覽您經歷的事件"
+
+#: src/events/EventsDirectoryPage.vala:149
 msgid "No events"
 msgstr "無事件"
 
-#: src/events/EventsDirectoryPage.vala:154
+#: src/events/EventsDirectoryPage.vala:153
 msgid "No events found"
 msgstr "找不到事件"
 
-#: src/events/EventsDirectoryPage.vala:227
+#: src/events/EventsDirectoryPage.vala:226
 msgid "All Events"
 msgstr "所有事件"
 
-#: src/events/EventsDirectoryPage.vala:241
+#: src/events/EventsDirectoryPage.vala:240
 msgid "Undated"
 msgstr "未限定日期"
 
-#: src/events/EventsDirectoryPage.vala:242
+#: src/events/EventsDirectoryPage.vala:241
 msgid "%Y"
 msgstr "%Y年"
 
-#: src/events/EventsDirectoryPage.vala:243
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%B"
 msgstr "%b"
 
@@ -4083,20 +4022,16 @@ msgstr "全部取代(_A)"
 msgid "Export"
 msgstr "匯出"
 
-#: src/folders/Branch.vala:144
+#: src/folders/FoldersBranch.vala:144
 msgid "Folders"
 msgstr "資料夾"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
-msgid "Library"
-msgstr "珍藏館"
+#: src/folders/FoldersBranch.vala:144
+msgid "Browse the library’s folder structure"
+msgstr "瀏覽珍藏館的資料夾結構"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
-msgid "Photos"
-msgstr "相片"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
-#: src/SearchFilter.vala:1103
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1098
+#: src/SearchFilter.vala:1099
 msgid "Flagged"
 msgstr "已加上旗幟"
 
@@ -4117,19 +4052,36 @@ msgstr "已匯入 %s"
 msgid "Last Import"
 msgstr "上次匯入"
 
-#: src/library/LibraryWindow.vala:507
+#: src/library/LibraryBranch.vala:30 src/library/LibraryBranch.vala:130
+#: ui/preferences_dialog.ui:512
+msgid "Library"
+msgstr "珍藏館"
+
+#: src/library/LibraryBranch.vala:30
+msgid "Organize and browse your photos"
+msgstr "整理並瀏覽您的相片"
+
+#: src/library/LibraryBranch.vala:97 src/SearchFilter.vala:1079
+msgid "Photos"
+msgstr "相片"
+
+#: src/library/LibraryWindow.vala:508
 msgid "Import From Folder"
 msgstr "從資料夾匯入"
 
-#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:515
+msgid "Recurse Into Subfolders"
+msgstr "遞迴進入子資料夾"
+
+#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "清空回收筒"
 
-#: src/library/LibraryWindow.vala:576
+#: src/library/LibraryWindow.vala:583
 msgid "Emptying Trash…"
 msgstr "正在清空回收筒…"
 
-#: src/library/LibraryWindow.vala:772
+#: src/library/LibraryWindow.vala:779
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4141,33 +4093,33 @@ msgstr ""
 "我們建議您在 <span weight=\"bold\">編輯 %s 偏好設定</span> 中更改此設定。\n"
 "您是否想要繼續匯入相片？"
 
-#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr "珍藏館位置"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:788
+#: src/library/LibraryWindow.vala:795
 msgid "Photos cannot be imported from this directory."
 msgstr "相片無法從此目錄匯入。"
 
-#: src/library/LibraryWindow.vala:1068
+#: src/library/LibraryWindow.vala:1075
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
 msgid "Updating library…"
 msgstr "正在更新珍藏館…"
 
-#: src/library/LibraryWindow.vala:1129
+#: src/library/LibraryWindow.vala:1136
 msgid "Preparing to auto-import photos…"
 msgstr "正在準備自動匯入相片…"
 
-#: src/library/LibraryWindow.vala:1134
+#: src/library/LibraryWindow.vala:1141
 msgid "Auto-importing photos…"
 msgstr "正在自動匯入相片…"
 
-#: src/library/LibraryWindow.vala:1142
+#: src/library/LibraryWindow.vala:1149
 msgid "Writing metadata to files…"
 msgstr "正在將中介資料寫入檔案中…"
 
@@ -4183,15 +4135,15 @@ msgstr "正在刪除…"
 msgid "Trash"
 msgstr "回收筒"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:106
 msgid "Trash is empty"
 msgstr "空的回收筒"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:110
 msgid "Delete"
 msgstr "刪除"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:111
 msgid "Deleting Photos"
 msgstr "正在刪除相片"
 
@@ -4236,32 +4188,36 @@ msgstr "試圖驗證 Shotwell 資料庫時發生未知錯誤：%s"
 msgid "Loading Shotwell"
 msgstr "正載入 Shotwell"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "Path to Shotwell’s private data"
 msgstr "Shotwell 的私人資料路徑"
 
-#: src/main.vala:293
+#: src/main.vala:303
 msgid "DIRECTORY"
 msgstr "目錄"
 
-#: src/main.vala:297
+#: src/main.vala:307
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "執行時期不要監視珍藏館目錄是否有變動"
 
-#: src/main.vala:301
+#: src/main.vala:311
 msgid "Don’t display startup progress meter"
 msgstr "不要顯示初始啟動時的進度條"
 
-#: src/main.vala:305
+#: src/main.vala:315
 msgid "Show the application’s version"
 msgstr "顯示應用程式的版本"
 
+#: src/main.vala:319
+msgid "Start the application in fullscreen mode"
+msgstr "以全螢幕模式啟動應用程式"
+
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:342
+#: src/main.vala:356
 msgid "[FILE]"
 msgstr "[檔案]"
 
-#: src/main.vala:346
+#: src/main.vala:360
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr "執行「%s --help」來查看可用命令列選項的完整清單。\n"
@@ -4275,7 +4231,7 @@ msgstr "無法處理監視更新：%s"
 msgid "Adjust the size of the thumbnails"
 msgstr "調整縮圖大小"
 
-#: src/MediaPage.vala:503
+#: src/MediaPage.vala:502
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4284,15 +4240,15 @@ msgstr ""
 "Shotwell 無法播放所選的視訊：\n"
 "%s"
 
-#: src/Page.vala:1319
+#: src/Page.vala:1327
 msgid "No photos/videos"
 msgstr "無相片/視訊"
 
-#: src/Page.vala:1323
+#: src/Page.vala:1331
 msgid "No photos/videos found which match the current filter"
 msgstr "根據目前的過濾器找不到符合的相片/視訊"
 
-#: src/Page.vala:2629
+#: src/Page.vala:2644
 msgid "Photos cannot be exported to this directory."
 msgstr "無法匯出相片至此目錄。"
 
@@ -4356,7 +4312,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3755
+#: src/Photo.vala:3774
 msgid "modified"
 msgstr "已修改"
 
@@ -4523,7 +4479,7 @@ msgstr "著作權："
 msgid "Software:"
 msgstr "軟體："
 
-#: src/Properties.vala:644
+#: src/Properties.vala:642
 msgid "Extended Information"
 msgstr "擴展資訊"
 
@@ -4569,37 +4525,37 @@ msgstr "正在擷取帳號資訊…"
 msgid "Logging in…"
 msgstr "正在登入…"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish Photos"
 msgstr "發布相片"
 
-#: src/publishing/PublishingUI.vala:196
+#: src/publishing/PublishingUI.vala:195
 msgid "Publish photos _to:"
 msgstr "將相片發布至(_T)："
 
-#: src/publishing/PublishingUI.vala:198
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish Videos"
 msgstr "發布視訊"
 
-#: src/publishing/PublishingUI.vala:199
+#: src/publishing/PublishingUI.vala:198
 msgid "Publish videos _to"
 msgstr "將視訊發布至(_T)"
 
-#: src/publishing/PublishingUI.vala:201
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish Photos and Videos"
 msgstr "發布相片與視訊"
 
-#: src/publishing/PublishingUI.vala:202
+#: src/publishing/PublishingUI.vala:201
 msgid "Publish photos and videos _to"
 msgstr "將相片與視訊發布至(_T)"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:412
+#: src/publishing/PublishingUI.vala:411
 msgid "Unable to publish"
 msgstr "無法發布"
 
-#: src/publishing/PublishingUI.vala:413
+#: src/publishing/PublishingUI.vala:412
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4642,9 +4598,10 @@ msgstr "水平翻轉"
 msgid "Flip Vertically"
 msgstr "垂直翻轉"
 
-#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
-#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:421
-#: ui/offline.ui:198 ui/photo.ui:404 ui/tags.ui:440 ui/trash.ui:207
+#: src/Resources.vala:156 ui/direct.ui:192 ui/events_directory.ui:168
+#: ui/event.ui:438 ui/import_queue.ui:83 ui/import.ui:201
+#: ui/manifest_widget.ui:35 ui/media.ui:421 ui/offline.ui:198 ui/photo.ui:405
+#: ui/tags.ui:440 ui/trash.ui:207
 msgid "_About"
 msgstr "關於(_A)"
 
@@ -4667,11 +4624,11 @@ msgstr "前進(_F)"
 msgid "Fulls_creen"
 msgstr "全螢幕(_C)"
 
-#: src/Resources.vala:163 ui/direct.ui:173 ui/direct.ui:176
+#: src/Resources.vala:163 ui/direct.ui:174 ui/direct.ui:177
 #: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:420
 #: ui/event.ui:423 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
 #: ui/import.ui:186 ui/media.ui:403 ui/media.ui:406 ui/offline.ui:180
-#: ui/offline.ui:183 ui/photo.ui:386 ui/photo.ui:389 ui/tags.ui:422
+#: ui/offline.ui:183 ui/photo.ui:387 ui/photo.ui:390 ui/tags.ui:422
 #: ui/tags.ui:425 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "求助(_H)"
@@ -5087,7 +5044,7 @@ msgid "Adjust Date and Time"
 msgstr "調整日期與時間"
 
 #: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:407 ui/event.ui:458
-#: ui/media.ui:390 ui/photo.ui:374 ui/tags.ui:390
+#: ui/media.ui:390 ui/photo.ui:375 ui/tags.ui:390
 msgid "Add _Tags…"
 msgstr "加入標籤(_T)…"
 
@@ -5178,7 +5135,7 @@ msgid "_Rename…"
 msgstr "重新命名(_R)…"
 
 #: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:412 ui/event.ui:463
-#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:379 ui/tags.ui:395
+#: ui/media.ui:395 ui/photo_context.ui:22 ui/photo.ui:380 ui/tags.ui:395
 msgid "Modif_y Tags…"
 msgstr "修改標籤(_Y)…"
 
@@ -5221,7 +5178,7 @@ msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "「%s」搜尋已經存在，故無法重新命名該搜尋。"
 
 #. Saved search button
-#: src/Resources.vala:411 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1120
 msgid "Saved Search"
 msgstr "儲存的搜尋"
 
@@ -5229,11 +5186,11 @@ msgstr "儲存的搜尋"
 msgid "Delete Search"
 msgstr "刪除搜尋"
 
-#: src/Resources.vala:416 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:10
 msgid "_Edit…"
 msgstr "編輯(_E)…"
 
-#: src/Resources.vala:417 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:6
 msgid "Re_name…"
 msgstr "重新命名(_N)…"
 
@@ -5303,7 +5260,7 @@ msgstr "還原(_R)"
 msgid "Move the selected photos back into the library"
 msgstr "將所選的相片移回珍藏館"
 
-#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:19
+#: src/Resources.vala:666 ui/collection.ui:123 ui/direct_context.ui:18
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:562 ui/media.ui:27
 #: ui/photo_context.ui:130 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
@@ -5319,7 +5276,8 @@ msgstr "在檔案管理員內開啟所選的相片目錄"
 msgid "Unable to open in file manager: %s"
 msgstr "無法於檔案管理員內開啟：%s"
 
-#: src/Resources.vala:673 ui/offline.ui:224
+#: src/Resources.vala:673 ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58
+#: ui/offline.ui:207 ui/offline.ui:224 ui/photo.ui:77 ui/tags.ui:74
 msgid "R_emove From Library"
 msgstr "從珍藏館移除(_E)"
 
@@ -5382,151 +5340,123 @@ msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%b%d日（%a）"
 
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:115
 msgid "Slideshow"
 msgstr "投影秀"
 
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "儲存的搜尋"
-
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:162
+#: src/searches/SavedSearchDialog.vala:167
 msgid "contains"
 msgstr "包含"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:163
-#: src/searches/SavedSearchDialog.vala:494
+#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:499
 msgid "is exactly"
 msgstr "完全是"
 
-#: src/searches/SavedSearchDialog.vala:164
+#: src/searches/SavedSearchDialog.vala:169
 msgid "starts with"
 msgstr "開頭為"
 
-#: src/searches/SavedSearchDialog.vala:165
+#: src/searches/SavedSearchDialog.vala:170
 msgid "ends with"
 msgstr "結尾為"
 
-#: src/searches/SavedSearchDialog.vala:166
+#: src/searches/SavedSearchDialog.vala:171
 msgid "does not contain"
 msgstr "不包含"
 
-#: src/searches/SavedSearchDialog.vala:167
-#: src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is not set"
 msgstr "未設定"
 
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:173
 msgid "is set"
 msgstr "有設定"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:242
-#: src/searches/SavedSearchDialog.vala:373
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:247
+#: src/searches/SavedSearchDialog.vala:378
+#: src/searches/SavedSearchDialog.vala:443
 msgid "is"
 msgstr "是"
 
-#: src/searches/SavedSearchDialog.vala:243
+#: src/searches/SavedSearchDialog.vala:248
 msgid "is not"
 msgstr "不是"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:254
 msgid "any photo"
 msgstr "任意相片"
 
-#: src/searches/SavedSearchDialog.vala:250
+#: src/searches/SavedSearchDialog.vala:255
 msgid "a raw photo"
 msgstr "RAW 相片"
 
-#: src/searches/SavedSearchDialog.vala:251
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a video"
 msgstr "視訊"
 
-#: src/searches/SavedSearchDialog.vala:305
+#: src/searches/SavedSearchDialog.vala:310
 msgid "has"
 msgstr "有"
 
-#: src/searches/SavedSearchDialog.vala:306
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has no"
 msgstr "沒有"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:316
 msgid "modifications"
 msgstr "修改"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:317
 msgid "internal modifications"
 msgstr "內部修改"
 
-#: src/searches/SavedSearchDialog.vala:313
+#: src/searches/SavedSearchDialog.vala:318
 msgid "external modifications"
 msgstr "外部修改"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:367
+#: src/searches/SavedSearchDialog.vala:372
 msgid "flagged"
 msgstr "已加上旗幟"
 
-#: src/searches/SavedSearchDialog.vala:368
+#: src/searches/SavedSearchDialog.vala:373
 msgid "not flagged"
 msgstr "未加上旗幟"
 
-#: src/searches/SavedSearchDialog.vala:431
+#: src/searches/SavedSearchDialog.vala:436
 msgid "and higher"
 msgstr "與更高"
 
-#: src/searches/SavedSearchDialog.vala:432
+#: src/searches/SavedSearchDialog.vala:437
 msgid "only"
 msgstr "只有"
 
-#: src/searches/SavedSearchDialog.vala:433
+#: src/searches/SavedSearchDialog.vala:438
 msgid "and lower"
 msgstr "與更低"
 
-#: src/searches/SavedSearchDialog.vala:495
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is after"
 msgstr "晚於"
 
-#: src/searches/SavedSearchDialog.vala:496
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is before"
 msgstr "早於"
 
-#: src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is between"
 msgstr "介於"
 
-#: src/searches/SavedSearchDialog.vala:510
+#: src/searches/SavedSearchDialog.vala:515
 msgid "and"
 msgstr "與"
 
-#: src/searches/SavedSearchDialog.vala:691
-msgid "Search"
-msgstr "搜尋"
-
-#: src/searches/SavedSearchDialog.vala:696
-msgid "Cancel"
-msgstr "取消"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "OK"
-msgstr "確定"
-
-#: src/searches/SavedSearchDialog.vala:716
-msgid "any"
-msgstr "任何"
-
-#: src/searches/SavedSearchDialog.vala:717
-msgid "all"
-msgstr "全部"
-
-#: src/searches/SavedSearchDialog.vala:718
-msgid "none"
-msgstr "無"
-
 #: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "任意文字"
@@ -5563,8 +5493,8 @@ msgstr "旗幟狀態"
 msgid "Photo state"
 msgstr "相片狀態"
 
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1114
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:827
+#: src/SearchFilter.vala:1110
 msgid "Rating"
 msgstr "評等"
 
@@ -5572,27 +5502,35 @@ msgstr "評等"
 msgid "Date"
 msgstr "日期"
 
-#: src/SearchFilter.vala:815
+#: src/searches/SearchesBranch.vala:68
+msgid "Saved Searches"
+msgstr "儲存的搜尋"
+
+#: src/searches/SearchesBranch.vala:68
+msgid "Organize your saved searches"
+msgstr "整理您儲存的搜尋"
+
+#: src/SearchFilter.vala:811
 msgid "★+ Rating"
 msgstr "★+ 評等"
 
-#: src/SearchFilter.vala:818
+#: src/SearchFilter.vala:814
 msgid "★★+ Rating"
 msgstr "★★+ 評等"
 
-#: src/SearchFilter.vala:821
+#: src/SearchFilter.vala:817
 msgid "★★★+ Rating"
 msgstr "★★★+ 評等"
 
-#: src/SearchFilter.vala:824
+#: src/SearchFilter.vala:820
 msgid "★★★★+ Rating"
 msgstr "★★★★+ 評等"
 
-#: src/SearchFilter.vala:828
+#: src/SearchFilter.vala:824
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ 評等"
 
-#: src/SearchFilter.vala:1064
+#: src/SearchFilter.vala:1060
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "載入搜尋列 UI 時發生錯誤：%s"
@@ -5602,71 +5540,71 @@ msgstr "載入搜尋列 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:1073
+#: src/SearchFilter.vala:1069
 msgid "Close"
 msgstr "關閉"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1079
+#: src/SearchFilter.vala:1075
 msgid "Type"
 msgstr "類型"
 
-#: src/SearchFilter.vala:1086
+#: src/SearchFilter.vala:1082
 msgid "Videos"
 msgstr "視訊"
 
-#: src/SearchFilter.vala:1089
+#: src/SearchFilter.vala:1085
 msgid "RAW Photos"
 msgstr "RAW 相片"
 
-#: src/SearchFilter.vala:1125
+#: src/SearchFilter.vala:1121
 msgid "Use a saved search to filter items in the current view"
 msgstr "使用儲存的搜尋來過濾目前檢視畫面中的項目"
 
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "設定值"
-
 #. Set up toolbar
 #. add toolbar buttons
-#: src/SlideshowPage.vala:160
+#: src/SlideshowPage.vala:134
 msgid "Back"
 msgstr "返回"
 
-#: src/SlideshowPage.vala:162
+#: src/SlideshowPage.vala:136
 msgid "Go to the previous photo"
 msgstr "前往上一張相片"
 
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#: src/SlideshowPage.vala:141 src/SlideshowPage.vala:248
 msgid "Pause"
 msgstr "暫停"
 
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#: src/SlideshowPage.vala:143 src/SlideshowPage.vala:249
 msgid "Pause the slideshow"
 msgstr "暫停投影秀"
 
-#: src/SlideshowPage.vala:174
+#: src/SlideshowPage.vala:148
 msgid "Next"
 msgstr "下一張"
 
-#: src/SlideshowPage.vala:176
+#: src/SlideshowPage.vala:150
 msgid "Go to the next photo"
 msgstr "前往下一張相片"
 
-#: src/SlideshowPage.vala:184
+#: src/SlideshowPage.vala:157 ui/slideshow_settings.ui:21
+msgid "Settings"
+msgstr "設定值"
+
+#: src/SlideshowPage.vala:158
 msgid "Change slideshow settings"
 msgstr "變更投影秀設定值"
 
 #. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
+#: src/SlideshowPage.vala:212
 msgid "All photo source files are missing."
 msgstr "遺失全部相片來源檔。"
 
-#: src/SlideshowPage.vala:270
+#: src/SlideshowPage.vala:244
 msgid "Play"
 msgstr "播放"
 
-#: src/SlideshowPage.vala:271
+#: src/SlideshowPage.vala:245
 msgid "Continue the slideshow"
 msgstr "繼續投影秀"
 
@@ -5678,7 +5616,7 @@ msgstr "投影秀轉場"
 msgid "(None)"
 msgstr "(無)"
 
-#: src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287 ui/preferences_dialog.ui:485
 msgid "None"
 msgstr "無"
 
@@ -5686,16 +5624,20 @@ msgstr "無"
 msgid "Random"
 msgstr "隨機"
 
-#: src/tags/Branch.vala:131
+#: src/tags/TagsBranch.vala:131
 msgid "Tags"
 msgstr "標籤"
 
+#: src/tags/TagsBranch.vala:131
+msgid "Organize and browse your photo’s tags"
+msgstr "整理並瀏覽您的相片標籤"
+
 #: src/Tag.vala:830
 msgid "untitled"
 msgstr "無標題"
 
 #. multiple videos
-#: src/VideoSupport.vala:523
+#: src/VideoSupport.vala:521
 msgid "Export Videos"
 msgstr "匯出視訊"
 
@@ -5705,14 +5647,10 @@ msgid "Toggle _Flag"
 msgstr "切換旗幟(_F)"
 
 #: ui/collection.ui:82 ui/event.ui:353 ui/event.ui:521 ui/media.ui:353
-#: ui/photo_context.ui:88 ui/photo.ui:343 ui/tags.ui:353
+#: ui/photo_context.ui:88 ui/photo.ui:344 ui/tags.ui:353
 msgid "_Developer"
 msgstr "顯影器(_D)"
 
-#: ui/collection.ui:108 ui/event.ui:547 ui/photo_context.ui:115 ui/photo.ui:360
-msgid "Open with E_xternal Editor"
-msgstr "以外部編輯器開啟(_X)"
-
 #: ui/collection.ui:119 ui/event.ui:387 ui/event.ui:558 ui/media.ui:381
 #: ui/photo_context.ui:126 ui/tags.ui:381
 msgid "View Eve_nt for Photo"
@@ -5762,21 +5700,21 @@ msgstr "下一張相片(_N)"
 msgid "T_ools"
 msgstr "工具(_O)"
 
-#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:428
+#: ui/direct.ui:182 ui/events_directory.ui:158 ui/event.ui:428
 #: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:411 ui/offline.ui:188
-#: ui/photo.ui:394 ui/tags.ui:430 ui/trash.ui:197
+#: ui/photo.ui:395 ui/tags.ui:430 ui/trash.ui:197
 msgid "_Frequently Asked Questions"
 msgstr "常見問答集(_F)"
 
-#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:432
+#: ui/direct.ui:186 ui/events_directory.ui:162 ui/event.ui:432
 #: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:415 ui/offline.ui:192
-#: ui/photo.ui:398 ui/tags.ui:434 ui/trash.ui:201
+#: ui/photo.ui:399 ui/tags.ui:434 ui/trash.ui:201
 msgid "_Report a Problem…"
 msgstr "回報問題(_R)…"
 
 #: 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…"
+msgid "_Import From Folder…"
 msgstr "從資料夾匯入(_I)…"
 
 #: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
@@ -5854,17 +5792,12 @@ msgstr "遞減(_E)"
 msgid "Even_ts"
 msgstr "事件(_T)"
 
-#: 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 "從珍藏館移除(_E)"
-
 #: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
 msgid "_Titles"
 msgstr "標題(_T)"
 
 #: ui/event.ui:139 ui/event.ui:404 ui/media.ui:139 ui/media.ui:387
-#: ui/photo.ui:371 ui/tags.ui:139 ui/tags.ui:387
+#: ui/photo.ui:372 ui/tags.ui:139 ui/tags.ui:387
 msgid "Ta_gs"
 msgstr "標籤(_G)"
 
@@ -5901,262 +5834,343 @@ msgstr "相片(_P)"
 msgid "_Stop Import"
 msgstr "停止匯入(_S)"
 
-#: ui/printing_widget.ui:19
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>列印的影像大小</b>"
-
-#: ui/printing_widget.ui:36
-msgid "Use a _standard size:"
-msgstr "使用標準大小(_S)："
-
-#: ui/printing_widget.ui:80
-msgid "Use a c_ustom size:"
-msgstr "使用自訂大小(_C)："
-
-#. Abbrevation for "inch"
-#: ui/printing_widget.ui:146
-msgid "in."
-msgstr "英吋"
-
-#. Abbrevation for "centimeters"
-#: ui/printing_widget.ui:147
-msgid "cm"
-msgstr "公分"
-
-#: ui/printing_widget.ui:173
-msgid "_Match photo aspect ratio"
-msgstr "符合相片寬高比(_M)"
-
-#: ui/printing_widget.ui:197
-msgid "_Autosize:"
-msgstr "自動大小(_A)："
-
-#: ui/printing_widget.ui:237
-msgid "<b>Titles</b>"
-msgstr "<b>標題</b>"
-
-#: ui/printing_widget.ui:254
-msgid "Print image _title"
-msgstr "列印影像標題(_T)"
-
-#: ui/printing_widget.ui:297
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>畫素解析度</b>"
-
-#: ui/printing_widget.ui:317
-msgid "_Output photo at:"
-msgstr "輸出相片於(_O)："
-
-#: ui/printing_widget.ui:351
-msgid "pixels per inch"
-msgstr "每英吋畫素"
-
-#: ui/set_background_dialog.ui:9
-msgid "Set as Desktop Background"
-msgstr "設為桌面背景"
-
-#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
-msgid "Use for Desktop"
-msgstr "用於桌面"
-
-#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
-msgid "Use for Lock Screen"
-msgstr "用於鎖定畫面"
-
-#: ui/set_background_slideshow_dialog.ui:16
-msgid "Set as Desktop Slideshow"
-msgstr "設為桌面投影秀"
-
-#: ui/set_background_slideshow_dialog.ui:56
-msgid "Generate desktop background slideshow"
-msgstr "製作桌面背景投影秀"
-
-#: ui/set_background_slideshow_dialog.ui:82
-msgid "Show each photo for"
-msgstr "顯示每張相片"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "period of time"
-msgstr "期間"
-
-#: ui/set_background_slideshow_dialog.ui:116
-msgid "How long each photo is shown on the desktop background"
-msgstr "每張相片要顯示為桌面背景多久"
-
-#: ui/shotwell.ui:65
+#: ui/preferences_dialog.ui:65
 msgid "white"
 msgstr "白"
 
-#: ui/shotwell.ui:92
+#: ui/preferences_dialog.ui:92
 msgid "black"
 msgstr "黑"
 
-#: ui/shotwell.ui:123
+#: ui/preferences_dialog.ui:123
 msgid "Display"
 msgstr "顯示"
 
-#: ui/shotwell.ui:160
+#: ui/preferences_dialog.ui:160
 msgid "_Background:"
 msgstr "背景(_B)："
 
-#: ui/shotwell.ui:175
+#: ui/preferences_dialog.ui:175
 msgid "_Import photos to:"
 msgstr "匯入相片至(_I)："
 
-#: ui/shotwell.ui:186
+#: ui/preferences_dialog.ui:186
 msgid "_Watch library directory for new files"
 msgstr "監視珍藏館目錄是否有新檔案(_W)"
 
-#: ui/shotwell.ui:209
+#: ui/preferences_dialog.ui:209
 msgid "Importing"
 msgstr "匯入"
 
-#: ui/shotwell.ui:226
+#: ui/preferences_dialog.ui:226
 msgid "_Directory structure:"
 msgstr "目錄結構(_D)："
 
-#: ui/shotwell.ui:240
+#: ui/preferences_dialog.ui:241
 msgid "Example:"
 msgstr "範例："
 
-#: ui/shotwell.ui:249
+#: ui/preferences_dialog.ui:250
 msgid "R_ename imported files to lowercase"
 msgstr "將匯入的檔案重新命名為小寫(_E)"
 
-#: ui/shotwell.ui:271
+#: ui/preferences_dialog.ui:272
 msgid "Metadata"
 msgstr "中介資料"
 
-#: ui/shotwell.ui:284
+#: ui/preferences_dialog.ui:285
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "寫入標籤、標題與其它中介資料至相片檔案(_M)"
 
-#: ui/shotwell.ui:306
+#: ui/preferences_dialog.ui:307
 msgid "RAW Developer"
 msgstr "RAW 顯影器"
 
-#: ui/shotwell.ui:323
+#: ui/preferences_dialog.ui:324
 msgid "De_fault:"
 msgstr "預設(_F)："
 
-#: ui/shotwell.ui:377
+#: ui/preferences_dialog.ui:378
 msgid "_Pattern:"
 msgstr "樣式(_P)："
 
-#: ui/shotwell.ui:439
+#: ui/preferences_dialog.ui:414
+msgid "Transparent Background:"
+msgstr "透明背景："
+
+#: ui/preferences_dialog.ui:428
+msgid "Checkered"
+msgstr "棋盤格狀"
+
+#: ui/preferences_dialog.ui:449
+msgid "Solid color"
+msgstr "單一色彩"
+
+#: ui/preferences_dialog.ui:539
 msgid "E_xternal photo editor:"
 msgstr "外部編輯器(_X)："
 
-#: ui/shotwell.ui:456
+#: ui/preferences_dialog.ui:556
 msgid "External _RAW editor:"
 msgstr "外部 _RAW 編輯器："
 
-#: ui/shotwell.ui:517
+#: ui/preferences_dialog.ui:617
 msgid "External Editors"
 msgstr "外部編輯器"
 
-#: ui/shotwell.ui:542
+#: ui/preferences_dialog.ui:642
 msgid "Plugins"
 msgstr "插件"
 
-#: ui/shotwell.ui:590
+#: ui/preferences_dialog.ui:668
+msgid "Shotwell Preferences"
+msgstr "Shotwell 偏好設定"
+
+#: ui/printing_widget.ui:18
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>列印的影像大小</b>"
+
+#: ui/printing_widget.ui:38
+msgid "Use a _standard size:"
+msgstr "使用標準大小(_S)："
+
+#: ui/printing_widget.ui:65
+msgid "Use a c_ustom size:"
+msgstr "使用自訂大小(_C)："
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:128
+msgid "in."
+msgstr "英吋"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:129
+msgid "cm"
+msgstr "公分"
+
+#: ui/printing_widget.ui:146
+msgid "_Match photo aspect ratio"
+msgstr "符合相片寬高比(_M)"
+
+#: ui/printing_widget.ui:161
+msgid "_Autosize:"
+msgstr "自動大小(_A)："
+
+#: ui/printing_widget.ui:202
+msgid "<b>Titles</b>"
+msgstr "<b>標題</b>"
+
+#: ui/printing_widget.ui:219
+msgid "Print image _title"
+msgstr "列印影像標題(_T)"
+
+#: ui/printing_widget.ui:262
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>畫素解析度</b>"
+
+#: ui/printing_widget.ui:282
+msgid "_Output photo at:"
+msgstr "輸出相片於(_O)："
+
+#: ui/printing_widget.ui:316
+msgid "pixels per inch"
+msgstr "每英吋畫素"
+
+#: ui/saved_search_dialog.ui:7
+msgid "Search"
+msgstr "搜尋"
+
+#: ui/saved_search_dialog.ui:23
+msgid "Cancel"
+msgstr "取消"
+
+#: ui/saved_search_dialog.ui:36
+msgid "OK"
+msgstr "確定"
+
+#: ui/saved_search_dialog.ui:74
 msgid "_Name of search:"
 msgstr "搜尋的名稱(_N)："
 
-#: ui/shotwell.ui:644
+#: ui/saved_search_dialog.ui:132
 msgid "_Match"
 msgstr "比對(_M)"
 
-#: ui/shotwell.ui:671
+#: ui/saved_search_dialog.ui:149
+msgid "any"
+msgstr "任何"
+
+#: ui/saved_search_dialog.ui:150
+msgid "all"
+msgstr "全部"
+
+#: ui/saved_search_dialog.ui:151
+msgid "none"
+msgstr "無"
+
+#: ui/saved_search_dialog.ui:165
 msgid "of the following:"
 msgstr "的下列條件："
 
-#: ui/shotwell.ui:752
-msgid "label"
-msgstr "標籤"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "設為桌面背景"
+
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:132
+msgid "Use for Desktop"
+msgstr "用於桌面"
+
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:149
+msgid "Use for Lock Screen"
+msgstr "用於鎖定畫面"
+
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "設為桌面投影秀"
+
+#: ui/set_background_slideshow_dialog.ui:54
+msgid "Generate desktop background slideshow"
+msgstr "製作桌面背景投影秀"
+
+#: ui/set_background_slideshow_dialog.ui:80
+msgid "Show each photo for"
+msgstr "顯示每張相片"
+
+#: ui/set_background_slideshow_dialog.ui:92
+msgid "period of time"
+msgstr "期間"
 
-#: ui/shotwell.ui:903
+#: ui/set_background_slideshow_dialog.ui:114
+msgid "How long each photo is shown on the desktop background"
+msgstr "每張相片要顯示為桌面背景多久"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "新增標籤(_T)…"
+
+#: ui/slideshow_settings.ui:91
 msgid "_Delay:"
 msgstr "延遲(_D)："
 
-#: ui/shotwell.ui:917
+#: ui/slideshow_settings.ui:105
 msgid "_Transition effect:"
 msgstr "轉場效果(_T)："
 
-#: ui/shotwell.ui:931
+#: ui/slideshow_settings.ui:119
 msgid "Transition d_elay:"
 msgstr "轉場延遲(_D)："
 
-#: ui/shotwell.ui:941
+#: ui/slideshow_settings.ui:129
 msgid "Show t_itle"
 msgstr "顯示標題(_I)"
 
-#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#: ui/slideshow_settings.ui:212 ui/slideshow_settings.ui:223
 msgid "seconds"
 msgstr "秒"
 
-#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
-msgid "New _Tag…"
-msgstr "新增標籤(_T)…"
+#: ui/textentrydialog.ui:66
+msgid "label"
+msgstr "標籤"
 
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "刪除回收筒中的所有相片"
 
-#~ msgid "background for transparent images"
-#~ msgstr "透明影像的背景"
+#~ msgid ""
+#~ "Enter the confirmation number which appears after you log into Flickr in "
+#~ "your Web browser."
+#~ msgstr "請輸入您登入 Flickr 後在您瀏覽器中出現的確認號碼。"
+
+#~ msgid "Authorization _Number:"
+#~ msgstr "授權號碼(_N)："
+
+#~ msgid "Width or height"
+#~ msgstr "寬度或高度"
 
-#~ msgid "The background to use for transparent images."
-#~ msgstr "透明影像使用的背景。"
+#~ msgid "“%s” isn’t a valid response to an OAuth authentication request"
+#~ msgstr "「%s」不是個對 OAuth 身份核對請求的有效回應"
 
-#~ msgid "color for solid transparency background"
-#~ msgstr "透明背景的單一色彩"
+#~ msgid ""
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select a library to import, either by selecting one of the "
+#~ "existing libraries found by Shotwell or by selecting an alternative F-"
+#~ "Spot database file."
+#~ msgstr ""
+#~ "歡迎光臨 F-Spot 珍藏館匯入服務。\n"
+#~ "\n"
+#~ "請選取要匯入的珍藏館，您可以選取 Shotwell 找到的既有珍藏館之一，或是選取其"
+#~ "他 F-Spot 資料庫檔案。"
 
 #~ msgid ""
-#~ "Color to use if background for transparent images is set to solid color"
-#~ msgstr "若透明影像背景設為單一色彩時要使用的顏色"
+#~ "Welcome to the F-Spot library import service.\n"
+#~ "\n"
+#~ "Please select an F-Spot database file."
+#~ msgstr ""
+#~ "歡迎光臨 F-Spot 珍藏館匯入服務。\n"
+#~ "\n"
+#~ "請選取一個 F-Spot 資料庫檔案。"
 
-#~ msgid "List of all discovered camera devices"
-#~ msgstr "列出所有探查到的相機裝置"
+#~ msgid "Manually select an F-Spot database file to import:"
+#~ msgstr "手動選取要匯入的 F-Spot 資料庫檔案："
 
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: the file does not exist or "
+#~ "is not an F-Spot database"
+#~ msgstr "無法開啟所選的 F-Spot 資料庫檔案：檔案不存在或不是 F-Spot 資料庫"
 
-#~ msgid "Connecting to camera, please wait…"
-#~ msgstr "正在連接相機，請稍候…"
+#~ msgid ""
+#~ "Cannot open the selected F-Spot database file: this version of the F-Spot "
+#~ "database is not supported by Shotwell"
+#~ msgstr ""
+#~ "無法開啟所選的 F-Spot 資料庫檔案：這個版本的 F-Spot 資料庫不受 Shotwell 支"
+#~ "援"
 
-#~ msgid "Browse through your events"
-#~ msgstr "瀏覽您經歷的事件"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading tags "
+#~ "table"
+#~ msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取標籤表時發生錯誤"
 
-#~ msgid "Browse the library’s folder structure"
-#~ msgstr "瀏覽珍藏館的資料夾結構"
+#~ msgid ""
+#~ "Cannot read the selected F-Spot database file: error while reading photos "
+#~ "table"
+#~ msgstr "無法讀取所選的 F-Spot 資料庫檔案：當讀取相片表時發生錯誤"
 
-#~ msgid "Organize and browse your photos"
-#~ msgstr "整理並瀏覽您的相片"
+#~ msgid ""
+#~ "Shotwell has found %d photos in the F-Spot library and is currently "
+#~ "importing them. Duplicates will be automatically detected and removed.\n"
+#~ "\n"
+#~ "You can close this dialog and start using Shotwell while the import is "
+#~ "taking place in the background."
+#~ msgstr ""
+#~ "Shotwell 已從 F-Spot 珍藏館中找到 %d 張相片，目前正在匯入。複本會被自動偵"
+#~ "測出來並移除。\n"
+#~ "\n"
+#~ "您可以關閉對話盒並繼續使用 Shotwell，匯入程序會在背景執行。"
 
-#~ msgid "Recurse Into Subfolders"
-#~ msgstr "遞迴進入子資料夾"
+#~ msgid "F-Spot library: %s"
+#~ msgstr "F-Spot 珍藏館：%s"
 
-#~ msgid "Start the application in fullscreen mode"
-#~ msgstr "以全螢幕模式啟動應用程式"
+#~ msgid "Preparing to import"
+#~ msgstr "正在準備匯入"
 
-#~ msgid "Organize your saved searches"
-#~ msgstr "整理您儲存的搜尋"
+#~ msgid "Core Data Import Services"
+#~ msgstr "核心資料匯入服務"
 
-#~ msgid "Organize and browse your photo’s tags"
-#~ msgstr "整理並瀏覽您的相片標籤"
+#~ msgid "%s – “Aachen”"
+#~ msgstr "%s – “Aachen”"
 
-#~ msgid "_Import From Folder…"
-#~ msgstr "從資料夾匯入(_I)…"
+#~ msgid "Export Photos/Videos"
+#~ msgstr "匯出相片/視訊"
 
-#~ msgid "Transparent Background:"
-#~ msgstr "透明背景："
+#~ msgid "Open with E_xternal Editor"
+#~ msgstr "以外部編輯器開啟(_X)"
 
-#~ msgid "Checkered"
-#~ msgstr "棋盤格狀"
+#~ msgid "_Import from Folder…"
+#~ msgstr "從資料夾匯入(_I)…"
 
-#~ msgid "Solid color"
-#~ msgstr "單一色彩"
+#~ msgid "R_emove from Library"
+#~ msgstr "從珍藏館移除(_E)"
 
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "著作權所有 2009-2015 Yorba Foundation"
@@ -6377,9 +6391,6 @@ msgstr "刪除回收筒中的所有相片"
 #~ msgid "The selected photos were successfully published."
 #~ msgstr "所選的相片已經成功發布。"
 
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Shotwell 偏好設定"
-
 #~| msgid ""
 #~| "A file required for publishing is unavailable. Publishing to Flickr "
 #~| "can't continue."
diff --git a/publish-extra.am b/publish-extra.am
index 801cc9a..2bf13e5 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -3,13 +3,10 @@ plugin_LTLIBRARIES += plugins/shotwell-publishing-extras/shotwell-publishing-ext
 dist_noinst_DATA += \
 	plugins/shotwell-publishing-extras/gallery3.png \
 	plugins/shotwell-publishing-extras/rajce.png \
-	plugins/shotwell-publishing-extras/tumblr.png \
 	plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \
 	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \
 	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \
 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \
-	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \
-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \
 	plugins/shotwell-publishing-extras/yandex_publish_model.ui \
 	plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
 
@@ -17,7 +14,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
 	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
 
diff --git a/publish.am b/publish.am
index 799765a..e98d533 100644
--- a/publish.am
+++ b/publish.am
@@ -3,6 +3,7 @@ plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la
 dist_noinst_DATA += \
 	plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-publishing/flickr.png \
+	plugins/shotwell-publishing/tumblr.png \
 	plugins/shotwell-publishing/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
@@ -12,6 +13,7 @@ dist_noinst_DATA += \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
 	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
+	plugins/shotwell-publishing/tumblr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
 
@@ -20,6 +22,7 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/FacebookPublishing.vala \
 	plugins/shotwell-publishing/PicasaPublishing.vala \
 	plugins/shotwell-publishing/FlickrPublishing.vala \
+	plugins/shotwell-publishing/TumblrPublishing.vala \
 	plugins/shotwell-publishing/YouTubePublishing.vala \
 	plugins/shotwell-publishing/PiwigoPublishing.vala \
 	plugins/shotwell-plugin-common.vapi \
diff --git a/settings-migrator/meson.build b/settings-migrator/meson.build
new file mode 100644
index 0000000..449eba9
--- /dev/null
+++ b/settings-migrator/meson.build
@@ -0,0 +1,3 @@
+install_data('shotwell-settings-migrator',
+           install_mode : 'rwxr-xr-x',
+           install_dir : join_paths(get_option('libexecdir'), 'shotwell'))
diff --git a/shotwell.am b/shotwell.am
index bb2c53b..ec6cf0d 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -4,12 +4,16 @@ shotwell_CFLAGS = \
 	$(UNITY_CFLAGS) \
 	$(COMMON_CFLAGS) \
 	-I$(top_builddir)/plugins \
-	-I$(abs_top_srcdir)/plugins
+	-I$(abs_top_srcdir)/plugins \
+	-I$(abs_top_srcdir)/src
+	-I$(abs_top_builddir)/src
 
 shotwell_LDADD = \
 	src/plugins/libplugin.la \
+	src/libgraphics-processor.la \
 	$(SHOTWELL_LIBS) \
 	$(UNITY_LIBS)
+
 shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
 	--pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
 	--pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
@@ -34,7 +38,7 @@ shotwell_resource_deps := $(shell $(GLIB_COMPILE_RESOURCES) \
 resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
 		--sourcedir=$(abs_top_srcdir) \
-		--generate $<
+		--generate $(abs_top_srcdir)/org.gnome.Shotwell.gresource.xml
 
 shotwell_SOURCES = \
 	src/unit/Unit.vala \
@@ -44,7 +48,6 @@ shotwell_SOURCES = \
 	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 \
@@ -59,7 +62,18 @@ shotwell_SOURCES = \
 	src/db/VideoTable.vala \
 	src/db/VersionTable.vala \
 	src/db/SavedSearchDBTable.vala \
+	src/dialogs/Preferences.vala \
+	src/dialogs/EntryMultiCompletion.vala \
+	src/dialogs/ExportDialog.vala \
+	src/dialogs/TextEntry.vala \
+	src/dialogs/WelcomeDialog.vala \
+	src/dialogs/MultiTextEntryDialog.vala \
+	src/dialogs/AdjustDateTimeDialog.vala \
+	src/dialogs/SetBackground.vala \
+	src/dialogs/ProgressDialog.vala \
+	src/dialogs/SetBackgroundSlideshow.vala \
 	src/editing_tools/EditingTools.vala \
+	src/editing_tools/RGBHistogramManipulator.vala \
 	src/editing_tools/StraightenTool.vala \
 	src/slideshow/Slideshow.vala \
 	src/slideshow/TransitionEffects.vala \
@@ -84,7 +98,7 @@ shotwell_SOURCES = \
 	src/publishing/APIGlue.vala \
 	src/library/Library.vala \
 	src/library/LibraryWindow.vala \
-	src/library/Branch.vala \
+	src/library/LibraryBranch.vala \
 	src/library/TrashSidebarEntry.vala \
 	src/library/OfflineSidebarEntry.vala \
 	src/library/FlaggedSidebarEntry.vala \
@@ -123,22 +137,22 @@ shotwell_SOURCES = \
 	src/sidebar/Tree.vala \
 	src/sidebar/common.vala \
 	src/events/Events.vala \
-	src/events/Branch.vala \
+	src/events/EventsBranch.vala \
 	src/events/EventsDirectoryPage.vala \
 	src/events/EventPage.vala \
 	src/events/EventDirectoryItem.vala \
 	src/tags/Tags.vala \
-	src/tags/Branch.vala \
+	src/tags/TagsBranch.vala \
 	src/tags/TagPage.vala \
 	src/tags/HierarchicalTagIndex.vala \
 	src/tags/HierarchicalTagUtilities.vala \
 	src/camera/Camera.vala \
-	src/camera/Branch.vala \
+	src/camera/CameraBranch.vala \
 	src/camera/CameraTable.vala \
 	src/camera/GPhoto.vala \
 	src/camera/ImportPage.vala \
 	src/searches/Searches.vala \
-	src/searches/Branch.vala \
+	src/searches/SearchesBranch.vala \
 	src/searches/SearchBoolean.vala \
 	src/searches/SavedSearchPage.vala \
 	src/searches/SavedSearchDialog.vala \
@@ -151,8 +165,8 @@ shotwell_SOURCES = \
 	src/data_imports/DataImportJob.vala \
 	src/data_imports/DataImportSource.vala \
 	src/folders/Folders.vala \
-	src/folders/Branch.vala \
-	src/folders/Page.vala \
+	src/folders/FoldersBranch.vala \
+	src/folders/FoldersPage.vala \
 	src/main.vala \
 	src/AppWindow.vala \
 	src/CollectionPage.vala \
@@ -171,9 +185,7 @@ shotwell_SOURCES = \
 	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 \
@@ -228,4 +240,5 @@ shotwell_SOURCES = \
 	src/.unitize/_FoldersInternals.vala \
 	src/.unitize/_Library_unitize_entry.vala \
 	src/.unitize/_Direct_unitize_entry.vala \
-	plugins/shotwell-plugin-dev-1.0.vapi
+	plugins/shotwell-plugin-dev-1.0.vapi \
+	src/shotwell-graphics-processor.vapi
diff --git a/src/AppDirs.c b/src/AppDirs.c
index e305d97..97986d0 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -393,11 +393,11 @@ void app_dirs_try_migrate_data (void) {
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 396 "AppDirs.c"
-				goto __catch444_g_error;
+				goto __catch452_g_error;
 			}
 		}
-		goto __finally444;
-		__catch444_g_error:
+		goto __finally452;
+		__catch452_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -408,7 +408,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 410 "AppDirs.c"
 		}
-		__finally444:
+		__finally452:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -436,11 +436,11 @@ void app_dirs_try_migrate_data (void) {
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 439 "AppDirs.c"
-			goto __catch445_g_error;
+			goto __catch453_g_error;
 		}
 	}
-	goto __finally445;
-	__catch445_g_error:
+	goto __finally453;
+	__catch453_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -451,7 +451,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_error_free0 (err);
 #line 453 "AppDirs.c"
 	}
-	__finally445:
+	__finally453:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -538,11 +538,11 @@ void app_dirs_try_migrate_data (void) {
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "AppDirs.c"
-				goto __catch446_g_error;
+				goto __catch454_g_error;
 			}
 		}
-		goto __finally446;
-		__catch446_g_error:
+		goto __finally454;
+		__catch454_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_;
@@ -580,7 +580,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 582 "AppDirs.c"
 		}
-		__finally446:
+		__finally454:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -662,11 +662,11 @@ void app_dirs_try_migrate_data (void) {
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 665 "AppDirs.c"
-				goto __catch447_g_error;
+				goto __catch455_g_error;
 			}
 		}
-		goto __finally447;
-		__catch447_g_error:
+		goto __finally455;
+		__catch455_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp60_;
@@ -712,7 +712,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 714 "AppDirs.c"
 		}
-		__finally447:
+		__finally455:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -888,12 +888,12 @@ void app_dirs_verify_data_dir (void) {
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 891 "AppDirs.c"
-				goto __catch448_g_error;
+				goto __catch456_g_error;
 			}
 		}
 	}
-	goto __finally448;
-	__catch448_g_error:
+	goto __finally456;
+	__catch456_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_;
@@ -931,7 +931,7 @@ void app_dirs_verify_data_dir (void) {
 		_g_error_free0 (err);
 #line 933 "AppDirs.c"
 	}
-	__finally448:
+	__finally456:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -977,12 +977,12 @@ void app_dirs_verify_cache_dir (void) {
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 980 "AppDirs.c"
-				goto __catch449_g_error;
+				goto __catch457_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_g_error:
+	goto __finally457;
+	__catch457_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_;
@@ -1020,7 +1020,7 @@ void app_dirs_verify_cache_dir (void) {
 		_g_error_free0 (err);
 #line 1022 "AppDirs.c"
 	}
-	__finally449:
+	__finally457:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1575,12 +1575,12 @@ GFile* app_dirs_get_temp_dir (void) {
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1578 "AppDirs.c"
-					goto __catch450_g_error;
+					goto __catch458_g_error;
 				}
 			}
 		}
-		goto __finally450;
-		__catch450_g_error:
+		goto __finally458;
+		__catch458_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp9_;
@@ -1618,7 +1618,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_error_free0 (err);
 #line 1620 "AppDirs.c"
 		}
-		__finally450:
+		__finally458:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1706,12 +1706,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 1709 "AppDirs.c"
-				goto __catch451_g_error;
+				goto __catch459_g_error;
 			}
 		}
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally459;
+	__catch459_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp12_;
@@ -1749,7 +1749,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 1751 "AppDirs.c"
 	}
-	__finally451:
+	__finally459:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1803,7 +1803,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1806 "AppDirs.c"
-				goto __catch452_g_error;
+				goto __catch460_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1824,7 +1824,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
 #line 1827 "AppDirs.c"
-				goto __catch452_g_error;
+				goto __catch460_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
@@ -1856,8 +1856,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_object_unref0 (info);
 #line 1858 "AppDirs.c"
 		}
-		goto __finally452;
-		__catch452_g_error:
+		goto __finally460;
+		__catch460_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp15_;
@@ -1895,7 +1895,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_error_free0 (err);
 #line 1897 "AppDirs.c"
 		}
-		__finally452:
+		__finally460:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1980,12 +1980,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 1983 "AppDirs.c"
-				goto __catch453_g_error;
+				goto __catch461_g_error;
 			}
 		}
 	}
-	goto __finally453;
-	__catch453_g_error:
+	goto __finally461;
+	__catch461_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_;
@@ -2023,7 +2023,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 2025 "AppDirs.c"
 	}
-	__finally453:
+	__finally461:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2052,53 +2052,98 @@ GFile* app_dirs_get_lib_dir (void) {
 	GFile* result = NULL;
 	GFile* install_dir = NULL;
 	GFile* _tmp0_;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_;
+	GFile* _tmp1_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	GFile* _tmp15_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
 #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_install_dir ();
 #line 262 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	install_dir = _tmp0_;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp2_ = install_dir;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	if (_tmp2_ != NULL) {
-#line 2066 "AppDirs.c"
-		GFile* _tmp3_;
-		GFile* _tmp4_;
-		GFile* _tmp5_;
-		GFile* _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp3_ = install_dir;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = g_file_get_child (_tmp3_, RESOURCES_LIB);
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp5_ = _tmp4_;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp6_ = g_file_get_child (_tmp5_, "shotwell");
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp5_);
-#line 2085 "AppDirs.c"
-	} else {
-		GFile* _tmp7_;
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp7_ = app_dirs_get_exec_dir ();
+	_tmp1_ = install_dir;
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp7_;
-#line 2094 "AppDirs.c"
+	if (_tmp1_ == NULL) {
+#line 2070 "AppDirs.c"
+		GFile* _tmp2_;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
+		GFile* _tmp12_;
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp2_ = app_dirs_get_exec_dir ();
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp3_ = _tmp2_;
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp4_ = g_file_get_path (_tmp3_);
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp5_ = _tmp4_;
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp6_ = g_str_has_suffix (_tmp5_, "src");
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp7_ = _tmp6_;
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_g_free0 (_tmp5_);
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_g_object_unref0 (_tmp3_);
+#line 267 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		if (_tmp7_) {
+#line 2096 "AppDirs.c"
+			GFile* _tmp8_;
+			GFile* _tmp9_;
+			GFile* _tmp10_;
+			GFile* _tmp11_;
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_tmp8_ = app_dirs_get_exec_dir ();
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_tmp9_ = _tmp8_;
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_tmp10_ = g_file_get_parent (_tmp9_);
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_tmp11_ = _tmp10_;
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_g_object_unref0 (_tmp9_);
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			result = _tmp11_;
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			_g_object_unref0 (install_dir);
+#line 268 "/home/jens/Source/shotwell/src/AppDirs.vala"
+			return result;
+#line 2117 "AppDirs.c"
+		}
+#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_tmp12_ = app_dirs_get_exec_dir ();
+#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		result = _tmp12_;
+#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		_g_object_unref0 (install_dir);
+#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
+		return result;
+#line 2127 "AppDirs.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	result = _tmp1_;
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_tmp13_ = install_dir;
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_tmp14_ = g_file_get_child (_tmp13_, RESOURCES_LIB);
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_tmp15_ = _tmp14_;
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_tmp16_ = g_file_get_child (_tmp15_, "shotwell");
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_tmp17_ = _tmp16_;
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	_g_object_unref0 (_tmp15_);
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
+	result = _tmp17_;
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (install_dir);
-#line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 274 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2102 "AppDirs.c"
+#line 2147 "AppDirs.c"
 }
 
 
@@ -2108,21 +2153,21 @@ GFile* app_dirs_get_system_plugins_dir (void) {
 	GFile* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_lib_dir ();
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2126 "AppDirs.c"
+#line 2171 "AppDirs.c"
 }
 
 
@@ -2132,54 +2177,54 @@ GFile* app_dirs_get_user_plugins_dir (void) {
 	GFile* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_data_dir ();
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 282 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2150 "AppDirs.c"
+#line 2195 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_log_file (void) {
 	GFile* result = NULL;
 	const gchar* _tmp0_;
-#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ != NULL) {
-#line 2161 "AppDirs.c"
+#line 2206 "AppDirs.c"
 		const gchar* _tmp1_;
-#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (g_strcmp0 (_tmp1_, ":console:") == 0) {
-#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = NULL;
-#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2171 "AppDirs.c"
+#line 2216 "AppDirs.c"
 		} else {
 			const gchar* _tmp2_;
 			GFile* _tmp3_;
-#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp2_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = _tmp3_;
-#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2183 "AppDirs.c"
+#line 2228 "AppDirs.c"
 		}
 	} else {
 		const gchar* _tmp4_;
@@ -2189,38 +2234,38 @@ GFile* app_dirs_get_log_file (void) {
 		GFile* _tmp8_;
 		GFile* _tmp9_;
 		GFile* _tmp10_;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp4_ = g_get_user_cache_dir ();
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = g_file_get_child (_tmp6_, "shotwell");
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = _tmp7_;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = g_file_get_child (_tmp8_, "shotwell.log");
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = _tmp9_;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		result = _tmp10_;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 2215 "AppDirs.c"
+#line 2260 "AppDirs.c"
 	}
 }
 
 
 GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* result = NULL;
-#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-video-thumbnailer";
-#line 2224 "AppDirs.c"
+#line 2269 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
@@ -2230,69 +2275,69 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* _tmp5_;
 	GFile* _tmp6_;
 	gboolean _tmp7_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "thumbnailer");
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2258 "AppDirs.c"
+#line 2303 "AppDirs.c"
 		GFile* _tmp8_;
 		GFile* _tmp9_;
 		GFile* _tmp10_;
 		GFile* _tmp11_;
 		GFile* _tmp12_;
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2282 "AppDirs.c"
+#line 2327 "AppDirs.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 305 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 305 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2288 "AppDirs.c"
+#line 2333 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* result = NULL;
-#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-settings-migrator";
-#line 2296 "AppDirs.c"
+#line 2341 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
@@ -2302,61 +2347,61 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* _tmp5_;
 	GFile* _tmp6_;
 	gboolean _tmp7_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "settings-migrator");
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2330 "AppDirs.c"
+#line 2375 "AppDirs.c"
 		GFile* _tmp8_;
 		GFile* _tmp9_;
 		GFile* _tmp10_;
 		GFile* _tmp11_;
 		GFile* _tmp12_;
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2354 "AppDirs.c"
+#line 2399 "AppDirs.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 315 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 315 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2360 "AppDirs.c"
+#line 2405 "AppDirs.c"
 }
 
 
@@ -2366,21 +2411,21 @@ AppDirs* app_dirs_construct (GType object_type) {
 	self = (AppDirs*) g_type_create_instance (object_type);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return self;
-#line 2370 "AppDirs.c"
+#line 2415 "AppDirs.c"
 }
 
 
 AppDirs* app_dirs_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return app_dirs_construct (TYPE_APP_DIRS);
-#line 2377 "AppDirs.c"
+#line 2422 "AppDirs.c"
 }
 
 
 static void value_app_dirs_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	value->data[0].v_pointer = NULL;
-#line 2384 "AppDirs.c"
+#line 2429 "AppDirs.c"
 }
 
 
@@ -2389,7 +2434,7 @@ static void value_app_dirs_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (value->data[0].v_pointer);
-#line 2393 "AppDirs.c"
+#line 2438 "AppDirs.c"
 	}
 }
 
@@ -2399,11 +2444,11 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = app_dirs_ref (src_value->data[0].v_pointer);
-#line 2403 "AppDirs.c"
+#line 2448 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2407 "AppDirs.c"
+#line 2452 "AppDirs.c"
 	}
 }
 
@@ -2411,37 +2456,37 @@ static void value_app_dirs_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_app_dirs_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2415 "AppDirs.c"
+#line 2460 "AppDirs.c"
 }
 
 
 static gchar* value_app_dirs_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (collect_values[0].v_pointer) {
-#line 2422 "AppDirs.c"
+#line 2467 "AppDirs.c"
 		AppDirs * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2429 "AppDirs.c"
+#line 2474 "AppDirs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.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 2433 "AppDirs.c"
+#line 2478 "AppDirs.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = app_dirs_ref (object);
-#line 2437 "AppDirs.c"
+#line 2482 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2441 "AppDirs.c"
+#line 2486 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2445 "AppDirs.c"
+#line 2490 "AppDirs.c"
 }
 
 
@@ -2452,25 +2497,25 @@ static gchar* value_app_dirs_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2456 "AppDirs.c"
+#line 2501 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = NULL;
-#line 2462 "AppDirs.c"
+#line 2507 "AppDirs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2466 "AppDirs.c"
+#line 2511 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = app_dirs_ref (value->data[0].v_pointer);
-#line 2470 "AppDirs.c"
+#line 2515 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2474 "AppDirs.c"
+#line 2519 "AppDirs.c"
 }
 
 
@@ -2484,7 +2529,7 @@ GParamSpec* param_spec_app_dirs (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return G_PARAM_SPEC (spec);
-#line 2488 "AppDirs.c"
+#line 2533 "AppDirs.c"
 }
 
 
@@ -2493,7 +2538,7 @@ gpointer value_get_app_dirs (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APP_DIRS), NULL);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return value->data[0].v_pointer;
-#line 2497 "AppDirs.c"
+#line 2542 "AppDirs.c"
 }
 
 
@@ -2513,17 +2558,17 @@ void value_set_app_dirs (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_ref (value->data[0].v_pointer);
-#line 2517 "AppDirs.c"
+#line 2562 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2521 "AppDirs.c"
+#line 2566 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2527 "AppDirs.c"
+#line 2572 "AppDirs.c"
 	}
 }
 
@@ -2542,17 +2587,17 @@ void value_take_app_dirs (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/AppDirs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2546 "AppDirs.c"
+#line 2591 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2550 "AppDirs.c"
+#line 2595 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_unref (old);
-#line 2556 "AppDirs.c"
+#line 2601 "AppDirs.c"
 	}
 }
 
@@ -2562,14 +2607,14 @@ static void app_dirs_class_init (AppDirsClass * klass) {
 	app_dirs_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	((AppDirsClass *) klass)->finalize = app_dirs_finalize;
-#line 2566 "AppDirs.c"
+#line 2611 "AppDirs.c"
 }
 
 
 static void app_dirs_instance_init (AppDirs * self) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	self->ref_count = 1;
-#line 2573 "AppDirs.c"
+#line 2618 "AppDirs.c"
 }
 
 
@@ -2579,7 +2624,7 @@ static void app_dirs_finalize (AppDirs * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_DIRS, AppDirs);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	g_signal_handlers_destroy (self);
-#line 2583 "AppDirs.c"
+#line 2628 "AppDirs.c"
 }
 
 
@@ -2604,7 +2649,7 @@ gpointer app_dirs_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return instance;
-#line 2608 "AppDirs.c"
+#line 2653 "AppDirs.c"
 }
 
 
@@ -2617,7 +2662,7 @@ void app_dirs_unref (gpointer instance) {
 		APP_DIRS_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2621 "AppDirs.c"
+#line 2666 "AppDirs.c"
 	}
 }
 
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 0c69270..ffea859 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -260,9 +260,18 @@ class AppDirs {
     
     public static File get_lib_dir() {
         File? install_dir = get_install_dir();
+
+        // Running from source tree
+        if (install_dir == null) {
+            // Meson build
+            if (get_exec_dir().get_path().has_suffix("src")) {
+                return get_exec_dir().get_parent();
+            }
+
+            return get_exec_dir();
+        }
         
-        return (install_dir != null) ? install_dir.get_child(Resources.LIB).get_child("shotwell")
-            : get_exec_dir();
+        return install_dir.get_child(Resources.LIB).get_child("shotwell");
     }
     
     public static File get_system_plugins_dir() {
diff --git a/src/AppWindow.c b/src/AppWindow.c
index e2c3a0f..c4ae66f 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -371,6 +371,7 @@ static void fullscreen_window_hide_toolbar (FullscreenWindow* self);
 static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self);
 void page_set_cursor_hide_time (Page* self, gint hide_time);
 void page_start_cursor_hiding (Page* self);
+gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self);
 static void fullscreen_window_invoke_toolbar (FullscreenWindow* self);
 void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self);
 static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
@@ -525,7 +526,7 @@ static gchar* app_window_real_get_app_role (AppWindow* self);
 "c., \n" \
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
-#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-braunschweig.jpg"
 void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
 void app_window_show_uri (AppWindow* self, const gchar* url, GError** error);
 #define RESOURCES_BUG_DB_URL "https://wiki.gnome.org/Apps/Shotwell/ReportingABug"
@@ -601,21 +602,21 @@ extern const gchar* RESOURCES_AUTHORS[6];
 static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close ((FullscreenWindow*) self);
-#line 577 "AppWindow.c"
+#line 578 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_update_toolbar_dismissal ((FullscreenWindow*) self);
-#line 584 "AppWindow.c"
+#line 585 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self) {
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar ((FullscreenWindow*) self);
-#line 591 "AppWindow.c"
+#line 592 "AppWindow.c"
 }
 
 
@@ -624,7 +625,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	Page* _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	static const gchar* accels[] = {"F11", NULL};
-#line 600 "AppWindow.c"
+#line 601 "AppWindow.c"
 	AppWindow* _tmp1_;
 	AppWindow* _tmp2_;
 	GdkScreen* _tmp3_;
@@ -667,7 +668,12 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	gint _tmp42_;
 	GdkRectangle _tmp43_;
 	gint _tmp44_;
-	Page* _tmp45_;
+	gboolean _tmp45_ = FALSE;
+	ConfigFacade* _tmp46_;
+	ConfigFacade* _tmp47_;
+	gboolean _tmp48_;
+	gboolean _tmp49_;
+	Page* _tmp51_;
 #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"
@@ -782,13 +788,13 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	_tmp28_ = page;
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_SLIDESHOW_PAGE)) {
-#line 758 "AppWindow.c"
+#line 764 "AppWindow.c"
 		Page* _tmp29_;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = page;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
-#line 764 "AppWindow.c"
+#line 770 "AppWindow.c"
 	} else {
 		GtkToolbar* _tmp30_;
 		GtkToggleToolButton* _tmp31_;
@@ -798,7 +804,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 		_tmp31_ = self->priv->pin_button;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_toolbar_insert (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 774 "AppWindow.c"
+#line 780 "AppWindow.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp32_ = page;
@@ -846,48 +852,79 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_POINTER_MOTION_MASK);
-#line 93 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen_window_invoke_toolbar (self);
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp46_ = config_facade_get_instance ();
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp47_ = _tmp46_;
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp48_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp49_ = _tmp48_;
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp47_);
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp49_) {
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp45_ = TRUE;
+#line 842 "AppWindow.c"
+	} else {
+		gboolean _tmp50_;
 #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp45_ = page;
+		_tmp50_ = self->priv->is_toolbar_dismissal_enabled;
 #line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+		_tmp45_ = !_tmp50_;
+#line 849 "AppWindow.c"
+	}
+#line 95 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp45_) {
+#line 97 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		fullscreen_window_invoke_toolbar (self);
+#line 855 "AppWindow.c"
+	} else {
 #line 99 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		fullscreen_window_hide_toolbar (self);
+#line 859 "AppWindow.c"
+	}
+#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp51_ = page;
+#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+#line 106 "/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 832 "AppWindow.c"
+#line 869 "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 839 "AppWindow.c"
+#line 876 "AppWindow.c"
 }
 
 
 void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
-#line 102 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 848 "AppWindow.c"
+#line 885 "AppWindow.c"
 }
 
 
 void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
 	GtkToggleToolButton* _tmp0_;
 	gboolean _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->pin_button;
-#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
-#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 863 "AppWindow.c"
+#line 900 "AppWindow.c"
 }
 
 
@@ -900,31 +937,31 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
 	GdkWindow* _tmp4_;
 	gint _tmp5_;
 	GdkRectangle _tmp6_ = {0};
-#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = gdk_screen_get_monitor_at_window (_tmp1_, _tmp4_);
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_screen_get_monitor_geometry (_tmp0_, _tmp5_, &_tmp6_);
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	monitor = _tmp6_;
-#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	*result = monitor;
-#line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 900 "AppWindow.c"
+#line 937 "AppWindow.c"
 }
 
 
@@ -935,40 +972,40 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	GdkEventConfigure* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = event;
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_result_ = _tmp1_;
-#line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->switched_to;
-#line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 925 "AppWindow.c"
+#line 962 "AppWindow.c"
 		Page* _tmp3_;
 		Page* _tmp4_;
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switched_to (_tmp4_);
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp4_);
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->switched_to = TRUE;
-#line 938 "AppWindow.c"
+#line 975 "AppWindow.c"
 	}
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _result_;
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 944 "AppWindow.c"
+#line 981 "AppWindow.c"
 }
 
 
@@ -984,68 +1021,68 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 	GdkEventKey* _tmp8_;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_;
-#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = event;
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 133 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		fullscreen_window_on_close (self);
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 978 "AppWindow.c"
+#line 1015 "AppWindow.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 982 "AppWindow.c"
+#line 1019 "AppWindow.c"
 		GdkEventKey* _tmp4_;
 		gboolean _tmp5_;
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = event;
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 991 "AppWindow.c"
+#line 1028 "AppWindow.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = FALSE;
-#line 995 "AppWindow.c"
+#line 1032 "AppWindow.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_) {
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1003 "AppWindow.c"
+#line 1040 "AppWindow.c"
 	}
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = app_window_get_instance ();
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = event;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp8_, &_tmp9_);
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1021 "AppWindow.c"
+#line 1058 "AppWindow.c"
 }
 
 
@@ -1055,38 +1092,38 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
 	gboolean _tmp2_;
 	AppWindow* _tmp3_;
 	AppWindow* _tmp4_;
-#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->is_toolbar_dismissal_enabled;
-#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	configuration_facade_set_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
-#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_end_fullscreen (_tmp4_);
-#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1053 "AppWindow.c"
+#line 1090 "AppWindow.c"
 }
 
 
 void fullscreen_window_close (FullscreenWindow* self) {
-#line 153 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 1062 "AppWindow.c"
+#line 1099 "AppWindow.c"
 }
 
 
@@ -1095,36 +1132,36 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 	Page* page = NULL;
 	Page* _tmp0_;
 	Page* _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_clear_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1083 "AppWindow.c"
+#line 1120 "AppWindow.c"
 		Page* _tmp2_;
 		Page* _tmp3_;
-#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_stop_cursor_hiding (_tmp2_);
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_from (_tmp3_);
-#line 1094 "AppWindow.c"
+#line 1131 "AppWindow.c"
 	}
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 173 "/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"
+#line 164 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 1100 "AppWindow.c"
+#line 1137 "AppWindow.c"
 }
 
 
@@ -1133,34 +1170,34 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
 	gboolean result = FALSE;
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = TRUE;
-#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1127 "AppWindow.c"
+#line 1164 "AppWindow.c"
 }
 
 
 static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self) {
 	gboolean result;
 	result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
-#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1136 "AppWindow.c"
+#line 1173 "AppWindow.c"
 }
 
 
@@ -1169,71 +1206,71 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 	gboolean _tmp4_ = FALSE;
-#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 1153 "AppWindow.c"
+#line 1190 "AppWindow.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_;
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->waiting_for_invoke;
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (!_tmp2_) {
-#line 1160 "AppWindow.c"
+#line 1197 "AppWindow.c"
 			gboolean _tmp3_;
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = _tmp3_;
-#line 1166 "AppWindow.c"
+#line 1203 "AppWindow.c"
 		} else {
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = FALSE;
-#line 1170 "AppWindow.c"
+#line 1207 "AppWindow.c"
 		}
-#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp1_) {
-#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref);
-#line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			self->priv->waiting_for_invoke = TRUE;
-#line 1178 "AppWindow.c"
+#line 1215 "AppWindow.c"
 		}
 	}
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1183 "AppWindow.c"
+#line 1220 "AppWindow.c"
 		GdkEventMotion* _tmp5_;
 		gboolean _tmp6_;
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 1192 "AppWindow.c"
+#line 1229 "AppWindow.c"
 	} else {
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 1196 "AppWindow.c"
+#line 1233 "AppWindow.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1202 "AppWindow.c"
+#line 1239 "AppWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1209 "AppWindow.c"
+#line 1246 "AppWindow.c"
 }
 
 
@@ -1254,57 +1291,57 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 	gint _tmp9_ = 0;
 	gint _tmp10_;
 	gint _tmp11_;
-#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_display (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_display_get_device_manager (_tmp0_);
-#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	devmgr = _tmp2_;
-#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = devmgr;
-#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_debug ("AppWindow.vala:193: No device manager for display");
-#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_debug ("AppWindow.vala:200: No device manager for display");
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (devmgr);
-#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1252 "AppWindow.c"
+#line 1289 "AppWindow.c"
 	}
-#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = devmgr;
-#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_device_get_position (_tmp5_, NULL, NULL, &_tmp6_);
-#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	py = _tmp6_;
-#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = self->priv->toolbar;
-#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_window_get_geometry (_tmp8_, NULL, &_tmp9_, NULL, NULL);
-#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	wy = _tmp9_;
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = py;
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = wy;
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_ >= _tmp11_;
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (devmgr);
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1280 "AppWindow.c"
+#line 1317 "AppWindow.c"
 }
 
 
@@ -1312,62 +1349,62 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->waiting_for_invoke = FALSE;
-#line 210 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 210 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1300 "AppWindow.c"
+#line 1337 "AppWindow.c"
 	}
-#line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp1_) {
-#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1310 "AppWindow.c"
+#line 1347 "AppWindow.c"
 	}
-#line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = FALSE;
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1318 "AppWindow.c"
+#line 1355 "AppWindow.c"
 }
 
 
 static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self) {
 	gboolean result;
 	result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1327 "AppWindow.c"
+#line 1364 "AppWindow.c"
 }
 
 
 static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
 	GtkToolbar* _tmp0_;
-#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->toolbar;
-#line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = TRUE;
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 233 "/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 1343 "AppWindow.c"
+#line 1380 "AppWindow.c"
 }
 
 
@@ -1383,99 +1420,99 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 	time_t _tmp7_;
 	time_t _tmp8_;
 	time_t _tmp9_;
-#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1369 "AppWindow.c"
+#line 1406 "AppWindow.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
-#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp1_) {
-#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1379 "AppWindow.c"
+#line 1416 "AppWindow.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 239 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->left_toolbar_time = (time_t) 0;
-#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1391 "AppWindow.c"
+#line 1428 "AppWindow.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = self->priv->left_toolbar_time;
-#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 1397 "AppWindow.c"
+#line 1434 "AppWindow.c"
 		time_t _tmp4_;
-#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = time (NULL);
-#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->left_toolbar_time = _tmp4_;
-#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1407 "AppWindow.c"
+#line 1444 "AppWindow.c"
 	}
-#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = time (NULL);
-#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	now = _tmp5_;
-#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = now;
-#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = self->priv->left_toolbar_time;
-#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp6_ >= _tmp7_, "now >= left_toolbar_time");
-#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = now;
-#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = self->priv->left_toolbar_time;
-#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if ((_tmp8_ - _tmp9_) < ((time_t) FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC)) {
-#line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1429 "AppWindow.c"
+#line 1466 "AppWindow.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
-#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1437 "AppWindow.c"
+#line 1474 "AppWindow.c"
 }
 
 
 static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
 	GtkToolbar* _tmp0_;
-#line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 270 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->toolbar;
-#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = FALSE;
-#line 1451 "AppWindow.c"
+#line 1488 "AppWindow.c"
 }
 
 
@@ -1496,7 +1533,7 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
 	((GtkWidgetClass *) klass)->motion_notify_event = (gboolean (*) (GtkWidget *, GdkEventMotion*)) fullscreen_window_real_motion_notify_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1472 "AppWindow.c"
+#line 1509 "AppWindow.c"
 }
 
 
@@ -1534,7 +1571,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 1510 "AppWindow.c"
+#line 1547 "AppWindow.c"
 }
 
 
@@ -1552,7 +1589,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 1528 "AppWindow.c"
+#line 1565 "AppWindow.c"
 }
 
 
@@ -1569,20 +1606,20 @@ GType fullscreen_window_get_type (void) {
 
 
 static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1549 "AppWindow.c"
+#line 1586 "AppWindow.c"
 }
 
 
 void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1558 "AppWindow.c"
+#line 1595 "AppWindow.c"
 }
 
 
@@ -1592,27 +1629,27 @@ PageWindow* page_window_construct (GType object_type) {
 	Application* _tmp1_;
 	GtkApplication* _tmp2_;
 	GtkApplication* _tmp3_;
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_system_app (_tmp1_);
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = (PageWindow*) g_object_new (object_type, "application", _tmp3_, NULL);
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) | GDK_STRUCTURE_MASK));
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
-#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 1588 "AppWindow.c"
+#line 1625 "AppWindow.c"
 }
 
 
@@ -1620,17 +1657,17 @@ Page* page_window_get_current_page (PageWindow* self) {
 	Page* result = NULL;
 	Page* _tmp0_;
 	Page* _tmp1_;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1606 "AppWindow.c"
+#line 1643 "AppWindow.c"
 }
 
 
@@ -1643,54 +1680,54 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	Page* _tmp5_;
 	Page* _tmp6_;
 	Page* _tmp7_;
-#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1625 "AppWindow.c"
+#line 1662 "AppWindow.c"
 		Page* _tmp1_;
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 305 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 305 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1631 "AppWindow.c"
+#line 1668 "AppWindow.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
-#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	old_page = _tmp3_;
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = _tmp5_;
-#line 302 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 302 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_set_container (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = page;
-#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_switched_pages (self, old_page, _tmp7_);
-#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1657 "AppWindow.c"
+#line 1694 "AppWindow.c"
 }
 
 
 void page_window_set_current_page (PageWindow* self, Page* page) {
-#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1666 "AppWindow.c"
+#line 1703 "AppWindow.c"
 }
 
 
@@ -1699,42 +1736,42 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	Page* old_page = NULL;
 	Page* _tmp2_;
 	Page* _tmp3_;
-#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 315 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 315 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1679 "AppWindow.c"
+#line 1716 "AppWindow.c"
 		Page* _tmp1_;
-#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 316 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1685 "AppWindow.c"
+#line 1722 "AppWindow.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	old_page = _tmp3_;
-#line 312 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 312 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = NULL;
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_switched_pages (self, old_page, NULL);
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1701 "AppWindow.c"
+#line 1738 "AppWindow.c"
 }
 
 
 void page_window_clear_current_page (PageWindow* self) {
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1710 "AppWindow.c"
+#line 1747 "AppWindow.c"
 }
 
 
@@ -1746,92 +1783,92 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_;
 	gboolean _tmp10_ = FALSE;
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_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"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1730 "AppWindow.c"
+#line 1767 "AppWindow.c"
 		GtkWidget* _tmp2_;
 		GdkEventKey* _tmp3_;
 		gboolean _tmp4_ = FALSE;
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1742 "AppWindow.c"
+#line 1779 "AppWindow.c"
 	} else {
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1746 "AppWindow.c"
+#line 1783 "AppWindow.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 326 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 326 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1754 "AppWindow.c"
+#line 1791 "AppWindow.c"
 	}
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1760 "AppWindow.c"
+#line 1797 "AppWindow.c"
 		Page* _tmp7_;
 		GdkEventKey* _tmp8_;
 		gboolean _tmp9_;
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = event;
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1772 "AppWindow.c"
+#line 1809 "AppWindow.c"
 	} else {
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1776 "AppWindow.c"
+#line 1813 "AppWindow.c"
 	}
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1784 "AppWindow.c"
+#line 1821 "AppWindow.c"
 	}
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 1788 "AppWindow.c"
+#line 1825 "AppWindow.c"
 		GdkEventKey* _tmp11_;
 		gboolean _tmp12_;
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1797 "AppWindow.c"
+#line 1834 "AppWindow.c"
 	} else {
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1801 "AppWindow.c"
+#line 1838 "AppWindow.c"
 	}
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1807 "AppWindow.c"
+#line 1844 "AppWindow.c"
 }
 
 
@@ -1843,92 +1880,92 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_;
 	gboolean _tmp10_ = FALSE;
-#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_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"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1827 "AppWindow.c"
+#line 1864 "AppWindow.c"
 		GtkWidget* _tmp2_;
 		GdkEventKey* _tmp3_;
 		gboolean _tmp4_ = FALSE;
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1839 "AppWindow.c"
+#line 1876 "AppWindow.c"
 	} else {
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1843 "AppWindow.c"
+#line 1880 "AppWindow.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1851 "AppWindow.c"
+#line 1888 "AppWindow.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 1857 "AppWindow.c"
+#line 1894 "AppWindow.c"
 		Page* _tmp7_;
 		GdkEventKey* _tmp8_;
 		gboolean _tmp9_;
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = event;
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 1869 "AppWindow.c"
+#line 1906 "AppWindow.c"
 	} else {
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1873 "AppWindow.c"
+#line 1910 "AppWindow.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1881 "AppWindow.c"
+#line 1918 "AppWindow.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 1885 "AppWindow.c"
+#line 1922 "AppWindow.c"
 		GdkEventKey* _tmp11_;
 		gboolean _tmp12_;
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 1894 "AppWindow.c"
+#line 1931 "AppWindow.c"
 	} else {
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 1898 "AppWindow.c"
+#line 1935 "AppWindow.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1904 "AppWindow.c"
+#line 1941 "AppWindow.c"
 }
 
 
@@ -1938,62 +1975,62 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	gboolean _tmp0_ = FALSE;
 	Page* _tmp1_;
 	gboolean _tmp5_ = FALSE;
-#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->current_page;
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1922 "AppWindow.c"
+#line 1959 "AppWindow.c"
 		Page* _tmp2_;
 		GdkEventFocus* _tmp3_;
 		gboolean _tmp4_;
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1934 "AppWindow.c"
+#line 1971 "AppWindow.c"
 	} else {
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 1938 "AppWindow.c"
+#line 1975 "AppWindow.c"
 	}
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1946 "AppWindow.c"
+#line 1983 "AppWindow.c"
 	}
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 1950 "AppWindow.c"
+#line 1987 "AppWindow.c"
 		GdkEventFocus* _tmp6_;
 		gboolean _tmp7_;
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_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"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 1959 "AppWindow.c"
+#line 1996 "AppWindow.c"
 	} else {
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 1963 "AppWindow.c"
+#line 2000 "AppWindow.c"
 	}
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
-#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1969 "AppWindow.c"
+#line 2006 "AppWindow.c"
 }
 
 
@@ -2003,62 +2040,62 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	gboolean _tmp0_ = FALSE;
 	Page* _tmp1_;
 	gboolean _tmp5_ = FALSE;
-#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->current_page;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1987 "AppWindow.c"
+#line 2024 "AppWindow.c"
 		Page* _tmp2_;
 		GdkEventFocus* _tmp3_;
 		gboolean _tmp4_;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 1999 "AppWindow.c"
+#line 2036 "AppWindow.c"
 	} else {
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2003 "AppWindow.c"
+#line 2040 "AppWindow.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2011 "AppWindow.c"
+#line 2048 "AppWindow.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2015 "AppWindow.c"
+#line 2052 "AppWindow.c"
 		GdkEventFocus* _tmp6_;
 		gboolean _tmp7_;
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 2024 "AppWindow.c"
+#line 2061 "AppWindow.c"
 	} else {
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2028 "AppWindow.c"
+#line 2065 "AppWindow.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2034 "AppWindow.c"
+#line 2071 "AppWindow.c"
 }
 
 
@@ -2067,55 +2104,55 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 	gboolean result = FALSE;
 	Page* _tmp0_;
 	gboolean _tmp4_ = FALSE;
-#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 2051 "AppWindow.c"
+#line 2088 "AppWindow.c"
 		Page* _tmp1_;
 		GdkEventConfigure* _tmp2_;
 		gboolean _tmp3_;
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = event;
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page_notify_configure_event (_tmp1_, _tmp2_);
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp3_) {
-#line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			result = TRUE;
-#line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return result;
-#line 2067 "AppWindow.c"
+#line 2104 "AppWindow.c"
 		}
 	}
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2072 "AppWindow.c"
+#line 2109 "AppWindow.c"
 		GdkEventConfigure* _tmp5_;
 		gboolean _tmp6_;
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 2081 "AppWindow.c"
+#line 2118 "AppWindow.c"
 	} else {
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 2085 "AppWindow.c"
+#line 2122 "AppWindow.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2091 "AppWindow.c"
+#line 2128 "AppWindow.c"
 }
 
 
@@ -2130,45 +2167,45 @@ void page_window_set_busy_cursor (PageWindow* self) {
 	GdkCursor* _tmp5_;
 	GdkWindow* _tmp6_;
 	GdkCursor* _tmp7_;
-#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 368 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->busy_counter;
-#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 368 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = _tmp0_ + 1;
-#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 368 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ > 0) {
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2116 "AppWindow.c"
+#line 2153 "AppWindow.c"
 	}
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = gdk_window_get_display (_tmp1_);
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	display = _tmp3_;
-#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = display;
-#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = gdk_cursor_new_for_display (_tmp4_, GDK_WATCH);
-#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	cursor = _tmp5_;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = cursor;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_window_set_cursor (_tmp6_, _tmp7_);
-#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	spin_event_loop ();
-#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (cursor);
-#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2144 "AppWindow.c"
+#line 2181 "AppWindow.c"
 }
 
 
@@ -2183,110 +2220,110 @@ void page_window_set_normal_cursor (PageWindow* self) {
 	GdkCursor* _tmp7_;
 	GdkWindow* _tmp8_;
 	GdkCursor* _tmp9_;
-#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->busy_counter;
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ <= 0) {
-#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->busy_counter = 0;
-#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2169 "AppWindow.c"
+#line 2206 "AppWindow.c"
 	} else {
 		gint _tmp1_;
 		gint _tmp2_;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->busy_counter;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->busy_counter = _tmp1_ - 1;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->busy_counter;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp2_ > 0) {
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 2183 "AppWindow.c"
+#line 2220 "AppWindow.c"
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = gdk_window_get_display (_tmp3_);
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	display = _tmp5_;
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = display;
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = gdk_cursor_new_for_display (_tmp6_, GDK_LEFT_PTR);
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	cursor = _tmp7_;
-#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = cursor;
-#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_window_set_cursor (_tmp8_, _tmp9_);
-#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 388 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	spin_event_loop ();
-#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (cursor);
-#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (display);
-#line 2212 "AppWindow.c"
+#line 2249 "AppWindow.c"
 }
 
 
 static void page_window_class_init (PageWindowClass * klass) {
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_parent_class = g_type_class_peek_parent (klass);
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_type_class_add_private (klass, sizeof (PageWindowPrivate));
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) page_window_real_switched_pages;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->set_current_page = (void (*) (PageWindow *, Page*)) page_window_real_set_current_page;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->clear_current_page = (void (*) (PageWindow *)) page_window_real_clear_current_page;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_press_event;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->key_release_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) page_window_real_key_release_event;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_in_event;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) page_window_real_focus_out_event;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) page_window_real_configure_event;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2239 "AppWindow.c"
+#line 2276 "AppWindow.c"
 }
 
 
 static void page_window_instance_init (PageWindow * self) {
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv = PAGE_WINDOW_GET_PRIVATE (self);
-#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = NULL;
-#line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 285 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = 0;
-#line 2250 "AppWindow.c"
+#line 2287 "AppWindow.c"
 }
 
 
 static void page_window_finalize (GObject * obj) {
 	PageWindow * self;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow);
-#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2262 "AppWindow.c"
+#line 2299 "AppWindow.c"
 }
 
 
@@ -2303,86 +2340,86 @@ 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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_about ((AppWindow*) self);
-#line 2281 "AppWindow.c"
+#line 2318 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit ((AppWindow*) self);
-#line 2288 "AppWindow.c"
+#line 2325 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_fullscreen ((AppWindow*) self);
-#line 2295 "AppWindow.c"
+#line 2332 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_contents ((AppWindow*) self);
-#line 2302 "AppWindow.c"
+#line 2339 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_faq ((AppWindow*) self);
-#line 2309 "AppWindow.c"
+#line 2346 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_help_report_problem ((AppWindow*) self);
-#line 2316 "AppWindow.c"
+#line 2353 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_undo ((AppWindow*) self);
-#line 2323 "AppWindow.c"
+#line 2360 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_redo ((AppWindow*) self);
-#line 2330 "AppWindow.c"
+#line 2367 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_jump_to_file ((AppWindow*) self);
-#line 2337 "AppWindow.c"
+#line 2374 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_all ((AppWindow*) self);
-#line 2344 "AppWindow.c"
+#line 2381 "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"
+#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_select_none ((AppWindow*) self);
-#line 2351 "AppWindow.c"
+#line 2388 "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"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2358 "AppWindow.c"
+#line 2395 "AppWindow.c"
 }
 
 
@@ -2401,186 +2438,186 @@ AppWindow* app_window_construct (GType object_type) {
 	GtkCssProvider* provider = NULL;
 	GtkCssProvider* _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = (AppWindow*) page_window_construct (object_type);
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp0_ == NULL, "instance == null");
-#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (self);
-#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_instance);
-#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_instance = _tmp1_;
-#line 412 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
-#line 413 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_default_icon_name ("shotwell");
-#line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2395 "AppWindow.c"
+#line 2432 "AppWindow.c"
 		ConfigFacade* _tmp2_;
 		ConfigFacade* _tmp3_;
 		gboolean _tmp4_ = FALSE;
 		Dimensions _tmp5_ = {0};
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		configuration_facade_get_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp4_, &_tmp5_);
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->maximized = _tmp4_;
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions = _tmp5_;
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2412 "AppWindow.c"
+#line 2449 "AppWindow.c"
 	} else {
 		ConfigFacade* _tmp6_;
 		ConfigFacade* _tmp7_;
 		gboolean _tmp8_ = FALSE;
 		Dimensions _tmp9_ = {0};
-#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_WINDOW), "this is DirectWindow");
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		configuration_facade_get_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp8_, &_tmp9_);
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->maximized = _tmp8_;
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions = _tmp9_;
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2432 "AppWindow.c"
+#line 2469 "AppWindow.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = self->dimensions;
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_.width;
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = self->dimensions;
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _tmp12_.height;
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_, _tmp13_);
-#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = self->maximized;
-#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp14_) {
-#line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 433 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2450 "AppWindow.c"
+#line 2487 "AppWindow.c"
 	}
-#line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = app_window_command_manager;
-#line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp15_ == NULL, "command_manager == null");
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = command_manager_new (COMMAND_MANAGER_DEFAULT_DEPTH);
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (app_window_command_manager);
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_command_manager = _tmp16_;
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = app_window_command_manager;
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_signal_connect_object (_tmp17_, "altered", (GCallback) _app_window_on_command_manager_altered_command_manager_altered, self, 0);
-#line 438 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_add_actions (self);
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_css_provider_new ();
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	provider = _tmp18_;
-#line 2472 "AppWindow.c"
+#line 2509 "AppWindow.c"
 	{
 		GdkScreen* _tmp19_;
-#line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 449 "/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"
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2479 "AppWindow.c"
-			goto __catch227_g_error;
+#line 2516 "AppWindow.c"
+			goto __catch238_g_error;
 		}
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = gdk_screen_get_default ();
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 450 "/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 2486 "AppWindow.c"
+#line 2523 "AppWindow.c"
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally238;
+	__catch238_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
 		const gchar* _tmp21_;
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = err;
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_->message;
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_debug ("AppWindow.vala:445: Unable to load custom CSS: %s", _tmp21_);
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_debug ("AppWindow.vala:452: Unable to load custom CSS: %s", _tmp21_);
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 2506 "AppWindow.c"
+#line 2543 "AppWindow.c"
 	}
-	__finally227:
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally238:
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (provider);
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2519 "AppWindow.c"
+#line 2556 "AppWindow.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (provider);
-#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 2525 "AppWindow.c"
+#line 2562 "AppWindow.c"
 }
 
 
 static void app_window_real_on_fullscreen (AppWindow* self) {
-#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 2534 "AppWindow.c"
+#line 2571 "AppWindow.c"
 }
 
 
 void app_window_on_fullscreen (AppWindow* self) {
-#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 463 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 2543 "AppWindow.c"
+#line 2580 "AppWindow.c"
 }
 
 
 gboolean app_window_has_instance (void) {
 	gboolean result = FALSE;
 	AppWindow* _tmp0_;
-#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp0_ != NULL;
-#line 466 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2556 "AppWindow.c"
+#line 2593 "AppWindow.c"
 }
 
 
@@ -2588,15 +2625,15 @@ AppWindow* app_window_get_instance (void) {
 	AppWindow* result = NULL;
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2572 "AppWindow.c"
+#line 2609 "AppWindow.c"
 }
 
 
@@ -2604,15 +2641,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
 	FullscreenWindow* result = NULL;
 	FullscreenWindow* _tmp0_;
 	FullscreenWindow* _tmp1_;
-#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 474 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2588 "AppWindow.c"
+#line 2625 "AppWindow.c"
 }
 
 
@@ -2622,92 +2659,92 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	GtkBuilder* _tmp0_;
 	void* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (glade_filename != NULL, NULL);
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	builder = _tmp0_;
-#line 2604 "AppWindow.c"
+#line 2641 "AppWindow.c"
 	{
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = glade_filename;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = resources_get_ui (_tmp1_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_builder_add_from_resource (builder, _tmp3_, &_inner_error_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp3_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2621 "AppWindow.c"
-			goto __catch228_g_error;
+#line 2658 "AppWindow.c"
+			goto __catch239_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally239;
+	__catch239_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _error_;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_->message;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp5_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_warning ("AppWindow.vala:489: Unable to create Gtk.Builder: %s\n", _tmp5_);
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 2643 "AppWindow.c"
+#line 2680 "AppWindow.c"
 	}
-	__finally228:
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally239:
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (builder);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2656 "AppWindow.c"
+#line 2693 "AppWindow.c"
 	}
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = user;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_builder_connect_signals (builder, _tmp6_);
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = builder;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2666 "AppWindow.c"
+#line 2703 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	const gchar* _tmp0_;
 	GtkWindow* _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = message;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2683 "AppWindow.c"
+#line 2720 "AppWindow.c"
 }
 
 
@@ -2727,83 +2764,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	gboolean _tmp14_;
 	gchar* _tmp15_;
 	gchar* _tmp16_;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2713 "AppWindow.c"
+#line 2750 "AppWindow.c"
 		GtkWindow* _tmp2_;
 		GtkWindow* _tmp3_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2724 "AppWindow.c"
+#line 2761 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2733 "AppWindow.c"
+#line 2770 "AppWindow.c"
 	}
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = should_escape;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp9_);
-#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp11_;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = title;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = message;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = should_escape;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2779 "AppWindow.c"
+#line 2816 "AppWindow.c"
 }
 
 
@@ -2826,93 +2863,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	const gchar* _tmp16_;
 	gboolean response = FALSE;
 	gint _tmp17_;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2814 "AppWindow.c"
+#line 2851 "AppWindow.c"
 		GtkWindow* _tmp2_;
 		GtkWindow* _tmp3_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2825 "AppWindow.c"
+#line 2862 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2834 "AppWindow.c"
+#line 2871 "AppWindow.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = message;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp14_);
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = negative;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = affirmative;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE);
-#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = response;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2888 "AppWindow.c"
+#line 2925 "AppWindow.c"
 }
 
 
@@ -2935,93 +2972,93 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	gchar* _tmp16_;
 	gint response = 0;
 	gint _tmp17_;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2923 "AppWindow.c"
+#line 2960 "AppWindow.c"
 		GtkWindow* _tmp2_;
 		GtkWindow* _tmp3_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2934 "AppWindow.c"
+#line 2971 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2943 "AppWindow.c"
+#line 2980 "AppWindow.c"
 	}
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = negative;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = title;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = message;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp13_, _tmp14_, TRUE);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2997 "AppWindow.c"
+#line 3034 "AppWindow.c"
 }
 
 
@@ -3044,101 +3081,101 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	GtkMessageDialog* _tmp16_;
 	gint _tmp17_;
 	GtkMessageDialog* _tmp18_;
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3030 "AppWindow.c"
+#line 3067 "AppWindow.c"
 		GtkWindow* _tmp2_;
 		GtkWindow* _tmp3_;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3041 "AppWindow.c"
+#line 3078 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3050 "AppWindow.c"
+#line 3087 "AppWindow.c"
 	}
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = dialog;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = message;
-#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = dialog;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3074 "AppWindow.c"
+#line 3111 "AppWindow.c"
 		const gchar* _tmp12_;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3080 "AppWindow.c"
+#line 3117 "AppWindow.c"
 	} else {
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3084 "AppWindow.c"
+#line 3121 "AppWindow.c"
 	}
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = dialog;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = dialog;
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = dialog;
-#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3114 "AppWindow.c"
+#line 3151 "AppWindow.c"
 }
 
 
@@ -3160,99 +3197,99 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	GtkMessageDialog* _tmp15_;
 	gint _tmp16_;
 	GtkMessageDialog* _tmp17_;
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3150 "AppWindow.c"
+#line 3187 "AppWindow.c"
 		GtkWindow* _tmp2_;
 		GtkWindow* _tmp3_;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3161 "AppWindow.c"
+#line 3198 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3170 "AppWindow.c"
+#line 3207 "AppWindow.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = title;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3184 "AppWindow.c"
+#line 3221 "AppWindow.c"
 		const gchar* _tmp9_;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3190 "AppWindow.c"
+#line 3227 "AppWindow.c"
 	} else {
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3194 "AppWindow.c"
+#line 3231 "AppWindow.c"
 	}
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = dialog;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = negative;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = affirmative;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _ ("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = dialog;
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp16_;
-#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = dialog;
-#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3228 "AppWindow.c"
+#line 3265 "AppWindow.c"
 }
 
 
@@ -3261,22 +3298,22 @@ void app_window_database_error (GError* err) {
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = err;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_->message;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = g_strdup_printf (_ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
 "not continue.\n" \
 "\n" \
 "%s"), _tmp1_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_panic (_tmp3_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp3_);
-#line 3249 "AppWindow.c"
+#line 3286 "AppWindow.c"
 }
 
 
@@ -3285,250 +3322,242 @@ void app_window_panic (const gchar* msg) {
 	const gchar* _tmp1_;
 	Application* _tmp2_;
 	Application* _tmp3_;
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (msg != NULL);
-#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = msg;
-#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_critical ("AppWindow.vala:584: %s", _tmp0_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_critical ("AppWindow.vala:591: %s", _tmp0_);
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = msg;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message (_tmp1_, NULL);
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_instance ();
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_panic (_tmp3_);
-#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3276 "AppWindow.c"
+#line 3313 "AppWindow.c"
 }
 
 
 static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3285 "AppWindow.c"
+#line 3322 "AppWindow.c"
 }
 
 
 gchar* app_window_get_app_role (AppWindow* self) {
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3294 "AppWindow.c"
+#line 3331 "AppWindow.c"
 }
 
 
 void app_window_on_about (AppWindow* self) {
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	static const gchar* artists[] = {"Aachen logo under public domain license https://www.flickr.com/photos/" \
-"30784528@N04/10860988196/", NULL};
-#line 3301 "AppWindow.c"
+#line 600 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	static const gchar* artists[] = {"Braunschweiger Löwe created by Magnus Manske., CC BY-SA 3.0, https://c" \
+"ommons.wikimedia.org/w/index.php?curid=109735", NULL};
+#line 3338 "AppWindow.c"
 	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkPixbuf* _tmp5_;
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GdkPixbuf* _tmp2_;
+	GdkPixbuf* _tmp3_;
+#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = g_strdup_printf ("%s \u2013 “Aachen”", RESOURCES_APP_VERSION);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp0_ = app_window_get_app_role (self);
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = app_window_get_app_role (self);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = _tmp4_;
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", _ (_tmp1_), "comments", _tmp3_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _ ("Visit the Shotwell web site"), "authors", RESOURCES_AUTHORS, "logo", _tmp5_, "artists", artists, "translator-credits", _ ("translator-credits"), NULL, NULL);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp5_);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_free0 (_tmp3_);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", RESOURCES_APP_VERSION " \u2013 \"Braunschweig\"", "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _ ("Visit the Shotwell web site"), "authors", RESOURCES_AUTHORS, "logo", _tmp3_, "artists", artists, "translator-credits", _ ("translator-credits"), NULL, NULL);
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp3_);
+#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3330 "AppWindow.c"
+#line 3359 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3338 "AppWindow.c"
+#line 3367 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3347 "AppWindow.c"
-			goto __catch229_g_error;
+#line 3376 "AppWindow.c"
+			goto __catch240_g_error;
 		}
 	}
-	goto __finally229;
-	__catch229_g_error:
+	goto __finally240;
+	__catch240_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp1_;
 		const gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_ ("Unable to display help: %s"), _tmp2_);
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3377 "AppWindow.c"
+#line 3406 "AppWindow.c"
 	}
-	__finally229:
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally240:
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3388 "AppWindow.c"
+#line 3417 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3397 "AppWindow.c"
+#line 3426 "AppWindow.c"
 	{
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3403 "AppWindow.c"
-			goto __catch230_g_error;
+#line 3432 "AppWindow.c"
+			goto __catch241_g_error;
 		}
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally241;
+	__catch241_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_;
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = err;
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _tmp0_->message;
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = g_strdup_printf (_ ("Unable to navigate to bug database: %s"), _tmp1_);
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp3_, NULL);
-#line 622 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp3_);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3433 "AppWindow.c"
+#line 3462 "AppWindow.c"
 	}
-	__finally230:
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally241:
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3444 "AppWindow.c"
+#line 3473 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3453 "AppWindow.c"
+#line 3482 "AppWindow.c"
 	{
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3459 "AppWindow.c"
-			goto __catch231_g_error;
+#line 3488 "AppWindow.c"
+			goto __catch242_g_error;
 		}
 	}
-	goto __finally231;
-	__catch231_g_error:
+	goto __finally242;
+	__catch242_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_;
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = err;
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _tmp0_->message;
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = g_strdup_printf (_ ("Unable to display FAQ: %s"), _tmp1_);
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp3_, NULL);
-#line 630 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp3_);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3489 "AppWindow.c"
+#line 3518 "AppWindow.c"
 	}
-	__finally231:
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally242:
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3500 "AppWindow.c"
+#line 3529 "AppWindow.c"
 	}
 }
 
@@ -3536,24 +3565,24 @@ static void app_window_on_help_faq (AppWindow* self) {
 static void app_window_real_on_quit (AppWindow* self) {
 	Application* _tmp0_;
 	Application* _tmp1_;
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3516 "AppWindow.c"
+#line 3545 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3525 "AppWindow.c"
+#line 3554 "AppWindow.c"
 }
 
 
@@ -3576,71 +3605,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_;
 	MediaSource* _tmp15_;
 	GError * _inner_error_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3570 "AppWindow.c"
+#line 3599 "AppWindow.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3592 "AppWindow.c"
+#line 3621 "AppWindow.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ == NULL) {
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3612 "AppWindow.c"
+#line 3641 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_;
@@ -3648,79 +3677,79 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_;
 		GFile* _tmp19_;
 		GFile* _tmp20_;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3638 "AppWindow.c"
-			goto __catch232_g_error;
+#line 3667 "AppWindow.c"
+			goto __catch243_g_error;
 		}
 	}
-	goto __finally232;
-	__catch232_g_error:
+	goto __finally243;
+	__catch243_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_;
 		gchar* _tmp22_;
 		gchar* _tmp23_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3665 "AppWindow.c"
+#line 3694 "AppWindow.c"
 	}
-	__finally232:
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally243:
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3678 "AppWindow.c"
+#line 3707 "AppWindow.c"
 	}
-#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3682 "AppWindow.c"
+#line 3711 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3692 "AppWindow.c"
+#line 3721 "AppWindow.c"
 }
 
 
@@ -3739,20 +3768,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3711 "AppWindow.c"
+#line 3740 "AppWindow.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 3718 "AppWindow.c"
+#line 3747 "AppWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 3724 "AppWindow.c"
+#line 3753 "AppWindow.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -3762,11 +3791,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 3734 "AppWindow.c"
+#line 3763 "AppWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3738 "AppWindow.c"
+#line 3767 "AppWindow.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -3774,7 +3803,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3746 "AppWindow.c"
+#line 3775 "AppWindow.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -3806,8 +3835,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3778 "AppWindow.c"
-				goto __catch233_g_regex_error;
+#line 3807 "AppWindow.c"
+				goto __catch244_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -3815,7 +3844,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3787 "AppWindow.c"
+#line 3816 "AppWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -3831,8 +3860,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3803 "AppWindow.c"
-				goto __catch233_g_regex_error;
+#line 3832 "AppWindow.c"
+				goto __catch244_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3842,7 +3871,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3814 "AppWindow.c"
+#line 3843 "AppWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -3856,10 +3885,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3828 "AppWindow.c"
+#line 3857 "AppWindow.c"
 	}
-	goto __finally233;
-	__catch233_g_regex_error:
+	goto __finally244;
+	__catch244_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -3870,9 +3899,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3842 "AppWindow.c"
+#line 3871 "AppWindow.c"
 	}
-	__finally233:
+	__finally244:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -3881,7 +3910,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3853 "AppWindow.c"
+#line 3882 "AppWindow.c"
 	}
 }
 
@@ -3892,53 +3921,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_;
 	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3878 "AppWindow.c"
+#line 3907 "AppWindow.c"
 		GFile* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		const gchar* _tmp7_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp6_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3910 "AppWindow.c"
+#line 3939 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_;
@@ -3948,44 +3977,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_;
 		gchar* _tmp13_;
 		const gchar* _tmp14_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp13_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 668 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3952 "AppWindow.c"
+#line 3981 "AppWindow.c"
 		}
 	}
-#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3957 "AppWindow.c"
+#line 3986 "AppWindow.c"
 }
 
 
@@ -3994,42 +4023,42 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 	GdkScreen* _tmp1_;
 	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (url != NULL);
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3984 "AppWindow.c"
+#line 4013 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_add_actions (AppWindow* self) {
-#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 683 "/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 3992 "AppWindow.c"
+#line 4021 "AppWindow.c"
 }
 
 
 void app_window_add_actions (AppWindow* self) {
-#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 676 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 4001 "AppWindow.c"
+#line 4030 "AppWindow.c"
 }
 
 
@@ -4046,81 +4075,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_;
 	FullscreenWindow* _tmp13_;
 	FullscreenWindow* _tmp14_;
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4026 "AppWindow.c"
+#line 4055 "AppWindow.c"
 		FullscreenWindow* _tmp1_;
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4034 "AppWindow.c"
+#line 4063 "AppWindow.c"
 	}
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = _tmp3_;
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4062 "AppWindow.c"
+#line 4091 "AppWindow.c"
 		Page* _tmp9_;
 		Page* _tmp10_;
 		FullscreenWindow* _tmp11_;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4076 "AppWindow.c"
+#line 4105 "AppWindow.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = _tmp13_;
-#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4092 "AppWindow.c"
+#line 4121 "AppWindow.c"
 }
 
 
@@ -4133,65 +4162,65 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_;
 	FullscreenWindow* _tmp9_;
 	FullscreenWindow* _tmp10_;
-#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ == NULL) {
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4113 "AppWindow.c"
+#line 4142 "AppWindow.c"
 	}
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4133 "AppWindow.c"
+#line 4162 "AppWindow.c"
 		Page* _tmp6_;
 		Page* _tmp7_;
 		FullscreenWindow* _tmp8_;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4147 "AppWindow.c"
+#line 4176 "AppWindow.c"
 	}
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4163 "AppWindow.c"
+#line 4192 "AppWindow.c"
 }
 
 
@@ -4200,21 +4229,21 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	const gchar* _tmp0_;
 	GAction* _tmp1_;
 	GAction* _tmp2_;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp0_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp2_;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4186 "AppWindow.c"
+#line 4215 "AppWindow.c"
 }
 
 
@@ -4224,42 +4253,42 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4210 "AppWindow.c"
+#line 4239 "AppWindow.c"
 	}
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4218 "AppWindow.c"
+#line 4247 "AppWindow.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4227 "AppWindow.c"
+#line 4256 "AppWindow.c"
 	}
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4231 "AppWindow.c"
+#line 4260 "AppWindow.c"
 }
 
 
@@ -4269,45 +4298,45 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4255 "AppWindow.c"
+#line 4284 "AppWindow.c"
 	}
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4263 "AppWindow.c"
+#line 4292 "AppWindow.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
 		gboolean _tmp6_;
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4275 "AppWindow.c"
+#line 4304 "AppWindow.c"
 	}
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4279 "AppWindow.c"
+#line 4308 "AppWindow.c"
 }
 
 
@@ -4317,66 +4346,66 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4303 "AppWindow.c"
+#line 4332 "AppWindow.c"
 	}
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4311 "AppWindow.c"
+#line 4340 "AppWindow.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
 		gboolean _tmp6_;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4323 "AppWindow.c"
+#line 4352 "AppWindow.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4327 "AppWindow.c"
+#line 4356 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4334 "AppWindow.c"
+#line 4363 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4341 "AppWindow.c"
+#line 4370 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4348 "AppWindow.c"
+#line 4377 "AppWindow.c"
 }
 
 
@@ -4388,23 +4417,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_;
 	Page* _tmp34_;
 	Page* _tmp35_;
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4376 "AppWindow.c"
+#line 4405 "AppWindow.c"
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
@@ -4417,49 +4446,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
 		guint _tmp14_;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self);
-#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self);
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4425 "AppWindow.c"
+#line 4454 "AppWindow.c"
 	}
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4431 "AppWindow.c"
+#line 4460 "AppWindow.c"
 		Page* _tmp16_;
 		ViewCollection* _tmp17_;
 		ViewCollection* _tmp18_;
@@ -4478,135 +4507,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_;
 		ViewCollection* _tmp32_;
 		gint _tmp33_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp18_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp21_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp24_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4504 "AppWindow.c"
+#line 4533 "AppWindow.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 758 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/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 4512 "AppWindow.c"
+#line 4541 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp0_;
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 767 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
-#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4531 "AppWindow.c"
+#line 4560 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4540 "AppWindow.c"
+#line 4569 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
 	Page* _tmp0_;
 	gint _tmp2_;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4553 "AppWindow.c"
+#line 4582 "AppWindow.c"
 		gint _tmp1_;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4559 "AppWindow.c"
+#line 4588 "AppWindow.c"
 	}
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_undo_action (self);
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4569 "AppWindow.c"
+#line 4598 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4578 "AppWindow.c"
+#line 4607 "AppWindow.c"
 }
 
 
@@ -4614,17 +4643,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_;
 	Page* _tmp1_;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = _tmp0_;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4596 "AppWindow.c"
+#line 4625 "AppWindow.c"
 		Page* _tmp2_;
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
@@ -4634,35 +4663,35 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_;
 		ViewCollection* _tmp9_;
 		gint _tmp10_;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4630 "AppWindow.c"
+#line 4659 "AppWindow.c"
 	}
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4634 "AppWindow.c"
+#line 4663 "AppWindow.c"
 }
 
 
@@ -4677,61 +4706,61 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	gint items = 0;
 	GMenu* _tmp6_;
 	gint _tmp7_;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (id != NULL);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (new_label != NULL);
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_menubar (_tmp1_);
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_get_type ()) ? ((GMenu*) _tmp2_) : NULL;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4667 "AppWindow.c"
+#line 4696 "AppWindow.c"
 	}
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	bar = _tmp4_;
-#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = bar;
-#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_ == NULL) {
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (bar);
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4683 "AppWindow.c"
+#line 4712 "AppWindow.c"
 	}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_menu_model_get_type (), GMenuModel));
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4691 "AppWindow.c"
+#line 4720 "AppWindow.c"
 	{
 		gint i = 0;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4696 "AppWindow.c"
+#line 4725 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4703 "AppWindow.c"
+#line 4732 "AppWindow.c"
 				gint _tmp10_;
 				gint _tmp11_;
 				GMenuModel* model = NULL;
@@ -4742,65 +4771,65 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				gint model_items = 0;
 				GMenuModel* _tmp16_;
 				gint _tmp17_;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4716 "AppWindow.c"
+#line 4745 "AppWindow.c"
 					gint _tmp9_;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4722 "AppWindow.c"
+#line 4751 "AppWindow.c"
 				}
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp10_ = i;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp11_ = items;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4734 "AppWindow.c"
+#line 4763 "AppWindow.c"
 				}
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp13_ = i;
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp14_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_menu_model_get_type (), GMenuModel), _tmp13_, G_MENU_LINK_SUBMENU);
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model = _tmp14_;
-#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp15_ = bar;
-#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (_tmp15_ == NULL) {
-#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_g_object_unref0 (model);
-#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4752 "AppWindow.c"
+#line 4781 "AppWindow.c"
 				}
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4760 "AppWindow.c"
+#line 4789 "AppWindow.c"
 				{
 					gint j = 0;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4765 "AppWindow.c"
+#line 4794 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4772 "AppWindow.c"
+#line 4801 "AppWindow.c"
 							gint _tmp20_;
 							gint _tmp21_;
 							GMenuModel* subsection = NULL;
@@ -4811,168 +4840,168 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							gint sub_items = 0;
 							GMenuModel* _tmp26_;
 							gint _tmp27_;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4785 "AppWindow.c"
+#line 4814 "AppWindow.c"
 								gint _tmp19_;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4791 "AppWindow.c"
+#line 4820 "AppWindow.c"
 							}
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp20_ = j;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp21_ = model_items;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!(_tmp20_ < _tmp21_)) {
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4803 "AppWindow.c"
+#line 4832 "AppWindow.c"
 							}
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp23_ = j;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp24_ = g_menu_model_get_item_link (_tmp22_, _tmp23_, G_MENU_LINK_SECTION);
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							subsection = _tmp24_;
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp25_ = subsection;
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (_tmp25_ == NULL) {
-#line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_g_object_unref0 (subsection);
-#line 809 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4821 "AppWindow.c"
+#line 4850 "AppWindow.c"
 							}
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4829 "AppWindow.c"
+#line 4858 "AppWindow.c"
 							{
 								gint k = 0;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4834 "AppWindow.c"
+#line 4863 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4841 "AppWindow.c"
+#line 4870 "AppWindow.c"
 										gint _tmp30_;
 										gint _tmp31_;
 										GMenuAttributeIter* it = NULL;
 										GMenuModel* _tmp32_;
 										gint _tmp33_;
 										GMenuAttributeIter* _tmp34_;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4850 "AppWindow.c"
+#line 4879 "AppWindow.c"
 											gint _tmp29_;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4856 "AppWindow.c"
+#line 4885 "AppWindow.c"
 										}
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp30_ = k;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp31_ = sub_items;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!(_tmp30_ < _tmp31_)) {
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4868 "AppWindow.c"
+#line 4897 "AppWindow.c"
 										}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp33_ = k;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp34_ = g_menu_model_iterate_item_attributes (_tmp32_, _tmp33_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										it = _tmp34_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4880 "AppWindow.c"
+#line 4909 "AppWindow.c"
 											GMenuAttributeIter* _tmp35_;
 											gboolean _tmp36_;
 											gboolean _tmp37_ = FALSE;
 											gboolean _tmp38_ = FALSE;
 											GMenuAttributeIter* _tmp39_;
 											const gchar* _tmp40_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp35_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp36_ = g_menu_attribute_iter_next (_tmp35_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (!_tmp36_) {
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4895 "AppWindow.c"
+#line 4924 "AppWindow.c"
 											}
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4903 "AppWindow.c"
+#line 4932 "AppWindow.c"
 												GMenuAttributeIter* _tmp41_;
 												GVariant* _tmp42_;
 												GVariant* _tmp43_;
 												const gchar* _tmp44_;
 												const gchar* _tmp45_;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp41_ = it;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp42_ = g_menu_attribute_iter_get_value (_tmp41_);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp43_ = _tmp42_;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp44_ = g_variant_get_string (_tmp43_, NULL);
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp45_ = id;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4923 "AppWindow.c"
+#line 4952 "AppWindow.c"
 											} else {
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4927 "AppWindow.c"
+#line 4956 "AppWindow.c"
 											}
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4933 "AppWindow.c"
+#line 4962 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
 												GMenuAttributeIter* _tmp47_;
 												const gchar* _tmp48_;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp47_ = it;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4944 "AppWindow.c"
+#line 4973 "AppWindow.c"
 													GMenuAttributeIter* _tmp49_;
 													GVariant* _tmp50_;
 													GVariant* _tmp51_;
@@ -4981,41 +5010,41 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													gchar* _tmp54_;
 													gchar* _tmp55_;
 													gboolean _tmp56_;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp49_ = it;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp50_ = g_menu_attribute_iter_get_value (_tmp49_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp51_ = _tmp50_;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp52_ = g_variant_get_string (_tmp51_, NULL);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp53_ = id;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp54_ = g_strconcat (".", _tmp53_, NULL);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp55_ = _tmp54_;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = _tmp56_;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_free0 (_tmp55_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4975 "AppWindow.c"
+#line 5004 "AppWindow.c"
 												} else {
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4979 "AppWindow.c"
+#line 5008 "AppWindow.c"
 												}
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4983 "AppWindow.c"
+#line 5012 "AppWindow.c"
 											}
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 4987 "AppWindow.c"
+#line 5016 "AppWindow.c"
 												GMenu* md = NULL;
 												GMenuModel* _tmp57_;
 												GMenu* _tmp58_;
@@ -5030,85 +5059,85 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												GMenu* _tmp66_;
 												gint _tmp67_;
 												GMenuItem* _tmp68_;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp57_ = subsection;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_get_type ()) ? ((GMenu*) _tmp57_) : NULL);
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												md = _tmp58_;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp59_ = subsection;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp60_ = k;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp61_ = g_menu_item_new_from_model (_tmp59_, _tmp60_);
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												m = _tmp61_;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp62_ = m;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp63_ = new_label;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_item_set_label (_tmp62_, _tmp63_);
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp64_ = md;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp65_ = k;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_remove (_tmp64_, _tmp65_);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp66_ = md;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp67_ = k;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp68_ = m;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (m);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (md);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (it);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (subsection);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (model);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (bar);
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5050 "AppWindow.c"
+#line 5079 "AppWindow.c"
 											}
 										}
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5055 "AppWindow.c"
+#line 5084 "AppWindow.c"
 									}
 								}
 							}
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5061 "AppWindow.c"
+#line 5090 "AppWindow.c"
 						}
 					}
 				}
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5067 "AppWindow.c"
+#line 5096 "AppWindow.c"
 			}
 		}
 	}
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5073 "AppWindow.c"
+#line 5102 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5080 "AppWindow.c"
+#line 5109 "AppWindow.c"
 }
 
 
@@ -5116,26 +5145,26 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5096 "AppWindow.c"
+#line 5125 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_undo_action (self);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5107 "AppWindow.c"
+#line 5136 "AppWindow.c"
 }
 
 
@@ -5151,51 +5180,51 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	CommandDescription* _tmp6_;
 	const gchar* _tmp18_;
 	const gchar* _tmp19_;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5143 "AppWindow.c"
+#line 5172 "AppWindow.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	action = _tmp2_;
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (action);
-#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5155 "AppWindow.c"
+#line 5184 "AppWindow.c"
 	}
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	label = _tmp5_;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = desc;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5167 "AppWindow.c"
+#line 5196 "AppWindow.c"
 		const gchar* _tmp7_;
 		CommandDescription* _tmp8_;
 		gchar* _tmp9_;
@@ -5204,62 +5233,62 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		gchar* _tmp12_;
 		gchar* _tmp13_;
 		GSimpleAction* _tmp14_;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = label;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = desc;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = command_description_get_name (_tmp8_);
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_strconcat (" ", _tmp10_, NULL);
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		label = _tmp13_;
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp10_);
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = action;
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5202 "AppWindow.c"
+#line 5231 "AppWindow.c"
 	} else {
 		const gchar* _tmp15_;
 		gchar* _tmp16_;
 		GSimpleAction* _tmp17_;
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp15_ = prefix;
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		label = _tmp16_;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = action;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5219 "AppWindow.c"
+#line 5248 "AppWindow.c"
 	}
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = label;
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_menu_item_label (self, _tmp18_, _tmp19_);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (label);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5231 "AppWindow.c"
+#line 5260 "AppWindow.c"
 }
 
 
@@ -5268,23 +5297,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_;
 	CommandDescription* _tmp2_;
 	CommandDescription* _tmp3_;
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 863 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5256 "AppWindow.c"
+#line 5285 "AppWindow.c"
 }
 
 
@@ -5293,47 +5322,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_;
 	CommandDescription* _tmp2_;
 	CommandDescription* _tmp3_;
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5281 "AppWindow.c"
+#line 5310 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_;
-#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5293 "AppWindow.c"
+#line 5322 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_;
-#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5305 "AppWindow.c"
+#line 5334 "AppWindow.c"
 }
 
 
@@ -5342,43 +5371,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_;
 	CheckerboardPage* _tmp1_;
 	Page* _tmp2_;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5324 "AppWindow.c"
+#line 5353 "AppWindow.c"
 	}
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5332 "AppWindow.c"
+#line 5361 "AppWindow.c"
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
-#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 883 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5346 "AppWindow.c"
+#line 5375 "AppWindow.c"
 	}
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5350 "AppWindow.c"
+#line 5379 "AppWindow.c"
 }
 
 
@@ -5387,43 +5416,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_;
 	CheckerboardPage* _tmp1_;
 	Page* _tmp2_;
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5369 "AppWindow.c"
+#line 5398 "AppWindow.c"
 	}
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5377 "AppWindow.c"
+#line 5406 "AppWindow.c"
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5391 "AppWindow.c"
+#line 5420 "AppWindow.c"
 	}
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5395 "AppWindow.c"
+#line 5424 "AppWindow.c"
 }
 
 
@@ -5435,88 +5464,88 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_;
 	GdkEventConfigure* _tmp5_;
 	gboolean _tmp6_;
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5421 "AppWindow.c"
+#line 5450 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp3_, &_tmp4_);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5430 "AppWindow.c"
+#line 5459 "AppWindow.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = GTK_WIDGET_CLASS (app_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5440 "AppWindow.c"
+#line 5469 "AppWindow.c"
 }
 
 
 static void app_window_class_init (AppWindowClass * klass) {
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_parent_class = g_type_class_peek_parent (klass);
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) app_window_real_on_fullscreen;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) app_window_real_get_app_role;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) app_window_real_on_quit;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->destroy = (void (*) (GtkWidget *)) app_window_real_destroy;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->add_actions = (void (*) (AppWindow *)) app_window_real_add_actions;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->switched_pages = (void (*) (PageWindow *, Page*, Page*)) app_window_real_switched_pages;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->update_common_action_availability = (void (*) (AppWindow *, Page*, Page*)) app_window_real_update_common_action_availability;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->update_common_actions = (void (*) (AppWindow *, Page*, gint, gint)) app_window_real_update_common_actions;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->configure_event = (gboolean (*) (GtkWidget *, GdkEventConfigure*)) app_window_real_configure_event;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 5467 "AppWindow.c"
+#line 5496 "AppWindow.c"
 }
 
 
 static void app_window_instance_init (AppWindow * self) {
-#line 402 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = 0;
-#line 405 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 412 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = 0;
-#line 5478 "AppWindow.c"
+#line 5507 "AppWindow.c"
 }
 
 
 static void app_window_finalize (GObject * obj) {
 	AppWindow * self;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 5488 "AppWindow.c"
+#line 5517 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index bfdfcaf..aefe3c6 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -89,8 +89,15 @@ public class FullscreenWindow : PageWindow {
         // capture motion events to show the toolbar
         add_events(Gdk.EventMask.POINTER_MOTION_MASK);
         
-        // start off with toolbar invoked, as a clue for the user
-        invoke_toolbar();
+        // If toolbar is enabled in "normal" ui OR was pinned in
+        // fullscreen, start off with toolbar invoked, as a clue for the
+        // user. Otherwise leave hidden unless activated by mouse over
+        if (Config.Facade.get_instance().get_display_toolbar() ||
+            !is_toolbar_dismissal_enabled) {
+            invoke_toolbar();
+        } else {
+            hide_toolbar();
+        }
 
         // Toolbar steals keyboard focus from page, put it back again
         page.grab_focus ();
@@ -590,10 +597,9 @@ public abstract class AppWindow : PageWindow {
     public abstract string get_app_role();
 
     protected void on_about() {
-        const string[] artists = { "Aachen logo under public domain license https://www.flickr.com/photos/30784528@N04/10860988196/", null };
+        const string[] artists = { "Braunschweiger Löwe created by Magnus Manske., CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=109735", null };
         Gtk.show_about_dialog(this,
-            // translators: %s will be replaced by application version
-            "version", _("%s \u2013 “Aachen”".printf(Resources.APP_VERSION)),
+            "version", Resources.APP_VERSION  + " \u2013 \"Braunschweig\"",
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
             "website", Resources.HOME_URL,
diff --git a/src/Application.c b/src/Application.c
index 3d0d2d9..a509a16 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -272,11 +272,11 @@ static Application* application_construct (GType object_type, gboolean is_direct
 #line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 275 "Application.c"
-			goto __catch560_g_error;
+			goto __catch569_g_error;
 		}
 	}
-	goto __finally560;
-	__catch560_g_error:
+	goto __finally569;
+	__catch569_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -289,7 +289,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_error_free0 (e);
 #line 291 "Application.c"
 	}
-	__finally560:
+	__finally569:
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 89be92d..3ee9b44 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -158,6 +158,7 @@ typedef struct _ParamSpecBatchImportResult ParamSpecBatchImportResult;
 typedef struct _ImportManifest ImportManifest;
 typedef struct _ImportManifestClass ImportManifestClass;
 typedef struct _ImportManifestPrivate ImportManifestPrivate;
+#define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
 #define _batch_import_result_unref0(var) ((var == NULL) ? NULL : (var = (batch_import_result_unref (var), NULL)))
 typedef struct _ParamSpecImportManifest ParamSpecImportManifest;
 
@@ -731,7 +732,6 @@ typedef struct _RawFileFormatPropertiesClass RawFileFormatPropertiesClass;
 typedef struct _JfifFileFormatProperties JfifFileFormatProperties;
 typedef struct _JfifFileFormatPropertiesClass JfifFileFormatPropertiesClass;
 typedef struct _ParamSpecPreparedFile ParamSpecPreparedFile;
-#define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
 
 #define TYPE_PHOTO_FILE_ADAPTER (photo_file_adapter_get_type ())
 #define PHOTO_FILE_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter))
@@ -833,11 +833,13 @@ struct _BatchImportJobClass {
 	gchar* (*get_basename) (BatchImportJob* self);
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+	GFile* (*get_associated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
 	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
 	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
+	gboolean (*recurse) (BatchImportJob* self);
 };
 
 struct _ParamSpecBatchImportJob {
@@ -857,6 +859,7 @@ struct _FileImportJobPrivate {
 	GFile* file_or_dir;
 	gboolean copy_to_library;
 	FileImportJob* associated;
+	gboolean _recurse;
 };
 
 struct _ImportID {
@@ -917,6 +920,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -1713,6 +1717,8 @@ gchar* batch_import_job_get_path (BatchImportJob* self);
 static gchar* batch_import_job_real_get_path (BatchImportJob* self);
 DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self);
 static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob* self);
+GFile* batch_import_job_get_associated_file (BatchImportJob* self);
+static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self);
 void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated);
 static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated);
 gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
@@ -1723,6 +1729,8 @@ gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, B
 static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 time_t batch_import_job_get_exposure_time_override (BatchImportJob* self);
 static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self);
+gboolean batch_import_job_recurse (BatchImportJob* self);
+static gboolean batch_import_job_real_recurse (BatchImportJob* self);
 BatchImportJob* batch_import_job_construct (GType object_type);
 static void batch_import_job_finalize (BatchImportJob * obj);
 GType file_import_job_get_type (void) G_GNUC_CONST;
@@ -1730,8 +1738,8 @@ GType file_import_job_get_type (void) G_GNUC_CONST;
 enum  {
 	FILE_IMPORT_JOB_DUMMY_PROPERTY
 };
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
 static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base);
 static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base);
 static gboolean file_import_job_real_is_directory (BatchImportJob* base);
@@ -1742,6 +1750,7 @@ static void file_import_job_real_set_associated (BatchImportJob* base, BatchImpo
 static gboolean file_import_job_real_determine_file_size (BatchImportJob* base, guint64* filesize, GFile* * file);
 static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * file_to_import, gboolean* copy, GError** error);
 GFile* file_import_job_get_file (FileImportJob* self);
+static gboolean file_import_job_real_recurse (BatchImportJob* base);
 static void file_import_job_finalize (BatchImportJob * obj);
 GType import_id_get_type (void) G_GNUC_CONST;
 ImportID* import_id_dup (const ImportID* self);
@@ -2052,7 +2061,7 @@ Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 GType orientation_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
-void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
+void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error);
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
@@ -2060,7 +2069,7 @@ ConfigFacade* config_facade_get_instance (void);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
 void photo_set_default_raw_developer (Photo* self, RawDeveloper d);
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
 Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self);
 CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result);
 CompletedImportObject* completed_import_object_construct (GType object_type, MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result);
@@ -2157,7 +2166,7 @@ gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatPr
 static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, FileToPrepare* maybe_paired);
 GType jfif_file_format_properties_get_type (void) G_GNUC_CONST;
 JfifFileFormatProperties* jfif_file_format_properties_get_instance (void);
-void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, GError** error);
+void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error);
 GCancellable* background_job_get_cancellable (BackgroundJob* self);
 gboolean photo_is_file_image (GFile* file);
 gboolean photo_file_format_is_file_supported (GFile* file);
@@ -2207,9 +2216,8 @@ gpointer value_get_media_metadata (const GValue* value);
 GType media_metadata_get_type (void) G_GNUC_CONST;
 GType photo_metadata_get_type (void) G_GNUC_CONST;
 PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
 static void prepare_files_job_finalize (BackgroundJob * obj);
 enum  {
 	READY_FOR_IMPORT_DUMMY_PROPERTY
@@ -2260,7 +2268,7 @@ gchar* import_result_to_string (ImportResult self) {
 	switch (self) {
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 2264 "BatchImport.c"
+#line 2272 "BatchImport.c"
 		{
 			gchar* _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2269,11 +2277,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2273 "BatchImport.c"
+#line 2281 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_ERROR:
-#line 2277 "BatchImport.c"
+#line 2285 "BatchImport.c"
 		{
 			gchar* _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2282,11 +2290,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2286 "BatchImport.c"
+#line 2294 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DECODE_ERROR:
-#line 2290 "BatchImport.c"
+#line 2298 "BatchImport.c"
 		{
 			gchar* _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2295,11 +2303,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2299 "BatchImport.c"
+#line 2307 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DATABASE_ERROR:
-#line 2303 "BatchImport.c"
+#line 2311 "BatchImport.c"
 		{
 			gchar* _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2308,11 +2316,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2312 "BatchImport.c"
+#line 2320 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2316 "BatchImport.c"
+#line 2324 "BatchImport.c"
 		{
 			gchar* _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2321,11 +2329,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp4_;
 #line 38 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2325 "BatchImport.c"
+#line 2333 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_A_FILE:
-#line 2329 "BatchImport.c"
+#line 2337 "BatchImport.c"
 		{
 			gchar* _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2334,11 +2342,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2338 "BatchImport.c"
+#line 2346 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 2342 "BatchImport.c"
+#line 2350 "BatchImport.c"
 		{
 			gchar* _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2347,11 +2355,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp6_;
 #line 44 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2351 "BatchImport.c"
+#line 2359 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 2355 "BatchImport.c"
+#line 2363 "BatchImport.c"
 		{
 			gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2360,11 +2368,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2364 "BatchImport.c"
+#line 2372 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 2368 "BatchImport.c"
+#line 2376 "BatchImport.c"
 		{
 			gchar* _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2373,11 +2381,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp8_;
 #line 50 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2377 "BatchImport.c"
+#line 2385 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2381 "BatchImport.c"
+#line 2389 "BatchImport.c"
 		{
 			gchar* _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2386,11 +2394,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp9_;
 #line 53 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2390 "BatchImport.c"
+#line 2398 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FULL:
-#line 2394 "BatchImport.c"
+#line 2402 "BatchImport.c"
 		{
 			gchar* _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2399,11 +2407,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp10_;
 #line 56 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2403 "BatchImport.c"
+#line 2411 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 2407 "BatchImport.c"
+#line 2415 "BatchImport.c"
 		{
 			gchar* _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2412,11 +2420,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp11_;
 #line 59 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2416 "BatchImport.c"
+#line 2424 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 2420 "BatchImport.c"
+#line 2428 "BatchImport.c"
 		{
 			gchar* _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2425,11 +2433,11 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp12_;
 #line 62 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2429 "BatchImport.c"
+#line 2437 "BatchImport.c"
 		}
 #line 24 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 2433 "BatchImport.c"
+#line 2441 "BatchImport.c"
 		{
 			gchar* _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2438,7 +2446,7 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp13_;
 #line 65 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2442 "BatchImport.c"
+#line 2450 "BatchImport.c"
 		}
 		default:
 		{
@@ -2449,7 +2457,7 @@ gchar* import_result_to_string (ImportResult self) {
 			result = _tmp14_;
 #line 68 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2453 "BatchImport.c"
+#line 2461 "BatchImport.c"
 		}
 	}
 }
@@ -2465,13 +2473,13 @@ gboolean import_result_is_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FAILURE:
 #line 73 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 2469 "BatchImport.c"
+#line 2477 "BatchImport.c"
 		{
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 77 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2475 "BatchImport.c"
+#line 2483 "BatchImport.c"
 		}
 		default:
 		{
@@ -2479,7 +2487,7 @@ gboolean import_result_is_abort (ImportResult self) {
 			result = FALSE;
 #line 80 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2483 "BatchImport.c"
+#line 2491 "BatchImport.c"
 		}
 	}
 }
@@ -2493,13 +2501,13 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 		case IMPORT_RESULT_DISK_FULL:
 #line 85 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_DISK_FAILURE:
-#line 2497 "BatchImport.c"
+#line 2505 "BatchImport.c"
 		{
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = TRUE;
 #line 88 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2503 "BatchImport.c"
+#line 2511 "BatchImport.c"
 		}
 		default:
 		{
@@ -2507,7 +2515,7 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 			result = FALSE;
 #line 91 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2511 "BatchImport.c"
+#line 2519 "BatchImport.c"
 		}
 	}
 }
@@ -2516,7 +2524,7 @@ gboolean import_result_is_nonuser_abort (ImportResult self) {
 static gpointer _g_error_copy0 (gpointer self) {
 #line 97 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2520 "BatchImport.c"
+#line 2528 "BatchImport.c"
 }
 
 
@@ -2528,7 +2536,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 	_tmp0_ = err;
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_->domain == G_FILE_ERROR) {
-#line 2532 "BatchImport.c"
+#line 2540 "BatchImport.c"
 		GError* ferr = NULL;
 		GError* _tmp1_;
 		GError* _tmp2_;
@@ -2549,7 +2557,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 			_g_error_free0 (ferr);
 #line 100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 2553 "BatchImport.c"
+#line 2561 "BatchImport.c"
 		} else {
 			GError* _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2562,7 +2570,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				_g_error_free0 (ferr);
 #line 102 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2566 "BatchImport.c"
+#line 2574 "BatchImport.c"
 			} else {
 				GError* _tmp5_;
 #line 103 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2575,7 +2583,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					_g_error_free0 (ferr);
 #line 104 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2579 "BatchImport.c"
+#line 2587 "BatchImport.c"
 				} else {
 					GError* _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2588,7 +2596,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (ferr);
 #line 106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2592 "BatchImport.c"
+#line 2600 "BatchImport.c"
 					} else {
 						GError* _tmp7_;
 #line 107 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2601,7 +2609,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ferr);
 #line 108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2605 "BatchImport.c"
+#line 2613 "BatchImport.c"
 						} else {
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							result = IMPORT_RESULT_FILE_ERROR;
@@ -2609,7 +2617,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ferr);
 #line 110 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2613 "BatchImport.c"
+#line 2621 "BatchImport.c"
 						}
 					}
 				}
@@ -2617,14 +2625,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 		}
 #line 96 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (ferr);
-#line 2621 "BatchImport.c"
+#line 2629 "BatchImport.c"
 	} else {
 		GError* _tmp8_;
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = err;
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp8_->domain == G_IO_ERROR) {
-#line 2628 "BatchImport.c"
+#line 2636 "BatchImport.c"
 			GError* ioerr = NULL;
 			GError* _tmp9_;
 			GError* _tmp10_;
@@ -2645,7 +2653,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				_g_error_free0 (ioerr);
 #line 115 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2649 "BatchImport.c"
+#line 2657 "BatchImport.c"
 			} else {
 				GError* _tmp12_;
 #line 116 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2658,7 +2666,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					_g_error_free0 (ioerr);
 #line 117 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return result;
-#line 2662 "BatchImport.c"
+#line 2670 "BatchImport.c"
 				} else {
 					GError* _tmp13_;
 #line 118 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2671,7 +2679,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (ioerr);
 #line 119 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2675 "BatchImport.c"
+#line 2683 "BatchImport.c"
 					} else {
 						GError* _tmp14_;
 #line 120 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2684,7 +2692,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (ioerr);
 #line 121 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2688 "BatchImport.c"
+#line 2696 "BatchImport.c"
 						} else {
 							GError* _tmp15_;
 #line 122 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2697,7 +2705,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 								_g_error_free0 (ioerr);
 #line 123 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2701 "BatchImport.c"
+#line 2709 "BatchImport.c"
 							} else {
 								GError* _tmp16_;
 #line 124 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2710,7 +2718,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (ioerr);
 #line 125 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2714 "BatchImport.c"
+#line 2722 "BatchImport.c"
 								} else {
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									result = IMPORT_RESULT_FILE_ERROR;
@@ -2718,7 +2726,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (ioerr);
 #line 127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2722 "BatchImport.c"
+#line 2730 "BatchImport.c"
 								}
 							}
 						}
@@ -2727,7 +2735,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 			}
 #line 111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (ioerr);
-#line 2731 "BatchImport.c"
+#line 2739 "BatchImport.c"
 		} else {
 			GError* _tmp17_;
 #line 128 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2738,14 +2746,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 				result = IMPORT_RESULT_CAMERA_ERROR;
 #line 129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 2742 "BatchImport.c"
+#line 2750 "BatchImport.c"
 			} else {
 				GError* _tmp18_;
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = err;
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp18_->domain == GDK_PIXBUF_ERROR) {
-#line 2749 "BatchImport.c"
+#line 2757 "BatchImport.c"
 					GError* pixbuferr = NULL;
 					GError* _tmp19_;
 					GError* _tmp20_;
@@ -2766,14 +2774,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 						_g_error_free0 (pixbuferr);
 #line 134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						return result;
-#line 2770 "BatchImport.c"
+#line 2778 "BatchImport.c"
 					} else {
 						GError* _tmp22_;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp22_ = pixbuferr;
 #line 135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (g_error_matches (_tmp22_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)) {
-#line 2777 "BatchImport.c"
+#line 2785 "BatchImport.c"
 							ImportResult _tmp23_;
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp23_ = default_result;
@@ -2783,14 +2791,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 							_g_error_free0 (pixbuferr);
 #line 136 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							return result;
-#line 2787 "BatchImport.c"
+#line 2795 "BatchImport.c"
 						} else {
 							GError* _tmp24_;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp24_ = pixbuferr;
 #line 137 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							if (g_error_matches (_tmp24_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION)) {
-#line 2794 "BatchImport.c"
+#line 2802 "BatchImport.c"
 								ImportResult _tmp25_;
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								_tmp25_ = default_result;
@@ -2800,7 +2808,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 								_g_error_free0 (pixbuferr);
 #line 138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 								return result;
-#line 2804 "BatchImport.c"
+#line 2812 "BatchImport.c"
 							} else {
 								GError* _tmp26_;
 #line 139 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2813,14 +2821,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 									_g_error_free0 (pixbuferr);
 #line 140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									return result;
-#line 2817 "BatchImport.c"
+#line 2825 "BatchImport.c"
 								} else {
 									GError* _tmp27_;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									_tmp27_ = pixbuferr;
 #line 141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 									if (g_error_matches (_tmp27_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION)) {
-#line 2824 "BatchImport.c"
+#line 2832 "BatchImport.c"
 										ImportResult _tmp28_;
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										_tmp28_ = default_result;
@@ -2830,14 +2838,14 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 										_g_error_free0 (pixbuferr);
 #line 142 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										return result;
-#line 2834 "BatchImport.c"
+#line 2842 "BatchImport.c"
 									} else {
 										GError* _tmp29_;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										_tmp29_ = pixbuferr;
 #line 143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 										if (g_error_matches (_tmp29_, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED)) {
-#line 2841 "BatchImport.c"
+#line 2849 "BatchImport.c"
 											ImportResult _tmp30_;
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											_tmp30_ = default_result;
@@ -2847,7 +2855,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 											_g_error_free0 (pixbuferr);
 #line 144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2851 "BatchImport.c"
+#line 2859 "BatchImport.c"
 										} else {
 											ImportResult _tmp31_;
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -2858,7 +2866,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 											_g_error_free0 (pixbuferr);
 #line 146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 											return result;
-#line 2862 "BatchImport.c"
+#line 2870 "BatchImport.c"
 										}
 									}
 								}
@@ -2867,7 +2875,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 					}
 #line 130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (pixbuferr);
-#line 2871 "BatchImport.c"
+#line 2879 "BatchImport.c"
 				}
 			}
 		}
@@ -2878,7 +2886,7 @@ ImportResult import_result_convert_error (GError* err, ImportResult default_resu
 	result = _tmp32_;
 #line 149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 2882 "BatchImport.c"
+#line 2890 "BatchImport.c"
 }
 
 
@@ -2899,7 +2907,7 @@ static gchar* batch_import_job_real_get_dest_identifier (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_dest_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2903 "BatchImport.c"
+#line 2911 "BatchImport.c"
 }
 
 
@@ -2908,7 +2916,7 @@ gchar* batch_import_job_get_dest_identifier (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_dest_identifier (self);
-#line 2912 "BatchImport.c"
+#line 2920 "BatchImport.c"
 }
 
 
@@ -2917,7 +2925,7 @@ static gchar* batch_import_job_real_get_source_identifier (BatchImportJob* self)
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_source_identifier'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2921 "BatchImport.c"
+#line 2929 "BatchImport.c"
 }
 
 
@@ -2926,7 +2934,7 @@ gchar* batch_import_job_get_source_identifier (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_source_identifier (self);
-#line 2930 "BatchImport.c"
+#line 2938 "BatchImport.c"
 }
 
 
@@ -2936,7 +2944,7 @@ static gboolean batch_import_job_real_is_directory (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_is_directory'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 2940 "BatchImport.c"
+#line 2948 "BatchImport.c"
 }
 
 
@@ -2945,7 +2953,7 @@ gboolean batch_import_job_is_directory (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
 #line 165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->is_directory (self);
-#line 2949 "BatchImport.c"
+#line 2957 "BatchImport.c"
 }
 
 
@@ -2954,7 +2962,7 @@ static gchar* batch_import_job_real_get_basename (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_basename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2958 "BatchImport.c"
+#line 2966 "BatchImport.c"
 }
 
 
@@ -2963,7 +2971,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 167 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_basename (self);
-#line 2967 "BatchImport.c"
+#line 2975 "BatchImport.c"
 }
 
 
@@ -2972,7 +2980,7 @@ static gchar* batch_import_job_real_get_path (BatchImportJob* self) {
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_get_path'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 2976 "BatchImport.c"
+#line 2984 "BatchImport.c"
 }
 
 
@@ -2981,7 +2989,7 @@ gchar* batch_import_job_get_path (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_path (self);
-#line 2985 "BatchImport.c"
+#line 2993 "BatchImport.c"
 }
 
 
@@ -2991,7 +2999,7 @@ static DuplicatedFile* batch_import_job_real_get_duplicated_file (BatchImportJob
 	result = NULL;
 #line 172 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 2995 "BatchImport.c"
+#line 3003 "BatchImport.c"
 }
 
 
@@ -3000,105 +3008,143 @@ DuplicatedFile* batch_import_job_get_duplicated_file (BatchImportJob* self) {
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
 #line 171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_duplicated_file (self);
-#line 3004 "BatchImport.c"
+#line 3012 "BatchImport.c"
 }
 
 
-static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated) {
+static GFile* batch_import_job_real_get_associated_file (BatchImportJob* self) {
+	GFile* result = NULL;
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+	result = NULL;
 #line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return result;
+#line 3022 "BatchImport.c"
+}
+
+
+GFile* batch_import_job_get_associated_file (BatchImportJob* self) {
+#line 175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), NULL);
+#line 175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_associated_file (self);
+#line 3031 "BatchImport.c"
+}
+
+
+static void batch_import_job_real_set_associated (BatchImportJob* self, BatchImportJob* associated) {
+#line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_critical ("Type `%s' does not implement abstract method `batch_import_job_set_associated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return;
-#line 3013 "BatchImport.c"
+#line 3040 "BatchImport.c"
 }
 
 
 void batch_import_job_set_associated (BatchImportJob* self, BatchImportJob* associated) {
-#line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (self));
-#line 176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_GET_CLASS (self)->set_associated (self, associated);
-#line 3022 "BatchImport.c"
+#line 3049 "BatchImport.c"
 }
 
 
 static gboolean batch_import_job_real_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
 	gboolean _tmp0_ = FALSE;
-#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_determine_file_size'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3032 "BatchImport.c"
+#line 3059 "BatchImport.c"
 }
 
 
 gboolean batch_import_job_determine_file_size (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir) {
-#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
-#line 183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->determine_file_size (self, filesize, file_or_dir);
-#line 3041 "BatchImport.c"
+#line 3068 "BatchImport.c"
 }
 
 
 static gboolean batch_import_job_real_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
 	gboolean _tmp0_ = FALSE;
-#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_critical ("Type `%s' does not implement abstract method `batch_import_job_prepare'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return _tmp0_;
-#line 3051 "BatchImport.c"
+#line 3078 "BatchImport.c"
 }
 
 
 gboolean batch_import_job_prepare (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error) {
-#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
-#line 186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->prepare (self, file_to_import, copy_to_library, error);
-#line 3060 "BatchImport.c"
+#line 3087 "BatchImport.c"
 }
 
 
 static gboolean batch_import_job_real_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
 	gboolean result = FALSE;
-#line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
-#line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
-#line 197 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 201 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 201 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3074 "BatchImport.c"
+#line 3101 "BatchImport.c"
 }
 
 
 gboolean batch_import_job_complete (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
-#line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
-#line 196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->complete (self, source, import_roll, error);
-#line 3083 "BatchImport.c"
+#line 3110 "BatchImport.c"
 }
 
 
 static time_t batch_import_job_real_get_exposure_time_override (BatchImportJob* self) {
 	time_t result = 0;
-#line 203 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = (time_t) 0;
-#line 203 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3093 "BatchImport.c"
+#line 3120 "BatchImport.c"
 }
 
 
 time_t batch_import_job_get_exposure_time_override (BatchImportJob* self) {
-#line 202 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 206 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), 0);
-#line 202 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 206 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return BATCH_IMPORT_JOB_GET_CLASS (self)->get_exposure_time_override (self);
-#line 3102 "BatchImport.c"
+#line 3129 "BatchImport.c"
+}
+
+
+static gboolean batch_import_job_real_recurse (BatchImportJob* self) {
+	gboolean result = FALSE;
+#line 211 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	result = TRUE;
+#line 211 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return result;
+#line 3139 "BatchImport.c"
+}
+
+
+gboolean batch_import_job_recurse (BatchImportJob* self) {
+#line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (self), FALSE);
+#line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return BATCH_IMPORT_JOB_GET_CLASS (self)->recurse (self);
+#line 3148 "BatchImport.c"
 }
 
 
@@ -3108,14 +3154,14 @@ BatchImportJob* batch_import_job_construct (GType object_type) {
 	self = (BatchImportJob*) g_type_create_instance (object_type);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3112 "BatchImport.c"
+#line 3158 "BatchImport.c"
 }
 
 
 static void value_batch_import_job_init (GValue* value) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3119 "BatchImport.c"
+#line 3165 "BatchImport.c"
 }
 
 
@@ -3124,7 +3170,7 @@ static void value_batch_import_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (value->data[0].v_pointer);
-#line 3128 "BatchImport.c"
+#line 3174 "BatchImport.c"
 	}
 }
 
@@ -3134,11 +3180,11 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_job_ref (src_value->data[0].v_pointer);
-#line 3138 "BatchImport.c"
+#line 3184 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3142 "BatchImport.c"
+#line 3188 "BatchImport.c"
 	}
 }
 
@@ -3146,37 +3192,37 @@ static void value_batch_import_job_copy_value (const GValue* src_value, GValue*
 static gpointer value_batch_import_job_peek_pointer (const GValue* value) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3150 "BatchImport.c"
+#line 3196 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3157 "BatchImport.c"
+#line 3203 "BatchImport.c"
 		BatchImportJob * object;
 		object = collect_values[0].v_pointer;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3164 "BatchImport.c"
+#line 3210 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.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 3168 "BatchImport.c"
+#line 3214 "BatchImport.c"
 		}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_job_ref (object);
-#line 3172 "BatchImport.c"
+#line 3218 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3176 "BatchImport.c"
+#line 3222 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3180 "BatchImport.c"
+#line 3226 "BatchImport.c"
 }
 
 
@@ -3187,25 +3233,25 @@ static gchar* value_batch_import_job_lcopy_value (const GValue* value, guint n_c
 	if (!object_p) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3191 "BatchImport.c"
+#line 3237 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3197 "BatchImport.c"
+#line 3243 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3201 "BatchImport.c"
+#line 3247 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_job_ref (value->data[0].v_pointer);
-#line 3205 "BatchImport.c"
+#line 3251 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3209 "BatchImport.c"
+#line 3255 "BatchImport.c"
 }
 
 
@@ -3219,7 +3265,7 @@ GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3223 "BatchImport.c"
+#line 3269 "BatchImport.c"
 }
 
 
@@ -3228,7 +3274,7 @@ gpointer value_get_batch_import_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_JOB), NULL);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3232 "BatchImport.c"
+#line 3278 "BatchImport.c"
 }
 
 
@@ -3248,17 +3294,17 @@ void value_set_batch_import_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_ref (value->data[0].v_pointer);
-#line 3252 "BatchImport.c"
+#line 3298 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3256 "BatchImport.c"
+#line 3302 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3262 "BatchImport.c"
+#line 3308 "BatchImport.c"
 	}
 }
 
@@ -3277,17 +3323,17 @@ void value_take_batch_import_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3281 "BatchImport.c"
+#line 3327 "BatchImport.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3285 "BatchImport.c"
+#line 3331 "BatchImport.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_job_unref (old);
-#line 3291 "BatchImport.c"
+#line 3337 "BatchImport.c"
 	}
 }
 
@@ -3310,6 +3356,8 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_duplicated_file = (DuplicatedFile* (*) (BatchImportJob *)) batch_import_job_real_get_duplicated_file;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BatchImportJobClass *) klass)->get_associated_file = (GFile* (*) (BatchImportJob *)) batch_import_job_real_get_associated_file;
+#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) batch_import_job_real_set_associated;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) batch_import_job_real_determine_file_size;
@@ -3319,14 +3367,16 @@ static void batch_import_job_class_init (BatchImportJobClass * klass) {
 	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) batch_import_job_real_complete;
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_exposure_time_override = (time_t (*) (BatchImportJob *)) batch_import_job_real_get_exposure_time_override;
-#line 3323 "BatchImport.c"
+#line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) batch_import_job_real_recurse;
+#line 3373 "BatchImport.c"
 }
 
 
 static void batch_import_job_instance_init (BatchImportJob * self) {
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3330 "BatchImport.c"
+#line 3380 "BatchImport.c"
 }
 
 
@@ -3336,7 +3386,7 @@ static void batch_import_job_finalize (BatchImportJob * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_JOB, BatchImportJob);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 3340 "BatchImport.c"
+#line 3390 "BatchImport.c"
 }
 
 
@@ -3361,7 +3411,7 @@ gpointer batch_import_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 3365 "BatchImport.c"
+#line 3415 "BatchImport.c"
 }
 
 
@@ -3374,49 +3424,54 @@ void batch_import_job_unref (gpointer instance) {
 		BATCH_IMPORT_JOB_GET_CLASS (self)->finalize (self);
 #line 160 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3378 "BatchImport.c"
+#line 3428 "BatchImport.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 3386 "BatchImport.c"
+#line 3436 "BatchImport.c"
 }
 
 
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library) {
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) {
 	FileImportJob* self = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
 	gboolean _tmp2_;
-#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	gboolean _tmp3_;
+#line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file_or_dir), NULL);
-#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (FileImportJob*) batch_import_job_construct (object_type);
-#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = file_or_dir;
-#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file_or_dir);
-#line 213 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file_or_dir = _tmp1_;
-#line 214 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 223 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = copy_to_library;
-#line 214 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 223 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->copy_to_library = _tmp2_;
-#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 224 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp3_ = recurse;
+#line 224 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	self->priv->_recurse = _tmp3_;
+#line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3413 "BatchImport.c"
+#line 3468 "BatchImport.c"
 }
 
 
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library) {
-#line 212 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library);
-#line 3420 "BatchImport.c"
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse) {
+#line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return file_import_job_construct (TYPE_FILE_IMPORT_JOB, file_or_dir, copy_to_library, recurse);
+#line 3475 "BatchImport.c"
 }
 
 
@@ -3425,17 +3480,17 @@ static gchar* file_import_job_real_get_dest_identifier (BatchImportJob* base) {
 	gchar* result = NULL;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
-#line 217 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 227 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 228 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 228 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 228 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 228 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3439 "BatchImport.c"
+#line 3494 "BatchImport.c"
 }
 
 
@@ -3444,17 +3499,17 @@ static gchar* file_import_job_real_get_source_identifier (BatchImportJob* base)
 	gchar* result = NULL;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
-#line 221 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 231 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 222 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3458 "BatchImport.c"
+#line 3513 "BatchImport.c"
 }
 
 
@@ -3463,17 +3518,17 @@ static gboolean file_import_job_real_is_directory (BatchImportJob* base) {
 	gboolean result = FALSE;
 	GFile* _tmp0_;
 	gboolean _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 235 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = query_is_directory (_tmp0_);
-#line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 226 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3477 "BatchImport.c"
+#line 3532 "BatchImport.c"
 }
 
 
@@ -3482,17 +3537,17 @@ static gchar* file_import_job_real_get_basename (BatchImportJob* base) {
 	gchar* result = NULL;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
-#line 229 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 239 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 240 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 240 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_file_get_basename (_tmp0_);
-#line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 240 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 230 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 240 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3496 "BatchImport.c"
+#line 3551 "BatchImport.c"
 }
 
 
@@ -3501,57 +3556,57 @@ static gchar* file_import_job_real_get_path (BatchImportJob* base) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	gboolean _tmp1_;
-#line 233 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = batch_import_job_is_directory (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_) {
-#line 3511 "BatchImport.c"
+#line 3566 "BatchImport.c"
 		GFile* _tmp2_;
 		gchar* _tmp3_;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->file_or_dir;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_path (_tmp2_);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 3522 "BatchImport.c"
+#line 3577 "BatchImport.c"
 	} else {
 		GFile* _tmp4_;
 		GFile* _tmp5_;
 		GFile* _tmp6_;
 		gchar* _tmp7_;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->priv->file_or_dir;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = g_file_get_parent (_tmp4_);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp7_;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3542 "BatchImport.c"
+#line 3597 "BatchImport.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 244 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3548 "BatchImport.c"
+#line 3603 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
-#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 3555 "BatchImport.c"
+#line 3610 "BatchImport.c"
 }
 
 
@@ -3559,19 +3614,19 @@ static void file_import_job_real_set_associated (BatchImportJob* base, BatchImpo
 	FileImportJob * self;
 	BatchImportJob* _tmp0_;
 	FileImportJob* _tmp1_;
-#line 237 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 247 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 237 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 247 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (associated));
-#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = associated;
-#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FILE_IMPORT_JOB) ? ((FileImportJob*) _tmp0_) : NULL);
-#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->priv->associated);
-#line 238 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->associated = _tmp1_;
-#line 3575 "BatchImport.c"
+#line 3630 "BatchImport.c"
 }
 
 
@@ -3582,39 +3637,39 @@ static gboolean file_import_job_real_determine_file_size (BatchImportJob* base,
 	gboolean result = FALSE;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
-#line 241 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 251 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_filesize = (guint64) 0;
-#line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_vala_file);
-#line 243 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 253 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_file = _tmp1_;
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = FALSE;
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (filesize) {
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*filesize = _vala_filesize;
-#line 3604 "BatchImport.c"
+#line 3659 "BatchImport.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file) {
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 3610 "BatchImport.c"
+#line 3665 "BatchImport.c"
 	} else {
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 3614 "BatchImport.c"
+#line 3669 "BatchImport.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3618 "BatchImport.c"
+#line 3673 "BatchImport.c"
 }
 
 
@@ -3626,41 +3681,41 @@ static gboolean file_import_job_real_prepare (BatchImportJob* base, GFile* * fil
 	GFile* _tmp0_;
 	GFile* _tmp1_;
 	gboolean _tmp2_;
-#line 248 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 258 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 249 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 249 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 249 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_vala_file_to_import);
-#line 249 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_file_to_import = _tmp1_;
-#line 250 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 260 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = self->priv->copy_to_library;
-#line 250 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 260 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_copy = _tmp2_;
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file_to_import) {
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file_to_import = _vala_file_to_import;
-#line 3650 "BatchImport.c"
+#line 3705 "BatchImport.c"
 	} else {
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 3654 "BatchImport.c"
+#line 3709 "BatchImport.c"
 	}
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy) {
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy = _vala_copy;
-#line 3660 "BatchImport.c"
+#line 3715 "BatchImport.c"
 	}
-#line 252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 262 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3664 "BatchImport.c"
+#line 3719 "BatchImport.c"
 }
 
 
@@ -3668,67 +3723,85 @@ GFile* file_import_job_get_file (FileImportJob* self) {
 	GFile* result = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
-#line 255 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_IMPORT_JOB (self), NULL);
-#line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 266 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_or_dir;
-#line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 266 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 266 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 266 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	return result;
+#line 3737 "BatchImport.c"
+}
+
+
+static gboolean file_import_job_real_recurse (BatchImportJob* base) {
+	FileImportJob * self;
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+#line 269 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FILE_IMPORT_JOB, FileImportJob);
+#line 270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp0_ = self->priv->_recurse;
+#line 270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	result = _tmp0_;
+#line 270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 3682 "BatchImport.c"
+#line 3753 "BatchImport.c"
 }
 
 
 static void file_import_job_class_init (FileImportJobClass * klass) {
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->finalize = file_import_job_finalize;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (FileImportJobPrivate));
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_dest_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_dest_identifier;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_source_identifier = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_source_identifier;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->is_directory = (gboolean (*) (BatchImportJob *)) file_import_job_real_is_directory;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_basename = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_basename;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->get_path = (gchar* (*) (BatchImportJob *)) file_import_job_real_get_path;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->set_associated = (void (*) (BatchImportJob *, BatchImportJob*)) file_import_job_real_set_associated;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->determine_file_size = (gboolean (*) (BatchImportJob *, guint64*, GFile* *)) file_import_job_real_determine_file_size;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) file_import_job_real_prepare;
-#line 3709 "BatchImport.c"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	((BatchImportJobClass *) klass)->recurse = (gboolean (*) (BatchImportJob *)) file_import_job_real_recurse;
+#line 3782 "BatchImport.c"
 }
 
 
 static void file_import_job_instance_init (FileImportJob * self) {
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = FILE_IMPORT_JOB_GET_PRIVATE (self);
-#line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->associated = NULL;
-#line 3718 "BatchImport.c"
+#line 3791 "BatchImport.c"
 }
 
 
 static void file_import_job_finalize (BatchImportJob * obj) {
 	FileImportJob * self;
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_IMPORT_JOB, FileImportJob);
-#line 208 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 216 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file_or_dir);
-#line 210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 218 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->priv->associated);
-#line 207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BATCH_IMPORT_JOB_CLASS (file_import_job_parent_class)->finalize (obj);
-#line 3732 "BatchImport.c"
+#line 3805 "BatchImport.c"
 }
 
 
@@ -3747,235 +3820,235 @@ GType file_import_job_get_type (void) {
 BatchImportRoll* batch_import_roll_construct (GType object_type) {
 	BatchImportRoll* self = NULL;
 	ImportID _tmp0_ = {0};
-#line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportRoll*) g_type_create_instance (object_type);
-#line 268 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	import_id_generate (&_tmp0_);
-#line 268 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->import_id = _tmp0_;
-#line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 3759 "BatchImport.c"
+#line 3832 "BatchImport.c"
 }
 
 
 BatchImportRoll* batch_import_roll_new (void) {
-#line 267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_roll_construct (TYPE_BATCH_IMPORT_ROLL);
-#line 3766 "BatchImport.c"
+#line 3839 "BatchImport.c"
 }
 
 
 static void value_batch_import_roll_init (GValue* value) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3773 "BatchImport.c"
+#line 3846 "BatchImport.c"
 }
 
 
 static void value_batch_import_roll_free_value (GValue* value) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (value->data[0].v_pointer);
-#line 3782 "BatchImport.c"
+#line 3855 "BatchImport.c"
 	}
 }
 
 
 static void value_batch_import_roll_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_roll_ref (src_value->data[0].v_pointer);
-#line 3792 "BatchImport.c"
+#line 3865 "BatchImport.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3796 "BatchImport.c"
+#line 3869 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_batch_import_roll_peek_pointer (const GValue* value) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3804 "BatchImport.c"
+#line 3877 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_roll_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3811 "BatchImport.c"
+#line 3884 "BatchImport.c"
 		BatchImportRoll * object;
 		object = collect_values[0].v_pointer;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3818 "BatchImport.c"
+#line 3891 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.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 3822 "BatchImport.c"
+#line 3895 "BatchImport.c"
 		}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_roll_ref (object);
-#line 3826 "BatchImport.c"
+#line 3899 "BatchImport.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3830 "BatchImport.c"
+#line 3903 "BatchImport.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3834 "BatchImport.c"
+#line 3907 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_roll_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	BatchImportRoll ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3845 "BatchImport.c"
+#line 3918 "BatchImport.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 3851 "BatchImport.c"
+#line 3924 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3855 "BatchImport.c"
+#line 3928 "BatchImport.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_roll_ref (value->data[0].v_pointer);
-#line 3859 "BatchImport.c"
+#line 3932 "BatchImport.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 3863 "BatchImport.c"
+#line 3936 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBatchImportRoll* spec;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_ROLL), NULL);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3877 "BatchImport.c"
+#line 3950 "BatchImport.c"
 }
 
 
 gpointer value_get_batch_import_roll (const GValue* value) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL), NULL);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 3886 "BatchImport.c"
+#line 3959 "BatchImport.c"
 }
 
 
 void value_set_batch_import_roll (GValue* value, gpointer v_object) {
 	BatchImportRoll * old;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BATCH_IMPORT_ROLL));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_ref (value->data[0].v_pointer);
-#line 3906 "BatchImport.c"
+#line 3979 "BatchImport.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3910 "BatchImport.c"
+#line 3983 "BatchImport.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 3916 "BatchImport.c"
+#line 3989 "BatchImport.c"
 	}
 }
 
 
 void value_take_batch_import_roll (GValue* value, gpointer v_object) {
 	BatchImportRoll * old;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_ROLL));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BATCH_IMPORT_ROLL));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3935 "BatchImport.c"
+#line 4008 "BatchImport.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3939 "BatchImport.c"
+#line 4012 "BatchImport.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_roll_unref (old);
-#line 3945 "BatchImport.c"
+#line 4018 "BatchImport.c"
 	}
 }
 
 
 static void batch_import_roll_class_init (BatchImportRollClass * klass) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_roll_parent_class = g_type_class_peek_parent (klass);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportRollClass *) klass)->finalize = batch_import_roll_finalize;
-#line 3955 "BatchImport.c"
+#line 4028 "BatchImport.c"
 }
 
 
 static void batch_import_roll_instance_init (BatchImportRoll * self) {
 	ViewCollection* _tmp0_;
-#line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = view_collection_new ("BatchImportRoll generated events");
-#line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->generated_events = _tmp0_;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 3967 "BatchImport.c"
+#line 4040 "BatchImport.c"
 }
 
 
 static void batch_import_roll_finalize (BatchImportRoll * obj) {
 	BatchImportRoll * self;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_ROLL, BatchImportRoll);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_collection_unref0 (self->generated_events);
-#line 3979 "BatchImport.c"
+#line 4052 "BatchImport.c"
 }
 
 
@@ -3996,24 +4069,24 @@ GType batch_import_roll_get_type (void) {
 gpointer batch_import_roll_ref (gpointer instance) {
 	BatchImportRoll * self;
 	self = instance;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4004 "BatchImport.c"
+#line 4077 "BatchImport.c"
 }
 
 
 void batch_import_roll_unref (gpointer instance) {
 	BatchImportRoll * self;
 	self = instance;
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		BATCH_IMPORT_ROLL_GET_CLASS (self)->finalize (self);
-#line 263 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4017 "BatchImport.c"
+#line 4090 "BatchImport.c"
 	}
 }
 
@@ -4031,72 +4104,72 @@ BatchImportResult* batch_import_result_construct (GType object_type, BatchImport
 	DuplicatedFile* _tmp8_;
 	DuplicatedFile* _tmp9_;
 	ImportResult _tmp10_;
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (src_identifier != NULL, NULL);
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (dest_identifier != NULL, NULL);
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((duplicate_of == NULL) || IS_DUPLICATED_FILE (duplicate_of), NULL);
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportResult*) g_type_create_instance (object_type);
-#line 289 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 289 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 289 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 290 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 290 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 290 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 290 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = src_identifier;
-#line 291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->src_identifier);
-#line 291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->src_identifier = _tmp5_;
-#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = dest_identifier;
-#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_identifier);
-#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->dest_identifier = _tmp7_;
-#line 293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = duplicate_of;
-#line 293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->duplicate_of);
-#line 293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 307 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->duplicate_of = _tmp9_;
-#line 294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = _result_;
-#line 294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->result = _tmp10_;
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4093 "BatchImport.c"
+#line 4166 "BatchImport.c"
 }
 
 
 BatchImportResult* batch_import_result_new (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, DuplicatedFile* duplicate_of, ImportResult _result_) {
-#line 287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, duplicate_of, _result_);
-#line 4100 "BatchImport.c"
+#line 4173 "BatchImport.c"
 }
 
 
@@ -4116,296 +4189,296 @@ BatchImportResult* batch_import_result_construct_from_error (GType object_type,
 	GError* _tmp11_;
 	const gchar* _tmp12_;
 	gchar* _tmp13_;
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (src_identifier != NULL, NULL);
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (dest_identifier != NULL, NULL);
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImportResult*) g_type_create_instance (object_type);
-#line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = src_identifier;
-#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->src_identifier);
-#line 301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->src_identifier = _tmp5_;
-#line 302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = dest_identifier;
-#line 302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_identifier);
-#line 302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->dest_identifier = _tmp7_;
-#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = err;
-#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = default_result;
-#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = import_result_convert_error (_tmp8_, _tmp9_);
-#line 303 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->result = _tmp10_;
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = err;
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = _tmp11_->message;
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->errmsg);
-#line 304 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->errmsg = _tmp13_;
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4182 "BatchImport.c"
+#line 4255 "BatchImport.c"
 }
 
 
 BatchImportResult* batch_import_result_new_from_error (BatchImportJob* job, GFile* file, const gchar* src_identifier, const gchar* dest_identifier, GError* err, ImportResult default_result) {
-#line 297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_result_construct_from_error (TYPE_BATCH_IMPORT_RESULT, job, file, src_identifier, dest_identifier, err, default_result);
-#line 4189 "BatchImport.c"
+#line 4262 "BatchImport.c"
 }
 
 
 static void value_batch_import_result_init (GValue* value) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4196 "BatchImport.c"
+#line 4269 "BatchImport.c"
 }
 
 
 static void value_batch_import_result_free_value (GValue* value) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (value->data[0].v_pointer);
-#line 4205 "BatchImport.c"
+#line 4278 "BatchImport.c"
 	}
 }
 
 
 static void value_batch_import_result_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = batch_import_result_ref (src_value->data[0].v_pointer);
-#line 4215 "BatchImport.c"
+#line 4288 "BatchImport.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4219 "BatchImport.c"
+#line 4292 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_batch_import_result_peek_pointer (const GValue* value) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4227 "BatchImport.c"
+#line 4300 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_result_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 4234 "BatchImport.c"
+#line 4307 "BatchImport.c"
 		BatchImportResult * object;
 		object = collect_values[0].v_pointer;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4241 "BatchImport.c"
+#line 4314 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.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 4245 "BatchImport.c"
+#line 4318 "BatchImport.c"
 		}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = batch_import_result_ref (object);
-#line 4249 "BatchImport.c"
+#line 4322 "BatchImport.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4253 "BatchImport.c"
+#line 4326 "BatchImport.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4257 "BatchImport.c"
+#line 4330 "BatchImport.c"
 }
 
 
 static gchar* value_batch_import_result_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	BatchImportResult ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4268 "BatchImport.c"
+#line 4341 "BatchImport.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 4274 "BatchImport.c"
+#line 4347 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4278 "BatchImport.c"
+#line 4351 "BatchImport.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = batch_import_result_ref (value->data[0].v_pointer);
-#line 4282 "BatchImport.c"
+#line 4355 "BatchImport.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 4286 "BatchImport.c"
+#line 4359 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_batch_import_result (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBatchImportResult* spec;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BATCH_IMPORT_RESULT), NULL);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4300 "BatchImport.c"
+#line 4373 "BatchImport.c"
 }
 
 
 gpointer value_get_batch_import_result (const GValue* value) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT), NULL);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4309 "BatchImport.c"
+#line 4382 "BatchImport.c"
 }
 
 
 void value_set_batch_import_result (GValue* value, gpointer v_object) {
 	BatchImportResult * old;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BATCH_IMPORT_RESULT));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_ref (value->data[0].v_pointer);
-#line 4329 "BatchImport.c"
+#line 4402 "BatchImport.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4333 "BatchImport.c"
+#line 4406 "BatchImport.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4339 "BatchImport.c"
+#line 4412 "BatchImport.c"
 	}
 }
 
 
 void value_take_batch_import_result (GValue* value, gpointer v_object) {
 	BatchImportResult * old;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BATCH_IMPORT_RESULT));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BATCH_IMPORT_RESULT));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4358 "BatchImport.c"
+#line 4431 "BatchImport.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4362 "BatchImport.c"
+#line 4435 "BatchImport.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_result_unref (old);
-#line 4368 "BatchImport.c"
+#line 4441 "BatchImport.c"
 	}
 }
 
 
 static void batch_import_result_class_init (BatchImportResultClass * klass) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_result_parent_class = g_type_class_peek_parent (klass);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BatchImportResultClass *) klass)->finalize = batch_import_result_finalize;
-#line 4378 "BatchImport.c"
+#line 4451 "BatchImport.c"
 }
 
 
 static void batch_import_result_instance_init (BatchImportResult * self) {
-#line 284 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 298 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->errmsg = NULL;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 4387 "BatchImport.c"
+#line 4460 "BatchImport.c"
 }
 
 
 static void batch_import_result_finalize (BatchImportResult * obj) {
 	BatchImportResult * self;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT_RESULT, BatchImportResult);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 293 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 280 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 294 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 281 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 295 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->src_identifier);
-#line 282 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_identifier);
-#line 284 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 298 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->errmsg);
-#line 285 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->duplicate_of);
-#line 4409 "BatchImport.c"
+#line 4482 "BatchImport.c"
 }
 
 
@@ -4426,302 +4499,309 @@ GType batch_import_result_get_type (void) {
 gpointer batch_import_result_ref (gpointer instance) {
 	BatchImportResult * self;
 	self = instance;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 4434 "BatchImport.c"
+#line 4507 "BatchImport.c"
 }
 
 
 void batch_import_result_unref (gpointer instance) {
 	BatchImportResult * self;
 	self = instance;
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		BATCH_IMPORT_RESULT_GET_CLASS (self)->finalize (self);
-#line 278 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 292 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4447 "BatchImport.c"
+#line 4520 "BatchImport.c"
 	}
 }
 
 
 ImportManifest* import_manifest_construct (GType object_type, GeeList* prefailed, GeeList* pre_already_imported) {
 	ImportManifest* self = NULL;
-	GeeList* _tmp0_;
-	GeeList* _tmp22_;
-#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	GTimer* _tmp0_;
+	GeeList* _tmp1_;
+	GeeList* _tmp23_;
+#line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((prefailed == NULL) || GEE_IS_LIST (prefailed), NULL);
-#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((pre_already_imported == NULL) || GEE_IS_LIST (pre_already_imported), NULL);
-#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ImportManifest*) g_type_create_instance (object_type);
-#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp0_ = prefailed;
-#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp0_ != NULL) {
-#line 4466 "BatchImport.c"
+#line 338 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp0_ = g_timer_new ();
+#line 338 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_timer_destroy0 (self->timer);
+#line 338 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	self->timer = _tmp0_;
+#line 339 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp1_ = prefailed;
+#line 339 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp1_ != NULL) {
+#line 4546 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp1_;
 			GeeList* _tmp2_;
-			gint _job_size = 0;
 			GeeList* _tmp3_;
-			gint _tmp4_;
+			gint _job_size = 0;
+			GeeList* _tmp4_;
 			gint _tmp5_;
+			gint _tmp6_;
 			gint _job_index = 0;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp1_ = prefailed;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_list = _tmp2_;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp3_ = _job_list;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp5_ = _tmp4_;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_size = _tmp5_;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp2_ = prefailed;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_job_list = _tmp3_;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp4_ = _job_list;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp6_ = _tmp5_;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_job_size = _tmp6_;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_job_index = -1;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4494 "BatchImport.c"
-				gint _tmp6_;
+#line 4574 "BatchImport.c"
 				gint _tmp7_;
 				gint _tmp8_;
+				gint _tmp9_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp9_;
-				gint _tmp10_;
-				gpointer _tmp11_;
+				GeeList* _tmp10_;
+				gint _tmp11_;
+				gpointer _tmp12_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp12_;
 				BatchImportJob* _tmp13_;
-				gchar* _tmp14_;
+				BatchImportJob* _tmp14_;
 				gchar* _tmp15_;
-				BatchImportJob* _tmp16_;
-				gchar* _tmp17_;
+				gchar* _tmp16_;
+				BatchImportJob* _tmp17_;
 				gchar* _tmp18_;
-				BatchImportResult* _tmp19_;
+				gchar* _tmp19_;
 				BatchImportResult* _tmp20_;
 				BatchImportResult* _tmp21_;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp6_ = _job_index;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_job_index = _tmp6_ + 1;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportResult* _tmp22_;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp7_ = _job_index;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp8_ = _job_size;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp7_ < _tmp8_)) {
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_job_index = _tmp7_ + 1;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp8_ = _job_index;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp9_ = _job_size;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (!(_tmp8_ < _tmp9_)) {
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4525 "BatchImport.c"
+#line 4605 "BatchImport.c"
 				}
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp9_ = _job_list;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp10_ = _job_index;
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				job = (BatchImportJob*) _tmp11_;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp12_ = job;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp10_ = _job_list;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp11_ = _job_index;
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				job = (BatchImportJob*) _tmp12_;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = job;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp14_ = batch_import_job_get_source_identifier (_tmp13_);
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp15_ = _tmp14_;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp16_ = job;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp17_ = batch_import_job_get_dest_identifier (_tmp16_);
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp18_ = _tmp17_;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp19_ = batch_import_result_new (_tmp12_, NULL, _tmp15_, _tmp18_, NULL, IMPORT_RESULT_FILE_ERROR);
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp20_ = _tmp19_;
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp18_);
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp15_);
-#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_result = _tmp20_;
-#line 329 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp21_ = batch_result;
-#line 329 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				import_manifest_add_result (self, _tmp21_);
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp14_ = job;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp15_ = batch_import_job_get_source_identifier (_tmp14_);
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp16_ = _tmp15_;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp17_ = job;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp18_ = batch_import_job_get_dest_identifier (_tmp17_);
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp19_ = _tmp18_;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp20_ = batch_import_result_new (_tmp13_, NULL, _tmp16_, _tmp19_, NULL, IMPORT_RESULT_FILE_ERROR);
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp21_ = _tmp20_;
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp19_);
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp16_);
+#line 341 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				batch_result = _tmp21_;
+#line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp22_ = batch_result;
+#line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				import_manifest_add_result (self, _tmp22_);
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (batch_result);
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4567 "BatchImport.c"
+#line 4647 "BatchImport.c"
 			}
-#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4571 "BatchImport.c"
+#line 4651 "BatchImport.c"
 		}
 	}
-#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp22_ = pre_already_imported;
-#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp22_ != NULL) {
-#line 4578 "BatchImport.c"
+#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp23_ = pre_already_imported;
+#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp23_ != NULL) {
+#line 4658 "BatchImport.c"
 		{
 			GeeList* _job_list = NULL;
-			GeeList* _tmp23_;
 			GeeList* _tmp24_;
-			gint _job_size = 0;
 			GeeList* _tmp25_;
-			gint _tmp26_;
+			gint _job_size = 0;
+			GeeList* _tmp26_;
 			gint _tmp27_;
+			gint _tmp28_;
 			gint _job_index = 0;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp23_ = pre_already_imported;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_list = _tmp24_;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp25_ = _job_list;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = _tmp26_;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_job_size = _tmp27_;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp24_ = pre_already_imported;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp25_ = _g_object_ref0 (_tmp24_);
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_job_list = _tmp25_;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp26_ = _job_list;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp28_ = _tmp27_;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_job_size = _tmp28_;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_job_index = -1;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 4606 "BatchImport.c"
-				gint _tmp28_;
+#line 4686 "BatchImport.c"
 				gint _tmp29_;
 				gint _tmp30_;
+				gint _tmp31_;
 				BatchImportJob* job = NULL;
-				GeeList* _tmp31_;
-				gint _tmp32_;
-				gpointer _tmp33_;
+				GeeList* _tmp32_;
+				gint _tmp33_;
+				gpointer _tmp34_;
 				BatchImportResult* batch_result = NULL;
-				BatchImportJob* _tmp34_;
 				BatchImportJob* _tmp35_;
-				gchar* _tmp36_;
+				BatchImportJob* _tmp36_;
 				gchar* _tmp37_;
-				GFile* _tmp38_;
+				gchar* _tmp38_;
 				GFile* _tmp39_;
-				BatchImportJob* _tmp40_;
-				gchar* _tmp41_;
+				GFile* _tmp40_;
+				BatchImportJob* _tmp41_;
 				gchar* _tmp42_;
-				BatchImportJob* _tmp43_;
-				gchar* _tmp44_;
+				gchar* _tmp43_;
+				BatchImportJob* _tmp44_;
 				gchar* _tmp45_;
-				BatchImportJob* _tmp46_;
-				DuplicatedFile* _tmp47_;
+				gchar* _tmp46_;
+				BatchImportJob* _tmp47_;
 				DuplicatedFile* _tmp48_;
-				BatchImportResult* _tmp49_;
+				DuplicatedFile* _tmp49_;
 				BatchImportResult* _tmp50_;
 				BatchImportResult* _tmp51_;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp28_ = _job_index;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_job_index = _tmp28_ + 1;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportResult* _tmp52_;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp29_ = _job_index;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp30_ = _job_size;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (!(_tmp29_ < _tmp30_)) {
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_job_index = _tmp29_ + 1;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp30_ = _job_index;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp31_ = _job_size;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (!(_tmp30_ < _tmp31_)) {
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 4645 "BatchImport.c"
+#line 4725 "BatchImport.c"
 				}
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp31_ = _job_list;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = _job_index;
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				job = (BatchImportJob*) _tmp33_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp34_ = job;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp32_ = _job_list;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp33_ = _job_index;
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp34_ = gee_list_get (_tmp32_, _tmp33_);
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				job = (BatchImportJob*) _tmp34_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = job;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp36_ = batch_import_job_get_basename (_tmp35_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp37_ = _tmp36_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp38_ = g_file_new_for_path (_tmp37_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp39_ = _tmp38_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp40_ = job;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp41_ = batch_import_job_get_source_identifier (_tmp40_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp42_ = _tmp41_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp43_ = job;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp44_ = batch_import_job_get_dest_identifier (_tmp43_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp45_ = _tmp44_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp46_ = job;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp47_ = batch_import_job_get_duplicated_file (_tmp46_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp48_ = _tmp47_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp49_ = batch_import_result_new (_tmp34_, _tmp39_, _tmp42_, _tmp45_, _tmp48_, IMPORT_RESULT_PHOTO_EXISTS);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp50_ = _tmp49_;
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp48_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp45_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp42_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_object_unref0 (_tmp39_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp37_);
-#line 335 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				batch_result = _tmp50_;
-#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp51_ = batch_result;
-#line 340 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				import_manifest_add_result (self, _tmp51_);
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp36_ = job;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp37_ = batch_import_job_get_basename (_tmp36_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp38_ = _tmp37_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp39_ = g_file_new_for_path (_tmp38_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp40_ = _tmp39_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp41_ = job;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp42_ = batch_import_job_get_source_identifier (_tmp41_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp43_ = _tmp42_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp44_ = job;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp45_ = batch_import_job_get_dest_identifier (_tmp44_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp46_ = _tmp45_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp47_ = job;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp48_ = batch_import_job_get_duplicated_file (_tmp47_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp49_ = _tmp48_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp50_ = batch_import_result_new (_tmp35_, _tmp40_, _tmp43_, _tmp46_, _tmp49_, IMPORT_RESULT_PHOTO_EXISTS);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp51_ = _tmp50_;
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_object_unref0 (_tmp49_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp46_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp43_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_object_unref0 (_tmp40_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp38_);
+#line 351 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				batch_result = _tmp51_;
+#line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp52_ = batch_result;
+#line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				import_manifest_add_result (self, _tmp52_);
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (batch_result);
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 4709 "BatchImport.c"
+#line 4789 "BatchImport.c"
 			}
-#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_job_list);
-#line 4713 "BatchImport.c"
+#line 4793 "BatchImport.c"
 		}
 	}
-#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 4718 "BatchImport.c"
+#line 4798 "BatchImport.c"
 }
 
 
 ImportManifest* import_manifest_new (GeeList* prefailed, GeeList* pre_already_imported) {
-#line 321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 336 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return import_manifest_construct (TYPE_IMPORT_MANIFEST, prefailed, pre_already_imported);
-#line 4725 "BatchImport.c"
+#line 4805 "BatchImport.c"
 }
 
 
@@ -4730,403 +4810,403 @@ void import_manifest_add_result (ImportManifest* self, BatchImportResult* batch_
 	BatchImportResult* _tmp0_;
 	ImportResult _tmp1_;
 	gboolean _tmp26_;
-#line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (self));
-#line 345 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_RESULT (batch_result));
-#line 346 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 362 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	reported = TRUE;
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = batch_result;
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _tmp0_->result;
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (_tmp1_) {
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_SUCCESS:
-#line 4748 "BatchImport.c"
+#line 4828 "BatchImport.c"
 		{
 			GeeList* _tmp2_;
 			BatchImportResult* _tmp3_;
-#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = self->success;
-#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp3_ = batch_result;
-#line 349 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
-#line 350 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 366 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4760 "BatchImport.c"
+#line 4840 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_USER_ABORT:
-#line 4764 "BatchImport.c"
+#line 4844 "BatchImport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 			BatchImportResult* _tmp5_;
 			GFile* _tmp6_;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = batch_result;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = _tmp5_->file;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp6_ != NULL) {
-#line 4775 "BatchImport.c"
+#line 4855 "BatchImport.c"
 				BatchImportResult* _tmp7_;
 				GFile* _tmp8_;
 				gboolean _tmp9_;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp7_ = batch_result;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp8_ = _tmp7_->file;
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp9_ = query_is_directory (_tmp8_);
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp4_ = !_tmp9_;
-#line 4787 "BatchImport.c"
+#line 4867 "BatchImport.c"
 			} else {
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp4_ = FALSE;
-#line 4791 "BatchImport.c"
+#line 4871 "BatchImport.c"
 			}
-#line 353 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp4_) {
-#line 4795 "BatchImport.c"
+#line 4875 "BatchImport.c"
 				GeeList* _tmp10_;
 				BatchImportResult* _tmp11_;
-#line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp10_ = self->aborted;
-#line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = batch_result;
-#line 354 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 4804 "BatchImport.c"
+#line 4884 "BatchImport.c"
 			} else {
-#line 356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 372 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				reported = FALSE;
-#line 4808 "BatchImport.c"
+#line 4888 "BatchImport.c"
 			}
-#line 357 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4812 "BatchImport.c"
+#line 4892 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_UNSUPPORTED_FORMAT:
-#line 4816 "BatchImport.c"
+#line 4896 "BatchImport.c"
 		{
 			GeeList* _tmp12_;
 			BatchImportResult* _tmp13_;
-#line 360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->skipped_photos;
-#line 360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = batch_result;
-#line 360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 376 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
-#line 361 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4828 "BatchImport.c"
+#line 4908 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_A_FILE:
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_NOT_AN_IMAGE:
-#line 4834 "BatchImport.c"
+#line 4914 "BatchImport.c"
 		{
 			GeeList* _tmp14_;
 			BatchImportResult* _tmp15_;
-#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = self->skipped_files;
-#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = batch_result;
-#line 365 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
-#line 366 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 382 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4846 "BatchImport.c"
+#line 4926 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PHOTO_EXISTS:
-#line 4850 "BatchImport.c"
+#line 4930 "BatchImport.c"
 		{
 			GeeList* _tmp16_;
 			BatchImportResult* _tmp17_;
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp16_ = self->already_imported;
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = batch_result;
-#line 369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_);
-#line 370 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4862 "BatchImport.c"
+#line 4942 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_CAMERA_ERROR:
-#line 4866 "BatchImport.c"
+#line 4946 "BatchImport.c"
 		{
 			GeeList* _tmp18_;
 			BatchImportResult* _tmp19_;
-#line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = self->camera_failed;
-#line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = batch_result;
-#line 373 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 374 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4878 "BatchImport.c"
+#line 4958 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_FILE_WRITE_ERROR:
-#line 4882 "BatchImport.c"
+#line 4962 "BatchImport.c"
 		{
 			GeeList* _tmp20_;
 			BatchImportResult* _tmp21_;
-#line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = self->write_failed;
-#line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp21_ = batch_result;
-#line 377 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 378 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4894 "BatchImport.c"
+#line 4974 "BatchImport.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 363 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE:
-#line 4898 "BatchImport.c"
+#line 4978 "BatchImport.c"
 		{
 			GeeList* _tmp22_;
 			BatchImportResult* _tmp23_;
-#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = self->corrupt_files;
-#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = batch_result;
-#line 381 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 382 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 398 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4910 "BatchImport.c"
+#line 4990 "BatchImport.c"
 		}
 		default:
 		{
 			GeeList* _tmp24_;
 			BatchImportResult* _tmp25_;
-#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = self->failed;
-#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = batch_result;
-#line 385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 401 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 386 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 4924 "BatchImport.c"
+#line 5004 "BatchImport.c"
 		}
 	}
-#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = reported;
-#line 389 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp26_) {
-#line 4931 "BatchImport.c"
+#line 5011 "BatchImport.c"
 		GeeList* _tmp27_;
 		BatchImportResult* _tmp28_;
-#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = self->all;
-#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = batch_result;
-#line 390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 406 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 4940 "BatchImport.c"
+#line 5020 "BatchImport.c"
 	}
 }
 
 
 static void value_import_manifest_init (GValue* value) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 4948 "BatchImport.c"
+#line 5028 "BatchImport.c"
 }
 
 
 static void value_import_manifest_free_value (GValue* value) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (value->data[0].v_pointer);
-#line 4957 "BatchImport.c"
+#line 5037 "BatchImport.c"
 	}
 }
 
 
 static void value_import_manifest_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = import_manifest_ref (src_value->data[0].v_pointer);
-#line 4967 "BatchImport.c"
+#line 5047 "BatchImport.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4971 "BatchImport.c"
+#line 5051 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_import_manifest_peek_pointer (const GValue* value) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 4979 "BatchImport.c"
+#line 5059 "BatchImport.c"
 }
 
 
 static gchar* value_import_manifest_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 4986 "BatchImport.c"
+#line 5066 "BatchImport.c"
 		ImportManifest * object;
 		object = collect_values[0].v_pointer;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4993 "BatchImport.c"
+#line 5073 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.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 4997 "BatchImport.c"
+#line 5077 "BatchImport.c"
 		}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = import_manifest_ref (object);
-#line 5001 "BatchImport.c"
+#line 5081 "BatchImport.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5005 "BatchImport.c"
+#line 5085 "BatchImport.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5009 "BatchImport.c"
+#line 5089 "BatchImport.c"
 }
 
 
 static gchar* value_import_manifest_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ImportManifest ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5020 "BatchImport.c"
+#line 5100 "BatchImport.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 5026 "BatchImport.c"
+#line 5106 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5030 "BatchImport.c"
+#line 5110 "BatchImport.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = import_manifest_ref (value->data[0].v_pointer);
-#line 5034 "BatchImport.c"
+#line 5114 "BatchImport.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 5038 "BatchImport.c"
+#line 5118 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecImportManifest* spec;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_IMPORT_MANIFEST), NULL);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5052 "BatchImport.c"
+#line 5132 "BatchImport.c"
 }
 
 
 gpointer value_get_import_manifest (const GValue* value) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST), NULL);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 5061 "BatchImport.c"
+#line 5141 "BatchImport.c"
 }
 
 
 void value_set_import_manifest (GValue* value, gpointer v_object) {
 	ImportManifest * old;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_IMPORT_MANIFEST));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_ref (value->data[0].v_pointer);
-#line 5081 "BatchImport.c"
+#line 5161 "BatchImport.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5085 "BatchImport.c"
+#line 5165 "BatchImport.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5091 "BatchImport.c"
+#line 5171 "BatchImport.c"
 	}
 }
 
 
 void value_take_import_manifest (GValue* value, gpointer v_object) {
 	ImportManifest * old;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORT_MANIFEST));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_IMPORT_MANIFEST));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5110 "BatchImport.c"
+#line 5190 "BatchImport.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5114 "BatchImport.c"
+#line 5194 "BatchImport.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_unref (old);
-#line 5120 "BatchImport.c"
+#line 5200 "BatchImport.c"
 	}
 }
 
 
 static void import_manifest_class_init (ImportManifestClass * klass) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	import_manifest_parent_class = g_type_class_peek_parent (klass);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ImportManifestClass *) klass)->finalize = import_manifest_finalize;
-#line 5130 "BatchImport.c"
+#line 5210 "BatchImport.c"
 }
 
 
@@ -5142,85 +5222,87 @@ static void import_manifest_instance_init (ImportManifest * self) {
 	GeeArrayList* _tmp8_;
 	GeeArrayList* _tmp9_;
 	GeeArrayList* _tmp10_;
-#line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->success = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
-#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->camera_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
-#line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
-#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->write_failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 328 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 328 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->skipped_photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
-#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->skipped_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->aborted = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->already_imported = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
-#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 332 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 332 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->corrupt_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_LIST, GeeList);
-#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->all = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_LIST, GeeList);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 5192 "BatchImport.c"
+#line 5272 "BatchImport.c"
 }
 
 
 static void import_manifest_finalize (ImportManifest * obj) {
 	ImportManifest * self;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_MANIFEST, ImportManifest);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->imported);
-#line 310 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 324 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->success);
-#line 311 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->camera_failed);
-#line 312 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->failed);
-#line 313 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->write_failed);
-#line 314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 328 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->skipped_photos);
-#line 315 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 329 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->skipped_files);
-#line 316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->aborted);
-#line 317 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->already_imported);
-#line 318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 332 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->corrupt_files);
-#line 319 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->all);
-#line 5224 "BatchImport.c"
+#line 334 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_timer_destroy0 (self->timer);
+#line 5306 "BatchImport.c"
 }
 
 
@@ -5241,66 +5323,66 @@ GType import_manifest_get_type (void) {
 gpointer import_manifest_ref (gpointer instance) {
 	ImportManifest * self;
 	self = instance;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 5249 "BatchImport.c"
+#line 5331 "BatchImport.c"
 }
 
 
 void import_manifest_unref (gpointer instance) {
 	ImportManifest * self;
 	self = instance;
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		IMPORT_MANIFEST_GET_CLASS (self)->finalize (self);
-#line 308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5262 "BatchImport.c"
+#line 5344 "BatchImport.c"
 	}
 }
 
 
 static void _batch_import_user_halt_application_exiting (Application* _sender, gboolean panicked, gpointer self) {
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_user_halt ((BatchImport*) self);
-#line 5270 "BatchImport.c"
+#line 5352 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_roll_ref0 (gpointer self) {
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_roll_ref (self) : NULL;
-#line 5277 "BatchImport.c"
+#line 5359 "BatchImport.c"
 }
 
 
 static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	guint result;
 	result = file_hash ((GFile*) v);
-#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5286 "BatchImport.c"
+#line 5368 "BatchImport.c"
 }
 
 
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
-#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5295 "BatchImport.c"
+#line 5377 "BatchImport.c"
 }
 
 
 static gboolean _batch_import_display_imported_timer_gsource_func (gpointer self) {
 	gboolean result;
 	result = batch_import_display_imported_timer ((BatchImport*) self);
-#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5304 "BatchImport.c"
+#line 5386 "BatchImport.c"
 }
 
 
@@ -5324,133 +5406,133 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 	ImportManifest* _tmp20_;
 	Application* _tmp38_;
 	Application* _tmp39_;
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((prefailed == NULL) || GEE_IS_ARRAY_LIST (prefailed), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((pre_already_imported == NULL) || GEE_IS_ARRAY_LIST (pre_already_imported), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((import_roll == NULL) || IS_BATCH_IMPORT_ROLL (import_roll), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((skip_manifest == NULL) || IS_IMPORT_MANIFEST (skip_manifest), NULL);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BatchImport*) g_object_new (object_type, NULL);
-#line 483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = jobs;
-#line 483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 483 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 499 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->jobs = _tmp1_;
-#line 484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = name;
-#line 484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->priv->name);
-#line 484 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 500 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->name = _tmp3_;
-#line 485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = reporter;
-#line 485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4__target = reporter_target;
-#line 485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->reporter = _tmp4_;
-#line 485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->reporter_target = _tmp4__target;
-#line 486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = prefailed;
-#line 486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = pre_already_imported;
-#line 486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = import_manifest_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList));
-#line 486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_import_manifest_unref0 (self->priv->manifest);
-#line 486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->manifest = _tmp7_;
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = cancellable;
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_ != NULL) {
-#line 5382 "BatchImport.c"
+#line 5464 "BatchImport.c"
 		GCancellable* _tmp10_;
 		GCancellable* _tmp11_;
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = cancellable;
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp11_;
-#line 5393 "BatchImport.c"
+#line 5475 "BatchImport.c"
 	} else {
 		GCancellable* _tmp12_;
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = g_cancellable_new ();
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp12_;
-#line 5402 "BatchImport.c"
+#line 5484 "BatchImport.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _g_object_ref0 (_tmp8_);
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->cancellable = _tmp13_;
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = import_roll;
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp15_ != NULL) {
-#line 5414 "BatchImport.c"
+#line 5496 "BatchImport.c"
 		BatchImportRoll* _tmp16_;
 		BatchImportRoll* _tmp17_;
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = import_roll;
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _batch_import_roll_ref0 (_tmp16_);
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_roll_unref0 (_tmp14_);
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _tmp17_;
-#line 5425 "BatchImport.c"
+#line 5507 "BatchImport.c"
 	} else {
 		BatchImportRoll* _tmp18_;
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = batch_import_roll_new ();
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_roll_unref0 (_tmp14_);
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _tmp18_;
-#line 5434 "BatchImport.c"
+#line 5516 "BatchImport.c"
 	}
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _batch_import_roll_ref0 (_tmp14_);
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_roll_unref0 (self->priv->import_roll);
-#line 488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_roll = _tmp19_;
-#line 490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = skip_manifest;
-#line 490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 506 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp20_ != NULL) {
-#line 5446 "BatchImport.c"
+#line 5528 "BatchImport.c"
 		GeeHashSet* _tmp21_;
-#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (self->priv->skipset);
-#line 491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->skipset = _tmp21_;
-#line 5454 "BatchImport.c"
+#line 5536 "BatchImport.c"
 		{
 			GeeList* _source_list = NULL;
 			ImportManifest* _tmp22_;
@@ -5461,27 +5543,27 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 			gint _tmp26_;
 			gint _tmp27_;
 			gint _source_index = 0;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = skip_manifest;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = _tmp22_->imported;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_source_list = _tmp24_;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = _source_list;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp27_ = _tmp26_;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_source_size = _tmp27_;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_source_index = -1;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 5485 "BatchImport.c"
+#line 5567 "BatchImport.c"
 				gint _tmp28_;
 				gint _tmp29_;
 				gint _tmp30_;
@@ -5493,73 +5575,73 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const
 				MediaSource* _tmp35_;
 				GFile* _tmp36_;
 				GFile* _tmp37_;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = _source_index;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_source_index = _tmp28_ + 1;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp29_ = _source_index;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = _source_size;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!(_tmp29_ < _tmp30_)) {
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 5509 "BatchImport.c"
+#line 5591 "BatchImport.c"
 				}
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = _source_list;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _source_index;
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				source = (MediaSource*) _tmp33_;
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = self->priv->skipset;
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = source;
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp36_ = media_source_get_file (_tmp35_);
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp37_ = _tmp36_;
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
-#line 493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp37_);
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (source);
-#line 5533 "BatchImport.c"
+#line 5615 "BatchImport.c"
 			}
-#line 492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_source_list);
-#line 5537 "BatchImport.c"
+#line 5619 "BatchImport.c"
 		}
 	}
-#line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp38_ = application_get_instance ();
-#line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp39_ = _tmp38_;
-#line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_connect_object (_tmp39_, "exiting", (GCallback) _batch_import_user_halt_application_exiting, self, 0);
-#line 498 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 514 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_application_unref0 (_tmp39_);
-#line 501 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_DISPLAY_QUEUE_TIMER_MSEC, _batch_import_display_imported_timer_gsource_func, g_object_ref (self), g_object_unref);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_roll_unref0 (_tmp14_);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_tmp8_);
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 5556 "BatchImport.c"
+#line 5638 "BatchImport.c"
 }
 
 
 BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest) {
-#line 478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 494 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return batch_import_construct (TYPE_BATCH_IMPORT, jobs, name, reporter, reporter_target, prefailed, pre_already_imported, cancellable, import_roll, skip_manifest);
-#line 5563 "BatchImport.c"
+#line 5645 "BatchImport.c"
 }
 
 
@@ -5567,92 +5649,92 @@ gchar* batch_import_get_name (BatchImport* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 527 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL);
-#line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->name;
-#line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp1_;
-#line 512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5581 "BatchImport.c"
+#line 5663 "BatchImport.c"
 }
 
 
 void batch_import_user_halt (BatchImport* self) {
 	GCancellable* _tmp0_;
-#line 515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 5593 "BatchImport.c"
+#line 5675 "BatchImport.c"
 }
 
 
 gboolean batch_import_get_untrash_duplicates (BatchImport* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 519 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 536 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->untrash_duplicates;
-#line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 536 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 520 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 536 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5608 "BatchImport.c"
+#line 5690 "BatchImport.c"
 }
 
 
 void batch_import_set_untrash_duplicates (BatchImport* self, gboolean untrash_duplicates) {
 	gboolean _tmp0_;
-#line 523 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 539 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 540 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = untrash_duplicates;
-#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 540 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->untrash_duplicates = _tmp0_;
-#line 5620 "BatchImport.c"
+#line 5702 "BatchImport.c"
 }
 
 
 gboolean batch_import_get_mark_duplicates_online (BatchImport* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 543 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->mark_duplicates_online;
-#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5635 "BatchImport.c"
+#line 5717 "BatchImport.c"
 }
 
 
 void batch_import_set_mark_duplicates_online (BatchImport* self, gboolean mark_duplicates_online) {
 	gboolean _tmp0_;
-#line 531 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 547 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = mark_duplicates_online;
-#line 532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = _tmp0_;
-#line 5647 "BatchImport.c"
+#line 5729 "BatchImport.c"
 }
 
 
 static void batch_import_log_status (BatchImport* self, const gchar* where) {
-#line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (where != NULL);
-#line 5656 "BatchImport.c"
+#line 5738 "BatchImport.c"
 }
 
 
@@ -5668,89 +5750,89 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 	ImportResult _tmp25_;
 	gboolean _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 561 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 561 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (import_result), FALSE);
-#line 546 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	proceed = TRUE;
-#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->manifest;
-#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = import_result;
-#line 548 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	import_manifest_add_result (_tmp0_, _tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result;
-#line 550 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _tmp2_->result;
-#line 550 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp3_ != IMPORT_RESULT_SUCCESS) {
-#line 5690 "BatchImport.c"
+#line 5772 "BatchImport.c"
 		BatchImportResult* _tmp4_;
 		gboolean _tmp5_ = FALSE;
 		BatchImportResult* _tmp6_;
 		GFile* _tmp7_;
-#line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = import_result;
-#line 551 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 567 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL], 0, _tmp4_);
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = import_result;
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->file;
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ != NULL) {
-#line 5705 "BatchImport.c"
+#line 5787 "BatchImport.c"
 			BatchImportResult* _tmp8_;
 			ImportResult _tmp9_;
 			gboolean _tmp10_;
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = import_result;
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _tmp8_->result;
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = import_result_is_abort (_tmp9_);
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = !_tmp10_;
-#line 5717 "BatchImport.c"
+#line 5799 "BatchImport.c"
 		} else {
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 5721 "BatchImport.c"
+#line 5803 "BatchImport.c"
 		}
-#line 553 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp5_) {
-#line 5725 "BatchImport.c"
+#line 5807 "BatchImport.c"
 			guint64 filesize = 0ULL;
 			guint64 _tmp22_;
-#line 554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filesize = (guint64) 0;
-#line 5730 "BatchImport.c"
+#line 5812 "BatchImport.c"
 			{
 				guint64 _tmp11_ = 0ULL;
 				BatchImportResult* _tmp12_;
 				GFile* _tmp13_;
 				guint64 _tmp14_;
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = import_result;
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = _tmp12_->file;
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp14_ = query_total_file_size (_tmp13_, NULL, &_inner_error_);
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = _tmp14_;
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5746 "BatchImport.c"
-					goto __catch411_g_error;
+#line 5828 "BatchImport.c"
+					goto __catch423_g_error;
 				}
-#line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
-#line 5751 "BatchImport.c"
+#line 5833 "BatchImport.c"
 			}
-			goto __finally411;
-			__catch411_g_error:
+			goto __finally423;
+			__catch423_g_error:
 			{
 				GError* err = NULL;
 				BatchImportResult* _tmp15_;
@@ -5759,96 +5841,96 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				gchar* _tmp18_;
 				GError* _tmp19_;
 				const gchar* _tmp20_;
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = import_result;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = _tmp15_->file;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = g_file_get_path (_tmp16_);
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = _tmp17_;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = err;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _tmp19_->message;
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:559: Unable to query file size of %s: %s", _tmp18_, _tmp20_);
-#line 559 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				g_warning ("BatchImport.vala:575: Unable to query file size of %s: %s", _tmp18_, _tmp20_);
+#line 575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp18_);
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 5785 "BatchImport.c"
+#line 5867 "BatchImport.c"
 			}
-			__finally411:
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally423:
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5790 "BatchImport.c"
+#line 5872 "BatchImport.c"
 				gboolean _tmp21_ = FALSE;
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %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/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return _tmp21_;
-#line 5798 "BatchImport.c"
+#line 5880 "BatchImport.c"
 			}
-#line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = filesize;
-#line 563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (self, _tmp22_);
-#line 5804 "BatchImport.c"
+#line 5886 "BatchImport.c"
 		}
 	}
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp24_ = import_result;
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp25_ = _tmp24_->result;
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = import_result_is_nonuser_abort (_tmp25_);
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp26_) {
-#line 5815 "BatchImport.c"
+#line 5897 "BatchImport.c"
 		gboolean _tmp27_;
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = proceed;
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = _tmp27_;
-#line 5821 "BatchImport.c"
+#line 5903 "BatchImport.c"
 	} else {
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = FALSE;
-#line 5825 "BatchImport.c"
+#line 5907 "BatchImport.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp23_) {
-#line 5829 "BatchImport.c"
+#line 5911 "BatchImport.c"
 		BatchImportResult* _tmp28_;
 		ImportResult _tmp29_;
 		BatchImportResult* _tmp30_;
 		const gchar* _tmp31_;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = import_result;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = _tmp28_->result;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = import_result;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = _tmp30_->errmsg;
-#line 569 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL], 0, _tmp29_, _tmp31_);
-#line 570 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 586 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		proceed = FALSE;
-#line 5846 "BatchImport.c"
+#line 5928 "BatchImport.c"
 	}
-#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
-#line 573 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 5852 "BatchImport.c"
+#line 5934 "BatchImport.c"
 }
 
 
@@ -5856,79 +5938,79 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 	guint64 _tmp0_;
 	guint64 _tmp1_;
 	guint64 _tmp2_;
-#line 576 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 577 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed_bytes;
-#line 577 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = increment_of_progress;
-#line 577 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed_bytes = _tmp0_ + _tmp1_;
-#line 581 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = self->priv->completed_bytes;
-#line 581 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == ((guint64) 0)) {
-#line 5872 "BatchImport.c"
+#line 5954 "BatchImport.c"
 		gulong now = 0UL;
 		gulong _tmp3_;
 		gulong _tmp4_;
 		gulong _tmp5_;
-#line 582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 598 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = now_ms ();
-#line 582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 598 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		now = _tmp3_;
-#line 583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = now;
-#line 583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->priv->last_preparing_ms;
-#line 583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp4_ - _tmp5_) > ((gulong) 250)) {
-#line 5887 "BatchImport.c"
+#line 5969 "BatchImport.c"
 			gulong _tmp6_;
-#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = now;
-#line 584 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->priv->last_preparing_ms = _tmp6_;
-#line 585 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL], 0);
-#line 5895 "BatchImport.c"
+#line 5977 "BatchImport.c"
 		}
 	} else {
 		guint64 _tmp7_;
-#line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 603 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = increment_of_progress;
-#line 587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 603 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp7_ > ((guint64) 0)) {
-#line 5903 "BatchImport.c"
+#line 5985 "BatchImport.c"
 			gulong now = 0UL;
 			gulong _tmp8_;
 			gulong _tmp9_;
 			gulong _tmp10_;
-#line 588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = now_ms ();
-#line 588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			now = _tmp8_;
-#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = now;
-#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = self->priv->last_preparing_ms;
-#line 589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 605 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if ((_tmp9_ - _tmp10_) > ((gulong) 250)) {
-#line 5918 "BatchImport.c"
+#line 6000 "BatchImport.c"
 				gulong _tmp11_;
 				guint64 _tmp12_;
 				guint64 _tmp13_;
-#line 590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = now;
-#line 590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->priv->last_preparing_ms = _tmp11_;
-#line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = self->priv->completed_bytes;
-#line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = self->priv->total_bytes;
-#line 591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_signal_emit (self, batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL], 0, _tmp12_, _tmp13_);
-#line 5932 "BatchImport.c"
+#line 6014 "BatchImport.c"
 			}
 		}
 	}
@@ -5938,13 +6020,13 @@ static void batch_import_report_progress (BatchImport* self, guint64 increment_o
 static gboolean batch_import_report_failures (BatchImport* self, BackgroundImportJob* background_job) {
 	gboolean result = FALSE;
 	gboolean proceed = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 596 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (background_job), FALSE);
-#line 597 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 613 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	proceed = TRUE;
-#line 5948 "BatchImport.c"
+#line 6030 "BatchImport.c"
 	{
 		GeeList* _import_result_list = NULL;
 		BackgroundImportJob* _tmp0_;
@@ -5955,27 +6037,27 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 		gint _tmp4_;
 		gint _tmp5_;
 		gint _import_result_index = 0;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = background_job;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _tmp0_->failed;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_import_result_list = _tmp2_;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _import_result_list;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_import_result_size = _tmp5_;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_import_result_index = -1;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 5979 "BatchImport.c"
+#line 6061 "BatchImport.c"
 			gint _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -5985,51 +6067,51 @@ static gboolean batch_import_report_failures (BatchImport* self, BackgroundImpor
 			gpointer _tmp11_;
 			BatchImportResult* _tmp12_;
 			gboolean _tmp13_;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = _import_result_index;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_import_result_index = _tmp6_ + 1;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _import_result_index;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = _import_result_size;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp7_ < _tmp8_)) {
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6001 "BatchImport.c"
+#line 6083 "BatchImport.c"
 			}
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _import_result_list;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _import_result_index;
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			import_result = (BatchImportResult*) _tmp11_;
-#line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = import_result;
-#line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = batch_import_report_failure (self, _tmp12_);
-#line 600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 616 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp13_) {
-#line 601 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				proceed = FALSE;
-#line 6019 "BatchImport.c"
+#line 6101 "BatchImport.c"
 			}
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (import_result);
-#line 6023 "BatchImport.c"
+#line 6105 "BatchImport.c"
 		}
-#line 599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_import_result_list);
-#line 6027 "BatchImport.c"
+#line 6109 "BatchImport.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = proceed;
-#line 604 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6033 "BatchImport.c"
+#line 6115 "BatchImport.c"
 }
 
 
@@ -6038,71 +6120,82 @@ static void batch_import_report_completed (BatchImport* self, const gchar* where
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-	BatchImportImportReporter _tmp5_;
-	void* _tmp5__target;
-	ImportManifest* _tmp9_;
-	BatchImportRoll* _tmp10_;
-#line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	ImportManifest* _tmp5_;
+	GTimer* _tmp6_;
+	gdouble _tmp7_;
+	BatchImportImportReporter _tmp8_;
+	void* _tmp8__target;
+	ImportManifest* _tmp12_;
+	BatchImportRoll* _tmp13_;
+#line 623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 623 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (where != NULL);
-#line 608 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 624 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 608 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 624 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6054 "BatchImport.c"
+#line 6139 "BatchImport.c"
 		const gchar* _tmp1_;
-#line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = where;
-#line 609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_error ("BatchImport.vala:609: Attempted to complete already-completed import: " \
+#line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_error ("BatchImport.vala:625: Attempted to complete already-completed import: " \
 "%s", _tmp1_);
-#line 6060 "BatchImport.c"
+#line 6145 "BatchImport.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed = TRUE;
-#line 613 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_ready_sources (self);
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = where;
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = g_strdup_printf ("Import completed: %s", _tmp2_);
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _tmp3_;
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, _tmp4_);
-#line 615 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 631 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp4_);
-#line 618 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5_ = self->priv->reporter;
-#line 618 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp5__target = self->priv->reporter_target;
-#line 618 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp5_ != NULL) {
-#line 6082 "BatchImport.c"
-		BatchImportImportReporter _tmp6_;
-		void* _tmp6__target;
-		ImportManifest* _tmp7_;
-		BatchImportRoll* _tmp8_;
-#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ = self->priv->reporter;
-#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6__target = self->priv->reporter_target;
-#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp7_ = self->priv->manifest;
-#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp8_ = self->priv->import_roll;
-#line 619 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp6_ (_tmp7_, _tmp8_, _tmp6__target);
-#line 6097 "BatchImport.c"
+#line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp5_ = self->priv->manifest;
+#line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp6_ = _tmp5_->timer;
+#line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp7_ = g_timer_elapsed (_tmp6_, NULL);
+#line 632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_debug ("BatchImport.vala:632: Import complete after %f", _tmp7_);
+#line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp8_ = self->priv->reporter;
+#line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp8__target = self->priv->reporter_target;
+#line 635 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp8_ != NULL) {
+#line 6175 "BatchImport.c"
+		BatchImportImportReporter _tmp9_;
+		void* _tmp9__target;
+		ImportManifest* _tmp10_;
+		BatchImportRoll* _tmp11_;
+#line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp9_ = self->priv->reporter;
+#line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp9__target = self->priv->reporter_target;
+#line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp10_ = self->priv->manifest;
+#line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp11_ = self->priv->import_roll;
+#line 636 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp9_ (_tmp10_, _tmp11_, _tmp9__target);
+#line 6190 "BatchImport.c"
 	}
-#line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp9_ = self->priv->manifest;
-#line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp10_ = self->priv->import_roll;
-#line 621 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp9_, _tmp10_);
-#line 6105 "BatchImport.c"
+#line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp12_ = self->priv->manifest;
+#line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp13_ = self->priv->import_roll;
+#line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL], 0, _tmp12_, _tmp13_);
+#line 6198 "BatchImport.c"
 }
 
 
@@ -6111,75 +6204,75 @@ static void batch_import_file_import_complete (BatchImport* self) {
 	gint _tmp1_;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_;
-#line 625 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 642 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 627 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file_imports_completed;
-#line 627 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file_imports_completed = _tmp0_ + 1;
-#line 628 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->priv->file_imports_to_perform;
-#line 628 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 645 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != -1) {
-#line 6124 "BatchImport.c"
+#line 6217 "BatchImport.c"
 		gint _tmp2_;
 		gint _tmp3_;
-#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->file_imports_completed;
-#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->file_imports_to_perform;
-#line 629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_ <= _tmp3_, "file_imports_completed <= file_imports_to_perform");
-#line 6133 "BatchImport.c"
+#line 6226 "BatchImport.c"
 	}
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = self->priv->file_imports_to_perform;
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ != -1) {
-#line 6139 "BatchImport.c"
+#line 6232 "BatchImport.c"
 		gint _tmp6_;
 		gint _tmp7_;
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->priv->file_imports_completed;
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = self->priv->file_imports_to_perform;
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp6_ == _tmp7_;
-#line 6148 "BatchImport.c"
+#line 6241 "BatchImport.c"
 	} else {
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = FALSE;
-#line 6152 "BatchImport.c"
+#line 6245 "BatchImport.c"
 	}
-#line 633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 650 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 634 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 651 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 6158 "BatchImport.c"
+#line 6251 "BatchImport.c"
 	}
 }
 
 
 static void _batch_import_on_work_sniffed_out_completion_callback (BackgroundJob* job, gpointer self) {
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_work_sniffed_out ((BatchImport*) self, job);
-#line 6166 "BatchImport.c"
+#line 6259 "BatchImport.c"
 }
 
 
 static void _batch_import_on_sniffer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_sniffer_cancelled ((BatchImport*) self, job);
-#line 6173 "BatchImport.c"
+#line 6266 "BatchImport.c"
 }
 
 
 static gboolean _batch_import_on_sniffer_working_gsource_func (gpointer self) {
 	gboolean result;
 	result = batch_import_on_sniffer_working ((BatchImport*) self);
-#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6182 "BatchImport.c"
+#line 6275 "BatchImport.c"
 }
 
 
@@ -6192,79 +6285,79 @@ void batch_import_schedule (BatchImport* self) {
 	WorkSniffer* _tmp5_;
 	WorkSniffer* _tmp6_;
 	guint _tmp7_;
-#line 637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 654 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 655 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->scheduled;
-#line 638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 655 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_ == FALSE, "scheduled == false");
-#line 639 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->scheduled = TRUE;
-#line 641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_emit (self, batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL], 0);
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = batch_import_feeder_workers;
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = self->priv->jobs;
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->skipset;
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = work_sniffer_new (self, _tmp2_, _batch_import_on_work_sniffed_out_completion_callback, self, _tmp3_, _batch_import_on_sniffer_cancelled_cancellation_callback, self, _tmp4_);
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _tmp5_;
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	workers_enqueue (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (_tmp6_);
-#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) BATCH_IMPORT_WORK_SNIFFER_THROBBER_MSEC, _batch_import_on_sniffer_working_gsource_func, g_object_ref (self), g_object_unref);
-#line 646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->throbber_id = _tmp7_;
-#line 6225 "BatchImport.c"
+#line 6318 "BatchImport.c"
 }
 
 
 static gboolean batch_import_on_sniffer_working (BatchImport* self) {
 	gboolean result = FALSE;
-#line 653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 654 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 671 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_progress (self, (guint64) 0);
-#line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 673 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 656 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 673 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6239 "BatchImport.c"
+#line 6332 "BatchImport.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
-#line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 6246 "BatchImport.c"
+#line 6339 "BatchImport.c"
 }
 
 
 static void _batch_import_on_file_prepared_notification_callback (BackgroundJob* job, NotificationObject* user, gpointer self) {
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepared ((BatchImport*) self, job, user);
-#line 6253 "BatchImport.c"
+#line 6346 "BatchImport.c"
 }
 
 
 static void _batch_import_on_files_prepared_completion_callback (BackgroundJob* job, gpointer self) {
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_files_prepared ((BatchImport*) self, job);
-#line 6260 "BatchImport.c"
+#line 6353 "BatchImport.c"
 }
 
 
 static void _batch_import_on_file_prepare_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_file_prepare_cancelled ((BatchImport*) self, job);
-#line 6267 "BatchImport.c"
+#line 6360 "BatchImport.c"
 }
 
 
@@ -6286,99 +6379,99 @@ static void batch_import_on_work_sniffed_out (BatchImport* self, BackgroundJob*
 	Workers* _tmp16_;
 	PrepareFilesJob* _tmp17_;
 	guint _tmp18_;
-#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer));
-#line 662 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sniffer = _tmp2_;
-#line 664 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_work_sniffed_out");
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = sniffer;
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp5_) {
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = TRUE;
-#line 6313 "BatchImport.c"
+#line 6406 "BatchImport.c"
 	} else {
 		WorkSniffer* _tmp6_;
 		GeeList* _tmp7_;
 		gint _tmp8_;
 		gint _tmp9_;
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = sniffer;
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->files_to_prepare;
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_;
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp9_ == 0;
-#line 6329 "BatchImport.c"
+#line 6422 "BatchImport.c"
 	}
-#line 666 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 683 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp3_) {
-#line 667 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "work sniffed out: nothing to do");
-#line 669 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_background_job_unref0 (sniffer);
-#line 669 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 6339 "BatchImport.c"
+#line 6432 "BatchImport.c"
 	}
-#line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = sniffer;
-#line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = _tmp10_->total_bytes;
-#line 672 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 689 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->total_bytes = _tmp11_;
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = sniffer;
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _tmp12_->files_to_prepare;
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->priv->cancellable;
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = prepare_files_job_new (self, _tmp13_, _batch_import_on_file_prepared_notification_callback, self, _batch_import_on_files_prepared_completion_callback, self, _tmp14_, _batch_import_on_file_prepare_cancelled_cancellation_callback, self);
-#line 679 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepare_files_job = _tmp15_;
-#line 682 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = batch_import_feeder_workers;
-#line 682 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = prepare_files_job;
-#line 682 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 699 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	workers_enqueue (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = self->priv->throbber_id;
-#line 684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp18_ > ((guint) 0)) {
-#line 6367 "BatchImport.c"
+#line 6460 "BatchImport.c"
 		guint _tmp19_;
-#line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = self->priv->throbber_id;
-#line 685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_source_remove (_tmp19_);
-#line 686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6375 "BatchImport.c"
+#line 6468 "BatchImport.c"
 	}
-#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
-#line 659 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 676 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6381 "BatchImport.c"
+#line 6474 "BatchImport.c"
 }
 
 
@@ -6389,82 +6482,82 @@ static void batch_import_on_sniffer_cancelled (BatchImport* self, BackgroundJob*
 	WorkSniffer* _tmp2_;
 	WorkSniffer* _tmp3_;
 	guint _tmp4_;
-#line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 691 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 708 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 691 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 708 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_WORK_SNIFFER, WorkSniffer));
-#line 693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sniffer = _tmp2_;
-#line 695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_sniffer_cancelled");
-#line 697 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 714 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = sniffer;
-#line 697 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 714 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_completed (self, "work sniffer cancelled");
-#line 700 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 717 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->throbber_id;
-#line 700 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 717 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_ > ((guint) 0)) {
-#line 6418 "BatchImport.c"
+#line 6511 "BatchImport.c"
 		guint _tmp5_;
-#line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->priv->throbber_id;
-#line 701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_source_remove (_tmp5_);
-#line 702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->priv->throbber_id = (guint) 0;
-#line 6426 "BatchImport.c"
+#line 6519 "BatchImport.c"
 	}
-#line 690 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (sniffer);
-#line 6430 "BatchImport.c"
+#line 6523 "BatchImport.c"
 }
 
 
 static void _batch_import_on_thumbnail_writer_completed_completion_callback (BackgroundJob* job, gpointer self) {
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_completed ((BatchImport*) self, job);
-#line 6437 "BatchImport.c"
+#line 6530 "BatchImport.c"
 }
 
 
 static void _batch_import_on_thumbnail_writer_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_thumbnail_writer_cancelled ((BatchImport*) self, job);
-#line 6444 "BatchImport.c"
+#line 6537 "BatchImport.c"
 }
 
 
 static void _batch_import_on_import_files_completed_completion_callback (BackgroundJob* job, gpointer self) {
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_completed ((BatchImport*) self, job);
-#line 6451 "BatchImport.c"
+#line 6544 "BatchImport.c"
 }
 
 
 static void _batch_import_on_import_files_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_on_import_files_cancelled ((BatchImport*) self, job);
-#line 6458 "BatchImport.c"
+#line 6551 "BatchImport.c"
 }
 
 
 static void batch_import_flush_import_jobs (BatchImport* self) {
-#line 710 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 727 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6467 "BatchImport.c"
+#line 6560 "BatchImport.c"
 		gboolean _tmp0_ = FALSE;
 		GeeList* _tmp1_;
 		gint _tmp2_;
@@ -6476,63 +6569,63 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		GCancellable* _tmp11_;
 		ThumbnailWriterJob* _tmp12_;
 		ThumbnailWriterJob* _tmp13_;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = self->priv->ready_thumbnails;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp2_;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ > 0) {
-#line 6487 "BatchImport.c"
+#line 6580 "BatchImport.c"
 			Workers* _tmp4_;
 			gint _tmp5_;
 			guint _tmp6_;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = batch_import_import_workers;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = workers_get_pending_job_count (_tmp4_);
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = self->priv->max_outstanding_import_jobs;
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = ((guint) _tmp5_) < _tmp6_;
-#line 6499 "BatchImport.c"
+#line 6592 "BatchImport.c"
 		} else {
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp0_ = FALSE;
-#line 6503 "BatchImport.c"
+#line 6596 "BatchImport.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
-#line 715 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6509 "BatchImport.c"
+#line 6602 "BatchImport.c"
 		}
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = batch_import_import_workers;
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = self->priv->ready_thumbnails;
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = gee_list_remove_at (_tmp8_, 0);
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = (CompletedImportObject*) _tmp9_;
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = self->priv->cancellable;
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = thumbnail_writer_job_new (self, _tmp10_, _batch_import_on_thumbnail_writer_completed_completion_callback, self, _tmp11_, _batch_import_on_thumbnail_writer_cancelled_cancellation_callback, self);
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _tmp12_;
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		workers_enqueue (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_background_job_unref0 (_tmp13_);
-#line 716 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (_tmp10_);
-#line 6531 "BatchImport.c"
+#line 6624 "BatchImport.c"
 	}
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 6535 "BatchImport.c"
+#line 6628 "BatchImport.c"
 		gboolean _tmp14_ = FALSE;
 		GeeList* _tmp15_;
 		gint _tmp16_;
@@ -6546,63 +6639,63 @@ static void batch_import_flush_import_jobs (BatchImport* self) {
 		GCancellable* _tmp27_;
 		PreparedFileImportJob* _tmp28_;
 		PreparedFileImportJob* _tmp29_;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = self->priv->ready_files;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp16_;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ > 0) {
-#line 6557 "BatchImport.c"
+#line 6650 "BatchImport.c"
 			Workers* _tmp18_;
 			gint _tmp19_;
 			guint _tmp20_;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = batch_import_import_workers;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = workers_get_pending_job_count (_tmp18_);
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = self->priv->max_outstanding_import_jobs;
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = ((guint) _tmp19_) < _tmp20_;
-#line 6569 "BatchImport.c"
+#line 6662 "BatchImport.c"
 		} else {
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = FALSE;
-#line 6573 "BatchImport.c"
+#line 6666 "BatchImport.c"
 		}
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp14_) {
-#line 720 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 6579 "BatchImport.c"
+#line 6672 "BatchImport.c"
 		}
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = batch_import_import_workers;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = self->priv->ready_files;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = gee_list_remove_at (_tmp22_, 0);
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = (PreparedFile*) _tmp23_;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = self->priv->import_roll;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = _tmp25_->import_id;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = self->priv->cancellable;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = prepared_file_import_job_new (self, _tmp24_, &_tmp26_, _batch_import_on_import_files_completed_completion_callback, self, _tmp27_, _batch_import_on_import_files_cancelled_cancellation_callback, self);
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = _tmp28_;
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		workers_enqueue (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_background_job_unref0 (_tmp29_);
-#line 721 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_tmp24_);
-#line 6605 "BatchImport.c"
+#line 6698 "BatchImport.c"
 	}
 }
 
@@ -6614,96 +6707,96 @@ static GFile* batch_import_get_in_current_import (BatchImport* self, PreparedFil
 	const gchar* _tmp2_;
 	PreparedFile* _tmp11_;
 	const gchar* _tmp12_;
-#line 729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), NULL);
-#line 729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
-#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = prepared_file;
-#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _tmp1_->full_md5;
-#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ != NULL) {
-#line 6627 "BatchImport.c"
+#line 6720 "BatchImport.c"
 		GeeHashMap* _tmp3_;
 		PreparedFile* _tmp4_;
 		const gchar* _tmp5_;
 		gboolean _tmp6_;
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->imported_full_md5_table;
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = prepared_file;
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_->full_md5;
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp6_;
-#line 6642 "BatchImport.c"
+#line 6735 "BatchImport.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 6646 "BatchImport.c"
+#line 6739 "BatchImport.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 6650 "BatchImport.c"
+#line 6743 "BatchImport.c"
 		GeeHashMap* _tmp7_;
 		PreparedFile* _tmp8_;
 		const gchar* _tmp9_;
 		gpointer _tmp10_;
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = self->priv->imported_full_md5_table;
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = prepared_file;
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_->full_md5;
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = (GFile*) _tmp10_;
-#line 734 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 751 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 6667 "BatchImport.c"
+#line 6760 "BatchImport.c"
 	}
-#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = prepared_file;
-#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = _tmp11_->full_md5;
-#line 738 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 755 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp12_ != NULL) {
-#line 6675 "BatchImport.c"
+#line 6768 "BatchImport.c"
 		GeeHashMap* _tmp13_;
 		PreparedFile* _tmp14_;
 		const gchar* _tmp15_;
 		PreparedFile* _tmp16_;
 		GFile* _tmp17_;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->imported_full_md5_table;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = prepared_file;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_->full_md5;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = prepared_file;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp16_->file;
-#line 739 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, _tmp17_);
-#line 6693 "BatchImport.c"
+#line 6786 "BatchImport.c"
 	}
-#line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = NULL;
-#line 741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6699 "BatchImport.c"
+#line 6792 "BatchImport.c"
 }
 
 
 static gpointer _notification_object_ref0 (gpointer self) {
-#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? notification_object_ref (self) : NULL;
-#line 6706 "BatchImport.c"
+#line 6799 "BatchImport.c"
 }
 
 
@@ -6718,72 +6811,72 @@ static void batch_import_on_file_prepared (BatchImport* self, BackgroundJob* j,
 	gchar* _tmp6_;
 	gchar* _tmp7_;
 	GeeArrayList* _tmp8_;
-#line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((user == NULL) || IS_NOTIFICATION_OBJECT (user));
-#line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 746 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = user;
-#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _notification_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster));
-#line 748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 765 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	cluster = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cluster->list;
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_;
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = g_strdup_printf ("on_file_prepared (%d files)", _tmp5_);
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _tmp6_;
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, _tmp7_);
-#line 750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp7_);
-#line 752 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = cluster->list;
-#line 752 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_process_prepared_files (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList), NULL, NULL);
-#line 745 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_notification_object_unref0 (cluster);
-#line 6757 "BatchImport.c"
+#line 6850 "BatchImport.c"
 }
 
 
 static void batch_import_process_prepared_files_data_free (gpointer _data) {
 	BatchImportProcessPreparedFilesData* _data_;
 	_data_ = _data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_data_->list);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_data_->self);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_slice_free (BatchImportProcessPreparedFilesData, _data_);
-#line 6770 "BatchImport.c"
+#line 6863 "BatchImport.c"
 }
 
 
 static void batch_import_process_prepared_files_async_ready_wrapper (GObject *source_object, GAsyncResult *res, void *user_data) {
 	BatchImportProcessPreparedFilesData* _task_data_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_task_data_ = g_task_get_task_data (G_TASK (res));
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_task_data_->_callback_ != NULL) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_task_data_->_callback_ (source_object, res, user_data);
-#line 6782 "BatchImport.c"
+#line 6875 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_task_data_->_task_complete_ = TRUE;
-#line 6786 "BatchImport.c"
+#line 6879 "BatchImport.c"
 }
 
 
@@ -6792,1122 +6885,1122 @@ static void batch_import_process_prepared_files (BatchImport* self, GeeList* lis
 	BatchImport* _tmp0_;
 	GeeList* _tmp1_;
 	GeeList* _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_ = g_slice_new0 (BatchImportProcessPreparedFilesData);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_->_callback_ = _callback_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_->_async_result = g_task_new (G_OBJECT (self), NULL, batch_import_process_prepared_files_async_ready_wrapper, _user_data_);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_callback_ == NULL) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_task_complete_ = TRUE;
-#line 6805 "BatchImport.c"
+#line 6898 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_task_set_task_data (_data_->_async_result, _data_, batch_import_process_prepared_files_data_free);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = _g_object_ref0 (self);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_->self = _tmp0_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = list;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_data_->list);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_->list = _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_process_prepared_files_co (_data_);
-#line 6823 "BatchImport.c"
+#line 6916 "BatchImport.c"
 }
 
 
 static void batch_import_process_prepared_files_finish (BatchImport* self, GAsyncResult* _res_) {
 	BatchImportProcessPreparedFilesData* _data_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
-#line 6831 "BatchImport.c"
+#line 6924 "BatchImport.c"
 }
 
 
 static gboolean _batch_import_process_prepared_files_co_gsource_func (gpointer self) {
 	gboolean result;
 	result = batch_import_process_prepared_files_co (self);
-#line 759 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 6840 "BatchImport.c"
+#line 6933 "BatchImport.c"
 }
 
 
 static gboolean batch_import_process_prepared_files_co (BatchImportProcessPreparedFilesData* _data_) {
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	switch (_data_->_state_) {
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 0:
-#line 6849 "BatchImport.c"
+#line 6942 "BatchImport.c"
 		goto _state_0;
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		case 1:
-#line 6853 "BatchImport.c"
+#line 6946 "BatchImport.c"
 		goto _state_1;
 		default:
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_assert_not_reached ();
-#line 6858 "BatchImport.c"
+#line 6951 "BatchImport.c"
 	}
 	_state_0:
 	{
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp0_ = _data_->list;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_list = _data_->_tmp1_;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp2_ = _data_->_prepared_file_list;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_tmp4_ = _data_->_tmp3_;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_size = _data_->_tmp4_;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_data_->_prepared_file_index = -1;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp5_ = _data_->_prepared_file_index;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_prepared_file_index = _data_->_tmp5_ + 1;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp6_ = _data_->_prepared_file_index;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp7_ = _data_->_prepared_file_size;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_data_->_tmp6_ < _data_->_tmp7_)) {
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 6892 "BatchImport.c"
+#line 6985 "BatchImport.c"
 			}
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp8_ = _data_->_prepared_file_list;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp9_ = _data_->_prepared_file_index;
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp10_ = gee_list_get (_data_->_tmp8_, _data_->_tmp9_);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->prepared_file = (PreparedFile*) _data_->_tmp10_;
-#line 759 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 776 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _batch_import_process_prepared_files_co_gsource_func, _data_, NULL);
-#line 760 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_state_ = 1;
-#line 760 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return FALSE;
-#line 6908 "BatchImport.c"
+#line 7001 "BatchImport.c"
 			_state_1:
 			;
-#line 762 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 779 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->import_result = NULL;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp11_ = library_photo_global;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp12_ = _data_->prepared_file;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp13_ = _data_->_tmp12_->file;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp14_ = 0;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp15_ = library_photo_source_collection_get_state_by_file (_data_->_tmp11_, _data_->_tmp13_, &_data_->_tmp14_);
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->photo_state = _data_->_tmp14_;
-#line 767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 784 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->photo = _data_->_tmp15_;
-#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp16_ = _data_->photo;
-#line 769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp16_ != NULL) {
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp17_ = _data_->photo_state;
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				switch (_data_->_tmp17_) {
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE:
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE:
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE:
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER:
-#line 6943 "BatchImport.c"
+#line 7036 "BatchImport.c"
 					{
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp18_ = _data_->prepared_file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp19_ = _data_->_tmp18_->job;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp20_ = _data_->prepared_file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp21_ = _data_->_tmp20_->file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp22_ = _data_->prepared_file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp23_ = _data_->_tmp22_->file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp24_ = g_file_get_path (_data_->_tmp23_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp25_ = _data_->_tmp24_;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp26_ = _data_->prepared_file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp27_ = _data_->_tmp26_->file;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp28_ = g_file_get_path (_data_->_tmp27_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp29_ = _data_->_tmp28_;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp30_ = _data_->photo;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp31_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp30_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp32_ = _data_->_tmp31_;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp33_ = duplicated_file_create_from_file (_data_->_tmp32_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp34_ = _data_->_tmp33_;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp35_ = batch_import_result_new (_data_->_tmp19_, _data_->_tmp21_, _data_->_tmp25_, _data_->_tmp29_, _data_->_tmp34_, IMPORT_RESULT_PHOTO_EXISTS);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->import_result = _data_->_tmp35_;
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->_tmp34_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->_tmp32_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp29_);
-#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 792 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp25_);
-#line 780 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp36_ = _data_->photo_state;
-#line 780 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp36_ == LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE) {
-#line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 798 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp37_ = _data_->photo;
-#line 781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 798 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7001 "BatchImport.c"
+#line 7094 "BatchImport.c"
 						}
-#line 782 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7005 "BatchImport.c"
+#line 7098 "BatchImport.c"
 					}
-#line 770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7009 "BatchImport.c"
+#line 7102 "BatchImport.c"
 					{
-#line 786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7013 "BatchImport.c"
+#line 7106 "BatchImport.c"
 					}
 					default:
 					{
-#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp38_ = _data_->photo_state;
-#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp39_ = g_enum_get_value (g_type_class_ref (LIBRARY_PHOTO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp38_);
-#line 789 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						g_error ("BatchImport.vala:789: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL);
-#line 7023 "BatchImport.c"
+#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						g_error ("BatchImport.vala:806: Unknown LibraryPhotoSourceCollection state: %s", (_data_->_tmp39_ != NULL) ? _data_->_tmp39_->value_name : NULL);
+#line 7116 "BatchImport.c"
 					}
 				}
 			}
-#line 793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp40_ = _data_->import_result;
-#line 793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp40_ != NULL) {
-#line 794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp41_ = _data_->import_result;
-#line 794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp41_);
-#line 795 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
-#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->photo);
-#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
-#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_data_->prepared_file);
-#line 797 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7045 "BatchImport.c"
+#line 7138 "BatchImport.c"
 			}
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp42_ = video_global;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp43_ = _data_->prepared_file;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp44_ = _data_->_tmp43_->file;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp45_ = 0;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp46_ = video_source_collection_get_state_by_file (_data_->_tmp42_, _data_->_tmp44_, &_data_->_tmp45_);
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->video_state = _data_->_tmp45_;
-#line 801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 818 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->video = _data_->_tmp46_;
-#line 802 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 819 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp47_ = _data_->video;
-#line 802 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 819 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp47_ != NULL) {
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp48_ = _data_->video_state;
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				switch (_data_->_tmp48_) {
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_ONLINE:
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_OFFLINE:
-#line 7073 "BatchImport.c"
+#line 7166 "BatchImport.c"
 					{
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp49_ = _data_->prepared_file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp50_ = _data_->_tmp49_->job;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp51_ = _data_->prepared_file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp52_ = _data_->_tmp51_->file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp53_ = _data_->prepared_file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp54_ = _data_->_tmp53_->file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp55_ = g_file_get_path (_data_->_tmp54_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp56_ = _data_->_tmp55_;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp57_ = _data_->prepared_file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp58_ = _data_->_tmp57_->file;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp59_ = g_file_get_path (_data_->_tmp58_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp60_ = _data_->_tmp59_;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp61_ = _data_->video;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp62_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp61_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp63_ = _data_->_tmp62_;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp64_ = duplicated_file_create_from_file (_data_->_tmp63_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp65_ = _data_->_tmp64_;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp66_ = batch_import_result_new (_data_->_tmp50_, _data_->_tmp52_, _data_->_tmp56_, _data_->_tmp60_, _data_->_tmp65_, IMPORT_RESULT_PHOTO_EXISTS);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->import_result = _data_->_tmp66_;
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->_tmp65_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->_tmp63_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp60_);
-#line 806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 823 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp56_);
-#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp67_ = _data_->video_state;
-#line 811 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp67_ == VIDEO_SOURCE_COLLECTION_STATE_OFFLINE) {
-#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp68_ = _data_->video;
-#line 812 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 829 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp68_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7131 "BatchImport.c"
+#line 7224 "BatchImport.c"
 						}
-#line 813 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7135 "BatchImport.c"
+#line 7228 "BatchImport.c"
 					}
-#line 803 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					case VIDEO_SOURCE_COLLECTION_STATE_TRASH:
-#line 7139 "BatchImport.c"
+#line 7232 "BatchImport.c"
 					{
-#line 817 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 7143 "BatchImport.c"
+#line 7236 "BatchImport.c"
 					}
 					default:
 					{
-#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp69_ = _data_->video_state;
-#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp70_ = g_enum_get_value (g_type_class_ref (VIDEO_SOURCE_COLLECTION_TYPE_STATE), _data_->_tmp69_);
-#line 820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						g_error ("BatchImport.vala:820: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL);
-#line 7153 "BatchImport.c"
+#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						g_error ("BatchImport.vala:837: Unknown VideoSourceCollection state: %s", (_data_->_tmp70_ != NULL) ? _data_->_tmp70_->value_name : NULL);
+#line 7246 "BatchImport.c"
 					}
 				}
 			}
-#line 824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 841 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp71_ = _data_->import_result;
-#line 824 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 841 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp71_ != NULL) {
-#line 825 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp72_ = _data_->import_result;
-#line 825 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp72_);
-#line 826 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
-#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->video);
-#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->photo);
-#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
-#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_data_->prepared_file);
-#line 828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 845 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7177 "BatchImport.c"
+#line 7270 "BatchImport.c"
 			}
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp74_ = _data_->prepared_file;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp75_ = _data_->_tmp74_->is_video;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp75_) {
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp76_ = _data_->prepared_file;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp77_ = _data_->_tmp76_->file;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp78_ = _data_->prepared_file;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp79_ = _data_->_tmp78_->full_md5;
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp80_ = video_is_duplicate (_data_->_tmp77_, _data_->_tmp79_);
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = _data_->_tmp80_;
-#line 7197 "BatchImport.c"
+#line 7290 "BatchImport.c"
 			} else {
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp73_ = FALSE;
-#line 7201 "BatchImport.c"
+#line 7294 "BatchImport.c"
 			}
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp73_) {
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp81_ = video_table_get_instance ();
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp82_ = _data_->_tmp81_;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp83_ = _data_->prepared_file;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp84_ = _data_->_tmp83_->file;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp85_ = _data_->prepared_file;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp86_ = _data_->_tmp85_->full_md5;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp88_ = video_table_get_duplicate_ids (_data_->_tmp82_, _data_->_tmp84_, _data_->_tmp86_, &_data_->_tmp87_);
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp89_ = _data_->_tmp88_;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp89__length1 = _data_->_tmp87_;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_database_table_unref0 (_data_->_tmp82_);
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids = _data_->_tmp89_;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids_length1 = _data_->_tmp89__length1;
-#line 834 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_duplicate_ids_size_ = _data_->duplicate_ids_length1;
-#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp90_ = _data_->duplicate_ids;
-#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp90__length1 = _data_->duplicate_ids_length1;
-#line 837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_vala_assert (_data_->_tmp90__length1 > 0, "duplicate_ids.length > 0");
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp91_ = _data_->duplicate_ids;
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp91__length1 = _data_->duplicate_ids_length1;
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp92_ = _data_->_tmp91_[0];
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp93_ = duplicated_file_create_from_video_id (&_data_->_tmp92_);
-#line 839 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicated_file = _data_->_tmp93_;
-#line 842 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->result_code = IMPORT_RESULT_PHOTO_EXISTS;
-#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp94_ = _data_->self->priv->mark_duplicates_online;
-#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp94_) {
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp95_ = video_global;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp96_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp97_ = _data_->_tmp96_;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp98_ = _data_->prepared_file;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp99_ = _data_->_tmp98_->file;
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp100_ = media_source_holding_tank_fetch_by_master_file (_data_->_tmp97_, _data_->_tmp99_);
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp101_ = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp100_, TYPE_VIDEO, Video);
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_source_holding_tank_unref0 (_data_->_tmp97_);
-#line 844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 861 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->dupe_video = _data_->_tmp101_;
-#line 846 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 863 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp102_ = _data_->dupe_video;
-#line 846 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 863 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp102_ == NULL) {
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp103_ = video_global;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp104_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp105_ = _data_->_tmp104_;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp106_ = _data_->prepared_file;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp107_ = _data_->_tmp106_->full_md5;
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp108_ = media_source_holding_tank_fetch_by_md5 (_data_->_tmp105_, _data_->_tmp107_);
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->dupe_video);
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->dupe_video = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, TYPE_VIDEO, Video);
-#line 847 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_source_holding_tank_unref0 (_data_->_tmp105_);
-#line 7293 "BatchImport.c"
+#line 7386 "BatchImport.c"
 					}
-#line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp109_ = _data_->dupe_video;
-#line 849 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp109_ != NULL) {
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp110_ = _data_->prepared_file;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp111_ = _data_->_tmp110_->file;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp112_ = g_file_get_path (_data_->_tmp111_);
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp113_ = _data_->_tmp112_;
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-						g_debug ("BatchImport.vala:850: duplicate video found offline, marking as online" \
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
+						g_debug ("BatchImport.vala:867: duplicate video found offline, marking as online" \
 ": %s", _data_->_tmp113_);
-#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 867 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp113_);
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp114_ = _data_->dupe_video;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp115_ = _data_->prepared_file;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp116_ = _data_->_tmp115_->file;
-#line 853 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp114_, TYPE_MONITORABLE, Monitorable), _data_->_tmp116_);
-#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp117_ = _data_->dupe_video;
-#line 854 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp117_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->duplicated_file);
-#line 856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->duplicated_file = NULL;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp118_ = _data_->self->priv->manifest;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp119_ = _data_->_tmp118_->imported;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp120_ = _data_->dupe_video;
-#line 858 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 875 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp120_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp121_ = _data_->dupe_video;
-#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp122_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 859 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_report_progress (_data_->self, _data_->_tmp122_);
-#line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_file_import_complete (_data_->self);
-#line 862 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 879 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->result_code = IMPORT_RESULT_SUCCESS;
-#line 7345 "BatchImport.c"
+#line 7438 "BatchImport.c"
 					}
-#line 843 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->dupe_video);
-#line 7349 "BatchImport.c"
+#line 7442 "BatchImport.c"
 				}
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp123_ = _data_->prepared_file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp124_ = _data_->_tmp123_->job;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp125_ = _data_->prepared_file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp126_ = _data_->_tmp125_->file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp127_ = _data_->prepared_file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp128_ = _data_->_tmp127_->file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp129_ = g_file_get_path (_data_->_tmp128_);
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp130_ = _data_->_tmp129_;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp131_ = _data_->prepared_file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp132_ = _data_->_tmp131_->file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp133_ = g_file_get_path (_data_->_tmp132_);
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp134_ = _data_->_tmp133_;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp135_ = _data_->duplicated_file;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp136_ = _data_->result_code;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp137_ = batch_import_result_new (_data_->_tmp124_, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp134_, _data_->_tmp135_, _data_->_tmp136_);
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->import_result = _data_->_tmp137_;
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp134_);
-#line 866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp130_);
-#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp138_ = _data_->result_code;
-#line 870 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp138_ == IMPORT_RESULT_SUCCESS) {
-#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp139_ = _data_->self->priv->manifest;
-#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp140_ = _data_->import_result;
-#line 871 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 888 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					import_manifest_add_result (_data_->_tmp139_, _data_->_tmp140_);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->duplicated_file);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->video);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->photo);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_result_unref0 (_data_->import_result);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_unref0 (_data_->prepared_file);
-#line 873 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 890 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 7413 "BatchImport.c"
+#line 7506 "BatchImport.c"
 				}
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->duplicated_file);
-#line 833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->duplicate_ids = (g_free (_data_->duplicate_ids), NULL);
-#line 7419 "BatchImport.c"
+#line 7512 "BatchImport.c"
 			}
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp141_ = _data_->prepared_file;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp142_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp141_);
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp143_ = _data_->_tmp142_;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp144_ = _data_->_tmp143_ != NULL;
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_data_->_tmp143_);
-#line 877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp144_) {
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp145_ = _data_->prepared_file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp146_ = _data_->_tmp145_->job;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp147_ = _data_->prepared_file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp148_ = _data_->_tmp147_->file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp149_ = _data_->prepared_file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp150_ = _data_->_tmp149_->file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp151_ = g_file_get_path (_data_->_tmp150_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp152_ = _data_->_tmp151_;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp153_ = _data_->prepared_file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp154_ = _data_->_tmp153_->file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp155_ = g_file_get_path (_data_->_tmp154_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp156_ = _data_->_tmp155_;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp157_ = _data_->prepared_file;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp158_ = batch_import_get_in_current_import (_data_->self, _data_->_tmp157_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp159_ = _data_->_tmp158_;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp160_ = duplicated_file_create_from_file (_data_->_tmp159_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp161_ = _data_->_tmp160_;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp162_ = batch_import_result_new (_data_->_tmp146_, _data_->_tmp148_, _data_->_tmp152_, _data_->_tmp156_, _data_->_tmp161_, IMPORT_RESULT_PHOTO_EXISTS);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->import_result = _data_->_tmp162_;
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->_tmp161_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->_tmp159_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp156_);
-#line 880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_data_->_tmp152_);
-#line 7481 "BatchImport.c"
+#line 7574 "BatchImport.c"
 			} else {
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp163_ = _data_->prepared_file;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp164_ = _data_->_tmp163_->file;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp165_ = _data_->prepared_file;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp166_ = _data_->_tmp165_->full_md5;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp167_ = _data_->prepared_file;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp168_ = _data_->_tmp167_->file_format;
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp169_ = photo_is_duplicate (_data_->_tmp164_, NULL, _data_->_tmp166_, _data_->_tmp168_);
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_data_->_tmp169_) {
-#line 886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp170_ = _data_->self->priv->untrash_duplicates;
-#line 886 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp170_) {
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp171_ = library_photo_global;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp172_ = _data_->prepared_file;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp173_ = _data_->_tmp172_->file;
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp174_ = library_photo_source_collection_get_trashed_by_file (_data_->_tmp171_, _data_->_tmp173_);
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
-#line 889 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->photo = _data_->_tmp174_;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp176_ = _data_->photo;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp176_ == NULL) {
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp177_ = _data_->prepared_file;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp178_ = _data_->_tmp177_->full_md5;
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = _data_->_tmp178_ != NULL;
-#line 7525 "BatchImport.c"
+#line 7618 "BatchImport.c"
 						} else {
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp175_ = FALSE;
-#line 7529 "BatchImport.c"
+#line 7622 "BatchImport.c"
 						}
-#line 891 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp175_) {
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp179_ = library_photo_global;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp180_ = _data_->prepared_file;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp181_ = _data_->_tmp180_->full_md5;
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp182_ = library_photo_source_collection_get_trashed_by_md5 (_data_->_tmp179_, _data_->_tmp181_);
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
-#line 892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp182_;
-#line 7545 "BatchImport.c"
+#line 7638 "BatchImport.c"
 						}
-#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp183_ = _data_->photo;
-#line 894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp183_ != NULL) {
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp184_ = _data_->prepared_file;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp185_ = _data_->_tmp184_->file;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp186_ = g_file_get_path (_data_->_tmp185_);
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp187_ = _data_->_tmp186_;
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							g_debug ("BatchImport.vala:895: duplicate linked photo found in trash, untrashin" \
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+							g_debug ("BatchImport.vala:912: duplicate linked photo found in trash, untrashin" \
 "g and removing transforms for %s", _data_->_tmp187_);
-#line 895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_free0 (_data_->_tmp187_);
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp188_ = _data_->photo;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp189_ = _data_->prepared_file;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp190_ = _data_->_tmp189_->file;
-#line 898 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp188_, TYPE_MONITORABLE, Monitorable), _data_->_tmp190_);
-#line 899 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp191_ = _data_->photo;
-#line 899 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_untrash (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp191_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp192_ = _data_->photo;
-#line 900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp192_, TYPE_PHOTO, Photo));
-#line 7579 "BatchImport.c"
+#line 7672 "BatchImport.c"
 						}
 					}
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp194_ = _data_->photo;
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp194_ == NULL) {
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp195_ = _data_->self->priv->mark_duplicates_online;
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = _data_->_tmp195_;
-#line 7590 "BatchImport.c"
+#line 7683 "BatchImport.c"
 					} else {
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp193_ = FALSE;
-#line 7594 "BatchImport.c"
+#line 7687 "BatchImport.c"
 					}
-#line 904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp193_) {
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp196_ = library_photo_global;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp197_ = _data_->prepared_file;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp198_ = _data_->_tmp197_->file;
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp199_ = library_photo_source_collection_get_offline_by_file (_data_->_tmp196_, _data_->_tmp198_);
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
-#line 906 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 923 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->photo = _data_->_tmp199_;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp201_ = _data_->photo;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp201_ == NULL) {
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp202_ = _data_->prepared_file;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp203_ = _data_->_tmp202_->full_md5;
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = _data_->_tmp203_ != NULL;
-#line 7620 "BatchImport.c"
+#line 7713 "BatchImport.c"
 						} else {
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp200_ = FALSE;
-#line 7624 "BatchImport.c"
+#line 7717 "BatchImport.c"
 						}
-#line 908 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp200_) {
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp204_ = library_photo_global;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp205_ = _data_->prepared_file;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp206_ = _data_->_tmp205_->full_md5;
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp207_ = library_photo_source_collection_get_offline_by_md5 (_data_->_tmp204_, _data_->_tmp206_);
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_object_unref0 (_data_->photo);
-#line 909 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->photo = _data_->_tmp207_;
-#line 7640 "BatchImport.c"
+#line 7733 "BatchImport.c"
 						}
-#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp208_ = _data_->photo;
-#line 911 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_data_->_tmp208_ != NULL) {
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp209_ = _data_->prepared_file;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp210_ = _data_->_tmp209_->file;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp211_ = g_file_get_path (_data_->_tmp210_);
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp212_ = _data_->_tmp211_;
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
-							g_debug ("BatchImport.vala:912: duplicate photo found marked offline, marking on" \
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
+							g_debug ("BatchImport.vala:929: duplicate photo found marked offline, marking on" \
 "line: %s", _data_->_tmp212_);
-#line 912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_g_free0 (_data_->_tmp212_);
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp213_ = _data_->photo;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp214_ = _data_->prepared_file;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp215_ = _data_->_tmp214_->file;
-#line 915 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 932 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							monitorable_set_master_file (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp213_, TYPE_MONITORABLE, Monitorable), _data_->_tmp215_);
-#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 933 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_data_->_tmp216_ = _data_->photo;
-#line 916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 933 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp216_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 7670 "BatchImport.c"
+#line 7763 "BatchImport.c"
 						}
 					}
-#line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp217_ = _data_->photo;
-#line 920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 937 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_data_->_tmp217_ != NULL) {
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp218_ = _data_->prepared_file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp219_ = _data_->_tmp218_->job;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp220_ = _data_->prepared_file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp221_ = _data_->_tmp220_->file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp222_ = _data_->prepared_file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp223_ = _data_->_tmp222_->file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp224_ = g_file_get_path (_data_->_tmp223_);
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp225_ = _data_->_tmp224_;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp226_ = _data_->prepared_file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp227_ = _data_->_tmp226_->file;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp228_ = g_file_get_path (_data_->_tmp227_);
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp229_ = _data_->_tmp228_;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp230_ = batch_import_result_new (_data_->_tmp219_, _data_->_tmp221_, _data_->_tmp225_, _data_->_tmp229_, NULL, IMPORT_RESULT_SUCCESS);
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->import_result = _data_->_tmp230_;
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp229_);
-#line 921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 938 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_free0 (_data_->_tmp225_);
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp231_ = _data_->self->priv->manifest;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp232_ = _data_->_tmp231_->imported;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp233_ = _data_->photo;
-#line 925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp232_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp233_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp234_ = _data_->self->priv->manifest;
-#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp235_ = _data_->import_result;
-#line 926 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						import_manifest_add_result (_data_->_tmp234_, _data_->_tmp235_);
-#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp236_ = _data_->photo;
-#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_data_->_tmp237_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp236_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 928 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_report_progress (_data_->self, _data_->_tmp237_);
-#line 929 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 946 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						batch_import_file_import_complete (_data_->self);
-#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->video);
-#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_g_object_unref0 (_data_->photo);
-#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_batch_import_result_unref0 (_data_->import_result);
-#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_prepared_file_unref0 (_data_->prepared_file);
-#line 931 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						continue;
-#line 7743 "BatchImport.c"
+#line 7836 "BatchImport.c"
 					}
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp238_ = _data_->prepared_file;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp239_ = _data_->_tmp238_->file;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp240_ = g_file_get_path (_data_->_tmp239_);
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp241_ = _data_->_tmp240_;
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					g_debug ("BatchImport.vala:934: duplicate photo detected, not importing %s", _data_->_tmp241_);
-#line 934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					g_debug ("BatchImport.vala:951: duplicate photo detected, not importing %s", _data_->_tmp241_);
+#line 951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_data_->_tmp241_);
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp242_ = photo_table_get_instance ();
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp243_ = _data_->_tmp242_;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp244_ = _data_->prepared_file;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp245_ = _data_->_tmp244_->file;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp246_ = _data_->prepared_file;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp247_ = _data_->_tmp246_->full_md5;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp248_ = _data_->prepared_file;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp249_ = _data_->_tmp248_->file_format;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp251_ = photo_table_get_duplicate_ids (_data_->_tmp243_, _data_->_tmp245_, NULL, _data_->_tmp247_, _data_->_tmp249_, &_data_->_tmp250_);
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp252_ = _data_->_tmp251_;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp252__length1 = _data_->_tmp250_;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_database_table_unref0 (_data_->_tmp243_);
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids = _data_->_tmp252_;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids_length1 = _data_->_tmp252__length1;
-#line 936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 953 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_photo_ids_size_ = _data_->photo_ids_length1;
-#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp253_ = _data_->photo_ids;
-#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp253__length1 = _data_->photo_ids_length1;
-#line 939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_vala_assert (_data_->_tmp253__length1 > 0, "photo_ids.length > 0");
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp254_ = _data_->photo_ids;
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp254__length1 = _data_->photo_ids_length1;
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp255_ = _data_->_tmp254_[0];
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp256_ = duplicated_file_create_from_photo_id (&_data_->_tmp255_);
-#line 941 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_vala1_duplicated_file = _data_->_tmp256_;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp257_ = _data_->prepared_file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp258_ = _data_->_tmp257_->job;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp259_ = _data_->prepared_file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp260_ = _data_->_tmp259_->file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp261_ = _data_->prepared_file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp262_ = _data_->_tmp261_->file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp263_ = g_file_get_path (_data_->_tmp262_);
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp264_ = _data_->_tmp263_;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp265_ = _data_->prepared_file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp266_ = _data_->_tmp265_->file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp267_ = g_file_get_path (_data_->_tmp266_);
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp268_ = _data_->_tmp267_;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp269_ = _data_->_vala1_duplicated_file;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->_tmp270_ = batch_import_result_new (_data_->_tmp258_, _data_->_tmp260_, _data_->_tmp264_, _data_->_tmp268_, _data_->_tmp269_, IMPORT_RESULT_PHOTO_EXISTS);
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_result_unref0 (_data_->import_result);
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->import_result = _data_->_tmp270_;
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_data_->_tmp268_);
-#line 943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 960 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_data_->_tmp264_);
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_data_->_vala1_duplicated_file);
-#line 884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 901 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_data_->photo_ids = (g_free (_data_->photo_ids), NULL);
-#line 7843 "BatchImport.c"
+#line 7936 "BatchImport.c"
 				}
 			}
-#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp271_ = _data_->import_result;
-#line 948 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_data_->_tmp271_ != NULL) {
-#line 949 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_data_->_tmp272_ = _data_->import_result;
-#line 949 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 966 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_report_failure (_data_->self, _data_->_tmp272_);
-#line 950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_file_import_complete (_data_->self);
-#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->video);
-#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_data_->photo);
-#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (_data_->import_result);
-#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_data_->prepared_file);
-#line 952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 7866 "BatchImport.c"
+#line 7959 "BatchImport.c"
 			}
-#line 955 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 972 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (_data_->self, (guint64) 0);
-#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp273_ = _data_->self->priv->ready_files;
-#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_data_->_tmp274_ = _data_->prepared_file;
-#line 956 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp273_, GEE_TYPE_COLLECTION, GeeCollection), _data_->_tmp274_);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_data_->video);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_data_->photo);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (_data_->import_result);
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_data_->prepared_file);
-#line 7884 "BatchImport.c"
+#line 7977 "BatchImport.c"
 		}
-#line 758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_data_->_prepared_file_list);
-#line 7888 "BatchImport.c"
+#line 7981 "BatchImport.c"
 	}
-#line 959 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 976 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (_data_->self);
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_task_return_pointer (_data_->_async_result, _data_, NULL);
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_data_->_state_ != 0) {
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (_data_->_task_complete_ != TRUE) {
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 7900 "BatchImport.c"
+#line 7993 "BatchImport.c"
 		}
 	}
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_object_unref (_data_->_async_result);
-#line 757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return FALSE;
-#line 7907 "BatchImport.c"
+#line 8000 "BatchImport.c"
 }
 
 
@@ -7924,125 +8017,125 @@ static void batch_import_done_preparing_files (BatchImport* self, BackgroundJob*
 	const gchar* _tmp8_;
 	gboolean _tmp9_ = FALSE;
 	gint _tmp10_;
-#line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (caller != NULL);
-#line 963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARE_FILES_JOB, PrepareFilesJob));
-#line 965 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepare_files_job = _tmp2_;
-#line 967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 984 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = prepare_files_job;
-#line 967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 984 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_failures (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = prepare_files_job;
-#line 970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_->prepared_files;
-#line 970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file_imports_to_perform = _tmp5_;
-#line 971 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = self->priv->file_imports_to_perform;
-#line 971 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = self->priv->file_imports_completed;
-#line 971 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp6_ >= _tmp7_, "file_imports_to_perform >= file_imports_completed");
-#line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = caller;
-#line 973 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, _tmp8_);
-#line 976 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 993 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->priv->file_imports_to_perform;
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp10_ == 0) {
-#line 7966 "BatchImport.c"
+#line 8059 "BatchImport.c"
 		gboolean _tmp11_;
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = self->priv->completed;
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = !_tmp11_;
-#line 7972 "BatchImport.c"
+#line 8065 "BatchImport.c"
 	} else {
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = FALSE;
-#line 7976 "BatchImport.c"
+#line 8069 "BatchImport.c"
 	}
-#line 980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
-#line 981 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_completed (self, "no files prepared for import");
-#line 7982 "BatchImport.c"
+#line 8075 "BatchImport.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
 		gint _tmp13_;
 		gint _tmp14_;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->file_imports_completed;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = self->priv->file_imports_to_perform;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp13_ == _tmp14_) {
-#line 7993 "BatchImport.c"
+#line 8086 "BatchImport.c"
 			gboolean _tmp15_;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = self->priv->completed;
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = !_tmp15_;
-#line 7999 "BatchImport.c"
+#line 8092 "BatchImport.c"
 		} else {
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = FALSE;
-#line 8003 "BatchImport.c"
+#line 8096 "BatchImport.c"
 		}
-#line 982 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp12_) {
-#line 983 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_completed (self, "completed preparing files, all outstanding imports completed");
-#line 8009 "BatchImport.c"
+#line 8102 "BatchImport.c"
 		}
 	}
-#line 962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 979 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (prepare_files_job);
-#line 8014 "BatchImport.c"
+#line 8107 "BatchImport.c"
 }
 
 
 static void batch_import_on_files_prepared (BatchImport* self, BackgroundJob* j) {
 	BackgroundJob* _tmp0_;
-#line 986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = j;
-#line 987 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_done_preparing_files (self, _tmp0_, "on_files_prepared");
-#line 8028 "BatchImport.c"
+#line 8121 "BatchImport.c"
 }
 
 
 static void batch_import_on_file_prepare_cancelled (BatchImport* self, BackgroundJob* j) {
 	BackgroundJob* _tmp0_;
-#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 990 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 991 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = j;
-#line 991 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_done_preparing_files (self, _tmp0_, "on_file_prepare_cancelled");
-#line 8042 "BatchImport.c"
+#line 8135 "BatchImport.c"
 }
 
 
@@ -8058,65 +8151,65 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 	PreparedFileImportJob* _tmp12_;
 	ReadyForImport* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 999 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 1001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 1001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
-#line 1001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	job = _tmp2_;
-#line 1003 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_import_files_completed");
-#line 1006 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = job;
-#line 1006 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _tmp3_->not_ready;
-#line 1006 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp4_ == NULL, "job.not_ready == null");
-#line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = job;
-#line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _tmp5_->failed;
-#line 1009 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_ != NULL) {
-#line 8086 "BatchImport.c"
+#line 8179 "BatchImport.c"
 		PreparedFileImportJob* _tmp7_;
 		BatchImportResult* _tmp8_;
 		ImportResult _tmp9_;
 		PreparedFileImportJob* _tmp10_;
 		BatchImportResult* _tmp11_;
-#line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = job;
-#line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_->failed;
-#line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_->result;
-#line 1010 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp9_ != IMPORT_RESULT_SUCCESS, "job.failed.result != ImportResult.SUCCESS");
-#line 1012 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = job;
-#line 1012 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _tmp10_->failed;
-#line 1012 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_failure (self, _tmp11_);
-#line 1013 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8108 "BatchImport.c"
+#line 8201 "BatchImport.c"
 	}
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = job;
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _tmp12_->ready;
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp13_ != NULL) {
-#line 8116 "BatchImport.c"
+#line 8209 "BatchImport.c"
 		PreparedFileImportJob* _tmp14_;
 		ReadyForImport* _tmp15_;
 		BatchImportResult* _tmp16_;
@@ -8136,54 +8229,54 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 		ReadyForImport* _tmp88_;
 		BatchImportResult* _tmp89_;
 		ImportResult _tmp90_;
-#line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = job;
-#line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_->ready;
-#line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = _tmp15_->batch_result;
-#line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp16_->result;
-#line 1019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp17_ == IMPORT_RESULT_SUCCESS, "job.ready.batch_result.result == ImportResult.SUCCESS");
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = tombstone_global;
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = job;
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp19_->ready;
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = _tmp20_->final_file;
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = tombstone_source_collection_locate (_tmp18_, _tmp21_);
-#line 1021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		tombstone = _tmp22_;
-#line 1022 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = tombstone;
-#line 1022 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp23_ != NULL) {
-#line 8162 "BatchImport.c"
+#line 8255 "BatchImport.c"
 			TombstoneSourceCollection* _tmp24_;
 			Tombstone* _tmp25_;
-#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = tombstone_global;
-#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = tombstone;
-#line 1023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			tombstone_source_collection_resurrect (_tmp24_, _tmp25_);
-#line 8171 "BatchImport.c"
+#line 8264 "BatchImport.c"
 		}
-#line 1026 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		source = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = job;
-#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = _tmp26_->ready;
-#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = _tmp27_->is_video;
-#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp28_) {
-#line 8183 "BatchImport.c"
+#line 8276 "BatchImport.c"
 			PreparedFileImportJob* _tmp29_;
 			ReadyForImport* _tmp30_;
 			BatchImportResult* _tmp31_;
@@ -8192,27 +8285,27 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			VideoImportParams* _tmp34_;
 			Video* _tmp35_ = NULL;
 			ImportResult _tmp36_;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = job;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp30_ = _tmp29_->ready;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_ = _tmp30_->batch_result;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = job;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = _tmp32_->ready;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _tmp33_->video_import_params;
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = video_import_create (_tmp34_, &_tmp35_);
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (source);
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_->result = _tmp36_;
-#line 8212 "BatchImport.c"
+#line 8305 "BatchImport.c"
 		} else {
 			PreparedFileImportJob* _tmp37_;
 			ReadyForImport* _tmp38_;
@@ -8231,43 +8324,43 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			GFile* _tmp50_;
 			Photo* _tmp72_;
 			PhotoFileFormat _tmp73_;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = job;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = _tmp37_->ready;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = _tmp38_->batch_result;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = job;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _tmp40_->ready;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = _tmp41_->photo_import_params;
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = library_photo_import_create (_tmp42_, &_tmp43_);
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (source);
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			source = G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_->result = _tmp44_;
-#line 1033 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = source;
-#line 1033 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, TYPE_PHOTO) ? ((Photo*) _tmp45_) : NULL);
-#line 1033 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			photo = _tmp46_;
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = job;
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = _tmp47_->ready;
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = _tmp48_->photo_import_params;
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp50_ = _tmp49_->final_associated_file;
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp50_ != NULL) {
-#line 8267 "BatchImport.c"
+#line 8360 "BatchImport.c"
 				BackingPhotoRow* bpr = NULL;
 				BackingPhotoRow* _tmp51_;
 				BackingPhotoRow* _tmp52_;
@@ -8284,125 +8377,125 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				gchar* _tmp63_;
 				BackingPhotoRow* _tmp64_;
 				const gchar* _tmp65_;
-#line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = backing_photo_row_new ();
-#line 1037 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				bpr = _tmp51_;
-#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_ = bpr;
-#line 1038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp53_ = bpr;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = job;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp55_ = _tmp54_->ready;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp56_ = _tmp55_->photo_import_params;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57_ = _tmp56_->final_associated_file;
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58_ = g_file_get_path (_tmp57_);
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp53_->filepath);
-#line 1039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp53_->filepath = _tmp58_;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = source;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp60_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PHOTO, Photo), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp61_ = _tmp60_;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = g_file_get_path (_tmp61_);
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = _tmp62_;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp64_ = bpr;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65_ = _tmp64_->filepath;
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_debug ("BatchImport.vala:1040: Associating %s with sibling %s", _tmp63_, _tmp65_);
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				g_debug ("BatchImport.vala:1057: Associating %s with sibling %s", _tmp63_, _tmp65_);
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp63_);
-#line 1040 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp61_);
-#line 8328 "BatchImport.c"
+#line 8421 "BatchImport.c"
 				{
 					MediaSource* _tmp66_;
 					BackingPhotoRow* _tmp67_;
-#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp66_ = source;
-#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp67_ = bpr;
-#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, &_inner_error_);
-#line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					photo_add_backing_photo_for_development (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA, _tmp67_, TRUE, &_inner_error_);
+#line 1060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8340 "BatchImport.c"
-						goto __catch412_g_error;
+#line 8433 "BatchImport.c"
+						goto __catch424_g_error;
 					}
 				}
-				goto __finally412;
-				__catch412_g_error:
+				goto __finally424;
+				__catch424_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp68_;
 					const gchar* _tmp69_;
 					GError* _tmp70_;
 					const gchar* _tmp71_;
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					e = _inner_error_;
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_inner_error_ = NULL;
-#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp68_ = bpr;
-#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp69_ = _tmp68_->filepath;
-#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp70_ = e;
-#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp71_ = _tmp70_->message;
-#line 1045 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					g_warning ("BatchImport.vala:1045: Unable to associate JPEG with RAW. File: %s Err" \
+#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					g_warning ("BatchImport.vala:1062: Unable to associate JPEG with RAW. File: %s Err" \
 "or: %s", _tmp69_, _tmp71_);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_error_free0 (e);
-#line 8368 "BatchImport.c"
+#line 8461 "BatchImport.c"
 				}
-				__finally412:
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				__finally424:
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (photo);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (source);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (tombstone);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_background_job_unref0 (job);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					g_clear_error (&_inner_error_);
-#line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					return;
-#line 8389 "BatchImport.c"
+#line 8482 "BatchImport.c"
 				}
-#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 8393 "BatchImport.c"
+#line 8486 "BatchImport.c"
 			}
-#line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp72_ = photo;
-#line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp73_ = photo_get_master_file_format (_tmp72_);
-#line 1051 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp73_ == PHOTO_FILE_FORMAT_RAW) {
-#line 8401 "BatchImport.c"
+#line 8494 "BatchImport.c"
 				RawDeveloper d = 0;
 				ConfigFacade* _tmp74_;
 				ConfigFacade* _tmp75_;
@@ -8414,75 +8507,75 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 				RawDeveloper _tmp84_;
 				Photo* _tmp85_;
 				RawDeveloper _tmp86_;
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = config_facade_get_instance ();
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp75_ = _tmp74_;
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp76_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp77_ = _tmp76_;
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp75_);
-#line 1052 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				d = _tmp77_;
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp79_ = d;
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp79_ == RAW_DEVELOPER_CAMERA) {
-#line 8429 "BatchImport.c"
+#line 8522 "BatchImport.c"
 					Photo* _tmp80_;
 					RawDeveloper _tmp81_;
 					gboolean _tmp82_;
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp80_ = photo;
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp81_ = d;
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp82_ = photo_is_raw_developer_available (_tmp80_, _tmp81_);
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = !_tmp82_;
-#line 8441 "BatchImport.c"
+#line 8534 "BatchImport.c"
 				} else {
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 8445 "BatchImport.c"
+#line 8538 "BatchImport.c"
 				}
-#line 1053 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp78_) {
-#line 1054 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					d = RAW_DEVELOPER_EMBEDDED;
-#line 8451 "BatchImport.c"
+#line 8544 "BatchImport.c"
 				}
-#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp83_ = photo;
-#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp84_ = d;
-#line 1056 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				photo_set_default_raw_developer (_tmp83_, _tmp84_);
-#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp85_ = photo;
-#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp86_ = d;
-#line 1057 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				photo_set_raw_developer (_tmp85_, _tmp86_);
-#line 8465 "BatchImport.c"
+#line 1074 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				photo_set_raw_developer (_tmp85_, _tmp86_, FALSE);
+#line 8558 "BatchImport.c"
 			}
-#line 1027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo);
-#line 8469 "BatchImport.c"
+#line 8562 "BatchImport.c"
 		}
-#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp87_ = job;
-#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp88_ = _tmp87_->ready;
-#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp89_ = _tmp88_->batch_result;
-#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp90_ = _tmp89_->result;
-#line 1061 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp90_ != IMPORT_RESULT_SUCCESS) {
-#line 8481 "BatchImport.c"
+#line 8574 "BatchImport.c"
 			PreparedFileImportJob* _tmp91_;
 			ReadyForImport* _tmp92_;
 			BatchImportResult* _tmp93_;
@@ -8492,33 +8585,33 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			PreparedFileImportJob* _tmp97_;
 			ReadyForImport* _tmp98_;
 			BatchImportResult* _tmp99_;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp91_ = job;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp92_ = _tmp91_->ready;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp93_ = _tmp92_->batch_result;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp94_ = _tmp93_->result;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95_ = import_result_to_string (_tmp94_);
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp96_ = _tmp95_;
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_debug ("BatchImport.vala:1062: on_import_file_completed: %s", _tmp96_);
-#line 1062 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_debug ("BatchImport.vala:1079: on_import_file_completed: %s", _tmp96_);
+#line 1079 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp96_);
-#line 1064 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp97_ = job;
-#line 1064 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp98_ = _tmp97_->ready;
-#line 1064 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp99_ = _tmp98_->batch_result;
-#line 1064 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_failure (self, _tmp99_);
-#line 1065 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_file_import_complete (self);
-#line 8517 "BatchImport.c"
+#line 8610 "BatchImport.c"
 		} else {
 			GeeList* _tmp100_;
 			MediaSource* _tmp101_;
@@ -8535,55 +8628,55 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 			BatchImportResult* _tmp112_;
 			CompletedImportObject* _tmp113_;
 			CompletedImportObject* _tmp114_;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp100_ = self->priv->ready_thumbnails;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp101_ = source;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp102_ = job;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp103_ = _tmp102_->ready;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp104_ = ready_for_import_get_thumbnails (_tmp103_);
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp105_ = _tmp104_;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp106_ = job;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp107_ = _tmp106_->ready;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp108_ = _tmp107_->prepared_file;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp109_ = _tmp108_->job;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp110_ = job;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp111_ = _tmp110_->ready;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp112_ = _tmp111_->batch_result;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp113_ = completed_import_object_new (_tmp101_, _tmp105_, _tmp109_, _tmp112_);
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp114_ = _tmp113_;
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp114_);
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_completed_import_object_unref0 (_tmp114_);
-#line 1067 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_thumbnails_unref0 (_tmp105_);
-#line 8570 "BatchImport.c"
+#line 8663 "BatchImport.c"
 		}
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (source);
-#line 1018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (tombstone);
-#line 8576 "BatchImport.c"
+#line 8669 "BatchImport.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
-#line 998 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 8582 "BatchImport.c"
+#line 8675 "BatchImport.c"
 }
 
 
@@ -8598,29 +8691,29 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 	BatchImportResult* _tmp24_;
 	PreparedFileImportJob* _tmp27_;
 	ReadyForImport* _tmp28_;
-#line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 1076 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 1076 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob));
-#line 1078 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	job = _tmp2_;
-#line 1080 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1097 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_import_files_cancelled");
-#line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = job;
-#line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _tmp3_->not_ready;
-#line 1082 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_ != NULL) {
-#line 8619 "BatchImport.c"
+#line 8712 "BatchImport.c"
 		PreparedFileImportJob* _tmp5_;
 		PreparedFile* _tmp6_;
 		BatchImportJob* _tmp7_;
@@ -8639,112 +8732,112 @@ static void batch_import_on_import_files_cancelled (BatchImport* self, Backgroun
 		gchar* _tmp20_;
 		BatchImportResult* _tmp21_;
 		BatchImportResult* _tmp22_;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = job;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_->not_ready;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->job;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = job;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_->not_ready;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = _tmp9_->file;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = job;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = _tmp11_->not_ready;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _tmp12_->file;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = job;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp16_->not_ready;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = _tmp17_->file;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp19_;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = batch_import_result_new (_tmp7_, _tmp10_, _tmp15_, _tmp20_, NULL, IMPORT_RESULT_USER_ABORT);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = _tmp21_;
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_failure (self, _tmp22_);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_result_unref0 (_tmp22_);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp20_);
-#line 1083 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp15_);
-#line 1086 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1103 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8684 "BatchImport.c"
+#line 8777 "BatchImport.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = job;
-#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp24_ = _tmp23_->failed;
-#line 1089 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp24_ != NULL) {
-#line 8692 "BatchImport.c"
+#line 8785 "BatchImport.c"
 		PreparedFileImportJob* _tmp25_;
 		BatchImportResult* _tmp26_;
-#line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = job;
-#line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = _tmp25_->failed;
-#line 1090 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_failure (self, _tmp26_);
-#line 1091 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1108 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8703 "BatchImport.c"
+#line 8796 "BatchImport.c"
 	}
-#line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp27_ = job;
-#line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = _tmp27_->ready;
-#line 1094 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp28_ != NULL) {
-#line 8711 "BatchImport.c"
+#line 8804 "BatchImport.c"
 		PreparedFileImportJob* _tmp29_;
 		ReadyForImport* _tmp30_;
 		BatchImportResult* _tmp31_;
 		BatchImportResult* _tmp32_;
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = job;
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = _tmp29_->ready;
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = ready_for_import_abort (_tmp30_);
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp32_ = _tmp31_;
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_failure (self, _tmp32_);
-#line 1095 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_result_unref0 (_tmp32_);
-#line 1096 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8730 "BatchImport.c"
+#line 8823 "BatchImport.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1116 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
-#line 1075 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 8736 "BatchImport.c"
+#line 8829 "BatchImport.c"
 }
 
 
 static gpointer _completed_import_object_ref0 (gpointer self) {
-#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? completed_import_object_ref (self) : NULL;
-#line 8743 "BatchImport.c"
+#line 8836 "BatchImport.c"
 }
 
 
@@ -8760,39 +8853,39 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 	CompletedImportObject* _tmp6_;
 	BatchImportResult* _tmp7_;
 	ImportResult _tmp8_;
-#line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 1110 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 1110 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
-#line 1112 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	job = _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = job;
-#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _tmp3_->completed_import_source;
-#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _completed_import_object_ref0 (_tmp4_);
-#line 1113 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completed = _tmp5_;
-#line 1115 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_thumbnail_writer_completed");
-#line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = completed;
-#line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _tmp6_->batch_result;
-#line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = _tmp7_->result;
-#line 1117 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp8_ != IMPORT_RESULT_SUCCESS) {
-#line 8791 "BatchImport.c"
+#line 8884 "BatchImport.c"
 		CompletedImportObject* _tmp9_;
 		MediaSource* _tmp10_;
 		gchar* _tmp11_;
@@ -8806,77 +8899,77 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 		MediaSource* _tmp19_;
 		CompletedImportObject* _tmp26_;
 		BatchImportResult* _tmp27_;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = completed;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = _tmp9_->source;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = _tmp11_;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = completed;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _tmp13_->batch_result;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_->result;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = import_result_to_string (_tmp15_);
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp16_;
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1118: Failed to import %s: unable to write thumbnails" \
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1135: Failed to import %s: unable to write thumbnails" \
 " (%s)", _tmp12_, _tmp17_);
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp17_);
-#line 1118 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp12_);
-#line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = completed;
-#line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = _tmp18_->source;
-#line 1121 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO)) {
-#line 8835 "BatchImport.c"
+#line 8928 "BatchImport.c"
 			CompletedImportObject* _tmp20_;
 			MediaSource* _tmp21_;
-#line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = completed;
-#line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp21_ = _tmp20_->source;
-#line 1122 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL);
-#line 8844 "BatchImport.c"
+#line 8937 "BatchImport.c"
 		} else {
 			CompletedImportObject* _tmp22_;
 			MediaSource* _tmp23_;
-#line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = completed;
-#line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = _tmp22_->source;
-#line 1123 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_VIDEO)) {
-#line 8854 "BatchImport.c"
+#line 8947 "BatchImport.c"
 				CompletedImportObject* _tmp24_;
 				MediaSource* _tmp25_;
-#line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = completed;
-#line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _tmp24_->source;
-#line 1124 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO) ? ((Video*) _tmp25_) : NULL);
-#line 8863 "BatchImport.c"
+#line 8956 "BatchImport.c"
 			}
 		}
-#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = completed;
-#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = _tmp26_->batch_result;
-#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_report_failure (self, _tmp27_);
-#line 1127 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 8874 "BatchImport.c"
+#line 8967 "BatchImport.c"
 	} else {
 		ImportManifest* _tmp28_;
 		GeeList* _tmp29_;
@@ -8887,39 +8980,39 @@ static void batch_import_on_thumbnail_writer_completed (BatchImport* self, Backg
 		BatchImportResult* _tmp34_;
 		GeeList* _tmp35_;
 		CompletedImportObject* _tmp36_;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = self->priv->manifest;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = _tmp28_->imported;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = completed;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = _tmp30_->source;
-#line 1129 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp32_ = self->priv->manifest;
-#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp33_ = completed;
-#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp34_ = _tmp33_->batch_result;
-#line 1130 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		import_manifest_add_result (_tmp32_, _tmp34_);
-#line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = self->priv->display_imported_queue;
-#line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp36_ = completed;
-#line 1132 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
-#line 8909 "BatchImport.c"
+#line 9002 "BatchImport.c"
 	}
-#line 1135 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1152 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
-#line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (completed);
-#line 1109 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 8917 "BatchImport.c"
+#line 9010 "BatchImport.c"
 }
 
 
@@ -8936,82 +9029,82 @@ static void batch_import_on_thumbnail_writer_cancelled (BatchImport* self, Backg
 	MediaSource* _tmp7_;
 	CompletedImportObject* _tmp14_;
 	BatchImportResult* _tmp15_;
-#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
-#line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->completed;
-#line 1139 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (!_tmp0_, "!completed");
-#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = j;
-#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob));
-#line 1141 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	job = _tmp2_;
-#line 1142 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = job;
-#line 1142 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _tmp3_->completed_import_source;
-#line 1142 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _completed_import_object_ref0 (_tmp4_);
-#line 1142 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completed = _tmp5_;
-#line 1144 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "on_thumbnail_writer_cancelled");
-#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = completed;
-#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _tmp6_->source;
-#line 1146 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
-#line 8964 "BatchImport.c"
+#line 9057 "BatchImport.c"
 		CompletedImportObject* _tmp8_;
 		MediaSource* _tmp9_;
-#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = completed;
-#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp8_->source;
-#line 1147 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		library_photo_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp9_) : NULL);
-#line 8973 "BatchImport.c"
+#line 9066 "BatchImport.c"
 	} else {
 		CompletedImportObject* _tmp10_;
 		MediaSource* _tmp11_;
-#line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = completed;
-#line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _tmp10_->source;
-#line 1148 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO)) {
-#line 8983 "BatchImport.c"
+#line 9076 "BatchImport.c"
 			CompletedImportObject* _tmp12_;
 			MediaSource* _tmp13_;
-#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = completed;
-#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = _tmp12_->source;
-#line 1149 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1166 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			video_import_failed (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO) ? ((Video*) _tmp13_) : NULL);
-#line 8992 "BatchImport.c"
+#line 9085 "BatchImport.c"
 		}
 	}
-#line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = completed;
-#line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _tmp14_->batch_result;
-#line 1151 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_report_failure (self, _tmp15_);
-#line 1152 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_file_import_complete (self);
-#line 1154 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_flush_import_jobs (self);
-#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (completed);
-#line 1138 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_background_job_unref0 (job);
-#line 9009 "BatchImport.c"
+#line 9102 "BatchImport.c"
 }
 
 
@@ -9049,51 +9142,51 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 	MediaCollectionRegistry* _tmp76_;
 	GeeList* _tmp77_;
 	GError * _inner_error_ = NULL;
-#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (self));
-#line 1162 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->ready_sources;
-#line 1162 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1162 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _tmp1_;
-#line 1162 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == 0) {
-#line 1163 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 9059 "BatchImport.c"
+#line 9152 "BatchImport.c"
 	}
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->priv->ready_sources;
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_;
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = g_strdup_printf ("flush_ready_sources (%d)", _tmp5_);
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _tmp6_;
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, _tmp7_);
-#line 1168 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp7_);
-#line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1170 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	all = _tmp8_;
-#line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1171 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	photos = _tmp9_;
-#line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1172 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	videos = _tmp10_;
-#line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1173 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completion_list = _tmp11_;
-#line 9091 "BatchImport.c"
+#line 9184 "BatchImport.c"
 	{
 		GeeList* _completed_list = NULL;
 		GeeList* _tmp12_;
@@ -9103,25 +9196,25 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		gint _tmp15_;
 		gint _tmp16_;
 		gint _completed_index = 0;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = self->priv->ready_sources;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_list = _tmp13_;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = _completed_list;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = _tmp15_;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_size = _tmp16_;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_index = -1;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9119 "BatchImport.c"
+#line 9212 "BatchImport.c"
 			gint _tmp17_;
 			gint _tmp18_;
 			gint _tmp19_;
@@ -9139,128 +9232,128 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 			MediaSource* _tmp38_;
 			CompletedImportObject* _tmp39_;
 			BatchImportJob* _tmp40_;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = _completed_index;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_completed_index = _tmp17_ + 1;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = _completed_index;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = _completed_size;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp18_ < _tmp19_)) {
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9149 "BatchImport.c"
+#line 9242 "BatchImport.c"
 			}
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _completed_list;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp21_ = _completed_index;
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp22_ = gee_list_get (_tmp20_, _tmp21_);
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			completed = (CompletedImportObject*) _tmp22_;
-#line 1176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = all;
-#line 1176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = completed;
-#line 1176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = _tmp24_->source;
-#line 1176 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = completed;
-#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp27_ = _tmp26_->source;
-#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_LIBRARY_PHOTO)) {
-#line 9173 "BatchImport.c"
+#line 9266 "BatchImport.c"
 				GeeArrayList* _tmp28_;
 				CompletedImportObject* _tmp29_;
 				MediaSource* _tmp30_;
-#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = photos;
-#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp29_ = completed;
-#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = _tmp29_->source;
-#line 1179 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 9185 "BatchImport.c"
+#line 9278 "BatchImport.c"
 			} else {
 				CompletedImportObject* _tmp31_;
 				MediaSource* _tmp32_;
-#line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = completed;
-#line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp31_->source;
-#line 1180 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
-#line 9195 "BatchImport.c"
+#line 9288 "BatchImport.c"
 					GeeArrayList* _tmp33_;
 					CompletedImportObject* _tmp34_;
 					MediaSource* _tmp35_;
-#line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp33_ = videos;
-#line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp34_ = completed;
-#line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp35_ = _tmp34_->source;
-#line 1181 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIDEO, Video));
-#line 9207 "BatchImport.c"
+#line 9300 "BatchImport.c"
 				}
 			}
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = completion_list;
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = completed;
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = _tmp37_->source;
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = completed;
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = _tmp39_->original_job;
-#line 1183 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp40_);
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_completed_import_object_unref0 (completed);
-#line 9224 "BatchImport.c"
+#line 9317 "BatchImport.c"
 		}
-#line 1175 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_completed_list);
-#line 9228 "BatchImport.c"
+#line 9321 "BatchImport.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp41_ = media_collection_registry_get_instance ();
-#line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp42_ = _tmp41_;
-#line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_collection_registry_begin_transaction_on_all (_tmp42_);
-#line 1186 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_media_collection_registry_unref0 (_tmp42_);
-#line 1187 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp43_ = event_global;
-#line 1187 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1188 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp44_ = tag_global;
-#line 1188 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp45_ = library_photo_global;
-#line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp46_ = photos;
-#line 1190 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp47_ = video_global;
-#line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp48_ = videos;
-#line 1191 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_source_collection_import_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9258 "BatchImport.c"
+#line 9351 "BatchImport.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeHashMap* _tmp49_;
@@ -9269,47 +9362,47 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 		GeeSet* _tmp52_;
 		GeeIterator* _tmp53_;
 		GeeIterator* _tmp54_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp49_ = completion_list;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp51_ = _tmp50_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp52_ = _tmp51_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp54_ = _tmp53_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp52_);
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_media_it = _tmp54_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 9285 "BatchImport.c"
+#line 9378 "BatchImport.c"
 			GeeIterator* _tmp55_;
 			gboolean _tmp56_;
 			MediaSource* media = NULL;
 			GeeIterator* _tmp57_;
 			gpointer _tmp58_;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = _media_it;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp56_ = gee_iterator_next (_tmp55_);
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp56_) {
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 9299 "BatchImport.c"
+#line 9392 "BatchImport.c"
 			}
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp57_ = _media_it;
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp58_ = gee_iterator_get (_tmp57_);
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			media = (MediaSource*) _tmp58_;
-#line 9307 "BatchImport.c"
+#line 9400 "BatchImport.c"
 			{
 				GeeHashMap* _tmp59_;
 				MediaSource* _tmp60_;
@@ -9317,30 +9410,30 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				BatchImportJob* _tmp62_;
 				MediaSource* _tmp63_;
 				BatchImportRoll* _tmp64_;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = completion_list;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp60_ = media;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp61_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_);
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = (BatchImportJob*) _tmp61_;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = media;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp64_ = self->priv->import_roll;
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				batch_import_job_complete (_tmp62_, _tmp63_, _tmp64_, &_inner_error_);
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (_tmp62_);
-#line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9333 "BatchImport.c"
-					goto __catch413_g_error;
+#line 9426 "BatchImport.c"
+					goto __catch425_g_error;
 				}
 			}
-			goto __finally413;
-			__catch413_g_error:
+			goto __finally425;
+			__catch425_g_error:
 			{
 				GError* err = NULL;
 				MediaSource* _tmp65_;
@@ -9348,97 +9441,97 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				gchar* _tmp67_;
 				GError* _tmp68_;
 				const gchar* _tmp69_;
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65_ = media;
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp66_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_DATA_OBJECT, DataObject));
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp67_ = _tmp66_;
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp68_ = err;
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp69_ = _tmp68_->message;
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:1198: Completion error when finalizing import of %s: " \
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				g_warning ("BatchImport.vala:1215: Completion error when finalizing import of %s: " \
 "%s", _tmp67_, _tmp69_);
-#line 1198 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp67_);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 9366 "BatchImport.c"
+#line 9459 "BatchImport.c"
 			}
-			__finally413:
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally425:
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (media);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_media_it);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (completion_list);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (videos);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (photos);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (all);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
-#line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 9389 "BatchImport.c"
+#line 9482 "BatchImport.c"
 			}
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (media);
-#line 9393 "BatchImport.c"
+#line 9486 "BatchImport.c"
 		}
-#line 1194 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_media_it);
-#line 9397 "BatchImport.c"
+#line 9490 "BatchImport.c"
 	}
-#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp70_ = all;
-#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp71_ = self->priv->import_roll;
-#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp72_ = _tmp71_->generated_events;
-#line 1204 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	event_generate_many_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp72_);
-#line 1206 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp73_ = tag_global;
-#line 1206 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp74_ = event_global;
-#line 1207 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1224 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp75_ = media_collection_registry_get_instance ();
-#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp76_ = _tmp75_;
-#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	media_collection_registry_commit_transaction_on_all (_tmp76_);
-#line 1208 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1225 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_media_collection_registry_unref0 (_tmp76_);
-#line 1210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp77_ = self->priv->ready_sources;
-#line 1210 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1227 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (completion_list);
-#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (videos);
-#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (photos);
-#line 1161 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (all);
-#line 9435 "BatchImport.c"
+#line 9528 "BatchImport.c"
 }
 
 
@@ -9461,105 +9554,105 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 	GeeList* _tmp48_;
 	gint _tmp49_;
 	gint _tmp50_;
-#line 1215 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1232 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (self), FALSE);
-#line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->display_imported_queue;
-#line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_ == 0) {
-#line 9468 "BatchImport.c"
+#line 9561 "BatchImport.c"
 		gboolean _tmp3_;
-#line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->completed;
-#line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = !_tmp3_;
-#line 1217 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 9476 "BatchImport.c"
+#line 9569 "BatchImport.c"
 	}
-#line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = self->priv->cancellable;
-#line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 1219 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1236 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_) {
-#line 9484 "BatchImport.c"
+#line 9577 "BatchImport.c"
 		GeeList* _tmp6_;
 		gint _tmp7_;
 		gint _tmp8_;
-#line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->priv->display_imported_queue;
-#line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_;
-#line 1220 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1220: Importing %d photos at once", _tmp8_);
-#line 9496 "BatchImport.c"
+#line 1237 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_debug ("BatchImport.vala:1237: Importing %d photos at once", _tmp8_);
+#line 9589 "BatchImport.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_log_status (self, "display_imported_timer");
-#line 1232 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1249 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	total = 1;
-#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = self->priv->cancellable;
-#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = g_cancellable_is_cancelled (_tmp9_);
-#line 1233 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1250 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp10_) {
-#line 9508 "BatchImport.c"
+#line 9601 "BatchImport.c"
 		GeeList* _tmp11_;
 		gint _tmp12_;
 		gint _tmp13_;
-#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = self->priv->display_imported_queue;
-#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _tmp12_;
-#line 1234 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1251 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp13_ > BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) {
-#line 9520 "BatchImport.c"
+#line 9613 "BatchImport.c"
 			GeeList* _tmp14_;
 			gint _tmp15_;
 			gint _tmp16_;
 			gint _tmp17_;
-#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = self->priv->display_imported_queue;
-#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp16_ = _tmp15_;
-#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = CLAMP ((_tmp16_ / BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW) + 2, 0, 16);
-#line 1235 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			total = 1 << _tmp17_;
-#line 9535 "BatchImport.c"
+#line 9628 "BatchImport.c"
 		}
 	} else {
-#line 1239 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		total = BATCH_IMPORT_DISPLAY_QUEUE_HYSTERESIS_OVERFLOW;
-#line 9540 "BatchImport.c"
+#line 9633 "BatchImport.c"
 	}
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = total;
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = self->priv->display_imported_queue;
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp21_ = _tmp20_;
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = MIN (_tmp18_, _tmp21_);
-#line 1242 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	total = _tmp22_;
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 9556 "BatchImport.c"
+#line 9649 "BatchImport.c"
 		gint _tmp23_;
 		CompletedImportObject* completed_object = NULL;
 		GeeList* _tmp24_;
@@ -9578,143 +9671,143 @@ static gboolean batch_import_display_imported_timer (BatchImport* self) {
 		gint _tmp36_;
 		CompletedImportObject* _tmp37_;
 		MediaSource* _tmp38_;
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = total;
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		total = _tmp23_ - 1;
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!(_tmp23_ > 0)) {
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 9583 "BatchImport.c"
+#line 9676 "BatchImport.c"
 		}
-#line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = self->priv->display_imported_queue;
-#line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = gee_list_remove_at (_tmp24_, 0);
-#line 1253 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_object = (CompletedImportObject*) _tmp25_;
-#line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = completed_object;
-#line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = _tmp26_->user_preview;
-#line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 1256 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1273 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		user_preview = _tmp28_;
-#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = completed_object;
-#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp29_->user_preview);
-#line 1259 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_->user_preview = NULL;
-#line 1260 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = completed_object;
-#line 1260 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_thumbnails_unref0 (_tmp30_->thumbnails);
-#line 1260 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1277 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_->thumbnails = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = self->priv->ready_sources;
-#line 1265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp32_ = completed_object;
-#line 1265 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
-#line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp33_ = completed_object;
-#line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp34_ = _tmp33_->source;
-#line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = user_preview;
-#line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp36_ = total;
-#line 1267 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1284 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_signal_emit (self, batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL], 0, _tmp34_, _tmp35_, _tmp36_);
-#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp37_ = completed_object;
-#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp38_ = _tmp37_->source;
-#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp38_, TYPE_PHOTO_SOURCE)) {
-#line 9633 "BatchImport.c"
+#line 9726 "BatchImport.c"
 			PhotoSource* photo_source = NULL;
 			CompletedImportObject* _tmp39_;
 			MediaSource* _tmp40_;
 			PhotoSource* _tmp41_;
 			PhotoSource* _tmp42_;
 			guint64 _tmp43_;
-#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = completed_object;
-#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = _tmp39_->source;
-#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, TYPE_PHOTO_SOURCE) ? ((PhotoSource*) _tmp40_) : NULL);
-#line 1271 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			photo_source = _tmp41_;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = photo_source;
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1272 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (self, _tmp43_);
-#line 1270 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo_source);
-#line 9656 "BatchImport.c"
+#line 9749 "BatchImport.c"
 		} else {
 			CompletedImportObject* _tmp44_;
 			MediaSource* _tmp45_;
 			guint64 _tmp46_;
-#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = completed_object;
-#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = _tmp44_->source;
-#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = media_source_get_filesize (_tmp45_);
-#line 1274 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			batch_import_report_progress (self, _tmp46_);
-#line 9669 "BatchImport.c"
+#line 9762 "BatchImport.c"
 		}
-#line 1276 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_file_import_complete (self);
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (user_preview);
-#line 1252 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1269 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_completed_import_object_unref0 (completed_object);
-#line 9677 "BatchImport.c"
+#line 9770 "BatchImport.c"
 	}
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp48_ = self->priv->ready_sources;
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp50_ = _tmp49_;
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp50_ >= BATCH_IMPORT_READY_SOURCES_COUNT_OVERFLOW) {
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp47_ = TRUE;
-#line 9689 "BatchImport.c"
+#line 9782 "BatchImport.c"
 	} else {
 		GCancellable* _tmp51_;
 		gboolean _tmp52_;
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp51_ = self->priv->cancellable;
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp52_ = g_cancellable_is_cancelled (_tmp51_);
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp47_ = _tmp52_;
-#line 9699 "BatchImport.c"
+#line 9792 "BatchImport.c"
 	}
-#line 1279 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1296 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp47_) {
-#line 1280 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		batch_import_flush_ready_sources (self);
-#line 9705 "BatchImport.c"
+#line 9798 "BatchImport.c"
 	}
-#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 1282 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1299 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 9711 "BatchImport.c"
+#line 9804 "BatchImport.c"
 }
 
 
@@ -9725,27 +9818,27 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = closure->data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9730 "BatchImport.c"
+#line 9823 "BatchImport.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9736 "BatchImport.c"
+#line 9829 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 9742 "BatchImport.c"
+#line 9835 "BatchImport.c"
 }
 
 
@@ -9756,27 +9849,27 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT (GClosure * closure,
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (n_param_values == 4);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = closure->data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9761 "BatchImport.c"
+#line 9854 "BatchImport.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9767 "BatchImport.c"
+#line 9860 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_int (param_values + 3), data2);
-#line 9773 "BatchImport.c"
+#line 9866 "BatchImport.c"
 }
 
 
@@ -9787,27 +9880,27 @@ static void g_cclosure_user_marshal_VOID__ENUM_STRING (GClosure * closure, GValu
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = closure->data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9792 "BatchImport.c"
+#line 9885 "BatchImport.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9798 "BatchImport.c"
+#line 9891 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__ENUM_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, g_value_get_enum (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 9804 "BatchImport.c"
+#line 9897 "BatchImport.c"
 }
 
 
@@ -9818,27 +9911,27 @@ static void g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT (GClosure * closur
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = closure->data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9823 "BatchImport.c"
+#line 9916 "BatchImport.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9829 "BatchImport.c"
+#line 9922 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__BATCH_IMPORT_RESULT) (marshal_data ? marshal_data : cc->callback);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_batch_import_result (param_values + 1), data2);
-#line 9835 "BatchImport.c"
+#line 9928 "BatchImport.c"
 }
 
 
@@ -9849,27 +9942,27 @@ static void g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL (GCl
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = closure->data;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9854 "BatchImport.c"
+#line 9947 "BatchImport.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		data2 = closure->data;
-#line 9860 "BatchImport.c"
+#line 9953 "BatchImport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback = (GMarshalFunc_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL) (marshal_data ? marshal_data : cc->callback);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	callback (data1, value_get_import_manifest (param_values + 1), value_get_batch_import_roll (param_values + 2), data2);
-#line 9866 "BatchImport.c"
+#line 9959 "BatchImport.c"
 }
 
 
@@ -9877,37 +9970,37 @@ static void batch_import_class_init (BatchImportClass * klass) {
 	Workers* _tmp0_;
 	guint _tmp1_;
 	Workers* _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_parent_class = g_type_class_peek_parent (klass);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (BatchImportPrivate));
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = batch_import_finalize;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_STARTING_SIGNAL] = g_signal_new ("starting", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_PREPARING_SIGNAL] = g_signal_new ("preparing", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_PROGRESS_SIGNAL] = 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"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_IMPORTED_SIGNAL] = 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"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_FATAL_ERROR_SIGNAL] = 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"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_IMPORT_JOB_FAILED_SIGNAL] = g_signal_new ("import-job-failed", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BATCH_IMPORT_RESULT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT_RESULT);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_signals[BATCH_IMPORT_IMPORT_COMPLETE_SIGNAL] = g_signal_new ("import-complete", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__IMPORT_MANIFEST_BATCH_IMPORT_ROLL, G_TYPE_NONE, 2, TYPE_IMPORT_MANIFEST, TYPE_BATCH_IMPORT_ROLL);
-#line 413 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = workers_new ((guint) 1, FALSE);
-#line 413 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_feeder_workers = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = workers_thread_per_cpu_minus_one ();
-#line 414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = workers_new (_tmp1_, FALSE);
-#line 414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 430 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	batch_import_import_workers = _tmp2_;
-#line 9904 "BatchImport.c"
+#line 9997 "BatchImport.c"
 }
 
 
@@ -9918,55 +10011,55 @@ static void batch_import_instance_init (BatchImport * self) {
 	GeeLinkedList* _tmp3_;
 	GeeLinkedList* _tmp4_;
 	GeeLinkedList* _tmp5_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = BATCH_IMPORT_GET_PRIVATE (self);
-#line 419 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 435 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed_bytes = (guint64) 0;
-#line 420 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 436 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->total_bytes = (guint64) 0;
-#line 423 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 439 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->scheduled = FALSE;
-#line 424 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->completed = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file_imports_to_perform = -1;
-#line 426 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file_imports_completed = 0;
-#line 427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->cancellable = NULL;
-#line 428 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 444 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->last_preparing_ms = (gulong) 0;
-#line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 447 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 447 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->imported_full_md5_table = _tmp0_;
-#line 433 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 449 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->throbber_id = (guint) 0;
-#line 434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = workers_thread_per_cpu_minus_one ();
-#line 434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->max_outstanding_import_jobs = _tmp1_;
-#line 435 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->untrash_duplicates = TRUE;
-#line 436 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 452 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->mark_duplicates_online = TRUE;
-#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = gee_linked_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
-#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
-#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 457 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
-#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 457 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_thumbnails = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_LIST, GeeList);
-#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 459 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
-#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 459 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->display_imported_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList);
-#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = gee_linked_list_new (TYPE_COMPLETED_IMPORT_OBJECT, (GBoxedCopyFunc) completed_import_object_ref, (GDestroyNotify) completed_import_object_unref, NULL, NULL, NULL);
-#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->ready_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
-#line 9963 "BatchImport.c"
+#line 10056 "BatchImport.c"
 }
 
 
@@ -9975,43 +10068,43 @@ static void batch_import_finalize (GObject * obj) {
 	Application* _tmp0_;
 	Application* _tmp1_;
 	guint _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BATCH_IMPORT, BatchImport);
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = application_get_instance ();
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _tmp0_;
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_parse_name ("exiting", TYPE_APPLICATION, &_tmp2_, NULL, FALSE);
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _batch_import_user_halt_application_exiting, self);
-#line 508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 524 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_application_unref0 (_tmp1_);
-#line 416 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 417 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_roll_unref0 (self->priv->import_roll);
-#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->priv->name);
-#line 422 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_import_manifest_unref0 (self->priv->manifest);
-#line 427 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
-#line 431 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 447 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->imported_full_md5_table);
-#line 440 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->ready_files);
-#line 441 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 457 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->ready_thumbnails);
-#line 443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 459 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->display_imported_queue);
-#line 445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->ready_sources);
-#line 402 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (batch_import_parent_class)->finalize (obj);
-#line 10008 "BatchImport.c"
+#line 10101 "BatchImport.c"
 }
 
 
@@ -10029,37 +10122,37 @@ GType batch_import_get_type (void) {
 
 static DuplicatedFile* duplicated_file_construct (GType object_type) {
 	DuplicatedFile * self = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (DuplicatedFile*) g_object_new (object_type, NULL);
-#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (self->priv->video_id);
-#line 1292 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->video_id = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (self->priv->photo_id);
-#line 1293 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->photo_id = NULL;
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file);
-#line 1294 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1311 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->file = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10042 "BatchImport.c"
+#line 10135 "BatchImport.c"
 }
 
 
 static DuplicatedFile* duplicated_file_new (void) {
-#line 1291 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return duplicated_file_construct (TYPE_DUPLICATED_FILE);
-#line 10049 "BatchImport.c"
+#line 10142 "BatchImport.c"
 }
 
 
 static gpointer _photo_id_dup0 (gpointer self) {
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_id_dup (self) : NULL;
-#line 10056 "BatchImport.c"
+#line 10149 "BatchImport.c"
 }
 
 
@@ -10070,36 +10163,36 @@ DuplicatedFile* duplicated_file_create_from_photo_id (PhotoID* photo_id) {
 	DuplicatedFile* _tmp1_;
 	PhotoID _tmp2_;
 	PhotoID* _tmp3_;
-#line 1297 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = photo_id_is_valid (photo_id);
-#line 1298 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1315 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_, "photo_id.is_valid()");
-#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = duplicated_file_new ();
-#line 1300 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1317 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp1_;
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = *photo_id;
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _photo_id_dup0 (&_tmp2_);
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (_result_->priv->photo_id);
-#line 1301 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->photo_id = _tmp3_;
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1302 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1319 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10089 "BatchImport.c"
+#line 10182 "BatchImport.c"
 }
 
 
 static gpointer _video_id_dup0 (gpointer self) {
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_id_dup (self) : NULL;
-#line 10096 "BatchImport.c"
+#line 10189 "BatchImport.c"
 }
 
 
@@ -10110,29 +10203,29 @@ DuplicatedFile* duplicated_file_create_from_video_id (VideoID* video_id) {
 	DuplicatedFile* _tmp1_;
 	VideoID _tmp2_;
 	VideoID* _tmp3_;
-#line 1305 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = video_id_is_valid (video_id);
-#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_, "video_id.is_valid()");
-#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = duplicated_file_new ();
-#line 1308 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp1_;
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = *video_id;
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _video_id_dup0 (&_tmp2_);
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (_result_->priv->video_id);
-#line 1309 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->video_id = _tmp3_;
-#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1310 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10129 "BatchImport.c"
+#line 10222 "BatchImport.c"
 }
 
 
@@ -10142,56 +10235,56 @@ DuplicatedFile* duplicated_file_create_from_file (GFile* file) {
 	DuplicatedFile* _tmp0_;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
-#line 1313 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = duplicated_file_new ();
-#line 1314 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp0_;
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = file;
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (_result_->priv->file);
-#line 1316 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_->priv->file = _tmp2_;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _result_;
-#line 1318 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1335 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10157 "BatchImport.c"
+#line 10250 "BatchImport.c"
 }
 
 
 GFile* duplicated_file_get_file (DuplicatedFile* self) {
 	GFile* result = NULL;
 	GFile* _tmp0_;
-#line 1321 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1338 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_DUPLICATED_FILE (self), NULL);
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1339 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->priv->file;
-#line 1322 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1339 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ != NULL) {
-#line 10170 "BatchImport.c"
+#line 10263 "BatchImport.c"
 		GFile* _tmp1_;
 		GFile* _tmp2_;
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = self->priv->file;
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = _tmp2_;
-#line 1323 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1340 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 10181 "BatchImport.c"
+#line 10274 "BatchImport.c"
 	} else {
 		PhotoID* _tmp3_;
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->priv->photo_id;
-#line 1324 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1341 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 10188 "BatchImport.c"
+#line 10281 "BatchImport.c"
 			Photo* photo_object = NULL;
 			LibraryPhotoSourceCollection* _tmp4_;
 			PhotoID* _tmp5_;
@@ -10201,42 +10294,42 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 			GFile* _tmp9_;
 			GFile* _tmp10_;
 			GFile* _tmp11_;
-#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1342 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = library_photo_global;
-#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1342 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = self->priv->photo_id;
-#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1342 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = *_tmp5_;
-#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1342 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = library_photo_source_collection_fetch (_tmp4_, &_tmp6_);
-#line 1325 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1342 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			photo_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo);
-#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1343 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = photo_object;
-#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1343 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1343 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (self->priv->file);
-#line 1326 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1343 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->priv->file = _tmp9_;
-#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = self->priv->file;
-#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = _tmp11_;
-#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (photo_object);
-#line 1327 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1344 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 10226 "BatchImport.c"
+#line 10319 "BatchImport.c"
 		} else {
 			VideoID* _tmp12_;
-#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = self->priv->video_id;
-#line 1328 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1345 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp12_ != NULL) {
-#line 10233 "BatchImport.c"
+#line 10326 "BatchImport.c"
 				Video* video_object = NULL;
 				VideoSourceCollection* _tmp13_;
 				VideoID* _tmp14_;
@@ -10246,39 +10339,39 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 				GFile* _tmp18_;
 				GFile* _tmp19_;
 				GFile* _tmp20_;
-#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1346 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = video_global;
-#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1346 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp14_ = self->priv->video_id;
-#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1346 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = *_tmp14_;
-#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1346 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = video_source_collection_fetch (_tmp13_, &_tmp15_);
-#line 1329 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1346 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				video_object = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_VIDEO, Video);
-#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = video_object;
-#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (self->priv->file);
-#line 1330 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1347 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->priv->file = _tmp18_;
-#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = self->priv->file;
-#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				result = _tmp20_;
-#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (video_object);
-#line 1331 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1348 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return result;
-#line 10271 "BatchImport.c"
+#line 10364 "BatchImport.c"
 			} else {
-#line 1333 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1350 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_assert_not_reached ();
-#line 10275 "BatchImport.c"
+#line 10368 "BatchImport.c"
 			}
 		}
 	}
@@ -10286,36 +10379,36 @@ GFile* duplicated_file_get_file (DuplicatedFile* self) {
 
 
 static void duplicated_file_class_init (DuplicatedFileClass * klass) {
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	duplicated_file_parent_class = g_type_class_peek_parent (klass);
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (DuplicatedFilePrivate));
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicated_file_finalize;
-#line 10289 "BatchImport.c"
+#line 10382 "BatchImport.c"
 }
 
 
 static void duplicated_file_instance_init (DuplicatedFile * self) {
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = DUPLICATED_FILE_GET_PRIVATE (self);
-#line 10296 "BatchImport.c"
+#line 10389 "BatchImport.c"
 }
 
 
 static void duplicated_file_finalize (GObject * obj) {
 	DuplicatedFile * self;
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATED_FILE, DuplicatedFile);
-#line 1287 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1304 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_id_free0 (self->priv->video_id);
-#line 1288 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1305 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_id_free0 (self->priv->photo_id);
-#line 1289 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1306 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->file);
-#line 1286 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1303 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_OBJECT_CLASS (duplicated_file_parent_class)->finalize (obj);
-#line 10312 "BatchImport.c"
+#line 10405 "BatchImport.c"
 }
 
 
@@ -10339,27 +10432,27 @@ BackgroundImportJob* background_import_job_construct (GType object_type, BatchIm
 	GCancellable* _tmp2_;
 	CancellationCallback _tmp3_;
 	void* _tmp3__target;
-#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1362 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1379 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (BackgroundImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
-#line 1360 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10356 "BatchImport.c"
+#line 10449 "BatchImport.c"
 }
 
 
@@ -10368,55 +10461,55 @@ ImportResult background_import_job_abort_check (BackgroundImportJob* self) {
 	gboolean _tmp0_ = FALSE;
 	ImportResult _tmp1_;
 	ImportResult _tmp3_;
-#line 1367 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1384 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BACKGROUND_IMPORT_JOB (self), 0);
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->abort_flag;
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ == IMPORT_RESULT_SUCCESS) {
-#line 10371 "BatchImport.c"
+#line 10464 "BatchImport.c"
 		gboolean _tmp2_;
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_;
-#line 10377 "BatchImport.c"
+#line 10470 "BatchImport.c"
 	} else {
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 10381 "BatchImport.c"
+#line 10474 "BatchImport.c"
 	}
-#line 1368 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 1369 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = IMPORT_RESULT_USER_ABORT;
-#line 10387 "BatchImport.c"
+#line 10480 "BatchImport.c"
 	}
-#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = self->abort_flag;
-#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp3_;
-#line 1371 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10395 "BatchImport.c"
+#line 10488 "BatchImport.c"
 }
 
 
 void background_import_job_abort (BackgroundImportJob* self, ImportResult _result_) {
 	ImportResult _tmp0_;
-#line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1391 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->abort_flag;
-#line 1376 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1393 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_ == IMPORT_RESULT_SUCCESS) {
-#line 10407 "BatchImport.c"
+#line 10500 "BatchImport.c"
 		ImportResult _tmp1_;
-#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _result_;
-#line 1377 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->abort_flag = _tmp1_;
-#line 10413 "BatchImport.c"
+#line 10506 "BatchImport.c"
 	}
 }
 
@@ -10433,73 +10526,73 @@ void background_import_job_report_failure (BackgroundImportJob* self, BatchImpor
 	ImportResult _tmp13_;
 	BatchImportResult* _tmp14_;
 	BatchImportResult* _tmp15_;
-#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
-#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (src_identifier != NULL);
-#line 1380 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1397 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
-#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = _result_;
-#line 1382 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1399 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp0_ != IMPORT_RESULT_SUCCESS, "result != ImportResult.SUCCESS");
-#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _result_;
-#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result_is_abort (_tmp1_);
-#line 1385 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1402 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
-#line 10450 "BatchImport.c"
+#line 10543 "BatchImport.c"
 		ImportResult _tmp3_;
-#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _result_;
-#line 1386 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp3_);
-#line 10456 "BatchImport.c"
+#line 10549 "BatchImport.c"
 	} else {
 		const gchar* _tmp4_;
 		ImportResult _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = src_identifier;
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _result_;
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = import_result_to_string (_tmp5_);
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1388: Import failure %s: %s", _tmp4_, _tmp7_);
-#line 1388 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1405: Import failure %s: %s", _tmp4_, _tmp7_);
+#line 1405 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 10474 "BatchImport.c"
+#line 10567 "BatchImport.c"
 	}
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = self->failed;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = job;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = file;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = src_identifier;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = dest_identifier;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _result_;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = batch_import_result_new (_tmp9_, _tmp10_, _tmp11_, _tmp12_, NULL, _tmp13_);
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _tmp14_;
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
-#line 1390 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1407 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp15_);
-#line 10496 "BatchImport.c"
+#line 10589 "BatchImport.c"
 }
 
 
@@ -10525,110 +10618,110 @@ void background_import_job_report_error (BackgroundImportJob* self, BatchImportJ
 	ImportResult _tmp18_;
 	BatchImportResult* _tmp19_;
 	BatchImportResult* _tmp20_;
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BACKGROUND_IMPORT_JOB (self));
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (src_identifier != NULL);
-#line 1394 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1411 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (dest_identifier != NULL);
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = err;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = default_result;
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result_convert_error (_tmp0_, _tmp1_);
-#line 1396 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1413 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = _tmp2_;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = src_identifier;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = err;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_->message;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _result_;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = import_result_to_string (_tmp6_);
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = _tmp7_;
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_warning ("BatchImport.vala:1398: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_);
-#line 1398 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_warning ("BatchImport.vala:1415: Import error %s: %s (%s)", _tmp3_, _tmp5_, _tmp8_);
+#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp8_);
-#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _result_;
-#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = import_result_is_abort (_tmp9_);
-#line 1400 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp10_) {
-#line 10562 "BatchImport.c"
+#line 10655 "BatchImport.c"
 		ImportResult _tmp11_;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _result_;
-#line 1401 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1418 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_abort (self, _tmp11_);
-#line 10568 "BatchImport.c"
+#line 10661 "BatchImport.c"
 	}
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = self->failed;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = job;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = file;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = src_identifier;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = dest_identifier;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = err;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = default_result;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = batch_import_result_new_from_error (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_, _tmp18_);
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = _tmp19_;
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
-#line 1403 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (_tmp20_);
-#line 10592 "BatchImport.c"
+#line 10685 "BatchImport.c"
 }
 
 
 static void background_import_job_class_init (BackgroundImportJobClass * klass) {
-#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = background_import_job_finalize;
-#line 10601 "BatchImport.c"
+#line 10694 "BatchImport.c"
 }
 
 
 static void background_import_job_instance_init (BackgroundImportJob * self) {
 	GeeArrayList* _tmp0_;
-#line 1357 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1374 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->abort_flag = IMPORT_RESULT_SUCCESS;
-#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_BATCH_IMPORT_RESULT, (GBoxedCopyFunc) batch_import_result_ref, (GDestroyNotify) batch_import_result_unref, NULL, NULL, NULL);
-#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 10613 "BatchImport.c"
+#line 10706 "BatchImport.c"
 }
 
 
 static void background_import_job_finalize (BackgroundJob * obj) {
 	BackgroundImportJob * self;
-#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob);
-#line 1358 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1375 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->failed);
-#line 1356 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1373 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (background_import_job_parent_class)->finalize (obj);
-#line 10625 "BatchImport.c"
+#line 10718 "BatchImport.c"
 }
 
 
@@ -10651,68 +10744,68 @@ FileToPrepare* file_to_prepare_construct (GType object_type, BatchImportJob* job
 	GFile* _tmp2_;
 	GFile* _tmp3_;
 	gboolean _tmp4_;
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (FileToPrepare*) g_type_create_instance (object_type);
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1415 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1432 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1416 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = copy_to_library;
-#line 1417 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->copy_to_library = _tmp4_;
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 10676 "BatchImport.c"
+#line 10769 "BatchImport.c"
 }
 
 
 FileToPrepare* file_to_prepare_new (BatchImportJob* job, GFile* file, gboolean copy_to_library) {
-#line 1414 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1431 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return file_to_prepare_construct (TYPE_FILE_TO_PREPARE, job, file, copy_to_library);
-#line 10683 "BatchImport.c"
+#line 10776 "BatchImport.c"
 }
 
 
 static gpointer _file_to_prepare_ref0 (gpointer self) {
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? file_to_prepare_ref (self) : NULL;
-#line 10690 "BatchImport.c"
+#line 10783 "BatchImport.c"
 }
 
 
 void file_to_prepare_set_associated (FileToPrepare* self, FileToPrepare* a) {
 	FileToPrepare* _tmp0_;
 	FileToPrepare* _tmp1_;
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_FILE_TO_PREPARE (self));
-#line 1420 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail ((a == NULL) || IS_FILE_TO_PREPARE (a));
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = a;
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _file_to_prepare_ref0 (_tmp0_);
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 1421 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = _tmp1_;
-#line 10709 "BatchImport.c"
+#line 10802 "BatchImport.c"
 }
 
 
@@ -10720,50 +10813,50 @@ gchar* file_to_prepare_get_parent_path (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
-#line 1424 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1441 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10723 "BatchImport.c"
+#line 10816 "BatchImport.c"
 		GFile* _tmp2_;
 		GFile* _tmp3_;
 		GFile* _tmp4_;
 		gchar* _tmp5_;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_parent (_tmp2_);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp3_;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = g_file_get_path (_tmp4_);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp4_);
-#line 10742 "BatchImport.c"
+#line 10835 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp6_;
 		gchar* _tmp7_;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->job;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = batch_import_job_get_path (_tmp6_);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp7_;
-#line 10754 "BatchImport.c"
+#line 10847 "BatchImport.c"
 	}
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1442 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10760 "BatchImport.c"
+#line 10853 "BatchImport.c"
 }
 
 
@@ -10771,24 +10864,24 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
-#line 1428 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10774 "BatchImport.c"
+#line 10867 "BatchImport.c"
 		GFile* _tmp2_;
 		gchar* _tmp3_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_path (_tmp2_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 10785 "BatchImport.c"
+#line 10878 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_;
 		gchar* _tmp5_;
@@ -10801,47 +10894,47 @@ gchar* file_to_prepare_get_path (FileToPrepare* self) {
 		GFile* _tmp12_;
 		GFile* _tmp13_;
 		gchar* _tmp14_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_get_path (_tmp4_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = g_file_new_for_path (_tmp6_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = self->job;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = batch_import_job_get_basename (_tmp9_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = _tmp10_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = g_file_get_child (_tmp8_, _tmp11_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = _tmp12_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp14_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp11_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp6_);
-#line 10832 "BatchImport.c"
+#line 10925 "BatchImport.c"
 	}
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1446 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10838 "BatchImport.c"
+#line 10931 "BatchImport.c"
 }
 
 
@@ -10849,42 +10942,42 @@ gchar* file_to_prepare_get_basename (FileToPrepare* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
 	GFile* _tmp1_;
-#line 1433 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), NULL);
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10852 "BatchImport.c"
+#line 10945 "BatchImport.c"
 		GFile* _tmp2_;
 		gchar* _tmp3_;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_get_basename (_tmp2_);
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 10863 "BatchImport.c"
+#line 10956 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_;
 		gchar* _tmp5_;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_get_basename (_tmp4_);
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp0_);
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 10875 "BatchImport.c"
+#line 10968 "BatchImport.c"
 	}
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1434 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1451 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10881 "BatchImport.c"
+#line 10974 "BatchImport.c"
 }
 
 
@@ -10892,252 +10985,252 @@ gboolean file_to_prepare_is_directory (FileToPrepare* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
-#line 1437 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (self), FALSE);
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->file;
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 10895 "BatchImport.c"
+#line 10988 "BatchImport.c"
 		GFile* _tmp2_;
 		GFileType _tmp3_;
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->file;
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = g_file_query_file_type (_tmp2_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_ == G_FILE_TYPE_DIRECTORY;
-#line 10904 "BatchImport.c"
+#line 10997 "BatchImport.c"
 	} else {
 		BatchImportJob* _tmp4_;
 		gboolean _tmp5_;
-#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->job;
-#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = batch_import_job_is_directory (_tmp4_);
-#line 1439 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1456 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 10914 "BatchImport.c"
+#line 11007 "BatchImport.c"
 	}
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp0_;
-#line 1438 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 10920 "BatchImport.c"
+#line 11013 "BatchImport.c"
 }
 
 
 static void value_file_to_prepare_init (GValue* value) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 10927 "BatchImport.c"
+#line 11020 "BatchImport.c"
 }
 
 
 static void value_file_to_prepare_free_value (GValue* value) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (value->data[0].v_pointer);
-#line 10936 "BatchImport.c"
+#line 11029 "BatchImport.c"
 	}
 }
 
 
 static void value_file_to_prepare_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = file_to_prepare_ref (src_value->data[0].v_pointer);
-#line 10946 "BatchImport.c"
+#line 11039 "BatchImport.c"
 	} else {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10950 "BatchImport.c"
+#line 11043 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_file_to_prepare_peek_pointer (const GValue* value) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 10958 "BatchImport.c"
+#line 11051 "BatchImport.c"
 }
 
 
 static gchar* value_file_to_prepare_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 10965 "BatchImport.c"
+#line 11058 "BatchImport.c"
 		FileToPrepare * object;
 		object = collect_values[0].v_pointer;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10972 "BatchImport.c"
+#line 11065 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.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 10976 "BatchImport.c"
+#line 11069 "BatchImport.c"
 		}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = file_to_prepare_ref (object);
-#line 10980 "BatchImport.c"
+#line 11073 "BatchImport.c"
 	} else {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 10984 "BatchImport.c"
+#line 11077 "BatchImport.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 10988 "BatchImport.c"
+#line 11081 "BatchImport.c"
 }
 
 
 static gchar* value_file_to_prepare_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	FileToPrepare ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10999 "BatchImport.c"
+#line 11092 "BatchImport.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 11005 "BatchImport.c"
+#line 11098 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11009 "BatchImport.c"
+#line 11102 "BatchImport.c"
 	} else {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = file_to_prepare_ref (value->data[0].v_pointer);
-#line 11013 "BatchImport.c"
+#line 11106 "BatchImport.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 11017 "BatchImport.c"
+#line 11110 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_file_to_prepare (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecFileToPrepare* spec;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_FILE_TO_PREPARE), NULL);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 11031 "BatchImport.c"
+#line 11124 "BatchImport.c"
 }
 
 
 gpointer value_get_file_to_prepare (const GValue* value) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE), NULL);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 11040 "BatchImport.c"
+#line 11133 "BatchImport.c"
 }
 
 
 void value_set_file_to_prepare (GValue* value, gpointer v_object) {
 	FileToPrepare * old;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_ref (value->data[0].v_pointer);
-#line 11060 "BatchImport.c"
+#line 11153 "BatchImport.c"
 	} else {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11064 "BatchImport.c"
+#line 11157 "BatchImport.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11070 "BatchImport.c"
+#line 11163 "BatchImport.c"
 	}
 }
 
 
 void value_take_file_to_prepare (GValue* value, gpointer v_object) {
 	FileToPrepare * old;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FILE_TO_PREPARE));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FILE_TO_PREPARE));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 11089 "BatchImport.c"
+#line 11182 "BatchImport.c"
 	} else {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 11093 "BatchImport.c"
+#line 11186 "BatchImport.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_to_prepare_unref (old);
-#line 11099 "BatchImport.c"
+#line 11192 "BatchImport.c"
 	}
 }
 
 
 static void file_to_prepare_class_init (FileToPrepareClass * klass) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_to_prepare_parent_class = g_type_class_peek_parent (klass);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((FileToPrepareClass *) klass)->finalize = file_to_prepare_finalize;
-#line 11109 "BatchImport.c"
+#line 11202 "BatchImport.c"
 }
 
 
 static void file_to_prepare_instance_init (FileToPrepare * self) {
-#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated = NULL;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 11118 "BatchImport.c"
+#line 11211 "BatchImport.c"
 }
 
 
 static void file_to_prepare_finalize (FileToPrepare * obj) {
 	FileToPrepare * self;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FILE_TO_PREPARE, FileToPrepare);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1409 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1426 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1410 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1427 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1412 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1429 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (self->associated);
-#line 11134 "BatchImport.c"
+#line 11227 "BatchImport.c"
 }
 
 
@@ -11158,24 +11251,24 @@ GType file_to_prepare_get_type (void) {
 gpointer file_to_prepare_ref (gpointer instance) {
 	FileToPrepare * self;
 	self = instance;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 11159 "BatchImport.c"
+#line 11252 "BatchImport.c"
 }
 
 
 void file_to_prepare_unref (gpointer instance) {
 	FileToPrepare * self;
 	self = instance;
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		FILE_TO_PREPARE_GET_CLASS (self)->finalize (self);
-#line 1408 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1425 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11172 "BatchImport.c"
+#line 11265 "BatchImport.c"
 	}
 }
 
@@ -11192,54 +11285,54 @@ WorkSniffer* work_sniffer_construct (GType object_type, BatchImport* owner, GeeI
 	GeeIterable* _tmp5_;
 	GeeHashSet* _tmp6_;
 	GeeHashSet* _tmp7_;
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ITERABLE (jobs), NULL);
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((skipset == NULL) || GEE_IS_HASH_SET (skipset), NULL);
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1452 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1469 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (WorkSniffer*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = jobs;
-#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 1454 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->jobs = _tmp5_;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = skipset;
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
-#line 1455 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skipset = _tmp7_;
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 11229 "BatchImport.c"
+#line 11322 "BatchImport.c"
 }
 
 
 WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, GeeHashSet* skipset) {
-#line 1450 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1467 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return work_sniffer_construct (TYPE_WORK_SNIFFER, owner, jobs, callback, callback_target, cancellable, cancellation, cancellation_target, skipset);
-#line 11236 "BatchImport.c"
+#line 11329 "BatchImport.c"
 }
 
 
@@ -11256,54 +11349,54 @@ static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
 	gchar* sb = NULL;
 	gchar* _tmp5_;
 	gint _tmp6_;
-#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (a), 0);
-#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (b), 0);
-#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = a;
-#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_FILE_TO_PREPARE, FileToPrepare));
-#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_a = _tmp1_;
-#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = b;
-#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _file_to_prepare_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FILE_TO_PREPARE, FileToPrepare));
-#line 1492 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1509 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_b = _tmp3_;
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = file_to_prepare_get_path (file_a);
-#line 1493 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1510 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sa = _tmp4_;
-#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = file_to_prepare_get_path (file_b);
-#line 1494 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sb = _tmp5_;
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = utf8_cs_compare (sa, sb);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp6_;
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (sb);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (sa);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (file_b);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_file_to_prepare_unref0 (file_a);
-#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11291 "BatchImport.c"
+#line 11384 "BatchImport.c"
 }
 
 
 static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
-#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 11300 "BatchImport.c"
+#line 11393 "BatchImport.c"
 }
 
 
@@ -11313,22 +11406,22 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 	GeeArrayList* _tmp26_;
 	GeeList* _tmp42_;
 	GError * _inner_error_ = NULL;
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 11312 "BatchImport.c"
+#line 11405 "BatchImport.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeIterable* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = self->priv->jobs;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_job_it = _tmp1_;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11325 "BatchImport.c"
+#line 11418 "BatchImport.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			BatchImportJob* job = NULL;
@@ -11338,31 +11431,31 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			ImportResult _tmp6_;
 			ImportResult _tmp7_;
 			gboolean _tmp25_;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _job_it;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp3_) {
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11343 "BatchImport.c"
+#line 11436 "BatchImport.c"
 			}
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = _job_it;
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			job = (BatchImportJob*) _tmp5_;
-#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1463 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1480 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp6_;
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _result_;
-#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1481 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp7_ != IMPORT_RESULT_SUCCESS) {
-#line 11359 "BatchImport.c"
+#line 11452 "BatchImport.c"
 				BatchImportJob* _tmp8_;
 				BatchImportJob* _tmp9_;
 				gchar* _tmp10_;
@@ -11371,48 +11464,48 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				gchar* _tmp13_;
 				gchar* _tmp14_;
 				ImportResult _tmp15_;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp8_ = job;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp9_ = job;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp10_ = batch_import_job_get_source_identifier (_tmp9_);
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp11_ = _tmp10_;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp12_ = job;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp13_ = batch_import_job_get_dest_identifier (_tmp12_);
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp14_ = _tmp13_;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = _result_;
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp8_, NULL, _tmp11_, _tmp14_, _tmp15_);
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp14_);
-#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1482 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp11_);
-#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1468 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 11394 "BatchImport.c"
+#line 11487 "BatchImport.c"
 			}
 			{
 				BatchImportJob* _tmp16_;
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = job;
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				work_sniffer_sniff_job (self, _tmp16_, &_inner_error_);
-#line 1472 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1489 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11404 "BatchImport.c"
-					goto __catch414_g_error;
+#line 11497 "BatchImport.c"
+					goto __catch426_g_error;
 				}
 			}
-			goto __finally414;
-			__catch414_g_error:
+			goto __finally426;
+			__catch426_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp17_;
@@ -11423,74 +11516,74 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				gchar* _tmp22_;
 				gchar* _tmp23_;
 				GError* _tmp24_;
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = job;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = job;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = batch_import_job_get_source_identifier (_tmp18_);
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _tmp19_;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = job;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = batch_import_job_get_dest_identifier (_tmp21_);
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = _tmp22_;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = err;
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp17_, NULL, _tmp20_, _tmp23_, _tmp24_, IMPORT_RESULT_FILE_ERROR);
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp23_);
-#line 1474 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1491 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp20_);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 11448 "BatchImport.c"
+#line 11541 "BatchImport.c"
 			}
-			__finally414:
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally426:
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_job_it);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_clear_error (&_inner_error_);
-#line 1471 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 11463 "BatchImport.c"
+#line 11556 "BatchImport.c"
 			}
-#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1478 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1495 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp25_) {
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_job_unref0 (job);
-#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1496 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11473 "BatchImport.c"
+#line 11566 "BatchImport.c"
 			}
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 11477 "BatchImport.c"
+#line 11570 "BatchImport.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1479 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_job_it);
-#line 11481 "BatchImport.c"
+#line 11574 "BatchImport.c"
 	}
-#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
-#line 1485 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	sorted = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_LIST, GeeList);
-#line 11487 "BatchImport.c"
+#line 11580 "BatchImport.c"
 	{
 		GeeList* _ftp_list = NULL;
 		GeeList* _tmp27_;
@@ -11500,25 +11593,25 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 		gint _tmp30_;
 		gint _tmp31_;
 		gint _ftp_index = 0;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = self->files_to_prepare;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_list = _tmp28_;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp29_ = _ftp_list;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = _tmp30_;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_size = _tmp31_;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ftp_index = -1;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 11515 "BatchImport.c"
+#line 11608 "BatchImport.c"
 			gint _tmp32_;
 			gint _tmp33_;
 			gint _tmp34_;
@@ -11528,70 +11621,70 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 			gpointer _tmp37_;
 			FileToPrepare* _tmp38_;
 			gboolean _tmp39_;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = _ftp_index;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_ftp_index = _tmp32_ + 1;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = _ftp_index;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _ftp_size;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp33_ < _tmp34_)) {
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 11537 "BatchImport.c"
+#line 11630 "BatchImport.c"
 			}
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp35_ = _ftp_list;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = _ftp_index;
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp37_ = gee_list_get (_tmp35_, _tmp36_);
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			ftp = (FileToPrepare*) _tmp37_;
-#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = ftp;
-#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = file_to_prepare_is_directory (_tmp38_);
-#line 1487 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1504 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!_tmp39_) {
-#line 11553 "BatchImport.c"
+#line 11646 "BatchImport.c"
 				GeeList* _tmp40_;
 				FileToPrepare* _tmp41_;
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp40_ = sorted;
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = ftp;
-#line 1488 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_COLLECTION, GeeCollection), _tmp41_);
-#line 11562 "BatchImport.c"
+#line 11655 "BatchImport.c"
 			}
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (ftp);
-#line 11566 "BatchImport.c"
+#line 11659 "BatchImport.c"
 		}
-#line 1486 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_ftp_list);
-#line 11570 "BatchImport.c"
+#line 11663 "BatchImport.c"
 	}
-#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp42_ = sorted;
-#line 1490 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1507 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
-#line 11576 "BatchImport.c"
+#line 11669 "BatchImport.c"
 	{
 		gint i = 0;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		i = 0;
-#line 11581 "BatchImport.c"
+#line 11674 "BatchImport.c"
 		{
 			gboolean _tmp43_ = FALSE;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = TRUE;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			while (TRUE) {
-#line 11588 "BatchImport.c"
+#line 11681 "BatchImport.c"
 				gint _tmp45_;
 				GeeList* _tmp46_;
 				gint _tmp47_;
@@ -11614,127 +11707,127 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				const gchar* _tmp61_;
 				gboolean _tmp62_;
 				gboolean _tmp63_;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!_tmp43_) {
-#line 11613 "BatchImport.c"
+#line 11706 "BatchImport.c"
 					gint _tmp44_;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp44_ = i;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					i = _tmp44_ + 1;
-#line 11619 "BatchImport.c"
+#line 11712 "BatchImport.c"
 				}
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp43_ = FALSE;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp45_ = i;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = sorted;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp47_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp48_ = _tmp47_;
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!(_tmp45_ < _tmp48_)) {
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					break;
-#line 11635 "BatchImport.c"
+#line 11728 "BatchImport.c"
 				}
-#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp49_ = sorted;
-#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp50_ = i;
-#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = gee_list_get (_tmp49_, _tmp50_);
-#line 1502 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1519 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				ftp = (FileToPrepare*) _tmp51_;
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_ = ftp;
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp53_ = file_to_prepare_get_basename (_tmp52_);
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp54_ = _tmp53_;
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				disassemble_filename (_tmp54_, &_tmp55_, &_tmp56_);
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				name = _tmp55_;
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (ext);
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				ext = _tmp56_;
-#line 1503 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1520 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp54_);
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp57_ = ext;
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp58_ = is_string_empty (_tmp57_);
-#line 1505 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1522 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp58_) {
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (ftp);
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (ext);
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (name);
-#line 1506 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1523 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 11677 "BatchImport.c"
+#line 11770 "BatchImport.c"
 				}
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp59_ = raw_file_format_properties_get_instance ();
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp60_ = _tmp59_;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp61_ = ext;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp61_);
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = _tmp62_;
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_photo_file_format_properties_unref0 (_tmp60_);
-#line 1508 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1525 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (_tmp63_) {
-#line 11693 "BatchImport.c"
+#line 11786 "BatchImport.c"
 					gboolean _tmp64_ = FALSE;
 					gint _tmp65_;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp65_ = i;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp65_ > 0) {
-#line 11700 "BatchImport.c"
+#line 11793 "BatchImport.c"
 						FileToPrepare* _tmp66_;
 						GeeList* _tmp67_;
 						gint _tmp68_;
 						gpointer _tmp69_;
 						FileToPrepare* _tmp70_;
 						gboolean _tmp71_;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp66_ = ftp;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp67_ = sorted;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp68_ = i;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp69_ = gee_list_get (_tmp67_, _tmp68_ - 1);
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp70_ = (FileToPrepare*) _tmp69_;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp71_ = work_sniffer_is_paired (self, _tmp66_, _tmp70_);
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp64_ = _tmp71_;
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (_tmp70_);
-#line 11723 "BatchImport.c"
+#line 11816 "BatchImport.c"
 					} else {
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp64_ = FALSE;
-#line 11727 "BatchImport.c"
+#line 11820 "BatchImport.c"
 					}
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (_tmp64_) {
-#line 11731 "BatchImport.c"
+#line 11824 "BatchImport.c"
 						FileToPrepare* associated_file = NULL;
 						GeeList* _tmp72_;
 						gint _tmp73_;
@@ -11743,77 +11836,77 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 						FileToPrepare* _tmp76_;
 						FileToPrepare* _tmp77_;
 						FileToPrepare* _tmp78_;
-#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp72_ = sorted;
-#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp73_ = i;
-#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp74_ = gee_list_get (_tmp72_, _tmp73_ - 1);
-#line 1512 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						associated_file = (FileToPrepare*) _tmp74_;
-#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp75_ = self->files_to_prepare;
-#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp76_ = associated_file;
-#line 1513 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1530 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection), _tmp76_);
-#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp77_ = ftp;
-#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp78_ = associated_file;
-#line 1514 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1531 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						file_to_prepare_set_associated (_tmp77_, _tmp78_);
-#line 1511 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_file_to_prepare_unref0 (associated_file);
-#line 11762 "BatchImport.c"
+#line 11855 "BatchImport.c"
 					} else {
 						gboolean _tmp79_ = FALSE;
 						gint _tmp80_;
 						GeeList* _tmp81_;
 						gint _tmp82_;
 						gint _tmp83_;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp80_ = i;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp81_ = sorted;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						_tmp83_ = _tmp82_;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp80_ < (_tmp83_ - 1)) {
-#line 11779 "BatchImport.c"
+#line 11872 "BatchImport.c"
 							FileToPrepare* _tmp84_;
 							GeeList* _tmp85_;
 							gint _tmp86_;
 							gpointer _tmp87_;
 							FileToPrepare* _tmp88_;
 							gboolean _tmp89_;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp84_ = ftp;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp85_ = sorted;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp86_ = i;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp87_ = gee_list_get (_tmp85_, _tmp86_ + 1);
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp88_ = (FileToPrepare*) _tmp87_;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp89_ = work_sniffer_is_paired (self, _tmp84_, _tmp88_);
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp79_ = _tmp89_;
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (_tmp88_);
-#line 11802 "BatchImport.c"
+#line 11895 "BatchImport.c"
 						} else {
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp79_ = FALSE;
-#line 11806 "BatchImport.c"
+#line 11899 "BatchImport.c"
 						}
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						if (_tmp79_) {
-#line 11810 "BatchImport.c"
+#line 11903 "BatchImport.c"
 							FileToPrepare* associated_file = NULL;
 							GeeList* _tmp90_;
 							gint _tmp91_;
@@ -11822,45 +11915,45 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 							FileToPrepare* _tmp94_;
 							FileToPrepare* _tmp95_;
 							FileToPrepare* _tmp96_;
-#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp90_ = sorted;
-#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp91_ = i;
-#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp92_ = gee_list_get (_tmp90_, _tmp91_ + 1);
-#line 1516 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1533 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							associated_file = (FileToPrepare*) _tmp92_;
-#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp93_ = self->files_to_prepare;
-#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp94_ = associated_file;
-#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_COLLECTION, GeeCollection), _tmp94_);
-#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp95_ = ftp;
-#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_tmp96_ = associated_file;
-#line 1518 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							file_to_prepare_set_associated (_tmp95_, _tmp96_);
-#line 1515 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
 							_file_to_prepare_unref0 (associated_file);
-#line 11841 "BatchImport.c"
+#line 11934 "BatchImport.c"
 						}
 					}
 				}
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_file_to_prepare_unref0 (ftp);
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (ext);
-#line 1500 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1517 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (name);
-#line 11851 "BatchImport.c"
+#line 11944 "BatchImport.c"
 			}
 		}
 	}
-#line 1458 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1475 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (sorted);
-#line 11857 "BatchImport.c"
+#line 11950 "BatchImport.c"
 }
 
 
@@ -11894,119 +11987,119 @@ static gboolean work_sniffer_is_paired (WorkSniffer* self, FileToPrepare* raw, F
 	gchar* _tmp21_ = NULL;
 	const gchar* _tmp22_;
 	const gchar* _tmp23_;
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_WORK_SNIFFER (self), FALSE);
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (raw), FALSE);
-#line 1527 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1544 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_FILE_TO_PREPARE (maybe_paired), FALSE);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = raw;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = file_to_prepare_get_parent_path (_tmp0_);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = _tmp1_;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = maybe_paired;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = file_to_prepare_get_parent_path (_tmp3_);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = g_strcmp0 (_tmp2_, _tmp5_) != 0;
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp5_);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp2_);
-#line 1528 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_) {
-#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1529 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 11921 "BatchImport.c"
+#line 12014 "BatchImport.c"
 	}
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = maybe_paired;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = file_to_prepare_get_basename (_tmp7_);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _tmp8_;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	disassemble_filename (_tmp9_, &_tmp10_, &_tmp11_);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_name);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	test_name = _tmp10_;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	test_ext = _tmp11_;
-#line 1532 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp9_);
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = jfif_file_format_properties_get_instance ();
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _tmp12_;
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = test_ext;
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = photo_file_format_properties_is_recognized_extension (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties), _tmp14_);
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = !_tmp15_;
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_file_format_properties_unref0 (_tmp13_);
-#line 1534 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1551 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp16_) {
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (test_ext);
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (test_name);
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (ext);
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (name);
-#line 1535 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1552 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 11967 "BatchImport.c"
+#line 12060 "BatchImport.c"
 	}
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = raw;
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = file_to_prepare_get_basename (_tmp17_);
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_;
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	disassemble_filename (_tmp19_, &_tmp20_, &_tmp21_);
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (name);
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	name = _tmp20_;
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (ext);
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	ext = _tmp21_;
-#line 1537 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp19_);
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = name;
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = test_name;
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_ext);
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (test_name);
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (ext);
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (name);
-#line 1539 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 12003 "BatchImport.c"
+#line 12096 "BatchImport.c"
 }
 
 
@@ -12022,44 +12115,44 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 	BatchImportJob* _tmp7_;
 	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_WORK_SNIFFER (self));
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = batch_import_job_determine_file_size (_tmp0_, &_tmp1_, &_tmp2_);
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	size = _tmp1_;
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_or_dir = _tmp2_;
-#line 1545 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	determined_size = _tmp3_;
-#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = determined_size;
-#line 1546 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 12039 "BatchImport.c"
+#line 12132 "BatchImport.c"
 		guint64 _tmp5_;
 		guint64 _tmp6_;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->total_bytes;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = size;
-#line 1547 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1564 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		self->total_bytes = _tmp5_ + _tmp6_;
-#line 12048 "BatchImport.c"
+#line 12141 "BatchImport.c"
 	}
-#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = job;
-#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = batch_import_job_is_directory (_tmp7_);
-#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp8_) {
-#line 12056 "BatchImport.c"
+#line 12149 "BatchImport.c"
 		GFile* dir = NULL;
 		gboolean copy_to_library = FALSE;
 		gboolean _tmp9_ = FALSE;
@@ -12069,33 +12162,33 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 		gboolean _tmp13_;
 		GFile* _tmp21_;
 		gboolean _tmp22_;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = job;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = batch_import_job_prepare (_tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dir = _tmp11_;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		copy_to_library = _tmp12_;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = _tmp13_;
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12088 "BatchImport.c"
+#line 12181 "BatchImport.c"
 		}
-#line 1554 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp9_) {
-#line 12092 "BatchImport.c"
+#line 12185 "BatchImport.c"
 			BatchImportJob* _tmp14_;
 			BatchImportJob* _tmp15_;
 			gchar* _tmp16_;
@@ -12103,266 +12196,272 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			BatchImportJob* _tmp18_;
 			gchar* _tmp19_;
 			gchar* _tmp20_;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = job;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = job;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp16_ = batch_import_job_get_source_identifier (_tmp15_);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp17_ = _tmp16_;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp18_ = job;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp20_ = _tmp19_;
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp14_, NULL, _tmp17_, _tmp20_, IMPORT_RESULT_FILE_ERROR);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp20_);
-#line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1572 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp17_);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1558 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12126 "BatchImport.c"
+#line 12219 "BatchImport.c"
 		}
-#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = dir;
-#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = query_is_directory (_tmp21_);
-#line 1560 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1577 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp22_, "query_is_directory(dir)");
-#line 12134 "BatchImport.c"
+#line 12227 "BatchImport.c"
 		{
 			BatchImportJob* _tmp23_;
 			GFile* _tmp24_;
 			gboolean _tmp25_;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			BatchImportJob* _tmp26_;
+			gboolean _tmp27_;
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp23_ = job;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp24_ = dir;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp25_ = copy_to_library;
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp26_ = job;
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp27_ = batch_import_job_recurse (_tmp26_);
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			work_sniffer_search_dir (self, _tmp23_, _tmp24_, _tmp25_, _tmp27_, &_inner_error_);
+#line 1580 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12149 "BatchImport.c"
-				goto __catch415_g_error;
+#line 12248 "BatchImport.c"
+				goto __catch427_g_error;
 			}
 		}
-		goto __finally415;
-		__catch415_g_error:
+		goto __finally427;
+		__catch427_g_error:
 		{
 			GError* err = NULL;
-			BatchImportJob* _tmp26_;
-			GFile* _tmp27_;
 			BatchImportJob* _tmp28_;
-			gchar* _tmp29_;
-			gchar* _tmp30_;
-			GFile* _tmp31_;
+			GFile* _tmp29_;
+			BatchImportJob* _tmp30_;
+			gchar* _tmp31_;
 			gchar* _tmp32_;
-			gchar* _tmp33_;
-			GError* _tmp34_;
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp33_;
+			gchar* _tmp34_;
+			gchar* _tmp35_;
+			GError* _tmp36_;
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp26_ = job;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp27_ = dir;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp28_ = job;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp29_ = batch_import_job_get_source_identifier (_tmp28_);
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp30_ = _tmp29_;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp31_ = dir;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp32_ = g_file_get_path (_tmp31_);
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = _tmp32_;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp34_ = err;
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR);
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp33_);
-#line 1565 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp30_);
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp29_ = dir;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp30_ = job;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp31_ = batch_import_job_get_source_identifier (_tmp30_);
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp32_ = _tmp31_;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp33_ = dir;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp34_ = g_file_get_path (_tmp33_);
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp35_ = _tmp34_;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp36_ = err;
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp28_, _tmp29_, _tmp32_, _tmp35_, _tmp36_, IMPORT_RESULT_FILE_ERROR);
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_free0 (_tmp35_);
+#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_free0 (_tmp32_);
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 12196 "BatchImport.c"
+#line 12295 "BatchImport.c"
 		}
-		__finally415:
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally427:
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (dir);
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1562 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1579 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12209 "BatchImport.c"
+#line 12308 "BatchImport.c"
 		}
-#line 1549 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1566 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (dir);
-#line 12213 "BatchImport.c"
+#line 12312 "BatchImport.c"
 	} else {
-		gboolean _tmp35_;
-		gboolean _tmp43_ = FALSE;
-		gboolean _tmp44_ = FALSE;
-		GFile* _tmp45_;
-		GeeList* _tmp50_;
-		BatchImportJob* _tmp51_;
-		FileToPrepare* _tmp52_;
-		FileToPrepare* _tmp53_;
-#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp35_ = determined_size;
-#line 1570 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (!_tmp35_) {
-#line 12227 "BatchImport.c"
-			guint64 _tmp36_ = 0ULL;
-			GFile* _tmp37_;
-			GCancellable* _tmp38_;
-			GCancellable* _tmp39_;
-			guint64 _tmp40_;
-			guint64 _tmp41_;
+		gboolean _tmp37_;
+		gboolean _tmp45_ = FALSE;
+		gboolean _tmp46_ = FALSE;
+		GFile* _tmp47_;
+		GeeList* _tmp52_;
+		BatchImportJob* _tmp53_;
+		FileToPrepare* _tmp54_;
+		FileToPrepare* _tmp55_;
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp37_ = determined_size;
+#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		if (!_tmp37_) {
+#line 12326 "BatchImport.c"
+			guint64 _tmp38_ = 0ULL;
+			GFile* _tmp39_;
+			GCancellable* _tmp40_;
+			GCancellable* _tmp41_;
 			guint64 _tmp42_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp37_ = file_or_dir;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp38_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp39_ = _tmp38_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp40_ = query_total_file_size (_tmp37_, _tmp39_, &_inner_error_);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			guint64 _tmp43_;
+			guint64 _tmp44_;
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp39_ = file_or_dir;
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp40_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _tmp40_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_object_unref0 (_tmp39_);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp36_ = _tmp41_;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp42_ = query_total_file_size (_tmp39_, _tmp41_, &_inner_error_);
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp43_ = _tmp42_;
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_object_unref0 (_tmp41_);
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp38_ = _tmp43_;
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (file_or_dir);
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12257 "BatchImport.c"
+#line 12356 "BatchImport.c"
 			}
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp42_ = self->total_bytes;
-#line 1571 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			self->total_bytes = _tmp42_ + _tmp36_;
-#line 12263 "BatchImport.c"
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp44_ = self->total_bytes;
+#line 1588 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			self->total_bytes = _tmp44_ + _tmp38_;
+#line 12362 "BatchImport.c"
 		}
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp45_ = file_or_dir;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp45_ != NULL) {
-#line 12269 "BatchImport.c"
-			GeeHashSet* _tmp46_;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp46_ = self->priv->skipset;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = _tmp46_ != NULL;
-#line 12275 "BatchImport.c"
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp47_ = file_or_dir;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		if (_tmp47_ != NULL) {
+#line 12368 "BatchImport.c"
+			GeeHashSet* _tmp48_;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp48_ = self->priv->skipset;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp46_ = _tmp48_ != NULL;
+#line 12374 "BatchImport.c"
 		} else {
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp44_ = FALSE;
-#line 12279 "BatchImport.c"
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp46_ = FALSE;
+#line 12378 "BatchImport.c"
 		}
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp44_) {
-#line 12283 "BatchImport.c"
-			GeeHashSet* _tmp47_;
-			GFile* _tmp48_;
-			gboolean _tmp49_;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp47_ = self->priv->skipset;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp48_ = file_or_dir;
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp49_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp48_);
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = _tmp49_;
-#line 12295 "BatchImport.c"
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		if (_tmp46_) {
+#line 12382 "BatchImport.c"
+			GeeHashSet* _tmp49_;
+			GFile* _tmp50_;
+			gboolean _tmp51_;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp49_ = self->priv->skipset;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp50_ = file_or_dir;
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp51_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_);
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp45_ = _tmp51_;
+#line 12394 "BatchImport.c"
 		} else {
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp43_ = FALSE;
-#line 12299 "BatchImport.c"
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp45_ = FALSE;
+#line 12398 "BatchImport.c"
 		}
-#line 1574 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		if (_tmp43_) {
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1591 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		if (_tmp45_) {
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file_or_dir);
-#line 1575 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12307 "BatchImport.c"
+#line 12406 "BatchImport.c"
 		}
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp50_ = self->files_to_prepare;
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp51_ = job;
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp52_ = file_to_prepare_new (_tmp51_, NULL, TRUE);
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp53_ = _tmp52_;
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
-#line 1578 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_file_to_prepare_unref0 (_tmp53_);
-#line 12321 "BatchImport.c"
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp52_ = self->files_to_prepare;
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp53_ = job;
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp54_ = file_to_prepare_new (_tmp53_, NULL, TRUE);
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp55_ = _tmp54_;
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
+#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_file_to_prepare_unref0 (_tmp55_);
+#line 12420 "BatchImport.c"
 	}
-#line 1542 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1559 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (file_or_dir);
-#line 12325 "BatchImport.c"
+#line 12424 "BatchImport.c"
 }
 
 
-void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, GError** error) {
+void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir, gboolean copy_to_library, gboolean recurse, GError** error) {
 	GFileEnumerator* enumerator = NULL;
 	GFile* _tmp0_;
 	GFileEnumerator* _tmp1_;
 	GFileInfo* info = NULL;
 	GError * _inner_error_ = NULL;
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_WORK_SNIFFER (self));
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_JOB (job));
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_IS_FILE (dir));
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = dir;
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_file_enumerate_children (_tmp0_, "standard::*", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	enumerator = _tmp1_;
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1583 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 12353 "BatchImport.c"
+#line 12452 "BatchImport.c"
 	}
-#line 1586 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1603 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	info = NULL;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	while (TRUE) {
-#line 12359 "BatchImport.c"
+#line 12458 "BatchImport.c"
 		GFileInfo* _tmp2_ = NULL;
 		GFileEnumerator* _tmp3_;
 		GCancellable* _tmp4_;
@@ -12381,380 +12480,396 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 		GFileInfo* _tmp15_;
 		GFileType _tmp16_;
 		GFileType _tmp17_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = enumerator;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = g_file_enumerator_next_file (_tmp3_, _tmp5_, &_inner_error_);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = _tmp7_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (info);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (enumerator);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 12402 "BatchImport.c"
+#line 12501 "BatchImport.c"
 		}
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp2_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (info);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		info = _tmp8_;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = info;
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!(_tmp9_ != NULL)) {
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp2_);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12420 "BatchImport.c"
+#line 12519 "BatchImport.c"
 		}
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = background_job_is_cancelled (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1589 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp10_) {
-#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp2_);
-#line 1590 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			break;
-#line 12430 "BatchImport.c"
+#line 12529 "BatchImport.c"
 		}
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp11_ = dir;
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = info;
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = g_file_info_get_name (_tmp12_);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = g_file_get_child (_tmp11_, _tmp13_);
-#line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		child = _tmp14_;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = info;
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = g_file_info_get_file_type (_tmp15_);
-#line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		file_type = _tmp16_;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = file_type;
-#line 1595 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp17_ == G_FILE_TYPE_DIRECTORY) {
-#line 12452 "BatchImport.c"
-			GFileInfo* _tmp18_;
-			const gchar* _tmp19_;
-			gboolean _tmp20_;
-#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp18_ = info;
-#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp19_ = g_file_info_get_name (_tmp18_);
-#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp20_ = g_str_has_prefix (_tmp19_, ".");
-#line 1596 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp20_) {
-#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 12551 "BatchImport.c"
+			gboolean _tmp18_;
+			GFileInfo* _tmp19_;
+			const gchar* _tmp20_;
+			gboolean _tmp21_;
+#line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp18_ = recurse;
+#line 1613 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			if (!_tmp18_) {
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_object_unref0 (child);
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_object_unref0 (_tmp2_);
+#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				continue;
+#line 12566 "BatchImport.c"
+			}
+#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp19_ = info;
+#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp20_ = g_file_info_get_name (_tmp19_);
+#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp21_ = g_str_has_prefix (_tmp20_, ".");
+#line 1616 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			if (_tmp21_) {
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
-#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp2_);
-#line 1597 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 12470 "BatchImport.c"
+#line 12582 "BatchImport.c"
 			}
 			{
-				BatchImportJob* _tmp21_;
-				GFile* _tmp22_;
-				gboolean _tmp23_;
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp21_ = job;
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp22_ = child;
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp23_ = copy_to_library;
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				work_sniffer_search_dir (self, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
-#line 1600 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				BatchImportJob* _tmp22_;
+				GFile* _tmp23_;
+				gboolean _tmp24_;
+				gboolean _tmp25_;
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp22_ = job;
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp23_ = child;
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp24_ = copy_to_library;
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp25_ = recurse;
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				work_sniffer_search_dir (self, _tmp22_, _tmp23_, _tmp24_, _tmp25_, &_inner_error_);
+#line 1620 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12486 "BatchImport.c"
-					goto __catch416_g_error;
+#line 12601 "BatchImport.c"
+					goto __catch428_g_error;
 				}
 			}
-			goto __finally416;
-			__catch416_g_error:
+			goto __finally428;
+			__catch428_g_error:
 			{
 				GError* err = NULL;
-				BatchImportJob* _tmp24_;
-				GFile* _tmp25_;
-				GFile* _tmp26_;
-				gchar* _tmp27_;
-				gchar* _tmp28_;
-				GFile* _tmp29_;
+				BatchImportJob* _tmp26_;
+				GFile* _tmp27_;
+				GFile* _tmp28_;
+				gchar* _tmp29_;
 				gchar* _tmp30_;
-				gchar* _tmp31_;
-				GError* _tmp32_;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				GFile* _tmp31_;
+				gchar* _tmp32_;
+				gchar* _tmp33_;
+				GError* _tmp34_;
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				err = _inner_error_;
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_inner_error_ = NULL;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp24_ = job;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp25_ = child;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp26_ = child;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp27_ = g_file_get_path (_tmp26_);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp28_ = _tmp27_;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp29_ = child;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp30_ = g_file_get_path (_tmp29_);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp31_ = _tmp30_;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp32_ = err;
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp24_, _tmp25_, _tmp28_, _tmp31_, _tmp32_, IMPORT_RESULT_FILE_ERROR);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp31_);
-#line 1602 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp28_);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp26_ = job;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp27_ = child;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp28_ = child;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp29_ = g_file_get_path (_tmp28_);
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp30_ = _tmp29_;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp31_ = child;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp32_ = g_file_get_path (_tmp31_);
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp33_ = _tmp32_;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp34_ = err;
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp26_, _tmp27_, _tmp30_, _tmp33_, _tmp34_, IMPORT_RESULT_FILE_ERROR);
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp33_);
+#line 1622 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp30_);
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_error_free0 (err);
-#line 12533 "BatchImport.c"
+#line 12648 "BatchImport.c"
 			}
-			__finally416:
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			__finally428:
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (child);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp2_);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (info);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (enumerator);
-#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1619 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 12550 "BatchImport.c"
+#line 12665 "BatchImport.c"
 			}
 		} else {
-			GFileType _tmp33_;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp33_ = file_type;
-#line 1605 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp33_ == G_FILE_TYPE_REGULAR) {
-#line 12558 "BatchImport.c"
-				gboolean _tmp34_ = FALSE;
-				GeeHashSet* _tmp35_;
-				gboolean _tmp39_ = FALSE;
-				gboolean _tmp40_ = FALSE;
-				GFile* _tmp41_;
-				gboolean _tmp42_;
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp35_ = self->priv->skipset;
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp35_ != NULL) {
-#line 12569 "BatchImport.c"
-					GeeHashSet* _tmp36_;
-					GFile* _tmp37_;
-					gboolean _tmp38_;
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp36_ = self->priv->skipset;
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp37_ = child;
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp38_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp34_ = _tmp38_;
-#line 12581 "BatchImport.c"
+			GFileType _tmp35_;
+#line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp35_ = file_type;
+#line 1625 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			if (_tmp35_ == G_FILE_TYPE_REGULAR) {
+#line 12673 "BatchImport.c"
+				gboolean _tmp36_ = FALSE;
+				GeeHashSet* _tmp37_;
+				gboolean _tmp41_ = FALSE;
+				gboolean _tmp42_ = FALSE;
+				GFile* _tmp43_;
+				gboolean _tmp44_;
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp37_ = self->priv->skipset;
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (_tmp37_ != NULL) {
+#line 12684 "BatchImport.c"
+					GeeHashSet* _tmp38_;
+					GFile* _tmp39_;
+					gboolean _tmp40_;
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp38_ = self->priv->skipset;
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp39_ = child;
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp40_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp39_);
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp36_ = _tmp40_;
+#line 12696 "BatchImport.c"
 				} else {
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp34_ = FALSE;
-#line 12585 "BatchImport.c"
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp36_ = FALSE;
+#line 12700 "BatchImport.c"
 				}
-#line 1606 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp34_) {
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (_tmp36_) {
+#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp2_);
-#line 1607 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12595 "BatchImport.c"
-				}
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp41_ = child;
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp42_ = photo_is_file_image (_tmp41_);
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp42_) {
-#line 12603 "BatchImport.c"
-					GFile* _tmp43_;
-					gboolean _tmp44_;
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp43_ = child;
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp44_ = photo_file_format_is_file_supported (_tmp43_);
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp40_ = _tmp44_;
-#line 12612 "BatchImport.c"
-				} else {
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp40_ = FALSE;
-#line 12616 "BatchImport.c"
+#line 12710 "BatchImport.c"
 				}
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp40_) {
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp39_ = TRUE;
-#line 12622 "BatchImport.c"
-				} else {
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp43_ = child;
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp44_ = photo_is_file_image (_tmp43_);
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (_tmp44_) {
+#line 12718 "BatchImport.c"
 					GFile* _tmp45_;
 					gboolean _tmp46_;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp45_ = child;
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp46_ = video_reader_is_supported_video_file (_tmp45_);
-#line 1610 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp39_ = _tmp46_;
-#line 12632 "BatchImport.c"
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp46_ = photo_file_format_is_file_supported (_tmp45_);
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp42_ = _tmp46_;
+#line 12727 "BatchImport.c"
+				} else {
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp42_ = FALSE;
+#line 12731 "BatchImport.c"
 				}
-#line 1609 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				if (_tmp39_) {
-#line 12636 "BatchImport.c"
-					guint64 _tmp47_;
-					GFileInfo* _tmp48_;
-					gint64 _tmp49_;
-					GeeList* _tmp50_;
-					BatchImportJob* _tmp51_;
-					GFile* _tmp52_;
-					gboolean _tmp53_;
-					FileToPrepare* _tmp54_;
-					FileToPrepare* _tmp55_;
-#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp47_ = self->total_bytes;
-#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp48_ = info;
-#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp49_ = g_file_info_get_size (_tmp48_);
-#line 1611 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					self->total_bytes = _tmp47_ + _tmp49_;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp50_ = self->files_to_prepare;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp51_ = job;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp52_ = child;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp53_ = copy_to_library;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp54_ = file_to_prepare_new (_tmp51_, _tmp52_, _tmp53_);
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_tmp55_ = _tmp54_;
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp55_);
-#line 1612 "/home/jens/Source/shotwell/src/BatchImport.vala"
-					_file_to_prepare_unref0 (_tmp55_);
-#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (_tmp42_) {
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp41_ = TRUE;
+#line 12737 "BatchImport.c"
+				} else {
+					GFile* _tmp47_;
+					gboolean _tmp48_;
+#line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp47_ = child;
+#line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp48_ = video_reader_is_supported_video_file (_tmp47_);
+#line 1630 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp41_ = _tmp48_;
+#line 12747 "BatchImport.c"
+				}
+#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				if (_tmp41_) {
+#line 12751 "BatchImport.c"
+					guint64 _tmp49_;
+					GFileInfo* _tmp50_;
+					gint64 _tmp51_;
+					GeeList* _tmp52_;
+					BatchImportJob* _tmp53_;
+					GFile* _tmp54_;
+					gboolean _tmp55_;
+					FileToPrepare* _tmp56_;
+					FileToPrepare* _tmp57_;
+#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp49_ = self->total_bytes;
+#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp50_ = info;
+#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp51_ = g_file_info_get_size (_tmp50_);
+#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					self->total_bytes = _tmp49_ + _tmp51_;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp52_ = self->files_to_prepare;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp53_ = job;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp54_ = child;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp55_ = copy_to_library;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp56_ = file_to_prepare_new (_tmp53_, _tmp54_, _tmp55_);
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_tmp57_ = _tmp56_;
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp57_);
+#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+					_file_to_prepare_unref0 (_tmp57_);
+#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (child);
-#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp2_);
-#line 1614 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1634 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 12676 "BatchImport.c"
+#line 12791 "BatchImport.c"
 				}
 			} else {
-				GFile* _tmp56_;
-				gchar* _tmp57_;
-				gchar* _tmp58_;
-				GFileType _tmp59_;
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp56_ = child;
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp57_ = g_file_get_path (_tmp56_);
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58_ = _tmp57_;
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = file_type;
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				g_warning ("BatchImport.vala:1617: Ignoring import of %s file type %d", _tmp58_, (gint) _tmp59_);
-#line 1617 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (_tmp58_);
-#line 12695 "BatchImport.c"
+				GFile* _tmp58_;
+				gchar* _tmp59_;
+				gchar* _tmp60_;
+				GFileType _tmp61_;
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp58_ = child;
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp59_ = g_file_get_path (_tmp58_);
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp60_ = _tmp59_;
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_tmp61_ = file_type;
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				g_warning ("BatchImport.vala:1637: Ignoring import of %s file type %d", _tmp60_, (gint) _tmp61_);
+#line 1637 "/home/jens/Source/shotwell/src/BatchImport.vala"
+				_g_free0 (_tmp60_);
+#line 12810 "BatchImport.c"
 			}
 		}
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (child);
-#line 1587 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1604 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 12702 "BatchImport.c"
+#line 12817 "BatchImport.c"
 	}
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (info);
-#line 1582 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1599 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (enumerator);
-#line 12708 "BatchImport.c"
+#line 12823 "BatchImport.c"
 }
 
 
 static void work_sniffer_class_init (WorkSnifferClass * klass) {
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	work_sniffer_parent_class = g_type_class_peek_parent (klass);
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = work_sniffer_finalize;
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (WorkSnifferPrivate));
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) work_sniffer_real_execute;
-#line 12721 "BatchImport.c"
+#line 12836 "BatchImport.c"
 }
 
 
 static void work_sniffer_instance_init (WorkSniffer * self) {
 	GeeArrayList* _tmp0_;
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = WORK_SNIFFER_GET_PRIVATE (self);
-#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = gee_array_list_new (TYPE_FILE_TO_PREPARE, (GBoxedCopyFunc) file_to_prepare_ref, (GDestroyNotify) file_to_prepare_unref, NULL, NULL, NULL);
-#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->files_to_prepare = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1445 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1462 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->total_bytes = (guint64) 0;
-#line 12735 "BatchImport.c"
+#line 12850 "BatchImport.c"
 }
 
 
 static void work_sniffer_finalize (BackgroundJob * obj) {
 	WorkSniffer * self;
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WORK_SNIFFER, WorkSniffer);
-#line 1444 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1461 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->files_to_prepare);
-#line 1447 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->jobs);
-#line 1448 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->skipset);
-#line 1443 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1460 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (work_sniffer_parent_class)->finalize (obj);
-#line 12751 "BatchImport.c"
+#line 12866 "BatchImport.c"
 }
 
 
@@ -12792,334 +12907,334 @@ PreparedFile* prepared_file_construct (GType object_type, BatchImportJob* job, G
 	PhotoFileFormat _tmp17_;
 	guint64 _tmp18_;
 	gboolean _tmp19_;
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), NULL);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), NULL);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (dest_id != NULL, NULL);
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFile*) g_type_create_instance (object_type);
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = job;
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _batch_import_job_ref0 (_tmp0_);
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1641 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->job = _tmp1_;
-#line 1642 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1662 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->result = IMPORT_RESULT_SUCCESS;
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = file;
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1663 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file = _tmp3_;
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = associated_file;
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->associated_file);
-#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1664 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated_file = _tmp5_;
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = source_id;
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->source_id);
-#line 1645 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->source_id = _tmp7_;
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = dest_id;
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_id);
-#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1666 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->dest_id = _tmp9_;
-#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = copy_to_library;
-#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->copy_to_library = _tmp10_;
-#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = exif_md5;
-#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = g_strdup (_tmp11_);
-#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->exif_md5);
-#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1668 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->exif_md5 = _tmp12_;
-#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = thumbnail_md5;
-#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = g_strdup (_tmp13_);
-#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->thumbnail_md5);
-#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->thumbnail_md5 = _tmp14_;
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = full_md5;
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 1650 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1670 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->full_md5 = _tmp16_;
-#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = file_format;
-#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->file_format = _tmp17_;
-#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = filesize;
-#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1672 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->filesize = _tmp18_;
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = is_video;
-#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1673 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->is_video = _tmp19_;
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 12885 "BatchImport.c"
+#line 13000 "BatchImport.c"
 }
 
 
 PreparedFile* prepared_file_new (BatchImportJob* job, GFile* file, GFile* associated_file, const gchar* source_id, const gchar* dest_id, gboolean copy_to_library, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, PhotoFileFormat file_format, guint64 filesize, gboolean is_video) {
-#line 1638 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_construct (TYPE_PREPARED_FILE, job, file, associated_file, source_id, dest_id, copy_to_library, exif_md5, thumbnail_md5, full_md5, file_format, filesize, is_video);
-#line 12892 "BatchImport.c"
+#line 13007 "BatchImport.c"
 }
 
 
 static void value_prepared_file_init (GValue* value) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 12899 "BatchImport.c"
+#line 13014 "BatchImport.c"
 }
 
 
 static void value_prepared_file_free_value (GValue* value) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (value->data[0].v_pointer);
-#line 12908 "BatchImport.c"
+#line 13023 "BatchImport.c"
 	}
 }
 
 
 static void value_prepared_file_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = prepared_file_ref (src_value->data[0].v_pointer);
-#line 12918 "BatchImport.c"
+#line 13033 "BatchImport.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12922 "BatchImport.c"
+#line 13037 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_prepared_file_peek_pointer (const GValue* value) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 12930 "BatchImport.c"
+#line 13045 "BatchImport.c"
 }
 
 
 static gchar* value_prepared_file_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 12937 "BatchImport.c"
+#line 13052 "BatchImport.c"
 		PreparedFile * object;
 		object = collect_values[0].v_pointer;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12944 "BatchImport.c"
+#line 13059 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.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 12948 "BatchImport.c"
+#line 13063 "BatchImport.c"
 		}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = prepared_file_ref (object);
-#line 12952 "BatchImport.c"
+#line 13067 "BatchImport.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 12956 "BatchImport.c"
+#line 13071 "BatchImport.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 12960 "BatchImport.c"
+#line 13075 "BatchImport.c"
 }
 
 
 static gchar* value_prepared_file_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreparedFile ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12971 "BatchImport.c"
+#line 13086 "BatchImport.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 12977 "BatchImport.c"
+#line 13092 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12981 "BatchImport.c"
+#line 13096 "BatchImport.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = prepared_file_ref (value->data[0].v_pointer);
-#line 12985 "BatchImport.c"
+#line 13100 "BatchImport.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 12989 "BatchImport.c"
+#line 13104 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_prepared_file (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreparedFile* spec;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREPARED_FILE), NULL);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 13003 "BatchImport.c"
+#line 13118 "BatchImport.c"
 }
 
 
 gpointer value_get_prepared_file (const GValue* value) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE), NULL);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 13012 "BatchImport.c"
+#line 13127 "BatchImport.c"
 }
 
 
 void value_set_prepared_file (GValue* value, gpointer v_object) {
 	PreparedFile * old;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_ref (value->data[0].v_pointer);
-#line 13032 "BatchImport.c"
+#line 13147 "BatchImport.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13036 "BatchImport.c"
+#line 13151 "BatchImport.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13042 "BatchImport.c"
+#line 13157 "BatchImport.c"
 	}
 }
 
 
 void value_take_prepared_file (GValue* value, gpointer v_object) {
 	PreparedFile * old;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREPARED_FILE));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREPARED_FILE));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 13061 "BatchImport.c"
+#line 13176 "BatchImport.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 13065 "BatchImport.c"
+#line 13180 "BatchImport.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		prepared_file_unref (old);
-#line 13071 "BatchImport.c"
+#line 13186 "BatchImport.c"
 	}
 }
 
 
 static void prepared_file_class_init (PreparedFileClass * klass) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_parent_class = g_type_class_peek_parent (klass);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((PreparedFileClass *) klass)->finalize = prepared_file_finalize;
-#line 13081 "BatchImport.c"
+#line 13196 "BatchImport.c"
 }
 
 
 static void prepared_file_instance_init (PreparedFile * self) {
-#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->associated_file = NULL;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 13090 "BatchImport.c"
+#line 13205 "BatchImport.c"
 }
 
 
 static void prepared_file_finalize (PreparedFile * obj) {
 	PreparedFile * self;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE, PreparedFile);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1624 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1644 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->job);
-#line 1626 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1646 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->file);
-#line 1627 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1647 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->associated_file);
-#line 1628 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1648 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->source_id);
-#line 1629 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1649 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->dest_id);
-#line 1631 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1651 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->exif_md5);
-#line 1632 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1652 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->thumbnail_md5);
-#line 1633 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1653 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (self->full_md5);
-#line 13116 "BatchImport.c"
+#line 13231 "BatchImport.c"
 }
 
 
@@ -13140,24 +13255,24 @@ GType prepared_file_get_type (void) {
 gpointer prepared_file_ref (gpointer instance) {
 	PreparedFile * self;
 	self = instance;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 13141 "BatchImport.c"
+#line 13256 "BatchImport.c"
 }
 
 
 void prepared_file_unref (gpointer instance) {
 	PreparedFile * self;
 	self = instance;
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		PREPARED_FILE_GET_CLASS (self)->finalize (self);
-#line 1623 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1643 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13154 "BatchImport.c"
+#line 13269 "BatchImport.c"
 	}
 }
 
@@ -13166,37 +13281,37 @@ PreparedFileCluster* prepared_file_cluster_construct (GType object_type, GeeArra
 	PreparedFileCluster* self = NULL;
 	GeeArrayList* _tmp0_;
 	GeeArrayList* _tmp1_;
-#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (list), NULL);
-#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFileCluster*) interlocked_notification_object_construct (object_type);
-#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = list;
-#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->list);
-#line 1661 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->list = _tmp1_;
-#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13177 "BatchImport.c"
+#line 13292 "BatchImport.c"
 }
 
 
 PreparedFileCluster* prepared_file_cluster_new (GeeArrayList* list) {
-#line 1660 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1680 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_cluster_construct (TYPE_PREPARED_FILE_CLUSTER, list);
-#line 13184 "BatchImport.c"
+#line 13299 "BatchImport.c"
 }
 
 
 static void prepared_file_cluster_class_init (PreparedFileClusterClass * klass) {
-#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_cluster_parent_class = g_type_class_peek_parent (klass);
-#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((NotificationObjectClass *) klass)->finalize = prepared_file_cluster_finalize;
-#line 13193 "BatchImport.c"
+#line 13308 "BatchImport.c"
 }
 
 
@@ -13206,13 +13321,13 @@ static void prepared_file_cluster_instance_init (PreparedFileCluster * self) {
 
 static void prepared_file_cluster_finalize (NotificationObject * obj) {
 	PreparedFileCluster * self;
-#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_CLUSTER, PreparedFileCluster);
-#line 1658 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->list);
-#line 1657 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1677 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	NOTIFICATION_OBJECT_CLASS (prepared_file_cluster_parent_class)->finalize (obj);
-#line 13209 "BatchImport.c"
+#line 13324 "BatchImport.c"
 }
 
 
@@ -13243,68 +13358,68 @@ PrepareFilesJob* prepare_files_job_construct (GType object_type, BatchImport* ow
 	GFile* _tmp7_;
 	gint _tmp8_;
 	gint _tmp9_;
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (GEE_IS_LIST (files_to_prepare), NULL);
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1681 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PrepareFilesJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = files_to_prepare;
-#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->files_to_prepare);
-#line 1683 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->files_to_prepare = _tmp5_;
-#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = notification;
-#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6__target = notification_target;
-#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->notification = _tmp6_;
-#line 1684 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->notification_target = _tmp6__target;
-#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->library_dir);
-#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->library_dir = _tmp7_;
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = prepare_files_job_get_test_variable ("SHOTWELL_FAIL_EVERY");
-#line 1686 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1706 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->fail_every = _tmp8_;
-#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = prepare_files_job_get_test_variable ("SHOTWELL_SKIP_EVERY");
-#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1707 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = _tmp9_;
-#line 1689 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1709 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_notification_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 13294 "BatchImport.c"
+#line 13409 "BatchImport.c"
 }
 
 
 PrepareFilesJob* prepare_files_job_new (BatchImport* owner, GeeList* files_to_prepare, NotificationCallback notification, void* notification_target, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
-#line 1678 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepare_files_job_construct (TYPE_PREPARE_FILES_JOB, owner, files_to_prepare, notification, notification_target, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 13301 "BatchImport.c"
+#line 13416 "BatchImport.c"
 }
 
 
@@ -13317,60 +13432,60 @@ static gint prepare_files_job_get_test_variable (const gchar* name) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	const gchar* _tmp5_;
-#line 1692 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (name != NULL, 0);
-#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = name;
-#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = g_getenv (_tmp0_);
-#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1693 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value = _tmp2_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = value;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp5_ == NULL) {
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = TRUE;
-#line 13330 "BatchImport.c"
+#line 13445 "BatchImport.c"
 	} else {
 		const gchar* _tmp6_;
 		gint _tmp7_;
 		gint _tmp8_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = value;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = strlen (_tmp6_);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = _tmp7_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp8_ == 0;
-#line 13343 "BatchImport.c"
+#line 13458 "BatchImport.c"
 	}
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp4_) {
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = 0;
-#line 13349 "BatchImport.c"
+#line 13464 "BatchImport.c"
 	} else {
 		const gchar* _tmp9_;
 		gint _tmp10_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = value;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp10_ = atoi (_tmp9_);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp10_;
-#line 13359 "BatchImport.c"
+#line 13474 "BatchImport.c"
 	}
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp3_;
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (value);
-#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1715 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 13367 "BatchImport.c"
+#line 13482 "BatchImport.c"
 }
 
 
@@ -13383,17 +13498,17 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 	GeeArrayList* _tmp90_;
 	gint _tmp91_;
 	gint _tmp92_;
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
-#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = g_timer_new ();
-#line 1699 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	timer = _tmp0_;
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
-#line 1701 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1721 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	list = _tmp1_;
-#line 13390 "BatchImport.c"
+#line 13505 "BatchImport.c"
 	{
 		GeeList* _file_to_prepare_list = NULL;
 		GeeList* _tmp2_;
@@ -13403,25 +13518,25 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _file_to_prepare_index = 0;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->priv->files_to_prepare;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_list = _tmp3_;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _file_to_prepare_list;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = _tmp5_;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_size = _tmp6_;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_file_to_prepare_index = -1;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		while (TRUE) {
-#line 13418 "BatchImport.c"
+#line 13533 "BatchImport.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -13463,37 +13578,37 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			GeeArrayList* _tmp75_;
 			gint _tmp76_;
 			gint _tmp77_;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = _file_to_prepare_index;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_index = _tmp7_ + 1;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = _file_to_prepare_index;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = _file_to_prepare_size;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				break;
-#line 13472 "BatchImport.c"
+#line 13587 "BatchImport.c"
 			}
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _file_to_prepare_list;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _file_to_prepare_index;
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			file_to_prepare = (FileToPrepare*) _tmp12_;
-#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1703 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp13_;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _result_;
-#line 1704 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1724 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp14_ != IMPORT_RESULT_SUCCESS) {
-#line 13490 "BatchImport.c"
+#line 13605 "BatchImport.c"
 				FileToPrepare* _tmp15_;
 				BatchImportJob* _tmp16_;
 				FileToPrepare* _tmp17_;
@@ -13505,202 +13620,202 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				gchar* _tmp23_;
 				gchar* _tmp24_;
 				ImportResult _tmp25_;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp15_ = file_to_prepare;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = _tmp15_->job;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = file_to_prepare;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = _tmp17_->job;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = batch_import_job_get_dest_identifier (_tmp18_);
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = _tmp19_;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = file_to_prepare;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = _tmp21_->job;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = batch_import_job_get_source_identifier (_tmp22_);
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = _tmp23_;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _result_;
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp16_, NULL, _tmp20_, _tmp24_, _tmp25_);
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp24_);
-#line 1705 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1725 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp20_);
-#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_file_to_prepare_unref0 (file_to_prepare);
-#line 1708 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				continue;
-#line 13534 "BatchImport.c"
+#line 13649 "BatchImport.c"
 			}
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp26_ = file_to_prepare;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp27_ = _tmp26_->job;
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp28_ = _batch_import_job_ref0 (_tmp27_);
-#line 1711 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1731 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			job = _tmp28_;
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = file_to_prepare;
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp30_ = _tmp29_->file;
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 1712 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			file = _tmp31_;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = file_to_prepare;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _tmp33_->associated;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp34_ != NULL) {
-#line 13558 "BatchImport.c"
+#line 13673 "BatchImport.c"
 				FileToPrepare* _tmp35_;
 				FileToPrepare* _tmp36_;
 				GFile* _tmp37_;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = file_to_prepare;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp36_ = _tmp35_->associated;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp37_ = _tmp36_->file;
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp37_;
-#line 13570 "BatchImport.c"
+#line 13685 "BatchImport.c"
 			} else {
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = NULL;
-#line 13574 "BatchImport.c"
+#line 13689 "BatchImport.c"
 			}
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp38_ = _g_object_ref0 (_tmp32_);
-#line 1713 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1733 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			associated = _tmp38_;
-#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp39_ = file_to_prepare;
-#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp40_ = _tmp39_->copy_to_library;
-#line 1714 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1734 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			copy_to_library = _tmp40_;
-#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = file;
-#line 1717 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp41_ == NULL) {
-#line 13590 "BatchImport.c"
+#line 13705 "BatchImport.c"
 				BatchImportJob* _tmp42_;
 				GFile* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
 				gboolean _tmp45_;
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp42_ = job;
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp45_ = prepare_files_job_create_file (self, _tmp42_, &_tmp43_, &_tmp44_);
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (file);
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				file = _tmp43_;
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				copy_to_library = _tmp44_;
-#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1738 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (!_tmp45_) {
-#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (associated);
-#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (file);
-#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_batch_import_job_unref0 (job);
-#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_file_to_prepare_unref0 (file_to_prepare);
-#line 1719 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1739 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					continue;
-#line 13617 "BatchImport.c"
+#line 13732 "BatchImport.c"
 				}
 			}
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = associated;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp47_ == NULL) {
-#line 13624 "BatchImport.c"
+#line 13739 "BatchImport.c"
 				FileToPrepare* _tmp48_;
 				FileToPrepare* _tmp49_;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp48_ = file_to_prepare;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp49_ = _tmp48_->associated;
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = _tmp49_ != NULL;
-#line 13633 "BatchImport.c"
+#line 13748 "BatchImport.c"
 			} else {
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp46_ = FALSE;
-#line 13637 "BatchImport.c"
+#line 13752 "BatchImport.c"
 			}
-#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp46_) {
-#line 13641 "BatchImport.c"
+#line 13756 "BatchImport.c"
 				FileToPrepare* _tmp50_;
 				FileToPrepare* _tmp51_;
 				BatchImportJob* _tmp52_;
 				GFile* _tmp53_ = NULL;
 				gboolean _tmp54_ = FALSE;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp50_ = file_to_prepare;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp51_ = _tmp50_->associated;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp52_ = _tmp51_->job;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				prepare_files_job_create_file (self, _tmp52_, &_tmp53_, &_tmp54_);
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (associated);
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				associated = _tmp53_;
-#line 1723 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				copy_to_library = _tmp54_;
-#line 13661 "BatchImport.c"
+#line 13776 "BatchImport.c"
 			}
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp55_ = job;
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp56_ = file;
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp57_ = associated;
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp58_ = copy_to_library;
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp60_ = prepare_files_job_prepare_file (self, _tmp55_, _tmp56_, _tmp57_, _tmp58_, &_tmp59_);
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			prepared_file = _tmp59_;
-#line 1727 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1747 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_result_ = _tmp60_;
-#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp61_ = _result_;
-#line 1728 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp61_ == IMPORT_RESULT_SUCCESS) {
-#line 13683 "BatchImport.c"
+#line 13798 "BatchImport.c"
 				gint _tmp62_;
 				GeeArrayList* _tmp63_;
 				PreparedFile* _tmp64_;
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp62_ = self->prepared_files;
-#line 1729 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->prepared_files = _tmp62_ + 1;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp63_ = list;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp64_ = prepared_file;
-#line 1730 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp64_);
-#line 13697 "BatchImport.c"
+#line 13812 "BatchImport.c"
 			} else {
 				BatchImportJob* _tmp65_;
 				GFile* _tmp66_;
@@ -13711,78 +13826,78 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				gchar* _tmp71_;
 				gchar* _tmp72_;
 				ImportResult _tmp73_;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp65_ = job;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp66_ = file;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp67_ = job;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp68_ = batch_import_job_get_source_identifier (_tmp67_);
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp69_ = _tmp68_;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp70_ = file;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp71_ = g_file_get_path (_tmp70_);
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp72_ = _tmp71_;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp73_ = _result_;
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp65_, _tmp66_, _tmp69_, _tmp72_, _tmp73_);
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp72_);
-#line 1732 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1752 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp69_);
-#line 13732 "BatchImport.c"
+#line 13847 "BatchImport.c"
 			}
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp75_ = list;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp77_ = _tmp76_;
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp77_ >= BATCH_IMPORT_REPORT_EVERY_N_PREPARED_FILES) {
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = TRUE;
-#line 13744 "BatchImport.c"
+#line 13859 "BatchImport.c"
 			} else {
 				gboolean _tmp78_ = FALSE;
 				GTimer* _tmp79_;
 				gdouble _tmp80_;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp79_ = timer;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp80_ = g_timer_elapsed (_tmp79_, NULL);
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if ((_tmp80_ * 1000.0) > ((gdouble) BATCH_IMPORT_REPORT_PREPARED_FILES_EVERY_N_MSEC)) {
-#line 13755 "BatchImport.c"
+#line 13870 "BatchImport.c"
 					GeeArrayList* _tmp81_;
 					gint _tmp82_;
 					gint _tmp83_;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp81_ = list;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp82_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp83_ = _tmp82_;
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = _tmp83_ > 0;
-#line 13767 "BatchImport.c"
+#line 13882 "BatchImport.c"
 				} else {
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp78_ = FALSE;
-#line 13771 "BatchImport.c"
+#line 13886 "BatchImport.c"
 				}
-#line 1737 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp74_ = _tmp78_;
-#line 13775 "BatchImport.c"
+#line 13890 "BatchImport.c"
 			}
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp74_) {
-#line 13779 "BatchImport.c"
+#line 13894 "BatchImport.c"
 				PreparedFileCluster* cluster = NULL;
 				GeeArrayList* _tmp84_;
 				PreparedFileCluster* _tmp85_;
@@ -13791,91 +13906,91 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				void* _tmp87__target;
 				PreparedFileCluster* _tmp88_;
 				GTimer* _tmp89_;
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp84_ = list;
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp85_ = prepared_file_cluster_new (_tmp84_);
-#line 1741 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				cluster = _tmp85_;
-#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp86_ = gee_array_list_new (TYPE_PREPARED_FILE, (GBoxedCopyFunc) prepared_file_ref, (GDestroyNotify) prepared_file_unref, NULL, NULL, NULL);
-#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (list);
-#line 1742 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				list = _tmp86_;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp87_ = self->priv->notification;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp87__target = self->priv->notification_target;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp88_ = cluster;
-#line 1743 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1763 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp87_, _tmp87__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp89_ = timer;
-#line 1744 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1764 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				g_timer_start (_tmp89_);
-#line 1736 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1756 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_notification_object_unref0 (cluster);
-#line 13814 "BatchImport.c"
+#line 13929 "BatchImport.c"
 			}
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (associated);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (file);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_job_unref0 (job);
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_file_to_prepare_unref0 (file_to_prepare);
-#line 13826 "BatchImport.c"
+#line 13941 "BatchImport.c"
 		}
-#line 1702 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1722 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_file_to_prepare_list);
-#line 13830 "BatchImport.c"
+#line 13945 "BatchImport.c"
 	}
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp90_ = list;
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp91_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp92_ = _tmp91_;
-#line 1748 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp92_ > 0) {
-#line 13840 "BatchImport.c"
+#line 13955 "BatchImport.c"
 		ImportResult _result_ = 0;
 		ImportResult _tmp93_;
 		ImportResult _tmp94_;
-#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp93_ = background_import_job_abort_check (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob));
-#line 1749 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_result_ = _tmp93_;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp94_ = _result_;
-#line 1750 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp94_ == IMPORT_RESULT_SUCCESS) {
-#line 13852 "BatchImport.c"
+#line 13967 "BatchImport.c"
 			NotificationCallback _tmp95_;
 			void* _tmp95__target;
 			GeeArrayList* _tmp96_;
 			PreparedFileCluster* _tmp97_;
 			PreparedFileCluster* _tmp98_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95_ = self->priv->notification;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp95__target = self->priv->notification_target;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp96_ = list;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp97_ = prepared_file_cluster_new (_tmp96_);
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp98_ = _tmp97_;
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_job_notify (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), _tmp95_, _tmp95__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, TYPE_NOTIFICATION_OBJECT, NotificationObject));
-#line 1751 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1771 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_notification_object_unref0 (_tmp98_);
-#line 13872 "BatchImport.c"
+#line 13987 "BatchImport.c"
 		} else {
 			gint _tmp99_;
 			GeeArrayList* _tmp100_;
@@ -13885,27 +14000,27 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 			GeeArrayList* _tmp104_;
 			gint _tmp105_;
 			gint _tmp106_;
-#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp99_ = self->prepared_files;
-#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp100_ = list;
-#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp101_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp102_ = _tmp101_;
-#line 1754 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1774 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_vala_assert (_tmp99_ >= _tmp102_, "prepared_files >= list.size");
-#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp103_ = self->prepared_files;
-#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp104_ = list;
-#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp106_ = _tmp105_;
-#line 1755 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1775 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->prepared_files = _tmp103_ - _tmp106_;
-#line 13902 "BatchImport.c"
+#line 14017 "BatchImport.c"
 			{
 				GeeArrayList* _prepared_file_list = NULL;
 				GeeArrayList* _tmp107_;
@@ -13915,25 +14030,25 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 				gint _tmp110_;
 				gint _tmp111_;
 				gint _prepared_file_index = 0;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp107_ = list;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp108_ = _g_object_ref0 (_tmp107_);
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_list = _tmp108_;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp109_ = _prepared_file_list;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp110_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp111_ = _tmp110_;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_size = _tmp111_;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_index = -1;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				while (TRUE) {
-#line 13930 "BatchImport.c"
+#line 14045 "BatchImport.c"
 					gint _tmp112_;
 					gint _tmp113_;
 					gint _tmp114_;
@@ -13954,75 +14069,75 @@ static void prepare_files_job_real_execute (BackgroundJob* base) {
 					gchar* _tmp128_;
 					gchar* _tmp129_;
 					ImportResult _tmp130_;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp112_ = _prepared_file_index;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_index = _tmp112_ + 1;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp113_ = _prepared_file_index;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp114_ = _prepared_file_size;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (!(_tmp113_ < _tmp114_)) {
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 						break;
-#line 13963 "BatchImport.c"
+#line 14078 "BatchImport.c"
 					}
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp115_ = _prepared_file_list;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp116_ = _prepared_file_index;
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp117_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp116_);
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					prepared_file = (PreparedFile*) _tmp117_;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp118_ = prepared_file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp119_ = _tmp118_->job;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp120_ = prepared_file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp121_ = _tmp120_->file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp122_ = prepared_file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp123_ = _tmp122_->job;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp124_ = batch_import_job_get_source_identifier (_tmp123_);
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp125_ = _tmp124_;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp126_ = prepared_file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp127_ = _tmp126_->file;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp128_ = g_file_get_path (_tmp127_);
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp129_ = _tmp128_;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_tmp130_ = _result_;
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp119_, _tmp121_, _tmp125_, _tmp129_, _tmp130_);
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_tmp129_);
-#line 1758 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1778 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_free0 (_tmp125_);
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_prepared_file_unref0 (prepared_file);
-#line 14007 "BatchImport.c"
+#line 14122 "BatchImport.c"
 				}
-#line 1757 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1777 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_prepared_file_list);
-#line 14011 "BatchImport.c"
+#line 14126 "BatchImport.c"
 			}
 		}
 	}
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (list);
-#line 1698 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1718 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_timer_destroy0 (timer);
-#line 14019 "BatchImport.c"
+#line 14134 "BatchImport.c"
 }
 
 
@@ -14031,37 +14146,37 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 	gboolean _vala_copy_to_library = FALSE;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), FALSE);
-#line 1767 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1787 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), FALSE);
-#line 14032 "BatchImport.c"
+#line 14147 "BatchImport.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		BatchImportJob* _tmp1_;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = job;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = batch_import_job_prepare (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_file = _tmp2_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_copy_to_library = _tmp3_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp4_;
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14053 "BatchImport.c"
-			goto __catch417_g_error;
+#line 14168 "BatchImport.c"
+			goto __catch429_g_error;
 		}
-#line 1769 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1789 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
-#line 14058 "BatchImport.c"
+#line 14173 "BatchImport.c"
 			BatchImportJob* _tmp5_;
 			BatchImportJob* _tmp6_;
 			gchar* _tmp7_;
@@ -14069,51 +14184,51 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 			BatchImportJob* _tmp9_;
 			gchar* _tmp10_;
 			gchar* _tmp11_;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = job;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp6_ = job;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = batch_import_job_get_source_identifier (_tmp6_);
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = job;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = batch_import_job_get_dest_identifier (_tmp9_);
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _tmp10_;
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			background_import_job_report_failure (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp5_, NULL, _tmp8_, _tmp11_, IMPORT_RESULT_FILE_ERROR);
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp11_);
-#line 1770 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp8_);
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = FALSE;
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (file) {
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*file = _vala_file;
-#line 14092 "BatchImport.c"
+#line 14207 "BatchImport.c"
 			} else {
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_vala_file);
-#line 14096 "BatchImport.c"
+#line 14211 "BatchImport.c"
 			}
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (copy_to_library) {
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 14102 "BatchImport.c"
+#line 14217 "BatchImport.c"
 			}
-#line 1773 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14106 "BatchImport.c"
+#line 14221 "BatchImport.c"
 		}
 	}
-	goto __finally417;
-	__catch417_g_error:
+	goto __finally429;
+	__catch429_g_error:
 	{
 		GError* err = NULL;
 		BatchImportJob* _tmp12_;
@@ -14124,90 +14239,90 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		gchar* _tmp17_;
 		gchar* _tmp18_;
 		GError* _tmp19_;
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = job;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = job;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp14_ = batch_import_job_get_source_identifier (_tmp13_);
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = _tmp14_;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = job;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = batch_import_job_get_dest_identifier (_tmp16_);
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = _tmp17_;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = err;
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		background_import_job_report_error (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_IMPORT_JOB, BackgroundImportJob), _tmp12_, NULL, _tmp15_, _tmp18_, _tmp19_, IMPORT_RESULT_FILE_ERROR);
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp18_);
-#line 1776 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp15_);
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = FALSE;
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (file) {
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*file = _vala_file;
-#line 14155 "BatchImport.c"
+#line 14270 "BatchImport.c"
 		} else {
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_vala_file);
-#line 14159 "BatchImport.c"
+#line 14274 "BatchImport.c"
 		}
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (copy_to_library) {
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 14165 "BatchImport.c"
+#line 14280 "BatchImport.c"
 		}
-#line 1779 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14169 "BatchImport.c"
+#line 14284 "BatchImport.c"
 	}
-	__finally417:
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally429:
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14174 "BatchImport.c"
+#line 14289 "BatchImport.c"
 		gboolean _tmp20_ = FALSE;
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1768 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return _tmp20_;
-#line 14182 "BatchImport.c"
+#line 14297 "BatchImport.c"
 	}
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = TRUE;
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (file) {
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*file = _vala_file;
-#line 14190 "BatchImport.c"
+#line 14305 "BatchImport.c"
 	} else {
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_object_unref0 (_vala_file);
-#line 14194 "BatchImport.c"
+#line 14309 "BatchImport.c"
 	}
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (copy_to_library) {
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 14200 "BatchImport.c"
+#line 14315 "BatchImport.c"
 	}
-#line 1781 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 14204 "BatchImport.c"
+#line 14319 "BatchImport.c"
 }
 
 
@@ -14233,221 +14348,221 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 	gboolean _tmp30_;
 	guint64 filesize = 0ULL;
 	gboolean is_in_library_dir = FALSE;
-	GFile* _tmp82_;
-	GFile* _tmp83_;
-	gboolean _tmp84_;
-	gboolean _tmp85_ = FALSE;
-	gboolean _tmp86_;
-	BatchImportJob* _tmp88_;
-	GFile* _tmp89_;
-	GFile* _tmp90_;
-	BatchImportJob* _tmp91_;
-	gchar* _tmp92_;
-	gchar* _tmp93_;
-	BatchImportJob* _tmp94_;
-	gchar* _tmp95_;
-	gchar* _tmp96_;
-	const gchar* _tmp97_;
-	const gchar* _tmp98_;
-	const gchar* _tmp99_;
-	PhotoFileFormat _tmp100_;
-	guint64 _tmp101_;
-	gboolean _tmp102_;
-	PreparedFile* _tmp103_;
+	GFile* _tmp68_;
+	GFile* _tmp69_;
+	gboolean _tmp70_;
+	gboolean _tmp71_ = FALSE;
+	gboolean _tmp72_;
+	BatchImportJob* _tmp74_;
+	GFile* _tmp75_;
+	GFile* _tmp76_;
+	BatchImportJob* _tmp77_;
+	gchar* _tmp78_;
+	gchar* _tmp79_;
+	BatchImportJob* _tmp80_;
+	gchar* _tmp81_;
+	gchar* _tmp82_;
+	const gchar* _tmp83_;
+	const gchar* _tmp84_;
+	const gchar* _tmp85_;
+	PhotoFileFormat _tmp86_;
+	guint64 _tmp87_;
+	gboolean _tmp88_;
+	PreparedFile* _tmp89_;
 	GError * _inner_error_ = NULL;
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARE_FILES_JOB (self), 0);
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (job), 0);
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
-#line 1784 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1804 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((associated_file == NULL) || G_IS_FILE (associated_file), 0);
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (_vala_prepared_file);
-#line 1786 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_prepared_file = NULL;
-#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = file;
-#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1788 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	is_video = _tmp1_;
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = is_video;
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp3_) {
-#line 14274 "BatchImport.c"
+#line 14389 "BatchImport.c"
 		GFile* _tmp4_;
 		gboolean _tmp5_;
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = file;
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = photo_is_file_image (_tmp4_);
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = !_tmp5_;
-#line 14283 "BatchImport.c"
+#line 14398 "BatchImport.c"
 	} else {
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = FALSE;
-#line 14287 "BatchImport.c"
+#line 14402 "BatchImport.c"
 	}
-#line 1790 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp2_) {
-#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14297 "BatchImport.c"
+#line 14412 "BatchImport.c"
 		} else {
-#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14301 "BatchImport.c"
+#line 14416 "BatchImport.c"
 		}
-#line 1791 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14305 "BatchImport.c"
+#line 14420 "BatchImport.c"
 	}
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = is_video;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp7_) {
-#line 14311 "BatchImport.c"
+#line 14426 "BatchImport.c"
 		GFile* _tmp8_;
 		gboolean _tmp9_;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = file;
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = photo_file_format_is_file_supported (_tmp8_);
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = !_tmp9_;
-#line 14320 "BatchImport.c"
+#line 14435 "BatchImport.c"
 	} else {
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = FALSE;
-#line 14324 "BatchImport.c"
+#line 14439 "BatchImport.c"
 	}
-#line 1793 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1813 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp6_) {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14334 "BatchImport.c"
+#line 14449 "BatchImport.c"
 		} else {
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14338 "BatchImport.c"
+#line 14453 "BatchImport.c"
 		}
-#line 1794 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14342 "BatchImport.c"
+#line 14457 "BatchImport.c"
 	}
-#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->priv->import_file_count;
-#line 1796 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1816 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_file_count = _tmp10_ + 1;
-#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = self->priv->fail_every;
-#line 1799 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1819 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp11_ > 0) {
-#line 14352 "BatchImport.c"
+#line 14467 "BatchImport.c"
 		gint _tmp12_;
 		gint _tmp13_;
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp12_ = self->priv->import_file_count;
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp13_ = self->priv->fail_every;
-#line 1800 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp12_ % _tmp13_) == 0) {
-#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
-#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14367 "BatchImport.c"
+#line 14482 "BatchImport.c"
 			} else {
-#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14371 "BatchImport.c"
+#line 14486 "BatchImport.c"
 			}
-#line 1801 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1821 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14375 "BatchImport.c"
+#line 14490 "BatchImport.c"
 		}
 	}
-#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->priv->skip_every;
-#line 1805 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1825 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp14_ > 0) {
-#line 14382 "BatchImport.c"
+#line 14497 "BatchImport.c"
 		gint _tmp15_;
 		gint _tmp16_;
-#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp15_ = self->priv->import_file_count;
-#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp16_ = self->priv->skip_every;
-#line 1806 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1826 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if ((_tmp15_ % _tmp16_) == 0) {
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_NOT_A_FILE;
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14397 "BatchImport.c"
+#line 14512 "BatchImport.c"
 			} else {
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14401 "BatchImport.c"
+#line 14516 "BatchImport.c"
 			}
-#line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1827 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14405 "BatchImport.c"
+#line 14520 "BatchImport.c"
 		}
 	}
-#line 1810 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	exif_only_md5 = NULL;
-#line 1811 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	thumbnail_md5 = NULL;
-#line 1812 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1832 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	full_md5 = NULL;
-#line 14414 "BatchImport.c"
+#line 14529 "BatchImport.c"
 	{
 		gchar* _tmp17_ = NULL;
 		GFile* _tmp18_;
 		gchar* _tmp19_;
 		gchar* _tmp20_;
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp18_ = file;
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp19_ = md5_file (_tmp18_, &_inner_error_);
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = _tmp19_;
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14428 "BatchImport.c"
-			goto __catch418_g_error;
+#line 14543 "BatchImport.c"
+			goto __catch430_g_error;
 		}
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp17_;
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp17_ = NULL;
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1815 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		full_md5 = _tmp20_;
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp17_);
-#line 14441 "BatchImport.c"
+#line 14556 "BatchImport.c"
 	}
-	goto __finally418;
-	__catch418_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp21_;
@@ -14457,80 +14572,80 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		const gchar* _tmp25_;
 		GError* _tmp26_;
 		ImportResult _tmp27_;
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp21_ = file;
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp22_ = g_file_get_path (_tmp21_);
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp23_ = _tmp22_;
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp24_ = err;
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp25_ = _tmp24_->message;
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1820: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_);
-#line 1820 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1840: Unable to perform MD5 checksum on file %s: %s", _tmp23_, _tmp25_);
+#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp23_);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp26_ = err;
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp27_ = import_result_convert_error (_tmp26_, IMPORT_RESULT_FILE_ERROR);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		result = _tmp27_;
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14490 "BatchImport.c"
+#line 14605 "BatchImport.c"
 		} else {
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14494 "BatchImport.c"
+#line 14609 "BatchImport.c"
 		}
-#line 1823 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1843 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14498 "BatchImport.c"
+#line 14613 "BatchImport.c"
 	}
-	__finally418:
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally430:
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1814 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1834 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 14515 "BatchImport.c"
+#line 14630 "BatchImport.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = file;
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp29_ = photo_file_format_get_by_file_extension (_tmp28_);
-#line 1828 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1848 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	file_format = _tmp29_;
-#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp30_ = is_video;
-#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!_tmp30_) {
-#line 14527 "BatchImport.c"
+#line 14642 "BatchImport.c"
 		PhotoFileFormat _tmp31_;
 		PhotoFileReader* reader = NULL;
 		PhotoFileFormat _tmp35_;
@@ -14541,95 +14656,95 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		PhotoFileReader* _tmp40_;
 		PhotoMetadata* metadata = NULL;
 		PhotoMetadata* _tmp50_;
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp31_ = file_format;
-#line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp31_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 14542 "BatchImport.c"
+#line 14657 "BatchImport.c"
 			GFile* _tmp32_;
 			gchar* _tmp33_;
 			gchar* _tmp34_;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp32_ = file;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp33_ = g_file_get_path (_tmp32_);
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp34_ = _tmp33_;
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1831: Skipping %s: unrecognized file extension", _tmp34_);
-#line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1851: Skipping %s: unrecognized file extension", _tmp34_);
+#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp34_);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (full_md5);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (thumbnail_md5);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (exif_only_md5);
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (prepared_file) {
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				*prepared_file = _vala_prepared_file;
-#line 14568 "BatchImport.c"
+#line 14683 "BatchImport.c"
 			} else {
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (_vala_prepared_file);
-#line 14572 "BatchImport.c"
+#line 14687 "BatchImport.c"
 			}
-#line 1833 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1853 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return result;
-#line 14576 "BatchImport.c"
+#line 14691 "BatchImport.c"
 		}
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp35_ = file_format;
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp36_ = file;
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp37_ = g_file_get_path (_tmp36_);
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp38_ = _tmp37_;
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp39_ = photo_file_format_create_reader (_tmp35_, _tmp38_);
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp40_ = _tmp39_;
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp38_);
-#line 1835 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		reader = _tmp40_;
-#line 1836 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		metadata = NULL;
-#line 14596 "BatchImport.c"
+#line 14711 "BatchImport.c"
 		{
 			PhotoMetadata* _tmp41_ = NULL;
 			PhotoFileReader* _tmp42_;
 			PhotoMetadata* _tmp43_;
 			PhotoMetadata* _tmp44_;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = reader;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = photo_file_reader_read_metadata (_tmp42_, &_inner_error_);
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = _tmp43_;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14610 "BatchImport.c"
-				goto __catch419_g_error;
+#line 14725 "BatchImport.c"
+				goto __catch431_g_error;
 			}
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp41_;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp41_ = NULL;
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (metadata);
-#line 1838 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1858 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			metadata = _tmp44_;
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (_tmp41_);
-#line 14623 "BatchImport.c"
+#line 14738 "BatchImport.c"
 		}
-		goto __finally419;
-		__catch419_g_error:
+		goto __finally431;
+		__catch431_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp45_;
@@ -14637,429 +14752,317 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			gchar* _tmp47_;
 			GError* _tmp48_;
 			const gchar* _tmp49_;
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = file;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = g_file_get_path (_tmp45_);
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = _tmp46_;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = err;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = _tmp48_->message;
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1840: Unable to read metadata for %s (%s): continuing" \
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1860: Unable to read metadata for %s (%s): continuing" \
 " to attempt import", _tmp47_, _tmp49_);
-#line 1840 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1860 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp47_);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 14654 "BatchImport.c"
+#line 14769 "BatchImport.c"
 		}
-		__finally419:
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally431:
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_media_metadata_unref0 (metadata);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (full_md5);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (thumbnail_md5);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (exif_only_md5);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1837 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return 0;
-#line 14675 "BatchImport.c"
+#line 14790 "BatchImport.c"
 		}
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp50_ = metadata;
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1864 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp50_ != NULL) {
-#line 14681 "BatchImport.c"
-			guint8* flattened_sans_thumbnail = NULL;
+#line 14796 "BatchImport.c"
 			PhotoMetadata* _tmp51_;
-			gint _tmp52_;
-			guint8* _tmp53_;
-			gint flattened_sans_thumbnail_length1;
-			gint _flattened_sans_thumbnail_size_;
-			gboolean _tmp54_ = FALSE;
-			guint8* _tmp55_;
-			gint _tmp55__length1;
-			guint8* flattened_thumbnail = NULL;
-			PhotoMetadata* _tmp60_;
-			gint _tmp61_;
-			guint8* _tmp62_;
-			gint flattened_thumbnail_length1;
-			gint _flattened_thumbnail_size_;
-			gboolean _tmp63_ = FALSE;
-			guint8* _tmp64_;
-			gint _tmp64__length1;
-#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			gchar* _tmp52_;
+			PhotoMetadata* _tmp53_;
+			gchar* _tmp54_;
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp51_ = metadata;
-#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp53_ = photo_metadata_flatten_exif (_tmp51_, FALSE, &_tmp52_);
-#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_sans_thumbnail = _tmp53_;
-#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_sans_thumbnail_length1 = _tmp52_;
-#line 1845 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp55_ = flattened_sans_thumbnail;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp55_ != NULL) {
-#line 14716 "BatchImport.c"
-				guint8* _tmp56_;
-				gint _tmp56__length1;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp56_ = flattened_sans_thumbnail;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp56__length1 = flattened_sans_thumbnail_length1;
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp54_ = _tmp56__length1 > 0;
-#line 14725 "BatchImport.c"
-			} else {
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp54_ = FALSE;
-#line 14729 "BatchImport.c"
-			}
-#line 1846 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp54_) {
-#line 14733 "BatchImport.c"
-				guint8* _tmp57_;
-				gint _tmp57__length1;
-				guint8* _tmp58_;
-				gint _tmp58__length1;
-				gchar* _tmp59_;
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp57_ = flattened_sans_thumbnail;
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp57__length1 = flattened_sans_thumbnail_length1;
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58_ = flattened_sans_thumbnail;
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp58__length1 = flattened_sans_thumbnail_length1;
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1);
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (exif_only_md5);
-#line 1847 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				exif_only_md5 = _tmp59_;
-#line 14753 "BatchImport.c"
-			}
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp60_ = metadata;
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp62_ = photo_metadata_flatten_exif_preview (_tmp60_, &_tmp61_);
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_thumbnail = _tmp62_;
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_thumbnail_length1 = _tmp61_;
-#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_flattened_thumbnail_size_ = flattened_thumbnail_length1;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp64_ = flattened_thumbnail;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp64__length1 = flattened_thumbnail_length1;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp64_ != NULL) {
-#line 14771 "BatchImport.c"
-				guint8* _tmp65_;
-				gint _tmp65__length1;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp65_ = flattened_thumbnail;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp65__length1 = flattened_thumbnail_length1;
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = _tmp65__length1 > 0;
-#line 14780 "BatchImport.c"
-			} else {
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp63_ = FALSE;
-#line 14784 "BatchImport.c"
-			}
-#line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			if (_tmp63_) {
-#line 14788 "BatchImport.c"
-				guint8* _tmp66_;
-				gint _tmp66__length1;
-				guint8* _tmp67_;
-				gint _tmp67__length1;
-				gchar* _tmp68_;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp66_ = flattened_thumbnail;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp66__length1 = flattened_thumbnail_length1;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp67_ = flattened_thumbnail;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp67__length1 = flattened_thumbnail_length1;
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_tmp68_ = md5_binary (_tmp66_, (gsize) _tmp67__length1);
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				_g_free0 (thumbnail_md5);
-#line 1851 "/home/jens/Source/shotwell/src/BatchImport.vala"
-				thumbnail_md5 = _tmp68_;
-#line 14808 "BatchImport.c"
-			}
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
-#line 1844 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 14814 "BatchImport.c"
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp52_ = photo_metadata_exif_hash (_tmp51_);
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_free0 (exif_only_md5);
+#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			exif_only_md5 = _tmp52_;
+#line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp53_ = metadata;
+#line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp54_ = photo_metadata_thumbnail_hash (_tmp53_);
+#line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_free0 (thumbnail_md5);
+#line 1866 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			thumbnail_md5 = _tmp54_;
+#line 14817 "BatchImport.c"
 		}
-#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_media_metadata_unref0 (metadata);
-#line 1829 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 14820 "BatchImport.c"
+#line 14823 "BatchImport.c"
 	}
-#line 1855 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1870 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	filesize = (guint64) 0;
-#line 14824 "BatchImport.c"
+#line 14827 "BatchImport.c"
 	{
-		guint64 _tmp69_ = 0ULL;
-		GFile* _tmp70_;
-		GCancellable* _tmp71_;
-		GCancellable* _tmp72_;
-		guint64 _tmp73_;
-		guint64 _tmp74_;
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp70_ = file;
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp71_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp72_ = _tmp71_;
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp73_ = query_total_file_size (_tmp70_, _tmp72_, &_inner_error_);
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp74_ = _tmp73_;
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_object_unref0 (_tmp72_);
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp69_ = _tmp74_;
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		guint64 _tmp55_ = 0ULL;
+		GFile* _tmp56_;
+		GCancellable* _tmp57_;
+		GCancellable* _tmp58_;
+		guint64 _tmp59_;
+		guint64 _tmp60_;
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp56_ = file;
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp57_ = background_job_get_cancellable (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob));
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp58_ = _tmp57_;
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp59_ = query_total_file_size (_tmp56_, _tmp58_, &_inner_error_);
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp60_ = _tmp59_;
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_g_object_unref0 (_tmp58_);
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp55_ = _tmp60_;
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14848 "BatchImport.c"
-			goto __catch420_g_error;
+#line 14851 "BatchImport.c"
+			goto __catch432_g_error;
 		}
-#line 1857 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		filesize = _tmp69_;
-#line 14853 "BatchImport.c"
+#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		filesize = _tmp55_;
+#line 14856 "BatchImport.c"
 	}
-	goto __finally420;
-	__catch420_g_error:
+	goto __finally432;
+	__catch432_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp75_;
-		gchar* _tmp76_;
-		gchar* _tmp77_;
-		GError* _tmp78_;
-		const gchar* _tmp79_;
-		GError* _tmp80_;
-		ImportResult _tmp81_;
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
+		GError* _tmp64_;
+		const gchar* _tmp65_;
+		GError* _tmp66_;
+		ImportResult _tmp67_;
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp75_ = file;
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp76_ = g_file_get_path (_tmp75_);
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp77_ = _tmp76_;
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp78_ = err;
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp79_ = _tmp78_->message;
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_warning ("BatchImport.vala:1859: Unable to query file size of %s: %s", _tmp77_, _tmp79_);
-#line 1859 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp77_);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp80_ = err;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp81_ = import_result_convert_error (_tmp80_, IMPORT_RESULT_FILE_ERROR);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		result = _tmp81_;
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp61_ = file;
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp62_ = g_file_get_path (_tmp61_);
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp63_ = _tmp62_;
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp64_ = err;
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp65_ = _tmp64_->message;
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_warning ("BatchImport.vala:1874: Unable to query file size of %s: %s", _tmp63_, _tmp65_);
+#line 1874 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_g_free0 (_tmp63_);
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp66_ = err;
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp67_ = import_result_convert_error (_tmp66_, IMPORT_RESULT_FILE_ERROR);
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		result = _tmp67_;
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (prepared_file) {
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			*prepared_file = _vala_prepared_file;
-#line 14902 "BatchImport.c"
+#line 14905 "BatchImport.c"
 		} else {
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (_vala_prepared_file);
-#line 14906 "BatchImport.c"
+#line 14909 "BatchImport.c"
 		}
-#line 1861 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return result;
-#line 14910 "BatchImport.c"
+#line 14913 "BatchImport.c"
 	}
-	__finally420:
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally432:
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (full_md5);
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (thumbnail_md5);
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (exif_only_md5);
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 1856 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1871 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return 0;
-#line 14927 "BatchImport.c"
+#line 14930 "BatchImport.c"
 	}
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp82_ = file;
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp83_ = self->priv->library_dir;
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp84_ = g_file_has_prefix (_tmp82_, _tmp83_);
-#line 1865 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	is_in_library_dir = _tmp84_;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp86_ = copy_to_library;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp86_) {
-#line 14941 "BatchImport.c"
-		gboolean _tmp87_;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp87_ = is_in_library_dir;
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp85_ = !_tmp87_;
-#line 14947 "BatchImport.c"
+#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp68_ = file;
+#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp69_ = self->priv->library_dir;
+#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp70_ = g_file_has_prefix (_tmp68_, _tmp69_);
+#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	is_in_library_dir = _tmp70_;
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp72_ = copy_to_library;
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp72_) {
+#line 14944 "BatchImport.c"
+		gboolean _tmp73_;
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp73_ = is_in_library_dir;
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp71_ = !_tmp73_;
+#line 14950 "BatchImport.c"
 	} else {
-#line 1869 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp85_ = FALSE;
-#line 14951 "BatchImport.c"
+#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp71_ = FALSE;
+#line 14954 "BatchImport.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp88_ = job;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp89_ = file;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp90_ = associated_file;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp91_ = job;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp92_ = batch_import_job_get_source_identifier (_tmp91_);
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp93_ = _tmp92_;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp94_ = job;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp95_ = batch_import_job_get_dest_identifier (_tmp94_);
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp96_ = _tmp95_;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp97_ = exif_only_md5;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp98_ = thumbnail_md5;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp99_ = full_md5;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp100_ = file_format;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp101_ = filesize;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp102_ = is_video;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp103_ = prepared_file_new (_tmp88_, _tmp89_, _tmp90_, _tmp93_, _tmp96_, _tmp85_, _tmp97_, _tmp98_, _tmp99_, _tmp100_, _tmp101_, _tmp102_);
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp74_ = job;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp75_ = file;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp76_ = associated_file;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp77_ = job;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp78_ = batch_import_job_get_source_identifier (_tmp77_);
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp79_ = _tmp78_;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp80_ = job;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp81_ = batch_import_job_get_dest_identifier (_tmp80_);
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp82_ = _tmp81_;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp83_ = exif_only_md5;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp84_ = thumbnail_md5;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp85_ = full_md5;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp86_ = file_format;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp87_ = filesize;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp88_ = is_video;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp89_ = prepared_file_new (_tmp74_, _tmp75_, _tmp76_, _tmp79_, _tmp82_, _tmp71_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_, _tmp88_);
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (_vala_prepared_file);
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_vala_prepared_file = _tmp103_;
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp96_);
-#line 1868 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp93_);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_vala_prepared_file = _tmp89_;
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_free0 (_tmp82_);
+#line 1883 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_free0 (_tmp79_);
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (full_md5);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (thumbnail_md5);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (exif_only_md5);
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (prepared_file) {
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*prepared_file = _vala_prepared_file;
-#line 15005 "BatchImport.c"
+#line 15008 "BatchImport.c"
 	} else {
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_prepared_file_unref0 (_vala_prepared_file);
-#line 15009 "BatchImport.c"
+#line 15012 "BatchImport.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15013 "BatchImport.c"
+#line 15016 "BatchImport.c"
 }
 
 
 static void prepare_files_job_class_init (PrepareFilesJobClass * klass) {
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepare_files_job_parent_class = g_type_class_peek_parent (klass);
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = prepare_files_job_finalize;
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (PrepareFilesJobPrivate));
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepare_files_job_real_execute;
-#line 15026 "BatchImport.c"
+#line 15029 "BatchImport.c"
 }
 
 
 static void prepare_files_job_instance_init (PrepareFilesJob * self) {
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARE_FILES_JOB_GET_PRIVATE (self);
-#line 1667 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1687 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->prepared_files = 0;
-#line 1674 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1694 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_file_count = 0;
-#line 1675 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1695 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->fail_every = 0;
-#line 1676 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1696 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->skip_every = 0;
-#line 15041 "BatchImport.c"
+#line 15044 "BatchImport.c"
 }
 
 
 static void prepare_files_job_finalize (BackgroundJob * obj) {
 	PrepareFilesJob * self;
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARE_FILES_JOB, PrepareFilesJob);
-#line 1669 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1689 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->files_to_prepare);
-#line 1671 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1691 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->priv->library_dir);
-#line 1665 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1685 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepare_files_job_parent_class)->finalize (obj);
-#line 15055 "BatchImport.c"
+#line 15058 "BatchImport.c"
 }
 
 
@@ -15076,30 +15079,30 @@ GType prepare_files_job_get_type (void) {
 
 
 static gpointer _prepared_file_ref0 (gpointer self) {
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? prepared_file_ref (self) : NULL;
-#line 15074 "BatchImport.c"
+#line 15077 "BatchImport.c"
 }
 
 
 static gpointer _batch_import_result_ref0 (gpointer self) {
-#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? batch_import_result_ref (self) : NULL;
-#line 15081 "BatchImport.c"
+#line 15084 "BatchImport.c"
 }
 
 
 static gpointer _video_import_params_ref0 (gpointer self) {
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? video_import_params_ref (self) : NULL;
-#line 15088 "BatchImport.c"
+#line 15091 "BatchImport.c"
 }
 
 
 static gpointer _photo_import_params_ref0 (gpointer self) {
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? photo_import_params_ref (self) : NULL;
-#line 15095 "BatchImport.c"
+#line 15098 "BatchImport.c"
 }
 
 
@@ -15119,125 +15122,125 @@ ReadyForImport* ready_for_import_construct (GType object_type, GFile* final_file
 	PhotoImportParams* _tmp17_;
 	PreparedFile* _tmp18_;
 	gboolean _tmp19_;
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_FILE (final_file), NULL);
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((photo_import_params == NULL) || IS_PHOTO_IMPORT_PARAMS (photo_import_params), NULL);
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail ((video_import_params == NULL) || IS_VIDEO_IMPORT_PARAMS (video_import_params), NULL);
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (batch_result), NULL);
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ReadyForImport*) g_type_create_instance (object_type);
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = prepared_file;
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _tmp0_->is_video;
-#line 1887 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_) {
-#line 15133 "BatchImport.c"
+#line 15136 "BatchImport.c"
 		gboolean _tmp2_ = FALSE;
 		VideoImportParams* _tmp3_;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = video_import_params;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp3_ != NULL) {
-#line 15140 "BatchImport.c"
+#line 15143 "BatchImport.c"
 			PhotoImportParams* _tmp4_;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp4_ = photo_import_params;
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = _tmp4_ == NULL;
-#line 15146 "BatchImport.c"
+#line 15149 "BatchImport.c"
 		} else {
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp2_ = FALSE;
-#line 15150 "BatchImport.c"
+#line 15153 "BatchImport.c"
 		}
-#line 1888 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp2_, "(video_import_params != null) && (photo_import_params == null)");
-#line 15154 "BatchImport.c"
+#line 15157 "BatchImport.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		VideoImportParams* _tmp6_;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = video_import_params;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (_tmp6_ == NULL) {
-#line 15162 "BatchImport.c"
+#line 15165 "BatchImport.c"
 			PhotoImportParams* _tmp7_;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp7_ = photo_import_params;
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = _tmp7_ != NULL;
-#line 15168 "BatchImport.c"
+#line 15171 "BatchImport.c"
 		} else {
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp5_ = FALSE;
-#line 15172 "BatchImport.c"
+#line 15175 "BatchImport.c"
 		}
-#line 1890 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_vala_assert (_tmp5_, "(video_import_params == null) && (photo_import_params != null)");
-#line 15176 "BatchImport.c"
+#line 15179 "BatchImport.c"
 	}
-#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = final_file;
-#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->final_file);
-#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->final_file = _tmp9_;
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = prepared_file;
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp11_ = _prepared_file_ref0 (_tmp10_);
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->prepared_file);
-#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1908 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->prepared_file = _tmp11_;
-#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp12_ = batch_result;
-#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp13_ = _batch_import_result_ref0 (_tmp12_);
-#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1909 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp13_;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = video_import_params;
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _video_import_params_ref0 (_tmp14_);
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (self->video_import_params);
-#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1910 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->video_import_params = _tmp15_;
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = photo_import_params;
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = _photo_import_params_ref0 (_tmp16_);
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (self->photo_import_params);
-#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1911 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->photo_import_params = _tmp17_;
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = prepared_file;
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_->is_video;
-#line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->is_video = _tmp19_;
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15226 "BatchImport.c"
+#line 15229 "BatchImport.c"
 }
 
 
 ReadyForImport* ready_for_import_new (GFile* final_file, PreparedFile* prepared_file, PhotoImportParams* photo_import_params, VideoImportParams* video_import_params, BatchImportResult* batch_result) {
-#line 1884 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1899 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return ready_for_import_construct (TYPE_READY_FOR_IMPORT, final_file, prepared_file, photo_import_params, video_import_params, batch_result);
-#line 15233 "BatchImport.c"
+#line 15236 "BatchImport.c"
 }
 
 
@@ -15261,61 +15264,61 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 	BatchImportResult* _tmp27_;
 	BatchImportResult* _tmp28_;
 	GError * _inner_error_ = NULL;
-#line 1900 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1915 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL);
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->final_file;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15263 "BatchImport.c"
+#line 15266 "BatchImport.c"
 		GFile* _tmp2_;
 		PreparedFile* _tmp3_;
 		GFile* _tmp4_;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->final_file;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = self->prepared_file;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = _tmp3_->file;
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp2_ != _tmp4_;
-#line 15275 "BatchImport.c"
+#line 15278 "BatchImport.c"
 	} else {
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = FALSE;
-#line 15279 "BatchImport.c"
+#line 15282 "BatchImport.c"
 	}
-#line 1902 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1917 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp0_) {
-#line 15283 "BatchImport.c"
+#line 15286 "BatchImport.c"
 		GFile* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = self->final_file;
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = g_file_get_path (_tmp5_);
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_;
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1903: Deleting aborted import copy %s", _tmp7_);
-#line 1903 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_debug ("BatchImport.vala:1918: Deleting aborted import copy %s", _tmp7_);
+#line 1918 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_free0 (_tmp7_);
-#line 15297 "BatchImport.c"
+#line 15300 "BatchImport.c"
 		{
 			GFile* _tmp8_;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp8_ = self->final_file;
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_file_delete (_tmp8_, NULL, &_inner_error_);
-#line 1905 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15306 "BatchImport.c"
-				goto __catch421_g_error;
+#line 15309 "BatchImport.c"
+				goto __catch433_g_error;
 			}
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally433;
+		__catch433_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp9_;
@@ -15323,91 +15326,91 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			gchar* _tmp11_;
 			GError* _tmp12_;
 			const gchar* _tmp13_;
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp9_ = self->final_file;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = g_file_get_path (_tmp9_);
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = _tmp10_;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = err;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1907: Unable to delete copy of imported file (aborted" \
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:1922: Unable to delete copy of imported file (aborted" \
 " import) %s: %s", _tmp11_, _tmp13_);
-#line 1907 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1922 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp11_);
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 15339 "BatchImport.c"
+#line 15342 "BatchImport.c"
 		}
-		__finally421:
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally433:
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1904 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return NULL;
-#line 15350 "BatchImport.c"
+#line 15353 "BatchImport.c"
 		}
 	}
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp14_ = self->prepared_file;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp15_ = _tmp14_->job;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp16_ = self->prepared_file;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp17_ = _tmp16_->file;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp18_ = self->prepared_file;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp19_ = _tmp18_->job;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp20_ = batch_import_job_get_source_identifier (_tmp19_);
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp21_ = _tmp20_;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp22_ = self->prepared_file;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp23_ = _tmp22_->job;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp24_ = batch_import_job_get_dest_identifier (_tmp23_);
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp25_ = _tmp24_;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp26_ = batch_import_result_new (_tmp15_, _tmp17_, _tmp21_, _tmp25_, NULL, IMPORT_RESULT_USER_ABORT);
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp26_;
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp25_);
-#line 1912 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_free0 (_tmp21_);
-#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp27_ = self->batch_result;
-#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp28_ = _batch_import_result_ref0 (_tmp27_);
-#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp28_;
-#line 1916 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1931 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15395 "BatchImport.c"
+#line 15398 "BatchImport.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 15402 "BatchImport.c"
+#line 15405 "BatchImport.c"
 }
 
 
@@ -15416,256 +15419,256 @@ Thumbnails* ready_for_import_get_thumbnails (ReadyForImport* self) {
 	Thumbnails* _tmp0_ = NULL;
 	PhotoImportParams* _tmp1_;
 	Thumbnails* _tmp6_;
-#line 1919 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_READY_FOR_IMPORT (self), NULL);
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = self->photo_import_params;
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp1_ != NULL) {
-#line 15417 "BatchImport.c"
+#line 15420 "BatchImport.c"
 		PhotoImportParams* _tmp2_;
 		Thumbnails* _tmp3_;
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->photo_import_params;
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp2_->thumbnails;
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp3_;
-#line 15426 "BatchImport.c"
+#line 15429 "BatchImport.c"
 	} else {
 		VideoImportParams* _tmp4_;
 		Thumbnails* _tmp5_;
-#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->video_import_params;
-#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_->thumbnails;
-#line 1921 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = _tmp5_;
-#line 15436 "BatchImport.c"
+#line 15439 "BatchImport.c"
 	}
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _thumbnails_ref0 (_tmp0_);
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	result = _tmp6_;
-#line 1920 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1935 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
-#line 15444 "BatchImport.c"
+#line 15447 "BatchImport.c"
 }
 
 
 static void value_ready_for_import_init (GValue* value) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 15451 "BatchImport.c"
+#line 15454 "BatchImport.c"
 }
 
 
 static void value_ready_for_import_free_value (GValue* value) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (value->data[0].v_pointer);
-#line 15460 "BatchImport.c"
+#line 15463 "BatchImport.c"
 	}
 }
 
 
 static void value_ready_for_import_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = ready_for_import_ref (src_value->data[0].v_pointer);
-#line 15470 "BatchImport.c"
+#line 15473 "BatchImport.c"
 	} else {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 15474 "BatchImport.c"
+#line 15477 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_ready_for_import_peek_pointer (const GValue* value) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 15482 "BatchImport.c"
+#line 15485 "BatchImport.c"
 }
 
 
 static gchar* value_ready_for_import_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 15489 "BatchImport.c"
+#line 15492 "BatchImport.c"
 		ReadyForImport * object;
 		object = collect_values[0].v_pointer;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 15496 "BatchImport.c"
+#line 15499 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.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 15500 "BatchImport.c"
+#line 15503 "BatchImport.c"
 		}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = ready_for_import_ref (object);
-#line 15504 "BatchImport.c"
+#line 15507 "BatchImport.c"
 	} else {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15508 "BatchImport.c"
+#line 15511 "BatchImport.c"
 	}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 15512 "BatchImport.c"
+#line 15515 "BatchImport.c"
 }
 
 
 static gchar* value_ready_for_import_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ReadyForImport ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 15523 "BatchImport.c"
+#line 15526 "BatchImport.c"
 	}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 15529 "BatchImport.c"
+#line 15532 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 15533 "BatchImport.c"
+#line 15536 "BatchImport.c"
 	} else {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = ready_for_import_ref (value->data[0].v_pointer);
-#line 15537 "BatchImport.c"
+#line 15540 "BatchImport.c"
 	}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 15541 "BatchImport.c"
+#line 15544 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_ready_for_import (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecReadyForImport* spec;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_READY_FOR_IMPORT), NULL);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 15555 "BatchImport.c"
+#line 15558 "BatchImport.c"
 }
 
 
 gpointer value_get_ready_for_import (const GValue* value) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT), NULL);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 15564 "BatchImport.c"
+#line 15567 "BatchImport.c"
 }
 
 
 void value_set_ready_for_import (GValue* value, gpointer v_object) {
 	ReadyForImport * old;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_ref (value->data[0].v_pointer);
-#line 15584 "BatchImport.c"
+#line 15587 "BatchImport.c"
 	} else {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15588 "BatchImport.c"
+#line 15591 "BatchImport.c"
 	}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 15594 "BatchImport.c"
+#line 15597 "BatchImport.c"
 	}
 }
 
 
 void value_take_ready_for_import (GValue* value, gpointer v_object) {
 	ReadyForImport * old;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_READY_FOR_IMPORT));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_READY_FOR_IMPORT));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 15613 "BatchImport.c"
+#line 15616 "BatchImport.c"
 	} else {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 15617 "BatchImport.c"
+#line 15620 "BatchImport.c"
 	}
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		ready_for_import_unref (old);
-#line 15623 "BatchImport.c"
+#line 15626 "BatchImport.c"
 	}
 }
 
 
 static void ready_for_import_class_init (ReadyForImportClass * klass) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	ready_for_import_parent_class = g_type_class_peek_parent (klass);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((ReadyForImportClass *) klass)->finalize = ready_for_import_finalize;
-#line 15633 "BatchImport.c"
+#line 15636 "BatchImport.c"
 }
 
 
 static void ready_for_import_instance_init (ReadyForImport * self) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 15640 "BatchImport.c"
+#line 15643 "BatchImport.c"
 }
 
 
 static void ready_for_import_finalize (ReadyForImport * obj) {
 	ReadyForImport * self;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_READY_FOR_IMPORT, ReadyForImport);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 1877 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1892 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->final_file);
-#line 1878 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1893 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->prepared_file);
-#line 1879 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1894 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (self->photo_import_params);
-#line 1880 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1895 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (self->video_import_params);
-#line 1881 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1896 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 15660 "BatchImport.c"
+#line 15663 "BatchImport.c"
 }
 
 
@@ -15686,24 +15689,24 @@ GType ready_for_import_get_type (void) {
 gpointer ready_for_import_ref (gpointer instance) {
 	ReadyForImport * self;
 	self = instance;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 15685 "BatchImport.c"
+#line 15688 "BatchImport.c"
 }
 
 
 void ready_for_import_unref (gpointer instance) {
 	ReadyForImport * self;
 	self = instance;
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		READY_FOR_IMPORT_GET_CLASS (self)->finalize (self);
-#line 1876 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1891 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 15698 "BatchImport.c"
+#line 15701 "BatchImport.c"
 	}
 }
 
@@ -15719,52 +15722,52 @@ PreparedFileImportJob* prepared_file_import_job_construct (GType object_type, Ba
 	ImportID _tmp4_;
 	PreparedFile* _tmp5_;
 	PreparedFile* _tmp6_;
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_PREPARED_FILE (prepared_file), NULL);
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (import_id != NULL, NULL);
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancellation;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancellation_target;
-#line 1934 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (PreparedFileImportJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target, NULL);
-#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = *import_id;
-#line 1936 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1951 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv->import_id = _tmp4_;
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = prepared_file;
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _prepared_file_ref0 (_tmp5_);
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1937 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->not_ready = _tmp6_;
-#line 1939 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 15752 "BatchImport.c"
+#line 15755 "BatchImport.c"
 }
 
 
 PreparedFileImportJob* prepared_file_import_job_new (BatchImport* owner, PreparedFile* prepared_file, ImportID* import_id, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target) {
-#line 1932 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return prepared_file_import_job_construct (TYPE_PREPARED_FILE_IMPORT_JOB, owner, prepared_file, import_id, callback, callback_target, cancellable, cancellation, cancellation_target);
-#line 15759 "BatchImport.c"
+#line 15762 "BatchImport.c"
 }
 
 
@@ -15784,66 +15787,67 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 	PreparedFile* _tmp8_;
 	gboolean _tmp9_;
 	GFile* _tmp51_;
-	gchar* _tmp52_;
-	gchar* _tmp53_;
+	GFile* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
 	ImportResult _result_ = 0;
 	VideoImportParams* video_import_params = NULL;
 	PhotoImportParams* photo_import_params = NULL;
-	PreparedFile* _tmp54_;
-	gboolean _tmp55_;
-	gboolean _tmp82_ = FALSE;
-	ImportResult _tmp83_;
+	PreparedFile* _tmp58_;
+	gboolean _tmp59_;
+	gboolean _tmp86_ = FALSE;
+	ImportResult _tmp87_;
 	BatchImportResult* batch_result = NULL;
-	PreparedFile* _tmp96_;
-	BatchImportJob* _tmp97_;
-	GFile* _tmp98_;
-	GFile* _tmp99_;
-	gchar* _tmp100_;
-	gchar* _tmp101_;
+	PreparedFile* _tmp100_;
+	BatchImportJob* _tmp101_;
 	GFile* _tmp102_;
-	gchar* _tmp103_;
+	GFile* _tmp103_;
 	gchar* _tmp104_;
-	ImportResult _tmp105_;
-	BatchImportResult* _tmp106_;
-	BatchImportResult* _tmp107_;
-	BatchImportResult* _tmp108_;
+	gchar* _tmp105_;
+	GFile* _tmp106_;
+	gchar* _tmp107_;
+	gchar* _tmp108_;
 	ImportResult _tmp109_;
+	BatchImportResult* _tmp110_;
+	BatchImportResult* _tmp111_;
+	BatchImportResult* _tmp112_;
+	ImportResult _tmp113_;
 	GError * _inner_error_ = NULL;
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = self->not_ready;
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _prepared_file_ref0 (_tmp0_);
-#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file = _tmp1_;
-#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1944 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1959 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->not_ready = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1961 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = prepared_file;
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1961 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _tmp2_->file;
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1961 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1946 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1961 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	final_file = _tmp4_;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = prepared_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = _tmp5_->associated_file;
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1947 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	final_associated_file = _tmp7_;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1964 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = prepared_file;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1964 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = _tmp8_->copy_to_library;
-#line 1949 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1964 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (_tmp9_) {
-#line 15838 "BatchImport.c"
+#line 15842 "BatchImport.c"
 		{
 			GFile* _tmp10_ = NULL;
 			PreparedFile* _tmp11_;
@@ -15852,32 +15856,32 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			GFile* _tmp14_;
 			GFile* _tmp15_;
 			GFile* _tmp29_;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp11_ = prepared_file;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp12_ = _tmp11_->file;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp13_ = library_files_duplicate (_tmp12_, NULL, NULL, TRUE, &_inner_error_);
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = _tmp13_;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15857 "BatchImport.c"
-				goto __catch422_g_error;
+#line 15861 "BatchImport.c"
+				goto __catch434_g_error;
 			}
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _tmp10_;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp10_ = NULL;
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1952 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			final_file = _tmp14_;
-#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1968 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp15_ = final_file;
-#line 1953 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1968 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp15_ == NULL) {
-#line 15872 "BatchImport.c"
+#line 15876 "BatchImport.c"
 				PreparedFile* _tmp16_;
 				BatchImportJob* _tmp17_;
 				PreparedFile* _tmp18_;
@@ -15891,95 +15895,95 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 				gchar* _tmp26_;
 				gchar* _tmp27_;
 				BatchImportResult* _tmp28_;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp16_ = prepared_file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp17_ = _tmp16_->job;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp18_ = prepared_file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp19_ = _tmp18_->file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp20_ = prepared_file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp21_ = _tmp20_->file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp22_ = g_file_get_path (_tmp21_);
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp23_ = _tmp22_;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp24_ = prepared_file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp25_ = _tmp24_->file;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp26_ = g_file_get_path (_tmp25_);
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp27_ = _tmp26_;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp28_ = batch_import_result_new (_tmp17_, _tmp19_, _tmp23_, _tmp27_, NULL, IMPORT_RESULT_FILE_ERROR);
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_batch_import_result_unref0 (self->failed);
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				self->failed = _tmp28_;
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp27_);
-#line 1954 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1969 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp23_);
-#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp10_);
-#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_associated_file);
-#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_file);
-#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_prepared_file_unref0 (prepared_file);
-#line 1958 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1973 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				return;
-#line 15930 "BatchImport.c"
+#line 15934 "BatchImport.c"
 			}
-#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp29_ = final_associated_file;
-#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp29_ != NULL) {
-#line 15936 "BatchImport.c"
+#line 15940 "BatchImport.c"
 				GFile* _tmp30_ = NULL;
 				PreparedFile* _tmp31_;
 				GFile* _tmp32_;
 				GFile* _tmp33_;
 				GFile* _tmp34_;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp31_ = prepared_file;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp32_ = _tmp31_->associated_file;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp33_ = library_files_duplicate (_tmp32_, NULL, NULL, TRUE, &_inner_error_);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = _tmp33_;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
-#line 15954 "BatchImport.c"
-					goto __catch422_g_error;
+#line 15958 "BatchImport.c"
+					goto __catch434_g_error;
 				}
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = _tmp30_;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp30_ = NULL;
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (final_associated_file);
-#line 1963 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				final_associated_file = _tmp34_;
-#line 1962 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_object_unref0 (_tmp30_);
-#line 15967 "BatchImport.c"
+#line 15971 "BatchImport.c"
 			}
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (_tmp10_);
-#line 15971 "BatchImport.c"
+#line 15975 "BatchImport.c"
 		}
-		goto __finally422;
-		__catch422_g_error:
+		goto __finally434;
+		__catch434_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp35_ = NULL;
@@ -15994,451 +15998,471 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			const gchar* _tmp48_;
 			GError* _tmp49_;
 			BatchImportResult* _tmp50_;
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp36_ = final_file;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (_tmp36_ != NULL) {
-#line 15997 "BatchImport.c"
+#line 16001 "BatchImport.c"
 				GFile* _tmp37_;
 				gchar* _tmp38_;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp37_ = final_file;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp38_ = g_file_get_path (_tmp37_);
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp35_);
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp38_;
-#line 16008 "BatchImport.c"
+#line 16012 "BatchImport.c"
 			} else {
 				PreparedFile* _tmp39_;
 				const gchar* _tmp40_;
 				gchar* _tmp41_;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp39_ = prepared_file;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp40_ = _tmp39_->source_id;
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp41_ = g_strdup (_tmp40_);
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_g_free0 (_tmp35_);
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp35_ = _tmp41_;
-#line 16023 "BatchImport.c"
+#line 16027 "BatchImport.c"
 			}
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp42_ = g_strdup (_tmp35_);
-#line 1966 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1981 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			filename = _tmp42_;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp43_ = prepared_file;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp43_->job;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp45_ = prepared_file;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp46_ = _tmp45_->file;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp47_ = filename;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp48_ = filename;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp49_ = err;
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp50_ = batch_import_result_new_from_error (_tmp44_, _tmp46_, _tmp47_, _tmp48_, _tmp49_, IMPORT_RESULT_FILE_ERROR);
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_batch_import_result_unref0 (self->failed);
-#line 1967 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1982 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			self->failed = _tmp50_;
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (filename);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_free0 (_tmp35_);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1970 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1985 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16063 "BatchImport.c"
+#line 16067 "BatchImport.c"
 		}
-		__finally422:
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally434:
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1950 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1965 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16080 "BatchImport.c"
+#line 16084 "BatchImport.c"
 		}
 	}
-#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp51_ = final_file;
-#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp52_ = g_file_get_path (_tmp51_);
-#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp53_ = _tmp52_;
-#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	g_debug ("BatchImport.vala:1974: Importing %s", _tmp53_);
-#line 1974 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp53_);
-#line 1976 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp51_ = final_associated_file;
+#line 1991 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp51_ == NULL) {
+#line 16091 "BatchImport.c"
+		PreparedFile* _tmp52_;
+		BatchImportJob* _tmp53_;
+		GFile* _tmp54_;
+#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp52_ = prepared_file;
+#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp53_ = _tmp52_->job;
+#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp54_ = batch_import_job_get_associated_file (_tmp53_);
+#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_g_object_unref0 (final_associated_file);
+#line 1992 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		final_associated_file = _tmp54_;
+#line 16105 "BatchImport.c"
+	}
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp55_ = final_file;
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp56_ = g_file_get_path (_tmp55_);
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp57_ = _tmp56_;
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	g_debug ("BatchImport.vala:1995: Importing %s", _tmp57_);
+#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_free0 (_tmp57_);
+#line 1997 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_result_ = IMPORT_RESULT_SUCCESS;
-#line 1977 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1998 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	video_import_params = NULL;
-#line 1978 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	photo_import_params = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp54_ = prepared_file;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp55_ = _tmp54_->is_video;
-#line 1979 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp55_) {
-#line 16105 "BatchImport.c"
-		GFile* _tmp56_;
-		ImportID _tmp57_;
-		PreparedFile* _tmp58_;
-		const gchar* _tmp59_;
-		Thumbnails* _tmp60_;
-		Thumbnails* _tmp61_;
+#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp58_ = prepared_file;
+#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp59_ = _tmp58_->is_video;
+#line 2000 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp59_) {
+#line 16129 "BatchImport.c"
+		GFile* _tmp60_;
+		ImportID _tmp61_;
 		PreparedFile* _tmp62_;
-		BatchImportJob* _tmp63_;
-		time_t _tmp64_;
-		VideoImportParams* _tmp65_;
-		VideoImportParams* _tmp66_;
-		ImportResult _tmp67_;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp56_ = final_file;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp57_ = self->priv->import_id;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp58_ = prepared_file;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp59_ = _tmp58_->full_md5;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp60_ = thumbnails_new ();
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp61_ = _tmp60_;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		const gchar* _tmp63_;
+		Thumbnails* _tmp64_;
+		Thumbnails* _tmp65_;
+		PreparedFile* _tmp66_;
+		BatchImportJob* _tmp67_;
+		time_t _tmp68_;
+		VideoImportParams* _tmp69_;
+		VideoImportParams* _tmp70_;
+		ImportResult _tmp71_;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp60_ = final_file;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp61_ = self->priv->import_id;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp62_ = prepared_file;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp63_ = _tmp62_->job;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp64_ = batch_import_job_get_exposure_time_override (_tmp63_);
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp65_ = video_import_params_new (_tmp56_, &_tmp57_, _tmp59_, _tmp61_, _tmp64_);
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp63_ = _tmp62_->full_md5;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp64_ = thumbnails_new ();
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp65_ = _tmp64_;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp66_ = prepared_file;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp67_ = _tmp66_->job;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp68_ = batch_import_job_get_exposure_time_override (_tmp67_);
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp69_ = video_import_params_new (_tmp60_, &_tmp61_, _tmp63_, _tmp65_, _tmp68_);
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_video_import_params_unref0 (video_import_params);
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		video_import_params = _tmp65_;
-#line 1980 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_thumbnails_unref0 (_tmp61_);
-#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp66_ = video_import_params;
-#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp67_ = video_reader_prepare_for_import (_tmp66_);
-#line 1984 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_result_ = _tmp67_;
-#line 16150 "BatchImport.c"
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		video_import_params = _tmp69_;
+#line 2001 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_thumbnails_unref0 (_tmp65_);
+#line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp70_ = video_import_params;
+#line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp71_ = video_reader_prepare_for_import (_tmp70_);
+#line 2005 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_result_ = _tmp71_;
+#line 16174 "BatchImport.c"
 	} else {
-		GFile* _tmp68_;
-		GFile* _tmp69_;
-		ImportID _tmp70_;
-		PreparedFile* _tmp71_;
-		const gchar* _tmp72_;
-		PreparedFile* _tmp73_;
-		const gchar* _tmp74_;
+		GFile* _tmp72_;
+		GFile* _tmp73_;
+		ImportID _tmp74_;
 		PreparedFile* _tmp75_;
 		const gchar* _tmp76_;
-		Thumbnails* _tmp77_;
-		Thumbnails* _tmp78_;
-		PhotoImportParams* _tmp79_;
-		PhotoImportParams* _tmp80_;
-		ImportResult _tmp81_;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp68_ = final_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp69_ = final_associated_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp70_ = self->priv->import_id;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp71_ = prepared_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp72_ = _tmp71_->exif_md5;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp73_ = prepared_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp74_ = _tmp73_->thumbnail_md5;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		PreparedFile* _tmp77_;
+		const gchar* _tmp78_;
+		PreparedFile* _tmp79_;
+		const gchar* _tmp80_;
+		Thumbnails* _tmp81_;
+		Thumbnails* _tmp82_;
+		PhotoImportParams* _tmp83_;
+		PhotoImportParams* _tmp84_;
+		ImportResult _tmp85_;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp72_ = final_file;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp73_ = final_associated_file;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp74_ = self->priv->import_id;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp75_ = prepared_file;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp76_ = _tmp75_->full_md5;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp77_ = thumbnails_new ();
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp78_ = _tmp77_;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp79_ = photo_import_params_new (_tmp68_, _tmp69_, &_tmp70_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp72_, _tmp74_, _tmp76_, _tmp78_);
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp76_ = _tmp75_->exif_md5;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp77_ = prepared_file;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp78_ = _tmp77_->thumbnail_md5;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp79_ = prepared_file;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp80_ = _tmp79_->full_md5;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp81_ = thumbnails_new ();
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp82_ = _tmp81_;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp83_ = photo_import_params_new (_tmp72_, _tmp73_, &_tmp74_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, _tmp76_, _tmp78_, _tmp80_, _tmp82_);
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_photo_import_params_unref0 (photo_import_params);
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		photo_import_params = _tmp79_;
-#line 1986 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_thumbnails_unref0 (_tmp78_);
-#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp80_ = photo_import_params;
-#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp81_ = photo_prepare_for_import (_tmp80_);
-#line 1990 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_result_ = _tmp81_;
-#line 16202 "BatchImport.c"
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		photo_import_params = _tmp83_;
+#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_thumbnails_unref0 (_tmp82_);
+#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp84_ = photo_import_params;
+#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp85_ = photo_prepare_for_import (_tmp84_);
+#line 2011 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_result_ = _tmp85_;
+#line 16226 "BatchImport.c"
 	}
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp83_ = _result_;
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp83_ != IMPORT_RESULT_SUCCESS) {
-#line 16208 "BatchImport.c"
-		GFile* _tmp84_;
-		PreparedFile* _tmp85_;
-		GFile* _tmp86_;
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp84_ = final_file;
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp85_ = prepared_file;
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp86_ = _tmp85_->file;
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp82_ = _tmp84_ != _tmp86_;
-#line 16220 "BatchImport.c"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp87_ = _result_;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp87_ != IMPORT_RESULT_SUCCESS) {
+#line 16232 "BatchImport.c"
+		GFile* _tmp88_;
+		PreparedFile* _tmp89_;
+		GFile* _tmp90_;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp88_ = final_file;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp89_ = prepared_file;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp90_ = _tmp89_->file;
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp86_ = _tmp88_ != _tmp90_;
+#line 16244 "BatchImport.c"
 	} else {
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp82_ = FALSE;
-#line 16224 "BatchImport.c"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp86_ = FALSE;
+#line 16248 "BatchImport.c"
 	}
-#line 1993 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp82_) {
-#line 16228 "BatchImport.c"
-		GFile* _tmp87_;
-		gchar* _tmp88_;
-		gchar* _tmp89_;
-#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp87_ = final_file;
-#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp88_ = g_file_get_path (_tmp87_);
-#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp89_ = _tmp88_;
-#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		g_debug ("BatchImport.vala:1994: Deleting failed imported copy %s", _tmp89_);
-#line 1994 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_g_free0 (_tmp89_);
-#line 16242 "BatchImport.c"
+#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp86_) {
+#line 16252 "BatchImport.c"
+		GFile* _tmp91_;
+		gchar* _tmp92_;
+		gchar* _tmp93_;
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp91_ = final_file;
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp92_ = g_file_get_path (_tmp91_);
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp93_ = _tmp92_;
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		g_debug ("BatchImport.vala:2015: Deleting failed imported copy %s", _tmp93_);
+#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_g_free0 (_tmp93_);
+#line 16266 "BatchImport.c"
 		{
-			GFile* _tmp90_;
-#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp90_ = final_file;
-#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_file_delete (_tmp90_, NULL, &_inner_error_);
-#line 1996 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp94_;
+#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp94_ = final_file;
+#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_file_delete (_tmp94_, NULL, &_inner_error_);
+#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16251 "BatchImport.c"
-				goto __catch423_g_error;
+#line 16275 "BatchImport.c"
+				goto __catch435_g_error;
 			}
 		}
-		goto __finally423;
-		__catch423_g_error:
+		goto __finally435;
+		__catch435_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp91_;
-			gchar* _tmp92_;
-			gchar* _tmp93_;
-			GError* _tmp94_;
-			const gchar* _tmp95_;
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			GFile* _tmp95_;
+			gchar* _tmp96_;
+			gchar* _tmp97_;
+			GError* _tmp98_;
+			const gchar* _tmp99_;
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			err = _inner_error_;
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_inner_error_ = NULL;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp91_ = final_file;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp92_ = g_file_get_path (_tmp91_);
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp93_ = _tmp92_;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp94_ = err;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_tmp95_ = _tmp94_->message;
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			g_warning ("BatchImport.vala:1999: Unable to delete copy of imported file %s: %s", _tmp93_, _tmp95_);
-#line 1999 "/home/jens/Source/shotwell/src/BatchImport.vala"
-			_g_free0 (_tmp93_);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp95_ = final_file;
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp96_ = g_file_get_path (_tmp95_);
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp97_ = _tmp96_;
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp98_ = err;
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_tmp99_ = _tmp98_->message;
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			g_warning ("BatchImport.vala:2020: Unable to delete copy of imported file %s: %s", _tmp97_, _tmp99_);
+#line 2020 "/home/jens/Source/shotwell/src/BatchImport.vala"
+			_g_free0 (_tmp97_);
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_error_free0 (err);
-#line 16284 "BatchImport.c"
+#line 16308 "BatchImport.c"
 		}
-		__finally423:
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		__finally435:
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_photo_import_params_unref0 (photo_import_params);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_video_import_params_unref0 (video_import_params);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_associated_file);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_g_object_unref0 (final_file);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_prepared_file_unref0 (prepared_file);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			g_clear_error (&_inner_error_);
-#line 1995 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return;
-#line 16305 "BatchImport.c"
+#line 16329 "BatchImport.c"
 		}
 	}
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp96_ = prepared_file;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp97_ = _tmp96_->job;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp98_ = final_file;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp99_ = final_file;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp100_ = g_file_get_path (_tmp99_);
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp101_ = _tmp100_;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp100_ = prepared_file;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp101_ = _tmp100_->job;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp102_ = final_file;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp103_ = g_file_get_path (_tmp102_);
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp104_ = _tmp103_;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp105_ = _result_;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp106_ = batch_import_result_new (_tmp97_, _tmp98_, _tmp101_, _tmp104_, NULL, _tmp105_);
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp107_ = _tmp106_;
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp104_);
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_g_free0 (_tmp101_);
-#line 2004 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	batch_result = _tmp107_;
-#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp108_ = batch_result;
-#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	_tmp109_ = _tmp108_->result;
-#line 2006 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	if (_tmp109_ != IMPORT_RESULT_SUCCESS) {
-#line 16344 "BatchImport.c"
-		BatchImportResult* _tmp110_;
-		BatchImportResult* _tmp111_;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp110_ = batch_result;
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp111_ = _batch_import_result_ref0 (_tmp110_);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp103_ = final_file;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp104_ = g_file_get_path (_tmp103_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp105_ = _tmp104_;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp106_ = final_file;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp107_ = g_file_get_path (_tmp106_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp108_ = _tmp107_;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp109_ = _result_;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp110_ = batch_import_result_new (_tmp101_, _tmp102_, _tmp105_, _tmp108_, NULL, _tmp109_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp111_ = _tmp110_;
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_free0 (_tmp108_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_g_free0 (_tmp105_);
+#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	batch_result = _tmp111_;
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp112_ = batch_result;
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	_tmp113_ = _tmp112_->result;
+#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	if (_tmp113_ != IMPORT_RESULT_SUCCESS) {
+#line 16368 "BatchImport.c"
+		BatchImportResult* _tmp114_;
+		BatchImportResult* _tmp115_;
+#line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp114_ = batch_result;
+#line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp115_ = _batch_import_result_ref0 (_tmp114_);
+#line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_batch_import_result_unref0 (self->failed);
-#line 2007 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->failed = _tmp111_;
-#line 16355 "BatchImport.c"
+#line 2028 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		self->failed = _tmp115_;
+#line 16379 "BatchImport.c"
 	} else {
-		GFile* _tmp112_;
-		PreparedFile* _tmp113_;
-		PhotoImportParams* _tmp114_;
-		VideoImportParams* _tmp115_;
-		BatchImportResult* _tmp116_;
-		ReadyForImport* _tmp117_;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp112_ = final_file;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp113_ = prepared_file;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp114_ = photo_import_params;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp115_ = video_import_params;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp116_ = batch_result;
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		_tmp117_ = ready_for_import_new (_tmp112_, _tmp113_, _tmp114_, _tmp115_, _tmp116_);
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		GFile* _tmp116_;
+		PreparedFile* _tmp117_;
+		PhotoImportParams* _tmp118_;
+		VideoImportParams* _tmp119_;
+		BatchImportResult* _tmp120_;
+		ReadyForImport* _tmp121_;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp116_ = final_file;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp117_ = prepared_file;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp118_ = photo_import_params;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp119_ = video_import_params;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp120_ = batch_result;
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		_tmp121_ = ready_for_import_new (_tmp116_, _tmp117_, _tmp118_, _tmp119_, _tmp120_);
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_ready_for_import_unref0 (self->ready);
-#line 2009 "/home/jens/Source/shotwell/src/BatchImport.vala"
-		self->ready = _tmp117_;
-#line 16379 "BatchImport.c"
+#line 2030 "/home/jens/Source/shotwell/src/BatchImport.vala"
+		self->ready = _tmp121_;
+#line 16403 "BatchImport.c"
 	}
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (batch_result);
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_photo_import_params_unref0 (photo_import_params);
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_video_import_params_unref0 (video_import_params);
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (final_associated_file);
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (final_file);
-#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1957 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (prepared_file);
-#line 16393 "BatchImport.c"
+#line 16417 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_class_init (PreparedFileImportJobClass * klass) {
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	prepared_file_import_job_parent_class = g_type_class_peek_parent (klass);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = prepared_file_import_job_finalize;
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_type_class_add_private (klass, sizeof (PreparedFileImportJobPrivate));
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) prepared_file_import_job_real_execute;
-#line 16406 "BatchImport.c"
+#line 16430 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_instance_init (PreparedFileImportJob * self) {
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->priv = PREPARED_FILE_IMPORT_JOB_GET_PRIVATE (self);
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ready = NULL;
-#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->failed = NULL;
-#line 16417 "BatchImport.c"
+#line 16441 "BatchImport.c"
 }
 
 
 static void prepared_file_import_job_finalize (BackgroundJob * obj) {
 	PreparedFileImportJob * self;
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREPARED_FILE_IMPORT_JOB, PreparedFileImportJob);
-#line 1926 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1941 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_prepared_file_unref0 (self->not_ready);
-#line 1927 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1942 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_ready_for_import_unref0 (self->ready);
-#line 1928 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->failed);
-#line 1925 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 1940 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (prepared_file_import_job_parent_class)->finalize (obj);
-#line 16433 "BatchImport.c"
+#line 16457 "BatchImport.c"
 }
 
 
@@ -16466,282 +16490,282 @@ CompletedImportObject* completed_import_object_construct (GType object_type, Med
 	BatchImportJob* _tmp7_;
 	Thumbnails* _tmp8_;
 	GdkPixbuf* _tmp9_;
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_THUMBNAILS (thumbnails), NULL);
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_JOB (original_job), NULL);
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT_RESULT (import_result), NULL);
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (CompletedImportObject*) g_type_create_instance (object_type);
-#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = thumbnails;
-#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = _thumbnails_ref0 (_tmp0_);
-#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (self->thumbnails);
-#line 2023 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->thumbnails = _tmp1_;
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = import_result;
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = _batch_import_result_ref0 (_tmp2_);
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 2024 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->batch_result = _tmp3_;
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = source;
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->source);
-#line 2025 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->source = _tmp5_;
-#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = original_job;
-#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _batch_import_job_ref0 (_tmp6_);
-#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->original_job);
-#line 2026 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2047 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->original_job = _tmp7_;
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp8_ = thumbnails;
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp9_ = thumbnails_get (_tmp8_, THUMBNAIL_CACHE_SIZE_LARGEST);
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 2027 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->user_preview = _tmp9_;
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 16513 "BatchImport.c"
+#line 16537 "BatchImport.c"
 }
 
 
 CompletedImportObject* completed_import_object_new (MediaSource* source, Thumbnails* thumbnails, BatchImportJob* original_job, BatchImportResult* import_result) {
-#line 2021 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return completed_import_object_construct (TYPE_COMPLETED_IMPORT_OBJECT, source, thumbnails, original_job, import_result);
-#line 16520 "BatchImport.c"
+#line 16544 "BatchImport.c"
 }
 
 
 static void value_completed_import_object_init (GValue* value) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	value->data[0].v_pointer = NULL;
-#line 16527 "BatchImport.c"
+#line 16551 "BatchImport.c"
 }
 
 
 static void value_completed_import_object_free_value (GValue* value) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (value->data[0].v_pointer) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (value->data[0].v_pointer);
-#line 16536 "BatchImport.c"
+#line 16560 "BatchImport.c"
 	}
 }
 
 
 static void value_completed_import_object_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = completed_import_object_ref (src_value->data[0].v_pointer);
-#line 16546 "BatchImport.c"
+#line 16570 "BatchImport.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16550 "BatchImport.c"
+#line 16574 "BatchImport.c"
 	}
 }
 
 
 static gpointer value_completed_import_object_peek_pointer (const GValue* value) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16558 "BatchImport.c"
+#line 16582 "BatchImport.c"
 }
 
 
 static gchar* value_completed_import_object_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (collect_values[0].v_pointer) {
-#line 16565 "BatchImport.c"
+#line 16589 "BatchImport.c"
 		CompletedImportObject * object;
 		object = collect_values[0].v_pointer;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16572 "BatchImport.c"
+#line 16596 "BatchImport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.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 16576 "BatchImport.c"
+#line 16600 "BatchImport.c"
 		}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = completed_import_object_ref (object);
-#line 16580 "BatchImport.c"
+#line 16604 "BatchImport.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16584 "BatchImport.c"
+#line 16608 "BatchImport.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16588 "BatchImport.c"
+#line 16612 "BatchImport.c"
 }
 
 
 static gchar* value_completed_import_object_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	CompletedImportObject ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!object_p) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16599 "BatchImport.c"
+#line 16623 "BatchImport.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (!value->data[0].v_pointer) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = NULL;
-#line 16605 "BatchImport.c"
+#line 16629 "BatchImport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16609 "BatchImport.c"
+#line 16633 "BatchImport.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		*object_p = completed_import_object_ref (value->data[0].v_pointer);
-#line 16613 "BatchImport.c"
+#line 16637 "BatchImport.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return NULL;
-#line 16617 "BatchImport.c"
+#line 16641 "BatchImport.c"
 }
 
 
 GParamSpec* param_spec_completed_import_object (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecCompletedImportObject* spec;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return G_PARAM_SPEC (spec);
-#line 16631 "BatchImport.c"
+#line 16655 "BatchImport.c"
 }
 
 
 gpointer value_get_completed_import_object (const GValue* value) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return value->data[0].v_pointer;
-#line 16640 "BatchImport.c"
+#line 16664 "BatchImport.c"
 }
 
 
 void value_set_completed_import_object (GValue* value, gpointer v_object) {
 	CompletedImportObject * old;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_ref (value->data[0].v_pointer);
-#line 16660 "BatchImport.c"
+#line 16684 "BatchImport.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16664 "BatchImport.c"
+#line 16688 "BatchImport.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 16670 "BatchImport.c"
+#line 16694 "BatchImport.c"
 	}
 }
 
 
 void value_take_completed_import_object (GValue* value, gpointer v_object) {
 	CompletedImportObject * old;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	old = value->data[0].v_pointer;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (v_object) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_COMPLETED_IMPORT_OBJECT));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = v_object;
-#line 16689 "BatchImport.c"
+#line 16713 "BatchImport.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		value->data[0].v_pointer = NULL;
-#line 16693 "BatchImport.c"
+#line 16717 "BatchImport.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (old) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		completed_import_object_unref (old);
-#line 16699 "BatchImport.c"
+#line 16723 "BatchImport.c"
 	}
 }
 
 
 static void completed_import_object_class_init (CompletedImportObjectClass * klass) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	completed_import_object_parent_class = g_type_class_peek_parent (klass);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((CompletedImportObjectClass *) klass)->finalize = completed_import_object_finalize;
-#line 16709 "BatchImport.c"
+#line 16733 "BatchImport.c"
 }
 
 
 static void completed_import_object_instance_init (CompletedImportObject * self) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->ref_count = 1;
-#line 16716 "BatchImport.c"
+#line 16740 "BatchImport.c"
 }
 
 
 static void completed_import_object_finalize (CompletedImportObject * obj) {
 	CompletedImportObject * self;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COMPLETED_IMPORT_OBJECT, CompletedImportObject);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_signal_handlers_destroy (self);
-#line 2015 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (self->thumbnails);
-#line 2016 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2037 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_result_unref0 (self->batch_result);
-#line 2017 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->source);
-#line 2018 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_batch_import_job_unref0 (self->original_job);
-#line 2019 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2040 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_g_object_unref0 (self->user_preview);
-#line 16736 "BatchImport.c"
+#line 16760 "BatchImport.c"
 }
 
 
@@ -16762,24 +16786,24 @@ GType completed_import_object_get_type (void) {
 gpointer completed_import_object_ref (gpointer instance) {
 	CompletedImportObject * self;
 	self = instance;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return instance;
-#line 16761 "BatchImport.c"
+#line 16785 "BatchImport.c"
 }
 
 
 void completed_import_object_unref (gpointer instance) {
 	CompletedImportObject * self;
 	self = instance;
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		COMPLETED_IMPORT_OBJECT_GET_CLASS (self)->finalize (self);
-#line 2014 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2035 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16774 "BatchImport.c"
+#line 16798 "BatchImport.c"
 	}
 }
 
@@ -16796,52 +16820,52 @@ ThumbnailWriterJob* thumbnail_writer_job_construct (GType object_type, BatchImpo
 	Thumbnails* _tmp5_;
 	CompletedImportObject* _tmp6_;
 	CompletedImportObject* _tmp7_;
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_BATCH_IMPORT (owner), NULL);
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (IS_COMPLETED_IMPORT_OBJECT (completed_import_source), NULL);
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp0_ = owner;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1_ = callback;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp1__target = callback_target;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp2_ = cancellable;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3_ = cancel_callback;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp3__target = cancel_callback_target;
-#line 2036 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2057 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = (ThumbnailWriterJob*) background_import_job_construct (object_type, _tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp3_, _tmp3__target);
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp4_ = completed_import_source;
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp5_ = _tmp4_->thumbnails;
-#line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2059 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_vala_assert (_tmp5_ != NULL, "completed_import_source.thumbnails != null");
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp6_ = completed_import_source;
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp7_ = _completed_import_object_ref0 (_tmp6_);
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (self->completed_import_source);
-#line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2060 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self->completed_import_source = _tmp7_;
-#line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2062 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return self;
-#line 16829 "BatchImport.c"
+#line 16853 "BatchImport.c"
 }
 
 
 ThumbnailWriterJob* thumbnail_writer_job_new (BatchImport* owner, CompletedImportObject* completed_import_source, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancel_callback, void* cancel_callback_target) {
-#line 2034 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return thumbnail_writer_job_construct (TYPE_THUMBNAIL_WRITER_JOB, owner, completed_import_source, callback, callback_target, cancellable, cancel_callback, cancel_callback_target);
-#line 16836 "BatchImport.c"
+#line 16860 "BatchImport.c"
 }
 
 
@@ -16849,9 +16873,9 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 	ThumbnailWriterJob * self;
 	CompletedImportObject* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 2044 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2065 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 16846 "BatchImport.c"
+#line 16870 "BatchImport.c"
 	{
 		CompletedImportObject* _tmp0_;
 		MediaSource* _tmp1_;
@@ -16859,84 +16883,84 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		Thumbnails* _tmp3_;
 		CompletedImportObject* _tmp4_;
 		BatchImportResult* _tmp5_;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp0_ = self->completed_import_source;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp1_ = _tmp0_->source;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp2_ = self->completed_import_source;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp3_ = _tmp2_->thumbnails;
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		thumbnail_cache_import_thumbnails (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, TRUE, &_inner_error_);
-#line 2046 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2067 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16866 "BatchImport.c"
-			goto __catch424_g_error;
+#line 16890 "BatchImport.c"
+			goto __catch436_g_error;
 		}
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->completed_import_source;
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_ = _tmp4_->batch_result;
-#line 2048 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2069 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
-#line 16875 "BatchImport.c"
+#line 16899 "BatchImport.c"
 	}
-	goto __finally424;
-	__catch424_g_error:
+	goto __finally436;
+	__catch436_g_error:
 	{
 		GError* err = NULL;
 		CompletedImportObject* _tmp6_;
 		BatchImportResult* _tmp7_;
 		GError* _tmp8_;
 		ImportResult _tmp9_;
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		err = _inner_error_;
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_inner_error_ = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp6_ = self->completed_import_source;
-#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_ = _tmp6_->batch_result;
-#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp8_ = err;
-#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp9_ = import_result_convert_error (_tmp8_, IMPORT_RESULT_FILE_ERROR);
-#line 2050 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2071 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp7_->result = _tmp9_;
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_g_error_free0 (err);
-#line 16901 "BatchImport.c"
+#line 16925 "BatchImport.c"
 	}
-	__finally424:
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+	__finally436:
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		g_clear_error (&_inner_error_);
-#line 2045 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2066 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		return;
-#line 16912 "BatchImport.c"
+#line 16936 "BatchImport.c"
 	}
-#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_ = self->completed_import_source;
-#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_thumbnails_unref0 (_tmp10_->thumbnails);
-#line 2055 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2076 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp10_->thumbnails = NULL;
-#line 16920 "BatchImport.c"
+#line 16944 "BatchImport.c"
 }
 
 
 static void thumbnail_writer_job_class_init (ThumbnailWriterJobClass * klass) {
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	thumbnail_writer_job_parent_class = g_type_class_peek_parent (klass);
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->finalize = thumbnail_writer_job_finalize;
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) thumbnail_writer_job_real_execute;
-#line 16931 "BatchImport.c"
+#line 16955 "BatchImport.c"
 }
 
 
@@ -16946,13 +16970,13 @@ static void thumbnail_writer_job_instance_init (ThumbnailWriterJob * self) {
 
 static void thumbnail_writer_job_finalize (BackgroundJob * obj) {
 	ThumbnailWriterJob * self;
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL_WRITER_JOB, ThumbnailWriterJob);
-#line 2032 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2053 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_completed_import_object_unref0 (self->completed_import_source);
-#line 2031 "/home/jens/Source/shotwell/src/BatchImport.vala"
+#line 2052 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	BACKGROUND_JOB_CLASS (thumbnail_writer_job_parent_class)->finalize (obj);
-#line 16947 "BatchImport.c"
+#line 16971 "BatchImport.c"
 }
 
 
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 8e4ae5c..0e31441 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -171,6 +171,10 @@ public abstract class BatchImportJob {
     public virtual DuplicatedFile? get_duplicated_file() {
         return null;
     }
+
+    public virtual File? get_associated_file() {
+        return null;
+    }
     
     // Attaches a sibling job (for RAW+JPEG)
     public abstract void set_associated(BatchImportJob associated);
@@ -202,16 +206,22 @@ public abstract class BatchImportJob {
     public virtual time_t get_exposure_time_override() {
         return 0;
     }
+
+    public virtual bool recurse() {
+        return true;
+    }
 }
 
 public class FileImportJob : BatchImportJob {
     private File file_or_dir;
     private bool copy_to_library;
     private FileImportJob? associated = null;
+    private bool _recurse;
     
-    public FileImportJob(File file_or_dir, bool copy_to_library) {
+    public FileImportJob(File file_or_dir, bool copy_to_library, bool recurse) {
         this.file_or_dir = file_or_dir;
         this.copy_to_library = copy_to_library;
+        this._recurse = recurse;
     }
     
     public override string get_dest_identifier() {
@@ -255,6 +265,10 @@ public class FileImportJob : BatchImportJob {
     public File get_file() {
         return file_or_dir;
     }
+
+    public override bool recurse() {
+        return this._recurse;
+    }
 }
 
 // A BatchImportRoll represents important state for a group of imported media.  If this is shared
@@ -317,9 +331,11 @@ public class ImportManifest {
     public Gee.List<BatchImportResult> already_imported = new Gee.ArrayList<BatchImportResult>();
     public Gee.List<BatchImportResult> corrupt_files = new Gee.ArrayList<BatchImportResult>();
     public Gee.List<BatchImportResult> all = new Gee.ArrayList<BatchImportResult>();
+    public GLib.Timer timer;
     
     public ImportManifest(Gee.List<BatchImportJob>? prefailed = null,
         Gee.List<BatchImportJob>? pre_already_imported = null) {
+        this.timer = new Timer();
         if (prefailed != null) {
             foreach (BatchImportJob job in prefailed) {
                 BatchImportResult batch_result = new BatchImportResult(job, null, 
@@ -613,6 +629,7 @@ public class BatchImport : Object {
         flush_ready_sources();
         
         log_status("Import completed: %s".printf(where));
+        debug("Import complete after %f", manifest.timer.elapsed());
         
         // report completed to the reporter (called prior to the "import_complete" signal)
         if (reporter != null)
@@ -1054,7 +1071,7 @@ public class BatchImport : Object {
                         d = RawDeveloper.EMBEDDED;
                     
                     photo.set_default_raw_developer(d);
-                    photo.set_raw_developer(d);
+                    photo.set_raw_developer(d, false);
                 }
             }
             
@@ -1560,7 +1577,7 @@ private class WorkSniffer : BackgroundImportJob {
             assert(query_is_directory(dir));
             
             try {
-                search_dir(job, dir, copy_to_library);
+                search_dir(job, dir, copy_to_library, job.recurse());
             } catch (Error err) {
                 report_error(job, dir, job.get_source_identifier(), dir.get_path(), err,    
                     ImportResult.FILE_ERROR);
@@ -1579,7 +1596,7 @@ private class WorkSniffer : BackgroundImportJob {
         }
     }
     
-    public void search_dir(BatchImportJob job, File dir, bool copy_to_library) throws Error {
+    public void search_dir(BatchImportJob job, File dir, bool copy_to_library, bool recurse) throws Error {
         FileEnumerator enumerator = dir.enumerate_children("standard::*",
             FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
         
@@ -1593,11 +1610,14 @@ private class WorkSniffer : BackgroundImportJob {
             FileType file_type = info.get_file_type();
             
             if (file_type == FileType.DIRECTORY) {
+                if (!recurse)
+                    continue;
+
                 if (info.get_name().has_prefix("."))
                     continue;
 
                 try {
-                    search_dir(job, child, copy_to_library);
+                    search_dir(job, child, copy_to_library, recurse);
                 } catch (Error err) {
                     report_error(job, child, child.get_path(), child.get_path(), err, 
                         ImportResult.FILE_ERROR);
@@ -1842,13 +1862,8 @@ private class PrepareFilesJob : BackgroundImportJob {
             }
             
             if (metadata != null) {
-                uint8[]? flattened_sans_thumbnail = metadata.flatten_exif(false);
-                if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
-                    exif_only_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
-                
-                uint8[]? flattened_thumbnail = metadata.flatten_exif_preview();
-                if (flattened_thumbnail != null && flattened_thumbnail.length > 0)
-                    thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length);
+                exif_only_md5 = metadata.exif_hash ();
+                thumbnail_md5 = metadata.thumbnail_hash();
             }
         }
 
@@ -1970,6 +1985,12 @@ private class PreparedFileImportJob : BackgroundJob {
                 return;
             }
         }
+
+        // See if the prepared job has a file associated already, then use that
+        // Usually works for import from Cameras
+        if (final_associated_file == null) {
+            final_associated_file = prepared_file.job.get_associated_file();
+        }
         
         debug("Importing %s", final_file.get_path());
         
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index ba1ba15..1ba0afb 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -563,6 +563,7 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion);
 void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin);
 static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
 static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self, gint scale);
 gint thumbnail_get_MIN_SCALE (void);
 gint thumbnail_get_MAX_SCALE (void);
@@ -705,6 +706,7 @@ static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocati
 static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx);
 static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, cairo_t* ctx);
 static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x, gint y, gboolean keyboard_mode, GtkTooltip* tooltip);
+void invalidate_transparent_background (void);
 static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEventFocus* event);
 GeeList* view_collection_get_selected (ViewCollection* self);
 static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEventFocus* event);
@@ -750,14 +752,14 @@ CheckerboardItemText* checkerboard_item_text_construct (GType object_type, const
 	self->priv->single_line = _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 754 "CheckerboardLayout.c"
+#line 756 "CheckerboardLayout.c"
 }
 
 
 CheckerboardItemText* checkerboard_item_text_new (const gchar* text, PangoAlignment alignment, gboolean marked_up) {
 #line 19 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return checkerboard_item_text_construct (TYPE_CHECKERBOARD_ITEM_TEXT, text, alignment, marked_up);
-#line 761 "CheckerboardLayout.c"
+#line 763 "CheckerboardLayout.c"
 }
 
 
@@ -775,7 +777,7 @@ static gboolean checkerboard_item_text_is_single_line (CheckerboardItemText* sel
 	result = !_tmp1_;
 #line 29 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 779 "CheckerboardLayout.c"
+#line 781 "CheckerboardLayout.c"
 }
 
 
@@ -790,7 +792,7 @@ gboolean checkerboard_item_text_is_marked_up (CheckerboardItemText* self) {
 	result = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 794 "CheckerboardLayout.c"
+#line 796 "CheckerboardLayout.c"
 }
 
 
@@ -810,7 +812,7 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 	_tmp3_ = marked_up;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 814 "CheckerboardLayout.c"
+#line 816 "CheckerboardLayout.c"
 		PangoAlignment _tmp4_;
 		PangoAlignment _tmp5_;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -819,15 +821,15 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 		_tmp5_ = alignment;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = _tmp4_ == _tmp5_;
-#line 823 "CheckerboardLayout.c"
+#line 825 "CheckerboardLayout.c"
 	} else {
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = FALSE;
-#line 827 "CheckerboardLayout.c"
+#line 829 "CheckerboardLayout.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 831 "CheckerboardLayout.c"
+#line 833 "CheckerboardLayout.c"
 		const gchar* _tmp6_;
 		const gchar* _tmp7_;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -836,17 +838,17 @@ gboolean checkerboard_item_text_is_set_to (CheckerboardItemText* self, const gch
 		_tmp7_ = text;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp7_) == 0;
-#line 840 "CheckerboardLayout.c"
+#line 842 "CheckerboardLayout.c"
 	} else {
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 844 "CheckerboardLayout.c"
+#line 846 "CheckerboardLayout.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 37 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 850 "CheckerboardLayout.c"
+#line 852 "CheckerboardLayout.c"
 }
 
 
@@ -864,7 +866,7 @@ gchar* checkerboard_item_text_get_text (CheckerboardItemText* self) {
 	result = _tmp1_;
 #line 41 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 868 "CheckerboardLayout.c"
+#line 870 "CheckerboardLayout.c"
 }
 
 
@@ -880,7 +882,7 @@ gint checkerboard_item_text_get_height (CheckerboardItemText* self) {
 	if (_tmp0_ == 0) {
 #line 46 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_update_height (self);
-#line 884 "CheckerboardLayout.c"
+#line 886 "CheckerboardLayout.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->height;
@@ -888,14 +890,14 @@ gint checkerboard_item_text_get_height (CheckerboardItemText* self) {
 	result = _tmp1_;
 #line 48 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 892 "CheckerboardLayout.c"
+#line 894 "CheckerboardLayout.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 899 "CheckerboardLayout.c"
+#line 901 "CheckerboardLayout.c"
 }
 
 
@@ -913,13 +915,13 @@ PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self
 	if (_tmp0_ == NULL) {
 #line 53 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_create_pango (self);
-#line 917 "CheckerboardLayout.c"
+#line 919 "CheckerboardLayout.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = max_width;
 #line 55 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ > 0) {
-#line 923 "CheckerboardLayout.c"
+#line 925 "CheckerboardLayout.c"
 		PangoLayout* _tmp2_;
 		gint _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -928,7 +930,7 @@ PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self
 		_tmp3_ = max_width;
 #line 56 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_layout_set_width (_tmp2_, _tmp3_ * PANGO_SCALE);
-#line 932 "CheckerboardLayout.c"
+#line 934 "CheckerboardLayout.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->layout;
@@ -938,7 +940,7 @@ PangoLayout* checkerboard_item_text_get_pango_layout (CheckerboardItemText* self
 	result = _tmp5_;
 #line 58 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 942 "CheckerboardLayout.c"
+#line 944 "CheckerboardLayout.c"
 }
 
 
@@ -949,7 +951,7 @@ void checkerboard_item_text_clear_pango_layout (CheckerboardItemText* self) {
 	_g_object_unref0 (self->priv->layout);
 #line 62 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->layout = NULL;
-#line 953 "CheckerboardLayout.c"
+#line 955 "CheckerboardLayout.c"
 }
 
 
@@ -962,31 +964,31 @@ static void checkerboard_item_text_update_height (CheckerboardItemText* self) {
 	_tmp1_ = checkerboard_item_text_one_line_height;
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != 0) {
-#line 966 "CheckerboardLayout.c"
+#line 968 "CheckerboardLayout.c"
 		gboolean _tmp2_;
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->single_line;
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_;
-#line 972 "CheckerboardLayout.c"
+#line 974 "CheckerboardLayout.c"
 	} else {
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 976 "CheckerboardLayout.c"
+#line 978 "CheckerboardLayout.c"
 	}
 #line 66 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 980 "CheckerboardLayout.c"
+#line 982 "CheckerboardLayout.c"
 		gint _tmp3_;
 #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = checkerboard_item_text_one_line_height;
 #line 67 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->height = _tmp3_;
-#line 986 "CheckerboardLayout.c"
+#line 988 "CheckerboardLayout.c"
 	} else {
 #line 69 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_create_pango (self);
-#line 990 "CheckerboardLayout.c"
+#line 992 "CheckerboardLayout.c"
 	}
 }
 
@@ -1019,7 +1021,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 	_tmp3_ = self->priv->marked_up;
 #line 75 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp3_) {
-#line 1023 "CheckerboardLayout.c"
+#line 1025 "CheckerboardLayout.c"
 		PangoLayout* _tmp4_;
 		const gchar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1028,7 +1030,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 		_tmp5_ = self->priv->text;
 #line 76 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_layout_set_text (_tmp4_, _tmp5_, -1);
-#line 1032 "CheckerboardLayout.c"
+#line 1034 "CheckerboardLayout.c"
 	} else {
 		PangoLayout* _tmp6_;
 		const gchar* _tmp7_;
@@ -1038,7 +1040,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 		_tmp7_ = self->priv->text;
 #line 78 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_layout_set_markup (_tmp6_, _tmp7_, -1);
-#line 1042 "CheckerboardLayout.c"
+#line 1044 "CheckerboardLayout.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->layout;
@@ -1054,27 +1056,27 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 	_tmp12_ = checkerboard_item_text_one_line_height;
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ != 0) {
-#line 1058 "CheckerboardLayout.c"
+#line 1060 "CheckerboardLayout.c"
 		gboolean _tmp13_;
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = self->priv->single_line;
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = _tmp13_;
-#line 1064 "CheckerboardLayout.c"
+#line 1066 "CheckerboardLayout.c"
 	} else {
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = FALSE;
-#line 1068 "CheckerboardLayout.c"
+#line 1070 "CheckerboardLayout.c"
 	}
 #line 85 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp11_) {
-#line 1072 "CheckerboardLayout.c"
+#line 1074 "CheckerboardLayout.c"
 		gint _tmp14_;
 #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = checkerboard_item_text_one_line_height;
 #line 86 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->height = _tmp14_;
-#line 1078 "CheckerboardLayout.c"
+#line 1080 "CheckerboardLayout.c"
 	} else {
 		gint width = 0;
 		PangoLayout* _tmp15_;
@@ -1094,27 +1096,27 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 		_tmp19_ = checkerboard_item_text_one_line_height;
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp19_ == 0) {
-#line 1098 "CheckerboardLayout.c"
+#line 1100 "CheckerboardLayout.c"
 			gboolean _tmp20_;
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp20_ = self->priv->single_line;
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp18_ = _tmp20_;
-#line 1104 "CheckerboardLayout.c"
+#line 1106 "CheckerboardLayout.c"
 		} else {
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp18_ = FALSE;
-#line 1108 "CheckerboardLayout.c"
+#line 1110 "CheckerboardLayout.c"
 		}
 #line 92 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp18_) {
-#line 1112 "CheckerboardLayout.c"
+#line 1114 "CheckerboardLayout.c"
 			gint _tmp21_;
 #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp21_ = self->priv->height;
 #line 93 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_item_text_one_line_height = _tmp21_;
-#line 1118 "CheckerboardLayout.c"
+#line 1120 "CheckerboardLayout.c"
 		}
 	}
 }
@@ -1123,7 +1125,7 @@ static void checkerboard_item_text_create_pango (CheckerboardItemText* self) {
 static void value_checkerboard_item_text_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	value->data[0].v_pointer = NULL;
-#line 1127 "CheckerboardLayout.c"
+#line 1129 "CheckerboardLayout.c"
 }
 
 
@@ -1132,7 +1134,7 @@ static void value_checkerboard_item_text_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_unref (value->data[0].v_pointer);
-#line 1136 "CheckerboardLayout.c"
+#line 1138 "CheckerboardLayout.c"
 	}
 }
 
@@ -1142,11 +1144,11 @@ static void value_checkerboard_item_text_copy_value (const GValue* src_value, GV
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = checkerboard_item_text_ref (src_value->data[0].v_pointer);
-#line 1146 "CheckerboardLayout.c"
+#line 1148 "CheckerboardLayout.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1150 "CheckerboardLayout.c"
+#line 1152 "CheckerboardLayout.c"
 	}
 }
 
@@ -1154,37 +1156,37 @@ static void value_checkerboard_item_text_copy_value (const GValue* src_value, GV
 static gpointer value_checkerboard_item_text_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 1158 "CheckerboardLayout.c"
+#line 1160 "CheckerboardLayout.c"
 }
 
 
 static gchar* value_checkerboard_item_text_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (collect_values[0].v_pointer) {
-#line 1165 "CheckerboardLayout.c"
+#line 1167 "CheckerboardLayout.c"
 		CheckerboardItemText * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1172 "CheckerboardLayout.c"
+#line 1174 "CheckerboardLayout.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.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 1176 "CheckerboardLayout.c"
+#line 1178 "CheckerboardLayout.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = checkerboard_item_text_ref (object);
-#line 1180 "CheckerboardLayout.c"
+#line 1182 "CheckerboardLayout.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 1184 "CheckerboardLayout.c"
+#line 1186 "CheckerboardLayout.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 1188 "CheckerboardLayout.c"
+#line 1190 "CheckerboardLayout.c"
 }
 
 
@@ -1195,25 +1197,25 @@ static gchar* value_checkerboard_item_text_lcopy_value (const GValue* value, gui
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1199 "CheckerboardLayout.c"
+#line 1201 "CheckerboardLayout.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = NULL;
-#line 1205 "CheckerboardLayout.c"
+#line 1207 "CheckerboardLayout.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1209 "CheckerboardLayout.c"
+#line 1211 "CheckerboardLayout.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = checkerboard_item_text_ref (value->data[0].v_pointer);
-#line 1213 "CheckerboardLayout.c"
+#line 1215 "CheckerboardLayout.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 1217 "CheckerboardLayout.c"
+#line 1219 "CheckerboardLayout.c"
 }
 
 
@@ -1227,7 +1229,7 @@ GParamSpec* param_spec_checkerboard_item_text (const gchar* name, const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return G_PARAM_SPEC (spec);
-#line 1231 "CheckerboardLayout.c"
+#line 1233 "CheckerboardLayout.c"
 }
 
 
@@ -1236,7 +1238,7 @@ gpointer value_get_checkerboard_item_text (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CHECKERBOARD_ITEM_TEXT), NULL);
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 1240 "CheckerboardLayout.c"
+#line 1242 "CheckerboardLayout.c"
 }
 
 
@@ -1256,17 +1258,17 @@ void value_set_checkerboard_item_text (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_ref (value->data[0].v_pointer);
-#line 1260 "CheckerboardLayout.c"
+#line 1262 "CheckerboardLayout.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 1264 "CheckerboardLayout.c"
+#line 1266 "CheckerboardLayout.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_unref (old);
-#line 1270 "CheckerboardLayout.c"
+#line 1272 "CheckerboardLayout.c"
 	}
 }
 
@@ -1285,17 +1287,17 @@ void value_take_checkerboard_item_text (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/CheckerboardLayout.vala"
 		value->data[0].v_pointer = v_object;
-#line 1289 "CheckerboardLayout.c"
+#line 1291 "CheckerboardLayout.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 1293 "CheckerboardLayout.c"
+#line 1295 "CheckerboardLayout.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_unref (old);
-#line 1299 "CheckerboardLayout.c"
+#line 1301 "CheckerboardLayout.c"
 	}
 }
 
@@ -1307,7 +1309,7 @@ static void checkerboard_item_text_class_init (CheckerboardItemTextClass * klass
 	((CheckerboardItemTextClass *) klass)->finalize = checkerboard_item_text_finalize;
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardItemTextPrivate));
-#line 1311 "CheckerboardLayout.c"
+#line 1313 "CheckerboardLayout.c"
 }
 
 
@@ -1324,7 +1326,7 @@ static void checkerboard_item_text_instance_init (CheckerboardItemText * self) {
 	memset (&self->allocation, 0, sizeof (GdkRectangle));
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->ref_count = 1;
-#line 1328 "CheckerboardLayout.c"
+#line 1330 "CheckerboardLayout.c"
 }
 
 
@@ -1338,7 +1340,7 @@ static void checkerboard_item_text_finalize (CheckerboardItemText * obj) {
 	_g_free0 (self->priv->text);
 #line 13 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1342 "CheckerboardLayout.c"
+#line 1344 "CheckerboardLayout.c"
 }
 
 
@@ -1363,7 +1365,7 @@ gpointer checkerboard_item_text_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return instance;
-#line 1367 "CheckerboardLayout.c"
+#line 1369 "CheckerboardLayout.c"
 }
 
 
@@ -1376,7 +1378,7 @@ void checkerboard_item_text_unref (gpointer instance) {
 		CHECKERBOARD_ITEM_TEXT_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1380 "CheckerboardLayout.c"
+#line 1382 "CheckerboardLayout.c"
 	}
 }
 
@@ -1396,20 +1398,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 1400 "CheckerboardLayout.c"
+#line 1402 "CheckerboardLayout.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 1407 "CheckerboardLayout.c"
+#line 1409 "CheckerboardLayout.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 1413 "CheckerboardLayout.c"
+#line 1415 "CheckerboardLayout.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -1419,11 +1421,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 1423 "CheckerboardLayout.c"
+#line 1425 "CheckerboardLayout.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1427 "CheckerboardLayout.c"
+#line 1429 "CheckerboardLayout.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -1431,7 +1433,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1435 "CheckerboardLayout.c"
+#line 1437 "CheckerboardLayout.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -1463,8 +1465,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1467 "CheckerboardLayout.c"
-				goto __catch243_g_regex_error;
+#line 1469 "CheckerboardLayout.c"
+				goto __catch254_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -1472,7 +1474,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1476 "CheckerboardLayout.c"
+#line 1478 "CheckerboardLayout.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -1488,8 +1490,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1492 "CheckerboardLayout.c"
-				goto __catch243_g_regex_error;
+#line 1494 "CheckerboardLayout.c"
+				goto __catch254_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1499,7 +1501,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1503 "CheckerboardLayout.c"
+#line 1505 "CheckerboardLayout.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -1513,10 +1515,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1517 "CheckerboardLayout.c"
+#line 1519 "CheckerboardLayout.c"
 	}
-	goto __finally243;
-	__catch243_g_regex_error:
+	goto __finally254;
+	__catch254_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1527,9 +1529,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1531 "CheckerboardLayout.c"
+#line 1533 "CheckerboardLayout.c"
 	}
-	__finally243:
+	__finally254:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1538,7 +1540,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1542 "CheckerboardLayout.c"
+#line 1544 "CheckerboardLayout.c"
 	}
 }
 
@@ -1582,7 +1584,7 @@ CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSourc
 	_tmp6_ = comment;
 #line 152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ != NULL) {
-#line 1586 "CheckerboardLayout.c"
+#line 1588 "CheckerboardLayout.c"
 		const gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -1607,11 +1609,11 @@ CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSourc
 		self->priv->comment = _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp9_);
-#line 1611 "CheckerboardLayout.c"
+#line 1613 "CheckerboardLayout.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 1615 "CheckerboardLayout.c"
+#line 1617 "CheckerboardLayout.c"
 }
 
 
@@ -1626,7 +1628,7 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) {
 	_tmp1_ = self->priv->title;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1630 "CheckerboardLayout.c"
+#line 1632 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		gchar* _tmp3_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1637,7 +1639,7 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) {
 		_g_free0 (_tmp0_);
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1641 "CheckerboardLayout.c"
+#line 1643 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp4_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1646,13 +1648,13 @@ static gchar* checkerboard_item_real_get_name (DataObject* base) {
 		_g_free0 (_tmp0_);
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1650 "CheckerboardLayout.c"
+#line 1652 "CheckerboardLayout.c"
 	}
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 164 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1656 "CheckerboardLayout.c"
+#line 1658 "CheckerboardLayout.c"
 }
 
 
@@ -1666,7 +1668,7 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) {
 	_tmp1_ = self->priv->title;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1670 "CheckerboardLayout.c"
+#line 1672 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		gchar* _tmp3_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1677,7 +1679,7 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1681 "CheckerboardLayout.c"
+#line 1683 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp4_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1686,13 +1688,13 @@ gchar* checkerboard_item_get_title (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1690 "CheckerboardLayout.c"
+#line 1692 "CheckerboardLayout.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1696 "CheckerboardLayout.c"
+#line 1698 "CheckerboardLayout.c"
 }
 
 
@@ -1706,7 +1708,7 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) {
 	_tmp1_ = self->priv->comment;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1710 "CheckerboardLayout.c"
+#line 1712 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		gchar* _tmp3_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1717,7 +1719,7 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 1721 "CheckerboardLayout.c"
+#line 1723 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp4_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -1726,13 +1728,13 @@ gchar* checkerboard_item_get_comment (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 1730 "CheckerboardLayout.c"
+#line 1732 "CheckerboardLayout.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 1736 "CheckerboardLayout.c"
+#line 1738 "CheckerboardLayout.c"
 }
 
 
@@ -1752,7 +1754,7 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 	_tmp1_ = self->priv->title;
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1756 "CheckerboardLayout.c"
+#line 1758 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		const gchar* _tmp3_;
 		gboolean _tmp4_;
@@ -1770,17 +1772,17 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 1774 "CheckerboardLayout.c"
+#line 1776 "CheckerboardLayout.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 1778 "CheckerboardLayout.c"
+#line 1780 "CheckerboardLayout.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1784 "CheckerboardLayout.c"
+#line 1786 "CheckerboardLayout.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -1802,7 +1804,7 @@ void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gbo
 		checkerboard_item_recalc_size (self, "set_title");
 #line 184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1806 "CheckerboardLayout.c"
+#line 1808 "CheckerboardLayout.c"
 	}
 }
 
@@ -1818,7 +1820,7 @@ void checkerboard_item_clear_title (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1822 "CheckerboardLayout.c"
+#line 1824 "CheckerboardLayout.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->title);
@@ -1832,7 +1834,7 @@ void checkerboard_item_clear_title (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_title");
 #line 196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1836 "CheckerboardLayout.c"
+#line 1838 "CheckerboardLayout.c"
 	}
 }
 
@@ -1851,7 +1853,7 @@ static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolea
 	if (_tmp0_ == _tmp1_) {
 #line 202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1855 "CheckerboardLayout.c"
+#line 1857 "CheckerboardLayout.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -1861,7 +1863,7 @@ static void checkerboard_item_set_title_visible (CheckerboardItem* self, gboolea
 	checkerboard_item_recalc_size (self, "set_title_visible");
 #line 207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1865 "CheckerboardLayout.c"
+#line 1867 "CheckerboardLayout.c"
 }
 
 
@@ -1883,7 +1885,7 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 	_tmp1_ = self->priv->comment;
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1887 "CheckerboardLayout.c"
+#line 1889 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		const gchar* _tmp3_;
 		gboolean _tmp4_;
@@ -1901,17 +1903,17 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 1905 "CheckerboardLayout.c"
+#line 1907 "CheckerboardLayout.c"
 	} else {
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 1909 "CheckerboardLayout.c"
+#line 1911 "CheckerboardLayout.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1915 "CheckerboardLayout.c"
+#line 1917 "CheckerboardLayout.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -1939,7 +1941,7 @@ void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, g
 		checkerboard_item_recalc_size (self, "set_comment");
 #line 219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1943 "CheckerboardLayout.c"
+#line 1945 "CheckerboardLayout.c"
 	}
 }
 
@@ -1955,7 +1957,7 @@ void checkerboard_item_clear_comment (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 225 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1959 "CheckerboardLayout.c"
+#line 1961 "CheckerboardLayout.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->comment);
@@ -1969,7 +1971,7 @@ void checkerboard_item_clear_comment (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_comment");
 #line 231 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 1973 "CheckerboardLayout.c"
+#line 1975 "CheckerboardLayout.c"
 	}
 }
 
@@ -1988,7 +1990,7 @@ static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gbool
 	if (_tmp0_ == _tmp1_) {
 #line 237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 1992 "CheckerboardLayout.c"
+#line 1994 "CheckerboardLayout.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -1998,7 +2000,7 @@ static void checkerboard_item_set_comment_visible (CheckerboardItem* self, gbool
 	checkerboard_item_recalc_size (self, "set_comment_visible");
 #line 242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2002 "CheckerboardLayout.c"
+#line 2004 "CheckerboardLayout.c"
 }
 
 
@@ -2022,7 +2024,7 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 	_tmp1_ = tags;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 2026 "CheckerboardLayout.c"
+#line 2028 "CheckerboardLayout.c"
 		GeeCollection* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
@@ -2034,11 +2036,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_tmp4_ = _tmp3_;
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 2038 "CheckerboardLayout.c"
+#line 2040 "CheckerboardLayout.c"
 	} else {
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 2042 "CheckerboardLayout.c"
+#line 2044 "CheckerboardLayout.c"
 	}
 #line 247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_item_set_has_tags (self, _tmp0_);
@@ -2050,7 +2052,7 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 	_tmp6_ = self->priv->_has_tags;
 #line 250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
-#line 2054 "CheckerboardLayout.c"
+#line 2056 "CheckerboardLayout.c"
 		GeeCollection* _tmp7_;
 		GeeCollection* _tmp8_;
 		GeeCollection* _tmp9_;
@@ -2081,7 +2083,7 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_g_free0 (text);
 #line 253 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text = _tmp12_;
-#line 2085 "CheckerboardLayout.c"
+#line 2087 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp13_;
 #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2090,13 +2092,13 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_g_free0 (text);
 #line 255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text = _tmp13_;
-#line 2094 "CheckerboardLayout.c"
+#line 2096 "CheckerboardLayout.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->subtitle;
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != NULL) {
-#line 2100 "CheckerboardLayout.c"
+#line 2102 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp16_;
 		const gchar* _tmp17_;
 		PangoAlignment _tmp18_;
@@ -2111,11 +2113,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_tmp19_ = checkerboard_item_text_is_set_to (_tmp16_, _tmp17_, TRUE, _tmp18_);
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp19_;
-#line 2115 "CheckerboardLayout.c"
+#line 2117 "CheckerboardLayout.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = FALSE;
-#line 2119 "CheckerboardLayout.c"
+#line 2121 "CheckerboardLayout.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_) {
@@ -2123,7 +2125,7 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		_g_free0 (text);
 #line 259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2127 "CheckerboardLayout.c"
+#line 2129 "CheckerboardLayout.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp20_ = text;
@@ -2143,11 +2145,11 @@ void checkerboard_item_set_tags (CheckerboardItem* self, GeeCollection* tags, Pa
 		checkerboard_item_recalc_size (self, "set_subtitle");
 #line 264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2147 "CheckerboardLayout.c"
+#line 2149 "CheckerboardLayout.c"
 	}
 #line 245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (text);
-#line 2151 "CheckerboardLayout.c"
+#line 2153 "CheckerboardLayout.c"
 }
 
 
@@ -2162,7 +2164,7 @@ void checkerboard_item_clear_tags (CheckerboardItem* self) {
 	_g_object_unref0 (self->priv->user_visible_tag_list);
 #line 271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->user_visible_tag_list = NULL;
-#line 2166 "CheckerboardLayout.c"
+#line 2168 "CheckerboardLayout.c"
 }
 
 
@@ -2206,11 +2208,11 @@ void checkerboard_item_highlight_user_visible_tag (CheckerboardItem* self, gint
 	if (_tmp7_) {
 #line 280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2210 "CheckerboardLayout.c"
+#line 2212 "CheckerboardLayout.c"
 	}
 #line 274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (text);
-#line 2214 "CheckerboardLayout.c"
+#line 2216 "CheckerboardLayout.c"
 }
 
 
@@ -2248,7 +2250,7 @@ Tag* checkerboard_item_get_user_visible_tag (CheckerboardItem* self, gint index)
 	result = (Tag*) _tmp7_;
 #line 285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2252 "CheckerboardLayout.c"
+#line 2254 "CheckerboardLayout.c"
 }
 
 
@@ -2262,7 +2264,7 @@ PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self) {
 	_tmp1_ = self->priv->_has_tags;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 2266 "CheckerboardLayout.c"
+#line 2268 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		PangoLayout* _tmp3_;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2273,19 +2275,19 @@ PangoLayout* checkerboard_item_get_tag_list_layout (CheckerboardItem* self) {
 		_g_object_unref0 (_tmp0_);
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 2277 "CheckerboardLayout.c"
+#line 2279 "CheckerboardLayout.c"
 	} else {
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp0_);
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = NULL;
-#line 2283 "CheckerboardLayout.c"
+#line 2285 "CheckerboardLayout.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2289 "CheckerboardLayout.c"
+#line 2291 "CheckerboardLayout.c"
 }
 
 
@@ -2302,7 +2304,7 @@ void checkerboard_item_get_subtitle_allocation (CheckerboardItem* self, GdkRecta
 	*result = _tmp1_;
 #line 293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 2306 "CheckerboardLayout.c"
+#line 2308 "CheckerboardLayout.c"
 }
 
 
@@ -2316,7 +2318,7 @@ gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) {
 	_tmp1_ = self->priv->subtitle;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 2320 "CheckerboardLayout.c"
+#line 2322 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		gchar* _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2327,7 +2329,7 @@ gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp3_;
-#line 2331 "CheckerboardLayout.c"
+#line 2333 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp4_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -2336,13 +2338,13 @@ gchar* checkerboard_item_get_subtitle (CheckerboardItem* self) {
 		_g_free0 (_tmp0_);
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 2340 "CheckerboardLayout.c"
+#line 2342 "CheckerboardLayout.c"
 	}
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
 #line 297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2346 "CheckerboardLayout.c"
+#line 2348 "CheckerboardLayout.c"
 }
 
 
@@ -2362,7 +2364,7 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 	_tmp1_ = self->priv->subtitle;
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 2366 "CheckerboardLayout.c"
+#line 2368 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp2_;
 		const gchar* _tmp3_;
 		gboolean _tmp4_;
@@ -2380,17 +2382,17 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 		_tmp6_ = checkerboard_item_text_is_set_to (_tmp2_, _tmp3_, _tmp4_, _tmp5_);
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp6_;
-#line 2384 "CheckerboardLayout.c"
+#line 2386 "CheckerboardLayout.c"
 	} else {
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 2388 "CheckerboardLayout.c"
+#line 2390 "CheckerboardLayout.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
 #line 303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2394 "CheckerboardLayout.c"
+#line 2396 "CheckerboardLayout.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = text;
@@ -2412,7 +2414,7 @@ void checkerboard_item_set_subtitle (CheckerboardItem* self, const gchar* text,
 		checkerboard_item_recalc_size (self, "set_subtitle");
 #line 309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2416 "CheckerboardLayout.c"
+#line 2418 "CheckerboardLayout.c"
 	}
 }
 
@@ -2428,7 +2430,7 @@ void checkerboard_item_clear_subtitle (CheckerboardItem* self) {
 	if (_tmp0_ == NULL) {
 #line 315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2432 "CheckerboardLayout.c"
+#line 2434 "CheckerboardLayout.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_item_text_unref0 (self->priv->subtitle);
@@ -2442,7 +2444,7 @@ void checkerboard_item_clear_subtitle (CheckerboardItem* self) {
 		checkerboard_item_recalc_size (self, "clear_subtitle");
 #line 321 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2446 "CheckerboardLayout.c"
+#line 2448 "CheckerboardLayout.c"
 	}
 }
 
@@ -2461,7 +2463,7 @@ static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboo
 	if (_tmp0_ == _tmp1_) {
 #line 327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 2465 "CheckerboardLayout.c"
+#line 2467 "CheckerboardLayout.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = visible;
@@ -2471,7 +2473,7 @@ static void checkerboard_item_set_subtitle_visible (CheckerboardItem* self, gboo
 	checkerboard_item_recalc_size (self, "set_subtitle_visible");
 #line 332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2475 "CheckerboardLayout.c"
+#line 2477 "CheckerboardLayout.c"
 }
 
 
@@ -2483,7 +2485,7 @@ void checkerboard_item_set_is_cursor (CheckerboardItem* self, gboolean is_cursor
 	_tmp0_ = is_cursor;
 #line 336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->is_cursor = _tmp0_;
-#line 2487 "CheckerboardLayout.c"
+#line 2489 "CheckerboardLayout.c"
 }
 
 
@@ -2498,7 +2500,7 @@ gboolean checkerboard_item_get_is_cursor (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2502 "CheckerboardLayout.c"
+#line 2504 "CheckerboardLayout.c"
 }
 
 
@@ -2507,7 +2509,7 @@ static void _vala_GValue_free (GValue* self) {
 	g_value_unset (self);
 #line 344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_free (self);
-#line 2511 "CheckerboardLayout.c"
+#line 2513 "CheckerboardLayout.c"
 }
 
 
@@ -2589,7 +2591,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp10_ = title_visible;
 #line 349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ != _tmp10_) {
-#line 2593 "CheckerboardLayout.c"
+#line 2595 "CheckerboardLayout.c"
 		gboolean _tmp11_;
 #line 350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = title_visible;
@@ -2597,7 +2599,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 		self->priv->title_visible = _tmp11_;
 #line 351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2601 "CheckerboardLayout.c"
+#line 2603 "CheckerboardLayout.c"
 	}
 #line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = self->priv->comment_visible;
@@ -2605,7 +2607,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp13_ = comment_visible;
 #line 354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 2609 "CheckerboardLayout.c"
+#line 2611 "CheckerboardLayout.c"
 		gboolean _tmp14_;
 #line 355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = comment_visible;
@@ -2613,7 +2615,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 		self->priv->comment_visible = _tmp14_;
 #line 356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2617 "CheckerboardLayout.c"
+#line 2619 "CheckerboardLayout.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->subtitle_visible;
@@ -2621,7 +2623,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	_tmp16_ = subtitle_visible;
 #line 359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != _tmp16_) {
-#line 2625 "CheckerboardLayout.c"
+#line 2627 "CheckerboardLayout.c"
 		gboolean _tmp17_;
 #line 360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = subtitle_visible;
@@ -2629,7 +2631,7 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 		self->priv->subtitle_visible = _tmp17_;
 #line 361 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		altered = TRUE;
-#line 2633 "CheckerboardLayout.c"
+#line 2635 "CheckerboardLayout.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp19_ = altered;
@@ -2637,14 +2639,14 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 	if (_tmp19_) {
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = TRUE;
-#line 2641 "CheckerboardLayout.c"
+#line 2643 "CheckerboardLayout.c"
 	} else {
 		gboolean _tmp20_;
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = dimensions_has_area (&self->requisition);
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = !_tmp20_;
-#line 2648 "CheckerboardLayout.c"
+#line 2650 "CheckerboardLayout.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp18_) {
@@ -2652,13 +2654,13 @@ static void checkerboard_item_real_notify_membership_changed (DataObject* base,
 		checkerboard_item_recalc_size (self, "notify_membership_changed");
 #line 366 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2656 "CheckerboardLayout.c"
+#line 2658 "CheckerboardLayout.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = collection;
 #line 369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 2662 "CheckerboardLayout.c"
+#line 2664 "CheckerboardLayout.c"
 }
 
 
@@ -2686,7 +2688,7 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 	if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_TITLES)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2690 "CheckerboardLayout.c"
+#line 2692 "CheckerboardLayout.c"
 			default:
 			{
 				GValue _tmp4_;
@@ -2696,13 +2698,13 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 				checkerboard_item_set_title_visible (self, g_value_get_boolean (&_tmp4_));
 #line 376 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2700 "CheckerboardLayout.c"
+#line 2702 "CheckerboardLayout.c"
 			}
 		}
 	} else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2706 "CheckerboardLayout.c"
+#line 2708 "CheckerboardLayout.c"
 			default:
 			{
 				GValue _tmp5_;
@@ -2712,13 +2714,13 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 				checkerboard_item_set_comment_visible (self, g_value_get_boolean (&_tmp5_));
 #line 380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2716 "CheckerboardLayout.c"
+#line 2718 "CheckerboardLayout.c"
 			}
 		}
 	} else if (_tmp3_ == g_quark_from_string (CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES)) {
 #line 373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		switch (0) {
-#line 2722 "CheckerboardLayout.c"
+#line 2724 "CheckerboardLayout.c"
 			default:
 			{
 				GValue _tmp6_;
@@ -2728,7 +2730,7 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 				checkerboard_item_set_subtitle_visible (self, g_value_get_boolean (&_tmp6_));
 #line 384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 2732 "CheckerboardLayout.c"
+#line 2734 "CheckerboardLayout.c"
 			}
 		}
 	}
@@ -2740,7 +2742,7 @@ static void checkerboard_item_real_notify_collection_property_set (DataObject* b
 	_tmp9_ = *val;
 #line 387 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_OBJECT_CLASS (checkerboard_item_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_OBJECT, DataObject), _tmp7_, _tmp8_, &_tmp9_);
-#line 2744 "CheckerboardLayout.c"
+#line 2746 "CheckerboardLayout.c"
 }
 
 
@@ -2758,14 +2760,14 @@ gint checkerboard_item_get_alignment_point (CheckerboardItem* self) {
 	result = (CHECKERBOARD_ITEM_FRAME_WIDTH + CHECKERBOARD_ITEM_BORDER_WIDTH) + _tmp1_;
 #line 394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2762 "CheckerboardLayout.c"
+#line 2764 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_exposed (CheckerboardItem* self) {
 #line 398 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure = TRUE;
-#line 2769 "CheckerboardLayout.c"
+#line 2771 "CheckerboardLayout.c"
 }
 
 
@@ -2774,7 +2776,7 @@ void checkerboard_item_exposed (CheckerboardItem* self) {
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->exposed (self);
-#line 2778 "CheckerboardLayout.c"
+#line 2780 "CheckerboardLayout.c"
 }
 
 
@@ -2788,37 +2790,37 @@ static void checkerboard_item_real_unexposed (CheckerboardItem* self) {
 	_tmp0_ = self->priv->title;
 #line 404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ != NULL) {
-#line 2792 "CheckerboardLayout.c"
+#line 2794 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp1_;
 #line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = self->priv->title;
 #line 405 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp1_);
-#line 2798 "CheckerboardLayout.c"
+#line 2800 "CheckerboardLayout.c"
 	}
 #line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->comment;
 #line 407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ != NULL) {
-#line 2804 "CheckerboardLayout.c"
+#line 2806 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp3_;
 #line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->comment;
 #line 408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp3_);
-#line 2810 "CheckerboardLayout.c"
+#line 2812 "CheckerboardLayout.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->subtitle;
 #line 410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 2816 "CheckerboardLayout.c"
+#line 2818 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp5_;
 #line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = self->priv->subtitle;
 #line 411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_text_clear_pango_layout (_tmp5_);
-#line 2822 "CheckerboardLayout.c"
+#line 2824 "CheckerboardLayout.c"
 	}
 }
 
@@ -2828,7 +2830,7 @@ void checkerboard_item_unexposed (CheckerboardItem* self) {
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->unexposed (self);
-#line 2832 "CheckerboardLayout.c"
+#line 2834 "CheckerboardLayout.c"
 }
 
 
@@ -2841,7 +2843,7 @@ static gboolean checkerboard_item_real_is_exposed (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2845 "CheckerboardLayout.c"
+#line 2847 "CheckerboardLayout.c"
 }
 
 
@@ -2850,7 +2852,7 @@ gboolean checkerboard_item_is_exposed (CheckerboardItem* self) {
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
 #line 414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->is_exposed (self);
-#line 2854 "CheckerboardLayout.c"
+#line 2856 "CheckerboardLayout.c"
 }
 
 
@@ -2865,7 +2867,7 @@ gboolean checkerboard_item_has_image (CheckerboardItem* self) {
 	result = _tmp0_ != NULL;
 #line 419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2869 "CheckerboardLayout.c"
+#line 2871 "CheckerboardLayout.c"
 }
 
 
@@ -2883,7 +2885,7 @@ GdkPixbuf* checkerboard_item_get_image (CheckerboardItem* self) {
 	result = _tmp1_;
 #line 423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2887 "CheckerboardLayout.c"
+#line 2889 "CheckerboardLayout.c"
 }
 
 
@@ -2924,7 +2926,7 @@ void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf) {
 	checkerboard_item_recalc_size (self, "set_image");
 #line 432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2928 "CheckerboardLayout.c"
+#line 2930 "CheckerboardLayout.c"
 }
 
 
@@ -2961,7 +2963,7 @@ void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim) {
 	if (_tmp2_) {
 #line 445 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 2965 "CheckerboardLayout.c"
+#line 2967 "CheckerboardLayout.c"
 	}
 }
 
@@ -2975,7 +2977,7 @@ gint checkerboard_item_get_max_width (gint scale) {
 	result = (CHECKERBOARD_ITEM_FRAME_WIDTH * 2) + _tmp0_;
 #line 451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 2979 "CheckerboardLayout.c"
+#line 2981 "CheckerboardLayout.c"
 }
 
 
@@ -3015,21 +3017,21 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp3_ = self->priv->title;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp3_ != NULL) {
-#line 3019 "CheckerboardLayout.c"
+#line 3021 "CheckerboardLayout.c"
 		gboolean _tmp4_;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->title_visible;
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp4_;
-#line 3025 "CheckerboardLayout.c"
+#line 3027 "CheckerboardLayout.c"
 	} else {
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = FALSE;
-#line 3029 "CheckerboardLayout.c"
+#line 3031 "CheckerboardLayout.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_) {
-#line 3033 "CheckerboardLayout.c"
+#line 3035 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp5_;
 		gint _tmp6_;
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3038,11 +3040,11 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 		_tmp6_ = checkerboard_item_text_get_height (_tmp5_);
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = _tmp6_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3042 "CheckerboardLayout.c"
+#line 3044 "CheckerboardLayout.c"
 	} else {
 #line 459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = 0;
-#line 3046 "CheckerboardLayout.c"
+#line 3048 "CheckerboardLayout.c"
 	}
 #line 458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	title_height = _tmp1_;
@@ -3050,21 +3052,21 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp9_ = self->priv->comment;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ != NULL) {
-#line 3054 "CheckerboardLayout.c"
+#line 3056 "CheckerboardLayout.c"
 		gboolean _tmp10_;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = self->priv->comment_visible;
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp10_;
-#line 3060 "CheckerboardLayout.c"
+#line 3062 "CheckerboardLayout.c"
 	} else {
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = FALSE;
-#line 3064 "CheckerboardLayout.c"
+#line 3066 "CheckerboardLayout.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp8_) {
-#line 3068 "CheckerboardLayout.c"
+#line 3070 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp11_;
 		gint _tmp12_;
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3073,11 +3075,11 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 		_tmp12_ = checkerboard_item_text_get_height (_tmp11_);
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = _tmp12_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3077 "CheckerboardLayout.c"
+#line 3079 "CheckerboardLayout.c"
 	} else {
 #line 461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = 0;
-#line 3081 "CheckerboardLayout.c"
+#line 3083 "CheckerboardLayout.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	comment_height = _tmp7_;
@@ -3085,21 +3087,21 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	_tmp15_ = self->priv->subtitle;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ != NULL) {
-#line 3089 "CheckerboardLayout.c"
+#line 3091 "CheckerboardLayout.c"
 		gboolean _tmp16_;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = self->priv->subtitle_visible;
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp16_;
-#line 3095 "CheckerboardLayout.c"
+#line 3097 "CheckerboardLayout.c"
 	} else {
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = FALSE;
-#line 3099 "CheckerboardLayout.c"
+#line 3101 "CheckerboardLayout.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_) {
-#line 3103 "CheckerboardLayout.c"
+#line 3105 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp17_;
 		gint _tmp18_;
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3108,11 +3110,11 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 		_tmp18_ = checkerboard_item_text_get_height (_tmp17_);
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp18_ + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 3112 "CheckerboardLayout.c"
+#line 3114 "CheckerboardLayout.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = 0;
-#line 3116 "CheckerboardLayout.c"
+#line 3118 "CheckerboardLayout.c"
 	}
 #line 462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	subtitle_height = _tmp13_;
@@ -3142,7 +3144,7 @@ static void checkerboard_item_recalc_size (CheckerboardItem* self, const gchar*
 	if (!_tmp27_) {
 #line 484 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		data_view_notify_geometry_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 3146 "CheckerboardLayout.c"
+#line 3148 "CheckerboardLayout.c"
 	}
 }
 
@@ -3179,7 +3181,7 @@ void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint borde
 	*result = dimensions;
 #line 492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 3183 "CheckerboardLayout.c"
+#line 3185 "CheckerboardLayout.c"
 }
 
 
@@ -3215,7 +3217,7 @@ void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_w
 	*result = origin;
 #line 499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return;
-#line 3219 "CheckerboardLayout.c"
+#line 3221 "CheckerboardLayout.c"
 }
 
 
@@ -3508,7 +3510,7 @@ static void checkerboard_item_real_paint_shadow (CheckerboardItem* self, cairo_t
 	_cairo_pattern_destroy0 (td);
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_cairo_pattern_destroy0 (lr);
-#line 3512 "CheckerboardLayout.c"
+#line 3514 "CheckerboardLayout.c"
 }
 
 
@@ -3517,7 +3519,7 @@ void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimen
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_shadow (self, ctx, dimensions, origin, radius, initial_alpha);
-#line 3521 "CheckerboardLayout.c"
+#line 3523 "CheckerboardLayout.c"
 }
 
 
@@ -3620,7 +3622,7 @@ void checkerboard_item_paint_shadow_in_corner (CheckerboardItem* self, cairo_t*
 	cairo_fill (_tmp24_);
 #line 536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_cairo_pattern_destroy0 (p);
-#line 3624 "CheckerboardLayout.c"
+#line 3626 "CheckerboardLayout.c"
 }
 
 
@@ -3636,7 +3638,7 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 	_tmp0_ = border_width;
 #line 550 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ == 1) {
-#line 3640 "CheckerboardLayout.c"
+#line 3642 "CheckerboardLayout.c"
 		cairo_t* _tmp1_;
 		GdkPoint _tmp2_;
 		gint _tmp3_;
@@ -3683,7 +3685,7 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 		_tmp14_ = ctx;
 #line 554 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp14_);
-#line 3687 "CheckerboardLayout.c"
+#line 3689 "CheckerboardLayout.c"
 	} else {
 		Dimensions dimensions = {0};
 		Dimensions _tmp15_;
@@ -3741,7 +3743,7 @@ static void checkerboard_item_real_paint_border (CheckerboardItem* self, cairo_t
 		_tmp29_ = scale;
 #line 561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		draw_rounded_corners_filled (_tmp26_, &_tmp27_, &_tmp28_, 0.25 * _tmp29_);
-#line 3745 "CheckerboardLayout.c"
+#line 3747 "CheckerboardLayout.c"
 	}
 }
 
@@ -3751,20 +3753,17 @@ void checkerboard_item_paint_border (CheckerboardItem* self, cairo_t* ctx, Dimen
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_border (self, ctx, object_dimensions, object_origin, border_width);
-#line 3755 "CheckerboardLayout.c"
+#line 3757 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
-	GdkPixbuf* _tmp0_;
-	gboolean _tmp1_;
-	cairo_t* _tmp12_;
-	GdkPixbuf* _tmp13_;
-	GdkPoint _tmp14_;
-	gint _tmp15_;
-	GdkPoint _tmp16_;
-	gint _tmp17_;
-	cairo_t* _tmp18_;
+	cairo_t* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	GdkPoint _tmp4_;
+	gint _tmp5_;
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
@@ -3772,67 +3771,20 @@ static void checkerboard_item_real_paint_image (CheckerboardItem* self, cairo_t*
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (origin != NULL);
 #line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp0_ = pixbuf;
+	_tmp0_ = ctx;
 #line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp1_ = gdk_pixbuf_get_has_alpha (_tmp0_);
+	_tmp1_ = pixbuf;
 #line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	if (_tmp1_) {
-#line 3781 "CheckerboardLayout.c"
-		cairo_t* _tmp2_;
-		GdkPoint _tmp3_;
-		gint _tmp4_;
-		GdkPoint _tmp5_;
-		gint _tmp6_;
-		GdkPixbuf* _tmp7_;
-		gint _tmp8_;
-		GdkPixbuf* _tmp9_;
-		gint _tmp10_;
-		cairo_t* _tmp11_;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp2_ = ctx;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp3_ = *origin;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp4_ = _tmp3_.x;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp5_ = *origin;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp6_ = _tmp5_.y;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp7_ = pixbuf;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp9_ = pixbuf;
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp10_ = gdk_pixbuf_get_height (_tmp9_);
-#line 567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		cairo_rectangle (_tmp2_, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp8_, (gdouble) _tmp10_);
-#line 568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		_tmp11_ = ctx;
-#line 568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		cairo_fill (_tmp11_);
-#line 3816 "CheckerboardLayout.c"
-	}
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp12_ = ctx;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp13_ = pixbuf;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp14_ = *origin;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp15_ = _tmp14_.x;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp16_ = *origin;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp17_ = _tmp16_.y;
-#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	gdk_cairo_set_source_pixbuf (_tmp12_, _tmp13_, (gdouble) _tmp15_, (gdouble) _tmp17_);
-#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	_tmp18_ = ctx;
-#line 571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-	cairo_paint (_tmp18_);
-#line 3836 "CheckerboardLayout.c"
+	_tmp2_ = *origin;
+#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+	_tmp3_ = _tmp2_.x;
+#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+	_tmp4_ = *origin;
+#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+	_tmp5_ = _tmp4_.y;
+#line 566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+	paint_pixmap_with_background (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
+#line 3788 "CheckerboardLayout.c"
 }
 
 
@@ -3841,7 +3793,7 @@ void checkerboard_item_paint_image (CheckerboardItem* self, cairo_t* ctx, GdkPix
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 565 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	CHECKERBOARD_ITEM_GET_CLASS (self)->paint_image (self, ctx, pixbuf, origin);
-#line 3845 "CheckerboardLayout.c"
+#line 3797 "CheckerboardLayout.c"
 }
 
 
@@ -3853,109 +3805,109 @@ static gint checkerboard_item_get_selection_border_width (CheckerboardItem* self
 	gint _tmp3_;
 	gint _tmp4_;
 	gint _tmp5_;
-#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = scale;
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = thumbnail_get_MIN_SCALE ();
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_;
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _tmp4_;
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ <= ((_tmp3_ + _tmp5_) / 3)) {
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = 2;
-#line 3873 "CheckerboardLayout.c"
+#line 3825 "CheckerboardLayout.c"
 	} else {
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = 3;
-#line 3877 "CheckerboardLayout.c"
+#line 3829 "CheckerboardLayout.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_ + CHECKERBOARD_ITEM_BORDER_WIDTH;
-#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 570 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3883 "CheckerboardLayout.c"
+#line 3835 "CheckerboardLayout.c"
 }
 
 
 static GdkPixbuf* checkerboard_item_real_get_top_left_trinket (CheckerboardItem* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = NULL;
-#line 580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 575 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3893 "CheckerboardLayout.c"
+#line 3845 "CheckerboardLayout.c"
 }
 
 
 GdkPixbuf* checkerboard_item_get_top_left_trinket (CheckerboardItem* self, gint scale) {
-#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
-#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 3902 "CheckerboardLayout.c"
+#line 3854 "CheckerboardLayout.c"
 }
 
 
 static GdkPixbuf* checkerboard_item_real_get_top_right_trinket (CheckerboardItem* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = NULL;
-#line 584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3912 "CheckerboardLayout.c"
+#line 3864 "CheckerboardLayout.c"
 }
 
 
 GdkPixbuf* checkerboard_item_get_top_right_trinket (CheckerboardItem* self, gint scale) {
-#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 578 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
-#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 578 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 3921 "CheckerboardLayout.c"
+#line 3873 "CheckerboardLayout.c"
 }
 
 
 static GdkPixbuf* checkerboard_item_real_get_bottom_left_trinket (CheckerboardItem* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = NULL;
-#line 588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3931 "CheckerboardLayout.c"
+#line 3883 "CheckerboardLayout.c"
 }
 
 
 GdkPixbuf* checkerboard_item_get_bottom_left_trinket (CheckerboardItem* self, gint scale) {
-#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 582 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
-#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 582 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 3940 "CheckerboardLayout.c"
+#line 3892 "CheckerboardLayout.c"
 }
 
 
 static GdkPixbuf* checkerboard_item_real_get_bottom_right_trinket (CheckerboardItem* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = NULL;
-#line 592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 587 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 3950 "CheckerboardLayout.c"
+#line 3902 "CheckerboardLayout.c"
 }
 
 
 GdkPixbuf* checkerboard_item_get_bottom_right_trinket (CheckerboardItem* self, gint scale) {
-#line 591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 586 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), NULL);
-#line 591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 586 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return CHECKERBOARD_ITEM_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 3959 "CheckerboardLayout.c"
+#line 3911 "CheckerboardLayout.c"
 }
 
 
@@ -4018,59 +3970,59 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 	GdkPixbuf* _tmp239_;
 	GdkPixbuf* _tmp262_;
 	GdkPixbuf* _tmp263_;
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (bg_color != NULL);
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (selected_color != NULL);
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (text_color != NULL);
-#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&pixbuf_origin, 0, sizeof (GdkPoint));
-#line 599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->allocation;
-#line 599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _tmp0_.x;
-#line 599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	pixbuf_origin.x = (_tmp1_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_BORDER_WIDTH;
-#line 600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->allocation;
-#line 600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_.y;
-#line 600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	pixbuf_origin.y = (_tmp3_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_BORDER_WIDTH;
-#line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = ctx;
-#line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) CHECKERBOARD_ITEM_FRAME_WIDTH);
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = ctx;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = *selected_color;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _tmp6_.red;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = *selected_color;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = _tmp8_.green;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = *selected_color;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = _tmp10_.blue;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = *selected_color;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp13_ = _tmp12_.alpha;
-#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_source_rgba (_tmp5_, _tmp7_, _tmp9_, _tmp11_, _tmp13_);
-#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = border_color;
-#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 602 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 4074 "CheckerboardLayout.c"
+#line 4026 "CheckerboardLayout.c"
 		cairo_t* _tmp15_;
 		Dimensions shadow_dim = {0};
 		Dimensions _tmp16_;
@@ -4081,43 +4033,43 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		Dimensions _tmp21_;
 		GdkPoint _tmp22_;
 		cairo_t* _tmp23_;
-#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = ctx;
-#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_save (_tmp15_);
-#line 609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dimensions_init (&shadow_dim, 0, 0);
-#line 610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = self->priv->pixbuf_dim;
-#line 610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = _tmp16_.width;
-#line 610 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 605 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		shadow_dim.width = _tmp17_ + CHECKERBOARD_ITEM_BORDER_WIDTH;
-#line 611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = self->priv->pixbuf_dim;
-#line 611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = _tmp18_.height;
-#line 611 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 606 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		shadow_dim.height = _tmp19_ + CHECKERBOARD_ITEM_BORDER_WIDTH;
-#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = ctx;
-#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = shadow_dim;
-#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = pixbuf_origin;
-#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 607 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_paint_shadow (self, _tmp20_, &_tmp21_, &_tmp22_, CHECKERBOARD_ITEM_SHADOW_RADIUS, CHECKERBOARD_ITEM_SHADOW_INITIAL_ALPHA);
-#line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp23_ = ctx;
-#line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp23_);
-#line 4115 "CheckerboardLayout.c"
+#line 4067 "CheckerboardLayout.c"
 	}
-#line 617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp24_ = self->priv->is_cursor;
-#line 617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 612 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp24_) {
-#line 4121 "CheckerboardLayout.c"
+#line 4073 "CheckerboardLayout.c"
 		cairo_t* _tmp25_;
 		cairo_t* _tmp26_;
 		GdkRGBA* _tmp27_;
@@ -4138,61 +4090,61 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		gint _tmp42_;
 		gint _tmp43_;
 		cairo_t* _tmp44_;
-#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = ctx;
-#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_save (_tmp25_);
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp26_ = ctx;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp27_ = border_color;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp28_ = (*_tmp27_).red;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp29_ = border_color;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp30_ = (*_tmp29_).green;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp31_ = border_color;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp32_ = (*_tmp31_).blue;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = border_color;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp34_ = (*_tmp33_).alpha;
-#line 619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_set_source_rgba (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_);
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = ctx;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp36_ = self->priv->pixbuf_dim;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp37_ = pixbuf_origin;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = self->priv->pixbuf_dim;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp39_ = _tmp38_.width;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = self->priv->pixbuf_dim;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp41_ = _tmp40_.height;
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp42_ = MAX (_tmp39_, _tmp41_);
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp43_ = checkerboard_item_get_selection_border_width (self, _tmp42_);
-#line 621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_paint_border (self, _tmp35_, &_tmp36_, &_tmp37_, _tmp43_);
-#line 623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp44_ = ctx;
-#line 623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp44_);
-#line 4190 "CheckerboardLayout.c"
+#line 4142 "CheckerboardLayout.c"
 	}
-#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp45_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp45_) {
-#line 4196 "CheckerboardLayout.c"
+#line 4148 "CheckerboardLayout.c"
 		cairo_t* _tmp46_;
 		cairo_t* _tmp47_;
 		Dimensions _tmp48_;
@@ -4204,41 +4156,41 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		gint _tmp54_;
 		gint _tmp55_;
 		cairo_t* _tmp56_;
-#line 629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp46_ = ctx;
-#line 629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_save (_tmp46_);
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = ctx;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp48_ = self->priv->pixbuf_dim;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp49_ = pixbuf_origin;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp50_ = self->priv->pixbuf_dim;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp51_ = _tmp50_.width;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp52_ = self->priv->pixbuf_dim;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp53_ = _tmp52_.height;
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp54_ = MAX (_tmp51_, _tmp53_);
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp55_ = checkerboard_item_get_selection_border_width (self, _tmp54_);
-#line 630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 625 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_paint_border (self, _tmp47_, &_tmp48_, &_tmp49_, _tmp55_);
-#line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp56_ = ctx;
-#line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp56_);
-#line 4236 "CheckerboardLayout.c"
+#line 4188 "CheckerboardLayout.c"
 	}
-#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp57_ = border_color;
-#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp57_ != NULL) {
-#line 4242 "CheckerboardLayout.c"
+#line 4194 "CheckerboardLayout.c"
 		cairo_t* _tmp58_;
 		cairo_t* _tmp59_;
 		GdkRGBA* _tmp60_;
@@ -4253,49 +4205,49 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		Dimensions _tmp69_;
 		GdkPoint _tmp70_;
 		cairo_t* _tmp71_;
-#line 637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp58_ = ctx;
-#line 637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_save (_tmp58_);
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp59_ = ctx;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp60_ = border_color;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp61_ = (*_tmp60_).red;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp62_ = border_color;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp63_ = (*_tmp62_).green;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp64_ = border_color;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp65_ = (*_tmp64_).blue;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp66_ = border_color;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp67_ = (*_tmp66_).alpha;
-#line 638 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 633 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_set_source_rgba (_tmp59_, _tmp61_, _tmp63_, _tmp65_, _tmp67_);
-#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp68_ = ctx;
-#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp69_ = self->priv->pixbuf_dim;
-#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp70_ = pixbuf_origin;
-#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_paint_border (self, _tmp68_, &_tmp69_, &_tmp70_, CHECKERBOARD_ITEM_BORDER_WIDTH);
-#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp71_ = ctx;
-#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp71_);
-#line 4293 "CheckerboardLayout.c"
+#line 4245 "CheckerboardLayout.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 639 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp72_ = self->priv->display_pixbuf;
-#line 644 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 639 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp72_ != NULL) {
-#line 4299 "CheckerboardLayout.c"
+#line 4251 "CheckerboardLayout.c"
 		cairo_t* _tmp73_;
 		cairo_t* _tmp74_;
 		GdkRGBA _tmp75_;
@@ -4310,93 +4262,93 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		GdkPixbuf* _tmp84_;
 		GdkPoint _tmp85_;
 		cairo_t* _tmp86_;
-#line 645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp73_ = ctx;
-#line 645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_save (_tmp73_);
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp74_ = ctx;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp75_ = *bg_color;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp76_ = _tmp75_.red;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp77_ = *bg_color;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp78_ = _tmp77_.green;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp79_ = *bg_color;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp80_ = _tmp79_.blue;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp81_ = *bg_color;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp82_ = _tmp81_.alpha;
-#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_set_source_rgba (_tmp74_, _tmp76_, _tmp78_, _tmp80_, _tmp82_);
-#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp83_ = ctx;
-#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp84_ = self->priv->display_pixbuf;
-#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp85_ = pixbuf_origin;
-#line 647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_paint_image (self, _tmp83_, _tmp84_, &_tmp85_);
-#line 648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp86_ = ctx;
-#line 648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_restore (_tmp86_);
-#line 4350 "CheckerboardLayout.c"
+#line 4302 "CheckerboardLayout.c"
 	}
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp87_ = ctx;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp88_ = *text_color;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp89_ = _tmp88_.red;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp90_ = *text_color;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp91_ = _tmp90_.green;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp92_ = *text_color;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp93_ = _tmp92_.blue;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp94_ = *text_color;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp95_ = _tmp94_.alpha;
-#line 651 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_source_rgba (_tmp87_, _tmp89_, _tmp91_, _tmp93_, _tmp95_);
-#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp96_ = self->allocation;
-#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp97_ = _tmp96_.y;
-#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp98_ = self->priv->pixbuf_dim;
-#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp99_ = _tmp98_.height;
-#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 649 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	text_y = (((_tmp97_ + CHECKERBOARD_ITEM_FRAME_WIDTH) + _tmp99_) + CHECKERBOARD_ITEM_FRAME_WIDTH) + CHECKERBOARD_ITEM_LABEL_PADDING;
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp101_ = self->priv->title;
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp101_ != NULL) {
-#line 4386 "CheckerboardLayout.c"
+#line 4338 "CheckerboardLayout.c"
 		gboolean _tmp102_;
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp102_ = self->priv->title_visible;
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp100_ = _tmp102_;
-#line 4392 "CheckerboardLayout.c"
+#line 4344 "CheckerboardLayout.c"
 	} else {
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp100_ = FALSE;
-#line 4396 "CheckerboardLayout.c"
+#line 4348 "CheckerboardLayout.c"
 	}
-#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 650 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp100_) {
-#line 4400 "CheckerboardLayout.c"
+#line 4352 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp103_;
 		GdkRectangle _tmp104_;
 		gint _tmp105_;
@@ -4424,97 +4376,97 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		gint _tmp127_;
 		CheckerboardItemText* _tmp128_;
 		gint _tmp129_;
-#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp103_ = self->priv->title;
-#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp104_ = self->allocation;
-#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp105_ = _tmp104_.x;
-#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp103_->allocation.x = _tmp105_ + CHECKERBOARD_ITEM_FRAME_WIDTH;
-#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp106_ = self->priv->title;
-#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp107_ = text_y;
-#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 654 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp106_->allocation.y = _tmp107_;
-#line 660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp108_ = self->priv->title;
-#line 660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp109_ = self->priv->pixbuf_dim;
-#line 660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp110_ = _tmp109_.width;
-#line 660 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 655 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp108_->allocation.width = _tmp110_;
-#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp111_ = self->priv->title;
-#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp112_ = self->priv->title;
-#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp113_ = checkerboard_item_text_get_height (_tmp112_);
-#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp111_->allocation.height = _tmp113_;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp114_ = ctx;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp115_ = self->priv->title;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp116_ = _tmp115_->allocation;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp117_ = _tmp116_.x;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp118_ = self->priv->title;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp119_ = _tmp118_->allocation;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp120_ = _tmp119_.y;
-#line 663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 658 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_move_to (_tmp114_, (gdouble) _tmp117_, (gdouble) _tmp120_);
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp121_ = ctx;
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp122_ = self->priv->title;
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp123_ = self->priv->pixbuf_dim;
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp124_ = _tmp123_.width;
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp125_ = checkerboard_item_text_get_pango_layout (_tmp122_, _tmp124_);
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp126_ = _tmp125_;
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_cairo_show_layout (_tmp121_, _tmp126_);
-#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 659 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp126_);
-#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp127_ = text_y;
-#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp128_ = self->priv->title;
-#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp129_ = checkerboard_item_text_get_height (_tmp128_);
-#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_y = _tmp127_ + (_tmp129_ + CHECKERBOARD_ITEM_LABEL_PADDING);
-#line 4498 "CheckerboardLayout.c"
+#line 4450 "CheckerboardLayout.c"
 	}
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp131_ = self->priv->comment;
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp131_ != NULL) {
-#line 4504 "CheckerboardLayout.c"
+#line 4456 "CheckerboardLayout.c"
 		gboolean _tmp132_;
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp132_ = self->priv->comment_visible;
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp130_ = _tmp132_;
-#line 4510 "CheckerboardLayout.c"
+#line 4462 "CheckerboardLayout.c"
 	} else {
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp130_ = FALSE;
-#line 4514 "CheckerboardLayout.c"
+#line 4466 "CheckerboardLayout.c"
 	}
-#line 669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp130_) {
-#line 4518 "CheckerboardLayout.c"
+#line 4470 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp133_;
 		GdkRectangle _tmp134_;
 		gint _tmp135_;
@@ -4542,97 +4494,97 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		gint _tmp157_;
 		CheckerboardItemText* _tmp158_;
 		gint _tmp159_;
-#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp133_ = self->priv->comment;
-#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp134_ = self->allocation;
-#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp135_ = _tmp134_.x;
-#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp133_->allocation.x = _tmp135_ + CHECKERBOARD_ITEM_FRAME_WIDTH;
-#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp136_ = self->priv->comment;
-#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp137_ = text_y;
-#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp136_->allocation.y = _tmp137_;
-#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp138_ = self->priv->comment;
-#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp139_ = self->priv->pixbuf_dim;
-#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp140_ = _tmp139_.width;
-#line 672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp138_->allocation.width = _tmp140_;
-#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp141_ = self->priv->comment;
-#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp142_ = self->priv->comment;
-#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp143_ = checkerboard_item_text_get_height (_tmp142_);
-#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp141_->allocation.height = _tmp143_;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp144_ = ctx;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp145_ = self->priv->comment;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp146_ = _tmp145_->allocation;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp147_ = _tmp146_.x;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp148_ = self->priv->comment;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp149_ = _tmp148_->allocation;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp150_ = _tmp149_.y;
-#line 675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_move_to (_tmp144_, (gdouble) _tmp147_, (gdouble) _tmp150_);
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp151_ = ctx;
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp152_ = self->priv->comment;
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp153_ = self->priv->pixbuf_dim;
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp154_ = _tmp153_.width;
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp155_ = checkerboard_item_text_get_pango_layout (_tmp152_, _tmp154_);
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp156_ = _tmp155_;
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_cairo_show_layout (_tmp151_, _tmp156_);
-#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp156_);
-#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp157_ = text_y;
-#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp158_ = self->priv->comment;
-#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp159_ = checkerboard_item_text_get_height (_tmp158_);
-#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_y = _tmp157_ + (_tmp159_ + CHECKERBOARD_ITEM_LABEL_PADDING);
-#line 4616 "CheckerboardLayout.c"
+#line 4568 "CheckerboardLayout.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp161_ = self->priv->subtitle;
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp161_ != NULL) {
-#line 4622 "CheckerboardLayout.c"
+#line 4574 "CheckerboardLayout.c"
 		gboolean _tmp162_;
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp162_ = self->priv->subtitle_visible;
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp160_ = _tmp162_;
-#line 4628 "CheckerboardLayout.c"
+#line 4580 "CheckerboardLayout.c"
 	} else {
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp160_ = FALSE;
-#line 4632 "CheckerboardLayout.c"
+#line 4584 "CheckerboardLayout.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp160_) {
-#line 4636 "CheckerboardLayout.c"
+#line 4588 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp163_;
 		GdkRectangle _tmp164_;
 		gint _tmp165_;
@@ -4657,99 +4609,99 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		gint _tmp184_;
 		PangoLayout* _tmp185_;
 		PangoLayout* _tmp186_;
-#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp163_ = self->priv->subtitle;
-#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp164_ = self->allocation;
-#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp165_ = _tmp164_.x;
-#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp163_->allocation.x = _tmp165_ + CHECKERBOARD_ITEM_FRAME_WIDTH;
-#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp166_ = self->priv->subtitle;
-#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp167_ = text_y;
-#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp166_->allocation.y = _tmp167_;
-#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp168_ = self->priv->subtitle;
-#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp169_ = self->priv->pixbuf_dim;
-#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp170_ = _tmp169_.width;
-#line 684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp168_->allocation.width = _tmp170_;
-#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp171_ = self->priv->subtitle;
-#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp172_ = self->priv->subtitle;
-#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp173_ = checkerboard_item_text_get_height (_tmp172_);
-#line 685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp171_->allocation.height = _tmp173_;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp174_ = ctx;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp175_ = self->priv->subtitle;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp176_ = _tmp175_->allocation;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp177_ = _tmp176_.x;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp178_ = self->priv->subtitle;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp179_ = _tmp178_->allocation;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp180_ = _tmp179_.y;
-#line 687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_move_to (_tmp174_, (gdouble) _tmp177_, (gdouble) _tmp180_);
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp181_ = ctx;
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp182_ = self->priv->subtitle;
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp183_ = self->priv->pixbuf_dim;
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp184_ = _tmp183_.width;
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp185_ = checkerboard_item_text_get_pango_layout (_tmp182_, _tmp184_);
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp186_ = _tmp185_;
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_cairo_show_layout (_tmp181_, _tmp186_);
-#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 683 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp186_);
-#line 4723 "CheckerboardLayout.c"
+#line 4675 "CheckerboardLayout.c"
 	}
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp187_ = ctx;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp188_ = *selected_color;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp189_ = _tmp188_.red;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp190_ = *selected_color;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp191_ = _tmp190_.green;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp192_ = *selected_color;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp193_ = _tmp192_.blue;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp194_ = *selected_color;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp195_ = _tmp194_.alpha;
-#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_source_rgba (_tmp187_, _tmp189_, _tmp191_, _tmp193_, _tmp195_);
-#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp196_ = checkerboard_item_get_bottom_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
-#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	trinket = _tmp196_;
-#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp197_ = trinket;
-#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp197_ != NULL) {
-#line 4753 "CheckerboardLayout.c"
+#line 4705 "CheckerboardLayout.c"
 		gint x = 0;
 		GdkPoint _tmp198_;
 		gint _tmp199_;
@@ -4773,71 +4725,71 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		GdkPixbuf* _tmp216_;
 		gint _tmp217_;
 		cairo_t* _tmp218_;
-#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp198_ = pixbuf_origin;
-#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp199_ = _tmp198_.x;
-#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp200_ = checkerboard_item_get_horizontal_trinket_offset (self);
-#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = (_tmp199_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + _tmp200_;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp201_ = pixbuf_origin;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp202_ = _tmp201_.y;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp203_ = self->priv->pixbuf_dim;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp204_ = _tmp203_.height;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp205_ = trinket;
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp206_ = gdk_pixbuf_get_height (_tmp205_);
-#line 700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = ((_tmp202_ + _tmp204_) - _tmp206_) - CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp207_ = ctx;
-#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp208_ = trinket;
-#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp209_ = x;
-#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp210_ = y;
-#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gdk_cairo_set_source_pixbuf (_tmp207_, _tmp208_, (gdouble) _tmp209_, (gdouble) _tmp210_);
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp211_ = ctx;
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp212_ = x;
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp213_ = y;
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp214_ = trinket;
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp215_ = gdk_pixbuf_get_width (_tmp214_);
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp216_ = trinket;
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp217_ = gdk_pixbuf_get_height (_tmp216_);
-#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_rectangle (_tmp211_, (gdouble) _tmp212_, (gdouble) _tmp213_, (gdouble) _tmp215_, (gdouble) _tmp217_);
-#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp218_ = ctx;
-#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp218_);
-#line 4829 "CheckerboardLayout.c"
+#line 4781 "CheckerboardLayout.c"
 	}
-#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp219_ = checkerboard_item_get_top_left_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
-#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (trinket);
-#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	trinket = _tmp219_;
-#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp220_ = trinket;
-#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp220_ != NULL) {
-#line 4841 "CheckerboardLayout.c"
+#line 4793 "CheckerboardLayout.c"
 		gint x = 0;
 		GdkPoint _tmp221_;
 		gint _tmp222_;
@@ -4857,63 +4809,63 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		GdkPixbuf* _tmp235_;
 		gint _tmp236_;
 		cairo_t* _tmp237_;
-#line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp221_ = pixbuf_origin;
-#line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp222_ = _tmp221_.x;
-#line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp223_ = checkerboard_item_get_horizontal_trinket_offset (self);
-#line 709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = (_tmp222_ + CHECKERBOARD_ITEM_TRINKET_PADDING) + _tmp223_;
-#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp224_ = pixbuf_origin;
-#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp225_ = _tmp224_.y;
-#line 710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = _tmp225_ + CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp226_ = ctx;
-#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp227_ = trinket;
-#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp228_ = x;
-#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp229_ = y;
-#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 706 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gdk_cairo_set_source_pixbuf (_tmp226_, _tmp227_, (gdouble) _tmp228_, (gdouble) _tmp229_);
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp230_ = ctx;
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp231_ = x;
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp232_ = y;
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp233_ = trinket;
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp234_ = gdk_pixbuf_get_width (_tmp233_);
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp235_ = trinket;
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp236_ = gdk_pixbuf_get_height (_tmp235_);
-#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_rectangle (_tmp230_, (gdouble) _tmp231_, (gdouble) _tmp232_, (gdouble) _tmp234_, (gdouble) _tmp236_);
-#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp237_ = ctx;
-#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp237_);
-#line 4905 "CheckerboardLayout.c"
+#line 4857 "CheckerboardLayout.c"
 	}
-#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp238_ = checkerboard_item_get_top_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
-#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (trinket);
-#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	trinket = _tmp238_;
-#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp239_ = trinket;
-#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 712 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp239_ != NULL) {
-#line 4917 "CheckerboardLayout.c"
+#line 4869 "CheckerboardLayout.c"
 		gint x = 0;
 		GdkPoint _tmp240_;
 		gint _tmp241_;
@@ -4938,73 +4890,73 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		GdkPixbuf* _tmp259_;
 		gint _tmp260_;
 		cairo_t* _tmp261_;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp240_ = pixbuf_origin;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp241_ = _tmp240_.x;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp242_ = self->priv->pixbuf_dim;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp243_ = _tmp242_.width;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp244_ = trinket;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp245_ = gdk_pixbuf_get_width (_tmp244_);
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp246_ = _tmp245_;
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp247_ = checkerboard_item_get_horizontal_trinket_offset (self);
-#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 713 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = (((_tmp241_ + _tmp243_) - _tmp246_) - _tmp247_) - CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp248_ = pixbuf_origin;
-#line 720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp249_ = _tmp248_.y;
-#line 720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = _tmp249_ + CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp250_ = ctx;
-#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp251_ = trinket;
-#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp252_ = x;
-#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp253_ = y;
-#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gdk_cairo_set_source_pixbuf (_tmp250_, _tmp251_, (gdouble) _tmp252_, (gdouble) _tmp253_);
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp254_ = ctx;
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp255_ = x;
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp256_ = y;
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp257_ = trinket;
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp258_ = gdk_pixbuf_get_width (_tmp257_);
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp259_ = trinket;
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp260_ = gdk_pixbuf_get_height (_tmp259_);
-#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 717 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_rectangle (_tmp254_, (gdouble) _tmp255_, (gdouble) _tmp256_, (gdouble) _tmp258_, (gdouble) _tmp260_);
-#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp261_ = ctx;
-#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 718 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp261_);
-#line 4996 "CheckerboardLayout.c"
+#line 4948 "CheckerboardLayout.c"
 	}
-#line 726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp262_ = checkerboard_item_get_bottom_right_trinket (self, CHECKERBOARD_ITEM_TRINKET_SCALE);
-#line 726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (trinket);
-#line 726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	trinket = _tmp262_;
-#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp263_ = trinket;
-#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 722 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp263_ != NULL) {
-#line 5008 "CheckerboardLayout.c"
+#line 4960 "CheckerboardLayout.c"
 		gint x = 0;
 		GdkPoint _tmp264_;
 		gint _tmp265_;
@@ -5034,154 +4986,154 @@ void checkerboard_item_paint (CheckerboardItem* self, cairo_t* ctx, GdkRGBA* bg_
 		GdkPixbuf* _tmp288_;
 		gint _tmp289_;
 		cairo_t* _tmp290_;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp264_ = pixbuf_origin;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp265_ = _tmp264_.x;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp266_ = self->priv->pixbuf_dim;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp267_ = _tmp266_.width;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp268_ = trinket;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp269_ = gdk_pixbuf_get_width (_tmp268_);
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp270_ = _tmp269_;
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp271_ = checkerboard_item_get_horizontal_trinket_offset (self);
-#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 723 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = (((_tmp265_ + _tmp267_) - _tmp270_) - _tmp271_) - CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp272_ = pixbuf_origin;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp273_ = _tmp272_.y;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp274_ = self->priv->pixbuf_dim;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp275_ = _tmp274_.height;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp276_ = trinket;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp277_ = gdk_pixbuf_get_height (_tmp276_);
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp278_ = _tmp277_;
-#line 730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = ((_tmp273_ + _tmp275_) - _tmp278_) - CHECKERBOARD_ITEM_TRINKET_PADDING;
-#line 732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp279_ = ctx;
-#line 732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp280_ = trinket;
-#line 732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp281_ = x;
-#line 732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp282_ = y;
-#line 732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gdk_cairo_set_source_pixbuf (_tmp279_, _tmp280_, (gdouble) _tmp281_, (gdouble) _tmp282_);
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp283_ = ctx;
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp284_ = x;
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp285_ = y;
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp286_ = trinket;
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp287_ = gdk_pixbuf_get_width (_tmp286_);
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp288_ = trinket;
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp289_ = gdk_pixbuf_get_height (_tmp288_);
-#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 728 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_rectangle (_tmp283_, (gdouble) _tmp284_, (gdouble) _tmp285_, (gdouble) _tmp287_, (gdouble) _tmp289_);
-#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 729 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp290_ = ctx;
-#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 729 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp290_);
-#line 5102 "CheckerboardLayout.c"
+#line 5054 "CheckerboardLayout.c"
 	}
-#line 595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 590 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (trinket);
-#line 5106 "CheckerboardLayout.c"
+#line 5058 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_horizontal_trinket_offset (CheckerboardItem* self, gint horizontal_trinket_offset) {
 	gint _tmp0_;
 	gint _tmp1_;
-#line 738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 733 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
-#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = horizontal_trinket_offset;
-#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp0_ >= 0, "horizontal_trinket_offset >= 0");
-#line 740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = horizontal_trinket_offset;
-#line 740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->horizontal_trinket_offset = _tmp1_;
-#line 5123 "CheckerboardLayout.c"
+#line 5075 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_horizontal_trinket_offset (CheckerboardItem* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
-#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->horizontal_trinket_offset;
-#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
-#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5138 "CheckerboardLayout.c"
+#line 5090 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_item_set_grid_coordinates (CheckerboardItem* self, gint col, gint row) {
 	gint _tmp0_;
 	gint _tmp1_;
-#line 747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
-#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = col;
-#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->col = _tmp0_;
-#line 749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = row;
-#line 749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->row = _tmp1_;
-#line 5155 "CheckerboardLayout.c"
+#line 5107 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_column (CheckerboardItem* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
-#line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->col;
-#line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
-#line 753 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 748 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5170 "CheckerboardLayout.c"
+#line 5122 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_item_get_row (CheckerboardItem* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 751 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), 0);
-#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->row;
-#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
-#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 752 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5185 "CheckerboardLayout.c"
+#line 5137 "CheckerboardLayout.c"
 }
 
 
@@ -5193,52 +5145,52 @@ void checkerboard_item_brighten (CheckerboardItem* self) {
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_;
 	GdkPixbuf* _tmp7_;
-#line 760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 755 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->brightened;
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 5205 "CheckerboardLayout.c"
+#line 5157 "CheckerboardLayout.c"
 	} else {
 		GdkPixbuf* _tmp2_;
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->pixbuf;
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 5212 "CheckerboardLayout.c"
+#line 5164 "CheckerboardLayout.c"
 	}
-#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 763 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 758 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 5218 "CheckerboardLayout.c"
+#line 5170 "CheckerboardLayout.c"
 	}
-#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->pixbuf;
-#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->brightened);
-#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->brightened = _tmp4_;
-#line 767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = self->priv->brightened;
-#line 767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	shift_colors (_tmp5_, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, CHECKERBOARD_ITEM_BRIGHTEN_SHIFT, 0);
-#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = self->priv->brightened;
-#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->display_pixbuf);
-#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->display_pixbuf = _tmp7_;
-#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 5242 "CheckerboardLayout.c"
+#line 5194 "CheckerboardLayout.c"
 }
 
 
@@ -5247,44 +5199,44 @@ void checkerboard_item_unbrighten (CheckerboardItem* self) {
 	GdkPixbuf* _tmp1_;
 	GdkPixbuf* _tmp3_;
 	GdkPixbuf* _tmp4_;
-#line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 769 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->brightened;
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ == NULL) {
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 5259 "CheckerboardLayout.c"
+#line 5211 "CheckerboardLayout.c"
 	} else {
 		GdkPixbuf* _tmp2_;
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->pixbuf;
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 5266 "CheckerboardLayout.c"
+#line 5218 "CheckerboardLayout.c"
 	}
-#line 776 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 5272 "CheckerboardLayout.c"
+#line 5224 "CheckerboardLayout.c"
 	}
-#line 779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->brightened);
-#line 779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 774 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->brightened = NULL;
-#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->pixbuf;
-#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->display_pixbuf);
-#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 777 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->display_pixbuf = _tmp4_;
-#line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 5288 "CheckerboardLayout.c"
+#line 5240 "CheckerboardLayout.c"
 }
 
 
@@ -5292,21 +5244,21 @@ static void checkerboard_item_real_visibility_changed (DataView* base, gboolean
 	CheckerboardItem * self;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 782 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = visible;
-#line 789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp0_) {
-#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 785 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_unbrighten (self);
-#line 5304 "CheckerboardLayout.c"
+#line 5256 "CheckerboardLayout.c"
 	}
-#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = visible;
-#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 787 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	DATA_VIEW_CLASS (checkerboard_item_parent_class)->visibility_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_VIEW, ThumbnailView), TYPE_DATA_VIEW, DataView), _tmp1_);
-#line 5310 "CheckerboardLayout.c"
+#line 5262 "CheckerboardLayout.c"
 }
 
 
@@ -5319,80 +5271,80 @@ static gboolean checkerboard_item_query_tooltip_on_text (CheckerboardItem* self,
 	gboolean _tmp4_;
 	CheckerboardItemText* _tmp5_;
 	gboolean _tmp6_;
-#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM_TEXT (text), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = text;
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = checkerboard_item_text_get_pango_layout (_tmp0_, 0);
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_;
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = pango_layout_is_ellipsized (_tmp2_);
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = !_tmp3_;
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp2_);
-#line 796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_) {
-#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5347 "CheckerboardLayout.c"
+#line 5299 "CheckerboardLayout.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = text;
-#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = checkerboard_item_text_is_marked_up (_tmp5_);
-#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
-#line 5355 "CheckerboardLayout.c"
+#line 5307 "CheckerboardLayout.c"
 		GtkTooltip* _tmp7_;
 		CheckerboardItemText* _tmp8_;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = tooltip;
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = text;
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = checkerboard_item_text_get_text (_tmp8_);
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = _tmp9_;
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_tooltip_set_markup (_tmp7_, _tmp10_);
-#line 800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp10_);
-#line 5372 "CheckerboardLayout.c"
+#line 5324 "CheckerboardLayout.c"
 	} else {
 		GtkTooltip* _tmp11_;
 		CheckerboardItemText* _tmp12_;
 		gchar* _tmp13_;
 		gchar* _tmp14_;
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = tooltip;
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = text;
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = checkerboard_item_text_get_text (_tmp12_);
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp13_;
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_tooltip_set_text (_tmp11_, _tmp14_);
-#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp14_);
-#line 5390 "CheckerboardLayout.c"
+#line 5342 "CheckerboardLayout.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = TRUE;
-#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 799 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5396 "CheckerboardLayout.c"
+#line 5348 "CheckerboardLayout.c"
 }
 
 
@@ -5407,195 +5359,195 @@ gboolean checkerboard_item_query_tooltip (CheckerboardItem* self, gint x, gint y
 	gboolean _tmp24_ = FALSE;
 	gboolean _tmp25_ = FALSE;
 	CheckerboardItemText* _tmp26_;
-#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (self), FALSE);
-#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE);
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->title;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ != NULL) {
-#line 5419 "CheckerboardLayout.c"
+#line 5371 "CheckerboardLayout.c"
 		gboolean _tmp3_;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->title_visible;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = _tmp3_;
-#line 5425 "CheckerboardLayout.c"
+#line 5377 "CheckerboardLayout.c"
 	} else {
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = FALSE;
-#line 5429 "CheckerboardLayout.c"
+#line 5381 "CheckerboardLayout.c"
 	}
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 5433 "CheckerboardLayout.c"
+#line 5385 "CheckerboardLayout.c"
 		gint _tmp4_;
 		gint _tmp5_;
 		CheckerboardItemText* _tmp6_;
 		GdkRectangle _tmp7_;
 		gboolean _tmp8_;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = x;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = y;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = self->priv->title;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = _tmp6_->allocation;
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = coord_in_rectangle (_tmp4_, _tmp5_, &_tmp7_);
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp8_;
-#line 5451 "CheckerboardLayout.c"
+#line 5403 "CheckerboardLayout.c"
 	} else {
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 5455 "CheckerboardLayout.c"
+#line 5407 "CheckerboardLayout.c"
 	}
-#line 808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 803 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 5459 "CheckerboardLayout.c"
+#line 5411 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp9_;
 		GtkTooltip* _tmp10_;
 		gboolean _tmp11_;
-#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = self->priv->title;
-#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = tooltip;
-#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = checkerboard_item_query_tooltip_on_text (self, _tmp9_, _tmp10_);
-#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = _tmp11_;
-#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5473 "CheckerboardLayout.c"
+#line 5425 "CheckerboardLayout.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = self->priv->comment;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 5479 "CheckerboardLayout.c"
+#line 5431 "CheckerboardLayout.c"
 		gboolean _tmp15_;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = self->priv->comment_visible;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp15_;
-#line 5485 "CheckerboardLayout.c"
+#line 5437 "CheckerboardLayout.c"
 	} else {
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = FALSE;
-#line 5489 "CheckerboardLayout.c"
+#line 5441 "CheckerboardLayout.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp13_) {
-#line 5493 "CheckerboardLayout.c"
+#line 5445 "CheckerboardLayout.c"
 		gint _tmp16_;
 		gint _tmp17_;
 		CheckerboardItemText* _tmp18_;
 		GdkRectangle _tmp19_;
 		gboolean _tmp20_;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = x;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = y;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = self->priv->comment;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = _tmp18_->allocation;
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = coord_in_rectangle (_tmp16_, _tmp17_, &_tmp19_);
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = _tmp20_;
-#line 5511 "CheckerboardLayout.c"
+#line 5463 "CheckerboardLayout.c"
 	} else {
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = FALSE;
-#line 5515 "CheckerboardLayout.c"
+#line 5467 "CheckerboardLayout.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_) {
-#line 5519 "CheckerboardLayout.c"
+#line 5471 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp21_;
 		GtkTooltip* _tmp22_;
 		gboolean _tmp23_;
-#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = self->priv->comment;
-#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = tooltip;
-#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp23_ = checkerboard_item_query_tooltip_on_text (self, _tmp21_, _tmp22_);
-#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = _tmp23_;
-#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 807 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5533 "CheckerboardLayout.c"
+#line 5485 "CheckerboardLayout.c"
 	}
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp26_ = self->priv->subtitle;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp26_ != NULL) {
-#line 5539 "CheckerboardLayout.c"
+#line 5491 "CheckerboardLayout.c"
 		gboolean _tmp27_;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp27_ = self->priv->subtitle_visible;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = _tmp27_;
-#line 5545 "CheckerboardLayout.c"
+#line 5497 "CheckerboardLayout.c"
 	} else {
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = FALSE;
-#line 5549 "CheckerboardLayout.c"
+#line 5501 "CheckerboardLayout.c"
 	}
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp25_) {
-#line 5553 "CheckerboardLayout.c"
+#line 5505 "CheckerboardLayout.c"
 		gint _tmp28_;
 		gint _tmp29_;
 		CheckerboardItemText* _tmp30_;
 		GdkRectangle _tmp31_;
 		gboolean _tmp32_;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp28_ = x;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp29_ = y;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp30_ = self->priv->subtitle;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp31_ = _tmp30_->allocation;
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp32_ = coord_in_rectangle (_tmp28_, _tmp29_, &_tmp31_);
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = _tmp32_;
-#line 5571 "CheckerboardLayout.c"
+#line 5523 "CheckerboardLayout.c"
 	} else {
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = FALSE;
-#line 5575 "CheckerboardLayout.c"
+#line 5527 "CheckerboardLayout.c"
 	}
-#line 814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp24_) {
-#line 5579 "CheckerboardLayout.c"
+#line 5531 "CheckerboardLayout.c"
 		CheckerboardItemText* _tmp33_;
 		GtkTooltip* _tmp34_;
 		gboolean _tmp35_;
-#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = self->priv->subtitle;
-#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp34_ = tooltip;
-#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = checkerboard_item_query_tooltip_on_text (self, _tmp33_, _tmp34_);
-#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = _tmp35_;
-#line 815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 5593 "CheckerboardLayout.c"
+#line 5545 "CheckerboardLayout.c"
 	}
-#line 817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5599 "CheckerboardLayout.c"
+#line 5551 "CheckerboardLayout.c"
 }
 
 
@@ -5610,7 +5562,7 @@ gboolean checkerboard_item_get_has_tags (CheckerboardItem* self) {
 	result = _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 5614 "CheckerboardLayout.c"
+#line 5566 "CheckerboardLayout.c"
 }
 
 
@@ -5619,7 +5571,7 @@ static void checkerboard_item_set_has_tags (CheckerboardItem* self, gboolean val
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (self));
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (checkerboard_item_get_has_tags (self) != value) {
-#line 5623 "CheckerboardLayout.c"
+#line 5575 "CheckerboardLayout.c"
 		gboolean _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = value;
@@ -5627,7 +5579,7 @@ static void checkerboard_item_set_has_tags (CheckerboardItem* self, gboolean val
 		self->priv->_has_tags = _tmp0_;
 #line 161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_object_notify ((GObject *) self, "has-tags");
-#line 5631 "CheckerboardLayout.c"
+#line 5583 "CheckerboardLayout.c"
 	}
 }
 
@@ -5673,7 +5625,7 @@ static void checkerboard_item_class_init (CheckerboardItemClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_item_finalize;
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CHECKERBOARD_ITEM_HAS_TAGS_PROPERTY, g_param_spec_boolean ("has-tags", "has-tags", "has-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5677 "CheckerboardLayout.c"
+#line 5629 "CheckerboardLayout.c"
 }
 
 
@@ -5718,7 +5670,7 @@ static void checkerboard_item_instance_init (CheckerboardItem * self) {
 	self->priv->row = -1;
 #line 139 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->horizontal_trinket_offset = 0;
-#line 5722 "CheckerboardLayout.c"
+#line 5674 "CheckerboardLayout.c"
 }
 
 
@@ -5744,7 +5696,7 @@ static void checkerboard_item_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->brightened);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (checkerboard_item_parent_class)->finalize (obj);
-#line 5748 "CheckerboardLayout.c"
+#line 5700 "CheckerboardLayout.c"
 }
 
 
@@ -5771,13 +5723,13 @@ static void _vala_checkerboard_item_get_property (GObject * object, guint proper
 		g_value_set_boolean (value, checkerboard_item_get_has_tags (self));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5775 "CheckerboardLayout.c"
+#line 5727 "CheckerboardLayout.c"
 		default:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5781 "CheckerboardLayout.c"
+#line 5733 "CheckerboardLayout.c"
 	}
 }
 
@@ -5793,105 +5745,105 @@ static void _vala_checkerboard_item_set_property (GObject * object, guint proper
 		checkerboard_item_set_has_tags (self, g_value_get_boolean (value));
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5797 "CheckerboardLayout.c"
+#line 5749 "CheckerboardLayout.c"
 		default:
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 98 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		break;
-#line 5803 "CheckerboardLayout.c"
+#line 5755 "CheckerboardLayout.c"
 	}
 }
 
 
 static void _checkerboard_layout_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_contents_altered ((CheckerboardLayout*) self, added, removed);
-#line 5811 "CheckerboardLayout.c"
+#line 5763 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_altered ((CheckerboardLayout*) self);
-#line 5818 "CheckerboardLayout.c"
+#line 5770 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_state_changed ((CheckerboardLayout*) self, changed);
-#line 5825 "CheckerboardLayout.c"
+#line 5777 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_visibility_changed ((CheckerboardLayout*) self, changed);
-#line 5832 "CheckerboardLayout.c"
+#line 5784 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
-#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_ordering_changed ((CheckerboardLayout*) self);
-#line 5839 "CheckerboardLayout.c"
+#line 5791 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_views_altered_view_collection_views_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) {
-#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_views_altered ((CheckerboardLayout*) self, views);
-#line 5846 "CheckerboardLayout.c"
+#line 5798 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered (ViewCollection* _sender, GeeCollection* views, gpointer self) {
-#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_geometries_altered ((CheckerboardLayout*) self);
-#line 5853 "CheckerboardLayout.c"
+#line 5805 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
-#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self);
-#line 5860 "CheckerboardLayout.c"
+#line 5812 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected (ViewCollection* _sender, GeeIterable* unselected, gpointer self) {
-#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_selection_changed ((CheckerboardLayout*) self);
-#line 5867 "CheckerboardLayout.c"
+#line 5819 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_viewport_shifted ((CheckerboardLayout*) self);
-#line 5874 "CheckerboardLayout.c"
+#line 5826 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
-#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_viewport_resized ((CheckerboardLayout*) self);
-#line 5881 "CheckerboardLayout.c"
+#line 5833 "CheckerboardLayout.c"
 }
 
 
 static void _checkerboard_layout_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self) {
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_colors_changed ((CheckerboardLayout*) self);
-#line 5888 "CheckerboardLayout.c"
+#line 5840 "CheckerboardLayout.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
-#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 5895 "CheckerboardLayout.c"
+#line 5847 "CheckerboardLayout.c"
 }
 
 
@@ -5913,86 +5865,86 @@ CheckerboardLayout* checkerboard_layout_construct (GType object_type, ViewCollec
 	GdkRGBA _tmp13_ = {0};
 	ConfigFacade* _tmp14_;
 	ConfigFacade* _tmp15_;
-#line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (view), NULL);
-#line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = (CheckerboardLayout*) g_object_new (object_type, NULL);
-#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = view;
-#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->view = _tmp1_;
-#line 881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_drag_select (self);
-#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = view;
-#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_layout_on_contents_altered_data_collection_contents_altered, self, 0);
-#line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = view;
-#line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _checkerboard_layout_on_items_altered_data_collection_items_altered, self, 0);
-#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = view;
-#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp4_, "items-state-changed", (GCallback) _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed, self, 0);
-#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = view;
-#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 882 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp5_, "items-visibility-changed", (GCallback) _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0);
-#line 888 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = view;
-#line 888 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 883 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed, self, 0);
-#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = view;
-#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp7_, "views-altered", (GCallback) _checkerboard_layout_on_views_altered_view_collection_views_altered, self, 0);
-#line 890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = view;
-#line 890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp8_, "geometries-altered", (GCallback) _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered, self, 0);
-#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = view;
-#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp9_, "items-selected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_selected, self, 0);
-#line 892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = view;
-#line 892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp10_, "items-unselected", (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected, self, 0);
-#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = _tmp11_;
-#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	config_facade_get_bg_color (_tmp12_, &_tmp13_);
-#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp13_);
-#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp12_);
-#line 896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = config_facade_get_instance ();
-#line 896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = _tmp14_;
-#line 896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp15_, "colors-changed", (GCallback) _checkerboard_layout_on_colors_changed_config_facade_colors_changed, self, 0);
-#line 896 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 891 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp15_);
-#line 899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 894 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 5989 "CheckerboardLayout.c"
+#line 5941 "CheckerboardLayout.c"
 }
 
 
 CheckerboardLayout* checkerboard_layout_new (ViewCollection* view) {
-#line 878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return checkerboard_layout_construct (TYPE_CHECKERBOARD_LAYOUT, view);
-#line 5996 "CheckerboardLayout.c"
+#line 5948 "CheckerboardLayout.c"
 }
 
 
@@ -6005,89 +5957,89 @@ void checkerboard_layout_set_adjustments (CheckerboardLayout* self, GtkAdjustmen
 	GtkAdjustment* _tmp5_;
 	GtkContainer* _tmp6_;
 	GtkContainer* _tmp7_;
-#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GTK_IS_ADJUSTMENT (hadjustment));
-#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GTK_IS_ADJUSTMENT (vadjustment));
-#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = hadjustment;
-#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->hadjustment);
-#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 925 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->hadjustment = _tmp1_;
-#line 931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = vadjustment;
-#line 931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->vadjustment);
-#line 931 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->vadjustment = _tmp3_;
-#line 934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = hadjustment;
-#line 934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp4_, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0);
-#line 935 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = vadjustment;
-#line 935 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 930 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (_tmp5_, "value-changed", (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self, 0);
-#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _tmp6_;
-#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self, 0);
-#line 6045 "CheckerboardLayout.c"
+#line 5997 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_scale (CheckerboardLayout* self, gint scale) {
 	gint _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 939 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = scale;
-#line 944 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 939 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->scale = _tmp0_;
-#line 6057 "CheckerboardLayout.c"
+#line 6009 "CheckerboardLayout.c"
 }
 
 
 gint checkerboard_layout_get_scale (CheckerboardLayout* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0);
-#line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->scale;
-#line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
-#line 948 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6072 "CheckerboardLayout.c"
+#line 6024 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_set_name (CheckerboardLayout* self, const gchar* name) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (name != NULL);
-#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = name;
-#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (self->priv->page_name);
-#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->page_name = _tmp1_;
-#line 6091 "CheckerboardLayout.c"
+#line 6043 "CheckerboardLayout.c"
 }
 
 
@@ -6100,123 +6052,123 @@ static void checkerboard_layout_on_viewport_resized (CheckerboardLayout* self) {
 	GtkAllocation _tmp3_ = {0};
 	const gchar* _tmp4_;
 	gboolean _tmp15_;
-#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 950 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_preferred_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL, &_tmp0_);
-#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	req = _tmp0_;
-#line 960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_;
-#line 960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 955 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	parent_allocation = _tmp3_;
-#line 962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->message;
-#line 962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ == NULL) {
-#line 6122 "CheckerboardLayout.c"
+#line 6074 "CheckerboardLayout.c"
 		GtkRequisition _tmp5_;
 		gint _tmp6_;
-#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = req;
-#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_.height;
-#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp6_ != 0) {
-#line 6131 "CheckerboardLayout.c"
+#line 6083 "CheckerboardLayout.c"
 			GtkAllocation _tmp7_;
 			gint _tmp8_;
 			GtkRequisition _tmp9_;
 			gint _tmp10_;
-#line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = parent_allocation;
-#line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = _tmp7_.width;
-#line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = req;
-#line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = _tmp9_.height;
-#line 972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp8_ - CHECKERBOARD_LAYOUT_SCROLLBAR_PLACEHOLDER_WIDTH, _tmp10_);
-#line 6146 "CheckerboardLayout.c"
+#line 6098 "CheckerboardLayout.c"
 		}
 	} else {
 		GtkAllocation _tmp11_;
 		gint _tmp12_;
 		GtkAllocation _tmp13_;
 		gint _tmp14_;
-#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = parent_allocation;
-#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = _tmp11_.width;
-#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = parent_allocation;
-#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = _tmp13_.height;
-#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 971 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp12_, _tmp14_);
-#line 6163 "CheckerboardLayout.c"
+#line 6115 "CheckerboardLayout.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 976 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_viewport_resized (self);
-#line 983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->size_allocate_due_to_reflow;
-#line 983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp15_) {
-#line 984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_clear_anchor (self);
-#line 6173 "CheckerboardLayout.c"
+#line 6125 "CheckerboardLayout.c"
 	} else {
-#line 986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 981 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->size_allocate_due_to_reflow = FALSE;
-#line 6177 "CheckerboardLayout.c"
+#line 6129 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_on_viewport_shifted (CheckerboardLayout* self) {
-#line 989 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 985 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_update_visible_page (self);
-#line 991 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 986 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_exposure (self, "on_viewport_shift");
-#line 993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_anchor (self);
-#line 6191 "CheckerboardLayout.c"
+#line 6143 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_items_selection_changed (CheckerboardLayout* self) {
-#line 996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 991 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_anchor (self);
-#line 6200 "CheckerboardLayout.c"
+#line 6152 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_clear_anchor (CheckerboardLayout* self) {
 	gboolean _tmp0_;
-#line 1000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->in_center_on_anchor;
-#line 1001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 996 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6214 "CheckerboardLayout.c"
+#line 6166 "CheckerboardLayout.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->anchor);
-#line 1004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->anchor = NULL;
-#line 6220 "CheckerboardLayout.c"
+#line 6172 "CheckerboardLayout.c"
 }
 
 
@@ -6235,35 +6187,35 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 	gint _tmp25_;
 	gint _tmp26_;
 	gpointer _tmp27_;
-#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->in_center_on_anchor;
-#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (!_tmp0_, "!in_center_on_anchor");
-#line 1010 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->visible_page;
-#line 1010 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = checkerboard_layout_intersection (self, &_tmp1_);
-#line 1010 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	items_on_page = _tmp2_;
-#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = items_on_page;
-#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _tmp4_;
-#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp5_ == 0) {
-#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (self->priv->anchor);
-#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->anchor = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (items_on_page);
-#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6267 "CheckerboardLayout.c"
+#line 6219 "CheckerboardLayout.c"
 	}
 	{
 		GeeList* _item_list = NULL;
@@ -6274,25 +6226,25 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 		gint _tmp9_;
 		gint _tmp10_;
 		gint _item_index = 0;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = items_on_page;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_list = _tmp7_;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _item_list;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = _tmp9_;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_size = _tmp10_;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_index = -1;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 6296 "CheckerboardLayout.c"
+#line 6248 "CheckerboardLayout.c"
 			gint _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
@@ -6302,96 +6254,96 @@ static void checkerboard_layout_update_anchor (CheckerboardLayout* self) {
 			gpointer _tmp16_;
 			CheckerboardItem* _tmp17_;
 			gboolean _tmp18_;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _item_index;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_item_index = _tmp11_ + 1;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = _item_index;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp13_ = _item_size;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 6318 "CheckerboardLayout.c"
+#line 6270 "CheckerboardLayout.c"
 			}
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp14_ = _item_list;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = _item_index;
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = (CheckerboardItem*) _tmp16_;
-#line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp17_ = item;
-#line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp18_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView));
-#line 1017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp18_) {
-#line 6334 "CheckerboardLayout.c"
+#line 6286 "CheckerboardLayout.c"
 				CheckerboardItem* _tmp19_;
 				CheckerboardItem* _tmp20_;
-#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = item;
-#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (self->priv->anchor);
-#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				self->priv->anchor = _tmp20_;
-#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (_item_list);
-#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (items_on_page);
-#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				return;
-#line 6353 "CheckerboardLayout.c"
+#line 6305 "CheckerboardLayout.c"
 			}
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 6357 "CheckerboardLayout.c"
+#line 6309 "CheckerboardLayout.c"
 		}
-#line 1016 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_list);
-#line 6361 "CheckerboardLayout.c"
+#line 6313 "CheckerboardLayout.c"
 	}
-#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = self->priv->vadjustment;
-#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp22_ = gtk_adjustment_get_value (_tmp21_);
-#line 1023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp22_ == ((gdouble) 0)) {
-#line 1024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (self->priv->anchor);
-#line 1024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->anchor = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (items_on_page);
-#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6377 "CheckerboardLayout.c"
+#line 6329 "CheckerboardLayout.c"
 	}
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp23_ = items_on_page;
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp24_ = items_on_page;
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp26_ = _tmp25_;
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp27_ = gee_list_get (_tmp23_, ((gint) _tmp26_) / 2);
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->anchor);
-#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->anchor = (CheckerboardItem*) _tmp27_;
-#line 1007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1002 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (items_on_page);
-#line 6395 "CheckerboardLayout.c"
+#line 6347 "CheckerboardLayout.c"
 }
 
 
@@ -6415,59 +6367,59 @@ static void checkerboard_layout_center_on_anchor (CheckerboardLayout* self, gdou
 	GtkAdjustment* _tmp15_;
 	gdouble _tmp16_;
 	gdouble _tmp17_;
-#line 1033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1028 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->anchor;
-#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ == NULL) {
-#line 1035 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6427 "CheckerboardLayout.c"
+#line 6379 "CheckerboardLayout.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1032 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->in_center_on_anchor = TRUE;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->anchor;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_->allocation;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_.y;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->anchor;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _tmp4_->allocation;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = _tmp5_.height;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = self->priv->vadjustment;
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = gtk_adjustment_get_page_size (_tmp7_);
-#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1034 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	anchor_pos = (_tmp3_ + (_tmp6_ / 2)) - (_tmp8_ / 2);
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = self->priv->vadjustment;
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = anchor_pos;
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = self->priv->vadjustment;
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = gtk_adjustment_get_lower (_tmp11_);
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp13_ = self->priv->vadjustment;
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = gtk_adjustment_get_upper (_tmp13_);
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = self->priv->vadjustment;
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp16_ = gtk_adjustment_get_page_size (_tmp15_);
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp17_ = CLAMP (_tmp10_, _tmp12_, _tmp14_ - _tmp16_);
-#line 1041 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1036 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_adjustment_set_value (_tmp9_, _tmp17_);
-#line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1039 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->in_center_on_anchor = FALSE;
-#line 6471 "CheckerboardLayout.c"
+#line 6423 "CheckerboardLayout.c"
 }
 
 
@@ -6481,72 +6433,72 @@ void checkerboard_layout_set_cursor (CheckerboardLayout* self, CheckerboardItem*
 	GeeHashSet* _tmp11_;
 	CheckerboardItem* _tmp12_;
 	GeeHashSet* _tmp13_;
-#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1043 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	collection = _tmp0_;
-#line 1049 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->cursor;
-#line 1049 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1044 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6497 "CheckerboardLayout.c"
+#line 6449 "CheckerboardLayout.c"
 		CheckerboardItem* _tmp2_;
 		ViewCollection* _tmp3_;
 		CheckerboardItem* _tmp4_;
 		gboolean _tmp5_;
-#line 1050 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->cursor;
-#line 1050 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1045 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_item_set_is_cursor (_tmp2_, FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->view;
-#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->cursor;
-#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp5_) {
-#line 6514 "CheckerboardLayout.c"
+#line 6466 "CheckerboardLayout.c"
 			GeeHashSet* _tmp6_;
 			CheckerboardItem* _tmp7_;
-#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = collection;
-#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = self->priv->cursor;
-#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1048 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_VIEW, DataView));
-#line 6523 "CheckerboardLayout.c"
+#line 6475 "CheckerboardLayout.c"
 		}
 	}
-#line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = item;
-#line 1056 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1051 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_item_set_is_cursor (_tmp8_, TRUE);
-#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = item;
-#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->cursor);
-#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1052 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->cursor = _tmp10_;
-#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = collection;
-#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = item;
-#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1053 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_VIEW, DataView));
-#line 1059 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp13_ = collection;
-#line 1059 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1054 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_on_items_state_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1047 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1042 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (collection);
-#line 6550 "CheckerboardLayout.c"
+#line 6502 "CheckerboardLayout.c"
 }
 
 
@@ -6554,57 +6506,57 @@ CheckerboardItem* checkerboard_layout_get_cursor (CheckerboardLayout* self) {
 	CheckerboardItem* result = NULL;
 	CheckerboardItem* _tmp0_;
 	CheckerboardItem* _tmp1_;
-#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1057 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->cursor;
-#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp1_;
-#line 1063 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1058 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6568 "CheckerboardLayout.c"
+#line 6520 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, GeeIterable* added, GeeIterable* removed) {
 	GeeIterable* _tmp0_;
 	GeeIterable* _tmp1_;
-#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1062 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1064 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = added;
-#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1064 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ != NULL) {
-#line 1070 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1065 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (self->priv->message);
-#line 1070 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1065 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->message = NULL;
-#line 6589 "CheckerboardLayout.c"
+#line 6541 "CheckerboardLayout.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = removed;
-#line 1072 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1067 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6595 "CheckerboardLayout.c"
+#line 6547 "CheckerboardLayout.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp2_;
 			GeeIterator* _tmp3_;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp2_ = removed;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_object_it = _tmp3_;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 6608 "CheckerboardLayout.c"
+#line 6560 "CheckerboardLayout.c"
 				GeeIterator* _tmp4_;
 				gboolean _tmp5_;
 				DataObject* object = NULL;
@@ -6612,187 +6564,187 @@ static void checkerboard_layout_on_contents_altered (CheckerboardLayout* self, G
 				gpointer _tmp7_;
 				GeeHashSet* _tmp8_;
 				DataObject* _tmp9_;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp4_ = _object_it;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp5_) {
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 6624 "CheckerboardLayout.c"
+#line 6576 "CheckerboardLayout.c"
 				}
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp6_ = _object_it;
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				object = (DataObject*) _tmp7_;
-#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp8_ = self->priv->exposed_items;
-#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp9_ = object;
-#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1069 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (object);
-#line 6640 "CheckerboardLayout.c"
+#line 6592 "CheckerboardLayout.c"
 			}
-#line 1073 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1068 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (_object_it);
-#line 6644 "CheckerboardLayout.c"
+#line 6596 "CheckerboardLayout.c"
 		}
 	}
-#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
-#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows_length1 = 0;
-#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1074 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
-#line 1081 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1076 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_contents_altered");
-#line 6657 "CheckerboardLayout.c"
+#line 6609 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_items_altered (CheckerboardLayout* self) {
-#line 1084 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1079 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1085 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1080 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_items_altered");
-#line 6666 "CheckerboardLayout.c"
+#line 6618 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_items_state_changed (CheckerboardLayout* self, GeeIterable* changed) {
 	GeeIterable* _tmp0_;
-#line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1083 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1089 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1084 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = changed;
-#line 1089 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1084 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "on_items_state_changed", _tmp0_);
-#line 6680 "CheckerboardLayout.c"
+#line 6632 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_items_visibility_changed (CheckerboardLayout* self, GeeIterable* changed) {
-#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1087 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1087 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1093 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1088 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_items_visibility_changed");
-#line 6691 "CheckerboardLayout.c"
+#line 6643 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_ordering_changed (CheckerboardLayout* self) {
-#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1091 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1097 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1092 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_ordering_changed");
-#line 6700 "CheckerboardLayout.c"
+#line 6652 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_views_altered (CheckerboardLayout* self, GeeCollection* altered) {
 	GeeCollection* _tmp0_;
-#line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1095 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1095 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (altered));
-#line 1101 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = altered;
-#line 1101 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1096 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "on_views_altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 6714 "CheckerboardLayout.c"
+#line 6666 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_on_geometries_altered (CheckerboardLayout* self) {
-#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1099 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1105 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1100 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_reflow (self, "on_geometries_altered");
-#line 6723 "CheckerboardLayout.c"
+#line 6675 "CheckerboardLayout.c"
 }
 
 
 static gboolean _checkerboard_layout_do_reflow_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_layout_do_reflow ((CheckerboardLayout*) self);
-#line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6732 "CheckerboardLayout.c"
+#line 6684 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_need_reflow (CheckerboardLayout* self, const gchar* caller) {
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1103 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1103 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
-#line 1109 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->flow_scheduled;
-#line 1109 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1104 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 1110 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1105 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6749 "CheckerboardLayout.c"
+#line 6701 "CheckerboardLayout.c"
 	}
-#line 1112 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1107 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->is_in_view;
-#line 1112 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1107 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp1_) {
-#line 1113 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1108 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->reflow_needed = TRUE;
-#line 1114 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1109 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6759 "CheckerboardLayout.c"
+#line 6711 "CheckerboardLayout.c"
 	}
-#line 1120 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1115 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->flow_scheduled = TRUE;
-#line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1116 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_idle_add_full (G_PRIORITY_HIGH, _checkerboard_layout_do_reflow_gsource_func, g_object_ref (self), g_object_unref);
-#line 6765 "CheckerboardLayout.c"
+#line 6717 "CheckerboardLayout.c"
 }
 
 
 static gboolean checkerboard_layout_do_reflow (CheckerboardLayout* self) {
 	gboolean result = FALSE;
-#line 1124 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1119 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
-#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1120 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_reflow (self, "do_reflow");
-#line 1126 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1121 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_need_exposure (self, "do_reflow");
-#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1123 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->flow_scheduled = FALSE;
-#line 1130 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = FALSE;
-#line 1130 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1125 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 6783 "CheckerboardLayout.c"
+#line 6735 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_need_exposure (CheckerboardLayout* self, const gchar* caller) {
-#line 1133 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1133 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1128 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
-#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1132 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure_dirty = TRUE;
-#line 1138 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1133 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 6796 "CheckerboardLayout.c"
+#line 6748 "CheckerboardLayout.c"
 }
 
 
@@ -6802,40 +6754,40 @@ void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* tex
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
 	const gchar* _tmp4_;
-#line 1141 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1136 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = text;
-#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->message;
-#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1137 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) == 0) {
-#line 1143 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1138 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 6816 "CheckerboardLayout.c"
+#line 6768 "CheckerboardLayout.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = text;
-#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (self->priv->message);
-#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1140 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->message = _tmp3_;
-#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = text;
-#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1142 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 6830 "CheckerboardLayout.c"
+#line 6782 "CheckerboardLayout.c"
 		GtkContainer* _tmp5_;
 		GtkContainer* _tmp6_;
-#line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_;
-#line 1150 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1145 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp6_ != NULL) {
-#line 6839 "CheckerboardLayout.c"
+#line 6791 "CheckerboardLayout.c"
 			GtkAllocation parent_allocation = {0};
 			GtkContainer* _tmp7_;
 			GtkContainer* _tmp8_;
@@ -6844,79 +6796,79 @@ void checkerboard_layout_set_message (CheckerboardLayout* self, const gchar* tex
 			gint _tmp11_;
 			GtkAllocation _tmp12_;
 			gint _tmp13_;
-#line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = _tmp7_;
-#line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), &_tmp9_);
-#line 1152 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1147 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			parent_allocation = _tmp9_;
-#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = parent_allocation;
-#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _tmp10_.width;
-#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = parent_allocation;
-#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp13_ = _tmp12_.height;
-#line 1154 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1149 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp11_, _tmp13_);
-#line 6866 "CheckerboardLayout.c"
+#line 6818 "CheckerboardLayout.c"
 		}
 	} else {
-#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1153 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_need_reflow (self, "set_message");
-#line 6871 "CheckerboardLayout.c"
+#line 6823 "CheckerboardLayout.c"
 	}
 }
 
 
 void checkerboard_layout_unset_message (CheckerboardLayout* self) {
-#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1157 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1158 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_message (self, NULL);
-#line 6881 "CheckerboardLayout.c"
+#line 6833 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_update_visible_page (CheckerboardLayout* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkAdjustment* _tmp1_;
-#line 1166 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1161 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->hadjustment;
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 6894 "CheckerboardLayout.c"
+#line 6846 "CheckerboardLayout.c"
 		GtkAdjustment* _tmp2_;
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->vadjustment;
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 6900 "CheckerboardLayout.c"
+#line 6852 "CheckerboardLayout.c"
 	} else {
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 6904 "CheckerboardLayout.c"
+#line 6856 "CheckerboardLayout.c"
 	}
-#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1162 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 6908 "CheckerboardLayout.c"
+#line 6860 "CheckerboardLayout.c"
 		GtkAdjustment* _tmp3_;
 		GtkAdjustment* _tmp4_;
 		GdkRectangle _tmp5_ = {0};
-#line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->hadjustment;
-#line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->vadjustment;
-#line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		get_adjustment_page (_tmp3_, _tmp4_, &_tmp5_);
-#line 1168 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1163 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->visible_page = _tmp5_;
-#line 6920 "CheckerboardLayout.c"
+#line 6872 "CheckerboardLayout.c"
 	}
 }
 
@@ -6924,42 +6876,42 @@ static void checkerboard_layout_update_visible_page (CheckerboardLayout* self) {
 void checkerboard_layout_set_in_view (CheckerboardLayout* self, gboolean in_view) {
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1166 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = in_view;
-#line 1172 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1167 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->is_in_view = _tmp0_;
-#line 1174 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1169 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = in_view;
-#line 1174 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1169 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_) {
-#line 6938 "CheckerboardLayout.c"
+#line 6890 "CheckerboardLayout.c"
 		gboolean _tmp2_;
-#line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1170 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->reflow_needed;
-#line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1170 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp2_) {
-#line 1176 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1171 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_need_reflow (self, "set_in_view (true)");
-#line 6946 "CheckerboardLayout.c"
+#line 6898 "CheckerboardLayout.c"
 		} else {
-#line 1178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1173 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_need_exposure (self, "set_in_view (true)");
-#line 6950 "CheckerboardLayout.c"
+#line 6902 "CheckerboardLayout.c"
 		}
 	} else {
-#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1175 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_unexpose_items (self, "set_in_view (false)");
-#line 6955 "CheckerboardLayout.c"
+#line 6907 "CheckerboardLayout.c"
 	}
 }
 
 
 static gpointer _checkerboard_layout_layout_row_ref0 (gpointer self) {
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self ? checkerboard_layout_layout_row_ref (self) : NULL;
-#line 6963 "CheckerboardLayout.c"
+#line 6915 "CheckerboardLayout.c"
 }
 
 
@@ -6980,60 +6932,60 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 	CheckerboardLayoutLayoutRow* _tmp31_;
 	CheckerboardItem** _tmp32_;
 	gint _tmp32__length1;
-#line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1178 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->message;
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != NULL) {
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 6992 "CheckerboardLayout.c"
+#line 6944 "CheckerboardLayout.c"
 	} else {
 		CheckerboardLayoutLayoutRow** _tmp2_;
 		gint _tmp2__length1;
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = self->priv->item_rows;
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2__length1 = self->priv->item_rows_length1;
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 7002 "CheckerboardLayout.c"
+#line 6954 "CheckerboardLayout.c"
 	}
-#line 1184 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1179 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 1185 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1180 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7010 "CheckerboardLayout.c"
+#line 6962 "CheckerboardLayout.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = xd;
-#line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1182 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	x = (gint) _tmp3_;
-#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = yd;
-#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1183 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	y = (gint) _tmp4_;
-#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1186 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	in_range = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1187 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	min = 0;
-#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = self->priv->item_rows;
-#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5__length1 = self->priv->item_rows_length1;
-#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1188 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	max = _tmp5__length1;
-#line 7030 "CheckerboardLayout.c"
+#line 6982 "CheckerboardLayout.c"
 	{
 		gboolean _tmp6_ = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = TRUE;
-#line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 7037 "CheckerboardLayout.c"
+#line 6989 "CheckerboardLayout.c"
 			gint mid = 0;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -7048,160 +7000,160 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 			CheckerboardLayoutLayoutRow* _tmp15_;
 			gint _tmp28_;
 			gint _tmp29_;
-#line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp6_) {
-#line 7054 "CheckerboardLayout.c"
+#line 7006 "CheckerboardLayout.c"
 			}
-#line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = FALSE;
-#line 1195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = min;
-#line 1195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = max;
-#line 1195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = min;
-#line 1195 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1190 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			mid = _tmp7_ + ((_tmp8_ - _tmp9_) / 2);
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = self->priv->item_rows;
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10__length1 = self->priv->item_rows_length1;
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = mid;
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = _tmp10_[_tmp11_];
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp13_ = _checkerboard_layout_layout_row_ref0 (_tmp12_);
-#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1191 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			row = _tmp13_;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = row;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp15_ == NULL) {
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = TRUE;
-#line 7084 "CheckerboardLayout.c"
+#line 7036 "CheckerboardLayout.c"
 			} else {
 				gint _tmp16_;
 				CheckerboardLayoutLayoutRow* _tmp17_;
 				gint _tmp18_;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp16_ = y;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = row;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp18_ = _tmp17_->y;
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = _tmp16_ < _tmp18_;
-#line 7097 "CheckerboardLayout.c"
+#line 7049 "CheckerboardLayout.c"
 			}
-#line 1198 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1193 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp14_) {
-#line 7101 "CheckerboardLayout.c"
+#line 7053 "CheckerboardLayout.c"
 				gint _tmp19_;
-#line 1201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = mid;
-#line 1201 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1196 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				max = _tmp19_ - 1;
-#line 7107 "CheckerboardLayout.c"
+#line 7059 "CheckerboardLayout.c"
 			} else {
 				gint _tmp20_;
 				CheckerboardLayoutLayoutRow* _tmp21_;
 				gint _tmp22_;
 				CheckerboardLayoutLayoutRow* _tmp23_;
 				gint _tmp24_;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = y;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp21_ = row;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp22_ = _tmp21_->y;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp23_ = row;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp24_ = _tmp23_->height;
-#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1197 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp20_ > (_tmp22_ + _tmp24_)) {
-#line 7126 "CheckerboardLayout.c"
+#line 7078 "CheckerboardLayout.c"
 					gint _tmp25_;
-#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp25_ = mid;
-#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1199 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					min = _tmp25_ + 1;
-#line 7132 "CheckerboardLayout.c"
+#line 7084 "CheckerboardLayout.c"
 				} else {
 					CheckerboardLayoutLayoutRow* _tmp26_;
 					CheckerboardLayoutLayoutRow* _tmp27_;
-#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp26_ = row;
-#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = _checkerboard_layout_layout_row_ref0 (_tmp26_);
-#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (in_range);
-#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1202 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					in_range = _tmp27_;
-#line 1209 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (row);
-#line 1209 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1204 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7148 "CheckerboardLayout.c"
+#line 7100 "CheckerboardLayout.c"
 				}
 			}
-#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp28_ = min;
-#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = max;
-#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1207 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp28_ > _tmp29_) {
-#line 1213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_checkerboard_layout_layout_row_unref0 (row);
-#line 1213 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1208 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 7161 "CheckerboardLayout.c"
+#line 7113 "CheckerboardLayout.c"
 			}
-#line 1194 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1189 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_checkerboard_layout_layout_row_unref0 (row);
-#line 7165 "CheckerboardLayout.c"
+#line 7117 "CheckerboardLayout.c"
 		}
 	}
-#line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp30_ = in_range;
-#line 1216 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1211 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp30_ == NULL) {
-#line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_checkerboard_layout_layout_row_unref0 (in_range);
-#line 1217 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1212 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7178 "CheckerboardLayout.c"
+#line 7130 "CheckerboardLayout.c"
 	}
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp31_ = in_range;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp32_ = _tmp31_->items;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp32__length1 = _tmp31_->items_length1;
-#line 7186 "CheckerboardLayout.c"
+#line 7138 "CheckerboardLayout.c"
 	{
 		CheckerboardItem** item_collection = NULL;
 		gint item_collection_length1 = 0;
 		gint _item_collection_size_ = 0;
 		gint item_it = 0;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		item_collection = _tmp32_;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		item_collection_length1 = _tmp32__length1;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		for (item_it = 0; item_it < _tmp32__length1; item_it = item_it + 1) {
-#line 7198 "CheckerboardLayout.c"
+#line 7150 "CheckerboardLayout.c"
 			CheckerboardItem* _tmp33_;
 			CheckerboardItem* item = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp33_ = _g_object_ref0 (item_collection[item_it]);
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = _tmp33_;
-#line 7205 "CheckerboardLayout.c"
+#line 7157 "CheckerboardLayout.c"
 			{
 				CheckerboardItem* _tmp34_;
 				gint _tmp35_;
@@ -7217,72 +7169,72 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 				CheckerboardItem* _tmp45_;
 				GdkRectangle _tmp46_;
 				gint _tmp47_;
-#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp34_ = item;
-#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1218 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp34_ == NULL) {
-#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_object_unref0 (item);
-#line 1224 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1219 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 7229 "CheckerboardLayout.c"
+#line 7181 "CheckerboardLayout.c"
 				}
-#line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp35_ = x;
-#line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp36_ = item;
-#line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp38_ = _tmp37_.x;
-#line 1226 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1221 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp35_ < _tmp38_) {
-#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_object_unref0 (item);
-#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1223 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7245 "CheckerboardLayout.c"
+#line 7197 "CheckerboardLayout.c"
 				}
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp41_ = x;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp42_ = item;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp43_ = _tmp42_->allocation;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp44_ = _tmp43_.x;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp45_ = item;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp46_ = _tmp45_->allocation;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp47_ = _tmp46_.width;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp41_ <= (_tmp44_ + _tmp47_)) {
-#line 7263 "CheckerboardLayout.c"
+#line 7215 "CheckerboardLayout.c"
 					gint _tmp48_;
 					CheckerboardItem* _tmp49_;
 					GdkRectangle _tmp50_;
 					gint _tmp51_;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp48_ = y;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp49_ = item;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp50_ = _tmp49_->allocation;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp51_ = _tmp50_.y;
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = _tmp48_ >= _tmp51_;
-#line 7278 "CheckerboardLayout.c"
+#line 7230 "CheckerboardLayout.c"
 				} else {
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = FALSE;
-#line 7282 "CheckerboardLayout.c"
+#line 7234 "CheckerboardLayout.c"
 				}
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp40_) {
-#line 7286 "CheckerboardLayout.c"
+#line 7238 "CheckerboardLayout.c"
 					gint _tmp52_;
 					CheckerboardItem* _tmp53_;
 					GdkRectangle _tmp54_;
@@ -7290,51 +7242,51 @@ CheckerboardItem* checkerboard_layout_get_item_at_pixel (CheckerboardLayout* sel
 					CheckerboardItem* _tmp56_;
 					GdkRectangle _tmp57_;
 					gint _tmp58_;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp52_ = y;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp53_ = item;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp54_ = _tmp53_->allocation;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp55_ = _tmp54_.y;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp56_ = item;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp57_ = _tmp56_->allocation;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp58_ = _tmp57_.height;
-#line 1234 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1229 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = _tmp52_ <= (_tmp55_ + _tmp58_);
-#line 7310 "CheckerboardLayout.c"
+#line 7262 "CheckerboardLayout.c"
 				} else {
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = FALSE;
-#line 7314 "CheckerboardLayout.c"
+#line 7266 "CheckerboardLayout.c"
 				}
-#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1228 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp39_) {
-#line 1235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					result = item;
-#line 1235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (in_range);
-#line 1235 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1230 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					return result;
-#line 7324 "CheckerboardLayout.c"
+#line 7276 "CheckerboardLayout.c"
 				}
-#line 1220 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1215 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 7328 "CheckerboardLayout.c"
+#line 7280 "CheckerboardLayout.c"
 			}
 		}
 	}
-#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_layout_layout_row_unref0 (in_range);
-#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1233 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7338 "CheckerboardLayout.c"
+#line 7290 "CheckerboardLayout.c"
 }
 
 
@@ -7352,7 +7304,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7356 "CheckerboardLayout.c"
+#line 7308 "CheckerboardLayout.c"
 }
 
 
@@ -7375,7 +7327,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7379 "CheckerboardLayout.c"
+#line 7331 "CheckerboardLayout.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -7383,7 +7335,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7387 "CheckerboardLayout.c"
+#line 7339 "CheckerboardLayout.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -7395,7 +7347,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7399 "CheckerboardLayout.c"
+#line 7351 "CheckerboardLayout.c"
 	}
 }
 
@@ -7419,21 +7371,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7423 "CheckerboardLayout.c"
+#line 7375 "CheckerboardLayout.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7429 "CheckerboardLayout.c"
+#line 7381 "CheckerboardLayout.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7433 "CheckerboardLayout.c"
+#line 7385 "CheckerboardLayout.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7437 "CheckerboardLayout.c"
+#line 7389 "CheckerboardLayout.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -7445,7 +7397,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7449 "CheckerboardLayout.c"
+#line 7401 "CheckerboardLayout.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -7455,13 +7407,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7459 "CheckerboardLayout.c"
+#line 7411 "CheckerboardLayout.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7465 "CheckerboardLayout.c"
+#line 7417 "CheckerboardLayout.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -7475,7 +7427,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7479 "CheckerboardLayout.c"
+#line 7431 "CheckerboardLayout.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -7485,13 +7437,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7489 "CheckerboardLayout.c"
+#line 7441 "CheckerboardLayout.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7495 "CheckerboardLayout.c"
+#line 7447 "CheckerboardLayout.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -7500,7 +7452,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7504 "CheckerboardLayout.c"
+#line 7456 "CheckerboardLayout.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -7520,7 +7472,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7524 "CheckerboardLayout.c"
+#line 7476 "CheckerboardLayout.c"
 }
 
 
@@ -7537,64 +7489,64 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 	gboolean _tmp6_ = FALSE;
 	gint _tmp7_;
 	gint index = 0;
-#line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1236 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (tag_list != NULL, 0);
-#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = strlen (TAG_TAG_LIST_SEPARATOR_STRING);
-#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _tmp0_;
-#line 1242 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1237 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	sep_len = _tmp1_;
-#line 1243 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = sep_len;
-#line 1243 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1238 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp2_ > 0, "sep_len > 0");
-#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = tag_list;
-#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = strlen (_tmp3_);
-#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _tmp4_;
-#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1239 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	len = _tmp5_;
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = pos;
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp7_ < 0) {
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = TRUE;
-#line 7567 "CheckerboardLayout.c"
+#line 7519 "CheckerboardLayout.c"
 	} else {
 		gint _tmp8_;
 		gint _tmp9_;
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = pos;
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = len;
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp8_ >= _tmp9_;
-#line 7577 "CheckerboardLayout.c"
+#line 7529 "CheckerboardLayout.c"
 	}
-#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1240 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_) {
-#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = -1;
-#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1241 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7585 "CheckerboardLayout.c"
+#line 7537 "CheckerboardLayout.c"
 	}
 	{
 		gint i = 0;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		i = 0;
-#line 7591 "CheckerboardLayout.c"
+#line 7543 "CheckerboardLayout.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = TRUE;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 7598 "CheckerboardLayout.c"
+#line 7550 "CheckerboardLayout.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gboolean _tmp14_ = FALSE;
@@ -7603,58 +7555,58 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				gchar _tmp17_;
 				gint _tmp18_;
 				gchar _tmp19_;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp10_) {
-#line 7609 "CheckerboardLayout.c"
+#line 7561 "CheckerboardLayout.c"
 					gint _tmp11_;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp11_ = i;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp11_ + 1;
-#line 7615 "CheckerboardLayout.c"
+#line 7567 "CheckerboardLayout.c"
 				}
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp10_ = FALSE;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp12_ = i;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = sep_len;
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!(_tmp12_ < _tmp13_)) {
-#line 1249 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1244 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7627 "CheckerboardLayout.c"
+#line 7579 "CheckerboardLayout.c"
 				}
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp15_ = tag_list;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp16_ = pos;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp18_ = i;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) _tmp18_);
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp17_ == _tmp19_) {
-#line 7641 "CheckerboardLayout.c"
+#line 7593 "CheckerboardLayout.c"
 					gint _tmp20_;
 					gint _tmp21_;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = pos;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp21_ = i;
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp14_ = _tmp20_ >= _tmp21_;
-#line 7650 "CheckerboardLayout.c"
+#line 7602 "CheckerboardLayout.c"
 				} else {
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp14_ = FALSE;
-#line 7654 "CheckerboardLayout.c"
+#line 7606 "CheckerboardLayout.c"
 				}
-#line 1250 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1245 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp14_) {
-#line 7658 "CheckerboardLayout.c"
+#line 7610 "CheckerboardLayout.c"
 					const gchar* _tmp22_;
 					gint _tmp23_;
 					gint _tmp24_;
@@ -7662,49 +7614,49 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 					gchar* _tmp26_;
 					gchar* _tmp27_;
 					gboolean _tmp28_;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp22_ = tag_list;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp23_ = pos;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp24_ = i;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp25_ = sep_len;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp26_ = string_substring (_tmp22_, (glong) (_tmp23_ - _tmp24_), (glong) _tmp25_);
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = _tmp26_;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp28_ = g_strcmp0 (_tmp27_, TAG_TAG_LIST_SEPARATOR_STRING) == 0;
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_free0 (_tmp27_);
-#line 1251 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1246 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (_tmp28_) {
-#line 1252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						result = -1;
-#line 1252 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1247 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						return result;
-#line 7688 "CheckerboardLayout.c"
+#line 7640 "CheckerboardLayout.c"
 					}
 				}
 			}
 		}
 	}
-#line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1254 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	index = 0;
-#line 7696 "CheckerboardLayout.c"
+#line 7648 "CheckerboardLayout.c"
 	{
 		gint i = 0;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		i = 0;
-#line 7701 "CheckerboardLayout.c"
+#line 7653 "CheckerboardLayout.c"
 		{
 			gboolean _tmp29_ = FALSE;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = TRUE;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 7708 "CheckerboardLayout.c"
+#line 7660 "CheckerboardLayout.c"
 				gint _tmp31_;
 				gint _tmp32_;
 				gboolean _tmp33_ = FALSE;
@@ -7713,110 +7665,110 @@ gint checkerboard_layout_get_tag_index_at_pos (const gchar* tag_list, gint pos)
 				gint _tmp36_;
 				gchar _tmp37_;
 				gchar _tmp38_;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp29_) {
-#line 7719 "CheckerboardLayout.c"
+#line 7671 "CheckerboardLayout.c"
 					gint _tmp30_;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp30_ = i;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp30_ + 1;
-#line 7725 "CheckerboardLayout.c"
+#line 7677 "CheckerboardLayout.c"
 				}
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp29_ = FALSE;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = i;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp32_ = pos;
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!(_tmp31_ < _tmp32_)) {
-#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1255 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 7737 "CheckerboardLayout.c"
+#line 7689 "CheckerboardLayout.c"
 				}
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp35_ = tag_list;
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp36_ = i;
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp38_ = string_get (TAG_TAG_LIST_SEPARATOR_STRING, (glong) 0);
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp37_ == _tmp38_) {
-#line 7749 "CheckerboardLayout.c"
+#line 7701 "CheckerboardLayout.c"
 					gint _tmp39_;
 					gint _tmp40_;
 					gint _tmp41_;
-#line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = i;
-#line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = sep_len;
-#line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp41_ = len;
-#line 1262 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1257 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp34_ = (_tmp39_ + _tmp40_) <= _tmp41_;
-#line 7761 "CheckerboardLayout.c"
+#line 7713 "CheckerboardLayout.c"
 				} else {
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp34_ = FALSE;
-#line 7765 "CheckerboardLayout.c"
+#line 7717 "CheckerboardLayout.c"
 				}
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp34_) {
-#line 7769 "CheckerboardLayout.c"
+#line 7721 "CheckerboardLayout.c"
 					const gchar* _tmp42_;
 					gint _tmp43_;
 					gint _tmp44_;
 					gchar* _tmp45_;
 					gchar* _tmp46_;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp42_ = tag_list;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp43_ = i;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp44_ = sep_len;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp45_ = string_substring (_tmp42_, (glong) _tmp43_, (glong) _tmp44_);
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp46_ = _tmp45_;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp33_ = g_strcmp0 (_tmp46_, TAG_TAG_LIST_SEPARATOR_STRING) == 0;
-#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1258 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_free0 (_tmp46_);
-#line 7789 "CheckerboardLayout.c"
+#line 7741 "CheckerboardLayout.c"
 				} else {
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp33_ = FALSE;
-#line 7793 "CheckerboardLayout.c"
+#line 7745 "CheckerboardLayout.c"
 				}
-#line 1261 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1256 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp33_) {
-#line 7797 "CheckerboardLayout.c"
+#line 7749 "CheckerboardLayout.c"
 					gint _tmp47_;
 					gint _tmp48_;
 					gint _tmp49_;
-#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp47_ = index;
-#line 1264 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1259 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					index = _tmp47_ + 1;
-#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp48_ = i;
-#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp49_ = sep_len;
-#line 1265 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1260 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					i = _tmp48_ + (_tmp49_ - 1);
-#line 7811 "CheckerboardLayout.c"
+#line 7763 "CheckerboardLayout.c"
 				}
 			}
 		}
 	}
-#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = index;
-#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1263 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7820 "CheckerboardLayout.c"
+#line 7772 "CheckerboardLayout.c"
 }
 
 
@@ -7845,92 +7797,92 @@ static gint checkerboard_layout_internal_handle_tag_mouse_event (CheckerboardLay
 	gint _tmp14_ = 0;
 	gint _tmp15_ = 0;
 	gboolean _tmp16_;
-#line 1271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), 0);
-#line 1271 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1266 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), 0);
-#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = item;
-#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = checkerboard_item_get_tag_list_layout (_tmp0_);
-#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1267 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	layout = _tmp1_;
-#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = layout;
-#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1268 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ == NULL) {
-#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = -1;
-#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (layout);
-#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1269 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7869 "CheckerboardLayout.c"
+#line 7821 "CheckerboardLayout.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = item;
-#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_item_get_subtitle_allocation (_tmp3_, &_tmp4_);
-#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1270 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	rect = _tmp4_;
-#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = x;
-#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = rect;
-#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _tmp6_.x;
-#line 1277 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1272 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	px = (_tmp5_ - _tmp7_) * PANGO_SCALE;
-#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = y;
-#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = rect;
-#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = _tmp9_.y;
-#line 1278 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1273 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	py = (_tmp8_ - _tmp10_) * PANGO_SCALE;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = layout;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = px;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp13_ = py;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp16_ = pango_layout_xy_to_index (_tmp11_, _tmp12_, _tmp13_, &_tmp14_, &_tmp15_);
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	index = _tmp14_;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	trailing = _tmp15_;
-#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1274 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp16_) {
-#line 7907 "CheckerboardLayout.c"
+#line 7859 "CheckerboardLayout.c"
 		PangoLayout* _tmp17_;
 		const gchar* _tmp18_;
 		gint _tmp19_;
 		gint _tmp20_;
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = layout;
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = pango_layout_get_text (_tmp17_);
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = index;
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = checkerboard_layout_get_tag_index_at_pos (_tmp18_, _tmp19_);
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = _tmp20_;
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (layout);
-#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1275 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7926 "CheckerboardLayout.c"
+#line 7878 "CheckerboardLayout.c"
 	}
-#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = -1;
-#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (layout);
-#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1276 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 7934 "CheckerboardLayout.c"
+#line 7886 "CheckerboardLayout.c"
 }
 
 
@@ -7948,60 +7900,60 @@ gboolean checkerboard_layout_handle_mouse_motion (CheckerboardLayout* self, Chec
 	CheckerboardItem* _tmp9_;
 	gint _tmp10_;
 	gint _tmp11_;
-#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
-#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1279 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = item;
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = checkerboard_item_get_has_tags (_tmp1_);
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_;
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp3_) {
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 7966 "CheckerboardLayout.c"
+#line 7918 "CheckerboardLayout.c"
 	} else {
 		gboolean _tmp4_;
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = checkerboard_layout_is_drag_select_active (self);
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_;
-#line 7973 "CheckerboardLayout.c"
+#line 7925 "CheckerboardLayout.c"
 	}
-#line 1285 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1280 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = FALSE;
-#line 1286 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1281 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 7981 "CheckerboardLayout.c"
+#line 7933 "CheckerboardLayout.c"
 	}
-#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = item;
-#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = x;
-#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = y;
-#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = checkerboard_layout_internal_handle_tag_mouse_event (self, _tmp5_, _tmp6_, _tmp7_);
-#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1282 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	tag_index = _tmp8_;
-#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = item;
-#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = tag_index;
-#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1283 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_item_highlight_user_visible_tag (_tmp9_, _tmp10_);
-#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = tag_index;
-#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp11_ >= 0;
-#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1284 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8005 "CheckerboardLayout.c"
+#line 7957 "CheckerboardLayout.c"
 }
 
 
@@ -8015,29 +7967,29 @@ gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, Checke
 	gdouble _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
-#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1287 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = item;
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = xd;
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = round (_tmp1_);
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = yd;
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = round (_tmp3_);
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = checkerboard_layout_internal_handle_tag_mouse_event (self, _tmp0_, (gint) _tmp2_, (gint) _tmp4_);
-#line 1293 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1288 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	tag_index = _tmp5_;
-#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = tag_index;
-#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1289 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ >= 0) {
-#line 8041 "CheckerboardLayout.c"
+#line 7993 "CheckerboardLayout.c"
 		Tag* tag = NULL;
 		CheckerboardItem* _tmp7_;
 		gint _tmp8_;
@@ -8045,37 +7997,37 @@ gboolean checkerboard_layout_handle_left_click (CheckerboardLayout* self, Checke
 		LibraryWindow* _tmp10_;
 		LibraryWindow* _tmp11_;
 		Tag* _tmp12_;
-#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = item;
-#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = tag_index;
-#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = checkerboard_item_get_user_visible_tag (_tmp7_, _tmp8_);
-#line 1295 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1290 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		tag = _tmp9_;
-#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = library_window_get_app ();
-#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = _tmp10_;
-#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = tag;
-#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		library_window_switch_to_tag (_tmp11_, _tmp12_);
-#line 1296 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1291 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = TRUE;
-#line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (tag);
-#line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1292 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8073 "CheckerboardLayout.c"
+#line 8025 "CheckerboardLayout.c"
 	}
-#line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = FALSE;
-#line 1299 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1294 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8079 "CheckerboardLayout.c"
+#line 8031 "CheckerboardLayout.c"
 }
 
 
@@ -8083,17 +8035,17 @@ GeeList* checkerboard_layout_get_visible_items (CheckerboardLayout* self) {
 	GeeList* result = NULL;
 	GdkRectangle _tmp0_;
 	GeeList* _tmp1_;
-#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1297 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->visible_page;
-#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = checkerboard_layout_intersection (self, &_tmp0_);
-#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp1_;
-#line 1303 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1298 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8097 "CheckerboardLayout.c"
+#line 8049 "CheckerboardLayout.c"
 }
 
 
@@ -8106,44 +8058,44 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 	GdkRectangle bitbucket = {0};
 	CheckerboardLayoutLayoutRow** _tmp2_;
 	gint _tmp2__length1;
-#line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1306 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1301 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (area != NULL, NULL);
-#line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1302 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	intersects = _tmp0_;
-#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp1_);
-#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1305 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	allocation = _tmp1_;
-#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1307 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&bitbucket, 0, sizeof (GdkRectangle));
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->item_rows;
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2__length1 = self->priv->item_rows_length1;
-#line 8128 "CheckerboardLayout.c"
+#line 8080 "CheckerboardLayout.c"
 	{
 		CheckerboardLayoutLayoutRow** row_collection = NULL;
 		gint row_collection_length1 = 0;
 		gint _row_collection_size_ = 0;
 		gint row_it = 0;
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		row_collection = _tmp2_;
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		row_collection_length1 = _tmp2__length1;
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		for (row_it = 0; row_it < _tmp2__length1; row_it = row_it + 1) {
-#line 8140 "CheckerboardLayout.c"
+#line 8092 "CheckerboardLayout.c"
 			CheckerboardLayoutLayoutRow* _tmp3_;
 			CheckerboardLayoutLayoutRow* row = NULL;
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = _checkerboard_layout_layout_row_ref0 (row_collection[row_it]);
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			row = _tmp3_;
-#line 8147 "CheckerboardLayout.c"
+#line 8099 "CheckerboardLayout.c"
 			{
 				CheckerboardLayoutLayoutRow* _tmp4_;
 				GdkRectangle _tmp5_;
@@ -8168,171 +8120,171 @@ GeeList* checkerboard_layout_intersection (CheckerboardLayout* self, GdkRectangl
 				GdkRectangle _tmp23_;
 				GdkRectangle _tmp24_ = {0};
 				gboolean _tmp25_;
-#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp4_ = row;
-#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1309 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp4_ == NULL) {
-#line 1315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (row);
-#line 1315 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1310 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 8180 "CheckerboardLayout.c"
+#line 8132 "CheckerboardLayout.c"
 				}
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp5_ = *area;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp6_ = _tmp5_.y;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp7_ = *area;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp8_ = _tmp7_.height;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp9_ = row;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp10_ = _tmp9_->y;
-#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1312 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if ((_tmp6_ + _tmp8_) < _tmp10_) {
-#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (row);
-#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1314 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 8200 "CheckerboardLayout.c"
+#line 8152 "CheckerboardLayout.c"
 				}
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp11_ = row;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp12_ = _tmp11_->y;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = row;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = _tmp13_->height;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp15_ = *area;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp16_ = _tmp15_.y;
-#line 1322 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1317 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if ((_tmp12_ + _tmp14_) < _tmp16_) {
-#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (row);
-#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1319 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					continue;
-#line 8220 "CheckerboardLayout.c"
+#line 8172 "CheckerboardLayout.c"
 				}
-#line 1328 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1323 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				memset (&row_rect, 0, sizeof (GdkRectangle));
-#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1324 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_rect.x = 0;
-#line 1330 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = row;
-#line 1330 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp18_ = _tmp17_->y;
-#line 1330 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1325 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_rect.y = _tmp18_;
-#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = allocation;
-#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = _tmp19_.width;
-#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1326 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_rect.width = _tmp20_;
-#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp21_ = row;
-#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp22_ = _tmp21_->height;
-#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1327 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_rect.height = _tmp22_;
-#line 1334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp23_ = row_rect;
-#line 1334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp25_ = gdk_rectangle_intersect (area, &_tmp23_, &_tmp24_);
-#line 1334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				bitbucket = _tmp24_;
-#line 1334 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1329 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp25_) {
-#line 8252 "CheckerboardLayout.c"
+#line 8204 "CheckerboardLayout.c"
 					CheckerboardLayoutLayoutRow* _tmp26_;
 					CheckerboardItem** _tmp27_;
 					gint _tmp27__length1;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp26_ = row;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = _tmp26_->items;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27__length1 = _tmp26_->items_length1;
-#line 8262 "CheckerboardLayout.c"
+#line 8214 "CheckerboardLayout.c"
 					{
 						CheckerboardItem** item_collection = NULL;
 						gint item_collection_length1 = 0;
 						gint _item_collection_size_ = 0;
 						gint item_it = 0;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						item_collection = _tmp27_;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						item_collection_length1 = _tmp27__length1;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						for (item_it = 0; item_it < _tmp27__length1; item_it = item_it + 1) {
-#line 8274 "CheckerboardLayout.c"
+#line 8226 "CheckerboardLayout.c"
 							CheckerboardItem* _tmp28_;
 							CheckerboardItem* item = NULL;
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp28_ = _g_object_ref0 (item_collection[item_it]);
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							item = _tmp28_;
-#line 8281 "CheckerboardLayout.c"
+#line 8233 "CheckerboardLayout.c"
 							{
 								CheckerboardItem* _tmp29_;
 								CheckerboardItem* _tmp30_;
 								GdkRectangle _tmp31_;
 								GdkRectangle _tmp32_ = {0};
 								gboolean _tmp33_;
-#line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp29_ = item;
-#line 1337 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1332 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								if (_tmp29_ == NULL) {
-#line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1333 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									_g_object_unref0 (item);
-#line 1338 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1333 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									continue;
-#line 8296 "CheckerboardLayout.c"
+#line 8248 "CheckerboardLayout.c"
 								}
-#line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp30_ = item;
-#line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp31_ = _tmp30_->allocation;
-#line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_tmp33_ = gdk_rectangle_intersect (area, &_tmp31_, &_tmp32_);
-#line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								bitbucket = _tmp32_;
-#line 1340 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1335 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								if (_tmp33_) {
-#line 8308 "CheckerboardLayout.c"
+#line 8260 "CheckerboardLayout.c"
 									GeeArrayList* _tmp34_;
 									CheckerboardItem* _tmp35_;
-#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									_tmp34_ = intersects;
-#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									_tmp35_ = item;
-#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 8317 "CheckerboardLayout.c"
+#line 8269 "CheckerboardLayout.c"
 								}
-#line 1336 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1331 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 								_g_object_unref0 (item);
-#line 8321 "CheckerboardLayout.c"
+#line 8273 "CheckerboardLayout.c"
 							}
 						}
 					}
 				}
-#line 1313 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1308 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_checkerboard_layout_layout_row_unref0 (row);
-#line 8328 "CheckerboardLayout.c"
+#line 8280 "CheckerboardLayout.c"
 			}
 		}
 	}
-#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (intersects, GEE_TYPE_LIST, GeeList);
-#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1341 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8336 "CheckerboardLayout.c"
+#line 8288 "CheckerboardLayout.c"
 }
 
 
@@ -8360,327 +8312,327 @@ CheckerboardItem* checkerboard_layout_get_item_relative_to (CheckerboardLayout*
 	CheckerboardItem* _tmp47_ = NULL;
 	CheckerboardItem* _tmp48_;
 	CheckerboardItem* _tmp51_;
-#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1344 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_ITEM (item), NULL);
-#line 1350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->view;
-#line 1350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1350 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1345 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ == 0) {
-#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1346 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8378 "CheckerboardLayout.c"
+#line 8330 "CheckerboardLayout.c"
 	}
-#line 1353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->columns;
-#line 1353 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1348 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp2_ > 0, "columns > 0");
-#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->rows;
-#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1349 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp3_ > 0, "rows > 0");
-#line 1356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = item;
-#line 1356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = checkerboard_item_get_column (_tmp4_);
-#line 1356 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1351 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	col = _tmp5_;
-#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = item;
-#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = checkerboard_item_get_row (_tmp6_);
-#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1352 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row = _tmp7_;
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = col;
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ < 0) {
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = TRUE;
-#line 8406 "CheckerboardLayout.c"
+#line 8358 "CheckerboardLayout.c"
 	} else {
 		gint _tmp10_;
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = row;
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp10_ < 0;
-#line 8413 "CheckerboardLayout.c"
+#line 8365 "CheckerboardLayout.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1354 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp8_) {
-#line 8417 "CheckerboardLayout.c"
+#line 8369 "CheckerboardLayout.c"
 		CheckerboardItem* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
-#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = item;
-#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = checkerboard_item_get_title (_tmp11_);
-#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp12_;
-#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-		g_critical ("CheckerboardLayout.vala:1360: Attempting to locate item not placed in " \
+#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+		g_critical ("CheckerboardLayout.vala:1355: Attempting to locate item not placed in " \
 "layout: %s", _tmp13_);
-#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1355 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp13_);
-#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1357 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8435 "CheckerboardLayout.c"
+#line 8387 "CheckerboardLayout.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = point;
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	switch (_tmp14_) {
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_NORTH:
-#line 8443 "CheckerboardLayout.c"
+#line 8395 "CheckerboardLayout.c"
 		{
 			gint _tmp15_;
 			gint _tmp16_;
-#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = row;
-#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			row = _tmp15_ - 1;
-#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp16_ = row;
-#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1362 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp16_ < 0) {
-#line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1363 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = 0;
-#line 8457 "CheckerboardLayout.c"
+#line 8409 "CheckerboardLayout.c"
 			}
-#line 1369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1364 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8461 "CheckerboardLayout.c"
+#line 8413 "CheckerboardLayout.c"
 		}
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_SOUTH:
-#line 8465 "CheckerboardLayout.c"
+#line 8417 "CheckerboardLayout.c"
 		{
 			gint _tmp17_;
 			gint _tmp18_;
 			gint _tmp19_;
-#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp17_ = row;
-#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			row = _tmp17_ + 1;
-#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp18_ = row;
-#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp19_ = self->priv->rows;
-#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1367 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp18_ >= _tmp19_) {
-#line 8480 "CheckerboardLayout.c"
+#line 8432 "CheckerboardLayout.c"
 				gint _tmp20_;
-#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = self->priv->rows;
-#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1368 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = _tmp20_ - 1;
-#line 8486 "CheckerboardLayout.c"
+#line 8438 "CheckerboardLayout.c"
 			}
-#line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1369 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8490 "CheckerboardLayout.c"
+#line 8442 "CheckerboardLayout.c"
 		}
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_EAST:
-#line 8494 "CheckerboardLayout.c"
+#line 8446 "CheckerboardLayout.c"
 		{
 			gint _tmp21_;
 			gint _tmp22_;
 			gint _tmp23_;
-#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp21_ = col;
-#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			col = _tmp21_ + 1;
-#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp22_ = col;
-#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp23_ = self->priv->columns;
-#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1372 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp22_ >= _tmp23_) {
-#line 8509 "CheckerboardLayout.c"
+#line 8461 "CheckerboardLayout.c"
 				gint _tmp24_;
 				gint _tmp25_;
 				gint _tmp26_;
-#line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp24_ = row;
-#line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = _tmp24_ + 1;
-#line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp25_ = row;
-#line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = self->priv->rows;
-#line 1378 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1373 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp25_ >= _tmp26_) {
-#line 8523 "CheckerboardLayout.c"
+#line 8475 "CheckerboardLayout.c"
 					gint _tmp27_;
 					gint _tmp28_;
-#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp27_ = self->priv->rows;
-#line 1379 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1374 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = _tmp27_ - 1;
-#line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp28_ = self->priv->columns;
-#line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1375 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = _tmp28_ - 1;
-#line 8534 "CheckerboardLayout.c"
+#line 8486 "CheckerboardLayout.c"
 				} else {
-#line 1382 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1377 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 8538 "CheckerboardLayout.c"
+#line 8490 "CheckerboardLayout.c"
 				}
 			}
-#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1380 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8543 "CheckerboardLayout.c"
+#line 8495 "CheckerboardLayout.c"
 		}
-#line 1365 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1360 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		case COMPASS_POINT_WEST:
-#line 8547 "CheckerboardLayout.c"
+#line 8499 "CheckerboardLayout.c"
 		{
 			gint _tmp29_;
 			gint _tmp30_;
-#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = col;
-#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			col = _tmp29_ - 1;
-#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp30_ = col;
-#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1383 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp30_ < 0) {
-#line 8559 "CheckerboardLayout.c"
+#line 8511 "CheckerboardLayout.c"
 				gint _tmp31_;
 				gint _tmp32_;
-#line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = row;
-#line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = _tmp31_ - 1;
-#line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp32_ = row;
-#line 1389 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1384 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp32_ < 0) {
-#line 1390 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1385 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = 0;
-#line 1391 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1386 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 8574 "CheckerboardLayout.c"
+#line 8526 "CheckerboardLayout.c"
 				} else {
 					gint _tmp33_;
-#line 1393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp33_ = self->priv->columns;
-#line 1393 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1388 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = _tmp33_ - 1;
-#line 8581 "CheckerboardLayout.c"
+#line 8533 "CheckerboardLayout.c"
 				}
 			}
-#line 1396 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1391 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			break;
-#line 8586 "CheckerboardLayout.c"
+#line 8538 "CheckerboardLayout.c"
 		}
 		default:
 		{
 			CompassPoint _tmp34_;
-#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp34_ = point;
-#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
-			g_error ("CheckerboardLayout.vala:1399: Bad compass point %d", (gint) _tmp34_);
-#line 8595 "CheckerboardLayout.c"
+#line 1394 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+			g_error ("CheckerboardLayout.vala:1394: Bad compass point %d", (gint) _tmp34_);
+#line 8547 "CheckerboardLayout.c"
 		}
 	}
-#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp35_ = col;
-#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp36_ = row;
-#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp37_ = checkerboard_layout_get_item_at_coordinate (self, _tmp35_, _tmp36_);
-#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1397 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	new_item = _tmp37_;
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp39_ = new_item;
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp39_ == NULL) {
-#line 8610 "CheckerboardLayout.c"
+#line 8562 "CheckerboardLayout.c"
 		CompassPoint _tmp40_;
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = point;
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = _tmp40_ == COMPASS_POINT_SOUTH;
-#line 8616 "CheckerboardLayout.c"
+#line 8568 "CheckerboardLayout.c"
 	} else {
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = FALSE;
-#line 8620 "CheckerboardLayout.c"
+#line 8572 "CheckerboardLayout.c"
 	}
-#line 1404 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1399 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp38_) {
-#line 8624 "CheckerboardLayout.c"
+#line 8576 "CheckerboardLayout.c"
 		ViewCollection* _tmp41_;
 		DataView* _tmp42_;
 		CheckerboardItem* _tmp43_;
 		gint _tmp44_;
 		CheckerboardItem* _tmp45_;
 		gint _tmp46_;
-#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp41_ = self->priv->view;
-#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp42_ = view_collection_get_last (_tmp41_);
-#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (new_item);
-#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1401 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		new_item = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp43_ = new_item;
-#line 1407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp44_ = checkerboard_item_get_row (_tmp43_);
-#line 1407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp45_ = item;
-#line 1407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp46_ = checkerboard_item_get_row (_tmp45_);
-#line 1407 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1402 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp44_ <= _tmp46_) {
-#line 1408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (new_item);
-#line 1408 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1403 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			new_item = NULL;
-#line 8653 "CheckerboardLayout.c"
+#line 8605 "CheckerboardLayout.c"
 		}
 	}
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp48_ = new_item;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp48_ != NULL) {
-#line 8660 "CheckerboardLayout.c"
+#line 8612 "CheckerboardLayout.c"
 		CheckerboardItem* _tmp49_;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp49_ = new_item;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = _tmp49_;
-#line 8666 "CheckerboardLayout.c"
+#line 8618 "CheckerboardLayout.c"
 	} else {
 		CheckerboardItem* _tmp50_;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp50_ = item;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = _tmp50_;
-#line 8673 "CheckerboardLayout.c"
+#line 8625 "CheckerboardLayout.c"
 	}
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp51_ = _g_object_ref0 (_tmp47_);
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp51_;
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (new_item);
-#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1406 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8683 "CheckerboardLayout.c"
+#line 8635 "CheckerboardLayout.c"
 }
 
 
@@ -8706,83 +8658,83 @@ CheckerboardItem* checkerboard_layout_get_item_at_coordinate (CheckerboardLayout
 	gint _tmp12_;
 	CheckerboardItem* _tmp13_;
 	CheckerboardItem* _tmp14_;
-#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1409 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = row;
-#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->item_rows;
-#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1__length1 = self->priv->item_rows_length1;
-#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1410 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ >= _tmp1__length1) {
-#line 1416 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1416 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1411 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8723 "CheckerboardLayout.c"
+#line 8675 "CheckerboardLayout.c"
 	}
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->item_rows;
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2__length1 = self->priv->item_rows_length1;
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = row;
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = _tmp2_[_tmp3_];
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _checkerboard_layout_layout_row_ref0 (_tmp4_);
-#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1413 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	item_row = _tmp5_;
-#line 1419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = item_row;
-#line 1419 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1414 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ == NULL) {
-#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_checkerboard_layout_layout_row_unref0 (item_row);
-#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1415 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8747 "CheckerboardLayout.c"
+#line 8699 "CheckerboardLayout.c"
 	}
-#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = col;
-#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = item_row;
-#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = _tmp8_->items;
-#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9__length1 = _tmp8_->items_length1;
-#line 1422 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1417 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp7_ >= _tmp9__length1) {
-#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_checkerboard_layout_layout_row_unref0 (item_row);
-#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1418 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8765 "CheckerboardLayout.c"
+#line 8717 "CheckerboardLayout.c"
 	}
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = item_row;
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = _tmp10_->items;
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11__length1 = _tmp10_->items_length1;
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = col;
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp13_ = _tmp11_[_tmp12_];
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = _g_object_ref0 (_tmp13_);
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp14_;
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_layout_layout_row_unref0 (item_row);
-#line 1425 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1420 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8785 "CheckerboardLayout.c"
+#line 8737 "CheckerboardLayout.c"
 }
 
 
@@ -8797,35 +8749,35 @@ void checkerboard_layout_set_drag_select_origin (CheckerboardLayout* self, gint
 	GtkAllocation _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 1428 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1423 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1424 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_clear_drag_select (self);
-#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_);
-#line 1432 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1427 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	allocation = _tmp0_;
-#line 1434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = x;
-#line 1434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = allocation;
-#line 1434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_.width;
-#line 1434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = CLAMP (_tmp1_, 0, _tmp3_);
-#line 1434 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1429 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_origin.x = _tmp4_;
-#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = y;
-#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = allocation;
-#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _tmp6_.height;
-#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = CLAMP (_tmp5_, 0, _tmp7_);
-#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1430 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_origin.y = _tmp8_;
-#line 8828 "CheckerboardLayout.c"
+#line 8780 "CheckerboardLayout.c"
 }
 
 
@@ -8847,51 +8799,51 @@ void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gin
 	Box _tmp12_ = {0};
 	GdkRectangle _tmp13_ = {0};
 	GdkWindow* _tmp14_;
-#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1433 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_);
-#line 1440 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1435 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	allocation = _tmp0_;
-#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = x;
-#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = allocation;
-#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = _tmp2_.width;
-#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = CLAMP (_tmp1_, 0, _tmp3_);
-#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1437 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_endpoint.x = _tmp4_;
-#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = y;
-#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = allocation;
-#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = _tmp6_.height;
-#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = CLAMP (_tmp5_, 0, _tmp7_);
-#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1438 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_endpoint.y = _tmp8_;
-#line 1447 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = self->priv->selection_band;
-#line 1447 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1442 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	old_selection_band = _tmp9_;
-#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = self->priv->drag_origin;
-#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = self->priv->drag_endpoint;
-#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	box_from_points (&_tmp10_, &_tmp11_, &_tmp12_);
-#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	box_get_rectangle (&_tmp12_, &_tmp13_);
-#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1443 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->selection_band = _tmp13_;
-#line 1451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1446 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1451 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1446 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp14_ != NULL) {
-#line 8894 "CheckerboardLayout.c"
+#line 8846 "CheckerboardLayout.c"
 		GdkRectangle _union_ = {0};
 		GdkRectangle _tmp15_;
 		GdkRectangle _tmp16_ = {0};
@@ -8903,31 +8855,31 @@ void checkerboard_layout_set_drag_select_endpoint (CheckerboardLayout* self, gin
 		gint _tmp22_;
 		GdkRectangle _tmp23_;
 		gint _tmp24_;
-#line 1453 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = old_selection_band;
-#line 1453 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gdk_rectangle_union (&self->priv->selection_band, &_tmp15_, &_tmp16_);
-#line 1453 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1448 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_union_ = _tmp16_;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = _union_;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = _tmp17_.x;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = _union_;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = _tmp19_.y;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = _union_;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = _tmp21_.width;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp23_ = _union_;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = _tmp23_.height;
-#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1450 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp18_, _tmp20_, _tmp22_, _tmp24_);
-#line 8930 "CheckerboardLayout.c"
+#line 8882 "CheckerboardLayout.c"
 	}
 }
 
@@ -8939,31 +8891,31 @@ GeeList* checkerboard_layout_items_in_selection_band (CheckerboardLayout* self)
 	gboolean _tmp2_;
 	GdkRectangle _tmp3_;
 	GeeList* _tmp4_;
-#line 1459 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1454 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), NULL);
-#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->selection_band;
-#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	dimensions_for_rectangle (&_tmp0_, &_tmp1_);
-#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = dimensions_has_area (&_tmp1_);
-#line 1460 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1455 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!_tmp2_) {
-#line 1461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		result = NULL;
-#line 1461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1456 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return result;
-#line 8956 "CheckerboardLayout.c"
+#line 8908 "CheckerboardLayout.c"
 	}
-#line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->selection_band;
-#line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = checkerboard_layout_intersection (self, &_tmp3_);
-#line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp4_;
-#line 1463 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1458 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 8966 "CheckerboardLayout.c"
+#line 8918 "CheckerboardLayout.c"
 }
 
 
@@ -8972,53 +8924,53 @@ gboolean checkerboard_layout_is_drag_select_active (CheckerboardLayout* self) {
 	gboolean _tmp0_ = FALSE;
 	GdkPoint _tmp1_;
 	gint _tmp2_;
-#line 1466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1461 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_LAYOUT (self), FALSE);
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->drag_origin;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_.x;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ >= 0) {
-#line 8983 "CheckerboardLayout.c"
+#line 8935 "CheckerboardLayout.c"
 		GdkPoint _tmp3_;
 		gint _tmp4_;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->drag_origin;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = _tmp3_.y;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ >= 0;
-#line 8992 "CheckerboardLayout.c"
+#line 8944 "CheckerboardLayout.c"
 	} else {
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = FALSE;
-#line 8996 "CheckerboardLayout.c"
+#line 8948 "CheckerboardLayout.c"
 	}
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp0_;
-#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1462 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 9002 "CheckerboardLayout.c"
+#line 8954 "CheckerboardLayout.c"
 }
 
 
 void checkerboard_layout_clear_drag_select (CheckerboardLayout* self) {
-#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1465 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1471 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1466 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&self->priv->selection_band, 0, sizeof (GdkRectangle));
-#line 1472 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1467 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_origin.x = -1;
-#line 1473 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1468 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_origin.y = -1;
-#line 1474 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1469 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_endpoint.x = -1;
-#line 1475 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1470 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->drag_endpoint.y = -1;
-#line 1478 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1473 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 9021 "CheckerboardLayout.c"
+#line 8973 "CheckerboardLayout.c"
 }
 
 
@@ -9026,19 +8978,19 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
 	GdkRectangle _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1476 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1478 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_update_visible_page (self);
-#line 1486 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->visible_page;
-#line 1486 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _tmp0_.width;
-#line 1486 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->last_width;
-#line 1486 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1481 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp1_ != _tmp2_) {
-#line 9041 "CheckerboardLayout.c"
+#line 8993 "CheckerboardLayout.c"
 		gint old_width = 0;
 		gint _tmp3_;
 		GdkRectangle _tmp4_;
@@ -9048,46 +9000,46 @@ static void checkerboard_layout_viewport_resized (CheckerboardLayout* self) {
 		gint _tmp8_;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 1487 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1482 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->last_width;
-#line 1487 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1482 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		old_width = _tmp3_;
-#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = self->priv->visible_page;
-#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = _tmp4_.width;
-#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1483 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->last_width = _tmp5_;
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = old_width;
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = self->priv->visible_page;
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp7_.width;
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = g_strdup_printf ("viewport_resized (%d -> %d)", _tmp6_, _tmp8_);
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp10_ = _tmp9_;
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_need_reflow (self, _tmp10_);
-#line 1490 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1485 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp10_);
-#line 9075 "CheckerboardLayout.c"
+#line 9027 "CheckerboardLayout.c"
 	} else {
 		gint _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
-#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp11_ = self->priv->last_width;
-#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp12_ = g_strdup_printf ("viewport_resized (same width=%d)", _tmp11_);
-#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp12_;
-#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_need_exposure (self, _tmp13_);
-#line 1493 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1488 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_free0 (_tmp13_);
-#line 9090 "CheckerboardLayout.c"
+#line 9042 "CheckerboardLayout.c"
 	}
 }
 
@@ -9101,23 +9053,23 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 	GeeHashSet* _tmp27_;
 	GeeHashSet* _tmp28_;
 	ViewCollection* _tmp29_;
-#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
-#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1495 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	new_exposed_items = _tmp0_;
-#line 1502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->view;
-#line 1502 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = checkerboard_layout_get_visible_items (self);
-#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1499 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	items = _tmp2_;
-#line 9120 "CheckerboardLayout.c"
+#line 9072 "CheckerboardLayout.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp3_;
@@ -9127,25 +9079,25 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 		gint _tmp6_;
 		gint _tmp7_;
 		gint _item_index = 0;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = items;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_list = _tmp4_;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = _item_list;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = _tmp6_;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_size = _tmp7_;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_index = -1;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9148 "CheckerboardLayout.c"
+#line 9100 "CheckerboardLayout.c"
 			gint _tmp8_;
 			gint _tmp9_;
 			gint _tmp10_;
@@ -9158,124 +9110,124 @@ static void checkerboard_layout_expose_items (CheckerboardLayout* self, const gc
 			GeeHashSet* _tmp16_;
 			CheckerboardItem* _tmp17_;
 			gboolean _tmp18_;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = _item_index;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_item_index = _tmp8_ + 1;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = _item_index;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = _item_size;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!(_tmp9_ < _tmp10_)) {
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9173 "CheckerboardLayout.c"
+#line 9125 "CheckerboardLayout.c"
 			}
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _item_list;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = _item_index;
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp13_ = gee_list_get (_tmp11_, _tmp12_);
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = (CheckerboardItem*) _tmp13_;
-#line 1506 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp14_ = new_exposed_items;
-#line 1506 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = item;
-#line 1506 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1501 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
-#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp16_ = self->priv->exposed_items;
-#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp17_ = item;
-#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp18_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1504 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp18_) {
-#line 9197 "CheckerboardLayout.c"
+#line 9149 "CheckerboardLayout.c"
 				CheckerboardItem* _tmp19_;
-#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = item;
-#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_exposed (_tmp19_);
-#line 9203 "CheckerboardLayout.c"
+#line 9155 "CheckerboardLayout.c"
 			}
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9207 "CheckerboardLayout.c"
+#line 9159 "CheckerboardLayout.c"
 		}
-#line 1505 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1500 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_list);
-#line 9211 "CheckerboardLayout.c"
+#line 9163 "CheckerboardLayout.c"
 	}
 	{
 		GeeIterator* _item_it = NULL;
 		GeeHashSet* _tmp20_;
 		GeeIterator* _tmp21_;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = self->priv->exposed_items;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_it = _tmp21_;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9225 "CheckerboardLayout.c"
+#line 9177 "CheckerboardLayout.c"
 			GeeIterator* _tmp22_;
 			gboolean _tmp23_;
 			CheckerboardItem* item = NULL;
 			GeeIterator* _tmp24_;
 			gpointer _tmp25_;
 			CheckerboardItem* _tmp26_;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp22_ = _item_it;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp23_ = gee_iterator_next (_tmp22_);
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp23_) {
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9240 "CheckerboardLayout.c"
+#line 9192 "CheckerboardLayout.c"
 			}
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp24_ = _item_it;
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp25_ = gee_iterator_get (_tmp24_);
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = (CheckerboardItem*) _tmp25_;
-#line 1515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp26_ = item;
-#line 1515 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1510 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_item_unexposed (_tmp26_);
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9254 "CheckerboardLayout.c"
+#line 9206 "CheckerboardLayout.c"
 		}
-#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1509 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_it);
-#line 9258 "CheckerboardLayout.c"
+#line 9210 "CheckerboardLayout.c"
 	}
-#line 1518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp27_ = new_exposed_items;
-#line 1518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 1518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->exposed_items);
-#line 1518 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1513 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposed_items = _tmp28_;
-#line 1519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1514 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure_dirty = FALSE;
-#line 1524 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp29_ = self->priv->view;
-#line 1524 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1519 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (items);
-#line 1497 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1492 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (new_exposed_items);
-#line 9278 "CheckerboardLayout.c"
+#line 9230 "CheckerboardLayout.c"
 }
 
 
@@ -9283,73 +9235,73 @@ static void checkerboard_layout_unexpose_items (CheckerboardLayout* self, const
 	ViewCollection* _tmp0_;
 	GeeHashSet* _tmp8_;
 	ViewCollection* _tmp9_;
-#line 1530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1530 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1525 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
-#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->view;
-#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1526 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 9294 "CheckerboardLayout.c"
+#line 9246 "CheckerboardLayout.c"
 	{
 		GeeIterator* _item_it = NULL;
 		GeeHashSet* _tmp1_;
 		GeeIterator* _tmp2_;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = self->priv->exposed_items;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_item_it = _tmp2_;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9307 "CheckerboardLayout.c"
+#line 9259 "CheckerboardLayout.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			CheckerboardItem* item = NULL;
 			GeeIterator* _tmp5_;
 			gpointer _tmp6_;
 			CheckerboardItem* _tmp7_;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = _item_it;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp4_) {
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9322 "CheckerboardLayout.c"
+#line 9274 "CheckerboardLayout.c"
 			}
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp5_ = _item_it;
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = (CheckerboardItem*) _tmp6_;
-#line 1534 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1529 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = item;
-#line 1534 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1529 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_item_unexposed (_tmp7_);
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 9336 "CheckerboardLayout.c"
+#line 9288 "CheckerboardLayout.c"
 		}
-#line 1533 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1528 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_item_it);
-#line 9340 "CheckerboardLayout.c"
+#line 9292 "CheckerboardLayout.c"
 	}
-#line 1536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->exposed_items;
-#line 1536 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1531 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1532 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure_dirty = FALSE;
-#line 1542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = self->priv->view;
-#line 1542 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1537 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 9352 "CheckerboardLayout.c"
+#line 9304 "CheckerboardLayout.c"
 }
 
 
@@ -9417,131 +9369,131 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 	gint _tmp270_;
 	GtkAllocation _tmp271_;
 	gint _tmp272_;
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (caller != NULL);
-#line 1549 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1544 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->reflow_needed = FALSE;
-#line 1552 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1547 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->message;
-#line 1552 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1547 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_ != NULL) {
-#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9432 "CheckerboardLayout.c"
+#line 9384 "CheckerboardLayout.c"
 	}
-#line 1556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp1_);
-#line 1556 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1551 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	allocation = _tmp1_;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = self->priv->visible_page;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = _tmp3_.width;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ > 0) {
-#line 9444 "CheckerboardLayout.c"
+#line 9396 "CheckerboardLayout.c"
 		GdkRectangle _tmp5_;
 		gint _tmp6_;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = self->priv->visible_page;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = _tmp5_.width;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp6_;
-#line 9453 "CheckerboardLayout.c"
+#line 9405 "CheckerboardLayout.c"
 	} else {
 		GtkAllocation _tmp7_;
 		gint _tmp8_;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = allocation;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = _tmp7_.width;
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp2_ = _tmp8_;
-#line 9463 "CheckerboardLayout.c"
+#line 9415 "CheckerboardLayout.c"
 	}
-#line 1558 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1553 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	visible_width = _tmp2_;
-#line 1566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = visible_width;
-#line 1566 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1561 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp9_ <= 1) {
-#line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1562 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9473 "CheckerboardLayout.c"
+#line 9425 "CheckerboardLayout.c"
 	}
-#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = self->priv->view;
-#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1564 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	total_items = _tmp11_;
-#line 1572 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = total_items;
-#line 1572 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1567 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp12_ == 0) {
-#line 9485 "CheckerboardLayout.c"
+#line 9437 "CheckerboardLayout.c"
 		gint _tmp13_;
 		CheckerboardLayoutLayoutRow** _tmp14_;
-#line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = visible_width;
-#line 1573 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1568 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp13_, 0);
-#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp14_ = g_new0 (CheckerboardLayoutLayoutRow*, 0 + 1);
-#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
-#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->item_rows = _tmp14_;
-#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->item_rows_length1 = 0;
-#line 1574 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1569 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->_item_rows_size_ = self->priv->item_rows_length1;
-#line 1576 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1571 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 9504 "CheckerboardLayout.c"
+#line 9456 "CheckerboardLayout.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp16_ = self->priv->anchor;
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp16_ == NULL) {
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = TRUE;
-#line 9512 "CheckerboardLayout.c"
+#line 9464 "CheckerboardLayout.c"
 	} else {
 		CheckerboardItem* _tmp17_;
 		gboolean _tmp18_;
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = self->priv->anchor;
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView));
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp15_ = !_tmp18_;
-#line 9522 "CheckerboardLayout.c"
+#line 9474 "CheckerboardLayout.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1579 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_) {
-#line 1585 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1580 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_update_anchor (self);
-#line 9528 "CheckerboardLayout.c"
+#line 9480 "CheckerboardLayout.c"
 	}
-#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
-#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = NULL;
-#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows_length1 = 0;
-#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1583 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
-#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1588 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	max_cols = 0;
-#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1589 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp19_ = self->priv->scale;
-#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1589 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp19_ > 0) {
-#line 9544 "CheckerboardLayout.c"
+#line 9496 "CheckerboardLayout.c"
 		gint remaining_width = 0;
 		gint _tmp20_;
 		gint max_item_width = 0;
@@ -9552,86 +9504,86 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		gint _tmp25_;
 		gint _tmp33_;
 		gint _tmp34_;
-#line 1596 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = visible_width;
-#line 1596 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1591 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		remaining_width = _tmp20_ - (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
-#line 1597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = self->priv->scale;
-#line 1597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = checkerboard_item_get_max_width (_tmp21_);
-#line 1597 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1592 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		max_item_width = _tmp22_;
-#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp23_ = remaining_width;
-#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = max_item_width;
-#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1593 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		max_cols = _tmp23_ / _tmp24_;
-#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = max_cols;
-#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1594 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp25_ <= 0) {
-#line 1600 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1595 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = 1;
-#line 9577 "CheckerboardLayout.c"
+#line 9529 "CheckerboardLayout.c"
 		}
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9581 "CheckerboardLayout.c"
+#line 9533 "CheckerboardLayout.c"
 			gboolean _tmp26_ = FALSE;
 			gint _tmp27_;
 			gint _tmp32_;
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp27_ = max_cols;
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp27_ > 1) {
-#line 9589 "CheckerboardLayout.c"
+#line 9541 "CheckerboardLayout.c"
 				gint _tmp28_;
 				gint _tmp29_;
 				gint _tmp30_;
 				gint _tmp31_;
-#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp28_ = max_cols;
-#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp29_ = max_item_width;
-#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp30_ = max_cols;
-#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = remaining_width;
-#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1599 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = ((_tmp28_ * _tmp29_) + ((_tmp30_ - 1) * CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING)) > _tmp31_;
-#line 9604 "CheckerboardLayout.c"
+#line 9556 "CheckerboardLayout.c"
 			} else {
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = FALSE;
-#line 9608 "CheckerboardLayout.c"
+#line 9560 "CheckerboardLayout.c"
 			}
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp26_) {
-#line 1603 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1598 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 9614 "CheckerboardLayout.c"
+#line 9566 "CheckerboardLayout.c"
 			}
-#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp32_ = max_cols;
-#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1604 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp32_ - 1;
-#line 9620 "CheckerboardLayout.c"
+#line 9572 "CheckerboardLayout.c"
 		}
-#line 1613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = total_items;
-#line 1613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp34_ = max_cols;
-#line 1613 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1608 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp33_ < _tmp34_) {
-#line 9628 "CheckerboardLayout.c"
+#line 9580 "CheckerboardLayout.c"
 			gint _tmp35_;
-#line 1614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp35_ = total_items;
-#line 1614 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1609 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp35_;
-#line 9634 "CheckerboardLayout.c"
+#line 9586 "CheckerboardLayout.c"
 		}
 	} else {
 		gint x = 0;
@@ -9640,27 +9592,27 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 		gint widest_row = 0;
 		gint _tmp61_;
 		gint _tmp62_;
-#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1616 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING;
-#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1617 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		col = 0;
-#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1618 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		row_width = 0;
-#line 1624 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1619 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		widest_row = 0;
-#line 9651 "CheckerboardLayout.c"
+#line 9603 "CheckerboardLayout.c"
 		{
 			gint ctr = 0;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			ctr = 0;
-#line 9656 "CheckerboardLayout.c"
+#line 9608 "CheckerboardLayout.c"
 			{
 				gboolean _tmp36_ = FALSE;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp36_ = TRUE;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				while (TRUE) {
-#line 9663 "CheckerboardLayout.c"
+#line 9615 "CheckerboardLayout.c"
 					gint _tmp38_;
 					gint _tmp39_;
 					CheckerboardItem* item = NULL;
@@ -9682,214 +9634,214 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					Dimensions _tmp58_;
 					gint _tmp59_;
 					gint _tmp60_;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (!_tmp36_) {
-#line 9687 "CheckerboardLayout.c"
+#line 9639 "CheckerboardLayout.c"
 						gint _tmp37_;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp37_ = ctr;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						ctr = _tmp37_ + 1;
-#line 9693 "CheckerboardLayout.c"
+#line 9645 "CheckerboardLayout.c"
 					}
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp36_ = FALSE;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp38_ = ctr;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp39_ = total_items;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (!(_tmp38_ < _tmp39_)) {
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						break;
-#line 9705 "CheckerboardLayout.c"
+#line 9657 "CheckerboardLayout.c"
 					}
-#line 1627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp40_ = self->priv->view;
-#line 1627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp41_ = ctr;
-#line 1627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp42_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _tmp41_);
-#line 1627 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1622 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					item = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1628 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp43_ = item;
-#line 1628 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp44_ = _tmp43_->requisition;
-#line 1628 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1623 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					req = _tmp44_;
-#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp45_ = dimensions_has_area (&req);
-#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_vala_assert (_tmp45_, "req.has_area()");
-#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp46_ = x;
-#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp47_ = req;
-#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp48_ = _tmp47_.width;
-#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp49_ = visible_width;
-#line 1634 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1629 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					if (((_tmp46_ + _tmp48_) + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) > _tmp49_) {
-#line 9735 "CheckerboardLayout.c"
+#line 9687 "CheckerboardLayout.c"
 						gint _tmp50_;
 						gint _tmp51_;
-#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp50_ = row_width;
-#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp51_ = widest_row;
-#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1630 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp50_ > _tmp51_) {
-#line 9744 "CheckerboardLayout.c"
+#line 9696 "CheckerboardLayout.c"
 							gint _tmp52_;
 							gint _tmp53_;
-#line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp52_ = row_width;
-#line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1631 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							widest_row = _tmp52_;
-#line 1637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp53_ = col;
-#line 1637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1632 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							max_cols = _tmp53_;
-#line 9755 "CheckerboardLayout.c"
+#line 9707 "CheckerboardLayout.c"
 						}
-#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1635 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						col = 0;
-#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1636 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						x = CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING;
-#line 1642 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1637 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						row_width = 0;
-#line 9763 "CheckerboardLayout.c"
+#line 9715 "CheckerboardLayout.c"
 					}
-#line 1645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp54_ = x;
-#line 1645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp55_ = req;
-#line 1645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp56_ = _tmp55_.width;
-#line 1645 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1640 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					x = _tmp54_ + (_tmp56_ + CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING);
-#line 1646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp57_ = row_width;
-#line 1646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp58_ = req;
-#line 1646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp59_ = _tmp58_.width;
-#line 1646 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1641 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row_width = _tmp57_ + _tmp59_;
-#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp60_ = col;
-#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1643 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = _tmp60_ + 1;
-#line 1626 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1621 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_g_object_unref0 (item);
-#line 9787 "CheckerboardLayout.c"
+#line 9739 "CheckerboardLayout.c"
 				}
 			}
 		}
-#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp61_ = row_width;
-#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp62_ = widest_row;
-#line 1652 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1647 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp61_ > _tmp62_) {
-#line 9797 "CheckerboardLayout.c"
+#line 9749 "CheckerboardLayout.c"
 			gint _tmp63_;
-#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp63_ = col;
-#line 1653 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1648 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			max_cols = _tmp63_;
-#line 9803 "CheckerboardLayout.c"
+#line 9755 "CheckerboardLayout.c"
 		}
 	}
-#line 1661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp64_ = max_cols;
-#line 1661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1656 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp64_ > 0, "max_cols > 0");
-#line 1662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp65_ = total_items;
-#line 1662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp66_ = max_cols;
-#line 1662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1657 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	max_rows = (_tmp65_ / _tmp66_) + 1;
-#line 1666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1661 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row = 0;
-#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1662 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	tallest = 0;
-#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1663 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	widest = 0;
-#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1664 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row_alignment_point = 0;
-#line 1670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1665 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	total_width = 0;
-#line 1671 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1666 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	col = 0;
-#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp67_ = max_cols;
-#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp68_ = g_new0 (gint, _tmp67_);
-#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	column_widths = _tmp68_;
-#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	column_widths_length1 = _tmp67_;
-#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1667 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_column_widths_size_ = column_widths_length1;
-#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp69_ = max_rows;
-#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp70_ = g_new0 (gint, _tmp69_);
-#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row_heights = _tmp70_;
-#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row_heights_length1 = _tmp69_;
-#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1668 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_row_heights_size_ = row_heights_length1;
-#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp71_ = max_rows;
-#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp72_ = g_new0 (gint, _tmp71_);
-#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	alignment_points = _tmp72_;
-#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	alignment_points_length1 = _tmp71_;
-#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1669 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_alignment_points_size_ = alignment_points_length1;
-#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1670 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gutter = 0;
-#line 9860 "CheckerboardLayout.c"
+#line 9812 "CheckerboardLayout.c"
 	{
 		gboolean _tmp73_ = FALSE;
-#line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp73_ = TRUE;
-#line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 9867 "CheckerboardLayout.c"
+#line 9819 "CheckerboardLayout.c"
 			gint _tmp129_;
 			gint _tmp138_;
 			gint _tmp139_;
 			gint _tmp140_;
 			gint _tmp141_;
 			gint _tmp142_;
-#line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp73_) {
-#line 9876 "CheckerboardLayout.c"
+#line 9828 "CheckerboardLayout.c"
 			}
-#line 1677 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1672 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp73_ = FALSE;
-#line 9880 "CheckerboardLayout.c"
+#line 9832 "CheckerboardLayout.c"
 			{
 				gint ctr = 0;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				ctr = 0;
-#line 9885 "CheckerboardLayout.c"
+#line 9837 "CheckerboardLayout.c"
 				{
 					gboolean _tmp74_ = FALSE;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp74_ = TRUE;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					while (TRUE) {
-#line 9892 "CheckerboardLayout.c"
+#line 9844 "CheckerboardLayout.c"
 						gint _tmp76_;
 						gint _tmp77_;
 						CheckerboardItem* item = NULL;
@@ -9922,123 +9874,123 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 						gint _tmp118_;
 						gint _tmp119_;
 						gint _tmp120_;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (!_tmp74_) {
-#line 9927 "CheckerboardLayout.c"
+#line 9879 "CheckerboardLayout.c"
 							gint _tmp75_;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp75_ = ctr;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							ctr = _tmp75_ + 1;
-#line 9933 "CheckerboardLayout.c"
+#line 9885 "CheckerboardLayout.c"
 						}
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp74_ = FALSE;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp76_ = ctr;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp77_ = total_items;
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (!(_tmp76_ < _tmp77_)) {
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							break;
-#line 9945 "CheckerboardLayout.c"
+#line 9897 "CheckerboardLayout.c"
 						}
-#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp78_ = self->priv->view;
-#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp79_ = ctr;
-#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp80_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_DATA_COLLECTION, DataCollection), _tmp79_);
-#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1674 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						item = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp81_ = item;
-#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp82_ = _tmp81_->requisition;
-#line 1680 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1675 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						req = _tmp82_;
-#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp83_ = item;
-#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp84_ = checkerboard_item_get_alignment_point (_tmp83_);
-#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1676 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						alignment_point = _tmp84_;
-#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp85_ = alignment_point;
-#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp86_ = req;
-#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp87_ = _tmp86_.height;
-#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1679 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_vala_assert (_tmp85_ < _tmp87_, "alignment_point < req.height");
-#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp88_ = req;
-#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp89_ = _tmp88_.height;
-#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp90_ = tallest;
-#line 1686 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1681 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp89_ > _tmp90_) {
-#line 9983 "CheckerboardLayout.c"
+#line 9935 "CheckerboardLayout.c"
 							Dimensions _tmp91_;
 							gint _tmp92_;
-#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp91_ = req;
-#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp92_ = _tmp91_.height;
-#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1682 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							tallest = _tmp92_;
-#line 9992 "CheckerboardLayout.c"
+#line 9944 "CheckerboardLayout.c"
 						}
-#line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp93_ = req;
-#line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp94_ = _tmp93_.width;
-#line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp95_ = widest;
-#line 1689 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1684 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp94_ > _tmp95_) {
-#line 10002 "CheckerboardLayout.c"
+#line 9954 "CheckerboardLayout.c"
 							Dimensions _tmp96_;
 							gint _tmp97_;
-#line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp96_ = req;
-#line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp97_ = _tmp96_.width;
-#line 1690 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1685 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							widest = _tmp97_;
-#line 10011 "CheckerboardLayout.c"
+#line 9963 "CheckerboardLayout.c"
 						}
-#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp98_ = alignment_point;
-#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp99_ = row_alignment_point;
-#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1687 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp98_ > _tmp99_) {
-#line 10019 "CheckerboardLayout.c"
+#line 9971 "CheckerboardLayout.c"
 							gint _tmp100_;
-#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp100_ = alignment_point;
-#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1688 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							row_alignment_point = _tmp100_;
-#line 10025 "CheckerboardLayout.c"
+#line 9977 "CheckerboardLayout.c"
 						}
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp101_ = column_widths;
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp101__length1 = column_widths_length1;
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp102_ = col;
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp103_ = _tmp101_[_tmp102_];
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp104_ = req;
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp105_ = _tmp104_.width;
-#line 1697 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1692 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp103_ < _tmp105_) {
-#line 10041 "CheckerboardLayout.c"
+#line 9993 "CheckerboardLayout.c"
 							gint _tmp106_;
 							gint* _tmp107_;
 							gint _tmp107__length1;
@@ -10053,53 +10005,53 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 							gint _tmp115_;
 							Dimensions _tmp116_;
 							gint _tmp117_;
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp106_ = total_width;
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp107_ = column_widths;
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp107__length1 = column_widths_length1;
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp108_ = col;
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp109_ = _tmp107_[_tmp108_];
-#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1693 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							total_width = _tmp106_ - _tmp109_;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp110_ = column_widths;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp110__length1 = column_widths_length1;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp111_ = col;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp112_ = req;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp113_ = _tmp112_.width;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp110_[_tmp111_] = _tmp113_;
-#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1694 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp114_ = _tmp110_[_tmp111_];
-#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp115_ = total_width;
-#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp116_ = req;
-#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp117_ = _tmp116_.width;
-#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1695 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							total_width = _tmp115_ + _tmp117_;
-#line 10090 "CheckerboardLayout.c"
+#line 10042 "CheckerboardLayout.c"
 						}
-#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp118_ = col;
-#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						col = _tmp118_ + 1;
-#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp119_ = col;
-#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_tmp120_ = max_cols;
-#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1698 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						if (_tmp119_ >= _tmp120_) {
-#line 10102 "CheckerboardLayout.c"
+#line 10054 "CheckerboardLayout.c"
 							gint* _tmp121_;
 							gint _tmp121__length1;
 							gint _tmp122_;
@@ -10110,51 +10062,51 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 							gint _tmp126_;
 							gint _tmp127_;
 							gint _tmp128_;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp121_ = alignment_points;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp121__length1 = alignment_points_length1;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp122_ = row;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp123_ = row_alignment_point;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp121_[_tmp122_] = _tmp123_;
-#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1699 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp124_ = _tmp121_[_tmp122_];
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp125_ = row_heights;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp125__length1 = row_heights_length1;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp126_ = row;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							row = _tmp126_ + 1;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp127_ = tallest;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp125_[_tmp126_] = _tmp127_;
-#line 1705 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1700 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							_tmp128_ = _tmp125_[_tmp126_];
-#line 1707 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1702 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							col = 0;
-#line 1708 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1703 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							row_alignment_point = 0;
-#line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1704 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 							tallest = 0;
-#line 10145 "CheckerboardLayout.c"
+#line 10097 "CheckerboardLayout.c"
 						}
-#line 1678 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1673 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 						_g_object_unref0 (item);
-#line 10149 "CheckerboardLayout.c"
+#line 10101 "CheckerboardLayout.c"
 					}
 				}
 			}
-#line 1714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp129_ = col;
-#line 1714 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1709 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp129_ != 0) {
-#line 10157 "CheckerboardLayout.c"
+#line 10109 "CheckerboardLayout.c"
 				gint* _tmp130_;
 				gint _tmp130__length1;
 				gint _tmp131_;
@@ -10165,53 +10117,53 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				gint _tmp135_;
 				gint _tmp136_;
 				gint _tmp137_;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp130_ = alignment_points;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp130__length1 = alignment_points_length1;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp131_ = row;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp132_ = row_alignment_point;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp130_[_tmp131_] = _tmp132_;
-#line 1715 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1710 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp133_ = _tmp130_[_tmp131_];
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp134_ = row_heights;
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp134__length1 = row_heights_length1;
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp135_ = row;
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp136_ = tallest;
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp134_[_tmp135_] = _tmp136_;
-#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1711 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp137_ = _tmp134_[_tmp135_];
-#line 10192 "CheckerboardLayout.c"
+#line 10144 "CheckerboardLayout.c"
 			}
-#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp138_ = visible_width;
-#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp139_ = total_width;
-#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp140_ = max_cols;
-#line 1721 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1716 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			gutter = (_tmp138_ - _tmp139_) / (_tmp140_ + 1);
-#line 1724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp141_ = max_cols;
-#line 1724 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1719 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp141_ == 1) {
-#line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1720 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10208 "CheckerboardLayout.c"
+#line 10160 "CheckerboardLayout.c"
 			}
-#line 1730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp142_ = gutter;
-#line 1730 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1725 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp142_ < CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING) {
-#line 10214 "CheckerboardLayout.c"
+#line 10166 "CheckerboardLayout.c"
 				gint _tmp143_;
 				gint _tmp144_;
 				gint _tmp145_;
@@ -10221,89 +10173,89 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				gint* _tmp149_;
 				gint _tmp150_;
 				gint* _tmp151_;
-#line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp143_ = max_cols;
-#line 1731 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1726 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				max_cols = _tmp143_ - 1;
-#line 1732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp144_ = total_items;
-#line 1732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp145_ = max_cols;
-#line 1732 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1727 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				max_rows = (_tmp144_ / _tmp145_) + 1;
-#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1734 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				col = 0;
-#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1735 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row = 0;
-#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1736 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				tallest = 0;
-#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1737 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				widest = 0;
-#line 1743 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1738 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				total_width = 0;
-#line 1744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1739 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_alignment_point = 0;
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp146_ = max_cols;
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp147_ = g_new0 (gint, _tmp146_);
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				column_widths = (g_free (column_widths), NULL);
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				column_widths = _tmp147_;
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				column_widths_length1 = _tmp146_;
-#line 1745 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1740 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_column_widths_size_ = column_widths_length1;
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp148_ = max_rows;
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp149_ = g_new0 (gint, _tmp148_);
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_heights = (g_free (row_heights), NULL);
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_heights = _tmp149_;
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				row_heights_length1 = _tmp148_;
-#line 1746 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1741 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_row_heights_size_ = row_heights_length1;
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp150_ = max_rows;
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp151_ = g_new0 (gint, _tmp150_);
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				alignment_points = (g_free (alignment_points), NULL);
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				alignment_points = _tmp151_;
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				alignment_points_length1 = _tmp150_;
-#line 1747 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1742 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_alignment_points_size_ = alignment_points_length1;
-#line 10282 "CheckerboardLayout.c"
+#line 10234 "CheckerboardLayout.c"
 			} else {
-#line 1749 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1744 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10286 "CheckerboardLayout.c"
+#line 10238 "CheckerboardLayout.c"
 			}
 		}
 	}
-#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1756 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	col = 0;
-#line 1762 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1757 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row = 0;
-#line 10294 "CheckerboardLayout.c"
+#line 10246 "CheckerboardLayout.c"
 	{
 		gint ctr = 0;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		ctr = 0;
-#line 10299 "CheckerboardLayout.c"
+#line 10251 "CheckerboardLayout.c"
 		{
 			gboolean _tmp152_ = FALSE;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp152_ = TRUE;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 10306 "CheckerboardLayout.c"
+#line 10258 "CheckerboardLayout.c"
 				gint _tmp154_;
 				gint _tmp155_;
 				CheckerboardItem* item = NULL;
@@ -10333,163 +10285,163 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				gint _tmp179_;
 				gint _tmp180_;
 				gint _tmp181_;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp152_) {
-#line 10338 "CheckerboardLayout.c"
+#line 10290 "CheckerboardLayout.c"
 					gint _tmp153_;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp153_ = ctr;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					ctr = _tmp153_ + 1;
-#line 10344 "CheckerboardLayout.c"
+#line 10296 "CheckerboardLayout.c"
 				}
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp152_ = FALSE;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp154_ = ctr;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp155_ = total_items;
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!(_tmp154_ < _tmp155_)) {
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 10356 "CheckerboardLayout.c"
+#line 10308 "CheckerboardLayout.c"
 				}
-#line 1765 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp156_ = self->priv->view;
-#line 1765 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp157_ = ctr;
-#line 1765 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp158_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, TYPE_DATA_COLLECTION, DataCollection), _tmp157_);
-#line 1765 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1760 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				item = G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp159_ = item;
-#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp160_ = _tmp159_->requisition;
-#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1761 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				req = _tmp160_;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp161_ = req;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp162_ = _tmp161_.height;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp163_ = alignment_points;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp163__length1 = alignment_points_length1;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp164_ = row;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp165_ = _tmp163_[_tmp164_];
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp166_ = item;
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp167_ = checkerboard_item_get_alignment_point (_tmp166_);
-#line 1771 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1766 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				true_height = _tmp162_ + (_tmp165_ - _tmp167_);
-#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp168_ = true_height;
-#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp169_ = req;
-#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp170_ = _tmp169_.height;
-#line 1772 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1767 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_vala_assert (_tmp168_ >= _tmp170_, "true_height >= req.height");
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp171_ = true_height;
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp172_ = row_heights;
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp172__length1 = row_heights_length1;
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp173_ = row;
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp174_ = _tmp172_[_tmp173_];
-#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1770 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp171_ > _tmp174_) {
-#line 10410 "CheckerboardLayout.c"
+#line 10362 "CheckerboardLayout.c"
 					gint* _tmp175_;
 					gint _tmp175__length1;
 					gint _tmp176_;
 					gint _tmp177_;
 					gint _tmp178_;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp175_ = row_heights;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp175__length1 = row_heights_length1;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp176_ = row;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp177_ = true_height;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp175_[_tmp176_] = _tmp177_;
-#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1775 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp178_ = _tmp175_[_tmp176_];
-#line 10428 "CheckerboardLayout.c"
+#line 10380 "CheckerboardLayout.c"
 				}
-#line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp179_ = col;
-#line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				col = _tmp179_ + 1;
-#line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp180_ = col;
-#line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp181_ = max_cols;
-#line 1784 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1779 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp180_ >= _tmp181_) {
-#line 10440 "CheckerboardLayout.c"
+#line 10392 "CheckerboardLayout.c"
 					gint _tmp182_;
-#line 1785 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1780 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1781 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp182_ = row;
-#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1781 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = _tmp182_ + 1;
-#line 10448 "CheckerboardLayout.c"
+#line 10400 "CheckerboardLayout.c"
 				}
-#line 1764 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1759 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 10452 "CheckerboardLayout.c"
+#line 10404 "CheckerboardLayout.c"
 			}
 		}
 	}
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp183_ = max_rows;
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp184_ = g_new0 (CheckerboardLayoutLayoutRow*, _tmp183_ + 1);
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = _tmp184_;
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows_length1 = _tmp183_;
-#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1786 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
-#line 1794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp185_ = gutter;
-#line 1794 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1789 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	x = _tmp185_;
-#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1790 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	y = CHECKERBOARD_LAYOUT_TOP_PADDING;
-#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1791 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	col = 0;
-#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1792 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row = 0;
-#line 1798 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1793 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	current_row = NULL;
-#line 10480 "CheckerboardLayout.c"
+#line 10432 "CheckerboardLayout.c"
 	{
 		gint ctr = 0;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		ctr = 0;
-#line 10485 "CheckerboardLayout.c"
+#line 10437 "CheckerboardLayout.c"
 		{
 			gboolean _tmp186_ = FALSE;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp186_ = TRUE;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 10492 "CheckerboardLayout.c"
+#line 10444 "CheckerboardLayout.c"
 				gint _tmp188_;
 				gint _tmp189_;
 				CheckerboardItem* item = NULL;
@@ -10547,123 +10499,123 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 				gint _tmp240_;
 				gint _tmp241_;
 				gint _tmp242_;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!_tmp186_) {
-#line 10552 "CheckerboardLayout.c"
+#line 10504 "CheckerboardLayout.c"
 					gint _tmp187_;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp187_ = ctr;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					ctr = _tmp187_ + 1;
-#line 10558 "CheckerboardLayout.c"
+#line 10510 "CheckerboardLayout.c"
 				}
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp186_ = FALSE;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp188_ = ctr;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp189_ = total_items;
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!(_tmp188_ < _tmp189_)) {
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 10570 "CheckerboardLayout.c"
+#line 10522 "CheckerboardLayout.c"
 				}
-#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp190_ = self->priv->view;
-#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp191_ = ctr;
-#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp192_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp190_, TYPE_DATA_COLLECTION, DataCollection), _tmp191_);
-#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1796 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				item = G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp193_ = item;
-#line 1802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp194_ = _tmp193_->requisition;
-#line 1802 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1797 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				req = _tmp194_;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp195_ = column_widths;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp195__length1 = column_widths_length1;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp196_ = col;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp197_ = _tmp195_[_tmp196_];
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp198_ = req;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp199_ = _tmp198_.width;
-#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				xpadding = (_tmp197_ - _tmp199_) / 2;
-#line 1806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp200_ = xpadding;
-#line 1806 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1801 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_vala_assert (_tmp200_ >= 0, "xpadding >= 0");
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp201_ = alignment_points;
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp201__length1 = alignment_points_length1;
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp202_ = row;
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp203_ = _tmp201_[_tmp202_];
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp204_ = item;
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp205_ = checkerboard_item_get_alignment_point (_tmp204_);
-#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1804 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				ypadding = _tmp203_ - _tmp205_;
-#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp206_ = ypadding;
-#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1805 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_vala_assert (_tmp206_ >= 0, "ypadding >= 0");
-#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp207_ = item;
-#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp208_ = x;
-#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp209_ = xpadding;
-#line 1813 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1808 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp207_->allocation.x = _tmp208_ + _tmp209_;
-#line 1814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp210_ = item;
-#line 1814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp211_ = y;
-#line 1814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp212_ = ypadding;
-#line 1814 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1809 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp210_->allocation.y = _tmp211_ + _tmp212_;
-#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp213_ = item;
-#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp214_ = req;
-#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp215_ = _tmp214_.width;
-#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1810 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp213_->allocation.width = _tmp215_;
-#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp216_ = item;
-#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp217_ = req;
-#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp218_ = _tmp217_.height;
-#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1811 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp216_->allocation.height = _tmp218_;
-#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp219_ = item;
-#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp220_ = col;
-#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp221_ = row;
-#line 1817 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1812 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_set_grid_coordinates (_tmp219_, _tmp220_, _tmp221_);
-#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp222_ = current_row;
-#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1815 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp222_ == NULL) {
-#line 10666 "CheckerboardLayout.c"
+#line 10618 "CheckerboardLayout.c"
 					gint _tmp223_;
 					gint* _tmp224_;
 					gint _tmp224__length1;
@@ -10671,69 +10623,69 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					gint _tmp226_;
 					gint _tmp227_;
 					CheckerboardLayoutLayoutRow* _tmp228_;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp223_ = y;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp224_ = row_heights;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp224__length1 = row_heights_length1;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp225_ = row;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp226_ = _tmp224_[_tmp225_];
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp227_ = max_cols;
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp228_ = checkerboard_layout_layout_row_new (_tmp223_, _tmp226_, _tmp227_);
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (current_row);
-#line 1821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					current_row = _tmp228_;
-#line 10692 "CheckerboardLayout.c"
+#line 10644 "CheckerboardLayout.c"
 				}
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp229_ = current_row;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp230_ = _tmp229_->items;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp230__length1 = _tmp229_->items_length1;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp231_ = col;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp232_ = item;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp233_ = _g_object_ref0 (_tmp232_);
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (_tmp230_[_tmp231_]);
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp230_[_tmp231_] = _tmp233_;
-#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1818 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp234_ = _tmp230_[_tmp231_];
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp235_ = x;
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp236_ = column_widths;
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp236__length1 = column_widths_length1;
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp237_ = col;
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp238_ = _tmp236_[_tmp237_];
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp239_ = gutter;
-#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1820 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				x = _tmp235_ + (_tmp238_ + _tmp239_);
-#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp240_ = col;
-#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				col = _tmp240_ + 1;
-#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp241_ = col;
-#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp242_ = max_cols;
-#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1823 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp241_ >= _tmp242_) {
-#line 10736 "CheckerboardLayout.c"
+#line 10688 "CheckerboardLayout.c"
 					CheckerboardLayoutLayoutRow* _tmp243_;
 					CheckerboardLayoutLayoutRow** _tmp244_;
 					gint _tmp244__length1;
@@ -10748,169 +10700,169 @@ static void checkerboard_layout_reflow (CheckerboardLayout* self, const gchar* c
 					gint _tmp252_;
 					gint _tmp253_;
 					gint _tmp254_;
-#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp243_ = current_row;
-#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1824 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_vala_assert (_tmp243_ != NULL, "current_row != null");
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp244_ = self->priv->item_rows;
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp244__length1 = self->priv->item_rows_length1;
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp245_ = row;
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp246_ = current_row;
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp247_ = _checkerboard_layout_layout_row_ref0 (_tmp246_);
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (_tmp244_[_tmp245_]);
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp244_[_tmp245_] = _tmp247_;
-#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1825 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp248_ = _tmp244_[_tmp245_];
-#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1826 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_checkerboard_layout_layout_row_unref0 (current_row);
-#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1826 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					current_row = NULL;
-#line 1833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp249_ = gutter;
-#line 1833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1828 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					x = _tmp249_;
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp250_ = y;
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp251_ = row_heights;
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp251__length1 = row_heights_length1;
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp252_ = row;
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp253_ = _tmp251_[_tmp252_];
-#line 1834 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1829 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					y = _tmp250_ + (_tmp253_ + CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING);
-#line 1835 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1830 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					col = 0;
-#line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp254_ = row;
-#line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1831 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					row = _tmp254_ + 1;
-#line 10797 "CheckerboardLayout.c"
+#line 10749 "CheckerboardLayout.c"
 				}
-#line 1800 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1795 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 10801 "CheckerboardLayout.c"
+#line 10753 "CheckerboardLayout.c"
 			}
 		}
 	}
-#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp255_ = current_row;
-#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp255_ != NULL) {
-#line 10809 "CheckerboardLayout.c"
+#line 10761 "CheckerboardLayout.c"
 		CheckerboardLayoutLayoutRow** _tmp256_;
 		gint _tmp256__length1;
 		gint _tmp257_;
 		CheckerboardLayoutLayoutRow* _tmp258_;
 		CheckerboardLayoutLayoutRow* _tmp259_;
 		CheckerboardLayoutLayoutRow* _tmp260_;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp256_ = self->priv->item_rows;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp256__length1 = self->priv->item_rows_length1;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp257_ = row;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp258_ = current_row;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp259_ = _checkerboard_layout_layout_row_ref0 (_tmp258_);
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_checkerboard_layout_layout_row_unref0 (_tmp256_[_tmp257_]);
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp256_[_tmp257_] = _tmp259_;
-#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1837 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp260_ = _tmp256_[_tmp257_];
-#line 10832 "CheckerboardLayout.c"
+#line 10784 "CheckerboardLayout.c"
 	}
-#line 1845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp261_ = max_cols;
-#line 1845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->columns = _tmp261_;
-#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp262_ = row;
-#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->rows = _tmp262_ + 1;
-#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp263_ = self->priv->rows;
-#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp264_ = max_rows;
-#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1842 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_vala_assert (_tmp263_ == _tmp264_, "rows == max_rows");
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp265_ = y;
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp266_ = row_heights;
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp266__length1 = row_heights_length1;
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp267_ = row;
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp268_ = _tmp266_[_tmp267_];
-#line 1851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	total_height = (_tmp265_ + _tmp268_) + CHECKERBOARD_LAYOUT_BOTTOM_PADDING;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp270_ = visible_width;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp271_ = allocation;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp272_ = _tmp271_.width;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp270_ != _tmp272_) {
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp269_ = TRUE;
-#line 10870 "CheckerboardLayout.c"
+#line 10822 "CheckerboardLayout.c"
 	} else {
 		gint _tmp273_;
 		GtkAllocation _tmp274_;
 		gint _tmp275_;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp273_ = total_height;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp274_ = allocation;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp275_ = _tmp274_.height;
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp269_ = _tmp273_ != _tmp275_;
-#line 10883 "CheckerboardLayout.c"
+#line 10835 "CheckerboardLayout.c"
 	}
-#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp269_) {
-#line 10887 "CheckerboardLayout.c"
+#line 10839 "CheckerboardLayout.c"
 		gint _tmp276_;
 		gint _tmp277_;
 		gint _tmp278_;
-#line 1857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp276_ = visible_width;
-#line 1857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp277_ = total_height;
-#line 1857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp276_, _tmp277_);
-#line 1858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		self->priv->size_allocate_due_to_reflow = TRUE;
-#line 1861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp278_ = total_height;
-#line 1861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_center_on_anchor (self, (gdouble) _tmp278_);
-#line 10903 "CheckerboardLayout.c"
+#line 10855 "CheckerboardLayout.c"
 	}
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_checkerboard_layout_layout_row_unref0 (current_row);
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	alignment_points = (g_free (alignment_points), NULL);
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	row_heights = (g_free (row_heights), NULL);
-#line 1548 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1543 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	column_widths = (g_free (column_widths), NULL);
-#line 10913 "CheckerboardLayout.c"
+#line 10865 "CheckerboardLayout.c"
 }
 
 
@@ -10919,28 +10871,28 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 	gboolean _tmp35_ = FALSE;
 	GdkRectangle _tmp36_;
 	gint _tmp37_;
-#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (reason != NULL);
-#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (items));
-#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&dirty, 0, sizeof (GdkRectangle));
-#line 10930 "CheckerboardLayout.c"
+#line 10882 "CheckerboardLayout.c"
 	{
 		GeeIterator* _data_view_it = NULL;
 		GeeIterable* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = items;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_data_view_it = _tmp1_;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		while (TRUE) {
-#line 10943 "CheckerboardLayout.c"
+#line 10895 "CheckerboardLayout.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataView* data_view = NULL;
@@ -10966,195 +10918,195 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 			gboolean _tmp27_ = FALSE;
 			GdkRectangle _tmp28_;
 			gint _tmp29_;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp2_ = _data_view_it;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp3_) {
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				break;
-#line 10977 "CheckerboardLayout.c"
+#line 10929 "CheckerboardLayout.c"
 			}
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp4_ = _data_view_it;
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			data_view = (DataView*) _tmp5_;
-#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp6_ = data_view;
-#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			item = _tmp7_;
-#line 1870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp8_ = item;
-#line 1870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = data_view_is_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView));
-#line 1870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp9_) {
-#line 1871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 1871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (data_view);
-#line 1871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				continue;
-#line 11003 "CheckerboardLayout.c"
+#line 10955 "CheckerboardLayout.c"
 			}
-#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = self->priv->view;
-#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = item;
-#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_vala_assert (_tmp12_, "view.contains(item)");
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp14_ = item;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp15_ = _tmp14_->allocation;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp16_ = _tmp15_.width;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp16_ <= 0) {
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = TRUE;
-#line 11023 "CheckerboardLayout.c"
+#line 10975 "CheckerboardLayout.c"
 			} else {
 				CheckerboardItem* _tmp17_;
 				GdkRectangle _tmp18_;
 				gint _tmp19_;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = item;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp18_ = _tmp17_->allocation;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = _tmp18_.height;
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp13_ = _tmp19_ <= 0;
-#line 11036 "CheckerboardLayout.c"
+#line 10988 "CheckerboardLayout.c"
 			}
-#line 1877 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp13_) {
-#line 11040 "CheckerboardLayout.c"
+#line 10992 "CheckerboardLayout.c"
 				const gchar* _tmp20_;
 				gchar* _tmp21_;
 				gchar* _tmp22_;
-#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp20_ = reason;
-#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp21_ = g_strdup_printf ("items_dirty: %s", _tmp20_);
-#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp22_ = _tmp21_;
-#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_layout_need_reflow (self, _tmp22_);
-#line 1878 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_free0 (_tmp22_);
-#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (data_view);
-#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (_data_view_it);
-#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				return;
-#line 11062 "CheckerboardLayout.c"
+#line 11014 "CheckerboardLayout.c"
 			}
-#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1879 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			memset (&intersection, 0, sizeof (GdkRectangle));
-#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp23_ = item;
-#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp26_ = gdk_rectangle_intersect (&self->priv->visible_page, &_tmp24_, &_tmp25_);
-#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			intersection = _tmp25_;
-#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1880 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (!_tmp26_) {
-#line 1886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 1886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (data_view);
-#line 1886 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1881 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				continue;
-#line 11082 "CheckerboardLayout.c"
+#line 11034 "CheckerboardLayout.c"
 			}
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp28_ = dirty;
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp29_ = _tmp28_.width;
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp29_ == 0) {
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp27_ = TRUE;
-#line 11092 "CheckerboardLayout.c"
+#line 11044 "CheckerboardLayout.c"
 			} else {
 				GdkRectangle _tmp30_;
 				gint _tmp31_;
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp30_ = dirty;
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp31_ = _tmp30_.height;
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp27_ = _tmp31_ == 0;
-#line 11102 "CheckerboardLayout.c"
+#line 11054 "CheckerboardLayout.c"
 			}
-#line 1889 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1884 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			if (_tmp27_) {
-#line 11106 "CheckerboardLayout.c"
+#line 11058 "CheckerboardLayout.c"
 				GdkRectangle _tmp32_;
-#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp32_ = intersection;
-#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1885 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				dirty = _tmp32_;
-#line 11112 "CheckerboardLayout.c"
+#line 11064 "CheckerboardLayout.c"
 			} else {
 				GdkRectangle _tmp33_;
 				GdkRectangle _tmp34_ = {0};
-#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp33_ = intersection;
-#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				gdk_rectangle_union (&dirty, &_tmp33_, &_tmp34_);
-#line 1892 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1887 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				dirty = _tmp34_;
-#line 11122 "CheckerboardLayout.c"
+#line 11074 "CheckerboardLayout.c"
 			}
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (item);
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (data_view);
-#line 11128 "CheckerboardLayout.c"
+#line 11080 "CheckerboardLayout.c"
 		}
-#line 1867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (_data_view_it);
-#line 11132 "CheckerboardLayout.c"
+#line 11084 "CheckerboardLayout.c"
 	}
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp36_ = dirty;
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp37_ = _tmp36_.width;
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp37_ > 0) {
-#line 11140 "CheckerboardLayout.c"
+#line 11092 "CheckerboardLayout.c"
 		GdkRectangle _tmp38_;
 		gint _tmp39_;
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = dirty;
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp39_ = _tmp38_.height;
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = _tmp39_ > 0;
-#line 11149 "CheckerboardLayout.c"
+#line 11101 "CheckerboardLayout.c"
 	} else {
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp35_ = FALSE;
-#line 11153 "CheckerboardLayout.c"
+#line 11105 "CheckerboardLayout.c"
 	}
-#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1890 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp35_) {
-#line 11157 "CheckerboardLayout.c"
+#line 11109 "CheckerboardLayout.c"
 		GdkRectangle _tmp40_;
 		gint _tmp41_;
 		GdkRectangle _tmp42_;
@@ -11163,38 +11115,38 @@ static void checkerboard_layout_items_dirty (CheckerboardLayout* self, const gch
 		gint _tmp45_;
 		GdkRectangle _tmp46_;
 		gint _tmp47_;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = dirty;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp41_ = _tmp40_.x;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp42_ = dirty;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp43_ = _tmp42_.y;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp44_ = dirty;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp45_ = _tmp44_.width;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp46_ = dirty;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp47_ = _tmp46_.height;
-#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1895 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_queue_draw_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp41_, _tmp43_, _tmp45_, _tmp47_);
-#line 11184 "CheckerboardLayout.c"
+#line 11136 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_real_map (GtkWidget* base) {
 	CheckerboardLayout * self;
-#line 1904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1899 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 1905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1900 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->map (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget));
-#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, TRUE);
-#line 11197 "CheckerboardLayout.c"
+#line 11149 "CheckerboardLayout.c"
 }
 
 
@@ -11211,64 +11163,64 @@ static void checkerboard_layout_set_colors (CheckerboardLayout* self, gboolean i
 	GdkRGBA _tmp9_ = {0};
 	GtkStyleContext* _tmp10_;
 	GdkRGBA _tmp11_ = {0};
-#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _tmp0_;
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = in_focus;
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	config_facade_get_selected_color (_tmp1_, _tmp2_, &_tmp3_);
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->selected_color = _tmp3_;
-#line 1912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = _tmp4_;
-#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	config_facade_get_unselected_color (_tmp5_, &_tmp6_);
-#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->unselected_color = _tmp6_;
-#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = config_facade_get_instance ();
-#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = _tmp7_;
-#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	config_facade_get_border_color (_tmp8_, &_tmp9_);
-#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->border_color = _tmp9_;
-#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp8_);
-#line 1915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_style_context_get_background_color (_tmp10_, GTK_STATE_FLAG_NORMAL, &_tmp11_);
-#line 1915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->bg_color = _tmp11_;
-#line 11254 "CheckerboardLayout.c"
+#line 11206 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_real_size_allocate (GtkWidget* base, GtkAllocation* allocation) {
 	CheckerboardLayout * self;
 	GtkAllocation _tmp0_;
-#line 1918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 1918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (allocation != NULL);
-#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = *allocation;
-#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->size_allocate (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), &_tmp0_);
-#line 1921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_viewport_resized (self);
-#line 11271 "CheckerboardLayout.c"
+#line 11223 "CheckerboardLayout.c"
 }
 
 
@@ -11287,41 +11239,41 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 	gboolean _tmp60_ = FALSE;
 	gboolean _result_ = FALSE;
 	cairo_t* _tmp63_;
-#line 1924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 1924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (ctx != NULL, FALSE);
-#line 1933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp0_);
-#line 1933 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1928 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	allocation = _tmp0_;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = ctx;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = allocation;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = _tmp3_.width;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp5_ = allocation;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = _tmp5_.height;
-#line 1934 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1929 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_render_background (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp4_, (gdouble) _tmp6_);
-#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp7_ = self->priv->message;
-#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp7_ == NULL) {
-#line 11316 "CheckerboardLayout.c"
+#line 11268 "CheckerboardLayout.c"
 		gboolean _tmp8_;
-#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = self->priv->exposure_dirty;
-#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp8_) {
-#line 1943 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1938 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			checkerboard_layout_expose_items (self, "draw");
-#line 11324 "CheckerboardLayout.c"
+#line 11276 "CheckerboardLayout.c"
 		}
 		{
 			GeeList* _item_list = NULL;
@@ -11332,25 +11284,25 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 			gint _tmp12_;
 			gint _tmp13_;
 			gint _item_index = 0;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp9_ = self->priv->visible_page;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp10_ = checkerboard_layout_intersection (self, &_tmp9_);
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_item_list = _tmp10_;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp11_ = _item_list;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp13_ = _tmp12_;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_item_size = _tmp13_;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_item_index = -1;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			while (TRUE) {
-#line 11353 "CheckerboardLayout.c"
+#line 11305 "CheckerboardLayout.c"
 				gint _tmp14_;
 				gint _tmp15_;
 				gint _tmp16_;
@@ -11366,68 +11318,68 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 				GdkRGBA _tmp27_;
 				GdkRGBA _tmp28_;
 				GdkRGBA _tmp29_;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp14_ = _item_index;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_item_index = _tmp14_ + 1;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp15_ = _item_index;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp16_ = _item_size;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					break;
-#line 11381 "CheckerboardLayout.c"
+#line 11333 "CheckerboardLayout.c"
 				}
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp17_ = _item_list;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp18_ = _item_index;
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp19_ = gee_list_get (_tmp17_, _tmp18_);
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				item = (CheckerboardItem*) _tmp19_;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp21_ = item;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp22_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_VIEW, DataView));
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				if (_tmp22_) {
-#line 11397 "CheckerboardLayout.c"
+#line 11349 "CheckerboardLayout.c"
 					GdkRGBA _tmp23_;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp23_ = self->priv->selected_color;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = _tmp23_;
-#line 11403 "CheckerboardLayout.c"
+#line 11355 "CheckerboardLayout.c"
 				} else {
 					GdkRGBA _tmp24_;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp24_ = self->priv->unselected_color;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 					_tmp20_ = _tmp24_;
-#line 11410 "CheckerboardLayout.c"
+#line 11362 "CheckerboardLayout.c"
 				}
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp25_ = item;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp26_ = ctx;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp27_ = self->priv->bg_color;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp28_ = self->priv->unselected_color;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_tmp29_ = self->priv->border_color;
-#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1942 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				checkerboard_item_paint (_tmp25_, _tmp26_, &_tmp27_, &_tmp20_, &_tmp28_, &_tmp29_);
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 				_g_object_unref0 (item);
-#line 11426 "CheckerboardLayout.c"
+#line 11378 "CheckerboardLayout.c"
 			}
-#line 1946 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1941 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_g_object_unref0 (_item_list);
-#line 11430 "CheckerboardLayout.c"
+#line 11382 "CheckerboardLayout.c"
 		}
 	} else {
 		PangoLayout* pango_layout = NULL;
@@ -11463,138 +11415,138 @@ static gboolean checkerboard_layout_real_draw (GtkWidget* base, cairo_t* ctx) {
 		gint _tmp57_;
 		cairo_t* _tmp58_;
 		PangoLayout* _tmp59_;
-#line 1952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp30_ = self->priv->message;
-#line 1952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp31_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp30_);
-#line 1952 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1947 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_layout = _tmp31_;
-#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp32_ = pango_layout;
-#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_layout_get_pixel_size (_tmp32_, &_tmp33_, &_tmp34_);
-#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_width = _tmp33_;
-#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1949 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		text_height = _tmp34_;
-#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp35_);
-#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1951 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		allocation = _tmp35_;
-#line 1958 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp36_ = allocation;
-#line 1958 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp37_ = _tmp36_.width;
-#line 1958 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp38_ = text_width;
-#line 1958 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1953 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = _tmp37_ - _tmp38_;
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp40_ = x;
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp40_ > 0) {
-#line 11496 "CheckerboardLayout.c"
+#line 11448 "CheckerboardLayout.c"
 			gint _tmp41_;
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp41_ = x;
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp39_ = _tmp41_ / 2;
-#line 11502 "CheckerboardLayout.c"
+#line 11454 "CheckerboardLayout.c"
 		} else {
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp39_ = 0;
-#line 11506 "CheckerboardLayout.c"
+#line 11458 "CheckerboardLayout.c"
 		}
-#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1954 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		x = _tmp39_;
-#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp42_ = allocation;
-#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp43_ = _tmp42_.height;
-#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp44_ = text_height;
-#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1956 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = _tmp43_ - _tmp44_;
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp46_ = y;
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (_tmp46_ > 0) {
-#line 11522 "CheckerboardLayout.c"
+#line 11474 "CheckerboardLayout.c"
 			gint _tmp47_;
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp47_ = y;
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp45_ = _tmp47_ / 2;
-#line 11528 "CheckerboardLayout.c"
+#line 11480 "CheckerboardLayout.c"
 		} else {
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			_tmp45_ = 0;
-#line 11532 "CheckerboardLayout.c"
+#line 11484 "CheckerboardLayout.c"
 		}
-#line 1962 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1957 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		y = _tmp45_;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp48_ = ctx;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp49_ = self->priv->unselected_color;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp50_ = _tmp49_.red;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp51_ = self->priv->unselected_color;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp52_ = _tmp51_.green;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp53_ = self->priv->unselected_color;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp54_ = _tmp53_.blue;
-#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1959 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_set_source_rgb (_tmp48_, _tmp50_, _tmp52_, _tmp54_);
-#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp55_ = ctx;
-#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp56_ = x;
-#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp57_ = y;
-#line 1965 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1960 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_move_to (_tmp55_, (gdouble) _tmp56_, (gdouble) _tmp57_);
-#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp58_ = ctx;
-#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp59_ = pango_layout;
-#line 1966 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1961 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		pango_cairo_show_layout (_tmp58_, _tmp59_);
-#line 1937 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1932 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_g_object_unref0 (pango_layout);
-#line 11568 "CheckerboardLayout.c"
+#line 11520 "CheckerboardLayout.c"
 	}
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw != NULL) {
-#line 11572 "CheckerboardLayout.c"
+#line 11524 "CheckerboardLayout.c"
 		cairo_t* _tmp61_;
 		gboolean _tmp62_;
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp61_ = ctx;
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp62_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->draw (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp61_);
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp60_ = _tmp62_;
-#line 11581 "CheckerboardLayout.c"
+#line 11533 "CheckerboardLayout.c"
 	} else {
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp60_ = TRUE;
-#line 11585 "CheckerboardLayout.c"
+#line 11537 "CheckerboardLayout.c"
 	}
-#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1964 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_result_ = _tmp60_;
-#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp63_ = ctx;
-#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1967 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_draw_selection_band (self, _tmp63_);
-#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _result_;
-#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1969 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11597 "CheckerboardLayout.c"
+#line 11549 "CheckerboardLayout.c"
 }
 
 
@@ -11633,97 +11585,97 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 	GdkRectangle _tmp51_;
 	gint _tmp52_;
 	cairo_t* _tmp53_;
-#line 1977 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 1977 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1972 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = self->priv->selection_band;
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_.width;
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp2_ <= 1) {
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = TRUE;
-#line 11648 "CheckerboardLayout.c"
+#line 11600 "CheckerboardLayout.c"
 	} else {
 		GdkRectangle _tmp3_;
 		gint _tmp4_;
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = self->priv->selection_band;
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp4_ = _tmp3_.height;
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp0_ = _tmp4_ <= 1;
-#line 11658 "CheckerboardLayout.c"
+#line 11610 "CheckerboardLayout.c"
 	}
-#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1974 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp0_) {
-#line 1980 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1975 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 11664 "CheckerboardLayout.c"
+#line 11616 "CheckerboardLayout.c"
 	}
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = self->priv->hadjustment;
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp6_ == NULL) {
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = TRUE;
-#line 11672 "CheckerboardLayout.c"
+#line 11624 "CheckerboardLayout.c"
 	} else {
 		GtkAdjustment* _tmp7_;
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = self->priv->vadjustment;
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = _tmp7_ == NULL;
-#line 11679 "CheckerboardLayout.c"
+#line 11631 "CheckerboardLayout.c"
 	}
-#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1978 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp5_) {
-#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1979 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return;
-#line 11685 "CheckerboardLayout.c"
+#line 11637 "CheckerboardLayout.c"
 	}
-#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->hadjustment;
-#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp9_ = self->priv->vadjustment;
-#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	get_adjustment_page (_tmp8_, _tmp9_, &_tmp10_);
-#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1982 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	visible_page = _tmp10_;
-#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1983 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&visible_band, 0, sizeof (GdkRectangle));
-#line 1989 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp11_ = self->priv->selection_band;
-#line 1989 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gdk_rectangle_intersect (&visible_page, &_tmp11_, &_tmp12_);
-#line 1989 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1984 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	visible_band = _tmp12_;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = visible_band;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp15_ = _tmp14_.width;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp15_ > 1) {
-#line 11709 "CheckerboardLayout.c"
+#line 11661 "CheckerboardLayout.c"
 		GdkRectangle _tmp16_;
 		gint _tmp17_;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp16_ = visible_band;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp17_ = _tmp16_.height;
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = _tmp17_ > 1;
-#line 11718 "CheckerboardLayout.c"
+#line 11670 "CheckerboardLayout.c"
 	} else {
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp13_ = FALSE;
-#line 11722 "CheckerboardLayout.c"
+#line 11674 "CheckerboardLayout.c"
 	}
-#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1987 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp13_) {
-#line 11726 "CheckerboardLayout.c"
+#line 11678 "CheckerboardLayout.c"
 		cairo_t* _tmp18_;
 		GdkRGBA _tmp19_;
 		gdouble _tmp20_;
@@ -11741,97 +11693,97 @@ static void checkerboard_layout_draw_selection_band (CheckerboardLayout* self, c
 		GdkRectangle _tmp32_;
 		gint _tmp33_;
 		cairo_t* _tmp34_;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp18_ = ctx;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = self->priv->selected_color;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp20_ = _tmp19_.red;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp21_ = self->priv->selected_color;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = _tmp21_.green;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp23_ = self->priv->selected_color;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp24_ = _tmp23_.blue;
-#line 1993 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1988 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_set_source_rgba (_tmp18_, _tmp20_, _tmp22_, _tmp24_, CHECKERBOARD_LAYOUT_SELECTION_ALPHA);
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp25_ = ctx;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp26_ = visible_band;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp27_ = _tmp26_.x;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp28_ = visible_band;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp29_ = _tmp28_.y;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp30_ = visible_band;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp31_ = _tmp30_.width;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp32_ = visible_band;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1995 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1990 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_rectangle (_tmp25_, (gdouble) _tmp27_, (gdouble) _tmp29_, (gdouble) _tmp31_, (gdouble) _tmp33_);
-#line 1997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp34_ = ctx;
-#line 1997 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1992 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		cairo_fill (_tmp34_);
-#line 11784 "CheckerboardLayout.c"
+#line 11736 "CheckerboardLayout.c"
 	}
-#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1998 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp35_ = ctx;
-#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1998 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_line_width (_tmp35_, 1.0);
-#line 2004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp36_ = ctx;
-#line 2004 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 1999 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_line_cap (_tmp36_, CAIRO_LINE_CAP_SQUARE);
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp37_ = ctx;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp38_ = self->priv->selected_color;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp39_ = _tmp38_.red;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp40_ = self->priv->selected_color;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp41_ = _tmp40_.green;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp42_ = self->priv->selected_color;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp43_ = _tmp42_.blue;
-#line 2005 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2000 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_set_source_rgb (_tmp37_, _tmp39_, _tmp41_, _tmp43_);
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp44_ = ctx;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp45_ = self->priv->selection_band;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp46_ = _tmp45_.x;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp47_ = self->priv->selection_band;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp48_ = _tmp47_.y;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp49_ = self->priv->selection_band;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp50_ = _tmp49_.width;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp51_ = self->priv->selection_band;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp52_ = _tmp51_.height;
-#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2001 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_rectangle (_tmp44_, ((gdouble) _tmp46_) + 0.5, ((gdouble) _tmp48_) + 0.5, ((gdouble) _tmp50_) - 1.0, ((gdouble) _tmp52_) - 1.0);
-#line 2008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp53_ = ctx;
-#line 2008 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2003 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	cairo_stroke (_tmp53_);
-#line 11834 "CheckerboardLayout.c"
+#line 11786 "CheckerboardLayout.c"
 }
 
 
@@ -11844,53 +11796,53 @@ static gboolean checkerboard_layout_real_query_tooltip (GtkWidget* base, gint x,
 	CheckerboardItem* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	CheckerboardItem* _tmp4_;
-#line 2011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 2011 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2006 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE);
-#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = x;
-#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = y;
-#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = checkerboard_layout_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2007 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	item = _tmp2_;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = item;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp4_ != NULL) {
-#line 11863 "CheckerboardLayout.c"
+#line 11815 "CheckerboardLayout.c"
 		CheckerboardItem* _tmp5_;
 		gint _tmp6_;
 		gint _tmp7_;
 		GtkTooltip* _tmp8_;
 		gboolean _tmp9_;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp5_ = item;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp6_ = x;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp7_ = y;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp8_ = tooltip;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp9_ = checkerboard_item_query_tooltip (_tmp5_, _tmp6_, _tmp7_, _tmp8_);
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = _tmp9_;
-#line 11881 "CheckerboardLayout.c"
+#line 11833 "CheckerboardLayout.c"
 	} else {
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp3_ = FALSE;
-#line 11885 "CheckerboardLayout.c"
+#line 11837 "CheckerboardLayout.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp3_;
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (item);
-#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2009 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11893 "CheckerboardLayout.c"
+#line 11845 "CheckerboardLayout.c"
 }
 
 
@@ -11898,21 +11850,23 @@ static void checkerboard_layout_on_colors_changed (CheckerboardLayout* self) {
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	GdkRGBA _tmp2_ = {0};
-#line 2017 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2012 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (IS_CHECKERBOARD_LAYOUT (self));
-#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2013 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+	invalidate_transparent_background ();
+#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = _tmp0_;
-#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	config_facade_get_bg_color (_tmp1_, &_tmp2_);
-#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_STATE_FLAG_NORMAL, &_tmp2_);
-#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2014 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2015 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, TRUE);
-#line 11915 "CheckerboardLayout.c"
+#line 11869 "CheckerboardLayout.c"
 }
 
 
@@ -11924,31 +11878,31 @@ static gboolean checkerboard_layout_real_focus_in_event (GtkWidget* base, GdkEve
 	GeeList* _tmp2_;
 	GdkEventFocus* _tmp3_;
 	gboolean _tmp4_;
-#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2018 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2023 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2019 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, TRUE);
-#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->view;
-#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = view_collection_get_selected (_tmp0_);
-#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_;
-#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "focus_in_event", G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2024 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2020 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = event;
-#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp4_;
-#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2022 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11951 "CheckerboardLayout.c"
+#line 11905 "CheckerboardLayout.c"
 }
 
 
@@ -11960,31 +11914,31 @@ static gboolean checkerboard_layout_real_focus_out_event (GtkWidget* base, GdkEv
 	GeeList* _tmp2_;
 	GdkEventFocus* _tmp3_;
 	gboolean _tmp4_;
-#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2025 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2030 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2026 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_set_colors (self, FALSE);
-#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->view;
-#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = view_collection_get_selected (_tmp0_);
-#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = _tmp1_;
-#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_items_dirty (self, "focus_out_event", G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2031 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2027 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = event;
-#line 2033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = GTK_WIDGET_CLASS (checkerboard_layout_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 2033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	result = _tmp4_;
-#line 2033 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 2029 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return result;
-#line 11987 "CheckerboardLayout.c"
+#line 11941 "CheckerboardLayout.c"
 }
 
 
@@ -11994,246 +11948,246 @@ static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_construct (GT
 	gint _tmp1_;
 	gint _tmp2_;
 	CheckerboardItem** _tmp3_;
-#line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = (CheckerboardLayoutLayoutRow*) g_type_create_instance (object_type);
-#line 844 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 839 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = y;
-#line 844 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 839 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->y = _tmp0_;
-#line 845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = height;
-#line 845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 840 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->height = _tmp1_;
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = num_in_row;
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp3_ = g_new0 (CheckerboardItem*, _tmp2_ + 1);
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->items = (_vala_array_free (self->items, self->items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->items = _tmp3_;
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->items_length1 = _tmp2_;
-#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->_items_size_ = self->items_length1;
-#line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return self;
-#line 12021 "CheckerboardLayout.c"
+#line 11975 "CheckerboardLayout.c"
 }
 
 
 static CheckerboardLayoutLayoutRow* checkerboard_layout_layout_row_new (gint y, gint height, gint num_in_row) {
-#line 843 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return checkerboard_layout_layout_row_construct (CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, y, height, num_in_row);
-#line 12028 "CheckerboardLayout.c"
+#line 11982 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_value_layout_row_init (GValue* value) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	value->data[0].v_pointer = NULL;
-#line 12035 "CheckerboardLayout.c"
+#line 11989 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_value_layout_row_free_value (GValue* value) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (value->data[0].v_pointer) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (value->data[0].v_pointer);
-#line 12044 "CheckerboardLayout.c"
+#line 11998 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_value_layout_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (src_value->data[0].v_pointer) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = checkerboard_layout_layout_row_ref (src_value->data[0].v_pointer);
-#line 12054 "CheckerboardLayout.c"
+#line 12008 "CheckerboardLayout.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12058 "CheckerboardLayout.c"
+#line 12012 "CheckerboardLayout.c"
 	}
 }
 
 
 static gpointer checkerboard_layout_value_layout_row_peek_pointer (const GValue* value) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 12066 "CheckerboardLayout.c"
+#line 12020 "CheckerboardLayout.c"
 }
 
 
 static gchar* checkerboard_layout_value_layout_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (collect_values[0].v_pointer) {
-#line 12073 "CheckerboardLayout.c"
+#line 12027 "CheckerboardLayout.c"
 		CheckerboardLayoutLayoutRow * object;
 		object = collect_values[0].v_pointer;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12080 "CheckerboardLayout.c"
+#line 12034 "CheckerboardLayout.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.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 12084 "CheckerboardLayout.c"
+#line 12038 "CheckerboardLayout.c"
 		}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = checkerboard_layout_layout_row_ref (object);
-#line 12088 "CheckerboardLayout.c"
+#line 12042 "CheckerboardLayout.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12092 "CheckerboardLayout.c"
+#line 12046 "CheckerboardLayout.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 12096 "CheckerboardLayout.c"
+#line 12050 "CheckerboardLayout.c"
 }
 
 
 static gchar* checkerboard_layout_value_layout_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	CheckerboardLayoutLayoutRow ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!object_p) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12107 "CheckerboardLayout.c"
+#line 12061 "CheckerboardLayout.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (!value->data[0].v_pointer) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = NULL;
-#line 12113 "CheckerboardLayout.c"
+#line 12067 "CheckerboardLayout.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12117 "CheckerboardLayout.c"
+#line 12071 "CheckerboardLayout.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		*object_p = checkerboard_layout_layout_row_ref (value->data[0].v_pointer);
-#line 12121 "CheckerboardLayout.c"
+#line 12075 "CheckerboardLayout.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return NULL;
-#line 12125 "CheckerboardLayout.c"
+#line 12079 "CheckerboardLayout.c"
 }
 
 
 static GParamSpec* checkerboard_layout_param_spec_layout_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	CheckerboardLayoutParamSpecLayoutRow* spec;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW), NULL);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return G_PARAM_SPEC (spec);
-#line 12139 "CheckerboardLayout.c"
+#line 12093 "CheckerboardLayout.c"
 }
 
 
 static gpointer checkerboard_layout_value_get_layout_row (const GValue* value) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW), NULL);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return value->data[0].v_pointer;
-#line 12148 "CheckerboardLayout.c"
+#line 12102 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_value_set_layout_row (GValue* value, gpointer v_object) {
 	CheckerboardLayoutLayoutRow * old;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	old = value->data[0].v_pointer;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (v_object) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = v_object;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_ref (value->data[0].v_pointer);
-#line 12168 "CheckerboardLayout.c"
+#line 12122 "CheckerboardLayout.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12172 "CheckerboardLayout.c"
+#line 12126 "CheckerboardLayout.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (old);
-#line 12178 "CheckerboardLayout.c"
+#line 12132 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_value_take_layout_row (GValue* value, gpointer v_object) {
 	CheckerboardLayoutLayoutRow * old;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	old = value->data[0].v_pointer;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (v_object) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = v_object;
-#line 12197 "CheckerboardLayout.c"
+#line 12151 "CheckerboardLayout.c"
 	} else {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		value->data[0].v_pointer = NULL;
-#line 12201 "CheckerboardLayout.c"
+#line 12155 "CheckerboardLayout.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (old) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		checkerboard_layout_layout_row_unref (old);
-#line 12207 "CheckerboardLayout.c"
+#line 12161 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_layout_row_class_init (CheckerboardLayoutLayoutRowClass * klass) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_layout_row_parent_class = g_type_class_peek_parent (klass);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((CheckerboardLayoutLayoutRowClass *) klass)->finalize = checkerboard_layout_layout_row_finalize;
-#line 12217 "CheckerboardLayout.c"
+#line 12171 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_layout_row_instance_init (CheckerboardLayoutLayoutRow * self) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->ref_count = 1;
-#line 12224 "CheckerboardLayout.c"
+#line 12178 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_layout_row_finalize (CheckerboardLayoutLayoutRow * obj) {
 	CheckerboardLayoutLayoutRow * self;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CHECKERBOARD_LAYOUT_TYPE_LAYOUT_ROW, CheckerboardLayoutLayoutRow);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_destroy (self);
-#line 841 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 836 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->items = (_vala_array_free (self->items, self->items_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 12236 "CheckerboardLayout.c"
+#line 12190 "CheckerboardLayout.c"
 }
 
 
@@ -12254,109 +12208,109 @@ static GType checkerboard_layout_layout_row_get_type (void) {
 static gpointer checkerboard_layout_layout_row_ref (gpointer instance) {
 	CheckerboardLayoutLayoutRow * self;
 	self = instance;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	return instance;
-#line 12261 "CheckerboardLayout.c"
+#line 12215 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_layout_row_unref (gpointer instance) {
 	CheckerboardLayoutLayoutRow * self;
 	self = instance;
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		CHECKERBOARD_LAYOUT_LAYOUT_ROW_GET_CLASS (self)->finalize (self);
-#line 838 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 833 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12274 "CheckerboardLayout.c"
+#line 12228 "CheckerboardLayout.c"
 	}
 }
 
 
 static void checkerboard_layout_class_init (CheckerboardLayoutClass * klass) {
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	checkerboard_layout_parent_class = g_type_class_peek_parent (klass);
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardLayoutPrivate));
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->map = (void (*) (GtkWidget *)) checkerboard_layout_real_map;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->size_allocate = (void (*) (GtkWidget *, GtkAllocation*)) checkerboard_layout_real_size_allocate;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) checkerboard_layout_real_draw;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->query_tooltip = (gboolean (*) (GtkWidget *, gint, gint, gboolean, GtkTooltip*)) checkerboard_layout_real_query_tooltip;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->focus_in_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_in_event;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) checkerboard_layout_real_focus_out_event;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_layout_finalize;
-#line 12298 "CheckerboardLayout.c"
+#line 12252 "CheckerboardLayout.c"
 }
 
 
 static void checkerboard_layout_instance_init (CheckerboardLayout * self) {
 	gchar* _tmp0_;
 	GeeHashSet* _tmp1_;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv = CHECKERBOARD_LAYOUT_GET_PRIVATE (self);
-#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = g_strdup ("");
-#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->page_name = _tmp0_;
-#line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = NULL;
-#line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows_length1 = 0;
-#line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->_item_rows_size_ = self->priv->item_rows_length1;
-#line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp1_ = gee_hash_set_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposed_items = _tmp1_;
-#line 854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->hadjustment = NULL;
-#line 855 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->vadjustment = NULL;
-#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->message = NULL;
-#line 861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&self->priv->visible_page, 0, sizeof (GdkRectangle));
-#line 862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 857 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->last_width = 0;
-#line 863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 858 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->columns = 0;
-#line 864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 859 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->rows = 0;
-#line 865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 860 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&self->priv->drag_origin, 0, sizeof (GdkPoint));
-#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 861 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&self->priv->drag_endpoint, 0, sizeof (GdkPoint));
-#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 862 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	memset (&self->priv->selection_band, 0, sizeof (GdkRectangle));
-#line 868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 863 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->scale = 0;
-#line 869 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 864 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->flow_scheduled = FALSE;
-#line 870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 865 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->exposure_dirty = TRUE;
-#line 871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->anchor = NULL;
-#line 872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->cursor = NULL;
-#line 873 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 868 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->in_center_on_anchor = FALSE;
-#line 874 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 869 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->size_allocate_due_to_reflow = FALSE;
-#line 875 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 870 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->is_in_view = FALSE;
-#line 876 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->reflow_needed = FALSE;
-#line 12359 "CheckerboardLayout.c"
+#line 12313 "CheckerboardLayout.c"
 }
 
 
@@ -12387,143 +12341,143 @@ static void checkerboard_layout_finalize (GObject * obj) {
 	ConfigFacade* _tmp29_;
 	ConfigFacade* _tmp30_;
 	guint _tmp31_;
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_LAYOUT, CheckerboardLayout);
-#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp0_ = self->priv->view;
-#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 902 "/home/jens/Source/shotwell/src/CheckerboardLayout.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) _checkerboard_layout_on_contents_altered_data_collection_contents_altered, self);
-#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp2_ = self->priv->view;
-#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 903 "/home/jens/Source/shotwell/src/CheckerboardLayout.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) _checkerboard_layout_on_items_altered_data_collection_items_altered, self);
-#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp4_ = self->priv->view;
-#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 904 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _checkerboard_layout_on_items_state_changed_view_collection_items_state_changed, self);
-#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp6_ = self->priv->view;
-#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 905 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _checkerboard_layout_on_items_visibility_changed_view_collection_items_visibility_changed, self);
-#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp8_ = self->priv->view;
-#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 911 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 906 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _checkerboard_layout_on_ordering_changed_data_collection_ordering_changed, self);
-#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp10_ = self->priv->view;
-#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("views-altered", TYPE_VIEW_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 907 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _checkerboard_layout_on_views_altered_view_collection_views_altered, self);
-#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp12_ = self->priv->view;
-#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("geometries-altered", TYPE_VIEW_COLLECTION, &_tmp13_, NULL, FALSE);
-#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 908 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _checkerboard_layout_on_geometries_altered_view_collection_geometries_altered, self);
-#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp14_ = self->priv->view;
-#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp15_, NULL, FALSE);
-#line 914 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 909 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_selected, self);
-#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp16_ = self->priv->view;
-#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("items-unselected", TYPE_VIEW_COLLECTION, &_tmp17_, NULL, FALSE);
-#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 910 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _checkerboard_layout_on_items_selection_changed_view_collection_items_unselected, self);
-#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp18_ = self->priv->hadjustment;
-#line 917 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 912 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp18_ != NULL) {
-#line 12450 "CheckerboardLayout.c"
+#line 12404 "CheckerboardLayout.c"
 		GtkAdjustment* _tmp19_;
 		guint _tmp20_;
-#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp19_ = self->priv->hadjustment;
-#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp20_, NULL, FALSE);
-#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 913 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self);
-#line 12459 "CheckerboardLayout.c"
+#line 12413 "CheckerboardLayout.c"
 	}
-#line 920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp21_ = self->priv->vadjustment;
-#line 920 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 915 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp21_ != NULL) {
-#line 12465 "CheckerboardLayout.c"
+#line 12419 "CheckerboardLayout.c"
 		GtkAdjustment* _tmp22_;
 		guint _tmp23_;
-#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp22_ = self->priv->vadjustment;
-#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp23_, NULL, FALSE);
-#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 916 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_shifted_gtk_adjustment_value_changed, self);
-#line 12474 "CheckerboardLayout.c"
+#line 12428 "CheckerboardLayout.c"
 	}
-#line 923 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp24_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 923 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp25_ = _tmp24_;
-#line 923 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 918 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	if (_tmp25_ != NULL) {
-#line 12482 "CheckerboardLayout.c"
+#line 12436 "CheckerboardLayout.c"
 		GtkContainer* _tmp26_;
 		GtkContainer* _tmp27_;
 		guint _tmp28_;
-#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp26_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		_tmp27_ = _tmp26_;
-#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_parse_name ("size-allocate", gtk_widget_get_type (), &_tmp28_, NULL, FALSE);
-#line 924 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 919 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _checkerboard_layout_on_viewport_resized_gtk_widget_size_allocate, self);
-#line 12494 "CheckerboardLayout.c"
+#line 12448 "CheckerboardLayout.c"
 	}
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp29_ = config_facade_get_instance ();
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_tmp30_ = _tmp29_;
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_parse_name ("colors-changed", CONFIG_TYPE_FACADE, &_tmp31_, NULL, FALSE);
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	g_signal_handlers_disconnect_matched (_tmp30_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp31_, 0, NULL, (GCallback) _checkerboard_layout_on_colors_changed_config_facade_colors_changed, self);
-#line 926 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 921 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (_tmp30_);
-#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 845 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 846 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (self->priv->page_name);
-#line 852 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 847 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	self->priv->item_rows = (_vala_array_free (self->priv->item_rows, self->priv->item_rows_length1, (GDestroyNotify) checkerboard_layout_layout_row_unref), NULL);
-#line 853 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 848 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->exposed_items);
-#line 854 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 849 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->hadjustment);
-#line 855 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 850 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->vadjustment);
-#line 856 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 851 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_free0 (self->priv->message);
-#line 871 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 866 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->anchor);
-#line 872 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 867 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	_g_object_unref0 (self->priv->cursor);
-#line 821 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
+#line 816 "/home/jens/Source/shotwell/src/CheckerboardLayout.vala"
 	G_OBJECT_CLASS (checkerboard_layout_parent_class)->finalize (obj);
-#line 12526 "CheckerboardLayout.c"
+#line 12480 "CheckerboardLayout.c"
 }
 
 
diff --git a/src/CheckerboardLayout.vala b/src/CheckerboardLayout.vala
index 5a672f3..d508617 100644
--- a/src/CheckerboardLayout.vala
+++ b/src/CheckerboardLayout.vala
@@ -563,12 +563,7 @@ public abstract class CheckerboardItem : ThumbnailView {
     }
 
     protected virtual void paint_image(Cairo.Context ctx, Gdk.Pixbuf pixbuf, Gdk.Point origin) {
-        if (pixbuf.get_has_alpha()) {
-            ctx.rectangle(origin.x, origin.y, pixbuf.get_width(), pixbuf.get_height());
-            ctx.fill();
-        }
-        Gdk.cairo_set_source_pixbuf(ctx, pixbuf, origin.x, origin.y);
-        ctx.paint();
+        paint_pixmap_with_background(ctx, pixbuf, origin.x, origin.y);
     }
 
     private int get_selection_border_width(int scale) {
@@ -2015,6 +2010,7 @@ public class CheckerboardLayout : Gtk.DrawingArea {
     }
     
     private void on_colors_changed() {
+        invalidate_transparent_background();
         override_background_color(Gtk.StateFlags.NORMAL, Config.Facade.get_instance().get_bg_color());
         set_colors();
     }
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 87f07c8..01e92e8 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -18,6 +18,7 @@
 #include <float.h>
 #include <math.h>
 #include <glib/gi18n-lib.h>
+#include "shotwell-graphics-processor.h"
 #include <time.h>
 
 
@@ -544,16 +545,6 @@ typedef struct _MultiplePhotoTransformationCommandClass MultiplePhotoTransformat
 
 typedef struct _RevertMultipleCommand RevertMultipleCommand;
 typedef struct _RevertMultipleCommandClass RevertMultipleCommandClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
 #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
 
 #define TYPE_ADJUST_COLORS_MULTIPLE_COMMAND (adjust_colors_multiple_command_get_type ())
@@ -1167,12 +1158,12 @@ 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);
-static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static gboolean collection_page_selection_has_video (CollectionPage* self);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
@@ -1184,11 +1175,7 @@ GeeCollection* view_collection_get_sources (ViewCollection* self);
 static gboolean collection_page_selection_has_photo (CollectionPage* self);
 static void collection_page_real_init_actions (Page* base, gint selected_count, gint count);
 void page_init_actions (Page* self, gint selected_count, gint count);
-void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label);
-#define RESOURCES_ROTATE_CW_LABEL _ ("Rotate")
-#define RESOURCES_ROTATE_CCW_LABEL _ ("Rotate")
-#define RESOURCES_PUBLISH_LABEL _ ("Publish")
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
+void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 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);
@@ -1198,8 +1185,6 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
 DataSource* data_view_get_source (DataView* self);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
 gboolean is_string_empty (const gchar* s);
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
 GType photo_source_get_type (void) G_GNUC_CONST;
@@ -1209,7 +1194,6 @@ PhotoFileFormat photo_get_master_file_format (Photo* self);
 gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
 static gboolean collection_page_can_revert_selected (CollectionPage* self);
 gboolean photo_has_color_adjustments (Photo* self);
-gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
 #define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
 #define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
 void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
@@ -1309,16 +1293,7 @@ GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType revert_multiple_command_get_type (void) G_GNUC_CONST;
 RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter);
 RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter);
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
-void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
-PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void);
 GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST;
 #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments")
 #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
@@ -1386,7 +1361,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 1390 "CollectionPage.c"
+#line 1365 "CollectionPage.c"
 }
 
 
@@ -1408,14 +1383,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 1412 "CollectionPage.c"
+#line 1387 "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 1419 "CollectionPage.c"
+#line 1394 "CollectionPage.c"
 }
 
 
@@ -1439,7 +1414,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 1443 "CollectionPage.c"
+#line 1418 "CollectionPage.c"
 }
 
 
@@ -1452,14 +1427,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 = (DataView* (*) (ViewManager *, DataSource*)) collection_view_manager_real_create_view;
-#line 1456 "CollectionPage.c"
+#line 1431 "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 1463 "CollectionPage.c"
+#line 1438 "CollectionPage.c"
 }
 
 
@@ -1471,7 +1446,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 1475 "CollectionPage.c"
+#line 1450 "CollectionPage.c"
 }
 
 
@@ -1490,126 +1465,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 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_print ((CollectionPage*) self);
-#line 1494 "CollectionPage.c"
+#line 1469 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_publish ((CollectionPage*) self);
-#line 1501 "CollectionPage.c"
+#line 1476 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_clockwise ((CollectionPage*) self);
-#line 1508 "CollectionPage.c"
+#line 1483 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
-#line 1515 "CollectionPage.c"
+#line 1490 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_horizontally ((CollectionPage*) self);
-#line 1522 "CollectionPage.c"
+#line 1497 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_vertically ((CollectionPage*) self);
-#line 1529 "CollectionPage.c"
+#line 1504 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_enhance ((CollectionPage*) self);
-#line 1536 "CollectionPage.c"
+#line 1511 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_copy_adjustments ((CollectionPage*) self);
-#line 1543 "CollectionPage.c"
+#line 1518 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_paste_adjustments ((CollectionPage*) self);
-#line 1550 "CollectionPage.c"
+#line 1525 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_revert ((CollectionPage*) self);
-#line 1557 "CollectionPage.c"
+#line 1532 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_set_background ((CollectionPage*) self);
-#line 1564 "CollectionPage.c"
+#line 1539 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_duplicate_photo ((CollectionPage*) self);
-#line 1571 "CollectionPage.c"
+#line 1546 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_adjust_date_time ((CollectionPage*) self);
-#line 1578 "CollectionPage.c"
+#line 1553 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit ((CollectionPage*) self);
-#line 1585 "CollectionPage.c"
+#line 1560 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit_raw ((CollectionPage*) self);
-#line 1592 "CollectionPage.c"
+#line 1567 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_slideshow ((CollectionPage*) self);
-#line 1599 "CollectionPage.c"
+#line 1574 "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 1606 "CollectionPage.c"
+#line 1581 "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 1613 "CollectionPage.c"
+#line 1588 "CollectionPage.c"
 }
 
 
@@ -1650,7 +1625,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 1654 "CollectionPage.c"
+#line 1629 "CollectionPage.c"
 }
 
 
@@ -1666,7 +1641,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 1670 "CollectionPage.c"
+#line 1645 "CollectionPage.c"
 		GtkToolbar* _tmp1_;
 		GtkToolbar* _tmp2_;
 		GtkSeparatorToolItem* separator = NULL;
@@ -1803,7 +1778,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 1807 "CollectionPage.c"
+#line 1782 "CollectionPage.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -1813,7 +1788,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	result = _tmp29_;
 #line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1817 "CollectionPage.c"
+#line 1792 "CollectionPage.c"
 }
 
 
@@ -1839,7 +1814,7 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	result = group;
 #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1843 "CollectionPage.c"
+#line 1818 "CollectionPage.c"
 }
 
 
@@ -1857,7 +1832,7 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	result = group;
 #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1861 "CollectionPage.c"
+#line 1836 "CollectionPage.c"
 }
 
 
@@ -1879,7 +1854,7 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	result = group;
 #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1883 "CollectionPage.c"
+#line 1858 "CollectionPage.c"
 }
 
 
@@ -1915,7 +1890,7 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	result = group;
 #line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1919 "CollectionPage.c"
+#line 1894 "CollectionPage.c"
 }
 
 
@@ -1928,12 +1903,12 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 #line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, _ ("Adjust Date and Time…"), "AdjustDateTime", NULL);
+	injection_group_add_menu_item (group, _ ("Adjust Date and Time…"), "AdjustDateTime", "F4");
 #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1937 "CollectionPage.c"
+#line 1912 "CollectionPage.c"
 }
 
 
@@ -1955,7 +1930,7 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	result = group;
 #line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1959 "CollectionPage.c"
+#line 1934 "CollectionPage.c"
 }
 
 
@@ -1975,7 +1950,7 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	_tmp1_ = ui_filenames;
 #line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 1979 "CollectionPage.c"
+#line 1954 "CollectionPage.c"
 }
 
 
@@ -1995,7 +1970,7 @@ static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
-#line 1999 "CollectionPage.c"
+#line 1974 "CollectionPage.c"
 }
 
 
@@ -2010,7 +1985,7 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 	_tmp0_ = map;
 #line 186 "/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 2014 "CollectionPage.c"
+#line 1989 "CollectionPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -2022,11 +1997,11 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
 #line 187 "/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 2026 "CollectionPage.c"
+#line 2001 "CollectionPage.c"
 			GActionEntry entry = {0};
 #line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			entry = entry_collection[entry_it];
-#line 2030 "CollectionPage.c"
+#line 2005 "CollectionPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -2039,112 +2014,112 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2043 "CollectionPage.c"
+#line 2018 "CollectionPage.c"
 			}
 		}
 	}
 }
 
 
-static void _vala_array_add76 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2057 "CollectionPage.c"
+#line 2032 "CollectionPage.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2063 "CollectionPage.c"
+#line 2038 "CollectionPage.c"
 }
 
 
-static void _vala_array_add77 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2074 "CollectionPage.c"
+#line 2049 "CollectionPage.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2080 "CollectionPage.c"
+#line 2055 "CollectionPage.c"
 }
 
 
-static void _vala_array_add78 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2091 "CollectionPage.c"
+#line 2066 "CollectionPage.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2097 "CollectionPage.c"
+#line 2072 "CollectionPage.c"
 }
 
 
-static void _vala_array_add79 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2108 "CollectionPage.c"
+#line 2083 "CollectionPage.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2114 "CollectionPage.c"
+#line 2089 "CollectionPage.c"
 }
 
 
-static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2125 "CollectionPage.c"
+#line 2100 "CollectionPage.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2131 "CollectionPage.c"
+#line 2106 "CollectionPage.c"
 }
 
 
-static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2142 "CollectionPage.c"
+#line 2117 "CollectionPage.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2148 "CollectionPage.c"
+#line 2123 "CollectionPage.c"
 }
 
 
@@ -2193,7 +2168,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add76 (&groups, &groups_length1, &_groups_size_, _tmp3_);
+	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp3_);
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2201,7 +2176,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add77 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp5_);
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2209,7 +2184,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add78 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2217,7 +2192,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2225,7 +2200,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp11_);
+	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp11_);
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2233,7 +2208,7 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+	_vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp13_);
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2242,13 +2217,13 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	if (result_length1) {
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2246 "CollectionPage.c"
+#line 2221 "CollectionPage.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2252 "CollectionPage.c"
+#line 2227 "CollectionPage.c"
 }
 
 
@@ -2282,7 +2257,7 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	result = _tmp5_;
 #line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2286 "CollectionPage.c"
+#line 2261 "CollectionPage.c"
 }
 
 
@@ -2316,7 +2291,7 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2320 "CollectionPage.c"
+#line 2295 "CollectionPage.c"
 }
 
 
@@ -2350,7 +2325,7 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	result = _tmp5_;
 #line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2354 "CollectionPage.c"
+#line 2329 "CollectionPage.c"
 }
 
 
@@ -2367,20 +2342,14 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 #line 218 "/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 220 "/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);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
 #line 221 "/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);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", TRUE);
 #line 222 "/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 224 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
-#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", TRUE);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
-#line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2384 "CollectionPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
+#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
+#line 2353 "CollectionPage.c"
 }
 
 
@@ -2405,86 +2374,86 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	gboolean _tmp18_;
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_;
-	gboolean _tmp22_;
+	gboolean _tmp22_ = FALSE;
 	gboolean _tmp23_ = FALSE;
 	gboolean _tmp24_;
-	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-	gboolean _tmp33_;
-	gboolean _tmp47_ = FALSE;
-	gboolean _tmp48_;
-	gboolean _tmp50_ = FALSE;
-	gboolean _tmp51_;
-	gboolean _tmp53_ = FALSE;
+	gboolean _tmp33_ = FALSE;
+	gboolean _tmp34_;
+	gboolean _tmp48_ = FALSE;
+	gboolean _tmp49_;
+	gboolean _tmp51_ = FALSE;
+	gboolean _tmp52_;
 	gboolean _tmp54_ = FALSE;
-	gboolean _tmp55_;
-	gboolean _tmp64_ = FALSE;
+	gboolean _tmp55_ = FALSE;
+	gboolean _tmp56_;
 	gboolean _tmp65_ = FALSE;
-	gboolean _tmp66_;
-	gboolean _tmp69_ = FALSE;
-	gboolean _tmp70_;
-	gboolean _tmp72_ = FALSE;
-	gboolean _tmp73_;
-	gboolean _tmp75_ = FALSE;
-	gboolean _tmp76_;
-	gboolean _tmp78_ = FALSE;
-	gboolean _tmp79_;
-	gboolean _tmp81_;
+	gboolean _tmp66_ = FALSE;
+	gboolean _tmp67_;
+	gboolean _tmp70_ = FALSE;
+	gboolean _tmp71_;
+	gboolean _tmp73_ = FALSE;
+	gboolean _tmp74_;
+	gboolean _tmp76_ = FALSE;
+	gboolean _tmp77_;
+	gboolean _tmp79_ = FALSE;
+	gboolean _tmp80_;
 	gboolean _tmp82_;
 	gboolean _tmp83_;
 	gboolean _tmp84_;
-	gboolean _tmp85_ = FALSE;
-	gboolean _tmp86_;
-	gboolean _tmp88_ = FALSE;
-	gboolean _tmp89_;
-	gboolean _tmp91_;
-	gboolean _tmp92_ = FALSE;
-	gboolean _tmp93_;
-	gboolean _tmp95_;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	gboolean _tmp85_;
+	gboolean _tmp86_ = FALSE;
+	gboolean _tmp87_;
+	gboolean _tmp89_ = FALSE;
+	gboolean _tmp90_;
+	gboolean _tmp92_;
+	gboolean _tmp93_ = FALSE;
+	gboolean _tmp94_;
+	gboolean _tmp96_;
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_ != G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page);
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2466 "CollectionPage.c"
+#line 2435 "CollectionPage.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = count;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/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 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = selected_count;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	one_selected = _tmp7_ == 1;
-#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = selected_count;
-#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_selected = _tmp8_ > 0;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	primary_is_video = FALSE;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = has_selected;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2488 "CollectionPage.c"
+#line 2457 "CollectionPage.c"
 		ViewCollection* _tmp10_;
 		ViewCollection* _tmp11_;
 		DataView* _tmp12_;
@@ -2492,498 +2461,508 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp14_;
 		DataSource* _tmp15_;
 		gboolean _tmp16_;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = data_view_get_source (_tmp13_);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp16_) {
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2520 "CollectionPage.c"
+#line 2489 "CollectionPage.c"
 		}
 	}
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = collection_page_selection_has_video (self);
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selection_has_videos = _tmp17_;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp18_ = collection_page_page_has_photo (self);
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_has_photos = _tmp18_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = has_selected;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2535 "CollectionPage.c"
+#line 2504 "CollectionPage.c"
 		gboolean _tmp21_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2541 "CollectionPage.c"
+#line 2510 "CollectionPage.c"
 	} else {
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2545 "CollectionPage.c"
+#line 2514 "CollectionPage.c"
 	}
-#line 251 "/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), "Duplicate", _tmp19_);
-#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp22_ = primary_is_video;
-#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", !_tmp22_);
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp24_ = one_selected;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp24_) {
-#line 2557 "CollectionPage.c"
-		ConfigFacade* _tmp25_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp24_ = primary_is_video;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp24_) {
+#line 2522 "CollectionPage.c"
+		gboolean _tmp25_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp25_ = one_selected;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = _tmp25_;
+#line 2528 "CollectionPage.c"
+	} else {
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = FALSE;
+#line 2532 "CollectionPage.c"
+	}
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp23_) {
+#line 2536 "CollectionPage.c"
 		ConfigFacade* _tmp26_;
-		gchar* _tmp27_;
+		ConfigFacade* _tmp27_;
 		gchar* _tmp28_;
-		gboolean _tmp29_;
+		gchar* _tmp29_;
+		gboolean _tmp30_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp26_ = config_facade_get_instance ();
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = _tmp26_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp28_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp29_ = _tmp28_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp30_ = is_string_empty (_tmp29_);
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp22_ = !_tmp30_;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (_tmp29_);
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp27_);
+#line 2558 "CollectionPage.c"
+	} else {
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp22_ = FALSE;
+#line 2562 "CollectionPage.c"
+	}
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp22_);
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp34_ = one_selected;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp34_) {
+#line 2570 "CollectionPage.c"
+		gboolean _tmp35_;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp35_ = primary_is_video;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp33_ = !_tmp35_;
+#line 2576 "CollectionPage.c"
+	} else {
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp33_ = FALSE;
+#line 2580 "CollectionPage.c"
+	}
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp33_) {
+#line 2584 "CollectionPage.c"
+		ViewCollection* _tmp36_;
+		ViewCollection* _tmp37_;
+		DataView* _tmp38_;
+		DataView* _tmp39_;
+		DataSource* _tmp40_;
+		Photo* _tmp41_;
+		PhotoFileFormat _tmp42_;
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp37_ = _tmp36_;
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp38_ = view_collection_get_selected_at (_tmp37_, 0);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp39_ = _tmp38_;
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp40_ = data_view_get_source (_tmp39_);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp41_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PHOTO, Photo);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp42_ = photo_get_master_file_format (_tmp41_);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp32_ = _tmp42_ == PHOTO_FILE_FORMAT_RAW;
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp41_);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp39_);
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_data_collection_unref0 (_tmp37_);
+#line 2614 "CollectionPage.c"
+	} else {
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp32_ = FALSE;
+#line 2618 "CollectionPage.c"
+	}
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp32_) {
+#line 2622 "CollectionPage.c"
+		ConfigFacade* _tmp43_;
+		ConfigFacade* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gboolean _tmp47_;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp25_ = config_facade_get_instance ();
+		_tmp43_ = config_facade_get_instance ();
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp26_ = _tmp25_;
+		_tmp44_ = _tmp43_;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp27_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp45_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp28_ = _tmp27_;
+		_tmp46_ = _tmp45_;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp29_ = is_string_empty (_tmp28_);
+		_tmp47_ = is_string_empty (_tmp46_);
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp23_ = !_tmp29_;
+		_tmp31_ = !_tmp47_;
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp28_);
+		_g_free0 (_tmp46_);
 #line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp26_);
-#line 2579 "CollectionPage.c"
+		_g_object_unref0 (_tmp44_);
+#line 2644 "CollectionPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp23_ = FALSE;
-#line 2583 "CollectionPage.c"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp31_ = FALSE;
+#line 2648 "CollectionPage.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp31_);
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp49_ = selection_has_videos;
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp49_) {
+#line 2656 "CollectionPage.c"
+		gboolean _tmp50_;
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp50_ = collection_page_can_revert_selected (self);
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp48_ = _tmp50_;
+#line 2662 "CollectionPage.c"
+	} else {
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp48_ = FALSE;
+#line 2666 "CollectionPage.c"
+	}
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp48_);
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp33_ = one_selected;
+	_tmp52_ = selection_has_videos;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp33_) {
-#line 2591 "CollectionPage.c"
-		gboolean _tmp34_;
+	if (!_tmp52_) {
+#line 2674 "CollectionPage.c"
+		gboolean _tmp53_;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp34_ = primary_is_video;
+		_tmp53_ = has_selected;
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp32_ = !_tmp34_;
-#line 2597 "CollectionPage.c"
+		_tmp51_ = _tmp53_;
+#line 2680 "CollectionPage.c"
 	} else {
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp32_ = FALSE;
-#line 2601 "CollectionPage.c"
+		_tmp51_ = FALSE;
+#line 2684 "CollectionPage.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp32_) {
-#line 2605 "CollectionPage.c"
-		ViewCollection* _tmp35_;
-		ViewCollection* _tmp36_;
-		DataView* _tmp37_;
-		DataView* _tmp38_;
-		DataSource* _tmp39_;
-		Photo* _tmp40_;
-		PhotoFileFormat _tmp41_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp36_ = _tmp35_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp37_ = view_collection_get_selected_at (_tmp36_, 0);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp38_ = _tmp37_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp39_ = data_view_get_source (_tmp38_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp51_);
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo);
+	_tmp56_ = selection_has_videos;
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp41_ = photo_get_master_file_format (_tmp40_);
+	if (!_tmp56_) {
+#line 2692 "CollectionPage.c"
+		gboolean _tmp57_;
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp31_ = _tmp41_ == PHOTO_FILE_FORMAT_RAW;
+		_tmp57_ = one_selected;
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp40_);
+		_tmp55_ = _tmp57_;
+#line 2698 "CollectionPage.c"
+	} else {
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp38_);
+		_tmp55_ = FALSE;
+#line 2702 "CollectionPage.c"
+	}
 #line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_data_collection_unref0 (_tmp36_);
-#line 2635 "CollectionPage.c"
+	if (_tmp55_) {
+#line 2706 "CollectionPage.c"
+		ViewCollection* _tmp58_;
+		ViewCollection* _tmp59_;
+		DataView* _tmp60_;
+		DataView* _tmp61_;
+		DataSource* _tmp62_;
+		Photo* _tmp63_;
+		gboolean _tmp64_;
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp58_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp59_ = _tmp58_;
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp60_ = view_collection_get_selected_at (_tmp59_, 0);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp61_ = _tmp60_;
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp62_ = data_view_get_source (_tmp61_);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp63_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO, Photo);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp64_ = photo_has_color_adjustments (_tmp63_);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp54_ = _tmp64_;
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp63_);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp61_);
+#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_data_collection_unref0 (_tmp59_);
+#line 2736 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp31_ = FALSE;
-#line 2639 "CollectionPage.c"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp54_ = FALSE;
+#line 2740 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp31_) {
-#line 2643 "CollectionPage.c"
-		ConfigFacade* _tmp42_;
-		ConfigFacade* _tmp43_;
-		gchar* _tmp44_;
-		gchar* _tmp45_;
-		gboolean _tmp46_;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp42_ = config_facade_get_instance ();
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp43_ = _tmp42_;
-#line 259 "/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 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp45_ = _tmp44_;
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp54_);
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp46_ = is_string_empty (_tmp45_);
+	_tmp67_ = selection_has_videos;
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp30_ = !_tmp46_;
+	if (!_tmp67_) {
+#line 2748 "CollectionPage.c"
+		gboolean _tmp68_;
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp45_);
+		_tmp68_ = has_selected;
 #line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp43_);
-#line 2665 "CollectionPage.c"
+		_tmp66_ = _tmp68_;
+#line 2754 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp30_ = FALSE;
-#line 2669 "CollectionPage.c"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp66_ = FALSE;
+#line 2758 "CollectionPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_);
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp48_ = selection_has_videos;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp48_) {
-#line 2677 "CollectionPage.c"
-		gboolean _tmp49_;
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp66_) {
+#line 2762 "CollectionPage.c"
+		gboolean _tmp69_;
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp49_ = collection_page_can_revert_selected (self);
+		_tmp69_ = pixel_transformation_bundle_has_copied_color_adjustments ();
 #line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp47_ = _tmp49_;
-#line 2683 "CollectionPage.c"
+		_tmp65_ = _tmp69_;
+#line 2768 "CollectionPage.c"
 	} else {
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp47_ = FALSE;
-#line 2687 "CollectionPage.c"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp65_ = FALSE;
+#line 2772 "CollectionPage.c"
 	}
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp65_);
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp51_ = selection_has_videos;
+	_tmp71_ = selection_has_videos;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp51_) {
-#line 2695 "CollectionPage.c"
-		gboolean _tmp52_;
+	if (!_tmp71_) {
+#line 2780 "CollectionPage.c"
+		gboolean _tmp72_;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp52_ = has_selected;
+		_tmp72_ = has_selected;
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp50_ = _tmp52_;
-#line 2701 "CollectionPage.c"
+		_tmp70_ = _tmp72_;
+#line 2786 "CollectionPage.c"
 	} else {
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp50_ = FALSE;
-#line 2705 "CollectionPage.c"
+		_tmp70_ = FALSE;
+#line 2790 "CollectionPage.c"
 	}
 #line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp70_);
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp55_ = selection_has_videos;
+	_tmp74_ = selection_has_videos;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp55_) {
-#line 2713 "CollectionPage.c"
-		gboolean _tmp56_;
+	if (!_tmp74_) {
+#line 2798 "CollectionPage.c"
+		gboolean _tmp75_;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp56_ = one_selected;
+		_tmp75_ = has_selected;
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp54_ = _tmp56_;
-#line 2719 "CollectionPage.c"
+		_tmp73_ = _tmp75_;
+#line 2804 "CollectionPage.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp54_ = FALSE;
-#line 2723 "CollectionPage.c"
+		_tmp73_ = FALSE;
+#line 2808 "CollectionPage.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp54_) {
-#line 2727 "CollectionPage.c"
-		ViewCollection* _tmp57_;
-		ViewCollection* _tmp58_;
-		DataView* _tmp59_;
-		DataView* _tmp60_;
-		DataSource* _tmp61_;
-		Photo* _tmp62_;
-		gboolean _tmp63_;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp58_ = _tmp57_;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp59_ = view_collection_get_selected_at (_tmp58_, 0);
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp60_ = _tmp59_;
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp73_);
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp61_ = data_view_get_source (_tmp60_);
+	_tmp77_ = selection_has_videos;
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp62_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_PHOTO, Photo);
+	if (!_tmp77_) {
+#line 2816 "CollectionPage.c"
+		gboolean _tmp78_;
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp63_ = photo_has_color_adjustments (_tmp62_);
+		_tmp78_ = has_selected;
 #line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp53_ = _tmp63_;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp62_);
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp60_);
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_data_collection_unref0 (_tmp58_);
-#line 2757 "CollectionPage.c"
+		_tmp76_ = _tmp78_;
+#line 2822 "CollectionPage.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp53_ = FALSE;
-#line 2761 "CollectionPage.c"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp76_ = FALSE;
+#line 2826 "CollectionPage.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
-#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp66_ = selection_has_videos;
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp76_);
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp66_) {
-#line 2769 "CollectionPage.c"
-		gboolean _tmp67_;
+	_tmp80_ = selection_has_videos;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp67_ = has_selected;
+	if (!_tmp80_) {
+#line 2834 "CollectionPage.c"
+		gboolean _tmp81_;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp65_ = _tmp67_;
-#line 2775 "CollectionPage.c"
-	} else {
-#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp65_ = FALSE;
-#line 2779 "CollectionPage.c"
-	}
+		_tmp81_ = has_selected;
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp65_) {
-#line 2783 "CollectionPage.c"
-		gboolean _tmp68_;
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp64_ = _tmp68_;
-#line 2789 "CollectionPage.c"
+		_tmp79_ = _tmp81_;
+#line 2840 "CollectionPage.c"
 	} else {
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp64_ = FALSE;
-#line 2793 "CollectionPage.c"
+		_tmp79_ = FALSE;
+#line 2844 "CollectionPage.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_);
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp70_ = selection_has_videos;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp70_) {
-#line 2801 "CollectionPage.c"
-		gboolean _tmp71_;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp71_ = has_selected;
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp69_ = _tmp71_;
-#line 2807 "CollectionPage.c"
-	} else {
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp69_ = FALSE;
-#line 2811 "CollectionPage.c"
-	}
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_);
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp73_ = selection_has_videos;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp73_) {
-#line 2819 "CollectionPage.c"
-		gboolean _tmp74_;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp74_ = has_selected;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp72_ = _tmp74_;
-#line 2825 "CollectionPage.c"
-	} else {
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp72_ = FALSE;
-#line 2829 "CollectionPage.c"
-	}
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp79_);
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp76_ = selection_has_videos;
-#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp76_) {
-#line 2837 "CollectionPage.c"
-		gboolean _tmp77_;
-#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp77_ = has_selected;
+	_tmp82_ = has_selected;
 #line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp75_ = _tmp77_;
-#line 2843 "CollectionPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp82_);
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp83_ = has_selected;
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp83_);
+#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp84_ = has_selected;
+#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp84_);
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp85_ = one_selected;
+#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp85_);
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp87_ = page_has_photos;
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp87_) {
+#line 2868 "CollectionPage.c"
+		gboolean _tmp88_;
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp88_ = primary_is_video;
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp86_ = !_tmp88_;
+#line 2874 "CollectionPage.c"
 	} else {
-#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp75_ = FALSE;
-#line 2847 "CollectionPage.c"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp86_ = FALSE;
+#line 2878 "CollectionPage.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_);
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp79_ = selection_has_videos;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp79_) {
-#line 2855 "CollectionPage.c"
-		gboolean _tmp80_;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp80_ = has_selected;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp78_ = _tmp80_;
-#line 2861 "CollectionPage.c"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp86_);
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp90_ = selection_has_videos;
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp90_) {
+#line 2886 "CollectionPage.c"
+		gboolean _tmp91_;
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp91_ = has_selected;
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp89_ = _tmp91_;
+#line 2892 "CollectionPage.c"
 	} else {
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp78_ = FALSE;
-#line 2865 "CollectionPage.c"
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp89_ = FALSE;
+#line 2896 "CollectionPage.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp81_ = has_selected;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp81_);
+#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp89_);
 #line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp82_ = has_selected;
+	_tmp92_ = has_selected;
 #line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp82_);
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp83_ = has_selected;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp83_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp92_);
 #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp84_ = one_selected;
+	_tmp94_ = selection_has_videos;
 #line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp84_);
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp86_ = page_has_photos;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp86_) {
-#line 2889 "CollectionPage.c"
-		gboolean _tmp87_;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp87_ = primary_is_video;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp85_ = !_tmp87_;
-#line 2895 "CollectionPage.c"
+	if (!_tmp94_) {
+#line 2908 "CollectionPage.c"
+		gboolean _tmp95_;
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp95_ = has_selected;
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp93_ = _tmp95_;
+#line 2914 "CollectionPage.c"
 	} else {
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp85_ = FALSE;
-#line 2899 "CollectionPage.c"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp93_ = FALSE;
+#line 2918 "CollectionPage.c"
 	}
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp93_);
 #line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_);
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp89_ = selection_has_videos;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp89_) {
-#line 2907 "CollectionPage.c"
-		gboolean _tmp90_;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp90_ = has_selected;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp88_ = _tmp90_;
-#line 2913 "CollectionPage.c"
-	} else {
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp88_ = FALSE;
-#line 2917 "CollectionPage.c"
-	}
+	_tmp96_ = has_selected;
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp96_) {
+#line 2926 "CollectionPage.c"
+		const gchar* _tmp97_ = NULL;
+		gboolean _tmp98_;
+		gchar* label = NULL;
+		gchar* _tmp99_;
+		const gchar* _tmp100_;
 #line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
+		g_debug ("CollectionPage.vala:279: Setting action label for SetBackground...");
 #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp91_ = has_selected;
+		_tmp98_ = one_selected;
 #line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp91_);
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp93_ = selection_has_videos;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp93_) {
-#line 2929 "CollectionPage.c"
-		gboolean _tmp94_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp94_ = has_selected;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp92_ = _tmp94_;
-#line 2935 "CollectionPage.c"
-	} else {
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp92_ = FALSE;
-#line 2939 "CollectionPage.c"
-	}
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp95_ = has_selected;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp95_) {
-#line 2947 "CollectionPage.c"
-		const gchar* _tmp96_ = NULL;
-		gboolean _tmp97_;
-		gchar* label = NULL;
-		gchar* _tmp98_;
-		const gchar* _tmp99_;
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		g_debug ("CollectionPage.vala:284: Setting action label for SetBackground...");
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp97_ = one_selected;
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp97_) {
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 2961 "CollectionPage.c"
+		if (_tmp98_) {
+#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp97_ = RESOURCES_SET_BACKGROUND_MENU;
+#line 2940 "CollectionPage.c"
 		} else {
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 2965 "CollectionPage.c"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp97_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
+#line 2944 "CollectionPage.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp98_ = g_strdup (_tmp96_);
-#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		label = _tmp98_;
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp99_ = label;
-#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp99_);
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp99_ = g_strdup (_tmp97_);
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		label = _tmp99_;
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp100_ = label;
 #line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp100_);
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (label);
-#line 2977 "CollectionPage.c"
+#line 2956 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 2987 "CollectionPage.c"
+#line 2966 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -2992,25 +2971,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 3014 "CollectionPage.c"
+#line 2993 "CollectionPage.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -3030,120 +3009,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_;
 			LibraryPhoto* _tmp25_;
 			gboolean _tmp26_;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3042 "CollectionPage.c"
+#line 3021 "CollectionPage.c"
 			}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3064 "CollectionPage.c"
+#line 3043 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_;
 				DataView* _tmp16_;
 				gpointer _tmp17_;
 				Alteration* _tmp18_;
 				gboolean _tmp19_;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3085 "CollectionPage.c"
+#line 3064 "CollectionPage.c"
 			}
-#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3095 "CollectionPage.c"
+#line 3074 "CollectionPage.c"
 			}
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3107 "CollectionPage.c"
+#line 3086 "CollectionPage.c"
 			}
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3123 "CollectionPage.c"
+#line 3102 "CollectionPage.c"
 			}
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 307 "/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), "Revert", _tmp24_);
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3143 "CollectionPage.c"
+#line 3122 "CollectionPage.c"
 		}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3147 "CollectionPage.c"
+#line 3126 "CollectionPage.c"
 	}
 }
 
@@ -3153,48 +3132,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_;
 	gint _tmp2_;
 	gboolean _tmp3_;
-#line 314 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3171 "CollectionPage.c"
+#line 3150 "CollectionPage.c"
 		PrintManager* _tmp4_;
 		PrintManager* _tmp5_;
 		ViewCollection* _tmp6_;
 		ViewCollection* _tmp7_;
 		GeeList* _tmp8_;
 		GeeCollection* _tmp9_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3198 "CollectionPage.c"
+#line 3177 "CollectionPage.c"
 	}
 }
 
@@ -3207,52 +3186,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_;
-#line 321 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3229 "CollectionPage.c"
+#line 3208 "CollectionPage.c"
 		ConfigFacade* _tmp6_;
 		ConfigFacade* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/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 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3248 "CollectionPage.c"
+#line 3227 "CollectionPage.c"
 	} else {
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3252 "CollectionPage.c"
+#line 3231 "CollectionPage.c"
 	}
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3256 "CollectionPage.c"
+#line 3235 "CollectionPage.c"
 }
 
 
@@ -3274,162 +3253,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_;
 	gchar* _tmp12_;
 	CheckerboardPageActivator _tmp13_;
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3308 "CollectionPage.c"
+#line 3287 "CollectionPage.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3320 "CollectionPage.c"
+#line 3299 "CollectionPage.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3334 "CollectionPage.c"
+#line 3313 "CollectionPage.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:350: activating %s", _tmp12_);
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_debug ("CollectionPage.vala:345: activating %s", _tmp12_);
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (_tmp12_);
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3350 "CollectionPage.c"
+#line 3329 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_;
 		gboolean _tmp15_;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3361 "CollectionPage.c"
+#line 3340 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_;
 			LibraryWindow* _tmp17_;
 			LibraryPhoto* _tmp18_;
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/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 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3376 "CollectionPage.c"
+#line 3355 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3384 "CollectionPage.c"
+#line 3363 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_;
 			gboolean _tmp22_;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3394 "CollectionPage.c"
+#line 3373 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_;
 				gboolean _tmp24_;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3403 "CollectionPage.c"
+#line 3382 "CollectionPage.c"
 			} else {
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3407 "CollectionPage.c"
+#line 3386 "CollectionPage.c"
 			}
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3411 "CollectionPage.c"
+#line 3390 "CollectionPage.c"
 				LibraryWindow* _tmp25_;
 				LibraryWindow* _tmp26_;
 				LibraryPhoto* _tmp27_;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/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 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3425 "CollectionPage.c"
+#line 3404 "CollectionPage.c"
 			}
 		}
 	}
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3433 "CollectionPage.c"
+#line 3412 "CollectionPage.c"
 }
 
 
@@ -3442,133 +3421,133 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3466 "CollectionPage.c"
+#line 3445 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_;
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 364 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/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 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3489 "CollectionPage.c"
+#line 3468 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_;
 				gboolean _tmp7_ = FALSE;
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 369 "/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 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3500 "CollectionPage.c"
+#line 3479 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3506 "CollectionPage.c"
+#line 3485 "CollectionPage.c"
 			default:
 			{
-#line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3513 "CollectionPage.c"
+#line 3492 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3519 "CollectionPage.c"
+#line 3498 "CollectionPage.c"
 			default:
 			{
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3526 "CollectionPage.c"
+#line 3505 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3532 "CollectionPage.c"
+#line 3511 "CollectionPage.c"
 			default:
 			{
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3539 "CollectionPage.c"
+#line 3518 "CollectionPage.c"
 			}
 		}
 	}
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3549 "CollectionPage.c"
+#line 3528 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_;
 		gboolean _tmp11_;
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/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 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3559 "CollectionPage.c"
+#line 3538 "CollectionPage.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3565 "CollectionPage.c"
+#line 3544 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3572 "CollectionPage.c"
+#line 3551 "CollectionPage.c"
 }
 
 
@@ -3593,552 +3572,530 @@ static void collection_page_real_on_export (MediaPage* base) {
 	gchar* title = NULL;
 	gboolean _tmp16_;
 	ExportDialog* export_dialog = NULL;
-	const gchar* _tmp27_;
-	ExportDialog* _tmp28_;
-	ExportFormatParameters _tmp29_ = {0};
-	gboolean _tmp30_;
+	const gchar* _tmp25_;
+	ExportDialog* _tmp26_;
+	ExportFormatParameters _tmp27_ = {0};
+	gboolean _tmp28_;
 	ExportFormatParameters export_params = {0};
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
-	ExportDialog* _tmp33_;
-	gint _tmp34_ = 0;
-	ScaleConstraint _tmp35_ = 0;
-	gboolean _tmp36_;
+	ExportDialog* _tmp31_;
+	gint _tmp32_ = 0;
+	ScaleConstraint _tmp33_ = 0;
+	gboolean _tmp34_;
 	Scaling scaling = {0};
-	ScaleConstraint _tmp37_;
-	gint _tmp38_;
-	Scaling _tmp39_ = {0};
-	GeeCollection* _tmp40_;
-	gint _tmp41_;
-	gint _tmp42_;
+	ScaleConstraint _tmp35_;
+	gint _tmp36_;
+	Scaling _tmp37_ = {0};
+	GeeCollection* _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
 	GFile* export_dir = NULL;
-	const gchar* _tmp77_;
-	GFile* _tmp78_;
+	const gchar* _tmp75_;
+	GFile* _tmp76_;
+	GFile* _tmp77_;
+	GeeCollection* _tmp78_;
 	GFile* _tmp79_;
-	GeeCollection* _tmp80_;
-	GFile* _tmp81_;
-	Scaling _tmp82_;
-	ExportFormatParameters _tmp83_;
-	Exporter* _tmp84_;
-	Exporter* _tmp85_;
-	ExporterUI* _tmp86_;
-	ExporterUI* _tmp87_;
+	Scaling _tmp80_;
+	ExportFormatParameters _tmp81_;
+	Exporter* _tmp82_;
+	Exporter* _tmp83_;
+	ExporterUI* _tmp84_;
+	ExporterUI* _tmp85_;
 	GError * _inner_error_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3636 "CollectionPage.c"
+#line 3615 "CollectionPage.c"
 	}
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3662 "CollectionPage.c"
+#line 3641 "CollectionPage.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3678 "CollectionPage.c"
+#line 3657 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3685 "CollectionPage.c"
+#line 3664 "CollectionPage.c"
 	}
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3693 "CollectionPage.c"
+#line 3672 "CollectionPage.c"
 		GeeCollection* _tmp14_;
 		ExporterUI* _tmp15_;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/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 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3708 "CollectionPage.c"
+#line 3687 "CollectionPage.c"
 	}
-#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3716 "CollectionPage.c"
-		const gchar* _tmp17_ = NULL;
-		GeeCollection* _tmp18_;
+#line 3695 "CollectionPage.c"
+		GeeCollection* _tmp17_;
+		gint _tmp18_;
 		gint _tmp19_;
-		gint _tmp20_;
-		gchar* _tmp21_;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp18_ = export_list;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp20_ = _tmp19_;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp20_ == 1) {
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp17_ = _ ("Export Photo/Video");
-#line 3732 "CollectionPage.c"
-		} else {
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp17_ = _ ("Export Photos/Videos");
-#line 3736 "CollectionPage.c"
-		}
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp21_ = g_strdup (_tmp17_);
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gchar* _tmp20_;
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp17_ = export_list;
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp18_ = gee_collection_get_size (_tmp17_);
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp19_ = _tmp18_;
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp20_ = g_strdup (ngettext ("Export Photo/Video", "Export Photos/Videos", (gulong) _tmp19_));
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		title = _tmp21_;
-#line 3744 "CollectionPage.c"
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		title = _tmp20_;
+#line 3712 "CollectionPage.c"
 	} else {
-		const gchar* _tmp22_ = NULL;
-		GeeCollection* _tmp23_;
-		gint _tmp24_;
-		gint _tmp25_;
-		gchar* _tmp26_;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp23_ = export_list;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp24_ = gee_collection_get_size (_tmp23_);
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp25_ = _tmp24_;
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp25_ == 1) {
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp22_ = _ ("Export Photo");
-#line 3761 "CollectionPage.c"
-		} else {
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp22_ = _ ("Export Photos");
-#line 3765 "CollectionPage.c"
-		}
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp26_ = g_strdup (_tmp22_);
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		GeeCollection* _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		gchar* _tmp24_;
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp21_ = export_list;
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp22_ = gee_collection_get_size (_tmp21_);
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = _tmp22_;
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp24_ = g_strdup (ngettext ("Export Photo", "Export Photos", (gulong) _tmp23_));
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		title = _tmp26_;
-#line 3773 "CollectionPage.c"
+#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		title = _tmp24_;
+#line 3730 "CollectionPage.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp27_ = title;
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp28_ = export_dialog_new (_tmp27_);
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_object_ref_sink (_tmp28_);
-#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_dialog = _tmp28_;
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp25_ = title;
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp26_ = export_dialog_new (_tmp25_);
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_object_ref_sink (_tmp26_);
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	export_dialog = _tmp26_;
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp28_ = has_some_videos;
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp28_) {
+#line 3744 "CollectionPage.c"
+		ExportFormatParameters _tmp29_ = {0};
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		export_format_parameters_current (&_tmp29_);
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = _tmp29_;
+#line 3750 "CollectionPage.c"
+	} else {
+		ExportFormatParameters _tmp30_ = {0};
+#line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		export_format_parameters_last (&_tmp30_);
+#line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = _tmp30_;
+#line 3757 "CollectionPage.c"
+	}
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	export_params = _tmp27_;
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp30_ = has_some_videos;
+	_tmp31_ = export_dialog;
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp30_) {
-#line 3787 "CollectionPage.c"
-		ExportFormatParameters _tmp31_ = {0};
+	_tmp34_ = export_dialog_execute (_tmp31_, &_tmp32_, &_tmp33_, &export_params);
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		export_format_parameters_current (&_tmp31_);
+	scale = _tmp32_;
 #line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp29_ = _tmp31_;
-#line 3793 "CollectionPage.c"
-	} else {
-		ExportFormatParameters _tmp32_ = {0};
+	constraint = _tmp33_;
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp34_) {
 #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		export_format_parameters_last (&_tmp32_);
+		_g_object_unref0 (export_dialog);
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (title);
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (export_list);
 #line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp29_ = _tmp32_;
-#line 3800 "CollectionPage.c"
+		return;
+#line 3779 "CollectionPage.c"
 	}
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_params = _tmp29_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp33_ = export_dialog;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp36_ = export_dialog_execute (_tmp33_, &_tmp34_, &_tmp35_, &export_params);
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scale = _tmp34_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	constraint = _tmp35_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp36_) {
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp35_ = constraint;
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp36_ = scale;
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	scaling_for_constraint (_tmp35_, _tmp36_, FALSE, &_tmp37_);
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	scaling = _tmp37_;
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (export_dialog);
+	_tmp38_ = export_list;
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (title);
+	_tmp39_ = gee_collection_get_size (_tmp38_);
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (export_list);
+	_tmp40_ = _tmp39_;
 #line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		return;
-#line 3822 "CollectionPage.c"
-	}
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp37_ = constraint;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_ = scale;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scaling_for_constraint (_tmp37_, _tmp38_, FALSE, &_tmp39_);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	scaling = _tmp39_;
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp40_ = export_list;
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_ = gee_collection_get_size (_tmp40_);
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp42_ = _tmp41_;
-#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp42_ == 1) {
-#line 3840 "CollectionPage.c"
+	if (_tmp40_ == 1) {
+#line 3797 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
-		LibraryPhoto* _tmp51_;
-		ExportFormatParameters _tmp52_;
-		gchar* _tmp53_;
-		gchar* _tmp54_;
+		LibraryPhoto* _tmp49_;
+		ExportFormatParameters _tmp50_;
+		gchar* _tmp51_;
+		gchar* _tmp52_;
+		GFile* _tmp53_;
+		GFile* _tmp54_;
 		GFile* _tmp55_;
-		GFile* _tmp56_;
-		GFile* _tmp57_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3852 "CollectionPage.c"
+#line 3809 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
-			GeeCollection* _tmp43_;
-			GeeIterator* _tmp44_;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp43_ = export_list;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp44_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_p_it = _tmp44_;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			GeeCollection* _tmp41_;
+			GeeIterator* _tmp42_;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp41_ = export_list;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_p_it = _tmp42_;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3865 "CollectionPage.c"
-				GeeIterator* _tmp45_;
-				gboolean _tmp46_;
+#line 3822 "CollectionPage.c"
+				GeeIterator* _tmp43_;
+				gboolean _tmp44_;
 				LibraryPhoto* p = NULL;
-				GeeIterator* _tmp47_;
-				gpointer _tmp48_;
-				LibraryPhoto* _tmp49_;
-				LibraryPhoto* _tmp50_;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp45_ = _p_it;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp46_ = gee_iterator_next (_tmp45_);
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				if (!_tmp46_) {
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				GeeIterator* _tmp45_;
+				gpointer _tmp46_;
+				LibraryPhoto* _tmp47_;
+				LibraryPhoto* _tmp48_;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp43_ = _p_it;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp44_ = gee_iterator_next (_tmp43_);
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				if (!_tmp44_) {
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3881 "CollectionPage.c"
+#line 3838 "CollectionPage.c"
 				}
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp47_ = _p_it;
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp48_ = gee_iterator_get (_tmp47_);
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				p = (LibraryPhoto*) _tmp48_;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp49_ = p;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp50_ = _g_object_ref0 (_tmp49_);
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp45_ = _p_it;
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp46_ = gee_iterator_get (_tmp45_);
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				p = (LibraryPhoto*) _tmp46_;
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp47_ = p;
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				_tmp48_ = _g_object_ref0 (_tmp47_);
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				photo = _tmp50_;
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+				photo = _tmp48_;
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3901 "CollectionPage.c"
+#line 3858 "CollectionPage.c"
 			}
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3905 "CollectionPage.c"
+#line 3862 "CollectionPage.c"
 		}
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp51_ = photo;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp52_ = export_params;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp53_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo), &_tmp52_);
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp49_ = photo;
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp50_ = export_params;
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp51_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO, Photo), &_tmp50_);
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp52_ = _tmp51_;
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp53_ = export_ui_choose_file (_tmp52_);
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp53_;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp55_ = export_ui_choose_file (_tmp54_);
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp56_ = _tmp55_;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp54_);
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		save_as = _tmp56_;
-#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp57_ = save_as;
-#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp57_ == NULL) {
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (_tmp52_);
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		save_as = _tmp54_;
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp55_ = save_as;
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		if (_tmp55_ == NULL) {
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 3939 "CollectionPage.c"
+#line 3896 "CollectionPage.c"
 		}
 		{
-			AppWindow* _tmp58_;
-			AppWindow* _tmp59_;
-			LibraryPhoto* _tmp60_;
-			GFile* _tmp61_;
-			Scaling _tmp62_;
-			ExportFormatParameters _tmp63_;
-			JpegQuality _tmp64_;
-			LibraryPhoto* _tmp65_;
+			AppWindow* _tmp56_;
+			AppWindow* _tmp57_;
+			LibraryPhoto* _tmp58_;
+			GFile* _tmp59_;
+			Scaling _tmp60_;
+			ExportFormatParameters _tmp61_;
+			JpegQuality _tmp62_;
+			LibraryPhoto* _tmp63_;
+			ExportFormatParameters _tmp64_;
+			PhotoFileFormat _tmp65_;
 			ExportFormatParameters _tmp66_;
-			PhotoFileFormat _tmp67_;
+			ExportFormatMode _tmp67_;
 			ExportFormatParameters _tmp68_;
-			ExportFormatMode _tmp69_;
-			ExportFormatParameters _tmp70_;
-			gboolean _tmp71_;
-			AppWindow* _tmp72_;
-			AppWindow* _tmp73_;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp58_ = app_window_get_instance ();
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp59_ = _tmp58_;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_PAGE_WINDOW, PageWindow));
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp59_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp60_ = photo;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp61_ = save_as;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp62_ = scaling;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp63_ = export_params;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp64_ = _tmp63_.quality;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp65_ = photo;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			gboolean _tmp69_;
+			AppWindow* _tmp70_;
+			AppWindow* _tmp71_;
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp56_ = app_window_get_instance ();
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp57_ = _tmp56_;
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PAGE_WINDOW, PageWindow));
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_g_object_unref0 (_tmp57_);
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp58_ = photo;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp59_ = save_as;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp60_ = scaling;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp61_ = export_params;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp62_ = _tmp61_.quality;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp63_ = photo;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp64_ = export_params;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp65_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PHOTO, Photo), &_tmp64_);
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = export_params;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp67_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_PHOTO, Photo), &_tmp66_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp67_ = _tmp66_.mode;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = export_params;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp69_ = _tmp68_.mode;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp70_ = export_params;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp71_ = _tmp70_.export_metadata;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO, Photo), _tmp61_, &_tmp62_, _tmp64_, _tmp67_, _tmp69_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp71_, &_inner_error_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp69_ = _tmp68_.export_metadata;
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_PHOTO, Photo), _tmp59_, &_tmp60_, _tmp62_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_, &_inner_error_);
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3994 "CollectionPage.c"
-				goto __catch234_g_error;
+#line 3951 "CollectionPage.c"
+				goto __catch245_g_error;
 			}
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp72_ = app_window_get_instance ();
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp73_ = _tmp72_;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow));
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp73_);
-#line 4005 "CollectionPage.c"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp70_ = app_window_get_instance ();
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp71_ = _tmp70_;
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PAGE_WINDOW, PageWindow));
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_g_object_unref0 (_tmp71_);
+#line 3962 "CollectionPage.c"
 		}
-		goto __finally234;
-		__catch234_g_error:
+		goto __finally245;
+		__catch245_g_error:
 		{
 			GError* err = NULL;
-			AppWindow* _tmp74_;
-			AppWindow* _tmp75_;
-			GFile* _tmp76_;
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			AppWindow* _tmp72_;
+			AppWindow* _tmp73_;
+			GFile* _tmp74_;
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp74_ = app_window_get_instance ();
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp75_ = _tmp74_;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PAGE_WINDOW, PageWindow));
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_g_object_unref0 (_tmp75_);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp76_ = save_as;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			export_error_dialog (_tmp76_, FALSE);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp72_ = app_window_get_instance ();
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp73_ = _tmp72_;
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow));
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_g_object_unref0 (_tmp73_);
+#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			_tmp74_ = save_as;
+#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			export_error_dialog (_tmp74_, FALSE);
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4032 "CollectionPage.c"
+#line 3989 "CollectionPage.c"
 		}
-		__finally234:
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		__finally245:
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/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 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4053 "CollectionPage.c"
+#line 4010 "CollectionPage.c"
 		}
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4067 "CollectionPage.c"
+#line 4024 "CollectionPage.c"
 	}
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp77_ = title;
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp78_ = export_ui_choose_dir (_tmp77_);
-#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	export_dir = _tmp78_;
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp79_ = export_dir;
-#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp79_ == NULL) {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp75_ = title;
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp76_ = export_ui_choose_dir (_tmp75_);
+#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	export_dir = _tmp76_;
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp77_ = export_dir;
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp77_ == NULL) {
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4089 "CollectionPage.c"
+#line 4046 "CollectionPage.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp80_ = export_list;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp81_ = export_dir;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp82_ = scaling;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp83_ = export_params;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp84_ = exporter_new (_tmp80_, _tmp81_, &_tmp82_, &_tmp83_, FALSE);
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp85_ = _tmp84_;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp86_ = exporter_ui_new (_tmp85_);
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp78_ = export_list;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp79_ = export_dir;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp80_ = scaling;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp81_ = export_params;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp82_ = exporter_new (_tmp78_, _tmp79_, &_tmp80_, &_tmp81_, FALSE);
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp83_ = _tmp82_;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp84_ = exporter_ui_new (_tmp83_);
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	self->priv->exporter = _tmp86_;
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_g_object_unref0 (_tmp85_);
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp87_ = self->priv->exporter;
-#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	exporter_ui_export (_tmp87_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	self->priv->exporter = _tmp84_;
+#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_g_object_unref0 (_tmp83_);
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp85_ = self->priv->exporter;
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	exporter_ui_export (_tmp85_, _collection_page_on_export_completed_exporter_completion_callback, self);
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4123 "CollectionPage.c"
+#line 4080 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4134 "CollectionPage.c"
+#line 4091 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4142 "CollectionPage.c"
+#line 4099 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_;
@@ -4150,31 +4107,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _source_index = 0;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4178 "CollectionPage.c"
+#line 4135 "CollectionPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -4187,107 +4144,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4203 "CollectionPage.c"
+#line 4160 "CollectionPage.c"
 			}
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4223 "CollectionPage.c"
+#line 4180 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_;
 				gboolean _tmp19_;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4235 "CollectionPage.c"
+#line 4192 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_;
 					gboolean _tmp21_;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4245 "CollectionPage.c"
+#line 4202 "CollectionPage.c"
 				}
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4249 "CollectionPage.c"
+#line 4206 "CollectionPage.c"
 			} else {
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4253 "CollectionPage.c"
+#line 4210 "CollectionPage.c"
 			}
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4267 "CollectionPage.c"
+#line 4224 "CollectionPage.c"
 			}
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4273 "CollectionPage.c"
+#line 4230 "CollectionPage.c"
 		}
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4277 "CollectionPage.c"
+#line 4234 "CollectionPage.c"
 	}
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4283 "CollectionPage.c"
+#line 4240 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4291 "CollectionPage.c"
+#line 4248 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_;
@@ -4299,31 +4256,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _source_index = 0;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4327 "CollectionPage.c"
+#line 4284 "CollectionPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -4336,82 +4293,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4352 "CollectionPage.c"
+#line 4309 "CollectionPage.c"
 			}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4372 "CollectionPage.c"
+#line 4329 "CollectionPage.c"
 				LibraryPhoto* _tmp17_;
 				gboolean _tmp18_;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4381 "CollectionPage.c"
+#line 4338 "CollectionPage.c"
 			} else {
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4385 "CollectionPage.c"
+#line 4342 "CollectionPage.c"
 			}
-#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4399 "CollectionPage.c"
+#line 4356 "CollectionPage.c"
 			}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4405 "CollectionPage.c"
+#line 4362 "CollectionPage.c"
 		}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4409 "CollectionPage.c"
+#line 4366 "CollectionPage.c"
 	}
-#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4415 "CollectionPage.c"
+#line 4372 "CollectionPage.c"
 }
 
 
@@ -4430,55 +4387,55 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	RotateMultipleCommand* _tmp12_;
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4450 "CollectionPage.c"
+#line 4407 "CollectionPage.c"
 	}
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = 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, _ ("Rotating"), _ ("Undoing Rotate"));
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4482 "CollectionPage.c"
+#line 4439 "CollectionPage.c"
 }
 
 
@@ -4487,40 +4444,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_;
 	gint _tmp2_;
 	gboolean _tmp3_;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4505 "CollectionPage.c"
+#line 4462 "CollectionPage.c"
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
 		GeeList* _tmp6_;
 		GeeCollection* _tmp7_;
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4524 "CollectionPage.c"
+#line 4481 "CollectionPage.c"
 	}
 }
 
@@ -4540,55 +4497,55 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	RotateMultipleCommand* _tmp12_;
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4560 "CollectionPage.c"
+#line 4517 "CollectionPage.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = 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, _ ("Rotating"), _ ("Undoing Rotate"));
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4592 "CollectionPage.c"
+#line 4549 "CollectionPage.c"
 }
 
 
@@ -4607,55 +4564,55 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	RotateMultipleCommand* _tmp12_;
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4627 "CollectionPage.c"
+#line 4584 "CollectionPage.c"
 	}
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally"));
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4659 "CollectionPage.c"
+#line 4616 "CollectionPage.c"
 }
 
 
@@ -4674,55 +4631,55 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	RotateMultipleCommand* _tmp12_;
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4694 "CollectionPage.c"
+#line 4651 "CollectionPage.c"
 	}
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically"));
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4726 "CollectionPage.c"
+#line 4683 "CollectionPage.c"
 }
 
 
@@ -4742,29 +4699,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_;
 	CommandManager* _tmp34_;
 	RevertMultipleCommand* _tmp35_;
-#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4762 "CollectionPage.c"
+#line 4719 "CollectionPage.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4768 "CollectionPage.c"
+#line 4725 "CollectionPage.c"
 		AppWindow* _tmp5_;
 		AppWindow* _tmp6_;
 		ViewCollection* _tmp7_;
@@ -4773,33 +4730,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_;
 		gboolean _tmp11_;
 		gboolean _tmp12_;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4803 "CollectionPage.c"
+#line 4760 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -4812,31 +4769,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_;
 			gint _tmp19_;
 			gint _object_index = 0;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4840 "CollectionPage.c"
+#line 4797 "CollectionPage.c"
 				gint _tmp20_;
 				gint _tmp21_;
 				gint _tmp22_;
@@ -4845,72 +4802,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_;
 				gpointer _tmp25_;
 				DataObject* _tmp26_;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4861 "CollectionPage.c"
+#line 4818 "CollectionPage.c"
 				}
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4877 "CollectionPage.c"
+#line 4834 "CollectionPage.c"
 			}
-#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4881 "CollectionPage.c"
+#line 4838 "CollectionPage.c"
 		}
 	}
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4914 "CollectionPage.c"
+#line 4871 "CollectionPage.c"
 }
 
 
@@ -4929,57 +4886,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_;
 	PixelTransformationBundle* _tmp11_;
 	PixelTransformationBundle* _tmp12_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4949 "CollectionPage.c"
+#line 4906 "CollectionPage.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
 #line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
+#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 4983 "CollectionPage.c"
+#line 4940 "CollectionPage.c"
 }
 
 
@@ -5002,78 +4959,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_;
 	CommandManager* _tmp15_;
 	AdjustColorsMultipleCommand* _tmp16_;
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5026 "CollectionPage.c"
+#line 4983 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5033 "CollectionPage.c"
+#line 4990 "CollectionPage.c"
 	}
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5041 "CollectionPage.c"
+#line 4998 "CollectionPage.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/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 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5077 "CollectionPage.c"
+#line 5034 "CollectionPage.c"
 }
 
 
@@ -5092,55 +5049,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	EnhanceMultipleCommand* _tmp12_;
-#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5112 "CollectionPage.c"
+#line 5069 "CollectionPage.c"
 	}
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_command_manager_unref0 (_tmp11_);
 #line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_command_manager_unref0 (_tmp11_);
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5144 "CollectionPage.c"
+#line 5101 "CollectionPage.c"
 }
 
 
@@ -5159,55 +5116,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	DuplicateMultiplePhotosCommand* _tmp12_;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5179 "CollectionPage.c"
+#line 5136 "CollectionPage.c"
 	}
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5211 "CollectionPage.c"
+#line 5168 "CollectionPage.c"
 }
 
 
@@ -5242,29 +5199,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_;
-#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5262 "CollectionPage.c"
+#line 5219 "CollectionPage.c"
 	}
-#line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5268 "CollectionPage.c"
+#line 5225 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_;
@@ -5276,31 +5233,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_;
 		gint _tmp10_;
 		gint _dv_index = 0;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5304 "CollectionPage.c"
+#line 5261 "CollectionPage.c"
 			gint _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
@@ -5312,109 +5269,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_;
 			DataSource* _tmp19_;
 			gboolean _tmp20_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5328 "CollectionPage.c"
+#line 5285 "CollectionPage.c"
 			}
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5352 "CollectionPage.c"
+#line 5309 "CollectionPage.c"
 			} else {
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5356 "CollectionPage.c"
+#line 5313 "CollectionPage.c"
 			}
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5360 "CollectionPage.c"
+#line 5317 "CollectionPage.c"
 		}
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5364 "CollectionPage.c"
+#line 5321 "CollectionPage.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5418 "CollectionPage.c"
+#line 5375 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_;
 		ViewCollection* _tmp41_;
@@ -5428,49 +5385,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_;
 		CommandManager* _tmp50_;
 		AdjustDateTimePhotosCommand* _tmp51_;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/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 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5468 "CollectionPage.c"
+#line 5425 "CollectionPage.c"
 	}
-#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5474 "CollectionPage.c"
+#line 5431 "CollectionPage.c"
 }
 
 
@@ -5487,122 +5444,122 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_;
 	Photo* _tmp9_;
 	GError * _inner_error_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5507 "CollectionPage.c"
+#line 5464 "CollectionPage.c"
 	}
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5527 "CollectionPage.c"
+#line 5484 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_;
 		AppWindow* _tmp11_;
 		Photo* _tmp12_;
 		AppWindow* _tmp13_;
 		AppWindow* _tmp14_;
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5548 "CollectionPage.c"
-			goto __catch235_g_error;
+#line 5505 "CollectionPage.c"
+			goto __catch246_g_error;
 		}
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5559 "CollectionPage.c"
+#line 5516 "CollectionPage.c"
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally246;
+	__catch246_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_;
 		AppWindow* _tmp16_;
 		GError* _tmp17_;
 		Photo* _tmp18_;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5589 "CollectionPage.c"
+#line 5546 "CollectionPage.c"
 	}
-	__finally235:
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally246:
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/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 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5602 "CollectionPage.c"
+#line 5559 "CollectionPage.c"
 	}
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5606 "CollectionPage.c"
+#line 5563 "CollectionPage.c"
 }
 
 
@@ -5621,53 +5578,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_;
 	PhotoFileFormat _tmp11_;
 	GError * _inner_error_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5641 "CollectionPage.c"
+#line 5598 "CollectionPage.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5671 "CollectionPage.c"
+#line 5628 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_;
@@ -5675,35 +5632,35 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_;
 		AppWindow* _tmp15_;
 		AppWindow* _tmp16_;
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5693 "CollectionPage.c"
-			goto __catch236_g_error;
+#line 5650 "CollectionPage.c"
+			goto __catch247_g_error;
 		}
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5704 "CollectionPage.c"
+#line 5661 "CollectionPage.c"
 	}
-	goto __finally236;
-	__catch236_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_;
@@ -5711,48 +5668,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_;
 		gchar* _tmp20_;
 		gchar* _tmp21_;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5739 "CollectionPage.c"
+#line 5696 "CollectionPage.c"
 	}
-	__finally236:
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally247:
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/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 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5752 "CollectionPage.c"
+#line 5709 "CollectionPage.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5756 "CollectionPage.c"
+#line 5713 "CollectionPage.c"
 }
 
 
@@ -5769,60 +5726,60 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/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 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5803 "CollectionPage.c"
+#line 5760 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_;
 		SetBackgroundPhotoDialog* _tmp10_;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_object_ref_sink (_tmp9_);
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5826 "CollectionPage.c"
+#line 5783 "CollectionPage.c"
 			AppWindow* _tmp14_;
 			AppWindow* _tmp15_;
 			GeeArrayList* _tmp16_;
@@ -5832,54 +5789,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_;
 			AppWindow* _tmp21_;
 			AppWindow* _tmp22_;
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/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 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5866 "CollectionPage.c"
+#line 5823 "CollectionPage.c"
 		}
-#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (dialog);
-#line 5870 "CollectionPage.c"
+#line 5827 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_;
 		gint _tmp24_;
 		gint _tmp25_;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5883 "CollectionPage.c"
+#line 5840 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_;
 			gint delay = 0;
@@ -5888,25 +5845,25 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_object_ref_sink (_tmp26_);
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 5910 "CollectionPage.c"
+#line 5867 "CollectionPage.c"
 				AppWindow* _tmp32_;
 				AppWindow* _tmp33_;
 				GeeArrayList* _tmp34_;
@@ -5915,42 +5872,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_;
 				AppWindow* _tmp38_;
 				AppWindow* _tmp39_;
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/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 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 5945 "CollectionPage.c"
+#line 5902 "CollectionPage.c"
 			}
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dialog);
-#line 5949 "CollectionPage.c"
+#line 5906 "CollectionPage.c"
 		}
 	}
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 5954 "CollectionPage.c"
+#line 5911 "CollectionPage.c"
 }
 
 
@@ -5990,205 +5947,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_;
 	SlideshowPage* _tmp39_;
 	SlideshowPage* _tmp40_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6010 "CollectionPage.c"
+#line 5967 "CollectionPage.c"
 	}
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6024 "CollectionPage.c"
+#line 5981 "CollectionPage.c"
 		ViewCollection* _tmp9_;
 		ViewCollection* _tmp10_;
 		GeeList* _tmp11_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6040 "CollectionPage.c"
+#line 5997 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
 		GeeList* _tmp14_;
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6057 "CollectionPage.c"
+#line 6014 "CollectionPage.c"
 	}
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6069 "CollectionPage.c"
+#line 6026 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_;
 		gint _tmp19_;
 		gint _tmp20_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6082 "CollectionPage.c"
+#line 6039 "CollectionPage.c"
 	}
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6092 "CollectionPage.c"
+#line 6049 "CollectionPage.c"
 	}
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6126 "CollectionPage.c"
+#line 6083 "CollectionPage.c"
 	}
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6138 "CollectionPage.c"
+#line 6095 "CollectionPage.c"
 	}
-#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6156 "CollectionPage.c"
+#line 6113 "CollectionPage.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/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 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6192 "CollectionPage.c"
+#line 6149 "CollectionPage.c"
 }
 
 
@@ -6202,49 +6159,49 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	GtkToolButton* _tmp3_;
 	GdkEventKey* _tmp7_;
 	gboolean _tmp8_;
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/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 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6220 "CollectionPage.c"
+#line 6177 "CollectionPage.c"
 		GtkToolButton* _tmp4_;
 		GtkToolButton* _tmp5_;
 		GtkToolButton* _tmp6_;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 704 "/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 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/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 6236 "CollectionPage.c"
+#line 6193 "CollectionPage.c"
 	}
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/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 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6248 "CollectionPage.c"
+#line 6205 "CollectionPage.c"
 }
 
 
@@ -6258,56 +6215,56 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	GtkToolButton* _tmp3_;
 	GdkEventKey* _tmp7_;
 	gboolean _tmp8_;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/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 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6276 "CollectionPage.c"
+#line 6233 "CollectionPage.c"
 		GtkToolButton* _tmp4_;
 		GtkToolButton* _tmp5_;
 		GtkToolButton* _tmp6_;
-#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 715 "/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 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
-#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 717 "/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 6292 "CollectionPage.c"
+#line 6249 "CollectionPage.c"
 	}
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/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 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6304 "CollectionPage.c"
+#line 6261 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6311 "CollectionPage.c"
+#line 6268 "CollectionPage.c"
 }
 
 
@@ -6316,17 +6273,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_;
 	SearchViewFilter* _tmp1_;
-#line 728 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6330 "CollectionPage.c"
+#line 6287 "CollectionPage.c"
 }
 
 
@@ -6339,7 +6296,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 6343 "CollectionPage.c"
+#line 6300 "CollectionPage.c"
 }
 
 
@@ -6349,14 +6306,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 6353 "CollectionPage.c"
+#line 6310 "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 6360 "CollectionPage.c"
+#line 6317 "CollectionPage.c"
 }
 
 
@@ -6365,7 +6322,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 = (guint (*) (SearchViewFilter *)) collection_page_collection_search_view_filter_real_get_criteria;
-#line 6369 "CollectionPage.c"
+#line 6326 "CollectionPage.c"
 }
 
 
@@ -6418,7 +6375,7 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 6422 "CollectionPage.c"
+#line 6379 "CollectionPage.c"
 }
 
 
@@ -6432,7 +6389,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 6436 "CollectionPage.c"
+#line 6393 "CollectionPage.c"
 }
 
 
@@ -6446,7 +6403,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 6450 "CollectionPage.c"
+#line 6407 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 3434b13..2b308b9 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -132,7 +132,7 @@ public abstract class CollectionPage : MediaPage {
     private static InjectionGroup create_photos_menu_date_injectables() {
         InjectionGroup group = new InjectionGroup("PhotosExtrasDateTimePlaceholder");
         
-        group.add_menu_item(_("Adjust Date and Time…"), "AdjustDateTime");
+        group.add_menu_item(_("Adjust Date and Time…"), "AdjustDateTime", "F4");
         
         return group;
     }
@@ -217,14 +217,10 @@ public abstract class CollectionPage : MediaPage {
     protected override void init_actions(int selected_count, int count) {
         base.init_actions(selected_count, count);
         
-        set_action_short_label("RotateClockwise", Resources.ROTATE_CW_LABEL);
-        set_action_short_label("RotateCounterclockwise", Resources.ROTATE_CCW_LABEL);
-        set_action_short_label("Publish", Resources.PUBLISH_LABEL);
-        
-        set_action_important("RotateClockwise", true);
-        set_action_important("RotateCounterclockwise", true);
-        set_action_important("Enhance", true);
-        set_action_important("Publish", true);
+        set_action_sensitive("RotateClockwise", true);
+        set_action_sensitive("RotateCounterclockwise", true);
+        set_action_sensitive("Enhance", true);
+        set_action_sensitive("Publish", true);
     }
     
     protected override void update_actions(int selected_count, int count) {
@@ -249,10 +245,9 @@ public abstract class CollectionPage : MediaPage {
         // don't allow duplication of the selection if it contains a video -- videos are huge and
         // and they're not editable anyway, so there seems to be no use case for duplicating them
         set_action_sensitive("Duplicate", has_selected && (!selection_has_videos));
-        set_action_visible("ExternalEdit", (!primary_is_video));
         set_action_sensitive("ExternalEdit", 
-            one_selected && !is_string_empty(Config.Facade.get_instance().get_external_photo_app()));
-        set_action_visible("ExternalEditRAW",
+            (!primary_is_video) && one_selected && !is_string_empty(Config.Facade.get_instance().get_external_photo_app()));
+        set_action_sensitive("ExternalEditRAW",
             one_selected && (!primary_is_video)
             && ((Photo) get_view().get_selected_at(0).get_source()).get_master_file_format() == 
                 PhotoFileFormat.RAW
@@ -412,9 +407,9 @@ public abstract class CollectionPage : MediaPage {
 
         string title = null;
         if (has_some_videos)
-            title = (export_list.size == 1) ? _("Export Photo/Video") : _("Export Photos/Videos");
+            title = ngettext("Export Photo/Video", "Export Photos/Videos", export_list.size);
         else
-            title = (export_list.size == 1) ?  _("Export Photo") : _("Export Photos");
+            title = ngettext("Export Photo", "Export Photos", export_list.size);
         ExportDialog export_dialog = new ExportDialog(title);
 
         // Setting up the parameters object requires a bit of thinking about what the user wants.
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 2297f3f..0cbc2d6 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -189,6 +189,11 @@ typedef struct _SaturationTransformationPrivate SaturationTransformationPrivate;
 typedef struct _ExposureTransformationPrivate ExposureTransformationPrivate;
 typedef struct _ContrastTransformationPrivate ContrastTransformationPrivate;
 typedef struct _PixelTransformerPrivate PixelTransformerPrivate;
+typedef struct _Block1Data Block1Data;
+typedef struct _Block2Data Block2Data;
+#define _g_thread_unref0(var) ((var == NULL) ? NULL : (var = (g_thread_unref (var), NULL)))
+typedef struct _Block3Data Block3Data;
+typedef struct _Block4Data Block4Data;
 typedef struct _ParamSpecPixelTransformer ParamSpecPixelTransformer;
 
 #define TYPE_RGB_HISTOGRAM (rgb_histogram_get_type ())
@@ -250,7 +255,8 @@ struct _HSVAnalyticPixel {
 
 typedef enum  {
 	COMPOSITION_MODE_NONE,
-	COMPOSITION_MODE_RGB_MATRIX
+	COMPOSITION_MODE_RGB_MATRIX,
+	COMPOSITION_MODE_HSV_LOOKUP
 } CompositionMode;
 
 typedef enum  {
@@ -297,7 +303,6 @@ struct _PixelTransformation {
 struct _PixelTransformationClass {
 	GTypeClass parent_class;
 	void (*finalize) (PixelTransformation *self);
-	PixelFormat (*get_preferred_format) (PixelTransformation* self);
 	CompositionMode (*get_composition_mode) (PixelTransformation* self);
 	void (*compose_with) (PixelTransformation* self, PixelTransformation* other);
 	gboolean (*is_identity) (PixelTransformation* self);
@@ -309,6 +314,7 @@ struct _PixelTransformationClass {
 
 struct _PixelTransformationPrivate {
 	PixelTransformationType type;
+	PixelFormat preferred_format;
 };
 
 struct _ParamSpecPixelTransformation {
@@ -330,6 +336,7 @@ struct _RGBTransformationClass {
 struct _HSVTransformation {
 	PixelTransformation parent_instance;
 	HSVTransformationPrivate * priv;
+	gfloat remap_table[256];
 };
 
 struct _HSVTransformationClass {
@@ -405,6 +412,9 @@ struct _PixelTransformer {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
 	PixelTransformerPrivate * priv;
+	PixelTransformation** optimized_transformations;
+	gint optimized_transformations_length1;
+	gint optimized_slots_used;
 };
 
 struct _PixelTransformerClass {
@@ -414,10 +424,49 @@ struct _PixelTransformerClass {
 
 struct _PixelTransformerPrivate {
 	GeeArrayList* transformations;
-	PixelTransformation** optimized_transformations;
-	gint optimized_transformations_length1;
-	gint _optimized_transformations_size_;
-	gint optimized_slots_used;
+};
+
+struct _Block1Data {
+	int _ref_count_;
+	PixelTransformer* self;
+	gint dest_width;
+	gint dest_num_channels;
+	gint dest_rowstride;
+	guchar* dest_pixels;
+	gint dest_pixels_length1;
+	gint _dest_pixels_size_;
+	gfloat* cache;
+	gint cache_length1;
+	gint _cache_size_;
+};
+
+struct _Block2Data {
+	int _ref_count_;
+	Block1Data * _data1_;
+	guint row;
+	guint slice_height;
+};
+
+struct _Block3Data {
+	int _ref_count_;
+	PixelTransformer* self;
+	gint n_channels;
+	gint rowstride;
+	gint rowbytes;
+	guchar* source_pixels;
+	gint source_pixels_length1;
+	gint _source_pixels_size_;
+	guchar* dest_pixels;
+	gint dest_pixels_length1;
+	gint _dest_pixels_size_;
+	GCancellable* cancellable;
+};
+
+struct _Block4Data {
+	int _ref_count_;
+	Block3Data * _data3_;
+	guint row;
+	guint slice_height;
 };
 
 struct _ParamSpecPixelTransformer {
@@ -498,9 +547,6 @@ struct _ExpansionTransformationClass {
 };
 
 struct _ExpansionTransformationPrivate {
-	gfloat* remap_table;
-	gint remap_table_length1;
-	gint _remap_table_size_;
 	gint low_kink;
 	gint high_kink;
 };
@@ -516,9 +562,6 @@ struct _ShadowDetailTransformationClass {
 
 struct _ShadowDetailTransformationPrivate {
 	gfloat intensity;
-	gfloat* remap_table;
-	gint remap_table_length1;
-	gint _remap_table_size_;
 };
 
 struct _HermiteGammaApproximationFunction {
@@ -552,9 +595,6 @@ struct _HighlightDetailTransformationClass {
 
 struct _HighlightDetailTransformationPrivate {
 	gfloat intensity;
-	gfloat* remap_table;
-	gint remap_table_length1;
-	gint _remap_table_size_;
 };
 
 
@@ -704,9 +744,8 @@ static void pixel_transformation_bundle_finalize (PixelTransformationBundle * ob
 enum  {
 	PIXEL_TRANSFORMATION_DUMMY_PROPERTY
 };
-PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type);
+PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format);
 PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self);
-static PixelFormat pixel_transformation_real_get_preferred_format (PixelTransformation* self);
 CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self);
 static CompositionMode pixel_transformation_real_get_composition_mode (PixelTransformation* self);
 void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other);
@@ -726,7 +765,6 @@ enum  {
 #define RGB_TRANSFORMATION_MATRIX_SIZE 16
 RGBTransformation* rgb_transformation_new (PixelTransformationType type);
 RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type);
-static PixelFormat rgb_transformation_real_get_preferred_format (PixelTransformation* base);
 static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransformation* base);
 static void rgb_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other);
 static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* p, HSVAnalyticPixel* result);
@@ -738,8 +776,11 @@ enum  {
 	HSV_TRANSFORMATION_DUMMY_PROPERTY
 };
 HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type);
-static PixelFormat hsv_transformation_real_get_preferred_format (PixelTransformation* base);
+static CompositionMode hsv_transformation_real_get_composition_mode (PixelTransformation* base);
 static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
+static void hsv_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other);
+static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
+static void hsv_transformation_finalize (PixelTransformation * obj);
 #define TINT_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TINT_TRANSFORMATION, TintTransformationPrivate))
 enum  {
 	TINT_TRANSFORMATION_DUMMY_PROPERTY
@@ -784,12 +825,25 @@ enum  {
 };
 PixelTransformer* pixel_transformer_copy (PixelTransformer* self);
 static void pixel_transformer_build_optimized_transformations (PixelTransformer* self);
-static void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
+void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
 void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim);
 void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
 void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
+void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs);
 void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static Block2Data* block2_data_ref (Block2Data* _data2_);
+static void block2_data_unref (void * _userdata_);
+static void* _____lambda5_ (Block2Data* _data2_);
+static gpointer ______lambda5__gthread_func (gpointer self);
+static Block3Data* block3_data_ref (Block3Data* _data3_);
+static void block3_data_unref (void * _userdata_);
+static Block4Data* block4_data_ref (Block4Data* _data4_);
+static void block4_data_unref (void * _userdata_);
+static void* _____lambda4_ (Block4Data* _data4_);
+void pixel_transformer_apply_transformation (PixelTransformer* self, guint row, gint rowstride, gint rowbytes, gint n_channels, guchar* source_pixels, int source_pixels_length1, guchar* dest_pixels, int dest_pixels_length1);
+static gpointer ______lambda4__gthread_func (gpointer self);
 static void pixel_transformer_finalize (PixelTransformer * obj);
 gpointer rgb_histogram_ref (gpointer instance);
 void rgb_histogram_unref (gpointer instance);
@@ -839,7 +893,6 @@ enum  {
 ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram);
 ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram);
 static void expansion_transformation_build_remap_table (ExpansionTransformation* self);
-static void expansion_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
 static gchar* expansion_transformation_real_to_string (PixelTransformation* base);
 gint expansion_transformation_get_white_point (ExpansionTransformation* self);
 gint expansion_transformation_get_black_point (ExpansionTransformation* self);
@@ -866,7 +919,6 @@ GType hermite_gamma_approximation_function_get_type (void) G_GNUC_CONST;
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper);
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper);
 gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x);
-static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
 static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransformation* base);
 static gboolean shadow_detail_transformation_real_is_identity (PixelTransformation* base);
 static void shadow_detail_transformation_finalize (PixelTransformation * obj);
@@ -885,7 +937,6 @@ enum  {
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_TONAL_WIDTH 1.0f
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f)
 #define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f
-static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result);
 static PixelTransformation* highlight_detail_transformation_real_copy (PixelTransformation* base);
 static gboolean highlight_detail_transformation_real_is_identity (PixelTransformation* base);
 static void highlight_detail_transformation_finalize (PixelTransformation * obj);
@@ -899,6 +950,7 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 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);
 
+const gfloat rgb_lookup_table[256] = {0.0f / 255.0f, 1.0f / 255.0f, 2.0f / 255.0f, 3.0f / 255.0f, 4.0f / 255.0f, 5.0f / 255.0f, 6.0f / 255.0f, 7.0f / 255.0f, 8.0f / 255.0f, 9.0f / 255.0f, 10.0f / 255.0f, 11.0f / 255.0f, 12.0f / 255.0f, 13.0f / 255.0f, 14.0f / 255.0f, 15.0f / 255.0f, 16.0f / 255.0f, 17.0f / 255.0f, 18.0f / 255.0f, 19.0f / 255.0f, 20.0f / 255.0f, 21.0f / 255.0f, 22.0f / 255.0f, 23.0f / 255.0f, 24.0f / 255.0f, 25.0f / 255.0f, 26.0f / 255.0f, 27.0f / 255.0f, 28.0f / 255.0f, 29.0f / 255.0f, 30.0f / 255.0f, 31.0f / 255.0f, 32.0f / 255.0f, 33.0f / 255.0f, 34.0f / 255.0f, 35.0f / 255.0f, 36.0f / 255.0f, 37.0f / 255.0f, 38.0f / 255.0f, 39.0f / 255.0f, 40.0f / 255.0f, 41.0f / 255.0f, 42.0f / 255.0f, 43.0f / 255.0f, 44.0f / 255.0f, 45.0f / 255.0f, 46.0f / 255.0f, 47.0f / 255.0f, 48.0f / 255.0f, 49.0f / 255.0f, 50.0f / 255.0f, 51.0f / 255.0f, 52.0f / 255.0f, 53.0f / 255.0f, 54.0f / 255.0f, 55.0f / 255.0f, 56.0f / 255.0f, 57.0f / 255.0f, 58.0f / 255.0f, 59.0f / 255.0f, 60.0f / 255.0f, 61.0f / 255.0f, 62.0f / 255.0f, 63.0f / 255.0f, 64.0f / 255.0f, 65.0f / 255.0f, 66.0f / 255.0f, 67.0f / 255.0f, 68.0f / 255.0f, 69.0f / 255.0f, 70.0f / 255.0f, 71.0f / 255.0f, 72.0f / 255.0f, 73.0f / 255.0f, 74.0f / 255.0f, 75.0f / 255.0f, 76.0f / 255.0f, 77.0f / 255.0f, 78.0f / 255.0f, 79.0f / 255.0f, 80.0f / 255.0f, 81.0f / 255.0f, 82.0f / 255.0f, 83.0f / 255.0f, 84.0f / 255.0f, 85.0f / 255.0f, 86.0f / 255.0f, 87.0f / 255.0f, 88.0f / 255.0f, 89.0f / 255.0f, 90.0f / 255.0f, 91.0f / 255.0f, 92.0f / 255.0f, 93.0f / 255.0f, 94.0f / 255.0f, 95.0f / 255.0f, 96.0f / 255.0f, 97.0f / 255.0f, 98.0f / 255.0f, 99.0f / 255.0f, 100.0f / 255.0f, 101.0f / 255.0f, 102.0f / 255.0f, 103.0f / 255.0f, 104.0f / 255.0f, 105.0f / 255.0f, 106.0f / 255.0f, 107.0f / 255.0f, 108.0f / 255.0f, 109.0f / 255.0f, 110.0f / 255.0f, 111.0f / 255.0f, 112.0f / 255.0f, 113.0f / 255.0f, 114.0f / 255.0f, 115.0f / 255.0f, 116.0f / 255.0f, 117.0f / 255.0f, 118.0f / 255.0f, 119.0f / 255.0f, 120.0f / 255.0f, 121.0f / 255.0f, 122.0f / 255.0f, 123.0f / 255.0f, 124.0f / 255.0f, 125.0f / 255.0f, 126.0f / 255.0f, 127.0f / 255.0f, 128.0f / 255.0f, 129.0f / 255.0f, 130.0f / 255.0f, 131.0f / 255.0f, 132.0f / 255.0f, 133.0f / 255.0f, 134.0f / 255.0f, 135.0f / 255.0f, 136.0f / 255.0f, 137.0f / 255.0f, 138.0f / 255.0f, 139.0f / 255.0f, 140.0f / 255.0f, 141.0f / 255.0f, 142.0f / 255.0f, 143.0f / 255.0f, 144.0f / 255.0f, 145.0f / 255.0f, 146.0f / 255.0f, 147.0f / 255.0f, 148.0f / 255.0f, 149.0f / 255.0f, 150.0f / 255.0f, 151.0f / 255.0f, 152.0f / 255.0f, 153.0f / 255.0f, 154.0f / 255.0f, 155.0f / 255.0f, 156.0f / 255.0f, 157.0f / 255.0f, 158.0f / 255.0f, 159.0f / 255.0f, 160.0f / 255.0f, 161.0f / 255.0f, 162.0f / 255.0f, 163.0f / 255.0f, 164.0f / 255.0f, 165.0f / 255.0f, 166.0f / 255.0f, 167.0f / 255.0f, 168.0f / 255.0f, 169.0f / 255.0f, 170.0f / 255.0f, 171.0f / 255.0f, 172.0f / 255.0f, 173.0f / 255.0f, 174.0f / 255.0f, 175.0f / 255.0f, 176.0f / 255.0f, 177.0f / 255.0f, 178.0f / 255.0f, 179.0f / 255.0f, 180.0f / 255.0f, 181.0f / 255.0f, 182.0f / 255.0f, 183.0f / 255.0f, 184.0f / 255.0f, 185.0f / 255.0f, 186.0f / 255.0f, 187.0f / 255.0f, 188.0f / 255.0f, 189.0f / 255.0f, 190.0f / 255.0f, 191.0f / 255.0f, 192.0f / 255.0f, 193.0f / 255.0f, 194.0f / 255.0f, 195.0f / 255.0f, 196.0f / 255.0f, 197.0f / 255.0f, 198.0f / 255.0f, 199.0f / 255.0f, 200.0f / 255.0f, 201.0f / 255.0f, 202.0f / 255.0f, 203.0f / 255.0f, 204.0f / 255.0f, 205.0f / 255.0f, 206.0f / 255.0f, 207.0f / 255.0f, 208.0f / 255.0f, 209.0f / 255.0f, 210.0f / 255.0f, 211.0f / 255.0f, 212.0f / 255.0f, 213.0f / 255.0f, 214.0f / 255.0f, 215.0f / 255.0f, 216.0f / 255.0f, 217.0f / 255.0f, 218.0f / 255.0f, 219.0f / 255.0f, 220.0f / 255.0f, 221.0f / 255.0f, 222.0f / 255.0f, 223.0f / 255.0f, 224.0f / 255.0f, 225.0f / 255.0f, 226.0f / 255.0f, 227.0f / 255.0f, 228.0f / 255.0f, 229.0f / 255.0f, 230.0f / 255.0f, 231.0f / 255.0f, 232.0f / 255.0f, 233.0f / 255.0f, 234.0f / 255.0f, 235.0f / 255.0f, 236.0f / 255.0f, 237.0f / 255.0f, 238.0f / 255.0f, 239.0f / 255.0f, 240.0f / 255.0f, 241.0f / 255.0f, 242.0f / 255.0f, 243.0f / 255.0f, 244.0f / 255.0f, 245.0f / 255.0f, 246.0f / 255.0f, 247.0f / 255.0f, 248.0f / 255.0f, 249.0f / 255.0f, 250.0f / 255.0f, 251.0f / 255.0f, 252.0f / 255.0f, 253.0f / 255.0f, 254.0f / 255.0f, 255.0f / 255.0f};
 
 void rgb_analytic_pixel_init (RGBAnalyticPixel *self) {
 #line 14 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
@@ -909,7 +961,7 @@ void rgb_analytic_pixel_init (RGBAnalyticPixel *self) {
 	(*self).green = 0.0f;
 #line 17 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = 0.0f;
-#line 913 "ColorTransformation.c"
+#line 965 "ColorTransformation.c"
 }
 
 
@@ -940,29 +992,38 @@ void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
 #line 24 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = _tmp5_;
-#line 944 "ColorTransformation.c"
+#line 996 "ColorTransformation.c"
 }
 
 
 void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized) {
 	guchar _tmp0_;
-	guchar _tmp1_;
+	gfloat _tmp1_;
 	guchar _tmp2_;
+	gfloat _tmp3_;
+	guchar _tmp4_;
+	gfloat _tmp5_;
 #line 27 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (RGBAnalyticPixel));
 #line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = red_quantized;
 #line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).red = ((gfloat) _tmp0_) * RGB_ANALYTIC_PIXEL_INV_255;
+	_tmp1_ = rgb_lookup_table[_tmp0_];
+#line 29 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	(*self).red = _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = green_quantized;
+	_tmp2_ = green_quantized;
 #line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).green = ((gfloat) _tmp1_) * RGB_ANALYTIC_PIXEL_INV_255;
+	_tmp3_ = rgb_lookup_table[_tmp2_];
+#line 30 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	(*self).green = _tmp3_;
 #line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = blue_quantized;
+	_tmp4_ = blue_quantized;
 #line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).blue = ((gfloat) _tmp2_) * RGB_ANALYTIC_PIXEL_INV_255;
-#line 966 "ColorTransformation.c"
+	_tmp5_ = rgb_lookup_table[_tmp4_];
+#line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	(*self).blue = _tmp5_;
+#line 1027 "ColorTransformation.c"
 }
 
 
@@ -976,8 +1037,6 @@ void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel*
 	RGBAnalyticPixel _tmp5_;
 	gfloat _tmp6_;
 #line 34 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (hsv_pixel != NULL);
-#line 34 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (RGBAnalyticPixel));
 #line 35 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_to_rgb (hsv_pixel, &_tmp0_);
@@ -1001,7 +1060,7 @@ void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel*
 	_tmp6_ = _tmp5_.blue;
 #line 38 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = _tmp6_;
-#line 1005 "ColorTransformation.c"
+#line 1064 "ColorTransformation.c"
 }
 
 
@@ -1014,7 +1073,7 @@ guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1018 "ColorTransformation.c"
+#line 1077 "ColorTransformation.c"
 }
 
 
@@ -1027,7 +1086,7 @@ guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1031 "ColorTransformation.c"
+#line 1090 "ColorTransformation.c"
 }
 
 
@@ -1040,7 +1099,7 @@ guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1044 "ColorTransformation.c"
+#line 1103 "ColorTransformation.c"
 }
 
 
@@ -1059,7 +1118,7 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 	_tmp4_ = (*_tmp3_).red;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 1063 "ColorTransformation.c"
+#line 1122 "ColorTransformation.c"
 		gfloat _tmp5_;
 		RGBAnalyticPixel* _tmp6_;
 		gfloat _tmp7_;
@@ -1071,15 +1130,15 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 		_tmp7_ = (*_tmp6_).green;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp5_ == _tmp7_;
-#line 1075 "ColorTransformation.c"
+#line 1134 "ColorTransformation.c"
 	} else {
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 1079 "ColorTransformation.c"
+#line 1138 "ColorTransformation.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 1083 "ColorTransformation.c"
+#line 1142 "ColorTransformation.c"
 		gfloat _tmp8_;
 		RGBAnalyticPixel* _tmp9_;
 		gfloat _tmp10_;
@@ -1091,17 +1150,17 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 		_tmp10_ = (*_tmp9_).blue;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp8_ == _tmp10_;
-#line 1095 "ColorTransformation.c"
+#line 1154 "ColorTransformation.c"
 	} else {
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 1099 "ColorTransformation.c"
+#line 1158 "ColorTransformation.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1105 "ColorTransformation.c"
+#line 1164 "ColorTransformation.c"
 }
 
 
@@ -1120,7 +1179,7 @@ guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) {
 	result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f));
 #line 58 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1124 "ColorTransformation.c"
+#line 1183 "ColorTransformation.c"
 }
 
 
@@ -1132,7 +1191,7 @@ void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result
 	*result = _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 1136 "ColorTransformation.c"
+#line 1195 "ColorTransformation.c"
 }
 
 
@@ -1144,14 +1203,14 @@ RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self) {
 	memcpy (dup, self, sizeof (RGBAnalyticPixel));
 #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return dup;
-#line 1148 "ColorTransformation.c"
+#line 1207 "ColorTransformation.c"
 }
 
 
 void rgb_analytic_pixel_free (RGBAnalyticPixel* self) {
 #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_free (self);
-#line 1155 "ColorTransformation.c"
+#line 1214 "ColorTransformation.c"
 }
 
 
@@ -1175,7 +1234,7 @@ void hsv_analytic_pixel_init (HSVAnalyticPixel *self) {
 	(*self).saturation = 0.0f;
 #line 77 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = 0.0f;
-#line 1179 "ColorTransformation.c"
+#line 1238 "ColorTransformation.c"
 }
 
 
@@ -1206,541 +1265,38 @@ void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
 #line 84 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = _tmp5_;
-#line 1210 "ColorTransformation.c"
+#line 1269 "ColorTransformation.c"
 }
 
 
 void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized) {
 	guchar _tmp0_;
-	guchar _tmp1_;
+	gfloat _tmp1_;
 	guchar _tmp2_;
+	gfloat _tmp3_;
+	guchar _tmp4_;
+	gfloat _tmp5_;
 #line 87 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	memset (self, 0, sizeof (HSVAnalyticPixel));
 #line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = hue_quantized;
 #line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).hue = ((gfloat) _tmp0_) * HSV_ANALYTIC_PIXEL_INV_255;
+	_tmp1_ = rgb_lookup_table[_tmp0_];
+#line 89 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	(*self).hue = _tmp1_;
+#line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = saturation_quantized;
 #line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = saturation_quantized;
+	_tmp3_ = rgb_lookup_table[_tmp2_];
 #line 90 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).saturation = ((gfloat) _tmp1_) * HSV_ANALYTIC_PIXEL_INV_255;
+	(*self).saturation = _tmp3_;
 #line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = light_value_quantized;
+	_tmp4_ = light_value_quantized;
 #line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).light_value = ((gfloat) _tmp2_) * HSV_ANALYTIC_PIXEL_INV_255;
-#line 1232 "ColorTransformation.c"
-}
-
-
-void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p) {
-	gfloat max_component = 0.0F;
-	RGBAnalyticPixel _tmp0_;
-	gfloat _tmp1_;
-	RGBAnalyticPixel _tmp2_;
-	gfloat _tmp3_;
-	gfloat _tmp4_;
-	RGBAnalyticPixel _tmp5_;
-	gfloat _tmp6_;
-	gfloat _tmp7_;
-	gfloat min_component = 0.0F;
-	RGBAnalyticPixel _tmp8_;
-	gfloat _tmp9_;
-	RGBAnalyticPixel _tmp10_;
-	gfloat _tmp11_;
-	gfloat _tmp12_;
-	RGBAnalyticPixel _tmp13_;
-	gfloat _tmp14_;
-	gfloat _tmp15_;
-	gfloat _tmp16_;
-	gfloat _tmp17_ = 0.0F;
-	gfloat _tmp18_;
-	gfloat _tmp22_;
-	gfloat _tmp53_;
-	gfloat _tmp54_;
-	gfloat _tmp55_;
-	gfloat _tmp56_;
-	gfloat _tmp57_;
-	gfloat _tmp58_;
-#line 94 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 94 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	memset (self, 0, sizeof (HSVAnalyticPixel));
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *p;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = _tmp0_.red;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = *p;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = _tmp2_.green;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = MAX (_tmp1_, _tmp3_);
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = *p;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6_ = _tmp5_.blue;
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp7_ = MAX (_tmp4_, _tmp6_);
-#line 95 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	max_component = _tmp7_;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp8_ = *p;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp9_ = _tmp8_.red;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp10_ = *p;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp11_ = _tmp10_.green;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp12_ = MIN (_tmp9_, _tmp11_);
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp13_ = *p;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp14_ = _tmp13_.blue;
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp15_ = MIN (_tmp12_, _tmp14_);
-#line 96 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	min_component = _tmp15_;
-#line 98 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp16_ = max_component;
-#line 98 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).light_value = _tmp16_;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp18_ = max_component;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp18_ != 0.0f) {
-#line 1313 "ColorTransformation.c"
-		gfloat _tmp19_;
-		gfloat _tmp20_;
-		gfloat _tmp21_;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp19_ = max_component;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp20_ = min_component;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp21_ = max_component;
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp17_ = (_tmp19_ - _tmp20_) / _tmp21_;
-#line 1325 "ColorTransformation.c"
-	} else {
-#line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp17_ = 0.0f;
-#line 1329 "ColorTransformation.c"
-	}
-#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).saturation = _tmp17_;
-#line 102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp22_ = (*self).saturation;
-#line 102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp22_ == 0.0f) {
-#line 103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		(*self).hue = 0.0f;
-#line 1339 "ColorTransformation.c"
-	} else {
-		gfloat delta = 0.0F;
-		gfloat _tmp23_;
-		gfloat _tmp24_;
-		RGBAnalyticPixel _tmp25_;
-		gfloat _tmp26_;
-		gfloat _tmp27_;
-		gfloat _tmp49_;
-		gfloat _tmp50_;
-		gfloat _tmp52_;
-#line 105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp23_ = max_component;
-#line 105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp24_ = min_component;
-#line 105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		delta = _tmp23_ - _tmp24_;
-#line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp25_ = *p;
-#line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp26_ = _tmp25_.red;
-#line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp27_ = max_component;
-#line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (_tmp26_ == _tmp27_) {
-#line 1364 "ColorTransformation.c"
-			RGBAnalyticPixel _tmp28_;
-			gfloat _tmp29_;
-			RGBAnalyticPixel _tmp30_;
-			gfloat _tmp31_;
-			gfloat _tmp32_;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp28_ = *p;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp29_ = _tmp28_.green;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp30_ = *p;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp31_ = _tmp30_.blue;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp32_ = delta;
-#line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			(*self).hue = (_tmp29_ - _tmp31_) / _tmp32_;
-#line 1382 "ColorTransformation.c"
-		} else {
-			RGBAnalyticPixel _tmp33_;
-			gfloat _tmp34_;
-			gfloat _tmp35_;
-#line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp33_ = *p;
-#line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp34_ = _tmp33_.green;
-#line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp35_ = max_component;
-#line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (_tmp34_ == _tmp35_) {
-#line 1395 "ColorTransformation.c"
-				RGBAnalyticPixel _tmp36_;
-				gfloat _tmp37_;
-				RGBAnalyticPixel _tmp38_;
-				gfloat _tmp39_;
-				gfloat _tmp40_;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp36_ = *p;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp37_ = _tmp36_.blue;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp38_ = *p;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp39_ = _tmp38_.red;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp40_ = delta;
-#line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				(*self).hue = 2.0f + ((_tmp37_ - _tmp39_) / _tmp40_);
-#line 1413 "ColorTransformation.c"
-			} else {
-				RGBAnalyticPixel _tmp41_;
-				gfloat _tmp42_;
-				gfloat _tmp43_;
-#line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp41_ = *p;
-#line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp42_ = _tmp41_.blue;
-#line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp43_ = max_component;
-#line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (_tmp42_ == _tmp43_) {
-#line 1426 "ColorTransformation.c"
-					RGBAnalyticPixel _tmp44_;
-					gfloat _tmp45_;
-					RGBAnalyticPixel _tmp46_;
-					gfloat _tmp47_;
-					gfloat _tmp48_;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp44_ = *p;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp45_ = _tmp44_.red;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp46_ = *p;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp47_ = _tmp46_.green;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp48_ = delta;
-#line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					(*self).hue = 4.0f + ((_tmp45_ - _tmp47_) / _tmp48_);
-#line 1444 "ColorTransformation.c"
-				}
-			}
-		}
-#line 114 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp49_ = (*self).hue;
-#line 114 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		(*self).hue = _tmp49_ * 60.0f;
-#line 115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp50_ = (*self).hue;
-#line 115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (_tmp50_ < 0.0f) {
-#line 1456 "ColorTransformation.c"
-			gfloat _tmp51_;
-#line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp51_ = (*self).hue;
-#line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			(*self).hue = _tmp51_ + 360.0f;
-#line 1462 "ColorTransformation.c"
-		}
-#line 118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp52_ = (*self).hue;
-#line 118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		(*self).hue = _tmp52_ / 360.0f;
-#line 1468 "ColorTransformation.c"
-	}
-#line 121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp53_ = (*self).hue;
-#line 121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp54_ = CLAMP (_tmp53_, 0.0f, 1.0f);
-#line 121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).hue = _tmp54_;
-#line 122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp55_ = (*self).saturation;
-#line 122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp56_ = CLAMP (_tmp55_, 0.0f, 1.0f);
-#line 122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).saturation = _tmp56_;
-#line 123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp57_ = (*self).light_value;
-#line 123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp58_ = CLAMP (_tmp57_, 0.0f, 1.0f);
-#line 123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	(*self).light_value = _tmp58_;
-#line 1488 "ColorTransformation.c"
-}
-
-
-void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result) {
-	RGBAnalyticPixel _result_ = {0};
-	gfloat _tmp0_;
-#line 127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	rgb_analytic_pixel_init (&_result_);
-#line 129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = (*self).saturation;
-#line 129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp0_ == 0.0f) {
-#line 1501 "ColorTransformation.c"
-		gfloat _tmp1_;
-		gfloat _tmp2_;
-		gfloat _tmp3_;
-#line 130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp1_ = (*self).light_value;
-#line 130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_result_.red = _tmp1_;
-#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp2_ = (*self).light_value;
-#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_result_.green = _tmp2_;
-#line 132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp3_ = (*self).light_value;
-#line 132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_result_.blue = _tmp3_;
-#line 1517 "ColorTransformation.c"
-	} else {
-		gfloat hue_denorm = 0.0F;
-		gfloat _tmp4_;
-		gfloat _tmp5_;
-		gfloat hue_hexant = 0.0F;
-		gfloat _tmp6_;
-		gint hexant_i_part = 0;
-		gfloat _tmp7_;
-		gfloat hexant_f_part = 0.0F;
-		gfloat _tmp8_;
-		gint _tmp9_;
-		gfloat p = 0.0F;
-		gfloat _tmp10_;
-		gfloat _tmp11_;
-		gfloat q = 0.0F;
-		gfloat _tmp12_;
-		gfloat _tmp13_;
-		gfloat _tmp14_;
-		gfloat t = 0.0F;
-		gfloat _tmp15_;
-		gfloat _tmp16_;
-		gfloat _tmp17_;
-		gint _tmp18_;
-#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp4_ = (*self).hue;
-#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		hue_denorm = _tmp4_ * 360.0f;
-#line 135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp5_ = hue_denorm;
-#line 135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (_tmp5_ == 360.0f) {
-#line 136 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			hue_denorm = 0.0f;
-#line 1551 "ColorTransformation.c"
-		}
-#line 138 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp6_ = hue_denorm;
-#line 138 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		hue_hexant = _tmp6_ / 60.0f;
-#line 140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp7_ = hue_hexant;
-#line 140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		hexant_i_part = (gint) _tmp7_;
-#line 142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp8_ = hue_hexant;
-#line 142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp9_ = hexant_i_part;
-#line 142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		hexant_f_part = _tmp8_ - ((gfloat) _tmp9_);
-#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp10_ = (*self).light_value;
-#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp11_ = (*self).saturation;
-#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		p = _tmp10_ * (1.0f - _tmp11_);
-#line 146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp12_ = (*self).light_value;
-#line 146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp13_ = (*self).saturation;
-#line 146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp14_ = hexant_f_part;
-#line 146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		q = _tmp12_ * (1.0f - (_tmp13_ * _tmp14_));
-#line 147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp15_ = (*self).light_value;
-#line 147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp16_ = (*self).saturation;
-#line 147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp17_ = hexant_f_part;
-#line 147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		t = _tmp15_ * (1.0f - (_tmp16_ * (1.0f - _tmp17_)));
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp18_ = hexant_i_part;
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		switch (_tmp18_) {
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 0:
-#line 1595 "ColorTransformation.c"
-			{
-				gfloat _tmp19_;
-				gfloat _tmp20_;
-				gfloat _tmp21_;
-#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp19_ = (*self).light_value;
-#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp19_;
-#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp20_ = t;
-#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp20_;
-#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp21_ = p;
-#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp21_;
-#line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1614 "ColorTransformation.c"
-			}
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 1:
-#line 1618 "ColorTransformation.c"
-			{
-				gfloat _tmp22_;
-				gfloat _tmp23_;
-				gfloat _tmp24_;
-#line 165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp22_ = q;
-#line 165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp22_;
-#line 166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp23_ = (*self).light_value;
-#line 166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp23_;
-#line 167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp24_ = p;
-#line 167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp24_;
-#line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1637 "ColorTransformation.c"
-			}
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 2:
-#line 1641 "ColorTransformation.c"
-			{
-				gfloat _tmp25_;
-				gfloat _tmp26_;
-				gfloat _tmp27_;
-#line 171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp25_ = p;
-#line 171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp25_;
-#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp26_ = (*self).light_value;
-#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp26_;
-#line 173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp27_ = t;
-#line 173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp27_;
-#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1660 "ColorTransformation.c"
-			}
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 3:
-#line 1664 "ColorTransformation.c"
-			{
-				gfloat _tmp28_;
-				gfloat _tmp29_;
-				gfloat _tmp30_;
-#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp28_ = p;
-#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp28_;
-#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp29_ = q;
-#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp29_;
-#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp30_ = (*self).light_value;
-#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp30_;
-#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1683 "ColorTransformation.c"
-			}
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 4:
-#line 1687 "ColorTransformation.c"
-			{
-				gfloat _tmp31_;
-				gfloat _tmp32_;
-				gfloat _tmp33_;
-#line 183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp31_ = t;
-#line 183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp31_;
-#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp32_ = p;
-#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp32_;
-#line 185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp33_ = (*self).light_value;
-#line 185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp33_;
-#line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1706 "ColorTransformation.c"
-			}
-#line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			case 5:
-#line 1710 "ColorTransformation.c"
-			{
-				gfloat _tmp34_;
-				gfloat _tmp35_;
-				gfloat _tmp36_;
-#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp34_ = (*self).light_value;
-#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.red = _tmp34_;
-#line 190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp35_ = p;
-#line 190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.green = _tmp35_;
-#line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp36_ = q;
-#line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_result_.blue = _tmp36_;
-#line 192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				break;
-#line 1729 "ColorTransformation.c"
-			}
-			default:
-			{
-#line 195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				g_error ("ColorTransformation.vala:195: bad color hexant in HSV-to-RGB conversio" \
-"n");
-#line 1735 "ColorTransformation.c"
-			}
-		}
-	}
-#line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = _result_;
-#line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 1743 "ColorTransformation.c"
+	_tmp5_ = rgb_lookup_table[_tmp4_];
+#line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	(*self).light_value = _tmp5_;
+#line 1300 "ColorTransformation.c"
 }
 
 
@@ -1751,59 +1307,57 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 	gfloat _tmp2_;
 	HSVAnalyticPixel _tmp3_;
 	gfloat _tmp4_;
-#line 202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (rhs != NULL, FALSE);
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = (*self).hue;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = *rhs;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp3_.hue;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 1764 "ColorTransformation.c"
+#line 1319 "ColorTransformation.c"
 		gfloat _tmp5_;
 		HSVAnalyticPixel _tmp6_;
 		gfloat _tmp7_;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = (*self).saturation;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = *rhs;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp6_.saturation;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp5_ == _tmp7_;
-#line 1776 "ColorTransformation.c"
+#line 1331 "ColorTransformation.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 1780 "ColorTransformation.c"
+#line 1335 "ColorTransformation.c"
 	}
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 1784 "ColorTransformation.c"
+#line 1339 "ColorTransformation.c"
 		gfloat _tmp8_;
 		HSVAnalyticPixel _tmp9_;
 		gfloat _tmp10_;
-#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = (*self).light_value;
-#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = *rhs;
-#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = _tmp9_.light_value;
-#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp8_ == _tmp10_;
-#line 1796 "ColorTransformation.c"
+#line 1351 "ColorTransformation.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 1800 "ColorTransformation.c"
+#line 1355 "ColorTransformation.c"
 	}
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1806 "ColorTransformation.c"
+#line 1361 "ColorTransformation.c"
 }
 
 
@@ -1812,17 +1366,17 @@ guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) {
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = (*self).hue;
-#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = (*self).saturation;
-#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = (*self).light_value;
-#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f));
-#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1825 "ColorTransformation.c"
+#line 1380 "ColorTransformation.c"
 }
 
 
@@ -1834,14 +1388,14 @@ HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self) {
 	memcpy (dup, self, sizeof (HSVAnalyticPixel));
 #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return dup;
-#line 1837 "ColorTransformation.c"
+#line 1392 "ColorTransformation.c"
 }
 
 
 void hsv_analytic_pixel_free (HSVAnalyticPixel* self) {
 #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_free (self);
-#line 1844 "ColorTransformation.c"
+#line 1399 "ColorTransformation.c"
 }
 
 
@@ -1859,7 +1413,7 @@ GType hsv_analytic_pixel_get_type (void) {
 GType composition_mode_get_type (void) {
 	static volatile gsize composition_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&composition_mode_type_id__volatile)) {
-		static const GEnumValue values[] = {{COMPOSITION_MODE_NONE, "COMPOSITION_MODE_NONE", "none"}, {COMPOSITION_MODE_RGB_MATRIX, "COMPOSITION_MODE_RGB_MATRIX", "rgb-matrix"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{COMPOSITION_MODE_NONE, "COMPOSITION_MODE_NONE", "none"}, {COMPOSITION_MODE_RGB_MATRIX, "COMPOSITION_MODE_RGB_MATRIX", "rgb-matrix"}, {COMPOSITION_MODE_HSV_LOOKUP, "COMPOSITION_MODE_HSV_LOOKUP", "hsv-lookup"}, {0, NULL, NULL}};
 		GType composition_mode_type_id;
 		composition_mode_type_id = g_enum_register_static ("CompositionMode", values);
 		g_once_init_leave (&composition_mode_type_id__volatile, composition_mode_type_id);
@@ -1894,25 +1448,25 @@ GType pixel_transformation_type_get_type (void) {
 
 PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type) {
 	PixelTransformationBundle* self = NULL;
-#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformationBundle*) g_type_create_instance (object_type);
-#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 1901 "ColorTransformation.c"
+#line 1456 "ColorTransformation.c"
 }
 
 
 PixelTransformationBundle* pixel_transformation_bundle_new (void) {
-#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return pixel_transformation_bundle_construct (TYPE_PIXEL_TRANSFORMATION_BUNDLE);
-#line 1908 "ColorTransformation.c"
+#line 1463 "ColorTransformation.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
-#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 1915 "ColorTransformation.c"
+#line 1470 "ColorTransformation.c"
 }
 
 
@@ -1920,45 +1474,43 @@ PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustme
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
-#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
-#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _pixel_transformation_bundle_ref0 (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp1_;
-#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1931 "ColorTransformation.c"
+#line 1486 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments) {
 	PixelTransformationBundle* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
-#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (adjustments));
-#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = adjustments;
-#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _pixel_transformation_bundle_ref0 (_tmp0_);
-#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_bundle_unref0 (pixel_transformation_bundle_copied_color_adjustments);
-#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_copied_color_adjustments = _tmp1_;
-#line 1948 "ColorTransformation.c"
+#line 1501 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) {
 	gboolean result = FALSE;
 	PixelTransformationBundle* _tmp0_;
-#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
-#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ != NULL;
-#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1961 "ColorTransformation.c"
+#line 1514 "ColorTransformation.c"
 }
 
 
@@ -1967,21 +1519,17 @@ void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTran
 	PixelTransformation* _tmp1_;
 	PixelTransformationType _tmp2_;
 	PixelTransformation* _tmp3_;
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = transformation;
-#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = transformation;
-#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp2_)), _tmp3_);
-#line 1984 "ColorTransformation.c"
+#line 1533 "ColorTransformation.c"
 }
 
 
@@ -2002,73 +1550,71 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel
 	ExposureTransformation* _tmp13_;
 	ContrastTransformation* _tmp14_;
 	ContrastTransformation* _tmp15_;
-#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = expansion_transformation_new_from_extrema (0, 255);
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _tmp0_;
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp1_);
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = shadow_detail_transformation_new (0.0f);
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_;
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp3_);
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = highlight_detail_transformation_new (0.0f);
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_;
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp5_);
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = temperature_transformation_new (0.0f);
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_;
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp7_);
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = tint_transformation_new (0.0f);
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = _tmp8_;
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 161 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp9_);
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = saturation_transformation_new (0.0f);
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_;
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp11_);
-#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = exposure_transformation_new (0.0f);
-#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_;
-#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp13_);
-#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 164 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = contrast_transformation_new (0.0f);
-#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 164 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_;
-#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 164 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 164 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp15_);
-#line 2071 "ColorTransformation.c"
+#line 1618 "ColorTransformation.c"
 }
 
 
@@ -2105,135 +1651,131 @@ void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValue
 	gfloat _tmp33_;
 	ContrastTransformation* _tmp34_;
 	ContrastTransformation* _tmp35_;
-#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
-#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (store));
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = store;
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = key_value_map_get_string (_tmp0_, "expansion", "-");
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_params_encoded = _tmp1_;
-#line 272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 169 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = expansion_params_encoded;
-#line 272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 169 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_strcmp0 (_tmp2_, "-") == 0) {
-#line 2122 "ColorTransformation.c"
+#line 1665 "ColorTransformation.c"
 		ExpansionTransformation* _tmp3_;
 		ExpansionTransformation* _tmp4_;
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = expansion_transformation_new_from_extrema (0, 255);
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp4_);
-#line 2133 "ColorTransformation.c"
+#line 1676 "ColorTransformation.c"
 	} else {
 		const gchar* _tmp5_;
 		ExpansionTransformation* _tmp6_;
 		ExpansionTransformation* _tmp7_;
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = expansion_params_encoded;
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = expansion_transformation_new_from_string (_tmp5_);
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp6_;
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp7_);
-#line 2148 "ColorTransformation.c"
+#line 1691 "ColorTransformation.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = store;
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = key_value_map_get_float (_tmp8_, "shadows", 0.0f);
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = shadow_detail_transformation_new (_tmp9_);
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_;
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp11_);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = store;
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = key_value_map_get_float (_tmp12_, "highlights", 0.0f);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = highlight_detail_transformation_new (_tmp13_);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_;
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp15_);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = store;
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = key_value_map_get_float (_tmp16_, "temperature", 0.0f);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = temperature_transformation_new (_tmp17_);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = _tmp18_;
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp19_);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = store;
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = key_value_map_get_float (_tmp20_, "tint", 0.0f);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = tint_transformation_new (_tmp21_);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_;
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp23_);
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = store;
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = key_value_map_get_float (_tmp24_, "saturation", 0.0f);
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = saturation_transformation_new (_tmp25_);
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = _tmp26_;
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp27_);
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = store;
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = key_value_map_get_float (_tmp28_, "exposure", 0.0f);
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = exposure_transformation_new (_tmp29_);
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = _tmp30_;
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp31_);
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = store;
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = key_value_map_get_float (_tmp32_, "contrast", 0.0f);
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = contrast_transformation_new (_tmp33_);
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_;
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp35_);
-#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (expansion_params_encoded);
-#line 2236 "ColorTransformation.c"
+#line 1779 "ColorTransformation.c"
 }
 
 
@@ -2267,121 +1809,117 @@ KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self,
 	ContrastTransformation* new_contrast_trans = NULL;
 	PixelTransformation* _tmp17_;
 	gfloat _tmp18_;
-#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (group != NULL, NULL);
-#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = group;
-#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = key_value_map_new (_tmp0_);
-#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	store = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_expansion_trans != NULL, "new_expansion_trans != null");
-#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = pixel_transformation_to_string (G_TYPE_CHECK_INSTANCE_CAST (new_expansion_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp3_;
-#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_string (store, "expansion", _tmp4_);
-#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp4_);
-#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_shadows_trans != NULL, "new_shadows_trans != null");
-#line 297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = shadow_detail_transformation_get_parameter (new_shadows_trans);
-#line 297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "shadows", _tmp6_);
-#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_highlight_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_highlight_trans != NULL, "new_highlight_trans != null");
-#line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = highlight_detail_transformation_get_parameter (new_highlight_trans);
-#line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "highlights", _tmp8_);
-#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_temp_trans != NULL, "new_temp_trans != null");
-#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = temperature_transformation_get_parameter (new_temp_trans);
-#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "temperature", _tmp10_);
-#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 311 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_tint_trans != NULL, "new_tint_trans != null");
-#line 312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 209 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = tint_transformation_get_parameter (new_tint_trans);
-#line 312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 209 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "tint", _tmp12_);
-#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 316 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 213 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_sat_trans != NULL, "new_sat_trans != null");
-#line 317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 214 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = saturation_transformation_get_parameter (new_sat_trans);
-#line 317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 214 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "saturation", _tmp14_);
-#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_exposure_trans != NULL, "new_exposure_trans != null");
-#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 219 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = exposure_transformation_get_parameter (new_exposure_trans);
-#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 219 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "exposure", _tmp16_);
-#line 324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_contrast_trans != NULL, "new_contrast_trans != null");
-#line 327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = contrast_transformation_get_parameter (new_contrast_trans);
-#line 327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "contrast", _tmp18_);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = store;
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_contrast_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_exposure_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_highlight_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_expansion_trans);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2384 "ColorTransformation.c"
+#line 1923 "ColorTransformation.c"
 }
 
 
@@ -2390,19 +1928,17 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) {
 	GeeHashMap* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), 0);
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2405 "ColorTransformation.c"
+#line 1942 "ColorTransformation.c"
 }
 
 
@@ -2411,19 +1947,17 @@ PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransf
 	GeeHashMap* _tmp0_;
 	PixelTransformationType _tmp1_;
 	gpointer _tmp2_;
-#line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = type;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp1_)));
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = (PixelTransformation*) _tmp2_;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2426 "ColorTransformation.c"
+#line 1961 "ColorTransformation.c"
 }
 
 
@@ -2432,48 +1966,43 @@ GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformatio
 	GeeHashMap* _tmp0_;
 	GeeCollection* _tmp1_;
 	GeeCollection* _tmp2_;
-#line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2447 "ColorTransformation.c"
+#line 1980 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self) {
 	gboolean result = FALSE;
-#line 344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), FALSE);
-#line 2455 "ColorTransformation.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		GeeIterable* _tmp0_;
 		GeeIterable* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = pixel_transformation_bundle_get_transformations (self);
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp0_;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = _tmp2_;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_adjustment_it = _tmp3_;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2476 "ColorTransformation.c"
+#line 2006 "ColorTransformation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			PixelTransformation* adjustment = NULL;
@@ -2481,51 +2010,51 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel
 			gpointer _tmp7_;
 			PixelTransformation* _tmp8_;
 			gboolean _tmp9_;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = _adjustment_it;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp5_) {
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2492 "ColorTransformation.c"
+#line 2022 "ColorTransformation.c"
 			}
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _adjustment_it;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			adjustment = (PixelTransformation*) _tmp7_;
-#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = adjustment;
-#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = pixel_transformation_is_identity (_tmp8_);
-#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp9_) {
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				result = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (adjustment);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_g_object_unref0 (_adjustment_it);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				return result;
-#line 2514 "ColorTransformation.c"
+#line 2044 "ColorTransformation.c"
 			}
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 2518 "ColorTransformation.c"
+#line 2048 "ColorTransformation.c"
 		}
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 2522 "ColorTransformation.c"
+#line 2052 "ColorTransformation.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = TRUE;
-#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2528 "ColorTransformation.c"
+#line 2058 "ColorTransformation.c"
 }
 
 
@@ -2533,34 +2062,32 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 	PixelTransformer* result = NULL;
 	PixelTransformer* transformer = NULL;
 	PixelTransformer* _tmp0_;
-#line 353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformer_new ();
-#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	transformer = _tmp0_;
-#line 2542 "ColorTransformation.c"
+#line 2070 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		GeeIterable* _tmp1_;
 		GeeIterable* _tmp2_;
 		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _tmp1_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_it = _tmp4_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2563 "ColorTransformation.c"
+#line 2091 "ColorTransformation.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
@@ -2568,41 +2095,41 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 			gpointer _tmp8_;
 			PixelTransformer* _tmp9_;
 			PixelTransformation* _tmp10_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp6_) {
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2579 "ColorTransformation.c"
+#line 2107 "ColorTransformation.c"
 			}
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_it;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = transformer;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = transformation;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			pixel_transformer_attach_transformation (_tmp9_, _tmp10_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 2595 "ColorTransformation.c"
+#line 2123 "ColorTransformation.c"
 		}
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_it);
-#line 2599 "ColorTransformation.c"
+#line 2127 "ColorTransformation.c"
 	}
-#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = transformer;
-#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2605 "ColorTransformation.c"
+#line 2133 "ColorTransformation.c"
 }
 
 
@@ -2610,34 +2137,32 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* bundle = NULL;
 	PixelTransformationBundle* _tmp0_;
-#line 361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	bundle = _tmp0_;
-#line 2619 "ColorTransformation.c"
+#line 2145 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		GeeIterable* _tmp1_;
 		GeeIterable* _tmp2_;
 		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _tmp1_;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_it = _tmp4_;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2640 "ColorTransformation.c"
+#line 2166 "ColorTransformation.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
@@ -2645,232 +2170,232 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 			gpointer _tmp8_;
 			PixelTransformationBundle* _tmp9_;
 			PixelTransformation* _tmp10_;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp6_) {
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2656 "ColorTransformation.c"
+#line 2182 "ColorTransformation.c"
 			}
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_it;
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = bundle;
-#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = transformation;
-#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			pixel_transformation_bundle_set (_tmp9_, _tmp10_);
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 2672 "ColorTransformation.c"
+#line 2198 "ColorTransformation.c"
 		}
-#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_it);
-#line 2676 "ColorTransformation.c"
+#line 2202 "ColorTransformation.c"
 	}
-#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = bundle;
-#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2682 "ColorTransformation.c"
+#line 2208 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_bundle_init (GValue* value) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 2689 "ColorTransformation.c"
+#line 2215 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_bundle_free_value (GValue* value) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (value->data[0].v_pointer);
-#line 2698 "ColorTransformation.c"
+#line 2224 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformation_bundle_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformation_bundle_ref (src_value->data[0].v_pointer);
-#line 2708 "ColorTransformation.c"
+#line 2234 "ColorTransformation.c"
 	} else {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2712 "ColorTransformation.c"
+#line 2238 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformation_bundle_peek_pointer (const GValue* value) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 2720 "ColorTransformation.c"
+#line 2246 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_bundle_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 2727 "ColorTransformation.c"
+#line 2253 "ColorTransformation.c"
 		PixelTransformationBundle * object;
 		object = collect_values[0].v_pointer;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2734 "ColorTransformation.c"
+#line 2260 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.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 2738 "ColorTransformation.c"
+#line 2264 "ColorTransformation.c"
 		}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformation_bundle_ref (object);
-#line 2742 "ColorTransformation.c"
+#line 2268 "ColorTransformation.c"
 	} else {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2746 "ColorTransformation.c"
+#line 2272 "ColorTransformation.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 2750 "ColorTransformation.c"
+#line 2276 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_bundle_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformationBundle ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2761 "ColorTransformation.c"
+#line 2287 "ColorTransformation.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 2767 "ColorTransformation.c"
+#line 2293 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2771 "ColorTransformation.c"
+#line 2297 "ColorTransformation.c"
 	} else {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformation_bundle_ref (value->data[0].v_pointer);
-#line 2775 "ColorTransformation.c"
+#line 2301 "ColorTransformation.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 2779 "ColorTransformation.c"
+#line 2305 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformationBundle* spec;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 2793 "ColorTransformation.c"
+#line 2319 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformation_bundle (const GValue* value) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 2802 "ColorTransformation.c"
+#line 2328 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) {
 	PixelTransformationBundle * old;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_ref (value->data[0].v_pointer);
-#line 2822 "ColorTransformation.c"
+#line 2348 "ColorTransformation.c"
 	} else {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2826 "ColorTransformation.c"
+#line 2352 "ColorTransformation.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (old);
-#line 2832 "ColorTransformation.c"
+#line 2358 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object) {
 	PixelTransformationBundle * old;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 2851 "ColorTransformation.c"
+#line 2377 "ColorTransformation.c"
 	} else {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2855 "ColorTransformation.c"
+#line 2381 "ColorTransformation.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (old);
-#line 2861 "ColorTransformation.c"
+#line 2387 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformation_bundle_class_init (PixelTransformationBundleClass * klass) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_parent_class = g_type_class_peek_parent (klass);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationBundleClass *) klass)->finalize = pixel_transformation_bundle_finalize;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformationBundlePrivate));
-#line 2873 "ColorTransformation.c"
+#line 2399 "ColorTransformation.c"
 }
 
 
@@ -2882,31 +2407,31 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle
 	GDestroyNotify _tmp4_;
 	GeeEqualDataFunc _tmp5_;
 	GeeHashMap* _tmp6_;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMATION_BUNDLE_GET_PRIVATE (self);
-#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gee_functions_get_hash_func_for (G_TYPE_INT, &_tmp0_, &_tmp1_);
-#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = gee_functions_get_equal_func_for (G_TYPE_INT, &_tmp3_, &_tmp4_);
-#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->map = _tmp6_;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 2897 "ColorTransformation.c"
+#line 2423 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_bundle_finalize (PixelTransformationBundle * obj) {
 	PixelTransformationBundle * self;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->map);
-#line 2909 "ColorTransformation.c"
+#line 2435 "ColorTransformation.c"
 }
 
 
@@ -2927,441 +2452,417 @@ GType pixel_transformation_bundle_get_type (void) {
 gpointer pixel_transformation_bundle_ref (gpointer instance) {
 	PixelTransformationBundle * self;
 	self = instance;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 2934 "ColorTransformation.c"
+#line 2460 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_bundle_unref (gpointer instance) {
 	PixelTransformationBundle * self;
 	self = instance;
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS (self)->finalize (self);
-#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2947 "ColorTransformation.c"
+#line 2473 "ColorTransformation.c"
 	}
 }
 
 
-PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type) {
+PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format) {
 	PixelTransformation* self = NULL;
 	PixelTransformationType _tmp0_;
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	PixelFormat _tmp1_;
+#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformation*) g_type_create_instance (object_type);
-#line 374 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 374 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->type = _tmp0_;
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = preferred_format;
+#line 274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->priv->preferred_format = _tmp1_;
+#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 2963 "ColorTransformation.c"
+#line 2494 "ColorTransformation.c"
 }
 
 
 PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self) {
 	PixelTransformationType result = 0;
 	PixelTransformationType _tmp0_;
-#line 377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->type;
-#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2978 "ColorTransformation.c"
-}
-
-
-static PixelFormat pixel_transformation_real_get_preferred_format (PixelTransformation* self) {
-#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_critical ("Type `%s' does not implement abstract method `pixel_transformation_get_preferred_format'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return 0;
-#line 2987 "ColorTransformation.c"
+#line 2507 "ColorTransformation.c"
 }
 
 
 PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self) {
-#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return PIXEL_TRANSFORMATION_GET_CLASS (self)->get_preferred_format (self);
-#line 2996 "ColorTransformation.c"
+	PixelFormat result = 0;
+	PixelFormat _tmp0_;
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = self->priv->preferred_format;
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	result = _tmp0_;
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 2520 "ColorTransformation.c"
 }
 
 
 static CompositionMode pixel_transformation_real_get_composition_mode (PixelTransformation* self) {
 	CompositionMode result = 0;
-#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = COMPOSITION_MODE_NONE;
-#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3006 "ColorTransformation.c"
+#line 2530 "ColorTransformation.c"
 }
 
 
 CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self) {
-#line 383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->get_composition_mode (self);
-#line 3015 "ColorTransformation.c"
+#line 2537 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_compose_with (PixelTransformation* self, PixelTransformation* other) {
-#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (other));
-#line 388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_error ("ColorTransformation.vala:388: %s", "PixelTransformation: compose_with( ): this type of pixel " "transformation doesn't support composition.");
-#line 3024 "ColorTransformation.c"
+#line 290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_error ("ColorTransformation.vala:290: %s", "PixelTransformation: compose_with( ): this type of pixel " "transformation doesn't support composition.");
+#line 2544 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other) {
-#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->compose_with (self, other);
-#line 3033 "ColorTransformation.c"
+#line 2551 "ColorTransformation.c"
 }
 
 
 static gboolean pixel_transformation_real_is_identity (PixelTransformation* self) {
 	gboolean result = FALSE;
-#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = TRUE;
-#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3043 "ColorTransformation.c"
+#line 2561 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_is_identity (PixelTransformation* self) {
-#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), FALSE);
-#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->is_identity (self);
-#line 3052 "ColorTransformation.c"
+#line 2568 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) {
 	HSVAnalyticPixel _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp0_;
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 3066 "ColorTransformation.c"
+#line 2580 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) {
-#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_hsv (self, p, result);
-#line 3075 "ColorTransformation.c"
+#line 2587 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
 	RGBAnalyticPixel _tmp0_;
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp0_;
-#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 3089 "ColorTransformation.c"
+#line 2599 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_rgb (self, p, result);
-#line 3098 "ColorTransformation.c"
+#line 2606 "ColorTransformation.c"
 }
 
 
 static gchar* pixel_transformation_real_to_string (PixelTransformation* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_strdup ("PixelTransformation");
-#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3111 "ColorTransformation.c"
+#line 2619 "ColorTransformation.c"
 }
 
 
 gchar* pixel_transformation_to_string (PixelTransformation* self) {
-#line 404 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), NULL);
-#line 404 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->to_string (self);
-#line 3120 "ColorTransformation.c"
+#line 2626 "ColorTransformation.c"
 }
 
 
 static PixelTransformation* pixel_transformation_real_copy (PixelTransformation* self) {
-#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_critical ("Type `%s' does not implement abstract method `pixel_transformation_copy'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3129 "ColorTransformation.c"
+#line 2635 "ColorTransformation.c"
 }
 
 
 PixelTransformation* pixel_transformation_copy (PixelTransformation* self) {
-#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), NULL);
-#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->copy (self);
-#line 3138 "ColorTransformation.c"
+#line 2642 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_init (GValue* value) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 3145 "ColorTransformation.c"
+#line 2649 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_free_value (GValue* value) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (value->data[0].v_pointer);
-#line 3154 "ColorTransformation.c"
+#line 2658 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformation_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformation_ref (src_value->data[0].v_pointer);
-#line 3164 "ColorTransformation.c"
+#line 2668 "ColorTransformation.c"
 	} else {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3168 "ColorTransformation.c"
+#line 2672 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformation_peek_pointer (const GValue* value) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 3176 "ColorTransformation.c"
+#line 2680 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 3183 "ColorTransformation.c"
+#line 2687 "ColorTransformation.c"
 		PixelTransformation * object;
 		object = collect_values[0].v_pointer;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3190 "ColorTransformation.c"
+#line 2694 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.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 3194 "ColorTransformation.c"
+#line 2698 "ColorTransformation.c"
 		}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformation_ref (object);
-#line 3198 "ColorTransformation.c"
+#line 2702 "ColorTransformation.c"
 	} else {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3202 "ColorTransformation.c"
+#line 2706 "ColorTransformation.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3206 "ColorTransformation.c"
+#line 2710 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformation ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3217 "ColorTransformation.c"
+#line 2721 "ColorTransformation.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 3223 "ColorTransformation.c"
+#line 2727 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3227 "ColorTransformation.c"
+#line 2731 "ColorTransformation.c"
 	} else {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformation_ref (value->data[0].v_pointer);
-#line 3231 "ColorTransformation.c"
+#line 2735 "ColorTransformation.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3235 "ColorTransformation.c"
+#line 2739 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformation* spec;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION), NULL);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 3249 "ColorTransformation.c"
+#line 2753 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformation (const GValue* value) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION), NULL);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 3258 "ColorTransformation.c"
+#line 2762 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformation (GValue* value, gpointer v_object) {
 	PixelTransformation * old;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_ref (value->data[0].v_pointer);
-#line 3278 "ColorTransformation.c"
+#line 2782 "ColorTransformation.c"
 	} else {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3282 "ColorTransformation.c"
+#line 2786 "ColorTransformation.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (old);
-#line 3288 "ColorTransformation.c"
+#line 2792 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformation (GValue* value, gpointer v_object) {
 	PixelTransformation * old;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 3307 "ColorTransformation.c"
+#line 2811 "ColorTransformation.c"
 	} else {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3311 "ColorTransformation.c"
+#line 2815 "ColorTransformation.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (old);
-#line 3317 "ColorTransformation.c"
+#line 2821 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformation_class_init (PixelTransformationClass * klass) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = pixel_transformation_finalize;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformationPrivate));
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) pixel_transformation_real_get_preferred_format;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*) (PixelTransformation *)) pixel_transformation_real_get_composition_mode;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) pixel_transformation_real_compose_with;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) pixel_transformation_real_is_identity;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) pixel_transformation_real_transform_pixel_hsv;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) pixel_transformation_real_transform_pixel_rgb;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->to_string = (gchar* (*) (PixelTransformation *)) pixel_transformation_real_to_string;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) pixel_transformation_real_copy;
-#line 3345 "ColorTransformation.c"
+#line 2847 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_instance_init (PixelTransformation * self) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMATION_GET_PRIVATE (self);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 3354 "ColorTransformation.c"
+#line 2856 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_finalize (PixelTransformation * obj) {
 	PixelTransformation * self;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 3364 "ColorTransformation.c"
+#line 2866 "ColorTransformation.c"
 }
 
 
@@ -3382,24 +2883,24 @@ GType pixel_transformation_get_type (void) {
 gpointer pixel_transformation_ref (gpointer instance) {
 	PixelTransformation * self;
 	self = instance;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 3389 "ColorTransformation.c"
+#line 2891 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_unref (gpointer instance) {
 	PixelTransformation * self;
 	self = instance;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMATION_GET_CLASS (self)->finalize (self);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3402 "ColorTransformation.c"
+#line 2904 "ColorTransformation.c"
 	}
 }
 
@@ -3408,93 +2909,80 @@ RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransfo
 	RGBTransformation* self = NULL;
 	PixelTransformationType _tmp0_;
 	gfloat* _tmp1_;
-#line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 323 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = (RGBTransformation*) pixel_transformation_construct (object_type, _tmp0_);
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 323 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = (RGBTransformation*) pixel_transformation_construct (object_type, _tmp0_, PIXEL_FORMAT_RGB);
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gfloat, 16);
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[0] = 1.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[1] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[2] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[3] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[4] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[5] = 1.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[6] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[7] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[8] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[9] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[10] = 1.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[11] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[12] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[13] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[14] = 0.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[15] = 1.0f;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = (g_free (self->matrix_entries), NULL);
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = _tmp1_;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries_length1 = 16;
-#line 420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 3457 "ColorTransformation.c"
+#line 2959 "ColorTransformation.c"
 }
 
 
 RGBTransformation* rgb_transformation_new (PixelTransformationType type) {
-#line 420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return rgb_transformation_construct (TYPE_RGB_TRANSFORMATION, type);
-#line 3464 "ColorTransformation.c"
-}
-
-
-static PixelFormat rgb_transformation_real_get_preferred_format (PixelTransformation* base) {
-	RGBTransformation * self;
-	PixelFormat result = 0;
-#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	result = PIXEL_FORMAT_RGB;
-#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return result;
-#line 3477 "ColorTransformation.c"
+#line 2966 "ColorTransformation.c"
 }
 
 
 static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransformation* base) {
 	RGBTransformation * self;
 	CompositionMode result = 0;
-#line 438 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = COMPOSITION_MODE_RGB_MATRIX;
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3490 "ColorTransformation.c"
+#line 2979 "ColorTransformation.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 3497 "ColorTransformation.c"
+#line 2986 "ColorTransformation.c"
 }
 
 
@@ -4007,1071 +3495,1069 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 	gfloat _tmp356_;
 	gboolean _tmp366_ = FALSE;
 	gboolean _tmp367_;
-#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (other));
-#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = other;
-#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixel_transformation_get_composition_mode (_tmp0_);
-#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_ != COMPOSITION_MODE_RGB_MATRIX) {
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:444: %s", "RGBTransformation: compose_with( ): 'other' transformation " "does not support RGB_MATRIX composition mode");
-#line 4022 "ColorTransformation.c"
+#line 342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:342: %s", "RGBTransformation: compose_with( ): 'other' transformation " "does not support RGB_MATRIX composition mode");
+#line 3509 "ColorTransformation.c"
 	}
-#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = other;
-#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_RGB_TRANSFORMATION, RGBTransformation));
-#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	transform = _tmp3_;
-#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = g_new0 (gfloat, 16);
-#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries = _tmp4_;
-#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries_length1 = 16;
-#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_matrix_entries_size_ = result_matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = result_matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5__length1 = result_matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = transform;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7__length1 = _tmp6_->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp7_[0];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = self->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9__length1 = self->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = _tmp9_[0];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = transform;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = _tmp11_->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12__length1 = _tmp11_->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_[1];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = self->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14__length1 = self->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_[4];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = transform;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17__length1 = _tmp16_->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = _tmp17_[2];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = self->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19__length1 = self->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = _tmp19_[8];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = transform;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = _tmp21_->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22__length1 = _tmp21_->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_[3];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = self->matrix_entries;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24__length1 = self->matrix_entries_length1;
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = _tmp24_[12];
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_[0] = (((_tmp8_ * _tmp10_) + (_tmp13_ * _tmp15_)) + (_tmp18_ * _tmp20_)) + (_tmp23_ * _tmp25_);
-#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = _tmp5_[0];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = result_matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27__length1 = result_matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = transform;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp28_->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29__length1 = _tmp28_->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = _tmp29_[0];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = self->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31__length1 = self->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = _tmp31_[1];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = transform;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = _tmp33_->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34__length1 = _tmp33_->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_[1];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36_ = self->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36__length1 = self->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp37_ = _tmp36_[5];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38_ = transform;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39_ = _tmp38_->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39__length1 = _tmp38_->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40_ = _tmp39_[2];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = self->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41__length1 = self->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = _tmp41_[9];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = transform;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = _tmp43_->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44__length1 = _tmp43_->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = _tmp44_[3];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = self->matrix_entries;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46__length1 = self->matrix_entries_length1;
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = _tmp46_[13];
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_[1] = (((_tmp30_ * _tmp32_) + (_tmp35_ * _tmp37_)) + (_tmp40_ * _tmp42_)) + (_tmp45_ * _tmp47_);
-#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = _tmp27_[1];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = result_matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49__length1 = result_matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = transform;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51__length1 = _tmp50_->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = _tmp51_[0];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = self->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53__length1 = self->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp53_[2];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = transform;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = _tmp55_->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56__length1 = _tmp55_->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_[1];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = self->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58__length1 = self->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp59_ = _tmp58_[6];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = transform;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61_ = _tmp60_->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61__length1 = _tmp60_->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp62_ = _tmp61_[2];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_ = self->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63__length1 = self->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64_ = _tmp63_[10];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp65_ = transform;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66_ = _tmp65_->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66__length1 = _tmp65_->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp67_ = _tmp66_[3];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68_ = self->matrix_entries;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68__length1 = self->matrix_entries_length1;
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp69_ = _tmp68_[14];
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_[2] = (((_tmp52_ * _tmp54_) + (_tmp57_ * _tmp59_)) + (_tmp62_ * _tmp64_)) + (_tmp67_ * _tmp69_);
-#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70_ = _tmp49_[2];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_ = result_matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71__length1 = result_matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp72_ = transform;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_ = _tmp72_->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73__length1 = _tmp72_->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74_ = _tmp73_[0];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75_ = self->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75__length1 = self->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76_ = _tmp75_[3];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp77_ = transform;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78_ = _tmp77_->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78__length1 = _tmp77_->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp79_ = _tmp78_[1];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80_ = self->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80__length1 = self->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp81_ = _tmp80_[7];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82_ = transform;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83_ = _tmp82_->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83__length1 = _tmp82_->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp84_ = _tmp83_[2];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_ = self->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85__length1 = self->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86_ = _tmp85_[11];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = transform;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = _tmp87_->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88__length1 = _tmp87_->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp89_ = _tmp88_[3];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90_ = self->matrix_entries;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90__length1 = self->matrix_entries_length1;
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp91_ = _tmp90_[15];
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_[3] = (((_tmp74_ * _tmp76_) + (_tmp79_ * _tmp81_)) + (_tmp84_ * _tmp86_)) + (_tmp89_ * _tmp91_);
-#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 368 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92_ = _tmp71_[3];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_ = result_matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93__length1 = result_matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94_ = transform;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95_ = _tmp94_->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95__length1 = _tmp94_->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp96_ = _tmp95_[4];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_ = self->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97__length1 = self->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98_ = _tmp97_[0];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp99_ = transform;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100_ = _tmp99_->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100__length1 = _tmp99_->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp101_ = _tmp100_[5];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102_ = self->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102__length1 = self->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp103_ = _tmp102_[4];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104_ = transform;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105_ = _tmp104_->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105__length1 = _tmp104_->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106_ = _tmp105_[6];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107_ = self->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107__length1 = self->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp108_ = _tmp107_[8];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp109_ = transform;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp110_ = _tmp109_->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp110__length1 = _tmp109_->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp111_ = _tmp110_[7];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp112_ = self->matrix_entries;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp112__length1 = self->matrix_entries_length1;
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp113_ = _tmp112_[12];
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_[4] = (((_tmp96_ * _tmp98_) + (_tmp101_ * _tmp103_)) + (_tmp106_ * _tmp108_)) + (_tmp111_ * _tmp113_);
-#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp114_ = _tmp93_[4];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115_ = result_matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115__length1 = result_matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp116_ = transform;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp117_ = _tmp116_->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp117__length1 = _tmp116_->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp118_ = _tmp117_[4];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp119_ = self->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp119__length1 = self->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp120_ = _tmp119_[1];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp121_ = transform;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122_ = _tmp121_->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122__length1 = _tmp121_->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp123_ = _tmp122_[5];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp124_ = self->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp124__length1 = self->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp125_ = _tmp124_[5];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp126_ = transform;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp127_ = _tmp126_->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp127__length1 = _tmp126_->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp128_ = _tmp127_[6];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp129_ = self->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp129__length1 = self->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp130_ = _tmp129_[9];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp131_ = transform;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp132_ = _tmp131_->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp132__length1 = _tmp131_->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp133_ = _tmp132_[7];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp134_ = self->matrix_entries;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp134__length1 = self->matrix_entries_length1;
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp135_ = _tmp134_[13];
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115_[5] = (((_tmp118_ * _tmp120_) + (_tmp123_ * _tmp125_)) + (_tmp128_ * _tmp130_)) + (_tmp133_ * _tmp135_);
-#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp136_ = _tmp115_[5];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137_ = result_matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137__length1 = result_matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp138_ = transform;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp139_ = _tmp138_->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp139__length1 = _tmp138_->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp140_ = _tmp139_[4];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp141_ = self->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp141__length1 = self->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp142_ = _tmp141_[2];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp143_ = transform;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp144_ = _tmp143_->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp144__length1 = _tmp143_->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp145_ = _tmp144_[5];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp146_ = self->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp146__length1 = self->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp147_ = _tmp146_[6];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp148_ = transform;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp149_ = _tmp148_->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp149__length1 = _tmp148_->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp150_ = _tmp149_[6];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp151_ = self->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp151__length1 = self->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp152_ = _tmp151_[10];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp153_ = transform;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp154_ = _tmp153_->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp154__length1 = _tmp153_->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp155_ = _tmp154_[7];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp156_ = self->matrix_entries;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp156__length1 = self->matrix_entries_length1;
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp157_ = _tmp156_[14];
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137_[6] = (((_tmp140_ * _tmp142_) + (_tmp145_ * _tmp147_)) + (_tmp150_ * _tmp152_)) + (_tmp155_ * _tmp157_);
-#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp158_ = _tmp137_[6];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159_ = result_matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159__length1 = result_matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp160_ = transform;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp161_ = _tmp160_->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp161__length1 = _tmp160_->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp162_ = _tmp161_[4];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp163_ = self->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp163__length1 = self->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp164_ = _tmp163_[3];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp165_ = transform;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp166_ = _tmp165_->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp166__length1 = _tmp165_->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp167_ = _tmp166_[5];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp168_ = self->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp168__length1 = self->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp169_ = _tmp168_[7];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp170_ = transform;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp171_ = _tmp170_->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp171__length1 = _tmp170_->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp172_ = _tmp171_[6];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp173_ = self->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp173__length1 = self->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp174_ = _tmp173_[11];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp175_ = transform;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp176_ = _tmp175_->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp176__length1 = _tmp175_->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp177_ = _tmp176_[7];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp178_ = self->matrix_entries;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp178__length1 = self->matrix_entries_length1;
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp179_ = _tmp178_[15];
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159_[7] = (((_tmp162_ * _tmp164_) + (_tmp167_ * _tmp169_)) + (_tmp172_ * _tmp174_)) + (_tmp177_ * _tmp179_);
-#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp180_ = _tmp159_[7];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181_ = result_matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181__length1 = result_matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp182_ = transform;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp183_ = _tmp182_->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp183__length1 = _tmp182_->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp184_ = _tmp183_[8];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp185_ = self->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp185__length1 = self->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp186_ = _tmp185_[0];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp187_ = transform;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp188_ = _tmp187_->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp188__length1 = _tmp187_->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp189_ = _tmp188_[9];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp190_ = self->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp190__length1 = self->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp191_ = _tmp190_[4];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp192_ = transform;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp193_ = _tmp192_->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp193__length1 = _tmp192_->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp194_ = _tmp193_[10];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp195_ = self->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp195__length1 = self->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp196_ = _tmp195_[8];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp197_ = transform;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp198_ = _tmp197_->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp198__length1 = _tmp197_->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp199_ = _tmp198_[11];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp200_ = self->matrix_entries;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp200__length1 = self->matrix_entries_length1;
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp201_ = _tmp200_[12];
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181_[8] = (((_tmp184_ * _tmp186_) + (_tmp189_ * _tmp191_)) + (_tmp194_ * _tmp196_)) + (_tmp199_ * _tmp201_);
-#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp202_ = _tmp181_[8];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203_ = result_matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203__length1 = result_matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp204_ = transform;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp205_ = _tmp204_->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp205__length1 = _tmp204_->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp206_ = _tmp205_[8];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp207_ = self->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp207__length1 = self->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp208_ = _tmp207_[1];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp209_ = transform;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp210_ = _tmp209_->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp210__length1 = _tmp209_->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp211_ = _tmp210_[9];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp212_ = self->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp212__length1 = self->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp213_ = _tmp212_[5];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp214_ = transform;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp215_ = _tmp214_->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp215__length1 = _tmp214_->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp216_ = _tmp215_[10];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp217_ = self->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp217__length1 = self->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp218_ = _tmp217_[9];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp219_ = transform;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp220_ = _tmp219_->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp220__length1 = _tmp219_->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp221_ = _tmp220_[11];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp222_ = self->matrix_entries;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp222__length1 = self->matrix_entries_length1;
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp223_ = _tmp222_[13];
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203_[9] = (((_tmp206_ * _tmp208_) + (_tmp211_ * _tmp213_)) + (_tmp216_ * _tmp218_)) + (_tmp221_ * _tmp223_);
-#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp224_ = _tmp203_[9];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225_ = result_matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225__length1 = result_matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp226_ = transform;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp227_ = _tmp226_->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp227__length1 = _tmp226_->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp228_ = _tmp227_[8];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp229_ = self->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp229__length1 = self->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp230_ = _tmp229_[2];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp231_ = transform;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp232_ = _tmp231_->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp232__length1 = _tmp231_->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp233_ = _tmp232_[9];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp234_ = self->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp234__length1 = self->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp235_ = _tmp234_[6];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp236_ = transform;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp237_ = _tmp236_->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp237__length1 = _tmp236_->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp238_ = _tmp237_[10];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp239_ = self->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp239__length1 = self->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp240_ = _tmp239_[10];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp241_ = transform;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp242_ = _tmp241_->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp242__length1 = _tmp241_->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp243_ = _tmp242_[11];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp244_ = self->matrix_entries;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp244__length1 = self->matrix_entries_length1;
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp245_ = _tmp244_[14];
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225_[10] = (((_tmp228_ * _tmp230_) + (_tmp233_ * _tmp235_)) + (_tmp238_ * _tmp240_)) + (_tmp243_ * _tmp245_);
-#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp246_ = _tmp225_[10];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247_ = result_matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247__length1 = result_matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp248_ = transform;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp249_ = _tmp248_->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp249__length1 = _tmp248_->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp250_ = _tmp249_[8];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp251_ = self->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp251__length1 = self->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp252_ = _tmp251_[3];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp253_ = transform;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp254_ = _tmp253_->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp254__length1 = _tmp253_->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp255_ = _tmp254_[9];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp256_ = self->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp256__length1 = self->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp257_ = _tmp256_[7];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp258_ = transform;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp259_ = _tmp258_->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp259__length1 = _tmp258_->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp260_ = _tmp259_[10];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp261_ = self->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp261__length1 = self->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp262_ = _tmp261_[11];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp263_ = transform;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp264_ = _tmp263_->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp264__length1 = _tmp263_->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp265_ = _tmp264_[11];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp266_ = self->matrix_entries;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp266__length1 = self->matrix_entries_length1;
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp267_ = _tmp266_[15];
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247_[11] = (((_tmp250_ * _tmp252_) + (_tmp255_ * _tmp257_)) + (_tmp260_ * _tmp262_)) + (_tmp265_ * _tmp267_);
-#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp268_ = _tmp247_[11];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269_ = result_matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269__length1 = result_matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp270_ = transform;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp271_ = _tmp270_->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp271__length1 = _tmp270_->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp272_ = _tmp271_[12];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp273_ = self->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp273__length1 = self->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp274_ = _tmp273_[0];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp275_ = transform;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp276_ = _tmp275_->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp276__length1 = _tmp275_->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp277_ = _tmp276_[13];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp278_ = self->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp278__length1 = self->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp279_ = _tmp278_[4];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp280_ = transform;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp281_ = _tmp280_->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp281__length1 = _tmp280_->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp282_ = _tmp281_[14];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp283_ = self->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp283__length1 = self->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp284_ = _tmp283_[8];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp285_ = transform;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp286_ = _tmp285_->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp286__length1 = _tmp285_->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp287_ = _tmp286_[15];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp288_ = self->matrix_entries;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp288__length1 = self->matrix_entries_length1;
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp289_ = _tmp288_[12];
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269_[12] = (((_tmp272_ * _tmp274_) + (_tmp277_ * _tmp279_)) + (_tmp282_ * _tmp284_)) + (_tmp287_ * _tmp289_);
-#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp290_ = _tmp269_[12];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291_ = result_matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291__length1 = result_matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp292_ = transform;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp293_ = _tmp292_->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp293__length1 = _tmp292_->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp294_ = _tmp293_[12];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp295_ = self->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp295__length1 = self->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp296_ = _tmp295_[1];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp297_ = transform;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp298_ = _tmp297_->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp298__length1 = _tmp297_->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp299_ = _tmp298_[13];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp300_ = self->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp300__length1 = self->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp301_ = _tmp300_[5];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp302_ = transform;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp303_ = _tmp302_->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp303__length1 = _tmp302_->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp304_ = _tmp303_[14];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp305_ = self->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp305__length1 = self->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp306_ = _tmp305_[9];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp307_ = transform;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp308_ = _tmp307_->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp308__length1 = _tmp307_->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp309_ = _tmp308_[15];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp310_ = self->matrix_entries;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp310__length1 = self->matrix_entries_length1;
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp311_ = _tmp310_[13];
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291_[13] = (((_tmp294_ * _tmp296_) + (_tmp299_ * _tmp301_)) + (_tmp304_ * _tmp306_)) + (_tmp309_ * _tmp311_);
-#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp312_ = _tmp291_[13];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313_ = result_matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313__length1 = result_matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp314_ = transform;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp315_ = _tmp314_->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp315__length1 = _tmp314_->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp316_ = _tmp315_[12];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp317_ = self->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp317__length1 = self->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp318_ = _tmp317_[2];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp319_ = transform;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp320_ = _tmp319_->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp320__length1 = _tmp319_->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp321_ = _tmp320_[13];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp322_ = self->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp322__length1 = self->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp323_ = _tmp322_[6];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp324_ = transform;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp325_ = _tmp324_->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp325__length1 = _tmp324_->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp326_ = _tmp325_[14];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp327_ = self->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp327__length1 = self->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp328_ = _tmp327_[10];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp329_ = transform;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp330_ = _tmp329_->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp330__length1 = _tmp329_->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp331_ = _tmp330_[15];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp332_ = self->matrix_entries;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp332__length1 = self->matrix_entries_length1;
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp333_ = _tmp332_[14];
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313_[14] = (((_tmp316_ * _tmp318_) + (_tmp321_ * _tmp323_)) + (_tmp326_ * _tmp328_)) + (_tmp331_ * _tmp333_);
-#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp334_ = _tmp313_[14];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335_ = result_matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335__length1 = result_matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp336_ = transform;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp337_ = _tmp336_->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp337__length1 = _tmp336_->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp338_ = _tmp337_[12];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp339_ = self->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp339__length1 = self->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp340_ = _tmp339_[3];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp341_ = transform;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp342_ = _tmp341_->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp342__length1 = _tmp341_->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp343_ = _tmp342_[13];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp344_ = self->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp344__length1 = self->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp345_ = _tmp344_[7];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp346_ = transform;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp347_ = _tmp346_->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp347__length1 = _tmp346_->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp348_ = _tmp347_[14];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp349_ = self->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp349__length1 = self->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp350_ = _tmp349_[11];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp351_ = transform;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp352_ = _tmp351_->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp352__length1 = _tmp351_->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp353_ = _tmp352_[15];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp354_ = self->matrix_entries;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp354__length1 = self->matrix_entries_length1;
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp355_ = _tmp354_[15];
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335_[15] = (((_tmp338_ * _tmp340_) + (_tmp343_ * _tmp345_)) + (_tmp348_ * _tmp350_)) + (_tmp353_ * _tmp355_);
-#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp356_ = _tmp335_[15];
-#line 5062 "ColorTransformation.c"
+#line 4549 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 5067 "ColorTransformation.c"
+#line 4554 "ColorTransformation.c"
 		{
 			gboolean _tmp357_ = FALSE;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp357_ = TRUE;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 5074 "ColorTransformation.c"
+#line 4561 "ColorTransformation.c"
 				gint _tmp359_;
 				gfloat* _tmp360_;
 				gint _tmp360__length1;
@@ -5081,74 +4567,74 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 				gint _tmp363_;
 				gfloat _tmp364_;
 				gfloat _tmp365_;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp357_) {
-#line 5086 "ColorTransformation.c"
+#line 4573 "ColorTransformation.c"
 					gint _tmp358_;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp358_ = i;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp358_ + 1;
-#line 5092 "ColorTransformation.c"
+#line 4579 "ColorTransformation.c"
 				}
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp357_ = FALSE;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp359_ = i;
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp359_ < RGB_TRANSFORMATION_MATRIX_SIZE)) {
-#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 5102 "ColorTransformation.c"
+#line 4589 "ColorTransformation.c"
 				}
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360_ = self->matrix_entries;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360__length1 = self->matrix_entries_length1;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp361_ = i;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp362_ = result_matrix_entries;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp362__length1 = result_matrix_entries_length1;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp363_ = i;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp364_ = _tmp362_[_tmp363_];
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360_[_tmp361_] = _tmp364_;
-#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp365_ = _tmp360_[_tmp361_];
-#line 5122 "ColorTransformation.c"
+#line 4609 "ColorTransformation.c"
 			}
 		}
 	}
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp367_ = self->identity;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp367_) {
-#line 5130 "ColorTransformation.c"
+#line 4617 "ColorTransformation.c"
 		RGBTransformation* _tmp368_;
 		gboolean _tmp369_;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp368_ = transform;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp369_ = _tmp368_->identity;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp366_ = _tmp369_;
-#line 5139 "ColorTransformation.c"
+#line 4626 "ColorTransformation.c"
 	} else {
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp366_ = FALSE;
-#line 5143 "ColorTransformation.c"
+#line 4630 "ColorTransformation.c"
 	}
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->identity = _tmp366_;
-#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries = (g_free (result_matrix_entries), NULL);
-#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (transform);
-#line 5151 "ColorTransformation.c"
+#line 4638 "ColorTransformation.c"
 }
 
 
@@ -5157,242 +4643,19 @@ static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* ba
 	RGBAnalyticPixel _tmp0_ = {0};
 	RGBAnalyticPixel _tmp1_ = {0};
 	HSVAnalyticPixel _tmp2_ = {0};
-#line 557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 455 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_to_rgb (p, &_tmp0_);
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_transform_pixel_rgb (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), &_tmp0_, &_tmp1_);
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_to_hsv (&_tmp1_, &_tmp2_);
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp2_;
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 5174 "ColorTransformation.c"
-}
-
-
-static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
-	RGBTransformation * self;
-	gfloat red_out = 0.0F;
-	RGBAnalyticPixel _tmp0_;
-	gfloat _tmp1_;
-	gfloat* _tmp2_;
-	gint _tmp2__length1;
-	gfloat _tmp3_;
-	RGBAnalyticPixel _tmp4_;
-	gfloat _tmp5_;
-	gfloat* _tmp6_;
-	gint _tmp6__length1;
-	gfloat _tmp7_;
-	RGBAnalyticPixel _tmp8_;
-	gfloat _tmp9_;
-	gfloat* _tmp10_;
-	gint _tmp10__length1;
-	gfloat _tmp11_;
-	gfloat* _tmp12_;
-	gint _tmp12__length1;
-	gfloat _tmp13_;
-	gfloat _tmp14_;
-	gfloat _tmp15_;
-	gfloat green_out = 0.0F;
-	RGBAnalyticPixel _tmp16_;
-	gfloat _tmp17_;
-	gfloat* _tmp18_;
-	gint _tmp18__length1;
-	gfloat _tmp19_;
-	RGBAnalyticPixel _tmp20_;
-	gfloat _tmp21_;
-	gfloat* _tmp22_;
-	gint _tmp22__length1;
-	gfloat _tmp23_;
-	RGBAnalyticPixel _tmp24_;
-	gfloat _tmp25_;
-	gfloat* _tmp26_;
-	gint _tmp26__length1;
-	gfloat _tmp27_;
-	gfloat* _tmp28_;
-	gint _tmp28__length1;
-	gfloat _tmp29_;
-	gfloat _tmp30_;
-	gfloat _tmp31_;
-	gfloat blue_out = 0.0F;
-	RGBAnalyticPixel _tmp32_;
-	gfloat _tmp33_;
-	gfloat* _tmp34_;
-	gint _tmp34__length1;
-	gfloat _tmp35_;
-	RGBAnalyticPixel _tmp36_;
-	gfloat _tmp37_;
-	gfloat* _tmp38_;
-	gint _tmp38__length1;
-	gfloat _tmp39_;
-	RGBAnalyticPixel _tmp40_;
-	gfloat _tmp41_;
-	gfloat* _tmp42_;
-	gint _tmp42__length1;
-	gfloat _tmp43_;
-	gfloat* _tmp44_;
-	gint _tmp44__length1;
-	gfloat _tmp45_;
-	gfloat _tmp46_;
-	gfloat _tmp47_;
-	gfloat _tmp48_;
-	gfloat _tmp49_;
-	gfloat _tmp50_;
-	RGBAnalyticPixel _tmp51_ = {0};
-#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *p;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = _tmp0_.red;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = self->matrix_entries;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2__length1 = self->matrix_entries_length1;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = _tmp2_[0];
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = *p;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = _tmp4_.green;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6_ = self->matrix_entries;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6__length1 = self->matrix_entries_length1;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp7_ = _tmp6_[1];
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp8_ = *p;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp9_ = _tmp8_.blue;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp10_ = self->matrix_entries;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp10__length1 = self->matrix_entries_length1;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp11_ = _tmp10_[2];
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp12_ = self->matrix_entries;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp12__length1 = self->matrix_entries_length1;
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp13_ = _tmp12_[3];
-#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	red_out = (((_tmp1_ * _tmp3_) + (_tmp5_ * _tmp7_)) + (_tmp9_ * _tmp11_)) + _tmp13_;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp14_ = red_out;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp15_ = CLAMP (_tmp14_, 0.0f, 1.0f);
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	red_out = _tmp15_;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp16_ = *p;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp17_ = _tmp16_.red;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp18_ = self->matrix_entries;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp18__length1 = self->matrix_entries_length1;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp19_ = _tmp18_[4];
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp20_ = *p;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp21_ = _tmp20_.green;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp22_ = self->matrix_entries;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp22__length1 = self->matrix_entries_length1;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp23_ = _tmp22_[5];
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp24_ = *p;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp25_ = _tmp24_.blue;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp26_ = self->matrix_entries;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp26__length1 = self->matrix_entries_length1;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp27_ = _tmp26_[6];
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp28_ = self->matrix_entries;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp28__length1 = self->matrix_entries_length1;
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp29_ = _tmp28_[7];
-#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	green_out = (((_tmp17_ * _tmp19_) + (_tmp21_ * _tmp23_)) + (_tmp25_ * _tmp27_)) + _tmp29_;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp30_ = green_out;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp31_ = CLAMP (_tmp30_, 0.0f, 1.0f);
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	green_out = _tmp31_;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp32_ = *p;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp33_ = _tmp32_.red;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp34_ = self->matrix_entries;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp34__length1 = self->matrix_entries_length1;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp35_ = _tmp34_[8];
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp36_ = *p;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp37_ = _tmp36_.green;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp38_ = self->matrix_entries;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp38__length1 = self->matrix_entries_length1;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp39_ = _tmp38_[9];
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp40_ = *p;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp41_ = _tmp40_.blue;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp42_ = self->matrix_entries;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp42__length1 = self->matrix_entries_length1;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp43_ = _tmp42_[10];
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp44_ = self->matrix_entries;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp44__length1 = self->matrix_entries_length1;
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp45_ = _tmp44_[11];
-#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	blue_out = (((_tmp33_ * _tmp35_) + (_tmp37_ * _tmp39_)) + (_tmp41_ * _tmp43_)) + _tmp45_;
-#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp46_ = blue_out;
-#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp47_ = CLAMP (_tmp46_, 0.0f, 1.0f);
-#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	blue_out = _tmp47_;
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp48_ = red_out;
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp49_ = green_out;
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp50_ = blue_out;
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	rgb_analytic_pixel_init_from_components (&_tmp51_, _tmp48_, _tmp49_, _tmp50_);
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = _tmp51_;
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 5395 "ColorTransformation.c"
+#line 4659 "ColorTransformation.c"
 }
 
 
@@ -5400,15 +4663,15 @@ static gboolean rgb_transformation_real_is_identity (PixelTransformation* base)
 	RGBTransformation * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 461 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->identity;
-#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5411 "ColorTransformation.c"
+#line 4675 "ColorTransformation.c"
 }
 
 
@@ -5418,27 +4681,27 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 	RGBTransformation* _result_ = NULL;
 	PixelTransformationType _tmp0_;
 	RGBTransformation* _tmp1_;
-#line 587 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 465 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_get_transformation_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = rgb_transformation_new (_tmp0_);
-#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_ = _tmp1_;
-#line 5429 "ColorTransformation.c"
+#line 4693 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 5434 "ColorTransformation.c"
+#line 4698 "ColorTransformation.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp2_ = TRUE;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 5441 "ColorTransformation.c"
+#line 4705 "ColorTransformation.c"
 				gint _tmp4_;
 				RGBTransformation* _tmp5_;
 				gfloat* _tmp6_;
@@ -5449,97 +4712,95 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 				gint _tmp9_;
 				gfloat _tmp10_;
 				gfloat _tmp11_;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp2_) {
-#line 5454 "ColorTransformation.c"
+#line 4718 "ColorTransformation.c"
 					gint _tmp3_;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp3_ = i;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp3_ + 1;
-#line 5460 "ColorTransformation.c"
+#line 4724 "ColorTransformation.c"
 				}
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp2_ = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = i;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp4_ < RGB_TRANSFORMATION_MATRIX_SIZE)) {
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 5470 "ColorTransformation.c"
+#line 4734 "ColorTransformation.c"
 				}
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = _result_;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = _tmp5_->matrix_entries;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6__length1 = _tmp5_->matrix_entries_length1;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = i;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = self->matrix_entries;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8__length1 = self->matrix_entries_length1;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = i;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = _tmp8_[_tmp9_];
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_[_tmp7_] = _tmp10_;
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = _tmp6_[_tmp7_];
-#line 5492 "ColorTransformation.c"
+#line 4756 "ColorTransformation.c"
 			}
 		}
 	}
-#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 472 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 472 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5500 "ColorTransformation.c"
+#line 4764 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_class_init (RGBTransformationClass * klass) {
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = rgb_transformation_finalize;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) rgb_transformation_real_get_preferred_format;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*) (PixelTransformation *)) rgb_transformation_real_get_composition_mode;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) rgb_transformation_real_compose_with;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) rgb_transformation_real_transform_pixel_hsv;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) rgb_transformation_real_transform_pixel_rgb;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) rgb_transformation_real_is_identity;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) rgb_transformation_real_copy;
-#line 5523 "ColorTransformation.c"
+#line 4785 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_instance_init (RGBTransformation * self) {
-#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 320 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->identity = TRUE;
-#line 5530 "ColorTransformation.c"
+#line 4792 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_finalize (PixelTransformation * obj) {
 	RGBTransformation * self;
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 414 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 316 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = (g_free (self->matrix_entries), NULL);
-#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (rgb_transformation_parent_class)->finalize (obj);
-#line 5542 "ColorTransformation.c"
+#line 4804 "ColorTransformation.c"
 }
 
 
@@ -5558,26 +4819,26 @@ GType rgb_transformation_get_type (void) {
 HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type) {
 	HSVTransformation* self = NULL;
 	PixelTransformationType _tmp0_;
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 480 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = (HSVTransformation*) pixel_transformation_construct (object_type, _tmp0_);
-#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 480 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = (HSVTransformation*) pixel_transformation_construct (object_type, _tmp0_, PIXEL_FORMAT_HSV);
+#line 479 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5567 "ColorTransformation.c"
+#line 4829 "ColorTransformation.c"
 }
 
 
-static PixelFormat hsv_transformation_real_get_preferred_format (PixelTransformation* base) {
+static CompositionMode hsv_transformation_real_get_composition_mode (PixelTransformation* base) {
 	HSVTransformation * self;
-	PixelFormat result = 0;
-#line 603 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	CompositionMode result = 0;
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	result = PIXEL_FORMAT_HSV;
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	result = COMPOSITION_MODE_HSV_LOOKUP;
+#line 484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5580 "ColorTransformation.c"
+#line 4842 "ColorTransformation.c"
 }
 
 
@@ -5586,32 +4847,177 @@ static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* ba
 	HSVAnalyticPixel _tmp0_ = {0};
 	HSVAnalyticPixel _tmp1_ = {0};
 	RGBAnalyticPixel _tmp2_ = {0};
-#line 607 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
-#line 607 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_to_hsv (p, &_tmp0_);
-#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_transform_pixel_hsv (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), &_tmp0_, &_tmp1_);
-#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_to_rgb (&_tmp1_, &_tmp2_);
-#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp2_;
-#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return;
+#line 4863 "ColorTransformation.c"
+}
+
+
+static void hsv_transformation_real_compose_with (PixelTransformation* base, PixelTransformation* other) {
+	HSVTransformation * self;
+	PixelTransformation* _tmp0_;
+	CompositionMode _tmp1_;
+	HSVTransformation* hsv_trans = NULL;
+	PixelTransformation* _tmp2_;
+	HSVTransformation* _tmp3_;
+#line 491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
+#line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = other;
+#line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = pixel_transformation_get_composition_mode (_tmp0_);
+#line 492 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp1_ != COMPOSITION_MODE_HSV_LOOKUP) {
+#line 493 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:493: HSVTransformation: compose_with(): wrong");
+#line 4884 "ColorTransformation.c"
+	}
+#line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = other;
+#line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_HSV_TRANSFORMATION, HSVTransformation));
+#line 496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	hsv_trans = _tmp3_;
+#line 4892 "ColorTransformation.c"
+	{
+		gint i = 0;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		i = 0;
+#line 4897 "ColorTransformation.c"
+		{
+			gboolean _tmp4_ = FALSE;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp4_ = TRUE;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			while (TRUE) {
+#line 4904 "ColorTransformation.c"
+				gint _tmp6_;
+				gint idx = 0;
+				gint _tmp7_;
+				gfloat _tmp8_;
+				gint _tmp9_;
+				HSVTransformation* _tmp10_;
+				gint _tmp11_;
+				gfloat _tmp12_;
+				gfloat _tmp13_;
+				gfloat _tmp14_;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp4_) {
+#line 4917 "ColorTransformation.c"
+					gint _tmp5_;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp5_ = i;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					i = _tmp5_ + 1;
+#line 4923 "ColorTransformation.c"
+				}
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp4_ = FALSE;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp6_ = i;
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp6_ < 256)) {
+#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					break;
+#line 4933 "ColorTransformation.c"
+				}
+#line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp7_ = i;
+#line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = self->remap_table[_tmp7_];
+#line 501 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				idx = (gint) (_tmp8_ * 255.0f);
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9_ = i;
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10_ = hsv_trans;
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp11_ = idx;
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp12_ = _tmp10_->remap_table[_tmp11_];
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp13_ = CLAMP (_tmp12_, 0.0f, 1.0f);
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				self->remap_table[_tmp9_] = _tmp13_;
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp14_ = self->remap_table[_tmp9_];
+#line 4955 "ColorTransformation.c"
+			}
+		}
+	}
+#line 491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (hsv_trans);
+#line 4961 "ColorTransformation.c"
+}
+
+
+static void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
+	HSVTransformation * self;
+	gint remap_index = 0;
+	HSVAnalyticPixel _tmp0_;
+	gfloat _tmp1_;
+	HSVAnalyticPixel _result_ = {0};
+	HSVAnalyticPixel _tmp2_;
+	gfloat _tmp3_;
+	HSVAnalyticPixel _tmp4_;
+	gfloat _tmp5_;
+	gfloat _tmp6_;
+#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
+#line 507 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = *pixel;
+#line 507 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = _tmp0_.light_value;
+#line 507 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	remap_index = (gint) (_tmp1_ * 255.0f);
+#line 509 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = *pixel;
+#line 509 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_result_ = _tmp2_;
+#line 510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp3_ = self->remap_table[remap_index];
+#line 510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_result_.light_value = _tmp3_;
+#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp4_ = _result_;
+#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp5_ = _tmp4_.light_value;
+#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp6_ = CLAMP (_tmp5_, 0.0f, 1.0f);
+#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_result_.light_value = _tmp6_;
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	*result = _result_;
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 5603 "ColorTransformation.c"
+#line 5004 "ColorTransformation.c"
 }
 
 
 static void hsv_transformation_class_init (HSVTransformationClass * klass) {
-#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->get_preferred_format = (PixelFormat (*) (PixelTransformation *)) hsv_transformation_real_get_preferred_format;
-#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	((PixelTransformationClass *) klass)->finalize = hsv_transformation_finalize;
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	((PixelTransformationClass *) klass)->get_composition_mode = (CompositionMode (*) (PixelTransformation *)) hsv_transformation_real_get_composition_mode;
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = (void (*) (PixelTransformation *, RGBAnalyticPixel*, RGBAnalyticPixel*)) hsv_transformation_real_transform_pixel_rgb;
-#line 5614 "ColorTransformation.c"
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	((PixelTransformationClass *) klass)->compose_with = (void (*) (PixelTransformation *, PixelTransformation*)) hsv_transformation_real_compose_with;
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) hsv_transformation_real_transform_pixel_hsv;
+#line 5021 "ColorTransformation.c"
 }
 
 
@@ -5619,6 +5025,16 @@ static void hsv_transformation_instance_init (HSVTransformation * self) {
 }
 
 
+static void hsv_transformation_finalize (PixelTransformation * obj) {
+	HSVTransformation * self;
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HSV_TRANSFORMATION, HSVTransformation);
+#line 476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	PIXEL_TRANSFORMATION_CLASS (hsv_transformation_parent_class)->finalize (obj);
+#line 5035 "ColorTransformation.c"
+}
+
+
 GType hsv_transformation_get_type (void) {
 	static volatile gsize hsv_transformation_type_id__volatile = 0;
 	if (g_once_init_enter (&hsv_transformation_type_id__volatile)) {
@@ -5636,19 +5052,19 @@ TintTransformation* tint_transformation_construct (GType object_type, gfloat cli
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TintTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_param;
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, TINT_TRANSFORMATION_MIN_PARAMETER, TINT_TRANSFORMATION_MAX_PARAMETER);
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5651 "ColorTransformation.c"
+#line 5068 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_;
 		gfloat _tmp4_;
@@ -5664,101 +5080,99 @@ TintTransformation* tint_transformation_construct (GType object_type, gfloat cli
 		gint _tmp11__length1;
 		gfloat _tmp12_;
 		gfloat _tmp13_;
-#line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 532 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 532 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / TINT_TRANSFORMATION_MAX_PARAMETER;
-#line 626 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 626 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ * TINT_TRANSFORMATION_INTENSITY_FACTOR;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[11] -= _tmp6_ / 2;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[11];
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = adjusted_param;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_[7] += _tmp9_;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 536 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = _tmp8_[7];
-#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = adjusted_param;
-#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_[3] -= _tmp12_ / 2;
-#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp11_[3];
-#line 632 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 5707 "ColorTransformation.c"
+#line 5124 "ColorTransformation.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 526 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5711 "ColorTransformation.c"
+#line 5128 "ColorTransformation.c"
 }
 
 
 TintTransformation* tint_transformation_new (gfloat client_param) {
-#line 619 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 526 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return tint_transformation_construct (TYPE_TINT_TRANSFORMATION, client_param);
-#line 5718 "ColorTransformation.c"
+#line 5135 "ColorTransformation.c"
 }
 
 
 gfloat tint_transformation_get_parameter (TintTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 636 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_TINT_TRANSFORMATION (self), 0.0F);
-#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5733 "ColorTransformation.c"
+#line 5148 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_class_init (TintTransformationClass * klass) {
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	tint_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = tint_transformation_finalize;
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (TintTransformationPrivate));
-#line 5744 "ColorTransformation.c"
+#line 5159 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_instance_init (TintTransformation * self) {
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = TINT_TRANSFORMATION_GET_PRIVATE (self);
-#line 5751 "ColorTransformation.c"
+#line 5166 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_finalize (PixelTransformation * obj) {
 	TintTransformation * self;
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (tint_transformation_parent_class)->finalize (obj);
-#line 5761 "ColorTransformation.c"
+#line 5176 "ColorTransformation.c"
 }
 
 
@@ -5779,19 +5193,19 @@ TemperatureTransformation* temperature_transformation_construct (GType object_ty
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TemperatureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, TEMPERATURE_TRANSFORMATION_MAX_PARAMETER);
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 653 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 653 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5794 "ColorTransformation.c"
+#line 5209 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_;
 		gfloat _tmp4_;
@@ -5807,101 +5221,99 @@ TemperatureTransformation* temperature_transformation_construct (GType object_ty
 		gint _tmp11__length1;
 		gfloat _tmp12_;
 		gfloat _tmp13_;
-#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / TEMPERATURE_TRANSFORMATION_MAX_PARAMETER;
-#line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ * TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[11] -= _tmp6_;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[11];
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = adjusted_param;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_[7] += _tmp9_ / 2;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 565 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = _tmp8_[7];
-#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = adjusted_param;
-#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_[3] += _tmp12_ / 2;
-#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp11_[3];
-#line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 5850 "ColorTransformation.c"
+#line 5265 "ColorTransformation.c"
 	}
-#line 648 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5854 "ColorTransformation.c"
+#line 5269 "ColorTransformation.c"
 }
 
 
 TemperatureTransformation* temperature_transformation_new (gfloat client_parameter) {
-#line 648 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return temperature_transformation_construct (TYPE_TEMPERATURE_TRANSFORMATION, client_parameter);
-#line 5861 "ColorTransformation.c"
+#line 5276 "ColorTransformation.c"
 }
 
 
 gfloat temperature_transformation_get_parameter (TemperatureTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_TEMPERATURE_TRANSFORMATION (self), 0.0F);
-#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 573 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 573 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 573 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5876 "ColorTransformation.c"
+#line 5289 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_class_init (TemperatureTransformationClass * klass) {
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temperature_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = temperature_transformation_finalize;
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (TemperatureTransformationPrivate));
-#line 5887 "ColorTransformation.c"
+#line 5300 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_instance_init (TemperatureTransformation * self) {
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = TEMPERATURE_TRANSFORMATION_GET_PRIVATE (self);
-#line 5894 "ColorTransformation.c"
+#line 5307 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_finalize (PixelTransformation * obj) {
 	TemperatureTransformation * self;
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 548 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (temperature_transformation_parent_class)->finalize (obj);
-#line 5904 "ColorTransformation.c"
+#line 5317 "ColorTransformation.c"
 }
 
 
@@ -5922,19 +5334,19 @@ SaturationTransformation* saturation_transformation_construct (GType object_type
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 677 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (SaturationTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, SATURATION_TRANSFORMATION_MIN_PARAMETER, SATURATION_TRANSFORMATION_MAX_PARAMETER);
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5937 "ColorTransformation.c"
+#line 5350 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_;
 		gfloat _tmp4_;
@@ -5987,187 +5399,185 @@ SaturationTransformation* saturation_transformation_construct (GType object_type
 		gfloat _tmp41_;
 		gfloat _tmp42_;
 		gfloat _tmp43_;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 589 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 589 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / SATURATION_TRANSFORMATION_MAX_PARAMETER;
-#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ + 1.0f;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 592 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		one_third = 0.3333333f;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = one_third;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = adjusted_param;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[0] = ((1.0f - _tmp6_) * _tmp7_) + _tmp8_;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = _tmp5_[0];
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = adjusted_param;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = one_third;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_[1] = (1.0f - _tmp11_) * _tmp12_;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp10_[1];
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp15_ = adjusted_param;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp16_ = one_third;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14_[2] = (1.0f - _tmp15_) * _tmp16_;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 597 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp17_ = _tmp14_[2];
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp19_ = adjusted_param;
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = one_third;
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_[4] = (1.0f - _tmp19_) * _tmp20_;
-#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = _tmp18_[4];
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = adjusted_param;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp24_ = one_third;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = adjusted_param;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22_[5] = ((1.0f - _tmp23_) * _tmp24_) + _tmp25_;
-#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = _tmp22_[5];
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = adjusted_param;
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp29_ = one_third;
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_[6] = (1.0f - _tmp28_) * _tmp29_;
-#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 602 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp30_ = _tmp27_[6];
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp32_ = adjusted_param;
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp33_ = one_third;
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_[8] = (1.0f - _tmp32_) * _tmp33_;
-#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp34_ = _tmp31_[8];
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = adjusted_param;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = one_third;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_[9] = (1.0f - _tmp36_) * _tmp37_;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 605 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp38_ = _tmp35_[9];
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp40_ = adjusted_param;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp41_ = one_third;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp42_ = adjusted_param;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_[10] = ((1.0f - _tmp40_) * _tmp41_) + _tmp42_;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 606 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp43_ = _tmp39_[10];
-#line 702 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 609 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 6116 "ColorTransformation.c"
+#line 5529 "ColorTransformation.c"
 	}
-#line 676 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6120 "ColorTransformation.c"
+#line 5533 "ColorTransformation.c"
 }
 
 
 SaturationTransformation* saturation_transformation_new (gfloat client_parameter) {
-#line 676 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return saturation_transformation_construct (TYPE_SATURATION_TRANSFORMATION, client_parameter);
-#line 6127 "ColorTransformation.c"
+#line 5540 "ColorTransformation.c"
 }
 
 
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_SATURATION_TRANSFORMATION (self), 0.0F);
-#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6142 "ColorTransformation.c"
+#line 5553 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_class_init (SaturationTransformationClass * klass) {
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	saturation_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = saturation_transformation_finalize;
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (SaturationTransformationPrivate));
-#line 6153 "ColorTransformation.c"
+#line 5564 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_instance_init (SaturationTransformation * self) {
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = SATURATION_TRANSFORMATION_GET_PRIVATE (self);
-#line 6160 "ColorTransformation.c"
+#line 5571 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_finalize (PixelTransformation * obj) {
 	SaturationTransformation * self;
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 577 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (saturation_transformation_parent_class)->finalize (obj);
-#line 6170 "ColorTransformation.c"
+#line 5581 "ColorTransformation.c"
 }
 
 
@@ -6188,19 +5598,19 @@ ExposureTransformation* exposure_transformation_construct (GType object_type, gf
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExposureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, EXPOSURE_TRANSFORMATION_MIN_PARAMETER, EXPOSURE_TRANSFORMATION_MAX_PARAMETER);
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 627 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 6203 "ColorTransformation.c"
+#line 5614 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_;
 		gfloat* _tmp4_;
@@ -6215,97 +5625,95 @@ ExposureTransformation* exposure_transformation_construct (GType object_type, gf
 		gint _tmp10__length1;
 		gfloat _tmp11_;
 		gfloat _tmp12_;
-#line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 631 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 631 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = ((_tmp3_ + 16.0f) / 32.0f) + 0.5f;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = adjusted_param;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_[0] = _tmp5_;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = _tmp4_[0];
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = adjusted_param;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_[5] = _tmp8_;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 634 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = _tmp7_[5];
-#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = adjusted_param;
-#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_[10] = _tmp11_;
-#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 635 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = _tmp10_[10];
-#line 730 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 6254 "ColorTransformation.c"
+#line 5665 "ColorTransformation.c"
 	}
-#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6258 "ColorTransformation.c"
+#line 5669 "ColorTransformation.c"
 }
 
 
 ExposureTransformation* exposure_transformation_new (gfloat client_parameter) {
-#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return exposure_transformation_construct (TYPE_EXPOSURE_TRANSFORMATION, client_parameter);
-#line 6265 "ColorTransformation.c"
+#line 5676 "ColorTransformation.c"
 }
 
 
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_EXPOSURE_TRANSFORMATION (self), 0.0F);
-#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 642 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 642 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 642 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6280 "ColorTransformation.c"
+#line 5689 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_class_init (ExposureTransformationClass * klass) {
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	exposure_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = exposure_transformation_finalize;
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ExposureTransformationPrivate));
-#line 6291 "ColorTransformation.c"
+#line 5700 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_instance_init (ExposureTransformation * self) {
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = EXPOSURE_TRANSFORMATION_GET_PRIVATE (self);
-#line 6298 "ColorTransformation.c"
+#line 5707 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_finalize (PixelTransformation * obj) {
 	ExposureTransformation * self;
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (exposure_transformation_parent_class)->finalize (obj);
-#line 6308 "ColorTransformation.c"
+#line 5717 "ColorTransformation.c"
 }
 
 
@@ -6326,19 +5734,19 @@ ContrastTransformation* contrast_transformation_construct (GType object_type, gf
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ContrastTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, CONTRAST_TRANSFORMATION_MIN_PARAMETER, CONTRAST_TRANSFORMATION_MAX_PARAMETER);
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 6341 "ColorTransformation.c"
+#line 5750 "ColorTransformation.c"
 		gfloat contrast_adjustment = 0.0F;
 		gfloat _tmp3_;
 		gfloat component_coefficient = 0.0F;
@@ -6369,135 +5777,133 @@ ContrastTransformation* contrast_transformation_construct (GType object_type, gf
 		gint _tmp21__length1;
 		gfloat _tmp22_;
 		gfloat _tmp23_;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		contrast_adjustment = (_tmp3_ / 16.0f) * CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT;
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = contrast_adjustment;
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		component_coefficient = 1.0f + _tmp4_;
-#line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 663 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = contrast_adjustment;
-#line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 663 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		component_offset = _tmp5_ / (-2.0f);
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = component_coefficient;
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_[0] = _tmp7_;
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = _tmp6_[0];
-#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = component_coefficient;
-#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_[5] = _tmp10_;
-#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = _tmp9_[5];
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = component_coefficient;
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_[10] = _tmp13_;
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 667 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14_ = _tmp12_[10];
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp15__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp16_ = component_offset;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp15_[3] = _tmp16_;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp17_ = _tmp15_[3];
-#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp19_ = component_offset;
-#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_[7] = _tmp19_;
-#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = _tmp18_[7];
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22_ = component_offset;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_[11] = _tmp22_;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = _tmp21_[11];
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 673 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 6446 "ColorTransformation.c"
+#line 5855 "ColorTransformation.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6450 "ColorTransformation.c"
+#line 5859 "ColorTransformation.c"
 }
 
 
 ContrastTransformation* contrast_transformation_new (gfloat client_parameter) {
-#line 747 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return contrast_transformation_construct (TYPE_CONTRAST_TRANSFORMATION, client_parameter);
-#line 6457 "ColorTransformation.c"
+#line 5866 "ColorTransformation.c"
 }
 
 
 gfloat contrast_transformation_get_parameter (ContrastTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_CONTRAST_TRANSFORMATION (self), 0.0F);
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 678 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 678 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 678 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6472 "ColorTransformation.c"
+#line 5879 "ColorTransformation.c"
 }
 
 
 static void contrast_transformation_class_init (ContrastTransformationClass * klass) {
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	contrast_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = contrast_transformation_finalize;
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ContrastTransformationPrivate));
-#line 6483 "ColorTransformation.c"
+#line 5890 "ColorTransformation.c"
 }
 
 
 static void contrast_transformation_instance_init (ContrastTransformation * self) {
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = CONTRAST_TRANSFORMATION_GET_PRIVATE (self);
-#line 6490 "ColorTransformation.c"
+#line 5897 "ColorTransformation.c"
 }
 
 
 static void contrast_transformation_finalize (PixelTransformation * obj) {
 	ContrastTransformation * self;
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (contrast_transformation_parent_class)->finalize (obj);
-#line 6500 "ColorTransformation.c"
+#line 5907 "ColorTransformation.c"
 }
 
 
@@ -6515,25 +5921,25 @@ GType contrast_transformation_get_type (void) {
 
 PixelTransformer* pixel_transformer_construct (GType object_type) {
 	PixelTransformer* self = NULL;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformer*) g_type_create_instance (object_type);
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6522 "ColorTransformation.c"
+#line 5929 "ColorTransformation.c"
 }
 
 
 PixelTransformer* pixel_transformer_new (void) {
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 688 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return pixel_transformer_construct (TYPE_PIXEL_TRANSFORMER);
-#line 6529 "ColorTransformation.c"
+#line 5936 "ColorTransformation.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 6536 "ColorTransformation.c"
+#line 5943 "ColorTransformation.c"
 }
 
 
@@ -6541,13 +5947,11 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 	PixelTransformer* result = NULL;
 	PixelTransformer* clone = NULL;
 	PixelTransformer* _tmp0_;
-#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_PIXEL_TRANSFORMER (self), NULL);
-#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformer_new ();
-#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	clone = _tmp0_;
-#line 6550 "ColorTransformation.c"
+#line 5955 "ColorTransformation.c"
 	{
 		GeeArrayList* _transformation_list = NULL;
 		GeeArrayList* _tmp1_;
@@ -6557,25 +5961,25 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 		gint _tmp4_;
 		gint _tmp5_;
 		gint _transformation_index = 0;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = self->priv->transformations;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_list = _tmp2_;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = _transformation_list;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = _tmp4_;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_size = _tmp5_;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_index = -1;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 6578 "ColorTransformation.c"
+#line 5983 "ColorTransformation.c"
 			gint _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -6586,49 +5990,49 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 			PixelTransformer* _tmp12_;
 			GeeArrayList* _tmp13_;
 			PixelTransformation* _tmp14_;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _transformation_index;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_transformation_index = _tmp6_ + 1;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_index;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = _transformation_size;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp7_ < _tmp8_)) {
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 6601 "ColorTransformation.c"
+#line 6006 "ColorTransformation.c"
 			}
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = _transformation_list;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = _transformation_index;
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_);
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp11_;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = clone;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = _tmp12_->priv->transformations;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = transformation;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 6621 "ColorTransformation.c"
+#line 6026 "ColorTransformation.c"
 		}
-#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_list);
-#line 6625 "ColorTransformation.c"
+#line 6030 "ColorTransformation.c"
 	}
-#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = clone;
-#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6631 "ColorTransformation.c"
+#line 6036 "ColorTransformation.c"
 }
 
 
@@ -6638,41 +6042,37 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 	gint _tmp2_;
 	PixelTransformation** _tmp3_;
 	PixelTransformation* pre_trans = NULL;
-#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = g_new0 (PixelTransformation*, _tmp2_ + 1);
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = _tmp3_;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations_length1 = _tmp2_;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 796 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = _tmp3_;
+#line 701 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations_length1 = _tmp2_;
+#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pre_trans = NULL;
-#line 797 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_slots_used = 0;
-#line 6663 "ColorTransformation.c"
+#line 704 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_slots_used = 0;
+#line 6064 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 6668 "ColorTransformation.c"
+#line 6069 "ColorTransformation.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = TRUE;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 6675 "ColorTransformation.c"
+#line 6076 "ColorTransformation.c"
 				gint _tmp6_;
 				GeeArrayList* _tmp7_;
 				gint _tmp8_;
@@ -6689,139 +6089,139 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 				gboolean _tmp21_ = FALSE;
 				gboolean _tmp22_ = FALSE;
 				PixelTransformation* _tmp23_;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp4_) {
-#line 6694 "ColorTransformation.c"
+#line 6095 "ColorTransformation.c"
 					gint _tmp5_;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp5_ = i;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp5_ + 1;
-#line 6700 "ColorTransformation.c"
+#line 6101 "ColorTransformation.c"
 				}
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = FALSE;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = i;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = self->priv->transformations;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = _tmp8_;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp6_ < _tmp9_)) {
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 6716 "ColorTransformation.c"
+#line 6117 "ColorTransformation.c"
 				}
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = self->priv->transformations;
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = i;
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_);
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				trans = (PixelTransformation*) _tmp12_;
-#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = trans;
-#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = pixel_transformation_is_identity (_tmp13_);
-#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 708 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp14_) {
-#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (trans);
-#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					continue;
-#line 6736 "ColorTransformation.c"
+#line 6137 "ColorTransformation.c"
 				}
-#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				this_trans = NULL;
-#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = trans;
-#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = pixel_transformation_get_composition_mode (_tmp15_);
-#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp16_ == COMPOSITION_MODE_NONE) {
-#line 6746 "ColorTransformation.c"
+#line 6147 "ColorTransformation.c"
 					PixelTransformation* _tmp17_;
 					PixelTransformation* _tmp18_;
-#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = trans;
-#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = _pixel_transformation_ref0 (_tmp17_);
-#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (this_trans);
-#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 713 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					this_trans = _tmp18_;
-#line 6757 "ColorTransformation.c"
+#line 6158 "ColorTransformation.c"
 				} else {
 					PixelTransformation* _tmp19_;
 					PixelTransformation* _tmp20_;
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = trans;
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = pixel_transformation_copy (_tmp19_);
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (this_trans);
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 715 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					this_trans = _tmp20_;
-#line 6769 "ColorTransformation.c"
+#line 6170 "ColorTransformation.c"
 				}
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = pre_trans;
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp23_ != NULL) {
-#line 6775 "ColorTransformation.c"
+#line 6176 "ColorTransformation.c"
 					PixelTransformation* _tmp24_;
 					CompositionMode _tmp25_;
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp24_ = this_trans;
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp25_ = pixel_transformation_get_composition_mode (_tmp24_);
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp22_ = _tmp25_ != COMPOSITION_MODE_NONE;
-#line 6784 "ColorTransformation.c"
+#line 6185 "ColorTransformation.c"
 				} else {
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp22_ = FALSE;
-#line 6788 "ColorTransformation.c"
+#line 6189 "ColorTransformation.c"
 				}
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp22_) {
-#line 6792 "ColorTransformation.c"
+#line 6193 "ColorTransformation.c"
 					PixelTransformation* _tmp26_;
 					CompositionMode _tmp27_;
 					PixelTransformation* _tmp28_;
 					CompositionMode _tmp29_;
-#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp26_ = this_trans;
-#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = pixel_transformation_get_composition_mode (_tmp26_);
-#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = pre_trans;
-#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = pixel_transformation_get_composition_mode (_tmp28_);
-#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = _tmp27_ == _tmp29_;
-#line 6807 "ColorTransformation.c"
+#line 6208 "ColorTransformation.c"
 				} else {
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = FALSE;
-#line 6811 "ColorTransformation.c"
+#line 6212 "ColorTransformation.c"
 				}
-#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp21_) {
-#line 6815 "ColorTransformation.c"
+#line 6216 "ColorTransformation.c"
 					PixelTransformation* _tmp30_;
 					PixelTransformation* _tmp31_;
-#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = pre_trans;
-#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = this_trans;
-#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_transformation_compose_with (_tmp30_, _tmp31_);
-#line 6824 "ColorTransformation.c"
+#line 6225 "ColorTransformation.c"
 				} else {
 					PixelTransformation** _tmp32_;
 					gint _tmp32__length1;
@@ -6831,282 +6231,99 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 					PixelTransformation* _tmp36_;
 					PixelTransformation* _tmp37_;
 					PixelTransformation* _tmp38_;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp32_ = self->priv->optimized_transformations;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp32__length1 = self->priv->optimized_transformations_length1;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp33_ = self->priv->optimized_slots_used;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					self->priv->optimized_slots_used = _tmp33_ + 1;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp32_ = self->optimized_transformations;
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp32__length1 = self->optimized_transformations_length1;
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp33_ = self->optimized_slots_used;
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					self->optimized_slots_used = _tmp33_ + 1;
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = this_trans;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_ = _pixel_transformation_ref0 (_tmp34_);
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (_tmp32_[_tmp33_]);
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_[_tmp33_] = _tmp35_;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 721 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36_ = _tmp32_[_tmp33_];
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp37_ = this_trans;
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = _pixel_transformation_ref0 (_tmp37_);
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (pre_trans);
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pre_trans = _tmp38_;
-#line 6860 "ColorTransformation.c"
+#line 6261 "ColorTransformation.c"
 				}
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (this_trans);
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 705 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (trans);
-#line 6866 "ColorTransformation.c"
+#line 6267 "ColorTransformation.c"
 			}
 		}
 	}
-#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 700 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (pre_trans);
-#line 6872 "ColorTransformation.c"
-}
-
-
-static void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
-	PixelFormat current_format = 0;
-	RGBAnalyticPixel p_rgb = {0};
-	RGBAnalyticPixel _tmp0_;
-	HSVAnalyticPixel p_hsv = {0};
-	PixelFormat _tmp21_;
-#line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (p != NULL);
-#line 821 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	current_format = PIXEL_FORMAT_RGB;
-#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *p;
-#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	p_rgb = _tmp0_;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	hsv_analytic_pixel_init (&p_hsv);
-#line 6894 "ColorTransformation.c"
-	{
-		gint i = 0;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		i = 0;
-#line 6899 "ColorTransformation.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp1_ = TRUE;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			while (TRUE) {
-#line 6906 "ColorTransformation.c"
-				gint _tmp3_;
-				gint _tmp4_;
-				PixelTransformation* trans = NULL;
-				PixelTransformation** _tmp5_;
-				gint _tmp5__length1;
-				gint _tmp6_;
-				PixelTransformation* _tmp7_;
-				PixelTransformation* _tmp8_;
-				PixelTransformation* _tmp9_;
-				PixelFormat _tmp10_;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!_tmp1_) {
-#line 6919 "ColorTransformation.c"
-					gint _tmp2_;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp2_ = i;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					i = _tmp2_ + 1;
-#line 6925 "ColorTransformation.c"
-				}
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp1_ = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp3_ = i;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp4_ = self->priv->optimized_slots_used;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!(_tmp3_ < _tmp4_)) {
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					break;
-#line 6937 "ColorTransformation.c"
-				}
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp5_ = self->priv->optimized_transformations;
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp5__length1 = self->priv->optimized_transformations_length1;
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp6_ = i;
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp7_ = _tmp5_[_tmp6_];
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp8_ = _pixel_transformation_ref0 (_tmp7_);
-#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				trans = _tmp8_;
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp9_ = trans;
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp10_ = pixel_transformation_get_preferred_format (_tmp9_);
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (_tmp10_ == PIXEL_FORMAT_RGB) {
-#line 6957 "ColorTransformation.c"
-					PixelFormat _tmp11_;
-					PixelTransformation* _tmp13_;
-					RGBAnalyticPixel _tmp14_;
-					RGBAnalyticPixel _tmp15_ = {0};
-#line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp11_ = current_format;
-#line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					if (_tmp11_ == PIXEL_FORMAT_HSV) {
-#line 6966 "ColorTransformation.c"
-						RGBAnalyticPixel _tmp12_ = {0};
-#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						hsv_analytic_pixel_to_rgb (&p_hsv, &_tmp12_);
-#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						p_rgb = _tmp12_;
-#line 830 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						current_format = PIXEL_FORMAT_RGB;
-#line 6974 "ColorTransformation.c"
-					}
-#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp13_ = trans;
-#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp14_ = p_rgb;
-#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					pixel_transformation_transform_pixel_rgb (_tmp13_, &_tmp14_, &_tmp15_);
-#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					p_rgb = _tmp15_;
-#line 6984 "ColorTransformation.c"
-				} else {
-					PixelFormat _tmp16_;
-					PixelTransformation* _tmp18_;
-					HSVAnalyticPixel _tmp19_;
-					HSVAnalyticPixel _tmp20_ = {0};
-#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp16_ = current_format;
-#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					if (_tmp16_ == PIXEL_FORMAT_RGB) {
-#line 6994 "ColorTransformation.c"
-						HSVAnalyticPixel _tmp17_ = {0};
-#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						rgb_analytic_pixel_to_hsv (&p_rgb, &_tmp17_);
-#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						p_hsv = _tmp17_;
-#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						current_format = PIXEL_FORMAT_HSV;
-#line 7002 "ColorTransformation.c"
-					}
-#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp18_ = trans;
-#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp19_ = p_hsv;
-#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					pixel_transformation_transform_pixel_hsv (_tmp18_, &_tmp19_, &_tmp20_);
-#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					p_hsv = _tmp20_;
-#line 7012 "ColorTransformation.c"
-				}
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_pixel_transformation_unref0 (trans);
-#line 7016 "ColorTransformation.c"
-			}
-		}
-	}
-#line 842 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp21_ = current_format;
-#line 842 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp21_ == PIXEL_FORMAT_HSV) {
-#line 7024 "ColorTransformation.c"
-		RGBAnalyticPixel _tmp22_ = {0};
-#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		hsv_analytic_pixel_to_rgb (&p_hsv, &_tmp22_);
-#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		p_rgb = _tmp22_;
-#line 7030 "ColorTransformation.c"
-	}
-#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = p_rgb;
-#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 7036 "ColorTransformation.c"
+#line 6273 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans) {
 	GeeArrayList* _tmp0_;
 	PixelTransformation* _tmp1_;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (trans));
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = trans;
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 733 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = NULL;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations_length1 = 0;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 7061 "ColorTransformation.c"
+#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
+#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = NULL;
+#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations_length1 = 0;
+#line 6292 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim) {
 	GeeArrayList* _tmp0_;
 	PixelTransformation* _tmp1_;
-#line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (victim));
-#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = victim;
-#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = NULL;
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations_length1 = 0;
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 7086 "ColorTransformation.c"
+#line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
+#line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = NULL;
+#line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations_length1 = 0;
+#line 6311 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans) {
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (old_trans));
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_trans));
-#line 7097 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 7102 "ColorTransformation.c"
+#line 6320 "ColorTransformation.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp0_ = TRUE;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7109 "ColorTransformation.c"
+#line 6327 "ColorTransformation.c"
 				gint _tmp2_;
 				GeeArrayList* _tmp3_;
 				gint _tmp4_;
@@ -7117,79 +6334,77 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 				PixelTransformation* _tmp9_;
 				PixelTransformation* _tmp10_;
 				gboolean _tmp11_;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp0_) {
-#line 7122 "ColorTransformation.c"
+#line 6340 "ColorTransformation.c"
 					gint _tmp1_;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp1_ = i;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp1_ + 1;
-#line 7128 "ColorTransformation.c"
+#line 6346 "ColorTransformation.c"
 				}
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp0_ = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp2_ = i;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp3_ = self->priv->transformations;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = _tmp4_;
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp2_ < _tmp5_)) {
-#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 7144 "ColorTransformation.c"
+#line 6362 "ColorTransformation.c"
 				}
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = self->priv->transformations;
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = i;
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_);
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = (PixelTransformation*) _tmp8_;
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = old_trans;
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = _tmp9_ == _tmp10_;
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (_tmp9_);
-#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp11_) {
-#line 7162 "ColorTransformation.c"
+#line 6380 "ColorTransformation.c"
 					GeeArrayList* _tmp12_;
 					gint _tmp13_;
 					PixelTransformation* _tmp14_;
-#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = self->priv->transformations;
-#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = i;
-#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp14_ = new_trans;
-#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_, _tmp14_);
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					self->priv->optimized_transformations = NULL;
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					self->priv->optimized_transformations_length1 = 0;
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 872 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
+#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					self->optimized_transformations = NULL;
+#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					self->optimized_transformations_length1 = 0;
+#line 753 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return;
-#line 7184 "ColorTransformation.c"
+#line 6400 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 875 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_error ("ColorTransformation.vala:875: %s", "PixelTransformer: replace_transformation( ): old_trans is not present " \
+#line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_error ("ColorTransformation.vala:756: %s", "PixelTransformer: replace_transformation( ): old_trans is not present " \
 "in " "transformation collection");
-#line 7191 "ColorTransformation.c"
+#line 6407 "ColorTransformation.c"
 }
 
 
@@ -7197,946 +6412,1386 @@ void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixb
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
 	GCancellable* _tmp2_;
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable));
-#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixbuf;
-#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = cancellable;
-#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	pixel_transformer_transform_to_other_pixbuf (self, _tmp0_, _tmp1_, _tmp2_);
-#line 7213 "ColorTransformation.c"
+#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	pixel_transformer_transform_to_other_pixbuf (self, _tmp0_, _tmp1_, _tmp2_, -1);
+#line 6423 "ColorTransformation.c"
+}
+
+
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return _data1_;
+#line 6432 "ColorTransformation.c"
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 6441 "ColorTransformation.c"
+		PixelTransformer* self;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self = _data1_->self;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_pixel_transformer_unref0 (self);
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 6449 "ColorTransformation.c"
+	}
+}
+
+
+static Block2Data* block2_data_ref (Block2Data* _data2_) {
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_atomic_int_inc (&_data2_->_ref_count_);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return _data2_;
+#line 6459 "ColorTransformation.c"
+}
+
+
+static void block2_data_unref (void * _userdata_) {
+	Block2Data* _data2_;
+	_data2_ = (Block2Data*) _userdata_;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
+#line 6468 "ColorTransformation.c"
+		PixelTransformer* self;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self = _data2_->_data1_->self;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		block1_data_unref (_data2_->_data1_);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_data2_->_data1_ = NULL;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_slice_free (Block2Data, _data2_);
+#line 6478 "ColorTransformation.c"
+	}
+}
+
+
+static void* _____lambda5_ (Block2Data* _data2_) {
+	Block1Data* _data1_;
+	PixelTransformer* self;
+	void* result = NULL;
+	guint cache_pixel_ticker = 0U;
+	guint _tmp0_;
+	gint _tmp1_;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_ = _data2_->_data1_;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = _data1_->self;
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = _data2_->row;
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = _data1_->dest_width;
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	cache_pixel_ticker = (_tmp0_ * _tmp1_) * 3;
+#line 6500 "ColorTransformation.c"
+	{
+		guint j = 0U;
+		guint _tmp2_;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp2_ = _data2_->row;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		j = _tmp2_;
+#line 6508 "ColorTransformation.c"
+		{
+			gboolean _tmp3_ = FALSE;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp3_ = TRUE;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			while (TRUE) {
+#line 6515 "ColorTransformation.c"
+				guint _tmp5_;
+				guint _tmp6_;
+				guint row_start_index = 0U;
+				guint _tmp7_;
+				gint _tmp8_;
+				guint row_end_index = 0U;
+				guint _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp3_) {
+#line 6527 "ColorTransformation.c"
+					guint _tmp4_;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp4_ = j;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					j = _tmp4_ + 1;
+#line 6533 "ColorTransformation.c"
+				}
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp3_ = FALSE;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp5_ = j;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp6_ = _data2_->slice_height;
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp5_ < _tmp6_)) {
+#line 789 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					break;
+#line 6545 "ColorTransformation.c"
+				}
+#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp7_ = j;
+#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = _data1_->dest_rowstride;
+#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				row_start_index = _tmp7_ * _tmp8_;
+#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9_ = row_start_index;
+#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10_ = _data1_->dest_width;
+#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp11_ = _data1_->dest_num_channels;
+#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				row_end_index = _tmp9_ + (_tmp10_ * _tmp11_);
+#line 6561 "ColorTransformation.c"
+				{
+					guint i = 0U;
+					guint _tmp12_;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp12_ = row_start_index;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					i = _tmp12_;
+#line 6569 "ColorTransformation.c"
+					{
+						gboolean _tmp13_ = FALSE;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+						_tmp13_ = TRUE;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+						while (TRUE) {
+#line 6576 "ColorTransformation.c"
+							guint _tmp16_;
+							guint _tmp17_;
+							RGBAnalyticPixel pixel = {0};
+							gfloat* _tmp18_;
+							gint _tmp18__length1;
+							guint _tmp19_;
+							gfloat _tmp20_;
+							gfloat* _tmp21_;
+							gint _tmp21__length1;
+							guint _tmp22_;
+							gfloat _tmp23_;
+							gfloat* _tmp24_;
+							gint _tmp24__length1;
+							guint _tmp25_;
+							gfloat _tmp26_;
+							guint _tmp27_;
+							RGBAnalyticPixel _tmp28_;
+							RGBAnalyticPixel _tmp29_ = {0};
+							guchar* _tmp30_;
+							gint _tmp30__length1;
+							guint _tmp31_;
+							RGBAnalyticPixel _tmp32_;
+							gfloat _tmp33_;
+							guchar _tmp34_;
+							guchar* _tmp35_;
+							gint _tmp35__length1;
+							guint _tmp36_;
+							RGBAnalyticPixel _tmp37_;
+							gfloat _tmp38_;
+							guchar _tmp39_;
+							guchar* _tmp40_;
+							gint _tmp40__length1;
+							guint _tmp41_;
+							RGBAnalyticPixel _tmp42_;
+							gfloat _tmp43_;
+							guchar _tmp44_;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							if (!_tmp13_) {
+#line 6615 "ColorTransformation.c"
+								guint _tmp14_;
+								gint _tmp15_;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+								_tmp14_ = i;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+								_tmp15_ = _data1_->dest_num_channels;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+								i = _tmp14_ + _tmp15_;
+#line 6624 "ColorTransformation.c"
+							}
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp13_ = FALSE;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp16_ = i;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp17_ = row_end_index;
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							if (!(_tmp16_ < _tmp17_)) {
+#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+								break;
+#line 6636 "ColorTransformation.c"
+							}
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp18_ = _data1_->cache;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp18__length1 = _data1_->cache_length1;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp19_ = cache_pixel_ticker;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp20_ = _tmp18_[_tmp19_];
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp21_ = _data1_->cache;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp21__length1 = _data1_->cache_length1;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp22_ = cache_pixel_ticker;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp23_ = _tmp21_[_tmp22_ + 1];
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp24_ = _data1_->cache;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp24__length1 = _data1_->cache_length1;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp25_ = cache_pixel_ticker;
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp26_ = _tmp24_[_tmp25_ + 2];
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							rgb_analytic_pixel_init_from_components (&pixel, _tmp20_, _tmp23_, _tmp26_);
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp27_ = cache_pixel_ticker;
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							cache_pixel_ticker = _tmp27_ + 3;
+#line 800 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp28_ = pixel;
+#line 800 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							pixel_transformer_apply_transformations (self, &_tmp28_, &_tmp29_);
+#line 800 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							pixel = _tmp29_;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp30_ = _data1_->dest_pixels;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp30__length1 = _data1_->dest_pixels_length1;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp31_ = i;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp32_ = pixel;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp33_ = _tmp32_.red;
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp30_[_tmp31_] = (guchar) (_tmp33_ * 255.0f);
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp34_ = _tmp30_[_tmp31_];
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp35_ = _data1_->dest_pixels;
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp35__length1 = _data1_->dest_pixels_length1;
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp36_ = i;
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp37_ = pixel;
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp38_ = _tmp37_.green;
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp35_[_tmp36_ + 1] = (guchar) (_tmp38_ * 255.0f);
+#line 803 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp39_ = _tmp35_[_tmp36_ + 1];
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp40_ = _data1_->dest_pixels;
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp40__length1 = _data1_->dest_pixels_length1;
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp41_ = i;
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp42_ = pixel;
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp43_ = _tmp42_.blue;
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp40_[_tmp41_ + 2] = (guchar) (_tmp43_ * 255.0f);
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+							_tmp44_ = _tmp40_[_tmp41_ + 2];
+#line 6716 "ColorTransformation.c"
+						}
+					}
+				}
+			}
+		}
+	}
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	result = NULL;
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 6727 "ColorTransformation.c"
+}
+
+
+static gpointer ______lambda5__gthread_func (gpointer self) {
+	gpointer result;
+	result = _____lambda5_ (self);
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	block2_data_unref (self);
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 6738 "ColorTransformation.c"
+}
+
+
+static gpointer _g_thread_ref0 (gpointer self) {
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return self ? g_thread_ref (self) : NULL;
+#line 6745 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest) {
+	Block1Data* _data1_;
 	PixelTransformation** _tmp0_;
 	gint _tmp0__length1;
-	gint dest_width = 0;
 	GdkPixbuf* _tmp1_;
 	gint _tmp2_;
 	gint dest_height = 0;
 	GdkPixbuf* _tmp3_;
 	gint _tmp4_;
-	gint dest_num_channels = 0;
 	GdkPixbuf* _tmp5_;
 	gint _tmp6_;
-	gint dest_rowstride = 0;
 	GdkPixbuf* _tmp7_;
 	gint _tmp8_;
-	guchar* dest_pixels = NULL;
 	GdkPixbuf* _tmp9_;
 	guint8* _tmp10_;
-	gint dest_pixels_length1;
-	gint _dest_pixels_size_;
-	gint cache_pixel_ticker = 0;
-#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (dest));
-#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = self->priv->optimized_transformations;
-#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0__length1 = self->priv->optimized_transformations_length1;
-#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	gint jobs = 0;
+	guint _tmp11_;
+	guint slice_length = 0U;
+	gint _tmp12_;
+	gint _tmp13_;
+	GThread** threads = NULL;
+	gint _tmp17_;
+	GThread** _tmp18_;
+	gint threads_length1;
+	gint _threads_size_;
+	gfloat* _tmp19_;
+	gint _tmp19__length1;
+	GThread** _tmp34_;
+	gint _tmp34__length1;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_ = g_slice_new0 (Block1Data);
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->_ref_count_ = 1;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->self = pixel_transformer_ref (self);
+#line 765 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = self->optimized_transformations;
+#line 765 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0__length1 = self->optimized_transformations_length1;
+#line 765 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
-#line 885 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_build_optimized_transformations (self);
-#line 7250 "ColorTransformation.c"
+#line 6792 "ColorTransformation.c"
 	}
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = dest;
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gdk_pixbuf_get_width (_tmp1_);
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_width = _tmp2_;
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->dest_width = _tmp2_;
+#line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = dest;
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = gdk_pixbuf_get_height (_tmp3_);
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 769 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_height = _tmp4_;
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = dest;
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = gdk_pixbuf_get_n_channels (_tmp5_);
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_num_channels = _tmp6_;
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->dest_num_channels = _tmp6_;
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = dest;
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = gdk_pixbuf_get_rowstride (_tmp7_);
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_rowstride = _tmp8_;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->dest_rowstride = _tmp8_;
+#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = dest;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = gdk_pixbuf_get_pixels (_tmp9_);
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_pixels = _tmp10_;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_pixels_length1 = -1;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_dest_pixels_size_ = dest_pixels_length1;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	cache_pixel_ticker = 0;
-#line 7288 "ColorTransformation.c"
+#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->dest_pixels = _tmp10_;
+#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->dest_pixels_length1 = -1;
+#line 772 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->_dest_pixels_size_ = _data1_->dest_pixels_length1;
+#line 774 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp11_ = g_get_num_processors ();
+#line 774 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	jobs = ((gint) _tmp11_) - 1;
+#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp12_ = dest_height;
+#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	slice_length = (guint) _tmp12_;
+#line 777 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp13_ = jobs;
+#line 777 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp13_ > 0) {
+#line 6840 "ColorTransformation.c"
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp14_ = dest_height;
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp15_ = jobs;
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp16_ = jobs;
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		slice_length = (guint) ((_tmp14_ + (_tmp15_ - 1)) / _tmp16_);
+#line 6852 "ColorTransformation.c"
+	}
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp17_ = jobs;
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp18_ = g_new0 (GThread*, _tmp17_ + 1);
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads = _tmp18_;
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads_length1 = _tmp17_;
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_threads_size_ = threads_length1;
+#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp19_ = *fp_pixel_cache;
+#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp19__length1 = *fp_pixel_cache_length1;
+#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->cache = _tmp19_;
+#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->cache_length1 = _tmp19__length1;
+#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_->_cache_size_ = _data1_->cache_length1;
+#line 6874 "ColorTransformation.c"
 	{
-		gint j = 0;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		j = 0;
-#line 7293 "ColorTransformation.c"
+		gint job = 0;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		job = 0;
+#line 6879 "ColorTransformation.c"
 		{
-			gboolean _tmp11_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp11_ = TRUE;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			gboolean _tmp20_ = FALSE;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp20_ = TRUE;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7300 "ColorTransformation.c"
-				gint _tmp13_;
-				gint _tmp14_;
-				gint row_start_index = 0;
-				gint _tmp15_;
-				gint _tmp16_;
-				gint row_end_index = 0;
-				gint _tmp17_;
-				gint _tmp18_;
-				gint _tmp19_;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!_tmp11_) {
-#line 7312 "ColorTransformation.c"
-					gint _tmp12_;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp12_ = j;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					j = _tmp12_ + 1;
-#line 7318 "ColorTransformation.c"
+#line 6886 "ColorTransformation.c"
+				Block2Data* _data2_;
+				gint _tmp22_;
+				gint _tmp23_;
+				gint _tmp24_;
+				guint _tmp25_;
+				guint _tmp26_;
+				guint _tmp27_;
+				gint _tmp28_;
+				guint _tmp29_;
+				GThread** _tmp30_;
+				gint _tmp30__length1;
+				gint _tmp31_;
+				GThread* _tmp32_;
+				GThread* _tmp33_;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_ = g_slice_new0 (Block2Data);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_->_ref_count_ = 1;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_->_data1_ = block1_data_ref (_data1_);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp20_) {
+#line 6909 "ColorTransformation.c"
+					gint _tmp21_;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp21_ = job;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					job = _tmp21_ + 1;
+#line 6915 "ColorTransformation.c"
 				}
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp11_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13_ = j;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp14_ = dest_height;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!(_tmp13_ < _tmp14_)) {
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp20_ = FALSE;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp22_ = job;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp23_ = jobs;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp22_ < _tmp23_)) {
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					block2_data_unref (_data2_);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_data2_ = NULL;
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 7330 "ColorTransformation.c"
+#line 6931 "ColorTransformation.c"
 				}
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp15_ = j;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp16_ = dest_rowstride;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				row_start_index = _tmp15_ * _tmp16_;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp17_ = row_start_index;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp18_ = dest_width;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp19_ = dest_num_channels;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				row_end_index = _tmp17_ + (_tmp18_ * _tmp19_);
-#line 7346 "ColorTransformation.c"
-				{
-					gint i = 0;
-					gint _tmp20_;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp20_ = row_start_index;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					i = _tmp20_;
-#line 7354 "ColorTransformation.c"
-					{
-						gboolean _tmp21_ = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						_tmp21_ = TRUE;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						while (TRUE) {
-#line 7361 "ColorTransformation.c"
-							gint _tmp24_;
-							gint _tmp25_;
-							RGBAnalyticPixel pixel = {0};
-							gfloat* _tmp26_;
-							gint _tmp26__length1;
-							gint _tmp27_;
-							gfloat _tmp28_;
-							gfloat* _tmp29_;
-							gint _tmp29__length1;
-							gint _tmp30_;
-							gfloat _tmp31_;
-							gfloat* _tmp32_;
-							gint _tmp32__length1;
-							gint _tmp33_;
-							gfloat _tmp34_;
-							gint _tmp35_;
-							RGBAnalyticPixel _tmp36_;
-							RGBAnalyticPixel _tmp37_ = {0};
-							guchar* _tmp38_;
-							gint _tmp38__length1;
-							gint _tmp39_;
-							RGBAnalyticPixel _tmp40_;
-							gfloat _tmp41_;
-							guchar _tmp42_;
-							guchar* _tmp43_;
-							gint _tmp43__length1;
-							gint _tmp44_;
-							RGBAnalyticPixel _tmp45_;
-							gfloat _tmp46_;
-							guchar _tmp47_;
-							guchar* _tmp48_;
-							gint _tmp48__length1;
-							gint _tmp49_;
-							RGBAnalyticPixel _tmp50_;
-							gfloat _tmp51_;
-							guchar _tmp52_;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							if (!_tmp21_) {
-#line 7400 "ColorTransformation.c"
-								gint _tmp22_;
-								gint _tmp23_;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								_tmp22_ = i;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								_tmp23_ = dest_num_channels;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								i = _tmp22_ + _tmp23_;
-#line 7409 "ColorTransformation.c"
-							}
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp21_ = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp24_ = i;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp25_ = row_end_index;
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							if (!(_tmp24_ < _tmp25_)) {
-#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								break;
-#line 7421 "ColorTransformation.c"
-							}
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp26_ = *fp_pixel_cache;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp26__length1 = *fp_pixel_cache_length1;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp27_ = cache_pixel_ticker;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp28_ = _tmp26_[_tmp27_];
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp29_ = *fp_pixel_cache;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp29__length1 = *fp_pixel_cache_length1;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp30_ = cache_pixel_ticker;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp31_ = _tmp29_[_tmp30_ + 1];
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp32_ = *fp_pixel_cache;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp32__length1 = *fp_pixel_cache_length1;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp33_ = cache_pixel_ticker;
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp34_ = _tmp32_[_tmp33_ + 2];
-#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							rgb_analytic_pixel_init_from_components (&pixel, _tmp28_, _tmp31_, _tmp34_);
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp35_ = cache_pixel_ticker;
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							cache_pixel_ticker = _tmp35_ + 3;
-#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp36_ = pixel;
-#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							pixel_transformer_apply_transformations (self, &_tmp36_, &_tmp37_);
-#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							pixel = _tmp37_;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp38_ = dest_pixels;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp38__length1 = dest_pixels_length1;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp39_ = i;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp40_ = pixel;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp41_ = _tmp40_.red;
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp38_[_tmp39_] = (guchar) (_tmp41_ * 255.0f);
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp42_ = _tmp38_[_tmp39_];
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp43_ = dest_pixels;
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp43__length1 = dest_pixels_length1;
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp44_ = i;
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp45_ = pixel;
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp46_ = _tmp45_.green;
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp43_[_tmp44_ + 1] = (guchar) (_tmp46_ * 255.0f);
-#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp47_ = _tmp43_[_tmp44_ + 1];
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp48_ = dest_pixels;
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp48__length1 = dest_pixels_length1;
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp49_ = i;
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp50_ = pixel;
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp51_ = _tmp50_.blue;
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp48_[_tmp49_ + 2] = (guchar) (_tmp51_ * 255.0f);
-#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp52_ = _tmp48_[_tmp49_ + 2];
-#line 7501 "ColorTransformation.c"
-						}
-					}
+#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp24_ = job;
+#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp25_ = slice_length;
+#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_->row = _tmp24_ * _tmp25_;
+#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp26_ = _data2_->row;
+#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp27_ = slice_length;
+#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp28_ = dest_height;
+#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp29_ = CLAMP (_tmp26_ + _tmp27_, (guint) 0, (guint) _tmp28_);
+#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_->slice_height = _tmp29_;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp30_ = threads;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp30__length1 = threads_length1;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp31_ = job;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp32_ = g_thread_new ("shotwell-worker", ______lambda5__gthread_func, block2_data_ref (_data2_));
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_g_thread_unref0 (_tmp30_[_tmp31_]);
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp30_[_tmp31_] = _tmp32_;
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp33_ = _tmp30_[_tmp31_];
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				block2_data_unref (_data2_);
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data2_ = NULL;
+#line 6967 "ColorTransformation.c"
+			}
+		}
+	}
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp34_ = threads;
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp34__length1 = threads_length1;
+#line 6975 "ColorTransformation.c"
+	{
+		GThread** thread_collection = NULL;
+		gint thread_collection_length1 = 0;
+		gint _thread_collection_size_ = 0;
+		gint thread_it = 0;
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		thread_collection = _tmp34_;
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		thread_collection_length1 = _tmp34__length1;
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		for (thread_it = 0; thread_it < _tmp34__length1; thread_it = thread_it + 1) {
+#line 6987 "ColorTransformation.c"
+			GThread* _tmp35_;
+			GThread* thread = NULL;
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp35_ = _g_thread_ref0 (thread_collection[thread_it]);
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			thread = _tmp35_;
+#line 6994 "ColorTransformation.c"
+			{
+				GThread* _tmp36_;
+				GThread* _tmp37_;
+#line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp36_ = thread;
+#line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp37_ = _g_thread_ref0 (_tmp36_);
+#line 813 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				g_thread_join (_tmp37_);
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_g_thread_unref0 (thread);
+#line 7006 "ColorTransformation.c"
+			}
+		}
+	}
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads = (_vala_array_free (threads, threads_length1, (GDestroyNotify) g_thread_unref), NULL);
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	block1_data_unref (_data1_);
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data1_ = NULL;
+#line 7016 "ColorTransformation.c"
+}
+
+
+static Block3Data* block3_data_ref (Block3Data* _data3_) {
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_atomic_int_inc (&_data3_->_ref_count_);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return _data3_;
+#line 7025 "ColorTransformation.c"
+}
+
+
+static void block3_data_unref (void * _userdata_) {
+	Block3Data* _data3_;
+	_data3_ = (Block3Data*) _userdata_;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
+#line 7034 "ColorTransformation.c"
+		PixelTransformer* self;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self = _data3_->self;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_g_object_unref0 (_data3_->cancellable);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_pixel_transformer_unref0 (self);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_slice_free (Block3Data, _data3_);
+#line 7044 "ColorTransformation.c"
+	}
+}
+
+
+static Block4Data* block4_data_ref (Block4Data* _data4_) {
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_atomic_int_inc (&_data4_->_ref_count_);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return _data4_;
+#line 7054 "ColorTransformation.c"
+}
+
+
+static void block4_data_unref (void * _userdata_) {
+	Block4Data* _data4_;
+	_data4_ = (Block4Data*) _userdata_;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
+#line 7063 "ColorTransformation.c"
+		PixelTransformer* self;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self = _data4_->_data3_->self;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		block3_data_unref (_data4_->_data3_);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_data4_->_data3_ = NULL;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_slice_free (Block4Data, _data4_);
+#line 7073 "ColorTransformation.c"
+	}
+}
+
+
+static void* _____lambda4_ (Block4Data* _data4_) {
+	Block3Data* _data3_;
+	PixelTransformer* self;
+	void* result = NULL;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_ = _data4_->_data3_;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = _data3_->self;
+#line 7086 "ColorTransformation.c"
+	{
+		guint j = 0U;
+		guint _tmp0_;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp0_ = _data4_->row;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		j = _tmp0_;
+#line 7094 "ColorTransformation.c"
+		{
+			gboolean _tmp1_ = FALSE;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp1_ = TRUE;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			while (TRUE) {
+#line 7101 "ColorTransformation.c"
+				guint _tmp3_;
+				guint _tmp4_;
+				guint _tmp5_;
+				gint _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
+				guchar* _tmp9_;
+				gint _tmp9__length1;
+				guchar* _tmp10_;
+				gint _tmp10__length1;
+				gboolean _tmp11_ = FALSE;
+				GCancellable* _tmp12_;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp1_) {
+#line 7116 "ColorTransformation.c"
+					guint _tmp2_;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp2_ = j;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					j = _tmp2_ + 1;
+#line 7122 "ColorTransformation.c"
+				}
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp1_ = FALSE;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp3_ = j;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp4_ = _data4_->slice_height;
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp3_ < _tmp4_)) {
+#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					break;
+#line 7134 "ColorTransformation.c"
+				}
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp5_ = j;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp6_ = _data3_->rowstride;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp7_ = _data3_->rowbytes;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = _data3_->n_channels;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9_ = _data3_->source_pixels;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9__length1 = _data3_->source_pixels_length1;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10_ = _data3_->dest_pixels;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10__length1 = _data3_->dest_pixels_length1;
+#line 856 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				pixel_transformer_apply_transformation (self, _tmp5_, _tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp9__length1, _tmp10_, _tmp10__length1);
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp12_ = _data3_->cancellable;
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (_tmp12_ != NULL) {
+#line 7158 "ColorTransformation.c"
+					GCancellable* _tmp13_;
+					gboolean _tmp14_;
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp13_ = _data3_->cancellable;
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp14_ = g_cancellable_is_cancelled (_tmp13_);
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp11_ = _tmp14_;
+#line 7167 "ColorTransformation.c"
+				} else {
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp11_ = FALSE;
+#line 7171 "ColorTransformation.c"
+				}
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (_tmp11_) {
+#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					break;
+#line 7177 "ColorTransformation.c"
 				}
 			}
 		}
 	}
+#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	result = NULL;
+#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 7186 "ColorTransformation.c"
 }
 
 
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable) {
-	GdkPixbuf* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	GdkPixbuf* _tmp3_;
+static gpointer ______lambda4__gthread_func (gpointer self) {
+	gpointer result;
+	result = _____lambda4_ (self);
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	block4_data_unref (self);
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 7197 "ColorTransformation.c"
+}
+
+
+void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs) {
+	Block3Data* _data3_;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	gint _tmp3_;
 	gint _tmp4_;
-	gint _tmp5_;
-	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp5_;
+	gint _tmp6_;
 	gint _tmp7_;
-	gint _tmp8_;
-	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp8_;
+	gint _tmp9_;
 	gint _tmp10_;
-	gint _tmp11_;
-	GdkPixbuf* _tmp12_;
+	GdkPixbuf* _tmp11_;
+	gint _tmp12_;
 	gint _tmp13_;
-	gint _tmp14_;
-	GdkPixbuf* _tmp15_;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
 	gint _tmp16_;
-	gint _tmp17_;
-	PixelTransformation** _tmp18_;
-	gint _tmp18__length1;
-	gint n_channels = 0;
-	GdkPixbuf* _tmp19_;
-	gint _tmp20_;
-	gint rowstride = 0;
+	GdkPixbuf* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+	PixelTransformation** _tmp20_;
+	gint _tmp20__length1;
 	GdkPixbuf* _tmp21_;
 	gint _tmp22_;
-	gint width = 0;
 	GdkPixbuf* _tmp23_;
 	gint _tmp24_;
-	gint height = 0;
+	gint width = 0;
 	GdkPixbuf* _tmp25_;
 	gint _tmp26_;
-	gint rowbytes = 0;
-	gint _tmp27_;
+	gint height = 0;
+	GdkPixbuf* _tmp27_;
 	gint _tmp28_;
-	guchar* source_pixels = NULL;
-	GdkPixbuf* _tmp29_;
-	guint8* _tmp30_;
-	gint source_pixels_length1;
-	gint _source_pixels_size_;
-	guchar* dest_pixels = NULL;
+	gint _tmp29_;
+	gint _tmp30_;
 	GdkPixbuf* _tmp31_;
 	guint8* _tmp32_;
-	gint dest_pixels_length1;
-	gint _dest_pixels_size_;
-#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (dest));
-#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable));
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = source;
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = _tmp1_;
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = dest;
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = _tmp4_;
-#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp2_ != _tmp5_) {
-#line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:918: PixelTransformer: source and destination" \
+	GdkPixbuf* _tmp33_;
+	guint8* _tmp34_;
+	gint _tmp35_;
+	guint slice_length = 0U;
+	gint _tmp37_;
+	gint _tmp38_;
+	GThread** threads = NULL;
+	gint _tmp42_;
+	GThread** _tmp43_;
+	gint threads_length1;
+	gint _threads_size_;
+	GThread** _tmp58_;
+	gint _tmp58__length1;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_ = g_slice_new0 (Block3Data);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->_ref_count_ = 1;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->self = pixel_transformer_ref (self);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = cancellable;
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_g_object_unref0 (_data3_->cancellable);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->cancellable = _tmp1_;
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = source;
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp3_ = gdk_pixbuf_get_width (_tmp2_);
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp4_ = _tmp3_;
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp5_ = dest;
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp6_ = gdk_pixbuf_get_width (_tmp5_);
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp7_ = _tmp6_;
+#line 819 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp4_ != _tmp7_) {
+#line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:820: PixelTransformer: source and destination" \
 " pixbufs must have the same width");
-#line 7581 "ColorTransformation.c"
+#line 7282 "ColorTransformation.c"
 	}
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6_ = source;
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp8_ = _tmp7_;
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp9_ = dest;
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp10_ = gdk_pixbuf_get_height (_tmp9_);
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp11_ = _tmp10_;
-#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp8_ != _tmp11_) {
-#line 921 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:921: PixelTransformer: source and destination" \
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp8_ = source;
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp9_ = gdk_pixbuf_get_height (_tmp8_);
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp10_ = _tmp9_;
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp11_ = dest;
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp12_ = gdk_pixbuf_get_height (_tmp11_);
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp13_ = _tmp12_;
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp10_ != _tmp13_) {
+#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:823: PixelTransformer: source and destination" \
 " pixbufs must have the same height");
-#line 7599 "ColorTransformation.c"
-	}
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp12_ = source;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp13_ = gdk_pixbuf_get_n_channels (_tmp12_);
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp14_ = _tmp13_;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp15_ = dest;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp16_ = gdk_pixbuf_get_n_channels (_tmp15_);
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp17_ = _tmp16_;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp14_ != _tmp17_) {
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:924: %s", "PixelTransformer: source and destination pixbufs must have the same nu" \
+#line 7300 "ColorTransformation.c"
+	}
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp14_ = source;
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp15_ = gdk_pixbuf_get_n_channels (_tmp14_);
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp16_ = _tmp15_;
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp17_ = dest;
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp18_ = gdk_pixbuf_get_n_channels (_tmp17_);
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp19_ = _tmp18_;
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp16_ != _tmp19_) {
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:826: %s", "PixelTransformer: source and destination pixbufs must have the same nu" \
 "mber " "of channels");
-#line 7617 "ColorTransformation.c"
-	}
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp18_ = self->priv->optimized_transformations;
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp18__length1 = self->priv->optimized_transformations_length1;
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp18_ == NULL) {
-#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 7318 "ColorTransformation.c"
+	}
+#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp20_ = self->optimized_transformations;
+#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp20__length1 = self->optimized_transformations_length1;
+#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp20_ == NULL) {
+#line 830 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_build_optimized_transformations (self);
-#line 7627 "ColorTransformation.c"
+#line 7328 "ColorTransformation.c"
 	}
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp19_ = source;
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp20_ = gdk_pixbuf_get_n_channels (_tmp19_);
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	n_channels = _tmp20_;
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = source;
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp22_ = gdk_pixbuf_get_rowstride (_tmp21_);
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	rowstride = _tmp22_;
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp22_ = gdk_pixbuf_get_n_channels (_tmp21_);
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->n_channels = _tmp22_;
+#line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = source;
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp24_ = gdk_pixbuf_get_width (_tmp23_);
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	width = _tmp24_;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp24_ = gdk_pixbuf_get_rowstride (_tmp23_);
+#line 833 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->rowstride = _tmp24_;
+#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = source;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	height = _tmp26_;
-#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp27_ = n_channels;
-#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp28_ = width;
-#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	rowbytes = _tmp27_ * _tmp28_;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp29_ = source;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp30_ = gdk_pixbuf_get_pixels (_tmp29_);
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	source_pixels = _tmp30_;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	source_pixels_length1 = -1;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_source_pixels_size_ = source_pixels_length1;
-#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp31_ = dest;
-#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp26_ = gdk_pixbuf_get_width (_tmp25_);
+#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	width = _tmp26_;
+#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp27_ = source;
+#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp28_ = gdk_pixbuf_get_height (_tmp27_);
+#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	height = _tmp28_;
+#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp29_ = _data3_->n_channels;
+#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp30_ = width;
+#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->rowbytes = _tmp29_ * _tmp30_;
+#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp31_ = source;
+#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = gdk_pixbuf_get_pixels (_tmp31_);
-#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_pixels = _tmp32_;
-#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	dest_pixels_length1 = -1;
-#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_dest_pixels_size_ = dest_pixels_length1;
-#line 7679 "ColorTransformation.c"
+#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->source_pixels = _tmp32_;
+#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->source_pixels_length1 = -1;
+#line 837 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->_source_pixels_size_ = _data3_->source_pixels_length1;
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp33_ = dest;
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp34_ = gdk_pixbuf_get_pixels (_tmp33_);
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->dest_pixels = _tmp34_;
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->dest_pixels_length1 = -1;
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_->_dest_pixels_size_ = _data3_->dest_pixels_length1;
+#line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp35_ = jobs;
+#line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp35_ == -1) {
+#line 7384 "ColorTransformation.c"
+		guint _tmp36_;
+#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp36_ = g_get_num_processors ();
+#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		jobs = ((gint) _tmp36_) - 1;
+#line 7390 "ColorTransformation.c"
+	}
+#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp37_ = height;
+#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	slice_length = (guint) _tmp37_;
+#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp38_ = jobs;
+#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp38_ > 0) {
+#line 7400 "ColorTransformation.c"
+		gint _tmp39_;
+		gint _tmp40_;
+		gint _tmp41_;
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp39_ = height;
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp40_ = jobs;
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp41_ = jobs;
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		slice_length = (guint) ((_tmp39_ + (_tmp40_ - 1)) / _tmp41_);
+#line 7412 "ColorTransformation.c"
+	}
+#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp42_ = jobs;
+#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp43_ = g_new0 (GThread*, _tmp42_ + 1);
+#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads = _tmp43_;
+#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads_length1 = _tmp42_;
+#line 848 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_threads_size_ = threads_length1;
+#line 7424 "ColorTransformation.c"
 	{
-		gint j = 0;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		j = 0;
-#line 7684 "ColorTransformation.c"
+		gint job = 0;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		job = 0;
+#line 7429 "ColorTransformation.c"
 		{
-			gboolean _tmp33_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp33_ = TRUE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			gboolean _tmp44_ = FALSE;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp44_ = TRUE;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7691 "ColorTransformation.c"
-				gint _tmp35_;
-				gint _tmp36_;
-				gint row_start_index = 0;
-				gint _tmp37_;
-				gint _tmp38_;
-				gint row_end_index = 0;
-				gint _tmp39_;
-				gint _tmp40_;
-				gboolean _tmp70_ = FALSE;
-				GCancellable* _tmp71_;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!_tmp33_) {
-#line 7704 "ColorTransformation.c"
-					gint _tmp34_;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp34_ = j;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					j = _tmp34_ + 1;
-#line 7710 "ColorTransformation.c"
+#line 7436 "ColorTransformation.c"
+				Block4Data* _data4_;
+				gint _tmp46_;
+				gint _tmp47_;
+				gint _tmp48_;
+				guint _tmp49_;
+				guint _tmp50_;
+				guint _tmp51_;
+				gint _tmp52_;
+				guint _tmp53_;
+				GThread** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				GThread* _tmp56_;
+				GThread* _tmp57_;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_ = g_slice_new0 (Block4Data);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_->_ref_count_ = 1;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_->_data3_ = block3_data_ref (_data3_);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp44_) {
+#line 7459 "ColorTransformation.c"
+					gint _tmp45_;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp45_ = job;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					job = _tmp45_ + 1;
+#line 7465 "ColorTransformation.c"
 				}
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp33_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp35_ = j;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp36_ = height;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!(_tmp35_ < _tmp36_)) {
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp44_ = FALSE;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp46_ = job;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp47_ = jobs;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp46_ < _tmp47_)) {
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					block4_data_unref (_data4_);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_data4_ = NULL;
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 7722 "ColorTransformation.c"
-				}
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp37_ = j;
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp38_ = rowstride;
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				row_start_index = _tmp37_ * _tmp38_;
-#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp39_ = row_start_index;
-#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp40_ = rowbytes;
-#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				row_end_index = _tmp39_ + _tmp40_;
-#line 7736 "ColorTransformation.c"
-				{
-					gint i = 0;
-					gint _tmp41_;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp41_ = row_start_index;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					i = _tmp41_;
-#line 7744 "ColorTransformation.c"
-					{
-						gboolean _tmp42_ = FALSE;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						_tmp42_ = TRUE;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-						while (TRUE) {
-#line 7751 "ColorTransformation.c"
-							gint _tmp45_;
-							gint _tmp46_;
-							RGBAnalyticPixel current_pixel = {0};
-							guchar* _tmp47_;
-							gint _tmp47__length1;
-							gint _tmp48_;
-							guchar _tmp49_;
-							guchar* _tmp50_;
-							gint _tmp50__length1;
-							gint _tmp51_;
-							guchar _tmp52_;
-							guchar* _tmp53_;
-							gint _tmp53__length1;
-							gint _tmp54_;
-							guchar _tmp55_;
-							RGBAnalyticPixel _tmp56_;
-							RGBAnalyticPixel _tmp57_ = {0};
-							guchar* _tmp58_;
-							gint _tmp58__length1;
-							gint _tmp59_;
-							guchar _tmp60_;
-							guchar _tmp61_;
-							guchar* _tmp62_;
-							gint _tmp62__length1;
-							gint _tmp63_;
-							guchar _tmp64_;
-							guchar _tmp65_;
-							guchar* _tmp66_;
-							gint _tmp66__length1;
-							gint _tmp67_;
-							guchar _tmp68_;
-							guchar _tmp69_;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							if (!_tmp42_) {
-#line 7786 "ColorTransformation.c"
-								gint _tmp43_;
-								gint _tmp44_;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								_tmp43_ = i;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								_tmp44_ = n_channels;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								i = _tmp43_ + _tmp44_;
-#line 7795 "ColorTransformation.c"
-							}
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp42_ = FALSE;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp45_ = i;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp46_ = row_end_index;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							if (!(_tmp45_ < _tmp46_)) {
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-								break;
-#line 7807 "ColorTransformation.c"
-							}
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp47_ = source_pixels;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp47__length1 = source_pixels_length1;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp48_ = i;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp49_ = _tmp47_[_tmp48_];
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp50_ = source_pixels;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp50__length1 = source_pixels_length1;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp51_ = i;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp52_ = _tmp50_[_tmp51_ + 1];
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp53_ = source_pixels;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp53__length1 = source_pixels_length1;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp54_ = i;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp55_ = _tmp53_[_tmp54_ + 2];
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							rgb_analytic_pixel_init_from_quantized_components (&current_pixel, _tmp49_, _tmp52_, _tmp55_);
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp56_ = current_pixel;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							pixel_transformer_apply_transformations (self, &_tmp56_, &_tmp57_);
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							current_pixel = _tmp57_;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp58_ = dest_pixels;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp58__length1 = dest_pixels_length1;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp59_ = i;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp60_ = rgb_analytic_pixel_quantized_red (&current_pixel);
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp58_[_tmp59_] = _tmp60_;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp61_ = _tmp58_[_tmp59_];
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp62_ = dest_pixels;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp62__length1 = dest_pixels_length1;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp63_ = i;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp64_ = rgb_analytic_pixel_quantized_green (&current_pixel);
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp62_[_tmp63_ + 1] = _tmp64_;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp65_ = _tmp62_[_tmp63_ + 1];
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp66_ = dest_pixels;
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp66__length1 = dest_pixels_length1;
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp67_ = i;
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp68_ = rgb_analytic_pixel_quantized_blue (&current_pixel);
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp66_[_tmp67_ + 2] = _tmp68_;
-#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-							_tmp69_ = _tmp66_[_tmp67_ + 2];
-#line 7877 "ColorTransformation.c"
-						}
-					}
-				}
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp71_ = cancellable;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (_tmp71_ != NULL) {
-#line 7885 "ColorTransformation.c"
-					GCancellable* _tmp72_;
-					gboolean _tmp73_;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp72_ = cancellable;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp73_ = g_cancellable_is_cancelled (_tmp72_);
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp70_ = _tmp73_;
-#line 7894 "ColorTransformation.c"
-				} else {
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp70_ = FALSE;
-#line 7898 "ColorTransformation.c"
-				}
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (_tmp70_) {
-#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					return;
-#line 7904 "ColorTransformation.c"
+#line 7481 "ColorTransformation.c"
 				}
+#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp48_ = job;
+#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp49_ = slice_length;
+#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_->row = _tmp48_ * _tmp49_;
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp50_ = _data4_->row;
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp51_ = slice_length;
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp52_ = height;
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp53_ = CLAMP (_tmp50_ + _tmp51_, (guint) 0, (guint) _tmp52_);
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_->slice_height = _tmp53_;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp54_ = threads;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp54__length1 = threads_length1;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp55_ = job;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp56_ = g_thread_new ("shotwell-worker", ______lambda4__gthread_func, block4_data_ref (_data4_));
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_g_thread_unref0 (_tmp54_[_tmp55_]);
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp54_[_tmp55_] = _tmp56_;
+#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp57_ = _tmp54_[_tmp55_];
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				block4_data_unref (_data4_);
+#line 850 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_data4_ = NULL;
+#line 7517 "ColorTransformation.c"
 			}
 		}
 	}
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp58_ = threads;
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp58__length1 = threads_length1;
+#line 7525 "ColorTransformation.c"
+	{
+		GThread** thread_collection = NULL;
+		gint thread_collection_length1 = 0;
+		gint _thread_collection_size_ = 0;
+		gint thread_it = 0;
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		thread_collection = _tmp58_;
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		thread_collection_length1 = _tmp58__length1;
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		for (thread_it = 0; thread_it < _tmp58__length1; thread_it = thread_it + 1) {
+#line 7537 "ColorTransformation.c"
+			GThread* _tmp59_;
+			GThread* thread = NULL;
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp59_ = _g_thread_ref0 (thread_collection[thread_it]);
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			thread = _tmp59_;
+#line 7544 "ColorTransformation.c"
+			{
+				GThread* _tmp60_;
+				GThread* _tmp61_;
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp60_ = thread;
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp61_ = _g_thread_ref0 (_tmp60_);
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				g_thread_join (_tmp61_);
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_g_thread_unref0 (thread);
+#line 7556 "ColorTransformation.c"
+			}
+		}
+	}
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	threads = (_vala_array_free (threads, threads_length1, (GDestroyNotify) g_thread_unref), NULL);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	block3_data_unref (_data3_);
+#line 817 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_data3_ = NULL;
+#line 7566 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformer_init (GValue* value) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 7915 "ColorTransformation.c"
+#line 7573 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformer_free_value (GValue* value) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (value->data[0].v_pointer);
-#line 7924 "ColorTransformation.c"
+#line 7582 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformer_ref (src_value->data[0].v_pointer);
-#line 7934 "ColorTransformation.c"
+#line 7592 "ColorTransformation.c"
 	} else {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7938 "ColorTransformation.c"
+#line 7596 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformer_peek_pointer (const GValue* value) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 7946 "ColorTransformation.c"
+#line 7604 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 7953 "ColorTransformation.c"
+#line 7611 "ColorTransformation.c"
 		PixelTransformer * object;
 		object = collect_values[0].v_pointer;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7960 "ColorTransformation.c"
+#line 7618 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.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 7964 "ColorTransformation.c"
+#line 7622 "ColorTransformation.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformer_ref (object);
-#line 7968 "ColorTransformation.c"
+#line 7626 "ColorTransformation.c"
 	} else {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 7972 "ColorTransformation.c"
+#line 7630 "ColorTransformation.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 7976 "ColorTransformation.c"
+#line 7634 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformer ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7987 "ColorTransformation.c"
+#line 7645 "ColorTransformation.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 7993 "ColorTransformation.c"
+#line 7651 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7997 "ColorTransformation.c"
+#line 7655 "ColorTransformation.c"
 	} else {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformer_ref (value->data[0].v_pointer);
-#line 8001 "ColorTransformation.c"
+#line 7659 "ColorTransformation.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 8005 "ColorTransformation.c"
+#line 7663 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformer* spec;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMER), NULL);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 8019 "ColorTransformation.c"
+#line 7677 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformer (const GValue* value) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER), NULL);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 8028 "ColorTransformation.c"
+#line 7686 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformer (GValue* value, gpointer v_object) {
 	PixelTransformer * old;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMER));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_ref (value->data[0].v_pointer);
-#line 8048 "ColorTransformation.c"
+#line 7706 "ColorTransformation.c"
 	} else {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8052 "ColorTransformation.c"
+#line 7710 "ColorTransformation.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (old);
-#line 8058 "ColorTransformation.c"
+#line 7716 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformer (GValue* value, gpointer v_object) {
 	PixelTransformer * old;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMER));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 8077 "ColorTransformation.c"
+#line 7735 "ColorTransformation.c"
 	} else {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8081 "ColorTransformation.c"
+#line 7739 "ColorTransformation.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (old);
-#line 8087 "ColorTransformation.c"
+#line 7745 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformer_class_init (PixelTransformerClass * klass) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformer_parent_class = g_type_class_peek_parent (klass);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformerClass *) klass)->finalize = pixel_transformer_finalize;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformerPrivate));
-#line 8099 "ColorTransformation.c"
+#line 7757 "ColorTransformation.c"
 }
 
 
 static void pixel_transformer_instance_init (PixelTransformer * self) {
 	GeeArrayList* _tmp0_;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMER_GET_PRIVATE (self);
-#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, (GDestroyNotify) pixel_transformation_unref, NULL, NULL, NULL);
-#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->transformations = _tmp0_;
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = NULL;
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations_length1 = 0;
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 779 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_slots_used = 0;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = NULL;
+#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations_length1 = 0;
+#line 686 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_slots_used = 0;
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 8121 "ColorTransformation.c"
+#line 7777 "ColorTransformation.c"
 }
 
 
 static void pixel_transformer_finalize (PixelTransformer * obj) {
 	PixelTransformer * self;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMER, PixelTransformer);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->transformations);
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 8135 "ColorTransformation.c"
+#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->optimized_transformations = (_vala_array_free (self->optimized_transformations, self->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
+#line 7791 "ColorTransformation.c"
 }
 
 
@@ -8157,24 +7812,24 @@ GType pixel_transformer_get_type (void) {
 gpointer pixel_transformer_ref (gpointer instance) {
 	PixelTransformer * self;
 	self = instance;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 8160 "ColorTransformation.c"
+#line 7816 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_unref (gpointer instance) {
 	PixelTransformer * self;
 	self = instance;
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMER_GET_CLASS (self)->finalize (self);
-#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8173 "ColorTransformation.c"
+#line 7829 "ColorTransformation.c"
 	}
 }
 
@@ -8198,57 +7853,55 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 	guint8* _tmp10_;
 	gint pixel_data_length1;
 	gint _pixel_data_size_;
-#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (RGBHistogram*) g_type_create_instance (object_type);
-#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gdk_pixbuf_get_bits_per_sample (_tmp0_);
-#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	sample_bytes = _tmp1_ / 8;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = sample_bytes;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = pixbuf;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = gdk_pixbuf_get_n_channels (_tmp3_);
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_bytes = _tmp2_ * _tmp4_;
-#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = pixel_bytes;
-#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = pixbuf;
-#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
-#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp7_;
-#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 901 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	row_length_bytes = _tmp5_ * _tmp8_;
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = pixbuf;
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = gdk_pixbuf_get_pixels (_tmp9_);
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_data = _tmp10_;
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_data_length1 = -1;
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_data_size_ = pixel_data_length1;
-#line 8235 "ColorTransformation.c"
+#line 7889 "ColorTransformation.c"
 	{
 		gint y = 0;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		y = 0;
-#line 8240 "ColorTransformation.c"
+#line 7894 "ColorTransformation.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = TRUE;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 8247 "ColorTransformation.c"
+#line 7901 "ColorTransformation.c"
 				gint _tmp13_;
 				GdkPixbuf* _tmp14_;
 				gint _tmp15_;
@@ -8267,63 +7920,63 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 				gint _tmp24_;
 				gint _tmp25_;
 				gint _tmp26_;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
-#line 8268 "ColorTransformation.c"
+#line 7922 "ColorTransformation.c"
 					gint _tmp12_;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = y;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					y = _tmp12_ + 1;
-#line 8274 "ColorTransformation.c"
+#line 7928 "ColorTransformation.c"
 				}
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = FALSE;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = y;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = pixbuf;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = gdk_pixbuf_get_height (_tmp14_);
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = _tmp15_;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp13_ < _tmp16_)) {
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 905 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 8290 "ColorTransformation.c"
+#line 7944 "ColorTransformation.c"
 				}
-#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = y;
-#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = pixbuf;
-#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = gdk_pixbuf_get_rowstride (_tmp18_);
-#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = _tmp19_;
-#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_offset = _tmp17_ * _tmp20_;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp21_ = row_start_offset;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				r_offset = _tmp21_;
-#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22_ = row_start_offset;
-#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = sample_bytes;
-#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				g_offset = _tmp22_ + _tmp23_;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = row_start_offset;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = sample_bytes;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = sample_bytes;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				b_offset = (_tmp24_ + _tmp25_) + _tmp26_;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 8322 "ColorTransformation.c"
+#line 7976 "ColorTransformation.c"
 					gint _tmp27_;
 					gint _tmp28_;
 					gint _tmp29_;
@@ -8354,99 +8007,99 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 					gint _tmp48_;
 					gint _tmp49_;
 					gint _tmp50_;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = b_offset;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = row_start_offset;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = row_length_bytes;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp27_ < (_tmp28_ + _tmp29_))) {
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 912 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 8363 "ColorTransformation.c"
+#line 8017 "ColorTransformation.c"
 					}
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = self->priv->red_counts;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30__length1 = self->priv->red_counts_length1;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = pixel_data;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31__length1 = pixel_data_length1;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = r_offset;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = _tmp31_[_tmp32_];
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_[_tmp33_] += 1;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 913 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = _tmp30_[_tmp33_];
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_ = self->priv->green_counts;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35__length1 = self->priv->green_counts_length1;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36_ = pixel_data;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36__length1 = pixel_data_length1;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp37_ = g_offset;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = _tmp36_[_tmp37_];
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_[_tmp38_] += 1;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp39_ = _tmp35_[_tmp38_];
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40_ = self->priv->blue_counts;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40__length1 = self->priv->blue_counts_length1;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41_ = pixel_data;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41__length1 = pixel_data_length1;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp42_ = b_offset;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp43_ = _tmp41_[_tmp42_];
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40_[_tmp43_] += 1;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp44_ = _tmp40_[_tmp43_];
-#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp45_ = r_offset;
-#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp46_ = pixel_bytes;
-#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					r_offset = _tmp45_ + _tmp46_;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp47_ = g_offset;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = pixel_bytes;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					g_offset = _tmp47_ + _tmp48_;
-#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp49_ = b_offset;
-#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp50_ = pixel_bytes;
-#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 919 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					b_offset = _tmp49_ + _tmp50_;
-#line 8431 "ColorTransformation.c"
+#line 8085 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 8438 "ColorTransformation.c"
+#line 8092 "ColorTransformation.c"
 }
 
 
 RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf) {
-#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return rgb_histogram_construct (TYPE_RGB_HISTOGRAM, pixbuf);
-#line 8445 "ColorTransformation.c"
+#line 8099 "ColorTransformation.c"
 }
 
 
@@ -8461,67 +8114,65 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 	gint _tmp54__length1;
 	gint _tmp55_;
 	gint _tmp56_;
-#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
-#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = buckets;
-#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = buckets_length1;
-#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "buckets.length == 256");
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = i;
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
-#line 8472 "ColorTransformation.c"
+#line 8124 "ColorTransformation.c"
 		gint _tmp3_;
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ <= 255;
-#line 8478 "ColorTransformation.c"
+#line 8130 "ColorTransformation.c"
 	} else {
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 8482 "ColorTransformation.c"
+#line 8134 "ColorTransformation.c"
 	}
-#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp1_, "(i >= 0) && (i <= 255)");
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = i;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
-#line 8490 "ColorTransformation.c"
+#line 8142 "ColorTransformation.c"
 		gint* _tmp5_;
 		gint _tmp5__length1;
 		gint _tmp6_;
 		gint _tmp7_;
-#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
-#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = buckets_length1;
-#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = i;
-#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[_tmp6_];
-#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 929 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp7_ > 0) {
-#line 8505 "ColorTransformation.c"
+#line 8157 "ColorTransformation.c"
 			gint* _tmp8_;
 			gint _tmp8__length1;
 			gint _tmp9_;
 			gint _tmp10_;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = buckets;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8__length1 = buckets_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = i;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = _tmp8_[_tmp9_ + 1];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp10_ > 0) {
-#line 8520 "ColorTransformation.c"
+#line 8172 "ColorTransformation.c"
 				gint* _tmp11_;
 				gint _tmp11__length1;
 				gint _tmp12_;
@@ -8530,82 +8181,82 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 				gint _tmp14__length1;
 				gint _tmp15_;
 				gint _tmp16_;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = buckets;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11__length1 = buckets_length1;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = i;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = _tmp11_[_tmp12_];
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = buckets;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14__length1 = buckets_length1;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = i;
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = _tmp14_[_tmp15_ + 1];
-#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp13_ > (2 * _tmp16_)) {
-#line 8547 "ColorTransformation.c"
+#line 8199 "ColorTransformation.c"
 					gint* _tmp17_;
 					gint _tmp17__length1;
 					gint _tmp18_;
 					gint _tmp19_;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = buckets;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17__length1 = buckets_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = i;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = _tmp17_[_tmp18_ + 1];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					result = _tmp19_;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return result;
-#line 8564 "ColorTransformation.c"
+#line 8216 "ColorTransformation.c"
 				}
 			}
 		}
 	} else {
 		gint _tmp20_;
-#line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = i;
-#line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp20_ == 255) {
-#line 8574 "ColorTransformation.c"
+#line 8226 "ColorTransformation.c"
 			gint* _tmp21_;
 			gint _tmp21__length1;
 			gint _tmp22_;
 			gint _tmp23_;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21_ = buckets;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21__length1 = buckets_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = i;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp23_ = _tmp21_[_tmp22_];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp23_ > 0) {
-#line 8589 "ColorTransformation.c"
+#line 8241 "ColorTransformation.c"
 				gint* _tmp24_;
 				gint _tmp24__length1;
 				gint _tmp25_;
 				gint _tmp26_;
-#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = buckets;
-#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24__length1 = buckets_length1;
-#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = i;
-#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = _tmp24_[_tmp25_ - 1];
-#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp26_ > 0) {
-#line 8604 "ColorTransformation.c"
+#line 8256 "ColorTransformation.c"
 					gint* _tmp27_;
 					gint _tmp27__length1;
 					gint _tmp28_;
@@ -8614,42 +8265,42 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 					gint _tmp30__length1;
 					gint _tmp31_;
 					gint _tmp32_;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = buckets;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27__length1 = buckets_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = i;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = _tmp27_[_tmp28_];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = buckets;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30__length1 = buckets_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = i;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = _tmp30_[_tmp31_ - 1];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp29_ > (2 * _tmp32_)) {
-#line 8631 "ColorTransformation.c"
+#line 8283 "ColorTransformation.c"
 						gint* _tmp33_;
 						gint _tmp33__length1;
 						gint _tmp34_;
 						gint _tmp35_;
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp33_ = buckets;
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp33__length1 = buckets_length1;
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp34_ = i;
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp35_ = _tmp33_[_tmp34_ - 1];
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						result = _tmp35_;
-#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						return result;
-#line 8648 "ColorTransformation.c"
+#line 8300 "ColorTransformation.c"
 					}
 				}
 			}
@@ -8658,17 +8309,17 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 			gint _tmp36__length1;
 			gint _tmp37_;
 			gint _tmp38_;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp36_ = buckets;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp36__length1 = buckets_length1;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp37_ = i;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp38_ = _tmp36_[_tmp37_];
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp38_ > 0) {
-#line 8667 "ColorTransformation.c"
+#line 8319 "ColorTransformation.c"
 				gint* _tmp39_;
 				gint _tmp39__length1;
 				gint _tmp40_;
@@ -8681,33 +8332,33 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 				gint _tmp45__length1;
 				gint _tmp46_;
 				gint _tmp47_;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = buckets;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39__length1 = buckets_length1;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp40_ = i;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_ = _tmp39_[_tmp40_];
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42_ = buckets;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42__length1 = buckets_length1;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43_ = i;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp44_ = _tmp42_[_tmp43_ - 1];
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45_ = buckets;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45__length1 = buckets_length1;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp46_ = i;
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = _tmp45_[_tmp46_ + 1];
-#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp41_ > ((_tmp44_ + _tmp47_) / 2)) {
-#line 8706 "ColorTransformation.c"
+#line 8358 "ColorTransformation.c"
 					gint* _tmp48_;
 					gint _tmp48__length1;
 					gint _tmp49_;
@@ -8716,44 +8367,44 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 					gint _tmp51__length1;
 					gint _tmp52_;
 					gint _tmp53_;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = buckets;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48__length1 = buckets_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp49_ = i;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp50_ = _tmp48_[_tmp49_ - 1];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp51_ = buckets;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp51__length1 = buckets_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp52_ = i;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp53_ = _tmp51_[_tmp52_ + 1];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					result = (_tmp50_ + _tmp53_) / 2;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return result;
-#line 8735 "ColorTransformation.c"
+#line 8387 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = buckets;
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54__length1 = buckets_length1;
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = i;
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = _tmp54_[_tmp55_];
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp56_;
-#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 8752 "ColorTransformation.c"
+#line 8404 "ColorTransformation.c"
 }
 
 
@@ -8768,124 +8419,122 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 	gint _tmp27__length1;
 	gint _tmp28_;
 	gint _tmp29_;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
-#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = buckets;
-#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = buckets_length1;
-#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "buckets.length == 256");
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = i;
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
-#line 8779 "ColorTransformation.c"
+#line 8429 "ColorTransformation.c"
 		gint _tmp3_;
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ <= 255;
-#line 8785 "ColorTransformation.c"
+#line 8435 "ColorTransformation.c"
 	} else {
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 8789 "ColorTransformation.c"
+#line 8439 "ColorTransformation.c"
 	}
-#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp1_, "(i >= 0) && (i <= 255)");
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = i;
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
-#line 8797 "ColorTransformation.c"
+#line 8447 "ColorTransformation.c"
 		gint* _tmp5_;
 		gint _tmp5__length1;
 		gint _tmp6_;
 		gint _tmp7_;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = buckets_length1;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = i;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[_tmp6_];
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		result = _tmp7_;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return result;
-#line 8814 "ColorTransformation.c"
+#line 8464 "ColorTransformation.c"
 	} else {
 		gint _tmp8_;
-#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 953 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = i;
-#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 953 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp8_ == 255) {
-#line 8821 "ColorTransformation.c"
+#line 8471 "ColorTransformation.c"
 			gint* _tmp9_;
 			gint _tmp9__length1;
 			gint _tmp10_;
 			gint _tmp11_;
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = buckets;
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9__length1 = buckets_length1;
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = i;
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = _tmp9_[_tmp10_];
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp11_;
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 954 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 8838 "ColorTransformation.c"
+#line 8488 "ColorTransformation.c"
 		} else {
 			gint* _tmp12_;
 			gint _tmp12__length1;
 			gint _tmp13_;
 			gint _tmp14_;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = buckets;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12__length1 = buckets_length1;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = i;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = _tmp12_[_tmp13_];
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp14_ == 0) {
-#line 8854 "ColorTransformation.c"
+#line 8504 "ColorTransformation.c"
 				gint* _tmp15_;
 				gint _tmp15__length1;
 				gint _tmp16_;
 				gint _tmp17_;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = buckets;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15__length1 = buckets_length1;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = i;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = _tmp15_[_tmp16_ - 1];
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp17_ > 0) {
-#line 8869 "ColorTransformation.c"
+#line 8519 "ColorTransformation.c"
 					gint* _tmp18_;
 					gint _tmp18__length1;
 					gint _tmp19_;
 					gint _tmp20_;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = buckets;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18__length1 = buckets_length1;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = i;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = _tmp18_[_tmp19_ + 1];
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > 0) {
-#line 8884 "ColorTransformation.c"
+#line 8534 "ColorTransformation.c"
 						gint* _tmp21_;
 						gint _tmp21__length1;
 						gint _tmp22_;
@@ -8894,45 +8543,45 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 						gint _tmp24__length1;
 						gint _tmp25_;
 						gint _tmp26_;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = buckets;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21__length1 = buckets_length1;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22_ = i;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp23_ = _tmp21_[_tmp22_ - 1];
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24_ = buckets;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24__length1 = buckets_length1;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp25_ = i;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp26_ = _tmp24_[_tmp25_ + 1];
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						result = (_tmp23_ + _tmp26_) / 2;
-#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 959 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						return result;
-#line 8913 "ColorTransformation.c"
+#line 8563 "ColorTransformation.c"
 					}
 				}
 			}
 		}
 	}
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = buckets;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27__length1 = buckets_length1;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = i;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp27_[_tmp28_];
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp29_;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 8931 "ColorTransformation.c"
+#line 8581 "ColorTransformation.c"
 }
 
 
@@ -9101,359 +8750,357 @@ static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data,
 	gint _tmp106__length1;
 	gint _tmp107_;
 	gint _tmp108_;
-#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM (self));
-#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *count_data;
-#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = *count_data_length1;
-#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "count_data.length == 256");
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = *count_data;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1__length1 = *count_data_length1;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = *count_data;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = *count_data_length1;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_[0];
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = *count_data;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4__length1 = *count_data_length1;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_[1];
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = *count_data;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6__length1 = *count_data_length1;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_[2];
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[0] = (((5 * _tmp3_) + (3 * _tmp5_)) + (2 * _tmp7_)) / 10;
-#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp1_[0];
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = *count_data;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9__length1 = *count_data_length1;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = *count_data;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10__length1 = *count_data_length1;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_[0];
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = *count_data;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12__length1 = *count_data_length1;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_[1];
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = *count_data;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14__length1 = *count_data_length1;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_[2];
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = *count_data;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16__length1 = *count_data_length1;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_[3];
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_[1] = ((((3 * _tmp11_) + (5 * _tmp13_)) + (3 * _tmp15_)) + (2 * _tmp17_)) / 13;
-#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = _tmp9_[1];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = _tmp20_[0];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_[1];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = _tmp24_[2];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = _tmp26_[3];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = *count_data;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28__length1 = *count_data_length1;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp28_[4];
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_[2] = (((((2 * _tmp21_) + (3 * _tmp23_)) + (5 * _tmp25_)) + (3 * _tmp27_)) + (2 * _tmp29_)) / 15;
-#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = _tmp19_[2];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = _tmp32_[1];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_[2];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp37_ = _tmp36_[3];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39_ = _tmp38_[4];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40_ = *count_data;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40__length1 = *count_data_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = _tmp40_[5];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_[3] = (((((2 * _tmp33_) + (3 * _tmp35_)) + (5 * _tmp37_)) + (3 * _tmp39_)) + (2 * _tmp41_)) / 15;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 978 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = _tmp31_[3];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = _tmp44_[2];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = _tmp46_[3];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = _tmp48_[4];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_[5];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = *count_data;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52__length1 = *count_data_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = _tmp52_[6];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_[4] = (((((2 * _tmp45_) + (3 * _tmp47_)) + (5 * _tmp49_)) + (3 * _tmp51_)) + (2 * _tmp53_)) / 15;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp43_[4];
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = *count_data;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55__length1 = *count_data_length1;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = *count_data;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56__length1 = *count_data_length1;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_[255];
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = *count_data;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58__length1 = *count_data_length1;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp59_ = _tmp58_[254];
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = *count_data;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60__length1 = *count_data_length1;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61_ = _tmp60_[253];
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_[255] = (((5 * _tmp57_) + (3 * _tmp59_)) + (2 * _tmp61_)) / 10;
-#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp62_ = _tmp55_[255];
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_ = *count_data;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63__length1 = *count_data_length1;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64_ = *count_data;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64__length1 = *count_data_length1;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp65_ = _tmp64_[255];
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66_ = *count_data;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66__length1 = *count_data_length1;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp67_ = _tmp66_[254];
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68_ = *count_data;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68__length1 = *count_data_length1;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp69_ = _tmp68_[253];
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70_ = *count_data;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70__length1 = *count_data_length1;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_ = _tmp70_[252];
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_[254] = ((((3 * _tmp65_) + (5 * _tmp67_)) + (3 * _tmp69_)) + (2 * _tmp71_)) / 13;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp72_ = _tmp63_[254];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75_ = _tmp74_[255];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp77_ = _tmp76_[254];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp79_ = _tmp78_[253];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp81_ = _tmp80_[252];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82_ = *count_data;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82__length1 = *count_data_length1;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83_ = _tmp82_[251];
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_[253] = (((((2 * _tmp75_) + (3 * _tmp77_)) + (5 * _tmp79_)) + (3 * _tmp81_)) + (2 * _tmp83_)) / 15;
-#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 987 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp84_ = _tmp73_[253];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = _tmp86_[254];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp89_ = _tmp88_[253];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp91_ = _tmp90_[252];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_ = _tmp92_[251];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94_ = *count_data;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94__length1 = *count_data_length1;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95_ = _tmp94_[250];
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_[252] = (((((2 * _tmp87_) + (3 * _tmp89_)) + (5 * _tmp91_)) + (3 * _tmp93_)) + (2 * _tmp95_)) / 15;
-#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp96_ = _tmp85_[252];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp99_ = _tmp98_[253];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp101_ = _tmp100_[252];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp103_ = _tmp102_[251];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105_ = _tmp104_[250];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106_ = *count_data;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106__length1 = *count_data_length1;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107_ = _tmp106_[249];
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_[251] = (((((2 * _tmp99_) + (3 * _tmp101_)) + (5 * _tmp103_)) + (3 * _tmp105_)) + (2 * _tmp107_)) / 15;
-#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp108_ = _tmp97_[251];
-#line 9452 "ColorTransformation.c"
+#line 9100 "ColorTransformation.c"
 }
 
 
@@ -9481,119 +9128,117 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 	gint _tmp87_;
 	gint constrained_max_qual_count = 0;
 	gint _tmp88_;
-#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM (self));
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->qualitative_red_counts;
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = self->priv->qualitative_red_counts_length1;
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != NULL) {
-#line 9488 "ColorTransformation.c"
+#line 9134 "ColorTransformation.c"
 		gint* _tmp3_;
 		gint _tmp3__length1;
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->qualitative_green_counts;
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3__length1 = self->priv->qualitative_green_counts_length1;
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 9497 "ColorTransformation.c"
+#line 9143 "ColorTransformation.c"
 	} else {
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 9501 "ColorTransformation.c"
+#line 9147 "ColorTransformation.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 9505 "ColorTransformation.c"
+#line 9151 "ColorTransformation.c"
 		gint* _tmp4_;
 		gint _tmp4__length1;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = self->priv->qualitative_blue_counts;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 9514 "ColorTransformation.c"
+#line 9160 "ColorTransformation.c"
 	} else {
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 9518 "ColorTransformation.c"
+#line 9164 "ColorTransformation.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 996 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_) {
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 998 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return;
-#line 9524 "ColorTransformation.c"
+#line 9170 "ColorTransformation.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = g_new0 (gint, 256);
-#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = (g_free (self->priv->qualitative_red_counts), NULL);
-#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = _tmp5_;
-#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts_length1 = 256;
-#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_red_counts_size_ = self->priv->qualitative_red_counts_length1;
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = g_new0 (gint, 256);
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = (g_free (self->priv->qualitative_green_counts), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = _tmp6_;
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts_length1 = 256;
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_green_counts_size_ = self->priv->qualitative_green_counts_length1;
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = g_new0 (gint, 256);
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = (g_free (self->priv->qualitative_blue_counts), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = _tmp7_;
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts_length1 = 256;
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_blue_counts_size_ = self->priv->qualitative_blue_counts_length1;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = g_new0 (gint, 256);
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts = _tmp8_;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts_length1 = 256;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_red_counts_size_ = temp_red_counts_length1;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = g_new0 (gint, 256);
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts = _tmp9_;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts_length1 = 256;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_green_counts_size_ = temp_green_counts_length1;
-#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = g_new0 (gint, 256);
-#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts = _tmp10_;
-#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts_length1 = 256;
-#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_blue_counts_size_ = temp_blue_counts_length1;
-#line 9580 "ColorTransformation.c"
+#line 9226 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9585 "ColorTransformation.c"
+#line 9231 "ColorTransformation.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = TRUE;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9592 "ColorTransformation.c"
+#line 9238 "ColorTransformation.c"
 				gint _tmp13_;
 				gint* _tmp14_;
 				gint _tmp14__length1;
@@ -9619,96 +9264,96 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp29_;
 				gint _tmp30_;
 				gint _tmp31_;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
-#line 9620 "ColorTransformation.c"
+#line 9266 "ColorTransformation.c"
 					gint _tmp12_;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = i;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp12_ + 1;
-#line 9626 "ColorTransformation.c"
+#line 9272 "ColorTransformation.c"
 				}
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = FALSE;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = i;
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp13_ < 256)) {
-#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9636 "ColorTransformation.c"
+#line 9282 "ColorTransformation.c"
 				}
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = self->priv->qualitative_red_counts;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14__length1 = self->priv->qualitative_red_counts_length1;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = i;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = self->priv->red_counts;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16__length1 = self->priv->red_counts_length1;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = i;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = rgb_histogram_correct_snap_from_quantization (self, _tmp16_, _tmp16__length1, _tmp17_);
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_[_tmp15_] = _tmp18_;
-#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = _tmp14_[_tmp15_];
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = self->priv->qualitative_green_counts;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20__length1 = self->priv->qualitative_green_counts_length1;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp21_ = i;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22_ = self->priv->green_counts;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22__length1 = self->priv->green_counts_length1;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = i;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = rgb_histogram_correct_snap_from_quantization (self, _tmp22_, _tmp22__length1, _tmp23_);
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_[_tmp21_] = _tmp24_;
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = _tmp20_[_tmp21_];
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = self->priv->qualitative_blue_counts;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp27_ = i;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp28_ = self->priv->blue_counts;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp28__length1 = self->priv->blue_counts_length1;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp29_ = i;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp30_ = rgb_histogram_correct_snap_from_quantization (self, _tmp28_, _tmp28__length1, _tmp29_);
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_[_tmp27_] = _tmp30_;
-#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp31_ = _tmp26_[_tmp27_];
-#line 9692 "ColorTransformation.c"
+#line 9338 "ColorTransformation.c"
 			}
 		}
 	}
 	{
 		gint i = 0;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9700 "ColorTransformation.c"
+#line 9346 "ColorTransformation.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp32_ = TRUE;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9707 "ColorTransformation.c"
+#line 9353 "ColorTransformation.c"
 				gint _tmp34_;
 				gint* _tmp35_;
 				gint _tmp35__length1;
@@ -9734,96 +9379,96 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp50_;
 				gint _tmp51_;
 				gint _tmp52_;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp32_) {
-#line 9735 "ColorTransformation.c"
+#line 9381 "ColorTransformation.c"
 					gint _tmp33_;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = i;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp33_ + 1;
-#line 9741 "ColorTransformation.c"
+#line 9387 "ColorTransformation.c"
 				}
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp32_ = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp34_ = i;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp34_ < 256)) {
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9751 "ColorTransformation.c"
+#line 9397 "ColorTransformation.c"
 				}
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35_ = temp_red_counts;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35__length1 = temp_red_counts_length1;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp36_ = i;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp37_ = self->priv->qualitative_red_counts;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp37__length1 = self->priv->qualitative_red_counts_length1;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp38_ = i;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = _tmp37_[_tmp38_];
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35_[_tmp36_] = _tmp39_;
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1022 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp40_ = _tmp35_[_tmp36_];
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_ = temp_green_counts;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41__length1 = temp_green_counts_length1;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42_ = i;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43_ = self->priv->qualitative_green_counts;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43__length1 = self->priv->qualitative_green_counts_length1;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp44_ = i;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45_ = _tmp43_[_tmp44_];
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_[_tmp42_] = _tmp45_;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp46_ = _tmp41_[_tmp42_];
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = temp_blue_counts;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47__length1 = temp_blue_counts_length1;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp48_ = i;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49_ = self->priv->qualitative_blue_counts;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_ = i;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp51_ = _tmp49_[_tmp50_];
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_[_tmp48_] = _tmp51_;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52_ = _tmp47_[_tmp48_];
-#line 9807 "ColorTransformation.c"
+#line 9453 "ColorTransformation.c"
 			}
 		}
 	}
 	{
 		gint i = 0;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9815 "ColorTransformation.c"
+#line 9461 "ColorTransformation.c"
 		{
 			gboolean _tmp53_ = FALSE;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp53_ = TRUE;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9822 "ColorTransformation.c"
+#line 9468 "ColorTransformation.c"
 				gint _tmp55_;
 				gint* _tmp56_;
 				gint _tmp56__length1;
@@ -9849,99 +9494,99 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp71_;
 				gint _tmp72_;
 				gint _tmp73_;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp53_) {
-#line 9850 "ColorTransformation.c"
+#line 9496 "ColorTransformation.c"
 					gint _tmp54_;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp54_ = i;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp54_ + 1;
-#line 9856 "ColorTransformation.c"
+#line 9502 "ColorTransformation.c"
 				}
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = FALSE;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp55_ = i;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp55_ < 256)) {
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9866 "ColorTransformation.c"
+#line 9512 "ColorTransformation.c"
 				}
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_ = self->priv->qualitative_red_counts;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56__length1 = self->priv->qualitative_red_counts_length1;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp57_ = i;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58_ = temp_red_counts;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58__length1 = temp_red_counts_length1;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp59_ = i;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp60_ = rgb_histogram_correct_snap_to_quantization (self, _tmp58_, _tmp58__length1, _tmp59_);
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_[_tmp57_] = _tmp60_;
-#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_ = _tmp56_[_tmp57_];
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_ = self->priv->qualitative_green_counts;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62__length1 = self->priv->qualitative_green_counts_length1;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp63_ = i;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64_ = temp_green_counts;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64__length1 = temp_green_counts_length1;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp65_ = i;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp66_ = rgb_histogram_correct_snap_to_quantization (self, _tmp64_, _tmp64__length1, _tmp65_);
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_[_tmp63_] = _tmp66_;
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp67_ = _tmp62_[_tmp63_];
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68_ = self->priv->qualitative_blue_counts;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp69_ = i;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp70_ = temp_blue_counts;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp70__length1 = temp_blue_counts_length1;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp71_ = i;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp72_ = rgb_histogram_correct_snap_to_quantization (self, _tmp70_, _tmp70__length1, _tmp71_);
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68_[_tmp69_] = _tmp72_;
-#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp73_ = _tmp68_[_tmp69_];
-#line 9922 "ColorTransformation.c"
+#line 9568 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1040 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	mean_qual_count = 0;
-#line 9928 "ColorTransformation.c"
+#line 9574 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9933 "ColorTransformation.c"
+#line 9579 "ColorTransformation.c"
 		{
 			gboolean _tmp74_ = FALSE;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp74_ = TRUE;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9940 "ColorTransformation.c"
+#line 9586 "ColorTransformation.c"
 				gint _tmp76_;
 				gint _tmp77_;
 				gint* _tmp78_;
@@ -9956,79 +9601,79 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp84__length1;
 				gint _tmp85_;
 				gint _tmp86_;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp74_) {
-#line 9957 "ColorTransformation.c"
+#line 9603 "ColorTransformation.c"
 					gint _tmp75_;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp75_ = i;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp75_ + 1;
-#line 9963 "ColorTransformation.c"
+#line 9609 "ColorTransformation.c"
 				}
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp74_ = FALSE;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp76_ = i;
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp76_ < 256)) {
-#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9973 "ColorTransformation.c"
+#line 9619 "ColorTransformation.c"
 				}
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp77_ = mean_qual_count;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp78_ = self->priv->qualitative_red_counts;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp78__length1 = self->priv->qualitative_red_counts_length1;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp79_ = i;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp80_ = _tmp78_[_tmp79_];
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp81_ = self->priv->qualitative_green_counts;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp81__length1 = self->priv->qualitative_green_counts_length1;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp82_ = i;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp83_ = _tmp81_[_tmp82_];
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp84_ = self->priv->qualitative_blue_counts;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp84__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp85_ = i;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp86_ = _tmp84_[_tmp85_];
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				mean_qual_count = _tmp77_ + ((_tmp80_ + _tmp83_) + _tmp86_);
-#line 10003 "ColorTransformation.c"
+#line 9649 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = mean_qual_count;
-#line 1121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	mean_qual_count = _tmp87_ / (256 * 3);
-#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1046 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = mean_qual_count;
-#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1046 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	constrained_max_qual_count = 8 * _tmp88_;
-#line 10015 "ColorTransformation.c"
+#line 9661 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 10020 "ColorTransformation.c"
+#line 9666 "ColorTransformation.c"
 		{
 			gboolean _tmp89_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp89_ = TRUE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 10027 "ColorTransformation.c"
+#line 9673 "ColorTransformation.c"
 				gint _tmp91_;
 				gint* _tmp92_;
 				gint _tmp92__length1;
@@ -10045,138 +9690,138 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp109_;
 				gint _tmp110_;
 				gint _tmp111_;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp89_) {
-#line 10046 "ColorTransformation.c"
+#line 9692 "ColorTransformation.c"
 					gint _tmp90_;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp90_ = i;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp90_ + 1;
-#line 10052 "ColorTransformation.c"
+#line 9698 "ColorTransformation.c"
 				}
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp89_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp91_ = i;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp91_ < 256)) {
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 10062 "ColorTransformation.c"
+#line 9708 "ColorTransformation.c"
 				}
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp92_ = self->priv->qualitative_red_counts;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp92__length1 = self->priv->qualitative_red_counts_length1;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp93_ = i;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp94_ = _tmp92_[_tmp93_];
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp95_ = constrained_max_qual_count;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp94_ > _tmp95_) {
-#line 10076 "ColorTransformation.c"
+#line 9722 "ColorTransformation.c"
 					gint* _tmp96_;
 					gint _tmp96__length1;
 					gint _tmp97_;
 					gint _tmp98_;
 					gint _tmp99_;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96_ = self->priv->qualitative_red_counts;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96__length1 = self->priv->qualitative_red_counts_length1;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp97_ = i;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp98_ = constrained_max_qual_count;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96_[_tmp97_] = _tmp98_;
-#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp99_ = _tmp96_[_tmp97_];
-#line 10094 "ColorTransformation.c"
+#line 9740 "ColorTransformation.c"
 				}
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp100_ = self->priv->qualitative_green_counts;
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp100__length1 = self->priv->qualitative_green_counts_length1;
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp101_ = i;
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp102_ = _tmp100_[_tmp101_];
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp103_ = constrained_max_qual_count;
-#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1051 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp102_ > _tmp103_) {
-#line 10108 "ColorTransformation.c"
+#line 9754 "ColorTransformation.c"
 					gint* _tmp104_;
 					gint _tmp104__length1;
 					gint _tmp105_;
 					gint _tmp106_;
 					gint _tmp107_;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104_ = self->priv->qualitative_green_counts;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104__length1 = self->priv->qualitative_green_counts_length1;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp105_ = i;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp106_ = constrained_max_qual_count;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104_[_tmp105_] = _tmp106_;
-#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp107_ = _tmp104_[_tmp105_];
-#line 10126 "ColorTransformation.c"
+#line 9772 "ColorTransformation.c"
 				}
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp108_ = self->priv->qualitative_blue_counts;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp108__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp109_ = i;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp110_ = _tmp108_[_tmp109_];
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp111_ = constrained_max_qual_count;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp110_ > _tmp111_) {
-#line 10140 "ColorTransformation.c"
+#line 9786 "ColorTransformation.c"
 					gint* _tmp112_;
 					gint _tmp112__length1;
 					gint _tmp113_;
 					gint _tmp114_;
 					gint _tmp115_;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112_ = self->priv->qualitative_blue_counts;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp113_ = i;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp114_ = constrained_max_qual_count;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112_[_tmp113_] = _tmp114_;
-#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp115_ = _tmp112_[_tmp113_];
-#line 10158 "ColorTransformation.c"
+#line 9804 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1058 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_red_counts, &self->priv->qualitative_red_counts_length1);
-#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_green_counts, &self->priv->qualitative_green_counts_length1);
-#line 1136 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1060 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_blue_counts, &self->priv->qualitative_blue_counts_length1);
-#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts = (g_free (temp_blue_counts), NULL);
-#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts = (g_free (temp_green_counts), NULL);
-#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts = (g_free (temp_red_counts), NULL);
-#line 10175 "ColorTransformation.c"
+#line 9821 "ColorTransformation.c"
 }
 
 
@@ -10185,13 +9830,11 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp121_;
 	GdkPixbuf* _tmp122_;
-#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), NULL);
-#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->graphic;
-#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
-#line 10190 "ColorTransformation.c"
+#line 9834 "ColorTransformation.c"
 		gint max_count = 0;
 		GdkPixbuf* _tmp25_;
 		gint rowstride = 0;
@@ -10213,23 +9856,23 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 		gint pixel_data_length1;
 		gint _pixel_data_size_;
 		gint _tmp37_;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_prepare_qualitative_counts (self);
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		max_count = 0;
-#line 10216 "ColorTransformation.c"
+#line 9860 "ColorTransformation.c"
 		{
 			gint i = 0;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			i = 0;
-#line 10221 "ColorTransformation.c"
+#line 9865 "ColorTransformation.c"
 			{
 				gboolean _tmp1_ = FALSE;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp1_ = TRUE;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 10228 "ColorTransformation.c"
+#line 9872 "ColorTransformation.c"
 					gint _tmp3_;
 					gint* _tmp4_;
 					gint _tmp4__length1;
@@ -10246,177 +9889,177 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 					gint _tmp19_;
 					gint _tmp20_;
 					gint _tmp21_;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp1_) {
-#line 10247 "ColorTransformation.c"
+#line 9891 "ColorTransformation.c"
 						gint _tmp2_;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp2_ = i;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						i = _tmp2_ + 1;
-#line 10253 "ColorTransformation.c"
+#line 9897 "ColorTransformation.c"
 					}
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp1_ = FALSE;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp3_ = i;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp3_ < 256)) {
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 10263 "ColorTransformation.c"
+#line 9907 "ColorTransformation.c"
 					}
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp4_ = self->priv->qualitative_red_counts;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp4__length1 = self->priv->qualitative_red_counts_length1;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp5_ = i;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp6_ = _tmp4_[_tmp5_];
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = max_count;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1068 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp6_ > _tmp7_) {
-#line 10277 "ColorTransformation.c"
+#line 9921 "ColorTransformation.c"
 						gint* _tmp8_;
 						gint _tmp8__length1;
 						gint _tmp9_;
 						gint _tmp10_;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp8_ = self->priv->qualitative_red_counts;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp8__length1 = self->priv->qualitative_red_counts_length1;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp9_ = i;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp10_ = _tmp8_[_tmp9_];
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1069 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp10_;
-#line 10292 "ColorTransformation.c"
+#line 9936 "ColorTransformation.c"
 					}
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11_ = self->priv->qualitative_green_counts;
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11__length1 = self->priv->qualitative_green_counts_length1;
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = i;
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = _tmp11_[_tmp12_];
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp14_ = max_count;
-#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1070 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp13_ > _tmp14_) {
-#line 10306 "ColorTransformation.c"
+#line 9950 "ColorTransformation.c"
 						gint* _tmp15_;
 						gint _tmp15__length1;
 						gint _tmp16_;
 						gint _tmp17_;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp15_ = self->priv->qualitative_green_counts;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp15__length1 = self->priv->qualitative_green_counts_length1;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp16_ = i;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp17_ = _tmp15_[_tmp16_];
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp17_;
-#line 10321 "ColorTransformation.c"
+#line 9965 "ColorTransformation.c"
 					}
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = self->priv->qualitative_blue_counts;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = i;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = _tmp18_[_tmp19_];
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = max_count;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > _tmp21_) {
-#line 10335 "ColorTransformation.c"
+#line 9979 "ColorTransformation.c"
 						gint* _tmp22_;
 						gint _tmp22__length1;
 						gint _tmp23_;
 						gint _tmp24_;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22_ = self->priv->qualitative_blue_counts;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp23_ = i;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24_ = _tmp22_[_tmp23_];
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp24_;
-#line 10350 "ColorTransformation.c"
+#line 9994 "ColorTransformation.c"
 					}
 				}
 			}
 		}
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, RGB_HISTOGRAM_GRAPHIC_WIDTH, RGB_HISTOGRAM_GRAPHIC_HEIGHT);
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (self->priv->graphic);
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->graphic = _tmp25_;
-#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = self->priv->graphic;
-#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = gdk_pixbuf_get_rowstride (_tmp26_);
-#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = _tmp27_;
-#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rowstride = _tmp28_;
-#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp29_ = self->priv->graphic;
-#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp30_ = gdk_pixbuf_get_bits_per_sample (_tmp29_);
-#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		sample_bytes = _tmp30_ / 8;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_ = sample_bytes;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp32_ = self->priv->graphic;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp33_ = gdk_pixbuf_get_n_channels (_tmp32_);
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_bytes = _tmp31_ * _tmp33_;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp34_ = max_count;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		scale_bar = (0.98 * ((gdouble) RGB_HISTOGRAM_GRAPHIC_HEIGHT)) / ((gdouble) _tmp34_);
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = self->priv->graphic;
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = gdk_pixbuf_get_pixels (_tmp35_);
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_data = _tmp36_;
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_data_length1 = -1;
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_data_size_ = pixel_data_length1;
-#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1090 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = max_count;
-#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1090 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp37_ == 0) {
-#line 10401 "ColorTransformation.c"
+#line 10045 "ColorTransformation.c"
 			GdkPixbuf* _tmp51_;
 			GdkPixbuf* _tmp52_;
 			{
 				gint i = 0;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				i = 0;
-#line 10408 "ColorTransformation.c"
+#line 10052 "ColorTransformation.c"
 				{
 					gboolean _tmp38_ = FALSE;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = TRUE;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					while (TRUE) {
-#line 10415 "ColorTransformation.c"
+#line 10059 "ColorTransformation.c"
 						gint _tmp40_;
 						gint _tmp41_;
 						GdkPixbuf* _tmp42_;
@@ -10429,76 +10072,76 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 						gint _tmp48__length1;
 						gint _tmp49_;
 						guchar _tmp50_;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						if (!_tmp38_) {
-#line 10430 "ColorTransformation.c"
+#line 10074 "ColorTransformation.c"
 							gint _tmp39_;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = i;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							i = _tmp39_ + 1;
-#line 10436 "ColorTransformation.c"
+#line 10080 "ColorTransformation.c"
 						}
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp38_ = FALSE;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp40_ = i;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp41_ = pixel_bytes;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp42_ = self->priv->graphic;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp43_ = gdk_pixbuf_get_width (_tmp42_);
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp44_ = _tmp43_;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp45_ = self->priv->graphic;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp46_ = gdk_pixbuf_get_height (_tmp45_);
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp47_ = _tmp46_;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						if (!(_tmp40_ < ((_tmp41_ * _tmp44_) * _tmp47_))) {
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							break;
-#line 10460 "ColorTransformation.c"
+#line 10104 "ColorTransformation.c"
 						}
-#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48_ = pixel_data;
-#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48__length1 = pixel_data_length1;
-#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp49_ = i;
-#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48_[_tmp49_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp50_ = _tmp48_[_tmp49_];
-#line 10472 "ColorTransformation.c"
+#line 10116 "ColorTransformation.c"
 					}
 				}
 			}
-#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp51_ = self->priv->graphic;
-#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp52_;
-#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1094 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 10484 "ColorTransformation.c"
+#line 10128 "ColorTransformation.c"
 		}
 		{
 			gint x = 0;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			x = 0;
-#line 10490 "ColorTransformation.c"
+#line 10134 "ColorTransformation.c"
 			{
 				gboolean _tmp53_ = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = TRUE;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 10497 "ColorTransformation.c"
+#line 10141 "ColorTransformation.c"
 					gint _tmp55_;
 					gint red_bar_height = 0;
 					gint* _tmp56_;
@@ -10530,94 +10173,94 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 					gint _tmp74_;
 					gint _tmp75_;
 					gint _tmp76_;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp53_) {
-#line 10531 "ColorTransformation.c"
+#line 10175 "ColorTransformation.c"
 						gint _tmp54_;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp54_ = x;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						x = _tmp54_ + 1;
-#line 10537 "ColorTransformation.c"
+#line 10181 "ColorTransformation.c"
 					}
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp53_ = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp55_ = x;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp55_ < 256)) {
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 10547 "ColorTransformation.c"
+#line 10191 "ColorTransformation.c"
 					}
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp56_ = self->priv->qualitative_red_counts;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp56__length1 = self->priv->qualitative_red_counts_length1;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp57_ = x;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp58_ = _tmp56_[_tmp57_];
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp59_ = scale_bar;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					red_bar_height = (gint) (((gdouble) _tmp58_) * _tmp59_);
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp60_ = self->priv->qualitative_green_counts;
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp60__length1 = self->priv->qualitative_green_counts_length1;
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp61_ = x;
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp62_ = _tmp60_[_tmp61_];
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp63_ = scale_bar;
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					green_bar_height = (gint) (((gdouble) _tmp62_) * _tmp63_);
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp64_ = self->priv->qualitative_blue_counts;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp64__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp65_ = x;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp66_ = _tmp64_[_tmp65_];
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp67_ = scale_bar;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					blue_bar_height = (gint) (((gdouble) _tmp66_) * _tmp67_);
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp68_ = red_bar_height;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp69_ = green_bar_height;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp70_ = MAX (_tmp68_, _tmp69_);
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp71_ = blue_bar_height;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp72_ = MAX (_tmp70_, _tmp71_);
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					max_bar_height = _tmp72_;
-#line 1184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					y = RGB_HISTOGRAM_GRAPHIC_HEIGHT - 1;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp73_ = x;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp74_ = pixel_bytes;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp75_ = y;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp76_ = rowstride;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_index = (_tmp73_ * _tmp74_) + (_tmp75_ * _tmp76_);
-#line 10609 "ColorTransformation.c"
+#line 10253 "ColorTransformation.c"
 					{
 						gboolean _tmp77_ = FALSE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp77_ = TRUE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 10616 "ColorTransformation.c"
+#line 10260 "ColorTransformation.c"
 							gint _tmp79_;
 							gint _tmp80_;
 							guchar* _tmp81_;
@@ -10640,143 +10283,143 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 							gint _tmp101_;
 							gint _tmp105_;
 							gint _tmp106_;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp77_) {
-#line 10641 "ColorTransformation.c"
+#line 10285 "ColorTransformation.c"
 								gint _tmp78_;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp78_ = y;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								y = _tmp78_ - 1;
-#line 10647 "ColorTransformation.c"
+#line 10291 "ColorTransformation.c"
 							}
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp77_ = FALSE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp79_ = y;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp80_ = max_bar_height;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp79_ >= (RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp80_))) {
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 10659 "ColorTransformation.c"
+#line 10303 "ColorTransformation.c"
 							}
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81_ = pixel_data;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81__length1 = pixel_data_length1;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp82_ = pixel_index;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81_[_tmp82_] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp83_ = _tmp81_[_tmp82_];
-#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84_ = pixel_data;
-#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84__length1 = pixel_data_length1;
-#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp85_ = pixel_index;
-#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84_[_tmp85_ + 1] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp86_ = _tmp84_[_tmp85_ + 1];
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87_ = pixel_data;
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87__length1 = pixel_data_length1;
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp88_ = pixel_index;
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87_[_tmp88_ + 2] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp89_ = _tmp87_[_tmp88_ + 2];
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp90_ = y;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp91_ = red_bar_height;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp90_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp91_) - 1)) {
-#line 10697 "ColorTransformation.c"
+#line 10341 "ColorTransformation.c"
 								guchar* _tmp92_;
 								gint _tmp92__length1;
 								gint _tmp93_;
 								guchar _tmp94_;
-#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92_ = pixel_data;
-#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92__length1 = pixel_data_length1;
-#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp93_ = pixel_index;
-#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92_[_tmp93_] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp94_ = _tmp92_[_tmp93_];
-#line 10712 "ColorTransformation.c"
+#line 10356 "ColorTransformation.c"
 							}
-#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp95_ = y;
-#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp96_ = green_bar_height;
-#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp95_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp96_) - 1)) {
-#line 10720 "ColorTransformation.c"
+#line 10364 "ColorTransformation.c"
 								guchar* _tmp97_;
 								gint _tmp97__length1;
 								gint _tmp98_;
 								guchar _tmp99_;
-#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97_ = pixel_data;
-#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97__length1 = pixel_data_length1;
-#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp98_ = pixel_index;
-#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97_[_tmp98_ + 1] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp99_ = _tmp97_[_tmp98_ + 1];
-#line 10735 "ColorTransformation.c"
+#line 10379 "ColorTransformation.c"
 							}
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp100_ = y;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp101_ = blue_bar_height;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1119 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp100_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp101_) - 1)) {
-#line 10743 "ColorTransformation.c"
+#line 10387 "ColorTransformation.c"
 								guchar* _tmp102_;
 								gint _tmp102__length1;
 								gint _tmp103_;
 								guchar _tmp104_;
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102_ = pixel_data;
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102__length1 = pixel_data_length1;
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp103_ = pixel_index;
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102_[_tmp103_ + 2] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1120 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp104_ = _tmp102_[_tmp103_ + 2];
-#line 10758 "ColorTransformation.c"
+#line 10402 "ColorTransformation.c"
 							}
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp105_ = pixel_index;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp106_ = rowstride;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_index = _tmp105_ - _tmp106_;
-#line 10766 "ColorTransformation.c"
+#line 10410 "ColorTransformation.c"
 						}
 					}
 					{
 						gboolean _tmp107_ = FALSE;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp107_ = TRUE;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 10775 "ColorTransformation.c"
+#line 10419 "ColorTransformation.c"
 							gint _tmp109_;
 							guchar* _tmp110_;
 							gint _tmp110__length1;
@@ -10792,269 +10435,269 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 							guchar _tmp118_;
 							gint _tmp119_;
 							gint _tmp120_;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp107_) {
-#line 10793 "ColorTransformation.c"
+#line 10437 "ColorTransformation.c"
 								gint _tmp108_;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp108_ = y;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								y = _tmp108_ - 1;
-#line 10799 "ColorTransformation.c"
+#line 10443 "ColorTransformation.c"
 							}
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp107_ = FALSE;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp109_ = y;
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp109_ >= 0)) {
-#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 10809 "ColorTransformation.c"
+#line 10453 "ColorTransformation.c"
 							}
-#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110_ = pixel_data;
-#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110__length1 = pixel_data_length1;
-#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp111_ = pixel_index;
-#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110_[_tmp111_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp112_ = _tmp110_[_tmp111_];
-#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113_ = pixel_data;
-#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113__length1 = pixel_data_length1;
-#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp114_ = pixel_index;
-#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113_[_tmp114_ + 1] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp115_ = _tmp113_[_tmp114_ + 1];
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116_ = pixel_data;
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116__length1 = pixel_data_length1;
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp117_ = pixel_index;
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116_[_tmp117_ + 2] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp118_ = _tmp116_[_tmp117_ + 2];
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp119_ = pixel_index;
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp120_ = rowstride;
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_index = _tmp119_ - _tmp120_;
-#line 10847 "ColorTransformation.c"
+#line 10491 "ColorTransformation.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp121_ = self->priv->graphic;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122_ = _g_object_ref0 (_tmp121_);
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp122_;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 10862 "ColorTransformation.c"
+#line 10506 "ColorTransformation.c"
 }
 
 
 static void value_rgb_histogram_init (GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 10869 "ColorTransformation.c"
+#line 10513 "ColorTransformation.c"
 }
 
 
 static void value_rgb_histogram_free_value (GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (value->data[0].v_pointer);
-#line 10878 "ColorTransformation.c"
+#line 10522 "ColorTransformation.c"
 	}
 }
 
 
 static void value_rgb_histogram_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = rgb_histogram_ref (src_value->data[0].v_pointer);
-#line 10888 "ColorTransformation.c"
+#line 10532 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10892 "ColorTransformation.c"
+#line 10536 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_rgb_histogram_peek_pointer (const GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 10900 "ColorTransformation.c"
+#line 10544 "ColorTransformation.c"
 }
 
 
 static gchar* value_rgb_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 10907 "ColorTransformation.c"
+#line 10551 "ColorTransformation.c"
 		RGBHistogram * object;
 		object = collect_values[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10914 "ColorTransformation.c"
+#line 10558 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.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 10918 "ColorTransformation.c"
+#line 10562 "ColorTransformation.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = rgb_histogram_ref (object);
-#line 10922 "ColorTransformation.c"
+#line 10566 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 10926 "ColorTransformation.c"
+#line 10570 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 10930 "ColorTransformation.c"
+#line 10574 "ColorTransformation.c"
 }
 
 
 static gchar* value_rgb_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	RGBHistogram ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10941 "ColorTransformation.c"
+#line 10585 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 10947 "ColorTransformation.c"
+#line 10591 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10951 "ColorTransformation.c"
+#line 10595 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = rgb_histogram_ref (value->data[0].v_pointer);
-#line 10955 "ColorTransformation.c"
+#line 10599 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 10959 "ColorTransformation.c"
+#line 10603 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecRGBHistogram* spec;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_RGB_HISTOGRAM), NULL);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 10973 "ColorTransformation.c"
+#line 10617 "ColorTransformation.c"
 }
 
 
 gpointer value_get_rgb_histogram (const GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM), NULL);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 10982 "ColorTransformation.c"
+#line 10626 "ColorTransformation.c"
 }
 
 
 void value_set_rgb_histogram (GValue* value, gpointer v_object) {
 	RGBHistogram * old;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_RGB_HISTOGRAM));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_ref (value->data[0].v_pointer);
-#line 11002 "ColorTransformation.c"
+#line 10646 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11006 "ColorTransformation.c"
+#line 10650 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (old);
-#line 11012 "ColorTransformation.c"
+#line 10656 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_rgb_histogram (GValue* value, gpointer v_object) {
 	RGBHistogram * old;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_RGB_HISTOGRAM));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 11031 "ColorTransformation.c"
+#line 10675 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11035 "ColorTransformation.c"
+#line 10679 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (old);
-#line 11041 "ColorTransformation.c"
+#line 10685 "ColorTransformation.c"
 	}
 }
 
 
 static void rgb_histogram_class_init (RGBHistogramClass * klass) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_parent_class = g_type_class_peek_parent (klass);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((RGBHistogramClass *) klass)->finalize = rgb_histogram_finalize;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (RGBHistogramPrivate));
-#line 11053 "ColorTransformation.c"
+#line 10697 "ColorTransformation.c"
 }
 
 
@@ -11062,79 +10705,79 @@ static void rgb_histogram_instance_init (RGBHistogram * self) {
 	gint* _tmp0_;
 	gint* _tmp1_;
 	gint* _tmp2_;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = RGB_HISTOGRAM_GET_PRIVATE (self);
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_new0 (gint, 256);
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts = _tmp0_;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts_length1 = 256;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_red_counts_size_ = self->priv->red_counts_length1;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gint, 256);
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts = _tmp1_;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts_length1 = 256;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_green_counts_size_ = self->priv->green_counts_length1;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_new0 (gint, 256);
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts = _tmp2_;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts_length1 = 256;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_blue_counts_size_ = self->priv->blue_counts_length1;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = NULL;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts_length1 = 0;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_red_counts_size_ = self->priv->qualitative_red_counts_length1;
-#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = NULL;
-#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts_length1 = 0;
-#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_green_counts_size_ = self->priv->qualitative_green_counts_length1;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = NULL;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts_length1 = 0;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_blue_counts_size_ = self->priv->qualitative_blue_counts_length1;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->graphic = NULL;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 11109 "ColorTransformation.c"
+#line 10753 "ColorTransformation.c"
 }
 
 
 static void rgb_histogram_finalize (RGBHistogram * obj) {
 	RGBHistogram * self;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM, RGBHistogram);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts = (g_free (self->priv->red_counts), NULL);
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts = (g_free (self->priv->green_counts), NULL);
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts = (g_free (self->priv->blue_counts), NULL);
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = (g_free (self->priv->qualitative_red_counts), NULL);
-#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = (g_free (self->priv->qualitative_green_counts), NULL);
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = (g_free (self->priv->qualitative_blue_counts), NULL);
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->graphic);
-#line 11133 "ColorTransformation.c"
+#line 10777 "ColorTransformation.c"
 }
 
 
@@ -11155,24 +10798,24 @@ GType rgb_histogram_get_type (void) {
 gpointer rgb_histogram_ref (gpointer instance) {
 	RGBHistogram * self;
 	self = instance;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 11158 "ColorTransformation.c"
+#line 10802 "ColorTransformation.c"
 }
 
 
 void rgb_histogram_unref (gpointer instance) {
 	RGBHistogram * self;
 	self = instance;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		RGB_HISTOGRAM_GET_CLASS (self)->finalize (self);
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 882 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11171 "ColorTransformation.c"
+#line 10815 "ColorTransformation.c"
 	}
 }
 
@@ -11207,63 +10850,61 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 	gint _tmp45_;
 	gint _tmp46_;
 	gfloat accumulator = 0.0F;
-#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (IntensityHistogram*) g_type_create_instance (object_type);
-#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gdk_pixbuf_get_n_channels (_tmp0_);
-#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	n_channels = _tmp1_;
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixbuf;
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = gdk_pixbuf_get_rowstride (_tmp2_);
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowstride = _tmp3_;
-#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = pixbuf;
-#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = gdk_pixbuf_get_width (_tmp4_);
-#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	width = _tmp5_;
-#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = pixbuf;
-#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	height = _tmp7_;
-#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = n_channels;
-#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = width;
-#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowbytes = _tmp8_ * _tmp9_;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = pixbuf;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = gdk_pixbuf_get_pixels (_tmp10_);
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixels = _tmp11_;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixels_length1 = -1;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixels_size_ = pixels_length1;
-#line 11250 "ColorTransformation.c"
+#line 10892 "ColorTransformation.c"
 	{
 		gint j = 0;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		j = 0;
-#line 11255 "ColorTransformation.c"
+#line 10897 "ColorTransformation.c"
 		{
 			gboolean _tmp12_ = FALSE;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = TRUE;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 11262 "ColorTransformation.c"
+#line 10904 "ColorTransformation.c"
 				gint _tmp14_;
 				gint _tmp15_;
 				gint row_start_index = 0;
@@ -11272,56 +10913,56 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 				gint row_end_index = 0;
 				gint _tmp18_;
 				gint _tmp19_;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp12_) {
-#line 11273 "ColorTransformation.c"
+#line 10915 "ColorTransformation.c"
 					gint _tmp13_;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = j;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					j = _tmp13_ + 1;
-#line 11279 "ColorTransformation.c"
+#line 10921 "ColorTransformation.c"
 				}
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = FALSE;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = j;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = height;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp14_ < _tmp15_)) {
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 11291 "ColorTransformation.c"
+#line 10933 "ColorTransformation.c"
 				}
-#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = j;
-#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = rowstride;
-#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_index = _tmp16_ * _tmp17_;
-#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = row_start_index;
-#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = rowbytes;
-#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1153 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_end_index = _tmp18_ + _tmp19_;
-#line 11305 "ColorTransformation.c"
+#line 10947 "ColorTransformation.c"
 				{
 					gint i = 0;
 					gint _tmp20_;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = row_start_index;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp20_;
-#line 11313 "ColorTransformation.c"
+#line 10955 "ColorTransformation.c"
 					{
 						gboolean _tmp21_ = FALSE;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = TRUE;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 11320 "ColorTransformation.c"
+#line 10962 "ColorTransformation.c"
 							gint _tmp24_;
 							gint _tmp25_;
 							RGBAnalyticPixel pix_rgb = {0};
@@ -11346,113 +10987,113 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 							gint _tmp38__length1;
 							gint _tmp39_;
 							gint _tmp40_;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp21_) {
-#line 11347 "ColorTransformation.c"
+#line 10989 "ColorTransformation.c"
 								gint _tmp22_;
 								gint _tmp23_;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp22_ = i;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp23_ = n_channels;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								i = _tmp22_ + _tmp23_;
-#line 11356 "ColorTransformation.c"
+#line 10998 "ColorTransformation.c"
 							}
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp21_ = FALSE;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp24_ = i;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp25_ = row_end_index;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp24_ < _tmp25_)) {
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 11368 "ColorTransformation.c"
+#line 11010 "ColorTransformation.c"
 							}
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26_ = pixels;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26__length1 = pixels_length1;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp27_ = i;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp28_ = _tmp26_[_tmp27_];
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29_ = pixels;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29__length1 = pixels_length1;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp30_ = i;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp31_ = _tmp29_[_tmp30_ + 1];
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32_ = pixels;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32__length1 = pixels_length1;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp33_ = i;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp34_ = _tmp32_[_tmp33_ + 2];
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							rgb_analytic_pixel_init_from_quantized_components (&pix_rgb, _tmp28_, _tmp31_, _tmp34_);
-#line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp35_ = pix_rgb;
-#line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							hsv_analytic_pixel_init_from_rgb (&pix_hsi, &_tmp35_);
-#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp36_ = pix_hsi;
-#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp37_ = _tmp36_.light_value;
-#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							quantized_light_value = (gint) (_tmp37_ * 255.0f);
-#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_ = self->priv->counts;
-#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38__length1 = self->priv->counts_length1;
-#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = quantized_light_value;
-#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_[_tmp39_] += 1;
-#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp40_ = _tmp38_[_tmp39_];
-#line 11416 "ColorTransformation.c"
+#line 11058 "ColorTransformation.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = pixbuf;
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = gdk_pixbuf_get_width (_tmp41_);
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = _tmp42_;
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = pixbuf;
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = gdk_pixbuf_get_height (_tmp44_);
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = _tmp45_;
-#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1163 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_count = (gfloat) (_tmp43_ * _tmp46_);
-#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1164 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	accumulator = 0.0f;
-#line 11439 "ColorTransformation.c"
+#line 11081 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 11444 "ColorTransformation.c"
+#line 11086 "ColorTransformation.c"
 		{
 			gboolean _tmp47_ = FALSE;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp47_ = TRUE;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 11451 "ColorTransformation.c"
+#line 11093 "ColorTransformation.c"
 				gint _tmp49_;
 				gfloat* _tmp50_;
 				gint _tmp50__length1;
@@ -11473,84 +11114,84 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 				gint _tmp62_;
 				gfloat _tmp63_;
 				gfloat _tmp64_;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp47_) {
-#line 11474 "ColorTransformation.c"
+#line 11116 "ColorTransformation.c"
 					gint _tmp48_;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = i;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp48_ + 1;
-#line 11480 "ColorTransformation.c"
+#line 11122 "ColorTransformation.c"
 				}
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = FALSE;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49_ = i;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp49_ < 256)) {
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1165 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 11490 "ColorTransformation.c"
+#line 11132 "ColorTransformation.c"
 				}
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_ = self->priv->probabilities;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50__length1 = self->priv->probabilities_length1;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp51_ = i;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52_ = self->priv->counts;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52__length1 = self->priv->counts_length1;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = i;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp54_ = _tmp52_[_tmp53_];
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp55_ = pixel_count;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_[_tmp51_] = ((gfloat) _tmp54_) / _tmp55_;
-#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_ = _tmp50_[_tmp51_];
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp57_ = accumulator;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58_ = self->priv->probabilities;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58__length1 = self->priv->probabilities_length1;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp59_ = i;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp60_ = _tmp58_[_tmp59_];
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				accumulator = _tmp57_ + _tmp60_;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_ = self->priv->cumulative_probabilities;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61__length1 = self->priv->cumulative_probabilities_length1;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_ = i;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp63_ = accumulator;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_[_tmp62_] = _tmp63_;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64_ = _tmp61_[_tmp62_];
-#line 11536 "ColorTransformation.c"
+#line 11178 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11542 "ColorTransformation.c"
+#line 11184 "ColorTransformation.c"
 }
 
 
 IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf) {
-#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return intensity_histogram_construct (TYPE_INTENSITY_HISTOGRAM, pixbuf);
-#line 11549 "ColorTransformation.c"
+#line 11191 "ColorTransformation.c"
 }
 
 
@@ -11562,218 +11203,216 @@ gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self,
 	gint _tmp2__length1;
 	gint _tmp3_;
 	gfloat _tmp4_;
-#line 1248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_INTENSITY_HISTOGRAM (self), 0.0F);
-#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = level;
-#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0, 255);
-#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	level = _tmp1_;
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->cumulative_probabilities;
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = self->priv->cumulative_probabilities_length1;
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = level;
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp2_[_tmp3_];
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp4_;
-#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1175 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 11581 "ColorTransformation.c"
+#line 11221 "ColorTransformation.c"
 }
 
 
 static void value_intensity_histogram_init (GValue* value) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 11588 "ColorTransformation.c"
+#line 11228 "ColorTransformation.c"
 }
 
 
 static void value_intensity_histogram_free_value (GValue* value) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (value->data[0].v_pointer);
-#line 11597 "ColorTransformation.c"
+#line 11237 "ColorTransformation.c"
 	}
 }
 
 
 static void value_intensity_histogram_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = intensity_histogram_ref (src_value->data[0].v_pointer);
-#line 11607 "ColorTransformation.c"
+#line 11247 "ColorTransformation.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11611 "ColorTransformation.c"
+#line 11251 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_intensity_histogram_peek_pointer (const GValue* value) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 11619 "ColorTransformation.c"
+#line 11259 "ColorTransformation.c"
 }
 
 
 static gchar* value_intensity_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 11626 "ColorTransformation.c"
+#line 11266 "ColorTransformation.c"
 		IntensityHistogram * object;
 		object = collect_values[0].v_pointer;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11633 "ColorTransformation.c"
+#line 11273 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.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 11637 "ColorTransformation.c"
+#line 11277 "ColorTransformation.c"
 		}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = intensity_histogram_ref (object);
-#line 11641 "ColorTransformation.c"
+#line 11281 "ColorTransformation.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11645 "ColorTransformation.c"
+#line 11285 "ColorTransformation.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 11649 "ColorTransformation.c"
+#line 11289 "ColorTransformation.c"
 }
 
 
 static gchar* value_intensity_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	IntensityHistogram ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11660 "ColorTransformation.c"
+#line 11300 "ColorTransformation.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 11666 "ColorTransformation.c"
+#line 11306 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11670 "ColorTransformation.c"
+#line 11310 "ColorTransformation.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = intensity_histogram_ref (value->data[0].v_pointer);
-#line 11674 "ColorTransformation.c"
+#line 11314 "ColorTransformation.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 11678 "ColorTransformation.c"
+#line 11318 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecIntensityHistogram* spec;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_INTENSITY_HISTOGRAM), NULL);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 11692 "ColorTransformation.c"
+#line 11332 "ColorTransformation.c"
 }
 
 
 gpointer value_get_intensity_histogram (const GValue* value) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM), NULL);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 11701 "ColorTransformation.c"
+#line 11341 "ColorTransformation.c"
 }
 
 
 void value_set_intensity_histogram (GValue* value, gpointer v_object) {
 	IntensityHistogram * old;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_INTENSITY_HISTOGRAM));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_ref (value->data[0].v_pointer);
-#line 11721 "ColorTransformation.c"
+#line 11361 "ColorTransformation.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11725 "ColorTransformation.c"
+#line 11365 "ColorTransformation.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (old);
-#line 11731 "ColorTransformation.c"
+#line 11371 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_intensity_histogram (GValue* value, gpointer v_object) {
 	IntensityHistogram * old;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_INTENSITY_HISTOGRAM));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 11750 "ColorTransformation.c"
+#line 11390 "ColorTransformation.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11754 "ColorTransformation.c"
+#line 11394 "ColorTransformation.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (old);
-#line 11760 "ColorTransformation.c"
+#line 11400 "ColorTransformation.c"
 	}
 }
 
 
 static void intensity_histogram_class_init (IntensityHistogramClass * klass) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_histogram_parent_class = g_type_class_peek_parent (klass);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((IntensityHistogramClass *) klass)->finalize = intensity_histogram_finalize;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (IntensityHistogramPrivate));
-#line 11772 "ColorTransformation.c"
+#line 11412 "ColorTransformation.c"
 }
 
 
@@ -11781,51 +11420,51 @@ static void intensity_histogram_instance_init (IntensityHistogram * self) {
 	gint* _tmp0_;
 	gfloat* _tmp1_;
 	gfloat* _tmp2_;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = INTENSITY_HISTOGRAM_GET_PRIVATE (self);
-#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_new0 (gint, 256);
-#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts = _tmp0_;
-#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts_length1 = 256;
-#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_counts_size_ = self->priv->counts_length1;
-#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gfloat, 256);
-#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities = _tmp1_;
-#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities_length1 = 256;
-#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_probabilities_size_ = self->priv->probabilities_length1;
-#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_new0 (gfloat, 256);
-#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities = _tmp2_;
-#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities_length1 = 256;
-#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_cumulative_probabilities_size_ = self->priv->cumulative_probabilities_length1;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 11808 "ColorTransformation.c"
+#line 11448 "ColorTransformation.c"
 }
 
 
 static void intensity_histogram_finalize (IntensityHistogram * obj) {
 	IntensityHistogram * self;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTENSITY_HISTOGRAM, IntensityHistogram);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts = (g_free (self->priv->counts), NULL);
-#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities = (g_free (self->priv->probabilities), NULL);
-#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities = (g_free (self->priv->cumulative_probabilities), NULL);
-#line 11824 "ColorTransformation.c"
+#line 11464 "ColorTransformation.c"
 }
 
 
@@ -11846,138 +11485,125 @@ GType intensity_histogram_get_type (void) {
 gpointer intensity_histogram_ref (gpointer instance) {
 	IntensityHistogram * self;
 	self = instance;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 11849 "ColorTransformation.c"
+#line 11489 "ColorTransformation.c"
 }
 
 
 void intensity_histogram_unref (gpointer instance) {
 	IntensityHistogram * self;
 	self = instance;
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		INTENSITY_HISTOGRAM_GET_CLASS (self)->finalize (self);
-#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11862 "ColorTransformation.c"
+#line 11502 "ColorTransformation.c"
 	}
 }
 
 
 ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram) {
 	ExpansionTransformation* self = NULL;
-	gfloat* _tmp0_;
 	gfloat LOW_KINK_MASS = 0.0F;
 	gfloat HIGH_KINK_MASS = 0.0F;
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_INTENSITY_HISTOGRAM (histogram), NULL);
-#line 1264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = g_new0 (gfloat, 256);
-#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = _tmp0_;
-#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 256;
-#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 1268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	LOW_KINK_MASS = EXPANSION_TRANSFORMATION_LOW_DISCARD_MASS;
-#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->low_kink = 0;
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	while (TRUE) {
-#line 11892 "ColorTransformation.c"
-		IntensityHistogram* _tmp1_;
-		gint _tmp2_;
+#line 11519 "ColorTransformation.c"
+		IntensityHistogram* _tmp0_;
+		gint _tmp1_;
+		gfloat _tmp2_;
 		gfloat _tmp3_;
-		gfloat _tmp4_;
-		gint _tmp5_;
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp1_ = histogram;
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp2_ = self->priv->low_kink;
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp3_ = intensity_histogram_get_cumulative_probability (_tmp1_, _tmp2_);
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp4_ = LOW_KINK_MASS;
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (!(_tmp3_ < _tmp4_)) {
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		gint _tmp4_;
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp0_ = histogram;
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp1_ = self->priv->low_kink;
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp2_ = intensity_histogram_get_cumulative_probability (_tmp0_, _tmp1_);
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp3_ = LOW_KINK_MASS;
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		if (!(_tmp2_ < _tmp3_)) {
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			break;
-#line 11910 "ColorTransformation.c"
+#line 11537 "ColorTransformation.c"
 		}
-#line 1271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp5_ = self->priv->low_kink;
-#line 1271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->low_kink = _tmp5_ + 1;
-#line 11916 "ColorTransformation.c"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp4_ = self->priv->low_kink;
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self->priv->low_kink = _tmp4_ + 1;
+#line 11543 "ColorTransformation.c"
 	}
-#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	HIGH_KINK_MASS = 1.0f - EXPANSION_TRANSFORMATION_HIGH_DISCARD_MASS;
-#line 1274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->high_kink = 255;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	while (TRUE) {
-#line 11924 "ColorTransformation.c"
-		gboolean _tmp6_ = FALSE;
-		IntensityHistogram* _tmp7_;
-		gint _tmp8_;
+#line 11551 "ColorTransformation.c"
+		gboolean _tmp5_ = FALSE;
+		IntensityHistogram* _tmp6_;
+		gint _tmp7_;
+		gfloat _tmp8_;
 		gfloat _tmp9_;
-		gfloat _tmp10_;
-		gint _tmp12_;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp7_ = histogram;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp8_ = self->priv->high_kink;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp9_ = intensity_histogram_get_cumulative_probability (_tmp7_, _tmp8_);
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp10_ = HIGH_KINK_MASS;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (_tmp9_ > _tmp10_) {
-#line 11941 "ColorTransformation.c"
-			gint _tmp11_;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp11_ = self->priv->high_kink;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp6_ = _tmp11_ > 0;
-#line 11947 "ColorTransformation.c"
+		gint _tmp11_;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp6_ = histogram;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp7_ = self->priv->high_kink;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp8_ = intensity_histogram_get_cumulative_probability (_tmp6_, _tmp7_);
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp9_ = HIGH_KINK_MASS;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		if (_tmp8_ > _tmp9_) {
+#line 11568 "ColorTransformation.c"
+			gint _tmp10_;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp10_ = self->priv->high_kink;
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp5_ = _tmp10_ > 0;
+#line 11574 "ColorTransformation.c"
 		} else {
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp6_ = FALSE;
-#line 11951 "ColorTransformation.c"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp5_ = FALSE;
+#line 11578 "ColorTransformation.c"
 		}
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		if (!_tmp6_) {
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		if (!_tmp5_) {
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			break;
-#line 11957 "ColorTransformation.c"
+#line 11584 "ColorTransformation.c"
 		}
-#line 1276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp12_ = self->priv->high_kink;
-#line 1276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->high_kink = _tmp12_ - 1;
-#line 11963 "ColorTransformation.c"
+#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp11_ = self->priv->high_kink;
+#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		self->priv->high_kink = _tmp11_ - 1;
+#line 11590 "ColorTransformation.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11969 "ColorTransformation.c"
+#line 11596 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram) {
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct (TYPE_EXPANSION_TRANSFORMATION, histogram);
-#line 11976 "ColorTransformation.c"
+#line 11603 "ColorTransformation.c"
 }
 
 
@@ -11991,74 +11617,74 @@ ExpansionTransformation* expansion_transformation_construct_from_extrema (GType
 	gint _tmp5_;
 	gint _tmp9_;
 	gint _tmp10_;
-#line 1282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = white_point;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0, 255);
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1205 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	white_point = _tmp1_;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = black_point;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = CLAMP (_tmp2_, 0, 255);
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	black_point = _tmp3_;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = black_point;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = white_point;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == _tmp5_) {
-#line 12010 "ColorTransformation.c"
+#line 11637 "ColorTransformation.c"
 		gint _tmp6_;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1209 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = black_point;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1209 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp6_ == 0) {
-#line 1289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1210 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			white_point = 1;
-#line 12018 "ColorTransformation.c"
+#line 11645 "ColorTransformation.c"
 		} else {
 			gint _tmp7_;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = white_point;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp7_ == 255) {
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				black_point = 254;
-#line 12027 "ColorTransformation.c"
+#line 11654 "ColorTransformation.c"
 			} else {
 				gint _tmp8_;
-#line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1214 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = white_point;
-#line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1214 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				black_point = _tmp8_ - 1;
-#line 12034 "ColorTransformation.c"
+#line 11661 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = black_point;
-#line 1296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->low_kink = _tmp9_;
-#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = white_point;
-#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->high_kink = _tmp10_;
-#line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12050 "ColorTransformation.c"
+#line 11677 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point) {
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct_from_extrema (TYPE_EXPANSION_TRANSFORMATION, black_point, white_point);
-#line 12057 "ColorTransformation.c"
+#line 11684 "ColorTransformation.c"
 }
 
 
@@ -12067,8 +11693,6 @@ static gchar* string_chug (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
 #line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
 #line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12081,7 +11705,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 12080 "ColorTransformation.c"
+#line 11705 "ColorTransformation.c"
 }
 
 
@@ -12090,8 +11714,6 @@ static gchar* string_chomp (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
 #line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
 #line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -12104,7 +11726,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 12103 "ColorTransformation.c"
+#line 11726 "ColorTransformation.c"
 }
 
 
@@ -12120,368 +11742,269 @@ ExpansionTransformation* expansion_transformation_construct_from_string (GType o
 	gint num_captured = 0;
 	const gchar* _tmp7_;
 	gint _tmp8_;
-#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (encoded_transformation != NULL, NULL);
-#line 1303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = encoded_transformation;
-#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_strcanon (_tmp0_, "0123456789. ", ' ');
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = encoded_transformation;
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = string_chug (_tmp1_);
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_;
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp3_);
-#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = encoded_transformation;
-#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = string_chomp (_tmp4_);
-#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = _tmp5_;
-#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp6_);
-#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = encoded_transformation;
-#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = sscanf (_tmp7_, "%d %d", &self->priv->low_kink, &self->priv->high_kink);
-#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	num_captured = _tmp8_;
-#line 1312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (num_captured == 2, "num_captured == 2");
-#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12155 "ColorTransformation.c"
+#line 11776 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation) {
-#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct_from_string (TYPE_EXPANSION_TRANSFORMATION, encoded_transformation);
-#line 12162 "ColorTransformation.c"
+#line 11783 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_build_remap_table (ExpansionTransformation* self) {
-	gfloat* _tmp0_;
-	gint _tmp0__length1;
 	gfloat low_kink_f = 0.0F;
-	gint _tmp2_;
+	gint _tmp0_;
 	gfloat high_kink_f = 0.0F;
-	gint _tmp3_;
+	gint _tmp1_;
 	gfloat slope = 0.0F;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat intercept = 0.0F;
 	gfloat _tmp4_;
 	gfloat _tmp5_;
-	gfloat intercept = 0.0F;
 	gfloat _tmp6_;
-	gfloat _tmp7_;
-	gfloat _tmp8_;
 	gint i = 0;
-#line 1317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_EXPANSION_TRANSFORMATION (self));
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = self->priv->remap_table;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0__length1 = self->priv->remap_table_length1;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	if (_tmp0_ == NULL) {
-#line 12189 "ColorTransformation.c"
-		gfloat* _tmp1_;
-#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp1_ = g_new0 (gfloat, 256);
-#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->remap_table = _tmp1_;
-#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->remap_table_length1 = 256;
-#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12201 "ColorTransformation.c"
-	}
-#line 1321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = self->priv->low_kink;
-#line 1321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	low_kink_f = ((gfloat) _tmp2_) / 255.0f;
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = self->priv->high_kink;
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	high_kink_f = ((gfloat) _tmp3_) / 255.0f;
-#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = high_kink_f;
-#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = low_kink_f;
-#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	slope = 1.0f / (_tmp4_ - _tmp5_);
-#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = self->priv->low_kink;
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	low_kink_f = ((gfloat) _tmp0_) / 255.0f;
+#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = self->priv->high_kink;
+#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	high_kink_f = ((gfloat) _tmp1_) / 255.0f;
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = high_kink_f;
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp3_ = low_kink_f;
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	slope = 1.0f / (_tmp2_ - _tmp3_);
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp4_ = low_kink_f;
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp5_ = high_kink_f;
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = low_kink_f;
-#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp7_ = high_kink_f;
-#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp8_ = low_kink_f;
-#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	intercept = -(_tmp6_ / (_tmp7_ - _tmp8_));
-#line 1327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	intercept = -(_tmp4_ / (_tmp5_ - _tmp6_));
+#line 1245 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	i = 0;
-#line 12227 "ColorTransformation.c"
+#line 11824 "ColorTransformation.c"
 	{
-		gboolean _tmp9_ = FALSE;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp9_ = TRUE;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		gboolean _tmp7_ = FALSE;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp7_ = TRUE;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 12234 "ColorTransformation.c"
+#line 11831 "ColorTransformation.c"
+			gint _tmp9_;
+			gint _tmp10_;
 			gint _tmp11_;
-			gint _tmp12_;
-			gfloat* _tmp13_;
-			gint _tmp13__length1;
-			gint _tmp14_;
-			gfloat _tmp15_;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!_tmp9_) {
-#line 12243 "ColorTransformation.c"
-				gint _tmp10_;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp10_ = i;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				i = _tmp10_ + 1;
-#line 12249 "ColorTransformation.c"
+			gfloat _tmp12_;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!_tmp7_) {
+#line 11838 "ColorTransformation.c"
+				gint _tmp8_;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = i;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				i = _tmp8_ + 1;
+#line 11844 "ColorTransformation.c"
 			}
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp9_ = FALSE;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp11_ = i;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp12_ = self->priv->low_kink;
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!(_tmp11_ <= _tmp12_)) {
-#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp7_ = FALSE;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp9_ = i;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp10_ = self->priv->low_kink;
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!(_tmp9_ <= _tmp10_)) {
+#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 12261 "ColorTransformation.c"
+#line 11856 "ColorTransformation.c"
 			}
-#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp13_ = self->priv->remap_table;
-#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp13__length1 = self->priv->remap_table_length1;
-#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp14_ = i;
-#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp13_[_tmp14_] = 0.0f;
-#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp15_ = _tmp13_[_tmp14_];
-#line 12273 "ColorTransformation.c"
+#line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp11_ = i;
+#line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp11_] = 0.0f;
+#line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp11_];
+#line 11864 "ColorTransformation.c"
 		}
 	}
 	{
-		gboolean _tmp16_ = FALSE;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp16_ = TRUE;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		gboolean _tmp13_ = FALSE;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp13_ = TRUE;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 12282 "ColorTransformation.c"
-			gint _tmp18_;
+#line 11873 "ColorTransformation.c"
+			gint _tmp15_;
+			gint _tmp16_;
+			gint _tmp17_;
+			gfloat _tmp18_;
 			gint _tmp19_;
-			gfloat* _tmp20_;
-			gint _tmp20__length1;
-			gint _tmp21_;
-			gfloat _tmp22_;
-			gint _tmp23_;
-			gfloat _tmp24_;
-			gfloat _tmp25_;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!_tmp16_) {
-#line 12294 "ColorTransformation.c"
-				gint _tmp17_;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp17_ = i;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				i = _tmp17_ + 1;
-#line 12300 "ColorTransformation.c"
+			gfloat _tmp20_;
+			gfloat _tmp21_;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!_tmp13_) {
+#line 11883 "ColorTransformation.c"
+				gint _tmp14_;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp14_ = i;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				i = _tmp14_ + 1;
+#line 11889 "ColorTransformation.c"
 			}
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp16_ = FALSE;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp18_ = i;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp19_ = self->priv->high_kink;
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!(_tmp18_ < _tmp19_)) {
-#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp13_ = FALSE;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp15_ = i;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp16_ = self->priv->high_kink;
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!(_tmp15_ < _tmp16_)) {
+#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 12312 "ColorTransformation.c"
+#line 11901 "ColorTransformation.c"
 			}
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp20_ = self->priv->remap_table;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp20__length1 = self->priv->remap_table_length1;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp21_ = i;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp22_ = slope;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp23_ = i;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp24_ = intercept;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp20_[_tmp21_] = (_tmp22_ * (((gfloat) _tmp23_) / 255.0f)) + _tmp24_;
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp25_ = _tmp20_[_tmp21_];
-#line 12330 "ColorTransformation.c"
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp17_ = i;
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp18_ = slope;
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp19_ = i;
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp20_ = intercept;
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp17_] = (_tmp18_ * (((gfloat) _tmp19_) / 255.0f)) + _tmp20_;
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp17_];
+#line 11915 "ColorTransformation.c"
 		}
 	}
 	{
-		gboolean _tmp26_ = FALSE;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		_tmp26_ = TRUE;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		gboolean _tmp22_ = FALSE;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp22_ = TRUE;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 12339 "ColorTransformation.c"
-			gint _tmp28_;
-			gfloat* _tmp29_;
-			gint _tmp29__length1;
-			gint _tmp30_;
-			gfloat _tmp31_;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!_tmp26_) {
-#line 12347 "ColorTransformation.c"
-				gint _tmp27_;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp27_ = i;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				i = _tmp27_ + 1;
-#line 12353 "ColorTransformation.c"
+#line 11924 "ColorTransformation.c"
+			gint _tmp24_;
+			gint _tmp25_;
+			gfloat _tmp26_;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!_tmp22_) {
+#line 11930 "ColorTransformation.c"
+				gint _tmp23_;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp23_ = i;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				i = _tmp23_ + 1;
+#line 11936 "ColorTransformation.c"
 			}
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp26_ = FALSE;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp28_ = i;
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			if (!(_tmp28_ < 256)) {
-#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp22_ = FALSE;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp24_ = i;
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			if (!(_tmp24_ < 256)) {
+#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 12363 "ColorTransformation.c"
+#line 11946 "ColorTransformation.c"
 			}
-#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp29_ = self->priv->remap_table;
-#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp29__length1 = self->priv->remap_table_length1;
-#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp30_ = i;
-#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp29_[_tmp30_] = 1.0f;
-#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp31_ = _tmp29_[_tmp30_];
-#line 12375 "ColorTransformation.c"
+#line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp25_ = i;
+#line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp25_] = 1.0f;
+#line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp25_];
+#line 11954 "ColorTransformation.c"
 		}
 	}
 }
 
 
-static void expansion_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
-	ExpansionTransformation * self;
-	gint remap_index = 0;
-	HSVAnalyticPixel _tmp0_;
-	gfloat _tmp1_;
-	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp2_;
-	gfloat* _tmp3_;
-	gint _tmp3__length1;
-	gfloat _tmp4_;
-	HSVAnalyticPixel _tmp5_;
-	gfloat _tmp6_;
-	gfloat _tmp7_;
-#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (pixel != NULL);
-#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *pixel;
-#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = _tmp0_.light_value;
-#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	remap_index = (gint) (_tmp1_ * 255.0f);
-#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = *pixel;
-#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_ = _tmp2_;
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = self->priv->remap_table;
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3__length1 = self->priv->remap_table_length1;
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = _tmp3_[remap_index];
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_.light_value = _tmp4_;
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = _result_;
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp6_ = _tmp5_.light_value;
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp7_ = CLAMP (_tmp6_, 0.0f, 1.0f);
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_.light_value = _tmp7_;
-#line 1346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = _result_;
-#line 1346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 12428 "ColorTransformation.c"
-}
-
-
 static gchar* expansion_transformation_real_to_string (PixelTransformation* base) {
 	ExpansionTransformation * self;
 	gchar* result = NULL;
 	gint _tmp0_;
 	gint _tmp1_;
 	gchar* _tmp2_;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->high_kink;
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_strdup_printf ("{ %d, %d }", _tmp0_, _tmp1_);
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp2_;
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1257 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12450 "ColorTransformation.c"
+#line 11978 "ColorTransformation.c"
 }
 
 
 gint expansion_transformation_get_white_point (ExpansionTransformation* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 1353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
-#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->high_kink;
-#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12465 "ColorTransformation.c"
+#line 11991 "ColorTransformation.c"
 }
 
 
 gint expansion_transformation_get_black_point (ExpansionTransformation* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12480 "ColorTransformation.c"
+#line 12004 "ColorTransformation.c"
 }
 
 
@@ -12490,29 +12013,29 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
-#line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->low_kink;
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_ == 0) {
-#line 12495 "ColorTransformation.c"
+#line 12019 "ColorTransformation.c"
 		gint _tmp2_;
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->high_kink;
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp2_ == 255;
-#line 12501 "ColorTransformation.c"
+#line 12025 "ColorTransformation.c"
 	} else {
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 12505 "ColorTransformation.c"
+#line 12029 "ColorTransformation.c"
 	}
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12511 "ColorTransformation.c"
+#line 12035 "ColorTransformation.c"
 }
 
 
@@ -12522,63 +12045,53 @@ static PixelTransformation* expansion_transformation_real_copy (PixelTransformat
 	gint _tmp0_;
 	gint _tmp1_;
 	ExpansionTransformation* _tmp2_;
-#line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->high_kink;
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = expansion_transformation_new_from_extrema (_tmp0_, _tmp1_);
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12533 "ColorTransformation.c"
+#line 12057 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_class_init (ExpansionTransformationClass * klass) {
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = expansion_transformation_finalize;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ExpansionTransformationPrivate));
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) expansion_transformation_real_transform_pixel_hsv;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->to_string = (gchar* (*) (PixelTransformation *)) expansion_transformation_real_to_string;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) expansion_transformation_real_is_identity;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) expansion_transformation_real_copy;
-#line 12552 "ColorTransformation.c"
+#line 12074 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_instance_init (ExpansionTransformation * self) {
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = EXPANSION_TRANSFORMATION_GET_PRIVATE (self);
-#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = NULL;
-#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 0;
-#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12565 "ColorTransformation.c"
+#line 12081 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_finalize (PixelTransformation * obj) {
 	ExpansionTransformation * self;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (expansion_transformation_parent_class)->finalize (obj);
-#line 12577 "ColorTransformation.c"
+#line 12091 "ColorTransformation.c"
 }
 
 
@@ -12604,174 +12117,117 @@ ShadowDetailTransformation* shadow_detail_transformation_construct (GType object
 	gfloat _tmp3_;
 	HermiteGammaApproximationFunction* func = NULL;
 	HermiteGammaApproximationFunction* _tmp4_;
-	gfloat* _tmp5_;
-#line 1383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ShadowDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_intensity;
-#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = _tmp0_;
-#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->intensity;
-#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = CLAMP (_tmp1_ / SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 0.0f, 1.0f);
-#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_adj = _tmp2_;
-#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = intensity_adj;
-#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	effect_shift = SHADOW_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_;
-#line 1389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = hermite_gamma_approximation_function_new (SHADOW_DETAIL_TRANSFORMATION_TONAL_WIDTH);
-#line 1389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	func = _tmp4_;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = g_new0 (gfloat, 256);
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = _tmp5_;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 256;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12634 "ColorTransformation.c"
+#line 12137 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 12639 "ColorTransformation.c"
+#line 12142 "ColorTransformation.c"
 		{
-			gboolean _tmp6_ = FALSE;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp6_ = TRUE;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			gboolean _tmp5_ = FALSE;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp5_ = TRUE;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 12646 "ColorTransformation.c"
-				gint _tmp8_;
+#line 12149 "ColorTransformation.c"
+				gint _tmp7_;
 				gfloat x = 0.0F;
-				gint _tmp9_;
+				gint _tmp8_;
 				gfloat weight = 0.0F;
-				HermiteGammaApproximationFunction* _tmp10_;
+				HermiteGammaApproximationFunction* _tmp9_;
+				gfloat _tmp10_;
 				gfloat _tmp11_;
-				gfloat _tmp12_;
-				gfloat* _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp14_;
+				gint _tmp12_;
+				gfloat _tmp13_;
+				gfloat _tmp14_;
 				gfloat _tmp15_;
 				gfloat _tmp16_;
 				gfloat _tmp17_;
 				gfloat _tmp18_;
-				gfloat _tmp19_;
-				gfloat _tmp20_;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!_tmp6_) {
-#line 12665 "ColorTransformation.c"
-					gint _tmp7_;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp7_ = i;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					i = _tmp7_ + 1;
-#line 12671 "ColorTransformation.c"
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp5_) {
+#line 12166 "ColorTransformation.c"
+					gint _tmp6_;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp6_ = i;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					i = _tmp6_ + 1;
+#line 12172 "ColorTransformation.c"
 				}
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp6_ = FALSE;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp8_ = i;
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!(_tmp8_ < 256)) {
-#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp5_ = FALSE;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp7_ = i;
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp7_ < 256)) {
+#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 12681 "ColorTransformation.c"
+#line 12182 "ColorTransformation.c"
 				}
-#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp9_ = i;
-#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				x = ((gfloat) _tmp9_) / 255.0f;
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp10_ = func;
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp11_ = x;
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp12_ = hermite_gamma_approximation_function_evaluate (_tmp10_, _tmp11_);
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				weight = _tmp12_;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13_ = self->priv->remap_table;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13__length1 = self->priv->remap_table_length1;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp14_ = i;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp15_ = weight;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp16_ = x;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp17_ = effect_shift;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp18_ = weight;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp19_ = x;
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13_[_tmp14_] = (_tmp15_ * (_tmp16_ + _tmp17_)) + ((1.0f - _tmp18_) * _tmp19_);
-#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp20_ = _tmp13_[_tmp14_];
-#line 12715 "ColorTransformation.c"
+#line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = i;
+#line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				x = ((gfloat) _tmp8_) / 255.0f;
+#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9_ = func;
+#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10_ = x;
+#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp11_ = hermite_gamma_approximation_function_evaluate (_tmp9_, _tmp10_);
+#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				weight = _tmp11_;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp12_ = i;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp13_ = weight;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp14_ = x;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp15_ = effect_shift;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp16_ = weight;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp17_ = x;
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_] = (_tmp13_ * (_tmp14_ + _tmp15_)) + ((1.0f - _tmp16_) * _tmp17_);
+#line 1301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_];
+#line 12212 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_hermite_gamma_approximation_function_unref0 (func);
-#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12723 "ColorTransformation.c"
+#line 12220 "ColorTransformation.c"
 }
 
 
 ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity) {
-#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return shadow_detail_transformation_construct (TYPE_SHADOW_DETAIL_TRANSFORMATION, user_intensity);
-#line 12730 "ColorTransformation.c"
-}
-
-
-static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
-	ShadowDetailTransformation * self;
-	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp0_;
-	gfloat* _tmp1_;
-	gint _tmp1__length1;
-	HSVAnalyticPixel _tmp2_;
-	gfloat _tmp3_;
-	gfloat _tmp4_;
-	gfloat _tmp5_;
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (pixel != NULL);
-#line 1401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *pixel;
-#line 1401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_ = _tmp0_;
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = self->priv->remap_table;
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1__length1 = self->priv->remap_table_length1;
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = *pixel;
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = _tmp2_.light_value;
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = _tmp1_[(gint) (_tmp3_ * 255.0f)];
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
-#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_.light_value = _tmp5_;
-#line 1403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = _result_;
-#line 1403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 12770 "ColorTransformation.c"
+#line 12227 "ColorTransformation.c"
 }
 
 
@@ -12780,17 +12236,17 @@ static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransfo
 	PixelTransformation* result = NULL;
 	gfloat _tmp0_;
 	ShadowDetailTransformation* _tmp1_;
-#line 1406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = shadow_detail_transformation_new (_tmp0_);
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12789 "ColorTransformation.c"
+#line 12246 "ColorTransformation.c"
 }
 
 
@@ -12798,74 +12254,62 @@ static gboolean shadow_detail_transformation_real_is_identity (PixelTransformati
 	ShadowDetailTransformation * self;
 	gboolean result = FALSE;
 	gfloat _tmp0_;
-#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ == 0.0f;
-#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12805 "ColorTransformation.c"
+#line 12262 "ColorTransformation.c"
 }
 
 
 gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 1414 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_SHADOW_DETAIL_TRANSFORMATION (self), 0.0F);
-#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12820 "ColorTransformation.c"
+#line 12275 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_class_init (ShadowDetailTransformationClass * klass) {
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_detail_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = shadow_detail_transformation_finalize;
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ShadowDetailTransformationPrivate));
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) shadow_detail_transformation_real_transform_pixel_hsv;
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) shadow_detail_transformation_real_copy;
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) shadow_detail_transformation_real_is_identity;
-#line 12837 "ColorTransformation.c"
+#line 12290 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_instance_init (ShadowDetailTransformation * self) {
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = SHADOW_DETAIL_TRANSFORMATION_GET_PRIVATE (self);
-#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = 0.0f;
-#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = NULL;
-#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 0;
-#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12852 "ColorTransformation.c"
+#line 12299 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_finalize (PixelTransformation * obj) {
 	ShadowDetailTransformation * self;
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (shadow_detail_transformation_parent_class)->finalize (obj);
-#line 12864 "ColorTransformation.c"
+#line 12309 "ColorTransformation.c"
 }
 
 
@@ -12886,59 +12330,57 @@ HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construc
 	gfloat _tmp0_;
 	gfloat _tmp1_;
 	gfloat _tmp2_;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HermiteGammaApproximationFunction*) g_type_create_instance (object_type);
-#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_interval_upper;
-#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.1f, 1.0f);
-#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1323 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->nonzero_interval_upper = _tmp1_;
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->nonzero_interval_upper;
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->x_scale = 1.0f / _tmp2_;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12899 "ColorTransformation.c"
+#line 12344 "ColorTransformation.c"
 }
 
 
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper) {
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return hermite_gamma_approximation_function_construct (TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, user_interval_upper);
-#line 12906 "ColorTransformation.c"
+#line 12351 "ColorTransformation.c"
 }
 
 
 gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 1428 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_HERMITE_GAMMA_APPROXIMATION_FUNCTION (self), 0.0F);
-#line 1429 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = x;
-#line 1429 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ < 0.0f) {
-#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		result = 0.0f;
-#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return result;
-#line 12923 "ColorTransformation.c"
+#line 12366 "ColorTransformation.c"
 	} else {
 		gfloat _tmp1_;
 		gfloat _tmp2_;
-#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = x;
-#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->nonzero_interval_upper;
-#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1330 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp1_ > _tmp2_) {
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = 0.0f;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 12937 "ColorTransformation.c"
+#line 12380 "ColorTransformation.c"
 		} else {
 			gfloat indep_var = 0.0F;
 			gfloat _tmp3_;
@@ -12952,251 +12394,251 @@ gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationF
 			gfloat _tmp10_;
 			gfloat _tmp11_;
 			gfloat _tmp12_;
-#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp3_ = self->priv->x_scale;
-#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = x;
-#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			indep_var = _tmp3_ * _tmp4_;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = indep_var;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			dep_var = 6.0f * ((((_tmp5_ * _tmp6_) * _tmp7_) - (2.0f * (_tmp8_ * _tmp9_))) + _tmp10_);
-#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = dep_var;
-#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = CLAMP (_tmp11_, 0.0f, 1.0f);
-#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp12_;
-#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 12979 "ColorTransformation.c"
+#line 12422 "ColorTransformation.c"
 		}
 	}
 }
 
 
 static void value_hermite_gamma_approximation_function_init (GValue* value) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 12988 "ColorTransformation.c"
+#line 12431 "ColorTransformation.c"
 }
 
 
 static void value_hermite_gamma_approximation_function_free_value (GValue* value) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (value->data[0].v_pointer);
-#line 12997 "ColorTransformation.c"
+#line 12440 "ColorTransformation.c"
 	}
 }
 
 
 static void value_hermite_gamma_approximation_function_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = hermite_gamma_approximation_function_ref (src_value->data[0].v_pointer);
-#line 13007 "ColorTransformation.c"
+#line 12450 "ColorTransformation.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13011 "ColorTransformation.c"
+#line 12454 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_hermite_gamma_approximation_function_peek_pointer (const GValue* value) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 13019 "ColorTransformation.c"
+#line 12462 "ColorTransformation.c"
 }
 
 
 static gchar* value_hermite_gamma_approximation_function_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 13026 "ColorTransformation.c"
+#line 12469 "ColorTransformation.c"
 		HermiteGammaApproximationFunction * object;
 		object = collect_values[0].v_pointer;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13033 "ColorTransformation.c"
+#line 12476 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.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 13037 "ColorTransformation.c"
+#line 12480 "ColorTransformation.c"
 		}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = hermite_gamma_approximation_function_ref (object);
-#line 13041 "ColorTransformation.c"
+#line 12484 "ColorTransformation.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 13045 "ColorTransformation.c"
+#line 12488 "ColorTransformation.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 13049 "ColorTransformation.c"
+#line 12492 "ColorTransformation.c"
 }
 
 
 static gchar* value_hermite_gamma_approximation_function_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	HermiteGammaApproximationFunction ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13060 "ColorTransformation.c"
+#line 12503 "ColorTransformation.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 13066 "ColorTransformation.c"
+#line 12509 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13070 "ColorTransformation.c"
+#line 12513 "ColorTransformation.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = hermite_gamma_approximation_function_ref (value->data[0].v_pointer);
-#line 13074 "ColorTransformation.c"
+#line 12517 "ColorTransformation.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 13078 "ColorTransformation.c"
+#line 12521 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecHermiteGammaApproximationFunction* spec;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 13092 "ColorTransformation.c"
+#line 12535 "ColorTransformation.c"
 }
 
 
 gpointer value_get_hermite_gamma_approximation_function (const GValue* value) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 13101 "ColorTransformation.c"
+#line 12544 "ColorTransformation.c"
 }
 
 
 void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
 	HermiteGammaApproximationFunction * old;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_ref (value->data[0].v_pointer);
-#line 13121 "ColorTransformation.c"
+#line 12564 "ColorTransformation.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 13125 "ColorTransformation.c"
+#line 12568 "ColorTransformation.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (old);
-#line 13131 "ColorTransformation.c"
+#line 12574 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
 	HermiteGammaApproximationFunction * old;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 13150 "ColorTransformation.c"
+#line 12593 "ColorTransformation.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 13154 "ColorTransformation.c"
+#line 12597 "ColorTransformation.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (old);
-#line 13160 "ColorTransformation.c"
+#line 12603 "ColorTransformation.c"
 	}
 }
 
 
 static void hermite_gamma_approximation_function_class_init (HermiteGammaApproximationFunctionClass * klass) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hermite_gamma_approximation_function_parent_class = g_type_class_peek_parent (klass);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((HermiteGammaApproximationFunctionClass *) klass)->finalize = hermite_gamma_approximation_function_finalize;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (HermiteGammaApproximationFunctionPrivate));
-#line 13172 "ColorTransformation.c"
+#line 12615 "ColorTransformation.c"
 }
 
 
 static void hermite_gamma_approximation_function_instance_init (HermiteGammaApproximationFunction * self) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_PRIVATE (self);
-#line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->x_scale = 1.0f;
-#line 1421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1320 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->nonzero_interval_upper = 1.0f;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 13185 "ColorTransformation.c"
+#line 12628 "ColorTransformation.c"
 }
 
 
 static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction * obj) {
 	HermiteGammaApproximationFunction * self;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunction);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 13195 "ColorTransformation.c"
+#line 12638 "ColorTransformation.c"
 }
 
 
@@ -13217,24 +12659,24 @@ GType hermite_gamma_approximation_function_get_type (void) {
 gpointer hermite_gamma_approximation_function_ref (gpointer instance) {
 	HermiteGammaApproximationFunction * self;
 	self = instance;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 13220 "ColorTransformation.c"
+#line 12663 "ColorTransformation.c"
 }
 
 
 void hermite_gamma_approximation_function_unref (gpointer instance) {
 	HermiteGammaApproximationFunction * self;
 	self = instance;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_CLASS (self)->finalize (self);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13233 "ColorTransformation.c"
+#line 12676 "ColorTransformation.c"
 	}
 }
 
@@ -13249,174 +12691,117 @@ HighlightDetailTransformation* highlight_detail_transformation_construct (GType
 	gfloat _tmp3_;
 	HermiteGammaApproximationFunction* func = NULL;
 	HermiteGammaApproximationFunction* _tmp4_;
-	gfloat* _tmp5_;
-#line 1457 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HighlightDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_intensity;
-#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = _tmp0_;
-#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->intensity;
-#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = CLAMP (_tmp1_ / HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, 0.0f, 1.0f);
-#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_adj = _tmp2_;
-#line 1462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1360 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = intensity_adj;
-#line 1462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1360 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	effect_shift = HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_;
-#line 1463 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = hermite_gamma_approximation_function_new (HIGHLIGHT_DETAIL_TRANSFORMATION_TONAL_WIDTH);
-#line 1463 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	func = _tmp4_;
-#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = g_new0 (gfloat, 256);
-#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = _tmp5_;
-#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 256;
-#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 13279 "ColorTransformation.c"
+#line 12711 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 13284 "ColorTransformation.c"
+#line 12716 "ColorTransformation.c"
 		{
-			gboolean _tmp6_ = FALSE;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-			_tmp6_ = TRUE;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			gboolean _tmp5_ = FALSE;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+			_tmp5_ = TRUE;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 13291 "ColorTransformation.c"
-				gint _tmp8_;
+#line 12723 "ColorTransformation.c"
+				gint _tmp7_;
 				gfloat x = 0.0F;
-				gint _tmp9_;
+				gint _tmp8_;
 				gfloat weight = 0.0F;
-				HermiteGammaApproximationFunction* _tmp10_;
+				HermiteGammaApproximationFunction* _tmp9_;
+				gfloat _tmp10_;
 				gfloat _tmp11_;
-				gfloat _tmp12_;
-				gfloat* _tmp13_;
-				gint _tmp13__length1;
-				gint _tmp14_;
+				gint _tmp12_;
+				gfloat _tmp13_;
+				gfloat _tmp14_;
 				gfloat _tmp15_;
 				gfloat _tmp16_;
 				gfloat _tmp17_;
 				gfloat _tmp18_;
-				gfloat _tmp19_;
-				gfloat _tmp20_;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!_tmp6_) {
-#line 13310 "ColorTransformation.c"
-					gint _tmp7_;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					_tmp7_ = i;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-					i = _tmp7_ + 1;
-#line 13316 "ColorTransformation.c"
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!_tmp5_) {
+#line 12740 "ColorTransformation.c"
+					gint _tmp6_;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					_tmp6_ = i;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+					i = _tmp6_ + 1;
+#line 12746 "ColorTransformation.c"
 				}
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp6_ = FALSE;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp8_ = i;
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				if (!(_tmp8_ < 256)) {
-#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp5_ = FALSE;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp7_ = i;
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				if (!(_tmp7_ < 256)) {
+#line 1364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13326 "ColorTransformation.c"
+#line 12756 "ColorTransformation.c"
 				}
-#line 1468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp9_ = i;
-#line 1468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				x = ((gfloat) _tmp9_) / 255.0f;
-#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp10_ = func;
-#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp11_ = x;
-#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp12_ = hermite_gamma_approximation_function_evaluate (_tmp10_, 1.0f - _tmp11_);
-#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				weight = _tmp12_;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13_ = self->priv->remap_table;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13__length1 = self->priv->remap_table_length1;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp14_ = i;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp15_ = weight;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp16_ = x;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp17_ = effect_shift;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp18_ = weight;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp19_ = x;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp13_[_tmp14_] = (_tmp15_ * (_tmp16_ - _tmp17_)) + ((1.0f - _tmp18_) * _tmp19_);
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-				_tmp20_ = _tmp13_[_tmp14_];
-#line 13360 "ColorTransformation.c"
+#line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp8_ = i;
+#line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				x = ((gfloat) _tmp8_) / 255.0f;
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp9_ = func;
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp10_ = x;
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp11_ = hermite_gamma_approximation_function_evaluate (_tmp9_, 1.0f - _tmp10_);
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				weight = _tmp11_;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp12_ = i;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp13_ = weight;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp14_ = x;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp15_ = effect_shift;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp16_ = weight;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp17_ = x;
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_] = (_tmp13_ * (_tmp14_ - _tmp15_)) + ((1.0f - _tmp16_) * _tmp17_);
+#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+				_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_HSV_TRANSFORMATION, HSVTransformation)->remap_table[_tmp12_];
+#line 12786 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_hermite_gamma_approximation_function_unref0 (func);
-#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 13368 "ColorTransformation.c"
+#line 12794 "ColorTransformation.c"
 }
 
 
 HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity) {
-#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return highlight_detail_transformation_construct (TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, user_intensity);
-#line 13375 "ColorTransformation.c"
-}
-
-
-static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
-	HighlightDetailTransformation * self;
-	HSVAnalyticPixel _result_ = {0};
-	HSVAnalyticPixel _tmp0_;
-	gfloat* _tmp1_;
-	gint _tmp1__length1;
-	HSVAnalyticPixel _tmp2_;
-	gfloat _tmp3_;
-	gfloat _tmp4_;
-	gfloat _tmp5_;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (pixel != NULL);
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp0_ = *pixel;
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_ = _tmp0_;
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1_ = self->priv->remap_table;
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp1__length1 = self->priv->remap_table_length1;
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp2_ = *pixel;
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp3_ = _tmp2_.light_value;
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp4_ = _tmp1_[(gint) (_tmp3_ * 255.0f)];
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_result_.light_value = _tmp5_;
-#line 1477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	*result = _result_;
-#line 1477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	return;
-#line 13415 "ColorTransformation.c"
+#line 12801 "ColorTransformation.c"
 }
 
 
@@ -13425,17 +12810,17 @@ static PixelTransformation* highlight_detail_transformation_real_copy (PixelTran
 	PixelTransformation* result = NULL;
 	gfloat _tmp0_;
 	HighlightDetailTransformation* _tmp1_;
-#line 1480 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1371 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1372 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1372 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = highlight_detail_transformation_new (_tmp0_);
-#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1372 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1372 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13434 "ColorTransformation.c"
+#line 12820 "ColorTransformation.c"
 }
 
 
@@ -13443,74 +12828,62 @@ static gboolean highlight_detail_transformation_real_is_identity (PixelTransform
 	HighlightDetailTransformation * self;
 	gboolean result = FALSE;
 	gfloat _tmp0_;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ == 0.0f;
-#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13450 "ColorTransformation.c"
+#line 12836 "ColorTransformation.c"
 }
 
 
 gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_;
-#line 1488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (IS_HIGHLIGHT_DETAIL_TRANSFORMATION (self), 0.0F);
-#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13465 "ColorTransformation.c"
+#line 12849 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_class_init (HighlightDetailTransformationClass * klass) {
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	highlight_detail_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = highlight_detail_transformation_finalize;
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (HighlightDetailTransformationPrivate));
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	((PixelTransformationClass *) klass)->transform_pixel_hsv = (void (*) (PixelTransformation *, HSVAnalyticPixel*, HSVAnalyticPixel*)) highlight_detail_transformation_real_transform_pixel_hsv;
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = (PixelTransformation* (*) (PixelTransformation *)) highlight_detail_transformation_real_copy;
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = (gboolean (*) (PixelTransformation *)) highlight_detail_transformation_real_is_identity;
-#line 13482 "ColorTransformation.c"
+#line 12864 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_instance_init (HighlightDetailTransformation * self) {
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = HIGHLIGHT_DETAIL_TRANSFORMATION_GET_PRIVATE (self);
-#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = 0.0f;
-#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table_length1 = 0;
-#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 13497 "ColorTransformation.c"
+#line 12873 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_finalize (PixelTransformation * obj) {
 	HighlightDetailTransformation * self;
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1343 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (highlight_detail_transformation_parent_class)->finalize (obj);
-#line 13509 "ColorTransformation.c"
+#line 12883 "ColorTransformation.c"
 }
 
 
@@ -13564,122 +12937,120 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 	PixelTransformationBundle* _tmp61_;
 	SaturationTransformation* _tmp62_;
 	SaturationTransformation* _tmp63_;
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 1503 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 1503 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	adjustments = _tmp0_;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixbuf;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = intensity_histogram_new (_tmp1_);
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	analysis_histogram = _tmp2_;
-#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = analysis_histogram;
-#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = intensity_histogram_get_cumulative_probability (_tmp3_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY);
-#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = analysis_histogram;
-#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = intensity_histogram_get_cumulative_probability (_tmp5_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY);
-#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1399 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pct_in_range = 100.0f * (_tmp4_ - _tmp6_);
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = analysis_histogram;
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = intensity_histogram_get_cumulative_probability (_tmp7_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY);
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = analysis_histogram;
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = intensity_histogram_get_cumulative_probability (_tmp9_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY);
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_range_mean_prob_val = (_tmp8_ + _tmp10_) * 0.5f;
-#line 1517 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_mean_intensity = AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY;
-#line 13597 "ColorTransformation.c"
+#line 12969 "ColorTransformation.c"
 	{
 		gboolean _tmp11_ = FALSE;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = TRUE;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 13604 "ColorTransformation.c"
+#line 12976 "ColorTransformation.c"
 			gint _tmp13_;
 			IntensityHistogram* _tmp14_;
 			gint _tmp15_;
 			gfloat _tmp16_;
 			gfloat _tmp17_;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp11_) {
-#line 13612 "ColorTransformation.c"
+#line 12984 "ColorTransformation.c"
 				gint _tmp12_;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = shadow_mean_intensity;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				shadow_mean_intensity = _tmp12_ + 1;
-#line 13618 "ColorTransformation.c"
+#line 12990 "ColorTransformation.c"
 			}
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = FALSE;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = shadow_mean_intensity;
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp13_ <= AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY)) {
-#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1409 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 13628 "ColorTransformation.c"
+#line 13000 "ColorTransformation.c"
 			}
-#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = analysis_histogram;
-#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp15_ = shadow_mean_intensity;
-#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp16_ = intensity_histogram_get_cumulative_probability (_tmp14_, _tmp15_);
-#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp17_ = shadow_range_mean_prob_val;
-#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp16_ >= _tmp17_) {
-#line 1520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 13642 "ColorTransformation.c"
+#line 13014 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = pct_in_range;
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp19_ > 40.0f) {
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = TRUE;
-#line 13652 "ColorTransformation.c"
+#line 13024 "ColorTransformation.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gfloat _tmp21_;
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = pct_in_range;
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp21_ > 20.0f) {
-#line 13660 "ColorTransformation.c"
+#line 13032 "ColorTransformation.c"
 			gint _tmp22_;
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = shadow_mean_intensity;
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_ = _tmp22_ < AUTO_ENHANCE_EMPIRICAL_DARK;
-#line 13666 "ColorTransformation.c"
+#line 13038 "ColorTransformation.c"
 		} else {
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_ = FALSE;
-#line 13670 "ColorTransformation.c"
+#line 13042 "ColorTransformation.c"
 		}
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = _tmp20_;
-#line 13674 "ColorTransformation.c"
+#line 13046 "ColorTransformation.c"
 	}
-#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp18_) {
-#line 13678 "ColorTransformation.c"
+#line 13050 "ColorTransformation.c"
 		gfloat shadow_trans_effect_size = 0.0F;
 		gint _tmp23_;
 		gfloat _tmp24_;
@@ -13692,87 +13063,87 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 		gint _tmp36_;
 		ExpansionTransformation* _tmp37_;
 		ExpansionTransformation* _tmp38_;
-#line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = shadow_mean_intensity;
-#line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		shadow_trans_effect_size = ((((gfloat) AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY) - ((gfloat) _tmp23_)) / ((gfloat) AUTO_ENHANCE_SHADOW_DETECT_INTENSITY_RANGE)) * SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER;
-#line 1533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp24_ = shadow_trans_effect_size;
-#line 1533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		shadow_trans_effect_size = _tmp24_ * AUTO_ENHANCE_SHADOW_AGGRESSIVENESS_MUL;
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = adjustments;
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = shadow_trans_effect_size;
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = shadow_detail_transformation_new (_tmp26_);
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = _tmp27_;
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp28_);
-#line 1539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		discard_point = 255;
-#line 13713 "ColorTransformation.c"
+#line 13085 "ColorTransformation.c"
 		{
 			gboolean _tmp29_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp29_ = TRUE;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 13720 "ColorTransformation.c"
+#line 13092 "ColorTransformation.c"
 				gint _tmp31_;
 				IntensityHistogram* _tmp32_;
 				gint _tmp33_;
 				gfloat _tmp34_;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp29_) {
-#line 13727 "ColorTransformation.c"
+#line 13099 "ColorTransformation.c"
 					gint _tmp30_;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = discard_point;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					discard_point = _tmp30_ - 1;
-#line 13733 "ColorTransformation.c"
+#line 13105 "ColorTransformation.c"
 				}
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp29_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp31_ = discard_point;
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp31_ > -1)) {
-#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13743 "ColorTransformation.c"
+#line 13115 "ColorTransformation.c"
 				}
-#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp32_ = analysis_histogram;
-#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp33_ = discard_point;
-#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp34_ = intensity_histogram_get_cumulative_probability (_tmp32_, _tmp33_);
-#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if ((1.0f - _tmp34_) > AUTO_ENHANCE_SHADOW_MODE_HIGH_DISCARD_MASS) {
-#line 1543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13755 "ColorTransformation.c"
+#line 13127 "ColorTransformation.c"
 				}
 			}
 		}
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = adjustments;
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = discard_point;
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = expansion_transformation_new_from_extrema (0, _tmp36_);
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp38_ = _tmp37_;
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp38_);
-#line 13771 "ColorTransformation.c"
+#line 13143 "ColorTransformation.c"
 	} else {
 		PixelTransformationBundle* _tmp39_;
 		IntensityHistogram* _tmp40_;
@@ -13781,97 +13152,97 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 		PixelTransformationBundle* _tmp43_;
 		ShadowDetailTransformation* _tmp44_;
 		ShadowDetailTransformation* _tmp45_;
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_ = adjustments;
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp40_ = analysis_histogram;
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp41_ = expansion_transformation_new (_tmp40_);
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp42_ = _tmp41_;
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp42_);
-#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp43_ = adjustments;
-#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp44_ = shadow_detail_transformation_new ((gfloat) 0);
-#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp45_ = _tmp44_;
-#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp45_);
-#line 13802 "ColorTransformation.c"
+#line 13174 "ColorTransformation.c"
 	}
-#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = adjustments;
-#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = highlight_detail_transformation_new (0.0f);
-#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = _tmp47_;
-#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp48_);
-#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = adjustments;
-#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = temperature_transformation_new (0.0f);
-#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_;
-#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1446 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp51_);
-#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = adjustments;
-#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = tint_transformation_new (0.0f);
-#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp53_;
-#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp54_);
-#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = adjustments;
-#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = exposure_transformation_new (0.0f);
-#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_;
-#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1448 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp57_);
-#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = adjustments;
-#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp59_ = contrast_transformation_new (0.0f);
-#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = _tmp59_;
-#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp60_);
-#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61_ = adjustments;
-#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp62_ = saturation_transformation_new (0.0f);
-#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_ = _tmp62_;
-#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp63_);
-#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = adjustments;
-#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_intensity_histogram_unref0 (analysis_histogram);
-#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13870 "ColorTransformation.c"
+#line 13242 "ColorTransformation.c"
 }
 
 
diff --git a/src/ColorTransformation.vala b/src/ColorTransformation.vala
index 435d3f4..8595e96 100644
--- a/src/ColorTransformation.vala
+++ b/src/ColorTransformation.vala
@@ -26,9 +26,9 @@ public struct RGBAnalyticPixel {
 
     public RGBAnalyticPixel.from_quantized_components(uchar red_quantized,
         uchar green_quantized, uchar blue_quantized) {
-        this.red = ((float) red_quantized) * INV_255;
-        this.green = ((float) green_quantized) * INV_255;
-        this.blue = ((float) blue_quantized) * INV_255;
+        this.red = rgb_lookup_table[red_quantized];
+        this.green = rgb_lookup_table[green_quantized];
+        this.blue = rgb_lookup_table[blue_quantized];
     }
 
     public RGBAnalyticPixel.from_hsv(HSVAnalyticPixel hsv_pixel) {
@@ -86,118 +86,14 @@ public struct HSVAnalyticPixel {
 
     public HSVAnalyticPixel.from_quantized_components(uchar hue_quantized,
         uchar saturation_quantized, uchar light_value_quantized) {
-        this.hue = ((float) hue_quantized) * INV_255;
-        this.saturation = ((float) saturation_quantized) * INV_255;
-        this.light_value = ((float) light_value_quantized) * INV_255;
+        this.hue = rgb_lookup_table[hue_quantized];
+        this.saturation = rgb_lookup_table[saturation_quantized];
+        this.light_value = rgb_lookup_table[light_value_quantized];
     }
 
-    public HSVAnalyticPixel.from_rgb(RGBAnalyticPixel p) {
-        float max_component = float.max(float.max(p.red, p.green), p.blue);
-        float min_component = float.min(float.min(p.red, p.green), p.blue);
+    public extern HSVAnalyticPixel.from_rgb(RGBAnalyticPixel p);
 
-        light_value = max_component;
-        saturation = (max_component != 0.0f) ? ((max_component - min_component) /
-            max_component) : 0.0f;
-
-        if (saturation == 0.0f) {
-            hue = 0.0f; /* hue is undefined in the zero saturation case */
-        } else {
-            float delta = max_component - min_component;
-            if (p.red == max_component) {
-                hue = (p.green - p.blue) / delta;
-            } else if (p.green == max_component) {
-                hue = 2.0f + ((p.blue - p.red) / delta);
-            } else if (p.blue == max_component) {
-                hue = 4.0f + ((p.red - p.green) / delta);
-            }
-
-            hue *= 60.0f;
-            if (hue < 0.0f)
-                hue += 360.0f;
-
-            hue /= 360.0f; /* normalize hue */
-        }
-
-        hue = hue.clamp(0.0f, 1.0f);
-        saturation = saturation.clamp(0.0f, 1.0f);
-        light_value = light_value.clamp(0.0f, 1.0f);
-    }
-
-    public RGBAnalyticPixel to_rgb() {
-        RGBAnalyticPixel result = RGBAnalyticPixel();
-
-        if (saturation == 0.0f) {
-            result.red = light_value;
-            result.green = light_value;
-            result.blue = light_value;
-        } else {
-            float hue_denorm = hue * 360.0f;
-            if (hue_denorm == 360.0f)
-                hue_denorm = 0.0f;
-
-            float hue_hexant = hue_denorm / 60.0f;
-
-            int hexant_i_part = (int) hue_hexant;
-
-            float hexant_f_part = hue_hexant - ((float) hexant_i_part);
-
-            /* the p, q, and t quantities from section 13.3 of Foley, et. al. */
-            float p = light_value * (1.0f - saturation);
-            float q = light_value * (1.0f - (saturation * hexant_f_part));
-            float t = light_value * (1.0f - (saturation * (1.0f - hexant_f_part)));
-            switch (hexant_i_part) {
-                /* the (r, g, b) components of the output pixel are computed
-                   from the light_value, p, q, and t quantities differently
-                   depending on which "hexant" (1/6 of a full rotation) of the
-                   HSV color cone the hue lies in. For example, if the hue lies
-                   in the yellow hexant, the dominant channels in the output
-                   are red and green, so we map relatively more of the light_value
-                   into these colors than if, say, the hue were to lie in the
-                   cyan hexant. See chapter 13 of Foley, et. al. for more
-                   information. */
-                case 0:
-                    result.red = light_value;
-                    result.green = t;
-                    result.blue = p;
-                break;
-
-                case 1:
-                    result.red = q;
-                    result.green = light_value;
-                    result.blue = p;
-                break;
-
-                case 2:
-                    result.red = p;
-                    result.green = light_value;
-                    result.blue = t;
-                break;
-
-                case 3:
-                    result.red = p;
-                    result.green = q;
-                    result.blue = light_value;
-                break;
-
-                case 4:
-                    result.red = t;
-                    result.green = p;
-                    result.blue = light_value;
-                break;
-
-                case 5:
-                    result.red = light_value;
-                    result.green = p;
-                    result.blue = q;
-                break;
-
-                default:
-                    error("bad color hexant in HSV-to-RGB conversion");
-            }
-        }
-
-        return result;
-    }
+    public extern RGBAnalyticPixel to_rgb();
 
     public bool equals(ref HSVAnalyticPixel rhs) {
         return ((hue == rhs.hue) && (saturation == rhs.saturation) &&
@@ -212,7 +108,8 @@ public struct HSVAnalyticPixel {
 
 public enum CompositionMode {
     NONE,
-    RGB_MATRIX
+    RGB_MATRIX,
+    HSV_LOOKUP
 }
 
 public enum PixelFormat {
@@ -369,16 +266,21 @@ public class PixelTransformationBundle {
 
 public abstract class PixelTransformation {
     private PixelTransformationType type;
+    private PixelFormat preferred_format;
     
-    public PixelTransformation(PixelTransformationType type) {
+    public PixelTransformation(PixelTransformationType type,
+                               PixelFormat preferred_format) {
         this.type = type;
+        this.preferred_format = preferred_format;
     }
     
     public PixelTransformationType get_transformation_type() {
         return type;
     }
     
-    public abstract PixelFormat get_preferred_format();
+    public PixelFormat get_preferred_format() {
+        return this.preferred_format;
+    }
 
     public virtual CompositionMode get_composition_mode() {
         return CompositionMode.NONE;
@@ -418,7 +320,7 @@ public class RGBTransformation : PixelTransformation {
     protected bool identity = true;
     
     public RGBTransformation(PixelTransformationType type) {
-        base(type);
+        base(type, PixelFormat.RGB);
         
         // Can't initialize these in their member declarations because of a valac bug that
         // I've been unable to produce a minimal test case for to report (JN).  May be 
@@ -431,10 +333,6 @@ public class RGBTransformation : PixelTransformation {
         0.0f, 0.0f, 0.0f, 1.0f };
     }
 
-    public override PixelFormat get_preferred_format() {
-        return PixelFormat.RGB;
-    }
-
     public override CompositionMode get_composition_mode() {
         return CompositionMode.RGB_MATRIX;
     }
@@ -558,27 +456,7 @@ public class RGBTransformation : PixelTransformation {
         return (transform_pixel_rgb(p.to_rgb())).to_hsv();
     }
 
-    public override RGBAnalyticPixel transform_pixel_rgb(RGBAnalyticPixel p) {
-        float red_out = (p.red * matrix_entries[0]) +
-            (p.green * matrix_entries[1]) +
-            (p.blue * matrix_entries[2]) +
-            matrix_entries[3];
-        red_out = red_out.clamp(0.0f, 1.0f);
-
-        float green_out = (p.red * matrix_entries[4]) +
-            (p.green * matrix_entries[5]) +
-            (p.blue * matrix_entries[6]) +
-            matrix_entries[7];
-        green_out = green_out.clamp(0.0f, 1.0f);
-
-        float blue_out = (p.red * matrix_entries[8]) +
-            (p.green * matrix_entries[9]) +
-            (p.blue * matrix_entries[10]) +
-            matrix_entries[11];
-        blue_out = blue_out.clamp(0.0f, 1.0f);
-        
-        return RGBAnalyticPixel.from_components(red_out, green_out, blue_out);
-    }
+    public extern override RGBAnalyticPixel transform_pixel_rgb(RGBAnalyticPixel p);
 
     public override bool is_identity() {
         return identity;
@@ -596,17 +474,46 @@ public class RGBTransformation : PixelTransformation {
 }
 
 public abstract class HSVTransformation : PixelTransformation {
+    protected float remap_table[256];
+
     public HSVTransformation(PixelTransformationType type) {
-        base(type);
+        base(type, PixelFormat.HSV);
     }
-    
-    public override PixelFormat get_preferred_format() {
-        return PixelFormat.HSV;
+
+    public override CompositionMode get_composition_mode() {
+        return CompositionMode.HSV_LOOKUP;
     }
 
     public override RGBAnalyticPixel transform_pixel_rgb(RGBAnalyticPixel p) {
         return (transform_pixel_hsv(p.to_hsv())).to_rgb();
     }
+
+    public override void compose_with(PixelTransformation other) {
+        if (other.get_composition_mode() != CompositionMode.HSV_LOOKUP) {
+            error("HSVTransformation: compose_with(): wrong");
+        }
+
+        var hsv_trans = (HSVTransformation) other;
+
+        // We can do this because ALL HSV transformations actually only
+        // operate on the light_value
+        for (var i = 0; i < 256; i++) {
+            var idx = (int) (this.remap_table[i] * 255.0f);
+            this.remap_table[i] = hsv_trans.remap_table[idx].clamp (0.0f, 1.0f);
+        }
+    }
+
+    public override HSVAnalyticPixel transform_pixel_hsv(HSVAnalyticPixel pixel) {
+        int remap_index = (int)(pixel.light_value * 255.0f);
+
+        HSVAnalyticPixel result = pixel;
+        result.light_value = remap_table[remap_index];
+
+        result.light_value = result.light_value.clamp(0.0f, 1.0f);
+
+        return result;
+    }
+
 }
 
 public class TintTransformation : RGBTransformation {
@@ -775,9 +682,9 @@ public class ContrastTransformation : RGBTransformation {
 public class PixelTransformer {
     private Gee.ArrayList<PixelTransformation> transformations =
         new Gee.ArrayList<PixelTransformation>();
-    private PixelTransformation[] optimized_transformations = null;
-    private int optimized_slots_used = 0;
-    
+    public PixelTransformation[] optimized_transformations = null;
+    public int optimized_slots_used = 0;
+
     public PixelTransformer() {
     }
     
@@ -817,33 +724,7 @@ public class PixelTransformer {
         }
     }
     
-    private RGBAnalyticPixel apply_transformations(RGBAnalyticPixel p) {
-        PixelFormat current_format = PixelFormat.RGB;
-        RGBAnalyticPixel p_rgb = p;
-        HSVAnalyticPixel p_hsv = HSVAnalyticPixel();
-
-        for (int i = 0; i < optimized_slots_used; i++) {
-            PixelTransformation trans = optimized_transformations[i];
-            if (trans.get_preferred_format() == PixelFormat.RGB) {
-                if (current_format == PixelFormat.HSV) {
-                    p_rgb = p_hsv.to_rgb();
-                    current_format = PixelFormat.RGB;
-                }
-                p_rgb = trans.transform_pixel_rgb(p_rgb);
-            } else {
-                if (current_format == PixelFormat.RGB) {
-                    p_hsv = p_rgb.to_hsv();
-                    current_format = PixelFormat.HSV;
-                }
-                p_hsv = trans.transform_pixel_hsv(p_hsv);
-            }
-        }
-
-        if (current_format == PixelFormat.HSV)
-            p_rgb = p_hsv.to_rgb();
-
-        return p_rgb;
-    }
+    private extern RGBAnalyticPixel apply_transformations(RGBAnalyticPixel p);
 
     /* NOTE: this method allows the same transformation to be added multiple
              times. There's nothing wrong with this behavior as of today,
@@ -889,31 +770,52 @@ public class PixelTransformer {
         int dest_num_channels = dest.get_n_channels();
         int dest_rowstride = dest.get_rowstride();
         unowned uchar[] dest_pixels = dest.get_pixels();
-        
-        int cache_pixel_ticker = 0;
 
-        for (int j = 0; j < dest_height; j++) {
-            int row_start_index = j * dest_rowstride;
-            int row_end_index = row_start_index + (dest_width * dest_num_channels);
-            for (int i = row_start_index; i < row_end_index; i += dest_num_channels) {
-                RGBAnalyticPixel pixel = RGBAnalyticPixel.from_components(
-                    fp_pixel_cache[cache_pixel_ticker],
-                    fp_pixel_cache[cache_pixel_ticker + 1],
-                    fp_pixel_cache[cache_pixel_ticker + 2]);
+        var jobs = (int) GLib.get_num_processors() - 1;
 
-                cache_pixel_ticker += 3;
+        uint slice_length = dest_height;
+        if (jobs > 0) {
+            slice_length = (dest_height + (jobs - 1)) / jobs;
+        }
 
-                pixel = apply_transformations(pixel);
+        var threads = new GLib.Thread<void *>[jobs];
+
+        unowned float[] cache = fp_pixel_cache;
+        for (var job = 0; job < jobs; job++) {
+            var row = job * slice_length;
+            var slice_height = (row + slice_length).clamp(0, dest_height);
+            threads[job] = new GLib.Thread<void*>("shotwell-worker", () => {
+                uint cache_pixel_ticker = row * dest_width * 3;
+                for (uint j = row; j < slice_height; j++) {
+                    uint row_start_index = j * dest_rowstride;
+                    uint row_end_index = row_start_index + (dest_width * dest_num_channels);
+                    for (uint i = row_start_index; i < row_end_index; i += dest_num_channels) {
+                        RGBAnalyticPixel pixel = RGBAnalyticPixel.from_components(
+                                cache[cache_pixel_ticker],
+                                cache[cache_pixel_ticker + 1],
+                                cache[cache_pixel_ticker + 2]);
+
+                        cache_pixel_ticker += 3;
+
+                        pixel = apply_transformations(pixel);
+
+                        dest_pixels[i] = (uchar) (pixel.red * 255.0f);
+                        dest_pixels[i + 1] = (uchar) (pixel.green * 255.0f);
+                        dest_pixels[i + 2] = (uchar) (pixel.blue * 255.0f);
+                    }
+                }
 
-                dest_pixels[i] = (uchar) (pixel.red * 255.0f);
-                dest_pixels[i + 1] = (uchar) (pixel.green * 255.0f);
-                dest_pixels[i + 2] = (uchar) (pixel.blue * 255.0f);
-            }
+                return null;
+            });
+        }
+
+        foreach (var thread in threads) {
+            thread.join();
         }
     }
 
     public void transform_to_other_pixbuf(Gdk.Pixbuf source, Gdk.Pixbuf dest,
-        Cancellable? cancellable = null) {
+        Cancellable? cancellable = null, int jobs = -1) {
         if (source.width != dest.width)
             error("PixelTransformer: source and destination pixbufs must have the same width");
 
@@ -934,28 +836,50 @@ public class PixelTransformer {
         int rowbytes = n_channels * width;
         unowned uchar[] source_pixels = source.get_pixels();
         unowned uchar[] dest_pixels = dest.get_pixels();
-        for (int j = 0; j < height; j++) {
-            int row_start_index = j * rowstride;
-            int row_end_index = row_start_index + rowbytes;
-            for (int i = row_start_index; i < row_end_index; i += n_channels) {
-                RGBAnalyticPixel current_pixel = RGBAnalyticPixel.from_quantized_components(
-                    source_pixels[i], source_pixels[i + 1], source_pixels[i + 2]);
+        if (jobs == -1) {
+            jobs = (int) GLib.get_num_processors() - 1;
+        }
 
-                current_pixel = apply_transformations(current_pixel);
+        uint slice_length = height;
+        if (jobs > 0) {
+            slice_length = (height + (jobs - 1)) / jobs;
+        }
 
-                dest_pixels[i] = current_pixel.quantized_red();
-                dest_pixels[i + 1] = current_pixel.quantized_green();
-                dest_pixels[i + 2] = current_pixel.quantized_blue();
-            }
+        var threads = new GLib.Thread<void*>[jobs];
 
-            if ((cancellable != null) && (cancellable.is_cancelled())) {
-                return;
-            }
+        for (var job = 0; job < jobs; job++) {
+            var row = job * slice_length;
+            var slice_height = (row + slice_length).clamp(0, height);
+
+            threads[job] = new GLib.Thread<void*>("shotwell-worker", () => {
+                for (var j = row; j < slice_height; j++) {
+                    this.apply_transformation(j, rowstride, rowbytes, n_channels, source_pixels,
+                            dest_pixels);
+
+                    if ((cancellable != null) && (cancellable.is_cancelled())) {
+                        break;
+                    }
+                }
+
+                return null;
+            });
+        }
+
+        foreach (var thread in threads) {
+            thread.join();
         }
     }
+
+    private extern void apply_transformation(uint row,
+                                      int rowstride,
+                                      int rowbytes,
+                                      int n_channels,
+                                      uchar[] source_pixels,
+                                      uchar[] dest_pixels);
+
 }
 
-class RGBHistogram {
+public class RGBHistogram {
     private const uchar MARKED_BACKGROUND = 30;
     private const uchar MARKED_FOREGROUND = 210;
     private const uchar UNMARKED_BACKGROUND = 120;
@@ -1253,7 +1177,6 @@ public class IntensityHistogram {
 }
 
 public class ExpansionTransformation : HSVTransformation {
-    private float[] remap_table = null;
     private const float LOW_DISCARD_MASS = 0.02f;
     private const float HIGH_DISCARD_MASS = 0.02f;
 
@@ -1263,8 +1186,6 @@ public class ExpansionTransformation : HSVTransformation {
     public ExpansionTransformation(IntensityHistogram histogram) {
         base(PixelTransformationType.TONE_EXPANSION);
         
-        remap_table = new float[256];
-
         float LOW_KINK_MASS = LOW_DISCARD_MASS;
         low_kink = 0;
         while (histogram.get_cumulative_probability(low_kink) < LOW_KINK_MASS)
@@ -1315,9 +1236,6 @@ public class ExpansionTransformation : HSVTransformation {
     }
 
     private void build_remap_table() {
-        if (remap_table == null)
-            remap_table = new float[256];
-
         float low_kink_f = ((float) low_kink) / 255.0f;
         float high_kink_f = ((float) high_kink) / 255.0f;
 
@@ -1335,17 +1253,6 @@ public class ExpansionTransformation : HSVTransformation {
             remap_table[i] = 1.0f;
     }
 
-    public override HSVAnalyticPixel transform_pixel_hsv(HSVAnalyticPixel pixel) {
-        int remap_index = (int)(pixel.light_value * 255.0f);
-
-        HSVAnalyticPixel result = pixel;
-        result.light_value = remap_table[remap_index];
-
-        result.light_value = result.light_value.clamp(0.0f, 1.0f);
-
-        return result;
-    }
-
     public override string to_string() {
         return "{ %d, %d }".printf(low_kink, high_kink);
     }
@@ -1374,7 +1281,6 @@ public class ShadowDetailTransformation : HSVTransformation {
     private const float TONAL_WIDTH = 1.0f;
 
     private float intensity = 0.0f;
-    private float[] remap_table = null;
     
     public const float MIN_PARAMETER = 0.0f;
     public const float MAX_PARAMETER = 32.0f;
@@ -1389,7 +1295,6 @@ public class ShadowDetailTransformation : HSVTransformation {
         HermiteGammaApproximationFunction func =
             new HermiteGammaApproximationFunction(TONAL_WIDTH);
         
-        remap_table = new float[256];
         for (int i = 0; i < 256; i++) {
             float x = ((float) i) / 255.0f;
             float weight = func.evaluate(x);
@@ -1397,12 +1302,6 @@ public class ShadowDetailTransformation : HSVTransformation {
         }
     }
 
-    public override HSVAnalyticPixel transform_pixel_hsv(HSVAnalyticPixel pixel) {
-        HSVAnalyticPixel result = pixel;
-        result.light_value = (remap_table[(int)(pixel.light_value * 255.0f)]).clamp(0.0f, 1.0f);
-        return result;
-    }
-
     public override PixelTransformation copy() {
         return new ShadowDetailTransformation(intensity);
     }
@@ -1448,7 +1347,6 @@ public class HighlightDetailTransformation : HSVTransformation {
     private const float TONAL_WIDTH = 1.0f;
 
     private float intensity = 0.0f;
-    private float[] remap_table = null;
     
     public const float MIN_PARAMETER = -32.0f;
     public const float MAX_PARAMETER = 0.0f;
@@ -1463,7 +1361,6 @@ public class HighlightDetailTransformation : HSVTransformation {
         HermiteGammaApproximationFunction func =
             new HermiteGammaApproximationFunction(TONAL_WIDTH);
         
-        remap_table = new float[256];
         for (int i = 0; i < 256; i++) {
             float x = ((float) i) / 255.0f;
             float weight = func.evaluate(1.0f - x);
@@ -1471,12 +1368,6 @@ public class HighlightDetailTransformation : HSVTransformation {
         }
     }
 
-    public override HSVAnalyticPixel transform_pixel_hsv(HSVAnalyticPixel pixel) {
-        HSVAnalyticPixel result = pixel;
-        result.light_value = (remap_table[(int)(pixel.light_value * 255.0f)]).clamp(0.0f, 1.0f);
-        return result;
-    }
-
     public override PixelTransformation copy() {
         return new HighlightDetailTransformation(intensity);
     }
@@ -1562,3 +1453,57 @@ public PixelTransformationBundle create_auto_enhance_adjustments(Gdk.Pixbuf pixb
 }
 }
 
+public const float rgb_lookup_table[] = {
+      0.0f/255.0f,   1.0f/255.0f,   2.0f/255.0f,   3.0f/255.0f,   4.0f/255.0f,
+      5.0f/255.0f,   6.0f/255.0f,   7.0f/255.0f,   8.0f/255.0f,   9.0f/255.0f,
+     10.0f/255.0f,  11.0f/255.0f,  12.0f/255.0f,  13.0f/255.0f,  14.0f/255.0f,
+     15.0f/255.0f,  16.0f/255.0f,  17.0f/255.0f,  18.0f/255.0f,  19.0f/255.0f,
+     20.0f/255.0f,  21.0f/255.0f,  22.0f/255.0f,  23.0f/255.0f,  24.0f/255.0f,
+     25.0f/255.0f,  26.0f/255.0f,  27.0f/255.0f,  28.0f/255.0f,  29.0f/255.0f,
+     30.0f/255.0f,  31.0f/255.0f,  32.0f/255.0f,  33.0f/255.0f,  34.0f/255.0f,
+     35.0f/255.0f,  36.0f/255.0f,  37.0f/255.0f,  38.0f/255.0f,  39.0f/255.0f,
+     40.0f/255.0f,  41.0f/255.0f,  42.0f/255.0f,  43.0f/255.0f,  44.0f/255.0f,
+     45.0f/255.0f,  46.0f/255.0f,  47.0f/255.0f,  48.0f/255.0f,  49.0f/255.0f,
+     50.0f/255.0f,  51.0f/255.0f,  52.0f/255.0f,  53.0f/255.0f,  54.0f/255.0f,
+     55.0f/255.0f,  56.0f/255.0f,  57.0f/255.0f,  58.0f/255.0f,  59.0f/255.0f,
+     60.0f/255.0f,  61.0f/255.0f,  62.0f/255.0f,  63.0f/255.0f,  64.0f/255.0f,
+     65.0f/255.0f,  66.0f/255.0f,  67.0f/255.0f,  68.0f/255.0f,  69.0f/255.0f,
+     70.0f/255.0f,  71.0f/255.0f,  72.0f/255.0f,  73.0f/255.0f,  74.0f/255.0f,
+     75.0f/255.0f,  76.0f/255.0f,  77.0f/255.0f,  78.0f/255.0f,  79.0f/255.0f,
+     80.0f/255.0f,  81.0f/255.0f,  82.0f/255.0f,  83.0f/255.0f,  84.0f/255.0f,
+     85.0f/255.0f,  86.0f/255.0f,  87.0f/255.0f,  88.0f/255.0f,  89.0f/255.0f,
+     90.0f/255.0f,  91.0f/255.0f,  92.0f/255.0f,  93.0f/255.0f,  94.0f/255.0f,
+     95.0f/255.0f,  96.0f/255.0f,  97.0f/255.0f,  98.0f/255.0f,  99.0f/255.0f,
+    100.0f/255.0f, 101.0f/255.0f, 102.0f/255.0f, 103.0f/255.0f, 104.0f/255.0f,
+    105.0f/255.0f, 106.0f/255.0f, 107.0f/255.0f, 108.0f/255.0f, 109.0f/255.0f,
+    110.0f/255.0f, 111.0f/255.0f, 112.0f/255.0f, 113.0f/255.0f, 114.0f/255.0f,
+    115.0f/255.0f, 116.0f/255.0f, 117.0f/255.0f, 118.0f/255.0f, 119.0f/255.0f,
+    120.0f/255.0f, 121.0f/255.0f, 122.0f/255.0f, 123.0f/255.0f, 124.0f/255.0f,
+    125.0f/255.0f, 126.0f/255.0f, 127.0f/255.0f, 128.0f/255.0f, 129.0f/255.0f,
+    130.0f/255.0f, 131.0f/255.0f, 132.0f/255.0f, 133.0f/255.0f, 134.0f/255.0f,
+    135.0f/255.0f, 136.0f/255.0f, 137.0f/255.0f, 138.0f/255.0f, 139.0f/255.0f,
+    140.0f/255.0f, 141.0f/255.0f, 142.0f/255.0f, 143.0f/255.0f, 144.0f/255.0f,
+    145.0f/255.0f, 146.0f/255.0f, 147.0f/255.0f, 148.0f/255.0f, 149.0f/255.0f,
+    150.0f/255.0f, 151.0f/255.0f, 152.0f/255.0f, 153.0f/255.0f, 154.0f/255.0f,
+    155.0f/255.0f, 156.0f/255.0f, 157.0f/255.0f, 158.0f/255.0f, 159.0f/255.0f,
+    160.0f/255.0f, 161.0f/255.0f, 162.0f/255.0f, 163.0f/255.0f, 164.0f/255.0f,
+    165.0f/255.0f, 166.0f/255.0f, 167.0f/255.0f, 168.0f/255.0f, 169.0f/255.0f,
+    170.0f/255.0f, 171.0f/255.0f, 172.0f/255.0f, 173.0f/255.0f, 174.0f/255.0f,
+    175.0f/255.0f, 176.0f/255.0f, 177.0f/255.0f, 178.0f/255.0f, 179.0f/255.0f,
+    180.0f/255.0f, 181.0f/255.0f, 182.0f/255.0f, 183.0f/255.0f, 184.0f/255.0f,
+    185.0f/255.0f, 186.0f/255.0f, 187.0f/255.0f, 188.0f/255.0f, 189.0f/255.0f,
+    190.0f/255.0f, 191.0f/255.0f, 192.0f/255.0f, 193.0f/255.0f, 194.0f/255.0f,
+    195.0f/255.0f, 196.0f/255.0f, 197.0f/255.0f, 198.0f/255.0f, 199.0f/255.0f,
+    200.0f/255.0f, 201.0f/255.0f, 202.0f/255.0f, 203.0f/255.0f, 204.0f/255.0f,
+    205.0f/255.0f, 206.0f/255.0f, 207.0f/255.0f, 208.0f/255.0f, 209.0f/255.0f,
+    210.0f/255.0f, 211.0f/255.0f, 212.0f/255.0f, 213.0f/255.0f, 214.0f/255.0f,
+    215.0f/255.0f, 216.0f/255.0f, 217.0f/255.0f, 218.0f/255.0f, 219.0f/255.0f,
+    220.0f/255.0f, 221.0f/255.0f, 222.0f/255.0f, 223.0f/255.0f, 224.0f/255.0f,
+    225.0f/255.0f, 226.0f/255.0f, 227.0f/255.0f, 228.0f/255.0f, 229.0f/255.0f,
+    230.0f/255.0f, 231.0f/255.0f, 232.0f/255.0f, 233.0f/255.0f, 234.0f/255.0f,
+    235.0f/255.0f, 236.0f/255.0f, 237.0f/255.0f, 238.0f/255.0f, 239.0f/255.0f,
+    240.0f/255.0f, 241.0f/255.0f, 242.0f/255.0f, 243.0f/255.0f, 244.0f/255.0f,
+    245.0f/255.0f, 246.0f/255.0f, 247.0f/255.0f, 248.0f/255.0f, 249.0f/255.0f,
+    250.0f/255.0f, 251.0f/255.0f, 252.0f/255.0f, 253.0f/255.0f, 254.0f/255.0f,
+    255.0f/255.0f,
+};
diff --git a/src/Commands.c b/src/Commands.c
index a8e7b47..9abf048 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -19,6 +19,7 @@
 #include <math.h>
 #include <gio/gio.h>
 #include <glib/gi18n-lib.h>
+#include "shotwell-graphics-processor.h"
 #include <gdk/gdk.h>
 #include <time.h>
 
@@ -665,16 +666,6 @@ typedef struct _CropCommandPrivate CropCommandPrivate;
 typedef struct _AdjustColorsSingleCommand AdjustColorsSingleCommand;
 typedef struct _AdjustColorsSingleCommandClass AdjustColorsSingleCommandClass;
 typedef struct _AdjustColorsSingleCommandPrivate AdjustColorsSingleCommandPrivate;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
 #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
 
 #define TYPE_ADJUST_COLORS_MULTIPLE_COMMAND (adjust_colors_multiple_command_get_type ())
@@ -2314,13 +2305,6 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
 static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
 static void crop_command_finalize (GObject * obj);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
 #define ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommandPrivate))
 enum  {
 	ADJUST_COLORS_SINGLE_COMMAND_DUMMY_PROPERTY
@@ -2484,7 +2468,7 @@ static void set_raw_developer_command_real_execute (Command* base);
 static void set_raw_developer_command_real_undo (Command* base);
 static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
 gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
 static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
@@ -2753,28 +2737,28 @@ static void flag_unflag_command_finalize (GObject * obj);
 static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_page_destroyed ((PageCommand*) self);
-#line 2757 "Commands.c"
+#line 2741 "Commands.c"
 }
 
 
 static void _page_command_on_photo_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_photo_destroyed ((PageCommand*) self);
-#line 2764 "Commands.c"
+#line 2748 "Commands.c"
 }
 
 
 static void _page_command_on_controller_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
 	page_command_on_controller_destroyed ((PageCommand*) self);
-#line 2771 "Commands.c"
+#line 2755 "Commands.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2778 "Commands.c"
+#line 2762 "Commands.c"
 }
 
 
@@ -2812,7 +2796,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 	_tmp5_ = self->priv->page;
 #line 20 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ != NULL) {
-#line 2816 "Commands.c"
+#line 2800 "Commands.c"
 		Page* _tmp6_;
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp7_;
@@ -2832,7 +2816,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 		_tmp9_ = photo_page;
 #line 28 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp9_ != NULL) {
-#line 2836 "Commands.c"
+#line 2820 "Commands.c"
 			LibraryPhotoPage* _tmp10_;
 			Photo* _tmp11_;
 			LibraryPhotoPage* _tmp12_;
@@ -2859,21 +2843,21 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 			_tmp15_ = self->priv->library_photo;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp15_ != NULL) {
-#line 2863 "Commands.c"
+#line 2847 "Commands.c"
 				CollectionPage* _tmp16_;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = self->priv->collection_page;
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = _tmp16_ != NULL;
-#line 2869 "Commands.c"
+#line 2853 "Commands.c"
 			} else {
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = FALSE;
-#line 2873 "Commands.c"
+#line 2857 "Commands.c"
 			}
 #line 32 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
-#line 2877 "Commands.c"
+#line 2861 "Commands.c"
 				Photo* _tmp17_;
 				CollectionPage* _tmp18_;
 #line 33 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2884,7 +2868,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 				_tmp18_ = self->priv->collection_page;
 #line 34 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self, 0);
-#line 2888 "Commands.c"
+#line 2872 "Commands.c"
 			} else {
 #line 36 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (self->priv->library_photo);
@@ -2894,16 +2878,16 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
 				_g_object_unref0 (self->priv->collection_page);
 #line 37 "/home/jens/Source/shotwell/src/Commands.vala"
 				self->priv->collection_page = NULL;
-#line 2898 "Commands.c"
+#line 2882 "Commands.c"
 			}
 		}
 #line 20 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (photo_page);
-#line 2903 "Commands.c"
+#line 2887 "Commands.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 2907 "Commands.c"
+#line 2891 "Commands.c"
 }
 
 
@@ -2915,7 +2899,7 @@ void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_retu
 	_tmp0_ = auto_return;
 #line 55 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->auto_return = _tmp0_;
-#line 2919 "Commands.c"
+#line 2903 "Commands.c"
 }
 
 
@@ -2930,11 +2914,11 @@ static void page_command_real_prepare (Command* base) {
 	if (_tmp0_) {
 #line 60 "/home/jens/Source/shotwell/src/Commands.vala"
 		page_command_return_to_page (self);
-#line 2934 "Commands.c"
+#line 2918 "Commands.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (page_command_parent_class)->prepare (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
-#line 2938 "Commands.c"
+#line 2922 "Commands.c"
 }
 
 
@@ -2955,28 +2939,28 @@ void page_command_return_to_page (PageCommand* self) {
 	_tmp2_ = photo_page;
 #line 68 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 2959 "Commands.c"
+#line 2943 "Commands.c"
 		gboolean _tmp3_ = FALSE;
 		Photo* _tmp4_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = self->priv->library_photo;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_ != NULL) {
-#line 2966 "Commands.c"
+#line 2950 "Commands.c"
 			CollectionPage* _tmp5_;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = self->priv->collection_page;
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = _tmp5_ != NULL;
-#line 2972 "Commands.c"
+#line 2956 "Commands.c"
 		} else {
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp3_ = FALSE;
-#line 2976 "Commands.c"
+#line 2960 "Commands.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 2980 "Commands.c"
+#line 2964 "Commands.c"
 			gboolean photo_in_collection = FALSE;
 			gint count = 0;
 			CollectionPage* _tmp6_;
@@ -3001,19 +2985,19 @@ void page_command_return_to_page (PageCommand* self) {
 			_data_collection_unref0 (_tmp8_);
 #line 71 "/home/jens/Source/shotwell/src/Commands.vala"
 			count = _tmp10_;
-#line 3005 "Commands.c"
+#line 2989 "Commands.c"
 			{
 				gint i = 0;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 				i = 0;
-#line 3010 "Commands.c"
+#line 2994 "Commands.c"
 				{
 					gboolean _tmp11_ = FALSE;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp11_ = TRUE;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 3017 "Commands.c"
+#line 3001 "Commands.c"
 						gint _tmp13_;
 						gint _tmp14_;
 						CollectionPage* _tmp15_;
@@ -3028,13 +3012,13 @@ void page_command_return_to_page (PageCommand* self) {
 						gboolean _tmp24_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (!_tmp11_) {
-#line 3032 "Commands.c"
+#line 3016 "Commands.c"
 							gint _tmp12_;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							_tmp12_ = i;
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							i = _tmp12_ + 1;
-#line 3038 "Commands.c"
+#line 3022 "Commands.c"
 						}
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp11_ = FALSE;
@@ -3046,7 +3030,7 @@ void page_command_return_to_page (PageCommand* self) {
 						if (!(_tmp13_ < _tmp14_)) {
 #line 72 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 3050 "Commands.c"
+#line 3034 "Commands.c"
 						}
 #line 73 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp15_ = self->priv->collection_page;
@@ -3080,7 +3064,7 @@ void page_command_return_to_page (PageCommand* self) {
 							photo_in_collection = TRUE;
 #line 75 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 3084 "Commands.c"
+#line 3068 "Commands.c"
 						}
 					}
 				}
@@ -3089,7 +3073,7 @@ void page_command_return_to_page (PageCommand* self) {
 			_tmp25_ = photo_in_collection;
 #line 79 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_) {
-#line 3093 "Commands.c"
+#line 3077 "Commands.c"
 				LibraryWindow* _tmp26_;
 				LibraryWindow* _tmp27_;
 				CollectionPage* _tmp28_;
@@ -3106,7 +3090,7 @@ void page_command_return_to_page (PageCommand* self) {
 				library_window_switch_to_photo_page (_tmp27_, _tmp28_, _tmp29_);
 #line 80 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp27_);
-#line 3110 "Commands.c"
+#line 3094 "Commands.c"
 			}
 		}
 	} else {
@@ -3115,7 +3099,7 @@ void page_command_return_to_page (PageCommand* self) {
 		_tmp30_ = self->priv->page;
 #line 82 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp30_ != NULL) {
-#line 3119 "Commands.c"
+#line 3103 "Commands.c"
 			AppWindow* _tmp31_;
 			AppWindow* _tmp32_;
 			Page* _tmp33_;
@@ -3129,12 +3113,12 @@ void page_command_return_to_page (PageCommand* self) {
 			page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PAGE_WINDOW, PageWindow), _tmp33_);
 #line 83 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp32_);
-#line 3133 "Commands.c"
+#line 3117 "Commands.c"
 		}
 	}
 #line 65 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo_page);
-#line 3138 "Commands.c"
+#line 3122 "Commands.c"
 }
 
 
@@ -3153,7 +3137,7 @@ static void page_command_on_page_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->page);
 #line 88 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->page = NULL;
-#line 3157 "Commands.c"
+#line 3141 "Commands.c"
 }
 
 
@@ -3172,7 +3156,7 @@ static void page_command_on_photo_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->library_photo);
 #line 93 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->library_photo = NULL;
-#line 3176 "Commands.c"
+#line 3160 "Commands.c"
 }
 
 
@@ -3191,7 +3175,7 @@ static void page_command_on_controller_destroyed (PageCommand* self) {
 	_g_object_unref0 (self->priv->collection_page);
 #line 98 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->collection_page = NULL;
-#line 3195 "Commands.c"
+#line 3179 "Commands.c"
 }
 
 
@@ -3204,7 +3188,7 @@ static void page_command_class_init (PageCommandClass * klass) {
 	((CommandClass *) klass)->prepare = (void (*) (Command *)) page_command_real_prepare;
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_command_finalize;
-#line 3208 "Commands.c"
+#line 3192 "Commands.c"
 }
 
 
@@ -3217,7 +3201,7 @@ static void page_command_instance_init (PageCommand * self) {
 	self->priv->library_photo = NULL;
 #line 13 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->collection_page = NULL;
-#line 3221 "Commands.c"
+#line 3205 "Commands.c"
 }
 
 
@@ -3232,7 +3216,7 @@ static void page_command_finalize (GObject * obj) {
 	_tmp0_ = self->priv->page;
 #line 44 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
-#line 3236 "Commands.c"
+#line 3220 "Commands.c"
 		Page* _tmp1_;
 		guint _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3241,13 +3225,13 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
 #line 45 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _page_command_on_page_destroyed_gtk_widget_destroy, self);
-#line 3245 "Commands.c"
+#line 3229 "Commands.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = self->priv->library_photo;
 #line 47 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 3251 "Commands.c"
+#line 3235 "Commands.c"
 		Photo* _tmp4_;
 		guint _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3256,13 +3240,13 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroyed", TYPE_DATA_SOURCE, &_tmp5_, NULL, FALSE);
 #line 48 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_command_on_photo_destroyed_data_source_destroyed, self);
-#line 3260 "Commands.c"
+#line 3244 "Commands.c"
 	}
 #line 50 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = self->priv->collection_page;
 #line 50 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 3266 "Commands.c"
+#line 3250 "Commands.c"
 		CollectionPage* _tmp7_;
 		guint _tmp8_;
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3271,7 +3255,7 @@ static void page_command_finalize (GObject * obj) {
 		g_signal_parse_name ("destroy", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
 #line 51 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _page_command_on_controller_destroyed_gtk_widget_destroy, self);
-#line 3275 "Commands.c"
+#line 3259 "Commands.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->page);
@@ -3281,7 +3265,7 @@ static void page_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->collection_page);
 #line 9 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (page_command_parent_class)->finalize (obj);
-#line 3285 "Commands.c"
+#line 3269 "Commands.c"
 }
 
 
@@ -3300,7 +3284,7 @@ GType page_command_get_type (void) {
 static void _single_data_source_command_on_source_destroyed_data_source_destroyed (DataSource* _sender, gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/Commands.vala"
 	single_data_source_command_on_source_destroyed ((SingleDataSourceCommand*) self);
-#line 3304 "Commands.c"
+#line 3288 "Commands.c"
 }
 
 
@@ -3337,7 +3321,7 @@ SingleDataSourceCommand* single_data_source_command_construct (GType object_type
 	g_signal_connect_object (_tmp4_, "destroyed", (GCallback) _single_data_source_command_on_source_destroyed_data_source_destroyed, self, 0);
 #line 106 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3341 "Commands.c"
+#line 3325 "Commands.c"
 }
 
 
@@ -3355,7 +3339,7 @@ DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 3359 "Commands.c"
+#line 3343 "Commands.c"
 }
 
 
@@ -3372,7 +3356,7 @@ static void single_data_source_command_on_source_destroyed (SingleDataSourceComm
 	command_manager_reset (_tmp1_);
 #line 125 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3376 "Commands.c"
+#line 3360 "Commands.c"
 }
 
 
@@ -3381,7 +3365,7 @@ static void single_data_source_command_class_init (SingleDataSourceCommandClass
 	single_data_source_command_parent_class = g_type_class_peek_parent (klass);
 #line 103 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_data_source_command_finalize;
-#line 3385 "Commands.c"
+#line 3369 "Commands.c"
 }
 
 
@@ -3405,7 +3389,7 @@ static void single_data_source_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->source);
 #line 103 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (single_data_source_command_parent_class)->finalize (obj);
-#line 3409 "Commands.c"
+#line 3393 "Commands.c"
 }
 
 
@@ -3424,7 +3408,7 @@ GType single_data_source_command_get_type (void) {
 static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 141 "/home/jens/Source/shotwell/src/Commands.vala"
 	simple_proxyable_command_on_proxy_broken ((SimpleProxyableCommand*) self);
-#line 3428 "Commands.c"
+#line 3412 "Commands.c"
 }
 
 
@@ -3461,7 +3445,7 @@ SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, P
 	g_signal_connect_object (_tmp4_, "broken", (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self, 0);
 #line 133 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3465 "Commands.c"
+#line 3449 "Commands.c"
 }
 
 
@@ -3482,7 +3466,7 @@ static void simple_proxyable_command_real_execute (Command* base) {
 	simple_proxyable_command_execute_on_source (self, _tmp2_);
 #line 146 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3486 "Commands.c"
+#line 3470 "Commands.c"
 }
 
 
@@ -3491,7 +3475,7 @@ static void simple_proxyable_command_real_execute_on_source (SimpleProxyableComm
 	g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 149 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3495 "Commands.c"
+#line 3479 "Commands.c"
 }
 
 
@@ -3500,7 +3484,7 @@ void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, D
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 149 "/home/jens/Source/shotwell/src/Commands.vala"
 	SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->execute_on_source (self, source);
-#line 3504 "Commands.c"
+#line 3488 "Commands.c"
 }
 
 
@@ -3521,7 +3505,7 @@ static void simple_proxyable_command_real_undo (Command* base) {
 	simple_proxyable_command_undo_on_source (self, _tmp2_);
 #line 152 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3525 "Commands.c"
+#line 3509 "Commands.c"
 }
 
 
@@ -3530,7 +3514,7 @@ static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand
 	g_critical ("Type `%s' does not implement abstract method `simple_proxyable_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 155 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3534 "Commands.c"
+#line 3518 "Commands.c"
 }
 
 
@@ -3539,7 +3523,7 @@ void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, Data
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 155 "/home/jens/Source/shotwell/src/Commands.vala"
 	SIMPLE_PROXYABLE_COMMAND_GET_CLASS (self)->undo_on_source (self, source);
-#line 3543 "Commands.c"
+#line 3527 "Commands.c"
 }
 
 
@@ -3548,7 +3532,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
 #line 161 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (proxyables));
-#line 3552 "Commands.c"
+#line 3536 "Commands.c"
 	{
 		GeeIterator* _proxyable_it = NULL;
 		GeeCollection* _tmp0_;
@@ -3561,7 +3545,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 		_proxyable_it = _tmp1_;
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 3565 "Commands.c"
+#line 3549 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			Proxyable* proxyable = NULL;
@@ -3581,7 +3565,7 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 			if (!_tmp3_) {
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 3585 "Commands.c"
+#line 3569 "Commands.c"
 			}
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _proxyable_it;
@@ -3609,11 +3593,11 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
 			_source_proxy_unref0 (added_proxy);
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (proxyable);
-#line 3613 "Commands.c"
+#line 3597 "Commands.c"
 		}
 #line 162 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxyable_it);
-#line 3617 "Commands.c"
+#line 3601 "Commands.c"
 	}
 }
 
@@ -3622,7 +3606,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 	GeeHashSet* _tmp8_;
 #line 170 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
-#line 3626 "Commands.c"
+#line 3610 "Commands.c"
 	{
 		GeeIterator* _added_proxy_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -3635,7 +3619,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 		_added_proxy_it = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 3639 "Commands.c"
+#line 3623 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceProxy* added_proxy = NULL;
@@ -3651,7 +3635,7 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 			if (!_tmp3_) {
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 3655 "Commands.c"
+#line 3639 "Commands.c"
 			}
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _added_proxy_it;
@@ -3667,17 +3651,17 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _simple_proxyable_command_on_proxy_broken_source_proxy_broken, self);
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (added_proxy);
-#line 3671 "Commands.c"
+#line 3655 "Commands.c"
 		}
 #line 171 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_added_proxy_it);
-#line 3675 "Commands.c"
+#line 3659 "Commands.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = self->priv->proxies;
 #line 174 "/home/jens/Source/shotwell/src/Commands.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3681 "Commands.c"
+#line 3665 "Commands.c"
 }
 
 
@@ -3696,7 +3680,7 @@ static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* se
 	command_manager_reset (_tmp1_);
 #line 179 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3700 "Commands.c"
+#line 3684 "Commands.c"
 }
 
 
@@ -3715,7 +3699,7 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_undo_on_source;
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize;
-#line 3719 "Commands.c"
+#line 3703 "Commands.c"
 }
 
 
@@ -3727,7 +3711,7 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel
 	_tmp0_ = gee_hash_set_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->proxies = _tmp0_;
-#line 3731 "Commands.c"
+#line 3715 "Commands.c"
 }
 
 
@@ -3751,7 +3735,7 @@ static void simple_proxyable_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->proxies);
 #line 129 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (simple_proxyable_command_parent_class)->finalize (obj);
-#line 3755 "Commands.c"
+#line 3739 "Commands.c"
 }
 
 
@@ -3770,7 +3754,7 @@ GType simple_proxyable_command_get_type (void) {
 static void _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 194 "/home/jens/Source/shotwell/src/Commands.vala"
 	single_photo_transformation_command_on_state_broken ((SinglePhotoTransformationCommand*) self);
-#line 3774 "Commands.c"
+#line 3758 "Commands.c"
 }
 
 
@@ -3810,7 +3794,7 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
 	g_signal_connect_object (_tmp5_, "broken", (GCallback) _single_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0);
 #line 186 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3814 "Commands.c"
+#line 3798 "Commands.c"
 }
 
 
@@ -3826,7 +3810,7 @@ static void single_photo_transformation_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->state;
 #line 198 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 3830 "Commands.c"
+#line 3814 "Commands.c"
 }
 
 
@@ -3843,7 +3827,7 @@ static void single_photo_transformation_command_on_state_broken (SinglePhotoTran
 	command_manager_reset (_tmp1_);
 #line 202 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3847 "Commands.c"
+#line 3831 "Commands.c"
 }
 
 
@@ -3856,14 +3840,14 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform
 	((CommandClass *) klass)->undo = (void (*) (Command *)) single_photo_transformation_command_real_undo;
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize;
-#line 3860 "Commands.c"
+#line 3844 "Commands.c"
 }
 
 
 static void single_photo_transformation_command_instance_init (SinglePhotoTransformationCommand * self) {
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self);
-#line 3867 "Commands.c"
+#line 3851 "Commands.c"
 }
 
 
@@ -3883,7 +3867,7 @@ static void single_photo_transformation_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->state);
 #line 183 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (single_photo_transformation_command_parent_class)->finalize (obj);
-#line 3887 "Commands.c"
+#line 3871 "Commands.c"
 }
 
 
@@ -3902,7 +3886,7 @@ GType single_photo_transformation_command_get_type (void) {
 static void _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
 	generic_photo_transformation_command_on_state_broken ((GenericPhotoTransformationCommand*) self);
-#line 3906 "Commands.c"
+#line 3890 "Commands.c"
 }
 
 
@@ -3927,7 +3911,7 @@ GenericPhotoTransformationCommand* generic_photo_transformation_command_construc
 	self = (GenericPhotoTransformationCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), _tmp1_, _tmp2_);
 #line 210 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 3931 "Commands.c"
+#line 3915 "Commands.c"
 }
 
 
@@ -3972,7 +3956,7 @@ static void generic_photo_transformation_command_real_execute (Command* base) {
 	g_signal_connect_object (_tmp5_, "broken", (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self, 0);
 #line 222 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 3976 "Commands.c"
+#line 3960 "Commands.c"
 }
 
 
@@ -3981,7 +3965,7 @@ static void generic_photo_transformation_command_real_execute_on_photo (GenericP
 	g_critical ("Type `%s' does not implement abstract method `generic_photo_transformation_command_execute_on_photo'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 234 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 3985 "Commands.c"
+#line 3969 "Commands.c"
 }
 
 
@@ -3990,7 +3974,7 @@ void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransfor
 	g_return_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self));
 #line 234 "/home/jens/Source/shotwell/src/Commands.vala"
 	GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->execute_on_photo (self, photo);
-#line 3994 "Commands.c"
+#line 3978 "Commands.c"
 }
 
 
@@ -4006,7 +3990,7 @@ static void generic_photo_transformation_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->original_state;
 #line 238 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 4010 "Commands.c"
+#line 3994 "Commands.c"
 }
 
 
@@ -4022,7 +4006,7 @@ static void generic_photo_transformation_command_real_redo (Command* base) {
 	_tmp1_ = self->priv->transformed_state;
 #line 243 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_load_transformation_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 4026 "Commands.c"
+#line 4010 "Commands.c"
 }
 
 
@@ -4034,7 +4018,7 @@ static gboolean generic_photo_transformation_command_real_can_compress (GenericP
 	result = FALSE;
 #line 247 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4038 "Commands.c"
+#line 4022 "Commands.c"
 }
 
 
@@ -4043,7 +4027,7 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
 	g_return_val_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self), FALSE);
 #line 246 "/home/jens/Source/shotwell/src/Commands.vala"
 	return GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_CLASS (self)->can_compress (self, command);
-#line 4047 "Commands.c"
+#line 4031 "Commands.c"
 }
 
 
@@ -4077,7 +4061,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		result = FALSE;
 #line 252 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4081 "Commands.c"
+#line 4065 "Commands.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = command;
@@ -4095,7 +4079,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		_g_object_unref0 (generic);
 #line 256 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4099 "Commands.c"
+#line 4083 "Commands.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = generic;
@@ -4111,7 +4095,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 		_g_object_unref0 (generic);
 #line 259 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 4115 "Commands.c"
+#line 4099 "Commands.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = generic;
@@ -4133,7 +4117,7 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
 	_g_object_unref0 (generic);
 #line 267 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4137 "Commands.c"
+#line 4121 "Commands.c"
 }
 
 
@@ -4150,7 +4134,7 @@ static void generic_photo_transformation_command_on_state_broken (GenericPhotoTr
 	command_manager_reset (_tmp1_);
 #line 271 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 4154 "Commands.c"
+#line 4138 "Commands.c"
 }
 
 
@@ -4173,7 +4157,7 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) generic_photo_transformation_command_real_compress;
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize;
-#line 4177 "Commands.c"
+#line 4161 "Commands.c"
 }
 
 
@@ -4184,7 +4168,7 @@ static void generic_photo_transformation_command_instance_init (GenericPhotoTran
 	self->priv->original_state = NULL;
 #line 208 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->transformed_state = NULL;
-#line 4188 "Commands.c"
+#line 4172 "Commands.c"
 }
 
 
@@ -4198,7 +4182,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 	_tmp0_ = self->priv->original_state;
 #line 215 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ != NULL) {
-#line 4202 "Commands.c"
+#line 4186 "Commands.c"
 		PhotoTransformationState* _tmp1_;
 		guint _tmp2_;
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4207,13 +4191,13 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 		g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp2_, NULL, FALSE);
 #line 216 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
-#line 4211 "Commands.c"
+#line 4195 "Commands.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = self->priv->transformed_state;
 #line 218 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 4217 "Commands.c"
+#line 4201 "Commands.c"
 		PhotoTransformationState* _tmp4_;
 		guint _tmp5_;
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4222,7 +4206,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 		g_signal_parse_name ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, &_tmp5_, NULL, FALSE);
 #line 219 "/home/jens/Source/shotwell/src/Commands.vala"
 		g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _generic_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
-#line 4226 "Commands.c"
+#line 4210 "Commands.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->original_state);
@@ -4230,7 +4214,7 @@ static void generic_photo_transformation_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->transformed_state);
 #line 206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (generic_photo_transformation_command_parent_class)->finalize (obj);
-#line 4234 "Commands.c"
+#line 4218 "Commands.c"
 }
 
 
@@ -4249,7 +4233,7 @@ GType generic_photo_transformation_command_get_type (void) {
 static void _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 309 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_command_on_source_destroyed ((MultipleDataSourceCommand*) self, source);
-#line 4253 "Commands.c"
+#line 4237 "Commands.c"
 }
 
 
@@ -4293,7 +4277,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 	_g_free0 (self->priv->undo_progress_text);
 #line 290 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->undo_progress_text = _tmp5_;
-#line 4297 "Commands.c"
+#line 4281 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp6_;
@@ -4306,7 +4290,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 		_view_it = _tmp7_;
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4310 "Commands.c"
+#line 4294 "Commands.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			DataView* view = NULL;
@@ -4329,7 +4313,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			if (!_tmp9_) {
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4333 "Commands.c"
+#line 4317 "Commands.c"
 			}
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _view_it;
@@ -4353,7 +4337,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			_tmp16_ = collection;
 #line 296 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 4357 "Commands.c"
+#line 4341 "Commands.c"
 				GeeHashSet* _tmp17_;
 				SourceCollection* _tmp18_;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4362,7 +4346,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 				_tmp18_ = collection;
 #line 297 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 4366 "Commands.c"
+#line 4350 "Commands.c"
 			}
 #line 299 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = self->source_list;
@@ -4376,11 +4360,11 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			_g_object_unref0 (source);
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 4380 "Commands.c"
+#line 4364 "Commands.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 4384 "Commands.c"
+#line 4368 "Commands.c"
 	}
 	{
 		GeeIterator* _current_collection_it = NULL;
@@ -4394,7 +4378,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 		_current_collection_it = _tmp22_;
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4398 "Commands.c"
+#line 4382 "Commands.c"
 			GeeIterator* _tmp23_;
 			gboolean _tmp24_;
 			SourceCollection* current_collection = NULL;
@@ -4409,7 +4393,7 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			if (!_tmp24_) {
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4413 "Commands.c"
+#line 4397 "Commands.c"
 			}
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _current_collection_it;
@@ -4423,15 +4407,15 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
 			g_signal_connect_object (_tmp27_, "item-destroyed", (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (current_collection);
-#line 4427 "Commands.c"
+#line 4411 "Commands.c"
 		}
 #line 302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 4431 "Commands.c"
+#line 4415 "Commands.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 4435 "Commands.c"
+#line 4419 "Commands.c"
 }
 
 
@@ -4449,7 +4433,7 @@ GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand
 	result = _tmp1_;
 #line 314 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4453 "Commands.c"
+#line 4437 "Commands.c"
 }
 
 
@@ -4470,7 +4454,7 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s
 	result = _tmp2_;
 #line 318 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 4474 "Commands.c"
+#line 4458 "Commands.c"
 }
 
 
@@ -4490,7 +4474,7 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
 #line 324 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
-#line 4494 "Commands.c"
+#line 4478 "Commands.c"
 		CommandManager* _tmp3_;
 		CommandManager* _tmp4_;
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4501,7 +4485,7 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
 		command_manager_reset (_tmp4_);
 #line 325 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp4_);
-#line 4505 "Commands.c"
+#line 4489 "Commands.c"
 	}
 }
 
@@ -4527,7 +4511,7 @@ static void multiple_data_source_command_real_execute (Command* base) {
 	multiple_data_source_command_execute_all (self, TRUE, TRUE, _tmp1_, _tmp2_);
 #line 333 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_command_commit_transaction (self);
-#line 4531 "Commands.c"
+#line 4515 "Commands.c"
 }
 
 
@@ -4536,7 +4520,7 @@ static void multiple_data_source_command_real_execute_on_source (MultipleDataSou
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_execute_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 336 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 4540 "Commands.c"
+#line 4524 "Commands.c"
 }
 
 
@@ -4545,7 +4529,7 @@ void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand*
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 336 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->execute_on_source (self, source);
-#line 4549 "Commands.c"
+#line 4533 "Commands.c"
 }
 
 
@@ -4564,7 +4548,7 @@ static void multiple_data_source_command_real_undo (Command* base) {
 	_tmp2_ = _tmp1_;
 #line 339 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ > 0) {
-#line 4568 "Commands.c"
+#line 4552 "Commands.c"
 		GeeArrayList* _tmp3_;
 		GeeArrayList* _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4579,7 +4563,7 @@ static void multiple_data_source_command_real_undo (Command* base) {
 		_tmp4_ = self->priv->acted_upon;
 #line 344 "/home/jens/Source/shotwell/src/Commands.vala"
 		gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 4583 "Commands.c"
+#line 4567 "Commands.c"
 	}
 }
 
@@ -4589,7 +4573,7 @@ static void multiple_data_source_command_real_undo_on_source (MultipleDataSource
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_command_undo_on_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 348 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 4593 "Commands.c"
+#line 4577 "Commands.c"
 }
 
 
@@ -4598,21 +4582,21 @@ void multiple_data_source_command_undo_on_source (MultipleDataSourceCommand* sel
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
 #line 348 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_COMMAND_GET_CLASS (self)->undo_on_source (self, source);
-#line 4602 "Commands.c"
+#line 4586 "Commands.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 352 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4609 "Commands.c"
+#line 4593 "Commands.c"
 }
 
 
 static void multiple_data_source_command_start_transaction (MultipleDataSourceCommand* self) {
 #line 350 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
-#line 4616 "Commands.c"
+#line 4600 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -4625,7 +4609,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 		_sources_it = _tmp1_;
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4629 "Commands.c"
+#line 4613 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
@@ -4643,7 +4627,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 			if (!_tmp3_) {
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4647 "Commands.c"
+#line 4631 "Commands.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _sources_it;
@@ -4661,7 +4645,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 			_tmp8_ = media_collection;
 #line 353 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
-#line 4665 "Commands.c"
+#line 4649 "Commands.c"
 				MediaSourceCollection* _tmp9_;
 				TransactionController* _tmp10_;
 				TransactionController* _tmp11_;
@@ -4673,17 +4657,17 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 				_tmp11_ = _tmp10_;
 #line 354 "/home/jens/Source/shotwell/src/Commands.vala"
 				transaction_controller_begin (_tmp11_);
-#line 4677 "Commands.c"
+#line 4661 "Commands.c"
 			}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (media_collection);
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (sources);
-#line 4683 "Commands.c"
+#line 4667 "Commands.c"
 		}
 #line 351 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 4687 "Commands.c"
+#line 4671 "Commands.c"
 	}
 }
 
@@ -4691,7 +4675,7 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
 static void multiple_data_source_command_commit_transaction (MultipleDataSourceCommand* self) {
 #line 358 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
-#line 4695 "Commands.c"
+#line 4679 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -4704,7 +4688,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 		_sources_it = _tmp1_;
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4708 "Commands.c"
+#line 4692 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* sources = NULL;
@@ -4722,7 +4706,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 			if (!_tmp3_) {
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4726 "Commands.c"
+#line 4710 "Commands.c"
 			}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _sources_it;
@@ -4740,7 +4724,7 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 			_tmp8_ = media_collection;
 #line 361 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ != NULL) {
-#line 4744 "Commands.c"
+#line 4728 "Commands.c"
 				MediaSourceCollection* _tmp9_;
 				TransactionController* _tmp10_;
 				TransactionController* _tmp11_;
@@ -4752,17 +4736,17 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
 				_tmp11_ = _tmp10_;
 #line 362 "/home/jens/Source/shotwell/src/Commands.vala"
 				transaction_controller_commit (_tmp11_);
-#line 4756 "Commands.c"
+#line 4740 "Commands.c"
 			}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (media_collection);
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (sources);
-#line 4762 "Commands.c"
+#line 4746 "Commands.c"
 		}
 #line 359 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 4766 "Commands.c"
+#line 4750 "Commands.c"
 	}
 }
 
@@ -4822,26 +4806,26 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	if (_tmp6_ <= 0) {
 #line 374 "/home/jens/Source/shotwell/src/Commands.vala"
 		two_percent = 1;
-#line 4826 "Commands.c"
+#line 4810 "Commands.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = exec;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_) {
-#line 4832 "Commands.c"
+#line 4816 "Commands.c"
 		const gchar* _tmp9_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = self->priv->progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp9_;
-#line 4838 "Commands.c"
+#line 4822 "Commands.c"
 	} else {
 		const gchar* _tmp10_;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->undo_progress_text;
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = _tmp10_;
-#line 4845 "Commands.c"
+#line 4829 "Commands.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = g_strdup (_tmp7_);
@@ -4855,7 +4839,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	_tmp12_ = total;
 #line 380 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp12_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) {
-#line 4859 "Commands.c"
+#line 4843 "Commands.c"
 		GCancellable* _tmp13_ = NULL;
 		gboolean _tmp14_;
 		GCancellable* _tmp16_;
@@ -4868,7 +4852,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_tmp14_ = can_cancel;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp14_) {
-#line 4872 "Commands.c"
+#line 4856 "Commands.c"
 			GCancellable* _tmp15_;
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = g_cancellable_new ();
@@ -4876,13 +4860,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			_g_object_unref0 (_tmp13_);
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _tmp15_;
-#line 4880 "Commands.c"
+#line 4864 "Commands.c"
 		} else {
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp13_);
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = NULL;
-#line 4886 "Commands.c"
+#line 4870 "Commands.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp16_ = _g_object_ref0 (_tmp13_);
@@ -4910,7 +4894,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_g_object_unref0 (_tmp18_);
 #line 380 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp13_);
-#line 4914 "Commands.c"
+#line 4898 "Commands.c"
 	}
 	{
 		GeeArrayList* _source_list = NULL;
@@ -4939,7 +4923,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 		_source_index = -1;
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 4943 "Commands.c"
+#line 4927 "Commands.c"
 			gint _tmp27_;
 			gint _tmp28_;
 			gint _tmp29_;
@@ -4962,7 +4946,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			if (!(_tmp28_ < _tmp29_)) {
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 4966 "Commands.c"
+#line 4950 "Commands.c"
 			}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp30_ = _source_list;
@@ -4976,26 +4960,26 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 			_tmp33_ = exec;
 #line 386 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp33_) {
-#line 4980 "Commands.c"
+#line 4964 "Commands.c"
 				DataSource* _tmp34_;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp34_ = source;
 #line 387 "/home/jens/Source/shotwell/src/Commands.vala"
 				multiple_data_source_command_execute_on_source (self, _tmp34_);
-#line 4986 "Commands.c"
+#line 4970 "Commands.c"
 			} else {
 				DataSource* _tmp35_;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp35_ = source;
 #line 389 "/home/jens/Source/shotwell/src/Commands.vala"
 				multiple_data_source_command_undo_on_source (self, _tmp35_);
-#line 4993 "Commands.c"
+#line 4977 "Commands.c"
 			}
 #line 391 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp36_ = completed;
 #line 391 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_ != NULL) {
-#line 4999 "Commands.c"
+#line 4983 "Commands.c"
 				GeeArrayList* _tmp37_;
 				DataSource* _tmp38_;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5004,13 +4988,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 				_tmp38_ = source;
 #line 392 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 5008 "Commands.c"
+#line 4992 "Commands.c"
 			}
 #line 394 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp39_ = progress;
 #line 394 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp39_ != NULL) {
-#line 5014 "Commands.c"
+#line 4998 "Commands.c"
 				gint _tmp40_;
 				gint _tmp41_;
 				gint _tmp42_;
@@ -5026,7 +5010,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 				_tmp42_ = two_percent;
 #line 395 "/home/jens/Source/shotwell/src/Commands.vala"
 				if ((_tmp41_ % _tmp42_) == 0) {
-#line 5030 "Commands.c"
+#line 5014 "Commands.c"
 					ProgressDialog* _tmp43_;
 					gint _tmp44_;
 					gint _tmp45_;
@@ -5040,13 +5024,13 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					progress_dialog_set_fraction (_tmp43_, _tmp44_, _tmp45_);
 #line 397 "/home/jens/Source/shotwell/src/Commands.vala"
 					spin_event_loop ();
-#line 5044 "Commands.c"
+#line 5028 "Commands.c"
 				}
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp47_ = cancellable;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp47_ != NULL) {
-#line 5050 "Commands.c"
+#line 5034 "Commands.c"
 					GCancellable* _tmp48_;
 					gboolean _tmp49_;
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5055,11 +5039,11 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					_tmp49_ = g_cancellable_is_cancelled (_tmp48_);
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp46_ = _tmp49_;
-#line 5059 "Commands.c"
+#line 5043 "Commands.c"
 				} else {
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp46_ = FALSE;
-#line 5063 "Commands.c"
+#line 5047 "Commands.c"
 				}
 #line 400 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp46_) {
@@ -5067,28 +5051,28 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 					_g_object_unref0 (source);
 #line 401 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 5071 "Commands.c"
+#line 5055 "Commands.c"
 				}
 			}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5076 "Commands.c"
+#line 5060 "Commands.c"
 		}
 #line 385 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 5080 "Commands.c"
+#line 5064 "Commands.c"
 	}
 #line 405 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp50_ = progress;
 #line 405 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp50_ != NULL) {
-#line 5086 "Commands.c"
+#line 5070 "Commands.c"
 		ProgressDialog* _tmp51_;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp51_ = progress;
 #line 406 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp51_);
-#line 5092 "Commands.c"
+#line 5076 "Commands.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp52_ = app_window_get_instance ();
@@ -5104,7 +5088,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
 	_g_object_unref0 (cancellable);
 #line 366 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (text);
-#line 5108 "Commands.c"
+#line 5092 "Commands.c"
 }
 
 
@@ -5123,7 +5107,7 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_undo_on_source;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize;
-#line 5127 "Commands.c"
+#line 5111 "Commands.c"
 }
 
 
@@ -5145,7 +5129,7 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman
 	_tmp2_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 283 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp2_;
-#line 5149 "Commands.c"
+#line 5133 "Commands.c"
 }
 
 
@@ -5153,7 +5137,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 	MultipleDataSourceCommand * self;
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
-#line 5157 "Commands.c"
+#line 5141 "Commands.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -5166,7 +5150,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 		_current_collection_it = _tmp1_;
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5170 "Commands.c"
+#line 5154 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* current_collection = NULL;
@@ -5182,7 +5166,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 			if (!_tmp3_) {
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5186 "Commands.c"
+#line 5170 "Commands.c"
 			}
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _current_collection_it;
@@ -5198,11 +5182,11 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_command_on_source_destroyed_source_collection_item_destroyed, self);
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (current_collection);
-#line 5202 "Commands.c"
+#line 5186 "Commands.c"
 		}
 #line 308 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 5206 "Commands.c"
+#line 5190 "Commands.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->source_list);
@@ -5216,7 +5200,7 @@ static void multiple_data_source_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->hooked_collections);
 #line 275 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_data_source_command_parent_class)->finalize (obj);
-#line 5220 "Commands.c"
+#line 5204 "Commands.c"
 }
 
 
@@ -5235,7 +5219,7 @@ GType multiple_data_source_command_get_type (void) {
 static void _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 435 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_data_source_at_once_command_on_sources_destroyed ((MultipleDataSourceAtOnceCommand*) self, destroyed);
-#line 5239 "Commands.c"
+#line 5223 "Commands.c"
 }
 
 
@@ -5263,7 +5247,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 	_tmp3_ = sources;
 #line 421 "/home/jens/Source/shotwell/src/Commands.vala"
 	gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), _tmp3_);
-#line 5267 "Commands.c"
+#line 5251 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeHashSet* _tmp4_;
@@ -5276,7 +5260,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 		_source_it = _tmp5_;
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5280 "Commands.c"
+#line 5264 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataSource* source = NULL;
@@ -5295,7 +5279,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (!_tmp7_) {
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5299 "Commands.c"
+#line 5283 "Commands.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _source_it;
@@ -5313,7 +5297,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (_tmp12_ == NULL) {
 #line 424 "/home/jens/Source/shotwell/src/Commands.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 5317 "Commands.c"
+#line 5301 "Commands.c"
 			}
 #line 424 "/home/jens/Source/shotwell/src/Commands.vala"
 			membership = _tmp12_;
@@ -5321,7 +5305,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			_tmp13_ = membership;
 #line 425 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp13_ != NULL) {
-#line 5325 "Commands.c"
+#line 5309 "Commands.c"
 				GeeHashSet* _tmp14_;
 				SourceCollection* _tmp15_;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5330,17 +5314,17 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 				_tmp15_ = membership;
 #line 426 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
-#line 5334 "Commands.c"
+#line 5318 "Commands.c"
 			}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (membership);
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5340 "Commands.c"
+#line 5324 "Commands.c"
 		}
 #line 423 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 5344 "Commands.c"
+#line 5328 "Commands.c"
 	}
 	{
 		GeeIterator* _source_collection_it = NULL;
@@ -5354,7 +5338,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 		_source_collection_it = _tmp17_;
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5358 "Commands.c"
+#line 5342 "Commands.c"
 			GeeIterator* _tmp18_;
 			gboolean _tmp19_;
 			SourceCollection* source_collection = NULL;
@@ -5369,7 +5353,7 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			if (!_tmp19_) {
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5373 "Commands.c"
+#line 5357 "Commands.c"
 			}
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = _source_collection_it;
@@ -5383,15 +5367,15 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
 			g_signal_connect_object (_tmp22_, "items-destroyed", (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self, 0);
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (source_collection);
-#line 5387 "Commands.c"
+#line 5371 "Commands.c"
 		}
 #line 429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_collection_it);
-#line 5391 "Commands.c"
+#line 5375 "Commands.c"
 	}
 #line 417 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 5395 "Commands.c"
+#line 5379 "Commands.c"
 }
 
 
@@ -5437,7 +5421,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 	media_collection_registry_thaw_all (_tmp6_);
 #line 446 "/home/jens/Source/shotwell/src/Commands.vala"
 	_media_collection_registry_unref0 (_tmp6_);
-#line 5441 "Commands.c"
+#line 5425 "Commands.c"
 	{
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 		database_table_commit_transaction (&_inner_error_);
@@ -5445,8 +5429,8 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5449 "Commands.c"
-				goto __catch456_database_error;
+#line 5433 "Commands.c"
+				goto __catch464_database_error;
 			}
 			{
 				AppWindow* _tmp7_;
@@ -5459,7 +5443,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp8_);
-#line 5463 "Commands.c"
+#line 5447 "Commands.c"
 			}
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5467,11 +5451,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 			g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 5471 "Commands.c"
+#line 5455 "Commands.c"
 		}
 	}
-	goto __finally456;
-	__catch456_database_error:
+	goto __finally464;
+	__catch464_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -5485,9 +5469,9 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		app_window_database_error (_tmp9_);
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 5489 "Commands.c"
+#line 5473 "Commands.c"
 	}
-	__finally456:
+	__finally464:
 	{
 		AppWindow* _tmp10_;
 		AppWindow* _tmp11_;
@@ -5499,7 +5483,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
 #line 452 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5503 "Commands.c"
+#line 5487 "Commands.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5509,7 +5493,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 5513 "Commands.c"
+#line 5497 "Commands.c"
 	}
 }
 
@@ -5519,7 +5503,7 @@ static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDa
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_execute_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 456 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 5523 "Commands.c"
+#line 5507 "Commands.c"
 }
 
 
@@ -5528,7 +5512,7 @@ void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOn
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 456 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->execute_on_all (self, sources);
-#line 5532 "Commands.c"
+#line 5516 "Commands.c"
 }
 
 
@@ -5574,7 +5558,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 	media_collection_registry_thaw_all (_tmp6_);
 #line 466 "/home/jens/Source/shotwell/src/Commands.vala"
 	_media_collection_registry_unref0 (_tmp6_);
-#line 5578 "Commands.c"
+#line 5562 "Commands.c"
 	{
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 		database_table_commit_transaction (&_inner_error_);
@@ -5582,8 +5566,8 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5586 "Commands.c"
-				goto __catch457_database_error;
+#line 5570 "Commands.c"
+				goto __catch465_database_error;
 			}
 			{
 				AppWindow* _tmp7_;
@@ -5596,7 +5580,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp8_);
-#line 5600 "Commands.c"
+#line 5584 "Commands.c"
 			}
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5604,11 +5588,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 			g_clear_error (&_inner_error_);
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 5608 "Commands.c"
+#line 5592 "Commands.c"
 		}
 	}
-	goto __finally457;
-	__catch457_database_error:
+	goto __finally465;
+	__catch465_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -5622,9 +5606,9 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		app_window_database_error (_tmp9_);
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 5626 "Commands.c"
+#line 5610 "Commands.c"
 	}
-	__finally457:
+	__finally465:
 	{
 		AppWindow* _tmp10_;
 		AppWindow* _tmp11_;
@@ -5636,7 +5620,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
 #line 472 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5640 "Commands.c"
+#line 5624 "Commands.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5646,7 +5630,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		g_clear_error (&_inner_error_);
 #line 467 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 5650 "Commands.c"
+#line 5634 "Commands.c"
 	}
 }
 
@@ -5656,7 +5640,7 @@ static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataS
 	g_critical ("Type `%s' does not implement abstract method `multiple_data_source_at_once_command_undo_on_all'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 476 "/home/jens/Source/shotwell/src/Commands.vala"
 	return;
-#line 5660 "Commands.c"
+#line 5644 "Commands.c"
 }
 
 
@@ -5665,7 +5649,7 @@ void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceC
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 476 "/home/jens/Source/shotwell/src/Commands.vala"
 	MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_CLASS (self)->undo_on_all (self, sources);
-#line 5669 "Commands.c"
+#line 5653 "Commands.c"
 }
 
 
@@ -5674,7 +5658,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 	g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (self));
 #line 478 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 5678 "Commands.c"
+#line 5662 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -5687,7 +5671,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 		_source_it = _tmp1_;
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5691 "Commands.c"
+#line 5675 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -5704,7 +5688,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 			if (!_tmp3_) {
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5708 "Commands.c"
+#line 5692 "Commands.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -5720,7 +5704,7 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 			_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
 #line 480 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
-#line 5724 "Commands.c"
+#line 5708 "Commands.c"
 				CommandManager* _tmp9_;
 				CommandManager* _tmp10_;
 #line 481 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5735,15 +5719,15 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
 				_g_object_unref0 (source);
 #line 483 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5739 "Commands.c"
+#line 5723 "Commands.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5743 "Commands.c"
+#line 5727 "Commands.c"
 		}
 #line 479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 5747 "Commands.c"
+#line 5731 "Commands.c"
 	}
 }
 
@@ -5763,7 +5747,7 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize;
-#line 5767 "Commands.c"
+#line 5751 "Commands.c"
 }
 
 
@@ -5780,7 +5764,7 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour
 	_tmp1_ = gee_hash_set_new (TYPE_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->hooked_collections = _tmp1_;
-#line 5784 "Commands.c"
+#line 5768 "Commands.c"
 }
 
 
@@ -5788,7 +5772,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 	MultipleDataSourceAtOnceCommand * self;
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
-#line 5792 "Commands.c"
+#line 5776 "Commands.c"
 	{
 		GeeIterator* _source_collection_it = NULL;
 		GeeHashSet* _tmp0_;
@@ -5801,7 +5785,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 		_source_collection_it = _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5805 "Commands.c"
+#line 5789 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			SourceCollection* source_collection = NULL;
@@ -5817,7 +5801,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 			if (!_tmp3_) {
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5821 "Commands.c"
+#line 5805 "Commands.c"
 			}
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_collection_it;
@@ -5833,11 +5817,11 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _multiple_data_source_at_once_command_on_sources_destroyed_source_collection_items_destroyed, self);
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_data_collection_unref0 (source_collection);
-#line 5837 "Commands.c"
+#line 5821 "Commands.c"
 		}
 #line 434 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_collection_it);
-#line 5841 "Commands.c"
+#line 5825 "Commands.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->sources);
@@ -5845,7 +5829,7 @@ static void multiple_data_source_at_once_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->hooked_collections);
 #line 413 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_data_source_at_once_command_parent_class)->finalize (obj);
-#line 5849 "Commands.c"
+#line 5833 "Commands.c"
 }
 
 
@@ -5864,7 +5848,7 @@ GType multiple_data_source_at_once_command_get_type (void) {
 static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self) {
 #line 508 "/home/jens/Source/shotwell/src/Commands.vala"
 	multiple_photo_transformation_command_on_state_broken ((MultiplePhotoTransformationCommand*) self);
-#line 5868 "Commands.c"
+#line 5852 "Commands.c"
 }
 
 
@@ -5897,7 +5881,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 	_tmp4_ = explanation;
 #line 495 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (MultiplePhotoTransformationCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 5901 "Commands.c"
+#line 5885 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
 		GeeArrayList* _tmp5_;
@@ -5925,7 +5909,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 		_source_index = -1;
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 5929 "Commands.c"
+#line 5913 "Commands.c"
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
@@ -5955,7 +5939,7 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 			if (!(_tmp11_ < _tmp12_)) {
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 5959 "Commands.c"
+#line 5943 "Commands.c"
 			}
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_list;
@@ -5995,15 +5979,15 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
 			_g_object_unref0 (photo);
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 5999 "Commands.c"
+#line 5983 "Commands.c"
 		}
 #line 497 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 6003 "Commands.c"
+#line 5987 "Commands.c"
 	}
 #line 493 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6007 "Commands.c"
+#line 5991 "Commands.c"
 }
 
 
@@ -6039,7 +6023,7 @@ static void multiple_photo_transformation_command_real_undo_on_source (MultipleD
 	_g_object_unref0 (state);
 #line 511 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 6043 "Commands.c"
+#line 6027 "Commands.c"
 }
 
 
@@ -6056,7 +6040,7 @@ static void multiple_photo_transformation_command_on_state_broken (MultiplePhoto
 	command_manager_reset (_tmp1_);
 #line 521 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 6060 "Commands.c"
+#line 6044 "Commands.c"
 }
 
 
@@ -6069,7 +6053,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize;
-#line 6073 "Commands.c"
+#line 6057 "Commands.c"
 }
 
 
@@ -6081,7 +6065,7 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr
 	_tmp0_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_PHOTO_TRANSFORMATION_STATE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
-#line 6085 "Commands.c"
+#line 6069 "Commands.c"
 }
 
 
@@ -6089,7 +6073,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 	MultiplePhotoTransformationCommand * self;
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
-#line 6093 "Commands.c"
+#line 6077 "Commands.c"
 	{
 		GeeIterator* _state_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -6116,7 +6100,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 		_state_it = _tmp5_;
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6120 "Commands.c"
+#line 6104 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			PhotoTransformationState* state = NULL;
@@ -6132,7 +6116,7 @@ static void multiple_photo_transformation_command_finalize (GObject * obj) {
 			if (!_tmp7_) {
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6136 "Commands.c"
+#line 6120 "Commands.c"
 			}
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _state_it;
@@ -6148,17 +6132,17 @@ static void multiple_photo_transformation_command_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) _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken, self);
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (state);
-#line 6152 "Commands.c"
+#line 6136 "Commands.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_state_it);
-#line 6156 "Commands.c"
+#line 6140 "Commands.c"
 	}
 #line 490 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->map);
 #line 489 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (multiple_photo_transformation_command_parent_class)->finalize (obj);
-#line 6162 "Commands.c"
+#line 6146 "Commands.c"
 }
 
 
@@ -6200,14 +6184,14 @@ RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo*
 	self->priv->rotation = _tmp3_;
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6204 "Commands.c"
+#line 6188 "Commands.c"
 }
 
 
 RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) {
 #line 528 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rotate_single_command_construct (TYPE_ROTATE_SINGLE_COMMAND, photo, rotation, name, explanation);
-#line 6211 "Commands.c"
+#line 6195 "Commands.c"
 }
 
 
@@ -6223,7 +6207,7 @@ static void rotate_single_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->rotation;
 #line 535 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 6227 "Commands.c"
+#line 6211 "Commands.c"
 }
 
 
@@ -6242,7 +6226,7 @@ static void rotate_single_command_real_undo (Command* base) {
 	_tmp2_ = rotation_opposite (_tmp1_);
 #line 539 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_);
-#line 6246 "Commands.c"
+#line 6230 "Commands.c"
 }
 
 
@@ -6257,14 +6241,14 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass)
 	((CommandClass *) klass)->undo = (void (*) (Command *)) rotate_single_command_real_undo;
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize;
-#line 6261 "Commands.c"
+#line 6245 "Commands.c"
 }
 
 
 static void rotate_single_command_instance_init (RotateSingleCommand * self) {
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ROTATE_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 6268 "Commands.c"
+#line 6252 "Commands.c"
 }
 
 
@@ -6274,7 +6258,7 @@ static void rotate_single_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
 #line 525 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rotate_single_command_parent_class)->finalize (obj);
-#line 6278 "Commands.c"
+#line 6262 "Commands.c"
 }
 
 
@@ -6326,14 +6310,14 @@ RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, Gee
 	self->priv->rotation = _tmp5_;
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6330 "Commands.c"
+#line 6314 "Commands.c"
 }
 
 
 RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) {
 #line 546 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rotate_multiple_command_construct (TYPE_ROTATE_MULTIPLE_COMMAND, iter, rotation, name, explanation, progress_text, undo_progress_text);
-#line 6337 "Commands.c"
+#line 6321 "Commands.c"
 }
 
 
@@ -6351,7 +6335,7 @@ static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCo
 	_tmp1_ = self->priv->rotation;
 #line 554 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 6355 "Commands.c"
+#line 6339 "Commands.c"
 }
 
 
@@ -6372,7 +6356,7 @@ static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceComma
 	_tmp2_ = rotation_opposite (_tmp1_);
 #line 558 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_rotate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp2_);
-#line 6376 "Commands.c"
+#line 6360 "Commands.c"
 }
 
 
@@ -6387,14 +6371,14 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_undo_on_source;
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize;
-#line 6391 "Commands.c"
+#line 6375 "Commands.c"
 }
 
 
 static void rotate_multiple_command_instance_init (RotateMultipleCommand * self) {
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ROTATE_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 6398 "Commands.c"
+#line 6382 "Commands.c"
 }
 
 
@@ -6404,7 +6388,7 @@ static void rotate_multiple_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
 #line 543 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rotate_multiple_command_parent_class)->finalize (obj);
-#line 6408 "Commands.c"
+#line 6392 "Commands.c"
 }
 
 
@@ -6461,14 +6445,14 @@ EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource*
 	_g_free0 (title);
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6465 "Commands.c"
+#line 6449 "Commands.c"
 }
 
 
 EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title) {
 #line 566 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_title_command_construct (TYPE_EDIT_TITLE_COMMAND, source, new_title);
-#line 6472 "Commands.c"
+#line 6456 "Commands.c"
 }
 
 
@@ -6484,7 +6468,7 @@ static void edit_title_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_title;
 #line 576 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6488 "Commands.c"
+#line 6472 "Commands.c"
 }
 
 
@@ -6500,7 +6484,7 @@ static void edit_title_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_title;
 #line 580 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6504 "Commands.c"
+#line 6488 "Commands.c"
 }
 
 
@@ -6515,14 +6499,14 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_title_command_real_undo;
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize;
-#line 6519 "Commands.c"
+#line 6503 "Commands.c"
 }
 
 
 static void edit_title_command_instance_init (EditTitleCommand * self) {
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_TITLE_COMMAND_GET_PRIVATE (self);
-#line 6526 "Commands.c"
+#line 6510 "Commands.c"
 }
 
 
@@ -6536,7 +6520,7 @@ static void edit_title_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_title);
 #line 562 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_title_command_parent_class)->finalize (obj);
-#line 6540 "Commands.c"
+#line 6524 "Commands.c"
 }
 
 
@@ -6585,14 +6569,14 @@ EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSour
 	self->priv->old_comment = _tmp4_;
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6589 "Commands.c"
+#line 6573 "Commands.c"
 }
 
 
 EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment) {
 #line 588 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_comment_command_construct (TYPE_EDIT_COMMENT_COMMAND, source, new_comment);
-#line 6596 "Commands.c"
+#line 6580 "Commands.c"
 }
 
 
@@ -6608,7 +6592,7 @@ static void edit_comment_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_comment;
 #line 596 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6612 "Commands.c"
+#line 6596 "Commands.c"
 }
 
 
@@ -6624,7 +6608,7 @@ static void edit_comment_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_comment;
 #line 600 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6628 "Commands.c"
+#line 6612 "Commands.c"
 }
 
 
@@ -6639,14 +6623,14 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) edit_comment_command_real_undo;
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize;
-#line 6643 "Commands.c"
+#line 6627 "Commands.c"
 }
 
 
 static void edit_comment_command_instance_init (EditCommentCommand * self) {
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 6650 "Commands.c"
+#line 6634 "Commands.c"
 }
 
 
@@ -6660,7 +6644,7 @@ static void edit_comment_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_comment);
 #line 584 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_comment_command_parent_class)->finalize (obj);
-#line 6664 "Commands.c"
+#line 6648 "Commands.c"
 }
 
 
@@ -6706,7 +6690,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 	_g_free0 (self->new_title);
 #line 613 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->new_title = _tmp4_;
-#line 6710 "Commands.c"
+#line 6694 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp5_;
@@ -6719,7 +6703,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 		_media_it = _tmp6_;
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6723 "Commands.c"
+#line 6707 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			MediaSource* media = NULL;
@@ -6738,7 +6722,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 			if (!_tmp8_) {
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6742 "Commands.c"
+#line 6726 "Commands.c"
 			}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _media_it;
@@ -6762,24 +6746,24 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_
 			_g_free0 (_tmp15_);
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 6766 "Commands.c"
+#line 6750 "Commands.c"
 		}
 #line 614 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 6770 "Commands.c"
+#line 6754 "Commands.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (title);
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 6776 "Commands.c"
+#line 6760 "Commands.c"
 }
 
 
 EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title) {
 #line 608 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_titles_command_construct (TYPE_EDIT_MULTIPLE_TITLES_COMMAND, media_sources, new_title);
-#line 6783 "Commands.c"
+#line 6767 "Commands.c"
 }
 
 
@@ -6789,7 +6773,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 618 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6793 "Commands.c"
+#line 6777 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -6802,7 +6786,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 		_source_it = _tmp1_;
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6806 "Commands.c"
+#line 6790 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -6818,7 +6802,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			if (!_tmp3_) {
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6822 "Commands.c"
+#line 6806 "Commands.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6834,11 +6818,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
 			media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6838 "Commands.c"
+#line 6822 "Commands.c"
 		}
 #line 619 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6842 "Commands.c"
+#line 6826 "Commands.c"
 	}
 }
 
@@ -6849,7 +6833,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
 #line 623 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6853 "Commands.c"
+#line 6837 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -6862,7 +6846,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 		_source_it = _tmp1_;
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 6866 "Commands.c"
+#line 6850 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -6881,7 +6865,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			if (!_tmp3_) {
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 6885 "Commands.c"
+#line 6869 "Commands.c"
 			}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -6905,11 +6889,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
 			_g_free0 (_tmp10_);
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 6909 "Commands.c"
+#line 6893 "Commands.c"
 		}
 #line 624 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 6913 "Commands.c"
+#line 6897 "Commands.c"
 	}
 }
 
@@ -6923,7 +6907,7 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize;
-#line 6927 "Commands.c"
+#line 6911 "Commands.c"
 }
 
 
@@ -6933,7 +6917,7 @@ static void edit_multiple_titles_command_instance_init (EditMultipleTitlesComman
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 606 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_titles = _tmp0_;
-#line 6937 "Commands.c"
+#line 6921 "Commands.c"
 }
 
 
@@ -6947,7 +6931,7 @@ static void edit_multiple_titles_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->old_titles);
 #line 604 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_titles_command_parent_class)->finalize (obj);
-#line 6951 "Commands.c"
+#line 6935 "Commands.c"
 }
 
 
@@ -6984,7 +6968,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 	_g_free0 (self->new_comment);
 #line 636 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->new_comment = _tmp2_;
-#line 6988 "Commands.c"
+#line 6972 "Commands.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp3_;
@@ -6997,7 +6981,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 		_media_it = _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7001 "Commands.c"
+#line 6985 "Commands.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			MediaSource* media = NULL;
@@ -7016,7 +7000,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			if (!_tmp6_) {
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7020 "Commands.c"
+#line 7004 "Commands.c"
 			}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = _media_it;
@@ -7040,22 +7024,22 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
 			_g_free0 (_tmp13_);
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (media);
-#line 7044 "Commands.c"
+#line 7028 "Commands.c"
 		}
 #line 637 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_media_it);
-#line 7048 "Commands.c"
+#line 7032 "Commands.c"
 	}
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7052 "Commands.c"
+#line 7036 "Commands.c"
 }
 
 
 EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment) {
 #line 633 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_multiple_comments_command_construct (TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, media_sources, new_comment);
-#line 7059 "Commands.c"
+#line 7043 "Commands.c"
 }
 
 
@@ -7065,7 +7049,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 641 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7069 "Commands.c"
+#line 7053 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -7078,7 +7062,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 		_source_it = _tmp1_;
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7082 "Commands.c"
+#line 7066 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -7094,7 +7078,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			if (!_tmp3_) {
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7098 "Commands.c"
+#line 7082 "Commands.c"
 			}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7110,11 +7094,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
 			media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7114 "Commands.c"
+#line 7098 "Commands.c"
 		}
 #line 642 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7118 "Commands.c"
+#line 7102 "Commands.c"
 	}
 }
 
@@ -7125,7 +7109,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
 #line 646 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7129 "Commands.c"
+#line 7113 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -7138,7 +7122,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 		_source_it = _tmp1_;
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 7142 "Commands.c"
+#line 7126 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -7157,7 +7141,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			if (!_tmp3_) {
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 7161 "Commands.c"
+#line 7145 "Commands.c"
 			}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -7181,11 +7165,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
 			_g_free0 (_tmp10_);
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 7185 "Commands.c"
+#line 7169 "Commands.c"
 		}
 #line 647 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 7189 "Commands.c"
+#line 7173 "Commands.c"
 	}
 }
 
@@ -7199,7 +7183,7 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize;
-#line 7203 "Commands.c"
+#line 7187 "Commands.c"
 }
 
 
@@ -7209,7 +7193,7 @@ static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCo
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 631 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->old_comments = _tmp0_;
-#line 7213 "Commands.c"
+#line 7197 "Commands.c"
 }
 
 
@@ -7223,7 +7207,7 @@ static void edit_multiple_comments_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->old_comments);
 #line 629 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_multiple_comments_command_parent_class)->finalize (obj);
-#line 7227 "Commands.c"
+#line 7211 "Commands.c"
 }
 
 
@@ -7272,14 +7256,14 @@ RenameEventCommand* rename_event_command_construct (GType object_type, Event* ev
 	self->priv->old_name = _tmp4_;
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7276 "Commands.c"
+#line 7260 "Commands.c"
 }
 
 
 RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name) {
 #line 656 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_event_command_construct (TYPE_RENAME_EVENT_COMMAND, event, new_name);
-#line 7283 "Commands.c"
+#line 7267 "Commands.c"
 }
 
 
@@ -7297,7 +7281,7 @@ static void rename_event_command_real_execute_on_source (SimpleProxyableCommand*
 	_tmp1_ = self->priv->new_name;
 #line 664 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7301 "Commands.c"
+#line 7285 "Commands.c"
 }
 
 
@@ -7315,7 +7299,7 @@ static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* ba
 	_tmp1_ = self->priv->old_name;
 #line 668 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7319 "Commands.c"
+#line 7303 "Commands.c"
 }
 
 
@@ -7330,14 +7314,14 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_undo_on_source;
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize;
-#line 7334 "Commands.c"
+#line 7318 "Commands.c"
 }
 
 
 static void rename_event_command_instance_init (RenameEventCommand * self) {
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_EVENT_COMMAND_GET_PRIVATE (self);
-#line 7341 "Commands.c"
+#line 7325 "Commands.c"
 }
 
 
@@ -7351,7 +7335,7 @@ static void rename_event_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_name);
 #line 652 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_event_command_parent_class)->finalize (obj);
-#line 7355 "Commands.c"
+#line 7339 "Commands.c"
 }
 
 
@@ -7400,14 +7384,14 @@ EditEventCommentCommand* edit_event_comment_command_construct (GType object_type
 	self->priv->old_comment = _tmp4_;
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7404 "Commands.c"
+#line 7388 "Commands.c"
 }
 
 
 EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment) {
 #line 676 "/home/jens/Source/shotwell/src/Commands.vala"
 	return edit_event_comment_command_construct (TYPE_EDIT_EVENT_COMMENT_COMMAND, event, new_comment);
-#line 7411 "Commands.c"
+#line 7395 "Commands.c"
 }
 
 
@@ -7425,7 +7409,7 @@ static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCo
 	_tmp1_ = self->priv->new_comment;
 #line 684 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7429 "Commands.c"
+#line 7413 "Commands.c"
 }
 
 
@@ -7443,7 +7427,7 @@ static void edit_event_comment_command_real_undo_on_source (SimpleProxyableComma
 	_tmp1_ = self->priv->old_comment;
 #line 688 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7447 "Commands.c"
+#line 7431 "Commands.c"
 }
 
 
@@ -7458,14 +7442,14 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_undo_on_source;
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize;
-#line 7462 "Commands.c"
+#line 7446 "Commands.c"
 }
 
 
 static void edit_event_comment_command_instance_init (EditEventCommentCommand * self) {
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 7469 "Commands.c"
+#line 7453 "Commands.c"
 }
 
 
@@ -7479,7 +7463,7 @@ static void edit_event_comment_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->old_comment);
 #line 672 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (edit_event_comment_command_parent_class)->finalize (obj);
-#line 7483 "Commands.c"
+#line 7467 "Commands.c"
 }
 
 
@@ -7528,14 +7512,14 @@ SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* e
 	self->priv->old_primary_source = _tmp4_;
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7532 "Commands.c"
+#line 7516 "Commands.c"
 }
 
 
 SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source) {
 #line 696 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_key_photo_command_construct (TYPE_SET_KEY_PHOTO_COMMAND, event, new_primary_source);
-#line 7539 "Commands.c"
+#line 7523 "Commands.c"
 }
 
 
@@ -7551,7 +7535,7 @@ static void set_key_photo_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->new_primary_source;
 #line 704 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7555 "Commands.c"
+#line 7539 "Commands.c"
 }
 
 
@@ -7567,7 +7551,7 @@ static void set_key_photo_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->old_primary_source;
 #line 708 "/home/jens/Source/shotwell/src/Commands.vala"
 	event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7571 "Commands.c"
+#line 7555 "Commands.c"
 }
 
 
@@ -7582,14 +7566,14 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) set_key_photo_command_real_undo;
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize;
-#line 7586 "Commands.c"
+#line 7570 "Commands.c"
 }
 
 
 static void set_key_photo_command_instance_init (SetKeyPhotoCommand * self) {
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_KEY_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 7593 "Commands.c"
+#line 7577 "Commands.c"
 }
 
 
@@ -7603,7 +7587,7 @@ static void set_key_photo_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->old_primary_source);
 #line 692 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_key_photo_command_parent_class)->finalize (obj);
-#line 7607 "Commands.c"
+#line 7591 "Commands.c"
 }
 
 
@@ -7630,14 +7614,14 @@ RevertSingleCommand* revert_single_command_construct (GType object_type, Photo*
 	self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_REVERT_LABEL, "");
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7634 "Commands.c"
+#line 7618 "Commands.c"
 }
 
 
 RevertSingleCommand* revert_single_command_new (Photo* photo) {
 #line 713 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_single_command_construct (TYPE_REVERT_SINGLE_COMMAND, photo);
-#line 7641 "Commands.c"
+#line 7625 "Commands.c"
 }
 
 
@@ -7652,7 +7636,7 @@ static void revert_single_command_real_execute_on_photo (GenericPhotoTransformat
 	_tmp0_ = photo;
 #line 718 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (_tmp0_);
-#line 7656 "Commands.c"
+#line 7640 "Commands.c"
 }
 
 
@@ -7686,7 +7670,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 724 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7690 "Commands.c"
+#line 7674 "Commands.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = revert_single_command;
@@ -7702,7 +7686,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 		_g_object_unref0 (revert_single_command);
 #line 727 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7706 "Commands.c"
+#line 7690 "Commands.c"
 	}
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7710,7 +7694,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
 	_g_object_unref0 (revert_single_command);
 #line 731 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7714 "Commands.c"
+#line 7698 "Commands.c"
 }
 
 
@@ -7721,7 +7705,7 @@ static void revert_single_command_class_init (RevertSingleCommandClass * klass)
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) revert_single_command_real_execute_on_photo;
 #line 712 "/home/jens/Source/shotwell/src/Commands.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) revert_single_command_real_compress;
-#line 7725 "Commands.c"
+#line 7709 "Commands.c"
 }
 
 
@@ -7752,14 +7736,14 @@ RevertMultipleCommand* revert_multiple_command_construct (GType object_type, Gee
 	self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, "");
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7756 "Commands.c"
+#line 7740 "Commands.c"
 }
 
 
 RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter) {
 #line 736 "/home/jens/Source/shotwell/src/Commands.vala"
 	return revert_multiple_command_construct (TYPE_REVERT_MULTIPLE_COMMAND, iter);
-#line 7763 "Commands.c"
+#line 7747 "Commands.c"
 }
 
 
@@ -7774,7 +7758,7 @@ static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCo
 	_tmp0_ = source;
 #line 742 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7778 "Commands.c"
+#line 7762 "Commands.c"
 }
 
 
@@ -7783,7 +7767,7 @@ static void revert_multiple_command_class_init (RevertMultipleCommandClass * kla
 	revert_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 735 "/home/jens/Source/shotwell/src/Commands.vala"
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) revert_multiple_command_real_execute_on_source;
-#line 7787 "Commands.c"
+#line 7771 "Commands.c"
 }
 
 
@@ -7814,14 +7798,14 @@ EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo
 	self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7818 "Commands.c"
+#line 7802 "Commands.c"
 }
 
 
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo) {
 #line 747 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_single_command_construct (TYPE_ENHANCE_SINGLE_COMMAND, photo);
-#line 7825 "Commands.c"
+#line 7809 "Commands.c"
 }
 
 
@@ -7856,7 +7840,7 @@ static void enhance_single_command_real_execute_on_photo (GenericPhotoTransforma
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
 #line 763 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 7860 "Commands.c"
+#line 7844 "Commands.c"
 }
 
 
@@ -7890,7 +7874,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 769 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7894 "Commands.c"
+#line 7878 "Commands.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = enhance_single_command;
@@ -7906,7 +7890,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 		_g_object_unref0 (enhance_single_command);
 #line 772 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 7910 "Commands.c"
+#line 7894 "Commands.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = TRUE;
@@ -7914,7 +7898,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
 	_g_object_unref0 (enhance_single_command);
 #line 775 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 7918 "Commands.c"
+#line 7902 "Commands.c"
 }
 
 
@@ -7925,7 +7909,7 @@ static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) enhance_single_command_real_execute_on_photo;
 #line 746 "/home/jens/Source/shotwell/src/Commands.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) enhance_single_command_real_compress;
-#line 7929 "Commands.c"
+#line 7913 "Commands.c"
 }
 
 
@@ -7956,14 +7940,14 @@ EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, G
 	self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 7960 "Commands.c"
+#line 7944 "Commands.c"
 }
 
 
 EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter) {
 #line 780 "/home/jens/Source/shotwell/src/Commands.vala"
 	return enhance_multiple_command_construct (TYPE_ENHANCE_MULTIPLE_COMMAND, iter);
-#line 7967 "Commands.c"
+#line 7951 "Commands.c"
 }
 
 
@@ -7978,7 +7962,7 @@ static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceC
 	_tmp0_ = source;
 #line 786 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7982 "Commands.c"
+#line 7966 "Commands.c"
 }
 
 
@@ -7987,7 +7971,7 @@ static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * k
 	enhance_multiple_command_parent_class = g_type_class_peek_parent (klass);
 #line 779 "/home/jens/Source/shotwell/src/Commands.vala"
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) enhance_multiple_command_real_execute_on_source;
-#line 7991 "Commands.c"
+#line 7975 "Commands.c"
 }
 
 
@@ -8040,14 +8024,14 @@ StraightenCommand* straighten_command_construct (GType object_type, Photo* photo
 	self->priv->crop = _tmp4_;
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8044 "Commands.c"
+#line 8028 "Commands.c"
 }
 
 
 StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
 #line 794 "/home/jens/Source/shotwell/src/Commands.vala"
 	return straighten_command_construct (TYPE_STRAIGHTEN_COMMAND, photo, theta, crop, name, explanation);
-#line 8051 "Commands.c"
+#line 8035 "Commands.c"
 }
 
 
@@ -8076,13 +8060,13 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp2_ = collection;
 #line 804 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 8080 "Commands.c"
+#line 8064 "Commands.c"
 		DataCollection* _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = collection;
 #line 805 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_freeze_notifications (_tmp3_);
-#line 8086 "Commands.c"
+#line 8070 "Commands.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = photo;
@@ -8100,17 +8084,17 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
 	_tmp8_ = collection;
 #line 810 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_ != NULL) {
-#line 8104 "Commands.c"
+#line 8088 "Commands.c"
 		DataCollection* _tmp9_;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = collection;
 #line 811 "/home/jens/Source/shotwell/src/Commands.vala"
 		data_collection_thaw_notifications (_tmp9_);
-#line 8110 "Commands.c"
+#line 8094 "Commands.c"
 	}
 #line 801 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (collection);
-#line 8114 "Commands.c"
+#line 8098 "Commands.c"
 }
 
 
@@ -8123,14 +8107,14 @@ static void straighten_command_class_init (StraightenCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) straighten_command_real_execute_on_photo;
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize;
-#line 8127 "Commands.c"
+#line 8111 "Commands.c"
 }
 
 
 static void straighten_command_instance_init (StraightenCommand * self) {
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = STRAIGHTEN_COMMAND_GET_PRIVATE (self);
-#line 8134 "Commands.c"
+#line 8118 "Commands.c"
 }
 
 
@@ -8140,7 +8124,7 @@ static void straighten_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
 #line 790 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (straighten_command_parent_class)->finalize (obj);
-#line 8144 "Commands.c"
+#line 8128 "Commands.c"
 }
 
 
@@ -8184,14 +8168,14 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
 	self->priv->crop = _tmp3_;
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8188 "Commands.c"
+#line 8172 "Commands.c"
 }
 
 
 CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
 #line 818 "/home/jens/Source/shotwell/src/Commands.vala"
 	return crop_command_construct (TYPE_CROP_COMMAND, photo, crop, name, explanation);
-#line 8195 "Commands.c"
+#line 8179 "Commands.c"
 }
 
 
@@ -8209,7 +8193,7 @@ static void crop_command_real_execute_on_photo (GenericPhotoTransformationComman
 	_tmp1_ = self->priv->crop;
 #line 825 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_crop (_tmp0_, &_tmp1_);
-#line 8213 "Commands.c"
+#line 8197 "Commands.c"
 }
 
 
@@ -8222,14 +8206,14 @@ static void crop_command_class_init (CropCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) crop_command_real_execute_on_photo;
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = crop_command_finalize;
-#line 8226 "Commands.c"
+#line 8210 "Commands.c"
 }
 
 
 static void crop_command_instance_init (CropCommand * self) {
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = CROP_COMMAND_GET_PRIVATE (self);
-#line 8233 "Commands.c"
+#line 8217 "Commands.c"
 }
 
 
@@ -8239,7 +8223,7 @@ static void crop_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CROP_COMMAND, CropCommand);
 #line 815 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (crop_command_parent_class)->finalize (obj);
-#line 8243 "Commands.c"
+#line 8227 "Commands.c"
 }
 
 
@@ -8258,7 +8242,7 @@ GType crop_command_get_type (void) {
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 #line 836 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 8262 "Commands.c"
+#line 8246 "Commands.c"
 }
 
 
@@ -8295,14 +8279,14 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
 	self->priv->transformations = _tmp4_;
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8299 "Commands.c"
+#line 8283 "Commands.c"
 }
 
 
 AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 832 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_single_command_construct (TYPE_ADJUST_COLORS_SINGLE_COMMAND, photo, transformations, name, explanation);
-#line 8306 "Commands.c"
+#line 8290 "Commands.c"
 }
 
 
@@ -8340,7 +8324,7 @@ static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTran
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
 #line 844 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp5_);
-#line 8344 "Commands.c"
+#line 8328 "Commands.c"
 }
 
 
@@ -8358,7 +8342,7 @@ static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTran
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ADJUST_COLORS_SINGLE_COMMAND);
 #line 848 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 8362 "Commands.c"
+#line 8346 "Commands.c"
 }
 
 
@@ -8373,14 +8357,14 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl
 	((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) adjust_colors_single_command_real_can_compress;
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize;
-#line 8377 "Commands.c"
+#line 8361 "Commands.c"
 }
 
 
 static void adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) {
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 8384 "Commands.c"
+#line 8368 "Commands.c"
 }
 
 
@@ -8392,7 +8376,7 @@ static void adjust_colors_single_command_finalize (GObject * obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 829 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_single_command_parent_class)->finalize (obj);
-#line 8396 "Commands.c"
+#line 8380 "Commands.c"
 }
 
 
@@ -8441,14 +8425,14 @@ AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType obj
 	self->priv->transformations = _tmp4_;
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8445 "Commands.c"
+#line 8429 "Commands.c"
 }
 
 
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
 #line 855 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_colors_multiple_command_construct (TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, iter, transformations, name, explanation);
-#line 8452 "Commands.c"
+#line 8436 "Commands.c"
 }
 
 
@@ -8466,7 +8450,7 @@ static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataS
 	_tmp1_ = self->priv->transformations;
 #line 864 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 8470 "Commands.c"
+#line 8454 "Commands.c"
 }
 
 
@@ -8479,14 +8463,14 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma
 	((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize;
-#line 8483 "Commands.c"
+#line 8467 "Commands.c"
 }
 
 
 static void adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) {
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 8490 "Commands.c"
+#line 8474 "Commands.c"
 }
 
 
@@ -8498,7 +8482,7 @@ static void adjust_colors_multiple_command_finalize (GObject * obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 852 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_colors_multiple_command_parent_class)->finalize (obj);
-#line 8502 "Commands.c"
+#line 8486 "Commands.c"
 }
 
 
@@ -8542,14 +8526,14 @@ RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, Editin
 	self->priv->redeye_instance = _tmp3_;
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8546 "Commands.c"
+#line 8530 "Commands.c"
 }
 
 
 RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
 #line 871 "/home/jens/Source/shotwell/src/Commands.vala"
 	return redeye_command_construct (TYPE_REDEYE_COMMAND, photo, redeye_instance, name, explanation);
-#line 8553 "Commands.c"
+#line 8537 "Commands.c"
 }
 
 
@@ -8567,7 +8551,7 @@ static void redeye_command_real_execute_on_photo (GenericPhotoTransformationComm
 	_tmp1_ = self->priv->redeye_instance;
 #line 879 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo_add_redeye_instance (_tmp0_, &_tmp1_);
-#line 8571 "Commands.c"
+#line 8555 "Commands.c"
 }
 
 
@@ -8580,14 +8564,14 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) {
 	((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) redeye_command_real_execute_on_photo;
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize;
-#line 8584 "Commands.c"
+#line 8568 "Commands.c"
 }
 
 
 static void redeye_command_instance_init (RedeyeCommand * self) {
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = REDEYE_COMMAND_GET_PRIVATE (self);
-#line 8591 "Commands.c"
+#line 8575 "Commands.c"
 }
 
 
@@ -8597,7 +8581,7 @@ static void redeye_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REDEYE_COMMAND, RedeyeCommand);
 #line 868 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (redeye_command_parent_class)->finalize (obj);
-#line 8601 "Commands.c"
+#line 8585 "Commands.c"
 }
 
 
@@ -8629,7 +8613,7 @@ MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar
 	self = (MovePhotosCommand*) command_construct (object_type, _tmp0_, _tmp1_);
 #line 967 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8633 "Commands.c"
+#line 8617 "Commands.c"
 }
 
 
@@ -8647,7 +8631,7 @@ static void move_photos_command_real_prepare (Command* base) {
 	_tmp1_ = self->real_command;
 #line 973 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_prepare (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8651 "Commands.c"
+#line 8635 "Commands.c"
 }
 
 
@@ -8665,7 +8649,7 @@ static void move_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->real_command;
 #line 978 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8669 "Commands.c"
+#line 8653 "Commands.c"
 }
 
 
@@ -8683,21 +8667,21 @@ static void move_photos_command_real_undo (Command* base) {
 	_tmp1_ = self->real_command;
 #line 983 "/home/jens/Source/shotwell/src/Commands.vala"
 	command_undo (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8687 "Commands.c"
+#line 8671 "Commands.c"
 }
 
 
 static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	move_photos_command_real_move_photos_command_on_proxy_broken ((MovePhotosCommandRealMovePhotosCommand*) self);
-#line 8694 "Commands.c"
+#line 8678 "Commands.c"
 }
 
 
 static gpointer _source_proxy_ref0 (gpointer self) {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? source_proxy_ref (self) : NULL;
-#line 8701 "Commands.c"
+#line 8685 "Commands.c"
 }
 
 
@@ -8735,7 +8719,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	_tmp4_ = explanation;
 #line 893 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 8739 "Commands.c"
+#line 8723 "Commands.c"
 	{
 		GeeArrayList* _source_list = NULL;
 		GeeArrayList* _tmp5_;
@@ -8763,7 +8747,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 		_source_index = -1;
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 8767 "Commands.c"
+#line 8751 "Commands.c"
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
@@ -8797,7 +8781,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			if (!(_tmp11_ < _tmp12_)) {
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 8801 "Commands.c"
+#line 8785 "Commands.c"
 			}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_list;
@@ -8823,7 +8807,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp21_ = old_event;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp21_ != NULL) {
-#line 8827 "Commands.c"
+#line 8811 "Commands.c"
 				Event* _tmp22_;
 				SourceProxy* _tmp23_;
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8834,13 +8818,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = _tmp23_;
-#line 8838 "Commands.c"
+#line 8822 "Commands.c"
 			} else {
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp20_);
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = NULL;
-#line 8844 "Commands.c"
+#line 8828 "Commands.c"
 			}
 #line 899 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _source_proxy_ref0 (_tmp20_);
@@ -8850,13 +8834,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_tmp25_ = old_event_proxy;
 #line 902 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp25_ != NULL) {
-#line 8854 "Commands.c"
+#line 8838 "Commands.c"
 				SourceProxy* _tmp26_;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp26_ = old_event_proxy;
 #line 903 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
-#line 8860 "Commands.c"
+#line 8844 "Commands.c"
 			}
 #line 905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp27_ = self->priv->old_events;
@@ -8876,11 +8860,11 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 			_g_object_unref0 (current_media);
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 8880 "Commands.c"
+#line 8864 "Commands.c"
 		}
 #line 896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_list);
-#line 8884 "Commands.c"
+#line 8868 "Commands.c"
 	}
 #line 909 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = new_event;
@@ -8896,14 +8880,14 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
 	g_signal_connect_object (_tmp32_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 8900 "Commands.c"
+#line 8884 "Commands.c"
 }
 
 
 MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
 #line 891 "/home/jens/Source/shotwell/src/Commands.vala"
 	return move_photos_command_real_move_photos_command_construct (MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, new_event, source_views, progress_text, undo_progress_text, name, explanation);
-#line 8907 "Commands.c"
+#line 8891 "Commands.c"
 }
 
 
@@ -8916,23 +8900,25 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 	gboolean _tmp4_;
 #line 922 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+	COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp0_ = library_window_get_app ();
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = _tmp0_;
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = _tmp2_;
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_EVENT_PAGE);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp3_);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp1_);
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 8936 "Commands.c"
+#line 8922 "Commands.c"
 		Event* evt = NULL;
 		LibraryWindow* _tmp5_;
 		LibraryWindow* _tmp6_;
@@ -8945,111 +8931,117 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
 		GeeArrayList* _tmp13_;
 		gint _tmp14_;
 		gint _tmp15_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = library_window_get_app ();
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = _tmp5_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT_PAGE, EventPage);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = event_page_get_event (_tmp8_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp9_;
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp8_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 929 "/home/jens/Source/shotwell/src/Commands.vala"
 		evt = _tmp10_;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp11_ = evt;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT_SOURCE, EventSource));
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp15_ = _tmp14_;
-#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 932 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp12_ == _tmp15_) {
-#line 8979 "Commands.c"
+#line 8965 "Commands.c"
 			LibraryWindow* _tmp16_;
 			LibraryWindow* _tmp17_;
 			SourceProxy* _tmp18_;
 			DataSource* _tmp19_;
 			Event* _tmp20_;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = library_window_get_app ();
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp17_ = _tmp16_;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = self->priv->new_event_proxy;
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = source_proxy_get_source (_tmp18_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT, Event);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			library_window_switch_to_event (_tmp17_, _tmp20_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp20_);
-#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 935 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp17_);
-#line 9001 "Commands.c"
+#line 8987 "Commands.c"
 		}
-#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (evt);
-#line 9005 "Commands.c"
+#line 8991 "Commands.c"
 	} else {
 		SourceProxy* _tmp21_;
 		DataSource* _tmp22_;
 		Event* _tmp23_;
 		gint _tmp24_;
-		gboolean _tmp25_;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+		GeeArrayList* _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+		gboolean _tmp28_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp21_ = self->priv->new_event_proxy;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp22_ = source_proxy_get_source (_tmp21_);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_EVENT, Event);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp24_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_EVENT_SOURCE, EventSource));
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
-		_tmp25_ = _tmp24_ == 0;
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp26_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp27_ = _tmp26_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		_tmp28_ = _tmp24_ == _tmp27_;
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp23_);
-#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
-		if (_tmp25_) {
-#line 9026 "Commands.c"
-			LibraryWindow* _tmp26_;
-			LibraryWindow* _tmp27_;
-			SourceProxy* _tmp28_;
-			DataSource* _tmp29_;
-			Event* _tmp30_;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp26_ = library_window_get_app ();
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp27_ = _tmp26_;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp28_ = self->priv->new_event_proxy;
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp29_ = source_proxy_get_source (_tmp28_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EVENT, Event);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			library_window_switch_to_event (_tmp27_, _tmp30_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
+#line 941 "/home/jens/Source/shotwell/src/Commands.vala"
+		if (_tmp28_) {
+#line 9021 "Commands.c"
+			LibraryWindow* _tmp29_;
+			LibraryWindow* _tmp30_;
+			SourceProxy* _tmp31_;
+			DataSource* _tmp32_;
+			Event* _tmp33_;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp29_ = library_window_get_app ();
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp30_ = _tmp29_;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp31_ = self->priv->new_event_proxy;
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp32_ = source_proxy_get_source (_tmp31_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT, Event);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			library_window_switch_to_event (_tmp30_, _tmp33_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
+			_g_object_unref0 (_tmp33_);
+#line 943 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tmp30_);
-#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
-			_g_object_unref0 (_tmp27_);
-#line 9048 "Commands.c"
+#line 9043 "Commands.c"
 		}
 	}
-#line 946 "/home/jens/Source/shotwell/src/Commands.vala"
-	COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 9053 "Commands.c"
 }
 
 
@@ -9075,7 +9067,7 @@ static void move_photos_command_real_move_photos_command_real_execute_on_source
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 950 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp3_);
-#line 9079 "Commands.c"
+#line 9071 "Commands.c"
 }
 
 
@@ -9113,7 +9105,7 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_tmp6_ = event_proxy;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 9117 "Commands.c"
+#line 9109 "Commands.c"
 		SourceProxy* _tmp7_;
 		DataSource* _tmp8_;
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9124,13 +9116,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event);
-#line 9128 "Commands.c"
+#line 9120 "Commands.c"
 	} else {
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp5_);
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = NULL;
-#line 9134 "Commands.c"
+#line 9126 "Commands.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp9_ = current_media;
@@ -9142,7 +9134,7 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
 	_source_proxy_unref0 (event_proxy);
 #line 953 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (current_media);
-#line 9146 "Commands.c"
+#line 9138 "Commands.c"
 }
 
 
@@ -9159,7 +9151,7 @@ static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePh
 	command_manager_reset (_tmp1_);
 #line 961 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 9163 "Commands.c"
+#line 9155 "Commands.c"
 }
 
 
@@ -9176,7 +9168,7 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize;
-#line 9180 "Commands.c"
+#line 9172 "Commands.c"
 }
 
 
@@ -9190,7 +9182,7 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot
 	_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 888 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->old_events = _tmp0_;
-#line 9194 "Commands.c"
+#line 9186 "Commands.c"
 }
 
 
@@ -9206,7 +9198,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 	g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp1_, NULL, FALSE);
 #line 914 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9210 "Commands.c"
+#line 9202 "Commands.c"
 	{
 		GeeIterator* _proxy_it = NULL;
 		GeeHashMap* _tmp2_;
@@ -9233,7 +9225,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 		_proxy_it = _tmp7_;
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9237 "Commands.c"
+#line 9229 "Commands.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			SourceProxy* proxy = NULL;
@@ -9248,7 +9240,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 			if (!_tmp9_) {
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9252 "Commands.c"
+#line 9244 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = _proxy_it;
@@ -9260,7 +9252,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 			_tmp12_ = proxy;
 #line 917 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_ != NULL) {
-#line 9264 "Commands.c"
+#line 9256 "Commands.c"
 				SourceProxy* _tmp13_;
 				guint _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9269,15 +9261,15 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 				g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE);
 #line 918 "/home/jens/Source/shotwell/src/Commands.vala"
 				g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9273 "Commands.c"
+#line 9265 "Commands.c"
 			}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 9277 "Commands.c"
+#line 9269 "Commands.c"
 		}
 #line 916 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_it);
-#line 9281 "Commands.c"
+#line 9273 "Commands.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/Commands.vala"
 	_source_proxy_unref0 (self->priv->new_event_proxy);
@@ -9285,7 +9277,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject * obj
 	_g_object_unref0 (self->priv->old_events);
 #line 886 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_real_move_photos_command_parent_class)->finalize (obj);
-#line 9289 "Commands.c"
+#line 9281 "Commands.c"
 }
 
 
@@ -9312,7 +9304,7 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) move_photos_command_real_undo;
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize;
-#line 9316 "Commands.c"
+#line 9308 "Commands.c"
 }
 
 
@@ -9328,7 +9320,7 @@ static void move_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->real_command);
 #line 883 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (move_photos_command_parent_class)->finalize (obj);
-#line 9332 "Commands.c"
+#line 9324 "Commands.c"
 }
 
 
@@ -9359,7 +9351,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 	self = (NewEventCommand*) move_photos_command_construct (object_type, RESOURCES_NEW_EVENT_LABEL, "");
 #line 992 "/home/jens/Source/shotwell/src/Commands.vala"
 	key_source = NULL;
-#line 9363 "Commands.c"
+#line 9355 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_;
@@ -9372,7 +9364,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 		_view_it = _tmp1_;
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9376 "Commands.c"
+#line 9368 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataView* view = NULL;
@@ -9390,7 +9382,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			if (!_tmp3_) {
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9394 "Commands.c"
+#line 9386 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _view_it;
@@ -9408,7 +9400,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 			_tmp8_ = key_source;
 #line 996 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_ == NULL) {
-#line 9412 "Commands.c"
+#line 9404 "Commands.c"
 				MediaSource* _tmp9_;
 				MediaSource* _tmp10_;
 #line 997 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9425,17 +9417,17 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 				_g_object_unref0 (view);
 #line 998 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9429 "Commands.c"
+#line 9421 "Commands.c"
 			}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_source);
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9435 "Commands.c"
+#line 9427 "Commands.c"
 		}
 #line 993 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9439 "Commands.c"
+#line 9431 "Commands.c"
 	}
 #line 1003 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = key_source;
@@ -9461,21 +9453,21 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 	_g_object_unref0 (key_source);
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9465 "Commands.c"
+#line 9457 "Commands.c"
 }
 
 
 NewEventCommand* new_event_command_new (GeeIterable* iter) {
 #line 988 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_event_command_construct (TYPE_NEW_EVENT_COMMAND, iter);
-#line 9472 "Commands.c"
+#line 9464 "Commands.c"
 }
 
 
 static void new_event_command_class_init (NewEventCommandClass * klass) {
 #line 987 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9479 "Commands.c"
+#line 9471 "Commands.c"
 }
 
 
@@ -9518,21 +9510,21 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
 	G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp2_;
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9522 "Commands.c"
+#line 9514 "Commands.c"
 }
 
 
 SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event) {
 #line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_event_command_construct (TYPE_SET_EVENT_COMMAND, iter, new_event);
-#line 9529 "Commands.c"
+#line 9521 "Commands.c"
 }
 
 
 static void set_event_command_class_init (SetEventCommandClass * klass) {
 #line 1013 "/home/jens/Source/shotwell/src/Commands.vala"
 	set_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9536 "Commands.c"
+#line 9528 "Commands.c"
 }
 
 
@@ -9580,7 +9572,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1034 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_thumbs = _tmp0_;
-#line 9584 "Commands.c"
+#line 9576 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_;
@@ -9593,7 +9585,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 		_view_it = _tmp2_;
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 9597 "Commands.c"
+#line 9589 "Commands.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			DataView* view = NULL;
@@ -9611,7 +9603,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			if (!_tmp4_) {
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 9615 "Commands.c"
+#line 9607 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -9629,7 +9621,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 			_tmp9_ = master_event;
 #line 1040 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ == NULL) {
-#line 9633 "Commands.c"
+#line 9625 "Commands.c"
 				Event* _tmp10_;
 				Event* _tmp11_;
 				Event* _tmp12_;
@@ -9656,7 +9648,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_tmp15_ = event_has_name (_tmp14_);
 #line 1045 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp15_) {
-#line 9660 "Commands.c"
+#line 9652 "Commands.c"
 					Event* _tmp16_;
 					gint _tmp17_;
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9665,7 +9657,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp17_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource));
 #line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
 					named_evt_src_count = _tmp17_;
-#line 9669 "Commands.c"
+#line 9661 "Commands.c"
 				}
 			} else {
 				Event* _tmp18_;
@@ -9676,7 +9668,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_tmp19_ = event_has_name (_tmp18_);
 #line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp19_) {
-#line 9680 "Commands.c"
+#line 9672 "Commands.c"
 					Event* _tmp20_;
 					gint _tmp21_;
 					gint _tmp22_;
@@ -9688,7 +9680,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp22_ = named_evt_src_count;
 #line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp21_ > _tmp22_) {
-#line 9692 "Commands.c"
+#line 9684 "Commands.c"
 						Event* _tmp23_;
 						gint _tmp24_;
 						Event* _tmp25_;
@@ -9707,7 +9699,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_g_object_unref0 (master_event);
 #line 1053 "/home/jens/Source/shotwell/src/Commands.vala"
 						master_event = _tmp26_;
-#line 9711 "Commands.c"
+#line 9703 "Commands.c"
 					}
 				} else {
 					gint _tmp27_;
@@ -9715,7 +9707,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_tmp27_ = named_evt_src_count;
 #line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp27_ == 0) {
-#line 9719 "Commands.c"
+#line 9711 "Commands.c"
 						Event* _tmp28_;
 						gint _tmp29_;
 						gint _tmp30_;
@@ -9727,7 +9719,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 						_tmp30_ = unnamed_evt_src_count;
 #line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp29_ > _tmp30_) {
-#line 9731 "Commands.c"
+#line 9723 "Commands.c"
 							Event* _tmp31_;
 							gint _tmp32_;
 							Event* _tmp33_;
@@ -9746,7 +9738,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 							_g_object_unref0 (master_event);
 #line 1061 "/home/jens/Source/shotwell/src/Commands.vala"
 							master_event = _tmp34_;
-#line 9750 "Commands.c"
+#line 9742 "Commands.c"
 						}
 					}
 				}
@@ -9774,7 +9766,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 				_media_source_it = _tmp39_;
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 9778 "Commands.c"
+#line 9770 "Commands.c"
 					GeeIterator* _tmp40_;
 					gboolean _tmp41_;
 					MediaSource* media_source = NULL;
@@ -9792,7 +9784,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					if (!_tmp41_) {
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 9796 "Commands.c"
+#line 9788 "Commands.c"
 					}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp42_ = _media_source_it;
@@ -9814,21 +9806,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 					_g_object_unref0 (_tmp47_);
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (media_source);
-#line 9818 "Commands.c"
+#line 9810 "Commands.c"
 				}
 #line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_media_source_it);
-#line 9822 "Commands.c"
+#line 9814 "Commands.c"
 			}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 9828 "Commands.c"
+#line 9820 "Commands.c"
 		}
 #line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 9832 "Commands.c"
+#line 9824 "Commands.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp48_ = master_event;
@@ -9858,21 +9850,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
 	_g_object_unref0 (master_event);
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9862 "Commands.c"
+#line 9854 "Commands.c"
 }
 
 
 MergeEventsCommand* merge_events_command_new (GeeIterable* iter) {
 #line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
 	return merge_events_command_construct (TYPE_MERGE_EVENTS_COMMAND, iter);
-#line 9869 "Commands.c"
+#line 9861 "Commands.c"
 }
 
 
 static void merge_events_command_class_init (MergeEventsCommandClass * klass) {
 #line 1023 "/home/jens/Source/shotwell/src/Commands.vala"
 	merge_events_command_parent_class = g_type_class_peek_parent (klass);
-#line 9876 "Commands.c"
+#line 9868 "Commands.c"
 }
 
 
@@ -9895,7 +9887,7 @@ GType merge_events_command_get_type (void) {
 static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
 	duplicate_multiple_photos_command_on_photo_destroyed ((DuplicateMultiplePhotosCommand*) self, source);
-#line 9899 "Commands.c"
+#line 9891 "Commands.c"
 }
 
 
@@ -9915,14 +9907,14 @@ DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GTy
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 9919 "Commands.c"
+#line 9911 "Commands.c"
 }
 
 
 DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter) {
 #line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
 	return duplicate_multiple_photos_command_construct (TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, iter);
-#line 9926 "Commands.c"
+#line 9918 "Commands.c"
 }
 
 
@@ -9956,7 +9948,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 	_g_object_unref0 (_tmp3_);
 #line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_) {
-#line 9960 "Commands.c"
+#line 9952 "Commands.c"
 		CommandManager* _tmp7_;
 		CommandManager* _tmp8_;
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9967,7 +9959,7 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
 		command_manager_reset (_tmp8_);
 #line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp8_);
-#line 9971 "Commands.c"
+#line 9963 "Commands.c"
 	}
 }
 
@@ -9990,7 +9982,7 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 	_tmp1_ = self->priv->failed;
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ > 0) {
-#line 9994 "Commands.c"
+#line 9986 "Commands.c"
 		gchar* error_string = NULL;
 		gint _tmp2_;
 		gint _tmp3_;
@@ -10010,7 +10002,7 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (error_string);
-#line 10014 "Commands.c"
+#line 10006 "Commands.c"
 	}
 }
 
@@ -10031,7 +10023,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
 #line 1115 "/home/jens/Source/shotwell/src/Commands.vala"
 	photo = _tmp1_;
-#line 10035 "Commands.c"
+#line 10027 "Commands.c"
 	{
 		LibraryPhoto* dupe = NULL;
 		LibraryPhoto* _tmp2_;
@@ -10042,8 +10034,8 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		dupe = _tmp2_;
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10046 "Commands.c"
-			goto __catch458_g_error;
+#line 10038 "Commands.c"
+			goto __catch466_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10051,10 +10043,10 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (dupe);
-#line 10055 "Commands.c"
+#line 10047 "Commands.c"
 	}
-	goto __finally458;
-	__catch458_g_error:
+	goto __finally466;
+	__catch466_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_;
@@ -10092,9 +10084,9 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		self->priv->failed = _tmp10_ + 1;
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_error_free0 (err);
-#line 10096 "Commands.c"
+#line 10088 "Commands.c"
 	}
-	__finally458:
+	__finally466:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10105,11 +10097,11 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		g_clear_error (&_inner_error_);
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 10109 "Commands.c"
+#line 10101 "Commands.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10113 "Commands.c"
+#line 10105 "Commands.c"
 }
 
 
@@ -10139,7 +10131,7 @@ static void duplicate_multiple_photos_command_real_undo (Command* base) {
 	_tmp3_ = library_photo_global;
 #line 1137 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 10143 "Commands.c"
+#line 10135 "Commands.c"
 }
 
 
@@ -10190,7 +10182,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
 	_g_object_unref0 (marker);
 #line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 10194 "Commands.c"
+#line 10186 "Commands.c"
 }
 
 
@@ -10209,7 +10201,7 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize;
-#line 10213 "Commands.c"
+#line 10205 "Commands.c"
 }
 
 
@@ -10223,7 +10215,7 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh
 	self->priv->dupes = _tmp0_;
 #line 1082 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->failed = 0;
-#line 10227 "Commands.c"
+#line 10219 "Commands.c"
 }
 
 
@@ -10243,7 +10235,7 @@ static void duplicate_multiple_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->dupes);
 #line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (duplicate_multiple_photos_command_parent_class)->finalize (obj);
-#line 10247 "Commands.c"
+#line 10239 "Commands.c"
 }
 
 
@@ -10291,14 +10283,14 @@ SetRatingSingleCommand* set_rating_single_command_construct (GType object_type,
 	self->priv->last_rating = _tmp5_;
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10295 "Commands.c"
+#line 10287 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating) {
 #line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct (TYPE_SET_RATING_SINGLE_COMMAND, source, rating);
-#line 10302 "Commands.c"
+#line 10294 "Commands.c"
 }
 
 
@@ -10318,11 +10310,11 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	if (_tmp1_) {
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10322 "Commands.c"
+#line 10314 "Commands.c"
 	} else {
 #line 1164 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10326 "Commands.c"
+#line 10318 "Commands.c"
 	}
 #line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp2_ = source;
@@ -10342,14 +10334,14 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
 	self->priv->last_rating = _tmp5_;
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10346 "Commands.c"
+#line 10338 "Commands.c"
 }
 
 
 SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing) {
 #line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_single_command_construct_inc_dec (TYPE_SET_RATING_SINGLE_COMMAND, source, is_incrementing);
-#line 10353 "Commands.c"
+#line 10345 "Commands.c"
 }
 
 
@@ -10362,7 +10354,7 @@ static void set_rating_single_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->set_direct;
 #line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10366 "Commands.c"
+#line 10358 "Commands.c"
 		DataSource* _tmp1_;
 		Rating _tmp2_;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10371,27 +10363,27 @@ static void set_rating_single_command_real_execute (Command* base) {
 		_tmp2_ = self->priv->new_rating;
 #line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10375 "Commands.c"
+#line 10367 "Commands.c"
 	} else {
 		gboolean _tmp3_;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10382 "Commands.c"
+#line 10374 "Commands.c"
 			DataSource* _tmp4_;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10388 "Commands.c"
+#line 10380 "Commands.c"
 		} else {
 			DataSource* _tmp5_;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
 #line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10395 "Commands.c"
+#line 10387 "Commands.c"
 		}
 	}
 }
@@ -10409,7 +10401,7 @@ static void set_rating_single_command_real_undo (Command* base) {
 	_tmp1_ = self->priv->last_rating;
 #line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 10413 "Commands.c"
+#line 10405 "Commands.c"
 }
 
 
@@ -10424,14 +10416,14 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass *
 	((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_single_command_real_undo;
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize;
-#line 10428 "Commands.c"
+#line 10420 "Commands.c"
 }
 
 
 static void set_rating_single_command_instance_init (SetRatingSingleCommand * self) {
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RATING_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 10435 "Commands.c"
+#line 10427 "Commands.c"
 }
 
 
@@ -10441,7 +10433,7 @@ static void set_rating_single_command_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
 #line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_single_command_parent_class)->finalize (obj);
-#line 10445 "Commands.c"
+#line 10437 "Commands.c"
 }
 
 
@@ -10497,14 +10489,14 @@ SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable*
 	set_rating_command_save_source_states (self, _tmp7_);
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10501 "Commands.c"
+#line 10493 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating) {
 #line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct (TYPE_SET_RATING_COMMAND, iter, rating);
-#line 10508 "Commands.c"
+#line 10500 "Commands.c"
 }
 
 
@@ -10527,11 +10519,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp1_) {
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Increasing ratings");
-#line 10531 "Commands.c"
+#line 10523 "Commands.c"
 	} else {
 #line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Decreasing ratings");
-#line 10535 "Commands.c"
+#line 10527 "Commands.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = is_incrementing;
@@ -10539,11 +10531,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp3_) {
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Decreasing ratings");
-#line 10543 "Commands.c"
+#line 10535 "Commands.c"
 	} else {
 #line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Increasing ratings");
-#line 10547 "Commands.c"
+#line 10539 "Commands.c"
 	}
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = is_incrementing;
@@ -10551,11 +10543,11 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	if (_tmp5_) {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10555 "Commands.c"
+#line 10547 "Commands.c"
 	} else {
 #line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10559 "Commands.c"
+#line 10551 "Commands.c"
 	}
 #line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = iter;
@@ -10573,14 +10565,14 @@ SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIt
 	set_rating_command_save_source_states (self, _tmp8_);
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10577 "Commands.c"
+#line 10569 "Commands.c"
 }
 
 
 SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing) {
 #line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_rating_command_construct_inc_dec (TYPE_SET_RATING_COMMAND, iter, is_incrementing);
-#line 10584 "Commands.c"
+#line 10576 "Commands.c"
 }
 
 
@@ -10596,7 +10588,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_rating_map = _tmp0_;
-#line 10600 "Commands.c"
+#line 10592 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_;
@@ -10609,7 +10601,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 		_view_it = _tmp2_;
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10613 "Commands.c"
+#line 10605 "Commands.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			DataView* view = NULL;
@@ -10630,7 +10622,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			if (!_tmp4_) {
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10634 "Commands.c"
+#line 10626 "Commands.c"
 			}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _view_it;
@@ -10658,11 +10650,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
 			_g_object_unref0 (source);
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 10662 "Commands.c"
+#line 10654 "Commands.c"
 		}
 #line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 10666 "Commands.c"
+#line 10658 "Commands.c"
 	}
 }
 
@@ -10675,7 +10667,7 @@ static void set_rating_command_real_execute (Command* base) {
 	self->priv->action_count = 0;
 #line 1226 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10679 "Commands.c"
+#line 10671 "Commands.c"
 }
 
 
@@ -10687,7 +10679,7 @@ static void set_rating_command_real_undo (Command* base) {
 	self->priv->action_count = 0;
 #line 1231 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_rating_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10691 "Commands.c"
+#line 10683 "Commands.c"
 }
 
 
@@ -10702,7 +10694,7 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 	_tmp0_ = self->priv->set_direct;
 #line 1235 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 10706 "Commands.c"
+#line 10698 "Commands.c"
 		DataSource* _tmp1_;
 		Rating _tmp2_;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10711,27 +10703,27 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
 		_tmp2_ = self->priv->new_rating;
 #line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10715 "Commands.c"
+#line 10707 "Commands.c"
 	} else {
 		gboolean _tmp3_;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->incrementing;
 #line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 10722 "Commands.c"
+#line 10714 "Commands.c"
 			DataSource* _tmp4_;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = source;
 #line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10728 "Commands.c"
+#line 10720 "Commands.c"
 		} else {
 			DataSource* _tmp5_;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = source;
 #line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
 			media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10735 "Commands.c"
+#line 10727 "Commands.c"
 		}
 	}
 }
@@ -10757,7 +10749,7 @@ static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* b
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
 #line 1246 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp3_));
-#line 10761 "Commands.c"
+#line 10753 "Commands.c"
 }
 
 
@@ -10776,7 +10768,7 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) {
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_undo_on_source;
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize;
-#line 10780 "Commands.c"
+#line 10772 "Commands.c"
 }
 
 
@@ -10785,7 +10777,7 @@ static void set_rating_command_instance_init (SetRatingCommand * self) {
 	self->priv = SET_RATING_COMMAND_GET_PRIVATE (self);
 #line 1192 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->action_count = 0;
-#line 10789 "Commands.c"
+#line 10781 "Commands.c"
 }
 
 
@@ -10797,7 +10789,7 @@ static void set_rating_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->last_rating_map);
 #line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_rating_command_parent_class)->finalize (obj);
-#line 10801 "Commands.c"
+#line 10793 "Commands.c"
 }
 
 
@@ -10834,14 +10826,14 @@ SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type,
 	set_raw_developer_command_save_source_states (self, _tmp2_);
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 10838 "Commands.c"
+#line 10830 "Commands.c"
 }
 
 
 SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer) {
 #line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
 	return set_raw_developer_command_construct (TYPE_SET_RAW_DEVELOPER_COMMAND, iter, developer);
-#line 10845 "Commands.c"
+#line 10837 "Commands.c"
 }
 
 
@@ -10864,7 +10856,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->last_transformation_map = _tmp1_;
-#line 10868 "Commands.c"
+#line 10860 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp2_;
@@ -10877,7 +10869,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 		_view_it = _tmp3_;
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 10881 "Commands.c"
+#line 10873 "Commands.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			DataView* view = NULL;
@@ -10897,7 +10889,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (!_tmp5_) {
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 10901 "Commands.c"
+#line 10893 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp6_ = _view_it;
@@ -10915,7 +10907,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			if (_tmp10_ == NULL) {
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp9_);
-#line 10919 "Commands.c"
+#line 10911 "Commands.c"
 			}
 #line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
 			photo = _tmp10_;
@@ -10925,7 +10917,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 			_tmp12_ = set_raw_developer_command_is_raw_photo (self, _tmp11_);
 #line 1268 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 10929 "Commands.c"
+#line 10921 "Commands.c"
 				GeeHashMap* _tmp13_;
 				Photo* _tmp14_;
 				Photo* _tmp15_;
@@ -10959,17 +10951,17 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, _tmp21_);
 #line 1270 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp21_);
-#line 10963 "Commands.c"
+#line 10955 "Commands.c"
 			}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (photo);
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 10969 "Commands.c"
+#line 10961 "Commands.c"
 		}
 #line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 10973 "Commands.c"
+#line 10965 "Commands.c"
 	}
 }
 
@@ -10980,7 +10972,7 @@ static void set_raw_developer_command_real_execute (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1276 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10984 "Commands.c"
+#line 10976 "Commands.c"
 }
 
 
@@ -10990,7 +10982,7 @@ static void set_raw_developer_command_real_undo (Command* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
 #line 1280 "/home/jens/Source/shotwell/src/Commands.vala"
 	COMMAND_CLASS (set_raw_developer_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10994 "Commands.c"
+#line 10986 "Commands.c"
 }
 
 
@@ -11017,14 +11009,14 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1285 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11021 "Commands.c"
+#line 11013 "Commands.c"
 		gboolean _tmp4_ = FALSE;
 		RawDeveloper _tmp5_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = self->priv->new_developer;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp5_ == RAW_DEVELOPER_CAMERA) {
-#line 11028 "Commands.c"
+#line 11020 "Commands.c"
 			Photo* _tmp6_;
 			gboolean _tmp7_;
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11033,21 +11025,21 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 			_tmp7_ = photo_is_raw_developer_available (_tmp6_, RAW_DEVELOPER_CAMERA);
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = !_tmp7_;
-#line 11037 "Commands.c"
+#line 11029 "Commands.c"
 		} else {
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = FALSE;
-#line 11041 "Commands.c"
+#line 11033 "Commands.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp4_) {
-#line 11045 "Commands.c"
+#line 11037 "Commands.c"
 			Photo* _tmp8_;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = photo;
 #line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
-			photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED);
-#line 11051 "Commands.c"
+			photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED, TRUE);
+#line 11043 "Commands.c"
 		} else {
 			Photo* _tmp9_;
 			RawDeveloper _tmp10_;
@@ -11056,13 +11048,13 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp10_ = self->priv->new_developer;
 #line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
-			photo_set_raw_developer (_tmp9_, _tmp10_);
-#line 11061 "Commands.c"
+			photo_set_raw_developer (_tmp9_, _tmp10_, TRUE);
+#line 11053 "Commands.c"
 		}
 	}
 #line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11066 "Commands.c"
+#line 11058 "Commands.c"
 }
 
 
@@ -11089,7 +11081,7 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 	_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
 #line 1295 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 11093 "Commands.c"
+#line 11085 "Commands.c"
 		Photo* _tmp4_;
 		GeeHashMap* _tmp5_;
 		Photo* _tmp6_;
@@ -11108,7 +11100,7 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
 #line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
-		photo_set_raw_developer (_tmp4_, (RawDeveloper) ((gintptr) _tmp7_));
+		photo_set_raw_developer (_tmp4_, (RawDeveloper) ((gintptr) _tmp7_), TRUE);
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = photo;
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11123,11 +11115,11 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
 		photo_load_transformation_state (_tmp8_, _tmp12_);
 #line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp12_);
-#line 11127 "Commands.c"
+#line 11119 "Commands.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 11131 "Commands.c"
+#line 11123 "Commands.c"
 }
 
 
@@ -11143,7 +11135,7 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
 	_tmp1_ = photo;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 11147 "Commands.c"
+#line 11139 "Commands.c"
 		Photo* _tmp2_;
 		PhotoFileFormat _tmp3_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11152,17 +11144,17 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
 		_tmp3_ = photo_get_master_file_format (_tmp2_);
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _tmp3_ == PHOTO_FILE_FORMAT_RAW;
-#line 11156 "Commands.c"
+#line 11148 "Commands.c"
 	} else {
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11160 "Commands.c"
+#line 11152 "Commands.c"
 	}
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _tmp0_;
 #line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 11166 "Commands.c"
+#line 11158 "Commands.c"
 }
 
 
@@ -11181,14 +11173,14 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass *
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_undo_on_source;
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize;
-#line 11185 "Commands.c"
+#line 11177 "Commands.c"
 }
 
 
 static void set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) {
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE (self);
-#line 11192 "Commands.c"
+#line 11184 "Commands.c"
 }
 
 
@@ -11202,7 +11194,7 @@ static void set_raw_developer_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->last_transformation_map);
 #line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (set_raw_developer_command_parent_class)->finalize (obj);
-#line 11206 "Commands.c"
+#line 11198 "Commands.c"
 }
 
 
@@ -11249,14 +11241,14 @@ AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType obje
 	self->priv->modify_original = _tmp4_;
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11253 "Commands.c"
+#line 11245 "Commands.c"
 }
 
 
 AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original) {
 #line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photo_command_construct (TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, dateable, time_shift, modify_original);
-#line 11260 "Commands.c"
+#line 11252 "Commands.c"
 }
 
 
@@ -11296,7 +11288,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	_tmp6_ = view_collection_new ("tmp");
 #line 1325 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp6_;
-#line 11300 "Commands.c"
+#line 11292 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
 		EventSourceCollection* _tmp7_;
@@ -11320,7 +11312,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 		_dobj_it = _tmp11_;
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11324 "Commands.c"
+#line 11316 "Commands.c"
 			GeeIterator* _tmp12_;
 			gboolean _tmp13_;
 			DataObject* dobj = NULL;
@@ -11338,7 +11330,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			if (!_tmp13_) {
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11342 "Commands.c"
+#line 11334 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp14_ = _dobj_it;
@@ -11356,7 +11348,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 			_tmp18_ = event;
 #line 1329 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp18_ != NULL) {
-#line 11360 "Commands.c"
+#line 11352 "Commands.c"
 				ViewCollection* _tmp19_;
 				Event* _tmp20_;
 				EventView* _tmp21_;
@@ -11373,17 +11365,17 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp22_);
-#line 11377 "Commands.c"
+#line 11369 "Commands.c"
 			}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 11383 "Commands.c"
+#line 11375 "Commands.c"
 		}
 #line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 11387 "Commands.c"
+#line 11379 "Commands.c"
 	}
 #line 1333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = self->priv->dateable;
@@ -11393,7 +11385,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
 	event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_, NULL);
 #line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 11397 "Commands.c"
+#line 11389 "Commands.c"
 }
 
 
@@ -11423,7 +11415,7 @@ static void adjust_date_time_photo_command_real_undo (Command* base) {
 	_tmp5_ = self->priv->prev_event;
 #line 1339 "/home/jens/Source/shotwell/src/Commands.vala"
 	media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_);
-#line 11427 "Commands.c"
+#line 11419 "Commands.c"
 }
 
 
@@ -11439,21 +11431,21 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 	_tmp1_ = self->priv->modify_original;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 11443 "Commands.c"
+#line 11435 "Commands.c"
 		Dateable* _tmp2_;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 11449 "Commands.c"
+#line 11441 "Commands.c"
 	} else {
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 11453 "Commands.c"
+#line 11445 "Commands.c"
 	}
 #line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 11457 "Commands.c"
+#line 11449 "Commands.c"
 		{
 			Dateable* _tmp3_;
 			time_t _tmp4_;
@@ -11465,12 +11457,12 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11469 "Commands.c"
-				goto __catch459_g_error;
+#line 11461 "Commands.c"
+				goto __catch467_g_error;
 			}
 		}
-		goto __finally459;
-		__catch459_g_error:
+		goto __finally467;
+		__catch467_g_error:
 		{
 			GError* err = NULL;
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11481,9 +11473,9 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			app_window_error_message (_ ("Original photo could not be adjusted."), NULL);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 11485 "Commands.c"
+#line 11477 "Commands.c"
 		}
-		__finally459:
+		__finally467:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11492,7 +11484,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			g_clear_error (&_inner_error_);
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 11496 "Commands.c"
+#line 11488 "Commands.c"
 		}
 	} else {
 		Dateable* _tmp5_;
@@ -11503,7 +11495,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 		_tmp6_ = exposure_time;
 #line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
 		dateable_set_exposure_time (_tmp5_, _tmp6_);
-#line 11507 "Commands.c"
+#line 11499 "Commands.c"
 	}
 }
 
@@ -11519,14 +11511,14 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman
 	((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photo_command_real_undo;
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize;
-#line 11523 "Commands.c"
+#line 11515 "Commands.c"
 }
 
 
 static void adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) {
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 11530 "Commands.c"
+#line 11522 "Commands.c"
 }
 
 
@@ -11540,7 +11532,7 @@ static void adjust_date_time_photo_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->prev_event);
 #line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photo_command_parent_class)->finalize (obj);
-#line 11544 "Commands.c"
+#line 11536 "Commands.c"
 }
 
 
@@ -11564,14 +11556,14 @@ static time_t* _time_t_dup (time_t* self) {
 	memcpy (dup, self, sizeof (time_t));
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return dup;
-#line 11568 "Commands.c"
+#line 11560 "Commands.c"
 }
 
 
 static gpointer __time_t_dup0 (gpointer self) {
 #line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self ? _time_t_dup (self) : NULL;
-#line 11575 "Commands.c"
+#line 11567 "Commands.c"
 }
 
 
@@ -11607,7 +11599,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 	_g_object_unref0 (self->priv->prev_events);
 #line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap);
-#line 11611 "Commands.c"
+#line 11603 "Commands.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp5_;
@@ -11620,7 +11612,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 		_view_it = _tmp6_;
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11624 "Commands.c"
+#line 11616 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			DataView* view = NULL;
@@ -11646,7 +11638,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (!_tmp8_) {
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11650 "Commands.c"
+#line 11642 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _view_it;
@@ -11666,7 +11658,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (_tmp14_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp13_);
-#line 11670 "Commands.c"
+#line 11662 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = _tmp14_;
@@ -11680,7 +11672,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			if (_tmp18_ == NULL) {
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp17_);
-#line 11684 "Commands.c"
+#line 11676 "Commands.c"
 			}
 #line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp19_ = _tmp18_;
@@ -11700,7 +11692,7 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 			_tmp22_ = self->priv->new_time;
 #line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp22_ == NULL) {
-#line 11704 "Commands.c"
+#line 11696 "Commands.c"
 				DataView* _tmp23_;
 				DataSource* _tmp24_;
 				Dateable* _tmp25_;
@@ -11732,15 +11724,15 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 				_g_object_unref0 (view);
 #line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11736 "Commands.c"
+#line 11728 "Commands.c"
 			}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (view);
-#line 11740 "Commands.c"
+#line 11732 "Commands.c"
 		}
 #line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_view_it);
-#line 11744 "Commands.c"
+#line 11736 "Commands.c"
 	}
 #line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -11750,14 +11742,14 @@ AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType ob
 	self->priv->old_times = _tmp30_;
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 11754 "Commands.c"
+#line 11746 "Commands.c"
 }
 
 
 AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
 #line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
 	return adjust_date_time_photos_command_construct (TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, iter, time_shift, keep_relativity, modify_originals);
-#line 11761 "Commands.c"
+#line 11753 "Commands.c"
 }
 
 
@@ -11787,7 +11779,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 11791 "Commands.c"
+#line 11783 "Commands.c"
 		GeeArrayList* _tmp4_;
 		GeeArrayList* _tmp5_;
 		gint _tmp6_;
@@ -11802,13 +11794,13 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 		_tmp7_ = _tmp6_;
 #line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
 		multiple_object_error_dialog (_tmp4_, ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
-#line 11806 "Commands.c"
+#line 11798 "Commands.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = view_collection_new ("tmp");
 #line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp8_;
-#line 11812 "Commands.c"
+#line 11804 "Commands.c"
 	{
 		GeeIterator* _d_it = NULL;
 		GeeMap* _tmp9_;
@@ -11835,7 +11827,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 		_d_it = _tmp14_;
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 11839 "Commands.c"
+#line 11831 "Commands.c"
 			GeeIterator* _tmp15_;
 			gboolean _tmp16_;
 			Dateable* d = NULL;
@@ -11851,7 +11843,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			if (!_tmp16_) {
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 11855 "Commands.c"
+#line 11847 "Commands.c"
 			}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp17_ = _d_it;
@@ -11859,7 +11851,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			_tmp18_ = gee_iterator_get (_tmp17_);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			d = (Dateable*) _tmp18_;
-#line 11863 "Commands.c"
+#line 11855 "Commands.c"
 			{
 				GeeIterator* _dobj_it = NULL;
 				EventSourceCollection* _tmp19_;
@@ -11883,7 +11875,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 				_dobj_it = _tmp23_;
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 11887 "Commands.c"
+#line 11879 "Commands.c"
 					GeeIterator* _tmp24_;
 					gboolean _tmp25_;
 					DataObject* dobj = NULL;
@@ -11901,7 +11893,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 					if (!_tmp25_) {
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 11905 "Commands.c"
+#line 11897 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp26_ = _dobj_it;
@@ -11919,7 +11911,7 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 					_tmp30_ = event;
 #line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp30_ != NULL) {
-#line 11923 "Commands.c"
+#line 11915 "Commands.c"
 						ViewCollection* _tmp31_;
 						Event* _tmp32_;
 						EventView* _tmp33_;
@@ -11936,17 +11928,17 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 						data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
 #line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp34_);
-#line 11940 "Commands.c"
+#line 11932 "Commands.c"
 					}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (event);
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (dobj);
-#line 11946 "Commands.c"
+#line 11938 "Commands.c"
 				}
 #line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_dobj_it);
-#line 11950 "Commands.c"
+#line 11942 "Commands.c"
 			}
 #line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp35_ = d;
@@ -11956,15 +11948,15 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
 			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource), _tmp36_, NULL);
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (d);
-#line 11960 "Commands.c"
+#line 11952 "Commands.c"
 		}
 #line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_d_it);
-#line 11964 "Commands.c"
+#line 11956 "Commands.c"
 	}
 #line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
 	_data_collection_unref0 (all_events);
-#line 11968 "Commands.c"
+#line 11960 "Commands.c"
 }
 
 
@@ -11992,7 +11984,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 	_tmp3_ = _tmp2_;
 #line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ > 0) {
-#line 11996 "Commands.c"
+#line 11988 "Commands.c"
 		GeeArrayList* _tmp4_;
 		GeeArrayList* _tmp5_;
 		gint _tmp6_;
@@ -12007,7 +11999,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
 		_tmp7_ = _tmp6_;
 #line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
 		multiple_object_error_dialog (_tmp4_, ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
-#line 12011 "Commands.c"
+#line 12003 "Commands.c"
 	}
 }
 
@@ -12024,21 +12016,21 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 	_tmp1_ = self->priv->modify_originals;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 12028 "Commands.c"
+#line 12020 "Commands.c"
 		Dateable* _tmp2_;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = dateable;
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 12034 "Commands.c"
+#line 12026 "Commands.c"
 	} else {
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = FALSE;
-#line 12038 "Commands.c"
+#line 12030 "Commands.c"
 	}
 #line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 12042 "Commands.c"
+#line 12034 "Commands.c"
 		{
 			Dateable* _tmp3_;
 			time_t _tmp4_;
@@ -12050,12 +12042,12 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12054 "Commands.c"
-				goto __catch460_g_error;
+#line 12046 "Commands.c"
+				goto __catch468_g_error;
 			}
 		}
-		goto __finally460;
-		__catch460_g_error:
+		goto __finally468;
+		__catch468_g_error:
 		{
 			GError* err = NULL;
 			GeeArrayList* _tmp5_;
@@ -12072,9 +12064,9 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_error_free0 (err);
-#line 12076 "Commands.c"
+#line 12068 "Commands.c"
 		}
-		__finally460:
+		__finally468:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12083,7 +12075,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			g_clear_error (&_inner_error_);
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 			return;
-#line 12087 "Commands.c"
+#line 12079 "Commands.c"
 		}
 	} else {
 		Dateable* _tmp7_;
@@ -12094,7 +12086,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 		_tmp8_ = exposure_time;
 #line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
 		dateable_set_exposure_time (_tmp7_, _tmp8_);
-#line 12098 "Commands.c"
+#line 12090 "Commands.c"
 	}
 }
 
@@ -12124,7 +12116,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_tmp3_ = self->priv->keep_relativity;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_) {
-#line 12128 "Commands.c"
+#line 12120 "Commands.c"
 		Dateable* _tmp4_;
 		time_t _tmp5_;
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12133,15 +12125,15 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp5_ = dateable_get_exposure_time (_tmp4_);
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_ != ((time_t) 0);
-#line 12137 "Commands.c"
+#line 12129 "Commands.c"
 	} else {
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FALSE;
-#line 12141 "Commands.c"
+#line 12133 "Commands.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_) {
-#line 12145 "Commands.c"
+#line 12137 "Commands.c"
 		Dateable* _tmp6_;
 		Dateable* _tmp7_;
 		time_t _tmp8_;
@@ -12156,7 +12148,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp9_ = self->priv->time_shift;
 #line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp6_, _tmp8_ + ((time_t) _tmp9_));
-#line 12160 "Commands.c"
+#line 12152 "Commands.c"
 	} else {
 		GeeHashMap* _tmp10_;
 		Dateable* _tmp11_;
@@ -12180,13 +12172,13 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_tmp15_ = self->priv->new_time;
 #line 1453 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp14_, *_tmp15_);
-#line 12184 "Commands.c"
+#line 12176 "Commands.c"
 	}
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = view_collection_new ("tmp");
 #line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
 	all_events = _tmp16_;
-#line 12190 "Commands.c"
+#line 12182 "Commands.c"
 	{
 		GeeIterator* _dobj_it = NULL;
 		EventSourceCollection* _tmp17_;
@@ -12210,7 +12202,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 		_dobj_it = _tmp21_;
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12214 "Commands.c"
+#line 12206 "Commands.c"
 			GeeIterator* _tmp22_;
 			gboolean _tmp23_;
 			DataObject* dobj = NULL;
@@ -12228,7 +12220,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			if (!_tmp23_) {
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12232 "Commands.c"
+#line 12224 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp24_ = _dobj_it;
@@ -12246,7 +12238,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 			_tmp28_ = event;
 #line 1460 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp28_ != NULL) {
-#line 12250 "Commands.c"
+#line 12242 "Commands.c"
 				ViewCollection* _tmp29_;
 				Event* _tmp30_;
 				EventView* _tmp31_;
@@ -12263,17 +12255,17 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
 #line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp32_);
-#line 12267 "Commands.c"
+#line 12259 "Commands.c"
 			}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (event);
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (dobj);
-#line 12273 "Commands.c"
+#line 12265 "Commands.c"
 		}
 #line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_dobj_it);
-#line 12277 "Commands.c"
+#line 12269 "Commands.c"
 	}
 #line 1464 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp33_ = dateable;
@@ -12285,7 +12277,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
 	_data_collection_unref0 (all_events);
 #line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dateable);
-#line 12289 "Commands.c"
+#line 12281 "Commands.c"
 }
 
 
@@ -12320,7 +12312,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
 #line 1470 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 12324 "Commands.c"
+#line 12316 "Commands.c"
 		Dateable* _tmp5_;
 		GeeHashMap* _tmp6_;
 		Dateable* _tmp7_;
@@ -12348,7 +12340,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp11_ = photo;
 #line 1472 "/home/jens/Source/shotwell/src/Commands.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 12352 "Commands.c"
+#line 12344 "Commands.c"
 	} else {
 		Dateable* _tmp12_;
 		Dateable* _tmp13_;
@@ -12364,7 +12356,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 		_tmp15_ = self->priv->time_shift;
 #line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
 		adjust_date_time_photos_command_set_time (self, _tmp12_, _tmp14_ - ((time_t) _tmp15_));
-#line 12368 "Commands.c"
+#line 12360 "Commands.c"
 	}
 #line 1477 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = source;
@@ -12382,7 +12374,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
 	_g_object_unref0 (_tmp20_);
 #line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (photo);
-#line 12386 "Commands.c"
+#line 12378 "Commands.c"
 }
 
 
@@ -12401,7 +12393,7 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm
 	((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize;
-#line 12405 "Commands.c"
+#line 12397 "Commands.c"
 }
 
 
@@ -12410,7 +12402,7 @@ static void adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosC
 	self->priv = ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE (self);
 #line 1362 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->new_time = NULL;
-#line 12414 "Commands.c"
+#line 12406 "Commands.c"
 }
 
 
@@ -12428,7 +12420,7 @@ static void adjust_date_time_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->error_list);
 #line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (adjust_date_time_photos_command_parent_class)->finalize (obj);
-#line 12432 "Commands.c"
+#line 12424 "Commands.c"
 }
 
 
@@ -12447,14 +12439,14 @@ GType adjust_date_time_photos_command_get_type (void) {
 static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1521 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_proxy_broken ((AddTagsCommand*) self);
-#line 12451 "Commands.c"
+#line 12443 "Commands.c"
 }
 
 
 static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	add_tags_command_on_source_destroyed ((AddTagsCommand*) self, source);
-#line 12458 "Commands.c"
+#line 12450 "Commands.c"
 }
 
 
@@ -12486,7 +12478,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	_tmp3_ = paths;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3__length1 = paths_length1;
-#line 12490 "Commands.c"
+#line 12482 "Commands.c"
 	{
 		gchar** path_collection = NULL;
 		gint path_collection_length1 = 0;
@@ -12498,14 +12490,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 		path_collection_length1 = _tmp3__length1;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 		for (path_it = 0; path_it < _tmp3__length1; path_it = path_it + 1) {
-#line 12502 "Commands.c"
+#line 12494 "Commands.c"
 			gchar* _tmp4_;
 			gchar* path = NULL;
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = g_strdup (path_collection[path_it]);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 			path = _tmp4_;
-#line 12509 "Commands.c"
+#line 12501 "Commands.c"
 			{
 				GeeList* paths_to_create = NULL;
 				const gchar* _tmp5_;
@@ -12524,7 +12516,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 				_tmp8_ = path;
 #line 1494 "/home/jens/Source/shotwell/src/Commands.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 12528 "Commands.c"
+#line 12520 "Commands.c"
 				{
 					GeeList* _create_path_list = NULL;
 					GeeList* _tmp9_;
@@ -12552,7 +12544,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 					_create_path_index = -1;
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 12556 "Commands.c"
+#line 12548 "Commands.c"
 						gint _tmp14_;
 						gint _tmp15_;
 						gint _tmp16_;
@@ -12583,7 +12575,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						if (!(_tmp15_ < _tmp16_)) {
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 12587 "Commands.c"
+#line 12579 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp17_ = _create_path_list;
@@ -12609,7 +12601,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 1502 "/home/jens/Source/shotwell/src/Commands.vala"
 						add_sources = _tmp24_;
-#line 12613 "Commands.c"
+#line 12605 "Commands.c"
 						{
 							GeeIterator* _source_it = NULL;
 							GeeCollection* _tmp25_;
@@ -12622,7 +12614,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_source_it = _tmp26_;
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							while (TRUE) {
-#line 12626 "Commands.c"
+#line 12618 "Commands.c"
 								GeeIterator* _tmp27_;
 								gboolean _tmp28_;
 								MediaSource* source = NULL;
@@ -12639,7 +12631,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								if (!_tmp28_) {
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 									break;
-#line 12643 "Commands.c"
+#line 12635 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_tmp29_ = _source_it;
@@ -12655,7 +12647,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 								_tmp33_ = tag_contains (_tmp31_, _tmp32_);
 #line 1504 "/home/jens/Source/shotwell/src/Commands.vala"
 								if (!_tmp33_) {
-#line 12659 "Commands.c"
+#line 12651 "Commands.c"
 									GeeArrayList* _tmp34_;
 									MediaSource* _tmp35_;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12664,15 +12656,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 									_tmp35_ = source;
 #line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 12668 "Commands.c"
+#line 12660 "Commands.c"
 								}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 								_g_object_unref0 (source);
-#line 12672 "Commands.c"
+#line 12664 "Commands.c"
 							}
 #line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_source_it);
-#line 12676 "Commands.c"
+#line 12668 "Commands.c"
 						}
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp36_ = add_sources;
@@ -12682,7 +12674,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_tmp38_ = _tmp37_;
 #line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp38_ > 0) {
-#line 12686 "Commands.c"
+#line 12678 "Commands.c"
 							SourceProxy* _tmp39_;
 							GeeHashMap* _tmp40_;
 							SourceProxy* _tmp41_;
@@ -12699,7 +12691,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 							_tmp42_ = add_sources;
 #line 1510 "/home/jens/Source/shotwell/src/Commands.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, _tmp42_);
-#line 12703 "Commands.c"
+#line 12695 "Commands.c"
 						}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (add_sources);
@@ -12709,17 +12701,17 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 						_g_object_unref0 (tag);
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_free0 (create_path);
-#line 12713 "Commands.c"
+#line 12705 "Commands.c"
 					}
 #line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_create_path_list);
-#line 12717 "Commands.c"
+#line 12709 "Commands.c"
 				}
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (paths_to_create);
 #line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (path);
-#line 12723 "Commands.c"
+#line 12715 "Commands.c"
 			}
 		}
 	}
@@ -12733,14 +12725,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 12737 "Commands.c"
+#line 12729 "Commands.c"
 }
 
 
 AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources) {
 #line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
 	return add_tags_command_construct (TYPE_ADD_TAGS_COMMAND, paths, paths_length1, sources);
-#line 12744 "Commands.c"
+#line 12736 "Commands.c"
 }
 
 
@@ -12748,7 +12740,7 @@ static void add_tags_command_real_execute (Command* base) {
 	AddTagsCommand * self;
 #line 1527 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12752 "Commands.c"
+#line 12744 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12775,7 +12767,7 @@ static void add_tags_command_real_execute (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12779 "Commands.c"
+#line 12771 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -12796,7 +12788,7 @@ static void add_tags_command_real_execute (Command* base) {
 			if (!_tmp7_) {
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12800 "Commands.c"
+#line 12792 "Commands.c"
 			}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -12826,11 +12818,11 @@ static void add_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp12_);
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 12830 "Commands.c"
+#line 12822 "Commands.c"
 		}
 #line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 12834 "Commands.c"
+#line 12826 "Commands.c"
 	}
 }
 
@@ -12839,7 +12831,7 @@ static void add_tags_command_real_undo (Command* base) {
 	AddTagsCommand * self;
 #line 1532 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12843 "Commands.c"
+#line 12835 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12866,7 +12858,7 @@ static void add_tags_command_real_undo (Command* base) {
 		_tag_proxy_it = _tmp5_;
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12870 "Commands.c"
+#line 12862 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -12890,7 +12882,7 @@ static void add_tags_command_real_undo (Command* base) {
 			if (!_tmp7_) {
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12894 "Commands.c"
+#line 12886 "Commands.c"
 			}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -12926,11 +12918,11 @@ static void add_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (tag);
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 12930 "Commands.c"
+#line 12922 "Commands.c"
 		}
 #line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 12934 "Commands.c"
+#line 12926 "Commands.c"
 	}
 }
 
@@ -12940,7 +12932,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 	g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
 #line 1540 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 12944 "Commands.c"
+#line 12936 "Commands.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -12967,7 +12959,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 		_sources_it = _tmp5_;
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 12971 "Commands.c"
+#line 12963 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			GeeArrayList* sources = NULL;
@@ -12984,7 +12976,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			if (!_tmp7_) {
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 12988 "Commands.c"
+#line 12980 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _sources_it;
@@ -13000,7 +12992,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 			_tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1542 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp12_) {
-#line 13004 "Commands.c"
+#line 12996 "Commands.c"
 				CommandManager* _tmp13_;
 				CommandManager* _tmp14_;
 #line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13017,15 +13009,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
 				_g_object_unref0 (_sources_it);
 #line 1545 "/home/jens/Source/shotwell/src/Commands.vala"
 				return;
-#line 13021 "Commands.c"
+#line 13013 "Commands.c"
 			}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (sources);
-#line 13025 "Commands.c"
+#line 13017 "Commands.c"
 		}
 #line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_sources_it);
-#line 13029 "Commands.c"
+#line 13021 "Commands.c"
 	}
 }
 
@@ -13043,7 +13035,7 @@ static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13047 "Commands.c"
+#line 13039 "Commands.c"
 }
 
 
@@ -13058,7 +13050,7 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) add_tags_command_real_undo;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize;
-#line 13062 "Commands.c"
+#line 13054 "Commands.c"
 }
 
 
@@ -13070,7 +13062,7 @@ static void add_tags_command_instance_init (AddTagsCommand * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->map = _tmp0_;
-#line 13074 "Commands.c"
+#line 13066 "Commands.c"
 }
 
 
@@ -13082,7 +13074,7 @@ static void add_tags_command_finalize (GObject * obj) {
 	guint _tmp15_;
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 13086 "Commands.c"
+#line 13078 "Commands.c"
 	{
 		GeeIterator* _tag_proxy_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -13109,7 +13101,7 @@ static void add_tags_command_finalize (GObject * obj) {
 		_tag_proxy_it = _tmp5_;
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 13113 "Commands.c"
+#line 13105 "Commands.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			SourceProxy* tag_proxy = NULL;
@@ -13125,7 +13117,7 @@ static void add_tags_command_finalize (GObject * obj) {
 			if (!_tmp7_) {
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 13129 "Commands.c"
+#line 13121 "Commands.c"
 			}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _tag_proxy_it;
@@ -13141,11 +13133,11 @@ static void add_tags_command_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) _add_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (tag_proxy);
-#line 13145 "Commands.c"
+#line 13137 "Commands.c"
 		}
 #line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tag_proxy_it);
-#line 13149 "Commands.c"
+#line 13141 "Commands.c"
 	}
 #line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = library_photo_global;
@@ -13163,7 +13155,7 @@ static void add_tags_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (add_tags_command_parent_class)->finalize (obj);
-#line 13167 "Commands.c"
+#line 13159 "Commands.c"
 }
 
 
@@ -13245,14 +13237,14 @@ RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, con
 	self->priv->new_name = _tmp13_;
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13249 "Commands.c"
+#line 13241 "Commands.c"
 }
 
 
 RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name) {
 #line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_tag_command_construct (TYPE_RENAME_TAG_COMMAND, tag, new_name);
-#line 13256 "Commands.c"
+#line 13248 "Commands.c"
 }
 
 
@@ -13273,7 +13265,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1569 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13277 "Commands.c"
+#line 13269 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -13287,7 +13279,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 		app_window_error_message (_tmp5_, NULL);
 #line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13291 "Commands.c"
+#line 13283 "Commands.c"
 	}
 }
 
@@ -13309,7 +13301,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
 #line 1574 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 13313 "Commands.c"
+#line 13305 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -13323,7 +13315,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		app_window_error_message (_tmp5_, NULL);
 #line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 13327 "Commands.c"
+#line 13319 "Commands.c"
 	}
 }
 
@@ -13339,14 +13331,14 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_undo_on_source;
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize;
-#line 13343 "Commands.c"
+#line 13335 "Commands.c"
 }
 
 
 static void rename_tag_command_instance_init (RenameTagCommand * self) {
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_TAG_COMMAND_GET_PRIVATE (self);
-#line 13350 "Commands.c"
+#line 13342 "Commands.c"
 }
 
 
@@ -13360,7 +13352,7 @@ static void rename_tag_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->new_name);
 #line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_tag_command_parent_class)->finalize (obj);
-#line 13364 "Commands.c"
+#line 13356 "Commands.c"
 }
 
 
@@ -13417,21 +13409,21 @@ DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
 	_g_free0 (_tmp3_);
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13421 "Commands.c"
+#line 13413 "Commands.c"
 }
 
 
 DeleteTagCommand* delete_tag_command_new (Tag* tag) {
 #line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_tag_command_construct (TYPE_DELETE_TAG_COMMAND, tag);
-#line 13428 "Commands.c"
+#line 13420 "Commands.c"
 }
 
 
 static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 1597 "/home/jens/Source/shotwell/src/Commands.vala"
 	delete_tag_command_on_proxy_broken ((DeleteTagCommand*) self);
-#line 13435 "Commands.c"
+#line 13427 "Commands.c"
 }
 
 
@@ -13475,7 +13467,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_tmp6_ = _tmp5_;
 #line 1591 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ > 0) {
-#line 13479 "Commands.c"
+#line 13471 "Commands.c"
 		GeeArrayList* _tmp7_;
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
@@ -13483,7 +13475,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 13487 "Commands.c"
+#line 13479 "Commands.c"
 		{
 			GeeList* _victim_list = NULL;
 			GeeList* _tmp8_;
@@ -13511,7 +13503,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 			_victim_index = -1;
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 13515 "Commands.c"
+#line 13507 "Commands.c"
 				gint _tmp13_;
 				gint _tmp14_;
 				gint _tmp15_;
@@ -13542,7 +13534,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				if (!(_tmp14_ < _tmp15_)) {
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 13546 "Commands.c"
+#line 13538 "Commands.c"
 				}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = _victim_list;
@@ -13586,11 +13578,11 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 				_source_proxy_unref0 (proxy);
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (victim);
-#line 13590 "Commands.c"
+#line 13582 "Commands.c"
 			}
 #line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_victim_list);
-#line 13594 "Commands.c"
+#line 13586 "Commands.c"
 		}
 	}
 #line 1605 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13611,7 +13603,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
 	_g_object_unref0 (recursive_victims);
 #line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13615 "Commands.c"
+#line 13607 "Commands.c"
 }
 
 
@@ -13631,7 +13623,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 	_tmp1_ = self->priv->recursive_victim_proxies;
 #line 1614 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_ != NULL) {
-#line 13635 "Commands.c"
+#line 13627 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp2_;
@@ -13645,14 +13637,14 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 			_tmp4_ = _tmp3_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp4_ - 1;
-#line 13649 "Commands.c"
+#line 13641 "Commands.c"
 			{
 				gboolean _tmp5_ = FALSE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp5_ = TRUE;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 13656 "Commands.c"
+#line 13648 "Commands.c"
 					gint _tmp7_;
 					SourceProxy* proxy = NULL;
 					GeeList* _tmp8_;
@@ -13666,13 +13658,13 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					guint _tmp15_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp5_) {
-#line 13670 "Commands.c"
+#line 13662 "Commands.c"
 						gint _tmp6_;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp6_ = i;
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp6_ - 1;
-#line 13676 "Commands.c"
+#line 13668 "Commands.c"
 					}
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp5_ = FALSE;
@@ -13682,7 +13674,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					if (!(_tmp7_ >= 0)) {
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 13686 "Commands.c"
+#line 13678 "Commands.c"
 					}
 #line 1616 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp8_ = self->priv->recursive_victim_proxies;
@@ -13712,7 +13704,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 					_g_object_unref0 (victim_source);
 #line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
 					_source_proxy_unref0 (proxy);
-#line 13716 "Commands.c"
+#line 13708 "Commands.c"
 				}
 			}
 		}
@@ -13720,7 +13712,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
 		_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1624 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->recursive_victim_proxies = NULL;
-#line 13724 "Commands.c"
+#line 13716 "Commands.c"
 	}
 }
 
@@ -13738,7 +13730,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 13742 "Commands.c"
+#line 13734 "Commands.c"
 }
 
 
@@ -13753,7 +13745,7 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_undo_on_source;
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize;
-#line 13757 "Commands.c"
+#line 13749 "Commands.c"
 }
 
 
@@ -13762,7 +13754,7 @@ static void delete_tag_command_instance_init (DeleteTagCommand * self) {
 	self->priv = DELETE_TAG_COMMAND_GET_PRIVATE (self);
 #line 1580 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->recursive_victim_proxies = NULL;
-#line 13766 "Commands.c"
+#line 13758 "Commands.c"
 }
 
 
@@ -13774,7 +13766,7 @@ static void delete_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->recursive_victim_proxies);
 #line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_tag_command_parent_class)->finalize (obj);
-#line 13778 "Commands.c"
+#line 13770 "Commands.c"
 }
 
 
@@ -13812,14 +13804,14 @@ NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag
 	_g_free0 (_tmp3_);
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13816 "Commands.c"
+#line 13808 "Commands.c"
 }
 
 
 NewChildTagCommand* new_child_tag_command_new (Tag* tag) {
 #line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_child_tag_command_construct (TYPE_NEW_CHILD_TAG_COMMAND, tag);
-#line 13823 "Commands.c"
+#line 13815 "Commands.c"
 }
 
 
@@ -13847,7 +13839,7 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
 	self->priv->created_child = _tmp2_;
 #line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
-#line 13851 "Commands.c"
+#line 13843 "Commands.c"
 }
 
 
@@ -13876,7 +13868,7 @@ static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* b
 	source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp4_, TRUE, NULL, NULL, NULL);
 #line 1646 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 13880 "Commands.c"
+#line 13872 "Commands.c"
 }
 
 
@@ -13899,7 +13891,7 @@ Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
 	result = _tmp2_;
 #line 1652 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 13903 "Commands.c"
+#line 13895 "Commands.c"
 }
 
 
@@ -13914,7 +13906,7 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) {
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_undo_on_source;
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize;
-#line 13918 "Commands.c"
+#line 13910 "Commands.c"
 }
 
 
@@ -13923,7 +13915,7 @@ static void new_child_tag_command_instance_init (NewChildTagCommand * self) {
 	self->priv = NEW_CHILD_TAG_COMMAND_GET_PRIVATE (self);
 #line 1634 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_child = NULL;
-#line 13927 "Commands.c"
+#line 13919 "Commands.c"
 }
 
 
@@ -13935,7 +13927,7 @@ static void new_child_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->created_child);
 #line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_child_tag_command_parent_class)->finalize (obj);
-#line 13939 "Commands.c"
+#line 13931 "Commands.c"
 }
 
 
@@ -13957,14 +13949,14 @@ NewRootTagCommand* new_root_tag_command_construct (GType object_type) {
 	self = (NewRootTagCommand*) page_command_construct (object_type, _ ("Create Tag"), "");
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 13961 "Commands.c"
+#line 13953 "Commands.c"
 }
 
 
 NewRootTagCommand* new_root_tag_command_new (void) {
 #line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
 	return new_root_tag_command_construct (TYPE_NEW_ROOT_TAG_COMMAND);
-#line 13968 "Commands.c"
+#line 13960 "Commands.c"
 }
 
 
@@ -13977,7 +13969,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->created_proxy;
 #line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 13981 "Commands.c"
+#line 13973 "Commands.c"
 		Tag* _tmp1_;
 		Tag* _tmp2_;
 		SourceProxy* _tmp3_;
@@ -13993,7 +13985,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 		self->priv->created_proxy = _tmp3_;
 #line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp2_);
-#line 13997 "Commands.c"
+#line 13989 "Commands.c"
 	} else {
 		SourceProxy* _tmp4_;
 		DataSource* _tmp5_;
@@ -14006,7 +13998,7 @@ static void new_root_tag_command_real_execute (Command* base) {
 		_tmp6_ = _tmp5_;
 #line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 14010 "Commands.c"
+#line 14002 "Commands.c"
 	}
 }
 
@@ -14042,7 +14034,7 @@ static void new_root_tag_command_real_undo (Command* base) {
 	_g_object_unref0 (_tmp6_);
 #line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (_tmp4_);
-#line 14046 "Commands.c"
+#line 14038 "Commands.c"
 }
 
 
@@ -14060,7 +14052,7 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag);
 #line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14064 "Commands.c"
+#line 14056 "Commands.c"
 }
 
 
@@ -14075,7 +14067,7 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) new_root_tag_command_real_undo;
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize;
-#line 14079 "Commands.c"
+#line 14071 "Commands.c"
 }
 
 
@@ -14084,7 +14076,7 @@ static void new_root_tag_command_instance_init (NewRootTagCommand * self) {
 	self->priv = NEW_ROOT_TAG_COMMAND_GET_PRIVATE (self);
 #line 1657 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->created_proxy = NULL;
-#line 14088 "Commands.c"
+#line 14080 "Commands.c"
 }
 
 
@@ -14096,7 +14088,7 @@ static void new_root_tag_command_finalize (GObject * obj) {
 	_source_proxy_unref0 (self->priv->created_proxy);
 #line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (new_root_tag_command_parent_class)->finalize (obj);
-#line 14100 "Commands.c"
+#line 14092 "Commands.c"
 }
 
 
@@ -14115,7 +14107,7 @@ GType new_root_tag_command_get_type (void) {
 static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
 #line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
 	reparent_tag_command_on_items_destroyed ((ReparentTagCommand*) self, destroyed);
-#line 14119 "Commands.c"
+#line 14111 "Commands.c"
 }
 
 
@@ -14206,7 +14198,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_tmp15_ = new_parent_path;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (g_strcmp0 (_tmp15_, TAG_PATH_SEPARATOR_STRING) == 0) {
-#line 14210 "Commands.c"
+#line 14202 "Commands.c"
 		gchar* _tmp16_ = NULL;
 		gboolean _tmp17_;
 		gchar* _tmp22_;
@@ -14214,7 +14206,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_tmp17_ = has_children;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp17_) {
-#line 14218 "Commands.c"
+#line 14210 "Commands.c"
 			const gchar* _tmp18_;
 			gchar* _tmp19_;
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14225,7 +14217,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _tmp19_;
-#line 14229 "Commands.c"
+#line 14221 "Commands.c"
 		} else {
 			const gchar* _tmp20_;
 			gchar* _tmp21_;
@@ -14237,7 +14229,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp16_);
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _tmp21_;
-#line 14241 "Commands.c"
+#line 14233 "Commands.c"
 		}
 #line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp22_ = g_strdup (_tmp16_);
@@ -14247,7 +14239,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		self->priv->to_path = _tmp22_;
 #line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp16_);
-#line 14251 "Commands.c"
+#line 14243 "Commands.c"
 	} else {
 		const gchar* _tmp23_;
 		gboolean _tmp24_;
@@ -14257,7 +14249,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_tmp24_ = g_str_has_prefix (_tmp23_, TAG_PATH_SEPARATOR_STRING);
 #line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp24_) {
-#line 14261 "Commands.c"
+#line 14253 "Commands.c"
 			const gchar* _tmp25_;
 			gchar* _tmp26_;
 			gchar* _tmp27_;
@@ -14279,7 +14271,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			self->priv->to_path = _tmp29_;
 #line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (_tmp27_);
-#line 14283 "Commands.c"
+#line 14275 "Commands.c"
 		} else {
 			const gchar* _tmp30_;
 			gchar* _tmp31_;
@@ -14310,7 +14302,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 			_g_free0 (_tmp34_);
 #line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (_tmp32_);
-#line 14314 "Commands.c"
+#line 14306 "Commands.c"
 		}
 	}
 #line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14323,7 +14315,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_tmp39_ = new_to_path;
 #line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp39_ != NULL) {
-#line 14327 "Commands.c"
+#line 14319 "Commands.c"
 		const gchar* _tmp40_;
 		gchar* _tmp41_;
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14334,7 +14326,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 		_g_free0 (self->priv->to_path);
 #line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path = _tmp41_;
-#line 14338 "Commands.c"
+#line 14330 "Commands.c"
 	}
 #line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp42_ = tag_global;
@@ -14346,7 +14338,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	if (_tmp44_) {
 #line 1715 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_exists = TRUE;
-#line 14350 "Commands.c"
+#line 14342 "Commands.c"
 	}
 #line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp45_ = self->priv->sources_in_play;
@@ -14374,14 +14366,14 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 	_g_free0 (basename);
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 14378 "Commands.c"
+#line 14370 "Commands.c"
 }
 
 
 ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path) {
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	return reparent_tag_command_construct (TYPE_REPARENT_TAG_COMMAND, tag, new_parent_path);
-#line 14385 "Commands.c"
+#line 14377 "Commands.c"
 }
 
 
@@ -14390,7 +14382,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 	g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
 #line 1728 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 14394 "Commands.c"
+#line 14386 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -14403,7 +14395,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 		_source_it = _tmp1_;
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14407 "Commands.c"
+#line 14399 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -14420,7 +14412,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			if (!_tmp3_) {
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14424 "Commands.c"
+#line 14416 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -14436,7 +14428,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 			_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1730 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp8_) {
-#line 14440 "Commands.c"
+#line 14432 "Commands.c"
 				CommandManager* _tmp9_;
 				CommandManager* _tmp10_;
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14447,15 +14439,15 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
 				command_manager_reset (_tmp10_);
 #line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
 				_command_manager_unref0 (_tmp10_);
-#line 14451 "Commands.c"
+#line 14443 "Commands.c"
 			}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 14455 "Commands.c"
+#line 14447 "Commands.c"
 		}
 #line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 14459 "Commands.c"
+#line 14451 "Commands.c"
 	}
 }
 
@@ -14475,20 +14467,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 14479 "Commands.c"
+#line 14471 "Commands.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 14486 "Commands.c"
+#line 14478 "Commands.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 14492 "Commands.c"
+#line 14484 "Commands.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -14498,11 +14490,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 14502 "Commands.c"
+#line 14494 "Commands.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 14506 "Commands.c"
+#line 14498 "Commands.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -14510,7 +14502,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 14514 "Commands.c"
+#line 14506 "Commands.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -14542,8 +14534,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14546 "Commands.c"
-				goto __catch461_g_regex_error;
+#line 14538 "Commands.c"
+				goto __catch469_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -14551,7 +14543,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14555 "Commands.c"
+#line 14547 "Commands.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -14567,8 +14559,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14571 "Commands.c"
-				goto __catch461_g_regex_error;
+#line 14563 "Commands.c"
+				goto __catch469_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -14578,7 +14570,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 14582 "Commands.c"
+#line 14574 "Commands.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -14592,10 +14584,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 14596 "Commands.c"
+#line 14588 "Commands.c"
 	}
-	goto __finally461;
-	__catch461_g_regex_error:
+	goto __finally469;
+	__catch469_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -14606,9 +14598,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 14610 "Commands.c"
+#line 14602 "Commands.c"
 	}
-	__finally461:
+	__finally469:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -14617,7 +14609,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 14621 "Commands.c"
+#line 14613 "Commands.c"
 	}
 }
 
@@ -14658,20 +14650,20 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_tmp3_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14662 "Commands.c"
+#line 14654 "Commands.c"
 		const gchar* _tmp4_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14668 "Commands.c"
+#line 14660 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14675 "Commands.c"
+#line 14667 "Commands.c"
 	}
 #line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14697,7 +14689,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_g_free0 (path);
 #line 1743 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 14701 "Commands.c"
+#line 14693 "Commands.c"
 	}
 #line 1745 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = path;
@@ -14719,7 +14711,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (_tmp15_);
 #line 1747 "/home/jens/Source/shotwell/src/Commands.vala"
 	path_prefix = _tmp17_;
-#line 14723 "Commands.c"
+#line 14715 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
 		Tag* _tmp18_;
@@ -14747,7 +14739,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 		_t_index = -1;
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14751 "Commands.c"
+#line 14743 "Commands.c"
 			gint _tmp23_;
 			gint _tmp24_;
 			gint _tmp25_;
@@ -14785,7 +14777,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14789 "Commands.c"
+#line 14781 "Commands.c"
 			}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -14847,11 +14839,11 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 			_g_free0 (child_subpath);
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 14851 "Commands.c"
+#line 14843 "Commands.c"
 		}
 #line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 14855 "Commands.c"
+#line 14847 "Commands.c"
 	}
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	result = _result_;
@@ -14863,7 +14855,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
 	_g_free0 (path);
 #line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 14867 "Commands.c"
+#line 14859 "Commands.c"
 }
 
 
@@ -14897,20 +14889,20 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp3_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 14901 "Commands.c"
+#line 14893 "Commands.c"
 		const gchar* _tmp4_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 14907 "Commands.c"
+#line 14899 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 14914 "Commands.c"
+#line 14906 "Commands.c"
 	}
 #line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -14930,7 +14922,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1765 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 14934 "Commands.c"
+#line 14926 "Commands.c"
 	{
 		GeeIterator* _child_subpath_it = NULL;
 		GeeMap* _tmp12_;
@@ -14957,7 +14949,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 		_child_subpath_it = _tmp17_;
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 14961 "Commands.c"
+#line 14953 "Commands.c"
 			GeeIterator* _tmp18_;
 			gboolean _tmp19_;
 			gchar* child_subpath = NULL;
@@ -14988,7 +14980,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			if (!_tmp19_) {
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 14992 "Commands.c"
+#line 14984 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp20_ = _child_subpath_it;
@@ -15032,7 +15024,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_g_free0 (_tmp32_);
 #line 1770 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp34_) {
-#line 15036 "Commands.c"
+#line 15028 "Commands.c"
 				Tag* _tmp35_;
 				Tag* _tmp36_;
 				gchar* _tmp37_;
@@ -15067,7 +15059,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_g_free0 (_tmp40_);
 #line 1772 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (_tmp38_);
-#line 15071 "Commands.c"
+#line 15063 "Commands.c"
 			}
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp43_ = tag_global;
@@ -15077,7 +15069,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 			_tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
 #line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
 			_vala_assert (_tmp45_, "Tag.global.exists(child_path)");
-#line 15081 "Commands.c"
+#line 15073 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp46_;
@@ -15104,7 +15096,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 				_s_it = _tmp51_;
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15108 "Commands.c"
+#line 15100 "Commands.c"
 					GeeIterator* _tmp52_;
 					gboolean _tmp53_;
 					MediaSource* s = NULL;
@@ -15122,7 +15114,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					if (!_tmp53_) {
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15126 "Commands.c"
+#line 15118 "Commands.c"
 					}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp54_ = _s_it;
@@ -15144,21 +15136,21 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 					_g_object_unref0 (_tmp58_);
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 15148 "Commands.c"
+#line 15140 "Commands.c"
 				}
 #line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 15152 "Commands.c"
+#line 15144 "Commands.c"
 			}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_path);
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
-#line 15158 "Commands.c"
+#line 15150 "Commands.c"
 		}
 #line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_child_subpath_it);
-#line 15162 "Commands.c"
+#line 15154 "Commands.c"
 	}
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15166,7 +15158,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
 	_g_free0 (path);
 #line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15170 "Commands.c"
+#line 15162 "Commands.c"
 }
 
 
@@ -15198,20 +15190,20 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp3_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp3_ != NULL) {
-#line 15202 "Commands.c"
+#line 15194 "Commands.c"
 		const gchar* _tmp4_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp4_ = new_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp4_;
-#line 15208 "Commands.c"
+#line 15200 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp5_ = client_path;
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _tmp5_;
-#line 15215 "Commands.c"
+#line 15207 "Commands.c"
 	}
 #line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -15231,7 +15223,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_tmp11_ = tag_for_path (_tmp10_);
 #line 1788 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag = _tmp11_;
-#line 15235 "Commands.c"
+#line 15227 "Commands.c"
 	{
 		GeeIterator* _s_it = NULL;
 		GeeHashSet* _tmp12_;
@@ -15244,7 +15236,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 		_s_it = _tmp13_;
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 15248 "Commands.c"
+#line 15240 "Commands.c"
 			GeeIterator* _tmp14_;
 			gboolean _tmp15_;
 			MediaSource* s = NULL;
@@ -15260,7 +15252,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			if (!_tmp15_) {
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 15264 "Commands.c"
+#line 15256 "Commands.c"
 			}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = _s_it;
@@ -15276,11 +15268,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 			tag_attach (_tmp18_, _tmp19_);
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (s);
-#line 15280 "Commands.c"
+#line 15272 "Commands.c"
 		}
 #line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_s_it);
-#line 15284 "Commands.c"
+#line 15276 "Commands.c"
 	}
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (tag);
@@ -15288,7 +15280,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
 	_g_free0 (path);
 #line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (new_path);
-#line 15292 "Commands.c"
+#line 15284 "Commands.c"
 }
 
 
@@ -15399,7 +15391,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp20_ = _tmp19_;
 #line 1812 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp20_ > 0) {
-#line 15403 "Commands.c"
+#line 15395 "Commands.c"
 		GeeList* _tmp21_;
 		GeeList* _tmp22_;
 		gint _tmp23_;
@@ -15419,13 +15411,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_free0 (self->priv->to_path_parent_path);
 #line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->to_path_parent_path = (gchar*) _tmp25_;
-#line 15423 "Commands.c"
+#line 15415 "Commands.c"
 	}
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp26_ = self->priv->to_path_parent_path;
 #line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp26_ != NULL) {
-#line 15429 "Commands.c"
+#line 15421 "Commands.c"
 		GeeMap* _tmp27_;
 		const gchar* _tmp28_;
 		GeeMap* _tmp29_;
@@ -15441,13 +15433,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (self->priv->existing_dest_child_structure);
 #line 1816 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->existing_dest_child_structure = _tmp29_;
-#line 15445 "Commands.c"
+#line 15437 "Commands.c"
 	}
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp30_ = self->priv->to_path_parent_path;
 #line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp30_ == NULL) {
-#line 15451 "Commands.c"
+#line 15443 "Commands.c"
 		GeeMap* _tmp31_;
 		GeeSet* _tmp32_;
 		const gchar* _tmp33_;
@@ -15499,13 +15491,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp41_);
 #line 1825 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp39_);
-#line 15503 "Commands.c"
+#line 15495 "Commands.c"
 	}
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp42_ = self->priv->to_path_parent_path;
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp42_ != NULL) {
-#line 15509 "Commands.c"
+#line 15501 "Commands.c"
 		gchar* new_tpp = NULL;
 		const gchar* _tmp43_;
 		gchar* _tmp44_;
@@ -15531,20 +15523,20 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp46_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp46_ != NULL) {
-#line 15535 "Commands.c"
+#line 15527 "Commands.c"
 			const gchar* _tmp47_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp47_ = new_tpp;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp47_;
-#line 15541 "Commands.c"
+#line 15533 "Commands.c"
 		} else {
 			const gchar* _tmp48_;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp48_ = self->priv->to_path_parent_path;
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp45_ = _tmp48_;
-#line 15548 "Commands.c"
+#line 15540 "Commands.c"
 		}
 #line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp49_ = g_strdup (_tmp45_);
@@ -15580,13 +15572,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp56_);
 #line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 15584 "Commands.c"
+#line 15576 "Commands.c"
 	}
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp59_ = self->priv->to_path_parent_path;
 #line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp59_ == NULL) {
-#line 15590 "Commands.c"
+#line 15582 "Commands.c"
 		GeeList* _tmp60_;
 		const gchar* _tmp61_;
 		Tag* _tmp62_;
@@ -15611,7 +15603,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_source_proxy_unref0 (_tmp65_);
 #line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp63_);
-#line 15615 "Commands.c"
+#line 15607 "Commands.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp66_ = from_tag;
@@ -15619,7 +15611,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp67_ = tag_get_hierarchical_children (_tmp66_);
 #line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp67_;
-#line 15623 "Commands.c"
+#line 15615 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp68_;
@@ -15633,14 +15625,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_tmp70_ = _tmp69_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp70_ - 1;
-#line 15637 "Commands.c"
+#line 15629 "Commands.c"
 		{
 			gboolean _tmp71_ = FALSE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp71_ = TRUE;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 15644 "Commands.c"
+#line 15636 "Commands.c"
 				gint _tmp73_;
 				GeeList* _tmp74_;
 				GeeList* _tmp75_;
@@ -15651,13 +15643,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				SourceProxy* _tmp80_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp71_) {
-#line 15655 "Commands.c"
+#line 15647 "Commands.c"
 					gint _tmp72_;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp72_ = i;
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp72_ - 1;
-#line 15661 "Commands.c"
+#line 15653 "Commands.c"
 				}
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp71_ = FALSE;
@@ -15667,7 +15659,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				if (!(_tmp73_ >= 0)) {
 #line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 15671 "Commands.c"
+#line 15663 "Commands.c"
 				}
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp74_ = self->priv->src_before_state;
@@ -15689,7 +15681,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp80_);
 #line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp78_);
-#line 15693 "Commands.c"
+#line 15685 "Commands.c"
 			}
 		}
 	}
@@ -15697,7 +15689,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_tmp81_ = self->priv->to_path_parent_path;
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp81_ != NULL) {
-#line 15701 "Commands.c"
+#line 15693 "Commands.c"
 		GeeList* to_children = NULL;
 		const gchar* _tmp82_;
 		Tag* _tmp83_;
@@ -15718,7 +15710,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp84_);
 #line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp86_;
-#line 15722 "Commands.c"
+#line 15714 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp87_;
@@ -15732,14 +15724,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp89_ = _tmp88_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp89_ - 1;
-#line 15736 "Commands.c"
+#line 15728 "Commands.c"
 			{
 				gboolean _tmp90_ = FALSE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp90_ = TRUE;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15743 "Commands.c"
+#line 15735 "Commands.c"
 					gint _tmp92_;
 					GeeList* _tmp93_;
 					GeeList* _tmp94_;
@@ -15750,13 +15742,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					SourceProxy* _tmp99_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp90_) {
-#line 15754 "Commands.c"
+#line 15746 "Commands.c"
 						gint _tmp91_;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp91_ = i;
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp91_ - 1;
-#line 15760 "Commands.c"
+#line 15752 "Commands.c"
 					}
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp90_ = FALSE;
@@ -15766,7 +15758,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp92_ >= 0)) {
 #line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15770 "Commands.c"
+#line 15762 "Commands.c"
 					}
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp93_ = self->priv->dest_before_state;
@@ -15788,19 +15780,19 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp99_);
 #line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp97_);
-#line 15792 "Commands.c"
+#line 15784 "Commands.c"
 				}
 			}
 		}
 #line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15798 "Commands.c"
+#line 15790 "Commands.c"
 	}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp100_ = self->priv->to_path_parent_path;
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp100_ == NULL) {
-#line 15804 "Commands.c"
+#line 15796 "Commands.c"
 		GeeList* to_children = NULL;
 		const gchar* _tmp101_;
 		Tag* _tmp102_;
@@ -15821,7 +15813,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 		_g_object_unref0 (_tmp103_);
 #line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
 		to_children = _tmp105_;
-#line 15825 "Commands.c"
+#line 15817 "Commands.c"
 		{
 			gint i = 0;
 			GeeList* _tmp106_;
@@ -15835,14 +15827,14 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 			_tmp108_ = _tmp107_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 			i = _tmp108_ - 1;
-#line 15839 "Commands.c"
+#line 15831 "Commands.c"
 			{
 				gboolean _tmp109_ = FALSE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp109_ = TRUE;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 15846 "Commands.c"
+#line 15838 "Commands.c"
 					gint _tmp111_;
 					GeeList* _tmp112_;
 					GeeList* _tmp113_;
@@ -15853,13 +15845,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					SourceProxy* _tmp118_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp109_) {
-#line 15857 "Commands.c"
+#line 15849 "Commands.c"
 						gint _tmp110_;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp110_ = i;
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						i = _tmp110_ - 1;
-#line 15863 "Commands.c"
+#line 15855 "Commands.c"
 					}
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp109_ = FALSE;
@@ -15869,7 +15861,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					if (!(_tmp111_ >= 0)) {
 #line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 15873 "Commands.c"
+#line 15865 "Commands.c"
 					}
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp112_ = self->priv->dest_before_state;
@@ -15891,13 +15883,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 					_source_proxy_unref0 (_tmp118_);
 #line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp116_);
-#line 15895 "Commands.c"
+#line 15887 "Commands.c"
 				}
 			}
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (to_children);
-#line 15901 "Commands.c"
+#line 15893 "Commands.c"
 	}
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_children);
@@ -15905,7 +15897,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
 	_g_object_unref0 (parent_paths);
 #line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 15909 "Commands.c"
+#line 15901 "Commands.c"
 }
 
 
@@ -15928,7 +15920,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 15932 "Commands.c"
+#line 15924 "Commands.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -15936,7 +15928,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 15940 "Commands.c"
+#line 15932 "Commands.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -15948,7 +15940,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 15952 "Commands.c"
+#line 15944 "Commands.c"
 	}
 }
 
@@ -15972,21 +15964,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 15976 "Commands.c"
+#line 15968 "Commands.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 15982 "Commands.c"
+#line 15974 "Commands.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 15986 "Commands.c"
+#line 15978 "Commands.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 15990 "Commands.c"
+#line 15982 "Commands.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -15998,7 +15990,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 16002 "Commands.c"
+#line 15994 "Commands.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -16008,13 +16000,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 16012 "Commands.c"
+#line 16004 "Commands.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 16018 "Commands.c"
+#line 16010 "Commands.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -16028,7 +16020,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 16032 "Commands.c"
+#line 16024 "Commands.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -16038,13 +16030,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 16042 "Commands.c"
+#line 16034 "Commands.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 16048 "Commands.c"
+#line 16040 "Commands.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -16053,7 +16045,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 16057 "Commands.c"
+#line 16049 "Commands.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -16073,7 +16065,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 16077 "Commands.c"
+#line 16069 "Commands.c"
 }
 
 
@@ -16100,7 +16092,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp2_ = self->priv->to_path_parent_path;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 16104 "Commands.c"
+#line 16096 "Commands.c"
 		gchar* new_tpp = NULL;
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
@@ -16117,20 +16109,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp6_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ != NULL) {
-#line 16121 "Commands.c"
+#line 16113 "Commands.c"
 			const gchar* _tmp7_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = new_tpp;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp7_;
-#line 16127 "Commands.c"
+#line 16119 "Commands.c"
 		} else {
 			const gchar* _tmp8_;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = self->priv->to_path_parent_path;
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = _tmp8_;
-#line 16134 "Commands.c"
+#line 16126 "Commands.c"
 		}
 #line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp9_ = g_strdup (_tmp5_);
@@ -16140,32 +16132,32 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		self->priv->to_path_parent_path = _tmp9_;
 #line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_tpp);
-#line 16144 "Commands.c"
+#line 16136 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp11_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp11_ != NULL) {
-#line 16150 "Commands.c"
+#line 16142 "Commands.c"
 		const gchar* _tmp12_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp12_ = self->priv->to_path_parent_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp12_;
-#line 16156 "Commands.c"
+#line 16148 "Commands.c"
 	} else {
 		const gchar* _tmp13_;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp13_ = self->priv->to_path;
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = _tmp13_;
-#line 16163 "Commands.c"
+#line 16155 "Commands.c"
 	}
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp14_ = g_strdup (_tmp10_);
 #line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
 	unwind_target = _tmp14_;
-#line 16169 "Commands.c"
+#line 16161 "Commands.c"
 	{
 		GeeList* _t_list = NULL;
 		const gchar* _tmp15_;
@@ -16204,7 +16196,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_t_index = -1;
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 16208 "Commands.c"
+#line 16200 "Commands.c"
 			gint _tmp23_;
 			gint _tmp24_;
 			gint _tmp25_;
@@ -16236,7 +16228,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			if (!(_tmp24_ < _tmp25_)) {
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 16240 "Commands.c"
+#line 16232 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp26_ = _t_list;
@@ -16268,7 +16260,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp36_ = g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING);
 #line 1876 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp36_) {
-#line 16272 "Commands.c"
+#line 16264 "Commands.c"
 				const gchar* _tmp37_;
 				gchar* _tmp38_;
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16279,7 +16271,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_free0 (child_subpath);
 #line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
 				child_subpath = _tmp38_;
-#line 16283 "Commands.c"
+#line 16275 "Commands.c"
 			}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp39_ = self->priv->existing_dest_child_structure;
@@ -16289,7 +16281,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_tmp41_ = gee_map_has_key (_tmp39_, _tmp40_);
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (!_tmp41_) {
-#line 16293 "Commands.c"
+#line 16285 "Commands.c"
 				TagSourceCollection* _tmp42_;
 				TagSourceCollection* _tmp43_;
 				Tag* _tmp44_;
@@ -16309,7 +16301,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp46_, TRUE, NULL, NULL, NULL);
 #line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp46_);
-#line 16313 "Commands.c"
+#line 16305 "Commands.c"
 			} else {
 				GeeSet* starting_sources = NULL;
 				GeeHashSet* _tmp47_;
@@ -16333,7 +16325,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);
 #line 1883 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp51_);
-#line 16337 "Commands.c"
+#line 16329 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
 					GeeSet* _tmp52_;
@@ -16346,7 +16338,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 					_source_it = _tmp53_;
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 16350 "Commands.c"
+#line 16342 "Commands.c"
 						GeeIterator* _tmp54_;
 						gboolean _tmp55_;
 						MediaSource* source = NULL;
@@ -16367,7 +16359,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						if (!_tmp55_) {
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 16371 "Commands.c"
+#line 16363 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp56_ = _source_it;
@@ -16393,7 +16385,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 						_g_object_unref0 (_tmp61_);
 #line 1885 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp64_) {
-#line 16397 "Commands.c"
+#line 16389 "Commands.c"
 							Tag* _tmp65_;
 							MediaSource* _tmp66_;
 							GeeList* _tmp67_;
@@ -16408,42 +16400,42 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 							_tmp68_ = _tmp67_;
 #line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp68_);
-#line 16412 "Commands.c"
+#line 16404 "Commands.c"
 						}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 16416 "Commands.c"
+#line 16408 "Commands.c"
 					}
 #line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 16420 "Commands.c"
+#line 16412 "Commands.c"
 				}
 #line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (starting_sources);
-#line 16424 "Commands.c"
+#line 16416 "Commands.c"
 			}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (child_subpath);
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (t);
-#line 16430 "Commands.c"
+#line 16422 "Commands.c"
 		}
 #line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_t_list);
-#line 16434 "Commands.c"
+#line 16426 "Commands.c"
 	}
 	{
 		gint i = 0;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16440 "Commands.c"
+#line 16432 "Commands.c"
 		{
 			gboolean _tmp69_ = FALSE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp69_ = TRUE;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16447 "Commands.c"
+#line 16439 "Commands.c"
 				gint _tmp71_;
 				GeeList* _tmp72_;
 				gint _tmp73_;
@@ -16456,13 +16448,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				DataSource* _tmp80_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp69_) {
-#line 16460 "Commands.c"
+#line 16452 "Commands.c"
 					gint _tmp70_;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp70_ = i;
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp70_ + 1;
-#line 16466 "Commands.c"
+#line 16458 "Commands.c"
 				}
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp69_ = FALSE;
@@ -16478,7 +16470,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp71_ < _tmp74_)) {
 #line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16482 "Commands.c"
+#line 16474 "Commands.c"
 				}
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp75_ = self->priv->src_before_state;
@@ -16496,7 +16488,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp80_);
 #line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp78_);
-#line 16500 "Commands.c"
+#line 16492 "Commands.c"
 			}
 		}
 	}
@@ -16504,14 +16496,14 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		gint i = 0;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 16508 "Commands.c"
+#line 16500 "Commands.c"
 		{
 			gboolean _tmp81_ = FALSE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp81_ = TRUE;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16515 "Commands.c"
+#line 16507 "Commands.c"
 				gint _tmp83_;
 				GeeList* _tmp84_;
 				gint _tmp85_;
@@ -16524,13 +16516,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				DataSource* _tmp92_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp81_) {
-#line 16528 "Commands.c"
+#line 16520 "Commands.c"
 					gint _tmp82_;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp82_ = i;
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp82_ + 1;
-#line 16534 "Commands.c"
+#line 16526 "Commands.c"
 				}
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp81_ = FALSE;
@@ -16546,7 +16538,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp83_ < _tmp86_)) {
 #line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16550 "Commands.c"
+#line 16542 "Commands.c"
 				}
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp87_ = self->priv->dest_before_state;
@@ -16564,7 +16556,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp92_);
 #line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp90_);
-#line 16568 "Commands.c"
+#line 16560 "Commands.c"
 			}
 		}
 	}
@@ -16572,7 +16564,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 	_tmp93_ = self->priv->to_path_parent_path;
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp93_ != NULL) {
-#line 16576 "Commands.c"
+#line 16568 "Commands.c"
 		gchar* new_path = NULL;
 		const gchar* _tmp94_;
 		gchar* _tmp95_;
@@ -16601,20 +16593,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp97_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp97_ != NULL) {
-#line 16605 "Commands.c"
+#line 16597 "Commands.c"
 			const gchar* _tmp98_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp98_ = new_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp98_;
-#line 16611 "Commands.c"
+#line 16603 "Commands.c"
 		} else {
 			const gchar* _tmp99_;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp99_ = self->priv->to_path_parent_path;
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp96_ = _tmp99_;
-#line 16618 "Commands.c"
+#line 16610 "Commands.c"
 		}
 #line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp100_ = g_strdup (_tmp96_);
@@ -16640,7 +16632,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_tmp107_ = tag_get_hierarchical_children (_tmp106_);
 #line 1904 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp107_;
-#line 16644 "Commands.c"
+#line 16636 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
 			GeeList* _tmp108_;
@@ -16668,7 +16660,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16672 "Commands.c"
+#line 16664 "Commands.c"
 				gint _tmp113_;
 				gint _tmp114_;
 				gint _tmp115_;
@@ -16694,7 +16686,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp114_ < _tmp115_)) {
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16698 "Commands.c"
+#line 16690 "Commands.c"
 				}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp116_ = _kidtag_list;
@@ -16722,11 +16714,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp122_);
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16726 "Commands.c"
+#line 16718 "Commands.c"
 			}
 #line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16730 "Commands.c"
+#line 16722 "Commands.c"
 		}
 #line 1908 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp125_ = path;
@@ -16742,7 +16734,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_free0 (path);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (new_path);
-#line 16746 "Commands.c"
+#line 16738 "Commands.c"
 	} else {
 		GeeSet* _tmp127_;
 		const gchar* _tmp128_;
@@ -16825,7 +16817,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		_g_object_unref0 (_tmp144_);
 #line 1914 "/home/jens/Source/shotwell/src/Commands.vala"
 		kids = _tmp146_;
-#line 16829 "Commands.c"
+#line 16821 "Commands.c"
 		{
 			GeeList* _kidtag_list = NULL;
 			GeeList* _tmp147_;
@@ -16853,7 +16845,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 			_kidtag_index = -1;
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 16857 "Commands.c"
+#line 16849 "Commands.c"
 				gint _tmp152_;
 				gint _tmp153_;
 				gint _tmp154_;
@@ -16879,7 +16871,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				if (!(_tmp153_ < _tmp154_)) {
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 16883 "Commands.c"
+#line 16875 "Commands.c"
 				}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp155_ = _kidtag_list;
@@ -16907,11 +16899,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp161_);
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (kidtag);
-#line 16911 "Commands.c"
+#line 16903 "Commands.c"
 			}
 #line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_kidtag_list);
-#line 16915 "Commands.c"
+#line 16907 "Commands.c"
 		}
 #line 1918 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp164_ = self->priv->to_path;
@@ -16921,11 +16913,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
 		reparent_tag_command_restore_child_attachments_at (self, _tmp164_, _tmp165_);
 #line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (kids);
-#line 16925 "Commands.c"
+#line 16917 "Commands.c"
 	}
 #line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (unwind_target);
-#line 16929 "Commands.c"
+#line 16921 "Commands.c"
 }
 
 
@@ -16989,7 +16981,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_tmp12_ = tag_get_hierarchical_children (_tmp11_);
 #line 1933 "/home/jens/Source/shotwell/src/Commands.vala"
 	to_children = _tmp12_;
-#line 16993 "Commands.c"
+#line 16985 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp13_;
@@ -17003,14 +16995,14 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 		_tmp15_ = _tmp14_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp15_ - 1;
-#line 17007 "Commands.c"
+#line 16999 "Commands.c"
 		{
 			gboolean _tmp16_ = FALSE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp16_ = TRUE;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17014 "Commands.c"
+#line 17006 "Commands.c"
 				gint _tmp18_;
 				GeeList* _tmp19_;
 				GeeList* _tmp20_;
@@ -17021,13 +17013,13 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				SourceProxy* _tmp25_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp16_) {
-#line 17025 "Commands.c"
+#line 17017 "Commands.c"
 					gint _tmp17_;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp17_ = i;
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp17_ - 1;
-#line 17031 "Commands.c"
+#line 17023 "Commands.c"
 				}
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp16_ = FALSE;
@@ -17037,7 +17029,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				if (!(_tmp18_ >= 0)) {
 #line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17041 "Commands.c"
+#line 17033 "Commands.c"
 				}
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp19_ = self->priv->after_state;
@@ -17059,7 +17051,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 				_source_proxy_unref0 (_tmp25_);
 #line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 17063 "Commands.c"
+#line 17055 "Commands.c"
 			}
 		}
 	}
@@ -17067,7 +17059,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
 	_g_object_unref0 (to_children);
 #line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (to_tag);
-#line 17071 "Commands.c"
+#line 17063 "Commands.c"
 }
 
 
@@ -17079,19 +17071,19 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 	_tmp0_ = self->priv->after_state;
 #line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "after_state != null");
-#line 17083 "Commands.c"
+#line 17075 "Commands.c"
 	{
 		gint i = 0;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 17088 "Commands.c"
+#line 17080 "Commands.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp1_ = TRUE;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17095 "Commands.c"
+#line 17087 "Commands.c"
 				gint _tmp3_;
 				GeeList* _tmp4_;
 				gint _tmp5_;
@@ -17104,13 +17096,13 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				DataSource* _tmp12_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp1_) {
-#line 17108 "Commands.c"
+#line 17100 "Commands.c"
 					gint _tmp2_;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp2_ = i;
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp2_ + 1;
-#line 17114 "Commands.c"
+#line 17106 "Commands.c"
 				}
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp1_ = FALSE;
@@ -17126,7 +17118,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				if (!(_tmp3_ < _tmp6_)) {
 #line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17130 "Commands.c"
+#line 17122 "Commands.c"
 				}
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp7_ = self->priv->after_state;
@@ -17144,7 +17136,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
 				_g_object_unref0 (_tmp12_);
 #line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
 				_source_proxy_unref0 (_tmp10_);
-#line 17148 "Commands.c"
+#line 17140 "Commands.c"
 			}
 		}
 	}
@@ -17168,7 +17160,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 	_tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING);
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 17172 "Commands.c"
+#line 17164 "Commands.c"
 		GeeList* parent_paths = NULL;
 		const gchar* _tmp2_;
 		GeeList* _tmp3_;
@@ -17189,7 +17181,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 		_tmp6_ = _tmp5_;
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp6_ > 0) {
-#line 17193 "Commands.c"
+#line 17185 "Commands.c"
 			gchar* immediate_parent_path = NULL;
 			GeeList* _tmp7_;
 			GeeList* _tmp8_;
@@ -17219,7 +17211,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 			_tmp14_ = tag_source_collection_exists (_tmp12_, _tmp13_, FALSE);
 #line 1952 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp14_) {
-#line 17223 "Commands.c"
+#line 17215 "Commands.c"
 				const gchar* _tmp15_;
 				Tag* _tmp16_;
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17230,7 +17222,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_object_unref0 (new_parent);
 #line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
 				new_parent = _tmp16_;
-#line 17234 "Commands.c"
+#line 17226 "Commands.c"
 			} else {
 				TagSourceCollection* _tmp17_;
 				const gchar* _tmp18_;
@@ -17254,7 +17246,7 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 				_g_free0 (_tmp20_);
 #line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (_tmp22_) {
-#line 17258 "Commands.c"
+#line 17250 "Commands.c"
 					const gchar* _tmp23_;
 					gchar* _tmp24_;
 					gchar* _tmp25_;
@@ -17273,36 +17265,36 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
 					new_parent = _tmp26_;
 #line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (_tmp25_);
-#line 17277 "Commands.c"
+#line 17269 "Commands.c"
 				} else {
 #line 1957 "/home/jens/Source/shotwell/src/Commands.vala"
 					g_assert_not_reached ();
-#line 17281 "Commands.c"
+#line 17273 "Commands.c"
 				}
 			}
 #line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (immediate_parent_path);
-#line 17286 "Commands.c"
+#line 17278 "Commands.c"
 		}
 #line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (parent_paths);
-#line 17290 "Commands.c"
+#line 17282 "Commands.c"
 	}
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp27_ = new_parent;
 #line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp27_ != NULL) {
-#line 17296 "Commands.c"
+#line 17288 "Commands.c"
 		Tag* _tmp28_;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp28_ = new_parent;
 #line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_promote (_tmp28_);
-#line 17302 "Commands.c"
+#line 17294 "Commands.c"
 	}
 #line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_parent);
-#line 17306 "Commands.c"
+#line 17298 "Commands.c"
 }
 
 
@@ -17334,7 +17326,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 	_tmp5_ = self->priv->src_parent_detachments;
 #line 1969 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_ == NULL) {
-#line 17338 "Commands.c"
+#line 17330 "Commands.c"
 		GeeHashMap* _tmp6_;
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -17342,7 +17334,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 		_g_object_unref0 (self->priv->src_parent_detachments);
 #line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
 		self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 17346 "Commands.c"
+#line 17338 "Commands.c"
 		{
 			GeeIterator* _source_it = NULL;
 			Tag* _tmp7_;
@@ -17366,7 +17358,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_source_it = _tmp11_;
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 17370 "Commands.c"
+#line 17362 "Commands.c"
 				GeeIterator* _tmp12_;
 				gboolean _tmp13_;
 				MediaSource* source = NULL;
@@ -17387,7 +17379,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				if (!_tmp13_) {
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 17391 "Commands.c"
+#line 17383 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp14_ = _source_it;
@@ -17411,7 +17403,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				running_attach_count = _tmp20_ + 1;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17415 "Commands.c"
+#line 17407 "Commands.c"
 					Tag* _tmp21_;
 					gchar* current_parent_path = NULL;
 					Tag* _tmp22_;
@@ -17436,7 +17428,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					if (!(_tmp21_ != NULL)) {
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17440 "Commands.c"
+#line 17432 "Commands.c"
 					}
 #line 1975 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp22_ = current_parent;
@@ -17452,7 +17444,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp26_ = gee_map_has_key (_tmp24_, _tmp25_);
 #line 1976 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (!_tmp26_) {
-#line 17456 "Commands.c"
+#line 17448 "Commands.c"
 						GeeMap* _tmp27_;
 						const gchar* _tmp28_;
 						GeeHashSet* _tmp29_;
@@ -17469,7 +17461,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_map_set (_tmp27_, _tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_SET, GeeSet));
 #line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp30_);
-#line 17473 "Commands.c"
+#line 17465 "Commands.c"
 					}
 #line 1979 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp31_ = current_parent;
@@ -17491,7 +17483,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_tmp37_ = running_attach_count;
 #line 1985 "/home/jens/Source/shotwell/src/Commands.vala"
 					if (_tmp36_ == _tmp37_) {
-#line 17495 "Commands.c"
+#line 17487 "Commands.c"
 						GeeMap* _tmp38_;
 						const gchar* _tmp39_;
 						gpointer _tmp40_;
@@ -17511,7 +17503,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
 #line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (_tmp41_);
-#line 17515 "Commands.c"
+#line 17507 "Commands.c"
 					}
 #line 1988 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp43_ = running_attach_count;
@@ -17527,17 +17519,17 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					current_parent = _tmp45_;
 #line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_free0 (current_parent_path);
-#line 17531 "Commands.c"
+#line 17523 "Commands.c"
 				}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (current_parent);
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (source);
-#line 17537 "Commands.c"
+#line 17529 "Commands.c"
 			}
 #line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_source_it);
-#line 17541 "Commands.c"
+#line 17533 "Commands.c"
 		}
 	}
 	{
@@ -17566,7 +17558,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 		_p_it = _tmp51_;
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17570 "Commands.c"
+#line 17562 "Commands.c"
 			GeeIterator* _tmp52_;
 			gboolean _tmp53_;
 			gchar* p = NULL;
@@ -17580,7 +17572,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			if (!_tmp53_) {
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17584 "Commands.c"
+#line 17576 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp54_ = _p_it;
@@ -17588,7 +17580,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 			_tmp55_ = gee_iterator_get (_tmp54_);
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp55_;
-#line 17592 "Commands.c"
+#line 17584 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp56_;
@@ -17615,7 +17607,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 				_s_it = _tmp61_;
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17619 "Commands.c"
+#line 17611 "Commands.c"
 					GeeIterator* _tmp62_;
 					gboolean _tmp63_;
 					MediaSource* s = NULL;
@@ -17635,7 +17627,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					if (!_tmp63_) {
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17639 "Commands.c"
+#line 17631 "Commands.c"
 					}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp64_ = _s_it;
@@ -17661,23 +17653,23 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
 					_g_object_unref0 (_tmp68_);
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17665 "Commands.c"
+#line 17657 "Commands.c"
 				}
 #line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17669 "Commands.c"
+#line 17661 "Commands.c"
 			}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17673 "Commands.c"
+#line 17665 "Commands.c"
 		}
 #line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17677 "Commands.c"
+#line 17669 "Commands.c"
 	}
 #line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 17681 "Commands.c"
+#line 17673 "Commands.c"
 }
 
 
@@ -17689,7 +17681,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 	_tmp0_ = self->priv->src_parent_detachments;
 #line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "src_parent_detachments != null");
-#line 17693 "Commands.c"
+#line 17685 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -17716,7 +17708,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 		_p_it = _tmp6_;
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17720 "Commands.c"
+#line 17712 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -17730,7 +17722,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			if (!_tmp8_) {
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17734 "Commands.c"
+#line 17726 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17738,7 +17730,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17742 "Commands.c"
+#line 17734 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -17765,7 +17757,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 				_s_it = _tmp16_;
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17769 "Commands.c"
+#line 17761 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -17783,7 +17775,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					if (!_tmp18_) {
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17787 "Commands.c"
+#line 17779 "Commands.c"
 					}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -17805,19 +17797,19 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
 					_g_object_unref0 (_tmp23_);
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17809 "Commands.c"
+#line 17801 "Commands.c"
 				}
 #line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17813 "Commands.c"
+#line 17805 "Commands.c"
 			}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17817 "Commands.c"
+#line 17809 "Commands.c"
 		}
 #line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17821 "Commands.c"
+#line 17813 "Commands.c"
 	}
 }
 
@@ -17830,7 +17822,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17834 "Commands.c"
+#line 17826 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -17857,7 +17849,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 		_p_it = _tmp6_;
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 17861 "Commands.c"
+#line 17853 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -17871,7 +17863,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			if (!_tmp8_) {
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 17875 "Commands.c"
+#line 17867 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -17879,7 +17871,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 17883 "Commands.c"
+#line 17875 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -17906,7 +17898,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 				_s_it = _tmp16_;
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 17910 "Commands.c"
+#line 17902 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -17926,7 +17918,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					if (!_tmp18_) {
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 17930 "Commands.c"
+#line 17922 "Commands.c"
 					}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -17952,19 +17944,19 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
 					_g_object_unref0 (_tmp23_);
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 17956 "Commands.c"
+#line 17948 "Commands.c"
 				}
 #line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 17960 "Commands.c"
+#line 17952 "Commands.c"
 			}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 17964 "Commands.c"
+#line 17956 "Commands.c"
 		}
 #line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 17968 "Commands.c"
+#line 17960 "Commands.c"
 	}
 }
 
@@ -17977,7 +17969,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 	_tmp0_ = self->priv->dest_parent_attachments;
 #line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
 	_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17981 "Commands.c"
+#line 17973 "Commands.c"
 	{
 		GeeIterator* _p_it = NULL;
 		GeeMap* _tmp1_;
@@ -18004,7 +17996,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 		_p_it = _tmp6_;
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18008 "Commands.c"
+#line 18000 "Commands.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			gchar* p = NULL;
@@ -18018,7 +18010,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			if (!_tmp8_) {
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18022 "Commands.c"
+#line 18014 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = _p_it;
@@ -18026,7 +18018,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			p = (gchar*) _tmp10_;
-#line 18030 "Commands.c"
+#line 18022 "Commands.c"
 			{
 				GeeIterator* _s_it = NULL;
 				GeeMap* _tmp11_;
@@ -18053,7 +18045,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 				_s_it = _tmp16_;
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				while (TRUE) {
-#line 18057 "Commands.c"
+#line 18049 "Commands.c"
 					GeeIterator* _tmp17_;
 					gboolean _tmp18_;
 					MediaSource* s = NULL;
@@ -18071,7 +18063,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					if (!_tmp18_) {
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 						break;
-#line 18075 "Commands.c"
+#line 18067 "Commands.c"
 					}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp19_ = _s_it;
@@ -18093,19 +18085,19 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
 					_g_object_unref0 (_tmp23_);
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (s);
-#line 18097 "Commands.c"
+#line 18089 "Commands.c"
 				}
 #line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_s_it);
-#line 18101 "Commands.c"
+#line 18093 "Commands.c"
 			}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (p);
-#line 18105 "Commands.c"
+#line 18097 "Commands.c"
 		}
 #line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_p_it);
-#line 18109 "Commands.c"
+#line 18101 "Commands.c"
 	}
 }
 
@@ -18156,7 +18148,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (self->priv->dest_parent_attachments);
 #line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap);
-#line 18160 "Commands.c"
+#line 18152 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		Tag* _tmp8_;
@@ -18180,7 +18172,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp12_;
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18184 "Commands.c"
+#line 18176 "Commands.c"
 			GeeIterator* _tmp13_;
 			gboolean _tmp14_;
 			MediaSource* source = NULL;
@@ -18197,7 +18189,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp14_) {
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18201 "Commands.c"
+#line 18193 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp15_ = _source_it;
@@ -18213,7 +18205,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			current_parent = _tmp18_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18217 "Commands.c"
+#line 18209 "Commands.c"
 				Tag* _tmp19_;
 				gchar* current_parent_path = NULL;
 				Tag* _tmp20_;
@@ -18232,7 +18224,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				if (!(_tmp19_ != NULL)) {
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18236 "Commands.c"
+#line 18228 "Commands.c"
 				}
 #line 2037 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp20_ = current_parent;
@@ -18248,7 +18240,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp24_ = gee_map_has_key (_tmp22_, _tmp23_);
 #line 2038 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp24_) {
-#line 18252 "Commands.c"
+#line 18244 "Commands.c"
 					GeeMap* _tmp25_;
 					const gchar* _tmp26_;
 					GeeHashSet* _tmp27_;
@@ -18265,7 +18257,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_map_set (_tmp25_, _tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet));
 #line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp28_);
-#line 18269 "Commands.c"
+#line 18261 "Commands.c"
 				}
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp29_ = current_parent;
@@ -18275,7 +18267,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_tmp31_ = tag_contains (_tmp29_, _tmp30_);
 #line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp31_) {
-#line 18279 "Commands.c"
+#line 18271 "Commands.c"
 					GeeMap* _tmp32_;
 					const gchar* _tmp33_;
 					gpointer _tmp34_;
@@ -18295,7 +18287,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
 #line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_tmp35_);
-#line 18299 "Commands.c"
+#line 18291 "Commands.c"
 				}
 #line 2044 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp37_ = current_parent;
@@ -18307,17 +18299,17 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				current_parent = _tmp38_;
 #line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_free0 (current_parent_path);
-#line 18311 "Commands.c"
+#line 18303 "Commands.c"
 			}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (current_parent);
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18317 "Commands.c"
+#line 18309 "Commands.c"
 		}
 #line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18321 "Commands.c"
+#line 18313 "Commands.c"
 	}
 	{
 		GeeIterator* _source_it = NULL;
@@ -18342,7 +18334,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_source_it = _tmp43_;
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 18346 "Commands.c"
+#line 18338 "Commands.c"
 			GeeIterator* _tmp44_;
 			gboolean _tmp45_;
 			MediaSource* source = NULL;
@@ -18358,7 +18350,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			if (!_tmp45_) {
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 18362 "Commands.c"
+#line 18354 "Commands.c"
 			}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp46_ = _source_it;
@@ -18374,11 +18366,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 			tag_attach (_tmp48_, _tmp49_);
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 18378 "Commands.c"
+#line 18370 "Commands.c"
 		}
 #line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 18382 "Commands.c"
+#line 18374 "Commands.c"
 	}
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp50_ = from_tag;
@@ -18386,7 +18378,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_tmp51_ = tag_get_hierarchical_children (_tmp50_);
 #line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
 	from_children = _tmp51_;
-#line 18390 "Commands.c"
+#line 18382 "Commands.c"
 	{
 		gint i = 0;
 		GeeList* _tmp52_;
@@ -18400,14 +18392,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 		_tmp54_ = _tmp53_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = _tmp54_ - 1;
-#line 18404 "Commands.c"
+#line 18396 "Commands.c"
 		{
 			gboolean _tmp55_ = FALSE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp55_ = TRUE;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18411 "Commands.c"
+#line 18403 "Commands.c"
 				gint _tmp57_;
 				Tag* from_child = NULL;
 				GeeList* _tmp58_;
@@ -18435,13 +18427,13 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				Tag* _tmp78_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp55_) {
-#line 18439 "Commands.c"
+#line 18431 "Commands.c"
 					gint _tmp56_;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp56_ = i;
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp56_ - 1;
-#line 18445 "Commands.c"
+#line 18437 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp55_ = FALSE;
@@ -18451,7 +18443,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				if (!(_tmp57_ >= 0)) {
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18455 "Commands.c"
+#line 18447 "Commands.c"
 				}
 #line 2055 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp58_ = from_children;
@@ -18511,7 +18503,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (_tmp71_);
 #line 2060 "/home/jens/Source/shotwell/src/Commands.vala"
 				to_child = _tmp78_;
-#line 18515 "Commands.c"
+#line 18507 "Commands.c"
 				{
 					GeeIterator* _source_it = NULL;
 					Tag* _tmp79_;
@@ -18535,7 +18527,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 					_source_it = _tmp83_;
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 18539 "Commands.c"
+#line 18531 "Commands.c"
 						GeeIterator* _tmp84_;
 						gboolean _tmp85_;
 						MediaSource* source = NULL;
@@ -18551,7 +18543,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						if (!_tmp85_) {
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 18555 "Commands.c"
+#line 18547 "Commands.c"
 						}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp86_ = _source_it;
@@ -18567,11 +18559,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 						tag_attach (_tmp88_, _tmp89_);
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (source);
-#line 18571 "Commands.c"
+#line 18563 "Commands.c"
 					}
 #line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_source_it);
-#line 18575 "Commands.c"
+#line 18567 "Commands.c"
 				}
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (to_child);
@@ -18579,7 +18571,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 				_g_free0 (child_subpath);
 #line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (from_child);
-#line 18583 "Commands.c"
+#line 18575 "Commands.c"
 			}
 		}
 	}
@@ -18589,7 +18581,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
 	_g_object_unref0 (to_tag);
 #line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (from_tag);
-#line 18593 "Commands.c"
+#line 18585 "Commands.c"
 }
 
 
@@ -18626,7 +18618,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp2_ = victim_path;
 #line 2070 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ == NULL) {
-#line 18630 "Commands.c"
+#line 18622 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18637,7 +18629,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
 		victim_path = _tmp4_;
-#line 18641 "Commands.c"
+#line 18633 "Commands.c"
 	}
 #line 2073 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = tag_global;
@@ -18651,7 +18643,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 		_g_free0 (victim_path);
 #line 2074 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 18655 "Commands.c"
+#line 18647 "Commands.c"
 	}
 #line 2076 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp8_ = victim_path;
@@ -18665,19 +18657,19 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_tmp11_ = tag_get_hierarchical_children (_tmp10_);
 #line 2079 "/home/jens/Source/shotwell/src/Commands.vala"
 	victim_children = _tmp11_;
-#line 18669 "Commands.c"
+#line 18661 "Commands.c"
 	{
 		gint i = 0;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 		i = 0;
-#line 18674 "Commands.c"
+#line 18666 "Commands.c"
 		{
 			gboolean _tmp12_ = FALSE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp12_ = TRUE;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 18681 "Commands.c"
+#line 18673 "Commands.c"
 				gint _tmp14_;
 				GeeList* _tmp15_;
 				gint _tmp16_;
@@ -18692,13 +18684,13 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				Marker* _tmp25_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				if (!_tmp12_) {
-#line 18696 "Commands.c"
+#line 18688 "Commands.c"
 					gint _tmp13_;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					_tmp13_ = i;
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					i = _tmp13_ + 1;
-#line 18702 "Commands.c"
+#line 18694 "Commands.c"
 				}
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp12_ = FALSE;
@@ -18714,7 +18706,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				if (!(_tmp14_ < _tmp17_)) {
 #line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 18718 "Commands.c"
+#line 18710 "Commands.c"
 				}
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp18_ = tag_global;
@@ -18738,7 +18730,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 				_g_object_unref0 (_tmp25_);
 #line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (_tmp23_);
-#line 18742 "Commands.c"
+#line 18734 "Commands.c"
 			}
 		}
 	}
@@ -18762,7 +18754,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
 	_g_object_unref0 (victim);
 #line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_free0 (victim_path);
-#line 18766 "Commands.c"
+#line 18758 "Commands.c"
 }
 
 
@@ -18775,7 +18767,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 	_tmp0_ = self->priv->after_state;
 #line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 18779 "Commands.c"
+#line 18771 "Commands.c"
 		const gchar* _tmp1_;
 		const gchar* _tmp2_;
 		const gchar* _tmp3_;
@@ -18800,7 +18792,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp4_ = self->priv->from_path;
 #line 2099 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp4_);
-#line 18804 "Commands.c"
+#line 18796 "Commands.c"
 	} else {
 		const gchar* _tmp5_;
 		const gchar* _tmp6_;
@@ -18831,7 +18823,7 @@ static void reparent_tag_command_real_execute (Command* base) {
 		_tmp9_ = self->priv->from_path;
 #line 2111 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp9_);
-#line 18835 "Commands.c"
+#line 18827 "Commands.c"
 	}
 }
 
@@ -18863,13 +18855,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp2_ = self->priv->to_path_exists;
 #line 2122 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 18867 "Commands.c"
+#line 18859 "Commands.c"
 		const gchar* _tmp3_;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->to_path;
 #line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
 		reparent_tag_command_destroy_subtree (self, _tmp3_);
-#line 18873 "Commands.c"
+#line 18865 "Commands.c"
 	}
 #line 2125 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->from_path;
@@ -18897,13 +18889,13 @@ static void reparent_tag_command_real_undo (Command* base) {
 	_tmp9_ = self->priv->to_path_parent_path;
 #line 2133 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp9_ != NULL) {
-#line 18901 "Commands.c"
+#line 18893 "Commands.c"
 		const gchar* _tmp10_;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp10_ = self->priv->to_path_parent_path;
 #line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
 		hierarchical_tag_utilities_cleanup_root_path (_tmp10_);
-#line 18907 "Commands.c"
+#line 18899 "Commands.c"
 	}
 }
 
@@ -18919,7 +18911,7 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) reparent_tag_command_real_undo;
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize;
-#line 18923 "Commands.c"
+#line 18915 "Commands.c"
 }
 
 
@@ -18949,7 +18941,7 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
 	self->priv->existing_dest_membership = NULL;
 #line 1692 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_path_exists = FALSE;
-#line 18953 "Commands.c"
+#line 18945 "Commands.c"
 }
 
 
@@ -18999,7 +18991,7 @@ static void reparent_tag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->existing_dest_membership);
 #line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (reparent_tag_command_parent_class)->finalize (obj);
-#line 19003 "Commands.c"
+#line 18995 "Commands.c"
 }
 
 
@@ -19018,7 +19010,7 @@ GType reparent_tag_command_get_type (void) {
 static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
 #line 2179 "/home/jens/Source/shotwell/src/Commands.vala"
 	modify_tags_command_on_proxy_broken ((ModifyTagsCommand*) self);
-#line 19022 "Commands.c"
+#line 19014 "Commands.c"
 }
 
 
@@ -19062,7 +19054,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_tmp6_ = original_tags;
 #line 2150 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp6_ != NULL) {
-#line 19066 "Commands.c"
+#line 19058 "Commands.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp7_;
@@ -19090,7 +19082,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_tag_index = -1;
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 19094 "Commands.c"
+#line 19086 "Commands.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
@@ -19116,7 +19108,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 19120 "Commands.c"
+#line 19112 "Commands.c"
 				}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _tag_list;
@@ -19146,18 +19138,18 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 				_source_proxy_unref0 (proxy);
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (tag);
-#line 19150 "Commands.c"
+#line 19142 "Commands.c"
 			}
 #line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_tag_list);
-#line 19154 "Commands.c"
+#line 19146 "Commands.c"
 		}
 	}
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
 	new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 19161 "Commands.c"
+#line 19153 "Commands.c"
 	{
 		GeeIterator* _new_tag_it = NULL;
 		GeeCollection* _tmp24_;
@@ -19170,7 +19162,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_new_tag_it = _tmp25_;
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19174 "Commands.c"
+#line 19166 "Commands.c"
 			GeeIterator* _tmp26_;
 			gboolean _tmp27_;
 			Tag* new_tag = NULL;
@@ -19193,7 +19185,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp27_) {
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19197 "Commands.c"
+#line 19189 "Commands.c"
 			}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp28_ = _new_tag_it;
@@ -19229,11 +19221,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_g_free0 (new_tag_path);
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (new_tag);
-#line 19233 "Commands.c"
+#line 19225 "Commands.c"
 		}
 #line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_new_tag_it);
-#line 19237 "Commands.c"
+#line 19229 "Commands.c"
 	}
 	{
 		GeeIterator* _path_it = NULL;
@@ -19247,7 +19239,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 		_path_it = _tmp39_;
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19251 "Commands.c"
+#line 19243 "Commands.c"
 			GeeIterator* _tmp40_;
 			gboolean _tmp41_;
 			gchar* path = NULL;
@@ -19273,7 +19265,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			if (!_tmp41_) {
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19277 "Commands.c"
+#line 19269 "Commands.c"
 			}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp42_ = _path_it;
@@ -19317,11 +19309,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 			_source_proxy_unref0 (proxy);
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_free0 (path);
-#line 19321 "Commands.c"
+#line 19313 "Commands.c"
 		}
 #line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_path_it);
-#line 19325 "Commands.c"
+#line 19317 "Commands.c"
 	}
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (new_paths);
@@ -19329,14 +19321,14 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
 	_g_object_unref0 (original_tags);
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 19333 "Commands.c"
+#line 19325 "Commands.c"
 }
 
 
 ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list) {
 #line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
 	return modify_tags_command_construct (TYPE_MODIFY_TAGS_COMMAND, media, new_tag_list);
-#line 19340 "Commands.c"
+#line 19332 "Commands.c"
 }
 
 
@@ -19344,7 +19336,7 @@ static void modify_tags_command_real_execute (Command* base) {
 	ModifyTagsCommand * self;
 #line 2185 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19348 "Commands.c"
+#line 19340 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19372,7 +19364,7 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19376 "Commands.c"
+#line 19368 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19398,7 +19390,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19402 "Commands.c"
+#line 19394 "Commands.c"
 			}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19426,11 +19418,11 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19430 "Commands.c"
+#line 19422 "Commands.c"
 		}
 #line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19434 "Commands.c"
+#line 19426 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19459,7 +19451,7 @@ static void modify_tags_command_real_execute (Command* base) {
 		_proxy_index = -1;
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19463 "Commands.c"
+#line 19455 "Commands.c"
 			gint _tmp22_;
 			gint _tmp23_;
 			gint _tmp24_;
@@ -19483,7 +19475,7 @@ static void modify_tags_command_real_execute (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19487 "Commands.c"
+#line 19479 "Commands.c"
 			}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19507,11 +19499,11 @@ static void modify_tags_command_real_execute (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19511 "Commands.c"
+#line 19503 "Commands.c"
 		}
 #line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19515 "Commands.c"
+#line 19507 "Commands.c"
 	}
 }
 
@@ -19520,7 +19512,7 @@ static void modify_tags_command_real_undo (Command* base) {
 	ModifyTagsCommand * self;
 #line 2193 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19524 "Commands.c"
+#line 19516 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19548,7 +19540,7 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19552 "Commands.c"
+#line 19544 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19574,7 +19566,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19578 "Commands.c"
+#line 19570 "Commands.c"
 			}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19602,11 +19594,11 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp13_);
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19606 "Commands.c"
+#line 19598 "Commands.c"
 		}
 #line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19610 "Commands.c"
+#line 19602 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19635,7 +19627,7 @@ static void modify_tags_command_real_undo (Command* base) {
 		_proxy_index = -1;
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19639 "Commands.c"
+#line 19631 "Commands.c"
 			gint _tmp22_;
 			gint _tmp23_;
 			gint _tmp24_;
@@ -19659,7 +19651,7 @@ static void modify_tags_command_real_undo (Command* base) {
 			if (!(_tmp23_ < _tmp24_)) {
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19663 "Commands.c"
+#line 19655 "Commands.c"
 			}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp25_ = _proxy_list;
@@ -19683,11 +19675,11 @@ static void modify_tags_command_real_undo (Command* base) {
 			_g_object_unref0 (_tmp30_);
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19687 "Commands.c"
+#line 19679 "Commands.c"
 		}
 #line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19691 "Commands.c"
+#line 19683 "Commands.c"
 	}
 }
 
@@ -19705,7 +19697,7 @@ static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
 	command_manager_reset (_tmp1_);
 #line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 19709 "Commands.c"
+#line 19701 "Commands.c"
 }
 
 
@@ -19720,7 +19712,7 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) {
 	((CommandClass *) klass)->undo = (void (*) (Command *)) modify_tags_command_real_undo;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize;
-#line 19724 "Commands.c"
+#line 19716 "Commands.c"
 }
 
 
@@ -19737,7 +19729,7 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
 	_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
 #line 2141 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->to_remove = _tmp1_;
-#line 19741 "Commands.c"
+#line 19733 "Commands.c"
 }
 
 
@@ -19745,7 +19737,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 	ModifyTagsCommand * self;
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19749 "Commands.c"
+#line 19741 "Commands.c"
 	{
 		GeeArrayList* _proxy_list = NULL;
 		GeeArrayList* _tmp0_;
@@ -19773,7 +19765,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 		_proxy_index = -1;
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19777 "Commands.c"
+#line 19769 "Commands.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -19795,7 +19787,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19799 "Commands.c"
+#line 19791 "Commands.c"
 			}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp8_ = _proxy_list;
@@ -19813,11 +19805,11 @@ static void modify_tags_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19817 "Commands.c"
+#line 19809 "Commands.c"
 		}
 #line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19821 "Commands.c"
+#line 19813 "Commands.c"
 	}
 	{
 		GeeArrayList* _proxy_list = NULL;
@@ -19846,7 +19838,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 		_proxy_index = -1;
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 19850 "Commands.c"
+#line 19842 "Commands.c"
 			gint _tmp18_;
 			gint _tmp19_;
 			gint _tmp20_;
@@ -19868,7 +19860,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 			if (!(_tmp19_ < _tmp20_)) {
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 19872 "Commands.c"
+#line 19864 "Commands.c"
 			}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp21_ = _proxy_list;
@@ -19886,11 +19878,11 @@ static void modify_tags_command_finalize (GObject * obj) {
 			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 			_source_proxy_unref0 (proxy);
-#line 19890 "Commands.c"
+#line 19882 "Commands.c"
 		}
 #line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_proxy_list);
-#line 19894 "Commands.c"
+#line 19886 "Commands.c"
 	}
 #line 2139 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->media);
@@ -19900,7 +19892,7 @@ static void modify_tags_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->to_remove);
 #line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (modify_tags_command_parent_class)->finalize (obj);
-#line 19904 "Commands.c"
+#line 19896 "Commands.c"
 }
 
 
@@ -19919,7 +19911,7 @@ GType modify_tags_command_get_type (void) {
 static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
 	tag_untag_photos_command_on_source_destroyed ((TagUntagPhotosCommand*) self, source);
-#line 19923 "Commands.c"
+#line 19915 "Commands.c"
 }
 
 
@@ -19944,7 +19936,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_tmp1_ = attach;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp1_) {
-#line 19948 "Commands.c"
+#line 19940 "Commands.c"
 		Tag* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
@@ -19966,7 +19958,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp6_;
 #line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp4_);
-#line 19970 "Commands.c"
+#line 19962 "Commands.c"
 	} else {
 		Tag* _tmp7_;
 		gchar* _tmp8_;
@@ -19989,7 +19981,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 		_tmp0_ = _tmp11_;
 #line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp9_);
-#line 19993 "Commands.c"
+#line 19985 "Commands.c"
 	}
 #line 2213 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp12_ = tag;
@@ -20027,14 +20019,14 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 	_g_free0 (_tmp0_);
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20031 "Commands.c"
+#line 20023 "Commands.c"
 }
 
 
 TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
 #line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
 	return tag_untag_photos_command_construct (TYPE_TAG_UNTAG_PHOTOS_COMMAND, tag, sources, count, attach);
-#line 20038 "Commands.c"
+#line 20030 "Commands.c"
 }
 
 
@@ -20049,20 +20041,20 @@ static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableComm
 	_tmp0_ = self->priv->attach;
 #line 2231 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20053 "Commands.c"
+#line 20045 "Commands.c"
 		DataSource* _tmp1_;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20059 "Commands.c"
+#line 20051 "Commands.c"
 	} else {
 		DataSource* _tmp2_;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20066 "Commands.c"
+#line 20058 "Commands.c"
 	}
 }
 
@@ -20078,20 +20070,20 @@ static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand
 	_tmp0_ = self->priv->attach;
 #line 2238 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_) {
-#line 20082 "Commands.c"
+#line 20074 "Commands.c"
 		DataSource* _tmp1_;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp1_ = source;
 #line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20088 "Commands.c"
+#line 20080 "Commands.c"
 	} else {
 		DataSource* _tmp2_;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = source;
 #line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
 		tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20095 "Commands.c"
+#line 20087 "Commands.c"
 	}
 }
 
@@ -20106,7 +20098,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->detached_from;
 #line 2246 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20110 "Commands.c"
+#line 20102 "Commands.c"
 		Tag* _tmp1_;
 		GeeCollection* _tmp2_;
 		GeeArrayList* _tmp3_;
@@ -20133,7 +20125,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		curr_tmp = _tmp5_;
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20137 "Commands.c"
+#line 20129 "Commands.c"
 			Tag* _tmp6_;
 			GeeList* _tmp7_;
 			Tag* _tmp8_;
@@ -20145,7 +20137,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			if (!(_tmp6_ != NULL)) {
 #line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20149 "Commands.c"
+#line 20141 "Commands.c"
 			}
 #line 2254 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp7_ = self->priv->attached_to;
@@ -20161,13 +20153,13 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (curr_tmp);
 #line 2255 "/home/jens/Source/shotwell/src/Commands.vala"
 			curr_tmp = _tmp10_;
-#line 20165 "Commands.c"
+#line 20157 "Commands.c"
 		}
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (curr_tmp);
 #line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
 		return;
-#line 20171 "Commands.c"
+#line 20163 "Commands.c"
 	}
 	{
 		GeeIterator* _detached_tag_it = NULL;
@@ -20192,7 +20184,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 		_detached_tag_it = _tmp15_;
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 20196 "Commands.c"
+#line 20188 "Commands.c"
 			GeeIterator* _tmp16_;
 			gboolean _tmp17_;
 			Tag* detached_tag = NULL;
@@ -20211,7 +20203,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			if (!_tmp17_) {
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 20215 "Commands.c"
+#line 20207 "Commands.c"
 			}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp18_ = _detached_tag_it;
@@ -20235,11 +20227,11 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 			_g_object_unref0 (_tmp24_);
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (detached_tag);
-#line 20239 "Commands.c"
+#line 20231 "Commands.c"
 		}
 #line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_detached_tag_it);
-#line 20243 "Commands.c"
+#line 20235 "Commands.c"
 	}
 #line 2265 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (self->priv->detached_from);
@@ -20247,7 +20239,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
 	self->priv->detached_from = NULL;
 #line 2266 "/home/jens/Source/shotwell/src/Commands.vala"
 	simple_proxyable_command_clear_added_proxies (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand));
-#line 20251 "Commands.c"
+#line 20243 "Commands.c"
 }
 
 
@@ -20261,7 +20253,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 	_tmp0_ = self->priv->attached_to;
 #line 2270 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp0_ == NULL) {
-#line 20265 "Commands.c"
+#line 20257 "Commands.c"
 		Tag* _tmp1_;
 		GeeCollection* _tmp2_;
 		GeeMultiMap* _tmp3_;
@@ -20288,7 +20280,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 		simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 2278 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_tmp6_);
-#line 20292 "Commands.c"
+#line 20284 "Commands.c"
 	} else {
 		{
 			GeeList* _t_list = NULL;
@@ -20317,7 +20309,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 			_t_index = -1;
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			while (TRUE) {
-#line 20321 "Commands.c"
+#line 20313 "Commands.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
@@ -20337,7 +20329,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				if (!(_tmp13_ < _tmp14_)) {
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 					break;
-#line 20341 "Commands.c"
+#line 20333 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp15_ = _t_list;
@@ -20347,7 +20339,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 				_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				t = (Tag*) _tmp17_;
-#line 20351 "Commands.c"
+#line 20343 "Commands.c"
 				{
 					GeeIterator* _ms_it = NULL;
 					GeeCollection* _tmp18_;
@@ -20360,7 +20352,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 					_ms_it = _tmp19_;
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					while (TRUE) {
-#line 20364 "Commands.c"
+#line 20356 "Commands.c"
 						GeeIterator* _tmp20_;
 						gboolean _tmp21_;
 						MediaSource* ms = NULL;
@@ -20377,7 +20369,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						if (!_tmp21_) {
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 							break;
-#line 20381 "Commands.c"
+#line 20373 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_tmp22_ = _ms_it;
@@ -20393,7 +20385,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 						_tmp26_ = tag_get_attachment_count (_tmp24_, _tmp25_);
 #line 2283 "/home/jens/Source/shotwell/src/Commands.vala"
 						if (_tmp26_ < 2) {
-#line 20397 "Commands.c"
+#line 20389 "Commands.c"
 							Tag* _tmp27_;
 							MediaSource* _tmp28_;
 							GeeList* _tmp29_;
@@ -20408,23 +20400,23 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
 							_tmp30_ = _tmp29_;
 #line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
 							_g_object_unref0 (_tmp30_);
-#line 20412 "Commands.c"
+#line 20404 "Commands.c"
 						}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 						_g_object_unref0 (ms);
-#line 20416 "Commands.c"
+#line 20408 "Commands.c"
 					}
 #line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
 					_g_object_unref0 (_ms_it);
-#line 20420 "Commands.c"
+#line 20412 "Commands.c"
 				}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 				_g_object_unref0 (t);
-#line 20424 "Commands.c"
+#line 20416 "Commands.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (_t_list);
-#line 20428 "Commands.c"
+#line 20420 "Commands.c"
 		}
 	}
 }
@@ -20459,7 +20451,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 	_tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2294 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp5_) {
-#line 20463 "Commands.c"
+#line 20455 "Commands.c"
 		CommandManager* _tmp6_;
 		CommandManager* _tmp7_;
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20470,7 +20462,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
 		command_manager_reset (_tmp7_);
 #line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp7_);
-#line 20474 "Commands.c"
+#line 20466 "Commands.c"
 	}
 }
 
@@ -20486,7 +20478,7 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl
 	((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_undo_on_source;
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize;
-#line 20490 "Commands.c"
+#line 20482 "Commands.c"
 }
 
 
@@ -20497,7 +20489,7 @@ static void tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self
 	self->priv->detached_from = NULL;
 #line 2210 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->attached_to = NULL;
-#line 20501 "Commands.c"
+#line 20493 "Commands.c"
 }
 
 
@@ -20529,7 +20521,7 @@ static void tag_untag_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->attached_to);
 #line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (tag_untag_photos_command_parent_class)->finalize (obj);
-#line 20533 "Commands.c"
+#line 20525 "Commands.c"
 }
 
 
@@ -20621,14 +20613,14 @@ RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_ty
 	self->priv->new_name = _tmp15_;
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20625 "Commands.c"
+#line 20617 "Commands.c"
 }
 
 
 RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name) {
 #line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
 	return rename_saved_search_command_construct (TYPE_RENAME_SAVED_SEARCH_COMMAND, search, new_name);
-#line 20632 "Commands.c"
+#line 20624 "Commands.c"
 }
 
 
@@ -20647,7 +20639,7 @@ static void rename_saved_search_command_real_execute (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20651 "Commands.c"
+#line 20643 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -20661,7 +20653,7 @@ static void rename_saved_search_command_real_execute (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20665 "Commands.c"
+#line 20657 "Commands.c"
 	}
 }
 
@@ -20681,7 +20673,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
 	_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
 #line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (!_tmp2_) {
-#line 20685 "Commands.c"
+#line 20677 "Commands.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -20695,7 +20687,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
 		app_window_error_message (_tmp5_, NULL);
 #line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_free0 (_tmp5_);
-#line 20699 "Commands.c"
+#line 20691 "Commands.c"
 	}
 }
 
@@ -20711,14 +20703,14 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas
 	((CommandClass *) klass)->undo = (void (*) (Command *)) rename_saved_search_command_real_undo;
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize;
-#line 20715 "Commands.c"
+#line 20707 "Commands.c"
 }
 
 
 static void rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) {
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20722 "Commands.c"
+#line 20714 "Commands.c"
 }
 
 
@@ -20734,7 +20726,7 @@ static void rename_saved_search_command_finalize (GObject * obj) {
 	_g_free0 (self->priv->new_name);
 #line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (rename_saved_search_command_parent_class)->finalize (obj);
-#line 20738 "Commands.c"
+#line 20730 "Commands.c"
 }
 
 
@@ -20801,14 +20793,14 @@ DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_ty
 	self->priv->search = _tmp10_;
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20805 "Commands.c"
+#line 20797 "Commands.c"
 }
 
 
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search) {
 #line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
 	return delete_saved_search_command_construct (TYPE_DELETE_SAVED_SEARCH_COMMAND, search);
-#line 20812 "Commands.c"
+#line 20804 "Commands.c"
 }
 
 
@@ -20829,7 +20821,7 @@ static void delete_saved_search_command_real_execute (Command* base) {
 	saved_search_table_remove (_tmp1_, _tmp2_);
 #line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 20833 "Commands.c"
+#line 20825 "Commands.c"
 }
 
 
@@ -20842,7 +20834,7 @@ static void delete_saved_search_command_real_undo (Command* base) {
 	_tmp0_ = self->priv->search;
 #line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
 	saved_search_reconstitute (_tmp0_);
-#line 20846 "Commands.c"
+#line 20838 "Commands.c"
 }
 
 
@@ -20857,14 +20849,14 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas
 	((CommandClass *) klass)->undo = (void (*) (Command *)) delete_saved_search_command_real_undo;
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize;
-#line 20861 "Commands.c"
+#line 20853 "Commands.c"
 }
 
 
 static void delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) {
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20868 "Commands.c"
+#line 20860 "Commands.c"
 }
 
 
@@ -20876,7 +20868,7 @@ static void delete_saved_search_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->search);
 #line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (delete_saved_search_command_parent_class)->finalize (obj);
-#line 20880 "Commands.c"
+#line 20872 "Commands.c"
 }
 
 
@@ -20895,7 +20887,7 @@ GType delete_saved_search_command_get_type (void) {
 static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
 #line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
 	trash_untrash_photos_command_on_photo_destroyed ((TrashUntrashPhotosCommand*) self, source);
-#line 20899 "Commands.c"
+#line 20891 "Commands.c"
 }
 
 
@@ -20918,11 +20910,11 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	if (_tmp1_) {
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Move Photos to Trash");
-#line 20922 "Commands.c"
+#line 20914 "Commands.c"
 	} else {
 #line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Restore Photos from Trash");
-#line 20926 "Commands.c"
+#line 20918 "Commands.c"
 	}
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = to_trash;
@@ -20930,11 +20922,11 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	if (_tmp3_) {
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Move the photos to the Shotwell trash");
-#line 20934 "Commands.c"
+#line 20926 "Commands.c"
 	} else {
 #line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = _ ("Restore the photos back to the Shotwell library");
-#line 20938 "Commands.c"
+#line 20930 "Commands.c"
 	}
 #line 2346 "/home/jens/Source/shotwell/src/Commands.vala"
 	self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp2_);
@@ -20960,14 +20952,14 @@ TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 20964 "Commands.c"
+#line 20956 "Commands.c"
 }
 
 
 TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash) {
 #line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
 	return trash_untrash_photos_command_construct (TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, sources, to_trash);
-#line 20971 "Commands.c"
+#line 20963 "Commands.c"
 }
 
 
@@ -21002,7 +20994,7 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 		result = NULL;
 #line 2364 "/home/jens/Source/shotwell/src/Commands.vala"
 		return result;
-#line 21006 "Commands.c"
+#line 20998 "Commands.c"
 	}
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = to_trash;
@@ -21010,11 +21002,11 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 	if (_tmp4_) {
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = _ ("Moving Photos to Trash");
-#line 21014 "Commands.c"
+#line 21006 "Commands.c"
 	} else {
 #line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = _ ("Restoring Photos From Trash");
-#line 21018 "Commands.c"
+#line 21010 "Commands.c"
 	}
 #line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp5_ = app_window_get_instance ();
@@ -21046,7 +21038,7 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
 	result = dialog;
 #line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21050 "Commands.c"
+#line 21042 "Commands.c"
 }
 
 
@@ -21055,7 +21047,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 	return result;
-#line 21059 "Commands.c"
+#line 21051 "Commands.c"
 }
 
 
@@ -21088,7 +21080,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	_tmp2_ = dialog;
 #line 2377 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21092 "Commands.c"
+#line 21084 "Commands.c"
 		ProgressDialog* _tmp3_;
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
@@ -21106,13 +21098,13 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21110 "Commands.c"
+#line 21102 "Commands.c"
 	}
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21116 "Commands.c"
+#line 21108 "Commands.c"
 		ProgressMonitor _tmp5_;
 		void* _tmp5__target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21121,7 +21113,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		_tmp5__target = monitor_target;
 #line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp5_, _tmp5__target);
-#line 21125 "Commands.c"
+#line 21117 "Commands.c"
 	} else {
 		ProgressMonitor _tmp6_;
 		void* _tmp6__target;
@@ -21131,19 +21123,19 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 		_tmp6__target = monitor_target;
 #line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp6_, _tmp6__target);
-#line 21135 "Commands.c"
+#line 21127 "Commands.c"
 	}
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21141 "Commands.c"
+#line 21133 "Commands.c"
 		ProgressDialog* _tmp8_;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21147 "Commands.c"
+#line 21139 "Commands.c"
 	}
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21155,7 +21147,7 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21159 "Commands.c"
+#line 21151 "Commands.c"
 }
 
 
@@ -21188,7 +21180,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	_tmp2_ = dialog;
 #line 2393 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21192 "Commands.c"
+#line 21184 "Commands.c"
 		ProgressDialog* _tmp3_;
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = dialog;
@@ -21206,13 +21198,13 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		monitor_target = g_object_ref (_tmp3_);
 #line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21210 "Commands.c"
+#line 21202 "Commands.c"
 	}
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = self->priv->to_trash;
 #line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_) {
-#line 21216 "Commands.c"
+#line 21208 "Commands.c"
 		ProgressMonitor _tmp5_;
 		void* _tmp5__target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21221,7 +21213,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		_tmp5__target = monitor_target;
 #line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_untrash (self, _tmp5_, _tmp5__target);
-#line 21225 "Commands.c"
+#line 21217 "Commands.c"
 	} else {
 		ProgressMonitor _tmp6_;
 		void* _tmp6__target;
@@ -21231,19 +21223,19 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 		_tmp6__target = monitor_target;
 #line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
 		trash_untrash_photos_command_trash (self, _tmp6_, _tmp6__target);
-#line 21235 "Commands.c"
+#line 21227 "Commands.c"
 	}
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp7_ = dialog;
 #line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp7_ != NULL) {
-#line 21241 "Commands.c"
+#line 21233 "Commands.c"
 		ProgressDialog* _tmp8_;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp8_ = dialog;
 #line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
 		progress_dialog_close (_tmp8_);
-#line 21247 "Commands.c"
+#line 21239 "Commands.c"
 	}
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21255,7 +21247,7 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
 	monitor_target_destroy_notify = NULL;
 #line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (dialog);
-#line 21259 "Commands.c"
+#line 21251 "Commands.c"
 }
 
 
@@ -21305,7 +21297,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp8_ = _tmp7_;
 #line 2410 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21309 "Commands.c"
+#line 21301 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp9_;
@@ -21318,7 +21310,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 		_source_it = _tmp10_;
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21322 "Commands.c"
+#line 21314 "Commands.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSource* source = NULL;
@@ -21335,7 +21327,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			if (!_tmp12_) {
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21339 "Commands.c"
+#line 21331 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21353,7 +21345,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 			_tmp16__target = monitor_target;
 #line 2414 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21357 "Commands.c"
+#line 21349 "Commands.c"
 				ProgressMonitor _tmp17_;
 				void* _tmp17__target;
 				gint _tmp18_;
@@ -21373,15 +21365,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 				_tmp20_ = count;
 #line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21377 "Commands.c"
+#line 21369 "Commands.c"
 			}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21381 "Commands.c"
+#line 21373 "Commands.c"
 		}
 #line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21385 "Commands.c"
+#line 21377 "Commands.c"
 	}
 #line 2418 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21399,7 +21391,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
 	_tmp26_ = _tmp25_;
 #line 2419 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21403 "Commands.c"
+#line 21395 "Commands.c"
 }
 
 
@@ -21449,7 +21441,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp8_ = _tmp7_;
 #line 2427 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_begin (_tmp8_);
-#line 21453 "Commands.c"
+#line 21445 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp9_;
@@ -21462,7 +21454,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 		_source_it = _tmp10_;
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21466 "Commands.c"
+#line 21458 "Commands.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSource* source = NULL;
@@ -21479,7 +21471,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			if (!_tmp12_) {
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21483 "Commands.c"
+#line 21475 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp13_ = _source_it;
@@ -21497,7 +21489,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 			_tmp16__target = monitor_target;
 #line 2431 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp16_ != NULL) {
-#line 21501 "Commands.c"
+#line 21493 "Commands.c"
 				ProgressMonitor _tmp17_;
 				void* _tmp17__target;
 				gint _tmp18_;
@@ -21517,15 +21509,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 				_tmp20_ = count;
 #line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
 				_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21521 "Commands.c"
+#line 21513 "Commands.c"
 			}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21525 "Commands.c"
+#line 21517 "Commands.c"
 		}
 #line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21529 "Commands.c"
+#line 21521 "Commands.c"
 	}
 #line 2435 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp21_ = library_photo_global;
@@ -21543,7 +21535,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
 	_tmp26_ = _tmp25_;
 #line 2436 "/home/jens/Source/shotwell/src/Commands.vala"
 	transaction_controller_commit (_tmp26_);
-#line 21547 "Commands.c"
+#line 21539 "Commands.c"
 }
 
 
@@ -21571,7 +21563,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 	_tmp4_ = _tmp3_;
 #line 2446 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp4_ == 0) {
-#line 21575 "Commands.c"
+#line 21567 "Commands.c"
 		CommandManager* _tmp5_;
 		CommandManager* _tmp6_;
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21582,7 +21574,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
 		command_manager_reset (_tmp6_);
 #line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 21586 "Commands.c"
+#line 21578 "Commands.c"
 	}
 }
 
@@ -21598,14 +21590,14 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl
 	((CommandClass *) klass)->undo = (void (*) (Command *)) trash_untrash_photos_command_real_undo;
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize;
-#line 21602 "Commands.c"
+#line 21594 "Commands.c"
 }
 
 
 static void trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) {
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv = TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE (self);
-#line 21609 "Commands.c"
+#line 21601 "Commands.c"
 }
 
 
@@ -21633,7 +21625,7 @@ static void trash_untrash_photos_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->sources);
 #line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (trash_untrash_photos_command_parent_class)->finalize (obj);
-#line 21637 "Commands.c"
+#line 21629 "Commands.c"
 }
 
 
@@ -21668,11 +21660,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	if (_tmp1_) {
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Flag");
-#line 21672 "Commands.c"
+#line 21664 "Commands.c"
 	} else {
 #line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp0_ = _ ("Unflag");
-#line 21676 "Commands.c"
+#line 21668 "Commands.c"
 	}
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp3_ = flag;
@@ -21680,11 +21672,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	if (_tmp3_) {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
-#line 21684 "Commands.c"
+#line 21676 "Commands.c"
 	} else {
 #line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp2_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
-#line 21688 "Commands.c"
+#line 21680 "Commands.c"
 	}
 #line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp4_ = sources;
@@ -21702,7 +21694,7 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 	_tmp8_ = _tmp7_;
 #line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp8_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
-#line 21706 "Commands.c"
+#line 21698 "Commands.c"
 		const gchar* _tmp9_ = NULL;
 		gboolean _tmp10_;
 		ProgressDialog* _tmp11_;
@@ -21713,11 +21705,11 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 		if (_tmp10_) {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
-#line 21717 "Commands.c"
+#line 21709 "Commands.c"
 		} else {
 #line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp9_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
-#line 21721 "Commands.c"
+#line 21713 "Commands.c"
 		}
 #line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp11_ = progress_dialog_new (NULL, _tmp9_, NULL);
@@ -21731,18 +21723,18 @@ FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollecti
 		_tmp12_ = self->priv->progress_dialog;
 #line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 21735 "Commands.c"
+#line 21727 "Commands.c"
 	}
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return self;
-#line 21739 "Commands.c"
+#line 21731 "Commands.c"
 }
 
 
 FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag) {
 #line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
 	return flag_unflag_command_construct (TYPE_FLAG_UNFLAG_COMMAND, sources, flag);
-#line 21746 "Commands.c"
+#line 21738 "Commands.c"
 }
 
 
@@ -21756,7 +21748,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
 #line 2477 "/home/jens/Source/shotwell/src/Commands.vala"
 	num_processed = 0;
-#line 21760 "Commands.c"
+#line 21752 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -21769,7 +21761,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 		_source_it = _tmp1_;
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21773 "Commands.c"
+#line 21765 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -21787,7 +21779,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			if (!_tmp3_) {
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21791 "Commands.c"
+#line 21783 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -21809,7 +21801,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 			_tmp9_ = self->priv->progress_dialog;
 #line 2484 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_tmp9_ != NULL) {
-#line 21813 "Commands.c"
+#line 21805 "Commands.c"
 				ProgressDialog* _tmp10_;
 				gint _tmp11_;
 				GeeCollection* _tmp12_;
@@ -21834,27 +21826,27 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
 				gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
 #line 2487 "/home/jens/Source/shotwell/src/Commands.vala"
 				spin_event_loop ();
-#line 21838 "Commands.c"
+#line 21830 "Commands.c"
 			}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21842 "Commands.c"
+#line 21834 "Commands.c"
 		}
 #line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21846 "Commands.c"
+#line 21838 "Commands.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp16_ = self->priv->progress_dialog;
 #line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp16_ != NULL) {
-#line 21852 "Commands.c"
+#line 21844 "Commands.c"
 		ProgressDialog* _tmp17_;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp17_ = self->priv->progress_dialog;
 #line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 21858 "Commands.c"
+#line 21850 "Commands.c"
 	}
 }
 
@@ -21865,7 +21857,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
 #line 2495 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 21869 "Commands.c"
+#line 21861 "Commands.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
@@ -21878,7 +21870,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 		_source_it = _tmp1_;
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		while (TRUE) {
-#line 21882 "Commands.c"
+#line 21874 "Commands.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataSource* source = NULL;
@@ -21894,7 +21886,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			if (!_tmp3_) {
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 				break;
-#line 21898 "Commands.c"
+#line 21890 "Commands.c"
 			}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = _source_it;
@@ -21910,11 +21902,11 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
 			flag_unflag_command_flag_unflag (self, _tmp6_, !_tmp7_);
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 			_g_object_unref0 (source);
-#line 21914 "Commands.c"
+#line 21906 "Commands.c"
 		}
 #line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
 		_g_object_unref0 (_source_it);
-#line 21918 "Commands.c"
+#line 21910 "Commands.c"
 	}
 }
 
@@ -21938,31 +21930,31 @@ static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource
 	_tmp2_ = flaggable;
 #line 2502 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (_tmp2_ != NULL) {
-#line 21942 "Commands.c"
+#line 21934 "Commands.c"
 		gboolean _tmp3_;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = flag;
 #line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (_tmp3_) {
-#line 21948 "Commands.c"
+#line 21940 "Commands.c"
 			Flaggable* _tmp4_;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp4_ = flaggable;
 #line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_flagged (_tmp4_);
-#line 21954 "Commands.c"
+#line 21946 "Commands.c"
 		} else {
 			Flaggable* _tmp5_;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			_tmp5_ = flaggable;
 #line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
 			flaggable_mark_unflagged (_tmp5_);
-#line 21961 "Commands.c"
+#line 21953 "Commands.c"
 		}
 	}
 #line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
 	_g_object_unref0 (flaggable);
-#line 21966 "Commands.c"
+#line 21958 "Commands.c"
 }
 
 
@@ -21977,7 +21969,7 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) {
 	((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_undo_on_all;
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize;
-#line 21981 "Commands.c"
+#line 21973 "Commands.c"
 }
 
 
@@ -21986,7 +21978,7 @@ static void flag_unflag_command_instance_init (FlagUnflagCommand * self) {
 	self->priv = FLAG_UNFLAG_COMMAND_GET_PRIVATE (self);
 #line 2459 "/home/jens/Source/shotwell/src/Commands.vala"
 	self->priv->progress_dialog = NULL;
-#line 21990 "Commands.c"
+#line 21982 "Commands.c"
 }
 
 
@@ -21998,7 +21990,7 @@ static void flag_unflag_command_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_dialog);
 #line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
 	G_OBJECT_CLASS (flag_unflag_command_parent_class)->finalize (obj);
-#line 22002 "Commands.c"
+#line 21994 "Commands.c"
 }
 
 
diff --git a/src/Commands.vala b/src/Commands.vala
index 75164c5..7441a50 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -920,6 +920,10 @@ public abstract class MovePhotosCommand : Command {
         }
         
         public override void execute() {
+
+            // create the new event
+            base.execute();
+
             // Are we at an event page already?
             if ((LibraryWindow.get_app().get_current_page() is EventPage)) {
                 Event evt = ((EventPage) LibraryWindow.get_app().get_current_page()).get_event();
@@ -933,17 +937,13 @@ public abstract class MovePhotosCommand : Command {
             } else {
                 // We're in a library or tag page.
                 
-                // Are we moving these to a newly-created (and therefore empty) event?
-                if (((Event) new_event_proxy.get_source()).get_media_count() == 0) {
+                // Are we moving these to a newly-created event (i.e. has same size)?
+                if (((Event) new_event_proxy.get_source()).get_media_count() == source_list.size) {
                     // Yes - jump to the new event.
                     LibraryWindow.get_app().switch_to_event((Event) new_event_proxy.get_source());
                 }
             }
-            
             // Otherwise - don't jump; users found the jumping disconcerting.
-            
-            // create the new event
-            base.execute();
         }
         
         public override void execute_on_source(DataSource source) {
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
deleted file mode 100644
index 80d8368..0000000
--- a/src/CustomComponents.c
+++ /dev/null
@@ -1,3680 +0,0 @@
-/* CustomComponents.c generated by valac 0.36.6, the Vala compiler
- * generated from CustomComponents.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gdk/gdk.h>
-#include <float.h>
-#include <math.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gee.h>
-#include <cairo.h>
-#include <gobject/gvaluecollector.h>
-
-
-#define TYPE_THEME_LOADER (theme_loader_get_type ())
-#define THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THEME_LOADER, ThemeLoader))
-#define THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_THEME_LOADER, ThemeLoaderClass))
-#define IS_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_THEME_LOADER))
-#define IS_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_THEME_LOADER))
-#define THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_THEME_LOADER, ThemeLoaderClass))
-
-typedef struct _ThemeLoader ThemeLoader;
-typedef struct _ThemeLoaderClass ThemeLoaderClass;
-typedef struct _ThemeLoaderPrivate ThemeLoaderPrivate;
-
-#define THEME_LOADER_TYPE_LIGHTWEIGHT_COLOR (theme_loader_lightweight_color_get_type ())
-typedef struct _ThemeLoaderLightweightColor ThemeLoaderLightweightColor;
-#define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL)))
-
-#define TYPE_RGB_ANALYTIC_PIXEL (rgb_analytic_pixel_get_type ())
-typedef struct _RGBAnalyticPixel RGBAnalyticPixel;
-
-#define TYPE_HSV_ANALYTIC_PIXEL (hsv_analytic_pixel_get_type ())
-typedef struct _HSVAnalyticPixel HSVAnalyticPixel;
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _rgb_analytic_pixel_free0(var) ((var == NULL) ? NULL : (var = (rgb_analytic_pixel_free (var), NULL)))
-typedef struct _ParamSpecThemeLoader ParamSpecThemeLoader;
-
-#define TYPE_RGB_HISTOGRAM_MANIPULATOR (rgb_histogram_manipulator_get_type ())
-#define RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator))
-#define RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
-#define IS_RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR))
-#define IS_RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR))
-#define RGB_HISTOGRAM_MANIPULATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
-
-typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
-typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
-typedef struct _RGBHistogramManipulatorPrivate RGBHistogramManipulatorPrivate;
-
-#define TYPE_RGB_HISTOGRAM (rgb_histogram_get_type ())
-#define RGB_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_HISTOGRAM, RGBHistogram))
-#define RGB_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_HISTOGRAM, RGBHistogramClass))
-#define IS_RGB_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_HISTOGRAM))
-#define IS_RGB_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_HISTOGRAM))
-#define RGB_HISTOGRAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_HISTOGRAM, RGBHistogramClass))
-
-typedef struct _RGBHistogram RGBHistogram;
-typedef struct _RGBHistogramClass RGBHistogramClass;
-
-#define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ())
-#define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL)))
-enum  {
-	RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL,
-	RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL
-};
-static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0};
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _ThemeLoader {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	ThemeLoaderPrivate * priv;
-};
-
-struct _ThemeLoaderClass {
-	GTypeClass parent_class;
-	void (*finalize) (ThemeLoader *self);
-};
-
-struct _ThemeLoaderLightweightColor {
-	guchar red;
-	guchar green;
-	guchar blue;
-};
-
-struct _RGBAnalyticPixel {
-	gfloat red;
-	gfloat green;
-	gfloat blue;
-};
-
-struct _HSVAnalyticPixel {
-	gfloat hue;
-	gfloat saturation;
-	gfloat light_value;
-};
-
-struct _ParamSpecThemeLoader {
-	GParamSpec parent_instance;
-};
-
-struct _RGBHistogramManipulator {
-	GtkDrawingArea parent_instance;
-	RGBHistogramManipulatorPrivate * priv;
-};
-
-struct _RGBHistogramManipulatorClass {
-	GtkDrawingAreaClass parent_class;
-};
-
-struct _RGBHistogramManipulatorPrivate {
-	gint left_nub_max;
-	gint right_nub_min;
-	RGBHistogram* histogram;
-	gint left_nub_position;
-	gint right_nub_position;
-	GdkPixbuf* nub_pixbuf;
-	gboolean is_left_nub_tracking;
-	gboolean is_right_nub_tracking;
-	gint track_start_x;
-	gint track_nub_start_position;
-};
-
-typedef enum  {
-	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB,
-	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB,
-	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH,
-	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH,
-	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA
-} RGBHistogramManipulatorLocationCode;
-
-
-static gpointer theme_loader_parent_class = NULL;
-static ThemeLoaderLightweightColor* theme_loader_theme_colors;
-static gint theme_loader_theme_colors_length1;
-static ThemeLoaderLightweightColor* theme_loader_theme_colors = NULL;
-static gint theme_loader_theme_colors_length1 = 0;
-static gint _theme_loader_theme_colors_size_ = 0;
-static gpointer rgb_histogram_manipulator_parent_class = NULL;
-static GtkWidget* rgb_histogram_manipulator_dummy_slider;
-static GtkWidget* rgb_histogram_manipulator_dummy_slider = NULL;
-static GtkWidget* rgb_histogram_manipulator_dummy_frame;
-static GtkWidget* rgb_histogram_manipulator_dummy_frame = NULL;
-static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path;
-static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path = NULL;
-static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path;
-static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path = NULL;
-static gboolean rgb_histogram_manipulator_paths_setup;
-static gboolean rgb_histogram_manipulator_paths_setup = FALSE;
-
-void qsort (void* p, gsize num, gsize size, GCompareFunc func);
-gpointer theme_loader_ref (gpointer instance);
-void theme_loader_unref (gpointer instance);
-GParamSpec* param_spec_theme_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_theme_loader (GValue* value, gpointer v_object);
-void value_take_theme_loader (GValue* value, gpointer v_object);
-gpointer value_get_theme_loader (const GValue* value);
-GType theme_loader_get_type (void) G_GNUC_CONST;
-enum  {
-	THEME_LOADER_DUMMY_PROPERTY
-};
-static GType theme_loader_lightweight_color_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static ThemeLoaderLightweightColor* theme_loader_lightweight_color_dup (const ThemeLoaderLightweightColor* self);
-static void theme_loader_lightweight_color_free (ThemeLoaderLightweightColor* self);
-#define THEME_LOADER_NUM_SUPPORTED_INTENSITIES 6
-#define THEME_LOADER_THEME_OUTLINE_COLOR 0
-#define THEME_LOADER_THEME_BEVEL_DARKER_COLOR 1
-#define THEME_LOADER_THEME_BEVEL_DARK_COLOR 2
-#define THEME_LOADER_THEME_BASE_COLOR 3
-#define THEME_LOADER_THEME_BEVEL_LIGHT_COLOR 4
-#define THEME_LOADER_THEME_BEVEL_LIGHTER_COLOR 5
-static void theme_loader_populate_theme_params (void);
-static GdkColor* _gdk_color_dup (GdkColor* self);
-GType rgb_analytic_pixel_get_type (void) G_GNUC_CONST;
-RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self);
-void rgb_analytic_pixel_free (RGBAnalyticPixel* self);
-void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized);
-GType hsv_analytic_pixel_get_type (void) G_GNUC_CONST;
-HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self);
-void hsv_analytic_pixel_free (HSVAnalyticPixel* self);
-void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p);
-void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result);
-static void theme_loader_populate_one_theme_param (RGBAnalyticPixel* from, ThemeLoaderLightweightColor* result);
-static void theme_loader_lightweight_color_init (ThemeLoaderLightweightColor *self);
-GdkPixbuf* theme_loader_load_icon (const gchar* source_basename);
-GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
-static guint theme_loader_rgb_pixel_hash_func (RGBAnalyticPixel* pixel_val);
-static guint _theme_loader_rgb_pixel_hash_func_gee_hash_data_func (gconstpointer v, gpointer self);
-static gboolean theme_loader_rgb_pixel_equal_func (RGBAnalyticPixel* p1, RGBAnalyticPixel* p2);
-static gboolean _theme_loader_rgb_pixel_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
-static gint theme_loader_hsv_pixel_compare_func (void* pixval1, void* pixval2);
-static gint _theme_loader_hsv_pixel_compare_func_gcompare_func (gconstpointer a, gconstpointer b);
-gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs);
-guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self);
-ThemeLoader* theme_loader_new (void);
-ThemeLoader* theme_loader_construct (GType object_type);
-static void theme_loader_finalize (ThemeLoader * obj);
-GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
-gpointer rgb_histogram_ref (gpointer instance);
-void rgb_histogram_unref (gpointer instance);
-GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_rgb_histogram (GValue* value, gpointer v_object);
-void value_take_rgb_histogram (GValue* value, gpointer v_object);
-gpointer value_get_rgb_histogram (const GValue* value);
-GType rgb_histogram_get_type (void) G_GNUC_CONST;
-#define RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorPrivate))
-enum  {
-	RGB_HISTOGRAM_MANIPULATOR_DUMMY_PROPERTY
-};
-static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-#define RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE 13
-#define RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH (RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE / 2)
-#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE 4
-#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH (256 + (2 * RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH))
-#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT 4
-#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET 1
-#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH (RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH + 2)
-#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT 118
-#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION (((((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - ((RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) / 2)) - RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) - 2)
-RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
-RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
-static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self);
-static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y);
-static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self);
-static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self);
-static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx);
-#define RGB_HISTOGRAM_GRAPHIC_WIDTH 256
-#define RGB_HISTOGRAM_GRAPHIC_HEIGHT 100
-static void rgb_histogram_manipulator_draw_histogram_frame (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
-static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
-static void rgb_histogram_manipulator_draw_trough (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
-static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position);
-GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self);
-void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
-RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf);
-RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
-gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
-gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
-void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-static void rgb_histogram_manipulator_finalize (GObject * obj);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 36 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 266 "CustomComponents.c"
-}
-
-
-static GdkColor* _gdk_color_dup (GdkColor* self) {
-	GdkColor* dup;
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	dup = g_new0 (GdkColor, 1);
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	memcpy (dup, self, sizeof (GdkColor));
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return dup;
-#line 278 "CustomComponents.c"
-}
-
-
-static gpointer __gdk_color_dup0 (gpointer self) {
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return self ? _gdk_color_dup (self) : NULL;
-#line 285 "CustomComponents.c"
-}
-
-
-static void theme_loader_populate_theme_params (void) {
-	ThemeLoaderLightweightColor* _tmp0_;
-	gint _tmp0__length1;
-	ThemeLoaderLightweightColor* _tmp1_;
-	GtkSettings* settings = NULL;
-	GtkSettings* _tmp2_;
-	GtkSettings* _tmp3_;
-	GHashTable* color_table = NULL;
-	GtkSettings* _tmp4_;
-	GHashTable* _tmp5_;
-	GHashTable* _tmp6_;
-	GdkColor* base_color = NULL;
-	GHashTable* _tmp7_;
-	gconstpointer _tmp8_;
-	GdkColor* _tmp9_;
-	gboolean _tmp10_ = FALSE;
-	GdkColor* _tmp11_;
-	RGBAnalyticPixel base_color_analytic_rgb = {0};
-	GdkColor* _tmp16_;
-	guint16 _tmp17_;
-	GdkColor* _tmp18_;
-	guint16 _tmp19_;
-	GdkColor* _tmp20_;
-	guint16 _tmp21_;
-	HSVAnalyticPixel base_color_analytic_hsv = {0};
-	RGBAnalyticPixel _tmp22_;
-	HSVAnalyticPixel bevel_light_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp23_;
-	gfloat _tmp24_;
-	HSVAnalyticPixel _tmp25_;
-	gfloat _tmp26_;
-	gfloat _tmp27_;
-	HSVAnalyticPixel bevel_lighter_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp28_;
-	gfloat _tmp29_;
-	HSVAnalyticPixel _tmp30_;
-	gfloat _tmp31_;
-	gfloat _tmp32_;
-	HSVAnalyticPixel bevel_dark_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp33_;
-	gfloat _tmp34_;
-	HSVAnalyticPixel _tmp35_;
-	gfloat _tmp36_;
-	gfloat _tmp37_;
-	HSVAnalyticPixel bevel_darker_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp38_;
-	gfloat _tmp39_;
-	HSVAnalyticPixel _tmp40_;
-	gfloat _tmp41_;
-	gfloat _tmp42_;
-	HSVAnalyticPixel outline_analytic_hsv = {0};
-	HSVAnalyticPixel _tmp43_;
-	gfloat _tmp44_;
-	HSVAnalyticPixel _tmp45_;
-	gfloat _tmp46_;
-	gfloat _tmp47_;
-	RGBAnalyticPixel outline_analytic_rgb = {0};
-	RGBAnalyticPixel _tmp48_ = {0};
-	ThemeLoaderLightweightColor* _tmp49_;
-	gint _tmp49__length1;
-	RGBAnalyticPixel _tmp50_;
-	ThemeLoaderLightweightColor _tmp51_ = {0};
-	ThemeLoaderLightweightColor _tmp52_;
-	RGBAnalyticPixel bevel_darker_analytic_rgb = {0};
-	RGBAnalyticPixel _tmp53_ = {0};
-	ThemeLoaderLightweightColor* _tmp54_;
-	gint _tmp54__length1;
-	RGBAnalyticPixel _tmp55_;
-	ThemeLoaderLightweightColor _tmp56_ = {0};
-	ThemeLoaderLightweightColor _tmp57_;
-	RGBAnalyticPixel bevel_dark_analytic_rgb = {0};
-	RGBAnalyticPixel _tmp58_ = {0};
-	ThemeLoaderLightweightColor* _tmp59_;
-	gint _tmp59__length1;
-	RGBAnalyticPixel _tmp60_;
-	ThemeLoaderLightweightColor _tmp61_ = {0};
-	ThemeLoaderLightweightColor _tmp62_;
-	ThemeLoaderLightweightColor* _tmp63_;
-	gint _tmp63__length1;
-	RGBAnalyticPixel _tmp64_;
-	ThemeLoaderLightweightColor _tmp65_ = {0};
-	ThemeLoaderLightweightColor _tmp66_;
-	RGBAnalyticPixel bevel_light_analytic_rgb = {0};
-	RGBAnalyticPixel _tmp67_ = {0};
-	ThemeLoaderLightweightColor* _tmp68_;
-	gint _tmp68__length1;
-	RGBAnalyticPixel _tmp69_;
-	ThemeLoaderLightweightColor _tmp70_ = {0};
-	ThemeLoaderLightweightColor _tmp71_;
-	RGBAnalyticPixel bevel_lighter_analytic_rgb = {0};
-	RGBAnalyticPixel _tmp72_ = {0};
-	ThemeLoaderLightweightColor* _tmp73_;
-	gint _tmp73__length1;
-	RGBAnalyticPixel _tmp74_;
-	ThemeLoaderLightweightColor _tmp75_ = {0};
-	ThemeLoaderLightweightColor _tmp76_;
-#line 31 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = theme_loader_theme_colors;
-#line 31 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0__length1 = theme_loader_theme_colors_length1;
-#line 31 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_ != NULL) {
-#line 32 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return;
-#line 393 "CustomComponents.c"
-	}
-#line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = g_new0 (ThemeLoaderLightweightColor, THEME_LOADER_NUM_SUPPORTED_INTENSITIES);
-#line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_theme_colors = (g_free (theme_loader_theme_colors), NULL);
-#line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_theme_colors = _tmp1_;
-#line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_theme_colors_length1 = THEME_LOADER_NUM_SUPPORTED_INTENSITIES;
-#line 34 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_theme_loader_theme_colors_size_ = theme_loader_theme_colors_length1;
-#line 36 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = gtk_settings_get_default ();
-#line 36 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 36 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	settings = _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = settings;
-#line 37 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_object_get (_tmp4_, "color-hash", &_tmp5_, NULL);
-#line 37 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = _tmp5_;
-#line 37 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	color_table = _tmp6_;
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = color_table;
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = g_hash_table_lookup (_tmp7_, "bg_color");
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp9_ = __gdk_color_dup0 ((GdkColor*) _tmp8_);
-#line 38 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	base_color = _tmp9_;
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp11_ = base_color;
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp11_ == NULL) {
-#line 431 "CustomComponents.c"
-		GdkColor _tmp12_ = {0};
-		gboolean _tmp13_;
-		GdkColor _tmp14_;
-		GdkColor* _tmp15_;
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp13_ = gdk_color_parse ("#fff", &_tmp12_);
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_g_free0 (base_color);
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp14_ = _tmp12_;
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp15_ = __gdk_color_dup0 (&_tmp14_);
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		base_color = _tmp15_;
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp10_ = !_tmp13_;
-#line 448 "CustomComponents.c"
-	} else {
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp10_ = FALSE;
-#line 452 "CustomComponents.c"
-	}
-#line 39 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp10_) {
-#line 40 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_error ("CustomComponents.vala:40: can't parse color");
-#line 458 "CustomComponents.c"
-	}
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp16_ = base_color;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp17_ = (*_tmp16_).red;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp18_ = base_color;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp19_ = (*_tmp18_).green;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp20_ = base_color;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp21_ = (*_tmp20_).blue;
-#line 42 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_analytic_pixel_init_from_quantized_components (&base_color_analytic_rgb, (guchar) (_tmp17_ >> 8), (guchar) (_tmp19_ >> 8), (guchar) (_tmp21_ >> 8));
-#line 45 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp22_ = base_color_analytic_rgb;
-#line 45 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_init_from_rgb (&base_color_analytic_hsv, &_tmp22_);
-#line 48 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp23_ = base_color_analytic_hsv;
-#line 48 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_light_analytic_hsv = _tmp23_;
-#line 49 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp24_ = bevel_light_analytic_hsv.light_value;
-#line 49 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_light_analytic_hsv.light_value = _tmp24_ * 1.15f;
-#line 50 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp25_ = bevel_light_analytic_hsv;
-#line 50 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp26_ = _tmp25_.light_value;
-#line 50 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp27_ = CLAMP (_tmp26_, 0.0f, 1.0f);
-#line 50 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_light_analytic_hsv.light_value = _tmp27_;
-#line 53 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp28_ = bevel_light_analytic_hsv;
-#line 53 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_lighter_analytic_hsv = _tmp28_;
-#line 54 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp29_ = bevel_lighter_analytic_hsv.light_value;
-#line 54 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_lighter_analytic_hsv.light_value = _tmp29_ * 1.15f;
-#line 55 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp30_ = bevel_lighter_analytic_hsv;
-#line 55 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp31_ = _tmp30_.light_value;
-#line 55 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp32_ = CLAMP (_tmp31_, 0.0f, 1.0f);
-#line 55 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_lighter_analytic_hsv.light_value = _tmp32_;
-#line 58 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp33_ = base_color_analytic_hsv;
-#line 58 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_dark_analytic_hsv = _tmp33_;
-#line 59 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp34_ = bevel_dark_analytic_hsv.light_value;
-#line 59 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_dark_analytic_hsv.light_value = _tmp34_ * 0.85f;
-#line 60 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp35_ = bevel_dark_analytic_hsv;
-#line 60 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp36_ = _tmp35_.light_value;
-#line 60 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp37_ = CLAMP (_tmp36_, 0.0f, 1.0f);
-#line 60 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_dark_analytic_hsv.light_value = _tmp37_;
-#line 63 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp38_ = bevel_dark_analytic_hsv;
-#line 63 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_darker_analytic_hsv = _tmp38_;
-#line 64 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp39_ = bevel_darker_analytic_hsv.light_value;
-#line 64 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_darker_analytic_hsv.light_value = _tmp39_ * 0.85f;
-#line 65 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp40_ = bevel_darker_analytic_hsv;
-#line 65 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp41_ = _tmp40_.light_value;
-#line 65 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp42_ = CLAMP (_tmp41_, 0.0f, 1.0f);
-#line 65 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_darker_analytic_hsv.light_value = _tmp42_;
-#line 68 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp43_ = bevel_darker_analytic_hsv;
-#line 68 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	outline_analytic_hsv = _tmp43_;
-#line 69 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp44_ = outline_analytic_hsv.light_value;
-#line 69 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	outline_analytic_hsv.light_value = _tmp44_ * 0.66f;
-#line 70 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp45_ = outline_analytic_hsv;
-#line 70 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp46_ = _tmp45_.light_value;
-#line 70 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp47_ = CLAMP (_tmp46_, 0.0f, 1.0f);
-#line 70 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	outline_analytic_hsv.light_value = _tmp47_;
-#line 73 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_to_rgb (&outline_analytic_hsv, &_tmp48_);
-#line 73 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	outline_analytic_rgb = _tmp48_;
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp49_ = theme_loader_theme_colors;
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp49__length1 = theme_loader_theme_colors_length1;
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp50_ = outline_analytic_rgb;
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp50_, &_tmp51_);
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp49_[THEME_LOADER_THEME_OUTLINE_COLOR] = _tmp51_;
-#line 74 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp52_ = _tmp49_[THEME_LOADER_THEME_OUTLINE_COLOR];
-#line 77 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_to_rgb (&bevel_darker_analytic_hsv, &_tmp53_);
-#line 77 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_darker_analytic_rgb = _tmp53_;
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp54_ = theme_loader_theme_colors;
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp54__length1 = theme_loader_theme_colors_length1;
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp55_ = bevel_darker_analytic_rgb;
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp55_, &_tmp56_);
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp54_[THEME_LOADER_THEME_BEVEL_DARKER_COLOR] = _tmp56_;
-#line 78 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp57_ = _tmp54_[THEME_LOADER_THEME_BEVEL_DARKER_COLOR];
-#line 81 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_to_rgb (&bevel_dark_analytic_hsv, &_tmp58_);
-#line 81 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_dark_analytic_rgb = _tmp58_;
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp59_ = theme_loader_theme_colors;
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp59__length1 = theme_loader_theme_colors_length1;
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp60_ = bevel_dark_analytic_rgb;
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp60_, &_tmp61_);
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp59_[THEME_LOADER_THEME_BEVEL_DARK_COLOR] = _tmp61_;
-#line 82 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp62_ = _tmp59_[THEME_LOADER_THEME_BEVEL_DARK_COLOR];
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp63_ = theme_loader_theme_colors;
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp63__length1 = theme_loader_theme_colors_length1;
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp64_ = base_color_analytic_rgb;
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp64_, &_tmp65_);
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp63_[THEME_LOADER_THEME_BASE_COLOR] = _tmp65_;
-#line 85 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp66_ = _tmp63_[THEME_LOADER_THEME_BASE_COLOR];
-#line 88 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_to_rgb (&bevel_light_analytic_hsv, &_tmp67_);
-#line 88 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_light_analytic_rgb = _tmp67_;
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp68_ = theme_loader_theme_colors;
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp68__length1 = theme_loader_theme_colors_length1;
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp69_ = bevel_light_analytic_rgb;
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp69_, &_tmp70_);
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp68_[THEME_LOADER_THEME_BEVEL_LIGHT_COLOR] = _tmp70_;
-#line 89 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp71_ = _tmp68_[THEME_LOADER_THEME_BEVEL_LIGHT_COLOR];
-#line 92 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_analytic_pixel_to_rgb (&bevel_light_analytic_hsv, &_tmp72_);
-#line 92 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	bevel_lighter_analytic_rgb = _tmp72_;
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp73_ = theme_loader_theme_colors;
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp73__length1 = theme_loader_theme_colors_length1;
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp74_ = bevel_lighter_analytic_rgb;
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_one_theme_param (&_tmp74_, &_tmp75_);
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp73_[THEME_LOADER_THEME_BEVEL_LIGHTER_COLOR] = _tmp75_;
-#line 93 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp76_ = _tmp73_[THEME_LOADER_THEME_BEVEL_LIGHTER_COLOR];
-#line 30 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_free0 (base_color);
-#line 30 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_hash_table_unref0 (color_table);
-#line 30 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (settings);
-#line 656 "CustomComponents.c"
-}
-
-
-static void theme_loader_populate_one_theme_param (RGBAnalyticPixel* from, ThemeLoaderLightweightColor* result) {
-	ThemeLoaderLightweightColor into = {0};
-	RGBAnalyticPixel _tmp0_;
-	gfloat _tmp1_;
-	RGBAnalyticPixel _tmp2_;
-	gfloat _tmp3_;
-	RGBAnalyticPixel _tmp4_;
-	gfloat _tmp5_;
-#line 97 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (from != NULL);
-#line 98 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_lightweight_color_init (&into);
-#line 100 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = *from;
-#line 100 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = _tmp0_.red;
-#line 100 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	into.red = (guchar) (_tmp1_ * 255.0f);
-#line 101 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = *from;
-#line 101 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_.green;
-#line 101 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	into.green = (guchar) (_tmp3_ * 255.0f);
-#line 102 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = *from;
-#line 102 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = _tmp4_.blue;
-#line 102 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	into.blue = (guchar) (_tmp5_ * 255.0f);
-#line 104 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	*result = into;
-#line 104 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return;
-#line 694 "CustomComponents.c"
-}
-
-
-static guint _theme_loader_rgb_pixel_hash_func_gee_hash_data_func (gconstpointer v, gpointer self) {
-	guint result;
-	result = theme_loader_rgb_pixel_hash_func ((RGBAnalyticPixel*) v);
-#line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 703 "CustomComponents.c"
-}
-
-
-static gboolean _theme_loader_rgb_pixel_equal_func_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
-	gboolean result;
-	result = theme_loader_rgb_pixel_equal_func ((RGBAnalyticPixel*) a, (RGBAnalyticPixel*) b);
-#line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 712 "CustomComponents.c"
-}
-
-
-static gint _theme_loader_hsv_pixel_compare_func_gcompare_func (gconstpointer a, gconstpointer b) {
-	gint result;
-	result = theme_loader_hsv_pixel_compare_func (a, b);
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 721 "CustomComponents.c"
-}
-
-
-GdkPixbuf* theme_loader_load_icon (const gchar* source_basename) {
-	GdkPixbuf* result = NULL;
-	GdkPixbuf* loaded_pixbuf = NULL;
-	const gchar* _tmp0_;
-	GdkPixbuf* _tmp1_;
-	GdkPixbuf* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GeeHashSet* colors = NULL;
-	GeeHashSet* _tmp5_;
-	guchar* pixel_data = NULL;
-	GdkPixbuf* _tmp6_;
-	guint8* _tmp7_;
-	gint pixel_data_length1;
-	gint _pixel_data_size_;
-	GeeHashSet* _tmp39_;
-	gint _tmp40_;
-	gint _tmp41_;
-	HSVAnalyticPixel* hsv_pixels = NULL;
-	HSVAnalyticPixel* _tmp42_;
-	gint hsv_pixels_length1;
-	gint _hsv_pixels_size_;
-	gint pixel_ticker = 0;
-	HSVAnalyticPixel* _tmp56_;
-	gint _tmp56__length1;
-	HSVAnalyticPixel* _tmp57_;
-	gint _tmp57__length1;
-#line 107 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (source_basename != NULL, NULL);
-#line 108 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_populate_theme_params ();
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = source_basename;
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = resources_get_icon (_tmp0_, 0);
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (_tmp2_);
-#line 110 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	loaded_pixbuf = _tmp4_;
-#line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = gee_hash_set_new (TYPE_RGB_ANALYTIC_PIXEL, (GBoxedCopyFunc) rgb_analytic_pixel_dup, (GDestroyNotify) rgb_analytic_pixel_free, _theme_loader_rgb_pixel_hash_func_gee_hash_data_func, NULL, NULL, _theme_loader_rgb_pixel_equal_func_gee_equal_data_func, NULL, NULL);
-#line 114 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	colors = _tmp5_;
-#line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = loaded_pixbuf;
-#line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = gdk_pixbuf_get_pixels (_tmp6_);
-#line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_data = _tmp7_;
-#line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_data_length1 = -1;
-#line 117 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_pixel_data_size_ = pixel_data_length1;
-#line 784 "CustomComponents.c"
-	{
-		gint j = 0;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		j = 0;
-#line 789 "CustomComponents.c"
-		{
-			gboolean _tmp8_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp8_ = TRUE;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			while (TRUE) {
-#line 796 "CustomComponents.c"
-				gint _tmp10_;
-				GdkPixbuf* _tmp11_;
-				gint _tmp12_;
-				gint _tmp13_;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				if (!_tmp8_) {
-#line 803 "CustomComponents.c"
-					gint _tmp9_;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp9_ = j;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					j = _tmp9_ + 1;
-#line 809 "CustomComponents.c"
-				}
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp8_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp10_ = j;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp11_ = loaded_pixbuf;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp12_ = gdk_pixbuf_get_height (_tmp11_);
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp13_ = _tmp12_;
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				if (!(_tmp10_ < _tmp13_)) {
-#line 118 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					break;
-#line 825 "CustomComponents.c"
-				}
-				{
-					gint i = 0;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					i = 0;
-#line 831 "CustomComponents.c"
-					{
-						gboolean _tmp14_ = FALSE;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp14_ = TRUE;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						while (TRUE) {
-#line 838 "CustomComponents.c"
-							gint _tmp16_;
-							GdkPixbuf* _tmp17_;
-							gint _tmp18_;
-							gint _tmp19_;
-							gint pixel_index = 0;
-							gint _tmp20_;
-							GdkPixbuf* _tmp21_;
-							gint _tmp22_;
-							gint _tmp23_;
-							gint _tmp24_;
-							GdkPixbuf* _tmp25_;
-							gint _tmp26_;
-							gint _tmp27_;
-							RGBAnalyticPixel pixel_color = {0};
-							guchar* _tmp28_;
-							gint _tmp28__length1;
-							gint _tmp29_;
-							guchar _tmp30_;
-							guchar* _tmp31_;
-							gint _tmp31__length1;
-							gint _tmp32_;
-							guchar _tmp33_;
-							guchar* _tmp34_;
-							gint _tmp34__length1;
-							gint _tmp35_;
-							guchar _tmp36_;
-							GeeHashSet* _tmp37_;
-							RGBAnalyticPixel _tmp38_;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							if (!_tmp14_) {
-#line 869 "CustomComponents.c"
-								gint _tmp15_;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								_tmp15_ = i;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								i = _tmp15_ + 1;
-#line 875 "CustomComponents.c"
-							}
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp14_ = FALSE;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp16_ = i;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp17_ = loaded_pixbuf;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp18_ = gdk_pixbuf_get_width (_tmp17_);
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp19_ = _tmp18_;
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							if (!(_tmp16_ < _tmp19_)) {
-#line 119 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								break;
-#line 891 "CustomComponents.c"
-							}
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp20_ = j;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp21_ = loaded_pixbuf;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp22_ = gdk_pixbuf_get_rowstride (_tmp21_);
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp23_ = _tmp22_;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp24_ = i;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp25_ = loaded_pixbuf;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp26_ = gdk_pixbuf_get_n_channels (_tmp25_);
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp27_ = _tmp26_;
-#line 120 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							pixel_index = (_tmp20_ * _tmp23_) + (_tmp24_ * _tmp27_);
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp28_ = pixel_data;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp28__length1 = pixel_data_length1;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp29_ = pixel_index;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp30_ = _tmp28_[_tmp29_];
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp31_ = pixel_data;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp31__length1 = pixel_data_length1;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp32_ = pixel_index;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp33_ = _tmp31_[_tmp32_ + 1];
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp34_ = pixel_data;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp34__length1 = pixel_data_length1;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp35_ = pixel_index;
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp36_ = _tmp34_[_tmp35_ + 2];
-#line 122 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							rgb_analytic_pixel_init_from_quantized_components (&pixel_color, _tmp30_, _tmp33_, _tmp36_);
-#line 125 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp37_ = colors;
-#line 125 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp38_ = pixel_color;
-#line 125 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp38_);
-#line 943 "CustomComponents.c"
-						}
-					}
-				}
-			}
-		}
-	}
-#line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp39_ = colors;
-#line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp41_ = _tmp40_;
-#line 132 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp41_ != THEME_LOADER_NUM_SUPPORTED_INTENSITIES) {
-#line 133 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_error ("CustomComponents.vala:133: %s", "ThemeLoader: load_icon: pixbuf does not contain the correct number " "of unique colors");
-#line 960 "CustomComponents.c"
-	}
-#line 138 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp42_ = g_new0 (HSVAnalyticPixel, 6);
-#line 138 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_pixels = _tmp42_;
-#line 138 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_pixels_length1 = 6;
-#line 138 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_hsv_pixels_size_ = hsv_pixels_length1;
-#line 139 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_ticker = 0;
-#line 972 "CustomComponents.c"
-	{
-		GeeIterator* _rgb_pixel_it = NULL;
-		GeeHashSet* _tmp43_;
-		GeeIterator* _tmp44_;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp43_ = colors;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp44_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_rgb_pixel_it = _tmp44_;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		while (TRUE) {
-#line 985 "CustomComponents.c"
-			GeeIterator* _tmp45_;
-			gboolean _tmp46_;
-			RGBAnalyticPixel rgb_pixel = {0};
-			GeeIterator* _tmp47_;
-			gpointer _tmp48_;
-			RGBAnalyticPixel* _tmp49_;
-			RGBAnalyticPixel _tmp50_;
-			HSVAnalyticPixel* _tmp51_;
-			gint _tmp51__length1;
-			gint _tmp52_;
-			RGBAnalyticPixel _tmp53_;
-			HSVAnalyticPixel _tmp54_ = {0};
-			HSVAnalyticPixel _tmp55_;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp45_ = _rgb_pixel_it;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp46_ = gee_iterator_next (_tmp45_);
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			if (!_tmp46_) {
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				break;
-#line 1007 "CustomComponents.c"
-			}
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp47_ = _rgb_pixel_it;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp48_ = gee_iterator_get (_tmp47_);
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp49_ = (RGBAnalyticPixel*) _tmp48_;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp50_ = *_tmp49_;
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_rgb_analytic_pixel_free0 (_tmp49_);
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			rgb_pixel = _tmp50_;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp51_ = hsv_pixels;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp51__length1 = hsv_pixels_length1;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp52_ = pixel_ticker;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			pixel_ticker = _tmp52_ + 1;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp53_ = rgb_pixel;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			hsv_analytic_pixel_init_from_rgb (&_tmp54_, &_tmp53_);
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp51_[_tmp52_] = _tmp54_;
-#line 141 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp55_ = _tmp51_[_tmp52_];
-#line 1037 "CustomComponents.c"
-		}
-#line 140 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_g_object_unref0 (_rgb_pixel_it);
-#line 1041 "CustomComponents.c"
-	}
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp56_ = hsv_pixels;
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp56__length1 = hsv_pixels_length1;
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp57_ = hsv_pixels;
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp57__length1 = hsv_pixels_length1;
-#line 142 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	qsort (_tmp56_, (gsize) _tmp57__length1, (gsize) sizeof (HSVAnalyticPixel), _theme_loader_hsv_pixel_compare_func_gcompare_func);
-#line 1053 "CustomComponents.c"
-	{
-		gint j = 0;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		j = 0;
-#line 1058 "CustomComponents.c"
-		{
-			gboolean _tmp58_ = FALSE;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp58_ = TRUE;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			while (TRUE) {
-#line 1065 "CustomComponents.c"
-				gint _tmp60_;
-				GdkPixbuf* _tmp61_;
-				gint _tmp62_;
-				gint _tmp63_;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				if (!_tmp58_) {
-#line 1072 "CustomComponents.c"
-					gint _tmp59_;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp59_ = j;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					j = _tmp59_ + 1;
-#line 1078 "CustomComponents.c"
-				}
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp58_ = FALSE;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp60_ = j;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp61_ = loaded_pixbuf;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp62_ = gdk_pixbuf_get_height (_tmp61_);
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp63_ = _tmp62_;
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				if (!(_tmp60_ < _tmp63_)) {
-#line 146 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					break;
-#line 1094 "CustomComponents.c"
-				}
-				{
-					gint i = 0;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					i = 0;
-#line 1100 "CustomComponents.c"
-					{
-						gboolean _tmp64_ = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp64_ = TRUE;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						while (TRUE) {
-#line 1107 "CustomComponents.c"
-							gint _tmp66_;
-							GdkPixbuf* _tmp67_;
-							gint _tmp68_;
-							gint _tmp69_;
-							gint pixel_index = 0;
-							gint _tmp70_;
-							GdkPixbuf* _tmp71_;
-							gint _tmp72_;
-							gint _tmp73_;
-							gint _tmp74_;
-							GdkPixbuf* _tmp75_;
-							gint _tmp76_;
-							gint _tmp77_;
-							RGBAnalyticPixel pixel_color = {0};
-							guchar* _tmp78_;
-							gint _tmp78__length1;
-							gint _tmp79_;
-							guchar _tmp80_;
-							guchar* _tmp81_;
-							gint _tmp81__length1;
-							gint _tmp82_;
-							guchar _tmp83_;
-							guchar* _tmp84_;
-							gint _tmp84__length1;
-							gint _tmp85_;
-							guchar _tmp86_;
-							HSVAnalyticPixel pixel_color_hsv = {0};
-							RGBAnalyticPixel _tmp87_;
-							gint this_intensity = 0;
-							guchar* _tmp98_;
-							gint _tmp98__length1;
-							gint _tmp99_;
-							ThemeLoaderLightweightColor* _tmp100_;
-							gint _tmp100__length1;
-							gint _tmp101_;
-							ThemeLoaderLightweightColor _tmp102_;
-							guchar _tmp103_;
-							guchar _tmp104_;
-							guchar* _tmp105_;
-							gint _tmp105__length1;
-							gint _tmp106_;
-							ThemeLoaderLightweightColor* _tmp107_;
-							gint _tmp107__length1;
-							gint _tmp108_;
-							ThemeLoaderLightweightColor _tmp109_;
-							guchar _tmp110_;
-							guchar _tmp111_;
-							guchar* _tmp112_;
-							gint _tmp112__length1;
-							gint _tmp113_;
-							ThemeLoaderLightweightColor* _tmp114_;
-							gint _tmp114__length1;
-							gint _tmp115_;
-							ThemeLoaderLightweightColor _tmp116_;
-							guchar _tmp117_;
-							guchar _tmp118_;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							if (!_tmp64_) {
-#line 1166 "CustomComponents.c"
-								gint _tmp65_;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								_tmp65_ = i;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								i = _tmp65_ + 1;
-#line 1172 "CustomComponents.c"
-							}
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp64_ = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp66_ = i;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp67_ = loaded_pixbuf;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp68_ = gdk_pixbuf_get_width (_tmp67_);
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp69_ = _tmp68_;
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							if (!(_tmp66_ < _tmp69_)) {
-#line 147 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								break;
-#line 1188 "CustomComponents.c"
-							}
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp70_ = j;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp71_ = loaded_pixbuf;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp72_ = gdk_pixbuf_get_rowstride (_tmp71_);
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp73_ = _tmp72_;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp74_ = i;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp75_ = loaded_pixbuf;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp76_ = gdk_pixbuf_get_n_channels (_tmp75_);
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp77_ = _tmp76_;
-#line 148 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							pixel_index = (_tmp70_ * _tmp73_) + (_tmp74_ * _tmp77_);
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp78_ = pixel_data;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp78__length1 = pixel_data_length1;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp79_ = pixel_index;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp80_ = _tmp78_[_tmp79_];
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp81_ = pixel_data;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp81__length1 = pixel_data_length1;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp82_ = pixel_index;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp83_ = _tmp81_[_tmp82_ + 1];
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp84_ = pixel_data;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp84__length1 = pixel_data_length1;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp85_ = pixel_index;
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp86_ = _tmp84_[_tmp85_ + 2];
-#line 149 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							rgb_analytic_pixel_init_from_quantized_components (&pixel_color, _tmp80_, _tmp83_, _tmp86_);
-#line 152 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp87_ = pixel_color;
-#line 152 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							hsv_analytic_pixel_init_from_rgb (&pixel_color_hsv, &_tmp87_);
-#line 153 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							this_intensity = 0;
-#line 1240 "CustomComponents.c"
-							{
-								gint k = 0;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-								k = 0;
-#line 1245 "CustomComponents.c"
-								{
-									gboolean _tmp88_ = FALSE;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-									_tmp88_ = TRUE;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-									while (TRUE) {
-#line 1252 "CustomComponents.c"
-										gint _tmp90_;
-										HSVAnalyticPixel* _tmp91_;
-										gint _tmp91__length1;
-										gint _tmp92_;
-										HSVAnalyticPixel _tmp93_;
-										gfloat _tmp94_;
-										HSVAnalyticPixel _tmp95_;
-										gfloat _tmp96_;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										if (!_tmp88_) {
-#line 1263 "CustomComponents.c"
-											gint _tmp89_;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											_tmp89_ = k;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											k = _tmp89_ + 1;
-#line 1269 "CustomComponents.c"
-										}
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp88_ = FALSE;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp90_ = k;
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										if (!(_tmp90_ < THEME_LOADER_NUM_SUPPORTED_INTENSITIES)) {
-#line 154 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											break;
-#line 1279 "CustomComponents.c"
-										}
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp91_ = hsv_pixels;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp91__length1 = hsv_pixels_length1;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp92_ = k;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp93_ = _tmp91_[_tmp92_];
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp94_ = _tmp93_.light_value;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp95_ = pixel_color_hsv;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										_tmp96_ = _tmp95_.light_value;
-#line 155 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-										if (_tmp94_ == _tmp96_) {
-#line 1297 "CustomComponents.c"
-											gint _tmp97_;
-#line 156 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											_tmp97_ = k;
-#line 156 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											this_intensity = _tmp97_;
-#line 157 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-											break;
-#line 1305 "CustomComponents.c"
-										}
-									}
-								}
-							}
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp98_ = pixel_data;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp98__length1 = pixel_data_length1;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp99_ = pixel_index;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp100_ = theme_loader_theme_colors;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp100__length1 = theme_loader_theme_colors_length1;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp101_ = this_intensity;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp102_ = _tmp100_[_tmp101_];
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp103_ = _tmp102_.red;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp98_[_tmp99_] = _tmp103_;
-#line 160 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp104_ = _tmp98_[_tmp99_];
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp105_ = pixel_data;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp105__length1 = pixel_data_length1;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp106_ = pixel_index;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp107_ = theme_loader_theme_colors;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp107__length1 = theme_loader_theme_colors_length1;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp108_ = this_intensity;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp109_ = _tmp107_[_tmp108_];
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp110_ = _tmp109_.green;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp105_[_tmp106_ + 1] = _tmp110_;
-#line 161 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp111_ = _tmp105_[_tmp106_ + 1];
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp112_ = pixel_data;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp112__length1 = pixel_data_length1;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp113_ = pixel_index;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp114_ = theme_loader_theme_colors;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp114__length1 = theme_loader_theme_colors_length1;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp115_ = this_intensity;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp116_ = _tmp114_[_tmp115_];
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp117_ = _tmp116_.blue;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp112_[_tmp113_ + 2] = _tmp117_;
-#line 162 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							_tmp118_ = _tmp112_[_tmp113_ + 2];
-#line 1370 "CustomComponents.c"
-						}
-					}
-				}
-			}
-		}
-	}
-#line 166 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = loaded_pixbuf;
-#line 166 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	hsv_pixels = (g_free (hsv_pixels), NULL);
-#line 166 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (colors);
-#line 166 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1385 "CustomComponents.c"
-}
-
-
-static gint theme_loader_hsv_pixel_compare_func (void* pixval1, void* pixval2) {
-	gint result = 0;
-	HSVAnalyticPixel pixel_val_1 = {0};
-	void* _tmp0_;
-	HSVAnalyticPixel pixel_val_2 = {0};
-	void* _tmp1_;
-	HSVAnalyticPixel _tmp2_;
-	gfloat _tmp3_;
-	HSVAnalyticPixel _tmp4_;
-	gfloat _tmp5_;
-#line 170 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = pixval1;
-#line 170 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_val_1 = *((HSVAnalyticPixel*) _tmp0_);
-#line 171 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = pixval2;
-#line 171 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_val_2 = *((HSVAnalyticPixel*) _tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = pixel_val_1;
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_.light_value;
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = pixel_val_2;
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = _tmp4_.light_value;
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = (gint) (255.0f * (_tmp3_ - _tmp5_));
-#line 173 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1419 "CustomComponents.c"
-}
-
-
-static gboolean theme_loader_rgb_pixel_equal_func (RGBAnalyticPixel* p1, RGBAnalyticPixel* p2) {
-	gboolean result = FALSE;
-	RGBAnalyticPixel* _tmp0_;
-	RGBAnalyticPixel* _tmp1_;
-	gboolean _tmp2_;
-#line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = p1;
-#line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = p2;
-#line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = rgb_analytic_pixel_equals (_tmp0_, _tmp1_);
-#line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = _tmp2_;
-#line 177 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1438 "CustomComponents.c"
-}
-
-
-static guint theme_loader_rgb_pixel_hash_func (RGBAnalyticPixel* pixel_val) {
-	guint result = 0U;
-	RGBAnalyticPixel* _tmp0_;
-	guint _tmp1_;
-#line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = pixel_val;
-#line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = rgb_analytic_pixel_hash_code (_tmp0_);
-#line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = _tmp1_;
-#line 181 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1454 "CustomComponents.c"
-}
-
-
-ThemeLoader* theme_loader_construct (GType object_type) {
-	ThemeLoader* self = NULL;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self = (ThemeLoader*) g_type_create_instance (object_type);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return self;
-#line 1464 "CustomComponents.c"
-}
-
-
-ThemeLoader* theme_loader_new (void) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return theme_loader_construct (TYPE_THEME_LOADER);
-#line 1471 "CustomComponents.c"
-}
-
-
-static void theme_loader_lightweight_color_init (ThemeLoaderLightweightColor *self) {
-	guchar _tmp0_;
-	guchar _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	memset (self, 0, sizeof (ThemeLoaderLightweightColor));
-#line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	(*self).blue = (guchar) 0;
-#line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = (*self).blue;
-#line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	(*self).green = _tmp0_;
-#line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = (*self).green;
-#line 16 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	(*self).red = _tmp1_;
-#line 1490 "CustomComponents.c"
-}
-
-
-static ThemeLoaderLightweightColor* theme_loader_lightweight_color_dup (const ThemeLoaderLightweightColor* self) {
-	ThemeLoaderLightweightColor* dup;
-#line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	dup = g_new0 (ThemeLoaderLightweightColor, 1);
-#line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	memcpy (dup, self, sizeof (ThemeLoaderLightweightColor));
-#line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return dup;
-#line 1502 "CustomComponents.c"
-}
-
-
-static void theme_loader_lightweight_color_free (ThemeLoaderLightweightColor* self) {
-#line 10 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_free (self);
-#line 1509 "CustomComponents.c"
-}
-
-
-static GType theme_loader_lightweight_color_get_type (void) {
-	static volatile gsize theme_loader_lightweight_color_type_id__volatile = 0;
-	if (g_once_init_enter (&theme_loader_lightweight_color_type_id__volatile)) {
-		GType theme_loader_lightweight_color_type_id;
-		theme_loader_lightweight_color_type_id = g_boxed_type_register_static ("ThemeLoaderLightweightColor", (GBoxedCopyFunc) theme_loader_lightweight_color_dup, (GBoxedFreeFunc) theme_loader_lightweight_color_free);
-		g_once_init_leave (&theme_loader_lightweight_color_type_id__volatile, theme_loader_lightweight_color_type_id);
-	}
-	return theme_loader_lightweight_color_type_id__volatile;
-}
-
-
-static void value_theme_loader_init (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	value->data[0].v_pointer = NULL;
-#line 1527 "CustomComponents.c"
-}
-
-
-static void value_theme_loader_free_value (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		theme_loader_unref (value->data[0].v_pointer);
-#line 1536 "CustomComponents.c"
-	}
-}
-
-
-static void value_theme_loader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (src_value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		dest_value->data[0].v_pointer = theme_loader_ref (src_value->data[0].v_pointer);
-#line 1546 "CustomComponents.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 1550 "CustomComponents.c"
-	}
-}
-
-
-static gpointer value_theme_loader_peek_pointer (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return value->data[0].v_pointer;
-#line 1558 "CustomComponents.c"
-}
-
-
-static gchar* value_theme_loader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (collect_values[0].v_pointer) {
-#line 1565 "CustomComponents.c"
-		ThemeLoader * object;
-		object = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1572 "CustomComponents.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.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 1576 "CustomComponents.c"
-		}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = theme_loader_ref (object);
-#line 1580 "CustomComponents.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = NULL;
-#line 1584 "CustomComponents.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return NULL;
-#line 1588 "CustomComponents.c"
-}
-
-
-static gchar* value_theme_loader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ThemeLoader ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (!object_p) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1599 "CustomComponents.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (!value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		*object_p = NULL;
-#line 1605 "CustomComponents.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		*object_p = value->data[0].v_pointer;
-#line 1609 "CustomComponents.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		*object_p = theme_loader_ref (value->data[0].v_pointer);
-#line 1613 "CustomComponents.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return NULL;
-#line 1617 "CustomComponents.c"
-}
-
-
-GParamSpec* param_spec_theme_loader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecThemeLoader* spec;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_THEME_LOADER), NULL);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return G_PARAM_SPEC (spec);
-#line 1631 "CustomComponents.c"
-}
-
-
-gpointer value_get_theme_loader (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER), NULL);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return value->data[0].v_pointer;
-#line 1640 "CustomComponents.c"
-}
-
-
-void value_set_theme_loader (GValue* value, gpointer v_object) {
-	ThemeLoader * old;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_THEME_LOADER));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = v_object;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		theme_loader_ref (value->data[0].v_pointer);
-#line 1660 "CustomComponents.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = NULL;
-#line 1664 "CustomComponents.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		theme_loader_unref (old);
-#line 1670 "CustomComponents.c"
-	}
-}
-
-
-void value_take_theme_loader (GValue* value, gpointer v_object) {
-	ThemeLoader * old;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_THEME_LOADER));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_THEME_LOADER));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = v_object;
-#line 1689 "CustomComponents.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		value->data[0].v_pointer = NULL;
-#line 1693 "CustomComponents.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		theme_loader_unref (old);
-#line 1699 "CustomComponents.c"
-	}
-}
-
-
-static void theme_loader_class_init (ThemeLoaderClass * klass) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	theme_loader_parent_class = g_type_class_peek_parent (klass);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	((ThemeLoaderClass *) klass)->finalize = theme_loader_finalize;
-#line 1709 "CustomComponents.c"
-}
-
-
-static void theme_loader_instance_init (ThemeLoader * self) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->ref_count = 1;
-#line 1716 "CustomComponents.c"
-}
-
-
-static void theme_loader_finalize (ThemeLoader * obj) {
-	ThemeLoader * self;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THEME_LOADER, ThemeLoader);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_signal_handlers_destroy (self);
-#line 1726 "CustomComponents.c"
-}
-
-
-GType theme_loader_get_type (void) {
-	static volatile gsize theme_loader_type_id__volatile = 0;
-	if (g_once_init_enter (&theme_loader_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_theme_loader_init, value_theme_loader_free_value, value_theme_loader_copy_value, value_theme_loader_peek_pointer, "p", value_theme_loader_collect_value, "p", value_theme_loader_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (ThemeLoaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) theme_loader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ThemeLoader), 0, (GInstanceInitFunc) theme_loader_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType theme_loader_type_id;
-		theme_loader_type_id = g_type_register_fundamental (g_type_fundamental_next (), "ThemeLoader", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&theme_loader_type_id__volatile, theme_loader_type_id);
-	}
-	return theme_loader_type_id__volatile;
-}
-
-
-gpointer theme_loader_ref (gpointer instance) {
-	ThemeLoader * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return instance;
-#line 1751 "CustomComponents.c"
-}
-
-
-void theme_loader_unref (gpointer instance) {
-	ThemeLoader * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		THEME_LOADER_GET_CLASS (self)->finalize (self);
-#line 9 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1764 "CustomComponents.c"
-	}
-}
-
-
-static GType rgb_histogram_manipulator_location_code_get_type (void) {
-	static volatile gsize rgb_histogram_manipulator_location_code_type_id__volatile = 0;
-	if (g_once_init_enter (&rgb_histogram_manipulator_location_code_type_id__volatile)) {
-		static const GEnumValue values[] = {{RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB", "left-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB", "right-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH", "left-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH", "right-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA", "insensitive-area"}, {0, NULL, NULL}};
-		GType rgb_histogram_manipulator_location_code_type_id;
-		rgb_histogram_manipulator_location_code_type_id = g_enum_register_static ("RGBHistogramManipulatorLocationCode", values);
-		g_once_init_leave (&rgb_histogram_manipulator_location_code_type_id__volatile, rgb_histogram_manipulator_location_code_type_id);
-	}
-	return rgb_histogram_manipulator_location_code_type_id__volatile;
-}
-
-
-static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event);
-#line 240 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1786 "CustomComponents.c"
-}
-
-
-static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event);
-#line 241 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1795 "CustomComponents.c"
-}
-
-
-static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
-	gboolean result;
-	result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event);
-#line 242 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 1804 "CustomComponents.c"
-}
-
-
-RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) {
-	RGBHistogramManipulator * self = NULL;
-	GtkWidget* _tmp0_;
-	GtkWidget* _tmp2_;
-	gboolean _tmp4_;
-#line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self = (RGBHistogramManipulator*) g_object_new (object_type, NULL);
-#line 217 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH, RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT);
-#line 219 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = rgb_histogram_manipulator_dummy_slider;
-#line 219 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_ == NULL) {
-#line 1821 "CustomComponents.c"
-		GtkScale* _tmp1_;
-#line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp1_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-#line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_object_ref_sink (_tmp1_);
-#line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_g_object_unref0 (rgb_histogram_manipulator_dummy_slider);
-#line 220 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		rgb_histogram_manipulator_dummy_slider = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget);
-#line 1831 "CustomComponents.c"
-	}
-#line 222 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = rgb_histogram_manipulator_dummy_frame;
-#line 222 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp2_ == NULL) {
-#line 1837 "CustomComponents.c"
-		GtkFrame* _tmp3_;
-#line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp3_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_object_ref_sink (_tmp3_);
-#line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_g_object_unref0 (rgb_histogram_manipulator_dummy_frame);
-#line 223 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		rgb_histogram_manipulator_dummy_frame = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget);
-#line 1847 "CustomComponents.c"
-	}
-#line 225 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = rgb_histogram_manipulator_paths_setup;
-#line 225 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (!_tmp4_) {
-#line 1853 "CustomComponents.c"
-		GtkWidgetPath* _tmp5_;
-		GtkWidgetPath* _tmp6_;
-		GtkWidgetPath* _tmp7_;
-		GtkWidgetPath* _tmp8_;
-		GtkWidgetPath* _tmp9_;
-#line 226 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp5_ = rgb_histogram_manipulator_slider_draw_path;
-#line 226 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		gtk_widget_path_append_type (_tmp5_, gtk_scale_get_type ());
-#line 227 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp6_ = rgb_histogram_manipulator_slider_draw_path;
-#line 227 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		gtk_widget_path_iter_add_class (_tmp6_, 0, "scale");
-#line 228 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp7_ = rgb_histogram_manipulator_slider_draw_path;
-#line 228 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		gtk_widget_path_iter_add_class (_tmp7_, 0, "range");
-#line 230 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp8_ = rgb_histogram_manipulator_frame_draw_path;
-#line 230 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		gtk_widget_path_append_type (_tmp8_, gtk_frame_get_type ());
-#line 231 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp9_ = rgb_histogram_manipulator_frame_draw_path;
-#line 231 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		gtk_widget_path_iter_add_class (_tmp9_, 0, "default");
-#line 233 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		rgb_histogram_manipulator_paths_setup = TRUE;
-#line 1881 "CustomComponents.c"
-	}
-#line 236 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK);
-#line 237 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_RELEASE_MASK);
-#line 238 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_MOTION_MASK);
-#line 240 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event, self, 0);
-#line 241 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event, self, 0);
-#line 242 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "motion-notify-event", (GCallback) _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event, self, 0);
-#line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return self;
-#line 1897 "CustomComponents.c"
-}
-
-
-RGBHistogramManipulator* rgb_histogram_manipulator_new (void) {
-#line 216 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR);
-#line 1904 "CustomComponents.c"
-}
-
-
-static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) {
-	RGBHistogramManipulatorLocationCode result = 0;
-	gint _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gint _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp6_ = FALSE;
-	gint _tmp7_;
-	gint _tmp8_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-#line 245 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
-#line 246 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = y;
-#line 246 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_ < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) {
-#line 247 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
-#line 247 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 1936 "CustomComponents.c"
-	}
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = x;
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = self->priv->left_nub_position;
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp2_ > _tmp3_) {
-#line 1944 "CustomComponents.c"
-		gint _tmp4_;
-		gint _tmp5_;
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp4_ = x;
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp5_ = self->priv->left_nub_position;
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 1953 "CustomComponents.c"
-	} else {
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp1_ = FALSE;
-#line 1957 "CustomComponents.c"
-	}
-#line 249 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp1_) {
-#line 250 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB;
-#line 250 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 1965 "CustomComponents.c"
-	}
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = x;
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = self->priv->right_nub_position;
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp7_ > _tmp8_) {
-#line 1973 "CustomComponents.c"
-		gint _tmp9_;
-		gint _tmp10_;
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp9_ = x;
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp10_ = self->priv->right_nub_position;
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 1982 "CustomComponents.c"
-	} else {
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp6_ = FALSE;
-#line 1986 "CustomComponents.c"
-	}
-#line 252 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp6_) {
-#line 253 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB;
-#line 253 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 1994 "CustomComponents.c"
-	}
-#line 255 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp11_ = y;
-#line 255 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp11_ < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) {
-#line 256 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
-#line 256 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 2004 "CustomComponents.c"
-	}
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp12_ = x;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp13_ = self->priv->left_nub_position;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp14_ = x;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp15_ = self->priv->left_nub_position;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp16_ = x;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp17_ = self->priv->right_nub_position;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp18_ = x;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp19_ = self->priv->right_nub_position;
-#line 258 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (((_tmp12_ - _tmp13_) * (_tmp14_ - _tmp15_)) < ((_tmp16_ - _tmp17_) * (_tmp18_ - _tmp19_))) {
-#line 260 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH;
-#line 260 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 2028 "CustomComponents.c"
-	} else {
-#line 262 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH;
-#line 262 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 2034 "CustomComponents.c"
-	}
-}
-
-
-static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) {
-	gboolean result = FALSE;
-	RGBHistogramManipulatorLocationCode loc = 0;
-	GdkEventButton* _tmp0_;
-	gdouble _tmp1_;
-	GdkEventButton* _tmp2_;
-	gdouble _tmp3_;
-	RGBHistogramManipulatorLocationCode _tmp4_;
-	RGBHistogramManipulatorLocationCode _tmp5_;
-#line 265 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
-#line 265 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (event_record != NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = event_record;
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = _tmp0_->x;
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = event_record;
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_->y;
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp1_, (gint) _tmp3_);
-#line 266 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	loc = _tmp4_;
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = loc;
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	switch (_tmp5_) {
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB:
-#line 2070 "CustomComponents.c"
-		{
-			GdkEventButton* _tmp6_;
-			gdouble _tmp7_;
-			gint _tmp8_;
-#line 270 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp6_ = event_record;
-#line 270 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp7_ = _tmp6_->x;
-#line 270 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->track_start_x = (gint) _tmp7_;
-#line 271 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp8_ = self->priv->left_nub_position;
-#line 271 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->track_nub_start_position = _tmp8_;
-#line 272 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->is_left_nub_tracking = TRUE;
-#line 273 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			result = TRUE;
-#line 273 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return result;
-#line 2091 "CustomComponents.c"
-		}
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB:
-#line 2095 "CustomComponents.c"
-		{
-			GdkEventButton* _tmp9_;
-			gdouble _tmp10_;
-			gint _tmp11_;
-#line 276 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp9_ = event_record;
-#line 276 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp10_ = _tmp9_->x;
-#line 276 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->track_start_x = (gint) _tmp10_;
-#line 277 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp11_ = self->priv->right_nub_position;
-#line 277 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->track_nub_start_position = _tmp11_;
-#line 278 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->is_right_nub_tracking = TRUE;
-#line 279 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			result = TRUE;
-#line 279 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return result;
-#line 2116 "CustomComponents.c"
-		}
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH:
-#line 2120 "CustomComponents.c"
-		{
-			GdkEventButton* _tmp12_;
-			gdouble _tmp13_;
-			gint _tmp14_;
-			gint _tmp15_;
-			gint _tmp16_;
-#line 282 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp12_ = event_record;
-#line 282 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp13_ = _tmp12_->x;
-#line 282 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->left_nub_position = ((gint) _tmp13_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
-#line 283 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp14_ = self->priv->left_nub_position;
-#line 283 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp15_ = self->priv->left_nub_max;
-#line 283 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp16_ = CLAMP (_tmp14_, 0, _tmp15_);
-#line 283 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->left_nub_position = _tmp16_;
-#line 284 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			rgb_histogram_manipulator_force_update (self);
-#line 285 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
-#line 286 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			rgb_histogram_manipulator_update_nub_extrema (self);
-#line 287 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			result = TRUE;
-#line 287 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return result;
-#line 2151 "CustomComponents.c"
-		}
-#line 268 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH:
-#line 2155 "CustomComponents.c"
-		{
-			GdkEventButton* _tmp17_;
-			gdouble _tmp18_;
-			gint _tmp19_;
-			gint _tmp20_;
-			gint _tmp21_;
-#line 290 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp17_ = event_record;
-#line 290 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp18_ = _tmp17_->x;
-#line 290 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->right_nub_position = ((gint) _tmp18_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
-#line 291 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp19_ = self->priv->right_nub_position;
-#line 291 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp20_ = self->priv->right_nub_min;
-#line 291 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			_tmp21_ = CLAMP (_tmp19_, _tmp20_, 255);
-#line 291 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			self->priv->right_nub_position = _tmp21_;
-#line 292 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			rgb_histogram_manipulator_force_update (self);
-#line 293 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
-#line 294 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			rgb_histogram_manipulator_update_nub_extrema (self);
-#line 295 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			result = TRUE;
-#line 295 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return result;
-#line 2186 "CustomComponents.c"
-		}
-		default:
-		{
-#line 298 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			result = FALSE;
-#line 298 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			return result;
-#line 2194 "CustomComponents.c"
-		}
-	}
-}
-
-
-static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-#line 302 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
-#line 302 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (event_record != NULL, FALSE);
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = self->priv->is_left_nub_tracking;
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp1_) {
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = TRUE;
-#line 2214 "CustomComponents.c"
-	} else {
-		gboolean _tmp2_;
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp2_ = self->priv->is_right_nub_tracking;
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = _tmp2_;
-#line 2221 "CustomComponents.c"
-	}
-#line 303 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_) {
-#line 304 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
-#line 305 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		rgb_histogram_manipulator_update_nub_extrema (self);
-#line 2229 "CustomComponents.c"
-	}
-#line 308 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->is_left_nub_tracking = FALSE;
-#line 309 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->is_right_nub_tracking = FALSE;
-#line 311 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = FALSE;
-#line 311 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 2239 "CustomComponents.c"
-}
-
-
-static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	gboolean _tmp3_;
-#line 314 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
-#line 314 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (event_record != NULL, FALSE);
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = self->priv->is_left_nub_tracking;
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (!_tmp1_) {
-#line 2256 "CustomComponents.c"
-		gboolean _tmp2_;
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp2_ = self->priv->is_right_nub_tracking;
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = !_tmp2_;
-#line 2262 "CustomComponents.c"
-	} else {
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = FALSE;
-#line 2266 "CustomComponents.c"
-	}
-#line 315 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_) {
-#line 316 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		result = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return result;
-#line 2274 "CustomComponents.c"
-	}
-#line 318 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = self->priv->is_left_nub_tracking;
-#line 318 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp3_) {
-#line 2280 "CustomComponents.c"
-		gint track_x_delta = 0;
-		GdkEventMotion* _tmp4_;
-		gdouble _tmp5_;
-		gint _tmp6_;
-		gint _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
-#line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp4_ = event_record;
-#line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp5_ = _tmp4_->x;
-#line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp6_ = self->priv->track_start_x;
-#line 319 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		track_x_delta = ((gint) _tmp5_) - _tmp6_;
-#line 320 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp7_ = self->priv->track_nub_start_position;
-#line 320 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp8_ = track_x_delta;
-#line 320 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		self->priv->left_nub_position = _tmp7_ + _tmp8_;
-#line 321 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp9_ = self->priv->left_nub_position;
-#line 321 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp10_ = self->priv->left_nub_max;
-#line 321 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp11_ = CLAMP (_tmp9_, 0, _tmp10_);
-#line 321 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		self->priv->left_nub_position = _tmp11_;
-#line 2312 "CustomComponents.c"
-	} else {
-		gint track_x_delta = 0;
-		GdkEventMotion* _tmp12_;
-		gdouble _tmp13_;
-		gint _tmp14_;
-		gint _tmp15_;
-		gint _tmp16_;
-		gint _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-#line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp12_ = event_record;
-#line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp13_ = _tmp12_->x;
-#line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp14_ = self->priv->track_start_x;
-#line 323 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		track_x_delta = ((gint) _tmp13_) - _tmp14_;
-#line 324 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp15_ = self->priv->track_nub_start_position;
-#line 324 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp16_ = track_x_delta;
-#line 324 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		self->priv->right_nub_position = _tmp15_ + _tmp16_;
-#line 325 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp17_ = self->priv->right_nub_position;
-#line 325 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp18_ = self->priv->right_nub_min;
-#line 325 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp19_ = CLAMP (_tmp17_, _tmp18_, 255);
-#line 325 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		self->priv->right_nub_position = _tmp19_;
-#line 2345 "CustomComponents.c"
-	}
-#line 328 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_force_update (self);
-#line 329 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = TRUE;
-#line 329 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 2353 "CustomComponents.c"
-}
-
-
-static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx) {
-	RGBHistogramManipulator * self;
-	gboolean result = FALSE;
-	GtkBorder padding = {0};
-	GtkStyleContext* _tmp0_;
-	GtkBorder _tmp1_ = {0};
-	GdkRectangle area = {0};
-	GtkBorder _tmp2_;
-	gint16 _tmp3_;
-	GtkBorder _tmp4_;
-	gint16 _tmp5_;
-	GtkBorder _tmp6_;
-	gint16 _tmp7_;
-	GtkBorder _tmp8_;
-	gint16 _tmp9_;
-	cairo_t* _tmp10_;
-	GdkRectangle _tmp11_;
-	cairo_t* _tmp12_;
-	GdkRectangle _tmp13_;
-	cairo_t* _tmp14_;
-	GdkRectangle _tmp15_;
-	cairo_t* _tmp16_;
-	GdkRectangle _tmp17_;
-	gint _tmp18_;
-	cairo_t* _tmp19_;
-	GdkRectangle _tmp20_;
-	gint _tmp21_;
-#line 332 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
-#line 332 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (ctx != NULL, FALSE);
-#line 333 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 333 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_get_padding (_tmp0_, GTK_STATE_FLAG_NORMAL, &_tmp1_);
-#line 333 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	padding = _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	memset (&area, 0, sizeof (GdkRectangle));
-#line 336 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = padding;
-#line 336 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_.left;
-#line 336 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	area.x = (gint) _tmp3_;
-#line 337 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = padding;
-#line 337 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = _tmp4_.top;
-#line 337 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	area.y = (gint) _tmp5_;
-#line 338 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = padding;
-#line 338 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = _tmp6_.right;
-#line 338 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	area.width = RGB_HISTOGRAM_GRAPHIC_WIDTH + _tmp7_;
-#line 339 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = padding;
-#line 339 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp9_ = _tmp8_.bottom;
-#line 339 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	area.height = RGB_HISTOGRAM_GRAPHIC_HEIGHT + _tmp9_;
-#line 341 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp10_ = ctx;
-#line 341 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp11_ = area;
-#line 341 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_draw_histogram_frame (self, _tmp10_, &_tmp11_);
-#line 342 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp12_ = ctx;
-#line 342 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp13_ = area;
-#line 342 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_draw_histogram (self, _tmp12_, &_tmp13_);
-#line 343 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp14_ = ctx;
-#line 343 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp15_ = area;
-#line 343 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_draw_trough (self, _tmp14_, &_tmp15_);
-#line 344 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp16_ = ctx;
-#line 344 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp17_ = area;
-#line 344 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp18_ = self->priv->left_nub_position;
-#line 344 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_draw_nub (self, _tmp16_, &_tmp17_, _tmp18_);
-#line 345 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp19_ = ctx;
-#line 345 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp20_ = area;
-#line 345 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp21_ = self->priv->right_nub_position;
-#line 345 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_draw_nub (self, _tmp19_, &_tmp20_, _tmp21_);
-#line 347 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = TRUE;
-#line 347 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 2458 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_draw_histogram_frame (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
-	GdkRectangle framed_area = {0};
-	GdkRectangle _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
-	GtkStyleContext* stylectx = NULL;
-	GtkWidget* _tmp5_;
-	GtkStyleContext* _tmp6_;
-	GtkStyleContext* _tmp7_;
-	GtkWidgetPath* _tmp8_;
-	GtkWidgetPath* _tmp9_;
-	cairo_t* _tmp10_;
-	GdkRectangle _tmp11_;
-	gint _tmp12_;
-	GdkRectangle _tmp13_;
-	gint _tmp14_;
-	GdkRectangle _tmp15_;
-	gint _tmp16_;
-	GdkRectangle _tmp17_;
-	gint _tmp18_;
-#line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (ctx != NULL);
-#line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (area != NULL);
-#line 353 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = *area;
-#line 353 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	framed_area = _tmp0_;
-#line 354 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = framed_area.x;
-#line 354 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	framed_area.x = _tmp1_ + 5;
-#line 355 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = framed_area.y;
-#line 355 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	framed_area.y = _tmp2_ + 1;
-#line 356 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = framed_area.width;
-#line 356 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	framed_area.width = _tmp3_ - 8;
-#line 357 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = framed_area.height;
-#line 357 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	framed_area.height = _tmp4_ - 12;
-#line 359 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = rgb_histogram_manipulator_dummy_frame;
-#line 359 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 359 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 359 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	stylectx = _tmp7_;
-#line 360 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_save (stylectx);
-#line 362 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = gtk_style_context_get_path (stylectx);
-#line 362 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_path_append_type (_tmp8_, gtk_frame_get_type ());
-#line 363 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp9_ = gtk_style_context_get_path (stylectx);
-#line 363 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_path_iter_add_class (_tmp9_, 0, "default");
-#line 364 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_add_class (stylectx, GTK_STYLE_CLASS_TROUGH);
-#line 365 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_set_junction_sides (stylectx, ((GTK_JUNCTION_TOP | GTK_JUNCTION_BOTTOM) | GTK_JUNCTION_LEFT) | GTK_JUNCTION_RIGHT);
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp10_ = ctx;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp11_ = framed_area;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp12_ = _tmp11_.x;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp13_ = framed_area;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp14_ = _tmp13_.y;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp15_ = framed_area;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp16_ = _tmp15_.width;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp17_ = framed_area;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp18_ = _tmp17_.height;
-#line 368 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_render_frame (stylectx, _tmp10_, (gdouble) _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_);
-#line 371 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_restore (stylectx);
-#line 350 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (stylectx);
-#line 2556 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
-	RGBHistogram* _tmp0_;
-	GdkPixbuf* histogram_graphic = NULL;
-	RGBHistogram* _tmp1_;
-	GdkPixbuf* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkPixbuf* _tmp5_;
-	guchar* pixel_data = NULL;
-	GdkPixbuf* _tmp6_;
-	guint8* _tmp7_;
-	gint pixel_data_length1;
-	gint _pixel_data_size_;
-	gint edge_blend_red = 0;
-	gint edge_blend_green = 0;
-	gint edge_blend_blue = 0;
-	gint body_blend_red = 0;
-	gint body_blend_green = 0;
-	gint body_blend_blue = 0;
-	gint _tmp8_;
-	gint _tmp80_;
-	cairo_t* _tmp158_;
-	GdkPixbuf* _tmp159_;
-	GdkRectangle _tmp160_;
-	gint _tmp161_;
-	GdkRectangle _tmp162_;
-	gint _tmp163_;
-	cairo_t* _tmp164_;
-#line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (ctx != NULL);
-#line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (area != NULL);
-#line 375 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = self->priv->histogram;
-#line 375 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp0_ == NULL) {
-#line 376 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		return;
-#line 2600 "CustomComponents.c"
-	}
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = self->priv->histogram;
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = rgb_histogram_get_graphic (_tmp1_);
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_;
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = _tmp4_;
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (_tmp3_);
-#line 378 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	histogram_graphic = _tmp5_;
-#line 379 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = histogram_graphic;
-#line 379 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = gdk_pixbuf_get_pixels (_tmp6_);
-#line 379 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_data = _tmp7_;
-#line 379 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	pixel_data_length1 = -1;
-#line 379 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_pixel_data_size_ = pixel_data_length1;
-#line 381 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_red = 0;
-#line 382 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_green = 0;
-#line 383 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_blue = 0;
-#line 384 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_red = 20;
-#line 385 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_green = 20;
-#line 386 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_blue = 20;
-#line 388 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = self->priv->left_nub_position;
-#line 388 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp8_ > 0) {
-#line 2642 "CustomComponents.c"
-		gint edge_pixel_index = 0;
-		GdkPixbuf* _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
-		gint _tmp12_;
-#line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp9_ = histogram_graphic;
-#line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp10_ = gdk_pixbuf_get_n_channels (_tmp9_);
-#line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp11_ = _tmp10_;
-#line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp12_ = self->priv->left_nub_position;
-#line 389 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		edge_pixel_index = _tmp11_ * _tmp12_;
-#line 2658 "CustomComponents.c"
-		{
-			gint i = 0;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			i = 0;
-#line 2663 "CustomComponents.c"
-			{
-				gboolean _tmp13_ = FALSE;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp13_ = TRUE;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				while (TRUE) {
-#line 2670 "CustomComponents.c"
-					gint _tmp15_;
-					GdkPixbuf* _tmp16_;
-					gint _tmp17_;
-					gint _tmp18_;
-					gint body_pixel_index = 0;
-					gint _tmp19_;
-					GdkPixbuf* _tmp20_;
-					gint _tmp21_;
-					gint _tmp22_;
-					gint row_last_pixel = 0;
-					gint _tmp23_;
-					GdkPixbuf* _tmp24_;
-					gint _tmp25_;
-					gint _tmp26_;
-					gint _tmp27_;
-					guchar* _tmp55_;
-					gint _tmp55__length1;
-					gint _tmp56_;
-					guchar* _tmp57_;
-					gint _tmp57__length1;
-					gint _tmp58_;
-					guchar _tmp59_;
-					gint _tmp60_;
-					guchar _tmp61_;
-					guchar* _tmp62_;
-					gint _tmp62__length1;
-					gint _tmp63_;
-					guchar* _tmp64_;
-					gint _tmp64__length1;
-					gint _tmp65_;
-					guchar _tmp66_;
-					gint _tmp67_;
-					guchar _tmp68_;
-					guchar* _tmp69_;
-					gint _tmp69__length1;
-					gint _tmp70_;
-					guchar* _tmp71_;
-					gint _tmp71__length1;
-					gint _tmp72_;
-					guchar _tmp73_;
-					gint _tmp74_;
-					guchar _tmp75_;
-					gint _tmp76_;
-					GdkPixbuf* _tmp77_;
-					gint _tmp78_;
-					gint _tmp79_;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					if (!_tmp13_) {
-#line 2719 "CustomComponents.c"
-						gint _tmp14_;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp14_ = i;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						i = _tmp14_ + 1;
-#line 2725 "CustomComponents.c"
-					}
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp13_ = FALSE;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp15_ = i;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp16_ = histogram_graphic;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp18_ = _tmp17_;
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					if (!(_tmp15_ < _tmp18_)) {
-#line 390 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						break;
-#line 2741 "CustomComponents.c"
-					}
-#line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp19_ = i;
-#line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp20_ = histogram_graphic;
-#line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp21_ = gdk_pixbuf_get_rowstride (_tmp20_);
-#line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp22_ = _tmp21_;
-#line 391 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					body_pixel_index = _tmp19_ * _tmp22_;
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp23_ = body_pixel_index;
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp24_ = histogram_graphic;
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp25_ = gdk_pixbuf_get_n_channels (_tmp24_);
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp26_ = _tmp25_;
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp27_ = self->priv->left_nub_position;
-#line 392 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					row_last_pixel = _tmp23_ + (_tmp26_ * _tmp27_);
-#line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					while (TRUE) {
-#line 2767 "CustomComponents.c"
-						gint _tmp28_;
-						gint _tmp29_;
-						guchar* _tmp30_;
-						gint _tmp30__length1;
-						gint _tmp31_;
-						guchar* _tmp32_;
-						gint _tmp32__length1;
-						gint _tmp33_;
-						guchar _tmp34_;
-						gint _tmp35_;
-						guchar _tmp36_;
-						guchar* _tmp37_;
-						gint _tmp37__length1;
-						gint _tmp38_;
-						guchar* _tmp39_;
-						gint _tmp39__length1;
-						gint _tmp40_;
-						guchar _tmp41_;
-						gint _tmp42_;
-						guchar _tmp43_;
-						guchar* _tmp44_;
-						gint _tmp44__length1;
-						gint _tmp45_;
-						guchar* _tmp46_;
-						gint _tmp46__length1;
-						gint _tmp47_;
-						guchar _tmp48_;
-						gint _tmp49_;
-						guchar _tmp50_;
-						gint _tmp51_;
-						GdkPixbuf* _tmp52_;
-						gint _tmp53_;
-						gint _tmp54_;
-#line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp28_ = body_pixel_index;
-#line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp29_ = row_last_pixel;
-#line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						if (!(_tmp28_ < _tmp29_)) {
-#line 394 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							break;
-#line 2809 "CustomComponents.c"
-						}
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp30_ = pixel_data;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp30__length1 = pixel_data_length1;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp31_ = body_pixel_index;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp32_ = pixel_data;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp32__length1 = pixel_data_length1;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp33_ = body_pixel_index;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp34_ = _tmp32_[_tmp33_];
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp35_ = body_blend_red;
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp30_[_tmp31_] = (guchar) ((_tmp34_ + _tmp35_) / 2);
-#line 395 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp36_ = _tmp30_[_tmp31_];
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp37_ = pixel_data;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp37__length1 = pixel_data_length1;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp38_ = body_pixel_index;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp39_ = pixel_data;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp39__length1 = pixel_data_length1;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp40_ = body_pixel_index;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp41_ = _tmp39_[_tmp40_ + 1];
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp42_ = body_blend_green;
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp37_[_tmp38_ + 1] = (guchar) ((_tmp41_ + _tmp42_) / 2);
-#line 397 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp43_ = _tmp37_[_tmp38_ + 1];
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp44_ = pixel_data;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp44__length1 = pixel_data_length1;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp45_ = body_pixel_index;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp46_ = pixel_data;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp46__length1 = pixel_data_length1;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp47_ = body_pixel_index;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp48_ = _tmp46_[_tmp47_ + 2];
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp49_ = body_blend_blue;
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp44_[_tmp45_ + 2] = (guchar) ((_tmp48_ + _tmp49_) / 2);
-#line 399 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp50_ = _tmp44_[_tmp45_ + 2];
-#line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp51_ = body_pixel_index;
-#line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp52_ = histogram_graphic;
-#line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp53_ = gdk_pixbuf_get_n_channels (_tmp52_);
-#line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp54_ = _tmp53_;
-#line 402 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						body_pixel_index = _tmp51_ + _tmp54_;
-#line 2881 "CustomComponents.c"
-					}
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp55_ = pixel_data;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp55__length1 = pixel_data_length1;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp56_ = edge_pixel_index;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp57_ = pixel_data;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp57__length1 = pixel_data_length1;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp58_ = edge_pixel_index;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp59_ = _tmp57_[_tmp58_];
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp60_ = edge_blend_red;
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp55_[_tmp56_] = (guchar) ((_tmp59_ + _tmp60_) / 2);
-#line 405 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp61_ = _tmp55_[_tmp56_];
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp62_ = pixel_data;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp62__length1 = pixel_data_length1;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp63_ = edge_pixel_index;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp64_ = pixel_data;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp64__length1 = pixel_data_length1;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp65_ = edge_pixel_index;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp66_ = _tmp64_[_tmp65_ + 1];
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp67_ = edge_blend_green;
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp62_[_tmp63_ + 1] = (guchar) ((_tmp66_ + _tmp67_) / 2);
-#line 407 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp68_ = _tmp62_[_tmp63_ + 1];
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp69_ = pixel_data;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp69__length1 = pixel_data_length1;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp70_ = edge_pixel_index;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp71_ = pixel_data;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp71__length1 = pixel_data_length1;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp72_ = edge_pixel_index;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp73_ = _tmp71_[_tmp72_ + 2];
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp74_ = edge_blend_blue;
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp69_[_tmp70_ + 2] = (guchar) ((_tmp73_ + _tmp74_) / 2);
-#line 409 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp75_ = _tmp69_[_tmp70_ + 2];
-#line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp76_ = edge_pixel_index;
-#line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp77_ = histogram_graphic;
-#line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp78_ = gdk_pixbuf_get_rowstride (_tmp77_);
-#line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp79_ = _tmp78_;
-#line 412 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					edge_pixel_index = _tmp76_ + _tmp79_;
-#line 2953 "CustomComponents.c"
-				}
-			}
-		}
-	}
-#line 416 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_red = 250;
-#line 417 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_green = 250;
-#line 418 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	edge_blend_blue = 250;
-#line 419 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_red = 200;
-#line 420 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_green = 200;
-#line 421 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	body_blend_blue = 200;
-#line 423 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp80_ = self->priv->right_nub_position;
-#line 423 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp80_ < 255) {
-#line 2974 "CustomComponents.c"
-		gint edge_pixel_index = 0;
-		GdkPixbuf* _tmp81_;
-		gint _tmp82_;
-		gint _tmp83_;
-		gint _tmp84_;
-#line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp81_ = histogram_graphic;
-#line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp82_ = gdk_pixbuf_get_n_channels (_tmp81_);
-#line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp83_ = _tmp82_;
-#line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp84_ = self->priv->right_nub_position;
-#line 424 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		edge_pixel_index = _tmp83_ * _tmp84_;
-#line 2990 "CustomComponents.c"
-		{
-			gint i = 0;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-			i = 0;
-#line 2995 "CustomComponents.c"
-			{
-				gboolean _tmp85_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				_tmp85_ = TRUE;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-				while (TRUE) {
-#line 3002 "CustomComponents.c"
-					gint _tmp87_;
-					GdkPixbuf* _tmp88_;
-					gint _tmp89_;
-					gint _tmp90_;
-					gint body_pixel_index = 0;
-					gint _tmp91_;
-					GdkPixbuf* _tmp92_;
-					gint _tmp93_;
-					gint _tmp94_;
-					GdkPixbuf* _tmp95_;
-					gint _tmp96_;
-					gint _tmp97_;
-					gint row_last_pixel = 0;
-					gint _tmp98_;
-					GdkPixbuf* _tmp99_;
-					gint _tmp100_;
-					gint _tmp101_;
-					GdkPixbuf* _tmp102_;
-					gint _tmp103_;
-					gint _tmp104_;
-					gint _tmp105_;
-					guchar* _tmp133_;
-					gint _tmp133__length1;
-					gint _tmp134_;
-					guchar* _tmp135_;
-					gint _tmp135__length1;
-					gint _tmp136_;
-					guchar _tmp137_;
-					gint _tmp138_;
-					guchar _tmp139_;
-					guchar* _tmp140_;
-					gint _tmp140__length1;
-					gint _tmp141_;
-					guchar* _tmp142_;
-					gint _tmp142__length1;
-					gint _tmp143_;
-					guchar _tmp144_;
-					gint _tmp145_;
-					guchar _tmp146_;
-					guchar* _tmp147_;
-					gint _tmp147__length1;
-					gint _tmp148_;
-					guchar* _tmp149_;
-					gint _tmp149__length1;
-					gint _tmp150_;
-					guchar _tmp151_;
-					gint _tmp152_;
-					guchar _tmp153_;
-					gint _tmp154_;
-					GdkPixbuf* _tmp155_;
-					gint _tmp156_;
-					gint _tmp157_;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					if (!_tmp85_) {
-#line 3057 "CustomComponents.c"
-						gint _tmp86_;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp86_ = i;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						i = _tmp86_ + 1;
-#line 3063 "CustomComponents.c"
-					}
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp85_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp87_ = i;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp88_ = histogram_graphic;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp89_ = gdk_pixbuf_get_height (_tmp88_);
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp90_ = _tmp89_;
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					if (!(_tmp87_ < _tmp90_)) {
-#line 425 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						break;
-#line 3079 "CustomComponents.c"
-					}
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp91_ = i;
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp92_ = histogram_graphic;
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp93_ = gdk_pixbuf_get_rowstride (_tmp92_);
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp94_ = _tmp93_;
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp95_ = histogram_graphic;
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp96_ = gdk_pixbuf_get_n_channels (_tmp95_);
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp97_ = _tmp96_;
-#line 426 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					body_pixel_index = (_tmp91_ * _tmp94_) + (_tmp97_ * 255);
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp98_ = i;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp99_ = histogram_graphic;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp100_ = gdk_pixbuf_get_rowstride (_tmp99_);
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp101_ = _tmp100_;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp102_ = histogram_graphic;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp103_ = gdk_pixbuf_get_n_channels (_tmp102_);
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp104_ = _tmp103_;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp105_ = self->priv->right_nub_position;
-#line 428 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					row_last_pixel = (_tmp98_ * _tmp101_) + (_tmp104_ * _tmp105_);
-#line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					while (TRUE) {
-#line 3117 "CustomComponents.c"
-						gint _tmp106_;
-						gint _tmp107_;
-						guchar* _tmp108_;
-						gint _tmp108__length1;
-						gint _tmp109_;
-						guchar* _tmp110_;
-						gint _tmp110__length1;
-						gint _tmp111_;
-						guchar _tmp112_;
-						gint _tmp113_;
-						guchar _tmp114_;
-						guchar* _tmp115_;
-						gint _tmp115__length1;
-						gint _tmp116_;
-						guchar* _tmp117_;
-						gint _tmp117__length1;
-						gint _tmp118_;
-						guchar _tmp119_;
-						gint _tmp120_;
-						guchar _tmp121_;
-						guchar* _tmp122_;
-						gint _tmp122__length1;
-						gint _tmp123_;
-						guchar* _tmp124_;
-						gint _tmp124__length1;
-						gint _tmp125_;
-						guchar _tmp126_;
-						gint _tmp127_;
-						guchar _tmp128_;
-						gint _tmp129_;
-						GdkPixbuf* _tmp130_;
-						gint _tmp131_;
-						gint _tmp132_;
-#line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp106_ = body_pixel_index;
-#line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp107_ = row_last_pixel;
-#line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						if (!(_tmp106_ > _tmp107_)) {
-#line 430 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-							break;
-#line 3159 "CustomComponents.c"
-						}
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp108_ = pixel_data;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp108__length1 = pixel_data_length1;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp109_ = body_pixel_index;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp110_ = pixel_data;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp110__length1 = pixel_data_length1;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp111_ = body_pixel_index;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp112_ = _tmp110_[_tmp111_];
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp113_ = body_blend_red;
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp108_[_tmp109_] = (guchar) ((_tmp112_ + _tmp113_) / 2);
-#line 431 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp114_ = _tmp108_[_tmp109_];
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp115_ = pixel_data;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp115__length1 = pixel_data_length1;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp116_ = body_pixel_index;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp117_ = pixel_data;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp117__length1 = pixel_data_length1;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp118_ = body_pixel_index;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp119_ = _tmp117_[_tmp118_ + 1];
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp120_ = body_blend_green;
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp115_[_tmp116_ + 1] = (guchar) ((_tmp119_ + _tmp120_) / 2);
-#line 433 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp121_ = _tmp115_[_tmp116_ + 1];
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp122_ = pixel_data;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp122__length1 = pixel_data_length1;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp123_ = body_pixel_index;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp124_ = pixel_data;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp124__length1 = pixel_data_length1;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp125_ = body_pixel_index;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp126_ = _tmp124_[_tmp125_ + 2];
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp127_ = body_blend_blue;
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp122_[_tmp123_ + 2] = (guchar) ((_tmp126_ + _tmp127_) / 2);
-#line 435 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp128_ = _tmp122_[_tmp123_ + 2];
-#line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp129_ = body_pixel_index;
-#line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp130_ = histogram_graphic;
-#line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp131_ = gdk_pixbuf_get_n_channels (_tmp130_);
-#line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						_tmp132_ = _tmp131_;
-#line 438 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-						body_pixel_index = _tmp129_ - _tmp132_;
-#line 3231 "CustomComponents.c"
-					}
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp133_ = pixel_data;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp133__length1 = pixel_data_length1;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp134_ = edge_pixel_index;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp135_ = pixel_data;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp135__length1 = pixel_data_length1;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp136_ = edge_pixel_index;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp137_ = _tmp135_[_tmp136_];
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp138_ = edge_blend_red;
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp133_[_tmp134_] = (guchar) ((_tmp137_ + _tmp138_) / 2);
-#line 440 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp139_ = _tmp133_[_tmp134_];
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp140_ = pixel_data;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp140__length1 = pixel_data_length1;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp141_ = edge_pixel_index;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp142_ = pixel_data;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp142__length1 = pixel_data_length1;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp143_ = edge_pixel_index;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp144_ = _tmp142_[_tmp143_ + 1];
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp145_ = edge_blend_green;
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp140_[_tmp141_ + 1] = (guchar) ((_tmp144_ + _tmp145_) / 2);
-#line 442 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp146_ = _tmp140_[_tmp141_ + 1];
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp147_ = pixel_data;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp147__length1 = pixel_data_length1;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp148_ = edge_pixel_index;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp149_ = pixel_data;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp149__length1 = pixel_data_length1;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp150_ = edge_pixel_index;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp151_ = _tmp149_[_tmp150_ + 2];
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp152_ = edge_blend_blue;
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp147_[_tmp148_ + 2] = (guchar) ((_tmp151_ + _tmp152_) / 2);
-#line 444 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp153_ = _tmp147_[_tmp148_ + 2];
-#line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp154_ = edge_pixel_index;
-#line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp155_ = histogram_graphic;
-#line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp156_ = gdk_pixbuf_get_rowstride (_tmp155_);
-#line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					_tmp157_ = _tmp156_;
-#line 447 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-					edge_pixel_index = _tmp154_ + _tmp157_;
-#line 3303 "CustomComponents.c"
-				}
-			}
-		}
-	}
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp158_ = ctx;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp159_ = histogram_graphic;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp160_ = *area;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp161_ = _tmp160_.x;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp162_ = *area;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp163_ = _tmp162_.y;
-#line 451 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gdk_cairo_set_source_pixbuf (_tmp158_, _tmp159_, (gdouble) (_tmp161_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp163_ + 2));
-#line 452 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp164_ = ctx;
-#line 452 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	cairo_paint (_tmp164_);
-#line 374 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (histogram_graphic);
-#line 3328 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_draw_trough (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
-	gint trough_x = 0;
-	GdkRectangle _tmp0_;
-	gint _tmp1_;
-	gint trough_y = 0;
-	GdkRectangle _tmp2_;
-	gint _tmp3_;
-	GtkStyleContext* stylectx = NULL;
-	GtkWidget* _tmp4_;
-	GtkStyleContext* _tmp5_;
-	GtkStyleContext* _tmp6_;
-	GtkWidgetPath* _tmp7_;
-	GtkWidgetPath* _tmp8_;
-	cairo_t* _tmp9_;
-#line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (ctx != NULL);
-#line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (area != NULL);
-#line 456 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = *area;
-#line 456 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = _tmp0_.x;
-#line 456 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	trough_x = _tmp1_;
-#line 457 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = *area;
-#line 457 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_.y;
-#line 457 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	trough_y = _tmp3_ + (((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - 3);
-#line 459 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = rgb_histogram_manipulator_dummy_slider;
-#line 459 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = gtk_widget_get_style_context (_tmp4_);
-#line 459 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 459 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	stylectx = _tmp6_;
-#line 460 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_save (stylectx);
-#line 462 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = gtk_style_context_get_path (stylectx);
-#line 462 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_path_append_type (_tmp7_, gtk_scale_get_type ());
-#line 463 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp8_ = gtk_style_context_get_path (stylectx);
-#line 463 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_widget_path_iter_add_class (_tmp8_, 0, "scale");
-#line 464 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_add_class (stylectx, GTK_STYLE_CLASS_TROUGH);
-#line 466 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp9_ = ctx;
-#line 466 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_render_activity (stylectx, _tmp9_, (gdouble) trough_x, (gdouble) trough_y, (gdouble) RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH, (gdouble) RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT);
-#line 468 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gtk_style_context_restore (stylectx);
-#line 455 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (stylectx);
-#line 3392 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) {
-	cairo_t* _tmp0_;
-	GdkPixbuf* _tmp1_;
-	GdkRectangle _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
-	GdkRectangle _tmp5_;
-	gint _tmp6_;
-	cairo_t* _tmp7_;
-#line 471 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 471 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (ctx != NULL);
-#line 471 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (area != NULL);
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = ctx;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = self->priv->nub_pixbuf;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp2_ = *area;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = _tmp2_.x;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = position;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = *area;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp6_ = _tmp5_.y;
-#line 472 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gdk_cairo_set_source_pixbuf (_tmp0_, _tmp1_, (gdouble) (_tmp3_ + _tmp4_), (gdouble) (_tmp6_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION));
-#line 473 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp7_ = ctx;
-#line 473 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	cairo_paint (_tmp7_);
-#line 3431 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) {
-	GdkWindow* _tmp0_;
-	GdkWindow* _tmp1_;
-#line 476 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 477 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 477 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gdk_window_invalidate_rect (_tmp0_, NULL, TRUE);
-#line 478 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 478 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	gdk_window_process_updates (_tmp1_, TRUE);
-#line 3448 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) {
-	gint _tmp0_;
-	gint _tmp1_;
-#line 481 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 482 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = self->priv->left_nub_position;
-#line 482 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->right_nub_min = (_tmp0_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + 1;
-#line 483 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = self->priv->right_nub_position;
-#line 483 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
-#line 3465 "CustomComponents.c"
-}
-
-
-void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) {
-	GdkPixbuf* _tmp0_;
-	RGBHistogram* _tmp1_;
-#line 488 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 488 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (source_pixbuf));
-#line 489 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = source_pixbuf;
-#line 489 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = rgb_histogram_new (_tmp0_);
-#line 489 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_rgb_histogram_unref0 (self->priv->histogram);
-#line 489 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->histogram = _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_force_update (self);
-#line 3486 "CustomComponents.c"
-}
-
-
-gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 493 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
-#line 494 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = self->priv->left_nub_position;
-#line 494 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 3501 "CustomComponents.c"
-}
-
-
-gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) {
-	gint result = 0;
-	gint _tmp0_;
-#line 497 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
-#line 498 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = self->priv->right_nub_position;
-#line 498 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	result = _tmp0_;
-#line 498 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	return result;
-#line 3516 "CustomComponents.c"
-}
-
-
-void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-#line 501 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = user_nub_pos;
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp1_ >= 0) {
-#line 3532 "CustomComponents.c"
-		gint _tmp2_;
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp2_ = user_nub_pos;
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = _tmp2_ <= 255;
-#line 3538 "CustomComponents.c"
-	} else {
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = FALSE;
-#line 3542 "CustomComponents.c"
-	}
-#line 502 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
-#line 503 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = user_nub_pos;
-#line 503 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = self->priv->left_nub_max;
-#line 503 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = CLAMP (_tmp3_, 0, _tmp4_);
-#line 503 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->left_nub_position = _tmp5_;
-#line 504 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 3556 "CustomComponents.c"
-}
-
-
-void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-#line 507 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = user_nub_pos;
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	if (_tmp1_ >= 0) {
-#line 3572 "CustomComponents.c"
-		gint _tmp2_;
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp2_ = user_nub_pos;
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = _tmp2_ <= 255;
-#line 3578 "CustomComponents.c"
-	} else {
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-		_tmp0_ = FALSE;
-#line 3582 "CustomComponents.c"
-	}
-#line 508 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
-#line 509 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp3_ = user_nub_pos;
-#line 509 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp4_ = self->priv->right_nub_min;
-#line 509 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp5_ = CLAMP (_tmp3_, _tmp4_, 255);
-#line 509 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->right_nub_position = _tmp5_;
-#line 510 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 3596 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) {
-	GtkWidgetPath* _tmp0_;
-	GtkWidgetPath* _tmp1_;
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_parent_class = g_type_class_peek_parent (klass);
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	g_type_class_add_private (klass, sizeof (RGBHistogramManipulatorPrivate));
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) rgb_histogram_manipulator_real_draw;
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	G_OBJECT_CLASS (klass)->finalize = rgb_histogram_manipulator_finalize;
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL] = g_signal_new ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 203 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = gtk_widget_path_new ();
-#line 203 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_slider_draw_path = _tmp0_;
-#line 204 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp1_ = gtk_widget_path_new ();
-#line 204 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	rgb_histogram_manipulator_frame_draw_path = _tmp1_;
-#line 3621 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) {
-	GdkPixbuf* _tmp0_;
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self);
-#line 198 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->left_nub_max = (255 - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
-#line 199 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->right_nub_min = RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE + 1;
-#line 207 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->histogram = NULL;
-#line 208 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->left_nub_position = 0;
-#line 209 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->right_nub_position = 255;
-#line 210 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_tmp0_ = theme_loader_load_icon ("drag_nub.png");
-#line 210 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->nub_pixbuf = _tmp0_;
-#line 211 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->is_left_nub_tracking = FALSE;
-#line 212 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->is_right_nub_tracking = FALSE;
-#line 213 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->track_start_x = 0;
-#line 214 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self->priv->track_nub_start_position = 0;
-#line 3651 "CustomComponents.c"
-}
-
-
-static void rgb_histogram_manipulator_finalize (GObject * obj) {
-	RGBHistogramManipulator * self;
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
-#line 207 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_rgb_histogram_unref0 (self->priv->histogram);
-#line 210 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	_g_object_unref0 (self->priv->nub_pixbuf);
-#line 185 "/home/jens/Source/shotwell/src/CustomComponents.vala"
-	G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj);
-#line 3665 "CustomComponents.c"
-}
-
-
-GType rgb_histogram_manipulator_get_type (void) {
-	static volatile gsize rgb_histogram_manipulator_type_id__volatile = 0;
-	if (g_once_init_enter (&rgb_histogram_manipulator_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (RGBHistogramManipulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_histogram_manipulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBHistogramManipulator), 0, (GInstanceInitFunc) rgb_histogram_manipulator_instance_init, NULL };
-		GType rgb_histogram_manipulator_type_id;
-		rgb_histogram_manipulator_type_id = g_type_register_static (gtk_drawing_area_get_type (), "RGBHistogramManipulator", &g_define_type_info, 0);
-		g_once_init_leave (&rgb_histogram_manipulator_type_id__volatile, rgb_histogram_manipulator_type_id);
-	}
-	return rgb_histogram_manipulator_type_id__volatile;
-}
-
-
-
diff --git a/src/CustomComponents.vala b/src/CustomComponents.vala
deleted file mode 100644
index 0a08c93..0000000
--- a/src/CustomComponents.vala
+++ /dev/null
@@ -1,513 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-extern void qsort(void *p, size_t num, size_t size, GLib.CompareFunc func);
-
-public class ThemeLoader {
-    private struct LightweightColor {
-        public uchar red;
-        public uchar green;
-        public uchar blue;
-        
-        public LightweightColor() {
-            red = green = blue = 0;
-        }
-    }
-
-    private const int NUM_SUPPORTED_INTENSITIES = 6;
-    private const int THEME_OUTLINE_COLOR = 0;
-    private const int THEME_BEVEL_DARKER_COLOR = 1;
-    private const int THEME_BEVEL_DARK_COLOR = 2;
-    private const int THEME_BASE_COLOR = 3;
-    private const int THEME_BEVEL_LIGHT_COLOR = 4;
-    private const int THEME_BEVEL_LIGHTER_COLOR = 5;
-
-    private static LightweightColor[] theme_colors = null;
-
-    private static void populate_theme_params() {
-        if (theme_colors != null)
-            return;
-        
-        theme_colors = new LightweightColor[NUM_SUPPORTED_INTENSITIES];
-
-        Gtk.Settings settings = Gtk.Settings.get_default();
-        HashTable<string, Gdk.Color?> color_table = settings.color_hash;
-        Gdk.Color? base_color = color_table.lookup("bg_color");
-        if (base_color == null && !Gdk.Color.parse("#fff", out base_color))
-            error("can't parse color");
-
-        RGBAnalyticPixel base_color_analytic_rgb =
-            RGBAnalyticPixel.from_quantized_components(base_color.red >> 8,
-            base_color.green >> 8, base_color.blue >> 8);
-        HSVAnalyticPixel base_color_analytic_hsv =
-            HSVAnalyticPixel.from_rgb(base_color_analytic_rgb);
-
-        HSVAnalyticPixel bevel_light_analytic_hsv = base_color_analytic_hsv;
-        bevel_light_analytic_hsv.light_value *= 1.15f;
-        bevel_light_analytic_hsv.light_value =
-            bevel_light_analytic_hsv.light_value.clamp(0.0f, 1.0f);
-        
-        HSVAnalyticPixel bevel_lighter_analytic_hsv = bevel_light_analytic_hsv;
-        bevel_lighter_analytic_hsv.light_value *= 1.15f;
-        bevel_lighter_analytic_hsv.light_value =
-            bevel_lighter_analytic_hsv.light_value.clamp(0.0f, 1.0f);
-
-        HSVAnalyticPixel bevel_dark_analytic_hsv = base_color_analytic_hsv;
-        bevel_dark_analytic_hsv.light_value *= 0.85f;
-        bevel_dark_analytic_hsv.light_value =
-            bevel_dark_analytic_hsv.light_value.clamp(0.0f, 1.0f);
-
-        HSVAnalyticPixel bevel_darker_analytic_hsv = bevel_dark_analytic_hsv;
-        bevel_darker_analytic_hsv.light_value *= 0.85f;
-        bevel_darker_analytic_hsv.light_value =
-            bevel_darker_analytic_hsv.light_value.clamp(0.0f, 1.0f);
-
-        HSVAnalyticPixel outline_analytic_hsv = bevel_darker_analytic_hsv;
-        outline_analytic_hsv.light_value *= 0.66f;
-        outline_analytic_hsv.light_value =
-            outline_analytic_hsv.light_value.clamp(0.0f, 1.0f);
-
-        RGBAnalyticPixel outline_analytic_rgb = outline_analytic_hsv.to_rgb();
-        theme_colors[THEME_OUTLINE_COLOR] =
-            populate_one_theme_param(outline_analytic_rgb);
-
-        RGBAnalyticPixel bevel_darker_analytic_rgb = bevel_darker_analytic_hsv.to_rgb();
-        theme_colors[THEME_BEVEL_DARKER_COLOR] =
-            populate_one_theme_param(bevel_darker_analytic_rgb);
-            
-        RGBAnalyticPixel bevel_dark_analytic_rgb = bevel_dark_analytic_hsv.to_rgb();
-        theme_colors[THEME_BEVEL_DARK_COLOR] =
-            populate_one_theme_param(bevel_dark_analytic_rgb);
-
-        theme_colors[THEME_BASE_COLOR] =
-            populate_one_theme_param(base_color_analytic_rgb);
-
-        RGBAnalyticPixel bevel_light_analytic_rgb = bevel_light_analytic_hsv.to_rgb();
-        theme_colors[THEME_BEVEL_LIGHT_COLOR] =
-            populate_one_theme_param(bevel_light_analytic_rgb);
-        
-        RGBAnalyticPixel bevel_lighter_analytic_rgb = bevel_light_analytic_hsv.to_rgb();
-        theme_colors[THEME_BEVEL_LIGHTER_COLOR] =
-            populate_one_theme_param(bevel_lighter_analytic_rgb);
-    }
-    
-    private static LightweightColor populate_one_theme_param(RGBAnalyticPixel from) {
-        LightweightColor into = LightweightColor();
-
-        into.red = (uchar)(from.red * 255.0f);
-        into.green = (uchar)(from.green * 255.0f);
-        into.blue = (uchar)(from.blue * 255.0f);
-        
-        return into;
-    }
-
-    public static Gdk.Pixbuf load_icon(string source_basename) {
-        populate_theme_params();
-
-        Gdk.Pixbuf loaded_pixbuf = Resources.get_icon(source_basename, 0).copy();
-
-        /* Sweep through the icon image data loaded from disk and determine how many
-           unique colors are in it. We do this with the aid of a HashSet. */
-        Gee.HashSet<RGBAnalyticPixel?> colors =
-            new Gee.HashSet<RGBAnalyticPixel?>(rgb_pixel_hash_func,
-            rgb_pixel_equal_func);
-        unowned uchar[] pixel_data = loaded_pixbuf.get_pixels();
-        for (int j = 0; j < loaded_pixbuf.height; j++) {
-            for (int i = 0; i < loaded_pixbuf.width; i++) {
-                int pixel_index = (j * loaded_pixbuf.rowstride) + (i * loaded_pixbuf.n_channels);
-
-                RGBAnalyticPixel pixel_color = RGBAnalyticPixel.from_quantized_components(
-                    pixel_data[pixel_index], pixel_data[pixel_index + 1],
-                    pixel_data[pixel_index + 2]);
-                colors.add(pixel_color);
-            }
-        }
-        
-        /* If the image data loaded from disk didn't contain NUM_SUPPORTED_INTENSITIES
-           colors, then we can't unambiguously map the colors in the loaded image data
-           to theme colors on the user's system, so propagate an error */
-        if (colors.size != NUM_SUPPORTED_INTENSITIES)
-            error("ThemeLoader: load_icon: pixbuf does not contain the correct number " +
-                "of unique colors");
-        
-        /* sort the colors in the loaded image data in order of increasing intensity; this
-           means that we have to convert the loaded colors from RGB to HSV format */
-        HSVAnalyticPixel[] hsv_pixels = new HSVAnalyticPixel[6];
-        int pixel_ticker = 0;
-        foreach (RGBAnalyticPixel rgb_pixel in colors)
-            hsv_pixels[pixel_ticker++] = HSVAnalyticPixel.from_rgb(rgb_pixel);
-        qsort(hsv_pixels, hsv_pixels.length, sizeof(HSVAnalyticPixel), hsv_pixel_compare_func);
-
-        /* step through each pixel in the image data loaded from disk and map its color
-           to one of the user's theme colors */
-        for (int j = 0; j < loaded_pixbuf.height; j++) {
-            for (int i = 0; i < loaded_pixbuf.width; i++) {
-                int pixel_index = (j * loaded_pixbuf.rowstride) + (i * loaded_pixbuf.n_channels);
-                RGBAnalyticPixel pixel_color = RGBAnalyticPixel.from_quantized_components(
-                    pixel_data[pixel_index], pixel_data[pixel_index + 1],
-                    pixel_data[pixel_index + 2]);
-                HSVAnalyticPixel pixel_color_hsv = HSVAnalyticPixel.from_rgb(pixel_color);
-                int this_intensity = 0;
-                for (int k = 0; k < NUM_SUPPORTED_INTENSITIES; k++) {
-                    if (hsv_pixels[k].light_value == pixel_color_hsv.light_value) {
-                        this_intensity = k;
-                        break;
-                    }
-                }
-                pixel_data[pixel_index] = theme_colors[this_intensity].red;
-                pixel_data[pixel_index + 1] = theme_colors[this_intensity].green;
-                pixel_data[pixel_index + 2] = theme_colors[this_intensity].blue;
-            }
-        }
-
-        return loaded_pixbuf;
-    }
-    
-    private static int hsv_pixel_compare_func(void* pixval1, void* pixval2) {
-        HSVAnalyticPixel pixel_val_1 = * ((HSVAnalyticPixel*) pixval1);
-        HSVAnalyticPixel pixel_val_2 = * ((HSVAnalyticPixel*) pixval2);
-        
-        return (int) (255.0f * (pixel_val_1.light_value - pixel_val_2.light_value));
-    }
-    
-    private static bool rgb_pixel_equal_func(RGBAnalyticPixel? p1, RGBAnalyticPixel? p2) {
-        return (p1.equals(p2));
-    }
-
-    private static uint rgb_pixel_hash_func(RGBAnalyticPixel? pixel_val) {        
-        return pixel_val.hash_code();
-    }
-}
-
-public class RGBHistogramManipulator : Gtk.DrawingArea {
-    private enum LocationCode { LEFT_NUB, RIGHT_NUB, LEFT_TROUGH, RIGHT_TROUGH,
-        INSENSITIVE_AREA }
-    private const int NUB_SIZE = 13;
-    private const int NUB_HALF_WIDTH = NUB_SIZE / 2;
-    private const int NUB_V_NUDGE = 4;
-    private const int TROUGH_WIDTH = 256 + (2 * NUB_HALF_WIDTH);
-    private const int TROUGH_HEIGHT = 4;
-    private const int TROUGH_BOTTOM_OFFSET = 1;
-    private const int CONTROL_WIDTH = TROUGH_WIDTH + 2;
-    private const int CONTROL_HEIGHT = 118;
-    private const int NUB_V_POSITION = CONTROL_HEIGHT - TROUGH_HEIGHT - TROUGH_BOTTOM_OFFSET
-        - (NUB_SIZE - TROUGH_HEIGHT) / 2 - NUB_V_NUDGE - 2;
-    private int left_nub_max = 255 - NUB_SIZE - 1;
-    private int right_nub_min = NUB_SIZE + 1;
-
-    private static Gtk.Widget dummy_slider = null;
-    private static Gtk.Widget dummy_frame = null;
-    private static Gtk.WidgetPath slider_draw_path = new Gtk.WidgetPath();
-    private static Gtk.WidgetPath frame_draw_path = new Gtk.WidgetPath();
-    private static bool paths_setup = false;
-
-    private RGBHistogram histogram = null;
-    private int left_nub_position = 0;
-    private int right_nub_position = 255;
-    private Gdk.Pixbuf nub_pixbuf = ThemeLoader.load_icon("drag_nub.png");
-    private bool is_left_nub_tracking = false;
-    private bool is_right_nub_tracking = false;
-    private int track_start_x = 0;
-    private int track_nub_start_position = 0;
-
-    public RGBHistogramManipulator( ) {
-        set_size_request(CONTROL_WIDTH, CONTROL_HEIGHT);
-        
-        if (dummy_slider == null)
-            dummy_slider = new Gtk.Scale(Gtk.Orientation.HORIZONTAL, null);
-            
-        if (dummy_frame == null)
-            dummy_frame = new Gtk.Frame(null);
-            
-        if (!paths_setup) {
-            slider_draw_path.append_type(typeof(Gtk.Scale));
-            slider_draw_path.iter_add_class(0, "scale");
-            slider_draw_path.iter_add_class(0, "range");
-            
-            frame_draw_path.append_type(typeof(Gtk.Frame));
-            frame_draw_path.iter_add_class(0, "default");
-            
-            paths_setup = true;
-        }
-            
-        add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
-        add_events(Gdk.EventMask.BUTTON_RELEASE_MASK);
-        add_events(Gdk.EventMask.BUTTON_MOTION_MASK);
-
-        button_press_event.connect(on_button_press);
-        button_release_event.connect(on_button_release);
-        motion_notify_event.connect(on_button_motion);
-    }
-    
-    private LocationCode hit_test_point(int x, int y) {
-        if (y < NUB_V_POSITION)
-            return LocationCode.INSENSITIVE_AREA;
-
-        if ((x > left_nub_position) && (x < left_nub_position + NUB_SIZE))
-            return LocationCode.LEFT_NUB;
-
-        if ((x > right_nub_position) && (x < right_nub_position + NUB_SIZE))
-            return LocationCode.RIGHT_NUB;
-
-        if (y < (NUB_V_POSITION + NUB_V_NUDGE + 1))
-            return LocationCode.INSENSITIVE_AREA;
-
-        if ((x - left_nub_position) * (x - left_nub_position) <
-            (x - right_nub_position) * (x - right_nub_position))
-            return LocationCode.LEFT_TROUGH;
-        else
-            return LocationCode.RIGHT_TROUGH;
-    }
-    
-    private bool on_button_press(Gdk.EventButton event_record) {
-        LocationCode loc = hit_test_point((int) event_record.x, (int) event_record.y);
-
-        switch (loc) {
-            case LocationCode.LEFT_NUB:
-                track_start_x = ((int) event_record.x);
-                track_nub_start_position = left_nub_position;
-                is_left_nub_tracking = true;
-                return true;
-
-            case LocationCode.RIGHT_NUB:
-                track_start_x = ((int) event_record.x);
-                track_nub_start_position = right_nub_position;
-                is_right_nub_tracking = true;
-                return true;
-
-            case LocationCode.LEFT_TROUGH:
-                left_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
-                left_nub_position = left_nub_position.clamp(0, left_nub_max);
-                force_update();
-                nub_position_changed();
-                update_nub_extrema();
-                return true;
-
-            case LocationCode.RIGHT_TROUGH:
-                right_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
-                right_nub_position = right_nub_position.clamp(right_nub_min, 255);
-                force_update();
-                nub_position_changed();
-                update_nub_extrema();
-                return true;
-
-            default:
-                return false;
-        }
-    }
-    
-    private bool on_button_release(Gdk.EventButton event_record) {
-        if (is_left_nub_tracking || is_right_nub_tracking) {
-            nub_position_changed();
-            update_nub_extrema();
-        }
-
-        is_left_nub_tracking = false;
-        is_right_nub_tracking = false;
-
-        return false;
-    }
-    
-    private bool on_button_motion(Gdk.EventMotion event_record) {
-        if ((!is_left_nub_tracking) && (!is_right_nub_tracking))
-            return false;
-    
-        if (is_left_nub_tracking) {
-            int track_x_delta = ((int) event_record.x) - track_start_x;
-            left_nub_position = (track_nub_start_position + track_x_delta);
-            left_nub_position = left_nub_position.clamp(0, left_nub_max);
-        } else { /* right nub is tracking */
-            int track_x_delta = ((int) event_record.x) - track_start_x;
-            right_nub_position = (track_nub_start_position + track_x_delta);
-            right_nub_position = right_nub_position.clamp(right_nub_min, 255);
-        }
-        
-        force_update();
-        return true;
-    }
-    
-    public override bool draw(Cairo.Context ctx) {
-        Gtk.Border padding = get_style_context().get_padding(Gtk.StateFlags.NORMAL);
-        
-        Gdk.Rectangle area = Gdk.Rectangle();
-        area.x = padding.left;
-        area.y = padding.top;
-        area.width = RGBHistogram.GRAPHIC_WIDTH + padding.right;
-        area.height = RGBHistogram.GRAPHIC_HEIGHT + padding.bottom;
-
-        draw_histogram_frame(ctx, area);
-        draw_histogram(ctx, area);
-        draw_trough(ctx, area);
-        draw_nub(ctx, area, left_nub_position);
-        draw_nub(ctx, area, right_nub_position);
-
-        return true;
-    }
-    
-    private void draw_histogram_frame(Cairo.Context ctx, Gdk.Rectangle area) {
-        // the framed area is inset and slightly smaller than the overall histogram
-        // control area
-        Gdk.Rectangle framed_area = area;
-        framed_area.x += 5;
-        framed_area.y += 1;
-        framed_area.width -= 8;
-        framed_area.height -= 12;
-        
-        Gtk.StyleContext stylectx = dummy_frame.get_style_context();
-        stylectx.save();
-        
-        stylectx.get_path().append_type(typeof(Gtk.Frame));
-        stylectx.get_path().iter_add_class(0, "default");
-        stylectx.add_class(Gtk.STYLE_CLASS_TROUGH);
-        stylectx.set_junction_sides(Gtk.JunctionSides.TOP | Gtk.JunctionSides.BOTTOM |
-            Gtk.JunctionSides.LEFT | Gtk.JunctionSides.RIGHT);
-
-        stylectx.render_frame(ctx, framed_area.x, framed_area.y, framed_area.width,
-            framed_area.height);
-
-        stylectx.restore();
-    }
-    
-    private void draw_histogram(Cairo.Context ctx, Gdk.Rectangle area) {
-        if (histogram == null)
-            return;
-        
-        Gdk.Pixbuf histogram_graphic = histogram.get_graphic().copy();
-        unowned uchar[] pixel_data = histogram_graphic.get_pixels();
-        
-        int edge_blend_red = 0;
-        int edge_blend_green = 0;
-        int edge_blend_blue = 0;
-        int body_blend_red = 20;
-        int body_blend_green = 20;
-        int body_blend_blue = 20;
-
-        if (left_nub_position > 0) {
-            int edge_pixel_index = histogram_graphic.n_channels * left_nub_position;
-            for (int i = 0; i < histogram_graphic.height; i++) {
-                int body_pixel_index = i * histogram_graphic.rowstride;
-                int row_last_pixel = body_pixel_index + histogram_graphic.n_channels *
-                    left_nub_position;
-                while (body_pixel_index < row_last_pixel) {
-                    pixel_data[body_pixel_index] =
-                        (uchar) ((pixel_data[body_pixel_index] + body_blend_red) / 2);
-                    pixel_data[body_pixel_index + 1] =
-                        (uchar) ((pixel_data[body_pixel_index + 1] + body_blend_green) / 2);
-                    pixel_data[body_pixel_index + 2] =
-                        (uchar) ((pixel_data[body_pixel_index + 2] + body_blend_blue) / 2);
-                
-                    body_pixel_index += histogram_graphic.n_channels;
-                }
-            
-                pixel_data[edge_pixel_index] =
-                    (uchar) ((pixel_data[edge_pixel_index] + edge_blend_red) / 2);
-                pixel_data[edge_pixel_index + 1] =
-                    (uchar) ((pixel_data[edge_pixel_index + 1] + edge_blend_green) / 2);
-                pixel_data[edge_pixel_index + 2] =
-                    (uchar) ((pixel_data[edge_pixel_index + 2] + edge_blend_blue) / 2);
-
-                edge_pixel_index += histogram_graphic.rowstride;
-            }
-        }
-
-        edge_blend_red = 250;
-        edge_blend_green = 250;
-        edge_blend_blue = 250;
-        body_blend_red = 200;
-        body_blend_green = 200;
-        body_blend_blue = 200;
-
-        if (right_nub_position < 255) {
-            int edge_pixel_index = histogram_graphic.n_channels * right_nub_position;
-            for (int i = 0; i < histogram_graphic.height; i++) {
-                int body_pixel_index = i * histogram_graphic.rowstride +
-                    histogram_graphic.n_channels * 255;
-                int row_last_pixel = i * histogram_graphic.rowstride +
-                    histogram_graphic.n_channels * right_nub_position;
-                while (body_pixel_index > row_last_pixel) {
-                    pixel_data[body_pixel_index] =
-                        (uchar) ((pixel_data[body_pixel_index] + body_blend_red) / 2);
-                    pixel_data[body_pixel_index + 1] =
-                        (uchar) ((pixel_data[body_pixel_index + 1] + body_blend_green) / 2);
-                    pixel_data[body_pixel_index + 2] =
-                        (uchar) ((pixel_data[body_pixel_index + 2] + body_blend_blue) / 2);
-                
-                    body_pixel_index -= histogram_graphic.n_channels;
-                }
-                pixel_data[edge_pixel_index] =
-                    (uchar) ((pixel_data[edge_pixel_index] + edge_blend_red) / 2);
-                pixel_data[edge_pixel_index + 1] =
-                    (uchar) ((pixel_data[edge_pixel_index + 1] + edge_blend_green) / 2);
-                pixel_data[edge_pixel_index + 2] =
-                    (uchar) ((pixel_data[edge_pixel_index + 2] + edge_blend_blue) / 2);
-
-                edge_pixel_index += histogram_graphic.rowstride;
-            }
-        }
-        
-        Gdk.cairo_set_source_pixbuf(ctx, histogram_graphic, area.x + NUB_HALF_WIDTH, area.y + 2);
-        ctx.paint();
-    }
-    
-    private void draw_trough(Cairo.Context ctx, Gdk.Rectangle area) { 
-        int trough_x = area.x;
-        int trough_y = area.y + (CONTROL_HEIGHT - TROUGH_HEIGHT - TROUGH_BOTTOM_OFFSET - 3);
-        
-        Gtk.StyleContext stylectx = dummy_slider.get_style_context();
-        stylectx.save();
-        
-        stylectx.get_path().append_type(typeof(Gtk.Scale));
-        stylectx.get_path().iter_add_class(0, "scale");
-        stylectx.add_class(Gtk.STYLE_CLASS_TROUGH);
-
-        stylectx.render_activity(ctx, trough_x, trough_y, TROUGH_WIDTH, TROUGH_HEIGHT);
-
-        stylectx.restore();
-    }
-    
-    private void draw_nub(Cairo.Context ctx, Gdk.Rectangle area, int position) {
-        Gdk.cairo_set_source_pixbuf(ctx, nub_pixbuf, area.x + position, area.y + NUB_V_POSITION);
-        ctx.paint();
-    }
-    
-    private void force_update() {
-        get_window().invalidate_rect(null, true);
-        get_window().process_updates(true);
-    }
-    
-    private void update_nub_extrema() {
-        right_nub_min = left_nub_position + NUB_SIZE + 1;
-        left_nub_max = right_nub_position - NUB_SIZE - 1;
-    }
-
-    public signal void nub_position_changed();
-
-    public void update_histogram(Gdk.Pixbuf source_pixbuf) {
-        histogram = new RGBHistogram(source_pixbuf);
-        force_update();
-    }
-    
-    public int get_left_nub_position() {
-        return left_nub_position;
-    }
-    
-    public int get_right_nub_position() {
-        return right_nub_position;
-    }
-
-    public void set_left_nub_position(int user_nub_pos) {
-        assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
-        left_nub_position = user_nub_pos.clamp(0, left_nub_max);
-        update_nub_extrema();
-    }
-    
-    public void set_right_nub_position(int user_nub_pos) {
-        assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
-        right_nub_position = user_nub_pos.clamp(right_nub_min, 255);
-        update_nub_extrema();
-    }
-}
-
diff --git a/src/Debug.c b/src/Debug.c
index 3529b39..cfbf83c 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -198,7 +198,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "Debug.c"
-					goto __catch433_g_error;
+					goto __catch441_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 __finally433;
-		__catch433_g_error:
+		goto __finally441;
+		__catch441_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_;
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally433:
+		__finally441:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index c1e90ba..7d24773 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1176 "DesktopIntegration.c"
-			goto __catch568_g_error;
+			goto __catch577_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 __finally568;
-	__catch568_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp23_;
@@ -1223,7 +1223,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_error_free0 (err);
 #line 1225 "DesktopIntegration.c"
 	}
-	__finally568:
+	__finally577:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1562,11 +1562,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 1565 "DesktopIntegration.c"
-			goto __catch569_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally569;
-	__catch569_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp27_;
@@ -1608,7 +1608,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		return;
 #line 1610 "DesktopIntegration.c"
 	}
-	__finally569:
+	__finally578:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2603,11 +2603,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 2606 "DesktopIntegration.c"
-			goto __catch570_g_error;
+			goto __catch579_g_error;
 		}
 	}
-	goto __finally570;
-	__catch570_g_error:
+	goto __finally579;
+	__catch579_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_;
@@ -2627,7 +2627,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		_g_error_free0 (err);
 #line 2628 "DesktopIntegration.c"
 	}
-	__finally570:
+	__finally579:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2762,7 +2762,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 2764 "DesktopIntegration.c"
-			goto __catch571_g_error;
+			goto __catch580_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
@@ -2804,7 +2804,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 2806 "DesktopIntegration.c"
-						goto __catch571_g_error;
+						goto __catch580_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
@@ -2824,7 +2824,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 2826 "DesktopIntegration.c"
-			goto __catch571_g_error;
+			goto __catch580_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2838,8 +2838,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (_tmp16_);
 #line 2839 "DesktopIntegration.c"
 	}
-	goto __finally571;
-	__catch571_g_error:
+	goto __finally580;
+	__catch580_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
@@ -2872,7 +2872,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		return;
 #line 2873 "DesktopIntegration.c"
 	}
-	__finally571:
+	__finally580:
 #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 6d3ea34..16d93b5 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -17,11 +17,6 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gee.h>
-#include <float.h>
-#include <math.h>
-#include <gdk/gdk.h>
-#include <time.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -127,59 +122,6 @@ typedef struct _PhotoSourceClass PhotoSourceClass;
 typedef struct _Photo Photo;
 typedef struct _PhotoClass PhotoClass;
 
-#define TYPE_EXPORT_DIALOG (export_dialog_get_type ())
-#define EXPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPORT_DIALOG, ExportDialog))
-#define EXPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPORT_DIALOG, ExportDialogClass))
-#define IS_EXPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPORT_DIALOG))
-#define IS_EXPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPORT_DIALOG))
-#define EXPORT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPORT_DIALOG, ExportDialogClass))
-
-typedef struct _ExportDialog ExportDialog;
-typedef struct _ExportDialogClass ExportDialogClass;
-typedef struct _ExportDialogPrivate ExportDialogPrivate;
-
-#define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ())
-
-#define TYPE_EXPORT_FORMAT_PARAMETERS (export_format_parameters_get_type ())
-
-#define TYPE_EXPORT_FORMAT_MODE (export_format_mode_get_type ())
-
-#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
-
-#define JPEG_TYPE_QUALITY (jpeg_quality_get_type ())
-typedef struct _ExportFormatParameters ExportFormatParameters;
-
-#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
-#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
-#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
-#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
-#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-
-typedef struct _ConfigurationFacade ConfigurationFacade;
-typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
-
-#define CONFIG_TYPE_FACADE (config_facade_get_type ())
-#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
-#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
-#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
-#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-
-typedef struct _ConfigFacade ConfigFacade;
-typedef struct _ConfigFacadeClass ConfigFacadeClass;
-
-#define TYPE_PHOTO_FILE_FORMAT_PROPERTIES (photo_file_format_properties_get_type ())
-#define PHOTO_FILE_FORMAT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties))
-#define PHOTO_FILE_FORMAT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatPropertiesClass))
-#define IS_PHOTO_FILE_FORMAT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES))
-#define IS_PHOTO_FILE_FORMAT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_FILE_FORMAT_PROPERTIES))
-#define PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatPropertiesClass))
-
-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_BATCH_IMPORT_RESULT (batch_import_result_get_type ())
 #define BATCH_IMPORT_RESULT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BATCH_IMPORT_RESULT, BatchImportResult))
 #define BATCH_IMPORT_RESULT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BATCH_IMPORT_RESULT, BatchImportResultClass))
@@ -226,6 +168,8 @@ typedef struct _ImportUIQuestionParamsClass ImportUIQuestionParamsClass;
 typedef struct _ImportUIQuestionParamsPrivate ImportUIQuestionParamsPrivate;
 typedef struct _ImportUIParamSpecQuestionParams ImportUIParamSpecQuestionParams;
 
+#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
+
 #define TYPE_IMPORT_MANIFEST (import_manifest_get_type ())
 #define IMPORT_MANIFEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMPORT_MANIFEST, ImportManifest))
 #define IMPORT_MANIFEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMPORT_MANIFEST, ImportManifestClass))
@@ -283,41 +227,6 @@ typedef struct _MultiTextEntryDialog MultiTextEntryDialog;
 typedef struct _MultiTextEntryDialogClass MultiTextEntryDialogClass;
 typedef struct _ParamSpecMultiTextEntryDialogMediator ParamSpecMultiTextEntryDialogMediator;
 
-#define TYPE_ENTRY_MULTI_COMPLETION (entry_multi_completion_get_type ())
-#define ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion))
-#define ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
-#define IS_ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ENTRY_MULTI_COMPLETION))
-#define IS_ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ENTRY_MULTI_COMPLETION))
-#define ENTRY_MULTI_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
-
-typedef struct _EntryMultiCompletion EntryMultiCompletion;
-typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
-typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate;
-
-#define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
-#define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
-#define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
-#define IS_SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG))
-#define IS_SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG))
-#define SET_BACKGROUND_PHOTO_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
-
-typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
-typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
-typedef struct _SetBackgroundPhotoDialogPrivate SetBackgroundPhotoDialogPrivate;
-
-#define TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG (set_background_slideshow_dialog_get_type ())
-#define SET_BACKGROUND_SLIDESHOW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog))
-#define SET_BACKGROUND_SLIDESHOW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogClass))
-#define IS_SET_BACKGROUND_SLIDESHOW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG))
-#define IS_SET_BACKGROUND_SLIDESHOW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG))
-#define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogClass))
-
-typedef struct _SetBackgroundSlideshowDialog SetBackgroundSlideshowDialog;
-typedef struct _SetBackgroundSlideshowDialogClass SetBackgroundSlideshowDialogClass;
-typedef struct _SetBackgroundSlideshowDialogPrivate SetBackgroundSlideshowDialogPrivate;
-typedef struct _TextEntryDialogPrivate TextEntryDialogPrivate;
-typedef struct _MultiTextEntryDialogPrivate MultiTextEntryDialogPrivate;
-
 #define TYPE_EVENT_RENAME_DIALOG (event_rename_dialog_get_type ())
 #define EVENT_RENAME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_RENAME_DIALOG, EventRenameDialog))
 #define EVENT_RENAME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_RENAME_DIALOG, EventRenameDialogClass))
@@ -351,38 +260,6 @@ typedef struct _EditCommentDialog EditCommentDialog;
 typedef struct _EditCommentDialogClass EditCommentDialogClass;
 typedef struct _EditCommentDialogPrivate EditCommentDialogPrivate;
 
-#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))
-#define IS_PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROGRESS_DIALOG))
-#define IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROGRESS_DIALOG))
-#define PROGRESS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROGRESS_DIALOG, ProgressDialogClass))
-
-typedef struct _ProgressDialog ProgressDialog;
-typedef struct _ProgressDialogClass ProgressDialogClass;
-typedef struct _ProgressDialogPrivate ProgressDialogPrivate;
-
-#define TYPE_ADJUST_DATE_TIME_DIALOG (adjust_date_time_dialog_get_type ())
-#define ADJUST_DATE_TIME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog))
-#define ADJUST_DATE_TIME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogClass))
-#define IS_ADJUST_DATE_TIME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ADJUST_DATE_TIME_DIALOG))
-#define IS_ADJUST_DATE_TIME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ADJUST_DATE_TIME_DIALOG))
-#define ADJUST_DATE_TIME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogClass))
-
-typedef struct _AdjustDateTimeDialog AdjustDateTimeDialog;
-typedef struct _AdjustDateTimeDialogClass AdjustDateTimeDialogClass;
-typedef struct _AdjustDateTimeDialogPrivate AdjustDateTimeDialogPrivate;
-
-#define ADJUST_DATE_TIME_DIALOG_TYPE_TIME_SYSTEM (adjust_date_time_dialog_time_system_get_type ())
-
-#define TYPE_DATEABLE (dateable_get_type ())
-#define DATEABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATEABLE, Dateable))
-#define IS_DATEABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATEABLE))
-#define DATEABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_DATEABLE, DateableIface))
-
-typedef struct _Dateable Dateable;
-typedef struct _DateableIface DateableIface;
-
 #define TYPE_TAGS_DIALOG (tags_dialog_get_type ())
 #define TAGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAGS_DIALOG, TagsDialog))
 #define TAGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TAGS_DIALOG, TagsDialogClass))
@@ -477,85 +354,6 @@ typedef struct _ContainerSourceCollectionClass ContainerSourceCollectionClass;
 typedef struct _TagSourceCollection TagSourceCollection;
 typedef struct _TagSourceCollectionClass TagSourceCollectionClass;
 
-#define TYPE_WELCOME_SERVICE_ENTRY (welcome_service_entry_get_type ())
-#define WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry))
-#define IS_WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WELCOME_SERVICE_ENTRY))
-#define WELCOME_SERVICE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntryIface))
-
-typedef struct _WelcomeServiceEntry WelcomeServiceEntry;
-typedef struct _WelcomeServiceEntryIface WelcomeServiceEntryIface;
-
-#define TYPE_WELCOME_DIALOG (welcome_dialog_get_type ())
-#define WELCOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_DIALOG, WelcomeDialog))
-#define WELCOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WELCOME_DIALOG, WelcomeDialogClass))
-#define IS_WELCOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WELCOME_DIALOG))
-#define IS_WELCOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_WELCOME_DIALOG))
-#define WELCOME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_WELCOME_DIALOG, WelcomeDialogClass))
-
-typedef struct _WelcomeDialog WelcomeDialog;
-typedef struct _WelcomeDialogClass WelcomeDialogClass;
-typedef struct _WelcomeDialogPrivate WelcomeDialogPrivate;
-
-#define SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST (spit_data_imports_welcome_import_meta_host_get_type ())
-#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost))
-#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostClass))
-#define SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST))
-#define SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST))
-#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostClass))
-
-typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost;
-typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass;
-
-#define TYPE_PREFERENCES_DIALOG (preferences_dialog_get_type ())
-#define PREFERENCES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PREFERENCES_DIALOG, PreferencesDialog))
-#define PREFERENCES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PREFERENCES_DIALOG, PreferencesDialogClass))
-#define IS_PREFERENCES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PREFERENCES_DIALOG))
-#define IS_PREFERENCES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PREFERENCES_DIALOG))
-#define PREFERENCES_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PREFERENCES_DIALOG, PreferencesDialogClass))
-
-typedef struct _PreferencesDialog PreferencesDialog;
-typedef struct _PreferencesDialogClass PreferencesDialogClass;
-typedef struct _PreferencesDialogPrivate PreferencesDialogPrivate;
-
-#define TYPE_SORTED_LIST (sorted_list_get_type ())
-#define SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SORTED_LIST, SortedList))
-#define SORTED_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SORTED_LIST, SortedListClass))
-#define IS_SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SORTED_LIST))
-#define IS_SORTED_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SORTED_LIST))
-#define SORTED_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SORTED_LIST, SortedListClass))
-
-typedef struct _SortedList SortedList;
-typedef struct _SortedListClass SortedListClass;
-
-#define PREFERENCES_DIALOG_TYPE_PATH_FORMAT (preferences_dialog_path_format_get_type ())
-#define PREFERENCES_DIALOG_PATH_FORMAT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat))
-#define PREFERENCES_DIALOG_PATH_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormatClass))
-#define PREFERENCES_DIALOG_IS_PATH_FORMAT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT))
-#define PREFERENCES_DIALOG_IS_PATH_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PREFERENCES_DIALOG_TYPE_PATH_FORMAT))
-#define PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormatClass))
-
-typedef struct _PreferencesDialogPathFormat PreferencesDialogPathFormat;
-typedef struct _PreferencesDialogPathFormatClass PreferencesDialogPathFormatClass;
-
-#define PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR (plugins_manifest_widget_mediator_get_type ())
-#define PLUGINS_MANIFEST_WIDGET_MEDIATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator))
-#define PLUGINS_MANIFEST_WIDGET_MEDIATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorClass))
-#define PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR))
-#define PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR))
-#define PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorClass))
-
-typedef struct _PluginsManifestWidgetMediator PluginsManifestWidgetMediator;
-typedef struct _PluginsManifestWidgetMediatorClass PluginsManifestWidgetMediatorClass;
-#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
-#define _plugins_manifest_widget_mediator_unref0(var) ((var == NULL) ? NULL : (var = (plugins_manifest_widget_mediator_unref (var), NULL)))
-
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-typedef struct _PreferencesDialogPathFormatPrivate PreferencesDialogPathFormatPrivate;
-#define _preferences_dialog_path_format_unref0(var) ((var == NULL) ? NULL : (var = (preferences_dialog_path_format_unref (var), NULL)))
-#define _preferences_dialog_unref0(var) ((var == NULL) ? NULL : (var = (preferences_dialog_unref (var), NULL)))
-typedef struct _PreferencesDialogParamSpecPathFormat PreferencesDialogParamSpecPathFormat;
-typedef struct _ParamSpecPreferencesDialog ParamSpecPreferencesDialog;
-
 #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))
@@ -586,6 +384,16 @@ typedef struct _VideoSourceClass VideoSourceClass;
 typedef struct _Video Video;
 typedef struct _VideoClass VideoClass;
 
+#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))
+#define IS_PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROGRESS_DIALOG))
+#define IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROGRESS_DIALOG))
+#define PROGRESS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROGRESS_DIALOG, ProgressDialogClass))
+
+typedef struct _ProgressDialog ProgressDialog;
+typedef struct _ProgressDialogClass ProgressDialogClass;
+
 #define TYPE_MEDIA_SOURCE_COLLECTION (media_source_collection_get_type ())
 #define MEDIA_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection))
 #define MEDIA_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionClass))
@@ -620,65 +428,6 @@ typedef struct _VideoSourceCollectionClass VideoSourceCollectionClass;
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
 #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
-struct _ExportDialog {
-	GtkDialog parent_instance;
-	ExportDialogPrivate * priv;
-};
-
-struct _ExportDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _ExportDialogPrivate {
-	GtkGrid* table;
-	GtkComboBoxText* quality_combo;
-	GtkComboBoxText* constraint_combo;
-	GtkComboBoxText* format_combo;
-	GtkSwitch* export_metadata;
-	GeeArrayList* format_options;
-	GtkEntry* pixels_entry;
-	GtkWidget* ok_button;
-	gboolean in_insert;
-};
-
-typedef enum  {
-	SCALE_CONSTRAINT_ORIGINAL,
-	SCALE_CONSTRAINT_DIMENSIONS,
-	SCALE_CONSTRAINT_WIDTH,
-	SCALE_CONSTRAINT_HEIGHT,
-	SCALE_CONSTRAINT_FILL_VIEWPORT
-} ScaleConstraint;
-
-typedef enum  {
-	EXPORT_FORMAT_MODE_UNMODIFIED,
-	EXPORT_FORMAT_MODE_CURRENT,
-	EXPORT_FORMAT_MODE_SPECIFIED,
-	EXPORT_FORMAT_MODE_LAST
-} ExportFormatMode;
-
-typedef enum  {
-	PHOTO_FILE_FORMAT_JFIF,
-	PHOTO_FILE_FORMAT_RAW,
-	PHOTO_FILE_FORMAT_PNG,
-	PHOTO_FILE_FORMAT_TIFF,
-	PHOTO_FILE_FORMAT_BMP,
-	PHOTO_FILE_FORMAT_UNKNOWN
-} PhotoFileFormat;
-
-typedef enum  {
-	JPEG_QUALITY_LOW = 50,
-	JPEG_QUALITY_MEDIUM = 75,
-	JPEG_QUALITY_HIGH = 90,
-	JPEG_QUALITY_MAXIMUM = 100
-} JpegQuality;
-
-struct _ExportFormatParameters {
-	ExportFormatMode mode;
-	PhotoFileFormat specified_format;
-	JpegQuality quality;
-	gboolean export_metadata;
-};
-
 typedef enum  {
 	IMPORT_RESULT_SUCCESS,
 	IMPORT_RESULT_FILE_ERROR,
@@ -732,6 +481,15 @@ struct _ImportUIParamSpecQuestionParams {
 	GParamSpec parent_instance;
 };
 
+typedef enum  {
+	PHOTO_FILE_FORMAT_JFIF,
+	PHOTO_FILE_FORMAT_RAW,
+	PHOTO_FILE_FORMAT_PNG,
+	PHOTO_FILE_FORMAT_TIFF,
+	PHOTO_FILE_FORMAT_BMP,
+	PHOTO_FILE_FORMAT_UNKNOWN
+} PhotoFileFormat;
+
 struct _ImportManifest {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -747,6 +505,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -796,86 +555,6 @@ struct _ParamSpecMultiTextEntryDialogMediator {
 	GParamSpec parent_instance;
 };
 
-struct _EntryMultiCompletion {
-	GtkEntryCompletion parent_instance;
-	EntryMultiCompletionPrivate * priv;
-};
-
-struct _EntryMultiCompletionClass {
-	GtkEntryCompletionClass parent_class;
-};
-
-struct _EntryMultiCompletionPrivate {
-	gchar* delimiter;
-};
-
-struct _SetBackgroundPhotoDialog {
-	GtkDialog parent_instance;
-	SetBackgroundPhotoDialogPrivate * priv;
-};
-
-struct _SetBackgroundPhotoDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _SetBackgroundPhotoDialogPrivate {
-	GtkCheckButton* desktop_background_checkbox;
-	GtkCheckButton* screensaver_checkbox;
-};
-
-struct _SetBackgroundSlideshowDialog {
-	GtkDialog parent_instance;
-	SetBackgroundSlideshowDialogPrivate * priv;
-};
-
-struct _SetBackgroundSlideshowDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _SetBackgroundSlideshowDialogPrivate {
-	GtkCheckButton* desktop_background_checkbox;
-	GtkCheckButton* screensaver_checkbox;
-	GtkScale* delay_scale;
-	GtkLabel* delay_value_label;
-	gint delay_value;
-};
-
-struct _TextEntryDialog {
-	GtkDialog parent_instance;
-	TextEntryDialogPrivate * priv;
-};
-
-struct _TextEntryDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _TextEntryDialogPrivate {
-	TextEntryDialogOnModifyValidateType on_modify_validate;
-	gpointer on_modify_validate_target;
-	GtkEntry* entry;
-	GtkBuilder* builder;
-	GtkButton* button1;
-	GtkButton* button2;
-};
-
-struct _MultiTextEntryDialog {
-	GtkDialog parent_instance;
-	MultiTextEntryDialogPrivate * priv;
-};
-
-struct _MultiTextEntryDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _MultiTextEntryDialogPrivate {
-	MultiTextEntryDialogOnModifyValidateType on_modify_validate;
-	gpointer on_modify_validate_target;
-	GtkTextView* entry;
-	GtkBuilder* builder;
-	GtkButton* button1;
-	GtkButton* button2;
-};
-
 struct _EventRenameDialog {
 	TextEntryDialogMediator parent_instance;
 	EventRenameDialogPrivate * priv;
@@ -906,62 +585,6 @@ struct _EditCommentDialogClass {
 	gchar* (*execute) (EditCommentDialog* self);
 };
 
-struct _ProgressDialog {
-	GtkWindow parent_instance;
-	ProgressDialogPrivate * priv;
-};
-
-struct _ProgressDialogClass {
-	GtkWindowClass parent_class;
-};
-
-struct _ProgressDialogPrivate {
-	GtkProgressBar* progress_bar;
-	GtkButton* cancel_button;
-	GCancellable* cancellable;
-	guint64 last_count;
-	gint update_every;
-	gint minimum_on_screen_time_msec;
-	gulong time_started;
-};
-
-struct _AdjustDateTimeDialog {
-	GtkDialog parent_instance;
-	AdjustDateTimeDialogPrivate * priv;
-};
-
-struct _AdjustDateTimeDialogClass {
-	GtkDialogClass parent_class;
-};
-
-typedef enum  {
-	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM,
-	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM,
-	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR
-} AdjustDateTimeDialogTimeSystem;
-
-struct _AdjustDateTimeDialogPrivate {
-	gboolean no_original_time;
-	time_t original_time;
-	GtkLabel* original_time_label;
-	GtkCalendar* calendar;
-	GtkSpinButton* hour;
-	GtkSpinButton* minute;
-	GtkSpinButton* second;
-	GtkComboBoxText* system;
-	GtkRadioButton* relativity_radio_button;
-	GtkRadioButton* batch_radio_button;
-	GtkCheckButton* modify_originals_check_button;
-	GtkLabel* notification;
-	AdjustDateTimeDialogTimeSystem previous_time_system;
-};
-
-struct _DateableIface {
-	GTypeInterface parent_iface;
-	void (*set_exposure_time) (Dateable* self, time_t target_time);
-	time_t (*get_exposure_time) (Dateable* self);
-};
-
 struct _TagsDialog {
 	TextEntryDialogMediator parent_instance;
 	TagsDialogPrivate * priv;
@@ -989,133 +612,20 @@ struct _ModifyTagsDialogClass {
 	TagsDialogClass parent_class;
 };
 
-struct _WelcomeServiceEntryIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_service_name) (WelcomeServiceEntry* self);
-	void (*execute) (WelcomeServiceEntry* self);
-};
-
-struct _WelcomeDialog {
-	GtkDialog parent_instance;
-	WelcomeDialogPrivate * priv;
-};
-
-struct _WelcomeDialogClass {
-	GtkDialogClass parent_class;
-};
-
-struct _WelcomeDialogPrivate {
-	GtkCheckButton* hide_button;
-	GtkCheckButton* system_pictures_import_check;
-	GtkCheckButton** external_import_checks;
-	gint external_import_checks_length1;
-	gint _external_import_checks_size_;
-	WelcomeServiceEntry** external_import_entries;
-	gint external_import_entries_length1;
-	gint _external_import_entries_size_;
-	GtkLabel* secondary_text;
-	GtkLabel* instruction_header;
-	GtkBox* import_content;
-	GtkBox* import_action_checkbox_packer;
-	GtkBox* external_import_action_checkbox_packer;
-	SpitDataImportsWelcomeImportMetaHost* import_meta_host;
-	gboolean import_content_already_installed;
-	gboolean ok_clicked;
-};
-
-struct _PreferencesDialog {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PreferencesDialogPrivate * priv;
-};
-
-struct _PreferencesDialogClass {
-	GTypeClass parent_class;
-	void (*finalize) (PreferencesDialog *self);
-};
-
-struct _PreferencesDialogPrivate {
-	GtkDialog* dialog;
-	GtkBuilder* builder;
-	GtkAdjustment* bg_color_adjustment;
-	GtkScale* bg_color_slider;
-	GtkComboBox* photo_editor_combo;
-	GtkComboBox* raw_editor_combo;
-	SortedList* external_raw_apps;
-	SortedList* external_photo_apps;
-	GtkFileChooserButton* library_dir_button;
-	GtkComboBoxText* dir_pattern_combo;
-	GtkEntry* dir_pattern_entry;
-	GtkLabel* dir_pattern_example;
-	gboolean allow_closing;
-	gchar* lib_dir;
-	GeeArrayList* path_formats;
-	GDateTime* example_date;
-	GtkCheckButton* lowercase;
-	PluginsManifestWidgetMediator* plugins_mediator;
-	GtkComboBoxText* default_raw_developer_combo;
-};
-
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
-struct _PreferencesDialogPathFormat {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PreferencesDialogPathFormatPrivate * priv;
-	gchar* name;
-	gchar* pattern;
-};
-
-struct _PreferencesDialogPathFormatClass {
-	GTypeClass parent_class;
-	void (*finalize) (PreferencesDialogPathFormat *self);
-};
-
-struct _PreferencesDialogParamSpecPathFormat {
-	GParamSpec parent_instance;
-};
-
-struct _ParamSpecPreferencesDialog {
-	GParamSpec parent_instance;
-};
-
 typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do_event_loop, void* user_data);
 
 extern GFile* export_ui_current_export_dir;
 GFile* export_ui_current_export_dir = NULL;
-static gpointer export_dialog_parent_class = NULL;
-static ScaleConstraint export_dialog_current_constraint;
-static ScaleConstraint export_dialog_current_constraint = SCALE_CONSTRAINT_ORIGINAL;
-static ExportFormatParameters export_dialog_current_parameters;
-static ExportFormatParameters export_dialog_current_parameters = {0};
-static gint export_dialog_current_scale;
-static gint export_dialog_current_scale = 0;
 static gpointer import_ui_question_params_parent_class = NULL;
 static gpointer text_entry_dialog_mediator_parent_class = NULL;
 static gpointer multi_text_entry_dialog_mediator_parent_class = NULL;
-static gpointer entry_multi_completion_parent_class = NULL;
-static gpointer set_background_photo_dialog_parent_class = NULL;
-static gpointer set_background_slideshow_dialog_parent_class = NULL;
-static gpointer text_entry_dialog_parent_class = NULL;
-static gpointer multi_text_entry_dialog_parent_class = NULL;
 static gpointer event_rename_dialog_parent_class = NULL;
 static gpointer edit_title_dialog_parent_class = NULL;
 static gpointer edit_comment_dialog_parent_class = NULL;
-static gpointer progress_dialog_parent_class = NULL;
-static gpointer adjust_date_time_dialog_parent_class = NULL;
 static gpointer tags_dialog_parent_class = NULL;
 static gpointer add_tags_dialog_parent_class = NULL;
 static gpointer modify_tags_dialog_parent_class = NULL;
 extern TagSourceCollection* tag_global;
-static gpointer welcome_dialog_parent_class = NULL;
-static gpointer preferences_dialog_parent_class = NULL;
-static PreferencesDialog* preferences_dialog_preferences_dialog;
-static PreferencesDialog* preferences_dialog_preferences_dialog = NULL;
-static gpointer preferences_dialog_path_format_parent_class = NULL;
 extern LibraryPhotoSourceCollection* library_photo_global;
 extern VideoSourceCollection* video_global;
 
@@ -1151,72 +661,6 @@ GFile* media_source_get_master_file (MediaSource* self);
 gchar* resources_launch_editor_failed (GError* err);
 GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining);
 GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent);
-GType export_dialog_get_type (void) G_GNUC_CONST;
-#define EXPORT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORT_DIALOG, ExportDialogPrivate))
-enum  {
-	EXPORT_DIALOG_DUMMY_PROPERTY
-};
-GType scale_constraint_get_type (void) G_GNUC_CONST;
-GType export_format_parameters_get_type (void) G_GNUC_CONST;
-GType export_format_mode_get_type (void) G_GNUC_CONST;
-GType photo_file_format_get_type (void) G_GNUC_CONST;
-GType jpeg_quality_get_type (void) G_GNUC_CONST;
-ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self);
-void export_format_parameters_free (ExportFormatParameters* self);
-void export_format_parameters_current (ExportFormatParameters* result);
-#define EXPORT_DIALOG_DEFAULT_SCALE 1200
-#define EXPORT_DIALOG_NUM_SPECIAL_FORMATS 2
-#define EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL _ ("Unmodified")
-#define EXPORT_DIALOG_CURRENT_FORMAT_LABEL _ ("Current")
-ExportDialog* export_dialog_new (const gchar* title);
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
-GType configuration_facade_get_type (void) G_GNUC_CONST;
-GType config_facade_get_type (void) G_GNUC_CONST;
-ConfigFacade* config_facade_get_instance (void);
-ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self);
-PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self);
-JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self);
-gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self);
-ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self);
-gint configuration_facade_get_export_scale (ConfigurationFacade* self);
-gchar* jpeg_quality_to_string (JpegQuality self);
-gchar* scale_constraint_to_string (ScaleConstraint self);
-static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name);
-PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
-gpointer photo_file_format_properties_ref (gpointer instance);
-void photo_file_format_properties_unref (gpointer instance);
-GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
-void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
-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_user_visible_name (PhotoFileFormatProperties* self);
-static void export_dialog_on_constraint_changed (ExportDialog* self);
-static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void export_dialog_on_format_changed (ExportDialog* self);
-static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void export_dialog_on_pixels_changed (ExportDialog* self);
-static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position);
-static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
-static void export_dialog_on_activate (ExportDialog* self);
-static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget);
-static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y);
-static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text);
-static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self);
-static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params);
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
-gboolean photo_file_format_can_write (PhotoFileFormat self);
-PhotoFileFormat photo_file_format_get_system_default_format (void);
-void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
-void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
-void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
-void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
-void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
-void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
-static void export_dialog_finalize (GObject * obj);
 #define IMPORT_UI_REPORT_FAILURE_COUNT 4
 #define IMPORT_UI_SAVE_RESULTS_BUTTON_NAME _ ("Save Details…")
 #define IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE _ ("Save Details")
@@ -1252,6 +696,7 @@ ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, co
 ImportUIQuestionParams* import_ui_question_params_construct (GType object_type, const gchar* question, const gchar* yes_button, const gchar* no_button);
 static void import_ui_question_params_finalize (ImportUIQuestionParams * obj);
 gboolean import_ui_import_has_photos (GeeCollection* import_collection);
+GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file);
 gboolean import_ui_import_has_videos (GeeCollection* import_collection);
 gboolean video_reader_is_supported_video_file (GFile* file);
@@ -1282,10 +727,8 @@ enum  {
 	TEXT_ENTRY_DIALOG_MEDIATOR_DUMMY_PROPERTY
 };
 TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 TextEntryDialog* text_entry_dialog_new (void);
 TextEntryDialog* text_entry_dialog_construct (GType object_type);
-void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder);
 void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter);
 gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, const gchar* text);
 static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self);
@@ -1308,7 +751,6 @@ enum  {
 MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text);
 MultiTextEntryDialog* multi_text_entry_dialog_new (void);
 MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type);
-void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder);
 void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text);
 gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text);
 static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self);
@@ -1318,56 +760,6 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self);
 static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj);
 gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape);
 gchar* guarded_markup_escape_text (const gchar* plain);
-GType entry_multi_completion_get_type (void) G_GNUC_CONST;
-#define ENTRY_MULTI_COMPLETION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionPrivate))
-enum  {
-	ENTRY_MULTI_COMPLETION_DUMMY_PROPERTY
-};
-EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter);
-EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter);
-static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list);
-static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter);
-static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self);
-static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
-static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
-static void entry_multi_completion_finalize (GObject * obj);
-GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
-#define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
-enum  {
-	SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY
-};
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
-static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
-static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_photo_dialog_finalize (GObject * obj);
-GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
-#define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
-enum  {
-	SET_BACKGROUND_SLIDESHOW_DIALOG_DUMMY_PROPERTY
-};
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
-static void set_background_slideshow_dialog_real_constructed (GObject* base);
-static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self);
-static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self);
-static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
-static void set_background_slideshow_dialog_finalize (GObject * obj);
-#define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
-enum  {
-	TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
-};
-void text_entry_dialog_on_entry_changed (TextEntryDialog* self);
-static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void text_entry_dialog_finalize (GObject * obj);
-#define MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogPrivate))
-enum  {
-	MULTI_TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
-};
-static void multi_text_entry_dialog_finalize (GObject * obj);
 GType event_rename_dialog_get_type (void) G_GNUC_CONST;
 enum  {
 	EVENT_RENAME_DIALOG_DUMMY_PROPERTY
@@ -1402,70 +794,9 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos);
 gboolean photo_has_editable (Photo* self);
 gboolean remove_offline_dialog (GtkWindow* owner, gint count);
-GType progress_dialog_get_type (void) G_GNUC_CONST;
-#define PROGRESS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_DIALOG, ProgressDialogPrivate))
-enum  {
-	PROGRESS_DIALOG_DUMMY_PROPERTY
-};
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-static void progress_dialog_on_cancel (ProgressDialog* self);
-static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static gboolean progress_dialog_on_window_closed (ProgressDialog* self);
-static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-gulong now_ms (void);
-static void progress_dialog_real_realize (GtkWidget* base);
-void progress_dialog_update_display_every (ProgressDialog* self, gint update_every);
-void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec);
-void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total);
-void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct);
-static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct);
-void progress_dialog_set_status (ProgressDialog* self, const gchar* text);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
-void spin_event_loop (void);
-void progress_dialog_close (ProgressDialog* self);
-static void progress_dialog_finalize (GObject * obj);
-GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
-static GType adjust_date_time_dialog_time_system_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-#define ADJUST_DATE_TIME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogPrivate))
-enum  {
-	ADJUST_DATE_TIME_DIALOG_DUMMY_PROPERTY
-};
-#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY ((gint64) ((60 * 60) * 24))
-#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR ((gint64) (60 * 60))
-#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE ((gint64) 60)
-#define ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET 1900
-#define ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE 1
-GType dateable_get_type (void) G_GNUC_CONST;
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-#define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time")
-static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self);
-gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self);
-static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button);
-static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self);
-static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self);
-static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self);
-static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
-GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
-gchar* data_object_to_string (DataObject* self);
-time_t dateable_get_exposure_time (Dateable* self);
-static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time);
-static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format);
-static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self);
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals);
-void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity);
-void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals);
-void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time);
-static void adjust_date_time_dialog_finalize (GObject * obj);
 #define MAX_OBJECTS_DISPLAYED 3
 void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message, const gchar* title);
+gchar* data_object_to_string (DataObject* self);
 GType tags_dialog_get_type (void) G_GNUC_CONST;
 enum  {
 	TAGS_DIALOG_DUMMY_PROPERTY
@@ -1519,144 +850,6 @@ gboolean is_string_empty (const gchar* s);
 gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
 Tag* tag_for_path (const gchar* name);
 static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text);
-GType welcome_service_entry_get_type (void) G_GNUC_CONST;
-gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self);
-void welcome_service_entry_execute (WelcomeServiceEntry* self);
-GType welcome_dialog_get_type (void) G_GNUC_CONST;
-GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
-#define WELCOME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WELCOME_DIALOG, WelcomeDialogPrivate))
-enum  {
-	WELCOME_DIALOG_DUMMY_PROPERTY
-};
-WelcomeDialog* welcome_dialog_new (GtkWindow* owner);
-WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner);
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog);
-SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog);
-static gboolean welcome_dialog_is_system_pictures_import_possible (void);
-gchar* get_display_pathname (GFile* file);
-GFile* app_dirs_get_import_dir (void);
-static void welcome_dialog_install_import_content (WelcomeDialog* self);
-void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
-void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void _vala_array_add109 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
-static void _vala_array_add110 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value);
-static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp);
-gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
-static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void _vala_array_add111 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
-static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length);
-static void welcome_dialog_finalize (GObject * obj);
-gpointer preferences_dialog_ref (gpointer instance);
-void preferences_dialog_unref (gpointer instance);
-GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_preferences_dialog (GValue* value, gpointer v_object);
-void value_take_preferences_dialog (GValue* value, gpointer v_object);
-gpointer value_get_preferences_dialog (const GValue* value);
-GType preferences_dialog_get_type (void) G_GNUC_CONST;
-GType sorted_list_get_type (void) G_GNUC_CONST;
-static gpointer preferences_dialog_path_format_ref (gpointer instance);
-static void preferences_dialog_path_format_unref (gpointer instance);
-static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static gpointer preferences_dialog_value_get_path_format (const GValue* value) G_GNUC_UNUSED;
-static GType preferences_dialog_path_format_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-gpointer plugins_manifest_widget_mediator_ref (gpointer instance);
-void plugins_manifest_widget_mediator_unref (gpointer instance);
-GParamSpec* plugins_param_spec_manifest_widget_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object);
-void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object);
-gpointer plugins_value_get_manifest_widget_mediator (const GValue* value);
-GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST;
-#define PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREFERENCES_DIALOG, PreferencesDialogPrivate))
-enum  {
-	PREFERENCES_DIALOG_DUMMY_PROPERTY
-};
-PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void);
-PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type);
-static PreferencesDialog* preferences_dialog_new (void);
-static PreferencesDialog* preferences_dialog_construct (GType object_type);
-static gboolean preferences_dialog_on_delete (PreferencesDialog* self);
-static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-static void preferences_dialog_on_close (PreferencesDialog* self);
-static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result);
-static void preferences_dialog_on_value_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
-static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event);
-static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-gchar* resources_get_help_path (void);
-#define RESOURCES_DIR_PATTERN_URI_SYSWIDE "help:shotwell/other-files"
-static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore);
-static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self);
-static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern);
-static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self);
-static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self);
-void preferences_dialog_populate_preference_options (PreferencesDialog* self);
-static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self);
-GType raw_developer_get_type (void) G_GNUC_CONST;
-gchar* raw_developer_get_label (RawDeveloper self);
-static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d);
-RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
-static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static gboolean preferences_dialog_map_event (PreferencesDialog* self);
-static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps);
-gchar** photo_file_format_get_editable_mime_types (int* result_length1);
-gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
-gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
-gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
-static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry);
-gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self);
-void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
-SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1);
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
-#define RESOURCES_DEFAULT_ICON_SCALE 24
-gint sorted_list_index_of (SortedList* self, gconstpointer search);
-gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self);
-gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self);
-void preferences_dialog_show (void);
-static void preferences_dialog_commit_on_close (PreferencesDialog* self);
-void config_facade_commit_bg_color (ConfigFacade* self);
-void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import);
-void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata);
-void app_dirs_set_import_dir (const gchar* path);
-void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s);
-void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s);
-static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self);
-static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value);
-gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
-void parse_color (const gchar* spec, GdkRGBA* result);
-#define CONFIG_FACADE_DEFAULT_BG_COLOR "#444"
-static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow);
-void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color);
-static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result);
-gpointer sorted_list_get_at (SortedList* self, gint index);
-void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app);
-gchar* desktop_integration_get_app_open_command (GAppInfo* app_info);
-void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app);
-static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self);
-void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d);
-static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self);
-static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self);
-static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern);
-static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern);
-void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b);
-enum  {
-	PREFERENCES_DIALOG_PATH_FORMAT_DUMMY_PROPERTY
-};
-static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj);
-static void preferences_dialog_finalize (PreferencesDialog * obj);
 GtkResponseType copy_files_dialog (void);
 GType library_photo_get_type (void) G_GNUC_CONST;
 void remove_photos_from_library (GeeCollection* photos);
@@ -1665,6 +858,10 @@ GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
 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);
+ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
@@ -1672,13 +869,12 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted);
 void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape);
+void progress_dialog_close (ProgressDialog* self);
 void page_window_set_normal_cursor (PageWindow* self);
 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 gint _vala_array_length (gpointer array);
 
-const ScaleConstraint EXPORT_DIALOG_CONSTRAINT_ARRAY[4] = {SCALE_CONSTRAINT_ORIGINAL, SCALE_CONSTRAINT_DIMENSIONS, SCALE_CONSTRAINT_WIDTH, SCALE_CONSTRAINT_HEIGHT};
-const JpegQuality EXPORT_DIALOG_QUALITY_ARRAY[4] = {JPEG_QUALITY_LOW, JPEG_QUALITY_MEDIUM, JPEG_QUALITY_HIGH, JPEG_QUALITY_MAXIMUM};
 
 gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	gboolean result = FALSE;
@@ -1712,7 +908,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1716 "Dialogs.c"
+#line 912 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
@@ -1742,7 +938,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1746 "Dialogs.c"
+#line 942 "Dialogs.c"
 }
 
 
@@ -1779,7 +975,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1783 "Dialogs.c"
+#line 979 "Dialogs.c"
 }
 
 
@@ -1827,7 +1023,7 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1829 "Dialogs.c"
+#line 1025 "Dialogs.c"
 }
 
 
@@ -1863,7 +1059,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1865 "Dialogs.c"
+#line 1061 "Dialogs.c"
 		const gchar* _tmp1_;
 		GFile* _tmp2_;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1874,7 +1070,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1876 "Dialogs.c"
+#line 1072 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1884,11 +1080,11 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	if (_tmp5_) {
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Export Video");
-#line 1886 "Dialogs.c"
+#line 1082 "Dialogs.c"
 	} else {
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Export Photo");
-#line 1890 "Dialogs.c"
+#line 1086 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_strdup (_tmp3_);
@@ -1944,7 +1140,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp21_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_dialog_get_type (), GtkDialog));
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp21_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 1946 "Dialogs.c"
+#line 1142 "Dialogs.c"
 		GtkFileChooserDialog* _tmp22_;
 		gchar* _tmp23_;
 		gchar* _tmp24_;
@@ -1973,7 +1169,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp27_;
-#line 1975 "Dialogs.c"
+#line 1171 "Dialogs.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = chooser;
@@ -1987,14 +1183,14 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_g_free0 (file_chooser_title);
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1989 "Dialogs.c"
+#line 1185 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1996 "Dialogs.c"
+#line 1192 "Dialogs.c"
 }
 
 
@@ -2021,7 +1217,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2023 "Dialogs.c"
+#line 1219 "Dialogs.c"
 		const gchar* _tmp1_;
 		GFile* _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2032,7 +1228,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2034 "Dialogs.c"
+#line 1230 "Dialogs.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
@@ -2040,7 +1236,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	if (_tmp3_ == NULL) {
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_title = _ ("Export Photos");
-#line 2042 "Dialogs.c"
+#line 1238 "Dialogs.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_title;
@@ -2082,7 +1278,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp15_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog));
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2084 "Dialogs.c"
+#line 1280 "Dialogs.c"
 		GtkFileChooserDialog* _tmp16_;
 		gchar* _tmp17_;
 		gchar* _tmp18_;
@@ -2111,7 +1307,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp21_;
-#line 2113 "Dialogs.c"
+#line 1309 "Dialogs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = chooser;
@@ -2123,7 +1319,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_g_object_unref0 (chooser);
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2125 "Dialogs.c"
+#line 1321 "Dialogs.c"
 }
 
 
@@ -2138,18 +1334,18 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2140 "Dialogs.c"
+#line 1336 "Dialogs.c"
 	} else {
 		GError* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2147 "Dialogs.c"
+#line 1343 "Dialogs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2151 "Dialogs.c"
+#line 1347 "Dialogs.c"
 		Photo* _tmp3_;
 		GFile* _tmp4_;
 		GFile* _tmp5_;
@@ -2188,7 +1384,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		_g_object_unref0 (_tmp7_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2189 "Dialogs.c"
+#line 1385 "Dialogs.c"
 	} else {
 		GError* _tmp12_;
 		gchar* _tmp13_;
@@ -2203,7 +1399,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		app_window_error_message (_tmp14_, NULL);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp14_);
-#line 2204 "Dialogs.c"
+#line 1400 "Dialogs.c"
 	}
 }
 
@@ -2240,7 +1436,7 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_tmp5_ = photos_remaining;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 2241 "Dialogs.c"
+#line 1437 "Dialogs.c"
 		const gchar* _tmp6_;
 		gchar* _tmp7_;
 		const gchar* _tmp8_;
@@ -2259,14 +1455,14 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 		_tmp9_ = app_window_affirm_cancel_question (_tmp8_, _ ("Con_tinue"), NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = _tmp9_;
-#line 2260 "Dialogs.c"
+#line 1456 "Dialogs.c"
 	} else {
 		const gchar* _tmp10_;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = message;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 2267 "Dialogs.c"
+#line 1463 "Dialogs.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
@@ -2274,1903 +1470,7 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_g_free0 (message);
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2275 "Dialogs.c"
-}
-
-
-static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2282 "Dialogs.c"
-}
-
-
-static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2289 "Dialogs.c"
-}
-
-
-static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2296 "Dialogs.c"
-}
-
-
-static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2303 "Dialogs.c"
-}
-
-
-static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
-#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_activate ((ExportDialog*) self);
-#line 2310 "Dialogs.c"
-}
-
-
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
-	ExportDialog * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-	const gchar* _tmp3_;
-	ConfigFacade* config = NULL;
-	ConfigFacade* _tmp4_;
-	ConfigFacade* _tmp5_;
-	ExportFormatMode _tmp6_;
-	ConfigFacade* _tmp7_;
-	PhotoFileFormat _tmp8_;
-	ConfigFacade* _tmp9_;
-	JpegQuality _tmp10_;
-	ConfigFacade* _tmp11_;
-	gboolean _tmp12_;
-	ConfigFacade* _tmp13_;
-	ScaleConstraint _tmp14_;
-	ConfigFacade* _tmp15_;
-	gint _tmp16_;
-	GtkComboBoxText* _tmp17_;
-	gint ctr = 0;
-	GtkComboBoxText* _tmp28_;
-	GtkComboBoxText* _tmp38_;
-	gint _tmp39_;
-	PhotoFileFormat* _tmp40_;
-	GtkEntry* _tmp46_;
-	GtkEntry* _tmp47_;
-	GtkEntry* _tmp48_;
-	gint _tmp49_;
-	gchar* _tmp50_;
-	gchar* _tmp51_;
-	GtkComboBoxText* _tmp52_;
-	GtkComboBoxText* _tmp53_;
-	GtkEntry* _tmp54_;
-	GtkEntry* _tmp55_;
-	GtkEntry* _tmp56_;
-	GtkComboBoxText* _tmp57_;
-	GtkComboBoxText* _tmp58_;
-	GtkComboBoxText* _tmp59_;
-	GtkComboBoxText* _tmp60_;
-	GtkComboBoxText* _tmp61_;
-	GtkComboBoxText* _tmp62_;
-	GtkEntry* _tmp63_;
-	GtkEntry* _tmp64_;
-	GtkSwitch* _tmp65_;
-	GtkSwitch* _tmp66_;
-	GtkSwitch* _tmp67_;
-	GtkSwitch* _tmp68_;
-	GtkSwitch* _tmp69_;
-	GtkGrid* _tmp70_;
-	GtkGrid* _tmp71_;
-	GtkGrid* _tmp72_;
-	GtkBox* _tmp73_;
-	GtkGrid* _tmp74_;
-	GtkWidget* _tmp75_;
-	GtkWidget* _tmp76_;
-	GtkWidget* _tmp77_;
-	GtkWidget* _tmp78_;
-	GtkWidget* _tmp79_;
-	ScaleConstraint _tmp80_;
-	GtkWidget* _tmp83_;
-#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (title != NULL, NULL);
-#line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_header;
-#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 1;
-#line 2389 "Dialogs.c"
-	} else {
-#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 0;
-#line 2393 "Dialogs.c"
-	}
-#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 172 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = title;
-#line 172 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
-#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = config_facade_get_instance ();
-#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	config = _tmp4_;
-#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = config;
-#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_parameters.mode = _tmp6_;
-#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = config;
-#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_parameters.specified_format = _tmp8_;
-#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = config;
-#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_parameters.quality = _tmp10_;
-#line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = config;
-#line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_parameters.export_metadata = _tmp12_;
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = config;
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_constraint = _tmp14_;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = config;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_scale = _tmp16_;
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp17_);
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->quality_combo);
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->quality_combo = _tmp17_;
-#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	ctr = 0;
-#line 2453 "Dialogs.c"
-	{
-		JpegQuality* quality_collection = NULL;
-		gint quality_collection_length1 = 0;
-		gint _quality_collection_size_ = 0;
-		gint quality_it = 0;
-#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		quality_collection = EXPORT_DIALOG_QUALITY_ARRAY;
-#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
-#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2465 "Dialogs.c"
-			JpegQuality quality = 0;
-#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			quality = quality_collection[quality_it];
-#line 2469 "Dialogs.c"
-			{
-				GtkComboBoxText* _tmp18_;
-				JpegQuality _tmp19_;
-				gchar* _tmp20_;
-				gchar* _tmp21_;
-				JpegQuality _tmp22_;
-				ExportFormatParameters _tmp23_;
-				JpegQuality _tmp24_;
-				gint _tmp27_;
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp18_ = self->priv->quality_combo;
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp19_ = quality;
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp20_ = jpeg_quality_to_string (_tmp19_);
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp21_ = _tmp20_;
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				gtk_combo_box_text_append_text (_tmp18_, _tmp21_);
-#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp21_);
-#line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp22_ = quality;
-#line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp23_ = export_dialog_current_parameters;
-#line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = _tmp23_.quality;
-#line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp22_ == _tmp24_) {
-#line 2499 "Dialogs.c"
-					GtkComboBoxText* _tmp25_;
-					gint _tmp26_;
-#line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp25_ = self->priv->quality_combo;
-#line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp26_ = ctr;
-#line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
-#line 2508 "Dialogs.c"
-				}
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp27_ = ctr;
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				ctr = _tmp27_ + 1;
-#line 2514 "Dialogs.c"
-			}
-		}
-	}
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp28_);
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->constraint_combo);
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->constraint_combo = _tmp28_;
-#line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	ctr = 0;
-#line 2528 "Dialogs.c"
-	{
-		ScaleConstraint* constraint_collection = NULL;
-		gint constraint_collection_length1 = 0;
-		gint _constraint_collection_size_ = 0;
-		gint constraint_it = 0;
-#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		constraint_collection = EXPORT_DIALOG_CONSTRAINT_ARRAY;
-#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
-#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2540 "Dialogs.c"
-			ScaleConstraint constraint = 0;
-#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			constraint = constraint_collection[constraint_it];
-#line 2544 "Dialogs.c"
-			{
-				GtkComboBoxText* _tmp29_;
-				ScaleConstraint _tmp30_;
-				gchar* _tmp31_;
-				gchar* _tmp32_;
-				ScaleConstraint _tmp33_;
-				ScaleConstraint _tmp34_;
-				gint _tmp37_;
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp29_ = self->priv->constraint_combo;
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp30_ = constraint;
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp31_ = scale_constraint_to_string (_tmp30_);
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp32_ = _tmp31_;
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				gtk_combo_box_text_append_text (_tmp29_, _tmp32_);
-#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp32_);
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp33_ = constraint;
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp34_ = export_dialog_current_constraint;
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp33_ == _tmp34_) {
-#line 2571 "Dialogs.c"
-					GtkComboBoxText* _tmp35_;
-					gint _tmp36_;
-#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp35_ = self->priv->constraint_combo;
-#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp36_ = ctr;
-#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 2580 "Dialogs.c"
-				}
-#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp37_ = ctr;
-#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				ctr = _tmp37_ + 1;
-#line 2586 "Dialogs.c"
-			}
-		}
-	}
-#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp38_);
-#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->format_combo);
-#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->format_combo = _tmp38_;
-#line 203 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_format_add_option (self, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
-#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
-#line 2604 "Dialogs.c"
-	{
-		PhotoFileFormat* format_collection = NULL;
-		gint format_collection_length1 = 0;
-		gint _format_collection_size_ = 0;
-		gint format_it = 0;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection = _tmp40_;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection_length1 = _tmp39_;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
-#line 2616 "Dialogs.c"
-			PhotoFileFormat format = 0;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			format = format_collection[format_it];
-#line 2620 "Dialogs.c"
-			{
-				PhotoFileFormat _tmp41_;
-				PhotoFileFormatProperties* _tmp42_;
-				PhotoFileFormatProperties* _tmp43_;
-				gchar* _tmp44_;
-				gchar* _tmp45_;
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp41_ = format;
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp42_ = photo_file_format_get_properties (_tmp41_);
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp43_ = _tmp42_;
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp44_ = photo_file_format_properties_get_user_visible_name (_tmp43_);
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp45_ = _tmp44_;
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				export_dialog_format_add_option (self, _tmp45_);
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp45_);
-#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_photo_file_format_properties_unref0 (_tmp43_);
-#line 2643 "Dialogs.c"
-			}
-		}
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection = (g_free (format_collection), NULL);
-#line 2648 "Dialogs.c"
-	}
-#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = (GtkEntry*) gtk_entry_new ();
-#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp46_);
-#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->pixels_entry);
-#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->pixels_entry = _tmp46_;
-#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = self->priv->pixels_entry;
-#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_max_length (_tmp47_, 6);
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = self->priv->pixels_entry;
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = export_dialog_current_scale;
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = g_strdup_printf ("%d", _tmp49_);
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = _tmp50_;
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_text (_tmp48_, _tmp51_);
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp51_);
-#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = self->priv->constraint_combo;
-#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
-#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = self->priv->format_combo;
-#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
-#line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = self->priv->pixels_entry;
-#line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
-#line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = self->priv->pixels_entry;
-#line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
-#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = self->priv->pixels_entry;
-#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp56_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
-#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = self->priv->format_combo;
-#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
-#line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = self->priv->format_combo;
-#line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 0);
-#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = self->priv->quality_combo;
-#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
-#line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->quality_combo;
-#line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), 1, 1);
-#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = self->priv->constraint_combo;
-#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = self->priv->constraint_combo;
-#line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 2);
-#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = self->priv->pixels_entry;
-#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
-#line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = self->priv->pixels_entry;
-#line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 1, 3);
-#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = (GtkSwitch*) gtk_switch_new ();
-#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp65_);
-#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->export_metadata);
-#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->export_metadata = _tmp65_;
-#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = self->priv->export_metadata;
-#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget));
-#line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = self->priv->export_metadata;
-#line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), 1, 4);
-#line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = self->priv->export_metadata;
-#line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_switch_set_active (_tmp68_, TRUE);
-#line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = self->priv->export_metadata;
-#line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = self->priv->table;
-#line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_row_spacing (_tmp70_, (guint) 6);
-#line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = self->priv->table;
-#line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_column_spacing (_tmp71_, (guint) 12);
-#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = self->priv->table;
-#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_container_get_type (), GtkContainer), (guint) 18);
-#line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = self->priv->table;
-#line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = _g_object_ref0 (_tmp75_);
-#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->ok_button);
-#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->ok_button = _tmp76_;
-#line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = self->priv->ok_button;
-#line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_can_default (_tmp77_, TRUE);
-#line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = self->priv->ok_button;
-#line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_set (_tmp78_, "has-default", TRUE, NULL);
-#line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = self->priv->ok_button;
-#line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp79_);
-#line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = export_dialog_current_constraint;
-#line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp80_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2796 "Dialogs.c"
-		GtkEntry* _tmp81_;
-		GtkComboBoxText* _tmp82_;
-#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp81_ = self->priv->pixels_entry;
-#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp82_ = self->priv->quality_combo;
-#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2807 "Dialogs.c"
-	}
-#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = self->priv->ok_button;
-#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp83_);
-#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (config);
-#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 2817 "Dialogs.c"
-}
-
-
-ExportDialog* export_dialog_new (const gchar* title) {
-#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2824 "Dialogs.c"
-}
-
-
-static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name) {
-	GeeArrayList* _tmp0_;
-	const gchar* _tmp1_;
-	GtkComboBoxText* _tmp2_;
-	const gchar* _tmp3_;
-#line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (format_name != NULL);
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->format_options;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = format_name;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->format_combo;
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = format_name;
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2849 "Dialogs.c"
-}
-
-
-static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) {
-	gint selection_ticker = 0;
-	const gchar* _tmp16_;
-#line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (text != NULL);
-#line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	selection_ticker = 0;
-#line 2862 "Dialogs.c"
-	{
-		GeeArrayList* _current_text_list = NULL;
-		GeeArrayList* _tmp0_;
-		GeeArrayList* _tmp1_;
-		gint _current_text_size = 0;
-		GeeArrayList* _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-		gint _current_text_index = 0;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = self->priv->format_options;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_current_text_list = _tmp1_;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = _current_text_list;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp3_;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_current_text_size = _tmp4_;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_current_text_index = -1;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		while (TRUE) {
-#line 2890 "Dialogs.c"
-			gint _tmp5_;
-			gint _tmp6_;
-			gint _tmp7_;
-			gchar* current_text = NULL;
-			GeeArrayList* _tmp8_;
-			gint _tmp9_;
-			gpointer _tmp10_;
-			const gchar* _tmp11_;
-			const gchar* _tmp12_;
-			gint _tmp15_;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp5_ = _current_text_index;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_current_text_index = _tmp5_ + 1;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp6_ = _current_text_index;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp7_ = _current_text_size;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (!(_tmp6_ < _tmp7_)) {
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				break;
-#line 2913 "Dialogs.c"
-			}
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = _current_text_list;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp9_ = _current_text_index;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_);
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			current_text = (gchar*) _tmp10_;
-#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp11_ = current_text;
-#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = text;
-#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 2929 "Dialogs.c"
-				GtkComboBoxText* _tmp13_;
-				gint _tmp14_;
-#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = self->priv->format_combo;
-#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp14_ = selection_ticker;
-#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), _tmp14_);
-#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (current_text);
-#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (_current_text_list);
-#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				return;
-#line 2944 "Dialogs.c"
-			}
-#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp15_ = selection_ticker;
-#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			selection_ticker = _tmp15_ + 1;
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (current_text);
-#line 2952 "Dialogs.c"
-		}
-#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_current_text_list);
-#line 2956 "Dialogs.c"
-	}
-#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = text;
-#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 2962 "Dialogs.c"
-}
-
-
-static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
-	PhotoFileFormat result = 0;
-	gint index = 0;
-	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	PhotoFileFormat* writeable_formats = NULL;
-	gint _tmp4_;
-	PhotoFileFormat* _tmp5_;
-	gint writeable_formats_length1;
-	gint _writeable_formats_size_;
-	gint _tmp6_;
-	PhotoFileFormat _tmp7_;
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0);
-#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->format_combo;
-#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	index = _tmp1_;
-#line 283 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = index;
-#line 283 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
-#line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 2994 "Dialogs.c"
-	}
-#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = index;
-#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	index = _tmp3_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = photo_file_format_get_writeable (&_tmp4_);
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	writeable_formats = _tmp5_;
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	writeable_formats_length1 = _tmp4_;
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_writeable_formats_size_ = writeable_formats_length1;
-#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = index;
-#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = writeable_formats[_tmp6_];
-#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp7_;
-#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	writeable_formats = (g_free (writeable_formats), NULL);
-#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 3018 "Dialogs.c"
-}
-
-
-static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params) {
-	gchar* result = NULL;
-	ExportFormatParameters _tmp0_;
-	ExportFormatMode _tmp1_;
-#line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_EXPORT_DIALOG (self), NULL);
-#line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (params != NULL, NULL);
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = *params;
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_.mode;
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	switch (_tmp1_) {
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3038 "Dialogs.c"
-		{
-			gchar* _tmp2_;
-#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp2_ = g_strdup (EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
-#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			result = _tmp2_;
-#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return result;
-#line 3047 "Dialogs.c"
-		}
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3051 "Dialogs.c"
-		{
-			gchar* _tmp3_;
-#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp3_ = g_strdup (EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
-#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			result = _tmp3_;
-#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return result;
-#line 3060 "Dialogs.c"
-		}
-#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3064 "Dialogs.c"
-		{
-			ExportFormatParameters _tmp4_;
-			PhotoFileFormat _tmp5_;
-			PhotoFileFormatProperties* _tmp6_;
-			PhotoFileFormatProperties* _tmp7_;
-			gchar* _tmp8_;
-			gchar* _tmp9_;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp4_ = *params;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp5_ = _tmp4_.specified_format;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp6_ = photo_file_format_get_properties (_tmp5_);
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp7_ = _tmp6_;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp9_ = _tmp8_;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_photo_file_format_properties_unref0 (_tmp7_);
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			result = _tmp9_;
-#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return result;
-#line 3090 "Dialogs.c"
-		}
-		default:
-		{
-#line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
-" mode");
-#line 3096 "Dialogs.c"
-		}
-	}
-}
-
-
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters) {
-	gint _vala_scale = 0;
-	ScaleConstraint _vala_constraint = 0;
-	gboolean result = FALSE;
-	ExportFormatParameters _tmp0_;
-	ExportFormatMode _tmp1_;
-	ExportFormatParameters _tmp4_;
-	ExportFormatMode _tmp5_;
-	ExportFormatParameters _tmp14_;
-	gchar* _tmp15_;
-	gchar* _tmp16_;
-	gboolean ok = FALSE;
-	gint _tmp17_;
-	gboolean _tmp18_;
-#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE);
-#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (parameters != NULL, FALSE);
-#line 312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = *parameters;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_.mode;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3128 "Dialogs.c"
-		ScaleConstraint _tmp2_;
-		GtkComboBoxText* _tmp3_;
-#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = _vala_constraint;
-#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_dialog_current_constraint = _tmp2_;
-#line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = self->priv->constraint_combo;
-#line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3141 "Dialogs.c"
-	}
-#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = *parameters;
-#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_.mode;
-#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3149 "Dialogs.c"
-		ExportFormatParameters _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = export_dialog_current_parameters;
-#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*parameters = _tmp6_;
-#line 3155 "Dialogs.c"
-	} else {
-		gboolean _tmp7_ = FALSE;
-		ExportFormatParameters _tmp8_;
-		ExportFormatMode _tmp9_;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = *parameters;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = _tmp8_.mode;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3166 "Dialogs.c"
-			ExportFormatParameters _tmp10_;
-			PhotoFileFormat _tmp11_;
-			gboolean _tmp12_;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp10_ = *parameters;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp11_ = _tmp10_.specified_format;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = photo_file_format_can_write (_tmp11_);
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp7_ = !_tmp12_;
-#line 3178 "Dialogs.c"
-		} else {
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp7_ = FALSE;
-#line 3182 "Dialogs.c"
-		}
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp7_) {
-#line 3186 "Dialogs.c"
-			PhotoFileFormat _tmp13_;
-#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp13_ = photo_file_format_get_system_default_format ();
-#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			(*parameters).specified_format = _tmp13_;
-#line 3192 "Dialogs.c"
-		}
-	}
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = *parameters;
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = export_dialog_get_label_for_parameters (self, &_tmp14_);
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = _tmp15_;
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_format_set_active_text (self, _tmp16_);
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp16_);
-#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_on_format_changed (self);
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	ok = _tmp17_ == ((gint) GTK_RESPONSE_OK);
-#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = ok;
-#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp18_) {
-#line 3215 "Dialogs.c"
-		gint index = 0;
-		GtkComboBoxText* _tmp19_;
-		gint _tmp20_;
-		gint _tmp21_;
-		gint _tmp22_;
-		ScaleConstraint _tmp23_;
-		ScaleConstraint _tmp24_;
-		GtkEntry* _tmp25_;
-		const gchar* _tmp26_;
-		gint _tmp27_;
-		ScaleConstraint _tmp28_;
-		gint _tmp30_;
-		gboolean _tmp31_ = FALSE;
-		GtkSwitch* _tmp32_;
-		gboolean _tmp33_;
-		gboolean _tmp34_;
-		GtkComboBoxText* _tmp38_;
-		gchar* _tmp39_;
-		gchar* _tmp40_;
-		gboolean _tmp41_;
-		ConfigFacade* config = NULL;
-		ConfigFacade* _tmp57_;
-		ConfigFacade* _tmp58_;
-		ExportFormatParameters _tmp59_;
-		ExportFormatMode _tmp60_;
-		ConfigFacade* _tmp61_;
-		ExportFormatParameters _tmp62_;
-		PhotoFileFormat _tmp63_;
-		ConfigFacade* _tmp64_;
-		ExportFormatParameters _tmp65_;
-		JpegQuality _tmp66_;
-		ConfigFacade* _tmp67_;
-		ExportFormatParameters _tmp68_;
-		gboolean _tmp69_;
-		ConfigFacade* _tmp70_;
-		ScaleConstraint _tmp71_;
-		ConfigFacade* _tmp72_;
-		gint _tmp73_;
-#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = self->priv->constraint_combo;
-#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox));
-#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		index = _tmp20_;
-#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = index;
-#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_assert (_tmp21_ >= 0, "index >= 0");
-#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = index;
-#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp22_];
-#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_constraint = _tmp23_;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = _vala_constraint;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_dialog_current_constraint = _tmp24_;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = self->priv->pixels_entry;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = gtk_entry_get_text (_tmp25_);
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = atoi (_tmp26_);
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_scale = _tmp27_;
-#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = _vala_constraint;
-#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3286 "Dialogs.c"
-			gint _tmp29_;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp29_ = _vala_scale;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3292 "Dialogs.c"
-		}
-#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = _vala_scale;
-#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_dialog_current_scale = _tmp30_;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = self->priv->export_metadata;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = _tmp33_;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp34_) {
-#line 3306 "Dialogs.c"
-			GtkSwitch* _tmp35_;
-			gboolean _tmp36_;
-			gboolean _tmp37_;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp35_ = self->priv->export_metadata;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp36_ = gtk_switch_get_active (_tmp35_);
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp37_ = _tmp36_;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp31_ = _tmp37_;
-#line 3318 "Dialogs.c"
-		} else {
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp31_ = FALSE;
-#line 3322 "Dialogs.c"
-		}
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		(*parameters).export_metadata = _tmp31_;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = self->priv->format_combo;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_);
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp40_ = _tmp39_;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp40_);
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp41_) {
-#line 3338 "Dialogs.c"
-			ExportFormatMode _tmp42_;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp42_ = export_dialog_current_parameters.mode;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			(*parameters).mode = _tmp42_;
-#line 3346 "Dialogs.c"
-		} else {
-			GtkComboBoxText* _tmp43_;
-			gchar* _tmp44_;
-			gchar* _tmp45_;
-			gboolean _tmp46_;
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp43_ = self->priv->format_combo;
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp44_ = gtk_combo_box_text_get_active_text (_tmp43_);
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp45_ = _tmp44_;
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp46_ = g_strcmp0 (_tmp45_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (_tmp45_);
-#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (_tmp46_) {
-#line 3364 "Dialogs.c"
-				ExportFormatMode _tmp47_;
-#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
-#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp47_ = export_dialog_current_parameters.mode;
-#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				(*parameters).mode = _tmp47_;
-#line 3372 "Dialogs.c"
-			} else {
-				ExportFormatMode _tmp48_;
-				PhotoFileFormat _tmp49_;
-				PhotoFileFormat _tmp50_;
-				ExportFormatParameters _tmp51_;
-				PhotoFileFormat _tmp52_;
-#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED;
-#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp48_ = export_dialog_current_parameters.mode;
-#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				(*parameters).mode = _tmp48_;
-#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp49_ = export_dialog_get_specified_format (self);
-#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				export_dialog_current_parameters.specified_format = _tmp49_;
-#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp50_ = export_dialog_current_parameters.specified_format;
-#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				(*parameters).specified_format = _tmp50_;
-#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp51_ = export_dialog_current_parameters;
-#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp52_ = _tmp51_.specified_format;
-#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3399 "Dialogs.c"
-					GtkComboBoxText* _tmp53_;
-					gint _tmp54_;
-					JpegQuality _tmp55_;
-					JpegQuality _tmp56_;
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp53_ = self->priv->quality_combo;
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp54_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox));
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp55_ = EXPORT_DIALOG_QUALITY_ARRAY[_tmp54_];
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					export_dialog_current_parameters.quality = _tmp55_;
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp56_ = export_dialog_current_parameters.quality;
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					(*parameters).quality = _tmp56_;
-#line 3416 "Dialogs.c"
-				}
-			}
-		}
-#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = config_facade_get_instance ();
-#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		config = _tmp57_;
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp58_ = config;
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp59_ = export_dialog_current_parameters;
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp60_ = _tmp59_.mode;
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp60_);
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp61_ = config;
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp62_ = export_dialog_current_parameters;
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp63_ = _tmp62_.specified_format;
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp63_);
-#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = config;
-#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp65_ = export_dialog_current_parameters;
-#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = _tmp65_.quality;
-#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_);
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp67_ = config;
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp68_ = export_dialog_current_parameters;
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = _tmp68_.export_metadata;
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp69_);
-#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = config;
-#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = export_dialog_current_constraint;
-#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp71_);
-#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = config;
-#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp73_ = export_dialog_current_scale;
-#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
-#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (config);
-#line 3470 "Dialogs.c"
-	} else {
-#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_scale = 0;
-#line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3476 "Dialogs.c"
-	}
-#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = ok;
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (scale) {
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*scale = _vala_scale;
-#line 3486 "Dialogs.c"
-	}
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (constraint) {
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*constraint = _vala_constraint;
-#line 3492 "Dialogs.c"
-	}
-#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 3496 "Dialogs.c"
-}
-
-
-static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) {
-	GtkLabel* new_label = NULL;
-	const gchar* _tmp0_;
-	GtkLabel* _tmp1_;
-	GtkLabel* _tmp2_;
-	GtkLabel* _tmp3_;
-	GtkLabel* _tmp4_;
-	GtkWidget* _tmp5_;
-	GtkGrid* _tmp8_;
-	GtkLabel* _tmp9_;
-	gint _tmp10_;
-	gint _tmp11_;
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (text != NULL);
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail ((widget == NULL) || GTK_IS_WIDGET (widget));
-#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = text;
-#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp1_);
-#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	new_label = _tmp1_;
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = new_label;
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
-#line 375 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = new_label;
-#line 375 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = new_label;
-#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_use_underline (_tmp4_, TRUE);
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = widget;
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_ != NULL) {
-#line 3542 "Dialogs.c"
-		GtkLabel* _tmp6_;
-		GtkWidget* _tmp7_;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = new_label;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = widget;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 3551 "Dialogs.c"
-	}
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->priv->table;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = new_label;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = x;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = y;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (new_label);
-#line 3565 "Dialogs.c"
-}
-
-
-static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) {
-	GtkWidget* _tmp0_;
-	GtkWidget* _tmp1_;
-	GtkWidget* _tmp2_;
-	GtkWidget* _tmp3_;
-	GtkGrid* _tmp4_;
-	GtkWidget* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = widget;
-#line 385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (_tmp0_, GTK_ALIGN_FILL);
-#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = widget;
-#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (_tmp1_, GTK_ALIGN_CENTER);
-#line 387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = widget;
-#line 387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_hexpand (_tmp2_, TRUE);
-#line 388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = widget;
-#line 388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_vexpand (_tmp3_, TRUE);
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->priv->table;
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = widget;
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = x;
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = y;
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 3608 "Dialogs.c"
-}
-
-
-static void export_dialog_on_constraint_changed (ExportDialog* self) {
-	gboolean original = FALSE;
-	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
-	ScaleConstraint _tmp2_;
-	gboolean jpeg = FALSE;
-	GtkComboBoxText* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	PhotoFileFormatProperties* _tmp6_;
-	PhotoFileFormatProperties* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	gboolean _tmp10_;
-	GtkEntry* _tmp11_;
-	gboolean _tmp12_;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_;
-	GtkComboBoxText* _tmp16_;
-	gboolean _tmp17_;
-#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->constraint_combo;
-#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
-#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->format_combo;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = g_strcmp0 (_tmp5_, _tmp9_) == 0;
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp9_);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_photo_file_format_properties_unref0 (_tmp7_);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp5_);
-#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	jpeg = _tmp10_;
-#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->pixels_entry;
-#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = original;
-#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), !_tmp12_);
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = original;
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp14_) {
-#line 3676 "Dialogs.c"
-		gboolean _tmp15_;
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = jpeg;
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = _tmp15_;
-#line 3682 "Dialogs.c"
-	} else {
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = FALSE;
-#line 3686 "Dialogs.c"
-	}
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->quality_combo;
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp13_);
-#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = original;
-#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp17_) {
-#line 3696 "Dialogs.c"
-		GtkWidget* _tmp18_;
-#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = self->priv->ok_button;
-#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3702 "Dialogs.c"
-	} else {
-#line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		export_dialog_on_pixels_changed (self);
-#line 3706 "Dialogs.c"
-	}
-}
-
-
-static void export_dialog_on_format_changed (ExportDialog* self) {
-	gboolean original = FALSE;
-	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
-	ScaleConstraint _tmp2_;
-	GtkComboBoxText* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	gboolean _tmp6_;
-#line 405 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->constraint_combo;
-#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
-#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->format_combo;
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_strcmp0 (_tmp5_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp5_);
-#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp6_) {
-#line 3742 "Dialogs.c"
-		GtkComboBoxText* _tmp7_;
-		GtkComboBoxText* _tmp8_;
-		GtkComboBoxText* _tmp9_;
-		GtkEntry* _tmp10_;
-		GtkSwitch* _tmp11_;
-		GtkSwitch* _tmp12_;
-#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = self->priv->constraint_combo;
-#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->priv->constraint_combo;
-#line 414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->quality_combo;
-#line 415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->pixels_entry;
-#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 417 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = self->priv->export_metadata;
-#line 417 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_switch_set_active (_tmp11_, FALSE);
-#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = self->priv->export_metadata;
-#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3773 "Dialogs.c"
-	} else {
-		GtkComboBoxText* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-		gboolean _tmp16_;
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->format_combo;
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = gtk_combo_box_text_get_active_text (_tmp13_);
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _tmp14_;
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = g_strcmp0 (_tmp15_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp15_);
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp16_) {
-#line 3791 "Dialogs.c"
-			GtkComboBoxText* _tmp17_;
-			GtkComboBoxText* _tmp18_;
-			GtkEntry* _tmp19_;
-			gboolean _tmp20_;
-			GtkSwitch* _tmp21_;
-#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp17_ = self->priv->constraint_combo;
-#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 427 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = self->priv->quality_combo;
-#line 427 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp19_ = self->priv->pixels_entry;
-#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = original;
-#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), !_tmp20_);
-#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp21_ = self->priv->export_metadata;
-#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3815 "Dialogs.c"
-		} else {
-			GtkComboBoxText* _tmp22_;
-			gboolean jpeg = FALSE;
-			PhotoFileFormat _tmp23_;
-			gboolean _tmp24_ = FALSE;
-			gboolean _tmp25_;
-			GtkComboBoxText* _tmp27_;
-			GtkSwitch* _tmp28_;
-#line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = self->priv->constraint_combo;
-#line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = export_dialog_get_specified_format (self);
-#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			jpeg = _tmp23_ == PHOTO_FILE_FORMAT_JFIF;
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp25_ = original;
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (!_tmp25_) {
-#line 3836 "Dialogs.c"
-				gboolean _tmp26_;
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp26_ = jpeg;
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = _tmp26_;
-#line 3842 "Dialogs.c"
-			} else {
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = FALSE;
-#line 3846 "Dialogs.c"
-			}
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp27_ = self->priv->quality_combo;
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp24_);
-#line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp28_ = self->priv->export_metadata;
-#line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3856 "Dialogs.c"
-		}
-	}
-}
-
-
-static void export_dialog_on_activate (ExportDialog* self) {
-#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3867 "Dialogs.c"
-}
-
-
-static void export_dialog_on_pixels_changed (ExportDialog* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_;
-	guint16 _tmp2_;
-	GtkWidget* _tmp6_;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->pixels_entry;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (((gint) _tmp2_) > 0) {
-#line 3884 "Dialogs.c"
-		GtkEntry* _tmp3_;
-		const gchar* _tmp4_;
-		gint _tmp5_;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = self->priv->pixels_entry;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = gtk_entry_get_text (_tmp3_);
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = atoi (_tmp4_);
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp5_ > 0;
-#line 3896 "Dialogs.c"
-	} else {
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = FALSE;
-#line 3900 "Dialogs.c"
-	}
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->ok_button;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 3906 "Dialogs.c"
-}
-
-
-static gchar string_get (const gchar* self, glong index) {
-	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 3924 "Dialogs.c"
-}
-
-
-static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position) {
-	gboolean _tmp0_;
-	gint _tmp1_;
-	gchar* new_text = NULL;
-	gchar* _tmp5_;
-	const gchar* _tmp21_;
-	gint _tmp22_;
-	gint _tmp23_;
-	GtkEntry* _tmp29_;
-#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (text != NULL);
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->in_insert;
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return;
-#line 3947 "Dialogs.c"
-	}
-#line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->in_insert = TRUE;
-#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = length;
-#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_ == -1) {
-#line 3955 "Dialogs.c"
-		const gchar* _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = text;
-#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = strlen (_tmp2_);
-#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp3_;
-#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		length = (gint) _tmp4_;
-#line 3967 "Dialogs.c"
-	}
-#line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = g_strdup ("");
-#line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	new_text = _tmp5_;
-#line 3973 "Dialogs.c"
-	{
-		gint ctr = 0;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		ctr = 0;
-#line 3978 "Dialogs.c"
-		{
-			gboolean _tmp6_ = FALSE;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp6_ = TRUE;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			while (TRUE) {
-#line 3985 "Dialogs.c"
-				gint _tmp8_;
-				gint _tmp9_;
-				const gchar* _tmp10_;
-				gint _tmp11_;
-				gchar _tmp12_;
-				gboolean _tmp13_;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!_tmp6_) {
-#line 3994 "Dialogs.c"
-					gint _tmp7_;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp7_ = ctr;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					ctr = _tmp7_ + 1;
-#line 4000 "Dialogs.c"
-				}
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp6_ = FALSE;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp8_ = ctr;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp9_ = length;
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp8_ < _tmp9_)) {
-#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					break;
-#line 4012 "Dialogs.c"
-				}
-#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp10_ = text;
-#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp11_ = ctr;
-#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp13_) {
-#line 4024 "Dialogs.c"
-					const gchar* _tmp14_;
-					const gchar* _tmp15_;
-					gint _tmp16_;
-					gchar _tmp17_;
-					gchar* _tmp18_;
-					gchar* _tmp19_;
-					gchar* _tmp20_;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp14_ = new_text;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp15_ = text;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp16_ = ctr;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp19_ = _tmp18_;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_g_free0 (new_text);
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					new_text = _tmp20_;
-#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_g_free0 (_tmp19_);
-#line 4052 "Dialogs.c"
-				}
-			}
-		}
-	}
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = new_text;
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = strlen (_tmp21_);
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = _tmp22_;
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp23_ > 0) {
-#line 4065 "Dialogs.c"
-		GtkEntry* _tmp24_;
-		const gchar* _tmp25_;
-		const gchar* _tmp26_;
-		gint _tmp27_;
-		gint _tmp28_;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = self->priv->pixels_entry;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = new_text;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = new_text;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = strlen (_tmp26_);
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = _tmp27_;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4083 "Dialogs.c"
-	}
-#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = self->priv->pixels_entry;
-#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->in_insert = FALSE;
-#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (new_text);
-#line 4093 "Dialogs.c"
-}
-
-
-static void export_dialog_class_init (ExportDialogClass * klass) {
-	ExportFormatParameters _tmp0_ = {0};
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (ExportDialogPrivate));
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = export_dialog_finalize;
-#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_format_parameters_current (&_tmp0_);
-#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_parameters = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4111 "Dialogs.c"
-}
-
-
-static void export_dialog_instance_init (ExportDialog * self) {
-	GtkGrid* _tmp0_;
-	GeeArrayList* _tmp1_;
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = EXPORT_DIALOG_GET_PRIVATE (self);
-#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = (GtkGrid*) gtk_grid_new ();
-#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->table = _tmp0_;
-#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->format_options = _tmp1_;
-#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->in_insert = FALSE;
-#line 4132 "Dialogs.c"
-}
-
-
-static void export_dialog_finalize (GObject * obj) {
-	ExportDialog * self;
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog);
-#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->table);
-#line 158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->quality_combo);
-#line 159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->constraint_combo);
-#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->format_combo);
-#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->export_metadata);
-#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->format_options);
-#line 163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->pixels_entry);
-#line 164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->ok_button);
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4158 "Dialogs.c"
-}
-
-
-GType export_dialog_get_type (void) {
-	static volatile gsize export_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&export_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (ExportDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) export_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExportDialog), 0, (GInstanceInitFunc) export_dialog_instance_init, NULL };
-		GType export_dialog_type_id;
-		export_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "ExportDialog", &g_define_type_info, 0);
-		g_once_init_leave (&export_dialog_type_id__volatile, export_dialog_type_id);
-	}
-	return export_dialog_type_id__volatile;
+#line 1471 "Dialogs.c"
 }
 
 
@@ -4186,39 +1486,39 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	gint _tmp29_;
 	gint _tmp30_;
 	gint _tmp31_;
-#line 482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_LIST (failed), NULL);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = failed;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 145 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 145 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4200 "Dialogs.c"
+#line 1501 "Dialogs.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
-#line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4206 "Dialogs.c"
+#line 1507 "Dialogs.c"
 	{
 		gint ctr = 0;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4211 "Dialogs.c"
+#line 1512 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4218 "Dialogs.c"
+#line 1519 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
 				gint _tmp7_;
 				const gchar* _tmp12_ = NULL;
@@ -4227,155 +1527,155 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				gchar* _tmp25_;
 				gchar* _tmp26_;
 				gchar* _tmp27_;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4229 "Dialogs.c"
+#line 1530 "Dialogs.c"
 					gint _tmp5_;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4235 "Dialogs.c"
+#line 1536 "Dialogs.c"
 				}
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp7_ = ctr;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4243 "Dialogs.c"
+#line 1544 "Dialogs.c"
 					gint _tmp8_;
 					GeeList* _tmp9_;
 					gint _tmp10_;
 					gint _tmp11_;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = ctr;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = failed;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp11_ = _tmp10_;
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4258 "Dialogs.c"
+#line 1559 "Dialogs.c"
 				} else {
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4262 "Dialogs.c"
+#line 1563 "Dialogs.c"
 				}
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4268 "Dialogs.c"
+#line 1569 "Dialogs.c"
 				}
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4274 "Dialogs.c"
+#line 1575 "Dialogs.c"
 					GeeList* _tmp14_;
 					gint _tmp15_;
 					gpointer _tmp16_;
 					BatchImportResult* _tmp17_;
 					const gchar* _tmp18_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = failed;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = ctr;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = (BatchImportResult*) _tmp16_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _tmp17_->dest_identifier;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp12_ = _tmp18_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4294 "Dialogs.c"
+#line 1595 "Dialogs.c"
 				} else {
 					GeeList* _tmp19_;
 					gint _tmp20_;
 					gpointer _tmp21_;
 					BatchImportResult* _tmp22_;
 					const gchar* _tmp23_;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = failed;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = ctr;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp21_ = gee_list_get (_tmp19_, _tmp20_);
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp22_ = (BatchImportResult*) _tmp21_;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp23_ = _tmp22_->src_identifier;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp12_ = _tmp23_;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4315 "Dialogs.c"
+#line 1616 "Dialogs.c"
 				}
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp25_ = g_strdup_printf ("%s\n", _tmp12_);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = _tmp25_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = g_strconcat (_tmp24_, _tmp26_, NULL);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (list);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				list = _tmp27_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4331 "Dialogs.c"
+#line 1632 "Dialogs.c"
 			}
 		}
 	}
-#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = failed;
-#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _tmp29_;
-#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remaining = _tmp30_ - IMPORT_UI_REPORT_FAILURE_COUNT;
-#line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = remaining;
-#line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4347 "Dialogs.c"
+#line 1648 "Dialogs.c"
 		const gchar* _tmp32_;
 		gint _tmp33_;
 		gchar* _tmp34_;
 		gchar* _tmp35_;
 		gchar* _tmp36_;
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = list;
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = remaining;
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = g_strdup_printf (_ ("(and %d more)\n"), _tmp33_);
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = _tmp34_;
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = g_strconcat (_tmp32_, _tmp35_, NULL);
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (list);
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		list = _tmp36_;
-#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp35_);
-#line 4369 "Dialogs.c"
+#line 1670 "Dialogs.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4375 "Dialogs.c"
+#line 1676 "Dialogs.c"
 }
 
 
@@ -4387,260 +1687,260 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	gchar* _tmp3_;
 	const gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (question != NULL, NULL);
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (yes_button != NULL, NULL);
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (no_button != NULL, NULL);
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ImportUIQuestionParams*) g_type_create_instance (object_type);
-#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = question;
-#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->question);
-#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->question = _tmp1_;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = yes_button;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->yes_button);
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->yes_button = _tmp3_;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = no_button;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->no_button = _tmp5_;
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4421 "Dialogs.c"
+#line 1722 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
-#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4428 "Dialogs.c"
+#line 1729 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4435 "Dialogs.c"
+#line 1736 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_free_value (GValue* value) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4444 "Dialogs.c"
+#line 1745 "Dialogs.c"
 	}
 }
 
 
 static void import_ui_value_question_params_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4454 "Dialogs.c"
+#line 1755 "Dialogs.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4458 "Dialogs.c"
+#line 1759 "Dialogs.c"
 	}
 }
 
 
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4466 "Dialogs.c"
+#line 1767 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4473 "Dialogs.c"
+#line 1774 "Dialogs.c"
 		ImportUIQuestionParams * object;
 		object = collect_values[0].v_pointer;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4480 "Dialogs.c"
+#line 1781 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4484 "Dialogs.c"
+#line 1785 "Dialogs.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4488 "Dialogs.c"
+#line 1789 "Dialogs.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4492 "Dialogs.c"
+#line 1793 "Dialogs.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4496 "Dialogs.c"
+#line 1797 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ImportUIQuestionParams ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4507 "Dialogs.c"
+#line 1808 "Dialogs.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4513 "Dialogs.c"
+#line 1814 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4517 "Dialogs.c"
+#line 1818 "Dialogs.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4521 "Dialogs.c"
+#line 1822 "Dialogs.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4525 "Dialogs.c"
+#line 1826 "Dialogs.c"
 }
 
 
 GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ImportUIParamSpecQuestionParams* spec;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4539 "Dialogs.c"
+#line 1840 "Dialogs.c"
 }
 
 
 gpointer import_ui_value_get_question_params (const GValue* value) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4548 "Dialogs.c"
+#line 1849 "Dialogs.c"
 }
 
 
 void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 	ImportUIQuestionParams * old;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4568 "Dialogs.c"
+#line 1869 "Dialogs.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4572 "Dialogs.c"
+#line 1873 "Dialogs.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4578 "Dialogs.c"
+#line 1879 "Dialogs.c"
 	}
 }
 
 
 void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 	ImportUIQuestionParams * old;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4597 "Dialogs.c"
+#line 1898 "Dialogs.c"
 	} else {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4601 "Dialogs.c"
+#line 1902 "Dialogs.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4607 "Dialogs.c"
+#line 1908 "Dialogs.c"
 	}
 }
 
 
 static void import_ui_question_params_class_init (ImportUIQuestionParamsClass * klass) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4617 "Dialogs.c"
+#line 1918 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4624 "Dialogs.c"
+#line 1925 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_finalize (ImportUIQuestionParams * obj) {
 	ImportUIQuestionParams * self;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_UI_TYPE_QUESTION_PARAMS, ImportUIQuestionParams);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->question);
-#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->yes_button);
-#line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4640 "Dialogs.c"
+#line 1941 "Dialogs.c"
 }
 
 
@@ -4661,46 +1961,46 @@ GType import_ui_question_params_get_type (void) {
 gpointer import_ui_question_params_ref (gpointer instance) {
 	ImportUIQuestionParams * self;
 	self = instance;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4665 "Dialogs.c"
+#line 1966 "Dialogs.c"
 }
 
 
 void import_ui_question_params_unref (gpointer instance) {
 	ImportUIQuestionParams * self;
 	self = instance;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4678 "Dialogs.c"
+#line 1979 "Dialogs.c"
 	}
 }
 
 
 gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
-#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 172 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4687 "Dialogs.c"
+#line 1988 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_result_it = _tmp1_;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4700 "Dialogs.c"
+#line 2001 "Dialogs.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			BatchImportResult* current_result = NULL;
@@ -4709,92 +2009,92 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			gboolean _tmp6_ = FALSE;
 			BatchImportResult* _tmp7_;
 			GFile* _tmp8_;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4717 "Dialogs.c"
+#line 2018 "Dialogs.c"
 			}
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			current_result = (BatchImportResult*) _tmp5_;
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = current_result;
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp7_->file;
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4731 "Dialogs.c"
+#line 2032 "Dialogs.c"
 				BatchImportResult* _tmp9_;
 				GFile* _tmp10_;
 				PhotoFileFormat _tmp11_;
-#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
-#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _tmp9_->file;
-#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
-#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4743 "Dialogs.c"
+#line 2044 "Dialogs.c"
 			} else {
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4747 "Dialogs.c"
+#line 2048 "Dialogs.c"
 			}
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = TRUE;
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (current_result);
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_current_result_it);
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4759 "Dialogs.c"
+#line 2060 "Dialogs.c"
 			}
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4763 "Dialogs.c"
+#line 2064 "Dialogs.c"
 		}
-#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4767 "Dialogs.c"
+#line 2068 "Dialogs.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4773 "Dialogs.c"
+#line 2074 "Dialogs.c"
 }
 
 
 gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4781 "Dialogs.c"
+#line 2082 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_result_it = _tmp1_;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4794 "Dialogs.c"
+#line 2095 "Dialogs.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			BatchImportResult* current_result = NULL;
@@ -4803,71 +2103,71 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			gboolean _tmp6_ = FALSE;
 			BatchImportResult* _tmp7_;
 			GFile* _tmp8_;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4811 "Dialogs.c"
+#line 2112 "Dialogs.c"
 			}
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			current_result = (BatchImportResult*) _tmp5_;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = current_result;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp7_->file;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4825 "Dialogs.c"
+#line 2126 "Dialogs.c"
 				BatchImportResult* _tmp9_;
 				GFile* _tmp10_;
 				gboolean _tmp11_;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _tmp9_->file;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4837 "Dialogs.c"
+#line 2138 "Dialogs.c"
 			} else {
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4841 "Dialogs.c"
+#line 2142 "Dialogs.c"
 			}
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
-#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = TRUE;
-#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (current_result);
-#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_current_result_it);
-#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4853 "Dialogs.c"
+#line 2154 "Dialogs.c"
 			}
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4857 "Dialogs.c"
+#line 2158 "Dialogs.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4861 "Dialogs.c"
+#line 2162 "Dialogs.c"
 	}
-#line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4867 "Dialogs.c"
+#line 2168 "Dialogs.c"
 }
 
 
@@ -4881,106 +2181,106 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	gboolean _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_;
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), NULL);
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (photos_msg != NULL, NULL);
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (videos_msg != NULL, NULL);
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (both_msg != NULL, NULL);
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (neither_msg != NULL, NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = import_collection;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = import_ui_import_has_photos (_tmp0_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	has_photos = _tmp1_;
-#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = import_collection;
-#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = import_ui_import_has_videos (_tmp2_);
-#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	has_videos = _tmp3_;
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = has_photos;
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 4907 "Dialogs.c"
+#line 2208 "Dialogs.c"
 		gboolean _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 4913 "Dialogs.c"
+#line 2214 "Dialogs.c"
 	} else {
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 4917 "Dialogs.c"
+#line 2218 "Dialogs.c"
 	}
-#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 4921 "Dialogs.c"
+#line 2222 "Dialogs.c"
 		const gchar* _tmp7_;
 		gchar* _tmp8_;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = both_msg;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = g_strdup (_tmp7_);
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp8_;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4932 "Dialogs.c"
+#line 2233 "Dialogs.c"
 	} else {
 		gboolean _tmp9_;
-#line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
-#line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 4939 "Dialogs.c"
+#line 2240 "Dialogs.c"
 			const gchar* _tmp10_;
 			gchar* _tmp11_;
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = photos_msg;
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp11_;
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 4950 "Dialogs.c"
+#line 2251 "Dialogs.c"
 		} else {
 			gboolean _tmp12_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 4957 "Dialogs.c"
+#line 2258 "Dialogs.c"
 				const gchar* _tmp13_;
 				gchar* _tmp14_;
-#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = videos_msg;
-#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = g_strdup (_tmp13_);
-#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = _tmp14_;
-#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4968 "Dialogs.c"
+#line 2269 "Dialogs.c"
 			} else {
 				const gchar* _tmp15_;
 				gchar* _tmp16_;
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = neither_msg;
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = _tmp16_;
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4980 "Dialogs.c"
+#line 2281 "Dialogs.c"
 			}
 		}
 	}
@@ -5068,157 +2368,157 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	GString* _tmp290_;
 	const gchar* _tmp291_;
 	gchar* _tmp292_;
-#line 544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), NULL);
-#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_string_new ("");
-#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_ ("Import Results Report"), " (Shotwell ", NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strconcat (_tmp2_, RESOURCES_APP_VERSION, NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strconcat (_tmp4_, " @ ", NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_get_current_time (&_tmp7_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_time_val_to_iso8601 (&_tmp7_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = g_strconcat (_tmp6_, _tmp9_, NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strconcat (_tmp11_, ")\n\n", NULL);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp6_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header = _tmp13_;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = builder;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = header;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_string_append (_tmp14_, _tmp15_);
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = manifest;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _tmp16_->all;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _tmp18_;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = manifest;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = _tmp20_->all;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = _tmp22_;
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = g_strdup_printf (ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp19_), _tmp23_);
-#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp24_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = subhead;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = g_strconcat (_tmp25_, " ", NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp26_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = subhead;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = manifest;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = _tmp28_->success;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = manifest;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = _tmp32_->success;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = g_strdup_printf (ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp31_), _tmp35_);
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = _tmp36_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = g_strconcat (_tmp27_, _tmp37_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp38_;
-#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp37_);
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = subhead;
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = g_strconcat (_tmp39_, "\n\n", NULL);
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp40_;
-#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = builder;
-#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = subhead;
-#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_string_append (_tmp41_, _tmp42_);
-#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = g_strdup ("");
-#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_file_summary = _tmp43_;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = manifest;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = _tmp44_->already_imported;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp47_ > 0) {
-#line 5204 "Dialogs.c"
+#line 2505 "Dialogs.c"
 		GString* _tmp48_;
 		gchar* _tmp49_;
 		gchar* _tmp50_;
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = builder;
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp49_ = g_strconcat (_ ("Duplicate Photos/Videos Not Imported:"), "\n\n", NULL);
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = _tmp49_;
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp48_, _tmp50_);
-#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp50_);
-#line 5218 "Dialogs.c"
+#line 2519 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp51_;
@@ -5229,27 +2529,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp55_;
 			gint _tmp56_;
 			gint _result_index = 0;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp51_ = manifest;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp52_ = _tmp51_->already_imported;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp53_ = _g_object_ref0 (_tmp52_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp53_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp54_ = _result_list;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = _tmp55_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp56_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5249 "Dialogs.c"
+#line 2550 "Dialogs.c"
 				gint _tmp57_;
 				gint _tmp58_;
 				gint _tmp59_;
@@ -5276,118 +2576,118 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp79_;
 				GString* _tmp80_;
 				const gchar* _tmp81_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp57_ = _result_index;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp57_ + 1;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp58_ = _result_index;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp59_ = _result_size;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp58_ < _tmp59_)) {
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5288 "Dialogs.c"
+#line 2589 "Dialogs.c"
 				}
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp60_ = _result_list;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp61_ = _result_index;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp62_ = gee_list_get (_tmp60_, _tmp61_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp62_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp63_ = _result_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _tmp63_->src_identifier;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = g_strconcat (_tmp64_, " ", NULL);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = _tmp65_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp67_ = g_strconcat (_tmp66_, _ ("duplicates existing media item"), NULL);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp68_ = _tmp67_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp69_ = g_strconcat (_tmp68_, "\n\t", NULL);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp70_ = _tmp69_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp71_ = _result_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp72_ = _tmp71_->duplicate_of;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp73_ = duplicated_file_get_file (_tmp72_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp74_ = _tmp73_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp75_ = g_file_get_path (_tmp74_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp76_ = _tmp75_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp77_ = g_strconcat (_tmp70_, _tmp76_, NULL);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp78_ = _tmp77_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp79_ = g_strconcat (_tmp78_, "\n\n", NULL);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp79_;
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp78_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp76_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp74_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp70_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp68_);
-#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp66_);
-#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp80_ = builder;
-#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp81_ = current_file_summary;
-#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp80_, _tmp81_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5356 "Dialogs.c"
+#line 2657 "Dialogs.c"
 			}
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5360 "Dialogs.c"
+#line 2661 "Dialogs.c"
 		}
 	}
-#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = manifest;
-#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = _tmp82_->camera_failed;
-#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = _tmp84_;
-#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp85_ > 0) {
-#line 5373 "Dialogs.c"
+#line 2674 "Dialogs.c"
 		GString* _tmp86_;
 		gchar* _tmp87_;
 		gchar* _tmp88_;
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = builder;
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = g_strconcat (_ ("Photos/Videos Not Imported Due to Camera Errors:"), "\n\n", NULL);
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = _tmp87_;
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp86_, _tmp88_);
-#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp88_);
-#line 5387 "Dialogs.c"
+#line 2688 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp89_;
@@ -5398,27 +2698,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp93_;
 			gint _tmp94_;
 			gint _result_index = 0;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp89_ = manifest;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp90_ = _tmp89_->camera_failed;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp91_ = _g_object_ref0 (_tmp90_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp91_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp92_ = _result_list;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp93_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = _tmp93_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp94_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5418 "Dialogs.c"
+#line 2719 "Dialogs.c"
 				gint _tmp95_;
 				gint _tmp96_;
 				gint _tmp97_;
@@ -5441,107 +2741,107 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp113_;
 				GString* _tmp114_;
 				const gchar* _tmp115_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp95_ = _result_index;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp95_ + 1;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp96_ = _result_index;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp97_ = _result_size;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp96_ < _tmp97_)) {
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5453 "Dialogs.c"
+#line 2754 "Dialogs.c"
 				}
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp98_ = _result_list;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp99_ = _result_index;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp100_ = gee_list_get (_tmp98_, _tmp99_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp100_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp101_ = _result_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp102_ = _tmp101_->src_identifier;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp103_ = g_strconcat (_tmp102_, "\n\t", NULL);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp104_ = _tmp103_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp105_ = g_strconcat (_tmp104_, _ ("error message:"), NULL);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp106_ = _tmp105_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp107_ = g_strconcat (_tmp106_, " ", NULL);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp108_ = _tmp107_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp109_ = _result_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp110_ = _tmp109_->errmsg;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp111_ = g_strconcat (_tmp108_, _tmp110_, NULL);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp112_ = _tmp111_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp113_ = g_strconcat (_tmp112_, "\n\n", NULL);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp113_;
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp112_);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp108_);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp106_);
-#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp104_);
-#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = builder;
-#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = current_file_summary;
-#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp114_, _tmp115_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5509 "Dialogs.c"
+#line 2810 "Dialogs.c"
 			}
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5513 "Dialogs.c"
+#line 2814 "Dialogs.c"
 		}
 	}
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp116_ = manifest;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp117_ = _tmp116_->skipped_files;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp119_ > 0) {
-#line 5526 "Dialogs.c"
+#line 2827 "Dialogs.c"
 		GString* _tmp120_;
 		gchar* _tmp121_;
 		gchar* _tmp122_;
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp120_ = builder;
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp121_ = g_strconcat (_ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \
 ":"), "\n\n", NULL);
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp122_ = _tmp121_;
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp120_, _tmp122_);
-#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp122_);
-#line 5540 "Dialogs.c"
+#line 2841 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp123_;
@@ -5552,27 +2852,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp127_;
 			gint _tmp128_;
 			gint _result_index = 0;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp123_ = manifest;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp124_ = _tmp123_->skipped_files;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp125_ = _g_object_ref0 (_tmp124_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp125_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp126_ = _result_list;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp127_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp128_ = _tmp127_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp128_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5571 "Dialogs.c"
+#line 2872 "Dialogs.c"
 				gint _tmp129_;
 				gint _tmp130_;
 				gint _tmp131_;
@@ -5595,107 +2895,107 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp147_;
 				GString* _tmp148_;
 				const gchar* _tmp149_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp129_ = _result_index;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp129_ + 1;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp130_ = _result_index;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp131_ = _result_size;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp130_ < _tmp131_)) {
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5606 "Dialogs.c"
+#line 2907 "Dialogs.c"
 				}
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp132_ = _result_list;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp133_ = _result_index;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp134_ = gee_list_get (_tmp132_, _tmp133_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp134_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp135_ = _result_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp136_ = _tmp135_->src_identifier;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp137_ = g_strconcat (_tmp136_, "\n\t", NULL);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp138_ = _tmp137_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp139_ = g_strconcat (_tmp138_, _ ("error message:"), NULL);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp140_ = _tmp139_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp141_ = g_strconcat (_tmp140_, " ", NULL);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp142_ = _tmp141_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp143_ = _result_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp144_ = _tmp143_->errmsg;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp145_ = g_strconcat (_tmp142_, _tmp144_, NULL);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp146_ = _tmp145_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp147_ = g_strconcat (_tmp146_, "\n\n", NULL);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp147_;
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp146_);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp142_);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp140_);
-#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp138_);
-#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp148_ = builder;
-#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp149_ = current_file_summary;
-#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp148_, _tmp149_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5662 "Dialogs.c"
+#line 2963 "Dialogs.c"
 			}
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5666 "Dialogs.c"
+#line 2967 "Dialogs.c"
 		}
 	}
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp150_ = manifest;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp151_ = _tmp150_->skipped_photos;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp152_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp153_ = _tmp152_;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp153_ > 0) {
-#line 5679 "Dialogs.c"
+#line 2980 "Dialogs.c"
 		GString* _tmp154_;
 		gchar* _tmp155_;
 		gchar* _tmp156_;
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp154_ = builder;
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp155_ = g_strconcat (_ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \
 "nderstands:"), "\n\n", NULL);
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp156_ = _tmp155_;
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp154_, _tmp156_);
-#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp156_);
-#line 5693 "Dialogs.c"
+#line 2994 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp157_;
@@ -5706,27 +3006,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp161_;
 			gint _tmp162_;
 			gint _result_index = 0;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp157_ = manifest;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp158_ = _tmp157_->skipped_photos;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp159_ = _g_object_ref0 (_tmp158_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp159_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp160_ = _result_list;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp161_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp162_ = _tmp161_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp162_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5724 "Dialogs.c"
+#line 3025 "Dialogs.c"
 				gint _tmp163_;
 				gint _tmp164_;
 				gint _tmp165_;
@@ -5749,107 +3049,107 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp181_;
 				GString* _tmp182_;
 				const gchar* _tmp183_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp163_ = _result_index;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp163_ + 1;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp164_ = _result_index;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp165_ = _result_size;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp164_ < _tmp165_)) {
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5759 "Dialogs.c"
+#line 3060 "Dialogs.c"
 				}
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp166_ = _result_list;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp167_ = _result_index;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp168_ = gee_list_get (_tmp166_, _tmp167_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp168_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp169_ = _result_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp170_ = _tmp169_->src_identifier;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp171_ = g_strconcat (_tmp170_, "\n\t", NULL);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp172_ = _tmp171_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp173_ = g_strconcat (_tmp172_, _ ("error message:"), NULL);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp174_ = _tmp173_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp175_ = g_strconcat (_tmp174_, " ", NULL);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp176_ = _tmp175_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp177_ = _result_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp178_ = _tmp177_->errmsg;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp179_ = g_strconcat (_tmp176_, _tmp178_, NULL);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp180_ = _tmp179_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp181_ = g_strconcat (_tmp180_, "\n\n", NULL);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp181_;
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp180_);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp176_);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp174_);
-#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp172_);
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp182_ = builder;
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp183_ = current_file_summary;
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp182_, _tmp183_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5815 "Dialogs.c"
+#line 3116 "Dialogs.c"
 			}
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5819 "Dialogs.c"
+#line 3120 "Dialogs.c"
 		}
 	}
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp184_ = manifest;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp185_ = _tmp184_->write_failed;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp186_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp187_ = _tmp186_;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp187_ > 0) {
-#line 5832 "Dialogs.c"
+#line 3133 "Dialogs.c"
 		GString* _tmp188_;
 		gchar* _tmp189_;
 		gchar* _tmp190_;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp188_ = builder;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp189_ = g_strconcat (_ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \
 "s Library:"), "\n\n", NULL);
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp190_ = _tmp189_;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp188_, _tmp190_);
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp190_);
-#line 5846 "Dialogs.c"
+#line 3147 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp191_;
@@ -5860,27 +3160,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp195_;
 			gint _tmp196_;
 			gint _result_index = 0;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp191_ = manifest;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp192_ = _tmp191_->write_failed;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp193_ = _g_object_ref0 (_tmp192_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp193_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp194_ = _result_list;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp195_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp196_ = _tmp195_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp196_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5877 "Dialogs.c"
+#line 3178 "Dialogs.c"
 				gint _tmp197_;
 				gint _tmp198_;
 				gint _tmp199_;
@@ -5907,116 +3207,116 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp219_;
 				GString* _tmp220_;
 				const gchar* _tmp221_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp197_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp197_ + 1;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp198_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp199_ = _result_size;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp198_ < _tmp199_)) {
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5916 "Dialogs.c"
+#line 3217 "Dialogs.c"
 				}
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp200_ = _result_list;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp201_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp202_ = gee_list_get (_tmp200_, _tmp201_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp202_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp203_ = _result_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp204_ = _tmp203_->src_identifier;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp205_ = _result_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp206_ = _tmp205_->dest_identifier;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp207_ = g_strdup_printf (_ ("couldn’t copy %s\n\tto %s"), _tmp204_, _tmp206_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp208_ = _tmp207_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp209_ = g_strconcat (_tmp208_, "\n\t", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp210_ = _tmp209_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp211_ = g_strconcat (_tmp210_, _ ("error message:"), NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp212_ = _tmp211_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp213_ = g_strconcat (_tmp212_, " ", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp214_ = _tmp213_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp215_ = _result_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp216_ = _tmp215_->errmsg;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp217_ = g_strconcat (_tmp214_, _tmp216_, NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp218_ = _tmp217_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp219_ = g_strconcat (_tmp218_, "\n\n", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp219_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp218_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp214_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp212_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp210_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp208_);
-#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp220_ = builder;
-#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp221_ = current_file_summary;
-#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp220_, _tmp221_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5982 "Dialogs.c"
+#line 3283 "Dialogs.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5986 "Dialogs.c"
+#line 3287 "Dialogs.c"
 		}
 	}
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp222_ = manifest;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp223_ = _tmp222_->corrupt_files;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp224_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp223_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp225_ = _tmp224_;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp225_ > 0) {
-#line 5999 "Dialogs.c"
+#line 3300 "Dialogs.c"
 		GString* _tmp226_;
 		gchar* _tmp227_;
 		gchar* _tmp228_;
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp226_ = builder;
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp227_ = g_strconcat (_ ("Photos/Videos Not Imported Because Files Are Corrupt:"), "\n\n", NULL);
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp228_ = _tmp227_;
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp226_, _tmp228_);
-#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp228_);
-#line 6013 "Dialogs.c"
+#line 3314 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp229_;
@@ -6027,27 +3327,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp233_;
 			gint _tmp234_;
 			gint _result_index = 0;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp229_ = manifest;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp230_ = _tmp229_->corrupt_files;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp231_ = _g_object_ref0 (_tmp230_);
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp231_;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp232_ = _result_list;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp233_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp232_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp234_ = _tmp233_;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp234_;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6044 "Dialogs.c"
+#line 3345 "Dialogs.c"
 				gint _tmp235_;
 				gint _tmp236_;
 				gint _tmp237_;
@@ -6070,106 +3370,106 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp253_;
 				GString* _tmp254_;
 				const gchar* _tmp255_;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp235_ = _result_index;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp235_ + 1;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp236_ = _result_index;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp237_ = _result_size;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp236_ < _tmp237_)) {
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6079 "Dialogs.c"
+#line 3380 "Dialogs.c"
 				}
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp238_ = _result_list;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp239_ = _result_index;
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp240_ = gee_list_get (_tmp238_, _tmp239_);
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp240_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp241_ = _result_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp242_ = _tmp241_->src_identifier;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp243_ = g_strconcat (_tmp242_, "\n\t", NULL);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp244_ = _tmp243_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp245_ = g_strconcat (_tmp244_, _ ("error message:"), NULL);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp246_ = _tmp245_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp247_ = g_strconcat (_tmp246_, " |", NULL);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp248_ = _tmp247_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp249_ = _result_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp250_ = _tmp249_->errmsg;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp251_ = g_strconcat (_tmp248_, _tmp250_, NULL);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp252_ = _tmp251_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp253_ = g_strconcat (_tmp252_, "|\n\n", NULL);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp253_;
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp252_);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp248_);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp246_);
-#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp244_);
-#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp254_ = builder;
-#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp255_ = current_file_summary;
-#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp254_, _tmp255_);
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6135 "Dialogs.c"
+#line 3436 "Dialogs.c"
 			}
-#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6139 "Dialogs.c"
+#line 3440 "Dialogs.c"
 		}
 	}
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp256_ = manifest;
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp257_ = _tmp256_->failed;
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp258_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp257_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp259_ = _tmp258_;
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp259_ > 0) {
-#line 6152 "Dialogs.c"
+#line 3453 "Dialogs.c"
 		GString* _tmp260_;
 		gchar* _tmp261_;
 		gchar* _tmp262_;
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp260_ = builder;
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp261_ = g_strconcat (_ ("Photos/Videos Not Imported for Other Reasons:"), "\n\n", NULL);
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp262_ = _tmp261_;
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp260_, _tmp262_);
-#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp262_);
-#line 6166 "Dialogs.c"
+#line 3467 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp263_;
@@ -6180,27 +3480,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp267_;
 			gint _tmp268_;
 			gint _result_index = 0;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp263_ = manifest;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp264_ = _tmp263_->failed;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp265_ = _g_object_ref0 (_tmp264_);
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp265_;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp266_ = _result_list;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp267_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp266_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp268_ = _tmp267_;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp268_;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6197 "Dialogs.c"
+#line 3498 "Dialogs.c"
 				gint _tmp269_;
 				gint _tmp270_;
 				gint _tmp271_;
@@ -6223,100 +3523,100 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp287_;
 				GString* _tmp288_;
 				const gchar* _tmp289_;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp269_ = _result_index;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp269_ + 1;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp270_ = _result_index;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp271_ = _result_size;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp270_ < _tmp271_)) {
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6232 "Dialogs.c"
+#line 3533 "Dialogs.c"
 				}
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp272_ = _result_list;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp273_ = _result_index;
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp274_ = gee_list_get (_tmp272_, _tmp273_);
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp274_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp275_ = _result_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp276_ = _tmp275_->src_identifier;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp277_ = g_strconcat (_tmp276_, "\n\t", NULL);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp278_ = _tmp277_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp279_ = g_strconcat (_tmp278_, _ ("error message:"), NULL);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp280_ = _tmp279_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp281_ = g_strconcat (_tmp280_, " ", NULL);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp282_ = _tmp281_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp283_ = _result_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp284_ = _tmp283_->errmsg;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp285_ = g_strconcat (_tmp282_, _tmp284_, NULL);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp286_ = _tmp285_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp287_ = g_strconcat (_tmp286_, "\n\n", NULL);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp287_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp286_);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp282_);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp280_);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp278_);
-#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp288_ = builder;
-#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp289_ = current_file_summary;
-#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp288_, _tmp289_);
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6288 "Dialogs.c"
+#line 3589 "Dialogs.c"
 			}
-#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6292 "Dialogs.c"
+#line 3593 "Dialogs.c"
 		}
 	}
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp290_ = builder;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp291_ = _tmp290_->str;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp292_ = g_strdup (_tmp291_);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp292_;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (current_file_summary);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (header);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_string_free0 (builder);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6313 "Dialogs.c"
+#line 3614 "Dialogs.c"
 }
 
 
@@ -6407,25 +3707,25 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	gint dialog_response = 0;
 	ImportUIQuestionParams* _tmp497_;
 	gint _tmp575_;
-#line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), FALSE);
-#line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((question == NULL) || IMPORT_UI_IS_QUESTION_PARAMS (question), FALSE);
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_strdup ("");
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	message = _tmp0_;
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = manifest;
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_->already_imported;
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6422 "Dialogs.c"
+#line 3723 "Dialogs.c"
 		gchar* photos_message = NULL;
 		ImportManifest* _tmp5_;
 		GeeList* _tmp6_;
@@ -6473,131 +3773,131 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp46_;
 		gchar* _tmp47_;
 		gchar* _tmp48_;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = manifest;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp5_->already_imported;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = manifest;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_->already_imported;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = g_strdup_printf (ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp8_), _tmp12_);
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp13_;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = manifest;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_->already_imported;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = manifest;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_->already_imported;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_;
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = g_strdup_printf (ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp17_), _tmp21_);
-#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp22_;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = manifest;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_->already_imported;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = _tmp25_;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = manifest;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = _tmp27_->already_imported;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _tmp29_;
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = g_strdup_printf (ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp26_), _tmp30_);
-#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp31_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = message;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = manifest;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_->already_imported;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = photos_message;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = videos_message;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = both_message;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = both_message;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_, _tmp36_, _tmp37_, _tmp38_);
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = _tmp39_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = g_strconcat (_tmp32_, _tmp40_, NULL);
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp41_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp40_);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = message;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = manifest;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = _tmp43_->already_imported;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = show_dest_id;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp46_ = import_ui_generate_import_failure_list (_tmp44_, _tmp45_);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp47_ = _tmp46_;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = g_strconcat (_tmp42_, _tmp47_, NULL);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp48_;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp47_);
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6582 "Dialogs.c"
+#line 3883 "Dialogs.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = manifest;
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_->failed;
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _tmp51_;
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ > 0) {
-#line 6594 "Dialogs.c"
+#line 3895 "Dialogs.c"
 		const gchar* _tmp53_;
 		gint _tmp54_;
 		gint _tmp55_;
@@ -6658,174 +3958,174 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp108_;
 		gchar* _tmp109_;
 		gchar* _tmp110_;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp54_ = strlen (_tmp53_);
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp55_ = _tmp54_;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp55_ > 0) {
-#line 6663 "Dialogs.c"
+#line 3964 "Dialogs.c"
 			const gchar* _tmp56_;
 			gchar* _tmp57_;
-#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = message;
-#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = g_strconcat (_tmp56_, "\n", NULL);
-#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp57_;
-#line 6674 "Dialogs.c"
+#line 3975 "Dialogs.c"
 		}
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = manifest;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = _tmp58_->failed;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = _tmp60_;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = manifest;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = _tmp62_->failed;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp65_ = _tmp64_;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp66_ = g_strdup_printf (ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp61_), _tmp65_);
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp66_;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp67_ = manifest;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp68_ = _tmp67_->failed;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = _tmp69_;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = manifest;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp72_ = _tmp71_->failed;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp74_ = _tmp73_;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = g_strdup_printf (ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp70_), _tmp74_);
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp75_;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp76_ = manifest;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp77_ = _tmp76_->failed;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp78_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp79_ = _tmp78_;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = manifest;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp81_ = _tmp80_->failed;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp82_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp82_;
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp79_), _tmp83_);
-#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp84_;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = manifest;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = _tmp85_->failed;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = _tmp87_;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = manifest;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = _tmp89_->failed;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp91_;
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = g_strdup_printf (ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp88_), _tmp92_);
-#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp93_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = message;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = manifest;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = _tmp95_->failed;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = photos_message;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = videos_message;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp99_ = both_message;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp100_ = neither_message;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp101_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp98_, _tmp99_, _tmp100_);
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp102_ = _tmp101_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp103_ = g_strconcat (_tmp94_, _tmp102_, NULL);
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp103_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp102_);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp104_ = message;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp105_ = manifest;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp106_ = _tmp105_->failed;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = show_dest_id;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = import_ui_generate_import_failure_list (_tmp106_, _tmp107_);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = _tmp108_;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = g_strconcat (_tmp104_, _tmp109_, NULL);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp110_;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp109_);
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6810 "Dialogs.c"
+#line 4111 "Dialogs.c"
 	}
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp111_ = manifest;
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp112_ = _tmp111_->write_failed;
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp114_ = _tmp113_;
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp114_ > 0) {
-#line 6822 "Dialogs.c"
+#line 4123 "Dialogs.c"
 		const gchar* _tmp115_;
 		gint _tmp116_;
 		gint _tmp117_;
@@ -6886,182 +4186,182 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp170_;
 		gchar* _tmp171_;
 		gchar* _tmp172_;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = strlen (_tmp115_);
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = _tmp116_;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp117_ > 0) {
-#line 6891 "Dialogs.c"
+#line 4192 "Dialogs.c"
 			const gchar* _tmp118_;
 			gchar* _tmp119_;
-#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp118_ = message;
-#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp119_ = g_strconcat (_tmp118_, "\n", NULL);
-#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp119_;
-#line 6902 "Dialogs.c"
+#line 4203 "Dialogs.c"
 		}
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp120_ = manifest;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp121_ = _tmp120_->write_failed;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp122_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp122_;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp124_ = manifest;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp125_ = _tmp124_->write_failed;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp126_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = _tmp126_;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp128_ = g_strdup_printf (ngettext ("1 photo failed to import because the photo library folder was not writ" \
 "able:\n", "%d photos failed to import because the photo library folder was not wr" \
 "itable:\n", (gulong) _tmp123_), _tmp127_);
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 380 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp128_;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp129_ = manifest;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp130_ = _tmp129_->write_failed;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp132_ = _tmp131_;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp133_ = manifest;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp134_ = _tmp133_->write_failed;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp135_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp136_ = _tmp135_;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp137_ = g_strdup_printf (ngettext ("1 video failed to import because the photo library folder was not writ" \
 "able:\n", "%d videos failed to import because the photo library folder was not wr" \
 "itable:\n", (gulong) _tmp132_), _tmp136_);
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp137_;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp138_ = manifest;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp139_ = _tmp138_->write_failed;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp140_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp141_ = _tmp140_;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp142_ = manifest;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp143_ = _tmp142_->write_failed;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp144_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp145_ = _tmp144_;
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp146_ = g_strdup_printf (ngettext ("1 photo/video failed to import because the photo library folder was no" \
 "t writable:\n", "%d photos/videos failed to import because the photo library folder was" \
 " not writable:\n", (gulong) _tmp141_), _tmp145_);
-#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp146_;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp147_ = manifest;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp148_ = _tmp147_->write_failed;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp150_ = _tmp149_;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp151_ = manifest;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp152_ = _tmp151_->write_failed;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp154_ = _tmp153_;
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp155_ = g_strdup_printf (ngettext ("1 file failed to import because the photo library folder was not writa" \
 "ble:\n", "%d files failed to import because the photo library folder was not wri" \
 "table:\n", (gulong) _tmp150_), _tmp154_);
-#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp155_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp156_ = message;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp157_ = manifest;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp158_ = _tmp157_->write_failed;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp159_ = photos_message;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp160_ = videos_message;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp161_ = both_message;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp162_ = neither_message;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp163_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection), _tmp159_, _tmp160_, _tmp161_, _tmp162_);
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp164_ = _tmp163_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp165_ = g_strconcat (_tmp156_, _tmp164_, NULL);
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp165_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp164_);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp166_ = message;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp167_ = manifest;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp168_ = _tmp167_->write_failed;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp169_ = show_dest_id;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp170_ = import_ui_generate_import_failure_list (_tmp168_, _tmp169_);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp171_ = _tmp170_;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp172_ = g_strconcat (_tmp166_, _tmp171_, NULL);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp172_;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp171_);
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7038 "Dialogs.c"
+#line 4339 "Dialogs.c"
 	}
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp173_ = manifest;
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp174_ = _tmp173_->camera_failed;
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp175_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp174_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp176_ = _tmp175_;
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp176_ > 0) {
-#line 7050 "Dialogs.c"
+#line 4351 "Dialogs.c"
 		const gchar* _tmp177_;
 		gint _tmp178_;
 		gint _tmp179_;
@@ -7122,174 +4422,174 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp232_;
 		gchar* _tmp233_;
 		gchar* _tmp234_;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp177_ = message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp178_ = strlen (_tmp177_);
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp179_ = _tmp178_;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp179_ > 0) {
-#line 7119 "Dialogs.c"
+#line 4420 "Dialogs.c"
 			const gchar* _tmp180_;
 			gchar* _tmp181_;
-#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp180_ = message;
-#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp181_ = g_strconcat (_tmp180_, "\n", NULL);
-#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp181_;
-#line 7130 "Dialogs.c"
+#line 4431 "Dialogs.c"
 		}
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp182_ = manifest;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp183_ = _tmp182_->camera_failed;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp184_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp185_ = _tmp184_;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp186_ = manifest;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp187_ = _tmp186_->camera_failed;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp188_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp187_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp189_ = _tmp188_;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp190_ = g_strdup_printf (ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp185_), _tmp189_);
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp190_;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp191_ = manifest;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp192_ = _tmp191_->camera_failed;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp193_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp194_ = _tmp193_;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp195_ = manifest;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp196_ = _tmp195_->camera_failed;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp197_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp196_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp198_ = _tmp197_;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp199_ = g_strdup_printf (ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp194_), _tmp198_);
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp199_;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp200_ = manifest;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp201_ = _tmp200_->camera_failed;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp202_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp201_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp203_ = _tmp202_;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp204_ = manifest;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp205_ = _tmp204_->camera_failed;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp206_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp205_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp207_ = _tmp206_;
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp208_ = g_strdup_printf (ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp203_), _tmp207_);
-#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp208_;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp209_ = manifest;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp210_ = _tmp209_->camera_failed;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp211_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp210_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp212_ = _tmp211_;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp213_ = manifest;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp214_ = _tmp213_->camera_failed;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp216_ = _tmp215_;
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp217_ = g_strdup_printf (ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp212_), _tmp216_);
-#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp217_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp218_ = message;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp219_ = manifest;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp220_ = _tmp219_->camera_failed;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp221_ = photos_message;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp222_ = videos_message;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp223_ = both_message;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp224_ = neither_message;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp225_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp220_, GEE_TYPE_COLLECTION, GeeCollection), _tmp221_, _tmp222_, _tmp223_, _tmp224_);
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp226_ = _tmp225_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp227_ = g_strconcat (_tmp218_, _tmp226_, NULL);
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp227_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp226_);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp228_ = message;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp229_ = manifest;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp230_ = _tmp229_->camera_failed;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp231_ = show_dest_id;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp232_ = import_ui_generate_import_failure_list (_tmp230_, _tmp231_);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp233_ = _tmp232_;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp234_ = g_strconcat (_tmp228_, _tmp233_, NULL);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp234_;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp233_);
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7266 "Dialogs.c"
+#line 4567 "Dialogs.c"
 	}
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp235_ = manifest;
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp236_ = _tmp235_->corrupt_files;
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp237_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp236_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp238_ = _tmp237_;
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp238_ > 0) {
-#line 7278 "Dialogs.c"
+#line 4579 "Dialogs.c"
 		const gchar* _tmp239_;
 		gint _tmp240_;
 		gint _tmp241_;
@@ -7350,174 +4650,174 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp294_;
 		gchar* _tmp295_;
 		gchar* _tmp296_;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp239_ = message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp240_ = strlen (_tmp239_);
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp241_ = _tmp240_;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp241_ > 0) {
-#line 7347 "Dialogs.c"
+#line 4648 "Dialogs.c"
 			const gchar* _tmp242_;
 			gchar* _tmp243_;
-#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp242_ = message;
-#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp243_ = g_strconcat (_tmp242_, "\n", NULL);
-#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp243_;
-#line 7358 "Dialogs.c"
+#line 4659 "Dialogs.c"
 		}
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp244_ = manifest;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp245_ = _tmp244_->corrupt_files;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp246_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp245_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp247_ = _tmp246_;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp248_ = manifest;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp249_ = _tmp248_->corrupt_files;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp250_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp249_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp251_ = _tmp250_;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp252_ = g_strdup_printf (ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp247_), _tmp251_);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp252_;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp253_ = manifest;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp254_ = _tmp253_->corrupt_files;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp255_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp254_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp256_ = _tmp255_;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp257_ = manifest;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp258_ = _tmp257_->corrupt_files;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp259_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp258_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp260_ = _tmp259_;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp261_ = g_strdup_printf (ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp256_), _tmp260_);
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp261_;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp262_ = manifest;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp263_ = _tmp262_->corrupt_files;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp264_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp263_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp265_ = _tmp264_;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp266_ = manifest;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp267_ = _tmp266_->corrupt_files;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp268_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp267_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp269_ = _tmp268_;
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp270_ = g_strdup_printf (ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp265_), _tmp269_);
-#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp270_;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp271_ = manifest;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp272_ = _tmp271_->corrupt_files;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp273_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp272_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp274_ = _tmp273_;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp275_ = manifest;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp276_ = _tmp275_->corrupt_files;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp277_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp276_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp278_ = _tmp277_;
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp279_ = g_strdup_printf (ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp274_), _tmp278_);
-#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp279_;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp280_ = message;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp281_ = manifest;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp282_ = _tmp281_->corrupt_files;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp283_ = photos_message;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp284_ = videos_message;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp285_ = both_message;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp286_ = neither_message;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp287_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp282_, GEE_TYPE_COLLECTION, GeeCollection), _tmp283_, _tmp284_, _tmp285_, _tmp286_);
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp288_ = _tmp287_;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp289_ = g_strconcat (_tmp280_, _tmp288_, NULL);
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp289_;
-#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp288_);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp290_ = message;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp291_ = manifest;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp292_ = _tmp291_->corrupt_files;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp293_ = show_dest_id;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp294_ = import_ui_generate_import_failure_list (_tmp292_, _tmp293_);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp295_ = _tmp294_;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp296_ = g_strconcat (_tmp290_, _tmp295_, NULL);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp296_;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp295_);
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7494 "Dialogs.c"
+#line 4795 "Dialogs.c"
 	}
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp297_ = manifest;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp298_ = _tmp297_->skipped_photos;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp299_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp298_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp300_ = _tmp299_;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp300_ > 0) {
-#line 7506 "Dialogs.c"
+#line 4807 "Dialogs.c"
 		const gchar* _tmp301_;
 		gint _tmp302_;
 		gint _tmp303_;
@@ -7541,92 +4841,92 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp322_;
 		gchar* _tmp323_;
 		gchar* _tmp324_;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp301_ = message;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp302_ = strlen (_tmp301_);
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp303_ = _tmp302_;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp303_ > 0) {
-#line 7538 "Dialogs.c"
+#line 4839 "Dialogs.c"
 			const gchar* _tmp304_;
 			gchar* _tmp305_;
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp304_ = message;
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp305_ = g_strconcat (_tmp304_, "\n", NULL);
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp305_;
-#line 7549 "Dialogs.c"
+#line 4850 "Dialogs.c"
 		}
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp306_ = manifest;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp307_ = _tmp306_->skipped_photos;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp308_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp307_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp309_ = _tmp308_;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp310_ = manifest;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp311_ = _tmp310_->skipped_photos;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp312_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp311_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp313_ = _tmp312_;
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp314_ = g_strdup_printf (ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp309_), _tmp313_);
-#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		skipped_photos_message = _tmp314_;
-#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp315_ = message;
-#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp316_ = skipped_photos_message;
-#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp317_ = g_strconcat (_tmp315_, _tmp316_, NULL);
-#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp317_;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp318_ = message;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp319_ = manifest;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp320_ = _tmp319_->skipped_photos;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp321_ = show_dest_id;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp322_ = import_ui_generate_import_failure_list (_tmp320_, _tmp321_);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp323_ = _tmp322_;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp324_ = g_strconcat (_tmp318_, _tmp323_, NULL);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp324_;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 458 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp323_);
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7603 "Dialogs.c"
+#line 4904 "Dialogs.c"
 	}
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp325_ = manifest;
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp326_ = _tmp325_->skipped_files;
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp327_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp328_ = _tmp327_;
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp328_ > 0) {
-#line 7615 "Dialogs.c"
+#line 4916 "Dialogs.c"
 		const gchar* _tmp329_;
 		gint _tmp330_;
 		gint _tmp331_;
@@ -7643,72 +4943,72 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		const gchar* _tmp343_;
 		const gchar* _tmp344_;
 		gchar* _tmp345_;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp329_ = message;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp330_ = strlen (_tmp329_);
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp331_ = _tmp330_;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp331_ > 0) {
-#line 7640 "Dialogs.c"
+#line 4941 "Dialogs.c"
 			const gchar* _tmp332_;
 			gchar* _tmp333_;
-#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp332_ = message;
-#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp333_ = g_strconcat (_tmp332_, "\n", NULL);
-#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp333_;
-#line 7651 "Dialogs.c"
+#line 4952 "Dialogs.c"
 		}
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp334_ = manifest;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp335_ = _tmp334_->skipped_files;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp336_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp335_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp337_ = _tmp336_;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp338_ = manifest;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp339_ = _tmp338_->skipped_files;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp340_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp339_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp341_ = _tmp340_;
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp342_ = g_strdup_printf (ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp337_), _tmp341_);
-#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		skipped_files_message = _tmp342_;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp343_ = message;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp344_ = skipped_files_message;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp345_ = g_strconcat (_tmp343_, _tmp344_, NULL);
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp345_;
-#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7685 "Dialogs.c"
+#line 4986 "Dialogs.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp346_ = manifest;
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp347_ = _tmp346_->aborted;
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp348_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp347_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp349_ = _tmp348_;
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp349_ > 0) {
-#line 7697 "Dialogs.c"
+#line 4998 "Dialogs.c"
 		const gchar* _tmp350_;
 		gint _tmp351_;
 		gint _tmp352_;
@@ -7769,174 +5069,174 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp405_;
 		gchar* _tmp406_;
 		gchar* _tmp407_;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp350_ = message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp351_ = strlen (_tmp350_);
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp352_ = _tmp351_;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp352_ > 0) {
-#line 7766 "Dialogs.c"
+#line 5067 "Dialogs.c"
 			const gchar* _tmp353_;
 			gchar* _tmp354_;
-#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp353_ = message;
-#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp354_ = g_strconcat (_tmp353_, "\n", NULL);
-#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp354_;
-#line 7777 "Dialogs.c"
+#line 5078 "Dialogs.c"
 		}
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp355_ = manifest;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp356_ = _tmp355_->aborted;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp357_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp356_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp358_ = _tmp357_;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp359_ = manifest;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp360_ = _tmp359_->aborted;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp361_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp362_ = _tmp361_;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp363_ = g_strdup_printf (ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp358_), _tmp362_);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp363_;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp364_ = manifest;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp365_ = _tmp364_->aborted;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp366_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp365_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp367_ = _tmp366_;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp368_ = manifest;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp369_ = _tmp368_->aborted;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp370_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp369_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp371_ = _tmp370_;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp372_ = g_strdup_printf (ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp367_), _tmp371_);
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp372_;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp373_ = manifest;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp374_ = _tmp373_->aborted;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp375_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp374_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp376_ = _tmp375_;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp377_ = manifest;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp378_ = _tmp377_->aborted;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp379_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp378_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp380_ = _tmp379_;
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp381_ = g_strdup_printf (ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp376_), _tmp380_);
-#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp381_;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp382_ = manifest;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp383_ = _tmp382_->aborted;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp384_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp383_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp385_ = _tmp384_;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp386_ = manifest;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp387_ = _tmp386_->aborted;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp388_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp387_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp389_ = _tmp388_;
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp390_ = g_strdup_printf (ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp385_), _tmp389_);
-#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp390_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp391_ = message;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp392_ = manifest;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp393_ = _tmp392_->aborted;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp394_ = photos_message;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp395_ = videos_message;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp396_ = both_message;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp397_ = neither_message;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp398_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp393_, GEE_TYPE_COLLECTION, GeeCollection), _tmp394_, _tmp395_, _tmp396_, _tmp397_);
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp399_ = _tmp398_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp400_ = g_strconcat (_tmp391_, _tmp399_, NULL);
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp400_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp399_);
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp401_ = message;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp402_ = manifest;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp403_ = _tmp402_->aborted;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp404_ = show_dest_id;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp405_ = import_ui_generate_import_failure_list (_tmp403_, _tmp404_);
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp406_ = _tmp405_;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp407_ = g_strconcat (_tmp401_, _tmp406_, NULL);
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp407_;
-#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp406_);
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7913 "Dialogs.c"
+#line 5214 "Dialogs.c"
 	}
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp408_ = manifest;
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp409_ = _tmp408_->success;
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp410_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp409_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp411_ = _tmp410_;
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp411_ > 0) {
-#line 7925 "Dialogs.c"
+#line 5226 "Dialogs.c"
 		const gchar* _tmp412_;
 		gint _tmp413_;
 		gint _tmp414_;
@@ -7979,231 +5279,231 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp450_;
 		gchar* _tmp451_;
 		gchar* _tmp452_;
-#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp412_ = message;
-#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp413_ = strlen (_tmp412_);
-#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp414_ = _tmp413_;
-#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp414_ > 0) {
-#line 7976 "Dialogs.c"
+#line 5277 "Dialogs.c"
 			const gchar* _tmp415_;
 			gchar* _tmp416_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp415_ = message;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp416_ = g_strconcat (_tmp415_, "\n", NULL);
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp416_;
-#line 7987 "Dialogs.c"
+#line 5288 "Dialogs.c"
 		}
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp417_ = manifest;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp418_ = _tmp417_->success;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp419_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp418_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp420_ = _tmp419_;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp421_ = manifest;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp422_ = _tmp421_->success;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp423_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp422_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp424_ = _tmp423_;
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp425_ = g_strdup_printf (ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp420_), _tmp424_);
-#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp425_;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp426_ = manifest;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp427_ = _tmp426_->success;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp428_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp427_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp429_ = _tmp428_;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp430_ = manifest;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp431_ = _tmp430_->success;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp432_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp431_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp433_ = _tmp432_;
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp434_ = g_strdup_printf (ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp429_), _tmp433_);
-#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp434_;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp435_ = manifest;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp436_ = _tmp435_->success;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp437_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp436_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp438_ = _tmp437_;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp439_ = manifest;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp440_ = _tmp439_->success;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp441_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp440_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp442_ = _tmp441_;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp443_ = g_strdup_printf (ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp438_), _tmp442_);
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp443_;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp444_ = message;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp445_ = manifest;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp446_ = _tmp445_->success;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp447_ = photos_message;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp448_ = videos_message;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp449_ = both_message;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp450_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp446_, GEE_TYPE_COLLECTION, GeeCollection), _tmp447_, _tmp448_, _tmp449_, "");
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp451_ = _tmp450_;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp452_ = g_strconcat (_tmp444_, _tmp451_, NULL);
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp452_;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp451_);
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8079 "Dialogs.c"
+#line 5380 "Dialogs.c"
 	}
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp453_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp454_ = _tmp453_->success;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp455_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp454_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp456_ = _tmp455_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp457_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp458_ = _tmp457_->failed;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp459_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp460_ = _tmp459_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp461_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp462_ = _tmp461_->camera_failed;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp463_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp462_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp464_ = _tmp463_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp465_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp466_ = _tmp465_->skipped_photos;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp467_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp466_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp468_ = _tmp467_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp469_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp470_ = _tmp469_->skipped_files;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp471_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp470_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp472_ = _tmp471_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp473_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp474_ = _tmp473_->corrupt_files;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp475_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp474_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp476_ = _tmp475_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp477_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp478_ = _tmp477_->already_imported;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp479_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp478_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp480_ = _tmp479_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp481_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp482_ = _tmp481_->aborted;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp483_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp482_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp484_ = _tmp483_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp485_ = manifest;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp486_ = _tmp485_->write_failed;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp487_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp486_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp488_ = _tmp487_;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	total = (((((((_tmp456_ + _tmp460_) + _tmp464_) + _tmp468_) + _tmp472_) + _tmp476_) + _tmp480_) + _tmp484_) + _tmp488_;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp489_ = total;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp490_ = manifest;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp491_ = _tmp490_->all;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp492_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp491_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp493_ = _tmp492_;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp489_ == _tmp493_, "total == manifest.all.size");
-#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp494_ = total;
-#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp494_ == 0) {
-#line 8171 "Dialogs.c"
+#line 5472 "Dialogs.c"
 		const gchar* _tmp495_;
 		gchar* _tmp496_;
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp495_ = message;
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp496_ = g_strconcat (_tmp495_, _ ("No photos or videos imported.\n"), NULL);
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp496_;
-#line 8182 "Dialogs.c"
+#line 5483 "Dialogs.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_response = (gint) GTK_RESPONSE_NONE;
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp497_ = question;
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp497_ == NULL) {
-#line 8192 "Dialogs.c"
+#line 5493 "Dialogs.c"
 		AppWindow* _tmp498_;
 		AppWindow* _tmp499_;
 		const gchar* _tmp500_;
@@ -8236,116 +5536,116 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gint _tmp524_;
 		GtkMessageDialog* _tmp525_;
 		gint _tmp526_;
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp498_ = app_window_get_instance ();
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp499_ = _tmp498_;
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp500_ = message;
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp501_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp499_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp500_);
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp501_);
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog = _tmp501_;
-#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp499_);
-#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp502_ = dialog;
-#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp502_, gtk_window_get_type (), GtkWindow), _ ("Import Complete"));
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp503_ = dialog;
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp504_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp503_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp505_ = _g_object_ref0 (_tmp504_);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		save_results_button = _tmp505_;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp506_ = save_results_button;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp507_ = manifest;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp508_ = _tmp507_->success;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp509_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp508_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp510_ = _tmp509_;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp511_ = manifest;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp512_ = _tmp511_->all;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp513_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp512_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp514_ = _tmp513_;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_visible (_tmp506_, _tmp510_ < _tmp514_);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp515_ = dialog;
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp516_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp515_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp517_ = _g_object_ref0 (_tmp516_);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ok_button = _tmp517_;
-#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp518_ = dialog;
-#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp519_ = ok_button;
-#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp518_, gtk_window_get_type (), GtkWindow), _tmp519_);
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp520_ = dialog;
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp521_ = (GtkContainer*) gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp520_, gtk_widget_get_type (), GtkWidget));
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp522_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp521_, gtk_window_get_type (), GtkWindow));
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_parent = _tmp522_;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp523_ = dialog;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp524_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp523_, gtk_dialog_get_type (), GtkDialog));
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_response = _tmp524_;
-#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp525_ = dialog;
-#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp525_, gtk_widget_get_type (), GtkWidget));
-#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp526_ = dialog_response;
-#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp526_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8309 "Dialogs.c"
+#line 5610 "Dialogs.c"
 			GtkWindow* _tmp527_;
 			ImportManifest* _tmp528_;
 			gchar* _tmp529_;
 			gchar* _tmp530_;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp527_ = dialog_parent;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp528_ = manifest;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp529_ = import_ui_create_result_report_from_manifest (_tmp528_);
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp530_ = _tmp529_;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			import_ui_save_import_results (_tmp527_, _tmp530_);
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp530_);
-#line 8326 "Dialogs.c"
+#line 5627 "Dialogs.c"
 		}
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (ok_button);
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8334 "Dialogs.c"
+#line 5635 "Dialogs.c"
 	} else {
 		const gchar* _tmp531_;
 		ImportUIQuestionParams* _tmp532_;
@@ -8386,107 +5686,107 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gint _tmp565_;
 		GtkMessageDialog* _tmp573_;
 		GtkMessageDialog* _tmp574_;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp531_ = message;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp532_ = question;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp533_ = _tmp532_->question;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp534_ = g_strconcat ("\n", _tmp533_, NULL);
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp535_ = _tmp534_;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp536_ = g_strconcat (_tmp531_, _tmp535_, NULL);
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp536_;
-#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp535_);
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp537_ = app_window_get_instance ();
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp538_ = _tmp537_;
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp539_ = message;
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp540_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp538_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp539_);
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp540_);
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog = _tmp540_;
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp538_);
-#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp541_ = dialog;
-#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp541_, gtk_window_get_type (), GtkWindow), _ ("Import Complete"));
-#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp542_ = dialog;
-#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp543_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp542_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
-#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp544_ = _g_object_ref0 (_tmp543_);
-#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		save_results_button = _tmp544_;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp545_ = save_results_button;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp546_ = manifest;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp547_ = _tmp546_->success;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp548_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp547_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp549_ = _tmp548_;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp550_ = manifest;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp551_ = _tmp550_->all;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp552_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp551_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp553_ = _tmp552_;
-#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_visible (_tmp545_, _tmp549_ < _tmp553_);
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp554_ = dialog;
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp555_ = question;
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp556_ = _tmp555_->no_button;
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp557_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp554_, gtk_dialog_get_type (), GtkDialog), _tmp556_, (gint) GTK_RESPONSE_NO);
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp558_ = _g_object_ref0 (_tmp557_);
-#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		no_button = _tmp558_;
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp559_ = dialog;
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp560_ = question;
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp561_ = _tmp560_->yes_button;
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp559_, gtk_dialog_get_type (), GtkDialog), _tmp561_, (gint) GTK_RESPONSE_YES);
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp562_ = dialog;
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp563_ = no_button;
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp562_, gtk_window_get_type (), GtkWindow), _tmp563_);
-#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp564_ = dialog;
-#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp565_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp564_, gtk_dialog_get_type (), GtkDialog));
-#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_response = _tmp565_;
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8475 "Dialogs.c"
+#line 5776 "Dialogs.c"
 			gint _tmp566_;
 			GtkMessageDialog* _tmp567_;
 			ImportManifest* _tmp568_;
@@ -8494,59 +5794,59 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			gchar* _tmp570_;
 			GtkMessageDialog* _tmp571_;
 			gint _tmp572_;
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp566_ = dialog_response;
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!(_tmp566_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8489 "Dialogs.c"
+#line 5790 "Dialogs.c"
 			}
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp567_ = dialog;
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp568_ = manifest;
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp569_ = import_ui_create_result_report_from_manifest (_tmp568_);
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp570_ = _tmp569_;
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp567_, gtk_window_get_type (), GtkWindow), _tmp570_);
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp570_);
-#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp571_ = dialog;
-#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp572_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp571_, gtk_dialog_get_type (), GtkDialog));
-#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dialog_response = _tmp572_;
-#line 8509 "Dialogs.c"
+#line 5810 "Dialogs.c"
 		}
-#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp573_ = dialog;
-#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 563 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp573_, gtk_widget_get_type (), GtkWidget));
-#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp574_ = dialog;
-#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp574_, gtk_widget_get_type (), GtkWidget));
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (no_button);
-#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8523 "Dialogs.c"
+#line 5824 "Dialogs.c"
 	}
-#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp575_ = dialog_response;
-#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp575_ == ((gint) GTK_RESPONSE_YES);
-#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (message);
-#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8535 "Dialogs.c"
+#line 5836 "Dialogs.c"
 }
 
 
@@ -8590,13 +5890,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 8579 "Dialogs.c"
+#line 5880 "Dialogs.c"
 	}
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8585 "Dialogs.c"
+#line 5886 "Dialogs.c"
 }
 
 
@@ -8620,75 +5920,75 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	gboolean _tmp13_ = FALSE;
 	gint _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((chooser_dialog_parent == NULL) || GTK_IS_WINDOW (chooser_dialog_parent));
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (results_log != NULL);
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = chooser_dialog_parent;
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE, _tmp0_, GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_AS_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	chooser_dialog = _tmp1_;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = chooser_dialog;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = chooser_dialog;
-#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_get_home_dir ();
-#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
-#line 915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = chooser_dialog;
-#line 915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "Shotwell Import Log.txt");
-#line 916 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = chooser_dialog;
-#line 916 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = chooser_dialog;
-#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog));
-#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_result = _tmp8_;
-#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = chooser_dialog;
-#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	chosen_file = _tmp10_;
-#line 920 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = chooser_dialog;
-#line 920 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = chooser_dialog;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = dialog_result;
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8663 "Dialogs.c"
+#line 5964 "Dialogs.c"
 		GFile* _tmp15_;
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8669 "Dialogs.c"
+#line 5970 "Dialogs.c"
 	} else {
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8673 "Dialogs.c"
+#line 5974 "Dialogs.c"
 	}
-#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8677 "Dialogs.c"
+#line 5978 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
 			GFile* _tmp16_;
@@ -8700,53 +6000,53 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			guint8* _tmp21_;
 			gint _tmp21__length1;
 			GFileOutputStream* _tmp22_;
-#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = chosen_file;
-#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = g_file_replace (_tmp16_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			outstream = _tmp17_;
-#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8697 "Dialogs.c"
-				goto __catch425_g_error;
+#line 5998 "Dialogs.c"
+				goto __catch437_g_error;
 			}
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = results_log;
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = string_get_data (_tmp19_, &_tmp20__length1);
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _tmp20_;
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21__length1 = _tmp20__length1;
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			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"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8716 "Dialogs.c"
-				goto __catch425_g_error;
+#line 6017 "Dialogs.c"
+				goto __catch437_g_error;
 			}
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			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"
+#line 588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8727 "Dialogs.c"
-				goto __catch425_g_error;
+#line 6028 "Dialogs.c"
+				goto __catch437_g_error;
 			}
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8732 "Dialogs.c"
+#line 6033 "Dialogs.c"
 		}
-		goto __finally425;
-		__catch425_g_error:
+		goto __finally437;
+		__catch437_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_;
@@ -8754,148 +6054,124 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			gchar* _tmp25_;
 			GError* _tmp26_;
 			const gchar* _tmp27_;
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			err = _inner_error_;
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_inner_error_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = chosen_file;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = g_file_get_path (_tmp23_);
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = _tmp24_;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = err;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _tmp26_->message;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_critical ("Dialogs.vala:929: couldn't save import results to log file %s: %s", _tmp25_, _tmp27_);
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			g_critical ("Dialogs.vala:590: couldn't save import results to log file %s: %s", _tmp25_, _tmp27_);
+#line 590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp25_);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 8763 "Dialogs.c"
+#line 6064 "Dialogs.c"
 		}
-		__finally425:
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		__finally437:
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (chosen_file);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (chooser_dialog);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_clear_error (&_inner_error_);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 8778 "Dialogs.c"
+#line 6079 "Dialogs.c"
 		}
 	}
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 8785 "Dialogs.c"
+#line 6086 "Dialogs.c"
 }
 
 
 static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) {
 	gboolean result;
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8794 "Dialogs.c"
+#line 6095 "Dialogs.c"
 }
 
 
 TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
 	TextEntryDialogMediator* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_;
+	TextEntryDialog* _tmp0_;
 	TextEntryDialog* _tmp1_;
-	TextEntryDialog* _tmp2_;
-	GtkBox* _tmp3_;
-	GObject* _tmp4_;
-	TextEntryDialog* _tmp5_;
-	TextEntryDialog* _tmp6_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	const gchar* _tmp9_;
-	GeeCollection* _tmp10_;
-	const gchar* _tmp11_;
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	GeeCollection* _tmp5_;
+	const gchar* _tmp6_;
+#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list), NULL);
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialogMediator*) g_type_create_instance (object_type);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = text_entry_dialog_new ();
-#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp1_);
-#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = text_entry_dialog_new ();
+#line 603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp0_);
+#line 603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dialog = _tmp1_;
-#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->dialog;
-#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_dialog_get_type (), GtkDialog));
-#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_builder_get_object (builder, "dialog-vbox2");
-#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox), gtk_widget_get_type (), GtkWidget));
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->dialog;
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text_entry_dialog_set_builder (_tmp5_, builder);
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->dialog;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = title;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = label;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = initial_text;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = completion_list;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = completion_delimiter;
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text_entry_dialog_setup (_tmp6_, _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type, self, _tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->dialog = _tmp0_;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->dialog;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = title;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = label;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = initial_text;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = completion_list;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = completion_delimiter;
+#line 604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	text_entry_dialog_setup (_tmp1_, _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type, self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
+#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 8863 "Dialogs.c"
+#line 6140 "Dialogs.c"
 }
 
 
 static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) {
 	gboolean result = FALSE;
-#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8875 "Dialogs.c"
+#line 6152 "Dialogs.c"
 }
 
 
 gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) {
-#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
-#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 8884 "Dialogs.c"
+#line 6161 "Dialogs.c"
 }
 
 
@@ -8903,231 +6179,231 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	gchar* result = NULL;
 	TextEntryDialog* _tmp0_;
 	gchar* _tmp1_;
-#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text_entry_dialog_execute (_tmp0_);
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp1_;
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8902 "Dialogs.c"
+#line 6179 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 8909 "Dialogs.c"
+#line 6186 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_free_value (GValue* value) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 8918 "Dialogs.c"
+#line 6195 "Dialogs.c"
 	}
 }
 
 
 static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 8928 "Dialogs.c"
+#line 6205 "Dialogs.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8932 "Dialogs.c"
+#line 6209 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 8940 "Dialogs.c"
+#line 6217 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 8947 "Dialogs.c"
+#line 6224 "Dialogs.c"
 		TextEntryDialogMediator * object;
 		object = collect_values[0].v_pointer;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8954 "Dialogs.c"
+#line 6231 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8958 "Dialogs.c"
+#line 6235 "Dialogs.c"
 		}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 8962 "Dialogs.c"
+#line 6239 "Dialogs.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 8966 "Dialogs.c"
+#line 6243 "Dialogs.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 8970 "Dialogs.c"
+#line 6247 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	TextEntryDialogMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8981 "Dialogs.c"
+#line 6258 "Dialogs.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 8987 "Dialogs.c"
+#line 6264 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8991 "Dialogs.c"
+#line 6268 "Dialogs.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 8995 "Dialogs.c"
+#line 6272 "Dialogs.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 8999 "Dialogs.c"
+#line 6276 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecTextEntryDialogMediator* spec;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9013 "Dialogs.c"
+#line 6290 "Dialogs.c"
 }
 
 
 gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9022 "Dialogs.c"
+#line 6299 "Dialogs.c"
 }
 
 
 void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	TextEntryDialogMediator * old;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9042 "Dialogs.c"
+#line 6319 "Dialogs.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9046 "Dialogs.c"
+#line 6323 "Dialogs.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9052 "Dialogs.c"
+#line 6329 "Dialogs.c"
 	}
 }
 
 
 void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	TextEntryDialogMediator * old;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9071 "Dialogs.c"
+#line 6348 "Dialogs.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9075 "Dialogs.c"
+#line 6352 "Dialogs.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9081 "Dialogs.c"
+#line 6358 "Dialogs.c"
 	}
 }
 
 
 static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass * klass) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->finalize = text_entry_dialog_mediator_finalize;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate));
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) text_entry_dialog_mediator_real_on_modify_validate;
-#line 9095 "Dialogs.c"
+#line 6372 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator * self) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9104 "Dialogs.c"
+#line 6381 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator * obj) {
 	TextEntryDialogMediator * self;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9116 "Dialogs.c"
+#line 6393 "Dialogs.c"
 }
 
 
@@ -9148,24 +6424,24 @@ GType text_entry_dialog_mediator_get_type (void) {
 gpointer text_entry_dialog_mediator_ref (gpointer instance) {
 	TextEntryDialogMediator * self;
 	self = instance;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9141 "Dialogs.c"
+#line 6418 "Dialogs.c"
 }
 
 
 void text_entry_dialog_mediator_unref (gpointer instance) {
 	TextEntryDialogMediator * self;
 	self = instance;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9154 "Dialogs.c"
+#line 6431 "Dialogs.c"
 	}
 }
 
@@ -9173,91 +6449,67 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) {
 	gboolean result;
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9164 "Dialogs.c"
+#line 6441 "Dialogs.c"
 }
 
 
 MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType object_type, const gchar* title, const gchar* label, const gchar* initial_text) {
 	MultiTextEntryDialogMediator* self = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_;
+	MultiTextEntryDialog* _tmp0_;
 	MultiTextEntryDialog* _tmp1_;
-	MultiTextEntryDialog* _tmp2_;
-	GtkBox* _tmp3_;
-	GObject* _tmp4_;
-	MultiTextEntryDialog* _tmp5_;
-	MultiTextEntryDialog* _tmp6_;
-	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	const gchar* _tmp9_;
-#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+#line 619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialogMediator*) g_type_create_instance (object_type);
-#line 962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 962 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	builder = _tmp0_;
-#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = multi_text_entry_dialog_new ();
-#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp1_);
-#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 620 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = multi_text_entry_dialog_new ();
+#line 620 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp0_);
+#line 620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dialog = _tmp1_;
-#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->dialog;
-#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_dialog_get_type (), GtkDialog));
-#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_builder_get_object (builder, "dialog-vbox4");
-#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox), gtk_widget_get_type (), GtkWidget));
-#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->dialog;
-#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	multi_text_entry_dialog_set_builder (_tmp5_, builder);
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->dialog;
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = title;
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = label;
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = initial_text;
-#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	multi_text_entry_dialog_setup (_tmp6_, _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type, self, _tmp7_, _tmp8_, _tmp9_);
-#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (builder);
-#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 620 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->dialog = _tmp0_;
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = self->priv->dialog;
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = title;
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = label;
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = initial_text;
+#line 621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	multi_text_entry_dialog_setup (_tmp1_, _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type, self, _tmp2_, _tmp3_, _tmp4_);
+#line 619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9225 "Dialogs.c"
+#line 6478 "Dialogs.c"
 }
 
 
 static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) {
 	gboolean result = FALSE;
-#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9237 "Dialogs.c"
+#line 6490 "Dialogs.c"
 }
 
 
 gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) {
-#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
-#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9246 "Dialogs.c"
+#line 6499 "Dialogs.c"
 }
 
 
@@ -9265,231 +6517,231 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	gchar* result = NULL;
 	MultiTextEntryDialog* _tmp0_;
 	gchar* _tmp1_;
-#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
-#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = multi_text_entry_dialog_execute (_tmp0_);
-#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp1_;
-#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9264 "Dialogs.c"
+#line 6517 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9271 "Dialogs.c"
+#line 6524 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9280 "Dialogs.c"
+#line 6533 "Dialogs.c"
 	}
 }
 
 
 static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9290 "Dialogs.c"
+#line 6543 "Dialogs.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9294 "Dialogs.c"
+#line 6547 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9302 "Dialogs.c"
+#line 6555 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9309 "Dialogs.c"
+#line 6562 "Dialogs.c"
 		MultiTextEntryDialogMediator * object;
 		object = collect_values[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9316 "Dialogs.c"
+#line 6569 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9320 "Dialogs.c"
+#line 6573 "Dialogs.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9324 "Dialogs.c"
+#line 6577 "Dialogs.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9328 "Dialogs.c"
+#line 6581 "Dialogs.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9332 "Dialogs.c"
+#line 6585 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	MultiTextEntryDialogMediator ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9343 "Dialogs.c"
+#line 6596 "Dialogs.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9349 "Dialogs.c"
+#line 6602 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9353 "Dialogs.c"
+#line 6606 "Dialogs.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9357 "Dialogs.c"
+#line 6610 "Dialogs.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9361 "Dialogs.c"
+#line 6614 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecMultiTextEntryDialogMediator* spec;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9375 "Dialogs.c"
+#line 6628 "Dialogs.c"
 }
 
 
 gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9384 "Dialogs.c"
+#line 6637 "Dialogs.c"
 }
 
 
 void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	MultiTextEntryDialogMediator * old;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9404 "Dialogs.c"
+#line 6657 "Dialogs.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9408 "Dialogs.c"
+#line 6661 "Dialogs.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9414 "Dialogs.c"
+#line 6667 "Dialogs.c"
 	}
 }
 
 
 void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	MultiTextEntryDialogMediator * old;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9433 "Dialogs.c"
+#line 6686 "Dialogs.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9437 "Dialogs.c"
+#line 6690 "Dialogs.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9443 "Dialogs.c"
+#line 6696 "Dialogs.c"
 	}
 }
 
 
 static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMediatorClass * klass) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->finalize = multi_text_entry_dialog_mediator_finalize;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate));
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) multi_text_entry_dialog_mediator_real_on_modify_validate;
-#line 9457 "Dialogs.c"
+#line 6710 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialogMediator * self) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9466 "Dialogs.c"
+#line 6719 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator * obj) {
 	MultiTextEntryDialogMediator * self;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9478 "Dialogs.c"
+#line 6731 "Dialogs.c"
 }
 
 
@@ -9510,24 +6762,24 @@ GType multi_text_entry_dialog_mediator_get_type (void) {
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
 	MultiTextEntryDialogMediator * self;
 	self = instance;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9503 "Dialogs.c"
+#line 6756 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 	MultiTextEntryDialogMediator * self;
 	self = instance;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 616 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9516 "Dialogs.c"
+#line 6769 "Dialogs.c"
 	}
 }
 
@@ -9541,11 +6793,11 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	const gchar* _tmp12_;
 	gchar* _tmp13_;
 	gchar* _tmp14_;
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = should_escape;
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9534 "Dialogs.c"
+#line 6787 "Dialogs.c"
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
@@ -9554,2339 +6806,71 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = primary_text;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = guarded_markup_escape_text (_tmp1_);
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = secondary_text;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp5_;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup_printf ("<span weight=\"Bold\" size=\"larger\">%s</span>\n%s", _tmp3_, _tmp6_);
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp6_);
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp3_);
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp8_;
-#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9567 "Dialogs.c"
+#line 6820 "Dialogs.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = guarded_markup_escape_text (_tmp9_);
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = secondary_text;
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = g_strdup_printf ("<span weight=\"Bold\" size=\"larger\">%s</span>\n%s", _tmp11_, _tmp12_);
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp14_;
-#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 9587 "Dialogs.c"
-}
-
-
-static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self) {
-	gboolean result;
-	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 9596 "Dialogs.c"
-}
-
-
-EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter) {
-	EntryMultiCompletion * self = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	GeeCollection* _tmp7_;
-	GtkListStore* _tmp8_;
-	GtkListStore* _tmp9_;
-#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
-#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (EntryMultiCompletion*) g_object_new (object_type, NULL);
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = delimiter;
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_ == NULL) {
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = TRUE;
-#line 9619 "Dialogs.c"
-	} else {
-		const gchar* _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = delimiter;
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = strlen (_tmp2_);
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp3_;
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp4_ == 1;
-#line 9632 "Dialogs.c"
-	}
-#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = delimiter;
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_strdup (_tmp5_);
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->priv->delimiter);
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delimiter = _tmp6_;
-#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = completion_list;
-#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = entry_multi_completion_create_completion_store (_tmp7_);
-#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
-#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp9_);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_completion_set_text_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), 0);
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
-#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 9660 "Dialogs.c"
-}
-
-
-EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
-#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9667 "Dialogs.c"
-}
-
-
-static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list) {
-	GtkListStore* result = NULL;
-	GtkListStore* completion_store = NULL;
-	GtkListStore* _tmp0_;
-	GtkTreeIter store_iter = {0};
-	GeeIterator* completion_iter = NULL;
-	GeeCollection* _tmp1_;
-	GeeIterator* _tmp2_;
-#line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
-#line 1007 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, -1);
-#line 1007 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	completion_store = _tmp0_;
-#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = completion_list;
-#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	completion_iter = _tmp2_;
-#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	while (TRUE) {
-#line 9693 "Dialogs.c"
-		GeeIterator* _tmp3_;
-		gboolean _tmp4_;
-		GtkListStore* _tmp5_;
-		GtkTreeIter _tmp6_ = {0};
-		GtkListStore* _tmp7_;
-		GtkTreeIter _tmp8_;
-		GeeIterator* _tmp9_;
-		gpointer _tmp10_;
-		gchar* _tmp11_;
-#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = completion_iter;
-#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (!_tmp4_) {
-#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			break;
-#line 9711 "Dialogs.c"
-		}
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = completion_store;
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_list_store_append (_tmp5_, &_tmp6_);
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		store_iter = _tmp6_;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = completion_store;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = store_iter;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = completion_iter;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = gee_iterator_get (_tmp9_);
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = (gchar*) _tmp10_;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp11_);
-#line 9733 "Dialogs.c"
-	}
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = completion_store;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (completion_iter);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 9741 "Dialogs.c"
-}
-
-
-static gchar* string_strip (const gchar* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-	const gchar* _tmp1_;
-#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = g_strdup (self);
-#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = _result_;
-#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_strstrip (_tmp1_);
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _result_;
-#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 9764 "Dialogs.c"
-}
-
-
-static gboolean string_contains (const gchar* self, const gchar* needle) {
-	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 9784 "Dialogs.c"
-}
-
-
-static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_;
-	gunichar _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 9809 "Dialogs.c"
-		gchar* _tmp4_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 9817 "Dialogs.c"
-	} else {
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 9823 "Dialogs.c"
-	}
-}
-
-
-static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter) {
-	gboolean result = FALSE;
-	GtkTreeModel* model = NULL;
-	GtkEntryCompletion* _tmp0_;
-	GtkTreeModel* _tmp1_;
-	GtkTreeModel* _tmp2_;
-	gchar* possible_match = NULL;
-	GtkTreeModel* _tmp3_;
-	GtkTreeIter _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* normed_key = NULL;
-	const gchar* _tmp9_;
-	gchar* _tmp10_;
-	const gchar* _tmp11_;
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE);
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), FALSE);
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (iter != NULL, FALSE);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = completion;
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_entry_completion_get_model (_tmp0_);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	model = _tmp2_;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = model;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = *iter;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_tree_model_get (_tmp3_, &_tmp4_, 0, &possible_match, -1);
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = possible_match;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_utf8_casefold (_tmp5_, (gssize) -1);
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = g_utf8_normalize (_tmp7_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (possible_match);
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	possible_match = _tmp8_;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp7_);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = key;
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = g_utf8_normalize (_tmp9_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	normed_key = _tmp10_;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->delimiter;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp11_ == NULL) {
-#line 9891 "Dialogs.c"
-		const gchar* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-		gboolean _tmp16_;
-		gboolean _tmp17_;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = possible_match;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = normed_key;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = string_strip (_tmp13_);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _tmp14_;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = g_str_has_prefix (_tmp12_, _tmp15_);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = _tmp16_;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp15_);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp17_;
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (normed_key);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (possible_match);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (model);
-#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 9922 "Dialogs.c"
-	} else {
-		const gchar* _tmp18_;
-		const gchar* _tmp19_;
-		gboolean _tmp20_;
-		gchar* last_part = NULL;
-		const gchar* _tmp31_;
-		gchar* _tmp32_;
-		gchar* _tmp33_;
-		const gchar* _tmp34_;
-		gchar* _tmp35_;
-		gchar* _tmp36_;
-		const gchar* _tmp37_;
-		gint _tmp38_;
-		gint _tmp39_;
-		const gchar* _tmp40_;
-		const gchar* _tmp41_;
-		gchar* _tmp42_;
-		gchar* _tmp43_;
-		gboolean _tmp44_;
-		gboolean _tmp45_;
-#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = normed_key;
-#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = self->priv->delimiter;
-#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = string_contains (_tmp18_, _tmp19_);
-#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp20_) {
-#line 9951 "Dialogs.c"
-			gint offset = 0;
-			const gchar* _tmp21_;
-			const gchar* _tmp22_;
-			const gchar* _tmp23_;
-			gchar _tmp24_;
-			gint _tmp25_;
-			gint _tmp26_;
-			gint position = 0;
-			GtkWidget* _tmp27_;
-			gint _tmp28_;
-			gint _tmp29_;
-			gint _tmp30_;
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp21_ = normed_key;
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = normed_key;
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = self->priv->delimiter;
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = string_get (_tmp23_, (glong) 0);
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp25_ = string_last_index_of_char (_tmp22_, (gunichar) _tmp24_, 0);
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp26_ = g_utf8_strlen (_tmp21_, (gssize) _tmp25_);
-#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			offset = _tmp26_;
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp27_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp28_ = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), GTK_TYPE_EDITABLE, GtkEditable));
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			position = _tmp28_;
-#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp29_ = position;
-#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp30_ = offset;
-#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (_tmp29_ <= _tmp30_) {
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				result = FALSE;
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (normed_key);
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (possible_match);
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (model);
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				return result;
-#line 10000 "Dialogs.c"
-			}
-		}
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = normed_key;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = string_strip (_tmp31_);
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = _tmp32_;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = self->priv->delimiter;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = entry_multi_completion_get_last_part (_tmp33_, _tmp34_);
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = _tmp35_;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp33_);
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		last_part = _tmp36_;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = last_part;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = strlen (_tmp37_);
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp39_ = _tmp38_;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp39_ == 0) {
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			result = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (last_part);
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (normed_key);
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (possible_match);
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (model);
-#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return result;
-#line 10039 "Dialogs.c"
-		}
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp40_ = possible_match;
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp41_ = last_part;
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp42_ = string_strip (_tmp41_);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp43_ = _tmp42_;
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp44_ = g_str_has_prefix (_tmp40_, _tmp43_);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp45_ = _tmp44_;
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp43_);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp45_;
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (last_part);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (normed_key);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (possible_match);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (model);
-#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 10067 "Dialogs.c"
-	}
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (normed_key);
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (possible_match);
-#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (model);
-#line 10075 "Dialogs.c"
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 10098 "Dialogs.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 10106 "Dialogs.c"
-	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		return result;
-#line 10118 "Dialogs.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 10142 "Dialogs.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10148 "Dialogs.c"
-	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 10152 "Dialogs.c"
-	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 10156 "Dialogs.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 10168 "Dialogs.c"
-	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 10178 "Dialogs.c"
-	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 10184 "Dialogs.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10198 "Dialogs.c"
-	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10208 "Dialogs.c"
-	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 10214 "Dialogs.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 10223 "Dialogs.c"
-	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 10243 "Dialogs.c"
-}
-
-
-static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter) {
-	EntryMultiCompletion * self;
-	gboolean result = FALSE;
-	gchar* match = NULL;
-	GtkTreeModel* _tmp0_;
-	GtkTreeIter _tmp1_;
-	GtkEntry* entry = NULL;
-	GtkWidget* _tmp2_;
-	GtkEntry* _tmp3_;
-	gchar* old_text = NULL;
-	GtkEntry* _tmp4_;
-	const gchar* _tmp5_;
-	gchar* _tmp6_;
-	const gchar* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_;
-	gchar* new_text = NULL;
-	const gchar* _tmp26_;
-	const gchar* _tmp27_;
-	gchar* _tmp28_;
-	gchar* _tmp29_;
-	const gchar* _tmp30_;
-	gchar* _tmp31_;
-	gchar* _tmp32_;
-	gchar* _tmp33_;
-	gchar* _tmp34_;
-	GtkEntry* _tmp35_;
-	GtkEntry* _tmp36_;
-	gint _tmp37_;
-	gint _tmp38_;
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (iter != NULL, FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = model;
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = *iter;
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &match, -1);
-#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry));
-#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	entry = _tmp3_;
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = entry;
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_utf8_normalize (_tmp5_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old_text = _tmp6_;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = old_text;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = strlen (_tmp7_);
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp9_ > 0) {
-#line 10313 "Dialogs.c"
-		const gchar* _tmp10_;
-		const gchar* _tmp11_;
-		gboolean _tmp12_;
-#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = old_text;
-#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = self->priv->delimiter;
-#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = string_contains (_tmp10_, _tmp11_);
-#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp12_) {
-#line 10325 "Dialogs.c"
-			const gchar* _tmp13_ = NULL;
-			const gchar* _tmp14_;
-			const gchar* _tmp15_;
-			const gchar* _tmp16_;
-			const gchar* _tmp17_;
-			gchar _tmp18_;
-			gint _tmp19_;
-			gchar* _tmp20_;
-			gchar* _tmp21_;
-			gchar* _tmp22_;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp14_ = self->priv->delimiter;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (g_strcmp0 (_tmp14_, " ") != 0) {
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = " ";
-#line 10342 "Dialogs.c"
-			} else {
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = "";
-#line 10346 "Dialogs.c"
-			}
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp15_ = old_text;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp16_ = old_text;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp17_ = self->priv->delimiter;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = string_get (_tmp17_, (glong) 0);
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp19_ = string_last_index_of_char (_tmp16_, (gunichar) _tmp18_, 0);
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = string_substring (_tmp15_, (glong) 0, (glong) (_tmp19_ + 1));
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp21_ = _tmp20_;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = g_strconcat (_tmp21_, _tmp13_, NULL);
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (old_text);
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			old_text = _tmp22_;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (_tmp21_);
-#line 10370 "Dialogs.c"
-		} else {
-			gchar* _tmp23_;
-#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = g_strdup ("");
-#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (old_text);
-#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			old_text = _tmp23_;
-#line 10379 "Dialogs.c"
-		}
-	}
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = self->priv->delimiter;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (g_strcmp0 (_tmp25_, " ") != 0) {
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = " ";
-#line 10388 "Dialogs.c"
-	} else {
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = "";
-#line 10392 "Dialogs.c"
-	}
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = old_text;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = match;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = _tmp28_;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = self->priv->delimiter;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = _tmp31_;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = g_strconcat (_tmp32_, _tmp24_, NULL);
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = _tmp33_;
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp32_);
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp29_);
-#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	new_text = _tmp34_;
-#line 1065 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = entry;
-#line 1065 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_text (_tmp35_, new_text);
-#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = entry;
-#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = strlen (new_text);
-#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = _tmp37_;
-#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_EDITABLE, GtkEditable), (gint) _tmp38_);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = TRUE;
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (new_text);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (old_text);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (entry);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (match);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 10442 "Dialogs.c"
-}
-
-
-static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter) {
-	gchar* result = NULL;
-	gchar** split = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint split_length1;
-	gint _split_size_;
-	gboolean _tmp4_ = FALSE;
-	gchar** _tmp5_;
-	gint _tmp5__length1;
-#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (s != NULL, NULL);
-#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (delimiter != NULL, NULL);
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = s;
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = delimiter;
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0);
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	split = _tmp3_;
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	split_length1 = _vala_array_length (_tmp2_);
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_split_size_ = split_length1;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = split;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5__length1 = split_length1;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_ != NULL) {
-#line 10480 "Dialogs.c"
-		gchar** _tmp6_;
-		gint _tmp6__length1;
-		const gchar* _tmp7_;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = split;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6__length1 = split_length1;
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp6_[0];
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp7_ != NULL;
-#line 10492 "Dialogs.c"
-	} else {
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = FALSE;
-#line 10496 "Dialogs.c"
-	}
-#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp4_) {
-#line 10500 "Dialogs.c"
-		gchar** _tmp8_;
-		gint _tmp8__length1;
-		gchar** _tmp9_;
-		gint _tmp9__length1;
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = split;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8__length1 = split_length1;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = split;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9__length1 = split_length1;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp8_[_tmp9__length1 - 1];
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = g_strdup (_tmp10_);
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp11_;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 10525 "Dialogs.c"
-	} else {
-		gchar* _tmp12_;
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = g_strdup ("");
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp12_;
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 10536 "Dialogs.c"
-	}
-#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10540 "Dialogs.c"
-}
-
-
-static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass) {
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	entry_multi_completion_parent_class = g_type_class_peek_parent (klass);
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (EntryMultiCompletionPrivate));
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*) (GtkEntryCompletion *, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected;
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 10553 "Dialogs.c"
-}
-
-
-static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10560 "Dialogs.c"
-}
-
-
-static void entry_multi_completion_finalize (GObject * obj) {
-	EntryMultiCompletion * self;
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
-#line 995 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->priv->delimiter);
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10572 "Dialogs.c"
-}
-
-
-GType entry_multi_completion_get_type (void) {
-	static volatile gsize entry_multi_completion_type_id__volatile = 0;
-	if (g_once_init_enter (&entry_multi_completion_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (EntryMultiCompletionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) entry_multi_completion_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EntryMultiCompletion), 0, (GInstanceInitFunc) entry_multi_completion_instance_init, NULL };
-		GType entry_multi_completion_type_id;
-		entry_multi_completion_type_id = g_type_register_static (gtk_entry_completion_get_type (), "EntryMultiCompletion", &g_define_type_info, 0);
-		g_once_init_leave (&entry_multi_completion_type_id__volatile, entry_multi_completion_type_id);
-	}
-	return entry_multi_completion_type_id__volatile;
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
-	SetBackgroundPhotoDialog * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-	AppWindow* _tmp3_;
-	AppWindow* _tmp4_;
-#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_header;
-#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 1;
-#line 10606 "Dialogs.c"
-	} else {
-#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 0;
-#line 10610 "Dialogs.c"
-	}
-#line 1093 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = app_window_get_instance ();
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 10624 "Dialogs.c"
-}
-
-
-SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
-#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 10631 "Dialogs.c"
-}
-
-
-static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkCheckButton* _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self));
-#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->desktop_background_checkbox;
-#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp3_) {
-#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = TRUE;
-#line 10652 "Dialogs.c"
-	} else {
-		GtkCheckButton* _tmp4_;
-		gboolean _tmp5_;
-		gboolean _tmp6_;
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = self->priv->screensaver_checkbox;
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = _tmp5_;
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp6_;
-#line 10665 "Dialogs.c"
-	}
-#line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 10669 "Dialogs.c"
-}
-
-
-static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
-#line 10676 "Dialogs.c"
-}
-
-
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver) {
-	gboolean _vala_desktop_background = FALSE;
-	gboolean _vala_screensaver = FALSE;
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	gint _tmp0_;
-	GtkCheckButton* _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-	GtkCheckButton* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
-#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->desktop_background_checkbox;
-#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 1109 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp3_;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->priv->screensaver_checkbox;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _tmp5_;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp6_;
-#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _result_;
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (desktop_background) {
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*desktop_background = _vala_desktop_background;
-#line 10726 "Dialogs.c"
-	}
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (screensaver) {
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*screensaver = _vala_screensaver;
-#line 10732 "Dialogs.c"
-	}
-#line 1113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10736 "Dialogs.c"
-}
-
-
-static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
-	gint SetBackgroundPhotoDialog_private_offset;
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (SetBackgroundPhotoDialogPrivate));
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = set_background_photo_dialog_finalize;
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	SetBackgroundPhotoDialog_private_offset = g_type_class_get_instance_private_offset (klass);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_dialog.ui");
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, desktop_background_checkbox));
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
-#line 10758 "Dialogs.c"
-}
-
-
-static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_init_template (GTK_WIDGET (self));
-#line 10767 "Dialogs.c"
-}
-
-
-static void set_background_photo_dialog_finalize (GObject * obj) {
-	SetBackgroundPhotoDialog * self;
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->desktop_background_checkbox);
-#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->screensaver_checkbox);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
-#line 10781 "Dialogs.c"
-}
-
-
-GType set_background_photo_dialog_get_type (void) {
-	static volatile gsize set_background_photo_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL };
-		GType set_background_photo_dialog_type_id;
-		set_background_photo_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundPhotoDialog", &g_define_type_info, 0);
-		g_once_init_leave (&set_background_photo_dialog_type_id__volatile, set_background_photo_dialog_type_id);
-	}
-	return set_background_photo_dialog_type_id__volatile;
-}
-
-
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
-	SetBackgroundSlideshowDialog * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-	AppWindow* _tmp3_;
-	AppWindow* _tmp4_;
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_header;
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 1;
-#line 10815 "Dialogs.c"
-	} else {
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 0;
-#line 10819 "Dialogs.c"
-	}
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = app_window_get_instance ();
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 10833 "Dialogs.c"
-}
-
-
-SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
-#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 10840 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_real_constructed (GObject* base) {
-	SetBackgroundSlideshowDialog * self;
-#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
-#line 10850 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
-	gboolean _tmp0_ = FALSE;
-	GtkCheckButton* _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->desktop_background_checkbox;
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp3_) {
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = TRUE;
-#line 10871 "Dialogs.c"
-	} else {
-		GtkCheckButton* _tmp4_;
-		gboolean _tmp5_;
-		gboolean _tmp6_;
-#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = self->priv->screensaver_checkbox;
-#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = _tmp5_;
-#line 1145 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp6_;
-#line 10884 "Dialogs.c"
-	}
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
-#line 10888 "Dialogs.c"
-}
-
-
-static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
-#line 10895 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) {
-	gdouble value = 0.0;
-	GtkScale* _tmp0_;
-	GtkAdjustment* _tmp1_;
-	GtkAdjustment* _tmp2_;
-	gdouble _tmp3_;
-	gdouble _tmp4_;
-	gdouble _tmp5_;
-	gdouble _tmp6_;
-	gdouble _tmp7_;
-	gchar* text = NULL;
-	gint _tmp8_;
-	GtkLabel* _tmp25_;
-	const gchar* _tmp26_;
-#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->delay_scale;
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	value = _tmp4_;
-#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = value;
-#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 1155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->priv->delay_value;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp8_ < 60) {
-#line 10939 "Dialogs.c"
-		gint _tmp9_;
-		gint _tmp10_;
-		gchar* _tmp11_;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->delay_value;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->delay_value;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_);
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (text);
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp11_;
-#line 10953 "Dialogs.c"
-	} else {
-		gint _tmp12_;
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = self->priv->delay_value;
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp12_ < (60 * 60)) {
-#line 10960 "Dialogs.c"
-			gint minutes = 0;
-			gint _tmp13_;
-			gint _tmp14_;
-			gint _tmp15_;
-			gchar* _tmp16_;
-			gint _tmp17_;
-#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp13_ = self->priv->delay_value;
-#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			minutes = _tmp13_ / 60;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp14_ = minutes;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp15_ = minutes;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_);
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (text);
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			text = _tmp16_;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp17_ = minutes;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			self->priv->delay_value = _tmp17_ * 60;
-#line 10985 "Dialogs.c"
-		} else {
-			gint _tmp18_;
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = self->priv->delay_value;
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (_tmp18_ < ((60 * 60) * 24)) {
-#line 10992 "Dialogs.c"
-				gint hours = 0;
-				gint _tmp19_;
-				gint _tmp20_;
-				gint _tmp21_;
-				gchar* _tmp22_;
-				gint _tmp23_;
-#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp19_ = self->priv->delay_value;
-#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				hours = _tmp19_ / (60 * 60);
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp20_ = hours;
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp21_ = hours;
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_);
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (text);
-#line 1167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				text = _tmp22_;
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp23_ = hours;
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				self->priv->delay_value = _tmp23_ * (60 * 60);
-#line 11017 "Dialogs.c"
-			} else {
-				gchar* _tmp24_;
-#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = g_strdup (_ ("1 day"));
-#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (text);
-#line 1170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				text = _tmp24_;
-#line 1171 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				self->priv->delay_value = (60 * 60) * 24;
-#line 11028 "Dialogs.c"
-			}
-		}
-	}
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = self->priv->delay_value_label;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = text;
-#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_label (_tmp25_, _tmp26_);
-#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (text);
-#line 11040 "Dialogs.c"
-}
-
-
-static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11047 "Dialogs.c"
-}
-
-
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver) {
-	gint _vala_delay_value = 0;
-	gboolean _vala_desktop_background = FALSE;
-	gboolean _vala_screensaver = FALSE;
-	gboolean result = FALSE;
-	gboolean _result_ = FALSE;
-	gint _tmp0_;
-	gint _tmp1_;
-	GtkCheckButton* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	GtkCheckButton* _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp7_;
-#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->delay_value;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_delay_value = _tmp1_;
-#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->desktop_background_checkbox;
-#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_desktop_background = _tmp4_;
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->screensaver_checkbox;
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
-#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_screensaver = _tmp7_;
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _result_;
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (delay_value) {
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*delay_value = _vala_delay_value;
-#line 11103 "Dialogs.c"
-	}
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (desktop_background) {
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*desktop_background = _vala_desktop_background;
-#line 11109 "Dialogs.c"
-	}
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (screensaver) {
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*screensaver = _vala_screensaver;
-#line 11115 "Dialogs.c"
-	}
-#line 1187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 11119 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
-	gint SetBackgroundSlideshowDialog_private_offset;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) set_background_slideshow_dialog_real_constructed;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = set_background_slideshow_dialog_finalize;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	SetBackgroundSlideshowDialog_private_offset = g_type_class_get_instance_private_offset (klass);
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui");
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, desktop_background_checkbox));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, screensaver_checkbox));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_scale", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_scale));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_value_label", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_value_label));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
-#line 11149 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
-#line 1128 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->delay_value = 0;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_init_template (GTK_WIDGET (self));
-#line 11160 "Dialogs.c"
-}
-
-
-static void set_background_slideshow_dialog_finalize (GObject * obj) {
-	SetBackgroundSlideshowDialog * self;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
-#line 1120 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->desktop_background_checkbox);
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->screensaver_checkbox);
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_scale);
-#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->delay_value_label);
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11178 "Dialogs.c"
-}
-
-
-GType set_background_slideshow_dialog_get_type (void) {
-	static volatile gsize set_background_slideshow_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL };
-		GType set_background_slideshow_dialog_type_id;
-		set_background_slideshow_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
-		g_once_init_leave (&set_background_slideshow_dialog_type_id__volatile, set_background_slideshow_dialog_type_id);
-	}
-	return set_background_slideshow_dialog_type_id__volatile;
-}
-
-
-TextEntryDialog* text_entry_dialog_construct (GType object_type) {
-	TextEntryDialog * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_header;
-#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 1;
-#line 11210 "Dialogs.c"
-	} else {
-#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 0;
-#line 11214 "Dialogs.c"
-	}
-#line 1204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 11220 "Dialogs.c"
-}
-
-
-TextEntryDialog* text_entry_dialog_new (void) {
-#line 1201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11227 "Dialogs.c"
-}
-
-
-void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = builder;
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->builder = _tmp1_;
-#line 11246 "Dialogs.c"
-}
-
-
-static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11253 "Dialogs.c"
-}
-
-
-void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
-	const gchar* _tmp0_;
-	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-	GdkWindow* _tmp3_;
-	AppWindow* _tmp4_;
-	AppWindow* _tmp5_;
-	TextEntryDialogOnModifyValidateType _tmp6_;
-	void* _tmp6__target;
-	GtkLabel* name_label = NULL;
-	GtkBuilder* _tmp7_;
-	GObject* _tmp8_;
-	GtkLabel* _tmp9_;
-	GtkLabel* _tmp10_;
-	const gchar* _tmp11_;
-	GtkBuilder* _tmp12_;
-	GObject* _tmp13_;
-	GtkEntry* _tmp14_;
-	const gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_;
-	GtkEntry* _tmp18_;
-	GtkEntry* _tmp19_;
-	GtkEntry* _tmp20_;
-	GtkWidget* _tmp21_;
-	GtkButton* _tmp22_;
-	GtkWidget* _tmp23_;
-	GtkButton* _tmp24_;
-	GeeCollection* _tmp25_;
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (title != NULL);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (label != NULL);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = title;
-#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = app_window_get_instance ();
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp2_);
-#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = app_window_get_instance ();
-#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp5_);
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = modify_validate;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6__target = modify_validate_target;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->on_modify_validate = _tmp6_;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->priv->builder;
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "label");
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	name_label = _tmp9_;
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = name_label;
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = label;
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_text (_tmp10_, _tmp11_);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = self->priv->builder;
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = gtk_builder_get_object (_tmp12_, "entry");
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->entry);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->entry = _tmp14_;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = initial_text;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp16_ != NULL) {
-#line 11353 "Dialogs.c"
-		const gchar* _tmp17_;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = initial_text;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _tmp17_;
-#line 11359 "Dialogs.c"
-	} else {
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = "";
-#line 11363 "Dialogs.c"
-	}
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->entry;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_text (_tmp18_, _tmp15_);
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = self->priv->entry;
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = self->priv->entry;
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button1);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button1 = _tmp22_;
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button2);
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button2 = _tmp24_;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = completion_list;
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp25_ != NULL) {
-#line 11399 "Dialogs.c"
-		EntryMultiCompletion* completion = NULL;
-		GeeCollection* _tmp26_;
-		const gchar* _tmp27_;
-		EntryMultiCompletion* _tmp28_;
-		GtkEntry* _tmp29_;
-		EntryMultiCompletion* _tmp30_;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = completion_list;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = completion_delimiter;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = entry_multi_completion_new (_tmp26_, _tmp27_);
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		completion = _tmp28_;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = self->priv->entry;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = completion;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_completion (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (completion);
-#line 11422 "Dialogs.c"
-	}
-#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (name_label);
-#line 11428 "Dialogs.c"
-}
-
-
-gchar* text_entry_dialog_execute (TextEntryDialog* self) {
-	gchar* result = NULL;
-	gchar* text = NULL;
-	TextEntryDialogOnModifyValidateType _tmp0_;
-	void* _tmp0__target;
-	GtkEntry* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-	gint _tmp4_;
-	GtkEntry* _tmp8_;
-	guint _tmp9_;
-#line 1240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text = NULL;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->on_modify_validate;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->entry;
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 11465 "Dialogs.c"
-		GtkEntry* _tmp5_;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = self->priv->entry;
-#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = g_strdup (_tmp6_);
-#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (text);
-#line 1249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp7_;
-#line 11479 "Dialogs.c"
-	}
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->priv->entry;
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
-#line 1252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = text;
-#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 11493 "Dialogs.c"
-}
-
-
-void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
-	TextEntryDialogOnModifyValidateType _tmp0_;
-	void* _tmp0__target;
-	GtkEntry* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->on_modify_validate;
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->entry;
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 11517 "Dialogs.c"
-}
-
-
-static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 11528 "Dialogs.c"
-}
-
-
-static void text_entry_dialog_instance_init (TextEntryDialog * self) {
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 11535 "Dialogs.c"
-}
-
-
-static void text_entry_dialog_finalize (GObject * obj) {
-	TextEntryDialog * self;
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->entry);
-#line 1197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button1);
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button2);
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 11553 "Dialogs.c"
-}
-
-
-GType text_entry_dialog_get_type (void) {
-	static volatile gsize text_entry_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&text_entry_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (TextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TextEntryDialog), 0, (GInstanceInitFunc) text_entry_dialog_instance_init, NULL };
-		GType text_entry_dialog_type_id;
-		text_entry_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "TextEntryDialog", &g_define_type_info, 0);
-		g_once_init_leave (&text_entry_dialog_type_id__volatile, text_entry_dialog_type_id);
-	}
-	return text_entry_dialog_type_id__volatile;
-}
-
-
-MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
-	MultiTextEntryDialog * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_header;
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 1;
-#line 11585 "Dialogs.c"
-	} else {
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = 0;
-#line 11589 "Dialogs.c"
-	}
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 11595 "Dialogs.c"
-}
-
-
-MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
-#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 11602 "Dialogs.c"
-}
-
-
-void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = builder;
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->builder = _tmp1_;
-#line 11621 "Dialogs.c"
-}
-
-
-void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text) {
-	const gchar* _tmp0_;
-	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-	GdkWindow* _tmp3_;
-	AppWindow* _tmp4_;
-	AppWindow* _tmp5_;
-	MultiTextEntryDialogOnModifyValidateType _tmp6_;
-	void* _tmp6__target;
-	GtkBuilder* _tmp7_;
-	GObject* _tmp8_;
-	GtkTextView* _tmp9_;
-	GtkTextView* _tmp10_;
-	GtkTextView* _tmp11_;
-	GtkTextBuffer* _tmp12_;
-	GtkTextBuffer* _tmp13_;
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_;
-	GtkTextView* _tmp17_;
-	GtkTextBuffer* _tmp18_;
-	GtkTextBuffer* _tmp19_;
-	GtkTextView* _tmp20_;
-	GtkWidget* _tmp21_;
-	GtkButton* _tmp22_;
-	GtkWidget* _tmp23_;
-	GtkButton* _tmp24_;
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (title != NULL);
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (label != NULL);
-#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = title;
-#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), 500, 300);
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = app_window_get_instance ();
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = app_window_get_instance ();
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp5_);
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = modify_validate;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6__target = modify_validate_target;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->on_modify_validate = _tmp6_;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->priv->builder;
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "textview1");
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp8_) : NULL);
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->entry);
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->entry = _tmp9_;
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = self->priv->entry;
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_text_view_set_wrap_mode (_tmp10_, GTK_WRAP_WORD);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->entry;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = gtk_text_buffer_new (NULL);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _tmp12_;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_text_view_set_buffer (_tmp11_, _tmp13_);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp13_);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = initial_text;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp15_ != NULL) {
-#line 11719 "Dialogs.c"
-		const gchar* _tmp16_;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = initial_text;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = _tmp16_;
-#line 11725 "Dialogs.c"
-	} else {
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = "";
-#line 11729 "Dialogs.c"
-	}
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->entry;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = gtk_text_view_get_buffer (_tmp17_);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = _tmp18_;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_set (_tmp19_, "text", _tmp14_, NULL);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = self->priv->entry;
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button1);
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button1 = _tmp22_;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button2);
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button2 = _tmp24_;
-#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 11761 "Dialogs.c"
-}
-
-
-gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
-	gchar* result = NULL;
-	gchar* text = NULL;
-	gint _tmp0_;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text = NULL;
-#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 11779 "Dialogs.c"
-		GtkTextView* _tmp1_;
-		GtkTextBuffer* _tmp2_;
-		GtkTextBuffer* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = self->priv->entry;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _tmp2_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = _tmp4_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (text);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp5_;
-#line 11799 "Dialogs.c"
-	}
-#line 1309 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = text;
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 11807 "Dialogs.c"
-}
-
-
-static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 11818 "Dialogs.c"
-}
-
-
-static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 11825 "Dialogs.c"
-}
-
-
-static void multi_text_entry_dialog_finalize (GObject * obj) {
-	MultiTextEntryDialog * self;
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
-#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->entry);
-#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button1);
-#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button2);
-#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 11843 "Dialogs.c"
-}
-
-
-GType multi_text_entry_dialog_get_type (void) {
-	static volatile gsize multi_text_entry_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&multi_text_entry_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (MultiTextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multi_text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultiTextEntryDialog), 0, (GInstanceInitFunc) multi_text_entry_dialog_instance_init, NULL };
-		GType multi_text_entry_dialog_type_id;
-		multi_text_entry_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "MultiTextEntryDialog", &g_define_type_info, 0);
-		g_once_init_leave (&multi_text_entry_dialog_type_id__volatile, multi_text_entry_dialog_type_id);
-	}
-	return multi_text_entry_dialog_type_id__volatile;
+#line 6840 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name) {
 	EventRenameDialog* self = NULL;
 	const gchar* _tmp0_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = event_name;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _ ("Rename Event"), _ ("Name:"), _tmp0_, NULL, NULL);
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11868 "Dialogs.c"
+#line 6853 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 11875 "Dialogs.c"
+#line 6860 "Dialogs.c"
 }
 
 
@@ -11896,39 +6880,39 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_prep_event_name (_tmp1_);
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11899 "Dialogs.c"
+#line 6884 "Dialogs.c"
 }
 
 
 gchar* event_rename_dialog_execute (EventRenameDialog* self) {
-#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
-#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 11908 "Dialogs.c"
+#line 6893 "Dialogs.c"
 }
 
 
 static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EventRenameDialogClass *) klass)->execute = (gchar* (*) (EventRenameDialog *)) event_rename_dialog_real_execute;
-#line 11917 "Dialogs.c"
+#line 6902 "Dialogs.c"
 }
 
 
@@ -11951,20 +6935,20 @@ GType event_rename_dialog_get_type (void) {
 EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title) {
 	EditTitleDialog* self = NULL;
 	const gchar* _tmp0_;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = photo_title;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, C_ ("Dialog Title", "Edit Title"), _ ("Title:"), _tmp0_, NULL, NULL);
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11946 "Dialogs.c"
+#line 6931 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 11953 "Dialogs.c"
+#line 6938 "Dialogs.c"
 }
 
 
@@ -11974,56 +6958,56 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_title (_tmp1_);
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11977 "Dialogs.c"
+#line 6962 "Dialogs.c"
 }
 
 
 gchar* edit_title_dialog_execute (EditTitleDialog* self) {
-#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
-#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 11986 "Dialogs.c"
+#line 6971 "Dialogs.c"
 }
 
 
 static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	EditTitleDialog * self;
 	gboolean result = FALSE;
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_DIALOG, EditTitleDialog);
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12001 "Dialogs.c"
+#line 6986 "Dialogs.c"
 }
 
 
 static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditTitleDialogClass *) klass)->execute = (gchar* (*) (EditTitleDialog *)) edit_title_dialog_real_execute;
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) edit_title_dialog_real_on_modify_validate;
-#line 12012 "Dialogs.c"
+#line 6997 "Dialogs.c"
 }
 
 
@@ -12050,38 +7034,38 @@ EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar
 	gchar* title_tmp = NULL;
 	gchar* _tmp2_;
 	const gchar* _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 1345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 678 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _ ("Edit Event Comment");
-#line 12045 "Dialogs.c"
+#line 7030 "Dialogs.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _ ("Edit Photo/Video Comment");
-#line 12049 "Dialogs.c"
+#line 7034 "Dialogs.c"
 	}
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strdup (_tmp0_);
-#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title_tmp = _tmp2_;
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = comment;
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _ ("Comment:"), _tmp3_);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12063 "Dialogs.c"
+#line 7048 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12070 "Dialogs.c"
+#line 7055 "Dialogs.c"
 }
 
 
@@ -12091,56 +7075,56 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_comment (_tmp1_);
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12094 "Dialogs.c"
+#line 7079 "Dialogs.c"
 }
 
 
 gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
-#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
-#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12103 "Dialogs.c"
+#line 7088 "Dialogs.c"
 }
 
 
 static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) {
 	EditCommentDialog * self;
 	gboolean result = FALSE;
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_DIALOG, EditCommentDialog);
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12118 "Dialogs.c"
+#line 7103 "Dialogs.c"
 }
 
 
 static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditCommentDialogClass *) klass)->execute = (gchar* (*) (EditCommentDialog *)) edit_comment_dialog_real_execute;
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (MultiTextEntryDialogMediator *, const gchar*)) edit_comment_dialog_real_on_modify_validate;
-#line 12129 "Dialogs.c"
+#line 7114 "Dialogs.c"
 }
 
 
@@ -12175,59 +7159,59 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	gchar* _tmp8_;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_;
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_));
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	trash_action = _tmp1_;
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = owner;
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_message;
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp2_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp3_);
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp4_);
-#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp4_;
-#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Remove From Library"), (gint) GTK_RESPONSE_NO);
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = title;
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = user_message;
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp8_);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp8_);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (trash_action);
-#line 1379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12216 "Dialogs.c"
+#line 7201 "Dialogs.c"
 }
 
 
@@ -12243,53 +7227,53 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	gchar* _tmp6_;
 	GtkResponseType _result_ = 0;
 	gint _tmp7_;
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = owner;
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = user_message;
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
-#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Keep"), (gint) GTK_RESPONSE_NO);
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Delete"), (gint) GTK_RESPONSE_YES);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = title;
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_message;
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = build_alert_body_text (_tmp3_, _tmp4_, TRUE);
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp6_);
-#line 1391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp6_);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp7_;
-#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12278 "Dialogs.c"
+#line 7263 "Dialogs.c"
 }
 
 
@@ -12326,26 +7310,26 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gint _tmp31_;
 	GtkMessageDialog* _tmp32_;
 	GtkResponseType _tmp33_;
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
-#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12321 "Dialogs.c"
+#line 7306 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_photo_it = _tmp1_;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12334 "Dialogs.c"
+#line 7319 "Dialogs.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			Photo* photo = NULL;
@@ -12353,153 +7337,153 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			gpointer _tmp5_;
 			Photo* _tmp6_;
 			gboolean _tmp7_;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12350 "Dialogs.c"
+#line 7335 "Dialogs.c"
 			}
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			photo = (Photo*) _tmp5_;
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo;
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = photo_has_editable (_tmp6_);
-#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12364 "Dialogs.c"
+#line 7349 "Dialogs.c"
 				gint _tmp8_;
-#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
-#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12370 "Dialogs.c"
+#line 7355 "Dialogs.c"
 			}
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12374 "Dialogs.c"
+#line 7359 "Dialogs.c"
 		}
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12378 "Dialogs.c"
+#line 7363 "Dialogs.c"
 	}
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ == 0) {
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12388 "Dialogs.c"
+#line 7373 "Dialogs.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _ ("Revert External Edit?");
-#line 12396 "Dialogs.c"
+#line 7381 "Dialogs.c"
 	} else {
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _ ("Revert External Edits?");
-#line 12400 "Dialogs.c"
+#line 7385 "Dialogs.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strdup (_tmp10_);
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	headline = _tmp12_;
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = count;
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = count;
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_strdup_printf (ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp13_), _tmp14_);
-#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp15_;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = count;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_ == 1) {
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _ ("Re_vert External Edit");
-#line 12420 "Dialogs.c"
+#line 7405 "Dialogs.c"
 	} else {
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _ ("Re_vert External Edits");
-#line 12424 "Dialogs.c"
+#line 7409 "Dialogs.c"
 	}
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = g_strdup (_tmp16_);
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	action = _tmp18_;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = owner;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = msg;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp19_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp20_);
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp21_);
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp21_;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = dialog;
-#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = dialog;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = action;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_dialog_get_type (), GtkDialog), _tmp24_, (gint) GTK_RESPONSE_YES);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = dialog;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = headline;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = msg;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = build_alert_body_text (_tmp26_, _tmp27_, TRUE);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = _tmp28_;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (_tmp25_, _tmp29_);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp29_);
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = dialog;
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_dialog_get_type (), GtkDialog));
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp31_;
-#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = dialog;
-#line 1427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = _result_;
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp33_ == GTK_RESPONSE_YES;
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (action);
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (headline);
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12488 "Dialogs.c"
+#line 7473 "Dialogs.c"
 }
 
 
@@ -12524,2666 +7508,81 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gint _tmp13_;
 	GtkMessageDialog* _tmp14_;
 	GtkResponseType _tmp15_;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 766 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == 0) {
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12523 "Dialogs.c"
+#line 7508 "Dialogs.c"
 	}
-#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
-#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = count;
-#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf (ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_), _tmp2_);
-#line 1436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp3_;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = owner;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = msg;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp4_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp6_;
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = dialog;
-#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = dialog;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _ ("_Remove"), (gint) GTK_RESPONSE_OK);
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = count;
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ == 1) {
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _ ("Remove Photo From Library");
-#line 12557 "Dialogs.c"
+#line 7542 "Dialogs.c"
 	} else {
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _ ("Remove Photos From Library");
-#line 12561 "Dialogs.c"
+#line 7546 "Dialogs.c"
 	}
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = dialog;
-#line 1445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), _tmp9_);
-#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = dialog;
-#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_dialog_get_type (), GtkDialog));
-#line 1447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp13_;
-#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = dialog;
-#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _result_;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp15_ == GTK_RESPONSE_OK;
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 12587 "Dialogs.c"
-}
-
-
-static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 12594 "Dialogs.c"
-}
-
-
-static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
-	gboolean result;
-	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
-#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 12603 "Dialogs.c"
-}
-
-
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-	ProgressDialog * self = NULL;
-	GCancellable* _tmp0_;
-	GCancellable* _tmp1_;
-	const gchar* _tmp2_;
-	GtkWindow* _tmp3_;
-	GtkProgressBar* _tmp5_;
-	GtkProgressBar* _tmp6_;
-	GtkBox* vbox_bar = NULL;
-	GtkBox* _tmp7_;
-	GtkBox* _tmp8_;
-	GtkProgressBar* _tmp9_;
-	GCancellable* _tmp10_;
-	GtkBox* hbox = NULL;
-	GtkBox* _tmp13_;
-	GtkBox* _tmp14_;
-	GtkBox* _tmp15_;
-	GtkButton* _tmp16_;
-	GtkLabel* primary_text_label = NULL;
-	GtkLabel* _tmp19_;
-	const gchar* _tmp20_;
-	gchar* _tmp21_;
-	gchar* _tmp22_;
-	GtkBox* vbox = NULL;
-	GtkBox* _tmp23_;
-	GtkBox* _tmp24_;
-	gulong _tmp25_;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (text != NULL, NULL);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (ProgressDialog*) g_object_new (object_type, NULL);
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = cancellable;
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->cancellable);
-#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->cancellable = _tmp1_;
-#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = text;
-#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = owner;
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp3_ != NULL) {
-#line 12660 "Dialogs.c"
-		GtkWindow* _tmp4_;
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = owner;
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 12666 "Dialogs.c"
-	}
-#line 1473 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1474 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->progress_bar;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = self->priv->progress_bar;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp7_);
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	vbox_bar = _tmp7_;
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = vbox_bar;
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = self->priv->progress_bar;
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = cancellable;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp10_ != NULL) {
-#line 12696 "Dialogs.c"
-		GtkButton* _tmp11_;
-		GtkButton* _tmp12_;
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp11_);
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->cancel_button);
-#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->cancel_button = _tmp11_;
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = self->priv->cancel_button;
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
-#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 12713 "Dialogs.c"
-	}
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp13_);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	hbox = _tmp13_;
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = hbox;
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = vbox_bar;
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->cancel_button;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp16_ != NULL) {
-#line 12731 "Dialogs.c"
-		GtkBox* _tmp17_;
-		GtkButton* _tmp18_;
-#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = hbox;
-#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = self->priv->cancel_button;
-#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 12740 "Dialogs.c"
-	}
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = (GtkLabel*) gtk_label_new ("");
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp19_);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	primary_text_label = _tmp19_;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = text;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _tmp21_;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp22_);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (primary_text_label, 0.0f);
-#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (primary_text_label, 0.5f);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp23_);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	vbox = _tmp23_;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = hbox;
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1507 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = now_ms ();
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->time_started = _tmp25_;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (vbox);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (primary_text_label);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (hbox);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (vbox_bar);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 12806 "Dialogs.c"
-}
-
-
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 12813 "Dialogs.c"
-}
-
-
-static void progress_dialog_real_realize (GtkWidget* base) {
-	ProgressDialog * self;
-	GCancellable* _tmp0_;
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->cancellable;
-#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == NULL) {
-#line 12828 "Dialogs.c"
-		GdkWindow* _tmp1_;
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 12834 "Dialogs.c"
-	}
-}
-
-
-void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
-	gint _tmp0_;
-	gint _tmp1_;
-#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = update_every;
-#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = update_every;
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->update_every = _tmp1_;
-#line 12852 "Dialogs.c"
-}
-
-
-void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
-	gint _tmp0_;
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = minimum_on_screen_time_msec;
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 12864 "Dialogs.c"
-}
-
-
-void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
-	gint _tmp0_;
-	gint _tmp1_;
-#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = current;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = total;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 12879 "Dialogs.c"
-}
-
-
-void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
-	gdouble _tmp0_;
-	gdouble _tmp1_;
-	gdouble _tmp2_;
-	GtkProgressBar* _tmp3_;
-	gdouble _tmp4_;
-	GtkProgressBar* _tmp5_;
-	gdouble _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-#line 1537 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = pct;
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pct = _tmp1_;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = pct;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	progress_dialog_maybe_show_all (self, _tmp2_);
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->progress_bar;
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = pct;
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->progress_bar;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = pct;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = g_strdup_printf (_ ("%d%%"), (gint) (_tmp6_ * 100.0));
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_progress_bar_set_text (_tmp5_, _tmp8_);
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp8_);
-#line 12923 "Dialogs.c"
-}
-
-
-void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
-	GtkProgressBar* _tmp0_;
-	const gchar* _tmp1_;
-#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (text != NULL);
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->progress_bar;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = text;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 12942 "Dialogs.c"
-}
-
-
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	guint64 _tmp1_;
-	gboolean _tmp8_ = FALSE;
-	GCancellable* _tmp9_;
-	gboolean keep_going = FALSE;
-	gboolean _tmp12_;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->last_count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_ == G_MAXUINT64) {
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = TRUE;
-#line 12962 "Dialogs.c"
-	} else {
-		guint64 _tmp2_;
-		guint64 _tmp3_;
-		gint _tmp4_;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = self->priv->last_count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = self->priv->update_every;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 12975 "Dialogs.c"
-	}
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 12979 "Dialogs.c"
-		guint64 _tmp5_;
-		guint64 _tmp6_;
-		guint64 _tmp7_;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = count;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = total;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
-#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = count;
-#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->last_count = _tmp7_;
-#line 12993 "Dialogs.c"
-	}
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = self->priv->cancellable;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp9_ != NULL) {
-#line 12999 "Dialogs.c"
-		GCancellable* _tmp10_;
-		gboolean _tmp11_;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->cancellable;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = !_tmp11_;
-#line 13008 "Dialogs.c"
-	} else {
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = TRUE;
-#line 13012 "Dialogs.c"
-	}
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	keep_going = _tmp8_;
-#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = do_event_loop;
-#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp12_) {
-#line 1577 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		spin_event_loop ();
-#line 13022 "Dialogs.c"
-	}
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = keep_going;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 13028 "Dialogs.c"
-}
-
-
-void progress_dialog_close (ProgressDialog* self) {
-#line 1582 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13039 "Dialogs.c"
-}
-
-
-static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
-	gboolean result = FALSE;
-#line 1591 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	progress_dialog_on_cancel (self);
-#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = FALSE;
-#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 13053 "Dialogs.c"
-}
-
-
-static void progress_dialog_on_cancel (ProgressDialog* self) {
-	GCancellable* _tmp0_;
-	GtkButton* _tmp2_;
-#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->cancellable;
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ != NULL) {
-#line 13066 "Dialogs.c"
-		GCancellable* _tmp1_;
-#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = self->priv->cancellable;
-#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_cancellable_cancel (_tmp1_);
-#line 13072 "Dialogs.c"
-	}
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->cancel_button;
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13078 "Dialogs.c"
-}
-
-
-static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp2_) {
-#line 13094 "Dialogs.c"
-		gulong _tmp3_;
-		gulong _tmp4_;
-		gint _tmp5_;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = now_ms ();
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = self->priv->time_started;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13106 "Dialogs.c"
-	} else {
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = FALSE;
-#line 13110 "Dialogs.c"
-	}
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 13114 "Dialogs.c"
-		gdouble pps = 0.0;
-		gdouble _tmp6_;
-		gint _tmp7_;
-		gdouble ttc = 0.0;
-		gdouble _tmp8_;
-		gdouble _tmp9_;
-		gint _tmp10_;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = pct;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = self->priv->minimum_on_screen_time_msec;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		pps = (_tmp6_ * 100.0) / _tmp7_;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = pps;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		ttc = 100.0 / _tmp8_;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = ttc;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->minimum_on_screen_time_msec;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp9_ > ((gdouble) _tmp10_)) {
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			spin_event_loop ();
-#line 13142 "Dialogs.c"
-		}
-	}
-}
-
-
-static void progress_dialog_class_init (ProgressDialogClass * klass) {
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	progress_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) progress_dialog_real_realize;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13157 "Dialogs.c"
-}
-
-
-static void progress_dialog_instance_init (ProgressDialog * self) {
-	GtkProgressBar* _tmp0_;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->progress_bar = _tmp0_;
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->cancel_button = NULL;
-#line 1458 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->last_count = G_MAXUINT64;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->update_every = 1;
-#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->minimum_on_screen_time_msec = 500;
-#line 13179 "Dialogs.c"
-}
-
-
-static void progress_dialog_finalize (GObject * obj) {
-	ProgressDialog * self;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->progress_bar);
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->cancel_button);
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->cancellable);
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13195 "Dialogs.c"
-}
-
-
-GType progress_dialog_get_type (void) {
-	static volatile gsize progress_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&progress_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (ProgressDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressDialog), 0, (GInstanceInitFunc) progress_dialog_instance_init, NULL };
-		GType progress_dialog_type_id;
-		progress_dialog_type_id = g_type_register_static (gtk_window_get_type (), "ProgressDialog", &g_define_type_info, 0);
-		g_once_init_leave (&progress_dialog_type_id__volatile, progress_dialog_type_id);
-	}
-	return progress_dialog_type_id__volatile;
-}
-
-
-static GType adjust_date_time_dialog_time_system_get_type (void) {
-	static volatile gsize adjust_date_time_dialog_time_system_type_id__volatile = 0;
-	if (g_once_init_enter (&adjust_date_time_dialog_time_system_type_id__volatile)) {
-		static const GEnumValue values[] = {{ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM", "am"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM", "pm"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR", "24hr"}, {0, NULL, NULL}};
-		GType adjust_date_time_dialog_time_system_type_id;
-		adjust_date_time_dialog_time_system_type_id = g_enum_register_static ("AdjustDateTimeDialogTimeSystem", values);
-		g_once_init_leave (&adjust_date_time_dialog_time_system_type_id__volatile, adjust_date_time_dialog_time_system_type_id);
-	}
-	return adjust_date_time_dialog_time_system_type_id__volatile;
-}
-
-
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13226 "Dialogs.c"
-}
-
-
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13233 "Dialogs.c"
-}
-
-
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13240 "Dialogs.c"
-}
-
-
-static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13247 "Dialogs.c"
-}
-
-
-static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
-	gboolean result;
-	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 13256 "Dialogs.c"
-}
-
-
-static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13263 "Dialogs.c"
-}
-
-
-static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13270 "Dialogs.c"
-}
-
-
-static void g_time_local (time_t time, struct tm* result) {
-	struct tm _result_ = {0};
-	struct tm _tmp0_ = {0};
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	localtime_r (&time, &_tmp0_);
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	*result = _result_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return;
-#line 13285 "Dialogs.c"
-}
-
-
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-	AdjustDateTimeDialog * self = NULL;
-	Dateable* _tmp0_;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp1_;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_;
-	AppWindow* _tmp4_;
-	AppWindow* _tmp5_;
-	GtkCalendar* _tmp6_;
-	GtkCalendar* _tmp7_;
-	GtkCalendar* _tmp8_;
-	GtkCalendar* _tmp9_;
-	GtkCalendar* _tmp10_;
-	ConfigFacade* _tmp11_;
-	ConfigFacade* _tmp12_;
-	gboolean _tmp13_;
-	gboolean _tmp14_;
-	GtkSpinButton* _tmp17_;
-	GtkSpinButton* _tmp18_;
-	GtkSpinButton* _tmp19_;
-	GtkSpinButton* _tmp20_;
-	GtkSpinButton* _tmp21_;
-	GtkSpinButton* _tmp22_;
-	GtkSpinButton* _tmp23_;
-	GtkSpinButton* _tmp24_;
-	GtkSpinButton* _tmp25_;
-	GtkSpinButton* _tmp26_;
-	GtkSpinButton* _tmp27_;
-	GtkComboBoxText* _tmp28_;
-	GtkComboBoxText* _tmp29_;
-	GtkComboBoxText* _tmp30_;
-	GtkComboBoxText* _tmp31_;
-	GtkComboBoxText* _tmp32_;
-	GtkBox* clock = NULL;
-	GtkBox* _tmp33_;
-	GtkBox* _tmp34_;
-	GtkSpinButton* _tmp35_;
-	GtkBox* _tmp36_;
-	GtkLabel* _tmp37_;
-	GtkLabel* _tmp38_;
-	GtkBox* _tmp39_;
-	GtkSpinButton* _tmp40_;
-	GtkBox* _tmp41_;
-	GtkLabel* _tmp42_;
-	GtkLabel* _tmp43_;
-	GtkBox* _tmp44_;
-	GtkSpinButton* _tmp45_;
-	GtkBox* _tmp46_;
-	GtkComboBoxText* _tmp47_;
-	GtkRadioButton* _tmp48_;
-	GtkRadioButton* _tmp49_;
-	ConfigFacade* _tmp50_;
-	ConfigFacade* _tmp51_;
-	gboolean _tmp52_;
-	gboolean _tmp53_ = FALSE;
-	gboolean _tmp54_;
-	GtkRadioButton* _tmp56_;
-	GtkRadioButton* _tmp57_;
-	GSList* _tmp58_;
-	GtkRadioButton* _tmp59_;
-	GtkRadioButton* _tmp60_;
-	ConfigFacade* _tmp61_;
-	ConfigFacade* _tmp62_;
-	gboolean _tmp63_;
-	gboolean _tmp64_ = FALSE;
-	gboolean _tmp65_;
-	GtkRadioButton* _tmp67_;
-	GtkRadioButton* _tmp68_;
-	gboolean _tmp69_;
-	gboolean _tmp78_ = FALSE;
-	ConfigFacade* _tmp79_;
-	ConfigFacade* _tmp80_;
-	gboolean _tmp81_;
-	gboolean _tmp82_;
-	GtkCheckButton* _tmp84_;
-	gboolean _tmp85_ = FALSE;
-	gboolean _tmp86_;
-	GtkCheckButton* _tmp93_;
-	GtkBox* time_content = NULL;
-	GtkBox* _tmp94_;
-	GtkBox* _tmp95_;
-	GtkCalendar* _tmp96_;
-	GtkBox* _tmp97_;
-	GtkBox* _tmp98_;
-	gboolean _tmp99_;
-	GdkPixbuf* preview = NULL;
-	GtkBox* image_content = NULL;
-	GtkBox* _tmp113_;
-	GtkBox* _tmp114_;
-	GtkBox* _tmp115_;
-	GtkImage* _tmp116_ = NULL;
-	GdkPixbuf* _tmp117_;
-	GtkImage* image = NULL;
-	GtkImage* _tmp121_;
-	GtkLabel* _tmp122_;
-	GtkBox* _tmp123_;
-	GtkImage* _tmp124_;
-	GtkBox* _tmp125_;
-	GtkLabel* _tmp126_;
-	GtkBox* hbox = NULL;
-	GtkBox* _tmp127_;
-	GtkBox* _tmp128_;
-	GtkBox* _tmp129_;
-	GtkBox* _tmp130_;
-	GtkBox* _tmp131_;
-	GtkBox* _tmp132_;
-	GtkBox* _tmp133_;
-	GtkBox* _tmp134_;
-	GtkBox* _tmp135_;
-	GtkBox* _tmp136_;
-	GtkBox* _tmp137_;
-	GtkBox* _tmp138_;
-	GtkLabel* _tmp139_;
-	GtkLabel* _tmp140_;
-	GtkLabel* _tmp141_;
-	GtkBox* _tmp142_;
-	GtkLabel* _tmp143_;
-	Dateable* _tmp144_;
-	time_t _tmp145_;
-	time_t _tmp146_;
-	time_t _tmp148_;
-	struct tm _tmp149_ = {0};
-	ConfigFacade* _tmp150_;
-	ConfigFacade* _tmp151_;
-	gboolean _tmp152_;
-	GError * _inner_error_ = NULL;
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_DATEABLE (source), NULL);
-#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = source;
-#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_assert (_tmp0_ != NULL, "source != null");
-#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_settings_get_default ();
-#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = use_header;
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp3_) {
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = 1;
-#line 13432 "Dialogs.c"
-	} else {
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = 0;
-#line 13436 "Dialogs.c"
-	}
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
-#line 1663 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1664 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = app_window_get_instance ();
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp5_);
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 1669 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = (GtkCalendar*) gtk_calendar_new ();
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp6_);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->calendar);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->calendar = _tmp6_;
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->priv->calendar;
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp7_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->priv->calendar;
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp8_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = self->priv->calendar;
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp9_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = self->priv->calendar;
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp10_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = config_facade_get_instance ();
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_;
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp12_);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp14_) {
-#line 13492 "Dialogs.c"
-		GtkSpinButton* _tmp15_;
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp15_);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->hour);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->hour = _tmp15_;
-#line 13502 "Dialogs.c"
-	} else {
-		GtkSpinButton* _tmp16_;
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp16_);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->hour);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->hour = _tmp16_;
-#line 13513 "Dialogs.c"
-	}
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->hour;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp17_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->hour;
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = self->priv->hour;
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp20_);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->minute);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->minute = _tmp20_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = self->priv->minute;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->priv->minute;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->priv->minute;
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp24_);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->second);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->second = _tmp24_;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = self->priv->second;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = self->priv->second;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = self->priv->second;
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp27_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp28_);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->system);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->system = _tmp28_;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = self->priv->system;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp29_, _ ("AM"));
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = self->priv->system;
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp30_, _ ("PM"));
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = self->priv->system;
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp31_, _ ("24 Hr"));
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = self->priv->system;
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp33_);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	clock = _tmp33_;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = clock;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = self->priv->hour;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = clock;
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = (GtkLabel*) gtk_label_new (":");
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp37_);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = _tmp37_;
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp38_);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = clock;
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = self->priv->minute;
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = clock;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = (GtkLabel*) gtk_label_new (":");
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp42_);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = _tmp42_;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp43_);
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = clock;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = self->priv->second;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = clock;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = self->priv->system;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1711 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount"));
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp48_);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->relativity_radio_button = _tmp48_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = self->priv->relativity_radio_button;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = config_facade_get_instance ();
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = _tmp50_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp51_);
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = display_options;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp54_) {
-#line 13671 "Dialogs.c"
-		gint _tmp55_;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp55_ = photo_count;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = _tmp55_ > 1;
-#line 13677 "Dialogs.c"
-	} else {
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = FALSE;
-#line 13681 "Dialogs.c"
-	}
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = self->priv->relativity_radio_button;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), _tmp53_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = self->priv->relativity_radio_button;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = gtk_radio_button_get_group (_tmp57_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp58_, _ ("Set _all photos/videos to this time"));
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp59_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->batch_radio_button = _tmp59_;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->batch_radio_button;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = config_facade_get_instance ();
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = _tmp61_;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp63_);
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp62_);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = display_options;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp65_) {
-#line 13715 "Dialogs.c"
-		gint _tmp66_;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = photo_count;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = _tmp66_ > 1;
-#line 13721 "Dialogs.c"
-	} else {
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = FALSE;
-#line 13725 "Dialogs.c"
-	}
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = self->priv->batch_radio_button;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), _tmp64_);
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = self->priv->batch_radio_button;
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = contains_video;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp69_) {
-#line 13739 "Dialogs.c"
-		gchar* text = NULL;
-		gint _tmp70_;
-		gchar* _tmp71_;
-		const gchar* _tmp72_;
-		GtkCheckButton* _tmp73_;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = photo_count;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp70_));
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp71_;
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = text;
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp73_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp72_);
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp73_);
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->modify_originals_check_button = _tmp73_;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (text);
-#line 13763 "Dialogs.c"
-	} else {
-		gchar* text = NULL;
-		gint _tmp74_;
-		gchar* _tmp75_;
-		const gchar* _tmp76_;
-		GtkCheckButton* _tmp77_;
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp74_ = photo_count;
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp75_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp74_));
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		text = _tmp75_;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp76_ = text;
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp77_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp76_);
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp77_);
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->modify_originals_check_button = _tmp77_;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (text);
-#line 13788 "Dialogs.c"
-	}
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = config_facade_get_instance ();
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = _tmp79_;
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = _tmp81_;
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp80_);
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp82_) {
-#line 13802 "Dialogs.c"
-		gboolean _tmp83_;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp83_ = display_options;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp78_ = _tmp83_;
-#line 13808 "Dialogs.c"
-	} else {
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp78_ = FALSE;
-#line 13812 "Dialogs.c"
-	}
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = self->priv->modify_originals_check_button;
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp78_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = only_video;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp86_) {
-#line 13822 "Dialogs.c"
-		gboolean _tmp87_ = FALSE;
-		ConfigFacade* _tmp88_;
-		ConfigFacade* _tmp89_;
-		gboolean _tmp90_;
-		gboolean _tmp91_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp88_ = config_facade_get_instance ();
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp89_ = _tmp88_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp90_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp91_ = !_tmp90_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp89_);
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp91_) {
-#line 13840 "Dialogs.c"
-			gboolean _tmp92_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp92_ = display_options;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp87_ = _tmp92_;
-#line 13846 "Dialogs.c"
-		} else {
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp87_ = FALSE;
-#line 13850 "Dialogs.c"
-		}
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = _tmp87_;
-#line 13854 "Dialogs.c"
-	} else {
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp85_ = FALSE;
-#line 13858 "Dialogs.c"
-	}
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp93_ = self->priv->modify_originals_check_button;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_widget_get_type (), GtkWidget), _tmp85_);
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp94_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp94_);
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time_content = _tmp94_;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp95_ = time_content;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp96_ = self->priv->calendar;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp95_, G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp97_ = time_content;
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp98_ = clock;
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp97_, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp99_ = display_options;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp99_) {
-#line 13886 "Dialogs.c"
-		GtkBox* _tmp100_;
-		GtkRadioButton* _tmp101_;
-		GtkBox* _tmp102_;
-		GtkRadioButton* _tmp103_;
-		GtkBox* _tmp104_;
-		GtkCheckButton* _tmp105_;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp100_ = time_content;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp101_ = self->priv->relativity_radio_button;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp100_, G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp102_ = time_content;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp103_ = self->priv->batch_radio_button;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp104_ = time_content;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp105_ = self->priv->modify_originals_check_button;
-#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 13911 "Dialogs.c"
-	}
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preview = NULL;
-#line 13915 "Dialogs.c"
-	{
-		GdkPixbuf* _tmp106_ = NULL;
-		Dateable* _tmp107_;
-		GdkPixbuf* _tmp108_;
-		GdkPixbuf* _tmp109_;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp107_ = source;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp108_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp106_ = _tmp108_;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13929 "Dialogs.c"
-			goto __catch426_g_error;
-		}
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp109_ = _tmp106_;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp106_ = NULL;
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (preview);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preview = _tmp109_;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp106_);
-#line 13942 "Dialogs.c"
-	}
-	goto __finally426;
-	__catch426_g_error:
-	{
-		GError* err = NULL;
-		Dateable* _tmp110_;
-		gchar* _tmp111_;
-		gchar* _tmp112_;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		err = _inner_error_;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_inner_error_ = NULL;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp110_ = source;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp111_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_DATA_OBJECT, DataObject));
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp112_ = _tmp111_;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1755: Unable to fetch preview for %s", _tmp112_);
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp112_);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_error_free0 (err);
-#line 13967 "Dialogs.c"
-	}
-	__finally426:
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (preview);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (time_content);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (clock);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_clear_error (&_inner_error_);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return NULL;
-#line 13984 "Dialogs.c"
-	}
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp113_);
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image_content = _tmp113_;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp114_ = image_content;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp115_ = image_content;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_set_homogeneous (_tmp115_, TRUE);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp117_ = preview;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp117_ != NULL) {
-#line 14004 "Dialogs.c"
-		GdkPixbuf* _tmp118_;
-		GtkImage* _tmp119_;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp118_ = preview;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp119_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp118_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp119_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp116_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp116_ = _tmp119_;
-#line 14017 "Dialogs.c"
-	} else {
-		GtkImage* _tmp120_;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp120_ = (GtkImage*) gtk_image_new ();
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp120_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp116_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp116_ = _tmp120_;
-#line 14028 "Dialogs.c"
-	}
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp121_ = _g_object_ref0 (_tmp116_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image = _tmp121_;
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp122_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp122_);
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->original_time_label);
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->original_time_label = _tmp122_;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp123_ = image_content;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp124_ = image;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp123_, G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp125_ = image_content;
-#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp126_ = self->priv->original_time_label;
-#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp125_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp127_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp127_);
-#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	hbox = _tmp127_;
-#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp128_ = hbox;
-#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp129_ = hbox;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp130_ = image_content;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp129_, G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp131_ = hbox;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp132_ = time_content;
-#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp133_ = hbox;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp134_ = hbox;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp135_ = hbox;
-#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp136_ = hbox;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp138_ = hbox;
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp139_ = (GtkLabel*) gtk_label_new ("");
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp139_);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->notification);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->notification = _tmp139_;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp140_ = self->priv->notification;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_line_wrap (_tmp140_, TRUE);
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp141_ = self->priv->notification;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_justify (_tmp141_, GTK_JUSTIFY_CENTER);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp142_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp143_ = self->priv->notification;
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp144_ = source;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp145_ = dateable_get_exposure_time (_tmp144_);
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->original_time = _tmp145_;
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp146_ = self->priv->original_time;
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp146_ == ((time_t) 0)) {
-#line 14130 "Dialogs.c"
-		time_t _tmp147_;
-#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp147_ = time (NULL);
-#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->original_time = _tmp147_;
-#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->no_original_time = TRUE;
-#line 14138 "Dialogs.c"
-	}
-#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp148_ = self->priv->original_time;
-#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_time_local (_tmp148_, &_tmp149_);
-#line 1790 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_time (self, &_tmp149_);
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp150_ = config_facade_get_instance ();
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp151_ = _tmp150_;
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp152_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp151_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_original_time_label (self, _tmp152_);
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp151_);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (hbox);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (image);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp116_);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (image_content);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (preview);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (time_content);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (clock);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 14172 "Dialogs.c"
-}
-
-
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14179 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time) {
-	GtkCalendar* _tmp0_;
-	struct tm _tmp1_;
-	gint _tmp2_;
-	struct tm _tmp3_;
-	gint _tmp4_;
-	GtkCalendar* _tmp5_;
-	struct tm _tmp6_;
-	gint _tmp7_;
-	ConfigFacade* _tmp8_;
-	ConfigFacade* _tmp9_;
-	gboolean _tmp10_;
-	gboolean _tmp11_;
-	GtkSpinButton* _tmp26_;
-	struct tm _tmp27_;
-	gint _tmp28_;
-	GtkSpinButton* _tmp29_;
-	struct tm _tmp30_;
-	gint _tmp31_;
-	GtkComboBoxText* _tmp32_;
-	gint _tmp33_;
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (time != NULL);
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->calendar;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = *time;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_.tm_mon;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = *time;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_.tm_year;
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->calendar;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = *time;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_.tm_mday;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = config_facade_get_instance ();
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = _tmp10_;
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp9_);
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp11_) {
-#line 14240 "Dialogs.c"
-		GtkComboBoxText* _tmp12_;
-		GtkSpinButton* _tmp13_;
-		struct tm _tmp14_;
-		gint _tmp15_;
-#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = self->priv->system;
-#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->hour;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = *time;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = _tmp14_.tm_hour;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14257 "Dialogs.c"
-	} else {
-		gint AMPM_hour = 0;
-		struct tm _tmp16_;
-		gint _tmp17_;
-		gint _tmp18_ = 0;
-		gint _tmp19_;
-		GtkSpinButton* _tmp21_;
-		AdjustDateTimeDialogTimeSystem _tmp22_ = 0;
-		struct tm _tmp23_;
-		gint _tmp24_;
-		GtkComboBoxText* _tmp25_;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = *time;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = _tmp16_.tm_hour;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		AMPM_hour = _tmp17_ % 12;
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = AMPM_hour;
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp19_ == 0) {
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = 12;
-#line 14281 "Dialogs.c"
-		} else {
-			gint _tmp20_;
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = AMPM_hour;
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = _tmp20_;
-#line 14288 "Dialogs.c"
-		}
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = self->priv->hour;
-#line 1803 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_value (_tmp21_, (gdouble) _tmp18_);
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = *time;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = _tmp23_.tm_hour;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp24_ >= 12) {
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14302 "Dialogs.c"
-		} else {
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14306 "Dialogs.c"
-		}
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = self->priv->system;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14312 "Dialogs.c"
-	}
-#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = self->priv->minute;
-#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = *time;
-#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = _tmp27_.tm_min;
-#line 1807 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp28_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = self->priv->second;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = *time;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = _tmp30_.tm_sec;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_spin_button_set_value (_tmp29_, (gdouble) _tmp31_);
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = self->priv->system;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 14336 "Dialogs.c"
-}
-
-
-static gchar* g_time_format (struct tm *self, const gchar* format) {
-	gchar* result = NULL;
-	gchar* buffer = NULL;
-	gchar* _tmp0_;
-	gint buffer_length1;
-	gint _buffer_size_;
-	gchar* _tmp1_;
-	gint _tmp1__length1;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint _tmp3__length1;
-	gchar* _tmp4_;
-#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (format != NULL, NULL);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = g_new0 (gchar, 64);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	buffer = _tmp0_;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	buffer_length1 = 64;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_buffer_size_ = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = buffer;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1__length1 = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = format;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = buffer;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3__length1 = buffer_length1;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp4_;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	buffer = (g_free (buffer), NULL);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	return result;
-#line 14382 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format) {
-	gboolean _tmp0_;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_;
-	GtkLabel* _tmp3_;
-	time_t _tmp4_;
-	struct tm _tmp5_ = {0};
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->no_original_time;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return;
-#line 14405 "Dialogs.c"
-	}
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = use_24_hr_format;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 14413 "Dialogs.c"
-	} else {
-#line 1819 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 14417 "Dialogs.c"
-	}
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->original_time_label;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->priv->original_time;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_time_local (_tmp4_, &_tmp5_);
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = g_time_format (&_tmp5_, _tmp1_);
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = g_strconcat (_ ("Original: "), _tmp7_, NULL);
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = _tmp8_;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_text (_tmp3_, _tmp9_);
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp9_);
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp7_);
-#line 14439 "Dialogs.c"
-}
-
-
-static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
-	time_t result = 0;
-	struct tm time = {0};
-	GtkSpinButton* _tmp0_;
-	gdouble _tmp1_;
-	GtkSpinButton* _tmp2_;
-	gdouble _tmp3_;
-	gint hour = 0;
-	GtkSpinButton* _tmp4_;
-	gdouble _tmp5_;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp8_;
-	gint _tmp12_ = 0;
-	GtkComboBoxText* _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	guint year = 0U;
-	guint month = 0U;
-	guint day = 0U;
-	GtkCalendar* _tmp16_;
-	guint _tmp17_ = 0U;
-	guint _tmp18_ = 0U;
-	guint _tmp19_ = 0U;
-	time_t _tmp20_;
-#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	memset (&time, 0, sizeof (struct tm));
-#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->second;
-#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_sec = (gint) _tmp1_;
-#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->minute;
-#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
-#line 1826 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_min = (gint) _tmp3_;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->priv->hour;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	hour = (gint) _tmp5_;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = hour;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp8_ == 12) {
-#line 14494 "Dialogs.c"
-		GtkComboBoxText* _tmp9_;
-		gint _tmp10_;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->system;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 14503 "Dialogs.c"
-	} else {
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = FALSE;
-#line 14507 "Dialogs.c"
-	}
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp7_) {
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = 0;
-#line 14513 "Dialogs.c"
-	} else {
-		gint _tmp11_;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = hour;
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = _tmp11_;
-#line 14520 "Dialogs.c"
-	}
-#line 1830 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_hour = _tmp6_;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = self->priv->system;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = 12;
-#line 14532 "Dialogs.c"
-	} else {
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = 0;
-#line 14536 "Dialogs.c"
-	}
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = time.tm_hour;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_hour = _tmp15_ + _tmp12_;
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->calendar;
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	year = _tmp17_;
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	month = _tmp18_;
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	day = _tmp19_;
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_mon = (gint) month;
-#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_mday = (gint) day;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time.tm_isdst = -1;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = mktime (&time);
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp20_;
-#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 14566 "Dialogs.c"
-}
-
-
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals) {
-	gint64 _vala_time_shift = 0LL;
-	gboolean _vala_keep_relativity = FALSE;
-	gboolean _vala_modify_originals = FALSE;
-	gboolean result = FALSE;
-	gboolean response = FALSE;
-	gint _tmp0_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	response = FALSE;
-#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 14587 "Dialogs.c"
-		gboolean _tmp1_;
-		GtkRadioButton* _tmp5_;
-		gboolean _tmp6_;
-		GtkRadioButton* _tmp7_;
-		gboolean _tmp8_;
-		gboolean _tmp9_;
-		GtkCheckButton* _tmp13_;
-		gboolean _tmp14_;
-		GtkCheckButton* _tmp15_;
-		gboolean _tmp16_;
-		gboolean _tmp17_;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = self->priv->no_original_time;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp1_) {
-#line 14603 "Dialogs.c"
-			time_t _tmp2_;
-#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp2_ = adjust_date_time_dialog_get_time (self);
-#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_vala_time_shift = (gint64) _tmp2_;
-#line 14609 "Dialogs.c"
-		} else {
-			time_t _tmp3_;
-			time_t _tmp4_;
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp3_ = adjust_date_time_dialog_get_time (self);
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp4_ = self->priv->original_time;
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 14619 "Dialogs.c"
-		}
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = self->priv->relativity_radio_button;
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_keep_relativity = _tmp6_;
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = self->priv->relativity_radio_button;
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = _tmp8_;
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp9_) {
-#line 14635 "Dialogs.c"
-			ConfigFacade* _tmp10_;
-			ConfigFacade* _tmp11_;
-			gboolean _tmp12_;
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp10_ = config_facade_get_instance ();
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp11_ = _tmp10_;
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = _vala_keep_relativity;
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (_tmp11_);
-#line 14649 "Dialogs.c"
-		}
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->modify_originals_check_button;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_modify_originals = _tmp14_;
-#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = self->priv->modify_originals_check_button;
-#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = _tmp16_;
-#line 1863 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp17_) {
-#line 14665 "Dialogs.c"
-			ConfigFacade* _tmp18_;
-			ConfigFacade* _tmp19_;
-			gboolean _tmp20_;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp18_ = config_facade_get_instance ();
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp19_ = _tmp18_;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = _vala_modify_originals;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (_tmp19_);
-#line 14679 "Dialogs.c"
-		}
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		response = TRUE;
-#line 14683 "Dialogs.c"
-	} else {
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_time_shift = (gint64) 0;
-#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_keep_relativity = TRUE;
-#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_modify_originals = FALSE;
-#line 14691 "Dialogs.c"
-	}
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = response;
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (time_shift) {
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*time_shift = _vala_time_shift;
-#line 14701 "Dialogs.c"
-	}
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (keep_relativity) {
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*keep_relativity = _vala_keep_relativity;
-#line 14707 "Dialogs.c"
-	}
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (modify_originals) {
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*modify_originals = _vala_modify_originals;
-#line 14713 "Dialogs.c"
-	}
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 14717 "Dialogs.c"
-}
-
-
-static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button) {
-	gboolean result = FALSE;
-	GtkSpinButton* _tmp0_;
-	GtkSpinButton* _tmp1_;
-	gdouble _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = button;
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = button;
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp4_);
-#line 1881 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed (self);
-#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = TRUE;
-#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 14752 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) {
-	gint64 time_shift = 0LL;
-	time_t _tmp0_;
-	time_t _tmp1_;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gint64 _tmp6_;
-#line 1886 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->original_time;
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->system;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp3_;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = time_shift;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp6_ == ((gint64) 0)) {
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = TRUE;
-#line 14785 "Dialogs.c"
-	} else {
-		gboolean _tmp7_;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = self->priv->no_original_time;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = _tmp7_;
-#line 14792 "Dialogs.c"
-	}
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_) {
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = TRUE;
-#line 14798 "Dialogs.c"
-	} else {
-		gboolean _tmp8_ = FALSE;
-		GtkRadioButton* _tmp9_;
-		gboolean _tmp10_;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->batch_radio_button;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp10_) {
-#line 14809 "Dialogs.c"
-			GtkRadioButton* _tmp11_;
-			gboolean _tmp12_;
-			gboolean _tmp13_;
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp11_ = self->priv->batch_radio_button;
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp13_ = _tmp12_;
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = _tmp13_;
-#line 14821 "Dialogs.c"
-		} else {
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = FALSE;
-#line 14825 "Dialogs.c"
-		}
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp8_;
-#line 14829 "Dialogs.c"
-	}
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp4_) {
-#line 14833 "Dialogs.c"
-		GtkLabel* _tmp14_;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = self->priv->notification;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 14839 "Dialogs.c"
-	} else {
-		gboolean forward = FALSE;
-		gint64 _tmp15_;
-		gint days = 0;
-		gint hours = 0;
-		gint minutes = 0;
-		gint seconds = 0;
-		gint64 _tmp16_;
-		gint64 _tmp17_;
-		gint64 _tmp18_;
-		gint64 _tmp19_;
-		gint64 _tmp20_;
-		gint64 _tmp21_;
-		gint64 _tmp22_;
-		gint64 _tmp23_;
-		const gchar* _tmp24_ = NULL;
-		gboolean _tmp25_;
-		gchar* shift_status = NULL;
-		gchar* _tmp26_;
-		GtkLabel* _tmp27_;
-		const gchar* _tmp28_;
-		gint _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
-		gint _tmp32_;
-		gint _tmp33_;
-		gint _tmp34_;
-		gint _tmp35_;
-		gint _tmp36_;
-		gchar* _tmp37_;
-		gchar* _tmp38_;
-		GtkLabel* _tmp39_;
-#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = time_shift;
-#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		forward = _tmp15_ > ((gint64) 0);
-#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = time_shift;
-#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = llabs (_tmp16_);
-#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		time_shift = _tmp17_;
-#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = time_shift;
-#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		days = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = time_shift;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = time_shift;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		hours = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = time_shift;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
-#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = time_shift;
-#line 1904 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		minutes = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = time_shift;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		seconds = (gint) (_tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = forward;
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp25_) {
-#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = _ ("Exposure time will be shifted forward by\n" \
-"%d %s, %d %s, %d %s, and %d %s.");
-#line 14912 "Dialogs.c"
-		} else {
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = _ ("Exposure time will be shifted backward by\n" \
-"%d %s, %d %s, %d %s, and %d %s.");
-#line 14916 "Dialogs.c"
-		}
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = g_strdup (_tmp24_);
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		shift_status = _tmp26_;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = self->priv->notification;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = shift_status;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = days;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = days;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = hours;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = hours;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = minutes;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = minutes;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = seconds;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = seconds;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = g_strdup_printf (_tmp28_, _tmp29_, ngettext ("day", "days", (gulong) _tmp30_), _tmp31_, ngettext ("hour", "hours", (gulong) _tmp32_), _tmp33_, ngettext ("minute", "minutes", (gulong) _tmp34_), _tmp35_, ngettext ("second", "seconds", (gulong) _tmp36_));
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = _tmp37_;
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp27_, _tmp38_);
-#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp38_);
-#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp39_ = self->priv->notification;
-#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (shift_status);
-#line 14956 "Dialogs.c"
-	}
-}
-
-
-static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) {
-	AdjustDateTimeDialogTimeSystem _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-	ConfigFacade* _tmp3_;
-	ConfigFacade* _tmp4_;
-	GtkComboBoxText* _tmp5_;
-	gint _tmp6_;
-	GtkComboBoxText* _tmp7_;
-	gint _tmp8_;
-#line 1920 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->previous_time_system;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->system;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == _tmp2_) {
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return;
-#line 14983 "Dialogs.c"
-	}
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = config_facade_get_instance ();
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->system;
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp4_);
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = self->priv->system;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15003 "Dialogs.c"
-		gint _tmp9_ = 0;
-		GtkSpinButton* _tmp10_;
-		gdouble _tmp11_;
-		gint time = 0;
-		gint _tmp14_ = 0;
-		AdjustDateTimeDialogTimeSystem _tmp15_;
-		gint _tmp16_;
-		GtkSpinButton* _tmp17_;
-		GtkSpinButton* _tmp18_;
-		gint _tmp19_;
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->hour;
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp11_ == 12.0) {
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp9_ = 0;
-#line 15022 "Dialogs.c"
-		} else {
-			GtkSpinButton* _tmp12_;
-			gdouble _tmp13_;
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = self->priv->hour;
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp9_ = (gint) _tmp13_;
-#line 15032 "Dialogs.c"
-		}
-#line 1927 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		time = _tmp9_;
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = self->priv->previous_time_system;
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp14_ = 12;
-#line 15042 "Dialogs.c"
-		} else {
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp14_ = 0;
-#line 15046 "Dialogs.c"
-		}
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = time;
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		time = _tmp16_ + _tmp14_;
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = self->priv->hour;
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		adjust_date_time_dialog_set_original_time_label (self, TRUE);
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = self->priv->hour;
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = time;
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15064 "Dialogs.c"
-	} else {
-		gint AMPM_hour = 0;
-		GtkSpinButton* _tmp20_;
-		gdouble _tmp21_;
-		GtkSpinButton* _tmp22_;
-		gint _tmp23_ = 0;
-		gint _tmp24_;
-		GtkSpinButton* _tmp26_;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = self->priv->hour;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		AMPM_hour = ((gint) _tmp21_) % 12;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = self->priv->hour;
-#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		adjust_date_time_dialog_set_original_time_label (self, FALSE);
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = AMPM_hour;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp24_ == 0) {
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = 12;
-#line 15091 "Dialogs.c"
-		} else {
-			gint _tmp25_;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp25_ = AMPM_hour;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = _tmp25_;
-#line 15098 "Dialogs.c"
-		}
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = self->priv->hour;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15104 "Dialogs.c"
-	}
-#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_on_time_changed (self);
-#line 15108 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15119 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
-#line 1631 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->no_original_time = FALSE;
-#line 15128 "Dialogs.c"
-}
-
-
-static void adjust_date_time_dialog_finalize (GObject * obj) {
-	AdjustDateTimeDialog * self;
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->original_time_label);
-#line 1637 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->calendar);
-#line 1638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->hour);
-#line 1639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->minute);
-#line 1640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->second);
-#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->system);
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1644 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->notification);
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15158 "Dialogs.c"
-}
-
-
-GType adjust_date_time_dialog_get_type (void) {
-	static volatile gsize adjust_date_time_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&adjust_date_time_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimeDialog), 0, (GInstanceInitFunc) adjust_date_time_dialog_instance_init, NULL };
-		GType adjust_date_time_dialog_type_id;
-		adjust_date_time_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "AdjustDateTimeDialog", &g_define_type_info, 0);
-		g_once_init_leave (&adjust_date_time_dialog_type_id__volatile, adjust_date_time_dialog_type_id);
-	}
-	return adjust_date_time_dialog_type_id__volatile;
+#line 7572 "Dialogs.c"
 }
 
 
@@ -15203,31 +7602,31 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	GtkMessageDialog* _tmp33_;
 	GtkMessageDialog* _tmp34_;
 	const gchar* _tmp35_;
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (message != NULL);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = message;
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
-#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15202 "Dialogs.c"
+#line 7604 "Dialogs.c"
 	{
 		gint i = 0;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15207 "Dialogs.c"
+#line 7609 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15214 "Dialogs.c"
+#line 7616 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_;
 				const gchar* _tmp10_;
@@ -15240,151 +7639,151 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				gchar* _tmp17_;
 				gchar* _tmp18_;
 				gchar* _tmp19_;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15229 "Dialogs.c"
+#line 7631 "Dialogs.c"
 					gint _tmp3_;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15235 "Dialogs.c"
+#line 7637 "Dialogs.c"
 				}
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp5_ = i;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15243 "Dialogs.c"
+#line 7645 "Dialogs.c"
 					GeeArrayList* _tmp6_;
 					gint _tmp7_;
 					gint _tmp8_;
 					gint _tmp9_;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = i;
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15258 "Dialogs.c"
+#line 7660 "Dialogs.c"
 				} else {
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15262 "Dialogs.c"
+#line 7664 "Dialogs.c"
 				}
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15268 "Dialogs.c"
+#line 7670 "Dialogs.c"
 				}
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = objects;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = i;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = (DataObject*) _tmp13_;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = data_object_to_string (_tmp14_);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = _tmp15_;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = g_strconcat ("\n", _tmp16_, NULL);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = _tmp17_;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (dialog_message);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				dialog_message = _tmp19_;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp18_);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp16_);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 15300 "Dialogs.c"
+#line 7702 "Dialogs.c"
 			}
 		}
 	}
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 796 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED;
-#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = remainder;
-#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 15316 "Dialogs.c"
+#line 7718 "Dialogs.c"
 		const gchar* _tmp24_;
 		gint _tmp25_;
 		gint _tmp26_;
 		gchar* _tmp27_;
 		gchar* _tmp28_;
 		gchar* _tmp29_;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = remainder;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = g_strdup_printf (ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_), _tmp26_);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = _tmp27_;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = g_strconcat (_tmp24_, _tmp28_, NULL);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_message = _tmp29_;
-#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp28_);
-#line 15341 "Dialogs.c"
+#line 7743 "Dialogs.c"
 	}
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = app_window_get_instance ();
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_;
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = dialog_message;
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp32_);
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp33_);
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _tmp33_;
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp31_);
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp34_;
-#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = title;
-#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp35_);
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 15371 "Dialogs.c"
+#line 7773 "Dialogs.c"
 }
 
 
@@ -15397,40 +7796,40 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	HierarchicalTagIndex* _tmp4_;
 	GeeCollection* _tmp5_;
 	GeeCollection* _tmp6_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = label;
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = initial_text;
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = hierarchical_tag_index_get_global_index ();
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_);
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ",");
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1973 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp4_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15410 "Dialogs.c"
+#line 7812 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 811 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 15417 "Dialogs.c"
+#line 7819 "Dialogs.c"
 }
 
 
@@ -15454,24 +7853,24 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	AddTagsDialog* self = NULL;
 	gchar* title = NULL;
 	gchar* _tmp0_;
-#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_strdup (g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE));
-#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title = _tmp0_;
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _ ("Tags (separated by commas):"), NULL);
-#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
-#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15451 "Dialogs.c"
+#line 7853 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
-#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 819 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 15458 "Dialogs.c"
+#line 7860 "Dialogs.c"
 }
 
 
@@ -15491,70 +7890,90 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gint _tmp9__length1;
 	gchar** _tmp10_;
 	gint _tmp10__length1;
-#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 15488 "Dialogs.c"
+#line 7890 "Dialogs.c"
 		gchar** _tmp2_;
 		gint _tmp2__length1;
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2__length1 = 0;
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (result_length1) {
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 15499 "Dialogs.c"
+#line 7901 "Dialogs.c"
 		}
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15507 "Dialogs.c"
+#line 7909 "Dialogs.c"
 	}
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__length1 = _vala_array_length (_tmp4_);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = tag_prep_tag_names (_tmp6_, _vala_array_length (_tmp4_), &_tmp7_);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = _tmp7_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (result_length1) {
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 15533 "Dialogs.c"
+#line 7935 "Dialogs.c"
 	}
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	return result;
+#line 7943 "Dialogs.c"
+}
+
+
+static gboolean string_contains (const gchar* self, const gchar* needle) {
+	gboolean result = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (needle != NULL, FALSE);
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = needle;
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp1_ != NULL;
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 15541 "Dialogs.c"
+#line 7963 "Dialogs.c"
 }
 
 
@@ -15577,64 +7996,64 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	gint _names_size_;
 	gchar** _tmp9_;
 	gint _tmp9__length1;
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15578 "Dialogs.c"
+#line 8000 "Dialogs.c"
 	}
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0);
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = _vala_array_length (_tmp3_);
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_);
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _tmp6_;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = _tmp8_;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names_length1 = _tmp8__length1;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_names_size_ = names_length1;
-#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = names;
-#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = names_length1;
-#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp9__length1 > 0;
-#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 2003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15612 "Dialogs.c"
+#line 8034 "Dialogs.c"
 }
 
 
 static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) add_tags_dialog_real_on_modify_validate;
-#line 15621 "Dialogs.c"
+#line 8043 "Dialogs.c"
 }
 
 
@@ -15659,28 +8078,28 @@ ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource*
 	MediaSource* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = source;
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = modify_tags_dialog_get_initial_text (_tmp0_);
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _ ("Tags (separated by commas):"), _tmp2_);
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15660 "Dialogs.c"
+#line 8082 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
-#line 2008 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 15667 "Dialogs.c"
+#line 8089 "Dialogs.c"
 }
 
 
@@ -15697,52 +8116,52 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	GeeSortedSet* tag_basenames = NULL;
 	GeeTreeSet* _tmp6_;
 	gchar* text = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 853 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = tag_global;
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_);
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 855 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = source_tags;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 855 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (source_tags);
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15704 "Dialogs.c"
+#line 8126 "Dialogs.c"
 	}
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag_get_terminal_tags (_tmp4_);
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 15716 "Dialogs.c"
+#line 8138 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
 		GeeCollection* _tmp7_;
 		GeeIterator* _tmp8_;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tag_it = _tmp8_;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 15729 "Dialogs.c"
+#line 8151 "Dialogs.c"
 			GeeIterator* _tmp9_;
 			gboolean _tmp10_;
 			Tag* tag = NULL;
@@ -15754,64 +8173,64 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			gchar* _tmp16_;
 			gchar* _tmp17_;
 			gchar* _tmp18_;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_iterator_next (_tmp9_);
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp10_) {
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 15749 "Dialogs.c"
+#line 8171 "Dialogs.c"
 			}
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gee_iterator_get (_tmp11_);
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			tag = (Tag*) _tmp12_;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = tag_basenames;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = tag;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = tag_get_path (_tmp14_);
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = _tmp15_;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_);
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp17_;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp18_);
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp16_);
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 15777 "Dialogs.c"
+#line 8199 "Dialogs.c"
 		}
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 15781 "Dialogs.c"
+#line 8203 "Dialogs.c"
 	}
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 15785 "Dialogs.c"
+#line 8207 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeSortedSet* _tmp19_;
 		GeeIterator* _tmp20_;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_name_it = _tmp20_;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 15798 "Dialogs.c"
+#line 8220 "Dialogs.c"
 			GeeIterator* _tmp21_;
 			gboolean _tmp22_;
 			gchar* name = NULL;
@@ -15821,77 +8240,77 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			const gchar* _tmp29_;
 			const gchar* _tmp30_;
 			gchar* _tmp31_;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp22_) {
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 15816 "Dialogs.c"
+#line 8238 "Dialogs.c"
 			}
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = (gchar*) _tmp24_;
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = text;
-#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 15828 "Dialogs.c"
+#line 8250 "Dialogs.c"
 				gchar* _tmp26_;
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 15836 "Dialogs.c"
+#line 8258 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_;
 				gchar* _tmp28_;
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strconcat (_tmp27_, ", ", NULL);
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 15848 "Dialogs.c"
+#line 8270 "Dialogs.c"
 			}
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = name;
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp31_;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 15862 "Dialogs.c"
+#line 8284 "Dialogs.c"
 		}
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 15866 "Dialogs.c"
+#line 8288 "Dialogs.c"
 	}
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (tag_basenames);
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (terminal_tags);
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (source_tags);
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15878 "Dialogs.c"
+#line 8300 "Dialogs.c"
 }
 
 
@@ -15924,140 +8343,140 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	gchar** _tmp16_;
 	gchar** _tmp17_;
 	gint _tmp17__length1;
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15927 "Dialogs.c"
+#line 8349 "Dialogs.c"
 	}
-#line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = is_string_empty (_tmp3_);
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = new_tags;
-#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2046 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 15945 "Dialogs.c"
+#line 8367 "Dialogs.c"
 	}
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11__length1 = _tmp9_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp11_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp11__length1;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = hierarchical_tag_index_get_global_index ();
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = tag_names;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14__length1 = tag_names_length1;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_);
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp16_;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp15_;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp13_);
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = tag_names;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 15993 "Dialogs.c"
+#line 8415 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
 		gint _name_collection_size_ = 0;
 		gint name_it = 0;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection = _tmp17_;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection_length1 = _tmp17__length1;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16005 "Dialogs.c"
+#line 8427 "Dialogs.c"
 			gchar* _tmp18_;
 			gchar* name = NULL;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16012 "Dialogs.c"
+#line 8434 "Dialogs.c"
 			{
 				GeeArrayList* _tmp19_;
 				const gchar* _tmp20_;
 				Tag* _tmp21_;
 				Tag* _tmp22_;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp20_ = name;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = tag_for_path (_tmp20_);
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = _tmp21_;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp22_);
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16032 "Dialogs.c"
+#line 8454 "Dialogs.c"
 			}
 		}
 	}
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = new_tags;
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16044 "Dialogs.c"
+#line 8466 "Dialogs.c"
 }
 
 
@@ -16066,28 +8485,28 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
 	gboolean _tmp1_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = !_tmp1_;
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16065 "Dialogs.c"
+#line 8487 "Dialogs.c"
 }
 
 
 static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 847 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 847 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = (gboolean (*) (TextEntryDialogMediator *, const gchar*)) modify_tags_dialog_real_on_modify_validate;
-#line 16074 "Dialogs.c"
+#line 8496 "Dialogs.c"
 }
 
 
@@ -16107,4336 +8526,6 @@ GType modify_tags_dialog_get_type (void) {
 }
 
 
-gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16099 "Dialogs.c"
-}
-
-
-void welcome_service_entry_execute (WelcomeServiceEntry* self) {
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16108 "Dialogs.c"
-}
-
-
-static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	static gboolean initialized = FALSE;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!initialized) {
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		initialized = TRUE;
-#line 16119 "Dialogs.c"
-	}
-}
-
-
-GType welcome_service_entry_get_type (void) {
-	static volatile gsize welcome_service_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&welcome_service_entry_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (WelcomeServiceEntryIface), (GBaseInitFunc) welcome_service_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-		GType welcome_service_entry_type_id;
-		welcome_service_entry_type_id = g_type_register_static (G_TYPE_INTERFACE, "WelcomeServiceEntry", &g_define_type_info, 0);
-		g_type_interface_add_prerequisite (welcome_service_entry_type_id, G_TYPE_OBJECT);
-		g_once_init_leave (&welcome_service_entry_type_id__volatile, welcome_service_entry_type_id);
-	}
-	return welcome_service_entry_type_id__volatile;
-}
-
-
-WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
-	WelcomeDialog * self = NULL;
-	SpitDataImportsWelcomeImportMetaHost* _tmp0_;
-	gboolean show_system_pictures_import = FALSE;
-	gboolean _tmp1_;
-	GtkWidget* ok_button = NULL;
-	GtkWidget* _tmp2_;
-	GtkWidget* _tmp3_;
-	GtkWindow* _tmp4_;
-	GtkLabel* primary_text = NULL;
-	GtkLabel* _tmp5_;
-	GtkLabel* _tmp6_;
-	gchar* _tmp7_;
-	gchar* _tmp8_;
-	GtkLabel* _tmp9_;
-	GtkLabel* _tmp10_;
-	GtkLabel* _tmp11_;
-	GtkLabel* _tmp12_;
-	gchar* _tmp13_;
-	gchar* _tmp14_;
-	GtkLabel* _tmp15_;
-	GtkLabel* _tmp16_;
-	GtkImage* image = NULL;
-	GtkImage* _tmp17_;
-	GtkBox* header_text = NULL;
-	GtkBox* _tmp18_;
-	GtkBox* _tmp19_;
-	GtkLabel* _tmp20_;
-	GtkBox* _tmp21_;
-	GtkLabel* _tmp22_;
-	GtkBox* header_content = NULL;
-	GtkBox* _tmp23_;
-	GtkBox* _tmp24_;
-	GtkImage* _tmp25_;
-	GtkBox* _tmp26_;
-	GtkBox* _tmp27_;
-	GtkLabel* instructions = NULL;
-	GtkLabel* _tmp28_;
-	gchar* indent_prefix = NULL;
-	gchar* _tmp29_;
-	const gchar* _tmp30_ = NULL;
-	GtkTextDirection _tmp31_;
-	gchar* arrow_glyph = NULL;
-	gchar* _tmp32_;
-	GtkLabel* _tmp33_;
-	const gchar* _tmp34_;
-	gchar* _tmp35_;
-	gchar* _tmp36_;
-	const gchar* _tmp37_;
-	gchar* _tmp38_;
-	gchar* _tmp39_;
-	gchar* _tmp40_;
-	gchar* _tmp41_;
-	const gchar* _tmp42_;
-	gchar* _tmp43_;
-	gchar* _tmp44_;
-	gchar* _tmp45_;
-	gchar* _tmp46_;
-	const gchar* _tmp47_;
-	gchar* _tmp48_;
-	gchar* _tmp49_;
-	gchar* _tmp50_;
-	gchar* _tmp51_;
-	GtkLabel* _tmp52_;
-	GtkLabel* _tmp53_;
-	GtkBox* _tmp54_;
-	GtkBox* _tmp55_;
-	GtkBox* _tmp56_;
-	GtkBox* _tmp57_;
-	gboolean _tmp58_;
-	GtkLabel* _tmp69_;
-	GtkLabel* _tmp70_;
-	GtkLabel* _tmp71_;
-	GtkLabel* _tmp72_;
-	GtkBox* content = NULL;
-	GtkBox* _tmp73_;
-	GtkBox* _tmp74_;
-	GtkBox* _tmp75_;
-	GtkBox* _tmp76_;
-	GtkLabel* _tmp77_;
-	GtkCheckButton* _tmp78_;
-	GtkCheckButton* _tmp79_;
-	GtkCheckButton* _tmp80_;
-	GtkBox* _tmp81_;
-	GtkWidget* _tmp82_;
-	SpitDataImportsWelcomeImportMetaHost* _tmp83_;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (WelcomeDialog*) g_object_new (object_type, NULL);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_meta_host);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_meta_host = _tmp0_;
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = welcome_dialog_is_system_pictures_import_possible ();
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	show_system_pictures_import = _tmp1_;
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	ok_button = _tmp3_;
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Welcome!"));
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = owner;
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = (GtkLabel*) gtk_label_new ("");
-#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp5_);
-#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	primary_text = _tmp5_;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = primary_text;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _ ("Welcome to Shotwell!"));
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp6_, _tmp8_);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp8_);
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = primary_text;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp9_, 0.0f);
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = primary_text;
-#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp10_, 0.5f);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = (GtkLabel*) gtk_label_new ("");
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp11_);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->secondary_text);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->secondary_text = _tmp11_;
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = self->priv->secondary_text;
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _ ("To get started, import photos in any of these ways:"));
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp12_, _tmp14_);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp14_);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = self->priv->secondary_text;
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp15_, 0.0f);
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->secondary_text;
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp16_, 0.5f);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp17_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image = _tmp17_;
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp18_);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_text = _tmp18_;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = header_text;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = primary_text;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = header_text;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->priv->secondary_text;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp23_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_content = _tmp23_;
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = header_content;
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = image;
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = header_content;
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = header_text;
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = (GtkLabel*) gtk_label_new ("");
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp28_);
-#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	instructions = _tmp28_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = g_strdup ("   ");
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	indent_prefix = _tmp29_;
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp31_ == GTK_TEXT_DIR_RTL) {
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = "◂";
-#line 16361 "Dialogs.c"
-	} else {
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = "▸";
-#line 16365 "Dialogs.c"
-	}
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = g_strdup (_tmp30_);
-#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	arrow_glyph = _tmp32_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = instructions;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = indent_prefix;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = g_strconcat (_tmp34_, "&#8226; %s\n", NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = _tmp35_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = indent_prefix;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = g_strconcat (_tmp37_, "&#8226; %s\n", NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = _tmp38_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = _tmp40_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = indent_prefix;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = g_strconcat (_tmp42_, "&#8226; %s", NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = _tmp43_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = g_strconcat (_tmp41_, _tmp44_, NULL);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = _tmp45_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = arrow_glyph;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = g_strdup_printf (_ ("Choose <span weight=\"bold\">File %s Import From Folder</span>"), _tmp47_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = _tmp48_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = g_strdup_printf (_tmp46_, _tmp49_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import"));
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = _tmp50_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp33_, _tmp51_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp51_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp49_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp46_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp44_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp41_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp39_);
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp36_);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = instructions;
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp52_, 0.0f);
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = instructions;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp53_, 0.5f);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp54_);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_action_checkbox_packer = _tmp54_;
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp55_);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_action_checkbox_packer = _tmp55_;
-#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = self->priv->import_action_checkbox_packer;
-#line 2130 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = self->priv->external_import_action_checkbox_packer;
-#line 2130 "/home/jens/Source/shotwell/src/Dialogs.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 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = show_system_pictures_import;
-#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp58_) {
-#line 16459 "Dialogs.c"
-		GFile* _tmp59_;
-		GFile* _tmp60_;
-		gchar* _tmp61_;
-		gchar* _tmp62_;
-		gchar* _tmp63_;
-		gchar* _tmp64_;
-		GtkCheckButton* _tmp65_;
-		GtkBox* _tmp66_;
-		GtkCheckButton* _tmp67_;
-		GtkCheckButton* _tmp68_;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp59_ = app_dirs_get_import_dir ();
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp60_ = _tmp59_;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp61_ = get_display_pathname (_tmp60_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp62_ = _tmp61_;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp63_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp62_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = _tmp63_;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp65_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp64_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp65_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->system_pictures_import_check = _tmp65_;
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp64_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp62_);
-#line 2133 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp60_);
-#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = self->priv->import_action_checkbox_packer;
-#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp67_ = self->priv->system_pictures_import_check;
-#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget));
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp68_ = self->priv->system_pictures_import_check;
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 16506 "Dialogs.c"
-	}
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:"));
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp69_);
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->instruction_header);
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->instruction_header = _tmp69_;
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = self->priv->instruction_header;
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_xalign (_tmp70_, 0.0f);
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = self->priv->instruction_header;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_yalign (_tmp71_, 0.5f);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = self->priv->instruction_header;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), 20);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp73_);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	content = _tmp73_;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = header_content;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp75_);
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_content);
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_content = _tmp75_;
-#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = self->priv->import_content;
-#line 2149 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = instructions;
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again"));
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp78_);
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->hide_button);
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->hide_button = _tmp78_;
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = self->priv->hide_button;
-#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = self->priv->hide_button;
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
-#line 2155 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 0);
-#line 2161 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = ok_button;
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp82_);
-#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	welcome_dialog_install_import_content (self);
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = self->priv->import_meta_host;
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spit_data_imports_welcome_import_meta_host_start (_tmp83_);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (content);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (arrow_glyph);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (indent_prefix);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (instructions);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (header_content);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (header_text);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (image);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (primary_text);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (ok_button);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 16620 "Dialogs.c"
-}
-
-
-WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 16627 "Dialogs.c"
-}
-
-
-static void welcome_dialog_install_import_content (WelcomeDialog* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GtkCheckButton** _tmp2_;
-	gint _tmp2__length1;
-#line 2173 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->external_import_checks;
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2__length1 = self->priv->external_import_checks_length1;
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2__length1 > 0) {
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = TRUE;
-#line 16646 "Dialogs.c"
-	} else {
-		GtkCheckButton* _tmp3_;
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = self->priv->system_pictures_import_check;
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _tmp3_ != NULL;
-#line 16653 "Dialogs.c"
-	}
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_) {
-#line 16657 "Dialogs.c"
-		gboolean _tmp4_;
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = self->priv->import_content_already_installed;
-#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp4_ == FALSE;
-#line 16663 "Dialogs.c"
-	} else {
-#line 2175 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = FALSE;
-#line 16667 "Dialogs.c"
-	}
-#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 16671 "Dialogs.c"
-		GtkLabel* _tmp5_;
-		GtkBox* _tmp6_;
-		GtkBox* _tmp7_;
-		GtkBox* _tmp8_;
-		GtkLabel* _tmp9_;
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = self->priv->secondary_text;
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp5_, "");
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = self->priv->import_content;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = self->priv->import_action_checkbox_packer;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->priv->import_content;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->instruction_header;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->import_content_already_installed = TRUE;
-#line 16695 "Dialogs.c"
-	}
-}
-
-
-static void _vala_array_add109 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if ((*length) == (*size)) {
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 16707 "Dialogs.c"
-	}
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[(*length)++] = value;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[*length] = NULL;
-#line 16713 "Dialogs.c"
-}
-
-
-static void _vala_array_add110 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value) {
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if ((*length) == (*size)) {
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 16724 "Dialogs.c"
-	}
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[(*length)++] = value;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[*length] = NULL;
-#line 16730 "Dialogs.c"
-}
-
-
-void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry) {
-	WelcomeServiceEntry* _tmp0_;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	WelcomeServiceEntry** _tmp5_;
-	gint _tmp5__length1;
-	WelcomeServiceEntry* _tmp6_;
-	WelcomeServiceEntry* _tmp7_;
-	GtkCheckButton* entry_check = NULL;
-	WelcomeServiceEntry* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	gchar* _tmp12_;
-	GtkCheckButton* _tmp13_;
-	GtkCheckButton* _tmp14_;
-	GtkCheckButton** _tmp15_;
-	gint _tmp15__length1;
-	GtkCheckButton* _tmp16_;
-	GtkBox* _tmp17_;
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = entry;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = _tmp1_;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2186: %s", _tmp4_);
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp4_);
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp2_);
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = self->priv->external_import_entries;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5__length1 = self->priv->external_import_entries_length1;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = entry;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_array_add109 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = entry;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = welcome_service_entry_get_service_name (_tmp8_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp10_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp12_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp13_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp12_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	entry_check = _tmp14_;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = self->priv->external_import_checks;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15__length1 = self->priv->external_import_checks_length1;
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = _g_object_ref0 (entry_check);
-#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp16_);
-#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->external_import_action_checkbox_packer;
-#line 2192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
-#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	welcome_dialog_install_import_content (self);
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (entry_check);
-#line 16826 "Dialogs.c"
-}
-
-
-/**
-     * Connected to the 'response' signal.  This is part of a workaround
-     * for the fact that run()-ning this dialog can interfere with displaying
-     * images from a camera; please see #4997 for details.
-     */
-static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
-	gint _tmp0_;
-#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = resp;
-#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->ok_clicked = TRUE;
-#line 16845 "Dialogs.c"
-	}
-#line 2205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_main_quit ();
-#line 16851 "Dialogs.c"
-}
-
-
-static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 16858 "Dialogs.c"
-}
-
-
-static void _vala_array_add111 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if ((*length) == (*size)) {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 16869 "Dialogs.c"
-	}
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[(*length)++] = value;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	(*array)[*length] = NULL;
-#line 16875 "Dialogs.c"
-}
-
-
-static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length) {
-	WelcomeServiceEntry** result;
-	int i;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = g_new0 (WelcomeServiceEntry*, length + 1);
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	for (i = 0; i < length; i++) {
-#line 16886 "Dialogs.c"
-		WelcomeServiceEntry* _tmp0_;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result[i] = _tmp0_;
-#line 16892 "Dialogs.c"
-	}
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 16896 "Dialogs.c"
-}
-
-
-gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import) {
-	WelcomeServiceEntry** _vala_selected_import_entries = NULL;
-	int _vala_selected_import_entries_length1 = 0;
-	gboolean _vala_do_system_pictures_import = FALSE;
-	gboolean result = FALSE;
-	guint _tmp0_;
-	gboolean ok = FALSE;
-	gboolean _tmp1_;
-	gboolean show_dialog = FALSE;
-	gboolean _tmp2_;
-	WelcomeServiceEntry** _result_ = NULL;
-	WelcomeServiceEntry** _tmp5_;
-	gint _result__length1;
-	gint __result__size_;
-	WelcomeServiceEntry** _tmp19_;
-	gint _tmp19__length1;
-	WelcomeServiceEntry** _tmp20_;
-	gint _tmp20__length1;
-	gboolean _tmp21_ = FALSE;
-	GtkCheckButton* _tmp22_;
-#line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
-#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
-#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2214 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_main ();
-#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
-#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->ok_clicked;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	ok = _tmp1_;
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	show_dialog = TRUE;
-#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = ok;
-#line 2228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_) {
-#line 16944 "Dialogs.c"
-		GtkCheckButton* _tmp3_;
-		gboolean _tmp4_;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = self->priv->hide_button;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		show_dialog = !_tmp4_;
-#line 16953 "Dialogs.c"
-	}
-#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = _tmp5_;
-#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result__length1 = 0;
-#line 2232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	__result__size_ = _result__length1;
-#line 16963 "Dialogs.c"
-	{
-		gint i = 0;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		i = 0;
-#line 16968 "Dialogs.c"
-		{
-			gboolean _tmp6_ = FALSE;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp6_ = TRUE;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			while (TRUE) {
-#line 16975 "Dialogs.c"
-				gint _tmp8_;
-				WelcomeServiceEntry** _tmp9_;
-				gint _tmp9__length1;
-				GtkCheckButton** _tmp10_;
-				gint _tmp10__length1;
-				gint _tmp11_;
-				GtkCheckButton* _tmp12_;
-				gboolean _tmp13_;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!_tmp6_) {
-#line 16986 "Dialogs.c"
-					gint _tmp7_;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp7_ = i;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					i = _tmp7_ + 1;
-#line 16992 "Dialogs.c"
-				}
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp6_ = FALSE;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp8_ = i;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp9_ = self->priv->external_import_entries;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp9__length1 = self->priv->external_import_entries_length1;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp8_ < _tmp9__length1)) {
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					break;
-#line 17006 "Dialogs.c"
-				}
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp10_ = self->priv->external_import_checks;
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp10__length1 = self->priv->external_import_checks_length1;
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp11_ = i;
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp12_ = _tmp10_[_tmp11_];
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp13_ == TRUE) {
-#line 17020 "Dialogs.c"
-					WelcomeServiceEntry** _tmp14_;
-					gint _tmp14__length1;
-					WelcomeServiceEntry** _tmp15_;
-					gint _tmp15__length1;
-					gint _tmp16_;
-					WelcomeServiceEntry* _tmp17_;
-					WelcomeServiceEntry* _tmp18_;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp14_ = _result_;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp14__length1 = _result__length1;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp15_ = self->priv->external_import_entries;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp15__length1 = self->priv->external_import_entries_length1;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp16_ = i;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp17_ = _tmp15_[_tmp16_];
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_vala_array_add111 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17044 "Dialogs.c"
-				}
-			}
-		}
-	}
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = _result_;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19__length1 = _result__length1;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup29 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20__length1 = _tmp19__length1;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_selected_import_entries = _tmp20_;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_selected_import_entries_length1 = _tmp20__length1;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->priv->system_pictures_import_check;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp22_ != NULL) {
-#line 17067 "Dialogs.c"
-		GtkCheckButton* _tmp23_;
-		gboolean _tmp24_;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = self->priv->system_pictures_import_check;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = _tmp24_;
-#line 17076 "Dialogs.c"
-	} else {
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = FALSE;
-#line 17080 "Dialogs.c"
-	}
-#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_do_system_pictures_import = _tmp21_;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = show_dialog;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (selected_import_entries) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*selected_import_entries = _vala_selected_import_entries;
-#line 17094 "Dialogs.c"
-	} else {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17098 "Dialogs.c"
-	}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (selected_import_entries_length1) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17104 "Dialogs.c"
-	}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (do_system_pictures_import) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17110 "Dialogs.c"
-	}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 17114 "Dialogs.c"
-}
-
-
-static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
-	gboolean result = FALSE;
-	GFile* system_pictures = NULL;
-	GFile* _tmp0_;
-	GFile* _tmp1_;
-	gboolean _tmp2_;
-	GFile* _tmp3_;
-	GFileType _tmp4_;
-	gboolean _tmp10_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_dirs_get_import_dir ();
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	system_pictures = _tmp0_;
-#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = system_pictures;
-#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp2_) {
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = FALSE;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (system_pictures);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 17144 "Dialogs.c"
-	}
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = system_pictures;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
-#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = FALSE;
-#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (system_pictures);
-#line 2252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 17158 "Dialogs.c"
-	}
-	{
-		GFileEnumerator* syspics_child_enum = NULL;
-		GFile* _tmp5_;
-		GFileEnumerator* _tmp6_;
-		GFileInfo* _tmp7_ = NULL;
-		GFileEnumerator* _tmp8_;
-		GFileInfo* _tmp9_;
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = system_pictures;
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		syspics_child_enum = _tmp6_;
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17175 "Dialogs.c"
-			goto __catch427_g_error;
-		}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = syspics_child_enum;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp9_;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (syspics_child_enum);
-#line 17188 "Dialogs.c"
-			goto __catch427_g_error;
-		}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = _tmp7_ != NULL;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp7_);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (syspics_child_enum);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (system_pictures);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 17201 "Dialogs.c"
-	}
-	goto __finally427;
-	__catch427_g_error:
-	{
-		GError* e = NULL;
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		e = _inner_error_;
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_inner_error_ = NULL;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = FALSE;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_error_free0 (e);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (system_pictures);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 17219 "Dialogs.c"
-	}
-	__finally427:
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (system_pictures);
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_clear_error (&_inner_error_);
-#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return _tmp10_;
-#line 17230 "Dialogs.c"
-}
-
-
-static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17241 "Dialogs.c"
-}
-
-
-static void welcome_dialog_instance_init (WelcomeDialog * self) {
-	GtkCheckButton** _tmp0_;
-	WelcomeServiceEntry** _tmp1_;
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->system_pictures_import_check = NULL;
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_checks = _tmp0_;
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_checks_length1 = 0;
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_entries = _tmp1_;
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_entries_length1 = 0;
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
-#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_content_already_installed = FALSE;
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->ok_clicked = FALSE;
-#line 17272 "Dialogs.c"
-}
-
-
-static void welcome_dialog_finalize (GObject * obj) {
-	WelcomeDialog * self;
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->hide_button);
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->secondary_text);
-#line 2077 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->instruction_header);
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_content);
-#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->import_meta_host);
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 17302 "Dialogs.c"
-}
-
-
-GType welcome_dialog_get_type (void) {
-	static volatile gsize welcome_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&welcome_dialog_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (WelcomeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) welcome_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WelcomeDialog), 0, (GInstanceInitFunc) welcome_dialog_instance_init, NULL };
-		GType welcome_dialog_type_id;
-		welcome_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "WelcomeDialog", &g_define_type_info, 0);
-		g_once_init_leave (&welcome_dialog_type_id__volatile, welcome_dialog_type_id);
-	}
-	return welcome_dialog_type_id__volatile;
-}
-
-
-static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
-	gboolean result;
-	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
-#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 17323 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 17330 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 17337 "Dialogs.c"
-}
-
-
-static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 17346 "Dialogs.c"
-}
-
-
-static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
-	gboolean result;
-	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 17355 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 17362 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 17369 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 17376 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 17383 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 17390 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 17397 "Dialogs.c"
-}
-
-
-static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
-	gboolean result;
-	result = preferences_dialog_map_event ((PreferencesDialog*) self);
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 17406 "Dialogs.c"
-}
-
-
-static PreferencesDialog* preferences_dialog_construct (GType object_type) {
-	PreferencesDialog* self = NULL;
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-	GObject* _tmp2_;
-	GtkDialog* _tmp3_;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp4_;
-	gboolean _tmp5_;
-	GtkDialog* _tmp8_;
-	AppWindow* _tmp9_;
-	AppWindow* _tmp10_;
-	GdkWindow* _tmp11_;
-	GtkDialog* _tmp12_;
-	AppWindow* _tmp13_;
-	AppWindow* _tmp14_;
-	GtkDialog* _tmp15_;
-	GtkDialog* _tmp16_;
-	GtkBuilder* _tmp17_;
-	GObject* _tmp18_;
-	GtkAdjustment* _tmp19_;
-	GtkAdjustment* _tmp20_;
-	GtkAdjustment* _tmp21_;
-	gdouble _tmp22_;
-	ConfigFacade* _tmp23_;
-	ConfigFacade* _tmp24_;
-	GdkRGBA _tmp25_ = {0};
-	gdouble _tmp26_;
-	GtkAdjustment* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkScale* _tmp30_;
-	GtkScale* _tmp31_;
-	GtkBuilder* _tmp32_;
-	GObject* _tmp33_;
-	GtkFileChooserButton* _tmp34_;
-	GtkBuilder* _tmp35_;
-	GObject* _tmp36_;
-	GtkComboBox* _tmp37_;
-	GtkBuilder* _tmp38_;
-	GObject* _tmp39_;
-	GtkComboBox* _tmp40_;
-	GtkLabel* pattern_help = NULL;
-	GtkBuilder* _tmp41_;
-	GObject* _tmp42_;
-	GtkLabel* _tmp43_;
-	gchar* help_path = NULL;
-	gchar* _tmp44_;
-	const gchar* _tmp45_;
-	GtkBuilder* _tmp57_;
-	GObject* _tmp58_;
-	GtkComboBoxText* _tmp59_;
-	GtkBuilder* _tmp60_;
-	GObject* _tmp61_;
-	GtkEntry* _tmp62_;
-	GtkBuilder* _tmp63_;
-	GObject* _tmp64_;
-	GtkLabel* _tmp65_;
-	gchar* _tmp66_;
-	gchar* _tmp67_;
-	gchar* _tmp68_;
-	gchar* _tmp69_;
-	gchar* _tmp70_;
-	gchar* _tmp71_;
-	GtkComboBoxText* _tmp72_;
-	GtkEntry* _tmp73_;
-	GtkBuilder* _tmp74_;
-	GObject* _tmp75_;
-	GtkComboBoxText* _tmp76_;
-	GtkBuilder* _tmp77_;
-	GObject* _tmp78_;
-	GtkCheckButton* _tmp79_;
-	GtkCheckButton* _tmp80_;
-	GtkNotebook* notebook = NULL;
-	GtkBuilder* _tmp81_;
-	GObject* _tmp82_;
-	GtkNotebook* _tmp83_;
-	GtkWidget* _tmp84_;
-	PluginsManifestWidgetMediator* _tmp85_;
-	GtkWidget* _tmp86_;
-	GtkWidget* _tmp87_;
-	GtkComboBox* _tmp88_;
-	GtkComboBox* _tmp89_;
-	GtkCheckButton* auto_import_button = NULL;
-	GtkBuilder* _tmp90_;
-	GObject* _tmp91_;
-	GtkCheckButton* _tmp92_;
-	ConfigFacade* _tmp93_;
-	ConfigFacade* _tmp94_;
-	gboolean _tmp95_;
-	GtkCheckButton* commit_metadata_button = NULL;
-	GtkBuilder* _tmp96_;
-	GObject* _tmp97_;
-	GtkCheckButton* _tmp98_;
-	ConfigFacade* _tmp99_;
-	ConfigFacade* _tmp100_;
-	gboolean _tmp101_;
-	GtkBuilder* _tmp102_;
-	GObject* _tmp103_;
-	GtkComboBoxText* _tmp104_;
-	GtkComboBoxText* _tmp105_;
-	gchar* _tmp106_;
-	gchar* _tmp107_;
-	GtkComboBoxText* _tmp108_;
-	gchar* _tmp109_;
-	gchar* _tmp110_;
-	ConfigFacade* _tmp111_;
-	ConfigFacade* _tmp112_;
-	RawDeveloper _tmp113_;
-	GtkComboBoxText* _tmp114_;
-	GtkDialog* _tmp115_;
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (PreferencesDialog*) g_type_create_instance (object_type);
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->builder = _tmp0_;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->builder;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_builder_get_object (_tmp1_, "preferences_dialog");
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp2_) : NULL);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dialog = _tmp3_;
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gtk_settings_get_default ();
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = use_header;
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp5_) {
-#line 17547 "Dialogs.c"
-		GtkWidget* null_titlebar = NULL;
-		GtkDialog* _tmp6_;
-		GtkWidget* _tmp7_;
-#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		null_titlebar = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = self->priv->dialog;
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = null_titlebar;
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (null_titlebar);
-#line 17561 "Dialogs.c"
-	}
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = self->priv->dialog;
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = app_window_get_instance ();
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp10_);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = self->priv->dialog;
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = app_window_get_instance ();
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp14_);
-#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = self->priv->dialog;
-#line 2308 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = self->priv->dialog;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp16_, "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self);
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->builder;
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "bg_color_adjustment");
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp18_) : NULL);
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->bg_color_adjustment = _tmp19_;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = self->priv->bg_color_adjustment;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = self->priv->bg_color_adjustment;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = gtk_adjustment_get_upper (_tmp21_);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = config_facade_get_instance ();
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = _tmp23_;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	config_facade_get_bg_color (_tmp24_, &_tmp25_);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = _tmp25_.red;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_adjustment_set_value (_tmp20_, _tmp22_ - (_tmp26_ * 65535.0));
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp24_);
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = self->priv->bg_color_adjustment;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp27_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = self->priv->builder;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "bg_color_slider");
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp29_) : NULL);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->bg_color_slider = _tmp30_;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = self->priv->bg_color_slider;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = self->priv->builder;
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "library_dir_button");
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp33_) : NULL);
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->library_dir_button);
-#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->library_dir_button = _tmp34_;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = self->priv->builder;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = gtk_builder_get_object (_tmp35_, "external_photo_editor_combo");
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp36_) : NULL);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->photo_editor_combo = _tmp37_;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = self->priv->builder;
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "external_raw_editor_combo");
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp39_) : NULL);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->raw_editor_combo = _tmp40_;
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = self->priv->builder;
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "pattern_help");
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp42_) : NULL);
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pattern_help = _tmp43_;
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = resources_get_help_path ();
-#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	help_path = _tmp44_;
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = help_path;
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp45_ == NULL) {
-#line 17685 "Dialogs.c"
-		GtkLabel* _tmp46_;
-		gchar* _tmp47_;
-		gchar* _tmp48_;
-		gchar* _tmp49_;
-		gchar* _tmp50_;
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp46_ = pattern_help;
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp47_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _ ("(Help)"), NULL);
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp48_ = _tmp47_;
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp49_ = g_strconcat (_tmp48_, "</a>", NULL);
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp50_ = _tmp49_;
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp46_, _tmp50_);
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp50_);
-#line 2335 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp48_);
-#line 17707 "Dialogs.c"
-	} else {
-		GtkLabel* _tmp51_;
-		gchar* _tmp52_;
-		gchar* _tmp53_;
-		gchar* _tmp54_;
-		gchar* _tmp55_;
-		GtkLabel* _tmp56_;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = pattern_help;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp52_ = g_strconcat ("<a href=\"dummy:\">", _ ("(Help)"), NULL);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = _tmp52_;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp54_ = g_strconcat (_tmp53_, "</a>", NULL);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp55_ = _tmp54_;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp51_, _tmp55_);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp55_);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp53_);
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp56_ = pattern_help;
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_signal_connect (_tmp56_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
-#line 17735 "Dialogs.c"
-	}
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = self->priv->builder;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = gtk_builder_get_object (_tmp57_, "dir choser");
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp58_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp58_) : NULL);
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_combo = _tmp59_;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->builder;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = gtk_builder_get_object (_tmp60_, "dir_pattern_entry");
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp61_) : NULL);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_entry = _tmp62_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = self->priv->builder;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = gtk_builder_get_object (_tmp63_, "dynamic example");
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp64_) : NULL);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_example = _tmp65_;
-#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = _tmp66_;
-#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp67_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
-#line 2346 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp67_);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = _tmp68_;
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp69_, "%Y" G_DIR_SEPARATOR_S "%m");
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp69_);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = _tmp70_;
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp71_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp71_);
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _ ("Year-Month-Day"), "%Y-%m-%d");
-#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _ ("Custom"), NULL);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = self->priv->dir_pattern_combo;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = self->priv->dir_pattern_entry;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = self->priv->builder;
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = gtk_builder_get_object (_tmp74_, "dir_structure_label");
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = self->priv->dir_pattern_combo;
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp75_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = self->priv->builder;
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = gtk_builder_get_object (_tmp77_, "lowercase");
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp78_) : NULL);
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->lowercase);
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->lowercase = _tmp79_;
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = self->priv->lowercase;
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = self->priv->builder;
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = gtk_builder_get_object (_tmp81_, "preferences-notebook");
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp82_) : NULL);
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	notebook = _tmp83_;
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = gtk_notebook_get_nth_page (notebook, 2);
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = self->priv->plugins_mediator;
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = plugins_manifest_widget_mediator_get_widget (_tmp85_);
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = _tmp86_;
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp84_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp84_) : NULL, _tmp87_);
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_populate_preference_options (self);
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = self->priv->photo_editor_combo;
-#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp88_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = self->priv->raw_editor_combo;
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp89_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp90_ = self->priv->builder;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp91_ = gtk_builder_get_object (_tmp90_, "autoimport");
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp91_) : NULL);
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	auto_import_button = _tmp92_;
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp93_ = config_facade_get_instance ();
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp94_ = _tmp93_;
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp95_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp95_);
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp94_);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp96_ = self->priv->builder;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp97_ = gtk_builder_get_object (_tmp96_, "write_metadata");
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp97_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp97_) : NULL);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	commit_metadata_button = _tmp98_;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp99_ = config_facade_get_instance ();
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp100_ = _tmp99_;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp101_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp101_);
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp100_);
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp102_ = self->priv->builder;
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp103_ = gtk_builder_get_object (_tmp102_, "default_raw_developer");
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp103_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp103_) : NULL);
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->default_raw_developer_combo = _tmp104_;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp105_ = self->priv->default_raw_developer_combo;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp106_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp107_ = _tmp106_;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp105_, _tmp107_);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp107_);
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp108_ = self->priv->default_raw_developer_combo;
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp109_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp110_ = _tmp109_;
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp108_, _tmp110_);
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp110_);
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp111_ = config_facade_get_instance ();
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp112_ = _tmp111_;
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp113_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_set_raw_developer_combo (self, _tmp113_);
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp112_);
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp114_ = self->priv->default_raw_developer_combo;
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp115_ = self->priv->dialog;
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (commit_metadata_button);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (auto_import_button);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (notebook);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (help_path);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (pattern_help);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 17949 "Dialogs.c"
-}
-
-
-static PreferencesDialog* preferences_dialog_new (void) {
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 17956 "Dialogs.c"
-}
-
-
-void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
-	GtkComboBox* _tmp0_;
-	gint _tmp1_;
-	gchar** _tmp2_;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
-	ConfigFacade* _tmp4_;
-	ConfigFacade* _tmp5_;
-	gchar* _tmp6_;
-	gchar* _tmp7_;
-	SortedList* _tmp8_ = NULL;
-	GtkComboBox* _tmp9_;
-	gint _tmp10_;
-	gchar** _tmp11_;
-	gchar** _tmp12_;
-	gint _tmp12__length1;
-	ConfigFacade* _tmp13_;
-	ConfigFacade* _tmp14_;
-	gchar* _tmp15_;
-	gchar* _tmp16_;
-	SortedList* _tmp17_ = NULL;
-	GtkComboBoxText* _tmp18_;
-	GtkEntry* _tmp19_;
-	GtkCheckButton* _tmp20_;
-	ConfigFacade* _tmp21_;
-	ConfigFacade* _tmp22_;
-	gboolean _tmp23_;
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->photo_editor_combo;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3__length1 = _tmp1_;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = config_facade_get_instance ();
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = _tmp6_;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_photo_apps = _tmp8_;
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp7_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp5_);
-#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = self->priv->raw_editor_combo;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12__length1 = _tmp10_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = config_facade_get_instance ();
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = _tmp15_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_raw_apps = _tmp17_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp16_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp14_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->dir_pattern_combo;
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = self->priv->dir_pattern_entry;
-#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = self->priv->lowercase;
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = config_facade_get_instance ();
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _tmp21_;
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp22_);
-#line 18063 "Dialogs.c"
-}
-
-
-static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
-	gboolean result = FALSE;
-	GError * _inner_error_ = NULL;
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18074 "Dialogs.c"
-	{
-		AppWindow* _tmp0_;
-		AppWindow* _tmp1_;
-		GdkScreen* _tmp2_;
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = app_window_get_instance ();
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _tmp0_;
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18091 "Dialogs.c"
-			goto __catch428_g_error;
-		}
-	}
-	goto __finally428;
-	__catch428_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp3_;
-		const gchar* _tmp4_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		e = _inner_error_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_inner_error_ = NULL;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = e;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = _tmp3_->message;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_message ("Dialogs.vala:2403: Unable to launch help: %s", _tmp4_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_error_free0 (e);
-#line 18113 "Dialogs.c"
-	}
-	__finally428:
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18118 "Dialogs.c"
-		gboolean _tmp5_ = FALSE;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_clear_error (&_inner_error_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return _tmp5_;
-#line 18126 "Dialogs.c"
-	}
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = TRUE;
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 18132 "Dialogs.c"
-}
-
-
-static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps) {
-	SortedList* _vala_external_apps = NULL;
-	gchar** _tmp0_;
-	gint _tmp0__length1;
-	gchar** _tmp1_;
-	gint _tmp1__length1;
-	SortedList* _tmp2_;
-	SortedList* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	GtkCellRendererPixbuf* pixbuf_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp6_;
-	GtkCellRendererText* text_renderer = NULL;
-	GtkCellRendererText* _tmp7_;
-	GtkComboBox* _tmp8_;
-	GtkComboBox* _tmp9_;
-	GtkCellRendererPixbuf* _tmp10_;
-	GtkComboBox* _tmp11_;
-	GtkCellRendererText* _tmp12_;
-	GtkComboBox* _tmp13_;
-	GtkCellRendererPixbuf* _tmp14_;
-	GtkComboBox* _tmp15_;
-	GtkCellRendererText* _tmp16_;
-	GtkListStore* combo_store = NULL;
-	GtkListStore* _tmp17_;
-	GtkTreeIter iter = {0};
-	gint current_app = 0;
-	GtkComboBox* _tmp67_;
-	GtkListStore* _tmp68_;
-	gint _tmp69_;
-	GError * _inner_error_ = NULL;
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (current_app_executable != NULL);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = mime_types;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0__length1 = mime_types_length1;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = mime_types;
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1__length1 = mime_types_length1;
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_vala_external_apps);
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_external_apps = _tmp2_;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _vala_external_apps;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_ == 0) {
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (external_apps) {
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			*external_apps = _vala_external_apps;
-#line 18201 "Dialogs.c"
-		} else {
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (_vala_external_apps);
-#line 18205 "Dialogs.c"
-		}
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return;
-#line 18209 "Dialogs.c"
-	}
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp6_);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pixbuf_renderer = _tmp6_;
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp7_);
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	text_renderer = _tmp7_;
-#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = combo_box;
-#line 2420 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = combo_box;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = pixbuf_renderer;
-#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = combo_box;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = text_renderer;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = combo_box;
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = pixbuf_renderer;
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = combo_box;
-#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = text_renderer;
-#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_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"
-	current_app = -1;
-#line 18257 "Dialogs.c"
-	{
-		GeeIterator* _app_it = NULL;
-		SortedList* _tmp18_;
-		GeeIterator* _tmp19_;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = _vala_external_apps;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_app_it = _tmp19_;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		while (TRUE) {
-#line 18270 "Dialogs.c"
-			GeeIterator* _tmp20_;
-			gboolean _tmp21_;
-			GAppInfo* app = NULL;
-			GeeIterator* _tmp22_;
-			gpointer _tmp23_;
-			GtkListStore* _tmp24_;
-			GtkTreeIter _tmp25_ = {0};
-			GIcon* app_icon = NULL;
-			GAppInfo* _tmp26_;
-			GIcon* _tmp27_;
-			GIcon* _tmp28_;
-			GtkListStore* _tmp56_;
-			GtkTreeIter _tmp57_;
-			GAppInfo* _tmp58_;
-			const gchar* _tmp59_;
-			GValue _tmp60_ = {0};
-			GAppInfo* _tmp61_;
-			const gchar* _tmp62_;
-			const gchar* _tmp63_;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp20_ = _app_it;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (!_tmp21_) {
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				break;
-#line 18298 "Dialogs.c"
-			}
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp22_ = _app_it;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			app = (GAppInfo*) _tmp23_;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp24_ = combo_store;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_list_store_append (_tmp24_, &_tmp25_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			iter = _tmp25_;
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp26_ = app;
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp27_ = g_app_info_get_icon (_tmp26_);
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			app_icon = _tmp28_;
-#line 18320 "Dialogs.c"
-			{
-				GIcon* _tmp29_;
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp29_ = app_icon;
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 18327 "Dialogs.c"
-					GdkPixbuf* _tmp30_ = NULL;
-					GIcon* _tmp31_;
-					GFile* _tmp32_;
-					gchar* _tmp33_;
-					gchar* _tmp34_;
-					GdkPixbuf* _tmp35_;
-					GdkPixbuf* _tmp36_;
-					GtkListStore* _tmp37_;
-					GtkTreeIter _tmp38_;
-					GdkPixbuf* _tmp39_;
-					GValue _tmp40_ = {0};
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp31_ = app_icon;
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp33_ = g_file_get_path (_tmp32_);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp34_ = _tmp33_;
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp36_ = _tmp35_;
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_g_free0 (_tmp34_);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp30_ = _tmp36_;
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18357 "Dialogs.c"
-						goto __catch429_g_error;
-					}
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp37_ = combo_store;
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp38_ = iter;
-#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_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"
-					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_g_object_unref0 (_tmp30_);
-#line 18376 "Dialogs.c"
-				} else {
-					GIcon* _tmp41_;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp41_ = app_icon;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 18383 "Dialogs.c"
-						GdkPixbuf* icon_pixbuf = NULL;
-						GtkIconTheme* _tmp42_;
-						GIcon* _tmp43_;
-						gchar** _tmp44_;
-						gchar** _tmp45_;
-						const gchar* _tmp46_;
-						GdkPixbuf* _tmp47_;
-						GtkListStore* _tmp48_;
-						GtkTreeIter _tmp49_;
-						GdkPixbuf* _tmp50_;
-						GValue _tmp51_ = {0};
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp42_ = gtk_icon_theme_get_default ();
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp43_ = app_icon;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp46_ = _tmp45_[0];
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						icon_pixbuf = _tmp47_;
-#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18409 "Dialogs.c"
-							goto __catch429_g_error;
-						}
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp48_ = combo_store;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_tmp49_ = iter;
-#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_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"
-						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-						_g_object_unref0 (icon_pixbuf);
-#line 18428 "Dialogs.c"
-					}
-				}
-			}
-			goto __finally429;
-			__catch429_g_error:
-			{
-				GError* _error_ = NULL;
-				GError* _tmp52_;
-				const gchar* _tmp53_;
-				gchar* _tmp54_;
-				gchar* _tmp55_;
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_error_ = _inner_error_;
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_inner_error_ = NULL;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp52_ = _error_;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp53_ = _tmp52_->message;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp55_ = _tmp54_;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_warning ("Dialogs.vala:2449: %s", _tmp55_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp55_);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_error_free0 (_error_);
-#line 18458 "Dialogs.c"
-			}
-			__finally429:
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (app_icon);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (app);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (_app_it);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (combo_store);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (text_renderer);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_object_unref0 (pixbuf_renderer);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_clear_error (&_inner_error_);
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				return;
-#line 18481 "Dialogs.c"
-			}
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp56_ = combo_store;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp57_ = iter;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp58_ = app;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp59_ = g_app_info_get_name (_tmp58_);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_value_init (&_tmp60_, G_TYPE_STRING);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_value_set_string (&_tmp60_, _tmp59_);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
-#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp61_ = app;
-#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp62_ = g_app_info_get_commandline (_tmp61_);
-#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp63_ = current_app_executable;
-#line 2454 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 18507 "Dialogs.c"
-				SortedList* _tmp64_;
-				GAppInfo* _tmp65_;
-				gint _tmp66_;
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp64_ = _vala_external_apps;
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp65_ = app;
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				current_app = _tmp66_;
-#line 18519 "Dialogs.c"
-			}
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (app_icon);
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (app);
-#line 18525 "Dialogs.c"
-		}
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_app_it);
-#line 18529 "Dialogs.c"
-	}
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = combo_box;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = combo_store;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = current_app;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp69_ != -1) {
-#line 18541 "Dialogs.c"
-		GtkComboBox* _tmp70_;
-		gint _tmp71_;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = combo_box;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = current_app;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 18550 "Dialogs.c"
-	}
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (combo_store);
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (text_renderer);
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (pixbuf_renderer);
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (external_apps) {
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*external_apps = _vala_external_apps;
-#line 18562 "Dialogs.c"
-	} else {
-#line 2408 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_vala_external_apps);
-#line 18566 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry) {
-	gchar* pattern = NULL;
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gboolean found = FALSE;
-	const gchar* _tmp4_;
-	gboolean _tmp32_;
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (GTK_IS_ENTRY (entry));
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp1_);
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pattern = _tmp3_;
-#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	found = FALSE;
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = pattern;
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (NULL != _tmp4_) {
-#line 18604 "Dialogs.c"
-		gint i = 0;
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		i = 0;
-#line 18608 "Dialogs.c"
-		{
-			GeeArrayList* _pf_list = NULL;
-			GeeArrayList* _tmp5_;
-			GeeArrayList* _tmp6_;
-			gint _pf_size = 0;
-			GeeArrayList* _tmp7_;
-			gint _tmp8_;
-			gint _tmp9_;
-			gint _pf_index = 0;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp5_ = self->priv->path_formats;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_pf_list = _tmp6_;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp7_ = _pf_list;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp9_ = _tmp8_;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_pf_size = _tmp9_;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_pf_index = -1;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			while (TRUE) {
-#line 18636 "Dialogs.c"
-				gint _tmp10_;
-				gint _tmp11_;
-				gint _tmp12_;
-				PreferencesDialogPathFormat* pf = NULL;
-				GeeArrayList* _tmp13_;
-				gint _tmp14_;
-				gpointer _tmp15_;
-				PreferencesDialogPathFormat* _tmp16_;
-				const gchar* _tmp17_;
-				const gchar* _tmp18_;
-				gint _tmp21_;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp10_ = _pf_index;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_pf_index = _tmp10_ + 1;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp11_ = _pf_index;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp12_ = _pf_size;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (!(_tmp11_ < _tmp12_)) {
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					break;
-#line 18660 "Dialogs.c"
-				}
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp13_ = _pf_list;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp14_ = _pf_index;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				pf = (PreferencesDialogPathFormat*) _tmp15_;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp16_ = pf;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp17_ = _tmp16_->pattern;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp18_ = pattern;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 18678 "Dialogs.c"
-					GtkComboBox* _tmp19_;
-					gint _tmp20_;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp19_ = combo_box;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp20_ = i;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					gtk_combo_box_set_active (_tmp19_, _tmp20_);
-#line 2475 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					found = TRUE;
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_preferences_dialog_path_format_unref0 (pf);
-#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					break;
-#line 18693 "Dialogs.c"
-				}
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp21_ = i;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				i = _tmp21_ + 1;
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_preferences_dialog_path_format_unref0 (pf);
-#line 18701 "Dialogs.c"
-			}
-#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_object_unref0 (_pf_list);
-#line 18705 "Dialogs.c"
-		}
-	} else {
-		gchar* s = NULL;
-		ConfigFacade* _tmp22_;
-		ConfigFacade* _tmp23_;
-		gchar* _tmp24_;
-		gchar* _tmp25_;
-		const gchar* _tmp26_;
-		gboolean _tmp27_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp22_ = config_facade_get_instance ();
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp23_ = _tmp22_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp25_ = _tmp24_;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp23_);
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		s = _tmp25_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp26_ = s;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp27_ = is_string_empty (_tmp26_);
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (!_tmp27_) {
-#line 18733 "Dialogs.c"
-			GtkComboBox* _tmp28_;
-			GeeArrayList* _tmp29_;
-			gint _tmp30_;
-			gint _tmp31_;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp28_ = combo_box;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp29_ = self->priv->path_formats;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp31_ = _tmp30_;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			found = TRUE;
-#line 18750 "Dialogs.c"
-		}
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (s);
-#line 18754 "Dialogs.c"
-	}
-#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = found;
-#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp32_) {
-#line 18760 "Dialogs.c"
-		GtkComboBox* _tmp33_;
-#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = combo_box;
-#line 2490 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (_tmp33_, 0);
-#line 18766 "Dialogs.c"
-	}
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_dir_pattern_combo_changed (self);
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (pattern);
-#line 18772 "Dialogs.c"
-}
-
-
-void preferences_dialog_show (void) {
-	PreferencesDialog* _tmp0_;
-	PreferencesDialog* _tmp2_;
-	PreferencesDialog* _tmp3_;
-	GtkDialog* _tmp4_;
-	PreferencesDialog* _tmp5_;
-	GtkFileChooserButton* _tmp6_;
-	GFile* _tmp7_;
-	GFile* _tmp8_;
-	gchar* _tmp9_;
-	gchar* _tmp10_;
-	PreferencesDialog* _tmp11_;
-	GtkDialog* _tmp12_;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = preferences_dialog_preferences_dialog;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == NULL) {
-#line 18793 "Dialogs.c"
-		PreferencesDialog* _tmp1_;
-#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = preferences_dialog_new ();
-#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
-#line 2498 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_preferences_dialog = _tmp1_;
-#line 18801 "Dialogs.c"
-	}
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = preferences_dialog_preferences_dialog;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_populate_preference_options (_tmp2_);
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = preferences_dialog_preferences_dialog;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _tmp3_->priv->dialog;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = preferences_dialog_preferences_dialog;
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = _tmp5_->priv->library_dir_button;
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = app_dirs_get_import_dir ();
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = _tmp7_;
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = g_file_get_path (_tmp8_);
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = _tmp9_;
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp10_);
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp10_);
-#line 2502 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp8_);
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = preferences_dialog_preferences_dialog;
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = _tmp11_->priv->dialog;
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 18837 "Dialogs.c"
-}
-
-
-static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	GtkCheckButton* autoimport = NULL;
-	GtkBuilder* _tmp2_;
-	GObject* _tmp3_;
-	GtkCheckButton* _tmp4_;
-	GtkCheckButton* _tmp5_;
-	GtkCheckButton* commit_metadata = NULL;
-	GtkBuilder* _tmp11_;
-	GObject* _tmp12_;
-	GtkCheckButton* _tmp13_;
-	GtkCheckButton* _tmp14_;
-	const gchar* _tmp20_;
-	PreferencesDialogPathFormat* pf = NULL;
-	GeeArrayList* _tmp22_;
-	GtkComboBoxText* _tmp23_;
-	gint _tmp24_;
-	gpointer _tmp25_;
-	PreferencesDialogPathFormat* _tmp26_;
-	const gchar* _tmp27_;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	config_facade_commit_bg_color (_tmp1_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp1_);
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->builder;
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_builder_get_object (_tmp2_, "autoimport");
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp3_) : NULL);
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	autoimport = _tmp4_;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = autoimport;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_ != NULL) {
-#line 18884 "Dialogs.c"
-		ConfigFacade* _tmp6_;
-		ConfigFacade* _tmp7_;
-		GtkCheckButton* _tmp8_;
-		gboolean _tmp9_;
-		gboolean _tmp10_;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = config_facade_get_instance ();
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp6_;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = autoimport;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp9_;
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp7_);
-#line 18904 "Dialogs.c"
-	}
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->builder;
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = gtk_builder_get_object (_tmp11_, "write_metadata");
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp12_) : NULL);
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	commit_metadata = _tmp13_;
-#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = commit_metadata;
-#line 2519 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp14_ != NULL) {
-#line 18918 "Dialogs.c"
-		ConfigFacade* _tmp15_;
-		ConfigFacade* _tmp16_;
-		GtkCheckButton* _tmp17_;
-		gboolean _tmp18_;
-		gboolean _tmp19_;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = config_facade_get_instance ();
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = _tmp15_;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = commit_metadata;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = _tmp18_;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp16_);
-#line 18938 "Dialogs.c"
-	}
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = self->priv->lib_dir;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp20_ != NULL) {
-#line 18944 "Dialogs.c"
-		const gchar* _tmp21_;
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = self->priv->lib_dir;
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		app_dirs_set_import_dir (_tmp21_);
-#line 18950 "Dialogs.c"
-	}
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->priv->path_formats;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->priv->dir_pattern_combo;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_);
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pf = (PreferencesDialogPathFormat*) _tmp25_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = pf;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = _tmp26_->pattern;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (NULL == _tmp27_) {
-#line 18968 "Dialogs.c"
-		ConfigFacade* _tmp28_;
-		ConfigFacade* _tmp29_;
-		GtkEntry* _tmp30_;
-		const gchar* _tmp31_;
-		const gchar* _tmp32_;
-		ConfigFacade* _tmp33_;
-		ConfigFacade* _tmp34_;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp28_ = config_facade_get_instance ();
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = _tmp28_;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = self->priv->dir_pattern_entry;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = gtk_entry_get_text (_tmp30_);
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = _tmp31_;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp32_);
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp29_);
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = config_facade_get_instance ();
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp34_ = _tmp33_;
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
-#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp34_);
-#line 18998 "Dialogs.c"
-	} else {
-		ConfigFacade* _tmp35_;
-		ConfigFacade* _tmp36_;
-		PreferencesDialogPathFormat* _tmp37_;
-		const gchar* _tmp38_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp35_ = config_facade_get_instance ();
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp36_ = _tmp35_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp37_ = pf;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp38_ = _tmp37_->pattern;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp36_);
-#line 19016 "Dialogs.c"
-	}
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_preferences_dialog_path_format_unref0 (pf);
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (commit_metadata);
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (autoimport);
-#line 19024 "Dialogs.c"
-}
-
-
-static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-	GtkDialog* _tmp1_;
-	gboolean _tmp2_;
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp0_) {
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = TRUE;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 19043 "Dialogs.c"
-	}
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_commit_on_close (self);
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->dialog;
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp2_;
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 19055 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_close (PreferencesDialog* self) {
-	gboolean _tmp0_;
-	GtkDialog* _tmp1_;
-#line 2542 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2543 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!_tmp0_) {
-#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return;
-#line 19070 "Dialogs.c"
-	}
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->dialog;
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_commit_on_close (self);
-#line 19078 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
-	GtkAdjustment* _tmp0_;
-	gdouble _tmp1_;
-	GtkAdjustment* _tmp2_;
-	gdouble _tmp3_;
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->bg_color_adjustment;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->bg_color_adjustment;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19099 "Dialogs.c"
-}
-
-
-static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	GdkEventButton* _tmp2_;
-	guint _tmp3_;
-#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = event;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_->button;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp3_ == ((guint) 1)) {
-#line 19119 "Dialogs.c"
-		GdkEventButton* _tmp4_;
-		GdkEventType _tmp5_;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp4_ = event;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = _tmp4_->type;
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19128 "Dialogs.c"
-	} else {
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = FALSE;
-#line 19132 "Dialogs.c"
-	}
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_) {
-#line 19136 "Dialogs.c"
-		GdkEventButton* _tmp6_;
-		GdkModifierType _tmp7_;
-		gboolean _tmp8_;
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = event;
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp6_->state;
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp8_;
-#line 19148 "Dialogs.c"
-	} else {
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = FALSE;
-#line 19152 "Dialogs.c"
-	}
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_) {
-#line 19156 "Dialogs.c"
-		GtkScale* _tmp9_;
-		GtkAdjustment* _tmp10_;
-		gdouble _tmp11_;
-		GdkRGBA _tmp12_ = {0};
-		gdouble _tmp13_;
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = self->priv->bg_color_slider;
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = self->priv->bg_color_adjustment;
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = _tmp12_.red;
-#line 2559 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_on_value_changed (self);
-#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = TRUE;
-#line 2563 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 19180 "Dialogs.c"
-	}
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = FALSE;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 19186 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) {
-	PreferencesDialogPathFormat* pf = NULL;
-	GeeArrayList* _tmp0_;
-	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-	gpointer _tmp3_;
-	PreferencesDialogPathFormat* _tmp4_;
-	const gchar* _tmp5_;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->path_formats;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->dir_pattern_combo;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pf = (PreferencesDialogPathFormat*) _tmp3_;
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = pf;
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_->pattern;
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (NULL == _tmp5_) {
-#line 19216 "Dialogs.c"
-		gchar* dir_pattern = NULL;
-		ConfigFacade* _tmp6_;
-		ConfigFacade* _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		const gchar* _tmp10_;
-		gboolean _tmp11_;
-		GtkEntry* _tmp13_;
-		const gchar* _tmp14_;
-		GtkEntry* _tmp15_;
-		GtkEntry* _tmp16_;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = config_facade_get_instance ();
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = _tmp6_;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = _tmp8_;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp7_);
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dir_pattern = _tmp9_;
-#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = dir_pattern;
-#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = is_string_empty (_tmp10_);
-#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp11_) {
-#line 19246 "Dialogs.c"
-			gchar* _tmp12_;
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp12_ = g_strdup ("");
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_g_free0 (dir_pattern);
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			dir_pattern = _tmp12_;
-#line 19254 "Dialogs.c"
-		}
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = dir_pattern;
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = self->priv->dir_pattern_entry;
-#line 2578 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (dir_pattern);
-#line 19272 "Dialogs.c"
-	} else {
-		GtkEntry* _tmp17_;
-		PreferencesDialogPathFormat* _tmp18_;
-		const gchar* _tmp19_;
-		GtkEntry* _tmp20_;
-		GtkEntry* _tmp21_;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = pf;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp19_ = _tmp18_->pattern;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_text (_tmp17_, _tmp19_);
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp20_ = self->priv->dir_pattern_entry;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_set (_tmp20_, "editable", FALSE, NULL);
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp21_ = self->priv->dir_pattern_entry;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 19295 "Dialogs.c"
-	}
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_preferences_dialog_path_format_unref0 (pf);
-#line 19299 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) {
-	gchar* example = NULL;
-	GDateTime* _tmp0_;
-	GtkEntry* _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-	const gchar* _tmp6_;
-	gboolean _tmp7_;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->example_date;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->dir_pattern_entry;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = _tmp2_;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	example = _tmp4_;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp6_ = example;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = is_string_empty (_tmp6_);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp7_) {
-#line 19333 "Dialogs.c"
-		GtkEntry* _tmp8_;
-		const gchar* _tmp9_;
-		const gchar* _tmp10_;
-		gboolean _tmp11_;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->priv->dir_pattern_entry;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp9_;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp11_ = is_string_empty (_tmp10_);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = !_tmp11_;
-#line 19348 "Dialogs.c"
-	} else {
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = FALSE;
-#line 19352 "Dialogs.c"
-	}
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp5_) {
-#line 19356 "Dialogs.c"
-		GtkLabel* _tmp12_;
-		GtkEntry* _tmp13_;
-		GtkEntry* _tmp14_;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp12_ = self->priv->dir_pattern_example;
-#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp12_, _ ("Invalid pattern"));
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_from_icon_name (_tmp13_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp14_ = self->priv->dir_pattern_entry;
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_activatable (_tmp14_, GTK_ENTRY_ICON_SECONDARY, FALSE);
-#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_set_allow_closing (self, FALSE);
-#line 19374 "Dialogs.c"
-	} else {
-		GtkLabel* _tmp15_;
-		const gchar* _tmp16_;
-		GtkEntry* _tmp17_;
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp15_ = self->priv->dir_pattern_example;
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp16_ = example;
-#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_text (_tmp15_, _tmp16_);
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_icon_from_icon_name (_tmp17_, GTK_ENTRY_ICON_SECONDARY, NULL);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_set_allow_closing (self, TRUE);
-#line 19391 "Dialogs.c"
-	}
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (example);
-#line 19395 "Dialogs.c"
-}
-
-
-static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow) {
-	GtkDialog* _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->dialog;
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = allow;
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), _tmp1_);
-#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = allow;
-#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->allow_closing = _tmp2_;
-#line 19415 "Dialogs.c"
-}
-
-
-static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->allow_closing;
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = _tmp0_;
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 19430 "Dialogs.c"
-}
-
-
-static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value) {
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	gdouble _tmp2_;
-	GdkRGBA _tmp3_ = {0};
-#line 2611 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_;
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = bg_color_value;
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	config_facade_set_bg_color (_tmp1_, &_tmp3_);
-#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp1_);
-#line 19453 "Dialogs.c"
-}
-
-
-static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result) {
-	GdkRGBA color = {0};
-	gdouble _tmp0_;
-	gdouble _tmp1_;
-	gdouble _tmp2_;
-#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2616 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	memset (&color, 0, sizeof (GdkRGBA));
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = color_value;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	color.red = _tmp0_;
-#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = color_value;
-#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	color.green = _tmp1_;
-#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = color_value;
-#line 2620 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	color.blue = _tmp2_;
-#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	color.alpha = 1.0;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	*result = color;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return;
-#line 19484 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) {
-	gint _tmp0_ = 0;
-	GtkComboBox* _tmp1_;
-	gint _tmp2_;
-	SortedList* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint photo_app_choice_index = 0;
-	GAppInfo* app = NULL;
-	SortedList* _tmp11_;
-	gpointer _tmp12_;
-	ConfigFacade* _tmp13_;
-	ConfigFacade* _tmp14_;
-	gchar* _tmp15_;
-	gchar* _tmp16_;
-	gchar* _tmp17_;
-	gchar* _tmp18_;
-#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->photo_editor_combo;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->external_photo_apps;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_ < _tmp5_) {
-#line 19519 "Dialogs.c"
-		GtkComboBox* _tmp6_;
-		gint _tmp7_;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = self->priv->photo_editor_combo;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp7_;
-#line 19528 "Dialogs.c"
-	} else {
-		SortedList* _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->priv->external_photo_apps;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp9_;
-#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp10_;
-#line 19541 "Dialogs.c"
-	}
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	photo_app_choice_index = _tmp0_;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->external_photo_apps;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	app = (GAppInfo*) _tmp12_;
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = config_facade_get_instance ();
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = desktop_integration_get_app_open_command (app);
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = _tmp15_;
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp16_);
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp14_);
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = desktop_integration_get_app_open_command (app);
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = _tmp17_;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2634: setting external photo editor to: %s", _tmp18_);
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp18_);
-#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (app);
-#line 19575 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
-	gint _tmp0_ = 0;
-	GtkComboBox* _tmp1_;
-	gint _tmp2_;
-	SortedList* _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint raw_app_choice_index = 0;
-	GAppInfo* app = NULL;
-	SortedList* _tmp11_;
-	gpointer _tmp12_;
-	ConfigFacade* _tmp13_;
-	ConfigFacade* _tmp14_;
-	const gchar* _tmp15_;
-	const gchar* _tmp16_;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = self->priv->raw_editor_combo;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->external_raw_apps;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = _tmp4_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp2_ < _tmp5_) {
-#line 19608 "Dialogs.c"
-		GtkComboBox* _tmp6_;
-		gint _tmp7_;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = self->priv->raw_editor_combo;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp7_;
-#line 19617 "Dialogs.c"
-	} else {
-		SortedList* _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp8_ = self->priv->external_raw_apps;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp10_ = _tmp9_;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp0_ = _tmp10_;
-#line 19630 "Dialogs.c"
-	}
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	raw_app_choice_index = _tmp0_;
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = self->priv->external_raw_apps;
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	app = (GAppInfo*) _tmp12_;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = config_facade_get_instance ();
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _tmp13_;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = g_app_info_get_commandline (app);
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp14_);
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = g_app_info_get_commandline (app);
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2645: setting external raw editor to: %s", _tmp16_);
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (app);
-#line 19656 "Dialogs.c"
-}
-
-
-static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) {
-	RawDeveloper result = 0;
-	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->default_raw_developer_combo;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp1_ == 0) {
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		result = RAW_DEVELOPER_CAMERA;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return result;
-#line 19676 "Dialogs.c"
-	}
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = RAW_DEVELOPER_SHOTWELL;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 19682 "Dialogs.c"
-}
-
-
-static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
-	RawDeveloper _tmp0_;
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = d;
-#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 19694 "Dialogs.c"
-		GtkComboBoxText* _tmp1_;
-#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp1_ = self->priv->default_raw_developer_combo;
-#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 19700 "Dialogs.c"
-	} else {
-		GtkComboBoxText* _tmp2_;
-#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp2_ = self->priv->default_raw_developer_combo;
-#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 19707 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	RawDeveloper _tmp2_;
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_;
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp1_);
-#line 19728 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
-	GtkFileChooserButton* _tmp0_;
-	gchar* _tmp1_;
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->library_dir_button;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->priv->lib_dir);
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->lib_dir = _tmp1_;
-#line 19745 "Dialogs.c"
-}
-
-
-static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 19752 "Dialogs.c"
-}
-
-
-static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
-	gboolean result = FALSE;
-	GtkFileChooserButton* _tmp0_;
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = self->priv->library_dir_button;
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self);
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	result = TRUE;
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return result;
-#line 19769 "Dialogs.c"
-}
-
-
-static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern) {
-	PreferencesDialogPathFormat* pf = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	PreferencesDialogPathFormat* _tmp2_;
-	GeeArrayList* _tmp3_;
-	GtkComboBoxText* _tmp4_;
-	const gchar* _tmp5_;
-#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (name != NULL);
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = name;
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = pattern;
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pf = _tmp2_;
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = self->priv->path_formats;
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
-#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = self->priv->dir_pattern_combo;
-#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp5_ = name;
-#line 2681 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
-#line 2678 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_preferences_dialog_path_format_unref0 (pf);
-#line 19805 "Dialogs.c"
-}
-
-
-static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	GtkCheckButton* _tmp2_;
-	gboolean _tmp3_;
-#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = _tmp0_;
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->lowercase;
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp1_);
-#line 19828 "Dialogs.c"
-}
-
-
-static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern) {
-	PreferencesDialogPathFormat* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	const gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = name;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->name);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->name = _tmp1_;
-#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = pattern;
-#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->pattern);
-#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->pattern = _tmp3_;
-#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return self;
-#line 19860 "Dialogs.c"
-}
-
-
-static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
-#line 2266 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 19867 "Dialogs.c"
-}
-
-
-static void preferences_dialog_value_path_format_init (GValue* value) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	value->data[0].v_pointer = NULL;
-#line 19874 "Dialogs.c"
-}
-
-
-static void preferences_dialog_value_path_format_free_value (GValue* value) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (value->data[0].v_pointer) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 19883 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (src_value->data[0].v_pointer) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 19893 "Dialogs.c"
-	} else {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 19897 "Dialogs.c"
-	}
-}
-
-
-static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 19905 "Dialogs.c"
-}
-
-
-static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (collect_values[0].v_pointer) {
-#line 19912 "Dialogs.c"
-		PreferencesDialogPathFormat * object;
-		object = collect_values[0].v_pointer;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 19919 "Dialogs.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 19923 "Dialogs.c"
-		}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 19927 "Dialogs.c"
-	} else {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 19931 "Dialogs.c"
-	}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 19935 "Dialogs.c"
-}
-
-
-static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PreferencesDialogPathFormat ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!object_p) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 19946 "Dialogs.c"
-	}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!value->data[0].v_pointer) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = NULL;
-#line 19952 "Dialogs.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = value->data[0].v_pointer;
-#line 19956 "Dialogs.c"
-	} else {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 19960 "Dialogs.c"
-	}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 19964 "Dialogs.c"
-}
-
-
-static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	PreferencesDialogParamSpecPathFormat* spec;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return G_PARAM_SPEC (spec);
-#line 19978 "Dialogs.c"
-}
-
-
-static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 19987 "Dialogs.c"
-}
-
-
-static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
-	PreferencesDialogPathFormat * old;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20007 "Dialogs.c"
-	} else {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 20011 "Dialogs.c"
-	}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_path_format_unref (old);
-#line 20017 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
-	PreferencesDialogPathFormat * old;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 20036 "Dialogs.c"
-	} else {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 20040 "Dialogs.c"
-	}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_path_format_unref (old);
-#line 20046 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20056 "Dialogs.c"
-}
-
-
-static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ref_count = 1;
-#line 20063 "Dialogs.c"
-}
-
-
-static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) {
-	PreferencesDialogPathFormat * self;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_destroy (self);
-#line 2270 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->name);
-#line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->pattern);
-#line 20077 "Dialogs.c"
-}
-
-
-static GType preferences_dialog_path_format_get_type (void) {
-	static volatile gsize preferences_dialog_path_format_type_id__volatile = 0;
-	if (g_once_init_enter (&preferences_dialog_path_format_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { preferences_dialog_value_path_format_init, preferences_dialog_value_path_format_free_value, preferences_dialog_value_path_format_copy_value, preferences_dialog_value_path_format_peek_pointer, "p", preferences_dialog_value_path_format_collect_value, "p", preferences_dialog_value_path_format_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogPathFormatClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_path_format_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialogPathFormat), 0, (GInstanceInitFunc) preferences_dialog_path_format_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType preferences_dialog_path_format_type_id;
-		preferences_dialog_path_format_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PreferencesDialogPathFormat", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&preferences_dialog_path_format_type_id__volatile, preferences_dialog_path_format_type_id);
-	}
-	return preferences_dialog_path_format_type_id__volatile;
-}
-
-
-static gpointer preferences_dialog_path_format_ref (gpointer instance) {
-	PreferencesDialogPathFormat * self;
-	self = instance;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return instance;
-#line 20102 "Dialogs.c"
-}
-
-
-static void preferences_dialog_path_format_unref (gpointer instance) {
-	PreferencesDialogPathFormat * self;
-	self = instance;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 20115 "Dialogs.c"
-	}
-}
-
-
-static void value_preferences_dialog_init (GValue* value) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	value->data[0].v_pointer = NULL;
-#line 20123 "Dialogs.c"
-}
-
-
-static void value_preferences_dialog_free_value (GValue* value) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (value->data[0].v_pointer) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20132 "Dialogs.c"
-	}
-}
-
-
-static void value_preferences_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (src_value->data[0].v_pointer) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer);
-#line 20142 "Dialogs.c"
-	} else {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 20146 "Dialogs.c"
-	}
-}
-
-
-static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 20154 "Dialogs.c"
-}
-
-
-static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (collect_values[0].v_pointer) {
-#line 20161 "Dialogs.c"
-		PreferencesDialog * object;
-		object = collect_values[0].v_pointer;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20168 "Dialogs.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20172 "Dialogs.c"
-		}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20176 "Dialogs.c"
-	} else {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 20180 "Dialogs.c"
-	}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 20184 "Dialogs.c"
-}
-
-
-static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PreferencesDialog ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!object_p) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20195 "Dialogs.c"
-	}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (!value->data[0].v_pointer) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = NULL;
-#line 20201 "Dialogs.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = value->data[0].v_pointer;
-#line 20205 "Dialogs.c"
-	} else {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20209 "Dialogs.c"
-	}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return NULL;
-#line 20213 "Dialogs.c"
-}
-
-
-GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecPreferencesDialog* spec;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return G_PARAM_SPEC (spec);
-#line 20227 "Dialogs.c"
-}
-
-
-gpointer value_get_preferences_dialog (const GValue* value) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return value->data[0].v_pointer;
-#line 20236 "Dialogs.c"
-}
-
-
-void value_set_preferences_dialog (GValue* value, gpointer v_object) {
-	PreferencesDialog * old;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_ref (value->data[0].v_pointer);
-#line 20256 "Dialogs.c"
-	} else {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 20260 "Dialogs.c"
-	}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_unref (old);
-#line 20266 "Dialogs.c"
-	}
-}
-
-
-void value_take_preferences_dialog (GValue* value, gpointer v_object) {
-	PreferencesDialog * old;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	old = value->data[0].v_pointer;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (v_object) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = v_object;
-#line 20285 "Dialogs.c"
-	} else {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		value->data[0].v_pointer = NULL;
-#line 20289 "Dialogs.c"
-	}
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (old) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		preferences_dialog_unref (old);
-#line 20295 "Dialogs.c"
-	}
-}
-
-
-static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 20307 "Dialogs.c"
-}
-
-
-static void preferences_dialog_instance_init (PreferencesDialog * self) {
-	GeeArrayList* _tmp0_;
-	GDateTime* _tmp1_;
-	PluginsManifestWidgetMediator* _tmp2_;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->allow_closing = FALSE;
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->lib_dir = NULL;
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, (GDestroyNotify) preferences_dialog_path_format_unref, NULL, NULL, NULL);
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->path_formats = _tmp0_;
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->example_date = _tmp1_;
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = plugins_manifest_widget_mediator_new ();
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->plugins_mediator = _tmp2_;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->ref_count = 1;
-#line 20335 "Dialogs.c"
-}
-
-
-static void preferences_dialog_finalize (PreferencesDialog * obj) {
-	PreferencesDialog * self;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_destroy (self);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->library_dir_button);
-#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (self->priv->lib_dir);
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->path_formats);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_date_time_unref0 (self->priv->example_date);
-#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->lowercase);
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 20381 "Dialogs.c"
-}
-
-
-GType preferences_dialog_get_type (void) {
-	static volatile gsize preferences_dialog_type_id__volatile = 0;
-	if (g_once_init_enter (&preferences_dialog_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_preferences_dialog_init, value_preferences_dialog_free_value, value_preferences_dialog_copy_value, value_preferences_dialog_peek_pointer, "p", value_preferences_dialog_collect_value, "p", value_preferences_dialog_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialog), 0, (GInstanceInitFunc) preferences_dialog_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
-		GType preferences_dialog_type_id;
-		preferences_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PreferencesDialog", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&preferences_dialog_type_id__volatile, preferences_dialog_type_id);
-	}
-	return preferences_dialog_type_id__volatile;
-}
-
-
-gpointer preferences_dialog_ref (gpointer instance) {
-	PreferencesDialog * self;
-	self = instance;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	return instance;
-#line 20406 "Dialogs.c"
-}
-
-
-void preferences_dialog_unref (gpointer instance) {
-	PreferencesDialog * self;
-	self = instance;
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
-#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 20419 "Dialogs.c"
-	}
-}
-
-
 GtkResponseType copy_files_dialog (void) {
 	GtkResponseType result = 0;
 	gchar* msg = NULL;
@@ -20448,46 +8537,46 @@ GtkResponseType copy_files_dialog (void) {
 	GtkMessageDialog* _tmp4_;
 	GtkResponseType _result_ = 0;
 	gint _tmp5_;
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_strdup (_ ("Shotwell can copy the photos into your library folder or it can import" \
 " them without copying."));
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp0_;
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp4_;
-#line 2697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("Co_py Photos"), (gint) GTK_RESPONSE_ACCEPT);
-#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _ ("_Import in Place"), (gint) GTK_RESPONSE_REJECT);
-#line 2699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _ ("Import to Library"));
-#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 2701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp5_;
-#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20473 "Dialogs.c"
+#line 8565 "Dialogs.c"
 }
 
 
@@ -20497,38 +8586,38 @@ void remove_photos_from_library (GeeCollection* photos) {
 	gint _tmp2_;
 	gint _tmp3_;
 	GeeCollection* _tmp4_;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = photos;
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_collection_get_size (_tmp1_);
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _ ("Removing Photo From Library");
-#line 20495 "Dialogs.c"
+#line 8587 "Dialogs.c"
 	} else {
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _ ("Removing Photos From Library");
-#line 20499 "Dialogs.c"
+#line 8591 "Dialogs.c"
 	}
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = photos;
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp4_, _ ("Remove From Library"), _tmp0_);
-#line 20505 "Dialogs.c"
+#line 8597 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20514 "Dialogs.c"
+#line 8606 "Dialogs.c"
 }
 
 
@@ -20599,71 +8688,71 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	ProgressDialog* _tmp117_;
 	AppWindow* _tmp119_;
 	AppWindow* _tmp120_;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (dialog_title != NULL);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (progress_dialog_text != NULL);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = sources;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 932 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 20601 "Dialogs.c"
+#line 8693 "Dialogs.c"
 	}
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = sources;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = videos;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	user_message = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = photos;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 20629 "Dialogs.c"
+#line 8721 "Dialogs.c"
 		GeeArrayList* _tmp12_;
 		gboolean _tmp13_;
 		gboolean _tmp14_;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp13_;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 20641 "Dialogs.c"
+#line 8733 "Dialogs.c"
 	} else {
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 20645 "Dialogs.c"
+#line 8737 "Dialogs.c"
 	}
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 939 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 20649 "Dialogs.c"
+#line 8741 "Dialogs.c"
 		GeeCollection* _tmp15_;
 		gint _tmp16_;
 		gint _tmp17_;
@@ -20671,19 +8760,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		gint _tmp19_;
 		gint _tmp20_;
 		gchar* _tmp21_;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (_tmp15_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = sources;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = _tmp19_;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = g_strdup_printf (ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
 " also like to move the file to your desktop trash?\n" \
 "\n" \
@@ -20691,24 +8780,24 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "u also like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp17_), _tmp20_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp21_;
-#line 20675 "Dialogs.c"
+#line 8767 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp22_;
 		gboolean _tmp23_;
 		gboolean _tmp24_;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = videos;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp24_) {
-#line 20688 "Dialogs.c"
+#line 8780 "Dialogs.c"
 			GeeCollection* _tmp25_;
 			gint _tmp26_;
 			gint _tmp27_;
@@ -20716,19 +8805,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp29_;
 			gint _tmp30_;
 			gchar* _tmp31_;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = sources;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _tmp26_;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = sources;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = gee_collection_get_size (_tmp28_);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = _tmp29_;
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strdup_printf (ngettext ("This will remove the video from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -20736,11 +8825,11 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp27_), _tmp30_);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp31_;
-#line 20714 "Dialogs.c"
+#line 8806 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp32_;
 			gint _tmp33_;
@@ -20749,19 +8838,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp36_;
 			gint _tmp37_;
 			gchar* _tmp38_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp32_ = sources;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp33_ = gee_collection_get_size (_tmp32_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp34_ = _tmp33_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = sources;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp36_ = gee_collection_get_size (_tmp35_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp37_ = _tmp36_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp38_ = g_strdup_printf (ngettext ("This will remove the photo from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -20769,200 +8858,200 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp34_), _tmp37_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp38_;
-#line 20741 "Dialogs.c"
+#line 8833 "Dialogs.c"
 		}
 	}
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = app_window_get_instance ();
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = _tmp39_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = dialog_title;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = user_message;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = sources;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = gee_collection_get_size (_tmp43_);
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = _tmp44_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_window_get_type (), GtkWindow), _tmp41_, _tmp42_, _tmp45_);
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp40_);
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp47_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = _result_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp49_ != GTK_RESPONSE_YES) {
-#line 20770 "Dialogs.c"
+#line 8862 "Dialogs.c"
 		GtkResponseType _tmp50_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = _result_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = _tmp50_ != GTK_RESPONSE_NO;
-#line 20776 "Dialogs.c"
+#line 8868 "Dialogs.c"
 	} else {
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = FALSE;
-#line 20780 "Dialogs.c"
+#line 8872 "Dialogs.c"
 	}
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 955 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp48_) {
-#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (videos);
-#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (photos);
-#line 2740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 956 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 20792 "Dialogs.c"
+#line 8884 "Dialogs.c"
 	}
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _result_;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	delete_backing = _tmp51_ == GTK_RESPONSE_YES;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = app_window_get_instance ();
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = _tmp52_;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp53_);
-#line 2746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = sources;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = gee_collection_get_size (_tmp54_);
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = _tmp55_;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp56_ >= 20) {
-#line 20822 "Dialogs.c"
+#line 8914 "Dialogs.c"
 		AppWindow* _tmp57_;
 		AppWindow* _tmp58_;
 		const gchar* _tmp59_;
 		ProgressDialog* _tmp60_;
 		ProgressDialog* _tmp61_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = app_window_get_instance ();
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = _tmp57_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = progress_dialog_text;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp59_, NULL);
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp60_);
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress = _tmp60_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp58_);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = progress;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = NULL;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = NULL;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = NULL;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = g_object_ref (_tmp61_);
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 20860 "Dialogs.c"
+#line 8952 "Dialogs.c"
 	}
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_photos = _tmp62_;
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_videos = _tmp63_;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = library_photo_global;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = photos;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = delete_backing;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = monitor;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67__target = monitor_target;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = not_removed_photos;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection), _tmp66_, _tmp67_, _tmp67__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_LIST, GeeList));
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = video_global;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = videos;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = delete_backing;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = monitor;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72__target = monitor_target;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = not_removed_videos;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_, _tmp72_, _tmp72__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_LIST, GeeList));
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = not_removed_photos;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _tmp75_;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = not_removed_videos;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	num_not_removed = _tmp76_ + _tmp79_;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = delete_backing;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp81_) {
-#line 20916 "Dialogs.c"
+#line 9008 "Dialogs.c"
 		gint _tmp82_;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp82_ = num_not_removed;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = _tmp82_ > 0;
-#line 20922 "Dialogs.c"
+#line 9014 "Dialogs.c"
 	} else {
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = FALSE;
-#line 20926 "Dialogs.c"
+#line 9018 "Dialogs.c"
 	}
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp80_) {
-#line 20930 "Dialogs.c"
+#line 9022 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp83_;
 		gint _tmp84_;
@@ -20975,37 +9064,37 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		GtkResponseType _tmp90_;
 		GtkResponseType _tmp91_;
 		GtkResponseType _tmp92_;
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = num_not_removed;
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = num_not_removed;
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = g_strdup_printf (ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
 "file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
 "iles?", (gulong) _tmp83_), _tmp84_);
-#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		not_deleted_message = _tmp85_;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = app_window_get_instance ();
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = _tmp86_;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = dialog_title;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = not_deleted_message;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_window_get_type (), GtkWindow), _tmp88_, _tmp89_);
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = _tmp90_;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp87_);
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result_delete = _tmp91_;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = result_delete;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp92_) {
-#line 20971 "Dialogs.c"
+#line 9063 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp93_;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21028,57 +9117,57 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp107_;
 			gint _tmp108_;
 			gint _tmp109_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp93_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_photos = _tmp93_;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 989 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 989 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_videos = _tmp94_;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp95_ = library_photo_global;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp96_ = not_removed_photos;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97_ = monitor;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97__target = monitor_target;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp98_ = not_deleted_photos;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_COLLECTION, GeeCollection), _tmp97_, _tmp97__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_LIST, GeeList));
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = video_global;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = not_removed_videos;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101_ = monitor;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101__target = monitor_target;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp102_ = not_deleted_videos;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp103_ = not_deleted_photos;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp104_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105_ = _tmp104_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp106_ = not_deleted_videos;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp108_ = _tmp107_;
-#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			num_not_deleted = _tmp105_ + _tmp108_;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = num_not_deleted;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp109_ > 0) {
-#line 21044 "Dialogs.c"
+#line 9136 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp110_;
 				gint _tmp111_;
@@ -21087,81 +9176,81 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				const gchar* _tmp114_;
 				AppWindow* _tmp115_;
 				AppWindow* _tmp116_;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp110_ = num_not_deleted;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp111_ = num_not_deleted;
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp112_ = g_strdup_printf (ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp110_), _tmp111_);
-#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				delete_failed_message = _tmp112_;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp113_ = dialog_title;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = delete_failed_message;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = app_window_get_instance ();
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = _tmp115_;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				app_window_error_message_with_title (_tmp113_, _tmp114_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp116_);
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21075 "Dialogs.c"
+#line 9167 "Dialogs.c"
 			}
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21081 "Dialogs.c"
+#line 9173 "Dialogs.c"
 		}
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21085 "Dialogs.c"
+#line 9177 "Dialogs.c"
 	}
-#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp117_ = progress;
-#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp117_ != NULL) {
-#line 21091 "Dialogs.c"
+#line 9183 "Dialogs.c"
 		ProgressDialog* _tmp118_;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp118_ = progress;
-#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp118_);
-#line 21097 "Dialogs.c"
+#line 9189 "Dialogs.c"
 	}
-#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = app_window_get_instance ();
-#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = _tmp119_;
-#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp120_);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_photos);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (progress);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (user_message);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (videos);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21127 "Dialogs.c"
+#line 9219 "Dialogs.c"
 }
 
 
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index d2f2cb0..2ca2678 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -134,345 +134,6 @@ public Gtk.ResponseType export_error_dialog(File dest, bool photos_remaining) {
 }
 
 
-public class ExportDialog : Gtk.Dialog {
-    public const int DEFAULT_SCALE = 1200;
-
-    // "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."
-    public const int NUM_SPECIAL_FORMATS = 2;
-    public const string UNMODIFIED_FORMAT_LABEL = _("Unmodified");
-    public const string CURRENT_FORMAT_LABEL = _("Current");
-    
-    public const ScaleConstraint[] CONSTRAINT_ARRAY = { ScaleConstraint.ORIGINAL,
-        ScaleConstraint.DIMENSIONS, ScaleConstraint.WIDTH, ScaleConstraint.HEIGHT };
-    
-    public const Jpeg.Quality[] QUALITY_ARRAY = { Jpeg.Quality.LOW, Jpeg.Quality.MEDIUM, 
-        Jpeg.Quality.HIGH, Jpeg.Quality.MAXIMUM };
-
-    private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
-    private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
-    private static int current_scale = DEFAULT_SCALE;
-    
-    private Gtk.Grid table = new Gtk.Grid();
-    private Gtk.ComboBoxText quality_combo;
-    private Gtk.ComboBoxText constraint_combo;
-    private Gtk.ComboBoxText format_combo;
-    private Gtk.Switch export_metadata;
-    private Gee.ArrayList<string> format_options = new Gee.ArrayList<string>();
-    private Gtk.Entry pixels_entry;
-    private Gtk.Widget ok_button;
-    private bool in_insert = false;
-    
-    public ExportDialog(string title) {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
-        
-        this.title = title;
-        resizable = false;
-
-        //get information about the export settings out of our config backend
-        Config.Facade config = Config.Facade.get_instance();
-        current_parameters.mode = config.get_export_export_format_mode(); //ExportFormatMode
-        current_parameters.specified_format = config.get_export_photo_file_format(); //PhotoFileFormat
-        current_parameters.quality = config.get_export_quality(); //quality
-        current_parameters.export_metadata = config.get_export_export_metadata(); //export metadata
-        current_constraint = config.get_export_constraint(); //constraint
-        current_scale = config.get_export_scale(); //scale
-
-        quality_combo = new Gtk.ComboBoxText();
-        int ctr = 0;
-        foreach (Jpeg.Quality quality in QUALITY_ARRAY) {
-            quality_combo.append_text(quality.to_string());
-            if (quality == current_parameters.quality)
-                quality_combo.set_active(ctr);
-            ctr++;
-        }
-        
-        constraint_combo = new Gtk.ComboBoxText();
-        ctr = 0;
-        foreach (ScaleConstraint constraint in CONSTRAINT_ARRAY) {
-            constraint_combo.append_text(constraint.to_string());
-            if (constraint == current_constraint)
-                constraint_combo.set_active(ctr);
-            ctr++;
-        }
-
-        format_combo = new Gtk.ComboBoxText();
-        format_add_option(UNMODIFIED_FORMAT_LABEL);
-        format_add_option(CURRENT_FORMAT_LABEL);
-        foreach (PhotoFileFormat format in PhotoFileFormat.get_writeable()) {
-            format_add_option(format.get_properties().get_user_visible_name());
-        }
-
-        pixels_entry = new Gtk.Entry();
-        pixels_entry.set_max_length(6);
-        pixels_entry.set_text("%d".printf(current_scale));
-        
-        // register after preparation to avoid signals during init
-        constraint_combo.changed.connect(on_constraint_changed);
-        format_combo.changed.connect(on_format_changed);
-        pixels_entry.changed.connect(on_pixels_changed);
-        pixels_entry.insert_text.connect(on_pixels_insert_text);
-        pixels_entry.activate.connect(on_activate);
-
-        // layout controls
-        add_label(_("_Format:"), 0, 0, format_combo);
-        add_control(format_combo, 1, 0);
-
-        add_label(_("_Quality:"), 0, 1, quality_combo);
-        add_control(quality_combo, 1, 1);
-        
-        add_label(_("_Scaling constraint:"), 0, 2, constraint_combo);
-        add_control(constraint_combo, 1, 2);
-
-        add_label(_("_Pixels:"), 0, 3, pixels_entry);
-        add_control(pixels_entry, 1, 3);
-        
-        export_metadata = new Gtk.Switch ();
-        add_label(_("Export _metadata:"), 0, 4, export_metadata);
-        add_control(export_metadata, 1, 4);
-        export_metadata.active = true;
-        export_metadata.halign = Gtk.Align.START;
-        
-        table.set_row_spacing(6);
-        table.set_column_spacing(12);
-        table.set_border_width(18);
-        
-        ((Gtk.Box) get_content_area()).add(table);
-        
-        // add buttons to action area
-        add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
-        ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
-        set_default_response(Gtk.ResponseType.OK);
-        
-        ok_button.set_can_default(true);
-        ok_button.has_default = true;
-        set_default(ok_button);
-
-        if (current_constraint == ScaleConstraint.ORIGINAL) {
-            pixels_entry.sensitive = false;
-            quality_combo.sensitive = false;
-        }
-
-        ok_button.grab_focus();
-    }
-    
-    private void format_add_option(string format_name) {
-        format_options.add(format_name);
-        format_combo.append_text(format_name);
-    }
-    
-    private void format_set_active_text(string text) {
-        int selection_ticker = 0;
-
-        foreach (string current_text in format_options) {
-            if (current_text == text) {
-                format_combo.set_active(selection_ticker);
-                return;
-            }
-            selection_ticker++;
-        }
-        
-        error("format_set_active_text: text '%s' isn't in combo box", text);
-    }
-    
-    private PhotoFileFormat get_specified_format() {
-        int index = format_combo.get_active();
-        if (index < NUM_SPECIAL_FORMATS)
-            index = NUM_SPECIAL_FORMATS;
-
-        index -= NUM_SPECIAL_FORMATS;
-        PhotoFileFormat[] writeable_formats = PhotoFileFormat.get_writeable();
-        return writeable_formats[index];
-    }
-    
-    private string get_label_for_parameters(ExportFormatParameters params) {
-        switch(params.mode) {
-            case ExportFormatMode.UNMODIFIED:
-                return UNMODIFIED_FORMAT_LABEL;
-            
-            case ExportFormatMode.CURRENT:
-                return CURRENT_FORMAT_LABEL;
-            
-            case ExportFormatMode.SPECIFIED:
-                return params.specified_format.get_properties().get_user_visible_name();            
-            
-            default:
-                error("get_label_for_parameters: unrecognized export format mode");
-        }
-    }
-    
-    // unlike other parameters, which should be persisted across dialog executions, the
-    // format parameters must be set each time the dialog is executed -- this is why
-    // it's passed qualified as ref and not as out
-    public bool execute(out int scale, out ScaleConstraint constraint,
-        ref ExportFormatParameters parameters) {
-        show_all();
-
-        // if the export format mode isn't set to last (i.e., don't use the persisted settings),
-        // reset the scale constraint to original size
-        if (parameters.mode != ExportFormatMode.LAST) {
-            current_constraint = constraint = ScaleConstraint.ORIGINAL;
-            constraint_combo.set_active(0);
-        }
-
-        if (parameters.mode == ExportFormatMode.LAST)
-            parameters = current_parameters;
-        else if (parameters.mode == ExportFormatMode.SPECIFIED && !parameters.specified_format.can_write())
-            parameters.specified_format = PhotoFileFormat.get_system_default_format();
-
-        format_set_active_text(get_label_for_parameters(parameters));
-        on_format_changed();
-        
-        bool ok = (run() == Gtk.ResponseType.OK);
-        if (ok) {
-            int index = constraint_combo.get_active();
-            assert(index >= 0);
-            constraint = CONSTRAINT_ARRAY[index];
-            current_constraint = constraint;
-            
-            scale = int.parse(pixels_entry.get_text());
-            if (constraint != ScaleConstraint.ORIGINAL)
-                assert(scale > 0);
-            current_scale = scale;
-            
-            parameters.export_metadata = export_metadata.sensitive ? export_metadata.active : false;
-            
-            if (format_combo.get_active_text() == UNMODIFIED_FORMAT_LABEL) {
-                parameters.mode = current_parameters.mode = ExportFormatMode.UNMODIFIED;
-            } else if (format_combo.get_active_text() == CURRENT_FORMAT_LABEL) {
-                parameters.mode = current_parameters.mode = ExportFormatMode.CURRENT;
-            } else {
-                parameters.mode = current_parameters.mode = ExportFormatMode.SPECIFIED;
-                parameters.specified_format = current_parameters.specified_format = get_specified_format();
-                if (current_parameters.specified_format == PhotoFileFormat.JFIF)
-                    parameters.quality = current_parameters.quality = QUALITY_ARRAY[quality_combo.get_active()];
-            }
-
-            //save current settings in config backend for reusing later
-            Config.Facade config = Config.Facade.get_instance();
-            config.set_export_export_format_mode(current_parameters.mode); //ExportFormatMode
-            config.set_export_photo_file_format(current_parameters.specified_format); //PhotoFileFormat
-            config.set_export_quality(current_parameters.quality); //quality
-            config.set_export_export_metadata(current_parameters.export_metadata); //export metadata
-            config.set_export_constraint(current_constraint); //constraint
-            config.set_export_scale(current_scale); //scale
-        } else {
-            scale = 0;
-            constraint = ScaleConstraint.ORIGINAL;
-        }
-        
-        destroy();
-        
-        return ok;
-    }
-    
-    private void add_label(string text, int x, int y, Gtk.Widget? widget = null) {
-        Gtk.Label new_label = new Gtk.Label.with_mnemonic(text);
-        new_label.halign = Gtk.Align.END;
-        new_label.valign = Gtk.Align.CENTER;
-        new_label.set_use_underline(true);
-        
-        if (widget != null)
-            new_label.set_mnemonic_widget(widget);
-        
-        table.attach(new_label, x, y, 1, 1);
-    }
-    
-    private void add_control(Gtk.Widget widget, int x, int y) {
-        widget.halign = Gtk.Align.FILL;
-        widget.valign = Gtk.Align.CENTER;
-        widget.hexpand = true;
-        widget.vexpand = true;
-        
-        table.attach(widget, x, y, 1, 1);
-    }
-    
-    private void on_constraint_changed() {
-        bool original = CONSTRAINT_ARRAY[constraint_combo.get_active()] == ScaleConstraint.ORIGINAL;
-        bool jpeg = format_combo.get_active_text() ==
-            PhotoFileFormat.JFIF.get_properties().get_user_visible_name();
-        pixels_entry.sensitive = !original;
-        quality_combo.sensitive = !original && jpeg;
-        if (original)
-            ok_button.sensitive = true;
-        else
-            on_pixels_changed();
-    }
-
-    private void on_format_changed() {
-        bool original = CONSTRAINT_ARRAY[constraint_combo.get_active()] == ScaleConstraint.ORIGINAL;
-        
-        if (format_combo.get_active_text() == UNMODIFIED_FORMAT_LABEL) {
-            // if the user wishes to export the media unmodified, then we just copy the original
-            // files, so parameterizing size, quality, etc. is impossible -- these are all
-            // just as they are in the original file. In this case, we set the scale constraint to
-            // original and lock out all the controls
-            constraint_combo.set_active(0); /* 0 == original size */
-            constraint_combo.set_sensitive(false);
-            quality_combo.set_sensitive(false);
-            pixels_entry.sensitive = false;
-            export_metadata.active = false;
-            export_metadata.sensitive = false;
-        } else if (format_combo.get_active_text() == CURRENT_FORMAT_LABEL) {
-            // if the user wishes to export the media in its current format, we allow sizing but
-            // not JPEG quality customization, because in a batch of many photos, it's not
-            // guaranteed that all of them will be JPEGs or RAWs that get converted to JPEGs. Some
-            // could be PNGs, and PNG has no notion of quality. So lock out the quality control.
-            // If the user wants to set JPEG quality, he or she can explicitly specify the JPEG
-            // format.
-            constraint_combo.set_sensitive(true);
-            quality_combo.set_sensitive(false);
-            pixels_entry.sensitive = !original;
-            export_metadata.sensitive = true;
-        } else {
-            // if the user has chosen a specific format, then allow JPEG quality customization if
-            // the format is JPEG and the user is re-sizing the image, otherwise, disallow JPEG
-            // quality customization; always allow scaling.
-            constraint_combo.set_sensitive(true);
-            bool jpeg = get_specified_format() == PhotoFileFormat.JFIF;
-            quality_combo.sensitive = !original && jpeg;
-            export_metadata.sensitive = true;
-        }
-    }
-    
-    private void on_activate() {
-        response(Gtk.ResponseType.OK);
-    }
-    
-    private void on_pixels_changed() {
-        ok_button.sensitive = (pixels_entry.get_text_length() > 0) && (int.parse(pixels_entry.get_text()) > 0);
-    }
-    
-    private void on_pixels_insert_text(string text, int length, ref int position) {
-        // This is necessary because SignalHandler.block_by_func() is not properly bound
-        if (in_insert)
-            return;
-        
-        in_insert = true;
-        
-        if (length == -1)
-            length = (int) text.length;
-        
-        // only permit numeric text
-        string new_text = "";
-        for (int ctr = 0; ctr < length; ctr++) {
-            if (text[ctr].isdigit()) {
-                new_text += ((char) text[ctr]).to_string();
-            }
-        }
-        
-        if (new_text.length > 0)
-            pixels_entry.insert_text(new_text, (int) new_text.length, ref position);
-        
-        Signal.stop_emission_by_name(pixels_entry, "insert-text");
-        
-        in_insert = false;
-    }
-}
-
 namespace ImportUI {
 private const int REPORT_FAILURE_COUNT = 4;
 internal const string SAVE_RESULTS_BUTTON_NAME = _("Save Details…");
@@ -939,10 +600,7 @@ public abstract class TextEntryDialogMediator {
     
     public TextEntryDialogMediator(string title, string label, string? initial_text = null,
         Gee.Collection<string>? completion_list = null, string? completion_delimiter = null) {
-        Gtk.Builder builder = AppWindow.create_builder();
         dialog = new TextEntryDialog();
-        dialog.get_content_area().add((Gtk.Box) builder.get_object("dialog-vbox2"));
-        dialog.set_builder(builder);
         dialog.setup(on_modify_validate, title, label, initial_text, completion_list, completion_delimiter);
     }
     
@@ -959,10 +617,7 @@ public abstract class MultiTextEntryDialogMediator {
     private MultiTextEntryDialog dialog;
     
     public MultiTextEntryDialogMediator(string title, string label, string? initial_text = null) {
-        Gtk.Builder builder = AppWindow.create_builder();
         dialog = new MultiTextEntryDialog();
-        dialog.get_content_area().add((Gtk.Box) builder.get_object("dialog-vbox4"));
-        dialog.set_builder(builder);
         dialog.setup(on_modify_validate, title, label, initial_text);
     }
     
@@ -989,328 +644,6 @@ public string build_alert_body_text(string? primary_text, string? secondary_text
         guarded_markup_escape_text(primary_text), secondary_text);
 }
 
-// Entry completion for values separated by separators (e.g. comma in the case of tags)
-// Partly inspired by the class of the same name in gtkmm-utils by Marko Anastasov
-public class EntryMultiCompletion : Gtk.EntryCompletion {
-    private string delimiter;
-    
-    public EntryMultiCompletion(Gee.Collection<string> completion_list, string? delimiter) {
-        assert(delimiter == null || delimiter.length == 1);
-        this.delimiter = delimiter;
-        
-        set_model(create_completion_store(completion_list));
-        set_text_column(0);
-        set_match_func(match_func);
-    }
-    
-    private static Gtk.ListStore create_completion_store(Gee.Collection<string> completion_list) {
-        Gtk.ListStore completion_store = new Gtk.ListStore(1, typeof(string));
-        Gtk.TreeIter store_iter;
-        Gee.Iterator<string> completion_iter = completion_list.iterator();
-        while (completion_iter.next()) {
-            completion_store.append(out store_iter);
-            completion_store.set(store_iter, 0, completion_iter.get(), -1);
-        }
-        
-        return completion_store;
-    }
-    
-    private bool match_func(Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter) {
-        Gtk.TreeModel model = completion.get_model();
-        string possible_match;
-        model.get(iter, 0, out possible_match);
-        
-        // Normalize key and possible matches to allow comparison of non-ASCII characters.
-        // Use a "COMPOSE" normalization to allow comparison to the position value returned by 
-        // Gtk.Entry, i.e. one character=one position. Using the default normalization a character
-        // like "é" or "ö" would have a length of two.
-        possible_match = possible_match.casefold().normalize(-1, NormalizeMode.ALL_COMPOSE);
-        string normed_key = key.normalize(-1, NormalizeMode.ALL_COMPOSE);
-        
-        if (delimiter == null) {
-            return possible_match.has_prefix(normed_key.strip());
-        } else {
-            if (normed_key.contains(delimiter)) {
-                // check whether cursor is before last delimiter
-                int offset = normed_key.char_count(normed_key.last_index_of_char(delimiter[0]));
-                int position = ((Gtk.Entry) get_entry()).get_position();
-                if (position <= offset)
-                    return false; // TODO: Autocompletion for tags not last in list
-            }
-            
-            string last_part = get_last_part(normed_key.strip(), delimiter);
-            
-            if (last_part.length == 0) 
-                return false; // need at least one character to show matches
-                
-            return possible_match.has_prefix(last_part.strip());
-        }
-    }
-
-    public override bool match_selected(Gtk.TreeModel model, Gtk.TreeIter iter) {
-        string match;
-        model.get(iter, 0, out match);
-        
-        Gtk.Entry entry = (Gtk.Entry)get_entry();
-        
-        string old_text = entry.get_text().normalize(-1, NormalizeMode.ALL_COMPOSE);
-        if (old_text.length > 0) {
-            if (old_text.contains(delimiter)) {
-                old_text = old_text.substring(0, old_text.last_index_of_char(delimiter[0]) + 1) + (delimiter != " " ? " " : "");
-            } else
-                old_text = "";
-        }
-        
-        string new_text = old_text + match + delimiter + (delimiter != " " ? " " : "");
-        entry.set_text(new_text);
-        entry.set_position((int) new_text.length);
-        
-        return true;
-    }
-    
-    // Find last string after any delimiter
-    private static string get_last_part(string s, string delimiter) {
-        string[] split = s.split(delimiter);
-        
-        if((split != null) && (split[0] != null)) {
-            return split[split.length - 1];
-        } else {
-            return "";
-        }
-    }
-}
-
-[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_dialog.ui")]
-public class SetBackgroundPhotoDialog : Gtk.Dialog {
-    [GtkChild]
-    private Gtk.CheckButton desktop_background_checkbox;
-    [GtkChild]
-    private Gtk.CheckButton screensaver_checkbox;
-
-    public SetBackgroundPhotoDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        this.set_transient_for (AppWindow.get_instance());
-    }
-
-    [GtkCallback]
-    private void on_checkbox_clicked() {
-        set_response_sensitive (Gtk.ResponseType.OK,
-                                desktop_background_checkbox.active ||
-                                screensaver_checkbox.active);
-    }
-
-    public bool execute(out bool desktop_background, out bool screensaver) {
-        this.show_all();
-        var result = this.run() == Gtk.ResponseType.OK;
-        this.hide ();
-
-        desktop_background = desktop_background_checkbox.active;
-        screensaver = screensaver_checkbox.active;
-
-        this.destroy();
-        return result;
-    }
-}
-
-[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui")]
-public class SetBackgroundSlideshowDialog : Gtk.Dialog {
-    [GtkChild]
-    private Gtk.CheckButton desktop_background_checkbox;
-    [GtkChild]
-    private Gtk.CheckButton screensaver_checkbox;
-    [GtkChild]
-    private Gtk.Scale delay_scale;
-    [GtkChild]
-    private Gtk.Label delay_value_label;
-
-    private int delay_value = 0;
-
-    public SetBackgroundSlideshowDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        this.set_transient_for (AppWindow.get_instance());
-    }
-
-    public override void constructed () {
-        on_delay_scale_value_changed ();
-    }
-
-    [GtkCallback]
-    private void on_checkbox_clicked() {
-        set_response_sensitive (Gtk.ResponseType.OK,
-                                desktop_background_checkbox.active ||
-                                screensaver_checkbox.active);
-    }
-
-    [GtkCallback]
-    private void on_delay_scale_value_changed() {
-        double value = delay_scale.adjustment.value;
-
-        // f(x)=x^5 allows to have fine-grained values (seconds) to the left
-        // and very coarse-grained values (hours) to the right of the slider.
-        // We limit maximum value to 1 day and minimum to 5 seconds.
-        delay_value = (int) (Math.pow(value, 5) / Math.pow(90, 5) * 60 * 60 * 24 + 5);
-
-        // convert to text and remove fractions from values > 1 minute
-        string text;
-        if (delay_value < 60) {
-            text = ngettext("%d second", "%d seconds", delay_value).printf(delay_value);
-        } else if (delay_value < 60 * 60) {
-            int minutes = delay_value / 60;
-            text = ngettext("%d minute", "%d minutes", minutes).printf(minutes);
-            delay_value = minutes * 60; 
-        } else if (delay_value < 60 * 60 * 24) {
-            int hours = delay_value / (60 * 60);
-            text = ngettext("%d hour", "%d hours", hours).printf(hours);
-            delay_value = hours * (60 * 60);
-        } else {
-            text = _("1 day");
-            delay_value = 60 * 60 * 24;
-        }
-
-        delay_value_label.label = text;
-    }
-
-    public bool execute(out int delay_value, out bool desktop_background, out bool screensaver) {
-        this.show_all();
-        var result = this.run() == Gtk.ResponseType.OK;
-        this.hide ();
-
-        delay_value = this.delay_value;
-        desktop_background = desktop_background_checkbox.active;
-        screensaver = screensaver_checkbox.active;
-
-        this.destroy();
-        return result;
-    }
-}
-
-
-public class TextEntryDialog : Gtk.Dialog {
-    public delegate bool OnModifyValidateType(string text);
-    
-    private unowned OnModifyValidateType on_modify_validate;
-    private Gtk.Entry entry;
-    private Gtk.Builder builder;
-    private Gtk.Button button1;
-    private Gtk.Button button2;
-    
-    public TextEntryDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
-    }
-    
-    public void set_builder(Gtk.Builder builder) {
-        this.builder = builder;
-    }
-    
-    public void setup(OnModifyValidateType? modify_validate, string title, string label, 
-        string? initial_text, Gee.Collection<string>? completion_list, string? completion_delimiter) {
-        set_title(title);
-        set_resizable(true);
-        set_parent_window(AppWindow.get_instance().get_parent_window());
-        set_transient_for(AppWindow.get_instance());
-        on_modify_validate = modify_validate;
-
-        Gtk.Label name_label = builder.get_object("label") as Gtk.Label;
-        name_label.set_text(label);
-
-        entry = builder.get_object("entry") as Gtk.Entry;
-        entry.set_text(initial_text != null ? initial_text : "");
-        entry.grab_focus();
-        entry.changed.connect(on_entry_changed);
-        
-        button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
-        button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
-        set_default_response(Gtk.ResponseType.OK);
-        
-        if (completion_list != null) { // Textfield with autocompletion
-            EntryMultiCompletion completion = new EntryMultiCompletion(completion_list,
-                completion_delimiter);
-            entry.set_completion(completion);
-        }
-        
-        set_default_response(Gtk.ResponseType.OK);
-    }
-
-    public string? execute() {
-        string? text = null;
-        
-        // validate entry to start with
-        set_response_sensitive(Gtk.ResponseType.OK, on_modify_validate(entry.get_text()));
-        
-        show_all();
-        
-        if (run() == Gtk.ResponseType.OK)
-            text = entry.get_text();
-        
-        entry.changed.disconnect(on_entry_changed);
-        destroy();
-        
-        return text;
-    }
-    
-    public void on_entry_changed() {
-        set_response_sensitive(Gtk.ResponseType.OK, on_modify_validate(entry.get_text()));
-    }
-}
-
-public class MultiTextEntryDialog : Gtk.Dialog {
-    public delegate bool OnModifyValidateType(string text);
-    
-    private unowned OnModifyValidateType on_modify_validate;
-    private Gtk.TextView entry;
-    private Gtk.Builder builder;
-    private Gtk.Button button1;
-    private Gtk.Button button2;
-    
-    public MultiTextEntryDialog() {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object (use_header_bar: use_header ? 1 : 0);
-    }
-    
-    public void set_builder(Gtk.Builder builder) {
-        this.builder = builder;
-    }
-    
-    public void setup(OnModifyValidateType? modify_validate, string title, string label, string? initial_text) {
-        set_title(title);
-        set_resizable(true);
-        set_default_size(500,300);
-        set_parent_window(AppWindow.get_instance().get_parent_window());
-        set_transient_for(AppWindow.get_instance());
-        on_modify_validate = modify_validate;
-        
-        entry = builder.get_object("textview1") as Gtk.TextView;
-        entry.set_wrap_mode (Gtk.WrapMode.WORD);
-        entry.buffer = new Gtk.TextBuffer(null);
-        entry.buffer.text = (initial_text != null ? initial_text : "");
-        
-        entry.grab_focus();
-        
-        button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
-        button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
-        set_default_response(Gtk.ResponseType.OK);
-    }
-        
-    public string? execute() {
-        string? text = null;
-        
-        show_all();
-        
-        if (run() == Gtk.ResponseType.OK)
-            text = entry.buffer.text;
-        
-        destroy();
-        
-        return text;
-    }
-}
 
 public class EventRenameDialog : TextEntryDialogMediator {
     public EventRenameDialog(string? event_name) {
@@ -1451,499 +784,6 @@ public bool remove_offline_dialog(Gtk.Window owner, int count) {
     return result == Gtk.ResponseType.OK;
 }
 
-public class ProgressDialog : Gtk.Window {
-    private Gtk.ProgressBar progress_bar = new Gtk.ProgressBar();
-    private Gtk.Button cancel_button = null;
-    private Cancellable cancellable;
-    private uint64 last_count = uint64.MAX;
-    private int update_every = 1;
-    private int minimum_on_screen_time_msec = 500;
-    private ulong time_started;
-#if UNITY_SUPPORT
-    UnityProgressBar uniprobar = UnityProgressBar.get_instance();
-#endif
-    
-    public ProgressDialog(Gtk.Window? owner, string text, Cancellable? cancellable = null) {
-        this.cancellable = cancellable;
-        
-        set_title(text);
-        set_resizable(false);
-        if (owner != null)
-            set_transient_for(owner);
-        set_modal(true);
-        set_type_hint(Gdk.WindowTypeHint.DIALOG);
-        
-        progress_bar.set_size_request(300, -1);
-        progress_bar.set_show_text(true);
-        
-        Gtk.Box vbox_bar = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        vbox_bar.pack_start(progress_bar, true, false, 0);
-        
-        if (cancellable != null) {
-            cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
-            cancel_button.clicked.connect(on_cancel);
-            delete_event.connect(on_window_closed);
-        }
-        
-        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
-        hbox.pack_start(vbox_bar, true, false, 0);
-        if (cancel_button != null)
-            hbox.pack_end(cancel_button, false, false, 0);
-        
-        Gtk.Label primary_text_label = new Gtk.Label("");
-        primary_text_label.set_markup("<span weight=\"bold\">%s</span>".printf(text));
-        primary_text_label.xalign = 0.0f;
-        primary_text_label.yalign = 0.5f;
-
-        Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 12);
-        vbox.pack_start(primary_text_label, false, false, 0);
-        vbox.pack_start(hbox, true, false, 0);
-        vbox.halign = Gtk.Align.CENTER;
-        vbox.valign = Gtk.Align.CENTER;
-        vbox.hexpand = true;
-        vbox.vexpand = true;
-        vbox.margin_start = 12;
-        vbox.margin_end = 12;
-        vbox.margin_top = 12;
-        vbox.margin_bottom = 12;
-
-        add(vbox);
-
-        time_started = now_ms();
-    }
-    
-    public override void realize() {
-        base.realize();
-        
-        // if unable to cancel the progress bar, remove the close button
-        if (cancellable == null)
-            get_window().set_functions(Gdk.WMFunction.MOVE);
-    }
-    
-    public void update_display_every(int update_every) {
-        assert(update_every >= 1);
-        
-        this.update_every = update_every;
-    }
-    
-    public void set_minimum_on_screen_time_msec(int minimum_on_screen_time_msec) {
-        this.minimum_on_screen_time_msec = minimum_on_screen_time_msec;
-    }
-    
-    public void set_fraction(int current, int total) {
-        set_percentage((double) current / (double) total);
-    }
-    
-    public void set_percentage(double pct) {
-        pct = pct.clamp(0.0, 1.0);
-        
-        maybe_show_all(pct);
-        
-        progress_bar.set_fraction(pct);
-        progress_bar.set_text(_("%d%%").printf((int) (pct * 100.0)));
-        
-#if UNITY_SUPPORT
-        //UnityProgressBar: set progress
-        uniprobar.set_progress(pct);
-#endif
-    }
-    
-    public void set_status(string text) {
-        progress_bar.set_text(text);
-        
-#if UNITY_SUPPORT
-        //UnityProgressBar: try to draw progress bar
-        uniprobar.set_visible(true);
-#endif
-        show_all();
-    }
-    
-    // This can be used as a ProgressMonitor delegate.
-    public bool monitor(uint64 count, uint64 total, bool do_event_loop = true) {
-        if ((last_count == uint64.MAX) || (count - last_count) >= update_every) {
-            set_percentage((double) count / (double) total);
-            last_count = count;
-        }
-        
-        bool keep_going = (cancellable != null) ? !cancellable.is_cancelled() : true;
-        
-        // TODO: get rid of this.  non-trivial, as some progress-monitor operations are blocking
-        // and need to allow the event loop to spin
-        //
-        // Important: Since it's possible the progress dialog might be destroyed inside this call,
-        // avoid referring to "this" afterwards at all costs (in case all refs have been dropped)
-        
-        if (do_event_loop)
-            spin_event_loop();
-        
-        return keep_going;
-    }
-    
-    public new void close() {
-#if UNITY_SUPPORT
-        //UnityProgressBar: reset
-        uniprobar.reset();
-#endif
-        hide();
-        destroy();
-    }
-    
-    private bool on_window_closed() {
-        on_cancel();
-        return false; // return false so that the system handler will remove the window from
-                      // the screen
-    }
-    
-    private void on_cancel() {
-        if (cancellable != null)
-            cancellable.cancel();
-        
-        cancel_button.sensitive = false;
-    }
-    
-    private void maybe_show_all(double pct) {
-        // Appear only after a while because some jobs may take only a 
-        // fraction of second to complete so there's no point in showing progress.
-        if (!this.visible && now_ms() - time_started > minimum_on_screen_time_msec) {
-            // calculate percents completed in one ms
-            double pps = pct * 100.0 / minimum_on_screen_time_msec;
-            // calculate [very rough] estimate of time to complete in ms
-            double ttc = 100.0 / pps;
-            // If there is still more work to do for at least MINIMUM_ON_SCREEN_TIME_MSEC, 
-            // finally display the dialog.
-            if (ttc > minimum_on_screen_time_msec) {
-#if UNITY_SUPPORT
-                //UnityProgressBar: try to draw progress bar
-                uniprobar.set_visible(true);
-#endif
-                show_all(); 
-                spin_event_loop();
-            }
-        }
-    }
-}
-
-public class AdjustDateTimeDialog : Gtk.Dialog {
-    private const int64 SECONDS_IN_DAY = 60 * 60 * 24;
-    private const int64 SECONDS_IN_HOUR = 60 * 60;
-    private const int64 SECONDS_IN_MINUTE = 60;
-    private const int YEAR_OFFSET = 1900;
-    private bool no_original_time = false;
-    
-    private const int CALENDAR_THUMBNAIL_SCALE = 1;
-
-    time_t original_time;
-    Gtk.Label original_time_label;
-    Gtk.Calendar calendar;
-    Gtk.SpinButton hour;
-    Gtk.SpinButton minute;
-    Gtk.SpinButton second;
-    Gtk.ComboBoxText system;
-    Gtk.RadioButton relativity_radio_button;
-    Gtk.RadioButton batch_radio_button;
-    Gtk.CheckButton modify_originals_check_button;
-    Gtk.Label notification;
-
-    private enum TimeSystem {
-        AM,
-        PM,
-        24HR;
-    }    
-
-    TimeSystem previous_time_system;
-
-    public AdjustDateTimeDialog(Dateable source, int photo_count, bool display_options = true,
-        bool contains_video = false, bool only_video = false) {
-        assert(source != null);
-
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        
-        set_modal(true);
-        set_resizable(false);
-        set_transient_for(AppWindow.get_instance());
-
-        add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
-                    Resources.OK_LABEL, Gtk.ResponseType.OK);
-        set_title(Resources.ADJUST_DATE_TIME_LABEL);
-
-        calendar = new Gtk.Calendar();
-        calendar.day_selected.connect(on_time_changed);
-        calendar.month_changed.connect(on_time_changed);
-        calendar.next_year.connect(on_time_changed);
-        calendar.prev_year.connect(on_time_changed);
-
-        if (Config.Facade.get_instance().get_use_24_hour_time())
-            hour = new Gtk.SpinButton.with_range(0, 23, 1);
-        else
-            hour = new Gtk.SpinButton.with_range(1, 12, 1);
-
-        hour.output.connect(on_spin_button_output);
-        hour.set_width_chars(2);  
-        hour.set_max_width_chars(2);
-
-        minute = new Gtk.SpinButton.with_range(0, 59, 1);
-        minute.set_width_chars(2);
-        minute.set_max_width_chars(2);
-        minute.output.connect(on_spin_button_output);
-
-        second = new Gtk.SpinButton.with_range(0, 59, 1);
-        second.set_width_chars(2);
-        second.set_max_width_chars(2);
-        second.output.connect(on_spin_button_output);
-
-        system = new Gtk.ComboBoxText();
-        system.append_text(_("AM"));
-        system.append_text(_("PM"));
-        system.append_text(_("24 Hr"));
-        system.changed.connect(on_time_system_changed);
-
-        Gtk.Box clock = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
-
-        clock.pack_start(hour, false, false, 0);
-        clock.pack_start(new Gtk.Label(":"), false, false, 0); // internationalize?
-        clock.pack_start(minute, false, false, 0);
-        clock.pack_start(new Gtk.Label(":"), false, false, 0);
-        clock.pack_start(second, false, false, 0);
-        clock.pack_start(system, false, false, 0);
-
-        set_default_response(Gtk.ResponseType.OK);
-        
-        relativity_radio_button = new Gtk.RadioButton.with_mnemonic(null, 
-            _("_Shift photos/videos by the same amount"));
-        relativity_radio_button.set_active(Config.Facade.get_instance().get_keep_relativity());
-        relativity_radio_button.sensitive = display_options && photo_count > 1;
-
-        batch_radio_button = new Gtk.RadioButton.with_mnemonic(relativity_radio_button.get_group(),
-            _("Set _all photos/videos to this time"));
-        batch_radio_button.set_active(!Config.Facade.get_instance().get_keep_relativity());
-        batch_radio_button.sensitive = display_options && photo_count > 1;
-        batch_radio_button.toggled.connect(on_time_changed);
-
-        if (contains_video) {
-            var text = ngettext ("_Modify original photo file", "_Modify original photo files",
-                                 photo_count);
-            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
-        } else {
-            var text = ngettext ("_Modify original file", "_Modify original files", photo_count);
-            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
-        }
-
-        modify_originals_check_button.set_active(Config.Facade.get_instance().get_commit_metadata_to_masters() &&
-            display_options);
-        modify_originals_check_button.sensitive = (!only_video) &&
-            (!Config.Facade.get_instance().get_commit_metadata_to_masters() && display_options);
-
-        Gtk.Box time_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
-
-        time_content.pack_start(calendar, true, false, 0);
-        time_content.pack_start(clock, true, false, 0);
-
-        if (display_options) {
-            time_content.pack_start(relativity_radio_button, true, false, 0);
-            time_content.pack_start(batch_radio_button, true, false, 0);
-            time_content.pack_start(modify_originals_check_button, true, false, 0);
-        }
-
-        Gdk.Pixbuf preview = null;
-        try {
-            // Instead of calling get_pixbuf() here, we use the thumbnail instead;
-            // this was needed for Videos, since they don't support get_pixbuf().
-            preview = source.get_thumbnail(CALENDAR_THUMBNAIL_SCALE);
-        } catch (Error err) {
-            warning("Unable to fetch preview for %s", source.to_string());
-        }
-        
-        Gtk.Box image_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        image_content.set_valign(Gtk.Align.START);
-        image_content.set_homogeneous(true);
-        Gtk.Image image = (preview != null) ? new Gtk.Image.from_pixbuf(preview) : new Gtk.Image();
-        original_time_label = new Gtk.Label(null);
-        image_content.pack_start(image, true, false, 0);
-        image_content.pack_start(original_time_label, true, false, 0);
-
-        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 10);
-        hbox.set_border_width(3);
-        hbox.pack_start(image_content, true, false, 0);
-        hbox.pack_start(time_content, true, false, 0);
-        hbox.halign = Gtk.Align.CENTER;
-        hbox.valign = Gtk.Align.CENTER;
-        hbox.hexpand = false;
-        hbox.vexpand = false;
-
-        ((Gtk.Box) get_content_area()).pack_start(hbox, true, false, 0);
-
-        notification = new Gtk.Label("");
-        notification.set_line_wrap(true);
-        notification.set_justify(Gtk.Justification.CENTER);
-
-        ((Gtk.Box) get_content_area()).pack_start(notification, true, true, 0);
-        
-        original_time = source.get_exposure_time();
-
-        if (original_time == 0) {
-            original_time = time_t();
-            no_original_time = true;
-        }
-
-        set_time(Time.local(original_time));
-        set_original_time_label(Config.Facade.get_instance().get_use_24_hour_time());
-    }
-
-    private void set_time(Time time) {
-        calendar.select_month(time.month, time.year + YEAR_OFFSET);
-        calendar.select_day(time.day);
-
-        if (Config.Facade.get_instance().get_use_24_hour_time()) {
-            system.set_active(TimeSystem.24HR);
-            hour.set_value(time.hour);
-        } else {
-            int AMPM_hour = time.hour % 12;
-            hour.set_value((AMPM_hour == 0) ? 12 : AMPM_hour);
-            system.set_active((time.hour >= 12) ? TimeSystem.PM : TimeSystem.AM);
-        }
-
-        minute.set_value(time.minute);
-        second.set_value(time.second);
-
-        previous_time_system = (TimeSystem) system.get_active();
-    }
-
-    private void set_original_time_label(bool use_24_hr_format) {
-        if (no_original_time)
-            return;
-
-        original_time_label.set_text(_("Original: ") + 
-            Time.local(original_time).format(use_24_hr_format ? _("%m/%d/%Y, %H:%M:%S") :
-            _("%m/%d/%Y, %I:%M:%S %p")));
-    }
-
-    private time_t get_time() {
-        Time time = Time();
-
-        time.second = (int) second.get_value();
-        time.minute = (int) minute.get_value();
-
-        // convert to 24 hr
-        int hour = (int) hour.get_value();
-        time.hour = (hour == 12 && system.get_active() != TimeSystem.24HR) ? 0 : hour;
-        time.hour += ((system.get_active() == TimeSystem.PM) ? 12 : 0);
-
-        uint year, month, day;
-        calendar.get_date(out year, out month, out day);
-        time.year = ((int) year) - YEAR_OFFSET;
-        time.month = (int) month;
-        time.day = (int) day;
-
-        time.isdst = -1;
-
-        return time.mktime();
-    }
-
-    public bool execute(out int64 time_shift, out bool keep_relativity, 
-        out bool modify_originals) {
-        show_all();
-
-        bool response = false;
-
-        if (run() == Gtk.ResponseType.OK) {
-            if (no_original_time)
-                time_shift = (int64) get_time();
-            else
-                time_shift = (int64) (get_time() - original_time);
-
-            keep_relativity = relativity_radio_button.get_active();
-
-            if (relativity_radio_button.sensitive)
-                Config.Facade.get_instance().set_keep_relativity(keep_relativity);
-
-            modify_originals = modify_originals_check_button.get_active();
-
-            if (modify_originals_check_button.sensitive)
-                Config.Facade.get_instance().set_modify_originals(modify_originals);
-
-            response = true;
-        } else {
-            time_shift = 0;
-            keep_relativity = true;
-            modify_originals = false;
-        }
-
-        destroy();
-
-        return response;
-    }
-
-    private bool on_spin_button_output(Gtk.SpinButton button) {
-        button.set_text("%02d".printf((int) button.get_value()));
-
-        on_time_changed();
-
-        return true;
-    }
-
-    private void on_time_changed() {
-        int64 time_shift = ((int64) get_time() - (int64) original_time);
-
-        previous_time_system = (TimeSystem) system.get_active();
-
-        if (time_shift == 0 || no_original_time || (batch_radio_button.get_active() &&
-            batch_radio_button.sensitive)) {
-            notification.hide();
-        } else {
-            bool forward = time_shift > 0;
-            int days, hours, minutes, seconds;
-
-            time_shift = time_shift.abs();
-
-            days = (int) (time_shift / SECONDS_IN_DAY);
-            time_shift = time_shift % SECONDS_IN_DAY;
-            hours = (int) (time_shift / SECONDS_IN_HOUR);
-            time_shift = time_shift % SECONDS_IN_HOUR;
-            minutes = (int) (time_shift / SECONDS_IN_MINUTE);
-            seconds = (int) (time_shift % SECONDS_IN_MINUTE);
-
-            string shift_status = (forward) ?
-                _("Exposure time will be shifted forward by\n%d %s, %d %s, %d %s, and %d %s.") :
-                _("Exposure time will be shifted backward by\n%d %s, %d %s, %d %s, and %d %s.");
-
-            notification.set_text(shift_status.printf(days, ngettext("day", "days", days),
-                hours, ngettext("hour", "hours", hours), minutes, 
-                ngettext("minute", "minutes", minutes), seconds, 
-                ngettext("second", "seconds", seconds)));
-
-            notification.show();
-        }
-    }
-
-    private void on_time_system_changed() {
-        if (previous_time_system == system.get_active())
-            return;
-
-        Config.Facade.get_instance().set_use_24_hour_time(system.get_active() == TimeSystem.24HR);
-
-        if (system.get_active() == TimeSystem.24HR) {
-            int time = (hour.get_value() == 12.0) ? 0 : (int) hour.get_value();
-            time = time + ((previous_time_system == TimeSystem.PM) ? 12 : 0);
-
-            hour.set_range(0, 23);
-            set_original_time_label(true);
-
-            hour.set_value(time);
-        } else {
-            int AMPM_hour = ((int) hour.get_value()) % 12;
-
-            hour.set_range(1, 12);
-            set_original_time_label(false);
-
-            hour.set_value((AMPM_hour == 0) ? 12 : AMPM_hour);
-        }
-
-        on_time_changed();
-    }
-}
-
 public const int MAX_OBJECTS_DISPLAYED = 3;
 public void multiple_object_error_dialog(Gee.ArrayList<DataObject> objects, string message, 
     string title) {
@@ -2062,630 +902,6 @@ public class ModifyTagsDialog : TagsDialog {
     
 }
 
-public interface WelcomeServiceEntry : GLib.Object {
-    public abstract string get_service_name();
-    
-    public abstract void execute();
-}
-
-public class WelcomeDialog : Gtk.Dialog {
-    Gtk.CheckButton hide_button;
-    Gtk.CheckButton? system_pictures_import_check = null;
-    Gtk.CheckButton[] external_import_checks = new Gtk.CheckButton[0];
-    WelcomeServiceEntry[] external_import_entries = new WelcomeServiceEntry[0];
-    Gtk.Label secondary_text;
-    Gtk.Label instruction_header;
-    Gtk.Box import_content;
-    Gtk.Box import_action_checkbox_packer;
-    Gtk.Box external_import_action_checkbox_packer;
-    Spit.DataImports.WelcomeImportMetaHost import_meta_host;
-    bool import_content_already_installed = false;
-    bool ok_clicked = false;
-    
-    public WelcomeDialog(Gtk.Window owner) {
-        import_meta_host = new Spit.DataImports.WelcomeImportMetaHost(this);
-        bool show_system_pictures_import = is_system_pictures_import_possible();
-        Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
-        set_title(_("Welcome!"));
-        set_resizable(false);
-        set_type_hint(Gdk.WindowTypeHint.DIALOG);
-        set_transient_for(owner);
-
-        Gtk.Label primary_text = new Gtk.Label("");
-        primary_text.set_markup(
-            "<span size=\"large\" weight=\"bold\">%s</span>".printf(_("Welcome to Shotwell!")));
-        primary_text.xalign = 0.0f;
-        primary_text.yalign = 0.5f;
-        secondary_text = new Gtk.Label("");
-        secondary_text.set_markup("<span weight=\"normal\">%s</span>".printf(
-            _("To get started, import photos in any of these ways:")));
-        secondary_text.xalign = 0.0f;
-        secondary_text.yalign = 0.5f;
-        var image = new Gtk.Image.from_icon_name ("shotwell", Gtk.IconSize.DIALOG);
-        
-        Gtk.Box header_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        header_text.pack_start(primary_text, false, false, 5);
-        header_text.pack_start(secondary_text, false, false, 0);
-
-        Gtk.Box header_content = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 12);
-        header_content.pack_start(image, false, false, 0);
-        header_content.pack_start(header_text, false, false, 0);
-
-        Gtk.Label instructions = new Gtk.Label("");
-        string indent_prefix = "   "; // we can't tell what the indent prefix is going to be so assume we need one
-        
-        string arrow_glyph = (get_direction() == Gtk.TextDirection.RTL) ? "◂" : "▸";
-        
-        instructions.set_markup(((indent_prefix + "&#8226; %s\n") + (indent_prefix + "&#8226; %s\n")
-            + (indent_prefix + "&#8226; %s")).printf(
-            _("Choose <span weight=\"bold\">File %s Import From Folder</span>").printf(arrow_glyph),
-            _("Drag and drop photos onto the Shotwell window"),
-            _("Connect a camera to your computer and import")));
-        instructions.xalign = 0.0f;
-        instructions.yalign = 0.5f;
-        
-        import_action_checkbox_packer = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
-        
-        external_import_action_checkbox_packer = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
-        import_action_checkbox_packer.add(external_import_action_checkbox_packer);
-        
-        if (show_system_pictures_import) {
-            system_pictures_import_check = new Gtk.CheckButton.with_mnemonic(
-                _("_Import photos from your %s folder").printf(
-                get_display_pathname(AppDirs.get_import_dir())));
-            import_action_checkbox_packer.add(system_pictures_import_check);
-            system_pictures_import_check.set_active(true);
-        }
-        
-        instruction_header = new Gtk.Label(
-            _("You can also import photos in any of these ways:"));
-        instruction_header.xalign = 0.0f;
-        instruction_header.yalign = 0.5f;
-        instruction_header.set_margin_top(20);
-        
-        Gtk.Box content = new Gtk.Box(Gtk.Orientation.VERTICAL, 16);
-        content.pack_start(header_content, true, true, 0);
-        import_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
-        content.add(import_content);
-        content.pack_start(instructions, false, false, 0);
-
-        hide_button = new Gtk.CheckButton.with_mnemonic(_("_Don’t show this message again"));
-        hide_button.set_active(true);
-        content.pack_start(hide_button, false, false, 6);
-        content.halign = Gtk.Align.FILL;
-        content.valign = Gtk.Align.FILL;
-        content.hexpand = false;
-        content.vexpand = false;
-        content.margin_top = 12;
-        content.margin_bottom = 0;
-        content.margin_start = 12;
-        content.margin_end = 12;
-
-        ((Gtk.Box) get_content_area()).pack_start(content, false, false, 0);
-
-        ok_button.grab_focus();
-
-        install_import_content();
-
-        import_meta_host.start();
-    }
-
-    private void install_import_content() {
-        if (
-            (external_import_checks.length > 0 || system_pictures_import_check != null) &&
-            (import_content_already_installed == false)
-        ) {
-            secondary_text.set_markup("");
-            import_content.add(import_action_checkbox_packer);
-            import_content.add(instruction_header);
-            import_content_already_installed = true;
-        }
-    }
-    
-    public void install_service_entry(WelcomeServiceEntry entry) {
-        debug("WelcomeDialog: Installing service entry for %s".printf(entry.get_service_name()));
-        external_import_entries += entry;
-        Gtk.CheckButton entry_check = new Gtk.CheckButton.with_label(
-            _("Import photos from your %s library").printf(entry.get_service_name()));
-        external_import_checks += entry_check;
-        entry_check.set_active(true);
-        external_import_action_checkbox_packer.add(entry_check);
-        install_import_content();
-    }
-
-    /**
-     * Connected to the 'response' signal.  This is part of a workaround
-     * for the fact that run()-ning this dialog can interfere with displaying
-     * images from a camera; please see #4997 for details.
-     */
-    private void on_dismiss(int resp) {
-        if (resp == Gtk.ResponseType.OK) {
-            ok_clicked = true;
-        }
-        hide();
-        Gtk.main_quit();
-    }
-
-    public bool execute(out WelcomeServiceEntry[] selected_import_entries, out bool do_system_pictures_import) {
-        // it's unsafe to call run() here - it interferes with displaying
-        // images from a camera - so we process the dialog ourselves.
-        response.connect(on_dismiss);
-        show_all();
-        show();
-
-        // this will block the thread we're in until a matching call
-        // to main_quit() is encountered; this happens when either the window
-        // is closed or OK is clicked.
-        Gtk.main();
-        
-        // at this point, the inner main loop will have been exited.
-        // we've got the response, so we don't need this signal anymore.
-        response.disconnect(on_dismiss);
-
-        bool ok = ok_clicked;
-        bool show_dialog = true;
-
-        if (ok)
-            show_dialog = !hide_button.get_active();
-
-        // Use a temporary variable as += cannot be used on parameters
-        WelcomeServiceEntry[] result = new WelcomeServiceEntry[0];
-        for (int i = 0; i < external_import_entries.length; i++) {
-            if (external_import_checks[i].get_active() == true)
-                result += external_import_entries[i];
-        }
-        selected_import_entries = result;
-        do_system_pictures_import = 
-            (system_pictures_import_check != null) ? system_pictures_import_check.get_active() : false;
-
-        destroy();
-
-        return show_dialog;
-    }
-    
-    private static bool is_system_pictures_import_possible() {
-        File system_pictures = AppDirs.get_import_dir();
-        if (!system_pictures.query_exists(null))
-            return false;
-        
-        if (!(system_pictures.query_file_type(FileQueryInfoFlags.NONE, null) == FileType.DIRECTORY))
-            return false;
-
-        try {
-            FileEnumerator syspics_child_enum = system_pictures.enumerate_children("standard::*",
-                FileQueryInfoFlags.NONE, null);
-            return (syspics_child_enum.next_file(null) != null);
-        } catch (Error e) {
-            return false;
-        }
-    }
-}
-
-public class PreferencesDialog {
-    private class PathFormat {
-        public PathFormat(string name, string? pattern) {
-            this.name = name;
-            this.pattern = pattern;
-        }
-        public string name;
-        public string? pattern;
-    } 
-    
-    private static PreferencesDialog preferences_dialog;
-    
-    private Gtk.Dialog dialog;
-    private Gtk.Builder builder;
-    private Gtk.Adjustment bg_color_adjustment;
-    private Gtk.Scale bg_color_slider;
-    private Gtk.ComboBox photo_editor_combo;
-    private Gtk.ComboBox raw_editor_combo;
-    private SortedList<AppInfo> external_raw_apps;
-    private SortedList<AppInfo> external_photo_apps;
-    private Gtk.FileChooserButton library_dir_button;
-    private Gtk.ComboBoxText dir_pattern_combo;
-    private Gtk.Entry dir_pattern_entry;
-    private Gtk.Label dir_pattern_example;
-    private bool allow_closing = false;
-    private string? lib_dir = null;
-    private Gee.ArrayList<PathFormat> path_formats = new Gee.ArrayList<PathFormat>();
-    private GLib.DateTime example_date = new GLib.DateTime.local(2009, 3, 10, 18, 16, 11);
-    private Gtk.CheckButton lowercase;
-    private Plugins.ManifestWidgetMediator plugins_mediator = new Plugins.ManifestWidgetMediator();
-    private Gtk.ComboBoxText default_raw_developer_combo;
-
-    private PreferencesDialog() {
-        builder = AppWindow.create_builder();
-        
-        dialog = builder.get_object("preferences_dialog") as Gtk.Dialog;
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        if (!use_header) {
-            Gtk.Widget null_titlebar = null;
-            dialog.set_titlebar (null_titlebar);
-        }
-        dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
-        dialog.set_transient_for(AppWindow.get_instance());
-        dialog.delete_event.connect(on_delete);
-        dialog.response.connect(on_close);
-        
-        bg_color_adjustment = builder.get_object("bg_color_adjustment") as Gtk.Adjustment;
-        bg_color_adjustment.set_value(bg_color_adjustment.get_upper() - 
-            (Config.Facade.get_instance().get_bg_color().red * 65535.0));
-        bg_color_adjustment.value_changed.connect(on_value_changed);
-
-        bg_color_slider = builder.get_object("bg_color_slider") as Gtk.Scale;
-        bg_color_slider.button_press_event.connect(on_bg_color_reset);
-
-        library_dir_button = builder.get_object("library_dir_button") as Gtk.FileChooserButton;
-        
-        photo_editor_combo = builder.get_object("external_photo_editor_combo") as Gtk.ComboBox;
-        raw_editor_combo = builder.get_object("external_raw_editor_combo") as Gtk.ComboBox;
-        
-        Gtk.Label pattern_help = builder.get_object("pattern_help") as Gtk.Label;
-
-        // Ticket #3162 - Move dir pattern blurb into Gnome help. 
-        // Because specifying a particular snippet of the help requires 
-        // us to know where its located, we can't hardcode a URL anymore;
-        // instead, we ask for the help path, and if we find it, we tell
-        // yelp to read from there, otherwise, we read from system-wide. 
-        string help_path = Resources.get_help_path();
-        
-        if (help_path == null) {
-            // We're installed system-wide, so use the system help.
-            pattern_help.set_markup("<a href=\"" + Resources.DIR_PATTERN_URI_SYSWIDE + "\">" + _("(Help)") + "</a>");
-        } else {
-            // 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.
-            pattern_help.set_markup("<a href=\"dummy:\">" + _("(Help)") + "</a>");
-            pattern_help.activate_link.connect(on_local_pattern_help);
-        }
-        
-        dir_pattern_combo = builder.get_object("dir choser") as Gtk.ComboBoxText;
-        dir_pattern_entry = builder.get_object("dir_pattern_entry") as Gtk.Entry;
-        dir_pattern_example = builder.get_object("dynamic example") as Gtk.Label;
-        add_to_dir_formats(_("Year%sMonth%sDay").printf(Path.DIR_SEPARATOR_S, Path.DIR_SEPARATOR_S), 
-            "%Y" + Path.DIR_SEPARATOR_S + "%m" + Path.DIR_SEPARATOR_S + "%d");
-        add_to_dir_formats(_("Year%sMonth").printf(Path.DIR_SEPARATOR_S), "%Y" +
-            Path.DIR_SEPARATOR_S + "%m");
-        add_to_dir_formats(_("Year%sMonth-Day").printf(Path.DIR_SEPARATOR_S), 
-            "%Y" + Path.DIR_SEPARATOR_S + "%m-%d");
-        add_to_dir_formats(_("Year-Month-Day"), "%Y-%m-%d");
-        add_to_dir_formats(_("Custom"), null); // Custom must always be last.
-        dir_pattern_combo.changed.connect(on_dir_pattern_combo_changed);
-        dir_pattern_entry.changed.connect(on_dir_pattern_entry_changed);
-        
-        (builder.get_object("dir_structure_label") as Gtk.Label).set_mnemonic_widget(dir_pattern_combo);
-        
-        lowercase = builder.get_object("lowercase") as Gtk.CheckButton;
-        lowercase.toggled.connect(on_lowercase_toggled);
-        
-        var notebook = builder.get_object("preferences-notebook") as Gtk.Notebook;
-        (notebook.get_nth_page (2) as Gtk.Container).add (plugins_mediator.widget);
-
-        populate_preference_options();
-
-        photo_editor_combo.changed.connect(on_photo_editor_changed);
-        raw_editor_combo.changed.connect(on_raw_editor_changed);
-        
-        Gtk.CheckButton auto_import_button = builder.get_object("autoimport") as Gtk.CheckButton;
-        auto_import_button.set_active(Config.Facade.get_instance().get_auto_import_from_library());
-        
-        Gtk.CheckButton commit_metadata_button = builder.get_object("write_metadata") as Gtk.CheckButton;
-        commit_metadata_button.set_active(Config.Facade.get_instance().get_commit_metadata_to_masters());
-        
-        default_raw_developer_combo = builder.get_object("default_raw_developer") as Gtk.ComboBoxText;
-        default_raw_developer_combo.append_text(RawDeveloper.CAMERA.get_label());
-        default_raw_developer_combo.append_text(RawDeveloper.SHOTWELL.get_label());
-        set_raw_developer_combo(Config.Facade.get_instance().get_default_raw_developer());
-        default_raw_developer_combo.changed.connect(on_default_raw_developer_changed);
-        
-        dialog.map_event.connect(map_event);
-    }
-    
-    public void populate_preference_options() {
-        populate_app_combo_box(photo_editor_combo, PhotoFileFormat.get_editable_mime_types(), 
-            Config.Facade.get_instance().get_external_photo_app(), out external_photo_apps);
-
-        populate_app_combo_box(raw_editor_combo, PhotoFileFormat.RAW.get_mime_types(), 
-            Config.Facade.get_instance().get_external_raw_app(), out external_raw_apps);
-        
-        setup_dir_pattern(dir_pattern_combo, dir_pattern_entry);
-        
-        lowercase.set_active(Config.Facade.get_instance().get_use_lowercase_filenames());
-    }
-    
-    // Ticket #3162, part II - if we're not yet installed, then we have to manually launch
-    // the help viewer and specify the full path to the subsection we want...
-    private bool on_local_pattern_help(string ignore) {
-        try {
-            Resources.launch_help(AppWindow.get_instance().get_screen(), "other-files.page");
-        } catch (Error e) {
-            message("Unable to launch help: %s", e.message);
-        }
-        return true;
-    }
-    
-    private void populate_app_combo_box(Gtk.ComboBox combo_box, string[] mime_types,
-        string current_app_executable, out SortedList<AppInfo> external_apps) {
-        // get list of all applications for the given mime types
-        assert(mime_types.length != 0);
-        external_apps = DesktopIntegration.get_apps_for_mime_types(mime_types);
-        
-        if (external_apps.size == 0)
-            return;
-        
-        // populate application ComboBox with app names and icons
-        Gtk.CellRendererPixbuf pixbuf_renderer = new Gtk.CellRendererPixbuf();
-        Gtk.CellRendererText text_renderer = new Gtk.CellRendererText();
-        combo_box.clear();
-        combo_box.pack_start(pixbuf_renderer, false);
-        combo_box.pack_start(text_renderer, false);
-        combo_box.add_attribute(pixbuf_renderer, "pixbuf", 0);
-        combo_box.add_attribute(text_renderer, "text", 1);
-        
-        // TODO: need more space between icons and text
-        Gtk.ListStore combo_store = new Gtk.ListStore(2, typeof(Gdk.Pixbuf), typeof(string));
-        Gtk.TreeIter iter;
-        
-        int current_app = -1;
-        
-        foreach (AppInfo app in external_apps) {
-            combo_store.append(out iter);
-
-            Icon app_icon = app.get_icon();
-            try {
-                if (app_icon is FileIcon) {
-                    combo_store.set_value(iter, 0, scale_pixbuf(new Gdk.Pixbuf.from_file(
-                        ((FileIcon) app_icon).get_file().get_path()), Resources.DEFAULT_ICON_SCALE,
-                        Gdk.InterpType.BILINEAR, false));
-                } else if (app_icon is ThemedIcon) {
-                    Gdk.Pixbuf icon_pixbuf = 
-                        Gtk.IconTheme.get_default().load_icon(((ThemedIcon) app_icon).get_names()[0],
-                        Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);
-                    
-                    combo_store.set_value(iter, 0, icon_pixbuf);
-                }
-            } catch (GLib.Error error) {
-                warning("Error loading icon pixbuf: " + error.message);
-            }
-
-            combo_store.set_value(iter, 1, app.get_name());
-            
-            if (app.get_commandline() == current_app_executable)
-                current_app = external_apps.index_of(app);
-        }
-        
-        // TODO: allow users to choose unlisted applications like Nautilus's "Open with -> Other Application..."
-
-        combo_box.set_model(combo_store);
-
-        if (current_app != -1)
-            combo_box.set_active(current_app);
-    }
-    
-    private void setup_dir_pattern(Gtk.ComboBox combo_box, Gtk.Entry entry) {
-        string? pattern = Config.Facade.get_instance().get_directory_pattern();
-        bool found = false;
-        if (null != pattern) {
-            // Locate pre-built text.
-            int i = 0;
-            foreach (PathFormat pf in path_formats) {
-                if (pf.pattern == pattern) {
-                    combo_box.set_active(i);
-                    found = true;
-                    break;
-                }
-                i++;
-            }
-        } else {
-            // Custom path.
-            string? s = Config.Facade.get_instance().get_directory_pattern_custom();
-            if (!is_string_empty(s)) {
-                combo_box.set_active(path_formats.size - 1); // Assume "custom" is last.
-                found = true;
-            }
-        }
-        
-        if (!found) {
-            combo_box.set_active(0);
-        }
-        
-        on_dir_pattern_combo_changed();
-    }
-    
-    public static void show() {
-        if (preferences_dialog == null) 
-            preferences_dialog = new PreferencesDialog();
-        
-        preferences_dialog.populate_preference_options();
-        preferences_dialog.dialog.show_all();
-        preferences_dialog.library_dir_button.set_current_folder(AppDirs.get_import_dir().get_path());
-
-        // Ticket #3001: Cause the dialog to become active if the user chooses 'Preferences'
-        // from the menus a second time.
-        preferences_dialog.dialog.present();
-    }
-
-    // For items that should only be committed when the dialog is closed, not as soon as the change
-    // is made.
-    private void commit_on_close() {
-        Config.Facade.get_instance().commit_bg_color();
-        
-        Gtk.CheckButton? autoimport = builder.get_object("autoimport") as Gtk.CheckButton;
-        if (autoimport != null)
-            Config.Facade.get_instance().set_auto_import_from_library(autoimport.active);
-        
-        Gtk.CheckButton? commit_metadata = builder.get_object("write_metadata") as Gtk.CheckButton;
-        if (commit_metadata != null)
-            Config.Facade.get_instance().set_commit_metadata_to_masters(commit_metadata.active);
-       
-        if (lib_dir != null)
-            AppDirs.set_import_dir(lib_dir);
-        
-        PathFormat pf = path_formats.get(dir_pattern_combo.get_active());
-        if (null == pf.pattern) {
-            Config.Facade.get_instance().set_directory_pattern_custom(dir_pattern_entry.text);
-            Config.Facade.get_instance().set_directory_pattern(null);
-        } else {
-            Config.Facade.get_instance().set_directory_pattern(pf.pattern);
-        }
-    }
-    
-    private bool on_delete() {
-        if (!get_allow_closing())
-            return true;
-        
-        commit_on_close();
-        return dialog.hide_on_delete(); //prevent widgets from getting destroyed
-    }
-    
-    private void on_close() {
-        if (!get_allow_closing())
-            return;
-            
-        dialog.hide();
-        commit_on_close();
-    }
-    
-    private void on_value_changed() {
-        set_background_color((double)(bg_color_adjustment.get_upper() - 
-            bg_color_adjustment.get_value()) / 65535.0);
-    }
-
-    private bool on_bg_color_reset(Gdk.EventButton event) {
-        if (event.button == 1 && event.type == Gdk.EventType.BUTTON_PRESS
-            && has_only_key_modifier(event.state, Gdk.ModifierType.CONTROL_MASK)) {
-            // Left Mouse Button and CTRL pressed
-            bg_color_slider.set_value(bg_color_adjustment.get_upper() - 
-                (parse_color(Config.Facade.DEFAULT_BG_COLOR).red * 65536.0f));
-            on_value_changed();
-
-            return true;
-        }
-
-        return false;
-    }
-    
-    private void on_dir_pattern_combo_changed() {
-        PathFormat pf = path_formats.get(dir_pattern_combo.get_active());
-        if (null == pf.pattern) {
-            // Custom format.
-            string? dir_pattern = Config.Facade.get_instance().get_directory_pattern_custom();
-            if (is_string_empty(dir_pattern))
-                dir_pattern = "";
-            dir_pattern_entry.set_text(dir_pattern);
-            dir_pattern_entry.editable = true;
-            dir_pattern_entry.sensitive = true;
-        } else {
-            dir_pattern_entry.set_text(pf.pattern);
-            dir_pattern_entry.editable = false;
-            dir_pattern_entry.sensitive = false;
-        }
-    }
-    
-    private void on_dir_pattern_entry_changed() {
-         string example = example_date.format(dir_pattern_entry.text);
-         if (is_string_empty(example) && !is_string_empty(dir_pattern_entry.text)) {
-            // Invalid pattern.
-            dir_pattern_example.set_text(_("Invalid pattern"));
-            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-error");
-            dir_pattern_entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, false);
-            set_allow_closing(false);
-         } else {
-            // Valid pattern.
-            dir_pattern_example.set_text(example);
-            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, null);
-            set_allow_closing(true);
-         }
-    }
-    
-    private void set_allow_closing(bool allow) {
-        dialog.set_deletable(allow);
-        allow_closing = allow;
-    }
-    
-    private bool get_allow_closing() {
-        return allow_closing;
-    }
-
-    private void set_background_color(double bg_color_value) {
-        Config.Facade.get_instance().set_bg_color(to_grayscale(bg_color_value));
-    }
-
-    private Gdk.RGBA to_grayscale(double color_value) {
-        Gdk.RGBA color = Gdk.RGBA();
-        
-        color.red = color_value;
-        color.green = color_value;
-        color.blue = color_value;
-        color.alpha = 1.0;
-        
-        return color;
-    }
-    
-    private void on_photo_editor_changed() {
-        int photo_app_choice_index = (photo_editor_combo.get_active() < external_photo_apps.size) ? 
-            photo_editor_combo.get_active() : external_photo_apps.size;
-            
-        AppInfo app = external_photo_apps.get_at(photo_app_choice_index);
-
-        Config.Facade.get_instance().set_external_photo_app(DesktopIntegration.get_app_open_command(app));
-
-        debug("setting external photo editor to: %s", DesktopIntegration.get_app_open_command(app));
-    }
-    
-    private void on_raw_editor_changed() {
-        int raw_app_choice_index = (raw_editor_combo.get_active() < external_raw_apps.size) ? 
-            raw_editor_combo.get_active() : external_raw_apps.size;
-        
-        AppInfo app = external_raw_apps.get_at(raw_app_choice_index);
-        
-        Config.Facade.get_instance().set_external_raw_app(app.get_commandline());
-        
-        debug("setting external raw editor to: %s", app.get_commandline());
-    }
-    
-    private RawDeveloper raw_developer_from_combo() {
-        if (default_raw_developer_combo.get_active() == 0)
-            return RawDeveloper.CAMERA;
-        return RawDeveloper.SHOTWELL;
-    }
-    
-    private void set_raw_developer_combo(RawDeveloper d) {
-        if (d == RawDeveloper.CAMERA)
-            default_raw_developer_combo.set_active(0);
-        else
-            default_raw_developer_combo.set_active(1);
-    }
-    
-    private void on_default_raw_developer_changed() {
-        Config.Facade.get_instance().set_default_raw_developer(raw_developer_from_combo());
-    }
-    
-    private void on_current_folder_changed() {
-        lib_dir = library_dir_button.get_filename();
-    }
-    
-    private bool map_event() {
-        // Set the signal for the lib dir button after the dialog is displayed, 
-        // 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);
-        return true;
-    }
-    
-    private void add_to_dir_formats(string name, string? pattern) {
-        PathFormat pf = new PathFormat(name, pattern);
-        path_formats.add(pf);
-        dir_pattern_combo.append_text(name);
-    }
-    
-    private void on_lowercase_toggled() {
-        Config.Facade.get_instance().set_use_lowercase_filenames(lowercase.get_active());
-    }
-}
-
 // 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.
 public Gtk.ResponseType copy_files_dialog() {
diff --git a/src/Dimensions.c b/src/Dimensions.c
index cf3daa1..20bd7e9 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -174,7 +174,7 @@ gchar* scale_constraint_to_string (ScaleConstraint self) {
 		{
 			gchar* _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
-			_tmp1_ = g_strdup (_ ("Width or height"));
+			_tmp1_ = g_strdup (_ ("Longest edge"));
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
 			result = _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala"
diff --git a/src/Dimensions.vala b/src/Dimensions.vala
index 7c9eed6..99fe469 100644
--- a/src/Dimensions.vala
+++ b/src/Dimensions.vala
@@ -17,7 +17,7 @@ public enum ScaleConstraint {
                 return _("Original size");
                 
             case DIMENSIONS:
-                return _("Width or height");
+                return _("Longest edge");
             
             case WIDTH:
                 return _("Width");
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index f673b36..ea74e69 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -3657,7 +3657,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3656 "DirectoryMonitor.c"
-				goto __catch481_g_error;
+				goto __catch490_g_error;
 			}
 #line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = _data_->_tmp11_;
@@ -3671,8 +3671,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_g_object_unref0 (_data_->_tmp11_);
 #line 3669 "DirectoryMonitor.c"
 		}
-		goto __finally481;
-		__catch481_g_error:
+		goto __finally490;
+		__catch490_g_error:
 		{
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
@@ -3717,7 +3717,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			return FALSE;
 #line 3715 "DirectoryMonitor.c"
 		}
-		__finally481:
+		__finally490:
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3874,7 +3874,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3873 "DirectoryMonitor.c"
-			goto __catch482_g_error;
+			goto __catch491_g_error;
 		}
 		{
 #line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -3908,7 +3908,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
 #line 3907 "DirectoryMonitor.c"
-					goto __catch482_g_error;
+					goto __catch491_g_error;
 				}
 #line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp54_ = _data_->infos;
@@ -4108,8 +4108,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4106 "DirectoryMonitor.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally491;
+	__catch491_g_error:
 	{
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
@@ -4158,7 +4158,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		return FALSE;
 #line 4156 "DirectoryMonitor.c"
 	}
-	__finally482:
+	__finally491:
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4704,7 +4704,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4703 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+			goto __catch492_g_error;
 		}
 #line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -4718,8 +4718,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_object_unref0 (_tmp9_);
 #line 4716 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_;
@@ -4757,7 +4757,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		return result;
 #line 4755 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally492:
 #line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4760 "DirectoryMonitor.c"
@@ -7209,7 +7209,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 7206 "DirectoryMonitor.c"
-			goto __catch484_g_error;
+			goto __catch493_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7254,8 +7254,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_object_unref0 (_tmp2_);
 #line 7250 "DirectoryMonitor.c"
 	}
-	goto __finally484;
-	__catch484_g_error:
+	goto __finally493;
+	__catch493_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_;
@@ -7276,7 +7276,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_error_free0 (err);
 #line 7272 "DirectoryMonitor.c"
 	}
-	__finally484:
+	__finally493:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8379,7 +8379,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8376 "DirectoryMonitor.c"
-			goto __catch485_g_error;
+			goto __catch494_g_error;
 		}
 #line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8393,8 +8393,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (_tmp3_);
 #line 8389 "DirectoryMonitor.c"
 	}
-	goto __finally485;
-	__catch485_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp8_;
@@ -8430,7 +8430,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		return result;
 #line 8426 "DirectoryMonitor.c"
 	}
-	__finally485:
+	__finally494:
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
diff --git a/src/Event.c b/src/Event.c
index c427644..984004e 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -3757,7 +3757,7 @@ Event* event_create_empty_event (MediaSource* source) {
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3760 "Event.c"
-				goto __catch436_database_error;
+				goto __catch444_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);
@@ -3795,8 +3795,8 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3797 "Event.c"
 	}
-	goto __finally436;
-	__catch436_database_error:
+	goto __finally444;
+	__catch444_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_;
@@ -3816,7 +3816,7 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3818 "Event.c"
 	}
-	__finally436:
+	__finally444:
 #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"
@@ -4025,11 +4025,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 4028 "Event.c"
-			goto __catch437_g_error;
+			goto __catch445_g_error;
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally445;
+	__catch445_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
@@ -4056,7 +4056,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4058 "Event.c"
 	}
-	__finally437:
+	__finally445:
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4086,11 +4086,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 4089 "Event.c"
-			goto __catch438_g_error;
+			goto __catch446_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally446;
+	__catch446_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -4117,7 +4117,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4119 "Event.c"
 	}
-	__finally438:
+	__finally446:
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4203,11 +4203,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 4206 "Event.c"
-			goto __catch439_g_error;
+			goto __catch447_g_error;
 		}
 	}
-	goto __finally439;
-	__catch439_g_error:
+	goto __finally447;
+	__catch447_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
@@ -4234,7 +4234,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4236 "Event.c"
 	}
-	__finally439:
+	__finally447:
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4264,11 +4264,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 4267 "Event.c"
-			goto __catch440_g_error;
+			goto __catch448_g_error;
 		}
 	}
-	goto __finally440;
-	__catch440_g_error:
+	goto __finally448;
+	__catch448_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -4295,7 +4295,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4297 "Event.c"
 	}
-	__finally440:
+	__finally448:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5329,7 +5329,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 5331 "Event.c"
-				goto __catch441_database_error;
+				goto __catch449_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);
@@ -5386,8 +5386,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		return result;
 #line 5387 "Event.c"
 	}
-	goto __finally441;
-	__catch441_database_error:
+	goto __finally449;
+	__catch449_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp49_;
@@ -5403,7 +5403,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		_g_error_free0 (err);
 #line 5404 "Event.c"
 	}
-	__finally441:
+	__finally449:
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6906,7 +6906,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 6908 "Event.c"
-			goto __catch442_g_error;
+			goto __catch450_g_error;
 		}
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = _tmp0_;
@@ -6920,8 +6920,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6921 "Event.c"
 	}
-	goto __finally442;
-	__catch442_g_error:
+	goto __finally450;
+	__catch450_g_error:
 	{
 		GError* err = NULL;
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6936,7 +6936,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6937 "Event.c"
 	}
-	__finally442:
+	__finally450:
 #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"
@@ -6978,7 +6978,7 @@ static void event_real_destroy (DataSource* base) {
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6980 "Event.c"
-				goto __catch443_database_error;
+				goto __catch451_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);
@@ -6989,8 +6989,8 @@ static void event_real_destroy (DataSource* base) {
 #line 6989 "Event.c"
 		}
 	}
-	goto __finally443;
-	__catch443_database_error:
+	goto __finally451;
+	__catch451_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
@@ -7006,7 +7006,7 @@ static void event_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 7007 "Event.c"
 	}
-	__finally443:
+	__finally451:
 #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 b0a15a6..b08f9bb 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -442,10 +442,10 @@ GType background_job_get_type (void) G_GNUC_CONST;
 static void exporter_on_exported (Exporter* self, BackgroundJob* j);
 static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value);
 static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j);
 GFile** exporter_get_exported_files (Exporter* self, int* result_length1);
-static GFile** _vala_array_dup30 (GFile** self, int length);
+static GFile** _vala_array_dup25 (GFile** self, int length);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
@@ -453,7 +453,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_basename (MediaSource* self);
-static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GFile* app_dirs_get_temp_dir (void);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -879,7 +879,7 @@ static gpointer _background_job_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add128 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1084,7 +1084,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp35_ = _g_object_ref0 (_tmp34_);
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_vala_array_add128 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp35_);
+			_vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp35_);
 #line 1089 "Exporter.c"
 		}
 	}
@@ -1133,7 +1133,7 @@ static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) {
 }
 
 
-static GFile** _vala_array_dup30 (GFile** self, int length) {
+static GFile** _vala_array_dup25 (GFile** self, int length) {
 	GFile** result;
 	int i;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1169,7 +1169,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0__length1 = self->priv->exported_files_length1;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup30 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup25 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1190,7 +1190,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 }
 
 
-static void _vala_array_add129 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1372,7 +1372,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp23_);
+				_vala_array_add130 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp23_);
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp24_ = self->priv->completed_count;
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "Exporter.c"
-						goto __catch479_g_error;
+						goto __catch488_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 __finally479;
-				__catch479_g_error:
+				goto __finally488;
+				__catch488_g_error:
 				{
 					GError* err = NULL;
 					MediaSource* _tmp44_;
@@ -1553,7 +1553,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 					break;
 #line 1555 "Exporter.c"
 				}
-				__finally479:
+				__finally488:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1560 "Exporter.c"
@@ -2053,7 +2053,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 2056 "Exporter.c"
-				goto __catch480_g_error;
+				goto __catch489_g_error;
 			}
 		} else {
 			MediaSource* _tmp9_;
@@ -2073,13 +2073,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 2076 "Exporter.c"
-					goto __catch480_g_error;
+					goto __catch489_g_error;
 				}
 			}
 		}
 	}
-	goto __finally480;
-	__catch480_g_error:
+	goto __finally489;
+	__catch489_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_;
@@ -2100,7 +2100,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2102 "Exporter.c"
 	}
-	__finally480:
+	__finally489:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 80acc12..e2bfc0c 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -9,11 +9,16 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <gio/gio.h>
+#include <stdio.h>
+#include <glib/gstdio.h>
 
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_MEDIA_METADATA (media_metadata_get_type ())
 #define MEDIA_METADATA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_METADATA, MediaMetadata))
@@ -35,9 +40,6 @@ typedef struct _MediaMetadataClass MediaMetadataClass;
 typedef struct _MetadataDateTime MetadataDateTime;
 typedef struct _MetadataDateTimeClass MetadataDateTimeClass;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#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_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
@@ -113,6 +115,7 @@ typedef struct _PhotoFileReaderClass PhotoFileReaderClass;
 typedef struct _PhotoMetadata PhotoMetadata;
 typedef struct _PhotoMetadataClass PhotoMetadataClass;
 #define _photo_file_adapter_unref0(var) ((var == NULL) ? NULL : (var = (photo_file_adapter_unref (var), NULL)))
+#define _fclose0(var) ((var == NULL) ? NULL : (var = (fclose (var), NULL)))
 
 typedef enum  {
 	PHOTO_FILE_FORMAT_JFIF,
@@ -124,7 +127,11 @@ typedef enum  {
 } PhotoFileFormat;
 
 
+extern gboolean library_files_use_fallback_copy_func;
+gboolean library_files_use_fallback_copy_func = FALSE;
 
+void library_files_select_copy_function (void);
+GFile* app_dirs_get_import_dir (void);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
 GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -177,14 +184,130 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc
 GType photo_metadata_get_type (void) G_GNUC_CONST;
 PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
 void library_monitor_blacklist_file (GFile* file, const gchar* reason);
+void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback callback, void* callback_target, GError** error);
 void library_monitor_unblacklist_file (GFile* file);
 gchar* md5_file (GFile* file, GError** error);
 
 
+static gchar* bool_to_string (gboolean self) {
+	gchar* result = NULL;
+#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (self) {
+#line 197 "LibraryFiles.c"
+		gchar* _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strdup ("true");
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 205 "LibraryFiles.c"
+	} else {
+		gchar* _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = g_strdup ("false");
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 214 "LibraryFiles.c"
+	}
+}
+
+
+void library_files_select_copy_function (void) {
+	GFile* import_dir = NULL;
+	GFile* _tmp0_;
+	gboolean _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	GError * _inner_error_ = NULL;
+#line 12 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp0_ = app_dirs_get_import_dir ();
+#line 12 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	import_dir = _tmp0_;
+#line 230 "LibraryFiles.c"
+	{
+		GFileInfo* info = NULL;
+		GFileInfo* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+#line 15 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp1_ = g_file_query_filesystem_info (import_dir, "filesystem::type", NULL, &_inner_error_);
+#line 15 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		info = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 242 "LibraryFiles.c"
+			goto __catch471_g_error;
+		}
+#line 16 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp2_ = g_file_info_get_attribute_as_string (info, "filesystem::type");
+#line 16 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp3_ = _tmp2_;
+#line 16 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		library_files_use_fallback_copy_func = g_strcmp0 (_tmp3_, "nfs") == 0;
+#line 16 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp3_);
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_object_unref0 (info);
+#line 255 "LibraryFiles.c"
+	}
+	goto __finally471;
+	__catch471_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_error_ = _inner_error_;
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_inner_error_ = NULL;
+#line 18 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp4_ = _error_;
+#line 18 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp5_ = _tmp4_->message;
+#line 18 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("LibraryFiles.vala:18: Failed to query fs type: %s", _tmp5_);
+#line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		library_files_use_fallback_copy_func = TRUE;
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_error_free0 (_error_);
+#line 277 "LibraryFiles.c"
+	}
+	__finally471:
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_object_unref0 (import_dir);
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_clear_error (&_inner_error_);
+#line 14 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return;
+#line 290 "LibraryFiles.c"
+	}
+#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp6_ = library_files_use_fallback_copy_func;
+#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp7_ = bool_to_string (_tmp6_);
+#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp8_ = _tmp7_;
+#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	g_info ("LibraryFiles.vala:22: Using fallback copy: %s", _tmp8_);
+#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_free0 (_tmp8_);
+#line 11 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_object_unref0 (import_dir);
+#line 304 "LibraryFiles.c"
+}
+
+
 static gpointer _g_error_copy0 (gpointer self) {
-#line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 188 "LibraryFiles.c"
+#line 311 "LibraryFiles.c"
 }
 
 
@@ -206,170 +329,170 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 	GFile* _tmp20_;
 	GFile* _tmp21_;
 	GError * _inner_error_ = NULL;
-#line 13 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (basename != NULL, NULL);
-#line 13 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_MEDIA_METADATA (metadata), NULL);
-#line 18 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 34 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp0_ = ts;
-#line 18 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 34 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	timestamp = _tmp0_;
-#line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp1_ = metadata;
-#line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp1_ != NULL) {
-#line 222 "LibraryFiles.c"
+#line 345 "LibraryFiles.c"
 		MetadataDateTime* date_time = NULL;
 		MediaMetadata* _tmp2_;
 		MetadataDateTime* _tmp3_;
 		MetadataDateTime* _tmp4_;
-#line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = metadata;
-#line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp3_ = media_metadata_get_creation_date_time (_tmp2_);
-#line 20 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 36 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		date_time = _tmp3_;
-#line 21 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 37 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp4_ = date_time;
-#line 21 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 37 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (_tmp4_ != NULL) {
-#line 237 "LibraryFiles.c"
+#line 360 "LibraryFiles.c"
 			MetadataDateTime* _tmp5_;
 			time_t _tmp6_;
-#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp5_ = date_time;
-#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp6_ = metadata_date_time_get_timestamp (_tmp5_);
-#line 22 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 38 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			timestamp = _tmp6_;
-#line 246 "LibraryFiles.c"
+#line 369 "LibraryFiles.c"
 		} else {
 			time_t _tmp7_;
-#line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp7_ = timestamp;
-#line 23 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (_tmp7_ == ((time_t) 0)) {
-#line 253 "LibraryFiles.c"
+#line 376 "LibraryFiles.c"
 				time_t _tmp8_;
-#line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_tmp8_ = time (NULL);
-#line 24 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 40 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				timestamp = _tmp8_;
-#line 259 "LibraryFiles.c"
+#line 382 "LibraryFiles.c"
 			}
 		}
-#line 19 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 35 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 264 "LibraryFiles.c"
+#line 387 "LibraryFiles.c"
 	}
-#line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = timestamp;
-#line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp10_ = app_dirs_get_baked_import_dir (_tmp9_);
-#line 28 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 44 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dir = _tmp10_;
-#line 272 "LibraryFiles.c"
+#line 395 "LibraryFiles.c"
 	{
 		GFile* _tmp11_;
-#line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = dir;
-#line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
-#line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 281 "LibraryFiles.c"
-			goto __catch463_g_error;
+#line 404 "LibraryFiles.c"
+			goto __catch472_g_error;
 		}
 	}
-	goto __finally463;
-	__catch463_g_error:
+	goto __finally472;
+	__catch472_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_;
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 32 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp12_ = err;
-#line 32 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!g_error_matches (_tmp12_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-#line 298 "LibraryFiles.c"
+#line 421 "LibraryFiles.c"
 			GError* _tmp13_;
 			GError* _tmp14_;
-#line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = err;
-#line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = _tmp14_;
-#line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 309 "LibraryFiles.c"
-			goto __finally463;
+#line 432 "LibraryFiles.c"
+			goto __finally472;
 		}
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 314 "LibraryFiles.c"
+#line 437 "LibraryFiles.c"
 	}
-	__finally463:
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally472:
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dir);
-#line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 45 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 325 "LibraryFiles.c"
+#line 448 "LibraryFiles.c"
 	}
-#line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp15_ = basename;
-#line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp16_ = library_files_convert_basename (_tmp15_);
-#line 39 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 55 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	newbasename = _tmp16_;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp18_ = dir;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp20_ = generate_unique_file (_tmp18_, newbasename, &_tmp19_, &_inner_error_);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_vala_collision = _tmp19_;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp17_ = _tmp20_;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (newbasename);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dir);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 351 "LibraryFiles.c"
+#line 474 "LibraryFiles.c"
 	}
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp21_ = _tmp17_;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp17_ = NULL;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	result = _tmp21_;
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_object_unref0 (_tmp17_);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (newbasename);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_object_unref0 (dir);
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (collision) {
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		*collision = _vala_collision;
-#line 369 "LibraryFiles.c"
+#line 492 "LibraryFiles.c"
 	}
-#line 41 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 373 "LibraryFiles.c"
+#line 496 "LibraryFiles.c"
 }
 
 
@@ -379,44 +502,44 @@ gchar* library_files_convert_basename (const gchar* basename) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 46 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (basename != NULL, NULL);
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp1_ = _tmp0_;
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp2_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp3_ = _tmp2_;
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_object_unref0 (_tmp1_);
-#line 47 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 63 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp3_) {
-#line 397 "LibraryFiles.c"
+#line 520 "LibraryFiles.c"
 		const gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp4_ = basename;
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		result = _tmp5_;
-#line 48 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 64 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return result;
-#line 408 "LibraryFiles.c"
+#line 531 "LibraryFiles.c"
 	} else {
 		const gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp6_ = basename;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		result = _tmp7_;
-#line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return result;
-#line 420 "LibraryFiles.c"
+#line 543 "LibraryFiles.c"
 	}
 }
 
@@ -440,32 +563,32 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 	GFile* _tmp35_;
 	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 73 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	g_return_val_if_fail (G_IS_FILE (src), NULL);
-#line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	timestamp = (time_t) 0;
-#line 448 "LibraryFiles.c"
+#line 571 "LibraryFiles.c"
 	{
 		time_t _tmp0_ = 0;
 		GFile* _tmp1_;
 		time_t _tmp2_;
-#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp1_ = src;
-#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp2_ = query_file_modified (_tmp1_, &_inner_error_);
-#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp0_ = _tmp2_;
-#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 461 "LibraryFiles.c"
-			goto __catch464_g_error;
+#line 584 "LibraryFiles.c"
+			goto __catch473_g_error;
 		}
-#line 60 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
-#line 466 "LibraryFiles.c"
+#line 589 "LibraryFiles.c"
 	}
-	goto __finally464;
-	__catch464_g_error:
+	goto __finally473;
+	__catch473_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp3_;
@@ -473,112 +596,112 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		gchar* _tmp5_;
 		GError* _tmp6_;
 		const gchar* _tmp7_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp3_ = src;
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp5_ = _tmp4_;
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp6_ = err;
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp7_ = _tmp6_->message;
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_critical ("LibraryFiles.vala:62: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
-#line 62 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("LibraryFiles.vala:78: Unable to access file modification for %s: %s", _tmp5_, _tmp7_);
+#line 78 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp5_);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 497 "LibraryFiles.c"
+#line 620 "LibraryFiles.c"
 	}
-	__finally464:
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally473:
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 75 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 506 "LibraryFiles.c"
+#line 629 "LibraryFiles.c"
 	}
-#line 65 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	metadata = NULL;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp8_ = src;
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp9_ = video_reader_is_supported_video_file (_tmp8_);
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp9_) {
-#line 516 "LibraryFiles.c"
+#line 639 "LibraryFiles.c"
 		VideoReader* reader = NULL;
 		GFile* _tmp10_;
 		VideoReader* _tmp11_;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp10_ = src;
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp11_ = video_reader_new (_tmp10_);
-#line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp11_;
-#line 526 "LibraryFiles.c"
+#line 649 "LibraryFiles.c"
 		{
 			VideoMetadata* _tmp12_ = NULL;
 			VideoReader* _tmp13_;
 			VideoMetadata* _tmp14_;
 			VideoMetadata* _tmp15_;
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp13_ = reader;
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp14_ = video_reader_read_metadata (_tmp13_, &_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = _tmp14_;
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 540 "LibraryFiles.c"
-				goto __catch465_g_error;
+#line 663 "LibraryFiles.c"
+				goto __catch474_g_error;
 			}
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp12_ = NULL;
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 69 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp12_);
-#line 553 "LibraryFiles.c"
+#line 676 "LibraryFiles.c"
 		}
-		goto __finally465;
-		__catch465_g_error:
+		goto __finally474;
+		__catch474_g_error:
 		{
 			GError* err = NULL;
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 565 "LibraryFiles.c"
+#line 688 "LibraryFiles.c"
 		}
-		__finally465:
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally474:
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_video_reader_unref0 (reader);
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 68 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 578 "LibraryFiles.c"
+#line 701 "LibraryFiles.c"
 		}
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_video_reader_unref0 (reader);
-#line 582 "LibraryFiles.c"
+#line 705 "LibraryFiles.c"
 	} else {
 		PhotoFileReader* reader = NULL;
 		GFile* _tmp16_;
@@ -588,378 +711,803 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		gchar* _tmp20_;
 		PhotoFileReader* _tmp21_;
 		PhotoFileReader* _tmp22_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp16_ = src;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp17_ = photo_file_format_get_by_file_extension (_tmp16_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp18_ = src;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp20_ = _tmp19_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp21_ = photo_file_format_create_reader (_tmp17_, _tmp20_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp22_ = _tmp21_;
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_free0 (_tmp20_);
-#line 74 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 90 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		reader = _tmp22_;
-#line 610 "LibraryFiles.c"
+#line 733 "LibraryFiles.c"
 		{
 			PhotoMetadata* _tmp23_ = NULL;
 			PhotoFileReader* _tmp24_;
 			PhotoMetadata* _tmp25_;
 			PhotoMetadata* _tmp26_;
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp24_ = reader;
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp25_ = photo_file_reader_read_metadata (_tmp24_, &_inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = _tmp25_;
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 624 "LibraryFiles.c"
-				goto __catch466_g_error;
+#line 747 "LibraryFiles.c"
+				goto __catch475_g_error;
 			}
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp23_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 77 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			metadata = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_METADATA, MediaMetadata);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (_tmp23_);
-#line 637 "LibraryFiles.c"
+#line 760 "LibraryFiles.c"
 		}
-		goto __finally466;
-		__catch466_g_error:
+		goto __finally475;
+		__catch475_g_error:
 		{
 			GError* err = NULL;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			err = _inner_error_;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_inner_error_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
-#line 649 "LibraryFiles.c"
+#line 772 "LibraryFiles.c"
 		}
-		__finally466:
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		__finally475:
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			g_propagate_error (error, _inner_error_);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_media_metadata_unref0 (metadata);
-#line 76 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			return NULL;
-#line 662 "LibraryFiles.c"
+#line 785 "LibraryFiles.c"
 		}
-#line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 666 "LibraryFiles.c"
+#line 789 "LibraryFiles.c"
 	}
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp27_ = src;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp28_ = g_file_get_basename (_tmp27_);
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp29_ = _tmp28_;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp30_ = metadata;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp31_ = timestamp;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp33_ = library_files_generate_unique_file (_tmp29_, _tmp30_, _tmp31_, &_tmp32_, &_inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	collision = _tmp32_;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp34_ = _tmp33_;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_g_free0 (_tmp29_);
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	dest = _tmp34_;
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 84 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 100 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 696 "LibraryFiles.c"
+#line 819 "LibraryFiles.c"
 	}
-#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 101 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp35_ = dest;
-#line 85 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 101 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp35_ == NULL) {
-#line 702 "LibraryFiles.c"
+#line 825 "LibraryFiles.c"
 		GError* _tmp36_;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp36_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_FAILED, "Unable to generate unique pathname for destination");
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = _tmp36_;
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 86 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 716 "LibraryFiles.c"
+#line 839 "LibraryFiles.c"
 	}
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_tmp37_ = blacklist;
-#line 88 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (_tmp37_) {
-#line 722 "LibraryFiles.c"
+#line 845 "LibraryFiles.c"
 		GFile* _tmp38_;
-#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp38_ = dest;
-#line 89 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		library_monitor_blacklist_file (_tmp38_, "LibraryFiles.duplicate");
-#line 728 "LibraryFiles.c"
+#line 851 "LibraryFiles.c"
 	}
 	{
-		GFile* _tmp39_;
-		GFile* _tmp40_;
-		GFileProgressCallback _tmp41_;
-		void* _tmp41__target;
-		gboolean _tmp42_;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp39_ = src;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp40_ = dest;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp41_ = progress_callback;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp41__target = progress_callback_target;
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_file_copy (_tmp39_, _tmp40_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, _tmp41_, _tmp41__target, &_inner_error_);
-#line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 748 "LibraryFiles.c"
-			goto __catch467_g_error;
-		}
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp42_ = blacklist;
-#line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (_tmp42_) {
-#line 755 "LibraryFiles.c"
+		gboolean _tmp39_;
+		gboolean _tmp46_;
+#line 108 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp39_ = library_files_use_fallback_copy_func;
+#line 108 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (_tmp39_) {
+#line 860 "LibraryFiles.c"
+			GFile* _tmp40_;
+			GFile* _tmp41_;
+			GFileProgressCallback _tmp42_;
+			void* _tmp42__target;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp40_ = src;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp41_ = dest;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp42_ = progress_callback;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp42__target = progress_callback_target;
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			library_files_fallback_copy (_tmp40_, _tmp41_, _tmp42_, _tmp42__target, &_inner_error_);
+#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 877 "LibraryFiles.c"
+				goto __catch476_g_error;
+			}
+		} else {
 			GFile* _tmp43_;
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp43_ = dest;
-#line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			library_monitor_unblacklist_file (_tmp43_);
-#line 761 "LibraryFiles.c"
+			GFile* _tmp44_;
+			GFileProgressCallback _tmp45_;
+			void* _tmp45__target;
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp43_ = src;
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp44_ = dest;
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp45_ = progress_callback;
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp45__target = progress_callback_target;
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_file_copy (_tmp43_, _tmp44_, G_FILE_COPY_ALL_METADATA | G_FILE_COPY_OVERWRITE, NULL, _tmp45_, _tmp45__target, &_inner_error_);
+#line 111 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 897 "LibraryFiles.c"
+				goto __catch476_g_error;
+			}
+		}
+#line 113 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp46_ = blacklist;
+#line 113 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (_tmp46_) {
+#line 905 "LibraryFiles.c"
+			GFile* _tmp47_;
+#line 114 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp47_ = dest;
+#line 114 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			library_monitor_unblacklist_file (_tmp47_);
+#line 911 "LibraryFiles.c"
 		}
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally476;
+	__catch476_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp44_;
-		gchar* _tmp45_;
-		gchar* _tmp46_;
-		GError* _tmp47_;
-		const gchar* _tmp48_;
-		gboolean _tmp49_ = FALSE;
-		gboolean _tmp50_;
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFile* _tmp48_;
+		gchar* _tmp49_;
+		gchar* _tmp50_;
+		GError* _tmp51_;
+		const gchar* _tmp52_;
+		gboolean _tmp53_ = FALSE;
+		gboolean _tmp54_;
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp44_ = src;
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp45_ = g_file_get_path (_tmp44_);
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp46_ = _tmp45_;
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp47_ = err;
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp48_ = _tmp47_->message;
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_message ("LibraryFiles.vala:96: There was a problem copying %s: %s", _tmp46_, _tmp48_);
-#line 96 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_g_free0 (_tmp46_);
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp50_ = blacklist;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (_tmp50_) {
-#line 797 "LibraryFiles.c"
-			gchar* _tmp51_ = NULL;
-			GFile* _tmp52_;
-			gchar* _tmp53_;
-			gchar* _tmp54_ = NULL;
-			GFile* _tmp55_;
-			gchar* _tmp56_;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp52_ = src;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp53_ = md5_file (_tmp52_, &_inner_error_);
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp51_ = _tmp53_;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp48_ = src;
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp49_ = g_file_get_path (_tmp48_);
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp50_ = _tmp49_;
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp51_ = err;
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp52_ = _tmp51_->message;
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_message ("LibraryFiles.vala:116: There was a problem copying %s: %s", _tmp50_, _tmp52_);
+#line 116 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp50_);
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp54_ = blacklist;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (_tmp54_) {
+#line 947 "LibraryFiles.c"
+			gchar* _tmp55_ = NULL;
+			GFile* _tmp56_;
+			gchar* _tmp57_;
+			gchar* _tmp58_ = NULL;
+			GFile* _tmp59_;
+			gchar* _tmp60_;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp56_ = src;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp57_ = md5_file (_tmp56_, &_inner_error_);
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp55_ = _tmp57_;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 814 "LibraryFiles.c"
-				goto __finally467;
+#line 964 "LibraryFiles.c"
+				goto __finally476;
 			}
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp55_ = dest;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp56_ = md5_file (_tmp55_, &_inner_error_);
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp54_ = _tmp56_;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp59_ = dest;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp60_ = md5_file (_tmp59_, &_inner_error_);
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp58_ = _tmp60_;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-				_g_free0 (_tmp51_);
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_g_free0 (_tmp55_);
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
-#line 829 "LibraryFiles.c"
-				goto __finally467;
+#line 979 "LibraryFiles.c"
+				goto __finally476;
 			}
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp49_ = g_strcmp0 (_tmp51_, _tmp54_) != 0;
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp54_);
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_g_free0 (_tmp51_);
-#line 838 "LibraryFiles.c"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp53_ = g_strcmp0 (_tmp55_, _tmp58_) != 0;
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_g_free0 (_tmp58_);
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_g_free0 (_tmp55_);
+#line 988 "LibraryFiles.c"
 		} else {
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp49_ = FALSE;
-#line 842 "LibraryFiles.c"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp53_ = FALSE;
+#line 992 "LibraryFiles.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (_tmp49_) {
-#line 846 "LibraryFiles.c"
-			GFile* _tmp57_;
-#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			_tmp57_ = dest;
-#line 98 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			library_monitor_unblacklist_file (_tmp57_);
-#line 852 "LibraryFiles.c"
+#line 117 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (_tmp53_) {
+#line 996 "LibraryFiles.c"
+			GFile* _tmp61_;
+#line 118 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp61_ = dest;
+#line 118 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			library_monitor_unblacklist_file (_tmp61_);
+#line 1002 "LibraryFiles.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 856 "LibraryFiles.c"
+#line 1006 "LibraryFiles.c"
 	}
-	__finally467:
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally476:
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 91 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 107 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 869 "LibraryFiles.c"
+#line 1019 "LibraryFiles.c"
 	}
 	{
 		GFileInfo* info = NULL;
-		GFile* _tmp58_;
-		GFileInfo* _tmp59_;
+		GFile* _tmp62_;
+		GFileInfo* _tmp63_;
 		guint32 mode = 0U;
-		GFileInfo* _tmp60_;
-		guint32 _tmp61_;
-		gboolean _tmp62_ = FALSE;
-		GFile* _tmp63_;
-		guint32 _tmp64_;
-		gboolean _tmp65_;
-#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp58_ = dest;
-#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp59_ = g_file_query_info (_tmp58_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		info = _tmp59_;
-#line 103 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GFileInfo* _tmp64_;
+		guint32 _tmp65_;
+		gboolean _tmp66_ = FALSE;
+		GFile* _tmp67_;
+		guint32 _tmp68_;
+		gboolean _tmp69_;
+#line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp62_ = dest;
+#line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp63_ = g_file_query_info (_tmp62_, G_FILE_ATTRIBUTE_UNIX_MODE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		info = _tmp63_;
+#line 123 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 890 "LibraryFiles.c"
-			goto __catch468_g_error;
+#line 1040 "LibraryFiles.c"
+			goto __catch477_g_error;
 		}
-#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp60_ = info;
-#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp61_ = g_file_info_get_attribute_uint32 (_tmp60_, G_FILE_ATTRIBUTE_UNIX_MODE);
-#line 104 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		mode = _tmp61_ | 0600;
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp63_ = dest;
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp64_ = mode;
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp65_ = g_file_set_attribute_uint32 (_tmp63_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp64_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp62_ = _tmp65_;
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp64_ = info;
+#line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp65_ = g_file_info_get_attribute_uint32 (_tmp64_, G_FILE_ATTRIBUTE_UNIX_MODE);
+#line 124 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		mode = _tmp65_ | 0600;
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp67_ = dest;
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp68_ = mode;
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp69_ = g_file_set_attribute_uint32 (_tmp67_, G_FILE_ATTRIBUTE_UNIX_MODE, _tmp68_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp66_ = _tmp69_;
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
-#line 911 "LibraryFiles.c"
-			goto __catch468_g_error;
+#line 1061 "LibraryFiles.c"
+			goto __catch477_g_error;
 		}
-#line 105 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		if (!_tmp62_) {
-#line 106 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-			g_warning ("LibraryFiles.vala:106: Could not make file writable");
-#line 918 "LibraryFiles.c"
+#line 125 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (!_tmp66_) {
+#line 126 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_warning ("LibraryFiles.vala:126: Could not make file writable");
+#line 1068 "LibraryFiles.c"
 		}
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (info);
-#line 922 "LibraryFiles.c"
+#line 1072 "LibraryFiles.c"
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally477;
+	__catch477_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp66_;
-		const gchar* _tmp67_;
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		GError* _tmp70_;
+		const gchar* _tmp71_;
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		err = _inner_error_;
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_inner_error_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp66_ = err;
-#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		_tmp67_ = _tmp66_->message;
-#line 109 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
-		g_warning ("LibraryFiles.vala:109: Could not make file writable: %s", _tmp67_);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp70_ = err;
+#line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp71_ = _tmp70_->message;
+#line 129 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_warning ("LibraryFiles.vala:129: Could not make file writable: %s", _tmp71_);
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
-#line 942 "LibraryFiles.c"
+#line 1092 "LibraryFiles.c"
 	}
-	__finally468:
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	__finally477:
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		g_propagate_error (error, _inner_error_);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_object_unref0 (dest);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_media_metadata_unref0 (metadata);
-#line 102 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 122 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		return NULL;
-#line 955 "LibraryFiles.c"
+#line 1105 "LibraryFiles.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 132 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	result = dest;
-#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 132 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	_media_metadata_unref0 (metadata);
-#line 112 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+#line 132 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	return result;
-#line 963 "LibraryFiles.c"
+#line 1113 "LibraryFiles.c"
+}
+
+
+void library_files_fallback_copy (GFile* src, GFile* dst, GFileProgressCallback callback, void* callback_target, GError** error) {
+	gboolean _tmp0_ = FALSE;
+	GFile* _tmp1_;
+	FILE* f = NULL;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	FILE* _tmp6_;
+	FILE* _tmp7_;
+	FILE* _tmp8_;
+	GError * _inner_error_ = NULL;
+#line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	g_return_if_fail ((src == NULL) || G_IS_FILE (src));
+#line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	g_return_if_fail ((dst == NULL) || G_IS_FILE (dst));
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp1_ = src;
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (_tmp1_ == NULL) {
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp0_ = TRUE;
+#line 1138 "LibraryFiles.c"
+	} else {
+		GFile* _tmp2_;
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp2_ = dst;
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp0_ = _tmp2_ == NULL;
+#line 1145 "LibraryFiles.c"
+	}
+#line 136 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (_tmp0_) {
+#line 137 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return;
+#line 1151 "LibraryFiles.c"
+	}
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp3_ = src;
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp4_ = g_file_get_path (_tmp3_);
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp5_ = _tmp4_;
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp6_ = g_fopen (_tmp5_, "rb");
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp7_ = _tmp6_;
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_g_free0 (_tmp5_);
+#line 140 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	f = _tmp7_;
+#line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_tmp8_ = f;
+#line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	if (_tmp8_ != NULL) {
+#line 1171 "LibraryFiles.c"
+		FILE* _tmp9_;
+		glong size = 0L;
+		FILE* _tmp10_;
+		glong _tmp11_;
+		FILE* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GFile* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		glong _tmp19_;
+		FILE* g = NULL;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		FILE* _tmp23_;
+		FILE* _tmp24_;
+		FILE* _tmp25_;
+#line 142 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp9_ = f;
+#line 142 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		fseek (_tmp9_, (glong) 0, SEEK_END);
+#line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp10_ = f;
+#line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp11_ = ftell (_tmp10_);
+#line 143 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		size = _tmp11_;
+#line 144 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp12_ = f;
+#line 144 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		fseek (_tmp12_, (glong) 0, SEEK_SET);
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp13_ = src;
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp14_ = g_file_get_path (_tmp13_);
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp15_ = _tmp14_;
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp16_ = dst;
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp17_ = g_file_get_path (_tmp16_);
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp18_ = _tmp17_;
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp19_ = size;
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_debug ("LibraryFiles.vala:145: Copying %s to %s, size is %ld", _tmp15_, _tmp18_, _tmp19_);
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp18_);
+#line 145 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp15_);
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp20_ = dst;
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp21_ = g_file_get_path (_tmp20_);
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp22_ = _tmp21_;
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp23_ = g_fopen (_tmp22_, "wb");
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp24_ = _tmp23_;
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp22_);
+#line 147 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g = _tmp24_;
+#line 148 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp25_ = g;
+#line 148 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		if (_tmp25_ != NULL) {
+#line 1243 "LibraryFiles.c"
+			guint8 buffer[4096] = {0};
+			gsize written = 0UL;
+#line 150 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			written = (gsize) 0;
+#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			while (TRUE) {
+#line 1250 "LibraryFiles.c"
+				FILE* _tmp26_;
+				gboolean _tmp27_;
+				gsize len = 0UL;
+				FILE* _tmp28_;
+				gsize _tmp29_;
+				gsize _tmp30_;
+#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_tmp26_ = f;
+#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_tmp27_ = feof (_tmp26_);
+#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				if (!(!_tmp27_)) {
+#line 152 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					break;
+#line 1265 "LibraryFiles.c"
+				}
+#line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_tmp28_ = f;
+#line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_tmp29_ = fread (buffer, (gsize) 1, 4096, _tmp28_);
+#line 153 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				len = _tmp29_;
+#line 154 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				_tmp30_ = len;
+#line 154 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+				if (_tmp30_ > ((gsize) 0)) {
+#line 1277 "LibraryFiles.c"
+					gsize out_len = 0UL;
+					FILE* _tmp31_;
+					gsize _tmp32_;
+					gsize _tmp33_;
+					gsize _tmp34_;
+					gsize _tmp43_;
+					gsize _tmp44_;
+					GFileProgressCallback _tmp45_;
+					void* _tmp45__target;
+#line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp31_ = g;
+#line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp32_ = len;
+#line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp33_ = fwrite (buffer + 0, (gsize) 1, ((gint) _tmp32_) - 0, _tmp31_);
+#line 155 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					out_len = _tmp33_;
+#line 156 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp34_ = out_len;
+#line 156 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					if (_tmp34_ < ((gsize) 0)) {
+#line 1299 "LibraryFiles.c"
+						GFile* _tmp35_;
+						gchar* _tmp36_;
+						gchar* _tmp37_;
+						GFile* _tmp38_;
+						gchar* _tmp39_;
+						gchar* _tmp40_;
+						GError* _tmp41_;
+						GError* _tmp42_;
+#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp35_ = dst;
+#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp36_ = g_file_get_path (_tmp35_);
+#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp37_ = _tmp36_;
+#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						g_critical ("LibraryFiles.vala:157: Failed to write to file %s: %m", _tmp37_);
+#line 157 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_g_free0 (_tmp37_);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp38_ = dst;
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp39_ = g_file_get_path (_tmp38_);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp40_ = _tmp39_;
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp41_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to write to %s", _tmp40_);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp42_ = _tmp41_;
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_g_free0 (_tmp40_);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_inner_error_ = _tmp42_;
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						g_propagate_error (error, _inner_error_);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_fclose0 (g);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_fclose0 (f);
+#line 158 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						return;
+#line 1340 "LibraryFiles.c"
+					}
+#line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp43_ = written;
+#line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp44_ = len;
+#line 160 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					written = _tmp43_ + _tmp44_;
+#line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp45_ = callback;
+#line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp45__target = callback_target;
+#line 162 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					if (_tmp45_ != NULL) {
+#line 1354 "LibraryFiles.c"
+						GFileProgressCallback _tmp46_;
+						void* _tmp46__target;
+						gsize _tmp47_;
+						glong _tmp48_;
+#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp46_ = callback;
+#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp46__target = callback_target;
+#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp47_ = written;
+#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp48_ = size;
+#line 163 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp46_ ((gint64) _tmp47_, (gint64) _tmp48_, _tmp46__target);
+#line 1369 "LibraryFiles.c"
+					}
+				} else {
+					gsize _tmp49_;
+#line 164 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					_tmp49_ = len;
+#line 164 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+					if (_tmp49_ < ((gsize) 0)) {
+#line 1377 "LibraryFiles.c"
+						GFile* _tmp50_;
+						gchar* _tmp51_;
+						gchar* _tmp52_;
+						GFile* _tmp53_;
+						gchar* _tmp54_;
+						gchar* _tmp55_;
+						GError* _tmp56_;
+						GError* _tmp57_;
+#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp50_ = src;
+#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp51_ = g_file_get_path (_tmp50_);
+#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp52_ = _tmp51_;
+#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						g_critical ("LibraryFiles.vala:165: Failed to read from file %s: %m", _tmp52_);
+#line 165 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_g_free0 (_tmp52_);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp53_ = src;
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp54_ = g_file_get_path (_tmp53_);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp55_ = _tmp54_;
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp56_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to read from %s", _tmp55_);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_tmp57_ = _tmp56_;
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_g_free0 (_tmp55_);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_inner_error_ = _tmp57_;
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						g_propagate_error (error, _inner_error_);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_fclose0 (g);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						_fclose0 (f);
+#line 166 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+						return;
+#line 1418 "LibraryFiles.c"
+					}
+				}
+			}
+		} else {
+			GFile* _tmp58_;
+			gchar* _tmp59_;
+			gchar* _tmp60_;
+			GFile* _tmp61_;
+			gchar* _tmp62_;
+			gchar* _tmp63_;
+			GError* _tmp64_;
+			GError* _tmp65_;
+#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp58_ = dst;
+#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp59_ = g_file_get_path (_tmp58_);
+#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp60_ = _tmp59_;
+#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_critical ("LibraryFiles.vala:170: Failed to open %s: %m", _tmp60_);
+#line 170 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_g_free0 (_tmp60_);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp61_ = dst;
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp62_ = g_file_get_path (_tmp61_);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp63_ = _tmp62_;
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp64_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp63_);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_tmp65_ = _tmp64_;
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_g_free0 (_tmp63_);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_inner_error_ = _tmp65_;
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			g_propagate_error (error, _inner_error_);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_fclose0 (g);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			_fclose0 (f);
+#line 171 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+			return;
+#line 1463 "LibraryFiles.c"
+		}
+#line 141 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_fclose0 (g);
+#line 1467 "LibraryFiles.c"
+	} else {
+		GFile* _tmp66_;
+		gchar* _tmp67_;
+		gchar* _tmp68_;
+		GFile* _tmp69_;
+		gchar* _tmp70_;
+		gchar* _tmp71_;
+		GError* _tmp72_;
+		GError* _tmp73_;
+#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp66_ = src;
+#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp67_ = g_file_get_path (_tmp66_);
+#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp68_ = _tmp67_;
+#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_critical ("LibraryFiles.vala:174: Failed to open %s: %m", _tmp68_);
+#line 174 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp68_);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp69_ = src;
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp70_ = g_file_get_path (_tmp69_);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp71_ = _tmp70_;
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp72_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to open %s", _tmp71_);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_tmp73_ = _tmp72_;
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_g_free0 (_tmp71_);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_inner_error_ = _tmp73_;
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		g_propagate_error (error, _inner_error_);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		_fclose0 (f);
+#line 175 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+		return;
+#line 1507 "LibraryFiles.c"
+	}
+#line 135 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
+	_fclose0 (f);
+#line 1511 "LibraryFiles.c"
 }
 
 
diff --git a/src/LibraryFiles.vala b/src/LibraryFiles.vala
index a49b77b..bbacb6c 100644
--- a/src/LibraryFiles.vala
+++ b/src/LibraryFiles.vala
@@ -6,6 +6,22 @@
 
 namespace LibraryFiles {
 
+static bool use_fallback_copy_func = false;
+
+public void select_copy_function() {
+    var import_dir = AppDirs.get_import_dir();
+
+    try {
+        var info = import_dir.query_filesystem_info("filesystem::type", null);
+        use_fallback_copy_func = info.get_attribute_as_string("filesystem::type") == "nfs";
+    } catch (Error error) {
+        critical ("Failed to query fs type: %s", error.message);
+        use_fallback_copy_func = true;
+    }
+
+    info ("Using fallback copy: %s", use_fallback_copy_func.to_string());
+}
+
 // This method uses global::generate_unique_file_at in order to "claim" a file in the filesystem.
 // Thus, when the method returns success a file may exist already, and should be overwritten.
 //
@@ -89,7 +105,11 @@ private File duplicate(File src, FileProgressCallback? progress_callback, bool b
         LibraryMonitor.blacklist_file(dest, "LibraryFiles.duplicate");
     
     try {
-        src.copy(dest, FileCopyFlags.ALL_METADATA | FileCopyFlags.OVERWRITE, null, progress_callback);
+        if (use_fallback_copy_func) {
+            fallback_copy(src, dest, progress_callback);
+        } else {
+            src.copy(dest, FileCopyFlags.ALL_METADATA | FileCopyFlags.OVERWRITE, null, progress_callback);
+        }
         if (blacklist)
             LibraryMonitor.unblacklist_file(dest);
     } catch (Error err) {
@@ -111,4 +131,48 @@ private File duplicate(File src, FileProgressCallback? progress_callback, bool b
     
     return dest;
 }
+
+public void fallback_copy(File? src, File? dst, FileProgressCallback? callback) throws Error {
+    if (src == null || dst == null) {
+        return;
+    }
+
+    var f = FileStream.open(src.get_path(), "rb");
+    if (f != null) {
+        f.seek(0, FileSeek.END);
+        var size = f.tell();
+        f.seek(0, FileSeek.SET);
+        debug ("Copying %s to %s, size is %ld", src.get_path(), dst.get_path(), size);
+
+        var g = FileStream.open(dst.get_path(), "wb");
+        if (g != null) {
+            uint8 buffer[4096];
+            size_t written = 0;
+
+            while (!f.eof()) {
+                var len = f.read(buffer);
+                if (len > 0) {
+                    var out_len = g.write(buffer[0:len]);
+                    if (out_len < 0) {
+                        critical("Failed to write to file %s: %m", dst.get_path());
+                        throw new IOError.FAILED("Failed to write to %s", dst.get_path());
+                    }
+                    written += len;
+
+                    if (callback != null)
+                        callback (written, size);
+                } else if (len < 0) {
+                    critical("Failed to read from file %s: %m", src.get_path());
+                    throw new IOError.FAILED("Failed to read from %s", src.get_path());
+                }
+            }
+        } else {
+            critical ("Failed to open %s: %m", dst.get_path());
+            throw new IOError.FAILED("Failed to open %s", dst.get_path());
+        }
+    } else {
+        critical ("Failed to open %s: %m", src.get_path());
+        throw new IOError.FAILED("Failed to open %s", src.get_path());
+    }
+}
 }
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index 7cc9ef6..123f726 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -813,6 +813,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -1084,7 +1085,7 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou
 static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
 GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
-static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES
 #define DIRECTORY_MONITOR_FILE_INFO_FLAGS G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
@@ -1110,8 +1111,8 @@ void value_set_batch_import_job (GValue* value, gpointer v_object);
 void value_take_batch_import_job (GValue* value, gpointer v_object);
 gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
 GType file_import_job_get_type (void) G_GNUC_CONST;
 gpointer import_manifest_ref (gpointer instance);
 void import_manifest_unref (gpointer instance);
@@ -1233,14 +1234,14 @@ static LibraryMonitorPool* library_monitor_pool_construct (GType object_type) {
 	self = (LibraryMonitorPool*) g_type_create_instance (object_type);
 #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 1237 "LibraryMonitor.c"
+#line 1238 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorPool* library_monitor_pool_new (void) {
 #line 38 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_pool_construct (TYPE_LIBRARY_MONITOR_POOL);
-#line 1244 "LibraryMonitor.c"
+#line 1245 "LibraryMonitor.c"
 }
 
 
@@ -1254,26 +1255,26 @@ void library_monitor_pool_terminate (void) {
 	_tmp0_ = library_monitor_pool_instance;
 #line 45 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_ != NULL) {
-#line 1258 "LibraryMonitor.c"
+#line 1259 "LibraryMonitor.c"
 		LibraryMonitorPool* _tmp1_;
 #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = library_monitor_pool_instance;
 #line 46 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_close (_tmp1_);
-#line 1264 "LibraryMonitor.c"
+#line 1265 "LibraryMonitor.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_library_monitor_pool_unref0 (library_monitor_pool_instance);
 #line 48 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_pool_instance = NULL;
-#line 1270 "LibraryMonitor.c"
+#line 1271 "LibraryMonitor.c"
 }
 
 
 static gpointer _library_monitor_pool_ref0 (gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? library_monitor_pool_ref (self) : NULL;
-#line 1277 "LibraryMonitor.c"
+#line 1278 "LibraryMonitor.c"
 }
 
 
@@ -1286,7 +1287,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) {
 	_tmp0_ = library_monitor_pool_instance;
 #line 52 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_ == NULL) {
-#line 1290 "LibraryMonitor.c"
+#line 1291 "LibraryMonitor.c"
 		LibraryMonitorPool* _tmp1_;
 #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = library_monitor_pool_new ();
@@ -1294,7 +1295,7 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) {
 		_library_monitor_pool_unref0 (library_monitor_pool_instance);
 #line 53 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_instance = _tmp1_;
-#line 1298 "LibraryMonitor.c"
+#line 1299 "LibraryMonitor.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp2_ = library_monitor_pool_instance;
@@ -1304,14 +1305,14 @@ LibraryMonitorPool* library_monitor_pool_get_instance (void) {
 	result = _tmp3_;
 #line 55 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1308 "LibraryMonitor.c"
+#line 1309 "LibraryMonitor.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1315 "LibraryMonitor.c"
+#line 1316 "LibraryMonitor.c"
 }
 
 
@@ -1329,7 +1330,7 @@ LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self) {
 	result = _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1333 "LibraryMonitor.c"
+#line 1334 "LibraryMonitor.c"
 }
 
 
@@ -1338,7 +1339,7 @@ static gboolean _library_monitor_pool_on_start_monitor_gsource_func (gpointer se
 	result = library_monitor_pool_on_start_monitor ((LibraryMonitorPool*) self);
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1342 "LibraryMonitor.c"
+#line 1343 "LibraryMonitor.c"
 }
 
 
@@ -1366,21 +1367,21 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep
 	_tmp3_ = start_msec_delay;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ > 0) {
-#line 1370 "LibraryMonitor.c"
+#line 1371 "LibraryMonitor.c"
 		guint _tmp4_;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->timer_id;
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = _tmp4_ == ((guint) 0);
-#line 1376 "LibraryMonitor.c"
+#line 1377 "LibraryMonitor.c"
 	} else {
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = FALSE;
-#line 1380 "LibraryMonitor.c"
+#line 1381 "LibraryMonitor.c"
 	}
 #line 67 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp2_) {
-#line 1384 "LibraryMonitor.c"
+#line 1385 "LibraryMonitor.c"
 		gint _tmp5_;
 		guint _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -1389,13 +1390,13 @@ void library_monitor_pool_replace (LibraryMonitorPool* self, LibraryMonitor* rep
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _library_monitor_pool_on_start_monitor_gsource_func, library_monitor_pool_ref (self), library_monitor_pool_unref);
 #line 68 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->timer_id = _tmp6_;
-#line 1393 "LibraryMonitor.c"
+#line 1394 "LibraryMonitor.c"
 	}
 #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp7_ = self->priv->monitor;
 #line 70 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL], 0, _tmp7_);
-#line 1399 "LibraryMonitor.c"
+#line 1400 "LibraryMonitor.c"
 }
 
 
@@ -1414,7 +1415,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) {
 	if (_tmp0_ == NULL) {
 #line 75 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 1418 "LibraryMonitor.c"
+#line 1419 "LibraryMonitor.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp1_ = self->priv->monitor;
@@ -1436,7 +1437,7 @@ static void library_monitor_pool_close (LibraryMonitorPool* self) {
 	g_signal_emit (self, library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL], 0, _tmp4_);
 #line 73 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (closed);
-#line 1440 "LibraryMonitor.c"
+#line 1441 "LibraryMonitor.c"
 }
 
 
@@ -1456,7 +1457,7 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self)
 		result = FALSE;
 #line 89 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 1460 "LibraryMonitor.c"
+#line 1461 "LibraryMonitor.c"
 	}
 #line 91 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp1_ = self->priv->monitor;
@@ -1466,14 +1467,14 @@ static gboolean library_monitor_pool_on_start_monitor (LibraryMonitorPool* self)
 	result = FALSE;
 #line 93 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1470 "LibraryMonitor.c"
+#line 1471 "LibraryMonitor.c"
 }
 
 
 static void value_library_monitor_pool_init (GValue* value) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 1477 "LibraryMonitor.c"
+#line 1478 "LibraryMonitor.c"
 }
 
 
@@ -1482,7 +1483,7 @@ static void value_library_monitor_pool_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (value->data[0].v_pointer);
-#line 1486 "LibraryMonitor.c"
+#line 1487 "LibraryMonitor.c"
 	}
 }
 
@@ -1492,11 +1493,11 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal
 	if (src_value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = library_monitor_pool_ref (src_value->data[0].v_pointer);
-#line 1496 "LibraryMonitor.c"
+#line 1497 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1500 "LibraryMonitor.c"
+#line 1501 "LibraryMonitor.c"
 	}
 }
 
@@ -1504,37 +1505,37 @@ static void value_library_monitor_pool_copy_value (const GValue* src_value, GVal
 static gpointer value_library_monitor_pool_peek_pointer (const GValue* value) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 1508 "LibraryMonitor.c"
+#line 1509 "LibraryMonitor.c"
 }
 
 
 static gchar* value_library_monitor_pool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 1515 "LibraryMonitor.c"
+#line 1516 "LibraryMonitor.c"
 		LibraryMonitorPool * object;
 		object = collect_values[0].v_pointer;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1522 "LibraryMonitor.c"
+#line 1523 "LibraryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.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 1526 "LibraryMonitor.c"
+#line 1527 "LibraryMonitor.c"
 		}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = library_monitor_pool_ref (object);
-#line 1530 "LibraryMonitor.c"
+#line 1531 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1534 "LibraryMonitor.c"
+#line 1535 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 1538 "LibraryMonitor.c"
+#line 1539 "LibraryMonitor.c"
 }
 
 
@@ -1545,25 +1546,25 @@ static gchar* value_library_monitor_pool_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1549 "LibraryMonitor.c"
+#line 1550 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = NULL;
-#line 1555 "LibraryMonitor.c"
+#line 1556 "LibraryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1559 "LibraryMonitor.c"
+#line 1560 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = library_monitor_pool_ref (value->data[0].v_pointer);
-#line 1563 "LibraryMonitor.c"
+#line 1564 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 1567 "LibraryMonitor.c"
+#line 1568 "LibraryMonitor.c"
 }
 
 
@@ -1577,7 +1578,7 @@ GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nic
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 1581 "LibraryMonitor.c"
+#line 1582 "LibraryMonitor.c"
 }
 
 
@@ -1586,7 +1587,7 @@ gpointer value_get_library_monitor_pool (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_LIBRARY_MONITOR_POOL), NULL);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 1590 "LibraryMonitor.c"
+#line 1591 "LibraryMonitor.c"
 }
 
 
@@ -1606,17 +1607,17 @@ void value_set_library_monitor_pool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_ref (value->data[0].v_pointer);
-#line 1610 "LibraryMonitor.c"
+#line 1611 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1614 "LibraryMonitor.c"
+#line 1615 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (old);
-#line 1620 "LibraryMonitor.c"
+#line 1621 "LibraryMonitor.c"
 	}
 }
 
@@ -1635,17 +1636,17 @@ void value_take_library_monitor_pool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 1639 "LibraryMonitor.c"
+#line 1640 "LibraryMonitor.c"
 	} else {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 1643 "LibraryMonitor.c"
+#line 1644 "LibraryMonitor.c"
 	}
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_pool_unref (old);
-#line 1649 "LibraryMonitor.c"
+#line 1650 "LibraryMonitor.c"
 	}
 }
 
@@ -1661,7 +1662,7 @@ static void library_monitor_pool_class_init (LibraryMonitorPoolClass * klass) {
 	library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_INSTALLED_SIGNAL] = g_signal_new ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_pool_signals[LIBRARY_MONITOR_POOL_MONITOR_DESTROYED_SIGNAL] = g_signal_new ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_LIBRARY_MONITOR);
-#line 1665 "LibraryMonitor.c"
+#line 1666 "LibraryMonitor.c"
 }
 
 
@@ -1674,7 +1675,7 @@ static void library_monitor_pool_instance_init (LibraryMonitorPool * self) {
 	self->priv->timer_id = (guint) 0;
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->ref_count = 1;
-#line 1678 "LibraryMonitor.c"
+#line 1679 "LibraryMonitor.c"
 }
 
 
@@ -1686,7 +1687,7 @@ static void library_monitor_pool_finalize (LibraryMonitorPool * obj) {
 	g_signal_handlers_destroy (self);
 #line 31 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->monitor);
-#line 1690 "LibraryMonitor.c"
+#line 1691 "LibraryMonitor.c"
 }
 
 
@@ -1711,7 +1712,7 @@ gpointer library_monitor_pool_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return instance;
-#line 1715 "LibraryMonitor.c"
+#line 1716 "LibraryMonitor.c"
 }
 
 
@@ -1724,7 +1725,7 @@ void library_monitor_pool_unref (gpointer instance) {
 		LIBRARY_MONITOR_POOL_GET_CLASS (self)->finalize (self);
 #line 28 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1728 "LibraryMonitor.c"
+#line 1729 "LibraryMonitor.c"
 	}
 }
 
@@ -1732,7 +1733,7 @@ void library_monitor_pool_unref (gpointer instance) {
 static void _library_monitor_on_config_changed_configuration_facade_auto_import_from_library_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 247 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_config_changed ((LibraryMonitor*) self);
-#line 1736 "LibraryMonitor.c"
+#line 1737 "LibraryMonitor.c"
 }
 
 
@@ -1741,7 +1742,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1745 "LibraryMonitor.c"
+#line 1746 "LibraryMonitor.c"
 }
 
 
@@ -1750,14 +1751,14 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 206 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1754 "LibraryMonitor.c"
+#line 1755 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_unblacklist_file_dequeued_callback (gconstpointer item, gpointer self) {
 #line 207 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_unblacklist_file ((GFile*) item);
-#line 1761 "LibraryMonitor.c"
+#line 1762 "LibraryMonitor.c"
 }
 
 
@@ -1766,7 +1767,7 @@ static gboolean _library_monitor_on_flush_import_queue_gsource_func (gpointer se
 	result = library_monitor_on_flush_import_queue ((LibraryMonitor*) self);
 #line 243 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 1770 "LibraryMonitor.c"
+#line 1771 "LibraryMonitor.c"
 }
 
 
@@ -1815,14 +1816,14 @@ LibraryMonitor* library_monitor_construct (GType object_type, GFile* root, gbool
 	self->priv->import_queue_timer_id = _tmp8_;
 #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 1819 "LibraryMonitor.c"
+#line 1820 "LibraryMonitor.c"
 }
 
 
 LibraryMonitor* library_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) {
 #line 236 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_construct (TYPE_LIBRARY_MONITOR, root, recurse, monitoring);
-#line 1826 "LibraryMonitor.c"
+#line 1827 "LibraryMonitor.c"
 }
 
 
@@ -1836,7 +1837,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 	_tmp0_ = self->priv->cancellable;
 #line 251 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_cancellable_cancel (_tmp0_);
-#line 1840 "LibraryMonitor.c"
+#line 1841 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp1_;
@@ -1864,7 +1865,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 		_monitor_index = -1;
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 1868 "LibraryMonitor.c"
+#line 1869 "LibraryMonitor.c"
 			gint _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -1885,7 +1886,7 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 			if (!(_tmp7_ < _tmp8_)) {
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 1889 "LibraryMonitor.c"
+#line 1890 "LibraryMonitor.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = _monitor_list;
@@ -1901,17 +1902,17 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 			media_monitor_close (_tmp12_);
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 1905 "LibraryMonitor.c"
+#line 1906 "LibraryMonitor.c"
 		}
 #line 253 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 1909 "LibraryMonitor.c"
+#line 1910 "LibraryMonitor.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp13_ = self->priv->import_queue_timer_id;
 #line 256 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp13_ != ((guint) 0)) {
-#line 1915 "LibraryMonitor.c"
+#line 1916 "LibraryMonitor.c"
 		guint _tmp14_;
 #line 257 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp14_ = self->priv->import_queue_timer_id;
@@ -1919,11 +1920,11 @@ static void library_monitor_real_close (DirectoryMonitor* base) {
 		g_source_remove (_tmp14_);
 #line 258 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->import_queue_timer_id = (guint) 0;
-#line 1923 "LibraryMonitor.c"
+#line 1924 "LibraryMonitor.c"
 	}
 #line 261 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->close (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 1927 "LibraryMonitor.c"
+#line 1928 "LibraryMonitor.c"
 }
 
 
@@ -1950,7 +1951,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp2_) {
-#line 1954 "LibraryMonitor.c"
+#line 1955 "LibraryMonitor.c"
 		GeeHashMap* _tmp3_;
 		MediaMonitor* _tmp4_;
 		GeeHashSet* _tmp5_;
@@ -1967,7 +1968,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SET, GeeSet));
 #line 266 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1971 "LibraryMonitor.c"
+#line 1972 "LibraryMonitor.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp7_ = self->priv->discovered;
@@ -1983,7 +1984,7 @@ static void library_monitor_add_to_discovered_list (LibraryMonitor* self, MediaM
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
 #line 268 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1987 "LibraryMonitor.c"
+#line 1988 "LibraryMonitor.c"
 }
 
 
@@ -1996,7 +1997,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 	g_return_val_if_fail (IS_LIBRARY_MONITOR (self), NULL);
 #line 271 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (IS_MONITORABLE (monitorable), NULL);
-#line 2000 "LibraryMonitor.c"
+#line 2001 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp0_;
@@ -2024,7 +2025,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 		_monitor_index = -1;
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2028 "LibraryMonitor.c"
+#line 2029 "LibraryMonitor.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -2050,7 +2051,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 			if (!(_tmp6_ < _tmp7_)) {
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2054 "LibraryMonitor.c"
+#line 2055 "LibraryMonitor.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -2082,15 +2083,15 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 				_g_object_unref0 (_monitor_list);
 #line 274 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				return result;
-#line 2086 "LibraryMonitor.c"
+#line 2087 "LibraryMonitor.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2090 "LibraryMonitor.c"
+#line 2091 "LibraryMonitor.c"
 		}
 #line 272 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2094 "LibraryMonitor.c"
+#line 2095 "LibraryMonitor.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = monitorable;
@@ -2102,7 +2103,7 @@ static MediaMonitor* library_monitor_get_monitor_for_monitorable (LibraryMonitor
 	g_error ("LibraryMonitor.vala:277: Unable to locate MediaMonitor for %s", _tmp19_);
 #line 277 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (_tmp19_);
-#line 2106 "LibraryMonitor.c"
+#line 2107 "LibraryMonitor.c"
 }
 
 
@@ -2112,7 +2113,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 	GeeHashSet* _tmp29_;
 #line 280 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
-#line 2116 "LibraryMonitor.c"
+#line 2117 "LibraryMonitor.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -2141,7 +2142,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 		_collection_it = _tmp5_;
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2145 "LibraryMonitor.c"
+#line 2146 "LibraryMonitor.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSourceCollection* collection = NULL;
@@ -2161,7 +2162,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			if (!_tmp7_) {
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2165 "LibraryMonitor.c"
+#line 2166 "LibraryMonitor.c"
 			}
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _collection_it;
@@ -2187,11 +2188,11 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			_g_object_unref0 (_tmp15_);
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_collection_unref0 (collection);
-#line 2191 "LibraryMonitor.c"
+#line 2192 "LibraryMonitor.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_collection_it);
-#line 2195 "LibraryMonitor.c"
+#line 2196 "LibraryMonitor.c"
 	}
 	{
 		GeeList* _monitor_list = NULL;
@@ -2220,7 +2221,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 		_monitor_index = -1;
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2224 "LibraryMonitor.c"
+#line 2225 "LibraryMonitor.c"
 			gint _tmp21_;
 			gint _tmp22_;
 			gint _tmp23_;
@@ -2241,7 +2242,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			if (!(_tmp22_ < _tmp23_)) {
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2245 "LibraryMonitor.c"
+#line 2246 "LibraryMonitor.c"
 			}
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp24_ = _monitor_list;
@@ -2257,11 +2258,11 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 			media_monitor_notify_discovery_started (_tmp27_);
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2261 "LibraryMonitor.c"
+#line 2262 "LibraryMonitor.c"
 		}
 #line 284 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2265 "LibraryMonitor.c"
+#line 2266 "LibraryMonitor.c"
 	}
 #line 287 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = gee_hash_map_new (TYPE_MEDIA_MONITOR, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -2277,7 +2278,7 @@ static void library_monitor_real_discovery_started (DirectoryMonitor* base) {
 	self->priv->unknown_files = _tmp29_;
 #line 290 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_started (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 2281 "LibraryMonitor.c"
+#line 2282 "LibraryMonitor.c"
 }
 
 
@@ -2301,7 +2302,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 	representing = NULL;
 #line 296 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	ignore = FALSE;
-#line 2305 "LibraryMonitor.c"
+#line 2306 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp0_;
@@ -2329,7 +2330,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_monitor_index = -1;
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 2333 "LibraryMonitor.c"
+#line 2334 "LibraryMonitor.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -2356,7 +2357,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			if (!(_tmp6_ < _tmp7_)) {
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2360 "LibraryMonitor.c"
+#line 2361 "LibraryMonitor.c"
 			}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -2384,7 +2385,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp16_ = _result_;
 #line 300 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp16_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
-#line 2388 "LibraryMonitor.c"
+#line 2389 "LibraryMonitor.c"
 				MediaMonitor* _tmp17_;
 				MediaMonitor* _tmp18_;
 #line 301 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2399,7 +2400,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 				_g_object_unref0 (monitor);
 #line 303 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2403 "LibraryMonitor.c"
+#line 2404 "LibraryMonitor.c"
 			} else {
 				MediaMonitorDiscoveredFile _tmp19_;
 #line 304 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2412,22 +2413,22 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 					_g_object_unref0 (monitor);
 #line 308 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 2416 "LibraryMonitor.c"
+#line 2417 "LibraryMonitor.c"
 				}
 			}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 2421 "LibraryMonitor.c"
+#line 2422 "LibraryMonitor.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 2425 "LibraryMonitor.c"
+#line 2426 "LibraryMonitor.c"
 	}
 #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp20_ = representing;
 #line 312 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp20_ != NULL) {
-#line 2431 "LibraryMonitor.c"
+#line 2432 "LibraryMonitor.c"
 		gboolean _tmp21_ = FALSE;
 		Monitorable* _tmp22_;
 		MediaMonitor* _tmp24_;
@@ -2436,17 +2437,17 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_tmp22_ = representation;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp22_ != NULL) {
-#line 2440 "LibraryMonitor.c"
+#line 2441 "LibraryMonitor.c"
 			gboolean _tmp23_;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp23_ = ignore;
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = !_tmp23_;
-#line 2446 "LibraryMonitor.c"
+#line 2447 "LibraryMonitor.c"
 		} else {
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp21_ = FALSE;
-#line 2450 "LibraryMonitor.c"
+#line 2451 "LibraryMonitor.c"
 		}
 #line 313 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_vala_assert (_tmp21_, "representation != null && !ignore");
@@ -2456,7 +2457,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_tmp25_ = representation;
 #line 314 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_add_to_discovered_list (self, _tmp24_, _tmp25_);
-#line 2460 "LibraryMonitor.c"
+#line 2461 "LibraryMonitor.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
@@ -2465,7 +2466,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 		_tmp28_ = ignore;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (!_tmp28_) {
-#line 2469 "LibraryMonitor.c"
+#line 2470 "LibraryMonitor.c"
 			TombstoneSourceCollection* _tmp29_;
 			GFile* _tmp30_;
 			gboolean _tmp31_;
@@ -2477,15 +2478,15 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp31_ = tombstone_source_collection_matches (_tmp29_, _tmp30_);
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = !_tmp31_;
-#line 2481 "LibraryMonitor.c"
+#line 2482 "LibraryMonitor.c"
 		} else {
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = FALSE;
-#line 2485 "LibraryMonitor.c"
+#line 2486 "LibraryMonitor.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp27_) {
-#line 2489 "LibraryMonitor.c"
+#line 2490 "LibraryMonitor.c"
 			GFile* _tmp32_;
 			gboolean _tmp33_;
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2494,15 +2495,15 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp33_ = library_monitor_is_supported_filetype (self, _tmp32_);
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp26_ = _tmp33_;
-#line 2498 "LibraryMonitor.c"
+#line 2499 "LibraryMonitor.c"
 		} else {
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp26_ = FALSE;
-#line 2502 "LibraryMonitor.c"
+#line 2503 "LibraryMonitor.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp26_) {
-#line 2506 "LibraryMonitor.c"
+#line 2507 "LibraryMonitor.c"
 			GeeHashSet* _tmp34_;
 			GFile* _tmp35_;
 #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2511,7 +2512,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 			_tmp35_ = file;
 #line 316 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 2515 "LibraryMonitor.c"
+#line 2516 "LibraryMonitor.c"
 		}
 	}
 #line 319 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2524,7 +2525,7 @@ static void library_monitor_real_file_discovered (DirectoryMonitor* base, GFile*
 	_g_object_unref0 (representing);
 #line 293 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (representation);
-#line 2528 "LibraryMonitor.c"
+#line 2529 "LibraryMonitor.c"
 }
 
 
@@ -2534,7 +2535,7 @@ static void library_monitor_real_discovery_completed (DirectoryMonitor* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_MONITOR, LibraryMonitor);
 #line 323 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_async_discovery_completed (self, NULL, NULL);
-#line 2538 "LibraryMonitor.c"
+#line 2539 "LibraryMonitor.c"
 }
 
 
@@ -2545,7 +2546,7 @@ static void library_monitor_async_discovery_completed_data_free (gpointer _data)
 	_g_object_unref0 (_data_->self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_slice_free (LibraryMonitorAsyncDiscoveryCompletedData, _data_);
-#line 2549 "LibraryMonitor.c"
+#line 2550 "LibraryMonitor.c"
 }
 
 
@@ -2557,11 +2558,11 @@ static void library_monitor_async_discovery_completed_async_ready_wrapper (GObje
 	if (_task_data_->_callback_ != NULL) {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_task_data_->_callback_ (source_object, res, user_data);
-#line 2561 "LibraryMonitor.c"
+#line 2562 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_task_data_->_task_complete_ = TRUE;
-#line 2565 "LibraryMonitor.c"
+#line 2566 "LibraryMonitor.c"
 }
 
 
@@ -2578,7 +2579,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs
 	if (_callback_ == NULL) {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_task_complete_ = TRUE;
-#line 2582 "LibraryMonitor.c"
+#line 2583 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_task_set_task_data (_data_->_async_result, _data_, library_monitor_async_discovery_completed_data_free);
@@ -2588,7 +2589,7 @@ static void library_monitor_async_discovery_completed (LibraryMonitor* self, GAs
 	_data_->self = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_async_discovery_completed_co (_data_);
-#line 2592 "LibraryMonitor.c"
+#line 2593 "LibraryMonitor.c"
 }
 
 
@@ -2596,7 +2597,7 @@ static void library_monitor_async_discovery_completed_finish (LibraryMonitor* se
 	LibraryMonitorAsyncDiscoveryCompletedData* _data_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
-#line 2600 "LibraryMonitor.c"
+#line 2601 "LibraryMonitor.c"
 }
 
 
@@ -2605,7 +2606,7 @@ static gboolean _library_monitor_async_discovery_completed_co_gsource_func (gpoi
 	result = library_monitor_async_discovery_completed_co (self);
 #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 2609 "LibraryMonitor.c"
+#line 2610 "LibraryMonitor.c"
 }
 
 
@@ -2614,16 +2615,16 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 	switch (_data_->_state_) {
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 0:
-#line 2618 "LibraryMonitor.c"
+#line 2619 "LibraryMonitor.c"
 		goto _state_0;
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 1:
-#line 2622 "LibraryMonitor.c"
+#line 2623 "LibraryMonitor.c"
 		goto _state_1;
 		default:
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_assert_not_reached ();
-#line 2627 "LibraryMonitor.c"
+#line 2628 "LibraryMonitor.c"
 	}
 	_state_0:
 #line 331 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2644,14 +2645,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			while (_data_->_task_complete_ != TRUE) {
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 2648 "LibraryMonitor.c"
+#line 2649 "LibraryMonitor.c"
 			}
 		}
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_object_unref (_data_->_async_result);
 #line 334 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return FALSE;
-#line 2655 "LibraryMonitor.c"
+#line 2656 "LibraryMonitor.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp3_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -2661,7 +2662,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 	_data_->_tmp4_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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 2665 "LibraryMonitor.c"
+#line 2666 "LibraryMonitor.c"
 	{
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp5_ = _data_->self->priv->unknown_files;
@@ -2679,7 +2680,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			if (!_data_->_tmp8_) {
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 2683 "LibraryMonitor.c"
+#line 2684 "LibraryMonitor.c"
 			}
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp9_ = _data_->_file_it;
@@ -2703,7 +2704,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_g_object_unref0 (_data_->file);
 #line 342 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 2707 "LibraryMonitor.c"
+#line 2708 "LibraryMonitor.c"
 			}
 #line 345 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp14_ = _data_->all_candidates;
@@ -2713,7 +2714,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_data_->candidates = NULL;
 #line 348 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->associated = FALSE;
-#line 2717 "LibraryMonitor.c"
+#line 2718 "LibraryMonitor.c"
 			{
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp15_ = _data_->self->priv->monitors;
@@ -2745,7 +2746,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 					if (!(_data_->_tmp21_ < _data_->_tmp22_)) {
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 2749 "LibraryMonitor.c"
+#line 2750 "LibraryMonitor.c"
 					}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp23_ = _data_->_monitor_list;
@@ -2777,13 +2778,13 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 					if (_data_->_tmp32_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = TRUE;
-#line 2781 "LibraryMonitor.c"
+#line 2782 "LibraryMonitor.c"
 					} else {
 #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = _data_->_result_;
 #line 353 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = _data_->_tmp33_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE;
-#line 2787 "LibraryMonitor.c"
+#line 2788 "LibraryMonitor.c"
 					}
 #line 352 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp31_) {
@@ -2793,7 +2794,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 						_g_object_unref0 (_data_->monitor);
 #line 356 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 2797 "LibraryMonitor.c"
+#line 2798 "LibraryMonitor.c"
 					} else {
 #line 357 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp34_ = _data_->candidates;
@@ -2805,16 +2806,16 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 							_data_->_tmp36_ = _data_->candidates;
 #line 358 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							gee_array_list_add_all (_data_->_tmp35_, _data_->_tmp36_);
-#line 2809 "LibraryMonitor.c"
+#line 2810 "LibraryMonitor.c"
 						}
 					}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->monitor);
-#line 2814 "LibraryMonitor.c"
+#line 2815 "LibraryMonitor.c"
 				}
 #line 349 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->_monitor_list);
-#line 2818 "LibraryMonitor.c"
+#line 2819 "LibraryMonitor.c"
 			}
 #line 362 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp37_ = _data_->associated;
@@ -2834,7 +2835,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_g_object_unref0 (_data_->file);
 #line 365 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 2838 "LibraryMonitor.c"
+#line 2839 "LibraryMonitor.c"
 			}
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp40_ = _data_->all_candidates;
@@ -2876,7 +2877,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 				_background_job_unref0 (_data_->_tmp51_);
 #line 369 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->job_candidates);
-#line 2880 "LibraryMonitor.c"
+#line 2881 "LibraryMonitor.c"
 			}
 #line 378 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _library_monitor_async_discovery_completed_co_gsource_func, _data_, NULL);
@@ -2884,7 +2885,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_data_->_state_ = 1;
 #line 379 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return FALSE;
-#line 2888 "LibraryMonitor.c"
+#line 2889 "LibraryMonitor.c"
 			_state_1:
 			;
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -2893,11 +2894,11 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 			_g_object_unref0 (_data_->info);
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_data_->file);
-#line 2897 "LibraryMonitor.c"
+#line 2898 "LibraryMonitor.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_data_->_file_it);
-#line 2901 "LibraryMonitor.c"
+#line 2902 "LibraryMonitor.c"
 	}
 #line 383 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_->_tmp52_ = _data_->self->priv->unknown_files;
@@ -2913,7 +2914,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 	if (_data_->_tmp54_ == 0) {
 #line 388 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_discovery_stage_completed (_data_->self);
-#line 2917 "LibraryMonitor.c"
+#line 2918 "LibraryMonitor.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp55_ = _data_->self->priv->checksums_total;
@@ -2931,7 +2932,7 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 		_data_->_tmp59_ = _data_->self->priv->checksums_total;
 #line 391 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_signal_emit (_data_->self, library_monitor_signals[LIBRARY_MONITOR_AUTO_UPDATE_PROGRESS_SIGNAL], 0, _data_->_tmp58_, _data_->_tmp59_);
-#line 2935 "LibraryMonitor.c"
+#line 2936 "LibraryMonitor.c"
 	}
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (_data_->adopted);
@@ -2945,14 +2946,14 @@ static gboolean library_monitor_async_discovery_completed_co (LibraryMonitorAsyn
 		while (_data_->_task_complete_ != TRUE) {
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 2949 "LibraryMonitor.c"
+#line 2950 "LibraryMonitor.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 326 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 2956 "LibraryMonitor.c"
+#line 2957 "LibraryMonitor.c"
 }
 
 
@@ -2990,7 +2991,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self)
 	if (_tmp5_ == _tmp6_) {
 #line 402 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_discovery_stage_completed (self);
-#line 2994 "LibraryMonitor.c"
+#line 2995 "LibraryMonitor.c"
 	}
 }
 
@@ -2998,7 +2999,7 @@ static void library_monitor_report_checksum_job_completed (LibraryMonitor* self)
 static gpointer _background_job_ref0 (gpointer self) {
 #line 406 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 3002 "LibraryMonitor.c"
+#line 3003 "LibraryMonitor.c"
 }
 
 
@@ -3026,7 +3027,7 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 	_tmp3_ = _tmp2_->match;
 #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 3030 "LibraryMonitor.c"
+#line 3031 "LibraryMonitor.c"
 		LibraryMonitorFindMoveJob* _tmp4_;
 		GFile* _tmp5_;
 		gchar* _tmp6_;
@@ -3118,7 +3119,7 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 		library_monitor_add_to_discovered_list (self, _tmp25_, _tmp27_);
 #line 411 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (monitor);
-#line 3122 "LibraryMonitor.c"
+#line 3123 "LibraryMonitor.c"
 	}
 #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = job;
@@ -3126,7 +3127,7 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 	_tmp29_ = _tmp28_->err;
 #line 421 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp29_ != NULL) {
-#line 3130 "LibraryMonitor.c"
+#line 3131 "LibraryMonitor.c"
 		LibraryMonitorFindMoveJob* _tmp30_;
 		GFile* _tmp31_;
 		gchar* _tmp32_;
@@ -3152,13 +3153,13 @@ static void library_monitor_on_find_move_completed (LibraryMonitor* self, Backgr
 		g_warning ("LibraryMonitor.vala:422: Unable to checksum unknown media file %s: %s", _tmp33_, _tmp36_);
 #line 422 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp33_);
-#line 3156 "LibraryMonitor.c"
+#line 3157 "LibraryMonitor.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_report_checksum_job_completed (self);
 #line 405 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_background_job_unref0 (job);
-#line 3162 "LibraryMonitor.c"
+#line 3163 "LibraryMonitor.c"
 }
 
 
@@ -3169,7 +3170,7 @@ static void library_monitor_on_find_move_cancelled (LibraryMonitor* self, Backgr
 	g_return_if_fail (IS_BACKGROUND_JOB (j));
 #line 428 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_report_checksum_job_completed (self);
-#line 3173 "LibraryMonitor.c"
+#line 3174 "LibraryMonitor.c"
 }
 
 
@@ -3179,7 +3180,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 	GCancellable* _tmp68_;
 #line 431 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
-#line 3183 "LibraryMonitor.c"
+#line 3184 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp0_;
@@ -3207,7 +3208,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 		_monitor_index = -1;
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 3211 "LibraryMonitor.c"
+#line 3212 "LibraryMonitor.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -3232,7 +3233,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 			if (!(_tmp6_ < _tmp7_)) {
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 3236 "LibraryMonitor.c"
+#line 3237 "LibraryMonitor.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp8_ = _monitor_list;
@@ -3254,7 +3255,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 			_tmp14_ = monitorables;
 #line 434 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp14_ != NULL) {
-#line 3258 "LibraryMonitor.c"
+#line 3259 "LibraryMonitor.c"
 				{
 					GeeIterator* _monitorable_it = NULL;
 					GeeSet* _tmp15_;
@@ -3267,7 +3268,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_monitorable_it = _tmp16_;
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					while (TRUE) {
-#line 3271 "LibraryMonitor.c"
+#line 3272 "LibraryMonitor.c"
 						GeeIterator* _tmp17_;
 						gboolean _tmp18_;
 						Monitorable* monitorable = NULL;
@@ -3283,7 +3284,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						if (!_tmp18_) {
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							break;
-#line 3287 "LibraryMonitor.c"
+#line 3288 "LibraryMonitor.c"
 						}
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp19_ = _monitorable_it;
@@ -3299,11 +3300,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						library_monitor_enqueue_verify_monitorable (self, _tmp21_, _tmp22_);
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_object_unref0 (monitorable);
-#line 3303 "LibraryMonitor.c"
+#line 3304 "LibraryMonitor.c"
 					}
 #line 435 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_monitorable_it);
-#line 3307 "LibraryMonitor.c"
+#line 3308 "LibraryMonitor.c"
 				}
 			}
 			{
@@ -3337,7 +3338,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 				_object_it = _tmp29_;
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 3341 "LibraryMonitor.c"
+#line 3342 "LibraryMonitor.c"
 					GeeIterator* _tmp30_;
 					gboolean _tmp31_;
 					DataObject* object = NULL;
@@ -3358,7 +3359,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					if (!_tmp31_) {
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 3362 "LibraryMonitor.c"
+#line 3363 "LibraryMonitor.c"
 					}
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp32_ = _object_it;
@@ -3376,7 +3377,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_tmp37_ = monitorables;
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp37_ != NULL) {
-#line 3380 "LibraryMonitor.c"
+#line 3381 "LibraryMonitor.c"
 						GeeSet* _tmp38_;
 						Monitorable* _tmp39_;
 						gboolean _tmp40_;
@@ -3388,11 +3389,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_tmp40_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), _tmp39_);
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp36_ = _tmp40_;
-#line 3392 "LibraryMonitor.c"
+#line 3393 "LibraryMonitor.c"
 					} else {
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp36_ = FALSE;
-#line 3396 "LibraryMonitor.c"
+#line 3397 "LibraryMonitor.c"
 					}
 #line 442 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp36_) {
@@ -3402,7 +3403,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_g_object_unref0 (object);
 #line 443 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						continue;
-#line 3406 "LibraryMonitor.c"
+#line 3407 "LibraryMonitor.c"
 					}
 #line 445 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp41_ = monitorable;
@@ -3414,11 +3415,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_g_object_unref0 (monitorable);
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (object);
-#line 3418 "LibraryMonitor.c"
+#line 3419 "LibraryMonitor.c"
 				}
 #line 439 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_object_it);
-#line 3422 "LibraryMonitor.c"
+#line 3423 "LibraryMonitor.c"
 			}
 			{
 				GeeIterator* _source_it = NULL;
@@ -3459,7 +3460,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 				_source_it = _tmp51_;
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 3463 "LibraryMonitor.c"
+#line 3464 "LibraryMonitor.c"
 					GeeIterator* _tmp52_;
 					gboolean _tmp53_;
 					DataSource* source = NULL;
@@ -3480,7 +3481,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					if (!_tmp53_) {
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 3484 "LibraryMonitor.c"
+#line 3485 "LibraryMonitor.c"
 					}
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp54_ = _source_it;
@@ -3498,7 +3499,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_tmp59_ = monitorables;
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp59_ != NULL) {
-#line 3502 "LibraryMonitor.c"
+#line 3503 "LibraryMonitor.c"
 						GeeSet* _tmp60_;
 						Monitorable* _tmp61_;
 						gboolean _tmp62_;
@@ -3510,11 +3511,11 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_tmp62_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection), _tmp61_);
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp58_ = _tmp62_;
-#line 3514 "LibraryMonitor.c"
+#line 3515 "LibraryMonitor.c"
 					} else {
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp58_ = FALSE;
-#line 3518 "LibraryMonitor.c"
+#line 3519 "LibraryMonitor.c"
 					}
 #line 452 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp58_) {
@@ -3524,7 +3525,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 						_g_object_unref0 (source);
 #line 453 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						continue;
-#line 3528 "LibraryMonitor.c"
+#line 3529 "LibraryMonitor.c"
 					}
 #line 455 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp63_ = monitorable;
@@ -3536,33 +3537,33 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 					_g_object_unref0 (monitorable);
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (source);
-#line 3540 "LibraryMonitor.c"
+#line 3541 "LibraryMonitor.c"
 				}
 #line 448 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_source_it);
-#line 3544 "LibraryMonitor.c"
+#line 3545 "LibraryMonitor.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitorables);
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 3550 "LibraryMonitor.c"
+#line 3551 "LibraryMonitor.c"
 		}
 #line 432 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 3554 "LibraryMonitor.c"
+#line 3555 "LibraryMonitor.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp65_ = self->priv->auto_import;
 #line 460 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp65_) {
-#line 3560 "LibraryMonitor.c"
+#line 3561 "LibraryMonitor.c"
 		GeeHashSet* _tmp66_;
 #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp66_ = self->priv->unknown_files;
 #line 461 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3566 "LibraryMonitor.c"
+#line 3567 "LibraryMonitor.c"
 	}
 #line 464 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->priv->discovered);
@@ -3580,7 +3581,7 @@ static void library_monitor_discovery_stage_completed (LibraryMonitor* self) {
 	tombstone_source_collection_launch_scan (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp68_);
 #line 472 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->discovery_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 3584 "LibraryMonitor.c"
+#line 3585 "LibraryMonitor.c"
 }
 
 
@@ -3621,7 +3622,7 @@ static void library_monitor_enqueue_verify_monitorable (LibraryMonitor* self, Mo
 	_vala_assert (offered, "offered");
 #line 479 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_execute_next_verify_job (self);
-#line 3625 "LibraryMonitor.c"
+#line 3626 "LibraryMonitor.c"
 }
 
 
@@ -3645,7 +3646,7 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 	if (_tmp1_ >= LIBRARY_MONITOR_MAX_VERIFY_EXISTING_MEDIA_JOBS) {
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 3649 "LibraryMonitor.c"
+#line 3650 "LibraryMonitor.c"
 	} else {
 		GeeQueue* _tmp2_;
 		gint _tmp3_;
@@ -3658,13 +3659,13 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 		_tmp4_ = _tmp3_;
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 3662 "LibraryMonitor.c"
+#line 3663 "LibraryMonitor.c"
 	}
 #line 483 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
 #line 484 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 3668 "LibraryMonitor.c"
+#line 3669 "LibraryMonitor.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->verify_queue;
@@ -3692,7 +3693,7 @@ static void library_monitor_execute_next_verify_job (LibraryMonitor* self) {
 	library_monitor_verify_monitorable (self, _tmp10_, _tmp12_, NULL, NULL);
 #line 482 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_library_monitor_verify_job_unref0 (job);
-#line 3696 "LibraryMonitor.c"
+#line 3697 "LibraryMonitor.c"
 }
 
 
@@ -3707,7 +3708,7 @@ static void library_monitor_verify_monitorable_data_free (gpointer _data) {
 	_g_object_unref0 (_data_->self);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_slice_free (LibraryMonitorVerifyMonitorableData, _data_);
-#line 3711 "LibraryMonitor.c"
+#line 3712 "LibraryMonitor.c"
 }
 
 
@@ -3719,11 +3720,11 @@ static void library_monitor_verify_monitorable_async_ready_wrapper (GObject *sou
 	if (_task_data_->_callback_ != NULL) {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_task_data_->_callback_ (source_object, res, user_data);
-#line 3723 "LibraryMonitor.c"
+#line 3724 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_task_data_->_task_complete_ = TRUE;
-#line 3727 "LibraryMonitor.c"
+#line 3728 "LibraryMonitor.c"
 }
 
 
@@ -3744,7 +3745,7 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl
 	if (_callback_ == NULL) {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_task_complete_ = TRUE;
-#line 3748 "LibraryMonitor.c"
+#line 3749 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_task_set_task_data (_data_->_async_result, _data_, library_monitor_verify_monitorable_data_free);
@@ -3770,7 +3771,7 @@ static void library_monitor_verify_monitorable (LibraryMonitor* self, Monitorabl
 	_data_->monitor = _tmp4_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_verify_monitorable_co (_data_);
-#line 3774 "LibraryMonitor.c"
+#line 3775 "LibraryMonitor.c"
 }
 
 
@@ -3778,24 +3779,24 @@ static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAs
 	LibraryMonitorVerifyMonitorableData* _data_;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_data_ = g_task_propagate_pointer (G_TASK (_res_), NULL);
-#line 3782 "LibraryMonitor.c"
+#line 3783 "LibraryMonitor.c"
 }
 
 
-static void _vala_array_add130 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if ((*length) == (*size)) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*array = g_renew (GFile*, *array, (*size) + 1);
-#line 3793 "LibraryMonitor.c"
+#line 3794 "LibraryMonitor.c"
 	}
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	(*array)[(*length)++] = value;
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	(*array)[*length] = NULL;
-#line 3799 "LibraryMonitor.c"
+#line 3800 "LibraryMonitor.c"
 }
 
 
@@ -3811,7 +3812,7 @@ static void library_monitor_verify_monitorable_ready (GObject* source_object, GA
 	_data_->_task_complete_ = TRUE;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_verify_monitorable_co (_data_);
-#line 3815 "LibraryMonitor.c"
+#line 3816 "LibraryMonitor.c"
 }
 
 
@@ -3820,7 +3821,7 @@ static gboolean _library_monitor_verify_monitorable_co_gsource_func (gpointer se
 	result = library_monitor_verify_monitorable_co (self);
 #line 530 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 3824 "LibraryMonitor.c"
+#line 3825 "LibraryMonitor.c"
 }
 
 
@@ -3829,20 +3830,20 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 	switch (_data_->_state_) {
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 0:
-#line 3833 "LibraryMonitor.c"
+#line 3834 "LibraryMonitor.c"
 		goto _state_0;
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 1:
-#line 3837 "LibraryMonitor.c"
+#line 3838 "LibraryMonitor.c"
 		goto _state_1;
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		case 2:
-#line 3841 "LibraryMonitor.c"
+#line 3842 "LibraryMonitor.c"
 		goto _state_2;
 		default:
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_assert_not_reached ();
-#line 3846 "LibraryMonitor.c"
+#line 3847 "LibraryMonitor.c"
 	}
 	_state_0:
 #line 494 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -3891,7 +3892,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 		_data_->_tmp11_ = _data_->aux_files;
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->_tmp11__length1 = _data_->aux_files_length1;
-#line 3895 "LibraryMonitor.c"
+#line 3896 "LibraryMonitor.c"
 		{
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->aux_file_collection_length1 = 0;
@@ -3907,7 +3908,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				_data_->_tmp12_ = _g_object_ref0 (_data_->aux_file_collection[_data_->aux_file_it]);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->aux_file = _data_->_tmp12_;
-#line 3911 "LibraryMonitor.c"
+#line 3912 "LibraryMonitor.c"
 				{
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp13_ = _data_->files;
@@ -3918,10 +3919,10 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_);
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_vala_array_add130 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_);
+					_vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->aux_file);
-#line 3925 "LibraryMonitor.c"
+#line 3926 "LibraryMonitor.c"
 				}
 			}
 		}
@@ -3929,7 +3930,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 	{
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_data_->ctr = 0;
-#line 3933 "LibraryMonitor.c"
+#line 3934 "LibraryMonitor.c"
 		{
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_data_->_tmp16_ = TRUE;
@@ -3941,7 +3942,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 					_data_->_tmp17_ = _data_->ctr;
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->ctr = _data_->_tmp17_ + 1;
-#line 3945 "LibraryMonitor.c"
+#line 3946 "LibraryMonitor.c"
 				}
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp16_ = FALSE;
@@ -3955,7 +3956,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				if (!(_data_->_tmp18_ < _data_->_tmp19__length1)) {
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 3959 "LibraryMonitor.c"
+#line 3960 "LibraryMonitor.c"
 				}
 #line 504 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_data_->_tmp20_ = _data_->files;
@@ -3979,7 +3980,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				_data_->_tmp26_ = _data_->info;
 #line 507 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_data_->_tmp26_ == NULL) {
-#line 3983 "LibraryMonitor.c"
+#line 3984 "LibraryMonitor.c"
 					{
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp28_ = _data_->file;
@@ -3991,7 +3992,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						g_file_query_info_async (_data_->_tmp28_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_FILE_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp29_, library_monitor_verify_monitorable_ready, _data_);
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						return FALSE;
-#line 3995 "LibraryMonitor.c"
+#line 3996 "LibraryMonitor.c"
 						_state_1:
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp30_ = g_file_query_info_finish (_data_->_tmp28_, _data_->_res_, &_data_->_inner_error_);
@@ -3999,8 +4000,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->_tmp27_ = _data_->_tmp30_;
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 4003 "LibraryMonitor.c"
-							goto __catch486_g_error;
+#line 4004 "LibraryMonitor.c"
+							goto __catch495_g_error;
 						}
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = _data_->_tmp27_;
@@ -4012,10 +4013,10 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->info = _data_->_tmp31_;
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_object_unref0 (_data_->_tmp27_);
-#line 4016 "LibraryMonitor.c"
+#line 4017 "LibraryMonitor.c"
 					}
-					goto __finally486;
-					__catch486_g_error:
+					goto __finally495;
+					__catch495_g_error:
 					{
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->err = _data_->_inner_error_;
@@ -4023,9 +4024,9 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->_inner_error_ = NULL;
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_g_error_free0 (_data_->err);
-#line 4027 "LibraryMonitor.c"
+#line 4028 "LibraryMonitor.c"
 					}
-					__finally486:
+					__finally495:
 #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"
@@ -4044,7 +4045,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						g_object_unref (_data_->_async_result);
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						return FALSE;
-#line 4048 "LibraryMonitor.c"
+#line 4049 "LibraryMonitor.c"
 					}
 				}
 #line 517 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4063,11 +4064,11 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->_tmp37_ = media_monitor_is_offline (_data_->_tmp35_, _data_->_tmp36_);
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = _data_->_tmp37_;
-#line 4067 "LibraryMonitor.c"
+#line 4068 "LibraryMonitor.c"
 					} else {
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp33_ = FALSE;
-#line 4071 "LibraryMonitor.c"
+#line 4072 "LibraryMonitor.c"
 					}
 #line 518 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_data_->_tmp33_) {
@@ -4077,7 +4078,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_data_->_tmp39_ = _data_->monitorable;
 #line 519 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						media_monitor_update_online (_data_->_tmp38_, _data_->_tmp39_);
-#line 4081 "LibraryMonitor.c"
+#line 4082 "LibraryMonitor.c"
 					} else {
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp41_ = _data_->info;
@@ -4091,11 +4092,11 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 							_data_->_tmp44_ = media_monitor_is_offline (_data_->_tmp42_, _data_->_tmp43_);
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp40_ = !_data_->_tmp44_;
-#line 4095 "LibraryMonitor.c"
+#line 4096 "LibraryMonitor.c"
 						} else {
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_data_->_tmp40_ = FALSE;
-#line 4099 "LibraryMonitor.c"
+#line 4100 "LibraryMonitor.c"
 						}
 #line 520 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_data_->_tmp40_) {
@@ -4105,7 +4106,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 							_data_->_tmp46_ = _data_->monitorable;
 #line 521 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							media_monitor_update_offline (_data_->_tmp45_, _data_->_tmp46_);
-#line 4109 "LibraryMonitor.c"
+#line 4110 "LibraryMonitor.c"
 						}
 					}
 				}
@@ -4123,7 +4124,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 				_g_object_unref0 (_data_->info);
 #line 503 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_data_->file);
-#line 4127 "LibraryMonitor.c"
+#line 4128 "LibraryMonitor.c"
 			}
 		}
 	}
@@ -4143,7 +4144,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 	_data_->_state_ = 2;
 #line 531 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 4147 "LibraryMonitor.c"
+#line 4148 "LibraryMonitor.c"
 	_state_2:
 	;
 #line 534 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4168,14 +4169,14 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 		while (_data_->_task_complete_ != TRUE) {
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE);
-#line 4172 "LibraryMonitor.c"
+#line 4173 "LibraryMonitor.c"
 		}
 	}
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_object_unref (_data_->_async_result);
 #line 493 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return FALSE;
-#line 4179 "LibraryMonitor.c"
+#line 4180 "LibraryMonitor.c"
 }
 
 
@@ -4211,7 +4212,7 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 	if (_tmp4_ == _tmp5_) {
 #line 544 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 4215 "LibraryMonitor.c"
+#line 4216 "LibraryMonitor.c"
 	}
 #line 546 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp6_ = value;
@@ -4221,7 +4222,7 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 	_tmp7_ = self->priv->auto_import;
 #line 547 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp7_) {
-#line 4225 "LibraryMonitor.c"
+#line 4226 "LibraryMonitor.c"
 		gboolean _tmp8_;
 #line 548 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp8_ = commandline_options_no_runtime_monitoring;
@@ -4229,12 +4230,12 @@ static void library_monitor_on_config_changed (LibraryMonitor* self) {
 		if (!_tmp8_) {
 #line 549 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			library_monitor_import_unrepresented_files (self);
-#line 4233 "LibraryMonitor.c"
+#line 4234 "LibraryMonitor.c"
 		}
 	} else {
 #line 551 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_cancel_batch_imports (self);
-#line 4238 "LibraryMonitor.c"
+#line 4239 "LibraryMonitor.c"
 	}
 }
 
@@ -4257,7 +4258,7 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 	_tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp4_) {
-#line 4261 "LibraryMonitor.c"
+#line 4262 "LibraryMonitor.c"
 		GFile* _tmp5_;
 		gboolean _tmp6_;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4266,15 +4267,15 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 		_tmp6_ = library_monitor_is_supported_filetype (self, _tmp5_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = _tmp6_;
-#line 4270 "LibraryMonitor.c"
+#line 4271 "LibraryMonitor.c"
 	} else {
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 4274 "LibraryMonitor.c"
+#line 4275 "LibraryMonitor.c"
 	}
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 4278 "LibraryMonitor.c"
+#line 4279 "LibraryMonitor.c"
 		GFile* _tmp7_;
 		gboolean _tmp8_;
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4283,15 +4284,15 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 		_tmp8_ = library_monitor_is_blacklisted (_tmp7_);
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = !_tmp8_;
-#line 4287 "LibraryMonitor.c"
+#line 4288 "LibraryMonitor.c"
 	} else {
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 4291 "LibraryMonitor.c"
+#line 4292 "LibraryMonitor.c"
 	}
 #line 556 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 4295 "LibraryMonitor.c"
+#line 4296 "LibraryMonitor.c"
 		GeeHashSet* _tmp9_;
 		GFile* _tmp10_;
 #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4300,7 +4301,7 @@ static void library_monitor_enqueue_import (LibraryMonitor* self, GFile* file) {
 		_tmp10_ = file;
 #line 557 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 4304 "LibraryMonitor.c"
+#line 4305 "LibraryMonitor.c"
 	}
 }
 
@@ -4310,7 +4311,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 560 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (files));
-#line 4314 "LibraryMonitor.c"
+#line 4315 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp0_;
@@ -4323,7 +4324,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 		_file_it = _tmp1_;
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 4327 "LibraryMonitor.c"
+#line 4328 "LibraryMonitor.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			GFile* file = NULL;
@@ -4338,7 +4339,7 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 			if (!_tmp3_) {
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 4342 "LibraryMonitor.c"
+#line 4343 "LibraryMonitor.c"
 			}
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp4_ = _file_it;
@@ -4352,11 +4353,11 @@ static void library_monitor_enqueue_import_many (LibraryMonitor* self, GeeCollec
 			library_monitor_enqueue_import (self, _tmp6_);
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 4356 "LibraryMonitor.c"
+#line 4357 "LibraryMonitor.c"
 		}
 #line 561 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 4360 "LibraryMonitor.c"
+#line 4361 "LibraryMonitor.c"
 	}
 }
 
@@ -4374,7 +4375,7 @@ static void library_monitor_remove_queued_import (LibraryMonitor* self, GFile* f
 	_tmp1_ = file;
 #line 566 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 4378 "LibraryMonitor.c"
+#line 4379 "LibraryMonitor.c"
 }
 
 
@@ -4419,7 +4420,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = FALSE;
 #line 571 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4423 "LibraryMonitor.c"
+#line 4424 "LibraryMonitor.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp2_ = self->priv->import_queue;
@@ -4433,7 +4434,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = TRUE;
 #line 574 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4437 "LibraryMonitor.c"
+#line 4438 "LibraryMonitor.c"
 	}
 #line 578 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->current_batch_import;
@@ -4443,7 +4444,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		result = TRUE;
 #line 579 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return result;
-#line 4447 "LibraryMonitor.c"
+#line 4448 "LibraryMonitor.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp6_ = self->priv->import_queue;
@@ -4469,7 +4470,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	if (_tmp13_ == NULL) {
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp12_ = TRUE;
-#line 4473 "LibraryMonitor.c"
+#line 4474 "LibraryMonitor.c"
 	} else {
 		time_t _tmp14_;
 		time_t _tmp15_;
@@ -4479,11 +4480,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		_tmp15_ = self->priv->last_import_roll_use;
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp12_ = (_tmp14_ - _tmp15_) >= ((time_t) LIBRARY_MONITOR_IMPORT_ROLL_QUIET_SEC);
-#line 4483 "LibraryMonitor.c"
+#line 4484 "LibraryMonitor.c"
 	}
 #line 587 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp12_) {
-#line 4487 "LibraryMonitor.c"
+#line 4488 "LibraryMonitor.c"
 		BatchImportRoll* _tmp16_;
 #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp16_ = batch_import_roll_new ();
@@ -4491,7 +4492,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		_batch_import_roll_unref0 (self->priv->current_import_roll);
 #line 588 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		self->priv->current_import_roll = _tmp16_;
-#line 4495 "LibraryMonitor.c"
+#line 4496 "LibraryMonitor.c"
 	}
 #line 589 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = now;
@@ -4501,7 +4502,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	_tmp18_ = gee_array_list_new (TYPE_BATCH_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 591 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	jobs = _tmp18_;
-#line 4505 "LibraryMonitor.c"
+#line 4506 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeHashSet* _tmp19_;
@@ -4514,7 +4515,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 		_file_it = _tmp20_;
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 4518 "LibraryMonitor.c"
+#line 4519 "LibraryMonitor.c"
 			GeeIterator* _tmp21_;
 			gboolean _tmp22_;
 			GFile* file = NULL;
@@ -4536,7 +4537,7 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 			if (!_tmp22_) {
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 4540 "LibraryMonitor.c"
+#line 4541 "LibraryMonitor.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp23_ = _file_it;
@@ -4554,14 +4555,14 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 594 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 4558 "LibraryMonitor.c"
+#line 4559 "LibraryMonitor.c"
 			}
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp27_ = jobs;
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp28_ = file;
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-			_tmp29_ = file_import_job_new (_tmp28_, FALSE);
+			_tmp29_ = file_import_job_new (_tmp28_, FALSE, TRUE);
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp30_ = _tmp29_;
 #line 596 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4576,11 +4577,11 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 4580 "LibraryMonitor.c"
+#line 4581 "LibraryMonitor.c"
 		}
 #line 592 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 4584 "LibraryMonitor.c"
+#line 4585 "LibraryMonitor.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp33_ = self->priv->import_queue;
@@ -4618,28 +4619,28 @@ static gboolean library_monitor_on_flush_import_queue (LibraryMonitor* self) {
 	_g_object_unref0 (jobs);
 #line 610 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 4622 "LibraryMonitor.c"
+#line 4623 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
 #line 618 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_preparing ((LibraryMonitor*) self);
-#line 4629 "LibraryMonitor.c"
+#line 4630 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
 #line 619 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_progress ((LibraryMonitor*) self, completed_bytes, total_bytes);
-#line 4636 "LibraryMonitor.c"
+#line 4637 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 620 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_import_complete ((LibraryMonitor*) self, _sender, manifest, import_roll);
-#line 4643 "LibraryMonitor.c"
+#line 4644 "LibraryMonitor.c"
 }
 
 
@@ -4660,7 +4661,7 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 	if (_tmp1_ != NULL) {
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 4664 "LibraryMonitor.c"
+#line 4665 "LibraryMonitor.c"
 	} else {
 		GeeArrayList* _tmp2_;
 		gint _tmp3_;
@@ -4673,13 +4674,13 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 		_tmp4_ = _tmp3_;
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 4677 "LibraryMonitor.c"
+#line 4678 "LibraryMonitor.c"
 	}
 #line 614 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
 #line 615 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 4683 "LibraryMonitor.c"
+#line 4684 "LibraryMonitor.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp5_ = self->priv->batch_import_queue;
@@ -4705,7 +4706,7 @@ static void library_monitor_schedule_next_batch_import (LibraryMonitor* self) {
 	_tmp10_ = self->priv->current_batch_import;
 #line 621 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	batch_import_schedule (_tmp10_);
-#line 4709 "LibraryMonitor.c"
+#line 4710 "LibraryMonitor.c"
 }
 
 
@@ -4773,13 +4774,13 @@ static void library_monitor_discard_current_batch_import (LibraryMonitor* self)
 	_tmp13_ = _tmp12_;
 #line 639 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp13_ == 0) {
-#line 4777 "LibraryMonitor.c"
+#line 4778 "LibraryMonitor.c"
 		GeeHashSet* _tmp14_;
 #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp14_ = self->priv->pending_imports;
 #line 640 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 4783 "LibraryMonitor.c"
+#line 4784 "LibraryMonitor.c"
 	}
 }
 
@@ -4794,7 +4795,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 	ctr = 0;
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	while (TRUE) {
-#line 4798 "LibraryMonitor.c"
+#line 4799 "LibraryMonitor.c"
 		gint _tmp0_;
 		GeeArrayList* _tmp1_;
 		gint _tmp2_;
@@ -4822,7 +4823,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		if (!(_tmp0_ < _tmp3_)) {
 #line 646 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			break;
-#line 4826 "LibraryMonitor.c"
+#line 4827 "LibraryMonitor.c"
 		}
 #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = self->priv->batch_import_queue;
@@ -4840,7 +4841,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		_g_object_unref0 (_tmp7_);
 #line 647 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp9_) {
-#line 4844 "LibraryMonitor.c"
+#line 4845 "LibraryMonitor.c"
 			gint _tmp10_;
 #line 648 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = ctr;
@@ -4848,7 +4849,7 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 			ctr = _tmp10_ + 1;
 #line 650 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			continue;
-#line 4852 "LibraryMonitor.c"
+#line 4853 "LibraryMonitor.c"
 		}
 #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp11_ = self->priv->batch_import_queue;
@@ -4864,25 +4865,25 @@ static void library_monitor_cancel_batch_imports (LibraryMonitor* self) {
 		gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
 #line 653 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_tmp15_);
-#line 4868 "LibraryMonitor.c"
+#line 4869 "LibraryMonitor.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp16_ = self->priv->current_batch_import;
 #line 657 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp16_ != NULL) {
-#line 4874 "LibraryMonitor.c"
+#line 4875 "LibraryMonitor.c"
 		BatchImport* _tmp17_;
 #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp17_ = self->priv->current_batch_import;
 #line 658 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		batch_import_user_halt (_tmp17_);
-#line 4880 "LibraryMonitor.c"
+#line 4881 "LibraryMonitor.c"
 	}
 #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp18_ = self->priv->pending_imports;
 #line 661 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 4886 "LibraryMonitor.c"
+#line 4887 "LibraryMonitor.c"
 }
 
 
@@ -4891,7 +4892,7 @@ static void library_monitor_on_import_preparing (LibraryMonitor* self) {
 	g_return_if_fail (IS_LIBRARY_MONITOR (self));
 #line 665 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PREPARING_SIGNAL], 0);
-#line 4895 "LibraryMonitor.c"
+#line 4896 "LibraryMonitor.c"
 }
 
 
@@ -4906,7 +4907,7 @@ static void library_monitor_on_import_progress (LibraryMonitor* self, guint64 co
 	_tmp1_ = total_bytes;
 #line 669 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4910 "LibraryMonitor.c"
+#line 4911 "LibraryMonitor.c"
 }
 
 
@@ -4961,7 +4962,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 	_g_free0 (_tmp7_);
 #line 677 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_signal_emit (self, library_monitor_signals[LIBRARY_MONITOR_AUTO_IMPORT_PROGRESS_SIGNAL], 0, (guint64) 0, (guint64) 0);
-#line 4965 "LibraryMonitor.c"
+#line 4966 "LibraryMonitor.c"
 	{
 		GeeList* _result_list = NULL;
 		ImportManifest* _tmp8_;
@@ -4992,7 +4993,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 		_result_index = -1;
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 4996 "LibraryMonitor.c"
+#line 4997 "LibraryMonitor.c"
 			gint _tmp14_;
 			gint _tmp15_;
 			gint _tmp16_;
@@ -5014,7 +5015,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			if (!(_tmp15_ < _tmp16_)) {
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 5018 "LibraryMonitor.c"
+#line 5019 "LibraryMonitor.c"
 			}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp17_ = _result_list;
@@ -5030,7 +5031,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_tmp21_ = _tmp20_->file;
 #line 682 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp21_ != NULL) {
-#line 5034 "LibraryMonitor.c"
+#line 5035 "LibraryMonitor.c"
 				GeeHashSet* _tmp22_;
 				BatchImportResult* _tmp23_;
 				GFile* _tmp24_;
@@ -5042,15 +5043,15 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_tmp24_ = _tmp23_->file;
 #line 683 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 5046 "LibraryMonitor.c"
+#line 5047 "LibraryMonitor.c"
 			}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_batch_import_result_unref0 (_result_);
-#line 5050 "LibraryMonitor.c"
+#line 5051 "LibraryMonitor.c"
 		}
 #line 679 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_result_list);
-#line 5054 "LibraryMonitor.c"
+#line 5055 "LibraryMonitor.c"
 	}
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp25_ = manifest;
@@ -5062,14 +5063,14 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 	_tmp28_ = _tmp27_;
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp28_ > 0) {
-#line 5066 "LibraryMonitor.c"
+#line 5067 "LibraryMonitor.c"
 		GeeArrayList* to_tombstone = NULL;
 		GeeArrayList* _tmp29_;
 #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp29_ = gee_array_list_new (TYPE_TOMBSTONED_FILE, (GBoxedCopyFunc) tombstoned_file_ref, (GDestroyNotify) tombstoned_file_unref, NULL, NULL, NULL);
 #line 687 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		to_tombstone = _tmp29_;
-#line 5073 "LibraryMonitor.c"
+#line 5074 "LibraryMonitor.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp30_;
@@ -5100,7 +5101,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_result_index = -1;
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			while (TRUE) {
-#line 5104 "LibraryMonitor.c"
+#line 5105 "LibraryMonitor.c"
 				gint _tmp36_;
 				gint _tmp37_;
 				gint _tmp38_;
@@ -5132,7 +5133,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				if (!(_tmp37_ < _tmp38_)) {
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 5136 "LibraryMonitor.c"
+#line 5137 "LibraryMonitor.c"
 				}
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp39_ = _result_list;
@@ -5154,7 +5155,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_tmp45_ = info;
 #line 690 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp45_ == NULL) {
-#line 5158 "LibraryMonitor.c"
+#line 5159 "LibraryMonitor.c"
 					BatchImportResult* _tmp46_;
 					GFile* _tmp47_;
 					gchar* _tmp48_;
@@ -5177,7 +5178,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 					_batch_import_result_unref0 (_result_);
 #line 693 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					continue;
-#line 5181 "LibraryMonitor.c"
+#line 5182 "LibraryMonitor.c"
 				}
 #line 696 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp50_ = to_tombstone;
@@ -5201,11 +5202,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				_g_object_unref0 (info);
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5205 "LibraryMonitor.c"
+#line 5206 "LibraryMonitor.c"
 			}
 #line 688 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_result_list);
-#line 5209 "LibraryMonitor.c"
+#line 5210 "LibraryMonitor.c"
 		}
 		{
 			GeeArrayList* _tmp57_;
@@ -5217,8 +5218,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5221 "LibraryMonitor.c"
-					goto __catch487_database_error;
+#line 5222 "LibraryMonitor.c"
+					goto __catch496_database_error;
 				}
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_tombstone);
@@ -5228,11 +5229,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 				g_clear_error (&_inner_error_);
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				return;
-#line 5232 "LibraryMonitor.c"
+#line 5233 "LibraryMonitor.c"
 			}
 		}
-		goto __finally487;
-		__catch487_database_error:
+		goto __finally496;
+		__catch496_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp58_;
@@ -5246,9 +5247,9 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			app_window_database_error (_tmp58_);
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_error_free0 (err);
-#line 5250 "LibraryMonitor.c"
+#line 5251 "LibraryMonitor.c"
 		}
-		__finally487:
+		__finally496:
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5259,11 +5260,11 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			g_clear_error (&_inner_error_);
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5263 "LibraryMonitor.c"
+#line 5264 "LibraryMonitor.c"
 		}
 #line 686 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (to_tombstone);
-#line 5267 "LibraryMonitor.c"
+#line 5268 "LibraryMonitor.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp59_ = self->priv->pending_imports;
@@ -5283,7 +5284,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 	library_monitor_discard_current_batch_import (self);
 #line 709 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_schedule_next_batch_import (self);
-#line 5287 "LibraryMonitor.c"
+#line 5288 "LibraryMonitor.c"
 }
 
 
@@ -5317,14 +5318,14 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 	_g_free0 (_tmp5_);
 #line 726 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (_tmp3_);
-#line 5321 "LibraryMonitor.c"
+#line 5322 "LibraryMonitor.c"
 	{
 		GeeHashSet* _tmp6_;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp6_ = library_monitor_blacklist;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5328 "LibraryMonitor.c"
+#line 5329 "LibraryMonitor.c"
 		{
 			GeeHashSet* _tmp7_;
 			GFile* _tmp8_;
@@ -5334,16 +5335,16 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			_tmp8_ = file;
 #line 728 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
-#line 5338 "LibraryMonitor.c"
+#line 5339 "LibraryMonitor.c"
 		}
-		__finally488:
+		__finally497:
 		{
 			GeeHashSet* _tmp9_;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp9_ = library_monitor_blacklist;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5347 "LibraryMonitor.c"
+#line 5348 "LibraryMonitor.c"
 		}
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5353,7 +5354,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			g_clear_error (&_inner_error_);
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5357 "LibraryMonitor.c"
+#line 5358 "LibraryMonitor.c"
 		}
 	}
 }
@@ -5363,14 +5364,14 @@ void library_monitor_unblacklist_file (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 732 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 5367 "LibraryMonitor.c"
+#line 5368 "LibraryMonitor.c"
 	{
 		GeeHashSet* _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = library_monitor_blacklist;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5374 "LibraryMonitor.c"
+#line 5375 "LibraryMonitor.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashSet* _tmp2_;
@@ -5384,7 +5385,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 			_tmp4_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp3_);
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp4_) {
-#line 5388 "LibraryMonitor.c"
+#line 5389 "LibraryMonitor.c"
 				HashTimedQueue* _tmp5_;
 				GFile* _tmp6_;
 				gboolean _tmp7_;
@@ -5396,15 +5397,15 @@ void library_monitor_unblacklist_file (GFile* file) {
 				_tmp7_ = timed_queue_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_TIMED_QUEUE, TimedQueue), _tmp6_);
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp1_ = !_tmp7_;
-#line 5400 "LibraryMonitor.c"
+#line 5401 "LibraryMonitor.c"
 			} else {
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp1_ = FALSE;
-#line 5404 "LibraryMonitor.c"
+#line 5405 "LibraryMonitor.c"
 			}
 #line 736 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp1_) {
-#line 5408 "LibraryMonitor.c"
+#line 5409 "LibraryMonitor.c"
 				HashTimedQueue* _tmp8_;
 				GFile* _tmp9_;
 #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5413,17 +5414,17 @@ void library_monitor_unblacklist_file (GFile* file) {
 				_tmp9_ = file;
 #line 737 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				timed_queue_enqueue (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TIMED_QUEUE, TimedQueue), _tmp9_);
-#line 5417 "LibraryMonitor.c"
+#line 5418 "LibraryMonitor.c"
 			}
 		}
-		__finally489:
+		__finally498:
 		{
 			GeeHashSet* _tmp10_;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = library_monitor_blacklist;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5427 "LibraryMonitor.c"
+#line 5428 "LibraryMonitor.c"
 		}
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5433,7 +5434,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5437 "LibraryMonitor.c"
+#line 5438 "LibraryMonitor.c"
 		}
 	}
 }
@@ -5444,14 +5445,14 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 741 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 5448 "LibraryMonitor.c"
+#line 5449 "LibraryMonitor.c"
 	{
 		GeeHashSet* _tmp0_;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = library_monitor_blacklist;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5455 "LibraryMonitor.c"
+#line 5456 "LibraryMonitor.c"
 		{
 			GeeHashSet* _tmp1_;
 			GFile* _tmp2_;
@@ -5464,16 +5465,16 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			_tmp3_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 744 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			removed = _tmp3_;
-#line 5468 "LibraryMonitor.c"
+#line 5469 "LibraryMonitor.c"
 		}
-		__finally490:
+		__finally499:
 		{
 			GeeHashSet* _tmp4_;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp4_ = library_monitor_blacklist;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5477 "LibraryMonitor.c"
+#line 5478 "LibraryMonitor.c"
 		}
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5483,12 +5484,12 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return;
-#line 5487 "LibraryMonitor.c"
+#line 5488 "LibraryMonitor.c"
 		}
 	}
 #line 747 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (removed) {
-#line 5492 "LibraryMonitor.c"
+#line 5493 "LibraryMonitor.c"
 		GFile* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
@@ -5510,7 +5511,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 		_g_free0 (_tmp9_);
 #line 748 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp7_);
-#line 5514 "LibraryMonitor.c"
+#line 5515 "LibraryMonitor.c"
 	} else {
 		GFile* _tmp10_;
 		gchar* _tmp11_;
@@ -5525,7 +5526,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 		g_warning ("LibraryMonitor.vala:750: File %s was not blacklisted but unblacklisted", _tmp12_);
 #line 750 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp12_);
-#line 5529 "LibraryMonitor.c"
+#line 5530 "LibraryMonitor.c"
 	}
 }
 
@@ -5535,7 +5536,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 	GError * _inner_error_ = NULL;
 #line 753 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 5539 "LibraryMonitor.c"
+#line 5540 "LibraryMonitor.c"
 	{
 		GeeHashSet* _tmp0_;
 		gboolean _tmp6_ = FALSE;
@@ -5543,7 +5544,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 		_tmp0_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_rec_mutex_lock (&__lock_library_monitor_blacklist);
-#line 5547 "LibraryMonitor.c"
+#line 5548 "LibraryMonitor.c"
 		{
 			GeeHashSet* _tmp1_;
 			GFile* _tmp2_;
@@ -5556,27 +5557,27 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			result = _tmp3_;
-#line 5560 "LibraryMonitor.c"
+#line 5561 "LibraryMonitor.c"
 			{
 				GeeHashSet* _tmp4_;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp4_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5567 "LibraryMonitor.c"
+#line 5568 "LibraryMonitor.c"
 			}
 #line 755 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return result;
-#line 5571 "LibraryMonitor.c"
+#line 5572 "LibraryMonitor.c"
 		}
-		__finally491:
+		__finally500:
 		{
 			GeeHashSet* _tmp5_;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp5_ = library_monitor_blacklist;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			g_rec_mutex_unlock (&__lock_library_monitor_blacklist);
-#line 5580 "LibraryMonitor.c"
+#line 5581 "LibraryMonitor.c"
 		}
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5584,7 +5585,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return _tmp6_;
-#line 5588 "LibraryMonitor.c"
+#line 5589 "LibraryMonitor.c"
 	}
 }
 
@@ -5621,7 +5622,7 @@ static gboolean library_monitor_is_supported_filetype (LibraryMonitor* self, GFi
 	result = _tmp5_;
 #line 760 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return result;
-#line 5625 "LibraryMonitor.c"
+#line 5626 "LibraryMonitor.c"
 }
 
 
@@ -5637,11 +5638,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 	if (!_tmp0_) {
 #line 767 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 5641 "LibraryMonitor.c"
+#line 5642 "LibraryMonitor.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	to_import = NULL;
-#line 5645 "LibraryMonitor.c"
+#line 5646 "LibraryMonitor.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp1_;
@@ -5662,7 +5663,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 		_file_it = _tmp4_;
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 5666 "LibraryMonitor.c"
+#line 5667 "LibraryMonitor.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			GFile* file = NULL;
@@ -5694,7 +5695,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (!_tmp6_) {
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 5698 "LibraryMonitor.c"
+#line 5699 "LibraryMonitor.c"
 			}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp7_ = _file_it;
@@ -5714,7 +5715,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			if (_tmp12_ == NULL) {
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = TRUE;
-#line 5718 "LibraryMonitor.c"
+#line 5719 "LibraryMonitor.c"
 			} else {
 				GFileInfo* _tmp13_;
 				GFileType _tmp14_;
@@ -5724,7 +5725,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_tmp14_ = g_file_info_get_file_type (_tmp13_);
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp11_ = _tmp14_ != G_FILE_TYPE_REGULAR;
-#line 5728 "LibraryMonitor.c"
+#line 5729 "LibraryMonitor.c"
 			}
 #line 772 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp11_) {
@@ -5734,7 +5735,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 773 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5738 "LibraryMonitor.c"
+#line 5739 "LibraryMonitor.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp15_ = self->priv->pending_imports;
@@ -5750,7 +5751,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 776 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5754 "LibraryMonitor.c"
+#line 5755 "LibraryMonitor.c"
 			}
 #line 778 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp18_ = tombstone_global;
@@ -5766,11 +5767,11 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 779 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5770 "LibraryMonitor.c"
+#line 5771 "LibraryMonitor.c"
 			}
 #line 781 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			represented = FALSE;
-#line 5774 "LibraryMonitor.c"
+#line 5775 "LibraryMonitor.c"
 			{
 				GeeList* _monitor_list = NULL;
 				GeeList* _tmp21_;
@@ -5798,7 +5799,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_monitor_index = -1;
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				while (TRUE) {
-#line 5802 "LibraryMonitor.c"
+#line 5803 "LibraryMonitor.c"
 					gint _tmp26_;
 					gint _tmp27_;
 					gint _tmp28_;
@@ -5821,7 +5822,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 					if (!(_tmp27_ < _tmp28_)) {
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 5825 "LibraryMonitor.c"
+#line 5826 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp29_ = _monitor_list;
@@ -5845,15 +5846,15 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 						_g_object_unref0 (monitor);
 #line 786 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						break;
-#line 5849 "LibraryMonitor.c"
+#line 5850 "LibraryMonitor.c"
 					}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (monitor);
-#line 5853 "LibraryMonitor.c"
+#line 5854 "LibraryMonitor.c"
 				}
 #line 782 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (_monitor_list);
-#line 5857 "LibraryMonitor.c"
+#line 5858 "LibraryMonitor.c"
 			}
 #line 790 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp35_ = represented;
@@ -5865,7 +5866,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 791 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5869 "LibraryMonitor.c"
+#line 5870 "LibraryMonitor.c"
 			}
 #line 793 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp36_ = file;
@@ -5879,13 +5880,13 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (file);
 #line 794 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 5883 "LibraryMonitor.c"
+#line 5884 "LibraryMonitor.c"
 			}
 #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp38_ = to_import;
 #line 796 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp38_ == NULL) {
-#line 5889 "LibraryMonitor.c"
+#line 5890 "LibraryMonitor.c"
 				GeeArrayList* _tmp39_;
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp39_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
@@ -5893,7 +5894,7 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 				_g_object_unref0 (to_import);
 #line 797 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				to_import = _tmp39_;
-#line 5897 "LibraryMonitor.c"
+#line 5898 "LibraryMonitor.c"
 			}
 #line 799 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp40_ = to_import;
@@ -5905,27 +5906,27 @@ static void library_monitor_import_unrepresented_files (LibraryMonitor* self) {
 			_g_object_unref0 (info);
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (file);
-#line 5909 "LibraryMonitor.c"
+#line 5910 "LibraryMonitor.c"
 		}
 #line 770 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_file_it);
-#line 5913 "LibraryMonitor.c"
+#line 5914 "LibraryMonitor.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp42_ = to_import;
 #line 802 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp42_ != NULL) {
-#line 5919 "LibraryMonitor.c"
+#line 5920 "LibraryMonitor.c"
 		GeeArrayList* _tmp43_;
 #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp43_ = to_import;
 #line 803 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import_many (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5925 "LibraryMonitor.c"
+#line 5926 "LibraryMonitor.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (to_import);
-#line 5929 "LibraryMonitor.c"
+#line 5930 "LibraryMonitor.c"
 }
 
 
@@ -5941,7 +5942,7 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 	_tmp2_ = self->priv->auto_import;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp2_) {
-#line 5945 "LibraryMonitor.c"
+#line 5946 "LibraryMonitor.c"
 		GFile* _tmp3_;
 		gboolean _tmp4_;
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5950,15 +5951,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp4_ = library_monitor_is_supported_filetype (self, _tmp3_);
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = _tmp4_;
-#line 5954 "LibraryMonitor.c"
+#line 5955 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp1_ = FALSE;
-#line 5958 "LibraryMonitor.c"
+#line 5959 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 5962 "LibraryMonitor.c"
+#line 5963 "LibraryMonitor.c"
 		TombstoneSourceCollection* _tmp5_;
 		GFile* _tmp6_;
 		gboolean _tmp7_;
@@ -5970,15 +5971,15 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp7_ = tombstone_source_collection_matches (_tmp5_, _tmp6_);
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = !_tmp7_;
-#line 5974 "LibraryMonitor.c"
+#line 5975 "LibraryMonitor.c"
 	} else {
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = FALSE;
-#line 5978 "LibraryMonitor.c"
+#line 5979 "LibraryMonitor.c"
 	}
 #line 809 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 5982 "LibraryMonitor.c"
+#line 5983 "LibraryMonitor.c"
 		GFile* _tmp8_;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
@@ -6005,7 +6006,7 @@ static void library_monitor_runtime_unknown_file_discovered (LibraryMonitor* sel
 		_tmp13_ = file;
 #line 811 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_enqueue_import (self, _tmp13_);
-#line 6009 "LibraryMonitor.c"
+#line 6010 "LibraryMonitor.c"
 	}
 }
 
@@ -6031,7 +6032,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 816 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 6035 "LibraryMonitor.c"
+#line 6036 "LibraryMonitor.c"
 		GFile* _tmp2_;
 		GFileInfo* _tmp3_;
 #line 817 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6042,11 +6043,11 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_);
 #line 819 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 6046 "LibraryMonitor.c"
+#line 6047 "LibraryMonitor.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6050 "LibraryMonitor.c"
+#line 6051 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp4_;
@@ -6074,7 +6075,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 6078 "LibraryMonitor.c"
+#line 6079 "LibraryMonitor.c"
 			gint _tmp9_;
 			gint _tmp10_;
 			gint _tmp11_;
@@ -6098,7 +6099,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			if (!(_tmp10_ < _tmp11_)) {
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6102 "LibraryMonitor.c"
+#line 6103 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -6124,28 +6125,28 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 827 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6128 "LibraryMonitor.c"
+#line 6129 "LibraryMonitor.c"
 			}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6132 "LibraryMonitor.c"
+#line 6133 "LibraryMonitor.c"
 		}
 #line 823 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 6136 "LibraryMonitor.c"
+#line 6137 "LibraryMonitor.c"
 	}
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = known;
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp19_) {
-#line 6142 "LibraryMonitor.c"
+#line 6143 "LibraryMonitor.c"
 		GeeHashSet* all_candidates = NULL;
 		gboolean _tmp78_ = FALSE;
 		gboolean _tmp79_ = FALSE;
 		gboolean _tmp80_;
 #line 833 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		all_candidates = NULL;
-#line 6149 "LibraryMonitor.c"
+#line 6150 "LibraryMonitor.c"
 		{
 			GeeList* _monitor_list = NULL;
 			GeeList* _tmp20_;
@@ -6173,7 +6174,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_monitor_index = -1;
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			while (TRUE) {
-#line 6177 "LibraryMonitor.c"
+#line 6178 "LibraryMonitor.c"
 				gint _tmp25_;
 				gint _tmp26_;
 				gint _tmp27_;
@@ -6202,7 +6203,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				if (!(_tmp26_ < _tmp27_)) {
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 6206 "LibraryMonitor.c"
+#line 6207 "LibraryMonitor.c"
 				}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp28_ = _monitor_list;
@@ -6230,18 +6231,18 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				if (_tmp37_ == MEDIA_MONITOR_DISCOVERED_FILE_REPRESENTED) {
 #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp36_ = TRUE;
-#line 6234 "LibraryMonitor.c"
+#line 6235 "LibraryMonitor.c"
 				} else {
 					MediaMonitorDiscoveredFile _tmp38_;
 #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp38_ = _result_;
 #line 839 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp36_ = _tmp38_ == MEDIA_MONITOR_DISCOVERED_FILE_IGNORE;
-#line 6241 "LibraryMonitor.c"
+#line 6242 "LibraryMonitor.c"
 				}
 #line 838 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp36_) {
-#line 6245 "LibraryMonitor.c"
+#line 6246 "LibraryMonitor.c"
 					MediaMonitor* _tmp39_;
 					gchar* _tmp40_;
 					gchar* _tmp41_;
@@ -6288,7 +6289,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 					_g_object_unref0 (monitor);
 #line 845 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					break;
-#line 6292 "LibraryMonitor.c"
+#line 6293 "LibraryMonitor.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
 					GeeCollection* _tmp50_;
@@ -6296,7 +6297,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 					_tmp50_ = candidates;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp50_ != NULL) {
-#line 6300 "LibraryMonitor.c"
+#line 6301 "LibraryMonitor.c"
 						GeeCollection* _tmp51_;
 						gint _tmp52_;
 						gint _tmp53_;
@@ -6308,15 +6309,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 						_tmp53_ = _tmp52_;
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp49_ = _tmp53_ > 0;
-#line 6312 "LibraryMonitor.c"
+#line 6313 "LibraryMonitor.c"
 					} else {
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_tmp49_ = FALSE;
-#line 6316 "LibraryMonitor.c"
+#line 6317 "LibraryMonitor.c"
 					}
 #line 846 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (_tmp49_) {
-#line 6320 "LibraryMonitor.c"
+#line 6321 "LibraryMonitor.c"
 						MediaMonitor* _tmp54_;
 						gchar* _tmp55_;
 						gchar* _tmp56_;
@@ -6363,7 +6364,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 						_tmp65_ = all_candidates;
 #line 850 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (_tmp65_ == NULL) {
-#line 6367 "LibraryMonitor.c"
+#line 6368 "LibraryMonitor.c"
 							GeeHashSet* _tmp66_;
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_tmp66_ = gee_hash_set_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -6371,7 +6372,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 							_g_object_unref0 (all_candidates);
 #line 851 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							all_candidates = _tmp66_;
-#line 6375 "LibraryMonitor.c"
+#line 6376 "LibraryMonitor.c"
 						}
 						{
 							GeeIterator* _candidate_it = NULL;
@@ -6385,7 +6386,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 							_candidate_it = _tmp68_;
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							while (TRUE) {
-#line 6389 "LibraryMonitor.c"
+#line 6390 "LibraryMonitor.c"
 								GeeIterator* _tmp69_;
 								gboolean _tmp70_;
 								Monitorable* candidate = NULL;
@@ -6402,7 +6403,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 								if (!_tmp70_) {
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									break;
-#line 6406 "LibraryMonitor.c"
+#line 6407 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_tmp71_ = _candidate_it;
@@ -6418,7 +6419,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 								_tmp75_ = media_monitor_is_offline (_tmp73_, _tmp74_);
 #line 854 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								if (_tmp75_) {
-#line 6422 "LibraryMonitor.c"
+#line 6423 "LibraryMonitor.c"
 									GeeHashSet* _tmp76_;
 									Monitorable* _tmp77_;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -6427,15 +6428,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 									_tmp77_ = candidate;
 #line 855 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 									gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp77_);
-#line 6431 "LibraryMonitor.c"
+#line 6432 "LibraryMonitor.c"
 								}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 								_g_object_unref0 (candidate);
-#line 6435 "LibraryMonitor.c"
+#line 6436 "LibraryMonitor.c"
 							}
 #line 853 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 							_g_object_unref0 (_candidate_it);
-#line 6439 "LibraryMonitor.c"
+#line 6440 "LibraryMonitor.c"
 						}
 					}
 				}
@@ -6443,31 +6444,31 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 				_g_object_unref0 (candidates);
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (monitor);
-#line 6447 "LibraryMonitor.c"
+#line 6448 "LibraryMonitor.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (_monitor_list);
-#line 6451 "LibraryMonitor.c"
+#line 6452 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp80_ = known;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (!_tmp80_) {
-#line 6457 "LibraryMonitor.c"
+#line 6458 "LibraryMonitor.c"
 			GeeHashSet* _tmp81_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp81_ = all_candidates;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp79_ = _tmp81_ != NULL;
-#line 6463 "LibraryMonitor.c"
+#line 6464 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp79_ = FALSE;
-#line 6467 "LibraryMonitor.c"
+#line 6468 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp79_) {
-#line 6471 "LibraryMonitor.c"
+#line 6472 "LibraryMonitor.c"
 			GeeHashSet* _tmp82_;
 			gint _tmp83_;
 			gint _tmp84_;
@@ -6479,15 +6480,15 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_tmp84_ = _tmp83_;
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = _tmp84_ > 0;
-#line 6483 "LibraryMonitor.c"
+#line 6484 "LibraryMonitor.c"
 		} else {
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp78_ = FALSE;
-#line 6487 "LibraryMonitor.c"
+#line 6488 "LibraryMonitor.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp78_) {
-#line 6491 "LibraryMonitor.c"
+#line 6492 "LibraryMonitor.c"
 			GeeHashSet* _tmp85_;
 			gint _tmp86_;
 			gint _tmp87_;
@@ -6539,23 +6540,23 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 			_background_job_unref0 (_tmp97_);
 #line 866 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			known = TRUE;
-#line 6543 "LibraryMonitor.c"
+#line 6544 "LibraryMonitor.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (all_candidates);
-#line 6547 "LibraryMonitor.c"
+#line 6548 "LibraryMonitor.c"
 	}
 #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp98_ = known;
 #line 870 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp98_) {
-#line 6553 "LibraryMonitor.c"
+#line 6554 "LibraryMonitor.c"
 		GFile* _tmp99_;
 #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp99_ = file;
 #line 871 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp99_);
-#line 6559 "LibraryMonitor.c"
+#line 6560 "LibraryMonitor.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp100_ = file;
@@ -6563,7 +6564,7 @@ static void library_monitor_real_notify_file_created (DirectoryMonitor* base, GF
 	_tmp101_ = info;
 #line 873 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_created (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp100_, _tmp101_);
-#line 6567 "LibraryMonitor.c"
+#line 6568 "LibraryMonitor.c"
 }
 
 
@@ -6591,7 +6592,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 	_tmp3_ = _tmp2_->err;
 #line 879 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp3_ != NULL) {
-#line 6595 "LibraryMonitor.c"
+#line 6596 "LibraryMonitor.c"
 		LibraryMonitorRuntimeFindMoveJob* _tmp4_;
 		GFile* _tmp5_;
 		gchar* _tmp6_;
@@ -6618,7 +6619,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 "or %s: %s", _tmp7_, _tmp10_);
 #line 880 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp7_);
-#line 6621 "LibraryMonitor.c"
+#line 6622 "LibraryMonitor.c"
 	}
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp11_ = job;
@@ -6626,7 +6627,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 	_tmp12_ = _tmp11_->match;
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp12_ != NULL) {
-#line 6629 "LibraryMonitor.c"
+#line 6630 "LibraryMonitor.c"
 		MediaMonitor* monitor = NULL;
 		LibraryMonitorRuntimeFindMoveJob* _tmp13_;
 		Monitorable* _tmp14_;
@@ -6669,7 +6670,7 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 		media_monitor_update_online (_tmp21_, _tmp23_);
 #line 884 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (monitor);
-#line 6672 "LibraryMonitor.c"
+#line 6673 "LibraryMonitor.c"
 	} else {
 		LibraryMonitorRuntimeFindMoveJob* _tmp24_;
 		GFile* _tmp25_;
@@ -6679,11 +6680,11 @@ static void library_monitor_on_runtime_find_move_completed (LibraryMonitor* self
 		_tmp25_ = _tmp24_->file;
 #line 890 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp25_);
-#line 6682 "LibraryMonitor.c"
+#line 6683 "LibraryMonitor.c"
 	}
 #line 876 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_background_job_unref0 (job);
-#line 6686 "LibraryMonitor.c"
+#line 6687 "LibraryMonitor.c"
 }
 
 
@@ -6713,7 +6714,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 	if (_tmp2_) {
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = TRUE;
-#line 6716 "LibraryMonitor.c"
+#line 6717 "LibraryMonitor.c"
 	} else {
 		GFile* _tmp3_;
 		gboolean _tmp4_;
@@ -6723,11 +6724,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		_tmp4_ = library_monitor_is_blacklisted (_tmp3_);
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp0_ = _tmp4_;
-#line 6726 "LibraryMonitor.c"
+#line 6727 "LibraryMonitor.c"
 	}
 #line 895 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp0_) {
-#line 6730 "LibraryMonitor.c"
+#line 6731 "LibraryMonitor.c"
 		GFile* _tmp5_;
 		GFile* _tmp6_;
 		GFileInfo* _tmp7_;
@@ -6741,11 +6742,11 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp5_, _tmp6_, _tmp7_);
 #line 898 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 6744 "LibraryMonitor.c"
+#line 6745 "LibraryMonitor.c"
 	}
 #line 901 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6748 "LibraryMonitor.c"
+#line 6749 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp8_;
@@ -6773,7 +6774,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 		_monitor_index = -1;
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 6776 "LibraryMonitor.c"
+#line 6777 "LibraryMonitor.c"
 			gint _tmp13_;
 			gint _tmp14_;
 			gint _tmp15_;
@@ -6798,7 +6799,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 			if (!(_tmp14_ < _tmp15_)) {
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6801 "LibraryMonitor.c"
+#line 6802 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp16_ = _monitor_list;
@@ -6826,27 +6827,27 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 				_g_object_unref0 (monitor);
 #line 906 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6829 "LibraryMonitor.c"
+#line 6830 "LibraryMonitor.c"
 			}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6833 "LibraryMonitor.c"
+#line 6834 "LibraryMonitor.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 6837 "LibraryMonitor.c"
+#line 6838 "LibraryMonitor.c"
 	}
 #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp24_ = known;
 #line 910 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp24_) {
-#line 6843 "LibraryMonitor.c"
+#line 6844 "LibraryMonitor.c"
 		GFile* _tmp25_;
 #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp25_ = new_file;
 #line 911 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp25_);
-#line 6849 "LibraryMonitor.c"
+#line 6850 "LibraryMonitor.c"
 	}
 #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp26_ = old_file;
@@ -6856,7 +6857,7 @@ static void library_monitor_real_notify_file_moved (DirectoryMonitor* base, GFil
 	_tmp28_ = new_info;
 #line 913 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_moved (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp26_, _tmp27_, _tmp28_);
-#line 6859 "LibraryMonitor.c"
+#line 6860 "LibraryMonitor.c"
 }
 
 
@@ -6877,7 +6878,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 917 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 6880 "LibraryMonitor.c"
+#line 6881 "LibraryMonitor.c"
 		GFile* _tmp2_;
 #line 918 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -6885,11 +6886,11 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 920 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 6888 "LibraryMonitor.c"
+#line 6889 "LibraryMonitor.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 6892 "LibraryMonitor.c"
+#line 6893 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_;
@@ -6917,7 +6918,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 6920 "LibraryMonitor.c"
+#line 6921 "LibraryMonitor.c"
 			gint _tmp8_;
 			gint _tmp9_;
 			gint _tmp10_;
@@ -6940,7 +6941,7 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 			if (!(_tmp9_ < _tmp10_)) {
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6943 "LibraryMonitor.c"
+#line 6944 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -6964,33 +6965,33 @@ static void library_monitor_real_notify_file_altered (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 928 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 6967 "LibraryMonitor.c"
+#line 6968 "LibraryMonitor.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 6971 "LibraryMonitor.c"
+#line 6972 "LibraryMonitor.c"
 		}
 #line 924 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 6975 "LibraryMonitor.c"
+#line 6976 "LibraryMonitor.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 932 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 6981 "LibraryMonitor.c"
+#line 6982 "LibraryMonitor.c"
 		GFile* _tmp18_;
 #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = file;
 #line 933 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp18_);
-#line 6987 "LibraryMonitor.c"
+#line 6988 "LibraryMonitor.c"
 	}
 #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = file;
 #line 935 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_);
-#line 6993 "LibraryMonitor.c"
+#line 6994 "LibraryMonitor.c"
 }
 
 
@@ -7011,7 +7012,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 939 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7014 "LibraryMonitor.c"
+#line 7015 "LibraryMonitor.c"
 		GFile* _tmp2_;
 #line 940 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -7019,11 +7020,11 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 942 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7022 "LibraryMonitor.c"
+#line 7023 "LibraryMonitor.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7026 "LibraryMonitor.c"
+#line 7027 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_;
@@ -7051,7 +7052,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 		_monitor_index = -1;
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7054 "LibraryMonitor.c"
+#line 7055 "LibraryMonitor.c"
 			gint _tmp8_;
 			gint _tmp9_;
 			gint _tmp10_;
@@ -7074,7 +7075,7 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 			if (!(_tmp9_ < _tmp10_)) {
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7077 "LibraryMonitor.c"
+#line 7078 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7098,33 +7099,33 @@ static void library_monitor_real_notify_file_attributes_altered (DirectoryMonito
 				_g_object_unref0 (monitor);
 #line 950 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7101 "LibraryMonitor.c"
+#line 7102 "LibraryMonitor.c"
 			}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7105 "LibraryMonitor.c"
+#line 7106 "LibraryMonitor.c"
 		}
 #line 946 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7109 "LibraryMonitor.c"
+#line 7110 "LibraryMonitor.c"
 	}
 #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 954 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 7115 "LibraryMonitor.c"
+#line 7116 "LibraryMonitor.c"
 		GFile* _tmp18_;
 #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = file;
 #line 955 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp18_);
-#line 7121 "LibraryMonitor.c"
+#line 7122 "LibraryMonitor.c"
 	}
 #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = file;
 #line 957 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_attributes_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp19_);
-#line 7127 "LibraryMonitor.c"
+#line 7128 "LibraryMonitor.c"
 }
 
 
@@ -7148,7 +7149,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 961 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7151 "LibraryMonitor.c"
+#line 7152 "LibraryMonitor.c"
 		GFile* _tmp2_;
 		GFileInfo* _tmp3_;
 #line 962 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7159,11 +7160,11 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_, _tmp3_);
 #line 964 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7162 "LibraryMonitor.c"
+#line 7163 "LibraryMonitor.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7166 "LibraryMonitor.c"
+#line 7167 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp4_;
@@ -7191,7 +7192,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 		_monitor_index = -1;
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7194 "LibraryMonitor.c"
+#line 7195 "LibraryMonitor.c"
 			gint _tmp9_;
 			gint _tmp10_;
 			gint _tmp11_;
@@ -7215,7 +7216,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 			if (!(_tmp10_ < _tmp11_)) {
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7218 "LibraryMonitor.c"
+#line 7219 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp12_ = _monitor_list;
@@ -7241,27 +7242,27 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 				_g_object_unref0 (monitor);
 #line 972 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7244 "LibraryMonitor.c"
+#line 7245 "LibraryMonitor.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7248 "LibraryMonitor.c"
+#line 7249 "LibraryMonitor.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7252 "LibraryMonitor.c"
+#line 7253 "LibraryMonitor.c"
 	}
 #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp19_ = known;
 #line 976 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp19_) {
-#line 7258 "LibraryMonitor.c"
+#line 7259 "LibraryMonitor.c"
 		GFile* _tmp20_;
 #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp20_ = file;
 #line 977 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_runtime_unknown_file_discovered (self, _tmp20_);
-#line 7264 "LibraryMonitor.c"
+#line 7265 "LibraryMonitor.c"
 	}
 #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp21_ = file;
@@ -7269,7 +7270,7 @@ static void library_monitor_real_notify_file_alteration_completed (DirectoryMoni
 	_tmp22_ = info;
 #line 979 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_alteration_completed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp21_, _tmp22_);
-#line 7272 "LibraryMonitor.c"
+#line 7273 "LibraryMonitor.c"
 }
 
 
@@ -7290,7 +7291,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 	_tmp1_ = library_monitor_is_blacklisted (_tmp0_);
 #line 983 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (_tmp1_) {
-#line 7293 "LibraryMonitor.c"
+#line 7294 "LibraryMonitor.c"
 		GFile* _tmp2_;
 #line 984 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp2_ = file;
@@ -7298,11 +7299,11 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp2_);
 #line 986 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7301 "LibraryMonitor.c"
+#line 7302 "LibraryMonitor.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	known = FALSE;
-#line 7305 "LibraryMonitor.c"
+#line 7306 "LibraryMonitor.c"
 	{
 		GeeList* _monitor_list = NULL;
 		GeeList* _tmp3_;
@@ -7330,7 +7331,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		_monitor_index = -1;
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7333 "LibraryMonitor.c"
+#line 7334 "LibraryMonitor.c"
 			gint _tmp8_;
 			gint _tmp9_;
 			gint _tmp10_;
@@ -7353,7 +7354,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 			if (!(_tmp9_ < _tmp10_)) {
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7356 "LibraryMonitor.c"
+#line 7357 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = _monitor_list;
@@ -7377,21 +7378,21 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 				_g_object_unref0 (monitor);
 #line 994 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7380 "LibraryMonitor.c"
+#line 7381 "LibraryMonitor.c"
 			}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (monitor);
-#line 7384 "LibraryMonitor.c"
+#line 7385 "LibraryMonitor.c"
 		}
 #line 990 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_monitor_list);
-#line 7388 "LibraryMonitor.c"
+#line 7389 "LibraryMonitor.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp17_ = known;
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!_tmp17_) {
-#line 7394 "LibraryMonitor.c"
+#line 7395 "LibraryMonitor.c"
 		Tombstone* tombstone = NULL;
 		TombstoneSourceCollection* _tmp18_;
 		GFile* _tmp19_;
@@ -7410,7 +7411,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		_tmp21_ = tombstone;
 #line 1001 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp21_ != NULL) {
-#line 7413 "LibraryMonitor.c"
+#line 7414 "LibraryMonitor.c"
 			GFile* _tmp22_;
 			gchar* _tmp23_;
 			gchar* _tmp24_;
@@ -7432,7 +7433,7 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 			_tmp26_ = tombstone;
 #line 1003 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			tombstone_source_collection_resurrect (_tmp25_, _tmp26_);
-#line 7435 "LibraryMonitor.c"
+#line 7436 "LibraryMonitor.c"
 		}
 #line 1007 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp27_ = file;
@@ -7440,13 +7441,13 @@ static void library_monitor_real_notify_file_deleted (DirectoryMonitor* base, GF
 		library_monitor_remove_queued_import (self, _tmp27_);
 #line 998 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (tombstone);
-#line 7443 "LibraryMonitor.c"
+#line 7444 "LibraryMonitor.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_tmp28_ = file;
 #line 1010 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	DIRECTORY_MONITOR_CLASS (library_monitor_parent_class)->notify_file_deleted (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), _tmp28_);
-#line 7449 "LibraryMonitor.c"
+#line 7450 "LibraryMonitor.c"
 }
 
 
@@ -7465,19 +7466,19 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7468 "LibraryMonitor.c"
+#line 7469 "LibraryMonitor.c"
 	} else {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = closure->data;
-#line 7474 "LibraryMonitor.c"
+#line 7475 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 7480 "LibraryMonitor.c"
+#line 7481 "LibraryMonitor.c"
 }
 
 
@@ -7496,33 +7497,33 @@ static void g_cclosure_user_marshal_VOID__UINT64_UINT64 (GClosure * closure, GVa
 		data1 = closure->data;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7499 "LibraryMonitor.c"
+#line 7500 "LibraryMonitor.c"
 	} else {
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		data2 = closure->data;
-#line 7505 "LibraryMonitor.c"
+#line 7506 "LibraryMonitor.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback = (GMarshalFunc_VOID__UINT64_UINT64) (marshal_data ? marshal_data : cc->callback);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	callback (data1, g_value_get_uint64 (param_values + 1), g_value_get_uint64 (param_values + 2), data2);
-#line 7511 "LibraryMonitor.c"
+#line 7512 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_find_move_completed ((LibraryMonitor*) self, job);
-#line 7518 "LibraryMonitor.c"
+#line 7519 "LibraryMonitor.c"
 }
 
 
 static void _library_monitor_on_find_move_cancelled_cancellation_callback (BackgroundJob* job, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_find_move_cancelled ((LibraryMonitor*) self, job);
-#line 7525 "LibraryMonitor.c"
+#line 7526 "LibraryMonitor.c"
 }
 
 
@@ -7575,21 +7576,21 @@ static LibraryMonitorFindMoveJob* library_monitor_find_move_job_construct (GType
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 7578 "LibraryMonitor.c"
+#line 7579 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorFindMoveJob* library_monitor_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 #line 110 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_find_move_job_construct (LIBRARY_MONITOR_TYPE_FIND_MOVE_JOB, owner, file, candidates);
-#line 7585 "LibraryMonitor.c"
+#line 7586 "LibraryMonitor.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 135 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 7592 "LibraryMonitor.c"
+#line 7593 "LibraryMonitor.c"
 }
 
 
@@ -7613,7 +7614,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 	iter = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	while (TRUE) {
-#line 7616 "LibraryMonitor.c"
+#line 7617 "LibraryMonitor.c"
 		GeeIterator* _tmp2_;
 		gboolean _tmp3_;
 		GeeIterator* _tmp4_;
@@ -7631,7 +7632,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		if (!_tmp3_) {
 #line 122 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			break;
-#line 7634 "LibraryMonitor.c"
+#line 7635 "LibraryMonitor.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp4_ = iter;
@@ -7653,13 +7654,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp6_);
 #line 123 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (_tmp10_) {
-#line 7656 "LibraryMonitor.c"
+#line 7657 "LibraryMonitor.c"
 			GeeIterator* _tmp11_;
 #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp11_ = iter;
 #line 124 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			gee_iterator_remove (_tmp11_);
-#line 7662 "LibraryMonitor.c"
+#line 7663 "LibraryMonitor.c"
 		}
 	}
 #line 128 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7674,11 +7675,11 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (iter);
 #line 129 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7677 "LibraryMonitor.c"
+#line 7678 "LibraryMonitor.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	md5 = NULL;
-#line 7681 "LibraryMonitor.c"
+#line 7682 "LibraryMonitor.c"
 	{
 		gchar* _tmp15_ = NULL;
 		GFile* _tmp16_;
@@ -7692,8 +7693,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_tmp15_ = _tmp17_;
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7695 "LibraryMonitor.c"
-			goto __catch492_g_error;
+#line 7696 "LibraryMonitor.c"
+			goto __catch501_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = _tmp15_;
@@ -7705,10 +7706,10 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		md5 = _tmp18_;
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp15_);
-#line 7708 "LibraryMonitor.c"
+#line 7709 "LibraryMonitor.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally501;
+	__catch501_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_;
@@ -7733,9 +7734,9 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (iter);
 #line 137 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7736 "LibraryMonitor.c"
+#line 7737 "LibraryMonitor.c"
 	}
-	__finally492:
+	__finally501:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7748,7 +7749,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 7751 "LibraryMonitor.c"
+#line 7752 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
@@ -7762,7 +7763,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_candidate_it = _tmp22_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 7765 "LibraryMonitor.c"
+#line 7766 "LibraryMonitor.c"
 			GeeIterator* _tmp23_;
 			gboolean _tmp24_;
 			Monitorable* candidate = NULL;
@@ -7784,7 +7785,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 			if (!_tmp24_) {
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 7787 "LibraryMonitor.c"
+#line 7788 "LibraryMonitor.c"
 			}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp25_ = _candidate_it;
@@ -7810,13 +7811,13 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_g_object_unref0 (candidate);
 #line 142 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 7813 "LibraryMonitor.c"
+#line 7814 "LibraryMonitor.c"
 			}
 #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp32_ = self->match;
 #line 144 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp32_ != NULL) {
-#line 7819 "LibraryMonitor.c"
+#line 7820 "LibraryMonitor.c"
 				GFile* _tmp33_;
 				gchar* _tmp34_;
 				gchar* _tmp35_;
@@ -7860,7 +7861,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_tmp42_ = self->losers;
 #line 148 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_tmp42_ == NULL) {
-#line 7862 "LibraryMonitor.c"
+#line 7863 "LibraryMonitor.c"
 					GeeArrayList* _tmp43_;
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_tmp43_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
@@ -7868,7 +7869,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 					_g_object_unref0 (self->losers);
 #line 149 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					self->losers = _tmp43_;
-#line 7870 "LibraryMonitor.c"
+#line 7871 "LibraryMonitor.c"
 				}
 #line 151 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_tmp44_ = self->losers;
@@ -7880,7 +7881,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 				_g_object_unref0 (candidate);
 #line 153 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				continue;
-#line 7882 "LibraryMonitor.c"
+#line 7883 "LibraryMonitor.c"
 			}
 #line 156 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp46_ = candidate;
@@ -7892,17 +7893,17 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 			self->match = _tmp47_;
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (candidate);
-#line 7894 "LibraryMonitor.c"
+#line 7895 "LibraryMonitor.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 7898 "LibraryMonitor.c"
+#line 7899 "LibraryMonitor.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (md5);
 #line 119 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (iter);
-#line 7904 "LibraryMonitor.c"
+#line 7905 "LibraryMonitor.c"
 }
 
 
@@ -7913,7 +7914,7 @@ static void library_monitor_find_move_job_class_init (LibraryMonitorFindMoveJobC
 	((BackgroundJobClass *) klass)->finalize = library_monitor_find_move_job_finalize;
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_find_move_job_real_execute;
-#line 7915 "LibraryMonitor.c"
+#line 7916 "LibraryMonitor.c"
 }
 
 
@@ -7924,7 +7925,7 @@ static void library_monitor_find_move_job_instance_init (LibraryMonitorFindMoveJ
 	self->losers = NULL;
 #line 108 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->err = NULL;
-#line 7926 "LibraryMonitor.c"
+#line 7927 "LibraryMonitor.c"
 }
 
 
@@ -7944,7 +7945,7 @@ static void library_monitor_find_move_job_finalize (BackgroundJob * obj) {
 	_g_error_free0 (self->err);
 #line 103 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	BACKGROUND_JOB_CLASS (library_monitor_find_move_job_parent_class)->finalize (obj);
-#line 7946 "LibraryMonitor.c"
+#line 7947 "LibraryMonitor.c"
 }
 
 
@@ -7963,7 +7964,7 @@ static GType library_monitor_find_move_job_get_type (void) {
 static void _library_monitor_on_runtime_find_move_completed_completion_callback (BackgroundJob* job, gpointer self) {
 #line 168 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	library_monitor_on_runtime_find_move_completed ((LibraryMonitor*) self, job);
-#line 7965 "LibraryMonitor.c"
+#line 7966 "LibraryMonitor.c"
 }
 
 
@@ -8013,14 +8014,14 @@ static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_c
 	background_job_set_completion_priority (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_BACKGROUND_JOB, BackgroundJob), G_PRIORITY_LOW);
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 8015 "LibraryMonitor.c"
+#line 8016 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorRuntimeFindMoveJob* library_monitor_runtime_find_move_job_new (LibraryMonitor* owner, GFile* file, GeeCollection* candidates) {
 #line 167 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_runtime_find_move_job_construct (LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, owner, file, candidates);
-#line 8022 "LibraryMonitor.c"
+#line 8023 "LibraryMonitor.c"
 }
 
 
@@ -8032,7 +8033,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_MONITOR_TYPE_RUNTIME_FIND_MOVE_JOB, LibraryMonitorRuntimeFindMoveJob);
 #line 177 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	md5 = NULL;
-#line 8034 "LibraryMonitor.c"
+#line 8035 "LibraryMonitor.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GFile* _tmp1_;
@@ -8046,8 +8047,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_tmp0_ = _tmp2_;
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8048 "LibraryMonitor.c"
-			goto __catch493_g_error;
+#line 8049 "LibraryMonitor.c"
+			goto __catch502_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp0_;
@@ -8059,10 +8060,10 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		md5 = _tmp3_;
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_free0 (_tmp0_);
-#line 8061 "LibraryMonitor.c"
+#line 8062 "LibraryMonitor.c"
 	}
-	goto __finally493;
-	__catch493_g_error:
+	goto __finally502;
+	__catch502_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -8085,9 +8086,9 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_g_free0 (md5);
 #line 183 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 8087 "LibraryMonitor.c"
+#line 8088 "LibraryMonitor.c"
 	}
-	__finally493:
+	__finally502:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8098,7 +8099,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return;
-#line 8100 "LibraryMonitor.c"
+#line 8101 "LibraryMonitor.c"
 	}
 	{
 		GeeIterator* _candidate_it = NULL;
@@ -8112,7 +8113,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_candidate_it = _tmp7_;
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		while (TRUE) {
-#line 8114 "LibraryMonitor.c"
+#line 8115 "LibraryMonitor.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			Monitorable* candidate = NULL;
@@ -8131,7 +8132,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 			if (!_tmp9_) {
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 8133 "LibraryMonitor.c"
+#line 8134 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_tmp10_ = _candidate_it;
@@ -8153,7 +8154,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 			_g_free0 (_tmp14_);
 #line 187 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			if (_tmp16_) {
-#line 8155 "LibraryMonitor.c"
+#line 8156 "LibraryMonitor.c"
 				Monitorable* _tmp17_;
 				Monitorable* _tmp18_;
 #line 188 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8168,19 +8169,19 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 				_g_object_unref0 (candidate);
 #line 190 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				break;
-#line 8170 "LibraryMonitor.c"
+#line 8171 "LibraryMonitor.c"
 			}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			_g_object_unref0 (candidate);
-#line 8174 "LibraryMonitor.c"
+#line 8175 "LibraryMonitor.c"
 		}
 #line 186 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_g_object_unref0 (_candidate_it);
-#line 8178 "LibraryMonitor.c"
+#line 8179 "LibraryMonitor.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_free0 (md5);
-#line 8182 "LibraryMonitor.c"
+#line 8183 "LibraryMonitor.c"
 }
 
 
@@ -8191,7 +8192,7 @@ static void library_monitor_runtime_find_move_job_class_init (LibraryMonitorRunt
 	((BackgroundJobClass *) klass)->finalize = library_monitor_runtime_find_move_job_finalize;
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) library_monitor_runtime_find_move_job_real_execute;
-#line 8193 "LibraryMonitor.c"
+#line 8194 "LibraryMonitor.c"
 }
 
 
@@ -8200,7 +8201,7 @@ static void library_monitor_runtime_find_move_job_instance_init (LibraryMonitorR
 	self->match = NULL;
 #line 165 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->err = NULL;
-#line 8202 "LibraryMonitor.c"
+#line 8203 "LibraryMonitor.c"
 }
 
 
@@ -8218,7 +8219,7 @@ static void library_monitor_runtime_find_move_job_finalize (BackgroundJob * obj)
 	_g_error_free0 (self->err);
 #line 161 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	BACKGROUND_JOB_CLASS (library_monitor_runtime_find_move_job_parent_class)->finalize (obj);
-#line 8220 "LibraryMonitor.c"
+#line 8221 "LibraryMonitor.c"
 }
 
 
@@ -8264,21 +8265,21 @@ static LibraryMonitorVerifyJob* library_monitor_verify_job_construct (GType obje
 	self->monitor = _tmp3_;
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return self;
-#line 8266 "LibraryMonitor.c"
+#line 8267 "LibraryMonitor.c"
 }
 
 
 static LibraryMonitorVerifyJob* library_monitor_verify_job_new (Monitorable* monitorable, MediaMonitor* monitor) {
 #line 200 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return library_monitor_verify_job_construct (LIBRARY_MONITOR_TYPE_VERIFY_JOB, monitorable, monitor);
-#line 8273 "LibraryMonitor.c"
+#line 8274 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_value_verify_job_init (GValue* value) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	value->data[0].v_pointer = NULL;
-#line 8280 "LibraryMonitor.c"
+#line 8281 "LibraryMonitor.c"
 }
 
 
@@ -8287,7 +8288,7 @@ static void library_monitor_value_verify_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (value->data[0].v_pointer);
-#line 8289 "LibraryMonitor.c"
+#line 8290 "LibraryMonitor.c"
 	}
 }
 
@@ -8297,11 +8298,11 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = library_monitor_verify_job_ref (src_value->data[0].v_pointer);
-#line 8299 "LibraryMonitor.c"
+#line 8300 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8303 "LibraryMonitor.c"
+#line 8304 "LibraryMonitor.c"
 	}
 }
 
@@ -8309,37 +8310,37 @@ static void library_monitor_value_verify_job_copy_value (const GValue* src_value
 static gpointer library_monitor_value_verify_job_peek_pointer (const GValue* value) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 8311 "LibraryMonitor.c"
+#line 8312 "LibraryMonitor.c"
 }
 
 
 static gchar* library_monitor_value_verify_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (collect_values[0].v_pointer) {
-#line 8318 "LibraryMonitor.c"
+#line 8319 "LibraryMonitor.c"
 		LibraryMonitorVerifyJob * object;
 		object = collect_values[0].v_pointer;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8325 "LibraryMonitor.c"
+#line 8326 "LibraryMonitor.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.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 8329 "LibraryMonitor.c"
+#line 8330 "LibraryMonitor.c"
 		}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = library_monitor_verify_job_ref (object);
-#line 8333 "LibraryMonitor.c"
+#line 8334 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8337 "LibraryMonitor.c"
+#line 8338 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8341 "LibraryMonitor.c"
+#line 8342 "LibraryMonitor.c"
 }
 
 
@@ -8350,25 +8351,25 @@ static gchar* library_monitor_value_verify_job_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8352 "LibraryMonitor.c"
+#line 8353 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (!value->data[0].v_pointer) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = NULL;
-#line 8358 "LibraryMonitor.c"
+#line 8359 "LibraryMonitor.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8362 "LibraryMonitor.c"
+#line 8363 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		*object_p = library_monitor_verify_job_ref (value->data[0].v_pointer);
-#line 8366 "LibraryMonitor.c"
+#line 8367 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return NULL;
-#line 8370 "LibraryMonitor.c"
+#line 8371 "LibraryMonitor.c"
 }
 
 
@@ -8382,7 +8383,7 @@ static GParamSpec* library_monitor_param_spec_verify_job (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return G_PARAM_SPEC (spec);
-#line 8384 "LibraryMonitor.c"
+#line 8385 "LibraryMonitor.c"
 }
 
 
@@ -8391,7 +8392,7 @@ static gpointer library_monitor_value_get_verify_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, LIBRARY_MONITOR_TYPE_VERIFY_JOB), NULL);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return value->data[0].v_pointer;
-#line 8393 "LibraryMonitor.c"
+#line 8394 "LibraryMonitor.c"
 }
 
 
@@ -8411,17 +8412,17 @@ static void library_monitor_value_set_verify_job (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_ref (value->data[0].v_pointer);
-#line 8413 "LibraryMonitor.c"
+#line 8414 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8417 "LibraryMonitor.c"
+#line 8418 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (old);
-#line 8423 "LibraryMonitor.c"
+#line 8424 "LibraryMonitor.c"
 	}
 }
 
@@ -8440,17 +8441,17 @@ static void library_monitor_value_take_verify_job (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = v_object;
-#line 8442 "LibraryMonitor.c"
+#line 8443 "LibraryMonitor.c"
 	} else {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		value->data[0].v_pointer = NULL;
-#line 8446 "LibraryMonitor.c"
+#line 8447 "LibraryMonitor.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (old) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		library_monitor_verify_job_unref (old);
-#line 8452 "LibraryMonitor.c"
+#line 8453 "LibraryMonitor.c"
 	}
 }
 
@@ -8460,14 +8461,14 @@ static void library_monitor_verify_job_class_init (LibraryMonitorVerifyJobClass
 	library_monitor_verify_job_parent_class = g_type_class_peek_parent (klass);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	((LibraryMonitorVerifyJobClass *) klass)->finalize = library_monitor_verify_job_finalize;
-#line 8462 "LibraryMonitor.c"
+#line 8463 "LibraryMonitor.c"
 }
 
 
 static void library_monitor_verify_job_instance_init (LibraryMonitorVerifyJob * self) {
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->ref_count = 1;
-#line 8469 "LibraryMonitor.c"
+#line 8470 "LibraryMonitor.c"
 }
 
 
@@ -8481,7 +8482,7 @@ static void library_monitor_verify_job_finalize (LibraryMonitorVerifyJob * obj)
 	_g_object_unref0 (self->monitorable);
 #line 198 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	_g_object_unref0 (self->monitor);
-#line 8483 "LibraryMonitor.c"
+#line 8484 "LibraryMonitor.c"
 }
 
 
@@ -8506,7 +8507,7 @@ static gpointer library_monitor_verify_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	return instance;
-#line 8508 "LibraryMonitor.c"
+#line 8509 "LibraryMonitor.c"
 }
 
 
@@ -8519,7 +8520,7 @@ static void library_monitor_verify_job_unref (gpointer instance) {
 		LIBRARY_MONITOR_VERIFY_JOB_GET_CLASS (self)->finalize (self);
 #line 196 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8521 "LibraryMonitor.c"
+#line 8522 "LibraryMonitor.c"
 	}
 }
 
@@ -8569,7 +8570,7 @@ static void library_monitor_class_init (LibraryMonitorClass * klass) {
 	_tmp1_ = hash_timed_queue_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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 8571 "LibraryMonitor.c"
+#line 8572 "LibraryMonitor.c"
 }
 
 
@@ -8638,7 +8639,7 @@ static void library_monitor_instance_init (LibraryMonitor * self) {
 	self->priv->completed_monitorable_verifies = 0;
 #line 228 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	self->priv->total_monitorable_verifies = 0;
-#line 8640 "LibraryMonitor.c"
+#line 8641 "LibraryMonitor.c"
 }
 
 
@@ -8683,7 +8684,7 @@ static void library_monitor_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->verify_queue);
 #line 97 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	G_OBJECT_CLASS (library_monitor_parent_class)->finalize (obj);
-#line 8685 "LibraryMonitor.c"
+#line 8686 "LibraryMonitor.c"
 }
 
 
diff --git a/src/LibraryMonitor.vala b/src/LibraryMonitor.vala
index 75194c1..f9291d7 100644
--- a/src/LibraryMonitor.vala
+++ b/src/LibraryMonitor.vala
@@ -593,7 +593,7 @@ public class LibraryMonitor : DirectoryMonitor {
             if (is_blacklisted(file))
                 continue;
             
-            jobs.add(new FileImportJob(file, false));
+            jobs.add(new FileImportJob(file, false, true));
             pending_imports.add(file);
         }
         
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 9a6edc0..a48a8dd 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1360,6 +1360,7 @@ static void _media_collection_registry_on_import_directory_changed_configuration
 void media_collection_registry_terminate (void);
 LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self);
 GFile* directory_monitor_get_root (DirectoryMonitor* self);
+void library_files_select_copy_function (void);
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
 gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id);
 #define PHOTO_TYPENAME "thumb"
@@ -1422,14 +1423,14 @@ BackingFileState* backing_file_state_construct (GType object_type, const gchar*
 	self->md5 = _tmp5_;
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1426 "MediaDataRepresentation.c"
+#line 1427 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) {
 #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return backing_file_state_construct (TYPE_BACKING_FILE_STATE, filepath, filesize, modification_time, md5);
-#line 1433 "MediaDataRepresentation.c"
+#line 1434 "MediaDataRepresentation.c"
 }
 
 
@@ -1480,14 +1481,14 @@ BackingFileState* backing_file_state_construct_from_photo_row (GType object_type
 	self->md5 = _tmp8_;
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1484 "MediaDataRepresentation.c"
+#line 1485 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5) {
 #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return backing_file_state_construct_from_photo_row (TYPE_BACKING_FILE_STATE, photo_row, md5);
-#line 1491 "MediaDataRepresentation.c"
+#line 1492 "MediaDataRepresentation.c"
 }
 
 
@@ -1505,14 +1506,14 @@ GFile* backing_file_state_get_file (BackingFileState* self) {
 	result = _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1509 "MediaDataRepresentation.c"
+#line 1510 "MediaDataRepresentation.c"
 }
 
 
 static void value_backing_file_state_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	value->data[0].v_pointer = NULL;
-#line 1516 "MediaDataRepresentation.c"
+#line 1517 "MediaDataRepresentation.c"
 }
 
 
@@ -1521,7 +1522,7 @@ static void value_backing_file_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (value->data[0].v_pointer);
-#line 1525 "MediaDataRepresentation.c"
+#line 1526 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1531,11 +1532,11 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = backing_file_state_ref (src_value->data[0].v_pointer);
-#line 1535 "MediaDataRepresentation.c"
+#line 1536 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1539 "MediaDataRepresentation.c"
+#line 1540 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1543,37 +1544,37 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue
 static gpointer value_backing_file_state_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 1547 "MediaDataRepresentation.c"
+#line 1548 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_backing_file_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (collect_values[0].v_pointer) {
-#line 1554 "MediaDataRepresentation.c"
+#line 1555 "MediaDataRepresentation.c"
 		BackingFileState * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1561 "MediaDataRepresentation.c"
+#line 1562 "MediaDataRepresentation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.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 1565 "MediaDataRepresentation.c"
+#line 1566 "MediaDataRepresentation.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = backing_file_state_ref (object);
-#line 1569 "MediaDataRepresentation.c"
+#line 1570 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1573 "MediaDataRepresentation.c"
+#line 1574 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 1577 "MediaDataRepresentation.c"
+#line 1578 "MediaDataRepresentation.c"
 }
 
 
@@ -1584,25 +1585,25 @@ static gchar* value_backing_file_state_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1588 "MediaDataRepresentation.c"
+#line 1589 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = NULL;
-#line 1594 "MediaDataRepresentation.c"
+#line 1595 "MediaDataRepresentation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1598 "MediaDataRepresentation.c"
+#line 1599 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = backing_file_state_ref (value->data[0].v_pointer);
-#line 1602 "MediaDataRepresentation.c"
+#line 1603 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 1606 "MediaDataRepresentation.c"
+#line 1607 "MediaDataRepresentation.c"
 }
 
 
@@ -1616,7 +1617,7 @@ GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return G_PARAM_SPEC (spec);
-#line 1620 "MediaDataRepresentation.c"
+#line 1621 "MediaDataRepresentation.c"
 }
 
 
@@ -1625,7 +1626,7 @@ gpointer value_get_backing_file_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE), NULL);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 1629 "MediaDataRepresentation.c"
+#line 1630 "MediaDataRepresentation.c"
 }
 
 
@@ -1645,17 +1646,17 @@ void value_set_backing_file_state (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_ref (value->data[0].v_pointer);
-#line 1649 "MediaDataRepresentation.c"
+#line 1650 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1653 "MediaDataRepresentation.c"
+#line 1654 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (old);
-#line 1659 "MediaDataRepresentation.c"
+#line 1660 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1674,17 +1675,17 @@ void value_take_backing_file_state (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/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1678 "MediaDataRepresentation.c"
+#line 1679 "MediaDataRepresentation.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 1682 "MediaDataRepresentation.c"
+#line 1683 "MediaDataRepresentation.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		backing_file_state_unref (old);
-#line 1688 "MediaDataRepresentation.c"
+#line 1689 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1694,14 +1695,14 @@ static void backing_file_state_class_init (BackingFileStateClass * klass) {
 	backing_file_state_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((BackingFileStateClass *) klass)->finalize = backing_file_state_finalize;
-#line 1698 "MediaDataRepresentation.c"
+#line 1699 "MediaDataRepresentation.c"
 }
 
 
 static void backing_file_state_instance_init (BackingFileState * self) {
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->ref_count = 1;
-#line 1705 "MediaDataRepresentation.c"
+#line 1706 "MediaDataRepresentation.c"
 }
 
 
@@ -1715,7 +1716,7 @@ static void backing_file_state_finalize (BackingFileState * obj) {
 	_g_free0 (self->filepath);
 #line 11 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (self->md5);
-#line 1719 "MediaDataRepresentation.c"
+#line 1720 "MediaDataRepresentation.c"
 }
 
 
@@ -1740,7 +1741,7 @@ gpointer backing_file_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return instance;
-#line 1744 "MediaDataRepresentation.c"
+#line 1745 "MediaDataRepresentation.c"
 }
 
 
@@ -1753,7 +1754,7 @@ void backing_file_state_unref (gpointer instance) {
 		BACKING_FILE_STATE_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1757 "MediaDataRepresentation.c"
+#line 1758 "MediaDataRepresentation.c"
 	}
 }
 
@@ -1767,7 +1768,7 @@ MediaSource* media_source_construct (GType object_type, gint64 object_id) {
 	self = (MediaSource*) thumbnail_source_construct (object_type, _tmp0_);
 #line 39 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 1771 "MediaDataRepresentation.c"
+#line 1772 "MediaDataRepresentation.c"
 }
 
 
@@ -1783,7 +1784,7 @@ inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector)
 	result = _tmp0_ | _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1787 "MediaDataRepresentation.c"
+#line 1788 "MediaDataRepresentation.c"
 }
 
 
@@ -1799,7 +1800,7 @@ inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 select
 	result = _tmp0_ & (~_tmp1_);
 #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1803 "MediaDataRepresentation.c"
+#line 1804 "MediaDataRepresentation.c"
 }
 
 
@@ -1815,7 +1816,7 @@ inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 select
 	result = (_tmp0_ & _tmp1_) != ((guint64) 0);
 #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 1819 "MediaDataRepresentation.c"
+#line 1820 "MediaDataRepresentation.c"
 }
 
 
@@ -1832,7 +1833,7 @@ static void media_source_real_notify_master_replaced (MediaSource* self, GFile*
 	_tmp1_ = new_file;
 #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 1836 "MediaDataRepresentation.c"
+#line 1837 "MediaDataRepresentation.c"
 }
 
 
@@ -1841,14 +1842,14 @@ void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GF
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
 #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->notify_master_replaced (self, old_file, new_file);
-#line 1845 "MediaDataRepresentation.c"
+#line 1846 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _alteration_ref0 (gpointer self) {
 #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? alteration_ref (self) : NULL;
-#line 1852 "MediaDataRepresentation.c"
+#line 1853 "MediaDataRepresentation.c"
 }
 
 
@@ -1858,9 +1859,10 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	Alteration* _tmp3_;
-	gboolean _tmp4_;
-	Alteration* _tmp11_;
+	gboolean _tmp3_ = FALSE;
+	Alteration* _tmp4_;
+	gboolean _tmp5_;
+	Alteration* _tmp14_;
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -1872,57 +1874,73 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte
 #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	local = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp3_ = local;
+	_tmp4_ = local;
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp4_ = alteration_has_detail (_tmp3_, "metadata", "name");
+	_tmp5_ = alteration_has_detail (_tmp4_, "metadata", "name");
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	if (_tmp4_) {
+	if (_tmp5_) {
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp2_ = TRUE;
-#line 1883 "MediaDataRepresentation.c"
+		_tmp3_ = TRUE;
+#line 1885 "MediaDataRepresentation.c"
 	} else {
-		Alteration* _tmp5_;
-		gboolean _tmp6_;
-#line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp5_ = local;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
+#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp6_ = local;
+#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment");
+#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp3_ = _tmp7_;
+#line 1895 "MediaDataRepresentation.c"
+	}
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp6_ = alteration_has_detail (_tmp5_, "backing", "master");
+	if (_tmp3_) {
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp2_ = _tmp6_;
-#line 1893 "MediaDataRepresentation.c"
+		_tmp2_ = TRUE;
+#line 1901 "MediaDataRepresentation.c"
+	} else {
+		Alteration* _tmp8_;
+		gboolean _tmp9_;
+#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp8_ = local;
+#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp9_ = alteration_has_detail (_tmp8_, "backing", "master");
+#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp2_ = _tmp9_;
+#line 1911 "MediaDataRepresentation.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp2_) {
-#line 1897 "MediaDataRepresentation.c"
-		Alteration* _tmp7_;
-		Alteration* _tmp8_;
-		Alteration* _tmp9_;
+#line 1915 "MediaDataRepresentation.c"
 		Alteration* _tmp10_;
-#line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		Alteration* _tmp11_;
+		Alteration* _tmp12_;
+		Alteration* _tmp13_;
+#line 65 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_update_indexable_keywords (self);
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp7_ = local;
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp8_ = alteration_new ("indexable", "keywords");
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp9_ = _tmp8_;
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_tmp10_ = alteration_compress (_tmp7_, _tmp9_);
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp10_ = local;
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp11_ = alteration_new ("indexable", "keywords");
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp12_ = _tmp11_;
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_tmp13_ = alteration_compress (_tmp10_, _tmp12_);
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_alteration_unref0 (local);
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		local = _tmp10_;
-#line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		_alteration_unref0 (_tmp9_);
-#line 1918 "MediaDataRepresentation.c"
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		local = _tmp13_;
+#line 66 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		_alteration_unref0 (_tmp12_);
+#line 1936 "MediaDataRepresentation.c"
 	}
-#line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp11_ = local;
-#line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp11_);
+#line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_tmp14_ = local;
+#line 69 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp14_);
 #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_alteration_unref0 (local);
-#line 1926 "MediaDataRepresentation.c"
+#line 1944 "MediaDataRepresentation.c"
 }
 
 
@@ -1931,37 +1949,37 @@ static void media_source_real_notify_membership_changed (DataObject* base, DataC
 	gboolean _tmp0_ = FALSE;
 	DataCollection* _tmp1_;
 	DataCollection* _tmp3_;
-#line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
-#line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 74 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((collection == NULL) || IS_DATA_COLLECTION (collection));
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = collection;
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 1943 "MediaDataRepresentation.c"
+#line 1961 "MediaDataRepresentation.c"
 		const gchar* _tmp2_;
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = self->priv->indexable_keywords;
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1949 "MediaDataRepresentation.c"
+#line 1967 "MediaDataRepresentation.c"
 	} else {
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = FALSE;
-#line 1953 "MediaDataRepresentation.c"
+#line 1971 "MediaDataRepresentation.c"
 	}
-#line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 75 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_) {
-#line 76 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 78 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_update_indexable_keywords (self);
-#line 1959 "MediaDataRepresentation.c"
+#line 1977 "MediaDataRepresentation.c"
 	}
-#line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = collection;
-#line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 81 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp3_);
-#line 1965 "MediaDataRepresentation.c"
+#line 1983 "MediaDataRepresentation.c"
 }
 
 
@@ -1977,49 +1995,49 @@ static void media_source_update_indexable_keywords (MediaSource* self) {
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gchar* _tmp7_;
-#line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = g_new0 (gchar*, 3 + 1);
-#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables = _tmp0_;
-#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables_length1 = 3;
-#line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_indexables_size_ = indexables_length1;
-#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = media_source_get_title (self);
-#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (indexables[0]);
-#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables[0] = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = indexables[0];
-#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = media_source_get_basename (self);
-#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (indexables[1]);
-#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables[1] = _tmp3_;
-#line 85 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 87 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = indexables[1];
-#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = media_source_get_comment (self);
-#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (indexables[2]);
-#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables[2] = _tmp5_;
-#line 86 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_tmp6_ = indexables[2];
 #line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_tmp6_ = indexables[2];
+#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = indexable_prepare_indexable_strings (indexables, indexables_length1);
-#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (self->priv->indexable_keywords);
-#line 88 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 90 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->indexable_keywords = _tmp7_;
-#line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 84 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	indexables = (_vala_array_free (indexables, indexables_length1, (GDestroyNotify) g_free), NULL);
-#line 2023 "MediaDataRepresentation.c"
+#line 2041 "MediaDataRepresentation.c"
 }
 
 
@@ -2027,41 +2045,41 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) {
 	MediaSource * self;
 	const gchar* result = NULL;
 	const gchar* _tmp0_;
-#line 91 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 93 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
-#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->indexable_keywords;
-#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp0_;
-#line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 94 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2039 "MediaDataRepresentation.c"
+#line 2057 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) {
 	gboolean _tmp0_ = FALSE;
-#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2049 "MediaDataRepresentation.c"
+#line 2067 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_set_event_id (MediaSource* self, EventID* id) {
-#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id);
-#line 2058 "MediaDataRepresentation.c"
+#line 2076 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2065 "MediaDataRepresentation.c"
+#line 2083 "MediaDataRepresentation.c"
 }
 
 
@@ -2076,36 +2094,36 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 	gboolean _tmp13_;
 	gboolean _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 98 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 100 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	ret = FALSE;
-#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_get_master_file (self);
-#line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	file = _tmp0_;
-#line 2088 "MediaDataRepresentation.c"
+#line 2106 "MediaDataRepresentation.c"
 	{
 		gboolean _tmp1_ = FALSE;
 		GFile* _tmp2_;
 		gboolean _tmp3_;
-#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = file;
-#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = g_file_trash (_tmp2_, NULL, &_inner_error_);
-#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp3_;
-#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2101 "MediaDataRepresentation.c"
-			goto __catch562_g_error;
+#line 2119 "MediaDataRepresentation.c"
+			goto __catch571_g_error;
 		}
-#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 104 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
-#line 2106 "MediaDataRepresentation.c"
+#line 2124 "MediaDataRepresentation.c"
 	}
-	goto __finally562;
-	__catch562_g_error:
+	goto __finally571;
+	__catch571_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_;
@@ -2113,71 +2131,71 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		gchar* _tmp6_;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		err = _inner_error_;
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = file;
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = g_file_get_path (_tmp4_);
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = _tmp5_;
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7_ = err;
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = _tmp7_->message;
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		g_message ("MediaDataRepresentation.vala:106: Unable to move original photo %s to " \
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		g_message ("MediaDataRepresentation.vala:108: Unable to move original photo %s to " \
 "trash: %s", _tmp6_, _tmp8_);
-#line 106 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 108 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (_tmp6_);
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_error_free0 (err);
-#line 2137 "MediaDataRepresentation.c"
+#line 2155 "MediaDataRepresentation.c"
 	}
-	__finally562:
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	__finally571:
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2142 "MediaDataRepresentation.c"
+#line 2160 "MediaDataRepresentation.c"
 		gboolean _tmp9_ = FALSE;
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (file);
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_clear_error (&_inner_error_);
-#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 103 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return _tmp9_;
-#line 2152 "MediaDataRepresentation.c"
+#line 2170 "MediaDataRepresentation.c"
 	}
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp10_ = file;
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp11_ = app_dirs_get_import_dir ();
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp12_ = _tmp11_;
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp13_ = g_file_has_prefix (_tmp10_, _tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp14_ = _tmp13_;
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp12_);
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp14_) {
-#line 2168 "MediaDataRepresentation.c"
+#line 2186 "MediaDataRepresentation.c"
 		GFile* parent = NULL;
 		GFile* _tmp15_;
 		GFile* _tmp16_;
-#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp15_ = file;
-#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		parent = _tmp16_;
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 2180 "MediaDataRepresentation.c"
+#line 2198 "MediaDataRepresentation.c"
 			GFile* _tmp17_;
 			GFile* _tmp18_;
 			GFile* _tmp19_;
@@ -2187,88 +2205,88 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 			GFile* _tmp23_;
 			gboolean _tmp24_ = FALSE;
 			GFile* _tmp25_;
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = parent;
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = app_dirs_get_import_dir ();
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp19_ = _tmp18_;
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp20_ = g_file_equal (_tmp17_, _tmp19_);
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp21_ = !(!_tmp20_);
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_tmp19_);
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp21_) {
-#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2206 "MediaDataRepresentation.c"
+#line 2224 "MediaDataRepresentation.c"
 			}
-#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp22_ = parent;
-#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp23_ = g_file_get_parent (_tmp22_);
-#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (parent);
-#line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			parent = _tmp23_;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp25_ = parent;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp25_ == NULL) {
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = TRUE;
-#line 2222 "MediaDataRepresentation.c"
+#line 2240 "MediaDataRepresentation.c"
 			} else {
 				GFile* _tmp26_;
 				GFile* _tmp27_;
 				GFile* _tmp28_;
 				gboolean _tmp29_;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = parent;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp27_ = app_dirs_get_import_dir ();
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = _tmp27_;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp29_ = g_file_equal (_tmp26_, _tmp28_);
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = _tmp29_;
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp28_);
-#line 2240 "MediaDataRepresentation.c"
+#line 2258 "MediaDataRepresentation.c"
 			}
-#line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 117 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp24_) {
-#line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2246 "MediaDataRepresentation.c"
+#line 2264 "MediaDataRepresentation.c"
 			}
 			{
 				gboolean _tmp30_ = FALSE;
 				GFile* _tmp31_;
 				gboolean _tmp32_;
-#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = parent;
-#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp32_ = query_is_directory_empty (_tmp31_, &_inner_error_);
-#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp30_ = _tmp32_;
-#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2260 "MediaDataRepresentation.c"
-					goto __catch563_g_error;
+#line 2278 "MediaDataRepresentation.c"
+					goto __catch572_g_error;
 				}
-#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 121 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp30_) {
-#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 2267 "MediaDataRepresentation.c"
+#line 2285 "MediaDataRepresentation.c"
 				}
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally572;
+			__catch572_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp33_;
@@ -2276,75 +2294,75 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				gchar* _tmp35_;
 				GError* _tmp36_;
 				const gchar* _tmp37_;
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_inner_error_ = NULL;
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp33_ = parent;
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp34_ = g_file_get_path (_tmp33_);
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35_ = _tmp34_;
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp36_ = err;
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp37_ = _tmp36_->message;
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_warning ("MediaDataRepresentation.vala:122: Unable to query file info for %s: %s", _tmp35_, _tmp37_);
-#line 122 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_free0 (_tmp35_);
 #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				_g_error_free0 (err);
+				g_warning ("MediaDataRepresentation.vala:124: Unable to query file info for %s: %s", _tmp35_, _tmp37_);
 #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_g_free0 (_tmp35_);
+#line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				_g_error_free0 (err);
+#line 126 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 2301 "MediaDataRepresentation.c"
+#line 2319 "MediaDataRepresentation.c"
 			}
-			__finally563:
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			__finally572:
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2306 "MediaDataRepresentation.c"
+#line 2324 "MediaDataRepresentation.c"
 				gboolean _tmp38_ = FALSE;
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (file);
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return _tmp38_;
-#line 2318 "MediaDataRepresentation.c"
+#line 2336 "MediaDataRepresentation.c"
 			}
 			{
 				GFile* _tmp39_;
 				GFile* _tmp40_;
 				gchar* _tmp41_;
 				gchar* _tmp42_;
-#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp39_ = parent;
-#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_file_delete (_tmp39_, NULL, &_inner_error_);
-#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 130 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2331 "MediaDataRepresentation.c"
-					goto __catch564_g_error;
+#line 2349 "MediaDataRepresentation.c"
+					goto __catch573_g_error;
 				}
-#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp40_ = parent;
-#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp41_ = g_file_get_path (_tmp40_);
-#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp42_ = _tmp41_;
-#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_);
-#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				g_debug ("MediaDataRepresentation.vala:131: Deleted empty directory %s", _tmp42_);
+#line 131 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_free0 (_tmp42_);
-#line 2344 "MediaDataRepresentation.c"
+#line 2362 "MediaDataRepresentation.c"
 			}
-			goto __finally564;
-			__catch564_g_error:
+			goto __finally573;
+			__catch573_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp43_;
@@ -2352,58 +2370,58 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				gchar* _tmp45_;
 				GError* _tmp46_;
 				const gchar* _tmp47_;
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp44_ = g_file_get_path (_tmp43_);
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp45_ = _tmp44_;
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp46_ = err;
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp47_ = _tmp46_->message;
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_message ("MediaDataRepresentation.vala:132: Unable to delete empty directory %s:" \
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				g_message ("MediaDataRepresentation.vala:134: Unable to delete empty directory %s:" \
 " %s", _tmp45_, _tmp47_);
-#line 132 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 134 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_free0 (_tmp45_);
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
-#line 2375 "MediaDataRepresentation.c"
+#line 2393 "MediaDataRepresentation.c"
 			}
-			__finally564:
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			__finally573:
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2380 "MediaDataRepresentation.c"
+#line 2398 "MediaDataRepresentation.c"
 				gboolean _tmp48_ = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (parent);
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (file);
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return _tmp48_;
-#line 2392 "MediaDataRepresentation.c"
+#line 2410 "MediaDataRepresentation.c"
 			}
 		}
-#line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (parent);
-#line 2397 "MediaDataRepresentation.c"
+#line 2415 "MediaDataRepresentation.c"
 	}
-#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = ret;
-#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (file);
-#line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 140 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2405 "MediaDataRepresentation.c"
+#line 2423 "MediaDataRepresentation.c"
 }
 
 
@@ -2415,47 +2433,47 @@ static gchar* media_source_real_get_name (DataObject* base) {
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_;
 	gboolean _tmp3_;
-#line 141 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 143 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource);
-#line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_get_title (self);
-#line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	title = _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	title = _tmp0_;
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = title;
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = is_string_empty (_tmp2_);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp3_) {
-#line 2429 "MediaDataRepresentation.c"
+#line 2447 "MediaDataRepresentation.c"
 		gchar* _tmp4_;
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = media_source_get_basename (self);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (_tmp1_);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp4_;
-#line 2437 "MediaDataRepresentation.c"
+#line 2455 "MediaDataRepresentation.c"
 	} else {
 		const gchar* _tmp5_;
 		gchar* _tmp6_;
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = title;
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = g_strdup (_tmp5_);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (_tmp1_);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp6_;
-#line 2449 "MediaDataRepresentation.c"
+#line 2467 "MediaDataRepresentation.c"
 	}
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (title);
-#line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 146 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2457 "MediaDataRepresentation.c"
+#line 2475 "MediaDataRepresentation.c"
 }
 
 
@@ -2465,214 +2483,214 @@ static gchar* media_source_real_get_basename (MediaSource* self) {
 	GFile* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_get_file (self);
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = g_file_get_basename (_tmp1_);
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = _tmp2_;
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp3_;
-#line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 150 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2481 "MediaDataRepresentation.c"
+#line 2499 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_get_basename (MediaSource* self) {
-#line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 149 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self);
-#line 2490 "MediaDataRepresentation.c"
+#line 2508 "MediaDataRepresentation.c"
 }
 
 
 static GFile* media_source_real_get_file (MediaSource* self) {
-#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_file'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2499 "MediaDataRepresentation.c"
+#line 2517 "MediaDataRepresentation.c"
 }
 
 
 GFile* media_source_get_file (MediaSource* self) {
-#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_file (self);
-#line 2508 "MediaDataRepresentation.c"
+#line 2526 "MediaDataRepresentation.c"
 }
 
 
 static GFile* media_source_real_get_master_file (MediaSource* self) {
-#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_file'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2517 "MediaDataRepresentation.c"
+#line 2535 "MediaDataRepresentation.c"
 }
 
 
 GFile* media_source_get_master_file (MediaSource* self) {
-#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self);
-#line 2526 "MediaDataRepresentation.c"
+#line 2544 "MediaDataRepresentation.c"
 }
 
 
 static guint64 media_source_real_get_master_filesize (MediaSource* self) {
 	guint64 _tmp0_ = 0ULL;
-#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2536 "MediaDataRepresentation.c"
+#line 2554 "MediaDataRepresentation.c"
 }
 
 
 guint64 media_source_get_master_filesize (MediaSource* self) {
-#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL);
-#line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self);
-#line 2545 "MediaDataRepresentation.c"
+#line 2563 "MediaDataRepresentation.c"
 }
 
 
 static guint64 media_source_real_get_filesize (MediaSource* self) {
 	guint64 _tmp0_ = 0ULL;
-#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2555 "MediaDataRepresentation.c"
+#line 2573 "MediaDataRepresentation.c"
 }
 
 
 guint64 media_source_get_filesize (MediaSource* self) {
-#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL);
-#line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 156 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self);
-#line 2564 "MediaDataRepresentation.c"
+#line 2582 "MediaDataRepresentation.c"
 }
 
 
 static time_t media_source_real_get_timestamp (MediaSource* self) {
 	time_t _tmp0_ = 0;
-#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_timestamp'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2574 "MediaDataRepresentation.c"
+#line 2592 "MediaDataRepresentation.c"
 }
 
 
 time_t media_source_get_timestamp (MediaSource* self) {
-#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
-#line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 157 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self);
-#line 2583 "MediaDataRepresentation.c"
+#line 2601 "MediaDataRepresentation.c"
 }
 
 
 static BackingFileState** media_source_real_get_backing_files_state (MediaSource* self, int* result_length1) {
-#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_backing_files_state'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2592 "MediaDataRepresentation.c"
+#line 2610 "MediaDataRepresentation.c"
 }
 
 
 BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* result_length1) {
-#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1);
-#line 2601 "MediaDataRepresentation.c"
+#line 2619 "MediaDataRepresentation.c"
 }
 
 
 static gchar* media_source_real_get_title (MediaSource* self) {
-#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2610 "MediaDataRepresentation.c"
+#line 2628 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_get_title (MediaSource* self) {
-#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_title (self);
-#line 2619 "MediaDataRepresentation.c"
+#line 2637 "MediaDataRepresentation.c"
 }
 
 
 static gchar* media_source_real_get_comment (MediaSource* self) {
-#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2628 "MediaDataRepresentation.c"
+#line 2646 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_get_comment (MediaSource* self) {
-#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self);
-#line 2637 "MediaDataRepresentation.c"
+#line 2655 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_set_title (MediaSource* self, const gchar* title) {
-#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_title'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2646 "MediaDataRepresentation.c"
+#line 2664 "MediaDataRepresentation.c"
 }
 
 
 void media_source_set_title (MediaSource* self, const gchar* title) {
-#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 164 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title);
-#line 2655 "MediaDataRepresentation.c"
+#line 2673 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_set_comment (MediaSource* self, const gchar* comment) {
 	gboolean _tmp0_ = FALSE;
-#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2665 "MediaDataRepresentation.c"
+#line 2683 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_set_comment (MediaSource* self, const gchar* comment) {
-#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 165 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment);
-#line 2674 "MediaDataRepresentation.c"
+#line 2692 "MediaDataRepresentation.c"
 }
 
 
@@ -2680,15 +2698,15 @@ gchar* media_source_prep_title (const gchar* title) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = title;
-#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = prepare_input_text (_tmp0_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 168 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2690 "MediaDataRepresentation.c"
+#line 2708 "MediaDataRepresentation.c"
 }
 
 
@@ -2696,269 +2714,269 @@ gchar* media_source_prep_comment (const gchar* comment) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = comment;
-#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = prepare_input_text (_tmp0_, (PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)) & (~PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL), -1);
-#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 173 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 2706 "MediaDataRepresentation.c"
+#line 2724 "MediaDataRepresentation.c"
 }
 
 
 static Rating media_source_real_get_rating (MediaSource* self) {
-#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return 0;
-#line 2715 "MediaDataRepresentation.c"
+#line 2733 "MediaDataRepresentation.c"
 }
 
 
 Rating media_source_get_rating (MediaSource* self) {
-#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
-#line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self);
-#line 2724 "MediaDataRepresentation.c"
+#line 2742 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_set_rating (MediaSource* self, Rating rating) {
-#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_set_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2733 "MediaDataRepresentation.c"
+#line 2751 "MediaDataRepresentation.c"
 }
 
 
 void media_source_set_rating (MediaSource* self, Rating rating) {
-#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating);
-#line 2742 "MediaDataRepresentation.c"
+#line 2760 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_increase_rating (MediaSource* self) {
-#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_increase_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2751 "MediaDataRepresentation.c"
+#line 2769 "MediaDataRepresentation.c"
 }
 
 
 void media_source_increase_rating (MediaSource* self) {
-#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 179 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self);
-#line 2760 "MediaDataRepresentation.c"
+#line 2778 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_decrease_rating (MediaSource* self) {
-#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_decrease_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2769 "MediaDataRepresentation.c"
+#line 2787 "MediaDataRepresentation.c"
 }
 
 
 void media_source_decrease_rating (MediaSource* self) {
-#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self);
-#line 2778 "MediaDataRepresentation.c"
+#line 2796 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) {
-#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_dimensions'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2787 "MediaDataRepresentation.c"
+#line 2805 "MediaDataRepresentation.c"
 }
 
 
 void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result) {
-#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 182 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result);
-#line 2796 "MediaDataRepresentation.c"
+#line 2814 "MediaDataRepresentation.c"
 }
 
 
 static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) {
-#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_preview_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2805 "MediaDataRepresentation.c"
+#line 2823 "MediaDataRepresentation.c"
 }
 
 
 GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error) {
-#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error);
-#line 2814 "MediaDataRepresentation.c"
+#line 2832 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_is_trashed (MediaSource* self) {
 	gboolean _tmp0_ = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_is_trashed'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2824 "MediaDataRepresentation.c"
+#line 2842 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_is_trashed (MediaSource* self) {
-#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self);
-#line 2833 "MediaDataRepresentation.c"
+#line 2851 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_trash (MediaSource* self) {
-#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_trash'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2842 "MediaDataRepresentation.c"
+#line 2860 "MediaDataRepresentation.c"
 }
 
 
 void media_source_trash (MediaSource* self) {
-#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 193 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->trash (self);
-#line 2851 "MediaDataRepresentation.c"
+#line 2869 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_untrash (MediaSource* self) {
-#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_untrash'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2860 "MediaDataRepresentation.c"
+#line 2878 "MediaDataRepresentation.c"
 }
 
 
 void media_source_untrash (MediaSource* self) {
-#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->untrash (self);
-#line 2869 "MediaDataRepresentation.c"
+#line 2887 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_real_is_offline (MediaSource* self) {
 	gboolean _tmp0_ = FALSE;
-#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_is_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 2879 "MediaDataRepresentation.c"
+#line 2897 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_is_offline (MediaSource* self) {
-#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self);
-#line 2888 "MediaDataRepresentation.c"
+#line 2906 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_mark_offline (MediaSource* self) {
-#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_mark_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2897 "MediaDataRepresentation.c"
+#line 2915 "MediaDataRepresentation.c"
 }
 
 
 void media_source_mark_offline (MediaSource* self) {
-#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 197 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self);
-#line 2906 "MediaDataRepresentation.c"
+#line 2924 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_mark_online (MediaSource* self) {
-#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_mark_online'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2915 "MediaDataRepresentation.c"
+#line 2933 "MediaDataRepresentation.c"
 }
 
 
 void media_source_mark_online (MediaSource* self) {
-#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->mark_online (self);
-#line 2924 "MediaDataRepresentation.c"
+#line 2942 "MediaDataRepresentation.c"
 }
 
 
 static gchar* media_source_real_get_master_md5 (MediaSource* self) {
-#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_master_md5'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 2933 "MediaDataRepresentation.c"
+#line 2951 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_get_master_md5 (MediaSource* self) {
-#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 200 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self);
-#line 2942 "MediaDataRepresentation.c"
+#line 2960 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_get_event_id (MediaSource* self, EventID* result) {
-#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 2951 "MediaDataRepresentation.c"
+#line 2969 "MediaDataRepresentation.c"
 }
 
 
 void media_source_get_event_id (MediaSource* self, EventID* result) {
-#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result);
-#line 2960 "MediaDataRepresentation.c"
+#line 2978 "MediaDataRepresentation.c"
 }
 
 
@@ -2973,58 +2991,58 @@ Event* media_source_get_event (MediaSource* self) {
 	Event* _tmp7_;
 	Event* _tmp8_;
 	Event* _tmp9_;
-#line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL);
-#line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->event;
-#line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 207 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 2981 "MediaDataRepresentation.c"
+#line 2999 "MediaDataRepresentation.c"
 		Event* _tmp1_;
 		Event* _tmp2_;
-#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = self->priv->event;
-#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp2_;
-#line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 2992 "MediaDataRepresentation.c"
+#line 3010 "MediaDataRepresentation.c"
 	}
-#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_get_event_id (self, &_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = event_id_is_valid (&event_id);
-#line 209 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 211 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!_tmp4_) {
-#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = NULL;
-#line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 3006 "MediaDataRepresentation.c"
+#line 3024 "MediaDataRepresentation.c"
 	}
-#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = event_global;
-#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = event_id;
-#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = event_source_collection_fetch (_tmp5_, &_tmp6_);
-#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->event);
-#line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	self->priv->event = _tmp7_;
 #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	self->priv->event = _tmp7_;
+#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = self->priv->event;
-#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp9_;
-#line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 216 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3026 "MediaDataRepresentation.c"
+#line 3044 "MediaDataRepresentation.c"
 }
 
 
@@ -3041,111 +3059,111 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) {
 	EventID _tmp8_;
 	gboolean _tmp9_;
 	gboolean _tmp10_;
-#line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE);
-#line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), FALSE);
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = new_event;
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 3051 "MediaDataRepresentation.c"
+#line 3069 "MediaDataRepresentation.c"
 		Event* _tmp2_;
 		EventID _tmp3_ = {0};
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = new_event;
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_get_event_id (_tmp2_, &_tmp3_);
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp3_;
-#line 3060 "MediaDataRepresentation.c"
+#line 3078 "MediaDataRepresentation.c"
 	} else {
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3064 "MediaDataRepresentation.c"
+#line 3082 "MediaDataRepresentation.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	event_id = _tmp0_;
-#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_get_event_id (self, &_tmp4_);
-#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = _tmp4_.id;
-#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = event_id;
-#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = _tmp6_.id;
-#line 219 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 221 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp5_ == _tmp7_) {
-#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = TRUE;
-#line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 3082 "MediaDataRepresentation.c"
+#line 3100 "MediaDataRepresentation.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = event_id;
-#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp9_ = media_source_set_event_id (self, &_tmp8_);
-#line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	committed = _tmp9_;
-#line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp10_ = committed;
-#line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp10_) {
-#line 3094 "MediaDataRepresentation.c"
+#line 3112 "MediaDataRepresentation.c"
 		Event* _tmp11_;
 		Event* _tmp13_;
 		Event* _tmp15_;
 		Event* _tmp16_;
 		Alteration* _tmp17_;
 		Alteration* _tmp18_;
-#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp11_ = self->priv->event;
-#line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 226 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (_tmp11_ != NULL) {
-#line 3105 "MediaDataRepresentation.c"
+#line 3123 "MediaDataRepresentation.c"
 			Event* _tmp12_;
-#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = self->priv->event;
-#line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			event_detach (_tmp12_, self);
-#line 3111 "MediaDataRepresentation.c"
+#line 3129 "MediaDataRepresentation.c"
 		}
-#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp13_ = new_event;
-#line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 229 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (_tmp13_ != NULL) {
-#line 3117 "MediaDataRepresentation.c"
+#line 3135 "MediaDataRepresentation.c"
 			Event* _tmp14_;
-#line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = new_event;
-#line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			event_attach (_tmp14_, self);
-#line 3123 "MediaDataRepresentation.c"
+#line 3141 "MediaDataRepresentation.c"
 		}
-#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp15_ = new_event;
-#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (self->priv->event);
-#line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		self->priv->event = _tmp16_;
 #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		self->priv->event = _tmp16_;
+#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp17_ = alteration_new ("metadata", "event");
-#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp18_ = _tmp17_;
-#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
-#line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 234 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_alteration_unref0 (_tmp18_);
-#line 3141 "MediaDataRepresentation.c"
+#line 3159 "MediaDataRepresentation.c"
 	}
-#line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = committed;
-#line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 237 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3147 "MediaDataRepresentation.c"
+#line 3165 "MediaDataRepresentation.c"
 }
 
 
@@ -3158,51 +3176,51 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 	Alteration* alteration = NULL;
 	Alteration* _tmp24_;
 	TransactionController* _tmp33_;
-#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
-#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((event == NULL) || IS_EVENT (event));
-#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
 #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail (IS_TRANSACTION_CONTROLLER (controller));
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = event;
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_ != NULL) {
-#line 3170 "MediaDataRepresentation.c"
+#line 3188 "MediaDataRepresentation.c"
 		Event* _tmp2_;
 		EventID _tmp3_ = {0};
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = event;
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_get_event_id (_tmp2_, &_tmp3_);
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = _tmp3_;
-#line 3179 "MediaDataRepresentation.c"
+#line 3197 "MediaDataRepresentation.c"
 	} else {
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_id_init (&_tmp0_, EVENT_ID_INVALID);
-#line 3183 "MediaDataRepresentation.c"
+#line 3201 "MediaDataRepresentation.c"
 	}
-#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	event_id = _tmp0_;
 #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	event_id = _tmp0_;
+#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = controller;
-#line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	transaction_controller_begin (_tmp4_);
-#line 3191 "MediaDataRepresentation.c"
+#line 3209 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp5_;
 		GeeIterator* _tmp6_;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = media_sources;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_media_it = _tmp6_;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3204 "MediaDataRepresentation.c"
+#line 3222 "MediaDataRepresentation.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			MediaSource* media = NULL;
@@ -3217,102 +3235,102 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			MediaSource* _tmp18_;
 			Event* _tmp19_;
 			Event* _tmp20_;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _media_it;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp8_) {
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3227 "MediaDataRepresentation.c"
+#line 3245 "MediaDataRepresentation.c"
 			}
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = _media_it;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			media = (MediaSource*) _tmp10_;
-#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = media;
-#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = media_source_get_event (_tmp11_);
-#line 245 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			old_event = _tmp12_;
-#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = old_event;
-#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 248 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp13_ != NULL) {
-#line 3245 "MediaDataRepresentation.c"
+#line 3263 "MediaDataRepresentation.c"
 				Event* _tmp14_;
 				MediaSource* _tmp15_;
-#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp14_ = old_event;
-#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = media;
-#line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				event_detach (_tmp14_, _tmp15_);
-#line 3254 "MediaDataRepresentation.c"
+#line 3272 "MediaDataRepresentation.c"
 			}
-#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = media;
-#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = event_id;
-#line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 251 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			media_source_set_event_id (_tmp16_, &_tmp17_);
-#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = media;
-#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp19_ = event;
-#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_tmp18_->priv->event);
-#line 250 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 252 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_->priv->event = _tmp20_;
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (old_event);
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (media);
-#line 3276 "MediaDataRepresentation.c"
+#line 3294 "MediaDataRepresentation.c"
 		}
-#line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3280 "MediaDataRepresentation.c"
+#line 3298 "MediaDataRepresentation.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp21_ = event;
-#line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 255 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp21_ != NULL) {
-#line 3286 "MediaDataRepresentation.c"
+#line 3304 "MediaDataRepresentation.c"
 		Event* _tmp22_;
 		GeeCollection* _tmp23_;
-#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp22_ = event;
-#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp23_ = media_sources;
-#line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		event_attach_many (_tmp22_, _tmp23_);
-#line 3295 "MediaDataRepresentation.c"
+#line 3313 "MediaDataRepresentation.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp24_ = alteration_new ("metadata", "event");
-#line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	alteration = _tmp24_;
-#line 3301 "MediaDataRepresentation.c"
+#line 3319 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp25_;
 		GeeIterator* _tmp26_;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp25_ = media_sources;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp26_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_media_it = _tmp26_;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3314 "MediaDataRepresentation.c"
+#line 3332 "MediaDataRepresentation.c"
 			GeeIterator* _tmp27_;
 			gboolean _tmp28_;
 			MediaSource* media = NULL;
@@ -3320,80 +3338,80 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event,
 			gpointer _tmp30_;
 			MediaSource* _tmp31_;
 			Alteration* _tmp32_;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp27_ = _media_it;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp28_ = gee_iterator_next (_tmp27_);
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp28_) {
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3330 "MediaDataRepresentation.c"
+#line 3348 "MediaDataRepresentation.c"
 			}
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = _media_it;
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp30_ = gee_iterator_get (_tmp29_);
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			media = (MediaSource*) _tmp30_;
-#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp31_ = media;
-#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp32_ = alteration;
-#line 258 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_);
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (media);
-#line 3346 "MediaDataRepresentation.c"
+#line 3364 "MediaDataRepresentation.c"
 		}
-#line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 259 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_media_it);
-#line 3350 "MediaDataRepresentation.c"
+#line 3368 "MediaDataRepresentation.c"
 	}
-#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = controller;
-#line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 262 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	transaction_controller_commit (_tmp33_);
-#line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_alteration_unref0 (alteration);
-#line 3358 "MediaDataRepresentation.c"
+#line 3376 "MediaDataRepresentation.c"
 }
 
 
 static time_t media_source_real_get_exposure_time (MediaSource* self) {
 	time_t _tmp0_ = 0;
-#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_exposure_time'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 3368 "MediaDataRepresentation.c"
+#line 3386 "MediaDataRepresentation.c"
 }
 
 
 time_t media_source_get_exposure_time (MediaSource* self) {
-#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0);
-#line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self);
-#line 3377 "MediaDataRepresentation.c"
+#line 3395 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_real_get_import_id (MediaSource* self, ImportID* result) {
-#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_get_import_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return;
-#line 3386 "MediaDataRepresentation.c"
+#line 3404 "MediaDataRepresentation.c"
 }
 
 
 void media_source_get_import_id (MediaSource* self, ImportID* result) {
-#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (self));
-#line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 267 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result);
-#line 3395 "MediaDataRepresentation.c"
+#line 3413 "MediaDataRepresentation.c"
 }
 
 
@@ -3402,7 +3420,7 @@ static void media_source_real_master_replaced (MediaSource* self, GFile* old_fil
 	g_return_if_fail (G_IS_FILE (old_file));
 #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 3404 "MediaDataRepresentation.c"
+#line 3422 "MediaDataRepresentation.c"
 }
 
 
@@ -3421,19 +3439,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3423 "MediaDataRepresentation.c"
+#line 3441 "MediaDataRepresentation.c"
 	} else {
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = closure->data;
-#line 3429 "MediaDataRepresentation.c"
+#line 3447 "MediaDataRepresentation.c"
 	}
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 3435 "MediaDataRepresentation.c"
+#line 3453 "MediaDataRepresentation.c"
 }
 
 
@@ -3512,7 +3530,7 @@ static void media_source_class_init (MediaSourceClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = media_source_finalize;
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL] = 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 3514 "MediaDataRepresentation.c"
+#line 3532 "MediaDataRepresentation.c"
 }
 
 
@@ -3521,7 +3539,7 @@ static void media_source_indexable_interface_init (IndexableIface * iface) {
 	media_source_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) media_source_real_get_indexable_keywords;
-#line 3523 "MediaDataRepresentation.c"
+#line 3541 "MediaDataRepresentation.c"
 }
 
 
@@ -3532,7 +3550,7 @@ static void media_source_instance_init (MediaSource * self) {
 	self->priv->event = NULL;
 #line 37 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->indexable_keywords = NULL;
-#line 3534 "MediaDataRepresentation.c"
+#line 3552 "MediaDataRepresentation.c"
 }
 
 
@@ -3546,7 +3564,7 @@ static void media_source_finalize (GObject * obj) {
 	_g_free0 (self->priv->indexable_keywords);
 #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_OBJECT_CLASS (media_source_parent_class)->finalize (obj);
-#line 3548 "MediaDataRepresentation.c"
+#line 3566 "MediaDataRepresentation.c"
 }
 
 
@@ -3567,18 +3585,18 @@ GType media_source_get_type (void) {
 static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	guint result;
 	result = file_hash ((GFile*) v);
-#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3571 "MediaDataRepresentation.c"
+#line 3589 "MediaDataRepresentation.c"
 }
 
 
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
-#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3580 "MediaDataRepresentation.c"
+#line 3598 "MediaDataRepresentation.c"
 }
 
 
@@ -3589,30 +3607,30 @@ MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type,
 	void* _tmp1__target;
 	GetSourceDatabaseKey _tmp2_;
 	void* _tmp2__target;
-#line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
 #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = sources;
-#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = check_to_keep;
-#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1__target = check_to_keep_target;
-#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = get_key;
-#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2__target = get_key_target;
-#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 276 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
-#line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 3607 "MediaDataRepresentation.c"
+#line 3625 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
-#line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_source_holding_tank_construct (TYPE_MEDIA_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 3614 "MediaDataRepresentation.c"
+#line 3632 "MediaDataRepresentation.c"
 }
 
 
@@ -3621,31 +3639,31 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT
 	GeeHashMap* _tmp0_;
 	GFile* _tmp1_;
 	gpointer _tmp2_;
-#line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL);
-#line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 279 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->master_file_map;
-#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = file;
-#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = (MediaSource*) _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 280 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3637 "MediaDataRepresentation.c"
+#line 3655 "MediaDataRepresentation.c"
 }
 
 
 MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* self, const gchar* md5) {
 	MediaSource* result = NULL;
-#line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL);
-#line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 3647 "MediaDataRepresentation.c"
+#line 3665 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeHashMap* _tmp0_;
@@ -3654,25 +3672,25 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = self->priv->master_file_map;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp4_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp3_);
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_it = _tmp5_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 3674 "MediaDataRepresentation.c"
+#line 3692 "MediaDataRepresentation.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSource* source = NULL;
@@ -3683,64 +3701,64 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel
 			gchar* _tmp12_;
 			const gchar* _tmp13_;
 			gboolean _tmp14_;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _source_it;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp7_) {
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 3693 "MediaDataRepresentation.c"
+#line 3711 "MediaDataRepresentation.c"
 			}
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _source_it;
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			source = (MediaSource*) _tmp9_;
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = source;
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = media_source_get_master_md5 (_tmp10_);
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = _tmp11_;
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = md5;
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = g_strcmp0 (_tmp12_, _tmp13_) == 0;
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_free0 (_tmp12_);
-#line 283 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 285 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp14_) {
-#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				result = source;
-#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_source_it);
-#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 286 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 3721 "MediaDataRepresentation.c"
+#line 3739 "MediaDataRepresentation.c"
 			}
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 3725 "MediaDataRepresentation.c"
+#line 3743 "MediaDataRepresentation.c"
 		}
-#line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 3729 "MediaDataRepresentation.c"
+#line 3747 "MediaDataRepresentation.c"
 	}
-#line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = NULL;
-#line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 290 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 3735 "MediaDataRepresentation.c"
+#line 3753 "MediaDataRepresentation.c"
 }
 
 
 static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 3742 "MediaDataRepresentation.c"
+#line 3760 "MediaDataRepresentation.c"
 }
 
 
@@ -3750,30 +3768,30 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 	GeeCollection* _tmp15_;
 	GeeCollection* _tmp33_;
 	GeeCollection* _tmp34_;
-#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
+#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = added;
-#line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 3762 "MediaDataRepresentation.c"
+#line 3780 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp1_ = added;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_source_it = _tmp2_;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 3775 "MediaDataRepresentation.c"
+#line 3793 "MediaDataRepresentation.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataSource* source = NULL;
@@ -3788,75 +3806,75 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				GFile* _tmp12_;
 				MediaSource* _tmp13_;
 				MediaSource* _tmp14_;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp3_ = _source_it;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp4_) {
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 3798 "MediaDataRepresentation.c"
+#line 3816 "MediaDataRepresentation.c"
 				}
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _source_it;
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				source = (DataSource*) _tmp6_;
-#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp7_ = source;
-#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 295 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				media_source = _tmp8_;
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp9_ = self->priv->master_file_map;
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp10_ = media_source;
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp11_ = media_source_get_master_file (_tmp10_);
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp12_ = _tmp11_;
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp13_ = media_source;
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_);
-#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 298 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp12_);
-#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp14_ = media_source;
-#line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 299 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self);
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (media_source);
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 3834 "MediaDataRepresentation.c"
+#line 3852 "MediaDataRepresentation.c"
 			}
-#line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 296 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3838 "MediaDataRepresentation.c"
+#line 3856 "MediaDataRepresentation.c"
 		}
 	}
-#line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp15_ = removed;
-#line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp15_ != NULL) {
-#line 3845 "MediaDataRepresentation.c"
+#line 3863 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp16_;
 			GeeIterator* _tmp17_;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = removed;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_source_it = _tmp17_;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 3858 "MediaDataRepresentation.c"
+#line 3876 "MediaDataRepresentation.c"
 				GeeIterator* _tmp18_;
 				gboolean _tmp19_;
 				DataSource* source = NULL;
@@ -3875,72 +3893,72 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin
 				gboolean _tmp30_;
 				MediaSource* _tmp31_;
 				guint _tmp32_;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp18_ = _source_it;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp19_) {
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 3885 "MediaDataRepresentation.c"
+#line 3903 "MediaDataRepresentation.c"
 				}
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp20_ = _source_it;
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				source = (DataSource*) _tmp21_;
-#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp22_ = source;
-#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 303 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				media_source = _tmp23_;
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = self->priv->master_file_map;
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp25_ = media_source;
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = media_source_get_master_file (_tmp25_);
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp27_ = _tmp26_;
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, NULL);
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp29_ = _tmp28_;
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp27_);
-#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				is_removed = _tmp29_;
-#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp30_ = is_removed;
-#line 305 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 307 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_vala_assert (_tmp30_, "is_removed");
-#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = media_source;
-#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp32_, NULL, FALSE);
-#line 306 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 308 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced, self);
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (media_source);
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 3929 "MediaDataRepresentation.c"
+#line 3947 "MediaDataRepresentation.c"
 			}
-#line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 304 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_source_it);
-#line 3933 "MediaDataRepresentation.c"
+#line 3951 "MediaDataRepresentation.c"
 		}
 	}
-#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = added;
-#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp34_ = removed;
-#line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 312 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp33_, _tmp34_);
-#line 3942 "MediaDataRepresentation.c"
+#line 3960 "MediaDataRepresentation.c"
 }
 
 
@@ -3952,70 +3970,70 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold
 	GeeHashMap* _tmp3_;
 	GFile* _tmp4_;
 	MediaSource* _tmp5_;
-#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self));
-#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media_source));
-#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
-#line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->master_file_map;
-#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = old_file;
-#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
-#line 314 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 316 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	removed = _tmp2_;
-#line 315 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_vala_assert (removed, "removed");
 #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_vala_assert (removed, "removed");
+#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = self->priv->master_file_map;
-#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = new_file;
-#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = media_source;
-#line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 319 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_);
-#line 3980 "MediaDataRepresentation.c"
+#line 3998 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * klass) {
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_holding_tank_parent_class = g_type_class_peek_parent (klass);
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((SourceHoldingTankClass *) klass)->finalize = media_source_holding_tank_finalize;
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate));
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered;
-#line 3993 "MediaDataRepresentation.c"
+#line 4011 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) {
 	GeeHashMap* _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/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"
+#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->master_file_map = _tmp0_;
-#line 4005 "MediaDataRepresentation.c"
+#line 4023 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	MediaSourceHoldingTank * self;
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 271 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->master_file_map);
-#line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 270 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj);
-#line 4017 "MediaDataRepresentation.c"
+#line 4035 "MediaDataRepresentation.c"
 }
 
 
@@ -4032,9 +4050,9 @@ GType media_source_holding_tank_get_type (void) {
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
-#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4036 "MediaDataRepresentation.c"
+#line 4054 "MediaDataRepresentation.c"
 }
 
 
@@ -4042,43 +4060,43 @@ MediaSourceTransactionController* media_source_transaction_controller_construct
 	MediaSourceTransactionController* self = NULL;
 	MediaSourceCollection* _tmp0_;
 	MediaSourceCollection* _tmp1_;
-#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL);
-#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = (MediaSourceTransactionController*) transaction_controller_construct (object_type);
-#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = sources;
-#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_data_collection_unref0 (self->priv->sources);
-#line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->sources = _tmp1_;
-#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 4058 "MediaDataRepresentation.c"
+#line 4076 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) {
-#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 328 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources);
-#line 4065 "MediaDataRepresentation.c"
+#line 4083 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error) {
 	MediaSourceTransactionController * self;
 	MediaSourceCollection* _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
-#line 331 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	database_table_begin_transaction ();
-#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->sources;
-#line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 4080 "MediaDataRepresentation.c"
+#line 4098 "MediaDataRepresentation.c"
 }
 
 
@@ -4086,56 +4104,56 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon
 	MediaSourceTransactionController * self;
 	MediaSourceCollection* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
-#line 336 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->sources;
-#line 336 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_propagate_error (error, _inner_error_);
-#line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return;
-#line 4102 "MediaDataRepresentation.c"
+#line 4120 "MediaDataRepresentation.c"
 	}
 }
 
 
 static void media_source_transaction_controller_class_init (MediaSourceTransactionControllerClass * klass) {
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_transaction_controller_parent_class = g_type_class_peek_parent (klass);
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((TransactionControllerClass *) klass)->finalize = media_source_transaction_controller_finalize;
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceTransactionControllerPrivate));
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_begin_impl;
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_commit_impl;
-#line 4118 "MediaDataRepresentation.c"
+#line 4136 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) {
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self);
-#line 4125 "MediaDataRepresentation.c"
+#line 4143 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_transaction_controller_finalize (TransactionController * obj) {
 	MediaSourceTransactionController * self;
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController);
-#line 324 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_data_collection_unref0 (self->priv->sources);
-#line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 325 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj);
-#line 4137 "MediaDataRepresentation.c"
+#line 4155 "MediaDataRepresentation.c"
 }
 
 
@@ -4154,9 +4172,9 @@ GType media_source_transaction_controller_get_type (void) {
 static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = import_id_compare_func ((ImportID*) a, (ImportID*) b);
-#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4158 "MediaDataRepresentation.c"
+#line 4176 "MediaDataRepresentation.c"
 }
 
 
@@ -4167,55 +4185,55 @@ MediaSourceCollection* media_source_collection_construct (GType object_type, con
 	void* _tmp1__target;
 	MediaSourceHoldingTank* _tmp2_;
 	MediaSourceHoldingTank* _tmp3_;
-#line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = name;
-#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = source_key_func;
-#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1__target = source_key_func_target;
-#line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	self = (MediaSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target);
 #line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	self = (MediaSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target);
+#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = media_source_collection_create_trashcan (self);
-#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (self->priv->trashcan);
-#line 385 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 387 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->trashcan = _tmp2_;
-#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = media_source_collection_create_offline_bin (self);
-#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (self->priv->offline_bin);
-#line 386 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 388 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->offline_bin = _tmp3_;
-#line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 4193 "MediaDataRepresentation.c"
+#line 4211 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos) {
-#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos));
-#line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos));
-#line 4204 "MediaDataRepresentation.c"
+#line 4222 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_it = _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4217 "MediaDataRepresentation.c"
+#line 4235 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			MediaSource* source = NULL;
@@ -4223,126 +4241,126 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection*
 			gpointer _tmp5_;
 			gboolean _tmp6_ = FALSE;
 			GeeCollection* _tmp7_;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _source_it;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp3_) {
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4233 "MediaDataRepresentation.c"
+#line 4251 "MediaDataRepresentation.c"
 			}
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _source_it;
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			source = (MediaSource*) _tmp5_;
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = photos;
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp7_ != NULL) {
-#line 4245 "MediaDataRepresentation.c"
+#line 4263 "MediaDataRepresentation.c"
 				MediaSource* _tmp8_;
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp8_ = source;
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO);
-#line 4251 "MediaDataRepresentation.c"
+#line 4269 "MediaDataRepresentation.c"
 			} else {
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = FALSE;
-#line 4255 "MediaDataRepresentation.c"
+#line 4273 "MediaDataRepresentation.c"
 			}
-#line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp6_) {
-#line 4259 "MediaDataRepresentation.c"
+#line 4277 "MediaDataRepresentation.c"
 				GeeCollection* _tmp9_;
 				MediaSource* _tmp10_;
-#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp9_ = photos;
-#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp10_ = source;
-#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4268 "MediaDataRepresentation.c"
+#line 4286 "MediaDataRepresentation.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				GeeCollection* _tmp12_;
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp12_ = videos;
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp12_ != NULL) {
-#line 4276 "MediaDataRepresentation.c"
+#line 4294 "MediaDataRepresentation.c"
 					MediaSource* _tmp13_;
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp13_ = source;
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO);
-#line 4282 "MediaDataRepresentation.c"
+#line 4300 "MediaDataRepresentation.c"
 				} else {
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp11_ = FALSE;
-#line 4286 "MediaDataRepresentation.c"
+#line 4304 "MediaDataRepresentation.c"
 				}
-#line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp11_) {
-#line 4290 "MediaDataRepresentation.c"
+#line 4308 "MediaDataRepresentation.c"
 					GeeCollection* _tmp14_;
 					MediaSource* _tmp15_;
-#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp14_ = videos;
-#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp15_ = source;
-#line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video));
-#line 4299 "MediaDataRepresentation.c"
+#line 4317 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					GeeCollection* _tmp17_;
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp17_ = photos;
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp17_ != NULL) {
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = TRUE;
-#line 4309 "MediaDataRepresentation.c"
+#line 4327 "MediaDataRepresentation.c"
 					} else {
 						GeeCollection* _tmp18_;
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp18_ = videos;
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp16_ = _tmp18_ != NULL;
-#line 4316 "MediaDataRepresentation.c"
+#line 4334 "MediaDataRepresentation.c"
 					}
-#line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp16_) {
-#line 4320 "MediaDataRepresentation.c"
+#line 4338 "MediaDataRepresentation.c"
 						MediaSource* _tmp19_;
 						gchar* _tmp20_;
 						gchar* _tmp21_;
-#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp19_ = source;
-#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
-#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp21_ = _tmp20_;
-#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-						g_warning ("MediaDataRepresentation.vala:397: Unrecognized media: %s", _tmp21_);
-#line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+						g_warning ("MediaDataRepresentation.vala:399: Unrecognized media: %s", _tmp21_);
+#line 399 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_g_free0 (_tmp21_);
-#line 4334 "MediaDataRepresentation.c"
+#line 4352 "MediaDataRepresentation.c"
 					}
 				}
 			}
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 4340 "MediaDataRepresentation.c"
+#line 4358 "MediaDataRepresentation.c"
 		}
-#line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 4344 "MediaDataRepresentation.c"
+#line 4362 "MediaDataRepresentation.c"
 	}
 }
 
@@ -4359,286 +4377,286 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
 	gint _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (media));
 #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (media));
+#line 405 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 405 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	photos = _tmp0_;
-#line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	videos = _tmp1_;
 #line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	videos = _tmp1_;
+#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = media;
-#line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	media_source_collection_filter_media (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
 #line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	media_source_collection_filter_media (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_COLLECTION, GeeCollection));
+#line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
-#line 408 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_vala_photo_count = _tmp4_;
-#line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (videos, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = _tmp5_;
-#line 409 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_vala_video_count = _tmp6_;
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (videos);
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (photos);
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (photo_count) {
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*photo_count = _vala_photo_count;
-#line 4395 "MediaDataRepresentation.c"
+#line 4413 "MediaDataRepresentation.c"
 	}
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (video_count) {
-#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*video_count = _vala_video_count;
-#line 4401 "MediaDataRepresentation.c"
+#line 4419 "MediaDataRepresentation.c"
 	}
 }
 
 
 gboolean media_source_collection_has_photo (GeeCollection* media) {
 	gboolean result = FALSE;
-#line 412 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE);
-#line 4410 "MediaDataRepresentation.c"
+#line 4428 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_media_it = _tmp1_;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4423 "MediaDataRepresentation.c"
+#line 4441 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			MediaSource* current_media = NULL;
 			GeeIterator* _tmp4_;
 			gpointer _tmp5_;
 			MediaSource* _tmp6_;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _current_media_it;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp3_) {
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4438 "MediaDataRepresentation.c"
+#line 4456 "MediaDataRepresentation.c"
 			}
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_media = (MediaSource*) _tmp5_;
-#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = current_media;
-#line 414 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 416 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO)) {
-#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				result = TRUE;
-#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (current_media);
-#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_current_media_it);
-#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 417 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 4458 "MediaDataRepresentation.c"
+#line 4476 "MediaDataRepresentation.c"
 			}
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4462 "MediaDataRepresentation.c"
+#line 4480 "MediaDataRepresentation.c"
 		}
-#line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4466 "MediaDataRepresentation.c"
+#line 4484 "MediaDataRepresentation.c"
 	}
-#line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 421 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4472 "MediaDataRepresentation.c"
+#line 4490 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_collection_has_video (GeeCollection* media) {
 	gboolean result = FALSE;
-#line 422 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE);
-#line 4480 "MediaDataRepresentation.c"
+#line 4498 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_media_it = _tmp1_;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4493 "MediaDataRepresentation.c"
+#line 4511 "MediaDataRepresentation.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			MediaSource* current_media = NULL;
 			GeeIterator* _tmp4_;
 			gpointer _tmp5_;
 			MediaSource* _tmp6_;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = _current_media_it;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp3_) {
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4508 "MediaDataRepresentation.c"
+#line 4526 "MediaDataRepresentation.c"
 			}
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_media_it;
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_media = (MediaSource*) _tmp5_;
-#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = current_media;
-#line 424 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 426 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_VIDEO)) {
-#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				result = TRUE;
-#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (current_media);
-#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_current_media_it);
-#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 4528 "MediaDataRepresentation.c"
+#line 4546 "MediaDataRepresentation.c"
 			}
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (current_media);
-#line 4532 "MediaDataRepresentation.c"
+#line 4550 "MediaDataRepresentation.c"
 		}
-#line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_media_it);
-#line 4536 "MediaDataRepresentation.c"
+#line 4554 "MediaDataRepresentation.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = FALSE;
-#line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4542 "MediaDataRepresentation.c"
+#line 4560 "MediaDataRepresentation.c"
 }
 
 
 static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (MediaSourceCollection* self) {
-#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4551 "MediaDataRepresentation.c"
+#line 4569 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceCollection* self) {
-#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self);
-#line 4560 "MediaDataRepresentation.c"
+#line 4578 "MediaDataRepresentation.c"
 }
 
 
 static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin (MediaSourceCollection* self) {
-#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4569 "MediaDataRepresentation.c"
+#line 4587 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceCollection* self) {
-#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self);
-#line 4578 "MediaDataRepresentation.c"
+#line 4596 "MediaDataRepresentation.c"
 }
 
 
 static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) {
-#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4587 "MediaDataRepresentation.c"
+#line 4605 "MediaDataRepresentation.c"
 }
 
 
 MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollection* self, Workers* workers, GCancellable* cancellable) {
-#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable);
-#line 4596 "MediaDataRepresentation.c"
+#line 4614 "MediaDataRepresentation.c"
 }
 
 
 static gchar* media_source_collection_real_get_typename (MediaSourceCollection* self) {
-#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4605 "MediaDataRepresentation.c"
+#line 4623 "MediaDataRepresentation.c"
 }
 
 
 gchar* media_source_collection_get_typename (MediaSourceCollection* self) {
-#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self);
-#line 4614 "MediaDataRepresentation.c"
+#line 4632 "MediaDataRepresentation.c"
 }
 
 
 static gboolean media_source_collection_real_is_file_recognized (MediaSourceCollection* self, GFile* file) {
 	gboolean _tmp0_ = FALSE;
-#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_is_file_recognized'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return _tmp0_;
-#line 4624 "MediaDataRepresentation.c"
+#line 4642 "MediaDataRepresentation.c"
 }
 
 
 gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self, GFile* file) {
-#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE);
-#line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file);
-#line 4633 "MediaDataRepresentation.c"
+#line 4651 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _source_holding_tank_ref0 (gpointer self) {
-#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? source_holding_tank_ref (self) : NULL;
-#line 4640 "MediaDataRepresentation.c"
+#line 4658 "MediaDataRepresentation.c"
 }
 
 
@@ -4646,17 +4664,17 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
 	MediaSourceHoldingTank* _tmp1_;
-#line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 444 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->trashcan;
-#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _source_holding_tank_ref0 (_tmp0_);
-#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 445 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4658 "MediaDataRepresentation.c"
+#line 4676 "MediaDataRepresentation.c"
 }
 
 
@@ -4664,109 +4682,109 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
 	MediaSourceHoldingTank* _tmp1_;
-#line 446 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->offline_bin;
-#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _source_holding_tank_ref0 (_tmp0_);
-#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 4676 "MediaDataRepresentation.c"
+#line 4694 "MediaDataRepresentation.c"
 }
 
 
 static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) {
-#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_fetch_by_numeric_id'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 4685 "MediaDataRepresentation.c"
+#line 4703 "MediaDataRepresentation.c"
 }
 
 
 MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* self, gint64 numeric_id) {
-#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id);
-#line 4694 "MediaDataRepresentation.c"
+#line 4712 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) {
-#line 456 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL], 0);
-#line 4701 "MediaDataRepresentation.c"
+#line 4719 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_notify_import_roll_altered (MediaSourceCollection* self) {
-#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self);
-#line 4710 "MediaDataRepresentation.c"
+#line 4728 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) {
-#line 460 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 462 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL], 0);
-#line 4717 "MediaDataRepresentation.c"
+#line 4735 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_notify_flagged_contents_altered (MediaSourceCollection* self) {
-#line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 461 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self);
-#line 4726 "MediaDataRepresentation.c"
+#line 4744 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) {
 	GeeCollection* _tmp0_;
-#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media;
-#line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, _tmp0_);
-#line 4738 "MediaDataRepresentation.c"
+#line 4756 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) {
-#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media);
-#line 4747 "MediaDataRepresentation.c"
+#line 4765 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) {
 	GeeCollection* _tmp0_;
-#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media;
-#line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, _tmp0_);
-#line 4759 "MediaDataRepresentation.c"
+#line 4777 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) {
-#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media);
-#line 4768 "MediaDataRepresentation.c"
+#line 4786 "MediaDataRepresentation.c"
 }
 
 
@@ -4779,17 +4797,17 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 	GeeArrayList* _tmp58_;
 	gboolean _tmp62_;
 	GeeMap* _tmp63_;
-#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
-#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 472 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	to_trashcan = NULL;
-#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	to_offline = NULL;
-#line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	flagged_altered = FALSE;
-#line 4791 "MediaDataRepresentation.c"
+#line 4809 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -4798,25 +4816,25 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = items;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp1_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp4_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp3_);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_object_it = _tmp5_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 4818 "MediaDataRepresentation.c"
+#line 4836 "MediaDataRepresentation.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -4841,327 +4859,327 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge
 			MediaSource* _tmp39_;
 			Flaggable* _tmp40_;
 			Flaggable* _tmp41_;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _object_it;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp7_) {
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 4851 "MediaDataRepresentation.c"
+#line 4869 "MediaDataRepresentation.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = _object_it;
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			object = (DataObject*) _tmp9_;
-#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = items;
-#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = object;
-#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 476 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			alteration = (Alteration*) _tmp12_;
-#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = object;
-#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-			source = _tmp14_;
 #line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			source = _tmp14_;
+#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp15_ = alteration;
-#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp16_ = alteration_has_subject (_tmp15_, "metadata");
-#line 479 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 481 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp16_) {
-#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_alteration_unref0 (alteration);
-#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 4887 "MediaDataRepresentation.c"
+#line 4905 "MediaDataRepresentation.c"
 			}
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = source;
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp19_ = media_source_is_trashed (_tmp18_);
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp19_) {
-#line 4895 "MediaDataRepresentation.c"
+#line 4913 "MediaDataRepresentation.c"
 				MediaSourceHoldingTank* _tmp20_;
 				MediaSourceHoldingTank* _tmp21_;
 				MediaSource* _tmp22_;
 				gboolean _tmp23_;
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp20_ = media_source_collection_get_trashcan (self);
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp21_ = _tmp20_;
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp22_ = source;
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp23_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource));
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = !_tmp23_;
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_source_holding_tank_unref0 (_tmp21_);
-#line 4912 "MediaDataRepresentation.c"
+#line 4930 "MediaDataRepresentation.c"
 			} else {
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = FALSE;
-#line 4916 "MediaDataRepresentation.c"
+#line 4934 "MediaDataRepresentation.c"
 			}
-#line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp17_) {
-#line 4920 "MediaDataRepresentation.c"
+#line 4938 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp24_;
 				GeeArrayList* _tmp26_;
 				MediaSource* _tmp27_;
-#line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = to_trashcan;
-#line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 485 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp24_ == NULL) {
-#line 4928 "MediaDataRepresentation.c"
+#line 4946 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp25_;
-#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (to_trashcan);
-#line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					to_trashcan = _tmp25_;
-#line 4936 "MediaDataRepresentation.c"
+#line 4954 "MediaDataRepresentation.c"
 				}
-#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = to_trashcan;
-#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp27_ = source;
-#line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_alteration_unref0 (alteration);
-#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 4952 "MediaDataRepresentation.c"
+#line 4970 "MediaDataRepresentation.c"
 			}
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp29_ = source;
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp30_ = media_source_is_offline (_tmp29_);
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp30_) {
-#line 4960 "MediaDataRepresentation.c"
+#line 4978 "MediaDataRepresentation.c"
 				MediaSourceHoldingTank* _tmp31_;
 				MediaSourceHoldingTank* _tmp32_;
 				MediaSource* _tmp33_;
 				gboolean _tmp34_;
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = media_source_collection_get_offline_bin (self);
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp32_ = _tmp31_;
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp33_ = source;
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp34_ = source_holding_tank_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_SOURCE, DataSource));
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = !_tmp34_;
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_source_holding_tank_unref0 (_tmp32_);
-#line 4977 "MediaDataRepresentation.c"
+#line 4995 "MediaDataRepresentation.c"
 			} else {
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp28_ = FALSE;
-#line 4981 "MediaDataRepresentation.c"
+#line 4999 "MediaDataRepresentation.c"
 			}
-#line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp28_) {
-#line 4985 "MediaDataRepresentation.c"
+#line 5003 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp35_;
 				GeeArrayList* _tmp37_;
 				MediaSource* _tmp38_;
-#line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35_ = to_offline;
-#line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp35_ == NULL) {
-#line 4993 "MediaDataRepresentation.c"
+#line 5011 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp36_;
-#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (to_offline);
-#line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					to_offline = _tmp36_;
-#line 5001 "MediaDataRepresentation.c"
+#line 5019 "MediaDataRepresentation.c"
 				}
-#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp37_ = to_offline;
-#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp38_ = source;
-#line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 5009 "MediaDataRepresentation.c"
+#line 5027 "MediaDataRepresentation.c"
 			}
-#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp39_ = source;
-#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp39_) : NULL);
-#line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			flaggable = _tmp40_;
-#line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp41_ = flaggable;
-#line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp41_ != NULL) {
-#line 5021 "MediaDataRepresentation.c"
+#line 5039 "MediaDataRepresentation.c"
 				Flaggable* _tmp42_;
 				gboolean _tmp43_;
-#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp42_ = flaggable;
-#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = flaggable_is_flagged (_tmp42_);
-#line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 503 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp43_) {
-#line 5030 "MediaDataRepresentation.c"
+#line 5048 "MediaDataRepresentation.c"
 					gboolean _tmp44_ = FALSE;
 					GeeSet* _tmp45_;
 					MediaSource* _tmp46_;
 					gboolean _tmp47_;
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp45_ = self->priv->flagged;
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp46_ = source;
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp47_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp46_);
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp47_) {
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp44_ = TRUE;
-#line 5045 "MediaDataRepresentation.c"
+#line 5063 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp48_;
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp48_ = flagged_altered;
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp44_ = _tmp48_;
-#line 5052 "MediaDataRepresentation.c"
+#line 5070 "MediaDataRepresentation.c"
 					}
-#line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp44_;
-#line 5056 "MediaDataRepresentation.c"
+#line 5074 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp49_ = FALSE;
 					GeeSet* _tmp50_;
 					MediaSource* _tmp51_;
 					gboolean _tmp52_;
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp50_ = self->priv->flagged;
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp51_ = source;
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp52_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp52_) {
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp49_ = TRUE;
-#line 5072 "MediaDataRepresentation.c"
+#line 5090 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp53_;
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp53_ = flagged_altered;
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp49_ = _tmp53_;
-#line 5079 "MediaDataRepresentation.c"
+#line 5097 "MediaDataRepresentation.c"
 					}
-#line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 506 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					flagged_altered = _tmp49_;
-#line 5083 "MediaDataRepresentation.c"
+#line 5101 "MediaDataRepresentation.c"
 				}
 			}
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (flaggable);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_alteration_unref0 (alteration);
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (object);
-#line 5094 "MediaDataRepresentation.c"
+#line 5112 "MediaDataRepresentation.c"
 		}
-#line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 477 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_object_it);
-#line 5098 "MediaDataRepresentation.c"
+#line 5116 "MediaDataRepresentation.c"
 	}
-#line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp54_ = to_trashcan;
-#line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp54_ != NULL) {
-#line 5104 "MediaDataRepresentation.c"
+#line 5122 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp55_;
 		MediaSourceHoldingTank* _tmp56_;
 		GeeArrayList* _tmp57_;
-#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp55_ = media_source_collection_get_trashcan (self);
-#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp56_ = _tmp55_;
-#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp57_ = to_trashcan;
-#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp56_);
-#line 5118 "MediaDataRepresentation.c"
+#line 5136 "MediaDataRepresentation.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp58_ = to_offline;
-#line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 513 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp58_ != NULL) {
-#line 5124 "MediaDataRepresentation.c"
+#line 5142 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp59_;
 		MediaSourceHoldingTank* _tmp60_;
 		GeeArrayList* _tmp61_;
-#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp59_ = media_source_collection_get_offline_bin (self);
-#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp60_ = _tmp59_;
-#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp61_ = to_offline;
-#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp60_);
-#line 5138 "MediaDataRepresentation.c"
+#line 5156 "MediaDataRepresentation.c"
 	}
-#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp62_ = flagged_altered;
-#line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 516 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp62_) {
-#line 515 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_flagged_contents_altered (self);
-#line 5146 "MediaDataRepresentation.c"
+#line 5164 "MediaDataRepresentation.c"
 	}
-#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = items;
-#line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 519 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_COLLECTION_CLASS (media_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp63_);
-#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (to_offline);
-#line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 473 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (to_trashcan);
-#line 5156 "MediaDataRepresentation.c"
+#line 5174 "MediaDataRepresentation.c"
 }
 
 
 static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file);
-#line 5163 "MediaDataRepresentation.c"
+#line 5181 "MediaDataRepresentation.c"
 }
 
 
@@ -5175,34 +5193,34 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 	gboolean _tmp75_;
 	GeeIterable* _tmp76_;
 	GeeIterable* _tmp77_;
-#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
-#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
 #line 522 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
+#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	import_roll_changed = FALSE;
-#line 523 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	flagged_altered = FALSE;
-#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = added;
-#line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp0_ != NULL) {
-#line 5191 "MediaDataRepresentation.c"
+#line 5209 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp1_ = added;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_object_it = _tmp2_;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 5204 "MediaDataRepresentation.c"
+#line 5222 "MediaDataRepresentation.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataObject* object = NULL;
@@ -5225,186 +5243,186 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				MediaSource* _tmp23_;
 				Flaggable* _tmp24_;
 				Flaggable* _tmp25_;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp3_ = _object_it;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp4_) {
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5235 "MediaDataRepresentation.c"
+#line 5253 "MediaDataRepresentation.c"
 				}
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp5_ = _object_it;
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				object = (DataObject*) _tmp6_;
-#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp7_ = object;
-#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 526 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				media = _tmp8_;
 #line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				media = _tmp8_;
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp9_ = self->priv->by_master_file;
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp10_ = media;
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp11_ = media_source_get_master_file (_tmp10_);
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp12_ = _tmp11_;
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp13_ = media;
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp13_);
-#line 528 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp12_);
-#line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp14_ = media;
-#line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self);
 #line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				g_signal_connect (_tmp14_, "master-replaced", (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self);
+#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = media;
-#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				media_source_get_import_id (_tmp15_, &_tmp16_);
-#line 531 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				import_id = _tmp16_;
-#line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = import_id_is_valid (&import_id);
-#line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp17_) {
-#line 5277 "MediaDataRepresentation.c"
+#line 5295 "MediaDataRepresentation.c"
 					GeeTreeSet* _tmp18_;
 					ImportID _tmp19_;
 					GeeMultiMap* _tmp20_;
 					ImportID _tmp21_;
 					MediaSource* _tmp22_;
-#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp18_ = self->priv->sorted_import_ids;
-#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp19_ = import_id;
-#line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 535 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp19_);
-#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp20_ = self->priv->import_rolls;
-#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp21_ = import_id;
-#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp22_ = media;
-#line 534 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-					gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_);
 #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+					gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_);
+#line 538 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					import_roll_changed = TRUE;
-#line 5299 "MediaDataRepresentation.c"
+#line 5317 "MediaDataRepresentation.c"
 				}
-#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp23_ = media;
-#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp23_) : NULL);
-#line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				flaggable = _tmp24_;
-#line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp25_ = flaggable;
-#line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp25_ != NULL) {
-#line 5311 "MediaDataRepresentation.c"
+#line 5329 "MediaDataRepresentation.c"
 					Flaggable* _tmp26_;
 					gboolean _tmp27_;
-#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp26_ = flaggable;
-#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp27_ = flaggable_is_flagged (_tmp26_);
-#line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 543 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (_tmp27_) {
-#line 5320 "MediaDataRepresentation.c"
+#line 5338 "MediaDataRepresentation.c"
 						gboolean _tmp28_ = FALSE;
 						GeeSet* _tmp29_;
 						MediaSource* _tmp30_;
 						gboolean _tmp31_;
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp29_ = self->priv->flagged;
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp30_ = media;
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp31_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), _tmp30_);
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						if (_tmp31_) {
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = TRUE;
-#line 5335 "MediaDataRepresentation.c"
+#line 5353 "MediaDataRepresentation.c"
 						} else {
 							gboolean _tmp32_;
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp32_ = flagged_altered;
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp28_ = _tmp32_;
-#line 5342 "MediaDataRepresentation.c"
+#line 5360 "MediaDataRepresentation.c"
 						}
-#line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp28_;
-#line 5346 "MediaDataRepresentation.c"
+#line 5364 "MediaDataRepresentation.c"
 					} else {
 						gboolean _tmp33_ = FALSE;
 						GeeSet* _tmp34_;
 						MediaSource* _tmp35_;
 						gboolean _tmp36_;
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp34_ = self->priv->flagged;
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp35_ = media;
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp36_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), _tmp35_);
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						if (_tmp36_) {
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp33_ = TRUE;
-#line 5362 "MediaDataRepresentation.c"
+#line 5380 "MediaDataRepresentation.c"
 						} else {
 							gboolean _tmp37_;
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp37_ = flagged_altered;
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 							_tmp33_ = _tmp37_;
-#line 5369 "MediaDataRepresentation.c"
+#line 5387 "MediaDataRepresentation.c"
 						}
-#line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						flagged_altered = _tmp33_;
-#line 5373 "MediaDataRepresentation.c"
+#line 5391 "MediaDataRepresentation.c"
 					}
 				}
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (flaggable);
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (media);
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 5382 "MediaDataRepresentation.c"
+#line 5400 "MediaDataRepresentation.c"
 			}
-#line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5386 "MediaDataRepresentation.c"
+#line 5404 "MediaDataRepresentation.c"
 		}
 	}
-#line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp38_ = removed;
-#line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp38_ != NULL) {
-#line 5393 "MediaDataRepresentation.c"
+#line 5411 "MediaDataRepresentation.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp39_;
 			GeeIterator* _tmp40_;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp39_ = removed;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp40_ = gee_iterable_iterator (_tmp39_);
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_object_it = _tmp40_;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			while (TRUE) {
-#line 5406 "MediaDataRepresentation.c"
+#line 5424 "MediaDataRepresentation.c"
 				GeeIterator* _tmp41_;
 				gboolean _tmp42_;
 				DataObject* object = NULL;
@@ -5431,65 +5449,65 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 				GeeSet* _tmp70_;
 				MediaSource* _tmp71_;
 				gboolean _tmp72_;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp41_ = _object_it;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp42_ = gee_iterator_next (_tmp41_);
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp42_) {
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					break;
-#line 5441 "MediaDataRepresentation.c"
+#line 5459 "MediaDataRepresentation.c"
 				}
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp43_ = _object_it;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp44_ = gee_iterator_get (_tmp43_);
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				object = (DataObject*) _tmp44_;
-#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp45_ = object;
-#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 551 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				media = _tmp46_;
 #line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				media = _tmp46_;
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp47_ = self->priv->by_master_file;
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp48_ = media;
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp49_ = media_source_get_master_file (_tmp48_);
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp50_ = _tmp49_;
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp51_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp50_, NULL);
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp52_ = _tmp51_;
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp50_);
-#line 553 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				is_removed = _tmp52_;
-#line 554 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp53_ = is_removed;
-#line 554 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_vala_assert (_tmp53_, "is_removed");
-#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp54_ = media;
-#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp55_, NULL, FALSE);
-#line 555 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_signal_handlers_disconnect_matched (_tmp54_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp55_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self);
 #line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				g_signal_handlers_disconnect_matched (_tmp54_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp55_, 0, NULL, (GCallback) _media_source_collection_on_master_replaced_media_source_master_replaced, self);
+#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp56_ = media;
-#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				media_source_get_import_id (_tmp56_, &_tmp57_);
-#line 557 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				import_id = _tmp57_;
-#line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp58_ = import_id_is_valid (&import_id);
-#line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp58_) {
-#line 5491 "MediaDataRepresentation.c"
+#line 5509 "MediaDataRepresentation.c"
 					GeeMultiMap* _tmp59_;
 					ImportID _tmp60_;
 					MediaSource* _tmp61_;
@@ -5498,98 +5516,98 @@ static void media_source_collection_real_notify_contents_altered (DataCollection
 					GeeMultiMap* _tmp64_;
 					ImportID _tmp65_;
 					gboolean _tmp66_;
-#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp59_ = self->priv->import_rolls;
-#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp60_ = import_id;
-#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp61_ = media;
-#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp62_ = gee_multi_map_remove (_tmp59_, &_tmp60_, _tmp61_);
-#line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					is_removed = _tmp62_;
-#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp63_ = is_removed;
-#line 560 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_vala_assert (_tmp63_, "is_removed");
-#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp64_ = self->priv->import_rolls;
-#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp65_ = import_id;
-#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_);
-#line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 563 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (!_tmp66_) {
-#line 5522 "MediaDataRepresentation.c"
+#line 5540 "MediaDataRepresentation.c"
 						GeeTreeSet* _tmp67_;
 						ImportID _tmp68_;
-#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp67_ = self->priv->sorted_import_ids;
-#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp68_ = import_id;
-#line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_);
-#line 5531 "MediaDataRepresentation.c"
+#line 5549 "MediaDataRepresentation.c"
 					}
-#line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					import_roll_changed = TRUE;
-#line 5535 "MediaDataRepresentation.c"
+#line 5553 "MediaDataRepresentation.c"
 				}
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp70_ = self->priv->flagged;
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp71_ = media;
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp72_ = gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GEE_TYPE_COLLECTION, GeeCollection), _tmp71_);
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp72_) {
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp69_ = TRUE;
-#line 5547 "MediaDataRepresentation.c"
+#line 5565 "MediaDataRepresentation.c"
 				} else {
 					gboolean _tmp73_;
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp73_ = flagged_altered;
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp69_ = _tmp73_;
-#line 5554 "MediaDataRepresentation.c"
+#line 5572 "MediaDataRepresentation.c"
 				}
-#line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 569 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				flagged_altered = _tmp69_;
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (media);
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (object);
-#line 5562 "MediaDataRepresentation.c"
+#line 5580 "MediaDataRepresentation.c"
 			}
-#line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_object_it);
-#line 5566 "MediaDataRepresentation.c"
+#line 5584 "MediaDataRepresentation.c"
 		}
 	}
-#line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp74_ = import_roll_changed;
-#line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 573 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp74_) {
-#line 572 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_import_roll_altered (self);
-#line 5575 "MediaDataRepresentation.c"
+#line 5593 "MediaDataRepresentation.c"
 	}
-#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp75_ = flagged_altered;
-#line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp75_) {
-#line 575 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_source_collection_notify_flagged_contents_altered (self);
-#line 5583 "MediaDataRepresentation.c"
+#line 5601 "MediaDataRepresentation.c"
 	}
-#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp76_ = added;
-#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp77_ = removed;
-#line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp76_, _tmp77_);
-#line 5591 "MediaDataRepresentation.c"
+#line 5609 "MediaDataRepresentation.c"
 }
 
 
@@ -5604,41 +5622,41 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s
 	MediaSource* _tmp6_;
 	GFile* _tmp7_;
 	GFile* _tmp8_;
-#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
-#line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->by_master_file;
-#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = old_file;
-#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
-#line 581 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	is_removed = _tmp2_;
-#line 582 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_vala_assert (is_removed, "is_removed");
 #line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_vala_assert (is_removed, "is_removed");
+#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = self->priv->by_master_file;
-#line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = new_file;
-#line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = media;
-#line 584 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_);
 #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_);
+#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = media;
-#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = old_file;
-#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = new_file;
-#line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 588 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, _tmp6_, _tmp7_, _tmp8_);
-#line 5640 "MediaDataRepresentation.c"
+#line 5658 "MediaDataRepresentation.c"
 }
 
 
@@ -5647,21 +5665,21 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection
 	GeeHashMap* _tmp0_;
 	GFile* _tmp1_;
 	gpointer _tmp2_;
-#line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->by_master_file;
-#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = file;
-#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = (MediaSource*) _tmp2_;
-#line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5663 "MediaDataRepresentation.c"
+#line 5681 "MediaDataRepresentation.c"
 }
 
 
@@ -5676,60 +5694,60 @@ static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSource
 	const gchar* _tmp3_;
 	gint64 _tmp4_;
 	MediaSource* _tmp5_;
-#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_ = g_strsplit (_tmp0_, "-", 0);
-#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	components = _tmp2_;
-#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	components_length1 = _vala_array_length (_tmp1_);
-#line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 596 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_components_size_ = components_length1;
-#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_vala_assert (components_length1 == 2, "components.length == 2");
 #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_vala_assert (components_length1 == 2, "components.length == 2");
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = components[1];
-#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = parse_int64 (_tmp3_, 16);
-#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = media_source_collection_fetch_by_numeric_id (self, _tmp4_);
-#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp5_;
-#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
-#line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5704 "MediaDataRepresentation.c"
+#line 5722 "MediaDataRepresentation.c"
 }
 
 
 MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) {
-#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id);
-#line 5713 "MediaDataRepresentation.c"
+#line 5731 "MediaDataRepresentation.c"
 }
 
 
 static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) {
-#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_event_source_ids'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 5722 "MediaDataRepresentation.c"
+#line 5740 "MediaDataRepresentation.c"
 }
 
 
 GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollection* self, EventID* event_id) {
-#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id);
-#line 5731 "MediaDataRepresentation.c"
+#line 5749 "MediaDataRepresentation.c"
 }
 
 
@@ -5739,23 +5757,23 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect
 	MediaSourceHoldingTank* _tmp1_;
 	GeeCollection* _tmp2_;
 	GeeCollection* _tmp3_;
-#line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 604 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_collection_get_trashcan (self);
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank));
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp3_;
-#line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5757 "MediaDataRepresentation.c"
+#line 5775 "MediaDataRepresentation.c"
 }
 
 
@@ -5765,23 +5783,23 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl
 	MediaSourceHoldingTank* _tmp1_;
 	GeeCollection* _tmp2_;
 	GeeCollection* _tmp3_;
-#line 606 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (self);
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = source_holding_tank_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank));
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp3_;
-#line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5783 "MediaDataRepresentation.c"
+#line 5801 "MediaDataRepresentation.c"
 }
 
 
@@ -5790,19 +5808,19 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self)
 	GeeSet* _tmp0_;
 	GeeSet* _tmp1_;
 	GeeSet* _tmp2_;
-#line 610 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 612 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->flagged;
-#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_set_get_read_only_view (_tmp0_);
-#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5804 "MediaDataRepresentation.c"
+#line 5822 "MediaDataRepresentation.c"
 }
 
 
@@ -5810,17 +5828,17 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection
 	GeeSortedSet* result = NULL;
 	GeeTreeSet* _tmp0_;
 	GeeSortedSet* _tmp1_;
-#line 615 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->sorted_import_ids;
-#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SORTED_SET, GeeSortedSet));
-#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5822 "MediaDataRepresentation.c"
+#line 5840 "MediaDataRepresentation.c"
 }
 
 
@@ -5830,40 +5848,40 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel
 	GeeTreeSet* _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-#line 619 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 621 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = self->priv->sorted_import_ids;
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = _tmp2_;
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp3_ != 0) {
-#line 5842 "MediaDataRepresentation.c"
+#line 5860 "MediaDataRepresentation.c"
 		GeeTreeSet* _tmp4_;
 		gpointer _tmp5_;
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = self->priv->sorted_import_ids;
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = gee_abstract_sorted_set_last (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_SORTED_SET, GeeAbstractSortedSet));
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_import_id_free0 (_tmp0_);
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = (ImportID*) _tmp5_;
-#line 5853 "MediaDataRepresentation.c"
+#line 5871 "MediaDataRepresentation.c"
 	} else {
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_import_id_free0 (_tmp0_);
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = NULL;
-#line 5859 "MediaDataRepresentation.c"
+#line 5877 "MediaDataRepresentation.c"
 	}
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp0_;
-#line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5865 "MediaDataRepresentation.c"
+#line 5883 "MediaDataRepresentation.c"
 }
 
 
@@ -5872,21 +5890,21 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s
 	GeeMultiMap* _tmp0_;
 	ImportID _tmp1_;
 	GeeCollection* _tmp2_;
-#line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (import_id != NULL, NULL);
-#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->import_rolls;
-#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = *import_id;
-#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp2_;
-#line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5888 "MediaDataRepresentation.c"
+#line 5906 "MediaDataRepresentation.c"
 }
 
 
@@ -5894,21 +5912,21 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee
 	MediaSourceHoldingTank* _tmp0_;
 	MediaSourceHoldingTank* _tmp1_;
 	GeeCollection* _tmp2_;
-#line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_collection_get_trashcan (self);
-#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = sources;
-#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
-#line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 5910 "MediaDataRepresentation.c"
+#line 5928 "MediaDataRepresentation.c"
 }
 
 
@@ -5916,21 +5934,21 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G
 	MediaSourceHoldingTank* _tmp0_;
 	MediaSourceHoldingTank* _tmp1_;
 	GeeCollection* _tmp2_;
-#line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 633 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (self);
-#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = sources;
-#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
-#line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 634 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 5932 "MediaDataRepresentation.c"
+#line 5950 "MediaDataRepresentation.c"
 }
 
 
@@ -5940,23 +5958,23 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) {
 	MediaSourceHoldingTank* _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-#line 635 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 637 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), 0);
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_source_collection_get_trashcan (self);
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank));
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = _tmp2_;
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp3_;
-#line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 5958 "MediaDataRepresentation.c"
+#line 5976 "MediaDataRepresentation.c"
 }
 
 
@@ -5967,63 +5985,63 @@ static void media_source_collection_real_import_many (MediaSourceCollection* sel
 	GeeCollection* _tmp3_;
 	GeeCollection* _tmp4_;
 	GeeCollection* _tmp5_;
-#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media;
-#line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	media_source_collection_notify_media_import_starting (self, _tmp0_);
 #line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	media_source_collection_notify_media_import_starting (self, _tmp0_);
+#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = media;
-#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, NULL, NULL);
-#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = _tmp2_;
-#line 645 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_g_object_unref0 (_tmp3_);
 #line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_g_object_unref0 (_tmp3_);
+#line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = media;
-#line 647 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	media_source_collection_postprocess_imported_media (self, _tmp4_);
 #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	media_source_collection_postprocess_imported_media (self, _tmp4_);
+#line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = media;
-#line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_notify_media_import_completed (self, _tmp5_);
-#line 5991 "MediaDataRepresentation.c"
+#line 6009 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_import_many (MediaSourceCollection* self, GeeCollection* media) {
-#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 644 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media);
-#line 6000 "MediaDataRepresentation.c"
+#line 6018 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) {
-#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 6007 "MediaDataRepresentation.c"
+#line 6025 "MediaDataRepresentation.c"
 }
 
 
 void media_source_collection_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) {
-#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media);
-#line 6016 "MediaDataRepresentation.c"
+#line 6034 "MediaDataRepresentation.c"
 }
 
 
 static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
-#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 6025 "MediaDataRepresentation.c"
+#line 6043 "MediaDataRepresentation.c"
 }
 
 
@@ -6068,66 +6086,66 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 	gboolean _tmp72_ = FALSE;
 	GeeHashSet* _tmp73_;
 	GError * _inner_error_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((sources == NULL) || GEE_IS_COLLECTION (sources));
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed));
 #line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail ((not_removed == NULL) || GEE_IS_LIST (not_removed));
+#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = sources;
-#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_vala_assert (_tmp0_ != NULL, "sources != null");
 #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_vala_assert (_tmp0_ != NULL, "sources != null");
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = delete_backing;
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!_tmp2_) {
-#line 6084 "MediaDataRepresentation.c"
+#line 6102 "MediaDataRepresentation.c"
 		GeeHashSet* _tmp3_;
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp3_;
-#line 6092 "MediaDataRepresentation.c"
+#line 6110 "MediaDataRepresentation.c"
 	} else {
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = NULL;
-#line 6098 "MediaDataRepresentation.c"
+#line 6116 "MediaDataRepresentation.c"
 	}
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _g_object_ref0 (_tmp1_);
-#line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	to_tombstone = _tmp4_;
-#line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 667 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	trashed = _tmp5_;
-#line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 668 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	offlined = _tmp6_;
-#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	not_trashed = _tmp7_;
-#line 6116 "MediaDataRepresentation.c"
+#line 6134 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_;
 		GeeIterator* _tmp9_;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = sources;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_it = _tmp9_;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 6129 "MediaDataRepresentation.c"
+#line 6147 "MediaDataRepresentation.c"
 			GeeIterator* _tmp10_;
 			gboolean _tmp11_;
 			MediaSource* source = NULL;
@@ -6136,165 +6154,165 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			MediaSource* _tmp14_;
 			gboolean _tmp15_;
 			GeeHashSet* _tmp24_;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _source_it;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp11_) {
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6146 "MediaDataRepresentation.c"
+#line 6164 "MediaDataRepresentation.c"
 			}
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = _source_it;
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			source = (MediaSource*) _tmp13_;
-#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = source;
-#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp15_ = media_source_is_trashed (_tmp14_);
-#line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp15_) {
-#line 6160 "MediaDataRepresentation.c"
+#line 6178 "MediaDataRepresentation.c"
 				GeeArrayList* _tmp16_;
 				MediaSource* _tmp17_;
-#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp16_ = trashed;
-#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp17_ = source;
-#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 6169 "MediaDataRepresentation.c"
+#line 6187 "MediaDataRepresentation.c"
 			} else {
 				MediaSource* _tmp18_;
 				gboolean _tmp19_;
-#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp18_ = source;
-#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp19_ = media_source_is_offline (_tmp18_);
-#line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 675 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_tmp19_) {
-#line 6179 "MediaDataRepresentation.c"
+#line 6197 "MediaDataRepresentation.c"
 					GeeArrayList* _tmp20_;
 					MediaSource* _tmp21_;
-#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp20_ = offlined;
-#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp21_ = source;
-#line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 6188 "MediaDataRepresentation.c"
+#line 6206 "MediaDataRepresentation.c"
 				} else {
 					GeeArrayList* _tmp22_;
 					MediaSource* _tmp23_;
-#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp22_ = not_trashed;
-#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp23_ = source;
-#line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_);
-#line 6198 "MediaDataRepresentation.c"
+#line 6216 "MediaDataRepresentation.c"
 				}
 			}
-#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp24_ = to_tombstone;
-#line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 680 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp24_ != NULL) {
-#line 6205 "MediaDataRepresentation.c"
+#line 6223 "MediaDataRepresentation.c"
 				GeeHashSet* _tmp25_;
 				MediaSource* _tmp26_;
-#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp25_ = to_tombstone;
-#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp26_ = source;
-#line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 681 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 6214 "MediaDataRepresentation.c"
+#line 6232 "MediaDataRepresentation.c"
 			}
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6218 "MediaDataRepresentation.c"
+#line 6236 "MediaDataRepresentation.c"
 		}
-#line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6222 "MediaDataRepresentation.c"
+#line 6240 "MediaDataRepresentation.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp27_ = sources;
-#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp28_ = gee_collection_get_size (_tmp27_);
-#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp29_ = _tmp28_;
-#line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	total_count = _tmp29_;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp30_ = total_count;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp31_ = trashed;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp32_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp33_ = _tmp32_;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp34_ = offlined;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp35_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp36_ = _tmp35_;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp37_ = not_trashed;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp39_ = _tmp38_;
-#line 683 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_vala_assert (_tmp30_ == ((_tmp33_ + _tmp36_) + _tmp39_), "total_count == (trashed.size + offlined.size + not_trashed.size)");
-#line 686 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	agg_monitor = NULL;
-#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp40_ = monitor;
-#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp40__target = monitor_target;
-#line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp40_ != NULL) {
-#line 6262 "MediaDataRepresentation.c"
+#line 6280 "MediaDataRepresentation.c"
 		gint _tmp41_;
 		ProgressMonitor _tmp42_;
 		void* _tmp42__target;
 		AggregateProgressMonitor* _tmp43_;
 		AggregateProgressMonitor* _tmp44_;
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp41_ = total_count;
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp42_ = monitor;
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp42__target = monitor_target;
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp43_ = aggregate_progress_monitor_new ((guint64) _tmp41_, _tmp42_, _tmp42__target);
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_aggregate_progress_monitor_unref0 (agg_monitor);
-#line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		agg_monitor = _tmp43_;
-#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp44_ = agg_monitor;
-#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		monitor = _aggregate_progress_monitor_monitor_progress_monitor;
-#line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		monitor_target = _tmp44_;
-#line 6286 "MediaDataRepresentation.c"
+#line 6304 "MediaDataRepresentation.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp45_ = trashed;
-#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp46_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp47_ = _tmp46_;
-#line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 694 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp47_ > 0) {
-#line 6296 "MediaDataRepresentation.c"
+#line 6314 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp48_;
 		MediaSourceHoldingTank* _tmp49_;
 		GeeArrayList* _tmp50_;
@@ -6302,35 +6320,35 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		ProgressMonitor _tmp52_;
 		void* _tmp52__target;
 		GeeList* _tmp53_;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp48_ = media_source_collection_get_trashcan (self);
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp49_ = _tmp48_;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp50_ = trashed;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp51_ = delete_backing;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp52_ = monitor;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp52__target = monitor_target;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp53_ = not_removed;
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_LIST, GeeList), _tmp51_, _tmp52_, _tmp52__target, _tmp53_);
-#line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp49_);
-#line 6322 "MediaDataRepresentation.c"
+#line 6340 "MediaDataRepresentation.c"
 	}
-#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp54_ = offlined;
-#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp55_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp56_ = _tmp55_;
-#line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp56_ > 0) {
-#line 6332 "MediaDataRepresentation.c"
+#line 6350 "MediaDataRepresentation.c"
 		MediaSourceHoldingTank* _tmp57_;
 		MediaSourceHoldingTank* _tmp58_;
 		GeeArrayList* _tmp59_;
@@ -6338,35 +6356,35 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		ProgressMonitor _tmp61_;
 		void* _tmp61__target;
 		GeeList* _tmp62_;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp57_ = media_source_collection_get_offline_bin (self);
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp58_ = _tmp57_;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp59_ = offlined;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp60_ = delete_backing;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp61_ = monitor;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp61__target = monitor_target;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp62_ = not_removed;
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList), _tmp60_, _tmp61_, _tmp61__target, _tmp62_);
-#line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_holding_tank_unref0 (_tmp58_);
-#line 6358 "MediaDataRepresentation.c"
+#line 6376 "MediaDataRepresentation.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp63_ = not_trashed;
-#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp64_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp65_ = _tmp64_;
-#line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp65_ > 0) {
-#line 6368 "MediaDataRepresentation.c"
+#line 6386 "MediaDataRepresentation.c"
 		GeeArrayList* _tmp66_;
 		Marker* _tmp67_;
 		Marker* _tmp68_;
@@ -6374,139 +6392,139 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 		ProgressMonitor _tmp70_;
 		void* _tmp70__target;
 		GeeList* _tmp71_;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp66_ = not_trashed;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp67_ = data_collection_mark_many (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp68_ = _tmp67_;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp69_ = delete_backing;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp70_ = monitor;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp70__target = monitor_target;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp71_ = not_removed;
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp68_, _tmp69_, _tmp70_, _tmp70__target, _tmp71_);
-#line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp68_);
-#line 6394 "MediaDataRepresentation.c"
+#line 6412 "MediaDataRepresentation.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp73_ = to_tombstone;
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp73_ != NULL) {
-#line 6400 "MediaDataRepresentation.c"
+#line 6418 "MediaDataRepresentation.c"
 		GeeHashSet* _tmp74_;
 		gint _tmp75_;
 		gint _tmp76_;
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp74_ = to_tombstone;
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp76_ = _tmp75_;
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = _tmp76_ > 0;
-#line 6412 "MediaDataRepresentation.c"
+#line 6430 "MediaDataRepresentation.c"
 	} else {
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp72_ = FALSE;
-#line 6416 "MediaDataRepresentation.c"
+#line 6434 "MediaDataRepresentation.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp72_) {
-#line 6420 "MediaDataRepresentation.c"
+#line 6438 "MediaDataRepresentation.c"
 		{
 			GeeHashSet* _tmp77_;
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp77_ = to_tombstone;
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			tombstone_entomb_many_sources (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection), TOMBSTONE_REASON_REMOVED_BY_USER, &_inner_error_);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6431 "MediaDataRepresentation.c"
-					goto __catch565_database_error;
+#line 6449 "MediaDataRepresentation.c"
+					goto __catch574_database_error;
 				}
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_aggregate_progress_monitor_unref0 (agg_monitor);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (not_trashed);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (offlined);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (trashed);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (to_tombstone);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_tmp1_);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_critical ("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 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
-#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return;
-#line 6452 "MediaDataRepresentation.c"
+#line 6470 "MediaDataRepresentation.c"
 			}
 		}
-		goto __finally565;
-		__catch565_database_error:
+		goto __finally574;
+		__catch574_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp78_;
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			err = _inner_error_;
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_inner_error_ = NULL;
-#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp78_ = err;
-#line 706 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			app_window_database_error (_tmp78_);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_error_free0 (err);
-#line 6470 "MediaDataRepresentation.c"
+#line 6488 "MediaDataRepresentation.c"
 		}
-		__finally565:
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		__finally574:
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_aggregate_progress_monitor_unref0 (agg_monitor);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (not_trashed);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (offlined);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (trashed);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (to_tombstone);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_tmp1_);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			g_clear_error (&_inner_error_);
-#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 705 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return;
-#line 6493 "MediaDataRepresentation.c"
+#line 6511 "MediaDataRepresentation.c"
 		}
 	}
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_aggregate_progress_monitor_unref0 (agg_monitor);
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (not_trashed);
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (offlined);
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (trashed);
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (to_tombstone);
-#line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 6508 "MediaDataRepresentation.c"
+#line 6526 "MediaDataRepresentation.c"
 }
 
 
@@ -6517,36 +6535,36 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 	gint _tmp2_;
 	gint i = 0;
 	GError * _inner_error_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self));
-#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail ((not_deleted == NULL) || GEE_IS_LIST (not_deleted));
 #line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail ((not_deleted == NULL) || GEE_IS_LIST (not_deleted));
+#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = sources;
-#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 715 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 717 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	total_count = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	i = 1;
-#line 6535 "MediaDataRepresentation.c"
+#line 6553 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = sources;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_source_it = _tmp4_;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 6548 "MediaDataRepresentation.c"
+#line 6566 "MediaDataRepresentation.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			MediaSource* source = NULL;
@@ -6567,43 +6585,43 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 			ProgressMonitor _tmp34_;
 			void* _tmp34__target;
 			gint _tmp38_;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = _source_it;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp6_) {
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 6577 "MediaDataRepresentation.c"
+#line 6595 "MediaDataRepresentation.c"
 			}
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _source_it;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			source = (MediaSource*) _tmp8_;
-#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = source;
-#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = media_source_get_file (_tmp9_);
-#line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			file = _tmp10_;
-#line 6591 "MediaDataRepresentation.c"
+#line 6609 "MediaDataRepresentation.c"
 			{
 				GFile* _tmp11_;
-#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp11_ = file;
-#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_file_delete (_tmp11_, NULL, &_inner_error_);
-#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6600 "MediaDataRepresentation.c"
-					goto __catch566_g_error;
+#line 6618 "MediaDataRepresentation.c"
+					goto __catch575_g_error;
 				}
 			}
-			goto __finally566;
-			__catch566_g_error:
+			goto __finally575;
+			__catch575_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp12_;
@@ -6611,236 +6629,236 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				gchar* _tmp14_;
 				GError* _tmp15_;
 				const gchar* _tmp16_;
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				err = _inner_error_;
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_inner_error_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp12_ = file;
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp13_ = g_file_get_path (_tmp12_);
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp14_ = _tmp13_;
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = err;
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp16_ = _tmp15_->message;
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-				g_debug ("MediaDataRepresentation.vala:724: Exception deleting file %s: %s", _tmp14_, _tmp16_);
-#line 724 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				g_debug ("MediaDataRepresentation.vala:726: Exception deleting file %s: %s", _tmp14_, _tmp16_);
+#line 726 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_free0 (_tmp14_);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_error_free0 (err);
-#line 6633 "MediaDataRepresentation.c"
+#line 6651 "MediaDataRepresentation.c"
 			}
-			__finally566:
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+			__finally575:
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (file);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (source);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_source_it);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				g_clear_error (&_inner_error_);
-#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 722 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return;
-#line 6650 "MediaDataRepresentation.c"
+#line 6668 "MediaDataRepresentation.c"
 			}
-#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp17_ = source;
-#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp18_ = media_source_get_master_file (_tmp17_);
-#line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			masterfile = _tmp18_;
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp19_ = masterfile;
-#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp19_ != NULL) {
-#line 6662 "MediaDataRepresentation.c"
+#line 6680 "MediaDataRepresentation.c"
 				{
 					GFile* _tmp20_;
-#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp20_ = masterfile;
-#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					g_file_delete (_tmp20_, NULL, &_inner_error_);
-#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6671 "MediaDataRepresentation.c"
-						goto __catch567_g_error;
+#line 6689 "MediaDataRepresentation.c"
+						goto __catch576_g_error;
 					}
 				}
-				goto __finally567;
-				__catch567_g_error:
+				goto __finally576;
+				__catch576_g_error:
 				{
 					GError* err = NULL;
 					GError* _tmp21_;
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					err = _inner_error_;
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_inner_error_ = NULL;
-#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_tmp21_ = err;
-#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					if (!g_error_matches (_tmp21_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
-#line 6688 "MediaDataRepresentation.c"
+#line 6706 "MediaDataRepresentation.c"
 						GFile* _tmp22_;
 						gchar* _tmp23_;
 						gchar* _tmp24_;
 						GError* _tmp25_;
 						const gchar* _tmp26_;
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp22_ = masterfile;
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp23_ = g_file_get_path (_tmp22_);
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp24_ = _tmp23_;
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp25_ = err;
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_tmp26_ = _tmp25_->message;
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-						g_debug ("MediaDataRepresentation.vala:733: Exception deleting master file %s: %" \
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+						g_debug ("MediaDataRepresentation.vala:735: Exception deleting master file %s: %" \
 "s", _tmp24_, _tmp26_);
-#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 						_g_free0 (_tmp24_);
-#line 6708 "MediaDataRepresentation.c"
+#line 6726 "MediaDataRepresentation.c"
 					}
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_error_free0 (err);
-#line 6712 "MediaDataRepresentation.c"
+#line 6730 "MediaDataRepresentation.c"
 				}
-				__finally567:
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+				__finally576:
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (masterfile);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (file);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (source);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					_g_object_unref0 (_source_it);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					g_clear_error (&_inner_error_);
-#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 					return;
-#line 6731 "MediaDataRepresentation.c"
+#line 6749 "MediaDataRepresentation.c"
 				}
 			}
-#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp27_ = file;
-#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp28_ = g_file_query_exists (_tmp27_, NULL);
-#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			deleted = !_tmp28_;
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp30_ = deleted;
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp30_) {
-#line 6744 "MediaDataRepresentation.c"
+#line 6762 "MediaDataRepresentation.c"
 				GeeList* _tmp31_;
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp31_ = not_deleted;
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp29_ = NULL != _tmp31_;
-#line 6750 "MediaDataRepresentation.c"
+#line 6768 "MediaDataRepresentation.c"
 			} else {
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp29_ = FALSE;
-#line 6754 "MediaDataRepresentation.c"
+#line 6772 "MediaDataRepresentation.c"
 			}
-#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp29_) {
-#line 6758 "MediaDataRepresentation.c"
+#line 6776 "MediaDataRepresentation.c"
 				GeeList* _tmp32_;
 				MediaSource* _tmp33_;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp32_ = not_deleted;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp33_ = source;
-#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 742 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_);
-#line 6767 "MediaDataRepresentation.c"
+#line 6785 "MediaDataRepresentation.c"
 			}
-#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp34_ = monitor;
-#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp34__target = monitor_target;
-#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp34_ != NULL) {
-#line 6775 "MediaDataRepresentation.c"
+#line 6793 "MediaDataRepresentation.c"
 				ProgressMonitor _tmp35_;
 				void* _tmp35__target;
 				gint _tmp36_;
 				gint _tmp37_;
-#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35_ = monitor;
-#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35__target = monitor_target;
-#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp36_ = i;
-#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp37_ = total_count;
-#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp35_ ((guint64) _tmp36_, (guint64) _tmp37_, TRUE, _tmp35__target);
-#line 6790 "MediaDataRepresentation.c"
+#line 6808 "MediaDataRepresentation.c"
 			}
-#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp38_ = i;
-#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 748 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			i = _tmp38_ + 1;
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (masterfile);
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (file);
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (source);
-#line 6802 "MediaDataRepresentation.c"
+#line 6820 "MediaDataRepresentation.c"
 		}
-#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_source_it);
-#line 6806 "MediaDataRepresentation.c"
+#line 6824 "MediaDataRepresentation.c"
 	}
 }
 
 
 TransactionController* media_source_collection_get_transaction_controller (MediaSourceCollection* self) {
-#line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL);
-#line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self);
-#line 6816 "MediaDataRepresentation.c"
+#line 6834 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) {
-#line 355 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 6823 "MediaDataRepresentation.c"
+#line 6841 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) {
-#line 362 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 364 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media));
-#line 6830 "MediaDataRepresentation.c"
+#line 6848 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_master_file_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) {
-#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
-#line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 6841 "MediaDataRepresentation.c"
+#line 6859 "MediaDataRepresentation.c"
 }
 
 
@@ -6851,36 +6869,36 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (n_param_values == 4);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data1 = closure->data;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6860 "MediaDataRepresentation.c"
+#line 6878 "MediaDataRepresentation.c"
 	} else {
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		data2 = closure->data;
-#line 6866 "MediaDataRepresentation.c"
+#line 6884 "MediaDataRepresentation.c"
 	}
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2);
-#line 6872 "MediaDataRepresentation.c"
+#line 6890 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_real_trashcan_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-#line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 370 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 6881 "MediaDataRepresentation.c"
+#line 6899 "MediaDataRepresentation.c"
 }
 
 
@@ -6889,11 +6907,11 @@ static void media_source_collection_real_import_roll_altered (MediaSourceCollect
 
 
 static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
-#line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 377 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 6894 "MediaDataRepresentation.c"
+#line 6912 "MediaDataRepresentation.c"
 }
 
 
@@ -6902,73 +6920,73 @@ static void media_source_collection_real_flagged_contents_altered (MediaSourceCo
 
 
 static void media_source_collection_class_init (MediaSourceCollectionClass * klass) {
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((DataCollectionClass *) klass)->finalize = media_source_collection_finalize;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaSourceCollectionPrivate));
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_trashcan;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_offline_bin;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) media_source_collection_real_get_typename;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) media_source_collection_real_is_file_recognized;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) media_source_collection_real_fetch_by_numeric_id;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_import_roll_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_flagged_contents_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_starting;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_completed;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) media_source_collection_real_items_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) media_source_collection_real_fetch_by_source_id;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) media_source_collection_real_get_event_source_ids;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->import_many = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_import_many;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_postprocess_imported_media;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->media_import_starting = media_source_collection_real_media_import_starting;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->media_import_completed = media_source_collection_real_media_import_completed;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->master_file_replaced = media_source_collection_real_master_file_replaced;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->trashcan_contents_altered = media_source_collection_real_trashcan_contents_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->import_roll_altered = media_source_collection_real_import_roll_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->offline_contents_altered = media_source_collection_real_offline_contents_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaSourceCollectionClass *) klass)->flagged_contents_altered = media_source_collection_real_flagged_contents_altered;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL] = g_signal_new ("media-import-starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL] = 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"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL] = 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"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL] = 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"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL] = g_signal_new ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("offline-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_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"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6969 "MediaDataRepresentation.c"
+#line 6987 "MediaDataRepresentation.c"
 }
 
 
@@ -6977,51 +6995,51 @@ static void media_source_collection_instance_init (MediaSourceCollection * self)
 	GeeTreeMultiMap* _tmp1_;
 	GeeTreeSet* _tmp2_;
 	GeeHashSet* _tmp3_;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->trashcan = NULL;
-#line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->offline_bin = NULL;
-#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+	self->priv->by_master_file = _tmp0_;
+#line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_tree_multi_map_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _import_id_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	self->priv->import_rolls = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	self->priv->import_rolls = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
+#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_tree_set_new (TYPE_IMPORT_ID, (GBoxedCopyFunc) import_id_dup, (GDestroyNotify) import_id_free, _import_id_compare_func_gcompare_data_func, NULL, NULL);
-#line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->sorted_import_ids = _tmp2_;
-#line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
-#line 7000 "MediaDataRepresentation.c"
+#line 7018 "MediaDataRepresentation.c"
 }
 
 
 static void media_source_collection_finalize (DataCollection * obj) {
 	MediaSourceCollection * self;
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection);
-#line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (self->priv->trashcan);
-#line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_source_holding_tank_unref0 (self->priv->offline_bin);
-#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_g_object_unref0 (self->priv->by_master_file);
 #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	_g_object_unref0 (self->priv->import_rolls);
+	_g_object_unref0 (self->priv->by_master_file);
 #line 350 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	_g_object_unref0 (self->priv->import_rolls);
+#line 352 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->sorted_import_ids);
-#line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->flagged);
-#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj);
-#line 7022 "MediaDataRepresentation.c"
+#line 7040 "MediaDataRepresentation.c"
 }
 
 
@@ -7038,9 +7056,9 @@ GType media_source_collection_get_type (void) {
 
 
 static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) {
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_on_init_done ((MediaCollectionRegistry*) self);
-#line 7041 "MediaDataRepresentation.c"
+#line 7059 "MediaDataRepresentation.c"
 }
 
 
@@ -7048,26 +7066,26 @@ static MediaCollectionRegistry* media_collection_registry_construct (GType objec
 	MediaCollectionRegistry* self = NULL;
 	Application* _tmp0_;
 	Application* _tmp1_;
-#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = (MediaCollectionRegistry*) g_type_create_instance (object_type);
-#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = application_get_instance ();
-#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_connect (_tmp1_, "init-done", (GCallback) _media_collection_registry_on_init_done_application_init_done, self);
-#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_application_unref0 (_tmp1_);
-#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self;
-#line 7061 "MediaDataRepresentation.c"
+#line 7079 "MediaDataRepresentation.c"
 }
 
 
 static MediaCollectionRegistry* media_collection_registry_new (void) {
-#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY);
-#line 7068 "MediaDataRepresentation.c"
+#line 7086 "MediaDataRepresentation.c"
 }
 
 
@@ -7080,40 +7098,40 @@ static void media_collection_registry_on_init_done (MediaCollectionRegistry* sel
 	LibraryMonitor* _tmp4_;
 	LibraryMonitorPool* _tmp5_;
 	LibraryMonitorPool* _tmp6_;
-#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
 #line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = commandline_options_no_runtime_monitoring;
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = library_monitor_new (_tmp1_, TRUE, !_tmp2_);
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 772 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor = _tmp4_;
-#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = library_monitor_pool_get_instance ();
-#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = _tmp5_;
-#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor_pool_replace (_tmp6_, library_monitor, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC);
-#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp6_);
-#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (library_monitor);
-#line 7107 "MediaDataRepresentation.c"
+#line 7125 "MediaDataRepresentation.c"
 }
 
 
 static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_on_import_directory_changed ();
-#line 7114 "MediaDataRepresentation.c"
+#line 7132 "MediaDataRepresentation.c"
 }
 
 
@@ -7121,21 +7139,21 @@ void media_collection_registry_init (void) {
 	MediaCollectionRegistry* _tmp0_;
 	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_collection_registry_new ();
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_media_collection_registry_unref0 (media_collection_registry_instance);
-#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_instance = _tmp0_;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "import-directory-changed", (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL);
-#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp2_);
-#line 7136 "MediaDataRepresentation.c"
+#line 7154 "MediaDataRepresentation.c"
 }
 
 
@@ -7143,17 +7161,17 @@ void media_collection_registry_terminate (void) {
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	guint _tmp2_;
-#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_parse_name ("import-directory-changed", TYPE_CONFIGURATION_FACADE, &_tmp2_, NULL, FALSE);
-#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL);
-#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (_tmp1_);
-#line 7154 "MediaDataRepresentation.c"
+#line 7172 "MediaDataRepresentation.c"
 }
 
 
@@ -7174,94 +7192,96 @@ static void media_collection_registry_on_import_directory_changed (void) {
 	LibraryMonitorPool* _tmp15_;
 	LibraryMonitorPool* _tmp16_;
 	LibraryMonitor* _tmp17_;
-#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	import_dir = _tmp0_;
 #line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	import_dir = _tmp0_;
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = library_monitor_pool_get_instance ();
-#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = library_monitor_pool_get_monitor (_tmp2_);
-#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = _tmp3_;
-#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp2_);
-#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	current = _tmp4_;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = current;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp6_ != NULL) {
-#line 7195 "MediaDataRepresentation.c"
+#line 7213 "MediaDataRepresentation.c"
 		LibraryMonitor* _tmp7_;
 		GFile* _tmp8_;
 		GFile* _tmp9_;
 		GFile* _tmp10_;
 		gboolean _tmp11_;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7_ = current;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp9_ = _tmp8_;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp10_ = import_dir;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp11_ = g_file_equal (_tmp9_, _tmp10_);
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp11_;
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp9_);
-#line 7215 "MediaDataRepresentation.c"
+#line 7233 "MediaDataRepresentation.c"
 	} else {
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = FALSE;
-#line 7219 "MediaDataRepresentation.c"
+#line 7237 "MediaDataRepresentation.c"
 	}
-#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp5_) {
-#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (current);
-#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (import_dir);
-#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return;
-#line 7229 "MediaDataRepresentation.c"
+#line 7247 "MediaDataRepresentation.c"
 	}
-#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp12_ = import_dir;
-#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp13_ = commandline_options_no_runtime_monitoring;
-#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp14_ = library_monitor_new (_tmp12_, TRUE, !_tmp13_);
-#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	replacement = _tmp14_;
 #line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	replacement = _tmp14_;
+#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp15_ = library_monitor_pool_get_instance ();
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp16_ = _tmp15_;
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp17_ = replacement;
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	library_monitor_pool_replace (_tmp16_, _tmp17_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC);
-#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_library_monitor_pool_unref0 (_tmp16_);
-#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	library_files_select_copy_function ();
+#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (replacement);
-#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (current);
-#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (import_dir);
-#line 7255 "MediaDataRepresentation.c"
+#line 7275 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _media_collection_registry_ref0 (gpointer self) {
-#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? media_collection_registry_ref (self) : NULL;
-#line 7262 "MediaDataRepresentation.c"
+#line 7282 "MediaDataRepresentation.c"
 }
 
 
@@ -7269,15 +7289,15 @@ MediaCollectionRegistry* media_collection_registry_get_instance (void) {
 	MediaCollectionRegistry* result = NULL;
 	MediaCollectionRegistry* _tmp0_;
 	MediaCollectionRegistry* _tmp1_;
-#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = media_collection_registry_instance;
-#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _media_collection_registry_ref0 (_tmp0_);
-#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp1_;
-#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7278 "MediaDataRepresentation.c"
+#line 7298 "MediaDataRepresentation.c"
 }
 
 
@@ -7285,23 +7305,23 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gboolean _tmp1_;
-#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-	g_return_val_if_fail (source_id != NULL, NULL);
 #line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+	g_return_val_if_fail (source_id != NULL, NULL);
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
-#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_) {
-#line 7294 "MediaDataRepresentation.c"
+#line 7314 "MediaDataRepresentation.c"
 		gchar* _tmp2_;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = g_strdup (PHOTO_TYPENAME);
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp2_;
-#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7302 "MediaDataRepresentation.c"
+#line 7322 "MediaDataRepresentation.c"
 	} else {
 		gchar** components = NULL;
 		const gchar* _tmp3_;
@@ -7315,37 +7335,37 @@ gchar* media_collection_registry_get_typename_from_source_id (const gchar* sourc
 		gint _tmp7__length1;
 		const gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = source_id;
-#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "-", 0);
-#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components = _tmp5_;
-#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components_length1 = _vala_array_length (_tmp4_);
-#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_components_size_ = components_length1;
-#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = components;
-#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6__length1 = components_length1;
-#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 811 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_vala_assert (_tmp6__length1 == 2, "components.length == 2");
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7_ = components;
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp7__length1 = components_length1;
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp8_ = _tmp7_[0];
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp9_;
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL);
-#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7346 "MediaDataRepresentation.c"
+#line 7366 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7358,31 +7378,31 @@ void media_collection_registry_register_collection (MediaCollectionRegistry* sel
 	gchar* _tmp4_;
 	gchar* _tmp5_;
 	MediaSourceCollection* _tmp6_;
-#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (collection));
-#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->all;
-#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = collection;
-#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 818 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = self->priv->by_typename;
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = collection;
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = media_source_collection_get_typename (_tmp3_);
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp5_ = _tmp4_;
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp6_ = collection;
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_);
-#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (_tmp5_);
-#line 7383 "MediaDataRepresentation.c"
+#line 7403 "MediaDataRepresentation.c"
 }
 
 
@@ -7391,21 +7411,21 @@ MediaSourceCollection* media_collection_registry_get_collection (MediaCollection
 	GeeHashMap* _tmp0_;
 	const gchar* _tmp1_;
 	gpointer _tmp2_;
-#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (typename != NULL, NULL);
-#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->by_typename;
-#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = typename;
-#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = (MediaSourceCollection*) _tmp2_;
-#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7406 "MediaDataRepresentation.c"
+#line 7426 "MediaDataRepresentation.c"
 }
 
 
@@ -7414,171 +7434,171 @@ GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self)
 	GeeArrayList* _tmp0_;
 	GeeBidirList* _tmp1_;
 	GeeBidirList* _tmp2_;
-#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = self->priv->all;
-#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList));
-#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = _tmp1_;
-#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7427 "MediaDataRepresentation.c"
+#line 7447 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_freeze_all (MediaCollectionRegistry* self) {
-#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 834 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7434 "MediaDataRepresentation.c"
+#line 7454 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7455 "MediaDataRepresentation.c"
+#line 7475 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
 			GeeIterator* _tmp6_;
 			gpointer _tmp7_;
 			MediaSourceCollection* _tmp8_;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7470 "MediaDataRepresentation.c"
+#line 7490 "MediaDataRepresentation.c"
 			}
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7484 "MediaDataRepresentation.c"
+#line 7504 "MediaDataRepresentation.c"
 		}
-#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7488 "MediaDataRepresentation.c"
+#line 7508 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_thaw_all (MediaCollectionRegistry* self) {
-#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7496 "MediaDataRepresentation.c"
+#line 7516 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7517 "MediaDataRepresentation.c"
+#line 7537 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
 			GeeIterator* _tmp6_;
 			gpointer _tmp7_;
 			MediaSourceCollection* _tmp8_;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7532 "MediaDataRepresentation.c"
+#line 7552 "MediaDataRepresentation.c"
 			}
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7546 "MediaDataRepresentation.c"
+#line 7566 "MediaDataRepresentation.c"
 		}
-#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7550 "MediaDataRepresentation.c"
+#line 7570 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) {
-#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7558 "MediaDataRepresentation.c"
+#line 7578 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7579 "MediaDataRepresentation.c"
+#line 7599 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
@@ -7587,66 +7607,66 @@ void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry
 			MediaSourceCollection* _tmp8_;
 			TransactionController* _tmp9_;
 			TransactionController* _tmp10_;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7596 "MediaDataRepresentation.c"
+#line 7616 "MediaDataRepresentation.c"
 			}
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_transaction_controller (_tmp8_);
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _tmp9_;
-#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			transaction_controller_begin (_tmp10_);
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7614 "MediaDataRepresentation.c"
+#line 7634 "MediaDataRepresentation.c"
 		}
-#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7618 "MediaDataRepresentation.c"
+#line 7638 "MediaDataRepresentation.c"
 	}
 }
 
 
 void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) {
-#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self));
-#line 7626 "MediaDataRepresentation.c"
+#line 7646 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_sources_it = _tmp3_;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7647 "MediaDataRepresentation.c"
+#line 7667 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* sources = NULL;
@@ -7655,37 +7675,37 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr
 			MediaSourceCollection* _tmp8_;
 			TransactionController* _tmp9_;
 			TransactionController* _tmp10_;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _sources_it;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7664 "MediaDataRepresentation.c"
+#line 7684 "MediaDataRepresentation.c"
 			}
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _sources_it;
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			sources = (MediaSourceCollection*) _tmp7_;
-#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = sources;
-#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_transaction_controller (_tmp8_);
-#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = _tmp9_;
-#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			transaction_controller_commit (_tmp10_);
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (sources);
-#line 7682 "MediaDataRepresentation.c"
+#line 7702 "MediaDataRepresentation.c"
 		}
-#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 850 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_sources_it);
-#line 7686 "MediaDataRepresentation.c"
+#line 7706 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7702,68 +7722,68 @@ MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* sel
 	MediaSourceCollection* _tmp7_;
 	const gchar* _tmp8_;
 	MediaSource* _tmp9_;
-#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = media_collection_registry_get_typename_from_source_id (_tmp0_);
-#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	typename = _tmp1_;
-#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp2_ = typename;
-#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = media_collection_registry_get_collection (self, _tmp2_);
-#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	collection = _tmp3_;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = collection;
-#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp4_ == NULL) {
-#line 7723 "MediaDataRepresentation.c"
+#line 7743 "MediaDataRepresentation.c"
 		const gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = source_id;
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = typename;
-#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
-		g_critical ("MediaDataRepresentation.vala:856: source id '%s' has unrecognized medi" \
+#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+		g_critical ("MediaDataRepresentation.vala:859: source id '%s' has unrecognized medi" \
 "a type '%s'", _tmp5_, _tmp6_);
-#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = NULL;
-#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_data_collection_unref0 (collection);
-#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_free0 (typename);
-#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7740 "MediaDataRepresentation.c"
+#line 7760 "MediaDataRepresentation.c"
 	}
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp7_ = collection;
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp8_ = source_id;
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp9_ = media_source_collection_fetch_by_source_id (_tmp7_, _tmp8_);
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp9_;
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_data_collection_unref0 (collection);
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_free0 (typename);
-#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7756 "MediaDataRepresentation.c"
+#line 7776 "MediaDataRepresentation.c"
 }
 
 
 static gpointer _import_id_dup0 (gpointer self) {
-#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return self ? import_id_dup (self) : NULL;
-#line 7763 "MediaDataRepresentation.c"
+#line 7783 "MediaDataRepresentation.c"
 }
 
 
@@ -7772,32 +7792,32 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 	ImportID last_import_id = {0};
 	ImportID _tmp16_;
 	gint64 _tmp17_;
-#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 864 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	import_id_init (&last_import_id, IMPORT_ID_INVALID);
-#line 7776 "MediaDataRepresentation.c"
+#line 7796 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_collection_it = _tmp3_;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7797 "MediaDataRepresentation.c"
+#line 7817 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* current_collection = NULL;
@@ -7811,88 +7831,88 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry*
 			gint64 _tmp12_;
 			ImportID _tmp13_;
 			gint64 _tmp14_;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _current_collection_it;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7819 "MediaDataRepresentation.c"
+#line 7839 "MediaDataRepresentation.c"
 			}
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _current_collection_it;
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_collection = (MediaSourceCollection*) _tmp7_;
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = current_collection;
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = media_source_collection_get_last_import_id (_tmp8_);
-#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_import_id = _tmp9_;
-#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = current_import_id;
-#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp10_ == NULL) {
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_import_id_free0 (current_import_id);
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_data_collection_unref0 (current_collection);
-#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				continue;
-#line 7843 "MediaDataRepresentation.c"
+#line 7863 "MediaDataRepresentation.c"
 			}
-#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = current_import_id;
-#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = (*_tmp11_).id;
-#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = last_import_id;
-#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp14_ = _tmp13_.id;
-#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp12_ > _tmp14_) {
-#line 7855 "MediaDataRepresentation.c"
+#line 7875 "MediaDataRepresentation.c"
 				ImportID* _tmp15_;
-#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp15_ = current_import_id;
-#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				last_import_id = *_tmp15_;
-#line 7861 "MediaDataRepresentation.c"
+#line 7881 "MediaDataRepresentation.c"
 			}
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_import_id_free0 (current_import_id);
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7867 "MediaDataRepresentation.c"
+#line 7887 "MediaDataRepresentation.c"
 		}
-#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7871 "MediaDataRepresentation.c"
+#line 7891 "MediaDataRepresentation.c"
 	}
-#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp16_ = last_import_id;
-#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp17_ = _tmp16_.id;
-#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp17_ == IMPORT_ID_INVALID) {
-#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = NULL;
-#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 882 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7883 "MediaDataRepresentation.c"
+#line 7903 "MediaDataRepresentation.c"
 	} else {
 		ImportID* _tmp18_;
-#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp18_ = _import_id_dup0 (&last_import_id);
-#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = _tmp18_;
-#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 7892 "MediaDataRepresentation.c"
+#line 7912 "MediaDataRepresentation.c"
 	}
 }
 
@@ -7901,36 +7921,36 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 	GeeCollection* result = NULL;
 	GeeArrayList* _result_ = NULL;
 	GeeArrayList* _tmp0_;
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_result_ = _tmp0_;
-#line 7909 "MediaDataRepresentation.c"
+#line 7929 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _current_collection_it = NULL;
 		GeeCollection* _tmp1_;
 		GeeCollection* _tmp2_;
 		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = media_collection_registry_get_all (self);
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp1_;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp4_ = _tmp3_;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_current_collection_it = _tmp4_;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 7930 "MediaDataRepresentation.c"
+#line 7950 "MediaDataRepresentation.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			MediaSourceCollection* current_collection = NULL;
@@ -7941,80 +7961,80 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle
 			EventID _tmp11_;
 			GeeCollection* _tmp12_;
 			GeeCollection* _tmp13_;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = _current_collection_it;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp6_) {
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 7949 "MediaDataRepresentation.c"
+#line 7969 "MediaDataRepresentation.c"
 			}
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = _current_collection_it;
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			current_collection = (MediaSourceCollection*) _tmp8_;
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = _result_;
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = current_collection;
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp11_ = *event_id;
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp12_ = media_source_collection_get_event_source_ids (_tmp10_, &_tmp11_);
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp13_ = _tmp12_;
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			gee_array_list_add_all (_tmp9_, _tmp13_);
-#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_g_object_unref0 (_tmp13_);
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (current_collection);
-#line 7973 "MediaDataRepresentation.c"
+#line 7993 "MediaDataRepresentation.c"
 		}
-#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 890 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_current_collection_it);
-#line 7977 "MediaDataRepresentation.c"
+#line 7997 "MediaDataRepresentation.c"
 	}
-#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 7983 "MediaDataRepresentation.c"
+#line 8003 "MediaDataRepresentation.c"
 }
 
 
 MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file) {
 	MediaSourceCollection* result = NULL;
-#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL);
-#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 7993 "MediaDataRepresentation.c"
+#line 8013 "MediaDataRepresentation.c"
 	{
 		GeeIterator* _collection_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp0_ = media_collection_registry_get_all (self);
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp1_ = _tmp0_;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp3_ = _tmp2_;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_collection_it = _tmp3_;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		while (TRUE) {
-#line 8014 "MediaDataRepresentation.c"
+#line 8034 "MediaDataRepresentation.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			MediaSourceCollection* collection = NULL;
@@ -8023,51 +8043,51 @@ MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaC
 			MediaSourceCollection* _tmp8_;
 			GFile* _tmp9_;
 			gboolean _tmp10_;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp4_ = _collection_it;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (!_tmp5_) {
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				break;
-#line 8031 "MediaDataRepresentation.c"
+#line 8051 "MediaDataRepresentation.c"
 			}
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp6_ = _collection_it;
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			collection = (MediaSourceCollection*) _tmp7_;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp8_ = collection;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp9_ = file;
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_tmp10_ = media_source_collection_is_file_recognized (_tmp8_, _tmp9_);
-#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (_tmp10_) {
-#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				result = collection;
-#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_g_object_unref0 (_collection_it);
-#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				return result;
-#line 8053 "MediaDataRepresentation.c"
+#line 8073 "MediaDataRepresentation.c"
 			}
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			_data_collection_unref0 (collection);
-#line 8057 "MediaDataRepresentation.c"
+#line 8077 "MediaDataRepresentation.c"
 		}
-#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_g_object_unref0 (_collection_it);
-#line 8061 "MediaDataRepresentation.c"
+#line 8081 "MediaDataRepresentation.c"
 	}
-#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = NULL;
-#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 8067 "MediaDataRepresentation.c"
+#line 8087 "MediaDataRepresentation.c"
 }
 
 
@@ -8078,255 +8098,255 @@ gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry*
 	gboolean _tmp2_ = FALSE;
 	const gchar* _tmp3_;
 	gboolean _tmp4_;
-#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 906 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), FALSE);
-#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = source_id;
-#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp1_) {
-#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		result = FALSE;
-#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 908 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return result;
-#line 8090 "MediaDataRepresentation.c"
+#line 8110 "MediaDataRepresentation.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp3_ = source_id;
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp4_ = g_str_has_prefix (_tmp3_, PHOTO_TYPENAME);
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (_tmp4_) {
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = TRUE;
-#line 8100 "MediaDataRepresentation.c"
+#line 8120 "MediaDataRepresentation.c"
 	} else {
 		const gchar* _tmp5_;
 		gboolean _tmp6_;
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp5_ = source_id;
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-");
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		_tmp2_ = _tmp6_;
-#line 8110 "MediaDataRepresentation.c"
+#line 8130 "MediaDataRepresentation.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	result = _tmp2_;
-#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 910 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return result;
-#line 8116 "MediaDataRepresentation.c"
+#line 8136 "MediaDataRepresentation.c"
 }
 
 
 static void value_media_collection_registry_init (GValue* value) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	value->data[0].v_pointer = NULL;
-#line 8123 "MediaDataRepresentation.c"
+#line 8143 "MediaDataRepresentation.c"
 }
 
 
 static void value_media_collection_registry_free_value (GValue* value) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (value->data[0].v_pointer) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (value->data[0].v_pointer);
-#line 8132 "MediaDataRepresentation.c"
+#line 8152 "MediaDataRepresentation.c"
 	}
 }
 
 
 static void value_media_collection_registry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer);
-#line 8142 "MediaDataRepresentation.c"
+#line 8162 "MediaDataRepresentation.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8146 "MediaDataRepresentation.c"
+#line 8166 "MediaDataRepresentation.c"
 	}
 }
 
 
 static gpointer value_media_collection_registry_peek_pointer (const GValue* value) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 8154 "MediaDataRepresentation.c"
+#line 8174 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (collect_values[0].v_pointer) {
-#line 8161 "MediaDataRepresentation.c"
+#line 8181 "MediaDataRepresentation.c"
 		MediaCollectionRegistry * object;
 		object = collect_values[0].v_pointer;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8168 "MediaDataRepresentation.c"
+#line 8188 "MediaDataRepresentation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.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 8172 "MediaDataRepresentation.c"
+#line 8192 "MediaDataRepresentation.c"
 		}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = media_collection_registry_ref (object);
-#line 8176 "MediaDataRepresentation.c"
+#line 8196 "MediaDataRepresentation.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8180 "MediaDataRepresentation.c"
+#line 8200 "MediaDataRepresentation.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8184 "MediaDataRepresentation.c"
+#line 8204 "MediaDataRepresentation.c"
 }
 
 
 static gchar* value_media_collection_registry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	MediaCollectionRegistry ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!object_p) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8195 "MediaDataRepresentation.c"
+#line 8215 "MediaDataRepresentation.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (!value->data[0].v_pointer) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = NULL;
-#line 8201 "MediaDataRepresentation.c"
+#line 8221 "MediaDataRepresentation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8205 "MediaDataRepresentation.c"
+#line 8225 "MediaDataRepresentation.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		*object_p = media_collection_registry_ref (value->data[0].v_pointer);
-#line 8209 "MediaDataRepresentation.c"
+#line 8229 "MediaDataRepresentation.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return NULL;
-#line 8213 "MediaDataRepresentation.c"
+#line 8233 "MediaDataRepresentation.c"
 }
 
 
 GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecMediaCollectionRegistry* spec;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_COLLECTION_REGISTRY), NULL);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return G_PARAM_SPEC (spec);
-#line 8227 "MediaDataRepresentation.c"
+#line 8247 "MediaDataRepresentation.c"
 }
 
 
 gpointer value_get_media_collection_registry (const GValue* value) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return value->data[0].v_pointer;
-#line 8236 "MediaDataRepresentation.c"
+#line 8256 "MediaDataRepresentation.c"
 }
 
 
 void value_set_media_collection_registry (GValue* value, gpointer v_object) {
 	MediaCollectionRegistry * old;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	old = value->data[0].v_pointer;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (v_object) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_ref (value->data[0].v_pointer);
-#line 8256 "MediaDataRepresentation.c"
+#line 8276 "MediaDataRepresentation.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8260 "MediaDataRepresentation.c"
+#line 8280 "MediaDataRepresentation.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8266 "MediaDataRepresentation.c"
+#line 8286 "MediaDataRepresentation.c"
 	}
 }
 
 
 void value_take_media_collection_registry (GValue* value, gpointer v_object) {
 	MediaCollectionRegistry * old;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	old = value->data[0].v_pointer;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (v_object) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = v_object;
-#line 8285 "MediaDataRepresentation.c"
+#line 8305 "MediaDataRepresentation.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		value->data[0].v_pointer = NULL;
-#line 8289 "MediaDataRepresentation.c"
+#line 8309 "MediaDataRepresentation.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (old) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		media_collection_registry_unref (old);
-#line 8295 "MediaDataRepresentation.c"
+#line 8315 "MediaDataRepresentation.c"
 	}
 }
 
 
 static void media_collection_registry_class_init (MediaCollectionRegistryClass * klass) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	media_collection_registry_parent_class = g_type_class_peek_parent (klass);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate));
-#line 8307 "MediaDataRepresentation.c"
+#line 8327 "MediaDataRepresentation.c"
 }
 
 
 static void media_collection_registry_instance_init (MediaCollectionRegistry * self) {
 	GeeArrayList* _tmp0_;
 	GeeHashMap* _tmp1_;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self);
-#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL);
-#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->all = _tmp0_;
-#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->priv->by_typename = _tmp1_;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self->ref_count = 1;
-#line 8326 "MediaDataRepresentation.c"
+#line 8346 "MediaDataRepresentation.c"
 }
 
 
@@ -8335,25 +8355,25 @@ static void media_collection_registry_finalize (MediaCollectionRegistry * obj) {
 	Application* _tmp0_;
 	Application* _tmp1_;
 	guint _tmp2_;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_destroy (self);
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp0_ = application_get_instance ();
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_tmp1_ = _tmp0_;
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_parse_name ("init-done", TYPE_APPLICATION, &_tmp2_, NULL, FALSE);
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_init_done_application_init_done, self);
-#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_application_unref0 (_tmp1_);
-#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 758 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->all);
-#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	_g_object_unref0 (self->priv->by_typename);
-#line 8353 "MediaDataRepresentation.c"
+#line 8373 "MediaDataRepresentation.c"
 }
 
 
@@ -8374,24 +8394,24 @@ GType media_collection_registry_get_type (void) {
 gpointer media_collection_registry_ref (gpointer instance) {
 	MediaCollectionRegistry * self;
 	self = instance;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	return instance;
-#line 8378 "MediaDataRepresentation.c"
+#line 8398 "MediaDataRepresentation.c"
 }
 
 
 void media_collection_registry_unref (gpointer instance) {
 	MediaCollectionRegistry * self;
 	self = instance;
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self);
-#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
+#line 753 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8391 "MediaDataRepresentation.c"
+#line 8411 "MediaDataRepresentation.c"
 	}
 }
 
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index e78894f..f4b9f7d 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -59,7 +59,9 @@ public abstract class MediaSource : ThumbnailSource, Indexable {
     protected override void notify_altered(Alteration alteration) {
         Alteration local = alteration;
         
-        if (local.has_detail("metadata", "name") || local.has_detail("backing", "master")) {
+        if (local.has_detail("metadata", "name") ||
+            local.has_detail("metadata", "comment") ||
+            local.has_detail("backing", "master")) {
             update_indexable_keywords();
             local = local.compress(new Alteration("indexable", "keywords"));
         }
@@ -792,6 +794,7 @@ public class MediaCollectionRegistry {
         LibraryMonitor replacement = new LibraryMonitor(import_dir, true,
             !CommandlineOptions.no_runtime_monitoring);
         LibraryMonitorPool.get_instance().replace(replacement, LIBRARY_MONITOR_START_DELAY_MSEC);
+        LibraryFiles.select_copy_function();
     }
     
     public static MediaCollectionRegistry get_instance() {
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 659af71..583afbf 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -293,11 +293,11 @@ void transaction_controller_begin (TransactionController* self) {
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "MediaInterfaces.c"
-					goto __catch574_g_error;
+					goto __catch583_g_error;
 				}
 			}
-			goto __finally574;
-			__catch574_g_error:
+			goto __finally583;
+			__catch583_g_error:
 			{
 				GError* err = NULL;
 				gint _tmp3_;
@@ -344,7 +344,7 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally574:
+			__finally583:
 #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"
 			}
 		}
-		__finally573:
+		__finally582:
 		{
 			gint _tmp11_;
 #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 __catch576_g_error;
+					goto __catch585_g_error;
 				}
 			}
-			goto __finally576;
-			__catch576_g_error:
+			goto __finally585;
+			__catch585_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp5_;
@@ -499,7 +499,7 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally576:
+			__finally585:
 #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"
 			}
 		}
-		__finally575:
+		__finally584:
 		{
 			gint _tmp12_;
 #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"
 		}
-		__finally572:
+		__finally581:
 		{
 			gint _tmp2_;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index b06e19e..91da70c 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -2860,7 +2860,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 2863 "MediaMonitor.c"
-				goto __catch585_g_error;
+				goto __catch594_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
@@ -2868,8 +2868,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			transaction_controller_commit (_tmp39_);
 #line 2870 "MediaMonitor.c"
 		}
-		goto __finally585;
-		__catch585_g_error:
+		goto __finally594;
+		__catch594_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp40_;
@@ -2911,7 +2911,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_g_error_free0 (err);
 #line 2913 "MediaMonitor.c"
 		}
-		__finally585:
+		__finally594:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2918 "MediaMonitor.c"
diff --git a/src/MediaPage.c b/src/MediaPage.c
index 7dd7c65..ae79f6f 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -367,9 +367,6 @@ typedef struct _ThumbnailClass ThumbnailClass;
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
-#define TYPE_RATING_FILTER (rating_filter_get_type ())
-#define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
-
 #define TYPE_TEXT_ENTRY_DIALOG_MEDIATOR (text_entry_dialog_mediator_get_type ())
 #define TEXT_ENTRY_DIALOG_MEDIATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator))
 #define TEXT_ENTRY_DIALOG_MEDIATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediatorClass))
@@ -922,24 +919,6 @@ typedef enum  {
 	PHOTO_FILE_FORMAT_UNKNOWN
 } PhotoFileFormat;
 
-typedef enum  {
-	RATING_FILTER_NO_FILTER = 0,
-	RATING_FILTER_REJECTED_OR_HIGHER = 1,
-	RATING_FILTER_UNRATED_OR_HIGHER = 2,
-	RATING_FILTER_ONE_OR_HIGHER = 3,
-	RATING_FILTER_TWO_OR_HIGHER = 4,
-	RATING_FILTER_THREE_OR_HIGHER = 5,
-	RATING_FILTER_FOUR_OR_HIGHER = 6,
-	RATING_FILTER_FIVE_OR_HIGHER = 7,
-	RATING_FILTER_REJECTED_ONLY = 8,
-	RATING_FILTER_UNRATED_ONLY = 9,
-	RATING_FILTER_ONE_ONLY = 10,
-	RATING_FILTER_TWO_ONLY = 11,
-	RATING_FILTER_THREE_ONLY = 12,
-	RATING_FILTER_FOUR_ONLY = 13,
-	RATING_FILTER_FIVE_ONLY = 14
-} RatingFilter;
-
 struct _FlaggableIface {
 	GTypeInterface parent_iface;
 	gboolean (*is_flagged) (Flaggable* self);
@@ -1181,7 +1160,6 @@ 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);
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
 static void media_page_update_rating_sensitivities (MediaPage* self);
 static void media_page_update_development_menu_item_sensitivity (MediaPage* self);
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
@@ -1225,10 +1203,6 @@ GFile* media_source_get_file (MediaSource* self);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* event);
 void page_activate_action (Page* self, const gchar* name);
-gboolean page_get_ctrl_pressed (Page* self);
-SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self);
-GType rating_filter_get_type (void) G_GNUC_CONST;
-void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter rf);
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
 static void media_page_real_switched_to (Page* base);
 void page_switched_to (Page* self);
@@ -1330,11 +1304,11 @@ GType library_photo_get_type (void) G_GNUC_CONST;
 void remove_photos_from_library (GeeCollection* photos);
 static void media_page_real_on_move_to_trash (MediaPage* self);
 DataView* view_collection_get_next (ViewCollection* self, DataView* view);
+gboolean data_collection_contains (DataCollection* self, DataObject* object);
+void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item);
 TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
 TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
-gboolean data_collection_contains (DataCollection* self, DataObject* object);
-void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* item);
 static void media_page_real_on_edit_title (MediaPage* self);
 GType edit_title_dialog_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_title (MediaSource* self);
@@ -1451,7 +1425,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[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}};
+static const GActionEntry MEDIA_PAGE_entries[29] = {{"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}, {"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;
@@ -1486,7 +1460,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 1490 "MediaPage.c"
+#line 1464 "MediaPage.c"
 		GdkPixbuf* _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = resources_load_icon ("sprocket.png", 0);
@@ -1494,18 +1468,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 1498 "MediaPage.c"
+#line 1472 "MediaPage.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 1502 "MediaPage.c"
+#line 1476 "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 1509 "MediaPage.c"
+#line 1483 "MediaPage.c"
 }
 
 
@@ -1539,7 +1513,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 1543 "MediaPage.c"
+#line 1517 "MediaPage.c"
 	} else {
 		gdouble reduction_factor = 0.0;
 		gint _tmp3_;
@@ -1573,7 +1547,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 1577 "MediaPage.c"
+#line 1551 "MediaPage.c"
 		} else {
 			gint _tmp10_;
 			GdkPixbuf* _tmp11_;
@@ -1589,11 +1563,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 1593 "MediaPage.c"
+#line 1567 "MediaPage.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp8_) {
-#line 1597 "MediaPage.c"
+#line 1571 "MediaPage.c"
 			GdkPixbuf* _tmp14_;
 			gint _tmp15_;
 			gint _tmp16_;
@@ -1610,7 +1584,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 1614 "MediaPage.c"
+#line 1588 "MediaPage.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = media_source_item_current_sprocket_pixbuf;
@@ -1620,7 +1594,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 1624 "MediaPage.c"
+#line 1598 "MediaPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = ctx;
@@ -1634,7 +1608,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 1638 "MediaPage.c"
+#line 1612 "MediaPage.c"
 		cairo_t* _tmp25_;
 		GdkPoint _tmp26_;
 		Dimensions _tmp27_;
@@ -1646,7 +1620,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 1650 "MediaPage.c"
+#line 1624 "MediaPage.c"
 	}
 }
 
@@ -1693,7 +1667,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 1697 "MediaPage.c"
+#line 1671 "MediaPage.c"
 }
 
 
@@ -1763,19 +1737,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 1767 "MediaPage.c"
+#line 1741 "MediaPage.c"
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		i = 0;
-#line 1772 "MediaPage.c"
+#line 1746 "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 1779 "MediaPage.c"
+#line 1753 "MediaPage.c"
 				gint _tmp15_;
 				gint _tmp16_;
 				cairo_t* _tmp17_;
@@ -1792,13 +1766,13 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				gint _tmp28_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (!_tmp13_) {
-#line 1796 "MediaPage.c"
+#line 1770 "MediaPage.c"
 					gint _tmp14_;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = i;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					i = _tmp14_ + 1;
-#line 1802 "MediaPage.c"
+#line 1776 "MediaPage.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp13_ = FALSE;
@@ -1810,7 +1784,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 1814 "MediaPage.c"
+#line 1788 "MediaPage.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = ctx;
@@ -1844,7 +1818,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 1848 "MediaPage.c"
+#line 1822 "MediaPage.c"
 			}
 		}
 	}
@@ -1864,7 +1838,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 1868 "MediaPage.c"
+#line 1842 "MediaPage.c"
 		cairo_t* _tmp35_;
 		cairo_t* _tmp36_;
 		GdkPixbuf* _tmp37_;
@@ -1977,7 +1951,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 1981 "MediaPage.c"
+#line 1955 "MediaPage.c"
 	}
 }
 
@@ -1990,7 +1964,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 1994 "MediaPage.c"
+#line 1968 "MediaPage.c"
 }
 
 
@@ -2014,7 +1988,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 2018 "MediaPage.c"
+#line 1992 "MediaPage.c"
 }
 
 
@@ -2029,7 +2003,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 2033 "MediaPage.c"
+#line 2007 "MediaPage.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2040,7 +2014,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 2044 "MediaPage.c"
+#line 2018 "MediaPage.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->natural_collation_key;
@@ -2050,7 +2024,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 2054 "MediaPage.c"
+#line 2028 "MediaPage.c"
 }
 
 
@@ -2063,7 +2037,7 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) {
 	((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) 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 2067 "MediaPage.c"
+#line 2041 "MediaPage.c"
 }
 
 
@@ -2074,7 +2048,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 2078 "MediaPage.c"
+#line 2052 "MediaPage.c"
 }
 
 
@@ -2086,7 +2060,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 2090 "MediaPage.c"
+#line 2064 "MediaPage.c"
 }
 
 
@@ -2117,210 +2091,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 2121 "MediaPage.c"
+#line 2095 "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 2128 "MediaPage.c"
+#line 2102 "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 2135 "MediaPage.c"
+#line 2109 "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 2142 "MediaPage.c"
+#line 2116 "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 2149 "MediaPage.c"
+#line 2123 "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 2156 "MediaPage.c"
+#line 2130 "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 2163 "MediaPage.c"
+#line 2137 "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 2170 "MediaPage.c"
+#line 2144 "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 2177 "MediaPage.c"
+#line 2151 "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 2184 "MediaPage.c"
+#line 2158 "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 2191 "MediaPage.c"
+#line 2165 "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 2198 "MediaPage.c"
+#line 2172 "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 2205 "MediaPage.c"
+#line 2179 "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 2212 "MediaPage.c"
+#line 2186 "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 2219 "MediaPage.c"
+#line 2193 "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 2226 "MediaPage.c"
+#line 2200 "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 2233 "MediaPage.c"
+#line 2207 "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 2240 "MediaPage.c"
+#line 2214 "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 2247 "MediaPage.c"
+#line 2221 "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 2254 "MediaPage.c"
+#line 2228 "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 2261 "MediaPage.c"
+#line 2235 "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 2268 "MediaPage.c"
+#line 2242 "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 2275 "MediaPage.c"
+#line 2249 "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 2282 "MediaPage.c"
+#line 2256 "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 2289 "MediaPage.c"
+#line 2263 "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 2296 "MediaPage.c"
+#line 2270 "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 2303 "MediaPage.c"
+#line 2277 "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 2310 "MediaPage.c"
+#line 2284 "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 2317 "MediaPage.c"
+#line 2291 "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 2324 "MediaPage.c"
+#line 2298 "MediaPage.c"
 }
 
 
@@ -2519,7 +2493,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 2523 "MediaPage.c"
+#line 2497 "MediaPage.c"
 }
 
 
@@ -2550,7 +2524,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 2554 "MediaPage.c"
+#line 2528 "MediaPage.c"
 }
 
 
@@ -2581,7 +2555,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 2585 "MediaPage.c"
+#line 2559 "MediaPage.c"
 }
 
 
@@ -2601,63 +2575,63 @@ 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 2605 "MediaPage.c"
+#line 2579 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new23 (gboolean value) {
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2612 "MediaPage.c"
+#line 2586 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new24 (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 2619 "MediaPage.c"
+#line 2593 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new25 (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 2626 "MediaPage.c"
+#line 2600 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new26 (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 2633 "MediaPage.c"
+#line 2607 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new27 (gchar* 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_string (value));
-#line 2640 "MediaPage.c"
+#line 2614 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new28 (const 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 2647 "MediaPage.c"
+#line 2621 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new29 (const gchar* value) {
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 2654 "MediaPage.c"
+#line 2628 "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"
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_raw_developer_changed ((MediaPage*) self, _sender, value);
-#line 2661 "MediaPage.c"
+#line 2635 "MediaPage.c"
 }
 
 
@@ -2717,239 +2691,239 @@ static void media_page_real_add_actions (Page* base, GActionMap* map) {
 	GSimpleAction* _tmp47_;
 	GSimpleAction* _tmp48_;
 	GActionMap* _tmp49_;
-#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 322 "/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"
+#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = map;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 323 "/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"
+#line 327 "/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"
+#line 327 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_order = _tmp1_;
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp2_;
-#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = map;
-#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 329 "/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"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = config_facade_get_instance ();
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/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 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _variant_new23 (_tmp8_);
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp5_, _tmp9_);
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp9_);
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = _tmp12_;
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/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 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = _variant_new24 (_tmp14_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = _tmp16_;
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = config_facade_get_instance ();
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = _tmp18_;
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/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 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = _variant_new25 (_tmp20_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp17_, _tmp21_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp21_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = config_facade_get_instance ();
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = _tmp24_;
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/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 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = _variant_new26 (_tmp26_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp23_, _tmp27_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp27_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp23_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp28_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp29_ = _tmp28_;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp30_ = sort_by;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp31_ = g_strdup_printf ("%d", _tmp30_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = _tmp31_;
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp33_ = _variant_new27 (_tmp32_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp29_, _tmp33_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp33_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp32_);
-#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp29_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp35_ = sort_order;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp35_) {
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "ascending";
-#line 2845 "MediaPage.c"
+#line 2819 "MediaPage.c"
 	} else {
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = "descending";
-#line 2849 "MediaPage.c"
+#line 2823 "MediaPage.c"
 	}
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp36_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp37_ = _tmp36_;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp38_ = _variant_new28 (_tmp34_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp37_, _tmp38_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp38_);
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp37_);
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp40_ = _tmp39_;
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/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 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp42_ = _tmp41_;
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	d = _tmp42_;
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp44_ = d;
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp44_ == RAW_DEVELOPER_SHOTWELL) {
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Shotwell";
-#line 2881 "MediaPage.c"
+#line 2855 "MediaPage.c"
 	} else {
-#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp43_ = "Camera";
-#line 2885 "MediaPage.c"
+#line 2859 "MediaPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp45_ = G_VARIANT_TYPE_STRING;
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp46_ = _variant_new29 (_tmp43_);
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/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"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp48_ = _tmp47_;
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp46_);
-#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	action = _tmp48_;
-#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 340 "/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"
+#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_enabled (action, TRUE);
-#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp49_ = map;
-#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 342 "/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"
+#line 322 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (action);
-#line 2909 "MediaPage.c"
+#line 2883 "MediaPage.c"
 }
 
 
 static void media_page_real_remove_actions (Page* base, GActionMap* map) {
 	MediaPage * self;
 	GActionMap* _tmp0_;
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 345 "/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"
+#line 345 "/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"
+#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = map;
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 346 "/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 2924 "MediaPage.c"
+#line 2898 "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"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		entry_collection = MEDIA_PAGE_entries;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/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"
+#line 347 "/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 2936 "MediaPage.c"
+#line 2910 "MediaPage.c"
 			GActionEntry entry = {0};
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			entry = entry_collection[entry_it];
-#line 2940 "MediaPage.c"
+#line 2914 "MediaPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
 				const gchar* _tmp3_;
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp1_ = map;
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp2_ = entry;
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2953 "MediaPage.c"
+#line 2927 "MediaPage.c"
 			}
 		}
 	}
@@ -2976,119 +2950,119 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp20_;
 	gint _tmp21_;
 	gint _tmp22_;
-#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", _tmp0_ > 0);
-#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = selected_count;
-#line 355 "/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), "EditTitle", _tmp1_ > 0);
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = selected_count;
-#line 356 "/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), "EditComment", _tmp2_ > 0);
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_get_thumb_size (self);
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 357 "/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), "IncreaseSize", _tmp3_ < _tmp5_);
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_get_thumb_size (self);
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MIN_SCALE ();
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 358 "/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), "DecreaseSize", _tmp6_ > _tmp8_);
-#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = selected_count;
-#line 359 "/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), "RemoveFromLibrary", _tmp9_ > 0);
-#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = selected_count;
-#line 360 "/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), "MoveToTrash", _tmp10_ > 0);
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = desktop_integration_is_send_to_installed ();
-#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_) {
-#line 3022 "MediaPage.c"
+#line 2996 "MediaPage.c"
 		gint _tmp12_;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = selected_count;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 3028 "MediaPage.c"
+#line 3002 "MediaPage.c"
 	} else {
-#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 3032 "MediaPage.c"
+#line 364 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
+#line 3006 "MediaPage.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = selected_count;
-#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", _tmp13_ > 0);
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_development_menu_item_sensitivity (self);
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = selected_count;
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp15_ == 1) {
-#line 3046 "MediaPage.c"
+#line 3020 "MediaPage.c"
 		ViewCollection* _tmp16_;
 		ViewCollection* _tmp17_;
 		DataSource* _tmp18_;
 		DataSource* _tmp19_;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/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 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _tmp16_;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = view_collection_get_selected_source_at (_tmp17_, 0);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 3065 "MediaPage.c"
+#line 3039 "MediaPage.c"
 	} else {
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = FALSE;
-#line 3069 "MediaPage.c"
+#line 3043 "MediaPage.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = selected_count;
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_flag_action (self, _tmp20_);
-#line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = selected_count;
-#line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = count;
-#line 377 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 376 "/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 3083 "MediaPage.c"
+#line 3057 "MediaPage.c"
 }
 
 
 static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3092 "MediaPage.c"
+#line 3066 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -3097,25 +3071,25 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = altered;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_object_it = _tmp5_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3119 "MediaPage.c"
+#line 3093 "MediaPage.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -3127,65 +3101,65 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			Alteration* _tmp13_;
 			gboolean _tmp14_;
 			gboolean _tmp15_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = _object_it;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp7_) {
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3139 "MediaPage.c"
+#line 3113 "MediaPage.c"
 			}
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _object_it;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = altered;
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = object;
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = (Alteration*) _tmp12_;
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = alteration_has_detail (_tmp13_, "metadata", "flagged");
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_alteration_unref0 (_tmp13_);
-#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp15_) {
-#line 3163 "MediaPage.c"
+#line 3137 "MediaPage.c"
 				ViewCollection* _tmp16_;
 				ViewCollection* _tmp17_;
 				gint _tmp18_;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = _tmp16_;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				media_page_update_flag_action (self, _tmp18_);
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_data_collection_unref0 (_tmp17_);
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (object);
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3181 "MediaPage.c"
+#line 3155 "MediaPage.c"
 			}
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 3185 "MediaPage.c"
+#line 3159 "MediaPage.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3189 "MediaPage.c"
+#line 3163 "MediaPage.c"
 	}
 }
 
@@ -3200,45 +3174,45 @@ static void media_page_update_rating_sensitivities (MediaPage* self) {
 	gboolean _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp8_;
-#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_can_rate_selected (self, RATING_REJECTED);
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp0_);
-#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_can_rate_selected (self, RATING_UNRATED);
-#line 392 "/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), "RateUnrated", _tmp1_);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_can_rate_selected (self, RATING_ONE);
-#line 393 "/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), "RateOne", _tmp2_);
-#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_can_rate_selected (self, RATING_TWO);
-#line 394 "/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), "RateTwo", _tmp3_);
-#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_can_rate_selected (self, RATING_THREE);
-#line 395 "/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), "RateThree", _tmp4_);
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = media_page_can_rate_selected (self, RATING_FOUR);
-#line 396 "/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), "RateFour", _tmp5_);
-#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_can_rate_selected (self, RATING_FIVE);
-#line 397 "/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), "RateFive", _tmp6_);
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = media_page_can_increase_selected_rating (self);
-#line 398 "/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), "IncreaseRating", _tmp7_);
-#line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_page_can_decrease_selected_rating (self);
-#line 399 "/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), "DecreaseRating", _tmp8_);
-#line 3242 "MediaPage.c"
+#line 3216 "MediaPage.c"
 }
 
 
@@ -3252,37 +3226,37 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 	gboolean _tmp6_;
 	gboolean is_raw = FALSE;
 	gboolean _tmp27_;
-#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_ == 0;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp6_) {
-#line 404 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
-#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 3282 "MediaPage.c"
+#line 3256 "MediaPage.c"
 	}
-#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 3286 "MediaPage.c"
+#line 3260 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp7_;
@@ -3294,31 +3268,31 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		gint _tmp12_;
 		gint _tmp13_;
 		gint _view_index = 0;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp10_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _view_list;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp13_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3322 "MediaPage.c"
+#line 3296 "MediaPage.c"
 			gint _tmp14_;
 			gint _tmp15_;
 			gint _tmp16_;
@@ -3332,107 +3306,107 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			Photo* _tmp22_;
 			gboolean _tmp23_ = FALSE;
 			Photo* _tmp24_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_index;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp14_ + 1;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_index;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_size;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp15_ < _tmp16_)) {
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3348 "MediaPage.c"
+#line 3322 "MediaPage.c"
 			}
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _view_index;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = gee_list_get (_tmp17_, _tmp18_);
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp19_;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = view;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp21_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_THUMBNAIL, Thumbnail));
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_PHOTO) ? ((Photo*) _tmp21_) : NULL;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ == NULL) {
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3368 "MediaPage.c"
+#line 3342 "MediaPage.c"
 			}
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp24_ = photo;
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 3376 "MediaPage.c"
+#line 3350 "MediaPage.c"
 				Photo* _tmp25_;
 				PhotoFileFormat _tmp26_;
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo;
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = photo_get_master_file_format (_tmp25_);
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 3385 "MediaPage.c"
+#line 3359 "MediaPage.c"
 			} else {
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 3389 "MediaPage.c"
+#line 3363 "MediaPage.c"
 			}
-#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				is_raw = TRUE;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (photo);
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3401 "MediaPage.c"
+#line 3375 "MediaPage.c"
 			}
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3407 "MediaPage.c"
+#line 3381 "MediaPage.c"
 		}
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3411 "MediaPage.c"
+#line 3385 "MediaPage.c"
 	}
-#line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp27_ = is_raw;
-#line 420 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
-#line 3417 "MediaPage.c"
+#line 3391 "MediaPage.c"
 }
 
 
 static void media_page_update_flag_action (MediaPage* self, gint selected_count) {
 	gint _tmp0_;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 3429 "MediaPage.c"
+#line 3403 "MediaPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3436 "MediaPage.c"
+#line 3410 "MediaPage.c"
 }
 
 
@@ -3441,17 +3415,17 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_;
 	CoreViewTracker* _tmp1_;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp1_;
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3455 "MediaPage.c"
+#line 3429 "MediaPage.c"
 }
 
 
@@ -3465,53 +3439,53 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
 	gboolean _tmp8_;
-#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/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 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 434 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = display;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
-#line 3507 "MediaPage.c"
+#line 3481 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 	gboolean result = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3515 "MediaPage.c"
+#line 3489 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3523,31 +3497,31 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _view_index = 0;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3551 "MediaPage.c"
+#line 3525 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3561,75 +3535,75 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			Rating _tmp16_;
 			Rating _tmp17_;
 			gboolean _tmp18_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3577 "MediaPage.c"
+#line 3551 "MediaPage.c"
 			}
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp16_ != _tmp17_;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 442 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3611 "MediaPage.c"
+#line 3585 "MediaPage.c"
 			}
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3615 "MediaPage.c"
+#line 3589 "MediaPage.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3619 "MediaPage.c"
+#line 3593 "MediaPage.c"
 	}
-#line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3625 "MediaPage.c"
+#line 3599 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3633 "MediaPage.c"
+#line 3607 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3641,31 +3615,31 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _view_index = 0;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3669 "MediaPage.c"
+#line 3643 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3679,75 +3653,75 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			Rating _tmp16_;
 			gboolean _tmp17_;
 			gboolean _tmp18_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3695 "MediaPage.c"
+#line 3669 "MediaPage.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_increase (_tmp16_);
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3729 "MediaPage.c"
+#line 3703 "MediaPage.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3733 "MediaPage.c"
+#line 3707 "MediaPage.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3737 "MediaPage.c"
+#line 3711 "MediaPage.c"
 	}
-#line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 454 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3743 "MediaPage.c"
+#line 3717 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 3751 "MediaPage.c"
+#line 3725 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_;
@@ -3759,31 +3733,31 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		gint _tmp5_;
 		gint _tmp6_;
 		gint _view_index = 0;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 3787 "MediaPage.c"
+#line 3761 "MediaPage.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -3797,84 +3771,84 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			Rating _tmp16_;
 			gboolean _tmp17_;
 			gboolean _tmp18_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 3813 "MediaPage.c"
+#line 3787 "MediaPage.c"
 			}
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_decrease (_tmp16_);
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 3847 "MediaPage.c"
+#line 3821 "MediaPage.c"
 			}
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 3851 "MediaPage.c"
+#line 3825 "MediaPage.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 3855 "MediaPage.c"
+#line 3829 "MediaPage.c"
 	}
-#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3861 "MediaPage.c"
+#line 3835 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) {
 	MediaPageZoomSliderAssembly* result = NULL;
 	MediaPageZoomSliderAssembly* _tmp0_;
-#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_zoom_slider_assembly_new ();
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp0_;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 3878 "MediaPage.c"
+#line 3852 "MediaPage.c"
 }
 
 
@@ -3883,35 +3857,35 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_;
 	GdkModifierType _tmp1_;
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_increase_zoom_level (self);
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3903 "MediaPage.c"
+#line 3877 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_;
 		gboolean _tmp3_;
-#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_);
-#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 475 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3915 "MediaPage.c"
+#line 3889 "MediaPage.c"
 	}
 }
 
@@ -3921,35 +3895,35 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_;
 	GdkModifierType _tmp1_;
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_decrease_zoom_level (self);
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3941 "MediaPage.c"
+#line 3915 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_;
 		gboolean _tmp3_;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/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 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 3953 "MediaPage.c"
+#line 3927 "MediaPage.c"
 	}
 }
 
@@ -3959,23 +3933,23 @@ static void media_page_on_send_to (MediaPage* self) {
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
 	GeeCollection* _tmp3_;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	desktop_integration_send_to (_tmp3_);
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 489 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3979 "MediaPage.c"
+#line 3953 "MediaPage.c"
 }
 
 
@@ -3994,59 +3968,59 @@ void media_page_on_play_video (MediaPage* self) {
 	Video* _tmp10_;
 	Video* _tmp11_;
 	GError * _inner_error_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4014 "MediaPage.c"
+#line 3988 "MediaPage.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO) ? ((Video*) _tmp8_) : NULL;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_ == NULL) {
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 4032 "MediaPage.c"
+#line 4006 "MediaPage.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	video = _tmp10_;
-#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = video;
-#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_ == NULL) {
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4050 "MediaPage.c"
+#line 4024 "MediaPage.c"
 	}
 	{
 		Video* _tmp12_;
@@ -4054,72 +4028,72 @@ void media_page_on_play_video (MediaPage* self) {
 		GFile* _tmp14_;
 		gchar* _tmp15_;
 		gchar* _tmp16_;
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = video;
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = _tmp13_;
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = g_file_get_uri (_tmp14_);
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_app_info_launch_default_for_uri (_tmp16_, NULL, &_inner_error_);
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp16_);
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4076 "MediaPage.c"
-			goto __catch561_g_error;
+#line 4050 "MediaPage.c"
+			goto __catch570_g_error;
 		}
 	}
-	goto __finally561;
-	__catch561_g_error:
+	goto __finally570;
+	__catch570_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp17_;
 		const gchar* _tmp18_;
 		gchar* _tmp19_;
 		gchar* _tmp20_;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		e = _inner_error_;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_inner_error_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = e;
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp17_->message;
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = g_strdup_printf (_ ("Shotwell was unable to play the selected video:\n%s"), _tmp18_);
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = _tmp19_;
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		app_window_error_message (_tmp20_, NULL);
-#line 503 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp20_);
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 4106 "MediaPage.c"
+#line 4080 "MediaPage.c"
 	}
-	__finally561:
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	__finally570:
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/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 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_clear_error (&_inner_error_);
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4119 "MediaPage.c"
+#line 4093 "MediaPage.c"
 	}
-#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 4123 "MediaPage.c"
+#line 4097 "MediaPage.c"
 }
 
 
@@ -4132,499 +4106,251 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label10 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label11 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label12 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label13 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label14 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label15 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label16 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label17 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label18 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label19 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label20 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label21 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label22 = 0;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	static GQuark _tmp4_label23 = 0;
-#line 4184 "MediaPage.c"
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_;
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 4142 "MediaPage.c"
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_;
+#line 507 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	handled = TRUE;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/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 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4207 "MediaPage.c"
+#line 4165 "MediaPage.c"
 			default:
 			{
-#line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4214 "MediaPage.c"
+#line 4172 "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 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4220 "MediaPage.c"
+#line 4178 "MediaPage.c"
 			default:
 			{
-#line 520 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 521 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4227 "MediaPage.c"
+#line 4185 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4233 "MediaPage.c"
+#line 4191 "MediaPage.c"
 			default:
 			{
-#line 524 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4240 "MediaPage.c"
+#line 4198 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4246 "MediaPage.c"
+#line 4204 "MediaPage.c"
 			default:
 			{
-#line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 529 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4253 "MediaPage.c"
+#line 4211 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4259 "MediaPage.c"
+#line 4217 "MediaPage.c"
 			default:
 			{
-#line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 533 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4266 "MediaPage.c"
+#line 4224 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4272 "MediaPage.c"
+#line 4230 "MediaPage.c"
 			default:
 			{
-#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 537 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4279 "MediaPage.c"
+#line 4237 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4285 "MediaPage.c"
+#line 4243 "MediaPage.c"
 			default:
 			{
-#line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 541 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4292 "MediaPage.c"
+#line 4250 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4298 "MediaPage.c"
+#line 4256 "MediaPage.c"
 			default:
 			{
-#line 544 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 545 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4305 "MediaPage.c"
+#line 4263 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4311 "MediaPage.c"
+#line 4269 "MediaPage.c"
 			default:
 			{
-#line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 549 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4318 "MediaPage.c"
+#line 4276 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4324 "MediaPage.c"
+#line 4282 "MediaPage.c"
 			default:
 			{
-#line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 553 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4331 "MediaPage.c"
+#line 4289 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4337 "MediaPage.c"
+#line 4295 "MediaPage.c"
 			default:
 			{
-#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4344 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4350 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp6_;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp6_) {
-#line 4358 "MediaPage.c"
-					SearchViewFilter* _tmp7_;
-					SearchViewFilter* _tmp8_;
-#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 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp8_ = _tmp7_;
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER);
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp8_);
-#line 4369 "MediaPage.c"
-				}
-#line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4373 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4379 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp9_;
-#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp9_) {
-#line 4387 "MediaPage.c"
-					SearchViewFilter* _tmp10_;
-					SearchViewFilter* _tmp11_;
-#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 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp11_ = _tmp10_;
-#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER);
-#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp11_);
-#line 4398 "MediaPage.c"
-				}
-#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4402 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4408 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp12_;
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp12_) {
-#line 4416 "MediaPage.c"
-					SearchViewFilter* _tmp13_;
-					SearchViewFilter* _tmp14_;
-#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 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp14_ = _tmp13_;
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER);
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp14_);
-#line 4427 "MediaPage.c"
-				}
-#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4431 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4437 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp15_;
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp15_) {
-#line 4445 "MediaPage.c"
-					SearchViewFilter* _tmp16_;
-					SearchViewFilter* _tmp17_;
-#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 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp17_ = _tmp16_;
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER);
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp17_);
-#line 4456 "MediaPage.c"
-				}
-#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4460 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4466 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp18_;
-#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp18_) {
-#line 4474 "MediaPage.c"
-					SearchViewFilter* _tmp19_;
-					SearchViewFilter* _tmp20_;
-#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 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp20_ = _tmp19_;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER);
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp20_);
-#line 4485 "MediaPage.c"
-				}
-#line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4489 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4495 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp21_;
-#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp21_) {
-#line 4503 "MediaPage.c"
-					SearchViewFilter* _tmp22_;
-					SearchViewFilter* _tmp23_;
-#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 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp23_ = _tmp22_;
-#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER);
-#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp23_);
-#line 4514 "MediaPage.c"
-				}
-#line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4518 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4524 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp24_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp24_) {
-#line 4532 "MediaPage.c"
-					SearchViewFilter* _tmp25_;
-					SearchViewFilter* _tmp26_;
-#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 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp26_ = _tmp25_;
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER);
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp26_);
-#line 4543 "MediaPage.c"
-				}
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				break;
-#line 4547 "MediaPage.c"
-			}
-		}
-	} else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		switch (0) {
-#line 4553 "MediaPage.c"
-			default:
-			{
-				gboolean _tmp27_;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp27_) {
-#line 4561 "MediaPage.c"
-					SearchViewFilter* _tmp28_;
-					SearchViewFilter* _tmp29_;
-#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 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp29_ = _tmp28_;
-#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY);
-#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_view_filter_unref0 (_tmp29_);
-#line 4572 "MediaPage.c"
-				}
-#line 597 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4576 "MediaPage.c"
+#line 4302 "MediaPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("slash")))) {
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4582 "MediaPage.c"
+#line 4308 "MediaPage.c"
 			default:
 			{
-#line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4589 "MediaPage.c"
+#line 4315 "MediaPage.c"
 			}
 		}
 	} else {
-#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 4595 "MediaPage.c"
+#line 4321 "MediaPage.c"
 			default:
 			{
-#line 604 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
-#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4602 "MediaPage.c"
+#line 4328 "MediaPage.c"
 			}
 		}
 	}
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = handled;
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp31_) {
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp30_ = TRUE;
-#line 4612 "MediaPage.c"
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp7_ = handled;
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp7_) {
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp6_ = TRUE;
+#line 4338 "MediaPage.c"
 	} else {
-		GdkEventKey* _tmp32_;
-		gboolean _tmp33_;
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp32_ = event;
-#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 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp30_ = _tmp33_;
-#line 4622 "MediaPage.c"
+		GdkEventKey* _tmp8_;
+		gboolean _tmp9_;
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp8_ = event;
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp9_ = 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), _tmp8_);
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp6_ = _tmp9_;
+#line 4348 "MediaPage.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp30_;
-#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	result = _tmp6_;
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 4628 "MediaPage.c"
+#line 4354 "MediaPage.c"
 }
 
 
@@ -4650,142 +4376,142 @@ static void media_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp17_;
 	gint _tmp18_;
 	gboolean _tmp19_;
-#line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 612 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/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 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/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 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp4_);
-#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/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 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp7_);
-#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/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 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, _tmp10_);
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 578 "/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 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, _tmp13_);
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = _tmp14_;
-#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection));
-#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = _tmp16_;
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = _tmp18_ > 0;
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_) {
-#line 4726 "MediaPage.c"
+#line 4452 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
 		ViewCollection* _tmp20_;
 		ViewCollection* _tmp21_;
 		DataView* _tmp22_;
 		CheckerboardItem* _tmp23_;
 		CheckerboardItem* _tmp24_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = view_collection_get_selected_at (_tmp21_, 0);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		selected = _tmp23_;
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = selected;
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp24_ != NULL) {
-#line 4749 "MediaPage.c"
+#line 4475 "MediaPage.c"
 			CheckerboardItem* _tmp25_;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp25_ = selected;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 4755 "MediaPage.c"
+#line 4481 "MediaPage.c"
 		}
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 4759 "MediaPage.c"
+#line 4485 "MediaPage.c"
 	}
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 4763 "MediaPage.c"
+#line 4489 "MediaPage.c"
 }
 
 
 static void media_page_real_switching_from (Page* base) {
 	MediaPage * self;
-#line 633 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 634 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 595 "/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 4775 "MediaPage.c"
+#line 4501 "MediaPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4782 "MediaPage.c"
+#line 4508 "MediaPage.c"
 }
 
 
 static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 4789 "MediaPage.c"
+#line 4515 "MediaPage.c"
 }
 
 
@@ -4793,25 +4519,25 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 	MediaPageZoomSliderAssembly* _tmp0_;
 	MediaPageZoomSliderAssembly* _tmp1_;
 	MediaPageZoomSliderAssembly* _tmp2_;
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (slider));
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = slider;
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = _tmp1_;
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->connected_slider;
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 600 "/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 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 4815 "MediaPage.c"
+#line 4541 "MediaPage.c"
 }
 
 
@@ -4821,29 +4547,29 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	ConfigFacade* _tmp2_;
 	MediaPageZoomSliderAssembly* _tmp3_;
 	gint _tmp4_;
-#line 645 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4833 "MediaPage.c"
+#line 4559 "MediaPage.c"
 	}
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->connected_slider;
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_zoom_slider_assembly_get_scale (_tmp3_);
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/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 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 4847 "MediaPage.c"
+#line 4573 "MediaPage.c"
 }
 
 
@@ -4857,39 +4583,39 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp5_;
 	gint _tmp6_;
 	gint _tmp7_;
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 611 "/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 612 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4869 "MediaPage.c"
+#line 4595 "MediaPage.c"
 	}
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/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 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _tmp3_;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	persistent_scale = _tmp4_;
-#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = self->priv->connected_slider;
-#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = persistent_scale;
-#line 658 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_set_scale (_tmp5_, _tmp6_);
-#line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = persistent_scale;
-#line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_thumb_size (self, _tmp7_);
-#line 4893 "MediaPage.c"
+#line 4619 "MediaPage.c"
 }
 
 
@@ -4897,109 +4623,109 @@ void media_page_disconnect_slider (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_;
 	MediaPageZoomSliderAssembly* _tmp1_;
 	guint _tmp2_;
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 663 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 663 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 4909 "MediaPage.c"
+#line 4635 "MediaPage.c"
 	}
-#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
-#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_parse_name ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, &_tmp2_, NULL, FALSE);
-#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 625 "/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 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 4921 "MediaPage.c"
+#line 4647 "MediaPage.c"
 }
 
 
 static void media_page_real_on_zoom_changed (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_;
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4931 "MediaPage.c"
+#line 4657 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
 		gint _tmp2_;
-#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
-#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp2_);
-#line 4940 "MediaPage.c"
+#line 4666 "MediaPage.c"
 	}
-#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 4944 "MediaPage.c"
+#line 4670 "MediaPage.c"
 }
 
 
 void media_page_on_zoom_changed (MediaPage* self) {
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 4953 "MediaPage.c"
+#line 4679 "MediaPage.c"
 }
 
 
 static void media_page_real_on_export (MediaPage* self) {
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/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 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 4962 "MediaPage.c"
+#line 4688 "MediaPage.c"
 }
 
 
 void media_page_on_export (MediaPage* self) {
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 4971 "MediaPage.c"
+#line 4697 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_size (MediaPage* self) {
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 4978 "MediaPage.c"
+#line 4704 "MediaPage.c"
 }
 
 
 void media_page_on_increase_size (MediaPage* self) {
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 4987 "MediaPage.c"
+#line 4713 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_size (MediaPage* self) {
-#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 4994 "MediaPage.c"
+#line 4720 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_size (MediaPage* self) {
-#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5003 "MediaPage.c"
+#line 4729 "MediaPage.c"
 }
 
 
@@ -5018,45 +4744,45 @@ static void media_page_on_add_tags (MediaPage* self) {
 	gint _names_size_;
 	gchar** _tmp8_;
 	gint _tmp8__length1;
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5038 "MediaPage.c"
+#line 4764 "MediaPage.c"
 	}
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = add_tags_dialog_new ();
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp4_;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = dialog;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = add_tags_dialog_execute (_tmp5_, &_tmp6_);
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = _tmp7_;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names_length1 = _tmp6_;
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_names_size_ = names_length1;
-#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = names;
-#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8__length1 = names_length1;
-#line 694 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp8_ != NULL) {
-#line 5060 "MediaPage.c"
+#line 4786 "MediaPage.c"
 		CommandManager* _tmp9_;
 		CommandManager* _tmp10_;
 		HierarchicalTagIndex* _tmp11_;
@@ -5073,57 +4799,57 @@ static void media_page_on_add_tags (MediaPage* self) {
 		GeeCollection* _tmp20_;
 		AddTagsCommand* _tmp21_;
 		AddTagsCommand* _tmp22_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = _tmp11_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = names;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13__length1 = names_length1;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16__length1 = _tmp14_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp17_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = view_collection_get_selected_sources (_tmp18_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = add_tags_command_new (_tmp16_, _tmp14_, _tmp20_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = _tmp21_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp18_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp12_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp10_);
-#line 5121 "MediaPage.c"
+#line 4847 "MediaPage.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 5127 "MediaPage.c"
+#line 4853 "MediaPage.c"
 }
 
 
@@ -5152,93 +4878,93 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	GeeArrayList* _tmp18_;
 	ModifyTagsCommand* _tmp19_;
 	ModifyTagsCommand* _tmp20_;
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5172 "MediaPage.c"
+#line 4898 "MediaPage.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 705 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media = _tmp9_;
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = media;
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = modify_tags_dialog_new (_tmp10_);
-#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp11_;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = dialog;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = modify_tags_dialog_execute (_tmp12_);
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_tags = _tmp13_;
-#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = new_tags;
-#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp14_ == NULL) {
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (new_tags);
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (media);
-#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5216 "MediaPage.c"
+#line 4942 "MediaPage.c"
 	}
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = media;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = new_tags;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = modify_tags_command_new (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp20_);
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp16_);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (new_tags);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 5242 "MediaPage.c"
+#line 4968 "MediaPage.c"
 }
 
 
@@ -5252,45 +4978,45 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
 	gboolean _tmp8_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/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 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = display;
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
-#line 5294 "MediaPage.c"
+#line 5020 "MediaPage.c"
 }
 
 
@@ -5299,21 +5025,21 @@ static void media_page_on_new_event (MediaPage* self) {
 	ViewCollection* _tmp1_;
 	gint _tmp2_;
 	gboolean _tmp3_;
-#line 724 "/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 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 725 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 5317 "MediaPage.c"
+#line 5043 "MediaPage.c"
 		CommandManager* _tmp4_;
 		CommandManager* _tmp5_;
 		ViewCollection* _tmp6_;
@@ -5322,33 +5048,33 @@ static void media_page_on_new_event (MediaPage* self) {
 		GeeList* _tmp9_;
 		NewEventCommand* _tmp10_;
 		NewEventCommand* _tmp11_;
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = view_collection_get_selected (_tmp7_);
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _tmp8_;
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 5352 "MediaPage.c"
+#line 5078 "MediaPage.c"
 	}
 }
 
@@ -5370,52 +5096,52 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	gboolean _tmp23_;
 	FlagUnflagCommand* _tmp24_;
 	FlagUnflagCommand* _tmp25_;
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5390 "MediaPage.c"
+#line 5116 "MediaPage.c"
 	}
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_MEDIA_SOURCE);
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sources = _tmp7_;
-#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 5406 "MediaPage.c"
+#line 5132 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_;
 		GeeIterator* _tmp9_;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = sources;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_source_it = _tmp9_;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5419 "MediaPage.c"
+#line 5145 "MediaPage.c"
 			GeeIterator* _tmp10_;
 			gboolean _tmp11_;
 			MediaSource* source = NULL;
@@ -5426,90 +5152,90 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			Flaggable* _tmp15_;
 			gboolean _tmp16_ = FALSE;
 			Flaggable* _tmp17_;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _source_it;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp11_) {
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5438 "MediaPage.c"
+#line 5164 "MediaPage.c"
 			}
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _source_it;
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			source = (MediaSource*) _tmp13_;
-#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = source;
-#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
-#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			flaggable = _tmp15_;
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = flaggable;
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp17_ != NULL) {
-#line 5456 "MediaPage.c"
+#line 5182 "MediaPage.c"
 				Flaggable* _tmp18_;
 				gboolean _tmp19_;
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = flaggable;
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp19_ = flaggable_is_flagged (_tmp18_);
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = !_tmp19_;
-#line 5465 "MediaPage.c"
+#line 5191 "MediaPage.c"
 			} else {
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = FALSE;
-#line 5469 "MediaPage.c"
+#line 5195 "MediaPage.c"
 			}
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp16_) {
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				flag = TRUE;
-#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (flaggable);
-#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (source);
-#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5481 "MediaPage.c"
+#line 5207 "MediaPage.c"
 			}
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 5487 "MediaPage.c"
+#line 5213 "MediaPage.c"
 		}
-#line 738 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 5491 "MediaPage.c"
+#line 5217 "MediaPage.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = _tmp20_;
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = sources;
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = flag;
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = flag_unflag_command_new (_tmp22_, _tmp23_);
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = _tmp24_;
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp21_);
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 5513 "MediaPage.c"
+#line 5239 "MediaPage.c"
 }
 
 
@@ -5528,64 +5254,64 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	SetRatingCommand* _tmp12_;
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/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 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5546 "MediaPage.c"
+#line 5272 "MediaPage.c"
 	}
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/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 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/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 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 714 "/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 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 714 "/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 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 757 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5580 "MediaPage.c"
+#line 5306 "MediaPage.c"
 }
 
 
 void media_page_on_increase_rating (MediaPage* self) {
-#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/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 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 5589 "MediaPage.c"
+#line 5315 "MediaPage.c"
 }
 
 
@@ -5604,64 +5330,64 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	SetRatingCommand* _tmp12_;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5622 "MediaPage.c"
+#line 5348 "MediaPage.c"
 	}
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/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 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 767 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5656 "MediaPage.c"
+#line 5382 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_rating (MediaPage* self) {
-#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 5665 "MediaPage.c"
+#line 5391 "MediaPage.c"
 }
 
 
@@ -5681,178 +5407,178 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	CommandManager* _tmp11_;
 	CommandManager* _tmp12_;
 	SetRatingCommand* _tmp13_;
-#line 771 "/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 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5699 "MediaPage.c"
+#line 5425 "MediaPage.c"
 	}
-#line 774 "/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 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = rating;
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), _tmp8_);
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp10_;
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = command;
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 777 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 736 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 5735 "MediaPage.c"
+#line 5461 "MediaPage.c"
 }
 
 
 void media_page_on_set_rating (MediaPage* self, Rating rating) {
-#line 770 "/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 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 5744 "MediaPage.c"
+#line 5470 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_rejected (MediaPage* self) {
-#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 5751 "MediaPage.c"
+#line 5477 "MediaPage.c"
 }
 
 
 void media_page_on_rate_rejected (MediaPage* self) {
-#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 5760 "MediaPage.c"
+#line 5486 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_unrated (MediaPage* self) {
-#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 5767 "MediaPage.c"
+#line 5493 "MediaPage.c"
 }
 
 
 void media_page_on_rate_unrated (MediaPage* self) {
-#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 5776 "MediaPage.c"
+#line 5502 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_one (MediaPage* self) {
-#line 789 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 5783 "MediaPage.c"
+#line 5509 "MediaPage.c"
 }
 
 
 void media_page_on_rate_one (MediaPage* self) {
-#line 788 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 788 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 5792 "MediaPage.c"
+#line 5518 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_two (MediaPage* self) {
-#line 793 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 5799 "MediaPage.c"
+#line 5525 "MediaPage.c"
 }
 
 
 void media_page_on_rate_two (MediaPage* self) {
-#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 5808 "MediaPage.c"
+#line 5534 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_three (MediaPage* self) {
-#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 5815 "MediaPage.c"
+#line 5541 "MediaPage.c"
 }
 
 
 void media_page_on_rate_three (MediaPage* self) {
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 5824 "MediaPage.c"
+#line 5550 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_four (MediaPage* self) {
-#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 5831 "MediaPage.c"
+#line 5557 "MediaPage.c"
 }
 
 
 void media_page_on_rate_four (MediaPage* self) {
-#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 5840 "MediaPage.c"
+#line 5566 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_five (MediaPage* self) {
-#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 5847 "MediaPage.c"
+#line 5573 "MediaPage.c"
 }
 
 
 void media_page_on_rate_five (MediaPage* self) {
-#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 763 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 5856 "MediaPage.c"
+#line 5582 "MediaPage.c"
 }
 
 
@@ -5861,169 +5587,175 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
 	GeeCollection* _tmp3_;
-#line 808 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	remove_photos_from_library (_tmp3_);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 5881 "MediaPage.c"
+#line 5607 "MediaPage.c"
 }
 
 
 static void media_page_real_on_move_to_trash (MediaPage* self) {
 	CheckerboardItem* restore_point = NULL;
 	CheckerboardItem* _tmp0_;
+	GeeList* sources = NULL;
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
-	gint _tmp8_;
-	gboolean _tmp9_;
-	gboolean _tmp18_ = FALSE;
-	CheckerboardItem* _tmp19_;
-#line 813 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GeeList* _tmp8_;
+	GeeList* _tmp9_;
+	gboolean _tmp10_ = FALSE;
+	CheckerboardItem* _tmp11_;
+	ViewCollection* _tmp17_;
+	ViewCollection* _tmp18_;
+	gint _tmp19_;
+	gboolean _tmp20_;
+#line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	restore_point = NULL;
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 5900 "MediaPage.c"
+#line 5631 "MediaPage.c"
 		ViewCollection* _tmp1_;
 		ViewCollection* _tmp2_;
 		CheckerboardItem* _tmp3_;
 		DataView* _tmp4_;
 		CheckerboardItem* _tmp5_;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = view_collection_get_next (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView));
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp4_) : NULL;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp5_ == NULL) {
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 5920 "MediaPage.c"
+#line 5651 "MediaPage.c"
 		}
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		restore_point = _tmp5_;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 5928 "MediaPage.c"
+#line 5659 "MediaPage.c"
 	}
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _tmp8_ > 0;
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp9_ = _tmp8_;
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp9_) {
-#line 5942 "MediaPage.c"
-		CommandManager* _tmp10_;
-		CommandManager* _tmp11_;
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sources = _tmp9_;
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp11_ = restore_point;
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp11_ != NULL) {
+#line 5677 "MediaPage.c"
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
-		GeeList* _tmp14_;
-		GeeCollection* _tmp15_;
-		TrashUntrashPhotosCommand* _tmp16_;
-		TrashUntrashPhotosCommand* _tmp17_;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = _tmp10_;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		CheckerboardItem* _tmp14_;
+		gboolean _tmp15_;
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp14_ = view_collection_get_selected_sources (_tmp13_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp16_ = trash_untrash_photos_command_new (_tmp15_, TRUE);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp17_ = _tmp16_;
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp17_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp15_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp14_ = restore_point;
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.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 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp10_ = _tmp15_;
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_command_manager_unref0 (_tmp11_);
-#line 5977 "MediaPage.c"
-	}
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = restore_point;
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp19_ != NULL) {
-#line 5983 "MediaPage.c"
-		ViewCollection* _tmp20_;
-		ViewCollection* _tmp21_;
-		CheckerboardItem* _tmp22_;
-		gboolean _tmp23_;
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp21_ = _tmp20_;
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = restore_point;
-#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 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = _tmp23_;
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_data_collection_unref0 (_tmp21_);
-#line 6000 "MediaPage.c"
+#line 5694 "MediaPage.c"
 	} else {
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp18_ = FALSE;
-#line 6004 "MediaPage.c"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp10_ = FALSE;
+#line 5698 "MediaPage.c"
 	}
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp18_) {
-#line 6008 "MediaPage.c"
-		CheckerboardItem* _tmp24_;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp24_ = restore_point;
-#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 6014 "MediaPage.c"
+#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp10_) {
+#line 5702 "MediaPage.c"
+		CheckerboardItem* _tmp16_;
+#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp16_ = restore_point;
+#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp16_);
+#line 5708 "MediaPage.c"
 	}
-#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp18_ = _tmp17_;
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp19_ = view_collection_get_selected_count (_tmp18_);
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp20_ = _tmp19_ > 0;
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_data_collection_unref0 (_tmp18_);
+#line 784 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp20_) {
+#line 5722 "MediaPage.c"
+		CommandManager* _tmp21_;
+		CommandManager* _tmp22_;
+		GeeList* _tmp23_;
+		TrashUntrashPhotosCommand* _tmp24_;
+		TrashUntrashPhotosCommand* _tmp25_;
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp22_ = _tmp21_;
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp23_ = sources;
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp24_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp25_ = _tmp24_;
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp25_);
+#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_command_manager_unref0 (_tmp22_);
+#line 5744 "MediaPage.c"
+	}
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (sources);
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 6018 "MediaPage.c"
+#line 5750 "MediaPage.c"
 }
 
 
 void media_page_on_move_to_trash (MediaPage* self) {
-#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 6027 "MediaPage.c"
+#line 5759 "MediaPage.c"
 }
 
 
@@ -6049,107 +5781,107 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	EditTitleDialog* _tmp15_;
 	gchar* _tmp16_;
 	const gchar* _tmp17_;
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6067 "MediaPage.c"
+#line 5799 "MediaPage.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_title (_tmp10_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_title_dialog_new (_tmp12_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_title_dialog = _tmp14_;
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_title_dialog;
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_title_dialog_execute (_tmp15_);
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_title = _tmp16_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_title;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6111 "MediaPage.c"
+#line 5843 "MediaPage.c"
 		CommandManager* _tmp18_;
 		CommandManager* _tmp19_;
 		GeeList* _tmp20_;
 		const gchar* _tmp21_;
 		EditMultipleTitlesCommand* _tmp22_;
 		EditMultipleTitlesCommand* _tmp23_;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_title;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/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 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6136 "MediaPage.c"
+#line 5868 "MediaPage.c"
 	}
-#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
-#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6144 "MediaPage.c"
+#line 5876 "MediaPage.c"
 }
 
 
 void media_page_on_edit_title (MediaPage* self) {
-#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 6153 "MediaPage.c"
+#line 5885 "MediaPage.c"
 }
 
 
@@ -6175,107 +5907,107 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	EditCommentDialog* _tmp15_;
 	gchar* _tmp16_;
 	const gchar* _tmp17_;
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6193 "MediaPage.c"
+#line 5925 "MediaPage.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_comment (_tmp10_);
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_comment_dialog_new (_tmp12_, FALSE);
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_comment_dialog = _tmp14_;
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_comment_dialog;
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_comment_dialog_execute (_tmp15_);
-#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_comment = _tmp16_;
-#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_comment;
-#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 6237 "MediaPage.c"
+#line 5969 "MediaPage.c"
 		CommandManager* _tmp18_;
 		CommandManager* _tmp19_;
 		GeeList* _tmp20_;
 		const gchar* _tmp21_;
 		EditMultipleCommentsCommand* _tmp22_;
 		EditMultipleCommentsCommand* _tmp23_;
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_comment;
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/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 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 6262 "MediaPage.c"
+#line 5994 "MediaPage.c"
 	}
-#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
-#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 6270 "MediaPage.c"
+#line 6002 "MediaPage.c"
 }
 
 
 void media_page_on_edit_comment (MediaPage* self) {
-#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 841 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 6279 "MediaPage.c"
+#line 6011 "MediaPage.c"
 }
 
 
@@ -6287,40 +6019,40 @@ static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* a
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/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 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6315 "MediaPage.c"
+#line 6047 "MediaPage.c"
 }
 
 
 void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
-#line 6324 "MediaPage.c"
+#line 6056 "MediaPage.c"
 }
 
 
@@ -6332,40 +6064,40 @@ static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction*
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 863 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/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 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 868 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6360 "MediaPage.c"
+#line 6092 "MediaPage.c"
 }
 
 
 void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
-#line 6369 "MediaPage.c"
+#line 6101 "MediaPage.c"
 }
 
 
@@ -6377,40 +6109,40 @@ static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction*
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 874 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, display);
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/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 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6405 "MediaPage.c"
+#line 6137 "MediaPage.c"
 }
 
 
 void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
-#line 6414 "MediaPage.c"
+#line 6146 "MediaPage.c"
 }
 
 
@@ -6422,76 +6154,76 @@ static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* act
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, display);
-#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/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 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = action;
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = value;
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6450 "MediaPage.c"
+#line 6182 "MediaPage.c"
 }
 
 
 void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
-#line 6459 "MediaPage.c"
+#line 6191 "MediaPage.c"
 }
 
 
 static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 851 "/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 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6468 "MediaPage.c"
+#line 6200 "MediaPage.c"
 }
 
 
 void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 889 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 851 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 6477 "MediaPage.c"
+#line 6209 "MediaPage.c"
 }
 
 
 static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/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 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 6486 "MediaPage.c"
+#line 6218 "MediaPage.c"
 }
 
 
 void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 891 "/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 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 6495 "MediaPage.c"
+#line 6227 "MediaPage.c"
 }
 
 
@@ -6502,36 +6234,36 @@ static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* act
 	gint _tmp2_;
 	gboolean sort_order = FALSE;
 	gboolean _tmp3_;
-#line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = action;
-#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = value;
-#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp0_, _tmp1_);
-#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_get_menu_sort_by (self);
-#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp2_;
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_get_menu_sort_order (self);
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_order = _tmp3_;
-#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_order);
-#line 900 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 6526 "MediaPage.c"
+#line 6258 "MediaPage.c"
 }
 
 
 void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
-#line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
-#line 6535 "MediaPage.c"
+#line 6267 "MediaPage.c"
 }
 
 
@@ -6541,78 +6273,78 @@ static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction*
 	const gchar* _tmp1_;
 	const gchar* _tmp2_;
 	GQuark _tmp4_ = 0U;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label0 = 0;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 6549 "MediaPage.c"
+#line 6281 "MediaPage.c"
 	RawDeveloper _tmp5_;
 	GSimpleAction* _tmp6_;
 	GVariant* _tmp7_;
-#line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = value;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6571 "MediaPage.c"
+#line 6303 "MediaPage.c"
 			default:
 			{
-#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
-#line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6578 "MediaPage.c"
+#line 6310 "MediaPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6584 "MediaPage.c"
+#line 6316 "MediaPage.c"
 			default:
 			{
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
-#line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6591 "MediaPage.c"
+#line 6323 "MediaPage.c"
 			}
 		}
 	} else {
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6597 "MediaPage.c"
+#line 6329 "MediaPage.c"
 			default:
 			{
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6602 "MediaPage.c"
+#line 6334 "MediaPage.c"
 			}
 		}
 	}
-#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = developer;
-#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_developer_changed (self, _tmp5_);
-#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = action;
-#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = value;
-#line 920 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 6616 "MediaPage.c"
+#line 6348 "MediaPage.c"
 }
 
 
@@ -6626,29 +6358,29 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	GeeArrayList* _tmp4_;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_;
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6644 "MediaPage.c"
+#line 6376 "MediaPage.c"
 	}
-#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	to_set = _tmp4_;
-#line 6652 "MediaPage.c"
+#line 6384 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp5_;
@@ -6660,31 +6392,31 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		gint _tmp10_;
 		gint _tmp11_;
 		gint _view_index = 0;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = view_collection_get_selected (_tmp6_);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp8_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _view_list;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp11_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 6688 "MediaPage.c"
+#line 6420 "MediaPage.c"
 			gint _tmp12_;
 			gint _tmp13_;
 			gint _tmp14_;
@@ -6698,128 +6430,128 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			Photo* _tmp20_;
 			gboolean _tmp21_ = FALSE;
 			Photo* _tmp22_;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _view_index;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp12_ + 1;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = _view_index;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_size;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6714 "MediaPage.c"
+#line 6446 "MediaPage.c"
 			}
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_list;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_index;
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp17_;
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = view;
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = data_view_get_source (_tmp18_);
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp20_ == NULL) {
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp19_);
-#line 6734 "MediaPage.c"
+#line 6466 "MediaPage.c"
 			}
-#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			p = _tmp20_;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = p;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ != NULL) {
-#line 6742 "MediaPage.c"
+#line 6474 "MediaPage.c"
 				RawDeveloper _tmp23_;
 				Photo* _tmp24_;
 				RawDeveloper _tmp25_;
 				gboolean _tmp26_;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = rd;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = p;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo_get_raw_developer (_tmp24_);
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = !_tmp26_;
-#line 6757 "MediaPage.c"
+#line 6489 "MediaPage.c"
 			} else {
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = FALSE;
-#line 6761 "MediaPage.c"
+#line 6493 "MediaPage.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp21_) {
-#line 6765 "MediaPage.c"
+#line 6497 "MediaPage.c"
 				GeeArrayList* _tmp27_;
 				DataView* _tmp28_;
 				Photo* _tmp29_;
 				gboolean _tmp30_;
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = to_set;
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp28_ = view;
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 899 "/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"
+#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp29_ = p;
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp30_ = photo_has_transformations (_tmp29_);
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp30_) {
-#line 940 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 6784 "MediaPage.c"
+#line 6516 "MediaPage.c"
 				}
 			}
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6791 "MediaPage.c"
+#line 6523 "MediaPage.c"
 		}
-#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6795 "MediaPage.c"
+#line 6527 "MediaPage.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = need_warn;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (!_tmp32_) {
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = TRUE;
-#line 6803 "MediaPage.c"
+#line 6535 "MediaPage.c"
 	} else {
 		GeeArrayList* _tmp33_;
 		gint _tmp34_;
 		gint _tmp35_;
 		gboolean _tmp36_;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = to_set;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp35_ = _tmp34_;
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = _tmp36_;
-#line 6819 "MediaPage.c"
+#line 6551 "MediaPage.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 6823 "MediaPage.c"
+#line 6555 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		GeeArrayList* _tmp37_;
 		RawDeveloper _tmp38_;
@@ -6827,42 +6559,42 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		CommandManager* _tmp40_;
 		CommandManager* _tmp41_;
 		SetRawDeveloperCommand* _tmp42_;
-#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp37_ = to_set;
-#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp38_ = rd;
-#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 908 "/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 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command = _tmp39_;
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp40_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp41_ = _tmp40_;
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp42_ = command;
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_COMMAND, Command));
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp41_);
-#line 949 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_update_development_menu_item_sensitivity (self);
-#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 6853 "MediaPage.c"
+#line 6585 "MediaPage.c"
 	}
-#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 6857 "MediaPage.c"
+#line 6589 "MediaPage.c"
 }
 
 
 void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
-#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 6866 "MediaPage.c"
+#line 6598 "MediaPage.c"
 }
 
 
@@ -6870,17 +6602,17 @@ static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean
 	MediaPage * self;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 953 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 916 "/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"
+#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = display;
-#line 956 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 6884 "MediaPage.c"
+#line 6616 "MediaPage.c"
 }
 
 
@@ -6888,17 +6620,17 @@ static void media_page_real_set_display_comments (CheckerboardPage* base, gboole
 	MediaPage * self;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 959 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/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"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = display;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
-#line 6902 "MediaPage.c"
+#line 6634 "MediaPage.c"
 }
 
 
@@ -6906,19 +6638,19 @@ static GAction* media_page_sort_by_title_action (MediaPage* self) {
 	GAction* result = NULL;
 	GAction* action = NULL;
 	GAction* _tmp0_;
-#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
-#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	action = _tmp0_;
-#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 929 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6922 "MediaPage.c"
+#line 6654 "MediaPage.c"
 }
 
 
@@ -6926,19 +6658,19 @@ static GAction* media_page_sort_ascending_action (MediaPage* self) {
 	GAction* result = NULL;
 	GAction* action = NULL;
 	GAction* _tmp0_;
-#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	action = _tmp0_;
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6942 "MediaPage.c"
+#line 6674 "MediaPage.c"
 }
 
 
@@ -6951,38 +6683,38 @@ gint media_page_get_menu_sort_by (MediaPage* self) {
 	const gchar* _tmp4_;
 	gint _tmp5_;
 	gint _tmp6_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 939 "/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"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_by_title_action (self);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = g_action_get_state (_tmp1_);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = atoi (_tmp4_);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp6_;
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6979 "MediaPage.c"
+#line 6711 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new30 (const gchar* value) {
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6986 "MediaPage.c"
+#line 6718 "MediaPage.c"
 }
 
 
@@ -6993,29 +6725,29 @@ void media_page_set_menu_sort_by (MediaPage* self, gint val) {
 	GAction* _tmp2_;
 	GAction* _tmp3_;
 	GVariant* _tmp4_;
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = val;
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = g_strdup_printf ("%d", _tmp0_);
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort = _tmp1_;
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_by_title_action (self);
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _variant_new30 (sort);
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp3_, _tmp4_);
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp4_);
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (sort);
-#line 7019 "MediaPage.c"
+#line 6751 "MediaPage.c"
 }
 
 
@@ -7027,36 +6759,36 @@ gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	GVariant* _tmp3_;
 	const gchar* _tmp4_;
 	gboolean _tmp5_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 949 "/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"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_ascending_action (self);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = g_action_get_state (_tmp1_);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "ascending") == 0;
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp5_;
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7053 "MediaPage.c"
+#line 6785 "MediaPage.c"
 }
 
 
 static GVariant* _variant_new31 (const gchar* value) {
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 7060 "MediaPage.c"
+#line 6792 "MediaPage.c"
 }
 
 
@@ -7066,141 +6798,141 @@ void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
 	GAction* _tmp2_;
 	GAction* _tmp3_;
 	GVariant* _tmp4_;
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = ascending;
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_) {
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "ascending";
-#line 7078 "MediaPage.c"
+#line 6810 "MediaPage.c"
 	} else {
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = "descending";
-#line 7082 "MediaPage.c"
+#line 6814 "MediaPage.c"
 	}
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_ascending_action (self);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _variant_new31 (_tmp0_);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_action_change_state (_tmp3_, _tmp4_);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_variant_unref0 (_tmp4_);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 7096 "MediaPage.c"
+#line 6828 "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 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7105 "MediaPage.c"
+#line 6837 "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 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7114 "MediaPage.c"
+#line 6846 "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 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7123 "MediaPage.c"
+#line 6855 "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 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7132 "MediaPage.c"
+#line 6864 "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 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7141 "MediaPage.c"
+#line 6873 "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 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7150 "MediaPage.c"
+#line 6882 "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 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7159 "MediaPage.c"
+#line 6891 "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 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7168 "MediaPage.c"
+#line 6900 "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 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7177 "MediaPage.c"
+#line 6909 "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 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7186 "MediaPage.c"
+#line 6918 "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 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7195 "MediaPage.c"
+#line 6927 "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 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7204 "MediaPage.c"
+#line 6936 "MediaPage.c"
 }
 
 
@@ -7218,329 +6950,329 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	void* _tmp10__target;
 	ComparatorPredicate _tmp11_;
 	void* _tmp11__target;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = sort_by;
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	switch (_tmp0_) {
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 7230 "MediaPage.c"
+#line 6962 "MediaPage.c"
 		{
 			gboolean _tmp1_;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp1_ = ascending;
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp1_) {
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_ascending_comparator_comparator;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7251 "MediaPage.c"
+#line 6983 "MediaPage.c"
 			} else {
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7267 "MediaPage.c"
+#line 6999 "MediaPage.c"
 			}
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7285 "MediaPage.c"
+#line 7017 "MediaPage.c"
 		}
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 7289 "MediaPage.c"
+#line 7021 "MediaPage.c"
 		{
 			gboolean _tmp2_;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp2_ = ascending;
-#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp2_) {
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_ascending_comparator_comparator;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7310 "MediaPage.c"
+#line 7042 "MediaPage.c"
 			} else {
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_desending_comparator_comparator;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7326 "MediaPage.c"
+#line 7058 "MediaPage.c"
 			}
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_exposure_time_comparator_predicate_comparator_predicate;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7344 "MediaPage.c"
+#line 7076 "MediaPage.c"
 		}
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 7348 "MediaPage.c"
+#line 7080 "MediaPage.c"
 		{
 			gboolean _tmp3_;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp3_ = ascending;
-#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp3_) {
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_ascending_comparator_comparator;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7369 "MediaPage.c"
+#line 7101 "MediaPage.c"
 			} else {
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_descending_comparator_comparator;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7385 "MediaPage.c"
+#line 7117 "MediaPage.c"
 			}
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_rating_comparator_predicate_comparator_predicate;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1020 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7403 "MediaPage.c"
+#line 7135 "MediaPage.c"
 		}
-#line 1000 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 7407 "MediaPage.c"
+#line 7139 "MediaPage.c"
 		{
 			gboolean _tmp4_;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp4_ = ascending;
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp4_) {
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_ascending_comparator_comparator;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7428 "MediaPage.c"
+#line 7160 "MediaPage.c"
 			} else {
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_descending_comparator_comparator;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 7444 "MediaPage.c"
+#line 7176 "MediaPage.c"
 			}
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_filename_comparator_predicate_comparator_predicate;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7462 "MediaPage.c"
+#line 7194 "MediaPage.c"
 		}
 		default:
 		{
 			gint _tmp5_;
 			gchar* _tmp6_;
 			gchar* _tmp7_;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp5_ = media_page_get_menu_sort_by (self);
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _tmp6_;
-#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"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+			g_debug ("MediaPage.vala:992: Unknown sort criteria: %s", _tmp7_);
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_free0 (_tmp7_);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 7509 "MediaPage.c"
+#line 7241 "MediaPage.c"
 		}
 	}
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = comparator;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10__target = comparator_target;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = predicate;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11__target = predicate_target;
-#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/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 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate = NULL;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target = NULL;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target_destroy_notify = NULL;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator = NULL;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target = NULL;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 7544 "MediaPage.c"
+#line 7276 "MediaPage.c"
 }
 
 
@@ -7549,106 +7281,106 @@ void media_page_sync_sort (MediaPage* self) {
 	gint sort_by = 0;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-#line 1039 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
-#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_ascending = _tmp0_;
-#line 1056 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp1_;
-#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1020 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_by (self, sort_by);
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1021 "/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"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 7567 "MediaPage.c"
+#line 7299 "MediaPage.c"
 }
 
 
 static void media_page_real_destroy (GtkWidget* base) {
 	MediaPage * self;
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1065 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/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 7579 "MediaPage.c"
+#line 7311 "MediaPage.c"
 }
 
 
 void media_page_increase_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7591 "MediaPage.c"
+#line 7323 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 7597 "MediaPage.c"
+#line 7329 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_);
-#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1036 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7615 "MediaPage.c"
+#line 7347 "MediaPage.c"
 	}
 }
 
 
 void media_page_decrease_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_;
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7628 "MediaPage.c"
+#line 7360 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_;
-#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1082 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 7634 "MediaPage.c"
+#line 7366 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_);
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 7652 "MediaPage.c"
+#line 7384 "MediaPage.c"
 	}
 }
 
@@ -7658,28 +7390,28 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource*
 	DataSource* _tmp0_;
 	gint _tmp1_;
 	Thumbnail* _tmp2_;
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = source;
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7674 "MediaPage.c"
+#line 7406 "MediaPage.c"
 }
 
 
 DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 7683 "MediaPage.c"
+#line 7415 "MediaPage.c"
 }
 
 
@@ -7710,104 +7442,104 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	gint _tmp24_;
 	gint _tmp25_;
 	gint _tmp26_;
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = new_scale;
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 7724 "MediaPage.c"
+#line 7456 "MediaPage.c"
 	} else {
 		gboolean _tmp3_;
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 7731 "MediaPage.c"
+#line 7463 "MediaPage.c"
 	}
-#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
-#line 1098 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7737 "MediaPage.c"
+#line 7469 "MediaPage.c"
 	}
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = new_scale;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = thumbnail_get_MIN_SCALE ();
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MAX_SCALE ();
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_);
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_scale = _tmp9_;
-#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = new_scale;
-#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_layout_set_scale (_tmp11_, _tmp12_);
-#line 1101 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_scale;
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp18_, G_TYPE_INT);
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_int (&_tmp18_, _tmp17_);
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/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 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL;
-#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1106 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = new_scale;
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = thumbnail_get_MAX_SCALE ();
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_);
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = new_scale;
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = thumbnail_get_MIN_SCALE ();
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp26_ = _tmp25_;
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 7811 "MediaPage.c"
+#line 7543 "MediaPage.c"
 }
 
 
@@ -7821,59 +7553,59 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	CheckerboardLayout* _tmp10_;
 	gint _tmp11_;
 	gint _tmp12_;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = checkerboard_layout_get_scale (_tmp1_);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ <= 0;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 7839 "MediaPage.c"
+#line 7571 "MediaPage.c"
 		CheckerboardLayout* _tmp4_;
 		CheckerboardLayout* _tmp5_;
 		ConfigFacade* _tmp6_;
 		ConfigFacade* _tmp7_;
 		gint _tmp8_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = 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 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/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 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_layout_set_scale (_tmp5_, _tmp8_);
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1114 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 7861 "MediaPage.c"
+#line 7593 "MediaPage.c"
 	}
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = checkerboard_layout_get_scale (_tmp10_);
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp12_;
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 7877 "MediaPage.c"
+#line 7609 "MediaPage.c"
 }
 
 
@@ -7882,14 +7614,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 7886 "MediaPage.c"
+#line 7618 "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 7893 "MediaPage.c"
+#line 7625 "MediaPage.c"
 }
 
 
@@ -7898,7 +7630,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 7902 "MediaPage.c"
+#line 7634 "MediaPage.c"
 }
 
 
@@ -8077,14 +7809,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 8081 "MediaPage.c"
+#line 7813 "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 8088 "MediaPage.c"
+#line 7820 "MediaPage.c"
 }
 
 
@@ -8125,7 +7857,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 8129 "MediaPage.c"
+#line 7861 "MediaPage.c"
 }
 
 
@@ -8163,7 +7895,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 8167 "MediaPage.c"
+#line 7899 "MediaPage.c"
 }
 
 
@@ -8179,7 +7911,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 8183 "MediaPage.c"
+#line 7915 "MediaPage.c"
 }
 
 
@@ -8195,7 +7927,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 8199 "MediaPage.c"
+#line 7931 "MediaPage.c"
 }
 
 
@@ -8204,7 +7936,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 (self, media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL], 0);
-#line 8208 "MediaPage.c"
+#line 7940 "MediaPage.c"
 }
 
 
@@ -8225,7 +7957,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 8229 "MediaPage.c"
+#line 7961 "MediaPage.c"
 }
 
 
@@ -8246,7 +7978,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 8250 "MediaPage.c"
+#line 7982 "MediaPage.c"
 }
 
 
@@ -8275,7 +8007,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8279 "MediaPage.c"
+#line 8011 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8285,7 +8017,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 8289 "MediaPage.c"
+#line 8021 "MediaPage.c"
 }
 
 
@@ -8314,7 +8046,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8318 "MediaPage.c"
+#line 8050 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -8324,7 +8056,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 8328 "MediaPage.c"
+#line 8060 "MediaPage.c"
 }
 
 
@@ -8345,7 +8077,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 8349 "MediaPage.c"
+#line 8081 "MediaPage.c"
 }
 
 
@@ -8365,7 +8097,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 8369 "MediaPage.c"
+#line 8101 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->slider;
@@ -8375,7 +8107,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 8379 "MediaPage.c"
+#line 8111 "MediaPage.c"
 }
 
 
@@ -8388,14 +8120,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"
 	media_page_zoom_slider_assembly_signals[MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_ZOOM_CHANGED_SIGNAL] = 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 8392 "MediaPage.c"
+#line 8124 "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 8399 "MediaPage.c"
+#line 8131 "MediaPage.c"
 }
 
 
@@ -8409,7 +8141,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 8413 "MediaPage.c"
+#line 8145 "MediaPage.c"
 }
 
 
@@ -8510,7 +8242,7 @@ static void media_page_class_init (MediaPageClass * klass) {
 	((MediaPageClass *) klass)->create_thumbnail = (DataView* (*) (MediaPage *, DataSource*)) media_page_real_create_thumbnail;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_finalize;
-#line 8514 "MediaPage.c"
+#line 8246 "MediaPage.c"
 }
 
 
@@ -8521,7 +8253,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 8525 "MediaPage.c"
+#line 8257 "MediaPage.c"
 }
 
 
@@ -8537,7 +8269,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 8541 "MediaPage.c"
+#line 8273 "MediaPage.c"
 }
 
 
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index a2d5185..eeb79e6 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -291,7 +291,6 @@ public abstract class MediaPage : CheckerboardPage {
         { "MoveToTrash", on_move_to_trash },
         { "NewEvent", on_new_event },
         { "AddTags", on_add_tags },
-        { "AddTagsContextMenu", on_add_tags },
         { "ModifyTags", on_modify_tags },
         { "IncreaseSize", on_increase_size },
         { "DecreaseSize", on_decrease_size },
@@ -362,7 +361,7 @@ public abstract class MediaPage : CheckerboardPage {
         if (DesktopIntegration.is_send_to_installed())
             set_action_sensitive("SendTo", selected_count > 0);
         else
-            set_action_visible("SendTo", false);
+            set_action_sensitive("SendTo", false);
         
         set_action_sensitive("Rate", selected_count > 0);
         update_rating_sensitivities();
@@ -556,46 +555,6 @@ public abstract class MediaPage : CheckerboardPage {
                 activate_action("RateRejected");
             break;
             
-            case "exclam":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.ONE_OR_HIGHER);
-            break;
-            
-            case "at":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.TWO_OR_HIGHER);
-            break;
-
-            case "numbersign":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.THREE_OR_HIGHER);
-            break;
-
-            case "dollar":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.FOUR_OR_HIGHER);
-            break;
-
-            case "percent":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.FIVE_OR_HIGHER);
-            break;
-
-            case "parenright":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.UNRATED_OR_HIGHER);
-            break;
-
-            case "parenleft":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.REJECTED_OR_HIGHER);
-            break;
-            
-            case "asterisk":
-                if (get_ctrl_pressed())
-                    get_search_view_filter().set_rating_filter(RatingFilter.REJECTED_ONLY);
-            break;
-            
             case "slash":
                 activate_action("Flag");
             break;
@@ -816,14 +775,17 @@ public abstract class MediaPage : CheckerboardPage {
             restore_point = get_view().get_next(cursor) as CheckerboardItem;
         }
 
-        if (get_view().get_selected_count() > 0) {
-            get_command_manager().execute(new TrashUntrashPhotosCommand(
-                (Gee.Collection<MediaSource>) get_view().get_selected_sources(), true));
-        }
+        var sources = get_view().get_selected_sources();
 
         if ((restore_point != null) && (get_view().contains(restore_point))) {
             set_cursor(restore_point);
         }
+
+        if (get_view().get_selected_count() > 0) {
+            get_command_manager().execute(new TrashUntrashPhotosCommand(
+                (Gee.Collection<MediaSource>) sources, true));
+        }
+
     }
 
     protected virtual void on_edit_title() {
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 555f600..9dd784c 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -2963,7 +2963,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 2966 "MetadataWriter.c"
-						goto __catch554_g_error;
+						goto __catch563_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
@@ -2983,8 +2983,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			transaction_controller_commit (_tmp23_);
 #line 2985 "MetadataWriter.c"
 		}
-		goto __finally554;
-		__catch554_g_error:
+		goto __finally563;
+		__catch563_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp24_;
@@ -3018,7 +3018,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_g_error_free0 (err);
 #line 3020 "MetadataWriter.c"
 		}
-		__finally554:
+		__finally563:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3801,7 +3801,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 3804 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch564_database_error;
 					}
 					{
 						LibraryPhoto* _tmp67_;
@@ -3858,7 +3858,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 3861 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch564_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_;
@@ -3890,8 +3890,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally555;
-		__catch555_database_error:
+		goto __finally564;
+		__catch564_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp79_;
@@ -3907,7 +3907,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_error_free0 (err);
 #line 3909 "MetadataWriter.c"
 		}
-		__finally555:
+		__finally564:
 		{
 			LibraryPhoto* _tmp80_;
 			MetadataWriterCommitJob* _tmp81_;
@@ -3954,7 +3954,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 3957 "MetadataWriter.c"
-				goto __catch556_database_error;
+				goto __catch565_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3967,8 +3967,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 3968 "MetadataWriter.c"
 		}
 	}
-	goto __finally556;
-	__catch556_database_error:
+	goto __finally565;
+	__catch565_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp85_;
@@ -3984,7 +3984,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_error_free0 (err);
 #line 3986 "MetadataWriter.c"
 	}
-	__finally556:
+	__finally565:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4162,18 +4162,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 4165 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch566_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 4172 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch566_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally566;
+	__catch566_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_;
@@ -4194,7 +4194,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4196 "MetadataWriter.c"
 	}
-	__finally557:
+	__finally566:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4296,10 +4296,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 4299 "MetadataWriter.c"
-				goto __finally558;
+				goto __finally567;
 			}
 		}
-		__finally558:
+		__finally567:
 		{
 			LibraryPhoto* _tmp16_;
 			GFile* _tmp17_;
@@ -4438,10 +4438,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 4441 "MetadataWriter.c"
-				goto __finally559;
+				goto __finally568;
 			}
 		}
-		__finally559:
+		__finally568:
 		{
 			LibraryPhoto* _tmp18_;
 			GFile* _tmp19_;
diff --git a/src/Page.c b/src/Page.c
index c6a223c..ab4f478 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -333,6 +333,26 @@ typedef struct _TransitionClockClass TransitionClockClass;
 
 #define TYPE_ZOOM_STATE (zoom_state_get_type ())
 typedef struct _ZoomState ZoomState;
+
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
 #define _transition_clock_unref0(var) ((var == NULL) ? NULL : (var = (transition_clock_unref (var), NULL)))
 #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
@@ -995,9 +1015,6 @@ GAction* page_get_action (Page* self, const gchar* name);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
-void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label);
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
 void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
 void page_activate_action (Page* self, const gchar* name);
@@ -1324,6 +1341,11 @@ void zoom_state_free (ZoomState* self);
 enum  {
 	SINGLE_PHOTO_PAGE_DUMMY_PROPERTY
 };
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+static void single_photo_page_on_colors_changed (SinglePhotoPage* self);
+static void _single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self);
 void dimensions_init (Dimensions *self, gint width, gint height);
 #define SINGLE_PHOTO_PAGE_FAST_INTERP GDK_INTERP_NEAREST
 #define SINGLE_PHOTO_PAGE_QUALITY_INTERP GDK_INTERP_BILINEAR
@@ -1355,6 +1377,7 @@ ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self);
 GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state);
 GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state);
 void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
 void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state);
 void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
 void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state);
@@ -1423,6 +1446,7 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self);
 void single_photo_page_on_next_photo (SinglePhotoPage* self);
 static void single_photo_page_real_on_next_photo (SinglePhotoPage* self);
 static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+void invalidate_transparent_background (void);
 static void single_photo_page_finalize (GObject * obj);
 gpointer drag_and_drop_handler_ref (gpointer instance);
 void drag_and_drop_handler_unref (gpointer instance);
@@ -1506,14 +1530,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 1510 "Page.c"
+#line 1534 "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 1517 "Page.c"
+#line 1541 "Page.c"
 }
 
 
@@ -1531,14 +1555,14 @@ gchar* injection_group_get_path (InjectionGroup* self) {
 	result = _tmp1_;
 #line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1535 "Page.c"
+#line 1559 "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 1542 "Page.c"
+#line 1566 "Page.c"
 }
 
 
@@ -1556,7 +1580,7 @@ GeeList* injection_group_get_elements (InjectionGroup* self) {
 	result = _tmp1_;
 #line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1560 "Page.c"
+#line 1584 "Page.c"
 }
 
 
@@ -1587,7 +1611,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 1591 "Page.c"
+#line 1615 "Page.c"
 }
 
 
@@ -1615,7 +1639,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 1619 "Page.c"
+#line 1643 "Page.c"
 }
 
 
@@ -1648,7 +1672,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 1652 "Page.c"
+#line 1676 "Page.c"
 }
 
 
@@ -1690,20 +1714,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 1694 "Page.c"
+#line 1718 "Page.c"
 		const gchar* _tmp4_;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp4_;
-#line 1700 "Page.c"
+#line 1724 "Page.c"
 	} else {
 		const gchar* _tmp5_;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp5_;
-#line 1707 "Page.c"
+#line 1731 "Page.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = g_strdup (_tmp2_);
@@ -1725,21 +1749,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 1729 "Page.c"
+#line 1753 "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 1736 "Page.c"
+#line 1760 "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 1743 "Page.c"
+#line 1767 "Page.c"
 }
 
 
@@ -1748,7 +1772,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 1752 "Page.c"
+#line 1776 "Page.c"
 	}
 }
 
@@ -1758,11 +1782,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 1762 "Page.c"
+#line 1786 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1766 "Page.c"
+#line 1790 "Page.c"
 	}
 }
 
@@ -1770,37 +1794,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 1774 "Page.c"
+#line 1798 "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 1781 "Page.c"
+#line 1805 "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 1788 "Page.c"
+#line 1812 "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 1792 "Page.c"
+#line 1816 "Page.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_element_ref (object);
-#line 1796 "Page.c"
+#line 1820 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1800 "Page.c"
+#line 1824 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1804 "Page.c"
+#line 1828 "Page.c"
 }
 
 
@@ -1811,25 +1835,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 1815 "Page.c"
+#line 1839 "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 1821 "Page.c"
+#line 1845 "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 1825 "Page.c"
+#line 1849 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_element_ref (value->data[0].v_pointer);
-#line 1829 "Page.c"
+#line 1853 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1833 "Page.c"
+#line 1857 "Page.c"
 }
 
 
@@ -1843,7 +1867,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 1847 "Page.c"
+#line 1871 "Page.c"
 }
 
 
@@ -1852,7 +1876,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 1856 "Page.c"
+#line 1880 "Page.c"
 }
 
 
@@ -1872,17 +1896,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 1876 "Page.c"
+#line 1900 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1880 "Page.c"
+#line 1904 "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 1886 "Page.c"
+#line 1910 "Page.c"
 	}
 }
 
@@ -1901,17 +1925,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 1905 "Page.c"
+#line 1929 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1909 "Page.c"
+#line 1933 "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 1915 "Page.c"
+#line 1939 "Page.c"
 	}
 }
 
@@ -1921,14 +1945,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 1925 "Page.c"
+#line 1949 "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 1932 "Page.c"
+#line 1956 "Page.c"
 }
 
 
@@ -1944,7 +1968,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 1948 "Page.c"
+#line 1972 "Page.c"
 }
 
 
@@ -1969,7 +1993,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 1973 "Page.c"
+#line 1997 "Page.c"
 }
 
 
@@ -1982,7 +2006,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 1986 "Page.c"
+#line 2010 "Page.c"
 	}
 }
 
@@ -1990,7 +2014,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 1994 "Page.c"
+#line 2018 "Page.c"
 }
 
 
@@ -1999,7 +2023,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 2003 "Page.c"
+#line 2027 "Page.c"
 	}
 }
 
@@ -2009,11 +2033,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 2013 "Page.c"
+#line 2037 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2017 "Page.c"
+#line 2041 "Page.c"
 	}
 }
 
@@ -2021,37 +2045,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 2025 "Page.c"
+#line 2049 "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 2032 "Page.c"
+#line 2056 "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 2039 "Page.c"
+#line 2063 "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 2043 "Page.c"
+#line 2067 "Page.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_ref (object);
-#line 2047 "Page.c"
+#line 2071 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2051 "Page.c"
+#line 2075 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2055 "Page.c"
+#line 2079 "Page.c"
 }
 
 
@@ -2062,25 +2086,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 2066 "Page.c"
+#line 2090 "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 2072 "Page.c"
+#line 2096 "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 2076 "Page.c"
+#line 2100 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_ref (value->data[0].v_pointer);
-#line 2080 "Page.c"
+#line 2104 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2084 "Page.c"
+#line 2108 "Page.c"
 }
 
 
@@ -2094,7 +2118,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 2098 "Page.c"
+#line 2122 "Page.c"
 }
 
 
@@ -2103,7 +2127,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 2107 "Page.c"
+#line 2131 "Page.c"
 }
 
 
@@ -2123,17 +2147,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 2127 "Page.c"
+#line 2151 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2131 "Page.c"
+#line 2155 "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 2137 "Page.c"
+#line 2161 "Page.c"
 	}
 }
 
@@ -2152,17 +2176,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 2156 "Page.c"
+#line 2180 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2160 "Page.c"
+#line 2184 "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 2166 "Page.c"
+#line 2190 "Page.c"
 	}
 }
 
@@ -2174,7 +2198,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 2178 "Page.c"
+#line 2202 "Page.c"
 }
 
 
@@ -2190,7 +2214,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 2194 "Page.c"
+#line 2218 "Page.c"
 }
 
 
@@ -2204,7 +2228,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 2208 "Page.c"
+#line 2232 "Page.c"
 }
 
 
@@ -2229,7 +2253,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 2233 "Page.c"
+#line 2257 "Page.c"
 }
 
 
@@ -2242,7 +2266,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 2246 "Page.c"
+#line 2270 "Page.c"
 	}
 }
 
@@ -2252,14 +2276,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 2256 "Page.c"
+#line 2280 "Page.c"
 }
 
 
 static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
 #line 100 "/home/jens/Source/shotwell/src/Page.vala"
 	page_attach_view_signals ((Page*) self);
-#line 2263 "Page.c"
+#line 2287 "Page.c"
 }
 
 
@@ -2312,7 +2336,7 @@ Page* page_construct (GType object_type, const gchar* page_name) {
 	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;
-#line 2316 "Page.c"
+#line 2340 "Page.c"
 }
 
 
@@ -2332,7 +2356,7 @@ static void page_real_destroy (GtkWidget* base) {
 	if (_tmp0_) {
 #line 113 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2336 "Page.c"
+#line 2360 "Page.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_event_source (self);
@@ -2348,25 +2372,25 @@ static void page_real_destroy (GtkWidget* base) {
 	_tmp2_ = self->toolbar;
 #line 123 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 2352 "Page.c"
+#line 2376 "Page.c"
 		GtkToolbar* _tmp3_;
 #line 124 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->toolbar;
 #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 2382 "Page.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->update_actions_scheduler;
 #line 127 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 2364 "Page.c"
+#line 2388 "Page.c"
 		OneShotScheduler* _tmp5_;
 #line 128 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->update_actions_scheduler;
 #line 128 "/home/jens/Source/shotwell/src/Page.vala"
 		one_shot_scheduler_cancel (_tmp5_);
-#line 2370 "Page.c"
+#line 2394 "Page.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = TRUE;
@@ -2380,7 +2404,7 @@ static void page_real_destroy (GtkWidget* base) {
 	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"
+#line 2408 "Page.c"
 }
 
 
@@ -2398,7 +2422,7 @@ gchar* page_get_page_name (Page* self) {
 	result = _tmp1_;
 #line 138 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2402 "Page.c"
+#line 2426 "Page.c"
 }
 
 
@@ -2415,7 +2439,7 @@ static void page_real_set_page_name (Page* self, const gchar* page_name) {
 	_g_free0 (self->priv->page_name);
 #line 142 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
-#line 2419 "Page.c"
+#line 2443 "Page.c"
 }
 
 
@@ -2424,7 +2448,7 @@ void page_set_page_name (Page* self, const gchar* page_name) {
 	g_return_if_fail (IS_PAGE (self));
 #line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_name (self, page_name);
-#line 2428 "Page.c"
+#line 2452 "Page.c"
 }
 
 
@@ -2442,14 +2466,14 @@ gchar* page_to_string (Page* self) {
 	result = _tmp1_;
 #line 146 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2446 "Page.c"
+#line 2470 "Page.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 2453 "Page.c"
+#line 2477 "Page.c"
 }
 
 
@@ -2467,7 +2491,7 @@ ViewCollection* page_get_view (Page* self) {
 	result = _tmp1_;
 #line 150 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2471 "Page.c"
+#line 2495 "Page.c"
 }
 
 
@@ -2485,7 +2509,7 @@ GtkWindow* page_get_container (Page* self) {
 	result = _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2489 "Page.c"
+#line 2513 "Page.c"
 }
 
 
@@ -2507,7 +2531,7 @@ static void page_real_set_container (Page* self, GtkWindow* container) {
 	_g_object_unref0 (self->priv->container);
 #line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = _tmp2_;
-#line 2511 "Page.c"
+#line 2535 "Page.c"
 }
 
 
@@ -2516,7 +2540,7 @@ void page_set_container (Page* self, GtkWindow* container) {
 	g_return_if_fail (IS_PAGE (self));
 #line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_container (self, container);
-#line 2520 "Page.c"
+#line 2544 "Page.c"
 }
 
 
@@ -2525,7 +2549,7 @@ static void page_real_clear_container (Page* self) {
 	_g_object_unref0 (self->priv->container);
 #line 164 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
-#line 2529 "Page.c"
+#line 2553 "Page.c"
 }
 
 
@@ -2534,7 +2558,7 @@ void page_clear_container (Page* self) {
 	g_return_if_fail (IS_PAGE (self));
 #line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->clear_container (self);
-#line 2538 "Page.c"
+#line 2562 "Page.c"
 }
 
 
@@ -2543,7 +2567,7 @@ static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (
 	result = page_on_button_pressed_internal ((Page*) self, event);
 #line 178 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2547 "Page.c"
+#line 2571 "Page.c"
 }
 
 
@@ -2552,7 +2576,7 @@ static gboolean _page_on_button_released_internal_gtk_widget_button_release_even
 	result = page_on_button_released_internal ((Page*) self, event);
 #line 179 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2556 "Page.c"
+#line 2580 "Page.c"
 }
 
 
@@ -2561,7 +2585,7 @@ static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidg
 	result = page_on_motion_internal ((Page*) self, event);
 #line 180 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2565 "Page.c"
+#line 2589 "Page.c"
 }
 
 
@@ -2570,7 +2594,7 @@ static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWi
 	result = page_on_leave_notify_event ((Page*) self);
 #line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2574 "Page.c"
+#line 2598 "Page.c"
 }
 
 
@@ -2579,14 +2603,14 @@ static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget*
 	result = page_on_mousewheel_internal ((Page*) self, event);
 #line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2583 "Page.c"
+#line 2607 "Page.c"
 }
 
 
 static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
 #line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_event_source_realize ((Page*) self);
-#line 2590 "Page.c"
+#line 2614 "Page.c"
 }
 
 
@@ -2650,7 +2674,7 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 	_tmp10_ = event_source;
 #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"
+#line 2678 "Page.c"
 }
 
 
@@ -2674,7 +2698,7 @@ static void page_detach_event_source (Page* self) {
 	if (_tmp0_ == NULL) {
 #line 188 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2678 "Page.c"
+#line 2702 "Page.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
@@ -2712,7 +2736,7 @@ static void page_detach_event_source (Page* self) {
 	_g_object_unref0 (self->priv->event_source);
 #line 198 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2716 "Page.c"
+#line 2740 "Page.c"
 }
 
 
@@ -2730,14 +2754,14 @@ GtkWidget* page_get_event_source (Page* self) {
 	result = _tmp1_;
 #line 202 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2734 "Page.c"
+#line 2758 "Page.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 2741 "Page.c"
+#line 2765 "Page.c"
 }
 
 
@@ -2763,7 +2787,7 @@ GMenuModel* page_get_menubar (Page* self) {
 	_tmp3_ = model;
 #line 208 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 2767 "Page.c"
+#line 2791 "Page.c"
 		GMenu* _tmp4_;
 #line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = g_menu_new ();
@@ -2773,13 +2797,13 @@ GMenuModel* page_get_menubar (Page* self) {
 		_g_object_unref0 (model);
 #line 209 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 2777 "Page.c"
+#line 2801 "Page.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->menubar_injected;
 #line 212 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp5_) {
-#line 2783 "Page.c"
+#line 2807 "Page.c"
 		InjectionGroup** injection_groups = NULL;
 		gint _tmp6_;
 		InjectionGroup** _tmp7_;
@@ -2799,7 +2823,7 @@ GMenuModel* page_get_menubar (Page* self) {
 		_tmp8_ = injection_groups;
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8__length1 = injection_groups_length1;
-#line 2803 "Page.c"
+#line 2827 "Page.c"
 		{
 			InjectionGroup** group_collection = NULL;
 			gint group_collection_length1 = 0;
@@ -2811,14 +2835,14 @@ GMenuModel* page_get_menubar (Page* self) {
 			group_collection_length1 = _tmp8__length1;
 #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"
+#line 2839 "Page.c"
 				InjectionGroup* _tmp9_;
 				InjectionGroup* group = NULL;
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = _injection_group_ref0 (group_collection[group_it]);
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 				group = _tmp9_;
-#line 2822 "Page.c"
+#line 2846 "Page.c"
 				{
 					gint items = 0;
 					GMenu* _tmp10_;
@@ -2829,19 +2853,19 @@ GMenuModel* page_get_menubar (Page* self) {
 					_tmp11_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel));
 #line 216 "/home/jens/Source/shotwell/src/Page.vala"
 					items = _tmp11_;
-#line 2833 "Page.c"
+#line 2857 "Page.c"
 					{
 						gint i = 0;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 						i = 0;
-#line 2838 "Page.c"
+#line 2862 "Page.c"
 						{
 							gboolean _tmp12_ = FALSE;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp12_ = TRUE;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 2845 "Page.c"
+#line 2869 "Page.c"
 								gint _tmp14_;
 								gint _tmp15_;
 								GMenuModel* submenu = NULL;
@@ -2858,13 +2882,13 @@ GMenuModel* page_get_menubar (Page* self) {
 								GMenuModel* _tmp25_;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp12_) {
-#line 2862 "Page.c"
+#line 2886 "Page.c"
 									gint _tmp13_;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp13_ = i;
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									i = _tmp13_ + 1;
-#line 2868 "Page.c"
+#line 2892 "Page.c"
 								}
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp12_ = FALSE;
@@ -2876,7 +2900,7 @@ GMenuModel* page_get_menubar (Page* self) {
 								if (!(_tmp14_ < _tmp15_)) {
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 2880 "Page.c"
+#line 2904 "Page.c"
 								}
 #line 218 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp16_ = model;
@@ -2912,7 +2936,7 @@ GMenuModel* page_get_menubar (Page* self) {
 									_g_object_unref0 (submenu);
 #line 224 "/home/jens/Source/shotwell/src/Page.vala"
 									continue;
-#line 2916 "Page.c"
+#line 2940 "Page.c"
 								}
 								{
 									GeeList* _element_list = NULL;
@@ -2941,7 +2965,7 @@ GMenuModel* page_get_menubar (Page* self) {
 									_element_index = -1;
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									while (TRUE) {
-#line 2945 "Page.c"
+#line 2969 "Page.c"
 										gint _tmp31_;
 										gint _tmp32_;
 										gint _tmp33_;
@@ -2966,7 +2990,7 @@ GMenuModel* page_get_menubar (Page* self) {
 										if (!(_tmp32_ < _tmp33_)) {
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 											break;
-#line 2970 "Page.c"
+#line 2994 "Page.c"
 										}
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_tmp34_ = _element_list;
@@ -2990,7 +3014,7 @@ GMenuModel* page_get_menubar (Page* self) {
 										switch (_tmp40_) {
 #line 229 "/home/jens/Source/shotwell/src/Page.vala"
 											case INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM:
-#line 2994 "Page.c"
+#line 3018 "Page.c"
 											{
 												GMenuItem* item = NULL;
 												InjectionGroupElement* _tmp41_;
@@ -3031,7 +3055,7 @@ GMenuModel* page_get_menubar (Page* self) {
 												_tmp50_ = _tmp49_->accellerator;
 #line 233 "/home/jens/Source/shotwell/src/Page.vala"
 												if (_tmp50_ != NULL) {
-#line 3035 "Page.c"
+#line 3059 "Page.c"
 													GMenuItem* _tmp51_;
 													InjectionGroupElement* _tmp52_;
 													const gchar* _tmp53_;
@@ -3043,7 +3067,7 @@ GMenuModel* page_get_menubar (Page* self) {
 													_tmp53_ = _tmp52_->accellerator;
 #line 234 "/home/jens/Source/shotwell/src/Page.vala"
 													g_menu_item_set_attribute (_tmp51_, "accel", "s", _tmp53_, NULL);
-#line 3047 "Page.c"
+#line 3071 "Page.c"
 												}
 #line 239 "/home/jens/Source/shotwell/src/Page.vala"
 												_tmp54_ = menu;
@@ -3055,36 +3079,36 @@ GMenuModel* page_get_menubar (Page* self) {
 												_g_object_unref0 (item);
 #line 240 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
-#line 3059 "Page.c"
+#line 3083 "Page.c"
 											}
 											default:
 											{
 #line 242 "/home/jens/Source/shotwell/src/Page.vala"
 												break;
-#line 3065 "Page.c"
+#line 3089 "Page.c"
 											}
 										}
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_g_object_unref0 (menu);
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 										_injection_group_element_unref0 (element);
-#line 3072 "Page.c"
+#line 3096 "Page.c"
 									}
 #line 227 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (_element_list);
-#line 3076 "Page.c"
+#line 3100 "Page.c"
 								}
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (section);
 #line 217 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 3082 "Page.c"
+#line 3106 "Page.c"
 							}
 						}
 					}
 #line 215 "/home/jens/Source/shotwell/src/Page.vala"
 					_injection_group_unref0 (group);
-#line 3088 "Page.c"
+#line 3112 "Page.c"
 				}
 			}
 		}
@@ -3092,13 +3116,13 @@ GMenuModel* page_get_menubar (Page* self) {
 		self->priv->menubar_injected = TRUE;
 #line 212 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_groups = (_vala_array_free (injection_groups, injection_groups_length1, (GDestroyNotify) injection_group_unref), NULL);
-#line 3096 "Page.c"
+#line 3120 "Page.c"
 	}
 #line 251 "/home/jens/Source/shotwell/src/Page.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (model, g_menu_model_get_type (), GMenuModel);
 #line 251 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3102 "Page.c"
+#line 3126 "Page.c"
 }
 
 
@@ -3111,7 +3135,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 	_tmp0_ = self->toolbar;
 #line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 3115 "Page.c"
+#line 3139 "Page.c"
 		GtkToolbar* _tmp1_ = NULL;
 		const gchar* _tmp2_;
 		GtkToolbar* _tmp8_;
@@ -3122,7 +3146,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 		_tmp2_ = self->priv->toolbar_path;
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp2_ == NULL) {
-#line 3126 "Page.c"
+#line 3150 "Page.c"
 			GtkToolbar* _tmp3_;
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = (GtkToolbar*) gtk_toolbar_new ();
@@ -3132,7 +3156,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 			_g_object_unref0 (_tmp1_);
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp3_;
-#line 3136 "Page.c"
+#line 3160 "Page.c"
 		} else {
 			GtkBuilder* _tmp4_;
 			const gchar* _tmp5_;
@@ -3150,7 +3174,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 			_g_object_unref0 (_tmp1_);
 #line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp7_;
-#line 3154 "Page.c"
+#line 3178 "Page.c"
 		}
 #line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp1_);
@@ -3170,7 +3194,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 		gtk_toolbar_set_icon_size (_tmp11_, GTK_ICON_SIZE_SMALL_TOOLBAR);
 #line 255 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3174 "Page.c"
+#line 3198 "Page.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->toolbar;
@@ -3180,7 +3204,7 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 	result = _tmp13_;
 #line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3184 "Page.c"
+#line 3208 "Page.c"
 }
 
 
@@ -3189,7 +3213,7 @@ GtkToolbar* page_get_toolbar (Page* self) {
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 254 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_toolbar (self);
-#line 3193 "Page.c"
+#line 3217 "Page.c"
 }
 
 
@@ -3199,7 +3223,7 @@ static GtkMenu* page_real_get_page_context_menu (Page* self) {
 	result = NULL;
 #line 266 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3203 "Page.c"
+#line 3227 "Page.c"
 }
 
 
@@ -3208,7 +3232,7 @@ GtkMenu* page_get_page_context_menu (Page* self) {
 	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 265 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_page_context_menu (self);
-#line 3212 "Page.c"
+#line 3236 "Page.c"
 }
 
 
@@ -3228,7 +3252,7 @@ static void page_real_switching_from (Page* self) {
 	if (_tmp1_ == NULL) {
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3232 "Page.c"
+#line 3256 "Page.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
 	map = _tmp1_;
@@ -3236,13 +3260,13 @@ static void page_real_switching_from (Page* self) {
 	_tmp2_ = map;
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3240 "Page.c"
+#line 3264 "Page.c"
 		GActionMap* _tmp3_;
 #line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = map;
 #line 274 "/home/jens/Source/shotwell/src/Page.vala"
 		page_remove_actions (self, _tmp3_);
-#line 3246 "Page.c"
+#line 3270 "Page.c"
 	}
 #line 276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->toolbar_path;
@@ -3252,11 +3276,11 @@ static void page_real_switching_from (Page* self) {
 		_g_object_unref0 (self->toolbar);
 #line 277 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 3256 "Page.c"
+#line 3280 "Page.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (map);
-#line 3260 "Page.c"
+#line 3284 "Page.c"
 }
 
 
@@ -3265,7 +3289,7 @@ void page_switching_from (Page* self) {
 	g_return_if_fail (IS_PAGE (self));
 #line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_from (self);
-#line 3269 "Page.c"
+#line 3293 "Page.c"
 }
 
 
@@ -3296,7 +3320,7 @@ static void page_real_switched_to (Page* self) {
 	if (_tmp1_ == NULL) {
 #line 283 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3300 "Page.c"
+#line 3324 "Page.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/Page.vala"
 	map = _tmp1_;
@@ -3304,13 +3328,13 @@ static void page_real_switched_to (Page* self) {
 	_tmp2_ = map;
 #line 284 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3308 "Page.c"
+#line 3332 "Page.c"
 		GActionMap* _tmp3_;
 #line 285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = map;
 #line 285 "/home/jens/Source/shotwell/src/Page.vala"
 		page_add_actions (self, _tmp3_);
-#line 3314 "Page.c"
+#line 3338 "Page.c"
 	}
 #line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
@@ -3344,7 +3368,7 @@ static void page_real_switched_to (Page* self) {
 	page_update_modifiers (self);
 #line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (map);
-#line 3348 "Page.c"
+#line 3372 "Page.c"
 }
 
 
@@ -3353,7 +3377,7 @@ void page_switched_to (Page* self) {
 	g_return_if_fail (IS_PAGE (self));
 #line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 3357 "Page.c"
+#line 3381 "Page.c"
 }
 
 
@@ -3366,7 +3390,7 @@ void page_ready (Page* self) {
 	g_return_if_fail (IS_PAGE (self));
 #line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 3370 "Page.c"
+#line 3394 "Page.c"
 }
 
 
@@ -3381,7 +3405,7 @@ gboolean page_is_in_view (Page* self) {
 	result = _tmp0_;
 #line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3385 "Page.c"
+#line 3409 "Page.c"
 }
 
 
@@ -3393,7 +3417,7 @@ static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw
 	_tmp0_ = fsw;
 #line 302 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
-#line 3397 "Page.c"
+#line 3421 "Page.c"
 }
 
 
@@ -3402,7 +3426,7 @@ void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
 	g_return_if_fail (IS_PAGE (self));
 #line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 3406 "Page.c"
+#line 3430 "Page.c"
 }
 
 
@@ -3416,7 +3440,7 @@ static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* f
 	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
 #line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	page_switched_to (self);
-#line 3420 "Page.c"
+#line 3444 "Page.c"
 }
 
 
@@ -3425,7 +3449,7 @@ void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
 	g_return_if_fail (IS_PAGE (self));
 #line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 3429 "Page.c"
+#line 3453 "Page.c"
 }
 
 
@@ -3444,7 +3468,7 @@ GAction* page_get_action (Page* self, const gchar* name) {
 	_tmp0_ = self->priv->container;
 #line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) {
-#line 3448 "Page.c"
+#line 3472 "Page.c"
 		GtkWindow* _tmp1_;
 		GActionMap* _tmp2_;
 #line 313 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3455,7 +3479,7 @@ GAction* page_get_action (Page* self, const gchar* name) {
 		_g_object_unref0 (map);
 #line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp2_;
-#line 3459 "Page.c"
+#line 3483 "Page.c"
 	} else {
 		AppWindow* _tmp3_;
 		GActionMap* _tmp4_;
@@ -3467,19 +3491,19 @@ GAction* page_get_action (Page* self, const gchar* name) {
 		if (_tmp4_ == NULL) {
 #line 315 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp3_);
-#line 3471 "Page.c"
+#line 3495 "Page.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
 #line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp4_;
-#line 3477 "Page.c"
+#line 3501 "Page.c"
 	}
 #line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = map;
 #line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ != NULL) {
-#line 3483 "Page.c"
+#line 3507 "Page.c"
 		GActionMap* _tmp6_;
 		const gchar* _tmp7_;
 		GAction* _tmp8_;
@@ -3498,7 +3522,7 @@ GAction* page_get_action (Page* self, const gchar* name) {
 		_g_object_unref0 (map);
 #line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3502 "Page.c"
+#line 3526 "Page.c"
 	}
 #line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
@@ -3506,7 +3530,7 @@ GAction* page_get_action (Page* self, const gchar* name) {
 	_g_object_unref0 (map);
 #line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3510 "Page.c"
+#line 3534 "Page.c"
 }
 
 
@@ -3530,7 +3554,7 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	if (_tmp2_ == NULL) {
 #line 326 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3534 "Page.c"
+#line 3558 "Page.c"
 	}
 #line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
@@ -3538,7 +3562,7 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	_tmp3_ = action;
 #line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3542 "Page.c"
+#line 3566 "Page.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
 #line 328 "/home/jens/Source/shotwell/src/Page.vala"
@@ -3547,61 +3571,11 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 		_tmp5_ = sensitive;
 #line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3551 "Page.c"
+#line 3575 "Page.c"
 	}
 #line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3555 "Page.c"
-}
-
-
-void page_set_action_important (Page* self, const gchar* name, gboolean important) {
-	const gchar* _tmp0_;
-	gboolean _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (name != NULL);
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = name;
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = important;
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
-	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3572 "Page.c"
-}
-
-
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
-	const gchar* _tmp0_;
-	gboolean _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 335 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (name != NULL);
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = name;
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = visible;
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
-	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3589 "Page.c"
-}
-
-
-void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
-	const gchar* _tmp0_;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (name != NULL);
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (short_label != NULL);
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = name;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:340: => Set action short_label called for %s", _tmp0_);
-#line 3605 "Page.c"
+#line 3579 "Page.c"
 }
 
 
@@ -3614,58 +3588,58 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 	const gchar* _tmp4_;
 	GSimpleAction* _tmp7_;
 	gboolean _tmp8_;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3632 "Page.c"
+#line 3606 "Page.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 334 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3644 "Page.c"
+#line 3618 "Page.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = label;
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 3650 "Page.c"
+#line 3624 "Page.c"
 		const gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = label;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 338 "/home/jens/Source/shotwell/src/Page.vala"
 		page_update_menu_item_label (self, _tmp5_, _tmp6_);
-#line 3659 "Page.c"
+#line 3633 "Page.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = action;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = sensitive;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 	g_simple_action_set_enabled (_tmp7_, _tmp8_);
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3669 "Page.c"
+#line 3643 "Page.c"
 }
 
 
@@ -3674,31 +3648,31 @@ void page_activate_action (Page* self, const gchar* name) {
 	const gchar* _tmp0_;
 	GAction* _tmp1_;
 	GAction* _tmp2_;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3692 "Page.c"
+#line 3666 "Page.c"
 		GAction* _tmp3_;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		g_action_activate (_tmp3_, NULL);
-#line 3698 "Page.c"
+#line 3672 "Page.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3702 "Page.c"
+#line 3676 "Page.c"
 }
 
 
@@ -3709,53 +3683,53 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 	GAction* _tmp1_;
 	GAction* _tmp2_;
 	gboolean _tmp3_;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 351 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 353 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 353 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
 		result = action;
-#line 366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3731 "Page.c"
+#line 3705 "Page.c"
 	}
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = log_warning;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 3737 "Page.c"
+#line 3711 "Page.c"
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = name;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:369: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:357: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
+#line 357 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp5_);
-#line 3751 "Page.c"
+#line 3725 "Page.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3759 "Page.c"
+#line 3733 "Page.c"
 }
 
 
@@ -3765,72 +3739,72 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3783 "Page.c"
+#line 3757 "Page.c"
 	}
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3791 "Page.c"
+#line 3765 "Page.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3800 "Page.c"
+#line 3774 "Page.c"
 	}
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3804 "Page.c"
+#line 3778 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
 	const gchar* _tmp0_;
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:381: Trying to set common action label for %s", _tmp0_);
-#line 3820 "Page.c"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:369: Trying to set common action label for %s", _tmp0_);
+#line 3794 "Page.c"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 372 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 372 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 385 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:385: Setting action to important: %s", _tmp0_);
-#line 3834 "Page.c"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:373: Setting action to important: %s", _tmp0_);
+#line 3808 "Page.c"
 }
 
 
@@ -3840,106 +3814,106 @@ void page_activate_common_action (Page* self, const gchar* name) {
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3858 "Page.c"
+#line 3832 "Page.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3866 "Page.c"
+#line 3840 "Page.c"
 		GSimpleAction* _tmp4_;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 379 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_emit_by_name (_tmp4_, "activate", NULL);
-#line 3872 "Page.c"
+#line 3846 "Page.c"
 	}
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3876 "Page.c"
+#line 3850 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 383 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3891 "Page.c"
+#line 3865 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 386 "/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 387 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 387 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 387 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3906 "Page.c"
+#line 3880 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3921 "Page.c"
+#line 3895 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3936 "Page.c"
+#line 3910 "Page.c"
 }
 
 
 static GVariant* _variant_new20 (gboolean value) {
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3943 "Page.c"
+#line 3917 "Page.c"
 }
 
 
@@ -3949,47 +3923,47 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GAction* _tmp1_;
 	GSimpleAction* _tmp2_;
 	GSimpleAction* _tmp3_;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3967 "Page.c"
+#line 3941 "Page.c"
 	}
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3975 "Page.c"
+#line 3949 "Page.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
 		GVariant* _tmp6_;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = active;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _variant_new20 (_tmp5_);
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_state (_tmp4_, _tmp6_);
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 3989 "Page.c"
+#line 3963 "Page.c"
 	}
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3993 "Page.c"
+#line 3967 "Page.c"
 }
 
 
@@ -4019,125 +3993,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_;
 	GdkModifierType _tmp15_;
 	GdkModifierType _tmp16_;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 405 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 409 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_super = FALSE;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 4051 "Page.c"
+#line 4025 "Page.c"
 		}
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 4057 "Page.c"
+#line 4031 "Page.c"
 		}
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 4063 "Page.c"
+#line 4037 "Page.c"
 		}
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 4069 "Page.c"
+#line 4043 "Page.c"
 		}
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 4073 "Page.c"
+#line 4047 "Page.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 420 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 420 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 421 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 423 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 4119 "Page.c"
+#line 4093 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 4125 "Page.c"
+#line 4099 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 4131 "Page.c"
+#line 4105 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 4137 "Page.c"
+#line 4111 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 425 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4141 "Page.c"
+#line 4115 "Page.c"
 }
 
 
@@ -4163,229 +4137,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_;
 	gboolean _tmp31_;
 	gboolean _tmp32_;
-#line 440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 428 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 431 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp4_) {
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4183 "Page.c"
+#line 4157 "Page.c"
 	}
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 4189 "Page.c"
+#line 4163 "Page.c"
 		gboolean _tmp7_;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 4195 "Page.c"
+#line 4169 "Page.c"
 	} else {
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 4199 "Page.c"
+#line 4173 "Page.c"
 	}
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 436 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 4205 "Page.c"
+#line 4179 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 4213 "Page.c"
+#line 4187 "Page.c"
 			gboolean _tmp10_;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 4219 "Page.c"
+#line 4193 "Page.c"
 		} else {
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 4223 "Page.c"
+#line 4197 "Page.c"
 		}
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 4229 "Page.c"
+#line 4203 "Page.c"
 		}
 	}
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 4236 "Page.c"
+#line 4210 "Page.c"
 		gboolean _tmp13_;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 4242 "Page.c"
+#line 4216 "Page.c"
 	} else {
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 4246 "Page.c"
+#line 4220 "Page.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 441 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 4252 "Page.c"
+#line 4226 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 4260 "Page.c"
+#line 4234 "Page.c"
 			gboolean _tmp16_;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 4266 "Page.c"
+#line 4240 "Page.c"
 		} else {
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 4270 "Page.c"
+#line 4244 "Page.c"
 		}
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 4276 "Page.c"
+#line 4250 "Page.c"
 		}
 	}
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 4283 "Page.c"
+#line 4257 "Page.c"
 		gboolean _tmp19_;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 4289 "Page.c"
+#line 4263 "Page.c"
 	} else {
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 4293 "Page.c"
+#line 4267 "Page.c"
 	}
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 446 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 447 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 4299 "Page.c"
+#line 4273 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_;
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 4307 "Page.c"
+#line 4281 "Page.c"
 			gboolean _tmp22_;
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 4313 "Page.c"
+#line 4287 "Page.c"
 		} else {
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 4317 "Page.c"
+#line 4291 "Page.c"
 		}
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 4323 "Page.c"
+#line 4297 "Page.c"
 		}
 	}
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 4330 "Page.c"
+#line 4304 "Page.c"
 		gboolean _tmp25_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 4336 "Page.c"
+#line 4310 "Page.c"
 	} else {
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4340 "Page.c"
+#line 4314 "Page.c"
 	}
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 452 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4346 "Page.c"
+#line 4320 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_;
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4354 "Page.c"
+#line 4328 "Page.c"
 			gboolean _tmp28_;
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4360 "Page.c"
+#line 4334 "Page.c"
 		} else {
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4364 "Page.c"
+#line 4338 "Page.c"
 		}
-#line 465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4370 "Page.c"
+#line 4344 "Page.c"
 		}
 	}
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4389 "Page.c"
+#line 4363 "Page.c"
 }
 
 
@@ -4395,134 +4369,134 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_;
 	GtkContainer* _tmp1_;
 	GtkWidget* _tmp2_;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4411 "Page.c"
+#line 4385 "Page.c"
 		GtkWidget* _tmp3_;
 		GtkWidget* _tmp4_;
 		GtkWidget* _tmp7_;
 		GtkContainer* _tmp8_;
 		GtkContainer* _tmp9_;
 		GtkWidget* _tmp10_;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4424 "Page.c"
+#line 4398 "Page.c"
 		}
-#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4430 "Page.c"
+#line 4404 "Page.c"
 			GtkWidget* _tmp5_;
 			PageWindow* _tmp6_;
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4443 "Page.c"
+#line 4417 "Page.c"
 		}
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4457 "Page.c"
+#line 4431 "Page.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4465 "Page.c"
+#line 4439 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_;
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4480 "Page.c"
+#line 4454 "Page.c"
 }
 
 
 static void page_real_add_actions (Page* self, GActionMap* map) {
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4487 "Page.c"
+#line 4461 "Page.c"
 }
 
 
 void page_add_actions (Page* self, GActionMap* map) {
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->add_actions (self, map);
-#line 4496 "Page.c"
+#line 4470 "Page.c"
 }
 
 
 static void page_real_remove_actions (Page* self, GActionMap* map) {
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4503 "Page.c"
+#line 4477 "Page.c"
 }
 
 
 void page_remove_actions (Page* self, GActionMap* map) {
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 479 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->remove_actions (self, map);
-#line 4512 "Page.c"
+#line 4486 "Page.c"
 }
 
 
 static gboolean _variant_get21 (GVariant* value) {
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_get_boolean (value);
-#line 4519 "Page.c"
+#line 4493 "Page.c"
 }
 
 
 static GVariant* _variant_new22 (gboolean value) {
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4526 "Page.c"
+#line 4500 "Page.c"
 }
 
 
@@ -4535,50 +4509,50 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* _tmp4_;
 	GVariant* _tmp5_;
 	GAction* _tmp6_;
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 481 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 481 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _variant_get21 (_tmp2_);
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _variant_new22 (!_tmp3_);
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 482 "/home/jens/Source/shotwell/src/Page.vala"
 	new_state = _tmp5_;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = action;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 481 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (new_state);
-#line 4565 "Page.c"
+#line 4539 "Page.c"
 }
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_;
 	GVariant* _tmp1_;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 498 "/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 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = value;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4582 "Page.c"
+#line 4556 "Page.c"
 }
 
 
@@ -4589,36 +4563,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_;
 	gint _tmp3_;
 	gint _tmp4_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4611 "Page.c"
+#line 4585 "Page.c"
 		gchar* _tmp5_;
 		gchar* _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:507: No UI file specified for %s", _tmp6_);
-#line 507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+		g_message ("Page.vala:495: No UI file specified for %s", _tmp6_);
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 4622 "Page.c"
+#line 4596 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4629,25 +4603,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_;
 		gint _tmp11_;
 		gint _ui_filename_index = 0;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4651 "Page.c"
+#line 4625 "Page.c"
 			gint _tmp12_;
 			gint _tmp13_;
 			gint _tmp14_;
@@ -4656,90 +4630,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_;
 			gpointer _tmp17_;
 			const gchar* _tmp18_;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4672 "Page.c"
+#line 4646 "Page.c"
 			}
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4688 "Page.c"
+#line 4662 "Page.c"
 		}
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4692 "Page.c"
+#line 4666 "Page.c"
 	}
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4696 "Page.c"
+#line 4670 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4715 "Page.c"
+#line 4689 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4722 "Page.c"
+#line 4696 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4729 "Page.c"
+#line 4703 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4736 "Page.c"
+#line 4710 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4743 "Page.c"
+#line 4717 "Page.c"
 }
 
 
@@ -4767,87 +4741,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_;
 	ViewCollection* _tmp19_;
 	ViewCollection* _tmp20_;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4779 "Page.c"
+#line 4753 "Page.c"
 	}
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/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 531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 519 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/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 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/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 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/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 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4851 "Page.c"
+#line 4825 "Page.c"
 }
 
 
@@ -4865,109 +4839,109 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_;
 	ViewCollection* _tmp11_;
 	guint _tmp12_;
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 530 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4877 "Page.c"
+#line 4851 "Page.c"
 	}
-#line 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/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 544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/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 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/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 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/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 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 537 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4921 "Page.c"
+#line 4895 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4928 "Page.c"
+#line 4902 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp6_;
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4941 "Page.c"
+#line 4915 "Page.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		OneShotScheduler* _tmp5_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4965 "Page.c"
+#line 4939 "Page.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4971 "Page.c"
+#line 4945 "Page.c"
 }
 
 
@@ -4980,43 +4954,43 @@ static void page_on_update_actions_on_idle (Page* self) {
 	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
 	gint _tmp7_;
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 550 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 551 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 551 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4992 "Page.c"
+#line 4966 "Page.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->in_view;
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5000 "Page.c"
+#line 4974 "Page.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (self);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp4_, _tmp7_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 5020 "Page.c"
+#line 4994 "Page.c"
 }
 
 
@@ -5025,34 +4999,34 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 560 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 560 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 561 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_resource = _tmp1_;
-#line 5039 "Page.c"
+#line 5013 "Page.c"
 	{
 		GtkBuilder* _tmp2_;
-#line 575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
-#line 575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_builder_add_from_resource (_tmp2_, ui_resource, &_inner_error_);
-#line 575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5048 "Page.c"
-			goto __catch255_g_error;
+#line 5022 "Page.c"
+			goto __catch266_g_error;
 		}
-#line 576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 564 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->menubar_injected = FALSE;
-#line 5053 "Page.c"
+#line 5027 "Page.c"
 	}
-	goto __finally255;
-	__catch255_g_error:
+	goto __finally266;
+	__catch266_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
@@ -5061,66 +5035,66 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		gchar* _tmp6_;
 		Application* _tmp7_;
 		Application* _tmp8_;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = err;
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->message;
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = g_strdup_printf ("Error loading UI resource %s: %s", ui_resource, _tmp4_);
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp6_, NULL);
-#line 578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = application_get_instance ();
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		application_panic (_tmp8_);
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 568 "/home/jens/Source/shotwell/src/Page.vala"
 		_application_unref0 (_tmp8_);
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 5091 "Page.c"
+#line 5065 "Page.c"
 	}
-	__finally255:
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally266:
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (ui_resource);
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/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 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5104 "Page.c"
+#line 5078 "Page.c"
 	}
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 560 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (ui_resource);
-#line 5108 "Page.c"
+#line 5082 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 5115 "Page.c"
+#line 5089 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 5124 "Page.c"
+#line 5098 "Page.c"
 }
 
 
@@ -5129,32 +5103,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_;
 	InjectionGroup** _tmp1_;
 	gint _tmp1__length1;
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 5143 "Page.c"
+#line 5117 "Page.c"
 	}
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 581 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5149 "Page.c"
+#line 5123 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 580 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 580 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 5158 "Page.c"
+#line 5132 "Page.c"
 }
 
 
@@ -5163,11 +5137,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 598 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 598 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5171 "Page.c"
+#line 5145 "Page.c"
 }
 
 
@@ -5176,48 +5150,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 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5184 "Page.c"
+#line 5158 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 607 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5191 "Page.c"
+#line 5165 "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 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5198 "Page.c"
+#line 5172 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5205 "Page.c"
+#line 5179 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5212 "Page.c"
+#line 5186 "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 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5221 "Page.c"
+#line 5195 "Page.c"
 }
 
 
@@ -5233,53 +5207,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_;
 	GtkWidget* _tmp8_;
 	GtkWidget* _tmp9_;
-#line 609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 598 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 598 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 599 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5245 "Page.c"
+#line 5219 "Page.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 607 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 607 "/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 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/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 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/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 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/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 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/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 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5283 "Page.c"
+#line 5257 "Page.c"
 }
 
 
@@ -5297,86 +5271,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_;
 	guint _tmp11_;
 	GtkWidget* _tmp12_;
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5309 "Page.c"
+#line 5283 "Page.c"
 	}
-#line 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/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 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 623 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 623 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 623 "/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 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/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 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 625 "/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 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 626 "/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 639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_unset (_tmp12_);
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5351 "Page.c"
+#line 5325 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 632 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5366 "Page.c"
+#line 5340 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_;
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 649 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 649 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", _tmp0_);
-#line 5380 "Page.c"
+#line 5354 "Page.c"
 }
 
 
@@ -5385,72 +5359,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_;
 	guint _tmp2_;
 	guint _tmp3_;
-#line 652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 654 "/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-data-get", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 5405 "Page.c"
+#line 5379 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_;
-#line 657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 657 "/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 658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 646 "/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 5419 "Page.c"
+#line 5393 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 649 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 649 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 650 "/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 5433 "Page.c"
+#line 5407 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 658 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 670 "/home/jens/Source/shotwell/src/Page.vala"
+#line 658 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5445 "Page.c"
+#line 5419 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5454 "Page.c"
+#line 5428 "Page.c"
 }
 
 
@@ -5459,21 +5433,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_;
 	GtkDragResult _tmp1_;
 	gboolean _tmp2_;
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5477 "Page.c"
+#line 5451 "Page.c"
 }
 
 
@@ -5502,291 +5476,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_;
 	gint _tmp21_;
 	gint _tmp22_;
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 670 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 670 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 671 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 685 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_mask = 0;
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5524 "Page.c"
+#line 5498 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5530 "Page.c"
+#line 5504 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5536 "Page.c"
+#line 5510 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 675 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5540 "Page.c"
+#line 5514 "Page.c"
 	}
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 678 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5568 "Page.c"
+#line 5542 "Page.c"
 	} else {
 		GdkPoint _tmp12_;
 		gint _tmp13_;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5578 "Page.c"
+#line 5552 "Page.c"
 	}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5588 "Page.c"
+#line 5562 "Page.c"
 		}
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5594 "Page.c"
+#line 5568 "Page.c"
 		}
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5600 "Page.c"
+#line 5574 "Page.c"
 		}
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5604 "Page.c"
+#line 5578 "Page.c"
 	}
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5616 "Page.c"
+#line 5590 "Page.c"
 		gint _tmp18_;
-#line 701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 701 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5622 "Page.c"
+#line 5596 "Page.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 691 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5634 "Page.c"
+#line 5608 "Page.c"
 		gint _tmp23_;
-#line 704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5640 "Page.c"
+#line 5614 "Page.c"
 	}
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5648 "Page.c"
+#line 5622 "Page.c"
 	}
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5654 "Page.c"
+#line 5628 "Page.c"
 	}
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5660 "Page.c"
+#line 5634 "Page.c"
 	}
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 694 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5664 "Page.c"
+#line 5638 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 698 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 698 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5676 "Page.c"
+#line 5650 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5685 "Page.c"
+#line 5659 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 701 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5697 "Page.c"
+#line 5671 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 701 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 701 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5706 "Page.c"
+#line 5680 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 706 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5718 "Page.c"
+#line 5692 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5727 "Page.c"
+#line 5701 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 710 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5739 "Page.c"
+#line 5713 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5748 "Page.c"
+#line 5722 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 714 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5760 "Page.c"
+#line 5734 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5769 "Page.c"
+#line 5743 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 718 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5781 "Page.c"
+#line 5755 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5790 "Page.c"
+#line 5764 "Page.c"
 }
 
 
@@ -5794,19 +5768,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_;
 	guint _tmp1_;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5810 "Page.c"
+#line 5784 "Page.c"
 		{
 			GtkWidget* _tmp2_;
 			GdkEventButton* _tmp4_;
@@ -5815,79 +5789,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_;
 			GdkEventButton* _tmp8_;
 			gboolean _tmp9_;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5823 "Page.c"
+#line 5797 "Page.c"
 				GtkWidget* _tmp3_;
-#line 737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 737 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5829 "Page.c"
+#line 5803 "Page.c"
 			}
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.y = (gint) _tmp7_;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 743 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5851 "Page.c"
+#line 5825 "Page.c"
 		}
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5855 "Page.c"
+#line 5829 "Page.c"
 		{
 			GdkEventButton* _tmp10_;
 			gboolean _tmp11_;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 734 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5867 "Page.c"
+#line 5841 "Page.c"
 		}
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5871 "Page.c"
+#line 5845 "Page.c"
 		{
 			GdkEventButton* _tmp12_;
 			gboolean _tmp13_;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 737 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5883 "Page.c"
+#line 5857 "Page.c"
 		}
 		default:
 		{
-#line 752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5891 "Page.c"
+#line 5865 "Page.c"
 		}
 	}
 }
@@ -5897,78 +5871,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_;
 	guint _tmp1_;
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 744 "/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 744 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5913 "Page.c"
+#line 5887 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_;
 			gboolean _tmp4_;
-#line 760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down = _tmp2_;
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5932 "Page.c"
+#line 5906 "Page.c"
 		}
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5936 "Page.c"
+#line 5910 "Page.c"
 		{
 			GdkEventButton* _tmp5_;
 			gboolean _tmp6_;
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 753 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5948 "Page.c"
+#line 5922 "Page.c"
 		}
-#line 757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5952 "Page.c"
+#line 5926 "Page.c"
 		{
 			GdkEventButton* _tmp7_;
 			gboolean _tmp8_;
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5964 "Page.c"
+#line 5938 "Page.c"
 		}
 		default:
 		{
-#line 771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5972 "Page.c"
+#line 5946 "Page.c"
 		}
 	}
 }
@@ -5976,195 +5950,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 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5984 "Page.c"
+#line 5958 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 763 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 763 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 5993 "Page.c"
+#line 5967 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 768 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6003 "Page.c"
+#line 5977 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 6012 "Page.c"
+#line 5986 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 772 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6022 "Page.c"
+#line 5996 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 771 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 771 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 6031 "Page.c"
+#line 6005 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 776 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6041 "Page.c"
+#line 6015 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 6050 "Page.c"
+#line 6024 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 780 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6060 "Page.c"
+#line 6034 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 6069 "Page.c"
+#line 6043 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 784 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6079 "Page.c"
+#line 6053 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 6088 "Page.c"
+#line 6062 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 788 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6098 "Page.c"
+#line 6072 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 6107 "Page.c"
+#line 6081 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 792 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6117 "Page.c"
+#line 6091 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 6126 "Page.c"
+#line 6100 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 796 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6138 "Page.c"
+#line 6112 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 6147 "Page.c"
+#line 6121 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6159 "Page.c"
+#line 6133 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6168 "Page.c"
+#line 6142 "Page.c"
 }
 
 
@@ -6183,248 +6157,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_;
 	const gchar* _tmp7_;
 	GQuark _tmp9_ = 0U;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6207 "Page.c"
+#line 6181 "Page.c"
 	GdkEventKey* _tmp30_;
 	gboolean _tmp31_;
-#line 815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/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 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6238 "Page.c"
+#line 6212 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_;
 				GdkEventKey* _tmp13_;
 				gboolean _tmp14_;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6251 "Page.c"
+#line 6225 "Page.c"
 				} else {
 					gboolean _tmp12_;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6258 "Page.c"
+#line 6232 "Page.c"
 				}
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 812 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 813 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 813 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6266 "Page.c"
+#line 6240 "Page.c"
 				}
-#line 827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 815 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = TRUE;
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6278 "Page.c"
+#line 6252 "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 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6284 "Page.c"
+#line 6258 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_;
 				GdkEventKey* _tmp18_;
 				gboolean _tmp19_;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6297 "Page.c"
+#line 6271 "Page.c"
 				} else {
 					gboolean _tmp17_;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6304 "Page.c"
+#line 6278 "Page.c"
 				}
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6312 "Page.c"
+#line 6286 "Page.c"
 				}
-#line 838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = TRUE;
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6324 "Page.c"
+#line 6298 "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 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6330 "Page.c"
+#line 6304 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_;
 				GdkEventKey* _tmp23_;
 				gboolean _tmp24_;
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6343 "Page.c"
+#line 6317 "Page.c"
 				} else {
 					gboolean _tmp22_;
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6350 "Page.c"
+#line 6324 "Page.c"
 				}
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6358 "Page.c"
+#line 6332 "Page.c"
 				}
-#line 847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = TRUE;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6370 "Page.c"
+#line 6344 "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 821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 809 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6376 "Page.c"
+#line 6350 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_;
 				GdkEventKey* _tmp28_;
 				gboolean _tmp29_;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6389 "Page.c"
+#line 6363 "Page.c"
 				} else {
 					gboolean _tmp27_;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6396 "Page.c"
+#line 6370 "Page.c"
 				}
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 841 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 842 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6404 "Page.c"
+#line 6378 "Page.c"
 				}
-#line 856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 844 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = TRUE;
-#line 858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6416 "Page.c"
+#line 6390 "Page.c"
 			}
 		}
 	}
-#line 861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6428 "Page.c"
+#line 6402 "Page.c"
 }
 
 
@@ -6443,406 +6417,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_;
 	const gchar* _tmp7_;
 	GQuark _tmp9_ = 0U;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6467 "Page.c"
+#line 6441 "Page.c"
 	GdkEventKey* _tmp30_;
 	gboolean _tmp31_;
-#line 864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/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 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6498 "Page.c"
+#line 6472 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_;
 				GdkEventKey* _tmp13_;
 				gboolean _tmp14_;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6511 "Page.c"
+#line 6485 "Page.c"
 				} else {
 					gboolean _tmp12_;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6518 "Page.c"
+#line 6492 "Page.c"
 				}
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 861 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 862 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 862 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6526 "Page.c"
+#line 6500 "Page.c"
 				}
-#line 876 "/home/jens/Source/shotwell/src/Page.vala"
+#line 864 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6538 "Page.c"
+#line 6512 "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 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6544 "Page.c"
+#line 6518 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_;
 				GdkEventKey* _tmp18_;
 				gboolean _tmp19_;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6557 "Page.c"
+#line 6531 "Page.c"
 				} else {
 					gboolean _tmp17_;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6564 "Page.c"
+#line 6538 "Page.c"
 				}
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6572 "Page.c"
+#line 6546 "Page.c"
 				}
-#line 887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = FALSE;
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6584 "Page.c"
+#line 6558 "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 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6590 "Page.c"
+#line 6564 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_;
 				GdkEventKey* _tmp23_;
 				gboolean _tmp24_;
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6603 "Page.c"
+#line 6577 "Page.c"
 				} else {
 					gboolean _tmp22_;
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6610 "Page.c"
+#line 6584 "Page.c"
 				}
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6618 "Page.c"
+#line 6592 "Page.c"
 				}
-#line 896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6630 "Page.c"
+#line 6604 "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 870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 858 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6636 "Page.c"
+#line 6610 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_;
 				GdkEventKey* _tmp28_;
 				gboolean _tmp29_;
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6649 "Page.c"
+#line 6623 "Page.c"
 				} else {
 					gboolean _tmp27_;
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6656 "Page.c"
+#line 6630 "Page.c"
 				}
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 890 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 891 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6664 "Page.c"
+#line 6638 "Page.c"
 				}
-#line 905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = FALSE;
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6676 "Page.c"
+#line 6650 "Page.c"
 			}
 		}
 	}
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6688 "Page.c"
+#line 6662 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6704 "Page.c"
+#line 6678 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 907 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 908 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 908 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6718 "Page.c"
+#line 6692 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6725 "Page.c"
+#line 6699 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6734 "Page.c"
+#line 6708 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6741 "Page.c"
+#line 6715 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6750 "Page.c"
+#line 6724 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6757 "Page.c"
+#line 6731 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6766 "Page.c"
+#line 6740 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6773 "Page.c"
+#line 6747 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6782 "Page.c"
+#line 6756 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 923 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6789 "Page.c"
+#line 6763 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 923 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 923 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6798 "Page.c"
+#line 6772 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6805 "Page.c"
+#line 6779 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6814 "Page.c"
+#line 6788 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 930 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 930 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6828 "Page.c"
+#line 6802 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6837 "Page.c"
+#line 6811 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6846 "Page.c"
+#line 6820 "Page.c"
 }
 
 
@@ -6873,41 +6847,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_;
 	GdkRectangle _tmp52_;
 	gboolean _tmp53_;
-#line 945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 936 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 936 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 936 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 6911 "Page.c"
+#line 6885 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_;
 		gint _tmp11_;
@@ -6918,193 +6892,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_;
 		GdkRectangle _tmp22_;
 		gint _tmp23_;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 6934 "Page.c"
+#line 6908 "Page.c"
 		} else {
 			GdkRectangle _tmp14_;
 			gint _tmp15_;
 			GdkRectangle _tmp16_;
 			gint _tmp17_;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 6950 "Page.c"
+#line 6924 "Page.c"
 		}
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 942 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 6954 "Page.c"
+#line 6928 "Page.c"
 			GdkRectangle _tmp18_;
-#line 955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 943 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 943 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 944 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 6962 "Page.c"
+#line 6936 "Page.c"
 		}
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 6976 "Page.c"
+#line 6950 "Page.c"
 		} else {
 			GdkRectangle _tmp24_;
 			gint _tmp25_;
 			GdkRectangle _tmp26_;
 			gint _tmp27_;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 6992 "Page.c"
+#line 6966 "Page.c"
 		}
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 6996 "Page.c"
+#line 6970 "Page.c"
 			GdkRectangle _tmp28_;
-#line 960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 961 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 7004 "Page.c"
+#line 6978 "Page.c"
 		}
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/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 7008 "Page.c"
+#line 6982 "Page.c"
 	}
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 7022 "Page.c"
+#line 6996 "Page.c"
 	} else {
 		GdkRectangle _tmp34_;
 		gint _tmp35_;
 		GdkRectangle _tmp36_;
 		gint _tmp37_;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 7038 "Page.c"
+#line 7012 "Page.c"
 	}
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 7042 "Page.c"
+#line 7016 "Page.c"
 		GdkRectangle _tmp38_;
-#line 970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 7048 "Page.c"
+#line 7022 "Page.c"
 	}
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 7062 "Page.c"
+#line 7036 "Page.c"
 	} else {
 		GdkRectangle _tmp44_;
 		gint _tmp45_;
 		GdkRectangle _tmp46_;
 		gint _tmp47_;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 7078 "Page.c"
+#line 7052 "Page.c"
 	}
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 7082 "Page.c"
+#line 7056 "Page.c"
 		GdkRectangle _tmp48_;
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 961 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 961 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 7088 "Page.c"
+#line 7062 "Page.c"
 	}
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 963 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = _tmp50_;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 966 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7108 "Page.c"
+#line 7082 "Page.c"
 }
 
 
@@ -7117,117 +7091,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_;
 	gboolean _tmp7_;
-#line 981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 970 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7131 "Page.c"
+#line 7105 "Page.c"
 	}
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7143 "Page.c"
+#line 7117 "Page.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp3_;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 979 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 979 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 7153 "Page.c"
+#line 7127 "Page.c"
 		GtkAllocation _tmp5_;
 		GdkRectangle _tmp6_;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 7162 "Page.c"
+#line 7136 "Page.c"
 	}
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7168 "Page.c"
+#line 7142 "Page.c"
 		GtkAllocation _tmp8_;
 		GdkRectangle _tmp9_;
-#line 995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7177 "Page.c"
+#line 7151 "Page.c"
 	}
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 986 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 987 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 989 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
+#line 989 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7189 "Page.c"
+#line 7163 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1005 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 995 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 995 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7203 "Page.c"
+#line 7177 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 992 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7212 "Page.c"
+#line 7186 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7222 "Page.c"
+#line 7196 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7231 "Page.c"
+#line 7205 "Page.c"
 }
 
 
@@ -7243,29 +7217,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_;
 	GdkModifierType _tmp14_;
 	gboolean _tmp15_;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7257 "Page.c"
+#line 7231 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7269 "Page.c"
+#line 7243 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_;
 		gdouble _tmp6_;
@@ -7273,41 +7247,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_;
 		GdkEventMotion* _tmp9_;
 		GdkModifierType _tmp10_;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7295 "Page.c"
+#line 7269 "Page.c"
 	}
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7311 "Page.c"
+#line 7285 "Page.c"
 }
 
 
@@ -7315,83 +7289,83 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_;
 	GdkScrollDirection _tmp1_;
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/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 1016 "/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 1017 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7331 "Page.c"
+#line 7305 "Page.c"
 		{
 			GdkEventScroll* _tmp2_;
 			gboolean _tmp3_;
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7343 "Page.c"
+#line 7317 "Page.c"
 		}
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7347 "Page.c"
+#line 7321 "Page.c"
 		{
 			GdkEventScroll* _tmp4_;
 			gboolean _tmp5_;
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7359 "Page.c"
+#line 7333 "Page.c"
 		}
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7363 "Page.c"
+#line 7337 "Page.c"
 		{
 			GdkEventScroll* _tmp6_;
 			gboolean _tmp7_;
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7375 "Page.c"
+#line 7349 "Page.c"
 		}
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7379 "Page.c"
+#line 7353 "Page.c"
 		{
 			GdkEventScroll* _tmp8_;
 			gboolean _tmp9_;
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7391 "Page.c"
+#line 7365 "Page.c"
 		}
-#line 1029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_SMOOTH:
-#line 7395 "Page.c"
+#line 7369 "Page.c"
 		{
 			{
 				gdouble dx = 0.0;
@@ -7400,90 +7374,90 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 				gdouble _tmp11_ = 0.0;
 				gdouble _tmp12_ = 0.0;
 				gdouble _tmp13_;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = event;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 				gdk_event_get_scroll_deltas ((GdkEvent*) _tmp10_, &_tmp11_, &_tmp12_);
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 				dx = _tmp11_;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 				dy = _tmp12_;
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = dy;
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp13_ < ((gdouble) 0)) {
-#line 7416 "Page.c"
+#line 7390 "Page.c"
 					GdkEventScroll* _tmp14_;
 					gboolean _tmp15_;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = event;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = page_on_mousewheel_up (self, _tmp14_);
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 					result = _tmp15_;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 7427 "Page.c"
+#line 7401 "Page.c"
 				} else {
 					gdouble _tmp16_;
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = dy;
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp16_ > ((gdouble) 0)) {
-#line 7434 "Page.c"
+#line 7408 "Page.c"
 						GdkEventScroll* _tmp17_;
 						gboolean _tmp18_;
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp17_ = event;
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp18_ = page_on_mousewheel_down (self, _tmp17_);
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 						result = _tmp18_;
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 						return result;
-#line 7445 "Page.c"
+#line 7419 "Page.c"
 					} else {
 						gdouble _tmp19_;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp19_ = dx;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 						if (_tmp19_ < ((gdouble) 0)) {
-#line 7452 "Page.c"
+#line 7426 "Page.c"
 							GdkEventScroll* _tmp20_;
 							gboolean _tmp21_;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp20_ = event;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = page_on_mousewheel_left (self, _tmp20_);
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 							result = _tmp21_;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
 							return result;
-#line 7463 "Page.c"
+#line 7437 "Page.c"
 						} else {
 							gdouble _tmp22_;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp22_ = dx;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
 							if (_tmp22_ > ((gdouble) 0)) {
-#line 7470 "Page.c"
+#line 7444 "Page.c"
 								GdkEventScroll* _tmp23_;
 								gboolean _tmp24_;
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp23_ = event;
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = page_on_mousewheel_right (self, _tmp23_);
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 								result = _tmp24_;
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 								return result;
-#line 7481 "Page.c"
+#line 7455 "Page.c"
 							} else {
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 								result = FALSE;
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
 								return result;
-#line 7487 "Page.c"
+#line 7461 "Page.c"
 							}
 						}
 					}
@@ -7492,11 +7466,11 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 		}
 		default:
 		{
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7500 "Page.c"
+#line 7474 "Page.c"
 		}
 	}
 }
@@ -7504,144 +7478,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 1064 "/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 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7514 "Page.c"
+#line 7488 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1064 "/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 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7523 "Page.c"
+#line 7497 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7535 "Page.c"
+#line 7509 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1068 "/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 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7544 "Page.c"
+#line 7518 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1072 "/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 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7556 "Page.c"
+#line 7530 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1072 "/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 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7565 "Page.c"
+#line 7539 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7577 "Page.c"
+#line 7551 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1076 "/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 1076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7586 "Page.c"
+#line 7560 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7596 "Page.c"
+#line 7570 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1080 "/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 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7605 "Page.c"
+#line 7579 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7617 "Page.c"
+#line 7591 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7626 "Page.c"
+#line 7600 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7636 "Page.c"
+#line 7610 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7645 "Page.c"
+#line 7619 "Page.c"
 }
 
 
@@ -7650,72 +7624,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_;
 	GdkEventButton* _tmp3_;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7664 "Page.c"
+#line 7638 "Page.c"
 	} else {
 		gboolean _tmp2_;
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7671 "Page.c"
+#line 7645 "Page.c"
 	}
-#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7679 "Page.c"
+#line 7653 "Page.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7685 "Page.c"
+#line 7659 "Page.c"
 		GtkMenu* _tmp4_;
 		guint32 _tmp5_;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7694 "Page.c"
+#line 7668 "Page.c"
 	} else {
 		GtkMenu* _tmp6_;
 		GdkEventButton* _tmp7_;
 		guint _tmp8_;
 		GdkEventButton* _tmp9_;
 		guint32 _tmp10_;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7713 "Page.c"
+#line 7687 "Page.c"
 	}
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7719 "Page.c"
+#line 7693 "Page.c"
 }
 
 
@@ -7730,166 +7704,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_;
 	GdkWindow* _tmp11_;
 	GdkWindow* _tmp20_;
-#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7750 "Page.c"
+#line 7724 "Page.c"
 		GtkWidget* _tmp5_;
 		GdkWindow* _tmp6_;
 		GdkCursor* _tmp7_;
 		GdkCursorType _tmp8_;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7767 "Page.c"
+#line 7741 "Page.c"
 	}
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7777 "Page.c"
+#line 7751 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7784 "Page.c"
+#line 7758 "Page.c"
 			GdkWindow* _tmp17_;
 			GdkWindow* _tmp18_;
 			GdkWindow* _tmp19_;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7790 "Page.c"
+#line 7764 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7797 "Page.c"
+#line 7771 "Page.c"
 					GdkWindow* _tmp15_;
 					GdkCursor* _tmp16_;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7806 "Page.c"
+#line 7780 "Page.c"
 				} else {
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7810 "Page.c"
+#line 7784 "Page.c"
 				}
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7816 "Page.c"
+#line 7790 "Page.c"
 				}
 			}
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7831 "Page.c"
+#line 7805 "Page.c"
 		}
 	}
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7838 "Page.c"
+#line 7812 "Page.c"
 		GdkWindow* _tmp21_;
 		GdkCursor* _tmp22_;
 		GdkCursorType _tmp23_;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7850 "Page.c"
+#line 7824 "Page.c"
 	}
-#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7854 "Page.c"
+#line 7828 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7866 "Page.c"
+#line 7840 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7875 "Page.c"
+#line 7849 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7887 "Page.c"
+#line 7861 "Page.c"
 		guint _tmp1_;
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7893 "Page.c"
+#line 7867 "Page.c"
 	}
 }
 
@@ -7897,41 +7871,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_;
 	guint _tmp1_;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7911 "Page.c"
+#line 7885 "Page.c"
 		guint _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7917 "Page.c"
+#line 7891 "Page.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7921 "Page.c"
+#line 7895 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_;
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1136 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7935 "Page.c"
+#line 7909 "Page.c"
 }
 
 
@@ -7939,29 +7913,29 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7951 "Page.c"
+#line 7925 "Page.c"
 		GtkWidget* _tmp3_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7957 "Page.c"
+#line 7931 "Page.c"
 	} else {
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7961 "Page.c"
+#line 7935 "Page.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7965 "Page.c"
+#line 7939 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_;
 		GdkWindow* _tmp5_;
@@ -7973,103 +7947,103 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 		GdkCursorType _tmp11_;
 		GdkCursor* _tmp12_;
 		GdkCursor* _tmp13_;
-#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 8005 "Page.c"
+#line 7979 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 8015 "Page.c"
+#line 7989 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8024 "Page.c"
+#line 7998 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_;
 	gint _tmp2_;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 8037 "Page.c"
+#line 8011 "Page.c"
 		GdkCursorType _tmp1_;
-#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 8045 "Page.c"
+#line 8019 "Page.c"
 	}
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 8051 "Page.c"
+#line 8025 "Page.c"
 		guint _tmp3_;
 		gint _tmp5_;
 		guint _tmp6_;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 8059 "Page.c"
+#line 8033 "Page.c"
 			guint _tmp4_;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 8065 "Page.c"
+#line 8039 "Page.c"
 		}
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1158 "/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 1170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 8073 "Page.c"
+#line 8047 "Page.c"
 	}
 }
 
@@ -8077,15 +8051,15 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 8089 "Page.c"
+#line 8063 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_;
 		GdkWindow* _tmp2_;
@@ -8096,41 +8070,41 @@ static gboolean page_on_hide_cursor (Page* self) {
 		GdkDisplay* _tmp7_;
 		GdkCursor* _tmp8_;
 		GdkCursor* _tmp9_;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 8126 "Page.c"
+#line 8100 "Page.c"
 	}
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8134 "Page.c"
+#line 8108 "Page.c"
 }
 
 
@@ -8139,25 +8113,25 @@ void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_
 	AppWindow* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (id != NULL);
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (new_label != NULL);
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = id;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = new_label;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 8161 "Page.c"
+#line 8135 "Page.c"
 }
 
 
@@ -8167,33 +8141,33 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 	GMenuModel* _tmp0_;
 	gint _tmp1_;
 	GMenuModel* section = NULL;
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 8185 "Page.c"
+#line 8159 "Page.c"
 	{
 		gint i = 0;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 8190 "Page.c"
+#line 8164 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 8197 "Page.c"
+#line 8171 "Page.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_;
 				gint _tmp6_;
@@ -8202,71 +8176,71 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 				gint _tmp9_;
 				const gchar* _tmp10_;
 				const gchar* _tmp11_;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 8208 "Page.c"
+#line 8182 "Page.c"
 					gint _tmp3_;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 8214 "Page.c"
+#line 8188 "Page.c"
 				}
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 8224 "Page.c"
+#line 8198 "Page.c"
 					GMenuModel* _tmp7_;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 8230 "Page.c"
+#line 8204 "Page.c"
 				} else {
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 8234 "Page.c"
+#line 8208 "Page.c"
 				}
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 8240 "Page.c"
+#line 8214 "Page.c"
 				}
-#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8256 "Page.c"
+#line 8230 "Page.c"
 					GMenuModel* _tmp12_;
 					gint _tmp13_;
 					GMenuModel* _tmp14_;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8270 "Page.c"
+#line 8244 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
 					GMenuModel* _tmp15_;
@@ -8276,45 +8250,45 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 					gint sub_items = 0;
 					GMenuModel* _tmp19_;
 					gint _tmp20_;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8298 "Page.c"
+#line 8272 "Page.c"
 					}
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8306 "Page.c"
+#line 8280 "Page.c"
 					{
 						gint j = 0;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8311 "Page.c"
+#line 8285 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8318 "Page.c"
+#line 8292 "Page.c"
 								gboolean _tmp23_ = FALSE;
 								gint _tmp24_;
 								gint _tmp25_;
@@ -8323,91 +8297,91 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 								gint _tmp28_;
 								GMenuModel* _tmp29_;
 								GMenuModel* _tmp30_;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8329 "Page.c"
+#line 8303 "Page.c"
 									gint _tmp22_;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8335 "Page.c"
+#line 8309 "Page.c"
 								}
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8345 "Page.c"
+#line 8319 "Page.c"
 									GMenuModel* _tmp26_;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8351 "Page.c"
+#line 8325 "Page.c"
 								} else {
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8355 "Page.c"
+#line 8329 "Page.c"
 								}
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8361 "Page.c"
+#line 8335 "Page.c"
 								}
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8375 "Page.c"
+#line 8349 "Page.c"
 									GMenuModel* _tmp31_;
 									const gchar* _tmp32_;
 									GMenuModel* _tmp33_;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8389 "Page.c"
+#line 8363 "Page.c"
 								}
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8393 "Page.c"
+#line 8367 "Page.c"
 							}
 						}
 					}
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8399 "Page.c"
+#line 8373 "Page.c"
 				}
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8403 "Page.c"
+#line 8377 "Page.c"
 			}
 		}
 	}
-#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8411 "Page.c"
+#line 8385 "Page.c"
 }
 
 
@@ -8520,7 +8494,7 @@ static void page_class_init (PageClass * klass) {
 	((PageClass *) klass)->set_page_cursor = (void (*) (Page *, GdkCursorType)) page_real_set_page_cursor;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8524 "Page.c"
+#line 8498 "Page.c"
 }
 
 
@@ -8578,7 +8552,7 @@ static void page_instance_init (Page * self) {
 	self->priv->update_actions_scheduler = NULL;
 #line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->menubar_injected = FALSE;
-#line 8582 "Page.c"
+#line 8556 "Page.c"
 }
 
 
@@ -8604,7 +8578,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 8608 "Page.c"
+#line 8582 "Page.c"
 }
 
 
@@ -8633,30 +8607,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 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8639 "Page.c"
+#line 8613 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8646 "Page.c"
+#line 8620 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8653 "Page.c"
+#line 8627 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8660 "Page.c"
+#line 8634 "Page.c"
 }
 
 
@@ -8685,141 +8659,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_;
 	ViewCollection* _tmp21_;
 	ViewCollection* _tmp22_;
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/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 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/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 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1258 "/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 1272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1260 "/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 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/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 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/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 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/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 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/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 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/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 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/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 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/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 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/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 1287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1278 "/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 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8785 "Page.c"
+#line 8759 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8804 "Page.c"
+#line 8778 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8823 "Page.c"
+#line 8797 "Page.c"
 }
 
 
@@ -8830,44 +8804,44 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_;
 	gint _tmp3_;
 	gboolean _tmp4_;
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/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 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8848 "Page.c"
+#line 8822 "Page.c"
 		GtkMenu* _tmp5_;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8856 "Page.c"
+#line 8830 "Page.c"
 	} else {
 		GtkMenu* _tmp6_;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8865 "Page.c"
+#line 8839 "Page.c"
 	}
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8871 "Page.c"
+#line 8845 "Page.c"
 }
 
 
@@ -8876,11 +8850,11 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 	GtkMenu* _tmp0_;
 	GtkMenu* _tmp8_;
 	GtkMenu* _tmp9_;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8884 "Page.c"
+#line 8858 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_;
 		const gchar* _tmp2_;
@@ -8889,52 +8863,52 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 		GMenuModel* _tmp5_;
 		GtkMenu* _tmp6_;
 		GtkMenu* _tmp7_;
-#line 1310 "/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 1310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1310 "/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 1310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1312 "/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 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1313 "/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 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8919 "Page.c"
+#line 8893 "Page.c"
 	}
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8929 "Page.c"
+#line 8903 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8938 "Page.c"
+#line 8912 "Page.c"
 }
 
 
@@ -8945,23 +8919,23 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	GtkMenu* _tmp1_;
 	GtkMenu* _tmp9_;
 	GtkMenu* _tmp10_;
-#line 1320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_context_menu_path;
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		result = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 8959 "Page.c"
+#line 8933 "Page.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->page_context_menu;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 8965 "Page.c"
+#line 8939 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp2_;
 		const gchar* _tmp3_;
@@ -8970,43 +8944,43 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 		GMenuModel* _tmp6_;
 		GtkMenu* _tmp7_;
 		GtkMenu* _tmp8_;
-#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->page_context_menu_path;
-#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_builder_get_object (_tmp2_, _tmp3_);
-#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp4_) : NULL);
-#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp5_;
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = model;
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_);
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp7_);
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->page_context_menu = _tmp7_;
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->page_context_menu;
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_attach_to_widget (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 9000 "Page.c"
+#line 8974 "Page.c"
 	}
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->page_context_menu;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp10_;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9010 "Page.c"
+#line 8984 "Page.c"
 }
 
 
@@ -9017,85 +8991,85 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9037 "Page.c"
+#line 9011 "Page.c"
 }
 
 
 static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_strdup (_ ("No photos/videos"));
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9050 "Page.c"
+#line 9024 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 9059 "Page.c"
+#line 9033 "Page.c"
 }
 
 
 static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPage* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_strdup (_ ("No photos/videos found which match the current filter"));
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9072 "Page.c"
+#line 9046 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1342 "/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 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 9081 "Page.c"
+#line 9055 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 9090 "Page.c"
+#line 9064 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 9099 "Page.c"
+#line 9073 "Page.c"
 }
 
 
@@ -9103,61 +9077,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_;
 	CheckerboardLayout* _tmp1_;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9117 "Page.c"
+#line 9091 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/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 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 9126 "Page.c"
+#line 9100 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 9135 "Page.c"
+#line 9109 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9145 "Page.c"
+#line 9119 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 9154 "Page.c"
+#line 9128 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 9161 "Page.c"
+#line 9135 "Page.c"
 }
 
 
@@ -9169,33 +9143,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_;
 	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/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 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/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 9199 "Page.c"
+#line 9173 "Page.c"
 }
 
 
@@ -9208,35 +9182,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_;
 	gint _tmp5_;
 	gboolean _tmp6_;
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/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 1373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 9240 "Page.c"
+#line 9214 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_;
 		ViewCollection* _tmp8_;
@@ -9251,37 +9225,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_;
 		gint _tmp17_;
 		AdjustmentRelation _tmp18_;
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1368 "/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 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9285 "Page.c"
+#line 9259 "Page.c"
 			GtkAdjustment* _tmp19_;
 			CheckerboardItem* _tmp20_;
 			GdkRectangle _tmp21_;
@@ -9290,33 +9264,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_;
 			gint _tmp25_;
 			AdjustmentRelation _tmp26_;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9312 "Page.c"
+#line 9286 "Page.c"
 		} else {
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9316 "Page.c"
+#line 9290 "Page.c"
 		}
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9320 "Page.c"
+#line 9294 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_;
 			GdkRectangle _tmp28_;
@@ -9325,38 +9299,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_;
 			GtkAdjustment* _tmp45_;
 			gint _tmp46_;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9343 "Page.c"
+#line 9317 "Page.c"
 				CheckerboardItem* _tmp32_;
 				GdkRectangle _tmp33_;
 				gint _tmp34_;
 				gint _tmp35_;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9360 "Page.c"
+#line 9334 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_;
 				GdkRectangle _tmp37_;
@@ -9367,91 +9341,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_;
 				gdouble _tmp43_;
 				gint _tmp44_;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9393 "Page.c"
+#line 9367 "Page.c"
 			}
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9401 "Page.c"
+#line 9375 "Page.c"
 		}
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9407 "Page.c"
+#line 9381 "Page.c"
 	}
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/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 9411 "Page.c"
+#line 9385 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9420 "Page.c"
+#line 9394 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9433 "Page.c"
+#line 9407 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9444 "Page.c"
+#line 9418 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9455 "Page.c"
+#line 9429 "Page.c"
 }
 
 
@@ -9461,87 +9435,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_;
 	gboolean _tmp3_;
 	gboolean _tmp4_;
-#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9479 "Page.c"
+#line 9453 "Page.c"
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
 		gint _tmp7_;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9493 "Page.c"
+#line 9467 "Page.c"
 	} else {
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9497 "Page.c"
+#line 9471 "Page.c"
 	}
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9501 "Page.c"
+#line 9475 "Page.c"
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9512 "Page.c"
+#line 9486 "Page.c"
 	} else {
 		ViewCollection* _tmp10_;
 		ViewCollection* _tmp11_;
 		gint _tmp12_;
 		gboolean _tmp13_;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9530 "Page.c"
+#line 9504 "Page.c"
 			gchar* _tmp14_;
 			gchar* _tmp15_;
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9541 "Page.c"
+#line 9515 "Page.c"
 		} else {
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9545 "Page.c"
+#line 9519 "Page.c"
 		}
 	}
 }
@@ -9551,27 +9525,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_;
 	const gchar* _tmp1_;
 	gboolean _tmp2_;
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9569 "Page.c"
+#line 9543 "Page.c"
 		CheckerboardLayout* _tmp3_;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9575 "Page.c"
+#line 9549 "Page.c"
 	}
 }
 
@@ -9579,23 +9553,23 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 void checkerboard_page_unset_page_message (CheckerboardPage* self) {
 	CheckerboardLayout* _tmp0_;
 	gboolean _tmp1_;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9593 "Page.c"
+#line 9567 "Page.c"
 		CheckerboardLayout* _tmp2_;
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9599 "Page.c"
+#line 9573 "Page.c"
 	}
 }
 
@@ -9605,21 +9579,21 @@ static void checkerboard_page_real_set_page_name (Page* base, const gchar* name)
 	const gchar* _tmp0_;
 	CheckerboardLayout* _tmp1_;
 	const gchar* _tmp2_;
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/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 1444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9623 "Page.c"
+#line 9597 "Page.c"
 }
 
 
@@ -9629,43 +9603,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_;
 	gdouble _tmp2_;
 	CheckerboardItem* _tmp3_;
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9647 "Page.c"
+#line 9621 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9656 "Page.c"
+#line 9630 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_;
 		GeeIterator* _tmp1_;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9669 "Page.c"
+#line 9643 "Page.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataView* view = NULL;
@@ -9680,73 +9654,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_;
 			CheckerboardItem* _tmp12_;
 			CheckerboardItem* _tmp13_;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9692 "Page.c"
+#line 9666 "Page.c"
 			}
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9716 "Page.c"
+#line 9690 "Page.c"
 			}
-#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9728 "Page.c"
+#line 9702 "Page.c"
 			}
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9740 "Page.c"
+#line 9714 "Page.c"
 			}
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9746 "Page.c"
+#line 9720 "Page.c"
 		}
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9750 "Page.c"
+#line 9724 "Page.c"
 	}
 }
 
@@ -9763,138 +9737,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_;
 	const gchar* _tmp5_;
 	GQuark _tmp7_ = 0U;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9797 "Page.c"
+#line 9771 "Page.c"
 	gboolean _tmp45_;
 	gboolean _tmp46_ = FALSE;
-#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9826 "Page.c"
+#line 9800 "Page.c"
 			default:
 			{
 				guint _tmp8_;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1463 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9838 "Page.c"
+#line 9812 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9844 "Page.c"
+#line 9818 "Page.c"
 			default:
 			{
 				guint _tmp9_;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9856 "Page.c"
+#line 9830 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9862 "Page.c"
+#line 9836 "Page.c"
 			default:
 			{
 				guint _tmp10_;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9874 "Page.c"
+#line 9848 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9880 "Page.c"
+#line 9854 "Page.c"
 			default:
 			{
 				guint _tmp11_;
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9892 "Page.c"
+#line 9866 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9898 "Page.c"
+#line 9872 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9904,45 +9878,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_;
 				CheckerboardItem* _tmp16_;
 				guint _tmp18_;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9924 "Page.c"
+#line 9898 "Page.c"
 					CheckerboardItem* _tmp17_;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9930 "Page.c"
+#line 9904 "Page.c"
 				}
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9940 "Page.c"
+#line 9914 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9946 "Page.c"
+#line 9920 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -9952,100 +9926,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_;
 				CheckerboardItem* _tmp23_;
 				guint _tmp25_;
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9972 "Page.c"
+#line 9946 "Page.c"
 					CheckerboardItem* _tmp24_;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9978 "Page.c"
+#line 9952 "Page.c"
 				}
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9988 "Page.c"
+#line 9962 "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 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9994 "Page.c"
+#line 9968 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_;
 				ViewCollection* _tmp27_;
 				gint _tmp28_;
 				gboolean _tmp29_;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 10013 "Page.c"
+#line 9987 "Page.c"
 					ViewCollection* _tmp30_;
 					ViewCollection* _tmp31_;
 					DataView* _tmp32_;
 					CheckerboardItem* _tmp33_;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 10035 "Page.c"
+#line 10009 "Page.c"
 				} else {
-#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 10039 "Page.c"
+#line 10013 "Page.c"
 				}
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10043 "Page.c"
+#line 10017 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10049 "Page.c"
+#line 10023 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -10059,89 +10033,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_;
 				ViewCollection* _tmp43_;
 				Marker* _tmp44_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/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 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10097 "Page.c"
+#line 10071 "Page.c"
 			}
 		}
 	} else {
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 10103 "Page.c"
+#line 10077 "Page.c"
 			default:
 			{
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10110 "Page.c"
+#line 10084 "Page.c"
 			}
 		}
 	}
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10122 "Page.c"
+#line 10096 "Page.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 10126 "Page.c"
+#line 10100 "Page.c"
 		GdkEventKey* _tmp47_;
 		gboolean _tmp48_;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/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 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 10135 "Page.c"
+#line 10109 "Page.c"
 	} else {
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 10139 "Page.c"
+#line 10113 "Page.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10145 "Page.c"
+#line 10119 "Page.c"
 }
 
 
@@ -10165,62 +10139,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_;
 	gint _tmp108_;
 	gboolean _tmp109_;
-#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 10179 "Page.c"
+#line 10153 "Page.c"
 		GdkEventButton* _tmp3_;
 		GdkEventType _tmp4_;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 10188 "Page.c"
+#line 10162 "Page.c"
 	} else {
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 10192 "Page.c"
+#line 10166 "Page.c"
 	}
-#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10200 "Page.c"
+#line 10174 "Page.c"
 	}
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 10224 "Page.c"
+#line 10198 "Page.c"
 		CheckerboardLayout* _tmp13_;
 		CheckerboardItem* _tmp14_;
 		GdkEventButton* _tmp15_;
@@ -10233,41 +10207,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_;
 		CheckerboardLayout* _tmp80_;
 		CheckerboardItem* _tmp81_;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10263 "Page.c"
+#line 10237 "Page.c"
 		}
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10271 "Page.c"
+#line 10245 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_;
@@ -10280,68 +10254,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_;
 				CheckerboardItem* _tmp31_;
 				gboolean _tmp32_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/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 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10314 "Page.c"
+#line 10288 "Page.c"
 					CheckerboardItem* _tmp33_;
 					CheckerboardItem* _tmp34_;
 					CheckerboardItem* _tmp35_;
 					CheckerboardItem* _tmp36_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10335 "Page.c"
+#line 10309 "Page.c"
 				}
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10341 "Page.c"
+#line 10315 "Page.c"
 			}
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10345 "Page.c"
+#line 10319 "Page.c"
 			{
 				ViewCollection* _tmp37_;
 				ViewCollection* _tmp38_;
@@ -10350,92 +10324,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_;
 				CheckerboardItem* _tmp44_;
 				CheckerboardItem* _tmp45_;
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10366 "Page.c"
+#line 10340 "Page.c"
 					CheckerboardItem* _tmp40_;
 					CheckerboardItem* _tmp41_;
-#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10377 "Page.c"
+#line 10351 "Page.c"
 				}
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10395 "Page.c"
+#line 10369 "Page.c"
 			}
-#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10399 "Page.c"
+#line 10373 "Page.c"
 			{
 				CheckerboardItem* _tmp46_;
 				CheckerboardItem* _tmp49_;
 				CheckerboardItem* _tmp50_;
 				CheckerboardItem* _tmp51_;
 				CheckerboardItem* _tmp52_;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10410 "Page.c"
+#line 10384 "Page.c"
 					CheckerboardItem* _tmp47_;
 					CheckerboardItem* _tmp48_;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10421 "Page.c"
+#line 10395 "Page.c"
 				}
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10439 "Page.c"
+#line 10413 "Page.c"
 			}
 			default:
 			{
@@ -10445,34 +10419,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_;
 				CheckerboardItem* _tmp78_;
 				CheckerboardItem* _tmp79_;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10455 "Page.c"
+#line 10429 "Page.c"
 					CheckerboardItem* _tmp55_;
 					CheckerboardItem* _tmp56_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10466 "Page.c"
+#line 10440 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_;
 					gboolean _tmp58_;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10476 "Page.c"
+#line 10450 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_;
 						ViewCollection* _tmp60_;
@@ -10491,91 +10465,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_;
 						Marker* _tmp74_;
 						Marker* _tmp75_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/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 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10549 "Page.c"
+#line 10523 "Page.c"
 					}
 				}
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10570 "Page.c"
+#line 10544 "Page.c"
 			}
 		}
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10579 "Page.c"
+#line 10553 "Page.c"
 	} else {
 		guint _tmp82_;
 		GeeArrayList* _tmp85_;
@@ -10584,30 +10558,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_;
 		GdkEventButton* _tmp104_;
 		gdouble _tmp105_;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10592 "Page.c"
+#line 10566 "Page.c"
 			ViewCollection* _tmp83_;
 			ViewCollection* _tmp84_;
-#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10603 "Page.c"
+#line 10577 "Page.c"
 		}
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10611 "Page.c"
+#line 10585 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_;
@@ -10619,31 +10593,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_;
 			gint _tmp92_;
 			gint _view_index = 0;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10647 "Page.c"
+#line 10621 "Page.c"
 				gint _tmp93_;
 				gint _tmp94_;
 				gint _tmp95_;
@@ -10653,79 +10627,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_;
 				GeeArrayList* _tmp99_;
 				DataView* _tmp100_;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10669 "Page.c"
+#line 10643 "Page.c"
 				}
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1610 "/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 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10687 "Page.c"
+#line 10661 "Page.c"
 			}
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10691 "Page.c"
+#line 10665 "Page.c"
 		}
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10711 "Page.c"
+#line 10685 "Page.c"
 	}
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10729 "Page.c"
+#line 10703 "Page.c"
 }
 
 
@@ -10746,152 +10720,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_;
 	CheckerboardItem* _tmp16_;
 	CheckerboardItem* _tmp17_;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10764 "Page.c"
+#line 10738 "Page.c"
 		CheckerboardLayout* _tmp2_;
 		CheckerboardItem* _tmp3_;
 		CheckerboardItem* _tmp4_;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10784 "Page.c"
+#line 10758 "Page.c"
 	}
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10796 "Page.c"
+#line 10770 "Page.c"
 	}
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10802 "Page.c"
+#line 10776 "Page.c"
 		CheckerboardItem* _tmp8_;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10819 "Page.c"
+#line 10793 "Page.c"
 	}
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10843 "Page.c"
+#line 10817 "Page.c"
 	}
-#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1664 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10851 "Page.c"
+#line 10825 "Page.c"
 		ViewCollection* _tmp18_;
 		ViewCollection* _tmp19_;
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10862 "Page.c"
+#line 10836 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_;
 		gboolean _tmp21_;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10872 "Page.c"
+#line 10846 "Page.c"
 			ViewCollection* _tmp22_;
 			ViewCollection* _tmp23_;
 			CheckerboardItem* _tmp24_;
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10886 "Page.c"
+#line 10860 "Page.c"
 		}
 	}
-#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10895 "Page.c"
+#line 10869 "Page.c"
 }
 
 
@@ -10912,50 +10886,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_;
 	GdkEventButton* _tmp41_;
 	gboolean _tmp42_;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10930 "Page.c"
+#line 10904 "Page.c"
 	}
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10948 "Page.c"
+#line 10922 "Page.c"
 		GdkEventButton* _tmp8_;
 		GdkModifierType _tmp9_;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10959 "Page.c"
+#line 10933 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_;
@@ -10966,63 +10940,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_;
 				ViewCollection* _tmp16_;
 				Marker* _tmp17_;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/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 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10998 "Page.c"
+#line 10972 "Page.c"
 			}
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 11002 "Page.c"
+#line 10976 "Page.c"
 			{
-#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11006 "Page.c"
+#line 10980 "Page.c"
 			}
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 11010 "Page.c"
+#line 10984 "Page.c"
 			{
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11014 "Page.c"
+#line 10988 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_;
 				gboolean _tmp19_;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 11026 "Page.c"
+#line 11000 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_;
 					ViewCollection* _tmp21_;
@@ -11041,99 +11015,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_;
 					Marker* _tmp35_;
 					Marker* _tmp36_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/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 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 11099 "Page.c"
+#line 11073 "Page.c"
 				}
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11103 "Page.c"
+#line 11077 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_;
 		ViewCollection* _tmp38_;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 11117 "Page.c"
+#line 11091 "Page.c"
 	}
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11137 "Page.c"
+#line 11111 "Page.c"
 }
 
 
@@ -11147,105 +11121,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_;
 	CheckerboardItem* _tmp12_;
 	CheckerboardItem* _tmp13_;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 11157 "Page.c"
+#line 11131 "Page.c"
 		CheckerboardLayout* _tmp1_;
 		CheckerboardItem* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
 		GdkModifierType _tmp5_;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 11175 "Page.c"
+#line 11149 "Page.c"
 	}
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11187 "Page.c"
+#line 11161 "Page.c"
 	}
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 11193 "Page.c"
+#line 11167 "Page.c"
 		CheckerboardItem* _tmp9_;
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 11203 "Page.c"
+#line 11177 "Page.c"
 	}
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11213 "Page.c"
+#line 11187 "Page.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11231 "Page.c"
+#line 11205 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 11240 "Page.c"
+#line 11214 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11249 "Page.c"
+#line 11223 "Page.c"
 }
 
 
@@ -11268,95 +11242,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_;
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11302 "Page.c"
+#line 11276 "Page.c"
 	}
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11314 "Page.c"
+#line 11288 "Page.c"
 	}
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11330 "Page.c"
+#line 11304 "Page.c"
 		GtkAdjustment* _tmp16_;
 		gint _tmp17_;
 		AdjustmentRelation _tmp18_;
-#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/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 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11342 "Page.c"
+#line 11316 "Page.c"
 	} else {
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11346 "Page.c"
+#line 11320 "Page.c"
 	}
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/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 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11354 "Page.c"
+#line 11328 "Page.c"
 	}
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11360 "Page.c"
+#line 11334 "Page.c"
 }
 
 
@@ -11393,91 +11367,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_;
 	ViewCollection* _tmp48_;
 	Marker* _tmp49_;
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11419 "Page.c"
+#line 11393 "Page.c"
 	}
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11481 "Page.c"
+#line 11455 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_;
@@ -11487,25 +11461,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_;
 		gint _tmp27_;
 		gint _item_index = 0;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11509 "Page.c"
+#line 11483 "Page.c"
 			gint _tmp28_;
 			gint _tmp29_;
 			gint _tmp30_;
@@ -11517,109 +11491,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_;
 			gboolean _tmp36_;
 			CheckerboardItem* _tmp41_;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11533 "Page.c"
+#line 11507 "Page.c"
 			}
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11551 "Page.c"
+#line 11525 "Page.c"
 				Marker* _tmp37_;
 				CheckerboardItem* _tmp38_;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11560 "Page.c"
+#line 11534 "Page.c"
 			} else {
 				Marker* _tmp39_;
 				CheckerboardItem* _tmp40_;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11570 "Page.c"
+#line 11544 "Page.c"
 			}
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11576 "Page.c"
+#line 11550 "Page.c"
 				CheckerboardItem* _tmp42_;
 				CheckerboardItem* _tmp43_;
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11587 "Page.c"
+#line 11561 "Page.c"
 			}
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11591 "Page.c"
+#line 11565 "Page.c"
 		}
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11595 "Page.c"
+#line 11569 "Page.c"
 	}
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11623 "Page.c"
+#line 11597 "Page.c"
 }
 
 
@@ -11651,77 +11625,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_;
 	gdouble _tmp29_;
 	gint _tmp30_;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11669 "Page.c"
+#line 11643 "Page.c"
 	}
-#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/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 1819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/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 1823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11701 "Page.c"
+#line 11675 "Page.c"
 		{
 			gint _tmp12_;
 			CheckerboardLayout* _tmp13_;
 			gint _tmp14_;
 			gint _tmp15_;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11721 "Page.c"
+#line 11695 "Page.c"
 		}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11725 "Page.c"
+#line 11699 "Page.c"
 		{
 			gint _tmp16_;
 			CheckerboardLayout* _tmp17_;
@@ -11729,78 +11703,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_;
 			GtkAdjustment* _tmp20_;
 			gdouble _tmp21_;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11751 "Page.c"
+#line 11725 "Page.c"
 		}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11755 "Page.c"
+#line 11729 "Page.c"
 		{
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11765 "Page.c"
+#line 11739 "Page.c"
 		}
 		default:
 		{
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11773 "Page.c"
+#line 11747 "Page.c"
 		}
 	}
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11804 "Page.c"
+#line 11778 "Page.c"
 }
 
 
@@ -11831,35 +11805,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_;
 	GtkAdjustment* _tmp53_;
 	gint _tmp54_;
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/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 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11863 "Page.c"
+#line 11837 "Page.c"
 		ViewCollection* _tmp7_;
 		ViewCollection* _tmp8_;
 		Marker* marker = NULL;
@@ -11871,67 +11845,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_;
 		ViewCollection* _tmp15_;
 		Marker* _tmp16_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/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 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11909 "Page.c"
+#line 11883 "Page.c"
 	}
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/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 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11935 "Page.c"
+#line 11909 "Page.c"
 		GtkAdjustment* _tmp27_;
 		CheckerboardItem* _tmp28_;
 		GdkRectangle _tmp29_;
@@ -11940,70 +11914,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_;
 		gint _tmp33_;
 		AdjustmentRelation _tmp34_;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11962 "Page.c"
+#line 11936 "Page.c"
 	} else {
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11966 "Page.c"
+#line 11940 "Page.c"
 	}
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11974 "Page.c"
+#line 11948 "Page.c"
 	}
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11990 "Page.c"
+#line 11964 "Page.c"
 		CheckerboardItem* _tmp40_;
 		GdkRectangle _tmp41_;
 		gint _tmp42_;
 		gint _tmp43_;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 12007 "Page.c"
+#line 11981 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_;
 		GdkRectangle _tmp45_;
@@ -12014,39 +11988,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_;
 		gdouble _tmp51_;
 		gint _tmp52_;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 12040 "Page.c"
+#line 12014 "Page.c"
 	}
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 12050 "Page.c"
+#line 12024 "Page.c"
 }
 
 
@@ -12065,171 +12039,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_;
 	CheckerboardItem* _tmp28_;
 	CheckerboardItem* _tmp29_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12085 "Page.c"
+#line 12059 "Page.c"
 	}
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 12091 "Page.c"
+#line 12065 "Page.c"
 		CheckerboardLayout* _tmp7_;
 		CheckerboardItem* _tmp8_;
 		CheckerboardItem* _tmp9_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 12105 "Page.c"
+#line 12079 "Page.c"
 	} else {
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 12109 "Page.c"
+#line 12083 "Page.c"
 	}
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 12115 "Page.c"
+#line 12089 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 12123 "Page.c"
+#line 12097 "Page.c"
 			ViewCollection* _tmp12_;
 			ViewCollection* _tmp13_;
 			CheckerboardItem* _tmp14_;
 			gboolean _tmp15_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/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 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 12140 "Page.c"
+#line 12114 "Page.c"
 		} else {
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 12144 "Page.c"
+#line 12118 "Page.c"
 		}
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 12148 "Page.c"
+#line 12122 "Page.c"
 	}
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12152 "Page.c"
+#line 12126 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_;
 		CheckerboardItem* _tmp17_;
 		CheckerboardItem* _tmp18_;
 		CheckerboardItem* _tmp19_;
 		CheckerboardItem* _tmp20_;
-#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12181 "Page.c"
+#line 12155 "Page.c"
 	}
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 12187 "Page.c"
+#line 12161 "Page.c"
 		CheckerboardLayout* _tmp22_;
 		CheckerboardItem* _tmp23_;
 		CheckerboardItem* _tmp24_;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 12201 "Page.c"
+#line 12175 "Page.c"
 		}
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 12207 "Page.c"
+#line 12181 "Page.c"
 	}
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 12223 "Page.c"
+#line 12197 "Page.c"
 		CheckerboardItem* _tmp30_;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 12229 "Page.c"
+#line 12203 "Page.c"
 	}
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 12233 "Page.c"
+#line 12207 "Page.c"
 }
 
 
@@ -12246,51 +12220,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_;
 	CheckerboardItem* _tmp9_;
 	CheckerboardItem* _tmp10_;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/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 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12294 "Page.c"
+#line 12268 "Page.c"
 }
 
 
@@ -12305,29 +12279,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_;
 	ViewCollection* _tmp29_;
 	Marker* _tmp30_;
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12331 "Page.c"
+#line 12305 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_;
@@ -12336,27 +12310,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_;
 		GeeIterator* _tmp8_;
 		GeeIterator* _tmp9_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12360 "Page.c"
+#line 12334 "Page.c"
 			GeeIterator* _tmp10_;
 			gboolean _tmp11_;
 			DataObject* object = NULL;
@@ -12373,125 +12347,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12385 "Page.c"
+#line 12359 "Page.c"
 			}
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12407 "Page.c"
+#line 12381 "Page.c"
 			}
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12417 "Page.c"
+#line 12391 "Page.c"
 			}
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12425 "Page.c"
+#line 12399 "Page.c"
 			} else {
 				gboolean _tmp22_;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12432 "Page.c"
+#line 12406 "Page.c"
 			}
-#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12436 "Page.c"
+#line 12410 "Page.c"
 				Marker* _tmp23_;
 				DataObject* _tmp24_;
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/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 12445 "Page.c"
+#line 12419 "Page.c"
 			}
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12451 "Page.c"
+#line 12425 "Page.c"
 				gboolean _tmp27_;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12457 "Page.c"
+#line 12431 "Page.c"
 			} else {
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12461 "Page.c"
+#line 12435 "Page.c"
 			}
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12471 "Page.c"
+#line 12445 "Page.c"
 			}
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12477 "Page.c"
+#line 12451 "Page.c"
 		}
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12481 "Page.c"
+#line 12455 "Page.c"
 	}
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12495 "Page.c"
+#line 12469 "Page.c"
 }
 
 
@@ -12499,65 +12473,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_;
 	guint _tmp3_;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12511 "Page.c"
+#line 12485 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_;
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12518 "Page.c"
+#line 12492 "Page.c"
 	}
-#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12524 "Page.c"
+#line 12498 "Page.c"
 	}
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12530 "Page.c"
+#line 12504 "Page.c"
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
 		CheckerboardItem* _tmp6_;
 		CheckerboardItem* _tmp7_;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12549 "Page.c"
+#line 12523 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_;
 		CheckerboardItem* _tmp9_;
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12561 "Page.c"
+#line 12535 "Page.c"
 	}
 }
 
@@ -12571,48 +12545,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/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 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12607 "Page.c"
+#line 12581 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12616 "Page.c"
+#line 12590 "Page.c"
 }
 
 
@@ -12625,48 +12599,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_;
 	ViewCollection* _tmp7_;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/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 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12661 "Page.c"
+#line 12635 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12670 "Page.c"
+#line 12644 "Page.c"
 }
 
 
@@ -12679,54 +12653,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_;
 	Page* _tmp6_;
 	gboolean _tmp7_;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12711 "Page.c"
+#line 12685 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12723 "Page.c"
+#line 12697 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12730 "Page.c"
+#line 12704 "Page.c"
 }
 
 
@@ -12742,113 +12716,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = (GtkMenu* (*) (CheckerboardPage *)) checkerboard_page_real_get_item_context_menu;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = (GtkMenu* (*) (Page *)) checkerboard_page_real_get_page_context_menu;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) checkerboard_page_real_on_context_keypress;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) checkerboard_page_real_get_view_empty_message;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) checkerboard_page_real_get_filter_no_match_message;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) checkerboard_page_real_on_item_activated;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) checkerboard_page_real_get_search_view_filter;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) checkerboard_page_real_get_view_tracker;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = (void (*) (Page *)) checkerboard_page_real_switching_from;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = (void (*) (Page *)) checkerboard_page_real_switched_to;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = (void (*) (Page *, const gchar*)) checkerboard_page_real_set_page_name;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) checkerboard_page_real_key_press_event;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_left_click;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_left_released;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = (gboolean (*) (Page *, GdkEventButton*)) checkerboard_page_real_on_right_click;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = (gboolean (*) (CheckerboardPage *, CheckerboardItem*, gint, gint, GdkModifierType)) checkerboard_page_real_on_mouse_over;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = (gboolean (*) (Page *, GdkEventMotion*, gint, gint, GdkModifierType)) checkerboard_page_real_on_motion;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = (void (*) (CheckerboardPage *, gboolean)) checkerboard_page_real_set_display_titles;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = (void (*) (CheckerboardPage *, gboolean)) checkerboard_page_real_set_display_comments;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12790 "Page.c"
+#line 12764 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12820 "Page.c"
+#line 12794 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject * obj) {
 	CheckerboardPage * self;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->item_context_menu);
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12852 "Page.c"
+#line 12826 "Page.c"
 }
 
 
@@ -12864,6 +12838,13 @@ GType checkerboard_page_get_type (void) {
 }
 
 
+static void _single_photo_page_on_colors_changed_config_facade_colors_changed (ConfigFacade* _sender, gpointer self) {
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+	single_photo_page_on_colors_changed ((SinglePhotoPage*) self);
+#line 12845 "Page.c"
+}
+
+
 GType single_photo_page_update_reason_get_type (void) {
 	static volatile gsize single_photo_page_update_reason_type_id__volatile = 0;
 	if (g_once_init_enter (&single_photo_page_update_reason_type_id__volatile)) {
@@ -12877,18 +12858,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 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12883 "Page.c"
+#line 12864 "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 2031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12892 "Page.c"
+#line 12873 "Page.c"
 }
 
 
@@ -12908,71 +12889,81 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_;
 	GtkDrawingArea* _tmp12_;
 	GtkDrawingArea* _tmp13_;
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+	ConfigFacade* _tmp14_;
+	ConfigFacade* _tmp15_;
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 2008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 2008 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/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 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/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 2019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2007 "/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 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/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 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/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 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2013 "/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 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/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 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/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 2031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/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 2033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/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 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp14_ = config_facade_get_instance ();
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp15_ = _tmp14_;
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+	g_signal_connect_object (_tmp15_, "colors-changed", (GCallback) _single_photo_page_on_colors_changed_config_facade_colors_changed, self, 0);
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (_tmp15_);
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12976 "Page.c"
+#line 12967 "Page.c"
 }
 
 
@@ -12980,38 +12971,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_;
 	gboolean _tmp1_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12994 "Page.c"
+#line 12985 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_;
 	gboolean _tmp1_;
-#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13009 "Page.c"
+#line 13000 "Page.c"
 		TransitionClock* _tmp2_;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 13015 "Page.c"
+#line 13006 "Page.c"
 	}
 }
 
@@ -13023,53 +13014,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_;
 	TransitionClock* _tmp4_;
 	gint _tmp8_;
-#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 13051 "Page.c"
+#line 13042 "Page.c"
 		TransitionEffectsManager* _tmp5_;
 		TransitionEffectsManager* _tmp6_;
 		TransitionClock* _tmp7_;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 13067 "Page.c"
+#line 13058 "Page.c"
 	}
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 13073 "Page.c"
+#line 13064 "Page.c"
 }
 
 
@@ -13100,87 +13091,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	GdkPixbuf* _tmp48_;
 	gint _tmp49_;
 	gint _tmp50_;
-	cairo_t* _tmp51_;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 13127 "Page.c"
+#line 13117 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_;
 		GdkPixbuf* _tmp15_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 13135 "Page.c"
+#line 13125 "Page.c"
 			ZoomBuffer* _tmp7_;
 			ZoomBuffer* _tmp8_;
 			ZoomState _tmp9_;
 			GdkPixbuf* _tmp10_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13154 "Page.c"
+#line 13144 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_;
 			ZoomBuffer* _tmp12_;
 			ZoomState _tmp13_;
 			GdkPixbuf* _tmp14_;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 13174 "Page.c"
+#line 13164 "Page.c"
 		}
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13184 "Page.c"
+#line 13174 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_;
@@ -13202,113 +13192,109 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_;
 		gint _tmp32_;
 		GdkPixbuf* _tmp33_;
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 13252 "Page.c"
+#line 13242 "Page.c"
 	}
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13262 "Page.c"
+#line 13252 "Page.c"
 	}
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
-	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp51_ = self->priv->pixmap_ctx;
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
-	cairo_paint (_tmp51_);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+	paint_pixmap_with_background (_tmp47_, _tmp48_, _tmp49_, _tmp50_);
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13312 "Page.c"
+#line 13298 "Page.c"
 }
 
 
@@ -13320,39 +13306,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_;
 	ZoomState _tmp4_;
 	GtkDrawingArea* _tmp5_;
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2080 "/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 2080 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13356 "Page.c"
+#line 13342 "Page.c"
 }
 
 
@@ -13364,230 +13350,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_;
 	ZoomState _tmp4_;
 	GtkDrawingArea* _tmp5_;
-#line 2103 "/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 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13400 "Page.c"
+#line 13386 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13410 "Page.c"
+#line 13396 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13419 "Page.c"
+#line 13405 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13429 "Page.c"
+#line 13415 "Page.c"
 		cairo_t* _tmp1_;
 		cairo_t* _tmp2_;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13440 "Page.c"
+#line 13426 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13450 "Page.c"
+#line 13436 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_;
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13462 "Page.c"
+#line 13448 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2128 "/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 2128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13471 "Page.c"
+#line 13457 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_;
 	ZoomState _tmp1_;
-#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13484 "Page.c"
+#line 13470 "Page.c"
 	}
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13494 "Page.c"
+#line 13480 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13503 "Page.c"
+#line 13489 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13513 "Page.c"
+#line 13499 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13522 "Page.c"
+#line 13508 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_;
-#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13536 "Page.c"
+#line 13522 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_;
 	ZoomState _tmp1_;
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13555 "Page.c"
+#line 13541 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_;
 	ZoomState _tmp1_;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13574 "Page.c"
+#line 13560 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_;
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2154 "/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 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13591 "Page.c"
+#line 13577 "Page.c"
 	}
 }
 
@@ -13596,21 +13582,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/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 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2166 "/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 13614 "Page.c"
+#line 13600 "Page.c"
 	}
 }
 
@@ -13627,92 +13613,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_;
 	GtkDrawingArea* _tmp9_;
 	Direction* _tmp10_;
-#line 2182 "/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 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13681 "Page.c"
+#line 13667 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_;
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13709 "Page.c"
+#line 13695 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13716 "Page.c"
+#line 13702 "Page.c"
 }
 
 
@@ -13720,38 +13706,38 @@ cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_;
 	cairo_surface_t* _tmp1_;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13734 "Page.c"
+#line 13720 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_;
-#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13748 "Page.c"
+#line 13734 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13755 "Page.c"
+#line 13741 "Page.c"
 }
 
 
@@ -13759,17 +13745,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
-#line 2221 "/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 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13773 "Page.c"
+#line 13759 "Page.c"
 }
 
 
@@ -13779,25 +13765,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_;
 	cairo_t* _tmp3_;
 	PangoLayout* _tmp4_;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13801 "Page.c"
+#line 13787 "Page.c"
 }
 
 
@@ -13806,55 +13792,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_;
 	GtkWindow* _tmp2_;
 	gboolean _tmp3_;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13822 "Page.c"
+#line 13808 "Page.c"
 		GtkWindow* _tmp4_;
 		GtkWindow* _tmp5_;
 		gboolean _tmp6_;
 		Scaling _tmp7_ = {0};
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13839 "Page.c"
+#line 13825 "Page.c"
 	} else {
 		GtkViewport* _tmp8_;
 		gboolean _tmp9_;
 		Scaling _tmp10_ = {0};
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13852 "Page.c"
+#line 13838 "Page.c"
 	}
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13858 "Page.c"
+#line 13844 "Page.c"
 }
 
 
@@ -13862,17 +13848,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13876 "Page.c"
+#line 13862 "Page.c"
 }
 
 
@@ -13880,31 +13866,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
-#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13894 "Page.c"
+#line 13880 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_;
-#line 2244 "/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 2245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13908 "Page.c"
+#line 13894 "Page.c"
 }
 
 
@@ -13914,50 +13900,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_;
 	GdkRectangle _tmp2_;
 	gboolean _tmp3_;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13932 "Page.c"
+#line 13918 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_;
 	GdkWindow* _tmp1_;
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13949 "Page.c"
+#line 13935 "Page.c"
 		GtkDrawingArea* _tmp2_;
 		GdkWindow* _tmp3_;
 		GdkRectangle _tmp4_;
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13961 "Page.c"
+#line 13947 "Page.c"
 	}
 }
 
@@ -13965,51 +13951,51 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 void single_photo_page_invalidate_all (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_;
 	GdkWindow* _tmp1_;
-#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13977 "Page.c"
+#line 13963 "Page.c"
 		GtkDrawingArea* _tmp2_;
 		GdkWindow* _tmp3_;
-#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13986 "Page.c"
+#line 13972 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13996 "Page.c"
+#line 13982 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_;
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/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 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 14013 "Page.c"
+#line 13999 "Page.c"
 }
 
 
@@ -14020,114 +14006,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_;
 	gint _tmp6_;
 	cairo_t* _tmp7_;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 14032 "Page.c"
+#line 14018 "Page.c"
 		cairo_t* _tmp1_;
 		cairo_surface_t* _tmp2_;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 14041 "Page.c"
+#line 14027 "Page.c"
 	} else {
 		cairo_t* _tmp3_;
-#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 14048 "Page.c"
+#line 14034 "Page.c"
 	}
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/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 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/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 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14066 "Page.c"
+#line 14052 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 14075 "Page.c"
+#line 14061 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/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 2279 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 14084 "Page.c"
+#line 14070 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 14093 "Page.c"
+#line 14079 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 14102 "Page.c"
+#line 14088 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 14117 "Page.c"
+#line 14103 "Page.c"
 		gboolean _tmp2_;
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 14123 "Page.c"
+#line 14109 "Page.c"
 	} else {
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 14127 "Page.c"
+#line 14113 "Page.c"
 	}
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 14131 "Page.c"
+#line 14117 "Page.c"
 		cairo_t* _tmp3_;
 		cairo_t* _tmp4_;
 		Dimensions _tmp5_;
@@ -14136,31 +14122,31 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		gint _tmp8_;
 		cairo_t* _tmp9_;
 		ZoomState _tmp10_;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 14164 "Page.c"
+#line 14150 "Page.c"
 	} else {
 		TransitionClock* _tmp11_;
 		cairo_t* _tmp12_;
@@ -14169,23 +14155,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_;
 		gint _tmp16_;
 		gboolean _tmp17_;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 14189 "Page.c"
+#line 14175 "Page.c"
 			cairo_t* _tmp18_;
 			cairo_t* _tmp19_;
 			Dimensions _tmp20_;
@@ -14199,57 +14185,52 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 			gint _tmp28_;
 			GdkRectangle _tmp29_;
 			gint _tmp30_;
-			cairo_t* _tmp31_;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
-			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp31_ = ctx;
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
-			cairo_paint (_tmp31_);
-#line 14242 "Page.c"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
+			paint_pixmap_with_background (_tmp25_, _tmp26_, _tmp28_, _tmp30_);
+#line 14223 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 14253 "Page.c"
+#line 14234 "Page.c"
 }
 
 
@@ -14257,44 +14238,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
 	Dimensions _tmp2_;
-#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14269 "Page.c"
+#line 14250 "Page.c"
 	}
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14279 "Page.c"
+#line 14260 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14291 "Page.c"
+#line 14272 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14298 "Page.c"
+#line 14279 "Page.c"
 }
 
 
@@ -14337,171 +14318,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_;
 	TransitionClock* _tmp98_;
 	gboolean _tmp99_;
-#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14357 "Page.c"
+#line 14338 "Page.c"
 	}
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14365 "Page.c"
+#line 14346 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_;
 		GdkWindow* _tmp4_;
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14375 "Page.c"
+#line 14356 "Page.c"
 	}
-#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14381 "Page.c"
+#line 14362 "Page.c"
 	}
-#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14407 "Page.c"
+#line 14388 "Page.c"
 	} else {
 		gint _tmp13_;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14414 "Page.c"
+#line 14395 "Page.c"
 	}
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14420 "Page.c"
+#line 14401 "Page.c"
 	}
-#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14446 "Page.c"
+#line 14427 "Page.c"
 	} else {
 		Dimensions _tmp22_;
 		gint _tmp23_;
 		gint _tmp24_;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14459 "Page.c"
+#line 14440 "Page.c"
 	}
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14467 "Page.c"
+#line 14448 "Page.c"
 	}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14475 "Page.c"
+#line 14456 "Page.c"
 		gint _tmp26_;
 		gint _tmp27_;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14486 "Page.c"
+#line 14467 "Page.c"
 	}
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14494 "Page.c"
+#line 14475 "Page.c"
 	} else {
 		gboolean _tmp30_;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14501 "Page.c"
+#line 14482 "Page.c"
 	}
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14505 "Page.c"
+#line 14486 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_;
 		Dimensions _tmp32_ = {0};
@@ -14526,155 +14507,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_;
 		Dimensions _tmp61_;
 		gint _tmp62_;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14542 "Page.c"
+#line 14523 "Page.c"
 			gboolean _tmp37_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14548 "Page.c"
+#line 14529 "Page.c"
 		} else {
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14552 "Page.c"
+#line 14533 "Page.c"
 		}
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14556 "Page.c"
+#line 14537 "Page.c"
 			Dimensions _tmp38_;
 			gint _tmp39_;
 			gint _tmp40_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14568 "Page.c"
+#line 14549 "Page.c"
 		} else {
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14572 "Page.c"
+#line 14553 "Page.c"
 		}
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14576 "Page.c"
+#line 14557 "Page.c"
 			Dimensions _tmp41_;
 			gint _tmp42_;
 			gint _tmp43_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14588 "Page.c"
+#line 14569 "Page.c"
 		} else {
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14592 "Page.c"
+#line 14573 "Page.c"
 		}
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14596 "Page.c"
+#line 14577 "Page.c"
 			Dimensions _tmp44_;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14602 "Page.c"
+#line 14583 "Page.c"
 		} else {
 			Dimensions _tmp45_;
 			Dimensions _tmp46_ = {0};
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14612 "Page.c"
+#line 14593 "Page.c"
 		}
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14658 "Page.c"
+#line 14639 "Page.c"
 	}
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14666 "Page.c"
+#line 14647 "Page.c"
 	} else {
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14670 "Page.c"
+#line 14651 "Page.c"
 	}
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14678 "Page.c"
+#line 14659 "Page.c"
 		GdkPixbuf* _tmp66_;
 		GdkRectangle _tmp67_;
 		Dimensions _tmp68_ = {0};
@@ -14689,101 +14670,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_;
 		SinglePhotoPageUpdateReason _tmp80_;
 		Dimensions _tmp81_;
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14715 "Page.c"
+#line 14696 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14723 "Page.c"
+#line 14704 "Page.c"
 				GdkInterpType _tmp74_;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14729 "Page.c"
+#line 14710 "Page.c"
 			} else {
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14733 "Page.c"
+#line 14714 "Page.c"
 			}
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14739 "Page.c"
+#line 14720 "Page.c"
 			}
 		}
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14760 "Page.c"
+#line 14741 "Page.c"
 	}
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14770 "Page.c"
+#line 14751 "Page.c"
 		TransitionClock* _tmp85_;
 		gboolean _tmp86_;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14779 "Page.c"
+#line 14760 "Page.c"
 	} else {
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14783 "Page.c"
+#line 14764 "Page.c"
 	}
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14787 "Page.c"
+#line 14768 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_;
 		GdkRectangle _tmp88_;
@@ -14796,45 +14777,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_;
 		SpitTransitionsDirection _tmp96_;
 		gint _tmp97_;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/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 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14828 "Page.c"
+#line 14809 "Page.c"
 	}
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14838 "Page.c"
+#line 14819 "Page.c"
 	}
 }
 
@@ -14855,65 +14836,65 @@ static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gi
 	cairo_t* _tmp12_;
 	cairo_t* _tmp13_;
 	Dimensions _tmp14_;
-#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14917 "Page.c"
+#line 14898 "Page.c"
 }
 
 
@@ -14924,23 +14905,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14944 "Page.c"
+#line 14925 "Page.c"
 }
 
 
@@ -14949,11 +14930,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14957 "Page.c"
+#line 14938 "Page.c"
 }
 
 
@@ -14962,11 +14943,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14970 "Page.c"
+#line 14951 "Page.c"
 }
 
 
@@ -14983,266 +14964,290 @@ static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp5_;
 	const gchar* _tmp6_;
 	GQuark _tmp8_ = 0U;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14999 "Page.c"
+#line 14980 "Page.c"
 	gboolean _tmp15_;
 	gboolean _tmp16_ = FALSE;
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/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 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15030 "Page.c"
+#line 15011 "Page.c"
 			default:
 			{
 				gboolean _tmp9_;
-#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 15038 "Page.c"
+#line 15019 "Page.c"
 					GdkEventKey* _tmp10_;
 					guint32 _tmp11_;
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2454 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 15049 "Page.c"
+#line 15030 "Page.c"
 				}
-#line 2467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15053 "Page.c"
+#line 15034 "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 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15059 "Page.c"
+#line 15040 "Page.c"
 			default:
 			{
 				gboolean _tmp12_;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 15067 "Page.c"
+#line 15048 "Page.c"
 					GdkEventKey* _tmp13_;
 					guint32 _tmp14_;
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 15078 "Page.c"
+#line 15059 "Page.c"
 				}
-#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15082 "Page.c"
+#line 15063 "Page.c"
 			}
 		}
 	} else {
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 15088 "Page.c"
+#line 15069 "Page.c"
 			default:
 			{
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2470 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 15095 "Page.c"
+#line 15076 "Page.c"
 			}
 		}
 	}
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 15107 "Page.c"
+#line 15088 "Page.c"
 	}
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 15111 "Page.c"
+#line 15092 "Page.c"
 		GdkEventKey* _tmp17_;
 		gboolean _tmp18_;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/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 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 15120 "Page.c"
+#line 15101 "Page.c"
 	} else {
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 15124 "Page.c"
+#line 15105 "Page.c"
 	}
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15130 "Page.c"
+#line 15111 "Page.c"
+}
+
+
+static void single_photo_page_on_colors_changed (SinglePhotoPage* self) {
+#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
+#line 2480 "/home/jens/Source/shotwell/src/Page.vala"
+	invalidate_transparent_background ();
+#line 2481 "/home/jens/Source/shotwell/src/Page.vala"
+	single_photo_page_repaint (self, NULL);
+#line 15122 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*) (SinglePhotoPage *)) single_photo_page_real_is_zoom_supported;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*) (SinglePhotoPage *)) single_photo_page_real_cancel_zoom;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*) (SinglePhotoPage *)) single_photo_page_real_save_zoom_state;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*) (SinglePhotoPage *)) single_photo_page_real_restore_zoom_state;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*) (SinglePhotoPage *)) single_photo_page_real_get_zoom_buffer;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = (void (*) (Page *)) single_photo_page_real_switched_to;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = (void (*) (Page *, GtkWindow*)) single_photo_page_real_set_container;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = (void (*) (Page *, GdkRectangle*)) single_photo_page_real_on_resize_finished;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) single_photo_page_real_new_surface;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*) (SinglePhotoPage *, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) single_photo_page_real_updated_pixbuf;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) single_photo_page_real_paint;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) single_photo_page_real_on_context_keypress;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) single_photo_page_real_on_previous_photo;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) single_photo_page_real_on_next_photo;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) single_photo_page_real_key_press_event;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 15171 "Page.c"
+#line 15163 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_;
 	GtkViewport* _tmp1_;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 2005 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 15218 "Page.c"
+#line 15210 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject * obj) {
 	SinglePhotoPage * self;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	guint _tmp2_;
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = _tmp0_;
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+	g_signal_parse_name ("colors-changed", CONFIG_TYPE_FACADE, &_tmp2_, NULL, FALSE);
+#line 2026 "/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) _single_photo_page_on_colors_changed_config_facade_colors_changed, self);
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (_tmp1_);
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 15246 "Page.c"
+#line 15251 "Page.c"
 }
 
 
@@ -15259,32 +15264,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 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15265 "Page.c"
+#line 15270 "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 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15272 "Page.c"
+#line 15277 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2542 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15279 "Page.c"
+#line 15284 "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 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15288 "Page.c"
+#line 15293 "Page.c"
 }
 
 
@@ -15302,20 +15307,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15312 "Page.c"
+#line 15317 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15319 "Page.c"
+#line 15324 "Page.c"
 }
 
 
@@ -15336,117 +15341,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_;
 	GtkWidget* _tmp18_;
 	GtkWidget* _tmp19_;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15370 "Page.c"
+#line 15375 "Page.c"
 		GdkAtom _tmp7_;
 		GdkAtom* _tmp8_;
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15381 "Page.c"
+#line 15386 "Page.c"
 	}
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15387 "Page.c"
+#line 15392 "Page.c"
 		GdkAtom _tmp10_;
 		GdkAtom* _tmp11_;
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15398 "Page.c"
+#line 15403 "Page.c"
 	}
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15406 "Page.c"
+#line 15411 "Page.c"
 		gint _tmp13_;
 		guchar* _tmp14_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/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 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15419 "Page.c"
+#line 15424 "Page.c"
 	}
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/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 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2532 "/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 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2533 "/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 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/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 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/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 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15443 "Page.c"
+#line 15448 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15450 "Page.c"
+#line 15455 "Page.c"
 }
 
 
@@ -15472,119 +15477,119 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 	guint8* _tmp31_;
 	gint _tmp31__length1;
 	GError * _inner_error_ = NULL;
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2556: on_drag_begin (%s)", _tmp2_);
-#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2551: on_drag_begin (%s)", _tmp2_);
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15496 "Page.c"
+#line 15501 "Page.c"
 	} else {
 		Page* _tmp6_;
 		ViewCollection* _tmp7_;
 		ViewCollection* _tmp8_;
 		gint _tmp9_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15514 "Page.c"
+#line 15519 "Page.c"
 	}
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15520 "Page.c"
+#line 15525 "Page.c"
 	} else {
 		ExporterUI* _tmp10_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15527 "Page.c"
+#line 15532 "Page.c"
 	}
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15533 "Page.c"
+#line 15538 "Page.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15559 "Page.c"
+#line 15564 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_;
 		GdkPixbuf* _tmp19_;
 		GtkWidget* _tmp20_;
 		GdkPixbuf* _tmp21_;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15574 "Page.c"
-			goto __catch256_g_error;
+#line 15579 "Page.c"
+			goto __catch267_g_error;
 		}
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15585 "Page.c"
+#line 15590 "Page.c"
 	}
-	goto __finally256;
-	__catch256_g_error:
+	goto __finally267;
+	__catch267_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_;
@@ -15592,58 +15597,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_;
 		GError* _tmp25_;
 		const gchar* _tmp26_;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2570: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2565: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15616 "Page.c"
+#line 15621 "Page.c"
 	}
-	__finally256:
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally267:
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/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 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15629 "Page.c"
+#line 15634 "Page.c"
 	}
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15647 "Page.c"
+#line 15652 "Page.c"
 }
 
 
@@ -15654,61 +15659,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_;
 	guint _tmp9_;
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2586: on_drag_data_get (%s)", _tmp2_);
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2581: on_drag_data_get (%s)", _tmp2_);
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15680 "Page.c"
+#line 15685 "Page.c"
 	} else {
 		Page* _tmp5_;
 		ViewCollection* _tmp6_;
 		ViewCollection* _tmp7_;
 		gint _tmp8_;
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15698 "Page.c"
+#line 15703 "Page.c"
 	}
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15704 "Page.c"
+#line 15709 "Page.c"
 	}
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15712 "Page.c"
+#line 15717 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_;
@@ -15744,83 +15749,83 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp45_;
 			guchar* _tmp46_;
 			gint _tmp46__length1;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/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 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15790 "Page.c"
+#line 15795 "Page.c"
 				guchar* _tmp24_;
 				gint _tmp24__length1;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15799 "Page.c"
+#line 15804 "Page.c"
 			} else {
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15803 "Page.c"
+#line 15808 "Page.c"
 			}
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15807 "Page.c"
+#line 15812 "Page.c"
 				guchar* _tmp25_;
 				gint _tmp25__length1;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15816 "Page.c"
+#line 15821 "Page.c"
 			} else {
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15820 "Page.c"
+#line 15825 "Page.c"
 			}
-#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15824 "Page.c"
+#line 15829 "Page.c"
 				guchar* _tmp26_;
 				gint _tmp26__length1;
 				gchar* _tmp27_;
@@ -15828,103 +15833,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_;
 				GFile* _tmp30_;
 				GFile* _tmp31_;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15854 "Page.c"
+#line 15859 "Page.c"
 			}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15860 "Page.c"
+#line 15865 "Page.c"
 				GFile* _tmp34_;
 				gchar* _tmp35_;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15871 "Page.c"
+#line 15876 "Page.c"
 			} else {
 				gchar* _tmp36_;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15880 "Page.c"
+#line 15885 "Page.c"
 			}
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2605: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2600: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15898 "Page.c"
+#line 15903 "Page.c"
 			} else {
-#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15902 "Page.c"
+#line 15907 "Page.c"
 			}
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15924 "Page.c"
+#line 15929 "Page.c"
 		}
-#line 2591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15928 "Page.c"
+#line 15933 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_;
@@ -15939,41 +15944,41 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp56_;
 			guchar* _tmp57_;
 			gint _tmp57__length1;
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15977 "Page.c"
+#line 15982 "Page.c"
 		}
 		default:
 		{
@@ -15981,30 +15986,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_;
 			gchar* _tmp60_;
 			guint _tmp61_;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2624: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2619: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2619 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15999 "Page.c"
+#line 16004 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 16008 "Page.c"
+#line 16013 "Page.c"
 }
 
 
@@ -16023,99 +16028,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_;
 	gchar* _tmp18_;
 	gboolean _tmp19_;
-#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2631: on_drag_end (%s)", _tmp2_);
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2626: on_drag_end (%s)", _tmp2_);
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 16045 "Page.c"
+#line 16050 "Page.c"
 	} else {
 		Page* _tmp7_;
 		ViewCollection* _tmp8_;
 		ViewCollection* _tmp9_;
 		gint _tmp10_;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 16063 "Page.c"
+#line 16068 "Page.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 16069 "Page.c"
+#line 16074 "Page.c"
 	} else {
 		GFile* _tmp11_;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 16076 "Page.c"
+#line 16081 "Page.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 16082 "Page.c"
+#line 16087 "Page.c"
 	} else {
 		ExporterUI* _tmp12_;
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 16089 "Page.c"
+#line 16094 "Page.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 16095 "Page.c"
+#line 16100 "Page.c"
 	}
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2638: Exporting to %s", _tmp15_);
-#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2633: Exporting to %s", _tmp15_);
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 16119 "Page.c"
+#line 16124 "Page.c"
 		Page* _tmp20_;
 		ViewCollection* _tmp21_;
 		ViewCollection* _tmp22_;
@@ -16128,53 +16133,53 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_;
 		ExporterUI* _tmp30_;
 		ExporterUI* _tmp31_;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 16168 "Page.c"
+#line 16173 "Page.c"
 	} else {
-#line 2649 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_ ("Photos cannot be exported to this directory."), NULL);
-#line 16172 "Page.c"
+#line 16177 "Page.c"
 	}
-#line 2652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 16178 "Page.c"
+#line 16183 "Page.c"
 }
 
 
@@ -16185,271 +16190,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_;
 	GtkDragResult _tmp3_;
 	Page* _tmp4_;
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2656: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2651: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 16213 "Page.c"
+#line 16218 "Page.c"
 	}
-#line 2661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 16223 "Page.c"
+#line 16228 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 16234 "Page.c"
+#line 16239 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 16241 "Page.c"
+#line 16246 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 16250 "Page.c"
+#line 16255 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 16260 "Page.c"
+#line 16265 "Page.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16264 "Page.c"
+#line 16269 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16272 "Page.c"
+#line 16277 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16279 "Page.c"
+#line 16284 "Page.c"
 		DragAndDropHandler * object;
 		object = collect_values[0].v_pointer;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16286 "Page.c"
+#line 16291 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 16290 "Page.c"
+#line 16295 "Page.c"
 		}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16294 "Page.c"
+#line 16299 "Page.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16298 "Page.c"
+#line 16303 "Page.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16302 "Page.c"
+#line 16307 "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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16313 "Page.c"
+#line 16318 "Page.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16319 "Page.c"
+#line 16324 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16323 "Page.c"
+#line 16328 "Page.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16327 "Page.c"
+#line 16332 "Page.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16331 "Page.c"
+#line 16336 "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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16345 "Page.c"
+#line 16350 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16354 "Page.c"
+#line 16359 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler * old;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16374 "Page.c"
+#line 16379 "Page.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16378 "Page.c"
+#line 16383 "Page.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16384 "Page.c"
+#line 16389 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler * old;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/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 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16403 "Page.c"
+#line 16408 "Page.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16407 "Page.c"
+#line 16412 "Page.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16413 "Page.c"
+#line 16418 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16425 "Page.c"
+#line 16430 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16438 "Page.c"
+#line 16443 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16453 "Page.c"
+#line 16458 "Page.c"
 		GtkWidget* _tmp1_;
 		guint _tmp2_;
 		GtkWidget* _tmp3_;
@@ -16458,45 +16463,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler * obj) {
 		guint _tmp6_;
 		GtkWidget* _tmp7_;
 		guint _tmp8_;
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/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 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2541 "/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 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2542 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2542 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2542 "/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 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/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 16486 "Page.c"
+#line 16491 "Page.c"
 	}
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16500 "Page.c"
+#line 16505 "Page.c"
 }
 
 
@@ -16517,24 +16522,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler * self;
 	self = instance;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16525 "Page.c"
+#line 16530 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler * self;
 	self = instance;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16538 "Page.c"
+#line 16543 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 88fecc7..ea8606e 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -328,18 +328,6 @@ public abstract class Page : Gtk.ScrolledWindow {
             action.set_enabled (sensitive);
     }
     
-    public void set_action_important(string name, bool important) {
-        set_action_sensitive (name, important);
-    }
-    
-    public void set_action_visible(string name, bool visible) {
-        set_action_sensitive (name, visible);
-    }
-    
-    public void set_action_short_label(string name, string short_label) {
-        debug ("=> Set action short_label called for %s", name);
-    }
-    
     public void set_action_details(string name, string? label, string? tooltip, bool sensitive) {
         GLib.SimpleAction? action = get_action(name) as GLib.SimpleAction;
 
@@ -2031,6 +2019,11 @@ public abstract class SinglePhotoPage : Page {
         canvas.draw.connect(on_canvas_exposed);
         
         set_event_source(canvas);
+        Config.Facade.get_instance().colors_changed.connect(on_colors_changed);
+    }
+
+    ~SinglePhotoPage() {
+        Config.Facade.get_instance().colors_changed.disconnect(on_colors_changed);
     }
     
     public bool is_transition_in_progress() {
@@ -2081,9 +2074,7 @@ public abstract class SinglePhotoPage : Page {
 
         int draw_y = (pixmap_dim.height - view_rect.height) / 2;
         draw_y = draw_y.clamp(0, int.MAX);
-        
-        Gdk.cairo_set_source_pixbuf(pixmap_ctx, zoomed, draw_x, draw_y);
-        pixmap_ctx.paint();
+        paint_pixmap_with_background(pixmap_ctx, zoomed, draw_x, draw_y);
     }
 
     protected void on_interactive_zoom(ZoomState interactive_zoom_state) {
@@ -2270,7 +2261,7 @@ public abstract class SinglePhotoPage : Page {
         // when the resize is completed, do a high-quality repaint
         repaint();
     }
-    
+
     private bool on_canvas_exposed(Cairo.Context exposed_ctx) {
         // draw pixmap onto canvas unless it's not been instantiated, in which case draw black
         // (so either old image or contents of another page is not left on screen)
@@ -2290,7 +2281,7 @@ public abstract class SinglePhotoPage : Page {
     
     protected virtual void updated_pixbuf(Gdk.Pixbuf pixbuf, UpdateReason reason, Dimensions old_dim) {
     }
-    
+
     protected virtual void paint(Cairo.Context ctx, Dimensions ctx_dim) {
         if (is_zoom_supported() && (!static_zoom_state.is_default())) {
             set_source_color_from_string(ctx, "#000");
@@ -2301,12 +2292,11 @@ public abstract class SinglePhotoPage : Page {
         } else if (!transition_clock.paint(ctx, ctx_dim.width, ctx_dim.height)) {
             // transition is not running, so paint the full image on a black background
             set_source_color_from_string(ctx, "#000");
-            
+
             ctx.rectangle(0, 0, pixmap_dim.width, pixmap_dim.height);
             ctx.fill();
-            
-            Gdk.cairo_set_source_pixbuf(ctx, scaled, scaled_pos.x, scaled_pos.y);
-            ctx.paint();
+
+            paint_pixmap_with_background(ctx, scaled, scaled_pos.x, scaled_pos.y);
         }
     }
     
@@ -2485,6 +2475,11 @@ public abstract class SinglePhotoPage : Page {
         
         return (base.key_press_event != null) ? base.key_press_event(event) : true;
     }
+
+    private void on_colors_changed() {
+        invalidate_transparent_background();
+        repaint();
+    }
 }
 
 //
@@ -2667,5 +2662,4 @@ public class DragAndDropHandler {
         exporter = null;
     }
 
-
 }
diff --git a/src/Photo.c b/src/Photo.c
index 1704070..c802450 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -22,6 +22,7 @@
 #include <gee.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <time.h>
+#include "shotwell-graphics-processor.h"
 #include <glib/gstdio.h>
 #include <float.h>
 #include <math.h>
@@ -291,26 +292,6 @@ typedef struct _BackingPhotoRowClass BackingPhotoRowClass;
 typedef struct _PhotoBackingReaders PhotoBackingReaders;
 typedef struct _PhotoBackingReadersClass PhotoBackingReadersClass;
 
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
-
 #define TYPE_ONE_SHOT_SCHEDULER (one_shot_scheduler_get_type ())
 #define ONE_SHOT_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler))
 #define ONE_SHOT_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerClass))
@@ -344,16 +325,6 @@ typedef struct _PhotoID PhotoID;
 
 #define TYPE_ORIENTATION (orientation_get_type ())
 
-#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
-#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
-#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
-#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
-#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-
-typedef struct _KeyValueMap KeyValueMap;
-typedef struct _KeyValueMapClass KeyValueMapClass;
-
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
 typedef struct _BackingPhotoID BackingPhotoID;
 typedef struct _BackingPhotoRowPrivate BackingPhotoRowPrivate;
@@ -469,6 +440,7 @@ typedef struct _PhotoFileWriterClass PhotoFileWriterClass;
 
 typedef struct _PhotoFileMetadataWriter PhotoFileMetadataWriter;
 typedef struct _PhotoFileMetadataWriterClass PhotoFileMetadataWriterClass;
+#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL)))
 
 #define TYPE_EXPORT_FORMAT_PARAMETERS (export_format_parameters_get_type ())
 
@@ -586,18 +558,6 @@ typedef struct _LibraryPhotoClass LibraryPhotoClass;
 #define TYPE_BOX (box_get_type ())
 typedef struct _Box Box;
 #define _key_value_map_unref0(var) ((var == NULL) ? NULL : (var = (key_value_map_unref (var), NULL)))
-
-#define TYPE_PIXEL_TRANSFORMATION_TYPE (pixel_transformation_type_get_type ())
-
-#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
-#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
-#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
-#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
-#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-
-typedef struct _PixelTransformation PixelTransformation;
-typedef struct _PixelTransformationClass PixelTransformationClass;
 #define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
 
 #define PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL (photo_photo_transformation_state_impl_get_type ())
@@ -1445,17 +1405,6 @@ struct _Box {
 	gint bottom;
 };
 
-typedef enum  {
-	PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION,
-	PIXEL_TRANSFORMATION_TYPE_SHADOWS,
-	PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS,
-	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
-	PIXEL_TRANSFORMATION_TYPE_TINT,
-	PIXEL_TRANSFORMATION_TYPE_SATURATION,
-	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
-	PIXEL_TRANSFORMATION_TYPE_CONTRAST
-} PixelTransformationType;
-
 struct _EditingToolsRedeyeInstance {
 	GdkPoint center;
 	gint radius;
@@ -1925,20 +1874,6 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) G
 static void photo_value_take_backing_readers (GValue* value, gpointer v_object) G_GNUC_UNUSED;
 static gpointer photo_value_get_backing_readers (const GValue* value) G_GNUC_UNUSED;
 static GType photo_backing_readers_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
 gpointer one_shot_scheduler_ref (gpointer instance);
 void one_shot_scheduler_unref (gpointer instance);
 GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1978,13 +1913,6 @@ GType photo_id_get_type (void) G_GNUC_CONST;
 PhotoID* photo_id_dup (const PhotoID* self);
 void photo_id_free (PhotoID* self);
 GType orientation_get_type (void) G_GNUC_CONST;
-gpointer key_value_map_ref (gpointer instance);
-void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
-gpointer value_get_key_value_map (const GValue* value);
-GType key_value_map_get_type (void) G_GNUC_CONST;
 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);
@@ -2056,7 +1984,7 @@ gpointer value_get_photo_preview (const GValue* value);
 GType photo_preview_get_type (void) G_GNUC_CONST;
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
 void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result);
-void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
+void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error);
 void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, BackingPhotoRow* bpr, GError** error);
 void data_object_notify_altered (DataObject* self, Alteration* alteration);
 Alteration* alteration_new (const gchar* subject, const gchar* detail);
@@ -2085,7 +2013,7 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator*
 Orientation photo_metadata_get_orientation (PhotoMetadata* self);
 void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, GError** error);
 void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDeveloper rd, BackingPhotoID* backing_photo_id, GError** error);
-static void photo_develop_photo (Photo* self, RawDeveloper d);
+static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify);
 BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error);
 GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rotate, GError** error);
 void scaling_for_original (Scaling* result);
@@ -2097,9 +2025,11 @@ void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQual
 GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST;
 PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error);
 void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error);
+GBytes* photo_preview_flatten (PhotoPreview* self, GError** error);
+gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error);
 GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error);
 void photo_set_default_raw_developer (Photo* self, RawDeveloper d);
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
 void photo_revert_to_master (Photo* self, gboolean notify);
 GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error);
 gboolean photo_set_orientation (Photo* self, Orientation orientation);
@@ -2111,12 +2041,12 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d);
 static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1);
 BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5);
 BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5);
-static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 gboolean photo_has_editable (Photo* self);
-static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 gboolean photo_is_developed (Photo* self);
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
-static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value);
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode);
 static PhotoFileReader* photo_get_master_reader (Photo* self);
 static PhotoFileReader* photo_get_baseline_reader (Photo* self);
@@ -2184,12 +2114,12 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_master_state (const GValue* value);
 GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
 gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error);
-static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -2198,8 +2128,8 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
 void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error);
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from);
-static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value);
 Alteration* alteration_new_from_array (gchar** array, int array_length1);
 Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1);
 static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow* * backing, DetectedPhotoInformation* * detected, GError** error);
@@ -2278,15 +2208,15 @@ static GFile* photo_real_get_file (MediaSource* base);
 void photo_set_master_file (Photo* self, GFile* file);
 void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error);
 void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
-static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value);
-void photo_set_editable_file (Photo* self, GFile* file);
-void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
 static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value);
+void photo_set_editable_file (Photo* self, GFile* file);
+void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value);
 void photo_set_many_editable_file (GeeMap* map, GError** error);
 GFile* photo_get_actual_file (Photo* self);
 static GFile* photo_real_get_master_file (MediaSource* base);
@@ -2371,35 +2301,14 @@ void box_free (Box* self);
 gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions);
 void box_get_dimensions (Box *self, Dimensions* result);
 static void photo_locked_create_adjustments_from_data (Photo* self);
-PixelTransformationBundle* pixel_transformation_bundle_new (void);
-PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type);
 static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name);
-void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self);
-void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store);
-PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
-PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
 PixelTransformer* photo_get_pixel_transformer (Photo* self);
-PixelTransformer* pixel_transformer_copy (PixelTransformer* self);
 gboolean photo_has_color_adjustments (Photo* self);
 static gboolean photo_has_transformation (Photo* self, const gchar* name);
-GType pixel_transformation_type_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_ref (gpointer instance);
-void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation (const GValue* value);
-GType pixel_transformation_get_type (void) G_GNUC_CONST;
 PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformationType type);
-PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type);
 void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments);
-gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self);
 static gboolean photo_remove_transformation (Photo* self, const gchar* name);
-KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group);
-GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
-void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
-PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self);
 static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans);
 static PhotoMetadata* photo_real_get_metadata (PhotoSource* base);
 PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error);
@@ -2431,30 +2340,20 @@ gboolean photo_check_can_rotate (Photo* self);
 void photo_rotate (Photo* self, Rotation rotation);
 static void photo_real_rotate (Photo* self, Rotation rotation);
 Orientation orientation_perform (Orientation self, Rotation rotation);
-KeyValueMap* key_value_map_copy (KeyValueMap* self);
-gchar* key_value_map_get_group (KeyValueMap* self);
 gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map);
 gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object);
 gboolean photo_has_crop (Photo* self);
 gboolean photo_get_raw_crop (Photo* self, Box* crop);
 void box_init (Box *self, gint left, gint top, gint right, gint bottom);
-gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def);
 static void photo_set_raw_crop (Photo* self, Box* crop);
-KeyValueMap* key_value_map_new (const gchar* group);
-KeyValueMap* key_value_map_construct (GType object_type, const gchar* group);
-void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value);
 static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle);
-gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def);
 static void photo_set_raw_straighten (Photo* self, gdouble theta);
-void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value);
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self);
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self);
 static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self, int* result_length1);
-void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
 gboolean photo_has_redeye_transformations (Photo* self);
 void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye);
-void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
 static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport);
 static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling, PhotoException exceptions, Dimensions* scaled_image, Dimensions* scaled_to_viewport);
 gboolean scaling_is_unscaled (Scaling *self);
@@ -2487,7 +2386,6 @@ void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_s
 gboolean dimensions_equals (Dimensions *self, Dimensions* dim);
 static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsRedeyeInstance* inst);
 GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle);
-void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
 gboolean photo_has_user_generated_metadata (Photo* self);
 static gboolean photo_real_has_user_generated_metadata (Photo* self);
 void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata);
@@ -2539,12 +2437,12 @@ static void photo_update_editable_attributes (Photo* self, GError** error);
 void photo_reimport_editable (Photo* self, GError** error);
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error);
 void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error);
-static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value);
 void backing_photo_id_init (BackingPhotoID *self, gint64 id);
 const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self);
 static void photo_on_reimport_editable (Photo* self);
@@ -2566,7 +2464,6 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 void orientation_derotate_point (Orientation self, Dimensions* space, GdkPoint* point, GdkPoint* result);
 void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result);
 PixelTransformationBundle* photo_get_enhance_transformations (Photo* self);
-PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf);
 gboolean photo_enhance (Photo* self);
 void photo_set_develop_raw_photos_to_files (gboolean value);
 static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* new_file);
@@ -2602,7 +2499,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj
 enum  {
 	PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY
 };
-static gchar** _vala_array_dup28 (gchar** self, int length);
+static gchar** _vala_array_dup24 (gchar** self, int length);
 static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj);
 enum  {
 	PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY
@@ -2908,14 +2805,14 @@ GType backing_fetch_mode_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2912 "Photo.c"
+#line 2809 "Photo.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 2919 "Photo.c"
+#line 2816 "Photo.c"
 }
 
 
@@ -3003,14 +2900,14 @@ PhotoImportParams* photo_import_params_construct (GType object_type, GFile* file
 	self->thumbnails = _tmp13_;
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3007 "Photo.c"
+#line 2904 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new (GFile* file, GFile* final_associated_file, ImportID* import_id, PhotoFileSnifferOptions sniffer_options, const gchar* exif_md5, const gchar* thumbnail_md5, const gchar* full_md5, Thumbnails* thumbnails) {
 #line 38 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct (TYPE_PHOTO_IMPORT_PARAMS, file, final_associated_file, import_id, sniffer_options, exif_md5, thumbnail_md5, full_md5, thumbnails);
-#line 3014 "Photo.c"
+#line 2911 "Photo.c"
 }
 
 
@@ -3057,21 +2954,21 @@ PhotoImportParams* photo_import_params_construct_create_placeholder (GType objec
 	self->thumbnails = NULL;
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3061 "Photo.c"
+#line 2958 "Photo.c"
 }
 
 
 PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id) {
 #line 52 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_import_params_construct_create_placeholder (TYPE_PHOTO_IMPORT_PARAMS, file, import_id);
-#line 3068 "Photo.c"
+#line 2965 "Photo.c"
 }
 
 
 static void value_photo_import_params_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 3075 "Photo.c"
+#line 2972 "Photo.c"
 }
 
 
@@ -3080,7 +2977,7 @@ static void value_photo_import_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (value->data[0].v_pointer);
-#line 3084 "Photo.c"
+#line 2981 "Photo.c"
 	}
 }
 
@@ -3090,11 +2987,11 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_import_params_ref (src_value->data[0].v_pointer);
-#line 3094 "Photo.c"
+#line 2991 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3098 "Photo.c"
+#line 2995 "Photo.c"
 	}
 }
 
@@ -3102,37 +2999,37 @@ static void value_photo_import_params_copy_value (const GValue* src_value, GValu
 static gpointer value_photo_import_params_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3106 "Photo.c"
+#line 3003 "Photo.c"
 }
 
 
 static gchar* value_photo_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 3113 "Photo.c"
+#line 3010 "Photo.c"
 		PhotoImportParams * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3120 "Photo.c"
+#line 3017 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.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 3124 "Photo.c"
+#line 3021 "Photo.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3128 "Photo.c"
+#line 3025 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3132 "Photo.c"
+#line 3029 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3136 "Photo.c"
+#line 3033 "Photo.c"
 }
 
 
@@ -3143,25 +3040,25 @@ static gchar* value_photo_import_params_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3147 "Photo.c"
+#line 3044 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 3153 "Photo.c"
+#line 3050 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3157 "Photo.c"
+#line 3054 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3161 "Photo.c"
+#line 3058 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3165 "Photo.c"
+#line 3062 "Photo.c"
 }
 
 
@@ -3175,7 +3072,7 @@ GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 3179 "Photo.c"
+#line 3076 "Photo.c"
 }
 
 
@@ -3184,7 +3081,7 @@ gpointer value_get_photo_import_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_IMPORT_PARAMS), NULL);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 3188 "Photo.c"
+#line 3085 "Photo.c"
 }
 
 
@@ -3204,17 +3101,17 @@ void value_set_photo_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_ref (value->data[0].v_pointer);
-#line 3208 "Photo.c"
+#line 3105 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3212 "Photo.c"
+#line 3109 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3218 "Photo.c"
+#line 3115 "Photo.c"
 	}
 }
 
@@ -3233,17 +3130,17 @@ void value_take_photo_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 3237 "Photo.c"
+#line 3134 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3241 "Photo.c"
+#line 3138 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_import_params_unref (old);
-#line 3247 "Photo.c"
+#line 3144 "Photo.c"
 	}
 }
 
@@ -3253,7 +3150,7 @@ static void photo_import_params_class_init (PhotoImportParamsClass * klass) {
 	photo_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoImportParamsClass *) klass)->finalize = photo_import_params_finalize;
-#line 3257 "Photo.c"
+#line 3154 "Photo.c"
 }
 
 
@@ -3269,7 +3166,7 @@ static void photo_import_params_instance_init (PhotoImportParams * self) {
 	self->keywords = NULL;
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 3273 "Photo.c"
+#line 3170 "Photo.c"
 }
 
 
@@ -3295,7 +3192,7 @@ static void photo_import_params_finalize (PhotoImportParams * obj) {
 	_photo_row_unref0 (self->row);
 #line 36 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->keywords);
-#line 3299 "Photo.c"
+#line 3196 "Photo.c"
 }
 
 
@@ -3320,7 +3217,7 @@ gpointer photo_import_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 3324 "Photo.c"
+#line 3221 "Photo.c"
 }
 
 
@@ -3333,7 +3230,7 @@ void photo_import_params_unref (gpointer instance) {
 		PHOTO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3337 "Photo.c"
+#line 3234 "Photo.c"
 	}
 }
 
@@ -3344,7 +3241,7 @@ PhotoTransformationState* photo_transformation_state_construct (GType object_typ
 	self = (PhotoTransformationState*) g_object_new (object_type, NULL);
 #line 72 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 3348 "Photo.c"
+#line 3245 "Photo.c"
 }
 
 
@@ -3359,14 +3256,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3363 "Photo.c"
+#line 3260 "Photo.c"
 }
 
 
 static void photo_transformation_state_real_broken (PhotoTransformationState* self) {
 #line 69 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = TRUE;
-#line 3370 "Photo.c"
+#line 3267 "Photo.c"
 }
 
 
@@ -3381,7 +3278,7 @@ static void photo_transformation_state_class_init (PhotoTransformationStateClass
 	G_OBJECT_CLASS (klass)->finalize = photo_transformation_state_finalize;
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL] = g_signal_new ("broken", TYPE_PHOTO_TRANSFORMATION_STATE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoTransformationStateClass, broken), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3385 "Photo.c"
+#line 3282 "Photo.c"
 }
 
 
@@ -3390,7 +3287,7 @@ static void photo_transformation_state_instance_init (PhotoTransformationState *
 	self->priv = PHOTO_TRANSFORMATION_STATE_GET_PRIVATE (self);
 #line 64 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->is_broke = FALSE;
-#line 3394 "Photo.c"
+#line 3291 "Photo.c"
 }
 
 
@@ -3400,7 +3297,7 @@ static void photo_transformation_state_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
 #line 63 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_transformation_state_parent_class)->finalize (obj);
-#line 3404 "Photo.c"
+#line 3301 "Photo.c"
 }
 
 
@@ -3422,7 +3319,7 @@ gboolean rating_can_increase (Rating self) {
 	result = self < RATING_FIVE;
 #line 90 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3426 "Photo.c"
+#line 3323 "Photo.c"
 }
 
 
@@ -3432,7 +3329,7 @@ gboolean rating_can_decrease (Rating self) {
 	result = self > RATING_REJECTED;
 #line 94 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3436 "Photo.c"
+#line 3333 "Photo.c"
 }
 
 
@@ -3443,17 +3340,17 @@ gboolean rating_is_valid (Rating self) {
 	if (self >= RATING_REJECTED) {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self <= RATING_FIVE;
-#line 3447 "Photo.c"
+#line 3344 "Photo.c"
 	} else {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 3451 "Photo.c"
+#line 3348 "Photo.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3457 "Photo.c"
+#line 3354 "Photo.c"
 }
 
 
@@ -3467,17 +3364,17 @@ Rating rating_increase (Rating self) {
 	if (_tmp1_) {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self + 1;
-#line 3471 "Photo.c"
+#line 3368 "Photo.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3475 "Photo.c"
+#line 3372 "Photo.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3481 "Photo.c"
+#line 3378 "Photo.c"
 }
 
 
@@ -3491,17 +3388,17 @@ Rating rating_decrease (Rating self) {
 	if (_tmp1_) {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self - 1;
-#line 3495 "Photo.c"
+#line 3392 "Photo.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3499 "Photo.c"
+#line 3396 "Photo.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3505 "Photo.c"
+#line 3402 "Photo.c"
 }
 
 
@@ -3511,73 +3408,73 @@ gint rating_serialize (Rating self) {
 	switch (self) {
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_REJECTED:
-#line 3515 "Photo.c"
+#line 3412 "Photo.c"
 		{
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = -1;
 #line 112 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3521 "Photo.c"
+#line 3418 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_UNRATED:
-#line 3525 "Photo.c"
+#line 3422 "Photo.c"
 		{
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 0;
 #line 114 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3531 "Photo.c"
+#line 3428 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_ONE:
-#line 3535 "Photo.c"
+#line 3432 "Photo.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 1;
 #line 116 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3541 "Photo.c"
+#line 3438 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_TWO:
-#line 3545 "Photo.c"
+#line 3442 "Photo.c"
 		{
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 2;
 #line 118 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3551 "Photo.c"
+#line 3448 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_THREE:
-#line 3555 "Photo.c"
+#line 3452 "Photo.c"
 		{
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 3;
 #line 120 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3561 "Photo.c"
+#line 3458 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FOUR:
-#line 3565 "Photo.c"
+#line 3462 "Photo.c"
 		{
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 4;
 #line 122 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3571 "Photo.c"
+#line 3468 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FIVE:
-#line 3575 "Photo.c"
+#line 3472 "Photo.c"
 		{
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = 5;
 #line 124 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3581 "Photo.c"
+#line 3478 "Photo.c"
 		}
 		default:
 		{
@@ -3585,7 +3482,7 @@ gint rating_serialize (Rating self) {
 			result = 0;
 #line 126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3589 "Photo.c"
+#line 3486 "Photo.c"
 		}
 	}
 }
@@ -3603,7 +3500,7 @@ Rating rating_unserialize (gint value) {
 		result = RATING_FIVE;
 #line 132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 3607 "Photo.c"
+#line 3504 "Photo.c"
 	} else {
 		gint _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3614,7 +3511,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_REJECTED;
 #line 134 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3618 "Photo.c"
+#line 3515 "Photo.c"
 		}
 	}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3623,73 +3520,73 @@ Rating rating_unserialize (gint value) {
 	switch (_tmp2_) {
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case -1:
-#line 3627 "Photo.c"
+#line 3524 "Photo.c"
 		{
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_REJECTED;
 #line 138 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3633 "Photo.c"
+#line 3530 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 0:
-#line 3637 "Photo.c"
+#line 3534 "Photo.c"
 		{
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_UNRATED;
 #line 140 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3643 "Photo.c"
+#line 3540 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 1:
-#line 3647 "Photo.c"
+#line 3544 "Photo.c"
 		{
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_ONE;
 #line 142 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3653 "Photo.c"
+#line 3550 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 2:
-#line 3657 "Photo.c"
+#line 3554 "Photo.c"
 		{
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_TWO;
 #line 144 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3663 "Photo.c"
+#line 3560 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 3:
-#line 3667 "Photo.c"
+#line 3564 "Photo.c"
 		{
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_THREE;
 #line 146 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3673 "Photo.c"
+#line 3570 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 4:
-#line 3677 "Photo.c"
+#line 3574 "Photo.c"
 		{
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FOUR;
 #line 148 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3683 "Photo.c"
+#line 3580 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 5:
-#line 3687 "Photo.c"
+#line 3584 "Photo.c"
 		{
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = RATING_FIVE;
 #line 150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3693 "Photo.c"
+#line 3590 "Photo.c"
 		}
 		default:
 		{
@@ -3697,7 +3594,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_UNRATED;
 #line 152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3701 "Photo.c"
+#line 3598 "Photo.c"
 		}
 	}
 }
@@ -3724,7 +3621,7 @@ gboolean photo_exception_prohibits (PhotoException self, PhotoException exceptio
 	result = (self & _tmp0_) != 0;
 #line 228 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3728 "Photo.c"
+#line 3625 "Photo.c"
 }
 
 
@@ -3737,7 +3634,7 @@ gboolean photo_exception_allows (PhotoException self, PhotoException exception)
 	result = (self & _tmp0_) == 0;
 #line 232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3741 "Photo.c"
+#line 3638 "Photo.c"
 }
 
 
@@ -3756,14 +3653,14 @@ GType photo_exception_get_type (void) {
 static gpointer _photo_row_ref0 (gpointer self) {
 #line 400 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_row_ref (self) : NULL;
-#line 3760 "Photo.c"
+#line 3657 "Photo.c"
 }
 
 
 static gpointer _backing_photo_row_ref0 (gpointer self) {
 #line 421 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? backing_photo_row_ref (self) : NULL;
-#line 3767 "Photo.c"
+#line 3664 "Photo.c"
 }
 
 
@@ -3880,7 +3777,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp22_ = basename;
 #line 412 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 3884 "Photo.c"
+#line 3781 "Photo.c"
 		const gchar* _tmp23_;
 		gchar* _tmp24_;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3891,7 +3788,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp24_;
-#line 3895 "Photo.c"
+#line 3792 "Photo.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = self->priv->file_title;
@@ -3899,7 +3796,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp26_ = is_string_empty (_tmp25_);
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_) {
-#line 3903 "Photo.c"
+#line 3800 "Photo.c"
 		PhotoRow* _tmp27_;
 		BackingPhotoRow* _tmp28_;
 		const gchar* _tmp29_;
@@ -3916,7 +3813,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_g_free0 (self->priv->file_title);
 #line 416 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->file_title = _tmp30_;
-#line 3920 "Photo.c"
+#line 3817 "Photo.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = row;
@@ -3926,7 +3823,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp33_ = _tmp32_.id;
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_ != BACKING_PHOTO_ID_INVALID) {
-#line 3930 "Photo.c"
+#line 3827 "Photo.c"
 		BackingPhotoRow* e = NULL;
 		PhotoRow* _tmp34_;
 		BackingPhotoID _tmp35_;
@@ -3944,7 +3841,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp37_ = e;
 #line 420 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_ != NULL) {
-#line 3948 "Photo.c"
+#line 3845 "Photo.c"
 			BackingPhotoRow* _tmp38_;
 			BackingPhotoRow* _tmp39_;
 			PhotoBackingReaders* _tmp40_;
@@ -3977,7 +3874,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_photo_file_adapter_unref0 (_tmp40_->editable);
 #line 422 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_->editable = _tmp45_;
-#line 3981 "Photo.c"
+#line 3878 "Photo.c"
 		} else {
 			{
 				PhotoTable* _tmp46_;
@@ -3997,8 +3894,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4001 "Photo.c"
-						goto __catch257_database_error;
+#line 3898 "Photo.c"
+						goto __catch268_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -4010,11 +3907,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					return NULL;
-#line 4014 "Photo.c"
+#line 3911 "Photo.c"
 				}
 			}
-			goto __finally257;
-			__catch257_database_error:
+			goto __finally268;
+			__catch268_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4023,9 +3920,9 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_inner_error_ = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 4027 "Photo.c"
+#line 3924 "Photo.c"
 			}
-			__finally257:
+			__finally268:
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4038,15 +3935,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4042 "Photo.c"
+#line 3939 "Photo.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_internal_remove_all_transformations (self, FALSE);
-#line 4046 "Photo.c"
+#line 3943 "Photo.c"
 		}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (e);
-#line 4050 "Photo.c"
+#line 3947 "Photo.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = row;
@@ -4056,7 +3953,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp51_ = _tmp50_->file_format;
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp51_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4060 "Photo.c"
+#line 3957 "Photo.c"
 		GeeHashMap* _tmp52_;
 		gint _tmp53_;
 		RawDeveloper* _tmp54_;
@@ -4068,7 +3965,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		self->priv->developments = _tmp52_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = raw_developer_as_array (&_tmp53_);
-#line 4072 "Photo.c"
+#line 3969 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4080,11 +3977,11 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			d_collection_length1 = _tmp53_;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp53_; d_it = d_it + 1) {
-#line 4084 "Photo.c"
+#line 3981 "Photo.c"
 				RawDeveloper d = 0;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4088 "Photo.c"
+#line 3985 "Photo.c"
 				{
 					BackingPhotoID id = {0};
 					PhotoRow* _tmp55_;
@@ -4112,7 +4009,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 					_tmp60_ = _tmp59_.id;
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp60_ != BACKING_PHOTO_ID_INVALID) {
-#line 4116 "Photo.c"
+#line 4013 "Photo.c"
 						BackingPhotoRow* bpr = NULL;
 						BackingPhotoID _tmp61_;
 						BackingPhotoRow* _tmp62_;
@@ -4127,7 +4024,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 						_tmp63_ = bpr;
 #line 443 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp63_ != NULL) {
-#line 4131 "Photo.c"
+#line 4028 "Photo.c"
 							GeeHashMap* _tmp64_;
 							RawDeveloper _tmp65_;
 							BackingPhotoRow* _tmp66_;
@@ -4139,17 +4036,17 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 							_tmp66_ = bpr;
 #line 444 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp65_), _tmp66_);
-#line 4143 "Photo.c"
+#line 4040 "Photo.c"
 						}
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bpr);
-#line 4147 "Photo.c"
+#line 4044 "Photo.c"
 					}
 				}
 			}
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4153 "Photo.c"
+#line 4050 "Photo.c"
 		}
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4160,7 +4057,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp70_ = _tmp69_->file_format;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp70_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4164 "Photo.c"
+#line 4061 "Photo.c"
 		GeeHashMap* _tmp71_;
 		PhotoRow* _tmp72_;
 		RawDeveloper _tmp73_;
@@ -4175,15 +4072,15 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp74_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp73_));
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = _tmp74_;
-#line 4179 "Photo.c"
+#line 4076 "Photo.c"
 	} else {
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = FALSE;
-#line 4183 "Photo.c"
+#line 4080 "Photo.c"
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_) {
-#line 4187 "Photo.c"
+#line 4084 "Photo.c"
 		BackingPhotoRow* r = NULL;
 		GeeHashMap* _tmp75_;
 		PhotoRow* _tmp76_;
@@ -4223,7 +4120,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp79_->developer = _tmp84_;
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (r);
-#line 4227 "Photo.c"
+#line 4124 "Photo.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = self->priv->readers;
@@ -4231,7 +4128,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp86_ = _tmp85_->editable;
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_ != NULL) {
-#line 4235 "Photo.c"
+#line 4132 "Photo.c"
 		BackingPhotoRow* _tmp87_;
 		BackingPhotoRow* _tmp88_;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4242,7 +4139,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_backing_photo_row_unref0 (self->backing_photo_row);
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->backing_photo_row = _tmp88_;
-#line 4246 "Photo.c"
+#line 4143 "Photo.c"
 	} else {
 		PhotoRow* _tmp89_;
 		BackingPhotoRow* _tmp90_;
@@ -4255,7 +4152,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp91_ = _tmp90_->file_format;
 #line 458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp91_ != PHOTO_FILE_FORMAT_RAW) {
-#line 4259 "Photo.c"
+#line 4156 "Photo.c"
 			PhotoRow* _tmp92_;
 			BackingPhotoRow* _tmp93_;
 			BackingPhotoRow* _tmp94_;
@@ -4269,7 +4166,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_backing_photo_row_unref0 (self->backing_photo_row);
 #line 459 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->backing_photo_row = _tmp94_;
-#line 4273 "Photo.c"
+#line 4170 "Photo.c"
 		} else {
 			GeeHashMap* _tmp95_;
 			PhotoRow* _tmp96_;
@@ -4285,7 +4182,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 			_tmp98_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp97_));
 #line 463 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp98_) {
-#line 4289 "Photo.c"
+#line 4186 "Photo.c"
 				GeeHashMap* _tmp99_;
 				PhotoRow* _tmp100_;
 				RawDeveloper _tmp101_;
@@ -4302,7 +4199,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 464 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = (BackingPhotoRow*) _tmp102_;
-#line 4306 "Photo.c"
+#line 4203 "Photo.c"
 			} else {
 				PhotoRow* _tmp103_;
 				BackingPhotoRow* _tmp104_;
@@ -4317,7 +4214,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_backing_photo_row_unref0 (self->backing_photo_row);
 #line 467 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->backing_photo_row = _tmp105_;
-#line 4321 "Photo.c"
+#line 4218 "Photo.c"
 			}
 		}
 	}
@@ -4331,7 +4228,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_g_free0 (basename);
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 4335 "Photo.c"
+#line 4232 "Photo.c"
 }
 
 
@@ -4343,7 +4240,7 @@ void photo_init_photo (void) {
 	_g_object_unref0 (photo_source_pixbuf_cache);
 #line 475 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_source_pixbuf_cache = _tmp0_;
-#line 4347 "Photo.c"
+#line 4244 "Photo.c"
 }
 
 
@@ -4357,7 +4254,7 @@ void photo_terminate_photo (void) {
 	_tmp0_ = photo_discard_source_id;
 #line 481 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 4361 "Photo.c"
+#line 4258 "Photo.c"
 		guint _tmp1_;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_discard_source_id;
@@ -4365,7 +4262,7 @@ void photo_terminate_photo (void) {
 		g_source_remove (_tmp1_);
 #line 483 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_discard_source_id = (guint) 0;
-#line 4369 "Photo.c"
+#line 4266 "Photo.c"
 	}
 }
 
@@ -4383,7 +4280,7 @@ static void photo_real_notify_editable_replaced (Photo* self, GFile* old_file, G
 	_tmp1_ = new_file;
 #line 488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4387 "Photo.c"
+#line 4284 "Photo.c"
 }
 
 
@@ -4392,14 +4289,14 @@ void photo_notify_editable_replaced (Photo* self, GFile* old_file, GFile* new_fi
 	g_return_if_fail (IS_PHOTO (self));
 #line 487 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_replaced (self, old_file, new_file);
-#line 4396 "Photo.c"
+#line 4293 "Photo.c"
 }
 
 
 static void photo_real_notify_raw_development_modified (Photo* self) {
 #line 492 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_RAW_DEVELOPMENT_MODIFIED_SIGNAL], 0);
-#line 4403 "Photo.c"
+#line 4300 "Photo.c"
 }
 
 
@@ -4408,14 +4305,14 @@ void photo_notify_raw_development_modified (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 491 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_raw_development_modified (self);
-#line 4412 "Photo.c"
+#line 4309 "Photo.c"
 }
 
 
 static void photo_real_notify_baseline_replaced (Photo* self) {
 #line 496 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_BASELINE_REPLACED_SIGNAL], 0);
-#line 4419 "Photo.c"
+#line 4316 "Photo.c"
 }
 
 
@@ -4424,7 +4321,7 @@ void photo_notify_baseline_replaced (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 495 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_replaced (self);
-#line 4428 "Photo.c"
+#line 4325 "Photo.c"
 }
 
 
@@ -4436,7 +4333,7 @@ static void photo_real_notify_master_reimported (Photo* self, PhotoMetadata* met
 	_tmp0_ = metadata;
 #line 500 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_);
-#line 4440 "Photo.c"
+#line 4337 "Photo.c"
 }
 
 
@@ -4445,7 +4342,7 @@ void photo_notify_master_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 499 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_master_reimported (self, metadata);
-#line 4449 "Photo.c"
+#line 4346 "Photo.c"
 }
 
 
@@ -4457,7 +4354,7 @@ static void photo_real_notify_editable_reimported (Photo* self, PhotoMetadata* m
 	_tmp0_ = metadata;
 #line 504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_);
-#line 4461 "Photo.c"
+#line 4358 "Photo.c"
 }
 
 
@@ -4466,7 +4363,7 @@ void photo_notify_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 503 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_editable_reimported (self, metadata);
-#line 4470 "Photo.c"
+#line 4367 "Photo.c"
 }
 
 
@@ -4478,7 +4375,7 @@ static void photo_real_notify_source_reimported (Photo* self, PhotoMetadata* met
 	_tmp0_ = metadata;
 #line 508 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_);
-#line 4482 "Photo.c"
+#line 4379 "Photo.c"
 }
 
 
@@ -4487,7 +4384,7 @@ void photo_notify_source_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 507 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_source_reimported (self, metadata);
-#line 4491 "Photo.c"
+#line 4388 "Photo.c"
 }
 
 
@@ -4499,7 +4396,7 @@ static void photo_real_notify_baseline_reimported (Photo* self, PhotoMetadata* m
 	_tmp0_ = metadata;
 #line 512 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, photo_signals[PHOTO_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_);
-#line 4503 "Photo.c"
+#line 4400 "Photo.c"
 }
 
 
@@ -4508,7 +4405,7 @@ void photo_notify_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 511 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->notify_baseline_reimported (self, metadata);
-#line 4512 "Photo.c"
+#line 4409 "Photo.c"
 }
 
 
@@ -4529,14 +4426,14 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	ret = TRUE;
 #line 517 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = NULL;
-#line 4533 "Photo.c"
+#line 4430 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 4540 "Photo.c"
+#line 4437 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
@@ -4546,7 +4443,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp2_ = _tmp1_->editable;
 #line 519 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 4550 "Photo.c"
+#line 4447 "Photo.c"
 				PhotoBackingReaders* _tmp3_;
 				PhotoFileReader* _tmp4_;
 				GFile* _tmp5_;
@@ -4560,21 +4457,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 				_g_object_unref0 (file);
 #line 520 "/home/jens/Source/shotwell/src/Photo.vala"
 				file = _tmp5_;
-#line 4564 "Photo.c"
+#line 4461 "Photo.c"
 			}
 		}
-		__finally258:
+		__finally269:
 		{
 			PhotoBackingReaders* _tmp6_;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->readers;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 4574 "Photo.c"
+#line 4471 "Photo.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4578 "Photo.c"
+#line 4475 "Photo.c"
 			gboolean _tmp7_ = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -4582,7 +4479,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp7_;
-#line 4586 "Photo.c"
+#line 4483 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4591,12 +4488,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp8_ = photo_get_master_file_format (self);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4595 "Photo.c"
+#line 4492 "Photo.c"
 		gint _tmp9_;
 		RawDeveloper* _tmp10_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw_developer_as_array (&_tmp9_);
-#line 4600 "Photo.c"
+#line 4497 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4608,30 +4505,30 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			d_collection_length1 = _tmp9_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp9_; d_it = d_it + 1) {
-#line 4612 "Photo.c"
+#line 4509 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4616 "Photo.c"
+#line 4513 "Photo.c"
 				{
 					RawDeveloper _tmp11_;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = d;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_delete_raw_development (self, _tmp11_);
-#line 4623 "Photo.c"
+#line 4520 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4628 "Photo.c"
+#line 4525 "Photo.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = file;
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ != NULL) {
-#line 4635 "Photo.c"
+#line 4532 "Photo.c"
 		{
 			gboolean _tmp13_ = FALSE;
 			GFile* _tmp14_;
@@ -4644,15 +4541,15 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp13_ = _tmp15_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4648 "Photo.c"
-				goto __catch259_g_error;
+#line 4545 "Photo.c"
+				goto __catch270_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp13_;
-#line 4653 "Photo.c"
+#line 4550 "Photo.c"
 		}
-		goto __finally259;
-		__catch259_g_error:
+		goto __finally270;
+		__catch270_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp16_;
@@ -4690,12 +4587,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_free0 (_tmp18_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4694 "Photo.c"
+#line 4591 "Photo.c"
 		}
-		__finally259:
+		__finally270:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4699 "Photo.c"
+#line 4596 "Photo.c"
 			gboolean _tmp23_ = FALSE;
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
@@ -4703,7 +4600,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_object_unref0 (file);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp23_;
-#line 4707 "Photo.c"
+#line 4604 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4712,7 +4609,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp25_ = _tmp26_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4716 "Photo.c"
+#line 4613 "Photo.c"
 		gboolean _tmp27_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
@@ -4720,21 +4617,21 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 		_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp27_;
-#line 4724 "Photo.c"
+#line 4621 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 4728 "Photo.c"
+#line 4625 "Photo.c"
 		gboolean _tmp28_;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = ret;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _tmp28_;
-#line 4734 "Photo.c"
+#line 4631 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = FALSE;
-#line 4738 "Photo.c"
+#line 4635 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp24_;
@@ -4742,7 +4639,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_g_object_unref0 (file);
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4746 "Photo.c"
+#line 4643 "Photo.c"
 }
 
 
@@ -4767,11 +4664,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		result = NULL;
 #line 549 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4771 "Photo.c"
+#line 4668 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4775 "Photo.c"
+#line 4672 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
 		BackingPhotoTable* _tmp3_;
@@ -4798,8 +4695,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4802 "Photo.c"
-				goto __catch260_database_error;
+#line 4699 "Photo.c"
+				goto __catch271_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4809,7 +4706,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4813 "Photo.c"
+#line 4710 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4821,10 +4718,10 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		backing_row = _tmp8_;
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp2_);
-#line 4825 "Photo.c"
+#line 4722 "Photo.c"
 	}
-	goto __finally260;
-	__catch260_database_error:
+	goto __finally271;
+	__catch271_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_;
@@ -4849,9 +4746,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_g_free0 (_tmp10_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 4853 "Photo.c"
+#line 4750 "Photo.c"
 	}
-	__finally260:
+	__finally271:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4862,13 +4759,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		g_clear_error (&_inner_error_);
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 4866 "Photo.c"
+#line 4763 "Photo.c"
 	}
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = backing_row;
 #line 558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 4872 "Photo.c"
+#line 4769 "Photo.c"
 		{
 			BackingPhotoTable* _tmp14_;
 			BackingPhotoTable* _tmp15_;
@@ -4887,8 +4784,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4891 "Photo.c"
-					goto __catch261_database_error;
+#line 4788 "Photo.c"
+					goto __catch272_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4898,11 +4795,11 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 				g_clear_error (&_inner_error_);
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				return NULL;
-#line 4902 "Photo.c"
+#line 4799 "Photo.c"
 			}
 		}
-		goto __finally261;
-		__catch261_database_error:
+		goto __finally272;
+		__catch272_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4911,9 +4808,9 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			_inner_error_ = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4915 "Photo.c"
+#line 4812 "Photo.c"
 		}
-		__finally261:
+		__finally272:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4924,7 +4821,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			g_clear_error (&_inner_error_);
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 4928 "Photo.c"
+#line 4825 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4932,13 +4829,13 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_backing_photo_row_unref0 (backing_row);
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 4936 "Photo.c"
+#line 4833 "Photo.c"
 	}
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing_row;
 #line 567 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 4942 "Photo.c"
+#line 4839 "Photo.c"
 }
 
 
@@ -4947,7 +4844,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4951 "Photo.c"
+#line 4848 "Photo.c"
 	{
 		GeeHashMap* _tmp0_;
 		gboolean _tmp13_ = FALSE;
@@ -4955,7 +4852,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 		_tmp0_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 4959 "Photo.c"
+#line 4856 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashMap* _tmp2_;
@@ -4969,7 +4866,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 			_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp3_));
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_) {
-#line 4973 "Photo.c"
+#line 4870 "Photo.c"
 				GeeHashMap* _tmp5_;
 				RawDeveloper _tmp6_;
 				gpointer _tmp7_;
@@ -4992,35 +4889,35 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp10_;
 #line 575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp8_);
-#line 4996 "Photo.c"
+#line 4893 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 5000 "Photo.c"
+#line 4897 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 5004 "Photo.c"
+#line 4901 "Photo.c"
 			{
 				GeeHashMap* _tmp11_;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5011 "Photo.c"
+#line 4908 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5015 "Photo.c"
+#line 4912 "Photo.c"
 		}
-		__finally262:
+		__finally273:
 		{
 			GeeHashMap* _tmp12_;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5024 "Photo.c"
+#line 4921 "Photo.c"
 		}
 #line 573 "/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);
@@ -5028,7 +4925,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 		g_clear_error (&_inner_error_);
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp13_;
-#line 5032 "Photo.c"
+#line 4929 "Photo.c"
 	}
 }
 
@@ -5039,14 +4936,14 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 580 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 5043 "Photo.c"
+#line 4940 "Photo.c"
 	{
 		GeeHashMap* _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5050 "Photo.c"
+#line 4947 "Photo.c"
 		{
 			GeeHashMap* _tmp1_;
 			RawDeveloper _tmp2_;
@@ -5061,32 +4958,32 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			if (_tmp3_) {
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 5065 "Photo.c"
+#line 4962 "Photo.c"
 				{
 					GeeHashMap* _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5072 "Photo.c"
+#line 4969 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5076 "Photo.c"
+#line 4973 "Photo.c"
 			}
 		}
-		__finally263:
+		__finally274:
 		{
 			GeeHashMap* _tmp5_;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5086 "Photo.c"
+#line 4983 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5090 "Photo.c"
+#line 4987 "Photo.c"
 			gboolean _tmp6_ = FALSE;
 #line 581 "/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);
@@ -5094,7 +4991,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp6_;
-#line 5098 "Photo.c"
+#line 4995 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5103,27 +5000,27 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	switch (_tmp7_) {
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5107 "Photo.c"
+#line 5004 "Photo.c"
 		{
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = TRUE;
 #line 588 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5113 "Photo.c"
+#line 5010 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5117 "Photo.c"
+#line 5014 "Photo.c"
 		{
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 591 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5123 "Photo.c"
+#line 5020 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5127 "Photo.c"
+#line 5024 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -5138,8 +5035,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				meta = _tmp8_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5142 "Photo.c"
-					goto __catch264_g_error;
+#line 5039 "Photo.c"
+					goto __catch275_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = meta;
@@ -5151,7 +5048,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_tmp11_ = num_previews;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ > ((guint) 0)) {
-#line 5155 "Photo.c"
+#line 5052 "Photo.c"
 					PhotoPreview* prev = NULL;
 					PhotoMetadata* _tmp12_;
 					guint _tmp13_;
@@ -5187,7 +5084,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 603 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5191 "Photo.c"
+#line 5088 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = prev;
@@ -5205,7 +5102,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_tmp22_ = _tmp21_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp20_ > _tmp22_) {
-#line 5209 "Photo.c"
+#line 5106 "Photo.c"
 						Dimensions _tmp23_;
 						gint _tmp24_;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5214,7 +5111,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp24_ = _tmp23_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = _tmp24_;
-#line 5218 "Photo.c"
+#line 5115 "Photo.c"
 					} else {
 						Dimensions _tmp25_;
 						gint _tmp26_;
@@ -5224,7 +5121,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp26_ = _tmp25_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = _tmp26_;
-#line 5228 "Photo.c"
+#line 5125 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					preview_major_axis = _tmp18_;
@@ -5240,7 +5137,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_media_metadata_unref0 (meta);
 #line 610 "/home/jens/Source/shotwell/src/Photo.vala"
 						return result;
-#line 5244 "Photo.c"
+#line 5141 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5250,7 +5147,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_media_metadata_unref0 (meta);
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 5254 "Photo.c"
+#line 5151 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5258,10 +5155,10 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_media_metadata_unref0 (meta);
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5262 "Photo.c"
+#line 5159 "Photo.c"
 			}
-			goto __finally264;
-			__catch264_g_error:
+			goto __finally275;
+			__catch275_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp28_;
@@ -5278,12 +5175,12 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp29_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 5282 "Photo.c"
+#line 5179 "Photo.c"
 			}
-			__finally264:
+			__finally275:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5287 "Photo.c"
+#line 5184 "Photo.c"
 				gboolean _tmp30_ = FALSE;
 #line 594 "/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);
@@ -5291,30 +5188,29 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp30_;
-#line 5295 "Photo.c"
+#line 5192 "Photo.c"
 			}
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = FALSE;
 #line 621 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 5301 "Photo.c"
+#line 5198 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5307 "Photo.c"
+#line 5204 "Photo.c"
 		}
 	}
 }
 
 
-void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, GError** error) {
+void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, BackingPhotoRow* bpr, gboolean notify, GError** error) {
 	PhotoRow* _tmp0_;
 	RawDeveloper _tmp1_;
 	BackingPhotoRow* _tmp2_;
-	Alteration* _tmp8_;
-	Alteration* _tmp9_;
+	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 631 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
@@ -5334,7 +5230,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		g_propagate_error (error, _inner_error_);
 #line 632 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5338 "Photo.c"
+#line 5234 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp3_;
@@ -5342,7 +5238,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 		_tmp3_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 5346 "Photo.c"
+#line 5242 "Photo.c"
 		{
 			GeeHashMap* _tmp4_;
 			RawDeveloper _tmp5_;
@@ -5355,16 +5251,16 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			_tmp6_ = bpr;
 #line 634 "/home/jens/Source/shotwell/src/Photo.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_);
-#line 5359 "Photo.c"
+#line 5255 "Photo.c"
 		}
-		__finally265:
+		__finally276:
 		{
 			GeeHashMap* _tmp7_;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->developments;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 5368 "Photo.c"
+#line 5264 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5372,18 +5268,26 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			g_propagate_error (error, _inner_error_);
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 5376 "Photo.c"
+#line 5272 "Photo.c"
 		}
 	}
-#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp8_ = alteration_new ("image", "developer");
-#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp9_ = _tmp8_;
-#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp9_);
-#line 636 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp9_);
-#line 5387 "Photo.c"
+#line 637 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp8_ = notify;
+#line 637 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp8_) {
+#line 5279 "Photo.c"
+		Alteration* _tmp9_;
+		Alteration* _tmp10_;
+#line 638 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp9_ = alteration_new ("image", "developer");
+#line 638 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp10_ = _tmp9_;
+#line 638 "/home/jens/Source/shotwell/src/Photo.vala"
+		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_);
+#line 638 "/home/jens/Source/shotwell/src/Photo.vala"
+		_alteration_unref0 (_tmp10_);
+#line 5290 "Photo.c"
+	}
 }
 
 
@@ -5430,242 +5334,242 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	BackingPhotoRow* _tmp39_;
 	BackingPhotoID _tmp40_;
 	GError * _inner_error_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr));
 #line 641 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (IS_BACKING_PHOTO_ROW (bpr));
+#line 643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = bpr;
-#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->filepath;
-#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 643 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = g_file_query_info (_tmp3_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = _tmp4_;
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5460 "Photo.c"
+#line 5364 "Photo.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
-#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 646 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp5_, &_tmp6_);
-#line 644 "/home/jens/Source/shotwell/src/Photo.vala"
-	timestamp = _tmp6_;
 #line 646 "/home/jens/Source/shotwell/src/Photo.vala"
+	timestamp = _tmp6_;
+#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = file;
-#line 646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_file_interrogator_new (_tmp7_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
-#line 646 "/home/jens/Source/shotwell/src/Photo.vala"
-	interrogator = _tmp8_;
 #line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+	interrogator = _tmp8_;
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = interrogator;
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_interrogator_interrogate (_tmp9_, &_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5490 "Photo.c"
+#line 5394 "Photo.c"
 	}
-#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
-#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_file_interrogator_get_detected_photo_information (_tmp10_);
-#line 650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 652 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp11_;
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = detected;
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 5504 "Photo.c"
+#line 5408 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp14_;
 		gboolean _tmp15_;
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = interrogator;
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp15_;
-#line 5514 "Photo.c"
+#line 5418 "Photo.c"
 	}
-#line 651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 653 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 656 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 656 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 656 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 656 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 656 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5528 "Photo.c"
+#line 5432 "Photo.c"
 	}
-#line 657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
-#line 657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = detected;
-#line 657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_->image_dim;
-#line 657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_->dim = _tmp18_;
-#line 658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = bpr;
-#line 658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = info;
-#line 658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = g_file_info_get_size (_tmp20_);
-#line 658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_->filesize = _tmp21_;
-#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = bpr;
-#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = timestamp;
-#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_.tv_sec;
-#line 659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_->timestamp = (time_t) _tmp24_;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = detected;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = _tmp26_->metadata;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp27_ != NULL) {
-#line 5560 "Photo.c"
+#line 5464 "Photo.c"
 		DetectedPhotoInformation* _tmp28_;
 		PhotoMetadata* _tmp29_;
 		Orientation _tmp30_;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = detected;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = _tmp28_->metadata;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = photo_metadata_get_orientation (_tmp29_);
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp30_;
-#line 5572 "Photo.c"
+#line 5476 "Photo.c"
 	} else {
-#line 661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 663 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5576 "Photo.c"
+#line 5480 "Photo.c"
 	}
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
-#line 660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_->original_orientation = _tmp25_;
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = backing_photo_table_get_instance ();
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_;
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = bpr;
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_photo_table_add (_tmp33_, _tmp34_, &_inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp33_);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 666 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5606 "Photo.c"
+#line 5510 "Photo.c"
 	}
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_;
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = row;
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = d;
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = bpr;
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_->id;
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp36_);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 667 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5638 "Photo.c"
+#line 5542 "Photo.c"
 	}
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 641 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5648 "Photo.c"
+#line 5552 "Photo.c"
 }
 
 
-static void photo_develop_photo (Photo* self, RawDeveloper d) {
+static void photo_develop_photo (Photo* self, RawDeveloper d, gboolean notify) {
 	gboolean wrote_img_to_disk = FALSE;
 	BackingPhotoRow* bps = NULL;
 	RawDeveloper _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 672 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 673 "/home/jens/Source/shotwell/src/Photo.vala"
 	wrote_img_to_disk = FALSE;
-#line 672 "/home/jens/Source/shotwell/src/Photo.vala"
-	bps = NULL;
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
+	bps = NULL;
+#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = d;
-#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp0_) {
-#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5669 "Photo.c"
+#line 5573 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
@@ -5678,1369 +5582,1590 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				GdkPixbuf* pix = NULL;
 				GdkPixbuf* _tmp14_;
 				PhotoFileWriter* writer = NULL;
-				BackingPhotoRow* _tmp20_;
-				const gchar* _tmp21_;
-				PhotoFileWriter* _tmp22_;
+				BackingPhotoRow* _tmp21_;
+				const gchar* _tmp22_;
 				PhotoFileWriter* _tmp23_;
-				GdkPixbuf* _tmp24_;
+				PhotoFileWriter* _tmp24_;
+				GdkPixbuf* _tmp25_;
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp25_;
+				PhotoMetadata* _tmp26_;
 				PhotoFileMetadataWriter* mwriter = NULL;
-				BackingPhotoRow* _tmp26_;
-				const gchar* _tmp27_;
-				PhotoFileMetadataWriter* _tmp28_;
+				BackingPhotoRow* _tmp27_;
+				const gchar* _tmp28_;
 				PhotoFileMetadataWriter* _tmp29_;
-				PhotoMetadata* _tmp30_;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+				PhotoFileMetadataWriter* _tmp30_;
+				PhotoMetadata* _tmp31_;
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp2_ = d;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->master;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->filepath;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = raw_developer_create_backing_row_for_development (_tmp2_, _tmp5_, NULL, &_inner_error_);
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5709 "Photo.c"
-					goto __catch266_g_error;
+#line 5613 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bps);
-#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 				bps = _tmp7_;
-#line 679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 681 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5722 "Photo.c"
+#line 5626 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp8_;
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = self->priv->readers;
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 5729 "Photo.c"
+#line 5633 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
 						GdkPixbuf* _tmp11_;
 						GdkPixbuf* _tmp12_;
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						scaling_for_original (&_tmp10_);
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp11_ = photo_get_master_pixbuf (self, &_tmp10_, FALSE, &_inner_error_);
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp9_ = _tmp11_;
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5743 "Photo.c"
-							goto __finally267;
+#line 5647 "Photo.c"
+							goto __finally278;
 						}
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp9_ = NULL;
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (pix);
-#line 685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 687 "/home/jens/Source/shotwell/src/Photo.vala"
 						pix = _tmp12_;
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp9_);
-#line 5756 "Photo.c"
+#line 5660 "Photo.c"
 					}
-					__finally267:
+					__finally278:
 					{
 						PhotoBackingReaders* _tmp13_;
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = self->priv->readers;
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5765 "Photo.c"
+#line 5669 "Photo.c"
 					}
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (pix);
-#line 680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 682 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (_tmp1_);
-#line 5773 "Photo.c"
-						goto __catch266_g_error;
+#line 5677 "Photo.c"
+						goto __catch277_g_error;
 					}
 				}
-#line 688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = pix;
-#line 688 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp14_ == NULL) {
-#line 689 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_debug ("Photo.vala:689: Could not get preview pixbuf");
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp14_ == NULL) {
+#line 691 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_debug ("Photo.vala:691: Could not get preview pixbuf");
+#line 692 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 692 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5787 "Photo.c"
+#line 5691 "Photo.c"
 					{
 						gboolean _tmp15_;
-#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 716 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = wrote_img_to_disk;
-#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 716 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp15_) {
-#line 5794 "Photo.c"
+#line 5698 "Photo.c"
 							{
 								RawDeveloper _tmp16_;
 								BackingPhotoRow* _tmp17_;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
+								gboolean _tmp18_;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp16_ = d;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp17_ = bps;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
-								photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_);
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp18_ = notify;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+								photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, _tmp18_, &_inner_error_);
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5806 "Photo.c"
-									goto __catch268_g_error;
+#line 5713 "Photo.c"
+									goto __catch279_g_error;
 								}
-#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5811 "Photo.c"
+#line 5718 "Photo.c"
 							}
-							goto __finally268;
-							__catch268_g_error:
+							goto __finally279;
+							__catch279_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp18_;
-								const gchar* _tmp19_;
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+								GError* _tmp19_;
+								const gchar* _tmp20_;
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								_inner_error_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp18_ = e;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp19_ = _tmp18_->message;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-								g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_);
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp19_ = e;
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp20_ = _tmp19_->message;
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+								g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp20_);
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 5831 "Photo.c"
+#line 5738 "Photo.c"
 							}
-							__finally268:
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+							__finally279:
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5836 "Photo.c"
-								goto __catch266_g_error;
+#line 5743 "Photo.c"
+								goto __catch277_g_error;
 							}
 						}
 					}
-#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 692 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bps);
-#line 690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 692 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 5845 "Photo.c"
+#line 5752 "Photo.c"
 				}
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp20_ = bps;
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp21_ = _tmp20_->filepath;
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp22_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp21_, &_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
-				writer = _tmp22_;
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp21_ = bps;
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp22_ = _tmp21_->filepath;
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp23_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp22_, &_inner_error_);
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
+				writer = _tmp23_;
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 696 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5861 "Photo.c"
-					goto __catch266_g_error;
+#line 5768 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp23_ = writer;
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp24_ = pix;
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_file_writer_write (_tmp23_, _tmp24_, JPEG_QUALITY_HIGH, &_inner_error_);
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp24_ = writer;
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp25_ = pix;
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_file_writer_write (_tmp24_, _tmp25_, JPEG_QUALITY_HIGH, &_inner_error_);
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (writer);
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 697 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5878 "Photo.c"
-					goto __catch266_g_error;
+#line 5785 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 705 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp25_ = photo_get_master_metadata (self, &_inner_error_);
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
-				meta = _tmp25_;
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp26_ = photo_get_master_metadata (self, &_inner_error_);
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+				meta = _tmp26_;
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (writer);
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5895 "Photo.c"
-					goto __catch266_g_error;
+#line 5802 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp26_ = bps;
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp27_ = _tmp26_->filepath;
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp28_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp27_, &_inner_error_);
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
-				mwriter = _tmp28_;
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp27_ = bps;
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp28_ = _tmp27_->filepath;
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp29_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp28_, &_inner_error_);
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
+				mwriter = _tmp29_;
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (writer);
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 711 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5916 "Photo.c"
-					goto __catch266_g_error;
+#line 5823 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp29_ = mwriter;
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp30_ = meta;
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_file_metadata_writer_write_metadata (_tmp29_, _tmp30_, &_inner_error_);
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp30_ = mwriter;
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp31_ = meta;
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_file_metadata_writer_write_metadata (_tmp30_, _tmp31_, &_inner_error_);
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (mwriter);
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (writer);
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pix);
-#line 710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5937 "Photo.c"
-					goto __catch266_g_error;
+#line 5844 "Photo.c"
+					goto __catch277_g_error;
 				}
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (meta);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (writer);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (pix);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 5950 "Photo.c"
+#line 5857 "Photo.c"
 			}
-			goto __finally266;
-			__catch266_g_error:
+			goto __finally277;
+			__catch277_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp31_;
-				const gchar* _tmp32_;
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+				GError* _tmp32_;
+				const gchar* _tmp33_;
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp31_ = err;
-#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp32_ = _tmp31_->message;
-#line 712 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp32_ = err;
+#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp33_ = _tmp32_->message;
+#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_debug ("Photo.vala:714: Error developing photo: %s", _tmp33_);
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 5970 "Photo.c"
+#line 5877 "Photo.c"
 			}
-			__finally266:
+			__finally277:
 			{
-				gboolean _tmp33_;
-#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp33_ = wrote_img_to_disk;
-#line 714 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp33_) {
-#line 5979 "Photo.c"
+				gboolean _tmp34_;
+#line 716 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp34_ = wrote_img_to_disk;
+#line 716 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp34_) {
+#line 5886 "Photo.c"
 					{
-						RawDeveloper _tmp34_;
-						BackingPhotoRow* _tmp35_;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp34_ = d;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp35_ = bps;
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
-						photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_);
-#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
+						RawDeveloper _tmp35_;
+						BackingPhotoRow* _tmp36_;
+						gboolean _tmp37_;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp35_ = d;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp36_ = bps;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp37_ = notify;
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+						photo_add_backing_photo_for_development (self, _tmp35_, _tmp36_, _tmp37_, &_inner_error_);
+#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5991 "Photo.c"
-							goto __catch269_g_error;
+#line 5901 "Photo.c"
+							goto __catch280_g_error;
 						}
-#line 719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5996 "Photo.c"
+#line 5906 "Photo.c"
 					}
-					goto __finally269;
-					__catch269_g_error:
+					goto __finally280;
+					__catch280_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp36_;
-						const gchar* _tmp37_;
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+						GError* _tmp38_;
+						const gchar* _tmp39_;
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						e = _inner_error_;
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_inner_error_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp36_ = e;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp37_ = _tmp36_->message;
-#line 721 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_);
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp38_ = e;
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp39_ = _tmp38_->message;
+#line 723 "/home/jens/Source/shotwell/src/Photo.vala"
+						g_debug ("Photo.vala:723: Error adding backing photo as development. Message: %s", _tmp39_);
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 6016 "Photo.c"
+#line 5926 "Photo.c"
 					}
-					__finally269:
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+					__finally280:
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bps);
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/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 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_clear_error (&_inner_error_);
-#line 715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6029 "Photo.c"
+#line 5939 "Photo.c"
 					}
 				}
 			}
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bps);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/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 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6043 "Photo.c"
+#line 5953 "Photo.c"
 			}
-#line 727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 729 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6047 "Photo.c"
+#line 5957 "Photo.c"
 		}
-#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6051 "Photo.c"
+#line 5961 "Photo.c"
 		{
-#line 731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 733 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6055 "Photo.c"
+#line 5965 "Photo.c"
 		}
-#line 674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6059 "Photo.c"
+#line 5969 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
-				PhotoMetadata* _tmp38_;
+				PhotoMetadata* _tmp40_;
 				guint c = 0U;
-				PhotoMetadata* _tmp39_;
-				guint _tmp40_;
-				guint _tmp41_;
+				PhotoMetadata* _tmp41_;
+				guint _tmp42_;
+				guint _tmp43_;
 				PhotoPreview* prev = NULL;
-				PhotoMetadata* _tmp47_;
-				guint _tmp48_;
-				PhotoPreview* _tmp49_;
-				PhotoPreview* _tmp50_;
-				GdkPixbuf* pix = NULL;
-				PhotoPreview* _tmp56_;
-				GdkPixbuf* _tmp57_;
-				GdkPixbuf* _tmp58_;
-				BackingPhotoRow* _tmp64_ = NULL;
-				RawDeveloper _tmp65_;
-				PhotoRow* _tmp66_;
-				BackingPhotoRow* _tmp67_;
-				const gchar* _tmp68_;
-				BackingPhotoRow* _tmp69_;
-				BackingPhotoRow* _tmp70_;
-				PhotoFileWriter* writer = NULL;
-				BackingPhotoRow* _tmp71_;
-				const gchar* _tmp72_;
-				PhotoFileWriter* _tmp73_;
-				PhotoFileWriter* _tmp74_;
-				GdkPixbuf* _tmp75_;
+				PhotoMetadata* _tmp50_;
+				guint _tmp51_;
+				PhotoPreview* _tmp52_;
+				PhotoPreview* _tmp53_;
+				GBytes* pix = NULL;
+				PhotoPreview* _tmp60_;
+				GBytes* _tmp61_;
+				GBytes* _tmp62_;
+				BackingPhotoRow* _tmp69_ = NULL;
+				RawDeveloper _tmp70_;
+				PhotoRow* _tmp71_;
+				BackingPhotoRow* _tmp72_;
+				const gchar* _tmp73_;
+				BackingPhotoRow* _tmp74_;
+				BackingPhotoRow* _tmp75_;
+				gboolean _tmp76_ = FALSE;
+				GBytes* _tmp77_;
+				gboolean _tmp78_;
 				PhotoFileMetadataWriter* mwriter = NULL;
-				BackingPhotoRow* _tmp76_;
-				const gchar* _tmp77_;
-				PhotoFileMetadataWriter* _tmp78_;
-				PhotoFileMetadataWriter* _tmp79_;
-				PhotoMetadata* _tmp80_;
-#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp38_ = photo_get_master_metadata (self, &_inner_error_);
-#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
-				meta = _tmp38_;
-#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6102 "Photo.c"
-					goto __catch270_g_error;
-				}
-#line 737 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp39_ = meta;
-#line 737 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp40_ = photo_metadata_get_preview_count (_tmp39_);
-#line 737 "/home/jens/Source/shotwell/src/Photo.vala"
-				c = _tmp40_;
+				BackingPhotoRow* _tmp100_;
+				const gchar* _tmp101_;
+				PhotoFileMetadataWriter* _tmp102_;
+				PhotoFileMetadataWriter* _tmp103_;
+				PhotoMetadata* _tmp104_;
+#line 738 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp40_ = photo_get_master_metadata (self, &_inner_error_);
 #line 738 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp41_ = c;
+				meta = _tmp40_;
 #line 738 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp41_ <= ((guint) 0)) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6009 "Photo.c"
+					goto __catch281_g_error;
+				}
+#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp41_ = meta;
+#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp42_ = photo_metadata_get_preview_count (_tmp41_);
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
+				c = _tmp42_;
+#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp43_ = c;
+#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp43_ <= ((guint) 0)) {
+#line 741 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6117 "Photo.c"
+#line 6024 "Photo.c"
 					{
-						gboolean _tmp42_;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp42_ = wrote_img_to_disk;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						if (_tmp42_) {
-#line 6124 "Photo.c"
+						gboolean _tmp44_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp44_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						if (_tmp44_) {
+#line 6031 "Photo.c"
 							{
-								RawDeveloper _tmp43_;
-								BackingPhotoRow* _tmp44_;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp43_ = d;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp44_ = bps;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+								RawDeveloper _tmp45_;
+								BackingPhotoRow* _tmp46_;
+								gboolean _tmp47_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp45_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp46_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp47_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								photo_add_backing_photo_for_development (self, _tmp45_, _tmp46_, _tmp47_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6136 "Photo.c"
-									goto __catch271_g_error;
+#line 6046 "Photo.c"
+									goto __catch282_g_error;
 								}
-#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6141 "Photo.c"
+#line 6051 "Photo.c"
 							}
-							goto __finally271;
-							__catch271_g_error:
+							goto __finally282;
+							__catch282_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp45_;
-								const gchar* _tmp46_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+								GError* _tmp48_;
+								const gchar* _tmp49_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp45_ = e;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp46_ = _tmp45_->message;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp48_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp49_ = _tmp48_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp49_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6161 "Photo.c"
+#line 6071 "Photo.c"
 							}
-							__finally271:
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+							__finally282:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6166 "Photo.c"
-								goto __catch270_g_error;
+#line 6076 "Photo.c"
+								goto __catch281_g_error;
 							}
 						}
 					}
-#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 741 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bps);
-#line 739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 741 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6175 "Photo.c"
+#line 6085 "Photo.c"
 				}
-#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp47_ = meta;
-#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp48_ = c;
-#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp49_ = photo_metadata_get_preview (_tmp47_, _tmp48_ - 1);
-#line 740 "/home/jens/Source/shotwell/src/Photo.vala"
-				prev = _tmp49_;
-#line 741 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp50_ = prev;
-#line 741 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp50_ == NULL) {
 #line 742 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_debug ("Photo.vala:742: Could not get preview from metadata");
+				_tmp50_ = meta;
+#line 742 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp51_ = c;
+#line 742 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp52_ = photo_metadata_get_preview (_tmp50_, _tmp51_ - 1);
+#line 742 "/home/jens/Source/shotwell/src/Photo.vala"
+				prev = _tmp52_;
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
-					_photo_preview_unref0 (prev);
+				_tmp53_ = prev;
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp53_ == NULL) {
+#line 744 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_debug ("Photo.vala:744: Could not get preview from metadata");
+#line 745 "/home/jens/Source/shotwell/src/Photo.vala"
+					_photo_preview_unref0 (prev);
+#line 745 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6195 "Photo.c"
+#line 6105 "Photo.c"
 					{
-						gboolean _tmp51_;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp51_ = wrote_img_to_disk;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						if (_tmp51_) {
-#line 6202 "Photo.c"
+						gboolean _tmp54_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp54_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						if (_tmp54_) {
+#line 6112 "Photo.c"
 							{
-								RawDeveloper _tmp52_;
-								BackingPhotoRow* _tmp53_;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp52_ = d;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp53_ = bps;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+								RawDeveloper _tmp55_;
+								BackingPhotoRow* _tmp56_;
+								gboolean _tmp57_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp55_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp56_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp57_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								photo_add_backing_photo_for_development (self, _tmp55_, _tmp56_, _tmp57_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6214 "Photo.c"
-									goto __catch272_g_error;
+#line 6127 "Photo.c"
+									goto __catch283_g_error;
 								}
-#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6219 "Photo.c"
+#line 6132 "Photo.c"
 							}
-							goto __finally272;
-							__catch272_g_error:
+							goto __finally283;
+							__catch283_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp54_;
-								const gchar* _tmp55_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+								GError* _tmp58_;
+								const gchar* _tmp59_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp54_ = e;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp55_ = _tmp54_->message;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp58_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp59_ = _tmp58_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp59_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6239 "Photo.c"
+#line 6152 "Photo.c"
 							}
-							__finally272:
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+							__finally283:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6244 "Photo.c"
-								goto __catch270_g_error;
+#line 6157 "Photo.c"
+								goto __catch281_g_error;
 							}
 						}
 					}
-#line 743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 745 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bps);
-#line 743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 745 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6253 "Photo.c"
+#line 6166 "Photo.c"
 				}
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp56_ = prev;
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp57_ = photo_preview_get_pixbuf (_tmp56_, &_inner_error_);
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
-				pix = _tmp57_;
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp60_ = prev;
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp61_ = photo_preview_flatten (_tmp60_, &_inner_error_);
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
+				pix = _tmp61_;
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_preview_unref0 (prev);
-#line 746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6267 "Photo.c"
-					goto __catch270_g_error;
+#line 6180 "Photo.c"
+					goto __catch281_g_error;
 				}
-#line 747 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp58_ = pix;
-#line 747 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp58_ == NULL) {
-#line 748 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_debug ("Photo.vala:748: Could not get preview pixbuf");
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
+				_tmp62_ = pix;
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp62_ == NULL) {
+#line 750 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_debug ("Photo.vala:750: Could not get preview pixbuf");
+#line 751 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_bytes_unref0 (pix);
+#line 751 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_preview_unref0 (prev);
-#line 749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 751 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6282 "Photo.c"
+#line 6195 "Photo.c"
 					{
-						gboolean _tmp59_;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp59_ = wrote_img_to_disk;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-						if (_tmp59_) {
-#line 6289 "Photo.c"
+						gboolean _tmp63_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp63_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+						if (_tmp63_) {
+#line 6202 "Photo.c"
 							{
-								RawDeveloper _tmp60_;
-								BackingPhotoRow* _tmp61_;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp60_ = d;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp61_ = bps;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-								photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+								RawDeveloper _tmp64_;
+								BackingPhotoRow* _tmp65_;
+								gboolean _tmp66_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp64_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp65_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp66_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+								photo_add_backing_photo_for_development (self, _tmp64_, _tmp65_, _tmp66_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6301 "Photo.c"
-									goto __catch273_g_error;
+#line 6217 "Photo.c"
+									goto __catch284_g_error;
 								}
-#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6306 "Photo.c"
+#line 6222 "Photo.c"
 							}
-							goto __finally273;
-							__catch273_g_error:
+							goto __finally284;
+							__catch284_g_error:
 							{
 								GError* e = NULL;
-								GError* _tmp62_;
-								const gchar* _tmp63_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+								GError* _tmp67_;
+								const gchar* _tmp68_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								e = _inner_error_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp62_ = e;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								_tmp63_ = _tmp62_->message;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp67_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								_tmp68_ = _tmp67_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+								g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp68_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6326 "Photo.c"
+#line 6242 "Photo.c"
 							}
-							__finally273:
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+							__finally284:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6331 "Photo.c"
-								goto __catch270_g_error;
+#line 6247 "Photo.c"
+								goto __catch281_g_error;
 							}
 						}
 					}
-#line 749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 751 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bps);
-#line 749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 751 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6340 "Photo.c"
-				}
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp65_ = d;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp66_ = self->row;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp67_ = _tmp66_->master;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp68_ = _tmp67_->filepath;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp69_ = raw_developer_create_backing_row_for_development (_tmp65_, _tmp68_, NULL, &_inner_error_);
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp64_ = _tmp69_;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-					_photo_preview_unref0 (prev);
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-					_media_metadata_unref0 (meta);
-#line 6362 "Photo.c"
-					goto __catch270_g_error;
-				}
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp70_ = _tmp64_;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp64_ = NULL;
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				_backing_photo_row_unref0 (bps);
-#line 753 "/home/jens/Source/shotwell/src/Photo.vala"
-				bps = _tmp70_;
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp71_ = bps;
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp72_ = _tmp71_->filepath;
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp73_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp72_, &_inner_error_);
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-				writer = _tmp73_;
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-					_backing_photo_row_unref0 (_tmp64_);
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-					_photo_preview_unref0 (prev);
-#line 754 "/home/jens/Source/shotwell/src/Photo.vala"
-					_media_metadata_unref0 (meta);
-#line 6391 "Photo.c"
-					goto __catch270_g_error;
+#line 6256 "Photo.c"
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp74_ = writer;
+				_tmp70_ = d;
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp75_ = pix;
+				_tmp71_ = self->row;
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_file_writer_write (_tmp74_, _tmp75_, JPEG_QUALITY_HIGH, &_inner_error_);
+				_tmp72_ = _tmp71_->master;
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
+				_tmp73_ = _tmp72_->filepath;
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-					_photo_file_adapter_unref0 (writer);
+				_tmp74_ = raw_developer_create_backing_row_for_development (_tmp70_, _tmp73_, NULL, &_inner_error_);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-					_backing_photo_row_unref0 (_tmp64_);
+				_tmp69_ = _tmp74_;
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_bytes_unref0 (pix);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_preview_unref0 (prev);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6412 "Photo.c"
-					goto __catch270_g_error;
+#line 6278 "Photo.c"
+					goto __catch281_g_error;
 				}
+#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp75_ = _tmp69_;
+#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp69_ = NULL;
+#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
+				_backing_photo_row_unref0 (bps);
+#line 755 "/home/jens/Source/shotwell/src/Photo.vala"
+				bps = _tmp75_;
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp77_ = pix;
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp78_ = jpeg_is_jpeg_bytes (_tmp77_, &_inner_error_);
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp76_ = _tmp78_;
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
-				wrote_img_to_disk = TRUE;
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp76_ = bps;
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp77_ = _tmp76_->filepath;
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp78_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp77_, &_inner_error_);
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-				mwriter = _tmp78_;
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_backing_photo_row_unref0 (_tmp69_);
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_bytes_unref0 (pix);
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_photo_preview_unref0 (prev);
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_media_metadata_unref0 (meta);
+#line 6305 "Photo.c"
+					goto __catch281_g_error;
+				}
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp76_) {
+#line 6310 "Photo.c"
+					GFile* outfile = NULL;
+					BackingPhotoRow* _tmp79_;
+					const gchar* _tmp80_;
+					GFile* _tmp81_;
+					GFile* _tmp82_;
+					GBytes* _tmp83_;
+					gsize _tmp84_;
+					guint8* _tmp85_;
+#line 760 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp79_ = bps;
+#line 760 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp80_ = _tmp79_->filepath;
+#line 760 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp81_ = g_file_new_for_path (_tmp80_);
+#line 760 "/home/jens/Source/shotwell/src/Photo.vala"
+					outfile = _tmp81_;
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp82_ = outfile;
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp83_ = pix;
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp85_ = g_bytes_get_data (_tmp83_, &_tmp84_);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_file_replace_contents (_tmp82_, _tmp85_, (gsize) _tmp84_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_object_unref0 (outfile);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (_tmp69_);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_bytes_unref0 (pix);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_preview_unref0 (prev);
+#line 761 "/home/jens/Source/shotwell/src/Photo.vala"
+						_media_metadata_unref0 (meta);
+#line 6347 "Photo.c"
+						goto __catch281_g_error;
+					}
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_object_unref0 (outfile);
+#line 6352 "Photo.c"
+				} else {
+					GdkPixbuf* pixbuf = NULL;
+					PhotoPreview* _tmp86_;
+					GdkPixbuf* _tmp87_;
+					GdkPixbuf* _tmp88_;
+					PhotoFileWriter* writer = NULL;
+					BackingPhotoRow* _tmp95_;
+					const gchar* _tmp96_;
+					PhotoFileWriter* _tmp97_;
+					PhotoFileWriter* _tmp98_;
+					GdkPixbuf* _tmp99_;
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp86_ = prev;
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp87_ = photo_preview_get_pixbuf (_tmp86_, &_inner_error_);
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+					pixbuf = _tmp87_;
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (_tmp69_);
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_bytes_unref0 (pix);
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_preview_unref0 (prev);
+#line 764 "/home/jens/Source/shotwell/src/Photo.vala"
+						_media_metadata_unref0 (meta);
+#line 6380 "Photo.c"
+						goto __catch281_g_error;
+					}
+#line 765 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp88_ = pixbuf;
+#line 765 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (_tmp88_ == NULL) {
+#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
+						g_debug ("Photo.vala:766: Could not get preview pixbuf");
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_object_unref0 (pixbuf);
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (_tmp69_);
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_bytes_unref0 (pix);
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_preview_unref0 (prev);
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_media_metadata_unref0 (meta);
+#line 6399 "Photo.c"
+						{
+							gboolean _tmp89_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp89_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+							if (_tmp89_) {
+#line 6406 "Photo.c"
+								{
+									RawDeveloper _tmp90_;
+									BackingPhotoRow* _tmp91_;
+									gboolean _tmp92_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+									_tmp90_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+									_tmp91_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+									_tmp92_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+									photo_add_backing_photo_for_development (self, _tmp90_, _tmp91_, _tmp92_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+									if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6421 "Photo.c"
+										goto __catch285_g_error;
+									}
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
+									photo_notify_raw_development_modified (self);
+#line 6426 "Photo.c"
+								}
+								goto __finally285;
+								__catch285_g_error:
+								{
+									GError* e = NULL;
+									GError* _tmp93_;
+									const gchar* _tmp94_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
+									e = _inner_error_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
+									_inner_error_ = NULL;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+									_tmp93_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+									_tmp94_ = _tmp93_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+									g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp94_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
+									_g_error_free0 (e);
+#line 6446 "Photo.c"
+								}
+								__finally285:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
+								if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6451 "Photo.c"
+									goto __catch281_g_error;
+								}
+							}
+						}
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (bps);
+#line 767 "/home/jens/Source/shotwell/src/Photo.vala"
+						return;
+#line 6460 "Photo.c"
+					}
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp95_ = bps;
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp96_ = _tmp95_->filepath;
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp97_ = photo_file_format_create_writer (PHOTO_FILE_FORMAT_JFIF, _tmp96_, &_inner_error_);
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+					writer = _tmp97_;
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_object_unref0 (pixbuf);
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (_tmp69_);
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_bytes_unref0 (pix);
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_preview_unref0 (prev);
+#line 770 "/home/jens/Source/shotwell/src/Photo.vala"
+						_media_metadata_unref0 (meta);
+#line 6482 "Photo.c"
+						goto __catch281_g_error;
+					}
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp98_ = writer;
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp99_ = pixbuf;
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+					photo_file_writer_write (_tmp98_, _tmp99_, JPEG_QUALITY_HIGH, &_inner_error_);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_file_adapter_unref0 (writer);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_object_unref0 (pixbuf);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_backing_photo_row_unref0 (_tmp69_);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_g_bytes_unref0 (pix);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_photo_preview_unref0 (prev);
+#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						_media_metadata_unref0 (meta);
+#line 6505 "Photo.c"
+						goto __catch281_g_error;
+					}
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (writer);
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-					_backing_photo_row_unref0 (_tmp64_);
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 759 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_object_unref0 (pixbuf);
+#line 6512 "Photo.c"
+				}
+#line 777 "/home/jens/Source/shotwell/src/Photo.vala"
+				wrote_img_to_disk = TRUE;
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp100_ = bps;
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp101_ = _tmp100_->filepath;
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp102_ = photo_file_format_create_metadata_writer (PHOTO_FILE_FORMAT_JFIF, _tmp101_, &_inner_error_);
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+				mwriter = _tmp102_;
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+					_backing_photo_row_unref0 (_tmp69_);
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_bytes_unref0 (pix);
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_preview_unref0 (prev);
-#line 762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6437 "Photo.c"
-					goto __catch270_g_error;
+#line 6534 "Photo.c"
+					goto __catch281_g_error;
 				}
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp79_ = mwriter;
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp80_ = meta;
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_file_metadata_writer_write_metadata (_tmp79_, _tmp80_, &_inner_error_);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp103_ = mwriter;
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp104_ = meta;
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_file_metadata_writer_write_metadata (_tmp103_, _tmp104_, &_inner_error_);
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (mwriter);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-					_photo_file_adapter_unref0 (writer);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-					_backing_photo_row_unref0 (_tmp64_);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (pix);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
+					_backing_photo_row_unref0 (_tmp69_);
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
+					_g_bytes_unref0 (pix);
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_preview_unref0 (prev);
-#line 763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 781 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6460 "Photo.c"
-					goto __catch270_g_error;
+#line 6555 "Photo.c"
+					goto __catch281_g_error;
 				}
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
-				_photo_file_adapter_unref0 (writer);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
-				_backing_photo_row_unref0 (_tmp64_);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
-				_g_object_unref0 (pix);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
+				_backing_photo_row_unref0 (_tmp69_);
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
+				_g_bytes_unref0 (pix);
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_preview_unref0 (prev);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (meta);
-#line 6475 "Photo.c"
+#line 6568 "Photo.c"
 			}
-			goto __finally270;
-			__catch270_g_error:
+			goto __finally281;
+			__catch281_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp81_;
-				const gchar* _tmp82_;
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+				GError* _tmp105_;
+				const gchar* _tmp106_;
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp81_ = e;
-#line 765 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp82_ = _tmp81_->message;
-#line 765 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_);
-#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 783 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp105_ = e;
+#line 783 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp106_ = _tmp105_->message;
+#line 783 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_debug ("Photo.vala:783: Error accessing embedded preview. Message: %s", _tmp106_);
+#line 784 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6495 "Photo.c"
+#line 6588 "Photo.c"
 				{
-					gboolean _tmp83_;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp83_ = wrote_img_to_disk;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-					if (_tmp83_) {
-#line 6502 "Photo.c"
+					gboolean _tmp107_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp107_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+					if (_tmp107_) {
+#line 6595 "Photo.c"
 						{
-							RawDeveloper _tmp84_;
-							BackingPhotoRow* _tmp85_;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp84_ = d;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp85_ = bps;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-							photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+							RawDeveloper _tmp108_;
+							BackingPhotoRow* _tmp109_;
+							gboolean _tmp110_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp108_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp109_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp110_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+							photo_add_backing_photo_for_development (self, _tmp108_, _tmp109_, _tmp110_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6514 "Photo.c"
-								goto __catch274_g_error;
+#line 6610 "Photo.c"
+								goto __catch286_g_error;
 							}
-#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6519 "Photo.c"
+#line 6615 "Photo.c"
 						}
-						goto __finally274;
-						__catch274_g_error:
+						goto __finally286;
+						__catch286_g_error:
 						{
 							GError* e = NULL;
-							GError* _tmp86_;
-							const gchar* _tmp87_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+							GError* _tmp111_;
+							const gchar* _tmp112_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							e = _inner_error_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							_inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp86_ = e;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp87_ = _tmp86_->message;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-							g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp111_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp112_ = _tmp111_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+							g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp112_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_error_free0 (e);
-#line 6539 "Photo.c"
+#line 6635 "Photo.c"
 						}
-						__finally274:
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+						__finally286:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (bps);
-#line 6546 "Photo.c"
+#line 6642 "Photo.c"
 						}
 					}
 				}
-#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 784 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bps);
-#line 766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 784 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6554 "Photo.c"
+#line 6650 "Photo.c"
 			}
-			__finally270:
+			__finally281:
 			{
-				gboolean _tmp88_;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp88_ = wrote_img_to_disk;
-#line 768 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp88_) {
-#line 6563 "Photo.c"
+				gboolean _tmp113_;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp113_ = wrote_img_to_disk;
+#line 786 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp113_) {
+#line 6659 "Photo.c"
 					{
-						RawDeveloper _tmp89_;
-						BackingPhotoRow* _tmp90_;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp89_ = d;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp90_ = bps;
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
-						photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/Photo.vala"
+						RawDeveloper _tmp114_;
+						BackingPhotoRow* _tmp115_;
+						gboolean _tmp116_;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp114_ = d;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp115_ = bps;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp116_ = notify;
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+						photo_add_backing_photo_for_development (self, _tmp114_, _tmp115_, _tmp116_, &_inner_error_);
+#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6575 "Photo.c"
-							goto __catch275_g_error;
+#line 6674 "Photo.c"
+							goto __catch287_g_error;
 						}
-#line 773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 791 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6580 "Photo.c"
+#line 6679 "Photo.c"
 					}
-					goto __finally275;
-					__catch275_g_error:
+					goto __finally287;
+					__catch287_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp91_;
-						const gchar* _tmp92_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+						GError* _tmp117_;
+						const gchar* _tmp118_;
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						e = _inner_error_;
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						_inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp91_ = e;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp92_ = _tmp91_->message;
-#line 775 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp117_ = e;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+						_tmp118_ = _tmp117_->message;
+#line 793 "/home/jens/Source/shotwell/src/Photo.vala"
+						g_debug ("Photo.vala:793: Error adding backing photo as development. Message: %s", _tmp118_);
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 6600 "Photo.c"
+#line 6699 "Photo.c"
 					}
-					__finally275:
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+					__finally287:
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bps);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/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 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_clear_error (&_inner_error_);
-#line 769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 787 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6613 "Photo.c"
+#line 6712 "Photo.c"
 					}
 				}
 			}
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bps);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/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 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6627 "Photo.c"
+#line 6726 "Photo.c"
 			}
-#line 780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 798 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6631 "Photo.c"
+#line 6730 "Photo.c"
 		}
 		default:
 		{
-#line 783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 801 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6637 "Photo.c"
+#line 6736 "Photo.c"
 		}
 	}
-#line 670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6642 "Photo.c"
+#line 6741 "Photo.c"
 }
 
 
 void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 806 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 6650 "Photo.c"
+#line 6749 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 6657 "Photo.c"
+#line 6756 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			RawDeveloper _tmp2_;
-#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_->developer = _tmp2_;
-#line 6667 "Photo.c"
+#line 6766 "Photo.c"
 		}
-		__finally276:
+		__finally288:
 		{
 			PhotoRow* _tmp3_;
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6676 "Photo.c"
+#line 6775 "Photo.c"
 		}
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/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 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6686 "Photo.c"
+#line 6785 "Photo.c"
 		}
 	}
 }
 
 
-void photo_set_raw_developer (Photo* self, RawDeveloper d) {
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify) {
 	PhotoFileFormat _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
-	gboolean _tmp4_;
-	Alteration* _tmp48_;
-	Alteration* _tmp49_;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_;
+	gboolean _tmp51_;
 	GError * _inner_error_ = NULL;
-#line 795 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 815 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 6708 "Photo.c"
+#line 6807 "Photo.c"
 	}
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_CAMERA);
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 6714 "Photo.c"
+#line 6813 "Photo.c"
 		RawDeveloper _tmp3_;
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = d;
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 6720 "Photo.c"
+#line 6819 "Photo.c"
 	} else {
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6724 "Photo.c"
+#line 6823 "Photo.c"
 	}
-#line 802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 821 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_CAMERA;
-#line 6730 "Photo.c"
+#line 6829 "Photo.c"
 	}
-#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
-#line 807 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (!_tmp4_) {
-#line 808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp5_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (!_tmp5_) {
+#line 6835 "Photo.c"
+		RawDeveloper _tmp6_;
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp6_ = d;
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp4_ = _tmp6_ != RAW_DEVELOPER_CAMERA;
+#line 6841 "Photo.c"
+	} else {
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp4_ = FALSE;
+#line 6845 "Photo.c"
+	}
+#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp4_) {
+#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_SHOTWELL;
-#line 6738 "Photo.c"
+#line 6851 "Photo.c"
 	}
 	{
-		GeeHashMap* _tmp5_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp5_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+		GeeHashMap* _tmp7_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp7_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6746 "Photo.c"
+#line 6859 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
-			PhotoRow* _tmp6_;
-			RawDeveloper _tmp7_;
-			RawDeveloper _tmp8_;
-			gboolean _tmp9_;
-			GeeHashMap* _tmp11_;
-			RawDeveloper _tmp12_;
-			gboolean _tmp13_;
-			PhotoRow* _tmp15_;
-			RawDeveloper _tmp16_;
-			GeeHashMap* _tmp17_;
-			RawDeveloper _tmp18_;
-			gpointer _tmp19_;
-			PhotoBackingReaders* _tmp20_;
-			BackingPhotoRow* _tmp21_;
-			PhotoFileFormat _tmp22_;
-			BackingPhotoRow* _tmp23_;
-			const gchar* _tmp24_;
-			PhotoFileReader* _tmp25_;
-			BackingPhotoRow* _tmp30_;
-			Orientation _tmp31_;
-			gboolean _tmp41_ = FALSE;
-			RawDeveloper _tmp42_;
-#line 811 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp6_ = self->row;
-#line 811 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp7_ = _tmp6_->developer;
-#line 811 "/home/jens/Source/shotwell/src/Photo.vala"
-			stale_raw_developer = _tmp7_;
-#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp8_ = d;
-#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
-#line 814 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp9_) {
-#line 6783 "Photo.c"
-				RawDeveloper _tmp10_;
-#line 815 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp10_ = d;
-#line 815 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_develop_photo (self, _tmp10_);
-#line 6789 "Photo.c"
-			}
-#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp11_ = self->priv->developments;
-#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp12_ = d;
-#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_));
-#line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp13_) {
-#line 6799 "Photo.c"
+			PhotoRow* _tmp8_;
+			RawDeveloper _tmp9_;
+			RawDeveloper _tmp10_;
+			gboolean _tmp11_;
+			GeeHashMap* _tmp14_;
+			RawDeveloper _tmp15_;
+			gboolean _tmp16_;
+			PhotoRow* _tmp18_;
+			RawDeveloper _tmp19_;
+			GeeHashMap* _tmp20_;
+			RawDeveloper _tmp21_;
+			gpointer _tmp22_;
+			PhotoBackingReaders* _tmp23_;
+			BackingPhotoRow* _tmp24_;
+			PhotoFileFormat _tmp25_;
+			BackingPhotoRow* _tmp26_;
+			const gchar* _tmp27_;
+			PhotoFileReader* _tmp28_;
+			BackingPhotoRow* _tmp33_;
+			Orientation _tmp34_;
+			gboolean _tmp44_ = FALSE;
+			RawDeveloper _tmp45_;
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp8_ = self->row;
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp9_ = _tmp8_->developer;
+#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+			stale_raw_developer = _tmp9_;
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp10_ = d;
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp11_ = photo_is_raw_developer_complete (self, _tmp10_);
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (!_tmp11_) {
+#line 6896 "Photo.c"
+				RawDeveloper _tmp12_;
+				gboolean _tmp13_;
+#line 833 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp12_ = d;
+#line 833 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp13_ = notify;
+#line 833 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_develop_photo (self, _tmp12_, _tmp13_);
+#line 6905 "Photo.c"
+			}
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp14_ = self->priv->developments;
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp15_ = d;
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp15_));
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (!_tmp16_) {
+#line 6915 "Photo.c"
 				{
-					GeeHashMap* _tmp14_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp14_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+					GeeHashMap* _tmp17_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp17_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6806 "Photo.c"
+#line 6922 "Photo.c"
 				}
-#line 818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6810 "Photo.c"
+#line 6926 "Photo.c"
 			}
-#line 821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_revert_to_master (self, FALSE);
-#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_ = self->row;
-#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp16_ = d;
-#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_->developer = _tmp16_;
-#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp17_ = self->priv->developments;
-#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp18_ = d;
-#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp18_));
-#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 842 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp18_ = self->row;
+#line 842 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp19_ = d;
+#line 842 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp18_->developer = _tmp19_;
+#line 843 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp20_ = self->priv->developments;
+#line 843 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp21_ = d;
+#line 843 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp21_));
+#line 843 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (self->backing_photo_row);
-#line 825 "/home/jens/Source/shotwell/src/Photo.vala"
-			self->backing_photo_row = (BackingPhotoRow*) _tmp19_;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp20_ = self->priv->readers;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp21_ = self->backing_photo_row;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp22_ = _tmp21_->file_format;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp23_ = self->backing_photo_row;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_ = _tmp23_->filepath;
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp25_ = photo_file_format_create_reader (_tmp22_, _tmp24_);
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_photo_file_adapter_unref0 (_tmp20_->developer);
-#line 826 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp20_->developer = _tmp25_;
-#line 6846 "Photo.c"
+#line 843 "/home/jens/Source/shotwell/src/Photo.vala"
+			self->backing_photo_row = (BackingPhotoRow*) _tmp22_;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp23_ = self->priv->readers;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp24_ = self->backing_photo_row;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp25_ = _tmp24_->file_format;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp26_ = self->backing_photo_row;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp27_ = _tmp26_->filepath;
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp28_ = photo_file_format_create_reader (_tmp25_, _tmp27_);
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_photo_file_adapter_unref0 (_tmp23_->developer);
+#line 844 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp23_->developer = _tmp28_;
+#line 6962 "Photo.c"
 			{
-				GdkPixbuf* _tmp26_;
-				GdkPixbuf* _tmp27_;
-#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp26_ = photo_get_prefetched_copy (self, &_inner_error_);
-#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp27_ = _tmp26_;
-#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
-				_g_object_unref0 (_tmp27_);
-#line 829 "/home/jens/Source/shotwell/src/Photo.vala"
+				GdkPixbuf* _tmp29_;
+				GdkPixbuf* _tmp30_;
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp29_ = photo_get_prefetched_copy (self, &_inner_error_);
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp30_ = _tmp29_;
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+				_g_object_unref0 (_tmp30_);
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6858 "Photo.c"
-					goto __catch278_g_error;
+#line 6974 "Photo.c"
+					goto __catch290_g_error;
 				}
 			}
-			goto __finally278;
-			__catch278_g_error:
+			goto __finally290;
+			__catch290_g_error:
 			{
 				GError* e = NULL;
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6872 "Photo.c"
+#line 6988 "Photo.c"
 				{
-					GeeHashMap* _tmp28_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp28_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+					GeeHashMap* _tmp31_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp31_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6879 "Photo.c"
+#line 6995 "Photo.c"
 				}
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6883 "Photo.c"
+#line 6999 "Photo.c"
 			}
-			__finally278:
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally290:
+#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6888 "Photo.c"
+#line 7004 "Photo.c"
 				{
-					GeeHashMap* _tmp29_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp29_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+					GeeHashMap* _tmp32_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp32_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6895 "Photo.c"
+#line 7011 "Photo.c"
 				}
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 846 "/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);
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6903 "Photo.c"
-			}
-#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp30_ = self->backing_photo_row;
-#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp31_ = _tmp30_->original_orientation;
-#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_set_orientation (self, _tmp31_);
-#line 6911 "Photo.c"
+#line 7019 "Photo.c"
+			}
+#line 853 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp33_ = self->backing_photo_row;
+#line 853 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp34_ = _tmp33_->original_orientation;
+#line 853 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_set_orientation (self, _tmp34_);
+#line 7027 "Photo.c"
 			{
-				PhotoTable* _tmp32_;
-				PhotoTable* _tmp33_;
-				PhotoRow* _tmp34_;
-				RawDeveloper _tmp35_;
-				BackingPhotoRow* _tmp36_;
-				BackingPhotoID _tmp37_;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp32_ = photo_table_get_instance ();
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp33_ = _tmp32_;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp34_ = self->row;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp35_ = d;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp36_ = self->backing_photo_row;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp37_ = _tmp36_->id;
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_table_update_raw_development (_tmp33_, _tmp34_, _tmp35_, &_tmp37_, &_inner_error_);
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
-				_database_table_unref0 (_tmp33_);
-#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
+				PhotoTable* _tmp35_;
+				PhotoTable* _tmp36_;
+				PhotoRow* _tmp37_;
+				RawDeveloper _tmp38_;
+				BackingPhotoRow* _tmp39_;
+				BackingPhotoID _tmp40_;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp35_ = photo_table_get_instance ();
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp36_ = _tmp35_;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp37_ = self->row;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp38_ = d;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp39_ = self->backing_photo_row;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp40_ = _tmp39_->id;
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_table_update_raw_development (_tmp36_, _tmp37_, _tmp38_, &_tmp40_, &_inner_error_);
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
+				_database_table_unref0 (_tmp36_);
+#line 856 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6937 "Photo.c"
-					goto __catch279_g_error;
+#line 7053 "Photo.c"
+					goto __catch291_g_error;
 				}
 			}
-			goto __finally279;
-			__catch279_g_error:
+			goto __finally291;
+			__catch291_g_error:
 			{
 				GError* e = NULL;
-				GError* _tmp38_;
-				const gchar* _tmp39_;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+				GError* _tmp41_;
+				const gchar* _tmp42_;
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp38_ = e;
-#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp39_ = _tmp38_->message;
-#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:840: Error updating database: %s", _tmp39_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp41_ = e;
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp42_ = _tmp41_->message;
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:858: Error updating database: %s", _tmp42_);
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6959 "Photo.c"
+#line 7075 "Photo.c"
 			}
-			__finally279:
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally291:
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6964 "Photo.c"
+#line 7080 "Photo.c"
 				{
-					GeeHashMap* _tmp40_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp40_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+					GeeHashMap* _tmp43_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+					_tmp43_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6971 "Photo.c"
+#line 7087 "Photo.c"
 				}
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 855 "/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);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 855 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6979 "Photo.c"
-			}
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp42_ = stale_raw_developer;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6985 "Photo.c"
-				RawDeveloper _tmp43_;
-				PhotoRow* _tmp44_;
-				RawDeveloper _tmp45_;
-#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp43_ = stale_raw_developer;
-#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp44_ = self->row;
-#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp45_ = _tmp44_->developer;
-#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp41_ = _tmp43_ != _tmp45_;
-#line 6997 "Photo.c"
-			} else {
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp41_ = FALSE;
-#line 7001 "Photo.c"
+#line 7095 "Photo.c"
 			}
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp41_) {
-#line 7005 "Photo.c"
+#line 865 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp45_ = stale_raw_developer;
+#line 865 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (_tmp45_ != RAW_DEVELOPER_CAMERA) {
+#line 7101 "Photo.c"
 				RawDeveloper _tmp46_;
-#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
+				PhotoRow* _tmp47_;
+				RawDeveloper _tmp48_;
+#line 866 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = stale_raw_developer;
-#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo_delete_raw_development (self, _tmp46_);
-#line 7011 "Photo.c"
+#line 866 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp47_ = self->row;
+#line 866 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp48_ = _tmp47_->developer;
+#line 866 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp44_ = _tmp46_ != _tmp48_;
+#line 7113 "Photo.c"
+			} else {
+#line 865 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp44_ = FALSE;
+#line 7117 "Photo.c"
+			}
+#line 865 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (_tmp44_) {
+#line 7121 "Photo.c"
+				RawDeveloper _tmp49_;
+#line 869 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp49_ = stale_raw_developer;
+#line 869 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo_delete_raw_development (self, _tmp49_);
+#line 7127 "Photo.c"
 			}
 		}
-		__finally277:
+		__finally289:
 		{
-			GeeHashMap* _tmp47_;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp47_ = self->priv->developments;
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+			GeeHashMap* _tmp50_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp50_ = self->priv->developments;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7021 "Photo.c"
+#line 7137 "Photo.c"
 		}
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/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 810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7031 "Photo.c"
+#line 7147 "Photo.c"
 		}
 	}
-#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp48_ = alteration_new ("image", "developer");
-#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp49_ = _tmp48_;
-#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
-	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_);
-#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp49_);
-#line 859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp51_ = notify;
+#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp51_) {
+#line 7154 "Photo.c"
+		Alteration* _tmp52_;
+		Alteration* _tmp53_;
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp52_ = alteration_new ("image", "developer");
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp53_ = _tmp52_;
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp53_);
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+		_alteration_unref0 (_tmp53_);
+#line 7165 "Photo.c"
+	}
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 7044 "Photo.c"
+#line 7169 "Photo.c"
 }
 
 
@@ -7048,17 +7173,17 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	RawDeveloper result = 0;
 	PhotoRow* _tmp0_;
 	RawDeveloper _tmp1_;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->developer;
-#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7062 "Photo.c"
+#line 7187 "Photo.c"
 }
 
 
@@ -7066,18 +7191,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GError * _inner_error_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 888 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = FALSE;
-#line 7074 "Photo.c"
+#line 7199 "Photo.c"
 	{
 		GeeHashMap* _tmp0_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7081 "Photo.c"
+#line 7206 "Photo.c"
 		{
 			GeeHashMap* _tmp1_;
 			RawDeveloper _tmp2_;
@@ -7096,162 +7221,162 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			GeeHashMap* _tmp39_;
 			RawDeveloper _tmp40_;
 			gboolean _tmp41_;
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp3_) {
-#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 7110 "Photo.c"
+#line 7235 "Photo.c"
 				{
 					GeeHashMap* _tmp4_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7117 "Photo.c"
+#line 7242 "Photo.c"
 				}
-#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7121 "Photo.c"
+#line 7246 "Photo.c"
 			}
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = d;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = raw_developer_to_string (_tmp7_);
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_debug ("Photo.vala:877: Delete raw development: %s %s", _tmp6_, _tmp9_);
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_debug ("Photo.vala:896: Delete raw development: %s %s", _tmp6_, _tmp9_);
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp9_);
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp6_);
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->priv->developments;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = d;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp11_));
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 897 "/home/jens/Source/shotwell/src/Photo.vala"
 			bpr = (BackingPhotoRow*) _tmp12_;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = bpr;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->filepath;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp14_ != NULL) {
-#line 7153 "Photo.c"
+#line 7278 "Photo.c"
 				GFile* f = NULL;
 				BackingPhotoRow* _tmp15_;
 				const gchar* _tmp16_;
 				GFile* _tmp17_;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = bpr;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->filepath;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_file_new_for_path (_tmp16_);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = _tmp17_;
-#line 7166 "Photo.c"
+#line 7291 "Photo.c"
 				{
 					RawDeveloper _tmp18_;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 901 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = d;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 901 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7173 "Photo.c"
+#line 7298 "Photo.c"
 						GFile* _tmp19_;
-#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
-#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7181 "Photo.c"
-							goto __catch281_g_error;
+#line 7306 "Photo.c"
+							goto __catch293_g_error;
 						}
 					} else {
 						GFile* _tmp20_;
-#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 904 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = f;
-#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 904 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
-#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 904 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7192 "Photo.c"
-							goto __catch281_g_error;
+#line 7317 "Photo.c"
+							goto __catch293_g_error;
 						}
 					}
 				}
-				goto __finally281;
-				__catch281_g_error:
+				goto __finally293;
+				__catch293_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp21_;
 					const gchar* _tmp22_;
 					GError* _tmp23_;
 					const gchar* _tmp24_;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					e = _inner_error_;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_inner_error_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = bpr;
-#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->filepath;
-#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = e;
-#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_->message;
-#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_warning ("Photo.vala:887: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
+					g_warning ("Photo.vala:906: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (e);
-#line 7221 "Photo.c"
+#line 7346 "Photo.c"
 				}
-				__finally281:
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+				__finally293:
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7226 "Photo.c"
+#line 7351 "Photo.c"
 					gboolean _tmp26_ = FALSE;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 7236 "Photo.c"
+#line 7361 "Photo.c"
 					{
 						GeeHashMap* _tmp25_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7243 "Photo.c"
+#line 7368 "Photo.c"
 					}
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/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);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 900 "/home/jens/Source/shotwell/src/Photo.vala"
 					return _tmp26_;
-#line 7251 "Photo.c"
+#line 7376 "Photo.c"
 				}
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7255 "Photo.c"
+#line 7380 "Photo.c"
 			}
 			{
 				PhotoTable* _tmp27_;
@@ -7262,242 +7387,242 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				BackingPhotoTable* _tmp32_;
 				BackingPhotoRow* _tmp33_;
 				BackingPhotoID _tmp34_;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = photo_table_get_instance ();
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _tmp27_;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = self->row;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = d;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_remove_development (_tmp28_, _tmp29_, _tmp30_, &_inner_error_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp28_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7280 "Photo.c"
-					goto __catch282_g_error;
+#line 7405 "Photo.c"
+					goto __catch294_g_error;
 				}
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = backing_photo_table_get_instance ();
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = _tmp31_;
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = bpr;
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_->id;
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp32_, &_tmp34_, &_inner_error_);
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp32_);
-#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7297 "Photo.c"
-					goto __catch282_g_error;
+#line 7422 "Photo.c"
+					goto __catch294_g_error;
 				}
 			}
-			goto __finally282;
-			__catch282_g_error:
+			goto __finally294;
+			__catch294_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp35_;
 				const gchar* _tmp36_;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 915 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = e;
-#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 915 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _tmp35_->message;
-#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp36_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 915 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:915: Database error while deleting RAW development: %s", _tmp36_);
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 7319 "Photo.c"
+#line 7444 "Photo.c"
 			}
-			__finally282:
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally294:
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7324 "Photo.c"
+#line 7449 "Photo.c"
 				gboolean _tmp38_ = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 7330 "Photo.c"
+#line 7455 "Photo.c"
 				{
 					GeeHashMap* _tmp37_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7337 "Photo.c"
+#line 7462 "Photo.c"
 				}
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/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);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp38_;
-#line 7345 "Photo.c"
+#line 7470 "Photo.c"
 			}
-#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = self->priv->developments;
-#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = d;
-#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp40_), NULL);
-#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp41_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7357 "Photo.c"
+#line 7482 "Photo.c"
 		}
-		__finally280:
+		__finally292:
 		{
 			GeeHashMap* _tmp42_;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7366 "Photo.c"
+#line 7491 "Photo.c"
 		}
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7370 "Photo.c"
+#line 7495 "Photo.c"
 			gboolean _tmp43_ = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/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 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 890 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp43_;
-#line 7378 "Photo.c"
+#line 7503 "Photo.c"
 		}
 	}
-#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_raw_development_modified (self);
-#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = ret;
-#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7387 "Photo.c"
+#line 7512 "Photo.c"
 }
 
 
 void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 7395 "Photo.c"
+#line 7520 "Photo.c"
 	{
 		GeeHashMap* _tmp0_;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7402 "Photo.c"
+#line 7527 "Photo.c"
 		{
 			RawDeveloper _tmp1_;
 			RawDeveloper dev = 0;
 			RawDeveloper _tmp2_;
 			RawDeveloper _tmp3_;
 			RawDeveloper _tmp4_;
-#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = d;
-#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_delete_raw_development (self, _tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 			dev = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dev;
-#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
-#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 931 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev = RAW_DEVELOPER_EMBEDDED;
-#line 7423 "Photo.c"
+#line 7548 "Photo.c"
 			}
-#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = dev;
-#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_set_raw_developer (self, _tmp4_);
-#line 7429 "Photo.c"
+#line 933 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_set_raw_developer (self, _tmp4_, TRUE);
+#line 7554 "Photo.c"
 		}
-		__finally283:
+		__finally295:
 		{
 			GeeHashMap* _tmp5_;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7438 "Photo.c"
+#line 7563 "Photo.c"
 		}
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/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 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7448 "Photo.c"
+#line 7573 "Photo.c"
 		}
 	}
 }
 
 
-static void _vala_array_add85 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add89 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7461 "Photo.c"
+#line 7586 "Photo.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7467 "Photo.c"
+#line 7592 "Photo.c"
 }
 
 
-static void _vala_array_add86 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add90 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7478 "Photo.c"
+#line 7603 "Photo.c"
 	}
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7484 "Photo.c"
+#line 7609 "Photo.c"
 }
 
 
-static void _vala_array_add87 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add91 (BackingFileState** * array, int* length, int* size, BackingFileState* value) {
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7495 "Photo.c"
+#line 7620 "Photo.c"
 	}
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7501 "Photo.c"
+#line 7626 "Photo.c"
 }
 
 
@@ -7511,24 +7636,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp27_;
 	gint _tmp27__length1;
 	GError * _inner_error_ = NULL;
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 937 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 0 + 1);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp0_;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_length1 = 0;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_size_ = backing_length1;
-#line 7525 "Photo.c"
+#line 7650 "Photo.c"
 	{
 		PhotoRow* _tmp1_;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7532 "Photo.c"
+#line 7657 "Photo.c"
 		{
 			BackingFileState** _tmp2_;
 			gint _tmp2__length1;
@@ -7539,73 +7664,73 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			BackingFileState* _tmp7_;
 			gboolean _tmp8_;
 			gboolean _tmp12_;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2__length1 = backing_length1;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->master;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->md5;
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_);
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_);
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_);
+#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_has_editable (self);
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 7563 "Photo.c"
+#line 7688 "Photo.c"
 				BackingFileState** _tmp9_;
 				gint _tmp9__length1;
 				BackingPhotoRow* _tmp10_;
 				BackingFileState* _tmp11_;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = backing;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9__length1 = backing_length1;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->priv->editable;
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
-#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7578 "Photo.c"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
+				_vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp11_);
+#line 7703 "Photo.c"
 			}
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_is_developed (self);
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_) {
-#line 7584 "Photo.c"
+#line 7709 "Photo.c"
 				GeeCollection* dev_rows = NULL;
 				GeeCollection* _tmp13_;
 				GeeCollection* _tmp14_;
-#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_get_raw_development_photo_rows (self);
-#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev_rows = _tmp13_;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 946 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev_rows;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 946 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_ != NULL) {
-#line 7596 "Photo.c"
+#line 7721 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
 						GeeCollection* _tmp15_;
 						GeeIterator* _tmp16_;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = dev_rows;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 						_r_it = _tmp16_;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 7609 "Photo.c"
+#line 7734 "Photo.c"
 							GeeIterator* _tmp17_;
 							gboolean _tmp18_;
 							BackingPhotoRow* r = NULL;
@@ -7617,246 +7742,246 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							gint _tmp23__length1;
 							BackingPhotoRow* _tmp24_;
 							BackingFileState* _tmp25_;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _r_it;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = gee_iterator_next (_tmp17_);
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp18_) {
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7629 "Photo.c"
+#line 7754 "Photo.c"
 							}
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = gee_iterator_get (_tmp19_);
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							r = (BackingPhotoRow*) _tmp20_;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = r;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->filepath;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
-							g_debug ("Photo.vala:929: adding: %s", _tmp22_);
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
+							g_debug ("Photo.vala:948: adding: %s", _tmp22_);
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = backing;
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23__length1 = backing_length1;
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = r;
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL);
-#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
-							_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 949 "/home/jens/Source/shotwell/src/Photo.vala"
+							_vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp25_);
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
-#line 7655 "Photo.c"
+#line 7780 "Photo.c"
 						}
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7659 "Photo.c"
+#line 7784 "Photo.c"
 					}
 				}
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7664 "Photo.c"
+#line 7789 "Photo.c"
 			}
 		}
-		__finally284:
+		__finally296:
 		{
 			PhotoRow* _tmp26_;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7674 "Photo.c"
+#line 7799 "Photo.c"
 		}
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/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 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 7686 "Photo.c"
+#line 7811 "Photo.c"
 		}
 	}
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27__length1 = backing_length1;
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp27__length1;
-#line 7697 "Photo.c"
+#line 7822 "Photo.c"
 	}
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp27_;
-#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 955 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7703 "Photo.c"
+#line 7828 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) {
 	PhotoFileReader* result = NULL;
 	BackingFetchMode _tmp0_;
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 958 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = mode;
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp0_) {
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_MASTER:
-#line 7718 "Photo.c"
+#line 7843 "Photo.c"
 		{
 			PhotoFileReader* _tmp1_;
-#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_master_reader (self);
-#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7727 "Photo.c"
+#line 7852 "Photo.c"
 		}
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7731 "Photo.c"
+#line 7856 "Photo.c"
 		{
 			PhotoFileReader* _tmp2_;
-#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 964 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = photo_get_baseline_reader (self);
-#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 964 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 964 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7740 "Photo.c"
+#line 7865 "Photo.c"
 		}
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7744 "Photo.c"
+#line 7869 "Photo.c"
 		{
 			PhotoFileReader* _tmp3_;
-#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_source_reader (self);
-#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7753 "Photo.c"
+#line 7878 "Photo.c"
 		}
-#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 959 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7757 "Photo.c"
+#line 7882 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_;
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 970 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_master_file_format (self);
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 970 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7764 "Photo.c"
+#line 7889 "Photo.c"
 				PhotoFileReader* _tmp5_;
-#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 971 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
-#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 971 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 971 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7772 "Photo.c"
+#line 7897 "Photo.c"
 			} else {
 				PhotoFileReader* _tmp6_;
-#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 973 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_get_master_reader (self);
-#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 973 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp6_;
-#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 973 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7781 "Photo.c"
+#line 7906 "Photo.c"
 			}
 		}
 		default:
 		{
 			BackingFetchMode _tmp7_;
 			GEnumValue* _tmp8_;
-#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = mode;
-#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
-#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:957: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
-#line 7794 "Photo.c"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:976: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
+#line 7919 "Photo.c"
 		}
 	}
 }
 
 
 static gpointer _photo_file_adapter_ref0 (gpointer self) {
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_file_adapter_ref (self) : NULL;
-#line 7803 "Photo.c"
+#line 7928 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_master_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7812 "Photo.c"
+#line 7937 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7819 "Photo.c"
+#line 7944 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			PhotoFileReader* _tmp3_;
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7832 "Photo.c"
+#line 7957 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7839 "Photo.c"
+#line 7964 "Photo.c"
 			}
-#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7843 "Photo.c"
+#line 7968 "Photo.c"
 		}
-		__finally285:
+		__finally297:
 		{
 			PhotoBackingReaders* _tmp5_;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7852 "Photo.c"
+#line 7977 "Photo.c"
 		}
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/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 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7860 "Photo.c"
+#line 7985 "Photo.c"
 	}
 }
 
@@ -7864,57 +7989,57 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 PhotoFileReader* photo_get_editable_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 986 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7870 "Photo.c"
+#line 7995 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7877 "Photo.c"
+#line 8002 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			PhotoFileReader* _tmp3_;
-#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7890 "Photo.c"
+#line 8015 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7897 "Photo.c"
+#line 8022 "Photo.c"
 			}
-#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7901 "Photo.c"
+#line 8026 "Photo.c"
 		}
-		__finally286:
+		__finally298:
 		{
 			PhotoBackingReaders* _tmp5_;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7910 "Photo.c"
+#line 8035 "Photo.c"
 		}
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/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 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7918 "Photo.c"
+#line 8043 "Photo.c"
 	}
 }
 
@@ -7922,16 +8047,16 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7928 "Photo.c"
+#line 8053 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7935 "Photo.c"
+#line 8060 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
@@ -7940,105 +8065,105 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_;
 			PhotoFileReader* _tmp14_;
 			PhotoFileReader* _tmp15_;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7950 "Photo.c"
+#line 8075 "Photo.c"
 				PhotoBackingReaders* _tmp3_;
 				PhotoFileReader* _tmp4_;
 				PhotoFileReader* _tmp5_;
-#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 996 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 7962 "Photo.c"
+#line 8087 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7969 "Photo.c"
+#line 8094 "Photo.c"
 				}
-#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 996 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7973 "Photo.c"
+#line 8098 "Photo.c"
 			}
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 998 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 998 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 998 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7981 "Photo.c"
+#line 8106 "Photo.c"
 				PhotoBackingReaders* _tmp9_;
 				PhotoFileReader* _tmp10_;
 				PhotoFileReader* _tmp11_;
-#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 7993 "Photo.c"
+#line 8118 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8000 "Photo.c"
+#line 8125 "Photo.c"
 				}
-#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8004 "Photo.c"
+#line 8129 "Photo.c"
 			}
-#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8014 "Photo.c"
+#line 8139 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8021 "Photo.c"
+#line 8146 "Photo.c"
 			}
-#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8025 "Photo.c"
+#line 8150 "Photo.c"
 		}
-		__finally287:
+		__finally299:
 		{
 			PhotoBackingReaders* _tmp17_;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8034 "Photo.c"
+#line 8159 "Photo.c"
 		}
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/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 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8042 "Photo.c"
+#line 8167 "Photo.c"
 	}
 }
 
@@ -8046,16 +8171,16 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 static PhotoFileReader* photo_get_source_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8052 "Photo.c"
+#line 8177 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8059 "Photo.c"
+#line 8184 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
@@ -8064,105 +8189,105 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_;
 			PhotoFileReader* _tmp14_;
 			PhotoFileReader* _tmp15_;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8074 "Photo.c"
+#line 8199 "Photo.c"
 				PhotoBackingReaders* _tmp3_;
 				PhotoFileReader* _tmp4_;
 				PhotoFileReader* _tmp5_;
-#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 8086 "Photo.c"
+#line 8211 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8093 "Photo.c"
+#line 8218 "Photo.c"
 				}
-#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8097 "Photo.c"
+#line 8222 "Photo.c"
 			}
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8105 "Photo.c"
+#line 8230 "Photo.c"
 				PhotoBackingReaders* _tmp9_;
 				PhotoFileReader* _tmp10_;
 				PhotoFileReader* _tmp11_;
-#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 8117 "Photo.c"
+#line 8242 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8124 "Photo.c"
+#line 8249 "Photo.c"
 				}
-#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8128 "Photo.c"
+#line 8253 "Photo.c"
 			}
-#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8138 "Photo.c"
+#line 8263 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8145 "Photo.c"
+#line 8270 "Photo.c"
 			}
-#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8149 "Photo.c"
+#line 8274 "Photo.c"
 		}
-		__finally288:
+		__finally300:
 		{
 			PhotoBackingReaders* _tmp17_;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8158 "Photo.c"
+#line 8283 "Photo.c"
 		}
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/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 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8166 "Photo.c"
+#line 8291 "Photo.c"
 	}
 }
 
@@ -8170,57 +8295,57 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8176 "Photo.c"
+#line 8301 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8183 "Photo.c"
+#line 8308 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			PhotoFileReader* _tmp3_;
-#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8196 "Photo.c"
+#line 8321 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8203 "Photo.c"
+#line 8328 "Photo.c"
 			}
-#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8207 "Photo.c"
+#line 8332 "Photo.c"
 		}
-		__finally289:
+		__finally301:
 		{
 			PhotoBackingReaders* _tmp5_;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8216 "Photo.c"
+#line 8341 "Photo.c"
 		}
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/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 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8224 "Photo.c"
+#line 8349 "Photo.c"
 	}
 }
 
@@ -8228,55 +8353,55 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 gboolean photo_is_developed (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8234 "Photo.c"
+#line 8359 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8242 "Photo.c"
+#line 8367 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
-#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8252 "Photo.c"
+#line 8377 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8259 "Photo.c"
+#line 8384 "Photo.c"
 			}
-#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8263 "Photo.c"
+#line 8388 "Photo.c"
 		}
-		__finally290:
+		__finally302:
 		{
 			PhotoBackingReaders* _tmp4_;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8272 "Photo.c"
+#line 8397 "Photo.c"
 		}
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/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 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8280 "Photo.c"
+#line 8405 "Photo.c"
 	}
 }
 
@@ -8284,55 +8409,55 @@ gboolean photo_is_developed (Photo* self) {
 gboolean photo_has_editable (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8290 "Photo.c"
+#line 8415 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8298 "Photo.c"
+#line 8423 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
-#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8308 "Photo.c"
+#line 8433 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8315 "Photo.c"
+#line 8440 "Photo.c"
 			}
-#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8319 "Photo.c"
+#line 8444 "Photo.c"
 		}
-		__finally291:
+		__finally303:
 		{
 			PhotoBackingReaders* _tmp4_;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8328 "Photo.c"
+#line 8453 "Photo.c"
 		}
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/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 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8336 "Photo.c"
+#line 8461 "Photo.c"
 	}
 }
 
@@ -8340,58 +8465,58 @@ gboolean photo_has_editable (Photo* self) {
 gboolean photo_does_master_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8346 "Photo.c"
+#line 8471 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp6_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8354 "Photo.c"
+#line 8479 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			gboolean _tmp3_;
-#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8367 "Photo.c"
+#line 8492 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8374 "Photo.c"
+#line 8499 "Photo.c"
 			}
-#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8378 "Photo.c"
+#line 8503 "Photo.c"
 		}
-		__finally292:
+		__finally304:
 		{
 			PhotoBackingReaders* _tmp5_;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8387 "Photo.c"
+#line 8512 "Photo.c"
 		}
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/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 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp6_;
-#line 8395 "Photo.c"
+#line 8520 "Photo.c"
 	}
 }
 
@@ -8399,76 +8524,76 @@ gboolean photo_does_master_exist (Photo* self) {
 gboolean photo_does_editable_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8405 "Photo.c"
+#line 8530 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp9_ = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8413 "Photo.c"
+#line 8538 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_;
 			PhotoFileReader* _tmp3_;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8424 "Photo.c"
+#line 8549 "Photo.c"
 				PhotoBackingReaders* _tmp4_;
 				PhotoFileReader* _tmp5_;
 				gboolean _tmp6_;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 8436 "Photo.c"
+#line 8561 "Photo.c"
 			} else {
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8440 "Photo.c"
+#line 8565 "Photo.c"
 			}
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8444 "Photo.c"
+#line 8569 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp7_;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8451 "Photo.c"
+#line 8576 "Photo.c"
 			}
-#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8455 "Photo.c"
+#line 8580 "Photo.c"
 		}
-		__finally293:
+		__finally305:
 		{
 			PhotoBackingReaders* _tmp8_;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8464 "Photo.c"
+#line 8589 "Photo.c"
 		}
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/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 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp9_;
-#line 8472 "Photo.c"
+#line 8597 "Photo.c"
 	}
 }
 
@@ -8476,55 +8601,55 @@ gboolean photo_does_editable_exist (Photo* self) {
 gboolean photo_is_master_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8482 "Photo.c"
+#line 8607 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8490 "Photo.c"
+#line 8615 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8500 "Photo.c"
+#line 8625 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8507 "Photo.c"
+#line 8632 "Photo.c"
 			}
-#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8511 "Photo.c"
+#line 8636 "Photo.c"
 		}
-		__finally294:
+		__finally306:
 		{
 			PhotoBackingReaders* _tmp4_;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8520 "Photo.c"
+#line 8645 "Photo.c"
 		}
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/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 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8528 "Photo.c"
+#line 8653 "Photo.c"
 	}
 }
 
@@ -8532,70 +8657,70 @@ gboolean photo_is_master_baseline (Photo* self) {
 gboolean photo_is_master_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_editable (self);
-#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = !_tmp0_;
-#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8544 "Photo.c"
+#line 8669 "Photo.c"
 }
 
 
 gboolean photo_is_editable_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8553 "Photo.c"
+#line 8678 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8561 "Photo.c"
+#line 8686 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
-#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8571 "Photo.c"
+#line 8696 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8578 "Photo.c"
+#line 8703 "Photo.c"
 			}
-#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8582 "Photo.c"
+#line 8707 "Photo.c"
 		}
-		__finally295:
+		__finally307:
 		{
 			PhotoBackingReaders* _tmp4_;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8591 "Photo.c"
+#line 8716 "Photo.c"
 		}
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/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 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 8599 "Photo.c"
+#line 8724 "Photo.c"
 	}
 }
 
@@ -8603,72 +8728,72 @@ gboolean photo_is_editable_baseline (Photo* self) {
 gboolean photo_is_editable_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_editable (self);
-#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8615 "Photo.c"
+#line 8740 "Photo.c"
 }
 
 
 BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1070 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8624 "Photo.c"
+#line 8749 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8631 "Photo.c"
+#line 8756 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			BackingPhotoRow* _tmp2_;
 			BackingPhotoRow* _tmp3_;
-#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
-#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8644 "Photo.c"
+#line 8769 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8651 "Photo.c"
+#line 8776 "Photo.c"
 			}
-#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8655 "Photo.c"
+#line 8780 "Photo.c"
 		}
-		__finally296:
+		__finally308:
 		{
 			PhotoRow* _tmp5_;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8664 "Photo.c"
+#line 8789 "Photo.c"
 		}
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/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 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8672 "Photo.c"
+#line 8797 "Photo.c"
 	}
 }
 
@@ -8676,79 +8801,79 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8682 "Photo.c"
+#line 8807 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8689 "Photo.c"
+#line 8814 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			gboolean _tmp2_;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8699 "Photo.c"
+#line 8824 "Photo.c"
 				BackingPhotoRow* _tmp3_;
 				BackingPhotoRow* _tmp4_;
-#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->editable;
-#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
-#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8708 "Photo.c"
+#line 8833 "Photo.c"
 				{
 					PhotoRow* _tmp5_;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp5_ = self->row;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8715 "Photo.c"
+#line 8840 "Photo.c"
 				}
-#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8719 "Photo.c"
+#line 8844 "Photo.c"
 			} else {
-#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8723 "Photo.c"
+#line 8848 "Photo.c"
 				{
 					PhotoRow* _tmp6_;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8730 "Photo.c"
+#line 8855 "Photo.c"
 				}
-#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8734 "Photo.c"
+#line 8859 "Photo.c"
 			}
 		}
-		__finally297:
+		__finally309:
 		{
 			PhotoRow* _tmp7_;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8744 "Photo.c"
+#line 8869 "Photo.c"
 		}
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/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 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8752 "Photo.c"
+#line 8877 "Photo.c"
 	}
 }
 
@@ -8756,76 +8881,76 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 	GeeCollection* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8762 "Photo.c"
+#line 8887 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8769 "Photo.c"
+#line 8894 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_;
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8777 "Photo.c"
+#line 8902 "Photo.c"
 				GeeHashMap* _tmp3_;
 				GeeCollection* _tmp4_;
 				GeeCollection* _tmp5_;
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8791 "Photo.c"
+#line 8916 "Photo.c"
 			} else {
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8797 "Photo.c"
+#line 8922 "Photo.c"
 			}
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8801 "Photo.c"
+#line 8926 "Photo.c"
 			{
 				PhotoRow* _tmp6_;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8808 "Photo.c"
+#line 8933 "Photo.c"
 			}
-#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8812 "Photo.c"
+#line 8937 "Photo.c"
 		}
-		__finally298:
+		__finally310:
 		{
 			PhotoRow* _tmp7_;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8821 "Photo.c"
+#line 8946 "Photo.c"
 		}
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/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 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8829 "Photo.c"
+#line 8954 "Photo.c"
 	}
 }
 
@@ -8833,96 +8958,96 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper d) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8839 "Photo.c"
+#line 8964 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8846 "Photo.c"
+#line 8971 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_;
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8854 "Photo.c"
+#line 8979 "Photo.c"
 				GeeHashMap* _tmp3_;
 				RawDeveloper _tmp4_;
 				gpointer _tmp5_;
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = d;
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp4_));
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8868 "Photo.c"
+#line 8993 "Photo.c"
 			} else {
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8874 "Photo.c"
+#line 8999 "Photo.c"
 			}
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8878 "Photo.c"
+#line 9003 "Photo.c"
 			{
 				PhotoRow* _tmp6_;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8885 "Photo.c"
+#line 9010 "Photo.c"
 			}
-#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8889 "Photo.c"
+#line 9014 "Photo.c"
 		}
-		__finally299:
+		__finally311:
 		{
 			PhotoRow* _tmp7_;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8898 "Photo.c"
+#line 9023 "Photo.c"
 		}
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/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 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8906 "Photo.c"
+#line 9031 "Photo.c"
 	}
 }
 
 
 static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	PhotoFileFormat* dup;
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (PhotoFileFormat, 1);
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (PhotoFileFormat));
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 8919 "Photo.c"
+#line 9044 "Photo.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 8926 "Photo.c"
+#line 9051 "Photo.c"
 }
 
 
@@ -8934,37 +9059,37 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	PhotoFileReader* _tmp2_;
 	PhotoFileFormat _tmp3_;
 	PhotoFileFormat* _tmp4_;
-#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 8954 "Photo.c"
+#line 9079 "Photo.c"
 	}
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = __photo_file_format_dup0 (&_tmp3_);
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8968 "Photo.c"
+#line 9093 "Photo.c"
 }
 
 
@@ -8974,75 +9099,75 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 	PhotoFileFormat _tmp0_;
 	ExportFormatParameters _tmp1_;
 	ExportFormatMode _tmp2_;
-#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (params != NULL, 0);
-#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = _tmp0_;
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *params;
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.mode;
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp2_) {
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8994 "Photo.c"
+#line 9119 "Photo.c"
 		{
 			PhotoFileFormat _tmp3_;
-#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_master_file_format (self);
-#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp3_;
-#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9003 "Photo.c"
+#line 9128 "Photo.c"
 		}
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 9007 "Photo.c"
+#line 9132 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_;
-#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_best_export_file_format (self);
-#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp4_;
-#line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9016 "Photo.c"
+#line 9141 "Photo.c"
 		}
-#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9020 "Photo.c"
+#line 9145 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_;
 			PhotoFileFormat _tmp6_;
-#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_.specified_format;
-#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp6_;
-#line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9032 "Photo.c"
+#line 9157 "Photo.c"
 		}
 		default:
 		{
-#line 1105 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \
+#line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1124: get_export_format_for_parameters: unsupported export " \
 "format mode");
-#line 9038 "Photo.c"
+#line 9163 "Photo.c"
 		}
 	}
-#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9045 "Photo.c"
+#line 9170 "Photo.c"
 }
 
 
@@ -9052,81 +9177,81 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	ExportFormatParameters _tmp0_;
 	ExportFormatMode _tmp1_;
 	const gchar* _tmp8_;
-#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (params != NULL, NULL);
-#line 1112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = NULL;
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *params;
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.mode;
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp1_) {
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9069 "Photo.c"
+#line 9194 "Photo.c"
 		{
 			GFile* _tmp2_;
 			GFile* _tmp3_;
 			gchar* _tmp4_;
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_;
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp4_;
-#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp3_);
-#line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1136 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9088 "Photo.c"
+#line 9213 "Photo.c"
 		}
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9094 "Photo.c"
+#line 9219 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_;
 			PhotoFileFormat _tmp6_;
 			gchar* _tmp7_;
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_get_export_format_for_parameters (self, &_tmp5_);
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_get_export_basename (self, &_tmp6_);
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp7_;
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 9111 "Photo.c"
+#line 9236 "Photo.c"
 		}
 		default:
 		{
-#line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \
+#line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1143: get_export_basename_for_parameters: unsupported expor" \
 "t format mode");
-#line 9117 "Photo.c"
+#line 9242 "Photo.c"
 		}
 	}
-#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _result_;
-#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp8_ != NULL, "result != null");
-#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9128 "Photo.c"
+#line 9253 "Photo.c"
 }
 
 
@@ -9255,243 +9380,243 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	PhotoImportParams* _tmp176_;
 	Thumbnails* _tmp177_;
 	GError * _inner_error_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
-#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9269 "Photo.c"
+#line 9394 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_;
 		GFileInfo* _tmp5_;
 		GFileInfo* _tmp6_;
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = file;
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9283 "Photo.c"
-			goto __catch300_g_error;
+#line 9408 "Photo.c"
+			goto __catch312_g_error;
 		}
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp6_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9296 "Photo.c"
+#line 9421 "Photo.c"
 	}
-	goto __finally300;
-	__catch300_g_error:
+	goto __finally312;
+	__catch312_g_error:
 	{
 		GError* err = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9316 "Photo.c"
+#line 9441 "Photo.c"
 	}
-	__finally300:
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally312:
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/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 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9331 "Photo.c"
+#line 9456 "Photo.c"
 	}
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
-#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9347 "Photo.c"
+#line 9472 "Photo.c"
 	}
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_is_file_image (_tmp9_);
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 9355 "Photo.c"
+#line 9480 "Photo.c"
 		GFile* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
-#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = file;
-#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1161: Not importing %s: Not an image file", _tmp13_);
-#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1180: Not importing %s: Not an image file", _tmp13_);
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp13_);
-#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9377 "Photo.c"
+#line 9502 "Photo.c"
 	}
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp15_) {
-#line 9385 "Photo.c"
+#line 9510 "Photo.c"
 		GFile* _tmp16_;
 		gchar* _tmp17_;
 		gchar* _tmp18_;
-#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = file;
-#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = g_file_get_path (_tmp16_);
-#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1167: Not importing %s: Unsupported extension", _tmp18_);
-#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1186: Not importing %s: Unsupported extension", _tmp18_);
+#line 1186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp18_);
-#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9407 "Photo.c"
+#line 9532 "Photo.c"
 	}
-#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
-#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp19_, &_tmp20_);
-#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp20_;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->exif_md5;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9421 "Photo.c"
+#line 9546 "Photo.c"
 		PhotoImportParams* _tmp25_;
 		const gchar* _tmp26_;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_->thumbnail_md5;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9430 "Photo.c"
+#line 9555 "Photo.c"
 	} else {
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9434 "Photo.c"
+#line 9559 "Photo.c"
 	}
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9438 "Photo.c"
+#line 9563 "Photo.c"
 		PhotoImportParams* _tmp27_;
 		const gchar* _tmp28_;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->full_md5;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9447 "Photo.c"
+#line 9572 "Photo.c"
 	} else {
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9451 "Photo.c"
+#line 9576 "Photo.c"
 	}
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9455 "Photo.c"
+#line 9580 "Photo.c"
 		PhotoImportParams* _tmp29_;
 		PhotoImportParams* _tmp30_;
 		PhotoFileSnifferOptions _tmp31_;
-#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = params;
-#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = params;
-#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_->sniffer_options;
-#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9467 "Photo.c"
+#line 9592 "Photo.c"
 	}
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->sniffer_options;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp35_;
-#line 9479 "Photo.c"
+#line 9604 "Photo.c"
 	{
 		PhotoFileInterrogator* _tmp36_;
-#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = interrogator;
-#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
-#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9488 "Photo.c"
-			goto __catch301_g_error;
+#line 9613 "Photo.c"
+			goto __catch313_g_error;
 		}
 	}
-	goto __finally301;
-	__catch301_g_error:
+	goto __finally313;
+	__catch313_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp37_;
@@ -9499,120 +9624,120 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		gchar* _tmp39_;
 		GError* _tmp40_;
 		const gchar* _tmp41_;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = file;
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_file_get_path (_tmp37_);
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_->message;
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1183: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_);
-#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1202: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_);
+#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp39_);
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DECODE_ERROR;
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9531 "Photo.c"
+#line 9656 "Photo.c"
 	}
-	__finally301:
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally313:
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/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 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9548 "Photo.c"
+#line 9673 "Photo.c"
 	}
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9566 "Photo.c"
+#line 9691 "Photo.c"
 	}
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_);
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp45_;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = detected;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_ == NULL) {
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9580 "Photo.c"
+#line 9705 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp48_;
 		PhotoFileFormat _tmp49_;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = detected;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_->file_format;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9590 "Photo.c"
+#line 9715 "Photo.c"
 	}
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9606 "Photo.c"
+#line 9731 "Photo.c"
 	}
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->sniffer_options;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9614 "Photo.c"
+#line 9739 "Photo.c"
 		DetectedPhotoInformation* _tmp52_;
 		PhotoImportParams* _tmp53_;
 		const gchar* _tmp54_;
@@ -9625,65 +9750,65 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		PhotoImportParams* _tmp61_;
 		const gchar* _tmp62_;
 		gchar* _tmp63_;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = detected;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = params;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = _tmp53_->exif_md5;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = g_strdup (_tmp54_);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp52_->exif_md5);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_->exif_md5 = _tmp55_;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = detected;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = params;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_->thumbnail_md5;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = g_strdup (_tmp58_);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp56_->thumbnail_md5);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_->thumbnail_md5 = _tmp59_;
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = params;
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = _tmp61_->full_md5;
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = g_strdup (_tmp62_);
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp60_->md5);
-#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_->md5 = _tmp63_;
-#line 9663 "Photo.c"
+#line 9788 "Photo.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = ORIENTATION_TOP_LEFT;
-#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 	exposure_time = (time_t) 0;
-#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = g_strdup ("");
-#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Photo.vala"
 	title = _tmp64_;
-#line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = g_strdup ("");
-#line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Photo.vala"
 	comment = _tmp65_;
-#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 	rating = RATING_UNRATED;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp66_ = detected;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = _tmp66_->metadata;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9685 "Photo.c"
+#line 9810 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp68_;
 		PhotoMetadata* _tmp69_;
@@ -9705,362 +9830,362 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		DetectedPhotoInformation* _tmp87_;
 		PhotoMetadata* _tmp88_;
 		Rating _tmp89_;
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = detected;
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = _tmp68_->metadata;
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_);
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp70_;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = date_time;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9719 "Photo.c"
+#line 9844 "Photo.c"
 			MetadataDateTime* _tmp72_;
 			time_t _tmp73_;
-#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = date_time;
-#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
-#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9728 "Photo.c"
+#line 9853 "Photo.c"
 		}
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp74_->metadata;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = photo_metadata_get_orientation (_tmp75_);
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 		orientation = _tmp76_;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = detected;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = _tmp77_->metadata;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 		title = _tmp79_;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = detected;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = _tmp80_->metadata;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp82_;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = params;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = detected;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_->metadata;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL);
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp83_->keywords);
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = detected;
-#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = _tmp87_->metadata;
-#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = photo_metadata_get_rating (_tmp88_);
-#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 		rating = _tmp89_;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 9780 "Photo.c"
+#line 9905 "Photo.c"
 	}
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_->colorspace;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9790 "Photo.c"
+#line 9915 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp94_;
 		gint _tmp95_;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = detected;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = _tmp94_->channels;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9800 "Photo.c"
+#line 9925 "Photo.c"
 	}
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp91_) {
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = TRUE;
-#line 9806 "Photo.c"
+#line 9931 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp96_;
 		gint _tmp97_;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = detected;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = _tmp96_->bits_per_channel;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9816 "Photo.c"
+#line 9941 "Photo.c"
 	}
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9820 "Photo.c"
+#line 9945 "Photo.c"
 		GFile* _tmp98_;
 		gchar* _tmp99_;
 		gchar* _tmp100_;
-#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = file;
-#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = g_file_get_path (_tmp98_);
-#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp99_;
-#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1230: Not importing %s: Unsupported color format", _tmp100_);
-#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_message ("Photo.vala:1249: Not importing %s: Unsupported color format", _tmp100_);
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp100_);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9850 "Photo.c"
+#line 9975 "Photo.c"
 	}
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = _tmp101_->row;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID);
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp103_ = params;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp104_ = _tmp103_->row;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp105_ = _tmp104_->master;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp106_ = file;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp107_ = g_file_get_path (_tmp106_);
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp105_->filepath);
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp105_->filepath = _tmp107_;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp108_ = params;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp109_ = _tmp108_->row;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp110_ = _tmp109_->master;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp111_ = detected;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = _tmp111_->image_dim;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp110_->dim = _tmp112_;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = params;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp114_ = _tmp113_->row;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp115_ = _tmp114_->master;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp116_ = info;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp117_ = g_file_info_get_size (_tmp116_);
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp115_->filesize = _tmp117_;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp118_ = params;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp119_ = _tmp118_->row;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp120_ = _tmp119_->master;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp121_ = timestamp;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = _tmp121_.tv_sec;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp120_->timestamp = (time_t) _tmp122_;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp123_ = params;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = _tmp123_->row;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = exposure_time;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_->exposure_time = _tmp125_;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp126_ = params;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp127_ = _tmp126_->row;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp128_ = orientation;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp127_->orientation = _tmp128_;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp129_ = params;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp130_ = _tmp129_->row;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = _tmp130_->master;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp132_ = orientation;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_->original_orientation = _tmp132_;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = params;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _tmp133_->row;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp135_ = params;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp136_ = _tmp135_->import_id;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_->import_id = _tmp136_;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp137_ = params;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp138_ = _tmp137_->row;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Photo.vala"
 	event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp139_ = params;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp140_ = _tmp139_->row;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp140_->transformations);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp140_->transformations = NULL;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp141_ = params;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp142_ = _tmp141_->row;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp143_ = detected;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp144_ = _tmp143_->md5;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp145_ = g_strdup (_tmp144_);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp142_->md5);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp142_->md5 = _tmp145_;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp146_ = params;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp147_ = _tmp146_->row;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp148_ = detected;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp149_ = _tmp148_->thumbnail_md5;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp150_ = g_strdup (_tmp149_);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp147_->thumbnail_md5);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp147_->thumbnail_md5 = _tmp150_;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp151_ = params;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp152_ = _tmp151_->row;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = detected;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = _tmp153_->exif_md5;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp155_ = g_strdup (_tmp154_);
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp152_->exif_md5);
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1270 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp152_->exif_md5 = _tmp155_;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp156_ = params;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp157_ = _tmp156_->row;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp157_->time_created = (time_t) 0;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp158_ = params;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp159_ = _tmp158_->row;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp159_->flags = (guint64) 0;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp160_ = params;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp161_ = _tmp160_->row;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp162_ = _tmp161_->master;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp163_ = detected;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp164_ = _tmp163_->file_format;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp162_->file_format = _tmp164_;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp165_ = params;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp166_ = _tmp165_->row;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp167_ = title;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp168_ = g_strdup (_tmp167_);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp166_->title);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp166_->title = _tmp168_;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp169_ = params;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp170_ = _tmp169_->row;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp171_ = comment;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp172_ = g_strdup (_tmp171_);
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp170_->comment);
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp170_->comment = _tmp172_;
-#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp173_ = params;
-#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_ = _tmp173_->row;
-#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp175_ = rating;
-#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_->rating = _tmp175_;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp176_ = params;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp177_ = _tmp176_->thumbnails;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10062 "Photo.c"
+#line 10187 "Photo.c"
 		PhotoFileReader* reader = NULL;
 		PhotoImportParams* _tmp178_;
 		PhotoRow* _tmp179_;
@@ -10072,31 +10197,31 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		const gchar* _tmp185_;
 		PhotoFileReader* _tmp186_;
 		PhotoFileReader* _tmp187_;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp178_ = params;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp179_ = _tmp178_->row;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp180_ = _tmp179_->master;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp181_ = _tmp180_->file_format;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp182_ = params;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp183_ = _tmp182_->row;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp184_ = _tmp183_->master;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp185_ = _tmp184_->filepath;
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_);
-#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 		reader = _tmp186_;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp187_ = reader;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL);
-#line 10098 "Photo.c"
+#line 10223 "Photo.c"
 		{
 			PhotoImportParams* _tmp188_;
 			Thumbnails* _tmp189_;
@@ -10108,116 +10233,116 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			PhotoRow* _tmp195_;
 			BackingPhotoRow* _tmp196_;
 			Dimensions _tmp197_;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp188_ = params;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp189_ = _tmp188_->thumbnails;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp190_ = reader;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp191_ = params;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp192_ = _tmp191_->row;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp193_ = _tmp192_->orientation;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp194_ = params;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp195_ = _tmp194_->row;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp196_ = _tmp195_->master;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp197_ = _tmp196_->dim;
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			thumbnail_cache_generate_for_photo (_tmp189_, _tmp190_, _tmp193_, &_tmp197_, &_inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10134 "Photo.c"
-				goto __catch302_g_error;
+#line 10259 "Photo.c"
+				goto __catch314_g_error;
 			}
 		}
-		goto __finally302;
-		__catch302_g_error:
+		goto __finally314;
+		__catch314_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp198_;
 			ImportResult _tmp199_;
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp198_ = err;
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp199_ = import_result_convert_error (_tmp198_, IMPORT_RESULT_FILE_ERROR);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp199_;
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10172 "Photo.c"
+#line 10297 "Photo.c"
 		}
-		__finally302:
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally314:
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/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 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0;
-#line 10197 "Photo.c"
+#line 10322 "Photo.c"
 		}
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10201 "Photo.c"
+#line 10326 "Photo.c"
 	}
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10219 "Photo.c"
+#line 10344 "Photo.c"
 }
 
 
@@ -10282,305 +10407,305 @@ void photo_create_pre_import (PhotoImportParams* params) {
 	PhotoFileSnifferOptions _tmp55_;
 	PhotoFileInterrogator* _tmp56_;
 	GError * _inner_error_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params));
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = params;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_->row;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID);
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = params;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_->row;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->master;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_get_path (file);
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp7_->filepath);
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_->filepath = _tmp8_;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = params;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_->row;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_->master;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_tmp11_->dim, 0, 0);
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = params;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_->row;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->master;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_->filesize = (gint64) 0;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = params;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_->row;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_->master;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_->timestamp = (time_t) 0;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = params;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_->row;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_->exposure_time = (time_t) 0;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = params;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_->row;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_->orientation = ORIENTATION_TOP_LEFT;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = params;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_->row;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->master;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->original_orientation = ORIENTATION_TOP_LEFT;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = params;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_->row;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = params;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_->import_id;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_->import_id = _tmp28_;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = params;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_->row;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 	event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID);
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = params;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_->row;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp32_->transformations);
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_->transformations = NULL;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->row;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp34_->md5);
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_->md5 = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = params;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_->row;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp36_->thumbnail_md5);
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->thumbnail_md5 = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = params;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->row;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp38_->exif_md5);
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_->exif_md5 = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = params;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_->row;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_->time_created = (time_t) 0;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = params;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_->row;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_->flags = (guint64) 0;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = params;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_->row;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->master;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = params;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_->row;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp47_->title);
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_->title = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = params;
-#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_->row;
-#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp49_->comment);
-#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_->comment = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->row;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_->rating = RATING_UNRATED;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = params;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = _tmp52_->file;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = params;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_->sniffer_options;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp56_;
-#line 10458 "Photo.c"
+#line 10583 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
 		DetectedPhotoInformation* _tmp57_;
 		gboolean _tmp58_ = FALSE;
 		gboolean _tmp59_ = FALSE;
 		DetectedPhotoInformation* _tmp60_;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10469 "Photo.c"
-			goto __catch303_g_error;
+#line 10594 "Photo.c"
+			goto __catch315_g_error;
 		}
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp57_;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10480 "Photo.c"
+#line 10605 "Photo.c"
 			gboolean _tmp61_;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = !_tmp61_;
-#line 10486 "Photo.c"
+#line 10611 "Photo.c"
 		} else {
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10490 "Photo.c"
+#line 10615 "Photo.c"
 		}
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10494 "Photo.c"
+#line 10619 "Photo.c"
 			DetectedPhotoInformation* _tmp62_;
 			PhotoFileFormat _tmp63_;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = detected;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_->file_format;
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10503 "Photo.c"
+#line 10628 "Photo.c"
 		} else {
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10507 "Photo.c"
+#line 10632 "Photo.c"
 		}
-#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10511 "Photo.c"
+#line 10636 "Photo.c"
 			PhotoImportParams* _tmp64_;
 			PhotoRow* _tmp65_;
 			BackingPhotoRow* _tmp66_;
 			DetectedPhotoInformation* _tmp67_;
 			PhotoFileFormat _tmp68_;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = params;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = _tmp64_->row;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = _tmp65_->master;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = detected;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = _tmp67_->file_format;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_->file_format = _tmp68_;
-#line 10529 "Photo.c"
+#line 10654 "Photo.c"
 		}
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10533 "Photo.c"
+#line 10658 "Photo.c"
 	}
-	goto __finally303;
-	__catch303_g_error:
+	goto __finally315;
+	__catch315_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp69_;
 		gchar* _tmp70_;
 		GError* _tmp71_;
 		const gchar* _tmp72_;
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = g_file_get_path (file);
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_;
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = err;
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_->message;
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:1307: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_);
-#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_debug ("Photo.vala:1326: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_);
+#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp70_);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10561 "Photo.c"
+#line 10686 "Photo.c"
 	}
-	__finally303:
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally315:
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/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 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10576 "Photo.c"
+#line 10701 "Photo.c"
 	}
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 10582 "Photo.c"
+#line 10707 "Photo.c"
 }
 
 
@@ -10622,51 +10747,51 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	PhotoMetadata* _tmp41_;
 	BackingPhotoRow* _tmp45_;
 	GError * _inner_error_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = NULL;
-#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp0_;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 10638 "Photo.c"
+#line 10763 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFile* _tmp2_;
 		GFileInfo* _tmp3_;
 		GFileInfo* _tmp4_;
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = file;
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = g_file_query_info (_tmp2_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_;
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10652 "Photo.c"
-			goto __catch304_g_error;
+#line 10777 "Photo.c"
+			goto __catch316_g_error;
 		}
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp4_;
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 10665 "Photo.c"
+#line 10790 "Photo.c"
 	}
-	goto __finally304;
-	__catch304_g_error:
+	goto __finally316;
+	__catch316_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_;
@@ -10674,350 +10799,350 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		gchar* _tmp7_;
 		GError* _tmp8_;
 		const gchar* _tmp9_;
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = file;
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_file_get_path (_tmp5_);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = err;
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->message;
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1322: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_critical ("Photo.vala:1341: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp7_);
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10706 "Photo.c"
+#line 10831 "Photo.c"
 		} else {
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10710 "Photo.c"
+#line 10835 "Photo.c"
 		}
-#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10714 "Photo.c"
+#line 10839 "Photo.c"
 	}
-	__finally304:
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally316:
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10727 "Photo.c"
+#line 10852 "Photo.c"
 	}
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = options;
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_);
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp12_;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = interrogator;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_interrogator_interrogate (_tmp13_, &_inner_error_);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10753 "Photo.c"
+#line 10878 "Photo.c"
 	}
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_);
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp15_;
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _vala_detected;
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = TRUE;
-#line 10769 "Photo.c"
+#line 10894 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp18_;
 		gboolean _tmp19_;
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = interrogator;
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10779 "Photo.c"
+#line 10904 "Photo.c"
 	}
-#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10783 "Photo.c"
+#line 10908 "Photo.c"
 		gchar* _tmp20_;
 		gchar* _tmp21_;
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1332: Photo update: %s no longer a recognized image", _tmp21_);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_critical ("Photo.vala:1351: Photo update: %s no longer a recognized image", _tmp21_);
+#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp21_);
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10806 "Photo.c"
+#line 10931 "Photo.c"
 		} else {
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10810 "Photo.c"
+#line 10935 "Photo.c"
 		}
-#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10814 "Photo.c"
+#line 10939 "Photo.c"
 	}
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp22_, &_tmp23_);
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification_time = _tmp23_;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = backing;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = file;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = g_file_get_path (_tmp25_);
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp24_->filepath);
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->filepath = _tmp26_;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = modification_time;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.tv_sec;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_->timestamp = (time_t) _tmp29_;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = backing;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = info;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_file_info_get_size (_tmp31_);
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_->filesize = _tmp32_;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = backing;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _vala_detected;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_->file_format;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_->file_format = _tmp35_;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = backing;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _vala_detected;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->image_dim;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->dim = _tmp38_;
-#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _vala_detected;
-#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_->metadata;
-#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_ != NULL) {
-#line 10870 "Photo.c"
+#line 10995 "Photo.c"
 		DetectedPhotoInformation* _tmp42_;
 		PhotoMetadata* _tmp43_;
 		Orientation _tmp44_;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _vala_detected;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp42_->metadata;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = photo_metadata_get_orientation (_tmp43_);
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp44_;
-#line 10882 "Photo.c"
+#line 11007 "Photo.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10886 "Photo.c"
+#line 11011 "Photo.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
-#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->original_orientation = _tmp39_;
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing;
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 10902 "Photo.c"
+#line 11027 "Photo.c"
 	} else {
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10906 "Photo.c"
+#line 11031 "Photo.c"
 	}
-#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10910 "Photo.c"
+#line 11035 "Photo.c"
 }
 
 
-static void _vala_array_add88 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10921 "Photo.c"
+#line 11046 "Photo.c"
 	}
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10927 "Photo.c"
+#line 11052 "Photo.c"
 }
 
 
-static void _vala_array_add89 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10938 "Photo.c"
+#line 11063 "Photo.c"
 	}
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10944 "Photo.c"
+#line 11069 "Photo.c"
 }
 
 
-static void _vala_array_add90 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10955 "Photo.c"
+#line 11080 "Photo.c"
 	}
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10961 "Photo.c"
+#line 11086 "Photo.c"
 }
 
 
-static void _vala_array_add91 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10972 "Photo.c"
+#line 11097 "Photo.c"
 	}
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10978 "Photo.c"
+#line 11103 "Photo.c"
 }
 
 
-static void _vala_array_add92 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10989 "Photo.c"
+#line 11114 "Photo.c"
 	}
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10995 "Photo.c"
+#line 11120 "Photo.c"
 }
 
 
-static void _vala_array_add93 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11006 "Photo.c"
+#line 11131 "Photo.c"
 	}
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11012 "Photo.c"
+#line 11137 "Photo.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 11019 "Photo.c"
+#line 11144 "Photo.c"
 }
 
 
@@ -11080,260 +11205,260 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	gint _tmp126__length1;
 	PhotoReimportMasterStateImpl* _tmp127_;
 	GError * _inner_error_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_reimport_state = NULL;
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_query_backing_photo_row (self, _tmp4_, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, &_tmp5_, &_inner_error_);
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp6_;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11112 "Photo.c"
+#line 11237 "Photo.c"
 		gboolean _tmp7_ = FALSE;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 11122 "Photo.c"
+#line 11247 "Photo.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = backing;
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 11128 "Photo.c"
+#line 11253 "Photo.c"
 		GFile* _tmp9_;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
-#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
-#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = g_file_get_path (_tmp9_);
-#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_;
-#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp11_);
-#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1439: Unable to retrieve photo state from %s for reimport", _tmp11_);
+#line 1439 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp11_);
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11154 "Photo.c"
+#line 11279 "Photo.c"
 		} else {
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11158 "Photo.c"
+#line 11283 "Photo.c"
 		}
-#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11162 "Photo.c"
+#line 11287 "Photo.c"
 	}
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = detected;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_->colorspace;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_ != GDK_COLORSPACE_RGB) {
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = TRUE;
-#line 11172 "Photo.c"
+#line 11297 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp16_;
 		gint _tmp17_;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = detected;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_->channels;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp17_ < 3;
-#line 11182 "Photo.c"
+#line 11307 "Photo.c"
 	}
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_) {
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 11188 "Photo.c"
+#line 11313 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp18_;
 		gint _tmp19_;
-#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = detected;
-#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->bits_per_channel;
-#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp19_ != 8;
-#line 11198 "Photo.c"
+#line 11323 "Photo.c"
 	}
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 11202 "Photo.c"
+#line 11327 "Photo.c"
 		GFile* _tmp20_;
 		gchar* _tmp21_;
 		gchar* _tmp22_;
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = file;
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_file_get_path (_tmp20_);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp21_;
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp22_);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1447: Not re-importing %s: Unsupported color format", _tmp22_);
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp22_);
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11228 "Photo.c"
+#line 11353 "Photo.c"
 		} else {
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11232 "Photo.c"
+#line 11357 "Photo.c"
 		}
-#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11236 "Photo.c"
+#line 11361 "Photo.c"
 	}
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_row_new ();
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	updated_row = _tmp23_;
-#line 11242 "Photo.c"
+#line 11367 "Photo.c"
 	{
 		PhotoRow* _tmp24_;
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = self->row;
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11249 "Photo.c"
+#line 11374 "Photo.c"
 		{
 			PhotoRow* _tmp25_;
 			PhotoRow* _tmp26_;
-#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = self->row;
-#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = _photo_row_ref0 (_tmp25_);
-#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 			updated_row = _tmp26_;
-#line 11261 "Photo.c"
+#line 11386 "Photo.c"
 		}
-		__finally305:
+		__finally317:
 		{
 			PhotoRow* _tmp27_;
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = self->row;
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11270 "Photo.c"
+#line 11395 "Photo.c"
 		}
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11274 "Photo.c"
+#line 11399 "Photo.c"
 			gboolean _tmp28_ = FALSE;
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp28_;
-#line 11288 "Photo.c"
+#line 11413 "Photo.c"
 		}
 	}
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = g_new0 (gchar*, 0 + 1);
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp29_;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	list_length1 = 0;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_list_size_ = list_length1;
-#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = updated_row;
-#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_->md5;
-#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = detected;
-#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_->md5;
-#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_strcmp0 (_tmp31_, _tmp33_) != 0) {
-#line 11309 "Photo.c"
+#line 11434 "Photo.c"
 		gchar** _tmp34_;
 		gint _tmp34__length1;
 		gchar* _tmp35_;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = list;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34__length1 = list_length1;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = g_strdup ("metadata:md5");
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp35_);
-#line 11321 "Photo.c"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_);
+#line 11446 "Photo.c"
 	}
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = updated_row;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_->master;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->original_orientation;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = backing;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_->original_orientation;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_ != _tmp40_) {
-#line 11335 "Photo.c"
+#line 11460 "Photo.c"
 		gchar** _tmp41_;
 		gint _tmp41__length1;
 		gchar* _tmp42_;
@@ -11341,33 +11466,33 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		BackingPhotoRow* _tmp44_;
 		BackingPhotoRow* _tmp45_;
 		Orientation _tmp46_;
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = list;
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41__length1 = list_length1;
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = g_strdup ("image:orientation");
-#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp42_);
-#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp42_);
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = updated_row;
-#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp43_->master;
-#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = backing;
-#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp45_->original_orientation;
-#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_->original_orientation = _tmp46_;
-#line 11361 "Photo.c"
+#line 11486 "Photo.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = detected;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = _tmp47_->metadata;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp48_ != NULL) {
-#line 11369 "Photo.c"
+#line 11494 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp49_;
 		PhotoMetadata* _tmp50_;
@@ -11393,204 +11518,204 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp80_;
 		PhotoMetadata* _tmp81_;
 		Rating _tmp82_;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = detected;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = _tmp49_->metadata;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = photo_metadata_get_exposure_date_time (_tmp50_);
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp51_;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = date_time;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp53_ != NULL) {
-#line 11407 "Photo.c"
+#line 11532 "Photo.c"
 			PhotoRow* _tmp54_;
 			time_t _tmp55_;
 			MetadataDateTime* _tmp56_;
 			time_t _tmp57_;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = updated_row;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = _tmp54_->exposure_time;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = date_time;
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = metadata_date_time_get_timestamp (_tmp56_);
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = _tmp55_ != _tmp57_;
-#line 11422 "Photo.c"
+#line 11547 "Photo.c"
 		} else {
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = FALSE;
-#line 11426 "Photo.c"
+#line 11551 "Photo.c"
 		}
-#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp52_) {
-#line 11430 "Photo.c"
+#line 11555 "Photo.c"
 			gchar** _tmp58_;
 			gint _tmp58__length1;
 			gchar* _tmp59_;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = list;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58__length1 = list_length1;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = g_strdup ("metadata:exposure-time");
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp59_);
-#line 11442 "Photo.c"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add94 (&list, &list_length1, &_list_size_, _tmp59_);
+#line 11567 "Photo.c"
 		}
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = updated_row;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_->title;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = detected;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = _tmp62_->metadata;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp65_ = _tmp64_;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp66_ = g_strcmp0 (_tmp61_, _tmp65_) != 0;
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp65_);
-#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp66_) {
-#line 11462 "Photo.c"
+#line 11587 "Photo.c"
 			gchar** _tmp67_;
 			gint _tmp67__length1;
 			gchar* _tmp68_;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = list;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67__length1 = list_length1;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = g_strdup ("metadata:name");
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp68_);
-#line 11474 "Photo.c"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add95 (&list, &list_length1, &_list_size_, _tmp68_);
+#line 11599 "Photo.c"
 		}
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = updated_row;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_->comment;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = detected;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_->metadata;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp73_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = _tmp73_;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = g_strcmp0 (_tmp70_, _tmp74_) != 0;
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp74_);
-#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp75_) {
-#line 11494 "Photo.c"
+#line 11619 "Photo.c"
 			gchar** _tmp76_;
 			gint _tmp76__length1;
 			gchar* _tmp77_;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = list;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76__length1 = list_length1;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = g_strdup ("metadata:comment");
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp77_);
-#line 11506 "Photo.c"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add96 (&list, &list_length1, &_list_size_, _tmp77_);
+#line 11631 "Photo.c"
 		}
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = updated_row;
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = _tmp78_->rating;
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = detected;
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = _tmp80_->metadata;
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = photo_metadata_get_rating (_tmp81_);
-#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp79_ != _tmp82_) {
-#line 11520 "Photo.c"
+#line 11645 "Photo.c"
 			gchar** _tmp83_;
 			gint _tmp83__length1;
 			gchar* _tmp84_;
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83_ = list;
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83__length1 = list_length1;
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp84_ = g_strdup ("metadata:rating");
-#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp84_);
-#line 11532 "Photo.c"
+#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add97 (&list, &list_length1, &_list_size_, _tmp84_);
+#line 11657 "Photo.c"
 		}
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11536 "Photo.c"
+#line 11661 "Photo.c"
 	}
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = updated_row;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = backing;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = _backing_photo_row_ref0 (_tmp86_);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp85_->master);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_->master = _tmp87_;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = updated_row;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = detected;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_->md5;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = g_strdup (_tmp90_);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp88_->md5);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_->md5 = _tmp91_;
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = updated_row;
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = detected;
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = _tmp93_->exif_md5;
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = g_strdup (_tmp94_);
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp92_->exif_md5);
-#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_->exif_md5 = _tmp95_;
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = updated_row;
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = detected;
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp98_ = _tmp97_->thumbnail_md5;
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp99_ = g_strdup (_tmp98_);
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp96_->thumbnail_md5);
-#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_->thumbnail_md5 = _tmp99_;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = NULL;
-#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp100_ = detected;
-#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = _tmp100_->metadata;
-#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_ != NULL) {
-#line 11592 "Photo.c"
+#line 11717 "Photo.c"
 		DetectedPhotoInformation* _tmp102_;
 		PhotoMetadata* _tmp103_;
 		PhotoMetadata* _tmp104_;
@@ -11611,180 +11736,180 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp121_;
 		PhotoMetadata* _tmp122_;
 		Rating _tmp123_;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = detected;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = _tmp102_->metadata;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = _media_metadata_ref0 (_tmp103_);
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp104_;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = detected;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = _tmp105_->metadata;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp107_ = photo_metadata_get_exposure_date_time (_tmp106_);
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp107_;
-#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp108_ = date_time;
-#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp108_ != NULL) {
-#line 11635 "Photo.c"
+#line 11760 "Photo.c"
 			PhotoRow* _tmp109_;
 			MetadataDateTime* _tmp110_;
 			time_t _tmp111_;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_ = updated_row;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp110_ = date_time;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp111_ = metadata_date_time_get_timestamp (_tmp110_);
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_->exposure_time = _tmp111_;
-#line 11647 "Photo.c"
+#line 11772 "Photo.c"
 		}
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp112_ = updated_row;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp113_ = detected;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = _tmp113_->metadata;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp112_->title);
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp112_->title = _tmp115_;
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = updated_row;
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = detected;
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = _tmp117_->metadata;
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp119_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp116_->comment);
-#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_->comment = _tmp119_;
-#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp120_ = updated_row;
-#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = detected;
-#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp122_ = _tmp121_->metadata;
-#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = photo_metadata_get_rating (_tmp122_);
-#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp120_->rating = _tmp123_;
-#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11685 "Photo.c"
+#line 11810 "Photo.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = updated_row;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = metadata;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp126_ = list;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp126__length1 = list_length1;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp127_ = photo_reimport_master_state_impl_new (_tmp124_, _tmp125_, _tmp126_, _tmp126__length1);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = (_vala_array_free (list, list_length1, (GDestroyNotify) g_free), NULL);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (updated_row);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (reimport_state) {
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 		*reimport_state = _vala_reimport_state;
-#line 11719 "Photo.c"
+#line 11844 "Photo.c"
 	} else {
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11723 "Photo.c"
+#line 11848 "Photo.c"
 	}
-#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11727 "Photo.c"
+#line 11852 "Photo.c"
 }
 
 
 static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 11736 "Photo.c"
+#line 11861 "Photo.c"
 }
 
 
 void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11745 "Photo.c"
+#line 11870 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11752 "Photo.c"
+#line 11877 "Photo.c"
 }
 
 
-static void _vala_array_add94 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11763 "Photo.c"
+#line 11888 "Photo.c"
 	}
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11769 "Photo.c"
+#line 11894 "Photo.c"
 }
 
 
-static void _vala_array_add95 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11780 "Photo.c"
+#line 11905 "Photo.c"
 	}
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11786 "Photo.c"
+#line 11911 "Photo.c"
 }
 
 
@@ -11803,56 +11928,56 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	gboolean _tmp33_;
 	gboolean _tmp35_;
 	GError * _inner_error_ = NULL;
-#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _photo_reimport_master_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl));
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp1_;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_table_get_instance ();
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state->row;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp3_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11835 "Photo.c"
+#line 11960 "Photo.c"
 		} else {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/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 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11845 "Photo.c"
+#line 11970 "Photo.c"
 		}
 	}
 	{
 		PhotoRow* _tmp5_;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = self->row;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11854 "Photo.c"
+#line 11979 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
 			PhotoRow* _tmp6_;
@@ -11868,191 +11993,191 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			PhotoRow* _tmp16_;
 			BackingPhotoRow* _tmp17_;
 			gboolean _tmp18_;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->master;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _backing_photo_row_ref0 (_tmp7_);
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_master = _tmp8_;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = reimport_state->row;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _photo_row_ref0 (_tmp9_);
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (self->row);
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->row = _tmp10_;
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = original_master;
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_tmp11_->master);
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_->master = _tmp13_;
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->master;
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = reimport_state->row;
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_->master;
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_row_copy_from (_tmp15_, _tmp17_);
-#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = reimport_state->metadata_only;
-#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp18_) {
-#line 1503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 11912 "Photo.c"
+#line 12037 "Photo.c"
 			}
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11916 "Photo.c"
+#line 12041 "Photo.c"
 		}
-		__finally306:
+		__finally318:
 		{
 			PhotoRow* _tmp19_;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11925 "Photo.c"
+#line 12050 "Photo.c"
 		}
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11937 "Photo.c"
+#line 12062 "Photo.c"
 			} else {
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/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 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11947 "Photo.c"
+#line 12072 "Photo.c"
 			}
 		}
 	}
-#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = reimport_state->metadata;
-#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_ != NULL) {
-#line 11955 "Photo.c"
+#line 12080 "Photo.c"
 		PhotoMetadata* _tmp21_;
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = reimport_state->metadata;
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11961 "Photo.c"
+#line 12086 "Photo.c"
 	}
-#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = reimport_state->metadata_only;
-#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp22_) {
-#line 11967 "Photo.c"
+#line 12092 "Photo.c"
 		gchar** _tmp23_;
 		gint _tmp23__length1;
 		gchar* _tmp24_;
 		gboolean _tmp25_;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state->alterations;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23__length1 = reimport_state->alterations_length1;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = g_strdup ("image:master");
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add94 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_);
-#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_);
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = photo_is_master_baseline (self);
-#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp25_) {
-#line 11984 "Photo.c"
+#line 12109 "Photo.c"
 			gchar** _tmp26_;
 			gint _tmp26__length1;
 			gchar* _tmp27_;
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = reimport_state->alterations;
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26__length1 = reimport_state->alterations_length1;
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = g_strdup ("image:baseline");
-#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
-#line 11996 "Photo.c"
+#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
+#line 12121 "Photo.c"
 		}
 	}
-#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = reimport_state->alterations;
-#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28__length1 = reimport_state->alterations_length1;
-#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28__length1 > 0) {
-#line 12005 "Photo.c"
+#line 12130 "Photo.c"
 		gchar** _tmp29_;
 		gint _tmp29__length1;
 		Alteration* _tmp30_;
 		Alteration* _tmp31_;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = reimport_state->alterations;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = reimport_state->alterations_length1;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1);
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp31_);
-#line 12022 "Photo.c"
+#line 12147 "Photo.c"
 	}
-#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
-#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_master_reimported (self, _tmp32_);
-#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_is_master_baseline (self);
-#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_) {
-#line 12032 "Photo.c"
+#line 12157 "Photo.c"
 		PhotoMetadata* _tmp34_;
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state->metadata;
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp34_);
-#line 12038 "Photo.c"
+#line 12163 "Photo.c"
 	}
-#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_is_master_source (self);
-#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 12044 "Photo.c"
+#line 12169 "Photo.c"
 		PhotoMetadata* _tmp36_;
-#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = reimport_state->metadata;
-#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp36_);
-#line 12050 "Photo.c"
+#line 12175 "Photo.c"
 	}
-#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 12054 "Photo.c"
+#line 12179 "Photo.c"
 }
 
 
@@ -12071,177 +12196,177 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	DetectedPhotoInformation* _tmp9_;
 	GdkColorspace _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_query_backing_photo_row (self, _tmp1_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp2_, &_inner_error_);
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp2_;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12089 "Photo.c"
+#line 12214 "Photo.c"
 		gboolean _tmp4_ = FALSE;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp4_;
-#line 12095 "Photo.c"
+#line 12220 "Photo.c"
 	}
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_vala_backing);
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_backing = _tmp5_;
-#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _vala_backing;
-#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12117 "Photo.c"
+#line 12242 "Photo.c"
 		} else {
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12121 "Photo.c"
+#line 12246 "Photo.c"
 		}
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12127 "Photo.c"
+#line 12252 "Photo.c"
 		} else {
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12131 "Photo.c"
+#line 12256 "Photo.c"
 		}
-#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12135 "Photo.c"
+#line 12260 "Photo.c"
 	}
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _vala_detected;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_->colorspace;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != GDK_COLORSPACE_RGB) {
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = TRUE;
-#line 12145 "Photo.c"
+#line 12270 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp11_;
 		gint _tmp12_;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _vala_detected;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->channels;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp12_ < 3;
-#line 12155 "Photo.c"
+#line 12280 "Photo.c"
 	}
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = TRUE;
-#line 12161 "Photo.c"
+#line 12286 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp13_;
 		gint _tmp14_;
-#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_detected;
-#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_->bits_per_channel;
-#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp14_ != 8;
-#line 12171 "Photo.c"
+#line 12296 "Photo.c"
 	}
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 12175 "Photo.c"
+#line 12300 "Photo.c"
 		GFile* _tmp15_;
 		gchar* _tmp16_;
 		gchar* _tmp17_;
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = file;
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = g_file_get_path (_tmp15_);
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp17_);
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1559: Not re-importing %s: Unsupported color format", _tmp17_);
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp17_);
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12197 "Photo.c"
+#line 12322 "Photo.c"
 		} else {
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12201 "Photo.c"
+#line 12326 "Photo.c"
 		}
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12207 "Photo.c"
+#line 12332 "Photo.c"
 		} else {
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12211 "Photo.c"
+#line 12336 "Photo.c"
 		}
-#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12215 "Photo.c"
+#line 12340 "Photo.c"
 	}
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp0_);
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (backing) {
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 		*backing = _vala_backing;
-#line 12225 "Photo.c"
+#line 12350 "Photo.c"
 	} else {
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12229 "Photo.c"
+#line 12354 "Photo.c"
 	}
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 12235 "Photo.c"
+#line 12360 "Photo.c"
 	} else {
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12239 "Photo.c"
+#line 12364 "Photo.c"
 	}
-#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12243 "Photo.c"
+#line 12368 "Photo.c"
 }
 
 
@@ -12263,132 +12388,132 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	PhotoMetadata* _tmp10_;
 	PhotoReimportEditableStateImpl* _tmp11_;
 	GError * _inner_error_ = NULL;
-#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = NULL;
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_file (self);
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp0_;
-#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12287 "Photo.c"
+#line 12412 "Photo.c"
 		} else {
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12291 "Photo.c"
+#line 12416 "Photo.c"
 		}
-#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12295 "Photo.c"
+#line 12420 "Photo.c"
 	}
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_verify_file_for_reimport (self, _tmp3_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp4_;
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp6_;
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12313 "Photo.c"
+#line 12438 "Photo.c"
 		gboolean _tmp7_ = FALSE;
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 12325 "Photo.c"
+#line 12450 "Photo.c"
 	}
-#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12341 "Photo.c"
+#line 12466 "Photo.c"
 		} else {
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12345 "Photo.c"
+#line 12470 "Photo.c"
 		}
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12349 "Photo.c"
+#line 12474 "Photo.c"
 	}
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = backing;
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = detected;
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_->metadata;
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_reimport_editable_state_impl_new (_tmp8_, _tmp10_);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12375 "Photo.c"
+#line 12500 "Photo.c"
 	} else {
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12379 "Photo.c"
+#line 12504 "Photo.c"
 	}
-#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1582 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12383 "Photo.c"
+#line 12508 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12390 "Photo.c"
+#line 12515 "Photo.c"
 }
 
 
@@ -12415,81 +12540,81 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	gboolean _tmp46_;
 	gboolean _tmp49_;
 	GError * _inner_error_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp0_);
-#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp0_;
-#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing_photo_id_is_invalid (&editable_id);
-#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12431 "Photo.c"
+#line 12556 "Photo.c"
 	}
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _photo_reimport_editable_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl));
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp3_;
-#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state;
-#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->metadata_only;
-#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 12445 "Photo.c"
+#line 12570 "Photo.c"
 		BackingPhotoTable* _tmp6_;
 		BackingPhotoTable* _tmp7_;
 		PhotoReimportEditableStateImpl* _tmp8_;
 		BackingPhotoRow* _tmp9_;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = backing_photo_table_get_instance ();
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = reimport_state;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->backing_state;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp7_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12472 "Photo.c"
+#line 12597 "Photo.c"
 			} else {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/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 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12482 "Photo.c"
+#line 12607 "Photo.c"
 			}
 		}
 		{
 			PhotoRow* _tmp10_;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12491 "Photo.c"
+#line 12616 "Photo.c"
 			{
 				PhotoReimportEditableStateImpl* _tmp11_;
 				BackingPhotoRow* _tmp12_;
@@ -12497,58 +12622,58 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				PhotoReimportEditableStateImpl* _tmp14_;
 				BackingPhotoRow* _tmp15_;
 				Orientation _tmp16_;
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = reimport_state;
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->backing_state;
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (self->priv->editable);
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->editable = _tmp13_;
-#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = reimport_state;
-#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing_state;
-#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_set_orientation (self, _tmp16_);
-#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 12519 "Photo.c"
+#line 12644 "Photo.c"
 			}
-			__finally307:
+			__finally319:
 			{
 				PhotoRow* _tmp17_;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12528 "Photo.c"
+#line 12653 "Photo.c"
 			}
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12540 "Photo.c"
+#line 12665 "Photo.c"
 				} else {
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/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 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12550 "Photo.c"
+#line 12675 "Photo.c"
 				}
 			}
 		}
@@ -12556,23 +12681,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		PhotoReimportEditableStateImpl* _tmp18_;
 		BackingPhotoRow* _tmp19_;
 		Orientation _tmp20_;
-#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = reimport_state;
-#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->backing_state;
-#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_->original_orientation;
-#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_orientation (self, _tmp20_);
-#line 12566 "Photo.c"
+#line 12691 "Photo.c"
 	}
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = _tmp21_->metadata;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 12574 "Photo.c"
+#line 12699 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp23_;
 		PhotoMetadata* _tmp24_;
 		gchar* _tmp25_;
@@ -12586,127 +12711,127 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		Rating _tmp33_;
 		PhotoReimportEditableStateImpl* _tmp34_;
 		PhotoMetadata* _tmp35_;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _tmp23_->metadata;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_);
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp26_);
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = reimport_state;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->metadata;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = _tmp29_;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_);
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp30_);
-#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = reimport_state;
-#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_->metadata;
-#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = photo_metadata_get_rating (_tmp32_);
-#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_);
-#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state;
-#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = _tmp34_->metadata;
-#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12626 "Photo.c"
+#line 12751 "Photo.c"
 	}
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp36_;
-#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = reimport_state;
-#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->metadata_only;
-#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 12638 "Photo.c"
+#line 12763 "Photo.c"
 		const gchar* _tmp39_;
 		gchar* _tmp40_;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp40_;
-#line 12649 "Photo.c"
+#line 12774 "Photo.c"
 	}
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = alteration_new_from_list (_tmp41_);
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_);
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp43_);
-#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = reimport_state;
-#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->metadata;
-#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_editable_reimported (self, _tmp45_);
-#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = photo_is_editable_baseline (self);
-#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 12671 "Photo.c"
+#line 12796 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp47_;
 		PhotoMetadata* _tmp48_;
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = reimport_state;
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12680 "Photo.c"
+#line 12805 "Photo.c"
 	}
-#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_is_editable_source (self);
-#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp49_) {
-#line 12686 "Photo.c"
+#line 12811 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp50_;
 		PhotoMetadata* _tmp51_;
-#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = reimport_state;
-#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_->metadata;
-#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12695 "Photo.c"
+#line 12820 "Photo.c"
 	}
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12701 "Photo.c"
+#line 12826 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
-#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12708 "Photo.c"
+#line 12833 "Photo.c"
 }
 
 
@@ -12723,56 +12848,56 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	PhotoReimportRawDevelopmentStateImpl* _tmp21_;
 	gint _tmp22_;
 	GError * _inner_error_ = NULL;
-#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = NULL;
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_raw_developer_files (self);
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = _tmp0_;
-#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = files;
-#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (files);
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12747 "Photo.c"
+#line 12872 "Photo.c"
 		} else {
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12751 "Photo.c"
+#line 12876 "Photo.c"
 		}
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12755 "Photo.c"
+#line 12880 "Photo.c"
 	}
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_reimport_raw_development_state_impl_new ();
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12761 "Photo.c"
+#line 12886 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = files;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 		_file_it = _tmp4_;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12774 "Photo.c"
+#line 12899 "Photo.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			GFile* file = NULL;
@@ -12789,123 +12914,123 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			BackingPhotoRow* _tmp16_;
 			DetectedPhotoInformation* _tmp17_;
 			PhotoMetadata* _tmp18_;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _file_it;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp6_) {
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12799 "Photo.c"
+#line 12924 "Photo.c"
 			}
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			file = (GFile*) _tmp8_;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = file;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp11_;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			detected = _tmp12_;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp13_;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12823 "Photo.c"
+#line 12948 "Photo.c"
 				gboolean _tmp14_ = FALSE;
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_file_it);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (files);
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp14_;
-#line 12841 "Photo.c"
+#line 12966 "Photo.c"
 			}
-#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Photo.vala"
 				continue;
-#line 12853 "Photo.c"
+#line 12978 "Photo.c"
 			}
-#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = reimport_state;
-#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = backing;
-#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = detected;
-#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = _tmp17_->metadata;
-#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_reimport_raw_development_state_impl_add (_tmp15_, _tmp16_, _tmp18_);
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12871 "Photo.c"
+#line 12996 "Photo.c"
 		}
-#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12875 "Photo.c"
+#line 13000 "Photo.c"
 	}
-#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = reimport_state;
-#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState));
-#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp20_;
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = photo_reimport_raw_development_state_impl_get_size (_tmp21_);
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp22_ > 0;
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (files);
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12899 "Photo.c"
+#line 13024 "Photo.c"
 	} else {
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12903 "Photo.c"
+#line 13028 "Photo.c"
 	}
-#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12907 "Photo.c"
+#line 13032 "Photo.c"
 }
 
 
@@ -12922,41 +13047,41 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	Alteration* _tmp38_;
 	Alteration* _tmp39_;
 	GError * _inner_error_ = NULL;
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state));
-#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12934 "Photo.c"
+#line 13059 "Photo.c"
 	}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl));
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12942 "Photo.c"
+#line 13067 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
 		PhotoReimportRawDevelopmentStateImpl* _tmp3_;
 		GeeCollection* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reimport_state;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_->list;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_dev_it = _tmp5_;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12958 "Photo.c"
+#line 13083 "Photo.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
@@ -12964,105 +13089,105 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			gpointer _tmp9_;
 			PhotoReimportRawDevelopmentStateImpl* _tmp10_;
 			gboolean _tmp11_;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _dev_it;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12974 "Photo.c"
+#line 13099 "Photo.c"
 			}
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_;
-#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = reimport_state;
-#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_->metadata_only;
-#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp11_) {
-#line 12988 "Photo.c"
+#line 13113 "Photo.c"
 				BackingPhotoTable* _tmp12_;
 				BackingPhotoTable* _tmp13_;
 				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_;
 				BackingPhotoRow* _tmp15_;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = backing_photo_table_get_instance ();
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp13_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_propagate_error (error, _inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 13019 "Photo.c"
+#line 13144 "Photo.c"
 					} else {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/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 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_clear_error (&_inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 13033 "Photo.c"
+#line 13158 "Photo.c"
 					}
 				}
 				{
 					PhotoRow* _tmp16_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13042 "Photo.c"
+#line 13167 "Photo.c"
 					{
 						gint _tmp17_;
 						RawDeveloper* _tmp18_;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 13048 "Photo.c"
+#line 13173 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
 							gint _d_collection_size_ = 0;
 							gint d_it = 0;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = _tmp18_;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection_length1 = _tmp17_;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 							for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 13060 "Photo.c"
+#line 13185 "Photo.c"
 								RawDeveloper d = 0;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 13064 "Photo.c"
+#line 13189 "Photo.c"
 								{
 									BackingPhotoID id = {0};
 									PhotoRow* _tmp19_;
@@ -13072,154 +13197,154 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 									BackingPhotoID _tmp22_;
 									BackingPhotoID _tmp23_;
 									gint64 _tmp24_;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp19_ = self->row;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20_ = _tmp19_->development_ids;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20__length1 = _tmp19_->development_ids_length1;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp21_ = d;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp22_ = _tmp20_[_tmp21_];
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 									id = _tmp22_;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp23_ = id;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp24_ = _tmp23_.id;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 									if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13092 "Photo.c"
+#line 13217 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
 										BackingPhotoID _tmp25_;
 										BackingPhotoRow* _tmp26_;
 										BackingPhotoRow* _tmp27_;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp25_ = id;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp26_ = photo_get_backing_row (self, &_tmp25_);
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 										bpr = _tmp26_;
-#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp27_ = bpr;
-#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13107 "Photo.c"
+#line 13232 "Photo.c"
 											GeeHashMap* _tmp28_;
 											RawDeveloper _tmp29_;
 											BackingPhotoRow* _tmp30_;
-#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp28_ = self->priv->developments;
-#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp29_ = d;
-#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp30_ = bpr;
-#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
 											gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp29_), _tmp30_);
-#line 13119 "Photo.c"
+#line 13244 "Photo.c"
 										}
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13123 "Photo.c"
+#line 13248 "Photo.c"
 									}
 								}
 							}
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13129 "Photo.c"
+#line 13254 "Photo.c"
 						}
 					}
-					__finally308:
+					__finally320:
 					{
 						PhotoRow* _tmp31_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->row;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13139 "Photo.c"
+#line 13264 "Photo.c"
 					}
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_propagate_error (error, _inner_error_);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13155 "Photo.c"
+#line 13280 "Photo.c"
 						} else {
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_clear_error (&_inner_error_);
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13169 "Photo.c"
+#line 13294 "Photo.c"
 						}
 					}
 				}
 			}
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13176 "Photo.c"
+#line 13301 "Photo.c"
 		}
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13180 "Photo.c"
+#line 13305 "Photo.c"
 	}
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp32_;
-#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = reimport_state;
-#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->metadata_only;
-#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp34_) {
-#line 13192 "Photo.c"
+#line 13317 "Photo.c"
 		const gchar* _tmp35_;
 		gchar* _tmp36_;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = list;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp36_;
-#line 13203 "Photo.c"
+#line 13328 "Photo.c"
 	}
-#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
-#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = alteration_new_from_list (_tmp37_);
-#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_;
-#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp39_);
-#line 1662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_raw_development_modified (self);
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13221 "Photo.c"
+#line 13346 "Photo.c"
 }
 
 
@@ -13227,15 +13352,15 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13237 "Photo.c"
+#line 13362 "Photo.c"
 }
 
 
@@ -13244,17 +13369,17 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_;
-#line 1669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp0_);
-#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13256 "Photo.c"
+#line 13381 "Photo.c"
 }
 
 
@@ -13266,25 +13391,25 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	gint64 _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-#line 1673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_);
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13286 "Photo.c"
+#line 13411 "Photo.c"
 }
 
 
@@ -13294,25 +13419,25 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	GTimeVal _tmp1_ = {0};
 	gboolean _tmp21_;
 	GError * _inner_error_ = NULL;
-#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 13306 "Photo.c"
+#line 13431 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13314 "Photo.c"
+#line 13439 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
 				BackingPhotoRow* _tmp4_;
@@ -13329,148 +13454,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				BackingPhotoRow* _tmp16_;
 				GTimeVal _tmp17_;
 				glong _tmp18_;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->master;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->timestamp;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = modification;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_.tv_sec;
-#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13343 "Photo.c"
+#line 13468 "Photo.c"
 					{
 						PhotoRow* _tmp8_;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = self->row;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13350 "Photo.c"
+#line 13475 "Photo.c"
 					}
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13354 "Photo.c"
+#line 13479 "Photo.c"
 				}
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->photo_id;
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = modification;
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_.tv_sec;
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_);
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp10_);
-#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13374 "Photo.c"
-					goto __finally310;
+#line 13499 "Photo.c"
+					goto __finally322;
 				}
-#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->master;
-#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13387 "Photo.c"
+#line 13512 "Photo.c"
 			}
-			__finally310:
+			__finally322:
 			{
 				PhotoRow* _tmp19_;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13396 "Photo.c"
+#line 13521 "Photo.c"
 			}
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13402 "Photo.c"
-					goto __catch309_database_error;
+#line 13527 "Photo.c"
+					goto __catch321_database_error;
 				}
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/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);
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13411 "Photo.c"
+#line 13536 "Photo.c"
 			}
 		}
 	}
-	goto __finally309;
-	__catch309_database_error:
+	goto __finally321;
+	__catch321_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = err;
-#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp20_);
-#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13432 "Photo.c"
+#line 13557 "Photo.c"
 	}
-	__finally309:
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally321:
+#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1703 "/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 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13443 "Photo.c"
+#line 13568 "Photo.c"
 	}
-#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_is_master_baseline (self);
-#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 13449 "Photo.c"
+#line 13574 "Photo.c"
 		Alteration* _tmp22_;
 		Alteration* _tmp23_;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp");
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp23_);
-#line 13460 "Photo.c"
+#line 13585 "Photo.c"
 	} else {
 		Alteration* _tmp24_;
 		Alteration* _tmp25_;
-#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("metadata", "master-timestamp");
-#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 13472 "Photo.c"
+#line 13597 "Photo.c"
 	}
 }
 
@@ -13482,60 +13607,60 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	gboolean altered = FALSE;
 	gboolean _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 13496 "Photo.c"
+#line 13621 "Photo.c"
 	{
 		PhotoRow* _tmp2_;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13503 "Photo.c"
+#line 13628 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
 			PhotoRow* _tmp4_;
 			gboolean _tmp5_;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13514 "Photo.c"
+#line 13639 "Photo.c"
 				BackingPhotoRow* _tmp6_;
 				time_t _tmp7_;
 				GTimeVal _tmp8_;
 				glong _tmp9_;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->editable;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->timestamp;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = modification;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_.tv_sec;
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13529 "Photo.c"
+#line 13654 "Photo.c"
 			} else {
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13533 "Photo.c"
+#line 13658 "Photo.c"
 			}
-#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13537 "Photo.c"
+#line 13662 "Photo.c"
 				BackingPhotoTable* _tmp10_;
 				BackingPhotoTable* _tmp11_;
 				PhotoRow* _tmp12_;
@@ -13545,96 +13670,96 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				BackingPhotoRow* _tmp16_;
 				GTimeVal _tmp17_;
 				glong _tmp18_;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = backing_photo_table_get_instance ();
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->editable_id;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = modification;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_.tv_sec;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_);
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13565 "Photo.c"
-					goto __finally311;
+#line 13690 "Photo.c"
+					goto __finally323;
 				}
-#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
-#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered = TRUE;
-#line 13578 "Photo.c"
+#line 13703 "Photo.c"
 			}
 		}
-		__finally311:
+		__finally323:
 		{
 			PhotoRow* _tmp19_;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13588 "Photo.c"
+#line 13713 "Photo.c"
 		}
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13598 "Photo.c"
+#line 13723 "Photo.c"
 			} else {
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/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 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13606 "Photo.c"
+#line 13731 "Photo.c"
 			}
 		}
 	}
-#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = altered;
-#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 13614 "Photo.c"
+#line 13739 "Photo.c"
 		Alteration* _tmp21_;
 		Alteration* _tmp22_;
-#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp");
-#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp21_;
-#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
-#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp22_);
-#line 13625 "Photo.c"
+#line 13750 "Photo.c"
 	}
 }
 
 
 void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 1723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 13636 "Photo.c"
+#line 13761 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMap* _tmp0_;
@@ -13643,25 +13768,25 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = map;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 13663 "Photo.c"
+#line 13788 "Photo.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			Photo* photo = NULL;
@@ -13672,90 +13797,90 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			Photo* _tmp12_;
 			gpointer _tmp13_;
 			GFileInfo* _tmp14_;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13682 "Photo.c"
+#line 13807 "Photo.c"
 			}
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (Photo*) _tmp9_;
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = map;
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo;
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = gee_map_get (_tmp11_, _tmp12_);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = (GFileInfo*) _tmp13_;
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp14_);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13716 "Photo.c"
+#line 13841 "Photo.c"
 				} else {
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/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 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13728 "Photo.c"
+#line 13853 "Photo.c"
 				}
 			}
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13733 "Photo.c"
+#line 13858 "Photo.c"
 		}
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13737 "Photo.c"
+#line 13862 "Photo.c"
 	}
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13749 "Photo.c"
+#line 13874 "Photo.c"
 		} else {
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/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 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13757 "Photo.c"
+#line 13882 "Photo.c"
 		}
 	}
 }
@@ -13767,34 +13892,34 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	PhotoFileFormat _tmp0_ = 0;
 	PhotoFileFormat _tmp1_;
 	gboolean _tmp2_;
-#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_file_format (self);
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write_image (_tmp1_);
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 13777 "Photo.c"
+#line 13902 "Photo.c"
 		PhotoFileFormat _tmp3_;
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_file_format (self);
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 13783 "Photo.c"
+#line 13908 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp4_;
-#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
-#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 13790 "Photo.c"
+#line 13915 "Photo.c"
 	}
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13796 "Photo.c"
+#line 13921 "Photo.c"
 }
 
 
@@ -13807,35 +13932,35 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp3_;
 	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 1736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_);
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp2_, &_inner_error_);
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 13825 "Photo.c"
+#line 13950 "Photo.c"
 	}
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13837 "Photo.c"
+#line 13962 "Photo.c"
 }
 
 
@@ -13844,41 +13969,41 @@ gboolean photo_is_file_image (GFile* file) {
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
 	gboolean _tmp2_;
-#line 1740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_is_file_supported (_tmp1_);
-#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13856 "Photo.c"
+#line 13981 "Photo.c"
 	} else {
 		GFile* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gboolean _tmp6_;
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS));
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_;
-#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13874 "Photo.c"
+#line 13999 "Photo.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13880 "Photo.c"
+#line 14005 "Photo.c"
 }
 
 
@@ -13894,102 +14019,102 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	gchar* _tmp5_;
 	gchar** _tmp6_;
 	gint _tmp6__length1;
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp1_;
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp2_;
-#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ext;
-#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 13922 "Photo.c"
+#line 14047 "Photo.c"
 	}
-#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
-#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
-#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp5_;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = extensions;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6__length1 = extensions_length1;
-#line 13936 "Photo.c"
+#line 14061 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection = _tmp6_;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection_length1 = _tmp6__length1;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13948 "Photo.c"
+#line 14073 "Photo.c"
 			gchar* _tmp7_;
 			gchar* extension = NULL;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = g_strdup (extension_collection[extension_it]);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 			extension = _tmp7_;
-#line 13955 "Photo.c"
+#line 14080 "Photo.c"
 			{
 				const gchar* _tmp8_;
 				const gchar* _tmp9_;
-#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = ext;
-#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = extension;
-#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (extension);
-#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (ext);
-#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (name);
-#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 13975 "Photo.c"
+#line 14100 "Photo.c"
 				}
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13979 "Photo.c"
+#line 14104 "Photo.c"
 			}
 		}
 	}
-#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13991 "Photo.c"
+#line 14116 "Photo.c"
 }
 
 
@@ -14003,31 +14128,31 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
 	PhotoFileFormat _tmp5_;
 	gboolean _tmp6_;
 	gboolean _tmp7_;
-#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14029 "Photo.c"
+#line 14154 "Photo.c"
 }
 
 
@@ -14045,43 +14170,43 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
 	gint _tmp8__length1;
 	PhotoID* _tmp9_;
 	gint _tmp9__length1;
-#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8__length1 = _tmp6_;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9__length1 = _tmp8__length1;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp9__length1;
-#line 14077 "Photo.c"
+#line 14202 "Photo.c"
 	}
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp9_;
-#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14083 "Photo.c"
+#line 14208 "Photo.c"
 }
 
 
@@ -14090,19 +14215,19 @@ gint64 photo_get_photo_key (DataSource* source) {
 	DataSource* _tmp0_;
 	PhotoID _tmp1_ = {0};
 	gint64 _tmp2_;
-#line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_PHOTO, Photo), &_tmp1_);
-#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14104 "Photo.c"
+#line 14229 "Photo.c"
 }
 
 
@@ -14113,91 +14238,91 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14131 "Photo.c"
+#line 14256 "Photo.c"
 }
 
 
-static void _vala_array_add96 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14142 "Photo.c"
+#line 14267 "Photo.c"
 	}
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14148 "Photo.c"
+#line 14273 "Photo.c"
 }
 
 
-static void _vala_array_add97 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14159 "Photo.c"
+#line 14284 "Photo.c"
 	}
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14165 "Photo.c"
+#line 14290 "Photo.c"
 }
 
 
-static void _vala_array_add98 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14176 "Photo.c"
+#line 14301 "Photo.c"
 	}
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14182 "Photo.c"
+#line 14307 "Photo.c"
 }
 
 
-static void _vala_array_add99 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14193 "Photo.c"
+#line 14318 "Photo.c"
 	}
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14199 "Photo.c"
+#line 14324 "Photo.c"
 }
 
 
@@ -14212,43 +14337,43 @@ void photo_set_master_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp41_;
 	GError * _inner_error_ = NULL;
-#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 	filepath = _tmp1_;
-#line 1816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1838 "/home/jens/Source/shotwell/src/Photo.vala"
 	name_changed = FALSE;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14234 "Photo.c"
+#line 14359 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14242 "Photo.c"
+#line 14367 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14250 "Photo.c"
+#line 14375 "Photo.c"
 					{
 						PhotoBackingReaders* _tmp4_;
 						PhotoFileReader* _tmp5_;
@@ -14256,25 +14381,25 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						GFile* _tmp7_;
 						GFile* _tmp8_;
 						gboolean _tmp9_;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp4_ = self->priv->readers;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = _tmp4_->master;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp6_;
-#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp7_ = file;
-#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = old_file;
-#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
-#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp9_) {
-#line 14276 "Photo.c"
+#line 14401 "Photo.c"
 							PhotoTable* _tmp10_;
 							PhotoTable* _tmp11_;
 							PhotoID _tmp12_ = {0};
@@ -14297,196 +14422,196 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							PhotoRow* _tmp29_;
 							const gchar* _tmp30_;
 							gboolean _tmp31_;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp10_ = photo_table_get_instance ();
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = _tmp10_;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_get_photo_id (self, &_tmp12_);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = filepath;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp11_);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14313 "Photo.c"
-								goto __finally314;
+#line 14438 "Photo.c"
+								goto __finally326;
 							}
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = _tmp14_->master;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = filepath;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = g_strdup (_tmp16_);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp15_->filepath);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_->filepath = _tmp17_;
-#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = file;
-#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = g_file_get_basename (_tmp18_);
-#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (self->priv->file_title);
-#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 							self->priv->file_title = _tmp19_;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = self->priv->readers;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->row;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->master;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _tmp22_->file_format;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = filepath;
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_);
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp20_->master);
-#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_->master = _tmp25_;
-#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = photo_is_master_baseline (self);
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp26_;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo_is_master_source (self);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp27_;
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = self->row;
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _tmp29_->title;
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = is_string_empty (_tmp30_);
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp31_) {
-#line 14370 "Photo.c"
+#line 14495 "Photo.c"
 								GFile* _tmp32_;
 								gchar* _tmp33_;
 								gchar* _tmp34_;
 								GFile* _tmp35_;
 								gchar* _tmp36_;
 								gchar* _tmp37_;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp32_ = old_file;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp33_ = g_file_get_basename (_tmp32_);
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp34_ = _tmp33_;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp35_ = file;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp36_ = g_file_get_basename (_tmp35_);
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp37_ = _tmp36_;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0;
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp37_);
-#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp34_);
-#line 14395 "Photo.c"
+#line 14520 "Photo.c"
 							} else {
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14399 "Photo.c"
+#line 14524 "Photo.c"
 							}
-#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14403 "Photo.c"
+#line 14528 "Photo.c"
 						}
 					}
-					__finally314:
+					__finally326:
 					{
 						PhotoBackingReaders* _tmp38_;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = self->priv->readers;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14413 "Photo.c"
+#line 14538 "Photo.c"
 					}
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14417 "Photo.c"
-						goto __finally313;
+#line 14542 "Photo.c"
+						goto __finally325;
 					}
 				}
 			}
-			__finally313:
+			__finally325:
 			{
 				PhotoRow* _tmp39_;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14429 "Photo.c"
+#line 14554 "Photo.c"
 			}
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14435 "Photo.c"
-					goto __catch312_database_error;
+#line 14560 "Photo.c"
+					goto __catch324_database_error;
 				}
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/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);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14448 "Photo.c"
+#line 14573 "Photo.c"
 			}
 		}
 	}
-	goto __finally312;
-	__catch312_database_error:
+	goto __finally324;
+	__catch324_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp40_;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp40_);
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14467 "Photo.c"
+#line 14592 "Photo.c"
 	}
-	__finally312:
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally324:
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/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 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14482 "Photo.c"
+#line 14607 "Photo.c"
 	}
-#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = altered;
-#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 14488 "Photo.c"
+#line 14613 "Photo.c"
 		GFile* _tmp42_;
 		GFile* _tmp43_;
 		gboolean _tmp44_;
@@ -14504,162 +14629,162 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		gint _tmp57__length1;
 		Alteration* _tmp58_;
 		Alteration* _tmp59_;
-#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = old_file;
-#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = file;
-#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp42_, _tmp43_);
-#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_baseline;
-#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14518 "Photo.c"
+#line 14643 "Photo.c"
 		}
-#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
-#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp45_;
-#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = alteration_list;
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46__length1 = alteration_list_length1;
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = g_strdup ("backing:master");
-#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
-#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
+#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = name_changed;
-#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14540 "Photo.c"
+#line 14665 "Photo.c"
 			gchar** _tmp49_;
 			gint _tmp49__length1;
 			gchar* _tmp50_;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = alteration_list;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49__length1 = alteration_list_length1;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = g_strdup ("metadata:name");
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14552 "Photo.c"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
+#line 14677 "Photo.c"
 		}
-#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = is_source;
-#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_) {
-#line 14558 "Photo.c"
+#line 14683 "Photo.c"
 			gchar** _tmp52_;
 			gint _tmp52__length1;
 			gchar* _tmp53_;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = alteration_list;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52__length1 = alteration_list_length1;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = g_strdup ("backing:source");
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14570 "Photo.c"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
+#line 14695 "Photo.c"
 		}
-#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = is_baseline;
-#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp54_) {
-#line 14576 "Photo.c"
+#line 14701 "Photo.c"
 			gchar** _tmp55_;
 			gint _tmp55__length1;
 			gchar* _tmp56_;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = alteration_list;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55__length1 = alteration_list_length1;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = g_strdup ("backing:baseline");
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14588 "Photo.c"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
+#line 14713 "Photo.c"
 		}
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57__length1 = alteration_list_length1;
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1);
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_;
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_);
-#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp59_);
-#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14604 "Photo.c"
+#line 14729 "Photo.c"
 	}
-#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14610 "Photo.c"
+#line 14735 "Photo.c"
 }
 
 
-static void _vala_array_add100 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14621 "Photo.c"
+#line 14746 "Photo.c"
 	}
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14627 "Photo.c"
+#line 14752 "Photo.c"
 }
 
 
-static void _vala_array_add101 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14638 "Photo.c"
+#line 14763 "Photo.c"
 	}
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14644 "Photo.c"
+#line 14769 "Photo.c"
 }
 
 
-static void _vala_array_add102 (gchar** * array, int* length, int* size, gchar* value) {
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) {
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14655 "Photo.c"
+#line 14780 "Photo.c"
 	}
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14661 "Photo.c"
+#line 14786 "Photo.c"
 }
 
 
@@ -14673,41 +14798,41 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp34_;
 	GError * _inner_error_ = NULL;
-#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Photo.vala"
 	filepath = _tmp1_;
-#line 1873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14693 "Photo.c"
+#line 14818 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14701 "Photo.c"
+#line 14826 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14709 "Photo.c"
+#line 14834 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
 						PhotoBackingReaders* _tmp5_;
@@ -14715,65 +14840,65 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						GFile* _tmp10_;
 						gboolean _tmp11_ = FALSE;
 						GFile* _tmp12_;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = self->priv->readers;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = _tmp5_->editable;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14723 "Photo.c"
+#line 14848 "Photo.c"
 							PhotoBackingReaders* _tmp7_;
 							PhotoFileReader* _tmp8_;
 							GFile* _tmp9_;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp7_ = self->priv->readers;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp8_ = _tmp7_->editable;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp9_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = _tmp9_;
-#line 14737 "Photo.c"
+#line 14862 "Photo.c"
 						} else {
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = NULL;
-#line 14743 "Photo.c"
+#line 14868 "Photo.c"
 						}
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp10_;
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = old_file;
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp12_ != NULL) {
-#line 14755 "Photo.c"
+#line 14880 "Photo.c"
 							GFile* _tmp13_;
 							GFile* _tmp14_;
 							gboolean _tmp15_;
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = old_file;
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = file;
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = !_tmp15_;
-#line 14767 "Photo.c"
+#line 14892 "Photo.c"
 						} else {
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14771 "Photo.c"
+#line 14896 "Photo.c"
 						}
-#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14775 "Photo.c"
+#line 14900 "Photo.c"
 							BackingPhotoTable* _tmp16_;
 							BackingPhotoTable* _tmp17_;
 							PhotoRow* _tmp18_;
@@ -14789,150 +14914,150 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							PhotoFileReader* _tmp28_;
 							gboolean _tmp29_;
 							gboolean _tmp30_;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = backing_photo_table_get_instance ();
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _tmp16_;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = self->row;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _tmp18_->editable_id;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = filepath;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp17_);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
-#line 14809 "Photo.c"
-								goto __finally317;
+#line 14934 "Photo.c"
+								goto __finally329;
 							}
-#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
-#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = filepath;
-#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = g_strdup (_tmp22_);
-#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp21_->filepath);
-#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_->filepath = _tmp23_;
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = self->priv->readers;
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->editable;
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = _tmp25_->file_format;
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = filepath;
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_);
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp24_->editable);
-#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_->editable = _tmp28_;
-#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = photo_is_editable_baseline (self);
-#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp29_;
-#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = photo_is_editable_source (self);
-#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp30_;
-#line 14846 "Photo.c"
+#line 14971 "Photo.c"
 						}
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14850 "Photo.c"
+#line 14975 "Photo.c"
 					}
-					__finally317:
+					__finally329:
 					{
 						PhotoBackingReaders* _tmp31_;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->priv->readers;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14859 "Photo.c"
+#line 14984 "Photo.c"
 					}
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14863 "Photo.c"
-						goto __finally316;
+#line 14988 "Photo.c"
+						goto __finally328;
 					}
 				}
 			}
-			__finally316:
+			__finally328:
 			{
 				PhotoRow* _tmp32_;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->row;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14875 "Photo.c"
+#line 15000 "Photo.c"
 			}
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14881 "Photo.c"
-					goto __catch315_database_error;
+#line 15006 "Photo.c"
+					goto __catch327_database_error;
 				}
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/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);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14894 "Photo.c"
+#line 15019 "Photo.c"
 			}
 		}
 	}
-	goto __finally315;
-	__catch315_database_error:
+	goto __finally327;
+	__catch327_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp33_;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = err;
-#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp33_);
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14913 "Photo.c"
+#line 15038 "Photo.c"
 	}
-	__finally315:
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally327:
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/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 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14928 "Photo.c"
+#line 15053 "Photo.c"
 	}
-#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = altered;
-#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp34_) {
-#line 14934 "Photo.c"
+#line 15059 "Photo.c"
 		GFile* _tmp35_;
 		GFile* _tmp36_;
 		gboolean _tmp37_;
@@ -14949,93 +15074,93 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		gint _tmp47__length1;
 		Alteration* _tmp48_;
 		Alteration* _tmp49_;
-#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = old_file;
-#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = file;
-#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp35_, _tmp36_);
-#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = is_baseline;
-#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_) {
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14963 "Photo.c"
+#line 15088 "Photo.c"
 		}
-#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
-#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp38_;
-#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = alteration_list;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39__length1 = alteration_list_length1;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("backing:editable");
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
-#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
+#line 1925 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = is_baseline;
-#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14985 "Photo.c"
+#line 15110 "Photo.c"
 			gchar** _tmp42_;
 			gint _tmp42__length1;
 			gchar* _tmp43_;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = alteration_list;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42__length1 = alteration_list_length1;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = g_strdup ("backing:baseline");
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14997 "Photo.c"
+#line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
+#line 15122 "Photo.c"
 		}
-#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_source;
-#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 15003 "Photo.c"
+#line 15128 "Photo.c"
 			gchar** _tmp45_;
 			gint _tmp45__length1;
 			gchar* _tmp46_;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = alteration_list;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45__length1 = alteration_list_length1;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp46_ = g_strdup ("backing:source");
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 15015 "Photo.c"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
+#line 15140 "Photo.c"
 		}
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47__length1 = alteration_list_length1;
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1);
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_;
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_);
-#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp49_);
-#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 15031 "Photo.c"
+#line 15156 "Photo.c"
 	}
-#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 15037 "Photo.c"
+#line 15162 "Photo.c"
 }
 
 
@@ -15044,19 +15169,19 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	GeeMap* _tmp0_;
 	GeeMapIterator* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = map;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_map_map_iterator (_tmp0_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Photo.vala"
 	map_iter = _tmp1_;
-#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	while (TRUE) {
-#line 15058 "Photo.c"
+#line 15183 "Photo.c"
 		GeeMapIterator* _tmp2_;
 		gboolean _tmp3_;
 		GeeMapIterator* _tmp4_;
@@ -15065,64 +15190,64 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		GeeMapIterator* _tmp7_;
 		gpointer _tmp8_;
 		GFile* _tmp9_;
-#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = map_iter;
-#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_map_iterator_next (_tmp2_);
-#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp3_) {
-#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15075 "Photo.c"
+#line 15200 "Photo.c"
 		}
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_map_iterator_get_key (_tmp4_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = (Photo*) _tmp5_;
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = map_iter;
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = gee_map_iterator_get_value (_tmp7_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = (GFile*) _tmp8_;
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_editable_file (_tmp6_, _tmp9_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 15095 "Photo.c"
+#line 15220 "Photo.c"
 	}
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15109 "Photo.c"
+#line 15234 "Photo.c"
 		} else {
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/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 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15119 "Photo.c"
+#line 15244 "Photo.c"
 		}
 	}
-#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15124 "Photo.c"
+#line 15249 "Photo.c"
 }
 
 
@@ -15132,23 +15257,23 @@ GFile* photo_get_actual_file (Photo* self) {
 	PhotoFileReader* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_baseline_reader (self);
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15150 "Photo.c"
+#line 15275 "Photo.c"
 }
 
 
@@ -15159,23 +15284,23 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 1933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15177 "Photo.c"
+#line 15302 "Photo.c"
 }
 
 
@@ -15185,42 +15310,42 @@ GFile* photo_get_editable_file (Photo* self) {
 	PhotoFileReader* _tmp0_;
 	GFile* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_;
-#line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1956 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15197 "Photo.c"
+#line 15322 "Photo.c"
 		PhotoFileReader* _tmp3_;
 		GFile* _tmp4_;
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15208 "Photo.c"
+#line 15333 "Photo.c"
 	} else {
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 15214 "Photo.c"
+#line 15339 "Photo.c"
 	}
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15222 "Photo.c"
+#line 15347 "Photo.c"
 }
 
 
@@ -15230,30 +15355,30 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 	GeeArrayList* ret = NULL;
 	GeeArrayList* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15242 "Photo.c"
+#line 15367 "Photo.c"
 	}
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
-#line 15248 "Photo.c"
+#line 15373 "Photo.c"
 	{
 		PhotoRow* _tmp2_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15255 "Photo.c"
+#line 15380 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
@@ -15263,25 +15388,25 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				GeeCollection* _tmp6_;
 				GeeIterator* _tmp7_;
 				GeeIterator* _tmp8_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp6_);
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_row_it = _tmp8_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15283 "Photo.c"
+#line 15408 "Photo.c"
 					GeeIterator* _tmp9_;
 					gboolean _tmp10_;
 					BackingPhotoRow* row = NULL;
@@ -15292,72 +15417,72 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					const gchar* _tmp15_;
 					GFile* _tmp16_;
 					GFile* _tmp17_;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = _row_it;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = gee_iterator_next (_tmp9_);
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!_tmp10_) {
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15302 "Photo.c"
+#line 15427 "Photo.c"
 					}
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = gee_iterator_get (_tmp11_);
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					row = (BackingPhotoRow*) _tmp12_;
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = ret;
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = row;
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->filepath;
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = g_file_new_for_path (_tmp15_);
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_;
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp17_);
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 15326 "Photo.c"
+#line 15451 "Photo.c"
 				}
-#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15330 "Photo.c"
+#line 15455 "Photo.c"
 			}
 		}
-		__finally318:
+		__finally330:
 		{
 			PhotoRow* _tmp18_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15340 "Photo.c"
+#line 15465 "Photo.c"
 		}
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (ret);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/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 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 15352 "Photo.c"
+#line 15477 "Photo.c"
 		}
 	}
-#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15359 "Photo.c"
+#line 15484 "Photo.c"
 }
 
 
@@ -15367,77 +15492,77 @@ GFile* photo_get_source_file (Photo* self) {
 	PhotoFileReader* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 1956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15385 "Photo.c"
+#line 15510 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15394 "Photo.c"
+#line 15519 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15401 "Photo.c"
+#line 15526 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			PhotoFileFormat _tmp2_;
-#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->file_format;
-#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15411 "Photo.c"
+#line 15536 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15418 "Photo.c"
+#line 15543 "Photo.c"
 			}
-#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15422 "Photo.c"
+#line 15547 "Photo.c"
 		}
-		__finally319:
+		__finally331:
 		{
 			PhotoRow* _tmp4_;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15431 "Photo.c"
+#line 15556 "Photo.c"
 		}
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/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 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15439 "Photo.c"
+#line 15564 "Photo.c"
 	}
 }
 
@@ -15448,88 +15573,88 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	PhotoFileFormat _tmp0_;
 	PhotoFileFormat _tmp1_;
 	gboolean _tmp2_;
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_file_format (self);
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 	file_format = _tmp0_;
-#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
-#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 15462 "Photo.c"
+#line 15587 "Photo.c"
 		PhotoFileFormat _tmp3_;
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_format_get_system_default_format ();
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 		file_format = _tmp3_;
-#line 15468 "Photo.c"
+#line 15593 "Photo.c"
 	}
-#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = file_format;
-#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15474 "Photo.c"
+#line 15599 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_master_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15483 "Photo.c"
+#line 15608 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15490 "Photo.c"
+#line 15615 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			PhotoFileFormat _tmp3_;
-#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15503 "Photo.c"
+#line 15628 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15510 "Photo.c"
+#line 15635 "Photo.c"
 			}
-#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15514 "Photo.c"
+#line 15639 "Photo.c"
 		}
-		__finally320:
+		__finally332:
 		{
 			PhotoRow* _tmp5_;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15523 "Photo.c"
+#line 15648 "Photo.c"
 		}
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/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 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15531 "Photo.c"
+#line 15656 "Photo.c"
 	}
 }
 
@@ -15538,109 +15663,109 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 	Photo * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15542 "Photo.c"
+#line 15667 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		time_t _tmp5_ = 0;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15550 "Photo.c"
+#line 15675 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			time_t _tmp2_;
-#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15560 "Photo.c"
+#line 15685 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15567 "Photo.c"
+#line 15692 "Photo.c"
 			}
-#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15571 "Photo.c"
+#line 15696 "Photo.c"
 		}
-		__finally321:
+		__finally333:
 		{
 			PhotoRow* _tmp4_;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15580 "Photo.c"
+#line 15705 "Photo.c"
 		}
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/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 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 15588 "Photo.c"
+#line 15713 "Photo.c"
 	}
 }
 
 
 void photo_get_photo_id (Photo* self, PhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2005 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15597 "Photo.c"
+#line 15722 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15604 "Photo.c"
+#line 15729 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			PhotoID _tmp2_;
-#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->photo_id;
-#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15614 "Photo.c"
+#line 15739 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15621 "Photo.c"
+#line 15746 "Photo.c"
 			}
-#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15625 "Photo.c"
+#line 15750 "Photo.c"
 		}
-		__finally322:
+		__finally334:
 		{
 			PhotoRow* _tmp4_;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15634 "Photo.c"
+#line 15759 "Photo.c"
 		}
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/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 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15642 "Photo.c"
+#line 15767 "Photo.c"
 	}
 }
 
@@ -15649,17 +15774,17 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
 	Photo * self;
 	PhotoRow* _tmp0_;
 	EventID _tmp1_;
-#line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp1_;
-#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 15661 "Photo.c"
+#line 15786 "Photo.c"
 }
 
 
@@ -15668,127 +15793,127 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	PhotoRow* _tmp0_;
 	EventID _tmp1_;
 	gint64 _tmp2_;
-#line 1998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0LL);
-#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15682 "Photo.c"
+#line 15807 "Photo.c"
 }
 
 
 static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15691 "Photo.c"
+#line 15816 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15698 "Photo.c"
+#line 15823 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			ImportID _tmp2_;
-#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15708 "Photo.c"
+#line 15833 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15715 "Photo.c"
+#line 15840 "Photo.c"
 			}
-#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15719 "Photo.c"
+#line 15844 "Photo.c"
 		}
-		__finally323:
+		__finally335:
 		{
 			PhotoRow* _tmp4_;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15728 "Photo.c"
+#line 15853 "Photo.c"
 		}
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/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 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15736 "Photo.c"
+#line 15861 "Photo.c"
 	}
 }
 
 
 void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15745 "Photo.c"
+#line 15870 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15752 "Photo.c"
+#line 15877 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			BackingPhotoID _tmp2_;
-#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable_id;
-#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15762 "Photo.c"
+#line 15887 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15769 "Photo.c"
+#line 15894 "Photo.c"
 			}
-#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15773 "Photo.c"
+#line 15898 "Photo.c"
 		}
-		__finally324:
+		__finally336:
 		{
 			PhotoRow* _tmp4_;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15782 "Photo.c"
+#line 15907 "Photo.c"
 		}
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/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 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15790 "Photo.c"
+#line 15915 "Photo.c"
 	}
 }
 
@@ -15797,57 +15922,57 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15801 "Photo.c"
+#line 15926 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15808 "Photo.c"
+#line 15933 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15821 "Photo.c"
+#line 15946 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15828 "Photo.c"
+#line 15953 "Photo.c"
 			}
-#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15832 "Photo.c"
+#line 15957 "Photo.c"
 		}
-		__finally325:
+		__finally337:
 		{
 			PhotoRow* _tmp5_;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15841 "Photo.c"
+#line 15966 "Photo.c"
 		}
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/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 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 15849 "Photo.c"
+#line 15974 "Photo.c"
 	}
 }
 
@@ -15855,55 +15980,55 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 guint64 photo_get_flags (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15859 "Photo.c"
+#line 15984 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15867 "Photo.c"
+#line 15992 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
-#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15877 "Photo.c"
+#line 16002 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15884 "Photo.c"
+#line 16009 "Photo.c"
 			}
-#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15888 "Photo.c"
+#line 16013 "Photo.c"
 		}
-		__finally326:
+		__finally338:
 		{
 			PhotoRow* _tmp4_;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15897 "Photo.c"
+#line 16022 "Photo.c"
 		}
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/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 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 15905 "Photo.c"
+#line 16030 "Photo.c"
 	}
 }
 
@@ -15913,41 +16038,41 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
 	Alteration* _tmp5_;
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration = _tmp0_;
-#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = additional_alteration;
-#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 15927 "Photo.c"
+#line 16052 "Photo.c"
 		Alteration* _tmp2_;
 		Alteration* _tmp3_;
 		Alteration* _tmp4_;
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = additional_alteration;
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (alteration);
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration = _tmp4_;
-#line 15941 "Photo.c"
+#line 16066 "Photo.c"
 	}
-#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (alteration);
-#line 15949 "Photo.c"
+#line 16074 "Photo.c"
 }
 
 
@@ -15957,18 +16082,18 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	gboolean _tmp11_;
 	guint64 _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15963 "Photo.c"
+#line 16088 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15970 "Photo.c"
+#line 16095 "Photo.c"
 		{
 			PhotoTable* _tmp1_;
 			PhotoTable* _tmp2_;
@@ -15976,138 +16101,138 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			guint64 _tmp4_;
 			gboolean _tmp5_;
 			gboolean _tmp6_;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp3_);
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = flags;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_);
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp5_;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = committed;
-#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15996 "Photo.c"
+#line 16121 "Photo.c"
 				PhotoRow* _tmp7_;
 				guint64 _tmp8_;
-#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = flags;
-#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 16005 "Photo.c"
+#line 16130 "Photo.c"
 			}
 		}
-		__finally327:
+		__finally339:
 		{
 			PhotoRow* _tmp9_;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16015 "Photo.c"
+#line 16140 "Photo.c"
 		}
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16019 "Photo.c"
+#line 16144 "Photo.c"
 			guint64 _tmp10_ = 0ULL;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/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 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp10_;
-#line 16027 "Photo.c"
+#line 16152 "Photo.c"
 		}
 	}
-#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = committed;
-#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16034 "Photo.c"
+#line 16159 "Photo.c"
 		Alteration* _tmp12_;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = additional_alteration;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp12_);
-#line 16040 "Photo.c"
+#line 16165 "Photo.c"
 	}
-#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = flags;
-#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp13_;
-#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16048 "Photo.c"
+#line 16173 "Photo.c"
 }
 
 
 gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16057 "Photo.c"
+#line 16182 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp7_ = FALSE;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16065 "Photo.c"
+#line 16190 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
 			guint64 _tmp3_;
 			gboolean _tmp4_;
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp4_;
-#line 16081 "Photo.c"
+#line 16206 "Photo.c"
 			{
 				PhotoRow* _tmp5_;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16088 "Photo.c"
+#line 16213 "Photo.c"
 			}
-#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16092 "Photo.c"
+#line 16217 "Photo.c"
 		}
-		__finally328:
+		__finally340:
 		{
 			PhotoRow* _tmp6_;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16101 "Photo.c"
+#line 16226 "Photo.c"
 		}
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/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 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 16109 "Photo.c"
+#line 16234 "Photo.c"
 	}
 }
 
@@ -16118,22 +16243,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	gboolean committed = FALSE;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Photo.vala"
 	flags = (guint64) 0;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16128 "Photo.c"
+#line 16253 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16135 "Photo.c"
+#line 16260 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -16142,101 +16267,101 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			PhotoRow* _tmp5_;
 			guint64 _tmp6_;
 			guint64 _tmp7_;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16162 "Photo.c"
+#line 16287 "Photo.c"
 				PhotoTable* _tmp8_;
 				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_;
 				gboolean _tmp12_;
 				gboolean _tmp13_;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16187 "Photo.c"
+#line 16312 "Photo.c"
 					PhotoRow* _tmp14_;
 					guint64 _tmp15_;
-#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16196 "Photo.c"
+#line 16321 "Photo.c"
 				}
 			}
 		}
-		__finally329:
+		__finally341:
 		{
 			PhotoRow* _tmp16_;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16207 "Photo.c"
+#line 16332 "Photo.c"
 		}
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16211 "Photo.c"
+#line 16336 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/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 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16219 "Photo.c"
+#line 16344 "Photo.c"
 		}
 	}
-#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16226 "Photo.c"
+#line 16351 "Photo.c"
 		Alteration* _tmp19_;
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16232 "Photo.c"
+#line 16357 "Photo.c"
 	}
-#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16238 "Photo.c"
+#line 16363 "Photo.c"
 }
 
 
@@ -16246,22 +16371,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Photo.vala"
 	flags = (guint64) 0;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16256 "Photo.c"
+#line 16381 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16263 "Photo.c"
+#line 16388 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -16270,101 +16395,101 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp5_;
 			guint64 _tmp6_;
 			guint64 _tmp7_;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16290 "Photo.c"
+#line 16415 "Photo.c"
 				PhotoTable* _tmp8_;
 				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_;
 				gboolean _tmp12_;
 				gboolean _tmp13_;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16315 "Photo.c"
+#line 16440 "Photo.c"
 					PhotoRow* _tmp14_;
 					guint64 _tmp15_;
-#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16324 "Photo.c"
+#line 16449 "Photo.c"
 				}
 			}
 		}
-		__finally330:
+		__finally342:
 		{
 			PhotoRow* _tmp16_;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16335 "Photo.c"
+#line 16460 "Photo.c"
 		}
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16339 "Photo.c"
+#line 16464 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/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 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16347 "Photo.c"
+#line 16472 "Photo.c"
 		}
 	}
-#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16354 "Photo.c"
+#line 16479 "Photo.c"
 		Alteration* _tmp19_;
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16360 "Photo.c"
+#line 16485 "Photo.c"
 	}
-#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16366 "Photo.c"
+#line 16491 "Photo.c"
 }
 
 
@@ -16374,22 +16499,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	gboolean committed = FALSE;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Photo.vala"
 	flags = (guint64) 0;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16384 "Photo.c"
+#line 16509 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16391 "Photo.c"
+#line 16516 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -16398,101 +16523,101 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			PhotoRow* _tmp5_;
 			guint64 _tmp6_;
 			guint64 _tmp7_;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = add;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = remove;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = (_tmp2_ | _tmp3_) & (~_tmp4_);
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16418 "Photo.c"
+#line 16543 "Photo.c"
 				PhotoTable* _tmp8_;
 				PhotoTable* _tmp9_;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_;
 				gboolean _tmp12_;
 				gboolean _tmp13_;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16443 "Photo.c"
+#line 16568 "Photo.c"
 					PhotoRow* _tmp14_;
 					guint64 _tmp15_;
-#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16452 "Photo.c"
+#line 16577 "Photo.c"
 				}
 			}
 		}
-		__finally331:
+		__finally343:
 		{
 			PhotoRow* _tmp16_;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16463 "Photo.c"
+#line 16588 "Photo.c"
 		}
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16467 "Photo.c"
+#line 16592 "Photo.c"
 			guint64 _tmp17_ = 0ULL;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/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 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp17_;
-#line 16475 "Photo.c"
+#line 16600 "Photo.c"
 		}
 	}
-#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 16482 "Photo.c"
+#line 16607 "Photo.c"
 		Alteration* _tmp19_;
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = additional_alteration;
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp19_);
-#line 16488 "Photo.c"
+#line 16613 "Photo.c"
 	}
-#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16494 "Photo.c"
+#line 16619 "Photo.c"
 }
 
 
@@ -16500,34 +16625,34 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add));
-#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_add_alteration == NULL) || IS_ALTERATION (additional_add_alteration));
-#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((remove == NULL) || GEE_IS_COLLECTION (remove));
-#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_remove_alteration == NULL) || IS_ALTERATION (additional_remove_alteration));
-#line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = add;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 16516 "Photo.c"
+#line 16641 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = add;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp2_;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16529 "Photo.c"
+#line 16654 "Photo.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				Photo* photo = NULL;
@@ -16536,57 +16661,57 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp7_;
 				guint64 _tmp8_;
 				Alteration* _tmp9_;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _photo_it;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16546 "Photo.c"
+#line 16671 "Photo.c"
 				}
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp6_;
-#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo;
-#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = add_mask;
-#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = additional_add_alteration;
-#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16564 "Photo.c"
+#line 16689 "Photo.c"
 			}
-#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16568 "Photo.c"
+#line 16693 "Photo.c"
 		}
 	}
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = remove;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != NULL) {
-#line 16575 "Photo.c"
+#line 16700 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp11_;
 			GeeIterator* _tmp12_;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = remove;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp12_;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16588 "Photo.c"
+#line 16713 "Photo.c"
 				GeeIterator* _tmp13_;
 				gboolean _tmp14_;
 				Photo* photo = NULL;
@@ -16595,58 +16720,58 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp17_;
 				guint64 _tmp18_;
 				Alteration* _tmp19_;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _photo_it;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_next (_tmp13_);
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp14_) {
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16605 "Photo.c"
+#line 16730 "Photo.c"
 				}
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = gee_iterator_get (_tmp15_);
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp16_;
-#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = remove_mask;
-#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = additional_remove_alteration;
-#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16623 "Photo.c"
+#line 16748 "Photo.c"
 			}
-#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16627 "Photo.c"
+#line 16752 "Photo.c"
 		}
 	}
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16640 "Photo.c"
+#line 16765 "Photo.c"
 		} else {
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/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 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16648 "Photo.c"
+#line 16773 "Photo.c"
 		}
 	}
 }
@@ -16658,22 +16783,22 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 	flags = (guint64) 0;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16668 "Photo.c"
+#line 16793 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16675 "Photo.c"
+#line 16800 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -16681,154 +16806,154 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp4_;
 			guint64 _tmp5_;
 			guint64 _tmp6_;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp2_ ^ _tmp3_;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->flags;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = flags;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_ != _tmp6_) {
-#line 16699 "Photo.c"
+#line 16824 "Photo.c"
 				PhotoTable* _tmp7_;
 				PhotoTable* _tmp8_;
 				PhotoID _tmp9_ = {0};
 				guint64 _tmp10_;
 				gboolean _tmp11_;
 				gboolean _tmp12_;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = flags;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_);
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16724 "Photo.c"
+#line 16849 "Photo.c"
 					PhotoRow* _tmp13_;
 					guint64 _tmp14_;
-#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = flags;
-#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16733 "Photo.c"
+#line 16858 "Photo.c"
 				}
 			}
 		}
-		__finally332:
+		__finally344:
 		{
 			PhotoRow* _tmp15_;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16744 "Photo.c"
+#line 16869 "Photo.c"
 		}
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16748 "Photo.c"
+#line 16873 "Photo.c"
 			guint64 _tmp16_ = 0ULL;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/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 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp16_;
-#line 16756 "Photo.c"
+#line 16881 "Photo.c"
 		}
 	}
-#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16763 "Photo.c"
+#line 16888 "Photo.c"
 		Alteration* _tmp18_;
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16769 "Photo.c"
+#line 16894 "Photo.c"
 	}
-#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16775 "Photo.c"
+#line 16900 "Photo.c"
 }
 
 
 gboolean photo_is_master_metadata_dirty (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16784 "Photo.c"
+#line 16909 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16792 "Photo.c"
+#line 16917 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			gboolean _tmp2_;
-#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16802 "Photo.c"
+#line 16927 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16809 "Photo.c"
+#line 16934 "Photo.c"
 			}
-#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16813 "Photo.c"
+#line 16938 "Photo.c"
 		}
-		__finally333:
+		__finally345:
 		{
 			PhotoRow* _tmp4_;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16822 "Photo.c"
+#line 16947 "Photo.c"
 		}
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/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 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 16830 "Photo.c"
+#line 16955 "Photo.c"
 	}
 }
 
@@ -16837,110 +16962,110 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	gboolean committed = FALSE;
 	gboolean _tmp11_;
 	GError * _inner_error_ = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2175 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16843 "Photo.c"
+#line 16968 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16850 "Photo.c"
+#line 16975 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			gboolean _tmp2_;
 			gboolean _tmp3_;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dirty;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 16863 "Photo.c"
+#line 16988 "Photo.c"
 				PhotoTable* _tmp4_;
 				PhotoTable* _tmp5_;
 				PhotoID _tmp6_ = {0};
 				gboolean _tmp7_;
 				PhotoRow* _tmp8_;
 				gboolean _tmp9_;
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp6_);
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = dirty;
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_);
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16884 "Photo.c"
-					goto __finally334;
+#line 17009 "Photo.c"
+					goto __finally346;
 				}
-#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = dirty;
-#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->metadata_dirty = _tmp9_;
-#line 2162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = TRUE;
-#line 16895 "Photo.c"
+#line 17020 "Photo.c"
 			}
 		}
-		__finally334:
+		__finally346:
 		{
 			PhotoRow* _tmp10_;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16905 "Photo.c"
+#line 17030 "Photo.c"
 		}
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16915 "Photo.c"
+#line 17040 "Photo.c"
 			} else {
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/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 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16923 "Photo.c"
+#line 17048 "Photo.c"
 			}
 		}
 	}
-#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = committed;
-#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16931 "Photo.c"
+#line 17056 "Photo.c"
 		Alteration* _tmp12_;
 		Alteration* _tmp13_;
-#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = alteration_new ("metadata", "master-dirty");
-#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp13_);
-#line 16942 "Photo.c"
+#line 17067 "Photo.c"
 	}
 }
 
@@ -16949,54 +17074,54 @@ static Rating photo_real_get_rating (MediaSource* base) {
 	Photo * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16953 "Photo.c"
+#line 17078 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16960 "Photo.c"
+#line 17085 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			Rating _tmp2_;
-#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16970 "Photo.c"
+#line 17095 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16977 "Photo.c"
+#line 17102 "Photo.c"
 			}
-#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16981 "Photo.c"
+#line 17106 "Photo.c"
 		}
-		__finally335:
+		__finally347:
 		{
 			PhotoRow* _tmp4_;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16990 "Photo.c"
+#line 17115 "Photo.c"
 		}
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/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 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 16998 "Photo.c"
+#line 17123 "Photo.c"
 	}
 }
 
@@ -17006,122 +17131,122 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	gboolean committed = FALSE;
 	gboolean _tmp16_;
 	GError * _inner_error_ = NULL;
-#line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 17012 "Photo.c"
+#line 17137 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17019 "Photo.c"
+#line 17144 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_;
 			PhotoRow* _tmp3_;
 			Rating _tmp4_;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rating;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->rating;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp4_) {
-#line 17033 "Photo.c"
+#line 17158 "Photo.c"
 				Rating _tmp5_;
 				gboolean _tmp6_;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = rating;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = rating_is_valid (_tmp5_);
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 17042 "Photo.c"
+#line 17167 "Photo.c"
 			} else {
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 17046 "Photo.c"
+#line 17171 "Photo.c"
 			}
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 17050 "Photo.c"
+#line 17175 "Photo.c"
 				PhotoTable* _tmp7_;
 				PhotoTable* _tmp8_;
 				PhotoID _tmp9_ = {0};
 				Rating _tmp10_;
 				gboolean _tmp11_;
 				gboolean _tmp12_;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = rating;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_);
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 17075 "Photo.c"
+#line 17200 "Photo.c"
 					PhotoRow* _tmp13_;
 					Rating _tmp14_;
-#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = rating;
-#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 17084 "Photo.c"
+#line 17209 "Photo.c"
 				}
 			}
 		}
-		__finally336:
+		__finally348:
 		{
 			PhotoRow* _tmp15_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17095 "Photo.c"
+#line 17220 "Photo.c"
 		}
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/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 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17105 "Photo.c"
+#line 17230 "Photo.c"
 		}
 	}
-#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
-#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 17112 "Photo.c"
+#line 17237 "Photo.c"
 		Alteration* _tmp17_;
 		Alteration* _tmp18_;
-#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = alteration_new ("metadata", "rating");
-#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
-#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp18_);
-#line 17123 "Photo.c"
+#line 17248 "Photo.c"
 	}
 }
 
@@ -17129,48 +17254,48 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 static void photo_real_increase_rating (MediaSource* base) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17133 "Photo.c"
+#line 17258 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17140 "Photo.c"
+#line 17265 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			Rating _tmp2_;
 			Rating _tmp3_;
-#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17153 "Photo.c"
+#line 17278 "Photo.c"
 		}
-		__finally337:
+		__finally349:
 		{
 			PhotoRow* _tmp4_;
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17162 "Photo.c"
+#line 17287 "Photo.c"
 		}
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/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 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17172 "Photo.c"
+#line 17297 "Photo.c"
 		}
 	}
 }
@@ -17179,48 +17304,48 @@ static void photo_real_increase_rating (MediaSource* base) {
 static void photo_real_decrease_rating (MediaSource* base) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2216 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17183 "Photo.c"
+#line 17308 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17190 "Photo.c"
+#line 17315 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			Rating _tmp2_;
 			Rating _tmp3_;
-#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17203 "Photo.c"
+#line 17328 "Photo.c"
 		}
-		__finally338:
+		__finally350:
 		{
 			PhotoRow* _tmp4_;
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17212 "Photo.c"
+#line 17337 "Photo.c"
 		}
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/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 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17222 "Photo.c"
+#line 17347 "Photo.c"
 		}
 	}
 }
@@ -17229,130 +17354,130 @@ static void photo_real_decrease_rating (MediaSource* base) {
 static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17235 "Photo.c"
+#line 17360 "Photo.c"
 	{
 		PhotoTable* _tmp0_;
 		PhotoTable* _tmp1_;
 		PhotoID _tmp2_ = {0};
 		const gchar* _tmp3_;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp2_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = backlinks;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17257 "Photo.c"
-				goto __catch339_database_error;
+#line 17382 "Photo.c"
+				goto __catch351_database_error;
 			}
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/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);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17266 "Photo.c"
+#line 17391 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp4_;
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17274 "Photo.c"
+#line 17399 "Photo.c"
 			{
 				PhotoRow* _tmp5_;
 				const gchar* _tmp6_;
 				gchar* _tmp7_;
-#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = backlinks;
-#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 17289 "Photo.c"
+#line 17414 "Photo.c"
 			}
-			__finally340:
+			__finally352:
 			{
 				PhotoRow* _tmp8_;
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17298 "Photo.c"
+#line 17423 "Photo.c"
 			}
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17304 "Photo.c"
-					goto __catch339_database_error;
+#line 17429 "Photo.c"
+					goto __catch351_database_error;
 				}
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/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);
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 17313 "Photo.c"
+#line 17438 "Photo.c"
 			}
 		}
 	}
-	goto __finally339;
-	__catch339_database_error:
+	goto __finally351;
+	__catch351_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
 		GError* _tmp11_;
 		const gchar* _tmp12_;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_;
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = err;
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->message;
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2213: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2232: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp10_);
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17343 "Photo.c"
+#line 17468 "Photo.c"
 	}
-	__finally339:
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally351:
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/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 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17354 "Photo.c"
+#line 17479 "Photo.c"
 	}
 }
 
@@ -17361,19 +17486,19 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Photo * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17367 "Photo.c"
+#line 17492 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp13_ = FALSE;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17375 "Photo.c"
+#line 17500 "Photo.c"
 		{
 			gboolean committed = FALSE;
 			PhotoTable* _tmp1_;
@@ -17384,70 +17509,70 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_;
 			gboolean _tmp7_;
 			gboolean _tmp8_;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *event_id;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp7_;
-#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = committed;
-#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 17408 "Photo.c"
+#line 17533 "Photo.c"
 				PhotoRow* _tmp9_;
 				EventID _tmp10_;
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = *event_id;
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17417 "Photo.c"
+#line 17542 "Photo.c"
 			}
-#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17421 "Photo.c"
+#line 17546 "Photo.c"
 			{
 				PhotoRow* _tmp11_;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17428 "Photo.c"
+#line 17553 "Photo.c"
 			}
-#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17432 "Photo.c"
+#line 17557 "Photo.c"
 		}
-		__finally341:
+		__finally353:
 		{
 			PhotoRow* _tmp12_;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17441 "Photo.c"
+#line 17566 "Photo.c"
 		}
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/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 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp13_;
-#line 17449 "Photo.c"
+#line 17574 "Photo.c"
 	}
 }
 
@@ -17467,13 +17592,13 @@ static gchar* photo_real_to_string (DataObject* base) {
 	gchar* _tmp17_;
 	gchar* _tmp18_;
 	gchar* _tmp19_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_is_master_baseline (self);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17475 "Photo.c"
+#line 17600 "Photo.c"
 		GFile* _tmp2_;
 		GFile* _tmp3_;
 		gchar* _tmp4_;
@@ -17481,74 +17606,74 @@ static gchar* photo_real_to_string (DataObject* base) {
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_actual_file (self);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_strconcat (" (", _tmp5_, NULL);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_strconcat (_tmp7_, ")", NULL);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp8_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp7_);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17507 "Photo.c"
+#line 17632 "Photo.c"
 	} else {
 		gchar* _tmp9_;
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_strdup ("");
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17516 "Photo.c"
+#line 17641 "Photo.c"
 	}
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.id;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_get_master_reader (self);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp17_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp15_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp13_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17550 "Photo.c"
+#line 17675 "Photo.c"
 }
 
 
@@ -17561,21 +17686,21 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	Photo* _tmp2_;
 	DataSource* _tmp14_;
 	gboolean _tmp15_;
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL);
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17577 "Photo.c"
+#line 17702 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
@@ -17583,66 +17708,66 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		PhotoID _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_;
-#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2260 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp3_);
-#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2260 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id = _tmp3_;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (_tmp4_, &_tmp5_);
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		other_photo_id = _tmp5_;
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17599 "Photo.c"
+#line 17724 "Photo.c"
 			PhotoID _tmp8_;
 			gint64 _tmp9_;
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_id;
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_.id;
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17608 "Photo.c"
+#line 17733 "Photo.c"
 		} else {
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17612 "Photo.c"
+#line 17737 "Photo.c"
 		}
-#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17616 "Photo.c"
+#line 17741 "Photo.c"
 			PhotoID _tmp10_;
 			gint64 _tmp11_;
 			PhotoID _tmp12_;
 			gint64 _tmp13_;
-#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_id;
-#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_.id;
-#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = other_photo_id;
-#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_.id;
-#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17631 "Photo.c"
+#line 17756 "Photo.c"
 		}
 	}
-#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = DATA_SOURCE_CLASS (photo_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_DATA_SOURCE, DataSource), _tmp14_);
-#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp15_;
-#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17644 "Photo.c"
+#line 17769 "Photo.c"
 }
 
 
@@ -17662,196 +17787,196 @@ static void photo_file_exif_updated (Photo* self) {
 	gboolean success = FALSE;
 	gboolean _tmp37_;
 	GError * _inner_error_ = NULL;
-#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp0_;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17672 "Photo.c"
+#line 17797 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFileInfo* _tmp2_;
 		GFileInfo* _tmp3_;
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_query_info (file, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp2_;
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17683 "Photo.c"
-			goto __catch342_g_error;
+#line 17808 "Photo.c"
+			goto __catch354_g_error;
 		}
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp3_;
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17696 "Photo.c"
+#line 17821 "Photo.c"
 	}
-	goto __finally342;
-	__catch342_g_error:
+	goto __finally354;
+	__catch354_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err->message;
-#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_error ("Photo.vala:2261: Unable to read file information for %s: %s", _tmp5_, _tmp6_);
-#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_error ("Photo.vala:2280: Unable to read file information for %s: %s", _tmp5_, _tmp6_);
+#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17721 "Photo.c"
+#line 17846 "Photo.c"
 	}
-	__finally342:
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally354:
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/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 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17736 "Photo.c"
+#line 17861 "Photo.c"
 	}
-#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp7_, &_tmp8_);
-#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp8_;
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp9_;
-#line 17748 "Photo.c"
+#line 17873 "Photo.c"
 	{
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17754 "Photo.c"
-			goto __catch343_g_error;
+#line 17879 "Photo.c"
+			goto __catch355_g_error;
 		}
 	}
-	goto __finally343;
-	__catch343_g_error:
+	goto __finally355;
+	__catch355_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
 		GError* _tmp12_;
 		const gchar* _tmp13_;
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = g_file_get_path (file);
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_;
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = err;
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_->message;
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2271: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_);
-#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2290: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_);
+#line 2290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp11_);
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17784 "Photo.c"
+#line 17909 "Photo.c"
 	}
-	__finally343:
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally355:
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/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 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17801 "Photo.c"
+#line 17926 "Photo.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp14_;
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = detected;
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ == NULL) {
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17813 "Photo.c"
+#line 17938 "Photo.c"
 	} else {
 		gboolean _tmp17_;
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp17_;
-#line 17820 "Photo.c"
+#line 17945 "Photo.c"
 	}
-#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17824 "Photo.c"
+#line 17949 "Photo.c"
 		gchar* _tmp18_;
 		gchar* _tmp19_;
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:2276: file_exif_updated: %s no longer an image", _tmp19_);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_critical ("Photo.vala:2295: file_exif_updated: %s no longer an image", _tmp19_);
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp19_);
-#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17845 "Photo.c"
+#line 17970 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp20_;
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = self->row;
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17853 "Photo.c"
+#line 17978 "Photo.c"
 		{
 			PhotoTable* _tmp21_;
 			PhotoTable* _tmp22_;
@@ -17868,96 +17993,96 @@ static void photo_file_exif_updated (Photo* self) {
 			const gchar* _tmp33_;
 			PhotoRow* _tmp34_;
 			gboolean _tmp35_;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_table_get_instance ();
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _tmp21_;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp23_);
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = info;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = g_file_info_get_size (_tmp24_);
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = timestamp;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_.tv_sec;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = detected;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_->md5;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = detected;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = _tmp30_->exif_md5;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = detected;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tmp32_->thumbnail_md5;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = self->row;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_);
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			success = _tmp35_;
-#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17904 "Photo.c"
+#line 18029 "Photo.c"
 		}
-		__finally344:
+		__finally356:
 		{
 			PhotoRow* _tmp36_;
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = self->row;
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17913 "Photo.c"
+#line 18038 "Photo.c"
 		}
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/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 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17931 "Photo.c"
+#line 18056 "Photo.c"
 		}
 	}
-#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = success;
-#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_) {
-#line 17938 "Photo.c"
+#line 18063 "Photo.c"
 		Alteration* _tmp38_;
 		Alteration* _tmp39_;
-#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5");
-#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp39_);
-#line 17949 "Photo.c"
+#line 18074 "Photo.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 17959 "Photo.c"
+#line 18084 "Photo.c"
 }
 
 
@@ -17965,55 +18090,55 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17969 "Photo.c"
+#line 18094 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17977 "Photo.c"
+#line 18102 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			gint64 _tmp2_;
-#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17987 "Photo.c"
+#line 18112 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17994 "Photo.c"
+#line 18119 "Photo.c"
 			}
-#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17998 "Photo.c"
+#line 18123 "Photo.c"
 		}
-		__finally345:
+		__finally357:
 		{
 			PhotoRow* _tmp4_;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18007 "Photo.c"
+#line 18132 "Photo.c"
 		}
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/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 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 18015 "Photo.c"
+#line 18140 "Photo.c"
 	}
 }
 
@@ -18022,58 +18147,58 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18026 "Photo.c"
+#line 18151 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		guint64 _tmp6_ = 0ULL;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18034 "Photo.c"
+#line 18159 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			BackingPhotoRow* _tmp2_;
 			gint64 _tmp3_;
-#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->filesize;
-#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp3_;
-#line 18047 "Photo.c"
+#line 18172 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18054 "Photo.c"
+#line 18179 "Photo.c"
 			}
-#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18058 "Photo.c"
+#line 18183 "Photo.c"
 		}
-		__finally346:
+		__finally358:
 		{
 			PhotoRow* _tmp5_;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18067 "Photo.c"
+#line 18192 "Photo.c"
 		}
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/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 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp6_;
-#line 18075 "Photo.c"
+#line 18200 "Photo.c"
 	}
 }
 
@@ -18081,55 +18206,55 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 guint64 photo_get_editable_filesize (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 18085 "Photo.c"
+#line 18210 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18093 "Photo.c"
+#line 18218 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			gint64 _tmp2_;
-#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->editable;
-#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18103 "Photo.c"
+#line 18228 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18110 "Photo.c"
+#line 18235 "Photo.c"
 			}
-#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18114 "Photo.c"
+#line 18239 "Photo.c"
 		}
-		__finally347:
+		__finally359:
 		{
 			PhotoRow* _tmp4_;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18123 "Photo.c"
+#line 18248 "Photo.c"
 		}
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/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 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp5_;
-#line 18131 "Photo.c"
+#line 18256 "Photo.c"
 	}
 }
 
@@ -18138,15 +18263,15 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
 	Photo * self;
 	time_t result = 0;
 	time_t _tmp0_;
-#line 2311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->cached_exposure_time;
-#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18148 "Photo.c"
+#line 18273 "Photo.c"
 }
 
 
@@ -18154,54 +18279,54 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18158 "Photo.c"
+#line 18283 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18165 "Photo.c"
+#line 18290 "Photo.c"
 		{
 			const gchar* _tmp1_;
 			gchar* _tmp2_;
-#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->file_title;
-#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = g_strdup (_tmp1_);
-#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18175 "Photo.c"
+#line 18300 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18182 "Photo.c"
+#line 18307 "Photo.c"
 			}
-#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18186 "Photo.c"
+#line 18311 "Photo.c"
 		}
-		__finally348:
+		__finally360:
 		{
 			PhotoRow* _tmp4_;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18195 "Photo.c"
+#line 18320 "Photo.c"
 		}
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/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 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18203 "Photo.c"
+#line 18328 "Photo.c"
 	}
 }
 
@@ -18210,57 +18335,57 @@ static gchar* photo_real_get_title (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18214 "Photo.c"
+#line 18339 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18221 "Photo.c"
+#line 18346 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->title;
-#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18234 "Photo.c"
+#line 18359 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18241 "Photo.c"
+#line 18366 "Photo.c"
 			}
-#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18245 "Photo.c"
+#line 18370 "Photo.c"
 		}
-		__finally349:
+		__finally361:
 		{
 			PhotoRow* _tmp5_;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18254 "Photo.c"
+#line 18379 "Photo.c"
 		}
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/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 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18262 "Photo.c"
+#line 18387 "Photo.c"
 	}
 }
 
@@ -18269,57 +18394,57 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18273 "Photo.c"
+#line 18398 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18280 "Photo.c"
+#line 18405 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18293 "Photo.c"
+#line 18418 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18300 "Photo.c"
+#line 18425 "Photo.c"
 			}
-#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18304 "Photo.c"
+#line 18429 "Photo.c"
 		}
-		__finally350:
+		__finally362:
 		{
 			PhotoRow* _tmp5_;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18313 "Photo.c"
+#line 18438 "Photo.c"
 		}
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/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 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18321 "Photo.c"
+#line 18446 "Photo.c"
 	}
 }
 
@@ -18332,24 +18457,24 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	gboolean committed = FALSE;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = title;
-#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	new_title = _tmp1_;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18344 "Photo.c"
+#line 18469 "Photo.c"
 	{
 		PhotoRow* _tmp2_;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18351 "Photo.c"
+#line 18476 "Photo.c"
 		{
 			const gchar* _tmp3_;
 			PhotoRow* _tmp4_;
@@ -18361,108 +18486,108 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			const gchar* _tmp11_;
 			gboolean _tmp12_;
 			gboolean _tmp13_;
-#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_title;
-#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->title;
-#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18371 "Photo.c"
+#line 18496 "Photo.c"
 				{
 					PhotoRow* _tmp6_;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18378 "Photo.c"
+#line 18503 "Photo.c"
 				}
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_title);
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18384 "Photo.c"
+#line 18509 "Photo.c"
 			}
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_title;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_);
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18406 "Photo.c"
+#line 18531 "Photo.c"
 				PhotoRow* _tmp14_;
 				const gchar* _tmp15_;
 				gchar* _tmp16_;
-#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_title;
-#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->title);
-#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->title = _tmp16_;
-#line 18420 "Photo.c"
+#line 18545 "Photo.c"
 			}
 		}
-		__finally351:
+		__finally363:
 		{
 			PhotoRow* _tmp17_;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18430 "Photo.c"
+#line 18555 "Photo.c"
 		}
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_title);
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/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 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18442 "Photo.c"
+#line 18567 "Photo.c"
 		}
 	}
-#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18449 "Photo.c"
+#line 18574 "Photo.c"
 		Alteration* _tmp19_;
 		Alteration* _tmp20_;
-#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "name");
-#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18460 "Photo.c"
+#line 18585 "Photo.c"
 	}
-#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18464 "Photo.c"
+#line 18589 "Photo.c"
 }
 
 
@@ -18475,24 +18600,24 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	gboolean committed = FALSE;
 	gboolean _tmp19_;
 	GError * _inner_error_ = NULL;
-#line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = comment;
-#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_comment (_tmp0_);
-#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	new_comment = _tmp1_;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18487 "Photo.c"
+#line 18612 "Photo.c"
 	{
 		PhotoRow* _tmp2_;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18494 "Photo.c"
+#line 18619 "Photo.c"
 		{
 			const gchar* _tmp3_;
 			PhotoRow* _tmp4_;
@@ -18504,123 +18629,123 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			const gchar* _tmp11_;
 			gboolean _tmp12_;
 			gboolean _tmp13_;
-#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_comment;
-#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->comment;
-#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 18516 "Photo.c"
+#line 18641 "Photo.c"
 				{
 					PhotoRow* _tmp6_;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18523 "Photo.c"
+#line 18648 "Photo.c"
 				}
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_comment);
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 18529 "Photo.c"
+#line 18654 "Photo.c"
 			}
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_comment;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_);
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18551 "Photo.c"
+#line 18676 "Photo.c"
 				PhotoRow* _tmp14_;
 				const gchar* _tmp15_;
 				gchar* _tmp16_;
-#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_comment;
-#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->comment);
-#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->comment = _tmp16_;
-#line 18565 "Photo.c"
+#line 18690 "Photo.c"
 			}
 		}
-		__finally352:
+		__finally364:
 		{
 			PhotoRow* _tmp17_;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18575 "Photo.c"
+#line 18700 "Photo.c"
 		}
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18579 "Photo.c"
+#line 18704 "Photo.c"
 			gboolean _tmp18_ = FALSE;
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_comment);
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/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 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp18_;
-#line 18589 "Photo.c"
+#line 18714 "Photo.c"
 		}
 	}
-#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = committed;
-#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_) {
-#line 18596 "Photo.c"
+#line 18721 "Photo.c"
 		Alteration* _tmp20_;
 		Alteration* _tmp21_;
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = alteration_new ("metadata", "comment");
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp21_);
-#line 18607 "Photo.c"
+#line 18732 "Photo.c"
 	}
-#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_comment);
-#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18615 "Photo.c"
+#line 18740 "Photo.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 18622 "Photo.c"
+#line 18747 "Photo.c"
 }
 
 
@@ -18628,20 +18753,20 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 	GError* dberr = NULL;
 	GError* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (import_id != NULL);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
 	dberr = NULL;
-#line 18636 "Photo.c"
+#line 18761 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18643 "Photo.c"
+#line 18768 "Photo.c"
 		{
 			{
 				PhotoTable* _tmp1_;
@@ -18651,158 +18776,158 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				ImportID _tmp5_;
 				PhotoRow* _tmp7_;
 				ImportID _tmp8_;
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = photo_table_get_instance ();
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp2_ = _tmp1_;
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->photo_id;
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = *import_id;
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_import_id (_tmp2_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp2_);
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18671 "Photo.c"
-						goto __catch354_database_error;
+#line 18796 "Photo.c"
+						goto __catch366_database_error;
 					}
 					{
 						PhotoRow* _tmp6_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18680 "Photo.c"
+#line 18805 "Photo.c"
 					}
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/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);
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 18690 "Photo.c"
+#line 18815 "Photo.c"
 				}
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = *import_id;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->import_id = _tmp8_;
-#line 18698 "Photo.c"
+#line 18823 "Photo.c"
 			}
-			goto __finally354;
-			__catch354_database_error:
+			goto __finally366;
+			__catch366_database_error:
 			{
 				GError* err = NULL;
 				GError* _tmp9_;
 				GError* _tmp10_;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = err;
-#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _g_error_copy0 (_tmp9_);
-#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 				dberr = _tmp10_;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 18720 "Photo.c"
+#line 18845 "Photo.c"
 			}
-			__finally354:
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally366:
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18725 "Photo.c"
+#line 18850 "Photo.c"
 				{
 					PhotoRow* _tmp11_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18732 "Photo.c"
+#line 18857 "Photo.c"
 				}
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/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);
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18742 "Photo.c"
+#line 18867 "Photo.c"
 			}
 		}
-		__finally353:
+		__finally365:
 		{
 			PhotoRow* _tmp12_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18752 "Photo.c"
+#line 18877 "Photo.c"
 		}
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (dberr);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/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 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18764 "Photo.c"
+#line 18889 "Photo.c"
 		}
 	}
-#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = dberr;
-#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 18771 "Photo.c"
+#line 18896 "Photo.c"
 		Alteration* _tmp14_;
 		Alteration* _tmp15_;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = alteration_new ("metadata", "import-id");
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp15_);
-#line 18782 "Photo.c"
+#line 18907 "Photo.c"
 	} else {
 		gchar* _tmp16_;
 		gchar* _tmp17_;
 		GError* _tmp18_;
 		const gchar* _tmp19_;
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = dberr;
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->message;
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2383: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
-#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2402: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp17_);
-#line 18800 "Photo.c"
+#line 18925 "Photo.c"
 	}
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18804 "Photo.c"
+#line 18929 "Photo.c"
 }
 
 
@@ -18825,155 +18950,155 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	GFile* _tmp16_;
 	const gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
-#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18841 "Photo.c"
+#line 18966 "Photo.c"
 		PhotoFileReader* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		const gchar* _tmp7_;
-#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2391: No photo file writer available for %s", _tmp6_);
-#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2410: No photo file writer available for %s", _tmp6_);
+#line 2410 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp6_);
-#line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = title;
-#line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
-#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18864 "Photo.c"
+#line 18989 "Photo.c"
 	}
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18880 "Photo.c"
+#line 19005 "Photo.c"
 	}
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = title;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = source;
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2420 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18904 "Photo.c"
+#line 19029 "Photo.c"
 	}
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18916 "Photo.c"
+#line 19041 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_;
 		PhotoMetadata* _tmp18_;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18928 "Photo.c"
-			goto __finally355;
+#line 19053 "Photo.c"
+			goto __finally367;
 		}
 	}
-	__finally355:
+	__finally367:
 	{
 		PhotoFileReader* _tmp19_;
 		GFile* _tmp20_;
 		GFile* _tmp21_;
-#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18947 "Photo.c"
+#line 19072 "Photo.c"
 	}
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18961 "Photo.c"
+#line 19086 "Photo.c"
 	}
-#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
-#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
-#line 2411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 18975 "Photo.c"
+#line 19100 "Photo.c"
 }
 
 
@@ -18996,155 +19121,155 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	GFile* _tmp16_;
 	const gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
-#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19012 "Photo.c"
+#line 19137 "Photo.c"
 		PhotoFileReader* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		const gchar* _tmp7_;
-#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2419: No photo file writer available for %s", _tmp6_);
-#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2438: No photo file writer available for %s", _tmp6_);
+#line 2438 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp6_);
-#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2440 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = comment;
-#line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2440 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
-#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19035 "Photo.c"
+#line 19160 "Photo.c"
 	}
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19051 "Photo.c"
+#line 19176 "Photo.c"
 	}
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = comment;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = source;
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19075 "Photo.c"
+#line 19200 "Photo.c"
 	}
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 19087 "Photo.c"
+#line 19212 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_;
 		PhotoMetadata* _tmp18_;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19099 "Photo.c"
-			goto __finally356;
+#line 19224 "Photo.c"
+			goto __finally368;
 		}
 	}
-	__finally356:
+	__finally368:
 	{
 		PhotoFileReader* _tmp19_;
 		GFile* _tmp20_;
 		GFile* _tmp21_;
-#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 19118 "Photo.c"
+#line 19243 "Photo.c"
 	}
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19132 "Photo.c"
+#line 19257 "Photo.c"
 	}
-#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
-#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
-#line 2439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19146 "Photo.c"
+#line 19271 "Photo.c"
 }
 
 
@@ -19153,16 +19278,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	gboolean committed = FALSE;
 	gboolean _tmp12_;
 	GError * _inner_error_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19157 "Photo.c"
+#line 19282 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19164 "Photo.c"
+#line 19289 "Photo.c"
 		{
 			PhotoTable* _tmp1_;
 			PhotoTable* _tmp2_;
@@ -19171,79 +19296,79 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			time_t _tmp5_;
 			gboolean _tmp6_;
 			gboolean _tmp7_;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = time;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_);
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp6_;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = committed;
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_) {
-#line 19193 "Photo.c"
+#line 19318 "Photo.c"
 				PhotoRow* _tmp8_;
 				time_t _tmp9_;
 				time_t _tmp10_;
-#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = time;
-#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->exposure_time = _tmp9_;
-#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = time;
-#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->cached_exposure_time = _tmp10_;
-#line 19207 "Photo.c"
+#line 19332 "Photo.c"
 			}
 		}
-		__finally357:
+		__finally369:
 		{
 			PhotoRow* _tmp11_;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19217 "Photo.c"
+#line 19342 "Photo.c"
 		}
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/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 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 19227 "Photo.c"
+#line 19352 "Photo.c"
 		}
 	}
-#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = committed;
-#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 19234 "Photo.c"
+#line 19359 "Photo.c"
 		Alteration* _tmp13_;
 		Alteration* _tmp14_;
-#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = alteration_new ("metadata", "exposure-time");
-#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
-#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp14_);
-#line 19245 "Photo.c"
+#line 19370 "Photo.c"
 	}
 }
 
@@ -19269,161 +19394,161 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	GFile* _tmp18_;
 	time_t _tmp24_;
 	GError * _inner_error_ = NULL;
-#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19285 "Photo.c"
+#line 19410 "Photo.c"
 		PhotoFileReader* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		time_t _tmp7_;
-#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2461: No photo file writer available for %s", _tmp6_);
-#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2480: No photo file writer available for %s", _tmp6_);
+#line 2480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp6_);
-#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = time;
-#line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Photo.vala"
 		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_);
-#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19308 "Photo.c"
+#line 19433 "Photo.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19324 "Photo.c"
+#line 19449 "Photo.c"
 	}
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = time;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata_date_time_new (_tmp11_);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (_tmp13_);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp15_;
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19354 "Photo.c"
+#line 19479 "Photo.c"
 	}
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp18_);
-#line 19366 "Photo.c"
+#line 19491 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp19_;
 		PhotoMetadata* _tmp20_;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = writer;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = metadata;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19378 "Photo.c"
-			goto __finally358;
+#line 19503 "Photo.c"
+			goto __finally370;
 		}
 	}
-	__finally358:
+	__finally370:
 	{
 		PhotoFileReader* _tmp21_;
 		GFile* _tmp22_;
 		GFile* _tmp23_;
-#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = source;
-#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp23_);
-#line 19397 "Photo.c"
+#line 19522 "Photo.c"
 	}
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19411 "Photo.c"
+#line 19536 "Photo.c"
 	}
-#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
-#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Photo.vala"
 	dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_);
-#line 2481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_exif_updated (self);
-#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19425 "Photo.c"
+#line 19550 "Photo.c"
 }
 
 
@@ -19450,39 +19575,39 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	gboolean _tmp11_;
 	PhotoException _tmp22_;
 	gboolean _tmp23_;
-#line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Photo.vala"
 	returned_dims = _tmp0_;
-#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = disallowed_steps;
-#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
-#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 19464 "Photo.c"
+#line 19589 "Photo.c"
 		Orientation ori_tmp = 0;
 		Orientation _tmp3_;
 		Orientation _tmp4_;
-#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_orientation (self);
-#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Photo.vala"
 		ori_tmp = _tmp3_;
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = ori_tmp;
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 		switch (_tmp4_) {
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_TOP:
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_TOP:
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_BOTTOM:
-#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_BOTTOM:
-#line 19484 "Photo.c"
+#line 19609 "Photo.c"
 			{
 				gint width_tmp = 0;
 				Dimensions _tmp5_;
@@ -19490,41 +19615,41 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 				Dimensions _tmp7_;
 				gint _tmp8_;
 				gint _tmp9_;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = returned_dims;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_.width;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 				width_tmp = _tmp6_;
-#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = returned_dims;
-#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_.height;
-#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.width = _tmp8_;
-#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = width_tmp;
-#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.height = _tmp9_;
-#line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19510 "Photo.c"
+#line 19635 "Photo.c"
 			}
 			default:
 			{
-#line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19516 "Photo.c"
+#line 19641 "Photo.c"
 			}
 		}
 	}
-#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = disallowed_steps;
-#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 19526 "Photo.c"
+#line 19651 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
@@ -19538,71 +19663,71 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		gdouble _tmp19_ = 0.0;
 		gdouble _tmp20_;
 		gdouble _tmp21_;
-#line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
 		angle = 0.0;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_straighten (self, &_tmp12_);
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 		angle = _tmp12_;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = returned_dims;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = returned_dims;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = angle;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_);
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		x_size = _tmp18_;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_size = _tmp19_;
-#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = x_size;
-#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.width = (gint) _tmp20_;
-#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = y_size;
-#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.height = (gint) _tmp21_;
-#line 19570 "Photo.c"
+#line 19695 "Photo.c"
 	}
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 19578 "Photo.c"
+#line 19703 "Photo.c"
 		Box crop = {0};
 		PhotoException _tmp24_;
 		Box _tmp25_ = {0};
 		gboolean _tmp26_;
-#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = disallowed_steps;
-#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_);
-#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp25_;
-#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19591 "Photo.c"
+#line 19716 "Photo.c"
 			Dimensions _tmp27_ = {0};
-#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp27_);
-#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 			returned_dims = _tmp27_;
-#line 19597 "Photo.c"
+#line 19722 "Photo.c"
 		}
 	}
-#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = returned_dims;
-#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 19604 "Photo.c"
+#line 19729 "Photo.c"
 }
 
 
@@ -19613,114 +19738,114 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	KeyValueMap* _tmp2_;
 	PixelTransformationBundle* _tmp6_;
 	PixelTransformer* _tmp7_;
-#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->adjustments = _tmp0_;
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_transformation (self, "adjustments");
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp1_;
-#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 19631 "Photo.c"
+#line 19756 "Photo.c"
 		PixelTransformationBundle* _tmp3_;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->adjustments;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19637 "Photo.c"
+#line 19762 "Photo.c"
 	} else {
 		PixelTransformationBundle* _tmp4_;
 		KeyValueMap* _tmp5_;
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->adjustments;
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = map;
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19647 "Photo.c"
+#line 19772 "Photo.c"
 	}
-#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
-#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_);
-#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->transformer = _tmp7_;
-#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 19659 "Photo.c"
+#line 19784 "Photo.c"
 }
 
 
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 	PixelTransformationBundle* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19668 "Photo.c"
+#line 19793 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19675 "Photo.c"
+#line 19800 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp1_;
 			PixelTransformationBundle* _tmp2_;
 			PixelTransformationBundle* _tmp3_;
-#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->adjustments;
-#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19686 "Photo.c"
+#line 19811 "Photo.c"
 			}
-#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
-#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
-#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19694 "Photo.c"
+#line 19819 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19701 "Photo.c"
+#line 19826 "Photo.c"
 			}
-#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19705 "Photo.c"
+#line 19830 "Photo.c"
 		}
-		__finally359:
+		__finally371:
 		{
 			PhotoRow* _tmp5_;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19714 "Photo.c"
+#line 19839 "Photo.c"
 		}
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/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 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19722 "Photo.c"
+#line 19847 "Photo.c"
 	}
 }
 
@@ -19728,63 +19853,63 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 	PixelTransformer* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19732 "Photo.c"
+#line 19857 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19739 "Photo.c"
+#line 19864 "Photo.c"
 		{
 			PixelTransformer* _tmp1_;
 			PixelTransformer* _tmp2_;
 			PixelTransformer* _tmp3_;
-#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->transformer;
-#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19750 "Photo.c"
+#line 19875 "Photo.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
-#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19758 "Photo.c"
+#line 19883 "Photo.c"
 			{
 				PhotoRow* _tmp4_;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19765 "Photo.c"
+#line 19890 "Photo.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19769 "Photo.c"
+#line 19894 "Photo.c"
 		}
-		__finally360:
+		__finally372:
 		{
 			PhotoRow* _tmp5_;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19778 "Photo.c"
+#line 19903 "Photo.c"
 		}
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/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 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19786 "Photo.c"
+#line 19911 "Photo.c"
 	}
 }
 
@@ -19792,15 +19917,15 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 gboolean photo_has_color_adjustments (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 2579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "adjustments");
-#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19802 "Photo.c"
+#line 19927 "Photo.c"
 }
 
 
@@ -19811,25 +19936,25 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	PixelTransformationType _tmp2_;
 	PixelTransformation* _tmp3_;
 	PixelTransformation* _tmp4_;
-#line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_color_adjustments (self);
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = type;
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_);
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (_tmp1_);
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19831 "Photo.c"
+#line 19956 "Photo.c"
 }
 
 
@@ -19842,141 +19967,141 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	gboolean committed = FALSE;
 	gboolean _tmp39_;
 	GError * _inner_error_ = NULL;
-#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = new_adjustments;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 19854 "Photo.c"
+#line 19979 "Photo.c"
 		gboolean _result_ = FALSE;
 		gboolean _tmp5_;
 		{
 			PhotoRow* _tmp2_;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19863 "Photo.c"
+#line 19988 "Photo.c"
 			{
 				gboolean _tmp3_;
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = photo_remove_transformation (self, "adjustments");
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_result_ = _tmp3_;
-#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = NULL;
-#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = NULL;
-#line 19878 "Photo.c"
+#line 20003 "Photo.c"
 			}
-			__finally361:
+			__finally373:
 			{
 				PhotoRow* _tmp4_;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19887 "Photo.c"
+#line 20012 "Photo.c"
 			}
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/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 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 19897 "Photo.c"
+#line 20022 "Photo.c"
 			}
 		}
-#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _result_;
-#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 19904 "Photo.c"
+#line 20029 "Photo.c"
 			Alteration* _tmp6_;
 			Alteration* _tmp7_;
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = alteration_new ("image", "color-adjustments");
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Photo.vala"
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (_tmp7_);
-#line 19915 "Photo.c"
+#line 20040 "Photo.c"
 		}
-#line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19919 "Photo.c"
+#line 20044 "Photo.c"
 	}
-#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
-#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
-#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp9_;
-#line 19927 "Photo.c"
+#line 20052 "Photo.c"
 	{
 		PhotoRow* _tmp10_;
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->row;
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19934 "Photo.c"
+#line 20059 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 			PixelTransformer* _tmp12_;
 			KeyValueMap* _tmp36_;
 			gboolean _tmp37_;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->transformer;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_ == NULL) {
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19946 "Photo.c"
+#line 20071 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp13_;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->priv->adjustments;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp13_ == NULL;
-#line 19953 "Photo.c"
+#line 20078 "Photo.c"
 			}
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19957 "Photo.c"
+#line 20082 "Photo.c"
 				PixelTransformationBundle* _tmp14_;
 				PixelTransformationBundle* _tmp15_;
 				PixelTransformationBundle* _tmp16_;
 				PixelTransformer* _tmp17_;
-#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = new_adjustments;
-#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = pixel_transformation_bundle_copy (_tmp14_);
-#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp15_;
-#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_adjustments;
-#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_);
-#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp17_;
-#line 19978 "Photo.c"
+#line 20103 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp34_;
 				PixelTransformationBundle* _tmp35_;
@@ -19987,23 +20112,23 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 					GeeIterable* _tmp20_;
 					GeeIterator* _tmp21_;
 					GeeIterator* _tmp22_;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = new_adjustments;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _tmp19_;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = gee_iterable_iterator (_tmp20_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp20_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_transformation_it = _tmp22_;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 20005 "Photo.c"
+#line 20130 "Photo.c"
 						GeeIterator* _tmp23_;
 						gboolean _tmp24_;
 						PixelTransformation* transformation = NULL;
@@ -20016,108 +20141,108 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						PixelTransformation* _tmp31_;
 						PixelTransformation* _tmp32_;
 						PixelTransformation* _tmp33_;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = _transformation_it;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp24_ = gee_iterator_next (_tmp23_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp24_) {
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 20026 "Photo.c"
+#line 20151 "Photo.c"
 						}
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = gee_iterator_get (_tmp25_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						transformation = (PixelTransformation*) _tmp26_;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = self->priv->transformer;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = self->priv->adjustments;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = transformation;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = pixel_transformation_get_transformation_type (_tmp29_);
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_);
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = _tmp31_;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp33_ = transformation;
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_);
-#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (_tmp32_);
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (transformation);
-#line 20054 "Photo.c"
+#line 20179 "Photo.c"
 					}
-#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 20058 "Photo.c"
+#line 20183 "Photo.c"
 				}
-#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
-#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = pixel_transformation_bundle_copy (_tmp34_);
-#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp35_;
-#line 20068 "Photo.c"
+#line 20193 "Photo.c"
 			}
-#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
-#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = photo_set_transformation (self, _tmp36_);
-#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp37_;
-#line 20076 "Photo.c"
+#line 20201 "Photo.c"
 		}
-		__finally362:
+		__finally374:
 		{
 			PhotoRow* _tmp38_;
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = self->row;
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20085 "Photo.c"
+#line 20210 "Photo.c"
 		}
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/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 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20097 "Photo.c"
+#line 20222 "Photo.c"
 		}
 	}
-#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = committed;
-#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_) {
-#line 20104 "Photo.c"
+#line 20229 "Photo.c"
 		Alteration* _tmp40_;
 		Alteration* _tmp41_;
-#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = alteration_new ("image", "color-adjustments");
-#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_;
-#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
-#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp41_);
-#line 20115 "Photo.c"
+#line 20240 "Photo.c"
 	}
-#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20119 "Photo.c"
+#line 20244 "Photo.c"
 }
 
 
@@ -20125,9 +20250,9 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	Photo * self;
 	PhotoMetadata* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20129 "Photo.c"
+#line 20254 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
 		PhotoFileReader* _tmp1_;
@@ -20135,67 +20260,67 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		PhotoMetadata* _tmp3_;
 		PhotoMetadata* _tmp4_;
 		PhotoMetadata* _tmp5_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_get_source_reader (self);
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp2_);
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20151 "Photo.c"
-			goto __catch363_g_error;
+#line 20276 "Photo.c"
+			goto __catch375_g_error;
 		}
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp5_;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp0_);
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20164 "Photo.c"
+#line 20289 "Photo.c"
 	}
-	goto __finally363;
-	__catch363_g_error:
+	goto __finally375;
+	__catch375_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		const gchar* _tmp7_;
-#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err;
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_->message;
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2636: Unable to load metadata: %s", _tmp7_);
-#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:2655: Unable to load metadata: %s", _tmp7_);
+#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20188 "Photo.c"
+#line 20313 "Photo.c"
 	}
-	__finally363:
-#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally375:
+#line 2652 "/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 2633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_clear_error (&_inner_error_);
-#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20197 "Photo.c"
+#line 20322 "Photo.c"
 }
 
 
@@ -20208,39 +20333,39 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp4_;
 	PhotoMetadata* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 2642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_reader (self);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp2_);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp4_;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 20230 "Photo.c"
+#line 20355 "Photo.c"
 	}
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20242 "Photo.c"
+#line 20367 "Photo.c"
 }
 
 
@@ -20251,53 +20376,53 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20263 "Photo.c"
+#line 20388 "Photo.c"
 		PhotoFileReader* _tmp3_;
 		PhotoMetadata* _tmp4_;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_reader_read_metadata (_tmp3_, &_inner_error_);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (_tmp1_);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 20284 "Photo.c"
+#line 20409 "Photo.c"
 		}
 	} else {
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 20291 "Photo.c"
+#line 20416 "Photo.c"
 	}
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20299 "Photo.c"
+#line 20424 "Photo.c"
 }
 
 
@@ -20318,178 +20443,178 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	gboolean _tmp12_;
 	PhotoReimportMasterState* _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
-#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = NULL;
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	master_reader = _tmp0_;
-#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = master_reader;
-#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20348 "Photo.c"
+#line 20473 "Photo.c"
 		} else {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20352 "Photo.c"
+#line 20477 "Photo.c"
 		}
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20356 "Photo.c"
+#line 20481 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp6_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20366 "Photo.c"
+#line 20491 "Photo.c"
 		gboolean _tmp7_ = FALSE;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp7_;
-#line 20374 "Photo.c"
+#line 20499 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = metadata;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp4_, _tmp8_, &_inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20382 "Photo.c"
+#line 20507 "Photo.c"
 		gboolean _tmp9_ = FALSE;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp9_;
-#line 20392 "Photo.c"
+#line 20517 "Photo.c"
 	}
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp11_;
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp12_;
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20404 "Photo.c"
+#line 20529 "Photo.c"
 		gboolean _tmp13_ = FALSE;
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp13_;
-#line 20414 "Photo.c"
+#line 20539 "Photo.c"
 	}
-#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20428 "Photo.c"
+#line 20553 "Photo.c"
 		} else {
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20432 "Photo.c"
+#line 20557 "Photo.c"
 		}
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20436 "Photo.c"
+#line 20561 "Photo.c"
 	}
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2688 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _vala_state;
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2688 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp4_);
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (master_reader);
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20452 "Photo.c"
+#line 20577 "Photo.c"
 	} else {
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20456 "Photo.c"
+#line 20581 "Photo.c"
 	}
-#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20460 "Photo.c"
+#line 20585 "Photo.c"
 }
 
 
 void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) {
 	PhotoReimportMasterState* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2693 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2693 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_master (self, _tmp0_, &_inner_error_);
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20483 "Photo.c"
+#line 20608 "Photo.c"
 		} else {
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/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 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20491 "Photo.c"
+#line 20616 "Photo.c"
 		}
 	}
 }
@@ -20513,200 +20638,200 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	gboolean _tmp13_;
 	PhotoReimportEditableState* _tmp15_;
 	GError * _inner_error_ = NULL;
-#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
-#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = NULL;
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2701 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_reader = _tmp0_;
-#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2702 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = editable_reader;
-#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2702 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20539 "Photo.c"
+#line 20664 "Photo.c"
 		} else {
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20543 "Photo.c"
+#line 20668 "Photo.c"
 		}
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20547 "Photo.c"
+#line 20672 "Photo.c"
 	}
-#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
-#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_can_write_metadata (_tmp3_);
-#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp4_) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20565 "Photo.c"
+#line 20690 "Photo.c"
 		} else {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20569 "Photo.c"
+#line 20694 "Photo.c"
 		}
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20573 "Photo.c"
+#line 20698 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp7_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20583 "Photo.c"
+#line 20708 "Photo.c"
 		gboolean _tmp8_ = FALSE;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp8_;
-#line 20591 "Photo.c"
+#line 20716 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = metadata;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp5_, _tmp9_, &_inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20599 "Photo.c"
+#line 20724 "Photo.c"
 		gboolean _tmp10_ = FALSE;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp10_;
-#line 20609 "Photo.c"
+#line 20734 "Photo.c"
 	}
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp12_;
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp13_;
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20621 "Photo.c"
+#line 20746 "Photo.c"
 		gboolean _tmp14_ = FALSE;
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp14_;
-#line 20631 "Photo.c"
+#line 20756 "Photo.c"
 	}
-#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp11_) {
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20645 "Photo.c"
+#line 20770 "Photo.c"
 		} else {
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20649 "Photo.c"
+#line 20774 "Photo.c"
 		}
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20653 "Photo.c"
+#line 20778 "Photo.c"
 	}
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _vala_state;
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (editable_reader);
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20669 "Photo.c"
+#line 20794 "Photo.c"
 	} else {
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20673 "Photo.c"
+#line 20798 "Photo.c"
 	}
-#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20677 "Photo.c"
+#line 20802 "Photo.c"
 }
 
 
 void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) {
 	PhotoReimportEditableState* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_editable (self, _tmp0_, &_inner_error_);
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20700 "Photo.c"
+#line 20825 "Photo.c"
 		} else {
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/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 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20708 "Photo.c"
+#line 20833 "Photo.c"
 		}
 	}
 }
@@ -20714,54 +20839,54 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 
 void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 20718 "Photo.c"
+#line 20843 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20725 "Photo.c"
+#line 20850 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			Dimensions _tmp2_;
-#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->dim;
-#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20735 "Photo.c"
+#line 20860 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20742 "Photo.c"
+#line 20867 "Photo.c"
 			}
-#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20746 "Photo.c"
+#line 20871 "Photo.c"
 		}
-		__finally364:
+		__finally376:
 		{
 			PhotoRow* _tmp4_;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20755 "Photo.c"
+#line 20880 "Photo.c"
 		}
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/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 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 20763 "Photo.c"
+#line 20888 "Photo.c"
 	}
 }
 
@@ -20769,78 +20894,78 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 gboolean photo_has_transformations (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20773 "Photo.c"
+#line 20898 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp10_ = FALSE;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20781 "Photo.c"
+#line 20906 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_;
 			Orientation _tmp3_;
 			BackingPhotoRow* _tmp4_;
 			Orientation _tmp5_;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->orientation;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->backing_photo_row;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->original_orientation;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != _tmp5_) {
-#line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20800 "Photo.c"
+#line 20925 "Photo.c"
 			} else {
 				PhotoRow* _tmp6_;
 				GeeHashMap* _tmp7_;
-#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->transformations;
-#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20810 "Photo.c"
+#line 20935 "Photo.c"
 			}
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20814 "Photo.c"
+#line 20939 "Photo.c"
 			{
 				PhotoRow* _tmp8_;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20821 "Photo.c"
+#line 20946 "Photo.c"
 			}
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20825 "Photo.c"
+#line 20950 "Photo.c"
 		}
-		__finally365:
+		__finally377:
 		{
 			PhotoRow* _tmp9_;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20834 "Photo.c"
+#line 20959 "Photo.c"
 		}
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/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 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp10_;
-#line 20842 "Photo.c"
+#line 20967 "Photo.c"
 	}
 }
 
@@ -20852,153 +20977,153 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	PhotoMetadata* _tmp0_;
 	PhotoMetadata* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	date_time = NULL;
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20866 "Photo.c"
+#line 20991 "Photo.c"
 		PhotoMetadata* _tmp2_;
 		MetadataDateTime* _tmp3_;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 20877 "Photo.c"
+#line 21002 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp4_;
 		gboolean _tmp21_ = FALSE;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20886 "Photo.c"
+#line 21011 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			PhotoRow* _tmp6_;
 			GeeHashMap* _tmp7_;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->transformations;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20897 "Photo.c"
+#line 21022 "Photo.c"
 				gboolean _tmp8_ = FALSE;
 				PhotoRow* _tmp9_;
 				Orientation _tmp10_;
 				BackingPhotoRow* _tmp11_;
 				Orientation _tmp12_;
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->orientation;
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->backing_photo_row;
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->original_orientation;
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ != _tmp12_) {
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20915 "Photo.c"
+#line 21040 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
 					MetadataDateTime* _tmp14_;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = date_time;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20923 "Photo.c"
+#line 21048 "Photo.c"
 						PhotoRow* _tmp15_;
 						time_t _tmp16_;
 						MetadataDateTime* _tmp17_;
 						time_t _tmp18_;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = _tmp15_->exposure_time;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = date_time;
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = _tmp16_ != _tmp18_;
-#line 20938 "Photo.c"
+#line 21063 "Photo.c"
 					} else {
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20942 "Photo.c"
+#line 21067 "Photo.c"
 					}
-#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20946 "Photo.c"
+#line 21071 "Photo.c"
 				}
-#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20950 "Photo.c"
+#line 21075 "Photo.c"
 			} else {
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20954 "Photo.c"
+#line 21079 "Photo.c"
 			}
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20958 "Photo.c"
+#line 21083 "Photo.c"
 			{
 				PhotoRow* _tmp19_;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20965 "Photo.c"
+#line 21090 "Photo.c"
 			}
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20973 "Photo.c"
+#line 21098 "Photo.c"
 		}
-		__finally366:
+		__finally378:
 		{
 			PhotoRow* _tmp20_;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20982 "Photo.c"
+#line 21107 "Photo.c"
 		}
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/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 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2745 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp21_;
-#line 20994 "Photo.c"
+#line 21119 "Photo.c"
 	}
-#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21000 "Photo.c"
+#line 21125 "Photo.c"
 }
 
 
@@ -21012,145 +21137,145 @@ gboolean photo_has_alterations (Photo* self) {
 	PhotoMetadata* _tmp1_;
 	MetadataDateTime* _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Photo.vala"
 	date_time = NULL;
-#line 2735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Photo.vala"
 	title = NULL;
-#line 2736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 	comment = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 21030 "Photo.c"
+#line 21155 "Photo.c"
 		PhotoMetadata* _tmp2_;
 		MetadataDateTime* _tmp3_;
 		PhotoMetadata* _tmp4_;
 		gchar* _tmp5_;
 		PhotoMetadata* _tmp6_;
 		gchar* _tmp7_;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = metadata;
-#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 		title = _tmp5_;
-#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = metadata;
-#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 21061 "Photo.c"
+#line 21186 "Photo.c"
 	}
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = date_time;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2765 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 21067 "Photo.c"
+#line 21192 "Photo.c"
 		{
 			PhotoRow* _tmp9_;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21074 "Photo.c"
+#line 21199 "Photo.c"
 			{
 				BackingPhotoRow* _tmp10_;
 				time_t _tmp11_;
 				PhotoRow* _tmp12_;
 				time_t _tmp13_;
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->backing_photo_row;
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_->timestamp;
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->exposure_time;
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != _tmp13_) {
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21092 "Photo.c"
+#line 21217 "Photo.c"
 					{
 						PhotoRow* _tmp14_;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21099 "Photo.c"
+#line 21224 "Photo.c"
 					}
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (comment);
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (title);
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					_metadata_date_time_unref0 (date_time);
-#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21111 "Photo.c"
+#line 21236 "Photo.c"
 				}
 			}
-			__finally367:
+			__finally379:
 			{
 				PhotoRow* _tmp15_;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21121 "Photo.c"
+#line 21246 "Photo.c"
 			}
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21125 "Photo.c"
+#line 21250 "Photo.c"
 				gboolean _tmp16_ = FALSE;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (metadata);
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (comment);
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (title);
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				_metadata_date_time_unref0 (date_time);
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/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 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 				return _tmp16_;
-#line 21141 "Photo.c"
+#line 21266 "Photo.c"
 			}
 		}
 	}
 	{
 		PhotoRow* _tmp17_;
 		gboolean _tmp42_ = FALSE;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = self->row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21152 "Photo.c"
+#line 21277 "Photo.c"
 		{
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
@@ -21158,184 +21283,184 @@ gboolean photo_has_alterations (Photo* self) {
 			gboolean _tmp21_ = FALSE;
 			PhotoRow* _tmp22_;
 			GeeHashMap* _tmp23_;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = self->row;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = _tmp22_->transformations;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_ != NULL) {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = TRUE;
-#line 21168 "Photo.c"
+#line 21293 "Photo.c"
 			} else {
 				PhotoRow* _tmp24_;
 				Orientation _tmp25_;
 				BackingPhotoRow* _tmp26_;
 				Orientation _tmp27_;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = self->row;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = _tmp24_->orientation;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = self->backing_photo_row;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_->original_orientation;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = _tmp25_ != _tmp27_;
-#line 21184 "Photo.c"
+#line 21309 "Photo.c"
 			}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = TRUE;
-#line 21190 "Photo.c"
+#line 21315 "Photo.c"
 			} else {
 				gboolean _tmp28_ = FALSE;
 				MetadataDateTime* _tmp29_;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = date_time;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp29_ != NULL) {
-#line 21198 "Photo.c"
+#line 21323 "Photo.c"
 					PhotoRow* _tmp30_;
 					time_t _tmp31_;
 					MetadataDateTime* _tmp32_;
 					time_t _tmp33_;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = self->row;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = _tmp30_->exposure_time;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = date_time;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = metadata_date_time_get_timestamp (_tmp32_);
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = _tmp31_ != _tmp33_;
-#line 21213 "Photo.c"
+#line 21338 "Photo.c"
 				} else {
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = FALSE;
-#line 21217 "Photo.c"
+#line 21342 "Photo.c"
 				}
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp28_;
-#line 21221 "Photo.c"
+#line 21346 "Photo.c"
 			}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp20_) {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = TRUE;
-#line 21227 "Photo.c"
+#line 21352 "Photo.c"
 			} else {
 				gchar* _tmp34_;
 				gchar* _tmp35_;
 				const gchar* _tmp36_;
-#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_;
-#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = comment;
-#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = g_strcmp0 (_tmp35_, _tmp36_) != 0;
-#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp35_);
-#line 21242 "Photo.c"
+#line 21367 "Photo.c"
 			}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = TRUE;
-#line 21248 "Photo.c"
+#line 21373 "Photo.c"
 			} else {
 				gchar* _tmp37_;
 				gchar* _tmp38_;
 				const gchar* _tmp39_;
-#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_;
-#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = title;
-#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = g_strcmp0 (_tmp38_, _tmp39_) != 0;
-#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp38_);
-#line 21263 "Photo.c"
+#line 21388 "Photo.c"
 			}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp18_;
-#line 21267 "Photo.c"
+#line 21392 "Photo.c"
 			{
 				PhotoRow* _tmp40_;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = self->row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21274 "Photo.c"
+#line 21399 "Photo.c"
 			}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21286 "Photo.c"
+#line 21411 "Photo.c"
 		}
-		__finally368:
+		__finally380:
 		{
 			PhotoRow* _tmp41_;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = self->row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21295 "Photo.c"
+#line 21420 "Photo.c"
 		}
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/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 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp42_;
-#line 21311 "Photo.c"
+#line 21436 "Photo.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21321 "Photo.c"
+#line 21446 "Photo.c"
 }
 
 
 PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 	PhotoTransformationState* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21330 "Photo.c"
+#line 21455 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21337 "Photo.c"
+#line 21462 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_;
@@ -21346,112 +21471,112 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			PhotoRow* _tmp11_;
 			GeeHashMap* _tmp12_;
 			PhotoPhotoTransformationStateImpl* _tmp13_;
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21352 "Photo.c"
+#line 21477 "Photo.c"
 				PixelTransformer* _tmp3_;
 				PixelTransformer* _tmp4_;
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->transformer;
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = pixel_transformer_copy (_tmp3_);
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21363 "Photo.c"
+#line 21488 "Photo.c"
 			} else {
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 21369 "Photo.c"
+#line 21494 "Photo.c"
 			}
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->adjustments;
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != NULL) {
-#line 21375 "Photo.c"
+#line 21500 "Photo.c"
 				PixelTransformationBundle* _tmp7_;
 				PixelTransformationBundle* _tmp8_;
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->adjustments;
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = pixel_transformation_bundle_copy (_tmp7_);
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 21386 "Photo.c"
+#line 21511 "Photo.c"
 			} else {
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = NULL;
-#line 21392 "Photo.c"
+#line 21517 "Photo.c"
 			}
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->orientation;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_->transformations;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_photo_transformation_state_impl_new (self, _tmp10_, _tmp12_, _tmp1_, _tmp5_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (_tmp1_);
-#line 21410 "Photo.c"
+#line 21535 "Photo.c"
 			{
 				PhotoRow* _tmp14_;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21417 "Photo.c"
+#line 21542 "Photo.c"
 			}
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21421 "Photo.c"
+#line 21546 "Photo.c"
 		}
-		__finally369:
+		__finally381:
 		{
 			PhotoRow* _tmp15_;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21430 "Photo.c"
+#line 21555 "Photo.c"
 		}
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/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 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 21438 "Photo.c"
+#line 21563 "Photo.c"
 	}
 }
 
 
 static gpointer _pixel_transformer_ref0 (gpointer self) {
-#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 21446 "Photo.c"
+#line 21571 "Photo.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
-#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21453 "Photo.c"
+#line 21578 "Photo.c"
 }
 
 
@@ -21476,60 +21601,60 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	gboolean committed = FALSE;
 	gboolean _tmp31_;
 	GError * _inner_error_ = NULL;
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE);
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL) ? ((PhotoPhotoTransformationStateImpl*) _tmp0_) : NULL);
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
 	state_impl = _tmp1_;
-#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state_impl;
-#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (state_impl);
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 21498 "Photo.c"
+#line 21623 "Photo.c"
 	}
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_);
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_orientation = _tmp4_;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = state_impl;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_);
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformations = _tmp6_;
-#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = state_impl;
-#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_);
-#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformer = _tmp8_;
-#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = state_impl;
-#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
-#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_adjustments = _tmp10_;
-#line 21524 "Photo.c"
+#line 21649 "Photo.c"
 	{
 		PhotoRow* _tmp11_;
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = self->row;
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21531 "Photo.c"
+#line 21656 "Photo.c"
 		{
 			PhotoTable* _tmp12_;
 			PhotoTable* _tmp13_;
@@ -21539,29 +21664,29 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			GeeHashMap* _tmp17_;
 			gboolean _tmp18_;
 			gboolean _tmp19_;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = saved_orientation;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = saved_transformations;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_);
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp18_;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = committed;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21563 "Photo.c"
+#line 21688 "Photo.c"
 				PhotoRow* _tmp20_;
 				Orientation _tmp21_;
 				PhotoRow* _tmp22_;
@@ -21571,110 +21696,110 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 				PixelTransformer* _tmp26_;
 				PixelTransformationBundle* _tmp27_;
 				PixelTransformationBundle* _tmp28_;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->row;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = saved_orientation;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_->orientation = _tmp21_;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = saved_transformations;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp22_->transformations);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_->transformations = _tmp24_;
-#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = saved_transformer;
-#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _pixel_transformer_ref0 (_tmp25_);
-#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp26_;
-#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = saved_adjustments;
-#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_);
-#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp28_;
-#line 21605 "Photo.c"
+#line 21730 "Photo.c"
 			}
 		}
-		__finally370:
+		__finally382:
 		{
 			PhotoRow* _tmp29_;
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = self->row;
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21615 "Photo.c"
+#line 21740 "Photo.c"
 		}
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21619 "Photo.c"
+#line 21744 "Photo.c"
 			gboolean _tmp30_ = FALSE;
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (saved_transformer);
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (saved_transformations);
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (state_impl);
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/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 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp30_;
-#line 21635 "Photo.c"
+#line 21760 "Photo.c"
 		}
 	}
-#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = committed;
-#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 21642 "Photo.c"
+#line 21767 "Photo.c"
 		Alteration* _tmp32_;
 		Alteration* _tmp33_;
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = alteration_new ("image", "transformation-state");
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = _tmp32_;
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp33_);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp33_);
-#line 21653 "Photo.c"
+#line 21778 "Photo.c"
 	}
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (saved_transformer);
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (saved_transformations);
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (state_impl);
-#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21667 "Photo.c"
+#line 21792 "Photo.c"
 }
 
 
 void photo_remove_all_transformations (Photo* self) {
-#line 2804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, TRUE);
-#line 21676 "Photo.c"
+#line 21801 "Photo.c"
 }
 
 
@@ -21683,18 +21808,18 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 	gboolean _tmp21_ = FALSE;
 	gboolean _tmp22_;
 	GError * _inner_error_ = NULL;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21689 "Photo.c"
+#line 21814 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21696 "Photo.c"
+#line 21821 "Photo.c"
 		{
 			PhotoTable* _tmp1_;
 			PhotoTable* _tmp2_;
@@ -21706,45 +21831,45 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			Orientation _tmp8_;
 			BackingPhotoRow* _tmp9_;
 			Orientation _tmp10_;
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_);
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_altered = _tmp5_;
-#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp6_->transformations);
-#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_->transformations = NULL;
-#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (self->priv->transformer);
-#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2833 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->priv->transformer = NULL;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->priv->adjustments = NULL;
-#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->orientation;
-#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->backing_photo_row;
-#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->original_orientation;
-#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != _tmp10_) {
-#line 21746 "Photo.c"
+#line 21871 "Photo.c"
 				PhotoTable* _tmp11_;
 				PhotoTable* _tmp12_;
 				PhotoRow* _tmp13_;
@@ -21754,85 +21879,85 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 				PhotoRow* _tmp17_;
 				BackingPhotoRow* _tmp18_;
 				Orientation _tmp19_;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_get_instance ();
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_->photo_id;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->backing_photo_row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_);
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp12_);
-#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->backing_photo_row;
-#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp18_->original_orientation;
-#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_->orientation = _tmp19_;
-#line 2821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2840 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_altered = TRUE;
-#line 21782 "Photo.c"
+#line 21907 "Photo.c"
 			}
 		}
-		__finally371:
+		__finally383:
 		{
 			PhotoRow* _tmp20_;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21792 "Photo.c"
+#line 21917 "Photo.c"
 		}
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/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 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 21802 "Photo.c"
+#line 21927 "Photo.c"
 		}
 	}
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = is_altered;
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 21809 "Photo.c"
+#line 21934 "Photo.c"
 		gboolean _tmp23_;
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21815 "Photo.c"
+#line 21940 "Photo.c"
 	} else {
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21819 "Photo.c"
+#line 21944 "Photo.c"
 	}
-#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21823 "Photo.c"
+#line 21948 "Photo.c"
 		Alteration* _tmp24_;
 		Alteration* _tmp25_;
-#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "revert");
-#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 21834 "Photo.c"
+#line 21959 "Photo.c"
 	}
 }
 
@@ -21840,54 +21965,54 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 Orientation photo_get_original_orientation (Photo* self) {
 	Orientation result = 0;
 	GError * _inner_error_ = NULL;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2848 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21844 "Photo.c"
+#line 21969 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21851 "Photo.c"
+#line 21976 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_;
 			Orientation _tmp2_;
-#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->original_orientation;
-#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21861 "Photo.c"
+#line 21986 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21868 "Photo.c"
+#line 21993 "Photo.c"
 			}
-#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21872 "Photo.c"
+#line 21997 "Photo.c"
 		}
-		__finally372:
+		__finally384:
 		{
 			PhotoRow* _tmp4_;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21881 "Photo.c"
+#line 22006 "Photo.c"
 		}
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/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 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21889 "Photo.c"
+#line 22014 "Photo.c"
 	}
 }
 
@@ -21895,54 +22020,54 @@ Orientation photo_get_original_orientation (Photo* self) {
 Orientation photo_get_orientation (Photo* self) {
 	Orientation result = 0;
 	GError * _inner_error_ = NULL;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21899 "Photo.c"
+#line 22024 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21906 "Photo.c"
+#line 22031 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			Orientation _tmp2_;
-#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21916 "Photo.c"
+#line 22041 "Photo.c"
 			{
 				PhotoRow* _tmp3_;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21923 "Photo.c"
+#line 22048 "Photo.c"
 			}
-#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21927 "Photo.c"
+#line 22052 "Photo.c"
 		}
-		__finally373:
+		__finally385:
 		{
 			PhotoRow* _tmp4_;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21936 "Photo.c"
+#line 22061 "Photo.c"
 		}
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/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 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21944 "Photo.c"
+#line 22069 "Photo.c"
 	}
 }
 
@@ -21952,31 +22077,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	gboolean committed = FALSE;
 	gboolean _tmp15_;
 	GError * _inner_error_ = NULL;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 21958 "Photo.c"
+#line 22083 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21965 "Photo.c"
+#line 22090 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			Orientation _tmp2_;
 			Orientation _tmp3_;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21978 "Photo.c"
+#line 22103 "Photo.c"
 				PhotoTable* _tmp4_;
 				PhotoTable* _tmp5_;
 				PhotoRow* _tmp6_;
@@ -21984,98 +22109,98 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				Orientation _tmp8_;
 				gboolean _tmp9_;
 				gboolean _tmp10_;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->photo_id;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = orientation;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_);
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp9_;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2864 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = committed;
-#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 22006 "Photo.c"
+#line 22131 "Photo.c"
 					PhotoRow* _tmp11_;
 					Orientation _tmp12_;
-#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = orientation;
-#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 22015 "Photo.c"
+#line 22140 "Photo.c"
 				}
 			}
 		}
-		__finally374:
+		__finally386:
 		{
 			PhotoRow* _tmp13_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22026 "Photo.c"
+#line 22151 "Photo.c"
 		}
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22030 "Photo.c"
+#line 22155 "Photo.c"
 			gboolean _tmp14_ = FALSE;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/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 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp14_;
-#line 22038 "Photo.c"
+#line 22163 "Photo.c"
 		}
 	}
-#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = committed;
-#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2870 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 22045 "Photo.c"
+#line 22170 "Photo.c"
 		Alteration* _tmp16_;
 		Alteration* _tmp17_;
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = alteration_new ("image", "orientation");
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2871 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp17_);
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp17_);
-#line 22056 "Photo.c"
+#line 22181 "Photo.c"
 	}
-#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2873 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2873 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22062 "Photo.c"
+#line 22187 "Photo.c"
 }
 
 
 gboolean photo_check_can_rotate (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 2857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->can_rotate_now;
-#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22077 "Photo.c"
+#line 22202 "Photo.c"
 }
 
 
@@ -22083,135 +22208,135 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 	GError * _inner_error_ = NULL;
 	{
 		PhotoRow* _tmp0_;
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22089 "Photo.c"
+#line 22214 "Photo.c"
 		{
 			Orientation _tmp1_;
 			Rotation _tmp2_;
 			Orientation _tmp3_;
-#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_orientation (self);
-#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rotation;
-#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
-#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp3_);
-#line 22102 "Photo.c"
+#line 22227 "Photo.c"
 		}
-		__finally375:
+		__finally387:
 		{
 			PhotoRow* _tmp4_;
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22111 "Photo.c"
+#line 22236 "Photo.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/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 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 22121 "Photo.c"
+#line 22246 "Photo.c"
 		}
 	}
 }
 
 
 void photo_rotate (Photo* self, Rotation rotation) {
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22132 "Photo.c"
+#line 22257 "Photo.c"
 }
 
 
 static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22143 "Photo.c"
+#line 22268 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp10_ = FALSE;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22151 "Photo.c"
+#line 22276 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_;
 			GeeHashMap* _tmp3_;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->transformations;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22162 "Photo.c"
+#line 22287 "Photo.c"
 				PhotoRow* _tmp4_;
 				GeeHashMap* _tmp5_;
 				const gchar* _tmp6_;
 				gboolean _tmp7_;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->transformations;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = name;
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 22177 "Photo.c"
+#line 22302 "Photo.c"
 			} else {
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22181 "Photo.c"
+#line 22306 "Photo.c"
 			}
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22185 "Photo.c"
+#line 22310 "Photo.c"
 			{
 				PhotoRow* _tmp8_;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22192 "Photo.c"
+#line 22317 "Photo.c"
 			}
-#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22196 "Photo.c"
+#line 22321 "Photo.c"
 		}
-		__finally376:
+		__finally388:
 		{
 			PhotoRow* _tmp9_;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22205 "Photo.c"
+#line 22330 "Photo.c"
 		}
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/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 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp10_;
-#line 22213 "Photo.c"
+#line 22338 "Photo.c"
 	}
 }
 
@@ -22220,112 +22345,112 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 	KeyValueMap* result = NULL;
 	KeyValueMap* map = NULL;
 	GError * _inner_error_ = NULL;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2895 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2895 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = NULL;
-#line 22228 "Photo.c"
+#line 22353 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22235 "Photo.c"
+#line 22360 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			GeeHashMap* _tmp2_;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22245 "Photo.c"
+#line 22370 "Photo.c"
 				PhotoRow* _tmp3_;
 				GeeHashMap* _tmp4_;
 				const gchar* _tmp5_;
 				gpointer _tmp6_;
 				KeyValueMap* _tmp7_;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				_key_value_map_unref0 (map);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2899 "/home/jens/Source/shotwell/src/Photo.vala"
 				map = (KeyValueMap*) _tmp6_;
-#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = map;
-#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp7_ != NULL) {
-#line 22267 "Photo.c"
+#line 22392 "Photo.c"
 					KeyValueMap* _tmp8_;
 					KeyValueMap* _tmp9_;
-#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = map;
-#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = key_value_map_copy (_tmp8_);
-#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
 					_key_value_map_unref0 (map);
-#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
 					map = _tmp9_;
-#line 22278 "Photo.c"
+#line 22403 "Photo.c"
 				}
 			}
 		}
-		__finally377:
+		__finally389:
 		{
 			PhotoRow* _tmp10_;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22289 "Photo.c"
+#line 22414 "Photo.c"
 		}
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/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 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2897 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 22301 "Photo.c"
+#line 22426 "Photo.c"
 		}
 	}
-#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = map;
-#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22308 "Photo.c"
+#line 22433 "Photo.c"
 }
 
 
 static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22319 "Photo.c"
+#line 22444 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp20_ = FALSE;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22327 "Photo.c"
+#line 22452 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			GeeHashMap* _tmp2_;
@@ -22342,88 +22467,88 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			KeyValueMap* _tmp15_;
 			gboolean _tmp16_;
 			gboolean _tmp17_;
-#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2910 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22350 "Photo.c"
+#line 22475 "Photo.c"
 				PhotoRow* _tmp3_;
 				GeeHashMap* _tmp4_;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp3_->transformations);
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22361 "Photo.c"
+#line 22486 "Photo.c"
 			}
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->transformations;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = trans;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = key_value_map_get_group (_tmp7_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = trans;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp9_);
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_table_get_instance ();
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->photo_id;
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = trans;
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_);
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_;
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp12_);
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 22397 "Photo.c"
+#line 22522 "Photo.c"
 			{
 				PhotoRow* _tmp18_;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->row;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22404 "Photo.c"
+#line 22529 "Photo.c"
 			}
-#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22408 "Photo.c"
+#line 22533 "Photo.c"
 		}
-		__finally378:
+		__finally390:
 		{
 			PhotoRow* _tmp19_;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22417 "Photo.c"
+#line 22542 "Photo.c"
 		}
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/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 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp20_;
-#line 22425 "Photo.c"
+#line 22550 "Photo.c"
 	}
 }
 
@@ -22435,18 +22560,18 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp21_;
 	GError * _inner_error_ = NULL;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22441 "Photo.c"
+#line 22566 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22448 "Photo.c"
+#line 22573 "Photo.c"
 		{
 			PhotoRow* _tmp1_;
 			GeeHashMap* _tmp2_;
@@ -22456,13 +22581,13 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			PhotoID _tmp15_;
 			const gchar* _tmp16_;
 			gboolean _tmp17_;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2922 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2922 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2922 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22464 "Photo.c"
+#line 22589 "Photo.c"
 				PhotoRow* _tmp3_;
 				GeeHashMap* _tmp4_;
 				const gchar* _tmp5_;
@@ -22471,113 +22596,113 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 				GeeHashMap* _tmp8_;
 				gint _tmp9_;
 				gint _tmp10_;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL);
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = _tmp6_;
-#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->transformations;
-#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22493 "Photo.c"
+#line 22618 "Photo.c"
 					PhotoRow* _tmp11_;
-#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp11_->transformations);
-#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22501 "Photo.c"
+#line 22626 "Photo.c"
 				}
 			} else {
-#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22506 "Photo.c"
+#line 22631 "Photo.c"
 			}
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = name;
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_);
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			altered_persistent = _tmp17_;
-#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 22524 "Photo.c"
+#line 22649 "Photo.c"
 		}
-		__finally379:
+		__finally391:
 		{
 			PhotoRow* _tmp18_;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22533 "Photo.c"
+#line 22658 "Photo.c"
 		}
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 22537 "Photo.c"
+#line 22662 "Photo.c"
 			gboolean _tmp19_ = FALSE;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/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 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp19_;
-#line 22545 "Photo.c"
+#line 22670 "Photo.c"
 		}
 	}
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = altered_cache;
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = TRUE;
-#line 22554 "Photo.c"
+#line 22679 "Photo.c"
 	} else {
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = altered_persistent;
-#line 22558 "Photo.c"
+#line 22683 "Photo.c"
 	}
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp20_;
-#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22564 "Photo.c"
+#line 22689 "Photo.c"
 }
 
 
 gboolean photo_has_crop (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 2918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2937 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "crop");
-#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22579 "Photo.c"
+#line 22704 "Photo.c"
 }
 
 
@@ -22607,136 +22732,136 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	gint _tmp18_;
 	gint _tmp19_;
 	gint _tmp20_;
-#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2943 "/home/jens/Source/shotwell/src/Photo.vala"
 	box_init (&_vala_crop, 0, 0, 0, 0);
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "crop");
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22629 "Photo.c"
+#line 22754 "Photo.c"
 		}
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22633 "Photo.c"
+#line 22758 "Photo.c"
 	}
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_int (_tmp2_, "left", -1);
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	left = _tmp3_;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "top", -1);
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
 	top = _tmp5_;
-#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = map;
-#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = key_value_map_get_int (_tmp6_, "right", -1);
-#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	right = _tmp7_;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = map;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1);
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 	bottom = _tmp9_;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = left;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == -1) {
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 22665 "Photo.c"
+#line 22790 "Photo.c"
 	} else {
 		gint _tmp14_;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22672 "Photo.c"
+#line 22797 "Photo.c"
 	}
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 22678 "Photo.c"
+#line 22803 "Photo.c"
 	} else {
 		gint _tmp15_;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22685 "Photo.c"
+#line 22810 "Photo.c"
 	}
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = TRUE;
-#line 22691 "Photo.c"
+#line 22816 "Photo.c"
 	} else {
 		gint _tmp16_;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22698 "Photo.c"
+#line 22823 "Photo.c"
 	}
-#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22710 "Photo.c"
+#line 22835 "Photo.c"
 		}
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22714 "Photo.c"
+#line 22839 "Photo.c"
 	}
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = top;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = right;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = bottom;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_);
-#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2959 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2959 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2959 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22734 "Photo.c"
+#line 22859 "Photo.c"
 	}
-#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2959 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22738 "Photo.c"
+#line 22863 "Photo.c"
 }
 
 
@@ -22757,68 +22882,68 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 	gint _tmp12_;
 	KeyValueMap* _tmp13_;
 	gboolean _tmp14_;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2964 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("crop");
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2964 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *crop;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.left;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp1_, "left", _tmp3_);
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = *crop;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.top;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp4_, "top", _tmp6_);
-#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = map;
-#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *crop;
-#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.right;
-#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp7_, "right", _tmp9_);
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = map;
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = *crop;
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = _tmp11_.bottom;
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp10_, "bottom", _tmp12_);
-#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = map;
-#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_set_transformation (self, _tmp13_);
-#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 22805 "Photo.c"
+#line 22930 "Photo.c"
 		Alteration* _tmp15_;
 		Alteration* _tmp16_;
-#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "crop");
-#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
-#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 22816 "Photo.c"
+#line 22941 "Photo.c"
 	}
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22820 "Photo.c"
+#line 22945 "Photo.c"
 }
 
 
@@ -22830,51 +22955,51 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	KeyValueMap* _tmp1_;
 	KeyValueMap* _tmp2_;
 	gdouble _tmp3_;
-#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2975 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "straighten");
-#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2975 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2976 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2976 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2977 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_angle = 0.0;
-#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (angle) {
-#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 			*angle = _vala_angle;
-#line 22852 "Photo.c"
+#line 22977 "Photo.c"
 		}
-#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22856 "Photo.c"
+#line 22981 "Photo.c"
 	}
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0);
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_angle = _tmp3_;
-#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (angle) {
-#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 		*angle = _vala_angle;
-#line 22872 "Photo.c"
+#line 22997 "Photo.c"
 	}
-#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22876 "Photo.c"
+#line 23001 "Photo.c"
 }
 
 
@@ -22885,40 +23010,40 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp2_;
 	KeyValueMap* _tmp3_;
 	gboolean _tmp4_;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2987 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("straighten");
-#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = theta;
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_double (_tmp1_, "angle", _tmp2_);
-#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = map;
-#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_set_transformation (self, _tmp3_);
-#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 22905 "Photo.c"
+#line 23030 "Photo.c"
 		Alteration* _tmp5_;
 		Alteration* _tmp6_;
-#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = alteration_new ("image", "straighten");
-#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
-#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp6_);
-#line 22916 "Photo.c"
+#line 23041 "Photo.c"
 	}
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2987 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22920 "Photo.c"
+#line 23045 "Photo.c"
 }
 
 
@@ -22940,81 +23065,81 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	GdkPoint _tmp9_ = {0};
 	EditingToolsRedeyeInstance* _tmp47_;
 	gint _tmp47__length1;
-#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22952 "Photo.c"
+#line 23077 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp2_;
 		EditingToolsRedeyeInstance* _tmp3_;
 		gint _tmp3__length1;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0);
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3__length1 = 0;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (result_length1) {
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result_length1 = _tmp3__length1;
-#line 22966 "Photo.c"
+#line 23091 "Photo.c"
 		}
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22974 "Photo.c"
+#line 23099 "Photo.c"
 	}
-#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3003 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3003 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp6_ > 0, "num_points > 0");
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_);
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
 	res = _tmp8_;
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
 	res_length1 = _tmp7_;
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_res_size_ = res_length1;
-#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_.x = 0;
-#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point = _tmp9_;
-#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.x = -1;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3009 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.y = -1;
-#line 23004 "Photo.c"
+#line 23129 "Photo.c"
 	{
 		gint i = 0;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 23009 "Photo.c"
+#line 23134 "Photo.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = TRUE;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 23016 "Photo.c"
+#line 23141 "Photo.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gchar* center_key = NULL;
@@ -23057,158 +23182,158 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				gint _tmp44_;
 				EditingToolsRedeyeInstance _tmp45_;
 				gint _tmp46_;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 23061 "Photo.c"
+#line 23186 "Photo.c"
 					gint _tmp11_;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 23067 "Photo.c"
+#line 23192 "Photo.c"
 				}
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = i;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = num_points;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp12_ < _tmp13_)) {
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 23079 "Photo.c"
+#line 23204 "Photo.c"
 				}
-#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
-#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = g_strdup_printf ("center%d", _tmp14_);
-#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 				center_key = _tmp15_;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_strdup_printf ("radius%d", _tmp16_);
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 				radius_key = _tmp17_;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = res;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18__length1 = res_length1;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = i;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = map;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = center_key;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = default_point;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_);
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_[_tmp19_].center = _tmp23_;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = res;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24__length1 = res_length1;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = i;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _tmp24_[_tmp25_];
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_.center;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _tmp27_.x;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = default_point;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp29_.x;
-#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x");
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = res;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31__length1 = res_length1;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = i;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp31_[_tmp32_];
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_.center;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_.y;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = default_point;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_.y;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y");
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = res;
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38__length1 = res_length1;
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = i;
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = map;
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = radius_key;
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1);
-#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_[_tmp39_].radius = _tmp42_;
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = res;
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43__length1 = res_length1;
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = i;
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp43_[_tmp44_];
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = _tmp45_.radius;
-#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp46_ != -1, "res[i].radius != -1");
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (radius_key);
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (center_key);
-#line 23175 "Photo.c"
+#line 23300 "Photo.c"
 			}
 		}
 	}
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = res;
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47__length1 = res_length1;
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp47__length1;
-#line 23187 "Photo.c"
+#line 23312 "Photo.c"
 	}
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23195 "Photo.c"
+#line 23320 "Photo.c"
 }
 
 
 gboolean photo_has_redeye_transformations (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "redeye");
-#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23210 "Photo.c"
+#line 23335 "Photo.c"
 }
 
 
@@ -23239,111 +23364,111 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	gint _tmp21_;
 	KeyValueMap* _tmp22_;
 	gboolean _tmp23_;
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (redeye != NULL);
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23253 "Photo.c"
+#line 23378 "Photo.c"
 		KeyValueMap* _tmp2_;
 		KeyValueMap* _tmp3_;
-#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = key_value_map_new ("redeye");
-#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3034 "/home/jens/Source/shotwell/src/Photo.vala"
 		map = _tmp2_;
-#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = map;
-#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3035 "/home/jens/Source/shotwell/src/Photo.vala"
 		key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23266 "Photo.c"
+#line 23391 "Photo.c"
 	}
-#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3038 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3038 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3038 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp6_ >= 0, "num_points >= 0");
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3041 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp7_ + 1;
-#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3043 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = num_points;
-#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3043 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1);
-#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3043 "/home/jens/Source/shotwell/src/Photo.vala"
 	radius_key = _tmp9_;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3044 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = num_points;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3044 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1);
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3044 "/home/jens/Source/shotwell/src/Photo.vala"
 	center_key = _tmp11_;
-#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3046 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = map;
-#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3046 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = radius_key;
-#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3046 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = *redeye;
-#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3046 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.radius;
-#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3046 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_);
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = map;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = center_key;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = *redeye;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.center;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_);
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = map;
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = num_points;
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp20_, "num_points", _tmp21_);
-#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = map;
-#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_set_transformation (self, _tmp22_);
-#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 23326 "Photo.c"
+#line 23451 "Photo.c"
 		Alteration* _tmp24_;
 		Alteration* _tmp25_;
-#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "redeye");
-#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3052 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 23337 "Photo.c"
+#line 23462 "Photo.c"
 	}
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (radius_key);
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 23345 "Photo.c"
+#line 23470 "Photo.c"
 }
 
 
@@ -23352,90 +23477,90 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 	Dimensions _vala_scaled_to_viewport = {0};
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23358 "Photo.c"
+#line 23483 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
 		gboolean _tmp8_ = FALSE;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23366 "Photo.c"
+#line 23491 "Photo.c"
 		{
 			Scaling _tmp1_;
 			PhotoException _tmp2_;
 			Dimensions _tmp3_ = {0};
 			Dimensions _tmp4_ = {0};
 			gboolean _tmp5_;
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = exceptions;
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp3_;
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp4_;
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 23385 "Photo.c"
+#line 23510 "Photo.c"
 			{
 				PhotoRow* _tmp6_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23392 "Photo.c"
+#line 23517 "Photo.c"
 			}
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_image) {
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_image = _vala_scaled_image;
-#line 23398 "Photo.c"
+#line 23523 "Photo.c"
 			}
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_to_viewport) {
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23404 "Photo.c"
+#line 23529 "Photo.c"
 			}
-#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3070 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23408 "Photo.c"
+#line 23533 "Photo.c"
 		}
-		__finally380:
+		__finally392:
 		{
 			PhotoRow* _tmp7_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23417 "Photo.c"
+#line 23542 "Photo.c"
 		}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/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 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp8_;
-#line 23425 "Photo.c"
+#line 23550 "Photo.c"
 	}
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23431 "Photo.c"
+#line 23556 "Photo.c"
 	}
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23437 "Photo.c"
+#line 23562 "Photo.c"
 	}
 }
 
@@ -23459,72 +23584,72 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	gint _tmp57_;
 	gboolean _tmp63_;
 	gboolean _tmp64_;
-#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw = _tmp0_;
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_is_unscaled (scaling);
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 23473 "Photo.c"
+#line 23598 "Photo.c"
 		Dimensions _tmp2_;
 		Dimensions _tmp3_;
-#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = raw;
-#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp2_;
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = raw;
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_to_viewport = _tmp3_;
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23490 "Photo.c"
+#line 23615 "Photo.c"
 		}
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23496 "Photo.c"
+#line 23621 "Photo.c"
 		}
-#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23500 "Photo.c"
+#line 23625 "Photo.c"
 	}
-#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3087 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
-#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3087 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp4_;
-#line 3073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_vala_scaled_image, 0, 0);
-#line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_vala_scaled_to_viewport, 0, 0);
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = exceptions;
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 23516 "Photo.c"
+#line 23641 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
 		gboolean _tmp8_;
-#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo_get_raw_crop (self, &_tmp7_);
-#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp7_;
-#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23526 "Photo.c"
+#line 23651 "Photo.c"
 			Dimensions rotated_raw = {0};
 			Dimensions _tmp9_;
 			PhotoException _tmp10_;
@@ -23542,17 +23667,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			Dimensions _tmp32_ = {0};
 			PhotoException _tmp33_;
 			gboolean _tmp34_;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = raw;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3100 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp9_;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = exceptions;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3101 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 23554 "Photo.c"
+#line 23679 "Photo.c"
 				Orientation _tmp12_;
 				Dimensions _tmp13_;
 				Box _tmp14_;
@@ -23560,125 +23685,125 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				Orientation _tmp16_;
 				Dimensions _tmp17_;
 				Dimensions _tmp18_ = {0};
-#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = orientation;
-#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = raw;
-#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = crop;
-#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_);
-#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 				crop = _tmp15_;
-#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3103 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = orientation;
-#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3103 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = raw;
-#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3103 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
-#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3103 "/home/jens/Source/shotwell/src/Photo.vala"
 				rotated_raw = _tmp18_;
-#line 23580 "Photo.c"
+#line 23705 "Photo.c"
 			}
-#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
-#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_);
-#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_scaled (&crop, &_tmp20_, &_tmp21_);
-#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_crop = _tmp21_;
-#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3110 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp22_);
-#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3110 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp22_;
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = box_get_width (&crop);
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = box_get_width (&scaled_crop);
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3113 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ <= _tmp25_) {
-#line 23600 "Photo.c"
+#line 23725 "Photo.c"
 				gint _tmp26_;
 				gint _tmp27_;
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = box_get_height (&crop);
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = box_get_height (&scaled_crop);
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23609 "Photo.c"
+#line 23734 "Photo.c"
 			} else {
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3113 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23613 "Photo.c"
+#line 23738 "Photo.c"
 			}
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3113 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23617 "Photo.c"
+#line 23742 "Photo.c"
 				Dimensions _tmp28_;
 				Dimensions _tmp29_ = {0};
-#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = raw;
-#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp28_;
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 				box_get_dimensions (&crop, &_tmp29_);
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_to_viewport = _tmp29_;
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_image) {
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_image = _vala_scaled_image;
-#line 23634 "Photo.c"
+#line 23759 "Photo.c"
 				}
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_to_viewport) {
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23640 "Photo.c"
+#line 23765 "Photo.c"
 				}
-#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23644 "Photo.c"
+#line 23769 "Photo.c"
 			}
-#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
-#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp31_);
-#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
 			dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_);
-#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp32_;
-#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = exceptions;
-#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp34_) {
-#line 23660 "Photo.c"
+#line 23785 "Photo.c"
 				Orientation _tmp35_;
 				Dimensions _tmp36_;
 				Dimensions _tmp37_ = {0};
-#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = orientation;
-#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _vala_scaled_image;
-#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
-#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp37_;
-#line 23672 "Photo.c"
+#line 23797 "Photo.c"
 			}
 		}
 	}
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = dimensions_has_area (&_vala_scaled_image);
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 23680 "Photo.c"
+#line 23805 "Photo.c"
 		Dimensions rotated_raw = {0};
 		Dimensions _tmp39_;
 		PhotoException _tmp40_;
@@ -23688,143 +23813,143 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		Dimensions _tmp47_;
 		PhotoException _tmp48_;
 		gboolean _tmp49_;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = raw;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 		rotated_raw = _tmp39_;
-#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = exceptions;
-#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 23700 "Photo.c"
+#line 23825 "Photo.c"
 			Orientation _tmp42_;
 			Dimensions _tmp43_;
 			Dimensions _tmp44_ = {0};
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = orientation;
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = raw;
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3137 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3137 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp44_;
-#line 23712 "Photo.c"
+#line 23837 "Photo.c"
 		}
-#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3139 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
-#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3139 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_);
-#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3139 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp46_;
-#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3140 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = _vala_scaled_image;
-#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3140 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_to_viewport = _tmp47_;
-#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3143 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = exceptions;
-#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3143 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3143 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp49_) {
-#line 23730 "Photo.c"
+#line 23855 "Photo.c"
 			Orientation _tmp50_;
 			Dimensions _tmp51_;
 			Dimensions _tmp52_ = {0};
-#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = orientation;
-#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = _vala_scaled_image;
-#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
-#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp52_;
-#line 23742 "Photo.c"
+#line 23867 "Photo.c"
 		}
 	}
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _vala_scaled_image;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_.width;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = raw;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = _tmp56_.width;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_ >= _tmp57_) {
-#line 23755 "Photo.c"
+#line 23880 "Photo.c"
 		Dimensions _tmp58_;
 		gint _tmp59_;
 		Dimensions _tmp60_;
 		gint _tmp61_;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _vala_scaled_image;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_.height;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = raw;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_.height;
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23770 "Photo.c"
+#line 23895 "Photo.c"
 	} else {
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23774 "Photo.c"
+#line 23899 "Photo.c"
 	}
-#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23778 "Photo.c"
+#line 23903 "Photo.c"
 		Dimensions _tmp62_;
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3149 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3149 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp62_;
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23790 "Photo.c"
+#line 23915 "Photo.c"
 		}
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23796 "Photo.c"
+#line 23921 "Photo.c"
 		}
-#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23800 "Photo.c"
+#line 23925 "Photo.c"
 	}
-#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
-#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp63_, "scaled_image.has_area()");
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport);
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp64_, "scaled_to_viewport.has_area()");
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23816 "Photo.c"
+#line 23941 "Photo.c"
 	}
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23822 "Photo.c"
+#line 23947 "Photo.c"
 	}
-#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3157 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23826 "Photo.c"
+#line 23951 "Photo.c"
 }
 
 
@@ -23852,141 +23977,141 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	Dimensions _tmp22_ = {0};
 	gboolean _tmp23_;
 	GError * _inner_error_ = NULL;
-#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3163 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3163 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = fetch_mode;
-#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_backing_reader (self, _tmp0_);
-#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3166 "/home/jens/Source/shotwell/src/Photo.vala"
 	loader = _tmp1_;
-#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = scaling_is_unscaled (scaling);
-#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3169 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 23868 "Photo.c"
+#line 23993 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
 		PhotoFileReader* _tmp4_;
 		GdkPixbuf* _tmp5_;
 		GdkPixbuf* _tmp6_;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = loader;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_);
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23887 "Photo.c"
+#line 24012 "Photo.c"
 		}
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp6_;
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3174 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23901 "Photo.c"
+#line 24026 "Photo.c"
 	}
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = exceptions;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_);
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_image = _tmp9_;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_to_viewport = _tmp10_;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3179 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_scaled = _tmp11_;
-#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3181 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = is_scaled;
-#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3181 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp12_) {
-#line 23919 "Photo.c"
+#line 24044 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		PhotoFileReader* _tmp14_;
 		GdkPixbuf* _tmp15_;
 		GdkPixbuf* _tmp16_;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = loader;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_);
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp15_;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23938 "Photo.c"
+#line 24063 "Photo.c"
 		}
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = NULL;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp16_;
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp13_);
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23952 "Photo.c"
+#line 24077 "Photo.c"
 	}
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp18_);
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = scaled_image;
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_);
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp20_;
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23972 "Photo.c"
+#line 24097 "Photo.c"
 	}
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3197 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_for_pixbuf (_tmp21_, &_tmp22_);
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE);
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3199 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3199 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (loader);
-#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3199 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23988 "Photo.c"
+#line 24113 "Photo.c"
 }
 
 
@@ -23998,37 +24123,37 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 	GdkPixbuf* _tmp3_;
 	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3204 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3204 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_);
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24018 "Photo.c"
+#line 24143 "Photo.c"
 	}
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3205 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24030 "Photo.c"
+#line 24155 "Photo.c"
 }
 
 
@@ -24040,37 +24165,37 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 	GdkPixbuf* _tmp3_;
 	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_);
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24060 "Photo.c"
+#line 24185 "Photo.c"
 	}
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24072 "Photo.c"
+#line 24197 "Photo.c"
 }
 
 
@@ -24085,93 +24210,93 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	GdkPixbuf* _tmp8_;
 	gboolean _tmp9_;
 	GError * _inner_error_ = NULL;
-#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 24091 "Photo.c"
+#line 24216 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24098 "Photo.c"
+#line 24223 "Photo.c"
 		{
 			Scaling _tmp1_;
 			Dimensions _tmp2_ = {0};
 			Dimensions _tmp3_ = {0};
 			Orientation _tmp4_;
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3229 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3229 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_calculate_pixbuf_dimensions (self, &_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_, &_tmp3_);
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3229 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_image = _tmp2_;
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3229 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_to_viewport = _tmp3_;
-#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3231 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_original_orientation (self);
-#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3231 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_orientation = _tmp4_;
-#line 24116 "Photo.c"
+#line 24241 "Photo.c"
 		}
-		__finally381:
+		__finally393:
 		{
 			PhotoRow* _tmp5_;
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24125 "Photo.c"
+#line 24250 "Photo.c"
 		}
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3228 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 24133 "Photo.c"
+#line 24258 "Photo.c"
 		}
 	}
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = *scaling;
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = fetch_mode;
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_);
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp8_;
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24150 "Photo.c"
+#line 24275 "Photo.c"
 	}
-#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = rotate;
-#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3241 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_) {
-#line 24156 "Photo.c"
+#line 24281 "Photo.c"
 		GdkPixbuf* _tmp10_;
 		GdkPixbuf* _tmp11_;
-#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = pixbuf;
-#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_);
-#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3242 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp11_;
-#line 24167 "Photo.c"
+#line 24292 "Photo.c"
 	}
-#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3251 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3251 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24173 "Photo.c"
+#line 24298 "Photo.c"
 }
 
 
@@ -24183,35 +24308,35 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	GdkPixbuf* _tmp2_;
 	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24201 "Photo.c"
+#line 24326 "Photo.c"
 	}
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24213 "Photo.c"
+#line 24338 "Photo.c"
 }
 
 
@@ -24231,34 +24356,34 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
      * it moves to the head of the LRU.
      */
 static gpointer _photo_cached_pixbuf_ref0 (gpointer self) {
-#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24235 "Photo.c"
+#line 24360 "Photo.c"
 }
 
 
 static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
 	gboolean result;
 	result = photo_trim_source_pixbuf_cache ();
-#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24244 "Photo.c"
+#line 24369 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) {
 	GdkPixbuf* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24253 "Photo.c"
+#line 24378 "Photo.c"
 	{
 		GeeLinkedList* _tmp0_;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_source_pixbuf_cache;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24260 "Photo.c"
+#line 24385 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
@@ -24278,21 +24403,21 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			GdkPixbuf* _tmp69_ = NULL;
 			PhotoCachedPixbuf* _tmp70_;
 			GdkPixbuf* _tmp73_;
-#line 3256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 			found = NULL;
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3279 "/home/jens/Source/shotwell/src/Photo.vala"
 			min_elapsed = DBL_MAX;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
 			count = 0;
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_source_pixbuf_cache;
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
 			iter = _tmp2_;
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 24294 "Photo.c"
+#line 24419 "Photo.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
@@ -24305,236 +24430,236 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp10_;
 				gboolean _tmp11_ = FALSE;
 				Photo* _tmp12_;
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = iter;
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 24315 "Photo.c"
+#line 24440 "Photo.c"
 				}
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 				cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3285 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = cached_pixbuf;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3285 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->last_touched;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3285 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3285 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = trunc (_tmp9_);
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3285 "/home/jens/Source/shotwell/src/Photo.vala"
 				elapsed = _tmp10_ + 1;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = locate;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_ != NULL) {
-#line 24337 "Photo.c"
+#line 24462 "Photo.c"
 					PhotoCachedPixbuf* _tmp13_;
 					Photo* _tmp14_;
 					Photo* _tmp15_;
 					gboolean _tmp16_;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = cached_pixbuf;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = _tmp13_->photo;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = locate;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource));
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp16_;
-#line 24352 "Photo.c"
+#line 24477 "Photo.c"
 				} else {
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24356 "Photo.c"
+#line 24481 "Photo.c"
 				}
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24360 "Photo.c"
+#line 24485 "Photo.c"
 					GeeIterator* _tmp17_;
 					PhotoCachedPixbuf* _tmp18_;
 					PhotoCachedPixbuf* _tmp19_;
 					gint _tmp20_;
-#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = iter;
-#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_iterator_remove (_tmp17_);
-#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = cached_pixbuf;
-#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_);
-#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					found = _tmp19_;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = count;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					count = _tmp20_ + 1;
-#line 24381 "Photo.c"
+#line 24506 "Photo.c"
 				} else {
 					gdouble _tmp21_;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3294 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = elapsed;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3294 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24388 "Photo.c"
+#line 24513 "Photo.c"
 						GeeIterator* _tmp22_;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp22_ = iter;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_iterator_remove (_tmp22_);
-#line 24394 "Photo.c"
+#line 24519 "Photo.c"
 					} else {
 						gint _tmp23_;
-#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = count;
-#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24401 "Photo.c"
+#line 24526 "Photo.c"
 							GeeIterator* _tmp24_;
-#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = iter;
-#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_iterator_remove (_tmp24_);
-#line 24407 "Photo.c"
+#line 24532 "Photo.c"
 						} else {
 							gdouble _tmp25_;
 							gdouble _tmp26_;
 							gdouble _tmp27_;
 							gint _tmp28_;
-#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = elapsed;
-#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = min_elapsed;
-#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = MIN (_tmp25_, _tmp26_);
-#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
 							min_elapsed = _tmp27_;
-#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3302 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = count;
-#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3302 "/home/jens/Source/shotwell/src/Photo.vala"
 							count = _tmp28_ + 1;
-#line 24425 "Photo.c"
+#line 24550 "Photo.c"
 						}
 					}
 				}
-#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24431 "Photo.c"
+#line 24556 "Photo.c"
 			}
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = found;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp31_ == NULL) {
-#line 24437 "Photo.c"
+#line 24562 "Photo.c"
 				Photo* _tmp32_;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24443 "Photo.c"
+#line 24568 "Photo.c"
 			} else {
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24447 "Photo.c"
+#line 24572 "Photo.c"
 			}
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24451 "Photo.c"
+#line 24576 "Photo.c"
 				gboolean _tmp33_;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24457 "Photo.c"
+#line 24582 "Photo.c"
 			} else {
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24461 "Photo.c"
+#line 24586 "Photo.c"
 			}
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24465 "Photo.c"
+#line 24590 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
 				Photo* _tmp35_;
 				Scaling _tmp36_ = {0};
 				GdkPixbuf* _tmp37_;
 				Photo* _tmp38_;
 				PhotoCachedPixbuf* _tmp39_;
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = locate;
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 				scaling_for_original (&_tmp36_);
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp37_;
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (iter);
-#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3309 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 24486 "Photo.c"
-					goto __finally382;
+#line 24611 "Photo.c"
+					goto __finally394;
 				}
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_);
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (found);
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 				found = _tmp39_;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp34_);
-#line 24499 "Photo.c"
+#line 24624 "Photo.c"
 			} else {
 				PhotoCachedPixbuf* _tmp40_;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24506 "Photo.c"
+#line 24631 "Photo.c"
 					PhotoCachedPixbuf* _tmp41_;
 					GTimer* _tmp42_;
-#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = found;
-#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->last_touched;
-#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24515 "Photo.c"
+#line 24640 "Photo.c"
 				}
 			}
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = found;
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp44_ != NULL) {
-#line 24522 "Photo.c"
+#line 24647 "Photo.c"
 				gboolean _tmp45_;
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24528 "Photo.c"
+#line 24653 "Photo.c"
 			} else {
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24532 "Photo.c"
+#line 24657 "Photo.c"
 			}
-#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24536 "Photo.c"
+#line 24661 "Photo.c"
 				GeeLinkedList* _tmp46_;
 				PhotoCachedPixbuf* _tmp47_;
 				PhotoCachedPixbuf* _tmp48_;
@@ -24542,157 +24667,157 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp50_;
 				gdouble _tmp51_;
 				gdouble _tmp52_;
-#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_source_pixbuf_cache;
-#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = found;
-#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp47_);
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = found;
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_->last_touched;
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = g_timer_elapsed (_tmp49_, NULL);
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = min_elapsed;
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = MIN (_tmp50_, _tmp51_);
-#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				min_elapsed = _tmp52_;
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 24564 "Photo.c"
+#line 24689 "Photo.c"
 					GeeLinkedList* _tmp53_;
 					gint _tmp54_;
 					gint _tmp55_;
 					GeeLinkedList* _tmp56_;
 					gpointer _tmp57_;
 					PhotoCachedPixbuf* _tmp58_;
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = photo_source_pixbuf_cache;
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = _tmp54_;
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
-#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24581 "Photo.c"
+#line 24706 "Photo.c"
 					}
-#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3327 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
-#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3327 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque));
-#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3327 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
-#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3327 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24591 "Photo.c"
+#line 24716 "Photo.c"
 				}
 			}
-#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = photo_discard_source_id;
-#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp59_ != ((guint) 0)) {
-#line 24598 "Photo.c"
+#line 24723 "Photo.c"
 				guint _tmp60_;
-#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
-#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_source_remove (_tmp60_);
-#line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3333 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24606 "Photo.c"
+#line 24731 "Photo.c"
 			}
-#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
-#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_;
-#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3337 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24616 "Photo.c"
+#line 24741 "Photo.c"
 				gdouble _tmp64_;
 				guint retry_sec = 0U;
 				gdouble _tmp65_;
 				gdouble _tmp66_;
 				guint _tmp67_;
 				guint _tmp68_;
-#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3338 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = min_elapsed;
-#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3338 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0");
-#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = min_elapsed;
-#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = trunc (_tmp65_);
-#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3341 "/home/jens/Source/shotwell/src/Photo.vala"
 				retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_);
-#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = retry_sec;
-#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL);
-#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = _tmp68_;
-#line 24639 "Photo.c"
+#line 24764 "Photo.c"
 			}
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = found;
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp70_ != NULL) {
-#line 24645 "Photo.c"
+#line 24770 "Photo.c"
 				PhotoCachedPixbuf* _tmp71_;
 				GdkPixbuf* _tmp72_;
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = found;
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_->pixbuf;
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24654 "Photo.c"
+#line 24779 "Photo.c"
 			} else {
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24658 "Photo.c"
+#line 24783 "Photo.c"
 			}
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp73_;
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (iter);
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_cached_pixbuf_unref0 (found);
-#line 24668 "Photo.c"
+#line 24793 "Photo.c"
 			{
 				GeeLinkedList* _tmp74_;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo_source_pixbuf_cache;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24675 "Photo.c"
+#line 24800 "Photo.c"
 			}
-#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24679 "Photo.c"
+#line 24804 "Photo.c"
 		}
-		__finally382:
+		__finally394:
 		{
 			GeeLinkedList* _tmp75_;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = photo_source_pixbuf_cache;
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24688 "Photo.c"
+#line 24813 "Photo.c"
 		}
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24694 "Photo.c"
+#line 24819 "Photo.c"
 	}
 }
 
@@ -24703,48 +24828,48 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 	{
 		GdkPixbuf* _tmp0_;
 		GdkPixbuf* _tmp1_;
-#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_);
-#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24713 "Photo.c"
-			goto __catch383_g_error;
+#line 24838 "Photo.c"
+			goto __catch395_g_error;
 		}
 	}
-	goto __finally383;
-	__catch383_g_error:
+	goto __finally395;
+	__catch395_g_error:
 	{
 		GError* err = NULL;
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24727 "Photo.c"
+#line 24852 "Photo.c"
 	}
-	__finally383:
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally395:
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24732 "Photo.c"
+#line 24857 "Photo.c"
 		gboolean _tmp2_ = FALSE;
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/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 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp2_;
-#line 24740 "Photo.c"
+#line 24865 "Photo.c"
 	}
-#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3355 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3355 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24746 "Photo.c"
+#line 24871 "Photo.c"
 }
 
 
@@ -24759,29 +24884,29 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	GdkPixbuf* _tmp1_;
 	GdkPixbuf* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 3344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3363 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_run_source_pixbuf_cache (self, TRUE, &_inner_error_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24773 "Photo.c"
+#line 24898 "Photo.c"
 	}
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gdk_pixbuf_copy (_tmp0_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24783 "Photo.c"
+#line 24908 "Photo.c"
 }
 
 
@@ -24790,46 +24915,46 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
      */
 void photo_discard_prefetched (Photo* self) {
 	GError * _inner_error_ = NULL;
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3370 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 24794 "Photo.c"
+#line 24919 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_;
 		GdkPixbuf* _tmp1_;
-#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3372 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_);
-#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3372 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3372 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3372 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24806 "Photo.c"
-			goto __catch384_g_error;
+#line 24931 "Photo.c"
+			goto __catch396_g_error;
 		}
 	}
-	goto __finally384;
-	__catch384_g_error:
+	goto __finally396;
+	__catch396_g_error:
 	{
 		GError* err = NULL;
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24820 "Photo.c"
+#line 24945 "Photo.c"
 	}
-	__finally384:
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally396:
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/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 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3371 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24831 "Photo.c"
+#line 24956 "Photo.c"
 	}
 }
 
@@ -24881,117 +25006,117 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	gboolean _tmp101_ = FALSE;
 	gboolean _tmp102_;
 	GError * _inner_error_ = NULL;
-#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_develop_raw_photos_to_files ();
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 24893 "Photo.c"
+#line 25018 "Photo.c"
 		PhotoFileFormat _tmp5_;
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_get_master_file_format (self);
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24899 "Photo.c"
+#line 25024 "Photo.c"
 	} else {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24903 "Photo.c"
+#line 25028 "Photo.c"
 	}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24907 "Photo.c"
+#line 25032 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		BackingFetchMode _tmp8_;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = fetch_mode;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24917 "Photo.c"
+#line 25042 "Photo.c"
 		} else {
 			BackingFetchMode _tmp9_;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = fetch_mode;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24924 "Photo.c"
+#line 25049 "Photo.c"
 		}
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp7_) {
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 24930 "Photo.c"
+#line 25055 "Photo.c"
 		} else {
 			BackingFetchMode _tmp10_;
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3404 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = fetch_mode;
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3404 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24937 "Photo.c"
+#line 25062 "Photo.c"
 		}
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24941 "Photo.c"
+#line 25066 "Photo.c"
 	} else {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24945 "Photo.c"
+#line 25070 "Photo.c"
 	}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24949 "Photo.c"
+#line 25074 "Photo.c"
 		RawDeveloper _tmp11_;
 		gboolean _tmp12_;
-#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_get_raw_developer (self);
-#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
-#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24958 "Photo.c"
+#line 25083 "Photo.c"
 	} else {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24962 "Photo.c"
+#line 25087 "Photo.c"
 	}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24966 "Photo.c"
+#line 25091 "Photo.c"
 		RawDeveloper _tmp13_;
-#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_raw_developer (self);
-#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_set_raw_developer (self, _tmp13_);
-#line 24972 "Photo.c"
+#line 3406 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_set_raw_developer (self, _tmp13_, TRUE);
+#line 25097 "Photo.c"
 	}
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
-#line 3393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&scaled, 0, 0);
-#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = NULL;
-#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances_length1 = 0;
-#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 	_redeye_instances_size_ = redeye_instances_length1;
-#line 3397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformer = NULL;
-#line 24986 "Photo.c"
+#line 25111 "Photo.c"
 	{
 		PhotoRow* _tmp14_;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = self->row;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24993 "Photo.c"
+#line 25118 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
 			PhotoException _tmp16_;
@@ -25009,201 +25134,201 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gboolean _tmp28_;
 			gboolean _tmp29_;
 			Orientation _tmp31_;
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3420 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ALL, &_tmp15_);
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3420 "/home/jens/Source/shotwell/src/Photo.vala"
 			original = _tmp15_;
-#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = exceptions;
-#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_);
-#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_);
-#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled = _tmp18_;
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3422 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = scaled;
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3422 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_to_viewport = _tmp19_;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3424 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp20_);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3424 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = scaled;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3424 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3424 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_scaled = !_tmp22_;
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3426 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_);
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3426 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3426 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = _tmp24_;
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3426 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances_length1 = _tmp23_;
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3426 "/home/jens/Source/shotwell/src/Photo.vala"
 			_redeye_instances_size_ = redeye_instances_length1;
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_get_raw_crop (self, &_tmp25_);
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop = _tmp25_;
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_cropped = _tmp26_;
-#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = photo_get_raw_straighten (self, &_tmp27_);
-#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 			straightening_angle = _tmp27_;
-#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_straightened = _tmp28_;
-#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = photo_has_color_adjustments (self);
-#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3432 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 25061 "Photo.c"
+#line 25186 "Photo.c"
 				PixelTransformer* _tmp30_;
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (transformer);
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 25069 "Photo.c"
+#line 25194 "Photo.c"
 			}
-#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = photo_get_orientation (self);
-#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation = _tmp31_;
-#line 25075 "Photo.c"
+#line 25200 "Photo.c"
 		}
-		__finally385:
+		__finally397:
 		{
 			PhotoRow* _tmp32_;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = self->row;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 25084 "Photo.c"
+#line 25209 "Photo.c"
 		}
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (transformer);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3419 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 25096 "Photo.c"
+#line 25221 "Photo.c"
 		}
 	}
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_get_prefetched_copy (self, &_inner_error_);
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp33_;
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (transformer);
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 		redeye_instances = (g_free (redeye_instances), NULL);
-#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 25113 "Photo.c"
+#line 25238 "Photo.c"
 	}
-#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
-#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
-#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 25121 "Photo.c"
+#line 25246 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp36_;
 		gint _tmp36__length1;
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = redeye_instances;
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36__length1 = redeye_instances_length1;
-#line 25128 "Photo.c"
+#line 25253 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
 			gint _instance_collection_size_ = 0;
 			gint instance_it = 0;
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection = _tmp36_;
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection_length1 = _tmp36__length1;
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25140 "Photo.c"
+#line 25265 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
-#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3454 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25144 "Photo.c"
+#line 25269 "Photo.c"
 				{
 					GdkPixbuf* _tmp37_;
 					EditingToolsRedeyeInstance _tmp38_;
 					GdkPixbuf* _tmp39_;
-#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3455 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = pixbuf;
-#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3455 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp38_ = instance;
-#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3455 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_);
-#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3455 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pixbuf);
-#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3455 "/home/jens/Source/shotwell/src/Photo.vala"
 					pixbuf = _tmp39_;
-#line 25159 "Photo.c"
+#line 25284 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3463 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = exceptions;
-#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3463 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3463 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 25170 "Photo.c"
+#line 25295 "Photo.c"
 		gboolean _tmp42_;
-#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
-#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25176 "Photo.c"
+#line 25301 "Photo.c"
 			GdkPixbuf* _tmp43_;
 			gdouble _tmp44_;
 			GdkPixbuf* _tmp45_;
-#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = pixbuf;
-#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = straightening_angle;
-#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = rotate_arb (_tmp43_, _tmp44_);
-#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp45_;
-#line 25190 "Photo.c"
+#line 25315 "Photo.c"
 		}
 	}
-#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3477 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = exceptions;
-#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3477 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
-#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3477 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_) {
-#line 25199 "Photo.c"
+#line 25324 "Photo.c"
 		gboolean _tmp48_;
-#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
-#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25205 "Photo.c"
+#line 25330 "Photo.c"
 			Box _tmp49_;
 			gint _tmp50_;
 			GdkPixbuf* _tmp51_;
@@ -25240,256 +25365,256 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gint _tmp82_;
 			gint _tmp83_;
 			GdkPixbuf* _tmp84_;
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = crop;
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp49_.left;
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = pixbuf;
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = gdk_pixbuf_get_width (_tmp51_);
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = _tmp52_;
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2);
-#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3486 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.left = _tmp54_;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = crop;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = _tmp55_.top;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = pixbuf;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = gdk_pixbuf_get_height (_tmp57_);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = _tmp58_;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.top = _tmp60_;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = crop;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = _tmp61_.right;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = crop;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = _tmp63_.left;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = pixbuf;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1);
-#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3489 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.right = _tmp68_;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp69_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = _tmp69_.bottom;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp71_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = _tmp71_.top;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = pixbuf;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = gdk_pixbuf_get_height (_tmp73_);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = _tmp74_;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3490 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.bottom = _tmp76_;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = pixbuf;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = crop;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = _tmp78_.left;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = crop;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _tmp80_.top;
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = box_get_width (&crop);
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83_ = box_get_height (&crop);
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_);
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp84_;
-#line 25326 "Photo.c"
+#line 25451 "Photo.c"
 		}
 	}
-#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = exceptions;
-#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3502 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_) {
-#line 25335 "Photo.c"
+#line 25460 "Photo.c"
 		GdkPixbuf* _tmp87_;
 		GdkPixbuf* _tmp88_;
-#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = pixbuf;
-#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_);
-#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp88_;
-#line 25346 "Photo.c"
+#line 25471 "Photo.c"
 	}
-#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = is_scaled;
-#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3513 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp89_) {
-#line 25352 "Photo.c"
+#line 25477 "Photo.c"
 		GdkPixbuf* _tmp90_;
 		Dimensions _tmp91_;
 		gint _tmp92_;
 		Dimensions _tmp93_;
 		gint _tmp94_;
 		GdkPixbuf* _tmp95_;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = pixbuf;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = scaled_to_viewport;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp92_ = _tmp91_.width;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = scaled_to_viewport;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = _tmp93_.height;
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR);
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3517 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp95_;
-#line 25375 "Photo.c"
+#line 25500 "Photo.c"
 	}
-#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
-#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
-#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp97_) {
-#line 25383 "Photo.c"
+#line 25508 "Photo.c"
 		PixelTransformer* _tmp98_;
-#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
-#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25389 "Photo.c"
+#line 25514 "Photo.c"
 			PixelTransformer* _tmp99_;
 			GdkPixbuf* _tmp100_;
-#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3530 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp99_ = transformer;
-#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3530 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp100_ = pixbuf;
-#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3530 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25398 "Photo.c"
+#line 25523 "Photo.c"
 		}
 	}
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = is_scaled;
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp102_) {
-#line 25405 "Photo.c"
+#line 25530 "Photo.c"
 		gboolean _tmp103_;
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25411 "Photo.c"
+#line 25536 "Photo.c"
 	} else {
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25415 "Photo.c"
+#line 25540 "Photo.c"
 	}
-#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25419 "Photo.c"
+#line 25544 "Photo.c"
 		GdkPixbuf* _tmp104_;
 		Dimensions _tmp105_ = {0};
 		gboolean _tmp106_;
-#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = pixbuf;
-#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3540 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp104_, &_tmp105_);
-#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
-#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25431 "Photo.c"
+#line 25556 "Photo.c"
 	}
-#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (transformer);
-#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = (g_free (redeye_instances), NULL);
-#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 25441 "Photo.c"
+#line 25566 "Photo.c"
 }
 
 
 static gboolean photo_real_has_user_generated_metadata (Photo* self) {
 	gboolean _tmp0_ = FALSE;
-#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 	return _tmp0_;
-#line 25451 "Photo.c"
+#line 25576 "Photo.c"
 }
 
 
 gboolean photo_has_user_generated_metadata (Photo* self) {
-#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 	return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25460 "Photo.c"
+#line 25585 "Photo.c"
 }
 
 
 static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 25469 "Photo.c"
+#line 25594 "Photo.c"
 }
 
 
 void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25478 "Photo.c"
+#line 25603 "Photo.c"
 }
 
 
 gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	gchar* result = NULL;
 	PhotoFileFormat* _tmp0_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25491 "Photo.c"
+#line 25616 "Photo.c"
 		PhotoFileFormat* _tmp1_;
 		PhotoFileFormatProperties* _tmp2_;
 		PhotoFileFormatProperties* _tmp3_;
@@ -25499,45 +25624,45 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		GFile* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = file_format;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_file_format_get_properties (*_tmp1_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_file_get_basename (_tmp7_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp3_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp9_;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25529 "Photo.c"
+#line 25654 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp10_;
 		gboolean _tmp11_;
-#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = photo_get_file_format (self);
-#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
-#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25539 "Photo.c"
+#line 25664 "Photo.c"
 			PhotoFileFormat _tmp12_;
 			PhotoFileFormatProperties* _tmp13_;
 			PhotoFileFormatProperties* _tmp14_;
@@ -25547,35 +25672,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp18_;
 			gchar* _tmp19_;
 			gchar* _tmp20_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_get_file_format (self);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_file_format_get_properties (_tmp12_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = _tmp17_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = g_file_get_basename (_tmp18_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp18_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp16_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp14_);
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp20_;
-#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25577 "Photo.c"
+#line 25702 "Photo.c"
 		} else {
 			PhotoFileFormat _tmp21_;
 			PhotoFileFormatProperties* _tmp22_;
@@ -25586,35 +25711,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp27_;
 			gchar* _tmp28_;
 			gchar* _tmp29_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_file_format_get_system_default_format ();
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_file_format_get_properties (_tmp21_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = _tmp22_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = _tmp24_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = g_file_get_basename (_tmp27_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp27_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp25_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp23_);
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp29_;
-#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25616 "Photo.c"
+#line 25741 "Photo.c"
 		}
 	}
 }
@@ -25668,473 +25793,473 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	PhotoFileMetadataWriter* _tmp101_;
 	PhotoMetadata* _tmp102_;
 	GError * _inner_error_ = NULL;
-#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3581 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3581 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3584 "/home/jens/Source/shotwell/src/Photo.vala"
 	export_reader = NULL;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_master = TRUE;
-#line 25678 "Photo.c"
+#line 25803 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25685 "Photo.c"
+#line 25810 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_;
 			PhotoFileReader* _tmp3_;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25696 "Photo.c"
+#line 25821 "Photo.c"
 				PhotoBackingReaders* _tmp4_;
 				PhotoFileReader* _tmp5_;
 				PhotoFileFormat _tmp6_;
 				gboolean _tmp7_;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 25711 "Photo.c"
+#line 25836 "Photo.c"
 			} else {
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25715 "Photo.c"
+#line 25840 "Photo.c"
 			}
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3587 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25719 "Photo.c"
+#line 25844 "Photo.c"
 				PhotoBackingReaders* _tmp8_;
 				PhotoFileReader* _tmp9_;
 				PhotoFileReader* _tmp10_;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->priv->readers;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_->editable;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _photo_file_adapter_ref0 (_tmp9_);
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (export_reader);
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 				export_reader = _tmp10_;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_master = FALSE;
-#line 25735 "Photo.c"
+#line 25860 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				PhotoBackingReaders* _tmp12_;
 				PhotoFileReader* _tmp13_;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->priv->readers;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->developer;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25746 "Photo.c"
+#line 25871 "Photo.c"
 					PhotoBackingReaders* _tmp14_;
 					PhotoFileReader* _tmp15_;
 					PhotoFileFormat _tmp16_;
 					gboolean _tmp17_;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->priv->readers;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->developer;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp17_;
-#line 25761 "Photo.c"
+#line 25886 "Photo.c"
 				} else {
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25765 "Photo.c"
+#line 25890 "Photo.c"
 				}
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3590 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25769 "Photo.c"
+#line 25894 "Photo.c"
 					PhotoBackingReaders* _tmp18_;
 					PhotoFileReader* _tmp19_;
 					PhotoFileReader* _tmp20_;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->readers;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _tmp18_->developer;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _photo_file_adapter_ref0 (_tmp19_);
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (export_reader);
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 					export_reader = _tmp20_;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3592 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_master = FALSE;
-#line 25785 "Photo.c"
+#line 25910 "Photo.c"
 				} else {
 					PhotoBackingReaders* _tmp21_;
 					PhotoFileReader* _tmp22_;
 					PhotoFileFormat _tmp23_;
 					gboolean _tmp24_;
-#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = self->priv->readers;
-#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->master;
-#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
-#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp24_) {
-#line 25801 "Photo.c"
+#line 25926 "Photo.c"
 						PhotoBackingReaders* _tmp25_;
 						PhotoFileReader* _tmp26_;
 						PhotoFileReader* _tmp27_;
-#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3594 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->readers;
-#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3594 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = _tmp25_->master;
-#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3594 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _photo_file_adapter_ref0 (_tmp26_);
-#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3594 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_file_adapter_unref0 (export_reader);
-#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3594 "/home/jens/Source/shotwell/src/Photo.vala"
 						export_reader = _tmp27_;
-#line 25815 "Photo.c"
+#line 25940 "Photo.c"
 					}
 				}
 			}
 		}
-		__finally386:
+		__finally398:
 		{
 			PhotoBackingReaders* _tmp28_;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = self->priv->readers;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25827 "Photo.c"
+#line 25952 "Photo.c"
 		}
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25831 "Photo.c"
+#line 25956 "Photo.c"
 			gboolean _tmp29_ = FALSE;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (export_reader);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp29_;
-#line 25839 "Photo.c"
+#line 25964 "Photo.c"
 		}
 	}
-#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = export_reader;
-#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp30_ == NULL) {
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25852 "Photo.c"
+#line 25977 "Photo.c"
 	}
-#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = export_reader;
-#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_file_format_get_properties (_tmp32_);
-#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 	format_properties = _tmp33_;
-#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = format_properties;
-#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = file;
-#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = photo_file_format_properties_convert_file_extension (_tmp34_, _tmp35_);
-#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	dest_file = _tmp36_;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = export_reader;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = dest_file;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = g_file_get_path (_tmp39_);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = photo_file_format_create_metadata_writer (_tmp38_, _tmp41_, &_inner_error_);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp41_);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp43_;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25890 "Photo.c"
+#line 26015 "Photo.c"
 		gboolean _tmp44_ = FALSE;
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp44_;
-#line 25902 "Photo.c"
+#line 26027 "Photo.c"
 	}
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = _tmp45_;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = writer;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3610: Exporting full-sized copy of %s to %s", _tmp46_, _tmp49_);
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp49_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp46_);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = export_reader;
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = _tmp51_;
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = dest_file;
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_copy (_tmp52_, _tmp53_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp52_);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 25934 "Photo.c"
+#line 26059 "Photo.c"
 		gboolean _tmp54_ = FALSE;
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp54_;
-#line 25948 "Photo.c"
+#line 26073 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp60_ = photo_has_alterations (self);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp60_) {
-#line 25954 "Photo.c"
+#line 26079 "Photo.c"
 		gboolean _tmp61_;
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = is_master;
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp61_;
-#line 25960 "Photo.c"
+#line 26085 "Photo.c"
 	} else {
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = FALSE;
-#line 25964 "Photo.c"
+#line 26089 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp59_) {
-#line 25968 "Photo.c"
+#line 26093 "Photo.c"
 		gboolean _tmp62_;
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = photo_has_user_generated_metadata (self);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = !_tmp62_;
-#line 25974 "Photo.c"
+#line 26099 "Photo.c"
 	} else {
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = FALSE;
-#line 25978 "Photo.c"
+#line 26103 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp58_) {
-#line 25982 "Photo.c"
+#line 26107 "Photo.c"
 		gchar* _tmp63_;
 		gchar* _tmp64_;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = _tmp63_;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = _tmp64_ == NULL;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp64_);
-#line 25993 "Photo.c"
+#line 26118 "Photo.c"
 	} else {
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = FALSE;
-#line 25997 "Photo.c"
+#line 26122 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp57_) {
-#line 26001 "Photo.c"
+#line 26126 "Photo.c"
 		gchar* _tmp65_;
 		gchar* _tmp66_;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp65_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp66_ = _tmp65_;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = _tmp66_ == NULL;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp66_);
-#line 26012 "Photo.c"
+#line 26137 "Photo.c"
 	} else {
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = FALSE;
-#line 26016 "Photo.c"
+#line 26141 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp56_) {
-#line 26020 "Photo.c"
+#line 26145 "Photo.c"
 		gboolean _tmp67_;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = export_metadata;
-#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = _tmp67_;
-#line 26026 "Photo.c"
+#line 26151 "Photo.c"
 	} else {
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = FALSE;
-#line 26030 "Photo.c"
+#line 26155 "Photo.c"
 	}
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 26046 "Photo.c"
+#line 26171 "Photo.c"
 	}
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp68_ = export_reader;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp69_ = photo_file_reader_read_metadata (_tmp68_, &_inner_error_);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp69_;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26056 "Photo.c"
+#line 26181 "Photo.c"
 		gboolean _tmp70_ = FALSE;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp70_;
-#line 26070 "Photo.c"
+#line 26195 "Photo.c"
 	}
-#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp71_ = metadata;
-#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp71_ == NULL) {
-#line 26076 "Photo.c"
+#line 26201 "Photo.c"
 		PhotoFileReader* _tmp72_;
 		PhotoFileFormat _tmp73_;
 		PhotoMetadata* _tmp74_;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = export_reader;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp73_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = photo_file_format_create_metadata (_tmp73_);
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3624 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp74_;
-#line 26090 "Photo.c"
+#line 26215 "Photo.c"
 	}
-#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = writer;
-#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp77_ = _tmp76_;
-#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp77_);
-#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3626 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3626: Updating metadata of %s", _tmp77_);
+#line 3626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp77_);
-#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp78_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3628 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp78_ != ((time_t) 0)) {
-#line 26106 "Photo.c"
+#line 26231 "Photo.c"
 		PhotoMetadata* _tmp79_;
 		time_t _tmp80_;
 		MetadataDateTime* _tmp81_;
 		MetadataDateTime* _tmp82_;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = metadata;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = metadata_date_time_new (_tmp80_);
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = _tmp81_;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp79_, _tmp82_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (_tmp82_);
-#line 26123 "Photo.c"
+#line 26248 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp83_;
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = metadata;
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp83_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26130 "Photo.c"
+#line 26255 "Photo.c"
 	}
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp84_ = export_metadata;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp84_) {
-#line 26136 "Photo.c"
+#line 26261 "Photo.c"
 		PhotoMetadata* _tmp85_;
 		gchar* _tmp86_;
 		gchar* _tmp87_;
@@ -26149,110 +26274,110 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		Orientation _tmp96_;
 		Orientation _tmp97_;
 		PhotoMetadata* _tmp99_;
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3635 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = metadata;
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3635 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3635 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = _tmp86_;
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3635 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp85_, _tmp87_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3635 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp87_);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = metadata;
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp89_;
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3636 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp88_, _tmp90_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp90_);
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = metadata;
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp92_);
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp91_, &_tmp92_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = metadata;
-#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = photo_get_orientation (self);
-#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp93_, _tmp94_);
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = metadata;
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_software (_tmp95_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = photo_get_orientation (self);
-#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = photo_get_original_orientation (self);
-#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp96_ != _tmp97_) {
-#line 26193 "Photo.c"
+#line 26318 "Photo.c"
 			PhotoMetadata* _tmp98_;
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3642 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = metadata;
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3642 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_remove_exif_thumbnail (_tmp98_);
-#line 26199 "Photo.c"
+#line 26324 "Photo.c"
 		}
-#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3644 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = metadata;
-#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3644 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_user_metadata_for_export (self, _tmp99_);
-#line 26205 "Photo.c"
+#line 26330 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp100_;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = metadata;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp100_);
-#line 26212 "Photo.c"
+#line 26337 "Photo.c"
 	}
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = writer;
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = metadata;
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp101_, _tmp102_, &_inner_error_);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 26222 "Photo.c"
+#line 26347 "Photo.c"
 		gboolean _tmp103_ = FALSE;
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp103_;
-#line 26238 "Photo.c"
+#line 26363 "Photo.c"
 	}
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dest_file);
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_format_properties_unref0 (format_properties);
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (export_reader);
-#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26254 "Photo.c"
+#line 26379 "Photo.c"
 }
 
 
@@ -26262,59 +26387,59 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_;
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = scaling_is_unscaled (scaling);
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26274 "Photo.c"
+#line 26399 "Photo.c"
 	} else {
 		gboolean _tmp4_;
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_has_alterations (self);
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp4_;
-#line 26281 "Photo.c"
+#line 26406 "Photo.c"
 	}
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = TRUE;
-#line 26287 "Photo.c"
+#line 26412 "Photo.c"
 	} else {
 		gboolean _tmp5_;
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_has_user_generated_metadata (self);
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp5_;
-#line 26294 "Photo.c"
+#line 26419 "Photo.c"
 	}
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 26300 "Photo.c"
+#line 26425 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp6_;
 		PhotoFileFormat _tmp7_;
-#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = export_format;
-#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo_get_file_format (self);
-#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26310 "Photo.c"
+#line 26435 "Photo.c"
 	}
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26316 "Photo.c"
+#line 26441 "Photo.c"
 }
 
 
@@ -26364,342 +26489,342 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	PhotoFileMetadataWriter* _tmp92_;
 	PhotoMetadata* _tmp93_;
 	GError * _inner_error_ = NULL;
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (scaling != NULL);
-#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = direct_copy_unmodified;
-#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 26376 "Photo.c"
+#line 26501 "Photo.c"
 		GFile* _tmp1_;
 		GFile* _tmp2_;
 		GFile* _tmp3_;
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = dest_file;
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_file_copy (_tmp2_, _tmp3_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp2_);
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26396 "Photo.c"
+#line 26521 "Photo.c"
 		}
-#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26400 "Photo.c"
+#line 26525 "Photo.c"
 	}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = scaling_is_unscaled (scaling);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 26406 "Photo.c"
+#line 26531 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = photo_has_alterations (self);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp9_) {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26415 "Photo.c"
+#line 26540 "Photo.c"
 		} else {
 			gboolean _tmp10_;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_only_metadata_changed (self);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp10_;
-#line 26422 "Photo.c"
+#line 26547 "Photo.c"
 		}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26426 "Photo.c"
+#line 26551 "Photo.c"
 	} else {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26430 "Photo.c"
+#line 26555 "Photo.c"
 	}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26434 "Photo.c"
+#line 26559 "Photo.c"
 		PhotoFileFormat _tmp11_;
 		PhotoFileFormat _tmp12_;
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3679 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = export_format;
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3679 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_get_file_format (self);
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3679 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26443 "Photo.c"
+#line 26568 "Photo.c"
 	} else {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26447 "Photo.c"
+#line 26572 "Photo.c"
 	}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26451 "Photo.c"
+#line 26576 "Photo.c"
 		PhotoFileFormat _tmp13_;
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3679 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_file_format (self);
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3679 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26457 "Photo.c"
+#line 26582 "Photo.c"
 	} else {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26461 "Photo.c"
+#line 26586 "Photo.c"
 	}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26465 "Photo.c"
+#line 26590 "Photo.c"
 		gboolean _tmp14_ = FALSE;
 		GFile* _tmp15_;
 		gboolean _tmp16_;
 		gboolean _tmp17_;
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = dest_file;
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = export_metadata;
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_);
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp17_;
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26484 "Photo.c"
+#line 26609 "Photo.c"
 		}
-#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3680 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
-#line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3681 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26490 "Photo.c"
+#line 26615 "Photo.c"
 		}
 	}
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3687 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3687 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp18_;
-#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = metadata;
-#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ == NULL) {
-#line 26501 "Photo.c"
+#line 26626 "Photo.c"
 		PhotoFileFormat _tmp20_;
 		PhotoMetadata* _tmp21_;
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = export_format;
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_create_metadata (_tmp20_);
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3689 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp21_;
-#line 26512 "Photo.c"
+#line 26637 "Photo.c"
 	}
-#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
-#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_file_format_can_write (_tmp22_);
-#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp23_) {
-#line 26520 "Photo.c"
+#line 26645 "Photo.c"
 		PhotoFileFormat _tmp24_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = photo_file_format_get_system_default_format ();
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
 		export_format = _tmp24_;
-#line 26526 "Photo.c"
+#line 26651 "Photo.c"
 	}
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dest_file;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_file_get_path (_tmp26_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp28_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp30_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26552 "Photo.c"
+#line 26677 "Photo.c"
 	}
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_;
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = writer;
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_;
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = export_format;
-#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_);
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3677: Saving transformed version of %s to %s in file format" \
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3696: Saving transformed version of %s to %s in file format" \
 " %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL);
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp35_);
-#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp32_);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = photo_get_file_format (self);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = TRUE;
-#line 26580 "Photo.c"
+#line 26705 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp40_;
-#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = photo_get_file_format (self);
-#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26587 "Photo.c"
+#line 26712 "Photo.c"
 	}
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26591 "Photo.c"
+#line 26716 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
 		Scaling _tmp42_;
 		GdkPixbuf* _tmp43_;
 		GdkPixbuf* _tmp44_;
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = *scaling;
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = photo_get_pixbuf_with_options (self, &_tmp42_, PHOTO_EXCEPTION_ORIENTATION, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp43_;
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26614 "Photo.c"
+#line 26739 "Photo.c"
 		}
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = NULL;
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp44_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp41_);
-#line 26626 "Photo.c"
+#line 26751 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
 		Scaling _tmp46_;
 		GdkPixbuf* _tmp47_;
 		GdkPixbuf* _tmp48_;
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = *scaling;
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = photo_get_pixbuf_with_options (self, &_tmp46_, PHOTO_EXCEPTION_NONE, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = _tmp47_;
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26650 "Photo.c"
+#line 26775 "Photo.c"
 		}
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = NULL;
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp48_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp45_);
-#line 26662 "Photo.c"
+#line 26787 "Photo.c"
 	}
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = pixbuf;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = quality;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26684 "Photo.c"
+#line 26809 "Photo.c"
 	}
-#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
-#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _tmp53_;
-#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3696: Setting EXIF for %s", _tmp54_);
-#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3715: Setting EXIF for %s", _tmp54_);
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp54_);
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3718 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = export_metadata;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3718 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 26700 "Photo.c"
+#line 26825 "Photo.c"
 		PhotoMetadata* _tmp56_;
 		gchar* _tmp57_;
 		gchar* _tmp58_;
@@ -26712,205 +26837,205 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		PhotoMetadata* _tmp70_;
 		PhotoMetadata* _tmp71_;
 		gboolean _tmp72_;
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = metadata;
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_;
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3720 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3720 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp58_);
-#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3721 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = metadata;
-#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3721 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3721 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
-#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3721 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3721 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3722 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = metadata;
-#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3722 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp63_ != ((time_t) 0)) {
-#line 26741 "Photo.c"
+#line 26866 "Photo.c"
 			PhotoMetadata* _tmp64_;
 			time_t _tmp65_;
 			MetadataDateTime* _tmp66_;
 			MetadataDateTime* _tmp67_;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = metadata;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = metadata_date_time_new (_tmp65_);
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (_tmp67_);
-#line 26758 "Photo.c"
+#line 26883 "Photo.c"
 		} else {
 			PhotoMetadata* _tmp68_;
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = metadata;
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26765 "Photo.c"
+#line 26890 "Photo.c"
 		}
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth");
-#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = metadata;
-#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight");
-#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = metadata;
-#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_exif_thumbnail (_tmp71_);
-#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = photo_has_user_generated_metadata (self);
-#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp72_) {
-#line 26783 "Photo.c"
+#line 26908 "Photo.c"
 			PhotoMetadata* _tmp73_;
-#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata;
-#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26789 "Photo.c"
+#line 26914 "Photo.c"
 		}
 	} else {
 		PhotoMetadata* _tmp74_;
-#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3738 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = metadata;
-#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3738 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26797 "Photo.c"
+#line 26922 "Photo.c"
 	}
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = TRUE;
-#line 26805 "Photo.c"
+#line 26930 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp77_;
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = photo_get_file_format (self);
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26812 "Photo.c"
+#line 26937 "Photo.c"
 	}
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26816 "Photo.c"
+#line 26941 "Photo.c"
 		PhotoMetadata* _tmp78_;
 		Dimensions _tmp79_ = {0};
 		PhotoMetadata* _tmp80_;
 		Orientation _tmp81_;
-#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = metadata;
-#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_ORIENTATION, &_tmp79_);
-#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = metadata;
-#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = photo_get_orientation (self);
-#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26833 "Photo.c"
+#line 26958 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp82_;
 		GdkPixbuf* _tmp83_;
 		Dimensions _tmp84_ = {0};
 		PhotoMetadata* _tmp85_;
-#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = metadata;
-#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = pixbuf;
-#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp83_, &_tmp84_);
-#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = metadata;
-#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26851 "Photo.c"
+#line 26976 "Photo.c"
 	}
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = dest_file;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = g_file_get_path (_tmp88_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp90_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = _tmp92_;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26881 "Photo.c"
+#line 27006 "Photo.c"
 	}
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = metadata;
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp86_, _tmp93_, &_inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp86_);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26901 "Photo.c"
+#line 27026 "Photo.c"
 	}
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 26911 "Photo.c"
+#line 27036 "Photo.c"
 }
 
 
@@ -26941,212 +27066,212 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	GFile* _tmp30_;
 	GFile* _tmp31_;
 	GError * _inner_error_ = NULL;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26944 "Photo.c"
+#line 27069 "Photo.c"
 	{
 		PhotoRow* _tmp0_;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26951 "Photo.c"
+#line 27076 "Photo.c"
 		{
 			PhotoFileFormat _tmp1_;
 			GFile* _tmp2_;
-#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_file_format (self);
-#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_file_format = _tmp1_;
-#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp2_;
-#line 26965 "Photo.c"
+#line 27090 "Photo.c"
 		}
-		__finally387:
+		__finally399:
 		{
 			PhotoRow* _tmp3_;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26974 "Photo.c"
+#line 27099 "Photo.c"
 		}
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 26984 "Photo.c"
+#line 27109 "Photo.c"
 		}
 	}
-#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _vala_file_format;
-#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_file_format_can_write (_tmp4_);
-#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 26993 "Photo.c"
+#line 27118 "Photo.c"
 		PhotoFileFormat _tmp6_;
-#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_get_system_default_format ();
-#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_file_format = _tmp6_;
-#line 26999 "Photo.c"
+#line 27124 "Photo.c"
 	}
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp9_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp10_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp8_);
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = ext;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ == NULL) {
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 27023 "Photo.c"
+#line 27148 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp13_;
 		PhotoFileFormatProperties* _tmp14_;
 		PhotoFileFormatProperties* _tmp15_;
 		const gchar* _tmp16_;
 		gboolean _tmp17_;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_file_format;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = photo_file_format_get_properties (_tmp13_);
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = ext;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_);
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = !_tmp17_;
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp15_);
-#line 27044 "Photo.c"
+#line 27169 "Photo.c"
 	}
-#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 27048 "Photo.c"
+#line 27173 "Photo.c"
 		PhotoFileFormat _tmp18_;
 		PhotoFileFormatProperties* _tmp19_;
 		PhotoFileFormatProperties* _tmp20_;
 		gchar* _tmp21_;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _vala_file_format;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_format_get_properties (_tmp18_);
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_);
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		ext = _tmp21_;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3772 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp20_);
-#line 27067 "Photo.c"
+#line 27192 "Photo.c"
 	}
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = ext;
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _ ("modified"), _tmp23_);
-#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_basename = _tmp24_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = g_file_get_parent (backing);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = _tmp26_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = generate_unique_file (_tmp27_, editable_basename, &_tmp28_, &_inner_error_);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	collision = _tmp28_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp27_);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp30_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (editable_basename);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (backing);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 27105 "Photo.c"
+#line 27230 "Photo.c"
 	}
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp25_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = NULL;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp31_;
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp25_);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (editable_basename);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (backing);
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (file_format) {
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 		*file_format = _vala_file_format;
-#line 27127 "Photo.c"
+#line 27252 "Photo.c"
 	}
-#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27131 "Photo.c"
+#line 27256 "Photo.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27138 "Photo.c"
+#line 27263 "Photo.c"
 }
 
 
 static void _g_list_free__g_object_unref0_ (GList* self) {
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_free (self);
-#line 27147 "Photo.c"
+#line 27272 "Photo.c"
 }
 
 
@@ -27184,266 +27309,266 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	GPid _tmp35_ = 0;
 	gboolean _tmp36_;
 	GError * _inner_error_ = NULL;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27191 "Photo.c"
+#line 27316 "Photo.c"
 		ConfigFacade* _tmp2_;
 		ConfigFacade* _tmp3_;
 		gchar* _tmp4_;
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27207 "Photo.c"
+#line 27332 "Photo.c"
 	} else {
 		ConfigFacade* _tmp5_;
 		ConfigFacade* _tmp6_;
 		gchar* _tmp7_;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = config_facade_get_instance ();
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp7_;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 27224 "Photo.c"
+#line 27349 "Photo.c"
 	}
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
-#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
 	commandline = _tmp8_;
-#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = commandline;
-#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = is_string_empty (_tmp9_);
-#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3785 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3785 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3785 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3785 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27244 "Photo.c"
+#line 27369 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
 		const gchar* _tmp12_;
 		GAppInfo* _tmp13_;
 		GAppInfo* _tmp14_;
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = commandline;
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_);
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp13_;
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27259 "Photo.c"
-			goto __catch388_g_error;
+#line 27384 "Photo.c"
+			goto __catch400_g_error;
 		}
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = NULL;
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3789 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = _tmp14_;
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp11_);
-#line 27272 "Photo.c"
+#line 27397 "Photo.c"
 	}
-	goto __finally388;
-	__catch388_g_error:
+	goto __finally400;
+	__catch400_g_error:
 	{
 		GError* er = NULL;
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		er = _inner_error_;
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3792 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3792 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = NULL;
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (er);
-#line 27288 "Photo.c"
+#line 27413 "Photo.c"
 	}
-	__finally388:
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally400:
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27293 "Photo.c"
+#line 27418 "Photo.c"
 		gboolean _tmp15_ = FALSE;
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp15_;
-#line 27305 "Photo.c"
+#line 27430 "Photo.c"
 	}
-#line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3795 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
-#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = file;
-#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3796 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = g_list_insert (files, _tmp17_, -1);
-#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = app;
-#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_ != NULL) {
-#line 27319 "Photo.c"
+#line 27444 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GAppInfo* _tmp20_;
 		GList* _tmp21_;
 		gboolean _tmp22_;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = app;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = files;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = g_app_info_launch (_tmp20_, _tmp21_, NULL, &_inner_error_);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp22_;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27334 "Photo.c"
+#line 27459 "Photo.c"
 			gboolean _tmp23_ = FALSE;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			__g_list_free__g_object_unref0_0 (files);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (app);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (commandline);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp0_);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp23_;
-#line 27348 "Photo.c"
+#line 27473 "Photo.c"
 		}
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp19_;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27362 "Photo.c"
+#line 27487 "Photo.c"
 	}
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_new0 (gchar*, 2 + 1);
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = _tmp24_;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv_length1 = 2;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_argv_size_ = argv_length1;
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = argv;
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25__length1 = argv_length1;
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = commandline;
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_strdup (_tmp26_);
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp25_[0]);
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_[0] = _tmp27_;
-#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp25_[0];
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = argv;
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29__length1 = argv_length1;
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = file;
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = g_file_get_path (_tmp30_);
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp29_[1]);
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_[1] = _tmp31_;
-#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp29_[1];
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = argv;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34__length1 = argv_length1;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_spawn_async ("/", _tmp34_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp35_, &_inner_error_);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	child_pid = _tmp35_;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp36_;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27412 "Photo.c"
+#line 27537 "Photo.c"
 		gboolean _tmp37_ = FALSE;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp37_;
-#line 27428 "Photo.c"
+#line 27553 "Photo.c"
 	}
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp33_;
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	__g_list_free__g_object_unref0_0 (files);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (app);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (commandline);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27444 "Photo.c"
+#line 27569 "Photo.c"
 }
 
 
@@ -27452,25 +27577,25 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
 	GFile* _tmp1_;
 	PhotoFileFormat _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_get_master_file_format (self);
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_);
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27471 "Photo.c"
+#line 27596 "Photo.c"
 	}
 }
 
@@ -27489,248 +27614,248 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	GFile* _tmp47_;
 	PhotoFileFormat _tmp48_;
 	GError * _inner_error_ = NULL;
-#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3823 "/home/jens/Source/shotwell/src/Photo.vala"
 	current_editable_file = NULL;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	create_editable_file = NULL;
-#line 27496 "Photo.c"
+#line 27621 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27503 "Photo.c"
+#line 27628 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
 			GFile* _tmp6_;
-#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27514 "Photo.c"
+#line 27639 "Photo.c"
 				PhotoBackingReaders* _tmp3_;
 				PhotoFileReader* _tmp4_;
 				GFile* _tmp5_;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 				current_editable_file = _tmp5_;
-#line 27528 "Photo.c"
+#line 27653 "Photo.c"
 			}
-#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = current_editable_file;
-#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ == NULL) {
-#line 27534 "Photo.c"
+#line 27659 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
 				GFile* _tmp9_;
 				GFile* _tmp10_;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_);
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp8_;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp9_;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27547 "Photo.c"
-					goto __finally389;
+#line 27672 "Photo.c"
+					goto __finally401;
 				}
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = NULL;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				create_editable_file = _tmp10_;
-#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp7_);
-#line 27560 "Photo.c"
+#line 27685 "Photo.c"
 			} else {
 				PhotoBackingReaders* _tmp11_;
 				PhotoFileReader* _tmp12_;
 				PhotoFileFormat _tmp13_;
-#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->readers;
-#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->editable;
-#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp13_;
-#line 27573 "Photo.c"
+#line 27698 "Photo.c"
 			}
 		}
-		__finally389:
+		__finally401:
 		{
 			PhotoBackingReaders* _tmp14_;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->priv->readers;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27583 "Photo.c"
+#line 27708 "Photo.c"
 		}
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27595 "Photo.c"
+#line 27720 "Photo.c"
 		}
 	}
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = create_editable_file;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 27602 "Photo.c"
+#line 27727 "Photo.c"
 		GFile* _tmp18_;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = current_editable_file;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp18_ != NULL;
-#line 27608 "Photo.c"
+#line 27733 "Photo.c"
 	} else {
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27612 "Photo.c"
+#line 27737 "Photo.c"
 	}
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27616 "Photo.c"
+#line 27741 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GFile* _tmp20_;
 		gboolean _tmp21_;
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = current_editable_file;
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_file_query_exists (_tmp20_, NULL);
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp21_) {
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27628 "Photo.c"
+#line 27753 "Photo.c"
 		} else {
 			gboolean _tmp22_;
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_has_transformations (self);
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp22_;
-#line 27635 "Photo.c"
+#line 27760 "Photo.c"
 		}
-#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3839 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27639 "Photo.c"
+#line 27764 "Photo.c"
 	} else {
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27643 "Photo.c"
+#line 27768 "Photo.c"
 	}
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27647 "Photo.c"
+#line 27772 "Photo.c"
 		GFile* _tmp23_;
 		GFile* _tmp24_;
-#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = current_editable_file;
-#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 		create_editable_file = _tmp24_;
-#line 27658 "Photo.c"
+#line 27783 "Photo.c"
 	}
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = create_editable_file;
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != NULL) {
-#line 27664 "Photo.c"
+#line 27789 "Photo.c"
 		PhotoFileFormat _tmp27_;
 		gboolean _tmp28_;
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = editable_file_format;
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27673 "Photo.c"
+#line 27798 "Photo.c"
 	} else {
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27677 "Photo.c"
+#line 27802 "Photo.c"
 	}
-#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3843 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27681 "Photo.c"
+#line 27806 "Photo.c"
 		PhotoFileFormat _tmp40_;
 		GFile* _tmp41_;
 		GFile* _tmp42_;
 		GFile* _tmp43_;
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27688 "Photo.c"
+#line 27813 "Photo.c"
 		{
 			GFile* _tmp29_;
 			Scaling _tmp30_ = {0};
 			PhotoFileFormat _tmp31_;
-#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = create_editable_file;
-#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_for_original (&_tmp30_);
-#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = editable_file_format;
-#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
-#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27703 "Photo.c"
-				goto __catch390_g_error;
+#line 27828 "Photo.c"
+				goto __catch402_g_error;
 			}
 		}
-		goto __finally390;
-		__catch390_g_error:
+		goto __finally402;
+		__catch402_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp38_;
 			GError* _tmp39_;
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27717 "Photo.c"
+#line 27842 "Photo.c"
 			{
 				GFile* _tmp32_;
-#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = create_editable_file;
-#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
-#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27726 "Photo.c"
-					goto __catch391_g_error;
+#line 27851 "Photo.c"
+					goto __catch403_g_error;
 				}
 			}
-			goto __finally391;
-			__catch391_g_error:
+			goto __finally403;
+			__catch403_g_error:
 			{
 				GError* delete_err = NULL;
 				GFile* _tmp33_;
@@ -27738,169 +27863,169 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				gchar* _tmp35_;
 				GError* _tmp36_;
 				const gchar* _tmp37_;
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				delete_err = _inner_error_;
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = create_editable_file;
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = g_file_get_path (_tmp33_);
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_;
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = delete_err;
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_->message;
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:3836: Unable to delete editable file %s after export error:" \
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:3855: Unable to delete editable file %s after export error:" \
 " %s", _tmp35_, _tmp37_);
-#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp35_);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (delete_err);
-#line 27759 "Photo.c"
+#line 27884 "Photo.c"
 			}
-			__finally391:
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally403:
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/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);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 27778 "Photo.c"
+#line 27903 "Photo.c"
 			}
-#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
-#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _g_error_copy0 (_tmp38_);
-#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = _tmp39_;
-#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 27788 "Photo.c"
-			goto __finally390;
+#line 27913 "Photo.c"
+			goto __finally402;
 		}
-		__finally390:
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally402:
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27802 "Photo.c"
+#line 27927 "Photo.c"
 		}
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = create_editable_file;
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27820 "Photo.c"
+#line 27945 "Photo.c"
 		}
-#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3865 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
-#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3865 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3865 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3865 "/home/jens/Source/shotwell/src/Photo.vala"
 		current_editable_file = _tmp43_;
-#line 27830 "Photo.c"
+#line 27955 "Photo.c"
 	}
-#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
-#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp44_ != NULL, "current_editable_file != null");
-#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = self->priv->editable_monitor;
-#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_ == NULL) {
-#line 27840 "Photo.c"
+#line 27965 "Photo.c"
 		GFile* _tmp46_;
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_start_monitoring_editable (self, _tmp46_, &_inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27856 "Photo.c"
+#line 27981 "Photo.c"
 		}
 	}
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = current_editable_file;
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = photo_get_file_format (self);
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_);
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27875 "Photo.c"
+#line 28000 "Photo.c"
 	}
-#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (create_editable_file);
-#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (current_editable_file);
-#line 27881 "Photo.c"
+#line 28006 "Photo.c"
 }
 
 
 void photo_revert_to_master (Photo* self, gboolean notify) {
 	gboolean _tmp0_;
-#line 3858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = notify;
-#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27893 "Photo.c"
+#line 28018 "Photo.c"
 }
 
 
 static void _photo_on_editable_file_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
-#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3888 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27900 "Photo.c"
+#line 28025 "Photo.c"
 }
 
 
@@ -27912,45 +28037,45 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 	GFileMonitor* _tmp4_;
 	GFileMonitor* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_halt_monitoring_editable (self);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3885 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3885 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable");
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_);
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp3_;
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27934 "Photo.c"
+#line 28059 "Photo.c"
 	}
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = NULL;
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3887 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = _tmp4_;
-#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = self->priv->editable_monitor;
-#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3888 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0);
-#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 27950 "Photo.c"
+#line 28075 "Photo.c"
 }
 
 
@@ -27962,49 +28087,49 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	GFileMonitor* _tmp4_;
 	guint _tmp5_;
 	GFileMonitor* _tmp6_;
-#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3891 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_monitor;
-#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3893 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27970 "Photo.c"
+#line 28095 "Photo.c"
 	}
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp1_;
-#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3897 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3897 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 27980 "Photo.c"
+#line 28105 "Photo.c"
 		GFile* _tmp3_;
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp3_);
-#line 27986 "Photo.c"
+#line 28111 "Photo.c"
 	}
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp5_, NULL, FALSE);
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self);
-#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3901 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->editable_monitor;
-#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3901 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_monitor_cancel (_tmp6_);
-#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3902 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = NULL;
-#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3891 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 28004 "Photo.c"
+#line 28129 "Photo.c"
 }
 
 
@@ -28016,174 +28141,174 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
 	PhotoFileReader* _tmp4_;
 	PhotoFileReader* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3910 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, FALSE);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, _tmp5_, &_inner_error_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp3_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28046 "Photo.c"
+#line 28171 "Photo.c"
 	}
 }
 
 
 static void photo_update_editable_attributes (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3914 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, TRUE, NULL, &_inner_error_);
-#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28063 "Photo.c"
+#line 28188 "Photo.c"
 	}
 }
 
 
 void photo_reimport_editable (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, NULL, &_inner_error_);
-#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28080 "Photo.c"
+#line 28205 "Photo.c"
 	}
 }
 
 
-static void _vala_array_add103 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28092 "Photo.c"
+#line 28217 "Photo.c"
 	}
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28098 "Photo.c"
+#line 28223 "Photo.c"
 }
 
 
-static void _vala_array_add104 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28109 "Photo.c"
+#line 28234 "Photo.c"
 	}
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28115 "Photo.c"
+#line 28240 "Photo.c"
 }
 
 
-static void _vala_array_add105 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add109 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28126 "Photo.c"
+#line 28251 "Photo.c"
 	}
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28132 "Photo.c"
+#line 28257 "Photo.c"
 }
 
 
-static void _vala_array_add106 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add110 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28143 "Photo.c"
+#line 28268 "Photo.c"
 	}
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28149 "Photo.c"
+#line 28274 "Photo.c"
 }
 
 
-static void _vala_array_add107 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add111 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28160 "Photo.c"
+#line 28285 "Photo.c"
 	}
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28166 "Photo.c"
+#line 28291 "Photo.c"
 }
 
 
-static void _vala_array_add108 (gchar** * array, int* length, int* size, gchar* value) {
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+static void _vala_array_add112 (gchar** * array, int* length, int* size, gchar* value) {
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28177 "Photo.c"
+#line 28302 "Photo.c"
 	}
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28183 "Photo.c"
+#line 28308 "Photo.c"
 }
 
 
@@ -28226,168 +28351,168 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	gchar** _tmp131_;
 	gint _tmp131__length1;
 	GError * _inner_error_ = NULL;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader));
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = only_attributes;
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 28234 "Photo.c"
+#line 28359 "Photo.c"
 		PhotoFileReader* _tmp3_;
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = new_reader;
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 28240 "Photo.c"
+#line 28365 "Photo.c"
 	} else {
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28244 "Photo.c"
+#line 28369 "Photo.c"
 	}
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 28250 "Photo.c"
+#line 28375 "Photo.c"
 	} else {
 		gboolean _tmp4_;
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28257 "Photo.c"
+#line 28382 "Photo.c"
 	}
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_editable_reader (self);
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_reader = _tmp5_;
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = new_reader;
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp7_;
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 28271 "Photo.c"
+#line 28396 "Photo.c"
 		PhotoFileReader* _tmp8_;
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28277 "Photo.c"
+#line 28402 "Photo.c"
 	}
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp9_;
-#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = reader;
-#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ == NULL) {
-#line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_detach_editable (self, FALSE, TRUE, TRUE);
-#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28295 "Photo.c"
+#line 28420 "Photo.c"
 	}
-#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
-#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 	filesize_changed = FALSE;
-#line 3920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_new_editable = FALSE;
-#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp11_);
-#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp11_;
-#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = reader;
-#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp13_;
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_query_backing_photo_row (self, _tmp14_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp15_, &_inner_error_);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp15_;
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp16_;
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28337 "Photo.c"
+#line 28462 "Photo.c"
 	}
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = backing_photo_id_is_invalid (&editable_id);
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 28343 "Photo.c"
+#line 28468 "Photo.c"
 		BackingPhotoRow* _tmp18_;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28349 "Photo.c"
+#line 28474 "Photo.c"
 			BackingPhotoTable* _tmp19_;
 			BackingPhotoTable* _tmp20_;
 			BackingPhotoRow* _tmp21_;
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = backing_photo_table_get_instance ();
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = backing;
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp20_);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28379 "Photo.c"
+#line 28504 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp22_;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28387 "Photo.c"
+#line 28512 "Photo.c"
 				{
 					PhotoTable* _tmp23_;
 					PhotoTable* _tmp24_;
@@ -28400,91 +28525,91 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp31_;
 					BackingPhotoRow* _tmp32_;
 					Orientation _tmp33_;
-#line 3935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3954 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = TRUE;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 					filesize_changed = TRUE;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = photo_table_get_instance ();
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = self->row;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = backing;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp26_->id;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					_database_table_unref0 (_tmp24_);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3957 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28420 "Photo.c"
-						goto __finally392;
+#line 28545 "Photo.c"
+						goto __finally404;
 					}
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _backing_photo_row_ref0 (_tmp28_);
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp29_;
-#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = self->priv->editable;
-#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = _backing_photo_row_ref0 (_tmp30_);
-#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp31_;
-#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3960 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = self->backing_photo_row;
-#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3960 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = _tmp32_->original_orientation;
-#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3960 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp33_);
-#line 28445 "Photo.c"
+#line 28570 "Photo.c"
 				}
-				__finally392:
+				__finally404:
 				{
 					PhotoRow* _tmp34_;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = self->row;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28454 "Photo.c"
+#line 28579 "Photo.c"
 				}
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28472 "Photo.c"
+#line 28597 "Photo.c"
 				}
 			}
 		}
-#line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28478 "Photo.c"
+#line 28603 "Photo.c"
 	}
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = only_attributes;
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 28484 "Photo.c"
+#line 28609 "Photo.c"
 		gboolean _tmp36_;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
@@ -28497,155 +28622,155 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		glong _tmp51_;
 		GFileInfo* _tmp52_;
 		gint64 _tmp53_;
-#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = backing_photo_id_is_valid (&editable_id);
-#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28501 "Photo.c"
+#line 28626 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
 			GFile* _tmp38_;
 			GFileInfo* _tmp39_;
 			GFileInfo* _tmp40_;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = file;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_);
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp39_;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28515 "Photo.c"
-				goto __catch393_g_error;
+#line 28640 "Photo.c"
+				goto __catch405_g_error;
 			}
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = NULL;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			info = _tmp40_;
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp37_);
-#line 28528 "Photo.c"
+#line 28653 "Photo.c"
 		}
-		goto __finally393;
-		__catch393_g_error:
+		goto __finally405;
+		__catch405_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp41_;
 			gchar* _tmp42_;
 			GError* _tmp43_;
 			const gchar* _tmp44_;
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = err;
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_->message;
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:3955: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_);
-#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:3974: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_);
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp42_);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3975 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_detach_editable (self, FALSE, TRUE, TRUE);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28572 "Photo.c"
+#line 28697 "Photo.c"
 		}
-		__finally393:
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally405:
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3971 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28593 "Photo.c"
+#line 28718 "Photo.c"
 		}
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_file_info_get_modification_time (_tmp45_, &_tmp46_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 		timestamp = _tmp46_;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = backing_photo_table_get_instance ();
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = editable_id;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = timestamp;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_.tv_sec;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = info;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = g_file_info_get_size (_tmp52_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp48_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28637 "Photo.c"
+#line 28762 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp54_;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = self->row;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28645 "Photo.c"
+#line 28770 "Photo.c"
 			{
 				BackingPhotoRow* _tmp55_;
 				time_t _tmp56_;
@@ -28661,145 +28786,145 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				BackingPhotoRow* _tmp66_;
 				GFileInfo* _tmp67_;
 				gint64 _tmp68_;
-#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = self->priv->editable;
-#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = _tmp55_->timestamp;
-#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = timestamp;
-#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = _tmp57_.tv_sec;
-#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 				timestamp_changed = _tmp56_ != ((time_t) _tmp58_);
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->editable;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp59_->filesize;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = info;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = g_file_info_get_size (_tmp61_);
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 				filesize_changed = _tmp60_ != _tmp62_;
-#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = self->priv->editable;
-#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = timestamp;
-#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = _tmp64_.tv_sec;
-#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_->timestamp = (time_t) _tmp65_;
-#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3989 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = self->priv->editable;
-#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3989 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = info;
-#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3989 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp68_ = g_file_info_get_size (_tmp67_);
-#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3989 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_->filesize = _tmp68_;
-#line 28697 "Photo.c"
+#line 28822 "Photo.c"
 			}
-			__finally394:
+			__finally406:
 			{
 				PhotoRow* _tmp69_;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = self->row;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28706 "Photo.c"
+#line 28831 "Photo.c"
 			}
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (info);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28726 "Photo.c"
+#line 28851 "Photo.c"
 			}
 		}
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28731 "Photo.c"
+#line 28856 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
 		gboolean _tmp71_;
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28739 "Photo.c"
+#line 28864 "Photo.c"
 			gboolean _tmp72_;
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = is_new_editable;
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = !_tmp72_;
-#line 28745 "Photo.c"
+#line 28870 "Photo.c"
 		} else {
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28749 "Photo.c"
+#line 28874 "Photo.c"
 		}
-#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28753 "Photo.c"
+#line 28878 "Photo.c"
 			BackingPhotoRow* _tmp73_;
 			BackingPhotoID _tmp74_;
 			BackingPhotoTable* _tmp75_;
 			BackingPhotoTable* _tmp76_;
 			BackingPhotoRow* _tmp77_;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3998 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = backing;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3998 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = editable_id;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3998 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_->id = _tmp74_;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = backing_photo_table_get_instance ();
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _tmp75_;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = backing;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp76_);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28791 "Photo.c"
+#line 28916 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp78_;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = self->row;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28799 "Photo.c"
+#line 28924 "Photo.c"
 				{
 					BackingPhotoRow* _tmp79_;
 					time_t _tmp80_;
@@ -28815,232 +28940,232 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp90_;
 					BackingPhotoRow* _tmp91_;
 					Orientation _tmp92_;
-#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp79_ = self->priv->editable;
-#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp80_ = _tmp79_->timestamp;
-#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp81_ = backing;
-#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp82_ = _tmp81_->timestamp;
-#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = _tmp80_ != _tmp82_;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp83_ = self->priv->editable;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp84_ = _tmp83_->filesize;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp85_ = backing;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp86_ = _tmp85_->filesize;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 					filesize_changed = _tmp84_ != _tmp86_;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = backing;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = _backing_photo_row_ref0 (_tmp87_);
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp88_;
-#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = self->priv->editable;
-#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _backing_photo_row_ref0 (_tmp89_);
-#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp90_;
-#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp91_ = self->backing_photo_row;
-#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_->original_orientation;
-#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp92_);
-#line 28857 "Photo.c"
+#line 28982 "Photo.c"
 				}
-				__finally395:
+				__finally407:
 				{
 					PhotoRow* _tmp93_;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = self->row;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28866 "Photo.c"
+#line 28991 "Photo.c"
 				}
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28884 "Photo.c"
+#line 29009 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = new_reader;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp94_ != NULL) {
-#line 28893 "Photo.c"
+#line 29018 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp95_;
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->readers;
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28900 "Photo.c"
+#line 29025 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp96_;
 				PhotoFileReader* _tmp97_;
 				PhotoFileReader* _tmp98_;
-#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = self->priv->readers;
-#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = new_reader;
-#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = _photo_file_adapter_ref0 (_tmp97_);
-#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp96_->editable);
-#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_->editable = _tmp98_;
-#line 28915 "Photo.c"
+#line 29040 "Photo.c"
 			}
-			__finally396:
+			__finally408:
 			{
 				PhotoBackingReaders* _tmp99_;
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->readers;
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28924 "Photo.c"
+#line 29049 "Photo.c"
 			}
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28942 "Photo.c"
+#line 29067 "Photo.c"
 			}
 		}
 	}
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = only_attributes;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp101_) {
-#line 28950 "Photo.c"
+#line 29075 "Photo.c"
 		PhotoFileReader* _tmp102_;
 		PhotoFileReader* _tmp103_;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = old_reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28959 "Photo.c"
+#line 29084 "Photo.c"
 	} else {
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28963 "Photo.c"
+#line 29088 "Photo.c"
 	}
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28967 "Photo.c"
+#line 29092 "Photo.c"
 		GFile* _tmp104_ = NULL;
 		PhotoFileReader* _tmp105_;
 		GFile* _tmp108_ = NULL;
 		PhotoFileReader* _tmp109_;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = old_reader;
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 28978 "Photo.c"
+#line 29103 "Photo.c"
 			PhotoFileReader* _tmp106_;
 			GFile* _tmp107_;
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp106_ = old_reader;
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = _tmp107_;
-#line 28989 "Photo.c"
+#line 29114 "Photo.c"
 		} else {
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = NULL;
-#line 28995 "Photo.c"
+#line 29120 "Photo.c"
 		}
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = new_reader;
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp109_ != NULL) {
-#line 29001 "Photo.c"
+#line 29126 "Photo.c"
 			PhotoFileReader* _tmp110_;
 			GFile* _tmp111_;
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp110_ = new_reader;
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp111_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = _tmp111_;
-#line 29012 "Photo.c"
+#line 29137 "Photo.c"
 		} else {
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = NULL;
-#line 29018 "Photo.c"
+#line 29143 "Photo.c"
 		}
-#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp108_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp104_);
-#line 29026 "Photo.c"
+#line 29151 "Photo.c"
 	}
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = _tmp112_;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list_length1 = 0;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_list_size_ = alteration_list_length1;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4025 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = timestamp_changed;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4025 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp113_) {
-#line 29040 "Photo.c"
+#line 29165 "Photo.c"
 		gchar** _tmp114_;
 		gint _tmp114__length1;
 		gchar* _tmp115_;
@@ -29048,59 +29173,59 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp116__length1;
 		gchar* _tmp117_;
 		gboolean _tmp118_;
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = alteration_list;
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114__length1 = alteration_list_length1;
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = g_strdup ("metadata:editable-timestamp");
-#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = alteration_list;
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116__length1 = alteration_list_length1;
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = g_strdup ("metadata:baseline-timestamp");
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
-#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
+#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = photo_is_editable_source (self);
-#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp118_) {
-#line 29068 "Photo.c"
+#line 29193 "Photo.c"
 			gchar** _tmp119_;
 			gint _tmp119__length1;
 			gchar* _tmp120_;
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119_ = alteration_list;
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119__length1 = alteration_list_length1;
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
-#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 29080 "Photo.c"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
+#line 29205 "Photo.c"
 		}
 	}
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = filesize_changed;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp122_) {
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = TRUE;
-#line 29089 "Photo.c"
+#line 29214 "Photo.c"
 	} else {
 		PhotoFileReader* _tmp123_;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = new_reader;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = _tmp123_ != NULL;
-#line 29096 "Photo.c"
+#line 29221 "Photo.c"
 	}
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29100 "Photo.c"
+#line 29225 "Photo.c"
 		gchar** _tmp124_;
 		gint _tmp124__length1;
 		gchar* _tmp125_;
@@ -29108,79 +29233,79 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp126__length1;
 		gchar* _tmp127_;
 		gboolean _tmp128_;
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124_ = alteration_list;
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124__length1 = alteration_list_length1;
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp125_ = g_strdup ("image:editable");
-#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126_ = alteration_list;
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126__length1 = alteration_list_length1;
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp127_ = g_strdup ("image:baseline");
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
-#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
+#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp128_ = photo_is_editable_source (self);
-#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp128_) {
-#line 29128 "Photo.c"
+#line 29253 "Photo.c"
 			gchar** _tmp129_;
 			gint _tmp129__length1;
 			gchar* _tmp130_;
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129_ = alteration_list;
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129__length1 = alteration_list_length1;
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp130_ = g_strdup ("image:source");
-#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29140 "Photo.c"
+#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
+#line 29265 "Photo.c"
 		}
 	}
-#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = alteration_list;
-#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131__length1 = alteration_list_length1;
-#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp131__length1 > 0) {
-#line 29149 "Photo.c"
+#line 29274 "Photo.c"
 		gchar** _tmp132_;
 		gint _tmp132__length1;
 		Alteration* _tmp133_;
 		Alteration* _tmp134_;
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132_ = alteration_list;
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132__length1 = alteration_list_length1;
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1);
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp134_ = _tmp133_;
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
-#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp134_);
-#line 29166 "Photo.c"
+#line 29291 "Photo.c"
 	}
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (old_reader);
-#line 29180 "Photo.c"
+#line 29305 "Photo.c"
 }
 
 
@@ -29196,96 +29321,96 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	gboolean _tmp43_ = FALSE;
 	gboolean _tmp44_;
 	GError * _inner_error_ = NULL;
-#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_halt_monitoring_editable (self);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4048 "/home/jens/Source/shotwell/src/Photo.vala"
 	has_editable = FALSE;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_file = NULL;
-#line 29204 "Photo.c"
+#line 29329 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29211 "Photo.c"
+#line 29336 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29221 "Photo.c"
+#line 29346 "Photo.c"
 				PhotoBackingReaders* _tmp3_;
 				PhotoFileReader* _tmp4_;
 				GFile* _tmp5_;
 				PhotoBackingReaders* _tmp6_;
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable_file);
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file = _tmp5_;
-#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->readers;
-#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp6_->editable);
-#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_->editable = NULL;
-#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				has_editable = TRUE;
-#line 29244 "Photo.c"
+#line 29369 "Photo.c"
 			}
 		}
-		__finally397:
+		__finally409:
 		{
 			PhotoBackingReaders* _tmp7_;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29254 "Photo.c"
+#line 29379 "Photo.c"
 		}
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/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 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29266 "Photo.c"
+#line 29391 "Photo.c"
 		}
 	}
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = has_editable;
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 29273 "Photo.c"
+#line 29398 "Photo.c"
 		BackingPhotoID editable_id = {0};
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4059 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29277 "Photo.c"
+#line 29402 "Photo.c"
 		{
 			{
 				PhotoRow* _tmp9_;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29285 "Photo.c"
+#line 29410 "Photo.c"
 				{
 					PhotoRow* _tmp10_;
 					BackingPhotoID _tmp11_;
@@ -29293,237 +29418,237 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					PhotoRow* _tmp16_;
 					BackingPhotoRow* _tmp17_;
 					BackingPhotoRow* _tmp18_;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->row;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp10_->editable_id;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
 					editable_id = _tmp11_;
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = backing_photo_id_is_valid (&editable_id);
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp12_) {
-#line 29303 "Photo.c"
+#line 29428 "Photo.c"
 						PhotoTable* _tmp13_;
 						PhotoTable* _tmp14_;
 						PhotoRow* _tmp15_;
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = photo_table_get_instance ();
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = _tmp13_;
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_);
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						_database_table_unref0 (_tmp14_);
-#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29319 "Photo.c"
-							goto __finally399;
+#line 29444 "Photo.c"
+							goto __finally411;
 						}
 					}
-#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_->master;
-#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = _backing_photo_row_ref0 (_tmp17_);
-#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp18_;
-#line 29333 "Photo.c"
+#line 29458 "Photo.c"
 				}
-				__finally399:
+				__finally411:
 				{
 					PhotoRow* _tmp19_;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = self->row;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29342 "Photo.c"
+#line 29467 "Photo.c"
 				}
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29348 "Photo.c"
-						goto __catch398_database_error;
+#line 29473 "Photo.c"
+						goto __catch410_database_error;
 					}
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/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);
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29359 "Photo.c"
+#line 29484 "Photo.c"
 				}
 			}
 		}
-		goto __finally398;
-		__catch398_database_error:
+		goto __finally410;
+		__catch410_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_;
 			const gchar* _tmp21_;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = err;
-#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_->message;
-#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4049: Unable to remove editable from PhotoTable: %s", _tmp21_);
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4068: Unable to remove editable from PhotoTable: %s", _tmp21_);
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29381 "Photo.c"
+#line 29506 "Photo.c"
 		}
-		__finally398:
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally410:
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/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 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29394 "Photo.c"
+#line 29519 "Photo.c"
 		}
 		{
 			gboolean _tmp22_;
-#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
-#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29402 "Photo.c"
+#line 29527 "Photo.c"
 				BackingPhotoTable* _tmp23_;
 				BackingPhotoTable* _tmp24_;
 				BackingPhotoID _tmp25_;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = backing_photo_table_get_instance ();
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _tmp23_;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = editable_id;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_);
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp24_);
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29420 "Photo.c"
-						goto __catch400_database_error;
+#line 29545 "Photo.c"
+						goto __catch412_database_error;
 					}
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/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);
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4073 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29431 "Photo.c"
+#line 29556 "Photo.c"
 				}
 			}
 		}
-		goto __finally400;
-		__catch400_database_error:
+		goto __finally412;
+		__catch412_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp26_;
 			const gchar* _tmp27_;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = err;
-#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_->message;
-#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4056: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4075: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29453 "Photo.c"
+#line 29578 "Photo.c"
 		}
-		__finally400:
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally412:
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/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 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4071 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29466 "Photo.c"
+#line 29591 "Photo.c"
 		}
 	}
-#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = remove_transformations;
-#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4080 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_internal_remove_all_transformations (self, FALSE);
-#line 29475 "Photo.c"
+#line 29600 "Photo.c"
 	}
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = has_editable;
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_) {
-#line 29481 "Photo.c"
+#line 29606 "Photo.c"
 		GFile* _tmp30_;
-#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = editable_file;
-#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29489 "Photo.c"
+#line 29614 "Photo.c"
 	}
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = delete_editable;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp32_) {
-#line 29495 "Photo.c"
+#line 29620 "Photo.c"
 		GFile* _tmp33_;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = editable_file;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp33_ != NULL;
-#line 29501 "Photo.c"
+#line 29626 "Photo.c"
 	} else {
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29505 "Photo.c"
+#line 29630 "Photo.c"
 	}
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4087 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29509 "Photo.c"
+#line 29634 "Photo.c"
 		{
 			GFile* _tmp34_;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4089 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = editable_file;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4089 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4089 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29518 "Photo.c"
-				goto __catch401_g_error;
+#line 29643 "Photo.c"
+				goto __catch413_g_error;
 			}
 		}
-		goto __finally401;
-		__catch401_g_error:
+		goto __finally413;
+		__catch413_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_;
@@ -29533,116 +29658,116 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			gchar* _tmp39_;
 			GError* _tmp40_;
 			const gchar* _tmp41_;
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = editable_file;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = g_file_get_path (_tmp35_);
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp36_;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _tmp38_;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = err;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = _tmp40_->message;
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4072: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_);
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_warning ("Photo.vala:4091: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_);
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp39_);
-#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp37_);
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29559 "Photo.c"
+#line 29684 "Photo.c"
 		}
-		__finally401:
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally413:
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/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 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29572 "Photo.c"
+#line 29697 "Photo.c"
 		}
 	}
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = has_editable;
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_) {
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = TRUE;
-#line 29581 "Photo.c"
+#line 29706 "Photo.c"
 	} else {
 		gboolean _tmp45_;
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29588 "Photo.c"
+#line 29713 "Photo.c"
 	}
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29592 "Photo.c"
+#line 29717 "Photo.c"
 		gboolean _tmp46_;
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29598 "Photo.c"
+#line 29723 "Photo.c"
 	} else {
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29602 "Photo.c"
+#line 29727 "Photo.c"
 	}
-#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29606 "Photo.c"
+#line 29731 "Photo.c"
 		Alteration* _tmp47_;
 		Alteration* _tmp48_;
-#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_new ("image", "revert");
-#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
-#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp48_);
-#line 29617 "Photo.c"
+#line 29742 "Photo.c"
 	}
-#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29621 "Photo.c"
+#line 29746 "Photo.c"
 }
 
 
 static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
-#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4119 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_reimport_editable ((Photo*) self);
-#line 29628 "Photo.c"
+#line 29753 "Photo.c"
 }
 
 
 static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
-#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_update_editable_attributes ((Photo*) self);
-#line 29635 "Photo.c"
+#line 29760 "Photo.c"
 }
 
 
 static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
-#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4137 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_remove_editable ((Photo*) self);
-#line 29642 "Photo.c"
+#line 29767 "Photo.c"
 }
 
 
@@ -29654,20 +29779,20 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 	gchar* _tmp16_;
 	GFileMonitorEvent _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29660 "Photo.c"
+#line 29785 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29667 "Photo.c"
+#line 29792 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_;
 			PhotoFileReader* _tmp2_;
@@ -29678,181 +29803,181 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			GFile* _tmp7_;
 			gboolean _tmp8_;
 			gboolean _tmp9_;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp2_ != NULL, "readers.editable != null");
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = file;
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->editable;
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_file_equal (_tmp3_, _tmp7_);
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = !_tmp8_;
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp7_);
-#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp9_) {
-#line 29702 "Photo.c"
+#line 29827 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp10_;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->priv->readers;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29709 "Photo.c"
+#line 29834 "Photo.c"
 				}
-#line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29713 "Photo.c"
+#line 29838 "Photo.c"
 			}
 		}
-		__finally402:
+		__finally414:
 		{
 			PhotoBackingReaders* _tmp11_;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->readers;
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29723 "Photo.c"
+#line 29848 "Photo.c"
 		}
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/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 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29733 "Photo.c"
+#line 29858 "Photo.c"
 		}
 	}
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = event;
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_);
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = g_file_get_path (_tmp14_);
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4094: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4113: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp16_);
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = event;
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp17_) {
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGED:
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 29758 "Photo.c"
+#line 29883 "Photo.c"
 		{
 			OneShotScheduler* _tmp18_;
 			OneShotScheduler* _tmp20_;
-#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->priv->reimport_editable_scheduler;
-#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29766 "Photo.c"
+#line 29891 "Photo.c"
 				OneShotScheduler* _tmp19_;
-#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
-#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
-#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4119 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29774 "Photo.c"
+#line 29899 "Photo.c"
 			}
-#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
-#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
-#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4124 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29782 "Photo.c"
+#line 29907 "Photo.c"
 		}
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29786 "Photo.c"
+#line 29911 "Photo.c"
 		{
 			OneShotScheduler* _tmp21_;
 			OneShotScheduler* _tmp23_;
-#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4127 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
-#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4127 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29794 "Photo.c"
+#line 29919 "Photo.c"
 				OneShotScheduler* _tmp22_;
-#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = one_shot_scheduler_new ("Photo.update_editable_attributes", _photo_on_update_editable_attributes_one_shot_callback, self);
-#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
-#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29802 "Photo.c"
+#line 29927 "Photo.c"
 			}
-#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4132 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
-#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4132 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
-#line 4114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29810 "Photo.c"
+#line 29935 "Photo.c"
 		}
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29814 "Photo.c"
+#line 29939 "Photo.c"
 		{
 			OneShotScheduler* _tmp24_;
 			OneShotScheduler* _tmp26_;
-#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->priv->remove_editable_scheduler;
-#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29822 "Photo.c"
+#line 29947 "Photo.c"
 				OneShotScheduler* _tmp25_;
-#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4137 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
-#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4137 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
-#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4137 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->remove_editable_scheduler = _tmp25_;
-#line 29830 "Photo.c"
+#line 29955 "Photo.c"
 			}
-#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
-#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
-#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29838 "Photo.c"
+#line 29963 "Photo.c"
 		}
 		default:
-#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29843 "Photo.c"
+#line 29968 "Photo.c"
 		{
-#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4147 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29847 "Photo.c"
+#line 29972 "Photo.c"
 		}
 	}
-#line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29852 "Photo.c"
+#line 29977 "Photo.c"
 }
 
 
@@ -29860,67 +29985,67 @@ static void photo_on_reimport_editable (Photo* self) {
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4155 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4157 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4140: Reimporting editable for %s", _tmp1_);
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4159: Reimporting editable for %s", _tmp1_);
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29872 "Photo.c"
+#line 29997 "Photo.c"
 	{
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable (self, &_inner_error_);
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29878 "Photo.c"
-			goto __catch403_g_error;
+#line 30003 "Photo.c"
+			goto __catch415_g_error;
 		}
 	}
-	goto __finally403;
-	__catch403_g_error:
+	goto __finally415;
+	__catch415_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4144: Unable to reimport photo %s changed by external edito" \
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4163: Unable to reimport photo %s changed by external edito" \
 "r: %s", _tmp3_, _tmp5_);
-#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp3_);
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29908 "Photo.c"
+#line 30033 "Photo.c"
 	}
-	__finally403:
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally415:
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/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 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29919 "Photo.c"
+#line 30044 "Photo.c"
 	}
 }
 
@@ -29929,56 +30054,56 @@ static void photo_on_update_editable_attributes (Photo* self) {
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4150: Updating editable attributes for %s", _tmp1_);
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4169: Updating editable attributes for %s", _tmp1_);
+#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29938 "Photo.c"
+#line 30063 "Photo.c"
 	{
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4171 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_update_editable_attributes (self, &_inner_error_);
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4171 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29944 "Photo.c"
-			goto __catch404_g_error;
+#line 30069 "Photo.c"
+			goto __catch416_g_error;
 		}
 	}
-	goto __finally404;
-	__catch404_g_error:
+	goto __finally416;
+	__catch416_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4173 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4173 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4154: Unable to update editable attributes: %s", _tmp3_);
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4173 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4173: Unable to update editable attributes: %s", _tmp3_);
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29966 "Photo.c"
+#line 30091 "Photo.c"
 	}
-	__finally404:
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally416:
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/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 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29977 "Photo.c"
+#line 30102 "Photo.c"
 	}
 }
 
@@ -29994,68 +30119,68 @@ static void photo_on_remove_editable (Photo* self) {
 	gboolean _tmp5_;
 	gchar* _tmp8_;
 	gchar* _tmp9_;
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4177 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 30007 "Photo.c"
+#line 30132 "Photo.c"
 	}
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4182 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30021 "Photo.c"
+#line 30146 "Photo.c"
 		gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4184 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4184 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:4165: Not removing editable for %s: file exists", _tmp7_);
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4184 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_debug ("Photo.vala:4184: Not removing editable for %s: file exists", _tmp7_);
+#line 4184 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp7_);
-#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 30038 "Photo.c"
+#line 30163 "Photo.c"
 	}
-#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4170: Removing editable for %s: file no longer exists", _tmp9_);
-#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4189 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:4189: Removing editable for %s: file no longer exists", _tmp9_);
+#line 4189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp9_);
-#line 4171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4190 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, FALSE, TRUE, TRUE);
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 30054 "Photo.c"
+#line 30179 "Photo.c"
 }
 
 
@@ -30066,25 +30191,25 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp1_;
 	Dimensions _tmp2_;
 	Dimensions _tmp3_ = {0};
-#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4198 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp1_;
-#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_);
-#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp3_;
-#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30083 "Photo.c"
+#line 30208 "Photo.c"
 }
 
 
@@ -30092,19 +30217,19 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
-#line 4187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4207 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_original_orientation (self);
-#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4207 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp1_);
-#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4207 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_);
-#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4207 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp2_;
-#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4207 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30103 "Photo.c"
+#line 30228 "Photo.c"
 }
 
 
@@ -30120,77 +30245,77 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	Orientation _tmp3_;
 	PhotoException _tmp4_;
 	gboolean _tmp5_;
-#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4211 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_raw_crop (self, &_tmp0_);
-#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw = _tmp0_;
-#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
 		box_init (&_vala_crop, 0, 0, 0, 0);
-#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 30135 "Photo.c"
+#line 30260 "Photo.c"
 		}
-#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30139 "Photo.c"
+#line 30264 "Photo.c"
 	}
-#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp2_);
-#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp2_;
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_orientation (self);
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp3_;
-#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = exceptions;
-#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
-#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30155 "Photo.c"
+#line 30280 "Photo.c"
 		Orientation _tmp6_;
 		Dimensions _tmp7_;
 		Box _tmp8_;
 		Box _tmp9_ = {0};
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = orientation;
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = dim;
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = raw;
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4223 "/home/jens/Source/shotwell/src/Photo.vala"
 		orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp9_;
-#line 30170 "Photo.c"
+#line 30295 "Photo.c"
 	} else {
 		Box _tmp10_;
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4225 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4225 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30177 "Photo.c"
+#line 30302 "Photo.c"
 	}
-#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 30185 "Photo.c"
+#line 30310 "Photo.c"
 	}
-#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30189 "Photo.c"
+#line 30314 "Photo.c"
 }
 
 
@@ -30228,87 +30353,87 @@ void photo_set_crop (Photo* self, Box* crop) {
 	gint _tmp27_;
 	gint _tmp28_;
 	Box _tmp29_;
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4232 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_ORIENTATION, &_tmp0_);
-#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4232 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp1_;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = *crop;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated = _tmp4_;
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = derotated;
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.left;
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = dim;
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_.width;
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2);
-#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4237 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.left = _tmp9_;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = derotated;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.right;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = derotated;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.left;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = dim;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.width;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1);
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.right = _tmp16_;
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = derotated;
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_.top;
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = dim;
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = _tmp19_.height;
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2);
-#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4240 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.top = _tmp21_;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = derotated;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.bottom;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = derotated;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_.top;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dim;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = _tmp26_.height;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1);
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4241 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.bottom = _tmp28_;
-#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = derotated;
-#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4243 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_crop (self, &_tmp29_);
-#line 30307 "Photo.c"
+#line 30432 "Photo.c"
 }
 
 
@@ -30317,49 +30442,49 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	gboolean result = FALSE;
 	gdouble _tmp0_ = 0.0;
 	gboolean _tmp1_;
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_raw_straighten (self, &_tmp0_);
-#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_theta = _tmp0_;
-#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (theta) {
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30330 "Photo.c"
+#line 30455 "Photo.c"
 		}
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30334 "Photo.c"
+#line 30459 "Photo.c"
 	}
-#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (theta) {
-#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30342 "Photo.c"
+#line 30467 "Photo.c"
 	}
-#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30346 "Photo.c"
+#line 30471 "Photo.c"
 }
 
 
 void photo_set_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp0_;
-#line 4234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = theta;
-#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30358 "Photo.c"
+#line 30483 "Photo.c"
 }
 
 
@@ -30417,48 +30542,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	gint _tmp96__length1;
 	GdkPixbuf* _tmp133_;
 	GdkPixbuf* _tmp134_;
-#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (inst != NULL, NULL);
-#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *inst;
-#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.radius;
-#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
 	r = (gdouble) _tmp1_;
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *inst;
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.radius;
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = g_new0 (gint, _tmp3_ + 1);
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = _tmp4_;
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant_length1 = _tmp3_ + 1;
-#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 	i = 0;
-#line 30442 "Photo.c"
+#line 30567 "Photo.c"
 	{
 		gdouble y = 0.0;
 		gdouble _tmp5_;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = r;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30450 "Photo.c"
+#line 30575 "Photo.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30457 "Photo.c"
+#line 30582 "Photo.c"
 				gdouble _tmp8_;
 				gdouble theta = 0.0;
 				gdouble _tmp9_;
@@ -30476,178 +30601,178 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp19_;
 				gint _tmp20_;
 				gint _tmp21_;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30477 "Photo.c"
+#line 30602 "Photo.c"
 					gdouble _tmp7_;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp7_ = y;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 					y = _tmp7_ - 1.0;
-#line 30483 "Photo.c"
+#line 30608 "Photo.c"
 				}
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = y;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp8_ >= 0.0)) {
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30493 "Photo.c"
+#line 30618 "Photo.c"
 				}
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = r;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = asin (_tmp9_ / _tmp10_);
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				theta = _tmp11_;
-#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = r;
-#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = theta;
-#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = cos (_tmp13_);
-#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				x = (gint) ((_tmp12_ * _tmp14_) + 0.5);
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = x_insets_first_quadrant;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15__length1 = x_insets_first_quadrant_length1;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *inst;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.radius;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = x;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_[_tmp16_] = _tmp18_ - _tmp19_;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp15_[_tmp16_];
-#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = i;
-#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 				i = _tmp21_ + 1;
-#line 30531 "Photo.c"
+#line 30656 "Photo.c"
 			}
 		}
 	}
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.center;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_.x;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_.radius;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_min = _tmp24_ - _tmp26_;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = *inst;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.center;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.x;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = *inst;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_.radius;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4280 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_max = _tmp29_ + _tmp31_;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = *inst;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_.center;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_.y;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = *inst;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_.radius;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4281 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp34_ - _tmp36_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = ymin;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_ < 0) {
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = 0;
-#line 30577 "Photo.c"
+#line 30702 "Photo.c"
 	} else {
 		gint _tmp39_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30584 "Photo.c"
+#line 30709 "Photo.c"
 	}
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
-#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = *inst;
-#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.center;
-#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_.y;
-#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp42_;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = ymax;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = pixbuf;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = gdk_pixbuf_get_height (_tmp45_);
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30606 "Photo.c"
+#line 30731 "Photo.c"
 		GdkPixbuf* _tmp48_;
 		gint _tmp49_;
 		gint _tmp50_;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = pixbuf;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = gdk_pixbuf_get_height (_tmp48_);
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = _tmp49_;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp50_ - 1;
-#line 30618 "Photo.c"
+#line 30743 "Photo.c"
 	} else {
 		gint _tmp51_;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30625 "Photo.c"
+#line 30750 "Photo.c"
 	}
-#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp43_;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = 0;
-#line 30631 "Photo.c"
+#line 30756 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp52_;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = ymin;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30639 "Photo.c"
+#line 30764 "Photo.c"
 		{
 			gboolean _tmp53_ = FALSE;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = TRUE;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30646 "Photo.c"
+#line 30771 "Photo.c"
 				gint _tmp55_;
 				gint _tmp56_;
 				gint xmin = 0;
@@ -30670,118 +30795,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp71_;
 				gint _tmp72_;
 				gint _tmp87_;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30671 "Photo.c"
+#line 30796 "Photo.c"
 					gint _tmp54_;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = y_it;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp54_ + 1;
-#line 30677 "Photo.c"
+#line 30802 "Photo.c"
 				}
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = y_it;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = ymax;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp55_ <= _tmp56_)) {
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30689 "Photo.c"
+#line 30814 "Photo.c"
 				}
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = x_insets_first_quadrant;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58__length1 = x_insets_first_quadrant_length1;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = inset_index;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp58_[_tmp59_];
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp57_ + _tmp60_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = xmin;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp62_ < 0) {
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = 0;
-#line 30709 "Photo.c"
+#line 30834 "Photo.c"
 				} else {
 					gint _tmp63_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30716 "Photo.c"
+#line 30841 "Photo.c"
 				}
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = x_bounds_max;
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = x_insets_first_quadrant;
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65__length1 = x_insets_first_quadrant_length1;
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = inset_index;
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = _tmp65_[_tmp66_];
-#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp64_ - _tmp67_;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = xmax;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = pixbuf;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = gdk_pixbuf_get_width (_tmp70_);
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30742 "Photo.c"
+#line 30867 "Photo.c"
 					GdkPixbuf* _tmp73_;
 					gint _tmp74_;
 					gint _tmp75_;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp73_ = pixbuf;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp74_ = gdk_pixbuf_get_width (_tmp73_);
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp75_ = _tmp74_;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp75_ - 1;
-#line 30754 "Photo.c"
+#line 30879 "Photo.c"
 				} else {
 					gint _tmp76_;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30761 "Photo.c"
+#line 30886 "Photo.c"
 				}
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30765 "Photo.c"
+#line 30890 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp77_;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp77_ = xmin;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30773 "Photo.c"
+#line 30898 "Photo.c"
 					{
 						gboolean _tmp78_ = FALSE;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp78_ = TRUE;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30780 "Photo.c"
+#line 30905 "Photo.c"
 							gint _tmp80_;
 							gint _tmp81_;
 							GdkPixbuf* _tmp82_;
@@ -30789,94 +30914,94 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp84_;
 							GdkPixbuf* _tmp85_;
 							GdkPixbuf* _tmp86_;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30790 "Photo.c"
+#line 30915 "Photo.c"
 								gint _tmp79_;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp79_ = x_it;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp79_ + 1;
-#line 30796 "Photo.c"
+#line 30921 "Photo.c"
 							}
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp80_ = x_it;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp81_ = xmax;
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp80_ <= _tmp81_)) {
-#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4295 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30808 "Photo.c"
+#line 30933 "Photo.c"
 							}
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp83_ = x_it;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp84_ = y_it;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_);
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp86_ = _tmp85_;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp86_);
-#line 30822 "Photo.c"
+#line 30947 "Photo.c"
 						}
 					}
 				}
-#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp87_ = inset_index;
-#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4298 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp87_ + 1;
-#line 30830 "Photo.c"
+#line 30955 "Photo.c"
 			}
 		}
 	}
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = *inst;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = _tmp88_.center;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_.y;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp90_;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = *inst;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_.center;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_.y;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = *inst;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = _tmp94_.radius;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4304 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp93_ + _tmp95_;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = x_insets_first_quadrant;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96__length1 = x_insets_first_quadrant_length1;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4305 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = _tmp96__length1 - 1;
-#line 30860 "Photo.c"
+#line 30985 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp97_;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = ymin;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30868 "Photo.c"
+#line 30993 "Photo.c"
 		{
 			gboolean _tmp98_ = FALSE;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = TRUE;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30875 "Photo.c"
+#line 31000 "Photo.c"
 				gint _tmp100_;
 				gint _tmp101_;
 				gint xmin = 0;
@@ -30899,118 +31024,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp116_;
 				gint _tmp117_;
 				gint _tmp132_;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30900 "Photo.c"
+#line 31025 "Photo.c"
 					gint _tmp99_;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp99_ = y_it;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp99_ + 1;
-#line 30906 "Photo.c"
+#line 31031 "Photo.c"
 				}
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp100_ = y_it;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp101_ = ymax;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp100_ <= _tmp101_)) {
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4306 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30918 "Photo.c"
+#line 31043 "Photo.c"
 				}
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103_ = x_insets_first_quadrant;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103__length1 = x_insets_first_quadrant_length1;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp104_ = inset_index;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp105_ = _tmp103_[_tmp104_];
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4307 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp102_ + _tmp105_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = xmin;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp107_ < 0) {
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = 0;
-#line 30938 "Photo.c"
+#line 31063 "Photo.c"
 				} else {
 					gint _tmp108_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30945 "Photo.c"
+#line 31070 "Photo.c"
 				}
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp109_ = x_bounds_max;
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = x_insets_first_quadrant;
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110__length1 = x_insets_first_quadrant_length1;
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = inset_index;
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp110_[_tmp111_];
-#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp109_ - _tmp112_;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp114_ = xmax;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = pixbuf;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = gdk_pixbuf_get_width (_tmp115_);
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30971 "Photo.c"
+#line 31096 "Photo.c"
 					GdkPixbuf* _tmp118_;
 					gint _tmp119_;
 					gint _tmp120_;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp118_ = pixbuf;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = gdk_pixbuf_get_width (_tmp118_);
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = _tmp119_;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp120_ - 1;
-#line 30983 "Photo.c"
+#line 31108 "Photo.c"
 				} else {
 					gint _tmp121_;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 30990 "Photo.c"
+#line 31115 "Photo.c"
 				}
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 30994 "Photo.c"
+#line 31119 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp122_;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = xmin;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 31002 "Photo.c"
+#line 31127 "Photo.c"
 					{
 						gboolean _tmp123_ = FALSE;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp123_ = TRUE;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 31009 "Photo.c"
+#line 31134 "Photo.c"
 							gint _tmp125_;
 							gint _tmp126_;
 							GdkPixbuf* _tmp127_;
@@ -31018,63 +31143,63 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp129_;
 							GdkPixbuf* _tmp130_;
 							GdkPixbuf* _tmp131_;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 31019 "Photo.c"
+#line 31144 "Photo.c"
 								gint _tmp124_;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp124_ = x_it;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp124_ + 1;
-#line 31025 "Photo.c"
+#line 31150 "Photo.c"
 							}
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp125_ = x_it;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp126_ = xmax;
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp125_ <= _tmp126_)) {
-#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4312 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 31037 "Photo.c"
+#line 31162 "Photo.c"
 							}
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp128_ = x_it;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp129_ = y_it;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_);
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp131_ = _tmp130_;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4313 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp131_);
-#line 31051 "Photo.c"
+#line 31176 "Photo.c"
 						}
 					}
 				}
-#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4315 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp132_ = inset_index;
-#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4315 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp132_ - 1;
-#line 31059 "Photo.c"
+#line 31184 "Photo.c"
 			}
 		}
 	}
-#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = pixbuf;
-#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _g_object_ref0 (_tmp133_);
-#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4318 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp134_;
-#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4318 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
-#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4318 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31073 "Photo.c"
+#line 31198 "Photo.c"
 }
 
 
@@ -31093,89 +31218,89 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	gint _tmp9_;
 	GdkPixbuf* _tmp33_;
 	GdkPixbuf* _tmp34_;
-#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = y;
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixbuf;
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_);
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = x;
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 	px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_);
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = x;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ >= 0) {
-#line 31114 "Photo.c"
+#line 31239 "Photo.c"
 		gint _tmp10_;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31120 "Photo.c"
+#line 31245 "Photo.c"
 	} else {
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31124 "Photo.c"
+#line 31249 "Photo.c"
 	}
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31128 "Photo.c"
+#line 31253 "Photo.c"
 		gint _tmp11_;
 		GdkPixbuf* _tmp12_;
 		gint _tmp13_;
 		gint _tmp14_;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = x;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = pixbuf;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = gdk_pixbuf_get_width (_tmp12_);
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < _tmp14_;
-#line 31143 "Photo.c"
+#line 31268 "Photo.c"
 	} else {
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31147 "Photo.c"
+#line 31272 "Photo.c"
 	}
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31151 "Photo.c"
+#line 31276 "Photo.c"
 		gint _tmp15_;
 		GdkPixbuf* _tmp16_;
 		gint _tmp17_;
 		gint _tmp18_;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = y;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = pixbuf;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp15_ < _tmp18_;
-#line 31166 "Photo.c"
+#line 31291 "Photo.c"
 	} else {
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31170 "Photo.c"
+#line 31295 "Photo.c"
 	}
-#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31174 "Photo.c"
+#line 31299 "Photo.c"
 		guchar* pixel_data = NULL;
 		GdkPixbuf* _tmp19_;
 		guint8* _tmp20_;
@@ -31199,65 +31324,65 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		gint _tmp30_;
 		guchar _tmp31_;
 		guchar _tmp32_;
-#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = pixbuf;
-#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = gdk_pixbuf_get_pixels (_tmp19_);
-#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data = _tmp20_;
-#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data_length1 = -1;
-#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_data_size_ = pixel_data_length1;
-#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = pixel_data;
-#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21__length1 = pixel_data_length1;
-#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = px_start_byte_offset;
-#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp21_[_tmp22_ + 1];
-#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 		g = _tmp23_;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = pixel_data;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24__length1 = pixel_data_length1;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = px_start_byte_offset;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp24_[_tmp25_ + 2];
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
 		b = _tmp26_;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = g;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = b;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		r = (guchar) ((_tmp27_ + _tmp28_) / 2);
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = pixel_data;
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = pixel_data_length1;
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = px_start_byte_offset;
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = r;
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_[_tmp30_] = _tmp31_;
-#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp29_[_tmp30_];
-#line 31246 "Photo.c"
+#line 31371 "Photo.c"
 	}
-#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
-#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4348 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp34_;
-#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31256 "Photo.c"
+#line 31381 "Photo.c"
 }
 
 
@@ -31282,78 +31407,78 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	gint _tmp15_;
 	gint _tmp16_;
 	gint _tmp17_;
-#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_point != NULL);
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_orientation (self);
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_orientation = _tmp0_;
-#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = unscaled_orientation;
-#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_);
-#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_);
-#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_dims = _tmp3_;
-#line 4338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_x_offset_raw = 0;
-#line 4339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_y_offset_raw = 0;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_raw_crop (self, &_tmp4_);
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	crop_box = _tmp4_;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 31307 "Photo.c"
+#line 31432 "Photo.c"
 		Box _tmp6_;
 		gint _tmp7_;
 		Box _tmp8_;
 		gint _tmp9_;
-#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = crop_box;
-#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_.left;
-#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_x_offset_raw = _tmp7_;
-#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = crop_box;
-#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_.top;
-#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_y_offset_raw = _tmp9_;
-#line 31324 "Photo.c"
+#line 31449 "Photo.c"
 	}
-#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
-#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = unscaled_dims;
-#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_point;
-#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_);
-#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point = _tmp13_;
-#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = derotated_point.x;
-#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = unscaled_x_offset_raw;
-#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point.x = _tmp14_ + _tmp15_;
-#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = derotated_point.y;
-#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = unscaled_y_offset_raw;
-#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point.y = _tmp16_ + _tmp17_;
-#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = derotated_point;
-#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31352 "Photo.c"
+#line 31477 "Photo.c"
 }
 
 
@@ -31399,171 +31524,171 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	gint _tmp45_;
 	GdkPoint _tmp46_;
 	gint _tmp47_;
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_rect != NULL);
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4377 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_.x = 0;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4377 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp0_;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_.x = 0;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right = _tmp1_;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *unscaled_rect;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.x;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.x = _tmp3_;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = *unscaled_rect;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_.y;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.y = _tmp5_;
-#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = upper_left;
-#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_.x;
-#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *unscaled_rect;
-#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.width;
-#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = upper_left;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.y;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_rect;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.height;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right.y = _tmp11_ + _tmp13_;
-#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4384 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = upper_left;
-#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4384 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp14_, &_tmp15_);
-#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4384 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp15_;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = lower_right;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp16_, &_tmp17_);
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right = _tmp17_;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = upper_left;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.x;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = lower_right;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_.x;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 31464 "Photo.c"
+#line 31589 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp22_;
 		gint _tmp23_;
 		GdkPoint _tmp24_;
 		gint _tmp25_;
 		gint _tmp26_;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = upper_left;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_.x;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp23_;
-#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = lower_right;
-#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_.x;
-#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.x = _tmp25_;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4390 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = temp;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4390 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.x = _tmp26_;
-#line 31487 "Photo.c"
+#line 31612 "Photo.c"
 	}
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.y;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = lower_right;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4392 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_.y;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4392 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_ > _tmp30_) {
-#line 31499 "Photo.c"
+#line 31624 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp31_;
 		gint _tmp32_;
 		GdkPoint _tmp33_;
 		gint _tmp34_;
 		gint _tmp35_;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = upper_left;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_.y;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp32_;
-#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = lower_right;
-#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = _tmp33_.y;
-#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.y = _tmp34_;
-#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = temp;
-#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.y = _tmp35_;
-#line 31522 "Photo.c"
+#line 31647 "Photo.c"
 	}
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4398 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = upper_left;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_.x;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4399 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.x = _tmp37_;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4400 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = upper_left;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4400 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_.y;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4400 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.y = _tmp39_;
-#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = lower_right;
-#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.x;
-#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = upper_left;
-#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_.x;
-#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.width = _tmp41_ - _tmp43_;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = lower_right;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_.y;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = upper_left;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_.y;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4402 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.height = _tmp45_ - _tmp47_;
-#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4404 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = raw_rect;
-#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4404 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31562 "Photo.c"
+#line 31687 "Photo.c"
 }
 
 
@@ -31574,85 +31699,85 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	GdkPixbuf* _tmp4_;
 	PixelTransformationBundle* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4407 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4408 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31577 "Photo.c"
+#line 31702 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_for_best_fit (360, FALSE, &_tmp1_);
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_pixbuf_with_options (self, &_tmp1_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp2_;
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31591 "Photo.c"
-			goto __catch405_g_error;
+#line 31716 "Photo.c"
+			goto __catch417_g_error;
 		}
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4415 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp3_;
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31604 "Photo.c"
+#line 31729 "Photo.c"
 	}
-	goto __finally405;
-	__catch405_g_error:
+	goto __finally417;
+	__catch417_g_error:
 	{
 		GError* e = NULL;
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		e = _inner_error_;
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4403: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram");
-#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4422 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4422: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram");
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (e);
-#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31624 "Photo.c"
+#line 31749 "Photo.c"
 	}
-	__finally405:
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally417:
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/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 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4414 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 31637 "Photo.c"
+#line 31762 "Photo.c"
 	}
-#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = auto_enhance_create_auto_enhance_adjustments (_tmp4_);
-#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformations = _tmp5_;
-#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4439 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = transformations;
-#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4439 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4439 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31651 "Photo.c"
+#line 31776 "Photo.c"
 }
 
 
@@ -31662,70 +31787,70 @@ gboolean photo_enhance (Photo* self) {
 	PixelTransformationBundle* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 4423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4443 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_enhance_transformations (self);
-#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4443 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformations = _tmp0_;
-#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = transformations;
-#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4445 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4446 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (transformations);
-#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4446 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31677 "Photo.c"
+#line 31802 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp2_;
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31685 "Photo.c"
+#line 31810 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp3_;
-#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = transformations;
-#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4452 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_color_adjustments (self, _tmp3_);
-#line 31692 "Photo.c"
+#line 31817 "Photo.c"
 		}
-		__finally406:
+		__finally418:
 		{
 			PhotoRow* _tmp4_;
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31701 "Photo.c"
+#line 31826 "Photo.c"
 		}
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31705 "Photo.c"
+#line 31830 "Photo.c"
 			gboolean _tmp5_ = FALSE;
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (transformations);
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/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 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4451 "/home/jens/Source/shotwell/src/Photo.vala"
 			return _tmp5_;
-#line 31715 "Photo.c"
+#line 31840 "Photo.c"
 		}
 	}
-#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (transformations);
-#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31724 "Photo.c"
+#line 31849 "Photo.c"
 }
 
 
@@ -31738,7 +31863,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) {
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31737 "Photo.c"
+#line 31862 "Photo.c"
 }
 
 
@@ -31748,7 +31873,7 @@ void photo_set_develop_raw_photos_to_files (gboolean value) {
 	_tmp0_ = value;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo__develop_raw_photos_to_files = _tmp0_;
-#line 31747 "Photo.c"
+#line 31872 "Photo.c"
 }
 
 
@@ -31757,7 +31882,7 @@ static void photo_real_editable_replaced (Photo* self, GFile* old_file, GFile* n
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
 #line 358 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 31756 "Photo.c"
+#line 31881 "Photo.c"
 }
 
 
@@ -31776,19 +31901,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31775 "Photo.c"
+#line 31900 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31781 "Photo.c"
+#line 31906 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 31787 "Photo.c"
+#line 31912 "Photo.c"
 }
 
 
@@ -31803,7 +31928,7 @@ static void photo_real_baseline_replaced (Photo* self) {
 static void photo_real_master_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 376 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31802 "Photo.c"
+#line 31927 "Photo.c"
 }
 
 
@@ -31822,47 +31947,47 @@ static void g_cclosure_user_marshal_VOID__MEDIA_METADATA (GClosure * closure, GV
 		data1 = closure->data;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 31821 "Photo.c"
+#line 31946 "Photo.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 31827 "Photo.c"
+#line 31952 "Photo.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, value_get_media_metadata (param_values + 1), data2);
-#line 31833 "Photo.c"
+#line 31958 "Photo.c"
 }
 
 
 static void photo_real_editable_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31840 "Photo.c"
+#line 31965 "Photo.c"
 }
 
 
 static void photo_real_baseline_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 387 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31847 "Photo.c"
+#line 31972 "Photo.c"
 }
 
 
 static void photo_real_source_reimported (Photo* self, PhotoMetadata* metadata) {
 #line 394 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 31854 "Photo.c"
+#line 31979 "Photo.c"
 }
 
 
 static void _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced (Photo* _sender, gpointer self) {
 #line 257 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_photo_transformation_state_impl_on_photo_baseline_replaced ((PhotoPhotoTransformationStateImpl*) self);
-#line 31861 "Photo.c"
+#line 31986 "Photo.c"
 }
 
 
@@ -31930,14 +32055,14 @@ static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_
 	g_signal_connect_object (_tmp9_, "baseline-replaced", (GCallback) _photo_photo_transformation_state_impl_on_photo_baseline_replaced_photo_baseline_replaced, self, 0);
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 31929 "Photo.c"
+#line 32054 "Photo.c"
 }
 
 
 static PhotoPhotoTransformationStateImpl* photo_photo_transformation_state_impl_new (Photo* photo, Orientation orientation, GeeHashMap* transformations, PixelTransformer* transformer, PixelTransformationBundle* adjustments) {
 #line 244 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_photo_transformation_state_impl_construct (PHOTO_TYPE_PHOTO_TRANSFORMATION_STATE_IMPL, photo, orientation, transformations, transformer, adjustments);
-#line 31936 "Photo.c"
+#line 32061 "Photo.c"
 }
 
 
@@ -31952,7 +32077,7 @@ static Orientation photo_photo_transformation_state_impl_get_orientation (PhotoP
 	result = _tmp0_;
 #line 261 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31951 "Photo.c"
+#line 32076 "Photo.c"
 }
 
 
@@ -31970,7 +32095,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_get_transformations (Ph
 	result = _tmp1_;
 #line 265 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31969 "Photo.c"
+#line 32094 "Photo.c"
 }
 
 
@@ -31984,7 +32109,7 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 	_tmp1_ = self->priv->transformer;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 31983 "Photo.c"
+#line 32108 "Photo.c"
 		PixelTransformer* _tmp2_;
 		PixelTransformer* _tmp3_;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31995,19 +32120,19 @@ static PixelTransformer* photo_photo_transformation_state_impl_get_transformer (
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 31994 "Photo.c"
+#line 32119 "Photo.c"
 	} else {
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (_tmp0_);
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 32000 "Photo.c"
+#line 32125 "Photo.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32006 "Photo.c"
+#line 32131 "Photo.c"
 }
 
 
@@ -32021,7 +32146,7 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 	_tmp1_ = self->priv->adjustments;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 32020 "Photo.c"
+#line 32145 "Photo.c"
 		PixelTransformationBundle* _tmp2_;
 		PixelTransformationBundle* _tmp3_;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32032,19 +32157,19 @@ static PixelTransformationBundle* photo_photo_transformation_state_impl_get_colo
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 32031 "Photo.c"
+#line 32156 "Photo.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 32037 "Photo.c"
+#line 32162 "Photo.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32043 "Photo.c"
+#line 32168 "Photo.c"
 }
 
 
@@ -32063,13 +32188,13 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		result = NULL;
 #line 279 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 32062 "Photo.c"
+#line 32187 "Photo.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	clone = _tmp1_;
-#line 32068 "Photo.c"
+#line 32193 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp2_;
@@ -32096,7 +32221,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 		_object_it = _tmp7_;
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 32095 "Photo.c"
+#line 32220 "Photo.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			gchar* object = NULL;
@@ -32118,7 +32243,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32117 "Photo.c"
+#line 32242 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32150,17 +32275,17 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			_key_value_map_unref0 (_tmp17_);
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (object);
-#line 32149 "Photo.c"
+#line 32274 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32153 "Photo.c"
+#line 32278 "Photo.c"
 	}
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = clone;
 #line 285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32159 "Photo.c"
+#line 32284 "Photo.c"
 }
 
 
@@ -32174,7 +32299,7 @@ static void photo_photo_transformation_state_impl_on_photo_baseline_replaced (Ph
 	if (!_tmp0_) {
 #line 290 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), photo_transformation_state_signals[PHOTO_TRANSFORMATION_STATE_BROKEN_SIGNAL], 0);
-#line 32173 "Photo.c"
+#line 32298 "Photo.c"
 	}
 }
 
@@ -32186,14 +32311,14 @@ static void photo_photo_transformation_state_impl_class_init (PhotoPhotoTransfor
 	g_type_class_add_private (klass, sizeof (PhotoPhotoTransformationStateImplPrivate));
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_photo_transformation_state_impl_finalize;
-#line 32185 "Photo.c"
+#line 32310 "Photo.c"
 }
 
 
 static void photo_photo_transformation_state_impl_instance_init (PhotoPhotoTransformationStateImpl * self) {
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = PHOTO_PHOTO_TRANSFORMATION_STATE_IMPL_GET_PRIVATE (self);
-#line 32192 "Photo.c"
+#line 32317 "Photo.c"
 }
 
 
@@ -32219,7 +32344,7 @@ static void photo_photo_transformation_state_impl_finalize (GObject * obj) {
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 237 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_photo_transformation_state_impl_parent_class)->finalize (obj);
-#line 32218 "Photo.c"
+#line 32343 "Photo.c"
 }
 
 
@@ -32241,21 +32366,21 @@ static PhotoBackingReaders* photo_backing_readers_construct (GType object_type)
 	self = (PhotoBackingReaders*) g_type_create_instance (object_type);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32240 "Photo.c"
+#line 32365 "Photo.c"
 }
 
 
 static PhotoBackingReaders* photo_backing_readers_new (void) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_backing_readers_construct (PHOTO_TYPE_BACKING_READERS);
-#line 32247 "Photo.c"
+#line 32372 "Photo.c"
 }
 
 
 static void photo_value_backing_readers_init (GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32254 "Photo.c"
+#line 32379 "Photo.c"
 }
 
 
@@ -32264,7 +32389,7 @@ static void photo_value_backing_readers_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (value->data[0].v_pointer);
-#line 32263 "Photo.c"
+#line 32388 "Photo.c"
 	}
 }
 
@@ -32274,11 +32399,11 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_backing_readers_ref (src_value->data[0].v_pointer);
-#line 32273 "Photo.c"
+#line 32398 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32277 "Photo.c"
+#line 32402 "Photo.c"
 	}
 }
 
@@ -32286,37 +32411,37 @@ static void photo_value_backing_readers_copy_value (const GValue* src_value, GVa
 static gpointer photo_value_backing_readers_peek_pointer (const GValue* value) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32285 "Photo.c"
+#line 32410 "Photo.c"
 }
 
 
 static gchar* photo_value_backing_readers_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32292 "Photo.c"
+#line 32417 "Photo.c"
 		PhotoBackingReaders * object;
 		object = collect_values[0].v_pointer;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32299 "Photo.c"
+#line 32424 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.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 32303 "Photo.c"
+#line 32428 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32307 "Photo.c"
+#line 32432 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32311 "Photo.c"
+#line 32436 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32315 "Photo.c"
+#line 32440 "Photo.c"
 }
 
 
@@ -32327,25 +32452,25 @@ static gchar* photo_value_backing_readers_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32326 "Photo.c"
+#line 32451 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32332 "Photo.c"
+#line 32457 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32336 "Photo.c"
+#line 32461 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32340 "Photo.c"
+#line 32465 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32344 "Photo.c"
+#line 32469 "Photo.c"
 }
 
 
@@ -32359,7 +32484,7 @@ static GParamSpec* photo_param_spec_backing_readers (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32358 "Photo.c"
+#line 32483 "Photo.c"
 }
 
 
@@ -32368,7 +32493,7 @@ static gpointer photo_value_get_backing_readers (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_BACKING_READERS), NULL);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32367 "Photo.c"
+#line 32492 "Photo.c"
 }
 
 
@@ -32388,17 +32513,17 @@ static void photo_value_set_backing_readers (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32387 "Photo.c"
+#line 32512 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32391 "Photo.c"
+#line 32516 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32397 "Photo.c"
+#line 32522 "Photo.c"
 	}
 }
 
@@ -32417,17 +32542,17 @@ static void photo_value_take_backing_readers (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32416 "Photo.c"
+#line 32541 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32420 "Photo.c"
+#line 32545 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_backing_readers_unref (old);
-#line 32426 "Photo.c"
+#line 32551 "Photo.c"
 	}
 }
 
@@ -32437,14 +32562,14 @@ static void photo_backing_readers_class_init (PhotoBackingReadersClass * klass)
 	photo_backing_readers_parent_class = g_type_class_peek_parent (klass);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoBackingReadersClass *) klass)->finalize = photo_backing_readers_finalize;
-#line 32436 "Photo.c"
+#line 32561 "Photo.c"
 }
 
 
 static void photo_backing_readers_instance_init (PhotoBackingReaders * self) {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32443 "Photo.c"
+#line 32568 "Photo.c"
 }
 
 
@@ -32460,7 +32585,7 @@ static void photo_backing_readers_finalize (PhotoBackingReaders * obj) {
 	_photo_file_adapter_unref0 (self->developer);
 #line 297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (self->editable);
-#line 32459 "Photo.c"
+#line 32584 "Photo.c"
 }
 
 
@@ -32485,7 +32610,7 @@ static gpointer photo_backing_readers_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32484 "Photo.c"
+#line 32609 "Photo.c"
 }
 
 
@@ -32498,7 +32623,7 @@ static void photo_backing_readers_unref (gpointer instance) {
 		PHOTO_BACKING_READERS_GET_CLASS (self)->finalize (self);
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32497 "Photo.c"
+#line 32622 "Photo.c"
 	}
 }
 
@@ -32533,21 +32658,21 @@ static PhotoCachedPixbuf* photo_cached_pixbuf_construct (GType object_type, Phot
 	self->pixbuf = _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32532 "Photo.c"
+#line 32657 "Photo.c"
 }
 
 
 static PhotoCachedPixbuf* photo_cached_pixbuf_new (Photo* photo, GdkPixbuf* pixbuf) {
 #line 305 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_cached_pixbuf_construct (PHOTO_TYPE_CACHED_PIXBUF, photo, pixbuf);
-#line 32539 "Photo.c"
+#line 32664 "Photo.c"
 }
 
 
 static void photo_value_cached_pixbuf_init (GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32546 "Photo.c"
+#line 32671 "Photo.c"
 }
 
 
@@ -32556,7 +32681,7 @@ static void photo_value_cached_pixbuf_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (value->data[0].v_pointer);
-#line 32555 "Photo.c"
+#line 32680 "Photo.c"
 	}
 }
 
@@ -32566,11 +32691,11 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_cached_pixbuf_ref (src_value->data[0].v_pointer);
-#line 32565 "Photo.c"
+#line 32690 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32569 "Photo.c"
+#line 32694 "Photo.c"
 	}
 }
 
@@ -32578,37 +32703,37 @@ static void photo_value_cached_pixbuf_copy_value (const GValue* src_value, GValu
 static gpointer photo_value_cached_pixbuf_peek_pointer (const GValue* value) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32577 "Photo.c"
+#line 32702 "Photo.c"
 }
 
 
 static gchar* photo_value_cached_pixbuf_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32584 "Photo.c"
+#line 32709 "Photo.c"
 		PhotoCachedPixbuf * object;
 		object = collect_values[0].v_pointer;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32591 "Photo.c"
+#line 32716 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.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 32595 "Photo.c"
+#line 32720 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32599 "Photo.c"
+#line 32724 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32603 "Photo.c"
+#line 32728 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32607 "Photo.c"
+#line 32732 "Photo.c"
 }
 
 
@@ -32619,25 +32744,25 @@ static gchar* photo_value_cached_pixbuf_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32618 "Photo.c"
+#line 32743 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32624 "Photo.c"
+#line 32749 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32628 "Photo.c"
+#line 32753 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32632 "Photo.c"
+#line 32757 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32636 "Photo.c"
+#line 32761 "Photo.c"
 }
 
 
@@ -32651,7 +32776,7 @@ static GParamSpec* photo_param_spec_cached_pixbuf (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32650 "Photo.c"
+#line 32775 "Photo.c"
 }
 
 
@@ -32660,7 +32785,7 @@ static gpointer photo_value_get_cached_pixbuf (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_CACHED_PIXBUF), NULL);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32659 "Photo.c"
+#line 32784 "Photo.c"
 }
 
 
@@ -32680,17 +32805,17 @@ static void photo_value_set_cached_pixbuf (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32679 "Photo.c"
+#line 32804 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32683 "Photo.c"
+#line 32808 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32689 "Photo.c"
+#line 32814 "Photo.c"
 	}
 }
 
@@ -32709,17 +32834,17 @@ static void photo_value_take_cached_pixbuf (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32708 "Photo.c"
+#line 32833 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32712 "Photo.c"
+#line 32837 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_cached_pixbuf_unref (old);
-#line 32718 "Photo.c"
+#line 32843 "Photo.c"
 	}
 }
 
@@ -32729,7 +32854,7 @@ static void photo_cached_pixbuf_class_init (PhotoCachedPixbufClass * klass) {
 	photo_cached_pixbuf_parent_class = g_type_class_peek_parent (klass);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoCachedPixbufClass *) klass)->finalize = photo_cached_pixbuf_finalize;
-#line 32728 "Photo.c"
+#line 32853 "Photo.c"
 }
 
 
@@ -32741,7 +32866,7 @@ static void photo_cached_pixbuf_instance_init (PhotoCachedPixbuf * self) {
 	self->last_touched = _tmp0_;
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32740 "Photo.c"
+#line 32865 "Photo.c"
 }
 
 
@@ -32757,7 +32882,7 @@ static void photo_cached_pixbuf_finalize (PhotoCachedPixbuf * obj) {
 	_g_object_unref0 (self->pixbuf);
 #line 303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_timer_destroy0 (self->last_touched);
-#line 32756 "Photo.c"
+#line 32881 "Photo.c"
 }
 
 
@@ -32782,7 +32907,7 @@ static gpointer photo_cached_pixbuf_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32781 "Photo.c"
+#line 32906 "Photo.c"
 }
 
 
@@ -32795,224 +32920,224 @@ static void photo_cached_pixbuf_unref (gpointer instance) {
 		PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32794 "Photo.c"
+#line 32919 "Photo.c"
 	}
 }
 
 
 PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) {
 	PhotoReimportMasterState* self = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32805 "Photo.c"
+#line 32930 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_init (GValue* value) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32812 "Photo.c"
+#line 32937 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_free_value (GValue* value) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32821 "Photo.c"
+#line 32946 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_master_state_ref (src_value->data[0].v_pointer);
-#line 32831 "Photo.c"
+#line 32956 "Photo.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32835 "Photo.c"
+#line 32960 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32843 "Photo.c"
+#line 32968 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32850 "Photo.c"
+#line 32975 "Photo.c"
 		PhotoReimportMasterState * object;
 		object = collect_values[0].v_pointer;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32857 "Photo.c"
+#line 32982 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.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 32861 "Photo.c"
+#line 32986 "Photo.c"
 		}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32865 "Photo.c"
+#line 32990 "Photo.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32869 "Photo.c"
+#line 32994 "Photo.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32873 "Photo.c"
+#line 32998 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportMasterState ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32884 "Photo.c"
+#line 33009 "Photo.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32890 "Photo.c"
+#line 33015 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32894 "Photo.c"
+#line 33019 "Photo.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32898 "Photo.c"
+#line 33023 "Photo.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32902 "Photo.c"
+#line 33027 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportMasterState* spec;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32916 "Photo.c"
+#line 33041 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_master_state (const GValue* value) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32925 "Photo.c"
+#line 33050 "Photo.c"
 }
 
 
 void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState * old;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32945 "Photo.c"
+#line 33070 "Photo.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32949 "Photo.c"
+#line 33074 "Photo.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32955 "Photo.c"
+#line 33080 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState * old;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32974 "Photo.c"
+#line 33099 "Photo.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32978 "Photo.c"
+#line 33103 "Photo.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32984 "Photo.c"
+#line 33109 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 32994 "Photo.c"
+#line 33119 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33001 "Photo.c"
+#line 33126 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_finalize (PhotoReimportMasterState * obj) {
 	PhotoReimportMasterState * self;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33011 "Photo.c"
+#line 33136 "Photo.c"
 }
 
 
@@ -33033,46 +33158,46 @@ GType photo_reimport_master_state_get_type (void) {
 gpointer photo_reimport_master_state_ref (gpointer instance) {
 	PhotoReimportMasterState * self;
 	self = instance;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33036 "Photo.c"
+#line 33161 "Photo.c"
 }
 
 
 void photo_reimport_master_state_unref (gpointer instance) {
 	PhotoReimportMasterState * self;
 	self = instance;
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
-#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33049 "Photo.c"
+#line 33174 "Photo.c"
 	}
 }
 
 
-static gchar** _vala_array_dup28 (gchar** self, int length) {
+static gchar** _vala_array_dup24 (gchar** self, int length) {
 	gchar** result;
 	int i;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = g_new0 (gchar*, length + 1);
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	for (i = 0; i < length; i++) {
-#line 33061 "Photo.c"
+#line 33186 "Photo.c"
 		gchar* _tmp0_;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = g_strdup (self[i]);
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 		result[i] = _tmp0_;
-#line 33067 "Photo.c"
+#line 33192 "Photo.c"
 	}
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33071 "Photo.c"
+#line 33196 "Photo.c"
 }
 
 
@@ -33086,91 +33211,91 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 	gint _tmp4__length1;
 	gchar** _tmp5_;
 	gint _tmp5__length1;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _photo_row_ref0 (_tmp0_);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp1_;
-#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = alterations;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4__length1 = alterations_length1;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup24 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5__length1 = _tmp4__length1;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = _tmp5_;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations_length1 = _tmp5__length1;
-#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->_alterations_size_ = self->alterations_length1;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33125 "Photo.c"
+#line 33250 "Photo.c"
 }
 
 
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1);
-#line 33132 "Photo.c"
+#line 33257 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) {
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33141 "Photo.c"
+#line 33266 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) {
 	PhotoRow* _tmp0_;
-#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_row_new ();
-#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp0_;
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33153 "Photo.c"
+#line 33278 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState * obj) {
 	PhotoReimportMasterStateImpl * self;
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl);
-#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33169 "Photo.c"
+#line 33294 "Photo.c"
 }
 
 
@@ -33188,217 +33313,217 @@ static GType photo_reimport_master_state_impl_get_type (void) {
 
 PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) {
 	PhotoReimportEditableState* self = NULL;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33191 "Photo.c"
+#line 33316 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_init (GValue* value) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33198 "Photo.c"
+#line 33323 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_free_value (GValue* value) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33207 "Photo.c"
+#line 33332 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_editable_state_ref (src_value->data[0].v_pointer);
-#line 33217 "Photo.c"
+#line 33342 "Photo.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33221 "Photo.c"
+#line 33346 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33229 "Photo.c"
+#line 33354 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33236 "Photo.c"
+#line 33361 "Photo.c"
 		PhotoReimportEditableState * object;
 		object = collect_values[0].v_pointer;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33243 "Photo.c"
+#line 33368 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.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 33247 "Photo.c"
+#line 33372 "Photo.c"
 		}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33251 "Photo.c"
+#line 33376 "Photo.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33255 "Photo.c"
+#line 33380 "Photo.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33259 "Photo.c"
+#line 33384 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportEditableState ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33270 "Photo.c"
+#line 33395 "Photo.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33276 "Photo.c"
+#line 33401 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33280 "Photo.c"
+#line 33405 "Photo.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33284 "Photo.c"
+#line 33409 "Photo.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33288 "Photo.c"
+#line 33413 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportEditableState* spec;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33302 "Photo.c"
+#line 33427 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_editable_state (const GValue* value) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33311 "Photo.c"
+#line 33436 "Photo.c"
 }
 
 
 void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState * old;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33331 "Photo.c"
+#line 33456 "Photo.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33335 "Photo.c"
+#line 33460 "Photo.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33341 "Photo.c"
+#line 33466 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState * old;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33360 "Photo.c"
+#line 33485 "Photo.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33364 "Photo.c"
+#line 33489 "Photo.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33370 "Photo.c"
+#line 33495 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33380 "Photo.c"
+#line 33505 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33387 "Photo.c"
+#line 33512 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_finalize (PhotoReimportEditableState * obj) {
 	PhotoReimportEditableState * self;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33397 "Photo.c"
+#line 33522 "Photo.c"
 }
 
 
@@ -33419,24 +33544,24 @@ GType photo_reimport_editable_state_get_type (void) {
 gpointer photo_reimport_editable_state_ref (gpointer instance) {
 	PhotoReimportEditableState * self;
 	self = instance;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33422 "Photo.c"
+#line 33547 "Photo.c"
 }
 
 
 void photo_reimport_editable_state_unref (gpointer instance) {
 	PhotoReimportEditableState * self;
 	self = instance;
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
-#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33435 "Photo.c"
+#line 33560 "Photo.c"
 	}
 }
 
@@ -33447,73 +33572,73 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	BackingPhotoRow* _tmp1_;
 	PhotoMetadata* _tmp2_;
 	PhotoMetadata* _tmp3_;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type);
-#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_state;
-#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_state = _tmp1_;
-#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33470 "Photo.c"
+#line 33595 "Photo.c"
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33477 "Photo.c"
+#line 33602 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) {
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33486 "Photo.c"
+#line 33611 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) {
 	BackingPhotoRow* _tmp0_;
-#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_state = _tmp0_;
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33498 "Photo.c"
+#line 33623 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState * obj) {
 	PhotoReimportEditableStateImpl * self;
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl);
-#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33512 "Photo.c"
+#line 33637 "Photo.c"
 }
 
 
@@ -33531,217 +33656,217 @@ static GType photo_reimport_editable_state_impl_get_type (void) {
 
 PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct (GType object_type) {
 	PhotoReimportRawDevelopmentState* self = NULL;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33534 "Photo.c"
+#line 33659 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_init (GValue* value) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33541 "Photo.c"
+#line 33666 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_free_value (GValue* value) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33550 "Photo.c"
+#line 33675 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_ref (src_value->data[0].v_pointer);
-#line 33560 "Photo.c"
+#line 33685 "Photo.c"
 	} else {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33564 "Photo.c"
+#line 33689 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33572 "Photo.c"
+#line 33697 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33579 "Photo.c"
+#line 33704 "Photo.c"
 		PhotoReimportRawDevelopmentState * object;
 		object = collect_values[0].v_pointer;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33586 "Photo.c"
+#line 33711 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.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 33590 "Photo.c"
+#line 33715 "Photo.c"
 		}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33594 "Photo.c"
+#line 33719 "Photo.c"
 	} else {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33598 "Photo.c"
+#line 33723 "Photo.c"
 	}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33602 "Photo.c"
+#line 33727 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportRawDevelopmentState ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33613 "Photo.c"
+#line 33738 "Photo.c"
 	}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33619 "Photo.c"
+#line 33744 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33623 "Photo.c"
+#line 33748 "Photo.c"
 	} else {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33627 "Photo.c"
+#line 33752 "Photo.c"
 	}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33631 "Photo.c"
+#line 33756 "Photo.c"
 }
 
 
 GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoParamSpecReimportRawDevelopmentState* spec;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33645 "Photo.c"
+#line 33770 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33654 "Photo.c"
+#line 33779 "Photo.c"
 }
 
 
 void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState * old;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33674 "Photo.c"
+#line 33799 "Photo.c"
 	} else {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33678 "Photo.c"
+#line 33803 "Photo.c"
 	}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33684 "Photo.c"
+#line 33809 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState * old;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33703 "Photo.c"
+#line 33828 "Photo.c"
 	} else {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33707 "Photo.c"
+#line 33832 "Photo.c"
 	}
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33713 "Photo.c"
+#line 33838 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33723 "Photo.c"
+#line 33848 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33730 "Photo.c"
+#line 33855 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState * obj) {
 	PhotoReimportRawDevelopmentState * self;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33740 "Photo.c"
+#line 33865 "Photo.c"
 }
 
 
@@ -33762,42 +33887,42 @@ GType photo_reimport_raw_development_state_get_type (void) {
 gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
 	PhotoReimportRawDevelopmentState * self;
 	self = instance;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33765 "Photo.c"
+#line 33890 "Photo.c"
 }
 
 
 void photo_reimport_raw_development_state_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentState * self;
 	self = instance;
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
-#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33778 "Photo.c"
+#line 33903 "Photo.c"
 	}
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) {
 	PhotoReimportRawDevelopmentStateImpl* self = NULL;
-#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
-#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33789 "Photo.c"
+#line 33914 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
-#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33796 "Photo.c"
+#line 33921 "Photo.c"
 }
 
 
@@ -33807,27 +33932,27 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
 	PhotoMetadata* _tmp2_;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_;
-#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self));
-#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (backing));
-#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_);
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_collection_add (_tmp0_, _tmp4_);
-#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33826 "Photo.c"
+#line 33951 "Photo.c"
 }
 
 
@@ -33836,19 +33961,19 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
 	GeeCollection* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0);
-#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33847 "Photo.c"
+#line 33972 "Photo.c"
 }
 
 
@@ -33858,253 +33983,253 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	BackingPhotoRow* _tmp1_;
 	PhotoMetadata* _tmp2_;
 	PhotoMetadata* _tmp3_;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type);
-#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing;
-#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp1_;
-#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33881 "Photo.c"
+#line 34006 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) {
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata);
-#line 33888 "Photo.c"
+#line 34013 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33895 "Photo.c"
+#line 34020 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33904 "Photo.c"
+#line 34029 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (src_value->data[0].v_pointer);
-#line 33914 "Photo.c"
+#line 34039 "Photo.c"
 	} else {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33918 "Photo.c"
+#line 34043 "Photo.c"
 	}
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33926 "Photo.c"
+#line 34051 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33933 "Photo.c"
+#line 34058 "Photo.c"
 		PhotoReimportRawDevelopmentStateImplDevToReimport * object;
 		object = collect_values[0].v_pointer;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33940 "Photo.c"
+#line 34065 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.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 33944 "Photo.c"
+#line 34069 "Photo.c"
 		}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33948 "Photo.c"
+#line 34073 "Photo.c"
 	} else {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33952 "Photo.c"
+#line 34077 "Photo.c"
 	}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33956 "Photo.c"
+#line 34081 "Photo.c"
 }
 
 
 static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33967 "Photo.c"
+#line 34092 "Photo.c"
 	}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33973 "Photo.c"
+#line 34098 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33977 "Photo.c"
+#line 34102 "Photo.c"
 	} else {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 33981 "Photo.c"
+#line 34106 "Photo.c"
 	}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33985 "Photo.c"
+#line 34110 "Photo.c"
 }
 
 
 static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_reimport (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PhotoReimportRawDevelopmentStateImplParamSpecDevToReimport* spec;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33999 "Photo.c"
+#line 34124 "Photo.c"
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 34008 "Photo.c"
+#line 34133 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * old;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 34028 "Photo.c"
+#line 34153 "Photo.c"
 	} else {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 34032 "Photo.c"
+#line 34157 "Photo.c"
 	}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34038 "Photo.c"
+#line 34163 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * old;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 34057 "Photo.c"
+#line 34182 "Photo.c"
 	} else {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 34061 "Photo.c"
+#line 34186 "Photo.c"
 	}
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 34067 "Photo.c"
+#line 34192 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 34077 "Photo.c"
+#line 34202 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) {
 	BackingPhotoRow* _tmp0_;
-#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp0_;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 34089 "Photo.c"
+#line 34214 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport * obj) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, PhotoReimportRawDevelopmentStateImplDevToReimport);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 34103 "Photo.c"
+#line 34228 "Photo.c"
 }
 
 
@@ -34125,58 +34250,58 @@ GType photo_reimport_raw_development_state_impl_dev_to_reimport_get_type (void)
 static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (gpointer instance) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
 	self = instance;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34128 "Photo.c"
+#line 34253 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
 	self = instance;
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 34141 "Photo.c"
+#line 34266 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) {
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34151 "Photo.c"
+#line 34276 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
 	GeeArrayList* _tmp0_;
-#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_array_list_new (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, (GBoxedCopyFunc) photo_reimport_raw_development_state_impl_dev_to_reimport_ref, (GDestroyNotify) photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 34163 "Photo.c"
+#line 34288 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState * obj) {
 	PhotoReimportRawDevelopmentStateImpl * self;
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl);
-#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->list);
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34175 "Photo.c"
+#line 34300 "Photo.c"
 }
 
 
@@ -34319,7 +34444,7 @@ static void photo_class_init (PhotoClass * klass) {
 	photo_signals[PHOTO_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_PHOTO, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (PhotoClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__MEDIA_METADATA, G_TYPE_NONE, 1, TYPE_PHOTO_METADATA);
 #line 326 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_rec_mutex_init (&__lock_photo_source_pixbuf_cache);
-#line 34318 "Photo.c"
+#line 34443 "Photo.c"
 }
 
 
@@ -34330,7 +34455,7 @@ static void photo_dateable_interface_init (DateableIface * iface) {
 	iface->get_exposure_time = (time_t (*) (Dateable *)) photo_real_get_exposure_time;
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_exposure_time = (void (*) (Dateable *, time_t)) photo_real_set_exposure_time;
-#line 34329 "Photo.c"
+#line 34454 "Photo.c"
 }
 
 
@@ -34373,7 +34498,7 @@ static void photo_instance_init (Photo * self) {
 	self->priv->developments = NULL;
 #line 353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_photo_row = NULL;
-#line 34372 "Photo.c"
+#line 34497 "Photo.c"
 }
 
 
@@ -34413,7 +34538,7 @@ static void photo_finalize (GObject * obj) {
 	_backing_photo_row_unref0 (self->backing_photo_row);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (photo_parent_class)->finalize (obj);
-#line 34412 "Photo.c"
+#line 34537 "Photo.c"
 }
 
 
@@ -34436,13 +34561,13 @@ static void _vala_photo_get_property (GObject * object, guint property_id, GValu
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34435 "Photo.c"
+#line 34560 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34441 "Photo.c"
+#line 34566 "Photo.c"
 	}
 }
 
@@ -34452,13 +34577,13 @@ static void _vala_photo_set_property (GObject * object, guint property_id, const
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PHOTO, Photo);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (property_id) {
-#line 34451 "Photo.c"
+#line 34576 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34457 "Photo.c"
+#line 34582 "Photo.c"
 	}
 }
 
@@ -34478,71 +34603,71 @@ GType library_photo_source_collection_state_get_type (void) {
 static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	guint result;
 	result = file_hash ((GFile*) v);
-#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34479 "Photo.c"
+#line 34604 "Photo.c"
 }
 
 
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
-#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34488 "Photo.c"
+#line 34613 "Photo.c"
 }
 
 
 static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = int64_compare ((gint64*) a, (gint64*) b);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34497 "Photo.c"
+#line 34622 "Photo.c"
 }
 
 
 static gint64* _int64_dup (gint64* self) {
 	gint64* dup;
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (gint64, 1);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (gint64));
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34509 "Photo.c"
+#line 34634 "Photo.c"
 }
 
 
 static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = int64_equal ((gint64*) a, (gint64*) b);
-#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34518 "Photo.c"
+#line 34643 "Photo.c"
 }
 
 
 static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = photo_get_photo_key (source);
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34527 "Photo.c"
+#line 34652 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34534 "Photo.c"
+#line 34659 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34541 "Photo.c"
+#line 34666 "Photo.c"
 }
 
 
@@ -34552,43 +34677,43 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
 	MediaSourceHoldingTank* _tmp1_;
 	MediaSourceHoldingTank* _tmp2_;
 	MediaSourceHoldingTank* _tmp3_;
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhotoSourceCollection*) media_source_collection_construct (object_type, "LibraryPhotoSourceCollection", _photo_get_photo_key_get_source_database_key, NULL);
-#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _library_photo_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 34571 "Photo.c"
+#line 34696 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
-#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34578 "Photo.c"
+#line 34703 "Photo.c"
 }
 
 
 static gboolean _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
-#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34587 "Photo.c"
+#line 34712 "Photo.c"
 }
 
 
@@ -34596,24 +34721,24 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_;
-#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_trashed_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL);
-#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34603 "Photo.c"
+#line 34728 "Photo.c"
 }
 
 
 static gboolean _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
-#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34612 "Photo.c"
+#line 34737 "Photo.c"
 }
 
 
@@ -34621,15 +34746,15 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_;
-#line 4500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4519 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_holding_tank_new (self, _library_photo_source_collection_check_if_offline_photo_source_holding_tank_check_to_keep, self, _photo_get_photo_key_get_source_database_key, NULL);
-#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34628 "Photo.c"
+#line 34753 "Photo.c"
 }
 
 
@@ -34639,23 +34764,23 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
 	Workers* _tmp0_;
 	GCancellable* _tmp1_;
 	PhotoMonitor* _tmp2_;
-#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = workers;
-#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = cancellable;
-#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_monitor_new (_tmp0_, _tmp1_);
-#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34654 "Photo.c"
+#line 34779 "Photo.c"
 }
 
 
@@ -34663,17 +34788,17 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
-#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
-#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34672 "Photo.c"
+#line 34797 "Photo.c"
 }
 
 
@@ -34681,15 +34806,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	LibraryPhotoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34688 "Photo.c"
+#line 34813 "Photo.c"
 }
 
 
@@ -34698,33 +34823,33 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
 	gboolean result = FALSE;
 	GFile* _tmp0_;
 	gboolean _tmp1_;
-#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_file_format_is_file_supported (_tmp0_);
-#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34709 "Photo.c"
+#line 34834 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34716 "Photo.c"
+#line 34841 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4554 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34723 "Photo.c"
+#line 34848 "Photo.c"
 }
 
 
@@ -34734,30 +34859,30 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	GeeIterable* _tmp75_;
 	GeeIterable* _tmp153_;
 	GeeIterable* _tmp154_;
-#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 34743 "Photo.c"
+#line 34868 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp2_;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 34756 "Photo.c"
+#line 34881 "Photo.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataObject* object = NULL;
@@ -34799,80 +34924,80 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp56_;
 				GeeCollection* _tmp57_;
 				GeeCollection* _tmp58_;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _object_it;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 34806 "Photo.c"
+#line 34931 "Photo.c"
 				}
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp6_;
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = object;
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp8_;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp10_;
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = editable;
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != NULL) {
-#line 34830 "Photo.c"
+#line 34955 "Photo.c"
 					GeeHashMap* _tmp12_;
 					GFile* _tmp13_;
 					LibraryPhoto* _tmp14_;
-#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->by_editable_file;
-#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = editable;
-#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp14_);
-#line 34842 "Photo.c"
+#line 34967 "Photo.c"
 				}
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = photo;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo));
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp17_;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = raw_list;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp18_ != NULL) {
-#line 34858 "Photo.c"
+#line 34983 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp19_;
 						GeeIterator* _tmp20_;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = raw_list;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp20_;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34871 "Photo.c"
+#line 34996 "Photo.c"
 							GeeIterator* _tmp21_;
 							gboolean _tmp22_;
 							GFile* f = NULL;
@@ -34881,163 +35006,163 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							GeeHashMap* _tmp25_;
 							GFile* _tmp26_;
 							LibraryPhoto* _tmp27_;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = _f_it;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = gee_iterator_next (_tmp21_);
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp22_) {
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34888 "Photo.c"
+#line 35013 "Photo.c"
 							}
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = gee_iterator_get (_tmp23_);
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp24_;
-#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->by_raw_development_file;
-#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = f;
-#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo;
-#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_);
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 34906 "Photo.c"
+#line 35031 "Photo.c"
 						}
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34910 "Photo.c"
+#line 35035 "Photo.c"
 					}
 				}
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4554 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = photo;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4554 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = photo;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo));
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = _tmp30_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = _tmp31_->filesize;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp31_);
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4556 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp33_;
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_;
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_ != NULL;
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp37_);
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp38_) {
-#line 34943 "Photo.c"
+#line 35068 "Photo.c"
 					LibraryPhoto* _tmp39_;
 					BackingPhotoRow* _tmp40_;
 					BackingPhotoRow* _tmp41_;
 					gint64 _tmp42_;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo));
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = _tmp40_;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->filesize;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = _tmp42_;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp41_);
-#line 34960 "Photo.c"
+#line 35085 "Photo.c"
 				} else {
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34964 "Photo.c"
+#line 35089 "Photo.c"
 				}
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4557 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = self->priv->filesize_to_photo;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = master_filesize;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_);
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = self->priv->photo_to_master_filesize;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = photo;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = master_filesize;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp47_, &_tmp48_);
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = editable_filesize;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_ >= ((gint64) 0)) {
-#line 34988 "Photo.c"
+#line 35113 "Photo.c"
 					GeeMultiMap* _tmp50_;
 					gint64 _tmp51_;
 					LibraryPhoto* _tmp52_;
 					GeeHashMap* _tmp53_;
 					LibraryPhoto* _tmp54_;
 					gint64 _tmp55_;
-#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->filesize_to_photo;
-#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = editable_filesize;
-#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = photo;
-#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_);
-#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = self->priv->photo_to_editable_filesize;
-#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = photo;
-#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = editable_filesize;
-#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp54_, &_tmp55_);
-#line 35011 "Photo.c"
+#line 35136 "Photo.c"
 				}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo));
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp57_;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = raw_rows;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4568 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp58_ != NULL) {
-#line 35023 "Photo.c"
+#line 35148 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp59_;
 						GeeIterator* _tmp60_;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = raw_rows;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp60_;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35036 "Photo.c"
+#line 35161 "Photo.c"
 							GeeIterator* _tmp61_;
 							gboolean _tmp62_;
 							BackingPhotoRow* row = NULL;
@@ -35045,29 +35170,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp64_;
 							BackingPhotoRow* _tmp65_;
 							gint64 _tmp66_;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp61_ = _row_it;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp62_ = gee_iterator_next (_tmp61_);
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp62_) {
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35052 "Photo.c"
+#line 35177 "Photo.c"
 							}
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp64_ = gee_iterator_get (_tmp63_);
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp64_;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp65_ = row;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp66_ = _tmp65_->filesize;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp66_ >= ((gint64) 0)) {
-#line 35066 "Photo.c"
+#line 35191 "Photo.c"
 								GeeMultiMap* _tmp67_;
 								BackingPhotoRow* _tmp68_;
 								gint64 _tmp69_;
@@ -35076,72 +35201,72 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp72_;
 								BackingPhotoRow* _tmp73_;
 								gint64 _tmp74_;
-#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp67_ = self->priv->filesize_to_photo;
-#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp68_ = row;
-#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp69_ = _tmp68_->filesize;
-#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp70_ = photo;
-#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_);
-#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp71_ = self->priv->photo_to_raw_development_filesize;
-#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp72_ = photo;
-#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp73_ = row;
-#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp74_ = _tmp73_->filesize;
-#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35095 "Photo.c"
+#line 35220 "Photo.c"
 							}
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35099 "Photo.c"
+#line 35224 "Photo.c"
 						}
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35103 "Photo.c"
+#line 35228 "Photo.c"
 					}
 				}
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35116 "Photo.c"
+#line 35241 "Photo.c"
 			}
-#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35120 "Photo.c"
+#line 35245 "Photo.c"
 		}
 	}
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = removed;
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_ != NULL) {
-#line 35127 "Photo.c"
+#line 35252 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp76_;
 			GeeIterator* _tmp77_;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = removed;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterable_iterator (_tmp76_);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp77_;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35140 "Photo.c"
+#line 35265 "Photo.c"
 				GeeIterator* _tmp78_;
 				gboolean _tmp79_;
 				DataObject* object = NULL;
@@ -35184,39 +35309,39 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp134_;
 				GeeCollection* _tmp135_;
 				GeeCollection* _tmp136_;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = _object_it;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = gee_iterator_next (_tmp78_);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp79_) {
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35191 "Photo.c"
+#line 35316 "Photo.c"
 				}
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp81_ = gee_iterator_get (_tmp80_);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp81_;
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp82_ = object;
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp83_;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp84_ = photo;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo));
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp85_;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp86_ = editable;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp86_ != NULL) {
-#line 35215 "Photo.c"
+#line 35340 "Photo.c"
 					gboolean is_removed = FALSE;
 					GeeHashMap* _tmp87_;
 					LibraryPhoto* _tmp88_;
@@ -35225,58 +35350,58 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					gboolean _tmp91_;
 					gboolean _tmp92_;
 					gboolean _tmp93_;
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = self->priv->by_editable_file;
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = photo;
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo));
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _tmp89_;
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp91_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL);
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_;
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp90_);
-#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_removed = _tmp92_;
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = is_removed;
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
 					_vala_assert (_tmp93_, "is_removed");
-#line 35244 "Photo.c"
+#line 35369 "Photo.c"
 				}
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE);
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp95_, 0, NULL, (GCallback) _library_photo_source_collection_on_editable_replaced_photo_editable_replaced, self);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = photo;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo));
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp97_;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = raw_list;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp98_ != NULL) {
-#line 35262 "Photo.c"
+#line 35387 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp99_;
 						GeeIterator* _tmp100_;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp99_ = raw_list;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp100_;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35275 "Photo.c"
+#line 35400 "Photo.c"
 							GeeIterator* _tmp101_;
 							gboolean _tmp102_;
 							GFile* f = NULL;
@@ -35284,158 +35409,158 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp104_;
 							GeeHashMap* _tmp105_;
 							GFile* _tmp106_;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp101_ = _f_it;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp102_ = gee_iterator_next (_tmp101_);
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp102_) {
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35291 "Photo.c"
+#line 35416 "Photo.c"
 							}
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp104_ = gee_iterator_get (_tmp103_);
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp104_;
-#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp105_ = self->priv->by_raw_development_file;
-#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp106_ = f;
-#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL);
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 35307 "Photo.c"
+#line 35432 "Photo.c"
 						}
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35311 "Photo.c"
+#line 35436 "Photo.c"
 					}
 				}
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = photo;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE);
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4594 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp108_, 0, NULL, (GCallback) _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified, self);
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp109_ = photo;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo));
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = _tmp110_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp111_->filesize;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp113_ = _tmp112_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp111_);
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4596 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp113_;
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = photo;
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo));
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp118_ = _tmp117_ != NULL;
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp117_);
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp118_) {
-#line 35346 "Photo.c"
+#line 35471 "Photo.c"
 					LibraryPhoto* _tmp119_;
 					BackingPhotoRow* _tmp120_;
 					BackingPhotoRow* _tmp121_;
 					gint64 _tmp122_;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = photo;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo));
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = _tmp120_;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = _tmp121_->filesize;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = _tmp122_;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp121_);
-#line 35363 "Photo.c"
+#line 35488 "Photo.c"
 				} else {
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4599 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35367 "Photo.c"
+#line 35492 "Photo.c"
 				}
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4597 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp123_ = self->priv->filesize_to_photo;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp124_ = master_filesize;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp125_ = photo;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_);
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp126_ = self->priv->photo_to_master_filesize;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp127_ = photo;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp127_, NULL);
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp128_ = editable_filesize;
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp128_ >= ((gint64) 0)) {
-#line 35389 "Photo.c"
+#line 35514 "Photo.c"
 					GeeMultiMap* _tmp129_;
 					gint64 _tmp130_;
 					LibraryPhoto* _tmp131_;
 					GeeHashMap* _tmp132_;
 					LibraryPhoto* _tmp133_;
-#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp129_ = self->priv->filesize_to_photo;
-#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp130_ = editable_filesize;
-#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp131_ = photo;
-#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_);
-#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp132_ = self->priv->photo_to_editable_filesize;
-#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp133_ = photo;
-#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp133_, NULL);
-#line 35409 "Photo.c"
+#line 35534 "Photo.c"
 				}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo));
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp135_;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp136_ = raw_rows;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp136_ != NULL) {
-#line 35421 "Photo.c"
+#line 35546 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp137_;
 						GeeIterator* _tmp138_;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp137_ = raw_rows;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp138_;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35434 "Photo.c"
+#line 35559 "Photo.c"
 							GeeIterator* _tmp139_;
 							gboolean _tmp140_;
 							BackingPhotoRow* row = NULL;
@@ -35443,29 +35568,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp142_;
 							BackingPhotoRow* _tmp143_;
 							gint64 _tmp144_;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp139_ = _row_it;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp140_ = gee_iterator_next (_tmp139_);
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp140_) {
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35450 "Photo.c"
+#line 35575 "Photo.c"
 							}
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp142_ = gee_iterator_get (_tmp141_);
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp142_;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp143_ = row;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp144_ = _tmp143_->filesize;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp144_ >= ((gint64) 0)) {
-#line 35464 "Photo.c"
+#line 35589 "Photo.c"
 								GeeMultiMap* _tmp145_;
 								BackingPhotoRow* _tmp146_;
 								gint64 _tmp147_;
@@ -35474,116 +35599,116 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp150_;
 								BackingPhotoRow* _tmp151_;
 								gint64 _tmp152_;
-#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp145_ = self->priv->filesize_to_photo;
-#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp146_ = row;
-#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp147_ = _tmp146_->filesize;
-#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp148_ = photo;
-#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_);
-#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp149_ = self->priv->photo_to_raw_development_filesize;
-#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp150_ = photo;
-#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp151_ = row;
-#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp152_ = _tmp151_->filesize;
-#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35493 "Photo.c"
+#line 35618 "Photo.c"
 							}
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35497 "Photo.c"
+#line 35622 "Photo.c"
 						}
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35501 "Photo.c"
+#line 35626 "Photo.c"
 					}
 				}
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35514 "Photo.c"
+#line 35639 "Photo.c"
 			}
-#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35518 "Photo.c"
+#line 35643 "Photo.c"
 		}
 	}
-#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = added;
-#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = removed;
-#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp153_, _tmp154_);
-#line 35527 "Photo.c"
+#line 35652 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) {
 	GFile* _tmp0_;
 	GFile* _tmp5_;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4623 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = old_file;
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4623 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 35546 "Photo.c"
+#line 35671 "Photo.c"
 		gboolean is_removed = FALSE;
 		GeeHashMap* _tmp1_;
 		GFile* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->priv->by_editable_file;
-#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = old_file;
-#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL);
-#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_removed = _tmp3_;
-#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = is_removed;
-#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp4_, "is_removed");
-#line 35564 "Photo.c"
+#line 35689 "Photo.c"
 	}
-#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = new_file;
-#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 35570 "Photo.c"
+#line 35695 "Photo.c"
 		GeeHashMap* _tmp6_;
 		GFile* _tmp7_;
 		Photo* _tmp8_;
-#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->by_editable_file;
-#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = new_file;
-#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo;
-#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 35582 "Photo.c"
+#line 35707 "Photo.c"
 	}
 }
 
@@ -35604,35 +35729,35 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	LibraryPhoto* _tmp35_;
 	GeeCollection* _tmp36_;
 	GeeCollection* _tmp37_;
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 35621 "Photo.c"
+#line 35746 "Photo.c"
 	}
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4638 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4638 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4638 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4638 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 35631 "Photo.c"
+#line 35756 "Photo.c"
 		GeeMultiMap* _tmp21_;
 		LibraryPhoto* _tmp22_;
 		{
@@ -35643,25 +35768,25 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			GeeCollection* _tmp9_;
 			GeeIterator* _tmp10_;
 			GeeIterator* _tmp11_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->photo_to_raw_development_filesize;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_s_it = _tmp11_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35660 "Photo.c"
+#line 35785 "Photo.c"
 				GeeIterator* _tmp12_;
 				gboolean _tmp13_;
 				gint64 s = 0LL;
@@ -35672,74 +35797,74 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeMultiMap* _tmp18_;
 				gint64 _tmp19_;
 				LibraryPhoto* _tmp20_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _s_it;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35679 "Photo.c"
+#line 35804 "Photo.c"
 				}
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = (gint64*) _tmp15_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *_tmp16_;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp16_);
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 				s = _tmp17_;
-#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->priv->filesize_to_photo;
-#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = s;
-#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = photo;
-#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35701 "Photo.c"
+#line 35826 "Photo.c"
 			}
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35705 "Photo.c"
+#line 35830 "Photo.c"
 		}
-#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
-#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = photo;
-#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35713 "Photo.c"
+#line 35838 "Photo.c"
 	}
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4645 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4645 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4645 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp24_;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = raw_list;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_ != NULL) {
-#line 35725 "Photo.c"
+#line 35850 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp26_;
 			GeeIterator* _tmp27_;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = raw_list;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp27_;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35738 "Photo.c"
+#line 35863 "Photo.c"
 				GeeIterator* _tmp28_;
 				gboolean _tmp29_;
 				GFile* f = NULL;
@@ -35748,63 +35873,63 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeHashMap* _tmp32_;
 				GFile* _tmp33_;
 				LibraryPhoto* _tmp34_;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _f_it;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = gee_iterator_next (_tmp28_);
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp29_) {
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35755 "Photo.c"
+#line 35880 "Photo.c"
 				}
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = gee_iterator_get (_tmp30_);
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp31_;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->by_raw_development_file;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = f;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = photo;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 35773 "Photo.c"
+#line 35898 "Photo.c"
 			}
-#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35777 "Photo.c"
+#line 35902 "Photo.c"
 		}
 	}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rows = _tmp36_;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = raw_rows;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_ != NULL) {
-#line 35790 "Photo.c"
+#line 35915 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp38_;
 			GeeIterator* _tmp39_;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = raw_rows;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp39_;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35803 "Photo.c"
+#line 35928 "Photo.c"
 				GeeIterator* _tmp40_;
 				gboolean _tmp41_;
 				BackingPhotoRow* row = NULL;
@@ -35812,29 +35937,29 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				gpointer _tmp43_;
 				BackingPhotoRow* _tmp44_;
 				gint64 _tmp45_;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _row_it;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_iterator_next (_tmp40_);
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp41_) {
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35819 "Photo.c"
+#line 35944 "Photo.c"
 				}
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = gee_iterator_get (_tmp42_);
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp43_;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = row;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_->filesize;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp45_ > ((gint64) 0)) {
-#line 35833 "Photo.c"
+#line 35958 "Photo.c"
 					GeeMultiMap* _tmp46_;
 					BackingPhotoRow* _tmp47_;
 					gint64 _tmp48_;
@@ -35843,62 +35968,62 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 					LibraryPhoto* _tmp51_;
 					BackingPhotoRow* _tmp52_;
 					gint64 _tmp53_;
-#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp46_ = self->priv->filesize_to_photo;
-#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp47_ = row;
-#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp48_ = _tmp47_->filesize;
-#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = photo;
-#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_);
-#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->photo_to_raw_development_filesize;
-#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = photo;
-#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = row;
-#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = _tmp52_->filesize;
-#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35862 "Photo.c"
+#line 35987 "Photo.c"
 				}
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35866 "Photo.c"
+#line 35991 "Photo.c"
 			}
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35870 "Photo.c"
+#line 35995 "Photo.c"
 		}
 	}
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_rows);
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 35879 "Photo.c"
+#line 36004 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4671 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35886 "Photo.c"
+#line 36011 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) {
 	LibraryPhotoSourceCollection * self;
 	GeeMap* _tmp72_;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 35897 "Photo.c"
+#line 36022 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -35907,25 +36032,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = items;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_object_it = _tmp5_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 35924 "Photo.c"
+#line 36049 "Photo.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -35941,59 +36066,59 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			gboolean _tmp15_ = FALSE;
 			Alteration* _tmp16_;
 			gboolean _tmp17_;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _object_it;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35948 "Photo.c"
+#line 36073 "Photo.c"
 			}
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			object = (DataObject*) _tmp9_;
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = items;
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = object;
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 			alteration = (Alteration*) _tmp12_;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = object;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp14_;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = alteration;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = alteration_has_detail (_tmp16_, "image", "master");
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp17_) {
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 35978 "Photo.c"
+#line 36103 "Photo.c"
 			} else {
 				Alteration* _tmp18_;
 				gboolean _tmp19_;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = alteration;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 35988 "Photo.c"
+#line 36113 "Photo.c"
 			}
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 35992 "Photo.c"
+#line 36117 "Photo.c"
 				gint64 old_master_filesize = 0LL;
 				GeeHashMap* _tmp20_;
 				LibraryPhoto* _tmp21_;
@@ -36030,215 +36155,215 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				gint64 _tmp63_;
 				LibraryPhoto* _tmp64_;
 				gint64 _tmp65_;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->priv->photo_to_master_filesize;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = photo;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_);
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = (gint64*) _tmp22_;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = *_tmp23_;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp23_);
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_master_filesize = _tmp24_;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = self->priv->photo_to_editable_filesize;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = photo;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 36051 "Photo.c"
+#line 36176 "Photo.c"
 					GeeHashMap* _tmp29_;
 					LibraryPhoto* _tmp30_;
 					gpointer _tmp31_;
-#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4670 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->priv->photo_to_editable_filesize;
-#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4670 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4670 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_);
-#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4670 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4670 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = (gint64*) _tmp31_;
-#line 36065 "Photo.c"
+#line 36190 "Photo.c"
 				} else {
 					gint64 _tmp32_;
 					gint64* _tmp33_;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4671 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = (gint64) -1;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4671 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = __int64_dup0 (&_tmp32_);
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4671 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4671 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = _tmp33_;
-#line 36077 "Photo.c"
+#line 36202 "Photo.c"
 				}
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4673 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = self->priv->photo_to_master_filesize;
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4673 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4673 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp35_, NULL);
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = self->priv->filesize_to_photo;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = old_master_filesize;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_);
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4675 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = old_editable_filesize;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4675 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp39_ >= ((gint64) 0)) {
-#line 36099 "Photo.c"
+#line 36224 "Photo.c"
 					GeeHashMap* _tmp40_;
 					LibraryPhoto* _tmp41_;
 					GeeMultiMap* _tmp42_;
 					gint64 _tmp43_;
 					LibraryPhoto* _tmp44_;
-#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->photo_to_editable_filesize;
-#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = photo;
-#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, NULL);
-#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = self->priv->filesize_to_photo;
-#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp43_ = old_editable_filesize;
-#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp44_ = photo;
-#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36119 "Photo.c"
+#line 36244 "Photo.c"
 				}
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo));
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _tmp47_->filesize;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp47_);
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp49_;
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = photo;
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo));
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = _tmp52_;
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp54_ = _tmp53_ != NULL;
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp53_);
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp54_) {
-#line 36147 "Photo.c"
+#line 36272 "Photo.c"
 					LibraryPhoto* _tmp55_;
 					BackingPhotoRow* _tmp56_;
 					BackingPhotoRow* _tmp57_;
 					gint64 _tmp58_;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = photo;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo));
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = _tmp56_;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = _tmp57_->filesize;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = _tmp58_;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp57_);
-#line 36164 "Photo.c"
+#line 36289 "Photo.c"
 				} else {
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4683 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36168 "Photo.c"
+#line 36293 "Photo.c"
 				}
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4684 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->photo_to_master_filesize;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4684 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4684 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = master_filesize;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4684 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, &_tmp61_);
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = self->priv->filesize_to_photo;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = master_filesize;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = photo;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_);
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = editable_filesize;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4686 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp65_ >= ((gint64) 0)) {
-#line 36192 "Photo.c"
+#line 36317 "Photo.c"
 					GeeHashMap* _tmp66_;
 					LibraryPhoto* _tmp67_;
 					gint64 _tmp68_;
 					GeeMultiMap* _tmp69_;
 					gint64 _tmp70_;
 					LibraryPhoto* _tmp71_;
-#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4687 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = self->priv->photo_to_editable_filesize;
-#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4687 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp67_ = photo;
-#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4687 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = editable_filesize;
-#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4687 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp67_, &_tmp68_);
-#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4688 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp69_ = self->priv->filesize_to_photo;
-#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4688 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp70_ = editable_filesize;
-#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4688 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp71_ = photo;
-#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4688 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36215 "Photo.c"
+#line 36340 "Photo.c"
 				}
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36219 "Photo.c"
+#line 36344 "Photo.c"
 			}
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (alteration);
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (object);
-#line 36227 "Photo.c"
+#line 36352 "Photo.c"
 		}
-#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36231 "Photo.c"
+#line 36356 "Photo.c"
 	}
-#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = items;
-#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp72_);
-#line 36237 "Photo.c"
+#line 36362 "Photo.c"
 }
 
 
@@ -36247,28 +36372,28 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	GeeHashMultiMap* map = NULL;
 	GeeHashMultiMap* _tmp0_;
 	GeeCollection* _tmp97_;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 36254 "Photo.c"
+#line 36379 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_sources;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp2_;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36267 "Photo.c"
+#line 36392 "Photo.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			MediaSource* media = NULL;
@@ -36291,80 +36416,80 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			gboolean _tmp21_;
 			PhotoMetadata* _tmp55_;
 			gboolean _tmp56_;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _media_it;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp4_) {
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36298 "Photo.c"
+#line 36423 "Photo.c"
 			}
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp6_;
-#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = media;
-#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp8_;
-#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = photo;
-#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 			metadata = _tmp10_;
-#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
 			global_index = _tmp11_;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 			htag_index = NULL;
-#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = metadata;
-#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
-#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 36330 "Photo.c"
+#line 36455 "Photo.c"
 				PhotoMetadata* _tmp14_;
 				GeeSet* _tmp15_;
 				GeeSet* _tmp16_;
 				HierarchicalTagIndex* _tmp17_;
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = metadata;
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_);
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_;
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_hierarchical_tag_index_unref0 (htag_index);
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				htag_index = _tmp17_;
-#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp16_);
-#line 36349 "Photo.c"
+#line 36474 "Photo.c"
 			}
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = library_photo_get_import_keywords (_tmp18_);
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_ != NULL;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp20_);
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 36363 "Photo.c"
+#line 36488 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
 					LibraryPhoto* _tmp22_;
@@ -36372,23 +36497,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp24_;
 					GeeIterator* _tmp25_;
 					GeeIterator* _tmp26_;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = photo;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = library_photo_get_import_keywords (_tmp22_);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = _tmp25_;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp24_);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_keyword_it = _tmp26_;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36387 "Photo.c"
+#line 36512 "Photo.c"
 						GeeIterator* _tmp27_;
 						gboolean _tmp28_;
 						gchar* keyword = NULL;
@@ -36403,67 +36528,67 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp39_;
 						gboolean _tmp40_;
 						const gchar* _tmp49_;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _keyword_it;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = gee_iterator_next (_tmp27_);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp28_) {
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36410 "Photo.c"
+#line 36535 "Photo.c"
 						}
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = gee_iterator_get (_tmp29_);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						keyword = (gchar*) _tmp30_;
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = htag_index;
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp32_ != NULL) {
-#line 36422 "Photo.c"
+#line 36547 "Photo.c"
 							HierarchicalTagIndex* _tmp33_;
 							const gchar* _tmp34_;
 							gboolean _tmp35_;
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = htag_index;
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = keyword;
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = _tmp35_;
-#line 36434 "Photo.c"
+#line 36559 "Photo.c"
 						} else {
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36438 "Photo.c"
+#line 36563 "Photo.c"
 						}
-#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36446 "Photo.c"
+#line 36571 "Photo.c"
 						}
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4722 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4722 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp37_ = tag_prep_tag_name (_tmp36_);
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4722 "/home/jens/Source/shotwell/src/Photo.vala"
 						name = _tmp37_;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = global_index;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp39_ = name;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp40_) {
-#line 36462 "Photo.c"
+#line 36587 "Photo.c"
 							gchar* most_derived_path = NULL;
 							HierarchicalTagIndex* _tmp41_;
 							const gchar* _tmp42_;
@@ -36473,82 +36598,82 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							Tag* _tmp46_;
 							Tag* _tmp47_;
 							LibraryPhoto* _tmp48_;
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp41_ = global_index;
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp42_ = name;
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 							most_derived_path = _tmp43_;
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp44_ = map;
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp45_ = most_derived_path;
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp46_ = tag_for_path (_tmp45_);
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp47_ = _tmp46_;
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp48_ = photo;
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp47_, _tmp48_);
-#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp47_);
-#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (most_derived_path);
-#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (name);
-#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36502 "Photo.c"
+#line 36627 "Photo.c"
 						}
-#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp49_ = name;
-#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp49_ != NULL) {
-#line 36508 "Photo.c"
+#line 36633 "Photo.c"
 							GeeHashMultiMap* _tmp50_;
 							const gchar* _tmp51_;
 							Tag* _tmp52_;
 							Tag* _tmp53_;
 							LibraryPhoto* _tmp54_;
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp50_ = map;
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp51_ = name;
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp52_ = tag_for_path (_tmp51_);
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp53_ = _tmp52_;
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp54_ = photo;
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_);
-#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp53_);
-#line 36528 "Photo.c"
+#line 36653 "Photo.c"
 						}
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (keyword);
-#line 36534 "Photo.c"
+#line 36659 "Photo.c"
 					}
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36538 "Photo.c"
+#line 36663 "Photo.c"
 				}
 			}
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = metadata;
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp56_) {
-#line 36547 "Photo.c"
+#line 36672 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
 					HierarchicalTagIndex* _tmp57_;
@@ -36556,23 +36681,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp59_;
 					GeeIterator* _tmp60_;
 					GeeIterator* _tmp61_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = htag_index;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_);
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp59_ = _tmp58_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp60_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp59_);
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_path_it = _tmp61_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36571 "Photo.c"
+#line 36696 "Photo.c"
 						GeeIterator* _tmp62_;
 						gboolean _tmp63_;
 						gchar* path = NULL;
@@ -36582,94 +36707,94 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp66_;
 						gchar* _tmp67_;
 						const gchar* _tmp68_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp62_ = _path_it;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp63_ = gee_iterator_next (_tmp62_);
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp63_) {
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36589 "Photo.c"
+#line 36714 "Photo.c"
 						}
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp65_ = gee_iterator_get (_tmp64_);
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						path = (gchar*) _tmp65_;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp66_ = path;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = tag_prep_tag_name (_tmp66_);
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 						name = _tmp67_;
-#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = name;
-#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp68_ != NULL) {
-#line 36607 "Photo.c"
+#line 36732 "Photo.c"
 							GeeHashMultiMap* _tmp69_;
 							const gchar* _tmp70_;
 							Tag* _tmp71_;
 							Tag* _tmp72_;
 							LibraryPhoto* _tmp73_;
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp69_ = map;
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp70_ = name;
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp71_ = tag_for_path (_tmp70_);
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp72_ = _tmp71_;
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp73_ = photo;
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_);
-#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4739 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp72_);
-#line 36627 "Photo.c"
+#line 36752 "Photo.c"
 						}
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (path);
-#line 36633 "Photo.c"
+#line 36758 "Photo.c"
 					}
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36637 "Photo.c"
+#line 36762 "Photo.c"
 				}
 			}
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (htag_index);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (global_index);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36650 "Photo.c"
+#line 36775 "Photo.c"
 		}
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36654 "Photo.c"
+#line 36779 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp74_;
 		GeeIterator* _tmp75_;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = media_sources;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp75_;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36668 "Photo.c"
+#line 36793 "Photo.c"
 			GeeIterator* _tmp76_;
 			gboolean _tmp77_;
 			MediaSource* media = NULL;
@@ -36679,41 +36804,41 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			MediaSource* _tmp80_;
 			LibraryPhoto* _tmp81_;
 			LibraryPhoto* _tmp82_;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _media_it;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterator_next (_tmp76_);
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp77_) {
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36686 "Photo.c"
+#line 36811 "Photo.c"
 			}
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = gee_iterator_get (_tmp78_);
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp79_;
-#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = media;
-#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp81_;
-#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = photo;
-#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_clear_import_keywords (_tmp82_);
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36708 "Photo.c"
+#line 36833 "Photo.c"
 		}
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4744 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36712 "Photo.c"
+#line 36837 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
@@ -36722,23 +36847,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		GeeSet* _tmp85_;
 		GeeIterator* _tmp86_;
 		GeeIterator* _tmp87_;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = map;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = _tmp86_;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp85_);
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tag_it = _tmp87_;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36737 "Photo.c"
+#line 36862 "Photo.c"
 			GeeIterator* _tmp88_;
 			gboolean _tmp89_;
 			Tag* tag = NULL;
@@ -36749,155 +36874,155 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			Tag* _tmp94_;
 			GeeCollection* _tmp95_;
 			GeeCollection* _tmp96_;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp88_ = _tag_it;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp89_ = gee_iterator_next (_tmp88_);
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp89_) {
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36756 "Photo.c"
+#line 36881 "Photo.c"
 			}
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp91_ = gee_iterator_get (_tmp90_);
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag = (Tag*) _tmp91_;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp92_ = tag;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp93_ = map;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = tag;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp94_);
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp96_ = _tmp95_;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag_attach_many (_tmp92_, _tmp96_);
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp96_);
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (tag);
-#line 36780 "Photo.c"
+#line 36905 "Photo.c"
 		}
-#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4749 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36784 "Photo.c"
+#line 36909 "Photo.c"
 	}
-#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
-#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map);
-#line 36792 "Photo.c"
+#line 36917 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_;
 	PhotoMetadata* _tmp1_;
-#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 36809 "Photo.c"
+#line 36934 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36818 "Photo.c"
+#line 36943 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_;
 	PhotoMetadata* _tmp1_;
-#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 36835 "Photo.c"
+#line 36960 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4761 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36844 "Photo.c"
+#line 36969 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_;
 	PhotoMetadata* _tmp1_;
-#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 36861 "Photo.c"
+#line 36986 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36870 "Photo.c"
+#line 36995 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_;
 	PhotoMetadata* _tmp1_;
-#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4771 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4771 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit (self, library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 36887 "Photo.c"
+#line 37012 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4771 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4771 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36896 "Photo.c"
+#line 37021 "Photo.c"
 }
 
 
@@ -36907,38 +37032,38 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
 	gint64 _tmp0_;
 	PhotoID _tmp1_ = {0};
 	LibraryPhoto* _tmp2_;
-#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = numeric_id;
-#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp1_, _tmp0_);
-#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_);
-#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36918 "Photo.c"
+#line 37043 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36937 "Photo.c"
+#line 37062 "Photo.c"
 }
 
 
@@ -36946,40 +37071,40 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
 	gboolean _tmp1_;
-#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36959 "Photo.c"
+#line 37084 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 36978 "Photo.c"
+#line 37103 "Photo.c"
 }
 
 
@@ -36987,21 +37112,21 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
 	gboolean _tmp1_;
-#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37000 "Photo.c"
+#line 37125 "Photo.c"
 }
 
 
@@ -37024,7 +37149,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 37023 "Photo.c"
+#line 37148 "Photo.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -37032,7 +37157,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 37031 "Photo.c"
+#line 37156 "Photo.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -37044,7 +37169,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 37043 "Photo.c"
+#line 37168 "Photo.c"
 	}
 }
 
@@ -37068,21 +37193,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 37067 "Photo.c"
+#line 37192 "Photo.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 37073 "Photo.c"
+#line 37198 "Photo.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 37077 "Photo.c"
+#line 37202 "Photo.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 37081 "Photo.c"
+#line 37206 "Photo.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -37094,7 +37219,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 37093 "Photo.c"
+#line 37218 "Photo.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -37104,13 +37229,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 37103 "Photo.c"
+#line 37228 "Photo.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 37109 "Photo.c"
+#line 37234 "Photo.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -37124,7 +37249,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37123 "Photo.c"
+#line 37248 "Photo.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -37134,13 +37259,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37133 "Photo.c"
+#line 37258 "Photo.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 37139 "Photo.c"
+#line 37264 "Photo.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -37149,7 +37274,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 37148 "Photo.c"
+#line 37273 "Photo.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -37169,7 +37294,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 37168 "Photo.c"
+#line 37293 "Photo.c"
 }
 
 
@@ -37185,37 +37310,37 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
 	gchar* _tmp5_;
 	gint64 _tmp6_;
 	MediaSource* _tmp7_;
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source_id;
-#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
-#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)");
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = source_id;
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = strlen (PHOTO_TYPENAME);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	numeric_only = _tmp5_;
-#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = parse_int64 (numeric_only, 16);
-#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = media_source_collection_fetch_by_numeric_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp6_);
-#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (numeric_only);
-#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37214 "Photo.c"
+#line 37339 "Photo.c"
 }
 
 
@@ -37227,27 +37352,27 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
 	EventID _tmp2_;
 	GeeArrayList* _tmp3_;
 	GeeCollection* _tmp4_;
-#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *event_id;
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37246 "Photo.c"
+#line 37371 "Photo.c"
 }
 
 
@@ -37256,21 +37381,21 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 	PhotoID _tmp0_;
 	gint64 _tmp1_;
 	DataSource* _tmp2_;
-#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *photo_id;
-#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37269 "Photo.c"
+#line 37394 "Photo.c"
 }
 
 
@@ -37279,21 +37404,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
 	GeeHashMap* _tmp0_;
 	GFile* _tmp1_;
 	gpointer _tmp2_;
-#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_editable_file;
-#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37292 "Photo.c"
+#line 37417 "Photo.c"
 }
 
 
@@ -37302,21 +37427,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
 	GeeHashMap* _tmp0_;
 	GFile* _tmp1_;
 	gpointer _tmp2_;
-#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4818 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4818 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_raw_development_file;
-#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37315 "Photo.c"
+#line 37440 "Photo.c"
 }
 
 
@@ -37336,110 +37461,110 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	LibraryPhoto* _tmp17_;
 	GeeCollection* _tmp18_;
 	GeeCollection* _tmp19_;
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_development));
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = info;
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_);
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp2_);
-#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 37363 "Photo.c"
+#line 37488 "Photo.c"
 		GeeCollection* _tmp6_;
 		LibraryPhoto* _tmp7_;
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = matches_master;
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4826 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37372 "Photo.c"
+#line 37497 "Photo.c"
 	}
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable = _tmp9_;
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = editable;
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37384 "Photo.c"
+#line 37509 "Photo.c"
 		BackingPhotoRow* _tmp12_;
 		GFileInfo* _tmp13_;
 		gboolean _tmp14_;
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = editable;
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = info;
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp14_;
-#line 37396 "Photo.c"
+#line 37521 "Photo.c"
 	} else {
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37400 "Photo.c"
+#line 37525 "Photo.c"
 	}
-#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37404 "Photo.c"
+#line 37529 "Photo.c"
 		GeeCollection* _tmp15_;
 		LibraryPhoto* _tmp16_;
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = matches_editable;
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = photo;
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37413 "Photo.c"
+#line 37538 "Photo.c"
 	}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 	development = _tmp18_;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = development;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37425 "Photo.c"
+#line 37550 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp20_;
 			GeeIterator* _tmp21_;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = development;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp21_;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37438 "Photo.c"
+#line 37563 "Photo.c"
 				GeeIterator* _tmp22_;
 				gboolean _tmp23_;
 				BackingPhotoRow* row = NULL;
@@ -37448,74 +37573,74 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				BackingPhotoRow* _tmp26_;
 				GFileInfo* _tmp27_;
 				gboolean _tmp28_;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = _row_it;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = gee_iterator_next (_tmp22_);
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp23_) {
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37455 "Photo.c"
+#line 37580 "Photo.c"
 				}
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = gee_iterator_get (_tmp24_);
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp25_;
-#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = row;
-#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = info;
-#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
-#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 37471 "Photo.c"
+#line 37596 "Photo.c"
 					GeeCollection* _tmp29_;
 					LibraryPhoto* _tmp30_;
-#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = matches_development;
-#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_collection_add (_tmp29_, _tmp30_);
-#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37484 "Photo.c"
+#line 37609 "Photo.c"
 				}
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37488 "Photo.c"
+#line 37613 "Photo.c"
 			}
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37492 "Photo.c"
+#line 37617 "Photo.c"
 		}
 	}
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (development);
-#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4822 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (editable);
-#line 37499 "Photo.c"
+#line 37624 "Photo.c"
 }
 
 
 void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSourceCollection* self, GFileInfo* info, GeeCollection* matches_master, GeeCollection* matches_editable, GeeCollection* matched_development) {
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37514 "Photo.c"
+#line 37639 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_;
@@ -37525,27 +37650,27 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp4_;
 		GeeIterator* _tmp5_;
 		GeeIterator* _tmp6_;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = info;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp6_;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37544 "Photo.c"
+#line 37669 "Photo.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			LibraryPhoto* photo = NULL;
@@ -37556,41 +37681,41 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp13_;
 			GeeCollection* _tmp14_;
 			GeeCollection* _tmp15_;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _photo_it;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp8_) {
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37563 "Photo.c"
+#line 37688 "Photo.c"
 			}
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp10_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = info;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = matches_master;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = matches_editable;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = matched_development;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37585 "Photo.c"
+#line 37710 "Photo.c"
 		}
-#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37589 "Photo.c"
+#line 37714 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -37598,21 +37723,21 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp17_;
 		GeeIterator* _tmp18_;
 		GeeIterator* _tmp19_;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp17_);
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp19_;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37611 "Photo.c"
+#line 37736 "Photo.c"
 			GeeIterator* _tmp20_;
 			gboolean _tmp21_;
 			MediaSource* media = NULL;
@@ -37623,52 +37748,52 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp26_;
 			GeeCollection* _tmp27_;
 			GeeCollection* _tmp28_;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _media_it;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp21_) {
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37630 "Photo.c"
+#line 37755 "Photo.c"
 			}
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp23_;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = info;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = matches_master;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = matches_editable;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = matched_development;
-#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_);
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 37652 "Photo.c"
+#line 37777 "Photo.c"
 		}
-#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37656 "Photo.c"
+#line 37781 "Photo.c"
 	}
 }
 
 
 void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) {
 	PhotoID _tmp19_ = {0};
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4855 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4855 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (basename != NULL);
-#line 37667 "Photo.c"
+#line 37792 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_;
@@ -37677,25 +37802,25 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = filesize;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37694 "Photo.c"
+#line 37819 "Photo.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			LibraryPhoto* photo = NULL;
@@ -37708,72 +37833,72 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			const gchar* _tmp14_;
 			gint _tmp15_;
 			gboolean _tmp16_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37715 "Photo.c"
+#line 37840 "Photo.c"
 			}
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp9_;
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = basename;
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp12_);
-#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp16_) {
-#line 37741 "Photo.c"
+#line 37866 "Photo.c"
 				LibraryPhoto* _tmp17_;
 				PhotoID _tmp18_ = {0};
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_);
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				*result = _tmp18_;
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_photo_it);
-#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 37756 "Photo.c"
+#line 37881 "Photo.c"
 			}
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37760 "Photo.c"
+#line 37885 "Photo.c"
 		}
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37764 "Photo.c"
+#line 37889 "Photo.c"
 	}
-#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
-#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp19_;
-#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37772 "Photo.c"
+#line 37897 "Photo.c"
 }
 
 
@@ -37783,23 +37908,23 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	gint64 _tmp1_;
 	PhotoID _tmp2_ = {0};
 	gboolean _tmp3_;
-#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = filesize;
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_id_is_valid (&_tmp2_);
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37798 "Photo.c"
+#line 37923 "Photo.c"
 }
 
 
@@ -37812,54 +37937,54 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 	MediaSource* _tmp3_;
 	LibraryPhoto* _tmp4_;
 	LibraryPhoto* _tmp5_;
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37833 "Photo.c"
+#line 37958 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_;
 		LibraryPhotoSourceHoldingTank* _tmp7_;
 		GFile* _tmp8_;
 		LibraryPhoto* _tmp9_;
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37852 "Photo.c"
+#line 37977 "Photo.c"
 	}
-#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37858 "Photo.c"
+#line 37983 "Photo.c"
 }
 
 
@@ -37870,27 +37995,27 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_;
 	MediaSource* _tmp3_;
 	LibraryPhoto* _tmp4_;
-#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37889 "Photo.c"
+#line 38014 "Photo.c"
 }
 
 
@@ -37903,54 +38028,54 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 	MediaSource* _tmp3_;
 	LibraryPhoto* _tmp4_;
 	LibraryPhoto* _tmp5_;
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4884 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4884 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37924 "Photo.c"
+#line 38049 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_;
 		LibraryPhotoSourceHoldingTank* _tmp7_;
 		GFile* _tmp8_;
 		LibraryPhoto* _tmp9_;
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37943 "Photo.c"
+#line 38068 "Photo.c"
 	}
-#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37949 "Photo.c"
+#line 38074 "Photo.c"
 }
 
 
@@ -37961,27 +38086,27 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_;
 	MediaSource* _tmp3_;
 	LibraryPhoto* _tmp4_;
-#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4891 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4891 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37980 "Photo.c"
+#line 38105 "Photo.c"
 }
 
 
@@ -37991,23 +38116,23 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	MediaSourceHoldingTank* _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-#line 4876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0);
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = source_holding_tank_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank));
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38006 "Photo.c"
+#line 38131 "Photo.c"
 }
 
 
@@ -38032,169 +38157,169 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	LibraryPhoto* _tmp14_;
 	LibraryPhoto* _tmp15_;
 	LibraryPhoto* _tmp16_;
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38053 "Photo.c"
+#line 38178 "Photo.c"
 		}
-#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38057 "Photo.c"
+#line 38182 "Photo.c"
 	}
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_);
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE;
-#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38079 "Photo.c"
+#line 38204 "Photo.c"
 		}
-#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38083 "Photo.c"
+#line 38208 "Photo.c"
 	}
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_);
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp7_;
-#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4915 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4915 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER;
-#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38105 "Photo.c"
+#line 38230 "Photo.c"
 		}
-#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38109 "Photo.c"
+#line 38234 "Photo.c"
 	}
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_);
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL;
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ == NULL) {
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp10_);
-#line 38121 "Photo.c"
+#line 38246 "Photo.c"
 	}
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp11_;
-#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo;
-#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ != NULL) {
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH;
-#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38139 "Photo.c"
+#line 38264 "Photo.c"
 		}
-#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38143 "Photo.c"
+#line 38268 "Photo.c"
 	}
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_);
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL;
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_ == NULL) {
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp14_);
-#line 38155 "Photo.c"
+#line 38280 "Photo.c"
 	}
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp15_;
-#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo;
-#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ != NULL) {
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4930 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38173 "Photo.c"
+#line 38298 "Photo.c"
 		}
-#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38177 "Photo.c"
+#line 38302 "Photo.c"
 	}
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4937 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = NULL;
-#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4937 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4937 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4937 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 38189 "Photo.c"
+#line 38314 "Photo.c"
 	}
-#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4937 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38193 "Photo.c"
+#line 38318 "Photo.c"
 }
 
 
@@ -38213,67 +38338,67 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 	SourceBacklink* _tmp9_;
 	gboolean _tmp10_;
 	gboolean _tmp11_;
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4940 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4940 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE);
-#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4941 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backlink;
-#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4941 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->has_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_);
-#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4941 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4942 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4942 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38226 "Photo.c"
+#line 38351 "Photo.c"
 	}
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backlink;
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp4_);
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_;
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4945 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38246 "Photo.c"
+#line 38371 "Photo.c"
 	}
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = backlink;
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = source_holding_tank_has_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp9_);
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp8_);
-#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4947 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4948 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4948 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38266 "Photo.c"
+#line 38391 "Photo.c"
 	}
-#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4950 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4950 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38272 "Photo.c"
+#line 38397 "Photo.c"
 }
 
 
@@ -38286,35 +38411,35 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
 	MediaSourceHoldingTank* _tmp4_;
 	SourceBacklink* _tmp5_;
 	SourceBacklink* _tmp6_;
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4953 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4953 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
-#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4954 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4954 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4954 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = backlink;
-#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4954 "/home/jens/Source/shotwell/src/Photo.vala"
 	source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_);
-#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4954 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = backlink;
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
 	source_holding_tank_remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp5_);
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = backlink;
-#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->remove_backlink (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38313 "Photo.c"
+#line 38438 "Photo.c"
 }
 
 
@@ -38323,38 +38448,38 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	LibraryPhotoSourceCollection* self;
 	TransactionController* _tmp0_;
 	TransactionController* _tmp2_;
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38328 "Photo.c"
+#line 38453 "Photo.c"
 		MediaSourceTransactionController* _tmp1_;
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4476 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38336 "Photo.c"
+#line 38461 "Photo.c"
 	}
-#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38344 "Photo.c"
+#line 38469 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38353 "Photo.c"
+#line 38478 "Photo.c"
 }
 
 
@@ -38365,119 +38490,119 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = closure->data;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 38372 "Photo.c"
+#line 38497 "Photo.c"
 	} else {
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 38378 "Photo.c"
+#line 38503 "Photo.c"
 	}
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2);
-#line 38384 "Photo.c"
+#line 38509 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38393 "Photo.c"
+#line 38518 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38402 "Photo.c"
+#line 38527 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38411 "Photo.c"
+#line 38536 "Photo.c"
 }
 
 
 static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) {
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->finalize = library_photo_source_collection_finalize;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate));
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_trashcan;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) library_photo_source_collection_real_create_offline_bin;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) library_photo_source_collection_real_create_media_monitor;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) library_photo_source_collection_real_holds_type_of_source;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) library_photo_source_collection_real_get_typename;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) library_photo_source_collection_real_is_file_recognized;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) library_photo_source_collection_real_notify_contents_altered;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) library_photo_source_collection_real_items_altered;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) library_photo_source_collection_real_postprocess_imported_media;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_master_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_editable_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_source_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = (void (*) (LibraryPhotoSourceCollection *, LibraryPhoto*, PhotoMetadata*)) library_photo_source_collection_real_notify_baseline_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) library_photo_source_collection_real_fetch_by_numeric_id;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) library_photo_source_collection_real_fetch_by_source_id;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) library_photo_source_collection_real_get_event_source_ids;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->has_backlink = (gboolean (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_has_backlink;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->remove_backlink = (void (*) (SourceCollection *, SourceBacklink*)) library_photo_source_collection_real_remove_backlink;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->editable_reimported = library_photo_source_collection_real_editable_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->baseline_reimported = library_photo_source_collection_real_baseline_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->source_reimported = library_photo_source_collection_real_source_reimported;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_MASTER_REIMPORTED_SIGNAL] = g_signal_new ("master-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, master_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_EDITABLE_REIMPORTED_SIGNAL] = g_signal_new ("editable-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, editable_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_BASELINE_REIMPORTED_SIGNAL] = g_signal_new ("baseline-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_signals[LIBRARY_PHOTO_SOURCE_COLLECTION_SOURCE_REIMPORTED_SIGNAL] = g_signal_new ("source-reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, source_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
-#line 38476 "Photo.c"
+#line 38601 "Photo.c"
 }
 
 
@@ -38488,59 +38613,59 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 	GeeHashMap* _tmp3_;
 	GeeHashMap* _tmp4_;
 	GeeTreeMultiMap* _tmp5_;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
 #line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
+#line 4482 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
-#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_editable_file = _tmp0_;
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4485 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->by_raw_development_file = _tmp1_;
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
-#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_master_filesize = _tmp3_;
-#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
-#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_editable_filesize = _tmp4_;
-#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 38515 "Photo.c"
+#line 38640 "Photo.c"
 }
 
 
 static void library_photo_source_collection_finalize (DataCollection * obj) {
 	LibraryPhotoSourceCollection * self;
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
+#line 4482 "/home/jens/Source/shotwell/src/Photo.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->by_editable_file);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->by_raw_development_file);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->filesize_to_photo);
-#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->photo_to_master_filesize);
-#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->photo_to_editable_filesize);
-#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
-#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38539 "Photo.c"
+#line 38664 "Photo.c"
 }
 
 
@@ -38557,9 +38682,9 @@ GType library_photo_source_collection_get_type (void) {
 
 
 static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) {
-#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38558 "Photo.c"
+#line 38683 "Photo.c"
 }
 
 
@@ -38571,69 +38696,69 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	guint64 _tmp3_;
 	PhotoRow* _tmp7_;
 	guint64 _tmp8_;
-#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhoto*) photo_construct (object_type, _tmp0_);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp1_;
-#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = row;
-#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->flags;
-#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38592 "Photo.c"
+#line 38717 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp4_;
 		PhotoRow* _tmp5_;
 		const gchar* _tmp6_;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = library_photo_global;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = row;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_->backlinks;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_);
-#line 38604 "Photo.c"
+#line 38729 "Photo.c"
 	}
-#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
-#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38612 "Photo.c"
+#line 38737 "Photo.c"
 		PhotoRow* _tmp9_;
 		guint64 _tmp10_;
-#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4992 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = row;
-#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4992 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4992 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38621 "Photo.c"
+#line 38746 "Photo.c"
 	}
-#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38625 "Photo.c"
+#line 38750 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new (PhotoRow* row) {
-#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38632 "Photo.c"
+#line 38757 "Photo.c"
 }
 
 
@@ -38651,87 +38776,87 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	PhotoImportParams* _tmp13_;
 	PhotoRow* _tmp14_;
 	guint64 _tmp15_;
-#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL);
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = import_params;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->row;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhoto*) photo_construct (object_type, _tmp1_);
-#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = import_params;
-#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->keywords;
-#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = _tmp4_;
-#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp5_;
-#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = import_params;
-#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->row;
-#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38682 "Photo.c"
+#line 38807 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp9_;
 		PhotoImportParams* _tmp10_;
 		PhotoRow* _tmp11_;
 		const gchar* _tmp12_;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_global;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = import_params;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_->row;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->backlinks;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp12_);
-#line 38697 "Photo.c"
+#line 38822 "Photo.c"
 	}
-#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
-#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->row;
-#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_->flags;
-#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38707 "Photo.c"
+#line 38832 "Photo.c"
 		PhotoImportParams* _tmp16_;
 		PhotoRow* _tmp17_;
 		guint64 _tmp18_;
-#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = import_params;
-#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_->row;
-#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_->flags;
-#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38719 "Photo.c"
+#line 38844 "Photo.c"
 	}
-#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38723 "Photo.c"
+#line 38848 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
-#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38730 "Photo.c"
+#line 38855 "Photo.c"
 }
 
 
@@ -38760,59 +38885,59 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp39_;
 	LibraryPhotoSourceCollection* _tmp40_;
 	GeeArrayList* _tmp41_;
-#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_init_photo ();
-#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_collection_new ();
-#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_data_collection_unref0 (library_photo_global);
-#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_global = _tmp0_;
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_table_get_instance ();
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_all (_tmp2_);
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp2_);
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
 	all = _tmp4_;
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
 	all_photos = _tmp5_;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	trashed_photos = _tmp6_;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	offline_photos = _tmp7_;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = all;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38799 "Photo.c"
+#line 38924 "Photo.c"
 	{
 		gint ctr = 0;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38804 "Photo.c"
+#line 38929 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = TRUE;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 38811 "Photo.c"
+#line 38936 "Photo.c"
 				gint _tmp13_;
 				gint _tmp14_;
 				PhotoRow* row = NULL;
@@ -38828,159 +38953,159 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				guint64 _tmp22_;
 				ProgressMonitor _tmp30_;
 				void* _tmp30__target;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38829 "Photo.c"
+#line 38954 "Photo.c"
 					gint _tmp12_;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38835 "Photo.c"
+#line 38960 "Photo.c"
 				}
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = ctr;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = count;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp13_ < _tmp14_)) {
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38847 "Photo.c"
+#line 38972 "Photo.c"
 				}
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = ctr;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_);
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (PhotoRow*) _tmp17_;
-#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5023 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = row;
-#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5023 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = library_photo_new (_tmp18_);
-#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5023 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp19_;
-#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = row;
-#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = _tmp20_->flags;
-#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 				flags = _tmp21_;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = flags;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5026 "/home/jens/Source/shotwell/src/Photo.vala"
 				if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38873 "Photo.c"
+#line 38998 "Photo.c"
 					GeeArrayList* _tmp23_;
 					LibraryPhoto* _tmp24_;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5027 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = trashed_photos;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5027 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5027 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38882 "Photo.c"
+#line 39007 "Photo.c"
 				} else {
 					guint64 _tmp25_;
-#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5028 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = flags;
-#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5028 "/home/jens/Source/shotwell/src/Photo.vala"
 					if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38889 "Photo.c"
+#line 39014 "Photo.c"
 						GeeArrayList* _tmp26_;
 						LibraryPhoto* _tmp27_;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5029 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = offline_photos;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5029 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = photo;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5029 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38898 "Photo.c"
+#line 39023 "Photo.c"
 					} else {
 						GeeArrayList* _tmp28_;
 						LibraryPhoto* _tmp29_;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = all_photos;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = photo;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38908 "Photo.c"
+#line 39033 "Photo.c"
 					}
 				}
-#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = monitor;
-#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30__target = monitor_target;
-#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp30_ != NULL) {
-#line 38917 "Photo.c"
+#line 39042 "Photo.c"
 					ProgressMonitor _tmp31_;
 					void* _tmp31__target;
 					gint _tmp32_;
 					gint _tmp33_;
-#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = monitor;
-#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31__target = monitor_target;
-#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = ctr;
-#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = count;
-#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38932 "Photo.c"
+#line 39057 "Photo.c"
 				}
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_row_unref0 (row);
-#line 38938 "Photo.c"
+#line 39063 "Photo.c"
 			}
 		}
 	}
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = library_photo_global;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = all_photos;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp37_);
-#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5038 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_global;
-#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5038 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = trashed_photos;
-#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5038 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = offline_photos;
-#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
 	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (offline_photos);
-#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (trashed_photos);
-#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all_photos);
-#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all);
-#line 38972 "Photo.c"
+#line 39097 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
-#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 38979 "Photo.c"
+#line 39104 "Photo.c"
 }
 
 
@@ -38997,139 +39122,139 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	gboolean _tmp6_;
 	PhotoImportParams* _tmp7_;
 	LibraryPhoto* _tmp8_;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = params;
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->row;
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_add (_tmp1_, _tmp3_, &_tmp4_);
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp5_;
-#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5053 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_id_is_invalid (&photo_id);
-#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5053 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_photo = NULL;
-#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5056 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5056 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo) {
-#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5056 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 39028 "Photo.c"
+#line 39153 "Photo.c"
 		} else {
-#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5056 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 39032 "Photo.c"
+#line 39157 "Photo.c"
 		}
-#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5056 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 39036 "Photo.c"
+#line 39161 "Photo.c"
 	}
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = library_photo_new_from_import_params (_tmp7_);
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_vala_photo);
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_photo = _tmp8_;
-#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5062 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5062 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (photo) {
-#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5062 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 39052 "Photo.c"
+#line 39177 "Photo.c"
 	} else {
-#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 39056 "Photo.c"
+#line 39181 "Photo.c"
 	}
-#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5062 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39060 "Photo.c"
+#line 39185 "Photo.c"
 }
 
 
 void library_photo_import_failed (LibraryPhoto* photo) {
 	GError * _inner_error_ = NULL;
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5065 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 39068 "Photo.c"
+#line 39193 "Photo.c"
 	{
 		PhotoTable* _tmp0_;
 		PhotoTable* _tmp1_;
 		LibraryPhoto* _tmp2_;
 		PhotoID _tmp3_ = {0};
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_);
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 39090 "Photo.c"
-				goto __catch407_database_error;
+#line 39215 "Photo.c"
+				goto __catch419_database_error;
 			}
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/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);
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39099 "Photo.c"
+#line 39224 "Photo.c"
 		}
 	}
-	goto __finally407;
-	__catch407_database_error:
+	goto __finally419;
+	__catch419_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39117 "Photo.c"
+#line 39242 "Photo.c"
 	}
-	__finally407:
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally419:
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/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 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39128 "Photo.c"
+#line 39253 "Photo.c"
 	}
 }
 
@@ -39139,21 +39264,21 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_;
 	LibraryPhotoSourceCollection* _tmp1_;
 	PhotoMetadata* _tmp2_;
-#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5074 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5074 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->notify_master_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39152 "Photo.c"
+#line 39277 "Photo.c"
 }
 
 
@@ -39162,21 +39287,21 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_;
 	LibraryPhotoSourceCollection* _tmp1_;
 	PhotoMetadata* _tmp2_;
-#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->notify_editable_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39175 "Photo.c"
+#line 39300 "Photo.c"
 }
 
 
@@ -39185,21 +39310,21 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_;
 	LibraryPhotoSourceCollection* _tmp1_;
 	PhotoMetadata* _tmp2_;
-#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5085 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5085 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->notify_source_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5088 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39198 "Photo.c"
+#line 39323 "Photo.c"
 }
 
 
@@ -39208,80 +39333,80 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_;
 	LibraryPhotoSourceCollection* _tmp1_;
 	PhotoMetadata* _tmp2_;
-#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5092 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5092 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->notify_baseline_reimported (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = library_photo_global;
-#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39221 "Photo.c"
+#line 39346 "Photo.c"
 }
 
 
 static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 	GError * _inner_error_ = NULL;
-#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5097 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39229 "Photo.c"
+#line 39354 "Photo.c"
 	{
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_import_from_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TRUE, &_inner_error_);
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39235 "Photo.c"
-			goto __catch408_g_error;
+#line 39360 "Photo.c"
+			goto __catch420_g_error;
 		}
 	}
-	goto __finally408;
-	__catch408_g_error:
+	goto __finally420;
+	__catch420_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp0_;
 		gchar* _tmp1_;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5082: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_);
-#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:5101: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_);
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp1_);
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39265 "Photo.c"
+#line 39390 "Photo.c"
 	}
-	__finally408:
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally420:
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/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 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39276 "Photo.c"
+#line 39401 "Photo.c"
 	}
-#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39280 "Photo.c"
+#line 39405 "Photo.c"
 }
 
 
@@ -39289,28 +39414,28 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 5090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
-#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->import_keywords;
-#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39298 "Photo.c"
+#line 39423 "Photo.c"
 }
 
 
 void library_photo_clear_import_keywords (LibraryPhoto* self) {
-#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 39309 "Photo.c"
+#line 39434 "Photo.c"
 }
 
 
@@ -39319,44 +39444,44 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
 	Alteration* _tmp5_;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5117 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5117 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_ALTERATION (alteration));
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = self->priv->block_thumbnail_generation;
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 39326 "Photo.c"
+#line 39451 "Photo.c"
 		Alteration* _tmp2_;
 		gboolean _tmp3_;
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39335 "Photo.c"
+#line 39460 "Photo.c"
 	} else {
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39339 "Photo.c"
+#line 39464 "Photo.c"
 	}
-#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5119 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39343 "Photo.c"
+#line 39468 "Photo.c"
 		OneShotScheduler* _tmp4_;
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->thumbnail_scheduler;
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5120 "/home/jens/Source/shotwell/src/Photo.vala"
 		one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39349 "Photo.c"
+#line 39474 "Photo.c"
 	}
-#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_OBJECT_CLASS (library_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 39355 "Photo.c"
+#line 39480 "Photo.c"
 }
 
 
@@ -39367,31 +39492,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5126 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5126 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp0_;
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5126 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5126 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5126 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39380 "Photo.c"
+#line 39505 "Photo.c"
 	}
-#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
-#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39390 "Photo.c"
+#line 39515 "Photo.c"
 }
 
 
@@ -39399,71 +39524,71 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	LibraryPhoto * self;
 	Rotation _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 5112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5131 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = TRUE;
-#line 5115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = rotation;
-#line 5115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 5116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 39408 "Photo.c"
+#line 39533 "Photo.c"
 	{
 		Rotation _tmp1_;
-#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = rotation;
-#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39417 "Photo.c"
-			goto __catch409_g_error;
+#line 39542 "Photo.c"
+			goto __catch421_g_error;
 		}
 	}
-	goto __finally409;
-	__catch409_g_error:
+	goto __finally421;
+	__catch421_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5127: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_);
-#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:5146: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_);
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp3_);
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39447 "Photo.c"
+#line 39572 "Photo.c"
 	}
-	__finally409:
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally421:
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/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 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39458 "Photo.c"
+#line 39583 "Photo.c"
 	}
-#line 5130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5149 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39462 "Photo.c"
+#line 39587 "Photo.c"
 }
 
 
@@ -39475,40 +39600,40 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	GdkPixbuf* _tmp2_;
 	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39488 "Photo.c"
+#line 39613 "Photo.c"
 	}
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39500 "Photo.c"
+#line 39625 "Photo.c"
 }
 
 
 static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) {
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39507 "Photo.c"
+#line 39632 "Photo.c"
 }
 
 
@@ -39523,53 +39648,53 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	GFile* _tmp7_;
 	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5159 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5159 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((backing == NULL) || IS_BACKING_PHOTO_ROW (backing));
-#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5160 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID);
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 39534 "Photo.c"
+#line 39659 "Photo.c"
 	} else {
 		BackingPhotoRow* _tmp2_;
 		const gchar* _tmp3_;
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = backing;
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->filepath;
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39544 "Photo.c"
+#line 39669 "Photo.c"
 	}
-#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5162 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = backing_id;
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5162 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39552 "Photo.c"
+#line 39677 "Photo.c"
 	}
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->filepath;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = g_file_new_for_path (_tmp5_);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp6_;
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = file;
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_query_exists (_tmp7_, NULL);
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 39568 "Photo.c"
+#line 39693 "Photo.c"
 		GFile* dupe_file = NULL;
 		GFile* _tmp9_;
 		GFile* _tmp10_;
@@ -39579,105 +39704,105 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		BackingPhotoRow* _tmp13_;
 		BackingPhotoRow* _tmp14_;
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = library_files_duplicate (_tmp9_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_);
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		dupe_file = _tmp10_;
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39592 "Photo.c"
+#line 39717 "Photo.c"
 		}
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_query_backing_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp11_, PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, &_tmp12_, &_inner_error_);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp12_;
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		state = _tmp13_;
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (dupe_file);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39616 "Photo.c"
+#line 39741 "Photo.c"
 		}
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = state;
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_ != NULL) {
-#line 39622 "Photo.c"
+#line 39747 "Photo.c"
 			BackingPhotoTable* _tmp15_;
 			BackingPhotoTable* _tmp16_;
 			BackingPhotoRow* _tmp17_;
 			BackingPhotoRow* _tmp18_;
 			BackingPhotoID _tmp19_;
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing_photo_table_get_instance ();
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = state;
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp16_);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (state);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dupe_file);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5172 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 39652 "Photo.c"
+#line 39777 "Photo.c"
 			}
-#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
-#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp18_->id;
-#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_id = _tmp19_;
-#line 39660 "Photo.c"
+#line 39785 "Photo.c"
 		}
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 39668 "Photo.c"
+#line 39793 "Photo.c"
 	}
-#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
-#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 39676 "Photo.c"
+#line 39801 "Photo.c"
 }
 
 
@@ -39742,231 +39867,231 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	GeeList* _tmp51_;
 	GeeCollection* _tmp52_;
 	GError * _inner_error_ = NULL;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = library_files_duplicate (_tmp1_, _library_photo_on_duplicate_progress_gfile_progress_callback, self, TRUE, &_inner_error_);
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_file = _tmp3_;
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5182 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39761 "Photo.c"
+#line 39886 "Photo.c"
 	}
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp5_, &_tmp6_, &_inner_error_);
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp5_);
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_editable_id = _tmp7_;
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5185 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39783 "Photo.c"
+#line 39908 "Photo.c"
 	}
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp9_, &_tmp10_, &_inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp9_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_shotwell_id = _tmp11_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39805 "Photo.c"
+#line 39930 "Photo.c"
 	}
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_CAMERA);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp13_, &_tmp14_, &_inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp13_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_camera_id = _tmp15_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39827 "Photo.c"
+#line 39952 "Photo.c"
 	}
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo_get_raw_development_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), RAW_DEVELOPER_EMBEDDED);
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp17_, &_tmp18_, &_inner_error_);
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp17_);
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_embedded_id = _tmp19_;
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39849 "Photo.c"
+#line 39974 "Photo.c"
 	}
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp22_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dupe_file;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_file_get_path (_tmp23_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dupe_editable_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = dupe_raw_shotwell_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = dupe_raw_camera_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = dupe_raw_embedded_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_duplicate (_tmp21_, &_tmp22_, _tmp25_, &_tmp26_, &_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp25_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp21_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_id = _tmp31_;
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_table_get_instance ();
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_;
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = dupe_id;
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_row (_tmp33_, &_tmp34_);
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_;
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp33_);
-#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_row = _tmp36_;
-#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5199 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = dupe_row;
-#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5199 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_new (_tmp37_);
-#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5199 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe = _tmp38_;
-#line 5183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5202 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = dupe;
-#line 5183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5202 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_duplicate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = dupe;
-#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5205 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_OBJECT, DataObject));
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = dupe;
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_;
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_ != NULL;
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp44_);
-#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39923 "Photo.c"
+#line 40048 "Photo.c"
 		LibraryPhoto* _tmp46_;
 		Event* _tmp47_;
 		Event* _tmp48_;
 		LibraryPhoto* _tmp49_;
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = dupe;
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = dupe;
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp48_);
-#line 39940 "Photo.c"
+#line 40065 "Photo.c"
 	}
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5212 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5212 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = tag_source_collection_fetch_for_source (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5212 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = tags;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39952 "Photo.c"
+#line 40077 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeCollection* _tmp53_;
 			GeeIterator* _tmp54_;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = tags;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_it = _tmp54_;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39965 "Photo.c"
+#line 40090 "Photo.c"
 				GeeIterator* _tmp55_;
 				gboolean _tmp56_;
 				Tag* tag = NULL;
@@ -39974,84 +40099,84 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				gpointer _tmp58_;
 				Tag* _tmp59_;
 				LibraryPhoto* _tmp60_;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = _tag_it;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp56_) {
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 39981 "Photo.c"
+#line 40106 "Photo.c"
 				}
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp58_;
-#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = tag;
-#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = dupe;
-#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 39997 "Photo.c"
+#line 40122 "Photo.c"
 			}
-#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 40001 "Photo.c"
+#line 40126 "Photo.c"
 		}
 	}
-#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = dupe;
-#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (dupe_row);
-#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dupe_file);
-#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40014 "Photo.c"
+#line 40139 "Photo.c"
 }
 
 
 static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) {
-#line 5203 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5222 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5223 "/home/jens/Source/shotwell/src/Photo.vala"
 	spin_event_loop ();
-#line 40023 "Photo.c"
+#line 40148 "Photo.c"
 }
 
 
 static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) {
 	guint64 _tmp0_;
 	guint64 _tmp1_;
-#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5226 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = flags;
-#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) {
-#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5228 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
-#line 5210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5229 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_HIDDEN, NULL);
-#line 40040 "Photo.c"
+#line 40165 "Photo.c"
 	}
-#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
-#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) {
-#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
-#line 5215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5234 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FAVORITE, NULL);
-#line 40050 "Photo.c"
+#line 40175 "Photo.c"
 	}
 }
 
@@ -40060,35 +40185,35 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 5220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5239 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH);
-#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40067 "Photo.c"
+#line 40192 "Photo.c"
 }
 
 
 static void library_photo_real_trash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5225 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40077 "Photo.c"
+#line 40202 "Photo.c"
 }
 
 
 static void library_photo_real_untrash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_TRASH, NULL);
-#line 40087 "Photo.c"
+#line 40212 "Photo.c"
 }
 
 
@@ -40096,35 +40221,35 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE);
-#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40103 "Photo.c"
+#line 40228 "Photo.c"
 }
 
 
 static void library_photo_real_mark_offline (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5255 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40113 "Photo.c"
+#line 40238 "Photo.c"
 }
 
 
 static void library_photo_real_mark_online (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_OFFLINE, NULL);
-#line 40123 "Photo.c"
+#line 40248 "Photo.c"
 }
 
 
@@ -40132,15 +40257,15 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5263 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_is_flag_set (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED);
-#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40139 "Photo.c"
+#line 40264 "Photo.c"
 }
 
 
@@ -40148,17 +40273,17 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
-#line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5267 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5268 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
-#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5268 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40157 "Photo.c"
+#line 40282 "Photo.c"
 }
 
 
@@ -40166,17 +40291,17 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
-#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5271 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
-#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40175 "Photo.c"
+#line 40300 "Photo.c"
 }
 
 
@@ -40187,37 +40312,37 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	gboolean _tmp1_;
 	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = DATA_SOURCE_CLASS (library_photo_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 40194 "Photo.c"
+#line 40319 "Photo.c"
 		gboolean _tmp2_ = FALSE;
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 		return _tmp2_;
-#line 40200 "Photo.c"
+#line 40325 "Photo.c"
 	}
-#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5279 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5279 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40208 "Photo.c"
+#line 40333 "Photo.c"
 	}
-#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5281 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5281 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40216 "Photo.c"
+#line 40341 "Photo.c"
 }
 
 
@@ -40226,76 +40351,76 @@ static void library_photo_real_destroy (DataSource* base) {
 	PhotoID photo_id = {0};
 	PhotoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 5265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5284 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp0_);
-#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp0_;
-#line 5269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40233 "Photo.c"
+#line 40358 "Photo.c"
 	{
 		PhotoTable* _tmp1_;
 		PhotoTable* _tmp2_;
 		PhotoID _tmp3_;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_table_get_instance ();
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_id;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp2_);
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40252 "Photo.c"
-				goto __catch410_database_error;
+#line 40377 "Photo.c"
+				goto __catch422_database_error;
 			}
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/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);
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40261 "Photo.c"
+#line 40386 "Photo.c"
 		}
 	}
-	goto __finally410;
-	__catch410_database_error:
+	goto __finally422;
+	__catch422_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 40279 "Photo.c"
+#line 40404 "Photo.c"
 	}
-	__finally410:
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally422:
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/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 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40290 "Photo.c"
+#line 40415 "Photo.c"
 	}
-#line 5280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_SOURCE_CLASS (library_photo_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_SOURCE, DataSource));
-#line 40294 "Photo.c"
+#line 40419 "Photo.c"
 }
 
 
@@ -40307,25 +40432,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
 	PhotoFileFormat _tmp3_;
 	PhotoID _tmp4_ = {0};
 	gboolean _tmp5_;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_id_is_valid (&_tmp4_);
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40324 "Photo.c"
+#line 40449 "Photo.c"
 }
 
 
@@ -40345,79 +40470,79 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	PhotoID* _tmp10_;
 	gint _tmp10__length1;
 	PhotoID _tmp18_ = {0};
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = _tmp5_;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids_length1 = _tmp4_;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_ids_size_ = ids_length1;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = ids;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7__length1 = ids_length1;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 40370 "Photo.c"
+#line 40495 "Photo.c"
 	} else {
 		PhotoID* _tmp8_;
 		gint _tmp8__length1;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = ids;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8__length1 = ids_length1;
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40380 "Photo.c"
+#line 40505 "Photo.c"
 	}
-#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40384 "Photo.c"
+#line 40509 "Photo.c"
 		PhotoID _tmp9_ = {0};
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = _tmp9_;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		ids = (g_free (ids), NULL);
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40394 "Photo.c"
+#line 40519 "Photo.c"
 	}
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = ids;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10__length1 = ids_length1;
-#line 40400 "Photo.c"
+#line 40525 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
 		gint _id_collection_size_ = 0;
 		gint id_it = 0;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection = _tmp10_;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection_length1 = _tmp10__length1;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40412 "Photo.c"
+#line 40537 "Photo.c"
 			PhotoID id = {0};
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40416 "Photo.c"
+#line 40541 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
 				LibraryPhotoSourceCollection* _tmp11_;
@@ -40425,60 +40550,60 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 				LibraryPhoto* _tmp13_;
 				gboolean _tmp14_ = FALSE;
 				LibraryPhoto* _tmp15_;
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = library_photo_global;
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = id;
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_);
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp13_;
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_ != NULL) {
-#line 40436 "Photo.c"
+#line 40561 "Photo.c"
 					LibraryPhoto* _tmp16_;
 					gboolean _tmp17_;
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo;
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = !_tmp17_;
-#line 40445 "Photo.c"
+#line 40570 "Photo.c"
 				} else {
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40449 "Photo.c"
+#line 40574 "Photo.c"
 				}
-#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
-#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
 					*result = id;
-#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
 					ids = (g_free (ids), NULL);
-#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 40461 "Photo.c"
+#line 40586 "Photo.c"
 				}
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40465 "Photo.c"
+#line 40590 "Photo.c"
 			}
 		}
 	}
-#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp18_, PHOTO_ID_INVALID);
-#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp18_;
-#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = (g_free (ids), NULL);
-#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 40477 "Photo.c"
+#line 40602 "Photo.c"
 }
 
 
@@ -40507,179 +40632,179 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	gint _tmp27_;
 	gboolean _tmp28_ = FALSE;
 	GeeList* _tmp29_;
-#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags = _tmp1_;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp2_;
-#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5327 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = metadata;
-#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5327 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 40522 "Photo.c"
+#line 40647 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		GeeList* _tmp6_;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = tags;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_ != NULL) {
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40532 "Photo.c"
+#line 40657 "Photo.c"
 		} else {
 			GeeList* _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = tags;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp9_ > 0;
-#line 40545 "Photo.c"
+#line 40670 "Photo.c"
 		}
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = TRUE;
-#line 40551 "Photo.c"
+#line 40676 "Photo.c"
 		} else {
 			Rating _tmp10_;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40558 "Photo.c"
+#line 40683 "Photo.c"
 		}
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40568 "Photo.c"
+#line 40693 "Photo.c"
 	}
-#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata;
-#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_metadata_get_rating (_tmp12_);
-#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != _tmp13_) {
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40586 "Photo.c"
+#line 40711 "Photo.c"
 	}
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL);
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = _tmp15_;
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = tags;
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 40598 "Photo.c"
+#line 40723 "Photo.c"
 		GeeList* _tmp18_;
 		gint _tmp19_;
 		gint _tmp20_;
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = tags;
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp20_;
-#line 40610 "Photo.c"
+#line 40735 "Photo.c"
 	} else {
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40614 "Photo.c"
+#line 40739 "Photo.c"
 	}
-#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = keywords;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 40622 "Photo.c"
+#line 40747 "Photo.c"
 		GeeSet* _tmp23_;
 		gint _tmp24_;
 		gint _tmp25_;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = keywords;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp25_;
-#line 40634 "Photo.c"
+#line 40759 "Photo.c"
 	} else {
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40638 "Photo.c"
+#line 40763 "Photo.c"
 	}
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords_count = _tmp21_;
-#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = tags_count;
-#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = keywords_count;
-#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5337 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != _tmp27_) {
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (keywords);
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40658 "Photo.c"
+#line 40783 "Photo.c"
 	}
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = tags;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ != NULL) {
-#line 40664 "Photo.c"
+#line 40789 "Photo.c"
 		GeeSet* _tmp30_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40670 "Photo.c"
+#line 40795 "Photo.c"
 	} else {
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40674 "Photo.c"
+#line 40799 "Photo.c"
 	}
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40678 "Photo.c"
+#line 40803 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp31_;
@@ -40689,25 +40814,25 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			gint _tmp34_;
 			gint _tmp35_;
 			gint _tag_index = 0;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = tags;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = _g_object_ref0 (_tmp31_);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp32_;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tag_list;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = _tmp34_;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp35_;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40706 "Photo.c"
+#line 40831 "Photo.c"
 				gint _tmp36_;
 				gint _tmp37_;
 				gint _tmp38_;
@@ -40723,86 +40848,86 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 				gchar* _tmp47_;
 				gboolean _tmp48_;
 				gboolean _tmp49_;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _tag_index;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp36_ + 1;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tag_index;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tag_size;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp37_ < _tmp38_)) {
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40734 "Photo.c"
+#line 40859 "Photo.c"
 				}
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _tag_index;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_list_get (_tmp39_, _tmp40_);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp41_;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = keywords;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = tag;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject));
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_);
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = !_tmp48_;
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp47_);
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp45_);
-#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_) {
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tag);
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tag_list);
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (keywords);
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tags);
-#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 40780 "Photo.c"
+#line 40905 "Photo.c"
 				}
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40784 "Photo.c"
+#line 40909 "Photo.c"
 			}
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40788 "Photo.c"
+#line 40913 "Photo.c"
 		}
 	}
-#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40801 "Photo.c"
+#line 40926 "Photo.c"
 }
 
 
@@ -40814,30 +40939,30 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	GeeList* _tmp2_;
 	PhotoMetadata* _tmp22_;
 	Rating _tmp23_;
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = tag_source_collection_fetch_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_tags = _tmp1_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_tags;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 40827 "Photo.c"
+#line 40952 "Photo.c"
 		GeeCollection* string_tags = NULL;
 		GeeArrayList* _tmp3_;
 		PhotoMetadata* _tmp19_;
 		GeeCollection* _tmp20_;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 		string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40836 "Photo.c"
+#line 40961 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp4_;
@@ -40847,25 +40972,25 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tag_index = 0;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_tags;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp5_;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tag_list;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp8_;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40864 "Photo.c"
+#line 40989 "Photo.c"
 				gint _tmp9_;
 				gint _tmp10_;
 				gint _tmp11_;
@@ -40877,74 +41002,74 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				Tag* _tmp16_;
 				gchar* _tmp17_;
 				gchar* _tmp18_;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tag_index;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp9_ + 1;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tag_index;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tag_size;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40888 "Photo.c"
+#line 41013 "Photo.c"
 				}
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tag_index;
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp14_;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = string_tags;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = tag;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_collection_add (_tmp15_, _tmp18_);
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp18_);
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40912 "Photo.c"
+#line 41037 "Photo.c"
 			}
-#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40916 "Photo.c"
+#line 41041 "Photo.c"
 		}
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = string_tags;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (string_tags);
-#line 40926 "Photo.c"
+#line 41051 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp21_;
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = metadata;
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40933 "Photo.c"
+#line 41058 "Photo.c"
 	}
-#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
-#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_rating (_tmp22_, _tmp23_);
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5350 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_tags);
-#line 40943 "Photo.c"
+#line 41068 "Photo.c"
 }
 
 
@@ -40958,63 +41083,63 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	GeeSet* _tmp7_;
 	GeeCollection* _tmp8_;
 	HierarchicalTagIndex* _tmp39_;
-#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 	new_htag_index = NULL;
-#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
-#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 40969 "Photo.c"
+#line 41094 "Photo.c"
 		PhotoMetadata* _tmp2_;
 		GeeSet* _tmp3_;
 		GeeSet* _tmp4_;
 		HierarchicalTagIndex* _tmp5_;
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_);
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = hierarchical_tag_utilities_process_hierarchical_import_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_hierarchical_tag_index_unref0 (new_htag_index);
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		new_htag_index = _tmp5_;
-#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 40988 "Photo.c"
+#line 41113 "Photo.c"
 	}
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5372 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5372 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5372 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = keywords;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 41000 "Photo.c"
+#line 41125 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp9_;
 			GeeIterator* _tmp10_;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = keywords;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_keyword_it = _tmp10_;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41013 "Photo.c"
+#line 41138 "Photo.c"
 				GeeIterator* _tmp11_;
 				gboolean _tmp12_;
 				gchar* keyword = NULL;
@@ -41037,156 +41162,156 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp36_;
 				Tag* _tmp37_;
 				Tag* _tmp38_;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _keyword_it;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = gee_iterator_next (_tmp11_);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp12_) {
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41044 "Photo.c"
+#line 41169 "Photo.c"
 				}
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_get (_tmp13_);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				keyword = (gchar*) _tmp14_;
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_htag_index;
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp16_ != NULL) {
-#line 41056 "Photo.c"
+#line 41181 "Photo.c"
 					HierarchicalTagIndex* _tmp17_;
 					const gchar* _tmp18_;
 					gboolean _tmp19_;
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = new_htag_index;
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = keyword;
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp19_;
-#line 41068 "Photo.c"
+#line 41193 "Photo.c"
 				} else {
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 41072 "Photo.c"
+#line 41197 "Photo.c"
 				}
-#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41080 "Photo.c"
+#line 41205 "Photo.c"
 				}
-#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
-#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_);
-#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				safe_keyword = _tmp21_;
-#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = safe_keyword;
-#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_);
-#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				promoted_keyword = _tmp23_;
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5382 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = tag_global;
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5382 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = safe_keyword;
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5382 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5382 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp26_) {
-#line 41102 "Photo.c"
+#line 41227 "Photo.c"
 					const gchar* _tmp27_;
 					Tag* _tmp28_;
 					Tag* _tmp29_;
-#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = safe_keyword;
-#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = tag_for_path (_tmp27_);
-#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _tmp28_;
-#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp29_);
-#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41124 "Photo.c"
+#line 41249 "Photo.c"
 				}
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5387 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5387 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = promoted_keyword;
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5387 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5387 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp32_) {
-#line 41134 "Photo.c"
+#line 41259 "Photo.c"
 					const gchar* _tmp33_;
 					Tag* _tmp34_;
 					Tag* _tmp35_;
-#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = promoted_keyword;
-#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = tag_for_path (_tmp33_);
-#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp35_ = _tmp34_;
-#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp35_);
-#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5389 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5389 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5389 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5389 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41156 "Photo.c"
+#line 41281 "Photo.c"
 				}
-#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
-#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = tag_for_path (_tmp36_);
-#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_;
-#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp38_);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (promoted_keyword);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (safe_keyword);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (keyword);
-#line 41174 "Photo.c"
+#line 41299 "Photo.c"
 			}
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5374 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41178 "Photo.c"
+#line 41303 "Photo.c"
 		}
 	}
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5396 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = new_htag_index;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5396 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ != NULL) {
-#line 41185 "Photo.c"
+#line 41310 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
 			HierarchicalTagIndex* _tmp40_;
@@ -41194,23 +41319,23 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			GeeCollection* _tmp42_;
 			GeeIterator* _tmp43_;
 			GeeIterator* _tmp44_;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = new_htag_index;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_);
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp42_);
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_path_it = _tmp44_;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41209 "Photo.c"
+#line 41334 "Photo.c"
 				GeeIterator* _tmp45_;
 				gboolean _tmp46_;
 				gchar* path = NULL;
@@ -41219,150 +41344,150 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp49_;
 				Tag* _tmp50_;
 				Tag* _tmp51_;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _path_it;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_next (_tmp45_);
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp46_) {
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41226 "Photo.c"
+#line 41351 "Photo.c"
 				}
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_iterator_get (_tmp47_);
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				path = (gchar*) _tmp48_;
-#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = path;
-#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = tag_for_path (_tmp49_);
-#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = _tmp50_;
-#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp51_);
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (path);
-#line 41246 "Photo.c"
+#line 41371 "Photo.c"
 			}
-#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41250 "Photo.c"
+#line 41375 "Photo.c"
 		}
 	}
-#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 	_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41257 "Photo.c"
+#line 41382 "Photo.c"
 }
 
 
 static void library_photo_class_init (LibraryPhotoClass * klass) {
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_parent_class = g_type_class_peek_parent (klass);
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate));
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_master_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_master_reimported;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_editable_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_editable_reimported;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_source_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_source_reimported;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_baseline_reimported = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_notify_baseline_reimported;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) library_photo_real_notify_altered;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) library_photo_real_get_preview_pixbuf;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) library_photo_real_rotate;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) library_photo_real_get_thumbnail;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) library_photo_real_is_trashed;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) library_photo_real_trash;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) library_photo_real_untrash;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) library_photo_real_is_offline;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) library_photo_real_mark_offline;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) library_photo_real_mark_online;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) library_photo_real_internal_delete_backing;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->destroy = (void (*) (DataSource *)) library_photo_real_destroy;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) library_photo_real_has_user_generated_metadata;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_set_user_metadata_for_export;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) library_photo_real_apply_user_metadata_for_reimport;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41306 "Photo.c"
+#line 41431 "Photo.c"
 }
 
 
 static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_flagged = (gboolean (*) (Flaggable *)) library_photo_real_is_flagged;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_flagged = (void (*) (Flaggable *)) library_photo_real_mark_flagged;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_unflagged = (void (*) (Flaggable *)) library_photo_real_mark_unflagged;
-#line 41319 "Photo.c"
+#line 41444 "Photo.c"
 }
 
 
 static void library_photo_monitorable_interface_init (MonitorableIface * iface) {
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_offline = (gboolean (*) (Monitorable *)) library_photo_real_is_offline;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_offline = (void (*) (Monitorable *)) library_photo_real_mark_offline;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_online = (void (*) (Monitorable *)) library_photo_real_mark_online;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_file = (void (*) (Monitorable *, GFile*)) photo_set_master_file;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) photo_set_master_timestamp;
-#line 41336 "Photo.c"
+#line 41461 "Photo.c"
 }
 
 
 static void library_photo_instance_init (LibraryPhoto * self) {
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_GET_PRIVATE (self);
-#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = NULL;
-#line 41347 "Photo.c"
+#line 41472 "Photo.c"
 }
 
 
 static void library_photo_finalize (GObject * obj) {
 	LibraryPhoto * self;
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4965 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41361 "Photo.c"
+#line 41486 "Photo.c"
 }
 
 
@@ -41389,30 +41514,30 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
 	void* _tmp1__target;
 	GetSourceDatabaseKey _tmp2_;
 	void* _tmp2__target;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = sources;
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = check_to_keep;
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1__target = check_to_keep_target;
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = get_key;
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2__target = get_key_target;
-#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 41404 "Photo.c"
+#line 41529 "Photo.c"
 }
 
 
 LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_new (LibraryPhotoSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) {
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_holding_tank_construct (TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target);
-#line 41411 "Photo.c"
+#line 41536 "Photo.c"
 }
 
 
@@ -41426,59 +41551,59 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 	GeeHashMap* _tmp4_;
 	GFile* _tmp5_;
 	gpointer _tmp6_;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5419 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL);
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5419 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = NULL;
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_file_map;
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = (LibraryPhoto*) _tmp2_;
-#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ret;
-#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = ret;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 41449 "Photo.c"
+#line 41574 "Photo.c"
 	}
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file;
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp6_;
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 41463 "Photo.c"
+#line 41588 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced (Photo* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5449 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41470 "Photo.c"
+#line 41595 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41477 "Photo.c"
+#line 41602 "Photo.c"
 }
 
 
@@ -41488,30 +41613,30 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	GeeCollection* _tmp40_;
 	GeeCollection* _tmp81_;
 	GeeCollection* _tmp82_;
-#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = added;
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 41497 "Photo.c"
+#line 41622 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp2_;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41510 "Photo.c"
+#line 41635 "Photo.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataSource* source = NULL;
@@ -41530,41 +41655,41 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				GeeCollection* _tmp25_;
 				LibraryPhoto* _tmp38_;
 				LibraryPhoto* _tmp39_;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _source_it;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41537 "Photo.c"
+#line 41662 "Photo.c"
 				}
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp6_;
-#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5432 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = source;
-#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5432 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5432 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp8_;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_ != NULL;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp11_);
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 41563 "Photo.c"
+#line 41688 "Photo.c"
 					GeeHashMap* _tmp13_;
 					LibraryPhoto* _tmp14_;
 					GFile* _tmp15_;
@@ -41575,60 +41700,60 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					LibraryPhoto* _tmp20_;
 					GFile* _tmp21_;
 					GFile* _tmp22_;
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->priv->editable_file_map;
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo));
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = _tmp15_;
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo;
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, _tmp17_);
-#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp16_);
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->reverse_editable_file_map;
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = photo;
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = photo;
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
-#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp22_);
-#line 41602 "Photo.c"
+#line 41727 "Photo.c"
 				}
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_files = _tmp24_;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = raw_files;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp25_ != NULL) {
-#line 41614 "Photo.c"
+#line 41739 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp26_;
 						GeeIterator* _tmp27_;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = raw_files;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp27_;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 41627 "Photo.c"
+#line 41752 "Photo.c"
 							GeeIterator* _tmp28_;
 							gboolean _tmp29_;
 							GFile* f = NULL;
@@ -41640,86 +41765,86 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							GeeMultiMap* _tmp35_;
 							LibraryPhoto* _tmp36_;
 							GFile* _tmp37_;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = _f_it;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = gee_iterator_next (_tmp28_);
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp29_) {
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 41647 "Photo.c"
+#line 41772 "Photo.c"
 							}
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = gee_iterator_get (_tmp30_);
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp31_;
-#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp32_ = self->priv->development_file_map;
-#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = f;
-#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = photo;
-#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
-#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = self->priv->reverse_development_file_map;
-#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp36_ = photo;
-#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp37_ = f;
-#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 41673 "Photo.c"
+#line 41798 "Photo.c"
 						}
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41677 "Photo.c"
+#line 41802 "Photo.c"
 					}
 				}
-#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5449 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5449 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo), "editable-replaced", (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self);
-#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo;
-#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo), "raw-development-modified", (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self);
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_files);
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41694 "Photo.c"
+#line 41819 "Photo.c"
 			}
-#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41698 "Photo.c"
+#line 41823 "Photo.c"
 		}
 	}
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = removed;
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp40_ != NULL) {
-#line 41705 "Photo.c"
+#line 41830 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp41_;
 			GeeIterator* _tmp42_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = removed;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp42_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41718 "Photo.c"
+#line 41843 "Photo.c"
 				GeeIterator* _tmp43_;
 				gboolean _tmp44_;
 				DataSource* source = NULL;
@@ -41736,29 +41861,29 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				guint _tmp78_;
 				LibraryPhoto* _tmp79_;
 				guint _tmp80_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _source_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = gee_iterator_next (_tmp43_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp44_) {
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41743 "Photo.c"
+#line 41868 "Photo.c"
 				}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_get (_tmp45_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp46_;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = source;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp48_;
-#line 41757 "Photo.c"
+#line 41882 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
 					GeeMultiMap* _tmp49_;
@@ -41767,25 +41892,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp52_;
 					GeeIterator* _tmp53_;
 					GeeIterator* _tmp54_;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = self->priv->reverse_editable_file_map;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = photo;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_);
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = _tmp51_;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = _tmp53_;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp52_);
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp54_;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41784 "Photo.c"
+#line 41909 "Photo.c"
 						GeeIterator* _tmp55_;
 						gboolean _tmp56_;
 						GFile* f = NULL;
@@ -41793,35 +41918,35 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp58_;
 						GeeHashMap* _tmp59_;
 						GFile* _tmp60_;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp55_ = _f_it;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp56_) {
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41800 "Photo.c"
+#line 41925 "Photo.c"
 						}
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp58_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = self->priv->editable_file_map;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = f;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL);
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41816 "Photo.c"
+#line 41941 "Photo.c"
 					}
-#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41820 "Photo.c"
+#line 41945 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
@@ -41831,25 +41956,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp64_;
 					GeeIterator* _tmp65_;
 					GeeIterator* _tmp66_;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = self->priv->reverse_development_file_map;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp62_ = photo;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_);
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp64_ = _tmp63_;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = _tmp65_;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp64_);
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp66_;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41848 "Photo.c"
+#line 41973 "Photo.c"
 						GeeIterator* _tmp67_;
 						gboolean _tmp68_;
 						GFile* f = NULL;
@@ -41857,78 +41982,78 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp70_;
 						GeeHashMap* _tmp71_;
 						GFile* _tmp72_;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = _f_it;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = gee_iterator_next (_tmp67_);
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp68_) {
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41864 "Photo.c"
+#line 41989 "Photo.c"
 						}
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp70_ = gee_iterator_get (_tmp69_);
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp70_;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp71_ = self->priv->development_file_map;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp72_ = f;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL);
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41880 "Photo.c"
+#line 42005 "Photo.c"
 					}
-#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41884 "Photo.c"
+#line 42009 "Photo.c"
 				}
-#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
-#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo;
-#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove_all (_tmp73_, _tmp74_);
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp75_ = self->priv->reverse_development_file_map;
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp76_ = photo;
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove_all (_tmp75_, _tmp76_);
-#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp77_ = photo;
-#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE);
-#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp78_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_editable_replaced_photo_editable_replaced, self);
-#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = photo;
-#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE);
-#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PHOTO, Photo), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp80_, 0, NULL, (GCallback) _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified, self);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41914 "Photo.c"
+#line 42039 "Photo.c"
 			}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41918 "Photo.c"
+#line 42043 "Photo.c"
 		}
 	}
-#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp81_ = added;
-#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp82_ = removed;
-#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp81_, _tmp82_);
-#line 41927 "Photo.c"
+#line 42052 "Photo.c"
 }
 
 
@@ -41942,79 +42067,79 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	GeeMultiMap* _tmp13_;
 	LibraryPhoto* _tmp14_;
 	GFile* _tmp15_;
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp2_ != NULL, "photo != null");
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5478 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = old_file;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5478 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 41963 "Photo.c"
+#line 42088 "Photo.c"
 		GeeHashMap* _tmp4_;
 		GFile* _tmp5_;
 		GeeMultiMap* _tmp6_;
 		LibraryPhoto* _tmp7_;
 		GFile* _tmp8_;
-#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->editable_file_map;
-#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = old_file;
-#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, NULL);
-#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->reverse_editable_file_map;
-#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_file;
-#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 41983 "Photo.c"
+#line 42108 "Photo.c"
 	}
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = new_file;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != NULL) {
-#line 41989 "Photo.c"
+#line 42114 "Photo.c"
 		GeeHashMap* _tmp10_;
 		GFile* _tmp11_;
 		LibraryPhoto* _tmp12_;
-#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->priv->editable_file_map;
-#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = new_file;
-#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo;
-#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_);
-#line 42001 "Photo.c"
+#line 42126 "Photo.c"
 	}
-#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
-#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo;
-#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = new_file;
-#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42013 "Photo.c"
+#line 42138 "Photo.c"
 }
 
 
@@ -42030,29 +42155,29 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	LibraryPhoto* _tmp20_;
 	GeeCollection* _tmp21_;
 	GeeCollection* _tmp22_;
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5489 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5489 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5489 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5490 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp2_ != NULL, "photo != null");
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->reverse_development_file_map;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5493 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 42051 "Photo.c"
+#line 42176 "Photo.c"
 		GeeMultiMap* _tmp18_;
 		LibraryPhoto* _tmp19_;
 		{
@@ -42063,25 +42188,25 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			GeeCollection* _tmp9_;
 			GeeIterator* _tmp10_;
 			GeeIterator* _tmp11_;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->reverse_development_file_map;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp11_;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42080 "Photo.c"
+#line 42205 "Photo.c"
 				GeeIterator* _tmp12_;
 				gboolean _tmp13_;
 				GFile* f = NULL;
@@ -42089,68 +42214,68 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gpointer _tmp15_;
 				GeeHashMap* _tmp16_;
 				GFile* _tmp17_;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _f_it;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42096 "Photo.c"
+#line 42221 "Photo.c"
 				}
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp15_;
-#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5495 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->development_file_map;
-#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5495 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = f;
-#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5495 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42112 "Photo.c"
+#line 42237 "Photo.c"
 			}
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42116 "Photo.c"
+#line 42241 "Photo.c"
 		}
-#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5496 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
-#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5496 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo;
-#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5496 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42124 "Photo.c"
+#line 42249 "Photo.c"
 	}
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5500 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5500 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5500 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp21_;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5501 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = raw_list;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5501 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 42136 "Photo.c"
+#line 42261 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp23_;
 			GeeIterator* _tmp24_;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = raw_list;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp24_;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42149 "Photo.c"
+#line 42274 "Photo.c"
 				GeeIterator* _tmp25_;
 				gboolean _tmp26_;
 				GFile* f = NULL;
@@ -42162,65 +42287,65 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				GeeMultiMap* _tmp32_;
 				LibraryPhoto* _tmp33_;
 				GFile* _tmp34_;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = _f_it;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = gee_iterator_next (_tmp25_);
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp26_) {
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42169 "Photo.c"
+#line 42294 "Photo.c"
 				}
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = gee_iterator_get (_tmp27_);
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp28_;
-#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5503 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = self->priv->development_file_map;
-#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5503 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = f;
-#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5503 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = photo;
-#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5503 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_);
-#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5504 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->reverse_development_file_map;
-#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5504 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = photo;
-#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5504 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = f;
-#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5504 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42195 "Photo.c"
+#line 42320 "Photo.c"
 			}
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42199 "Photo.c"
+#line 42324 "Photo.c"
 		}
 	}
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5488 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42206 "Photo.c"
+#line 42331 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) {
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass);
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->finalize = library_photo_source_holding_tank_finalize;
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42219 "Photo.c"
+#line 42344 "Photo.c"
 }
 
 
@@ -42229,43 +42354,43 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 	GeeHashMap* _tmp1_;
 	GeeHashMultiMap* _tmp2_;
 	GeeHashMultiMap* _tmp3_;
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
-#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 5405 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_file_map = _tmp0_;
-#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->development_file_map = _tmp1_;
-#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 5409 "/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 5392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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 5392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5411 "/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 42246 "Photo.c"
+#line 42371 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_finalize (SourceHoldingTank * obj) {
 	LibraryPhotoSourceHoldingTank * self;
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_file_map);
-#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->development_file_map);
-#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->reverse_editable_file_map);
-#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->reverse_development_file_map);
-#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42264 "Photo.c"
+#line 42389 "Photo.c"
 }
 
 
diff --git a/src/Photo.vala b/src/Photo.vala
index c768017..f089d79 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -628,12 +628,14 @@ public abstract class Photo : PhotoSource, Dateable {
     // Reads info on a backing photo and adds it.
     // Note: this function was created for importing new photos.  It will not
     // notify of changes to the developments.
-    public void add_backing_photo_for_development(RawDeveloper d, BackingPhotoRow bpr) throws Error {
+    public void add_backing_photo_for_development(RawDeveloper d, BackingPhotoRow bpr, bool notify = true) throws Error {
         import_developed_backing_photo(row, d, bpr);
         lock (developments) {
             developments.set(d, bpr);
         }
-        notify_altered(new Alteration("image", "developer"));
+
+        if (notify)
+            notify_altered(new Alteration("image", "developer"));
     }
     
     public static void import_developed_backing_photo(PhotoRow row, RawDeveloper d, 
@@ -667,7 +669,7 @@ public abstract class Photo : PhotoSource, Dateable {
     
     // "Develops" a raw photo
     // Not thread-safe.
-    private void develop_photo(RawDeveloper d) {
+    private void develop_photo(RawDeveloper d, bool notify) {
         bool wrote_img_to_disk = false;
         BackingPhotoRow bps = null;
         
@@ -714,7 +716,7 @@ public abstract class Photo : PhotoSource, Dateable {
                     if (wrote_img_to_disk) {
                         try {
                             // Read in backing photo info, add to DB.
-                            add_backing_photo_for_development(d, bps);
+                            add_backing_photo_for_development(d, bps, notify);
                             
                             notify_raw_development_modified();
                         } catch (Error e) {
@@ -743,17 +745,33 @@ public abstract class Photo : PhotoSource, Dateable {
                         return;
                     }
                     
-                    Gdk.Pixbuf? pix = prev.get_pixbuf();
+                    var pix = prev.flatten();
                     if (pix == null) {
                         debug("Could not get preview pixbuf");
                         return;
                     }
-                    
+
                     // Write out file.
                     bps = d.create_backing_row_for_development(row.master.filepath);
-                    PhotoFileWriter writer = PhotoFileFormat.JFIF.create_writer(bps.filepath);
-                    writer.write(pix, Jpeg.Quality.HIGH);
-                    
+
+                    // Peek at data. If we really have a JPEG image, just use it,
+                    // otherwise do GdkPixbuf roundtrip
+                    if (Jpeg.is_jpeg_bytes(pix)) {
+                        var outfile = File.new_for_path(bps.filepath);
+                        outfile.replace_contents(pix.get_data(), null,
+                                false, FileCreateFlags.NONE, null);
+                    } else {
+                        var pixbuf = prev.get_pixbuf();
+                        if (pixbuf == null) {
+                            debug("Could not get preview pixbuf");
+                            return;
+                        }
+
+                        var writer = PhotoFileFormat.JFIF.create_writer(bps.filepath);
+                        writer.write(pixbuf, Jpeg.Quality.HIGH);
+                    }
+
+
                     // Remember that we wrote it (see above
                     // case for why this is necessary).
                     wrote_img_to_disk = true;
@@ -768,7 +786,7 @@ public abstract class Photo : PhotoSource, Dateable {
                     if (wrote_img_to_disk) {
                         try {
                             // Read in backing photo info, add to DB.
-                            add_backing_photo_for_development(d, bps);
+                            add_backing_photo_for_development(d, bps, notify);
                             
                             notify_raw_development_modified();
                         } catch (Error e) {
@@ -792,7 +810,7 @@ public abstract class Photo : PhotoSource, Dateable {
     }
     
     // Sets the developer and develops the photo.
-    public void set_raw_developer(RawDeveloper d) {
+    public void set_raw_developer(RawDeveloper d, bool notify = true) {
         if (get_master_file_format() != PhotoFileFormat.RAW)
             return;
         
@@ -804,7 +822,7 @@ public abstract class Photo : PhotoSource, Dateable {
             
         // If the embedded preview is too small to be used in the PhotoPage, don't
         // allow EMBEDDED to be chosen.
-        if (!is_raw_developer_available(RawDeveloper.EMBEDDED))
+        if (!is_raw_developer_available(RawDeveloper.EMBEDDED) && d != RawDeveloper.CAMERA)
             d = RawDeveloper.SHOTWELL;
             
         lock (developments) {
@@ -812,7 +830,7 @@ public abstract class Photo : PhotoSource, Dateable {
             
             // Perform development, bail out if it doesn't work.
             if (!is_raw_developer_complete(d)) {
-                develop_photo(d);
+                develop_photo(d, notify);
             }
             if (!developments.has_key(d))
                 return; // we tried!
@@ -855,14 +873,15 @@ public abstract class Photo : PhotoSource, Dateable {
             // and is to be preserved.
         }
         
-        notify_altered(new Alteration("image", "developer"));
+        if (notify)
+            notify_altered(new Alteration("image", "developer"));
         discard_prefetched();
     }
-    
+
     public RawDeveloper get_raw_developer() {
         return row.developer;
     }
-    
+
     // Removes a development from the database, filesystem, etc.
     // Returns true if a development was removed, otherwise false.
     private bool delete_raw_development(RawDeveloper d) {
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index f9c7e9f..82de1d6 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -724,10 +724,10 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto
 static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1);
 gboolean photo_has_editable (Photo* self);
 GFile* photo_get_editable_file (Photo* self);
-static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value);
-GeeCollection* photo_get_raw_developer_files (Photo* self);
 static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value);
-static GFile** _vala_array_dup31 (GFile** self, int length);
+GeeCollection* photo_get_raw_developer_files (Photo* self);
+static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value);
+static GFile** _vala_array_dup26 (GFile** self, int length);
 static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
 static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info);
@@ -755,7 +755,7 @@ void photo_monitor_update_editable_file_info_altered (PhotoMonitor* self, Librar
 void photo_monitor_update_editable_file_alterations_completed (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info);
 void photo_monitor_update_reimport_editable (PhotoMonitor* self, LibraryPhoto* photo);
 GType raw_developer_get_type (void) G_GNUC_CONST;
-void photo_set_raw_developer (Photo* self, RawDeveloper d);
+void photo_set_raw_developer (Photo* self, RawDeveloper d, gboolean notify);
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
@@ -2618,7 +2618,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 }
 
 
-static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2635,7 +2635,7 @@ static void _vala_array_add131 (GFile** * array, int* length, int* size, GFile*
 }
 
 
-static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add133 (GFile** * array, int* length, int* size, GFile* value) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2652,7 +2652,7 @@ static void _vala_array_add132 (GFile** * array, int* length, int* size, GFile*
 }
 
 
-static GFile** _vala_array_dup31 (GFile** self, int length) {
+static GFile** _vala_array_dup26 (GFile** self, int length) {
 	GFile** result;
 	int i;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2736,7 +2736,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_vala_array_add131 (&files, &files_length1, &_files_size_, _tmp7_);
+		_vala_array_add132 (&files, &files_length1, &_files_size_, _tmp7_);
 #line 2739 "PhotoMonitor.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2797,7 +2797,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp19_ = _g_object_ref0 (_tmp18_);
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-				_vala_array_add132 (&files, &files_length1, &_files_size_, _tmp19_);
+				_vala_array_add133 (&files, &files_length1, &_files_size_, _tmp19_);
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (f);
 #line 2802 "PhotoMonitor.c"
@@ -2837,7 +2837,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 2836 "PhotoMonitor.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup31 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_);
+	_tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup26 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_);
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp23__length1 = _tmp20__length1;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3291,7 +3291,7 @@ static void photo_monitor_check_for_raw_development_changes (PhotoMonitor* self,
 #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp1_ = photo;
 #line 442 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL);
+		photo_set_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO, Photo), RAW_DEVELOPER_SHOTWELL, TRUE);
 #line 444 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		return;
 #line 3296 "PhotoMonitor.c"
@@ -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 __catch586_database_error;
+					goto __catch595_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 __finally586;
-		__catch586_database_error:
+		goto __finally595;
+		__catch595_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp97_;
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6658 "PhotoMonitor.c"
 		}
-		__finally586:
+		__finally595:
 #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 __catch587_database_error;
+					goto __catch596_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 __finally587;
-		__catch587_database_error:
+		goto __finally596;
+		__catch596_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp105_;
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6760 "PhotoMonitor.c"
 		}
-		__finally587:
+		__finally596:
 #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 __catch588_database_error;
+				goto __catch597_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 __finally588;
-	__catch588_database_error:
+	goto __finally597;
+	__catch597_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_;
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 		_g_error_free0 (err);
 #line 7466 "PhotoMonitor.c"
 	}
-	__finally588:
+	__finally597:
 #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 __catch589_database_error;
+				goto __catch598_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 __finally589;
-	__catch589_database_error:
+	goto __finally598;
+	__catch598_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 		_g_error_free0 (err);
 #line 7679 "PhotoMonitor.c"
 	}
-	__finally589:
+	__finally598:
 #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 __catch590_database_error;
+				goto __catch599_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 __finally590;
-	__catch590_database_error:
+	goto __finally599;
+	__catch599_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_;
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 		_g_error_free0 (err);
 #line 7873 "PhotoMonitor.c"
 	}
-	__finally590:
+	__finally599:
 #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 __catch591_g_error;
+			goto __catch600_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally591;
-	__catch591_g_error:
+	goto __finally600;
+	__catch600_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (err);
 #line 8057 "PhotoMonitor.c"
 	}
-	__finally591:
+	__finally600:
 #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 __catch592_g_error;
+			goto __catch601_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally601;
+	__catch601_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 		_g_error_free0 (err);
 #line 8235 "PhotoMonitor.c"
 	}
-	__finally592:
+	__finally601:
 #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 __catch593_g_error;
+			goto __catch602_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally593;
-	__catch593_g_error:
+	goto __finally602;
+	__catch602_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 		_g_error_free0 (err);
 #line 8413 "PhotoMonitor.c"
 	}
-	__finally593:
+	__finally602:
 #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 65c465c..8693b5d 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -14,6 +14,7 @@
 #include <math.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
+#include "shotwell-graphics-processor.h"
 #include <gio/gio.h>
 #include <cairo.h>
 #include <string.h>
@@ -171,16 +172,6 @@ typedef struct _BackgroundJobPrivate BackgroundJobPrivate;
 typedef struct _ZoomBufferIsoSourceFetchJobPrivate ZoomBufferIsoSourceFetchJobPrivate;
 
 #define TYPE_DIRECTION (direction_get_type ())
-
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
 #define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
 typedef struct _ZoomBufferTransformationJobPrivate ZoomBufferTransformationJobPrivate;
 
@@ -661,16 +652,6 @@ typedef struct _EditingToolsAdjustToolClass EditingToolsAdjustToolClass;
 
 typedef struct _EnhanceSingleCommand EnhanceSingleCommand;
 typedef struct _EnhanceSingleCommandClass EnhanceSingleCommandClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
 #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
 
 #define TYPE_ADJUST_COLORS_SINGLE_COMMAND (adjust_colors_single_command_get_type ())
@@ -1529,13 +1510,6 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) G_GNUC_CONST G_GNU
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
 GType direction_get_type (void) G_GNUC_CONST;
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction);
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
 PixelTransformer* photo_get_pixel_transformer (Photo* self);
 static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job);
 static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self);
@@ -1588,7 +1562,6 @@ enum  {
 	ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY
 };
 static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base);
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
 static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj);
 static void zoom_buffer_finalize (GObject * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
@@ -2081,18 +2054,9 @@ GType enhance_single_command_get_type (void) G_GNUC_CONST;
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo);
 EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo);
 void editing_host_page_on_copy_adjustments (EditingHostPage* self);
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
-void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void editing_host_page_on_paste_adjustments (EditingHostPage* self);
-PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
 #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments")
 #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
@@ -2243,9 +2207,9 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display);
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
 static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -2254,10 +2218,8 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
 static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self);
 static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self);
 gboolean photo_has_color_adjustments (Photo* self);
-gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self);
 gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
 void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd);
 static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd);
 gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d);
@@ -2416,7 +2378,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 2420 "PhotoPage.c"
+#line 2382 "PhotoPage.c"
 }
 
 
@@ -2469,28 +2431,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 2473 "PhotoPage.c"
+#line 2435 "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 2480 "PhotoPage.c"
+#line 2442 "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 2487 "PhotoPage.c"
+#line 2449 "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 2494 "PhotoPage.c"
+#line 2456 "PhotoPage.c"
 }
 
 
@@ -2544,7 +2506,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 2547 "PhotoPage.c"
+#line 2509 "PhotoPage.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = fetch_job;
@@ -2570,7 +2532,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 2573 "PhotoPage.c"
+#line 2535 "PhotoPage.c"
 		GdkPixbuf* _tmp13_;
 		GdkPixbuf* _tmp14_;
 		gint _tmp15_;
@@ -2599,7 +2561,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 2602 "PhotoPage.c"
+#line 2564 "PhotoPage.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED;
@@ -2607,13 +2569,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 2610 "PhotoPage.c"
+#line 2572 "PhotoPage.c"
 		SinglePhotoPage* _tmp22_;
 #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 2616 "PhotoPage.c"
+#line 2578 "PhotoPage.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = self->priv->iso_source_image;
@@ -2647,7 +2609,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 2650 "PhotoPage.c"
+#line 2612 "PhotoPage.c"
 }
 
 
@@ -2688,7 +2650,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 2691 "PhotoPage.c"
+#line 2653 "PhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2714,7 +2676,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 2717 "PhotoPage.c"
+#line 2679 "PhotoPage.c"
 		GdkPixbuf* _tmp13_;
 		GdkPixbuf* _tmp14_;
 		gint _tmp15_;
@@ -2743,13 +2705,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 2746 "PhotoPage.c"
+#line 2708 "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 2752 "PhotoPage.c"
+#line 2714 "PhotoPage.c"
 }
 
 
@@ -2785,7 +2747,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 2788 "PhotoPage.c"
+#line 2750 "PhotoPage.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2807,7 +2769,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 2810 "PhotoPage.c"
+#line 2772 "PhotoPage.c"
 }
 
 
@@ -2880,21 +2842,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 2883 "PhotoPage.c"
+#line 2845 "PhotoPage.c"
 		gdouble _tmp7_;
 #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 2889 "PhotoPage.c"
+#line 2851 "PhotoPage.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 2893 "PhotoPage.c"
+#line 2855 "PhotoPage.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 2897 "PhotoPage.c"
+#line 2859 "PhotoPage.c"
 		GdkPixbuf* _tmp8_;
 		GdkPixbuf* _tmp9_;
 		gint _tmp10_;
@@ -2925,7 +2887,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 2928 "PhotoPage.c"
+#line 2890 "PhotoPage.c"
 	}
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = view_rect_proj;
@@ -3003,14 +2965,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 3006 "PhotoPage.c"
+#line 2968 "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 3013 "PhotoPage.c"
+#line 2975 "PhotoPage.c"
 }
 
 
@@ -3029,7 +2991,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 3032 "PhotoPage.c"
+#line 2994 "PhotoPage.c"
 		ZoomState _tmp1_;
 		gboolean _tmp2_;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3038,7 +3000,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 3041 "PhotoPage.c"
+#line 3003 "PhotoPage.c"
 			GdkPixbuf* _tmp3_;
 			GdkPixbuf* _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3049,7 +3011,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 3052 "PhotoPage.c"
+#line 3014 "PhotoPage.c"
 		} else {
 			gdouble _tmp5_;
 			gdouble _tmp6_;
@@ -3059,7 +3021,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 3062 "PhotoPage.c"
+#line 3024 "PhotoPage.c"
 				GdkRectangle curr_rect = {0};
 				GdkRectangle _tmp7_ = {0};
 				GdkRectangle pre_rect = {0};
@@ -3379,7 +3341,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 3382 "PhotoPage.c"
+#line 3344 "PhotoPage.c"
 			}
 		}
 	}
@@ -3387,7 +3349,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 3390 "PhotoPage.c"
+#line 3352 "PhotoPage.c"
 		ZoomState _tmp98_;
 		gboolean _tmp99_;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3396,7 +3358,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 3399 "PhotoPage.c"
+#line 3361 "PhotoPage.c"
 			ZoomState _tmp100_;
 			GdkPixbuf* _tmp101_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3407,7 +3369,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 3410 "PhotoPage.c"
+#line 3372 "PhotoPage.c"
 		} else {
 			ZoomBufferTransformationJob* _tmp102_;
 			GdkPixbuf* zoomed = NULL;
@@ -3487,14 +3449,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 3490 "PhotoPage.c"
+#line 3452 "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 3497 "PhotoPage.c"
+#line 3459 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
 		ZoomState _tmp120_;
 		GdkPixbuf* _tmp121_;
@@ -3564,7 +3526,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 3567 "PhotoPage.c"
+#line 3529 "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" \
@@ -3577,14 +3539,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 3579 "PhotoPage.c"
+#line 3541 "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 3586 "PhotoPage.c"
+#line 3548 "PhotoPage.c"
 }
 
 
@@ -3627,7 +3589,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 3629 "PhotoPage.c"
+#line 3591 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
 		Photo* _tmp1_;
 		ZoomBufferIsoSourceFetchJob* _tmp2_;
@@ -3649,7 +3611,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 3651 "PhotoPage.c"
+#line 3613 "PhotoPage.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_);
@@ -3717,7 +3679,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 3719 "PhotoPage.c"
+#line 3681 "PhotoPage.c"
 }
 
 
@@ -3735,7 +3697,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	result = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3737 "PhotoPage.c"
+#line 3699 "PhotoPage.c"
 }
 
 
@@ -3754,7 +3716,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 3756 "PhotoPage.c"
+#line 3718 "PhotoPage.c"
 }
 
 
@@ -3770,7 +3732,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 3772 "PhotoPage.c"
+#line 3734 "PhotoPage.c"
 		ZoomState* _tmp1_;
 		ZoomState _tmp2_;
 		GdkPixbuf* _tmp3_;
@@ -3785,7 +3747,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 3787 "PhotoPage.c"
+#line 3749 "PhotoPage.c"
 	}
 }
 
@@ -3804,7 +3766,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 3806 "PhotoPage.c"
+#line 3768 "PhotoPage.c"
 		ZoomState _tmp1_;
 		GdkPixbuf* _tmp2_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3815,7 +3777,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 3817 "PhotoPage.c"
+#line 3779 "PhotoPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->object_state;
@@ -3825,7 +3787,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 3827 "PhotoPage.c"
+#line 3789 "PhotoPage.c"
 		{
 			ZoomState _tmp4_;
 			GdkPixbuf* _tmp5_;
@@ -3837,11 +3799,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 3839 "PhotoPage.c"
+#line 3801 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
-#line 3843 "PhotoPage.c"
+#line 3805 "PhotoPage.c"
 		{
 			ZoomState _tmp6_;
 			GdkPixbuf* _tmp7_;
@@ -3853,11 +3815,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 3855 "PhotoPage.c"
+#line 3817 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
-#line 3859 "PhotoPage.c"
+#line 3821 "PhotoPage.c"
 		{
 			ZoomState _tmp8_;
 			GdkPixbuf* _tmp9_;
@@ -3875,7 +3837,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 3877 "PhotoPage.c"
+#line 3839 "PhotoPage.c"
 		}
 		default:
 		{
@@ -3892,7 +3854,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 3893 "PhotoPage.c"
+#line 3855 "PhotoPage.c"
 		}
 	}
 }
@@ -3916,7 +3878,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 3917 "PhotoPage.c"
+#line 3879 "PhotoPage.c"
 }
 
 
@@ -3949,14 +3911,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 3950 "PhotoPage.c"
+#line 3912 "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 3957 "PhotoPage.c"
+#line 3919 "PhotoPage.c"
 }
 
 
@@ -3965,7 +3927,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 3966 "PhotoPage.c"
+#line 3928 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -3982,8 +3944,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 3983 "PhotoPage.c"
-			goto __catch244_g_error;
+#line 3945 "PhotoPage.c"
+			goto __catch255_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -3995,10 +3957,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 3996 "PhotoPage.c"
+#line 3958 "PhotoPage.c"
 	}
-	goto __finally244;
-	__catch244_g_error:
+	goto __finally255;
+	__catch255_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4010,9 +3972,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 4010 "PhotoPage.c"
+#line 3972 "PhotoPage.c"
 	}
-	__finally244:
+	__finally255:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4021,7 +3983,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 4021 "PhotoPage.c"
+#line 3983 "PhotoPage.c"
 	}
 }
 
@@ -4035,7 +3997,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 = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute;
-#line 4035 "PhotoPage.c"
+#line 3997 "PhotoPage.c"
 }
 
 
@@ -4044,7 +4006,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 4044 "PhotoPage.c"
+#line 4006 "PhotoPage.c"
 }
 
 
@@ -4058,7 +4020,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 4058 "PhotoPage.c"
+#line 4020 "PhotoPage.c"
 }
 
 
@@ -4077,7 +4039,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 4077 "PhotoPage.c"
+#line 4039 "PhotoPage.c"
 }
 
 
@@ -4147,14 +4109,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT
 	self->transformed = _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4147 "PhotoPage.c"
+#line 4109 "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 4154 "PhotoPage.c"
+#line 4116 "PhotoPage.c"
 }
 
 
@@ -4167,7 +4129,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 4167 "PhotoPage.c"
+#line 4129 "PhotoPage.c"
 		PixelTransformer* _tmp1_;
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
@@ -4181,8 +4143,8 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->cancellable;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 4182 "PhotoPage.c"
+		pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_, -1);
+#line 4144 "PhotoPage.c"
 	}
 }
 
@@ -4196,7 +4158,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 = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute;
-#line 4196 "PhotoPage.c"
+#line 4158 "PhotoPage.c"
 }
 
 
@@ -4205,7 +4167,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 4205 "PhotoPage.c"
+#line 4167 "PhotoPage.c"
 }
 
 
@@ -4223,7 +4185,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 4223 "PhotoPage.c"
+#line 4185 "PhotoPage.c"
 }
 
 
@@ -4246,7 +4208,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 4246 "PhotoPage.c"
+#line 4208 "PhotoPage.c"
 }
 
 
@@ -4275,7 +4237,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 4275 "PhotoPage.c"
+#line 4237 "PhotoPage.c"
 }
 
 
@@ -4305,7 +4267,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 4305 "PhotoPage.c"
+#line 4267 "PhotoPage.c"
 }
 
 
@@ -4324,77 +4286,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 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
-#line 4324 "PhotoPage.c"
+#line 4286 "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 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4331 "PhotoPage.c"
+#line 4293 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
 #line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4338 "PhotoPage.c"
+#line 4300 "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 4345 "PhotoPage.c"
+#line 4307 "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 4352 "PhotoPage.c"
+#line 4314 "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 4359 "PhotoPage.c"
+#line 4321 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
-#line 4366 "PhotoPage.c"
+#line 4328 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
-#line 4373 "PhotoPage.c"
+#line 4335 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
-#line 4380 "PhotoPage.c"
+#line 4342 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
-#line 4387 "PhotoPage.c"
+#line 4349 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 4394 "PhotoPage.c"
+#line 4356 "PhotoPage.c"
 }
 
 
@@ -4403,14 +4365,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 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4403 "PhotoPage.c"
+#line 4365 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
-#line 4410 "PhotoPage.c"
+#line 4372 "PhotoPage.c"
 }
 
 
@@ -4419,7 +4381,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 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4419 "PhotoPage.c"
+#line 4381 "PhotoPage.c"
 }
 
 
@@ -4428,7 +4390,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 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4428 "PhotoPage.c"
+#line 4390 "PhotoPage.c"
 }
 
 
@@ -4437,7 +4399,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 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4437 "PhotoPage.c"
+#line 4399 "PhotoPage.c"
 }
 
 
@@ -4446,21 +4408,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 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4446 "PhotoPage.c"
+#line 4408 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 4453 "PhotoPage.c"
+#line 4415 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 4460 "PhotoPage.c"
+#line 4422 "PhotoPage.c"
 }
 
 
@@ -4981,7 +4943,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 4981 "PhotoPage.c"
+#line 4943 "PhotoPage.c"
 }
 
 
@@ -5005,7 +4967,7 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 5005 "PhotoPage.c"
+#line 4967 "PhotoPage.c"
 		ZoomState _tmp4_;
 		gboolean _tmp5_;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5016,13 +4978,13 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
 #line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5016 "PhotoPage.c"
+#line 4978 "PhotoPage.c"
 			ZoomState _tmp6_;
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
 #line 564 "/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 5022 "PhotoPage.c"
+#line 4984 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_;
@@ -5032,22 +4994,22 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 		if (_tmp7_) {
 #line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5032 "PhotoPage.c"
+#line 4994 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_;
 #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
 #line 569 "/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 5039 "PhotoPage.c"
+#line 5001 "PhotoPage.c"
 		}
 #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5043 "PhotoPage.c"
+#line 5005 "PhotoPage.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5047 "PhotoPage.c"
+#line 5009 "PhotoPage.c"
 }
 
 
@@ -5072,7 +5034,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	_g_object_unref0 (_tmp1_);
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5072 "PhotoPage.c"
+#line 5034 "PhotoPage.c"
 		GtkWindow* _tmp3_;
 		FullscreenWindow* _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5083,13 +5045,13 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5083 "PhotoPage.c"
+#line 5045 "PhotoPage.c"
 	}
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5089 "PhotoPage.c"
+#line 5051 "PhotoPage.c"
 }
 
 
@@ -5119,7 +5081,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	_g_object_unref0 (_tmp1_);
 #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5119 "PhotoPage.c"
+#line 5081 "PhotoPage.c"
 		GtkWindow* _tmp3_;
 		FullscreenWindow* _tmp4_;
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5130,7 +5092,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5130 "PhotoPage.c"
+#line 5092 "PhotoPage.c"
 	}
 #line 592 "/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_);
@@ -5150,7 +5112,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	result = FALSE;
 #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5150 "PhotoPage.c"
+#line 5112 "PhotoPage.c"
 }
 
 
@@ -5166,7 +5128,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
 	result = TRUE;
 #line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5166 "PhotoPage.c"
+#line 5128 "PhotoPage.c"
 }
 
 
@@ -5182,7 +5144,7 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
 	result = TRUE;
 #line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5182 "PhotoPage.c"
+#line 5144 "PhotoPage.c"
 }
 
 
@@ -5294,7 +5256,7 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	*result = _result_;
 #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5294 "PhotoPage.c"
+#line 5256 "PhotoPage.c"
 }
 
 
@@ -5356,7 +5318,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	*result = _tmp11_;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5356 "PhotoPage.c"
+#line 5318 "PhotoPage.c"
 }
 
 
@@ -5414,7 +5376,7 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	*result = _tmp12_;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5414 "PhotoPage.c"
+#line 5376 "PhotoPage.c"
 }
 
 
@@ -5430,7 +5392,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	if (_tmp0_ < 0.03) {
 #line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5430 "PhotoPage.c"
+#line 5392 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5439,7 +5401,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 		if (_tmp1_ > 0.97) {
 #line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5439 "PhotoPage.c"
+#line 5401 "PhotoPage.c"
 		}
 	}
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5448,7 +5410,7 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	result = _tmp2_;
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5448 "PhotoPage.c"
+#line 5410 "PhotoPage.c"
 }
 
 
@@ -5472,7 +5434,7 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	result = _tmp3_;
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5472 "PhotoPage.c"
+#line 5434 "PhotoPage.c"
 }
 
 
@@ -5517,7 +5479,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	if (_tmp0_) {
 #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5517 "PhotoPage.c"
+#line 5479 "PhotoPage.c"
 	}
 #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -5571,7 +5533,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 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5571 "PhotoPage.c"
+#line 5533 "PhotoPage.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
@@ -5603,7 +5565,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 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5603 "PhotoPage.c"
+#line 5565 "PhotoPage.c"
 }
 
 
@@ -5615,7 +5577,7 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 694 "/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 5615 "PhotoPage.c"
+#line 5577 "PhotoPage.c"
 }
 
 
@@ -5627,7 +5589,7 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 698 "/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 5627 "PhotoPage.c"
+#line 5589 "PhotoPage.c"
 }
 
 
@@ -5648,7 +5610,7 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5648 "PhotoPage.c"
+#line 5610 "PhotoPage.c"
 }
 
 
@@ -5691,7 +5653,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 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5691 "PhotoPage.c"
+#line 5653 "PhotoPage.c"
 			default:
 			{
 #line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5700,13 +5662,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5700 "PhotoPage.c"
+#line 5662 "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 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5706 "PhotoPage.c"
+#line 5668 "PhotoPage.c"
 			default:
 			{
 #line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5715,13 +5677,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5715 "PhotoPage.c"
+#line 5677 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5721 "PhotoPage.c"
+#line 5683 "PhotoPage.c"
 			default:
 			{
 #line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5730,13 +5692,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5730 "PhotoPage.c"
+#line 5692 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5736 "PhotoPage.c"
+#line 5698 "PhotoPage.c"
 			default:
 			{
 #line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5745,7 +5707,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5745 "PhotoPage.c"
+#line 5707 "PhotoPage.c"
 			}
 		}
 	}
@@ -5753,7 +5715,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	result = FALSE;
 #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5753 "PhotoPage.c"
+#line 5715 "PhotoPage.c"
 }
 
 
@@ -5762,7 +5724,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 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5762 "PhotoPage.c"
+#line 5724 "PhotoPage.c"
 }
 
 
@@ -5775,7 +5737,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 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5775 "PhotoPage.c"
+#line 5737 "PhotoPage.c"
 }
 
 
@@ -5784,7 +5746,7 @@ void editing_host_page_on_increase_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5784 "PhotoPage.c"
+#line 5746 "PhotoPage.c"
 }
 
 
@@ -5797,7 +5759,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 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5797 "PhotoPage.c"
+#line 5759 "PhotoPage.c"
 }
 
 
@@ -5806,7 +5768,7 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5806 "PhotoPage.c"
+#line 5768 "PhotoPage.c"
 }
 
 
@@ -5824,7 +5786,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 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5824 "PhotoPage.c"
+#line 5786 "PhotoPage.c"
 }
 
 
@@ -5843,7 +5805,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	result = _tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5843 "PhotoPage.c"
+#line 5805 "PhotoPage.c"
 }
 
 
@@ -5866,7 +5828,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	if (_tmp2_) {
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5866 "PhotoPage.c"
+#line 5828 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_;
 		gboolean _tmp4_;
@@ -5876,7 +5838,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 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5876 "PhotoPage.c"
+#line 5838 "PhotoPage.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5884,7 +5846,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 5884 "PhotoPage.c"
+#line 5846 "PhotoPage.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5894,7 +5856,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	result = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5894 "PhotoPage.c"
+#line 5856 "PhotoPage.c"
 }
 
 
@@ -5917,7 +5879,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	if (_tmp2_) {
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5917 "PhotoPage.c"
+#line 5879 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_;
 		gboolean _tmp4_;
@@ -5927,7 +5889,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 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5927 "PhotoPage.c"
+#line 5889 "PhotoPage.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5935,7 +5897,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 5935 "PhotoPage.c"
+#line 5897 "PhotoPage.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -5945,7 +5907,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	result = FALSE;
 #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5945 "PhotoPage.c"
+#line 5907 "PhotoPage.c"
 }
 
 
@@ -5976,7 +5938,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	_tmp4_ = self->priv->zoom_slider;
 #line 770 "/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 5976 "PhotoPage.c"
+#line 5938 "PhotoPage.c"
 }
 
 
@@ -5989,7 +5951,7 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
 	result = TRUE;
 #line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5989 "PhotoPage.c"
+#line 5951 "PhotoPage.c"
 }
 
 
@@ -6009,7 +5971,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	_tmp1_ = container;
 #line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 6009 "PhotoPage.c"
+#line 5971 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_;
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6017,7 +5979,7 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6017 "PhotoPage.c"
+#line 5979 "PhotoPage.c"
 	}
 }
 
@@ -6036,7 +5998,7 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	result = _tmp1_;
 #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6036 "PhotoPage.c"
+#line 5998 "PhotoPage.c"
 }
 
 
@@ -6059,7 +6021,7 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	result = _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6059 "PhotoPage.c"
+#line 6021 "PhotoPage.c"
 }
 
 
@@ -6096,7 +6058,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 		result = NULL;
 #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6096 "PhotoPage.c"
+#line 6058 "PhotoPage.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6128,7 +6090,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	result = _tmp12_;
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6128 "PhotoPage.c"
+#line 6090 "PhotoPage.c"
 }
 
 
@@ -6146,7 +6108,7 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
 #line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6146 "PhotoPage.c"
+#line 6108 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_;
 		GFile* _tmp3_;
@@ -6164,13 +6126,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 		editing_host_page_set_photo_missing (self, !_tmp5_);
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6164 "PhotoPage.c"
+#line 6126 "PhotoPage.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6170 "PhotoPage.c"
+#line 6132 "PhotoPage.c"
 }
 
 
@@ -6179,7 +6141,7 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo)
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6179 "PhotoPage.c"
+#line 6141 "PhotoPage.c"
 }
 
 
@@ -6284,7 +6246,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	_tmp21_ = self->priv->parent_view;
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6284 "PhotoPage.c"
+#line 6246 "PhotoPage.c"
 		ViewCollection* _tmp22_;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_;
@@ -6307,7 +6269,7 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 		_tmp26_ = view_in_parent;
 #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6307 "PhotoPage.c"
+#line 6269 "PhotoPage.c"
 			ViewCollection* _tmp27_;
 			ViewCollection* _tmp28_;
 			DataView* _tmp29_;
@@ -6327,17 +6289,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 			view_collection_select_marked (_tmp27_, _tmp31_);
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6327 "PhotoPage.c"
+#line 6289 "PhotoPage.c"
 		}
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6331 "PhotoPage.c"
+#line 6293 "PhotoPage.c"
 	}
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6337 "PhotoPage.c"
+#line 6299 "PhotoPage.c"
 }
 
 
@@ -6349,7 +6311,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 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6349 "PhotoPage.c"
+#line 6311 "PhotoPage.c"
 }
 
 
@@ -6367,21 +6329,21 @@ static void editing_host_page_real_switched_to (Page* base) {
 	_tmp1_ = editing_host_page_has_photo (self);
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6367 "PhotoPage.c"
+#line 6329 "PhotoPage.c"
 		gboolean _tmp2_;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6373 "PhotoPage.c"
+#line 6335 "PhotoPage.c"
 	} else {
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6377 "PhotoPage.c"
+#line 6339 "PhotoPage.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6381 "PhotoPage.c"
+#line 6343 "PhotoPage.c"
 		Photo* _tmp3_;
 		Photo* _tmp4_;
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6392,7 +6354,7 @@ static void editing_host_page_real_switched_to (Page* base) {
 		editing_host_page_replace_photo (self, _tmp4_);
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6392 "PhotoPage.c"
+#line 6354 "PhotoPage.c"
 	}
 }
 
@@ -6420,21 +6382,21 @@ static void editing_host_page_real_switching_from (Page* base) {
 	_tmp2_ = editing_host_page_has_photo (self);
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6420 "PhotoPage.c"
+#line 6382 "PhotoPage.c"
 		ViewCollection* _tmp3_;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6426 "PhotoPage.c"
+#line 6388 "PhotoPage.c"
 	} else {
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6430 "PhotoPage.c"
+#line 6392 "PhotoPage.c"
 	}
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6434 "PhotoPage.c"
+#line 6396 "PhotoPage.c"
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
@@ -6470,7 +6432,7 @@ static void editing_host_page_real_switching_from (Page* base) {
 		_g_object_unref0 (_tmp10_);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6470 "PhotoPage.c"
+#line 6432 "PhotoPage.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
@@ -6484,14 +6446,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 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6484 "PhotoPage.c"
+#line 6446 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6491 "PhotoPage.c"
+#line 6453 "PhotoPage.c"
 }
 
 
@@ -6529,7 +6491,7 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	_tmp4_ = page;
 #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6529 "PhotoPage.c"
+#line 6491 "PhotoPage.c"
 		Page* _tmp5_;
 		ViewCollection* _tmp6_;
 		ViewCollection* _tmp7_;
@@ -6543,11 +6505,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 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6543 "PhotoPage.c"
+#line 6505 "PhotoPage.c"
 	}
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6547 "PhotoPage.c"
+#line 6509 "PhotoPage.c"
 }
 
 
@@ -6578,7 +6540,7 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	_tmp3_ = page;
 #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6578 "PhotoPage.c"
+#line 6540 "PhotoPage.c"
 		Page* _tmp4_;
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
@@ -6595,11 +6557,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 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6595 "PhotoPage.c"
+#line 6557 "PhotoPage.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6599 "PhotoPage.c"
+#line 6561 "PhotoPage.c"
 }
 
 
@@ -6608,7 +6570,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6608 "PhotoPage.c"
+#line 6570 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_;
@@ -6621,7 +6583,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 		_view_it = _tmp1_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6621 "PhotoPage.c"
+#line 6583 "PhotoPage.c"
 			gboolean _tmp2_;
 			DataView* view = NULL;
 			gpointer _tmp3_;
@@ -6634,7 +6596,7 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			if (!_tmp2_) {
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6634 "PhotoPage.c"
+#line 6596 "PhotoPage.c"
 			}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
@@ -6654,11 +6616,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 			_g_object_unref0 (view);
 #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6654 "PhotoPage.c"
+#line 6616 "PhotoPage.c"
 		}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6658 "PhotoPage.c"
+#line 6620 "PhotoPage.c"
 	}
 }
 
@@ -6674,14 +6636,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena
 	_tmp1_ = should_enable;
 #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6674 "PhotoPage.c"
+#line 6636 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6681 "PhotoPage.c"
+#line 6643 "PhotoPage.c"
 }
 
 
@@ -6690,7 +6652,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6690 "PhotoPage.c"
+#line 6652 "PhotoPage.c"
 }
 
 
@@ -6723,7 +6685,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp2_ = self->priv->cache;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6723 "PhotoPage.c"
+#line 6685 "PhotoPage.c"
 		PixbufCache* _tmp3_;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_;
@@ -6738,17 +6700,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6738 "PhotoPage.c"
+#line 6700 "PhotoPage.c"
 	} else {
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6742 "PhotoPage.c"
+#line 6704 "PhotoPage.c"
 	}
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
 #line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6748 "PhotoPage.c"
+#line 6710 "PhotoPage.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
@@ -6764,7 +6726,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp10_ = self->priv->cache;
 #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6764 "PhotoPage.c"
+#line 6726 "PhotoPage.c"
 		PixbufCache* _tmp11_;
 		guint _tmp12_;
 		PixbufCache* _tmp13_;
@@ -6778,7 +6740,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 		_tmp13_ = self->priv->cache;
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6778 "PhotoPage.c"
+#line 6740 "PhotoPage.c"
 	}
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
@@ -6808,7 +6770,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp21_ = caller;
 #line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6808 "PhotoPage.c"
+#line 6770 "PhotoPage.c"
 }
 
 
@@ -6822,7 +6784,7 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6822 "PhotoPage.c"
+#line 6784 "PhotoPage.c"
 		const gchar* _tmp1_;
 		Photo* _tmp2_;
 		Photo* _tmp3_;
@@ -6863,14 +6825,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		_g_object_unref0 (_tmp9_);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6862 "PhotoPage.c"
+#line 6824 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_;
 #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
 #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6869 "PhotoPage.c"
+#line 6831 "PhotoPage.c"
 	}
 }
 
@@ -6892,7 +6854,7 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	if (_tmp2_) {
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6891 "PhotoPage.c"
+#line 6853 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_;
 		gboolean _tmp4_;
@@ -6902,13 +6864,13 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 		_tmp4_ = photo_has_editable (_tmp3_);
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6901 "PhotoPage.c"
+#line 6863 "PhotoPage.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6907 "PhotoPage.c"
+#line 6869 "PhotoPage.c"
 }
 
 
@@ -6942,13 +6904,13 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	if (_tmp4_) {
 #line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6941 "PhotoPage.c"
+#line 6903 "PhotoPage.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6947 "PhotoPage.c"
+#line 6909 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_;
 		Dimensions max_dim = {0};
@@ -6962,7 +6924,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp7_ = self->priv->zoom_buffer;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6961 "PhotoPage.c"
+#line 6923 "PhotoPage.c"
 			ZoomBuffer* _tmp8_;
 			Photo* _tmp9_;
 			Photo* _tmp10_;
@@ -6979,15 +6941,15 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp6_ = _tmp10_ == _tmp11_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6978 "PhotoPage.c"
+#line 6940 "PhotoPage.c"
 		} else {
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6982 "PhotoPage.c"
+#line 6944 "PhotoPage.c"
 		}
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6986 "PhotoPage.c"
+#line 6948 "PhotoPage.c"
 			Photo* _tmp12_;
 			GdkPixbuf* _tmp13_;
 			ZoomBuffer* _tmp14_;
@@ -7001,7 +6963,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_g_object_unref0 (self->priv->zoom_buffer);
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 7000 "PhotoPage.c"
+#line 6962 "PhotoPage.c"
 		}
 #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
@@ -7013,7 +6975,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp17_ = self->priv->current_tool;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7012 "PhotoPage.c"
+#line 6974 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7037,14 +6999,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				tool_pixbuf = _tmp22_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7036 "PhotoPage.c"
-					goto __catch245_g_error;
+#line 6998 "PhotoPage.c"
+					goto __catch256_g_error;
 				}
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7043 "PhotoPage.c"
+#line 7005 "PhotoPage.c"
 					GdkPixbuf* _tmp24_;
 					Dimensions _tmp25_;
 #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7055,14 +7017,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 					_tmp25_ = tool_pixbuf_dim;
 #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7054 "PhotoPage.c"
+#line 7016 "PhotoPage.c"
 				}
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7058 "PhotoPage.c"
+#line 7020 "PhotoPage.c"
 			}
-			goto __finally245;
-			__catch245_g_error:
+			goto __finally256;
+			__catch256_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_;
@@ -7094,9 +7056,9 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7093 "PhotoPage.c"
+#line 7055 "PhotoPage.c"
 			}
-			__finally245:
+			__finally256:
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7105,7 +7067,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7104 "PhotoPage.c"
+#line 7066 "PhotoPage.c"
 			}
 		}
 #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7120,14 +7082,14 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		_tmp33_ = photo;
 #line 988 "/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 7119 "PhotoPage.c"
+#line 7081 "PhotoPage.c"
 	} else {
 		GError* _tmp34_;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7126 "PhotoPage.c"
+#line 7088 "PhotoPage.c"
 			Photo* _tmp35_;
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
@@ -7135,7 +7097,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 			_tmp35_ = photo;
 #line 995 "/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 7134 "PhotoPage.c"
+#line 7096 "PhotoPage.c"
 		}
 	}
 }
@@ -7219,7 +7181,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_g_object_unref0 (normal_batch);
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7218 "PhotoPage.c"
+#line 7180 "PhotoPage.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
@@ -7233,7 +7195,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 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7232 "PhotoPage.c"
+#line 7194 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_;
@@ -7260,7 +7222,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_neighbor_source_it = _tmp20_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7259 "PhotoPage.c"
+#line 7221 "PhotoPage.c"
 			GeeIterator* _tmp21_;
 			gboolean _tmp22_;
 			DataSource* neighbor_source = NULL;
@@ -7287,7 +7249,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (!_tmp22_) {
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7286 "PhotoPage.c"
+#line 7248 "PhotoPage.c"
 			}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
@@ -7313,7 +7275,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			if (_tmp30_) {
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7312 "PhotoPage.c"
+#line 7274 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_;
 				Photo* _tmp32_;
@@ -7326,13 +7288,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 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7325 "PhotoPage.c"
+#line 7287 "PhotoPage.c"
 			}
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
 #line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7331 "PhotoPage.c"
+#line 7293 "PhotoPage.c"
 			}
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
@@ -7352,11 +7314,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			_g_object_unref0 (neighbor);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7351 "PhotoPage.c"
+#line 7313 "PhotoPage.c"
 		}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7355 "PhotoPage.c"
+#line 7317 "PhotoPage.c"
 	}
 #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
@@ -7382,7 +7344,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_g_object_unref0 (master_batch);
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7381 "PhotoPage.c"
+#line 7343 "PhotoPage.c"
 }
 
 
@@ -7425,7 +7387,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 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7424 "PhotoPage.c"
+#line 7386 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_;
@@ -7438,7 +7400,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_old_neighbor_it = _tmp7_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7437 "PhotoPage.c"
+#line 7399 "PhotoPage.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			Photo* old_neighbor = NULL;
@@ -7456,7 +7418,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			if (!_tmp9_) {
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7455 "PhotoPage.c"
+#line 7417 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
@@ -7472,7 +7434,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 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7471 "PhotoPage.c"
+#line 7433 "PhotoPage.c"
 				Photo* _tmp16_;
 				Photo* _tmp17_;
 				gboolean _tmp18_;
@@ -7484,15 +7446,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 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7483 "PhotoPage.c"
+#line 7445 "PhotoPage.c"
 			} else {
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7487 "PhotoPage.c"
+#line 7449 "PhotoPage.c"
 			}
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7491 "PhotoPage.c"
+#line 7453 "PhotoPage.c"
 				PixbufCache* _tmp19_;
 				Photo* _tmp20_;
 				PixbufCache* _tmp21_;
@@ -7509,15 +7471,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 				_tmp22_ = old_neighbor;
 #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7508 "PhotoPage.c"
+#line 7470 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7512 "PhotoPage.c"
+#line 7474 "PhotoPage.c"
 		}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7516 "PhotoPage.c"
+#line 7478 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
@@ -7527,7 +7489,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 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7526 "PhotoPage.c"
+#line 7488 "PhotoPage.c"
 		Photo* _tmp27_;
 		Photo* _tmp28_;
 		gboolean _tmp29_;
@@ -7539,15 +7501,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 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7538 "PhotoPage.c"
+#line 7500 "PhotoPage.c"
 	} else {
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7542 "PhotoPage.c"
+#line 7504 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7546 "PhotoPage.c"
+#line 7508 "PhotoPage.c"
 		PixbufCache* _tmp30_;
 		Photo* _tmp31_;
 		PixbufCache* _tmp32_;
@@ -7564,13 +7526,13 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 		_tmp33_ = old_photo;
 #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7563 "PhotoPage.c"
+#line 7525 "PhotoPage.c"
 	}
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7569 "PhotoPage.c"
+#line 7531 "PhotoPage.c"
 }
 
 
@@ -7588,7 +7550,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7587 "PhotoPage.c"
+#line 7549 "PhotoPage.c"
 }
 
 
@@ -7597,7 +7559,7 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7596 "PhotoPage.c"
+#line 7558 "PhotoPage.c"
 }
 
 
@@ -7614,7 +7576,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
 #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7613 "PhotoPage.c"
+#line 7575 "PhotoPage.c"
 }
 
 
@@ -7623,7 +7585,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7622 "PhotoPage.c"
+#line 7584 "PhotoPage.c"
 }
 
 
@@ -7632,7 +7594,7 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7631 "PhotoPage.c"
+#line 7593 "PhotoPage.c"
 }
 
 
@@ -7677,7 +7639,7 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	_data_collection_unref0 (_tmp7_);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7676 "PhotoPage.c"
+#line 7638 "PhotoPage.c"
 		ViewCollection* _tmp9_;
 		ViewCollection* _tmp10_;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7686,15 +7648,15 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_tmp10_ = self->priv->parent_view;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7685 "PhotoPage.c"
+#line 7647 "PhotoPage.c"
 	} else {
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7689 "PhotoPage.c"
+#line 7651 "PhotoPage.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7693 "PhotoPage.c"
+#line 7655 "PhotoPage.c"
 		ViewCollection* _tmp11_;
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
@@ -7728,13 +7690,13 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7727 "PhotoPage.c"
+#line 7689 "PhotoPage.c"
 	}
 #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7733 "PhotoPage.c"
+#line 7695 "PhotoPage.c"
 }
 
 
@@ -7779,7 +7741,7 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	_data_collection_unref0 (_tmp7_);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7778 "PhotoPage.c"
+#line 7740 "PhotoPage.c"
 		ViewCollection* _tmp9_;
 		ViewCollection* _tmp10_;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7788,15 +7750,15 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_tmp10_ = self->priv->parent_view;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7787 "PhotoPage.c"
+#line 7749 "PhotoPage.c"
 	} else {
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7791 "PhotoPage.c"
+#line 7753 "PhotoPage.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7795 "PhotoPage.c"
+#line 7757 "PhotoPage.c"
 		ViewCollection* _tmp11_;
 		ViewCollection* _tmp12_;
 		ViewCollection* _tmp13_;
@@ -7830,13 +7792,13 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7829 "PhotoPage.c"
+#line 7791 "PhotoPage.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7835 "PhotoPage.c"
+#line 7797 "PhotoPage.c"
 }
 
 
@@ -7887,7 +7849,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	dimensions_init (&_tmp8_, 0, 0);
 #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7886 "PhotoPage.c"
+#line 7848 "PhotoPage.c"
 }
 
 
@@ -7896,14 +7858,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7895 "PhotoPage.c"
+#line 7857 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7902 "PhotoPage.c"
+#line 7864 "PhotoPage.c"
 }
 
 
@@ -7912,7 +7874,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7911 "PhotoPage.c"
+#line 7873 "PhotoPage.c"
 }
 
 
@@ -7976,17 +7938,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp10_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7975 "PhotoPage.c"
+#line 7937 "PhotoPage.c"
 		gint _tmp11_;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7981 "PhotoPage.c"
+#line 7943 "PhotoPage.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7985 "PhotoPage.c"
+#line 7947 "PhotoPage.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
@@ -8002,17 +7964,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	_tmp16_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 8001 "PhotoPage.c"
+#line 7963 "PhotoPage.c"
 		gint _tmp17_;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 8007 "PhotoPage.c"
+#line 7969 "PhotoPage.c"
 	} else {
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8011 "PhotoPage.c"
+#line 7973 "PhotoPage.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
@@ -8026,7 +7988,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 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8025 "PhotoPage.c"
+#line 7987 "PhotoPage.c"
 }
 
 
@@ -8050,7 +8012,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	if (_tmp0_ == _tmp1_) {
 #line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8049 "PhotoPage.c"
+#line 8011 "PhotoPage.c"
 	}
 #line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
@@ -8068,7 +8030,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 		_g_object_unref0 (photo);
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8067 "PhotoPage.c"
+#line 8029 "PhotoPage.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
@@ -8078,7 +8040,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	_tmp6_ = self->priv->photo_missing;
 #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8077 "PhotoPage.c"
+#line 8039 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_;
@@ -8103,8 +8065,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			pixbuf = _tmp9_;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8102 "PhotoPage.c"
-				goto __catch246_g_error;
+#line 8064 "PhotoPage.c"
+				goto __catch257_g_error;
 			}
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
@@ -8132,10 +8094,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 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8131 "PhotoPage.c"
+#line 8093 "PhotoPage.c"
 		}
-		goto __finally246;
-		__catch246_g_error:
+		goto __finally257;
+		__catch257_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_;
@@ -8168,9 +8130,9 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8167 "PhotoPage.c"
+#line 8129 "PhotoPage.c"
 		}
-		__finally246:
+		__finally257:
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8181,12 +8143,12 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_clear_error (&_inner_error_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8180 "PhotoPage.c"
+#line 8142 "PhotoPage.c"
 		}
 	}
 #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8185 "PhotoPage.c"
+#line 8147 "PhotoPage.c"
 }
 
 
@@ -8201,7 +8163,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	result = _tmp0_;
 #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8200 "PhotoPage.c"
+#line 8162 "PhotoPage.c"
 }
 
 
@@ -8215,7 +8177,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
 	result = TRUE;
 #line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8214 "PhotoPage.c"
+#line 8176 "PhotoPage.c"
 }
 
 
@@ -8224,7 +8186,7 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo*
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8223 "PhotoPage.c"
+#line 8185 "PhotoPage.c"
 }
 
 
@@ -8253,7 +8215,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	_tmp3_ = pixbuf;
 #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8252 "PhotoPage.c"
+#line 8214 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_;
@@ -8270,8 +8232,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_tmp4_ = _tmp7_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8269 "PhotoPage.c"
-				goto __catch247_g_error;
+#line 8231 "PhotoPage.c"
+				goto __catch258_g_error;
 			}
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
@@ -8283,10 +8245,10 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			pixbuf = _tmp8_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8282 "PhotoPage.c"
+#line 8244 "PhotoPage.c"
 		}
-		goto __finally247;
-		__catch247_g_error:
+		goto __finally258;
+		__catch258_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_;
@@ -8303,9 +8265,9 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8302 "PhotoPage.c"
+#line 8264 "PhotoPage.c"
 		}
-		__finally247:
+		__finally258:
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8316,14 +8278,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_clear_error (&_inner_error_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8315 "PhotoPage.c"
+#line 8277 "PhotoPage.c"
 		}
 	}
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8322 "PhotoPage.c"
+#line 8284 "PhotoPage.c"
 		GdkPixbuf* _tmp12_;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_;
@@ -8345,13 +8307,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 		_tmp16_ = _tmp15_;
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8344 "PhotoPage.c"
+#line 8306 "PhotoPage.c"
 	}
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8350 "PhotoPage.c"
+#line 8312 "PhotoPage.c"
 }
 
 
@@ -8401,35 +8363,35 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_g_object_unref0 (_tmp4_);
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8400 "PhotoPage.c"
+#line 8362 "PhotoPage.c"
 		gboolean _tmp7_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8406 "PhotoPage.c"
+#line 8368 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8410 "PhotoPage.c"
+#line 8372 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8414 "PhotoPage.c"
+#line 8376 "PhotoPage.c"
 		gboolean _tmp8_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8420 "PhotoPage.c"
+#line 8382 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8424 "PhotoPage.c"
+#line 8386 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8428 "PhotoPage.c"
+#line 8390 "PhotoPage.c"
 		Photo* _tmp9_;
 		Photo* _tmp10_;
 		GdkPixbuf* _tmp11_;
@@ -8453,13 +8415,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_g_object_unref0 (_tmp12_);
 #line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8452 "PhotoPage.c"
+#line 8414 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8458 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
 		Photo* _tmp17_;
 		Photo* _tmp18_;
 		Photo* _tmp19_;
@@ -8476,25 +8438,25 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_tmp15_ = !_tmp20_;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8475 "PhotoPage.c"
+#line 8437 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8479 "PhotoPage.c"
+#line 8441 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8485 "PhotoPage.c"
+#line 8447 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8489 "PhotoPage.c"
+#line 8451 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8493 "PhotoPage.c"
+#line 8455 "PhotoPage.c"
 		Photo* _tmp21_;
 		Photo* _tmp22_;
 		Photo* _tmp23_;
@@ -8516,7 +8478,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		if (_tmp25_) {
 #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8515 "PhotoPage.c"
+#line 8477 "PhotoPage.c"
 		}
 	}
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8565,7 +8527,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	_tmp36_ = old_photo;
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8564 "PhotoPage.c"
+#line 8526 "PhotoPage.c"
 		ViewCollection* _tmp37_;
 		ViewCollection* _tmp38_;
 		Photo* _tmp39_;
@@ -8590,7 +8552,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 		_data_collection_unref0 (_tmp41_);
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8589 "PhotoPage.c"
+#line 8551 "PhotoPage.c"
 	}
 #line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -8616,7 +8578,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	editing_host_page_refresh_caches (self, "replace_photo");
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8615 "PhotoPage.c"
+#line 8577 "PhotoPage.c"
 }
 
 
@@ -8659,7 +8621,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	_g_object_unref0 (_tmp5_);
 #line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8658 "PhotoPage.c"
+#line 8620 "PhotoPage.c"
 		Photo* _tmp7_;
 		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
@@ -8679,13 +8641,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 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8678 "PhotoPage.c"
+#line 8640 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8684 "PhotoPage.c"
+#line 8646 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_;
 		GdkWindow* _tmp15_;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8694,21 +8656,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 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8693 "PhotoPage.c"
+#line 8655 "PhotoPage.c"
 	} else {
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8697 "PhotoPage.c"
+#line 8659 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
 #line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8703 "PhotoPage.c"
+#line 8665 "PhotoPage.c"
 	}
 #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8707 "PhotoPage.c"
+#line 8669 "PhotoPage.c"
 }
 
 
@@ -8752,7 +8714,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_tmp5_ = pixbuf;
 #line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8751 "PhotoPage.c"
+#line 8713 "PhotoPage.c"
 		GdkPixbuf* _tmp6_;
 		Photo* _tmp7_;
 		Photo* _tmp8_;
@@ -8775,7 +8737,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (pixbuf);
 #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8774 "PhotoPage.c"
+#line 8736 "PhotoPage.c"
 	}
 #line 1250 "/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_);
@@ -8801,7 +8763,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_g_free0 (_tmp14_);
 #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8800 "PhotoPage.c"
+#line 8762 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_;
@@ -8828,8 +8790,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_tmp17_ = _tmp22_;
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8827 "PhotoPage.c"
-			goto __catch248_g_error;
+#line 8789 "PhotoPage.c"
+			goto __catch259_g_error;
 		}
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
@@ -8843,10 +8805,10 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp24_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8842 "PhotoPage.c"
+#line 8804 "PhotoPage.c"
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally259;
+	__catch259_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_;
@@ -8863,9 +8825,9 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8862 "PhotoPage.c"
+#line 8824 "PhotoPage.c"
 	}
-	__finally248:
+	__finally259:
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8876,7 +8838,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8875 "PhotoPage.c"
+#line 8837 "PhotoPage.c"
 	}
 #line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
@@ -8892,7 +8854,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = FALSE;
 #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8891 "PhotoPage.c"
+#line 8853 "PhotoPage.c"
 }
 
 
@@ -8925,7 +8887,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (photo);
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8924 "PhotoPage.c"
+#line 8886 "PhotoPage.c"
 	}
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
@@ -8935,7 +8897,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 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8934 "PhotoPage.c"
+#line 8896 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
@@ -8949,7 +8911,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_tmp5_ = self->priv->current_tool;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8948 "PhotoPage.c"
+#line 8910 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_;
 			Scaling _tmp8_ = {0};
@@ -8971,8 +8933,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp6_ = _tmp11_;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8970 "PhotoPage.c"
-				goto __catch249_g_error;
+#line 8932 "PhotoPage.c"
+				goto __catch260_g_error;
 			}
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
@@ -8984,23 +8946,23 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			pixbuf = _tmp12_;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8983 "PhotoPage.c"
+#line 8945 "PhotoPage.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8989 "PhotoPage.c"
+#line 8951 "PhotoPage.c"
 			Dimensions _tmp14_;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 8995 "PhotoPage.c"
+#line 8957 "PhotoPage.c"
 		}
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally260;
+	__catch260_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_;
@@ -9019,12 +8981,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9018 "PhotoPage.c"
+#line 8980 "PhotoPage.c"
 	}
-	__finally249:
+	__finally260:
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9023 "PhotoPage.c"
+#line 8985 "PhotoPage.c"
 		gboolean _tmp17_ = FALSE;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
@@ -9036,20 +8998,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return _tmp17_;
-#line 9035 "PhotoPage.c"
+#line 8997 "PhotoPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->photo_missing;
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp18_) {
-#line 9041 "PhotoPage.c"
+#line 9003 "PhotoPage.c"
 		GdkPixbuf* _tmp19_;
 		GdkPixbuf* _tmp23_;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = pixbuf;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp19_ == NULL) {
-#line 9048 "PhotoPage.c"
+#line 9010 "PhotoPage.c"
 			PixbufCache* _tmp20_;
 			Photo* _tmp21_;
 			GdkPixbuf* _tmp22_;
@@ -9063,13 +9025,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_g_object_unref0 (pixbuf);
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp22_;
-#line 9062 "PhotoPage.c"
+#line 9024 "PhotoPage.c"
 		}
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = pixbuf;
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp23_ == NULL) {
-#line 9068 "PhotoPage.c"
+#line 9030 "PhotoPage.c"
 			PixbufCache* _tmp24_;
 			Photo* _tmp25_;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9078,28 +9040,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp25_ = photo;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9077 "PhotoPage.c"
+#line 9039 "PhotoPage.c"
 		}
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->photo_missing;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp27_) {
-#line 9084 "PhotoPage.c"
+#line 9046 "PhotoPage.c"
 		GdkPixbuf* _tmp28_;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp28_ != NULL;
-#line 9090 "PhotoPage.c"
+#line 9052 "PhotoPage.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 9094 "PhotoPage.c"
+#line 9056 "PhotoPage.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp26_) {
-#line 9098 "PhotoPage.c"
+#line 9060 "PhotoPage.c"
 		GdkPixbuf* _tmp29_;
 		Dimensions _tmp30_;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9110,7 +9072,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), _tmp29_, &_tmp30_, NULL);
 #line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9109 "PhotoPage.c"
+#line 9071 "PhotoPage.c"
 	}
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9120,7 +9082,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	_g_object_unref0 (photo);
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9119 "PhotoPage.c"
+#line 9081 "PhotoPage.c"
 }
 
 
@@ -9137,7 +9099,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 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9136 "PhotoPage.c"
+#line 9098 "PhotoPage.c"
 }
 
 
@@ -9153,7 +9115,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
 	self->priv->pixbuf_dirty = TRUE;
 #line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9152 "PhotoPage.c"
+#line 9114 "PhotoPage.c"
 }
 
 
@@ -9166,7 +9128,7 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = TRUE;
 #line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9165 "PhotoPage.c"
+#line 9127 "PhotoPage.c"
 }
 
 
@@ -9250,21 +9212,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp13_ = photo;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9249 "PhotoPage.c"
+#line 9211 "PhotoPage.c"
 		gboolean _tmp14_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9255 "PhotoPage.c"
+#line 9217 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9259 "PhotoPage.c"
+#line 9221 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9263 "PhotoPage.c"
+#line 9225 "PhotoPage.c"
 		Photo* _tmp15_;
 		gboolean _tmp16_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9273,15 +9235,15 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9272 "PhotoPage.c"
+#line 9234 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9276 "PhotoPage.c"
+#line 9238 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9280 "PhotoPage.c"
+#line 9242 "PhotoPage.c"
 		Photo* _tmp17_;
 		gboolean _tmp18_;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9290,11 +9252,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9289 "PhotoPage.c"
+#line 9251 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9293 "PhotoPage.c"
+#line 9255 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
@@ -9304,21 +9266,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp22_ = photo;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9303 "PhotoPage.c"
+#line 9265 "PhotoPage.c"
 		gboolean _tmp23_;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9309 "PhotoPage.c"
+#line 9271 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9313 "PhotoPage.c"
+#line 9275 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9317 "PhotoPage.c"
+#line 9279 "PhotoPage.c"
 		Photo* _tmp24_;
 		Scaling _tmp25_;
 		gboolean _tmp26_;
@@ -9330,11 +9292,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9329 "PhotoPage.c"
+#line 9291 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9333 "PhotoPage.c"
+#line 9295 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
@@ -9344,21 +9306,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp30_ = photo;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9343 "PhotoPage.c"
+#line 9305 "PhotoPage.c"
 		gboolean _tmp31_;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9349 "PhotoPage.c"
+#line 9311 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9353 "PhotoPage.c"
+#line 9315 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9357 "PhotoPage.c"
+#line 9319 "PhotoPage.c"
 		Photo* _tmp32_;
 		Scaling _tmp33_;
 		gboolean _tmp34_;
@@ -9370,11 +9332,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9369 "PhotoPage.c"
+#line 9331 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9373 "PhotoPage.c"
+#line 9335 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
@@ -9384,21 +9346,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp38_ = photo;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9383 "PhotoPage.c"
+#line 9345 "PhotoPage.c"
 		gboolean _tmp39_;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9389 "PhotoPage.c"
+#line 9351 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9393 "PhotoPage.c"
+#line 9355 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9397 "PhotoPage.c"
+#line 9359 "PhotoPage.c"
 		Photo* _tmp40_;
 		Scaling _tmp41_;
 		gboolean _tmp42_;
@@ -9410,11 +9372,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9409 "PhotoPage.c"
+#line 9371 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9413 "PhotoPage.c"
+#line 9375 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
@@ -9424,21 +9386,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp46_ = photo;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9423 "PhotoPage.c"
+#line 9385 "PhotoPage.c"
 		gboolean _tmp47_;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9429 "PhotoPage.c"
+#line 9391 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9433 "PhotoPage.c"
+#line 9395 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9437 "PhotoPage.c"
+#line 9399 "PhotoPage.c"
 		Photo* _tmp48_;
 		gboolean _tmp49_;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9447,11 +9409,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9446 "PhotoPage.c"
+#line 9408 "PhotoPage.c"
 	} else {
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9450 "PhotoPage.c"
+#line 9412 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
@@ -9461,21 +9423,21 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	_tmp53_ = photo;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9460 "PhotoPage.c"
+#line 9422 "PhotoPage.c"
 		gboolean _tmp54_;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9466 "PhotoPage.c"
+#line 9428 "PhotoPage.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9470 "PhotoPage.c"
+#line 9432 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9474 "PhotoPage.c"
+#line 9436 "PhotoPage.c"
 		Photo* _tmp55_;
 		Scaling _tmp56_;
 		gboolean _tmp57_;
@@ -9487,11 +9449,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9486 "PhotoPage.c"
+#line 9448 "PhotoPage.c"
 	} else {
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9490 "PhotoPage.c"
+#line 9452 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
@@ -9505,7 +9467,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 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9504 "PhotoPage.c"
+#line 9466 "PhotoPage.c"
 }
 
 
@@ -9524,51 +9486,51 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	_tmp3_ = self->priv->current_tool;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9523 "PhotoPage.c"
+#line 9485 "PhotoPage.c"
 		gboolean _tmp4_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9529 "PhotoPage.c"
+#line 9491 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9533 "PhotoPage.c"
+#line 9495 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9537 "PhotoPage.c"
+#line 9499 "PhotoPage.c"
 		gboolean _tmp5_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9543 "PhotoPage.c"
+#line 9505 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9547 "PhotoPage.c"
+#line 9509 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9551 "PhotoPage.c"
+#line 9513 "PhotoPage.c"
 		gboolean _tmp6_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9557 "PhotoPage.c"
+#line 9519 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9561 "PhotoPage.c"
+#line 9523 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9567 "PhotoPage.c"
+#line 9529 "PhotoPage.c"
 	}
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -9578,7 +9540,7 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	result = _tmp8_;
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9577 "PhotoPage.c"
+#line 9539 "PhotoPage.c"
 }
 
 
@@ -9596,7 +9558,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	if (_tmp0_ == NULL) {
 #line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9595 "PhotoPage.c"
+#line 9557 "PhotoPage.c"
 	}
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9606,7 +9568,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	result = _tmp2_;
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9605 "PhotoPage.c"
+#line 9567 "PhotoPage.c"
 }
 
 
@@ -9624,7 +9586,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	if (_tmp0_ == NULL) {
 #line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9623 "PhotoPage.c"
+#line 9585 "PhotoPage.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -9634,7 +9596,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	result = _tmp2_;
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9633 "PhotoPage.c"
+#line 9595 "PhotoPage.c"
 }
 
 
@@ -9652,37 +9614,37 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	_tmp2_ = self->priv->current_tool;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9651 "PhotoPage.c"
+#line 9613 "PhotoPage.c"
 		gboolean _tmp3_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9657 "PhotoPage.c"
+#line 9619 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9661 "PhotoPage.c"
+#line 9623 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9665 "PhotoPage.c"
+#line 9627 "PhotoPage.c"
 		gboolean _tmp4_;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9671 "PhotoPage.c"
+#line 9633 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9675 "PhotoPage.c"
+#line 9637 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9681 "PhotoPage.c"
+#line 9643 "PhotoPage.c"
 	}
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
@@ -9692,7 +9654,7 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	result = _tmp6_;
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9691 "PhotoPage.c"
+#line 9653 "PhotoPage.c"
 }
 
 
@@ -9708,7 +9670,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	GError * _inner_error_ = NULL;
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9707 "PhotoPage.c"
+#line 9669 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -9733,8 +9695,8 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_tmp0_ = _tmp4_;
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9732 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 9694 "PhotoPage.c"
+			goto __catch261_g_error;
 		}
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
@@ -9752,10 +9714,10 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9751 "PhotoPage.c"
+#line 9713 "PhotoPage.c"
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally261;
+	__catch261_g_error:
 	{
 		GError* err = NULL;
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9768,9 +9730,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (original);
 #line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9767 "PhotoPage.c"
+#line 9729 "PhotoPage.c"
 	}
-	__finally250:
+	__finally261:
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9781,7 +9743,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9780 "PhotoPage.c"
+#line 9742 "PhotoPage.c"
 	}
 #line 1404 "/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));
@@ -9799,7 +9761,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 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9798 "PhotoPage.c"
+#line 9760 "PhotoPage.c"
 	}
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
@@ -9815,7 +9777,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	_g_object_unref0 (_tmp14_);
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9814 "PhotoPage.c"
+#line 9776 "PhotoPage.c"
 }
 
 
@@ -9827,7 +9789,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	_tmp0_ = self->priv->swapped;
 #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9826 "PhotoPage.c"
+#line 9788 "PhotoPage.c"
 		GdkPixbuf* _tmp1_;
 		Photo* _tmp2_;
 		Photo* _tmp3_;
@@ -9852,7 +9814,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 		_g_object_unref0 (self->priv->swapped);
 #line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9851 "PhotoPage.c"
+#line 9813 "PhotoPage.c"
 	}
 }
 
@@ -9860,7 +9822,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9859 "PhotoPage.c"
+#line 9821 "PhotoPage.c"
 }
 
 
@@ -9911,7 +9873,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_g_object_unref0 (_tmp3_);
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9910 "PhotoPage.c"
+#line 9872 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9949,8 +9911,8 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp7_ = _tmp14_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9948 "PhotoPage.c"
-			goto __catch251_g_error;
+#line 9910 "PhotoPage.c"
+			goto __catch262_g_error;
 		}
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
@@ -9964,20 +9926,20 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp16_ = unscaled;
 #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9963 "PhotoPage.c"
+#line 9925 "PhotoPage.c"
 			Dimensions _tmp17_;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9969 "PhotoPage.c"
+#line 9931 "PhotoPage.c"
 		}
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9973 "PhotoPage.c"
+#line 9935 "PhotoPage.c"
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally262;
+	__catch262_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_;
@@ -10010,9 +9972,9 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_g_object_unref0 (unscaled);
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10009 "PhotoPage.c"
+#line 9971 "PhotoPage.c"
 	}
-	__finally251:
+	__finally262:
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10023,13 +9985,13 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		g_clear_error (&_inner_error_);
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10022 "PhotoPage.c"
+#line 9984 "PhotoPage.c"
 	}
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10028 "PhotoPage.c"
+#line 9990 "PhotoPage.c"
 		GdkPixbuf* _tmp23_;
 		Dimensions _tmp24_;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10038,7 +10000,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_tmp24_ = max_dim;
 #line 1462 "/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 10037 "PhotoPage.c"
+#line 9999 "PhotoPage.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10066,42 +10028,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10065 "PhotoPage.c"
+#line 10027 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10072 "PhotoPage.c"
+#line 10034 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10079 "PhotoPage.c"
+#line 10041 "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 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10086 "PhotoPage.c"
+#line 10048 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10093 "PhotoPage.c"
+#line 10055 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10100 "PhotoPage.c"
+#line 10062 "PhotoPage.c"
 }
 
 
@@ -10110,7 +10072,7 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
 #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10109 "PhotoPage.c"
+#line 10071 "PhotoPage.c"
 }
 
 
@@ -10154,7 +10116,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	if (_tmp0_ == NULL) {
 #line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10153 "PhotoPage.c"
+#line 10115 "PhotoPage.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10176,7 +10138,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp6_ = tool_window;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10175 "PhotoPage.c"
+#line 10137 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_;
 		gboolean _tmp8_;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10185,15 +10147,15 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10184 "PhotoPage.c"
+#line 10146 "PhotoPage.c"
 	} else {
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10188 "PhotoPage.c"
+#line 10150 "PhotoPage.c"
 	}
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10192 "PhotoPage.c"
+#line 10154 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_;
@@ -10251,7 +10213,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 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10250 "PhotoPage.c"
+#line 10212 "PhotoPage.c"
 	}
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
@@ -10301,7 +10263,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp35_ = new_pixbuf;
 #line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10300 "PhotoPage.c"
+#line 10262 "PhotoPage.c"
 		GdkPixbuf* _tmp36_;
 		GdkPixbuf* _tmp37_;
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10312,14 +10274,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_g_object_unref0 (replacement);
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10311 "PhotoPage.c"
+#line 10273 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10318 "PhotoPage.c"
+#line 10280 "PhotoPage.c"
 			GdkPixbuf* _tmp39_;
 			GdkPixbuf* _tmp40_;
 			GdkPixbuf* _tmp41_;
@@ -10340,18 +10302,18 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 			*new_max_dim = _tmp42_;
 #line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10339 "PhotoPage.c"
+#line 10301 "PhotoPage.c"
 		} else {
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10343 "PhotoPage.c"
+#line 10305 "PhotoPage.c"
 		}
 	}
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10350 "PhotoPage.c"
+#line 10312 "PhotoPage.c"
 		GdkPixbuf* _tmp44_;
 		Dimensions _tmp45_;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10360,7 +10322,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		_tmp45_ = *new_max_dim;
 #line 1524 "/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 10359 "PhotoPage.c"
+#line 10321 "PhotoPage.c"
 	}
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10374,13 +10336,13 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		self->priv->pixbuf_dirty = TRUE;
 #line 1530 "/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 10373 "PhotoPage.c"
+#line 10335 "PhotoPage.c"
 	}
 #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
 #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10379 "PhotoPage.c"
+#line 10341 "PhotoPage.c"
 		CommandManager* _tmp48_;
 		CommandManager* _tmp49_;
 		Command* _tmp50_;
@@ -10394,7 +10356,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		command_manager_execute (_tmp49_, _tmp50_);
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10393 "PhotoPage.c"
+#line 10355 "PhotoPage.c"
 	}
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10402,7 +10364,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_g_object_unref0 (tool_window);
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10401 "PhotoPage.c"
+#line 10363 "PhotoPage.c"
 }
 
 
@@ -10414,7 +10376,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
 	result = FALSE;
 #line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10413 "PhotoPage.c"
+#line 10375 "PhotoPage.c"
 }
 
 
@@ -10423,7 +10385,7 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10422 "PhotoPage.c"
+#line 10384 "PhotoPage.c"
 }
 
 
@@ -10457,14 +10419,14 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp1_ = _tmp0_->type;
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10456 "PhotoPage.c"
+#line 10418 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10463 "PhotoPage.c"
+#line 10425 "PhotoPage.c"
 			GdkEventButton* _tmp4_;
 			gboolean _tmp5_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10473,17 +10435,17 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10472 "PhotoPage.c"
+#line 10434 "PhotoPage.c"
 		} else {
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10476 "PhotoPage.c"
+#line 10438 "PhotoPage.c"
 		}
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10482 "PhotoPage.c"
+#line 10444 "PhotoPage.c"
 	}
 #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
@@ -10501,7 +10463,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	_tmp11_ = self->priv->current_tool;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10500 "PhotoPage.c"
+#line 10462 "PhotoPage.c"
 		GtkScale* _tmp12_;
 		gdouble _tmp13_;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10510,15 +10472,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 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10509 "PhotoPage.c"
+#line 10471 "PhotoPage.c"
 	} else {
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10513 "PhotoPage.c"
+#line 10475 "PhotoPage.c"
 	}
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10517 "PhotoPage.c"
+#line 10479 "PhotoPage.c"
 		GdkEventButton* _tmp14_;
 		gdouble _tmp15_;
 		GdkEventButton* _tmp16_;
@@ -10543,7 +10505,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10542 "PhotoPage.c"
+#line 10504 "PhotoPage.c"
 	}
 #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
@@ -10553,7 +10515,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = FALSE;
 #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10552 "PhotoPage.c"
+#line 10514 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
@@ -10567,7 +10529,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10566 "PhotoPage.c"
+#line 10528 "PhotoPage.c"
 	}
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10581,7 +10543,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	result = TRUE;
 #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10580 "PhotoPage.c"
+#line 10542 "PhotoPage.c"
 }
 
 
@@ -10607,7 +10569,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_tmp0_ = self->priv->is_pan_in_progress;
 #line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10606 "PhotoPage.c"
+#line 10568 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10694,7 +10656,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		self->priv->is_pan_in_progress = FALSE;
 #line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10693 "PhotoPage.c"
+#line 10655 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
@@ -10704,7 +10666,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		result = FALSE;
 #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10703 "PhotoPage.c"
+#line 10665 "PhotoPage.c"
 	}
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
@@ -10730,7 +10692,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_g_object_unref0 (_tmp29_);
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10729 "PhotoPage.c"
+#line 10691 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_;
 		EditingToolsEditingToolWindow* _tmp32_;
 		EditingToolsEditingToolWindow* _tmp33_;
@@ -10744,13 +10706,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 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10743 "PhotoPage.c"
+#line 10705 "PhotoPage.c"
 	}
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10749 "PhotoPage.c"
+#line 10711 "PhotoPage.c"
 }
 
 
@@ -10771,7 +10733,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	result = _tmp1_;
 #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10770 "PhotoPage.c"
+#line 10732 "PhotoPage.c"
 }
 
 
@@ -10780,7 +10742,7 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
 #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10779 "PhotoPage.c"
+#line 10741 "PhotoPage.c"
 }
 
 
@@ -10820,7 +10782,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp4_) {
 #line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10819 "PhotoPage.c"
+#line 10781 "PhotoPage.c"
 	}
 #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
@@ -10838,7 +10800,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	if (_tmp8_) {
 #line 1622 "/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 10837 "PhotoPage.c"
+#line 10799 "PhotoPage.c"
 	}
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10858,7 +10820,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	_data_collection_unref0 (_tmp13_);
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10857 "PhotoPage.c"
+#line 10819 "PhotoPage.c"
 }
 
 
@@ -10867,7 +10829,7 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10866 "PhotoPage.c"
+#line 10828 "PhotoPage.c"
 }
 
 
@@ -10880,7 +10842,7 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10879 "PhotoPage.c"
+#line 10841 "PhotoPage.c"
 		PixbufCache* _tmp1_;
 		Photo* _tmp2_;
 		Photo* _tmp3_;
@@ -10894,13 +10856,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10893 "PhotoPage.c"
+#line 10855 "PhotoPage.c"
 	}
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10899 "PhotoPage.c"
+#line 10861 "PhotoPage.c"
 }
 
 
@@ -10951,7 +10913,7 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	_tmp10_ = _tmp9_.width;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10950 "PhotoPage.c"
+#line 10912 "PhotoPage.c"
 		Dimensions _tmp11_;
 		gint _tmp12_;
 		Dimensions _tmp13_;
@@ -10966,17 +10928,17 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 		_tmp14_ = _tmp13_.height;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10965 "PhotoPage.c"
+#line 10927 "PhotoPage.c"
 	} else {
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10969 "PhotoPage.c"
+#line 10931 "PhotoPage.c"
 	}
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10975 "PhotoPage.c"
+#line 10937 "PhotoPage.c"
 }
 
 
@@ -10990,11 +10952,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
 	if (_tmp0_) {
 #line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 10989 "PhotoPage.c"
+#line 10951 "PhotoPage.c"
 	} else {
 #line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 10993 "PhotoPage.c"
+#line 10955 "PhotoPage.c"
 	}
 }
 
@@ -11017,7 +10979,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp0_ = self->priv->current_tool;
 #line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11016 "PhotoPage.c"
+#line 10978 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		gint _tmp2_;
 		gint _tmp3_;
@@ -11041,7 +11003,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11040 "PhotoPage.c"
+#line 11002 "PhotoPage.c"
 	}
 #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
@@ -11049,7 +11011,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp6_ = self->priv->is_pan_in_progress;
 #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11048 "PhotoPage.c"
+#line 11010 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_;
 		gdouble _tmp8_;
@@ -11123,7 +11085,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		result = TRUE;
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11122 "PhotoPage.c"
+#line 11084 "PhotoPage.c"
 	}
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
@@ -11139,7 +11101,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	result = _tmp28_;
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11138 "PhotoPage.c"
+#line 11100 "PhotoPage.c"
 }
 
 
@@ -11154,7 +11116,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	_tmp0_ = self->priv->current_tool;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11153 "PhotoPage.c"
+#line 11115 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		gboolean _tmp2_;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11165,7 +11127,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 		result = _tmp2_;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11164 "PhotoPage.c"
+#line 11126 "PhotoPage.c"
 	}
 #line 1690 "/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));
@@ -11173,7 +11135,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	result = _tmp3_;
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11172 "PhotoPage.c"
+#line 11134 "PhotoPage.c"
 }
 
 
@@ -11185,7 +11147,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11184 "PhotoPage.c"
+#line 11146 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_;
 		EditingToolsEditingToolWindow* _tmp2_;
@@ -11201,7 +11163,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 		_tmp4_ = tool_window;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11200 "PhotoPage.c"
+#line 11162 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_;
 			gboolean _tmp6_;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11210,21 +11172,21 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11209 "PhotoPage.c"
+#line 11171 "PhotoPage.c"
 		} else {
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11213 "PhotoPage.c"
+#line 11175 "PhotoPage.c"
 		}
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
 #line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11219 "PhotoPage.c"
+#line 11181 "PhotoPage.c"
 		}
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11223 "PhotoPage.c"
+#line 11185 "PhotoPage.c"
 	}
 }
 
@@ -11242,7 +11204,7 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	_tmp0_ = *rect;
 #line 1705 "/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 11241 "PhotoPage.c"
+#line 11203 "PhotoPage.c"
 }
 
 
@@ -11262,7 +11224,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	_tmp1_ = *rect;
 #line 1711 "/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 11261 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
 }
 
 
@@ -11301,7 +11263,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	static GQuark _tmp6_label10 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11300 "PhotoPage.c"
+#line 11262 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_;
 	GdkPoint _tmp13_;
@@ -11332,7 +11294,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 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11331 "PhotoPage.c"
+#line 11293 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_;
@@ -11342,13 +11304,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11341 "PhotoPage.c"
+#line 11303 "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 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11347 "PhotoPage.c"
+#line 11309 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_;
@@ -11358,13 +11320,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11357 "PhotoPage.c"
+#line 11319 "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 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11363 "PhotoPage.c"
+#line 11325 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_;
@@ -11374,13 +11336,13 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11373 "PhotoPage.c"
+#line 11335 "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 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11379 "PhotoPage.c"
+#line 11341 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_;
@@ -11390,20 +11352,20 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11389 "PhotoPage.c"
+#line 11351 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11395 "PhotoPage.c"
+#line 11357 "PhotoPage.c"
 			default:
 			{
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11402 "PhotoPage.c"
+#line 11364 "PhotoPage.c"
 			}
 		}
 	}
@@ -11423,7 +11385,7 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	result = TRUE;
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11422 "PhotoPage.c"
+#line 11384 "PhotoPage.c"
 }
 
 
@@ -11456,7 +11418,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	static GQuark _tmp13_label6 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11455 "PhotoPage.c"
+#line 11417 "PhotoPage.c"
 	gboolean _tmp15_;
 	gboolean _tmp16_ = FALSE;
 #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11467,7 +11429,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	_tmp0_ = self->priv->current_tool;
 #line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11466 "PhotoPage.c"
+#line 11428 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		GdkEventKey* _tmp2_;
 		gboolean _tmp3_;
@@ -11483,14 +11445,14 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11482 "PhotoPage.c"
+#line 11444 "PhotoPage.c"
 		}
 	}
 #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
 #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11489 "PhotoPage.c"
+#line 11451 "PhotoPage.c"
 		GdkEventKey* _tmp5_;
 		gboolean _tmp6_;
 #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11503,7 +11465,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 			result = TRUE;
 #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11502 "PhotoPage.c"
+#line 11464 "PhotoPage.c"
 		}
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11516,7 +11478,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11515 "PhotoPage.c"
+#line 11477 "PhotoPage.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -11534,51 +11496,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 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11533 "PhotoPage.c"
+#line 11495 "PhotoPage.c"
 			default:
 			{
 #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11538 "PhotoPage.c"
+#line 11500 "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 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11544 "PhotoPage.c"
+#line 11506 "PhotoPage.c"
 			default:
 			{
 #line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11551 "PhotoPage.c"
+#line 11513 "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 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11557 "PhotoPage.c"
+#line 11519 "PhotoPage.c"
 			default:
 			{
 #line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11564 "PhotoPage.c"
+#line 11526 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11570 "PhotoPage.c"
+#line 11532 "PhotoPage.c"
 			default:
 			{
 #line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11577 "PhotoPage.c"
+#line 11539 "PhotoPage.c"
 			}
 		}
 	}
@@ -11590,11 +11552,11 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 		result = TRUE;
 #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11589 "PhotoPage.c"
+#line 11551 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11593 "PhotoPage.c"
+#line 11555 "PhotoPage.c"
 		GdkEventKey* _tmp17_;
 		gboolean _tmp18_;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11603,17 +11565,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 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11602 "PhotoPage.c"
+#line 11564 "PhotoPage.c"
 	} else {
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11606 "PhotoPage.c"
+#line 11568 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11612 "PhotoPage.c"
+#line 11574 "PhotoPage.c"
 }
 
 
@@ -11630,7 +11592,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 	_tmp0_ = self->priv->current_tool;
 #line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11629 "PhotoPage.c"
+#line 11591 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		EditingToolsPhotoCanvas* _tmp2_;
 		cairo_t* _tmp3_;
@@ -11645,7 +11607,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 		_tmp4_ = *dim;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11644 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
 	}
 }
 
@@ -11664,21 +11626,21 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	_tmp1_ = self->priv->current_tool;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11663 "PhotoPage.c"
+#line 11625 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11669 "PhotoPage.c"
+#line 11631 "PhotoPage.c"
 	} else {
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11673 "PhotoPage.c"
+#line 11635 "PhotoPage.c"
 	}
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11677 "PhotoPage.c"
+#line 11639 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_;
 		EditingToolsPhotoCanvas* _tmp4_;
 		Dimensions _tmp5_;
@@ -11700,7 +11662,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11699 "PhotoPage.c"
+#line 11661 "PhotoPage.c"
 	}
 }
 
@@ -11711,7 +11673,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag
 	result = NULL;
 #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11710 "PhotoPage.c"
+#line 11672 "PhotoPage.c"
 }
 
 
@@ -11720,7 +11682,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11719 "PhotoPage.c"
+#line 11681 "PhotoPage.c"
 }
 
 
@@ -11730,7 +11692,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage*
 	result = NULL;
 #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11729 "PhotoPage.c"
+#line 11691 "PhotoPage.c"
 }
 
 
@@ -11739,7 +11701,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 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11738 "PhotoPage.c"
+#line 11700 "PhotoPage.c"
 }
 
 
@@ -11749,7 +11711,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage*
 	result = NULL;
 #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11748 "PhotoPage.c"
+#line 11710 "PhotoPage.c"
 }
 
 
@@ -11758,7 +11720,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11757 "PhotoPage.c"
+#line 11719 "PhotoPage.c"
 }
 
 
@@ -11768,7 +11730,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa
 	result = NULL;
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11767 "PhotoPage.c"
+#line 11729 "PhotoPage.c"
 }
 
 
@@ -11777,7 +11739,7 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11776 "PhotoPage.c"
+#line 11738 "PhotoPage.c"
 }
 
 
@@ -11811,7 +11773,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp0_ = self->priv->current_tool;
 #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11810 "PhotoPage.c"
+#line 11772 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		cairo_t* _tmp2_;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11822,27 +11784,27 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11821 "PhotoPage.c"
+#line 11783 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11827 "PhotoPage.c"
+#line 11789 "PhotoPage.c"
 		gboolean _tmp5_;
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11833 "PhotoPage.c"
+#line 11795 "PhotoPage.c"
 	} else {
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11837 "PhotoPage.c"
+#line 11799 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11841 "PhotoPage.c"
+#line 11803 "PhotoPage.c"
 		cairo_t* _tmp6_;
 		cairo_t* _tmp7_;
 		Dimensions _tmp8_ = {0};
@@ -11911,7 +11873,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_g_object_unref0 (_tmp15_);
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11910 "PhotoPage.c"
+#line 11872 "PhotoPage.c"
 	}
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = ctx;
@@ -11927,7 +11889,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	if (!_tmp25_) {
 #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11926 "PhotoPage.c"
+#line 11888 "PhotoPage.c"
 	}
 #line 1860 "/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), &_tmp26_);
@@ -11941,7 +11903,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp28_ = trinket;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp28_ != NULL) {
-#line 11940 "PhotoPage.c"
+#line 11902 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp29_;
 		gint _tmp30_;
@@ -12023,7 +11985,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp51_ = ctx;
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp51_);
-#line 12022 "PhotoPage.c"
+#line 11984 "PhotoPage.c"
 	}
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12035,7 +11997,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp53_ = trinket;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 12034 "PhotoPage.c"
+#line 11996 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp54_;
 		gint _tmp55_;
@@ -12102,7 +12064,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp71_ = ctx;
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp71_);
-#line 12101 "PhotoPage.c"
+#line 12063 "PhotoPage.c"
 	}
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12114,7 +12076,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp73_ = trinket;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp73_ != NULL) {
-#line 12113 "PhotoPage.c"
+#line 12075 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp74_;
 		gint _tmp75_;
@@ -12196,7 +12158,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp96_ = ctx;
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp96_);
-#line 12195 "PhotoPage.c"
+#line 12157 "PhotoPage.c"
 	}
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
@@ -12208,7 +12170,7 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp98_ = trinket;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp98_ != NULL) {
-#line 12207 "PhotoPage.c"
+#line 12169 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp99_;
 		gint _tmp100_;
@@ -12305,11 +12267,11 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		_tmp126_ = ctx;
 #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp126_);
-#line 12304 "PhotoPage.c"
+#line 12266 "PhotoPage.c"
 	}
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12308 "PhotoPage.c"
+#line 12270 "PhotoPage.c"
 }
 
 
@@ -12326,7 +12288,7 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
 	result = !_tmp0_;
 #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12325 "PhotoPage.c"
+#line 12287 "PhotoPage.c"
 }
 
 
@@ -12362,7 +12324,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	if (!_tmp1_) {
 #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12361 "PhotoPage.c"
+#line 12323 "PhotoPage.c"
 	}
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -12394,7 +12356,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	_command_manager_unref0 (_tmp10_);
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12393 "PhotoPage.c"
+#line 12355 "PhotoPage.c"
 }
 
 
@@ -12403,7 +12365,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12402 "PhotoPage.c"
+#line 12364 "PhotoPage.c"
 }
 
 
@@ -12412,7 +12374,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12411 "PhotoPage.c"
+#line 12373 "PhotoPage.c"
 }
 
 
@@ -12421,7 +12383,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12420 "PhotoPage.c"
+#line 12382 "PhotoPage.c"
 }
 
 
@@ -12430,7 +12392,7 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) {
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12429 "PhotoPage.c"
+#line 12391 "PhotoPage.c"
 }
 
 
@@ -12458,7 +12420,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12457 "PhotoPage.c"
+#line 12419 "PhotoPage.c"
 	}
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
@@ -12470,7 +12432,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12469 "PhotoPage.c"
+#line 12431 "PhotoPage.c"
 	}
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
@@ -12484,7 +12446,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12483 "PhotoPage.c"
+#line 12445 "PhotoPage.c"
 		AppWindow* _tmp7_;
 		AppWindow* _tmp8_;
 		ViewCollection* _tmp9_;
@@ -12521,7 +12483,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		if (_tmp14_) {
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12520 "PhotoPage.c"
+#line 12482 "PhotoPage.c"
 		}
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
@@ -12531,7 +12493,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		photo_revert_to_master (_tmp16_, TRUE);
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12530 "PhotoPage.c"
+#line 12492 "PhotoPage.c"
 	}
 #line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -12561,7 +12523,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	_command_manager_unref0 (_tmp22_);
 #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12560 "PhotoPage.c"
+#line 12522 "PhotoPage.c"
 }
 
 
@@ -12599,7 +12561,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12598 "PhotoPage.c"
+#line 12560 "PhotoPage.c"
 		Photo* _tmp3_;
 		LibraryPhoto* _tmp4_;
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12610,19 +12572,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12609 "PhotoPage.c"
+#line 12571 "PhotoPage.c"
 		}
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12615 "PhotoPage.c"
+#line 12577 "PhotoPage.c"
 	} else {
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12621 "PhotoPage.c"
+#line 12583 "PhotoPage.c"
 	}
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12656,7 +12618,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12655 "PhotoPage.c"
+#line 12617 "PhotoPage.c"
 	}
 #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12684,7 +12646,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12683 "PhotoPage.c"
+#line 12645 "PhotoPage.c"
 }
 
 
@@ -12722,7 +12684,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12721 "PhotoPage.c"
+#line 12683 "PhotoPage.c"
 		Photo* _tmp3_;
 		LibraryPhoto* _tmp4_;
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12733,19 +12695,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12732 "PhotoPage.c"
+#line 12694 "PhotoPage.c"
 		}
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12738 "PhotoPage.c"
+#line 12700 "PhotoPage.c"
 	} else {
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12744 "PhotoPage.c"
+#line 12706 "PhotoPage.c"
 	}
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12779,7 +12741,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12778 "PhotoPage.c"
+#line 12740 "PhotoPage.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12807,7 +12769,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12806 "PhotoPage.c"
+#line 12768 "PhotoPage.c"
 }
 
 
@@ -12834,7 +12796,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12833 "PhotoPage.c"
+#line 12795 "PhotoPage.c"
 	}
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -12862,7 +12824,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	modify_originals = _tmp8_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12861 "PhotoPage.c"
+#line 12823 "PhotoPage.c"
 		ViewCollection* _tmp10_;
 		ViewCollection* _tmp11_;
 		GeeList* _tmp12_;
@@ -12917,11 +12879,11 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		_command_manager_unref0 (_tmp21_);
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12916 "PhotoPage.c"
+#line 12878 "PhotoPage.c"
 	}
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12920 "PhotoPage.c"
+#line 12882 "PhotoPage.c"
 }
 
 
@@ -12933,7 +12895,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 	_tmp0_ = editing_host_page_has_photo (self);
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12932 "PhotoPage.c"
+#line 12894 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_;
 		gboolean desktop = FALSE;
@@ -12958,7 +12920,7 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		screensaver = _tmp4_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12957 "PhotoPage.c"
+#line 12919 "PhotoPage.c"
 			AppWindow* _tmp6_;
 			AppWindow* _tmp7_;
 			Photo* _tmp8_;
@@ -12995,11 +12957,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 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 12994 "PhotoPage.c"
+#line 12956 "PhotoPage.c"
 		}
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 12998 "PhotoPage.c"
+#line 12960 "PhotoPage.c"
 	}
 }
 
@@ -13007,7 +12969,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 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 13006 "PhotoPage.c"
+#line 12968 "PhotoPage.c"
 }
 
 
@@ -13053,7 +13015,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	if (_tmp6_ == NULL) {
 #line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13052 "PhotoPage.c"
+#line 13014 "PhotoPage.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
@@ -13063,7 +13025,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	result = _tmp8_;
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13062 "PhotoPage.c"
+#line 13024 "PhotoPage.c"
 }
 
 
@@ -13109,37 +13071,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	_tmp8_ = self->priv->current_tool;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13108 "PhotoPage.c"
+#line 13070 "PhotoPage.c"
 		gboolean _tmp9_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13114 "PhotoPage.c"
+#line 13076 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13118 "PhotoPage.c"
+#line 13080 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13122 "PhotoPage.c"
+#line 13084 "PhotoPage.c"
 		gboolean _tmp10_;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13128 "PhotoPage.c"
+#line 13090 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13132 "PhotoPage.c"
+#line 13094 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
 #line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13138 "PhotoPage.c"
+#line 13100 "PhotoPage.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
@@ -13149,7 +13111,7 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	result = _tmp12_;
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13148 "PhotoPage.c"
+#line 13110 "PhotoPage.c"
 }
 
 
@@ -13184,7 +13146,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	_tmp3_ = _tmp2_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13183 "PhotoPage.c"
+#line 13145 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_;
 		GtkToggleToolButton* _tmp5_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13193,11 +13155,11 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 		_tmp5_ = toggle;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13192 "PhotoPage.c"
+#line 13154 "PhotoPage.c"
 	} else {
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13196 "PhotoPage.c"
+#line 13158 "PhotoPage.c"
 	}
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
@@ -13213,7 +13175,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 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13212 "PhotoPage.c"
+#line 13174 "PhotoPage.c"
 	}
 #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13257,7 +13219,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	editing_host_page_activate_tool (self, _tmp17_);
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13256 "PhotoPage.c"
+#line 13218 "PhotoPage.c"
 }
 
 
@@ -13279,7 +13241,7 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13278 "PhotoPage.c"
+#line 13240 "PhotoPage.c"
 }
 
 
@@ -13301,7 +13263,7 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13300 "PhotoPage.c"
+#line 13262 "PhotoPage.c"
 }
 
 
@@ -13328,7 +13290,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	_tmp3_ = needs_improvement;
 #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13327 "PhotoPage.c"
+#line 13289 "PhotoPage.c"
 }
 
 
@@ -13344,7 +13306,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 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13343 "PhotoPage.c"
+#line 13305 "PhotoPage.c"
 }
 
 
@@ -13358,7 +13320,7 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13357 "PhotoPage.c"
+#line 13319 "PhotoPage.c"
 }
 
 
@@ -13376,7 +13338,7 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13375 "PhotoPage.c"
+#line 13337 "PhotoPage.c"
 }
 
 
@@ -13394,7 +13356,7 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13393 "PhotoPage.c"
+#line 13355 "PhotoPage.c"
 }
 
 
@@ -13412,7 +13374,7 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13411 "PhotoPage.c"
+#line 13373 "PhotoPage.c"
 }
 
 
@@ -13430,7 +13392,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13429 "PhotoPage.c"
+#line 13391 "PhotoPage.c"
 }
 
 
@@ -13439,7 +13401,7 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t
 	result = editing_tools_straighten_tool_factory ();
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13438 "PhotoPage.c"
+#line 13400 "PhotoPage.c"
 }
 
 
@@ -13451,7 +13413,7 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->straighten_button;
 #line 2117 "/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 13450 "PhotoPage.c"
+#line 13412 "PhotoPage.c"
 }
 
 
@@ -13460,7 +13422,7 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e
 	result = editing_tools_crop_tool_factory ();
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13459 "PhotoPage.c"
+#line 13421 "PhotoPage.c"
 }
 
 
@@ -13472,7 +13434,7 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->crop_button;
 #line 2121 "/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 13471 "PhotoPage.c"
+#line 13433 "PhotoPage.c"
 }
 
 
@@ -13481,7 +13443,7 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools
 	result = editing_tools_redeye_tool_factory ();
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13480 "PhotoPage.c"
+#line 13442 "PhotoPage.c"
 }
 
 
@@ -13493,7 +13455,7 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->redeye_button;
 #line 2125 "/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 13492 "PhotoPage.c"
+#line 13454 "PhotoPage.c"
 }
 
 
@@ -13502,7 +13464,7 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
 	result = editing_tools_adjust_tool_factory ();
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13501 "PhotoPage.c"
+#line 13463 "PhotoPage.c"
 }
 
 
@@ -13514,7 +13476,7 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->adjust_button;
 #line 2129 "/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 13513 "PhotoPage.c"
+#line 13475 "PhotoPage.c"
 }
 
 
@@ -13531,7 +13493,7 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
 	result = !_tmp0_;
 #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13530 "PhotoPage.c"
+#line 13492 "PhotoPage.c"
 }
 
 
@@ -13556,7 +13518,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13555 "PhotoPage.c"
+#line 13517 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13564,7 +13526,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13563 "PhotoPage.c"
+#line 13525 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
@@ -13572,7 +13534,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13571 "PhotoPage.c"
+#line 13533 "PhotoPage.c"
 	}
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
@@ -13584,7 +13546,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_tmp5_ = adjust_tool;
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13583 "PhotoPage.c"
+#line 13545 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
@@ -13594,7 +13556,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		_editing_tools_editing_tool_unref0 (adjust_tool);
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13593 "PhotoPage.c"
+#line 13555 "PhotoPage.c"
 	}
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
@@ -13622,7 +13584,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13621 "PhotoPage.c"
+#line 13583 "PhotoPage.c"
 }
 
 
@@ -13640,7 +13602,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	if (!_tmp0_) {
 #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13639 "PhotoPage.c"
+#line 13601 "PhotoPage.c"
 	}
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
@@ -13658,7 +13620,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (_tmp2_);
 #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13657 "PhotoPage.c"
+#line 13619 "PhotoPage.c"
 }
 
 
@@ -13688,14 +13650,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	if (!_tmp2_) {
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13687 "PhotoPage.c"
+#line 13649 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13694 "PhotoPage.c"
+#line 13656 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13703,7 +13665,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13702 "PhotoPage.c"
+#line 13664 "PhotoPage.c"
 	}
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
@@ -13733,7 +13695,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	_g_object_unref0 (command);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13732 "PhotoPage.c"
+#line 13694 "PhotoPage.c"
 }
 
 
@@ -13791,7 +13753,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	if (_tmp0_ == NULL) {
 #line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13790 "PhotoPage.c"
+#line 13752 "PhotoPage.c"
 	}
 #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13807,7 +13769,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (tool_window);
 #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13806 "PhotoPage.c"
+#line 13768 "PhotoPage.c"
 	}
 #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13851,7 +13813,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_free0 (_tmp15_);
 #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp17_) {
-#line 13850 "PhotoPage.c"
+#line 13812 "PhotoPage.c"
 		GeeHashMap* _tmp18_;
 		EditingToolsEditingTool* _tmp19_;
 		const gchar* _tmp20_;
@@ -13896,7 +13858,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		y = (gint) ((gintptr) _tmp29_);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp28_);
-#line 13895 "PhotoPage.c"
+#line 13857 "PhotoPage.c"
 	} else {
 		GtkWindow* _tmp30_;
 		GtkWindow* _tmp31_;
@@ -13919,7 +13881,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (_tmp31_);
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_) {
-#line 13918 "PhotoPage.c"
+#line 13880 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
 			GtkWindow* _tmp35_;
@@ -13994,7 +13956,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			cheight = _tmp49_;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13993 "PhotoPage.c"
+#line 13955 "PhotoPage.c"
 				gint _tmp51_;
 				gint _tmp52_;
 				gint _tmp53_;
@@ -14012,7 +13974,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp55_ = _tmp54_.width;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
-#line 14011 "PhotoPage.c"
+#line 13973 "PhotoPage.c"
 			} else {
 				gint _tmp56_;
 				gint _tmp57_;
@@ -14025,7 +13987,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp58_ = cwidth;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
-#line 14024 "PhotoPage.c"
+#line 13986 "PhotoPage.c"
 			}
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp50_;
@@ -14041,7 +14003,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp63_ = _tmp62_.height;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
-#line 14040 "PhotoPage.c"
+#line 14002 "PhotoPage.c"
 		} else {
 			GtkWindow* _tmp64_;
 			GtkWindow* _tmp65_;
@@ -14120,13 +14082,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			_tmp82_ = self->priv->current_tool;
 #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14119 "PhotoPage.c"
+#line 14081 "PhotoPage.c"
 				gint _tmp83_;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp83_ = x;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp83_ * 3) / 4;
-#line 14125 "PhotoPage.c"
+#line 14087 "PhotoPage.c"
 			} else {
 				gint _tmp84_;
 				GtkAllocation _tmp85_;
@@ -14139,11 +14101,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 				_tmp86_ = _tmp85_.width;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp84_ - _tmp86_) / 2;
-#line 14138 "PhotoPage.c"
+#line 14100 "PhotoPage.c"
 			}
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14142 "PhotoPage.c"
+#line 14104 "PhotoPage.c"
 		}
 	}
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14208,7 +14170,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	_g_object_unref0 (screen);
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14207 "PhotoPage.c"
+#line 14169 "PhotoPage.c"
 }
 
 
@@ -14242,7 +14204,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14241 "PhotoPage.c"
+#line 14203 "PhotoPage.c"
 	}
 #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14280,7 +14242,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14279 "PhotoPage.c"
+#line 14241 "PhotoPage.c"
 	}
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14288,14 +14250,14 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14287 "PhotoPage.c"
+#line 14249 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14294 "PhotoPage.c"
+#line 14256 "PhotoPage.c"
 			ViewCollection* _tmp14_;
 			ViewCollection* _tmp15_;
 			DataView* _tmp16_;
@@ -14311,7 +14273,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14310 "PhotoPage.c"
+#line 14272 "PhotoPage.c"
 			}
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14335,7 +14297,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14334 "PhotoPage.c"
+#line 14296 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
@@ -14347,7 +14309,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14346 "PhotoPage.c"
+#line 14308 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
@@ -14359,7 +14321,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (next_photo);
 #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14358 "PhotoPage.c"
+#line 14320 "PhotoPage.c"
 			}
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
@@ -14371,7 +14333,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 14370 "PhotoPage.c"
+#line 14332 "PhotoPage.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
@@ -14381,7 +14343,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (next_photo);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14380 "PhotoPage.c"
+#line 14342 "PhotoPage.c"
 		}
 	}
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14390,7 +14352,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14389 "PhotoPage.c"
+#line 14351 "PhotoPage.c"
 }
 
 
@@ -14424,7 +14386,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	if (!_tmp1_) {
 #line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14423 "PhotoPage.c"
+#line 14385 "PhotoPage.c"
 	}
 #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
@@ -14462,7 +14424,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (current_photo);
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14461 "PhotoPage.c"
+#line 14423 "PhotoPage.c"
 	}
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
@@ -14470,14 +14432,14 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_tmp12_ = _g_object_ref0 (_tmp11_);
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14469 "PhotoPage.c"
+#line 14431 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14476 "PhotoPage.c"
+#line 14438 "PhotoPage.c"
 			ViewCollection* _tmp14_;
 			ViewCollection* _tmp15_;
 			DataView* _tmp16_;
@@ -14493,7 +14455,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp25_;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14492 "PhotoPage.c"
+#line 14454 "PhotoPage.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
@@ -14517,7 +14479,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp18_ == NULL) {
 #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14516 "PhotoPage.c"
+#line 14478 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
@@ -14529,7 +14491,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			if (_tmp21_ == NULL) {
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14528 "PhotoPage.c"
+#line 14490 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
@@ -14541,7 +14503,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 				_g_object_unref0 (previous_photo);
 #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14540 "PhotoPage.c"
+#line 14502 "PhotoPage.c"
 			}
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
@@ -14553,7 +14515,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 14552 "PhotoPage.c"
+#line 14514 "PhotoPage.c"
 			}
 #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
@@ -14563,7 +14525,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (previous_photo);
 #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14562 "PhotoPage.c"
+#line 14524 "PhotoPage.c"
 		}
 	}
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14572,7 +14534,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14571 "PhotoPage.c"
+#line 14533 "PhotoPage.c"
 }
 
 
@@ -14587,7 +14549,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	result = _tmp0_ != NULL;
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14586 "PhotoPage.c"
+#line 14548 "PhotoPage.c"
 }
 
 
@@ -14598,7 +14560,7 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) {
 	_data_collection_unref0 (self->priv->parent_view);
 #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14597 "PhotoPage.c"
+#line 14559 "PhotoPage.c"
 }
 
 
@@ -14685,14 +14647,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 14684 "PhotoPage.c"
+#line 14646 "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 14691 "PhotoPage.c"
+#line 14653 "PhotoPage.c"
 }
 
 
@@ -14705,7 +14667,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 14704 "PhotoPage.c"
+#line 14666 "PhotoPage.c"
 }
 
 
@@ -14718,14 +14680,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 = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint;
-#line 14717 "PhotoPage.c"
+#line 14679 "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 14724 "PhotoPage.c"
+#line 14686 "PhotoPage.c"
 }
 
 
@@ -14737,7 +14699,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 14736 "PhotoPage.c"
+#line 14698 "PhotoPage.c"
 }
 
 
@@ -14856,7 +14818,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) 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 14855 "PhotoPage.c"
+#line 14817 "PhotoPage.c"
 }
 
 
@@ -14924,7 +14886,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) 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 14923 "PhotoPage.c"
+#line 14885 "PhotoPage.c"
 }
 
 
@@ -15008,7 +14970,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 15007 "PhotoPage.c"
+#line 14969 "PhotoPage.c"
 }
 
 
@@ -15027,364 +14989,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 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15026 "PhotoPage.c"
+#line 14988 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15033 "PhotoPage.c"
+#line 14995 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15040 "PhotoPage.c"
+#line 15002 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15047 "PhotoPage.c"
+#line 15009 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15054 "PhotoPage.c"
+#line 15016 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15061 "PhotoPage.c"
+#line 15023 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15068 "PhotoPage.c"
+#line 15030 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15075 "PhotoPage.c"
+#line 15037 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15082 "PhotoPage.c"
+#line 15044 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15089 "PhotoPage.c"
+#line 15051 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15096 "PhotoPage.c"
+#line 15058 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15103 "PhotoPage.c"
+#line 15065 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15110 "PhotoPage.c"
+#line 15072 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15117 "PhotoPage.c"
+#line 15079 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15124 "PhotoPage.c"
+#line 15086 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15131 "PhotoPage.c"
+#line 15093 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15138 "PhotoPage.c"
+#line 15100 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15145 "PhotoPage.c"
+#line 15107 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15152 "PhotoPage.c"
+#line 15114 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15159 "PhotoPage.c"
+#line 15121 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15166 "PhotoPage.c"
+#line 15128 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15173 "PhotoPage.c"
+#line 15135 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15180 "PhotoPage.c"
+#line 15142 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15187 "PhotoPage.c"
+#line 15149 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15194 "PhotoPage.c"
+#line 15156 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15201 "PhotoPage.c"
+#line 15163 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15208 "PhotoPage.c"
+#line 15170 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15215 "PhotoPage.c"
+#line 15177 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15222 "PhotoPage.c"
+#line 15184 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15229 "PhotoPage.c"
+#line 15191 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15236 "PhotoPage.c"
+#line 15198 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15243 "PhotoPage.c"
+#line 15205 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15250 "PhotoPage.c"
+#line 15212 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15257 "PhotoPage.c"
+#line 15219 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15264 "PhotoPage.c"
+#line 15226 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15271 "PhotoPage.c"
+#line 15233 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15278 "PhotoPage.c"
+#line 15240 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15285 "PhotoPage.c"
+#line 15247 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15292 "PhotoPage.c"
+#line 15254 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15299 "PhotoPage.c"
+#line 15261 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15306 "PhotoPage.c"
+#line 15268 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15313 "PhotoPage.c"
+#line 15275 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15320 "PhotoPage.c"
+#line 15282 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15327 "PhotoPage.c"
+#line 15289 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15334 "PhotoPage.c"
+#line 15296 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15341 "PhotoPage.c"
+#line 15303 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15348 "PhotoPage.c"
+#line 15310 "PhotoPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15355 "PhotoPage.c"
+#line 15317 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15362 "PhotoPage.c"
+#line 15324 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15369 "PhotoPage.c"
+#line 15331 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
 #line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15376 "PhotoPage.c"
+#line 15338 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
 #line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15383 "PhotoPage.c"
+#line 15345 "PhotoPage.c"
 }
 
 
@@ -15450,14 +15412,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 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15449 "PhotoPage.c"
+#line 15411 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_new (void) {
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15456 "PhotoPage.c"
+#line 15418 "PhotoPage.c"
 }
 
 
@@ -15488,7 +15450,7 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	result = _tmp4_;
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15487 "PhotoPage.c"
+#line 15449 "PhotoPage.c"
 }
 
 
@@ -15502,7 +15464,7 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
 	_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 15501 "PhotoPage.c"
+#line 15463 "PhotoPage.c"
 }
 
 
@@ -15516,7 +15478,7 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
 	_tmp0_ = self->priv->filter;
 #line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15515 "PhotoPage.c"
+#line 15477 "PhotoPage.c"
 }
 
 
@@ -15541,28 +15503,28 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	_tmp2_ = ui_filenames;
 #line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15540 "PhotoPage.c"
+#line 15502 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new16 (gboolean value) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15547 "PhotoPage.c"
+#line 15509 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new17 (const gchar* value) {
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15554 "PhotoPage.c"
+#line 15516 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
 #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15561 "PhotoPage.c"
+#line 15523 "PhotoPage.c"
 }
 
 
@@ -15610,7 +15572,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp3_ == NULL) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15609 "PhotoPage.c"
+#line 15571 "PhotoPage.c"
 	}
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
@@ -15648,11 +15610,11 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Shotwell";
-#line 15647 "PhotoPage.c"
+#line 15609 "PhotoPage.c"
 	} else {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Camera";
-#line 15651 "PhotoPage.c"
+#line 15613 "PhotoPage.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = G_VARIANT_TYPE_STRING;
@@ -15676,7 +15638,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15675 "PhotoPage.c"
+#line 15637 "PhotoPage.c"
 }
 
 
@@ -15691,7 +15653,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 2454 "/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 15690 "PhotoPage.c"
+#line 15652 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -15703,11 +15665,11 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2455 "/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 15702 "PhotoPage.c"
+#line 15664 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15706 "PhotoPage.c"
+#line 15668 "PhotoPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -15720,7 +15682,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15719 "PhotoPage.c"
+#line 15681 "PhotoPage.c"
 			}
 		}
 	}
@@ -15730,58 +15692,58 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15729 "PhotoPage.c"
+#line 15691 "PhotoPage.c"
 }
 
 
-static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15740 "PhotoPage.c"
+#line 15702 "PhotoPage.c"
 	}
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15746 "PhotoPage.c"
+#line 15708 "PhotoPage.c"
 }
 
 
-static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15757 "PhotoPage.c"
+#line 15719 "PhotoPage.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15763 "PhotoPage.c"
+#line 15725 "PhotoPage.c"
 }
 
 
-static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15774 "PhotoPage.c"
+#line 15736 "PhotoPage.c"
 	}
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15780 "PhotoPage.c"
+#line 15742 "PhotoPage.c"
 }
 
 
@@ -15833,7 +15795,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _injection_group_ref0 (print_group);
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp4_);
+	_vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = injection_group_new ("PublishPlaceholder");
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15847,7 +15809,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _injection_group_ref0 (publish_group);
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add87 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15861,7 +15823,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _injection_group_ref0 (bg_group);
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp10_);
+	_vala_array_add88 (&groups, &groups_length1, &_groups_size_, _tmp10_);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = groups;
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15870,7 +15832,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	if (result_length1) {
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp11__length1;
-#line 15869 "PhotoPage.c"
+#line 15831 "PhotoPage.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp11_;
@@ -15882,7 +15844,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	_injection_group_unref0 (print_group);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15881 "PhotoPage.c"
+#line 15843 "PhotoPage.c"
 }
 
 
@@ -15920,7 +15882,7 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	_tmp5_ = value;
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15919 "PhotoPage.c"
+#line 15881 "PhotoPage.c"
 }
 
 
@@ -15939,7 +15901,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	if (_tmp1_ == NULL) {
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15938 "PhotoPage.c"
+#line 15900 "PhotoPage.c"
 	}
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
@@ -15947,7 +15909,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	_tmp2_ = action;
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15946 "PhotoPage.c"
+#line 15908 "PhotoPage.c"
 		GSimpleAction* _tmp3_;
 		gboolean _tmp4_;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15956,11 +15918,11 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 		_tmp4_ = display;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15955 "PhotoPage.c"
+#line 15917 "PhotoPage.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15959 "PhotoPage.c"
+#line 15921 "PhotoPage.c"
 }
 
 
@@ -16016,7 +15978,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 16015 "PhotoPage.c"
+#line 15977 "PhotoPage.c"
 		Photo* _tmp6_;
 		Photo* _tmp7_;
 		gboolean _tmp8_;
@@ -16030,11 +15992,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp4_ = _tmp8_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 16029 "PhotoPage.c"
+#line 15991 "PhotoPage.c"
 	} else {
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16033 "PhotoPage.c"
+#line 15995 "PhotoPage.c"
 	}
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
@@ -16042,7 +16004,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp10_ = 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"
 	if (_tmp10_) {
-#line 16041 "PhotoPage.c"
+#line 16003 "PhotoPage.c"
 		Photo* _tmp11_;
 		Photo* _tmp12_;
 		PhotoFileFormat _tmp13_;
@@ -16056,11 +16018,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 16055 "PhotoPage.c"
+#line 16017 "PhotoPage.c"
 	} else {
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16059 "PhotoPage.c"
+#line 16021 "PhotoPage.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
@@ -16068,7 +16030,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16067 "PhotoPage.c"
+#line 16029 "PhotoPage.c"
 		ConfigFacade* _tmp16_;
 		ConfigFacade* _tmp17_;
 		gchar* _tmp18_;
@@ -16087,11 +16049,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp19_);
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16086 "PhotoPage.c"
+#line 16048 "PhotoPage.c"
 	} else {
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16090 "PhotoPage.c"
+#line 16052 "PhotoPage.c"
 	}
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
@@ -16099,7 +16061,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16098 "PhotoPage.c"
+#line 16060 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_;
 		Photo* _tmp24_;
@@ -16119,7 +16081,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		if (_tmp26_) {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16118 "PhotoPage.c"
+#line 16080 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_;
 			Photo* _tmp28_;
@@ -16134,15 +16096,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 			_tmp22_ = _tmp29_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16133 "PhotoPage.c"
+#line 16095 "PhotoPage.c"
 		}
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16137 "PhotoPage.c"
+#line 16099 "PhotoPage.c"
 	} else {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16141 "PhotoPage.c"
+#line 16103 "PhotoPage.c"
 	}
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
@@ -16150,17 +16112,17 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16149 "PhotoPage.c"
+#line 16111 "PhotoPage.c"
 		gboolean _tmp32_;
 #line 2508 "/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 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16155 "PhotoPage.c"
+#line 16117 "PhotoPage.c"
 	} else {
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16159 "PhotoPage.c"
+#line 16121 "PhotoPage.c"
 	}
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
@@ -16168,7 +16130,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16167 "PhotoPage.c"
+#line 16129 "PhotoPage.c"
 	}
 #line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16178,7 +16140,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16177 "PhotoPage.c"
+#line 16139 "PhotoPage.c"
 		Photo* _tmp36_;
 		Photo* _tmp37_;
 		gboolean _tmp38_;
@@ -16192,11 +16154,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_tmp34_ = _tmp38_;
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16191 "PhotoPage.c"
+#line 16153 "PhotoPage.c"
 	} else {
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16195 "PhotoPage.c"
+#line 16157 "PhotoPage.c"
 	}
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
@@ -16232,7 +16194,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16231 "PhotoPage.c"
+#line 16193 "PhotoPage.c"
 		Photo* _tmp47_;
 		Photo* _tmp48_;
 		Scaling _tmp49_ = {0};
@@ -16265,7 +16227,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16264 "PhotoPage.c"
+#line 16226 "PhotoPage.c"
 	}
 #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
@@ -16273,7 +16235,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	_tmp56_ = is_raw;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16272 "PhotoPage.c"
+#line 16234 "PhotoPage.c"
 		ConfigFacade* _tmp57_;
 		ConfigFacade* _tmp58_;
 		gchar* _tmp59_;
@@ -16292,21 +16254,21 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		_g_free0 (_tmp60_);
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16291 "PhotoPage.c"
+#line 16253 "PhotoPage.c"
 	} else {
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16295 "PhotoPage.c"
+#line 16257 "PhotoPage.c"
 	}
 #line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = selected_count;
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = count;
 #line 2536 "/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 16305 "PhotoPage.c"
+#line 16267 "PhotoPage.c"
 }
 
 
@@ -16319,7 +16281,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16318 "PhotoPage.c"
+#line 16280 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_;
 		Photo* _tmp4_;
@@ -16339,7 +16301,7 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 		if (_tmp6_) {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16338 "PhotoPage.c"
+#line 16300 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_;
 			Photo* _tmp8_;
@@ -16354,21 +16316,21 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 			_tmp2_ = _tmp9_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16353 "PhotoPage.c"
+#line 16315 "PhotoPage.c"
 		}
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16357 "PhotoPage.c"
+#line 16319 "PhotoPage.c"
 	} else {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16361 "PhotoPage.c"
+#line 16323 "PhotoPage.c"
 	}
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
 #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16367 "PhotoPage.c"
+#line 16329 "PhotoPage.c"
 }
 
 
@@ -16382,7 +16344,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	static GQuark _tmp3_label0 = 0;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16381 "PhotoPage.c"
+#line 16343 "PhotoPage.c"
 	RawDeveloper _tmp5_;
 	GSimpleAction* _tmp6_;
 	GVariant* _tmp7_;
@@ -16404,38 +16366,38 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16403 "PhotoPage.c"
+#line 16365 "PhotoPage.c"
 			default:
 			{
 #line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16410 "PhotoPage.c"
+#line 16372 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16416 "PhotoPage.c"
+#line 16378 "PhotoPage.c"
 			default:
 			{
 #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16423 "PhotoPage.c"
+#line 16385 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16429 "PhotoPage.c"
+#line 16391 "PhotoPage.c"
 			default:
 			{
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16434 "PhotoPage.c"
+#line 16396 "PhotoPage.c"
 			}
 		}
 	}
@@ -16449,7 +16411,7 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	_tmp7_ = value;
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16448 "PhotoPage.c"
+#line 16410 "PhotoPage.c"
 }
 
 
@@ -16487,7 +16449,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp3_) {
 #line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16486 "PhotoPage.c"
+#line 16448 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -16509,7 +16471,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp11_ == NULL) {
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16508 "PhotoPage.c"
+#line 16470 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
@@ -16527,7 +16489,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (_tmp14_ == NULL) {
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16526 "PhotoPage.c"
+#line 16488 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_;
 		Photo* _tmp16_;
@@ -16543,7 +16505,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16542 "PhotoPage.c"
+#line 16504 "PhotoPage.c"
 	}
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
@@ -16551,7 +16513,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		_g_object_unref0 (photo);
 #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16550 "PhotoPage.c"
+#line 16512 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
@@ -16561,18 +16523,18 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	if (!_tmp21_) {
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16560 "PhotoPage.c"
+#line 16522 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_;
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16567 "PhotoPage.c"
+#line 16529 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16571 "PhotoPage.c"
+#line 16533 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_;
 		ViewCollection* _tmp24_;
@@ -16618,11 +16580,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		library_photo_page_update_development_menu_item_sensitivity (self);
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16617 "PhotoPage.c"
+#line 16579 "PhotoPage.c"
 	}
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16621 "PhotoPage.c"
+#line 16583 "PhotoPage.c"
 }
 
 
@@ -16631,7 +16593,7 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16630 "PhotoPage.c"
+#line 16592 "PhotoPage.c"
 }
 
 
@@ -16643,14 +16605,14 @@ static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16642 "PhotoPage.c"
+#line 16604 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
 #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16649 "PhotoPage.c"
+#line 16611 "PhotoPage.c"
 }
 
 
@@ -16685,7 +16647,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	_tmp4_ = view;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16684 "PhotoPage.c"
+#line 16646 "PhotoPage.c"
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16696,7 +16658,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 		_data_collection_unref0 (_tmp3_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16695 "PhotoPage.c"
+#line 16657 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_;
 		ViewCollection* _tmp8_;
@@ -16708,7 +16670,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 		_data_collection_unref0 (_tmp3_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16707 "PhotoPage.c"
+#line 16669 "PhotoPage.c"
 	}
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
@@ -16716,7 +16678,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16715 "PhotoPage.c"
+#line 16677 "PhotoPage.c"
 }
 
 
@@ -16729,7 +16691,7 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
 	self->priv->return_page = NULL;
 #line 2604 "/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 16728 "PhotoPage.c"
+#line 16690 "PhotoPage.c"
 }
 
 
@@ -16747,7 +16709,7 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	result = _tmp1_;
 #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16746 "PhotoPage.c"
+#line 16708 "PhotoPage.c"
 }
 
 
@@ -16784,7 +16746,7 @@ static void library_photo_page_real_switched_to (Page* base) {
 	library_photo_page_set_display_ratings (self, _tmp4_);
 #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16783 "PhotoPage.c"
+#line 16745 "PhotoPage.c"
 }
 
 
@@ -16794,7 +16756,7 @@ static void library_photo_page_real_switching_from (Page* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2627 "/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 16793 "PhotoPage.c"
+#line 16755 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -16806,11 +16768,11 @@ static void library_photo_page_real_switching_from (Page* base) {
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2628 "/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 16805 "PhotoPage.c"
+#line 16767 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16809 "PhotoPage.c"
+#line 16771 "PhotoPage.c"
 			{
 				AppWindow* _tmp0_;
 				AppWindow* _tmp1_;
@@ -16828,7 +16790,7 @@ static void library_photo_page_real_switching_from (Page* base) {
 				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
 #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp1_);
-#line 16827 "PhotoPage.c"
+#line 16789 "PhotoPage.c"
 			}
 		}
 	}
@@ -16854,7 +16816,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	if (!_tmp1_) {
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16853 "PhotoPage.c"
+#line 16815 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_;
 		ConfigFacade* _tmp3_;
@@ -16869,7 +16831,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 		_tmp0_ = !_tmp4_;
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16868 "PhotoPage.c"
+#line 16830 "PhotoPage.c"
 	}
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16877,7 +16839,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 		result = NULL;
 #line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16876 "PhotoPage.c"
+#line 16838 "PhotoPage.c"
 	}
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16897,7 +16859,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	result = _tmp10_;
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16896 "PhotoPage.c"
+#line 16858 "PhotoPage.c"
 }
 
 
@@ -16915,7 +16877,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	if (!_tmp1_) {
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16914 "PhotoPage.c"
+#line 16876 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_;
 		LibraryPhoto* _tmp3_;
@@ -16930,7 +16892,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 		_tmp0_ = !_tmp4_;
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16929 "PhotoPage.c"
+#line 16891 "PhotoPage.c"
 	}
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16938,7 +16900,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 		result = NULL;
 #line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16937 "PhotoPage.c"
+#line 16899 "PhotoPage.c"
 	}
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
@@ -16946,7 +16908,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	result = _tmp5_;
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16945 "PhotoPage.c"
+#line 16907 "PhotoPage.c"
 }
 
 
@@ -16976,7 +16938,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16975 "PhotoPage.c"
+#line 16937 "PhotoPage.c"
 	}
 #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -17006,7 +16968,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17005 "PhotoPage.c"
+#line 16967 "PhotoPage.c"
 }
 
 
@@ -17025,17 +16987,17 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 17024 "PhotoPage.c"
+#line 16986 "PhotoPage.c"
 		gboolean _tmp3_;
 #line 2657 "/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 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 17030 "PhotoPage.c"
+#line 16992 "PhotoPage.c"
 	} else {
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17034 "PhotoPage.c"
+#line 16996 "PhotoPage.c"
 	}
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
@@ -17045,21 +17007,21 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 17044 "PhotoPage.c"
+#line 17006 "PhotoPage.c"
 		gboolean _tmp7_;
 #line 2658 "/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 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 17050 "PhotoPage.c"
+#line 17012 "PhotoPage.c"
 	} else {
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17054 "PhotoPage.c"
+#line 17016 "PhotoPage.c"
 	}
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17058 "PhotoPage.c"
+#line 17020 "PhotoPage.c"
 }
 
 
@@ -17071,7 +17033,7 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17070 "PhotoPage.c"
+#line 17032 "PhotoPage.c"
 }
 
 
@@ -17083,7 +17045,7 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17082 "PhotoPage.c"
+#line 17044 "PhotoPage.c"
 }
 
 
@@ -17109,7 +17071,7 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 		result = TRUE;
 #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17108 "PhotoPage.c"
+#line 17070 "PhotoPage.c"
 	}
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
@@ -17125,13 +17087,13 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 		result = TRUE;
 #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17124 "PhotoPage.c"
+#line 17086 "PhotoPage.c"
 	} else {
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17130 "PhotoPage.c"
+#line 17092 "PhotoPage.c"
 	}
 }
 
@@ -17211,7 +17173,7 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	_tmp1_ = missing;
 #line 2724 "/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 17210 "PhotoPage.c"
+#line 17172 "PhotoPage.c"
 }
 
 
@@ -17228,20 +17190,20 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	_tmp0_ = missing;
 #line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17227 "PhotoPage.c"
+#line 17189 "PhotoPage.c"
 		Photo* _tmp1_;
 #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
 #line 2729 "/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 17233 "PhotoPage.c"
+#line 17195 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_;
 #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
 #line 2731 "/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 17240 "PhotoPage.c"
+#line 17202 "PhotoPage.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
@@ -17249,7 +17211,7 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	_tmp4_ = missing;
 #line 2733 "/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 17248 "PhotoPage.c"
+#line 17210 "PhotoPage.c"
 }
 
 
@@ -17305,7 +17267,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17304 "PhotoPage.c"
+#line 17266 "PhotoPage.c"
 		GdkEventKey* _tmp1_;
 		gboolean _tmp2_;
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17314,11 +17276,11 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 		_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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17313 "PhotoPage.c"
+#line 17275 "PhotoPage.c"
 	} else {
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17317 "PhotoPage.c"
+#line 17279 "PhotoPage.c"
 	}
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -17326,7 +17288,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 		result = TRUE;
 #line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17325 "PhotoPage.c"
+#line 17287 "PhotoPage.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
@@ -17344,7 +17306,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	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 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17343 "PhotoPage.c"
+#line 17305 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_;
@@ -17362,193 +17324,193 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 				if (_tmp11_) {
 #line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17361 "PhotoPage.c"
+#line 17323 "PhotoPage.c"
 				}
 #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17365 "PhotoPage.c"
+#line 17327 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17371 "PhotoPage.c"
+#line 17333 "PhotoPage.c"
 			default:
 			{
 #line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
 #line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17378 "PhotoPage.c"
+#line 17340 "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 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17384 "PhotoPage.c"
+#line 17346 "PhotoPage.c"
 			default:
 			{
 #line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17391 "PhotoPage.c"
+#line 17353 "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 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17397 "PhotoPage.c"
+#line 17359 "PhotoPage.c"
 			default:
 			{
 #line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17404 "PhotoPage.c"
+#line 17366 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17410 "PhotoPage.c"
+#line 17372 "PhotoPage.c"
 			default:
 			{
 #line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17417 "PhotoPage.c"
+#line 17379 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17423 "PhotoPage.c"
+#line 17385 "PhotoPage.c"
 			default:
 			{
 #line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17430 "PhotoPage.c"
+#line 17392 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17436 "PhotoPage.c"
+#line 17398 "PhotoPage.c"
 			default:
 			{
 #line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17443 "PhotoPage.c"
+#line 17405 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17449 "PhotoPage.c"
+#line 17411 "PhotoPage.c"
 			default:
 			{
 #line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17456 "PhotoPage.c"
+#line 17418 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17462 "PhotoPage.c"
+#line 17424 "PhotoPage.c"
 			default:
 			{
 #line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17469 "PhotoPage.c"
+#line 17431 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17475 "PhotoPage.c"
+#line 17437 "PhotoPage.c"
 			default:
 			{
 #line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17482 "PhotoPage.c"
+#line 17444 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17488 "PhotoPage.c"
+#line 17450 "PhotoPage.c"
 			default:
 			{
 #line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17495 "PhotoPage.c"
+#line 17457 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17501 "PhotoPage.c"
+#line 17463 "PhotoPage.c"
 			default:
 			{
 #line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17508 "PhotoPage.c"
+#line 17470 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17514 "PhotoPage.c"
+#line 17476 "PhotoPage.c"
 			default:
 			{
 #line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
 #line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17521 "PhotoPage.c"
+#line 17483 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17527 "PhotoPage.c"
+#line 17489 "PhotoPage.c"
 			default:
 			{
 #line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17534 "PhotoPage.c"
+#line 17496 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17540 "PhotoPage.c"
+#line 17502 "PhotoPage.c"
 			default:
 			{
 #line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17547 "PhotoPage.c"
+#line 17509 "PhotoPage.c"
 			}
 		}
 	}
@@ -17556,7 +17518,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	result = handled;
 #line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17555 "PhotoPage.c"
+#line 17517 "PhotoPage.c"
 }
 
 
@@ -17579,7 +17541,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp1_ == NULL) {
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17578 "PhotoPage.c"
+#line 17540 "PhotoPage.c"
 	}
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
@@ -17589,14 +17551,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp2_ == NULL) {
 #line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17588 "PhotoPage.c"
+#line 17550 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17595 "PhotoPage.c"
+#line 17557 "PhotoPage.c"
 	}
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
@@ -17604,7 +17566,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	_g_object_unref0 (fs);
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17603 "PhotoPage.c"
+#line 17565 "PhotoPage.c"
 }
 
 
@@ -17630,7 +17592,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 		result = TRUE;
 #line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17629 "PhotoPage.c"
+#line 17591 "PhotoPage.c"
 	}
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
@@ -17640,7 +17602,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	result = _tmp2_;
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17639 "PhotoPage.c"
+#line 17601 "PhotoPage.c"
 }
 
 
@@ -17655,7 +17617,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->context_menu;
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17654 "PhotoPage.c"
+#line 17616 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_;
 		GObject* _tmp2_;
@@ -17687,7 +17649,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17686 "PhotoPage.c"
+#line 17648 "PhotoPage.c"
 	}
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
@@ -17697,7 +17659,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	result = _tmp8_;
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17696 "PhotoPage.c"
+#line 17658 "PhotoPage.c"
 }
 
 
@@ -17725,7 +17687,7 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	result = TRUE;
 #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17724 "PhotoPage.c"
+#line 17686 "PhotoPage.c"
 }
 
 
@@ -17748,7 +17710,7 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	result = TRUE;
 #line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17747 "PhotoPage.c"
+#line 17709 "PhotoPage.c"
 }
 
 
@@ -17760,7 +17722,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->return_page;
 #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17759 "PhotoPage.c"
+#line 17721 "PhotoPage.c"
 		LibraryWindow* _tmp1_;
 		LibraryWindow* _tmp2_;
 		CollectionPage* _tmp3_;
@@ -17774,7 +17736,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
 #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17773 "PhotoPage.c"
+#line 17735 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_;
 		LibraryWindow* _tmp5_;
@@ -17786,7 +17748,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_library_page (_tmp5_);
 #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17785 "PhotoPage.c"
+#line 17747 "PhotoPage.c"
 	}
 }
 
@@ -17814,7 +17776,7 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	_g_object_unref0 (photos);
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17813 "PhotoPage.c"
+#line 17775 "PhotoPage.c"
 }
 
 
@@ -17847,13 +17809,13 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17846 "PhotoPage.c"
+#line 17808 "PhotoPage.c"
 	}
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17852 "PhotoPage.c"
+#line 17814 "PhotoPage.c"
 		LibraryWindow* _tmp2_;
 		LibraryWindow* _tmp3_;
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17864,7 +17826,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17863 "PhotoPage.c"
+#line 17825 "PhotoPage.c"
 	}
 #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -17896,7 +17858,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	_g_object_unref0 (_tmp10_);
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17895 "PhotoPage.c"
+#line 17857 "PhotoPage.c"
 		LibraryWindow* _tmp13_;
 		LibraryWindow* _tmp14_;
 		GtkWindow* _tmp15_;
@@ -17922,7 +17884,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp16_);
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17921 "PhotoPage.c"
+#line 17883 "PhotoPage.c"
 			GtkWindow* _tmp18_;
 			FullscreenWindow* _tmp19_;
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17933,7 +17895,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 			fullscreen_window_close (_tmp19_);
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17932 "PhotoPage.c"
+#line 17894 "PhotoPage.c"
 		}
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
@@ -17943,7 +17905,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		library_window_switch_to_library_page (_tmp21_);
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17942 "PhotoPage.c"
+#line 17904 "PhotoPage.c"
 	}
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -17973,7 +17935,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	_g_object_unref0 (photos);
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17972 "PhotoPage.c"
+#line 17934 "PhotoPage.c"
 }
 
 
@@ -17985,7 +17947,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17984 "PhotoPage.c"
+#line 17946 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_;
 		GeeArrayList* _tmp2_;
@@ -18039,7 +18001,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		_command_manager_unref0 (_tmp6_);
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 18038 "PhotoPage.c"
+#line 18000 "PhotoPage.c"
 	}
 }
 
@@ -18054,7 +18016,7 @@ static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataS
 	_tmp0_ = source;
 #line 2925 "/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 18053 "PhotoPage.c"
+#line 18015 "PhotoPage.c"
 }
 
 
@@ -18086,7 +18048,7 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	if (_tmp1_ == NULL) {
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18085 "PhotoPage.c"
+#line 18047 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_;
 		Photo* _tmp3_;
@@ -18104,13 +18066,13 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 		_tmp0_ = !_tmp5_;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18103 "PhotoPage.c"
+#line 18065 "PhotoPage.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18109 "PhotoPage.c"
+#line 18071 "PhotoPage.c"
 	}
 #line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -18154,7 +18116,7 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	_g_object_unref0 (_tmp17_);
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18153 "PhotoPage.c"
+#line 18115 "PhotoPage.c"
 		LibraryWindow* _tmp20_;
 		LibraryWindow* _tmp21_;
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18165,11 +18127,11 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 		library_window_switch_to_library_page (_tmp21_);
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18164 "PhotoPage.c"
+#line 18126 "PhotoPage.c"
 	}
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18168 "PhotoPage.c"
+#line 18130 "PhotoPage.c"
 }
 
 
@@ -18192,7 +18154,7 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18191 "PhotoPage.c"
+#line 18153 "PhotoPage.c"
 		PrintManager* _tmp4_;
 		PrintManager* _tmp5_;
 		ViewCollection* _tmp6_;
@@ -18219,7 +18181,7 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 		_data_collection_unref0 (_tmp7_);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18218 "PhotoPage.c"
+#line 18180 "PhotoPage.c"
 	}
 }
 
@@ -18233,7 +18195,7 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18232 "PhotoPage.c"
+#line 18194 "PhotoPage.c"
 		ConfigFacade* _tmp2_;
 		ConfigFacade* _tmp3_;
 		gchar* _tmp4_;
@@ -18252,15 +18214,15 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
 		_g_free0 (_tmp5_);
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18251 "PhotoPage.c"
+#line 18213 "PhotoPage.c"
 	} else {
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18255 "PhotoPage.c"
+#line 18217 "PhotoPage.c"
 	}
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18259 "PhotoPage.c"
+#line 18221 "PhotoPage.c"
 }
 
 
@@ -18275,7 +18237,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18274 "PhotoPage.c"
+#line 18236 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_;
@@ -18302,8 +18264,8 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18301 "PhotoPage.c"
-			goto __catch252_g_error;
+#line 18263 "PhotoPage.c"
+			goto __catch263_g_error;
 		}
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
@@ -18313,10 +18275,10 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18312 "PhotoPage.c"
+#line 18274 "PhotoPage.c"
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally263;
+	__catch263_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_;
@@ -18348,9 +18310,9 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp11_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18347 "PhotoPage.c"
+#line 18309 "PhotoPage.c"
 	}
-	__finally252:
+	__finally263:
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18359,7 +18321,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18358 "PhotoPage.c"
+#line 18320 "PhotoPage.c"
 	}
 }
 
@@ -18379,7 +18341,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18378 "PhotoPage.c"
+#line 18340 "PhotoPage.c"
 	}
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18395,7 +18357,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	if (_tmp4_) {
 #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18394 "PhotoPage.c"
+#line 18356 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_;
@@ -18422,8 +18384,8 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp8_);
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18421 "PhotoPage.c"
-			goto __catch253_g_error;
+#line 18383 "PhotoPage.c"
+			goto __catch264_g_error;
 		}
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
@@ -18433,10 +18395,10 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18432 "PhotoPage.c"
+#line 18394 "PhotoPage.c"
 	}
-	goto __finally253;
-	__catch253_g_error:
+	goto __finally264;
+	__catch264_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_;
@@ -18468,9 +18430,9 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_free0 (_tmp15_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18467 "PhotoPage.c"
+#line 18429 "PhotoPage.c"
 	}
-	__finally253:
+	__finally264:
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18479,7 +18441,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18478 "PhotoPage.c"
+#line 18440 "PhotoPage.c"
 	}
 }
 
@@ -18492,7 +18454,7 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18491 "PhotoPage.c"
+#line 18453 "PhotoPage.c"
 		ViewCollection* _tmp1_;
 		ViewCollection* _tmp2_;
 		GeeList* _tmp3_;
@@ -18511,7 +18473,7 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp4_);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18510 "PhotoPage.c"
+#line 18472 "PhotoPage.c"
 	}
 }
 
@@ -18550,7 +18512,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	if (!_tmp0_) {
 #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18549 "PhotoPage.c"
+#line 18511 "PhotoPage.c"
 	}
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = export_dialog_new (_ ("Export Photo"));
@@ -18576,7 +18538,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (export_dialog);
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18575 "PhotoPage.c"
+#line 18537 "PhotoPage.c"
 	}
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18608,7 +18570,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (export_dialog);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18607 "PhotoPage.c"
+#line 18569 "PhotoPage.c"
 	}
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = constraint;
@@ -18618,7 +18580,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_);
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp17_;
-#line 18617 "PhotoPage.c"
+#line 18579 "PhotoPage.c"
 	{
 		Photo* _tmp18_;
 		Photo* _tmp19_;
@@ -18670,12 +18632,12 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp19_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18669 "PhotoPage.c"
-			goto __catch254_g_error;
+#line 18631 "PhotoPage.c"
+			goto __catch265_g_error;
 		}
 	}
-	goto __finally254;
-	__catch254_g_error:
+	goto __finally265;
+	__catch265_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp32_;
@@ -18711,9 +18673,9 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_free0 (_tmp34_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18710 "PhotoPage.c"
+#line 18672 "PhotoPage.c"
 	}
-	__finally254:
+	__finally265:
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18726,13 +18688,13 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18725 "PhotoPage.c"
+#line 18687 "PhotoPage.c"
 	}
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18731 "PhotoPage.c"
+#line 18693 "PhotoPage.c"
 }
 
 
@@ -18755,7 +18717,7 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	_data_collection_unref0 (_tmp1_);
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18754 "PhotoPage.c"
+#line 18716 "PhotoPage.c"
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
 		GeeList* _tmp6_;
@@ -18774,7 +18736,7 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp7_);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18773 "PhotoPage.c"
+#line 18735 "PhotoPage.c"
 	}
 }
 
@@ -18798,20 +18760,20 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	if (!_tmp1_) {
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18797 "PhotoPage.c"
+#line 18759 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_;
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18804 "PhotoPage.c"
+#line 18766 "PhotoPage.c"
 	}
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18810 "PhotoPage.c"
+#line 18772 "PhotoPage.c"
 	}
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18839,7 +18801,7 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18838 "PhotoPage.c"
+#line 18800 "PhotoPage.c"
 }
 
 
@@ -18862,20 +18824,20 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	if (!_tmp1_) {
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18861 "PhotoPage.c"
+#line 18823 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_;
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18868 "PhotoPage.c"
+#line 18830 "PhotoPage.c"
 	}
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18874 "PhotoPage.c"
+#line 18836 "PhotoPage.c"
 	}
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18903,7 +18865,7 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18902 "PhotoPage.c"
+#line 18864 "PhotoPage.c"
 }
 
 
@@ -18927,20 +18889,20 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	if (!_tmp1_) {
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18926 "PhotoPage.c"
+#line 18888 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_;
 #line 3049 "/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 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18933 "PhotoPage.c"
+#line 18895 "PhotoPage.c"
 	}
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18939 "PhotoPage.c"
+#line 18901 "PhotoPage.c"
 	}
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18970,7 +18932,7 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18969 "PhotoPage.c"
+#line 18931 "PhotoPage.c"
 }
 
 
@@ -18979,7 +18941,7 @@ static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18978 "PhotoPage.c"
+#line 18940 "PhotoPage.c"
 }
 
 
@@ -18988,7 +18950,7 @@ static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18987 "PhotoPage.c"
+#line 18949 "PhotoPage.c"
 }
 
 
@@ -18997,7 +18959,7 @@ static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18996 "PhotoPage.c"
+#line 18958 "PhotoPage.c"
 }
 
 
@@ -19006,7 +18968,7 @@ static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 19005 "PhotoPage.c"
+#line 18967 "PhotoPage.c"
 }
 
 
@@ -19015,7 +18977,7 @@ static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 19014 "PhotoPage.c"
+#line 18976 "PhotoPage.c"
 }
 
 
@@ -19024,7 +18986,7 @@ static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 19023 "PhotoPage.c"
+#line 18985 "PhotoPage.c"
 }
 
 
@@ -19033,7 +18995,7 @@ static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 19032 "PhotoPage.c"
+#line 18994 "PhotoPage.c"
 }
 
 
@@ -19163,21 +19125,21 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19162 "PhotoPage.c"
+#line 19124 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new18 (const gchar* value) {
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19169 "PhotoPage.c"
+#line 19131 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new19 (const gchar* value) {
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19176 "PhotoPage.c"
+#line 19138 "PhotoPage.c"
 }
 
 
@@ -19211,7 +19173,7 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	_tmp5_ = format;
 #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19210 "PhotoPage.c"
+#line 19172 "PhotoPage.c"
 		Photo* _tmp6_;
 		Photo* _tmp7_;
 		RawDeveloper _tmp8_;
@@ -19230,7 +19192,7 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 		switch (_tmp9_) {
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19229 "PhotoPage.c"
+#line 19191 "PhotoPage.c"
 			{
 				GAction* _tmp10_;
 				GAction* _tmp11_;
@@ -19249,13 +19211,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 				_g_object_unref0 (_tmp11_);
 #line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19248 "PhotoPage.c"
+#line 19210 "PhotoPage.c"
 			}
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19254 "PhotoPage.c"
+#line 19216 "PhotoPage.c"
 			{
 				GAction* _tmp13_;
 				GAction* _tmp14_;
@@ -19274,13 +19236,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 				_g_object_unref0 (_tmp14_);
 #line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19273 "PhotoPage.c"
+#line 19235 "PhotoPage.c"
 			}
 			default:
 			{
 #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19279 "PhotoPage.c"
+#line 19241 "PhotoPage.c"
 			}
 		}
 	}
@@ -19312,7 +19274,7 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	_g_object_unref0 (_tmp3_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19311 "PhotoPage.c"
+#line 19273 "PhotoPage.c"
 		GeeMap* _tmp6_;
 		Photo* _tmp7_;
 		Photo* _tmp8_;
@@ -19337,17 +19299,17 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 		_alteration_unref0 (_tmp10_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19336 "PhotoPage.c"
+#line 19298 "PhotoPage.c"
 	} else {
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19340 "PhotoPage.c"
+#line 19302 "PhotoPage.c"
 	}
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19346 "PhotoPage.c"
+#line 19308 "PhotoPage.c"
 	}
 }
 
@@ -19385,7 +19347,7 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	_tmp4__length1 = names_length1;
 #line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19384 "PhotoPage.c"
+#line 19346 "PhotoPage.c"
 		CommandManager* _tmp5_;
 		CommandManager* _tmp6_;
 		HierarchicalTagIndex* _tmp7_;
@@ -19446,13 +19408,13 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		_hierarchical_tag_index_unref0 (_tmp8_);
 #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19445 "PhotoPage.c"
+#line 19407 "PhotoPage.c"
 	}
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19451 "PhotoPage.c"
+#line 19413 "PhotoPage.c"
 }
 
 
@@ -19521,7 +19483,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19520 "PhotoPage.c"
+#line 19482 "PhotoPage.c"
 	}
 #line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -19547,7 +19509,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19546 "PhotoPage.c"
+#line 19508 "PhotoPage.c"
 }
 
 
@@ -19579,7 +19541,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	result = _tmp4_;
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19578 "PhotoPage.c"
+#line 19540 "PhotoPage.c"
 }
 
 
@@ -19589,14 +19551,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19588 "PhotoPage.c"
+#line 19550 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
 #line 2334 "/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 19595 "PhotoPage.c"
+#line 19557 "PhotoPage.c"
 }
 
 
@@ -19605,7 +19567,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 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19604 "PhotoPage.c"
+#line 19566 "PhotoPage.c"
 }
 
 
@@ -19672,7 +19634,7 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) library_photo_page_real_on_context_keypress;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19671 "PhotoPage.c"
+#line 19633 "PhotoPage.c"
 }
 
 
@@ -19688,7 +19650,7 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
 #line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19687 "PhotoPage.c"
+#line 19649 "PhotoPage.c"
 }
 
 
@@ -19733,7 +19695,7 @@ static void library_photo_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19732 "PhotoPage.c"
+#line 19694 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 9bed855..5c2a1de 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2530,7 +2530,7 @@ public class LibraryPhotoPage : EditingHostPage {
                  
         update_flag_action();
         
-        set_action_visible("ExternalEditRAW", 
+        set_action_sensitive("ExternalEditRAW",
             is_raw && Config.Facade.get_instance().get_external_raw_app() != "");
         
         base.update_actions(selected_count, count);
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index f50ca76..cf238a0 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -2293,7 +2293,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 2296 "PixbufCache.c"
-			goto __catch454_g_error;
+			goto __catch462_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2307,8 +2307,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2309 "PixbufCache.c"
 	}
-	goto __finally454;
-	__catch454_g_error:
+	goto __finally462;
+	__catch462_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
@@ -2329,7 +2329,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2331 "PixbufCache.c"
 	}
-	__finally454:
+	__finally462:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2432,7 +2432,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 2435 "PixbufCache.c"
-			goto __catch455_g_error;
+			goto __catch463_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2446,8 +2446,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2448 "PixbufCache.c"
 	}
-	goto __finally455;
-	__catch455_g_error:
+	goto __finally463;
+	__catch463_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
@@ -2468,7 +2468,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2470 "PixbufCache.c"
 	}
-	__finally455:
+	__finally463:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
diff --git a/src/Printing.c b/src/Printing.c
index 42a3024..bb93377 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -603,7 +603,6 @@ enum  {
 #define PRINT_MANAGER_IMAGE_DISTANCE 0.24
 static PrintManager* print_manager_new (void);
 static PrintManager* print_manager_construct (GType object_type);
-static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
@@ -618,6 +617,7 @@ static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* s
 static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value);
 void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 gchar* data_object_get_name (DataObject* self);
 static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context);
@@ -5300,7 +5300,7 @@ static PrintManager* print_manager_new (void) {
 }
 
 
-static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5317,7 +5317,7 @@ static void _vala_array_add112 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5334,7 +5334,7 @@ static void _vala_array_add113 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5351,7 +5351,7 @@ static void _vala_array_add114 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5368,7 +5368,7 @@ static void _vala_array_add115 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5385,7 +5385,7 @@ static void _vala_array_add116 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5402,7 +5402,7 @@ static void _vala_array_add117 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5419,7 +5419,7 @@ static void _vala_array_add118 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5436,7 +5436,7 @@ static void _vala_array_add119 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5453,7 +5453,7 @@ static void _vala_array_add120 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5470,7 +5470,7 @@ static void _vala_array_add121 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5487,7 +5487,7 @@ static void _vala_array_add122 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5504,7 +5504,7 @@ static void _vala_array_add123 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5521,7 +5521,7 @@ static void _vala_array_add124 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5538,7 +5538,7 @@ static void _vala_array_add125 (StandardPrintSize** * array, int* length, int* s
 }
 
 
-static void _vala_array_add126 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add127 (StandardPrintSize** * array, int* length, int* size, StandardPrintSize* value) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5669,7 +5669,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = standard_print_size_new (_ ("Wallet (2 × 3 in.)"), &_tmp3_, &_tmp4_);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
+		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->standard_sizes;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5681,7 +5681,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = standard_print_size_new (_ ("Notecard (3 × 5 in.)"), &_tmp7_, &_tmp8_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
+		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->standard_sizes;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5693,7 +5693,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp13_ = standard_print_size_new (_ ("4 × 6 in."), &_tmp11_, &_tmp12_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
+		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = self->priv->standard_sizes;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5705,7 +5705,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = standard_print_size_new (_ ("5 × 7 in."), &_tmp15_, &_tmp16_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
+		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = self->priv->standard_sizes;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5717,7 +5717,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = standard_print_size_new (_ ("8 × 10 in."), &_tmp19_, &_tmp20_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = self->priv->standard_sizes;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5729,7 +5729,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = standard_print_size_new (_ ("11 × 14 in."), &_tmp23_, &_tmp24_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
+		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = self->priv->standard_sizes;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5741,7 +5741,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = standard_print_size_new (_ ("16 × 20 in."), &_tmp27_, &_tmp28_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
+		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->standard_sizes;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5753,7 +5753,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = standard_print_size_new ("-", &_tmp31_, &_tmp32_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
+		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5765,7 +5765,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = standard_print_size_new (_ ("Metric Wallet (9 × 13 cm)"), &_tmp35_, &_tmp36_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
+		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = self->priv->standard_sizes;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5777,7 +5777,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp41_ = standard_print_size_new (_ ("Postcard (10 × 15 cm)"), &_tmp39_, &_tmp40_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
+		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp42_ = self->priv->standard_sizes;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5789,7 +5789,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = standard_print_size_new (_ ("13 × 18 cm"), &_tmp43_, &_tmp44_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp46_ = self->priv->standard_sizes;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5801,7 +5801,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp49_ = standard_print_size_new (_ ("18 × 24 cm"), &_tmp47_, &_tmp48_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
+		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp50_ = self->priv->standard_sizes;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5813,7 +5813,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp53_ = standard_print_size_new (_ ("20 × 30 cm"), &_tmp51_, &_tmp52_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
+		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp54_ = self->priv->standard_sizes;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5825,7 +5825,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp57_ = standard_print_size_new (_ ("24 × 40 cm"), &_tmp55_, &_tmp56_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp58_ = self->priv->standard_sizes;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5837,7 +5837,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp61_ = standard_print_size_new (_ ("30 × 40 cm"), &_tmp59_, &_tmp60_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
+		_vala_array_add127 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
 #line 5841 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6048,7 +6048,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6050 "Printing.c"
-			goto __catch469_g_error;
+			goto __catch478_g_error;
 		}
 #line 870 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
@@ -6066,8 +6066,8 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 6066 "Printing.c"
 		}
 	}
-	goto __finally469;
-	__catch469_g_error:
+	goto __finally478;
+	__catch478_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp20_;
@@ -6093,7 +6093,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		_g_error_free0 (e);
 #line 6094 "Printing.c"
 	}
-	__finally469:
+	__finally478:
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 867 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7598,7 +7598,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7600 "Printing.c"
-				goto __catch470_g_error;
+				goto __catch479_g_error;
 			}
 #line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -7725,7 +7725,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7727 "Printing.c"
-				goto __catch470_g_error;
+				goto __catch479_g_error;
 			}
 #line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -7751,8 +7751,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		cairo_paint (_tmp89_);
 #line 7752 "Printing.c"
 	}
-	goto __finally470;
-	__catch470_g_error:
+	goto __finally479;
+	__catch479_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_;
@@ -7784,7 +7784,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_g_error_free0 (e);
 #line 7785 "Printing.c"
 	}
-	__finally470:
+	__finally479:
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
diff --git a/src/Properties.c b/src/Properties.c
index d14faa7..21f7671 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -636,6 +636,7 @@ enum  {
 };
 ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner);
 ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner);
+gint resources_use_header_bar (void);
 static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void);
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_construct (GType object_type);
@@ -699,14 +700,14 @@ Properties* properties_construct (GType object_type) {
 	gtk_grid_set_column_spacing (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), 6);
 #line 10 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 703 "Properties.c"
+#line 704 "Properties.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 31 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 710 "Properties.c"
+#line 711 "Properties.c"
 }
 
 
@@ -756,7 +757,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 	_tmp6_ = multi_line;
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp6_) {
-#line 760 "Properties.c"
+#line 761 "Properties.c"
 		GtkScrolledWindow* info_scroll = NULL;
 		GtkScrolledWindow* _tmp7_;
 		GtkScrolledWindow* _tmp8_;
@@ -836,14 +837,14 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		if (_tmp21_) {
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = "";
-#line 840 "Properties.c"
+#line 841 "Properties.c"
 		} else {
 			const gchar* _tmp22_;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = info_text;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = _tmp22_;
-#line 847 "Properties.c"
+#line 848 "Properties.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp23_ = view;
@@ -881,7 +882,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		_g_object_unref0 (view);
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info_scroll);
-#line 885 "Properties.c"
+#line 886 "Properties.c"
 	} else {
 		GtkLabel* info_label = NULL;
 		GtkLabel* _tmp32_;
@@ -911,14 +912,14 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		if (_tmp35_) {
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = "";
-#line 915 "Properties.c"
+#line 916 "Properties.c"
 		} else {
 			const gchar* _tmp36_;
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = info_text;
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = _tmp36_;
-#line 922 "Properties.c"
+#line 923 "Properties.c"
 		}
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp37_ = info_label;
@@ -958,7 +959,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		info = _tmp45_;
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info_label);
-#line 962 "Properties.c"
+#line 963 "Properties.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp46_ = label;
@@ -970,7 +971,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 	_tmp48_ = multi_line;
 #line 56 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp48_) {
-#line 974 "Properties.c"
+#line 975 "Properties.c"
 		GtkWidget* _tmp49_;
 		guint _tmp50_;
 #line 57 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -979,7 +980,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		_tmp50_ = self->priv->line_count;
 #line 57 "/home/jens/Source/shotwell/src/Properties.vala"
 		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp49_, 1, (gint) _tmp50_, 1, 2);
-#line 983 "Properties.c"
+#line 984 "Properties.c"
 	} else {
 		GtkWidget* _tmp51_;
 		guint _tmp52_;
@@ -989,7 +990,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		_tmp52_ = self->priv->line_count;
 #line 59 "/home/jens/Source/shotwell/src/Properties.vala"
 		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp51_, 1, (gint) _tmp52_, 1, 1);
-#line 993 "Properties.c"
+#line 994 "Properties.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp53_ = self->priv->line_count;
@@ -999,7 +1000,7 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 	_g_object_unref0 (info);
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (label);
-#line 1003 "Properties.c"
+#line 1004 "Properties.c"
 }
 
 
@@ -1045,7 +1046,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1049 "Properties.c"
+#line 1050 "Properties.c"
 }
 
 
@@ -1063,7 +1064,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1067 "Properties.c"
+#line 1068 "Properties.c"
 }
 
 
@@ -1086,7 +1087,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1090 "Properties.c"
+#line 1091 "Properties.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -1094,7 +1095,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1098 "Properties.c"
+#line 1099 "Properties.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -1106,7 +1107,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1110 "Properties.c"
+#line 1111 "Properties.c"
 	}
 }
 
@@ -1130,21 +1131,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1134 "Properties.c"
+#line 1135 "Properties.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1140 "Properties.c"
+#line 1141 "Properties.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1144 "Properties.c"
+#line 1145 "Properties.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1148 "Properties.c"
+#line 1149 "Properties.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -1156,7 +1157,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1160 "Properties.c"
+#line 1161 "Properties.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -1166,13 +1167,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1170 "Properties.c"
+#line 1171 "Properties.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1176 "Properties.c"
+#line 1177 "Properties.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -1186,7 +1187,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1190 "Properties.c"
+#line 1191 "Properties.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -1196,13 +1197,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1200 "Properties.c"
+#line 1201 "Properties.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1206 "Properties.c"
+#line 1207 "Properties.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1211,7 +1212,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1215 "Properties.c"
+#line 1216 "Properties.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -1231,7 +1232,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1235 "Properties.c"
+#line 1236 "Properties.c"
 }
 
 
@@ -1266,7 +1267,7 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 	_tmp5_ = string_get (_tmp4_, (glong) 0);
 #line 68 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
-#line 1270 "Properties.c"
+#line 1271 "Properties.c"
 		const gchar* _tmp6_;
 		gchar* _tmp7_;
 #line 69 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1277,13 +1278,13 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 		_g_free0 (timestring);
 #line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		timestring = _tmp7_;
-#line 1281 "Properties.c"
+#line 1282 "Properties.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = timestring;
 #line 71 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1287 "Properties.c"
+#line 1288 "Properties.c"
 }
 
 
@@ -1318,7 +1319,7 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 	_tmp5_ = string_get (_tmp4_, (glong) 0);
 #line 77 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
-#line 1322 "Properties.c"
+#line 1323 "Properties.c"
 		const gchar* _tmp6_;
 		gchar* _tmp7_;
 #line 78 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1329,13 +1330,13 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 		_g_free0 (timestring);
 #line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		timestring = _tmp7_;
-#line 1333 "Properties.c"
+#line 1334 "Properties.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = timestring;
 #line 80 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1339 "Properties.c"
+#line 1340 "Properties.c"
 }
 
 
@@ -1350,7 +1351,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 1354 "Properties.c"
+#line 1355 "Properties.c"
 }
 
 
@@ -1387,7 +1388,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 	_tmp6_ = _tmp5_.tm_yday;
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 1391 "Properties.c"
+#line 1392 "Properties.c"
 		struct tm _tmp7_;
 		gint _tmp8_;
 		struct tm _tmp9_;
@@ -1402,15 +1403,15 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 		_tmp10_ = _tmp9_.tm_year;
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 1406 "Properties.c"
+#line 1407 "Properties.c"
 	} else {
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = FALSE;
-#line 1410 "Properties.c"
+#line 1411 "Properties.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp2_) {
-#line 1414 "Properties.c"
+#line 1415 "Properties.c"
 		gchar* _tmp11_;
 #line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = g_strdup (_ ("Today"));
@@ -1418,7 +1419,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 		_g_free0 (date_string);
 #line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		date_string = _tmp11_;
-#line 1422 "Properties.c"
+#line 1423 "Properties.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
 		struct tm _tmp13_;
@@ -1435,7 +1436,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 		_tmp16_ = _tmp15_.tm_yday;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp14_ == (_tmp16_ - 1)) {
-#line 1439 "Properties.c"
+#line 1440 "Properties.c"
 			struct tm _tmp17_;
 			gint _tmp18_;
 			struct tm _tmp19_;
@@ -1450,15 +1451,15 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 			_tmp20_ = _tmp19_.tm_year;
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp12_ = _tmp18_ == _tmp20_;
-#line 1454 "Properties.c"
+#line 1455 "Properties.c"
 		} else {
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp12_ = FALSE;
-#line 1458 "Properties.c"
+#line 1459 "Properties.c"
 		}
 #line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp12_) {
-#line 1462 "Properties.c"
+#line 1463 "Properties.c"
 			gchar* _tmp21_;
 #line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp21_ = g_strdup (_ ("Yesterday"));
@@ -1466,7 +1467,7 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 			_g_free0 (date_string);
 #line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			date_string = _tmp21_;
-#line 1470 "Properties.c"
+#line 1471 "Properties.c"
 		} else {
 			struct tm _tmp22_;
 			gchar* _tmp23_;
@@ -1478,21 +1479,21 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 			_g_free0 (date_string);
 #line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			date_string = _tmp23_;
-#line 1482 "Properties.c"
+#line 1483 "Properties.c"
 		}
 	}
 #line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = date_string;
 #line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1489 "Properties.c"
+#line 1490 "Properties.c"
 }
 
 
 static void properties_real_get_single_properties (Properties* self, DataView* view) {
 #line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 1496 "Properties.c"
+#line 1497 "Properties.c"
 }
 
 
@@ -1501,14 +1502,14 @@ void properties_get_single_properties (Properties* self, DataView* view) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_single_properties (self, view);
-#line 1505 "Properties.c"
+#line 1506 "Properties.c"
 }
 
 
 static void properties_real_get_multiple_properties (Properties* self, GeeIterable* iter) {
 #line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter));
-#line 1512 "Properties.c"
+#line 1513 "Properties.c"
 }
 
 
@@ -1517,7 +1518,7 @@ void properties_get_multiple_properties (Properties* self, GeeIterable* iter) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_multiple_properties (self, iter);
-#line 1521 "Properties.c"
+#line 1522 "Properties.c"
 }
 
 
@@ -1550,7 +1551,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_data_collection_unref0 (view);
 #line 106 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1554 "Properties.c"
+#line 1555 "Properties.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = view;
@@ -1564,7 +1565,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 	_tmp5_ = count;
 #line 111 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ != 0) {
-#line 1568 "Properties.c"
+#line 1569 "Properties.c"
 		ViewCollection* _tmp6_;
 		GeeList* _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1575,7 +1576,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_g_object_unref0 (iter);
 #line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1579 "Properties.c"
+#line 1580 "Properties.c"
 	} else {
 		ViewCollection* _tmp8_;
 		gint _tmp9_;
@@ -1595,7 +1596,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_g_object_unref0 (iter);
 #line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1599 "Properties.c"
+#line 1600 "Properties.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp13_ = iter;
@@ -1603,14 +1604,14 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 	if (_tmp13_ == NULL) {
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = TRUE;
-#line 1607 "Properties.c"
+#line 1608 "Properties.c"
 	} else {
 		gint _tmp14_;
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = count;
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = _tmp14_ == 0;
-#line 1614 "Properties.c"
+#line 1615 "Properties.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp12_) {
@@ -1620,13 +1621,13 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_data_collection_unref0 (view);
 #line 119 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1624 "Properties.c"
+#line 1625 "Properties.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp15_ = count;
 #line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp15_ == 1) {
-#line 1630 "Properties.c"
+#line 1631 "Properties.c"
 		{
 			GeeIterator* _item_it = NULL;
 			GeeIterable* _tmp16_;
@@ -1639,7 +1640,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 			_item_it = _tmp17_;
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			while (TRUE) {
-#line 1643 "Properties.c"
+#line 1644 "Properties.c"
 				GeeIterator* _tmp18_;
 				gboolean _tmp19_;
 				DataView* item = NULL;
@@ -1654,7 +1655,7 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 				if (!_tmp19_) {
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 					break;
-#line 1658 "Properties.c"
+#line 1659 "Properties.c"
 				}
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp20_ = _item_it;
@@ -1670,11 +1671,11 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 				_g_object_unref0 (item);
 #line 124 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 1674 "Properties.c"
+#line 1675 "Properties.c"
 			}
 #line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (_item_it);
-#line 1678 "Properties.c"
+#line 1679 "Properties.c"
 		}
 	} else {
 		GeeIterable* _tmp23_;
@@ -1682,13 +1683,13 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 		_tmp23_ = iter;
 #line 127 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_get_multiple_properties (self, _tmp23_);
-#line 1686 "Properties.c"
+#line 1687 "Properties.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (iter);
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_data_collection_unref0 (view);
-#line 1692 "Properties.c"
+#line 1693 "Properties.c"
 }
 
 
@@ -1697,7 +1698,7 @@ void properties_get_properties (Properties* self, Page* current_page) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_properties (self, current_page);
-#line 1701 "Properties.c"
+#line 1702 "Properties.c"
 }
 
 
@@ -1705,7 +1706,7 @@ static void properties_real_clear_properties (Properties* self) {
 	GList* _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1709 "Properties.c"
+#line 1710 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
@@ -1713,14 +1714,14 @@ static void properties_real_clear_properties (Properties* self) {
 		child_collection = _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1717 "Properties.c"
+#line 1718 "Properties.c"
 			GtkWidget* _tmp1_;
 			GtkWidget* child = NULL;
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1724 "Properties.c"
+#line 1725 "Properties.c"
 			{
 				GtkWidget* _tmp2_;
 #line 133 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -1729,16 +1730,16 @@ static void properties_real_clear_properties (Properties* self) {
 				gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), _tmp2_);
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1733 "Properties.c"
+#line 1734 "Properties.c"
 			}
 		}
 #line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1738 "Properties.c"
+#line 1739 "Properties.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1742 "Properties.c"
+#line 1743 "Properties.c"
 }
 
 
@@ -1747,7 +1748,7 @@ void properties_clear_properties (Properties* self) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 131 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->clear_properties (self);
-#line 1751 "Properties.c"
+#line 1752 "Properties.c"
 }
 
 
@@ -1765,7 +1766,7 @@ void properties_update_properties (Properties* self, Page* page) {
 	properties_internal_update_properties (self, _tmp0_);
 #line 141 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1769 "Properties.c"
+#line 1770 "Properties.c"
 }
 
 
@@ -1777,7 +1778,7 @@ static void properties_real_internal_update_properties (Properties* self, Page*
 	_tmp0_ = page;
 #line 145 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_get_properties (self, _tmp0_);
-#line 1781 "Properties.c"
+#line 1782 "Properties.c"
 }
 
 
@@ -1786,7 +1787,7 @@ void properties_internal_update_properties (Properties* self, Page* page) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->internal_update_properties (self, page);
-#line 1790 "Properties.c"
+#line 1791 "Properties.c"
 }
 
 
@@ -1796,7 +1797,7 @@ void properties_unselect_text (Properties* self) {
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1800 "Properties.c"
+#line 1801 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
@@ -1804,36 +1805,36 @@ void properties_unselect_text (Properties* self) {
 		child_collection = _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1808 "Properties.c"
+#line 1809 "Properties.c"
 			GtkWidget* _tmp1_;
 			GtkWidget* child = NULL;
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1815 "Properties.c"
+#line 1816 "Properties.c"
 			{
 				GtkWidget* _tmp2_;
 #line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp2_ = child;
 #line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ())) {
-#line 1822 "Properties.c"
+#line 1823 "Properties.c"
 					GtkWidget* _tmp3_;
 #line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp3_ = child;
 #line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					gtk_label_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_label_get_type (), GtkLabel), 0, 0);
-#line 1828 "Properties.c"
+#line 1829 "Properties.c"
 				}
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1832 "Properties.c"
+#line 1833 "Properties.c"
 			}
 		}
 #line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1837 "Properties.c"
+#line 1838 "Properties.c"
 	}
 }
 
@@ -1855,7 +1856,7 @@ static void properties_class_init (PropertiesClass * klass) {
 	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) properties_real_internal_update_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = properties_finalize;
-#line 1859 "Properties.c"
+#line 1860 "Properties.c"
 }
 
 
@@ -1864,7 +1865,7 @@ static void properties_instance_init (Properties * self) {
 	self->priv = PROPERTIES_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1868 "Properties.c"
+#line 1869 "Properties.c"
 }
 
 
@@ -1874,7 +1875,7 @@ static void properties_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROPERTIES, Properties);
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (properties_parent_class)->finalize (obj);
-#line 1878 "Properties.c"
+#line 1879 "Properties.c"
 }
 
 
@@ -1896,14 +1897,14 @@ BasicProperties* basic_properties_construct (GType object_type) {
 	self = (BasicProperties*) properties_construct (object_type);
 #line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 1900 "Properties.c"
+#line 1901 "Properties.c"
 }
 
 
 BasicProperties* basic_properties_new (void) {
 #line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return basic_properties_construct (TYPE_BASIC_PROPERTIES);
-#line 1907 "Properties.c"
+#line 1908 "Properties.c"
 }
 
 
@@ -1969,14 +1970,14 @@ static void basic_properties_real_clear_properties (Properties* base) {
 	_g_free0 (self->priv->raw_assoc);
 #line 188 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->raw_assoc = _tmp5_;
-#line 1973 "Properties.c"
+#line 1974 "Properties.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 1980 "Properties.c"
+#line 1981 "Properties.c"
 }
 
 
@@ -2018,18 +2019,18 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_SOURCE)) {
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = TRUE;
-#line 2022 "Properties.c"
+#line 2023 "Properties.c"
 	} else {
 		DataSource* _tmp7_;
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = source;
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2029 "Properties.c"
+#line 2030 "Properties.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_) {
-#line 2033 "Properties.c"
+#line 2034 "Properties.c"
 		time_t _tmp8_ = 0;
 		DataSource* _tmp9_;
 		time_t _tmp14_;
@@ -2045,7 +2046,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		_tmp9_ = source;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_SOURCE)) {
-#line 2049 "Properties.c"
+#line 2050 "Properties.c"
 			DataSource* _tmp10_;
 			time_t _tmp11_;
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2054,7 +2055,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp11_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp11_;
-#line 2058 "Properties.c"
+#line 2059 "Properties.c"
 		} else {
 			DataSource* _tmp12_;
 			time_t _tmp13_;
@@ -2064,7 +2065,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp13_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp13_;
-#line 2068 "Properties.c"
+#line 2069 "Properties.c"
 		}
 #line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp8_;
@@ -2076,7 +2077,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		_tmp16_ = source;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_SOURCE)) {
-#line 2080 "Properties.c"
+#line 2081 "Properties.c"
 			DataSource* _tmp17_;
 			PhotoMetadata* _tmp18_;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2087,7 +2088,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_media_metadata_unref0 (_tmp15_);
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp18_;
-#line 2091 "Properties.c"
+#line 2092 "Properties.c"
 		} else {
 			DataSource* _tmp19_;
 			PhotoMetadata* _tmp20_;
@@ -2099,7 +2100,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_media_metadata_unref0 (_tmp15_);
 #line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp20_;
-#line 2103 "Properties.c"
+#line 2104 "Properties.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp21_ = _media_metadata_ref0 (_tmp15_);
@@ -2109,7 +2110,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		_tmp22_ = metadata;
 #line 206 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp22_ != NULL) {
-#line 2113 "Properties.c"
+#line 2114 "Properties.c"
 			PhotoMetadata* _tmp23_;
 			gchar* _tmp24_;
 			const gchar* _tmp25_;
@@ -2136,7 +2137,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp25_ = self->priv->exposure;
 #line 208 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp25_ == NULL) {
-#line 2140 "Properties.c"
+#line 2141 "Properties.c"
 				gchar* _tmp26_;
 #line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp26_ = g_strdup ("");
@@ -2144,7 +2145,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				_g_free0 (self->priv->exposure);
 #line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->exposure = _tmp26_;
-#line 2148 "Properties.c"
+#line 2149 "Properties.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = metadata;
@@ -2158,7 +2159,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp29_ = self->priv->aperture;
 #line 212 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp29_ == NULL) {
-#line 2162 "Properties.c"
+#line 2163 "Properties.c"
 				gchar* _tmp30_;
 #line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = g_strdup ("");
@@ -2166,7 +2167,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				_g_free0 (self->priv->aperture);
 #line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->aperture = _tmp30_;
-#line 2170 "Properties.c"
+#line 2171 "Properties.c"
 			}
 #line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = metadata;
@@ -2180,7 +2181,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp33_ = self->priv->iso;
 #line 216 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp33_ == NULL) {
-#line 2184 "Properties.c"
+#line 2185 "Properties.c"
 				gchar* _tmp34_;
 #line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp34_ = g_strdup ("");
@@ -2188,7 +2189,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				_g_free0 (self->priv->iso);
 #line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->iso = _tmp34_;
-#line 2192 "Properties.c"
+#line 2193 "Properties.c"
 			}
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = metadata;
@@ -2202,7 +2203,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_dimensions_free0 (_tmp38_);
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp39_) {
-#line 2206 "Properties.c"
+#line 2207 "Properties.c"
 				PhotoMetadata* _tmp40_;
 				Orientation _tmp41_;
 				PhotoMetadata* _tmp42_;
@@ -2228,21 +2229,21 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				_tmp35_ = _tmp46_;
 #line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_dimensions_free0 (_tmp44_);
-#line 2232 "Properties.c"
+#line 2233 "Properties.c"
 			} else {
 #line 221 "/home/jens/Source/shotwell/src/Properties.vala"
 				dimensions_init (&_tmp35_, 0, 0);
-#line 2236 "Properties.c"
+#line 2237 "Properties.c"
 			}
 #line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp35_;
-#line 2240 "Properties.c"
+#line 2241 "Properties.c"
 		}
 #line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp47_ = source;
 #line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, TYPE_PHOTO_SOURCE)) {
-#line 2246 "Properties.c"
+#line 2247 "Properties.c"
 			DataSource* _tmp48_;
 			Dimensions _tmp49_ = {0};
 #line 225 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2251,13 +2252,13 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp49_);
 #line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp49_;
-#line 2255 "Properties.c"
+#line 2256 "Properties.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp51_ = source;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_PHOTO)) {
-#line 2261 "Properties.c"
+#line 2262 "Properties.c"
 			DataSource* _tmp52_;
 			PhotoFileFormat _tmp53_;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2266,15 +2267,15 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			_tmp53_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo));
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = _tmp53_ == PHOTO_FILE_FORMAT_RAW;
-#line 2270 "Properties.c"
+#line 2271 "Properties.c"
 		} else {
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = FALSE;
-#line 2274 "Properties.c"
+#line 2275 "Properties.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp50_) {
-#line 2278 "Properties.c"
+#line 2279 "Properties.c"
 			Photo* photo = NULL;
 			DataSource* _tmp54_;
 			Photo* _tmp55_;
@@ -2309,11 +2310,11 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			if (_tmp61_) {
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp59_ = _ ("RAW+JPEG");
-#line 2313 "Properties.c"
+#line 2314 "Properties.c"
 			} else {
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp59_ = "";
-#line 2317 "Properties.c"
+#line 2318 "Properties.c"
 			}
 #line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp62_ = g_strdup (_tmp59_);
@@ -2323,20 +2324,20 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			self->priv->raw_assoc = _tmp62_;
 #line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 2327 "Properties.c"
+#line 2328 "Properties.c"
 		}
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (metadata);
 #line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (_tmp15_);
-#line 2333 "Properties.c"
+#line 2334 "Properties.c"
 	} else {
 		DataSource* _tmp63_;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp63_ = source;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, TYPE_EVENT_SOURCE)) {
-#line 2340 "Properties.c"
+#line 2341 "Properties.c"
 			EventSource* event_source = NULL;
 			DataSource* _tmp64_;
 			EventSource* _tmp65_;
@@ -2395,7 +2396,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			self->priv->video_count = _tmp76_;
 #line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event_source);
-#line 2399 "Properties.c"
+#line 2400 "Properties.c"
 		} else {
 			gboolean _tmp77_ = FALSE;
 			DataSource* _tmp78_;
@@ -2405,25 +2406,25 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_VIDEO_SOURCE)) {
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp77_ = TRUE;
-#line 2409 "Properties.c"
+#line 2410 "Properties.c"
 			} else {
 				DataSource* _tmp79_;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp79_ = source;
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp77_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2416 "Properties.c"
+#line 2417 "Properties.c"
 			}
 #line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp77_) {
-#line 2420 "Properties.c"
+#line 2421 "Properties.c"
 				DataSource* _tmp80_;
 				time_t _tmp93_;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp80_ = source;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_VIDEO_SOURCE)) {
-#line 2427 "Properties.c"
+#line 2428 "Properties.c"
 					Video* video = NULL;
 					DataSource* _tmp81_;
 					Video* _tmp82_;
@@ -2451,7 +2452,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 					_tmp86_ = video_get_is_interpretable (_tmp85_);
 #line 250 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp86_) {
-#line 2455 "Properties.c"
+#line 2456 "Properties.c"
 						Video* _tmp87_;
 						Dimensions _tmp88_ = {0};
 #line 251 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2460,7 +2461,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 						video_get_frame_dimensions (_tmp87_, &_tmp88_);
 #line 251 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->dimensions = _tmp88_;
-#line 2464 "Properties.c"
+#line 2465 "Properties.c"
 					}
 #line 253 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp89_ = video;
@@ -2470,7 +2471,7 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 					self->priv->start_time = _tmp90_;
 #line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (video);
-#line 2474 "Properties.c"
+#line 2475 "Properties.c"
 				} else {
 					DataSource* _tmp91_;
 					time_t _tmp92_;
@@ -2480,19 +2481,19 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 					_tmp92_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 255 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->start_time = _tmp92_;
-#line 2484 "Properties.c"
+#line 2485 "Properties.c"
 				}
 #line 257 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp93_ = self->priv->start_time;
 #line 257 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->end_time = _tmp93_;
-#line 2490 "Properties.c"
+#line 2491 "Properties.c"
 			}
 		}
 	}
 #line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 2496 "Properties.c"
+#line 2497 "Properties.c"
 }
 
 
@@ -2511,7 +2512,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 	self->priv->photo_count = 0;
 #line 265 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->video_count = 0;
-#line 2515 "Properties.c"
+#line 2516 "Properties.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_;
@@ -2524,7 +2525,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 		_view_it = _tmp2_;
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		while (TRUE) {
-#line 2528 "Properties.c"
+#line 2529 "Properties.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			DataView* view = NULL;
@@ -2543,7 +2544,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			if (!_tmp4_) {
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 2547 "Properties.c"
+#line 2548 "Properties.c"
 			}
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = _view_it;
@@ -2563,18 +2564,18 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO_SOURCE)) {
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = TRUE;
-#line 2567 "Properties.c"
+#line 2568 "Properties.c"
 			} else {
 				DataSource* _tmp11_;
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp11_ = source;
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2574 "Properties.c"
+#line 2575 "Properties.c"
 			}
 #line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp9_) {
-#line 2578 "Properties.c"
+#line 2579 "Properties.c"
 				time_t _tmp12_ = 0;
 				DataSource* _tmp13_;
 				time_t exposure_time = 0;
@@ -2584,7 +2585,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 				_tmp13_ = source;
 #line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO_SOURCE)) {
-#line 2588 "Properties.c"
+#line 2589 "Properties.c"
 					DataSource* _tmp14_;
 					time_t _tmp15_;
 #line 271 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2593,7 +2594,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					_tmp15_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp15_;
-#line 2597 "Properties.c"
+#line 2598 "Properties.c"
 				} else {
 					DataSource* _tmp16_;
 					time_t _tmp17_;
@@ -2603,7 +2604,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					_tmp17_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp17_;
-#line 2607 "Properties.c"
+#line 2608 "Properties.c"
 				}
 #line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				exposure_time = _tmp12_;
@@ -2611,7 +2612,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 				_tmp18_ = exposure_time;
 #line 274 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (_tmp18_ != ((time_t) 0)) {
-#line 2615 "Properties.c"
+#line 2616 "Properties.c"
 					gboolean _tmp19_ = FALSE;
 					time_t _tmp20_;
 					gboolean _tmp24_ = FALSE;
@@ -2622,7 +2623,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp20_ == ((time_t) 0)) {
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = TRUE;
-#line 2626 "Properties.c"
+#line 2627 "Properties.c"
 					} else {
 						time_t _tmp21_;
 						time_t _tmp22_;
@@ -2632,17 +2633,17 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp22_ = self->priv->start_time;
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = _tmp21_ < _tmp22_;
-#line 2636 "Properties.c"
+#line 2637 "Properties.c"
 					}
 #line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp19_) {
-#line 2640 "Properties.c"
+#line 2641 "Properties.c"
 						time_t _tmp23_;
 #line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp23_ = exposure_time;
 #line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp23_;
-#line 2646 "Properties.c"
+#line 2647 "Properties.c"
 					}
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp25_ = self->priv->end_time;
@@ -2650,7 +2651,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp25_ == ((time_t) 0)) {
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = TRUE;
-#line 2654 "Properties.c"
+#line 2655 "Properties.c"
 					} else {
 						time_t _tmp26_;
 						time_t _tmp27_;
@@ -2660,31 +2661,31 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp27_ = self->priv->end_time;
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = _tmp26_ > _tmp27_;
-#line 2664 "Properties.c"
+#line 2665 "Properties.c"
 					}
 #line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp24_) {
-#line 2668 "Properties.c"
+#line 2669 "Properties.c"
 						time_t _tmp28_;
 #line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp28_ = exposure_time;
 #line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp28_;
-#line 2674 "Properties.c"
+#line 2675 "Properties.c"
 					}
 				}
 #line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp29_ = self->priv->photo_count;
 #line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->photo_count = _tmp29_ + 1;
-#line 2681 "Properties.c"
+#line 2682 "Properties.c"
 			} else {
 				DataSource* _tmp30_;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = source;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT_SOURCE)) {
-#line 2688 "Properties.c"
+#line 2689 "Properties.c"
 					EventSource* event_source = NULL;
 					DataSource* _tmp31_;
 					EventSource* _tmp32_;
@@ -2719,7 +2720,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp33_ == -1) {
 #line 287 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->event_count = 0;
-#line 2723 "Properties.c"
+#line 2724 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp36_ = self->priv->start_time;
@@ -2727,7 +2728,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp36_ == ((time_t) 0)) {
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = TRUE;
-#line 2731 "Properties.c"
+#line 2732 "Properties.c"
 					} else {
 						EventSource* _tmp37_;
 						time_t _tmp38_;
@@ -2740,11 +2741,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp39_ = self->priv->start_time;
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = _tmp38_ < _tmp39_;
-#line 2744 "Properties.c"
+#line 2745 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp35_) {
-#line 2748 "Properties.c"
+#line 2749 "Properties.c"
 						EventSource* _tmp40_;
 						time_t _tmp41_;
 #line 290 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2753,15 +2754,15 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp41_ = event_source_get_start_time (_tmp40_);
 #line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = _tmp41_ != ((time_t) 0);
-#line 2757 "Properties.c"
+#line 2758 "Properties.c"
 					} else {
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = FALSE;
-#line 2761 "Properties.c"
+#line 2762 "Properties.c"
 					}
 #line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp34_) {
-#line 2765 "Properties.c"
+#line 2766 "Properties.c"
 						EventSource* _tmp42_;
 						time_t _tmp43_;
 #line 291 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2770,7 +2771,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp43_ = event_source_get_start_time (_tmp42_);
 #line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp43_;
-#line 2774 "Properties.c"
+#line 2775 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp46_ = self->priv->end_time;
@@ -2778,7 +2779,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (_tmp46_ == ((time_t) 0)) {
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = TRUE;
-#line 2782 "Properties.c"
+#line 2783 "Properties.c"
 					} else {
 						EventSource* _tmp47_;
 						time_t _tmp48_;
@@ -2791,11 +2792,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp49_ = self->priv->end_time;
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = _tmp48_ > _tmp49_;
-#line 2795 "Properties.c"
+#line 2796 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp45_) {
-#line 2799 "Properties.c"
+#line 2800 "Properties.c"
 						EventSource* _tmp50_;
 						time_t _tmp51_;
 #line 294 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2804,15 +2805,15 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp51_ = event_source_get_end_time (_tmp50_);
 #line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = _tmp51_ != ((time_t) 0);
-#line 2808 "Properties.c"
+#line 2809 "Properties.c"
 					} else {
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = FALSE;
-#line 2812 "Properties.c"
+#line 2813 "Properties.c"
 					}
 #line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp44_) {
-#line 2816 "Properties.c"
+#line 2817 "Properties.c"
 						EventSource* _tmp52_;
 						time_t _tmp53_;
 #line 295 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2821,7 +2822,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp53_ = event_source_get_end_time (_tmp52_);
 #line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp53_;
-#line 2825 "Properties.c"
+#line 2826 "Properties.c"
 					} else {
 						gboolean _tmp54_ = FALSE;
 						time_t _tmp55_;
@@ -2831,7 +2832,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						if (_tmp55_ == ((time_t) 0)) {
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = TRUE;
-#line 2835 "Properties.c"
+#line 2836 "Properties.c"
 						} else {
 							EventSource* _tmp56_;
 							time_t _tmp57_;
@@ -2844,11 +2845,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							_tmp58_ = self->priv->end_time;
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = _tmp57_ > _tmp58_;
-#line 2848 "Properties.c"
+#line 2849 "Properties.c"
 						}
 #line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp54_) {
-#line 2852 "Properties.c"
+#line 2853 "Properties.c"
 							EventSource* _tmp59_;
 							time_t _tmp60_;
 #line 297 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2857,7 +2858,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							_tmp60_ = event_source_get_start_time (_tmp59_);
 #line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							self->priv->end_time = _tmp60_;
-#line 2861 "Properties.c"
+#line 2862 "Properties.c"
 						}
 					}
 #line 302 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2892,7 +2893,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					self->priv->event_count = _tmp70_ + 1;
 #line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (event_source);
-#line 2896 "Properties.c"
+#line 2897 "Properties.c"
 				} else {
 					gboolean _tmp71_ = FALSE;
 					DataSource* _tmp72_;
@@ -2902,18 +2903,18 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_SOURCE)) {
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = TRUE;
-#line 2906 "Properties.c"
+#line 2907 "Properties.c"
 					} else {
 						DataSource* _tmp73_;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp73_ = source;
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2913 "Properties.c"
+#line 2914 "Properties.c"
 					}
 #line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp71_) {
-#line 2917 "Properties.c"
+#line 2918 "Properties.c"
 						time_t _tmp74_ = 0;
 						DataSource* _tmp75_;
 						time_t exposure_time = 0;
@@ -2923,7 +2924,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp75_ = source;
 #line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_SOURCE)) {
-#line 2927 "Properties.c"
+#line 2928 "Properties.c"
 							DataSource* _tmp76_;
 							time_t _tmp77_;
 #line 310 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -2932,7 +2933,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							_tmp77_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_VIDEO_SOURCE, VideoSource), TYPE_MEDIA_SOURCE, MediaSource));
 #line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp77_;
-#line 2936 "Properties.c"
+#line 2937 "Properties.c"
 						} else {
 							DataSource* _tmp78_;
 							time_t _tmp79_;
@@ -2942,7 +2943,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							_tmp79_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
 #line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp79_;
-#line 2946 "Properties.c"
+#line 2947 "Properties.c"
 						}
 #line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						exposure_time = _tmp74_;
@@ -2950,7 +2951,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 						_tmp80_ = exposure_time;
 #line 313 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp80_ != ((time_t) 0)) {
-#line 2954 "Properties.c"
+#line 2955 "Properties.c"
 							gboolean _tmp81_ = FALSE;
 							time_t _tmp82_;
 							gboolean _tmp86_ = FALSE;
@@ -2961,7 +2962,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							if (_tmp82_ == ((time_t) 0)) {
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = TRUE;
-#line 2965 "Properties.c"
+#line 2966 "Properties.c"
 							} else {
 								time_t _tmp83_;
 								time_t _tmp84_;
@@ -2971,17 +2972,17 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 								_tmp84_ = self->priv->start_time;
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = _tmp83_ < _tmp84_;
-#line 2975 "Properties.c"
+#line 2976 "Properties.c"
 							}
 #line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp81_) {
-#line 2979 "Properties.c"
+#line 2980 "Properties.c"
 								time_t _tmp85_;
 #line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp85_ = exposure_time;
 #line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->start_time = _tmp85_;
-#line 2985 "Properties.c"
+#line 2986 "Properties.c"
 							}
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp87_ = self->priv->end_time;
@@ -2989,7 +2990,7 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 							if (_tmp87_ == ((time_t) 0)) {
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = TRUE;
-#line 2993 "Properties.c"
+#line 2994 "Properties.c"
 							} else {
 								time_t _tmp88_;
 								time_t _tmp89_;
@@ -2999,24 +3000,24 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 								_tmp89_ = self->priv->end_time;
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = _tmp88_ > _tmp89_;
-#line 3003 "Properties.c"
+#line 3004 "Properties.c"
 							}
 #line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp86_) {
-#line 3007 "Properties.c"
+#line 3008 "Properties.c"
 								time_t _tmp90_;
 #line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp90_ = exposure_time;
 #line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->end_time = _tmp90_;
-#line 3013 "Properties.c"
+#line 3014 "Properties.c"
 							}
 						}
 #line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp91_ = self->priv->video_count;
 #line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->video_count = _tmp91_ + 1;
-#line 3020 "Properties.c"
+#line 3021 "Properties.c"
 					}
 				}
 			}
@@ -3024,11 +3025,11 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			_g_object_unref0 (source);
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (view);
-#line 3028 "Properties.c"
+#line 3029 "Properties.c"
 		}
 #line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_view_it);
-#line 3032 "Properties.c"
+#line 3033 "Properties.c"
 	}
 }
 
@@ -3050,25 +3051,25 @@ static void basic_properties_real_get_properties (Properties* base, Page* curren
 	_tmp1_ = self->priv->end_time;
 #line 329 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ == ((time_t) 0)) {
-#line 3054 "Properties.c"
+#line 3055 "Properties.c"
 		time_t _tmp2_;
 #line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = self->priv->start_time;
 #line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->end_time = _tmp2_;
-#line 3060 "Properties.c"
+#line 3061 "Properties.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = self->priv->start_time;
 #line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 3066 "Properties.c"
+#line 3067 "Properties.c"
 		time_t _tmp4_;
 #line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = self->priv->end_time;
 #line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp4_;
-#line 3072 "Properties.c"
+#line 3073 "Properties.c"
 	}
 }
 
@@ -3101,21 +3102,21 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 	_tmp2_ = self->priv->title;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp2_, "") == 0) {
-#line 3105 "Properties.c"
+#line 3106 "Properties.c"
 		Page* _tmp3_;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp3_ = page;
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_TAG_PAGE);
-#line 3111 "Properties.c"
+#line 3112 "Properties.c"
 	} else {
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = FALSE;
-#line 3115 "Properties.c"
+#line 3116 "Properties.c"
 	}
 #line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_) {
-#line 3119 "Properties.c"
+#line 3120 "Properties.c"
 		Page* _tmp4_;
 		Tag* _tmp5_;
 		Tag* _tmp6_;
@@ -3134,13 +3135,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		self->priv->title = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3138 "Properties.c"
+#line 3139 "Properties.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = self->priv->title;
 #line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp8_, "") != 0) {
-#line 3144 "Properties.c"
+#line 3145 "Properties.c"
 		const gchar* _tmp9_;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
@@ -3154,7 +3155,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Title:"), _tmp11_, FALSE);
 #line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp11_);
-#line 3158 "Properties.c"
+#line 3159 "Properties.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp13_ = self->priv->photo_count;
@@ -3162,18 +3163,18 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 	if (_tmp13_ >= 0) {
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = TRUE;
-#line 3166 "Properties.c"
+#line 3167 "Properties.c"
 	} else {
 		gint _tmp14_;
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = self->priv->video_count;
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = _tmp14_ >= 0;
-#line 3173 "Properties.c"
+#line 3174 "Properties.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp12_) {
-#line 3177 "Properties.c"
+#line 3178 "Properties.c"
 		gchar* label = NULL;
 		gchar* _tmp15_;
 		gint _tmp16_;
@@ -3198,7 +3199,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp16_ = self->priv->event_count;
 #line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp16_ >= 0) {
-#line 3202 "Properties.c"
+#line 3203 "Properties.c"
 			gchar* event_num_string = NULL;
 			gint _tmp17_;
 			gint _tmp18_;
@@ -3228,7 +3229,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			label = _tmp22_;
 #line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (event_num_string);
-#line 3232 "Properties.c"
+#line 3233 "Properties.c"
 		}
 #line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp23_ = self->priv->photo_count;
@@ -3250,21 +3251,21 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp30_ = self->priv->photo_count;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp30_ == 0) {
-#line 3254 "Properties.c"
+#line 3255 "Properties.c"
 			gint _tmp31_;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = self->priv->video_count;
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp29_ = _tmp31_ > 0;
-#line 3260 "Properties.c"
+#line 3261 "Properties.c"
 		} else {
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp29_ = FALSE;
-#line 3264 "Properties.c"
+#line 3265 "Properties.c"
 		}
 #line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp29_) {
-#line 3268 "Properties.c"
+#line 3269 "Properties.c"
 			const gchar* _tmp32_;
 			const gchar* _tmp33_;
 #line 362 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3281,7 +3282,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_g_free0 (label);
 #line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 3285 "Properties.c"
+#line 3286 "Properties.c"
 		}
 #line 366 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp34_ = label;
@@ -3293,13 +3294,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp36_ = self->priv->video_count;
 #line 368 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp36_ > 0) {
-#line 3297 "Properties.c"
+#line 3298 "Properties.c"
 			const gchar* _tmp37_;
 #line 369 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = video_num_string;
 #line 369 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp37_, FALSE);
-#line 3303 "Properties.c"
+#line 3304 "Properties.c"
 		}
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (video_num_string);
@@ -3307,13 +3308,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_g_free0 (photo_num_string);
 #line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3311 "Properties.c"
+#line 3312 "Properties.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp38_ = self->priv->start_time;
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp38_ != ((time_t) 0)) {
-#line 3317 "Properties.c"
+#line 3318 "Properties.c"
 		gchar* start_date = NULL;
 		time_t _tmp39_;
 		struct tm _tmp40_ = {0};
@@ -3370,7 +3371,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp52_ = end_date;
 #line 378 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp51_, _tmp52_) == 0) {
-#line 3374 "Properties.c"
+#line 3375 "Properties.c"
 			const gchar* _tmp53_;
 			const gchar* _tmp54_;
 			const gchar* _tmp55_;
@@ -3384,13 +3385,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_tmp55_ = end_time;
 #line 382 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (g_strcmp0 (_tmp54_, _tmp55_) == 0) {
-#line 3388 "Properties.c"
+#line 3389 "Properties.c"
 				const gchar* _tmp56_;
 #line 384 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp56_ = start_time;
 #line 384 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Time:"), _tmp56_, FALSE);
-#line 3394 "Properties.c"
+#line 3395 "Properties.c"
 			} else {
 				const gchar* _tmp57_;
 				const gchar* _tmp58_;
@@ -3402,7 +3403,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 				_tmp58_ = end_time;
 #line 388 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp58_, FALSE);
-#line 3406 "Properties.c"
+#line 3407 "Properties.c"
 			}
 		} else {
 			const gchar* _tmp59_;
@@ -3415,7 +3416,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_tmp60_ = end_date;
 #line 393 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("To:"), _tmp60_, FALSE);
-#line 3419 "Properties.c"
+#line 3420 "Properties.c"
 		}
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (end_time);
@@ -3425,13 +3426,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_g_free0 (start_time);
 #line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (start_date);
-#line 3429 "Properties.c"
+#line 3430 "Properties.c"
 	}
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp61_ = dimensions_has_area (&self->priv->dimensions);
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp61_) {
-#line 3435 "Properties.c"
+#line 3436 "Properties.c"
 		gchar* label = NULL;
 		gchar* _tmp62_;
 		gboolean _tmp63_;
@@ -3443,7 +3444,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp63_ = dimensions_has_area (&self->priv->dimensions);
 #line 400 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp63_) {
-#line 3447 "Properties.c"
+#line 3448 "Properties.c"
 			const gchar* _tmp64_;
 			Dimensions _tmp65_;
 			gint _tmp66_;
@@ -3476,17 +3477,17 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_g_free0 (label);
 #line 402 "/home/jens/Source/shotwell/src/Properties.vala"
 			label = _tmp71_;
-#line 3480 "Properties.c"
+#line 3481 "Properties.c"
 		}
 #line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3484 "Properties.c"
+#line 3485 "Properties.c"
 	}
 #line 406 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp72_ = self->priv->clip_duration;
 #line 406 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp72_ > 0.0) {
-#line 3490 "Properties.c"
+#line 3491 "Properties.c"
 		gdouble _tmp73_;
 		gchar* _tmp74_;
 		gchar* _tmp75_;
@@ -3500,31 +3501,31 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Duration:"), _tmp75_, FALSE);
 #line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp75_);
-#line 3504 "Properties.c"
+#line 3505 "Properties.c"
 	}
 #line 410 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp76_ = self->priv->raw_developer;
 #line 410 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp76_, "") != 0) {
-#line 3510 "Properties.c"
+#line 3511 "Properties.c"
 		const gchar* _tmp77_;
 #line 411 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp77_ = self->priv->raw_developer;
 #line 411 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Developer:"), _tmp77_, FALSE);
-#line 3516 "Properties.c"
+#line 3517 "Properties.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp78_ = self->priv->raw_assoc;
 #line 415 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp78_, "") != 0) {
-#line 3522 "Properties.c"
+#line 3523 "Properties.c"
 		const gchar* _tmp79_;
 #line 416 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp79_ = self->priv->raw_assoc;
 #line 416 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp79_, FALSE);
-#line 3528 "Properties.c"
+#line 3529 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp82_ = self->priv->exposure;
@@ -3532,31 +3533,31 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 	if (g_strcmp0 (_tmp82_, "") != 0) {
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp81_ = TRUE;
-#line 3536 "Properties.c"
+#line 3537 "Properties.c"
 	} else {
 		const gchar* _tmp83_;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp83_ = self->priv->aperture;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp81_ = g_strcmp0 (_tmp83_, "") != 0;
-#line 3543 "Properties.c"
+#line 3544 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp81_) {
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp80_ = TRUE;
-#line 3549 "Properties.c"
+#line 3550 "Properties.c"
 	} else {
 		const gchar* _tmp84_;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp84_ = self->priv->iso;
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp80_ = g_strcmp0 (_tmp84_, "") != 0;
-#line 3556 "Properties.c"
+#line 3557 "Properties.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp80_) {
-#line 3560 "Properties.c"
+#line 3561 "Properties.c"
 		gchar* line = NULL;
 		const gchar* _tmp85_;
 		const gchar* _tmp88_;
@@ -3569,7 +3570,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		_tmp85_ = self->priv->exposure;
 #line 422 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp85_, "") != 0) {
-#line 3573 "Properties.c"
+#line 3574 "Properties.c"
 			const gchar* _tmp86_;
 			gchar* _tmp87_;
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3580,19 +3581,19 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_g_free0 (line);
 #line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			line = _tmp87_;
-#line 3584 "Properties.c"
+#line 3585 "Properties.c"
 		}
 #line 425 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp88_ = self->priv->aperture;
 #line 425 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp88_, "") != 0) {
-#line 3590 "Properties.c"
+#line 3591 "Properties.c"
 			const gchar* _tmp89_;
 #line 426 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp89_ = line;
 #line 426 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp89_ != NULL) {
-#line 3596 "Properties.c"
+#line 3597 "Properties.c"
 				const gchar* _tmp90_;
 				const gchar* _tmp91_;
 				gchar* _tmp92_;
@@ -3614,7 +3615,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 				line = _tmp94_;
 #line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (_tmp93_);
-#line 3618 "Properties.c"
+#line 3619 "Properties.c"
 			} else {
 				const gchar* _tmp95_;
 				gchar* _tmp96_;
@@ -3626,7 +3627,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 				_g_free0 (line);
 #line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp96_;
-#line 3630 "Properties.c"
+#line 3631 "Properties.c"
 			}
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -3635,39 +3636,39 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		if (g_strcmp0 (_tmp99_, "") == 0) {
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp98_ = TRUE;
-#line 3639 "Properties.c"
+#line 3640 "Properties.c"
 		} else {
 			const gchar* _tmp100_;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp100_ = self->priv->aperture;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp98_ = g_strcmp0 (_tmp100_, "") == 0;
-#line 3646 "Properties.c"
+#line 3647 "Properties.c"
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp98_) {
-#line 3650 "Properties.c"
+#line 3651 "Properties.c"
 			const gchar* _tmp101_;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp101_ = self->priv->iso;
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp97_ = g_strcmp0 (_tmp101_, "") != 0;
-#line 3656 "Properties.c"
+#line 3657 "Properties.c"
 		} else {
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp97_ = FALSE;
-#line 3660 "Properties.c"
+#line 3661 "Properties.c"
 		}
 #line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp97_) {
-#line 3664 "Properties.c"
+#line 3665 "Properties.c"
 			const gchar* _tmp102_;
 			const gchar* _tmp110_;
 #line 434 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp102_ = line;
 #line 434 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp102_ != NULL) {
-#line 3671 "Properties.c"
+#line 3672 "Properties.c"
 				const gchar* _tmp103_;
 				const gchar* _tmp104_;
 				gchar* _tmp105_;
@@ -3689,7 +3690,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 				line = _tmp107_;
 #line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (_tmp106_);
-#line 3693 "Properties.c"
+#line 3694 "Properties.c"
 			} else {
 				const gchar* _tmp108_;
 				gchar* _tmp109_;
@@ -3701,13 +3702,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 				_g_free0 (line);
 #line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp109_;
-#line 3705 "Properties.c"
+#line 3706 "Properties.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp110_ = line;
 #line 439 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp110_, FALSE);
-#line 3711 "Properties.c"
+#line 3712 "Properties.c"
 		} else {
 			const gchar* _tmp111_;
 			const gchar* _tmp113_;
@@ -3715,25 +3716,25 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			_tmp111_ = line;
 #line 442 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp111_ != NULL) {
-#line 3719 "Properties.c"
+#line 3720 "Properties.c"
 				const gchar* _tmp112_;
 #line 443 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp112_ = line;
 #line 443 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp112_, FALSE);
-#line 3725 "Properties.c"
+#line 3726 "Properties.c"
 			}
 #line 446 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp113_ = self->priv->iso;
 #line 446 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (g_strcmp0 (_tmp113_, "") != 0) {
-#line 3731 "Properties.c"
+#line 3732 "Properties.c"
 				const gchar* _tmp114_;
 #line 447 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp114_ = line;
 #line 447 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (_tmp114_ != NULL) {
-#line 3737 "Properties.c"
+#line 3738 "Properties.c"
 					const gchar* _tmp115_;
 					gchar* _tmp116_;
 					gchar* _tmp117_;
@@ -3747,7 +3748,7 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp117_, FALSE);
 #line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_free0 (_tmp117_);
-#line 3751 "Properties.c"
+#line 3752 "Properties.c"
 				} else {
 					const gchar* _tmp118_;
 					gchar* _tmp119_;
@@ -3762,13 +3763,13 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure:"), _tmp120_, FALSE);
 #line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_free0 (_tmp120_);
-#line 3766 "Properties.c"
+#line 3767 "Properties.c"
 				}
 			}
 		}
 #line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (line);
-#line 3772 "Properties.c"
+#line 3773 "Properties.c"
 	}
 }
 
@@ -3790,7 +3791,7 @@ static void basic_properties_class_init (BasicPropertiesClass * klass) {
 	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) basic_properties_real_internal_update_properties;
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = basic_properties_finalize;
-#line 3794 "Properties.c"
+#line 3795 "Properties.c"
 }
 
 
@@ -3807,7 +3808,7 @@ static void basic_properties_instance_init (BasicProperties * self) {
 	_tmp1_ = time (NULL);
 #line 159 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->end_time = _tmp1_;
-#line 3811 "Properties.c"
+#line 3812 "Properties.c"
 }
 
 
@@ -3829,7 +3830,7 @@ static void basic_properties_finalize (GObject * obj) {
 	_g_free0 (self->priv->raw_assoc);
 #line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (basic_properties_parent_class)->finalize (obj);
-#line 3833 "Properties.c"
+#line 3834 "Properties.c"
 }
 
 
@@ -3848,19 +3849,18 @@ GType basic_properties_get_type (void) {
 static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = gtk_widget_hide_on_delete ((GtkWidget*) self);
-#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 647 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 3854 "Properties.c"
+#line 3855 "Properties.c"
 }
 
 
 ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner) {
 	ExtendedPropertiesWindow * self = NULL;
-	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
-	gboolean _tmp2_;
-	GtkWindow* _tmp3_;
+	gint _tmp0_;
+	GtkWindow* _tmp1_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp2_;
+	ExtendedPropertiesWindowExtendedProperties* _tmp3_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp4_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp5_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp6_;
@@ -3868,106 +3868,90 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ
 	ExtendedPropertiesWindowExtendedProperties* _tmp8_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp9_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp10_;
-	ExtendedPropertiesWindowExtendedProperties* _tmp11_;
+	GtkBox* _tmp11_;
 	ExtendedPropertiesWindowExtendedProperties* _tmp12_;
-	GtkBox* _tmp13_;
-	ExtendedPropertiesWindowExtendedProperties* _tmp14_;
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 637 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 637 "/home/jens/Source/shotwell/src/Properties.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp2_ = use_header;
-#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp2_) {
-#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp1_ = 1;
-#line 3888 "Properties.c"
-	} else {
-#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp1_ = 0;
-#line 3892 "Properties.c"
-	}
+#line 636 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 636 "/home/jens/Source/shotwell/src/Properties.vala"
+	self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
 #line 638 "/home/jens/Source/shotwell/src/Properties.vala"
-	self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 640 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) (GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK));
-#line 641 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 639 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_focus_on_map (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 642 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 640 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_accept_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 643 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 641 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 642 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Extended Information"));
-#line 645 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 643 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER);
-#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp3_ = owner;
-#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
-#line 647 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp1_ = owner;
+#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_);
+#line 645 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 647 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _gtk_widget_hide_on_delete_gtk_widget_delete_event, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), 0);
-#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp4_ = extended_properties_window_extended_properties_new ();
-#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	g_object_ref_sink (_tmp4_);
-#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp2_ = extended_properties_window_extended_properties_new ();
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
+	g_object_ref_sink (_tmp2_);
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (self->priv->properties);
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
+	self->priv->properties = _tmp2_;
+#line 650 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp3_ = self->priv->properties;
+#line 650 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp4_ = self->priv->properties;
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	self->priv->properties = _tmp4_;
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = self->priv->properties;
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 653 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = self->priv->properties;
 #line 653 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 654 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = self->priv->properties;
 #line 654 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 3);
 #line 655 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = self->priv->properties;
 #line 655 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 3);
 #line 656 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp9_ = self->priv->properties;
 #line 656 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 3);
 #line 657 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp10_ = self->priv->properties;
 #line 657 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3);
 #line 658 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp11_ = self->priv->properties;
+	_tmp11_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 658 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 3);
-#line 659 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp12_ = self->priv->properties;
-#line 659 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 3);
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp13_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp14_ = self->priv->properties;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
+#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 3964 "Properties.c"
+#line 3948 "Properties.c"
 }
 
 
 ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner) {
 #line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_construct (TYPE_EXTENDED_PROPERTIES_WINDOW, owner);
-#line 3971 "Properties.c"
+#line 3955 "Properties.c"
 }
 
 
@@ -3984,64 +3968,64 @@ static gboolean extended_properties_window_real_button_press_event (GtkWidget* b
 	gdouble _tmp10_;
 	GdkEventButton* _tmp11_;
 	guint32 _tmp12_;
-#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 661 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 661 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = event;
-#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_->button;
-#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 3998 "Properties.c"
+#line 3982 "Properties.c"
 		gboolean _tmp2_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event != NULL) {
-#line 4002 "Properties.c"
+#line 3986 "Properties.c"
 			GdkEventButton* _tmp3_;
 			gboolean _tmp4_;
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = event;
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp4_;
-#line 4011 "Properties.c"
+#line 3995 "Properties.c"
 		} else {
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = TRUE;
-#line 4015 "Properties.c"
+#line 3999 "Properties.c"
 		}
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 		result = _tmp2_;
-#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 664 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4021 "Properties.c"
+#line 4005 "Properties.c"
 	}
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = event;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = _tmp5_->button;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = event;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = _tmp7_->x_root;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp9_ = event;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp10_ = _tmp9_->y_root;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp11_ = event;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp12_ = _tmp11_->time;
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
-#line 670 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = TRUE;
-#line 670 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4045 "Properties.c"
+#line 4029 "Properties.c"
 }
 
 
@@ -4056,84 +4040,84 @@ static gboolean extended_properties_window_real_key_press_event (GtkWidget* base
 	GdkEventKey* _tmp5_;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_;
-#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 671 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 671 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = event;
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 676 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 674 "/home/jens/Source/shotwell/src/Properties.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 677 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 		result = TRUE;
-#line 677 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4078 "Properties.c"
+#line 4062 "Properties.c"
 	}
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = _tmp3_;
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = event;
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp5_, &_tmp6_);
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = _tmp6_;
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (_tmp4_);
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = _tmp7_;
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 678 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4096 "Properties.c"
+#line 4080 "Properties.c"
 }
 
 
 void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page) {
 	ExtendedPropertiesWindowExtendedProperties* _tmp0_;
 	Page* _tmp1_;
-#line 683 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 681 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_EXTENDED_PROPERTIES_WINDOW (self));
-#line 683 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 681 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 682 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = self->priv->properties;
-#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 682 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = page;
-#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 682 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties), _tmp1_);
-#line 4113 "Properties.c"
+#line 4097 "Properties.c"
 }
 
 
 static void extended_properties_window_real_show_all (GtkWidget* base) {
 	ExtendedPropertiesWindow * self;
 	ExtendedPropertiesWindowExtendedProperties* _tmp0_;
-#line 687 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 685 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 688 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 686 "/home/jens/Source/shotwell/src/Properties.vala"
 	GTK_WIDGET_CLASS (extended_properties_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget));
-#line 689 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 687 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = self->priv->properties;
-#line 689 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 687 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_unselect_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties));
-#line 690 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 688 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 4130 "Properties.c"
+#line 4114 "Properties.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
 #line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 4137 "Properties.c"
+#line 4121 "Properties.c"
 }
 
 
@@ -4266,7 +4250,7 @@ static void extended_properties_window_extended_properties_real_clear_properties
 	_g_free0 (self->priv->comment);
 #line 513 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->comment = _tmp16_;
-#line 4270 "Properties.c"
+#line 4254 "Properties.c"
 }
 
 
@@ -4301,13 +4285,13 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_g_object_unref0 (source);
 #line 521 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 4305 "Properties.c"
+#line 4289 "Properties.c"
 	}
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = source;
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_MEDIA_SOURCE)) {
-#line 4311 "Properties.c"
+#line 4295 "Properties.c"
 		MediaSource* media = NULL;
 		DataSource* _tmp5_;
 		MediaSource* _tmp6_;
@@ -4429,7 +4413,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_object_unref0 (source);
 #line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4433 "Properties.c"
+#line 4417 "Properties.c"
 		}
 		{
 			PhotoMetadata* _tmp20_ = NULL;
@@ -4444,8 +4428,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_tmp20_ = _tmp22_;
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4448 "Properties.c"
-				goto __catch434_g_error;
+#line 4432 "Properties.c"
+				goto __catch442_g_error;
 			}
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4457,10 +4441,10 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			metadata = _tmp23_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (_tmp20_);
-#line 4461 "Properties.c"
+#line 4445 "Properties.c"
 		}
-		goto __finally434;
-		__catch434_g_error:
+		goto __finally442;
+		__catch442_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_;
@@ -4479,9 +4463,9 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			metadata = _tmp25_;
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_error_free0 (e);
-#line 4483 "Properties.c"
+#line 4467 "Properties.c"
 		}
-		__finally434:
+		__finally442:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4498,7 +4482,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			g_clear_error (&_inner_error_);
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4502 "Properties.c"
+#line 4486 "Properties.c"
 		}
 #line 548 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp26_ = metadata;
@@ -4514,7 +4498,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_object_unref0 (source);
 #line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4518 "Properties.c"
+#line 4502 "Properties.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp27_ = metadata;
@@ -4528,7 +4512,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_metadata_date_time_unref0 (_tmp29_);
 #line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp30_) {
-#line 4532 "Properties.c"
+#line 4516 "Properties.c"
 			PhotoMetadata* _tmp31_;
 			Photo* _tmp32_;
 			time_t _tmp33_;
@@ -4548,7 +4532,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			photo_metadata_set_exposure_date_time (_tmp31_, _tmp35_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_metadata_date_time_unref0 (_tmp35_);
-#line 4552 "Properties.c"
+#line 4536 "Properties.c"
 		}
 #line 559 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp36_ = photo;
@@ -4694,14 +4678,14 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		_g_object_unref0 (photo);
 #line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (media);
-#line 4698 "Properties.c"
+#line 4682 "Properties.c"
 	} else {
 		DataSource* _tmp75_;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp75_ = source;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_EVENT_SOURCE)) {
-#line 4705 "Properties.c"
+#line 4689 "Properties.c"
 			Event* event = NULL;
 			DataSource* _tmp76_;
 			Event* _tmp77_;
@@ -4723,12 +4707,12 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			self->priv->comment = _tmp79_;
 #line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event);
-#line 4727 "Properties.c"
+#line 4711 "Properties.c"
 		}
 	}
 #line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 4732 "Properties.c"
+#line 4716 "Properties.c"
 }
 
 
@@ -4747,20 +4731,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 4751 "Properties.c"
+#line 4735 "Properties.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 4758 "Properties.c"
+#line 4742 "Properties.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 4764 "Properties.c"
+#line 4748 "Properties.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -4770,11 +4754,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 4774 "Properties.c"
+#line 4758 "Properties.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 4778 "Properties.c"
+#line 4762 "Properties.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -4782,7 +4766,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4786 "Properties.c"
+#line 4770 "Properties.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -4814,8 +4798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4818 "Properties.c"
-				goto __catch435_g_regex_error;
+#line 4802 "Properties.c"
+				goto __catch443_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -4823,7 +4807,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4827 "Properties.c"
+#line 4811 "Properties.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -4839,8 +4823,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4843 "Properties.c"
-				goto __catch435_g_regex_error;
+#line 4827 "Properties.c"
+				goto __catch443_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4850,7 +4834,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4854 "Properties.c"
+#line 4838 "Properties.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -4864,10 +4848,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4868 "Properties.c"
+#line 4852 "Properties.c"
 	}
-	goto __finally435;
-	__catch435_g_regex_error:
+	goto __finally443;
+	__catch443_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -4878,9 +4862,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4882 "Properties.c"
+#line 4866 "Properties.c"
 	}
-	__finally435:
+	__finally443:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -4889,7 +4873,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4893 "Properties.c"
+#line 4877 "Properties.c"
 	}
 }
 
@@ -4916,7 +4900,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 	_tmp1_ = page;
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 4920 "Properties.c"
+#line 4904 "Properties.c"
 	} else {
 		gchar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -4969,21 +4953,21 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp4_ = self->priv->file_path;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp4_, "") != 0) {
-#line 4973 "Properties.c"
+#line 4957 "Properties.c"
 			const gchar* _tmp5_;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = self->priv->file_path;
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = _tmp5_ != NULL;
-#line 4979 "Properties.c"
+#line 4963 "Properties.c"
 		} else {
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = FALSE;
-#line 4983 "Properties.c"
+#line 4967 "Properties.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp3_) {
-#line 4987 "Properties.c"
+#line 4971 "Properties.c"
 			const gchar* _tmp6_;
 			gchar* _tmp7_;
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4994,7 +4978,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp2_);
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp7_;
-#line 4998 "Properties.c"
+#line 4982 "Properties.c"
 		} else {
 			gchar* _tmp8_;
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5003,7 +4987,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp2_);
 #line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp8_;
-#line 5007 "Properties.c"
+#line 4991 "Properties.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Location:"), _tmp2_, FALSE);
@@ -5011,7 +4995,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp10_ = self->priv->filesize;
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp10_ > ((guint64) 0)) {
-#line 5015 "Properties.c"
+#line 4999 "Properties.c"
 			guint64 _tmp11_;
 			gchar* _tmp12_;
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5022,7 +5006,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp9_);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp9_ = _tmp12_;
-#line 5026 "Properties.c"
+#line 5010 "Properties.c"
 		} else {
 			gchar* _tmp13_;
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5031,7 +5015,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp9_);
 #line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp9_ = _tmp13_;
-#line 5035 "Properties.c"
+#line 5019 "Properties.c"
 		}
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("File size:"), _tmp9_, FALSE);
@@ -5039,19 +5023,19 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp14_ = self->priv->is_raw;
 #line 592 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp14_) {
-#line 5043 "Properties.c"
+#line 5027 "Properties.c"
 			const gchar* _tmp15_;
 #line 593 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = self->priv->development_path;
 #line 593 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Current Development:"), _tmp15_, FALSE);
-#line 5049 "Properties.c"
+#line 5033 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp18_ = self->priv->original_dim;
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp18_ != NULL) {
-#line 5055 "Properties.c"
+#line 5039 "Properties.c"
 			Dimensions* _tmp19_;
 			gboolean _tmp20_;
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5060,15 +5044,15 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_tmp20_ = dimensions_has_area (_tmp19_);
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = _tmp20_;
-#line 5064 "Properties.c"
+#line 5048 "Properties.c"
 		} else {
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = FALSE;
-#line 5068 "Properties.c"
+#line 5052 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp17_) {
-#line 5072 "Properties.c"
+#line 5056 "Properties.c"
 			Dimensions* _tmp21_;
 			gint _tmp22_;
 			Dimensions* _tmp23_;
@@ -5088,7 +5072,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp16_);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp16_ = _tmp25_;
-#line 5092 "Properties.c"
+#line 5076 "Properties.c"
 		} else {
 			gchar* _tmp26_;
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5097,7 +5081,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp16_);
 #line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp16_ = _tmp26_;
-#line 5101 "Properties.c"
+#line 5085 "Properties.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Original dimensions:"), _tmp16_, FALSE);
@@ -5105,31 +5089,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp29_ = self->priv->camera_make;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp29_, "") != 0) {
-#line 5109 "Properties.c"
+#line 5093 "Properties.c"
 			const gchar* _tmp30_;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp30_ = self->priv->camera_make;
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp28_ = _tmp30_ != NULL;
-#line 5115 "Properties.c"
+#line 5099 "Properties.c"
 		} else {
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp28_ = FALSE;
-#line 5119 "Properties.c"
+#line 5103 "Properties.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp28_) {
-#line 5123 "Properties.c"
+#line 5107 "Properties.c"
 			const gchar* _tmp31_;
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = self->priv->camera_make;
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = _tmp31_;
-#line 5129 "Properties.c"
+#line 5113 "Properties.c"
 		} else {
 #line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5133 "Properties.c"
+#line 5117 "Properties.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera make:"), _tmp27_, FALSE);
@@ -5137,31 +5121,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp34_ = self->priv->camera_model;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 5141 "Properties.c"
+#line 5125 "Properties.c"
 			const gchar* _tmp35_;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp35_ = self->priv->camera_model;
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = _tmp35_ != NULL;
-#line 5147 "Properties.c"
+#line 5131 "Properties.c"
 		} else {
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = FALSE;
-#line 5151 "Properties.c"
+#line 5135 "Properties.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp33_) {
-#line 5155 "Properties.c"
+#line 5139 "Properties.c"
 			const gchar* _tmp36_;
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = self->priv->camera_model;
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = _tmp36_;
-#line 5161 "Properties.c"
+#line 5145 "Properties.c"
 		} else {
 #line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5165 "Properties.c"
+#line 5149 "Properties.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Camera model:"), _tmp32_, FALSE);
@@ -5169,31 +5153,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp39_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp39_, "") != 0) {
-#line 5173 "Properties.c"
+#line 5157 "Properties.c"
 			const gchar* _tmp40_;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp40_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = _tmp40_ != NULL;
-#line 5179 "Properties.c"
+#line 5163 "Properties.c"
 		} else {
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = FALSE;
-#line 5183 "Properties.c"
+#line 5167 "Properties.c"
 		}
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp38_) {
-#line 5187 "Properties.c"
+#line 5171 "Properties.c"
 			const gchar* _tmp41_;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp41_ = self->priv->flash;
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = _tmp41_;
-#line 5193 "Properties.c"
+#line 5177 "Properties.c"
 		} else {
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5197 "Properties.c"
+#line 5181 "Properties.c"
 		}
 #line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Flash:"), _tmp37_, FALSE);
@@ -5201,31 +5185,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp44_ = self->priv->focal_length;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp44_, "") != 0) {
-#line 5205 "Properties.c"
+#line 5189 "Properties.c"
 			const gchar* _tmp45_;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp45_ = self->priv->focal_length;
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp43_ = _tmp45_ != NULL;
-#line 5211 "Properties.c"
+#line 5195 "Properties.c"
 		} else {
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp43_ = FALSE;
-#line 5215 "Properties.c"
+#line 5199 "Properties.c"
 		}
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp43_) {
-#line 5219 "Properties.c"
+#line 5203 "Properties.c"
 			const gchar* _tmp46_;
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp46_ = self->priv->focal_length;
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp42_ = _tmp46_;
-#line 5225 "Properties.c"
+#line 5209 "Properties.c"
 		} else {
 #line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp42_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5229 "Properties.c"
+#line 5213 "Properties.c"
 		}
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Focal length:"), _tmp42_, FALSE);
@@ -5233,31 +5217,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp49_ = self->priv->exposure_date;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp49_, "") != 0) {
-#line 5237 "Properties.c"
+#line 5221 "Properties.c"
 			const gchar* _tmp50_;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = self->priv->exposure_date;
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp48_ = _tmp50_ != NULL;
-#line 5243 "Properties.c"
+#line 5227 "Properties.c"
 		} else {
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp48_ = FALSE;
-#line 5247 "Properties.c"
+#line 5231 "Properties.c"
 		}
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp48_) {
-#line 5251 "Properties.c"
+#line 5235 "Properties.c"
 			const gchar* _tmp51_;
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp51_ = self->priv->exposure_date;
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp47_ = _tmp51_;
-#line 5257 "Properties.c"
+#line 5241 "Properties.c"
 		} else {
 #line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp47_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5261 "Properties.c"
+#line 5245 "Properties.c"
 		}
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure date:"), _tmp47_, FALSE);
@@ -5265,31 +5249,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp54_ = self->priv->exposure_time;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp54_, "") != 0) {
-#line 5269 "Properties.c"
+#line 5253 "Properties.c"
 			const gchar* _tmp55_;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp55_ = self->priv->exposure_time;
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp53_ = _tmp55_ != NULL;
-#line 5275 "Properties.c"
+#line 5259 "Properties.c"
 		} else {
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp53_ = FALSE;
-#line 5279 "Properties.c"
+#line 5263 "Properties.c"
 		}
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp53_) {
-#line 5283 "Properties.c"
+#line 5267 "Properties.c"
 			const gchar* _tmp56_;
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp56_ = self->priv->exposure_time;
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp52_ = _tmp56_;
-#line 5289 "Properties.c"
+#line 5273 "Properties.c"
 		} else {
 #line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp52_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5293 "Properties.c"
+#line 5277 "Properties.c"
 		}
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure time:"), _tmp52_, FALSE);
@@ -5297,31 +5281,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp59_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp59_, "") != 0) {
-#line 5301 "Properties.c"
+#line 5285 "Properties.c"
 			const gchar* _tmp60_;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp60_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp58_ = _tmp60_ != NULL;
-#line 5307 "Properties.c"
+#line 5291 "Properties.c"
 		} else {
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp58_ = FALSE;
-#line 5311 "Properties.c"
+#line 5295 "Properties.c"
 		}
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp58_) {
-#line 5315 "Properties.c"
+#line 5299 "Properties.c"
 			const gchar* _tmp61_;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp61_ = self->priv->exposure_bias;
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp57_ = _tmp61_;
-#line 5321 "Properties.c"
+#line 5305 "Properties.c"
 		} else {
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp57_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5325 "Properties.c"
+#line 5309 "Properties.c"
 		}
 #line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Exposure bias:"), _tmp57_, FALSE);
@@ -5329,35 +5313,35 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp65_ = self->priv->gps_lat;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp65_ != ((gdouble) -1)) {
-#line 5333 "Properties.c"
+#line 5317 "Properties.c"
 			const gchar* _tmp66_;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp66_ = self->priv->gps_lat_ref;
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp64_ = g_strcmp0 (_tmp66_, "") != 0;
-#line 5339 "Properties.c"
+#line 5323 "Properties.c"
 		} else {
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp64_ = FALSE;
-#line 5343 "Properties.c"
+#line 5327 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp64_) {
-#line 5347 "Properties.c"
+#line 5331 "Properties.c"
 			const gchar* _tmp67_;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp67_ = self->priv->gps_lat_ref;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp63_ = _tmp67_ != NULL;
-#line 5353 "Properties.c"
+#line 5337 "Properties.c"
 		} else {
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp63_ = FALSE;
-#line 5357 "Properties.c"
+#line 5341 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp63_) {
-#line 5361 "Properties.c"
+#line 5345 "Properties.c"
 			gdouble _tmp68_;
 			const gchar* _tmp69_;
 			gchar* _tmp70_;
@@ -5371,7 +5355,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp62_);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp62_ = _tmp70_;
-#line 5375 "Properties.c"
+#line 5359 "Properties.c"
 		} else {
 			gchar* _tmp71_;
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5380,7 +5364,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp62_);
 #line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp62_ = _tmp71_;
-#line 5384 "Properties.c"
+#line 5368 "Properties.c"
 		}
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS latitude:"), _tmp62_, FALSE);
@@ -5388,35 +5372,35 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp75_ = self->priv->gps_long;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp75_ != ((gdouble) -1)) {
-#line 5392 "Properties.c"
+#line 5376 "Properties.c"
 			const gchar* _tmp76_;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp76_ = self->priv->gps_long_ref;
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp74_ = g_strcmp0 (_tmp76_, "") != 0;
-#line 5398 "Properties.c"
+#line 5382 "Properties.c"
 		} else {
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp74_ = FALSE;
-#line 5402 "Properties.c"
+#line 5386 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp74_) {
-#line 5406 "Properties.c"
+#line 5390 "Properties.c"
 			const gchar* _tmp77_;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp77_ = self->priv->gps_long_ref;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp73_ = _tmp77_ != NULL;
-#line 5412 "Properties.c"
+#line 5396 "Properties.c"
 		} else {
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp73_ = FALSE;
-#line 5416 "Properties.c"
+#line 5400 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp73_) {
-#line 5420 "Properties.c"
+#line 5404 "Properties.c"
 			gdouble _tmp78_;
 			const gchar* _tmp79_;
 			gchar* _tmp80_;
@@ -5430,7 +5414,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp72_);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp72_ = _tmp80_;
-#line 5434 "Properties.c"
+#line 5418 "Properties.c"
 		} else {
 			gchar* _tmp81_;
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -5439,7 +5423,7 @@ static void extended_properties_window_extended_properties_real_internal_update_
 			_g_free0 (_tmp72_);
 #line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp72_ = _tmp81_;
-#line 5443 "Properties.c"
+#line 5427 "Properties.c"
 		}
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("GPS longitude:"), _tmp72_, FALSE);
@@ -5447,31 +5431,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp84_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp84_, "") != 0) {
-#line 5451 "Properties.c"
+#line 5435 "Properties.c"
 			const gchar* _tmp85_;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp85_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp83_ = _tmp85_ != NULL;
-#line 5457 "Properties.c"
+#line 5441 "Properties.c"
 		} else {
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp83_ = FALSE;
-#line 5461 "Properties.c"
+#line 5445 "Properties.c"
 		}
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp83_) {
-#line 5465 "Properties.c"
+#line 5449 "Properties.c"
 			const gchar* _tmp86_;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp86_ = self->priv->artist;
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp82_ = _tmp86_;
-#line 5471 "Properties.c"
+#line 5455 "Properties.c"
 		} else {
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp82_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5475 "Properties.c"
+#line 5459 "Properties.c"
 		}
 #line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Artist:"), _tmp82_, FALSE);
@@ -5479,31 +5463,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp89_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp89_, "") != 0) {
-#line 5483 "Properties.c"
+#line 5467 "Properties.c"
 			const gchar* _tmp90_;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp90_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp88_ = _tmp90_ != NULL;
-#line 5489 "Properties.c"
+#line 5473 "Properties.c"
 		} else {
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp88_ = FALSE;
-#line 5493 "Properties.c"
+#line 5477 "Properties.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp88_) {
-#line 5497 "Properties.c"
+#line 5481 "Properties.c"
 			const gchar* _tmp91_;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp91_ = self->priv->copyright;
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp87_ = _tmp91_;
-#line 5503 "Properties.c"
+#line 5487 "Properties.c"
 		} else {
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp87_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5507 "Properties.c"
+#line 5491 "Properties.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Copyright:"), _tmp87_, FALSE);
@@ -5511,31 +5495,31 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_tmp94_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp94_, "") != 0) {
-#line 5515 "Properties.c"
+#line 5499 "Properties.c"
 			const gchar* _tmp95_;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp95_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp93_ = _tmp95_ != NULL;
-#line 5521 "Properties.c"
+#line 5505 "Properties.c"
 		} else {
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp93_ = FALSE;
-#line 5525 "Properties.c"
+#line 5509 "Properties.c"
 		}
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp93_) {
-#line 5529 "Properties.c"
+#line 5513 "Properties.c"
 			const gchar* _tmp96_;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp96_ = self->priv->software;
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp92_ = _tmp96_;
-#line 5535 "Properties.c"
+#line 5519 "Properties.c"
 		} else {
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp92_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5539 "Properties.c"
+#line 5523 "Properties.c"
 		}
 #line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Software:"), _tmp92_, FALSE);
@@ -5549,23 +5533,23 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		_g_free0 (_tmp9_);
 #line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp2_);
-#line 5553 "Properties.c"
+#line 5537 "Properties.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp98_ = self->priv->comment;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp98_, "") != 0) {
-#line 5559 "Properties.c"
+#line 5543 "Properties.c"
 		const gchar* _tmp99_;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp99_ = self->priv->comment;
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp97_ = _tmp99_ != NULL;
-#line 5565 "Properties.c"
+#line 5549 "Properties.c"
 	} else {
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp97_ = FALSE;
-#line 5569 "Properties.c"
+#line 5553 "Properties.c"
 	}
 #line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	has_comment = _tmp97_;
@@ -5573,23 +5557,23 @@ static void extended_properties_window_extended_properties_real_internal_update_
 	_tmp101_ = has_comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp101_) {
-#line 5577 "Properties.c"
+#line 5561 "Properties.c"
 		const gchar* _tmp102_;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp102_ = self->priv->comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp100_ = _tmp102_;
-#line 5583 "Properties.c"
+#line 5567 "Properties.c"
 	} else {
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp100_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5587 "Properties.c"
+#line 5571 "Properties.c"
 	}
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp103_ = has_comment;
 #line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _ ("Comment:"), _tmp100_, _tmp103_);
-#line 5593 "Properties.c"
+#line 5577 "Properties.c"
 }
 
 
@@ -5599,14 +5583,14 @@ static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_ex
 	self = (ExtendedPropertiesWindowExtendedProperties*) properties_construct (object_type);
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 5603 "Properties.c"
+#line 5587 "Properties.c"
 }
 
 
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void) {
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_extended_properties_construct (EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES);
-#line 5610 "Properties.c"
+#line 5594 "Properties.c"
 }
 
 
@@ -5623,14 +5607,14 @@ static void extended_properties_window_extended_properties_class_init (ExtendedP
 	((PropertiesClass *) klass)->internal_update_properties = (void (*) (Properties *, Page*)) extended_properties_window_extended_properties_real_internal_update_properties;
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_extended_properties_finalize;
-#line 5627 "Properties.c"
+#line 5611 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_instance_init (ExtendedPropertiesWindowExtendedProperties * self) {
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_GET_PRIVATE (self);
-#line 5634 "Properties.c"
+#line 5618 "Properties.c"
 }
 
 
@@ -5672,7 +5656,7 @@ static void extended_properties_window_extended_properties_finalize (GObject * o
 	_g_free0 (self->priv->comment);
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_extended_properties_parent_class)->finalize (obj);
-#line 5676 "Properties.c"
+#line 5660 "Properties.c"
 }
 
 
@@ -5701,7 +5685,7 @@ static void extended_properties_window_class_init (ExtendedPropertiesWindowClass
 	((GtkWidgetClass *) klass)->show_all = (void (*) (GtkWidget *)) extended_properties_window_real_show_all;
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_finalize;
-#line 5705 "Properties.c"
+#line 5689 "Properties.c"
 }
 
 
@@ -5710,7 +5694,7 @@ static void extended_properties_window_instance_init (ExtendedPropertiesWindow *
 	self->priv = EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE (self);
 #line 458 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->properties = NULL;
-#line 5714 "Properties.c"
+#line 5698 "Properties.c"
 }
 
 
@@ -5722,7 +5706,7 @@ static void extended_properties_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->properties);
 #line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_parent_class)->finalize (obj);
-#line 5726 "Properties.c"
+#line 5710 "Properties.c"
 }
 
 
diff --git a/src/Properties.vala b/src/Properties.vala
index 1f59040..3cbd5af 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -633,10 +633,8 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
     }
 
     public ExtendedPropertiesWindow(Gtk.Window owner) {
-        bool use_header;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        
+        Object(use_header_bar: Resources.use_header_bar());
+
         add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.KEY_PRESS_MASK);
         focus_on_map = true;
         set_accept_focus(true);
diff --git a/src/Resources.c b/src/Resources.c
index 0c894c6..da32009 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -221,7 +221,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_MERGE "shotwell-merge-events"
 #define RESOURCES_GO_NEXT "go-next"
 #define RESOURCES_GO_PREVIOUS "go-previous"
-#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-braunschweig.jpg"
 #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
 #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point"
 #define RESOURCES_ICON_RATING_REJECTED "rejected.svg"
@@ -485,6 +485,7 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error);
 gchar* resources_to_css_color (GdkRGBA* color);
 #define RESOURCES_ALL_DATA -1
 void resources_style_widget (GtkWidget* widget, const gchar* stylesheet);
+gint resources_use_header_bar (void);
 #define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \
 "               background-color: @borders;\n" \
 "            }\n" \
@@ -518,7 +519,7 @@ gchar* resources_launch_editor_failed (GError* err) {
 	result = _tmp2_;
 #line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 494 "Resources.c"
+#line 495 "Resources.c"
 }
 
 
@@ -532,7 +533,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	_tmp0__length1 = names_length1;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 508 "Resources.c"
+#line 509 "Resources.c"
 		gchar** _tmp1_;
 		gint _tmp1__length1;
 		const gchar* _tmp2_;
@@ -560,7 +561,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		result = _tmp6_;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 536 "Resources.c"
+#line 537 "Resources.c"
 	} else {
 		gchar** _tmp7_;
 		gint _tmp7__length1;
@@ -570,7 +571,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		_tmp7__length1 = names_length1;
 #line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp7__length1 == 2) {
-#line 546 "Resources.c"
+#line 547 "Resources.c"
 			gchar** _tmp8_;
 			gint _tmp8__length1;
 			const gchar* _tmp9_;
@@ -615,7 +616,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp17_;
 #line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 591 "Resources.c"
+#line 592 "Resources.c"
 		} else {
 			gchar* _tmp18_;
 #line 349 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -624,7 +625,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp18_;
 #line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 600 "Resources.c"
+#line 601 "Resources.c"
 		}
 	}
 }
@@ -644,7 +645,7 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 	result = _tmp1_;
 #line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 620 "Resources.c"
+#line 621 "Resources.c"
 }
 
 
@@ -662,7 +663,7 @@ gchar* resources_delete_tag_label (const gchar* name) {
 	result = _tmp1_;
 #line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 638 "Resources.c"
+#line 639 "Resources.c"
 }
 
 
@@ -680,7 +681,7 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 656 "Resources.c"
+#line 657 "Resources.c"
 }
 
 
@@ -703,7 +704,7 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 	result = _tmp2_;
 #line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 679 "Resources.c"
+#line 680 "Resources.c"
 }
 
 
@@ -724,7 +725,7 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	result = _tmp2_;
 #line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 700 "Resources.c"
+#line 701 "Resources.c"
 }
 
 
@@ -745,7 +746,7 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	result = _tmp2_;
 #line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 721 "Resources.c"
+#line 722 "Resources.c"
 }
 
 
@@ -766,7 +767,7 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	result = _tmp2_;
 #line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 742 "Resources.c"
+#line 743 "Resources.c"
 }
 
 
@@ -787,7 +788,7 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	result = _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 763 "Resources.c"
+#line 764 "Resources.c"
 }
 
 
@@ -805,7 +806,7 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 	result = _tmp1_;
 #line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 781 "Resources.c"
+#line 782 "Resources.c"
 }
 
 
@@ -823,7 +824,7 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 	result = _tmp1_;
 #line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 799 "Resources.c"
+#line 800 "Resources.c"
 }
 
 
@@ -846,7 +847,7 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 	result = _tmp2_;
 #line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 822 "Resources.c"
+#line 823 "Resources.c"
 }
 
 
@@ -864,7 +865,7 @@ gchar* resources_delete_search_label (const gchar* name) {
 	result = _tmp1_;
 #line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 840 "Resources.c"
+#line 841 "Resources.c"
 }
 
 
@@ -877,27 +878,27 @@ const gchar* resources_rating_label (Rating rating) {
 	switch (_tmp0_) {
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 853 "Resources.c"
+#line 854 "Resources.c"
 		{
 #line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
 #line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 859 "Resources.c"
+#line 860 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 863 "Resources.c"
+#line 864 "Resources.c"
 		{
 #line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 869 "Resources.c"
+#line 870 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 873 "Resources.c"
+#line 874 "Resources.c"
 		{
 			const gchar* _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -906,11 +907,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp1_;
 #line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 882 "Resources.c"
+#line 883 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 886 "Resources.c"
+#line 887 "Resources.c"
 		{
 			const gchar* _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -919,11 +920,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 895 "Resources.c"
+#line 896 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 899 "Resources.c"
+#line 900 "Resources.c"
 		{
 			const gchar* _tmp3_;
 #line 438 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -932,11 +933,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp3_;
 #line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 908 "Resources.c"
+#line 909 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 912 "Resources.c"
+#line 913 "Resources.c"
 		{
 			const gchar* _tmp4_;
 #line 440 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -945,11 +946,11 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp4_;
 #line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 921 "Resources.c"
+#line 922 "Resources.c"
 		}
 #line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 925 "Resources.c"
+#line 926 "Resources.c"
 		{
 			const gchar* _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -958,7 +959,7 @@ const gchar* resources_rating_label (Rating rating) {
 			result = _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 934 "Resources.c"
+#line 935 "Resources.c"
 		}
 		default:
 		{
@@ -966,7 +967,7 @@ const gchar* resources_rating_label (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_LABEL;
 #line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 942 "Resources.c"
+#line 943 "Resources.c"
 		}
 	}
 }
@@ -981,27 +982,27 @@ const gchar* resources_rating_combo_box (Rating rating) {
 	switch (_tmp0_) {
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 957 "Resources.c"
+#line 958 "Resources.c"
 		{
 #line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
 #line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 963 "Resources.c"
+#line 964 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 967 "Resources.c"
+#line 968 "Resources.c"
 		{
 #line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
 #line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 973 "Resources.c"
+#line 974 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 977 "Resources.c"
+#line 978 "Resources.c"
 		{
 			const gchar* _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1010,11 +1011,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 986 "Resources.c"
+#line 987 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 990 "Resources.c"
+#line 991 "Resources.c"
 		{
 			const gchar* _tmp2_;
 #line 457 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1023,11 +1024,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp2_;
 #line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 999 "Resources.c"
+#line 1000 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1003 "Resources.c"
+#line 1004 "Resources.c"
 		{
 			const gchar* _tmp3_;
 #line 459 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1036,11 +1037,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp3_;
 #line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1012 "Resources.c"
+#line 1013 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1016 "Resources.c"
+#line 1017 "Resources.c"
 		{
 			const gchar* _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1049,11 +1050,11 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1025 "Resources.c"
+#line 1026 "Resources.c"
 		}
 #line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1029 "Resources.c"
+#line 1030 "Resources.c"
 		{
 			const gchar* _tmp5_;
 #line 463 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1062,7 +1063,7 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = _tmp5_;
 #line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1038 "Resources.c"
+#line 1039 "Resources.c"
 		}
 		default:
 		{
@@ -1070,7 +1071,7 @@ const gchar* resources_rating_combo_box (Rating rating) {
 			result = RESOURCES_RATE_UNRATED_MENU;
 #line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1046 "Resources.c"
+#line 1047 "Resources.c"
 		}
 	}
 }
@@ -1085,7 +1086,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	switch (_tmp0_) {
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1061 "Resources.c"
+#line 1062 "Resources.c"
 		{
 			gchar* _tmp1_;
 #line 472 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1094,11 +1095,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp1_;
 #line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1070 "Resources.c"
+#line 1071 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1074 "Resources.c"
+#line 1075 "Resources.c"
 		{
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
@@ -1110,11 +1111,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp3_;
 #line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1086 "Resources.c"
+#line 1087 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1090 "Resources.c"
+#line 1091 "Resources.c"
 		{
 			const gchar* _tmp4_;
 			gchar* _tmp5_;
@@ -1126,11 +1127,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp5_;
 #line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1102 "Resources.c"
+#line 1103 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1106 "Resources.c"
+#line 1107 "Resources.c"
 		{
 			const gchar* _tmp6_;
 			gchar* _tmp7_;
@@ -1142,11 +1143,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp7_;
 #line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1118 "Resources.c"
+#line 1119 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1122 "Resources.c"
+#line 1123 "Resources.c"
 		{
 			const gchar* _tmp8_;
 			gchar* _tmp9_;
@@ -1158,13 +1159,13 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp9_;
 #line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1134 "Resources.c"
+#line 1135 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1140 "Resources.c"
+#line 1141 "Resources.c"
 		{
 			const gchar* _tmp10_;
 			gchar* _tmp11_;
@@ -1176,11 +1177,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp11_;
 #line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1152 "Resources.c"
+#line 1153 "Resources.c"
 		}
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1156 "Resources.c"
+#line 1157 "Resources.c"
 		{
 			gchar* _tmp12_;
 #line 491 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1189,12 +1190,12 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp12_;
 #line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1165 "Resources.c"
+#line 1166 "Resources.c"
 		}
 		default:
 #line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1170 "Resources.c"
+#line 1171 "Resources.c"
 		{
 			gchar* _tmp13_;
 #line 495 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1203,7 +1204,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 			result = _tmp13_;
 #line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1179 "Resources.c"
+#line 1180 "Resources.c"
 		}
 	}
 }
@@ -1218,7 +1219,7 @@ gchar* resources_rating_progress (Rating rating) {
 	switch (_tmp0_) {
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1194 "Resources.c"
+#line 1195 "Resources.c"
 		{
 			gchar* _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1227,11 +1228,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp1_;
 #line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1203 "Resources.c"
+#line 1204 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1207 "Resources.c"
+#line 1208 "Resources.c"
 		{
 			gchar* _tmp2_;
 #line 504 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1240,11 +1241,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp2_;
 #line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1216 "Resources.c"
+#line 1217 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1220 "Resources.c"
+#line 1221 "Resources.c"
 		{
 			const gchar* _tmp3_;
 			gchar* _tmp4_;
@@ -1256,11 +1257,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp4_;
 #line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1232 "Resources.c"
+#line 1233 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1236 "Resources.c"
+#line 1237 "Resources.c"
 		{
 			const gchar* _tmp5_;
 			gchar* _tmp6_;
@@ -1272,11 +1273,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp6_;
 #line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1248 "Resources.c"
+#line 1249 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1252 "Resources.c"
+#line 1253 "Resources.c"
 		{
 			const gchar* _tmp7_;
 			gchar* _tmp8_;
@@ -1288,11 +1289,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp8_;
 #line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1264 "Resources.c"
+#line 1265 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1268 "Resources.c"
+#line 1269 "Resources.c"
 		{
 			const gchar* _tmp9_;
 			gchar* _tmp10_;
@@ -1304,11 +1305,11 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp10_;
 #line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1280 "Resources.c"
+#line 1281 "Resources.c"
 		}
 #line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1284 "Resources.c"
+#line 1285 "Resources.c"
 		{
 			const gchar* _tmp11_;
 			gchar* _tmp12_;
@@ -1320,7 +1321,7 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp12_;
 #line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1296 "Resources.c"
+#line 1297 "Resources.c"
 		}
 		default:
 		{
@@ -1331,7 +1332,7 @@ gchar* resources_rating_progress (Rating rating) {
 			result = _tmp13_;
 #line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1307 "Resources.c"
+#line 1308 "Resources.c"
 		}
 	}
 }
@@ -1346,7 +1347,7 @@ gchar* resources_get_stars (Rating rating) {
 	switch (_tmp0_) {
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1322 "Resources.c"
+#line 1323 "Resources.c"
 		{
 			gchar* _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1355,11 +1356,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1331 "Resources.c"
+#line 1332 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1335 "Resources.c"
+#line 1336 "Resources.c"
 		{
 			gchar* _tmp2_;
 #line 527 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1368,11 +1369,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp2_;
 #line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1344 "Resources.c"
+#line 1345 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1348 "Resources.c"
+#line 1349 "Resources.c"
 		{
 			gchar* _tmp3_;
 #line 529 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1381,11 +1382,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp3_;
 #line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1357 "Resources.c"
+#line 1358 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1361 "Resources.c"
+#line 1362 "Resources.c"
 		{
 			gchar* _tmp4_;
 #line 531 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1394,11 +1395,11 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp4_;
 #line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1370 "Resources.c"
+#line 1371 "Resources.c"
 		}
 #line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1374 "Resources.c"
+#line 1375 "Resources.c"
 		{
 			gchar* _tmp5_;
 #line 533 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -1407,7 +1408,7 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp5_;
 #line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1383 "Resources.c"
+#line 1384 "Resources.c"
 		}
 		default:
 		{
@@ -1418,7 +1419,7 @@ gchar* resources_get_stars (Rating rating) {
 			result = _tmp6_;
 #line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1394 "Resources.c"
+#line 1395 "Resources.c"
 		}
 	}
 }
@@ -1433,7 +1434,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	switch (_tmp0_) {
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1409 "Resources.c"
+#line 1410 "Resources.c"
 		{
 			gint _tmp1_;
 			GdkPixbuf* _tmp2_;
@@ -1445,11 +1446,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp2_;
 #line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1421 "Resources.c"
+#line 1422 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1425 "Resources.c"
+#line 1426 "Resources.c"
 		{
 			gint _tmp3_;
 			GdkPixbuf* _tmp4_;
@@ -1461,11 +1462,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp4_;
 #line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1437 "Resources.c"
+#line 1438 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1441 "Resources.c"
+#line 1442 "Resources.c"
 		{
 			gint _tmp5_;
 			GdkPixbuf* _tmp6_;
@@ -1477,11 +1478,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp6_;
 #line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1453 "Resources.c"
+#line 1454 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1457 "Resources.c"
+#line 1458 "Resources.c"
 		{
 			gint _tmp7_;
 			GdkPixbuf* _tmp8_;
@@ -1493,11 +1494,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp8_;
 #line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1469 "Resources.c"
+#line 1470 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1473 "Resources.c"
+#line 1474 "Resources.c"
 		{
 			gint _tmp9_;
 			GdkPixbuf* _tmp10_;
@@ -1509,11 +1510,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp10_;
 #line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1485 "Resources.c"
+#line 1486 "Resources.c"
 		}
 #line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1489 "Resources.c"
+#line 1490 "Resources.c"
 		{
 			gint _tmp11_;
 			GdkPixbuf* _tmp12_;
@@ -1525,7 +1526,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = _tmp12_;
 #line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1501 "Resources.c"
+#line 1502 "Resources.c"
 		}
 		default:
 		{
@@ -1533,7 +1534,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 			result = NULL;
 #line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1509 "Resources.c"
+#line 1510 "Resources.c"
 		}
 	}
 }
@@ -2145,7 +2146,7 @@ void resources_generate_rating_strings (void) {
 	_g_free0 (label_base);
 #line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2121 "Resources.c"
+#line 2122 "Resources.c"
 }
 
 
@@ -2164,7 +2165,7 @@ gchar* resources_jump_to_file_failed (GError* err) {
 	result = _tmp2_;
 #line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2140 "Resources.c"
+#line 2141 "Resources.c"
 }
 
 
@@ -2179,7 +2180,7 @@ void resources_init (void) {
 	_g_object_unref0 (_tmp1_);
 #line 694 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 2155 "Resources.c"
+#line 2156 "Resources.c"
 }
 
 
@@ -2231,7 +2232,7 @@ void resources_fetch_lc_time_format (void) {
 	if (_tmp2_ != NULL) {
 #line 715 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2207 "Resources.c"
+#line 2208 "Resources.c"
 	}
 #line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
@@ -2249,13 +2250,13 @@ void resources_fetch_lc_time_format (void) {
 	_tmp7_ = lc_time;
 #line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2225 "Resources.c"
+#line 2226 "Resources.c"
 		const gchar* _tmp8_;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = lc_time;
 #line 723 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp8_);
-#line 2231 "Resources.c"
+#line 2232 "Resources.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
@@ -2305,25 +2306,25 @@ void resources_fetch_lc_time_format (void) {
 	_tmp17_ = old_messages;
 #line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp17_ != NULL) {
-#line 2281 "Resources.c"
+#line 2282 "Resources.c"
 		const gchar* _tmp18_;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = old_messages;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp18_);
-#line 2287 "Resources.c"
+#line 2288 "Resources.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = old_language;
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp19_ != NULL) {
-#line 2293 "Resources.c"
+#line 2294 "Resources.c"
 		const gchar* _tmp20_;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = old_language;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_setenv ("LANGUAGE", _tmp20_, TRUE);
-#line 2299 "Resources.c"
+#line 2300 "Resources.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
@@ -2331,7 +2332,7 @@ void resources_fetch_lc_time_format (void) {
 	_g_free0 (old_messages);
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_language);
-#line 2307 "Resources.c"
+#line 2308 "Resources.c"
 }
 
 
@@ -2368,7 +2369,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 2344 "Resources.c"
+#line 2345 "Resources.c"
 		gchar* _tmp4_;
 #line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -2376,13 +2377,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2352 "Resources.c"
+#line 2353 "Resources.c"
 	} else {
 #line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
 #line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2358 "Resources.c"
+#line 2359 "Resources.c"
 	}
 }
 
@@ -2406,7 +2407,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2382 "Resources.c"
+#line 2383 "Resources.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -2414,7 +2415,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2390 "Resources.c"
+#line 2391 "Resources.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -2426,7 +2427,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2402 "Resources.c"
+#line 2403 "Resources.c"
 	}
 }
 
@@ -2450,21 +2451,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2426 "Resources.c"
+#line 2427 "Resources.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2432 "Resources.c"
+#line 2433 "Resources.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2436 "Resources.c"
+#line 2437 "Resources.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 2440 "Resources.c"
+#line 2441 "Resources.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -2476,7 +2477,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 2452 "Resources.c"
+#line 2453 "Resources.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -2486,13 +2487,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 2462 "Resources.c"
+#line 2463 "Resources.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 2468 "Resources.c"
+#line 2469 "Resources.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -2506,7 +2507,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2482 "Resources.c"
+#line 2483 "Resources.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -2516,13 +2517,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2492 "Resources.c"
+#line 2493 "Resources.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 2498 "Resources.c"
+#line 2499 "Resources.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -2531,7 +2532,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 2507 "Resources.c"
+#line 2508 "Resources.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -2551,7 +2552,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2527 "Resources.c"
+#line 2528 "Resources.c"
 }
 
 
@@ -2563,12 +2564,12 @@ static gboolean _vala_string_array_contains (const gchar* * stack, int stack_len
 		if (g_strcmp0 (stack[i], needle) == 0) {
 #line 798 "/home/jens/Source/shotwell/src/Resources.vala"
 			return TRUE;
-#line 2539 "Resources.c"
+#line 2540 "Resources.c"
 		}
 	}
 #line 798 "/home/jens/Source/shotwell/src/Resources.vala"
 	return FALSE;
-#line 2544 "Resources.c"
+#line 2545 "Resources.c"
 }
 
 
@@ -2588,7 +2589,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	_tmp0_ = resources_unit_system;
 #line 783 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) {
-#line 2564 "Resources.c"
+#line 2565 "Resources.c"
 		ResourcesUnitSystem _tmp1_;
 #line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = resources_unit_system;
@@ -2596,7 +2597,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 		result = _tmp1_;
 #line 784 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 2572 "Resources.c"
+#line 2573 "Resources.c"
 	}
 #line 787 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_getenv ("LC_MEASUREMENT");
@@ -2610,7 +2611,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	_tmp4_ = resources_lc_measurement;
 #line 788 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_ == NULL) {
-#line 2586 "Resources.c"
+#line 2587 "Resources.c"
 		gchar** _tmp5_;
 		gchar** _tmp6_;
 		const gchar* _tmp7_;
@@ -2625,7 +2626,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 		_g_free0 (resources_lc_measurement);
 #line 789 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_lc_measurement = _tmp8_;
-#line 2601 "Resources.c"
+#line 2602 "Resources.c"
 	}
 #line 792 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = resources_lc_measurement;
@@ -2637,7 +2638,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	_tmp11_ = index;
 #line 793 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp11_ > 0) {
-#line 2613 "Resources.c"
+#line 2614 "Resources.c"
 		const gchar* _tmp12_;
 		gint _tmp13_;
 		gchar* _tmp14_;
@@ -2651,7 +2652,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 		_g_free0 (resources_lc_measurement);
 #line 794 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_lc_measurement = _tmp14_;
-#line 2627 "Resources.c"
+#line 2628 "Resources.c"
 	}
 #line 797 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC;
@@ -2661,7 +2662,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) {
 #line 799 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL;
-#line 2637 "Resources.c"
+#line 2638 "Resources.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = resources_unit_system;
@@ -2669,7 +2670,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
 	result = _tmp16_;
 #line 802 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2645 "Resources.c"
+#line 2646 "Resources.c"
 }
 
 
@@ -2688,7 +2689,7 @@ gchar* resources_get_hh_mm_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2664 "Resources.c"
+#line 2665 "Resources.c"
 	}
 #line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
@@ -2698,7 +2699,7 @@ gchar* resources_get_hh_mm_format_string (void) {
 	result = _tmp2_;
 #line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2674 "Resources.c"
+#line 2675 "Resources.c"
 }
 
 
@@ -2713,7 +2714,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2689 "Resources.c"
+#line 2690 "Resources.c"
 	}
 #line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
@@ -2723,7 +2724,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	result = _tmp2_;
 #line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2699 "Resources.c"
+#line 2700 "Resources.c"
 }
 
 
@@ -2738,7 +2739,7 @@ gchar* resources_get_long_date_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2714 "Resources.c"
+#line 2715 "Resources.c"
 	}
 #line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
@@ -2748,7 +2749,7 @@ gchar* resources_get_long_date_format_string (void) {
 	result = _tmp2_;
 #line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2724 "Resources.c"
+#line 2725 "Resources.c"
 }
 
 
@@ -2763,7 +2764,7 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2739 "Resources.c"
+#line 2740 "Resources.c"
 	}
 #line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
@@ -2773,7 +2774,7 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	result = _tmp2_;
 #line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2749 "Resources.c"
+#line 2750 "Resources.c"
 }
 
 
@@ -2788,7 +2789,7 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2764 "Resources.c"
+#line 2765 "Resources.c"
 	}
 #line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
@@ -2798,7 +2799,7 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	result = _tmp2_;
 #line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2774 "Resources.c"
+#line 2775 "Resources.c"
 }
 
 
@@ -2813,7 +2814,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2789 "Resources.c"
+#line 2790 "Resources.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2823,7 +2824,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	result = _tmp2_;
 #line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2799 "Resources.c"
+#line 2800 "Resources.c"
 }
 
 
@@ -2838,7 +2839,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	if (_tmp0_ == NULL) {
 #line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2814 "Resources.c"
+#line 2815 "Resources.c"
 	}
 #line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2848,7 +2849,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	result = _tmp2_;
 #line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2824 "Resources.c"
+#line 2825 "Resources.c"
 }
 
 
@@ -2866,14 +2867,14 @@ gchar* resources_get_ui (const gchar* filename) {
 	result = _tmp1_;
 #line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2842 "Resources.c"
+#line 2843 "Resources.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2849 "Resources.c"
+#line 2850 "Resources.c"
 }
 
 
@@ -2887,7 +2888,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
 #line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2863 "Resources.c"
+#line 2864 "Resources.c"
 		{
 			gchar* path = NULL;
 			gchar* _tmp1_;
@@ -2909,8 +2910,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 				_g_free0 (path);
-#line 2885 "Resources.c"
-				goto __catch430_g_error;
+#line 2886 "Resources.c"
+				goto __catch438_g_error;
 			}
 #line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = _tmp2_;
@@ -2924,10 +2925,10 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_object_unref0 (_tmp2_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (path);
-#line 2900 "Resources.c"
+#line 2901 "Resources.c"
 		}
-		goto __finally430;
-		__catch430_g_error:
+		goto __finally438;
+		__catch438_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp6_;
@@ -2942,9 +2943,9 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 "e: %s", _tmp6_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 2917 "Resources.c"
+#line 2918 "Resources.c"
 		}
-		__finally430:
+		__finally438:
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2953,7 +2954,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			g_clear_error (&_inner_error_);
 #line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 2928 "Resources.c"
+#line 2929 "Resources.c"
 		}
 	}
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2964,7 +2965,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	result = _tmp8_;
 #line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2939 "Resources.c"
+#line 2940 "Resources.c"
 }
 
 
@@ -2985,7 +2986,7 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	result = icon_theme;
 #line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2960 "Resources.c"
+#line 2961 "Resources.c"
 }
 
 
@@ -3016,7 +3017,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_tmp0_ = resources_scaled_icon_cache;
 #line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 2991 "Resources.c"
+#line 2992 "Resources.c"
 		gchar* scaled_name = NULL;
 		const gchar* _tmp1_;
 		gint _tmp2_;
@@ -3040,7 +3041,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
 #line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 3015 "Resources.c"
+#line 3016 "Resources.c"
 			GeeHashMap* _tmp7_;
 			const gchar* _tmp8_;
 			gpointer _tmp9_;
@@ -3056,17 +3057,17 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 			_g_free0 (scaled_name);
 #line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3031 "Resources.c"
+#line 3032 "Resources.c"
 		}
 #line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 3035 "Resources.c"
+#line 3036 "Resources.c"
 	}
 #line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
 #line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 3041 "Resources.c"
+#line 3042 "Resources.c"
 		GeeHashMap* _tmp11_;
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -3074,7 +3075,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (resources_icon_cache);
 #line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 3049 "Resources.c"
+#line 3050 "Resources.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
@@ -3088,7 +3089,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_tmp15_ = pixbuf;
 #line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 3063 "Resources.c"
+#line 3064 "Resources.c"
 		const gchar* _tmp16_;
 		GdkPixbuf* _tmp17_;
 		GdkPixbuf* _tmp18_;
@@ -3113,7 +3114,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 			_g_object_unref0 (pixbuf);
 #line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3088 "Resources.c"
+#line 3089 "Resources.c"
 		}
 #line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
@@ -3123,7 +3124,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_tmp21_ = pixbuf;
 #line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 3098 "Resources.c"
+#line 3099 "Resources.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
@@ -3133,7 +3134,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		result = pixbuf;
 #line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3108 "Resources.c"
+#line 3109 "Resources.c"
 	}
 #line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
@@ -3147,7 +3148,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_tmp26_ = resources_scaled_icon_cache;
 #line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 3122 "Resources.c"
+#line 3123 "Resources.c"
 		GeeHashMap* _tmp27_;
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -3155,7 +3156,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (resources_scaled_icon_cache);
 #line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 3130 "Resources.c"
+#line 3131 "Resources.c"
 	}
 #line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
@@ -3179,7 +3180,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	_g_object_unref0 (pixbuf);
 #line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3154 "Resources.c"
+#line 3155 "Resources.c"
 }
 
 
@@ -3194,7 +3195,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	g_return_val_if_fail (name != NULL, NULL);
 #line 930 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3169 "Resources.c"
+#line 3170 "Resources.c"
 	{
 		gchar* path = NULL;
 		const gchar* _tmp0_;
@@ -3216,8 +3217,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (path);
-#line 3191 "Resources.c"
-			goto __catch431_g_error;
+#line 3192 "Resources.c"
+			goto __catch439_g_error;
 		}
 #line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = _tmp2_;
@@ -3231,10 +3232,10 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp2_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (path);
-#line 3206 "Resources.c"
+#line 3207 "Resources.c"
 	}
-	goto __finally431;
-	__catch431_g_error:
+	goto __finally439;
+	__catch439_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp5_;
@@ -3254,9 +3255,9 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3229 "Resources.c"
+#line 3230 "Resources.c"
 	}
-	__finally431:
+	__finally439:
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3267,7 +3268,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		g_clear_error (&_inner_error_);
 #line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3242 "Resources.c"
+#line 3243 "Resources.c"
 	}
 #line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = pixbuf;
@@ -3279,13 +3280,13 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (pixbuf);
 #line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3254 "Resources.c"
+#line 3255 "Resources.c"
 	}
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = scale;
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ > 0) {
-#line 3260 "Resources.c"
+#line 3261 "Resources.c"
 		GdkPixbuf* _tmp11_;
 		gint _tmp12_;
 		GdkPixbuf* _tmp13_;
@@ -3299,7 +3300,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp13_;
-#line 3274 "Resources.c"
+#line 3275 "Resources.c"
 	} else {
 		GdkPixbuf* _tmp14_;
 		GdkPixbuf* _tmp15_;
@@ -3311,7 +3312,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp9_);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp15_;
-#line 3286 "Resources.c"
+#line 3287 "Resources.c"
 	}
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp9_;
@@ -3319,106 +3320,151 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	_g_object_unref0 (pixbuf);
 #line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3294 "Resources.c"
+#line 3295 "Resources.c"
 }
 
 
 gchar* resources_get_help_path (void) {
 	gchar* result = NULL;
-	GFile* help_dir = NULL;
+	GFile* dir = NULL;
 	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
-	GFile* _tmp3_;
-	GFile* _tmp4_;
-	GFile* _tmp5_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
+	gboolean _tmp5_;
+	GFile* help_dir = NULL;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
 	GFile* help_index = NULL;
-	GFile* _tmp6_;
-	GFile* _tmp7_;
-	GFile* _tmp8_;
-	gboolean _tmp9_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+	GFile* _tmp15_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	gboolean _tmp18_;
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _tmp0_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_file_get_child (_tmp1_, "help");
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+	dir = _tmp0_;
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = dir;
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = g_file_get_path (_tmp1_);
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = g_file_get_child (_tmp3_, "C");
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = _tmp4_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp1_);
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
-	help_dir = _tmp5_;
 #line 953 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = help_dir;
+	_tmp4_ = g_str_has_suffix (_tmp3_, "src");
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp5_ = _tmp4_;
 #line 953 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = g_file_get_child (_tmp6_, "index.page");
+	_g_free0 (_tmp3_);
 #line 953 "/home/jens/Source/shotwell/src/Resources.vala"
-	help_index = _tmp7_;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp8_ = help_index;
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp9_) {
-#line 3342 "Resources.c"
-		gchar* help_path = NULL;
-		GFile* _tmp10_;
-		gchar* _tmp11_;
-		const gchar* _tmp12_;
-		gboolean _tmp13_;
-#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp10_ = help_dir;
+	if (_tmp5_) {
+#line 3337 "Resources.c"
+		GFile* _tmp6_;
+		GFile* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp6_ = dir;
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp7_ = g_file_get_parent (_tmp6_);
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp8_ = _tmp7_;
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp9_ = g_file_get_parent (_tmp8_);
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (dir);
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		dir = _tmp9_;
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp8_);
+#line 3356 "Resources.c"
+	}
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp10_ = dir;
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp11_ = g_file_get_child (_tmp10_, "help");
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp12_ = _tmp11_;
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp13_ = g_file_get_child (_tmp12_, "C");
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp14_ = _tmp13_;
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (_tmp12_);
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+	help_dir = _tmp14_;
 #line 958 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = g_file_get_path (_tmp10_);
+	_tmp15_ = help_dir;
 #line 958 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_free0 (help_path);
+	_tmp16_ = g_file_get_child (_tmp15_, "index.page");
 #line 958 "/home/jens/Source/shotwell/src/Resources.vala"
-		help_path = _tmp11_;
+	help_index = _tmp16_;
 #line 960 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp12_ = help_path;
+	_tmp17_ = help_index;
 #line 960 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
+	_tmp18_ = g_file_query_exists (_tmp17_, NULL);
 #line 960 "/home/jens/Source/shotwell/src/Resources.vala"
-		if (!_tmp13_) {
-#line 3362 "Resources.c"
-			const gchar* _tmp14_;
-			gchar* _tmp15_;
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp14_ = help_path;
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp15_ = g_strconcat (_tmp14_, "/", NULL);
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp18_) {
+#line 3384 "Resources.c"
+		gchar* help_path = NULL;
+		GFile* _tmp19_;
+		gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gboolean _tmp22_;
+#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp19_ = help_dir;
+#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp20_ = g_file_get_path (_tmp19_);
+#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (help_path);
+#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+		help_path = _tmp20_;
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp21_ = help_path;
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp22_ = g_str_has_suffix (_tmp21_, "/");
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
+		if (!_tmp22_) {
+#line 3404 "Resources.c"
+			const gchar* _tmp23_;
+			gchar* _tmp24_;
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp23_ = help_path;
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp24_ = g_strconcat (_tmp23_, "/", NULL);
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
-			help_path = _tmp15_;
-#line 3373 "Resources.c"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+			help_path = _tmp24_;
+#line 3415 "Resources.c"
 		}
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_index);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_dir);
-#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (dir);
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3383 "Resources.c"
+#line 3427 "Resources.c"
 	}
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_index);
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_dir);
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (dir);
+#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3393 "Resources.c"
+#line 3439 "Resources.c"
 }
 
 
@@ -3428,17 +3474,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 	const gchar* _tmp1_;
 	const gchar* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 979 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_help_path ();
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 979 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_path = _tmp0_;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = help_path;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3413 "Resources.c"
+#line 3459 "Resources.c"
 		const gchar* _tmp2_;
 		gchar** argv = NULL;
 		gchar** _tmp6_;
@@ -3470,179 +3516,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		gchar** _tmp25_;
 		gint _tmp25__length1;
 		const gchar* _tmp26_;
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3449 "Resources.c"
+#line 3495 "Resources.c"
 			const gchar* _tmp3_;
 			const gchar* _tmp4_;
 			gchar* _tmp5_;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = anchor;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3463 "Resources.c"
+#line 3509 "Resources.c"
 		}
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = _tmp6_;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv_length1 = 3;
-#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
 		_argv_size_ = argv_length1;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = argv;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7__length1 = argv_length1;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_strdup ("yelp");
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp7_[0]);
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_[0] = _tmp8_;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp7_[0];
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = argv;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10__length1 = argv_length1;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = help_path;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp10_[1]);
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_[1] = _tmp12_;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = _tmp10_[1];
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = argv;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14__length1 = argv_length1;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp14_[2]);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_[2] = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_[2];
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = app_dirs_get_exec_dir ();
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = _tmp17_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = _tmp19_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = argv;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21__length1 = argv_length1;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		pid = _tmp22_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = _tmp23_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp20_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp18_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp24_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3543 "Resources.c"
+#line 3589 "Resources.c"
 		}
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3553 "Resources.c"
+#line 3599 "Resources.c"
 		}
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25__length1 = argv_length1;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp26_ = _tmp25_[0];
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:995: Unable to launch %s", _tmp26_);
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:1000: Unable to launch %s", _tmp26_);
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3565 "Resources.c"
+#line 3611 "Resources.c"
 	}
-#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
-#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 3571 "Resources.c"
+#line 3617 "Resources.c"
 		GdkScreen* _tmp28_;
 		const gchar* _tmp29_;
 		gchar* _tmp30_;
 		gchar* _tmp31_;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp29_ = anchor;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp31_ = _tmp30_;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp31_);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3596 "Resources.c"
+#line 3642 "Resources.c"
 		}
 	} else {
 		GdkScreen* _tmp32_;
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3612 "Resources.c"
+#line 3658 "Resources.c"
 		}
 	}
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 3617 "Resources.c"
+#line 3663 "Resources.c"
 }
 
 
@@ -3658,33 +3704,33 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	GdkRGBA _tmp4_;
 	gdouble _tmp5_;
 	gchar* _tmp6_;
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = *color;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_.red;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
 	r = (gint) (_tmp1_ * 255);
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = *color;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_.green;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 	g = (gint) (_tmp3_ * 255);
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = *color;
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_.blue;
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Resources.vala"
 	b = (gint) (_tmp5_ * 255);
-#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b);
-#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3659 "Resources.c"
+#line 3705 "Resources.c"
 }
 
 
@@ -3702,136 +3748,177 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	GtkWidget* _tmp21_;
 	GtkCssProvider* _tmp22_;
 	GError * _inner_error_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stylesheet != NULL);
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_providers;
-#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 3685 "Resources.c"
+#line 3731 "Resources.c"
 		GeeHashMap* _tmp1_;
-#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
-#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 3693 "Resources.c"
+#line 3739 "Resources.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = widget;
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 3703 "Resources.c"
+#line 3749 "Resources.c"
 		GtkWidget* _tmp5_;
 		GtkStyleContext* _tmp6_;
 		GeeMap* _tmp7_;
 		GtkWidget* _tmp8_;
 		gpointer _tmp9_;
 		GtkCssProvider* _tmp10_;
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = resources_providers;
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = widget;
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = gee_map_get (_tmp7_, _tmp8_);
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = (GtkCssProvider*) _tmp9_;
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider));
-#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 3726 "Resources.c"
+#line 3772 "Resources.c"
 	}
-#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
-#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 3732 "Resources.c"
+#line 3778 "Resources.c"
 	{
 		GtkCssProvider* _tmp12_;
 		const gchar* _tmp13_;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stylesheet;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3744 "Resources.c"
-			goto __catch432_g_error;
+#line 3790 "Resources.c"
+			goto __catch440_g_error;
 		}
 	}
-	goto __finally432;
-	__catch432_g_error:
+	goto __finally440;
+	__catch440_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_;
 		GError* _tmp15_;
 		const gchar* _tmp16_;
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = stylesheet;
-#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = e;
-#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:1030: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (e);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3773 "Resources.c"
+#line 3819 "Resources.c"
 	}
-	__finally432:
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally440:
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3786 "Resources.c"
+#line 3832 "Resources.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
-#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = gtk_widget_get_style_context (_tmp17_);
-#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = styler;
-#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = resources_providers;
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = widget;
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = styler;
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 3806 "Resources.c"
+#line 3852 "Resources.c"
+}
+
+
+gint resources_use_header_bar (void) {
+	gint result = 0;
+	const gchar* _tmp0_;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp1_;
+	gint _tmp2_ = 0;
+	gboolean _tmp3_;
+#line 1049 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = g_getenv ("SHOTWELL_USE_HEADERBARS");
+#line 1049 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp0_ != NULL) {
+#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+		result = 0;
+#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+		return result;
+#line 3871 "Resources.c"
+	}
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = gtk_settings_get_default ();
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = use_header;
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp3_) {
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = 1;
+#line 3883 "Resources.c"
+	} else {
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = 0;
+#line 3887 "Resources.c"
+	}
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp2_;
+#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+	return result;
+#line 3893 "Resources.c"
 }
 
 
diff --git a/src/Resources.vala b/src/Resources.vala
index e26448a..ef86424 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -88,7 +88,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
 
     
     //public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
-    public const string ICON_ABOUT_LOGO = "about-aachen.jpg";
+    public const string ICON_ABOUT_LOGO = "about-braunschweig.jpg";
     public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
     public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point";
     public const string ICON_RATING_REJECTED = "rejected.svg";
@@ -948,8 +948,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         // Try looking for our 'index.page' in the build directory.
         //
         // TODO: Need to look for internationalized help before falling back on help/C
+        File dir = AppDirs.get_exec_dir();
         
-        File help_dir = AppDirs.get_exec_dir().get_child("help").get_child("C");
+        if (dir.get_path().has_suffix("src")) {
+            dir = dir.get_parent().get_parent();
+        }
+
+        File help_dir = dir.get_child("help").get_child("C");
         File help_index = help_dir.get_child("index.page");
         
         if (help_index.query_exists(null)) {
@@ -1040,6 +1045,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         providers.set(widget, styler);
     }
 
+    public static int use_header_bar() {
+        if (Environment.get_variable("SHOTWELL_USE_HEADERBARS") != null) {
+            return 0;
+        }
+
+        bool use_header;
+        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+
+        return use_header ? 1 : 0;
+    }
+
     public const string CUSTOM_CSS =
          """LibraryWindow .pane-separator {
                background-color: @borders;
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index c40b19f..00b08ac 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -566,7 +566,6 @@ typedef struct _SearchFilterToolbarSavedSearchPopoverClass SearchFilterToolbarSa
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 #define TYPE_COMMAND_MANAGER (command_manager_get_type ())
 #define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager))
@@ -1076,7 +1075,7 @@ gboolean is_string_empty (const gchar* s);
 const gchar* search_view_filter_get_search_filter (SearchViewFilter* self);
 gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
 void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* text);
-static gchar** _vala_array_dup32 (gchar** self, int length);
+static gchar** _vala_array_dup27 (gchar** self, int length);
 void search_view_filter_clear_search_filter (SearchViewFilter* self);
 gboolean search_view_filter_has_saved_search (SearchViewFilter* self);
 SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self);
@@ -1337,12 +1336,6 @@ void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpoin
 gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* value);
 GType search_filter_toolbar_saved_search_popover_get_type (void) G_GNUC_CONST;
 void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search);
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search);
@@ -1454,8 +1447,8 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
 gchar* data_object_get_name (DataObject* self);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name);
-static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
 static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
+static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
 void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self);
 static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self);
 static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row);
@@ -1510,7 +1503,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
 	g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return _tmp0_;
-#line 1514 "SearchFilter.c"
+#line 1507 "SearchFilter.c"
 }
 
 
@@ -1519,7 +1512,7 @@ guint search_view_filter_get_criteria (SearchViewFilter* self) {
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0U);
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return SEARCH_VIEW_FILTER_GET_CLASS (self)->get_criteria (self);
-#line 1523 "SearchFilter.c"
+#line 1516 "SearchFilter.c"
 }
 
 
@@ -1538,7 +1531,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 	switch (_tmp1_) {
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1542 "SearchFilter.c"
+#line 1535 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1546,11 +1539,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 73 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1550 "SearchFilter.c"
+#line 1543 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1554 "SearchFilter.c"
+#line 1547 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1558,11 +1551,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 78 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1562 "SearchFilter.c"
+#line 1555 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1566 "SearchFilter.c"
+#line 1559 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1570,11 +1563,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 83 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1574 "SearchFilter.c"
+#line 1567 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1578 "SearchFilter.c"
+#line 1571 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1582,11 +1575,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 88 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1586 "SearchFilter.c"
+#line 1579 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1590 "SearchFilter.c"
+#line 1583 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1594,11 +1587,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 93 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1598 "SearchFilter.c"
+#line 1591 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1602 "SearchFilter.c"
+#line 1595 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1606,11 +1599,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 98 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1610 "SearchFilter.c"
+#line 1603 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1614 "SearchFilter.c"
+#line 1607 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1618,11 +1611,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1622 "SearchFilter.c"
+#line 1615 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1626 "SearchFilter.c"
+#line 1619 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1630,11 +1623,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1634 "SearchFilter.c"
+#line 1627 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1638 "SearchFilter.c"
+#line 1631 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1642,11 +1635,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1646 "SearchFilter.c"
+#line 1639 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1650 "SearchFilter.c"
+#line 1643 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1654,11 +1647,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1658 "SearchFilter.c"
+#line 1651 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1662 "SearchFilter.c"
+#line 1655 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1666,11 +1659,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1670 "SearchFilter.c"
+#line 1663 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1674 "SearchFilter.c"
+#line 1667 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1678,12 +1671,12 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1682 "SearchFilter.c"
+#line 1675 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1687 "SearchFilter.c"
+#line 1680 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1691,7 +1684,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1695 "SearchFilter.c"
+#line 1688 "SearchFilter.c"
 		}
 	}
 }
@@ -1711,7 +1704,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1715 "SearchFilter.c"
+#line 1708 "SearchFilter.c"
 }
 
 
@@ -1726,7 +1719,7 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1730 "SearchFilter.c"
+#line 1723 "SearchFilter.c"
 }
 
 
@@ -1750,34 +1743,34 @@ gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int*
 	if (result_length1) {
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp1__length1;
-#line 1754 "SearchFilter.c"
+#line 1747 "SearchFilter.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1760 "SearchFilter.c"
+#line 1753 "SearchFilter.c"
 }
 
 
-static gchar** _vala_array_dup32 (gchar** self, int length) {
+static gchar** _vala_array_dup27 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	for (i = 0; i < length; i++) {
-#line 1771 "SearchFilter.c"
+#line 1764 "SearchFilter.c"
 		gchar* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result[i] = _tmp0_;
-#line 1777 "SearchFilter.c"
+#line 1770 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1781 "SearchFilter.c"
+#line 1774 "SearchFilter.c"
 }
 
 
@@ -1800,7 +1793,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp2_ = is_string_empty (_tmp1_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!_tmp2_) {
-#line 1804 "SearchFilter.c"
+#line 1797 "SearchFilter.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1811,13 +1804,13 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp4_;
-#line 1815 "SearchFilter.c"
+#line 1808 "SearchFilter.c"
 	} else {
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = NULL;
-#line 1821 "SearchFilter.c"
+#line 1814 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1829,7 +1822,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp7_ = self->priv->search_filter;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp7_ != NULL) {
-#line 1833 "SearchFilter.c"
+#line 1826 "SearchFilter.c"
 		const gchar* _tmp8_;
 		gchar** _tmp9_;
 		gchar** _tmp10_;
@@ -1845,7 +1838,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = _vala_array_length (_tmp9_);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1849 "SearchFilter.c"
+#line 1842 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1855,10 +1848,10 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = 0;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1859 "SearchFilter.c"
+#line 1852 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup27 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11__length1 = _tmp6__length1;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1873,7 +1866,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
 #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (_tmp0_);
-#line 1877 "SearchFilter.c"
+#line 1870 "SearchFilter.c"
 }
 
 
@@ -1892,7 +1885,7 @@ void search_view_filter_clear_search_filter (SearchViewFilter* self) {
 	self->priv->search_filter_words_length1 = 0;
 #line 157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
-#line 1896 "SearchFilter.c"
+#line 1889 "SearchFilter.c"
 }
 
 
@@ -1907,7 +1900,7 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) {
 	result = _tmp0_ != NULL;
 #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1911 "SearchFilter.c"
+#line 1904 "SearchFilter.c"
 }
 
 
@@ -1922,7 +1915,7 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1926 "SearchFilter.c"
+#line 1919 "SearchFilter.c"
 }
 
 
@@ -1937,7 +1930,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1941 "SearchFilter.c"
+#line 1934 "SearchFilter.c"
 }
 
 
@@ -1955,31 +1948,31 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 	if (_tmp3_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 1959 "SearchFilter.c"
+#line 1952 "SearchFilter.c"
 	} else {
 		gboolean _tmp4_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->_show_media_photos;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_;
-#line 1966 "SearchFilter.c"
+#line 1959 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = TRUE;
-#line 1972 "SearchFilter.c"
+#line 1965 "SearchFilter.c"
 	} else {
 		gboolean _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->_show_media_raw;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = _tmp5_;
-#line 1979 "SearchFilter.c"
+#line 1972 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1983 "SearchFilter.c"
+#line 1976 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_;
@@ -1987,45 +1980,45 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 		_tmp8_ = self->priv->_show_media_video;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp8_) {
-#line 1991 "SearchFilter.c"
+#line 1984 "SearchFilter.c"
 			gboolean _tmp9_;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = self->priv->_show_media_photos;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = _tmp9_;
-#line 1997 "SearchFilter.c"
+#line 1990 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 2001 "SearchFilter.c"
+#line 1994 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 2005 "SearchFilter.c"
+#line 1998 "SearchFilter.c"
 			gboolean _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp10_ = self->priv->_show_media_raw;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp10_;
-#line 2011 "SearchFilter.c"
+#line 2004 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 2015 "SearchFilter.c"
+#line 2008 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 2019 "SearchFilter.c"
+#line 2012 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 2023 "SearchFilter.c"
+#line 2016 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2029 "SearchFilter.c"
+#line 2022 "SearchFilter.c"
 }
 
 
@@ -2035,7 +2028,7 @@ SearchViewFilter* search_view_filter_construct (GType object_type) {
 	self = (SearchViewFilter*) view_filter_construct (object_type);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2039 "SearchFilter.c"
+#line 2032 "SearchFilter.c"
 }
 
 
@@ -2050,7 +2043,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2054 "SearchFilter.c"
+#line 2047 "SearchFilter.c"
 }
 
 
@@ -2062,7 +2055,7 @@ void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) {
 	_tmp0_ = value;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_flagged = _tmp0_;
-#line 2066 "SearchFilter.c"
+#line 2059 "SearchFilter.c"
 }
 
 
@@ -2077,7 +2070,7 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2081 "SearchFilter.c"
+#line 2074 "SearchFilter.c"
 }
 
 
@@ -2089,7 +2082,7 @@ void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean v
 	_tmp0_ = value;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_video = _tmp0_;
-#line 2093 "SearchFilter.c"
+#line 2086 "SearchFilter.c"
 }
 
 
@@ -2104,7 +2097,7 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2108 "SearchFilter.c"
+#line 2101 "SearchFilter.c"
 }
 
 
@@ -2116,7 +2109,7 @@ void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean
 	_tmp0_ = value;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_photos = _tmp0_;
-#line 2120 "SearchFilter.c"
+#line 2113 "SearchFilter.c"
 }
 
 
@@ -2131,7 +2124,7 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2135 "SearchFilter.c"
+#line 2128 "SearchFilter.c"
 }
 
 
@@ -2143,7 +2136,7 @@ void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean val
 	_tmp0_ = value;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_raw = _tmp0_;
-#line 2147 "SearchFilter.c"
+#line 2140 "SearchFilter.c"
 }
 
 
@@ -2158,14 +2151,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2162 "SearchFilter.c"
+#line 2155 "SearchFilter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2169 "SearchFilter.c"
+#line 2162 "SearchFilter.c"
 }
 
 
@@ -2182,7 +2175,7 @@ void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* v
 	_g_object_unref0 (self->priv->_saved_search);
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = _tmp1_;
-#line 2186 "SearchFilter.c"
+#line 2179 "SearchFilter.c"
 }
 
 
@@ -2195,7 +2188,7 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate));
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) search_view_filter_real_get_criteria;
-#line 2199 "SearchFilter.c"
+#line 2192 "SearchFilter.c"
 }
 
 
@@ -2226,7 +2219,7 @@ static void search_view_filter_instance_init (SearchViewFilter * self) {
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = NULL;
-#line 2230 "SearchFilter.c"
+#line 2223 "SearchFilter.c"
 }
 
 
@@ -2242,7 +2235,7 @@ static void search_view_filter_finalize (ViewFilter * obj) {
 	_g_object_unref0 (self->priv->_saved_search);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	VIEW_FILTER_CLASS (search_view_filter_parent_class)->finalize (obj);
-#line 2246 "SearchFilter.c"
+#line 2239 "SearchFilter.c"
 }
 
 
@@ -2274,7 +2267,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2278 "SearchFilter.c"
+#line 2271 "SearchFilter.c"
 }
 
 
@@ -2312,14 +2305,14 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp3_ = criteria;
 #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_RATING & _tmp3_) != 0) {
-#line 2316 "SearchFilter.c"
+#line 2309 "SearchFilter.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp5_) {
-#line 2323 "SearchFilter.c"
+#line 2316 "SearchFilter.c"
 			MediaSource* _tmp6_;
 			Rating _tmp7_;
 			Rating _tmp8_;
@@ -2331,11 +2324,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp8_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = _tmp7_ < _tmp8_;
-#line 2335 "SearchFilter.c"
+#line 2328 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2339 "SearchFilter.c"
+#line 2332 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2345,7 +2338,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2349 "SearchFilter.c"
+#line 2342 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_;
@@ -2353,7 +2346,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp10_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (!_tmp10_) {
-#line 2357 "SearchFilter.c"
+#line 2350 "SearchFilter.c"
 				MediaSource* _tmp11_;
 				Rating _tmp12_;
 				Rating _tmp13_;
@@ -2365,11 +2358,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp13_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = _tmp12_ != _tmp13_;
-#line 2369 "SearchFilter.c"
+#line 2362 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2373 "SearchFilter.c"
+#line 2366 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2379,7 +2372,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2383 "SearchFilter.c"
+#line 2376 "SearchFilter.c"
 			}
 		}
 	}
@@ -2387,7 +2380,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp14_ = criteria;
 #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp14_) != 0) {
-#line 2391 "SearchFilter.c"
+#line 2384 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_;
@@ -2398,21 +2391,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp18_ = _tmp17_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp18_) {
-#line 2402 "SearchFilter.c"
+#line 2395 "SearchFilter.c"
 			MediaSource* _tmp19_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = source;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE);
-#line 2408 "SearchFilter.c"
+#line 2401 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2412 "SearchFilter.c"
+#line 2405 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2416 "SearchFilter.c"
+#line 2409 "SearchFilter.c"
 			MediaSource* _tmp20_;
 			gboolean _tmp21_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2421,11 +2414,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp21_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_FLAGGABLE, Flaggable));
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = !_tmp21_;
-#line 2425 "SearchFilter.c"
+#line 2418 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2429 "SearchFilter.c"
+#line 2422 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2435,34 +2428,34 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2439 "SearchFilter.c"
+#line 2432 "SearchFilter.c"
 		}
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp23_ = criteria;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp23_) != 0) {
-#line 2446 "SearchFilter.c"
+#line 2439 "SearchFilter.c"
 		gboolean _tmp24_;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = _tmp24_;
-#line 2452 "SearchFilter.c"
+#line 2445 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2456 "SearchFilter.c"
+#line 2449 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2460 "SearchFilter.c"
+#line 2453 "SearchFilter.c"
 		MediaSource* _tmp25_;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp25_ = source;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) {
-#line 2466 "SearchFilter.c"
+#line 2459 "SearchFilter.c"
 			gboolean _tmp26_;
 			gboolean _tmp27_;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2477,7 +2470,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2481 "SearchFilter.c"
+#line 2474 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_;
@@ -2485,7 +2478,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp28_ = source;
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) {
-#line 2489 "SearchFilter.c"
+#line 2482 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_;
 				Photo* _tmp30_;
@@ -2503,7 +2496,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp32_ = photo_get_master_file_format (_tmp31_);
 #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				if (_tmp32_ == PHOTO_FILE_FORMAT_RAW) {
-#line 2507 "SearchFilter.c"
+#line 2500 "SearchFilter.c"
 					gboolean _tmp33_ = FALSE;
 					gboolean _tmp34_;
 					gboolean _tmp35_;
@@ -2513,7 +2506,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp35_ = _tmp34_;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (!_tmp35_) {
-#line 2517 "SearchFilter.c"
+#line 2510 "SearchFilter.c"
 						gboolean _tmp36_;
 						gboolean _tmp37_;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2522,11 +2515,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp37_ = _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp33_ = !_tmp37_;
-#line 2526 "SearchFilter.c"
+#line 2519 "SearchFilter.c"
 					} else {
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp33_ = FALSE;
-#line 2530 "SearchFilter.c"
+#line 2523 "SearchFilter.c"
 					}
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp33_) {
@@ -2538,7 +2531,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_g_object_unref0 (source);
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2542 "SearchFilter.c"
+#line 2535 "SearchFilter.c"
 					}
 				} else {
 					gboolean _tmp38_;
@@ -2557,12 +2550,12 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_g_object_unref0 (source);
 #line 210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2561 "SearchFilter.c"
+#line 2554 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2566 "SearchFilter.c"
+#line 2559 "SearchFilter.c"
 			}
 		}
 	}
@@ -2570,21 +2563,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp41_ = criteria;
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp41_) != 0) {
-#line 2574 "SearchFilter.c"
+#line 2567 "SearchFilter.c"
 		gboolean _tmp42_;
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp42_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp40_ = _tmp42_;
-#line 2580 "SearchFilter.c"
+#line 2573 "SearchFilter.c"
 	} else {
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp40_ = FALSE;
-#line 2584 "SearchFilter.c"
+#line 2577 "SearchFilter.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp40_) {
-#line 2588 "SearchFilter.c"
+#line 2581 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp43_;
 		const gchar* _tmp44_;
@@ -2620,7 +2613,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp47_ = event;
 #line 220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp47_ != NULL) {
-#line 2624 "SearchFilter.c"
+#line 2617 "SearchFilter.c"
 			Event* _tmp48_;
 			const gchar* _tmp49_;
 #line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2629,7 +2622,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp49_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_INDEXABLE, Indexable));
 #line 221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			event_keywords = _tmp49_;
-#line 2633 "SearchFilter.c"
+#line 2626 "SearchFilter.c"
 		}
 #line 223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp50_ = tag_global;
@@ -2643,7 +2636,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp54_ = tags;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp54_ != NULL) {
-#line 2647 "SearchFilter.c"
+#line 2640 "SearchFilter.c"
 			GeeList* _tmp55_;
 			gint _tmp56_;
 			gint _tmp57_;
@@ -2655,17 +2648,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp57_ = _tmp56_;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp53_ = _tmp57_;
-#line 2659 "SearchFilter.c"
+#line 2652 "SearchFilter.c"
 		} else {
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp53_ = 0;
-#line 2663 "SearchFilter.c"
+#line 2656 "SearchFilter.c"
 		}
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tags_size = _tmp53_;
 #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp59_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp58_);
-#line 2669 "SearchFilter.c"
+#line 2662 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2677,11 +2670,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			word_collection_length1 = _tmp58_;
 #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			for (word_it = 0; word_it < _tmp58_; word_it = word_it + 1) {
-#line 2681 "SearchFilter.c"
+#line 2674 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 226 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2685 "SearchFilter.c"
+#line 2678 "SearchFilter.c"
 				{
 					gboolean _tmp60_ = FALSE;
 					const gchar* _tmp61_;
@@ -2692,7 +2685,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp61_ = media_keywords;
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp61_ != NULL) {
-#line 2696 "SearchFilter.c"
+#line 2689 "SearchFilter.c"
 						const gchar* _tmp62_;
 						const gchar* _tmp63_;
 						gboolean _tmp64_;
@@ -2704,23 +2697,23 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp64_ = string_contains (_tmp62_, _tmp63_);
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp60_ = _tmp64_;
-#line 2708 "SearchFilter.c"
+#line 2701 "SearchFilter.c"
 					} else {
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp60_ = FALSE;
-#line 2712 "SearchFilter.c"
+#line 2705 "SearchFilter.c"
 					}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp60_) {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2718 "SearchFilter.c"
+#line 2711 "SearchFilter.c"
 					}
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp66_ = event_keywords;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp66_ != NULL) {
-#line 2724 "SearchFilter.c"
+#line 2717 "SearchFilter.c"
 						const gchar* _tmp67_;
 						const gchar* _tmp68_;
 						gboolean _tmp69_;
@@ -2732,40 +2725,40 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp69_ = string_contains (_tmp67_, _tmp68_);
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp65_ = _tmp69_;
-#line 2736 "SearchFilter.c"
+#line 2729 "SearchFilter.c"
 					} else {
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp65_ = FALSE;
-#line 2740 "SearchFilter.c"
+#line 2733 "SearchFilter.c"
 					}
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp65_) {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2746 "SearchFilter.c"
+#line 2739 "SearchFilter.c"
 					}
 #line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp70_ = tags_size;
 #line 233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp70_ > 0) {
-#line 2752 "SearchFilter.c"
+#line 2745 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp86_;
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2757 "SearchFilter.c"
+#line 2750 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2762 "SearchFilter.c"
+#line 2755 "SearchFilter.c"
 							{
 								gboolean _tmp71_ = FALSE;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								_tmp71_ = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								while (TRUE) {
-#line 2769 "SearchFilter.c"
+#line 2762 "SearchFilter.c"
 									gint _tmp73_;
 									gint _tmp74_;
 									const gchar* tag_keywords = NULL;
@@ -2779,13 +2772,13 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									const gchar* _tmp82_;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (!_tmp71_) {
-#line 2783 "SearchFilter.c"
+#line 2776 "SearchFilter.c"
 										gint _tmp72_;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp72_ = ctr;
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										ctr = _tmp72_ + 1;
-#line 2789 "SearchFilter.c"
+#line 2782 "SearchFilter.c"
 									}
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp71_ = FALSE;
@@ -2797,7 +2790,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									if (!(_tmp73_ < _tmp74_)) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2801 "SearchFilter.c"
+#line 2794 "SearchFilter.c"
 									}
 #line 236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = tags;
@@ -2819,7 +2812,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									_tmp82_ = tag_keywords;
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp82_ != NULL) {
-#line 2823 "SearchFilter.c"
+#line 2816 "SearchFilter.c"
 										const gchar* _tmp83_;
 										const gchar* _tmp84_;
 										gboolean _tmp85_;
@@ -2831,11 +2824,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										_tmp85_ = string_contains (_tmp83_, _tmp84_);
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp81_ = _tmp85_;
-#line 2835 "SearchFilter.c"
+#line 2828 "SearchFilter.c"
 									} else {
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp81_ = FALSE;
-#line 2839 "SearchFilter.c"
+#line 2832 "SearchFilter.c"
 									}
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp81_) {
@@ -2843,7 +2836,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										found = TRUE;
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2847 "SearchFilter.c"
+#line 2840 "SearchFilter.c"
 									}
 								}
 							}
@@ -2854,7 +2847,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						if (_tmp86_) {
 #line 245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							continue;
-#line 2858 "SearchFilter.c"
+#line 2851 "SearchFilter.c"
 						}
 					}
 #line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2867,7 +2860,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_g_object_unref0 (source);
 #line 250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					return result;
-#line 2871 "SearchFilter.c"
+#line 2864 "SearchFilter.c"
 				}
 			}
 		}
@@ -2875,27 +2868,27 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (tags);
 #line 215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (event);
-#line 2879 "SearchFilter.c"
+#line 2872 "SearchFilter.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp88_ = criteria;
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp88_) != 0) {
-#line 2885 "SearchFilter.c"
+#line 2878 "SearchFilter.c"
 		gboolean _tmp89_;
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp89_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp87_ = _tmp89_;
-#line 2891 "SearchFilter.c"
+#line 2884 "SearchFilter.c"
 	} else {
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp87_ = FALSE;
-#line 2895 "SearchFilter.c"
+#line 2888 "SearchFilter.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp87_) {
-#line 2899 "SearchFilter.c"
+#line 2892 "SearchFilter.c"
 		SavedSearch* _tmp90_;
 		SavedSearch* _tmp91_;
 		MediaSource* _tmp92_;
@@ -2914,7 +2907,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (source);
 #line 256 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 2918 "SearchFilter.c"
+#line 2911 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2922,7 +2915,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_g_object_unref0 (source);
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2926 "SearchFilter.c"
+#line 2919 "SearchFilter.c"
 }
 
 
@@ -2932,7 +2925,7 @@ DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type
 	self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2936 "SearchFilter.c"
+#line 2929 "SearchFilter.c"
 }
 
 
@@ -2941,7 +2934,7 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass
 	default_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) default_search_view_filter_real_predicate;
-#line 2945 "SearchFilter.c"
+#line 2938 "SearchFilter.c"
 }
 
 
@@ -2972,7 +2965,7 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView*
 	result = TRUE;
 #line 265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2976 "SearchFilter.c"
+#line 2969 "SearchFilter.c"
 }
 
 
@@ -2985,7 +2978,7 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) {
 	result = (guint) SEARCH_FILTER_CRITERIA_RATING;
 #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2989 "SearchFilter.c"
+#line 2982 "SearchFilter.c"
 }
 
 
@@ -2995,14 +2988,14 @@ DisabledViewFilter* disabled_view_filter_construct (GType object_type) {
 	self = (DisabledViewFilter*) search_view_filter_construct (object_type);
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2999 "SearchFilter.c"
+#line 2992 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_new (void) {
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER);
-#line 3006 "SearchFilter.c"
+#line 2999 "SearchFilter.c"
 }
 
 
@@ -3013,7 +3006,7 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) disabled_view_filter_real_predicate;
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) disabled_view_filter_real_get_criteria;
-#line 3017 "SearchFilter.c"
+#line 3010 "SearchFilter.c"
 }
 
 
@@ -3049,14 +3042,14 @@ TextAction* text_action_construct (GType object_type, const gchar* init) {
 	self->priv->text = _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3053 "SearchFilter.c"
+#line 3046 "SearchFilter.c"
 }
 
 
 TextAction* text_action_new (const gchar* init) {
 #line 290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return text_action_construct (TYPE_TEXT_ACTION, init);
-#line 3060 "SearchFilter.c"
+#line 3053 "SearchFilter.c"
 }
 
 
@@ -3071,7 +3064,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 	_tmp1_ = text;
 #line 295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) != 0) {
-#line 3075 "SearchFilter.c"
+#line 3068 "SearchFilter.c"
 		const gchar* _tmp2_;
 		gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -3087,7 +3080,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 		_tmp4_ = text;
 #line 297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit (self, text_action_signals[TEXT_ACTION_TEXT_CHANGED_SIGNAL], 0, _tmp4_);
-#line 3091 "SearchFilter.c"
+#line 3084 "SearchFilter.c"
 	}
 }
 
@@ -3097,7 +3090,7 @@ void text_action_clear (TextAction* self) {
 	g_return_if_fail (IS_TEXT_ACTION (self));
 #line 302 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (self, NULL);
-#line 3101 "SearchFilter.c"
+#line 3094 "SearchFilter.c"
 }
 
 
@@ -3112,7 +3105,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3116 "SearchFilter.c"
+#line 3109 "SearchFilter.c"
 }
 
 
@@ -3127,7 +3120,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 	_tmp1_ = sensitive;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3131 "SearchFilter.c"
+#line 3124 "SearchFilter.c"
 		gboolean _tmp2_;
 		gboolean _tmp3_;
 #line 311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3138,7 +3131,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 		_tmp3_ = sensitive;
 #line 312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit (self, text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL], 0, _tmp3_);
-#line 3142 "SearchFilter.c"
+#line 3135 "SearchFilter.c"
 	}
 }
 
@@ -3154,7 +3147,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 317 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3158 "SearchFilter.c"
+#line 3151 "SearchFilter.c"
 }
 
 
@@ -3169,7 +3162,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 	_tmp1_ = visible;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3173 "SearchFilter.c"
+#line 3166 "SearchFilter.c"
 		gboolean _tmp2_;
 		gboolean _tmp3_;
 #line 322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3180,7 +3173,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 		_tmp3_ = visible;
 #line 323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit (self, text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
-#line 3184 "SearchFilter.c"
+#line 3177 "SearchFilter.c"
 	}
 }
 
@@ -3196,14 +3189,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3200 "SearchFilter.c"
+#line 3193 "SearchFilter.c"
 }
 
 
 static void value_text_action_init (GValue* value) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 3207 "SearchFilter.c"
+#line 3200 "SearchFilter.c"
 }
 
 
@@ -3212,7 +3205,7 @@ static void value_text_action_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (value->data[0].v_pointer);
-#line 3216 "SearchFilter.c"
+#line 3209 "SearchFilter.c"
 	}
 }
 
@@ -3222,11 +3215,11 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer);
-#line 3226 "SearchFilter.c"
+#line 3219 "SearchFilter.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3230 "SearchFilter.c"
+#line 3223 "SearchFilter.c"
 	}
 }
 
@@ -3234,37 +3227,37 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_text_action_peek_pointer (const GValue* value) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3238 "SearchFilter.c"
+#line 3231 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 3245 "SearchFilter.c"
+#line 3238 "SearchFilter.c"
 		TextAction * object;
 		object = collect_values[0].v_pointer;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3252 "SearchFilter.c"
+#line 3245 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3256 "SearchFilter.c"
+#line 3249 "SearchFilter.c"
 		}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3260 "SearchFilter.c"
+#line 3253 "SearchFilter.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3264 "SearchFilter.c"
+#line 3257 "SearchFilter.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3268 "SearchFilter.c"
+#line 3261 "SearchFilter.c"
 }
 
 
@@ -3275,25 +3268,25 @@ static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3279 "SearchFilter.c"
+#line 3272 "SearchFilter.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 3285 "SearchFilter.c"
+#line 3278 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3289 "SearchFilter.c"
+#line 3282 "SearchFilter.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3293 "SearchFilter.c"
+#line 3286 "SearchFilter.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3297 "SearchFilter.c"
+#line 3290 "SearchFilter.c"
 }
 
 
@@ -3307,7 +3300,7 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 3311 "SearchFilter.c"
+#line 3304 "SearchFilter.c"
 }
 
 
@@ -3316,7 +3309,7 @@ gpointer value_get_text_action (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL);
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3320 "SearchFilter.c"
+#line 3313 "SearchFilter.c"
 }
 
 
@@ -3336,17 +3329,17 @@ void value_set_text_action (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_ref (value->data[0].v_pointer);
-#line 3340 "SearchFilter.c"
+#line 3333 "SearchFilter.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3344 "SearchFilter.c"
+#line 3337 "SearchFilter.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3350 "SearchFilter.c"
+#line 3343 "SearchFilter.c"
 	}
 }
 
@@ -3365,17 +3358,17 @@ void value_take_text_action (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 3369 "SearchFilter.c"
+#line 3362 "SearchFilter.c"
 	} else {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3373 "SearchFilter.c"
+#line 3366 "SearchFilter.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3379 "SearchFilter.c"
+#line 3372 "SearchFilter.c"
 	}
 }
 
@@ -3393,7 +3386,7 @@ static void text_action_class_init (TextActionClass * klass) {
 	text_action_signals[TEXT_ACTION_SENSITIVITY_CHANGED_SIGNAL] = g_signal_new ("sensitivity-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_signals[TEXT_ACTION_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 3397 "SearchFilter.c"
+#line 3390 "SearchFilter.c"
 }
 
 
@@ -3408,7 +3401,7 @@ static void text_action_instance_init (TextAction * self) {
 	self->priv->visible = TRUE;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 3412 "SearchFilter.c"
+#line 3405 "SearchFilter.c"
 }
 
 
@@ -3420,7 +3413,7 @@ static void text_action_finalize (TextAction * obj) {
 	g_signal_handlers_destroy (self);
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 3424 "SearchFilter.c"
+#line 3417 "SearchFilter.c"
 }
 
 
@@ -3445,7 +3438,7 @@ gpointer text_action_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 3449 "SearchFilter.c"
+#line 3442 "SearchFilter.c"
 }
 
 
@@ -3458,7 +3451,7 @@ void text_action_unref (gpointer instance) {
 		TEXT_ACTION_GET_CLASS (self)->finalize (self);
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3462 "SearchFilter.c"
+#line 3455 "SearchFilter.c"
 	}
 }
 
@@ -3466,56 +3459,56 @@ void text_action_unref (gpointer instance) {
 static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter);
-#line 3470 "SearchFilter.c"
+#line 3463 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
-#line 3477 "SearchFilter.c"
+#line 3470 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
-#line 3484 "SearchFilter.c"
+#line 3477 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
-#line 3491 "SearchFilter.c"
+#line 3484 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
-#line 3498 "SearchFilter.c"
+#line 3491 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
-#line 3505 "SearchFilter.c"
+#line 3498 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
-#line 3512 "SearchFilter.c"
+#line 3505 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3519 "SearchFilter.c"
+#line 3512 "SearchFilter.c"
 }
 
 
@@ -3535,14 +3528,14 @@ SearchFilterActions* search_filter_actions_construct (GType object_type) {
 	g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self);
 #line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3539 "SearchFilter.c"
+#line 3532 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_new (void) {
 #line 402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS);
-#line 3546 "SearchFilter.c"
+#line 3539 "SearchFilter.c"
 }
 
 
@@ -3557,7 +3550,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se
 	result = _tmp0_;
 #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3561 "SearchFilter.c"
+#line 3554 "SearchFilter.c"
 }
 
 
@@ -3575,13 +3568,13 @@ GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int*
 	if (result_length1) {
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp0__length1;
-#line 3579 "SearchFilter.c"
+#line 3572 "SearchFilter.c"
 	}
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3585 "SearchFilter.c"
+#line 3578 "SearchFilter.c"
 }
 
 
@@ -3603,7 +3596,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	if (_tmp1_ == NULL) {
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3607 "SearchFilter.c"
+#line 3600 "SearchFilter.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
@@ -3611,7 +3604,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_tmp2_ = lw;
 #line 419 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3615 "SearchFilter.c"
+#line 3608 "SearchFilter.c"
 		LibraryWindow* _tmp3_;
 		const gchar* _tmp4_;
 		GAction* _tmp5_;
@@ -3627,7 +3620,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 		_g_object_unref0 (lw);
 #line 420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 3631 "SearchFilter.c"
+#line 3624 "SearchFilter.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
@@ -3635,7 +3628,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_g_object_unref0 (lw);
 #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3639 "SearchFilter.c"
+#line 3632 "SearchFilter.c"
 }
 
 
@@ -3661,7 +3654,7 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 	_tmp3_ = action;
 #line 429 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != NULL) {
-#line 3665 "SearchFilter.c"
+#line 3658 "SearchFilter.c"
 		GSimpleAction* _tmp4_;
 		gboolean _tmp5_;
 #line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3670,46 +3663,46 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 		_tmp5_ = sensitive;
 #line 430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3674 "SearchFilter.c"
+#line 3667 "SearchFilter.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3678 "SearchFilter.c"
+#line 3671 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new32 (gboolean value) {
 #line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3685 "SearchFilter.c"
+#line 3678 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new33 (gboolean value) {
 #line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3692 "SearchFilter.c"
+#line 3685 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new34 (gboolean value) {
 #line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3699 "SearchFilter.c"
+#line 3692 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new35 (gboolean value) {
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3706 "SearchFilter.c"
+#line 3699 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new36 (gchar* value) {
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3713 "SearchFilter.c"
+#line 3706 "SearchFilter.c"
 }
 
 
@@ -3803,7 +3796,7 @@ void search_filter_actions_reset (SearchFilterActions* self) {
 	text_action_set_text (_tmp19_, NULL);
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3807 "SearchFilter.c"
+#line 3800 "SearchFilter.c"
 }
 
 
@@ -3819,21 +3812,21 @@ void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterAction
 	search_filter_actions_update_sensitivities (self);
 #line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL], 0);
-#line 3823 "SearchFilter.c"
+#line 3816 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3830 "SearchFilter.c"
+#line 3823 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3837 "SearchFilter.c"
+#line 3830 "SearchFilter.c"
 }
 
 
@@ -3862,7 +3855,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp2_ = old_tracked_page;
 #line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3866 "SearchFilter.c"
+#line 3859 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_;
 		CoreViewTracker* _tmp4_;
@@ -3877,7 +3870,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp5_ = tracker;
 #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3881 "SearchFilter.c"
+#line 3874 "SearchFilter.c"
 			CoreViewTracker* _tmp6_;
 			guint _tmp7_;
 #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3886,14 +3879,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE);
 #line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 3890 "SearchFilter.c"
+#line 3883 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp8_;
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = tracker;
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3897 "SearchFilter.c"
+#line 3890 "SearchFilter.c"
 				CoreViewTracker* _tmp9_;
 				guint _tmp10_;
 #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3902,12 +3895,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE);
 #line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 3906 "SearchFilter.c"
+#line 3899 "SearchFilter.c"
 			}
 		}
 #line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3911 "SearchFilter.c"
+#line 3904 "SearchFilter.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
@@ -3919,7 +3912,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp13_ = new_tracked_page;
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp13_ != NULL) {
-#line 3923 "SearchFilter.c"
+#line 3916 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_;
 		CoreViewTracker* _tmp15_;
@@ -3936,7 +3929,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp16_ = tracker;
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3940 "SearchFilter.c"
+#line 3933 "SearchFilter.c"
 			CoreViewTracker* _tmp17_;
 			CoreViewTracker* _tmp18_;
 #line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3955,14 +3948,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			_g_object_unref0 (old_tracked_page);
 #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return;
-#line 3959 "SearchFilter.c"
+#line 3952 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp19_;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = tracker;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3966 "SearchFilter.c"
+#line 3959 "SearchFilter.c"
 				CoreViewTracker* _tmp20_;
 				CoreViewTracker* _tmp21_;
 #line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3981,12 +3974,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				_g_object_unref0 (old_tracked_page);
 #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return;
-#line 3985 "SearchFilter.c"
+#line 3978 "SearchFilter.c"
 			}
 		}
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3990 "SearchFilter.c"
+#line 3983 "SearchFilter.c"
 	}
 #line 482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
@@ -4004,14 +3997,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_g_object_unref0 (new_tracked_page);
 #line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (old_tracked_page);
-#line 4008 "SearchFilter.c"
+#line 4001 "SearchFilter.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 4015 "SearchFilter.c"
+#line 4008 "SearchFilter.c"
 }
 
 
@@ -4065,7 +4058,7 @@ static void search_filter_actions_on_media_tracker_updated (SearchFilterActions*
 	search_filter_actions_update_sensitivities (self);
 #line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4069 "SearchFilter.c"
+#line 4062 "SearchFilter.c"
 }
 
 
@@ -4122,7 +4115,7 @@ static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions
 	search_filter_actions_update_sensitivities (self);
 #line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4126 "SearchFilter.c"
+#line 4119 "SearchFilter.c"
 }
 
 
@@ -4162,7 +4155,7 @@ static void search_filter_actions_update_sensitivities (SearchFilterActions* sel
 	_tmp7_ = self->priv->has_flagged;
 #line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL], 0, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 4166 "SearchFilter.c"
+#line 4159 "SearchFilter.c"
 }
 
 
@@ -4176,7 +4169,7 @@ static void search_filter_actions_on_text_changed (SearchFilterActions* self, Te
 	_tmp0_ = text;
 #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL], 0, _tmp0_);
-#line 4180 "SearchFilter.c"
+#line 4173 "SearchFilter.c"
 }
 
 
@@ -4193,21 +4186,21 @@ static void search_filter_actions_on_action_radio (SearchFilterActions* self, GS
 	_tmp1_ = parameter;
 #line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_);
-#line 4197 "SearchFilter.c"
+#line 4190 "SearchFilter.c"
 }
 
 
 static gboolean _variant_get37 (GVariant* value) {
 #line 543 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4204 "SearchFilter.c"
+#line 4197 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new38 (gboolean value) {
 #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4211 "SearchFilter.c"
+#line 4204 "SearchFilter.c"
 }
 
 
@@ -4246,7 +4239,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4250 "SearchFilter.c"
+#line 4243 "SearchFilter.c"
 }
 
 
@@ -4260,7 +4253,7 @@ static void search_filter_actions_register (SearchFilterActions* self) {
 	_text_action_unref0 (self->priv->_text);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = _tmp0_;
-#line 4264 "SearchFilter.c"
+#line 4257 "SearchFilter.c"
 }
 
 
@@ -4305,7 +4298,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	if (_tmp6_) {
 #line 554 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 4309 "SearchFilter.c"
+#line 4302 "SearchFilter.c"
 	}
 #line 556 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = value;
@@ -4325,7 +4318,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	_tmp12_ = filter;
 #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL], 0, _tmp12_);
-#line 4329 "SearchFilter.c"
+#line 4322 "SearchFilter.c"
 }
 
 
@@ -4352,7 +4345,7 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_FLAGGED_TOGGLED_SIGNAL], 0, _tmp3_);
-#line 4356 "SearchFilter.c"
+#line 4349 "SearchFilter.c"
 }
 
 
@@ -4379,7 +4372,7 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_PHOTOS_TOGGLED_SIGNAL], 0, _tmp3_);
-#line 4383 "SearchFilter.c"
+#line 4376 "SearchFilter.c"
 }
 
 
@@ -4406,7 +4399,7 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_VIDEOS_TOGGLED_SIGNAL], 0, _tmp3_);
-#line 4410 "SearchFilter.c"
+#line 4403 "SearchFilter.c"
 }
 
 
@@ -4433,7 +4426,7 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RAW_TOGGLED_SIGNAL], 0, _tmp3_);
-#line 4437 "SearchFilter.c"
+#line 4430 "SearchFilter.c"
 }
 
 
@@ -4448,7 +4441,7 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4452 "SearchFilter.c"
+#line 4445 "SearchFilter.c"
 }
 
 
@@ -4463,7 +4456,7 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4467 "SearchFilter.c"
+#line 4460 "SearchFilter.c"
 }
 
 
@@ -4478,7 +4471,7 @@ gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4482 "SearchFilter.c"
+#line 4475 "SearchFilter.c"
 }
 
 
@@ -4493,7 +4486,7 @@ gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4497 "SearchFilter.c"
+#line 4490 "SearchFilter.c"
 }
 
 
@@ -4508,7 +4501,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4512 "SearchFilter.c"
+#line 4505 "SearchFilter.c"
 }
 
 
@@ -4523,7 +4516,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4527 "SearchFilter.c"
+#line 4520 "SearchFilter.c"
 }
 
 
@@ -4538,7 +4531,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4542 "SearchFilter.c"
+#line 4535 "SearchFilter.c"
 }
 
 
@@ -4553,7 +4546,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4557 "SearchFilter.c"
+#line 4550 "SearchFilter.c"
 }
 
 
@@ -4568,7 +4561,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 356 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4572 "SearchFilter.c"
+#line 4565 "SearchFilter.c"
 }
 
 
@@ -4588,7 +4581,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4592 "SearchFilter.c"
+#line 4585 "SearchFilter.c"
 }
 
 
@@ -4607,26 +4600,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos
 		data1 = closure->data;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4611 "SearchFilter.c"
+#line 4604 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = closure->data;
-#line 4617 "SearchFilter.c"
+#line 4610 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4623 "SearchFilter.c"
+#line 4616 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_init (GValue* value) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 4630 "SearchFilter.c"
+#line 4623 "SearchFilter.c"
 }
 
 
@@ -4635,7 +4628,7 @@ static void value_search_filter_actions_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (value->data[0].v_pointer);
-#line 4639 "SearchFilter.c"
+#line 4632 "SearchFilter.c"
 	}
 }
 
@@ -4645,11 +4638,11 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer);
-#line 4649 "SearchFilter.c"
+#line 4642 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4653 "SearchFilter.c"
+#line 4646 "SearchFilter.c"
 	}
 }
 
@@ -4657,37 +4650,37 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 static gpointer value_search_filter_actions_peek_pointer (const GValue* value) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4661 "SearchFilter.c"
+#line 4654 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 4668 "SearchFilter.c"
+#line 4661 "SearchFilter.c"
 		SearchFilterActions * object;
 		object = collect_values[0].v_pointer;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4675 "SearchFilter.c"
+#line 4668 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4679 "SearchFilter.c"
+#line 4672 "SearchFilter.c"
 		}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4683 "SearchFilter.c"
+#line 4676 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4687 "SearchFilter.c"
+#line 4680 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4691 "SearchFilter.c"
+#line 4684 "SearchFilter.c"
 }
 
 
@@ -4698,25 +4691,25 @@ static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4702 "SearchFilter.c"
+#line 4695 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 4708 "SearchFilter.c"
+#line 4701 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4712 "SearchFilter.c"
+#line 4705 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4716 "SearchFilter.c"
+#line 4709 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4720 "SearchFilter.c"
+#line 4713 "SearchFilter.c"
 }
 
 
@@ -4730,7 +4723,7 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 4734 "SearchFilter.c"
+#line 4727 "SearchFilter.c"
 }
 
 
@@ -4739,7 +4732,7 @@ gpointer value_get_search_filter_actions (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4743 "SearchFilter.c"
+#line 4736 "SearchFilter.c"
 }
 
 
@@ -4759,17 +4752,17 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_ref (value->data[0].v_pointer);
-#line 4763 "SearchFilter.c"
+#line 4756 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4767 "SearchFilter.c"
+#line 4760 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4773 "SearchFilter.c"
+#line 4766 "SearchFilter.c"
 	}
 }
 
@@ -4788,17 +4781,17 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 4792 "SearchFilter.c"
+#line 4785 "SearchFilter.c"
 	} else {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4796 "SearchFilter.c"
+#line 4789 "SearchFilter.c"
 	}
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4802 "SearchFilter.c"
+#line 4795 "SearchFilter.c"
 	}
 }
 
@@ -4822,7 +4815,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_RATING_CHANGED_SIGNAL] = g_signal_new ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_TEXT_CHANGED_SIGNAL] = g_signal_new ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 4826 "SearchFilter.c"
+#line 4819 "SearchFilter.c"
 	/**
 	     * fired when the kinds of media present in the current view change (e.g., a video becomes
 	     * available in the view through a new import operation or no raw photos are available in
@@ -4832,7 +4825,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_MEDIA_CONTEXT_CHANGED_SIGNAL] = g_signal_new ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_signals[SEARCH_FILTER_ACTIONS_CRITERIA_CHANGED_SIGNAL] = g_signal_new ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4836 "SearchFilter.c"
+#line 4829 "SearchFilter.c"
 }
 
 
@@ -4855,7 +4848,7 @@ static void search_filter_actions_instance_init (SearchFilterActions * self) {
 	self->priv->can_filter_by_stars = TRUE;
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 4859 "SearchFilter.c"
+#line 4852 "SearchFilter.c"
 }
 
 
@@ -4867,7 +4860,7 @@ static void search_filter_actions_finalize (SearchFilterActions * obj) {
 	g_signal_handlers_destroy (self);
 #line 368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 4871 "SearchFilter.c"
+#line 4864 "SearchFilter.c"
 }
 
 
@@ -4892,7 +4885,7 @@ gpointer search_filter_actions_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 4896 "SearchFilter.c"
+#line 4889 "SearchFilter.c"
 }
 
 
@@ -4905,7 +4898,7 @@ void search_filter_actions_unref (gpointer instance) {
 		SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self);
 #line 329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4909 "SearchFilter.c"
+#line 4902 "SearchFilter.c"
 	}
 }
 
@@ -4913,56 +4906,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 1154 "/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 4917 "SearchFilter.c"
+#line 4910 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1156 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4924 "SearchFilter.c"
+#line 4917 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4931 "SearchFilter.c"
+#line 4924 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4938 "SearchFilter.c"
+#line 4931 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4945 "SearchFilter.c"
+#line 4938 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
 #line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4952 "SearchFilter.c"
+#line 4945 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
 #line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4959 "SearchFilter.c"
+#line 4952 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
 #line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4966 "SearchFilter.c"
+#line 4959 "SearchFilter.c"
 }
 
 
@@ -4971,28 +4964,28 @@ static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_pop
 	result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number);
 #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4975 "SearchFilter.c"
+#line 4968 "SearchFilter.c"
 }
 
 
 static gpointer _search_filter_actions_ref0 (gpointer self) {
 #line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? search_filter_actions_ref (self) : NULL;
-#line 4982 "SearchFilter.c"
+#line 4975 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4989 "SearchFilter.c"
+#line 4982 "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 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4996 "SearchFilter.c"
+#line 4989 "SearchFilter.c"
 }
 
 
@@ -5126,7 +5119,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_tmp9_ = self->priv->toolbar;
 #line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5130 "SearchFilter.c"
+#line 5123 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_;
 		gchar* _tmp11_;
@@ -5143,12 +5136,12 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_free0 (_tmp12_);
 #line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5147 "SearchFilter.c"
-			goto __catch594_g_error;
+#line 5140 "SearchFilter.c"
+			goto __catch603_g_error;
 		}
 	}
-	goto __finally594;
-	__catch594_g_error:
+	goto __finally603;
+	__catch603_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -5173,9 +5166,9 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_free0 (_tmp16_);
 #line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5177 "SearchFilter.c"
+#line 5170 "SearchFilter.c"
 	}
-	__finally594:
+	__finally603:
 #line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5184,7 +5177,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		g_clear_error (&_inner_error_);
 #line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5188 "SearchFilter.c"
+#line 5181 "SearchFilter.c"
 	}
 #line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = self->priv->close_item;
@@ -5468,14 +5461,14 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_g_object_unref0 (model);
 #line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 5472 "SearchFilter.c"
+#line 5465 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) {
 #line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions);
-#line 5479 "SearchFilter.c"
+#line 5472 "SearchFilter.c"
 }
 
 
@@ -5493,88 +5486,88 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	if (_tmp1_) {
 #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = TRUE;
-#line 5497 "SearchFilter.c"
+#line 5490 "SearchFilter.c"
 	} else {
 		gboolean _tmp2_;
 #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = has_raw;
 #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 5504 "SearchFilter.c"
+#line 5497 "SearchFilter.c"
 	}
 #line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5508 "SearchFilter.c"
+#line 5501 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp3_;
 #line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->toolbtn_photos;
 #line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp3_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 5514 "SearchFilter.c"
+#line 5507 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp4_;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_photos;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 5521 "SearchFilter.c"
+#line 5514 "SearchFilter.c"
 	}
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = has_videos;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_) {
-#line 5527 "SearchFilter.c"
+#line 5520 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp6_;
 #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = self->priv->toolbtn_videos;
 #line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp6_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 5533 "SearchFilter.c"
+#line 5526 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp7_;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_videos;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 5540 "SearchFilter.c"
+#line 5533 "SearchFilter.c"
 	}
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = has_raw;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp8_) {
-#line 5546 "SearchFilter.c"
+#line 5539 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp9_;
 #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp9_ = self->priv->toolbtn_raw;
 #line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp9_, RESOURCES_ICON_FILTER_RAW);
-#line 5552 "SearchFilter.c"
+#line 5545 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp10_;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_raw;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 5559 "SearchFilter.c"
+#line 5552 "SearchFilter.c"
 	}
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = has_flagged;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp11_) {
-#line 5565 "SearchFilter.c"
+#line 5558 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp12_;
 #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp12_ = self->priv->toolbtn_flag;
 #line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp12_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 5571 "SearchFilter.c"
+#line 5564 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp13_;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp13_ = self->priv->toolbtn_flag;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp13_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 5578 "SearchFilter.c"
+#line 5571 "SearchFilter.c"
 	}
 }
 
@@ -5598,14 +5591,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	result = FALSE;
 #line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5602 "SearchFilter.c"
+#line 5595 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5609 "SearchFilter.c"
+#line 5602 "SearchFilter.c"
 }
 
 
@@ -5635,7 +5628,7 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	_tmp4_ = action;
 #line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5639 "SearchFilter.c"
+#line 5632 "SearchFilter.c"
 		GSimpleAction* _tmp5_;
 		GVariant* _tmp6_;
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5646,13 +5639,13 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5650 "SearchFilter.c"
+#line 5643 "SearchFilter.c"
 	}
 #line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
 #line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5656 "SearchFilter.c"
+#line 5649 "SearchFilter.c"
 }
 
 
@@ -5661,7 +5654,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1217 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5665 "SearchFilter.c"
+#line 5658 "SearchFilter.c"
 }
 
 
@@ -5670,7 +5663,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1221 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5674 "SearchFilter.c"
+#line 5667 "SearchFilter.c"
 }
 
 
@@ -5679,7 +5672,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5683 "SearchFilter.c"
+#line 5676 "SearchFilter.c"
 }
 
 
@@ -5688,7 +5681,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1229 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5692 "SearchFilter.c"
+#line 5685 "SearchFilter.c"
 }
 
 
@@ -5697,14 +5690,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5701 "SearchFilter.c"
+#line 5694 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
 #line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5708 "SearchFilter.c"
+#line 5701 "SearchFilter.c"
 }
 
 
@@ -5731,7 +5724,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		_g_object_unref0 (aw);
 #line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5735 "SearchFilter.c"
+#line 5728 "SearchFilter.c"
 	}
 #line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
@@ -5745,7 +5738,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_tmp5_ = action;
 #line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5749 "SearchFilter.c"
+#line 5742 "SearchFilter.c"
 		GSimpleAction* _tmp6_;
 		GVariant* _tmp7_;
 #line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5756,7 +5749,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
 #line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5760 "SearchFilter.c"
+#line 5753 "SearchFilter.c"
 	}
 #line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
@@ -5764,7 +5757,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_g_object_unref0 (action);
 #line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5768 "SearchFilter.c"
+#line 5761 "SearchFilter.c"
 }
 
 
@@ -5773,14 +5766,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1257 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5777 "SearchFilter.c"
+#line 5770 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5784 "SearchFilter.c"
+#line 5777 "SearchFilter.c"
 }
 
 
@@ -5807,7 +5800,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	if (_tmp0_ == _tmp1_) {
 #line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5811 "SearchFilter.c"
+#line 5804 "SearchFilter.c"
 	}
 #line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
@@ -5835,7 +5828,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0);
 #line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5839 "SearchFilter.c"
+#line 5832 "SearchFilter.c"
 }
 
 
@@ -5852,7 +5845,7 @@ void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
 	search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 5856 "SearchFilter.c"
+#line 5849 "SearchFilter.c"
 }
 
 
@@ -5945,7 +5938,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 1279 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5949 "SearchFilter.c"
+#line 5942 "SearchFilter.c"
 		LibraryWindow* _tmp1_;
 		LibraryWindow* _tmp2_;
 #line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5956,7 +5949,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		library_window_show_search_bar (_tmp2_, TRUE);
 #line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5960 "SearchFilter.c"
+#line 5953 "SearchFilter.c"
 	}
 #line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
@@ -6148,7 +6141,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp73_ = _tmp72_;
 #line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6152 "SearchFilter.c"
+#line 6145 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_;
 		gboolean _tmp75_;
 		gboolean _tmp76_;
@@ -6160,11 +6153,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp76_ = _tmp75_;
 #line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6164 "SearchFilter.c"
+#line 6157 "SearchFilter.c"
 	} else {
 #line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6168 "SearchFilter.c"
+#line 6161 "SearchFilter.c"
 	}
 #line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
@@ -6178,7 +6171,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp82_ = _tmp81_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6182 "SearchFilter.c"
+#line 6175 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_;
 		gboolean _tmp84_;
 		gboolean _tmp85_;
@@ -6190,17 +6183,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp85_ = _tmp84_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6194 "SearchFilter.c"
+#line 6187 "SearchFilter.c"
 	} else {
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6198 "SearchFilter.c"
+#line 6191 "SearchFilter.c"
 	}
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6204 "SearchFilter.c"
+#line 6197 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
 		SearchFilterToolbarToggleActionToolButton* _tmp87_;
@@ -6214,7 +6207,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp89_ = _tmp88_;
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6218 "SearchFilter.c"
+#line 6211 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_;
 			gboolean _tmp91_;
 			gboolean _tmp92_;
@@ -6226,15 +6219,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 			_tmp92_ = _tmp91_;
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6230 "SearchFilter.c"
+#line 6223 "SearchFilter.c"
 		} else {
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6234 "SearchFilter.c"
+#line 6227 "SearchFilter.c"
 		}
 #line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6238 "SearchFilter.c"
+#line 6231 "SearchFilter.c"
 	}
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
@@ -6244,7 +6237,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp94_ = self->priv->search_filter;
 #line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6248 "SearchFilter.c"
+#line 6241 "SearchFilter.c"
 }
 
 
@@ -6265,7 +6258,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar*
 	self->priv->saved_search = _tmp1_;
 #line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6269 "SearchFilter.c"
+#line 6262 "SearchFilter.c"
 }
 
 
@@ -6278,7 +6271,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self
 	self->priv->saved_search = NULL;
 #line 1335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6282 "SearchFilter.c"
+#line 6275 "SearchFilter.c"
 }
 
 
@@ -6303,12 +6296,14 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 #line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = saved_search_dialog_new_edit_existing (_tmp2_);
 #line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp3_);
+#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	ssd = _tmp3_;
 #line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (ssd);
 #line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_saved_search_dialog_unref0 (ssd);
-#line 6312 "SearchFilter.c"
+	_g_object_unref0 (ssd);
+#line 6307 "SearchFilter.c"
 }
 
 
@@ -6333,7 +6328,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
 #line 1346 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6337 "SearchFilter.c"
+#line 6332 "SearchFilter.c"
 		CommandManager* _tmp4_;
 		CommandManager* _tmp5_;
 		SavedSearch* _tmp6_;
@@ -6355,7 +6350,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		_g_object_unref0 (_tmp8_);
 #line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6359 "SearchFilter.c"
+#line 6354 "SearchFilter.c"
 	}
 }
 
@@ -6376,12 +6371,14 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 #line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = saved_search_dialog_new ();
 #line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp2_);
+#line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
 #line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (_tmp3_);
 #line 1352 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_saved_search_dialog_unref0 (_tmp3_);
-#line 6385 "SearchFilter.c"
+	_g_object_unref0 (_tmp3_);
+#line 6382 "SearchFilter.c"
 }
 
 
@@ -6406,42 +6403,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	_tmp3_ = _tmp2_->filter_popup;
 #line 1359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6410 "SearchFilter.c"
+#line 6407 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6417 "SearchFilter.c"
+#line 6414 "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 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6424 "SearchFilter.c"
+#line 6421 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6431 "SearchFilter.c"
+#line 6428 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6438 "SearchFilter.c"
+#line 6435 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6445 "SearchFilter.c"
+#line 6442 "SearchFilter.c"
 }
 
 
@@ -6454,28 +6451,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 	_tmp1_ = self->priv->elide_showing_again;
 #line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6458 "SearchFilter.c"
+#line 6455 "SearchFilter.c"
 		SavedSearch* _tmp2_;
 #line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
 #line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6464 "SearchFilter.c"
+#line 6461 "SearchFilter.c"
 	} else {
 #line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6468 "SearchFilter.c"
+#line 6465 "SearchFilter.c"
 	}
 #line 1363 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6472 "SearchFilter.c"
+#line 6469 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_;
 #line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
 #line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6479 "SearchFilter.c"
+#line 6476 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
@@ -6487,7 +6484,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6491 "SearchFilter.c"
+#line 6488 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_;
@@ -6512,7 +6509,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp6_ = _tmp5_->filter_popup;
 #line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6516 "SearchFilter.c"
+#line 6513 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_;
 				guint _tmp9_;
@@ -6568,7 +6565,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
 #line 1374 "/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 6572 "SearchFilter.c"
+#line 6569 "SearchFilter.c"
 			}
 #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
@@ -6616,12 +6613,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp36_ = _tmp35_->filter_popup;
 #line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6620 "SearchFilter.c"
+#line 6617 "SearchFilter.c"
 		}
 	}
 #line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6625 "SearchFilter.c"
+#line 6622 "SearchFilter.c"
 }
 
 
@@ -6633,7 +6630,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_box;
 #line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6637 "SearchFilter.c"
+#line 6634 "SearchFilter.c"
 }
 
 
@@ -6664,18 +6661,18 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	if (_tmp3_ != 0) {
 #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6668 "SearchFilter.c"
+#line 6665 "SearchFilter.c"
 	} else {
 		gint _tmp4_;
 #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
 #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6675 "SearchFilter.c"
+#line 6672 "SearchFilter.c"
 	}
 #line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6679 "SearchFilter.c"
+#line 6676 "SearchFilter.c"
 		GtkLabel* _tmp5_;
 		GtkLabel* _tmp6_;
 		GtkLabel* _tmp7_;
@@ -6702,7 +6699,7 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 		_tmp10_ = right_padding;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 6706 "SearchFilter.c"
+#line 6703 "SearchFilter.c"
 	}
 #line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
@@ -6710,14 +6707,14 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
 #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6714 "SearchFilter.c"
+#line 6711 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
 #line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding);
-#line 6721 "SearchFilter.c"
+#line 6718 "SearchFilter.c"
 }
 
 
@@ -6728,14 +6725,14 @@ static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolba
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
 #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6732 "SearchFilter.c"
+#line 6729 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
 #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6739 "SearchFilter.c"
+#line 6736 "SearchFilter.c"
 }
 
 
@@ -6747,7 +6744,7 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->label);
 #line 613 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6751 "SearchFilter.c"
+#line 6748 "SearchFilter.c"
 }
 
 
@@ -6813,14 +6810,14 @@ static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_a
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6817 "SearchFilter.c"
+#line 6814 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
 #line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action);
-#line 6824 "SearchFilter.c"
+#line 6821 "SearchFilter.c"
 }
 
 
@@ -6864,7 +6861,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
 #line 642 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 6868 "SearchFilter.c"
+#line 6865 "SearchFilter.c"
 }
 
 
@@ -6881,7 +6878,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFil
 	_tmp1_ = label;
 #line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 6885 "SearchFilter.c"
+#line 6882 "SearchFilter.c"
 }
 
 
@@ -6892,14 +6889,14 @@ static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFi
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6896 "SearchFilter.c"
+#line 6893 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6903 "SearchFilter.c"
+#line 6900 "SearchFilter.c"
 }
 
 
@@ -6911,7 +6908,7 @@ static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject *
 	_g_object_unref0 (self->priv->button);
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6915 "SearchFilter.c"
+#line 6912 "SearchFilter.c"
 }
 
 
@@ -6930,42 +6927,42 @@ static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) {
 static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
 #line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text);
-#line 6934 "SearchFilter.c"
+#line 6931 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) {
 #line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive);
-#line 6941 "SearchFilter.c"
+#line 6938 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) {
 #line 688 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible);
-#line 6948 "SearchFilter.c"
+#line 6945 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self) {
 #line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6955 "SearchFilter.c"
+#line 6952 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) {
 #line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6962 "SearchFilter.c"
+#line 6959 "SearchFilter.c"
 }
 
 
 static gpointer _text_action_ref0 (gpointer self) {
 #line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? text_action_ref (self) : NULL;
-#line 6969 "SearchFilter.c"
+#line 6966 "SearchFilter.c"
 }
 
 
@@ -6974,7 +6971,7 @@ static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_p
 	result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event);
 #line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 6978 "SearchFilter.c"
+#line 6975 "SearchFilter.c"
 }
 
 
@@ -7068,14 +7065,14 @@ SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType
 	g_signal_connect_object (_tmp17_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7072 "SearchFilter.c"
+#line 7069 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) {
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action);
-#line 7079 "SearchFilter.c"
+#line 7076 "SearchFilter.c"
 }
 
 
@@ -7087,7 +7084,7 @@ void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* s
 	_tmp0_ = self->priv->search_entry;
 #line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL);
-#line 7091 "SearchFilter.c"
+#line 7088 "SearchFilter.c"
 }
 
 
@@ -7108,19 +7105,19 @@ static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterTool
 	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 7112 "SearchFilter.c"
+#line 7109 "SearchFilter.c"
 		TextAction* _tmp3_;
 #line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->action;
 #line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_clear (_tmp3_);
-#line 7118 "SearchFilter.c"
+#line 7115 "SearchFilter.c"
 	}
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7124 "SearchFilter.c"
+#line 7121 "SearchFilter.c"
 }
 
 
@@ -7182,7 +7179,7 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte
 	_tmp14_ = _tmp13_;
 #line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 7186 "SearchFilter.c"
+#line 7183 "SearchFilter.c"
 }
 
 
@@ -7213,7 +7210,7 @@ static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolb
 	_tmp5_ = self->priv->action;
 #line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 7217 "SearchFilter.c"
+#line 7214 "SearchFilter.c"
 }
 
 
@@ -7225,7 +7222,7 @@ static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilte
 	_tmp0_ = sensitive;
 #line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7229 "SearchFilter.c"
+#line 7226 "SearchFilter.c"
 }
 
 
@@ -7237,7 +7234,7 @@ static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilter
 	_tmp0_ = visible;
 #line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7241 "SearchFilter.c"
+#line 7238 "SearchFilter.c"
 }
 
 
@@ -7251,23 +7248,23 @@ static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterTool
 	_tmp1_ = text;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ != NULL) {
-#line 7255 "SearchFilter.c"
+#line 7252 "SearchFilter.c"
 		const gchar* _tmp2_;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 7261 "SearchFilter.c"
+#line 7258 "SearchFilter.c"
 	} else {
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7265 "SearchFilter.c"
+#line 7262 "SearchFilter.c"
 	}
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_);
-#line 7271 "SearchFilter.c"
+#line 7268 "SearchFilter.c"
 }
 
 
@@ -7278,14 +7275,14 @@ static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSear
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate));
 #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize;
-#line 7282 "SearchFilter.c"
+#line 7279 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) {
 #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self);
-#line 7289 "SearchFilter.c"
+#line 7286 "SearchFilter.c"
 }
 
 
@@ -7351,7 +7348,7 @@ static void search_filter_toolbar_search_box_finalize (GObject * obj) {
 	_text_action_unref0 (self->priv->action);
 #line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj);
-#line 7355 "SearchFilter.c"
+#line 7352 "SearchFilter.c"
 }
 
 
@@ -7427,14 +7424,14 @@ SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_butto
 	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 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7431 "SearchFilter.c"
+#line 7428 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) {
 #line 740 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model);
-#line 7438 "SearchFilter.c"
+#line 7435 "SearchFilter.c"
 }
 
 
@@ -7460,7 +7457,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	switch (_tmp0_) {
 #line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7464 "SearchFilter.c"
+#line 7461 "SearchFilter.c"
 		{
 			gchar* _tmp1_;
 #line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7471,11 +7468,11 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp1_;
 #line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7475 "SearchFilter.c"
+#line 7472 "SearchFilter.c"
 		}
 #line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7479 "SearchFilter.c"
+#line 7476 "SearchFilter.c"
 		{
 			gchar* _tmp2_;
 #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7486,12 +7483,12 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp2_;
 #line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7490 "SearchFilter.c"
+#line 7487 "SearchFilter.c"
 		}
 		default:
 #line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7495 "SearchFilter.c"
+#line 7492 "SearchFilter.c"
 		{
 			gchar* _tmp3_;
 #line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7502,7 +7499,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp3_;
 #line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7506 "SearchFilter.c"
+#line 7503 "SearchFilter.c"
 		}
 	}
 #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7533,7 +7530,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	_g_free0 (filename);
 #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7537 "SearchFilter.c"
+#line 7534 "SearchFilter.c"
 }
 
 
@@ -7557,7 +7554,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 	switch (_tmp0_) {
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7561 "SearchFilter.c"
+#line 7558 "SearchFilter.c"
 		{
 			gint _tmp1_;
 			gint _tmp2_;
@@ -7569,11 +7566,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp1_ + _tmp2_;
 #line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7573 "SearchFilter.c"
+#line 7570 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7577 "SearchFilter.c"
+#line 7574 "SearchFilter.c"
 		{
 			gint _tmp3_;
 			gint _tmp4_;
@@ -7585,11 +7582,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp3_ * 2) + _tmp4_;
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7589 "SearchFilter.c"
+#line 7586 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7593 "SearchFilter.c"
+#line 7590 "SearchFilter.c"
 		{
 			gint _tmp5_;
 			gint _tmp6_;
@@ -7601,11 +7598,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp5_ * 3) + _tmp6_;
 #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7605 "SearchFilter.c"
+#line 7602 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7609 "SearchFilter.c"
+#line 7606 "SearchFilter.c"
 		{
 			gint _tmp7_;
 			gint _tmp8_;
@@ -7617,13 +7614,13 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp7_ * 4) + _tmp8_;
 #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7621 "SearchFilter.c"
+#line 7618 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 7627 "SearchFilter.c"
+#line 7624 "SearchFilter.c"
 		{
 			gint _tmp9_;
 #line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7632,37 +7629,37 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp9_ * 5;
 #line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7636 "SearchFilter.c"
+#line 7633 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7640 "SearchFilter.c"
+#line 7637 "SearchFilter.c"
 		{
 #line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE;
 #line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7646 "SearchFilter.c"
+#line 7643 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7650 "SearchFilter.c"
+#line 7647 "SearchFilter.c"
 		{
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7656 "SearchFilter.c"
+#line 7653 "SearchFilter.c"
 		}
 #line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7660 "SearchFilter.c"
+#line 7657 "SearchFilter.c"
 		{
 #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_plus;
 #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7666 "SearchFilter.c"
+#line 7663 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7670,7 +7667,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = icon_base;
 #line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7674 "SearchFilter.c"
+#line 7671 "SearchFilter.c"
 		}
 	}
 }
@@ -7696,7 +7693,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 	switch (_tmp1_) {
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7700 "SearchFilter.c"
+#line 7697 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp2_;
 #line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7705,11 +7702,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _ ("★+ Rating"));
 #line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7709 "SearchFilter.c"
+#line 7706 "SearchFilter.c"
 		}
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7713 "SearchFilter.c"
+#line 7710 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp3_;
 #line 814 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7718,11 +7715,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), _ ("★★+ Rating"));
 #line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7722 "SearchFilter.c"
+#line 7719 "SearchFilter.c"
 		}
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7726 "SearchFilter.c"
+#line 7723 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp4_;
 #line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7731,11 +7728,11 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _ ("★★★+ Rating"));
 #line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7735 "SearchFilter.c"
+#line 7732 "SearchFilter.c"
 		}
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7739 "SearchFilter.c"
+#line 7736 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp5_;
 #line 820 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7744,13 +7741,13 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), _ ("★★★★+ Rating"));
 #line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7748 "SearchFilter.c"
+#line 7745 "SearchFilter.c"
 		}
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
 #line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 7754 "SearchFilter.c"
+#line 7751 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp6_;
 #line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7759,7 +7756,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _ ("★★★★★+ Rating"));
 #line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7763 "SearchFilter.c"
+#line 7760 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7786,7 +7783,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			_g_object_unref0 (_tmp11_);
 #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7790 "SearchFilter.c"
+#line 7787 "SearchFilter.c"
 		}
 	}
 #line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7809,7 +7806,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 835 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 7813 "SearchFilter.c"
+#line 7810 "SearchFilter.c"
 }
 
 
@@ -7827,7 +7824,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (S
 	result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN);
 #line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7831 "SearchFilter.c"
+#line 7828 "SearchFilter.c"
 }
 
 
@@ -7844,7 +7841,7 @@ void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRa
 	_tmp1_ = label;
 #line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 7848 "SearchFilter.c"
+#line 7845 "SearchFilter.c"
 }
 
 
@@ -7853,7 +7850,7 @@ static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterT
 	search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass);
 #line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize;
-#line 7857 "SearchFilter.c"
+#line 7854 "SearchFilter.c"
 }
 
 
@@ -7869,7 +7866,7 @@ static void search_filter_toolbar_rating_filter_button_finalize (GObject * obj)
 	_g_object_unref0 (self->button);
 #line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj);
-#line 7873 "SearchFilter.c"
+#line 7870 "SearchFilter.c"
 }
 
 
@@ -7888,7 +7885,7 @@ GType search_filter_toolbar_rating_filter_button_get_type (void) {
 static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self);
-#line 7892 "SearchFilter.c"
+#line 7889 "SearchFilter.c"
 }
 
 
@@ -7948,14 +7945,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	_g_object_unref0 (image);
 #line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7952 "SearchFilter.c"
+#line 7949 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) {
 #line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON);
-#line 7959 "SearchFilter.c"
+#line 7956 "SearchFilter.c"
 }
 
 
@@ -7964,7 +7961,7 @@ static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchF
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
 #line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL], 0);
-#line 7968 "SearchFilter.c"
+#line 7965 "SearchFilter.c"
 }
 
 
@@ -7979,7 +7976,7 @@ void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterTo
 	_tmp1_ = active;
 #line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toggle_button_set_active (_tmp0_, _tmp1_);
-#line 7983 "SearchFilter.c"
+#line 7980 "SearchFilter.c"
 }
 
 
@@ -7996,7 +7993,7 @@ void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToo
 	_tmp1_ = label;
 #line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 8000 "SearchFilter.c"
+#line 7997 "SearchFilter.c"
 }
 
 
@@ -8013,7 +8010,7 @@ void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolb
 	_tmp1_ = self->button;
 #line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 8017 "SearchFilter.c"
+#line 8014 "SearchFilter.c"
 }
 
 
@@ -8024,14 +8021,14 @@ static void search_filter_toolbar_saved_search_filter_button_class_init (SearchF
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_filter_button_finalize;
 #line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_FILTER_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8028 "SearchFilter.c"
+#line 8025 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) {
 #line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->filter_popup = NULL;
-#line 8035 "SearchFilter.c"
+#line 8032 "SearchFilter.c"
 }
 
 
@@ -8053,7 +8050,7 @@ static void search_filter_toolbar_saved_search_filter_button_finalize (GObject *
 	_g_object_unref0 (self->button);
 #line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj);
-#line 8057 "SearchFilter.c"
+#line 8054 "SearchFilter.c"
 }
 
 
@@ -8072,69 +8069,69 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) {
 static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8076 "SearchFilter.c"
+#line 8073 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8083 "SearchFilter.c"
+#line 8080 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8090 "SearchFilter.c"
+#line 8087 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self) {
 #line 978 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row);
-#line 8097 "SearchFilter.c"
+#line 8094 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) {
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8104 "SearchFilter.c"
+#line 8101 "SearchFilter.c"
 }
 
 
-static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8115 "SearchFilter.c"
+#line 8112 "SearchFilter.c"
 	}
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8121 "SearchFilter.c"
+#line 8118 "SearchFilter.c"
 }
 
 
-static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8132 "SearchFilter.c"
+#line 8129 "SearchFilter.c"
 	}
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8138 "SearchFilter.c"
+#line 8135 "SearchFilter.c"
 }
 
 
@@ -8200,7 +8197,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	self->priv->delete_buttons_length1 = 0;
 #line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 8204 "SearchFilter.c"
+#line 8201 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_;
@@ -8229,7 +8226,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		_search_it = _tmp11_;
 #line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8233 "SearchFilter.c"
+#line 8230 "SearchFilter.c"
 			GeeIterator* _tmp12_;
 			gboolean _tmp13_;
 			SavedSearch* search = NULL;
@@ -8277,7 +8274,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			if (!_tmp13_) {
 #line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8281 "SearchFilter.c"
+#line 8278 "SearchFilter.c"
 			}
 #line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
@@ -8348,7 +8345,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = _g_object_ref0 (_tmp32_);
 #line 955 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add133 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_);
+			_vala_array_add134 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_);
 #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = search;
 #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8376,7 +8373,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp41_ = _g_object_ref0 (_tmp40_);
 #line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add134 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_);
+			_vala_array_add135 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_);
 #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp42_ = self->priv->list_box;
 #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8393,11 +8390,11 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			_g_object_unref0 (row);
 #line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (search);
-#line 8397 "SearchFilter.c"
+#line 8394 "SearchFilter.c"
 		}
 #line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8401 "SearchFilter.c"
+#line 8398 "SearchFilter.c"
 	}
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
@@ -8435,14 +8432,14 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	search_filter_toolbar_saved_search_popover_restyle (self);
 #line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8439 "SearchFilter.c"
+#line 8436 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) {
 #line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to);
-#line 8446 "SearchFilter.c"
+#line 8443 "SearchFilter.c"
 }
 
 
@@ -8462,7 +8459,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp1_ = self->priv->edit_buttons;
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1__length1 = self->priv->edit_buttons_length1;
-#line 8466 "SearchFilter.c"
+#line 8463 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8474,14 +8471,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp1__length1;
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) {
-#line 8478 "SearchFilter.c"
+#line 8475 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = _g_object_ref0 (button_collection[button_it]);
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp2_;
-#line 8485 "SearchFilter.c"
+#line 8482 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_;
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8490,7 +8487,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_);
 #line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8494 "SearchFilter.c"
+#line 8491 "SearchFilter.c"
 			}
 		}
 	}
@@ -8498,7 +8495,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp4_ = self->priv->delete_buttons;
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 8502 "SearchFilter.c"
+#line 8499 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8510,14 +8507,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp4__length1;
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 8514 "SearchFilter.c"
+#line 8511 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 8521 "SearchFilter.c"
+#line 8518 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_;
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8526,7 +8523,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_);
 #line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8530 "SearchFilter.c"
+#line 8527 "SearchFilter.c"
 			}
 		}
 	}
@@ -8554,7 +8551,7 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8558 "SearchFilter.c"
+#line 8555 "SearchFilter.c"
 	}
 #line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
@@ -8576,13 +8573,13 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 990 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8580 "SearchFilter.c"
+#line 8577 "SearchFilter.c"
 	}
 #line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
 #line 991 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8586 "SearchFilter.c"
+#line 8583 "SearchFilter.c"
 }
 
 
@@ -8653,7 +8650,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (Searc
 	_g_object_unref0 (button);
 #line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8657 "SearchFilter.c"
+#line 8654 "SearchFilter.c"
 }
 
 
@@ -8671,7 +8668,7 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 	_tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_);
 #line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 8675 "SearchFilter.c"
+#line 8672 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_;
 		SavedSearch* _tmp3_;
 		SavedSearch* _tmp4_;
@@ -8685,13 +8682,13 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 		g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_SEARCH_ACTIVATED_SIGNAL], 0, _tmp4_);
 #line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp4_);
-#line 8689 "SearchFilter.c"
+#line 8686 "SearchFilter.c"
 	}
 #line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->popover;
 #line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 8695 "SearchFilter.c"
+#line 8692 "SearchFilter.c"
 }
 
 
@@ -8705,7 +8702,7 @@ static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilt
 	_tmp0_ = search;
 #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_EDIT_CLICKED_SIGNAL], 0, _tmp0_);
-#line 8709 "SearchFilter.c"
+#line 8706 "SearchFilter.c"
 }
 
 
@@ -8719,7 +8716,7 @@ static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFi
 	_tmp0_ = search;
 #line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DELETE_CLICKED_SIGNAL], 0, _tmp0_);
-#line 8723 "SearchFilter.c"
+#line 8720 "SearchFilter.c"
 }
 
 
@@ -8728,7 +8725,7 @@ static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilte
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
 #line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL], 0);
-#line 8732 "SearchFilter.c"
+#line 8729 "SearchFilter.c"
 }
 
 
@@ -8737,7 +8734,7 @@ static void search_filter_toolbar_saved_search_popover_on_popover_closed (Search
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
 #line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL], 0);
-#line 8741 "SearchFilter.c"
+#line 8738 "SearchFilter.c"
 }
 
 
@@ -8749,7 +8746,7 @@ void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSav
 	_tmp0_ = self->priv->popover;
 #line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8753 "SearchFilter.c"
+#line 8750 "SearchFilter.c"
 }
 
 
@@ -8761,14 +8758,14 @@ void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSe
 	_tmp0_ = self->priv->popover;
 #line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8765 "SearchFilter.c"
+#line 8762 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self);
-#line 8772 "SearchFilter.c"
+#line 8769 "SearchFilter.c"
 }
 
 
@@ -8811,14 +8808,14 @@ static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_sa
 	g_signal_connect_object (_tmp4_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0);
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8815 "SearchFilter.c"
+#line 8812 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) {
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name);
-#line 8822 "SearchFilter.c"
+#line 8819 "SearchFilter.c"
 }
 
 
@@ -8835,7 +8832,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_restyle (Sear
 	_tmp1_ = self->priv->button;
 #line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE);
-#line 8839 "SearchFilter.c"
+#line 8836 "SearchFilter.c"
 }
 
 
@@ -8847,7 +8844,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_on_click (Sea
 	_tmp0_ = self->priv->_search;
 #line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit (self, search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL], 0, _tmp0_);
-#line 8851 "SearchFilter.c"
+#line 8848 "SearchFilter.c"
 }
 
 
@@ -8862,7 +8859,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_s
 	result = _tmp0_;
 #line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8866 "SearchFilter.c"
+#line 8863 "SearchFilter.c"
 }
 
 
@@ -8871,7 +8868,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_set_search (S
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
 #line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (search_filter_toolbar_saved_search_popover_data_button_get_search (self) != value) {
-#line 8875 "SearchFilter.c"
+#line 8872 "SearchFilter.c"
 		SavedSearch* _tmp0_;
 		SavedSearch* _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8884,7 +8881,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_set_search (S
 		self->priv->_search = _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_object_notify ((GObject *) self, "search");
-#line 8888 "SearchFilter.c"
+#line 8885 "SearchFilter.c"
 	}
 }
 
@@ -8904,7 +8901,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_class_init (S
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH_PROPERTY, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_CLICKED_SIGNAL] = g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 8908 "SearchFilter.c"
+#line 8905 "SearchFilter.c"
 }
 
 
@@ -8913,7 +8910,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_instance_init
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self);
 #line 909 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = NULL;
-#line 8917 "SearchFilter.c"
+#line 8914 "SearchFilter.c"
 }
 
 
@@ -8935,7 +8932,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_finalize (GOb
 	_g_object_unref0 (self->priv->_search);
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj);
-#line 8939 "SearchFilter.c"
+#line 8936 "SearchFilter.c"
 }
 
 
@@ -8962,13 +8959,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_pro
 		g_value_set_object (value, search_filter_toolbar_saved_search_popover_data_button_get_search (self));
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8966 "SearchFilter.c"
+#line 8963 "SearchFilter.c"
 		default:
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8972 "SearchFilter.c"
+#line 8969 "SearchFilter.c"
 	}
 }
 
@@ -8984,13 +8981,13 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro
 		search_filter_toolbar_saved_search_popover_data_button_set_search (self, g_value_get_object (value));
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8988 "SearchFilter.c"
+#line 8985 "SearchFilter.c"
 		default:
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8994 "SearchFilter.c"
+#line 8991 "SearchFilter.c"
 	}
 }
 
@@ -8998,7 +8995,7 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_pro
 static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 9002 "SearchFilter.c"
+#line 8999 "SearchFilter.c"
 }
 
 
@@ -9007,7 +9004,7 @@ static void search_filter_toolbar_value_saved_search_popover_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer);
-#line 9011 "SearchFilter.c"
+#line 9008 "SearchFilter.c"
 	}
 }
 
@@ -9017,11 +9014,11 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G
 	if (src_value->data[0].v_pointer) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer);
-#line 9021 "SearchFilter.c"
+#line 9018 "SearchFilter.c"
 	} else {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9025 "SearchFilter.c"
+#line 9022 "SearchFilter.c"
 	}
 }
 
@@ -9029,37 +9026,37 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G
 static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9033 "SearchFilter.c"
+#line 9030 "SearchFilter.c"
 }
 
 
 static gchar* search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 9040 "SearchFilter.c"
+#line 9037 "SearchFilter.c"
 		SearchFilterToolbarSavedSearchPopover * object;
 		object = collect_values[0].v_pointer;
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9047 "SearchFilter.c"
+#line 9044 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9051 "SearchFilter.c"
+#line 9048 "SearchFilter.c"
 		}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object);
-#line 9055 "SearchFilter.c"
+#line 9052 "SearchFilter.c"
 	} else {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9059 "SearchFilter.c"
+#line 9056 "SearchFilter.c"
 	}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9063 "SearchFilter.c"
+#line 9060 "SearchFilter.c"
 }
 
 
@@ -9070,25 +9067,25 @@ static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (cons
 	if (!object_p) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9074 "SearchFilter.c"
+#line 9071 "SearchFilter.c"
 	}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 9080 "SearchFilter.c"
+#line 9077 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9084 "SearchFilter.c"
+#line 9081 "SearchFilter.c"
 	} else {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9088 "SearchFilter.c"
+#line 9085 "SearchFilter.c"
 	}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9092 "SearchFilter.c"
+#line 9089 "SearchFilter.c"
 }
 
 
@@ -9102,7 +9099,7 @@ GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 9106 "SearchFilter.c"
+#line 9103 "SearchFilter.c"
 }
 
 
@@ -9111,7 +9108,7 @@ gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* val
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL);
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9115 "SearchFilter.c"
+#line 9112 "SearchFilter.c"
 }
 
 
@@ -9131,17 +9128,17 @@ void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpoint
 		value->data[0].v_pointer = v_object;
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9135 "SearchFilter.c"
+#line 9132 "SearchFilter.c"
 	} else {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9139 "SearchFilter.c"
+#line 9136 "SearchFilter.c"
 	}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9145 "SearchFilter.c"
+#line 9142 "SearchFilter.c"
 	}
 }
 
@@ -9160,17 +9157,17 @@ void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpoin
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 9164 "SearchFilter.c"
+#line 9161 "SearchFilter.c"
 	} else {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9168 "SearchFilter.c"
+#line 9165 "SearchFilter.c"
 	}
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9174 "SearchFilter.c"
+#line 9171 "SearchFilter.c"
 	}
 }
 
@@ -9192,7 +9189,7 @@ static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterT
 	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_ADD_CLICKED_SIGNAL] = g_signal_new ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_signals[SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_CLOSED_SIGNAL] = g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9196 "SearchFilter.c"
+#line 9193 "SearchFilter.c"
 }
 
 
@@ -9219,7 +9216,7 @@ static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilt
 	self->priv->add = NULL;
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 9223 "SearchFilter.c"
+#line 9220 "SearchFilter.c"
 }
 
 
@@ -9243,7 +9240,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp0_ = self->priv->edit_buttons;
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = self->priv->edit_buttons_length1;
-#line 9247 "SearchFilter.c"
+#line 9244 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9255,14 +9252,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp0__length1;
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-#line 9259 "SearchFilter.c"
+#line 9256 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp1_;
-#line 9266 "SearchFilter.c"
+#line 9263 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_;
 				guint _tmp3_;
@@ -9274,7 +9271,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
 #line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9278 "SearchFilter.c"
+#line 9275 "SearchFilter.c"
 			}
 		}
 	}
@@ -9282,7 +9279,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp4_ = self->priv->delete_buttons;
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 9286 "SearchFilter.c"
+#line 9283 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9294,14 +9291,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp4__length1;
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 9298 "SearchFilter.c"
+#line 9295 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 9305 "SearchFilter.c"
+#line 9302 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_;
 				guint _tmp7_;
@@ -9313,7 +9310,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 				g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
 #line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9317 "SearchFilter.c"
+#line 9314 "SearchFilter.c"
 			}
 		}
 	}
@@ -9345,7 +9342,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 9349 "SearchFilter.c"
+#line 9346 "SearchFilter.c"
 }
 
 
@@ -9370,7 +9367,7 @@ gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 9374 "SearchFilter.c"
+#line 9371 "SearchFilter.c"
 }
 
 
@@ -9383,7 +9380,7 @@ void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9387 "SearchFilter.c"
+#line 9384 "SearchFilter.c"
 	}
 }
 
@@ -9395,7 +9392,7 @@ static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
 #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9399 "SearchFilter.c"
+#line 9396 "SearchFilter.c"
 }
 
 
@@ -9434,7 +9431,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
 	self->priv->elide_showing_again = FALSE;
 #line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = NULL;
-#line 9438 "SearchFilter.c"
+#line 9435 "SearchFilter.c"
 }
 
 
@@ -9552,7 +9549,7 @@ static void search_filter_toolbar_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9556 "SearchFilter.c"
+#line 9553 "SearchFilter.c"
 }
 
 
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 642fce7..a9b13ec 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -473,15 +473,13 @@ struct _SlideshowPageSettingsDialogClass {
 };
 
 struct _SlideshowPageSettingsDialogPrivate {
-	GtkBuilder* builder;
+	GtkAdjustment* delay_adjustment;
 	GtkSpinButton* delay_entry;
-	GtkScale* delay_hscale;
 	GtkComboBoxText* transition_effect_selector;
 	GtkScale* transition_effect_hscale;
 	GtkSpinButton* transition_effect_entry;
 	GtkAdjustment* transition_effect_adjustment;
 	GtkCheckButton* show_title_button;
-	GtkBox* pane;
 };
 
 
@@ -634,12 +632,7 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self);
 enum  {
 	SLIDESHOW_PAGE_SETTINGS_DIALOG_DUMMY_PROPERTY
 };
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 FullscreenWindow* app_window_get_fullscreen (void);
-#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
-#define RESOURCES_OK_LABEL _ ("_OK")
-#define CONFIG_FACADE_SLIDESHOW_DELAY_MIN 1.0
-#define CONFIG_FACADE_SLIDESHOW_DELAY_MAX 30.0
 gchar* transition_effects_manager_get_effect_name (TransitionEffectsManager* self, const gchar* effect_id);
 GeeCollection* transition_effects_manager_get_effect_names (TransitionEffectsManager* self, GCompareDataFunc comparator, void* comparator_target, GDestroyNotify comparator_target_destroy_notify);
 gint utf8_ci_compare (void* a, void* b);
@@ -647,8 +640,6 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer
 gchar* transition_effects_manager_get_id_for_effect_name (TransitionEffectsManager* self, const gchar* effect_name);
 static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageSettingsDialog* self);
 static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN 0.1
-#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX 1.0
 static void slideshow_page_settings_dialog_finalize (GObject * obj);
 static void slideshow_page_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -656,44 +647,44 @@ 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"
+#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 662 "SlideshowPage.c"
+#line 653 "SlideshowPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 669 "SlideshowPage.c"
+#line 660 "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"
+#line 137 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 676 "SlideshowPage.c"
+#line 667 "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"
+#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_play_pause ((SlideshowPage*) self);
-#line 683 "SlideshowPage.c"
+#line 674 "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"
+#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 690 "SlideshowPage.c"
+#line 681 "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"
+#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_change_settings ((SlideshowPage*) self);
-#line 697 "SlideshowPage.c"
+#line 688 "SlideshowPage.c"
 }
 
 
@@ -733,195 +724,195 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 	GtkToolButton* _tmp26_;
 	GtkToolButton* _tmp27_;
 	Screensaver* _tmp28_;
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_VIEW_COLLECTION (controller), NULL);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_PHOTO (start), NULL);
-#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = (SlideshowPage*) single_photo_page_construct (object_type, _ ("Slideshow"), TRUE);
-#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = sources;
-#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_data_collection_unref0 (self->priv->sources);
-#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->sources = _tmp1_;
-#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = controller;
-#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = _data_collection_ref0 (_tmp2_);
-#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_data_collection_unref0 (self->priv->controller);
-#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->controller = _tmp3_;
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = _tmp4_;
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = transition_effects_manager_get_effect_ids (_tmp5_);
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = _tmp6_;
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_transition_effects_manager_unref0 (_tmp5_);
-#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pluggables = _tmp7_;
-#line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp8_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 147 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	a = _tmp8_;
-#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gee_array_list_add_all (a, pluggables);
-#line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), NULL_TRANSITION_DESCRIPTOR_EFFECT_ID);
-#line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID);
-#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp10_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), &_tmp9_);
-#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->transitions = (_vala_array_free (self->priv->transitions, self->priv->transitions_length1, (GDestroyNotify) g_free), NULL);
-#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->transitions = _tmp10_;
-#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->transitions_length1 = _tmp9_;
-#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->_transitions_size_ = self->priv->transitions_length1;
-#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = start;
-#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->current);
-#line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->current = _tmp12_;
-#line 154 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_update_transition_effect (self);
-#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp13_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	toolbar = _tmp13_;
-#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp14_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Back"));
-#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_object_ref_sink (_tmp14_);
-#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 134 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	previous_button = _tmp14_;
-#line 161 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (previous_button, "go-previous");
-#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the previous photo"));
-#line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (previous_button, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
-#line 165 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (previous_button, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp15_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Pause"));
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_object_ref_sink (_tmp15_);
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->play_pause_button);
-#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->play_pause_button = _tmp15_;
-#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp16_ = self->priv->play_pause_button;
-#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (_tmp16_, "media-playback-pause");
-#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp17_ = self->priv->play_pause_button;
-#line 169 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
-#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp18_ = self->priv->play_pause_button;
-#line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 144 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (_tmp18_, "clicked", (GCallback) _slideshow_page_on_play_pause_gtk_tool_button_clicked, self, 0);
-#line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp19_ = self->priv->play_pause_button;
-#line 172 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, _ ("Next"));
-#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_object_ref_sink (_tmp20_);
-#line 174 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	next_button = _tmp20_;
-#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (next_button, "go-next");
-#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), _ ("Go to the next photo"));
-#line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (next_button, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
-#line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (next_button, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp21_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_object_ref_sink (_tmp21_);
-#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->settings_button);
-#line 181 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->settings_button = _tmp21_;
-#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = self->priv->settings_button;
-#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_icon_name (_tmp22_, "preferences-system");
-#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp23_ = self->priv->settings_button;
-#line 183 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_button_set_label (_tmp23_, _ ("Settings"));
-#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp24_ = self->priv->settings_button;
-#line 184 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), _ ("Change slideshow settings"));
-#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = self->priv->settings_button;
-#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_connect_object (_tmp25_, "clicked", (GCallback) _slideshow_page_on_change_settings_gtk_tool_button_clicked, self, 0);
-#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp26_ = self->priv->settings_button;
-#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp27_ = self->priv->settings_button;
-#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 162 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp28_ = screensaver_new ();
-#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_screensaver_unref0 (self->priv->screensaver);
-#line 190 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->screensaver = _tmp28_;
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_button);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (previous_button);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (toolbar);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (a);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (pluggables);
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 909 "SlideshowPage.c"
+#line 900 "SlideshowPage.c"
 }
 
 
 SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) {
-#line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start);
-#line 916 "SlideshowPage.c"
+#line 907 "SlideshowPage.c"
 }
 
 
 static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) {
 	gboolean result;
 	result = slideshow_page_auto_advance ((SlideshowPage*) self);
-#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 925 "SlideshowPage.c"
+#line 916 "SlideshowPage.c"
 }
 
 
@@ -937,81 +928,81 @@ static void slideshow_page_real_switched_to (Page* base) {
 	gboolean _tmp6_;
 	GTimer* _tmp11_;
 	Screensaver* _tmp12_;
-#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	PAGE_CLASS (slideshow_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->sources;
-#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = pixbuf_cache_new (_tmp0_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp1_, SLIDESHOW_PAGE_READAHEAD_COUNT, NULL, NULL);
-#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->cache);
-#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->cache = _tmp2_;
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = self->priv->current;
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = slideshow_page_get_next_photo (self, _tmp3_, DIRECTION_FORWARD, &_tmp4_, &_tmp5_);
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->current);
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->current = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pixbuf = _tmp5_;
-#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 969 "SlideshowPage.c"
+#line 960 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_;
 		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
 		Direction _tmp10_;
-#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = pixbuf;
-#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = self->priv->current;
-#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = DIRECTION_FORWARD;
-#line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 176 "/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 984 "SlideshowPage.c"
+#line 975 "SlideshowPage.c"
 	}
-#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 179 "/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);
-#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
-#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp11_);
-#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = self->priv->screensaver;
-#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	screensaver_inhibit (_tmp12_, "Playing slideshow");
-#line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 998 "SlideshowPage.c"
+#line 989 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_real_switching_from (Page* base) {
 	SlideshowPage * self;
 	Screensaver* _tmp0_;
-#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	PAGE_CLASS (slideshow_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 214 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->screensaver;
-#line 214 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	screensaver_uninhibit (_tmp0_);
-#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->exiting = TRUE;
-#line 1015 "SlideshowPage.c"
+#line 1006 "SlideshowPage.c"
 }
 
 
@@ -1022,26 +1013,26 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 	Photo* _tmp0_;
 	Photo* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_PHOTO (start), FALSE);
-#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = start;
-#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_vala_next);
-#line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_vala_next = _tmp1_;
-#line 1038 "SlideshowPage.c"
+#line 1029 "SlideshowPage.c"
 	{
 		gboolean _tmp2_ = FALSE;
-#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
-#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 1045 "SlideshowPage.c"
+#line 1036 "SlideshowPage.c"
 			DataSource* forward = NULL;
 			DataSource* back = NULL;
 			ViewCollection* _tmp40_;
@@ -1062,46 +1053,46 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 			DataSource* _tmp54_;
 			PixbufCache* _tmp55_;
 			GeeSet* _tmp56_;
-#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (!_tmp2_) {
-#line 1068 "SlideshowPage.c"
+#line 1059 "SlideshowPage.c"
 			}
-#line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp2_ = FALSE;
-#line 1072 "SlideshowPage.c"
+#line 1063 "SlideshowPage.c"
 			{
 				GdkPixbuf* _tmp3_ = NULL;
 				PixbufCache* _tmp4_;
 				Photo* _tmp5_;
 				GdkPixbuf* _tmp6_;
 				GdkPixbuf* _tmp7_;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp4_ = self->priv->cache;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp5_ = _vala_next;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp6_ = pixbuf_cache_fetch (_tmp4_, _tmp5_, &_inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp3_ = _tmp6_;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1089 "SlideshowPage.c"
-					goto __catch462_g_error;
+#line 1080 "SlideshowPage.c"
+					goto __catch470_g_error;
 				}
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp3_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_vala_next_pixbuf = _tmp7_;
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp3_);
-#line 1102 "SlideshowPage.c"
+#line 1093 "SlideshowPage.c"
 			}
-			goto __finally462;
-			__catch462_g_error:
+			goto __finally470;
+			__catch470_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_;
@@ -1122,308 +1113,308 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				gboolean _tmp28_ = FALSE;
 				Photo* _tmp29_;
 				Photo* _tmp30_;
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				err = _inner_error_;
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_inner_error_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp8_ = _vala_next;
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp10_ = _tmp9_;
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp11_ = err;
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp12_ = _tmp11_->message;
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				g_warning ("SlideshowPage.vala:227: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_);
-#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+				g_warning ("SlideshowPage.vala:201: Unable to fetch pixbuf for %s: %s", _tmp10_, _tmp12_);
+#line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_free0 (_tmp10_);
-#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp13_ = self->priv->controller;
-#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp14_ = _vala_next;
-#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp15_ = view_collection_get_view_for_source (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource));
-#line 230 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				view = _tmp15_;
-#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp17_ = direction;
-#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp17_ == DIRECTION_FORWARD) {
-#line 1156 "SlideshowPage.c"
+#line 1147 "SlideshowPage.c"
 					ViewCollection* _tmp18_;
 					DataView* _tmp19_;
 					DataView* _tmp20_;
-#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp18_ = self->priv->controller;
-#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp19_ = view;
-#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp20_ = view_collection_get_next (_tmp18_, _tmp19_);
-#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_tmp16_);
-#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp20_;
-#line 1170 "SlideshowPage.c"
+#line 1161 "SlideshowPage.c"
 				} else {
 					ViewCollection* _tmp21_;
 					DataView* _tmp22_;
 					DataView* _tmp23_;
-#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp21_ = self->priv->controller;
-#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp22_ = view;
-#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp23_ = view_collection_get_previous (_tmp21_, _tmp22_);
-#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_tmp16_);
-#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp23_;
-#line 1185 "SlideshowPage.c"
+#line 1176 "SlideshowPage.c"
 				}
-#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp24_ = _g_object_ref0 (_tmp16_);
-#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (view);
-#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				view = _tmp24_;
-#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp25_ = view;
-#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp26_ = data_view_get_source (_tmp25_);
-#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 234 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_vala_next = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo);
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp29_ = _vala_next;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp30_ = start;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp29_ == _tmp30_) {
-#line 1207 "SlideshowPage.c"
+#line 1198 "SlideshowPage.c"
 					Photo* _tmp31_;
 					Photo* _tmp32_;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp31_ = _vala_next;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp32_ = self->priv->current;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = _tmp31_ != _tmp32_;
-#line 1216 "SlideshowPage.c"
+#line 1207 "SlideshowPage.c"
 				} else {
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = FALSE;
-#line 1220 "SlideshowPage.c"
+#line 1211 "SlideshowPage.c"
 				}
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp28_) {
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = TRUE;
-#line 1226 "SlideshowPage.c"
+#line 1217 "SlideshowPage.c"
 				} else {
 					Photo* _tmp33_;
 					Photo* _tmp34_;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp33_ = _vala_next;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp34_ = self->priv->current;
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = _tmp33_ == _tmp34_;
-#line 1236 "SlideshowPage.c"
+#line 1227 "SlideshowPage.c"
 				}
-#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp27_) {
-#line 1240 "SlideshowPage.c"
+#line 1231 "SlideshowPage.c"
 					GtkWindow* _tmp35_;
 					GtkWindow* _tmp36_;
 					AppWindow* _tmp37_;
 					AppWindow* _tmp38_;
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp36_ = _tmp35_;
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					app_window_error_message (_ ("All photo source files are missing."), _tmp36_);
-#line 238 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_tmp36_);
-#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp37_ = app_window_get_instance ();
-#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp38_ = _tmp37_;
-#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					app_window_end_fullscreen (_tmp38_);
-#line 239 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_tmp38_);
-#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_vala_next);
-#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_vala_next = NULL;
-#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_vala_next_pixbuf);
-#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_vala_next_pixbuf = NULL;
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					result = FALSE;
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (_tmp16_);
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_object_unref0 (view);
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_g_error_free0 (err);
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					if (next) {
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next = _vala_next;
-#line 1281 "SlideshowPage.c"
+#line 1272 "SlideshowPage.c"
 					} else {
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next);
-#line 1285 "SlideshowPage.c"
+#line 1276 "SlideshowPage.c"
 					}
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					if (next_pixbuf) {
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next_pixbuf = _vala_next_pixbuf;
-#line 1291 "SlideshowPage.c"
+#line 1282 "SlideshowPage.c"
 					} else {
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next_pixbuf);
-#line 1295 "SlideshowPage.c"
+#line 1286 "SlideshowPage.c"
 					}
-#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					return result;
-#line 1299 "SlideshowPage.c"
+#line 1290 "SlideshowPage.c"
 				}
-#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp16_);
-#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (view);
-#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_error_free0 (err);
-#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 1309 "SlideshowPage.c"
+#line 1300 "SlideshowPage.c"
 			}
-			__finally462:
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			__finally470:
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1314 "SlideshowPage.c"
+#line 1305 "SlideshowPage.c"
 				gboolean _tmp39_ = FALSE;
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				g_clear_error (&_inner_error_);
-#line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				return _tmp39_;
-#line 1322 "SlideshowPage.c"
+#line 1313 "SlideshowPage.c"
 			}
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp40_ = self->priv->controller;
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp41_ = _vala_next;
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			view_collection_get_immediate_neighbors (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_DATA_SOURCE, DataSource), &_tmp42_, &_tmp43_, PHOTO_TYPENAME);
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (forward);
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			forward = _tmp42_;
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (back);
-#line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			back = _tmp43_;
-#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp44_ = self->priv->cache;
-#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp45_ = forward;
-#line 254 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			pixbuf_cache_prefetch (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
-#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp46_ = self->priv->cache;
-#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp47_ = back;
-#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			pixbuf_cache_prefetch (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO, Photo), BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp48_ = self->priv->controller;
-#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp49_ = _vala_next;
-#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp50_ = view_collection_get_extended_neighbors (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 257 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			neighbors = _tmp50_;
-#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp51_ = neighbors;
-#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp52_ = forward;
-#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection), _tmp52_);
-#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp53_ = neighbors;
-#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp54_ = back;
-#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
-#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp55_ = self->priv->cache;
-#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp56_ = neighbors;
-#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			pixbuf_cache_prefetch_many (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_COLLECTION, GeeCollection), BACKGROUND_JOB_JOB_PRIORITY_LOWEST, FALSE);
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			result = TRUE;
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (neighbors);
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (back);
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (forward);
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (next) {
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next = _vala_next;
-#line 1388 "SlideshowPage.c"
+#line 1379 "SlideshowPage.c"
 			} else {
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 1392 "SlideshowPage.c"
+#line 1383 "SlideshowPage.c"
 			}
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (next_pixbuf) {
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next_pixbuf = _vala_next_pixbuf;
-#line 1398 "SlideshowPage.c"
+#line 1389 "SlideshowPage.c"
 			} else {
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 1402 "SlideshowPage.c"
+#line 1393 "SlideshowPage.c"
 			}
-#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return result;
-#line 1406 "SlideshowPage.c"
+#line 1397 "SlideshowPage.c"
 		}
 	}
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next) {
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next = _vala_next;
-#line 1413 "SlideshowPage.c"
+#line 1404 "SlideshowPage.c"
 	} else {
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next);
-#line 1417 "SlideshowPage.c"
+#line 1408 "SlideshowPage.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next_pixbuf) {
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next_pixbuf = _vala_next_pixbuf;
-#line 1423 "SlideshowPage.c"
+#line 1414 "SlideshowPage.c"
 	} else {
-#line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next_pixbuf);
-#line 1427 "SlideshowPage.c"
+#line 1418 "SlideshowPage.c"
 	}
 }
 
@@ -1432,56 +1423,56 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 	gboolean _tmp0_;
 	gboolean _tmp7_;
 	GTimer* _tmp8_;
-#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->playing;
-#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp0_) {
-#line 1442 "SlideshowPage.c"
+#line 1433 "SlideshowPage.c"
 		GtkToolButton* _tmp1_;
 		GtkToolButton* _tmp2_;
 		GtkToolButton* _tmp3_;
-#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp1_ = self->priv->play_pause_button;
-#line 269 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_button_set_icon_name (_tmp1_, "media-playback-start");
-#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = self->priv->play_pause_button;
-#line 270 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_button_set_label (_tmp2_, _ ("Play"));
-#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = self->priv->play_pause_button;
-#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tool_item_get_type (), GtkToolItem), _ ("Continue the slideshow"));
-#line 1458 "SlideshowPage.c"
+#line 1449 "SlideshowPage.c"
 	} else {
 		GtkToolButton* _tmp4_;
 		GtkToolButton* _tmp5_;
 		GtkToolButton* _tmp6_;
-#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = self->priv->play_pause_button;
-#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_button_set_icon_name (_tmp4_, "media-playback-pause");
-#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp5_ = self->priv->play_pause_button;
-#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_button_set_label (_tmp5_, _ ("Pause"));
-#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp6_ = self->priv->play_pause_button;
-#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), _ ("Pause the slideshow"));
-#line 1475 "SlideshowPage.c"
+#line 1466 "SlideshowPage.c"
 	}
-#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = self->priv->playing;
-#line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->playing = !_tmp7_;
-#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp8_ = self->priv->timer;
-#line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp8_);
-#line 1485 "SlideshowPage.c"
+#line 1476 "SlideshowPage.c"
 }
 
 
@@ -1500,35 +1491,35 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	DataView* _tmp6_;
 	DataView* _tmp7_;
 	Photo* _tmp20_;
-#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->controller;
-#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->current;
-#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	view = _tmp2_;
-#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	prev_photo = NULL;
-#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = self->priv->controller;
-#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = view;
-#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = view_collection_get_previous (_tmp3_, _tmp4_);
-#line 288 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	start_view = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = start_view;
-#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	prev_view = _tmp7_;
-#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1532 "SlideshowPage.c"
+#line 1523 "SlideshowPage.c"
 		DataView* _tmp8_;
 		DataView* _tmp9_;
 		DataSource* _tmp10_;
@@ -1539,86 +1530,86 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 		DataView* _tmp17_;
 		DataView* _tmp18_;
 		DataView* _tmp19_;
-#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = prev_view;
-#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (!(_tmp8_ != NULL)) {
-#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1549 "SlideshowPage.c"
+#line 1540 "SlideshowPage.c"
 		}
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = prev_view;
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = data_view_get_source (_tmp9_);
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = _tmp10_;
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO);
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1563 "SlideshowPage.c"
+#line 1554 "SlideshowPage.c"
 			DataView* _tmp13_;
 			DataSource* _tmp14_;
-#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp13_ = prev_view;
-#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp14_ = data_view_get_source (_tmp13_);
-#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (prev_photo);
-#line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
-#line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1576 "SlideshowPage.c"
+#line 1567 "SlideshowPage.c"
 		}
-#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
-#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp16_ = prev_view;
-#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_);
-#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (prev_view);
-#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		prev_view = _tmp17_;
-#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp18_ = prev_view;
-#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp19_ = start_view;
-#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp18_ == _tmp19_) {
-#line 300 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			g_warning ("SlideshowPage.vala:300: on_previous( ): can't advance to previous phot" \
+#line 274 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			g_warning ("SlideshowPage.vala:274: on_previous( ): can't advance to previous phot" \
 "o: collection has only videos");
-#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (prev_view);
-#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (start_view);
-#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (prev_photo);
-#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (view);
-#line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1606 "SlideshowPage.c"
+#line 1597 "SlideshowPage.c"
 		}
 	}
-#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp20_ = prev_photo;
-#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_advance (self, _tmp20_, DIRECTION_BACKWARD);
-#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (prev_view);
-#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (start_view);
-#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (prev_photo);
-#line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1621 "SlideshowPage.c"
+#line 1612 "SlideshowPage.c"
 }
 
 
@@ -1642,35 +1633,35 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	gchar* _tmp23_;
 	gboolean _tmp24_;
 	Photo* _tmp25_;
-#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->controller;
-#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->current;
-#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 309 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	view = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	next_photo = NULL;
-#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = self->priv->controller;
-#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = view;
-#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = view_collection_get_next (_tmp3_, _tmp4_);
-#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	start_view = _tmp5_;
-#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = start_view;
-#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 313 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	next_view = _tmp7_;
-#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1673 "SlideshowPage.c"
+#line 1664 "SlideshowPage.c"
 		DataView* _tmp8_;
 		DataView* _tmp9_;
 		DataSource* _tmp10_;
@@ -1681,106 +1672,106 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 		DataView* _tmp17_;
 		DataView* _tmp18_;
 		DataView* _tmp19_;
-#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = next_view;
-#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (!(_tmp8_ != NULL)) {
-#line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1690 "SlideshowPage.c"
+#line 1681 "SlideshowPage.c"
 		}
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = next_view;
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = data_view_get_source (_tmp9_);
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = _tmp10_;
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO);
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1704 "SlideshowPage.c"
+#line 1695 "SlideshowPage.c"
 			DataView* _tmp13_;
 			DataSource* _tmp14_;
-#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp13_ = next_view;
-#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp14_ = data_view_get_source (_tmp13_);
-#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (next_photo);
-#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
-#line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1717 "SlideshowPage.c"
+#line 1708 "SlideshowPage.c"
 		}
-#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
-#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp16_ = next_view;
-#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_);
-#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (next_view);
-#line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		next_view = _tmp17_;
-#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp18_ = next_view;
-#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp19_ = start_view;
-#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp18_ == _tmp19_) {
-#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			g_warning ("SlideshowPage.vala:324: on_next( ): can't advance to next photo: colle" \
+#line 298 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			g_warning ("SlideshowPage.vala:298: on_next( ): can't advance to next photo: colle" \
 "ction has only videos");
-#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (next_view);
-#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (start_view);
-#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (next_photo);
-#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_object_unref0 (view);
-#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1747 "SlideshowPage.c"
+#line 1738 "SlideshowPage.c"
 		}
 	}
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp20_ = config_facade_get_instance ();
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp21_ = _tmp20_;
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp23_ = _tmp22_;
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp24_ = g_strcmp0 (_tmp23_, RANDOM_EFFECT_DESCRIPTOR_EFFECT_ID) == 0;
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (_tmp23_);
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp21_);
-#line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp24_) {
-#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_random_transition_effect (self);
-#line 1768 "SlideshowPage.c"
+#line 1759 "SlideshowPage.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = next_photo;
-#line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	slideshow_page_advance (self, _tmp25_, DIRECTION_FORWARD);
 #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	slideshow_page_advance (self, _tmp25_, DIRECTION_FORWARD);
+#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_view);
-#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (start_view);
-#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_photo);
-#line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1782 "SlideshowPage.c"
+#line 1773 "SlideshowPage.c"
 }
 
 
@@ -1794,58 +1785,58 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 	GdkPixbuf* _tmp5_ = NULL;
 	gboolean _tmp6_;
 	GTimer* _tmp11_;
-#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = photo;
-#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->current);
-#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->current = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->current;
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = direction;
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = slideshow_page_get_next_photo (self, _tmp2_, _tmp3_, &_tmp4_, &_tmp5_);
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->current);
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->current = _tmp4_;
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_pixbuf);
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	next_pixbuf = _tmp5_;
-#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 1824 "SlideshowPage.c"
+#line 1815 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_;
 		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
 		Direction _tmp10_;
-#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = next_pixbuf;
-#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = self->priv->current;
-#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = direction;
-#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 317 "/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 1839 "SlideshowPage.c"
+#line 1830 "SlideshowPage.c"
 	}
-#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
-#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp11_);
-#line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_pixbuf);
-#line 1847 "SlideshowPage.c"
+#line 1838 "SlideshowPage.c"
 }
 
 
@@ -1859,57 +1850,57 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	ConfigFacade* _tmp5_;
 	gdouble _tmp6_;
 	gboolean _tmp7_;
-#line 349 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (IS_SLIDESHOW_PAGE (self), FALSE);
-#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->exiting;
-#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp0_) {
-#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		result = FALSE;
-#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1871 "SlideshowPage.c"
+#line 1862 "SlideshowPage.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->playing;
-#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (!_tmp1_) {
-#line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		result = TRUE;
-#line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 328 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1881 "SlideshowPage.c"
+#line 1872 "SlideshowPage.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->timer;
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = g_timer_elapsed (_tmp2_, NULL);
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = _tmp4_;
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = _tmp3_ < _tmp6_;
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp7_) {
-#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		result = TRUE;
-#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1903 "SlideshowPage.c"
+#line 1894 "SlideshowPage.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = TRUE;
-#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 1911 "SlideshowPage.c"
+#line 1902 "SlideshowPage.c"
 }
 
 
@@ -1922,87 +1913,87 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 1926 "SlideshowPage.c"
+#line 1917 "SlideshowPage.c"
 	gboolean _tmp6_;
 	gboolean _tmp7_ = FALSE;
-#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 365 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	handled = TRUE;
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = event;
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = _tmp2_;
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) {
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1949 "SlideshowPage.c"
+#line 1940 "SlideshowPage.c"
 			default:
 			{
-#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				slideshow_page_on_play_pause (self);
-#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 1956 "SlideshowPage.c"
+#line 1947 "SlideshowPage.c"
 			}
 		}
 	} else {
-#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1962 "SlideshowPage.c"
+#line 1953 "SlideshowPage.c"
 			default:
 			{
-#line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				handled = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 1969 "SlideshowPage.c"
+#line 1960 "SlideshowPage.c"
 			}
 		}
 	}
-#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = handled;
-#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		result = TRUE;
-#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1981 "SlideshowPage.c"
+#line 1972 "SlideshowPage.c"
 	}
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 1985 "SlideshowPage.c"
+#line 1976 "SlideshowPage.c"
 		GdkEventKey* _tmp8_;
 		gboolean _tmp9_;
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = event;
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_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"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = _tmp9_;
-#line 1994 "SlideshowPage.c"
+#line 1985 "SlideshowPage.c"
 	} else {
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = TRUE;
-#line 1998 "SlideshowPage.c"
+#line 1989 "SlideshowPage.c"
 	}
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp7_;
-#line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2004 "SlideshowPage.c"
+#line 1995 "SlideshowPage.c"
 }
 
 
@@ -2017,33 +2008,33 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	SlideshowPageSettingsDialog* _tmp22_;
 	gboolean _tmp23_;
 	GTimer* _tmp24_;
-#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = slideshow_page_settings_dialog_new ();
-#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 383 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	settings_dialog = _tmp0_;
-#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = settings_dialog;
-#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 386 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->playing;
-#line 386 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_playing = _tmp2_;
-#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->playing = FALSE;
-#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_emit (self, slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL], 0);
-#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = settings_dialog;
-#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog));
-#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2045 "SlideshowPage.c"
+#line 2036 "SlideshowPage.c"
 		ConfigFacade* _tmp5_;
 		ConfigFacade* _tmp6_;
 		SlideshowPageSettingsDialog* _tmp7_;
@@ -2061,77 +2052,77 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 		ConfigFacade* _tmp19_;
 		SlideshowPageSettingsDialog* _tmp20_;
 		gboolean _tmp21_;
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp5_ = config_facade_get_instance ();
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp6_ = _tmp5_;
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = settings_dialog;
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = slideshow_page_settings_dialog_get_delay (_tmp7_);
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		configuration_facade_set_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_);
-#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = config_facade_get_instance ();
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = _tmp9_;
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = settings_dialog;
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp12_ = slideshow_page_settings_dialog_get_transition_delay (_tmp11_);
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		configuration_facade_set_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp13_ = config_facade_get_instance ();
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp14_ = _tmp13_;
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = settings_dialog;
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp16_ = slideshow_page_settings_dialog_get_transition_effect_id (_tmp15_);
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp17_ = _tmp16_;
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		configuration_facade_set_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp17_);
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_free0 (_tmp17_);
-#line 395 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp18_ = config_facade_get_instance ();
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp19_ = _tmp18_;
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp20_ = settings_dialog;
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp21_ = slideshow_page_settings_dialog_get_show_title (_tmp20_);
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		configuration_facade_set_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp21_);
-#line 396 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_update_transition_effect (self);
-#line 2117 "SlideshowPage.c"
+#line 2108 "SlideshowPage.c"
 	}
-#line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = settings_dialog;
-#line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp23_ = slideshow_playing;
-#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->playing = _tmp23_;
-#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp24_ = self->priv->timer;
-#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp24_);
-#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (settings_dialog);
-#line 2133 "SlideshowPage.c"
+#line 2124 "SlideshowPage.c"
 }
 
 
@@ -2146,37 +2137,37 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {
 	ConfigFacade* _tmp5_;
 	gdouble _tmp6_;
 	gdouble _tmp7_;
-#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = _tmp2_;
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	effect_id = _tmp3_;
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = _tmp4_;
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = _tmp6_;
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	effect_delay = _tmp7_;
-#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	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"
+#line 380 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2178 "SlideshowPage.c"
+#line 2169 "SlideshowPage.c"
 }
 
 
@@ -2192,31 +2183,31 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	gint _tmp5__length1;
 	const gchar* _tmp12_;
 	gdouble _tmp13_;
-#line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = _tmp2_;
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	effect_delay = _tmp3_;
-#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	effect_id = _tmp4_;
-#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = self->priv->transitions;
-#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5__length1 = self->priv->transitions_length1;
-#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (0 < _tmp5__length1) {
-#line 2218 "SlideshowPage.c"
+#line 2209 "SlideshowPage.c"
 		gint random = 0;
 		gchar** _tmp6_;
 		gint _tmp6__length1;
@@ -2226,39 +2217,39 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 		gint _tmp9_;
 		const gchar* _tmp10_;
 		gchar* _tmp11_;
-#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp6_ = self->priv->transitions;
-#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp6__length1 = self->priv->transitions_length1;
-#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = g_random_int_range ((gint32) 0, (gint32) _tmp6__length1);
-#line 417 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		random = (gint) _tmp7_;
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = self->priv->transitions;
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8__length1 = self->priv->transitions_length1;
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = random;
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp10_ = _tmp8_[_tmp9_];
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_free0 (effect_id);
-#line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		effect_id = _tmp11_;
-#line 2250 "SlideshowPage.c"
+#line 2241 "SlideshowPage.c"
 	}
-#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = effect_id;
-#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp13_ = effect_delay;
-#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	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"
+#line 387 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2260 "SlideshowPage.c"
+#line 2251 "SlideshowPage.c"
 }
 
 
@@ -2313,190 +2304,190 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	cairo_t* _tmp46_;
 	cairo_t* _tmp47_;
 	cairo_t* _tmp48_;
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (IS_SLIDESHOW_PAGE (self));
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (ctx != NULL);
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->current;
-#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	title = _tmp1_;
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = title;
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp3_ == NULL) {
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
-#line 2333 "SlideshowPage.c"
+#line 2324 "SlideshowPage.c"
 	} else {
 		const gchar* _tmp4_;
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = title;
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2340 "SlideshowPage.c"
+#line 2331 "SlideshowPage.c"
 	}
-#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_free0 (title);
-#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return;
-#line 2348 "SlideshowPage.c"
+#line 2339 "SlideshowPage.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = title;
-#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 405 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	layout = _tmp6_;
-#line 432 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = pango_attr_list_new ();
-#line 432 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	list = _tmp7_;
-#line 433 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp8_ = pango_attr_scale_new ((gdouble) 3);
-#line 433 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	size = _tmp8_;
-#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp9_ = list;
-#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp10_ = size;
-#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = pango_attribute_copy (_tmp10_);
-#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_attr_list_insert (_tmp9_, _tmp11_);
-#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = layout;
-#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp13_ = list;
-#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_layout_set_attributes (_tmp12_, _tmp13_);
-#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp14_ = layout;
-#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp15_ = *ctx_dim;
-#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp16_ = _tmp15_.width;
-#line 436 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_layout_set_width (_tmp14_, (gint) ((_tmp16_ * 0.9) * PANGO_SCALE));
-#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp17_ = layout;
-#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_layout_get_pixel_size (_tmp17_, &_tmp18_, &_tmp19_);
-#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	title_width = _tmp18_;
-#line 440 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	title_height = _tmp19_;
-#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp20_ = *ctx_dim;
-#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp21_ = _tmp20_.width;
-#line 441 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	x = _tmp21_ * 0.2;
-#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = *ctx_dim;
-#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp23_ = _tmp22_.height;
-#line 442 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	y = _tmp23_ * 0.90;
-#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp24_ = y;
-#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = title_height;
-#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp26_ = *ctx_dim;
-#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp27_ = _tmp26_.height;
-#line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) {
-#line 2416 "SlideshowPage.c"
+#line 2407 "SlideshowPage.c"
 		Dimensions _tmp28_;
 		gint _tmp29_;
 		gint _tmp30_;
-#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp28_ = *ctx_dim;
-#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp29_ = _tmp28_.height;
-#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp30_ = title_height;
-#line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		y = (_tmp29_ * 0.95) - _tmp30_;
-#line 2428 "SlideshowPage.c"
+#line 2419 "SlideshowPage.c"
 	}
-#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp31_ = x;
-#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp32_ = title_width;
-#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp33_ = *ctx_dim;
-#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp34_ = _tmp33_.width;
-#line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) {
-#line 2440 "SlideshowPage.c"
+#line 2431 "SlideshowPage.c"
 		Dimensions _tmp35_;
 		gint _tmp36_;
 		gint _tmp37_;
-#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp35_ = *ctx_dim;
-#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp36_ = _tmp35_.width;
-#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp37_ = title_width;
-#line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2));
-#line 2452 "SlideshowPage.c"
+#line 2443 "SlideshowPage.c"
 	}
-#line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp38_ = ctx;
-#line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	set_source_color_from_string (_tmp38_, "#fff");
-#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp39_ = ctx;
-#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp40_ = x;
-#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp41_ = y;
-#line 452 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 426 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	cairo_move_to (_tmp39_, _tmp40_, _tmp41_);
-#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp42_ = ctx;
-#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp43_ = layout;
-#line 453 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_cairo_show_layout (_tmp42_, _tmp43_);
-#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp44_ = ctx;
-#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp45_ = layout;
-#line 454 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	pango_cairo_layout_path (_tmp44_, _tmp45_);
-#line 455 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp46_ = ctx;
-#line 455 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	cairo_set_line_width (_tmp46_, 1.5);
-#line 456 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp47_ = ctx;
-#line 456 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	set_source_color_from_string (_tmp47_, "#000");
-#line 457 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp48_ = ctx;
-#line 457 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	cairo_stroke (_tmp48_);
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_pango_attribute_destroy0 (size);
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_pango_attr_list_unref0 (list);
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (layout);
-#line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (title);
-#line 2498 "SlideshowPage.c"
+#line 2489 "SlideshowPage.c"
 }
 
 
@@ -2509,54 +2500,54 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 	ConfigFacade* _tmp4_;
 	gboolean _tmp5_;
 	gboolean _tmp6_;
-#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SLIDESHOW_PAGE, SlideshowPage);
-#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (ctx != NULL);
-#line 460 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = ctx;
-#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = *ctx_dim;
-#line 461 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (slideshow_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp0_, &_tmp1_);
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = _tmp3_;
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = _tmp5_;
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 2535 "SlideshowPage.c"
+#line 2526 "SlideshowPage.c"
 		gboolean _tmp7_;
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/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"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = !_tmp7_;
-#line 2541 "SlideshowPage.c"
+#line 2532 "SlideshowPage.c"
 	} else {
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 2545 "SlideshowPage.c"
+#line 2536 "SlideshowPage.c"
 	}
-#line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 2549 "SlideshowPage.c"
+#line 2540 "SlideshowPage.c"
 		cairo_t* _tmp8_;
 		Dimensions _tmp9_;
-#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp8_ = ctx;
-#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = *ctx_dim;
-#line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_paint_title (self, _tmp8_, &_tmp9_);
-#line 2558 "SlideshowPage.c"
+#line 2549 "SlideshowPage.c"
 	}
 }
 
@@ -2564,485 +2555,297 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = utf8_ci_compare (a, b);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2568 "SlideshowPage.c"
+#line 2559 "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"
+#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self);
-#line 2575 "SlideshowPage.c"
+#line 2566 "SlideshowPage.c"
 }
 
 
 static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GType object_type) {
 	SlideshowPageSettingsDialog * self = NULL;
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
-	GObject* _tmp2_;
-	GtkBox* _tmp3_;
-	GtkBox* _tmp4_;
-	GtkBox* _tmp5_;
 	gdouble delay = 0.0;
-	ConfigFacade* _tmp6_;
-	ConfigFacade* _tmp7_;
-	gdouble _tmp8_;
-	gdouble _tmp9_;
-	FullscreenWindow* _tmp10_;
-	FullscreenWindow* _tmp11_;
-	GtkAdjustment* adjustment = NULL;
-	gdouble _tmp12_;
-	GtkAdjustment* _tmp13_;
-	GtkBuilder* _tmp14_;
-	GObject* _tmp15_;
-	GtkScale* _tmp16_;
-	GtkScale* _tmp17_;
-	GtkAdjustment* _tmp18_;
-	GtkBuilder* _tmp19_;
-	GObject* _tmp20_;
-	GtkSpinButton* _tmp21_;
-	GtkSpinButton* _tmp22_;
-	GtkAdjustment* _tmp23_;
-	GtkSpinButton* _tmp24_;
-	gdouble _tmp25_;
-	GtkSpinButton* _tmp26_;
-	GtkSpinButton* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkComboBoxText* _tmp30_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
+	FullscreenWindow* _tmp4_;
+	FullscreenWindow* _tmp5_;
+	GtkAdjustment* _tmp6_;
+	gdouble _tmp7_;
 	gchar* effect_id = NULL;
-	ConfigFacade* _tmp31_;
-	ConfigFacade* _tmp32_;
-	gchar* _tmp33_;
-	gchar* _tmp34_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 	gchar* null_display_name = NULL;
-	TransitionEffectsManager* _tmp35_;
-	TransitionEffectsManager* _tmp36_;
-	gchar* _tmp37_;
-	gchar* _tmp38_;
-	GtkComboBoxText* _tmp39_;
-	const gchar* _tmp40_;
-	GtkComboBoxText* _tmp41_;
+	TransitionEffectsManager* _tmp12_;
+	TransitionEffectsManager* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	GtkComboBoxText* _tmp16_;
+	const gchar* _tmp17_;
+	GtkComboBoxText* _tmp18_;
 	gint i = 0;
-	GtkComboBoxText* _tmp66_;
+	GtkComboBoxText* _tmp43_;
 	gdouble transition_delay = 0.0;
-	ConfigFacade* _tmp67_;
-	ConfigFacade* _tmp68_;
-	gdouble _tmp69_;
-	gdouble _tmp70_;
-	GtkAdjustment* _tmp71_;
-	GtkBuilder* _tmp72_;
-	GObject* _tmp73_;
-	GtkScale* _tmp74_;
-	GtkScale* _tmp75_;
-	GtkAdjustment* _tmp76_;
-	GtkBuilder* _tmp77_;
-	GObject* _tmp78_;
-	GtkSpinButton* _tmp79_;
-	GtkSpinButton* _tmp80_;
-	GtkAdjustment* _tmp81_;
-	GtkSpinButton* _tmp82_;
-	GtkSpinButton* _tmp83_;
-	GtkSpinButton* _tmp84_;
+	ConfigFacade* _tmp44_;
+	ConfigFacade* _tmp45_;
+	gdouble _tmp46_;
+	gdouble _tmp47_;
+	GtkAdjustment* _tmp48_;
 	gboolean show_title = FALSE;
-	ConfigFacade* _tmp85_;
-	ConfigFacade* _tmp86_;
-	gboolean _tmp87_;
-	gboolean _tmp88_;
-	GtkBuilder* _tmp89_;
-	GObject* _tmp90_;
-	GtkCheckButton* _tmp91_;
-	GtkCheckButton* _tmp92_;
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	ConfigFacade* _tmp49_;
+	ConfigFacade* _tmp50_;
+	gboolean _tmp51_;
+	gboolean _tmp52_;
+	GtkCheckButton* _tmp53_;
+#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self = (SlideshowPageSettingsDialog*) g_object_new (object_type, NULL);
-#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 38 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->builder = _tmp0_;
-#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp1_ = self->priv->builder;
-#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp2_ = gtk_builder_get_object (_tmp1_, "slideshow_settings_pane");
-#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_box_get_type ()) ? ((GtkBox*) _tmp2_) : NULL);
-#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->pane);
-#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->pane = _tmp3_;
-#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp4_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp5_ = self->priv->pane;
-#line 40 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp6_ = config_facade_get_instance ();
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp7_ = _tmp6_;
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp8_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp9_ = _tmp8_;
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp7_);
-#line 42 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	delay = _tmp9_;
 #line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp10_ = app_window_get_fullscreen ();
-#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp11_ = _tmp10_;
-#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 45 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp11_);
-#line 47 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 49 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Settings"));
+	_tmp0_ = config_facade_get_instance ();
+#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp1_ = _tmp0_;
+#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp2_ = configuration_facade_get_slideshow_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp3_ = _tmp2_;
+#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 44 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	delay = _tmp3_;
+#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp4_ = app_window_get_fullscreen ();
+#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp5_ = _tmp4_;
+#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+#line 46 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (_tmp5_);
+#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp6_ = self->priv->delay_adjustment;
+#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp7_ = delay;
+#line 48 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_adjustment_set_value (_tmp6_, _tmp7_);
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp12_ = delay;
+	_tmp8_ = config_facade_get_instance ();
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp13_ = gtk_adjustment_new (_tmp12_, CONFIG_FACADE_SLIDESHOW_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
+	_tmp9_ = _tmp8_;
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp13_);
+	_tmp10_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	adjustment = _tmp13_;
-#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp14_ = self->priv->builder;
-#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "delay_hscale");
-#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp15_) : NULL);
-#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->delay_hscale);
-#line 52 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->delay_hscale = _tmp16_;
-#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp17_ = self->priv->delay_hscale;
-#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp18_ = adjustment;
-#line 53 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), _tmp18_);
-#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp19_ = self->priv->builder;
-#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "delay_entry");
-#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp20_) : NULL);
-#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->delay_entry);
-#line 55 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->delay_entry = _tmp21_;
+	_tmp11_ = _tmp10_;
+#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (_tmp9_);
+#line 51 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	effect_id = _tmp11_;
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp12_ = transition_effects_manager_get_instance ();
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp13_ = _tmp12_;
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp14_ = transition_effects_manager_get_effect_name (_tmp13_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp15_ = _tmp14_;
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_transition_effects_manager_unref0 (_tmp13_);
+#line 54 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	null_display_name = _tmp15_;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp22_ = self->priv->delay_entry;
+	_tmp16_ = self->priv->transition_effect_selector;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp23_ = adjustment;
+	_tmp17_ = null_display_name;
 #line 56 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_adjustment (_tmp22_, _tmp23_);
-#line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp24_ = self->priv->delay_entry;
+	gtk_combo_box_text_append_text (_tmp16_, _tmp17_);
 #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp25_ = delay;
+	_tmp18_ = self->priv->transition_effect_selector;
 #line 57 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_value (_tmp24_, _tmp25_);
-#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp26_ = self->priv->delay_entry;
-#line 58 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_numeric (_tmp26_, TRUE);
-#line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp27_ = self->priv->delay_entry;
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 59 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), TRUE);
-#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp28_ = self->priv->builder;
-#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "transition_effect_selector");
-#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
-#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->transition_effect_selector);
-#line 61 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_selector = _tmp30_;
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp31_ = config_facade_get_instance ();
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp32_ = _tmp31_;
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp33_ = configuration_facade_get_slideshow_transition_effect_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp34_ = _tmp33_;
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp32_);
-#line 64 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	effect_id = _tmp34_;
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp35_ = transition_effects_manager_get_instance ();
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp36_ = _tmp35_;
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp37_ = transition_effects_manager_get_effect_name (_tmp36_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp38_ = _tmp37_;
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_transition_effects_manager_unref0 (_tmp36_);
-#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	null_display_name = _tmp38_;
-#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp39_ = self->priv->transition_effect_selector;
-#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp40_ = null_display_name;
-#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_combo_box_text_append_text (_tmp39_, _tmp40_);
-#line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp41_ = self->priv->transition_effect_selector;
-#line 70 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	i = 1;
-#line 2807 "SlideshowPage.c"
+#line 2672 "SlideshowPage.c"
 	{
 		GeeIterator* _display_name_it = NULL;
-		TransitionEffectsManager* _tmp42_;
-		TransitionEffectsManager* _tmp43_;
-		GeeCollection* _tmp44_;
-		GeeCollection* _tmp45_;
-		GeeIterator* _tmp46_;
-		GeeIterator* _tmp47_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp42_ = transition_effects_manager_get_instance ();
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp43_ = _tmp42_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp44_ = transition_effects_manager_get_effect_names (_tmp43_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp45_ = _tmp44_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_tmp47_ = _tmp46_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_g_object_unref0 (_tmp45_);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_transition_effects_manager_unref0 (_tmp43_);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-		_display_name_it = _tmp47_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		TransitionEffectsManager* _tmp19_;
+		TransitionEffectsManager* _tmp20_;
+		GeeCollection* _tmp21_;
+		GeeCollection* _tmp22_;
+		GeeIterator* _tmp23_;
+		GeeIterator* _tmp24_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp19_ = transition_effects_manager_get_instance ();
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp20_ = _tmp19_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp21_ = transition_effects_manager_get_effect_names (_tmp20_, _utf8_ci_compare_gcompare_data_func, NULL, NULL);
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp22_ = _tmp21_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp23_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_tmp24_ = _tmp23_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_g_object_unref0 (_tmp22_);
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_transition_effects_manager_unref0 (_tmp20_);
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+		_display_name_it = _tmp24_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 2836 "SlideshowPage.c"
-			GeeIterator* _tmp48_;
-			gboolean _tmp49_;
+#line 2701 "SlideshowPage.c"
+			GeeIterator* _tmp25_;
+			gboolean _tmp26_;
 			gchar* display_name = NULL;
-			GeeIterator* _tmp50_;
-			gpointer _tmp51_;
-			const gchar* _tmp52_;
-			const gchar* _tmp53_;
-			GtkComboBoxText* _tmp54_;
-			const gchar* _tmp55_;
-			const gchar* _tmp56_;
-			TransitionEffectsManager* _tmp57_;
-			TransitionEffectsManager* _tmp58_;
-			const gchar* _tmp59_;
-			gchar* _tmp60_;
-			gchar* _tmp61_;
-			gboolean _tmp62_;
-			gint _tmp65_;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp48_ = _display_name_it;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp49_ = gee_iterator_next (_tmp48_);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (!_tmp49_) {
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			GeeIterator* _tmp27_;
+			gpointer _tmp28_;
+			const gchar* _tmp29_;
+			const gchar* _tmp30_;
+			GtkComboBoxText* _tmp31_;
+			const gchar* _tmp32_;
+			const gchar* _tmp33_;
+			TransitionEffectsManager* _tmp34_;
+			TransitionEffectsManager* _tmp35_;
+			const gchar* _tmp36_;
+			gchar* _tmp37_;
+			gchar* _tmp38_;
+			gboolean _tmp39_;
+			gint _tmp42_;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp25_ = _display_name_it;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp26_ = gee_iterator_next (_tmp25_);
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			if (!_tmp26_) {
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2862 "SlideshowPage.c"
+#line 2727 "SlideshowPage.c"
 			}
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp50_ = _display_name_it;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp51_ = gee_iterator_get (_tmp50_);
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			display_name = (gchar*) _tmp51_;
-#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp52_ = display_name;
-#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp53_ = null_display_name;
-#line 75 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (g_strcmp0 (_tmp52_, _tmp53_) == 0) {
-#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp27_ = _display_name_it;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp28_ = gee_iterator_get (_tmp27_);
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			display_name = (gchar*) _tmp28_;
+#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp29_ = display_name;
+#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp30_ = null_display_name;
+#line 62 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			if (g_strcmp0 (_tmp29_, _tmp30_) == 0) {
+#line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_free0 (display_name);
-#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 2880 "SlideshowPage.c"
+#line 2745 "SlideshowPage.c"
 			}
-#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp54_ = self->priv->transition_effect_selector;
-#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp55_ = display_name;
-#line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			gtk_combo_box_text_append_text (_tmp54_, _tmp55_);
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp56_ = effect_id;
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp57_ = transition_effects_manager_get_instance ();
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp58_ = _tmp57_;
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp59_ = display_name;
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp60_ = transition_effects_manager_get_id_for_effect_name (_tmp58_, _tmp59_);
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp61_ = _tmp60_;
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp62_ = g_strcmp0 (_tmp56_, _tmp61_) == 0;
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_g_free0 (_tmp61_);
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_transition_effects_manager_unref0 (_tmp58_);
-#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			if (_tmp62_) {
-#line 2908 "SlideshowPage.c"
-				GtkComboBoxText* _tmp63_;
-				gint _tmp64_;
-#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				_tmp63_ = self->priv->transition_effect_selector;
-#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				_tmp64_ = i;
-#line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_combo_box_get_type (), GtkComboBox), _tmp64_);
-#line 2917 "SlideshowPage.c"
+#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp31_ = self->priv->transition_effect_selector;
+#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp32_ = display_name;
+#line 65 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp33_ = effect_id;
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp34_ = transition_effects_manager_get_instance ();
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp35_ = _tmp34_;
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp36_ = display_name;
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp37_ = transition_effects_manager_get_id_for_effect_name (_tmp35_, _tmp36_);
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp38_ = _tmp37_;
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp39_ = g_strcmp0 (_tmp33_, _tmp38_) == 0;
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_g_free0 (_tmp38_);
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_transition_effects_manager_unref0 (_tmp35_);
+#line 66 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			if (_tmp39_) {
+#line 2773 "SlideshowPage.c"
+				GtkComboBoxText* _tmp40_;
+				gint _tmp41_;
+#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+				_tmp40_ = self->priv->transition_effect_selector;
+#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+				_tmp41_ = i;
+#line 67 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), _tmp41_);
+#line 2782 "SlideshowPage.c"
 			}
-#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			_tmp65_ = i;
-#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-			i = _tmp65_ + 1;
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			_tmp42_ = i;
+#line 69 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+			i = _tmp42_ + 1;
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_free0 (display_name);
-#line 2925 "SlideshowPage.c"
+#line 2790 "SlideshowPage.c"
 		}
-#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 60 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_display_name_it);
-#line 2929 "SlideshowPage.c"
+#line 2794 "SlideshowPage.c"
 	}
-#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp66_ = self->priv->transition_effect_selector;
-#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp67_ = config_facade_get_instance ();
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp68_ = _tmp67_;
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp69_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp70_ = _tmp69_;
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp68_);
-#line 86 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	transition_delay = _tmp70_;
-#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp71_ = gtk_adjustment_new (transition_delay, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN, CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX, 0.1, (gdouble) 1, (gdouble) 0);
-#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	g_object_ref_sink (_tmp71_);
-#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->transition_effect_adjustment);
-#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_adjustment = _tmp71_;
-#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp72_ = self->priv->builder;
-#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp73_ = gtk_builder_get_object (_tmp72_, "transition_effect_hscale");
-#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp73_) : NULL);
-#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->transition_effect_hscale);
-#line 90 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_hscale = _tmp74_;
-#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp75_ = self->priv->transition_effect_hscale;
-#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp76_ = self->priv->transition_effect_adjustment;
-#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_range_set_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_range_get_type (), GtkRange), _tmp76_);
-#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp77_ = self->priv->builder;
-#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp78_ = gtk_builder_get_object (_tmp77_, "transition_effect_entry");
-#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_spin_button_get_type ()) ? ((GtkSpinButton*) _tmp78_) : NULL);
-#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->transition_effect_entry);
-#line 93 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->transition_effect_entry = _tmp79_;
-#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp80_ = self->priv->transition_effect_entry;
-#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp81_ = self->priv->transition_effect_adjustment;
-#line 94 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_adjustment (_tmp80_, _tmp81_);
-#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp82_ = self->priv->transition_effect_entry;
-#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_value (_tmp82_, transition_delay);
-#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp83_ = self->priv->transition_effect_entry;
-#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_spin_button_set_numeric (_tmp83_, TRUE);
-#line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp84_ = self->priv->transition_effect_entry;
-#line 97 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_entry_set_activates_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_entry_get_type (), GtkEntry), TRUE);
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp85_ = config_facade_get_instance ();
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp86_ = _tmp85_;
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp87_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp88_ = _tmp87_;
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (_tmp86_);
-#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	show_title = _tmp88_;
-#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp89_ = self->priv->builder;
-#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp90_ = gtk_builder_get_object (_tmp89_, "show_title_button");
-#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp90_) : NULL);
-#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->show_title_button);
-#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->show_title_button = _tmp91_;
-#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_tmp92_ = self->priv->show_title_button;
-#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
-#line 103 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 105 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp43_ = self->priv->transition_effect_selector;
+#line 71 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed, self, 0);
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp44_ = config_facade_get_instance ();
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp45_ = _tmp44_;
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp46_ = configuration_facade_get_slideshow_transition_delay (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp47_ = _tmp46_;
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (_tmp45_);
+#line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	transition_delay = _tmp47_;
+#line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp48_ = self->priv->transition_effect_adjustment;
+#line 74 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_adjustment_set_value (_tmp48_, transition_delay);
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp49_ = config_facade_get_instance ();
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp50_ = _tmp49_;
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp51_ = configuration_facade_get_slideshow_show_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp52_ = _tmp51_;
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (_tmp50_);
+#line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	show_title = _tmp52_;
+#line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_tmp53_ = self->priv->show_title_button;
+#line 77 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), show_title);
+#line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_settings_dialog_on_transition_changed (self);
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (null_display_name);
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (adjustment);
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 3037 "SlideshowPage.c"
+#line 2840 "SlideshowPage.c"
 }
 
 
 static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) {
-#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 43 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG);
-#line 3044 "SlideshowPage.c"
+#line 2847 "SlideshowPage.c"
 }
 
 
@@ -3055,43 +2858,43 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 	gboolean sensitive = FALSE;
 	GtkScale* _tmp5_;
 	GtkSpinButton* _tmp6_;
-#line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self));
-#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->transition_effect_selector;
-#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	selected = _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp3_ = selected;
-#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp3_ != NULL) {
-#line 3069 "SlideshowPage.c"
+#line 2872 "SlideshowPage.c"
 		const gchar* _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = selected;
-#line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0;
-#line 3075 "SlideshowPage.c"
+#line 2878 "SlideshowPage.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 3079 "SlideshowPage.c"
+#line 2882 "SlideshowPage.c"
 	}
-#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	sensitive = _tmp2_;
-#line 113 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = self->priv->transition_effect_hscale;
-#line 113 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitive);
-#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = self->priv->transition_effect_entry;
-#line 114 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	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"
+#line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (selected);
-#line 3093 "SlideshowPage.c"
+#line 2896 "SlideshowPage.c"
 }
 
 
@@ -3099,17 +2902,17 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
 	gdouble result = 0.0;
 	GtkSpinButton* _tmp0_;
 	gdouble _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
-#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->delay_entry;
-#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp1_;
-#line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3111 "SlideshowPage.c"
+#line 2914 "SlideshowPage.c"
 }
 
 
@@ -3117,17 +2920,17 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag
 	gdouble result = 0.0;
 	GtkSpinButton* _tmp0_;
 	gdouble _tmp1_;
-#line 121 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), 0.0);
-#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->transition_effect_entry;
-#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp1_;
-#line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3129 "SlideshowPage.c"
+#line 2932 "SlideshowPage.c"
 }
 
 
@@ -3146,71 +2949,71 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	const gchar* _tmp9_ = NULL;
 	const gchar* _tmp10_;
 	gchar* _tmp12_;
-#line 125 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), NULL);
-#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->transition_effect_selector;
-#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 126 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	active = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = active;
-#line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_ == NULL) {
-#line 3160 "SlideshowPage.c"
+#line 2963 "SlideshowPage.c"
 		gchar* _tmp3_;
-#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		result = _tmp3_;
-#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_free0 (active);
-#line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 3170 "SlideshowPage.c"
+#line 2973 "SlideshowPage.c"
 	}
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = _tmp4_;
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp6_ = active;
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp7_ = transition_effects_manager_get_id_for_effect_name (_tmp5_, _tmp6_);
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp8_ = _tmp7_;
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_transition_effects_manager_unref0 (_tmp5_);
-#line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	id = _tmp8_;
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp10_ = id;
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp10_ != NULL) {
-#line 3190 "SlideshowPage.c"
+#line 2993 "SlideshowPage.c"
 		const gchar* _tmp11_;
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = id;
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = _tmp11_;
-#line 3196 "SlideshowPage.c"
+#line 2999 "SlideshowPage.c"
 	} else {
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3200 "SlideshowPage.c"
+#line 3003 "SlideshowPage.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = g_strdup (_tmp9_);
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp12_;
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (id);
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (active);
-#line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3212 "SlideshowPage.c"
+#line 3015 "SlideshowPage.c"
 }
 
 
@@ -3219,67 +3022,82 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett
 	GtkCheckButton* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_return_val_if_fail (SLIDESHOW_PAGE_IS_SETTINGS_DIALOG (self), FALSE);
-#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp0_ = self->priv->show_title_button;
-#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp2_;
-#line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3233 "SlideshowPage.c"
+#line 3036 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDialogClass * klass) {
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gint SlideshowPageSettingsDialog_private_offset;
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_settings_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate));
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize;
-#line 3244 "SlideshowPage.c"
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	SlideshowPageSettingsDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/slideshow_settings.ui");
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_adjustment", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, delay_adjustment));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_entry", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, delay_entry));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_selector", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_selector));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_hscale", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_hscale));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_entry", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_entry));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transition_effect_adjustment", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, transition_effect_adjustment));
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "show_title_button", FALSE, SlideshowPageSettingsDialog_private_offset + G_STRUCT_OFFSET (SlideshowPageSettingsDialogPrivate, show_title_button));
+#line 3066 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsDialog * self) {
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self);
 #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self->priv->builder = NULL;
-#line 3253 "SlideshowPage.c"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 3075 "SlideshowPage.c"
 }
 
 
 static void slideshow_page_settings_dialog_finalize (GObject * obj) {
 	SlideshowPageSettingsDialog * self;
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog);
 #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 28 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->delay_entry);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG, SlideshowPageSettingsDialog);
 #line 29 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->delay_hscale);
-#line 30 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->transition_effect_selector);
+	_g_object_unref0 (self->priv->delay_adjustment);
 #line 31 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (self->priv->delay_entry);
+#line 33 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+	_g_object_unref0 (self->priv->transition_effect_selector);
+#line 35 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_hscale);
-#line 32 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_entry);
-#line 33 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 39 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->transition_effect_adjustment);
-#line 34 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 41 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (self->priv->show_title_button);
-#line 35 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
-	_g_object_unref0 (self->priv->pane);
-#line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
+#line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj);
-#line 3281 "SlideshowPage.c"
+#line 3099 "SlideshowPage.c"
 }
 
 
@@ -3316,7 +3134,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"
 	slideshow_page_signals[SLIDESHOW_PAGE_HIDE_TOOLBAR_SIGNAL] = 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 3318 "SlideshowPage.c"
+#line 3136 "SlideshowPage.c"
 }
 
 
@@ -3334,7 +3152,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 3336 "SlideshowPage.c"
+#line 3154 "SlideshowPage.c"
 }
 
 
@@ -3362,7 +3180,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 3364 "SlideshowPage.c"
+#line 3182 "SlideshowPage.c"
 }
 
 
diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index ebf7962..fcb6430 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -23,46 +23,33 @@ class SlideshowPage : SinglePhotoPage {
 
     public signal void hide_toolbar();
     
+    [GtkTemplate (ui = "/org/gnome/Shotwell/ui/slideshow_settings.ui")]
     private class SettingsDialog : Gtk.Dialog {
-        private Gtk.Builder builder = null;
+        [GtkChild]
+        Gtk.Adjustment delay_adjustment;
+        [GtkChild]
         Gtk.SpinButton delay_entry;
-        Gtk.Scale delay_hscale;
+        [GtkChild]
         Gtk.ComboBoxText transition_effect_selector;
+        [GtkChild]
         Gtk.Scale transition_effect_hscale;
+        [GtkChild]
         Gtk.SpinButton transition_effect_entry;
+        [GtkChild]
         Gtk.Adjustment transition_effect_adjustment;
+        [GtkChild]
         Gtk.CheckButton show_title_button;
-        Gtk.Box pane;
         
         public SettingsDialog() {
-            builder = AppWindow.create_builder();
-            pane = builder.get_object("slideshow_settings_pane") as Gtk.Box;
-            get_content_area().add(pane);
-            
             double delay = Config.Facade.get_instance().get_slideshow_delay();
-            
-            set_modal(true);
+
             set_transient_for(AppWindow.get_fullscreen());
-            
-            add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
-                Resources.OK_LABEL, Gtk.ResponseType.OK);
-            set_title(_("Settings"));
-            
-            Gtk.Adjustment adjustment = new Gtk.Adjustment(delay, Config.Facade.SLIDESHOW_DELAY_MIN, Config.Facade.SLIDESHOW_DELAY_MAX, 0.1, 1, 0);
-            delay_hscale = builder.get_object("delay_hscale") as Gtk.Scale;
-            delay_hscale.adjustment = adjustment;
-            
-            delay_entry = builder.get_object("delay_entry") as Gtk.SpinButton;
-            delay_entry.adjustment = adjustment;
-            delay_entry.set_value(delay);
-            delay_entry.set_numeric(true);
-            delay_entry.set_activates_default(true);
 
-            transition_effect_selector = builder.get_object("transition_effect_selector") as Gtk.ComboBoxText;
-            
+            delay_adjustment.value = delay;
+
             // get last effect id
             string effect_id = Config.Facade.get_instance().get_slideshow_transition_effect_id();
-            
+
             // null effect first, always, and set active in case no other one is found
             string null_display_name = TransitionEffectsManager.get_instance().get_effect_name(
                 TransitionEffectsManager.NULL_EFFECT_ID);
@@ -84,24 +71,11 @@ class SlideshowPage : SinglePhotoPage {
             transition_effect_selector.changed.connect(on_transition_changed);
             
             double transition_delay = Config.Facade.get_instance().get_slideshow_transition_delay();
-            transition_effect_adjustment = new Gtk.Adjustment(transition_delay,
-                Config.Facade.SLIDESHOW_TRANSITION_DELAY_MIN, Config.Facade.SLIDESHOW_TRANSITION_DELAY_MAX,
-                0.1, 1, 0);
-            transition_effect_hscale = builder.get_object("transition_effect_hscale") as Gtk.Scale;
-            transition_effect_hscale.adjustment = transition_effect_adjustment;
-            
-            transition_effect_entry = builder.get_object("transition_effect_entry") as Gtk.SpinButton;
-            transition_effect_entry.adjustment = transition_effect_adjustment;
-            transition_effect_entry.set_value(transition_delay);
-            transition_effect_entry.set_numeric(true);
-            transition_effect_entry.set_activates_default(true);
+            transition_effect_adjustment.value = transition_delay;
             
             bool show_title = Config.Facade.get_instance().get_slideshow_show_title();
-            show_title_button = builder.get_object("show_title_button") as  Gtk.CheckButton;
             show_title_button.active = show_title;
             
-            set_default_response(Gtk.ResponseType.OK);
-            
             on_transition_changed();
         }
         
diff --git a/src/SortedList.c b/src/SortedList.c
index e616365..f5bd10e 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -9,12 +9,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
 #include <gee.h>
 
-#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_SORTED_LIST (sorted_list_get_type ())
 #define SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SORTED_LIST, SortedList))
@@ -57,8 +53,6 @@ static GeeTraversableIface * sorted_list_gee_traversable_parent_iface = NULL;
 static GeeIterableIface * sorted_list_gee_iterable_parent_iface = NULL;
 static GeeCollectionIface * sorted_list_gee_collection_parent_iface = NULL;
 
-gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len);
-gint64 file_comparator (void* a, void* b);
 GType sorted_list_get_type (void) G_GNUC_CONST;
 #define SORTED_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SORTED_LIST, SortedListPrivate))
 enum  {
@@ -108,151 +102,43 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-gint64 file_comparator (void* a, void* b) {
-	gint64 result = 0LL;
-	gchar* path_a = NULL;
-	void* _tmp0_;
-	gchar* _tmp1_;
-	gchar* path_b = NULL;
-	void* _tmp2_;
-	gchar* _tmp3_;
-	const gchar* _tmp4_;
-	const gchar* _tmp7_;
-	GCompareFunc _tmp8_;
-	const gchar* _tmp9_;
-	gchar* _tmp10_;
-	gchar* _tmp11_;
-	const gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* _tmp14_;
-	gint _tmp15_;
-	gint64 _tmp16_;
-#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_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_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"
-	_tmp4_ = path_a;
-#line 16 "/home/jens/Source/shotwell/src/SortedList.vala"
-	if (_tmp4_ == NULL) {
-#line 147 "SortedList.c"
-		gint _tmp5_ = 0;
-		const gchar* _tmp6_;
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_tmp6_ = path_b;
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		if (_tmp6_ == NULL) {
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-			_tmp5_ = 0;
-#line 156 "SortedList.c"
-		} else {
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-			_tmp5_ = 1;
-#line 160 "SortedList.c"
-		}
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		result = (gint64) _tmp5_;
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_g_free0 (path_b);
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_g_free0 (path_a);
-#line 17 "/home/jens/Source/shotwell/src/SortedList.vala"
-		return result;
-#line 170 "SortedList.c"
-	}
-#line 19 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp7_ = path_b;
-#line 19 "/home/jens/Source/shotwell/src/SortedList.vala"
-	if (_tmp7_ == NULL) {
-#line 20 "/home/jens/Source/shotwell/src/SortedList.vala"
-		result = (gint64) -1;
-#line 20 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_g_free0 (path_b);
-#line 20 "/home/jens/Source/shotwell/src/SortedList.vala"
-		_g_free0 (path_a);
-#line 20 "/home/jens/Source/shotwell/src/SortedList.vala"
-		return result;
-#line 184 "SortedList.c"
-	}
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp8_ = g_strcmp0;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp9_ = path_a;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp10_ = g_utf8_collate_key_for_filename (_tmp9_, (gssize) -1);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp11_ = _tmp10_;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp12_ = path_b;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp13_ = g_utf8_collate_key_for_filename (_tmp12_, (gssize) -1);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp14_ = _tmp13_;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp15_ = _tmp8_ (_tmp11_, _tmp14_);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_tmp16_ = (gint64) _tmp15_;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_g_free0 (_tmp14_);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_g_free0 (_tmp11_);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	result = _tmp16_;
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_g_free0 (path_b);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	_g_free0 (path_a);
-#line 22 "/home/jens/Source/shotwell/src/SortedList.vala"
-	return result;
-#line 216 "SortedList.c"
-}
-
-
 SortedList* sorted_list_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) {
 	SortedList * self = NULL;
 	GeeArrayList* _tmp0_;
 	Comparator _tmp1_;
 	void* _tmp1__target;
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = (SortedList*) g_object_new (object_type, NULL);
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->g_type = g_type;
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->g_dup_func = g_dup_func;
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->g_destroy_func = g_destroy_func;
-#line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 14 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = gee_array_list_new (g_type, (GBoxedCopyFunc) g_dup_func, (GDestroyNotify) g_destroy_func, NULL, NULL, NULL);
-#line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 14 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_g_object_unref0 (self->priv->list);
-#line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 14 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->list = _tmp0_;
-#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 15 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = cmp;
-#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 15 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1__target = cmp_target;
-#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 15 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->cmp = _tmp1_;
-#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 15 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->cmp_target = _tmp1__target;
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self;
-#line 249 "SortedList.c"
+#line 135 "SortedList.c"
 }
 
 
 SortedList* sorted_list_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, Comparator cmp, void* cmp_target) {
-#line 29 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 13 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return sorted_list_construct (TYPE_SORTED_LIST, g_type, g_dup_func, g_destroy_func, cmp, cmp_target);
-#line 256 "SortedList.c"
+#line 142 "SortedList.c"
 }
 
 
@@ -261,17 +147,17 @@ static GeeIterator* sorted_list_real_iterator (GeeIterable* base) {
 	GeeIterator* result = NULL;
 	GeeArrayList* _tmp0_;
 	GeeIterator* _tmp1_;
-#line 42 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 26 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 43 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 27 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 43 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 27 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 43 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 27 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp1_;
-#line 43 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 27 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 275 "SortedList.c"
+#line 161 "SortedList.c"
 }
 
 
@@ -282,21 +168,21 @@ static gboolean sorted_list_real_foreach (GeeTraversable* base, GeeForallFunc f,
 	GeeForallFunc _tmp1_;
 	void* _tmp1__target;
 	gboolean _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 30 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = f;
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1__target = f_target;
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_collection_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_, _tmp1__target);
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 31 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 300 "SortedList.c"
+#line 186 "SortedList.c"
 }
 
 
@@ -305,53 +191,53 @@ static gboolean sorted_list_real_add (GeeCollection* base, gconstpointer item) {
 	gboolean result = FALSE;
 	Comparator _tmp0_;
 	void* _tmp0__target;
-#line 50 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 34 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->cmp;
-#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = self->priv->cmp_target;
-#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp0_ == NULL) {
-#line 317 "SortedList.c"
+#line 203 "SortedList.c"
 		GeeArrayList* _tmp1_;
 		gconstpointer _tmp2_;
-#line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 36 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp1_ = self->priv->list;
-#line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 36 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp2_ = item;
-#line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 36 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
-#line 326 "SortedList.c"
+#line 212 "SortedList.c"
 	} else {
 		GeeArrayList* _tmp3_;
 		gconstpointer _tmp4_;
 		gint _tmp5_;
 		gconstpointer _tmp6_;
-#line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 38 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->list;
-#line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 38 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = item;
-#line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 38 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_);
-#line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 38 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = item;
-#line 54 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 38 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp5_, _tmp6_);
-#line 342 "SortedList.c"
+#line 228 "SortedList.c"
 	}
-#line 60 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 44 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = TRUE;
-#line 60 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 44 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 348 "SortedList.c"
+#line 234 "SortedList.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 355 "SortedList.c"
+#line 241 "SortedList.c"
 }
 
 
@@ -371,84 +257,84 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 	GeeCollection* _tmp12_;
 	gint _tmp13_;
 	gint _tmp14_;
-#line 63 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 63 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 47 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE);
-#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 48 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = collection;
-#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 48 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 48 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 48 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp2_ == 0) {
-#line 65 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 49 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = FALSE;
-#line 65 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 49 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 391 "SortedList.c"
+#line 277 "SortedList.c"
 	}
-#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = collection;
-#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GEE_TYPE_LIST) ? ((GeeList*) _tmp3_) : NULL);
-#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 51 "/home/jens/Source/shotwell/src/SortedList.vala"
 	as_list = _tmp4_;
-#line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp5_ = as_list;
-#line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 52 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp5_ != NULL) {
-#line 403 "SortedList.c"
+#line 289 "SortedList.c"
 		GeeList* _tmp6_;
 		gboolean _tmp7_;
-#line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 53 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = as_list;
-#line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 53 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp7_ = sorted_list_add_list (self, _tmp6_);
-#line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 53 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = _tmp7_;
-#line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 53 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_g_object_unref0 (as_list);
-#line 69 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 53 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 416 "SortedList.c"
+#line 302 "SortedList.c"
 	}
-#line 71 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 55 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8_ = self->priv->cmp;
-#line 71 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 55 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8__target = self->priv->cmp_target;
-#line 71 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 55 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp8_ == NULL) {
-#line 424 "SortedList.c"
+#line 310 "SortedList.c"
 		GeeArrayList* _tmp9_;
 		GeeCollection* _tmp10_;
 		gboolean _tmp11_;
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp9_ = self->priv->list;
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp10_ = collection;
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp11_ = gee_array_list_add_all (_tmp9_, _tmp10_);
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = _tmp11_;
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_g_object_unref0 (as_list);
-#line 72 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 56 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 440 "SortedList.c"
+#line 326 "SortedList.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 58 "/home/jens/Source/shotwell/src/SortedList.vala"
 	changed = FALSE;
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp12_ = collection;
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp13_ = gee_collection_get_size (_tmp12_);
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp14_ = _tmp13_;
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp14_ == 1) {
-#line 452 "SortedList.c"
+#line 338 "SortedList.c"
 		GeeIterator* iter = NULL;
 		GeeCollection* _tmp15_;
 		GeeIterator* _tmp16_;
@@ -460,39 +346,39 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 		gconstpointer _tmp21_;
 		gint _tmp22_;
 		gconstpointer _tmp23_;
-#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 60 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15_ = collection;
-#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 60 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 60 "/home/jens/Source/shotwell/src/SortedList.vala"
 		iter = _tmp16_;
-#line 77 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 61 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp17_ = iter;
-#line 77 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 61 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_iterator_next (_tmp17_);
-#line 78 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 62 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp18_ = iter;
-#line 78 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 62 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp19_ = gee_iterator_get (_tmp18_);
-#line 78 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 62 "/home/jens/Source/shotwell/src/SortedList.vala"
 		item = _tmp19_;
-#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp20_ = self->priv->list;
-#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp21_ = item;
-#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp22_ = sorted_list_get_sorted_insert_pos (self, _tmp21_);
-#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23_ = item;
-#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 64 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_, _tmp23_);
-#line 81 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 65 "/home/jens/Source/shotwell/src/SortedList.vala"
 		changed = TRUE;
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_g_object_unref0 (iter);
-#line 496 "SortedList.c"
+#line 382 "SortedList.c"
 	} else {
 		GeeList* items = NULL;
 		GeeArrayList* _tmp24_;
@@ -500,33 +386,33 @@ static gboolean sorted_list_real_add_all (GeeCollection* base, GeeCollection* co
 		GeeCollection* _tmp26_;
 		GeeList* _tmp27_;
 		gboolean _tmp28_;
-#line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24_ = gee_array_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, NULL, NULL, NULL);
-#line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 67 "/home/jens/Source/shotwell/src/SortedList.vala"
 		items = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_LIST, GeeList);
-#line 84 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp25_ = items;
-#line 84 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp26_ = collection;
-#line 84 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 68 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
-#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 70 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp27_ = items;
-#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 70 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp28_ = sorted_list_merge_sort (self, _tmp27_);
-#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 70 "/home/jens/Source/shotwell/src/SortedList.vala"
 		changed = _tmp28_;
-#line 75 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 59 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_g_object_unref0 (items);
-#line 522 "SortedList.c"
+#line 408 "SortedList.c"
 	}
-#line 92 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = changed;
-#line 92 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_g_object_unref0 (as_list);
-#line 92 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 76 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 530 "SortedList.c"
+#line 416 "SortedList.c"
 }
 
 
@@ -536,43 +422,43 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 	GeeList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 95 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 79 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
-#line 95 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 79 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (GEE_IS_LIST (items), FALSE);
-#line 96 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 80 "/home/jens/Source/shotwell/src/SortedList.vala"
 	added = FALSE;
-#line 97 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 81 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = items;
-#line 97 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 81 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 97 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 81 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 97 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 81 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp2_ == 0) {
-#line 554 "SortedList.c"
+#line 440 "SortedList.c"
 	} else {
 		Comparator _tmp3_;
 		void* _tmp3__target;
-#line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->cmp;
-#line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3__target = self->priv->cmp_target;
-#line 99 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 83 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp3_ != NULL) {
-#line 564 "SortedList.c"
+#line 450 "SortedList.c"
 			GeeList* _tmp4_;
 			gint _tmp5_;
 			gint _tmp6_;
-#line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp4_ = items;
-#line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp6_ = _tmp5_;
-#line 102 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 86 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp6_ == 1) {
-#line 576 "SortedList.c"
+#line 462 "SortedList.c"
 				GeeArrayList* _tmp7_;
 				GeeList* _tmp8_;
 				gpointer _tmp9_;
@@ -581,75 +467,75 @@ gboolean sorted_list_add_list (SortedList* self, GeeList* items) {
 				GeeList* _tmp12_;
 				gpointer _tmp13_;
 				gpointer _tmp14_;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp7_ = self->priv->list;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp8_ = items;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp10_ = _tmp9_;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp11_ = sorted_list_get_sorted_insert_pos (self, _tmp10_);
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp12_ = items;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp13_ = gee_list_get (_tmp12_, 0);
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp14_ = _tmp13_;
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp14_);
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL));
-#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 87 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((_tmp10_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp10_ = (self->priv->g_destroy_func (_tmp10_), NULL));
-#line 104 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 88 "/home/jens/Source/shotwell/src/SortedList.vala"
 				added = TRUE;
-#line 609 "SortedList.c"
+#line 495 "SortedList.c"
 			} else {
 				GeeList* _tmp15_;
 				gboolean _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 90 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp15_ = items;
-#line 106 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 90 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp16_ = sorted_list_merge_sort (self, _tmp15_);
-#line 106 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 90 "/home/jens/Source/shotwell/src/SortedList.vala"
 				added = _tmp16_;
-#line 619 "SortedList.c"
+#line 505 "SortedList.c"
 			}
 		} else {
 			GeeArrayList* _tmp17_;
 			GeeList* _tmp18_;
 			gboolean _tmp19_;
-#line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 93 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp17_ = self->priv->list;
-#line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 93 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp18_ = items;
-#line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 93 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp19_ = gee_array_list_add_all (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 109 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 93 "/home/jens/Source/shotwell/src/SortedList.vala"
 			added = _tmp19_;
-#line 633 "SortedList.c"
+#line 519 "SortedList.c"
 		}
 	}
-#line 116 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 100 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = added;
-#line 116 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 100 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 640 "SortedList.c"
+#line 526 "SortedList.c"
 }
 
 
 static void sorted_list_real_clear (GeeCollection* base) {
 	SortedList * self;
 	GeeArrayList* _tmp0_;
-#line 119 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 103 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 120 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 104 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 120 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 104 "/home/jens/Source/shotwell/src/SortedList.vala"
 	gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 653 "SortedList.c"
+#line 539 "SortedList.c"
 }
 
 
@@ -659,19 +545,19 @@ static gboolean sorted_list_real_contains (GeeCollection* base, gconstpointer it
 	GeeArrayList* _tmp0_;
 	gconstpointer _tmp1_;
 	gboolean _tmp2_;
-#line 123 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 107 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 108 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 108 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = item;
-#line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 108 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 108 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 124 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 108 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 675 "SortedList.c"
+#line 561 "SortedList.c"
 }
 
 
@@ -681,21 +567,21 @@ static gboolean sorted_list_real_contains_all (GeeCollection* base, GeeCollectio
 	GeeArrayList* _tmp0_;
 	GeeCollection* _tmp1_;
 	gboolean _tmp2_;
-#line 127 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 111 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 127 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 111 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE);
-#line 128 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 112 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 128 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 112 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = collection;
-#line 128 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 112 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_collection_contains_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
-#line 128 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 112 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 128 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 112 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 699 "SortedList.c"
+#line 585 "SortedList.c"
 }
 
 
@@ -705,19 +591,19 @@ static gboolean sorted_list_real_remove (GeeCollection* base, gconstpointer item
 	GeeArrayList* _tmp0_;
 	gconstpointer _tmp1_;
 	gboolean _tmp2_;
-#line 137 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 121 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 122 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 122 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = item;
-#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 122 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 122 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 122 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 721 "SortedList.c"
+#line 607 "SortedList.c"
 }
 
 
@@ -727,21 +613,21 @@ static gboolean sorted_list_real_remove_all (GeeCollection* base, GeeCollection*
 	GeeArrayList* _tmp0_;
 	GeeCollection* _tmp1_;
 	gboolean _tmp2_;
-#line 141 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 125 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 141 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 125 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE);
-#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 126 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 126 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = collection;
-#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 126 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_collection_remove_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
-#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 126 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 126 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 745 "SortedList.c"
+#line 631 "SortedList.c"
 }
 
 
@@ -751,21 +637,21 @@ static gboolean sorted_list_real_retain_all (GeeCollection* base, GeeCollection*
 	GeeArrayList* _tmp0_;
 	GeeCollection* _tmp1_;
 	gboolean _tmp2_;
-#line 145 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 129 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 145 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 129 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (collection), FALSE);
-#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 130 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 130 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = collection;
-#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 130 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_collection_retain_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
-#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 130 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 130 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 769 "SortedList.c"
+#line 655 "SortedList.c"
 }
 
 
@@ -774,19 +660,19 @@ inline gint sorted_list_get_count (SortedList* self) {
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 153 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 137 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
-#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 138 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 790 "SortedList.c"
+#line 676 "SortedList.c"
 }
 
 
@@ -795,19 +681,19 @@ gpointer sorted_list_get_at (SortedList* self, gint index) {
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gpointer _tmp2_;
-#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 141 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
-#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = index;
-#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_);
-#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 142 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 811 "SortedList.c"
+#line 697 "SortedList.c"
 }
 
 
@@ -820,32 +706,32 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 	GeeArrayList* _tmp1_;
 	gint _tmp2_;
 	gint _tmp3_;
-#line 161 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 145 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
-#line 162 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->cmp;
-#line 162 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = self->priv->cmp_target;
-#line 162 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 146 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp0_ != NULL, "cmp != null");
-#line 164 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 148 "/home/jens/Source/shotwell/src/SortedList.vala"
 	min = 0;
-#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 149 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->list;
-#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 149 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 149 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = _tmp2_;
-#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 149 "/home/jens/Source/shotwell/src/SortedList.vala"
 	max = _tmp3_;
-#line 842 "SortedList.c"
+#line 728 "SortedList.c"
 	{
 		gboolean _tmp4_ = FALSE;
-#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = TRUE;
-#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 		while (TRUE) {
-#line 849 "SortedList.c"
+#line 735 "SortedList.c"
 			gint mid = 0;
 			gint _tmp5_;
 			gint _tmp6_;
@@ -865,130 +751,130 @@ static gint sorted_list_binary_search (SortedList* self, gconstpointer search, G
 			gint64 _tmp21_;
 			gint _tmp25_;
 			gint _tmp26_;
-#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (!_tmp4_) {
-#line 871 "SortedList.c"
+#line 757 "SortedList.c"
 			}
-#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp4_ = FALSE;
-#line 167 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 151 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp5_ = min;
-#line 167 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 151 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp6_ = max;
-#line 167 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 151 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp7_ = min;
-#line 167 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 151 "/home/jens/Source/shotwell/src/SortedList.vala"
 			mid = _tmp5_ + ((_tmp6_ - _tmp7_) / 2);
-#line 168 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 152 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp8_ = self->priv->list;
-#line 168 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 152 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp9_ = mid;
-#line 168 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 152 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_);
-#line 168 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 152 "/home/jens/Source/shotwell/src/SortedList.vala"
 			item = _tmp10_;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp12_ = equal_func;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp12_ != NULL) {
-#line 895 "SortedList.c"
+#line 781 "SortedList.c"
 				GEqualFunc _tmp13_;
 				gconstpointer _tmp14_;
 				gconstpointer _tmp15_;
 				gboolean _tmp16_;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp13_ = equal_func;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp14_ = item;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp15_ = search;
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp16_ = _tmp13_ (_tmp14_, _tmp15_);
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp11_ = _tmp16_;
-#line 910 "SortedList.c"
+#line 796 "SortedList.c"
 			} else {
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp11_ = FALSE;
-#line 914 "SortedList.c"
+#line 800 "SortedList.c"
 			}
-#line 170 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 154 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp11_) {
-#line 171 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 155 "/home/jens/Source/shotwell/src/SortedList.vala"
 				result = mid;
-#line 171 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 155 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 171 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 155 "/home/jens/Source/shotwell/src/SortedList.vala"
 				return result;
-#line 924 "SortedList.c"
+#line 810 "SortedList.c"
 			}
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp17_ = self->priv->cmp;
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp17__target = self->priv->cmp_target;
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp18_ = item;
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp19_ = search;
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp20_ = _tmp17_ (_tmp18_, _tmp19_, _tmp17__target);
-#line 173 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 157 "/home/jens/Source/shotwell/src/SortedList.vala"
 			compare = _tmp20_;
-#line 174 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp21_ = compare;
-#line 174 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 158 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp21_ == ((gint64) 0)) {
-#line 175 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 159 "/home/jens/Source/shotwell/src/SortedList.vala"
 				result = mid;
-#line 175 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 159 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 175 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 159 "/home/jens/Source/shotwell/src/SortedList.vala"
 				return result;
-#line 948 "SortedList.c"
+#line 834 "SortedList.c"
 			} else {
 				gint64 _tmp22_;
-#line 176 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 160 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp22_ = compare;
-#line 176 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 160 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp22_ > ((gint64) 0)) {
-#line 955 "SortedList.c"
+#line 841 "SortedList.c"
 					gint _tmp23_;
-#line 177 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 161 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp23_ = mid;
-#line 177 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 161 "/home/jens/Source/shotwell/src/SortedList.vala"
 					max = _tmp23_ - 1;
-#line 961 "SortedList.c"
+#line 847 "SortedList.c"
 				} else {
 					gint _tmp24_;
-#line 179 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 163 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp24_ = mid;
-#line 179 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 163 "/home/jens/Source/shotwell/src/SortedList.vala"
 					min = _tmp24_ + 1;
-#line 968 "SortedList.c"
+#line 854 "SortedList.c"
 				}
 			}
-#line 181 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp25_ = min;
-#line 181 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp26_ = max;
-#line 181 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 165 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp25_ > _tmp26_) {
-#line 182 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 182 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
 				break;
-#line 981 "SortedList.c"
+#line 867 "SortedList.c"
 			}
-#line 166 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
 			((item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (item = (self->priv->g_destroy_func (item), NULL));
-#line 985 "SortedList.c"
+#line 871 "SortedList.c"
 		}
 	}
-#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 169 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = -1;
-#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 169 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 992 "SortedList.c"
+#line 878 "SortedList.c"
 }
 
 
@@ -997,43 +883,43 @@ gint sorted_list_index_of (SortedList* self, gconstpointer search) {
 	gint _tmp0_ = 0;
 	Comparator _tmp1_;
 	void* _tmp1__target;
-#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 179 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->cmp;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1__target = self->priv->cmp_target;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp1_ != NULL) {
-#line 1009 "SortedList.c"
+#line 895 "SortedList.c"
 		gconstpointer _tmp2_;
 		gint _tmp3_;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp2_ = search;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = sorted_list_binary_search (self, _tmp2_, NULL);
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp0_ = _tmp3_;
-#line 1018 "SortedList.c"
+#line 904 "SortedList.c"
 	} else {
 		gconstpointer _tmp4_;
 		GEqualFunc _tmp5_;
 		gint _tmp6_;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = search;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp5_ = g_direct_equal;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = sorted_list_locate (self, _tmp4_, FALSE, _tmp5_);
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp0_ = _tmp6_;
-#line 1031 "SortedList.c"
+#line 917 "SortedList.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp0_;
-#line 196 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 180 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1037 "SortedList.c"
+#line 923 "SortedList.c"
 }
 
 
@@ -1045,53 +931,53 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 	gconstpointer _tmp18_;
 	GEqualFunc _tmp19_;
 	gint _tmp20_;
-#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 184 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->cmp;
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1__target = self->priv->cmp_target;
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp1_ == NULL) {
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp0_ = TRUE;
-#line 1059 "SortedList.c"
+#line 945 "SortedList.c"
 	} else {
 		gboolean _tmp2_;
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp2_ = altered;
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp0_ = _tmp2_;
-#line 1066 "SortedList.c"
+#line 952 "SortedList.c"
 	}
-#line 201 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 185 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp0_) {
-#line 1070 "SortedList.c"
+#line 956 "SortedList.c"
 		gint count = 0;
 		GeeArrayList* _tmp3_;
 		gint _tmp4_;
 		gint _tmp5_;
-#line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 186 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = self->priv->list;
-#line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 186 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 186 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp5_ = _tmp4_;
-#line 202 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 186 "/home/jens/Source/shotwell/src/SortedList.vala"
 		count = _tmp5_;
-#line 1083 "SortedList.c"
+#line 969 "SortedList.c"
 		{
 			gint ctr = 0;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 			ctr = 0;
-#line 1088 "SortedList.c"
+#line 974 "SortedList.c"
 			{
 				gboolean _tmp6_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp6_ = TRUE;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 				while (TRUE) {
-#line 1095 "SortedList.c"
+#line 981 "SortedList.c"
 					gint _tmp8_;
 					gint _tmp9_;
 					GEqualFunc _tmp10_;
@@ -1102,74 +988,74 @@ gint sorted_list_locate (SortedList* self, gconstpointer search, gboolean altere
 					gconstpointer _tmp15_;
 					gboolean _tmp16_;
 					gboolean _tmp17_;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 					if (!_tmp6_) {
-#line 1108 "SortedList.c"
+#line 994 "SortedList.c"
 						gint _tmp7_;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 						_tmp7_ = ctr;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 						ctr = _tmp7_ + 1;
-#line 1114 "SortedList.c"
+#line 1000 "SortedList.c"
 					}
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp6_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp8_ = ctr;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp9_ = count;
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 					if (!(_tmp8_ < _tmp9_)) {
-#line 203 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 187 "/home/jens/Source/shotwell/src/SortedList.vala"
 						break;
-#line 1126 "SortedList.c"
+#line 1012 "SortedList.c"
 					}
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp10_ = equal_func;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp11_ = self->priv->list;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp12_ = ctr;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp14_ = _tmp13_;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp15_ = search;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp16_ = _tmp10_ (_tmp14_, _tmp15_);
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp17_ = _tmp16_;
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					((_tmp14_ == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp14_ = (self->priv->g_destroy_func (_tmp14_), NULL));
-#line 204 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 188 "/home/jens/Source/shotwell/src/SortedList.vala"
 					if (_tmp17_) {
-#line 205 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 189 "/home/jens/Source/shotwell/src/SortedList.vala"
 						result = ctr;
-#line 205 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 189 "/home/jens/Source/shotwell/src/SortedList.vala"
 						return result;
-#line 1152 "SortedList.c"
+#line 1038 "SortedList.c"
 					}
 				}
 			}
 		}
-#line 208 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 192 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = -1;
-#line 208 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 192 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 1161 "SortedList.c"
+#line 1047 "SortedList.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp18_ = search;
-#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp19_ = equal_func;
-#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp20_ = sorted_list_binary_search (self, _tmp18_, _tmp19_);
-#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp20_;
-#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 195 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1173 "SortedList.c"
+#line 1059 "SortedList.c"
 }
 
 
@@ -1178,19 +1064,19 @@ gpointer sorted_list_remove_at (SortedList* self, gint index) {
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gpointer _tmp2_;
-#line 226 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 210 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
-#line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = index;
-#line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp1_);
-#line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 211 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1194 "SortedList.c"
+#line 1080 "SortedList.c"
 }
 
 
@@ -1202,46 +1088,46 @@ static gpointer* sorted_list_real_to_array (GeeCollection* base, int* result_len
 	gpointer* _tmp2_;
 	gpointer* _tmp3_;
 	gint _tmp3__length1;
-#line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 214 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp1_);
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = _tmp2_;
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3__length1 = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (result_length1) {
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 		*result_length1 = _tmp3__length1;
-#line 1220 "SortedList.c"
+#line 1106 "SortedList.c"
 	}
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp3_;
-#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1226 "SortedList.c"
+#line 1112 "SortedList.c"
 }
 
 
 void sorted_list_resort (SortedList* self, Comparator new_cmp, void* new_cmp_target) {
 	Comparator _tmp0_;
 	void* _tmp0__target;
-#line 234 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 218 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
-#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 219 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = new_cmp;
-#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 219 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = new_cmp_target;
-#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 219 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->cmp = _tmp0_;
-#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 219 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv->cmp_target = _tmp0__target;
-#line 237 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 221 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_merge_sort (self, NULL);
-#line 1245 "SortedList.c"
+#line 1131 "SortedList.c"
 }
 
 
@@ -1259,45 +1145,45 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 	gint _tmp7_;
 	gint _tmp8_;
 	gint _tmp9_;
-#line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 229 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
-#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = item;
-#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = g_direct_equal;
-#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = sorted_list_locate (self, _tmp0_, TRUE, _tmp1_);
-#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 230 "/home/jens/Source/shotwell/src/SortedList.vala"
 	index = _tmp2_;
-#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = index;
-#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 231 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp3_ >= 0, "index >= 0");
-#line 249 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 233 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp4_ = item;
-#line 249 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 233 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp5_ = sorted_list_get_sorted_insert_pos (self, _tmp4_);
-#line 249 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 233 "/home/jens/Source/shotwell/src/SortedList.vala"
 	new_index = _tmp5_;
-#line 251 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp6_ = index;
-#line 251 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp7_ = new_index;
-#line 251 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 235 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 252 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 236 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = FALSE;
-#line 252 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 236 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 1293 "SortedList.c"
+#line 1179 "SortedList.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 240 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8_ = new_index;
-#line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 240 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp9_ = index;
-#line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 240 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp8_ > _tmp9_) {
-#line 1301 "SortedList.c"
+#line 1187 "SortedList.c"
 		GeeArrayList* _tmp10_;
 		gint _tmp11_;
 		gconstpointer _tmp12_;
@@ -1307,31 +1193,31 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 		gpointer _tmp15_;
 		gconstpointer _tmp16_;
 		gconstpointer _tmp17_;
-#line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 241 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp10_ = self->priv->list;
-#line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 241 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp11_ = new_index;
-#line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 241 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp12_ = item;
-#line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 241 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_, _tmp12_);
-#line 258 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 242 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp13_ = self->priv->list;
-#line 258 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 242 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp14_ = index;
-#line 258 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 242 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 258 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 242 "/home/jens/Source/shotwell/src/SortedList.vala"
 		removed_item = _tmp15_;
-#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 243 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16_ = item;
-#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 243 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp17_ = removed_item;
-#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 243 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_vala_assert (_tmp16_ == _tmp17_, "item == removed_item");
-#line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 240 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL));
-#line 1335 "SortedList.c"
+#line 1221 "SortedList.c"
 	} else {
 		gpointer removed_item = NULL;
 		GeeArrayList* _tmp18_;
@@ -1342,37 +1228,37 @@ gboolean sorted_list_resort_item (SortedList* self, gconstpointer item) {
 		GeeArrayList* _tmp23_;
 		gint _tmp24_;
 		gconstpointer _tmp25_;
-#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp18_ = self->priv->list;
-#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp19_ = index;
-#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp20_ = gee_abstract_list_remove_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_);
-#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 245 "/home/jens/Source/shotwell/src/SortedList.vala"
 		removed_item = _tmp20_;
-#line 262 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp21_ = item;
-#line 262 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp22_ = removed_item;
-#line 262 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 246 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_vala_assert (_tmp21_ == _tmp22_, "item == removed_item");
-#line 263 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23_ = self->priv->list;
-#line 263 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24_ = new_index;
-#line 263 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp25_ = item;
-#line 263 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 247 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_, _tmp25_);
-#line 256 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 240 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((removed_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (removed_item = (self->priv->g_destroy_func (removed_item), NULL));
-#line 1370 "SortedList.c"
+#line 1256 "SortedList.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 254 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = TRUE;
-#line 270 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 254 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1376 "SortedList.c"
+#line 1262 "SortedList.c"
 }
 
 
@@ -1383,26 +1269,26 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 273 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 257 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), 0);
-#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 258 "/home/jens/Source/shotwell/src/SortedList.vala"
 	low = 0;
-#line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 275 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 259 "/home/jens/Source/shotwell/src/SortedList.vala"
 	high = _tmp2_;
-#line 1399 "SortedList.c"
+#line 1285 "SortedList.c"
 	{
 		gboolean _tmp3_ = FALSE;
-#line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 260 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp3_ = TRUE;
-#line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 260 "/home/jens/Source/shotwell/src/SortedList.vala"
 		while (TRUE) {
-#line 1406 "SortedList.c"
+#line 1292 "SortedList.c"
 			gint _tmp4_;
 			gint _tmp5_;
 			gint mid = 0;
@@ -1422,47 +1308,47 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 			gconstpointer _tmp26_;
 			gint64 _tmp27_;
 			gint64 _tmp28_;
-#line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 260 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (!_tmp3_) {
-#line 1428 "SortedList.c"
+#line 1314 "SortedList.c"
 			}
-#line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 260 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp3_ = FALSE;
-#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp4_ = low;
-#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp5_ = high;
-#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 261 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp4_ == _tmp5_) {
-#line 278 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 262 "/home/jens/Source/shotwell/src/SortedList.vala"
 				result = low;
-#line 278 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 262 "/home/jens/Source/shotwell/src/SortedList.vala"
 				return result;
-#line 1442 "SortedList.c"
+#line 1328 "SortedList.c"
 			}
-#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 264 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp6_ = low;
-#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 264 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp7_ = high;
-#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 264 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp8_ = low;
-#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 264 "/home/jens/Source/shotwell/src/SortedList.vala"
 			mid = _tmp6_ + ((_tmp7_ - _tmp8_) / 2);
-#line 284 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 268 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp9_ = self->priv->list;
-#line 284 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 268 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp10_ = mid;
-#line 284 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 268 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_);
-#line 284 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 268 "/home/jens/Source/shotwell/src/SortedList.vala"
 			cmp_item = _tmp11_;
-#line 285 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 269 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp12_ = item;
-#line 285 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 269 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp13_ = cmp_item;
-#line 285 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 269 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1466 "SortedList.c"
+#line 1352 "SortedList.c"
 				gint _tmp14_;
 				GeeArrayList* _tmp15_;
 				gint _tmp16_;
@@ -1470,95 +1356,95 @@ static gint sorted_list_get_sorted_insert_pos (SortedList* self, gconstpointer i
 				GeeArrayList* _tmp21_;
 				gint _tmp22_;
 				gpointer _tmp23_;
-#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 271 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp14_ = mid;
-#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 271 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp15_ = self->priv->list;
-#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 271 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 271 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp17_ = _tmp16_;
-#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 271 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp14_ >= (_tmp17_ - 1)) {
-#line 1484 "SortedList.c"
+#line 1370 "SortedList.c"
 					GeeArrayList* _tmp18_;
 					gint _tmp19_;
 					gint _tmp20_;
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp18_ = self->priv->list;
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp20_ = _tmp19_;
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					result = _tmp20_;
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL));
-#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 272 "/home/jens/Source/shotwell/src/SortedList.vala"
 					return result;
-#line 1500 "SortedList.c"
+#line 1386 "SortedList.c"
 				}
-#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp21_ = self->priv->list;
-#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp22_ = mid;
-#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp23_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp22_ + 1);
-#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL));
-#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 274 "/home/jens/Source/shotwell/src/SortedList.vala"
 				cmp_item = _tmp23_;
-#line 1512 "SortedList.c"
+#line 1398 "SortedList.c"
 			}
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp24_ = self->priv->cmp;
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp24__target = self->priv->cmp_target;
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp25_ = item;
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp26_ = cmp_item;
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27_ = _tmp24_ (_tmp25_, _tmp26_, _tmp24__target);
-#line 293 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 277 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_result_ = _tmp27_;
-#line 294 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 278 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp28_ = _result_;
-#line 294 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 278 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (_tmp28_ < ((gint64) 0)) {
-#line 1530 "SortedList.c"
+#line 1416 "SortedList.c"
 				gint _tmp29_;
-#line 295 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 279 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp29_ = mid;
-#line 295 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 279 "/home/jens/Source/shotwell/src/SortedList.vala"
 				high = _tmp29_;
-#line 1536 "SortedList.c"
+#line 1422 "SortedList.c"
 			} else {
 				gint64 _tmp30_;
-#line 296 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp30_ = _result_;
-#line 296 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 280 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (_tmp30_ > ((gint64) 0)) {
-#line 1543 "SortedList.c"
+#line 1429 "SortedList.c"
 					gint _tmp31_;
-#line 297 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 281 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp31_ = mid;
-#line 297 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 281 "/home/jens/Source/shotwell/src/SortedList.vala"
 					low = _tmp31_ + 1;
-#line 1549 "SortedList.c"
+#line 1435 "SortedList.c"
 				} else {
-#line 299 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 283 "/home/jens/Source/shotwell/src/SortedList.vala"
 					result = mid;
-#line 299 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 283 "/home/jens/Source/shotwell/src/SortedList.vala"
 					((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL));
-#line 299 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 283 "/home/jens/Source/shotwell/src/SortedList.vala"
 					return result;
-#line 1557 "SortedList.c"
+#line 1443 "SortedList.c"
 				}
 			}
-#line 276 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 260 "/home/jens/Source/shotwell/src/SortedList.vala"
 			((cmp_item == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (cmp_item = (self->priv->g_destroy_func (cmp_item), NULL));
-#line 1562 "SortedList.c"
+#line 1448 "SortedList.c"
 		}
 	}
 }
@@ -1572,27 +1458,27 @@ SortedList* sorted_list_copy (SortedList* self) {
 	SortedList* _tmp1_;
 	GeeArrayList* _tmp2_;
 	GeeArrayList* _tmp3_;
-#line 303 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 287 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
-#line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->cmp;
-#line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = self->priv->cmp_target;
-#line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = sorted_list_new (self->priv->g_type, (GBoxedCopyFunc) self->priv->g_dup_func, (GDestroyNotify) self->priv->g_destroy_func, _tmp0_, _tmp0__target);
-#line 304 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 288 "/home/jens/Source/shotwell/src/SortedList.vala"
 	copy = _tmp1_;
-#line 306 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = copy->priv->list;
-#line 306 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = self->priv->list;
-#line 306 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 290 "/home/jens/Source/shotwell/src/SortedList.vala"
 	gee_array_list_add_all (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 308 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 292 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = copy;
-#line 308 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 292 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1596 "SortedList.c"
+#line 1482 "SortedList.c"
 }
 
 
@@ -1627,79 +1513,79 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 	gpointer* _tmp38_;
 	gint _tmp38__length1;
 	gint _tmp39_;
-#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 313 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), FALSE);
-#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 313 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail ((add == NULL) || GEE_IS_LIST (add), FALSE);
-#line 330 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 314 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->cmp;
-#line 330 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 314 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0__target = self->priv->cmp_target;
-#line 330 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 314 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp0_ != NULL, "cmp != null");
-#line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 316 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = self->priv->list;
-#line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 316 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 316 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = _tmp2_;
-#line 332 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 316 "/home/jens/Source/shotwell/src/SortedList.vala"
 	list_count = _tmp3_;
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp5_ = add;
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp5_ != NULL) {
-#line 1653 "SortedList.c"
+#line 1539 "SortedList.c"
 		GeeList* _tmp6_;
 		gint _tmp7_;
 		gint _tmp8_;
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp6_ = add;
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp8_ = _tmp7_;
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = _tmp8_;
-#line 1665 "SortedList.c"
+#line 1551 "SortedList.c"
 	} else {
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp4_ = 0;
-#line 1669 "SortedList.c"
+#line 1555 "SortedList.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 317 "/home/jens/Source/shotwell/src/SortedList.vala"
 	add_count = _tmp4_;
-#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 319 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp9_ = list_count;
-#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 319 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp10_ = add_count;
-#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 319 "/home/jens/Source/shotwell/src/SortedList.vala"
 	count = _tmp9_ + _tmp10_;
-#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 320 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp11_ = count;
-#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 320 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp11_ == 0) {
-#line 337 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 321 "/home/jens/Source/shotwell/src/SortedList.vala"
 		result = FALSE;
-#line 337 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 321 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return result;
-#line 1687 "SortedList.c"
+#line 1573 "SortedList.c"
 	}
-#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 325 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp12_ = count;
-#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 325 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp13_ = g_new0 (gpointer, _tmp12_);
-#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 325 "/home/jens/Source/shotwell/src/SortedList.vala"
 	array = _tmp13_;
-#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 325 "/home/jens/Source/shotwell/src/SortedList.vala"
 	array_length1 = _tmp12_;
-#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 325 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_array_size_ = array_length1;
-#line 342 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 326 "/home/jens/Source/shotwell/src/SortedList.vala"
 	offset = 0;
-#line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 328 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 1703 "SortedList.c"
+#line 1589 "SortedList.c"
 		gint _tmp14_;
 		gint _tmp15_;
 		gpointer* _tmp16_;
@@ -1710,51 +1596,51 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 		gpointer _tmp20_;
 		gpointer _tmp21_;
 		gint _tmp22_;
-#line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 328 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp14_ = offset;
-#line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 328 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15_ = list_count;
-#line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 328 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!(_tmp14_ < _tmp15_)) {
-#line 344 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 328 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 1722 "SortedList.c"
+#line 1608 "SortedList.c"
 		}
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16_ = array;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16__length1 = array_length1;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp17_ = offset;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp18_ = self->priv->list;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp19_ = offset;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp19_);
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((_tmp16_[_tmp17_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp16_[_tmp17_] = (self->priv->g_destroy_func (_tmp16_[_tmp17_]), NULL));
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16_[_tmp17_] = _tmp20_;
-#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 329 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp21_ = _tmp16_[_tmp17_];
-#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 330 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp22_ = offset;
-#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 330 "/home/jens/Source/shotwell/src/SortedList.vala"
 		offset = _tmp22_ + 1;
-#line 1746 "SortedList.c"
+#line 1632 "SortedList.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp23_ = add;
-#line 349 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 333 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp23_ != NULL) {
-#line 1752 "SortedList.c"
+#line 1638 "SortedList.c"
 		gint add_ctr = 0;
-#line 350 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 334 "/home/jens/Source/shotwell/src/SortedList.vala"
 		add_ctr = 0;
-#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
 		while (TRUE) {
-#line 1758 "SortedList.c"
+#line 1644 "SortedList.c"
 			gint _tmp24_;
 			gint _tmp25_;
 			gpointer* _tmp26_;
@@ -1765,72 +1651,72 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 			gpointer _tmp30_;
 			gpointer _tmp31_;
 			gint _tmp32_;
-#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp24_ = offset;
-#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp25_ = count;
-#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
 			if (!(_tmp24_ < _tmp25_)) {
-#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 335 "/home/jens/Source/shotwell/src/SortedList.vala"
 				break;
-#line 1777 "SortedList.c"
+#line 1663 "SortedList.c"
 			}
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp26_ = array;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp26__length1 = array_length1;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27_ = offset;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp28_ = add;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp29_ = add_ctr;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			add_ctr = _tmp29_ + 1;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp30_ = gee_list_get (_tmp28_, _tmp29_);
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			((_tmp26_[_tmp27_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp26_[_tmp27_] = (self->priv->g_destroy_func (_tmp26_[_tmp27_]), NULL));
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp26_[_tmp27_] = _tmp30_;
-#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 336 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp31_ = _tmp26_[_tmp27_];
-#line 353 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 337 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp32_ = offset;
-#line 353 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 337 "/home/jens/Source/shotwell/src/SortedList.vala"
 			offset = _tmp32_ + 1;
-#line 1803 "SortedList.c"
+#line 1689 "SortedList.c"
 		}
 	}
-#line 357 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp33_ = offset;
-#line 357 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp34_ = count;
-#line 357 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 341 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp33_ == _tmp34_, "offset == count");
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp35_ = array;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp35__length1 = array_length1;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp36_ = count;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp37_ = g_new0 (gpointer, _tmp36_);
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp38_ = _tmp37_;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp38__length1 = _tmp36_;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp39_ = count;
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_sorted_list_merge_sort (self, _tmp35_, _tmp35__length1, _tmp38_, _tmp36_, 0, _tmp39_ - 1);
-#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 343 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp38_ = (_vala_array_free (_tmp38_, _tmp38__length1, (GDestroyNotify) self->priv->g_destroy_func), NULL);
-#line 361 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 345 "/home/jens/Source/shotwell/src/SortedList.vala"
 	offset = 0;
-#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 1834 "SortedList.c"
+#line 1720 "SortedList.c"
 		gint _tmp40_;
 		gint _tmp41_;
 		GeeArrayList* _tmp42_;
@@ -1840,39 +1726,39 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 		gint _tmp45_;
 		gconstpointer _tmp46_;
 		gint _tmp47_;
-#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp40_ = offset;
-#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp41_ = list_count;
-#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!(_tmp40_ < _tmp41_)) {
-#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 346 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 1852 "SortedList.c"
+#line 1738 "SortedList.c"
 		}
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp42_ = self->priv->list;
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp43_ = offset;
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp44_ = array;
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp44__length1 = array_length1;
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp45_ = offset;
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp46_ = _tmp44_[_tmp45_];
-#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 347 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_, _tmp46_);
-#line 364 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 348 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp47_ = offset;
-#line 364 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 348 "/home/jens/Source/shotwell/src/SortedList.vala"
 		offset = _tmp47_ + 1;
-#line 1872 "SortedList.c"
+#line 1758 "SortedList.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 1876 "SortedList.c"
+#line 1762 "SortedList.c"
 		gint _tmp48_;
 		gint _tmp49_;
 		GeeArrayList* _tmp50_;
@@ -1882,43 +1768,43 @@ static gboolean sorted_list_merge_sort (SortedList* self, GeeList* add) {
 		gint _tmp53_;
 		gconstpointer _tmp54_;
 		gint _tmp55_;
-#line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp48_ = offset;
-#line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp49_ = count;
-#line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!(_tmp48_ < _tmp49_)) {
-#line 367 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 351 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 1894 "SortedList.c"
+#line 1780 "SortedList.c"
 		}
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp50_ = self->priv->list;
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp51_ = offset;
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp52_ = array;
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp52__length1 = array_length1;
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp53_ = offset;
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp54_ = _tmp52_[_tmp53_];
-#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 352 "/home/jens/Source/shotwell/src/SortedList.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_, _tmp54_);
-#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 353 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp55_ = offset;
-#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 353 "/home/jens/Source/shotwell/src/SortedList.vala"
 		offset = _tmp55_ + 1;
-#line 1914 "SortedList.c"
+#line 1800 "SortedList.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 356 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 356 "/home/jens/Source/shotwell/src/SortedList.vala"
 	array = (_vala_array_free (array, array_length1, (GDestroyNotify) self->priv->g_destroy_func), NULL);
-#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 356 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 1922 "SortedList.c"
+#line 1808 "SortedList.c"
 }
 
 
@@ -1955,87 +1841,87 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra
 	gint _tmp20_;
 	gconstpointer _tmp21_;
 	gint64 _tmp22_;
-#line 375 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 359 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
-#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 360 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = start_index;
-#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 360 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = end_index;
-#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 360 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp0_ <= _tmp1_, "start_index <= end_index");
-#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = end_index;
-#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = start_index;
-#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 362 "/home/jens/Source/shotwell/src/SortedList.vala"
 	count = (_tmp2_ - _tmp3_) + 1;
-#line 379 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp4_ = count;
-#line 379 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 363 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp4_ <= 1) {
-#line 380 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 364 "/home/jens/Source/shotwell/src/SortedList.vala"
 		return;
-#line 1979 "SortedList.c"
+#line 1865 "SortedList.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 366 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp5_ = start_index;
-#line 382 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 366 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp6_ = count;
-#line 382 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 366 "/home/jens/Source/shotwell/src/SortedList.vala"
 	middle_index = _tmp5_ + (_tmp6_ / 2);
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp7_ = array;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp7__length1 = array_length1;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8_ = scratch;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8__length1 = scratch_length1;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp9_ = start_index;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp10_ = middle_index;
-#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 368 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_sorted_list_merge_sort (self, _tmp7_, _tmp7__length1, _tmp8_, _tmp8__length1, _tmp9_, _tmp10_ - 1);
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp11_ = array;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp11__length1 = array_length1;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp12_ = scratch;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp12__length1 = scratch_length1;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp13_ = middle_index;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp14_ = end_index;
-#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 369 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_sorted_list_merge_sort (self, _tmp11_, _tmp11__length1, _tmp12_, _tmp12__length1, _tmp13_, _tmp14_);
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp15_ = self->priv->cmp;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp15__target = self->priv->cmp_target;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp16_ = array;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp16__length1 = array_length1;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp17_ = middle_index;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp18_ = _tmp16_[_tmp17_ - 1];
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp19_ = array;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp19__length1 = array_length1;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp20_ = middle_index;
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp21_ = _tmp19_[_tmp20_];
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp22_ = _tmp15_ (_tmp18_, _tmp21_, _tmp15__target);
-#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 371 "/home/jens/Source/shotwell/src/SortedList.vala"
 	if (_tmp22_ > ((gint64) 0)) {
-#line 2039 "SortedList.c"
+#line 1925 "SortedList.c"
 		gpointer* _tmp23_;
 		gint _tmp23__length1;
 		gpointer* _tmp24_;
@@ -2043,23 +1929,23 @@ static void _sorted_list_merge_sort (SortedList* self, gpointer* array, int arra
 		gint _tmp25_;
 		gint _tmp26_;
 		gint _tmp27_;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23_ = array;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23__length1 = array_length1;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24_ = scratch;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24__length1 = scratch_length1;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp25_ = start_index;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp26_ = middle_index;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp27_ = end_index;
-#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 372 "/home/jens/Source/shotwell/src/SortedList.vala"
 		sorted_list_merge (self, _tmp23_, _tmp23__length1, _tmp24_, _tmp24__length1, _tmp25_, _tmp26_, _tmp27_);
-#line 2063 "SortedList.c"
+#line 1949 "SortedList.c"
 	}
 }
 
@@ -2084,49 +1970,49 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 	gint scratch_index = 0;
 	gint _tmp57_;
 	gint _tmp58_;
-#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 375 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_if_fail (IS_SORTED_LIST (self));
-#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = start_index;
-#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = end_index;
-#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 376 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp0_ < _tmp1_, "start_index < end_index");
-#line 394 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = end_index;
-#line 394 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp3_ = start_index;
-#line 394 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 378 "/home/jens/Source/shotwell/src/SortedList.vala"
 	count = (_tmp2_ - _tmp3_) + 1;
-#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 379 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp4_ = start_index;
-#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 379 "/home/jens/Source/shotwell/src/SortedList.vala"
 	left_start = _tmp4_;
-#line 396 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 380 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp5_ = middle_index;
-#line 396 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 380 "/home/jens/Source/shotwell/src/SortedList.vala"
 	left_end = _tmp5_ - 1;
-#line 397 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 381 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp6_ = middle_index;
-#line 397 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 381 "/home/jens/Source/shotwell/src/SortedList.vala"
 	right_start = _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 382 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp7_ = end_index;
-#line 398 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 382 "/home/jens/Source/shotwell/src/SortedList.vala"
 	right_end = _tmp7_;
-#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8_ = scratch;
-#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp8__length1 = scratch_length1;
-#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp9_ = count;
-#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 384 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp8__length1 >= _tmp9_, "scratch.length >= count");
-#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 385 "/home/jens/Source/shotwell/src/SortedList.vala"
 	scratch_index = 0;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 2130 "SortedList.c"
+#line 2016 "SortedList.c"
 		gboolean _tmp10_ = FALSE;
 		gint _tmp11_;
 		gint _tmp12_;
@@ -2147,70 +2033,70 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 		gconstpointer _tmp24_;
 		gconstpointer _tmp25_;
 		gint64 _tmp26_;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp11_ = left_start;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp12_ = left_end;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp11_ <= _tmp12_) {
-#line 2157 "SortedList.c"
+#line 2043 "SortedList.c"
 			gint _tmp13_;
 			gint _tmp14_;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp13_ = right_start;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp14_ = right_end;
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp10_ = _tmp13_ <= _tmp14_;
-#line 2166 "SortedList.c"
+#line 2052 "SortedList.c"
 		} else {
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp10_ = FALSE;
-#line 2170 "SortedList.c"
+#line 2056 "SortedList.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!_tmp10_) {
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 2176 "SortedList.c"
+#line 2062 "SortedList.c"
 		}
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15_ = array;
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp15__length1 = array_length1;
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp16_ = left_start;
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp17_ = _tmp15_[_tmp16_];
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp18_ = ((_tmp17_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp17_) : ((gpointer) _tmp17_);
-#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 388 "/home/jens/Source/shotwell/src/SortedList.vala"
 		left = _tmp18_;
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp19_ = array;
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp19__length1 = array_length1;
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp20_ = right_start;
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp21_ = _tmp19_[_tmp20_];
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_);
-#line 405 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 389 "/home/jens/Source/shotwell/src/SortedList.vala"
 		right = _tmp22_;
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23_ = self->priv->cmp;
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp23__target = self->priv->cmp_target;
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp24_ = left;
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp25_ = right;
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp26_ = _tmp23_ (_tmp24_, _tmp25_, _tmp23__target);
-#line 407 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 391 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (_tmp26_ <= ((gint64) 0)) {
-#line 2214 "SortedList.c"
+#line 2100 "SortedList.c"
 			gpointer* _tmp27_;
 			gint _tmp27__length1;
 			gint _tmp28_;
@@ -2218,29 +2104,29 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 			gpointer _tmp30_;
 			gpointer _tmp31_;
 			gint _tmp32_;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27_ = scratch;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27__length1 = scratch_length1;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp28_ = scratch_index;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			scratch_index = _tmp28_ + 1;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp29_ = left;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp30_ = ((_tmp29_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp29_) : ((gpointer) _tmp29_);
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			((_tmp27_[_tmp28_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp27_[_tmp28_] = (self->priv->g_destroy_func (_tmp27_[_tmp28_]), NULL));
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp27_[_tmp28_] = _tmp30_;
-#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 392 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp31_ = _tmp27_[_tmp28_];
-#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 393 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp32_ = left_start;
-#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 393 "/home/jens/Source/shotwell/src/SortedList.vala"
 			left_start = _tmp32_ + 1;
-#line 2244 "SortedList.c"
+#line 2130 "SortedList.c"
 		} else {
 			gpointer* _tmp33_;
 			gint _tmp33__length1;
@@ -2249,39 +2135,39 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 			gpointer _tmp36_;
 			gpointer _tmp37_;
 			gint _tmp38_;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp33_ = scratch;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp33__length1 = scratch_length1;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp34_ = scratch_index;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			scratch_index = _tmp34_ + 1;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp35_ = right;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp36_ = ((_tmp35_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp35_) : ((gpointer) _tmp35_);
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			((_tmp33_[_tmp34_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp33_[_tmp34_] = (self->priv->g_destroy_func (_tmp33_[_tmp34_]), NULL));
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp33_[_tmp34_] = _tmp36_;
-#line 411 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 395 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp37_ = _tmp33_[_tmp34_];
-#line 412 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 396 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp38_ = right_start;
-#line 412 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 396 "/home/jens/Source/shotwell/src/SortedList.vala"
 			right_start = _tmp38_ + 1;
-#line 2275 "SortedList.c"
+#line 2161 "SortedList.c"
 		}
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((right == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (right = (self->priv->g_destroy_func (right), NULL));
-#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 387 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((left == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (left = (self->priv->g_destroy_func (left), NULL));
-#line 2281 "SortedList.c"
+#line 2167 "SortedList.c"
 	}
-#line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 2285 "SortedList.c"
+#line 2171 "SortedList.c"
 		gint _tmp39_;
 		gint _tmp40_;
 		gpointer* _tmp41_;
@@ -2293,47 +2179,47 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 		gconstpointer _tmp45_;
 		gpointer _tmp46_;
 		gpointer _tmp47_;
-#line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp39_ = left_start;
-#line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp40_ = left_end;
-#line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!(_tmp39_ <= _tmp40_)) {
-#line 416 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 400 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 2305 "SortedList.c"
+#line 2191 "SortedList.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp41_ = scratch;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp41__length1 = scratch_length1;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp42_ = scratch_index;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		scratch_index = _tmp42_ + 1;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp43_ = array;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp43__length1 = array_length1;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp44_ = left_start;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		left_start = _tmp44_ + 1;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp45_ = _tmp43_[_tmp44_];
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp46_ = ((_tmp45_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp45_) : ((gpointer) _tmp45_);
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((_tmp41_[_tmp42_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp41_[_tmp42_] = (self->priv->g_destroy_func (_tmp41_[_tmp42_]), NULL));
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp41_[_tmp42_] = _tmp46_;
-#line 417 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 401 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp47_ = _tmp41_[_tmp42_];
-#line 2333 "SortedList.c"
+#line 2219 "SortedList.c"
 	}
-#line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 	while (TRUE) {
-#line 2337 "SortedList.c"
+#line 2223 "SortedList.c"
 		gint _tmp48_;
 		gint _tmp49_;
 		gpointer* _tmp50_;
@@ -2345,68 +2231,68 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 		gconstpointer _tmp54_;
 		gpointer _tmp55_;
 		gpointer _tmp56_;
-#line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp48_ = right_start;
-#line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp49_ = right_end;
-#line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 		if (!(_tmp48_ <= _tmp49_)) {
-#line 419 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 403 "/home/jens/Source/shotwell/src/SortedList.vala"
 			break;
-#line 2357 "SortedList.c"
+#line 2243 "SortedList.c"
 		}
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp50_ = scratch;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp50__length1 = scratch_length1;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp51_ = scratch_index;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		scratch_index = _tmp51_ + 1;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp52_ = array;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp52__length1 = array_length1;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp53_ = right_start;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		right_start = _tmp53_ + 1;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp54_ = _tmp52_[_tmp53_];
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp55_ = ((_tmp54_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp54_) : ((gpointer) _tmp54_);
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		((_tmp50_[_tmp51_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp50_[_tmp51_] = (self->priv->g_destroy_func (_tmp50_[_tmp51_]), NULL));
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp50_[_tmp51_] = _tmp55_;
-#line 420 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 404 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp56_ = _tmp50_[_tmp51_];
-#line 2385 "SortedList.c"
+#line 2271 "SortedList.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 406 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp57_ = scratch_index;
-#line 422 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 406 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp58_ = count;
-#line 422 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 406 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_vala_assert (_tmp57_ == _tmp58_, "scratch_index == count");
-#line 424 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 408 "/home/jens/Source/shotwell/src/SortedList.vala"
 	scratch_index = 0;
-#line 2395 "SortedList.c"
+#line 2281 "SortedList.c"
 	{
 		gint list_index = 0;
 		gint _tmp59_;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 		_tmp59_ = start_index;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 		list_index = _tmp59_;
-#line 2403 "SortedList.c"
+#line 2289 "SortedList.c"
 		{
 			gboolean _tmp60_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 			_tmp60_ = TRUE;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 			while (TRUE) {
-#line 2410 "SortedList.c"
+#line 2296 "SortedList.c"
 				gint _tmp62_;
 				gint _tmp63_;
 				gpointer* _tmp64_;
@@ -2418,53 +2304,53 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 				gconstpointer _tmp68_;
 				gpointer _tmp69_;
 				gpointer _tmp70_;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (!_tmp60_) {
-#line 2424 "SortedList.c"
+#line 2310 "SortedList.c"
 					gint _tmp61_;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 					_tmp61_ = list_index;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 					list_index = _tmp61_ + 1;
-#line 2430 "SortedList.c"
+#line 2316 "SortedList.c"
 				}
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp60_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp62_ = list_index;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp63_ = end_index;
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 				if (!(_tmp62_ <= _tmp63_)) {
-#line 425 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 409 "/home/jens/Source/shotwell/src/SortedList.vala"
 					break;
-#line 2442 "SortedList.c"
+#line 2328 "SortedList.c"
 				}
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp64_ = array;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp64__length1 = array_length1;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp65_ = list_index;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp66_ = scratch;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp66__length1 = scratch_length1;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp67_ = scratch_index;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				scratch_index = _tmp67_ + 1;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp68_ = _tmp66_[_tmp67_];
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp69_ = ((_tmp68_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp68_) : ((gpointer) _tmp68_);
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				((_tmp64_[_tmp65_] == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_tmp64_[_tmp65_] = (self->priv->g_destroy_func (_tmp64_[_tmp65_]), NULL));
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp64_[_tmp65_] = _tmp69_;
-#line 426 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 410 "/home/jens/Source/shotwell/src/SortedList.vala"
 				_tmp70_ = _tmp64_[_tmp65_];
-#line 2468 "SortedList.c"
+#line 2354 "SortedList.c"
 			}
 		}
 	}
@@ -2474,13 +2360,13 @@ static void sorted_list_merge (SortedList* self, gpointer* array, int array_leng
 static GType sorted_list_real_get_element_type (GeeTraversable* base) {
 	GType result;
 	SortedList* self;
-#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 19 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 19 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = self->priv->g_type;
-#line 35 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 19 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2484 "SortedList.c"
+#line 2370 "SortedList.c"
 }
 
 
@@ -2490,19 +2376,19 @@ static gboolean sorted_list_real_get_read_only (GeeCollection* base) {
 	GeeArrayList* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 39 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 23 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2506 "SortedList.c"
+#line 2392 "SortedList.c"
 }
 
 
@@ -2512,19 +2398,19 @@ static gboolean sorted_list_real_get_is_empty (GeeCollection* base) {
 	GeeArrayList* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 132 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 116 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 117 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 117 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 117 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 117 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 133 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 117 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2528 "SortedList.c"
+#line 2414 "SortedList.c"
 }
 
 
@@ -2534,19 +2420,19 @@ static gint sorted_list_real_get_size (GeeCollection* base) {
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = _tmp2_;
-#line 150 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 134 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2550 "SortedList.c"
+#line 2436 "SortedList.c"
 }
 
 
@@ -2556,19 +2442,19 @@ static GeeCollection* sorted_list_real_get_read_only_view (GeeCollection* base)
 	GeeArrayList* _tmp0_;
 	GeeBidirList* _tmp1_;
 	GeeBidirList* _tmp2_;
-#line 215 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 199 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SORTED_LIST, SortedList);
-#line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList));
-#line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 216 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 200 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2572 "SortedList.c"
+#line 2458 "SortedList.c"
 }
 
 
@@ -2577,205 +2463,205 @@ GeeList* sorted_list_get_read_only_view_as_list (SortedList* self) {
 	GeeArrayList* _tmp0_;
 	GeeBidirList* _tmp1_;
 	GeeBidirList* _tmp2_;
-#line 221 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 205 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_return_val_if_fail (IS_SORTED_LIST (self), NULL);
-#line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 206 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp0_ = self->priv->list;
-#line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 206 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList));
-#line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 206 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_tmp2_ = _tmp1_;
-#line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 206 "/home/jens/Source/shotwell/src/SortedList.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
-#line 222 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 206 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return result;
-#line 2593 "SortedList.c"
+#line 2479 "SortedList.c"
 }
 
 
 static void sorted_list_class_init (SortedListClass * klass) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_parent_class = g_type_class_peek_parent (klass);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_type_class_add_private (klass, sizeof (SortedListPrivate));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_sorted_list_get_property;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_sorted_list_set_property;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	G_OBJECT_CLASS (klass)->finalize = sorted_list_finalize;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_TYPE, g_param_spec_gtype ("g-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DUP_FUNC, g_param_spec_pointer ("g-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_G_DESTROY_FUNC, g_param_spec_pointer ("g-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_ELEMENT_TYPE_PROPERTY, g_param_spec_gtype ("element-type", "element-type", "element-type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_PROPERTY, g_param_spec_boolean ("read-only", "read-only", "read-only", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_IS_EMPTY_PROPERTY, g_param_spec_boolean ("is-empty", "is-empty", "is-empty", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_SIZE_PROPERTY, g_param_spec_int ("size", "size", "size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_PROPERTY, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_COLLECTION, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY, g_param_spec_object ("read-only-view-as-list", "read-only-view-as-list", "read-only-view-as-list", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 2626 "SortedList.c"
+#line 2512 "SortedList.c"
 }
 
 
 static GType sorted_list_gee_traversable_get_g_type (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_type;
-#line 2633 "SortedList.c"
+#line 2519 "SortedList.c"
 }
 
 
 static GBoxedCopyFunc sorted_list_gee_traversable_get_g_dup_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_dup_func;
-#line 2640 "SortedList.c"
+#line 2526 "SortedList.c"
 }
 
 
 static GDestroyNotify sorted_list_gee_traversable_get_g_destroy_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_destroy_func;
-#line 2647 "SortedList.c"
+#line 2533 "SortedList.c"
 }
 
 
 static void sorted_list_gee_traversable_interface_init (GeeTraversableIface * iface) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_traversable_parent_iface = g_type_interface_peek_parent (iface);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->foreach = (gboolean (*) (GeeTraversable *, GeeForallFunc, void*)) sorted_list_real_foreach;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_type = (GType (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_type;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_dup_func;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeTraversable *)) sorted_list_gee_traversable_get_g_destroy_func;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_element_type = sorted_list_real_get_element_type;
-#line 2664 "SortedList.c"
+#line 2550 "SortedList.c"
 }
 
 
 static GType sorted_list_gee_iterable_get_g_type (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_type;
-#line 2671 "SortedList.c"
+#line 2557 "SortedList.c"
 }
 
 
 static GBoxedCopyFunc sorted_list_gee_iterable_get_g_dup_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_dup_func;
-#line 2678 "SortedList.c"
+#line 2564 "SortedList.c"
 }
 
 
 static GDestroyNotify sorted_list_gee_iterable_get_g_destroy_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_destroy_func;
-#line 2685 "SortedList.c"
+#line 2571 "SortedList.c"
 }
 
 
 static void sorted_list_gee_iterable_interface_init (GeeIterableIface * iface) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_iterable_parent_iface = g_type_interface_peek_parent (iface);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->iterator = (GeeIterator* (*) (GeeIterable *)) sorted_list_real_iterator;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_type = (GType (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_type;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_dup_func;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeIterable *)) sorted_list_gee_iterable_get_g_destroy_func;
-#line 2700 "SortedList.c"
+#line 2586 "SortedList.c"
 }
 
 
 static GType sorted_list_gee_collection_get_g_type (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_type;
-#line 2707 "SortedList.c"
+#line 2593 "SortedList.c"
 }
 
 
 static GBoxedCopyFunc sorted_list_gee_collection_get_g_dup_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_dup_func;
-#line 2714 "SortedList.c"
+#line 2600 "SortedList.c"
 }
 
 
 static GDestroyNotify sorted_list_gee_collection_get_g_destroy_func (SortedList* self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	return self->priv->g_destroy_func;
-#line 2721 "SortedList.c"
+#line 2607 "SortedList.c"
 }
 
 
 static void sorted_list_gee_collection_interface_init (GeeCollectionIface * iface) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	sorted_list_gee_collection_parent_iface = g_type_interface_peek_parent (iface);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->add = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_add;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->add_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_add_all;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->clear = (void (*) (GeeCollection *)) sorted_list_real_clear;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->contains = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_contains;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->contains_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_contains_all;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->remove = (gboolean (*) (GeeCollection *, gconstpointer)) sorted_list_real_remove;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->remove_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_remove_all;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->retain_all = (gboolean (*) (GeeCollection *, GeeCollection*)) sorted_list_real_retain_all;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->to_array = (gpointer* (*) (GeeCollection *, int*)) sorted_list_real_to_array;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_type = (GType (*) (GeeCollection *)) sorted_list_gee_collection_get_g_type;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_dup_func = (GBoxedCopyFunc (*) (GeeCollection *)) sorted_list_gee_collection_get_g_dup_func;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_g_destroy_func = (GDestroyNotify (*) (GeeCollection *)) sorted_list_gee_collection_get_g_destroy_func;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_read_only = sorted_list_real_get_read_only;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_is_empty = sorted_list_real_get_is_empty;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_size = sorted_list_real_get_size;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	iface->get_read_only_view = sorted_list_real_get_read_only_view;
-#line 2760 "SortedList.c"
+#line 2646 "SortedList.c"
 }
 
 
 static void sorted_list_instance_init (SortedList * self) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self->priv = SORTED_LIST_GET_PRIVATE (self);
-#line 2767 "SortedList.c"
+#line 2653 "SortedList.c"
 }
 
 
 static void sorted_list_finalize (GObject * obj) {
 	SortedList * self;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SORTED_LIST, SortedList);
-#line 26 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 10 "/home/jens/Source/shotwell/src/SortedList.vala"
 	_g_object_unref0 (self->priv->list);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	G_OBJECT_CLASS (sorted_list_parent_class)->finalize (obj);
-#line 2779 "SortedList.c"
+#line 2665 "SortedList.c"
 }
 
 
@@ -2800,51 +2686,51 @@ GType sorted_list_get_type (void) {
 static void _vala_sorted_list_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	SortedList * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	switch (property_id) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_ELEMENT_TYPE_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_gtype (value, gee_traversable_get_element_type (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_TRAVERSABLE, GeeTraversable)));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_READ_ONLY_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_boolean (value, gee_collection_get_read_only (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_IS_EMPTY_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_boolean (value, gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_SIZE_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_set_int (value, gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_READ_ONLY_VIEW_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_take_object (value, gee_collection_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection)));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_READ_ONLY_VIEW_AS_LIST_PROPERTY:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		g_value_take_object (value, sorted_list_get_read_only_view_as_list (self));
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 2842 "SortedList.c"
+#line 2728 "SortedList.c"
 		default:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 2848 "SortedList.c"
+#line 2734 "SortedList.c"
 	}
 }
 
@@ -2852,33 +2738,33 @@ static void _vala_sorted_list_get_property (GObject * object, guint property_id,
 static void _vala_sorted_list_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	SortedList * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_SORTED_LIST, SortedList);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 	switch (property_id) {
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_G_TYPE:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		self->priv->g_type = g_value_get_gtype (value);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_G_DUP_FUNC:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		self->priv->g_dup_func = g_value_get_pointer (value);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		case SORTED_LIST_G_DESTROY_FUNC:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		self->priv->g_destroy_func = g_value_get_pointer (value);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 2876 "SortedList.c"
+#line 2762 "SortedList.c"
 		default:
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 25 "/home/jens/Source/shotwell/src/SortedList.vala"
+#line 9 "/home/jens/Source/shotwell/src/SortedList.vala"
 		break;
-#line 2882 "SortedList.c"
+#line 2768 "SortedList.c"
 	}
 }
 
diff --git a/src/SortedList.vala b/src/SortedList.vala
index 00672ab..20e6771 100644
--- a/src/SortedList.vala
+++ b/src/SortedList.vala
@@ -6,22 +6,6 @@
 
 public delegate int64 Comparator(void *a, void *b);
 
-extern string g_utf8_collate_key_for_filename(string str, ssize_t len = -1);
-
-public int64 file_comparator(void *a, void *b) {
-    string? path_a = ((File *) a)->get_path();
-    string? path_b = ((File *) b)->get_path();
-    
-    // if both are null, treat as equal; if one but not the other, prioritize  the non-null
-    if (path_a == null)
-        return (path_b == null) ? 0 : 1;
-    
-    if (path_b == null)
-        return -1;
-    
-    return strcmp(g_utf8_collate_key_for_filename(path_a), g_utf8_collate_key_for_filename(path_b));
-}
-
 public class SortedList<G> : Object, Gee.Traversable<G>, Gee.Iterable<G>, Gee.Collection<G> {
     private Gee.ArrayList<G> list;
     private unowned Comparator? cmp;
diff --git a/src/Tag.c b/src/Tag.c
index 5f27dfc..b1d3895 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -923,7 +923,7 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
 #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024
 gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value);
 static void tag_set_raw_flat_name (Tag* self, const gchar* name);
 void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error);
 void data_object_notify_altered (DataObject* self, Alteration* alteration);
@@ -3240,7 +3240,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3243 "Tag.c"
-				goto __catch471_database_error;
+				goto __catch480_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 __finally471;
-	__catch471_database_error:
+	goto __finally480;
+	__catch480_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_error_free0 (err);
 #line 3283 "Tag.c"
 	}
-	__finally471:
+	__finally480:
 #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 __catch472_database_error;
+								goto __catch481_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 __finally472;
-					__catch472_database_error:
+					goto __finally481;
+					__catch481_database_error:
 					{
 						GError* err = NULL;
 						TagRow* _tmp30_;
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 						_g_error_free0 (err);
 #line 3472 "Tag.c"
 					}
-					__finally472:
+					__finally481:
 #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 __catch473_database_error;
+				goto __catch482_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 __finally473;
-	__catch473_database_error:
+	goto __finally482;
+	__catch482_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_;
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
 		_g_error_free0 (err);
 #line 4618 "Tag.c"
 	}
-	__finally473:
+	__finally482:
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5336,7 +5336,7 @@ gchar* tag_prep_tag_name (const gchar* name) {
 }
 
 
-static void _vala_array_add127 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add128 (gchar** * array, int* length, int* size, gchar* value) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 	if ((*length) == (*size)) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5446,7 +5446,7 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp12_ = g_strdup (_tmp11_);
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
-					_vala_array_add127 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+					_vala_array_add128 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 5451 "Tag.c"
 				}
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5535 "Tag.c"
-				goto __catch474_database_error;
+				goto __catch483_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 __finally474;
-	__catch474_database_error:
+	goto __finally483;
+	__catch483_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 		return;
 #line 5568 "Tag.c"
 	}
-	__finally474:
+	__finally483:
 #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 __catch475_database_error;
+				goto __catch484_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 __finally475;
-	__catch475_database_error:
+	goto __finally484;
+	__catch484_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 		return;
 #line 5714 "Tag.c"
 	}
-	__finally475:
+	__finally484:
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7066,7 +7066,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 7069 "Tag.c"
-				goto __catch476_database_error;
+				goto __catch485_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);
@@ -7082,8 +7082,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_tmp6_->tag_id = _tmp0_;
 #line 7084 "Tag.c"
 	}
-	goto __finally476;
-	__catch476_database_error:
+	goto __finally485;
+	__catch485_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -7099,7 +7099,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_g_error_free0 (err);
 #line 7101 "Tag.c"
 	}
-	__finally476:
+	__finally485:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9013,7 +9013,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 9016 "Tag.c"
-				goto __catch477_database_error;
+				goto __catch486_database_error;
 			}
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (removed_sources);
@@ -9028,8 +9028,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 9029 "Tag.c"
 		}
 	}
-	goto __finally477;
-	__catch477_database_error:
+	goto __finally486;
+	__catch486_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp57_;
@@ -9045,7 +9045,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_g_error_free0 (err);
 #line 9047 "Tag.c"
 	}
-	__finally477:
+	__finally486:
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9257,7 +9257,7 @@ static void tag_real_destroy (DataSource* base) {
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9260 "Tag.c"
-				goto __catch478_database_error;
+				goto __catch487_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);
@@ -9268,8 +9268,8 @@ static void tag_real_destroy (DataSource* base) {
 #line 9269 "Tag.c"
 		}
 	}
-	goto __finally478;
-	__catch478_database_error:
+	goto __finally487;
+	__catch487_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_;
@@ -9285,7 +9285,7 @@ static void tag_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 9287 "Tag.c"
 	}
-	__finally478:
+	__finally487:
 #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 c884d23..f02ebd7 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -528,7 +528,6 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b);
 gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration);
 gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration);
 GFile* media_source_get_file (MediaSource* self);
-gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len);
 gint64 thumbnail_rating_ascending_comparator (void* a, void* b);
 GType rating_get_type (void) G_GNUC_CONST;
 Rating media_source_get_rating (MediaSource* self);
@@ -582,21 +581,21 @@ static void _vala_thumbnail_get_property (GObject * object, guint property_id, G
 static void _thumbnail_on_tag_contents_altered_container_source_collection_container_contents_altered (ContainerSourceCollection* _sender, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked, gpointer self) {
 #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_on_tag_contents_altered ((Thumbnail*) self, container, added, relinked, removed, unlinked);
-#line 586 "Thumbnail.c"
+#line 585 "Thumbnail.c"
 }
 
 
 static void _thumbnail_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 77 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_on_tags_altered ((Thumbnail*) self, items);
-#line 593 "Thumbnail.c"
+#line 592 "Thumbnail.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 53 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 600 "Thumbnail.c"
+#line 599 "Thumbnail.c"
 }
 
 
@@ -681,14 +680,14 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_LIBRARY_PHOTO)) {
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp16_ = TRUE;
-#line 685 "Thumbnail.c"
+#line 684 "Thumbnail.c"
 	} else {
 		MediaSource* _tmp18_;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp18_ = media;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO);
-#line 692 "Thumbnail.c"
+#line 691 "Thumbnail.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_vala_assert (_tmp16_, "(media is LibraryPhoto) || (media is Video)");
@@ -716,14 +715,14 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal
 	thumbnail_update_tags (self, TRUE);
 #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return self;
-#line 720 "Thumbnail.c"
+#line 719 "Thumbnail.c"
 }
 
 
 Thumbnail* thumbnail_new (MediaSource* media, gint scale) {
 #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return thumbnail_construct (TYPE_THUMBNAIL, media, scale);
-#line 727 "Thumbnail.c"
+#line 726 "Thumbnail.c"
 }
 
 
@@ -750,7 +749,7 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 	if (_tmp4_ == NULL) {
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = TRUE;
-#line 754 "Thumbnail.c"
+#line 753 "Thumbnail.c"
 	} else {
 		GeeCollection* _tmp5_;
 		gint _tmp6_;
@@ -763,24 +762,24 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 		_tmp7_ = _tmp6_;
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp7_ == 0;
-#line 767 "Thumbnail.c"
+#line 766 "Thumbnail.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_) {
 #line 83 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_clear_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 773 "Thumbnail.c"
+#line 772 "Thumbnail.c"
 	} else {
 		GeeCollection* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = tags;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_set_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp8_, PANGO_ALIGN_LEFT);
-#line 780 "Thumbnail.c"
+#line 779 "Thumbnail.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (tags);
-#line 784 "Thumbnail.c"
+#line 783 "Thumbnail.c"
 }
 
 
@@ -808,13 +807,13 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 	if (!_tmp0_) {
 #line 91 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		return;
-#line 812 "Thumbnail.c"
+#line 811 "Thumbnail.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = added;
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_ != NULL) {
-#line 818 "Thumbnail.c"
+#line 817 "Thumbnail.c"
 		GeeCollection* _tmp3_;
 		MediaSource* _tmp4_;
 		gboolean _tmp5_;
@@ -826,11 +825,11 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 		_tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = _tmp5_;
-#line 830 "Thumbnail.c"
+#line 829 "Thumbnail.c"
 	} else {
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = FALSE;
-#line 834 "Thumbnail.c"
+#line 833 "Thumbnail.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	tag_added = _tmp1_;
@@ -838,7 +837,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 	_tmp7_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != NULL) {
-#line 842 "Thumbnail.c"
+#line 841 "Thumbnail.c"
 		GeeCollection* _tmp8_;
 		MediaSource* _tmp9_;
 		gboolean _tmp10_;
@@ -850,11 +849,11 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 		_tmp10_ = gee_collection_contains (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp10_;
-#line 854 "Thumbnail.c"
+#line 853 "Thumbnail.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = FALSE;
-#line 858 "Thumbnail.c"
+#line 857 "Thumbnail.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	tag_removed = _tmp6_;
@@ -864,20 +863,20 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 	if (_tmp12_) {
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = TRUE;
-#line 868 "Thumbnail.c"
+#line 867 "Thumbnail.c"
 	} else {
 		gboolean _tmp13_;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp13_ = tag_removed;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = _tmp13_;
-#line 875 "Thumbnail.c"
+#line 874 "Thumbnail.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp11_) {
 #line 98 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_update_tags (self, FALSE);
-#line 881 "Thumbnail.c"
+#line 880 "Thumbnail.c"
 	}
 }
 
@@ -894,7 +893,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 	if (!_tmp0_) {
 #line 103 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		return;
-#line 898 "Thumbnail.c"
+#line 897 "Thumbnail.c"
 	}
 	{
 		GeeIterator* _object_it = NULL;
@@ -922,7 +921,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 		_object_it = _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		while (TRUE) {
-#line 926 "Thumbnail.c"
+#line 925 "Thumbnail.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			DataObject* object = NULL;
@@ -942,7 +941,7 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 			if (!_tmp8_) {
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				break;
-#line 946 "Thumbnail.c"
+#line 945 "Thumbnail.c"
 			}
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp9_ = _object_it;
@@ -972,17 +971,17 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 111 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				break;
-#line 976 "Thumbnail.c"
+#line 975 "Thumbnail.c"
 			}
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_g_object_unref0 (tag);
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_g_object_unref0 (object);
-#line 982 "Thumbnail.c"
+#line 981 "Thumbnail.c"
 		}
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (_object_it);
-#line 986 "Thumbnail.c"
+#line 985 "Thumbnail.c"
 	}
 }
 
@@ -1009,29 +1008,25 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 	if (_tmp3_) {
 #line 119 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1013 "Thumbnail.c"
+#line 1012 "Thumbnail.c"
 	} else {
 		gboolean _tmp4_;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
-#line 1020 "Thumbnail.c"
+#line 1019 "Thumbnail.c"
 			const gchar* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = title;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT);
-#line 1026 "Thumbnail.c"
-		} else {
-#line 123 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-			media_source_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), "", FALSE, PANGO_ALIGN_LEFT);
-#line 1030 "Thumbnail.c"
+#line 1025 "Thumbnail.c"
 		}
 	}
 #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (title);
-#line 1035 "Thumbnail.c"
+#line 1030 "Thumbnail.c"
 }
 
 
@@ -1041,45 +1036,41 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 	gchar* _tmp1_;
 	const gchar* _tmp2_;
 	gboolean _tmp3_;
-#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->media;
-#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = media_source_get_comment (_tmp0_);
-#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 125 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	comment = _tmp1_;
-#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = comment;
-#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = is_string_empty (_tmp2_);
-#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_) {
-#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1061 "Thumbnail.c"
+#line 1056 "Thumbnail.c"
 	} else {
 		gboolean _tmp4_;
-#line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
-#line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 128 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
-#line 1068 "Thumbnail.c"
+#line 1063 "Thumbnail.c"
 			const gchar* _tmp5_;
-#line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = comment;
-#line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 129 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT);
-#line 1074 "Thumbnail.c"
-		} else {
-#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-			checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT);
-#line 1078 "Thumbnail.c"
+#line 1069 "Thumbnail.c"
 		}
 	}
-#line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 124 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (comment);
-#line 1083 "Thumbnail.c"
+#line 1074 "Thumbnail.c"
 }
 
 
@@ -1090,65 +1081,65 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_;
 	Alteration* _tmp8_;
-#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 132 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_ALTERATION (alteration));
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = self->priv->exposure;
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp1_) {
-#line 1102 "Thumbnail.c"
+#line 1093 "Thumbnail.c"
 		Alteration* _tmp2_;
 		gboolean _tmp3_;
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = alteration;
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = alteration_has_detail (_tmp2_, "metadata", "name");
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp0_ = _tmp3_;
-#line 1111 "Thumbnail.c"
+#line 1102 "Thumbnail.c"
 	} else {
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp0_ = FALSE;
-#line 1115 "Thumbnail.c"
+#line 1106 "Thumbnail.c"
 	}
-#line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 133 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_) {
-#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 134 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_update_title (self, FALSE);
-#line 1121 "Thumbnail.c"
+#line 1112 "Thumbnail.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = self->priv->exposure;
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp5_) {
-#line 1127 "Thumbnail.c"
+#line 1118 "Thumbnail.c"
 		Alteration* _tmp6_;
 		gboolean _tmp7_;
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = alteration;
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = alteration_has_detail (_tmp6_, "metadata", "comment");
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = _tmp7_;
-#line 1136 "Thumbnail.c"
+#line 1127 "Thumbnail.c"
 	} else {
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = FALSE;
-#line 1140 "Thumbnail.c"
+#line 1131 "Thumbnail.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 135 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_) {
-#line 140 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_update_comment (self, FALSE);
-#line 1146 "Thumbnail.c"
+#line 1137 "Thumbnail.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = alteration;
-#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 138 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp8_);
-#line 1152 "Thumbnail.c"
+#line 1143 "Thumbnail.c"
 }
 
 
@@ -1156,17 +1147,17 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) {
 	MediaSource* result = NULL;
 	MediaSource* _tmp0_;
 	MediaSource* _tmp1_;
-#line 145 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 141 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), NULL);
-#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->media;
-#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 142 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1170 "Thumbnail.c"
+#line 1161 "Thumbnail.c"
 }
 
 
@@ -1178,23 +1169,23 @@ gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) {
 	void* _tmp3_;
 	MediaSource* _tmp4_;
 	gint64 _tmp5_;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = b;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp2_ - _tmp5_;
-#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 150 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1198 "Thumbnail.c"
+#line 1189 "Thumbnail.c"
 }
 
 
@@ -1203,17 +1194,17 @@ gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) {
 	void* _tmp0_;
 	void* _tmp1_;
 	gint64 _tmp2_;
-#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
-#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = thumbnail_photo_id_ascending_comparator (_tmp0_, _tmp1_);
-#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp2_;
-#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1217 "Thumbnail.c"
+#line 1208 "Thumbnail.c"
 }
 
 
@@ -1231,60 +1222,60 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 	gint64 _tmp8_;
 	gint64 _tmp9_ = 0LL;
 	gint64 _tmp10_;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = g_strcmp0;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp1_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem));
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = _tmp2_;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = b;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = media_source_item_get_natural_collation_key (G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp4_, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem));
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = _tmp5_;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = _tmp0_ (_tmp3_, _tmp6_);
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = (gint64) _tmp7_;
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp6_);
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp3_);
-#line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp8_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp10_ = _result_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp10_ != ((gint64) 0)) {
-#line 1263 "Thumbnail.c"
+#line 1254 "Thumbnail.c"
 		gint64 _tmp11_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = _result_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = _tmp11_;
-#line 1269 "Thumbnail.c"
+#line 1260 "Thumbnail.c"
 	} else {
 		void* _tmp12_;
 		void* _tmp13_;
 		gint64 _tmp14_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp12_ = a;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp13_ = b;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp14_ = thumbnail_photo_id_ascending_comparator (_tmp12_, _tmp13_);
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = _tmp14_;
-#line 1282 "Thumbnail.c"
+#line 1273 "Thumbnail.c"
 	}
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp9_;
-#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 159 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1288 "Thumbnail.c"
+#line 1279 "Thumbnail.c"
 }
 
 
@@ -1296,44 +1287,44 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
 	gint64 _tmp4_;
-#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
-#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = thumbnail_title_ascending_comparator (_tmp0_, _tmp1_);
-#line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp2_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = _result_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
-#line 1312 "Thumbnail.c"
+#line 1303 "Thumbnail.c"
 		gint64 _tmp5_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
-#line 1318 "Thumbnail.c"
+#line 1309 "Thumbnail.c"
 	} else {
 		void* _tmp6_;
 		void* _tmp7_;
 		gint64 _tmp8_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = b;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_);
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp8_;
-#line 1331 "Thumbnail.c"
+#line 1322 "Thumbnail.c"
 	}
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp3_;
-#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 165 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1337 "Thumbnail.c"
+#line 1328 "Thumbnail.c"
 }
 
 
@@ -1341,19 +1332,19 @@ gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* a
 	gboolean result = FALSE;
 	Alteration* _tmp0_;
 	gboolean _tmp1_;
-#line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 168 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = alteration;
-#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "title");
-#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp1_;
-#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1357 "Thumbnail.c"
+#line 1348 "Thumbnail.c"
 }
 
 
@@ -1372,58 +1363,58 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 	gint64 _tmp7_;
 	gint64 _tmp8_ = 0LL;
 	gint64 _tmp9_;
-#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
-#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = media_source_get_exposure_time (_tmp1_);
-#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 173 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	time_a = (gint64) _tmp2_;
-#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = b;
-#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = media_source_get_exposure_time (_tmp4_);
-#line 178 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 174 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	time_b = (gint64) _tmp5_;
-#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = time_a;
-#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = time_b;
-#line 179 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 175 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp6_ - _tmp7_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp9_ = _result_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp9_ != ((gint64) 0)) {
-#line 1402 "Thumbnail.c"
+#line 1393 "Thumbnail.c"
 		gint64 _tmp10_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = _result_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _tmp10_;
-#line 1408 "Thumbnail.c"
+#line 1399 "Thumbnail.c"
 	} else {
 		void* _tmp11_;
 		void* _tmp12_;
 		gint64 _tmp13_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = a;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp12_ = b;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp13_ = thumbnail_filename_ascending_comparator (_tmp11_, _tmp12_);
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _tmp13_;
-#line 1421 "Thumbnail.c"
+#line 1412 "Thumbnail.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp8_;
-#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1427 "Thumbnail.c"
+#line 1418 "Thumbnail.c"
 }
 
 
@@ -1435,44 +1426,44 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
 	gint64 _tmp4_;
-#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
-#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = thumbnail_exposure_time_ascending_comparator (_tmp0_, _tmp1_);
-#line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp2_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = _result_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
-#line 1451 "Thumbnail.c"
+#line 1442 "Thumbnail.c"
 		gint64 _tmp5_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
-#line 1457 "Thumbnail.c"
+#line 1448 "Thumbnail.c"
 	} else {
 		void* _tmp6_;
 		void* _tmp7_;
 		gint64 _tmp8_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = b;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = thumbnail_filename_descending_comparator (_tmp6_, _tmp7_);
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp8_;
-#line 1470 "Thumbnail.c"
+#line 1461 "Thumbnail.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp3_;
-#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 183 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1476 "Thumbnail.c"
+#line 1467 "Thumbnail.c"
 }
 
 
@@ -1480,19 +1471,19 @@ gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alter
 	gboolean result = FALSE;
 	Alteration* _tmp0_;
 	gboolean _tmp1_;
-#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 186 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = alteration;
-#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time");
-#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp1_;
-#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1496 "Thumbnail.c"
+#line 1487 "Thumbnail.c"
 }
 
 
@@ -1500,19 +1491,19 @@ gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration
 	gboolean result = FALSE;
 	Alteration* _tmp0_;
 	gboolean _tmp1_;
-#line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = alteration;
-#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "filename");
-#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp1_;
-#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 191 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1516 "Thumbnail.c"
+#line 1507 "Thumbnail.c"
 }
 
 
@@ -1548,108 +1539,108 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 	gint64 _tmp24_;
 	gint64 _tmp25_ = 0LL;
 	gint64 _tmp26_;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = media_source_get_file (_tmp1_);
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = g_file_get_basename (_tmp3_);
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = _tmp4_;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = g_utf8_strdown (_tmp5_, (gssize) -1);
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = _tmp6_;
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp5_);
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (_tmp3_);
-#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 195 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	path_a = _tmp7_;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = b;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp8_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp10_ = media_source_get_file (_tmp9_);
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp11_ = _tmp10_;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp12_ = g_file_get_basename (_tmp11_);
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp13_ = _tmp12_;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp14_ = g_utf8_strdown (_tmp13_, (gssize) -1);
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp15_ = _tmp14_;
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp13_);
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (_tmp11_);
-#line 200 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 196 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	path_b = _tmp15_;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp16_ = g_strcmp0;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp17_ = path_a;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp18_ = g_utf8_collate_key_for_filename (_tmp17_, (gssize) -1);
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp19_ = _tmp18_;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp20_ = path_b;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp21_ = g_utf8_collate_key_for_filename (_tmp20_, (gssize) -1);
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp22_ = _tmp21_;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp23_ = _tmp16_ (_tmp19_, _tmp22_);
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp24_ = (gint64) _tmp23_;
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp22_);
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (_tmp19_);
-#line 202 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 198 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp24_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp26_ = _result_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp26_ != ((gint64) 0)) {
-#line 1624 "Thumbnail.c"
+#line 1615 "Thumbnail.c"
 		gint64 _tmp27_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp27_ = _result_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp25_ = _tmp27_;
-#line 1630 "Thumbnail.c"
+#line 1621 "Thumbnail.c"
 	} else {
 		void* _tmp28_;
 		void* _tmp29_;
 		gint64 _tmp30_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp28_ = a;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp29_ = b;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp30_ = thumbnail_photo_id_ascending_comparator (_tmp28_, _tmp29_);
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp25_ = _tmp30_;
-#line 1643 "Thumbnail.c"
+#line 1634 "Thumbnail.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp25_;
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (path_b);
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_free0 (path_a);
-#line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1653 "Thumbnail.c"
+#line 1644 "Thumbnail.c"
 }
 
 
@@ -1661,44 +1652,44 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
 	gint64 _tmp4_;
-#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
-#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = thumbnail_filename_ascending_comparator (_tmp0_, _tmp1_);
-#line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 203 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp2_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = _result_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
-#line 1677 "Thumbnail.c"
+#line 1668 "Thumbnail.c"
 		gint64 _tmp5_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
-#line 1683 "Thumbnail.c"
+#line 1674 "Thumbnail.c"
 	} else {
 		void* _tmp6_;
 		void* _tmp7_;
 		gint64 _tmp8_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = b;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_);
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp8_;
-#line 1696 "Thumbnail.c"
+#line 1687 "Thumbnail.c"
 	}
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp3_;
-#line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 205 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1702 "Thumbnail.c"
+#line 1693 "Thumbnail.c"
 }
 
 
@@ -1713,50 +1704,50 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 	Rating _tmp5_;
 	gint64 _tmp6_ = 0LL;
 	gint64 _tmp7_;
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp0_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = media_source_get_rating (_tmp1_);
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = b;
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((Thumbnail*) _tmp3_, TYPE_THUMBNAIL, Thumbnail)->priv->media;
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = media_source_get_rating (_tmp4_);
-#line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 209 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = (gint64) (_tmp2_ - _tmp5_);
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = _result_;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != ((gint64) 0)) {
-#line 1735 "Thumbnail.c"
+#line 1726 "Thumbnail.c"
 		gint64 _tmp8_;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _result_;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp8_;
-#line 1741 "Thumbnail.c"
+#line 1732 "Thumbnail.c"
 	} else {
 		void* _tmp9_;
 		void* _tmp10_;
 		gint64 _tmp11_;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = a;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = b;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = thumbnail_photo_id_ascending_comparator (_tmp9_, _tmp10_);
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp11_;
-#line 1754 "Thumbnail.c"
+#line 1745 "Thumbnail.c"
 	}
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp6_;
-#line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 211 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1760 "Thumbnail.c"
+#line 1751 "Thumbnail.c"
 }
 
 
@@ -1768,44 +1759,44 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
 	gint64 _tmp4_;
-#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
-#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = a;
-#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = thumbnail_rating_ascending_comparator (_tmp0_, _tmp1_);
-#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 215 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_result_ = _tmp2_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = _result_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
-#line 1784 "Thumbnail.c"
+#line 1775 "Thumbnail.c"
 		gint64 _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
-#line 1790 "Thumbnail.c"
+#line 1781 "Thumbnail.c"
 	} else {
 		void* _tmp6_;
 		void* _tmp7_;
 		gint64 _tmp8_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = b;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = thumbnail_photo_id_descending_comparator (_tmp6_, _tmp7_);
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp8_;
-#line 1803 "Thumbnail.c"
+#line 1794 "Thumbnail.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp3_;
-#line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 217 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1809 "Thumbnail.c"
+#line 1800 "Thumbnail.c"
 }
 
 
@@ -1813,19 +1804,19 @@ gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration*
 	gboolean result = FALSE;
 	Alteration* _tmp0_;
 	gboolean _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = alteration;
-#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "rating");
-#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp1_;
-#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 221 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 1829 "Thumbnail.c"
+#line 1820 "Thumbnail.c"
 }
 
 
@@ -1836,35 +1827,35 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) {
 	gint _tmp2_;
 	Dimensions _tmp3_ = {0};
 	gboolean _tmp4_;
-#line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 224 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->media;
-#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	media_source_get_dimensions (_tmp0_, PHOTO_EXCEPTION_NONE, &_tmp1_);
-#line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->original_dim = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = self->priv->scale;
-#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	dimensions_get_scaled (&self->priv->original_dim, _tmp2_, TRUE, &_tmp3_);
-#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 226 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->dim = _tmp3_;
-#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 228 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = self->priv->exposure;
-#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 228 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_) {
-#line 234 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_delayed_high_quality_fetch (self);
-#line 1860 "Thumbnail.c"
+#line 1851 "Thumbnail.c"
 	} else {
-#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 231 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_paint_empty (self);
-#line 1864 "Thumbnail.c"
+#line 1855 "Thumbnail.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 233 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	THUMBNAIL_VIEW_CLASS (thumbnail_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_THUMBNAIL_VIEW, ThumbnailView));
-#line 1868 "Thumbnail.c"
+#line 1859 "Thumbnail.c"
 }
 
 
@@ -1876,58 +1867,58 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con
 	const gchar* _tmp5_;
 	GValue* _tmp6_;
 	GValue _tmp7_;
-#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (name != NULL);
-#line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 236 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (val != NULL);
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = name;
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = _tmp0_;
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SIZE)) {
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		switch (0) {
-#line 1896 "Thumbnail.c"
+#line 1887 "Thumbnail.c"
 			default:
 			{
 				GValue _tmp4_;
-#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp4_ = *val;
-#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 239 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				thumbnail_resize (self, g_value_get_int (&_tmp4_));
-#line 245 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 240 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				break;
-#line 1906 "Thumbnail.c"
+#line 1897 "Thumbnail.c"
 			}
 		}
 	} else if (_tmp3_ == g_quark_from_string (THUMBNAIL_PROP_SHOW_RATINGS)) {
-#line 242 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 237 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		switch (0) {
-#line 1912 "Thumbnail.c"
+#line 1903 "Thumbnail.c"
 			default:
 			{
-#line 248 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 243 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				data_view_notify_view_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_VIEW, DataView));
-#line 249 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				break;
-#line 1919 "Thumbnail.c"
+#line 1910 "Thumbnail.c"
 			}
 		}
 	}
-#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = name;
-#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = old;
-#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = *val;
-#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 247 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	DATA_OBJECT_CLASS (thumbnail_parent_class)->notify_collection_property_set (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_DATA_OBJECT, DataObject), _tmp5_, _tmp6_, &_tmp7_);
-#line 1931 "Thumbnail.c"
+#line 1922 "Thumbnail.c"
 }
 
 
@@ -1944,150 +1935,150 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 	gint _tmp9_;
 	Dimensions _tmp10_ = {0};
 	gboolean _tmp11_;
-#line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 250 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = new_scale;
-#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = thumbnail_get_MIN_SCALE ();
-#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 251 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_vala_assert (_tmp0_ >= _tmp2_, "new_scale >= MIN_SCALE");
-#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = new_scale;
-#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp5_ = _tmp4_;
-#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 252 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_vala_assert (_tmp3_ <= _tmp5_, "new_scale <= MAX_SCALE");
-#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = self->priv->scale;
-#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = new_scale;
-#line 259 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 254 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		return;
-#line 1974 "Thumbnail.c"
+#line 1965 "Thumbnail.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = new_scale;
-#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 257 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->scale = _tmp8_;
-#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp9_ = self->priv->scale;
-#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	dimensions_get_scaled (&self->priv->original_dim, _tmp9_, TRUE, &_tmp10_);
-#line 263 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 258 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->dim = _tmp10_;
-#line 265 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 260 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_cancel_async_fetch (self);
-#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp11_ = self->priv->exposure;
-#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp11_) {
-#line 1992 "Thumbnail.c"
+#line 1983 "Thumbnail.c"
 		GdkPixbuf* resizable = NULL;
 		GdkPixbuf* _tmp12_;
 		GdkPixbuf* _tmp17_;
-#line 272 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		resizable = NULL;
-#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp12_ = self->priv->unscaled_pixbuf;
-#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 268 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp12_ != NULL) {
-#line 2002 "Thumbnail.c"
+#line 1993 "Thumbnail.c"
 			GdkPixbuf* _tmp13_;
 			GdkPixbuf* _tmp14_;
-#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp13_ = self->priv->unscaled_pixbuf;
-#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp14_ = _g_object_ref0 (_tmp13_);
-#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_g_object_unref0 (resizable);
-#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 269 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			resizable = _tmp14_;
-#line 2013 "Thumbnail.c"
+#line 2004 "Thumbnail.c"
 		} else {
 			gboolean _tmp15_;
-#line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp15_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 270 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			if (_tmp15_) {
-#line 2020 "Thumbnail.c"
+#line 2011 "Thumbnail.c"
 				GdkPixbuf* _tmp16_;
-#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_g_object_unref0 (resizable);
-#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 271 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				resizable = _tmp16_;
-#line 2028 "Thumbnail.c"
+#line 2019 "Thumbnail.c"
 			}
 		}
-#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp17_ = resizable;
-#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp17_ != NULL) {
-#line 2035 "Thumbnail.c"
+#line 2026 "Thumbnail.c"
 			GdkPixbuf* _tmp18_;
 			Dimensions _tmp19_;
 			GdkPixbuf* _tmp20_;
 			GdkPixbuf* _tmp21_;
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp18_ = resizable;
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp19_ = self->priv->dim;
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp20_ = resize_pixbuf (_tmp18_, &_tmp19_, THUMBNAIL_LOW_QUALITY_INTERP);
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp21_ = _tmp20_;
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp21_);
-#line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_g_object_unref0 (_tmp21_);
-#line 2052 "Thumbnail.c"
+#line 2043 "Thumbnail.c"
 		}
-#line 281 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_delayed_high_quality_fetch (self);
-#line 267 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 262 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (resizable);
-#line 2058 "Thumbnail.c"
+#line 2049 "Thumbnail.c"
 	} else {
 		Dimensions _tmp22_;
-#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp22_ = self->priv->dim;
-#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp22_);
-#line 2065 "Thumbnail.c"
+#line 2056 "Thumbnail.c"
 	}
 }
 
 
 static void thumbnail_paint_empty (Thumbnail* self) {
 	Dimensions _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 282 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_cancel_async_fetch (self);
-#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 284 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->dim;
-#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 284 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp0_);
-#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (self->priv->unscaled_pixbuf);
-#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 285 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->unscaled_pixbuf = NULL;
-#line 2084 "Thumbnail.c"
+#line 2075 "Thumbnail.c"
 }
 
 
 static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
-#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_on_low_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err);
-#line 2091 "Thumbnail.c"
+#line 2082 "Thumbnail.c"
 }
 
 
@@ -2096,63 +2087,63 @@ static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) {
 	MediaSource* _tmp1_;
 	Dimensions _tmp2_;
 	GCancellable* _tmp3_;
-#line 293 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 294 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 289 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_cancel_async_fetch (self);
-#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = g_cancellable_new ();
-#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 295 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 290 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->cancellable = _tmp0_;
-#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = self->priv->media;
-#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = self->priv->dim;
-#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 292 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_SMALLEST, &_tmp2_, THUMBNAIL_LOW_QUALITY_INTERP, _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp3_);
-#line 2118 "Thumbnail.c"
+#line 2109 "Thumbnail.c"
 }
 
 
 static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self) {
 	gboolean result;
 	result = thumbnail_on_schedule_high_quality ((Thumbnail*) self);
-#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2127 "Thumbnail.c"
+#line 2118 "Thumbnail.c"
 }
 
 
 static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) {
 	gboolean _tmp0_;
-#line 301 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 296 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->hq_scheduled;
-#line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 297 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_) {
-#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 298 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		self->priv->hq_reschedule = TRUE;
-#line 305 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 300 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		return;
-#line 2143 "Thumbnail.c"
+#line 2134 "Thumbnail.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 303 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) THUMBNAIL_HQ_IMPROVEMENT_MSEC, _thumbnail_on_schedule_high_quality_gsource_func, g_object_ref (self), g_object_unref);
-#line 309 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 304 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->hq_scheduled = TRUE;
-#line 2149 "Thumbnail.c"
+#line 2140 "Thumbnail.c"
 }
 
 
 static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_on_high_quality_fetched ((Thumbnail*) self, pixbuf, unscaled, dim, interp, err);
-#line 2156 "Thumbnail.c"
+#line 2147 "Thumbnail.c"
 }
 
 
@@ -2161,74 +2152,74 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 	gboolean _tmp0_;
 	GCancellable* _tmp1_;
 	gboolean _tmp2_;
-#line 312 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 307 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), FALSE);
-#line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->hq_reschedule;
-#line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 308 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_) {
-#line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 309 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		self->priv->hq_reschedule = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		result = TRUE;
-#line 316 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 311 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		return result;
-#line 2177 "Thumbnail.c"
+#line 2168 "Thumbnail.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 314 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_cancel_async_fetch (self);
-#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = g_cancellable_new ();
-#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 320 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 315 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->cancellable = _tmp1_;
-#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = self->priv->exposure;
-#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 317 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_) {
-#line 2191 "Thumbnail.c"
+#line 2182 "Thumbnail.c"
 		MediaSource* _tmp3_;
 		gint _tmp4_;
 		Dimensions _tmp5_;
 		GCancellable* _tmp6_;
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = self->priv->media;
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = self->priv->scale;
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = self->priv->dim;
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = self->priv->cancellable;
-#line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 318 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp4_, &_tmp5_, THUMBNAIL_HIGH_QUALITY_INTERP, _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callback, self, _tmp6_);
-#line 2206 "Thumbnail.c"
+#line 2197 "Thumbnail.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->hq_scheduled = FALSE;
-#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = FALSE;
-#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 324 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2214 "Thumbnail.c"
+#line 2205 "Thumbnail.c"
 }
 
 
 static void thumbnail_cancel_async_fetch (Thumbnail* self) {
 	GCancellable* _tmp0_;
-#line 332 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 327 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 329 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
-#line 2226 "Thumbnail.c"
+#line 2217 "Thumbnail.c"
 		GCancellable* _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
-#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 330 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 2232 "Thumbnail.c"
+#line 2223 "Thumbnail.c"
 	}
 }
 
@@ -2237,73 +2228,73 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 	GError* _tmp0_;
 	GdkPixbuf* _tmp6_;
 	GdkPixbuf* _tmp8_;
-#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
-#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail ((unscaled == NULL) || GDK_IS_PIXBUF (unscaled));
-#line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 333 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (dim != NULL);
-#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = err;
-#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
-#line 2253 "Thumbnail.c"
+#line 2244 "Thumbnail.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gint _tmp3_;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = _tmp1_;
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = self->priv->scale;
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = err;
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _tmp4_->message;
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-		g_critical ("Thumbnail.vala:341: Unable to fetch low-quality thumbnail for %s (scal" \
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+		g_critical ("Thumbnail.vala:336: Unable to fetch low-quality thumbnail for %s (scal" \
 "e: %d): %s", _tmp2_, _tmp3_, _tmp5_);
-#line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 336 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_free0 (_tmp2_);
-#line 2273 "Thumbnail.c"
+#line 2264 "Thumbnail.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = pixbuf;
-#line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 339 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
-#line 2279 "Thumbnail.c"
+#line 2270 "Thumbnail.c"
 		GdkPixbuf* _tmp7_;
-#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
-#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_);
-#line 2285 "Thumbnail.c"
+#line 2276 "Thumbnail.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = unscaled;
-#line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 342 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
-#line 2291 "Thumbnail.c"
+#line 2282 "Thumbnail.c"
 		GdkPixbuf* _tmp9_;
 		GdkPixbuf* _tmp10_;
-#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
-#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (self->priv->unscaled_pixbuf);
-#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 343 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		self->priv->unscaled_pixbuf = _tmp10_;
-#line 2302 "Thumbnail.c"
+#line 2293 "Thumbnail.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_delayed_high_quality_fetch (self);
-#line 2306 "Thumbnail.c"
+#line 2297 "Thumbnail.c"
 }
 
 
@@ -2311,69 +2302,69 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 	GError* _tmp0_;
 	GdkPixbuf* _tmp6_;
 	GdkPixbuf* _tmp8_;
-#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
-#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
-#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail ((unscaled == NULL) || GDK_IS_PIXBUF (unscaled));
-#line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (dim != NULL);
-#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = err;
-#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 350 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
-#line 2326 "Thumbnail.c"
+#line 2317 "Thumbnail.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gint _tmp3_;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = _tmp1_;
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = self->priv->scale;
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = err;
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _tmp4_->message;
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-		g_critical ("Thumbnail.vala:356: Unable to fetch high-quality thumbnail for %s (sca" \
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+		g_critical ("Thumbnail.vala:351: Unable to fetch high-quality thumbnail for %s (sca" \
 "le: %d): %s", _tmp2_, _tmp3_, _tmp5_);
-#line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 351 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_free0 (_tmp2_);
-#line 2346 "Thumbnail.c"
+#line 2337 "Thumbnail.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp6_ = pixbuf;
-#line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 354 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
-#line 2352 "Thumbnail.c"
+#line 2343 "Thumbnail.c"
 		GdkPixbuf* _tmp7_;
-#line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
-#line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp7_);
-#line 2358 "Thumbnail.c"
+#line 2349 "Thumbnail.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp8_ = unscaled;
-#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 357 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
-#line 2364 "Thumbnail.c"
+#line 2355 "Thumbnail.c"
 		GdkPixbuf* _tmp9_;
 		GdkPixbuf* _tmp10_;
-#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
-#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (self->priv->unscaled_pixbuf);
-#line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 358 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		self->priv->unscaled_pixbuf = _tmp10_;
-#line 2375 "Thumbnail.c"
+#line 2366 "Thumbnail.c"
 	}
 }
 
@@ -2381,41 +2372,41 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 static void thumbnail_real_exposed (CheckerboardItem* base) {
 	Thumbnail * self;
 	gboolean _tmp0_;
-#line 366 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 361 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->exposure = TRUE;
-#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 364 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (!_tmp0_) {
-#line 370 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 365 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		thumbnail_schedule_low_quality_fetch (self);
-#line 2393 "Thumbnail.c"
+#line 2384 "Thumbnail.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_update_title (self, FALSE);
-#line 373 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 368 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_update_comment (self, FALSE);
-#line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 369 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_update_tags (self, FALSE);
-#line 376 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 371 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 2403 "Thumbnail.c"
+#line 2394 "Thumbnail.c"
 }
 
 
 static void thumbnail_real_unexposed (CheckerboardItem* base) {
 	Thumbnail * self;
-#line 379 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 374 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 380 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 375 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->exposure = FALSE;
-#line 382 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 377 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	thumbnail_paint_empty (self);
-#line 384 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 379 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	CHECKERBOARD_ITEM_CLASS (thumbnail_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 2417 "Thumbnail.c"
+#line 2408 "Thumbnail.c"
 }
 
 
@@ -2428,67 +2419,67 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 	GdkPixbuf* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	Flaggable* _tmp4_;
-#line 387 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 382 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->media;
-#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL);
-#line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 383 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	flaggable = _tmp1_;
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = flaggable;
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != NULL) {
-#line 2442 "Thumbnail.c"
+#line 2433 "Thumbnail.c"
 		Flaggable* _tmp5_;
 		gboolean _tmp6_;
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = flaggable;
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = flaggable_is_flagged (_tmp5_);
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp6_;
-#line 2451 "Thumbnail.c"
+#line 2442 "Thumbnail.c"
 	} else {
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = FALSE;
-#line 2455 "Thumbnail.c"
+#line 2446 "Thumbnail.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_) {
-#line 2459 "Thumbnail.c"
+#line 2450 "Thumbnail.c"
 		GdkPixbuf* _tmp7_;
-#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = _tmp7_;
-#line 2467 "Thumbnail.c"
+#line 2458 "Thumbnail.c"
 	} else {
-#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 386 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = NULL;
-#line 2473 "Thumbnail.c"
+#line 2464 "Thumbnail.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp2_;
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_g_object_unref0 (flaggable);
-#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 385 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2481 "Thumbnail.c"
+#line 2472 "Thumbnail.c"
 }
 
 
 static void _vala_GValue_free (GValue* self) {
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_value_unset (self);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_free (self);
-#line 2490 "Thumbnail.c"
+#line 2481 "Thumbnail.c"
 }
 
 
@@ -2505,73 +2496,73 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 	GdkPixbuf* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	Rating _tmp7_;
-#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 389 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
-#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = self->priv->media;
-#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp1_ = media_source_get_rating (_tmp0_);
-#line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	rating = _tmp1_;
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = g_new0 (GValue, 1);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_value_init (_tmp2_, G_TYPE_BOOLEAN);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_value_set_boolean (_tmp2_, FALSE);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	data_object_get_collection_property (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), THUMBNAIL_PROP_SHOW_RATINGS, _tmp2_, &_tmp3_);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp4_ = g_value_get_boolean (&_tmp3_);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	__vala_GValue_free0 (_tmp2_);
-#line 396 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	show_ratings = _tmp4_;
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp7_ = rating;
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != RATING_UNRATED) {
-#line 2533 "Thumbnail.c"
+#line 2524 "Thumbnail.c"
 		gboolean _tmp8_;
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = show_ratings;
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp8_;
-#line 2539 "Thumbnail.c"
+#line 2530 "Thumbnail.c"
 	} else {
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = FALSE;
-#line 2543 "Thumbnail.c"
+#line 2534 "Thumbnail.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_) {
-#line 2547 "Thumbnail.c"
+#line 2538 "Thumbnail.c"
 		Rating _tmp9_;
 		gint _tmp10_;
 		GdkPixbuf* _tmp11_;
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = rating;
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = scale;
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = resources_get_rating_trinket (_tmp9_, _tmp10_);
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (_tmp5_);
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _tmp11_;
-#line 2561 "Thumbnail.c"
+#line 2552 "Thumbnail.c"
 	} else {
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_g_object_unref0 (_tmp5_);
-#line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = NULL;
-#line 2567 "Thumbnail.c"
+#line 2558 "Thumbnail.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	result = _tmp5_;
-#line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
+#line 393 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2573 "Thumbnail.c"
+#line 2564 "Thumbnail.c"
 }
 
 
@@ -2581,7 +2572,7 @@ gint thumbnail_get_MIN_SCALE (void) {
 	result = 72;
 #line 18 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2583 "Thumbnail.c"
+#line 2574 "Thumbnail.c"
 }
 
 
@@ -2594,7 +2585,7 @@ gint thumbnail_get_MAX_SCALE (void) {
 	result = _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2596 "Thumbnail.c"
+#line 2587 "Thumbnail.c"
 }
 
 
@@ -2607,7 +2598,7 @@ gint thumbnail_get_DEFAULT_SCALE (void) {
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	return result;
-#line 2609 "Thumbnail.c"
+#line 2600 "Thumbnail.c"
 }
 
 
@@ -2634,7 +2625,7 @@ static void thumbnail_class_init (ThumbnailClass * klass) {
 	G_OBJECT_CLASS (klass)->get_property = _vala_thumbnail_get_property;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	G_OBJECT_CLASS (klass)->finalize = thumbnail_finalize;
-#line 2636 "Thumbnail.c"
+#line 2627 "Thumbnail.c"
 }
 
 
@@ -2651,7 +2642,7 @@ static void thumbnail_instance_init (Thumbnail * self) {
 	self->priv->hq_reschedule = FALSE;
 #line 47 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self->priv->exposure = FALSE;
-#line 2653 "Thumbnail.c"
+#line 2644 "Thumbnail.c"
 }
 
 
@@ -2668,13 +2659,13 @@ static void thumbnail_finalize (GObject * obj) {
 	_tmp0_ = self->priv->cancellable;
 #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
-#line 2670 "Thumbnail.c"
+#line 2661 "Thumbnail.c"
 		GCancellable* _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 2676 "Thumbnail.c"
+#line 2667 "Thumbnail.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp2_ = tag_global;
@@ -2696,7 +2687,7 @@ static void thumbnail_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->cancellable);
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	G_OBJECT_CLASS (thumbnail_parent_class)->finalize (obj);
-#line 2698 "Thumbnail.c"
+#line 2689 "Thumbnail.c"
 }
 
 
@@ -2717,13 +2708,13 @@ static void _vala_thumbnail_get_property (GObject * object, guint property_id, G
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_THUMBNAIL, Thumbnail);
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	switch (property_id) {
-#line 2719 "Thumbnail.c"
+#line 2710 "Thumbnail.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		break;
-#line 2725 "Thumbnail.c"
+#line 2716 "Thumbnail.c"
 	}
 }
 
diff --git a/src/Thumbnail.vala b/src/Thumbnail.vala
index 2fe28e8..17dda4b 100644
--- a/src/Thumbnail.vala
+++ b/src/Thumbnail.vala
@@ -119,8 +119,6 @@ public class Thumbnail : MediaSourceItem {
             clear_title();
         else if (!init)
             set_title(title);
-        else
-            set_title("");
     }
     
     private void update_comment(bool init = false) {
@@ -129,8 +127,6 @@ public class Thumbnail : MediaSourceItem {
             clear_comment();
         else if (!init)
             set_comment(comment);
-        else
-            set_comment("");
     }
 
     protected override void notify_altered(Alteration alteration) {
@@ -198,12 +194,11 @@ public class Thumbnail : MediaSourceItem {
     public static int64 filename_ascending_comparator(void *a, void *b) {
         string path_a = ((Thumbnail *) a)->media.get_file().get_basename().down();
         string path_b = ((Thumbnail *) b)->media.get_file().get_basename().down();
-        
-        int64 result = strcmp(g_utf8_collate_key_for_filename(path_a), 
-            g_utf8_collate_key_for_filename(path_b));
+
+        int64 result = strcmp(path_a.collate_key_for_filename(), path_b.collate_key_for_filename());
         return (result != 0) ? result : photo_id_ascending_comparator(a, b);
     }
-    
+
     public static int64 filename_descending_comparator(void *a, void *b) {
         int64 result = filename_ascending_comparator(b, a);
         
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 5ef8ed9..1d4933c 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1805 "ThumbnailCache.c"
-			goto __catch237_g_error;
+			goto __catch248_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 __finally237;
-	__catch237_g_error:
+	goto __finally248;
+	__catch248_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 __finally237;
+			goto __finally248;
 		}
 #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"
 	}
-	__finally237:
+	__finally248:
 #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 __catch238_g_error;
+				goto __catch249_g_error;
 			}
 		}
-		goto __finally238;
-		__catch238_g_error:
+		goto __finally249;
+		__catch249_g_error:
 		{
 			GError* err = NULL;
 			ThumbnailCacheAsyncFetchJob* _tmp14_;
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			_g_error_free0 (err);
 #line 2420 "ThumbnailCache.c"
 		}
-		__finally238:
+		__finally249:
 #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 __catch239_g_error;
+			goto __catch250_g_error;
 		}
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 		_g_error_free0 (err);
 #line 2804 "ThumbnailCache.c"
 	}
-	__finally239:
+	__finally250:
 #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 __catch240_g_error;
+			goto __catch251_g_error;
 		}
 	}
-	goto __finally240;
-	__catch240_g_error:
+	goto __finally251;
+	__catch251_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"
 	}
-	__finally240:
+	__finally251:
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4069,7 +4069,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 4071 "ThumbnailCache.c"
-				goto __catch241_g_error;
+				goto __catch252_g_error;
 			}
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp6_ = _tmp1_;
@@ -4138,8 +4138,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp8_);
 #line 4139 "ThumbnailCache.c"
 	}
-	goto __finally241;
-	__catch241_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp17_;
@@ -4158,11 +4158,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 4160 "ThumbnailCache.c"
-					goto __catch242_g_error;
+					goto __catch253_g_error;
 				}
 			}
-			goto __finally242;
-			__catch242_g_error:
+			goto __finally253;
+			__catch253_g_error:
 			{
 				GError* generr = NULL;
 				GError* _tmp18_;
@@ -4183,7 +4183,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				_g_error_free0 (generr);
 #line 4184 "ThumbnailCache.c"
 			}
-			__finally242:
+			__finally253:
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4215,7 +4215,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4216 "ThumbnailCache.c"
 	}
-	__finally241:
+	__finally252:
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
diff --git a/src/Tombstone.c b/src/Tombstone.c
index 7c57055..0f09e21 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1323,7 +1323,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 1326 "Tombstone.c"
-				goto __catch548_database_error;
+				goto __catch557_database_error;
 			}
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (marker);
@@ -1336,8 +1336,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 1337 "Tombstone.c"
 		}
 	}
-	goto __finally548;
-	__catch548_database_error:
+	goto __finally557;
+	__catch557_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_;
@@ -1353,7 +1353,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		_g_error_free0 (err);
 #line 1355 "Tombstone.c"
 	}
-	__finally548:
+	__finally557:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1628,7 +1628,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 1631 "Tombstone.c"
-						goto __catch549_g_error;
+						goto __catch558_g_error;
 					}
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp22_ = _data_->_tmp18_;
@@ -1642,8 +1642,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_object_unref0 (_data_->_tmp18_);
 #line 1644 "Tombstone.c"
 				}
-				goto __finally549;
-				__catch549_g_error:
+				goto __finally558;
+				__catch558_g_error:
 				{
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->err = _data_->_inner_error_;
@@ -1692,7 +1692,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_error_free0 (_data_->err);
 #line 1693 "Tombstone.c"
 				}
-				__finally549:
+				__finally558:
 #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"
@@ -1780,7 +1780,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 1782 "Tombstone.c"
-					goto __catch550_database_error;
+					goto __catch559_database_error;
 				}
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->marker);
@@ -1795,8 +1795,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 1795 "Tombstone.c"
 			}
 		}
-		goto __finally550;
-		__catch550_database_error:
+		goto __finally559;
+		__catch559_database_error:
 		{
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->err2 = _data_->_inner_error_;
@@ -1810,7 +1810,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_g_error_free0 (_data_->err2);
 #line 1811 "Tombstone.c"
 		}
-		__finally550:
+		__finally559:
 #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"
@@ -2339,7 +2339,7 @@ void tombstone_init (void) {
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 2341 "Tombstone.c"
-				goto __catch551_database_error;
+				goto __catch560_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2371,8 +2371,8 @@ void tombstone_init (void) {
 		_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
 #line 2372 "Tombstone.c"
 	}
-	goto __finally551;
-	__catch551_database_error:
+	goto __finally560;
+	__catch560_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_;
@@ -2388,7 +2388,7 @@ void tombstone_init (void) {
 		_g_error_free0 (err);
 #line 2389 "Tombstone.c"
 	}
-	__finally551:
+	__finally560:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3175,7 +3175,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3177 "Tombstone.c"
-				goto __catch552_database_error;
+				goto __catch561_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);
@@ -3186,8 +3186,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 3186 "Tombstone.c"
 		}
 	}
-	goto __finally552;
-	__catch552_database_error:
+	goto __finally561;
+	__catch561_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -3203,7 +3203,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		_g_error_free0 (err);
 #line 3204 "Tombstone.c"
 	}
-	__finally552:
+	__finally561:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3422,7 +3422,7 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3424 "Tombstone.c"
-				goto __catch553_database_error;
+				goto __catch562_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);
@@ -3433,8 +3433,8 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 3433 "Tombstone.c"
 		}
 	}
-	goto __finally553;
-	__catch553_database_error:
+	goto __finally562;
+	__catch562_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -3450,7 +3450,7 @@ static void tombstone_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 3451 "Tombstone.c"
 	}
-	__finally553:
+	__finally562:
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
diff --git a/src/Upgrades.c b/src/Upgrades.c
index 80ae01f..0c4acc4 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "shotwell-graphics-processor.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -129,16 +130,6 @@ typedef struct _EventID EventID;
 
 #define TYPE_ORIENTATION (orientation_get_type ())
 
-#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
-#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
-#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
-#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
-#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-
-typedef struct _KeyValueMap KeyValueMap;
-typedef struct _KeyValueMapClass KeyValueMapClass;
-
 #define TYPE_RATING (rating_get_type ())
 
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
@@ -533,13 +524,6 @@ GType event_id_get_type (void) G_GNUC_CONST;
 EventID* event_id_dup (const EventID* self);
 void event_id_free (EventID* self);
 GType orientation_get_type (void) G_GNUC_CONST;
-gpointer key_value_map_ref (gpointer instance);
-void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
-gpointer value_get_key_value_map (const GValue* value);
-GType key_value_map_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
@@ -602,7 +586,7 @@ static Upgrades* upgrades_construct (GType object_type) {
 	_application_unref0 (_tmp3_);
 #line 19 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (_tmp5_) {
-#line 606 "Upgrades.c"
+#line 590 "Upgrades.c"
 		FixupRawThumbnailsTask* _tmp6_;
 		FixupRawThumbnailsTask* _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -613,18 +597,18 @@ static Upgrades* upgrades_construct (GType object_type) {
 		upgrades_add (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_UPGRADE_TASK, UpgradeTask));
 #line 20 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_tmp7_);
-#line 617 "Upgrades.c"
+#line 601 "Upgrades.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 621 "Upgrades.c"
+#line 605 "Upgrades.c"
 }
 
 
 static Upgrades* upgrades_new (void) {
 #line 15 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return upgrades_construct (TYPE_UPGRADES);
-#line 628 "Upgrades.c"
+#line 612 "Upgrades.c"
 }
 
 
@@ -641,14 +625,14 @@ void upgrades_init (void) {
 	_upgrades_unref0 (upgrades_instance);
 #line 26 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	upgrades_instance = _tmp1_;
-#line 645 "Upgrades.c"
+#line 629 "Upgrades.c"
 }
 
 
 static gpointer _upgrades_ref0 (gpointer self) {
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self ? upgrades_ref (self) : NULL;
-#line 652 "Upgrades.c"
+#line 636 "Upgrades.c"
 }
 
 
@@ -664,7 +648,7 @@ Upgrades* upgrades_get_instance (void) {
 	result = _tmp1_;
 #line 30 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 668 "Upgrades.c"
+#line 652 "Upgrades.c"
 }
 
 
@@ -679,21 +663,21 @@ guint64 upgrades_get_step_count (Upgrades* self) {
 	result = _tmp0_;
 #line 35 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 683 "Upgrades.c"
+#line 667 "Upgrades.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 690 "Upgrades.c"
+#line 674 "Upgrades.c"
 }
 
 
 void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_target) {
 #line 39 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_return_if_fail (IS_UPGRADES (self));
-#line 697 "Upgrades.c"
+#line 681 "Upgrades.c"
 	{
 		GeeLinkedList* _task_list = NULL;
 		GeeLinkedList* _tmp0_;
@@ -721,7 +705,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 		_task_index = -1;
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 725 "Upgrades.c"
+#line 709 "Upgrades.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -744,7 +728,7 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 			if (!(_tmp6_ < _tmp7_)) {
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 748 "Upgrades.c"
+#line 732 "Upgrades.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp8_ = _task_list;
@@ -764,11 +748,11 @@ void upgrades_execute (Upgrades* self, ProgressMonitor monitor, void* monitor_ta
 			upgrade_task_execute (_tmp11_, _tmp12_, _tmp12__target);
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_g_object_unref0 (task);
-#line 768 "Upgrades.c"
+#line 752 "Upgrades.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_task_list);
-#line 772 "Upgrades.c"
+#line 756 "Upgrades.c"
 	}
 }
 
@@ -797,14 +781,14 @@ static void upgrades_add (Upgrades* self, UpgradeTask* task) {
 	_tmp4_ = task;
 #line 46 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 801 "Upgrades.c"
+#line 785 "Upgrades.c"
 }
 
 
 static void value_upgrades_init (GValue* value) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	value->data[0].v_pointer = NULL;
-#line 808 "Upgrades.c"
+#line 792 "Upgrades.c"
 }
 
 
@@ -813,7 +797,7 @@ static void value_upgrades_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		upgrades_unref (value->data[0].v_pointer);
-#line 817 "Upgrades.c"
+#line 801 "Upgrades.c"
 	}
 }
 
@@ -823,11 +807,11 @@ static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		dest_value->data[0].v_pointer = upgrades_ref (src_value->data[0].v_pointer);
-#line 827 "Upgrades.c"
+#line 811 "Upgrades.c"
 	} else {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 831 "Upgrades.c"
+#line 815 "Upgrades.c"
 	}
 }
 
@@ -835,37 +819,37 @@ static void value_upgrades_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_upgrades_peek_pointer (const GValue* value) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return value->data[0].v_pointer;
-#line 839 "Upgrades.c"
+#line 823 "Upgrades.c"
 }
 
 
 static gchar* value_upgrades_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (collect_values[0].v_pointer) {
-#line 846 "Upgrades.c"
+#line 830 "Upgrades.c"
 		Upgrades * object;
 		object = collect_values[0].v_pointer;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 853 "Upgrades.c"
+#line 837 "Upgrades.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.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 857 "Upgrades.c"
+#line 841 "Upgrades.c"
 		}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		value->data[0].v_pointer = upgrades_ref (object);
-#line 861 "Upgrades.c"
+#line 845 "Upgrades.c"
 	} else {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		value->data[0].v_pointer = NULL;
-#line 865 "Upgrades.c"
+#line 849 "Upgrades.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return NULL;
-#line 869 "Upgrades.c"
+#line 853 "Upgrades.c"
 }
 
 
@@ -876,25 +860,25 @@ static gchar* value_upgrades_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 880 "Upgrades.c"
+#line 864 "Upgrades.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (!value->data[0].v_pointer) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		*object_p = NULL;
-#line 886 "Upgrades.c"
+#line 870 "Upgrades.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		*object_p = value->data[0].v_pointer;
-#line 890 "Upgrades.c"
+#line 874 "Upgrades.c"
 	} else {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		*object_p = upgrades_ref (value->data[0].v_pointer);
-#line 894 "Upgrades.c"
+#line 878 "Upgrades.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return NULL;
-#line 898 "Upgrades.c"
+#line 882 "Upgrades.c"
 }
 
 
@@ -908,7 +892,7 @@ GParamSpec* param_spec_upgrades (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return G_PARAM_SPEC (spec);
-#line 912 "Upgrades.c"
+#line 896 "Upgrades.c"
 }
 
 
@@ -917,7 +901,7 @@ gpointer value_get_upgrades (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_UPGRADES), NULL);
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return value->data[0].v_pointer;
-#line 921 "Upgrades.c"
+#line 905 "Upgrades.c"
 }
 
 
@@ -937,17 +921,17 @@ void value_set_upgrades (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		upgrades_ref (value->data[0].v_pointer);
-#line 941 "Upgrades.c"
+#line 925 "Upgrades.c"
 	} else {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		value->data[0].v_pointer = NULL;
-#line 945 "Upgrades.c"
+#line 929 "Upgrades.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (old) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		upgrades_unref (old);
-#line 951 "Upgrades.c"
+#line 935 "Upgrades.c"
 	}
 }
 
@@ -966,17 +950,17 @@ void value_take_upgrades (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		value->data[0].v_pointer = v_object;
-#line 970 "Upgrades.c"
+#line 954 "Upgrades.c"
 	} else {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		value->data[0].v_pointer = NULL;
-#line 974 "Upgrades.c"
+#line 958 "Upgrades.c"
 	}
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (old) {
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		upgrades_unref (old);
-#line 980 "Upgrades.c"
+#line 964 "Upgrades.c"
 	}
 }
 
@@ -988,7 +972,7 @@ static void upgrades_class_init (UpgradesClass * klass) {
 	((UpgradesClass *) klass)->finalize = upgrades_finalize;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_type_class_add_private (klass, sizeof (UpgradesPrivate));
-#line 992 "Upgrades.c"
+#line 976 "Upgrades.c"
 }
 
 
@@ -1004,7 +988,7 @@ static void upgrades_instance_init (Upgrades * self) {
 	self->priv->task_list = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->ref_count = 1;
-#line 1008 "Upgrades.c"
+#line 992 "Upgrades.c"
 }
 
 
@@ -1016,7 +1000,7 @@ static void upgrades_finalize (Upgrades * obj) {
 	g_signal_handlers_destroy (self);
 #line 13 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_g_object_unref0 (self->priv->task_list);
-#line 1020 "Upgrades.c"
+#line 1004 "Upgrades.c"
 }
 
 
@@ -1041,7 +1025,7 @@ gpointer upgrades_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return instance;
-#line 1045 "Upgrades.c"
+#line 1029 "Upgrades.c"
 }
 
 
@@ -1054,7 +1038,7 @@ void upgrades_unref (gpointer instance) {
 		UPGRADES_GET_CLASS (self)->finalize (self);
 #line 10 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1058 "Upgrades.c"
+#line 1042 "Upgrades.c"
 	}
 }
 
@@ -1064,7 +1048,7 @@ guint64 upgrade_task_get_step_count (UpgradeTask* self) {
 	g_return_val_if_fail (IS_UPGRADE_TASK (self), 0ULL);
 #line 55 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return UPGRADE_TASK_GET_INTERFACE (self)->get_step_count (self);
-#line 1068 "Upgrades.c"
+#line 1052 "Upgrades.c"
 }
 
 
@@ -1073,7 +1057,7 @@ void upgrade_task_execute (UpgradeTask* self, ProgressMonitor monitor, void* mon
 	g_return_if_fail (IS_UPGRADE_TASK (self));
 #line 60 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	UPGRADE_TASK_GET_INTERFACE (self)->execute (self, monitor, monitor_target);
-#line 1077 "Upgrades.c"
+#line 1061 "Upgrades.c"
 }
 
 
@@ -1084,7 +1068,7 @@ static void upgrade_task_base_init (UpgradeTaskIface * iface) {
 	if (!initialized) {
 #line 53 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		initialized = TRUE;
-#line 1088 "Upgrades.c"
+#line 1072 "Upgrades.c"
 	}
 }
 
@@ -1109,7 +1093,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	GError * _inner_error_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
-#line 1113 "Upgrades.c"
+#line 1097 "Upgrades.c"
 	{
 		guint64 _tmp0_ = 0ULL;
 		GFile* _tmp1_;
@@ -1122,15 +1106,15 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_tmp0_ = _tmp2_;
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1126 "Upgrades.c"
-			goto __catch595_g_error;
+#line 1110 "Upgrades.c"
+			goto __catch604_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
-#line 1131 "Upgrades.c"
+#line 1115 "Upgrades.c"
 	}
-	goto __finally595;
-	__catch595_g_error:
+	goto __finally604;
+	__catch604_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_;
@@ -1147,12 +1131,12 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		g_debug ("Upgrades.vala:75: Error on deleting mimics: %s", _tmp4_);
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_error_free0 (e);
-#line 1151 "Upgrades.c"
+#line 1135 "Upgrades.c"
 	}
-	__finally595:
+	__finally604:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1156 "Upgrades.c"
+#line 1140 "Upgrades.c"
 		guint64 _tmp5_ = 0ULL;
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1160,7 +1144,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		g_clear_error (&_inner_error_);
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		return _tmp5_;
-#line 1164 "Upgrades.c"
+#line 1148 "Upgrades.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	_tmp6_ = self->priv->num_mimics;
@@ -1168,7 +1152,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 	result = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1172 "Upgrades.c"
+#line 1156 "Upgrades.c"
 }
 
 
@@ -1177,7 +1161,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 	GError * _inner_error_ = NULL;
 #line 80 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MIMICS_REMOVAL_TASK, MimicsRemovalTask);
-#line 1181 "Upgrades.c"
+#line 1165 "Upgrades.c"
 	{
 		GFile* _tmp0_;
 		ProgressMonitor _tmp1_;
@@ -1196,8 +1180,8 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		delete_all_files (_tmp0_, NULL, _tmp1_, _tmp1__target, _tmp2_, NULL, &_inner_error_);
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1200 "Upgrades.c"
-			goto __catch596_g_error;
+#line 1184 "Upgrades.c"
+			goto __catch605_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1205,12 +1189,12 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_file_delete (_tmp3_, NULL, &_inner_error_);
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1209 "Upgrades.c"
-			goto __catch596_g_error;
+#line 1193 "Upgrades.c"
+			goto __catch605_g_error;
 		}
 	}
-	goto __finally596;
-	__catch596_g_error:
+	goto __finally605;
+	__catch605_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_;
@@ -1227,9 +1211,9 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_debug ("Upgrades.vala:85: Could not delete mimics: %s", _tmp5_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_error_free0 (e);
-#line 1231 "Upgrades.c"
+#line 1215 "Upgrades.c"
 	}
-	__finally596:
+	__finally605:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1238,7 +1222,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		g_clear_error (&_inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		return;
-#line 1242 "Upgrades.c"
+#line 1226 "Upgrades.c"
 	}
 }
 
@@ -1249,14 +1233,14 @@ MimicsRemovalTask* mimics_removal_task_construct (GType object_type) {
 	self = (MimicsRemovalTask*) g_object_new (object_type, NULL);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1253 "Upgrades.c"
+#line 1237 "Upgrades.c"
 }
 
 
 MimicsRemovalTask* mimics_removal_task_new (void) {
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return mimics_removal_task_construct (TYPE_MIMICS_REMOVAL_TASK);
-#line 1260 "Upgrades.c"
+#line 1244 "Upgrades.c"
 }
 
 
@@ -1267,7 +1251,7 @@ static void mimics_removal_task_class_init (MimicsRemovalTaskClass * klass) {
 	g_type_class_add_private (klass, sizeof (MimicsRemovalTaskPrivate));
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (klass)->finalize = mimics_removal_task_finalize;
-#line 1271 "Upgrades.c"
+#line 1255 "Upgrades.c"
 }
 
 
@@ -1278,7 +1262,7 @@ static void mimics_removal_task_upgrade_task_interface_init (UpgradeTaskIface *
 	iface->get_step_count = (guint64 (*) (UpgradeTask *)) mimics_removal_task_real_get_step_count;
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) mimics_removal_task_real_execute;
-#line 1282 "Upgrades.c"
+#line 1266 "Upgrades.c"
 }
 
 
@@ -1300,7 +1284,7 @@ static void mimics_removal_task_instance_init (MimicsRemovalTask * self) {
 	_g_object_unref0 (_tmp1_);
 #line 69 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	self->priv->num_mimics = (guint64) 0;
-#line 1304 "Upgrades.c"
+#line 1288 "Upgrades.c"
 }
 
 
@@ -1312,7 +1296,7 @@ static void mimics_removal_task_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->mimic_dir);
 #line 66 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	G_OBJECT_CLASS (mimics_removal_task_parent_class)->finalize (obj);
-#line 1316 "Upgrades.c"
+#line 1300 "Upgrades.c"
 }
 
 
@@ -1338,7 +1322,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 95 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	num_raw_files = 0;
-#line 1342 "Upgrades.c"
+#line 1326 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_;
@@ -1374,7 +1358,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 		_phr_index = -1;
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1378 "Upgrades.c"
+#line 1362 "Upgrades.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -1397,7 +1381,7 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			if (!(_tmp8_ < _tmp9_)) {
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1401 "Upgrades.c"
+#line 1385 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1415,27 +1399,27 @@ static guint64 fixup_raw_thumbnails_task_real_get_step_count (UpgradeTask* base)
 			_tmp15_ = _tmp14_->file_format;
 #line 98 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp15_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1419 "Upgrades.c"
+#line 1403 "Upgrades.c"
 				gint _tmp16_;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp16_ = num_raw_files;
 #line 99 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				num_raw_files = _tmp16_ + 1;
-#line 1425 "Upgrades.c"
+#line 1409 "Upgrades.c"
 			}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1429 "Upgrades.c"
+#line 1413 "Upgrades.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1433 "Upgrades.c"
+#line 1417 "Upgrades.c"
 	}
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	result = (guint64) num_raw_files;
 #line 101 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return result;
-#line 1439 "Upgrades.c"
+#line 1423 "Upgrades.c"
 }
 
 
@@ -1445,7 +1429,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FIXUP_RAW_THUMBNAILS_TASK, FixupRawThumbnailsTask);
 #line 105 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	g_debug ("Upgrades.vala:105: Executing thumbnail deletion and fixup");
-#line 1449 "Upgrades.c"
+#line 1433 "Upgrades.c"
 	{
 		GeeArrayList* _phr_list = NULL;
 		PhotoTable* _tmp0_;
@@ -1481,7 +1465,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 		_phr_index = -1;
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		while (TRUE) {
-#line 1485 "Upgrades.c"
+#line 1469 "Upgrades.c"
 			gint _tmp7_;
 			gint _tmp8_;
 			gint _tmp9_;
@@ -1505,7 +1489,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			if (!(_tmp8_ < _tmp9_)) {
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				break;
-#line 1509 "Upgrades.c"
+#line 1493 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_tmp10_ = _phr_list;
@@ -1523,7 +1507,7 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 			_tmp16_ = _tmp15_->file_format;
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp16_ == PHOTO_FILE_FORMAT_RAW) {
-#line 1527 "Upgrades.c"
+#line 1511 "Upgrades.c"
 				PhotoRow* _tmp17_;
 				RawDeveloper _tmp18_;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1532,15 +1516,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				_tmp18_ = _tmp17_->developer;
 #line 109 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = _tmp18_ == RAW_DEVELOPER_CAMERA;
-#line 1536 "Upgrades.c"
+#line 1520 "Upgrades.c"
 			} else {
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_tmp13_ = FALSE;
-#line 1540 "Upgrades.c"
+#line 1524 "Upgrades.c"
 			}
 #line 108 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			if (_tmp13_) {
-#line 1544 "Upgrades.c"
+#line 1528 "Upgrades.c"
 				LibraryPhotoSourceCollection* _tmp19_;
 				PhotoRow* _tmp20_;
 				PhotoID _tmp21_;
@@ -1560,15 +1544,15 @@ static void fixup_raw_thumbnails_task_real_execute (UpgradeTask* base, ProgressM
 				thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
 #line 110 "/home/jens/Source/shotwell/src/Upgrades.vala"
 				_g_object_unref0 (_tmp23_);
-#line 1564 "Upgrades.c"
+#line 1548 "Upgrades.c"
 			}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 			_photo_row_unref0 (phr);
-#line 1568 "Upgrades.c"
+#line 1552 "Upgrades.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_g_object_unref0 (_phr_list);
-#line 1572 "Upgrades.c"
+#line 1556 "Upgrades.c"
 	}
 }
 
@@ -1579,21 +1563,21 @@ FixupRawThumbnailsTask* fixup_raw_thumbnails_task_construct (GType object_type)
 	self = (FixupRawThumbnailsTask*) g_object_new (object_type, NULL);
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return self;
-#line 1583 "Upgrades.c"
+#line 1567 "Upgrades.c"
 }
 
 
 FixupRawThumbnailsTask* fixup_raw_thumbnails_task_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	return fixup_raw_thumbnails_task_construct (TYPE_FIXUP_RAW_THUMBNAILS_TASK);
-#line 1590 "Upgrades.c"
+#line 1574 "Upgrades.c"
 }
 
 
 static void fixup_raw_thumbnails_task_class_init (FixupRawThumbnailsTaskClass * klass) {
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	fixup_raw_thumbnails_task_parent_class = g_type_class_peek_parent (klass);
-#line 1597 "Upgrades.c"
+#line 1581 "Upgrades.c"
 }
 
 
@@ -1604,7 +1588,7 @@ static void fixup_raw_thumbnails_task_upgrade_task_interface_init (UpgradeTaskIf
 	iface->get_step_count = (guint64 (*) (UpgradeTask *)) fixup_raw_thumbnails_task_real_get_step_count;
 #line 93 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	iface->execute = (void (*) (UpgradeTask *, ProgressMonitor, void*)) fixup_raw_thumbnails_task_real_execute;
-#line 1608 "Upgrades.c"
+#line 1592 "Upgrades.c"
 }
 
 
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index c914694..dbdd25c 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 749 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch586_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 __catch577_g_error;
+			goto __catch586_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 __catch577_g_error;
+					goto __catch586_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 __catch577_g_error;
+					goto __catch586_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 __finally577;
-	__catch577_g_error:
+	goto __finally586;
+	__catch586_g_error:
 	{
 		GError* e = NULL;
 		GFile* _tmp16_;
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally586:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 871 "VideoMetadata.c"
@@ -889,11 +889,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 891 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch587_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally587;
+	__catch587_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp23_;
@@ -912,7 +912,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 913 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally587:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 918 "VideoMetadata.c"
@@ -967,7 +967,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 969 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch588_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
@@ -998,7 +998,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 1000 "VideoMetadata.c"
-				goto __catch579_g_error;
+				goto __catch588_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1062,7 +1062,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 1064 "VideoMetadata.c"
-						goto __catch579_g_error;
+						goto __catch588_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1118,7 +1118,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 1120 "VideoMetadata.c"
-							goto __catch579_g_error;
+							goto __catch588_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1131,7 +1131,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 1133 "VideoMetadata.c"
-							goto __catch579_g_error;
+							goto __catch588_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1150,7 +1150,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 1152 "VideoMetadata.c"
-						goto __catch579_g_error;
+						goto __catch588_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1164,12 +1164,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 1166 "VideoMetadata.c"
-				goto __catch579_g_error;
+				goto __catch588_g_error;
 			}
 		}
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally588;
+	__catch588_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp30_;
@@ -1188,7 +1188,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1189 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally588:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1194 "VideoMetadata.c"
@@ -1212,11 +1212,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 1214 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch589_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally589;
+	__catch589_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp34_;
@@ -1235,7 +1235,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1236 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally589:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1241 "VideoMetadata.c"
@@ -2616,7 +2616,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 2618 "VideoMetadata.c"
-			goto __catch581_g_error;
+			goto __catch590_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2625,7 +2625,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 2627 "VideoMetadata.c"
-			goto __catch581_g_error;
+			goto __catch590_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2652,7 +2652,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 2654 "VideoMetadata.c"
-				goto __catch581_g_error;
+				goto __catch590_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp4_ = g_strcmp0 ("AVI ", _tmp9_) == 0;
@@ -2671,8 +2671,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 2671 "VideoMetadata.c"
 		}
 	}
-	goto __finally581;
-	__catch581_g_error:
+	goto __finally590;
+	__catch590_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_;
@@ -2691,7 +2691,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2692 "VideoMetadata.c"
 	}
-	__finally581:
+	__finally590:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2697 "VideoMetadata.c"
@@ -2715,11 +2715,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 2717 "VideoMetadata.c"
-			goto __catch582_g_error;
+			goto __catch591_g_error;
 		}
 	}
-	goto __finally582;
-	__catch582_g_error:
+	goto __finally591;
+	__catch591_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp16_;
@@ -2738,7 +2738,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2739 "VideoMetadata.c"
 	}
-	__finally582:
+	__finally591:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2744 "VideoMetadata.c"
@@ -4081,7 +4081,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 4083 "VideoMetadata.c"
-			goto __catch583_g_error;
+			goto __catch592_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4090,7 +4090,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 4092 "VideoMetadata.c"
-			goto __catch583_g_error;
+			goto __catch592_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4101,7 +4101,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 4103 "VideoMetadata.c"
-			goto __catch583_g_error;
+			goto __catch592_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
@@ -4130,8 +4130,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_free0 (sdate);
 #line 4131 "VideoMetadata.c"
 	}
-	goto __finally583;
-	__catch583_g_error:
+	goto __finally592;
+	__catch592_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp11_;
@@ -4150,7 +4150,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4151 "VideoMetadata.c"
 	}
-	__finally583:
+	__finally592:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4156 "VideoMetadata.c"
@@ -4174,11 +4174,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 4176 "VideoMetadata.c"
-			goto __catch584_g_error;
+			goto __catch593_g_error;
 		}
 	}
-	goto __finally584;
-	__catch584_g_error:
+	goto __finally593;
+	__catch593_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_;
@@ -4197,7 +4197,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4198 "VideoMetadata.c"
 	}
-	__finally584:
+	__finally593:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4203 "VideoMetadata.c"
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index dd6a15f..7dbbcda 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -367,6 +367,7 @@ typedef struct _DatabaseTableClass DatabaseTableClass;
 typedef struct _VideoTable VideoTable;
 typedef struct _VideoTableClass VideoTableClass;
 #define _database_table_unref0(var) ((var == NULL) ? NULL : (var = (database_table_unref (var), NULL)))
+#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL)))
 
 #define TYPE_EXPORTER (exporter_get_type ())
 #define EXPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPORTER, Exporter))
@@ -1242,6 +1243,8 @@ GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self);
 #define CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE -1
+static gboolean __lambda12_ (GstPluginFeature* f);
+static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self);
 VideoSourceCollection* video_source_collection_new (void);
 VideoSourceCollection* video_source_collection_construct (GType object_type);
 gpointer database_table_ref (gpointer instance);
@@ -1260,6 +1263,8 @@ gboolean media_source_is_offline (MediaSource* self);
 void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources);
 void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources);
 GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target);
+static void _g_object_unref0_ (gpointer var);
+static void _g_list_free__g_object_unref0_ (GList* self);
 gboolean video_has_interpreter_state_changed (void);
 void video_notify_normal_thumbs_regenerated (void);
 static void video_save_interpreter_state (void);
@@ -1511,14 +1516,14 @@ GQuark video_error_quark (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1515 "VideoSupport.c"
+#line 1520 "VideoSupport.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 1522 "VideoSupport.c"
+#line 1527 "VideoSupport.c"
 }
 
 
@@ -1574,21 +1579,21 @@ VideoImportParams* video_import_params_construct (GType object_type, GFile* file
 	self->exposure_time_override = _tmp7_;
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1578 "VideoSupport.c"
+#line 1583 "VideoSupport.c"
 }
 
 
 VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) {
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_import_params_construct (TYPE_VIDEO_IMPORT_PARAMS, file, import_id, md5, thumbnails, exposure_time_override);
-#line 1585 "VideoSupport.c"
+#line 1590 "VideoSupport.c"
 }
 
 
 static void value_video_import_params_init (GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1592 "VideoSupport.c"
+#line 1597 "VideoSupport.c"
 }
 
 
@@ -1597,7 +1602,7 @@ static void value_video_import_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (value->data[0].v_pointer);
-#line 1601 "VideoSupport.c"
+#line 1606 "VideoSupport.c"
 	}
 }
 
@@ -1607,11 +1612,11 @@ static void value_video_import_params_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_import_params_ref (src_value->data[0].v_pointer);
-#line 1611 "VideoSupport.c"
+#line 1616 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1615 "VideoSupport.c"
+#line 1620 "VideoSupport.c"
 	}
 }
 
@@ -1619,37 +1624,37 @@ static void value_video_import_params_copy_value (const GValue* src_value, GValu
 static gpointer value_video_import_params_peek_pointer (const GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1623 "VideoSupport.c"
+#line 1628 "VideoSupport.c"
 }
 
 
 static gchar* value_video_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1630 "VideoSupport.c"
+#line 1635 "VideoSupport.c"
 		VideoImportParams * object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1637 "VideoSupport.c"
+#line 1642 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1641 "VideoSupport.c"
+#line 1646 "VideoSupport.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_import_params_ref (object);
-#line 1645 "VideoSupport.c"
+#line 1650 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1649 "VideoSupport.c"
+#line 1654 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1653 "VideoSupport.c"
+#line 1658 "VideoSupport.c"
 }
 
 
@@ -1660,25 +1665,25 @@ static gchar* value_video_import_params_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1664 "VideoSupport.c"
+#line 1669 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 1670 "VideoSupport.c"
+#line 1675 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1674 "VideoSupport.c"
+#line 1679 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_import_params_ref (value->data[0].v_pointer);
-#line 1678 "VideoSupport.c"
+#line 1683 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1682 "VideoSupport.c"
+#line 1687 "VideoSupport.c"
 }
 
 
@@ -1692,7 +1697,7 @@ GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1696 "VideoSupport.c"
+#line 1701 "VideoSupport.c"
 }
 
 
@@ -1701,7 +1706,7 @@ gpointer value_get_video_import_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS), NULL);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1705 "VideoSupport.c"
+#line 1710 "VideoSupport.c"
 }
 
 
@@ -1721,17 +1726,17 @@ void value_set_video_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_ref (value->data[0].v_pointer);
-#line 1725 "VideoSupport.c"
+#line 1730 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1729 "VideoSupport.c"
+#line 1734 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1735 "VideoSupport.c"
+#line 1740 "VideoSupport.c"
 	}
 }
 
@@ -1750,17 +1755,17 @@ void value_take_video_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1754 "VideoSupport.c"
+#line 1759 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1758 "VideoSupport.c"
+#line 1763 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1764 "VideoSupport.c"
+#line 1769 "VideoSupport.c"
 	}
 }
 
@@ -1770,7 +1775,7 @@ static void video_import_params_class_init (VideoImportParamsClass * klass) {
 	video_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoImportParamsClass *) klass)->finalize = video_import_params_finalize;
-#line 1774 "VideoSupport.c"
+#line 1779 "VideoSupport.c"
 }
 
 
@@ -1784,7 +1789,7 @@ static void video_import_params_instance_init (VideoImportParams * self) {
 	self->row = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 1788 "VideoSupport.c"
+#line 1793 "VideoSupport.c"
 }
 
 
@@ -1802,7 +1807,7 @@ static void video_import_params_finalize (VideoImportParams * obj) {
 	_thumbnails_unref0 (self->thumbnails);
 #line 26 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->row);
-#line 1806 "VideoSupport.c"
+#line 1811 "VideoSupport.c"
 }
 
 
@@ -1827,7 +1832,7 @@ gpointer video_import_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 1831 "VideoSupport.c"
+#line 1836 "VideoSupport.c"
 }
 
 
@@ -1840,7 +1845,7 @@ void video_import_params_unref (gpointer instance) {
 		VIDEO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1844 "VideoSupport.c"
+#line 1849 "VideoSupport.c"
 	}
 }
 
@@ -1863,14 +1868,14 @@ VideoReader* video_reader_construct (GType object_type, GFile* file) {
 	self->priv->file = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1867 "VideoSupport.c"
+#line 1872 "VideoSupport.c"
 }
 
 
 VideoReader* video_reader_new (GFile* file) {
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_reader_construct (TYPE_VIDEO_READER, file);
-#line 1874 "VideoSupport.c"
+#line 1879 "VideoSupport.c"
 }
 
 
@@ -1921,7 +1926,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 	_tmp8_ = mime_type;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) {
-#line 1925 "VideoSupport.c"
+#line 1930 "VideoSupport.c"
 		GFile* _tmp9_;
 		gboolean _tmp10_;
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1930,15 +1935,15 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 		_tmp10_ = g_file_has_uri_scheme (_tmp9_, "file");
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = _tmp10_;
-#line 1934 "VideoSupport.c"
+#line 1939 "VideoSupport.c"
 	} else {
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = FALSE;
-#line 1938 "VideoSupport.c"
+#line 1943 "VideoSupport.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_) {
-#line 1942 "VideoSupport.c"
+#line 1947 "VideoSupport.c"
 		{
 			GFileInfo* info = NULL;
 			GFile* _tmp11_;
@@ -1957,8 +1962,8 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			info = _tmp12_;
 #line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1961 "VideoSupport.c"
-				goto __catch494_g_error;
+#line 1966 "VideoSupport.c"
+				goto __catch503_g_error;
 			}
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = info;
@@ -1972,7 +1977,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			_tmp17_ = content_type;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp17_ != NULL) {
-#line 1976 "VideoSupport.c"
+#line 1981 "VideoSupport.c"
 				const gchar* _tmp18_;
 				gboolean _tmp19_;
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1981,11 +1986,11 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 				_tmp19_ = g_str_has_prefix (_tmp18_, "video/");
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp19_;
-#line 1985 "VideoSupport.c"
+#line 1990 "VideoSupport.c"
 			} else {
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = FALSE;
-#line 1989 "VideoSupport.c"
+#line 1994 "VideoSupport.c"
 			}
 #line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
@@ -1999,16 +2004,16 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 				_g_free0 (mime_type);
 #line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 2003 "VideoSupport.c"
+#line 2008 "VideoSupport.c"
 			}
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (content_type);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 2009 "VideoSupport.c"
+#line 2014 "VideoSupport.c"
 		}
-		goto __finally494;
-		__catch494_g_error:
+		goto __finally503;
+		__catch503_g_error:
 		{
 			GError* _error_ = NULL;
 			GError* _tmp20_;
@@ -2025,12 +2030,12 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			g_debug ("VideoSupport.vala:67: Failed to query content type: %s", _tmp21_);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (_error_);
-#line 2029 "VideoSupport.c"
+#line 2034 "VideoSupport.c"
 		}
-		__finally494:
+		__finally503:
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2034 "VideoSupport.c"
+#line 2039 "VideoSupport.c"
 			gboolean _tmp22_ = FALSE;
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
@@ -2040,7 +2045,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 			g_clear_error (&_inner_error_);
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp22_;
-#line 2044 "VideoSupport.c"
+#line 2049 "VideoSupport.c"
 		}
 	}
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2061,7 +2066,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 	_g_free0 (mime_type);
 #line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2065 "VideoSupport.c"
+#line 2070 "VideoSupport.c"
 }
 
 
@@ -2102,7 +2107,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	if (_tmp6_) {
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = TRUE;
-#line 2106 "VideoSupport.c"
+#line 2111 "VideoSupport.c"
 	} else {
 		const gchar* _tmp7_;
 		gboolean _tmp8_;
@@ -2112,11 +2117,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_tmp8_ = g_str_has_suffix (_tmp7_, "mp4");
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp8_;
-#line 2116 "VideoSupport.c"
+#line 2121 "VideoSupport.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2120 "VideoSupport.c"
+#line 2125 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
 		const gchar* _tmp9_;
@@ -2153,7 +2158,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			_g_free0 (mime_type);
 #line 84 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2157 "VideoSupport.c"
+#line 2162 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
@@ -2166,14 +2171,14 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) {
-#line 2170 "VideoSupport.c"
+#line 2175 "VideoSupport.c"
 				gchar* _tmp13_;
 				gchar* s = NULL;
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = g_strdup (s_collection[s_it]);
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				s = _tmp13_;
-#line 2177 "VideoSupport.c"
+#line 2182 "VideoSupport.c"
 				{
 					const gchar* _tmp14_;
 					const gchar* _tmp15_;
@@ -2198,11 +2203,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 						_g_free0 (mime_type);
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2202 "VideoSupport.c"
+#line 2207 "VideoSupport.c"
 					}
 #line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2206 "VideoSupport.c"
+#line 2211 "VideoSupport.c"
 				}
 			}
 		}
@@ -2216,7 +2221,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 91 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2220 "VideoSupport.c"
+#line 2225 "VideoSupport.c"
 	} else {
 		const gchar* _tmp17_;
 		const gchar* _tmp18_;
@@ -2232,11 +2237,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 94 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2236 "VideoSupport.c"
+#line 2241 "VideoSupport.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2240 "VideoSupport.c"
+#line 2245 "VideoSupport.c"
 }
 
 
@@ -2348,7 +2353,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	file = _tmp2_;
 #line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2352 "VideoSupport.c"
+#line 2357 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_;
@@ -2362,8 +2367,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp3_ = _tmp5_;
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2366 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 2371 "VideoSupport.c"
+			goto __catch504_g_error;
 		}
 #line 106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2375,10 +2380,10 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		info = _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2379 "VideoSupport.c"
+#line 2384 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally504;
+	__catch504_g_error:
 	{
 		GError* err = NULL;
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2395,9 +2400,9 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2399 "VideoSupport.c"
+#line 2404 "VideoSupport.c"
 	}
-	__finally495:
+	__finally504:
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2410,7 +2415,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2414 "VideoSupport.c"
+#line 2419 "VideoSupport.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
@@ -2426,7 +2431,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2430 "VideoSupport.c"
+#line 2435 "VideoSupport.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
@@ -2434,7 +2439,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
 #line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp10_) {
-#line 2438 "VideoSupport.c"
+#line 2443 "VideoSupport.c"
 		GFile* _tmp11_;
 		gchar* _tmp12_;
 		gchar* _tmp13_;
@@ -2456,7 +2461,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2460 "VideoSupport.c"
+#line 2465 "VideoSupport.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
@@ -2500,7 +2505,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
 #line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2504 "VideoSupport.c"
+#line 2509 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
 		VideoReader* _tmp27_;
@@ -2515,8 +2520,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2519 "VideoSupport.c"
-				goto __catch496_video_error;
+#line 2524 "VideoSupport.c"
+				goto __catch505_video_error;
 			}
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2536,14 +2541,14 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2540 "VideoSupport.c"
+#line 2545 "VideoSupport.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2544 "VideoSupport.c"
+#line 2549 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_video_error:
+	goto __finally505;
+	__catch505_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_;
@@ -2573,7 +2578,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_object_unref0 (file);
 #line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2577 "VideoSupport.c"
+#line 2582 "VideoSupport.c"
 		} else {
 			GError* _tmp30_;
 #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2584,19 +2589,19 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 				is_interpretable = FALSE;
 #line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2588 "VideoSupport.c"
+#line 2593 "VideoSupport.c"
 			} else {
 #line 144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_error ("VideoSupport.vala:144: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2592 "VideoSupport.c"
+#line 2597 "VideoSupport.c"
 			}
 		}
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2597 "VideoSupport.c"
+#line 2602 "VideoSupport.c"
 	}
-	__finally496:
+	__finally505:
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2617,7 +2622,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2620 "VideoSupport.c"
+#line 2625 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
@@ -2644,8 +2649,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		metadata = _tmp32_;
 #line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2647 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 2652 "VideoSupport.c"
+			goto __catch506_g_error;
 		}
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2657,7 +2662,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp36_ = creation_date_time;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2660 "VideoSupport.c"
+#line 2665 "VideoSupport.c"
 			MetadataDateTime* _tmp37_;
 			time_t _tmp38_;
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2666,15 +2671,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2669 "VideoSupport.c"
+#line 2674 "VideoSupport.c"
 		} else {
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2673 "VideoSupport.c"
+#line 2678 "VideoSupport.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp35_) {
-#line 2677 "VideoSupport.c"
+#line 2682 "VideoSupport.c"
 			MetadataDateTime* _tmp39_;
 			time_t _tmp40_;
 #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2683,7 +2688,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
 #line 153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2686 "VideoSupport.c"
+#line 2691 "VideoSupport.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
@@ -2701,7 +2706,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp45_ = video_title;
 #line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp45_ != NULL) {
-#line 2704 "VideoSupport.c"
+#line 2709 "VideoSupport.c"
 			const gchar* _tmp46_;
 			gchar* _tmp47_;
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2712,13 +2717,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (title);
 #line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2715 "VideoSupport.c"
+#line 2720 "VideoSupport.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
 #line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp48_ != NULL) {
-#line 2721 "VideoSupport.c"
+#line 2726 "VideoSupport.c"
 			const gchar* _tmp49_;
 			gchar* _tmp50_;
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2729,7 +2734,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (comment);
 #line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2732 "VideoSupport.c"
+#line 2737 "VideoSupport.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
@@ -2739,10 +2744,10 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_metadata_date_time_unref0 (creation_date_time);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2742 "VideoSupport.c"
+#line 2747 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally506;
+	__catch506_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_;
@@ -2759,9 +2764,9 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_warning ("VideoSupport.vala:162: Unable to read video metadata: %s", _tmp52_);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2762 "VideoSupport.c"
+#line 2767 "VideoSupport.c"
 	}
-	__finally497:
+	__finally506:
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2782,13 +2787,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2785 "VideoSupport.c"
+#line 2790 "VideoSupport.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
 #line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2791 "VideoSupport.c"
+#line 2796 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
 		VideoReader* _tmp55_;
 		GDateTime* _tmp56_;
@@ -2798,7 +2803,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp56_ = _tmp55_->priv->_timestamp;
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp56_ != NULL) {
-#line 2801 "VideoSupport.c"
+#line 2806 "VideoSupport.c"
 			VideoReader* _tmp57_;
 			GDateTime* _tmp58_;
 			gint64 _tmp59_;
@@ -2810,15 +2815,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2813 "VideoSupport.c"
+#line 2818 "VideoSupport.c"
 		} else {
 #line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2817 "VideoSupport.c"
+#line 2822 "VideoSupport.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2821 "VideoSupport.c"
+#line 2826 "VideoSupport.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
@@ -2994,7 +2999,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp122_ = _tmp121_->thumbnails;
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp122_ != NULL) {
-#line 2997 "VideoSupport.c"
+#line 3002 "VideoSupport.c"
 		VideoImportParams* _tmp123_;
 		Thumbnails* _tmp124_;
 		VideoImportParams* _tmp125_;
@@ -3016,7 +3021,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp127_ = preview_frame;
 #line 192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 3019 "VideoSupport.c"
+#line 3024 "VideoSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -3034,7 +3039,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_g_object_unref0 (file);
 #line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3037 "VideoSupport.c"
+#line 3042 "VideoSupport.c"
 }
 
 
@@ -3046,14 +3051,14 @@ static GDate* _g_date_dup (GDate* self) {
 	memcpy (dup, self, sizeof (GDate));
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3049 "VideoSupport.c"
+#line 3054 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3056 "VideoSupport.c"
+#line 3061 "VideoSupport.c"
 }
 
 
@@ -3066,7 +3071,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 	_tmp0_ = video_reader_does_file_exist (self);
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp0_) {
-#line 3069 "VideoSupport.c"
+#line 3074 "VideoSupport.c"
 		GFile* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
@@ -3100,7 +3105,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3103 "VideoSupport.c"
+#line 3108 "VideoSupport.c"
 		} else {
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3108,7 +3113,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3111 "VideoSupport.c"
+#line 3116 "VideoSupport.c"
 		}
 	}
 	{
@@ -3133,8 +3138,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		d = _tmp8_;
 #line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3136 "VideoSupport.c"
-			goto __catch498_g_error;
+#line 3141 "VideoSupport.c"
+			goto __catch507_g_error;
 		}
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3156,8 +3161,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3159 "VideoSupport.c"
-			goto __catch498_g_error;
+#line 3164 "VideoSupport.c"
+			goto __catch507_g_error;
 		}
 #line 210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3173,7 +3178,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3176 "VideoSupport.c"
+#line 3181 "VideoSupport.c"
 			GstDiscovererInfo* _tmp20_;
 			GstTagList* _tmp21_;
 			GDate _tmp22_ = {0};
@@ -3196,21 +3201,21 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			video_date = _tmp25_;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3199 "VideoSupport.c"
+#line 3204 "VideoSupport.c"
 		} else {
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3203 "VideoSupport.c"
+#line 3208 "VideoSupport.c"
 		}
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3207 "VideoSupport.c"
+#line 3212 "VideoSupport.c"
 			GDate* _tmp26_;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp26_ != NULL) {
-#line 3213 "VideoSupport.c"
+#line 3218 "VideoSupport.c"
 				GDate* _tmp27_;
 				GDateYear _tmp28_;
 				GDate* _tmp29_;
@@ -3239,7 +3244,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 				video_reader_set_timestamp (self, _tmp34_);
 #line 219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3242 "VideoSupport.c"
+#line 3247 "VideoSupport.c"
 			}
 		}
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3248,10 +3253,10 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (info);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3251 "VideoSupport.c"
+#line 3256 "VideoSupport.c"
 	}
-	goto __finally498;
-	__catch498_g_error:
+	goto __finally507;
+	__catch507_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_;
@@ -3290,10 +3295,10 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_inner_error_ = _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3293 "VideoSupport.c"
-		goto __finally498;
+#line 3298 "VideoSupport.c"
+		goto __finally507;
 	}
-	__finally498:
+	__finally507:
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3302,7 +3307,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3305 "VideoSupport.c"
+#line 3310 "VideoSupport.c"
 		} else {
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3310,7 +3315,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3313 "VideoSupport.c"
+#line 3318 "VideoSupport.c"
 		}
 	}
 }
@@ -3327,7 +3332,7 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	_tmp0_ = self->priv->thumbnailer_pid;
 #line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3330 "VideoSupport.c"
+#line 3335 "VideoSupport.c"
 		GPid _tmp1_;
 		GPid _tmp2_;
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3338,13 +3343,13 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 		_tmp2_ = self->priv->thumbnailer_pid;
 #line 235 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3341 "VideoSupport.c"
+#line 3346 "VideoSupport.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
 #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3347 "VideoSupport.c"
+#line 3352 "VideoSupport.c"
 }
 
 
@@ -3353,7 +3358,7 @@ static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self)
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
 #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3356 "VideoSupport.c"
+#line 3361 "VideoSupport.c"
 }
 
 
@@ -3430,7 +3435,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv_length1 = _tmp10__length1;
 #line 245 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3433 "VideoSupport.c"
+#line 3438 "VideoSupport.c"
 	{
 		gchar** _tmp11_;
 		gint _tmp11__length1;
@@ -3449,17 +3454,17 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		child_stdout = _tmp13_;
 #line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3452 "VideoSupport.c"
-			goto __catch499_g_error;
+#line 3457 "VideoSupport.c"
+			goto __catch508_g_error;
 		}
 #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
 #line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_debug ("VideoSupport.vala:251: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3459 "VideoSupport.c"
+#line 3464 "VideoSupport.c"
 	}
-	goto __finally499;
-	__catch499_g_error:
+	goto __finally508;
+	__catch508_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_;
@@ -3479,13 +3484,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp17_ = self->priv->thumbnailer_pid;
 #line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_ != ((GPid) 0)) {
-#line 3482 "VideoSupport.c"
+#line 3487 "VideoSupport.c"
 			GPid _tmp18_;
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
 #line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3488 "VideoSupport.c"
+#line 3493 "VideoSupport.c"
 		}
 #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -3495,9 +3500,9 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3498 "VideoSupport.c"
+#line 3503 "VideoSupport.c"
 	}
-	__finally499:
+	__finally508:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3508,13 +3513,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3511 "VideoSupport.c"
+#line 3516 "VideoSupport.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
 #line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3517 "VideoSupport.c"
+#line 3522 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
 		gint _tmp19_;
@@ -3539,8 +3544,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3542 "VideoSupport.c"
-			goto __catch500_g_error;
+#line 3547 "VideoSupport.c"
+			goto __catch509_g_error;
 		}
 #line 266 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3554,10 +3559,10 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (_tmp21_);
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3557 "VideoSupport.c"
+#line 3562 "VideoSupport.c"
 	}
-	goto __finally500;
-	__catch500_g_error:
+	goto __finally509;
+	__catch509_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_;
@@ -3578,9 +3583,9 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		buf = NULL;
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3581 "VideoSupport.c"
+#line 3586 "VideoSupport.c"
 	}
-	__finally500:
+	__finally509:
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3593,7 +3598,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3596 "VideoSupport.c"
+#line 3601 "VideoSupport.c"
 	}
 #line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
@@ -3609,7 +3614,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	_tmp30_ = ret_waitpid;
 #line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp30_ < 0) {
-#line 3612 "VideoSupport.c"
+#line 3617 "VideoSupport.c"
 		gint _tmp31_;
 #line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
@@ -3619,7 +3624,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (buf);
 #line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3622 "VideoSupport.c"
+#line 3627 "VideoSupport.c"
 	} else {
 		gint _tmp32_;
 		gint _tmp33_;
@@ -3629,7 +3634,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp33_ = WEXITSTATUS (_tmp32_);
 #line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (0 != _tmp33_) {
-#line 3632 "VideoSupport.c"
+#line 3637 "VideoSupport.c"
 			gint _tmp34_;
 			gint _tmp35_;
 #line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3642,7 +3647,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 			_g_object_unref0 (buf);
 #line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3645 "VideoSupport.c"
+#line 3650 "VideoSupport.c"
 		}
 	}
 #line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3657,7 +3662,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3660 "VideoSupport.c"
+#line 3665 "VideoSupport.c"
 }
 
 
@@ -3686,7 +3691,7 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 	result = _tmp4_;
 #line 290 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3689 "VideoSupport.c"
+#line 3694 "VideoSupport.c"
 }
 
 
@@ -3707,7 +3712,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	_tmp0_ = self->priv->preview_frame;
 #line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3710 "VideoSupport.c"
+#line 3715 "VideoSupport.c"
 		GdkPixbuf* _tmp1_;
 		GdkPixbuf* _tmp2_;
 #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3718,7 +3723,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		result = _tmp2_;
 #line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3721 "VideoSupport.c"
+#line 3726 "VideoSupport.c"
 	}
 #line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
@@ -3728,7 +3733,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		result = NULL;
 #line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3731 "VideoSupport.c"
+#line 3736 "VideoSupport.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
@@ -3748,7 +3753,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	_tmp8_ = self->priv->preview_frame;
 #line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (NULL == _tmp8_) {
-#line 3751 "VideoSupport.c"
+#line 3756 "VideoSupport.c"
 		GdkPixbuf* _tmp9_;
 #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
@@ -3756,7 +3761,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 		_g_object_unref0 (self->priv->preview_frame);
 #line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3759 "VideoSupport.c"
+#line 3764 "VideoSupport.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
@@ -3766,7 +3771,7 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	result = _tmp11_;
 #line 305 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3769 "VideoSupport.c"
+#line 3774 "VideoSupport.c"
 }
 
 
@@ -3787,13 +3792,13 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 3790 "VideoSupport.c"
+#line 3795 "VideoSupport.c"
 				gdouble _tmp1_ = 0.0;
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp1_;
-#line 3796 "VideoSupport.c"
+#line 3801 "VideoSupport.c"
 			} else {
 				gdouble _tmp2_ = 0.0;
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3802,7 +3807,7 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp2_;
-#line 3805 "VideoSupport.c"
+#line 3810 "VideoSupport.c"
 			}
 		}
 	}
@@ -3812,7 +3817,7 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	result = _tmp3_;
 #line 312 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3815 "VideoSupport.c"
+#line 3820 "VideoSupport.c"
 }
 
 
@@ -3856,13 +3861,13 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 		_media_metadata_unref0 (metadata);
 #line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3859 "VideoSupport.c"
+#line 3864 "VideoSupport.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
 #line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3865 "VideoSupport.c"
+#line 3870 "VideoSupport.c"
 }
 
 
@@ -3877,14 +3882,14 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3880 "VideoSupport.c"
+#line 3885 "VideoSupport.c"
 }
 
 
 static gpointer _g_date_time_ref0 (gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 3887 "VideoSupport.c"
+#line 3892 "VideoSupport.c"
 }
 
 
@@ -3901,14 +3906,14 @@ static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
 	_g_date_time_unref0 (self->priv->_timestamp);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_timestamp = _tmp1_;
-#line 3904 "VideoSupport.c"
+#line 3909 "VideoSupport.c"
 }
 
 
 static void value_video_reader_init (GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3911 "VideoSupport.c"
+#line 3916 "VideoSupport.c"
 }
 
 
@@ -3917,7 +3922,7 @@ static void value_video_reader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (value->data[0].v_pointer);
-#line 3920 "VideoSupport.c"
+#line 3925 "VideoSupport.c"
 	}
 }
 
@@ -3927,11 +3932,11 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer);
-#line 3930 "VideoSupport.c"
+#line 3935 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3934 "VideoSupport.c"
+#line 3939 "VideoSupport.c"
 	}
 }
 
@@ -3939,37 +3944,37 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_video_reader_peek_pointer (const GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3942 "VideoSupport.c"
+#line 3947 "VideoSupport.c"
 }
 
 
 static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3949 "VideoSupport.c"
+#line 3954 "VideoSupport.c"
 		VideoReader * object;
 		object = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3956 "VideoSupport.c"
+#line 3961 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3960 "VideoSupport.c"
+#line 3965 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 3964 "VideoSupport.c"
+#line 3969 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3968 "VideoSupport.c"
+#line 3973 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3972 "VideoSupport.c"
+#line 3977 "VideoSupport.c"
 }
 
 
@@ -3980,25 +3985,25 @@ static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3983 "VideoSupport.c"
+#line 3988 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 3989 "VideoSupport.c"
+#line 3994 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3993 "VideoSupport.c"
+#line 3998 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 3997 "VideoSupport.c"
+#line 4002 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 4001 "VideoSupport.c"
+#line 4006 "VideoSupport.c"
 }
 
 
@@ -4012,7 +4017,7 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 4015 "VideoSupport.c"
+#line 4020 "VideoSupport.c"
 }
 
 
@@ -4021,7 +4026,7 @@ gpointer value_get_video_reader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 4024 "VideoSupport.c"
+#line 4029 "VideoSupport.c"
 }
 
 
@@ -4041,17 +4046,17 @@ void value_set_video_reader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_ref (value->data[0].v_pointer);
-#line 4044 "VideoSupport.c"
+#line 4049 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4048 "VideoSupport.c"
+#line 4053 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4054 "VideoSupport.c"
+#line 4059 "VideoSupport.c"
 	}
 }
 
@@ -4070,17 +4075,17 @@ void value_take_video_reader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4073 "VideoSupport.c"
+#line 4078 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4077 "VideoSupport.c"
+#line 4082 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4083 "VideoSupport.c"
+#line 4088 "VideoSupport.c"
 	}
 }
 
@@ -4092,7 +4097,7 @@ static void video_reader_class_init (VideoReaderClass * klass) {
 	((VideoReaderClass *) klass)->finalize = video_reader_finalize;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoReaderPrivate));
-#line 4095 "VideoSupport.c"
+#line 4100 "VideoSupport.c"
 }
 
 
@@ -4111,7 +4116,7 @@ static void video_reader_instance_init (VideoReader * self) {
 	self->priv->_timestamp = NULL;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 4114 "VideoSupport.c"
+#line 4119 "VideoSupport.c"
 }
 
 
@@ -4127,7 +4132,7 @@ static void video_reader_finalize (VideoReader * obj) {
 	_g_object_unref0 (self->priv->file);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
-#line 4130 "VideoSupport.c"
+#line 4135 "VideoSupport.c"
 }
 
 
@@ -4152,7 +4157,7 @@ gpointer video_reader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4155 "VideoSupport.c"
+#line 4160 "VideoSupport.c"
 }
 
 
@@ -4165,7 +4170,7 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4168 "VideoSupport.c"
+#line 4173 "VideoSupport.c"
 	}
 }
 
@@ -4173,7 +4178,7 @@ void video_reader_unref (gpointer instance) {
 static gpointer _video_row_ref0 (gpointer self) {
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4176 "VideoSupport.c"
+#line 4181 "VideoSupport.c"
 }
 
 
@@ -4220,7 +4225,7 @@ Video* video_construct (GType object_type, VideoRow* row) {
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4223 "VideoSupport.c"
+#line 4228 "VideoSupport.c"
 	} else {
 		VideoRow* _tmp9_;
 		guint64 _tmp10_;
@@ -4230,11 +4235,11 @@ Video* video_construct (GType object_type, VideoRow* row) {
 		_tmp10_ = _tmp9_->flags;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4233 "VideoSupport.c"
+#line 4238 "VideoSupport.c"
 	}
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp6_) {
-#line 4237 "VideoSupport.c"
+#line 4242 "VideoSupport.c"
 		VideoSourceCollection* _tmp11_;
 		VideoRow* _tmp12_;
 		const gchar* _tmp13_;
@@ -4246,18 +4251,72 @@ Video* video_construct (GType object_type, VideoRow* row) {
 		_tmp13_ = _tmp12_->backlinks;
 #line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_);
-#line 4249 "VideoSupport.c"
+#line 4254 "VideoSupport.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4253 "VideoSupport.c"
+#line 4258 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
 #line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4260 "VideoSupport.c"
+#line 4265 "VideoSupport.c"
+}
+
+
+static gboolean __lambda12_ (GstPluginFeature* f) {
+	gboolean result = FALSE;
+	GstPluginFeature* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (f), FALSE);
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp0_ = f;
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp1_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gst_object_get_type (), GstObject));
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp2_ = _tmp1_;
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp3_ = g_str_has_prefix (_tmp2_, "vaapi");
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp4_ = _tmp3_;
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp2_);
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	result = _tmp4_;
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	return result;
+#line 4294 "VideoSupport.c"
+}
+
+
+static gboolean ___lambda12__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self) {
+	gboolean result;
+	result = __lambda12_ (feature);
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	return result;
+#line 4303 "VideoSupport.c"
+}
+
+
+static void _g_object_unref0_ (gpointer var) {
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
+#line 4310 "VideoSupport.c"
+}
+
+
+static void _g_list_free__g_object_unref0_ (GList* self) {
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_list_free (self);
+#line 4319 "VideoSupport.c"
 }
 
 
@@ -4276,37 +4335,34 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	GstRegistry* _tmp6_;
 	guint32 _tmp7_;
 	gint _tmp8_;
-	GstPluginFeature* feature = NULL;
+	GList* features = NULL;
 	GstRegistry* _tmp11_;
-	GstPluginFeature* _tmp12_;
-	GstPluginFeature* _tmp13_;
-	GstRegistry* _tmp16_;
-	GstPluginFeature* _tmp17_;
-	GstPluginFeature* _tmp18_;
-	VideoSourceCollection* _tmp21_;
+	GList* _tmp12_;
+	GList* _tmp13_;
+	VideoSourceCollection* _tmp20_;
 	GeeArrayList* all = NULL;
+	VideoTable* _tmp21_;
 	VideoTable* _tmp22_;
-	VideoTable* _tmp23_;
+	GeeArrayList* _tmp23_;
 	GeeArrayList* _tmp24_;
-	GeeArrayList* _tmp25_;
 	GeeArrayList* all_videos = NULL;
-	GeeArrayList* _tmp26_;
+	GeeArrayList* _tmp25_;
 	GeeArrayList* trashed_videos = NULL;
-	GeeArrayList* _tmp27_;
+	GeeArrayList* _tmp26_;
 	GeeArrayList* offline_videos = NULL;
-	GeeArrayList* _tmp28_;
+	GeeArrayList* _tmp27_;
 	gint count = 0;
-	GeeArrayList* _tmp29_;
+	GeeArrayList* _tmp28_;
+	gint _tmp29_;
 	gint _tmp30_;
-	gint _tmp31_;
-	VideoSourceCollection* _tmp58_;
-	GeeArrayList* _tmp59_;
-	VideoSourceCollection* _tmp60_;
-	GeeArrayList* _tmp61_;
-	VideoSourceCollection* _tmp62_;
-	GeeArrayList* _tmp63_;
+	VideoSourceCollection* _tmp57_;
+	GeeArrayList* _tmp58_;
+	VideoSourceCollection* _tmp59_;
+	GeeArrayList* _tmp60_;
+	VideoSourceCollection* _tmp61_;
+	GeeArrayList* _tmp62_;
+	GeeCollection* _tmp63_;
 	GeeCollection* _tmp64_;
-	GeeCollection* _tmp65_;
 #line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
 #line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4356,7 +4412,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 "l video thumbnails are out of date");
 #line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4358 "VideoSupport.c"
+#line 4414 "VideoSupport.c"
 	} else {
 		gint _tmp9_;
 		gint _tmp10_;
@@ -4371,266 +4427,274 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 " may be out of date");
 #line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4372 "VideoSupport.c"
+#line 4428 "VideoSupport.c"
 		}
 	}
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = registry;
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
+	_tmp12_ = gst_registry_feature_filter (_tmp11_, ___lambda12__gst_plugin_feature_filter, FALSE, NULL);
 #line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	feature = _tmp12_;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = feature;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp13_ != NULL) {
-#line 4385 "VideoSupport.c"
-		GstRegistry* _tmp14_;
-		GstPluginFeature* _tmp15_;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp14_ = registry;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp15_ = feature;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4394 "VideoSupport.c"
-	}
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp16_ = registry;
+	features = _tmp12_;
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp13_ = features;
+#line 4439 "VideoSupport.c"
+	{
+		GList* feature_collection = NULL;
+		GList* feature_it = NULL;
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		feature_collection = _tmp13_;
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		for (feature_it = feature_collection; feature_it != NULL; feature_it = feature_it->next) {
+#line 4447 "VideoSupport.c"
+			GstPluginFeature* _tmp14_;
+			GstPluginFeature* feature = NULL;
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp14_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data);
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			feature = _tmp14_;
+#line 4454 "VideoSupport.c"
+			{
+				GstPluginFeature* _tmp15_;
+				gchar* _tmp16_;
+				gchar* _tmp17_;
+				GstRegistry* _tmp18_;
+				GstPluginFeature* _tmp19_;
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp15_ = feature;
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp16_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gst_object_get_type (), GstObject));
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp17_ = _tmp16_;
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:412: Removing registry feature %s", _tmp17_);
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_free0 (_tmp17_);
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
+				_tmp18_ = registry;
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (feature);
+				_tmp19_ = feature;
 #line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	feature = _tmp17_;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp18_ = feature;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	if (_tmp18_ != NULL) {
-#line 4408 "VideoSupport.c"
-		GstRegistry* _tmp19_;
-		GstPluginFeature* _tmp20_;
+				gst_registry_remove_feature (_tmp18_, _tmp19_);
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_object_unref0 (feature);
+#line 4479 "VideoSupport.c"
+			}
+		}
+	}
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp19_ = registry;
+	_tmp20_ = video_source_collection_new ();
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_tmp20_ = feature;
+	_data_collection_unref0 (video_global);
 #line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4417 "VideoSupport.c"
-	}
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = video_source_collection_new ();
+	video_global = _tmp20_;
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp21_ = video_table_get_instance ();
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp22_ = _tmp21_;
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp23_ = video_table_get_all (_tmp22_);
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp24_ = _tmp23_;
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_database_table_unref0 (_tmp22_);
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	all = _tmp24_;
 #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_data_collection_unref0 (video_global);
+	_tmp25_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_global = _tmp21_;
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp22_ = video_table_get_instance ();
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp23_ = _tmp22_;
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp24_ = video_table_get_all (_tmp23_);
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp25_ = _tmp24_;
+	all_videos = _tmp25_;
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	trashed_videos = _tmp26_;
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_database_table_unref0 (_tmp23_);
+	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all = _tmp25_;
+	offline_videos = _tmp27_;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp28_ = all;
 #line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all_videos = _tmp26_;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	trashed_videos = _tmp27_;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	offline_videos = _tmp28_;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp29_ = all;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp31_ = _tmp30_;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	count = _tmp31_;
-#line 4457 "VideoSupport.c"
+	_tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp30_ = _tmp29_;
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	count = _tmp30_;
+#line 4521 "VideoSupport.c"
 	{
 		gint ctr = 0;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4462 "VideoSupport.c"
+#line 4526 "VideoSupport.c"
 		{
-			gboolean _tmp32_ = FALSE;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp32_ = TRUE;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			gboolean _tmp31_ = FALSE;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp31_ = TRUE;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4469 "VideoSupport.c"
+#line 4533 "VideoSupport.c"
+				gint _tmp33_;
 				gint _tmp34_;
-				gint _tmp35_;
 				Video* video = NULL;
-				GeeArrayList* _tmp36_;
-				gint _tmp37_;
-				gpointer _tmp38_;
-				VideoRow* _tmp39_;
+				GeeArrayList* _tmp35_;
+				gint _tmp36_;
+				gpointer _tmp37_;
+				VideoRow* _tmp38_;
+				Video* _tmp39_;
 				Video* _tmp40_;
-				Video* _tmp41_;
-				gboolean _tmp42_;
-				Video* _tmp44_;
-				gboolean _tmp45_;
-				ProgressMonitor _tmp54_;
-				void* _tmp54__target;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp32_) {
-#line 4486 "VideoSupport.c"
-					gint _tmp33_;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp33_ = ctr;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					ctr = _tmp33_ + 1;
-#line 4492 "VideoSupport.c"
+				gboolean _tmp41_;
+				Video* _tmp43_;
+				gboolean _tmp44_;
+				ProgressMonitor _tmp53_;
+				void* _tmp53__target;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (!_tmp31_) {
+#line 4550 "VideoSupport.c"
+					gint _tmp32_;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp32_ = ctr;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					ctr = _tmp32_ + 1;
+#line 4556 "VideoSupport.c"
 				}
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp32_ = FALSE;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp34_ = ctr;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp35_ = count;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!(_tmp34_ < _tmp35_)) {
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp31_ = FALSE;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp33_ = ctr;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp34_ = count;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (!(_tmp33_ < _tmp34_)) {
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4504 "VideoSupport.c"
+#line 4568 "VideoSupport.c"
 				}
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp35_ = all;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp36_ = ctr;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_);
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp38_ = (VideoRow*) _tmp37_;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp39_ = video_new (_tmp38_);
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp40_ = _tmp39_;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_video_row_unref0 (_tmp38_);
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				video = _tmp40_;
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp41_ = video_interpreter_state_changed;
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp41_) {
+#line 4590 "VideoSupport.c"
+					Video* _tmp42_;
 #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp36_ = all;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp37_ = ctr;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp39_ = (VideoRow*) _tmp38_;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp40_ = video_new (_tmp39_);
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp41_ = _tmp40_;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_video_row_unref0 (_tmp39_);
+					_tmp42_ = video;
 #line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp41_;
+					video_set_is_interpretable (_tmp42_, FALSE);
+#line 4596 "VideoSupport.c"
+				}
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp42_ = video_interpreter_state_changed;
+				_tmp43_ = video;
 #line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp42_) {
-#line 4526 "VideoSupport.c"
-					Video* _tmp43_;
+				_tmp44_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp44_) {
+#line 4604 "VideoSupport.c"
+					GeeArrayList* _tmp45_;
+					Video* _tmp46_;
 #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp43_ = video;
+					_tmp45_ = trashed_videos;
 #line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4532 "VideoSupport.c"
-				}
+					_tmp46_ = video;
+#line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp46_);
+#line 4613 "VideoSupport.c"
+				} else {
+					Video* _tmp47_;
+					gboolean _tmp48_;
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp47_ = video;
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp48_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					if (_tmp48_) {
+#line 4623 "VideoSupport.c"
+						GeeArrayList* _tmp49_;
+						Video* _tmp50_;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp44_ = video;
+						_tmp49_ = offline_videos;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
+						_tmp50_ = video;
 #line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp45_) {
-#line 4540 "VideoSupport.c"
-					GeeArrayList* _tmp46_;
-					Video* _tmp47_;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp46_ = trashed_videos;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp47_ = video;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4549 "VideoSupport.c"
-				} else {
-					Video* _tmp48_;
-					gboolean _tmp49_;
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_);
+#line 4632 "VideoSupport.c"
+					} else {
+						GeeArrayList* _tmp51_;
+						Video* _tmp52_;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp48_ = video;
+						_tmp51_ = all_videos;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
+						_tmp52_ = video;
 #line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp49_) {
-#line 4559 "VideoSupport.c"
-						GeeArrayList* _tmp50_;
-						Video* _tmp51_;
-#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp50_ = offline_videos;
-#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp51_ = video;
-#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4568 "VideoSupport.c"
-					} else {
-						GeeArrayList* _tmp52_;
-						Video* _tmp53_;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp52_ = all_videos;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp53_ = video;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4578 "VideoSupport.c"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp52_);
+#line 4642 "VideoSupport.c"
 					}
 				}
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp54_ = monitor;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp54__target = monitor_target;
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp54_ != NULL) {
-#line 4587 "VideoSupport.c"
-					ProgressMonitor _tmp55_;
-					void* _tmp55__target;
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp53_ = monitor;
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp53__target = monitor_target;
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp53_ != NULL) {
+#line 4651 "VideoSupport.c"
+					ProgressMonitor _tmp54_;
+					void* _tmp54__target;
+					gint _tmp55_;
 					gint _tmp56_;
-					gint _tmp57_;
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp55_ = monitor;
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp55__target = monitor_target;
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp56_ = ctr;
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp57_ = count;
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4602 "VideoSupport.c"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp54_ = monitor;
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp54__target = monitor_target;
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp55_ = ctr;
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp56_ = count;
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp54_ ((guint64) _tmp55_, (guint64) _tmp56_, TRUE, _tmp54__target);
+#line 4666 "VideoSupport.c"
 				}
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4606 "VideoSupport.c"
+#line 4670 "VideoSupport.c"
 			}
 		}
 	}
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp58_ = video_global;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp59_ = trashed_videos;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp60_ = video_global;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp61_ = offline_videos;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp62_ = video_global;
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp63_ = all_videos;
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp64_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp65_ = _tmp64_;
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp65_);
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp57_ = video_global;
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp58_ = trashed_videos;
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp59_ = video_global;
+#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp60_ = offline_videos;
+#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp61_ = video_global;
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp62_ = all_videos;
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp63_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp64_ = _tmp63_;
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (_tmp64_);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4640,23 +4704,23 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (feature);
+	__g_list_free__g_object_unref0_0 (features);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4644 "VideoSupport.c"
+#line 4708 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 446 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4657 "VideoSupport.c"
+#line 4721 "VideoSupport.c"
 }
 
 
@@ -4664,39 +4728,39 @@ void video_notify_normal_thumbs_regenerated (void) {
 	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 450 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 450 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 451 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4671 "VideoSupport.c"
+#line 4735 "VideoSupport.c"
 	}
-#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:456: normal video thumbnail regeneration completed");
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:453: normal video thumbnail regeneration completed");
+#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = TRUE;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4681 "VideoSupport.c"
+#line 4745 "VideoSupport.c"
 		gboolean _tmp3_;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4687 "VideoSupport.c"
+#line 4751 "VideoSupport.c"
 	} else {
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4691 "VideoSupport.c"
+#line 4755 "VideoSupport.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 456 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 460 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4697 "VideoSupport.c"
+#line 4761 "VideoSupport.c"
 	}
 }
 
@@ -4705,69 +4769,69 @@ void video_notify_offline_thumbs_regenerated (void) {
 	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_;
-#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 465 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4712 "VideoSupport.c"
+#line 4776 "VideoSupport.c"
 	}
-#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:467: offline video thumbnail regeneration completed");
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:464: offline video thumbnail regeneration completed");
+#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = TRUE;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4722 "VideoSupport.c"
+#line 4786 "VideoSupport.c"
 		gboolean _tmp3_;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4728 "VideoSupport.c"
+#line 4792 "VideoSupport.c"
 	} else {
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4732 "VideoSupport.c"
+#line 4796 "VideoSupport.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4738 "VideoSupport.c"
+#line 4802 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
 	gboolean _tmp0_;
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4749 "VideoSupport.c"
+#line 4813 "VideoSupport.c"
 		ConfigFacade* _tmp1_;
 		ConfigFacade* _tmp2_;
 		gint _tmp3_;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:476: saving video interpreter state to configuration" \
+#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:473: saving video interpreter state to configuration" \
 " system");
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		configuration_facade_set_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4767 "VideoSupport.c"
+#line 4831 "VideoSupport.c"
 	}
 }
 
@@ -4801,27 +4865,27 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	ExporterCompletionCallback _tmp50_;
 	void* _tmp50__target;
 	GError * _inner_error_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ == 0) {
-#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4815 "VideoSupport.c"
+#line 4879 "VideoSupport.c"
 	}
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 489 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4821 "VideoSupport.c"
+#line 4885 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_;
 		Scaling _tmp5_ = {0};
@@ -4833,47 +4897,47 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		ExporterUI* _tmp11_;
 		ExporterCompletionCallback _tmp12_;
 		void* _tmp12__target;
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4863 "VideoSupport.c"
+#line 4927 "VideoSupport.c"
 	}
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4873 "VideoSupport.c"
+#line 4937 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_;
@@ -4882,22 +4946,22 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp27_;
 		GFile* _tmp28_;
 		GFile* _tmp29_;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4884 "VideoSupport.c"
+#line 4948 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_;
 			GeeIterator* _tmp17_;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4897 "VideoSupport.c"
+#line 4961 "VideoSupport.c"
 				GeeIterator* _tmp18_;
 				gboolean _tmp19_;
 				Video* v = NULL;
@@ -4905,67 +4969,67 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				gpointer _tmp21_;
 				Video* _tmp22_;
 				Video* _tmp23_;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4913 "VideoSupport.c"
+#line 4977 "VideoSupport.c"
 				}
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				v = (Video*) _tmp21_;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp23_;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4933 "VideoSupport.c"
+#line 4997 "VideoSupport.c"
 			}
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 4937 "VideoSupport.c"
+#line 5001 "VideoSupport.c"
 		}
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		save_as = _tmp28_;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp29_ == NULL) {
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 4965 "VideoSupport.c"
+#line 5029 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_;
@@ -4974,268 +5038,268 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			GFile* _tmp33_;
 			AppWindow* _tmp34_;
 			AppWindow* _tmp35_;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp31_);
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4990 "VideoSupport.c"
-				goto __catch501_g_error;
+#line 5054 "VideoSupport.c"
+				goto __catch510_g_error;
 			}
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 5001 "VideoSupport.c"
+#line 5065 "VideoSupport.c"
 		}
-		goto __finally501;
-		__catch501_g_error:
+		goto __finally510;
+		__catch510_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_;
 			AppWindow* _tmp37_;
 			GFile* _tmp38_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp37_);
-#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 5028 "VideoSupport.c"
+#line 5092 "VideoSupport.c"
 		}
-		__finally501:
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally510:
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5043 "VideoSupport.c"
+#line 5107 "VideoSupport.c"
 		}
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5053 "VideoSupport.c"
+#line 5117 "VideoSupport.c"
 	}
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = export_ui_choose_dir (_ ("Export Videos"));
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_dir = _tmp39_;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp40_ = export_dir;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp40_ == NULL) {
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5069 "VideoSupport.c"
+#line 5133 "VideoSupport.c"
 	}
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp41_ = videos;
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = export_dir;
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	scaling_for_original (&_tmp43_);
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_format_parameters_unmodified (&_tmp44_);
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp45_ = exporter_new (_tmp41_, _tmp42_, &_tmp43_, &_tmp44_, FALSE);
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp46_ = _tmp45_;
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp47_ = exporter_ui_new (_tmp46_);
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp48_ = _tmp47_;
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp46_);
-#line 528 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter = _tmp48_;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp49_ = exporter;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50_ = done;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50__target = done_target;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter_ui_export (_tmp49_, _tmp50_, _tmp50__target);
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5105 "VideoSupport.c"
+#line 5169 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5116 "VideoSupport.c"
+#line 5180 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_;
 		VideoTable* _tmp1_;
 		VideoID _tmp2_ = {0};
 		const gchar* _tmp3_;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5138 "VideoSupport.c"
-				goto __catch502_database_error;
+#line 5202 "VideoSupport.c"
+				goto __catch511_database_error;
 			}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5147 "VideoSupport.c"
+#line 5211 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5155 "VideoSupport.c"
+#line 5219 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_;
 				const gchar* _tmp6_;
 				gchar* _tmp7_;
-#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5170 "VideoSupport.c"
+#line 5234 "VideoSupport.c"
 			}
-			__finally503:
+			__finally512:
 			{
 				VideoRow* _tmp8_;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5179 "VideoSupport.c"
+#line 5243 "VideoSupport.c"
 			}
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5185 "VideoSupport.c"
-					goto __catch502_database_error;
+#line 5249 "VideoSupport.c"
+					goto __catch511_database_error;
 				}
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5194 "VideoSupport.c"
+#line 5258 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally502;
-	__catch502_database_error:
+	goto __finally511;
+	__catch511_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
 		GError* _tmp11_;
 		const gchar* _tmp12_;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:542: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:539: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 539 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5224 "VideoSupport.c"
+#line 5288 "VideoSupport.c"
 	}
-	__finally502:
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally511:
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5235 "VideoSupport.c"
+#line 5299 "VideoSupport.c"
 	}
 }
 
@@ -5244,19 +5308,19 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5248 "VideoSupport.c"
+#line 5312 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gboolean _tmp13_ = FALSE;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5256 "VideoSupport.c"
+#line 5320 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_;
@@ -5267,70 +5331,70 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_;
 			gboolean _tmp7_;
 			gboolean _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5289 "VideoSupport.c"
+#line 5353 "VideoSupport.c"
 				VideoRow* _tmp9_;
 				EventID _tmp10_;
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 548 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5298 "VideoSupport.c"
+#line 5362 "VideoSupport.c"
 			}
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5302 "VideoSupport.c"
+#line 5366 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5309 "VideoSupport.c"
+#line 5373 "VideoSupport.c"
 			}
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5313 "VideoSupport.c"
+#line 5377 "VideoSupport.c"
 		}
-		__finally504:
+		__finally513:
 		{
 			VideoRow* _tmp12_;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5322 "VideoSupport.c"
+#line 5386 "VideoSupport.c"
 		}
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp13_;
-#line 5330 "VideoSupport.c"
+#line 5394 "VideoSupport.c"
 	}
 }
 
@@ -5345,44 +5409,44 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	const gchar* _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp8_;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5353 "VideoSupport.c"
+#line 5417 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5360 "VideoSupport.c"
+#line 5424 "VideoSupport.c"
 	}
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5382 "VideoSupport.c"
+#line 5446 "VideoSupport.c"
 }
 
 
@@ -5393,13 +5457,13 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 	VideoRow* _tmp9_;
 	Video* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5399 "VideoSupport.c"
+#line 5463 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_;
@@ -5409,188 +5473,188 @@ ImportResult video_import_create (VideoImportParams* params, Video* * video) {
 		VideoID _tmp5_ = {0};
 		VideoID _tmp6_;
 		gboolean _tmp7_;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5429 "VideoSupport.c"
-				goto __catch505_database_error;
+#line 5493 "VideoSupport.c"
+				goto __catch514_database_error;
 			}
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5438 "VideoSupport.c"
+#line 5502 "VideoSupport.c"
 		}
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp7_) {
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5450 "VideoSupport.c"
+#line 5514 "VideoSupport.c"
 			} else {
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5454 "VideoSupport.c"
+#line 5518 "VideoSupport.c"
 			}
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5458 "VideoSupport.c"
+#line 5522 "VideoSupport.c"
 		}
 	}
-	goto __finally505;
-	__catch505_database_error:
+	goto __finally514;
+	__catch514_database_error:
 	{
 		GError* err = NULL;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5477 "VideoSupport.c"
+#line 5541 "VideoSupport.c"
 		} else {
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5481 "VideoSupport.c"
+#line 5545 "VideoSupport.c"
 		}
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5485 "VideoSupport.c"
+#line 5549 "VideoSupport.c"
 	}
-	__finally505:
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally514:
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5496 "VideoSupport.c"
+#line 5560 "VideoSupport.c"
 	}
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5514 "VideoSupport.c"
+#line 5578 "VideoSupport.c"
 	} else {
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5518 "VideoSupport.c"
+#line 5582 "VideoSupport.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5522 "VideoSupport.c"
+#line 5586 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5530 "VideoSupport.c"
+#line 5594 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_;
 		VideoTable* _tmp1_;
 		Video* _tmp2_;
 		VideoID _tmp3_ = {0};
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5552 "VideoSupport.c"
-				goto __catch506_database_error;
+#line 5616 "VideoSupport.c"
+				goto __catch515_database_error;
 			}
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5561 "VideoSupport.c"
+#line 5625 "VideoSupport.c"
 		}
 	}
-	goto __finally506;
-	__catch506_database_error:
+	goto __finally515;
+	__catch515_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp4_);
 #line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		app_window_database_error (_tmp4_);
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5579 "VideoSupport.c"
+#line 5643 "VideoSupport.c"
 	}
-	__finally506:
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally515:
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5590 "VideoSupport.c"
+#line 5654 "VideoSupport.c"
 	}
 }
 
@@ -5605,24 +5669,24 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp13_;
 	gint _tmp13__length1;
 	GError * _inner_error_ = NULL;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 588 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5615 "VideoSupport.c"
+#line 5679 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5622 "VideoSupport.c"
+#line 5686 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_;
 			const gchar* _tmp3_;
@@ -5634,69 +5698,69 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			const gchar* _tmp9_;
 			BackingFileState* _tmp10_;
 			BackingFileState* _tmp11_;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5658 "VideoSupport.c"
+#line 5722 "VideoSupport.c"
 		}
-		__finally507:
+		__finally516:
 		{
 			VideoRow* _tmp12_;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5667 "VideoSupport.c"
+#line 5731 "VideoSupport.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5679 "VideoSupport.c"
+#line 5743 "VideoSupport.c"
 		}
 	}
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5690 "VideoSupport.c"
+#line 5754 "VideoSupport.c"
 	}
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5696 "VideoSupport.c"
+#line 5760 "VideoSupport.c"
 }
 
 
@@ -5708,33 +5772,33 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	GdkPixbuf* _tmp2_;
 	GdkPixbuf* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5722 "VideoSupport.c"
+#line 5786 "VideoSupport.c"
 	}
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5734 "VideoSupport.c"
+#line 5798 "VideoSupport.c"
 }
 
 
@@ -5742,57 +5806,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5744 "VideoSupport.c"
+#line 5808 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5751 "VideoSupport.c"
+#line 5815 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5764 "VideoSupport.c"
+#line 5828 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5771 "VideoSupport.c"
+#line 5835 "VideoSupport.c"
 			}
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5775 "VideoSupport.c"
+#line 5839 "VideoSupport.c"
 		}
-		__finally508:
+		__finally517:
 		{
 			VideoRow* _tmp5_;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5784 "VideoSupport.c"
+#line 5848 "VideoSupport.c"
 		}
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5792 "VideoSupport.c"
+#line 5856 "VideoSupport.c"
 	}
 }
 
@@ -5804,31 +5868,31 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5818 "VideoSupport.c"
+#line 5882 "VideoSupport.c"
 	}
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5828 "VideoSupport.c"
+#line 5892 "VideoSupport.c"
 }
 
 
@@ -5845,69 +5909,69 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_ = NULL;
 	GdkPixbuf* _tmp7_;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp3_;
-#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5869 "VideoSupport.c"
+#line 5933 "VideoSupport.c"
 		GdkPixbuf* _tmp8_;
 		GdkPixbuf* _tmp9_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5880 "VideoSupport.c"
+#line 5944 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_;
 		GdkPixbuf* _tmp11_;
 		GdkPixbuf* _tmp12_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5897 "VideoSupport.c"
+#line 5961 "VideoSupport.c"
 	}
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5907 "VideoSupport.c"
+#line 5971 "VideoSupport.c"
 }
 
 
@@ -5915,15 +5979,15 @@ static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5923 "VideoSupport.c"
+#line 5987 "VideoSupport.c"
 }
 
 
@@ -5932,71 +5996,71 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5942 "VideoSupport.c"
+#line 6006 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5951 "VideoSupport.c"
+#line 6015 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5958 "VideoSupport.c"
+#line 6022 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			ImportID _tmp2_;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 5968 "VideoSupport.c"
+#line 6032 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5975 "VideoSupport.c"
+#line 6039 "VideoSupport.c"
 			}
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5979 "VideoSupport.c"
+#line 6043 "VideoSupport.c"
 		}
-		__finally509:
+		__finally518:
 		{
 			VideoRow* _tmp4_;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5988 "VideoSupport.c"
+#line 6052 "VideoSupport.c"
 		}
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 630 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5996 "VideoSupport.c"
+#line 6060 "VideoSupport.c"
 	}
 }
 
@@ -6005,15 +6069,15 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Video * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6013 "VideoSupport.c"
+#line 6077 "VideoSupport.c"
 }
 
 
@@ -6021,57 +6085,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6023 "VideoSupport.c"
+#line 6087 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6030 "VideoSupport.c"
+#line 6094 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6043 "VideoSupport.c"
+#line 6107 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6050 "VideoSupport.c"
+#line 6114 "VideoSupport.c"
 			}
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6054 "VideoSupport.c"
+#line 6118 "VideoSupport.c"
 		}
-		__finally510:
+		__finally519:
 		{
 			VideoRow* _tmp5_;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6063 "VideoSupport.c"
+#line 6127 "VideoSupport.c"
 		}
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6071 "VideoSupport.c"
+#line 6135 "VideoSupport.c"
 	}
 }
 
@@ -6084,22 +6148,22 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Alteration* _tmp20_;
 	Alteration* _tmp21_;
 	GError * _inner_error_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6092 "VideoSupport.c"
+#line 6156 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6099 "VideoSupport.c"
+#line 6163 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_;
 			const gchar* _tmp4_;
@@ -6107,28 +6171,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			VideoRow* _tmp16_;
 			const gchar* _tmp17_;
 			gchar* _tmp18_;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6115 "VideoSupport.c"
+#line 6179 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6122 "VideoSupport.c"
+#line 6186 "VideoSupport.c"
 				}
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6128 "VideoSupport.c"
+#line 6192 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_;
@@ -6136,143 +6200,143 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				VideoRow* _tmp9_;
 				VideoID _tmp10_;
 				const gchar* _tmp11_;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6154 "VideoSupport.c"
-						goto __catch512_database_error;
+#line 6218 "VideoSupport.c"
+						goto __catch521_database_error;
 					}
 					{
 						VideoRow* _tmp12_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6163 "VideoSupport.c"
+#line 6227 "VideoSupport.c"
 					}
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6173 "VideoSupport.c"
+#line 6237 "VideoSupport.c"
 				}
 			}
-			goto __finally512;
-			__catch512_database_error:
+			goto __finally521;
+			__catch521_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6191 "VideoSupport.c"
+#line 6255 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6198 "VideoSupport.c"
+#line 6262 "VideoSupport.c"
 				}
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6204 "VideoSupport.c"
+#line 6268 "VideoSupport.c"
 			}
-			__finally512:
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally521:
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6209 "VideoSupport.c"
+#line 6273 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6216 "VideoSupport.c"
+#line 6280 "VideoSupport.c"
 				}
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6226 "VideoSupport.c"
+#line 6290 "VideoSupport.c"
 			}
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6238 "VideoSupport.c"
+#line 6302 "VideoSupport.c"
 		}
-		__finally511:
+		__finally520:
 		{
 			VideoRow* _tmp19_;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6247 "VideoSupport.c"
+#line 6311 "VideoSupport.c"
 		}
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6259 "VideoSupport.c"
+#line 6323 "VideoSupport.c"
 		}
 	}
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6272 "VideoSupport.c"
+#line 6336 "VideoSupport.c"
 }
 
 
@@ -6280,57 +6344,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6282 "VideoSupport.c"
+#line 6346 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6289 "VideoSupport.c"
+#line 6353 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6302 "VideoSupport.c"
+#line 6366 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6309 "VideoSupport.c"
+#line 6373 "VideoSupport.c"
 			}
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6313 "VideoSupport.c"
+#line 6377 "VideoSupport.c"
 		}
-		__finally513:
+		__finally522:
 		{
 			VideoRow* _tmp5_;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6322 "VideoSupport.c"
+#line 6386 "VideoSupport.c"
 		}
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6330 "VideoSupport.c"
+#line 6394 "VideoSupport.c"
 	}
 }
 
@@ -6344,22 +6408,22 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Alteration* _tmp23_;
 	Alteration* _tmp24_;
 	GError * _inner_error_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6352 "VideoSupport.c"
+#line 6416 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6359 "VideoSupport.c"
+#line 6423 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_;
 			const gchar* _tmp4_;
@@ -6367,30 +6431,30 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			VideoRow* _tmp18_;
 			const gchar* _tmp19_;
 			gchar* _tmp20_;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6377 "VideoSupport.c"
+#line 6441 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6384 "VideoSupport.c"
+#line 6448 "VideoSupport.c"
 				}
-#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6390 "VideoSupport.c"
+#line 6454 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_;
@@ -6398,154 +6462,154 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				VideoRow* _tmp9_;
 				VideoID _tmp10_;
 				const gchar* _tmp11_;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6414 "VideoSupport.c"
+#line 6478 "VideoSupport.c"
 					gboolean _tmp13_ = FALSE;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6418 "VideoSupport.c"
-						goto __catch515_database_error;
+#line 6482 "VideoSupport.c"
+						goto __catch524_database_error;
 					}
 					{
 						VideoRow* _tmp12_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6427 "VideoSupport.c"
+#line 6491 "VideoSupport.c"
 					}
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp13_;
-#line 6437 "VideoSupport.c"
+#line 6501 "VideoSupport.c"
 				}
 			}
-			goto __finally515;
-			__catch515_database_error:
+			goto __finally524;
+			__catch524_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp14_;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = e;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp14_);
-#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6457 "VideoSupport.c"
+#line 6521 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6464 "VideoSupport.c"
+#line 6528 "VideoSupport.c"
 				}
-#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 686 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6470 "VideoSupport.c"
+#line 6534 "VideoSupport.c"
 			}
-			__finally515:
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally524:
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6475 "VideoSupport.c"
+#line 6539 "VideoSupport.c"
 				gboolean _tmp17_ = FALSE;
 				{
 					VideoRow* _tmp16_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp16_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6483 "VideoSupport.c"
+#line 6547 "VideoSupport.c"
 				}
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp17_;
-#line 6493 "VideoSupport.c"
+#line 6557 "VideoSupport.c"
 			}
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = new_comment;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = g_strdup (_tmp19_);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp18_->comment);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_->comment = _tmp20_;
-#line 6505 "VideoSupport.c"
+#line 6569 "VideoSupport.c"
 		}
-		__finally514:
+		__finally523:
 		{
 			VideoRow* _tmp21_;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6514 "VideoSupport.c"
+#line 6578 "VideoSupport.c"
 		}
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6518 "VideoSupport.c"
+#line 6582 "VideoSupport.c"
 			gboolean _tmp22_ = FALSE;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp22_;
-#line 6528 "VideoSupport.c"
+#line 6592 "VideoSupport.c"
 		}
 	}
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = alteration_new ("metadata", "comment");
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = _tmp23_;
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp24_);
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp24_);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6545 "VideoSupport.c"
+#line 6609 "VideoSupport.c"
 }
 
 
@@ -6553,54 +6617,54 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6555 "VideoSupport.c"
+#line 6619 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6562 "VideoSupport.c"
+#line 6626 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6572 "VideoSupport.c"
+#line 6636 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6579 "VideoSupport.c"
+#line 6643 "VideoSupport.c"
 			}
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6583 "VideoSupport.c"
+#line 6647 "VideoSupport.c"
 		}
-		__finally516:
+		__finally525:
 		{
 			VideoRow* _tmp4_;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6592 "VideoSupport.c"
+#line 6656 "VideoSupport.c"
 		}
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6600 "VideoSupport.c"
+#line 6664 "VideoSupport.c"
 	}
 }
 
@@ -6610,234 +6674,234 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Alteration* _tmp19_;
 	Alteration* _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6612 "VideoSupport.c"
+#line 6676 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6619 "VideoSupport.c"
+#line 6683 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_;
 			gboolean _tmp3_;
 			VideoRow* _tmp16_;
 			Rating _tmp17_;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6634 "VideoSupport.c"
+#line 6698 "VideoSupport.c"
 			} else {
 				Rating _tmp4_;
 				VideoRow* _tmp5_;
 				Rating _tmp6_;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6647 "VideoSupport.c"
+#line 6711 "VideoSupport.c"
 			}
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6651 "VideoSupport.c"
+#line 6715 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6658 "VideoSupport.c"
+#line 6722 "VideoSupport.c"
 				}
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6662 "VideoSupport.c"
+#line 6726 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_;
 				VideoTable* _tmp9_;
 				VideoID _tmp10_ = {0};
 				Rating _tmp11_;
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6685 "VideoSupport.c"
-						goto __catch518_database_error;
+#line 6749 "VideoSupport.c"
+						goto __catch527_database_error;
 					}
 					{
 						VideoRow* _tmp12_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6694 "VideoSupport.c"
+#line 6758 "VideoSupport.c"
 					}
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6702 "VideoSupport.c"
+#line 6766 "VideoSupport.c"
 				}
 			}
-			goto __finally518;
-			__catch518_database_error:
+			goto __finally527;
+			__catch527_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6720 "VideoSupport.c"
+#line 6784 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6727 "VideoSupport.c"
+#line 6791 "VideoSupport.c"
 				}
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6731 "VideoSupport.c"
+#line 6795 "VideoSupport.c"
 			}
-			__finally518:
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally527:
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6736 "VideoSupport.c"
+#line 6800 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6743 "VideoSupport.c"
+#line 6807 "VideoSupport.c"
 				}
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6751 "VideoSupport.c"
+#line 6815 "VideoSupport.c"
 			}
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6759 "VideoSupport.c"
+#line 6823 "VideoSupport.c"
 		}
-		__finally517:
+		__finally526:
 		{
 			VideoRow* _tmp18_;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6768 "VideoSupport.c"
+#line 6832 "VideoSupport.c"
 		}
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6778 "VideoSupport.c"
+#line 6842 "VideoSupport.c"
 		}
 	}
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6789 "VideoSupport.c"
+#line 6853 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6798 "VideoSupport.c"
+#line 6862 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6805 "VideoSupport.c"
+#line 6869 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
 			Rating _tmp3_;
-#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6818 "VideoSupport.c"
+#line 6882 "VideoSupport.c"
 		}
-		__finally519:
+		__finally528:
 		{
 			VideoRow* _tmp4_;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6827 "VideoSupport.c"
+#line 6891 "VideoSupport.c"
 		}
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6837 "VideoSupport.c"
+#line 6901 "VideoSupport.c"
 		}
 	}
 }
@@ -6846,48 +6910,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6848 "VideoSupport.c"
+#line 6912 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6855 "VideoSupport.c"
+#line 6919 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			Rating _tmp2_;
 			Rating _tmp3_;
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6868 "VideoSupport.c"
+#line 6932 "VideoSupport.c"
 		}
-		__finally520:
+		__finally529:
 		{
 			VideoRow* _tmp4_;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6877 "VideoSupport.c"
+#line 6941 "VideoSupport.c"
 		}
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6887 "VideoSupport.c"
+#line 6951 "VideoSupport.c"
 		}
 	}
 }
@@ -6897,15 +6961,15 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6905 "VideoSupport.c"
+#line 6969 "VideoSupport.c"
 }
 
 
@@ -6913,25 +6977,25 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6921 "VideoSupport.c"
+#line 6985 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 745 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6931 "VideoSupport.c"
+#line 6995 "VideoSupport.c"
 }
 
 
@@ -6939,61 +7003,61 @@ static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 745 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 6947 "VideoSupport.c"
+#line 7011 "VideoSupport.c"
 		gboolean _tmp2_;
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 6953 "VideoSupport.c"
+#line 7017 "VideoSupport.c"
 	} else {
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 6957 "VideoSupport.c"
+#line 7021 "VideoSupport.c"
 	}
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 6961 "VideoSupport.c"
+#line 7025 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_;
 		VideoInterpretableResults* _tmp4_;
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 6972 "VideoSupport.c"
+#line 7036 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 753 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6983 "VideoSupport.c"
+#line 7047 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 757 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6993 "VideoSupport.c"
+#line 7057 "VideoSupport.c"
 }
 
 
@@ -7001,15 +7065,15 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7009 "VideoSupport.c"
+#line 7073 "VideoSupport.c"
 }
 
 
@@ -7017,17 +7081,17 @@ static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7027 "VideoSupport.c"
+#line 7091 "VideoSupport.c"
 }
 
 
@@ -7035,71 +7099,71 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 769 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7045 "VideoSupport.c"
+#line 7109 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7054 "VideoSupport.c"
+#line 7118 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7061 "VideoSupport.c"
+#line 7125 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			EventID _tmp2_;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7071 "VideoSupport.c"
+#line 7135 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7078 "VideoSupport.c"
+#line 7142 "VideoSupport.c"
 			}
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7082 "VideoSupport.c"
+#line 7146 "VideoSupport.c"
 		}
-		__finally521:
+		__finally530:
 		{
 			VideoRow* _tmp4_;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7091 "VideoSupport.c"
+#line 7155 "VideoSupport.c"
 		}
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7099 "VideoSupport.c"
+#line 7163 "VideoSupport.c"
 	}
 }
 
@@ -7108,16 +7172,16 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7110 "VideoSupport.c"
+#line 7174 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7117 "VideoSupport.c"
+#line 7181 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			VideoID _tmp2_;
@@ -7128,111 +7192,111 @@ static gchar* video_real_to_string (DataObject* base) {
 			const gchar* _tmp7_;
 			gchar* _tmp8_;
 			gchar* _tmp9_;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7150 "VideoSupport.c"
+#line 7214 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7157 "VideoSupport.c"
+#line 7221 "VideoSupport.c"
 			}
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7161 "VideoSupport.c"
+#line 7225 "VideoSupport.c"
 		}
-		__finally522:
+		__finally531:
 		{
 			VideoRow* _tmp11_;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7170 "VideoSupport.c"
+#line 7234 "VideoSupport.c"
 		}
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7178 "VideoSupport.c"
+#line 7242 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7187 "VideoSupport.c"
+#line 7251 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7194 "VideoSupport.c"
+#line 7258 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			VideoID _tmp2_;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7204 "VideoSupport.c"
+#line 7268 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7211 "VideoSupport.c"
+#line 7275 "VideoSupport.c"
 			}
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7215 "VideoSupport.c"
+#line 7279 "VideoSupport.c"
 		}
-		__finally523:
+		__finally532:
 		{
 			VideoRow* _tmp4_;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7224 "VideoSupport.c"
+#line 7288 "VideoSupport.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7232 "VideoSupport.c"
+#line 7296 "VideoSupport.c"
 	}
 }
 
@@ -7241,55 +7305,55 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7243 "VideoSupport.c"
+#line 7307 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7251 "VideoSupport.c"
+#line 7315 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			time_t _tmp2_;
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7261 "VideoSupport.c"
+#line 7325 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7268 "VideoSupport.c"
+#line 7332 "VideoSupport.c"
 			}
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7272 "VideoSupport.c"
+#line 7336 "VideoSupport.c"
 		}
-		__finally524:
+		__finally533:
 		{
 			VideoRow* _tmp4_;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7281 "VideoSupport.c"
+#line 7345 "VideoSupport.c"
 		}
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 791 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7289 "VideoSupport.c"
+#line 7353 "VideoSupport.c"
 	}
 }
 
@@ -7299,16 +7363,16 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Alteration* _tmp12_;
 	Alteration* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7301 "VideoSupport.c"
+#line 7365 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7308 "VideoSupport.c"
+#line 7372 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_;
 			time_t _tmp10_;
@@ -7318,165 +7382,165 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				VideoRow* _tmp3_;
 				VideoID _tmp4_;
 				time_t _tmp5_;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7334 "VideoSupport.c"
-					goto __catch526_g_error;
+#line 7398 "VideoSupport.c"
+					goto __catch535_g_error;
 				}
 			}
-			goto __finally526;
-			__catch526_g_error:
+			goto __finally535;
+			__catch535_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_;
 				const gchar* _tmp7_;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:804: Warning - %s", _tmp7_);
 #line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:801: Warning - %s", _tmp7_);
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7356 "VideoSupport.c"
+#line 7420 "VideoSupport.c"
 			}
-			__finally526:
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally535:
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7361 "VideoSupport.c"
+#line 7425 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7368 "VideoSupport.c"
+#line 7432 "VideoSupport.c"
 				}
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7376 "VideoSupport.c"
+#line 7440 "VideoSupport.c"
 			}
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7384 "VideoSupport.c"
+#line 7448 "VideoSupport.c"
 		}
-		__finally525:
+		__finally534:
 		{
 			VideoRow* _tmp11_;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7393 "VideoSupport.c"
+#line 7457 "VideoSupport.c"
 		}
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7403 "VideoSupport.c"
+#line 7467 "VideoSupport.c"
 		}
 	}
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7414 "VideoSupport.c"
+#line 7478 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7422 "VideoSupport.c"
+#line 7486 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7429 "VideoSupport.c"
+#line 7493 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gint _tmp2_;
 			VideoRow* _tmp3_;
 			gint _tmp4_;
 			Dimensions _tmp5_ = {0};
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7448 "VideoSupport.c"
+#line 7512 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7455 "VideoSupport.c"
+#line 7519 "VideoSupport.c"
 			}
-#line 814 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7459 "VideoSupport.c"
+#line 7523 "VideoSupport.c"
 		}
-		__finally527:
+		__finally536:
 		{
 			VideoRow* _tmp7_;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7468 "VideoSupport.c"
+#line 7532 "VideoSupport.c"
 		}
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7476 "VideoSupport.c"
+#line 7540 "VideoSupport.c"
 	}
 }
 
@@ -7484,15 +7548,15 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) {
 	Video * self;
 	Dimensions _tmp0_ = {0};
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7492 "VideoSupport.c"
+#line 7556 "VideoSupport.c"
 }
 
 
@@ -7500,15 +7564,15 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	guint64 _tmp0_;
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 819 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 820 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7508 "VideoSupport.c"
+#line 7572 "VideoSupport.c"
 }
 
 
@@ -7516,55 +7580,55 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7518 "VideoSupport.c"
+#line 7582 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		guint64 _tmp5_ = 0ULL;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7526 "VideoSupport.c"
+#line 7590 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gint64 _tmp2_;
-#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7536 "VideoSupport.c"
+#line 7600 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7543 "VideoSupport.c"
+#line 7607 "VideoSupport.c"
 			}
-#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7547 "VideoSupport.c"
+#line 7611 "VideoSupport.c"
 		}
-		__finally528:
+		__finally537:
 		{
 			VideoRow* _tmp4_;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7556 "VideoSupport.c"
+#line 7620 "VideoSupport.c"
 		}
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7564 "VideoSupport.c"
+#line 7628 "VideoSupport.c"
 	}
 }
 
@@ -7573,55 +7637,55 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7575 "VideoSupport.c"
+#line 7639 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		time_t _tmp5_ = 0;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7583 "VideoSupport.c"
+#line 7647 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			time_t _tmp2_;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7593 "VideoSupport.c"
+#line 7657 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7600 "VideoSupport.c"
+#line 7664 "VideoSupport.c"
 			}
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7604 "VideoSupport.c"
+#line 7668 "VideoSupport.c"
 		}
-		__finally529:
+		__finally538:
 		{
 			VideoRow* _tmp4_;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7613 "VideoSupport.c"
+#line 7677 "VideoSupport.c"
 		}
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7621 "VideoSupport.c"
+#line 7685 "VideoSupport.c"
 	}
 }
 
@@ -7634,25 +7698,25 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	Alteration* _tmp19_;
 	Alteration* _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7644 "VideoSupport.c"
+#line 7708 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7652 "VideoSupport.c"
+#line 7716 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 				time_t _tmp4_;
@@ -7667,182 +7731,182 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				VideoRow* _tmp14_;
 				GTimeVal _tmp15_;
 				glong _tmp16_;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7677 "VideoSupport.c"
+#line 7741 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7684 "VideoSupport.c"
+#line 7748 "VideoSupport.c"
 					}
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7688 "VideoSupport.c"
+#line 7752 "VideoSupport.c"
 				}
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7708 "VideoSupport.c"
-					goto __finally531;
+#line 7772 "VideoSupport.c"
+					goto __finally540;
 				}
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7719 "VideoSupport.c"
+#line 7783 "VideoSupport.c"
 			}
-			__finally531:
+			__finally540:
 			{
 				VideoRow* _tmp17_;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7728 "VideoSupport.c"
+#line 7792 "VideoSupport.c"
 			}
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7734 "VideoSupport.c"
-					goto __catch530_database_error;
+#line 7798 "VideoSupport.c"
+					goto __catch539_database_error;
 				}
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7743 "VideoSupport.c"
+#line 7807 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally530;
-	__catch530_database_error:
+	goto __finally539;
+	__catch539_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 850 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7764 "VideoSupport.c"
+#line 7828 "VideoSupport.c"
 	}
-	__finally530:
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally539:
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7775 "VideoSupport.c"
+#line 7839 "VideoSupport.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7785 "VideoSupport.c"
+#line 7849 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7794 "VideoSupport.c"
+#line 7858 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7801 "VideoSupport.c"
+#line 7865 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			const gchar* _tmp2_;
 			gchar* _tmp3_;
-#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7814 "VideoSupport.c"
+#line 7878 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7821 "VideoSupport.c"
+#line 7885 "VideoSupport.c"
 			}
-#line 860 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7825 "VideoSupport.c"
+#line 7889 "VideoSupport.c"
 		}
-		__finally532:
+		__finally541:
 		{
 			VideoRow* _tmp5_;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7834 "VideoSupport.c"
+#line 7898 "VideoSupport.c"
 		}
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7842 "VideoSupport.c"
+#line 7906 "VideoSupport.c"
 	}
 }
 
@@ -7854,23 +7918,23 @@ static GFile* video_real_get_file (MediaSource* base) {
 	gchar* _tmp1_;
 	GFile* _tmp2_;
 	GFile* _tmp3_;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7870 "VideoSupport.c"
+#line 7934 "VideoSupport.c"
 }
 
 
@@ -7878,15 +7942,15 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 866 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 866 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 866 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7886 "VideoSupport.c"
+#line 7950 "VideoSupport.c"
 }
 
 
@@ -7898,94 +7962,94 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* _tmp3_;
 	GFile* _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7926 "VideoSupport.c"
+#line 7990 "VideoSupport.c"
 	}
-#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7930 "VideoSupport.c"
+#line 7994 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 7939 "VideoSupport.c"
+#line 8003 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gdouble _tmp5_ = 0.0;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7947 "VideoSupport.c"
+#line 8011 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gdouble _tmp2_;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7957 "VideoSupport.c"
+#line 8021 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7964 "VideoSupport.c"
+#line 8028 "VideoSupport.c"
 			}
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7968 "VideoSupport.c"
+#line 8032 "VideoSupport.c"
 		}
-		__finally533:
+		__finally542:
 		{
 			VideoRow* _tmp4_;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7977 "VideoSupport.c"
+#line 8041 "VideoSupport.c"
 		}
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 7985 "VideoSupport.c"
+#line 8049 "VideoSupport.c"
 	}
 }
 
@@ -7993,124 +8057,124 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 7995 "VideoSupport.c"
+#line 8059 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gboolean _tmp5_ = FALSE;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8003 "VideoSupport.c"
+#line 8067 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gboolean _tmp2_;
-#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 8013 "VideoSupport.c"
+#line 8077 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8020 "VideoSupport.c"
+#line 8084 "VideoSupport.c"
 			}
-#line 886 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8024 "VideoSupport.c"
+#line 8088 "VideoSupport.c"
 		}
-		__finally534:
+		__finally543:
 		{
 			VideoRow* _tmp4_;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8033 "VideoSupport.c"
+#line 8097 "VideoSupport.c"
 		}
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp5_;
-#line 8041 "VideoSupport.c"
+#line 8105 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 8050 "VideoSupport.c"
+#line 8114 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8057 "VideoSupport.c"
+#line 8121 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			gboolean _tmp2_;
 			gboolean _tmp3_;
 			VideoRow* _tmp5_;
 			gboolean _tmp6_;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8072 "VideoSupport.c"
+#line 8136 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8079 "VideoSupport.c"
+#line 8143 "VideoSupport.c"
 				}
-#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8083 "VideoSupport.c"
+#line 8147 "VideoSupport.c"
 			}
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8091 "VideoSupport.c"
+#line 8155 "VideoSupport.c"
 		}
-		__finally535:
+		__finally544:
 		{
 			VideoRow* _tmp7_;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8100 "VideoSupport.c"
+#line 8164 "VideoSupport.c"
 		}
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8110 "VideoSupport.c"
+#line 8174 "VideoSupport.c"
 		}
 	}
 	{
@@ -8118,61 +8182,61 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		VideoTable* _tmp9_;
 		VideoID _tmp10_ = {0};
 		gboolean _tmp11_;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8134 "VideoSupport.c"
-				goto __catch536_database_error;
+#line 8198 "VideoSupport.c"
+				goto __catch545_database_error;
 			}
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8143 "VideoSupport.c"
+#line 8207 "VideoSupport.c"
 		}
 	}
-	goto __finally536;
-	__catch536_database_error:
+	goto __finally545;
+	__catch545_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		app_window_database_error (_tmp12_);
 #line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		app_window_database_error (_tmp12_);
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8161 "VideoSupport.c"
+#line 8225 "VideoSupport.c"
 	}
-	__finally536:
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally545:
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8172 "VideoSupport.c"
+#line 8236 "VideoSupport.c"
 	}
 }
 
@@ -8199,235 +8263,235 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GdkPixbuf* _tmp27_;
 	GdkPixbuf* _tmp28_;
 	GError * _inner_error_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = -1.0;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8221 "VideoSupport.c"
+#line 8285 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_;
 		gdouble _tmp7_;
 		VideoReader* _tmp8_;
 		GdkPixbuf* _tmp9_;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8238 "VideoSupport.c"
-				goto __catch537_video_error;
+#line 8302 "VideoSupport.c"
+				goto __catch546_video_error;
 			}
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8253 "VideoSupport.c"
+#line 8317 "VideoSupport.c"
 		}
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
-#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 917 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8265 "VideoSupport.c"
+#line 8329 "VideoSupport.c"
 	}
-	goto __finally537;
-	__catch537_video_error:
+	goto __finally546;
+	__catch546_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_;
 		gboolean _tmp11_;
 		VideoInterpretableResults* _tmp12_;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_->update_interpretable = _tmp11_;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 924 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8298 "VideoSupport.c"
+#line 8362 "VideoSupport.c"
 	}
-	__finally537:
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally546:
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8315 "VideoSupport.c"
+#line 8379 "VideoSupport.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_) {
-#line 8321 "VideoSupport.c"
+#line 8385 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_;
 		VideoInterpretableResults* _tmp15_;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_->update_interpretable = FALSE;
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8340 "VideoSupport.c"
+#line 8404 "VideoSupport.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:935: video %s has become interpretable", _tmp19_);
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:932: video %s has become interpretable", _tmp19_);
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8356 "VideoSupport.c"
+#line 8420 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8363 "VideoSupport.c"
+#line 8427 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_;
 			gdouble _tmp22_;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8373 "VideoSupport.c"
+#line 8437 "VideoSupport.c"
 		}
-		__finally538:
+		__finally547:
 		{
 			VideoRow* _tmp23_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8382 "VideoSupport.c"
+#line 8446 "VideoSupport.c"
 		}
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8398 "VideoSupport.c"
+#line 8462 "VideoSupport.c"
 		}
 	}
-#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_->update_interpretable = TRUE;
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_->is_interpretable = TRUE;
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8427 "VideoSupport.c"
+#line 8491 "VideoSupport.c"
 }
 
 
@@ -8436,81 +8500,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8444 "VideoSupport.c"
+#line 8508 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_;
 		VideoTable* _tmp2_;
 		VideoID _tmp3_;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8463 "VideoSupport.c"
-				goto __catch539_database_error;
+#line 8527 "VideoSupport.c"
+				goto __catch548_database_error;
 			}
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8472 "VideoSupport.c"
+#line 8536 "VideoSupport.c"
 		}
 	}
-	goto __finally539;
-	__catch539_database_error:
+	goto __finally548;
+	__catch548_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:957: failed to remove video %s from video table", _tmp5_);
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		_g_free0 (_tmp5_);
 #line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:954: failed to remove video %s from video table", _tmp5_);
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_g_free0 (_tmp5_);
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8495 "VideoSupport.c"
+#line 8559 "VideoSupport.c"
 	}
-	__finally539:
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally548:
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8506 "VideoSupport.c"
+#line 8570 "VideoSupport.c"
 	}
-#line 960 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource));
-#line 8510 "VideoSupport.c"
+#line 8574 "VideoSupport.c"
 }
 
 
@@ -8523,41 +8587,41 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 960 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8535 "VideoSupport.c"
+#line 8599 "VideoSupport.c"
 		gboolean _tmp4_ = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp4_;
-#line 8541 "VideoSupport.c"
+#line 8605 "VideoSupport.c"
 	}
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8547 "VideoSupport.c"
+#line 8611 "VideoSupport.c"
 	} else {
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8551 "VideoSupport.c"
+#line 8615 "VideoSupport.c"
 	}
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8557 "VideoSupport.c"
+#line 8621 "VideoSupport.c"
 }
 
 
@@ -8566,41 +8630,41 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	Alteration* _tmp0_;
 	Alteration* _tmp1_;
 	Alteration* _tmp5_;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8578 "VideoSupport.c"
+#line 8642 "VideoSupport.c"
 		Alteration* _tmp2_;
 		Alteration* _tmp3_;
 		Alteration* _tmp4_;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8592 "VideoSupport.c"
+#line 8656 "VideoSupport.c"
 	}
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8600 "VideoSupport.c"
+#line 8664 "VideoSupport.c"
 }
 
 
@@ -8609,18 +8673,18 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8613 "VideoSupport.c"
+#line 8677 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8620 "VideoSupport.c"
+#line 8684 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -8631,185 +8695,185 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			guint64 _tmp7_;
 			VideoRow* _tmp23_;
 			guint64 _tmp24_;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8649 "VideoSupport.c"
+#line 8713 "VideoSupport.c"
 				VideoRow* _tmp8_;
 				guint64 _tmp9_;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8658 "VideoSupport.c"
+#line 8722 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8665 "VideoSupport.c"
+#line 8729 "VideoSupport.c"
 				}
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8669 "VideoSupport.c"
+#line 8733 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_;
 				VideoTable* _tmp12_;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8690 "VideoSupport.c"
+#line 8754 "VideoSupport.c"
 					guint64 _tmp16_ = 0ULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8694 "VideoSupport.c"
-						goto __catch541_database_error;
+#line 8758 "VideoSupport.c"
+						goto __catch550_database_error;
 					}
 					{
 						VideoRow* _tmp15_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8703 "VideoSupport.c"
+#line 8767 "VideoSupport.c"
 					}
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp16_;
-#line 8711 "VideoSupport.c"
+#line 8775 "VideoSupport.c"
 				}
 			}
-			goto __finally541;
-			__catch541_database_error:
+			goto __finally550;
+			__catch550_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp17_;
 				VideoRow* _tmp18_;
 				guint64 _tmp19_;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = e;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp17_);
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = _tmp18_->flags;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp19_;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8737 "VideoSupport.c"
+#line 8801 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8744 "VideoSupport.c"
+#line 8808 "VideoSupport.c"
 				}
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8748 "VideoSupport.c"
+#line 8812 "VideoSupport.c"
 			}
-			__finally541:
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally550:
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8753 "VideoSupport.c"
+#line 8817 "VideoSupport.c"
 				guint64 _tmp22_ = 0ULL;
 				{
 					VideoRow* _tmp21_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp21_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8761 "VideoSupport.c"
+#line 8825 "VideoSupport.c"
 				}
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp22_;
-#line 8769 "VideoSupport.c"
+#line 8833 "VideoSupport.c"
 			}
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = new_flags;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_->flags = _tmp24_;
-#line 8777 "VideoSupport.c"
+#line 8841 "VideoSupport.c"
 		}
-		__finally540:
+		__finally549:
 		{
 			VideoRow* _tmp25_;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8786 "VideoSupport.c"
+#line 8850 "VideoSupport.c"
 		}
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8790 "VideoSupport.c"
+#line 8854 "VideoSupport.c"
 			guint64 _tmp26_ = 0ULL;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp26_;
-#line 8798 "VideoSupport.c"
+#line 8862 "VideoSupport.c"
 		}
 	}
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = additional_alteration;
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp27_);
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8809 "VideoSupport.c"
+#line 8873 "VideoSupport.c"
 }
 
 
@@ -8818,18 +8882,18 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8822 "VideoSupport.c"
+#line 8886 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8829 "VideoSupport.c"
+#line 8893 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
@@ -8840,246 +8904,246 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			guint64 _tmp7_;
 			VideoRow* _tmp23_;
 			guint64 _tmp24_;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8858 "VideoSupport.c"
+#line 8922 "VideoSupport.c"
 				VideoRow* _tmp8_;
 				guint64 _tmp9_;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8867 "VideoSupport.c"
+#line 8931 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8874 "VideoSupport.c"
+#line 8938 "VideoSupport.c"
 				}
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8878 "VideoSupport.c"
+#line 8942 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_;
 				VideoTable* _tmp12_;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8899 "VideoSupport.c"
+#line 8963 "VideoSupport.c"
 					guint64 _tmp16_ = 0ULL;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8903 "VideoSupport.c"
-						goto __catch543_database_error;
+#line 8967 "VideoSupport.c"
+						goto __catch552_database_error;
 					}
 					{
 						VideoRow* _tmp15_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8912 "VideoSupport.c"
+#line 8976 "VideoSupport.c"
 					}
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return _tmp16_;
-#line 8920 "VideoSupport.c"
+#line 8984 "VideoSupport.c"
 				}
 			}
-			goto __finally543;
-			__catch543_database_error:
+			goto __finally552;
+			__catch552_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp17_;
 				VideoRow* _tmp18_;
 				guint64 _tmp19_;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = e;
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp17_);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = _tmp18_->flags;
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp19_;
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8946 "VideoSupport.c"
+#line 9010 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8953 "VideoSupport.c"
+#line 9017 "VideoSupport.c"
 				}
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8957 "VideoSupport.c"
+#line 9021 "VideoSupport.c"
 			}
-			__finally543:
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally552:
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8962 "VideoSupport.c"
+#line 9026 "VideoSupport.c"
 				guint64 _tmp22_ = 0ULL;
 				{
 					VideoRow* _tmp21_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp21_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8970 "VideoSupport.c"
+#line 9034 "VideoSupport.c"
 				}
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return _tmp22_;
-#line 8978 "VideoSupport.c"
+#line 9042 "VideoSupport.c"
 			}
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = new_flags;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_->flags = _tmp24_;
-#line 8986 "VideoSupport.c"
+#line 9050 "VideoSupport.c"
 		}
-		__finally542:
+		__finally551:
 		{
 			VideoRow* _tmp25_;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8995 "VideoSupport.c"
+#line 9059 "VideoSupport.c"
 		}
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8999 "VideoSupport.c"
+#line 9063 "VideoSupport.c"
 			guint64 _tmp26_ = 0ULL;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return _tmp26_;
-#line 9007 "VideoSupport.c"
+#line 9071 "VideoSupport.c"
 		}
 	}
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = additional_alteration;
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp27_);
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9018 "VideoSupport.c"
+#line 9082 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 9027 "VideoSupport.c"
+#line 9091 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_;
 		gboolean _tmp7_ = FALSE;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9035 "VideoSupport.c"
+#line 9099 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_;
 			guint64 _tmp2_;
 			guint64 _tmp3_;
 			gboolean _tmp4_;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 9051 "VideoSupport.c"
+#line 9115 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9058 "VideoSupport.c"
+#line 9122 "VideoSupport.c"
 			}
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 9062 "VideoSupport.c"
+#line 9126 "VideoSupport.c"
 		}
-		__finally544:
+		__finally553:
 		{
 			VideoRow* _tmp6_;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9071 "VideoSupport.c"
+#line 9135 "VideoSupport.c"
 		}
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return _tmp7_;
-#line 9079 "VideoSupport.c"
+#line 9143 "VideoSupport.c"
 	}
 }
 
@@ -9098,27 +9162,27 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Alteration* _tmp25_;
 	Alteration* _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_filepath = _tmp1_;
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9110 "VideoSupport.c"
+#line 9174 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9118 "VideoSupport.c"
+#line 9182 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_;
 				const gchar* _tmp4_;
@@ -9134,169 +9198,169 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				VideoRow* _tmp15_;
 				const gchar* _tmp16_;
 				gchar* _tmp17_;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9142 "VideoSupport.c"
+#line 9206 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9149 "VideoSupport.c"
+#line 9213 "VideoSupport.c"
 					}
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9157 "VideoSupport.c"
+#line 9221 "VideoSupport.c"
 				}
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9185 "VideoSupport.c"
-					goto __finally546;
+#line 9249 "VideoSupport.c"
+					goto __finally555;
 				}
-#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9198 "VideoSupport.c"
+#line 9262 "VideoSupport.c"
 			}
-			__finally546:
+			__finally555:
 			{
 				VideoRow* _tmp18_;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9207 "VideoSupport.c"
+#line 9271 "VideoSupport.c"
 			}
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9213 "VideoSupport.c"
-					goto __catch545_database_error;
+#line 9277 "VideoSupport.c"
+					goto __catch554_database_error;
 				}
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9226 "VideoSupport.c"
+#line 9290 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally545;
-	__catch545_database_error:
+	goto __finally554;
+	__catch554_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1039 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9251 "VideoSupport.c"
+#line 9315 "VideoSupport.c"
 	}
-	__finally545:
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally554:
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9266 "VideoSupport.c"
+#line 9330 "VideoSupport.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1044 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_);
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9296 "VideoSupport.c"
+#line 9360 "VideoSupport.c"
 }
 
 
@@ -9311,45 +9375,45 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* _tmp6_;
 	VideoMetadata* _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9337 "VideoSupport.c"
+#line 9401 "VideoSupport.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9349 "VideoSupport.c"
+#line 9413 "VideoSupport.c"
 }
 
 
@@ -9371,14 +9435,14 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	self->video = _tmp1_;
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9371 "VideoSupport.c"
+#line 9435 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
 #line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9378 "VideoSupport.c"
+#line 9442 "VideoSupport.c"
 }
 
 
@@ -9392,7 +9456,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	_tmp0_ = self->update_interpretable;
 #line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9392 "VideoSupport.c"
+#line 9456 "VideoSupport.c"
 		Video* _tmp1_;
 		gboolean _tmp2_;
 #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9401,13 +9465,13 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 		_tmp2_ = self->is_interpretable;
 #line 342 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9401 "VideoSupport.c"
+#line 9465 "VideoSupport.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
 #line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9407 "VideoSupport.c"
+#line 9471 "VideoSupport.c"
 		{
 			Video* _tmp4_;
 			GdkPixbuf* _tmp5_;
@@ -9422,8 +9486,8 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
 #line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9422 "VideoSupport.c"
-				goto __catch547_g_error;
+#line 9486 "VideoSupport.c"
+				goto __catch556_g_error;
 			}
 #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
@@ -9433,17 +9497,17 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
 #line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9433 "VideoSupport.c"
-				goto __catch547_g_error;
+#line 9497 "VideoSupport.c"
+				goto __catch556_g_error;
 			}
 #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
 #line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9440 "VideoSupport.c"
+#line 9504 "VideoSupport.c"
 		}
-		goto __finally547;
-		__catch547_g_error:
+		goto __finally556;
+		__catch556_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_;
@@ -9471,9 +9535,9 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_free0 (_tmp11_);
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9471 "VideoSupport.c"
+#line 9535 "VideoSupport.c"
 		}
-		__finally547:
+		__finally556:
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9482,7 +9546,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			g_clear_error (&_inner_error_);
 #line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9482 "VideoSupport.c"
+#line 9546 "VideoSupport.c"
 		}
 	}
 }
@@ -9491,7 +9555,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 static void video_value_interpretable_results_init (GValue* value) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9491 "VideoSupport.c"
+#line 9555 "VideoSupport.c"
 }
 
 
@@ -9500,7 +9564,7 @@ static void video_value_interpretable_results_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9500 "VideoSupport.c"
+#line 9564 "VideoSupport.c"
 	}
 }
 
@@ -9510,11 +9574,11 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 	if (src_value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9510 "VideoSupport.c"
+#line 9574 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9514 "VideoSupport.c"
+#line 9578 "VideoSupport.c"
 	}
 }
 
@@ -9522,37 +9586,37 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9522 "VideoSupport.c"
+#line 9586 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9529 "VideoSupport.c"
+#line 9593 "VideoSupport.c"
 		VideoInterpretableResults * object;
 		object = collect_values[0].v_pointer;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9536 "VideoSupport.c"
+#line 9600 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9540 "VideoSupport.c"
+#line 9604 "VideoSupport.c"
 		}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9544 "VideoSupport.c"
+#line 9608 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9548 "VideoSupport.c"
+#line 9612 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9552 "VideoSupport.c"
+#line 9616 "VideoSupport.c"
 }
 
 
@@ -9563,25 +9627,25 @@ static gchar* video_value_interpretable_results_lcopy_value (const GValue* value
 	if (!object_p) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9563 "VideoSupport.c"
+#line 9627 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9569 "VideoSupport.c"
+#line 9633 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9573 "VideoSupport.c"
+#line 9637 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9577 "VideoSupport.c"
+#line 9641 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9581 "VideoSupport.c"
+#line 9645 "VideoSupport.c"
 }
 
 
@@ -9595,7 +9659,7 @@ GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9595 "VideoSupport.c"
+#line 9659 "VideoSupport.c"
 }
 
 
@@ -9604,7 +9668,7 @@ gpointer video_value_get_interpretable_results (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9604 "VideoSupport.c"
+#line 9668 "VideoSupport.c"
 }
 
 
@@ -9624,17 +9688,17 @@ void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9624 "VideoSupport.c"
+#line 9688 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9628 "VideoSupport.c"
+#line 9692 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9634 "VideoSupport.c"
+#line 9698 "VideoSupport.c"
 	}
 }
 
@@ -9653,17 +9717,17 @@ void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9653 "VideoSupport.c"
+#line 9717 "VideoSupport.c"
 	} else {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9657 "VideoSupport.c"
+#line 9721 "VideoSupport.c"
 	}
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9663 "VideoSupport.c"
+#line 9727 "VideoSupport.c"
 	}
 }
 
@@ -9673,7 +9737,7 @@ static void video_interpretable_results_class_init (VideoInterpretableResultsCla
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9673 "VideoSupport.c"
+#line 9737 "VideoSupport.c"
 }
 
 
@@ -9686,7 +9750,7 @@ static void video_interpretable_results_instance_init (VideoInterpretableResults
 	self->new_thumbnail = NULL;
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9686 "VideoSupport.c"
+#line 9750 "VideoSupport.c"
 }
 
 
@@ -9700,7 +9764,7 @@ static void video_interpretable_results_finalize (VideoInterpretableResults * ob
 	_g_object_unref0 (self->video);
 #line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9700 "VideoSupport.c"
+#line 9764 "VideoSupport.c"
 }
 
 
@@ -9725,7 +9789,7 @@ gpointer video_interpretable_results_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9725 "VideoSupport.c"
+#line 9789 "VideoSupport.c"
 }
 
 
@@ -9738,7 +9802,7 @@ void video_interpretable_results_unref (gpointer instance) {
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9738 "VideoSupport.c"
+#line 9802 "VideoSupport.c"
 	}
 }
 
@@ -9822,7 +9886,7 @@ static void video_class_init (VideoClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) video_real_internal_delete_backing;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9822 "VideoSupport.c"
+#line 9886 "VideoSupport.c"
 }
 
 
@@ -9835,7 +9899,7 @@ static void video_flaggable_interface_init (FlaggableIface * iface) {
 	iface->mark_flagged = (void (*) (Flaggable *)) video_real_mark_flagged;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*) (Flaggable *)) video_real_mark_unflagged;
-#line 9835 "VideoSupport.c"
+#line 9899 "VideoSupport.c"
 }
 
 
@@ -9852,7 +9916,7 @@ static void video_monitorable_interface_init (MonitorableIface * iface) {
 	iface->set_master_timestamp = (void (*) (Monitorable *, GFileInfo*)) video_real_set_master_timestamp;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*) (Monitorable *, GFile*)) video_real_set_master_file;
-#line 9852 "VideoSupport.c"
+#line 9916 "VideoSupport.c"
 }
 
 
@@ -9863,7 +9927,7 @@ static void video_dateable_interface_init (DateableIface * iface) {
 	iface->get_exposure_time = (time_t (*) (Dateable *)) video_real_get_exposure_time;
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*) (Dateable *, time_t)) video_real_set_exposure_time;
-#line 9863 "VideoSupport.c"
+#line 9927 "VideoSupport.c"
 }
 
 
@@ -9872,7 +9936,7 @@ static void video_instance_init (Video * self) {
 	self->priv = VIDEO_GET_PRIVATE (self);
 #line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9872 "VideoSupport.c"
+#line 9936 "VideoSupport.c"
 }
 
 
@@ -9886,7 +9950,7 @@ static void video_finalize (GObject * obj) {
 	_video_row_unref0 (self->priv->backing_row);
 #line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9886 "VideoSupport.c"
+#line 9950 "VideoSupport.c"
 }
 
 
@@ -9923,44 +9987,44 @@ GType video_source_collection_state_get_type (void) {
 static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = uint64_compare ((guint64*) a, (guint64*) b);
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9925 "VideoSupport.c"
+#line 9989 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 9937 "VideoSupport.c"
+#line 10001 "VideoSupport.c"
 }
 
 
 static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = video_source_collection_get_video_key (source);
-#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9946 "VideoSupport.c"
+#line 10010 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9953 "VideoSupport.c"
+#line 10017 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9960 "VideoSupport.c"
+#line 10024 "VideoSupport.c"
 }
 
 
@@ -9970,43 +10034,43 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	MediaSourceHoldingTank* _tmp1_;
 	MediaSourceHoldingTank* _tmp2_;
 	MediaSourceHoldingTank* _tmp3_;
-#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoSourceCollection*) media_source_collection_construct (object_type, "VideoSourceCollection", _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9990 "VideoSupport.c"
+#line 10054 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 9997 "VideoSupport.c"
+#line 10061 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_trashed (source);
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10006 "VideoSupport.c"
+#line 10070 "VideoSupport.c"
 }
 
 
@@ -10014,24 +10078,24 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10022 "VideoSupport.c"
+#line 10086 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_offline (source);
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10031 "VideoSupport.c"
+#line 10095 "VideoSupport.c"
 }
 
 
@@ -10039,15 +10103,15 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_offline_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10047 "VideoSupport.c"
+#line 10111 "VideoSupport.c"
 }
 
 
@@ -10056,21 +10120,21 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	MediaMonitor* result = NULL;
 	GCancellable* _tmp0_;
 	VideoMonitor* _tmp1_;
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10070 "VideoSupport.c"
+#line 10134 "VideoSupport.c"
 }
 
 
@@ -10078,17 +10142,17 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
-#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10088 "VideoSupport.c"
+#line 10152 "VideoSupport.c"
 }
 
 
@@ -10096,15 +10160,15 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10104 "VideoSupport.c"
+#line 10168 "VideoSupport.c"
 }
 
 
@@ -10113,57 +10177,57 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	gboolean result = FALSE;
 	GFile* _tmp0_;
 	gboolean _tmp1_;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10125 "VideoSupport.c"
+#line 10189 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10144 "VideoSupport.c"
+#line 10208 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10163 "VideoSupport.c"
+#line 10227 "VideoSupport.c"
 }
 
 
@@ -10173,19 +10237,19 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	gint64 _tmp0_;
 	VideoID _tmp1_ = {0};
 	Video* _tmp2_;
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10185 "VideoSupport.c"
+#line 10249 "VideoSupport.c"
 }
 
 
@@ -10198,29 +10262,29 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	VideoID _tmp2_ = {0};
 	VideoID _tmp3_;
 	gint64 _tmp4_;
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = _tmp1_;
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10220 "VideoSupport.c"
+#line 10284 "VideoSupport.c"
 }
 
 
@@ -10228,17 +10292,17 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
 	gboolean _tmp1_;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10238 "VideoSupport.c"
+#line 10302 "VideoSupport.c"
 }
 
 
@@ -10246,17 +10310,17 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_;
 	gboolean _tmp1_;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10256 "VideoSupport.c"
+#line 10320 "VideoSupport.c"
 }
 
 
@@ -10265,21 +10329,21 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	VideoID _tmp0_;
 	gint64 _tmp1_;
 	DataSource* _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10279 "VideoSupport.c"
+#line 10343 "VideoSupport.c"
 }
 
 
@@ -10291,27 +10355,27 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	EventID _tmp2_;
 	GeeArrayList* _tmp3_;
 	GeeCollection* _tmp4_;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10311 "VideoSupport.c"
+#line 10375 "VideoSupport.c"
 }
 
 
@@ -10332,113 +10396,113 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	GFile* _tmp10_;
 	MediaSource* _tmp11_;
 	Video* _tmp12_;
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ != NULL) {
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10354 "VideoSupport.c"
+#line 10418 "VideoSupport.c"
 		}
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10358 "VideoSupport.c"
+#line 10422 "VideoSupport.c"
 	}
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10386 "VideoSupport.c"
+#line 10450 "VideoSupport.c"
 		}
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10390 "VideoSupport.c"
+#line 10454 "VideoSupport.c"
 	}
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp9_);
-#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp12_ != NULL) {
-#line 1166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10418 "VideoSupport.c"
+#line 10482 "VideoSupport.c"
 		}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10422 "VideoSupport.c"
+#line 10486 "VideoSupport.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10434 "VideoSupport.c"
+#line 10498 "VideoSupport.c"
 	}
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10438 "VideoSupport.c"
+#line 10502 "VideoSupport.c"
 }
 
 
@@ -10452,83 +10516,83 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	GFileInfo* _tmp6_;
 	GTimeVal _tmp7_ = {0};
 	glong _tmp8_;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != ((guint64) _tmp3_)) {
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10472 "VideoSupport.c"
+#line 10536 "VideoSupport.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10486 "VideoSupport.c"
+#line 10550 "VideoSupport.c"
 		GeeCollection* _tmp9_;
 		Video* _tmp10_;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10495 "VideoSupport.c"
+#line 10559 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10507 "VideoSupport.c"
+#line 10571 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10528 "VideoSupport.c"
+#line 10592 "VideoSupport.c"
 			GeeIterator* _tmp4_;
 			gboolean _tmp5_;
 			DataObject* object = NULL;
@@ -10537,37 +10601,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			DataObject* _tmp8_;
 			GFileInfo* _tmp9_;
 			GeeCollection* _tmp10_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10545 "VideoSupport.c"
+#line 10609 "VideoSupport.c"
 			}
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			object = (DataObject*) _tmp7_;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10563 "VideoSupport.c"
+#line 10627 "VideoSupport.c"
 		}
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10567 "VideoSupport.c"
+#line 10631 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10575,21 +10639,21 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		GeeCollection* _tmp12_;
 		GeeIterator* _tmp13_;
 		GeeIterator* _tmp14_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10589 "VideoSupport.c"
+#line 10653 "VideoSupport.c"
 			GeeIterator* _tmp15_;
 			gboolean _tmp16_;
 			MediaSource* media = NULL;
@@ -10598,37 +10662,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			MediaSource* _tmp19_;
 			GFileInfo* _tmp20_;
 			GeeCollection* _tmp21_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10606 "VideoSupport.c"
+#line 10670 "VideoSupport.c"
 			}
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media = (MediaSource*) _tmp18_;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10624 "VideoSupport.c"
+#line 10688 "VideoSupport.c"
 		}
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10628 "VideoSupport.c"
+#line 10692 "VideoSupport.c"
 	}
 }
 
@@ -10639,30 +10703,30 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	GeeIterable* _tmp13_;
 	GeeIterable* _tmp26_;
 	GeeIterable* _tmp27_;
-#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10649 "VideoSupport.c"
+#line 10713 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10662 "VideoSupport.c"
+#line 10726 "VideoSupport.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataObject* object = NULL;
@@ -10675,67 +10739,67 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp10_;
 				guint64 _tmp11_;
 				Video* _tmp12_;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10683 "VideoSupport.c"
+#line 10747 "VideoSupport.c"
 				}
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp6_;
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
 #line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10711 "VideoSupport.c"
+#line 10775 "VideoSupport.c"
 			}
-#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1192 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10715 "VideoSupport.c"
+#line 10779 "VideoSupport.c"
 		}
 	}
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10722 "VideoSupport.c"
+#line 10786 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_;
 			GeeIterator* _tmp15_;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10735 "VideoSupport.c"
+#line 10799 "VideoSupport.c"
 				GeeIterator* _tmp16_;
 				gboolean _tmp17_;
 				DataObject* object = NULL;
@@ -10748,66 +10812,66 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp23_;
 				guint64 _tmp24_;
 				Video* _tmp25_;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10756 "VideoSupport.c"
+#line 10820 "VideoSupport.c"
 				}
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp19_;
-#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1204 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
 #line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10784 "VideoSupport.c"
+#line 10848 "VideoSupport.c"
 			}
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10788 "VideoSupport.c"
+#line 10852 "VideoSupport.c"
 		}
 	}
-#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_);
-#line 10797 "VideoSupport.c"
+#line 10861 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1210 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10807 "VideoSupport.c"
+#line 10871 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_;
@@ -10816,25 +10880,25 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10834 "VideoSupport.c"
+#line 10898 "VideoSupport.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			Video* video = NULL;
@@ -10847,72 +10911,72 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			const gchar* _tmp14_;
 			gint _tmp15_;
 			gboolean _tmp16_;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10855 "VideoSupport.c"
+#line 10919 "VideoSupport.c"
 			}
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video = (Video*) _tmp9_;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10881 "VideoSupport.c"
+#line 10945 "VideoSupport.c"
 				Video* _tmp17_;
 				VideoID _tmp18_ = {0};
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10896 "VideoSupport.c"
+#line 10960 "VideoSupport.c"
 			}
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10900 "VideoSupport.c"
+#line 10964 "VideoSupport.c"
 		}
-#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1211 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10904 "VideoSupport.c"
+#line 10968 "VideoSupport.c"
 	}
-#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1219 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10912 "VideoSupport.c"
+#line 10976 "VideoSupport.c"
 }
 
 
@@ -10922,23 +10986,23 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	guint64 _tmp1_;
 	VideoID _tmp2_ = {0};
 	gboolean _tmp3_;
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1221 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10938 "VideoSupport.c"
+#line 11002 "VideoSupport.c"
 }
 
 
@@ -10947,88 +11011,88 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_;
 	TransactionController* _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 10953 "VideoSupport.c"
+#line 11017 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_;
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 10961 "VideoSupport.c"
+#line 11025 "VideoSupport.c"
 	}
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10969 "VideoSupport.c"
+#line 11033 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) video_source_collection_real_create_trashcan;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) video_source_collection_real_create_offline_bin;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) video_source_collection_real_create_media_monitor;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) video_source_collection_real_holds_type_of_source;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) video_source_collection_real_get_typename;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) video_source_collection_real_is_file_recognized;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) video_source_collection_real_fetch_by_numeric_id;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) video_source_collection_real_get_event_source_ids;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) video_source_collection_real_notify_contents_altered;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 11000 "VideoSupport.c"
+#line 11064 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
 	GeeTreeMultiMap* _tmp0_;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, (GDestroyNotify) g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 11014 "VideoSupport.c"
+#line 11078 "VideoSupport.c"
 }
 
 
 static void video_source_collection_finalize (DataCollection * obj) {
 	VideoSourceCollection * self;
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 11028 "VideoSupport.c"
+#line 11092 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index d742dda..857a901 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -404,15 +404,12 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
          * https://bugzilla.gnome.org/show_bug.cgi?id=762416
          */
 
-        var feature = registry.find_feature ("vaapidecodebin",
-                                             typeof (Gst.ElementFactory));
-        if (feature != null) {
-            registry.remove_feature (feature);
-        }
+        var features = registry.feature_filter ((f) => {
+            return f.get_name ().has_prefix ("vaapi");
+        }, false);
 
-        feature = registry.find_feature ("vaapidecode",
-                                         typeof (Gst.ElementFactory));
-        if (feature != null) {
+        foreach (var feature in features) {
+            debug ("Removing registry feature %s", feature.get_name ());
             registry.remove_feature (feature);
         }
 
diff --git a/src/_transformation.c b/src/_transformation.c
new file mode 100644
index 0000000..7c5a7b0
--- /dev/null
+++ b/src/_transformation.c
@@ -0,0 +1,180 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include "shotwell-graphics-processor.h"
+
+static inline void _pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
+    PixelFormat current_format = PIXEL_FORMAT_RGB;
+    RGBAnalyticPixel p_rgb = {p->red, p->green, p->blue };
+    HSVAnalyticPixel p_hsv = {0.0f, 0.0f, 0.0f};
+    gint i = 0;
+
+    for (i = 0; i < self->optimized_slots_used; i++) {
+        PixelTransformation* trans = NULL;
+        PixelFormat preferred_format;
+
+        trans = self->optimized_transformations[i];
+        preferred_format = pixel_transformation_get_preferred_format (trans);
+        if (preferred_format == PIXEL_FORMAT_RGB) {
+            RGBAnalyticPixel _tmp14_ = {0};
+            if (current_format == PIXEL_FORMAT_HSV) {
+                hsv_analytic_pixel_to_rgb (&p_hsv, &p_rgb);
+                current_format = PIXEL_FORMAT_RGB;
+            }
+            pixel_transformation_transform_pixel_rgb (trans, &p_rgb, &_tmp14_);
+            p_rgb.red =_tmp14_.red;
+            p_rgb.green =_tmp14_.green;
+            p_rgb.blue =_tmp14_.blue;
+        } else {
+            HSVAnalyticPixel _tmp19_ = {0};
+            if (current_format == PIXEL_FORMAT_RGB) {
+                rgb_analytic_pixel_to_hsv (&p_rgb, &p_hsv);
+                current_format = PIXEL_FORMAT_HSV;
+            }
+            pixel_transformation_transform_pixel_hsv (trans, &p_hsv, &_tmp19_);
+            p_hsv.hue = _tmp19_.hue;
+            p_hsv.saturation = _tmp19_.saturation;
+            p_hsv.light_value = _tmp19_.light_value;
+        }
+    }
+
+    if (current_format == PIXEL_FORMAT_HSV) {
+        hsv_analytic_pixel_to_rgb (&p_hsv, &p_rgb);
+    }
+
+    result->red = p_rgb.red;
+    result->green = p_rgb.green;
+    result->blue = p_rgb.blue;
+}
+
+void pixel_transformer_apply_transformations (PixelTransformer* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
+    _pixel_transformer_apply_transformations (self, p, result);
+}
+
+void pixel_transformer_apply_transformation (PixelTransformer* self,
+                                             guint row,
+                                             gint rowstride,
+                                             gint rowbytes,
+                                             gint n_channels,
+                                             guchar* source_pixels, int source_pixels_length1,
+                                             guchar* dest_pixels, int dest_pixels_length1) {
+    guint row_start_index = row * rowstride;
+    guint row_end_index = row_start_index + rowbytes;
+    guint i = 0;
+
+    for (i = row_start_index; i < row_end_index; i += n_channels) {
+        RGBAnalyticPixel current_pixel = { rgb_lookup_table[source_pixels[i]],
+                                           rgb_lookup_table[source_pixels[i+1]],
+                                           rgb_lookup_table[source_pixels[i+2]] };
+        RGBAnalyticPixel transformed_pixel = { 0.0f, 0.0f, 0.0f };
+        _pixel_transformer_apply_transformations (self, &current_pixel, &transformed_pixel);
+        dest_pixels[i] = (guchar) (transformed_pixel.red * 255.0f);
+        dest_pixels[i+1] = (guchar) (transformed_pixel.green * 255.0f);
+        dest_pixels[i+2] = (guchar) (transformed_pixel.blue * 255.0f);
+    }
+}
+
+void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result) {
+    if (self->saturation == 0.0f) {
+        result->red = self->light_value;
+        result->green = self->light_value;
+        result->blue = self->light_value;
+
+        return;
+    }
+
+    float hue_denorm = self->hue * 360.0f;
+    if (hue_denorm == 360.0f)
+        hue_denorm = 0.0f;
+
+    float hue_hexant = hue_denorm / 60.0f;
+    int hexant_i_part = (int) hue_hexant;
+    float hexant_f_part = hue_hexant - ((float) hexant_i_part);
+
+    float p = self->light_value * (1.0f - self->saturation);
+    float q = self->light_value * (1.0f - (self->saturation * hexant_f_part));
+    float t = self->light_value * (1.0f - (self->saturation * (1.0f - hexant_f_part)));
+
+    switch (hexant_i_part) {
+        case 0:
+            result->red = self->light_value; result->green = t; result->blue = p;
+        break;
+        case 1:
+            result->red = q; result->green = self->light_value; result->blue = p;
+        break;
+        case 2:
+            result->red = p; result->green = self->light_value; result->blue = t;
+        break;
+        case 3:
+            result->red = p; result->green = q; result->blue = self->light_value;
+        break;
+        case 4:
+            result->red = t; result->green = p; result->blue = self->light_value;
+        break;
+        case 5:
+            result->red = self->light_value; result->green = p; result->blue = q;
+        break;
+        default:
+            g_assert_not_reached();
+    }
+}
+
+void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p) {
+    gfloat max_component = MAX(MAX(p->red, p->green), p->blue);
+    gfloat min_component = MIN(MIN(p->red, p->green), p->blue);
+
+    self->light_value = max_component;
+    gfloat delta = max_component - min_component;
+    self->saturation = (max_component != 0.0f) ? ((delta) / max_component) : 0.0f;
+    if (self->saturation == 0.0f) {
+        self->hue = 0.0f;
+
+        return;
+    }
+
+    if (p->red == max_component) {
+        self->hue = (p->green - p->blue) / delta;
+    } else if (p->green == max_component) {
+        self->hue = 2.0f + ((p->blue - p->red) / delta);
+    } else if (p->blue == max_component) {
+        self->hue = 4.0f + ((p->red - p->green) / delta);
+    }
+
+    self->hue *= 60.0f;
+    if (self->hue < 0.0f) {
+        self->hue += 360.0f;
+    }
+
+    self->hue /= 360.0f;
+    self->hue = CLAMP(self->hue, 0.0f, 1.0f);
+    self->saturation = CLAMP(self->saturation, 0.0f, 1.0f);
+    self->light_value = CLAMP(self->light_value, 0.0f, 1.0f);
+}
+
+void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* base, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
+    RGBTransformation *self = RGB_TRANSFORMATION(base);
+    result->red = CLAMP(p->red * self->matrix_entries[0] +
+                        p->green * self->matrix_entries[1] +
+                        p->blue * self->matrix_entries[2] +
+                                  self->matrix_entries[3], 0.0f, 1.0f);
+    result->green = CLAMP(p->red * self->matrix_entries[4] +
+                          p->green * self->matrix_entries[5] +
+                          p->blue * self->matrix_entries[6] +
+                                    self->matrix_entries[7], 0.0f, 1.0f);
+    result->blue = CLAMP(p->red * self->matrix_entries[8] +
+                         p->green * self->matrix_entries[9] +
+                         p->blue * self->matrix_entries[10] +
+                                   self->matrix_entries[11], 0.0f, 1.0f);
+}
+
+
+void hsv_transformation_real_transform_pixel_hsv (PixelTransformation* base, HSVAnalyticPixel* pixel, HSVAnalyticPixel* result) {
+    HSVTransformation *self = HSV_TRANSFORMATION(base);
+    result->hue = pixel->hue;
+    result->saturation = pixel->saturation;
+    result->light_value = CLAMP(self->remap_table[(int) (pixel->light_value * 255.0f)], 0.0f, 1.0f);
+}
diff --git a/src/camera/Branch.c b/src/camera/CameraBranch.c
index 60ed699..9ac4b11 100644
--- a/src/camera/Branch.c
+++ b/src/camera/CameraBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* CameraBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from CameraBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -433,8 +433,8 @@ GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 enum  {
 	CAMERA_HEADER_DUMMY_PROPERTY
 };
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -459,23 +459,23 @@ static void camera_sidebar_entry_finalize (GObject * obj);
 static gint _camera_branch_camera_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = camera_branch_camera_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 465 "Branch.c"
+#line 465 "CameraBranch.c"
 }
 
 
 static void _camera_branch_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_on_camera_added ((CameraBranch*) self, camera);
-#line 472 "Branch.c"
+#line 472 "CameraBranch.c"
 }
 
 
 static void _camera_branch_on_camera_removed_camera_table_camera_removed (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_on_camera_removed ((CameraBranch*) self, camera);
-#line 479 "Branch.c"
+#line 479 "CameraBranch.c"
 }
 
 
@@ -487,15 +487,15 @@ CameraBranch* camera_branch_construct (GType object_type) {
 	CameraTable* _tmp14_;
 	CameraTable* _tmp15_;
 	CameraTable* _tmp16_;
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = camera_header_new ();
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = (CameraBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, _camera_branch_camera_comparator_gcompare_func, NULL);
-#line 14 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 499 "Branch.c"
+#line 499 "CameraBranch.c"
 	{
 		GeeIterator* _camera_it = NULL;
 		CameraTable* _tmp2_;
@@ -504,87 +504,87 @@ CameraBranch* camera_branch_construct (GType object_type) {
 		GeeIterable* _tmp5_;
 		GeeIterator* _tmp6_;
 		GeeIterator* _tmp7_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp2_ = camera_table_get_instance ();
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp4_ = camera_table_get_cameras (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp6_ = gee_iterable_iterator (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp7_ = _tmp6_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (_tmp5_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_camera_table_unref0 (_tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_camera_it = _tmp7_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		while (TRUE) {
-#line 528 "Branch.c"
+#line 528 "CameraBranch.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			DiscoveredCamera* camera = NULL;
 			GeeIterator* _tmp10_;
 			gpointer _tmp11_;
 			DiscoveredCamera* _tmp12_;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp8_ = _camera_it;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			if (!_tmp9_) {
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 				break;
-#line 543 "Branch.c"
+#line 543 "CameraBranch.c"
 			}
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp10_ = _camera_it;
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			camera = (DiscoveredCamera*) _tmp11_;
-#line 19 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp12_ = camera;
-#line 19 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			camera_branch_add_camera (self, _tmp12_);
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_discovered_camera_unref0 (camera);
-#line 557 "Branch.c"
+#line 557 "CameraBranch.c"
 		}
-#line 18 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (_camera_it);
-#line 561 "Branch.c"
+#line 561 "CameraBranch.c"
 	}
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp13_ = camera_table_get_instance ();
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp14_ = _tmp13_;
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_signal_connect_object (_tmp14_, "camera-added", (GCallback) _camera_branch_on_camera_added_camera_table_camera_added, self, 0);
-#line 21 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_camera_table_unref0 (_tmp14_);
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp15_ = camera_table_get_instance ();
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp16_ = _tmp15_;
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_signal_connect_object (_tmp16_, "camera-removed", (GCallback) _camera_branch_on_camera_removed_camera_table_camera_removed, self, 0);
-#line 22 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_camera_table_unref0 (_tmp16_);
-#line 13 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 581 "Branch.c"
+#line 581 "CameraBranch.c"
 }
 
 
 CameraBranch* camera_branch_new (void) {
-#line 13 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_branch_construct (CAMERA_TYPE_BRANCH);
-#line 588 "Branch.c"
+#line 588 "CameraBranch.c"
 }
 
 
@@ -597,9 +597,9 @@ void camera_branch_terminate (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 603 "Branch.c"
+#line 603 "CameraBranch.c"
 }
 
 
@@ -617,49 +617,49 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint _tmp8_;
 	gint _tmp9_;
 	gint _tmp10_;
-#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 31 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = a;
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = b;
-#line 32 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 33 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		result = 0;
-#line 33 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		return result;
-#line 635 "Branch.c"
+#line 635 "CameraBranch.c"
 	}
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = a;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = sidebar_entry_get_sidebar_name (_tmp2_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp5_ = b;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp6_ = sidebar_entry_get_sidebar_name (_tmp5_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp7_ = _tmp6_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp8_ = g_utf8_collate (_tmp4_, _tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (_tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (_tmp4_);
-#line 36 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	ret = _tmp9_;
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp10_ = ret;
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	if (_tmp10_ == 0) {
-#line 663 "Branch.c"
+#line 663 "CameraBranch.c"
 		CameraSidebarEntry* cam_a = NULL;
 		SidebarEntry* _tmp11_;
 		CameraSidebarEntry* _tmp12_;
@@ -675,67 +675,67 @@ static gint camera_branch_camera_comparator (SidebarEntry* a, SidebarEntry* b) {
 		gchar* _tmp22_;
 		gchar* _tmp23_;
 		gint _tmp24_;
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp11_ = a;
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp11_) : NULL);
-#line 39 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		cam_a = _tmp12_;
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp13_ = b;
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, CAMERA_TYPE_SIDEBAR_ENTRY) ? ((CameraSidebarEntry*) _tmp13_) : NULL);
-#line 40 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		cam_b = _tmp14_;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp16_ = cam_a;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		if (_tmp16_ != NULL) {
-#line 695 "Branch.c"
+#line 695 "CameraBranch.c"
 			CameraSidebarEntry* _tmp17_;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp17_ = cam_b;
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp15_ = _tmp17_ != NULL;
-#line 701 "Branch.c"
+#line 701 "CameraBranch.c"
 		} else {
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 			_tmp15_ = FALSE;
-#line 705 "Branch.c"
+#line 705 "CameraBranch.c"
 		}
-#line 41 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_vala_assert (_tmp15_, "cam_a != null && cam_b != null");
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp18_ = cam_a;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp19_ = camera_sidebar_entry_get_uri (_tmp18_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp20_ = _tmp19_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp21_ = cam_b;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp22_ = camera_sidebar_entry_get_uri (_tmp21_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp23_ = _tmp22_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp24_ = g_utf8_collate (_tmp20_, _tmp23_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		ret = _tmp24_;
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_free0 (_tmp23_);
-#line 42 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_free0 (_tmp20_);
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (cam_b);
-#line 37 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_g_object_unref0 (cam_a);
-#line 733 "Branch.c"
+#line 733 "CameraBranch.c"
 	}
-#line 45 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = ret;
-#line 45 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 45 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 739 "Branch.c"
+#line 739 "CameraBranch.c"
 }
 
 
@@ -744,49 +744,49 @@ CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, Disc
 	GeeHashMap* _tmp0_;
 	DiscoveredCamera* _tmp1_;
 	gpointer _tmp2_;
-#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (CAMERA_IS_BRANCH (self), NULL);
-#line 48 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = camera;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = (CameraSidebarEntry*) _tmp2_;
-#line 49 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 762 "Branch.c"
+#line 762 "CameraBranch.c"
 }
 
 
 static void camera_branch_on_camera_added (CameraBranch* self, DiscoveredCamera* camera) {
 	DiscoveredCamera* _tmp0_;
-#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 52 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 53 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = camera;
-#line 53 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_add_camera (self, _tmp0_);
-#line 776 "Branch.c"
+#line 776 "CameraBranch.c"
 }
 
 
 static void camera_branch_on_camera_removed (CameraBranch* self, DiscoveredCamera* camera) {
 	DiscoveredCamera* _tmp0_;
-#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 57 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = camera;
-#line 57 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_remove_camera (self, _tmp0_);
-#line 790 "Branch.c"
+#line 790 "CameraBranch.c"
 }
 
 
@@ -801,41 +801,41 @@ static void camera_branch_add_camera (CameraBranch* self, DiscoveredCamera* came
 	DiscoveredCamera* _tmp6_;
 	SidebarEntry* _tmp7_;
 	SidebarEntry* _tmp8_;
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = camera;
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (!_tmp2_, "!camera_map.has_key(camera)");
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = camera;
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = camera_sidebar_entry_new (_tmp3_);
-#line 63 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	entry = _tmp4_;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp5_ = self->priv->camera_map;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp6_ = camera;
-#line 64 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, entry);
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp7_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp8_ = _tmp7_;
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 67 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (_tmp8_);
-#line 60 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (entry);
-#line 839 "Branch.c"
+#line 839 "CameraBranch.c"
 }
 
 
@@ -851,83 +851,83 @@ static void camera_branch_remove_camera (CameraBranch* self, DiscoveredCamera* c
 	GeeHashMap* _tmp6_;
 	DiscoveredCamera* _tmp7_;
 	gboolean _tmp8_;
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (CAMERA_IS_BRANCH (self));
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera_map;
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = camera;
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 71 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (_tmp2_, "camera_map.has_key(camera)");
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = self->priv->camera_map;
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = camera;
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 73 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	entry = (CameraSidebarEntry*) _tmp5_;
-#line 74 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (entry != NULL, "entry != null");
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp6_ = self->priv->camera_map;
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp7_ = camera;
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp8_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, NULL);
-#line 76 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	removed = _tmp8_;
-#line 77 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_vala_assert (removed, "removed");
-#line 79 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 70 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (entry);
-#line 891 "Branch.c"
+#line 891 "CameraBranch.c"
 }
 
 
 static void camera_branch_class_init (CameraBranchClass * klass) {
 	gchar* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_type_class_add_private (klass, sizeof (CameraBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_branch_finalize;
-#line 8 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_CAMERAS);
-#line 8 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_branch_cameras_icon = _tmp0_;
-#line 907 "Branch.c"
+#line 907 "CameraBranch.c"
 }
 
 
 static void camera_branch_instance_init (CameraBranch * self) {
 	GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv = CAMERA_BRANCH_GET_PRIVATE (self);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv->camera_map = _tmp0_;
-#line 919 "Branch.c"
+#line 919 "CameraBranch.c"
 }
 
 
 static void camera_branch_finalize (GObject * obj) {
 	CameraBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_BRANCH, CameraBranch);
-#line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_object_unref0 (self->priv->camera_map);
-#line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (camera_branch_parent_class)->finalize (obj);
-#line 931 "Branch.c"
+#line 931 "CameraBranch.c"
 }
 
 
@@ -945,25 +945,25 @@ GType camera_branch_get_type (void) {
 
 CameraHeader* camera_header_construct (GType object_type) {
 	CameraHeader * self = NULL;
-#line 85 "/home/jens/Source/shotwell/src/camera/Branch.vala"
-	self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), TRUE);
-#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
+	self = (CameraHeader*) sidebar_header_construct (object_type, _ ("Cameras"), _ ("List of all discovered camera devices"), TRUE);
+#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 953 "Branch.c"
+#line 953 "CameraBranch.c"
 }
 
 
 CameraHeader* camera_header_new (void) {
-#line 84 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_header_construct (CAMERA_TYPE_HEADER);
-#line 960 "Branch.c"
+#line 960 "CameraBranch.c"
 }
 
 
 static void camera_header_class_init (CameraHeaderClass * klass) {
-#line 83 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 83 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_header_parent_class = g_type_class_peek_parent (klass);
-#line 967 "Branch.c"
+#line 967 "CameraBranch.c"
 }
 
 
@@ -984,9 +984,9 @@ GType camera_header_get_type (void) {
 
 
 static gpointer _discovered_camera_ref0 (gpointer self) {
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 990 "Branch.c"
+#line 990 "CameraBranch.c"
 }
 
 
@@ -997,38 +997,38 @@ CameraSidebarEntry* camera_sidebar_entry_construct (GType object_type, Discovere
 	DiscoveredCamera* _tmp2_;
 	const gchar* _tmp3_;
 	gchar* _tmp4_;
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (IS_DISCOVERED_CAMERA (camera), NULL);
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = (CameraSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = camera;
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = _discovered_camera_ref0 (_tmp0_);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_discovered_camera_unref0 (self->priv->camera);
-#line 94 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv->camera = _tmp1_;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = camera;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = _tmp2_->uri;
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (self->priv->uri);
-#line 95 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv->uri = _tmp4_;
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return self;
-#line 1025 "Branch.c"
+#line 1025 "CameraBranch.c"
 }
 
 
 CameraSidebarEntry* camera_sidebar_entry_new (DiscoveredCamera* camera) {
-#line 93 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return camera_sidebar_entry_construct (CAMERA_TYPE_SIDEBAR_ENTRY, camera);
-#line 1032 "Branch.c"
+#line 1032 "CameraBranch.c"
 }
 
 
@@ -1039,27 +1039,27 @@ static gchar* camera_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	DiscoveredCamera* _tmp1_;
 	const gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 98 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = self->priv->camera;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = _tmp1_->display_name;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = _tmp2_;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	if (_tmp0_ == NULL) {
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp0_ = _ ("Camera");
-#line 1055 "Branch.c"
+#line 1055 "CameraBranch.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = g_strdup (_tmp0_);
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = _tmp3_;
-#line 99 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1063 "Branch.c"
+#line 1063 "CameraBranch.c"
 }
 
 
@@ -1070,31 +1070,31 @@ static gchar* camera_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	DiscoveredCamera* _tmp1_;
 	const gchar* _tmp2_;
 	gchar* _tmp4_;
-#line 102 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = self->priv->camera;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = _tmp1_->icon;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	if (_tmp0_ == NULL) {
-#line 1084 "Branch.c"
+#line 1084 "CameraBranch.c"
 		const gchar* _tmp3_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp3_ = camera_branch_cameras_icon;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 		_tmp0_ = _tmp3_;
-#line 1090 "Branch.c"
+#line 1090 "CameraBranch.c"
 	}
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = g_strdup (_tmp0_);
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1098 "Branch.c"
+#line 1098 "CameraBranch.c"
 }
 
 
@@ -1110,37 +1110,37 @@ static Page* camera_sidebar_entry_real_create_page (SidebarSimplePageEntry* base
 	gchar* _tmp6_;
 	ImportPage* _tmp7_;
 	Page* _tmp8_;
-#line 106 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->camera;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = _tmp0_->gcamera;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp2_ = self->priv->uri;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp3_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp5_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp6_ = _tmp5_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp7_ = import_page_new (_tmp1_, _tmp2_, _tmp4_, _tmp6_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_object_ref_sink (_tmp7_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (_tmp6_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (_tmp4_);
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = _tmp8_;
-#line 107 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1144 "Branch.c"
+#line 1144 "CameraBranch.c"
 }
 
 
@@ -1148,55 +1148,55 @@ gchar* camera_sidebar_entry_get_uri (CameraSidebarEntry* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_return_val_if_fail (CAMERA_IS_SIDEBAR_ENTRY (self), NULL);
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp0_ = self->priv->uri;
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	result = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	return result;
-#line 1162 "Branch.c"
+#line 1162 "CameraBranch.c"
 }
 
 
 static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) {
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	camera_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate));
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_name;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_get_sidebar_icon;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) camera_sidebar_entry_real_create_page;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize;
-#line 1179 "Branch.c"
+#line 1179 "CameraBranch.c"
 }
 
 
 static void camera_sidebar_entry_instance_init (CameraSidebarEntry * self) {
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self->priv = CAMERA_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1186 "Branch.c"
+#line 1186 "CameraBranch.c"
 }
 
 
 static void camera_sidebar_entry_finalize (GObject * obj) {
 	CameraSidebarEntry * self;
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CAMERA_TYPE_SIDEBAR_ENTRY, CameraSidebarEntry);
-#line 90 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_discovered_camera_unref0 (self->priv->camera);
-#line 91 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	_g_free0 (self->priv->uri);
-#line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala"
+#line 89 "/home/jens/Source/shotwell/src/camera/CameraBranch.vala"
 	G_OBJECT_CLASS (camera_sidebar_entry_parent_class)->finalize (obj);
-#line 1200 "Branch.c"
+#line 1200 "CameraBranch.c"
 }
 
 
diff --git a/src/camera/Branch.vala b/src/camera/CameraBranch.vala
index 9bc551a..052f093 100644
--- a/src/camera/Branch.vala
+++ b/src/camera/CameraBranch.vala
@@ -82,7 +82,7 @@ public class Camera.Branch : Sidebar.Branch {
 
 public class Camera.Header : Sidebar.Header {
     public Header() {
-        base (_("Cameras"));
+        base (_("Cameras"), _("List of all discovered camera devices"));
     }
 }
 
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 864a4e8..5c3c502 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <gphoto2/gphoto2-port-info-list.h>
 #include <gphoto2/gphoto2-list.h>
+#include <glib/gi18n-lib.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -227,7 +228,7 @@ gint camera_table_get_count (CameraTable* self);
 DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
 static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
 static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value);
 static void _g_object_unref0_ (gpointer var);
 static void _g_list_free__g_object_unref0_ (GList* self);
 static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar* * full_port);
@@ -235,7 +236,7 @@ gchar* camera_table_get_port_uri (const gchar* port);
 gchar* camera_table_get_port_path (const gchar* port);
 static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
 static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
 static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void camera_table_finalize (CameraTable * obj);
@@ -247,7 +248,7 @@ static const gchar* CAMERA_TABLE_SUBSYSTEMS[3] = {"usb", "block", NULL};
 static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 251 "CameraTable.c"
+#line 252 "CameraTable.c"
 }
 
 
@@ -303,21 +304,21 @@ DiscoveredCamera* discovered_camera_construct (GType object_type, Camera* gcamer
 	self->icon = _tmp7_;
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 307 "CameraTable.c"
+#line 308 "CameraTable.c"
 }
 
 
 DiscoveredCamera* discovered_camera_new (Camera* gcamera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 314 "CameraTable.c"
+#line 315 "CameraTable.c"
 }
 
 
 static void value_discovered_camera_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 321 "CameraTable.c"
+#line 322 "CameraTable.c"
 }
 
 
@@ -326,7 +327,7 @@ static void value_discovered_camera_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (value->data[0].v_pointer);
-#line 330 "CameraTable.c"
+#line 331 "CameraTable.c"
 	}
 }
 
@@ -336,11 +337,11 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 340 "CameraTable.c"
+#line 341 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 344 "CameraTable.c"
+#line 345 "CameraTable.c"
 	}
 }
 
@@ -348,37 +349,37 @@ static void value_discovered_camera_copy_value (const GValue* src_value, GValue*
 static gpointer value_discovered_camera_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 352 "CameraTable.c"
+#line 353 "CameraTable.c"
 }
 
 
 static gchar* value_discovered_camera_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 359 "CameraTable.c"
+#line 360 "CameraTable.c"
 		DiscoveredCamera * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 366 "CameraTable.c"
+#line 367 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.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 370 "CameraTable.c"
+#line 371 "CameraTable.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = discovered_camera_ref (object);
-#line 374 "CameraTable.c"
+#line 375 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 378 "CameraTable.c"
+#line 379 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 382 "CameraTable.c"
+#line 383 "CameraTable.c"
 }
 
 
@@ -389,25 +390,25 @@ static gchar* value_discovered_camera_lcopy_value (const GValue* value, guint n_
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 393 "CameraTable.c"
+#line 394 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 399 "CameraTable.c"
+#line 400 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 403 "CameraTable.c"
+#line 404 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 407 "CameraTable.c"
+#line 408 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 411 "CameraTable.c"
+#line 412 "CameraTable.c"
 }
 
 
@@ -421,7 +422,7 @@ GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 425 "CameraTable.c"
+#line 426 "CameraTable.c"
 }
 
 
@@ -430,7 +431,7 @@ gpointer value_get_discovered_camera (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 434 "CameraTable.c"
+#line 435 "CameraTable.c"
 }
 
 
@@ -450,17 +451,17 @@ void value_set_discovered_camera (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_ref (value->data[0].v_pointer);
-#line 454 "CameraTable.c"
+#line 455 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 458 "CameraTable.c"
+#line 459 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 464 "CameraTable.c"
+#line 465 "CameraTable.c"
 	}
 }
 
@@ -479,17 +480,17 @@ void value_take_discovered_camera (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/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 483 "CameraTable.c"
+#line 484 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 487 "CameraTable.c"
+#line 488 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 493 "CameraTable.c"
+#line 494 "CameraTable.c"
 	}
 }
 
@@ -499,14 +500,14 @@ static void discovered_camera_class_init (DiscoveredCameraClass * klass) {
 	discovered_camera_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 503 "CameraTable.c"
+#line 504 "CameraTable.c"
 }
 
 
 static void discovered_camera_instance_init (DiscoveredCamera * self) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 510 "CameraTable.c"
+#line 511 "CameraTable.c"
 }
 
 
@@ -524,7 +525,7 @@ static void discovered_camera_finalize (DiscoveredCamera * obj) {
 	_g_free0 (self->display_name);
 #line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_free0 (self->icon);
-#line 528 "CameraTable.c"
+#line 529 "CameraTable.c"
 }
 
 
@@ -549,7 +550,7 @@ gpointer discovered_camera_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 553 "CameraTable.c"
+#line 554 "CameraTable.c"
 }
 
 
@@ -562,7 +563,7 @@ void discovered_camera_unref (gpointer instance) {
 		DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 566 "CameraTable.c"
+#line 567 "CameraTable.c"
 	}
 }
 
@@ -570,28 +571,28 @@ void discovered_camera_unref (gpointer instance) {
 static void _camera_table_on_update_cameras_one_shot_callback (gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_update_cameras ((CameraTable*) self);
-#line 574 "CameraTable.c"
+#line 575 "CameraTable.c"
 }
 
 
 static void _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 581 "CameraTable.c"
+#line 582 "CameraTable.c"
 }
 
 
 static void _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 588 "CameraTable.c"
+#line 589 "CameraTable.c"
 }
 
 
 static void _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _sender, GVolume* volume, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 595 "CameraTable.c"
+#line 596 "CameraTable.c"
 }
 
 
@@ -600,7 +601,7 @@ static gboolean _camera_table_delayed_init_gsource_func (gpointer self) {
 	result = camera_table_delayed_init ((CameraTable*) self);
 #line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 604 "CameraTable.c"
+#line 605 "CameraTable.c"
 }
 
 
@@ -641,14 +642,14 @@ static CameraTable* camera_table_construct (GType object_type) {
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 645 "CameraTable.c"
+#line 646 "CameraTable.c"
 }
 
 
 static CameraTable* camera_table_new (void) {
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 652 "CameraTable.c"
+#line 653 "CameraTable.c"
 }
 
 
@@ -669,18 +670,18 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 	library_window_set_page_switching_enabled (_tmp1_, FALSE);
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (_tmp1_);
-#line 673 "CameraTable.c"
+#line 674 "CameraTable.c"
 	{
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_init_camera_table (self, &_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 679 "CameraTable.c"
+#line 680 "CameraTable.c"
 			gboolean _tmp2_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 683 "CameraTable.c"
-				goto __catch58_gphoto_error;
+#line 684 "CameraTable.c"
+				goto __catch64_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);
@@ -688,11 +689,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 			g_clear_error (&_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp2_;
-#line 692 "CameraTable.c"
+#line 693 "CameraTable.c"
 		}
 	}
-	goto __finally58;
-	__catch58_gphoto_error:
+	goto __finally64;
+	__catch64_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
@@ -713,12 +714,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		_g_error_free0 (err);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 717 "CameraTable.c"
+#line 718 "CameraTable.c"
 	}
-	__finally58:
+	__finally64:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 722 "CameraTable.c"
+#line 723 "CameraTable.c"
 		gboolean _tmp5_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -726,19 +727,19 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_clear_error (&_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp5_;
-#line 730 "CameraTable.c"
+#line 731 "CameraTable.c"
 	}
 	{
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_update_camera_table (self, &_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "CameraTable.c"
+#line 738 "CameraTable.c"
 			gboolean _tmp6_ = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 741 "CameraTable.c"
-				goto __catch59_gphoto_error;
+#line 742 "CameraTable.c"
+				goto __catch65_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);
@@ -746,11 +747,11 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp6_;
-#line 750 "CameraTable.c"
+#line 751 "CameraTable.c"
 		}
 	}
-	goto __finally59;
-	__catch59_gphoto_error:
+	goto __finally65;
+	__catch65_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -767,12 +768,12 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 771 "CameraTable.c"
+#line 772 "CameraTable.c"
 	}
-	__finally59:
+	__finally65:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 776 "CameraTable.c"
+#line 777 "CameraTable.c"
 		gboolean _tmp9_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -780,7 +781,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		g_clear_error (&_inner_error_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp9_;
-#line 784 "CameraTable.c"
+#line 785 "CameraTable.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp10_ = app_window_get_instance ();
@@ -794,14 +795,14 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 	result = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 798 "CameraTable.c"
+#line 799 "CameraTable.c"
 }
 
 
 static gpointer _camera_table_ref0 (gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? camera_table_ref (self) : NULL;
-#line 805 "CameraTable.c"
+#line 806 "CameraTable.c"
 }
 
 
@@ -814,7 +815,7 @@ CameraTable* camera_table_get_instance (void) {
 	_tmp0_ = camera_table_instance;
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ == NULL) {
-#line 818 "CameraTable.c"
+#line 819 "CameraTable.c"
 		CameraTable* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = camera_table_new ();
@@ -822,7 +823,7 @@ CameraTable* camera_table_get_instance (void) {
 		_camera_table_unref0 (camera_table_instance);
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_instance = _tmp1_;
-#line 826 "CameraTable.c"
+#line 827 "CameraTable.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = camera_table_instance;
@@ -832,7 +833,7 @@ CameraTable* camera_table_get_instance (void) {
 	result = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 836 "CameraTable.c"
+#line 837 "CameraTable.c"
 }
 
 
@@ -853,7 +854,7 @@ GeeIterable* camera_table_get_cameras (CameraTable* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 857 "CameraTable.c"
+#line 858 "CameraTable.c"
 }
 
 
@@ -874,7 +875,7 @@ gint camera_table_get_count (CameraTable* self) {
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 878 "CameraTable.c"
+#line 879 "CameraTable.c"
 }
 
 
@@ -897,7 +898,7 @@ DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri)
 	result = (DiscoveredCamera*) _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 901 "CameraTable.c"
+#line 902 "CameraTable.c"
 }
 
 
@@ -912,7 +913,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 	_tmp0_ = res;
 #line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ != GP_OK) {
-#line 916 "CameraTable.c"
+#line 917 "CameraTable.c"
 		int _tmp1_;
 		const gchar* _tmp2_;
 		int _tmp3_;
@@ -936,7 +937,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 			g_propagate_error (error, _inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 940 "CameraTable.c"
+#line 941 "CameraTable.c"
 		} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -944,7 +945,7 @@ static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GEr
 			g_clear_error (&_inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 948 "CameraTable.c"
+#line 949 "CameraTable.c"
 		}
 	}
 }
@@ -975,7 +976,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 979 "CameraTable.c"
+#line 980 "CameraTable.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -983,7 +984,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 987 "CameraTable.c"
+#line 988 "CameraTable.c"
 		}
 	}
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1002,7 +1003,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1006 "CameraTable.c"
+#line 1007 "CameraTable.c"
 		} else {
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1010,7 +1011,7 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1014 "CameraTable.c"
+#line 1015 "CameraTable.c"
 		}
 	}
 }
@@ -1019,31 +1020,31 @@ static void camera_table_init_camera_table (CameraTable* self, GError** error) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1023 "CameraTable.c"
+#line 1024 "CameraTable.c"
 }
 
 
-static void _vala_array_add66 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add69 (gchar** * array, int* length, int* size, gchar* value) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1034 "CameraTable.c"
+#line 1035 "CameraTable.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[(*length)++] = value;
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[*length] = NULL;
-#line 1040 "CameraTable.c"
+#line 1041 "CameraTable.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 1047 "CameraTable.c"
+#line 1048 "CameraTable.c"
 }
 
 
@@ -1052,7 +1053,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_list_free (self);
-#line 1056 "CameraTable.c"
+#line 1057 "CameraTable.c"
 }
 
 
@@ -1086,7 +1087,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	device_list = _tmp2_;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp3_ = device_list;
-#line 1090 "CameraTable.c"
+#line 1091 "CameraTable.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
@@ -1094,14 +1095,14 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 		device_collection = _tmp3_;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1098 "CameraTable.c"
+#line 1099 "CameraTable.c"
 			GUdevDevice* _tmp4_;
 			GUdevDevice* device = NULL;
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			device = _tmp4_;
-#line 1105 "CameraTable.c"
+#line 1106 "CameraTable.c"
 			{
 				gchar* device_file = NULL;
 				GUdevDevice* _tmp5_;
@@ -1122,7 +1123,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 				_tmp10_ = device_file;
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp10_ != NULL) {
-#line 1126 "CameraTable.c"
+#line 1127 "CameraTable.c"
 					GUdevDevice* _tmp11_;
 					gboolean _tmp12_;
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1131,15 +1132,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_tmp12_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
 #line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = _tmp12_;
-#line 1135 "CameraTable.c"
+#line 1136 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = FALSE;
-#line 1139 "CameraTable.c"
+#line 1140 "CameraTable.c"
 				}
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp9_) {
-#line 1143 "CameraTable.c"
+#line 1144 "CameraTable.c"
 					GUdevDevice* _tmp13_;
 					gboolean _tmp14_;
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1148,15 +1149,15 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_tmp14_ = g_udev_device_has_property (_tmp13_, "GPHOTO2_DRIVER");
 #line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = _tmp14_;
-#line 1152 "CameraTable.c"
+#line 1153 "CameraTable.c"
 				} else {
 #line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = FALSE;
-#line 1156 "CameraTable.c"
+#line 1157 "CameraTable.c"
 				}
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp8_) {
-#line 1160 "CameraTable.c"
+#line 1161 "CameraTable.c"
 					gint camera_bus = 0;
 					gint camera_device = 0;
 					const gchar* _tmp15_;
@@ -1176,7 +1177,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 					_tmp16_ = sscanf (_tmp15_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device);
 #line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_tmp16_ < 2) {
-#line 1180 "CameraTable.c"
+#line 1181 "CameraTable.c"
 						const gchar* _tmp17_;
 #line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_tmp17_ = device_file;
@@ -1189,7 +1190,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 						_g_object_unref0 (device);
 #line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						continue;
-#line 1192 "CameraTable.c"
+#line 1193 "CameraTable.c"
 					}
 #line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp18_ = camera_bus;
@@ -1212,16 +1213,16 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp24_ = g_strdup (_tmp23_);
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+					_vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (camera);
-#line 1218 "CameraTable.c"
+#line 1219 "CameraTable.c"
 				}
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (device_file);
 #line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (device);
-#line 1224 "CameraTable.c"
+#line 1225 "CameraTable.c"
 			}
 		}
 	}
@@ -1233,7 +1234,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	if (result_length1) {
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*result_length1 = _tmp25__length1;
-#line 1236 "CameraTable.c"
+#line 1237 "CameraTable.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp25_;
@@ -1241,7 +1242,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 	__g_list_free__g_object_unref0_0 (device_list);
 #line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1244 "CameraTable.c"
+#line 1245 "CameraTable.c"
 }
 
 
@@ -1283,7 +1284,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	_tmp4_ = current_camera_count;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp4_ == 1) {
-#line 1286 "CameraTable.c"
+#line 1287 "CameraTable.c"
 		gchar** _tmp5_;
 		gint _tmp5__length1;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1292,15 +1293,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		_tmp5__length1 = usb_cameras_length1;
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = _tmp5__length1 == 1;
-#line 1295 "CameraTable.c"
+#line 1296 "CameraTable.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = FALSE;
-#line 1299 "CameraTable.c"
+#line 1300 "CameraTable.c"
 	}
 #line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp3_) {
-#line 1303 "CameraTable.c"
+#line 1304 "CameraTable.c"
 		gchar** _tmp6_;
 		gint _tmp6__length1;
 		const gchar* _tmp7_;
@@ -1331,21 +1332,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1334 "CameraTable.c"
+#line 1335 "CameraTable.c"
 		} else {
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1338 "CameraTable.c"
+#line 1339 "CameraTable.c"
 		}
 #line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1342 "CameraTable.c"
+#line 1343 "CameraTable.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp11_ = port;
 #line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (g_strcmp0 (_tmp11_, "usb:") == 0) {
-#line 1348 "CameraTable.c"
+#line 1349 "CameraTable.c"
 		const gchar* _tmp12_;
 #line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp12_ = port;
@@ -1357,15 +1358,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1360 "CameraTable.c"
+#line 1361 "CameraTable.c"
 		} else {
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1364 "CameraTable.c"
+#line 1365 "CameraTable.c"
 		}
 #line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1368 "CameraTable.c"
+#line 1369 "CameraTable.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp13_ = port;
@@ -1373,7 +1374,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	_tmp14_ = sscanf (_tmp13_, "usb:%d,%d", &bus, &device);
 #line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp14_ < 2) {
-#line 1376 "CameraTable.c"
+#line 1377 "CameraTable.c"
 		const gchar* _tmp15_;
 #line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp15_ = port;
@@ -1385,21 +1386,21 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		if (full_port) {
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			*full_port = _vala_full_port;
-#line 1388 "CameraTable.c"
+#line 1389 "CameraTable.c"
 		} else {
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (_vala_full_port);
-#line 1392 "CameraTable.c"
+#line 1393 "CameraTable.c"
 		}
 #line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 1396 "CameraTable.c"
+#line 1397 "CameraTable.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp16_ = usb_cameras;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp16__length1 = usb_cameras_length1;
-#line 1402 "CameraTable.c"
+#line 1403 "CameraTable.c"
 	{
 		gchar** usb_camera_collection = NULL;
 		gint usb_camera_collection_length1 = 0;
@@ -1411,14 +1412,14 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 		usb_camera_collection_length1 = _tmp16__length1;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (usb_camera_it = 0; usb_camera_it < _tmp16__length1; usb_camera_it = usb_camera_it + 1) {
-#line 1414 "CameraTable.c"
+#line 1415 "CameraTable.c"
 			gchar* _tmp17_;
 			gchar* usb_camera = NULL;
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp17_ = g_strdup (usb_camera_collection[usb_camera_it]);
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			usb_camera = _tmp17_;
-#line 1421 "CameraTable.c"
+#line 1422 "CameraTable.c"
 			{
 				gint camera_bus = 0;
 				gint camera_device = 0;
@@ -1433,7 +1434,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 				_tmp19_ = sscanf (_tmp18_, "usb:%d,%d", &camera_bus, &camera_device);
 #line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp19_ < 2) {
-#line 1436 "CameraTable.c"
+#line 1437 "CameraTable.c"
 					const gchar* _tmp20_;
 #line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp20_ = usb_camera;
@@ -1443,7 +1444,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					_g_free0 (usb_camera);
 #line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					continue;
-#line 1446 "CameraTable.c"
+#line 1447 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp22_ = bus;
@@ -1451,7 +1452,7 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 				_tmp23_ = camera_bus;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp22_ == _tmp23_) {
-#line 1454 "CameraTable.c"
+#line 1455 "CameraTable.c"
 					gint _tmp24_;
 					gint _tmp25_;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1460,15 +1461,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					_tmp25_ = camera_device;
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = _tmp24_ == _tmp25_;
-#line 1463 "CameraTable.c"
+#line 1464 "CameraTable.c"
 				} else {
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp21_ = FALSE;
-#line 1467 "CameraTable.c"
+#line 1468 "CameraTable.c"
 				}
 #line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp21_) {
-#line 1471 "CameraTable.c"
+#line 1472 "CameraTable.c"
 					const gchar* _tmp26_;
 					gchar* _tmp27_;
 					const gchar* _tmp28_;
@@ -1495,19 +1496,19 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 					if (full_port) {
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						*full_port = _vala_full_port;
-#line 1498 "CameraTable.c"
+#line 1499 "CameraTable.c"
 					} else {
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (_vala_full_port);
-#line 1502 "CameraTable.c"
+#line 1503 "CameraTable.c"
 					}
 #line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 1506 "CameraTable.c"
+#line 1507 "CameraTable.c"
 				}
 #line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (usb_camera);
-#line 1510 "CameraTable.c"
+#line 1511 "CameraTable.c"
 			}
 		}
 	}
@@ -1522,15 +1523,15 @@ static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_cou
 	if (full_port) {
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*full_port = _vala_full_port;
-#line 1524 "CameraTable.c"
+#line 1525 "CameraTable.c"
 	} else {
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_vala_full_port);
-#line 1528 "CameraTable.c"
+#line 1529 "CameraTable.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1532 "CameraTable.c"
+#line 1533 "CameraTable.c"
 }
 
 
@@ -1548,7 +1549,7 @@ gchar* camera_table_get_port_uri (const gchar* port) {
 	result = _tmp1_;
 #line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1550 "CameraTable.c"
+#line 1551 "CameraTable.c"
 }
 
 
@@ -1571,7 +1572,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1573 "CameraTable.c"
+#line 1574 "CameraTable.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -1579,7 +1580,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1581 "CameraTable.c"
+#line 1582 "CameraTable.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -1591,7 +1592,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1593 "CameraTable.c"
+#line 1594 "CameraTable.c"
 	}
 }
 
@@ -1615,21 +1616,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1617 "CameraTable.c"
+#line 1618 "CameraTable.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1623 "CameraTable.c"
+#line 1624 "CameraTable.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1627 "CameraTable.c"
+#line 1628 "CameraTable.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1631 "CameraTable.c"
+#line 1632 "CameraTable.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -1641,7 +1642,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1643 "CameraTable.c"
+#line 1644 "CameraTable.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -1651,13 +1652,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1653 "CameraTable.c"
+#line 1654 "CameraTable.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1659 "CameraTable.c"
+#line 1660 "CameraTable.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -1671,7 +1672,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1673 "CameraTable.c"
+#line 1674 "CameraTable.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -1681,13 +1682,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1683 "CameraTable.c"
+#line 1684 "CameraTable.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1689 "CameraTable.c"
+#line 1690 "CameraTable.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1696,7 +1697,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1698 "CameraTable.c"
+#line 1699 "CameraTable.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -1716,7 +1717,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1718 "CameraTable.c"
+#line 1719 "CameraTable.c"
 }
 
 
@@ -1735,20 +1736,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 1737 "CameraTable.c"
+#line 1738 "CameraTable.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 1744 "CameraTable.c"
+#line 1745 "CameraTable.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 1750 "CameraTable.c"
+#line 1751 "CameraTable.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -1758,11 +1759,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 1760 "CameraTable.c"
+#line 1761 "CameraTable.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1764 "CameraTable.c"
+#line 1765 "CameraTable.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -1770,7 +1771,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1772 "CameraTable.c"
+#line 1773 "CameraTable.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -1802,8 +1803,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1804 "CameraTable.c"
-				goto __catch60_g_regex_error;
+#line 1805 "CameraTable.c"
+				goto __catch66_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -1811,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1813 "CameraTable.c"
+#line 1814 "CameraTable.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -1827,8 +1828,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1829 "CameraTable.c"
-				goto __catch60_g_regex_error;
+#line 1830 "CameraTable.c"
+				goto __catch66_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1838,7 +1839,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1840 "CameraTable.c"
+#line 1841 "CameraTable.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -1852,10 +1853,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1854 "CameraTable.c"
+#line 1855 "CameraTable.c"
 	}
-	goto __finally60;
-	__catch60_g_regex_error:
+	goto __finally66;
+	__catch66_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1866,9 +1867,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1868 "CameraTable.c"
+#line 1869 "CameraTable.c"
 	}
-	__finally60:
+	__finally66:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1877,7 +1878,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1879 "CameraTable.c"
+#line 1880 "CameraTable.c"
 	}
 }
 
@@ -1895,7 +1896,7 @@ gchar* camera_table_get_port_path (const gchar* port) {
 	_tmp2_ = g_str_has_prefix (_tmp1_, "usb:");
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp2_) {
-#line 1897 "CameraTable.c"
+#line 1898 "CameraTable.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -1922,19 +1923,19 @@ gchar* camera_table_get_port_path (const gchar* port) {
 		_g_free0 (_tmp7_);
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp5_);
-#line 1924 "CameraTable.c"
+#line 1925 "CameraTable.c"
 	} else {
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp0_);
 #line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = NULL;
-#line 1930 "CameraTable.c"
+#line 1931 "CameraTable.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp0_;
 #line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1936 "CameraTable.c"
+#line 1937 "CameraTable.c"
 }
 
 
@@ -1950,7 +1951,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 	_tmp0_ = self->priv->volume_monitor;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1952 "CameraTable.c"
+#line 1953 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -1958,14 +1959,14 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 		volume_collection = _tmp1_;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1960 "CameraTable.c"
+#line 1961 "CameraTable.c"
 			GVolume* _tmp2_;
 			GVolume* volume = NULL;
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 1967 "CameraTable.c"
+#line 1968 "CameraTable.c"
 			{
 				GVolume* _tmp3_;
 				gchar* _tmp4_;
@@ -1986,7 +1987,7 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 				_g_free0 (_tmp5_);
 #line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp7_) {
-#line 1988 "CameraTable.c"
+#line 1989 "CameraTable.c"
 					GVolume* _tmp8_;
 					gchar* _tmp9_;
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2001,22 +2002,22 @@ static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uu
 					__g_list_free__g_object_unref0_0 (volume_collection);
 #line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 2003 "CameraTable.c"
+#line 2004 "CameraTable.c"
 				}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2007 "CameraTable.c"
+#line 2008 "CameraTable.c"
 			}
 		}
 #line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2012 "CameraTable.c"
+#line 2013 "CameraTable.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
 #line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 2018 "CameraTable.c"
+#line 2019 "CameraTable.c"
 }
 
 
@@ -2032,7 +2033,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 	_tmp0_ = self->priv->volume_monitor;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 2034 "CameraTable.c"
+#line 2035 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
@@ -2040,14 +2041,14 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 		volume_collection = _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 2042 "CameraTable.c"
+#line 2043 "CameraTable.c"
 			GVolume* _tmp2_;
 			GVolume* volume = NULL;
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 2049 "CameraTable.c"
+#line 2050 "CameraTable.c"
 			{
 				GVolume* _tmp3_;
 				gchar* _tmp4_;
@@ -2068,7 +2069,7 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 				_g_free0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp7_) {
-#line 2070 "CameraTable.c"
+#line 2071 "CameraTable.c"
 					GVolume* _tmp8_;
 					GIcon* _tmp9_;
 					GIcon* _tmp10_;
@@ -2094,46 +2095,46 @@ static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uu
 					__g_list_free__g_object_unref0_0 (volume_collection);
 #line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 2096 "CameraTable.c"
+#line 2097 "CameraTable.c"
 				}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2100 "CameraTable.c"
+#line 2101 "CameraTable.c"
 			}
 		}
 #line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2105 "CameraTable.c"
+#line 2106 "CameraTable.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
 #line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 2111 "CameraTable.c"
+#line 2112 "CameraTable.c"
 }
 
 
 static gpointer _discovered_camera_ref0 (gpointer self) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 2118 "CameraTable.c"
+#line 2119 "CameraTable.c"
 }
 
 
-static void _vala_array_add67 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add70 (DiscoveredCamera** * array, int* length, int* size, DiscoveredCamera* value) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2129 "CameraTable.c"
+#line 2130 "CameraTable.c"
 	}
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[(*length)++] = value;
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[*length] = NULL;
-#line 2135 "CameraTable.c"
+#line 2136 "CameraTable.c"
 }
 
 
@@ -2185,7 +2186,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2187 "CameraTable.c"
+#line 2188 "CameraTable.c"
 		} else {
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2195,7 +2196,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2197 "CameraTable.c"
+#line 2198 "CameraTable.c"
 		}
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2214,7 +2215,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2216 "CameraTable.c"
+#line 2217 "CameraTable.c"
 		} else {
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
@@ -2224,7 +2225,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2226 "CameraTable.c"
+#line 2227 "CameraTable.c"
 		}
 	}
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2247,7 +2248,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2249 "CameraTable.c"
+#line 2250 "CameraTable.c"
 		} else {
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2259,7 +2260,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2261 "CameraTable.c"
+#line 2262 "CameraTable.c"
 		}
 	}
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2286,7 +2287,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_gp_port_info_list_free0 (port_info_list);
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2288 "CameraTable.c"
+#line 2289 "CameraTable.c"
 		} else {
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
@@ -2298,7 +2299,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			g_clear_error (&_inner_error_);
 #line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2300 "CameraTable.c"
+#line 2301 "CameraTable.c"
 		}
 	}
 #line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2313,19 +2314,19 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	usb_cameras_length1 = _tmp12_;
 #line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_usb_cameras_size_ = usb_cameras_length1;
-#line 2315 "CameraTable.c"
+#line 2316 "CameraTable.c"
 	{
 		gint ctr = 0;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		ctr = 0;
-#line 2320 "CameraTable.c"
+#line 2321 "CameraTable.c"
 		{
 			gboolean _tmp14_ = FALSE;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp14_ = TRUE;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			while (TRUE) {
-#line 2327 "CameraTable.c"
+#line 2328 "CameraTable.c"
 				gint _tmp16_;
 				CameraList* _tmp17_;
 				gint _tmp18_;
@@ -2353,13 +2354,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				const gchar* _tmp46_;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (!_tmp14_) {
-#line 2355 "CameraTable.c"
+#line 2356 "CameraTable.c"
 					gint _tmp15_;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp15_ = ctr;
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					ctr = _tmp15_ + 1;
-#line 2361 "CameraTable.c"
+#line 2362 "CameraTable.c"
 				}
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp14_ = FALSE;
@@ -2373,7 +2374,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				if (!(_tmp16_ < _tmp18_)) {
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					break;
-#line 2375 "CameraTable.c"
+#line 2376 "CameraTable.c"
 				}
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp19_ = camera_list;
@@ -2407,7 +2408,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2409 "CameraTable.c"
+#line 2410 "CameraTable.c"
 					} else {
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
@@ -2425,7 +2426,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2427 "CameraTable.c"
+#line 2428 "CameraTable.c"
 					}
 				}
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2462,7 +2463,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2464 "CameraTable.c"
+#line 2465 "CameraTable.c"
 					} else {
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
@@ -2482,7 +2483,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2484 "CameraTable.c"
+#line 2485 "CameraTable.c"
 					}
 				}
 #line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2503,7 +2504,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_tmp35_ = g_str_has_prefix (_tmp34_, "usb:");
 #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp35_) {
-#line 2505 "CameraTable.c"
+#line 2506 "CameraTable.c"
 					gchar* full_port = NULL;
 					CameraList* _tmp36_;
 					gint _tmp37_;
@@ -2540,7 +2541,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_g_free0 (name);
 #line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						continue;
-#line 2542 "CameraTable.c"
+#line 2543 "CameraTable.c"
 					}
 #line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp42_ = full_port;
@@ -2552,7 +2553,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					port = _tmp43_;
 #line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (full_port);
-#line 2554 "CameraTable.c"
+#line 2555 "CameraTable.c"
 				}
 #line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp44_ = detected_map;
@@ -2566,7 +2567,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_g_free0 (port);
 #line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (name);
-#line 2568 "CameraTable.c"
+#line 2569 "CameraTable.c"
 			}
 		}
 	}
@@ -2578,7 +2579,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	missing_length1 = 0;
 #line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_missing_size_ = missing_length1;
-#line 2580 "CameraTable.c"
+#line 2581 "CameraTable.c"
 	{
 		GeeIterator* _camera_it = NULL;
 		GeeHashMap* _tmp48_;
@@ -2605,7 +2606,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		_camera_it = _tmp53_;
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 2607 "CameraTable.c"
+#line 2608 "CameraTable.c"
 			GeeIterator* _tmp54_;
 			gboolean _tmp55_;
 			DiscoveredCamera* camera = NULL;
@@ -2642,7 +2643,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			if (!_tmp55_) {
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 2644 "CameraTable.c"
+#line 2645 "CameraTable.c"
 			}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp56_ = _camera_it;
@@ -2688,7 +2689,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2690 "CameraTable.c"
+#line 2691 "CameraTable.c"
 				} else {
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
@@ -2714,7 +2715,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2716 "CameraTable.c"
+#line 2717 "CameraTable.c"
 				}
 			}
 #line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2765,7 +2766,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_gp_port_info_list_free0 (port_info_list);
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2767 "CameraTable.c"
+#line 2768 "CameraTable.c"
 				} else {
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (abilities);
@@ -2793,7 +2794,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2795 "CameraTable.c"
+#line 2796 "CameraTable.c"
 				}
 			}
 #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2804,7 +2805,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp70_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp69_);
 #line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp70_) {
-#line 2806 "CameraTable.c"
+#line 2807 "CameraTable.c"
 				CameraAbilities _tmp71_;
 				const gchar* _tmp72_;
 				const gchar* _tmp73_;
@@ -2826,7 +2827,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_discovered_camera_unref0 (camera);
 #line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 2828 "CameraTable.c"
+#line 2829 "CameraTable.c"
 			}
 #line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp74_ = abilities;
@@ -2845,7 +2846,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp79_ = _discovered_camera_ref0 (_tmp78_);
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_vala_array_add67 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+			_vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp79_);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (abilities);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2854,17 +2855,17 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			 (port_info);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
-#line 2856 "CameraTable.c"
+#line 2857 "CameraTable.c"
 		}
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_camera_it);
-#line 2860 "CameraTable.c"
+#line 2861 "CameraTable.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp80_ = missing;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp80__length1 = missing_length1;
-#line 2866 "CameraTable.c"
+#line 2867 "CameraTable.c"
 	{
 		DiscoveredCamera** camera_collection = NULL;
 		gint camera_collection_length1 = 0;
@@ -2876,14 +2877,14 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		camera_collection_length1 = _tmp80__length1;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (camera_it = 0; camera_it < _tmp80__length1; camera_it = camera_it + 1) {
-#line 2878 "CameraTable.c"
+#line 2879 "CameraTable.c"
 			DiscoveredCamera* _tmp81_;
 			DiscoveredCamera* camera = NULL;
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp81_ = _discovered_camera_ref0 (camera_collection[camera_it]);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			camera = _tmp81_;
-#line 2885 "CameraTable.c"
+#line 2886 "CameraTable.c"
 			{
 				GPPortInfo port_info = {0};
 				gchar* tmp_path = NULL;
@@ -2942,7 +2943,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2944 "CameraTable.c"
+#line 2945 "CameraTable.c"
 					} else {
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
@@ -2966,7 +2967,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2968 "CameraTable.c"
+#line 2969 "CameraTable.c"
 					}
 				}
 #line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3015,7 +3016,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						_gp_port_info_list_free0 (port_info_list);
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3017 "CameraTable.c"
+#line 3018 "CameraTable.c"
 					} else {
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (abilities);
@@ -3041,7 +3042,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 						g_clear_error (&_inner_error_);
 #line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3043 "CameraTable.c"
+#line 3044 "CameraTable.c"
 					}
 				}
 #line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3076,7 +3077,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				 (port_info);
 #line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_discovered_camera_unref0 (camera);
-#line 3078 "CameraTable.c"
+#line 3079 "CameraTable.c"
 			}
 		}
 	}
@@ -3106,7 +3107,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 		_port_it = _tmp105_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 3108 "CameraTable.c"
+#line 3109 "CameraTable.c"
 			GeeIterator* _tmp106_;
 			gboolean _tmp107_;
 			gchar* port = NULL;
@@ -3129,67 +3130,69 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			gchar* _tmp121_;
 			const gchar* _tmp122_;
 			const gchar* _tmp142_;
+			gboolean _tmp143_;
+			const gchar* _tmp162_;
 			gint index = 0;
-			GPPortInfoList* _tmp145_;
-			const gchar* _tmp146_;
-			gint _tmp147_;
-			gint _tmp148_;
+			GPPortInfoList* _tmp165_;
+			const gchar* _tmp166_;
+			gint _tmp167_;
+			gint _tmp168_;
 			GPPortInfo port_info = {0};
 			gchar* tmp_path = NULL;
-			GPPortInfoList* _tmp153_;
-			gint _tmp154_;
-			GPPortInfo _tmp155_ = {0};
-			int _tmp156_;
-			const gchar* _tmp157_;
-			gchar* _tmp158_;
-			gchar* _tmp159_;
-			const gchar* _tmp160_ = NULL;
-			gchar* _tmp161_;
-			const gchar* _tmp162_;
-			const gchar* _tmp163_;
-			CameraAbilitiesList* _tmp164_;
-			const gchar* _tmp165_;
-			gint _tmp166_;
-			gint _tmp167_;
-			CameraAbilities camera_abilities = {0};
-			CameraAbilitiesList* _tmp172_;
-			gint _tmp173_;
-			CameraAbilities _tmp174_ = {0};
-			int _tmp175_;
-			const gchar* _tmp176_;
-			gchar* _tmp177_;
+			GPPortInfoList* _tmp173_;
+			gint _tmp174_;
+			GPPortInfo _tmp175_ = {0};
+			int _tmp176_;
+			const gchar* _tmp177_;
 			gchar* _tmp178_;
+			gchar* _tmp179_;
+			const gchar* _tmp180_ = NULL;
+			gchar* _tmp181_;
+			const gchar* _tmp182_;
+			const gchar* _tmp183_;
+			CameraAbilitiesList* _tmp184_;
+			const gchar* _tmp185_;
+			gint _tmp186_;
+			gint _tmp187_;
+			CameraAbilities camera_abilities = {0};
+			CameraAbilitiesList* _tmp192_;
+			gint _tmp193_;
+			CameraAbilities _tmp194_ = {0};
+			int _tmp195_;
+			const gchar* _tmp196_;
+			gchar* _tmp197_;
+			gchar* _tmp198_;
 			Camera* gcamera = NULL;
-			Camera* _tmp179_ = NULL;
-			int _tmp180_;
-			const gchar* _tmp181_;
-			gchar* _tmp182_;
-			gchar* _tmp183_;
-			Camera* _tmp184_;
-			CameraAbilities _tmp185_;
-			int _tmp186_;
-			const gchar* _tmp187_;
-			gchar* _tmp188_;
-			gchar* _tmp189_;
-			Camera* _tmp190_;
-			GPPortInfo _tmp191_;
-			int _tmp192_;
-			const gchar* _tmp193_;
-			const gchar* _tmp194_;
-			gchar* _tmp195_;
-			gchar* _tmp196_;
-			const gchar* _tmp197_;
-			const gchar* _tmp198_;
-			DiscoveredCamera* camera = NULL;
-			Camera* _tmp199_;
-			const gchar* _tmp200_;
+			Camera* _tmp199_ = NULL;
+			int _tmp200_;
 			const gchar* _tmp201_;
-			const gchar* _tmp202_;
-			DiscoveredCamera* _tmp203_;
-			GeeHashMap* _tmp204_;
-			const gchar* _tmp205_;
-			DiscoveredCamera* _tmp206_;
-			DiscoveredCamera* _tmp207_;
+			gchar* _tmp202_;
+			gchar* _tmp203_;
+			Camera* _tmp204_;
+			CameraAbilities _tmp205_;
+			int _tmp206_;
+			const gchar* _tmp207_;
+			gchar* _tmp208_;
+			gchar* _tmp209_;
+			Camera* _tmp210_;
+			GPPortInfo _tmp211_;
+			int _tmp212_;
+			const gchar* _tmp213_;
+			const gchar* _tmp214_;
+			gchar* _tmp215_;
+			gchar* _tmp216_;
+			const gchar* _tmp217_;
+			const gchar* _tmp218_;
+			DiscoveredCamera* camera = NULL;
+			Camera* _tmp219_;
+			const gchar* _tmp220_;
+			const gchar* _tmp221_;
+			const gchar* _tmp222_;
+			DiscoveredCamera* _tmp223_;
+			GeeHashMap* _tmp224_;
+			const gchar* _tmp225_;
+			DiscoveredCamera* _tmp226_;
+			DiscoveredCamera* _tmp227_;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp106_ = _port_it;
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3198,7 +3201,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			if (!_tmp107_) {
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 3200 "CameraTable.c"
+#line 3203 "CameraTable.c"
 			}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp108_ = _port_it;
@@ -3232,7 +3235,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp117_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp116_);
 #line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_tmp117_) {
-#line 3234 "CameraTable.c"
+#line 3237 "CameraTable.c"
 				const gchar* _tmp118_;
 				const gchar* _tmp119_;
 #line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -3253,7 +3256,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_g_free0 (port);
 #line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 3255 "CameraTable.c"
+#line 3258 "CameraTable.c"
 			}
 #line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp120_ = port;
@@ -3265,7 +3268,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_tmp122_ = path;
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (NULL != _tmp122_) {
-#line 3267 "CameraTable.c"
+#line 3270 "CameraTable.c"
 				GUdevDevice* device = NULL;
 				GUdevClient* _tmp123_;
 				const gchar* _tmp124_;
@@ -3297,7 +3300,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 				_tmp129_ = serial;
 #line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL != _tmp129_) {
-#line 3299 "CameraTable.c"
+#line 3302 "CameraTable.c"
 					const gchar* _tmp130_;
 					gchar* _tmp131_;
 					const gchar* _tmp132_;
@@ -3318,13 +3321,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (icon);
 #line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					icon = _tmp133_;
-#line 3320 "CameraTable.c"
+#line 3323 "CameraTable.c"
 				}
 #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp134_ = display_name;
 #line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL == _tmp134_) {
-#line 3326 "CameraTable.c"
+#line 3329 "CameraTable.c"
 					GUdevDevice* _tmp135_;
 					const gchar* _tmp136_;
 					gchar* _tmp137_;
@@ -3338,13 +3341,13 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (display_name);
 #line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					display_name = _tmp137_;
-#line 3340 "CameraTable.c"
+#line 3343 "CameraTable.c"
 				}
 #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp138_ = display_name;
 #line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (NULL == _tmp138_) {
-#line 3346 "CameraTable.c"
+#line 3349 "CameraTable.c"
 					GUdevDevice* _tmp139_;
 					const gchar* _tmp140_;
 					gchar* _tmp141_;
@@ -3358,770 +3361,946 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 					_g_free0 (display_name);
 #line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					display_name = _tmp141_;
-#line 3360 "CameraTable.c"
+#line 3363 "CameraTable.c"
 				}
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (serial);
 #line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (device);
-#line 3366 "CameraTable.c"
+#line 3369 "CameraTable.c"
 			}
-#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp142_ = display_name;
-#line 345 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (NULL == _tmp142_) {
-#line 3372 "CameraTable.c"
-				const gchar* _tmp143_;
-				gchar* _tmp144_;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp143_ = name;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp144_ = g_strdup (_tmp143_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (display_name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				display_name = _tmp144_;
-#line 3383 "CameraTable.c"
-			}
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp145_ = port_info_list;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp146_ = port;
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp147_ = gp_port_info_list_lookup_path (_tmp145_, _tmp146_);
-#line 350 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			index = _tmp147_;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp142_ = port;
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp143_ = g_str_has_prefix (_tmp142_, "disk:");
+#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (_tmp143_) {
+#line 3377 "CameraTable.c"
+				{
+					GMount* mount = NULL;
+					const gchar* _tmp144_;
+					gchar* _tmp145_;
+					gchar* _tmp146_;
+					GFile* _tmp147_;
+					GFile* _tmp148_;
+					GMount* _tmp149_;
+					GMount* _tmp150_;
+					GVolume* volume = NULL;
+					GMount* _tmp151_;
+					GVolume* _tmp152_;
+					const gchar* _tmp153_;
+					GVolume* _tmp154_;
+					gchar* _tmp155_;
+					gchar* _tmp156_;
+					gchar* _tmp157_;
+					GVolume* _tmp158_;
+					GIcon* _tmp159_;
+					GIcon* _tmp160_;
+					gchar* _tmp161_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp144_ = port;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp145_ = string_substring (_tmp144_, (glong) 5, (glong) -1);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp146_ = _tmp145_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp147_ = g_file_new_for_path (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp148_ = _tmp147_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp149_ = g_file_find_enclosing_mount (_tmp148_, NULL, &_inner_error_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp150_ = _tmp149_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (_tmp148_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_free0 (_tmp146_);
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					mount = _tmp150_;
+#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3421 "CameraTable.c"
+						goto __catch67_g_error;
+					}
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp151_ = mount;
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp152_ = g_mount_get_volume (_tmp151_);
+#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					volume = _tmp152_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp153_ = name;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp154_ = volume;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp155_ = g_volume_get_name (_tmp154_);
 #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp148_ = index;
+					_tmp156_ = _tmp155_;
 #line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (_tmp148_ < 0) {
-#line 3397 "CameraTable.c"
-				gint _tmp149_;
-				const gchar* _tmp150_;
-				gchar* _tmp151_;
-				gchar* _tmp152_;
+					_tmp157_ = g_strdup_printf (_ ("%s (%s)"), _tmp153_, _tmp156_);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_free0 (display_name);
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					display_name = _tmp157_;
+#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_free0 (_tmp156_);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp149_ = index;
+					_tmp158_ = volume;
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp150_ = port;
+					_tmp159_ = g_volume_get_icon (_tmp158_);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp151_ = g_strdup_printf ("lookup port %s", _tmp150_);
+					_tmp160_ = _tmp159_;
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp152_ = _tmp151_;
+					_tmp161_ = g_icon_to_string (_tmp160_);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, (int) _tmp149_, _tmp152_, &_inner_error_);
+					_g_free0 (icon);
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (_tmp152_);
+					icon = _tmp161_;
 #line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (_tmp160_);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (volume);
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (mount);
+#line 3464 "CameraTable.c"
+				}
+				goto __finally67;
+				__catch67_g_error:
+				{
+					GError* e = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					e = _inner_error_;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_inner_error_ = NULL;
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_error_free0 (e);
+#line 3476 "CameraTable.c"
+				}
+				__finally67:
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3446 "CameraTable.c"
+#line 3511 "CameraTable.c"
 					} else {
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3478 "CameraTable.c"
+#line 3543 "CameraTable.c"
 					}
 				}
 			}
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp153_ = port_info_list;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp154_ = index;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp156_ = gp_port_info_list_get_info (_tmp153_, _tmp154_, &_tmp155_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp162_ = display_name;
+#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (NULL == _tmp162_) {
+#line 3551 "CameraTable.c"
+				const gchar* _tmp163_;
+				gchar* _tmp164_;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp163_ = name;
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp164_ = g_strdup (_tmp163_);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (display_name);
+#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				display_name = _tmp164_;
+#line 3562 "CameraTable.c"
+			}
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp165_ = port_info_list;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp166_ = port;
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp167_ = gp_port_info_list_lookup_path (_tmp165_, _tmp166_);
+#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			index = _tmp167_;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp168_ = index;
+#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (_tmp168_ < 0) {
+#line 3576 "CameraTable.c"
+				gint _tmp169_;
+				const gchar* _tmp170_;
+				gchar* _tmp171_;
+				gchar* _tmp172_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp169_ = index;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp170_ = port;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp171_ = g_strdup_printf ("lookup port %s", _tmp170_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp172_ = _tmp171_;
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, (int) _tmp169_, _tmp172_, &_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (_tmp172_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					if (_inner_error_->domain == GPHOTO_ERROR) {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						g_propagate_error (error, _inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_gp_port_info_list_free0 (port_info_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						return;
+#line 3625 "CameraTable.c"
+					} else {
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (path);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (uri);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (icon);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (display_name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (name);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_free0 (port);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_object_unref0 (_port_it);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_g_object_unref0 (detected_map);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_gp_list_unref0 (camera_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						_gp_port_info_list_free0 (port_info_list);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						g_clear_error (&_inner_error_);
+#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+						return;
+#line 3657 "CameraTable.c"
+					}
+				}
+			}
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp173_ = port_info_list;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp174_ = index;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp176_ = gp_port_info_list_get_info (_tmp173_, _tmp174_, &_tmp175_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			port_info = _tmp155_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp157_ = port;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp158_ = g_strdup_printf ("get port info for %s", _tmp157_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp159_ = _tmp158_;
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp156_, _tmp159_, &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp159_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			port_info = _tmp175_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp177_ = port;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp178_ = g_strdup_printf ("get port info for %s", _tmp177_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp179_ = _tmp178_;
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp176_, _tmp179_, &_inner_error_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp179_);
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3538 "CameraTable.c"
+#line 3717 "CameraTable.c"
 				} else {
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 357 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3574 "CameraTable.c"
+#line 3753 "CameraTable.c"
 				}
 			}
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gp_port_info_get_path (port_info, &_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gp_port_info_get_path (port_info, &_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (tmp_path);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp161_ = g_strdup (_tmp160_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			tmp_path = _tmp161_;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp162_ = port;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp163_ = tmp_path;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_vala_assert (g_strcmp0 (_tmp162_, _tmp163_) == 0, "port == tmp_path");
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp164_ = self->priv->abilities_list;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp165_ = name;
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp166_ = gp_abilities_list_lookup_model (_tmp164_, _tmp165_);
-#line 363 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			index = _tmp166_;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp167_ = index;
-#line 364 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (_tmp167_ < 0) {
-#line 3603 "CameraTable.c"
-				gint _tmp168_;
-				const gchar* _tmp169_;
-				gchar* _tmp170_;
-				gchar* _tmp171_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp168_ = index;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp169_ = name;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp170_ = g_strdup_printf ("lookup camera model %s", _tmp169_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp171_ = _tmp170_;
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, (int) _tmp168_, _tmp171_, &_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (_tmp171_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp181_ = g_strdup (_tmp180_);
+#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			tmp_path = _tmp181_;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp182_ = port;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp183_ = tmp_path;
+#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_vala_assert (g_strcmp0 (_tmp182_, _tmp183_) == 0, "port == tmp_path");
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp184_ = self->priv->abilities_list;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp185_ = name;
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp186_ = gp_abilities_list_lookup_model (_tmp184_, _tmp185_);
+#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			index = _tmp186_;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp187_ = index;
+#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (_tmp187_ < 0) {
+#line 3782 "CameraTable.c"
+				gint _tmp188_;
+				const gchar* _tmp189_;
+				gchar* _tmp190_;
+				gchar* _tmp191_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp188_ = index;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp189_ = name;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp190_ = g_strdup_printf ("lookup camera model %s", _tmp189_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp191_ = _tmp190_;
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, (int) _tmp188_, _tmp191_, &_inner_error_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (_tmp191_);
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3656 "CameraTable.c"
+#line 3835 "CameraTable.c"
 					} else {
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3692 "CameraTable.c"
+#line 3871 "CameraTable.c"
 					}
 				}
 			}
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp172_ = self->priv->abilities_list;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp173_ = index;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp175_ = gp_abilities_list_get_abilities (_tmp172_, _tmp173_, &_tmp174_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp192_ = self->priv->abilities_list;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp193_ = index;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp195_ = gp_abilities_list_get_abilities (_tmp192_, _tmp193_, &_tmp194_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_abilities = _tmp174_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp176_ = name;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp177_ = g_strdup_printf ("lookup camera abilities for %s", _tmp176_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp178_ = _tmp177_;
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp175_, _tmp178_, &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp178_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_abilities = _tmp194_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp196_ = name;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp197_ = g_strdup_printf ("lookup camera abilities for %s", _tmp196_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp198_ = _tmp197_;
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp195_, _tmp198_, &_inner_error_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp198_);
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3754 "CameraTable.c"
+#line 3933 "CameraTable.c"
 				} else {
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3792 "CameraTable.c"
+#line 3971 "CameraTable.c"
 				}
 			}
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp180_ = gp_camera_new (&_tmp179_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp200_ = gp_camera_new (&_tmp199_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gcamera = _tmp179_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp181_ = name;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp182_ = g_strdup_printf ("create camera object for %s", _tmp181_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp183_ = _tmp182_;
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp180_, _tmp183_, &_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp183_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gcamera = _tmp199_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp201_ = name;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp202_ = g_strdup_printf ("create camera object for %s", _tmp201_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp203_ = _tmp202_;
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp200_, _tmp203_, &_inner_error_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp203_);
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3851 "CameraTable.c"
+#line 4030 "CameraTable.c"
 				} else {
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3891 "CameraTable.c"
+#line 4070 "CameraTable.c"
 				}
 			}
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp184_ = gcamera;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp185_ = camera_abilities;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp186_ = gp_camera_set_abilities (_tmp184_, _tmp185_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp187_ = name;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp188_ = g_strdup_printf ("set camera abilities for %s", _tmp187_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp189_ = _tmp188_;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp186_, _tmp189_, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp189_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp204_ = gcamera;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp205_ = camera_abilities;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp206_ = gp_camera_set_abilities (_tmp204_, _tmp205_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp207_ = name;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp208_ = g_strdup_printf ("set camera abilities for %s", _tmp207_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp209_ = _tmp208_;
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp206_, _tmp209_, &_inner_error_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp209_);
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3950 "CameraTable.c"
+#line 4129 "CameraTable.c"
 				} else {
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3990 "CameraTable.c"
+#line 4169 "CameraTable.c"
 				}
 			}
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp190_ = gcamera;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp191_ = port_info;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp192_ = gp_camera_set_port_info (_tmp190_, _tmp191_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp193_ = name;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp194_ = port;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp195_ = g_strdup_printf ("set port info for %s on %s", _tmp193_, _tmp194_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp196_ = _tmp195_;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp192_, _tmp196_, &_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp196_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp210_ = gcamera;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp211_ = port_info;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp212_ = gp_camera_set_port_info (_tmp210_, _tmp211_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp213_ = name;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp214_ = port;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp215_ = g_strdup_printf ("set port info for %s on %s", _tmp213_, _tmp214_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp216_ = _tmp215_;
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp212_, _tmp216_, &_inner_error_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp216_);
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4051 "CameraTable.c"
+#line 4230 "CameraTable.c"
 				} else {
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4091 "CameraTable.c"
+#line 4270 "CameraTable.c"
 				}
 			}
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp197_ = name;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp198_ = port;
-#line 376 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_debug ("CameraTable.vala:376: Adding to camera table: %s @ %s", _tmp197_, _tmp198_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp199_ = gcamera;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp200_ = uri;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp201_ = display_name;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp202_ = icon;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp203_ = discovered_camera_new (_tmp199_, _tmp200_, _tmp201_, _tmp202_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera = _tmp203_;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp204_ = self->priv->camera_map;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp205_ = uri;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp206_ = camera;
-#line 379 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp205_, _tmp206_);
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp207_ = camera;
-#line 381 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp207_);
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp217_ = name;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp218_ = port;
+#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp217_, _tmp218_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp219_ = gcamera;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp220_ = uri;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp221_ = display_name;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp222_ = icon;
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp223_ = discovered_camera_new (_tmp219_, _tmp220_, _tmp221_, _tmp222_);
+#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera = _tmp223_;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp224_ = self->priv->camera_map;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp225_ = uri;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp226_ = camera;
+#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp225_, _tmp226_);
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp227_ = camera;
+#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp227_);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4144,11 +4323,11 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 			_g_free0 (name);
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (port);
-#line 4146 "CameraTable.c"
+#line 4325 "CameraTable.c"
 		}
 #line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_port_it);
-#line 4150 "CameraTable.c"
+#line 4329 "CameraTable.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
@@ -4160,7 +4339,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 	_gp_list_unref0 (camera_list);
 #line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_port_info_list_free0 (port_info_list);
-#line 4162 "CameraTable.c"
+#line 4341 "CameraTable.c"
 }
 
 
@@ -4169,104 +4348,104 @@ static void camera_table_on_udev_event (CameraTable* self, const gchar* action,
 	GUdevDevice* _tmp1_;
 	const gchar* _tmp2_;
 	OneShotScheduler* _tmp3_;
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (action != NULL);
-#line 385 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_UDEV_IS_DEVICE (device));
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = action;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = device;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = g_udev_device_get_name (_tmp1_);
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_debug ("CameraTable.vala:386: udev event: %s on %s", _tmp0_, _tmp2_);
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	g_debug ("CameraTable.vala:396: udev event: %s on %s", _tmp0_, _tmp2_);
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp3_ = self->priv->camera_update_scheduler;
-#line 390 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp3_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4189 "CameraTable.c"
+#line 4368 "CameraTable.c"
 }
 
 
 void camera_table_on_volume_changed (CameraTable* self, GVolume* volume) {
 	OneShotScheduler* _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 393 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_IS_VOLUME (volume));
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->camera_update_scheduler;
-#line 394 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4203 "CameraTable.c"
+#line 4382 "CameraTable.c"
 }
 
 
 static void camera_table_on_update_cameras (CameraTable* self) {
 	GError * _inner_error_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4211 "CameraTable.c"
+#line 4390 "CameraTable.c"
 	{
 		CameraTable* _tmp0_;
 		CameraTable* _tmp1_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = camera_table_get_instance ();
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = _tmp0_;
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_update_camera_table (_tmp1_, &_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_camera_table_unref0 (_tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4227 "CameraTable.c"
-				goto __catch61_gphoto_error;
+#line 4406 "CameraTable.c"
+				goto __catch68_gphoto_error;
 			}
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/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);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 4236 "CameraTable.c"
+#line 4415 "CameraTable.c"
 		}
 	}
-	goto __finally61;
-	__catch61_gphoto_error:
+	goto __finally68;
+	__catch68_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_inner_error_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp2_ = err;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = _tmp2_->message;
-#line 401 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_warning ("CameraTable.vala:401: Error updating camera table: %s", _tmp3_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 4257 "CameraTable.c"
+#line 4436 "CameraTable.c"
 	}
-	__finally61:
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	__finally68:
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_clear_error (&_inner_error_);
-#line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return;
-#line 4268 "CameraTable.c"
+#line 4447 "CameraTable.c"
 	}
 }
 
@@ -4286,26 +4465,26 @@ static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
 		data1 = closure->data;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4288 "CameraTable.c"
+#line 4467 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = closure->data;
-#line 4294 "CameraTable.c"
+#line 4473 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback (data1, value_get_discovered_camera (param_values + 1), data2);
-#line 4300 "CameraTable.c"
+#line 4479 "CameraTable.c"
 }
 
 
 static void value_camera_table_init (GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 4307 "CameraTable.c"
+#line 4486 "CameraTable.c"
 }
 
 
@@ -4314,7 +4493,7 @@ static void value_camera_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (value->data[0].v_pointer);
-#line 4316 "CameraTable.c"
+#line 4495 "CameraTable.c"
 	}
 }
 
@@ -4324,11 +4503,11 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer);
-#line 4326 "CameraTable.c"
+#line 4505 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4330 "CameraTable.c"
+#line 4509 "CameraTable.c"
 	}
 }
 
@@ -4336,37 +4515,37 @@ static void value_camera_table_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_camera_table_peek_pointer (const GValue* value) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4338 "CameraTable.c"
+#line 4517 "CameraTable.c"
 }
 
 
 static gchar* value_camera_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 4345 "CameraTable.c"
+#line 4524 "CameraTable.c"
 		CameraTable * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4352 "CameraTable.c"
+#line 4531 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.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 4356 "CameraTable.c"
+#line 4535 "CameraTable.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = camera_table_ref (object);
-#line 4360 "CameraTable.c"
+#line 4539 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4364 "CameraTable.c"
+#line 4543 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4368 "CameraTable.c"
+#line 4547 "CameraTable.c"
 }
 
 
@@ -4377,25 +4556,25 @@ static gchar* value_camera_table_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4379 "CameraTable.c"
+#line 4558 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 4385 "CameraTable.c"
+#line 4564 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4389 "CameraTable.c"
+#line 4568 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4393 "CameraTable.c"
+#line 4572 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4397 "CameraTable.c"
+#line 4576 "CameraTable.c"
 }
 
 
@@ -4409,7 +4588,7 @@ GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 4411 "CameraTable.c"
+#line 4590 "CameraTable.c"
 }
 
 
@@ -4418,7 +4597,7 @@ gpointer value_get_camera_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4420 "CameraTable.c"
+#line 4599 "CameraTable.c"
 }
 
 
@@ -4438,17 +4617,17 @@ void value_set_camera_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_ref (value->data[0].v_pointer);
-#line 4440 "CameraTable.c"
+#line 4619 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4444 "CameraTable.c"
+#line 4623 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4450 "CameraTable.c"
+#line 4629 "CameraTable.c"
 	}
 }
 
@@ -4467,17 +4646,17 @@ void value_take_camera_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 4469 "CameraTable.c"
+#line 4648 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4473 "CameraTable.c"
+#line 4652 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4479 "CameraTable.c"
+#line 4658 "CameraTable.c"
 	}
 }
 
@@ -4493,7 +4672,7 @@ static void camera_table_class_init (CameraTableClass * klass) {
 	camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4495 "CameraTable.c"
+#line 4674 "CameraTable.c"
 }
 
 
@@ -4519,7 +4698,7 @@ static void camera_table_instance_init (CameraTable * self) {
 	self->priv->camera_map = _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 4521 "CameraTable.c"
+#line 4700 "CameraTable.c"
 }
 
 
@@ -4541,7 +4720,7 @@ static void camera_table_finalize (CameraTable * obj) {
 	_g_object_unref0 (self->priv->volume_monitor);
 #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (self->priv->camera_map);
-#line 4543 "CameraTable.c"
+#line 4722 "CameraTable.c"
 }
 
 
@@ -4566,7 +4745,7 @@ gpointer camera_table_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 4568 "CameraTable.c"
+#line 4747 "CameraTable.c"
 }
 
 
@@ -4579,7 +4758,7 @@ void camera_table_unref (gpointer instance) {
 		CAMERA_TABLE_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4581 "CameraTable.c"
+#line 4760 "CameraTable.c"
 	}
 }
 
diff --git a/src/camera/CameraTable.vala b/src/camera/CameraTable.vala
index 7eb7ae2..1636816 100644
--- a/src/camera/CameraTable.vala
+++ b/src/camera/CameraTable.vala
@@ -342,11 +342,21 @@ public class CameraTable {
                     display_name = device.get_property("ID_MODEL");
                 }
             }
+
+            if (port.has_prefix("disk:")) {
+                try {
+                    var mount = File.new_for_path (port.substring(5)).find_enclosing_mount();
+                    var volume = mount.get_volume();
+                    // Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
+                    display_name = _("%s (%s)").printf (name, volume.get_name ());
+                    icon = volume.get_icon().to_string();
+
+                } catch (Error e) { }
+            }
             if (null == display_name) {
                 // Default to GPhoto detected name.
                 display_name = name;
             }
-            
             int index = port_info_list.lookup_path(port);
             if (index < 0)
                 do_op((GPhoto.Result) index, "lookup port %s".printf(port));
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 6deedf6..b1865ed 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -19,10 +19,10 @@
 #include <gphoto2/gphoto2-filesys.h>
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-result.h>
+#include <gphoto2/gphoto2-file.h>
 #include <gphoto2/gphoto2-port-info-list.h>
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gphoto2/gphoto2-file.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -75,6 +75,7 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
+#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL)))
 
 #define TYPE_PHOTO_PREVIEW (photo_preview_get_type ())
 #define PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_PREVIEW, PhotoPreview))
@@ -182,6 +183,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
 #define GP_MAX_FILENAME_LENGTH 63
 #define GP_MAX_BASEDIR_LENGTH 255
 gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileInfo* info, GError** error);
+GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
 GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -194,8 +196,8 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 PhotoMetadata* photo_metadata_new (void);
 PhotoMetadata* photo_metadata_construct (GType object_type);
 void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error);
-guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, int* result_length1, GError** error);
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
+GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
 guint photo_metadata_get_preview_count (PhotoMetadata* self);
 gpointer photo_preview_ref (gpointer instance);
 void photo_preview_unref (gpointer instance);
@@ -205,17 +207,13 @@ void value_take_photo_preview (GValue* value, gpointer v_object);
 gpointer value_get_photo_preview (const GValue* value);
 GType photo_preview_get_type (void) G_GNUC_CONST;
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-static guint8* _vala_array_dup23 (guint8* self, int length);
+GBytes* photo_preview_flatten (PhotoPreview* self, GError** error);
 #define IMPORT_PREVIEW_MAX_SCALE 128
 GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
 GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error);
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error);
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error);
-static guint8* _vala_array_dup24 (guint8* self, int length);
-void gp_on_mins_destroyed (void* data);
-static void _gp_on_mins_destroyed_gdestroy_notify (void* data);
+void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error);
 GFile* app_dirs_get_temp_dir (void);
 
 
@@ -227,28 +225,28 @@ GQuark gphoto_error_quark (void) {
 static void _gp_context_wrapper_on_idle_gp_context_idle_func (GPContext* context, gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_idle ((GPContextWrapper*) self, context);
-#line 231 "GPhoto.c"
+#line 229 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_error_gp_context_error_func (GPContext* context, const gchar* text, gpointer self) {
 #line 19 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_error ((GPContextWrapper*) self, context, text);
-#line 238 "GPhoto.c"
+#line 236 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_status_gp_context_status_func (GPContext* context, const gchar* text, gpointer self) {
 #line 20 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_status ((GPContextWrapper*) self, context, text);
-#line 245 "GPhoto.c"
+#line 243 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_message_gp_context_message_func (GPContext* context, const gchar* text, gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_message ((GPContextWrapper*) self, context, text);
-#line 252 "GPhoto.c"
+#line 250 "GPhoto.c"
 }
 
 
@@ -257,21 +255,21 @@ static guint _gp_context_wrapper_on_progress_start_gp_context_progress_start_fun
 	result = gp_context_wrapper_on_progress_start ((GPContextWrapper*) self, context, target, text);
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 261 "GPhoto.c"
+#line 259 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_update_gp_context_progress_update_func (GPContext* context, guint id, gfloat current, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_update ((GPContextWrapper*) self, context, id, current);
-#line 268 "GPhoto.c"
+#line 266 "GPhoto.c"
 }
 
 
 static void _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func (GPContext* context, guint id, gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_on_progress_stop ((GPContextWrapper*) self, context, id);
-#line 275 "GPhoto.c"
+#line 273 "GPhoto.c"
 }
 
 
@@ -306,14 +304,14 @@ GPContextWrapper* gp_context_wrapper_construct (GType object_type) {
 	gp_context_set_progress_funcs (_tmp4_, _gp_context_wrapper_on_progress_start_gp_context_progress_start_func, _gp_context_wrapper_on_progress_update_gp_context_progress_update_func, _gp_context_wrapper_on_progress_stop_gp_context_progress_stop_func, self);
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 310 "GPhoto.c"
+#line 308 "GPhoto.c"
 }
 
 
 GPContextWrapper* gp_context_wrapper_new (void) {
 #line 17 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_context_wrapper_construct (GP_TYPE_CONTEXT_WRAPPER);
-#line 317 "GPhoto.c"
+#line 315 "GPhoto.c"
 }
 
 
@@ -326,14 +324,14 @@ void gp_context_wrapper_idle (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 25 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->idle (self);
-#line 330 "GPhoto.c"
+#line 328 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_error (GPContextWrapper* self, const gchar* text, void* data) {
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 337 "GPhoto.c"
+#line 335 "GPhoto.c"
 }
 
 
@@ -342,14 +340,14 @@ void gp_context_wrapper_error (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 28 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->error (self, text, data);
-#line 346 "GPhoto.c"
+#line 344 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_status (GPContextWrapper* self, const gchar* text, void* data) {
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 353 "GPhoto.c"
+#line 351 "GPhoto.c"
 }
 
 
@@ -358,14 +356,14 @@ void gp_context_wrapper_status (GPContextWrapper* self, const gchar* text, void*
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 31 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->status (self, text, data);
-#line 362 "GPhoto.c"
+#line 360 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_message (GPContextWrapper* self, const gchar* text, void* data) {
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 369 "GPhoto.c"
+#line 367 "GPhoto.c"
 }
 
 
@@ -374,14 +372,14 @@ void gp_context_wrapper_message (GPContextWrapper* self, const gchar* text, void
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 34 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->message (self, text, data);
-#line 378 "GPhoto.c"
+#line 376 "GPhoto.c"
 }
 
 
 static void gp_context_wrapper_real_progress_start (GPContextWrapper* self, gfloat current, const gchar* text, void* data) {
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (text != NULL);
-#line 385 "GPhoto.c"
+#line 383 "GPhoto.c"
 }
 
 
@@ -390,7 +388,7 @@ void gp_context_wrapper_progress_start (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 37 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_start (self, current, text, data);
-#line 394 "GPhoto.c"
+#line 392 "GPhoto.c"
 }
 
 
@@ -403,7 +401,7 @@ void gp_context_wrapper_progress_update (GPContextWrapper* self, gfloat current,
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 40 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_update (self, current, data);
-#line 407 "GPhoto.c"
+#line 405 "GPhoto.c"
 }
 
 
@@ -416,7 +414,7 @@ void gp_context_wrapper_progress_stop (GPContextWrapper* self) {
 	g_return_if_fail (GP_IS_CONTEXT_WRAPPER (self));
 #line 43 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	GP_CONTEXT_WRAPPER_GET_CLASS (self)->progress_stop (self);
-#line 420 "GPhoto.c"
+#line 418 "GPhoto.c"
 }
 
 
@@ -427,7 +425,7 @@ static void gp_context_wrapper_on_idle (GPContextWrapper* self, GPContext* conte
 	g_return_if_fail (context != NULL);
 #line 47 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_idle (self);
-#line 431 "GPhoto.c"
+#line 429 "GPhoto.c"
 }
 
 
@@ -443,7 +441,7 @@ static void gp_context_wrapper_on_error (GPContextWrapper* self, GPContext* cont
 	_tmp0_ = text;
 #line 51 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_error (self, _tmp0_, NULL);
-#line 447 "GPhoto.c"
+#line 445 "GPhoto.c"
 }
 
 
@@ -459,7 +457,7 @@ static void gp_context_wrapper_on_status (GPContextWrapper* self, GPContext* con
 	_tmp0_ = text;
 #line 55 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_status (self, _tmp0_, NULL);
-#line 463 "GPhoto.c"
+#line 461 "GPhoto.c"
 }
 
 
@@ -475,7 +473,7 @@ static void gp_context_wrapper_on_message (GPContextWrapper* self, GPContext* co
 	_tmp0_ = text;
 #line 59 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_message (self, _tmp0_, NULL);
-#line 479 "GPhoto.c"
+#line 477 "GPhoto.c"
 }
 
 
@@ -499,7 +497,7 @@ static guint gp_context_wrapper_on_progress_start (GPContextWrapper* self, GPCon
 	result = (guint) 0;
 #line 65 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 503 "GPhoto.c"
+#line 501 "GPhoto.c"
 }
 
 
@@ -513,7 +511,7 @@ static void gp_context_wrapper_on_progress_update (GPContextWrapper* self, GPCon
 	_tmp0_ = current;
 #line 69 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_update (self, _tmp0_, NULL);
-#line 517 "GPhoto.c"
+#line 515 "GPhoto.c"
 }
 
 
@@ -524,14 +522,14 @@ static void gp_context_wrapper_on_progress_stop (GPContextWrapper* self, GPConte
 	g_return_if_fail (context != NULL);
 #line 73 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_context_wrapper_progress_stop (self);
-#line 528 "GPhoto.c"
+#line 526 "GPhoto.c"
 }
 
 
 static void gp_value_context_wrapper_init (GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	value->data[0].v_pointer = NULL;
-#line 535 "GPhoto.c"
+#line 533 "GPhoto.c"
 }
 
 
@@ -540,7 +538,7 @@ static void gp_value_context_wrapper_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (value->data[0].v_pointer);
-#line 544 "GPhoto.c"
+#line 542 "GPhoto.c"
 	}
 }
 
@@ -550,11 +548,11 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = gp_context_wrapper_ref (src_value->data[0].v_pointer);
-#line 554 "GPhoto.c"
+#line 552 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 558 "GPhoto.c"
+#line 556 "GPhoto.c"
 	}
 }
 
@@ -562,37 +560,37 @@ static void gp_value_context_wrapper_copy_value (const GValue* src_value, GValue
 static gpointer gp_value_context_wrapper_peek_pointer (const GValue* value) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 566 "GPhoto.c"
+#line 564 "GPhoto.c"
 }
 
 
 static gchar* gp_value_context_wrapper_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (collect_values[0].v_pointer) {
-#line 573 "GPhoto.c"
+#line 571 "GPhoto.c"
 		GPContextWrapper * object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 580 "GPhoto.c"
+#line 578 "GPhoto.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.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 584 "GPhoto.c"
+#line 582 "GPhoto.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 588 "GPhoto.c"
+#line 586 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 592 "GPhoto.c"
+#line 590 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 596 "GPhoto.c"
+#line 594 "GPhoto.c"
 }
 
 
@@ -603,25 +601,25 @@ static gchar* gp_value_context_wrapper_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 607 "GPhoto.c"
+#line 605 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = NULL;
-#line 613 "GPhoto.c"
+#line 611 "GPhoto.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = value->data[0].v_pointer;
-#line 617 "GPhoto.c"
+#line 615 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*object_p = gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 621 "GPhoto.c"
+#line 619 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 625 "GPhoto.c"
+#line 623 "GPhoto.c"
 }
 
 
@@ -635,7 +633,7 @@ GParamSpec* gp_param_spec_context_wrapper (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return G_PARAM_SPEC (spec);
-#line 639 "GPhoto.c"
+#line 637 "GPhoto.c"
 }
 
 
@@ -644,7 +642,7 @@ gpointer gp_value_get_context_wrapper (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GP_TYPE_CONTEXT_WRAPPER), NULL);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return value->data[0].v_pointer;
-#line 648 "GPhoto.c"
+#line 646 "GPhoto.c"
 }
 
 
@@ -664,17 +662,17 @@ void gp_value_set_context_wrapper (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_ref (value->data[0].v_pointer);
-#line 668 "GPhoto.c"
+#line 666 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 672 "GPhoto.c"
+#line 670 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 678 "GPhoto.c"
+#line 676 "GPhoto.c"
 	}
 }
 
@@ -693,17 +691,17 @@ void gp_value_take_context_wrapper (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = v_object;
-#line 697 "GPhoto.c"
+#line 695 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 701 "GPhoto.c"
+#line 699 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (old) {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		gp_context_wrapper_unref (old);
-#line 707 "GPhoto.c"
+#line 705 "GPhoto.c"
 	}
 }
 
@@ -727,7 +725,7 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_context_wrapper_real_progress_update;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_stop = (void (*) (GPContextWrapper *)) gp_context_wrapper_real_progress_stop;
-#line 731 "GPhoto.c"
+#line 729 "GPhoto.c"
 }
 
 
@@ -739,7 +737,7 @@ static void gp_context_wrapper_instance_init (GPContextWrapper * self) {
 	self->context = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	self->ref_count = 1;
-#line 743 "GPhoto.c"
+#line 741 "GPhoto.c"
 }
 
 
@@ -751,7 +749,7 @@ static void gp_context_wrapper_finalize (GPContextWrapper * obj) {
 	g_signal_handlers_destroy (self);
 #line 15 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_context_unref0 (self->context);
-#line 755 "GPhoto.c"
+#line 753 "GPhoto.c"
 }
 
 
@@ -776,7 +774,7 @@ gpointer gp_context_wrapper_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return instance;
-#line 780 "GPhoto.c"
+#line 778 "GPhoto.c"
 }
 
 
@@ -789,7 +787,7 @@ void gp_context_wrapper_unref (gpointer instance) {
 		GP_CONTEXT_WRAPPER_GET_CLASS (self)->finalize (self);
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 793 "GPhoto.c"
+#line 791 "GPhoto.c"
 	}
 }
 
@@ -800,14 +798,14 @@ GPSpinIdleWrapper* gp_spin_idle_wrapper_construct (GType object_type) {
 	self = (GPSpinIdleWrapper*) gp_context_wrapper_construct (object_type);
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return self;
-#line 804 "GPhoto.c"
+#line 802 "GPhoto.c"
 }
 
 
 GPSpinIdleWrapper* gp_spin_idle_wrapper_new (void) {
 #line 79 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return gp_spin_idle_wrapper_construct (GP_TYPE_SPIN_IDLE_WRAPPER);
-#line 811 "GPhoto.c"
+#line 809 "GPhoto.c"
 }
 
 
@@ -819,7 +817,7 @@ static void gp_spin_idle_wrapper_real_idle (GPContextWrapper* base) {
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->idle (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper));
 #line 85 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 823 "GPhoto.c"
+#line 821 "GPhoto.c"
 }
 
 
@@ -837,7 +835,7 @@ static void gp_spin_idle_wrapper_real_progress_update (GPContextWrapper* base, g
 	GP_CONTEXT_WRAPPER_CLASS (gp_spin_idle_wrapper_parent_class)->progress_update (G_TYPE_CHECK_INSTANCE_CAST (self, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper), _tmp0_, _tmp1_);
 #line 91 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	spin_event_loop ();
-#line 841 "GPhoto.c"
+#line 839 "GPhoto.c"
 }
 
 
@@ -848,7 +846,7 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->idle = (void (*) (GPContextWrapper *)) gp_spin_idle_wrapper_real_idle;
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_update = (void (*) (GPContextWrapper *, gfloat, void*)) gp_spin_idle_wrapper_real_progress_update;
-#line 852 "GPhoto.c"
+#line 850 "GPhoto.c"
 }
 
 
@@ -902,7 +900,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (_tmp3_ > GP_MAX_BASEDIR_LENGTH) {
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = TRUE;
-#line 906 "GPhoto.c"
+#line 904 "GPhoto.c"
 	} else {
 		const gchar* _tmp4_;
 		gint _tmp5_;
@@ -915,11 +913,11 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		_tmp6_ = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_ > GP_MAX_FILENAME_LENGTH;
-#line 919 "GPhoto.c"
+#line 917 "GPhoto.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp0_) {
-#line 923 "GPhoto.c"
+#line 921 "GPhoto.c"
 		CameraFileInfo _tmp7_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
@@ -931,15 +929,15 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		if (info) {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*info = _vala_info;
-#line 935 "GPhoto.c"
+#line 933 "GPhoto.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			 (_vala_info);
-#line 939 "GPhoto.c"
+#line 937 "GPhoto.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 943 "GPhoto.c"
+#line 941 "GPhoto.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = camera;
@@ -961,7 +959,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	_tmp14_ = res;
 #line 111 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 965 "GPhoto.c"
+#line 963 "GPhoto.c"
 		int _tmp15_;
 		const gchar* _tmp16_;
 		const gchar* _tmp17_;
@@ -987,7 +985,7 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return _tmp21_;
-#line 991 "GPhoto.c"
+#line 989 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -995,15 +993,99 @@ gboolean gp_get_info (GPContext* context, Camera* camera, const gchar* folder, c
 	if (info) {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*info = _vala_info;
-#line 999 "GPhoto.c"
+#line 997 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1003 "GPhoto.c"
+#line 1001 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1007 "GPhoto.c"
+#line 1005 "GPhoto.c"
+}
+
+
+static gpointer _GPHOTO_REF_FILE0 (gpointer self) {
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	return self ? GPHOTO_REF_FILE (self) : NULL;
+#line 1012 "GPhoto.c"
+}
+
+
+GBytes* gp_camera_file_to_bytes (GPContext* context, CameraFile* file) {
+	GBytes* result = NULL;
+	guint8* data = NULL;
+	gulong data_len = 0UL;
+	int res = 0;
+	CameraFile* _tmp0_;
+	guint8* _tmp1_ = NULL;
+	gulong _tmp2_ = 0UL;
+	int _tmp3_;
+	int _tmp4_;
+	guint8* buffer = NULL;
+	guint8* _tmp5_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gulong _tmp6_;
+	gint _tmp7_;
+	guint8* _tmp8_;
+	gint _tmp8__length1;
+	CameraFile* _tmp9_;
+	CameraFile* _tmp10_;
+	GBytes* _tmp11_;
+#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	g_return_val_if_fail (context != NULL, NULL);
+#line 118 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	g_return_val_if_fail (file != NULL, NULL);
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp0_ = file;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp3_ = gp_file_get_data_and_size (_tmp0_, &_tmp1_, &_tmp2_);
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	data = _tmp1_;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	data_len = _tmp2_;
+#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	res = _tmp3_;
+#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp4_ = res;
+#line 125 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp4_ != GP_OK) {
+#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		result = NULL;
+#line 126 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		return result;
+#line 1059 "GPhoto.c"
+	}
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp5_ = data;
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	buffer = (guint8*) _tmp5_;
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	buffer_length1 = sizeof (guint8) / sizeof (guint8);
+#line 128 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_buffer_size_ = buffer_length1;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp6_ = data_len;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	buffer_length1 = (gint) _tmp6_;
+#line 129 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp7_ = buffer_length1;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp8_ = buffer;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp8__length1 = buffer_length1;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp9_ = file;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp10_ = _GPHOTO_REF_FILE0 (_tmp9_);
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp11_ = g_bytes_new_with_free_func (_tmp8_, (gsize) _tmp8__length1, gp_file_unref, _tmp10_);
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	result = _tmp11_;
+#line 131 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	return result;
+#line 1089 "GPhoto.c"
 }
 
 
@@ -1036,7 +1118,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1040 "GPhoto.c"
+#line 1122 "GPhoto.c"
 		glong _tmp3_;
 		glong _tmp4_;
 #line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1045,13 +1127,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1049 "GPhoto.c"
+#line 1131 "GPhoto.c"
 	}
 #line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1055 "GPhoto.c"
+#line 1137 "GPhoto.c"
 		glong _tmp6_;
 		glong _tmp7_;
 #line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1060,13 +1142,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1064 "GPhoto.c"
+#line 1146 "GPhoto.c"
 	}
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1070 "GPhoto.c"
+#line 1152 "GPhoto.c"
 		glong _tmp10_;
 		glong _tmp11_;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1075,11 +1157,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1079 "GPhoto.c"
+#line 1161 "GPhoto.c"
 	} else {
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1083 "GPhoto.c"
+#line 1165 "GPhoto.c"
 	}
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1087,7 +1169,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1091 "GPhoto.c"
+#line 1173 "GPhoto.c"
 		glong _tmp14_;
 		glong _tmp15_;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1096,11 +1178,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1100 "GPhoto.c"
+#line 1182 "GPhoto.c"
 	} else {
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1104 "GPhoto.c"
+#line 1186 "GPhoto.c"
 	}
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -1122,7 +1204,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1126 "GPhoto.c"
+#line 1208 "GPhoto.c"
 }
 
 
@@ -1146,53 +1228,53 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	PhotoMetadata* metadata = NULL;
 	PhotoMetadata* _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 137 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 122 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	sifs = NULL;
-#line 123 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	count = 0;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = camera;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = context;
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp2_, _tmp1_);
-#line 124 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	count = _tmp2_;
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = camera;
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_camera_get_port_info (_tmp3_, &_tmp4_);
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	 (port_info);
-#line 127 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	port_info = _tmp4_;
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_port_info_get_path (port_info, &_tmp5_);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (path);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 130 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	path = _tmp6_;
-#line 132 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = g_strdup ("disk:");
-#line 132 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	prefix = _tmp7_;
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = path;
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
-#line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp9_) {
-#line 1196 "GPhoto.c"
+#line 1278 "GPhoto.c"
 		const gchar* _tmp10_;
 		gint _tmp11_;
 		gint _tmp12_;
@@ -1200,43 +1282,43 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		gint _tmp14_;
 		gint _tmp15_;
 		gchar* _tmp16_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = path;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = strlen (prefix);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp12_ = _tmp11_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = path;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = strlen (_tmp13_);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = _tmp14_;
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = string_slice (_tmp10_, (glong) _tmp12_, (glong) _tmp15_);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (path);
-#line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		path = _tmp16_;
-#line 1222 "GPhoto.c"
+#line 1304 "GPhoto.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (prefix);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (path);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (port_info);
-#line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1234 "GPhoto.c"
+#line 1316 "GPhoto.c"
 	}
-#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = photo_metadata_new ();
-#line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp17_;
-#line 1240 "GPhoto.c"
+#line 1322 "GPhoto.c"
 	{
 		PhotoMetadata* _tmp18_;
 		const gchar* _tmp19_;
@@ -1250,463 +1332,394 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		gchar* _tmp27_;
 		GFile* _tmp28_;
 		GFile* _tmp29_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = metadata;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = path;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp20_ = folder;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp22_ = _tmp21_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp23_ = g_strconcat (_tmp22_, "/", NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp23_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp25_ = filename;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = g_strconcat (_tmp24_, _tmp25_, NULL);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = _tmp26_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = g_file_new_for_path (_tmp27_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = _tmp28_;
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp29_, &_inner_error_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (_tmp29_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp27_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp24_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp22_);
-#line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1290 "GPhoto.c"
-			goto __catch62_g_error;
+#line 1372 "GPhoto.c"
+			goto __catch69_g_error;
 		}
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally69;
+	__catch69_g_error:
 	{
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		metadata = NULL;
-#line 1305 "GPhoto.c"
+#line 1387 "GPhoto.c"
 	}
-	__finally62:
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally69:
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (prefix);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (path);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (port_info);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 155 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1324 "GPhoto.c"
+#line 1406 "GPhoto.c"
 	}
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (prefix);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (path);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	 (port_info);
-#line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1336 "GPhoto.c"
+#line 1418 "GPhoto.c"
 }
 
 
-static guint8* _vala_array_dup23 (guint8* self, int length) {
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 1343 "GPhoto.c"
+static gpointer _g_bytes_ref0 (gpointer self) {
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	return self ? g_bytes_ref (self) : NULL;
+#line 1425 "GPhoto.c"
 }
 
 
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error) {
-	guint8* _vala_raw = NULL;
-	int _vala_raw_length1 = 0;
-	gsize _vala_raw_length = 0UL;
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error) {
+	gchar* _vala_preview_md5 = NULL;
 	GdkPixbuf* result = NULL;
-	guint8* _tmp25_;
-	gint _tmp25__length1;
-	guint8* _tmp26_;
-	gint _tmp26__length1;
+	GBytes* raw = NULL;
+	GBytes* out_bytes = NULL;
+	GBytes* _tmp25_;
+	GBytes* _tmp26_;
+	GBytes* _tmp27_;
+	gchar* _tmp28_;
 	GMemoryInputStream* mins = NULL;
-	guint8* _tmp27_;
-	gint _tmp27__length1;
-	guint8* _tmp28_;
-	gint _tmp28__length1;
-	GMemoryInputStream* _tmp29_;
-	GdkPixbuf* _tmp30_ = NULL;
-	GMemoryInputStream* _tmp31_;
-	GdkPixbuf* _tmp32_;
+	GBytes* _tmp29_;
+	GMemoryInputStream* _tmp30_;
+	GdkPixbuf* _tmp31_ = NULL;
+	GMemoryInputStream* _tmp32_;
 	GdkPixbuf* _tmp33_;
+	GdkPixbuf* _tmp34_;
 	GError * _inner_error_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 164 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_vala_raw = (g_free (_vala_raw), NULL);
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_vala_raw = NULL;
-#line 150 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_vala_raw_length1 = 0;
-#line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_vala_raw_length = (gsize) 0;
-#line 1383 "GPhoto.c"
+#line 166 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	raw = NULL;
+#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	out_bytes = NULL;
+#line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_free0 (_vala_preview_md5);
+#line 168 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_vala_preview_md5 = NULL;
+#line 1462 "GPhoto.c"
 	{
-		guint8* _tmp0_ = NULL;
+		GBytes* _tmp0_ = NULL;
 		GPContext* _tmp1_;
 		Camera* _tmp2_;
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
-		gint _tmp5_;
-		guint8* _tmp6_;
-		gint _tmp0__length1;
-		gint __tmp0__size_;
-		guint8* _tmp7_;
-		gint _tmp7__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		GBytes* _tmp5_;
+		GBytes* _tmp6_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_tmp5_, &_inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0_ = _tmp6_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0__length1 = _tmp5_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		__tmp0__size_ = _tmp0__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_PREVIEW, &_inner_error_);
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp0_ = _tmp5_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1414 "GPhoto.c"
-			goto __catch63_g_error;
+#line 1485 "GPhoto.c"
+			goto __catch70_g_error;
 		}
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp7_ = _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp7__length1 = _tmp0__length1;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp6_ = _tmp0_;
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0__length1 = 0;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw = (g_free (_vala_raw), NULL);
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw = _tmp7_;
-#line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw_length1 = _tmp7__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1433 "GPhoto.c"
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (raw);
+#line 171 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		raw = _tmp6_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (_tmp0_);
+#line 1498 "GPhoto.c"
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally70;
+	__catch70_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
-		Camera* _tmp8_;
-		GPContext* _tmp9_;
+		Camera* _tmp7_;
+		GPContext* _tmp8_;
+		const gchar* _tmp9_;
 		const gchar* _tmp10_;
-		const gchar* _tmp11_;
+		PhotoMetadata* _tmp11_;
 		PhotoMetadata* _tmp12_;
 		PhotoMetadata* _tmp13_;
-		PhotoMetadata* _tmp14_;
-		guint _tmp15_;
+		guint _tmp14_;
 		PhotoPreview* preview = NULL;
+		PhotoMetadata* _tmp15_;
 		PhotoMetadata* _tmp16_;
-		PhotoMetadata* _tmp17_;
-		guint _tmp18_;
-		PhotoPreview* _tmp19_;
-		guint8* _tmp20_ = NULL;
-		PhotoPreview* _tmp21_;
-		gint _tmp22_;
-		guint8* _tmp23_;
-		gint _tmp20__length1;
-		gint __tmp20__size_;
-		guint8* _tmp24_;
-		gint _tmp24__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		guint _tmp17_;
+		PhotoPreview* _tmp18_;
+		GBytes* _tmp19_ = NULL;
+		PhotoPreview* _tmp20_;
+		GBytes* _tmp21_;
+		GBytes* _tmp22_;
+		GBytes* _tmp23_;
+		gchar* _tmp24_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp8_ = camera;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp9_ = context;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp10_ = folder;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp11_ = filename;
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 156 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		metadata = _tmp12_;
-#line 157 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp13_ = metadata;
-#line 157 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (NULL == _tmp13_) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp7_ = camera;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp8_ = context;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp9_ = folder;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp10_ = filename;
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
+#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		metadata = _tmp11_;
+#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp12_ = metadata;
+#line 174 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		if (NULL == _tmp12_) {
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			result = NULL;
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw = _vala_raw;
-#line 1488 "GPhoto.c"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			_g_bytes_unref0 (out_bytes);
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			_g_bytes_unref0 (raw);
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			if (preview_md5) {
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+				*preview_md5 = _vala_preview_md5;
+#line 1555 "GPhoto.c"
 			} else {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1492 "GPhoto.c"
-			}
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw_length1) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw_length1 = _vala_raw_length1;
-#line 1498 "GPhoto.c"
-			}
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw_length) {
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw_length = _vala_raw_length;
-#line 1504 "GPhoto.c"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+				_g_free0 (_vala_preview_md5);
+#line 1559 "GPhoto.c"
 			}
-#line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 175 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1508 "GPhoto.c"
+#line 1563 "GPhoto.c"
 		}
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp14_ = metadata;
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp15_ = photo_metadata_get_preview_count (_tmp14_);
-#line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (((guint) 0) == _tmp15_) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp13_ = metadata;
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp14_ = photo_metadata_get_preview_count (_tmp13_);
+#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		if (((guint) 0) == _tmp14_) {
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			result = NULL;
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw = _vala_raw;
-#line 1524 "GPhoto.c"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			_g_bytes_unref0 (out_bytes);
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			_g_bytes_unref0 (raw);
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+			if (preview_md5) {
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+				*preview_md5 = _vala_preview_md5;
+#line 1583 "GPhoto.c"
 			} else {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1528 "GPhoto.c"
-			}
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw_length1) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw_length1 = _vala_raw_length1;
-#line 1534 "GPhoto.c"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+				_g_free0 (_vala_preview_md5);
+#line 1587 "GPhoto.c"
 			}
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			if (raw_length) {
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-				*raw_length = _vala_raw_length;
-#line 1540 "GPhoto.c"
-			}
-#line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1544 "GPhoto.c"
+#line 1591 "GPhoto.c"
 		}
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp15_ = metadata;
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp17_ = metadata;
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp18_ = photo_metadata_get_preview_count (_tmp17_);
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp19_ = photo_metadata_get_preview (_tmp16_, _tmp18_ - 1);
-#line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		preview = _tmp19_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp21_ = preview;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp23_ = photo_preview_flatten (_tmp21_, &_tmp22_, &_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp20_ = _tmp23_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp20__length1 = _tmp22_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		__tmp20__size_ = _tmp20__length1;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp17_ = photo_metadata_get_preview_count (_tmp16_);
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp18_ = photo_metadata_get_preview (_tmp15_, _tmp17_ - 1);
+#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		preview = _tmp18_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp20_ = preview;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp21_ = photo_preview_flatten (_tmp20_, &_inner_error_);
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp19_ = _tmp21_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_photo_preview_unref0 (preview);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 1572 "GPhoto.c"
-			goto __finally63;
+#line 1615 "GPhoto.c"
+			goto __finally70;
 		}
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp24_ = _tmp20_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp24__length1 = _tmp20__length1;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp20_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp20__length1 = 0;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw = (g_free (_vala_raw), NULL);
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw = _tmp24_;
-#line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw_length1 = _tmp24__length1;
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp20_ = (g_free (_tmp20_), NULL);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp22_ = _tmp19_;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp19_ = NULL;
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (raw);
+#line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		raw = _tmp22_;
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp23_ = raw;
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp24_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp23_);
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_free0 (_vala_preview_md5);
+#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_vala_preview_md5 = _tmp24_;
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (_tmp19_);
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_photo_preview_unref0 (preview);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 1595 "GPhoto.c"
+#line 1640 "GPhoto.c"
 	}
-	__finally63:
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally70:
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		return NULL;
-#line 1604 "GPhoto.c"
-	}
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp25_ = _vala_raw;
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp25__length1 = _vala_raw_length1;
-#line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp25_ == NULL) {
-#line 166 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw_length = (gsize) 0;
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = NULL;
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (raw) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			*raw = _vala_raw;
-#line 1620 "GPhoto.c"
-		} else {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			_vala_raw = (g_free (_vala_raw), NULL);
-#line 1624 "GPhoto.c"
-		}
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (raw_length1) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			*raw_length1 = _vala_raw_length1;
-#line 1630 "GPhoto.c"
-		}
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (raw_length) {
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			*raw_length = _vala_raw_length;
-#line 1636 "GPhoto.c"
-		}
-#line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		return result;
-#line 1640 "GPhoto.c"
-	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp26_ = _vala_raw;
+		_g_bytes_unref0 (out_bytes);
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp26__length1 = _vala_raw_length1;
+		_g_bytes_unref0 (raw);
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_vala_raw_length = (gsize) _tmp26__length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp27_ = _vala_raw;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp27__length1 = _vala_raw_length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp28_ = (_tmp27_ != NULL) ? _vala_array_dup23 (_tmp27_, _tmp27__length1) : ((gpointer) _tmp27_);
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp28__length1 = _tmp27__length1;
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp29_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp28_, _tmp28__length1, NULL);
-#line 172 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	mins = _tmp29_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp31_ = mins;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp32_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp30_ = _tmp32_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		return NULL;
+#line 1653 "GPhoto.c"
+	}
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp25_ = raw;
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp26_ = _g_bytes_ref0 (_tmp25_);
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_bytes_unref0 (out_bytes);
+#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	out_bytes = _tmp26_;
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = out_bytes;
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28_ = g_compute_checksum_for_bytes (G_CHECKSUM_MD5, _tmp27_);
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_free0 (_vala_preview_md5);
+#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_vala_preview_md5 = _tmp28_;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp29_ = raw;
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp29_);
+#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	mins = _tmp30_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp32_ = mins;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp33_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp31_ = _tmp33_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (mins);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (out_bytes);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (raw);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1674 "GPhoto.c"
+#line 1695 "GPhoto.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp33_ = _tmp30_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp30_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = _tmp33_;
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_object_unref0 (_tmp30_);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp34_ = _tmp31_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp31_ = NULL;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	result = _tmp34_;
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_object_unref0 (_tmp31_);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (mins);
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (raw) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		*raw = _vala_raw;
-#line 1690 "GPhoto.c"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_bytes_unref0 (out_bytes);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_bytes_unref0 (raw);
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (preview_md5) {
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		*preview_md5 = _vala_preview_md5;
+#line 1715 "GPhoto.c"
 	} else {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1694 "GPhoto.c"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_free0 (_vala_preview_md5);
+#line 1719 "GPhoto.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (raw_length1) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		*raw_length1 = _vala_raw_length1;
-#line 1700 "GPhoto.c"
-	}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (raw_length) {
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		*raw_length = _vala_raw_length;
-#line 1706 "GPhoto.c"
-	}
-#line 173 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 190 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1710 "GPhoto.c"
+#line 1723 "GPhoto.c"
 }
 
 
@@ -1724,75 +1737,75 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 	GdkPixbuf* _tmp8_;
 	GdkPixbuf* _tmp9_;
 	GError * _inner_error_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = context;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = camera;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = folder;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = filename;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = gp_load_file_into_stream (_tmp0_, _tmp1_, _tmp2_, _tmp3_, GP_FILE_TYPE_NORMAL, &_inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	ins = _tmp4_;
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1754 "GPhoto.c"
+#line 1767 "GPhoto.c"
 	}
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
-#line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ == NULL) {
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 180 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1766 "GPhoto.c"
+#line 1779 "GPhoto.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = gdk_pixbuf_new_from_stream (_tmp7_, NULL, &_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = _tmp8_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (ins);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1782 "GPhoto.c"
+#line 1795 "GPhoto.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp6_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp9_;
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp6_);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (ins);
-#line 182 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1796 "GPhoto.c"
+#line 1809 "GPhoto.c"
 }
 
 
@@ -1818,351 +1831,327 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	int _tmp25_;
 	int _tmp26_;
 	GError * _inner_error_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (context != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (camera != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (folder != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (filename != NULL);
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = dest_file;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = _tmp1_;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp3_ = creat (_tmp2_, (mode_t) 0640);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp4_ = _tmp3_;
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp2_);
-#line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	fd = _tmp4_;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = fd;
-#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp5_ < 0) {
-#line 1850 "GPhoto.c"
+#line 1863 "GPhoto.c"
 		gint _tmp6_;
 		GFile* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
 		GError* _tmp10_;
 		GError* _tmp11_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = errno;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = dest_file;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = _tmp8_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "[%d] Error creating file %s: %m", _tmp6_, _tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = _tmp10_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp11_;
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 205 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1877 "GPhoto.c"
+#line 1890 "GPhoto.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = fd;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp13_;
-#line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp14_;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp15_ = res;
-#line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp15_ != GP_OK) {
-#line 1893 "GPhoto.c"
+#line 1906 "GPhoto.c"
 		int _tmp16_;
 		int _tmp17_;
 		const gchar* _tmp18_;
 		GError* _tmp19_;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = res;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp16_, _tmp18_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1914 "GPhoto.c"
+#line 1927 "GPhoto.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp20_ = camera;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = folder;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = filename;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = camera_file;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = context;
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = gp_camera_file_get (_tmp20_, _tmp21_, _tmp22_, GP_FILE_TYPE_NORMAL, _tmp23_, _tmp24_);
-#line 197 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp25_;
-#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = res;
-#line 198 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp26_ != GP_OK) {
-#line 1934 "GPhoto.c"
+#line 1947 "GPhoto.c"
 		int _tmp27_;
 		const gchar* _tmp28_;
 		const gchar* _tmp29_;
 		int _tmp30_;
 		const gchar* _tmp31_;
 		GError* _tmp32_;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = res;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = folder;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = filename;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = res;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = gp_port_result_as_string (_tmp30_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp32_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp27_, _tmp28_, _tmp29_, _tmp31_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp32_;
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1961 "GPhoto.c"
+#line 1974 "GPhoto.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 1965 "GPhoto.c"
+#line 1978 "GPhoto.c"
+}
+
+
+static gint _vala_g_bytes_get_length (GBytes* self) {
+	gint result;
+	gsize _tmp0_;
+#line 5013 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = g_bytes_get_size (self);
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = (gint) _tmp0_;
+#line 5015 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 1993 "GPhoto.c"
 }
 
 
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error) {
 	PhotoMetadata* result = NULL;
-	guint8* camera_raw = NULL;
-	gint camera_raw_length1;
-	gint _camera_raw_size_;
-	gboolean _tmp13_ = FALSE;
-	guint8* _tmp14_;
-	gint _tmp14__length1;
+	GBytes* camera_raw = NULL;
+	gboolean _tmp12_ = FALSE;
+	GBytes* _tmp13_;
 	PhotoMetadata* metadata = NULL;
-	PhotoMetadata* _tmp16_;
 	PhotoMetadata* _tmp17_;
-	guint8* _tmp18_;
-	gint _tmp18__length1;
+	PhotoMetadata* _tmp18_;
+	GBytes* _tmp19_;
 	GError * _inner_error_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = NULL;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	camera_raw_length1 = 0;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_camera_raw_size_ = camera_raw_length1;
-#line 1997 "GPhoto.c"
+#line 2017 "GPhoto.c"
 	{
-		guint8* _tmp0_ = NULL;
+		GBytes* _tmp0_ = NULL;
 		GPContext* _tmp1_;
 		Camera* _tmp2_;
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
-		gint _tmp5_;
-		guint8* _tmp6_;
-		gint _tmp0__length1;
-		gint __tmp0__size_;
-		guint8* _tmp7_;
-		gint _tmp7__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		GBytes* _tmp5_;
+		GBytes* _tmp6_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp6_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_tmp5_, &_inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0_ = _tmp6_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0__length1 = _tmp5_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		__tmp0__size_ = _tmp0__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp5_ = gp_load_file_into_buffer (_tmp1_, _tmp2_, _tmp3_, _tmp4_, GP_FILE_TYPE_EXIF, &_inner_error_);
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp0_ = _tmp5_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2028 "GPhoto.c"
-			goto __catch64_g_error;
+#line 2040 "GPhoto.c"
+			goto __catch71_g_error;
 		}
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp7_ = _tmp0_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp7__length1 = _tmp0__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp6_ = _tmp0_;
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0__length1 = 0;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = (g_free (camera_raw), NULL);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = _tmp7_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw_length1 = _tmp7__length1;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_camera_raw_size_ = camera_raw_length1;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2049 "GPhoto.c"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (camera_raw);
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		camera_raw = _tmp6_;
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (_tmp0_);
+#line 2053 "GPhoto.c"
 	}
-	goto __finally64;
-	__catch64_g_error:
+	goto __finally71;
+	__catch71_g_error:
 	{
-		Camera* _tmp8_;
-		GPContext* _tmp9_;
+		Camera* _tmp7_;
+		GPContext* _tmp8_;
+		const gchar* _tmp9_;
 		const gchar* _tmp10_;
-		const gchar* _tmp11_;
-		PhotoMetadata* _tmp12_;
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		PhotoMetadata* _tmp11_;
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp8_ = camera;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp9_ = context;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp10_ = folder;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp11_ = filename;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = _tmp12_;
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = (g_free (camera_raw), NULL);
-#line 210 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp7_ = camera;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp8_ = context;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp9_ = folder;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp10_ = filename;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp11_ = gp_get_fallback_metadata (_tmp7_, _tmp8_, _tmp9_, _tmp10_);
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		result = _tmp11_;
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (camera_raw);
+#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2079 "GPhoto.c"
+#line 2083 "GPhoto.c"
 	}
-	__finally64:
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally71:
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = (g_free (camera_raw), NULL);
-#line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (camera_raw);
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2090 "GPhoto.c"
+#line 2094 "GPhoto.c"
 	}
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp14_ = camera_raw;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp14__length1 = camera_raw_length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp14_ == NULL) {
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp13_ = TRUE;
-#line 2100 "GPhoto.c"
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp13_ = camera_raw;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp13_ == NULL) {
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp12_ = TRUE;
+#line 2102 "GPhoto.c"
 	} else {
-		guint8* _tmp15_;
-		gint _tmp15__length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp15_ = camera_raw;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp15__length1 = camera_raw_length1;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp13_ = _tmp15__length1 == 0;
-#line 2110 "GPhoto.c"
+		GBytes* _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp14_ = camera_raw;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp15_ = _vala_g_bytes_get_length (_tmp14_);
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp16_ = _tmp15_;
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp12_ = _tmp16_ == 0;
+#line 2115 "GPhoto.c"
 	}
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp13_) {
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp12_) {
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = (g_free (camera_raw), NULL);
-#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (camera_raw);
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2120 "GPhoto.c"
+#line 2125 "GPhoto.c"
 	}
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp16_ = photo_metadata_new ();
-#line 216 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	metadata = _tmp16_;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp17_ = metadata;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp18_ = camera_raw;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp18__length1 = camera_raw_length1;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp17_ = photo_metadata_new ();
+#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	metadata = _tmp17_;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp18_ = metadata;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp19_ = camera_raw;
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	photo_metadata_read_from_app1_segment (_tmp18_, _tmp19_, &_inner_error_);
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		camera_raw = (g_free (camera_raw), NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (camera_raw);
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2144 "GPhoto.c"
+#line 2147 "GPhoto.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	camera_raw = (g_free (camera_raw), NULL);
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_bytes_unref0 (camera_raw);
+#line 236 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2152 "GPhoto.c"
-}
-
-
-static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 2159 "GPhoto.c"
-}
-
-
-static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	gp_on_mins_destroyed (data);
-#line 2166 "GPhoto.c"
+#line 2155 "GPhoto.c"
 }
 
 
@@ -2180,308 +2169,259 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	GPContext* _tmp11_;
 	int _tmp12_;
 	int _tmp13_;
-	guint8* data = NULL;
-	gulong data_len = 0UL;
-	guint8* _tmp20_ = NULL;
-	gulong _tmp21_ = 0UL;
-	int _tmp22_;
-	int _tmp23_;
+	GBytes* bytes = NULL;
+	GPContext* _tmp20_;
+	GBytes* _tmp21_;
+	GBytes* _tmp22_;
 	GFile* temp = NULL;
-	GFile* _tmp32_;
-	GFile* _tmp33_;
-	GFile* _tmp34_;
-	GFile* _tmp35_;
-	GFile* _tmp36_;
-	gchar* _tmp37_;
-	gchar* _tmp38_;
-	int _tmp39_;
-	int _tmp40_;
-	GFileInputStream* _tmp51_ = NULL;
-	GFile* _tmp52_;
-	GFileInputStream* _tmp53_;
-	GFileInputStream* _tmp54_;
+	GFile* _tmp25_;
+	GFile* _tmp26_;
+	GFile* _tmp27_;
+	GFile* _tmp28_;
+	GFile* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	int _tmp32_;
+	int _tmp33_;
+	GFileInputStream* _tmp44_ = NULL;
+	GFile* _tmp45_;
+	GFileInputStream* _tmp46_;
+	GFileInputStream* _tmp47_;
 	GError * _inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2225 "GPhoto.c"
+#line 2212 "GPhoto.c"
 		int _tmp3_;
 		int _tmp4_;
 		const gchar* _tmp5_;
 		GError* _tmp6_;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2246 "GPhoto.c"
+#line 2233 "GPhoto.c"
 	}
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = context;
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 248 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp12_;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = res;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2266 "GPhoto.c"
+#line 2253 "GPhoto.c"
 		int _tmp14_;
 		const gchar* _tmp15_;
 		const gchar* _tmp16_;
 		int _tmp17_;
 		const gchar* _tmp18_;
 		GError* _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = res;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = folder;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = filename;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 233 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2293 "GPhoto.c"
+#line 2280 "GPhoto.c"
 	}
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	data = _tmp20_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	data_len = _tmp21_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp22_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp23_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp23_ == GP_OK) {
-#line 2307 "GPhoto.c"
-		guint8* buffer = NULL;
-		gulong _tmp24_;
-		guint8* _tmp25_;
-		gint buffer_length1;
-		gint _buffer_size_;
-		guint8* _tmp26_;
-		gint _tmp26__length1;
-		guint8* _tmp27_;
-		guint8* _tmp28_;
-		gint _tmp28__length1;
-		guint8* _tmp29_;
-		gint _tmp29__length1;
-		guint8* _tmp30_;
-		gint _tmp30__length1;
-		GMemoryInputStream* _tmp31_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp24_ = data_len;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		buffer = _tmp25_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		buffer_length1 = _tmp24_;
-#line 243 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_buffer_size_ = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26_ = buffer;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26__length1 = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp27_ = data;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp28_ = buffer;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp28__length1 = buffer_length1;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp29_ = buffer;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp29__length1 = buffer_length1;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp30__length1 = _tmp29__length1;
-#line 246 "/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 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		buffer = (g_free (buffer), NULL);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp20_ = context;
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp21_ = gp_camera_file_to_bytes (_tmp20_, camera_file);
+#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	bytes = _tmp21_;
+#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp22_ = bytes;
+#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp22_ != NULL) {
+#line 2292 "GPhoto.c"
+		GBytes* _tmp23_;
+		GMemoryInputStream* _tmp24_;
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp23_ = bytes;
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp24_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp23_);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_input_stream_get_type (), GInputStream);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (bytes);
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 258 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2363 "GPhoto.c"
+#line 2307 "GPhoto.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp32_ = app_dirs_get_temp_dir ();
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp33_ = _tmp32_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp35_ = _tmp34_;
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_object_unref0 (_tmp33_);
-#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	temp = _tmp35_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp36_ = temp;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp37_ = g_file_get_path (_tmp36_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp38_ = _tmp37_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp39_;
-#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_free0 (_tmp38_);
-#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp40_ = res;
-#line 252 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp40_ != GP_OK) {
-#line 2393 "GPhoto.c"
-		int _tmp41_;
-		const gchar* _tmp42_;
-		const gchar* _tmp43_;
-		GFile* _tmp44_;
-		gchar* _tmp45_;
-		gchar* _tmp46_;
-		int _tmp47_;
-		const gchar* _tmp48_;
-		GError* _tmp49_;
-		GError* _tmp50_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp41_ = res;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp42_ = folder;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp43_ = filename;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp44_ = temp;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp45_ = g_file_get_path (_tmp44_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp46_ = _tmp45_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp47_ = res;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp49_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp41_, _tmp42_, _tmp43_, _tmp46_, _tmp48_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp50_ = _tmp49_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_g_free0 (_tmp46_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp50_;
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp25_ = app_dirs_get_temp_dir ();
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp26_ = _tmp25_;
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = g_file_get_child (_tmp26_, "import.tmp");
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp28_ = _tmp27_;
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_object_unref0 (_tmp26_);
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	temp = _tmp28_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp29_ = temp;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp30_ = g_file_get_path (_tmp29_);
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp31_ = _tmp30_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp32_ = gp_file_save (camera_file, _tmp31_);
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	res = _tmp32_;
+#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_free0 (_tmp31_);
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp33_ = res;
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp33_ != GP_OK) {
+#line 2337 "GPhoto.c"
+		int _tmp34_;
+		const gchar* _tmp35_;
+		const gchar* _tmp36_;
+		GFile* _tmp37_;
+		gchar* _tmp38_;
+		gchar* _tmp39_;
+		int _tmp40_;
+		const gchar* _tmp41_;
+		GError* _tmp42_;
+		GError* _tmp43_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp34_ = res;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp35_ = folder;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp36_ = filename;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp37_ = temp;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp38_ = g_file_get_path (_tmp37_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp39_ = _tmp38_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp40_ = res;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp41_ = gp_port_result_as_string (_tmp40_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp42_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp34_, _tmp35_, _tmp36_, _tmp39_, _tmp41_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp43_ = _tmp42_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_free0 (_tmp39_);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp43_;
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (bytes);
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 253 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2436 "GPhoto.c"
+#line 2382 "GPhoto.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp52_ = temp;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp51_ = _tmp53_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp45_ = temp;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp46_ = g_file_read (_tmp45_, NULL, &_inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp44_ = _tmp46_;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_bytes_unref0 (bytes);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2454 "GPhoto.c"
+#line 2402 "GPhoto.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp54_ = _tmp51_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp51_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_object_unref0 (_tmp51_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp47_ = _tmp44_;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp44_ = NULL;
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, g_input_stream_get_type (), GInputStream);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_object_unref0 (_tmp44_);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (temp);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_bytes_unref0 (bytes);
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2470 "GPhoto.c"
+#line 2420 "GPhoto.c"
 }
 
 
-void gp_on_mins_destroyed (void* data) {
-	void* _tmp0_;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp0_ = data;
-#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	g_free (_tmp0_);
-#line 2480 "GPhoto.c"
-}
-
-
-guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, int* result_length1, GError** error) {
-	guint8* result = NULL;
+GBytes* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, CameraFileType filetype, GError** error) {
+	GBytes* result = NULL;
 	CameraFile* camera_file = NULL;
 	int res = 0;
 	CameraFile* _tmp0_ = NULL;
@@ -2495,192 +2435,115 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	GPContext* _tmp12_;
 	int _tmp13_;
 	int _tmp14_;
-	guint8* data = NULL;
-	gulong data_len = 0UL;
-	CameraFile* _tmp21_;
-	guint8* _tmp22_ = NULL;
-	gulong _tmp23_ = 0UL;
-	int _tmp24_;
-	int _tmp25_;
-	guint8* buffer = NULL;
-	gulong _tmp27_;
-	guint8* _tmp28_;
-	gint buffer_length1;
-	gint _buffer_size_;
-	guint8* _tmp29_;
-	gint _tmp29__length1;
-	guint8* _tmp30_;
-	guint8* _tmp31_;
-	gint _tmp31__length1;
-	guint8* _tmp32_;
-	gint _tmp32__length1;
+	GPContext* _tmp21_;
+	CameraFile* _tmp22_;
+	GBytes* _tmp23_;
 	GError * _inner_error_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 267 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 275 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 276 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2539 "GPhoto.c"
+#line 2463 "GPhoto.c"
 		int _tmp3_;
 		int _tmp4_;
 		const gchar* _tmp5_;
 		GError* _tmp6_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp6_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp3_, _tmp5_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2560 "GPhoto.c"
+#line 2484 "GPhoto.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = camera_file;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = context;
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp13_;
-#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = res;
-#line 272 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2582 "GPhoto.c"
+#line 2506 "GPhoto.c"
 		int _tmp15_;
 		const gchar* _tmp16_;
 		const gchar* _tmp17_;
 		int _tmp18_;
 		const gchar* _tmp19_;
 		GError* _tmp20_;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = folder;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = filename;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = res;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp15_, _tmp16_, _tmp17_, _tmp19_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp20_;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_gp_file_unref0 (camera_file);
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		return NULL;
-#line 2609 "GPhoto.c"
-	}
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp21_ = camera_file;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	data = _tmp22_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	data_len = _tmp23_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp24_;
 #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp25_ = res;
+		g_propagate_error (error, _inner_error_);
 #line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp25_ != GP_OK) {
-#line 2625 "GPhoto.c"
-		guint8* _tmp26_;
-		gint _tmp26__length1;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26__length1 = 0;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		if (result_length1) {
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-			*result_length1 = _tmp26__length1;
-#line 2636 "GPhoto.c"
-		}
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		result = _tmp26_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		return result;
-#line 2644 "GPhoto.c"
+#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		return NULL;
+#line 2533 "GPhoto.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp27_ = data_len;
+	_tmp21_ = context;
 #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp28_ = g_new0 (guint8, _tmp27_);
+	_tmp22_ = camera_file;
 #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	buffer = _tmp28_;
+	_tmp23_ = gp_camera_file_to_bytes (_tmp21_, _tmp22_);
 #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	buffer_length1 = _tmp27_;
+	result = _tmp23_;
 #line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_buffer_size_ = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp29_ = buffer;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp29__length1 = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp30_ = data;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp31_ = buffer;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp31__length1 = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp32_ = buffer;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp32__length1 = buffer_length1;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (result_length1) {
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		*result_length1 = _tmp32__length1;
-#line 2676 "GPhoto.c"
-	}
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	result = _tmp32_;
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2684 "GPhoto.c"
+#line 2547 "GPhoto.c"
 }
 
 
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 8dab941..39b2109 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -115,6 +115,22 @@ namespace GPhoto {
         return true;
     }
 
+    public Bytes? camera_file_to_bytes (Context context, CameraFile file) {
+        // if buffer can be loaded into memory, return a Bytes class with
+        // CameraFile being the owner of the data. This way, the CameraFile is freed
+        // when the Bytes are freed
+        unowned uint8 *data;
+        ulong data_len;
+        var res = file.get_data_and_size(out data, out data_len);
+        if (res != Result.OK)
+            return null;
+
+        unowned uint8[] buffer = (uint8[]) data;
+        buffer.length = (int) data_len;
+
+        return Bytes.new_with_owner<GPhoto.CameraFile>(buffer, file);
+    }
+
     // 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
@@ -146,9 +162,10 @@ namespace GPhoto {
     }
     
     public Gdk.Pixbuf? load_preview(Context context, Camera camera, string folder, string filename,
-        out uint8[] raw, out size_t raw_length) throws Error {
-        raw = null;
-        raw_length = 0;
+            out string? preview_md5) throws Error {
+        Bytes? raw = null;
+        Bytes? out_bytes = null;
+        preview_md5 = null;
         
         try {
             raw = load_file_into_buffer(context, camera, folder, filename, GPhoto.CameraFileType.PREVIEW);
@@ -158,18 +175,18 @@ namespace GPhoto {
                 return null;
             if(0 == metadata.get_preview_count())
                 return null;
-            PhotoPreview? preview = metadata.get_preview(metadata.get_preview_count() - 1);
+
+            // Get the smallest preview from meta-data
+            var preview = metadata.get_preview (metadata.get_preview_count() - 1);
             raw = preview.flatten();
+            preview_md5 = Checksum.compute_for_bytes(ChecksumType.MD5, raw);
         }
         
-        if (raw == null) {
-            raw_length = 0;
-            return null;
-        }
-        
-        raw_length = raw.length;
-        
-        MemoryInputStream mins = new MemoryInputStream.from_data(raw, null);
+        out_bytes = raw;
+        preview_md5 = Checksum.compute_for_bytes(ChecksumType.MD5, out_bytes);
+
+        MemoryInputStream mins = new MemoryInputStream.from_bytes (raw);
+
         return new Gdk.Pixbuf.from_stream_at_scale(mins, ImportPreview.MAX_SCALE, ImportPreview.MAX_SCALE, true, null);
     }
     
@@ -203,7 +220,7 @@ namespace GPhoto {
     
     public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename)
         throws Error {
-        uint8[] camera_raw = null;
+        Bytes? camera_raw = null;
         try {
             camera_raw = load_file_into_buffer(context, camera, folder, filename, GPhoto.CameraFileType.EXIF);
         } catch {
@@ -233,17 +250,12 @@ namespace GPhoto {
             throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s", 
                 (int) res, folder, filename, res.as_string());
         
-        // if entire file fits in memory, return a stream from that ... can't merely wrap
-        // MemoryInputStream around the camera_file buffer, as that will be destroyed when the
-        // function returns
-        unowned uint8 *data;
-        ulong data_len;
-        res = camera_file.get_data_and_size(out data, out data_len);
-        if (res == Result.OK) {
-            uint8[] buffer = new uint8[data_len];
-            Memory.copy(buffer, data, buffer.length);
-            
-            return new MemoryInputStream.from_data(buffer, on_mins_destroyed);
+        // if entire file fits in memory, return a stream from that ...
+        // The camera_file is set as data on the object to keep it alive while
+        // the MemoryInputStream is alive.
+        var bytes = camera_file_to_bytes (context, camera_file);
+        if (bytes != null) {
+            return new MemoryInputStream.from_bytes(bytes);
         }
 
         // if not stored in memory, try copying it to a temp file and then reading out of that
@@ -256,35 +268,20 @@ namespace GPhoto {
         return temp.read(null);
     }
     
-    private static void on_mins_destroyed(void *data) {
-        free(data);
-    }
-    
     // Returns a buffer with the requested file, if within reason.  Use load_file for larger files.
-    public uint8[]? load_file_into_buffer(Context context, Camera camera, string folder,
+    public Bytes? load_file_into_buffer(Context context, Camera camera, string folder,
         string filename, CameraFileType filetype) throws Error {
         GPhoto.CameraFile camera_file;
         GPhoto.Result res = GPhoto.CameraFile.create(out camera_file);
         if (res != Result.OK)
             throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string());
-        
+
         res = camera.get_file(folder, filename, filetype, camera_file, context);
         if (res != Result.OK)
             throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s", 
                 (int) res, folder, filename, res.as_string());
-        
-        // if buffer can be loaded into memory, return a copy of that (can't return buffer itself
-        // as it will be destroyed when the camera_file is unref'd)
-        unowned uint8 *data;
-        ulong data_len;
-        res = camera_file.get_data_and_size(out data, out data_len);
-        if (res != Result.OK)
-            return null;
-        
-        uint8[] buffer = new uint8[data_len];
-        Memory.copy(buffer, data, buffer.length);
-        
-        return buffer;
+
+        return camera_file_to_bytes (context, camera_file);
     }
 }
 
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 2f5582f..a1593ef 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1283,6 +1283,7 @@ struct _ImportPagePrivate {
 	ImportPageImportPageSearchViewFilter* search_filter;
 	ImportPageHideImportedViewFilter* hide_imported_filter;
 	CameraViewTracker* tracker;
+	gint claim_timeout;
 };
 
 typedef enum  {
@@ -1344,6 +1345,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -1392,11 +1394,13 @@ struct _BatchImportJobClass {
 	gchar* (*get_basename) (BatchImportJob* self);
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+	GFile* (*get_associated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
 	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
 	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
+	gboolean (*recurse) (BatchImportJob* self);
 };
 
 struct _ImportPageCameraImportJob {
@@ -1903,14 +1907,13 @@ Camera* import_page_get_camera (ImportPage* self);
 gchar* import_page_get_uri (ImportPage* self);
 gboolean import_page_is_busy (ImportPage* self);
 static void import_page_real_init_actions (Page* base, gint selected_count, gint count);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
+void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_init_actions (Page* self, gint selected_count, gint count);
 gboolean import_page_is_refreshed (ImportPage* self);
 gchar* import_page_get_refresh_message (ImportPage* self);
 static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed);
 gint view_collection_get_unfiltered_count (ViewCollection* self);
 gint view_collection_get_selected_count (ViewCollection* self);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 gint data_collection_get_count (DataCollection* self);
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display);
 void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
@@ -1934,6 +1937,8 @@ Marker* data_collection_start_marking (DataCollection* self);
 void marker_mark_all (Marker* self);
 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 ____lambda18_ (ImportPage* self);
+static gboolean _____lambda18__gsource_func (gpointer self);
 static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const gchar* dir, GeeArrayList* import_list);
 static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list);
 static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list);
@@ -1949,9 +1954,8 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena
 void spin_event_loop (void);
 void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GError** error);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, guint8** raw, int* raw_length1, gsize* raw_length, GError** error);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, gchar* * preview_md5, GError** error);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
 void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
 void view_collection_remove_view_filter (ViewCollection* self, ViewFilter* f);
@@ -2065,10 +2069,7 @@ gchar* batch_import_job_get_basename (BatchImportJob* self);
 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);
-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);
+static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base);
 static void import_page_camera_import_job_finalize (BatchImportJob * obj);
 enum  {
 	IMPORT_PAGE_IMPORT_PAGE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
@@ -2104,14 +2105,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 2107 "ImportPage.c"
+#line 2108 "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 2114 "ImportPage.c"
+#line 2115 "ImportPage.c"
 }
 
 
@@ -2129,7 +2130,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 2132 "ImportPage.c"
+#line 2133 "ImportPage.c"
 }
 
 
@@ -2138,7 +2139,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 = (gboolean (*) (SourceCollection *, DataSource*)) import_source_collection_real_holds_type_of_source;
-#line 2141 "ImportPage.c"
+#line 2142 "ImportPage.c"
 }
 
 
@@ -2161,7 +2162,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 2164 "ImportPage.c"
+#line 2165 "ImportPage.c"
 }
 
 
@@ -2244,14 +2245,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 2247 "ImportPage.c"
+#line 2248 "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 2254 "ImportPage.c"
+#line 2255 "ImportPage.c"
 }
 
 
@@ -2270,7 +2271,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 2273 "ImportPage.c"
+#line 2274 "ImportPage.c"
 }
 
 
@@ -2288,7 +2289,7 @@ gchar* import_source_get_camera_name (ImportSource* self) {
 	result = _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2291 "ImportPage.c"
+#line 2292 "ImportPage.c"
 }
 
 
@@ -2306,7 +2307,7 @@ Camera* import_source_get_camera (ImportSource* self) {
 	result = _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2309 "ImportPage.c"
+#line 2310 "ImportPage.c"
 }
 
 
@@ -2321,7 +2322,7 @@ gint import_source_get_fsid (ImportSource* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2324 "ImportPage.c"
+#line 2325 "ImportPage.c"
 }
 
 
@@ -2339,7 +2340,7 @@ gchar* import_source_get_folder (ImportSource* self) {
 	result = _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2342 "ImportPage.c"
+#line 2343 "ImportPage.c"
 }
 
 
@@ -2357,7 +2358,7 @@ gchar* import_source_get_filename (ImportSource* self) {
 	result = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2360 "ImportPage.c"
+#line 2361 "ImportPage.c"
 }
 
 
@@ -2372,7 +2373,7 @@ gulong import_source_get_filesize (ImportSource* self) {
 	result = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2375 "ImportPage.c"
+#line 2376 "ImportPage.c"
 }
 
 
@@ -2387,7 +2388,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 2390 "ImportPage.c"
+#line 2391 "ImportPage.c"
 }
 
 
@@ -2403,7 +2404,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 2406 "ImportPage.c"
+#line 2407 "ImportPage.c"
 }
 
 
@@ -2412,7 +2413,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 2415 "ImportPage.c"
+#line 2416 "ImportPage.c"
 }
 
 
@@ -2425,7 +2426,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 2428 "ImportPage.c"
+#line 2429 "ImportPage.c"
 }
 
 
@@ -2434,7 +2435,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 2437 "ImportPage.c"
+#line 2438 "ImportPage.c"
 }
 
 
@@ -2479,7 +2480,7 @@ gchar* import_source_get_fulldir (ImportSource* self) {
 	result = _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2482 "ImportPage.c"
+#line 2483 "ImportPage.c"
 }
 
 
@@ -2522,7 +2523,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 2525 "ImportPage.c"
+#line 2526 "ImportPage.c"
 }
 
 
@@ -2538,7 +2539,7 @@ static gchar* gp_result_to_full_string (int self) {
 	result = _tmp1_;
 #line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	return result;
-#line 2541 "ImportPage.c"
+#line 2542 "ImportPage.c"
 }
 
 
@@ -2586,7 +2587,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 2589 "ImportPage.c"
+#line 2590 "ImportPage.c"
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		const gchar* _tmp7_;
@@ -2608,7 +2609,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_tmp8_ = _tmp9_;
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2611 "ImportPage.c"
+#line 2612 "ImportPage.c"
 			gboolean _tmp10_ = FALSE;
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
@@ -2616,7 +2617,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 _tmp10_;
-#line 2619 "ImportPage.c"
+#line 2620 "ImportPage.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp8_;
@@ -2624,7 +2625,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 2627 "ImportPage.c"
+#line 2628 "ImportPage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = import_source_get_camera (self);
@@ -2654,7 +2655,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	_tmp20_ = _result_;
 #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp20_ != GP_OK) {
-#line 2657 "ImportPage.c"
+#line 2658 "ImportPage.c"
 		gchar* _tmp21_;
 		gchar* _tmp22_;
 		const gchar* _tmp23_;
@@ -2679,7 +2680,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_g_free0 (_tmp26_);
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp22_);
-#line 2682 "ImportPage.c"
+#line 2683 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp29_ = 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_);
@@ -2687,7 +2688,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	_tmp28_ = _tmp29_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2690 "ImportPage.c"
+#line 2691 "ImportPage.c"
 		gboolean _tmp30_ = FALSE;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
@@ -2695,21 +2696,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 _tmp30_;
-#line 2698 "ImportPage.c"
+#line 2699 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp28_) {
-#line 2702 "ImportPage.c"
+#line 2703 "ImportPage.c"
 		int _tmp31_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = _result_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = _tmp31_ == GP_OK;
-#line 2708 "ImportPage.c"
+#line 2709 "ImportPage.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = FALSE;
-#line 2712 "ImportPage.c"
+#line 2713 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp27_;
@@ -2717,7 +2718,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 2720 "ImportPage.c"
+#line 2721 "ImportPage.c"
 }
 
 
@@ -2733,7 +2734,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 2736 "ImportPage.c"
+#line 2737 "ImportPage.c"
 }
 
 
@@ -2752,7 +2753,7 @@ static void import_source_class_init (ImportSourceClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) 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 2755 "ImportPage.c"
+#line 2756 "ImportPage.c"
 }
 
 
@@ -2761,7 +2762,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 2764 "ImportPage.c"
+#line 2765 "ImportPage.c"
 }
 
 
@@ -2772,7 +2773,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 2775 "ImportPage.c"
+#line 2776 "ImportPage.c"
 }
 
 
@@ -2794,7 +2795,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 2797 "ImportPage.c"
+#line 2798 "ImportPage.c"
 }
 
 
@@ -2847,14 +2848,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 2850 "ImportPage.c"
+#line 2851 "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 2857 "ImportPage.c"
+#line 2858 "ImportPage.c"
 }
 
 
@@ -2880,7 +2881,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 2883 "ImportPage.c"
+#line 2884 "ImportPage.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp0_;
@@ -2892,7 +2893,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 2895 "ImportPage.c"
+#line 2896 "ImportPage.c"
 }
 
 
@@ -2920,13 +2921,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 2923 "ImportPage.c"
+#line 2924 "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 2929 "ImportPage.c"
+#line 2930 "ImportPage.c"
 		GdkPixbuf* _tmp5_;
 		GdkPixbuf* _tmp6_;
 		gint _tmp7_;
@@ -2945,7 +2946,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 2948 "ImportPage.c"
+#line 2949 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_;
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2954,13 +2955,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 2957 "ImportPage.c"
+#line 2958 "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 2963 "ImportPage.c"
+#line 2964 "ImportPage.c"
 }
 
 
@@ -2976,7 +2977,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 2979 "ImportPage.c"
+#line 2980 "ImportPage.c"
 }
 
 
@@ -2992,7 +2993,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 2995 "ImportPage.c"
+#line 2996 "ImportPage.c"
 }
 
 
@@ -3008,7 +3009,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 3011 "ImportPage.c"
+#line 3012 "ImportPage.c"
 }
 
 
@@ -3024,7 +3025,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 3027 "ImportPage.c"
+#line 3028 "ImportPage.c"
 }
 
 
@@ -3039,7 +3040,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 3042 "ImportPage.c"
+#line 3043 "ImportPage.c"
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3050,7 +3051,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 3053 "ImportPage.c"
+#line 3054 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp4_;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3059,13 +3060,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 3062 "ImportPage.c"
+#line 3063 "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 3068 "ImportPage.c"
+#line 3069 "ImportPage.c"
 }
 
 
@@ -3084,7 +3085,7 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
 	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = (PhotoFileFormat (*) (ThumbnailSource *)) video_import_source_real_get_preferred_thumbnail_format;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) video_import_source_real_get_name;
-#line 3087 "ImportPage.c"
+#line 3088 "ImportPage.c"
 }
 
 
@@ -3144,14 +3145,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 3147 "ImportPage.c"
+#line 3148 "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 3154 "ImportPage.c"
+#line 3155 "ImportPage.c"
 }
 
 
@@ -3175,7 +3176,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 3178 "ImportPage.c"
+#line 3179 "ImportPage.c"
 		const gchar* _tmp4_;
 		gchar* _tmp5_;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3186,7 +3187,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 3189 "ImportPage.c"
+#line 3190 "ImportPage.c"
 	} else {
 		gchar* _tmp6_;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3195,7 +3196,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 3198 "ImportPage.c"
+#line 3199 "ImportPage.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
@@ -3203,7 +3204,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 3206 "ImportPage.c"
+#line 3207 "ImportPage.c"
 }
 
 
@@ -3219,7 +3220,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 3222 "ImportPage.c"
+#line 3223 "ImportPage.c"
 }
 
 
@@ -3235,7 +3236,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 3238 "ImportPage.c"
+#line 3239 "ImportPage.c"
 }
 
 
@@ -3253,26 +3254,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 3256 "ImportPage.c"
+#line 3257 "ImportPage.c"
 		PhotoFileFormat _tmp3_;
 #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 3262 "ImportPage.c"
+#line 3263 "ImportPage.c"
 	} else {
 		PhotoFileFormat _tmp4_;
 #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 3269 "ImportPage.c"
+#line 3270 "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 3275 "ImportPage.c"
+#line 3276 "ImportPage.c"
 }
 
 
@@ -3300,13 +3301,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 3303 "ImportPage.c"
+#line 3304 "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 3309 "ImportPage.c"
+#line 3310 "ImportPage.c"
 		GdkPixbuf* _tmp5_;
 		GdkPixbuf* _tmp6_;
 		gint _tmp7_;
@@ -3325,7 +3326,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 3328 "ImportPage.c"
+#line 3329 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3334,20 +3335,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 3337 "ImportPage.c"
+#line 3338 "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 3343 "ImportPage.c"
+#line 3344 "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 3350 "ImportPage.c"
+#line 3351 "ImportPage.c"
 }
 
 
@@ -3393,7 +3394,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 3396 "ImportPage.c"
+#line 3397 "ImportPage.c"
 }
 
 
@@ -3412,7 +3413,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 3415 "ImportPage.c"
+#line 3416 "ImportPage.c"
 		time_t _tmp1_;
 #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));
@@ -3420,7 +3421,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 3423 "ImportPage.c"
+#line 3424 "ImportPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->metadata;
@@ -3432,7 +3433,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 3435 "ImportPage.c"
+#line 3436 "ImportPage.c"
 		MetadataDateTime* _tmp6_;
 		time_t _tmp7_;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3441,14 +3442,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 3444 "ImportPage.c"
+#line 3445 "ImportPage.c"
 	} else {
 		time_t _tmp8_;
 #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 3451 "ImportPage.c"
+#line 3452 "ImportPage.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp4_;
@@ -3456,7 +3457,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 3459 "ImportPage.c"
+#line 3460 "ImportPage.c"
 }
 
 
@@ -3470,7 +3471,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 3473 "ImportPage.c"
+#line 3474 "ImportPage.c"
 		PhotoMetadata* _tmp2_;
 		gchar* _tmp3_;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3481,19 +3482,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 3484 "ImportPage.c"
+#line 3485 "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 3490 "ImportPage.c"
+#line 3491 "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 3496 "ImportPage.c"
+#line 3497 "ImportPage.c"
 }
 
 
@@ -3508,7 +3509,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 3511 "ImportPage.c"
+#line 3512 "ImportPage.c"
 		PhotoImportSource* _tmp1_;
 		PhotoMetadata* _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3519,7 +3520,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 		result = _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3522 "ImportPage.c"
+#line 3523 "ImportPage.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->metadata;
@@ -3529,7 +3530,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	result = _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3532 "ImportPage.c"
+#line 3533 "ImportPage.c"
 }
 
 
@@ -3546,7 +3547,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 3549 "ImportPage.c"
+#line 3550 "ImportPage.c"
 		PhotoImportSource* _tmp1_;
 		GdkPixbuf* _tmp2_;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3557,7 +3558,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 3560 "ImportPage.c"
+#line 3561 "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));
@@ -3569,7 +3570,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 3572 "ImportPage.c"
+#line 3573 "ImportPage.c"
 		GdkPixbuf* _tmp6_;
 #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));
@@ -3577,13 +3578,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 3580 "ImportPage.c"
+#line 3581 "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 3586 "ImportPage.c"
+#line 3587 "ImportPage.c"
 }
 
 
@@ -3611,13 +3612,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 3614 "ImportPage.c"
+#line 3615 "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 3620 "ImportPage.c"
+#line 3621 "ImportPage.c"
 		GdkPixbuf* _tmp5_;
 		GdkPixbuf* _tmp6_;
 		gint _tmp7_;
@@ -3636,7 +3637,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 3639 "ImportPage.c"
+#line 3640 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3645,13 +3646,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 3648 "ImportPage.c"
+#line 3649 "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 3654 "ImportPage.c"
+#line 3655 "ImportPage.c"
 }
 
 
@@ -3666,7 +3667,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 3669 "ImportPage.c"
+#line 3670 "ImportPage.c"
 }
 
 
@@ -3684,7 +3685,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 3687 "ImportPage.c"
+#line 3688 "ImportPage.c"
 }
 
 
@@ -3703,7 +3704,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 3706 "ImportPage.c"
+#line 3707 "ImportPage.c"
 }
 
 
@@ -3721,7 +3722,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
 	result = _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3724 "ImportPage.c"
+#line 3725 "ImportPage.c"
 }
 
 
@@ -3740,19 +3741,19 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 	ret = _tmp0_;
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3743 "ImportPage.c"
+#line 3744 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return _tmp1_;
-#line 3749 "ImportPage.c"
+#line 3750 "ImportPage.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->associated;
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ != NULL) {
-#line 3755 "ImportPage.c"
+#line 3756 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
 		PhotoImportSource* _tmp4_;
 		gboolean _tmp5_;
@@ -3765,25 +3766,25 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 		_tmp3_ = _tmp5_;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3768 "ImportPage.c"
+#line 3769 "ImportPage.c"
 			gboolean _tmp6_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return _tmp6_;
-#line 3774 "ImportPage.c"
+#line 3775 "ImportPage.c"
 		}
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = ret;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ret = _tmp7_ & _tmp3_;
-#line 3780 "ImportPage.c"
+#line 3781 "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 3786 "ImportPage.c"
+#line 3787 "ImportPage.c"
 }
 
 
@@ -3812,7 +3813,7 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = (gboolean (*) (DataSource *, GError**)) 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 3815 "ImportPage.c"
+#line 3816 "ImportPage.c"
 }
 
 
@@ -3827,7 +3828,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 3830 "ImportPage.c"
+#line 3831 "ImportPage.c"
 }
 
 
@@ -3845,7 +3846,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 3848 "ImportPage.c"
+#line 3849 "ImportPage.c"
 }
 
 
@@ -3905,11 +3906,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 3908 "ImportPage.c"
+#line 3909 "ImportPage.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	pixbuf = NULL;
-#line 3912 "ImportPage.c"
+#line 3913 "ImportPage.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		ImportSource* _tmp7_;
@@ -3923,8 +3924,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 3926 "ImportPage.c"
-			goto __catch65_g_error;
+#line 3927 "ImportPage.c"
+			goto __catch72_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3936,10 +3937,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 3939 "ImportPage.c"
+#line 3940 "ImportPage.c"
 	}
-	goto __finally65;
-	__catch65_g_error:
+	goto __finally72;
+	__catch72_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_;
@@ -3964,9 +3965,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 3967 "ImportPage.c"
+#line 3968 "ImportPage.c"
 	}
-	__finally65:
+	__finally72:
 #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"
@@ -3977,7 +3978,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 3980 "ImportPage.c"
+#line 3981 "ImportPage.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = pixbuf;
@@ -3987,7 +3988,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 3990 "ImportPage.c"
+#line 3991 "ImportPage.c"
 		GdkPixbuf* _tmp16_;
 		GdkPixbuf* _tmp20_;
 		GdkPixbuf* _tmp21_;
@@ -3995,7 +3996,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 3998 "ImportPage.c"
+#line 3999 "ImportPage.c"
 			GdkPixbuf* _tmp17_;
 			GdkPixbuf* _tmp18_;
 			GdkPixbuf* _tmp19_;
@@ -4013,7 +4014,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 4016 "ImportPage.c"
+#line 4017 "ImportPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = import_preview_placeholder_preview;
@@ -4023,7 +4024,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 4026 "ImportPage.c"
+#line 4027 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = pixbuf;
@@ -4033,7 +4034,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 4036 "ImportPage.c"
+#line 4037 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp25_;
 		gint _tmp26_;
@@ -4043,11 +4044,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 4046 "ImportPage.c"
+#line 4047 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp22_) {
-#line 4050 "ImportPage.c"
+#line 4051 "ImportPage.c"
 		GdkPixbuf* _tmp27_;
 		GdkPixbuf* _tmp28_;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4058,13 +4059,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 4061 "ImportPage.c"
+#line 4062 "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 4067 "ImportPage.c"
+#line 4068 "ImportPage.c"
 		PhotoImportSource* photo_import_source = NULL;
 		ImportSource* _tmp30_;
 		PhotoImportSource* _tmp31_;
@@ -4084,7 +4085,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 4087 "ImportPage.c"
+#line 4088 "ImportPage.c"
 			PhotoImportSource* _tmp34_;
 			PhotoMetadata* _tmp35_;
 			PhotoMetadata* _tmp36_;
@@ -4098,15 +4099,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 4101 "ImportPage.c"
+#line 4102 "ImportPage.c"
 		} else {
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = FALSE;
-#line 4105 "ImportPage.c"
+#line 4106 "ImportPage.c"
 		}
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp32_) {
-#line 4109 "ImportPage.c"
+#line 4110 "ImportPage.c"
 			PhotoImportSource* _tmp37_;
 			PhotoMetadata* _tmp38_;
 			PhotoMetadata* _tmp39_;
@@ -4131,7 +4132,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 4134 "ImportPage.c"
+#line 4135 "ImportPage.c"
 		}
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = photo_import_source;
@@ -4145,7 +4146,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 4148 "ImportPage.c"
+#line 4149 "ImportPage.c"
 			gchar* _tmp47_;
 			gchar* _tmp48_;
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4156,11 +4157,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp48_, TRUE, PANGO_ALIGN_LEFT);
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp48_);
-#line 4159 "ImportPage.c"
+#line 4160 "ImportPage.c"
 		}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 4163 "ImportPage.c"
+#line 4164 "ImportPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp49_ = pixbuf;
@@ -4170,14 +4171,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 4173 "ImportPage.c"
+#line 4174 "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 4180 "ImportPage.c"
+#line 4181 "ImportPage.c"
 }
 
 
@@ -4201,7 +4202,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 4204 "ImportPage.c"
+#line 4205 "ImportPage.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo_import_source = _tmp1_;
@@ -4209,7 +4210,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 4212 "ImportPage.c"
+#line 4213 "ImportPage.c"
 		gchar* preview_md5 = NULL;
 		PhotoImportSource* _tmp3_;
 		gchar* _tmp4_;
@@ -4238,7 +4239,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 4241 "ImportPage.c"
+#line 4242 "ImportPage.c"
 			const gchar* _tmp10_;
 			PhotoFileFormat _tmp11_;
 			gboolean _tmp12_;
@@ -4250,15 +4251,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 4253 "ImportPage.c"
+#line 4254 "ImportPage.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = FALSE;
-#line 4257 "ImportPage.c"
+#line 4258 "ImportPage.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_) {
-#line 4261 "ImportPage.c"
+#line 4262 "ImportPage.c"
 			const gchar* _tmp13_;
 			PhotoFileFormat _tmp14_;
 			PhotoID _tmp15_ = {0};
@@ -4283,13 +4284,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 4286 "ImportPage.c"
+#line 4287 "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 4292 "ImportPage.c"
+#line 4293 "ImportPage.c"
 			guint64 filesize = 0ULL;
 			ImportSource* _tmp18_;
 			ImportSource* _tmp19_;
@@ -4312,7 +4313,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_tmp22_ = filesize;
 #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp22_ <= ((guint64) G_MAXINT64)) {
-#line 4315 "ImportPage.c"
+#line 4316 "ImportPage.c"
 				PhotoID duplicated_photo_id = {0};
 				LibraryPhotoSourceCollection* _tmp23_;
 				ImportSource* _tmp24_;
@@ -4349,7 +4350,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 				_tmp31_ = photo_id_is_valid (&duplicated_photo_id);
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_) {
-#line 4352 "ImportPage.c"
+#line 4353 "ImportPage.c"
 					LibraryPhoto* duplicated_photo = NULL;
 					LibraryPhotoSourceCollection* _tmp32_;
 					PhotoID _tmp33_;
@@ -4388,7 +4389,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 					_tmp40_ = duplicated_photo_exposure_time;
 #line 350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_ == _tmp40_) {
-#line 4391 "ImportPage.c"
+#line 4392 "ImportPage.c"
 						LibraryPhotoSourceCollection* _tmp41_;
 						ImportSource* _tmp42_;
 						ImportSource* _tmp43_;
@@ -4431,11 +4432,11 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 						_g_object_unref0 (photo_import_source);
 #line 355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 4434 "ImportPage.c"
+#line 4435 "ImportPage.c"
 					}
 #line 344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (duplicated_photo);
-#line 4438 "ImportPage.c"
+#line 4439 "ImportPage.c"
 				}
 			}
 		}
@@ -4447,7 +4448,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4450 "ImportPage.c"
+#line 4451 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp49_ = import_preview_get_import_source (self);
@@ -4457,7 +4458,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	if (_tmp50_ == NULL) {
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp49_);
-#line 4460 "ImportPage.c"
+#line 4461 "ImportPage.c"
 	}
 #line 364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	video_import_source = _tmp50_;
@@ -4465,7 +4466,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_tmp51_ = video_import_source;
 #line 365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp51_ != NULL) {
-#line 4468 "ImportPage.c"
+#line 4469 "ImportPage.c"
 		VideoSourceCollection* _tmp52_;
 		VideoImportSource* _tmp53_;
 		gchar* _tmp54_;
@@ -4494,7 +4495,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_free0 (_tmp55_);
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp59_) {
-#line 4497 "ImportPage.c"
+#line 4498 "ImportPage.c"
 			VideoSourceCollection* _tmp60_;
 			VideoImportSource* _tmp61_;
 			gchar* _tmp62_;
@@ -4533,7 +4534,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_g_object_unref0 (photo_import_source);
 #line 378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4536 "ImportPage.c"
+#line 4537 "ImportPage.c"
 		}
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
@@ -4543,7 +4544,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4546 "ImportPage.c"
+#line 4547 "ImportPage.c"
 	}
 #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
@@ -4553,7 +4554,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_g_object_unref0 (photo_import_source);
 #line 384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4556 "ImportPage.c"
+#line 4557 "ImportPage.c"
 }
 
 
@@ -4572,7 +4573,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 		result = NULL;
 #line 389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4575 "ImportPage.c"
+#line 4576 "ImportPage.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->duplicated_file;
@@ -4582,7 +4583,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	result = _tmp2_;
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4585 "ImportPage.c"
+#line 4586 "ImportPage.c"
 }
 
 
@@ -4597,7 +4598,7 @@ ImportSource* import_preview_get_import_source (ImportPreview* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
 #line 395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4600 "ImportPage.c"
+#line 4601 "ImportPage.c"
 }
 
 
@@ -4608,14 +4609,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 4611 "ImportPage.c"
+#line 4612 "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 4618 "ImportPage.c"
+#line 4619 "ImportPage.c"
 }
 
 
@@ -4627,7 +4628,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 4630 "ImportPage.c"
+#line 4631 "ImportPage.c"
 }
 
 
@@ -4665,14 +4666,14 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect
 	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4668 "ImportPage.c"
+#line 4669 "ImportPage.c"
 }
 
 
 CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection);
-#line 4675 "ImportPage.c"
+#line 4676 "ImportPage.c"
 }
 
 
@@ -4681,7 +4682,7 @@ static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
 	camera_view_tracker_parent_class = g_type_class_peek_parent (klass);
 #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize;
-#line 4684 "ImportPage.c"
+#line 4685 "ImportPage.c"
 }
 
 
@@ -4701,7 +4702,7 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) {
 	_tmp2_ = camera_accumulator_new ();
 #line 402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->selected = _tmp2_;
-#line 4704 "ImportPage.c"
+#line 4705 "ImportPage.c"
 }
 
 
@@ -4717,7 +4718,7 @@ static void camera_view_tracker_finalize (CoreTracker * obj) {
 	_g_object_unref0 (self->selected);
 #line 399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj);
-#line 4720 "ImportPage.c"
+#line 4721 "ImportPage.c"
 }
 
 
@@ -4769,7 +4770,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_tmp6_ = photo;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4772 "ImportPage.c"
+#line 4773 "ImportPage.c"
 		PhotoImportSource* _tmp7_;
 		PhotoFileFormat _tmp8_;
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4778,21 +4779,21 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4781 "ImportPage.c"
+#line 4782 "ImportPage.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4785 "ImportPage.c"
+#line 4786 "ImportPage.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4789 "ImportPage.c"
+#line 4790 "ImportPage.c"
 		gint _tmp9_;
 #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
 #line 424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4795 "ImportPage.c"
+#line 4796 "ImportPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		PhotoImportSource* _tmp11_;
@@ -4800,7 +4801,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_tmp11_ = photo;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_ != NULL) {
-#line 4803 "ImportPage.c"
+#line 4804 "ImportPage.c"
 			PhotoImportSource* _tmp12_;
 			PhotoFileFormat _tmp13_;
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4809,34 +4810,34 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 			_tmp13_ = photo_import_source_get_file_format (_tmp12_);
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4812 "ImportPage.c"
+#line 4813 "ImportPage.c"
 		} else {
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = FALSE;
-#line 4816 "ImportPage.c"
+#line 4817 "ImportPage.c"
 		}
 #line 425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp10_) {
-#line 4820 "ImportPage.c"
+#line 4821 "ImportPage.c"
 			gint _tmp14_;
 #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = self->priv->_raw;
 #line 426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4826 "ImportPage.c"
+#line 4827 "ImportPage.c"
 		} else {
 			ImportSource* _tmp15_;
 #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = source;
 #line 427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4833 "ImportPage.c"
+#line 4834 "ImportPage.c"
 				gint _tmp16_;
 #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = self->priv->_videos;
 #line 428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4839 "ImportPage.c"
+#line 4840 "ImportPage.c"
 			}
 		}
 	}
@@ -4848,7 +4849,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_g_object_unref0 (source);
 #line 431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4851 "ImportPage.c"
+#line 4852 "ImportPage.c"
 }
 
 
@@ -4888,7 +4889,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_tmp6_ = photo;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4891 "ImportPage.c"
+#line 4892 "ImportPage.c"
 		PhotoImportSource* _tmp7_;
 		PhotoFileFormat _tmp8_;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4897,15 +4898,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4900 "ImportPage.c"
+#line 4901 "ImportPage.c"
 	} else {
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4904 "ImportPage.c"
+#line 4905 "ImportPage.c"
 	}
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4908 "ImportPage.c"
+#line 4909 "ImportPage.c"
 		gint _tmp9_;
 		gint _tmp10_;
 #line 441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4916,7 +4917,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp10_ = self->priv->_photos;
 #line 442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4919 "ImportPage.c"
+#line 4920 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		PhotoImportSource* _tmp12_;
@@ -4924,7 +4925,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp12_ = photo;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ != NULL) {
-#line 4927 "ImportPage.c"
+#line 4928 "ImportPage.c"
 			PhotoImportSource* _tmp13_;
 			PhotoFileFormat _tmp14_;
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4933,15 +4934,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_tmp14_ = photo_import_source_get_file_format (_tmp13_);
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4936 "ImportPage.c"
+#line 4937 "ImportPage.c"
 		} else {
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 4940 "ImportPage.c"
+#line 4941 "ImportPage.c"
 		}
 #line 443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 4944 "ImportPage.c"
+#line 4945 "ImportPage.c"
 			gint _tmp15_;
 			gint _tmp16_;
 #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4952,14 +4953,14 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_tmp16_ = self->priv->_raw;
 #line 445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4955 "ImportPage.c"
+#line 4956 "ImportPage.c"
 		} else {
 			ImportSource* _tmp17_;
 #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = source;
 #line 446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4962 "ImportPage.c"
+#line 4963 "ImportPage.c"
 				gint _tmp18_;
 				gint _tmp19_;
 #line 447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4970,7 +4971,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 				_tmp19_ = self->priv->_videos;
 #line 448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4973 "ImportPage.c"
+#line 4974 "ImportPage.c"
 			}
 		}
 	}
@@ -4982,7 +4983,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_g_object_unref0 (source);
 #line 452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4985 "ImportPage.c"
+#line 4986 "ImportPage.c"
 }
 
 
@@ -4999,7 +5000,7 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
 	result = FALSE;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5002 "ImportPage.c"
+#line 5003 "ImportPage.c"
 }
 
 
@@ -5026,7 +5027,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	result = _tmp4_;
 #line 461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5029 "ImportPage.c"
+#line 5030 "ImportPage.c"
 }
 
 
@@ -5036,14 +5037,14 @@ CameraAccumulator* camera_accumulator_construct (GType object_type) {
 	self = (CameraAccumulator*) g_object_new (object_type, NULL);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5039 "ImportPage.c"
+#line 5040 "ImportPage.c"
 }
 
 
 CameraAccumulator* camera_accumulator_new (void) {
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 5046 "ImportPage.c"
+#line 5047 "ImportPage.c"
 }
 
 
@@ -5058,7 +5059,7 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5061 "ImportPage.c"
+#line 5062 "ImportPage.c"
 }
 
 
@@ -5067,7 +5068,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (camera_accumulator_get_total (self) != value) {
-#line 5070 "ImportPage.c"
+#line 5071 "ImportPage.c"
 		gint _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = value;
@@ -5075,7 +5076,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
 		self->priv->_total = _tmp0_;
 #line 412 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_notify ((GObject *) self, "total");
-#line 5078 "ImportPage.c"
+#line 5079 "ImportPage.c"
 	}
 }
 
@@ -5091,7 +5092,7 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5094 "ImportPage.c"
+#line 5095 "ImportPage.c"
 }
 
 
@@ -5100,7 +5101,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (camera_accumulator_get_photos (self) != value) {
-#line 5103 "ImportPage.c"
+#line 5104 "ImportPage.c"
 		gint _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = value;
@@ -5108,7 +5109,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
 		self->priv->_photos = _tmp0_;
 #line 413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_notify ((GObject *) self, "photos");
-#line 5111 "ImportPage.c"
+#line 5112 "ImportPage.c"
 	}
 }
 
@@ -5124,7 +5125,7 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5127 "ImportPage.c"
+#line 5128 "ImportPage.c"
 }
 
 
@@ -5133,7 +5134,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (camera_accumulator_get_videos (self) != value) {
-#line 5136 "ImportPage.c"
+#line 5137 "ImportPage.c"
 		gint _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = value;
@@ -5141,7 +5142,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
 		self->priv->_videos = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_notify ((GObject *) self, "videos");
-#line 5144 "ImportPage.c"
+#line 5145 "ImportPage.c"
 	}
 }
 
@@ -5157,7 +5158,7 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5160 "ImportPage.c"
+#line 5161 "ImportPage.c"
 }
 
 
@@ -5166,7 +5167,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
 	g_return_if_fail (IS_CAMERA_ACCUMULATOR (self));
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (camera_accumulator_get_raw (self) != value) {
-#line 5169 "ImportPage.c"
+#line 5170 "ImportPage.c"
 		gint _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = value;
@@ -5174,7 +5175,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
 		self->priv->_raw = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_notify ((GObject *) self, "raw");
-#line 5177 "ImportPage.c"
+#line 5178 "ImportPage.c"
 	}
 }
 
@@ -5198,7 +5199,7 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS_PROPERTY, 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 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW_PROPERTY, 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 5201 "ImportPage.c"
+#line 5202 "ImportPage.c"
 }
 
 
@@ -5211,7 +5212,7 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
 	iface->uninclude = (gboolean (*) (CoreTrackerAccumulator *, DataObject*)) camera_accumulator_real_uninclude;
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->altered = (gboolean (*) (CoreTrackerAccumulator *, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5214 "ImportPage.c"
+#line 5215 "ImportPage.c"
 }
 
 
@@ -5226,7 +5227,7 @@ static void camera_accumulator_instance_init (CameraAccumulator * self) {
 	self->priv->_videos = 0;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_raw = 0;
-#line 5229 "ImportPage.c"
+#line 5230 "ImportPage.c"
 }
 
 
@@ -5236,7 +5237,7 @@ static void camera_accumulator_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj);
-#line 5239 "ImportPage.c"
+#line 5240 "ImportPage.c"
 }
 
 
@@ -5283,13 +5284,13 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
 		g_value_set_int (value, camera_accumulator_get_raw (self));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5286 "ImportPage.c"
+#line 5287 "ImportPage.c"
 		default:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5292 "ImportPage.c"
+#line 5293 "ImportPage.c"
 	}
 }
 
@@ -5323,21 +5324,21 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 		camera_accumulator_set_raw (self, g_value_get_int (value));
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5326 "ImportPage.c"
+#line 5327 "ImportPage.c"
 		default:
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5332 "ImportPage.c"
+#line 5333 "ImportPage.c"
 	}
 }
 
 
 static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_media_added_removed ((ImportPage*) self);
-#line 5340 "ImportPage.c"
+#line 5341 "ImportPage.c"
 }
 
 
@@ -5354,69 +5355,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 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_selected ((ImportPage*) self);
-#line 5359 "ImportPage.c"
+#line 5360 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_all ((ImportPage*) self);
-#line 5366 "ImportPage.c"
+#line 5367 "ImportPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 5373 "ImportPage.c"
+#line 5374 "ImportPage.c"
 }
 
 
 static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_display_titles ((ImportPage*) self, action, value);
-#line 5380 "ImportPage.c"
+#line 5381 "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 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5389 "ImportPage.c"
+#line 5390 "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 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5398 "ImportPage.c"
+#line 5399 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5405 "ImportPage.c"
+#line 5406 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5412 "ImportPage.c"
+#line 5413 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5419 "ImportPage.c"
+#line 5420 "ImportPage.c"
 }
 
 
@@ -5462,78 +5463,78 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	GValue _tmp49_ = {0};
 	LibraryPhotoSourceCollection* _tmp50_;
 	VideoSourceCollection* _tmp51_;
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPage*) checkerboard_page_construct (object_type, _ ("Camera"));
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera;
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->camera = _tmp1_;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = uri;
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->uri);
-#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->uri = _tmp3_;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = uri;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = g_strdup_printf ("ImportSources for %s", _tmp4_);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = _tmp5_;
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = import_source_collection_new (_tmp6_);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (self->priv->import_sources);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->import_sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection);
-#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (_tmp6_);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = icon;
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->icon);
-#line 722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->icon = _tmp9_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = _tmp10_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = camera_view_tracker_new (_tmp11_);
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->tracker = _tmp12_;
-#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = display_name;
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (NULL != _tmp13_) {
-#line 5525 "ImportPage.c"
+#line 5526 "ImportPage.c"
 		const gchar* _tmp14_;
 		gchar* _tmp15_;
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = display_name;
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = g_strdup (_tmp14_);
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (self->priv->camera_name);
-#line 728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->camera_name = _tmp15_;
-#line 5536 "ImportPage.c"
+#line 5537 "ImportPage.c"
 	} else {
 		CameraAbilities abilities = {0};
 		int res = 0;
@@ -5541,186 +5542,186 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		CameraAbilities _tmp17_ = {0};
 		int _tmp18_;
 		int _tmp19_;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = camera;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = gp_camera_get_abilities (_tmp16_, &_tmp17_);
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		abilities = _tmp17_;
-#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		res = _tmp18_;
-#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = res;
-#line 732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp19_ != GP_OK) {
-#line 5558 "ImportPage.c"
+#line 5559 "ImportPage.c"
 			int _tmp20_;
 			gchar* _tmp21_;
 			gchar* _tmp22_;
 			gchar* _tmp23_;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = res;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = gp_result_to_full_string (_tmp20_);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = _tmp21_;
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_debug ("ImportPage.vala:733: Unable to get camera abilities: %s", _tmp22_);
-#line 733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_debug ("ImportPage.vala:726: Unable to get camera abilities: %s", _tmp22_);
+#line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp22_);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = g_strdup (_ ("Camera"));
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (self->priv->camera_name);
-#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			self->priv->camera_name = _tmp23_;
-#line 5579 "ImportPage.c"
+#line 5580 "ImportPage.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 5583 "ImportPage.c"
+#line 5584 "ImportPage.c"
 	}
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp24_ = self->priv->camera_label;
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp25_ = self->priv->camera_name;
-#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_label_set_text (_tmp24_, _tmp25_);
-#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->camera_name;
-#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp26_);
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp27_ = g_volume_monitor_get ();
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->volume_monitor);
-#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->volume_monitor = _tmp27_;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp28_ = import_page_null_context;
-#line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp28_ == NULL) {
-#line 5605 "ImportPage.c"
+#line 5606 "ImportPage.c"
 		GPContextWrapper* _tmp29_;
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = gp_context_wrapper_new ();
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_null_context);
-#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_null_context = _tmp29_;
-#line 5613 "ImportPage.c"
+#line 5614 "ImportPage.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp30_ = import_page_spin_idle_context;
-#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp30_ == NULL) {
-#line 5619 "ImportPage.c"
+#line 5620 "ImportPage.c"
 		GPSpinIdleWrapper* _tmp31_;
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = gp_spin_idle_wrapper_new ();
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_context_wrapper_unref0 (import_page_spin_idle_context);
-#line 749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_spin_idle_context = _tmp31_;
-#line 5627 "ImportPage.c"
+#line 5628 "ImportPage.c"
 	}
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp33_ = _tmp32_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp34_ = self->priv->import_sources;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp35_ = import_page_import_view_manager_new (self);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp36_ = _tmp35_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp37_ = view_collection_monitor_source_collection (_tmp33_, _tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp38_ = _tmp37_;
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_collection_monitor_unref0 (_tmp38_);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_manager_unref0 (_tmp36_);
-#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp33_);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp39_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp40_ = _tmp39_;
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_COLLECTION, DataCollection), _import_page_preview_comparator_comparator, NULL, _import_page_preview_comparator_predicate_comparator_predicate, NULL);
-#line 755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp40_);
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp41_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp42_ = _tmp41_;
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp42_, "items-state-changed", (GCallback) _import_page_on_view_changed_view_collection_items_state_changed, self, 0);
-#line 758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp42_);
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp44_ = _tmp43_;
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_view_changed_data_collection_contents_altered, self, 0);
-#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp44_);
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp45_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp46_ = _tmp45_;
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp46_, "items-visibility-changed", (GCallback) _import_page_on_view_changed_view_collection_items_visibility_changed, self, 0);
-#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp46_);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp48_ = _tmp47_;
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_value_init (&_tmp49_, G_TYPE_BOOLEAN);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_value_set_boolean (&_tmp49_, TRUE);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_SUBTITLES, &_tmp49_, NULL, NULL);
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_IS_VALUE (&_tmp49_) ? (g_value_unset (&_tmp49_), NULL) : NULL;
-#line 763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp50_ = library_photo_global;
-#line 766 "/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 (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp51_ = video_global;
-#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _import_page_on_media_added_removed_data_collection_contents_altered, self, 0);
-#line 769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 762 "/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 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 763 "/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 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5709 "ImportPage.c"
+#line 5710 "ImportPage.c"
 }
 
 
 ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
-#line 717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5716 "ImportPage.c"
+#line 5717 "ImportPage.c"
 }
 
 
 static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_hide_imported ((ImportPage*) self);
-#line 5723 "ImportPage.c"
+#line 5724 "ImportPage.c"
 }
 
 
@@ -5730,13 +5731,13 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	GtkToolbar* _tmp0_;
 	GtkToolbar* _tmp55_;
 	GtkToolbar* _tmp56_;
-#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 5739 "ImportPage.c"
+#line 5740 "ImportPage.c"
 		GtkToolbar* _tmp1_;
 		GtkToolbar* _tmp2_;
 		GtkCheckButton* _tmp3_;
@@ -5797,250 +5798,250 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 		GtkToolbar* _tmp52_;
 		GtkToolButton* _tmp53_;
 		GtkProgressBar* _tmp54_;
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/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 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp1_;
-#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Hide photos already imported"));
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp3_);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->hide_imported);
-#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->hide_imported = _tmp3_;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->hide_imported;
-#line 784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Only display photos that have not been imported"));
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = self->priv->hide_imported;
-#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _import_page_on_hide_imported_gtk_button_clicked, self, 0);
-#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = self->priv->hide_imported;
-#line 786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->hide_imported;
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = config_facade_get_instance ();
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = configuration_facade_get_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp10_);
-#line 787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = gtk_tool_item_new ();
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp11_);
-#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		hide_item = _tmp11_;
-#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = hide_item;
-#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_is_important (_tmp12_, TRUE);
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = hide_item;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = self->priv->hide_imported;
-#line 790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = hide_item;
-#line 792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp15_, _tmp16_, -1);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp17_);
-#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		separator = _tmp17_;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = separator;
-#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_separator_tool_item_set_draw (_tmp18_, FALSE);
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = separator;
-#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = self->priv->progress_bar;
-#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_orientable_set_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_ORIENTABLE, GtkOrientable), GTK_ORIENTATION_HORIZONTAL);
-#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = self->priv->progress_bar;
-#line 802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = gtk_tool_item_new ();
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp23_);
-#line 803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		progress_item = _tmp23_;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = progress_item;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_expand (_tmp24_, TRUE);
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = progress_item;
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = self->priv->progress_bar;
-#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = self->priv->progress_bar;
-#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_show_text (_tmp27_, TRUE);
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = progress_item;
-#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp28_, _tmp29_, -1);
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp30_);
-#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		find_button = _tmp30_;
-#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = find_button;
-#line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "edit-find");
-#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = find_button;
-#line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp34_ = find_button;
-#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp36_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp36_);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp37_ = _tmp36_;
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp38_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp38_);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_selected_button = _tmp38_;
-#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = import_selected_button;
-#line 822 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_icon_name (_tmp39_, "import");
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp40_ = import_selected_button;
-#line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_label (_tmp40_, _ ("Import _Selected"));
-#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp41_ = import_selected_button;
-#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = import_selected_button;
-#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_use_underline (_tmp42_, TRUE);
-#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = import_selected_button;
-#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = import_selected_button;
-#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp46_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_object_ref_sink (_tmp46_);
-#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_all_button = _tmp46_;
-#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp47_ = import_all_button;
-#line 832 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_icon_name (_tmp47_, "import-all");
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp48_ = import_all_button;
-#line 833 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_label (_tmp48_, _ ("Import _All"));
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp49_ = import_all_button;
-#line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp50_ = import_all_button;
-#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_tool_button_set_use_underline (_tmp50_, TRUE);
-#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp51_ = import_all_button;
-#line 836 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp53_ = import_all_button;
-#line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp54_ = self->priv->progress_bar;
-#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 844 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_toolbar_state (self);
-#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (import_all_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (import_selected_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (find_button);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (progress_item);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (separator);
-#line 779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (hide_item);
-#line 6026 "ImportPage.c"
+#line 6027 "ImportPage.c"
 	}
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp56_;
-#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6036 "ImportPage.c"
+#line 6037 "ImportPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 6043 "ImportPage.c"
+#line 6044 "ImportPage.c"
 }
 
 
@@ -6049,17 +6050,17 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
 	CoreViewTracker* result = NULL;
 	CameraViewTracker* _tmp0_;
 	CoreViewTracker* _tmp1_;
-#line 852 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 845 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6062 "ImportPage.c"
+#line 6063 "ImportPage.c"
 }
 
 
@@ -6067,15 +6068,15 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
 	ImportPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 856 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = g_strdup (_ ("The camera seems to be empty. No photos/videos found to import"));
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 857 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6078 "ImportPage.c"
+#line 6079 "ImportPage.c"
 }
 
 
@@ -6083,15 +6084,15 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
 	ImportPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 860 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = g_strdup (_ ("No new photos/videos found on camera"));
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 854 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6094 "ImportPage.c"
+#line 6095 "ImportPage.c"
 }
 
 
@@ -6106,33 +6107,33 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
 	ImportSource* _tmp6_;
 	time_t _tmp7_;
 	gint64 _tmp8_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = a;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/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 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_source_get_exposure_time (_tmp2_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = b;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/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 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = _tmp5_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = import_source_get_exposure_time (_tmp6_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = (gint64) (_tmp3_ - _tmp7_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp8_;
-#line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 858 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6135 "ImportPage.c"
+#line 6136 "ImportPage.c"
 }
 
 
@@ -6140,19 +6141,19 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
 	gboolean result = FALSE;
 	Alteration* _tmp0_;
 	gboolean _tmp1_;
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = alteration;
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "exposure-time");
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 863 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6155 "ImportPage.c"
+#line 6156 "ImportPage.c"
 }
 
 
@@ -6162,21 +6163,21 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
 	time_t _tmp1_;
 	void* _tmp2_;
 	time_t _tmp3_;
-#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0LL);
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = a;
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/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 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = b;
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/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 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = (gint64) (_tmp1_ - _tmp3_);
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6179 "ImportPage.c"
+#line 6180 "ImportPage.c"
 }
 
 
@@ -6184,26 +6185,26 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
 	ImportPage * self;
 	GeeList* _tmp0_;
 	GeeList* _tmp1_;
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = ui_filenames;
-#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 871 "/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 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = ui_filenames;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6199 "ImportPage.c"
+#line 6200 "ImportPage.c"
 }
 
 
 static GVariant* _variant_new15 (gboolean value) {
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6206 "ImportPage.c"
+#line 6207 "ImportPage.c"
 }
 
 
@@ -6217,83 +6218,83 @@ static void import_page_real_add_actions (Page* base, GActionMap* map) {
 	ConfigFacade* _tmp5_;
 	gboolean _tmp6_;
 	GVariant* _tmp7_;
-#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 890 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 883 "/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"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = map;
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/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"
+#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = map;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 886 "/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"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _tmp4_;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/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 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _variant_new15 (_tmp6_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 6252 "ImportPage.c"
+#line 6253 "ImportPage.c"
 }
 
 
 static void import_page_real_remove_actions (Page* base, GActionMap* map) {
 	ImportPage * self;
 	GActionMap* _tmp0_;
-#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 891 "/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"
+#line 891 "/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"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = map;
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/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 6267 "ImportPage.c"
+#line 6268 "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"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		entry_collection = IMPORT_PAGE_entries;
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/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"
+#line 893 "/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 6279 "ImportPage.c"
+#line 6280 "ImportPage.c"
 			GActionEntry entry = {0};
-#line 900 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			entry = entry_collection[entry_it];
-#line 6283 "ImportPage.c"
+#line 6284 "ImportPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
 				const gchar* _tmp3_;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp1_ = map;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp2_ = entry;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 6296 "ImportPage.c"
+#line 6297 "ImportPage.c"
 			}
 		}
 	}
@@ -6304,17 +6305,17 @@ Camera* import_page_get_camera (ImportPage* self) {
 	Camera* result = NULL;
 	Camera* _tmp0_;
 	Camera* _tmp1_;
-#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6317 "ImportPage.c"
+#line 6318 "ImportPage.c"
 }
 
 
@@ -6322,32 +6323,32 @@ gchar* import_page_get_uri (ImportPage* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->uri;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6335 "ImportPage.c"
+#line 6336 "ImportPage.c"
 }
 
 
 gboolean import_page_is_busy (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6350 "ImportPage.c"
+#line 6351 "ImportPage.c"
 }
 
 
@@ -6355,21 +6356,21 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
 	ImportPage * self;
 	gint _tmp0_;
 	gint _tmp1_;
-#line 917 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#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 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 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE);
+#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
+#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = selected_count;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = count;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 916 "/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 6372 "ImportPage.c"
+#line 6373 "ImportPage.c"
 }
 
 
@@ -6377,29 +6378,29 @@ gboolean import_page_is_refreshed (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 919 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6386 "ImportPage.c"
+#line 6387 "ImportPage.c"
 		gboolean _tmp2_;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp2_;
-#line 6392 "ImportPage.c"
+#line 6393 "ImportPage.c"
 	} else {
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6396 "ImportPage.c"
+#line 6397 "ImportPage.c"
 	}
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6402 "ImportPage.c"
+#line 6403 "ImportPage.c"
 }
 
 
@@ -6407,130 +6408,130 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 	gchar* result = NULL;
 	gchar* msg = NULL;
 	const gchar* _tmp0_;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 931 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	msg = NULL;
-#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refresh_error;
-#line 932 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6418 "ImportPage.c"
+#line 6419 "ImportPage.c"
 		const gchar* _tmp1_;
 		gchar* _tmp2_;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->refresh_error;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = g_strdup (_tmp1_);
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (msg);
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6429 "ImportPage.c"
+#line 6430 "ImportPage.c"
 	} else {
 		int _tmp3_;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refresh_result;
-#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ == GP_OK) {
-#line 6436 "ImportPage.c"
+#line 6437 "ImportPage.c"
 		} else {
 			int _tmp4_;
 			gchar* _tmp5_;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refresh_result;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = gp_result_to_full_string (_tmp4_);
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (msg);
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6448 "ImportPage.c"
+#line 6449 "ImportPage.c"
 		}
 	}
-#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = msg;
-#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6455 "ImportPage.c"
+#line 6456 "ImportPage.c"
 }
 
 
 static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = busy;
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->busy = _tmp0_;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = refreshed;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refreshed = _tmp1_;
-#line 947 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 6474 "ImportPage.c"
+#line 6475 "ImportPage.c"
 }
 
 
 static void import_page_update_toolbar_state (ImportPage* self) {
 	GtkCheckButton* _tmp0_;
-#line 950 "/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 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6486 "ImportPage.c"
+#line 6487 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_;
 		GtkCheckButton* _tmp8_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->busy;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6495 "ImportPage.c"
+#line 6496 "ImportPage.c"
 			gboolean _tmp4_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refreshed;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = _tmp4_;
-#line 6501 "ImportPage.c"
+#line 6502 "ImportPage.c"
 		} else {
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6505 "ImportPage.c"
+#line 6506 "ImportPage.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6509 "ImportPage.c"
+#line 6510 "ImportPage.c"
 			ViewCollection* _tmp5_;
 			ViewCollection* _tmp6_;
 			gint _tmp7_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _tmp5_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = view_collection_get_unfiltered_count (_tmp6_);
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = _tmp7_ > 0;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_data_collection_unref0 (_tmp6_);
-#line 6523 "ImportPage.c"
+#line 6524 "ImportPage.c"
 		} else {
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6527 "ImportPage.c"
+#line 6528 "ImportPage.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/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 6533 "ImportPage.c"
+#line 6534 "ImportPage.c"
 	}
 }
 
@@ -6544,129 +6545,129 @@ static void import_page_on_view_changed (ImportPage* self) {
 	gboolean _tmp9_;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_;
-#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6553 "ImportPage.c"
+#line 6554 "ImportPage.c"
 		gboolean _tmp3_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refreshed;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp3_;
-#line 6559 "ImportPage.c"
+#line 6560 "ImportPage.c"
 	} else {
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6563 "ImportPage.c"
+#line 6564 "ImportPage.c"
 	}
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6567 "ImportPage.c"
+#line 6568 "ImportPage.c"
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
 		gint _tmp6_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp4_;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 6581 "ImportPage.c"
+#line 6582 "ImportPage.c"
 	} else {
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6585 "ImportPage.c"
+#line 6586 "ImportPage.c"
 	}
-#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->busy;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp9_) {
-#line 6593 "ImportPage.c"
+#line 6594 "ImportPage.c"
 		gboolean _tmp10_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refreshed;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp10_;
-#line 6599 "ImportPage.c"
+#line 6600 "ImportPage.c"
 	} else {
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6603 "ImportPage.c"
+#line 6604 "ImportPage.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6607 "ImportPage.c"
+#line 6608 "ImportPage.c"
 		ViewCollection* _tmp11_;
 		ViewCollection* _tmp12_;
 		gint _tmp13_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp13_ > 0;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 6621 "ImportPage.c"
+#line 6622 "ImportPage.c"
 	} else {
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6625 "ImportPage.c"
+#line 6626 "ImportPage.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = self->priv->busy;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp15_) {
-#line 6633 "ImportPage.c"
+#line 6634 "ImportPage.c"
 		ViewCollection* _tmp16_;
 		ViewCollection* _tmp17_;
 		gint _tmp18_;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = _tmp16_;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = _tmp18_ > 0;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 6647 "ImportPage.c"
+#line 6648 "ImportPage.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6651 "ImportPage.c"
+#line 6652 "ImportPage.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
-#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_toolbar_state (self);
-#line 6657 "ImportPage.c"
+#line 6658 "ImportPage.c"
 }
 
 
 static void import_page_on_media_added_removed (ImportPage* self) {
 	ImportPageImportPageSearchViewFilter* _tmp0_;
-#line 963 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/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 6669 "ImportPage.c"
+#line 6670 "ImportPage.c"
 }
 
 
@@ -6678,33 +6679,33 @@ static void import_page_on_display_titles (ImportPage* self, GSimpleAction* acti
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 960 "/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 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = value;
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	display = _tmp1_;
-#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 963 "/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 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/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 972 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = action;
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = value;
-#line 973 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 6707 "ImportPage.c"
+#line 6708 "ImportPage.c"
 }
 
 
@@ -6713,36 +6714,204 @@ static void import_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/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 977 "/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), _tmp2_);
-#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 972 "/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 6730 "ImportPage.c"
+#line 6731 "ImportPage.c"
 }
 
 
 static void import_page_real_ready (Page* base) {
 	ImportPage * self;
 	ImportPageHideImportedViewFilter* _tmp0_;
-#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, FALSE);
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported_filter;
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 977 "/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 6745 "ImportPage.c"
+#line 6746 "ImportPage.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 6769 "ImportPage.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 6777 "ImportPage.c"
+	} else {
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 6789 "ImportPage.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 6813 "ImportPage.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 6819 "ImportPage.c"
+	} else {
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 6823 "ImportPage.c"
+	}
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 6827 "ImportPage.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 6839 "ImportPage.c"
+	} else {
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 6849 "ImportPage.c"
+	}
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 6855 "ImportPage.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 6869 "ImportPage.c"
+	} else {
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 6879 "ImportPage.c"
+	}
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 6885 "ImportPage.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 6894 "ImportPage.c"
+	}
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 6914 "ImportPage.c"
 }
 
 
@@ -6753,50 +6922,50 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 	ImportPageRefreshResult _tmp3_;
 	ImportPageRefreshResult _tmp4_;
 	GError * _inner_error_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 6764 "ImportPage.c"
+#line 6933 "ImportPage.c"
 	} else {
 		gboolean _tmp2_;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6771 "ImportPage.c"
+#line 6940 "ImportPage.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 983 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 6777 "ImportPage.c"
+#line 6946 "ImportPage.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
-#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (_tmp4_) {
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_OK:
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6791 "ImportPage.c"
+#line 6960 "ImportPage.c"
 		{
-#line 998 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6795 "ImportPage.c"
+#line 6964 "ImportPage.c"
 		}
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6799 "ImportPage.c"
+#line 6968 "ImportPage.c"
 		{
 			gboolean _tmp5_;
 			const gchar* _tmp6_;
@@ -6804,278 +6973,385 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			const gchar* _tmp7_;
 			GFile* _tmp8_;
 			GMount* mount = NULL;
-			GMount* _tmp13_;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			gboolean _tmp13_ = FALSE;
+			GMount* _tmp14_;
+			GMount* _tmp27_;
+#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = fail_on_locked;
-#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp5_) {
-#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 6816 "ImportPage.c"
+#line 6987 "ImportPage.c"
 			}
-#line 1008 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
-#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"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_debug ("ImportPage.vala:1001: Checking if %s is mounted…", _tmp6_);
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = self->priv->uri;
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			uri = _tmp8_;
-#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			mount = NULL;
-#line 6830 "ImportPage.c"
+#line 7001 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
 				GFile* _tmp10_;
 				GMount* _tmp11_;
 				GMount* _tmp12_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = uri;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = _tmp11_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6844 "ImportPage.c"
-					goto __catch66_g_error;
+#line 7015 "ImportPage.c"
+					goto __catch73_g_error;
 				}
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				mount = _tmp12_;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp9_);
-#line 6857 "ImportPage.c"
+#line 7028 "ImportPage.c"
 			}
-			goto __finally66;
-			__catch66_g_error:
+			goto __finally73;
+			__catch73_g_error:
 			{
 				GError* err = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 6869 "ImportPage.c"
+#line 7040 "ImportPage.c"
 			}
-			__finally66:
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally73:
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (uri);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/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 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 6884 "ImportPage.c"
+#line 7055 "ImportPage.c"
 			}
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp13_ = mount;
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp13_ != NULL) {
-#line 6890 "ImportPage.c"
-				gchar* mounted_message = NULL;
-				gchar* _tmp14_;
-				GtkMessageDialog* dialog = NULL;
-				AppWindow* _tmp15_;
-				AppWindow* _tmp16_;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp14_ = mount;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			if (_tmp14_ == NULL) {
+#line 7061 "ImportPage.c"
+				const gchar* _tmp15_;
+				gboolean _tmp16_;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp15_ = self->priv->uri;
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp16_ = g_str_has_prefix (_tmp15_, "gphoto2");
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp13_ = _tmp16_;
+#line 7070 "ImportPage.c"
+			} else {
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp13_ = FALSE;
+#line 7074 "ImportPage.c"
+			}
+#line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			if (_tmp13_) {
+#line 7078 "ImportPage.c"
 				const gchar* _tmp17_;
-				GtkMessageDialog* _tmp18_;
-				GtkMessageDialog* _tmp19_;
-				GtkMessageDialog* _tmp20_;
-				GtkMessageDialog* _tmp21_;
-				gint dialog_res = 0;
-				GtkMessageDialog* _tmp22_;
-				gint _tmp23_;
-				GtkMessageDialog* _tmp24_;
-				gint _tmp25_;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp14_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
-"ccess it. Continue?"));
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				mounted_message = _tmp14_;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp15_ = app_window_get_instance ();
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp16_ = _tmp15_;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp17_ = mounted_message;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp18_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp17_);
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_object_ref_sink (_tmp18_);
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				GFile* _tmp22_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp17_ = self->priv->uri;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp18_ = string_substring (_tmp17_, (glong) 7, (glong) -1);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = _tmp18_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp20_ = g_strconcat ("mtp", _tmp19_, NULL);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp21_ = _tmp20_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp22_ = g_file_new_for_uri (_tmp21_);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_object_unref0 (uri);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				uri = _tmp22_;
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (_tmp21_);
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (_tmp19_);
+#line 7105 "ImportPage.c"
+				{
+					GMount* _tmp23_ = NULL;
+					GFile* _tmp24_;
+					GMount* _tmp25_;
+					GMount* _tmp26_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp24_ = uri;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp25_ = g_file_find_enclosing_mount (_tmp24_, NULL, &_inner_error_);
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp23_ = _tmp25_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 7119 "ImportPage.c"
+						goto __catch74_g_error;
+					}
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp26_ = _tmp23_;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp23_ = NULL;
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_object_unref0 (mount);
+#line 1017 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					mount = _tmp26_;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_object_unref0 (_tmp23_);
+#line 7132 "ImportPage.c"
+				}
+				goto __finally74;
+				__catch74_g_error:
+				{
+					GError* err = NULL;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					err = _inner_error_;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_inner_error_ = NULL;
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_error_free0 (err);
+#line 7144 "ImportPage.c"
+				}
+				__finally74:
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_object_unref0 (mount);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_object_unref0 (uri);
+#line 1016 "/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 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_clear_error (&_inner_error_);
+#line 1016 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					return;
+#line 7159 "ImportPage.c"
+				}
+			}
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp16_);
+			_tmp27_ = mount;
 #line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog = _tmp19_;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp20_ = dialog;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+			if (_tmp27_ != NULL) {
+#line 7166 "ImportPage.c"
+				gchar* mounted_message = NULL;
+				gchar* _tmp28_;
+				GtkMessageDialog* dialog = NULL;
+				AppWindow* _tmp29_;
+				AppWindow* _tmp30_;
+				const gchar* _tmp31_;
+				GtkMessageDialog* _tmp32_;
+				GtkMessageDialog* _tmp33_;
+				GtkMessageDialog* _tmp34_;
+				GtkMessageDialog* _tmp35_;
+				gint dialog_res = 0;
+				GtkMessageDialog* _tmp36_;
+				gint _tmp37_;
+				GtkMessageDialog* _tmp38_;
+				gint _tmp39_;
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp28_ = g_strdup (_ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
+"ccess it. Continue?"));
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				mounted_message = _tmp28_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp29_ = app_window_get_instance ();
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp30_ = _tmp29_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp31_ = mounted_message;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp32_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp31_);
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp21_ = dialog;
+				g_object_ref_sink (_tmp32_);
 #line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp22_ = dialog;
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
-#line 1028 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog_res = _tmp23_;
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp24_ = dialog;
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
+				_tmp33_ = _tmp32_;
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_object_unref0 (_tmp30_);
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				dialog = _tmp33_;
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp34_ = dialog;
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
 #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp25_ = dialog_res;
+				_tmp35_ = dialog;
 #line 1031 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp25_ != ((gint) GTK_RESPONSE_YES)) {
+				gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_dialog_get_type (), GtkDialog), _ ("_Unmount"), (gint) GTK_RESPONSE_YES);
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp36_ = dialog;
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
 #line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				dialog_res = _tmp37_;
+#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp38_ = dialog;
+#line 1033 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp39_ = dialog_res;
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (_tmp39_ != ((gint) GTK_RESPONSE_YES)) {
+#line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please unmount the camera."));
-#line 6950 "ImportPage.c"
+#line 7226 "ImportPage.c"
 				} else {
-					GMount* _tmp26_;
-#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp26_ = mount;
-#line 1034 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					import_page_unmount_camera (self, _tmp26_);
-#line 6957 "ImportPage.c"
+					GMount* _tmp40_;
+#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp40_ = mount;
+#line 1038 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					import_page_unmount_camera (self, _tmp40_);
+#line 7233 "ImportPage.c"
 				}
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (mounted_message);
-#line 6963 "ImportPage.c"
+#line 7239 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
-				gchar* _tmp27_;
+				gchar* _tmp41_;
 				GtkMessageDialog* dialog = NULL;
-				AppWindow* _tmp28_;
-				AppWindow* _tmp29_;
-				const gchar* _tmp30_;
-				GtkMessageDialog* _tmp31_;
-				GtkMessageDialog* _tmp32_;
-				GtkMessageDialog* _tmp33_;
-				GtkMessageDialog* _tmp34_;
-				GtkMessageDialog* _tmp35_;
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp27_ = g_strdup (_ ("The camera is locked by another application. Shotwell can only access " \
+				AppWindow* _tmp42_;
+				AppWindow* _tmp43_;
+				const gchar* _tmp44_;
+				GtkMessageDialog* _tmp45_;
+				GtkMessageDialog* _tmp46_;
+				GtkMessageDialog* _tmp47_;
+				GtkMessageDialog* _tmp48_;
+				GtkMessageDialog* _tmp49_;
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp41_ = g_strdup (_ ("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 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				locked_message = _tmp27_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp28_ = app_window_get_instance ();
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp29_ = _tmp28_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp30_ = locked_message;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp31_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp30_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_object_ref_sink (_tmp31_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp32_ = _tmp31_;
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp29_);
-#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				dialog = _tmp32_;
-#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp33_ = dialog;
-#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				locked_message = _tmp41_;
 #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp34_ = dialog;
+				_tmp42_ = app_window_get_instance ();
 #line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_dialog_get_type (), GtkDialog));
-#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp35_ = dialog;
-#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
+				_tmp43_ = _tmp42_;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp44_ = locked_message;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp45_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp44_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_object_ref_sink (_tmp45_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp46_ = _tmp45_;
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_object_unref0 (_tmp43_);
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				dialog = _tmp46_;
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp47_ = dialog;
 #line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
+#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp48_ = dialog;
+#line 1048 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_dialog_get_type (), GtkDialog));
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp49_ = dialog;
+#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+#line 1051 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Please close any other application using the camera."));
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 7014 "ImportPage.c"
+#line 7290 "ImportPage.c"
 			}
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (uri);
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7022 "ImportPage.c"
+#line 7298 "ImportPage.c"
 		}
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7026 "ImportPage.c"
+#line 7302 "ImportPage.c"
 		{
-			gchar* _tmp36_;
-			gchar* _tmp37_;
-			gchar* _tmp38_;
-			gchar* _tmp39_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp36_ = import_page_get_refresh_message (self);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp37_ = _tmp36_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp38_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp37_);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp39_ = _tmp38_;
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			app_window_error_message (_tmp39_, NULL);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp39_);
-#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp37_);
-#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			gchar* _tmp50_;
+			gchar* _tmp51_;
+			gchar* _tmp52_;
+			gchar* _tmp53_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp50_ = import_page_get_refresh_message (self);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp51_ = _tmp50_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp52_ = g_strdup_printf (_ ("Unable to fetch previews from the camera:\n%s"), _tmp51_);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp53_ = _tmp52_;
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			app_window_error_message (_tmp53_, NULL);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_free0 (_tmp53_);
+#line 1056 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_free0 (_tmp51_);
+#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7048 "ImportPage.c"
+#line 7324 "ImportPage.c"
 		}
 		default:
 		{
-			ImportPageRefreshResult _tmp40_;
-#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp40_ = res;
-#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_error ("ImportPage.vala:1057: Unknown result type %d", (gint) _tmp40_);
-#line 7057 "ImportPage.c"
+			ImportPageRefreshResult _tmp54_;
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp54_ = res;
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_error ("ImportPage.vala:1061: Unknown result type %d", (gint) _tmp54_);
+#line 7333 "ImportPage.c"
 		}
 	}
 }
 
 
 static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7066 "ImportPage.c"
+#line 7342 "ImportPage.c"
 }
 
 
 static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_unref (self);
-#line 7075 "ImportPage.c"
+#line 7351 "ImportPage.c"
 }
 
 
@@ -7092,65 +7368,65 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	AppWindow* _tmp8_;
 	GtkMountOperation* _tmp9_;
 	GtkMountOperation* _tmp10_;
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
-#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1063 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7104 "ImportPage.c"
+#line 7380 "ImportPage.c"
 	}
-#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1070 "/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 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1067 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp2_, 0.0);
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE);
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = self->priv->progress_bar;
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp4_, _ ("Unmounting…"));
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = mount;
-#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp5_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
-#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"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1080: Unmounting camera…");
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = mount;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_mount_unmount_with_operation (_tmp6_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1077 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7150 "ImportPage.c"
+#line 7426 "ImportPage.c"
 }
 
 
@@ -7159,35 +7435,35 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 	GObject* _tmp0_;
 	GMount* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail ((source == NULL) || G_IS_OBJECT (source));
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_ASYNC_RESULT (aresult));
-#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"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1088: Async unmount finished");
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = source;
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
-#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	mount = _tmp1_;
-#line 7173 "ImportPage.c"
+#line 7449 "ImportPage.c"
 	{
 		GAsyncResult* _tmp2_;
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = aresult;
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7182 "ImportPage.c"
-			goto __catch67_g_error;
+#line 7458 "ImportPage.c"
+			goto __catch75_g_error;
 		}
 	}
-	goto __finally67;
-	__catch67_g_error:
+	goto __finally75;
+	__catch75_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_;
@@ -7195,52 +7471,52 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		GtkProgressBar* _tmp5_;
 		GtkProgressBar* _tmp6_;
 		GtkProgressBar* _tmp7_;
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE);
-#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1097 "/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 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->refreshed;
-#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, _tmp4_);
-#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = self->priv->progress_bar;
-#line 1096 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE);
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = self->priv->progress_bar;
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_text (_tmp6_, "");
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->progress_bar;
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1102 "/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 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 7223 "ImportPage.c"
+#line 7499 "ImportPage.c"
 	}
-	__finally67:
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally75:
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (mount);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/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 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 7236 "ImportPage.c"
+#line 7512 "ImportPage.c"
 	}
-#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7240 "ImportPage.c"
+#line 7516 "ImportPage.c"
 }
 
 
@@ -7249,31 +7525,31 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
 	GtkProgressBar* _tmp1_;
 	GtkProgressBar* _tmp2_;
 	GtkProgressBar* _tmp3_;
-#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_MOUNT (mount));
-#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"
+#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1107: on_unmounted");
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refreshed;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp1_, PANGO_ELLIPSIZE_NONE);
-#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp2_, "");
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/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 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, TRUE);
-#line 7273 "ImportPage.c"
+#line 7549 "ImportPage.c"
 }
 
 
@@ -7282,23 +7558,23 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 	SourceCollection* _tmp0_;
 	Marker* _tmp1_;
 	SourceCollection* _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->import_sources;
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1114 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker_mark_all (marker);
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->import_sources;
-#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
-#line 1113 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 7298 "ImportPage.c"
+#line 7574 "ImportPage.c"
 }
 
 
@@ -7332,93 +7608,93 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	gint list_len = 0;
 	CameraList* _tmp15_;
 	gint _tmp16_;
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (search_target != NULL, FALSE);
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	fulldir = _tmp4_;
 #line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	fulldir = _tmp4_;
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = gp_list_new (&_tmp5_);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	folders = _tmp5_;
-#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp6_;
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _result_;
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7370 "ImportPage.c"
+#line 7646 "ImportPage.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fulldir;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = folders;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = import_page_spin_idle_context;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_);
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp13_;
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = _result_;
-#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp14_ != GP_OK) {
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7398 "ImportPage.c"
+#line 7674 "ImportPage.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = gp_list_count (_tmp15_);
-#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	list_len = _tmp16_;
-#line 7406 "ImportPage.c"
+#line 7682 "ImportPage.c"
 	{
 		gint list_index = 0;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7411 "ImportPage.c"
+#line 7687 "ImportPage.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = TRUE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 7418 "ImportPage.c"
+#line 7694 "ImportPage.c"
 				gint _tmp19_;
 				gint _tmp20_;
 				gchar* tmp = NULL;
@@ -7428,73 +7704,94 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				gchar* _tmp24_;
 				const gchar* _tmp25_;
 				const gchar* _tmp26_;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7430 "ImportPage.c"
+#line 7706 "ImportPage.c"
 					gint _tmp18_;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = list_index;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					list_index = _tmp18_ + 1;
-#line 7436 "ImportPage.c"
+#line 7712 "ImportPage.c"
 				}
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = list_index;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp20_ = list_len;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp19_ < _tmp20_)) {
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 7448 "ImportPage.c"
+#line 7724 "ImportPage.c"
 				}
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = list_index;
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = g_strdup (_tmp23_);
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				tmp = _tmp24_;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = tmp;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = search_target;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = TRUE;
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (tmp);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 7478 "ImportPage.c"
+#line 7754 "ImportPage.c"
 				}
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7482 "ImportPage.c"
+#line 7758 "ImportPage.c"
 			}
 		}
 	}
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1153 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	return result;
+#line 7770 "ImportPage.c"
+}
+
+
+static gboolean ____lambda18_ (ImportPage* self) {
+	gboolean result = FALSE;
+#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_refresh_camera (self);
+#line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	result = FALSE;
+#line 1181 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7494 "ImportPage.c"
+#line 7782 "ImportPage.c"
+}
+
+
+static gboolean _____lambda18__gsource_func (gpointer self) {
+	gboolean result;
+	result = ____lambda18_ ((ImportPage*) self);
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	return result;
+#line 7791 "ImportPage.c"
 }
 
 
@@ -7507,174 +7804,205 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	GPContext* _tmp4_;
 	int _tmp5_;
 	int _tmp6_;
-	gboolean _tmp12_;
-	GtkProgressBar* _tmp13_;
-	GtkProgressBar* _tmp14_;
-	GtkProgressBar* _tmp15_;
-	GtkProgressBar* _tmp16_;
+	int _tmp10_;
+	gboolean _tmp16_;
 	GtkProgressBar* _tmp17_;
+	GtkProgressBar* _tmp18_;
+	GtkProgressBar* _tmp19_;
+	GtkProgressBar* _tmp20_;
+	GtkProgressBar* _tmp21_;
 	GeeArrayList* import_list = NULL;
-	GeeArrayList* _tmp18_;
+	GeeArrayList* _tmp22_;
 	CameraStorageInformation* sifs = NULL;
 	gint count = 0;
-	Camera* _tmp19_;
-	GPSpinIdleWrapper* _tmp20_;
-	GPContext* _tmp21_;
-	gint _tmp22_ = 0;
-	int _tmp23_;
-	int _tmp24_;
-	GeeArrayList* _tmp73_;
-	GeeArrayList* _tmp74_;
-	GtkProgressBar* _tmp75_;
-	GtkProgressBar* _tmp76_;
-	GtkProgressBar* _tmp77_;
-	GtkProgressBar* _tmp78_;
+	Camera* _tmp23_;
+	GPSpinIdleWrapper* _tmp24_;
+	GPContext* _tmp25_;
+	gint _tmp26_ = 0;
+	int _tmp27_;
+	int _tmp28_;
+	GeeArrayList* _tmp77_;
+	GeeArrayList* _tmp78_;
+	GtkProgressBar* _tmp79_;
+	GtkProgressBar* _tmp80_;
+	GtkProgressBar* _tmp81_;
+	GtkProgressBar* _tmp82_;
 	int res = 0;
-	Camera* _tmp79_;
-	GPSpinIdleWrapper* _tmp80_;
-	GPContext* _tmp81_;
-	int _tmp82_;
-	int _tmp83_;
+	Camera* _tmp83_;
+	GPSpinIdleWrapper* _tmp84_;
+	GPContext* _tmp85_;
+	int _tmp86_;
 	int _tmp87_;
-	int _tmp92_;
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	int _tmp91_;
+	int _tmp96_;
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7547 "ImportPage.c"
+#line 7845 "ImportPage.c"
 	}
-#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), _ ("Starting import, please wait…"));
-#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Connecting to camera, please wait…"));
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->busy;
-#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, _tmp1_, FALSE);
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->camera;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_spin_idle_context;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = gp_camera_init (_tmp2_, _tmp4_);
-#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp5_;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = self->priv->refresh_result;
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp6_ != GP_OK) {
-#line 7573 "ImportPage.c"
-		int _tmp7_;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-		ImportPageRefreshResult _tmp10_ = 0;
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp6_ == GP_ERROR_IO_USB_CLAIM) {
+#line 7871 "ImportPage.c"
+		gint _tmp7_;
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp7_ = self->priv->claim_timeout;
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		if (_tmp7_ < 4000) {
+#line 7877 "ImportPage.c"
+			gint _tmp8_;
+			gint _tmp9_;
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp8_ = self->priv->claim_timeout;
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp8_, _____lambda18__gsource_func, g_object_ref (self), g_object_unref);
+#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp9_ = self->priv->claim_timeout;
+#line 1183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			self->priv->claim_timeout = _tmp9_ * 2;
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			return result;
+#line 7892 "ImportPage.c"
+		}
+	}
+#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self->priv->claim_timeout = 500;
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp10_ = self->priv->refresh_result;
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp10_ != GP_OK) {
+#line 7901 "ImportPage.c"
 		int _tmp11_;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp7_ = self->priv->refresh_result;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp8_ = gp_result_to_full_string (_tmp7_);
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp9_ = _tmp8_;
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1167: Unable to initialize camera: %s", _tmp9_);
-#line 1167 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp9_);
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		ImportPageRefreshResult _tmp14_ = 0;
+		int _tmp15_;
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = self->priv->refresh_result;
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp11_ == GP_ERROR_IO_LOCK) {
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7595 "ImportPage.c"
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp12_ = gp_result_to_full_string (_tmp11_);
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp13_ = _tmp12_;
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1193: Unable to initialize camera: %s", _tmp13_);
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_free0 (_tmp13_);
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp15_ = self->priv->refresh_result;
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		if (_tmp15_ == GP_ERROR_IO_LOCK) {
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
+#line 7923 "ImportPage.c"
 		} else {
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp10_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7599 "ImportPage.c"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp14_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
+#line 7927 "ImportPage.c"
 		}
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		result = _tmp10_;
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		result = _tmp14_;
+#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7605 "ImportPage.c"
+#line 7933 "ImportPage.c"
 	}
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = self->priv->refreshed;
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_update_status (self, TRUE, _tmp12_);
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _ ("Starting import, please wait…"));
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp16_ = self->priv->refreshed;
+#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_update_status (self, TRUE, _tmp16_);
+#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp13_ = self->priv->progress_bar;
-#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_NONE);
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp14_ = self->priv->progress_bar;
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_text (_tmp14_, _ ("Fetching photo information"));
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp15_ = self->priv->progress_bar;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_fraction (_tmp15_, 0.0);
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp16_ = self->priv->progress_bar;
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_pulse_step (_tmp16_, 0.01);
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = self->priv->progress_bar;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp18_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 1182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_list = _tmp18_;
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_ellipsize (_tmp17_, PANGO_ELLIPSIZE_NONE);
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp18_ = self->priv->progress_bar;
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_text (_tmp18_, _ ("Fetching photo information"));
+#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp19_ = self->priv->progress_bar;
+#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_fraction (_tmp19_, 0.0);
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp20_ = self->priv->progress_bar;
+#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_pulse_step (_tmp20_, 0.01);
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp21_ = self->priv->progress_bar;
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp22_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_list = _tmp22_;
+#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp19_ = self->priv->camera;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp20_ = import_page_spin_idle_context;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp23_ = gp_camera_get_storageinfo (_tmp19_, &sifs, &_tmp22_, _tmp21_);
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	count = _tmp22_;
-#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp23_;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp24_ = self->priv->refresh_result;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp24_ == GP_OK) {
-#line 7657 "ImportPage.c"
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp23_ = self->priv->camera;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp24_ = import_page_spin_idle_context;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp27_ = gp_camera_get_storageinfo (_tmp23_, &sifs, &_tmp26_, _tmp25_);
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	count = _tmp26_;
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self->priv->refresh_result = _tmp27_;
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp28_ = self->priv->refresh_result;
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp28_ == GP_OK) {
+#line 7987 "ImportPage.c"
 		{
 			gint fsid = 0;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7662 "ImportPage.c"
+#line 7992 "ImportPage.c"
 			{
-				gboolean _tmp25_ = FALSE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp25_ = TRUE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gboolean _tmp29_ = FALSE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp29_ = TRUE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7669 "ImportPage.c"
-					gint _tmp27_;
-					gint _tmp28_;
+#line 7999 "ImportPage.c"
+					gint _tmp31_;
+					gint _tmp32_;
 					gboolean got_well_known_dir = FALSE;
-					gint _tmp29_;
-					gboolean _tmp30_;
 					gint _tmp33_;
 					gboolean _tmp34_;
 					gint _tmp37_;
@@ -7693,382 +8021,384 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					gboolean _tmp62_;
 					gint _tmp65_;
 					gboolean _tmp66_;
-					gboolean _tmp69_;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!_tmp25_) {
-#line 7696 "ImportPage.c"
-						gint _tmp26_;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp26_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						fsid = _tmp26_ + 1;
-#line 7702 "ImportPage.c"
+					gint _tmp69_;
+					gboolean _tmp70_;
+					gboolean _tmp73_;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (!_tmp29_) {
+#line 8026 "ImportPage.c"
+						gint _tmp30_;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp30_ = fsid;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						fsid = _tmp30_ + 1;
+#line 8032 "ImportPage.c"
 					}
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp25_ = FALSE;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp27_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp28_ = count;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!(_tmp27_ < _tmp28_)) {
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp29_ = FALSE;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp31_ = fsid;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp32_ = count;
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (!(_tmp31_ < _tmp32_)) {
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7714 "ImportPage.c"
+#line 8044 "ImportPage.c"
 					}
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp29_ = fsid;
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp30_ = import_page_check_directory_exists (self, _tmp29_, "/", "DCIM");
-#line 1195 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp30_) {
-#line 7724 "ImportPage.c"
-						gint _tmp31_;
-						GeeArrayList* _tmp32_;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp31_ = fsid;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp32_ = import_list;
-#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp31_, "/DCIM", _tmp32_);
-#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						got_well_known_dir = TRUE;
-#line 7735 "ImportPage.c"
-					}
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = fsid;
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "dcim");
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp34_ = import_page_check_directory_exists (self, _tmp33_, "/", "DCIM");
+#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp34_) {
-#line 7743 "ImportPage.c"
+#line 8054 "ImportPage.c"
 						gint _tmp35_;
 						GeeArrayList* _tmp36_;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp35_ = fsid;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp36_ = import_list;
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp35_, "/dcim", _tmp36_);
-#line 1201 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp35_, "/DCIM", _tmp36_);
+#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7754 "ImportPage.c"
+#line 8065 "ImportPage.c"
 					}
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = fsid;
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/PRIVATE/", "AVCHD");
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp38_ = import_page_check_directory_exists (self, _tmp37_, "/", "dcim");
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp38_) {
-#line 7762 "ImportPage.c"
+#line 8073 "ImportPage.c"
 						gint _tmp39_;
 						GeeArrayList* _tmp40_;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = fsid;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp40_ = import_list;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp39_, "/PRIVATE/AVCHD", _tmp40_);
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp39_, "/dcim", _tmp40_);
+#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7773 "ImportPage.c"
+#line 8084 "ImportPage.c"
 					}
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = fsid;
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/private/", "avchd");
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp42_ = import_page_check_directory_exists (self, _tmp41_, "/PRIVATE/", "AVCHD");
+#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp42_) {
-#line 7781 "ImportPage.c"
+#line 8092 "ImportPage.c"
 						gint _tmp43_;
 						GeeArrayList* _tmp44_;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp43_ = fsid;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp44_ = import_list;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp43_, "/private/avchd", _tmp44_);
-#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp43_, "/PRIVATE/AVCHD", _tmp44_);
+#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7792 "ImportPage.c"
+#line 8103 "ImportPage.c"
 					}
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = fsid;
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/", "AVCHD");
-#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp46_ = import_page_check_directory_exists (self, _tmp45_, "/private/", "avchd");
+#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp46_) {
-#line 7800 "ImportPage.c"
+#line 8111 "ImportPage.c"
 						gint _tmp47_;
 						GeeArrayList* _tmp48_;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp47_ = fsid;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = import_list;
-#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp47_, "/AVCHD", _tmp48_);
-#line 1216 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp47_, "/private/avchd", _tmp48_);
+#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7811 "ImportPage.c"
+#line 8122 "ImportPage.c"
 					}
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp49_ = fsid;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "avchd");
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp50_ = import_page_check_directory_exists (self, _tmp49_, "/", "AVCHD");
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp50_) {
-#line 7819 "ImportPage.c"
+#line 8130 "ImportPage.c"
 						gint _tmp51_;
 						GeeArrayList* _tmp52_;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp51_ = fsid;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = import_list;
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp51_, "/avchd", _tmp52_);
-#line 1220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp51_, "/AVCHD", _tmp52_);
+#line 1243 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7830 "ImportPage.c"
+#line 8141 "ImportPage.c"
 					}
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = fsid;
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/PRIVATE/", "SONY");
-#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp54_ = import_page_check_directory_exists (self, _tmp53_, "/", "avchd");
+#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp54_) {
-#line 7838 "ImportPage.c"
+#line 8149 "ImportPage.c"
 						gint _tmp55_;
 						GeeArrayList* _tmp56_;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = fsid;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = import_list;
-#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp55_, "/PRIVATE/SONY", _tmp56_);
-#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp55_, "/avchd", _tmp56_);
+#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7849 "ImportPage.c"
+#line 8160 "ImportPage.c"
 					}
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp57_ = fsid;
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/private/", "sony");
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp58_ = import_page_check_directory_exists (self, _tmp57_, "/PRIVATE/", "SONY");
+#line 1252 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp58_) {
-#line 7857 "ImportPage.c"
+#line 8168 "ImportPage.c"
 						gint _tmp59_;
 						GeeArrayList* _tmp60_;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp59_ = fsid;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp60_ = import_list;
-#line 1230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp59_, "/private/sony", _tmp60_);
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp59_, "/PRIVATE/SONY", _tmp60_);
+#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7868 "ImportPage.c"
+#line 8179 "ImportPage.c"
 					}
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp61_ = fsid;
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/", "MP_ROOT");
-#line 1235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp62_ = import_page_check_directory_exists (self, _tmp61_, "/private/", "sony");
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp62_) {
-#line 7876 "ImportPage.c"
+#line 8187 "ImportPage.c"
 						gint _tmp63_;
 						GeeArrayList* _tmp64_;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp63_ = fsid;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp64_ = import_list;
-#line 1236 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp63_, "/MP_ROOT", _tmp64_);
-#line 1237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp63_, "/private/sony", _tmp64_);
+#line 1258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7887 "ImportPage.c"
+#line 8198 "ImportPage.c"
 					}
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = fsid;
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "mp_root");
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp66_ = import_page_check_directory_exists (self, _tmp65_, "/", "MP_ROOT");
+#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp66_) {
-#line 7895 "ImportPage.c"
+#line 8206 "ImportPage.c"
 						gint _tmp67_;
 						GeeArrayList* _tmp68_;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = fsid;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = import_list;
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						import_page_enumerate_files (self, _tmp67_, "/mp_root", _tmp68_);
-#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp67_, "/MP_ROOT", _tmp68_);
+#line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7906 "ImportPage.c"
+#line 8217 "ImportPage.c"
 					}
-#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp69_ = got_well_known_dir;
-#line 1246 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!_tmp69_) {
-#line 7912 "ImportPage.c"
-						gint _tmp70_;
-						GeeArrayList* _tmp71_;
-						gboolean _tmp72_;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp70_ = fsid;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp71_ = import_list;
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp72_ = import_page_enumerate_files (self, _tmp70_, "/", _tmp71_);
-#line 1247 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						if (!_tmp72_) {
-#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp69_ = fsid;
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp70_ = import_page_check_directory_exists (self, _tmp69_, "/", "mp_root");
+#line 1266 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (_tmp70_) {
+#line 8225 "ImportPage.c"
+						gint _tmp71_;
+						GeeArrayList* _tmp72_;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp71_ = fsid;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp72_ = import_list;
+#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						import_page_enumerate_files (self, _tmp71_, "/mp_root", _tmp72_);
+#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						got_well_known_dir = TRUE;
+#line 8236 "ImportPage.c"
+					}
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp73_ = got_well_known_dir;
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (!_tmp73_) {
+#line 8242 "ImportPage.c"
+						gint _tmp74_;
+						GeeArrayList* _tmp75_;
+						gboolean _tmp76_;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp74_ = fsid;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp75_ = import_list;
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp76_ = import_page_enumerate_files (self, _tmp74_, "/", _tmp75_);
+#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						if (!_tmp76_) {
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 7926 "ImportPage.c"
+#line 8256 "ImportPage.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1280 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_clear_all_import_sources (self);
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp73_ = import_list;
-#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_auto_match_raw_jpeg (self, _tmp73_);
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp74_ = import_list;
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_LIST, GeeList));
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp75_ = self->priv->progress_bar;
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp76_ = self->priv->progress_bar;
-#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_ellipsize (_tmp76_, PANGO_ELLIPSIZE_NONE);
-#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp77_ = self->priv->progress_bar;
-#line 1272 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_text (_tmp77_, "");
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp78_ = self->priv->progress_bar;
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	gtk_progress_bar_set_fraction (_tmp78_, 0.0);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp79_ = self->priv->camera;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp80_ = import_page_spin_idle_context;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp81_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp82_ = gp_camera_exit (_tmp79_, _tmp81_);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	res = _tmp82_;
-#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp83_ = res;
-#line 1276 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp83_ != GP_OK) {
-#line 7973 "ImportPage.c"
-		int _tmp84_;
-		gchar* _tmp85_;
-		gchar* _tmp86_;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp84_ = res;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp85_ = gp_result_to_full_string (_tmp84_);
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp86_ = _tmp85_;
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1278: Unable to unlock camera: %s", _tmp86_);
-#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp86_);
-#line 7987 "ImportPage.c"
-	}
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp87_ = self->priv->refresh_result;
-#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp87_ == GP_OK) {
-#line 7993 "ImportPage.c"
-		SourceCollection* _tmp88_;
-		gint _tmp89_;
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp88_ = self->priv->import_sources;
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp89_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp89_ == 0) {
-#line 8002 "ImportPage.c"
-			gchar* _tmp90_;
-			gchar* _tmp91_;
-#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp90_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp91_ = _tmp90_;
 #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), _tmp91_);
+	_tmp77_ = import_list;
 #line 1283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_free0 (_tmp91_);
-#line 8013 "ImportPage.c"
+	import_page_auto_match_raw_jpeg (self, _tmp77_);
+#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp78_ = import_list;
+#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp79_ = self->priv->progress_bar;
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp80_ = self->priv->progress_bar;
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_ellipsize (_tmp80_, PANGO_ELLIPSIZE_NONE);
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp81_ = self->priv->progress_bar;
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_text (_tmp81_, "");
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp82_ = self->priv->progress_bar;
+#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gtk_progress_bar_set_fraction (_tmp82_, 0.0);
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp83_ = self->priv->camera;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp84_ = import_page_spin_idle_context;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp86_ = gp_camera_exit (_tmp83_, _tmp85_);
+#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	res = _tmp86_;
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp87_ = res;
+#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp87_ != GP_OK) {
+#line 8303 "ImportPage.c"
+		int _tmp88_;
+		gchar* _tmp89_;
+		gchar* _tmp90_;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp88_ = res;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp89_ = gp_result_to_full_string (_tmp88_);
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp90_ = _tmp89_;
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1305: Unable to unlock camera: %s", _tmp90_);
+#line 1305 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_free0 (_tmp90_);
+#line 8317 "ImportPage.c"
+	}
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp91_ = self->priv->refresh_result;
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp91_ == GP_OK) {
+#line 8323 "ImportPage.c"
+		SourceCollection* _tmp92_;
+		gint _tmp93_;
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp92_ = self->priv->import_sources;
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp93_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_DATA_COLLECTION, DataCollection));
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		if (_tmp93_ == 0) {
+#line 8332 "ImportPage.c"
+			gchar* _tmp94_;
+			gchar* _tmp95_;
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp94_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp95_ = _tmp94_;
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp95_);
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_g_free0 (_tmp95_);
+#line 8343 "ImportPage.c"
 		}
-#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 8017 "ImportPage.c"
+#line 8347 "ImportPage.c"
 	} else {
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, FALSE);
-#line 1290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_clear_all_import_sources (self);
-#line 8023 "ImportPage.c"
+#line 8353 "ImportPage.c"
 	}
-#line 1293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp92_ = self->priv->refresh_result;
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	switch (_tmp92_) {
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp96_ = self->priv->refresh_result;
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	switch (_tmp96_) {
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 8033 "ImportPage.c"
+#line 8363 "ImportPage.c"
 		{
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8041 "ImportPage.c"
+#line 8371 "ImportPage.c"
 		}
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 8045 "ImportPage.c"
+#line 8375 "ImportPage.c"
 		{
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8053 "ImportPage.c"
+#line 8383 "ImportPage.c"
 		}
 		default:
 		{
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8063 "ImportPage.c"
+#line 8393 "ImportPage.c"
 		}
 	}
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 8068 "ImportPage.c"
+#line 8398 "ImportPage.c"
 }
 
 
@@ -8086,7 +8416,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8086 "ImportPage.c"
+#line 8416 "ImportPage.c"
 }
 
 
@@ -8119,7 +8449,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 8119 "ImportPage.c"
+#line 8449 "ImportPage.c"
 		glong _tmp3_;
 		glong _tmp4_;
 #line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8128,13 +8458,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8128 "ImportPage.c"
+#line 8458 "ImportPage.c"
 	}
 #line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 8134 "ImportPage.c"
+#line 8464 "ImportPage.c"
 		glong _tmp6_;
 		glong _tmp7_;
 #line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8143,13 +8473,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8143 "ImportPage.c"
+#line 8473 "ImportPage.c"
 	}
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 8149 "ImportPage.c"
+#line 8479 "ImportPage.c"
 		glong _tmp10_;
 		glong _tmp11_;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8158,11 +8488,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8158 "ImportPage.c"
+#line 8488 "ImportPage.c"
 	} else {
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8162 "ImportPage.c"
+#line 8492 "ImportPage.c"
 	}
 #line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -8170,7 +8500,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8170 "ImportPage.c"
+#line 8500 "ImportPage.c"
 		glong _tmp14_;
 		glong _tmp15_;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8179,11 +8509,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8179 "ImportPage.c"
+#line 8509 "ImportPage.c"
 	} else {
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8183 "ImportPage.c"
+#line 8513 "ImportPage.c"
 	}
 #line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -8205,7 +8535,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8205 "ImportPage.c"
+#line 8535 "ImportPage.c"
 }
 
 
@@ -8216,71 +8546,71 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	gint _tmp1_;
 	gint _tmp2_;
 	gchar* _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1334 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = str;
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	offset = (glong) _tmp2_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	while (TRUE) {
-#line 8228 "ImportPage.c"
+#line 8558 "ImportPage.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		const gchar* _tmp5_;
 		glong _tmp6_;
 		gchar _tmp7_;
 		gchar _tmp8_;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = offset;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		offset = _tmp3_ - 1;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = offset;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!(_tmp4_ >= ((glong) 0))) {
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 8245 "ImportPage.c"
+#line 8575 "ImportPage.c"
 		}
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = offset;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = string_get (_tmp5_, _tmp6_);
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = ch;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_ != _tmp8_) {
-#line 8257 "ImportPage.c"
+#line 8587 "ImportPage.c"
 			const gchar* _tmp9_;
 			glong _tmp10_;
 			gchar* _tmp11_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = str;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = offset;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_);
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp11_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8271 "ImportPage.c"
+#line 8601 "ImportPage.c"
 		}
 	}
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = g_strdup ("");
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp12_;
-#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8280 "ImportPage.c"
+#line 8610 "ImportPage.c"
 }
 
 
@@ -8289,127 +8619,127 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_;
 	gboolean _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (basepath != NULL, NULL);
-#line 1317 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (addition != NULL, NULL);
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = basepath;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = g_str_has_suffix (_tmp1_, "/");
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 8299 "ImportPage.c"
+#line 8629 "ImportPage.c"
 		const gchar* _tmp3_;
 		gboolean _tmp4_;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = addition;
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8308 "ImportPage.c"
+#line 8638 "ImportPage.c"
 	} else {
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8312 "ImportPage.c"
+#line 8642 "ImportPage.c"
 	}
-#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8316 "ImportPage.c"
+#line 8646 "ImportPage.c"
 		const gchar* _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		const gchar* _tmp8_;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = basepath;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = g_strconcat (_tmp5_, "/", NULL);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = addition;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8341 "ImportPage.c"
+#line 8671 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		const gchar* _tmp12_;
 		gboolean _tmp13_;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = basepath;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8352 "ImportPage.c"
+#line 8682 "ImportPage.c"
 			const gchar* _tmp14_;
 			gboolean _tmp15_;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = addition;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8361 "ImportPage.c"
+#line 8691 "ImportPage.c"
 		} else {
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8365 "ImportPage.c"
+#line 8695 "ImportPage.c"
 		}
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8369 "ImportPage.c"
+#line 8699 "ImportPage.c"
 			const gchar* _tmp16_;
 			gchar* _tmp17_;
 			gchar* _tmp18_;
 			const gchar* _tmp19_;
 			gchar* _tmp20_;
 			gchar* _tmp21_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = basepath;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = import_page_chomp_ch (_tmp16_, '/');
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = _tmp17_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = addition;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = _tmp20_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp18_);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp21_;
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8394 "ImportPage.c"
+#line 8724 "ImportPage.c"
 		} else {
 			const gchar* _tmp22_;
 			const gchar* _tmp23_;
 			gchar* _tmp24_;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = basepath;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = addition;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp24_;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8409 "ImportPage.c"
+#line 8739 "ImportPage.c"
 		}
 	}
 }
@@ -8435,80 +8765,80 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	CameraStorageInformation* _tmp11_;
 	CameraStorageInfoFields _tmp12_;
 	gchar* _tmp15_;
-#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_null_context;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->context;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_);
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = _tmp3_;
-#line 1331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp4_;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = res;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != GP_OK) {
-#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1333 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8461 "ImportPage.c"
+#line 8791 "ImportPage.c"
 	}
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = count;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ >= _tmp7_) {
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8473 "ImportPage.c"
+#line 8803 "ImportPage.c"
 	}
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fsid;
-#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	ifs = _tmp8_ + _tmp9_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = ifs;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = (*_tmp11_).fields;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8487 "ImportPage.c"
+#line 8817 "ImportPage.c"
 		CameraStorageInformation* _tmp13_;
 		const gchar* _tmp14_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = ifs;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = (*_tmp13_).basedir;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8496 "ImportPage.c"
+#line 8826 "ImportPage.c"
 	} else {
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8500 "ImportPage.c"
+#line 8830 "ImportPage.c"
 	}
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp15_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8508 "ImportPage.c"
+#line 8838 "ImportPage.c"
 }
 
 
@@ -8525,74 +8855,74 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	const gchar* _tmp11_;
 	const gchar* _tmp12_;
 	gchar* _tmp13_;
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = folder;
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8543 "ImportPage.c"
+#line 8873 "ImportPage.c"
 	}
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = fsid;
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_);
-#line 1347 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	basedir = _tmp5_;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = basedir;
-#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ == NULL) {
-#line 8557 "ImportPage.c"
+#line 8887 "ImportPage.c"
 		const gchar* _tmp7_;
 		gint _tmp8_;
 		const gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = camera_name;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = fsid;
-#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"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_debug ("ImportPage.vala:1376: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = folder;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (basedir);
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8578 "ImportPage.c"
+#line 8908 "ImportPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = folder;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = import_page_append_path (_tmp11_, _tmp12_);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp13_;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (basedir);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8592 "ImportPage.c"
+#line 8922 "ImportPage.c"
 }
 
 
@@ -8616,841 +8946,847 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	GPContext* _tmp17_;
 	int _tmp18_;
 	int _tmp19_;
+	CameraList* _tmp24_;
 	CameraList* folders = NULL;
-	CameraList* _tmp110_ = NULL;
-	int _tmp111_;
+	CameraList* _tmp111_ = NULL;
 	int _tmp112_;
-	Camera* _tmp116_;
-	const gchar* _tmp117_;
-	CameraList* _tmp118_;
-	GPSpinIdleWrapper* _tmp119_;
-	GPContext* _tmp120_;
-	int _tmp121_;
+	int _tmp113_;
+	Camera* _tmp117_;
+	const gchar* _tmp118_;
+	CameraList* _tmp119_;
+	GPSpinIdleWrapper* _tmp120_;
+	GPContext* _tmp121_;
 	int _tmp122_;
+	int _tmp123_;
 	GError * _inner_error_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (import_list), FALSE);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	fulldir = _tmp4_;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = fulldir;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ == NULL) {
-#line 8650 "ImportPage.c"
+#line 8981 "ImportPage.c"
 		const gchar* _tmp6_;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
-#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"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1387: Skipping enumerating %s: invalid folder name", _tmp6_);
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8662 "ImportPage.c"
+#line 8993 "ImportPage.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	files = _tmp7_;
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp8_;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->refresh_result;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp9_ != GP_OK) {
-#line 8676 "ImportPage.c"
+#line 9007 "ImportPage.c"
 		int _tmp10_;
 		gchar* _tmp11_;
 		gchar* _tmp12_;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refresh_result;
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = gp_result_to_full_string (_tmp10_);
-#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#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"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1395: Unable to create file list: %s", _tmp12_);
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp12_);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8698 "ImportPage.c"
+#line 9029 "ImportPage.c"
 	}
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = fulldir;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = files;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = import_page_spin_idle_context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_);
-#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp18_;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = self->priv->refresh_result;
-#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 8718 "ImportPage.c"
+#line 9049 "ImportPage.c"
 		const gchar* _tmp20_;
 		int _tmp21_;
 		gchar* _tmp22_;
 		gchar* _tmp23_;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = fulldir;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = self->priv->refresh_result;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = gp_result_to_full_string (_tmp21_);
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = _tmp22_;
-#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"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1402: Unable to list files in %s: %s", _tmp20_, _tmp23_);
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp23_);
-#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8745 "ImportPage.c"
+#line 9076 "ImportPage.c"
 	}
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp24_ = files;
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gp_list_sort (_tmp24_);
+#line 9082 "ImportPage.c"
 	{
 		gint ctr = 0;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8751 "ImportPage.c"
+#line 9087 "ImportPage.c"
 		{
-			gboolean _tmp24_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp24_ = TRUE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			gboolean _tmp25_ = FALSE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp25_ = TRUE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 8758 "ImportPage.c"
-				gint _tmp26_;
-				CameraList* _tmp27_;
-				gint _tmp28_;
+#line 9094 "ImportPage.c"
+				gint _tmp27_;
+				CameraList* _tmp28_;
+				gint _tmp29_;
 				gchar* filename = NULL;
-				CameraList* _tmp29_;
-				gint _tmp30_;
-				const gchar* _tmp31_ = NULL;
-				int _tmp32_;
-				gchar* _tmp33_;
-				int _tmp34_;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!_tmp24_) {
-#line 8771 "ImportPage.c"
-					gint _tmp25_;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp25_ = ctr;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					ctr = _tmp25_ + 1;
-#line 8777 "ImportPage.c"
+				CameraList* _tmp30_;
+				gint _tmp31_;
+				const gchar* _tmp32_ = NULL;
+				int _tmp33_;
+				gchar* _tmp34_;
+				int _tmp35_;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (!_tmp25_) {
+#line 9107 "ImportPage.c"
+					gint _tmp26_;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp26_ = ctr;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					ctr = _tmp26_ + 1;
+#line 9113 "ImportPage.c"
 				}
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp24_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp26_ = ctr;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp27_ = files;
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp28_ = gp_list_count (_tmp27_);
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!(_tmp26_ < _tmp28_)) {
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp25_ = FALSE;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp27_ = ctr;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp28_ = files;
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp29_ = gp_list_count (_tmp28_);
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (!(_tmp27_ < _tmp29_)) {
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 8791 "ImportPage.c"
+#line 9127 "ImportPage.c"
 				}
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp29_ = files;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp30_ = ctr;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp32_ = gp_list_get_name (_tmp29_, _tmp30_, &_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp30_ = files;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp31_ = ctr;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp33_ = gp_list_get_name (_tmp30_, _tmp31_, &_tmp32_);
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp33_ = g_strdup (_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				filename = _tmp33_;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				self->priv->refresh_result = _tmp32_;
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp34_ = self->priv->refresh_result;
-#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp34_ != GP_OK) {
-#line 8811 "ImportPage.c"
-					gint _tmp35_;
-					const gchar* _tmp36_;
-					int _tmp37_;
-					gchar* _tmp38_;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp34_ = g_strdup (_tmp32_);
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				filename = _tmp34_;
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				self->priv->refresh_result = _tmp33_;
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp35_ = self->priv->refresh_result;
+#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (_tmp35_ != GP_OK) {
+#line 9147 "ImportPage.c"
+					gint _tmp36_;
+					const gchar* _tmp37_;
+					int _tmp38_;
 					gchar* _tmp39_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp35_ = ctr;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp36_ = fulldir;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp37_ = self->priv->refresh_result;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp38_ = gp_result_to_full_string (_tmp37_);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp39_ = _tmp38_;
-#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 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					gchar* _tmp40_;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp36_ = ctr;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp37_ = fulldir;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp38_ = self->priv->refresh_result;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp39_ = gp_result_to_full_string (_tmp38_);
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp40_ = _tmp39_;
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1415: Unable to get the name of file %d in %s: %s", _tmp36_, _tmp37_, _tmp40_);
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp40_);
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 8841 "ImportPage.c"
+#line 9177 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
-					gboolean _tmp40_ = FALSE;
-					GPSpinIdleWrapper* _tmp41_;
-					GPContext* _tmp42_;
-					Camera* _tmp43_;
-					const gchar* _tmp44_;
+					gboolean _tmp41_ = FALSE;
+					GPSpinIdleWrapper* _tmp42_;
+					GPContext* _tmp43_;
+					Camera* _tmp44_;
 					const gchar* _tmp45_;
-					CameraFileInfo _tmp46_ = {0};
-					gboolean _tmp47_;
-					CameraFileInfo _tmp50_;
-					CameraFileInfoFile _tmp51_;
-					CameraFileInfoFields _tmp52_;
-					const gchar* _tmp58_;
-					gboolean _tmp59_;
-					GtkProgressBar* _tmp102_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp41_ = import_page_spin_idle_context;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp43_ = self->priv->camera;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp44_ = fulldir;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp45_ = filename;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp47_ = gp_get_info (_tmp42_, _tmp43_, _tmp44_, _tmp45_, &_tmp46_, &_inner_error_);
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					const gchar* _tmp46_;
+					CameraFileInfo _tmp47_ = {0};
+					gboolean _tmp48_;
+					CameraFileInfo _tmp51_;
+					CameraFileInfoFile _tmp52_;
+					CameraFileInfoFields _tmp53_;
+					const gchar* _tmp59_;
+					gboolean _tmp60_;
+					GtkProgressBar* _tmp103_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp42_ = import_page_spin_idle_context;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp44_ = self->priv->camera;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp45_ = fulldir;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp46_ = filename;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp48_ = gp_get_info (_tmp43_, _tmp44_, _tmp45_, _tmp46_, &_tmp47_, &_inner_error_);
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					info = _tmp46_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp40_ = _tmp47_;
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					info = _tmp47_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp41_ = _tmp48_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 8881 "ImportPage.c"
-						goto __catch68_g_error;
+#line 9217 "ImportPage.c"
+						goto __catch76_g_error;
 					}
-#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (!_tmp40_) {
-#line 8886 "ImportPage.c"
-						const gchar* _tmp48_;
+#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (!_tmp41_) {
+#line 9222 "ImportPage.c"
 						const gchar* _tmp49_;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp48_ = fulldir;
-#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp49_ = filename;
-#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"
+						const gchar* _tmp50_;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp49_ = fulldir;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp50_ = filename;
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_warning ("ImportPage.vala:1424: Skipping import of %s/%s: name too long", _tmp49_, _tmp50_);
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1398 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1426 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8901 "ImportPage.c"
+#line 9237 "ImportPage.c"
 					}
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp50_ = info;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp51_ = _tmp50_.file;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp52_ = _tmp51_.fields;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 8911 "ImportPage.c"
-						const gchar* _tmp53_;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp51_ = info;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp52_ = _tmp51_.file;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp53_ = _tmp52_.fields;
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if ((_tmp53_ & GP_FILE_INFO_TYPE) == 0) {
+#line 9247 "ImportPage.c"
 						const gchar* _tmp54_;
-						CameraFileInfo _tmp55_;
-						CameraFileInfoFile _tmp56_;
-						CameraFileInfoFields _tmp57_;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp53_ = fulldir;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp54_ = filename;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp55_ = info;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp56_ = _tmp55_.file;
-#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp57_ = _tmp56_.fields;
-#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"
+						const gchar* _tmp55_;
+						CameraFileInfo _tmp56_;
+						CameraFileInfoFile _tmp57_;
+						CameraFileInfoFields _tmp58_;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp54_ = fulldir;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp55_ = filename;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp56_ = info;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp57_ = _tmp56_.file;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp58_ = _tmp57_.fields;
+#line 1430 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_message ("ImportPage.vala:1430: Skipping %s/%s: No file (file=%02Xh)", _tmp54_, _tmp55_, (guint) _tmp58_);
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8935 "ImportPage.c"
+#line 9271 "ImportPage.c"
 					}
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp58_ = filename;
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					if (_tmp59_) {
-#line 8943 "ImportPage.c"
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp59_ = filename;
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp60_ = video_reader_is_supported_video_filename (_tmp59_);
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					if (_tmp60_) {
+#line 9279 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
-						const gchar* _tmp60_;
-						Camera* _tmp61_;
-						gint _tmp62_;
-						const gchar* _tmp63_;
+						const gchar* _tmp61_;
+						Camera* _tmp62_;
+						gint _tmp63_;
 						const gchar* _tmp64_;
-						CameraFileInfo _tmp65_;
-						CameraFileInfoFile _tmp66_;
-						gulong _tmp67_;
-						CameraFileInfo _tmp68_;
-						CameraFileInfoFile _tmp69_;
-						time_t _tmp70_;
-						VideoImportSource* _tmp71_;
-						GeeArrayList* _tmp72_;
-						VideoImportSource* _tmp73_;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp60_ = self->priv->camera_name;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp61_ = self->priv->camera;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp62_ = fsid;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp63_ = dir;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp64_ = filename;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp65_ = info;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp66_ = _tmp65_.file;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp67_ = _tmp66_.size;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp68_ = info;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp69_ = _tmp68_.file;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp70_ = _tmp69_.mtime;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp71_ = video_import_source_new (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp67_, _tmp70_);
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						video_source = _tmp71_;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp72_ = import_list;
-#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp73_ = video_source;
-#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 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						const gchar* _tmp65_;
+						CameraFileInfo _tmp66_;
+						CameraFileInfoFile _tmp67_;
+						gulong _tmp68_;
+						CameraFileInfo _tmp69_;
+						CameraFileInfoFile _tmp70_;
+						time_t _tmp71_;
+						VideoImportSource* _tmp72_;
+						GeeArrayList* _tmp73_;
+						VideoImportSource* _tmp74_;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp61_ = self->priv->camera_name;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp62_ = self->priv->camera;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp63_ = fsid;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp64_ = dir;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp65_ = filename;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp66_ = info;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp67_ = _tmp66_.file;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp68_ = _tmp67_.size;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp69_ = info;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp70_ = _tmp69_.file;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp71_ = _tmp70_.mtime;
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp72_ = video_import_source_new (_tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp65_, _tmp68_, _tmp71_);
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						video_source = _tmp72_;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp73_ = import_list;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp74_ = video_source;
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (video_source);
-#line 8993 "ImportPage.c"
+#line 9329 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
-						CameraFileInfo _tmp74_;
-						CameraFileInfoFile _tmp75_;
-						const gchar* _tmp76_;
-						PhotoFileFormat _tmp77_;
+						CameraFileInfo _tmp75_;
+						CameraFileInfoFile _tmp76_;
+						const gchar* _tmp77_;
 						PhotoFileFormat _tmp78_;
-						GeeArrayList* _tmp87_;
-						const gchar* _tmp88_;
-						Camera* _tmp89_;
-						gint _tmp90_;
-						const gchar* _tmp91_;
+						PhotoFileFormat _tmp79_;
+						GeeArrayList* _tmp88_;
+						const gchar* _tmp89_;
+						Camera* _tmp90_;
+						gint _tmp91_;
 						const gchar* _tmp92_;
-						CameraFileInfo _tmp93_;
-						CameraFileInfoFile _tmp94_;
-						gulong _tmp95_;
-						CameraFileInfo _tmp96_;
-						CameraFileInfoFile _tmp97_;
-						time_t _tmp98_;
-						PhotoFileFormat _tmp99_;
-						PhotoImportSource* _tmp100_;
+						const gchar* _tmp93_;
+						CameraFileInfo _tmp94_;
+						CameraFileInfoFile _tmp95_;
+						gulong _tmp96_;
+						CameraFileInfo _tmp97_;
+						CameraFileInfoFile _tmp98_;
+						time_t _tmp99_;
+						PhotoFileFormat _tmp100_;
 						PhotoImportSource* _tmp101_;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp74_ = info;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp75_ = _tmp74_.file;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp76_ = _tmp75_.type;
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp77_ = photo_file_format_from_gphoto_type (_tmp76_);
-#line 1414 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						file_format = _tmp77_;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp78_ = file_format;
-#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9030 "ImportPage.c"
-							const gchar* _tmp79_;
-							PhotoFileFormat _tmp80_;
+						PhotoImportSource* _tmp102_;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp75_ = info;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp76_ = _tmp75_.file;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp77_ = _tmp76_.type;
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp78_ = photo_file_format_from_gphoto_type (_tmp77_);
+#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						file_format = _tmp78_;
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp79_ = file_format;
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						if (_tmp79_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9366 "ImportPage.c"
+							const gchar* _tmp80_;
 							PhotoFileFormat _tmp81_;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							_tmp79_ = filename;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							_tmp80_ = photo_file_format_get_by_basename_extension (_tmp79_);
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							file_format = _tmp80_;
-#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							_tmp81_ = file_format;
-#line 1417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9044 "ImportPage.c"
-								const gchar* _tmp82_;
+							PhotoFileFormat _tmp82_;
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							_tmp80_ = filename;
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							_tmp81_ = photo_file_format_get_by_basename_extension (_tmp80_);
+#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							file_format = _tmp81_;
+#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							_tmp82_ = file_format;
+#line 1445 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							if (_tmp82_ == PHOTO_FILE_FORMAT_UNKNOWN) {
+#line 9380 "ImportPage.c"
 								const gchar* _tmp83_;
-								CameraFileInfo _tmp84_;
-								CameraFileInfoFile _tmp85_;
-								const gchar* _tmp86_;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								_tmp82_ = fulldir;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								_tmp83_ = filename;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								_tmp84_ = info;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								_tmp85_ = _tmp84_.file;
-#line 1418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								_tmp86_ = _tmp85_.type;
-#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 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								const gchar* _tmp84_;
+								CameraFileInfo _tmp85_;
+								CameraFileInfoFile _tmp86_;
+								const gchar* _tmp87_;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								_tmp83_ = fulldir;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								_tmp84_ = filename;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								_tmp85_ = info;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								_tmp86_ = _tmp85_.file;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								_tmp87_ = _tmp86_.type;
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								g_message ("ImportPage.vala:1446: Skipping %s/%s: Not a supported file extension (" \
+"%s)", _tmp83_, _tmp84_, _tmp87_);
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								 (info);
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_g_free0 (filename);
-#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								continue;
-#line 9068 "ImportPage.c"
+#line 9404 "ImportPage.c"
 							}
 						}
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp87_ = import_list;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp88_ = self->priv->camera_name;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp89_ = self->priv->camera;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp90_ = fsid;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp91_ = dir;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp92_ = filename;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp93_ = info;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp94_ = _tmp93_.file;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp95_ = _tmp94_.size;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp96_ = info;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp97_ = _tmp96_.file;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp98_ = _tmp97_.mtime;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp99_ = file_format;
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp100_ = photo_import_source_new (_tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp95_, _tmp98_, _tmp99_);
-#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_tmp101_ = _tmp100_;
-#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 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						_g_object_unref0 (_tmp101_);
-#line 9105 "ImportPage.c"
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp88_ = import_list;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp89_ = self->priv->camera_name;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp90_ = self->priv->camera;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp91_ = fsid;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp92_ = dir;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp93_ = filename;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp94_ = info;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp95_ = _tmp94_.file;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp96_ = _tmp95_.size;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp97_ = info;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp98_ = _tmp97_.file;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp99_ = _tmp98_.mtime;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp100_ = file_format;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp101_ = photo_import_source_new (_tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp93_, _tmp96_, _tmp99_, _tmp100_);
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_tmp102_ = _tmp101_;
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1452 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						_g_object_unref0 (_tmp102_);
+#line 9441 "ImportPage.c"
 					}
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp102_ = self->priv->progress_bar;
-#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					gtk_progress_bar_pulse (_tmp102_);
-#line 1431 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp103_ = self->priv->progress_bar;
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					gtk_progress_bar_pulse (_tmp103_);
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					spin_event_loop ();
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 9115 "ImportPage.c"
+#line 9451 "ImportPage.c"
 				}
-				goto __finally68;
-				__catch68_g_error:
+				goto __finally76;
+				__catch76_g_error:
 				{
 					GError* err = NULL;
-					const gchar* _tmp103_;
-					GError* _tmp104_;
-					const gchar* _tmp105_;
-					GError* _tmp106_;
-					const gchar* _tmp107_;
-					gchar* _tmp108_;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					const gchar* _tmp104_;
+					GError* _tmp105_;
+					const gchar* _tmp106_;
+					GError* _tmp107_;
+					const gchar* _tmp108_;
+					gchar* _tmp109_;
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp103_ = fulldir;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp104_ = err;
-#line 1433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp105_ = _tmp104_->message;
-#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 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp107_ = _tmp106_->message;
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp108_ = g_strdup (_tmp107_);
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp104_ = fulldir;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp105_ = err;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp106_ = _tmp105_->message;
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1461: Error while enumerating files in %s: %s", _tmp104_, _tmp106_);
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp107_ = err;
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp108_ = _tmp107_->message;
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp109_ = g_strdup (_tmp108_);
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (self->priv->refresh_error);
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					self->priv->refresh_error = _tmp108_;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					self->priv->refresh_error = _tmp109_;
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9161 "ImportPage.c"
+#line 9497 "ImportPage.c"
 				}
-				__finally68:
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally76:
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9166 "ImportPage.c"
-					gboolean _tmp109_ = FALSE;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 9502 "ImportPage.c"
+					gboolean _tmp110_ = FALSE;
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/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 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					return _tmp109_;
-#line 9180 "ImportPage.c"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					return _tmp110_;
+#line 9516 "ImportPage.c"
 				}
-#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9184 "ImportPage.c"
+#line 9520 "ImportPage.c"
 			}
 		}
 	}
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp111_ = gp_list_new (&_tmp110_);
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp112_ = gp_list_new (&_tmp111_);
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	folders = _tmp110_;
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp111_;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp112_ = self->priv->refresh_result;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp112_ != GP_OK) {
-#line 9200 "ImportPage.c"
-		int _tmp113_;
-		gchar* _tmp114_;
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	folders = _tmp111_;
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self->priv->refresh_result = _tmp112_;
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp113_ = self->priv->refresh_result;
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp113_ != GP_OK) {
+#line 9536 "ImportPage.c"
+		int _tmp114_;
 		gchar* _tmp115_;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp113_ = self->priv->refresh_result;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp114_ = gp_result_to_full_string (_tmp113_);
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp115_ = _tmp114_;
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1444: Unable to create folder list: %s", _tmp115_);
-#line 1444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp115_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gchar* _tmp116_;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp114_ = self->priv->refresh_result;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp115_ = gp_result_to_full_string (_tmp114_);
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp116_ = _tmp115_;
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1472: Unable to create folder list: %s", _tmp116_);
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_free0 (_tmp116_);
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9224 "ImportPage.c"
+#line 9560 "ImportPage.c"
 	}
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp116_ = self->priv->camera;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp117_ = fulldir;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp118_ = folders;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp119_ = import_page_spin_idle_context;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp120_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp121_ = gp_camera_folder_list_folders (_tmp116_, _tmp117_, _tmp118_, _tmp120_);
-#line 1449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self->priv->refresh_result = _tmp121_;
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp122_ = self->priv->refresh_result;
-#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp122_ != GP_OK) {
-#line 9244 "ImportPage.c"
-		const gchar* _tmp123_;
-		int _tmp124_;
-		gchar* _tmp125_;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp117_ = self->priv->camera;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp118_ = fulldir;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp119_ = folders;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp120_ = import_page_spin_idle_context;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp121_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp122_ = gp_camera_folder_list_folders (_tmp117_, _tmp118_, _tmp119_, _tmp121_);
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self->priv->refresh_result = _tmp122_;
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp123_ = self->priv->refresh_result;
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp123_ != GP_OK) {
+#line 9580 "ImportPage.c"
+		const gchar* _tmp124_;
+		int _tmp125_;
 		gchar* _tmp126_;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp123_ = fulldir;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp124_ = self->priv->refresh_result;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp125_ = gp_result_to_full_string (_tmp124_);
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp126_ = _tmp125_;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1451: Unable to list folders in %s: %s", _tmp123_, _tmp126_);
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_free0 (_tmp126_);
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		gchar* _tmp127_;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp124_ = fulldir;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp125_ = self->priv->refresh_result;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp126_ = gp_result_to_full_string (_tmp125_);
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_tmp127_ = _tmp126_;
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1479: Unable to list folders in %s: %s", _tmp124_, _tmp127_);
+#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_free0 (_tmp127_);
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9273 "ImportPage.c"
+#line 9609 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9279 "ImportPage.c"
+#line 9615 "ImportPage.c"
 		{
-			gboolean _tmp127_ = FALSE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp127_ = TRUE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			gboolean _tmp128_ = FALSE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp128_ = TRUE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9286 "ImportPage.c"
-				gint _tmp129_;
-				CameraList* _tmp130_;
-				gint _tmp131_;
+#line 9622 "ImportPage.c"
+				gint _tmp130_;
+				CameraList* _tmp131_;
+				gint _tmp132_;
 				gchar* subdir = NULL;
-				CameraList* _tmp132_;
-				gint _tmp133_;
-				const gchar* _tmp134_ = NULL;
-				int _tmp135_;
-				gchar* _tmp136_;
-				int _tmp137_;
-				gint _tmp142_;
-				const gchar* _tmp143_;
+				CameraList* _tmp133_;
+				gint _tmp134_;
+				const gchar* _tmp135_ = NULL;
+				int _tmp136_;
+				gchar* _tmp137_;
+				int _tmp138_;
+				gint _tmp143_;
 				const gchar* _tmp144_;
-				gchar* _tmp145_;
+				const gchar* _tmp145_;
 				gchar* _tmp146_;
-				GeeArrayList* _tmp147_;
-				gboolean _tmp148_;
+				gchar* _tmp147_;
+				GeeArrayList* _tmp148_;
 				gboolean _tmp149_;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!_tmp127_) {
-#line 9307 "ImportPage.c"
-					gint _tmp128_;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp128_ = ctr;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					ctr = _tmp128_ + 1;
-#line 9313 "ImportPage.c"
+				gboolean _tmp150_;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (!_tmp128_) {
+#line 9643 "ImportPage.c"
+					gint _tmp129_;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp129_ = ctr;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					ctr = _tmp129_ + 1;
+#line 9649 "ImportPage.c"
 				}
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp127_ = FALSE;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp129_ = ctr;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp130_ = folders;
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp131_ = gp_list_count (_tmp130_);
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!(_tmp129_ < _tmp131_)) {
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp128_ = FALSE;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp130_ = ctr;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp131_ = folders;
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp132_ = gp_list_count (_tmp131_);
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (!(_tmp130_ < _tmp132_)) {
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9327 "ImportPage.c"
+#line 9663 "ImportPage.c"
 				}
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp132_ = folders;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp133_ = ctr;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp135_ = gp_list_get_name (_tmp132_, _tmp133_, &_tmp134_);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp133_ = folders;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp134_ = ctr;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp136_ = gp_list_get_name (_tmp133_, _tmp134_, &_tmp135_);
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp136_ = g_strdup (_tmp134_);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				subdir = _tmp136_;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				self->priv->refresh_result = _tmp135_;
-#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp137_ = self->priv->refresh_result;
-#line 1462 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp137_ != GP_OK) {
-#line 9347 "ImportPage.c"
-					gint _tmp138_;
-					int _tmp139_;
-					gchar* _tmp140_;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp137_ = g_strdup (_tmp135_);
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				subdir = _tmp137_;
+#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				self->priv->refresh_result = _tmp136_;
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp138_ = self->priv->refresh_result;
+#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (_tmp138_ != GP_OK) {
+#line 9683 "ImportPage.c"
+					gint _tmp139_;
+					int _tmp140_;
 					gchar* _tmp141_;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp138_ = ctr;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp139_ = self->priv->refresh_result;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp140_ = gp_result_to_full_string (_tmp139_);
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp141_ = _tmp140_;
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1463: Unable to get name of folder %d: %s", _tmp138_, _tmp141_);
-#line 1463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp141_);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					gchar* _tmp142_;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp139_ = ctr;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp140_ = self->priv->refresh_result;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp141_ = gp_result_to_full_string (_tmp140_);
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp142_ = _tmp141_;
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1491: Unable to get name of folder %d: %s", _tmp139_, _tmp142_);
+#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp142_);
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9376 "ImportPage.c"
+#line 9712 "ImportPage.c"
 				}
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp142_ = fsid;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp143_ = dir;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp144_ = subdir;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp145_ = import_page_append_path (_tmp143_, _tmp144_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp146_ = _tmp145_;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp147_ = import_list;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp148_ = import_page_enumerate_files (self, _tmp142_, _tmp146_, _tmp147_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp149_ = !_tmp148_;
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_free0 (_tmp146_);
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp149_) {
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp143_ = fsid;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp144_ = dir;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp145_ = subdir;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp146_ = import_page_append_path (_tmp144_, _tmp145_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp147_ = _tmp146_;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp148_ = import_list;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp149_ = import_page_enumerate_files (self, _tmp143_, _tmp147_, _tmp148_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp150_ = !_tmp149_;
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (_tmp147_);
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (_tmp150_) {
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9410 "ImportPage.c"
+#line 9746 "ImportPage.c"
 				}
-#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9414 "ImportPage.c"
+#line 9750 "ImportPage.c"
 			}
 		}
 	}
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 9428 "ImportPage.c"
+#line 9764 "ImportPage.c"
 }
 
 
 static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) {
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9437 "ImportPage.c"
+#line 9773 "ImportPage.c"
 	{
 		gint i = 0;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9442 "ImportPage.c"
+#line 9778 "ImportPage.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp0_ = TRUE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9449 "ImportPage.c"
+#line 9785 "ImportPage.c"
 				gint _tmp2_;
 				GeeArrayList* _tmp3_;
 				gint _tmp4_;
@@ -9474,162 +9810,162 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				PhotoImportSource* _tmp29_;
 				gboolean _tmp30_ = FALSE;
 				PhotoImportSource* _tmp31_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9475 "ImportPage.c"
+#line 9811 "ImportPage.c"
 					gint _tmp1_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp1_ = i;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					i = _tmp1_ + 1;
-#line 9481 "ImportPage.c"
+#line 9817 "ImportPage.c"
 				}
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp2_ = i;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp3_ = import_list;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp5_ = _tmp4_;
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp2_ < _tmp5_)) {
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9497 "ImportPage.c"
+#line 9833 "ImportPage.c"
 				}
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp7_ = i;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/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 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = (ImportSource*) _tmp8_;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp10_ == NULL) {
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp9_);
-#line 9513 "ImportPage.c"
+#line 9849 "ImportPage.c"
 				}
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = i;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp13_ = import_list;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = _tmp14_;
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9527 "ImportPage.c"
+#line 9863 "ImportPage.c"
 					GeeArrayList* _tmp16_;
 					gint _tmp17_;
 					gpointer _tmp18_;
 					ImportSource* _tmp19_;
 					PhotoImportSource* _tmp20_;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = import_list;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp17_ = i;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/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 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp19_ = (ImportSource*) _tmp18_;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL;
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp20_ == NULL) {
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp19_);
-#line 9547 "ImportPage.c"
+#line 9883 "ImportPage.c"
 					}
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = _tmp20_;
-#line 9553 "ImportPage.c"
+#line 9889 "ImportPage.c"
 				} else {
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = NULL;
-#line 9559 "ImportPage.c"
+#line 9895 "ImportPage.c"
 				}
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
-#line 1479 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				next = _tmp21_;
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = i;
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp23_ > 0) {
-#line 9569 "ImportPage.c"
+#line 9905 "ImportPage.c"
 					GeeArrayList* _tmp24_;
 					gint _tmp25_;
 					gpointer _tmp26_;
 					ImportSource* _tmp27_;
 					PhotoImportSource* _tmp28_;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = import_list;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = i;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/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 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = (ImportSource*) _tmp26_;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp28_ == NULL) {
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp27_);
-#line 9589 "ImportPage.c"
+#line 9925 "ImportPage.c"
 					}
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = _tmp28_;
-#line 9595 "ImportPage.c"
+#line 9931 "ImportPage.c"
 				} else {
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = NULL;
-#line 9601 "ImportPage.c"
+#line 9937 "ImportPage.c"
 				}
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				prev = _tmp29_;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = current;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_ != NULL) {
-#line 9611 "ImportPage.c"
+#line 9947 "ImportPage.c"
 					PhotoImportSource* _tmp32_;
 					PhotoFileFormat _tmp33_;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = current;
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = photo_import_source_get_file_format (_tmp32_);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9620 "ImportPage.c"
+#line 9956 "ImportPage.c"
 				} else {
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9624 "ImportPage.c"
+#line 9960 "ImportPage.c"
 				}
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9628 "ImportPage.c"
+#line 9964 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
 					PhotoImportSource* _tmp34_;
@@ -9643,48 +9979,48 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					gboolean _tmp52_ = FALSE;
 					PhotoImportSource* _tmp53_;
 					PhotoImportSource* _tmp65_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = current;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = _tmp35_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					current_name = _tmp37_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ext = _tmp38_;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp36_);
-#line 1489 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					associated = NULL;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = next;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_ != NULL) {
-#line 9666 "ImportPage.c"
+#line 10002 "ImportPage.c"
 						PhotoImportSource* _tmp41_;
 						PhotoFileFormat _tmp42_;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = next;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = photo_import_source_get_file_format (_tmp41_);
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9675 "ImportPage.c"
+#line 10011 "ImportPage.c"
 					} else {
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9679 "ImportPage.c"
+#line 10015 "ImportPage.c"
 					}
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9683 "ImportPage.c"
+#line 10019 "ImportPage.c"
 						gchar* next_name = NULL;
 						PhotoImportSource* _tmp43_;
 						gchar* _tmp44_;
@@ -9693,69 +10029,69 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						gchar* _tmp47_ = NULL;
 						const gchar* _tmp48_;
 						const gchar* _tmp49_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp43_ = next;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp45_ = _tmp44_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						next_name = _tmp46_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp47_;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp45_);
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = next_name;
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = current_name;
-#line 1493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9716 "ImportPage.c"
+#line 10052 "ImportPage.c"
 							PhotoImportSource* _tmp50_;
 							PhotoImportSource* _tmp51_;
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp50_ = next;
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp51_ = _g_object_ref0 (_tmp50_);
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp51_;
-#line 9727 "ImportPage.c"
+#line 10063 "ImportPage.c"
 						}
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9731 "ImportPage.c"
+#line 10067 "ImportPage.c"
 					}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = prev;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp53_ != NULL) {
-#line 9737 "ImportPage.c"
+#line 10073 "ImportPage.c"
 						PhotoImportSource* _tmp54_;
 						PhotoFileFormat _tmp55_;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = prev;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = photo_import_source_get_file_format (_tmp54_);
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9746 "ImportPage.c"
+#line 10082 "ImportPage.c"
 					} else {
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9750 "ImportPage.c"
+#line 10086 "ImportPage.c"
 					}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9754 "ImportPage.c"
+#line 10090 "ImportPage.c"
 						gchar* prev_name = NULL;
 						PhotoImportSource* _tmp56_;
 						gchar* _tmp57_;
@@ -9764,52 +10100,52 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						gchar* _tmp60_ = NULL;
 						const gchar* _tmp61_;
 						const gchar* _tmp62_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = prev;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp58_ = _tmp57_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						prev_name = _tmp59_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp60_;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp58_);
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = prev_name;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = current_name;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9787 "ImportPage.c"
+#line 10123 "ImportPage.c"
 							PhotoImportSource* _tmp63_;
 							PhotoImportSource* _tmp64_;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp63_ = prev;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp64_;
-#line 9798 "ImportPage.c"
+#line 10134 "ImportPage.c"
 						}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9802 "ImportPage.c"
+#line 10138 "ImportPage.c"
 					}
-#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
-#line 1504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp65_ != NULL) {
-#line 9808 "ImportPage.c"
+#line 10144 "ImportPage.c"
 						PhotoImportSource* _tmp66_;
 						gchar* _tmp67_;
 						gchar* _tmp68_;
@@ -9821,68 +10157,68 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						GeeArrayList* _tmp74_;
 						PhotoImportSource* _tmp75_;
 						gboolean _tmp76_;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = current;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = _tmp67_;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = associated;
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp71_ = _tmp70_;
-#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"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_debug ("ImportPage.vala:1533: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp71_);
-#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp68_);
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = current;
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = associated;
-#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						photo_import_source_set_associated (_tmp72_, _tmp73_);
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = import_list;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp75_ = associated;
-#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/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 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp76_) {
-#line 9852 "ImportPage.c"
+#line 10188 "ImportPage.c"
 							PhotoImportSource* _tmp77_;
-#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"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							g_debug ("ImportPage.vala:1536: Unable to associate files");
+#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp77_ = current;
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9860 "ImportPage.c"
+#line 10196 "ImportPage.c"
 						}
 					}
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 9869 "ImportPage.c"
+#line 10205 "ImportPage.c"
 				}
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp22_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (next);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (current);
-#line 9881 "ImportPage.c"
+#line 10217 "ImportPage.c"
 			}
 		}
 	}
@@ -9892,13 +10228,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 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_LIST (import_list));
-#line 1517 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	loaded_photos = 0;
-#line 9897 "ImportPage.c"
+#line 10233 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
 		GeeList* _tmp0_;
@@ -9908,25 +10244,25 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 		gint _tmp3_;
 		gint _tmp4_;
 		gint _import_source_index = 0;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = import_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_list = _tmp1_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _import_source_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_size = _tmp4_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_index = -1;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 9925 "ImportPage.c"
+#line 10261 "ImportPage.c"
 			gint _tmp5_;
 			gint _tmp6_;
 			gint _tmp7_;
@@ -9956,161 +10292,154 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			gboolean _tmp34_;
 			gchar* exif_only_md5 = NULL;
 			PhotoMetadata* _tmp47_;
-			guint8* preview_raw = NULL;
-			gint preview_raw_length1;
-			gint _preview_raw_size_;
-			gsize preview_raw_length = 0UL;
 			GdkPixbuf* preview = NULL;
 			gchar* preview_md5 = NULL;
-			gboolean _tmp83_ = FALSE;
-			gboolean _tmp84_ = FALSE;
-			GdkPixbuf* _tmp85_;
-			ImportSource* _tmp91_;
-			ImportSource* _tmp94_;
-			PhotoImportSource* _tmp100_;
-			SourceCollection* _tmp124_;
-			ImportSource* _tmp125_;
-			GtkProgressBar* _tmp126_;
-			gint _tmp127_;
-			gint _tmp128_;
-			GeeList* _tmp129_;
-			gint _tmp130_;
-			gint _tmp131_;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			ImportSource* _tmp74_;
+			ImportSource* _tmp77_;
+			PhotoImportSource* _tmp83_;
+			SourceCollection* _tmp107_;
+			ImportSource* _tmp108_;
+			GtkProgressBar* _tmp109_;
+			gint _tmp110_;
+			gint _tmp111_;
+			GeeList* _tmp112_;
+			gint _tmp113_;
+			gint _tmp114_;
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_source_index = _tmp5_ + 1;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _import_source_size;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp6_ < _tmp7_)) {
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 9987 "ImportPage.c"
+#line 10316 "ImportPage.c"
 			}
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = _import_source_index;
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_source = (ImportSource*) _tmp10_;
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = import_source;
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp12_ = import_source_get_filename (_tmp11_);
-#line 1519 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			filename = _tmp12_;
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = import_source;
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = import_source_get_fulldir (_tmp13_);
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fulldir = _tmp14_;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = fulldir;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp15_ == NULL) {
-#line 10013 "ImportPage.c"
+#line 10342 "ImportPage.c"
 				ImportSource* _tmp16_;
 				gchar* _tmp17_;
 				gchar* _tmp18_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = import_source;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = _tmp17_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_warning ("ImportPage.vala:1522: Skipping loading preview of %s: invalid folder n" \
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_warning ("ImportPage.vala:1550: Skipping loading preview of %s: invalid folder n" \
 "ame", _tmp18_);
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp18_);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 10035 "ImportPage.c"
+#line 10364 "ImportPage.c"
 			}
-#line 1528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = import_source;
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10043 "ImportPage.c"
+#line 10372 "ImportPage.c"
 				ImportSource* _tmp21_;
 				PhotoImportSource* _tmp22_;
 				PhotoImportSource* _tmp23_;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = import_source;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/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 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = _tmp22_;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = _tmp23_ != NULL;
-#line 1530 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp23_);
-#line 10057 "ImportPage.c"
+#line 10386 "ImportPage.c"
 			} else {
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 10061 "ImportPage.c"
+#line 10390 "ImportPage.c"
 			}
-#line 1529 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 10065 "ImportPage.c"
+#line 10394 "ImportPage.c"
 				ImportSource* _tmp24_;
 				PhotoImportSource* _tmp25_;
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = import_source;
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/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 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1531 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				associated = _tmp25_;
-#line 10076 "ImportPage.c"
+#line 10405 "ImportPage.c"
 			}
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp27_ = self->priv->progress_bar;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp28_ = import_source;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp30_ = _tmp29_;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp31_ = g_strdup_printf (_ ("Fetching preview for %s"), _tmp30_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = _tmp31_;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_text (_tmp27_, _tmp32_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp32_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp30_);
-#line 1542 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			metadata = NULL;
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp33_ = filename;
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = video_reader_is_supported_video_filename (_tmp33_);
-#line 1543 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp34_) {
-#line 10108 "ImportPage.c"
+#line 10437 "ImportPage.c"
 				{
 					PhotoMetadata* _tmp35_ = NULL;
 					GPSpinIdleWrapper* _tmp36_;
@@ -10120,631 +10449,501 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					const gchar* _tmp40_;
 					PhotoMetadata* _tmp41_;
 					PhotoMetadata* _tmp42_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = import_page_spin_idle_context;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp38_ = self->priv->camera;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = fulldir;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = filename;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = gp_load_metadata (_tmp37_, _tmp38_, _tmp39_, _tmp40_, &_inner_error_);
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = _tmp41_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10134 "ImportPage.c"
-						goto __catch69_g_error;
+#line 10463 "ImportPage.c"
+						goto __catch77_g_error;
 					}
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp42_ = _tmp35_;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					metadata = _tmp42_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (_tmp35_);
-#line 10147 "ImportPage.c"
+#line 10476 "ImportPage.c"
 				}
-				goto __finally69;
-				__catch69_g_error:
+				goto __finally77;
+				__catch77_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp43_;
 					const gchar* _tmp44_;
 					GError* _tmp45_;
 					const gchar* _tmp46_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = fulldir;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = filename;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = err;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp46_ = _tmp45_->message;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1548: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1576: Unable to fetch metadata for %s/%s: %s", _tmp43_, _tmp44_, _tmp46_);
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10173 "ImportPage.c"
+#line 10502 "ImportPage.c"
 				}
-				__finally69:
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally77:
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/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 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10196 "ImportPage.c"
+#line 10525 "ImportPage.c"
 				}
 			}
-#line 1554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			exif_only_md5 = NULL;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp47_ = metadata;
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp47_ != NULL) {
-#line 10205 "ImportPage.c"
-				guint8* flattened_sans_thumbnail = NULL;
+#line 10534 "ImportPage.c"
 				PhotoMetadata* _tmp48_;
-				gint _tmp49_;
-				guint8* _tmp50_;
-				gint flattened_sans_thumbnail_length1;
-				gint _flattened_sans_thumbnail_size_;
-				gboolean _tmp51_ = FALSE;
-				guint8* _tmp52_;
-				gint _tmp52__length1;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				gchar* _tmp49_;
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp48_ = metadata;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp50_ = photo_metadata_flatten_exif (_tmp48_, FALSE, &_tmp49_);
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				flattened_sans_thumbnail = _tmp50_;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				flattened_sans_thumbnail_length1 = _tmp49_;
-#line 1556 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp52_ = flattened_sans_thumbnail;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp52__length1 = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp52_ != NULL) {
-#line 10231 "ImportPage.c"
-					guint8* _tmp53_;
-					gint _tmp53__length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp53_ = flattened_sans_thumbnail;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp53__length1 = flattened_sans_thumbnail_length1;
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp51_ = _tmp53__length1 > 0;
-#line 10240 "ImportPage.c"
-				} else {
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp51_ = FALSE;
-#line 10244 "ImportPage.c"
-				}
-#line 1557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp51_) {
-#line 10248 "ImportPage.c"
-					guint8* _tmp54_;
-					gint _tmp54__length1;
-					guint8* _tmp55_;
-					gint _tmp55__length1;
-					gchar* _tmp56_;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp54_ = flattened_sans_thumbnail;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp54__length1 = flattened_sans_thumbnail_length1;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp55_ = flattened_sans_thumbnail;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp56_ = md5_binary (_tmp54_, (gsize) _tmp55__length1);
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (exif_only_md5);
-#line 1558 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					exif_only_md5 = _tmp56_;
-#line 10268 "ImportPage.c"
-				}
-#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10272 "ImportPage.c"
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp49_ = photo_metadata_exif_hash (_tmp48_);
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (exif_only_md5);
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				exif_only_md5 = _tmp49_;
+#line 10545 "ImportPage.c"
 			}
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview_raw = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview_raw_length1 = 0;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_preview_raw_size_ = preview_raw_length1;
-#line 1568 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview_raw_length = (gsize) 0;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = NULL;
-#line 10284 "ImportPage.c"
+#line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			preview_md5 = NULL;
+#line 10551 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
-				const gchar* _tmp57_;
-				gchar* _tmp58_;
+				const gchar* _tmp50_;
+				gchar* _tmp51_;
 				gchar* preview_filename = NULL;
-				const gchar* _tmp59_;
-				gchar* _tmp60_;
-				PhotoImportSource* _tmp61_;
-				GdkPixbuf* _tmp66_ = NULL;
-				GPSpinIdleWrapper* _tmp67_;
-				GPContext* _tmp68_;
-				Camera* _tmp69_;
-				const gchar* _tmp70_;
-				const gchar* _tmp71_;
-				guint8* _tmp72_ = NULL;
-				gint _tmp73_;
-				gsize _tmp74_ = 0UL;
-				GdkPixbuf* _tmp75_;
-				GdkPixbuf* _tmp76_;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp57_ = fulldir;
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp58_ = g_strdup (_tmp57_);
-#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_fulldir = _tmp58_;
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp59_ = filename;
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp60_ = g_strdup (_tmp59_);
-#line 1572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_filename = _tmp60_;
-#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp61_ = associated;
-#line 1573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (_tmp61_ != NULL) {
-#line 10320 "ImportPage.c"
-					PhotoImportSource* _tmp62_;
-					gchar* _tmp63_;
-					PhotoImportSource* _tmp64_;
-					gchar* _tmp65_;
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp62_ = associated;
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp63_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				const gchar* _tmp52_;
+				gchar* _tmp53_;
+				PhotoImportSource* _tmp54_;
+				GdkPixbuf* _tmp59_ = NULL;
+				GPSpinIdleWrapper* _tmp60_;
+				GPContext* _tmp61_;
+				Camera* _tmp62_;
+				const gchar* _tmp63_;
+				const gchar* _tmp64_;
+				gchar* _tmp65_ = NULL;
+				GdkPixbuf* _tmp66_;
+				GdkPixbuf* _tmp67_;
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp50_ = fulldir;
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp51_ = g_strdup (_tmp50_);
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				preview_fulldir = _tmp51_;
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp52_ = filename;
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp53_ = g_strdup (_tmp52_);
+#line 1597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				preview_filename = _tmp53_;
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp54_ = associated;
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (_tmp54_ != NULL) {
+#line 10585 "ImportPage.c"
+					PhotoImportSource* _tmp55_;
+					gchar* _tmp56_;
+					PhotoImportSource* _tmp57_;
+					gchar* _tmp58_;
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp55_ = associated;
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp56_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 1574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					preview_fulldir = _tmp63_;
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp64_ = associated;
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp65_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					preview_fulldir = _tmp56_;
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp57_ = associated;
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp58_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					preview_filename = _tmp65_;
-#line 10341 "ImportPage.c"
+#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					preview_filename = _tmp58_;
+#line 10606 "ImportPage.c"
 				}
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp67_ = import_page_spin_idle_context;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp69_ = self->priv->camera;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp70_ = preview_fulldir;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp71_ = preview_filename;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp75_ = gp_load_preview (_tmp68_, _tmp69_, _tmp70_, _tmp71_, &_tmp72_, &_tmp73_, &_tmp74_, &_inner_error_);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw = (g_free (preview_raw), NULL);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw = _tmp72_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw_length1 = _tmp73_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_preview_raw_size_ = preview_raw_length1;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw_length = _tmp74_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp66_ = _tmp75_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp60_ = import_page_spin_idle_context;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp62_ = self->priv->camera;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp63_ = preview_fulldir;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp64_ = preview_filename;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp66_ = gp_load_preview (_tmp61_, _tmp62_, _tmp63_, _tmp64_, &_tmp65_, &_inner_error_);
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (preview_md5);
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				preview_md5 = _tmp65_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp59_ = _tmp66_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10373 "ImportPage.c"
-					goto __catch70_g_error;
+#line 10632 "ImportPage.c"
+					goto __catch78_g_error;
 				}
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp76_ = _tmp66_;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp66_ = NULL;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp67_ = _tmp59_;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp59_ = NULL;
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview = _tmp76_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (_tmp66_);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				preview = _tmp67_;
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_object_unref0 (_tmp59_);
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_filename);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10390 "ImportPage.c"
+#line 10649 "ImportPage.c"
 			}
-			goto __finally70;
-			__catch70_g_error:
+			goto __finally78;
+			__catch78_g_error:
 			{
 				GError* err = NULL;
-				const gchar* _tmp77_;
-				gboolean _tmp78_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				const gchar* _tmp68_;
+				gboolean _tmp69_;
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp77_ = filename;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp78_ = video_reader_is_supported_video_filename (_tmp77_);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				if (!_tmp78_) {
-#line 10408 "ImportPage.c"
-					const gchar* _tmp79_;
-					const gchar* _tmp80_;
-					GError* _tmp81_;
-					const gchar* _tmp82_;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp79_ = fulldir;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp80_ = filename;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp81_ = err;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp82_ = _tmp81_->message;
-#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1586: Unable to fetch preview for %s/%s: %s", _tmp79_, _tmp80_, _tmp82_);
-#line 10423 "ImportPage.c"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp68_ = filename;
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp69_ = video_reader_is_supported_video_filename (_tmp68_);
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				if (!_tmp69_) {
+#line 10667 "ImportPage.c"
+					const gchar* _tmp70_;
+					const gchar* _tmp71_;
+					GError* _tmp72_;
+					const gchar* _tmp73_;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp70_ = fulldir;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp71_ = filename;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp72_ = err;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp73_ = _tmp72_->message;
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1611: Unable to fetch preview for %s/%s: %s", _tmp70_, _tmp71_, _tmp73_);
+#line 10682 "ImportPage.c"
 				}
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10427 "ImportPage.c"
+#line 10686 "ImportPage.c"
 			}
-			__finally70:
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally78:
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_g_free0 (preview_md5);
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_raw = (g_free (preview_raw), NULL);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (exif_only_md5);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_media_metadata_unref0 (metadata);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_import_source_list);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/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 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 10456 "ImportPage.c"
+#line 10715 "ImportPage.c"
 			}
-#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview_md5 = NULL;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp85_ = preview;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp85_ != NULL) {
-#line 10464 "ImportPage.c"
-				guint8* _tmp86_;
-				gint _tmp86__length1;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp86_ = preview_raw;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp86__length1 = preview_raw_length1;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp84_ = _tmp86_ != NULL;
-#line 10473 "ImportPage.c"
-			} else {
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp84_ = FALSE;
-#line 10477 "ImportPage.c"
-			}
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp84_) {
-#line 10481 "ImportPage.c"
-				gsize _tmp87_;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp87_ = preview_raw_length;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp83_ = _tmp87_ > ((gsize) 0);
-#line 10487 "ImportPage.c"
-			} else {
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp83_ = FALSE;
-#line 10491 "ImportPage.c"
-			}
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp83_) {
-#line 10495 "ImportPage.c"
-				guint8* _tmp88_;
-				gint _tmp88__length1;
-				gsize _tmp89_;
-				gchar* _tmp90_;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp88_ = preview_raw;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp88__length1 = preview_raw_length1;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp89_ = preview_raw_length;
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp90_ = md5_binary (_tmp88_, _tmp89_);
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_free0 (preview_md5);
-#line 1593 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				preview_md5 = _tmp90_;
-#line 10512 "ImportPage.c"
-			}
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp91_ = import_source;
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10518 "ImportPage.c"
-				ImportSource* _tmp92_;
-				GdkPixbuf* _tmp93_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp92_ = import_source;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp93_ = preview;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp92_) : NULL, _tmp93_);
-#line 10527 "ImportPage.c"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp74_ = import_source;
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp74_, TYPE_VIDEO_IMPORT_SOURCE)) {
+#line 10721 "ImportPage.c"
+				ImportSource* _tmp75_;
+				GdkPixbuf* _tmp76_;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp75_ = import_source;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp76_ = preview;
+#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp75_) : NULL, _tmp76_);
+#line 10730 "ImportPage.c"
 			}
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp94_ = import_source;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp94_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10533 "ImportPage.c"
-				ImportSource* _tmp95_;
-				GdkPixbuf* _tmp96_;
-				const gchar* _tmp97_;
-				PhotoMetadata* _tmp98_;
-				const gchar* _tmp99_;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp95_ = import_source;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp96_ = preview;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp97_ = preview_md5;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp98_ = metadata;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp99_ = exif_only_md5;
-#line 1603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp95_) : NULL, _tmp96_, _tmp97_, _tmp98_, _tmp99_);
-#line 10551 "ImportPage.c"
+#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp77_ = import_source;
+#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, TYPE_PHOTO_IMPORT_SOURCE)) {
+#line 10736 "ImportPage.c"
+				ImportSource* _tmp78_;
+				GdkPixbuf* _tmp79_;
+				const gchar* _tmp80_;
+				PhotoMetadata* _tmp81_;
+				const gchar* _tmp82_;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp78_ = import_source;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp79_ = preview;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp80_ = preview_md5;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp81_ = metadata;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				_tmp82_ = exif_only_md5;
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp78_) : NULL, _tmp79_, _tmp80_, _tmp81_, _tmp82_);
+#line 10754 "ImportPage.c"
 			}
-#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp100_ = associated;
-#line 1606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (_tmp100_ != NULL) {
-#line 10557 "ImportPage.c"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp83_ = associated;
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			if (_tmp83_ != NULL) {
+#line 10760 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
-					GPSpinIdleWrapper* _tmp101_;
-					GPContext* _tmp102_;
-					Camera* _tmp103_;
-					PhotoImportSource* _tmp104_;
-					gchar* _tmp105_;
-					gchar* _tmp106_;
-					PhotoImportSource* _tmp107_;
-					gchar* _tmp108_;
-					gchar* _tmp109_;
-					PhotoMetadata* _tmp110_;
-					PhotoMetadata* _tmp111_;
-					PhotoImportSource* _tmp112_;
-					GdkPixbuf* _tmp113_;
-					const gchar* _tmp114_;
-					PhotoMetadata* _tmp115_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp101_ = import_page_spin_idle_context;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp102_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp103_ = self->priv->camera;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp104_ = associated;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp105_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp106_ = _tmp105_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp107_ = associated;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp108_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp109_ = _tmp108_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp110_ = gp_load_metadata (_tmp102_, _tmp103_, _tmp106_, _tmp109_, &_inner_error_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp111_ = _tmp110_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp109_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp106_);
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					associated_metadata = _tmp111_;
-#line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					GPSpinIdleWrapper* _tmp84_;
+					GPContext* _tmp85_;
+					Camera* _tmp86_;
+					PhotoImportSource* _tmp87_;
+					gchar* _tmp88_;
+					gchar* _tmp89_;
+					PhotoImportSource* _tmp90_;
+					gchar* _tmp91_;
+					gchar* _tmp92_;
+					PhotoMetadata* _tmp93_;
+					PhotoMetadata* _tmp94_;
+					PhotoImportSource* _tmp95_;
+					GdkPixbuf* _tmp96_;
+					const gchar* _tmp97_;
+					PhotoMetadata* _tmp98_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp84_ = import_page_spin_idle_context;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp85_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp86_ = self->priv->camera;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp87_ = associated;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp88_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp89_ = _tmp88_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp90_ = associated;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp91_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp92_ = _tmp91_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp93_ = gp_load_metadata (_tmp85_, _tmp86_, _tmp89_, _tmp92_, &_inner_error_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp94_ = _tmp93_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp92_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp89_);
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					associated_metadata = _tmp94_;
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10605 "ImportPage.c"
-						goto __catch71_g_error;
+#line 10808 "ImportPage.c"
+						goto __catch79_g_error;
 					}
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp112_ = associated;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp113_ = preview;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp114_ = preview_md5;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp115_ = associated_metadata;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					photo_import_source_update (_tmp112_, _tmp113_, _tmp114_, _tmp115_, NULL);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp95_ = associated;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp96_ = preview;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp97_ = preview_md5;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp98_ = associated_metadata;
+#line 1630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					photo_import_source_update (_tmp95_, _tmp96_, _tmp97_, _tmp98_, NULL);
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10620 "ImportPage.c"
+#line 10823 "ImportPage.c"
 				}
-				goto __finally71;
-				__catch71_g_error:
+				goto __finally79;
+				__catch79_g_error:
 				{
 					GError* err = NULL;
-					PhotoImportSource* _tmp116_;
-					gchar* _tmp117_;
-					gchar* _tmp118_;
-					PhotoImportSource* _tmp119_;
-					gchar* _tmp120_;
-					gchar* _tmp121_;
-					GError* _tmp122_;
-					const gchar* _tmp123_;
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					PhotoImportSource* _tmp99_;
+					gchar* _tmp100_;
+					gchar* _tmp101_;
+					PhotoImportSource* _tmp102_;
+					gchar* _tmp103_;
+					gchar* _tmp104_;
+					GError* _tmp105_;
+					const gchar* _tmp106_;
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp116_ = associated;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp117_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp118_ = _tmp117_;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp119_ = associated;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp120_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp121_ = _tmp120_;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp122_ = err;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_tmp123_ = _tmp122_->message;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1612: Unable to fetch metadata for %s/%s: %s", _tmp118_, _tmp121_, _tmp123_);
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp121_);
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					_g_free0 (_tmp118_);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp99_ = associated;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp100_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp101_ = _tmp100_;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp102_ = associated;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp103_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_IMPORT_SOURCE, ImportSource));
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp104_ = _tmp103_;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp105_ = err;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_tmp106_ = _tmp105_->message;
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1632: Unable to fetch metadata for %s/%s: %s", _tmp101_, _tmp104_, _tmp106_);
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp104_);
+#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					_g_free0 (_tmp101_);
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10662 "ImportPage.c"
+#line 10865 "ImportPage.c"
 				}
-				__finally71:
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally79:
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_md5);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (preview);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					preview_raw = (g_free (preview_raw), NULL);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/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 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10693 "ImportPage.c"
+#line 10894 "ImportPage.c"
 				}
 			}
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp124_ = self->priv->import_sources;
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp125_ = import_source;
-#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_OBJECT, DataObject));
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp126_ = self->priv->progress_bar;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp127_ = loaded_photos;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			loaded_photos = _tmp127_ + 1;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp128_ = loaded_photos;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp129_ = import_list;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp130_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp131_ = _tmp130_;
-#line 1620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			gtk_progress_bar_set_fraction (_tmp126_, ((gdouble) _tmp128_) / ((gdouble) _tmp131_));
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp107_ = self->priv->import_sources;
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp108_ = import_source;
+#line 1638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_DATA_OBJECT, DataObject));
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp109_ = self->priv->progress_bar;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp110_ = loaded_photos;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			loaded_photos = _tmp110_ + 1;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp111_ = loaded_photos;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp112_ = import_list;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp113_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			_tmp114_ = _tmp113_;
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			gtk_progress_bar_set_fraction (_tmp109_, ((gdouble) _tmp111_) / ((gdouble) _tmp114_));
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			spin_event_loop ();
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (preview_md5);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			preview_raw = (g_free (preview_raw), NULL);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (exif_only_md5);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (metadata);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (associated);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (fulldir);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (filename);
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_source);
-#line 10738 "ImportPage.c"
+#line 10937 "ImportPage.c"
 		}
-#line 1518 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10742 "ImportPage.c"
+#line 10941 "ImportPage.c"
 	}
 }
 
@@ -10756,58 +10955,58 @@ static void import_page_on_hide_imported (ImportPage* self) {
 	ConfigFacade* _tmp9_;
 	GtkCheckButton* _tmp10_;
 	gboolean _tmp11_;
-#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/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 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 10762 "ImportPage.c"
+#line 10961 "ImportPage.c"
 		ViewCollection* _tmp2_;
 		ViewCollection* _tmp3_;
 		ImportPageHideImportedViewFilter* _tmp4_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->hide_imported_filter;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/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 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 10776 "ImportPage.c"
+#line 10975 "ImportPage.c"
 	} else {
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
 		ImportPageHideImportedViewFilter* _tmp7_;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->hide_imported_filter;
-#line 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/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 1635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 10791 "ImportPage.c"
+#line 10990 "ImportPage.c"
 	}
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = self->priv->hide_imported;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/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 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/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 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 10805 "ImportPage.c"
+#line 11004 "ImportPage.c"
 }
 
 
@@ -10816,23 +11015,23 @@ static void import_page_on_import_selected (ImportPage* self) {
 	ViewCollection* _tmp1_;
 	GeeList* _tmp2_;
 	GeeList* _tmp3_;
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10830 "ImportPage.c"
+#line 11029 "ImportPage.c"
 }
 
 
@@ -10841,53 +11040,53 @@ static void import_page_on_import_all (ImportPage* self) {
 	ViewCollection* _tmp1_;
 	GeeCollection* _tmp2_;
 	GeeCollection* _tmp3_;
-#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10855 "ImportPage.c"
+#line 11054 "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 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 10864 "ImportPage.c"
+#line 11063 "ImportPage.c"
 }
 
 
 static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10871 "ImportPage.c"
+#line 11070 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10878 "ImportPage.c"
+#line 11077 "ImportPage.c"
 }
 
 
 static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_close_import ((ImportPage*) self);
-#line 10885 "ImportPage.c"
+#line 11084 "ImportPage.c"
 }
 
 
@@ -10911,82 +11110,82 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	SortedList* _tmp58_;
 	gint _tmp59_;
 	gint _tmp60_;
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (items));
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_init (_tmp0_, _tmp2_);
-#line 1649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 10927 "ImportPage.c"
+#line 11126 "ImportPage.c"
 		int _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = res;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = g_strdup_printf (_ ("Unable to lock camera: %s"), _tmp7_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp9_, NULL);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp9_);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 10951 "ImportPage.c"
+#line 11150 "ImportPage.c"
 	}
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = self->priv->refreshed;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1676 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, _tmp10_);
-#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = self->priv->progress_bar;
-#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	jobs = _tmp12_;
-#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 1662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	already_imported = _tmp13_;
-#line 10971 "ImportPage.c"
+#line 11170 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp14_;
 		GeeIterator* _tmp15_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = items;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_object_it = _tmp15_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 10984 "ImportPage.c"
+#line 11183 "ImportPage.c"
 			GeeIterator* _tmp16_;
 			gboolean _tmp17_;
 			DataObject* object = NULL;
@@ -11008,41 +11207,41 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			ImportSource* _tmp41_;
 			SortedList* _tmp52_;
 			ImportPageCameraImportJob* _tmp53_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = _object_it;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp17_) {
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11014 "ImportPage.c"
+#line 11213 "ImportPage.c"
 			}
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = _object_it;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			object = (DataObject*) _tmp19_;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = object;
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = _tmp21_;
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = preview;
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_VIEW, DataView));
-#line 1666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = preview;
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = import_preview_is_already_imported (_tmp24_);
-#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp25_) {
-#line 11040 "ImportPage.c"
+#line 11239 "ImportPage.c"
 				ImportSource* _tmp26_;
 				gchar* _tmp27_;
 				gchar* _tmp28_;
@@ -11054,84 +11253,84 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				DuplicatedFile* _tmp34_;
 				ImportPageCameraImportJob* _tmp35_;
 				ImportPageCameraImportJob* _tmp36_;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = import_file;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = import_source_get_filename (_tmp26_);
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = _tmp27_;
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_message ("ImportPage.vala:1669: Skipping import of %s: checksum detected in libr" \
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_message ("ImportPage.vala:1689: Skipping import of %s: checksum detected in libr" \
 "ary", _tmp28_);
-#line 1669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp28_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = already_imported;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = import_page_null_context;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = import_file;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = preview;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = import_preview_get_duplicated_file (_tmp32_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = _tmp33_;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp35_ = import_page_camera_import_job_new (_tmp30_, _tmp31_, _tmp34_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp36_ = _tmp35_;
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp36_);
-#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp34_);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_file);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (object);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 11092 "ImportPage.c"
+#line 11291 "ImportPage.c"
 			}
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp37_ = import_page_null_context;
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = import_file;
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp39_ = import_page_camera_import_job_new (_tmp37_, _tmp38_, NULL);
-#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_job = _tmp39_;
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp41_ = import_file;
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11106 "ImportPage.c"
+#line 11305 "ImportPage.c"
 				ImportSource* _tmp42_;
 				PhotoImportSource* _tmp43_;
 				PhotoImportSource* _tmp44_;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp42_ = import_file;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp43_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp44_ = _tmp43_;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp40_ = _tmp44_ != NULL;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp44_);
-#line 11120 "ImportPage.c"
+#line 11319 "ImportPage.c"
 			} else {
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp40_ = FALSE;
-#line 11124 "ImportPage.c"
+#line 11323 "ImportPage.c"
 			}
-#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp40_) {
-#line 11128 "ImportPage.c"
+#line 11327 "ImportPage.c"
 				ImportPageCameraImportJob* _tmp45_;
 				GPContextWrapper* _tmp46_;
 				ImportSource* _tmp47_;
@@ -11139,67 +11338,67 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				PhotoImportSource* _tmp49_;
 				ImportPageCameraImportJob* _tmp50_;
 				ImportPageCameraImportJob* _tmp51_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp45_ = import_job;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp46_ = import_page_null_context;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp47_ = import_file;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp48_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp49_ = _tmp48_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp50_ = import_page_camera_import_job_new (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp51_ = _tmp50_;
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp51_);
-#line 1683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp49_);
-#line 11156 "ImportPage.c"
+#line 11355 "ImportPage.c"
 			}
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp52_ = jobs;
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = import_job;
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_COLLECTION, GeeCollection), _tmp53_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (import_job);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_file);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (object);
-#line 11172 "ImportPage.c"
+#line 11371 "ImportPage.c"
 		}
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11176 "ImportPage.c"
+#line 11375 "ImportPage.c"
 	}
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp54_ = jobs;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = _tmp55_;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp57_ = self->priv->camera_name;
-#line 1690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1690: Importing %d files from %s", _tmp56_, _tmp57_);
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1710: Importing %d files from %s", _tmp56_, _tmp57_);
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp58_ = jobs;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = _tmp59_;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp60_ > 0) {
-#line 11196 "ImportPage.c"
+#line 11395 "ImportPage.c"
 		ImportPage* _tmp61_;
 		ImportPage* _tmp62_;
 		BatchImport* batch_import = NULL;
@@ -11214,92 +11413,92 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		BatchImport* _tmp71_;
 		LibraryWindow* _tmp72_;
 		LibraryWindow* _tmp73_;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp61_ = self->priv->local_ref;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_vala_assert (_tmp61_ == NULL, "local_ref == null");
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = _g_object_ref0 (self);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->local_ref);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->local_ref = _tmp62_;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp63_ = jobs;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp64_ = self->priv->camera_name;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp65_ = already_imported;
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp66_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_ITERABLE, GeeIterable), _tmp64_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp65_, NULL, NULL, NULL);
-#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		batch_import = _tmp66_;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp67_ = batch_import;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (_tmp67_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp68_ = batch_import;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (_tmp68_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp69_ = library_window_get_app ();
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp70_ = _tmp69_;
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp71_ = batch_import;
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_enqueue_batch_import (_tmp70_, _tmp71_, TRUE);
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp70_);
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp72_ = library_window_get_app ();
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp73_ = _tmp72_;
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_switch_to_import_queue_page (_tmp73_);
-#line 1703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp73_);
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11259 "ImportPage.c"
+#line 11458 "ImportPage.c"
 	} else {
 		GeeArrayList* _tmp74_;
 		gint _tmp75_;
 		gint _tmp76_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp74_ = already_imported;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp75_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp76_ = _tmp75_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp76_ > 0) {
-#line 11272 "ImportPage.c"
+#line 11471 "ImportPage.c"
 			GeeArrayList* _tmp77_;
 			ImportManifest* _tmp78_;
 			ImportManifest* _tmp79_;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp77_ = already_imported;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp78_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_LIST, GeeList));
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp79_ = _tmp78_;
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_page_import_reporter (self, _tmp79_);
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_manifest_unref0 (_tmp79_);
-#line 11286 "ImportPage.c"
+#line 11485 "ImportPage.c"
 		}
-#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11290 "ImportPage.c"
+#line 11489 "ImportPage.c"
 	}
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (already_imported);
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (jobs);
-#line 11296 "ImportPage.c"
+#line 11495 "ImportPage.c"
 }
 
 
@@ -11308,53 +11507,53 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 	BatchImportResult* _tmp1_;
 	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_));
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _result_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->file;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ == NULL) {
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 11317 "ImportPage.c"
+#line 11516 "ImportPage.c"
 	} else {
 		BatchImportResult* _tmp3_;
 		ImportResult _tmp4_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _result_;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_->result;
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11327 "ImportPage.c"
+#line 11526 "ImportPage.c"
 	}
-#line 1715 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1716 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11333 "ImportPage.c"
+#line 11532 "ImportPage.c"
 	}
 	{
 		BatchImportResult* _tmp5_;
 		GFile* _tmp6_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _result_;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_->file;
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_file_delete (_tmp6_, NULL, &_inner_error_);
-#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11346 "ImportPage.c"
-			goto __catch72_g_error;
+#line 11545 "ImportPage.c"
+			goto __catch80_g_error;
 		}
 	}
-	goto __finally72;
-	__catch72_g_error:
+	goto __finally80;
+	__catch80_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_;
@@ -11363,57 +11562,57 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		gchar* _tmp10_;
 		GError* _tmp11_;
 		const gchar* _tmp12_;
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _result_;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp7_->file;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = err;
-#line 1722 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_->message;
-#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"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1742: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 11382 "ImportPage.c"
+#line 11581 "ImportPage.c"
 	}
-	__finally72:
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally80:
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/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 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11393 "ImportPage.c"
+#line 11592 "ImportPage.c"
 	}
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 11401 "ImportPage.c"
+#line 11600 "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 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11410 "ImportPage.c"
+#line 11609 "ImportPage.c"
 }
 
 
@@ -11442,31 +11641,31 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	gint _tmp85_;
 	gint _tmp86_;
 	ProgressDialog* _tmp91_;
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->local_ref;
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1732 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = _tmp1_;
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->local_ref);
-#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->local_ref = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = manifest;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_->success;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ > 0) {
-#line 11463 "ImportPage.c"
+#line 11662 "ImportPage.c"
 		gchar* photos_string = NULL;
 		ImportManifest* _tmp6_;
 		GeeList* _tmp7_;
@@ -11521,166 +11720,166 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		ImportManifest* _tmp51_;
 		ImportUIQuestionParams* _tmp52_;
 		gboolean _tmp53_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = manifest;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_->success;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = manifest;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = _tmp10_->success;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = _tmp12_;
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = g_strdup_printf (ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_), _tmp13_);
-#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		photos_string = _tmp14_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = manifest;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = _tmp15_->success;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = manifest;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = _tmp19_->success;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = g_strdup_printf (ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp18_), _tmp22_);
-#line 1739 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		videos_string = _tmp23_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = manifest;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = _tmp24_->success;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = _tmp26_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = manifest;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = _tmp28_->success;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = _tmp30_;
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = g_strdup_printf (ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp27_), _tmp31_);
-#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		both_string = _tmp32_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = manifest;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp34_ = _tmp33_->success;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp35_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp36_ = _tmp35_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp37_ = manifest;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp38_ = _tmp37_->success;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp40_ = _tmp39_;
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp41_ = g_strdup_printf (ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp36_), _tmp40_);
-#line 1745 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		neither_string = _tmp41_;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = manifest;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = _tmp42_->success;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp44_ = photos_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = videos_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp46_ = both_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp47_ = neither_string;
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp48_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_COLLECTION, GeeCollection), _tmp44_, _tmp45_, _tmp46_, _tmp47_);
-#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1769 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question_string = _tmp48_;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp49_ = question_string;
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp50_ = import_ui_question_params_new (_tmp49_, RESOURCES_DELETE_LABEL, _ ("_Keep"));
-#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question = _tmp50_;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp51_ = manifest;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp52_ = question;
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp53_ = import_ui_report_manifest (_tmp51_, FALSE, _tmp52_);
-#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp53_) {
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_ui_question_params_unref0 (question);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (question_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (neither_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (both_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (videos_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (photos_string);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (local_ref);
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1776 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return;
-#line 11644 "ImportPage.c"
+#line 11843 "ImportPage.c"
 		}
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (question_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (neither_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (both_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (videos_string);
-#line 1735 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (photos_string);
-#line 11658 "ImportPage.c"
+#line 11857 "ImportPage.c"
 	} else {
 		ImportManifest* _tmp54_;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp54_ = manifest;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_ui_report_manifest (_tmp54_, FALSE, NULL);
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (local_ref);
-#line 1759 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11669 "ImportPage.c"
+#line 11868 "ImportPage.c"
 	}
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = self->priv->import_sources;
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1764 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp56_;
-#line 11677 "ImportPage.c"
+#line 11876 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
 		ImportManifest* _tmp57_;
@@ -11691,27 +11890,27 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		gint _tmp61_;
 		gint _tmp62_;
 		gint _batch_result_index = 0;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp57_ = manifest;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp58_ = _tmp57_->success;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp59_ = _g_object_ref0 (_tmp58_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_list = _tmp59_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp60_ = _batch_result_list;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp61_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = _tmp61_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_size = _tmp62_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_index = -1;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11708 "ImportPage.c"
+#line 11907 "ImportPage.c"
 			gint _tmp63_;
 			gint _tmp64_;
 			gint _tmp65_;
@@ -11727,129 +11926,129 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			ImportPageCameraImportJob* _tmp73_;
 			ImportSource* _tmp74_;
 			ImportSource* _tmp75_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp63_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_result_index = _tmp63_ + 1;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp64_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp65_ = _batch_result_size;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp64_ < _tmp65_)) {
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11736 "ImportPage.c"
+#line 11935 "ImportPage.c"
 			}
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp66_ = _batch_result_list;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp67_ = _batch_result_index;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp68_ = gee_list_get (_tmp66_, _tmp67_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			batch_result = (BatchImportResult*) _tmp68_;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp69_ = batch_result;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp70_ = _tmp69_->job;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp71_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp70_) : NULL);
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			job = _tmp71_;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp72_ = marker;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp73_ = job;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp74_ = import_page_camera_import_job_get_source (_tmp73_);
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp75_ = _tmp74_;
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			marker_mark (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_DATA_OBJECT, DataObject));
-#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp75_);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (job);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11770 "ImportPage.c"
+#line 11969 "ImportPage.c"
 		}
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11774 "ImportPage.c"
+#line 11973 "ImportPage.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp76_ = app_window_get_instance ();
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp77_ = _tmp76_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp78_ = g_cancellable_new ();
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp79_ = _tmp78_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp80_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_window_get_type (), GtkWindow), _ ("Removing photos/videos from camera"), _tmp79_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp80_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = _tmp80_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp79_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp77_);
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1791 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress = _tmp81_;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp82_ = self->priv->import_sources;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp83_ = marker;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp84_ = progress;
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp85_ = source_collection_destroy_marked (_tmp82_, _tmp83_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp84_, NULL);
-#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	error_count = _tmp85_;
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp86_ = error_count;
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp86_ > 0) {
-#line 11810 "ImportPage.c"
+#line 12009 "ImportPage.c"
 		gchar* error_string = NULL;
 		gint _tmp87_;
 		gint _tmp88_;
 		gchar* _tmp89_;
 		const gchar* _tmp90_;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp87_ = error_count;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp88_ = error_count;
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp89_ = g_strdup_printf (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) _tmp87_), _tmp88_);
-#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		error_string = _tmp89_;
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp90_ = error_string;
-#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1799 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp90_, NULL);
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11830 "ImportPage.c"
+#line 12029 "ImportPage.c"
 	}
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp91_ = progress;
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress_dialog_close (_tmp91_);
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1805 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = NULL;
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (progress);
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 1726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 11846 "ImportPage.c"
+#line 12045 "ImportPage.c"
 }
 
 
@@ -11861,45 +12060,45 @@ static void import_page_close_import (ImportPage* self) {
 	int _tmp3_;
 	int _tmp4_;
 	gboolean _tmp8_;
-#line 1788 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_exit (_tmp0_, _tmp2_);
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1790 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1810 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11874 "ImportPage.c"
+#line 12073 "ImportPage.c"
 		int _tmp5_;
 		gchar* _tmp6_;
 		gchar* _tmp7_;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = res;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#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"
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1812: Unable to unlock camera: %s", _tmp7_);
+#line 1812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 11888 "ImportPage.c"
+#line 12087 "ImportPage.c"
 	}
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp8_);
-#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 11896 "ImportPage.c"
+#line 12095 "ImportPage.c"
 }
 
 
@@ -11907,24 +12106,24 @@ static void import_page_real_set_display_titles (CheckerboardPage* base, gboolea
 	ImportPage * self;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-#line 1800 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = display;
-#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1821 "/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 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = display;
-#line 1803 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
-#line 11914 "ImportPage.c"
+#line 12113 "ImportPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 11921 "ImportPage.c"
+#line 12120 "ImportPage.c"
 }
 
 
@@ -11933,17 +12132,17 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
 	SearchViewFilter* result = NULL;
 	ImportPageImportPageSearchViewFilter* _tmp0_;
 	SearchViewFilter* _tmp1_;
-#line 1807 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 1808 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11940 "ImportPage.c"
+#line 12139 "ImportPage.c"
 }
 
 
@@ -11965,14 +12164,14 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
 	self->priv->owner = _tmp1_;
 #line 471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 11962 "ImportPage.c"
+#line 12161 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
 #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 11969 "ImportPage.c"
+#line 12168 "ImportPage.c"
 }
 
 
@@ -11993,7 +12192,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11990 "ImportPage.c"
+#line 12189 "ImportPage.c"
 }
 
 
@@ -12006,14 +12205,14 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
 	g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) import_page_import_view_manager_real_create_view;
-#line 12003 "ImportPage.c"
+#line 12202 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 12010 "ImportPage.c"
+#line 12209 "ImportPage.c"
 }
 
 
@@ -12025,7 +12224,7 @@ static void import_page_import_view_manager_finalize (ViewManager * obj) {
 	_g_object_unref0 (self->priv->owner);
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 12022 "ImportPage.c"
+#line 12221 "ImportPage.c"
 }
 
 
@@ -12044,7 +12243,7 @@ static GType import_page_import_view_manager_get_type (void) {
 static gpointer _gp_context_wrapper_ref0 (gpointer self) {
 #line 495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? gp_context_wrapper_ref (self) : NULL;
-#line 12041 "ImportPage.c"
+#line 12240 "ImportPage.c"
 }
 
 
@@ -12140,7 +12339,7 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_tmp16_ = import_file;
 #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12137 "ImportPage.c"
+#line 12336 "ImportPage.c"
 		ImportSource* _tmp17_;
 		PhotoMetadata* _tmp18_;
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12151,13 +12350,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 		_media_metadata_unref0 (_tmp15_);
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp18_;
-#line 12148 "ImportPage.c"
+#line 12347 "ImportPage.c"
 	} else {
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
 #line 507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = NULL;
-#line 12154 "ImportPage.c"
+#line 12353 "ImportPage.c"
 	}
 #line 506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12175,14 +12374,14 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_media_metadata_unref0 (_tmp15_);
 #line 493 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12172 "ImportPage.c"
+#line 12371 "ImportPage.c"
 }
 
 
 static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
 #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 12179 "ImportPage.c"
+#line 12378 "ImportPage.c"
 }
 
 
@@ -12197,7 +12396,7 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI
 	result = _tmp0_;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12194 "ImportPage.c"
+#line 12393 "ImportPage.c"
 }
 
 
@@ -12216,7 +12415,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
 	result = _tmp1_;
 #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12213 "ImportPage.c"
+#line 12412 "ImportPage.c"
 }
 
 
@@ -12231,23 +12430,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	_tmp1_ = self->priv->import_file;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12228 "ImportPage.c"
+#line 12427 "ImportPage.c"
 		time_t _tmp2_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 12234 "ImportPage.c"
+#line 12433 "ImportPage.c"
 	} else {
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12238 "ImportPage.c"
+#line 12437 "ImportPage.c"
 	}
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12244 "ImportPage.c"
+#line 12443 "ImportPage.c"
 }
 
 
@@ -12266,7 +12465,7 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
 	result = _tmp1_;
 #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12263 "ImportPage.c"
+#line 12462 "ImportPage.c"
 }
 
 
@@ -12285,7 +12484,7 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
 	result = _tmp1_;
 #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12282 "ImportPage.c"
+#line 12481 "ImportPage.c"
 }
 
 
@@ -12304,7 +12503,7 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 	result = _tmp1_;
 #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12301 "ImportPage.c"
+#line 12500 "ImportPage.c"
 }
 
 
@@ -12323,7 +12522,7 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
 	result = _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12320 "ImportPage.c"
+#line 12519 "ImportPage.c"
 }
 
 
@@ -12343,7 +12542,7 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
 	_batch_import_job_unref0 (self->priv->associated);
 #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 12340 "ImportPage.c"
+#line 12539 "ImportPage.c"
 }
 
 
@@ -12361,7 +12560,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
 	result = _tmp1_;
 #line 544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12358 "ImportPage.c"
+#line 12557 "ImportPage.c"
 }
 
 
@@ -12374,7 +12573,7 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob*
 	result = FALSE;
 #line 548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12371 "ImportPage.c"
+#line 12570 "ImportPage.c"
 }
 
 
@@ -12400,21 +12599,21 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
 	if (filesize) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*filesize = _vala_filesize;
-#line 12397 "ImportPage.c"
+#line 12596 "ImportPage.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file = _vala_file;
-#line 12403 "ImportPage.c"
+#line 12602 "ImportPage.c"
 	} else {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12407 "ImportPage.c"
+#line 12606 "ImportPage.c"
 	}
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12411 "ImportPage.c"
+#line 12610 "ImportPage.c"
 }
 
 
@@ -12440,7 +12639,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	_vala_copy_to_library = FALSE;
 #line 562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	dest_file = NULL;
-#line 12437 "ImportPage.c"
+#line 12636 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
@@ -12464,8 +12663,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp0_ = _tmp5_;
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12461 "ImportPage.c"
-			goto __catch73_g_error;
+#line 12660 "ImportPage.c"
+			goto __catch81_g_error;
 		}
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12477,10 +12676,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		dest_file = _tmp6_;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 12474 "ImportPage.c"
+#line 12673 "ImportPage.c"
 	}
-	goto __finally73;
-	__catch73_g_error:
+	goto __finally81;
+	__catch81_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_;
@@ -12508,12 +12707,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_free0 (_tmp9_);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 12505 "ImportPage.c"
+#line 12704 "ImportPage.c"
 	}
-	__finally73:
+	__finally81:
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12510 "ImportPage.c"
+#line 12709 "ImportPage.c"
 		gboolean _tmp12_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
@@ -12521,13 +12720,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return _tmp12_;
-#line 12518 "ImportPage.c"
+#line 12717 "ImportPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = dest_file;
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp13_ == NULL) {
-#line 12524 "ImportPage.c"
+#line 12723 "ImportPage.c"
 		ImportSource* _tmp14_;
 		gchar* _tmp15_;
 		gchar* _tmp16_;
@@ -12549,27 +12748,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		if (file_to_import) {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*file_to_import = _vala_file_to_import;
-#line 12546 "ImportPage.c"
+#line 12745 "ImportPage.c"
 		} else {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12550 "ImportPage.c"
+#line 12749 "ImportPage.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (copy_to_library) {
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 12556 "ImportPage.c"
+#line 12755 "ImportPage.c"
 		}
 #line 575 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12560 "ImportPage.c"
+#line 12759 "ImportPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = dest_file;
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	library_monitor_blacklist_file (_tmp17_, "CameraImportJob.prepare");
-#line 12566 "ImportPage.c"
+#line 12765 "ImportPage.c"
 	{
 		GPContextWrapper* _tmp18_;
 		GPContext* _tmp19_;
@@ -12593,22 +12792,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gp_save_image (_tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_, &_inner_error_);
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12590 "ImportPage.c"
-			goto __finally74;
+#line 12789 "ImportPage.c"
+			goto __finally82;
 		}
 	}
-	__finally74:
+	__finally82:
 	{
 		GFile* _tmp24_;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = dest_file;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_unblacklist_file (_tmp24_);
-#line 12601 "ImportPage.c"
+#line 12800 "ImportPage.c"
 	}
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12605 "ImportPage.c"
+#line 12804 "ImportPage.c"
 		gboolean _tmp25_ = FALSE;
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_propagate_error (error, _inner_error_);
@@ -12616,13 +12815,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return _tmp25_;
-#line 12613 "ImportPage.c"
+#line 12812 "ImportPage.c"
 	}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->associated;
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ != NULL) {
-#line 12619 "ImportPage.c"
+#line 12818 "ImportPage.c"
 		BackingPhotoRow* _tmp42_;
 		GFile* assoc_dest = NULL;
 		BackingPhotoRow* _tmp45_;
@@ -12664,8 +12863,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_tmp27_ = _tmp35_;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12661 "ImportPage.c"
-				goto __catch75_g_error;
+#line 12860 "ImportPage.c"
+				goto __catch83_g_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp36_ = _tmp27_;
@@ -12677,10 +12876,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			self->priv->associated_file = _tmp36_;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (_tmp27_);
-#line 12674 "ImportPage.c"
+#line 12873 "ImportPage.c"
 		}
-		goto __finally75;
-		__catch75_g_error:
+		goto __finally83;
+		__catch83_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp37_;
@@ -12704,12 +12903,12 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 ": %s", _tmp38_, _tmp40_);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12700 "ImportPage.c"
+#line 12899 "ImportPage.c"
 		}
-		__finally75:
+		__finally83:
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12705 "ImportPage.c"
+#line 12904 "ImportPage.c"
 			gboolean _tmp41_ = FALSE;
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
@@ -12717,13 +12916,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return _tmp41_;
-#line 12713 "ImportPage.c"
+#line 12912 "ImportPage.c"
 		}
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = self->priv->associated_file;
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp42_ == NULL) {
-#line 12719 "ImportPage.c"
+#line 12918 "ImportPage.c"
 			ImportPageCameraImportJob* _tmp43_;
 			const gchar* _tmp44_;
 #line 599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12740,21 +12939,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			if (file_to_import) {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*file_to_import = _vala_file_to_import;
-#line 12736 "ImportPage.c"
+#line 12935 "ImportPage.c"
 			} else {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12740 "ImportPage.c"
+#line 12939 "ImportPage.c"
 			}
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (copy_to_library) {
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 12746 "ImportPage.c"
+#line 12945 "ImportPage.c"
 			}
 #line 600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12750 "ImportPage.c"
+#line 12949 "ImportPage.c"
 		}
 #line 603 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = self->priv->associated_file;
@@ -12768,7 +12967,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp48_ = assoc_dest;
 #line 604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_blacklist_file (_tmp48_, "CameraImportJob.prepare");
-#line 12764 "ImportPage.c"
+#line 12963 "ImportPage.c"
 		{
 			GPContextWrapper* _tmp49_;
 			GPContext* _tmp50_;
@@ -12798,22 +12997,22 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			gp_save_image (_tmp50_, _tmp51_, _tmp53_, _tmp55_, _tmp56_, &_inner_error_);
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12794 "ImportPage.c"
-				goto __finally76;
+#line 12993 "ImportPage.c"
+				goto __finally84;
 			}
 		}
-		__finally76:
+		__finally84:
 		{
 			GFile* _tmp57_;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp57_ = assoc_dest;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			library_monitor_unblacklist_file (_tmp57_);
-#line 12805 "ImportPage.c"
+#line 13004 "ImportPage.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12809 "ImportPage.c"
+#line 13008 "ImportPage.c"
 			gboolean _tmp58_ = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			g_propagate_error (error, _inner_error_);
@@ -12823,11 +13022,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return _tmp58_;
-#line 12819 "ImportPage.c"
+#line 13018 "ImportPage.c"
 		}
 #line 588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12823 "ImportPage.c"
+#line 13022 "ImportPage.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = dest_file;
@@ -12847,107 +13046,54 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	if (file_to_import) {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file_to_import = _vala_file_to_import;
-#line 12843 "ImportPage.c"
+#line 13042 "ImportPage.c"
 	} else {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12847 "ImportPage.c"
+#line 13046 "ImportPage.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (copy_to_library) {
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 12853 "ImportPage.c"
+#line 13052 "ImportPage.c"
 	}
 #line 616 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12857 "ImportPage.c"
+#line 13056 "ImportPage.c"
 }
 
 
-static gboolean import_page_camera_import_job_real_complete (BatchImportJob* base, MediaSource* source, BatchImportRoll* import_roll, GError** error) {
+static GFile* import_page_camera_import_job_real_get_associated_file (BatchImportJob* base) {
 	ImportPageCameraImportJob * self;
-	gboolean result = FALSE;
-	gboolean ret = FALSE;
-	MediaSource* _tmp0_;
-	GError * _inner_error_ = NULL;
+	GFile* result = NULL;
+	BackingPhotoRow* _tmp0_;
+	BackingPhotoRow* _tmp1_;
+	const gchar* _tmp2_;
+	GFile* _tmp3_;
 #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 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
-#line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_return_val_if_fail (IS_BATCH_IMPORT_ROLL (import_roll), FALSE);
 #line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	ret = FALSE;
-#line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = source;
+	_tmp0_ = self->priv->associated_file;
+#line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp0_ == NULL) {
 #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 12879 "ImportPage.c"
-		Photo* photo = NULL;
-		MediaSource* _tmp1_;
-		Photo* _tmp2_;
-		BackingPhotoRow* _tmp3_;
-#line 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp1_ = source;
-#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 622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		photo = _tmp2_;
-#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp3_ = self->priv->associated_file;
-#line 625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		if (_tmp3_ != NULL) {
-#line 12894 "ImportPage.c"
-			Photo* _tmp4_;
-			BackingPhotoRow* _tmp5_;
-			Photo* _tmp7_;
-			ConfigFacade* _tmp8_;
-			ConfigFacade* _tmp9_;
-			RawDeveloper _tmp10_;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp4_ = photo;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp5_ = self->priv->associated_file;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			photo_add_backing_photo_for_development (_tmp4_, RAW_DEVELOPER_CAMERA, _tmp5_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12909 "ImportPage.c"
-				gboolean _tmp6_ = FALSE;
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_propagate_error (error, _inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_g_object_unref0 (photo);
-#line 626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				return _tmp6_;
-#line 12917 "ImportPage.c"
-			}
-#line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			ret = TRUE;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp7_ = photo;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp8_ = config_facade_get_instance ();
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp9_ = _tmp8_;
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_tmp10_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			photo_set_raw_developer (_tmp7_, _tmp10_);
-#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			_g_object_unref0 (_tmp9_);
-#line 12933 "ImportPage.c"
-		}
+		result = NULL;
 #line 621 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (photo);
-#line 12937 "ImportPage.c"
-	}
-#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = ret;
-#line 631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		return result;
+#line 13077 "ImportPage.c"
+	}
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp1_ = self->priv->associated_file;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp2_ = _tmp1_->filepath;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp3_ = g_file_new_for_path (_tmp2_);
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	result = _tmp3_;
+#line 624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12943 "ImportPage.c"
+#line 13089 "ImportPage.c"
 }
 
 
@@ -12979,8 +13125,8 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) import_page_camera_import_job_real_prepare;
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) import_page_camera_import_job_real_complete;
-#line 12976 "ImportPage.c"
+	((BatchImportJobClass *) klass)->get_associated_file = (GFile* (*) (BatchImportJob *)) import_page_camera_import_job_real_get_associated_file;
+#line 13122 "ImportPage.c"
 }
 
 
@@ -12991,7 +13137,7 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ
 	self->priv->associated = NULL;
 #line 490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated_file = NULL;
-#line 12987 "ImportPage.c"
+#line 13133 "ImportPage.c"
 }
 
 
@@ -13019,7 +13165,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob * obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 480 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 13015 "ImportPage.c"
+#line 13161 "ImportPage.c"
 }
 
 
@@ -13038,13 +13184,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 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 629 "/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 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
-#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13040 "ImportPage.c"
+#line 13186 "ImportPage.c"
 }
 
 
@@ -13064,7 +13210,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 13060 "ImportPage.c"
+#line 13206 "ImportPage.c"
 }
 
 
@@ -13077,186 +13223,186 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_;
 	guint _tmp26_;
-#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 633 "/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 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = view;
-#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/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 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source = _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/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 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13087 "ImportPage.c"
+#line 13233 "ImportPage.c"
 		gboolean _tmp4_;
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/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 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp4_;
-#line 13093 "ImportPage.c"
+#line 13239 "ImportPage.c"
 	} else {
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 13097 "ImportPage.c"
+#line 13243 "ImportPage.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 13101 "ImportPage.c"
+#line 13247 "ImportPage.c"
 		ImportSource* _tmp5_;
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = source;
-#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13107 "ImportPage.c"
+#line 13253 "ImportPage.c"
 			gboolean _tmp6_;
 			gboolean _tmp7_;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/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 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _tmp6_;
-#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp7_) {
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				result = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (source);
-#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return result;
-#line 13122 "ImportPage.c"
+#line 13268 "ImportPage.c"
 			}
 		} else {
 			ImportSource* _tmp8_;
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = source;
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13130 "ImportPage.c"
+#line 13276 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
 				ImportSource* _tmp9_;
 				PhotoImportSource* _tmp10_;
 				PhotoImportSource* _tmp11_;
 				PhotoFileFormat _tmp12_;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = source;
-#line 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/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 649 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				photo = _tmp10_;
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp11_ = photo;
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = photo_import_source_get_file_format (_tmp11_);
-#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13148 "ImportPage.c"
+#line 13294 "ImportPage.c"
 					PhotoImportSource* _tmp13_;
 					PhotoImportSource* _tmp14_;
 					PhotoImportSource* _tmp15_;
 					gboolean _tmp16_;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp13_ = photo;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp14_ = photo_import_source_get_associated (_tmp13_);
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp15_ = _tmp14_;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = _tmp15_ != NULL;
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp15_);
-#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp16_) {
-#line 13165 "ImportPage.c"
+#line 13311 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
 						gboolean _tmp18_;
 						gboolean _tmp19_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/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 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp19_ = _tmp18_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13175 "ImportPage.c"
+#line 13321 "ImportPage.c"
 							gboolean _tmp20_;
 							gboolean _tmp21_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/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 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp21_ = _tmp20_;
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13184 "ImportPage.c"
+#line 13330 "ImportPage.c"
 						} else {
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13188 "ImportPage.c"
+#line 13334 "ImportPage.c"
 						}
-#line 652 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							result = FALSE;
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (photo);
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (source);
-#line 653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13200 "ImportPage.c"
+#line 13346 "ImportPage.c"
 						}
 					} else {
 						gboolean _tmp22_;
 						gboolean _tmp23_;
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/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 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp23_ = _tmp22_;
-#line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp23_) {
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							result = FALSE;
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (photo);
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (source);
-#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13219 "ImportPage.c"
+#line 13365 "ImportPage.c"
 						}
 					}
 				} else {
 					gboolean _tmp24_;
 					gboolean _tmp25_;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/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 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = _tmp24_;
-#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp25_) {
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						result = FALSE;
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (photo);
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (source);
-#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13239 "ImportPage.c"
+#line 13385 "ImportPage.c"
 					}
 				}
-#line 648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13244 "ImportPage.c"
+#line 13390 "ImportPage.c"
 			}
 		}
 	}
-#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/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 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13252 "ImportPage.c"
+#line 13398 "ImportPage.c"
 		const gchar* keywords = NULL;
 		ImportSource* _tmp27_;
 		const gchar* _tmp28_;
@@ -13264,104 +13410,104 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 		gboolean _tmp30_;
 		gint _tmp31_;
 		gchar** _tmp32_;
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = source;
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_INDEXABLE, Indexable));
-#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		keywords = _tmp28_;
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = keywords;
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = is_string_empty (_tmp29_);
-#line 664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp30_) {
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = FALSE;
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (source);
-#line 665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 13278 "ImportPage.c"
+#line 13424 "ImportPage.c"
 		}
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/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 13282 "ImportPage.c"
+#line 13428 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
 			gint _word_collection_size_ = 0;
 			gint word_it = 0;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			word_collection = _tmp32_;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			word_collection_length1 = _tmp31_;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13294 "ImportPage.c"
+#line 13440 "ImportPage.c"
 				const gchar* word = NULL;
-#line 668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13298 "ImportPage.c"
+#line 13444 "ImportPage.c"
 				{
 					const gchar* _tmp33_;
 					const gchar* _tmp34_;
 					gboolean _tmp35_;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = keywords;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = word;
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = string_contains (_tmp33_, _tmp34_);
-#line 669 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp35_) {
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						result = FALSE;
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (source);
-#line 670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13317 "ImportPage.c"
+#line 13463 "ImportPage.c"
 					}
 				}
 			}
 		}
 	}
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (source);
-#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13329 "ImportPage.c"
+#line 13475 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type) {
 	ImportPageImportPageSearchViewFilter* self = NULL;
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13339 "ImportPage.c"
+#line 13485 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/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 13346 "ImportPage.c"
+#line 13492 "ImportPage.c"
 }
 
 
 static void import_page_import_page_search_view_filter_class_init (ImportPageImportPageSearchViewFilterClass * klass) {
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_page_search_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) import_page_import_page_search_view_filter_real_get_criteria;
-#line 635 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_import_page_search_view_filter_real_predicate;
-#line 13357 "ImportPage.c"
+#line 13503 "ImportPage.c"
 }
 
 
@@ -13386,45 +13532,45 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 	gboolean result = FALSE;
 	DataView* _tmp0_;
 	gboolean _tmp1_;
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER, ImportPageHideImportedViewFilter);
-#line 680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = view;
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/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 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = !_tmp1_;
-#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13394 "ImportPage.c"
+#line 13540 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type) {
 	ImportPageHideImportedViewFilter* self = NULL;
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13404 "ImportPage.c"
+#line 13550 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13411 "ImportPage.c"
+#line 13557 "ImportPage.c"
 }
 
 
 static void import_page_hide_imported_view_filter_class_init (ImportPageHideImportedViewFilterClass * klass) {
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) import_page_hide_imported_view_filter_real_predicate;
-#line 13420 "ImportPage.c"
+#line 13566 "ImportPage.c"
 }
 
 
@@ -13475,7 +13621,7 @@ static void import_page_class_init (ImportPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) import_page_real_get_search_view_filter;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13471 "ImportPage.c"
+#line 13617 "ImportPage.c"
 }
 
 
@@ -13486,41 +13632,43 @@ static void import_page_instance_init (ImportPage * self) {
 	ImportPageHideImportedViewFilter* _tmp3_;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_GET_PRIVATE (self);
-#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->import_sources = NULL;
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = (GtkLabel*) gtk_label_new (NULL);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->camera_label = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->progress_bar = _tmp1_;
-#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->busy = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refreshed = FALSE;
-#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = GP_OK;
-#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
-#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->volume_monitor = NULL;
-#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->local_ref = NULL;
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = import_page_import_page_search_view_filter_new ();
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->search_filter = _tmp2_;
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_hide_imported_view_filter_new ();
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->hide_imported_filter = _tmp3_;
-#line 13516 "ImportPage.c"
+#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	self->priv->claim_timeout = 500;
+#line 13664 "ImportPage.c"
 }
 
 
@@ -13532,49 +13680,49 @@ static void import_page_finalize (GObject * obj) {
 	guint _tmp3_;
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_PAGE, ImportPage);
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = library_photo_global;
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 767 "/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 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = video_global;
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 768 "/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 688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (self->priv->import_sources);
-#line 689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->camera_label);
-#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->hide_imported);
-#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_camera_unref0 (self->priv->camera);
-#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->uri);
-#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
-#line 698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->camera_name);
-#line 699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->volume_monitor);
-#line 700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->local_ref);
-#line 701 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->icon);
-#line 702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 703 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_view_filter_unref0 (self->priv->hide_imported_filter);
-#line 704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_core_tracker_unref0 (self->priv->tracker);
 #line 465 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13570 "ImportPage.c"
+#line 13718 "ImportPage.c"
 }
 
 
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 4e055ec..f7698a6 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -615,20 +615,13 @@ public class ImportPage : CheckerboardPage {
             
             return true;
         }
-        
-        public override bool complete(MediaSource source, BatchImportRoll import_roll) throws Error {
-            bool ret = false;
-            if (source is Photo) {
-                Photo photo = source as Photo;
-                
-                // Associate paired JPEG with RAW photo.
-                if (associated_file != null) {
-                    photo.add_backing_photo_for_development(RawDeveloper.CAMERA, associated_file);
-                    ret = true;
-                    photo.set_raw_developer(Config.Facade.get_instance().get_default_raw_developer());
-                }
+
+        public override File? get_associated_file() {
+            if (associated_file == null) {
+                return null;
             }
-            return ret;
+
+            return File.new_for_path(associated_file.filepath);
         }
     }
     
@@ -917,8 +910,8 @@ public class ImportPage : CheckerboardPage {
     protected override void init_actions(int selected_count, int count) {
         on_view_changed();
         
-        set_action_important("ImportSelected", true);
-        set_action_important("ImportAll", true);
+        set_action_sensitive("ImportSelected", true);
+        set_action_sensitive("ImportAll", true);
         
         base.init_actions(selected_count, count);
     }
@@ -1015,6 +1008,17 @@ public class ImportPage : CheckerboardPage {
                 } catch (Error err) {
                     // error means not mounted
                 }
+
+                // Could not find mount for gphoto2://, re-try with mtp://
+                // It seems some devices are mounted using MTP and not gphoto2 daemon
+                if (mount == null && this.uri.has_prefix("gphoto2")) {
+                    uri = File.new_for_uri("mtp" + this.uri.substring(7));
+                    try {
+                        mount = uri.find_enclosing_mount(null);
+                    } catch (Error err) {
+                        // error means not mounted
+                    }
+                }
                 
                 if (mount != null) {
                     // it's mounted, offer to unmount for the user
@@ -1153,22 +1157,45 @@ public class ImportPage : CheckerboardPage {
         return false;
     }
 
+    private int claim_timeout = 500;
+
     private RefreshResult refresh_camera() {
         if (busy)
             return RefreshResult.BUSY;
             
-        this.set_page_message (_("Starting import, please wait…"));
-
+        this.set_page_message (_("Connecting to camera, please wait…"));
         update_status(busy, false);
         
         refresh_error = null;
         refresh_result = camera.init(spin_idle_context.context);
+
+        // If we fail to claim the device, we might have run into a conflict
+        // with gvfs-gphoto2-volume-monitor. Back off, try again after
+        // claim_timeout ms.
+        // We will wait 3.5s in total (500 + 1000 + 2000) before giving
+        // up with the infamous -53 error dialog.
+        if (refresh_result == GPhoto.Result.IO_USB_CLAIM) {
+            if (claim_timeout < 4000) {
+                Timeout.add (claim_timeout, () => {
+                    refresh_camera();
+                    return false;
+                });
+                claim_timeout *= 2;
+
+                return RefreshResult.LOCKED;
+            }
+        }
+
+        // reset claim_timeout to initial value
+        claim_timeout = 500;
+
         if (refresh_result != GPhoto.Result.OK) {
             warning("Unable to initialize camera: %s", refresh_result.to_full_string());
             
             return (refresh_result == GPhoto.Result.IO_LOCK) ? RefreshResult.LOCKED : RefreshResult.LIBRARY_ERROR;
         }
 
+        this.set_page_message (_("Starting import, please wait…"));
         update_status(true, refreshed);
         
         on_view_changed();
@@ -1379,6 +1406,7 @@ public class ImportPage : CheckerboardPage {
             
             return true;
         }
+        files.sort();
 
         for (int ctr = 0; ctr < files.count(); ctr++) {
             string filename;
@@ -1553,9 +1581,7 @@ public class ImportPage : CheckerboardPage {
             // calculate EXIF's fingerprint
             string? exif_only_md5 = null;
             if (metadata != null) {
-                uint8[]? flattened_sans_thumbnail = metadata.flatten_exif(false);
-                if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
-                    exif_only_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
+                exif_only_md5 = metadata.exif_hash();
             }
             
             // XXX: Cannot use the metadata for the thumbnail preview because libgphoto2
@@ -1564,9 +1590,8 @@ public class ImportPage : CheckerboardPage {
             // this means the preview orientation will be wrong and the MD5 is not generated
             // if the EXIF did not parse properly (see above)
             
-            uint8[] preview_raw = null;
-            size_t preview_raw_length = 0;
             Gdk.Pixbuf preview = null;
+            string? preview_md5 = null;
             try {
                 string preview_fulldir = fulldir;
                 string preview_filename = filename;
@@ -1575,7 +1600,7 @@ public class ImportPage : CheckerboardPage {
                     preview_filename = associated.get_filename();
                 }
                 preview = GPhoto.load_preview(spin_idle_context.context, camera, preview_fulldir,
-                    preview_filename, out preview_raw, out preview_raw_length);
+                    preview_filename, out preview_md5);
             } catch (Error err) {
                 // only issue the warning message if we're not reading a video. GPhoto is capable
                 // of reading video previews about 50% of the time, so we don't want to put a guard
@@ -1587,11 +1612,6 @@ public class ImportPage : CheckerboardPage {
                 }
             }
             
-            // calculate thumbnail fingerprint
-            string? preview_md5 = null;
-            if (preview != null && preview_raw != null && preview_raw_length > 0)
-                preview_md5 = md5_binary(preview_raw, preview_raw_length);
-            
 #if TRACE_MD5
             debug("camera MD5 %s: exif=%s preview=%s", filename, exif_only_md5, preview_md5);
 #endif
diff --git a/src/config/Config.c b/src/config/Config.c
index 4d9bba5..7008805 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -147,6 +147,10 @@ struct _ConfigurationFacadeClass {
 	void (*set_auto_import_from_library) (ConfigurationFacade* self, gboolean auto_import);
 	gchar* (*get_bg_color_name) (ConfigurationFacade* self);
 	void (*set_bg_color_name) (ConfigurationFacade* self, const gchar* color_name);
+	gchar* (*get_transparent_background_type) (ConfigurationFacade* self);
+	void (*set_transparent_background_type) (ConfigurationFacade* self, const gchar* type);
+	gchar* (*get_transparent_background_color) (ConfigurationFacade* self);
+	void (*set_transparent_background_color) (ConfigurationFacade* self, const gchar* color_name);
 	gboolean (*get_commit_metadata_to_masters) (ConfigurationFacade* self);
 	void (*set_commit_metadata_to_masters) (ConfigurationFacade* self, gboolean commit_metadata);
 	gchar* (*get_desktop_background) (ConfigurationFacade* self);
@@ -298,6 +302,8 @@ struct _ConfigFacadePrivate {
 typedef enum  {
 	CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY = 0,
 	CONFIGURABLE_PROPERTY_BG_COLOR_NAME,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR,
 	CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE,
@@ -419,12 +425,6 @@ GType config_facade_get_type (void) G_GNUC_CONST;
 enum  {
 	CONFIG_FACADE_DUMMY_PROPERTY
 };
-#define CONFIG_FACADE_SLIDESHOW_DELAY_MAX 30.0
-#define CONFIG_FACADE_SLIDESHOW_DELAY_MIN 1.0
-#define CONFIG_FACADE_SLIDESHOW_DELAY_DEFAULT 3.0
-#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MAX 1.0
-#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_MIN 0.1
-#define CONFIG_FACADE_SLIDESHOW_TRANSITION_DELAY_DEFAULT 0.3
 #define CONFIG_FACADE_WIDTH_DEFAULT 1024
 #define CONFIG_FACADE_HEIGHT_DEFAULT 768
 #define CONFIG_FACADE_SIDEBAR_MIN_POSITION 180
@@ -451,6 +451,8 @@ GType configuration_engine_get_type (void) G_GNUC_CONST;
 ConfigurationFacade* configuration_facade_construct (GType object_type, ConfigurationEngine* engine);
 static void config_facade_on_color_name_changed (ConfigFacade* self);
 static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self);
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self);
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self);
 ConfigFacade* config_facade_get_instance (void);
 static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color);
 static void config_facade_get_colors (ConfigFacade* self);
@@ -472,9 +474,23 @@ void config_terminate (void);
 
 
 static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 49 "/home/jens/Source/shotwell/src/config/Config.vala"
+	config_facade_on_color_name_changed ((ConfigFacade*) self);
+#line 480 "Config.c"
+}
+
+
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed (ConfigurationFacade* _sender, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/config/Config.vala"
+	config_facade_on_color_name_changed ((ConfigFacade*) self);
+#line 487 "Config.c"
+}
+
+
+static void _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed (ConfigurationFacade* _sender, gpointer self) {
+#line 51 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 478 "Config.c"
+#line 494 "Config.c"
 }
 
 
@@ -482,33 +498,37 @@ static ConfigFacade* config_facade_construct (GType object_type) {
 	ConfigFacade * self = NULL;
 	GSettingsConfigurationEngine* _tmp0_;
 	GSettingsConfigurationEngine* _tmp1_;
-#line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 47 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = gsettings_configuration_engine_new ();
-#line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 47 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = _tmp0_;
-#line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 47 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self = (ConfigFacade*) configuration_facade_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine));
-#line 53 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 47 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_object_unref0 (_tmp1_);
-#line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 49 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "bg-color-name-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed, self, 0);
-#line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 50 "/home/jens/Source/shotwell/src/config/Config.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "transparent-background-type-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_transparent_background_type_changed, self, 0);
+#line 51 "/home/jens/Source/shotwell/src/config/Config.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "transparent-background-color-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_transparent_background_color_changed, self, 0);
+#line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self;
-#line 498 "Config.c"
+#line 518 "Config.c"
 }
 
 
 static ConfigFacade* config_facade_new (void) {
-#line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return config_facade_construct (CONFIG_TYPE_FACADE);
-#line 505 "Config.c"
+#line 525 "Config.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 512 "Config.c"
+#line 532 "Config.c"
 }
 
 
@@ -517,114 +537,114 @@ ConfigFacade* config_facade_get_instance (void) {
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
-#line 59 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = config_facade_instance;
-#line 59 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_ == NULL) {
-#line 525 "Config.c"
+#line 545 "Config.c"
 		ConfigFacade* _tmp1_;
-#line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 56 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = config_facade_new ();
-#line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 56 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_object_unref0 (config_facade_instance);
-#line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 56 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_instance = _tmp1_;
-#line 533 "Config.c"
+#line 553 "Config.c"
 	}
-#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = config_facade_instance;
-#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	result = _tmp3_;
-#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 58 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return result;
-#line 543 "Config.c"
+#line 563 "Config.c"
 }
 
 
 static void config_facade_on_color_name_changed (ConfigFacade* self) {
-#line 65 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 61 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 66 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_signal_emit (self, config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL], 0);
-#line 552 "Config.c"
+#line 572 "Config.c"
 }
 
 
 static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color) {
 	GdkRGBA _tmp0_;
 	gdouble _tmp1_;
-#line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 65 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 65 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (bg_color != NULL);
-#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = *bg_color;
-#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = _tmp0_.red;
-#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 69 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_ > CONFIG_FACADE_BLACK_THRESHOLD) {
-#line 569 "Config.c"
+#line 589 "Config.c"
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 74 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 70 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp2_ = g_strdup (CONFIG_FACADE_DARK_SELECTED_COLOR);
-#line 74 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 70 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->selected_color);
-#line 74 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 70 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->selected_color = _tmp2_;
-#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 71 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = g_strdup (CONFIG_FACADE_DARK_UNSELECTED_COLOR);
-#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 71 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->unselected_color);
-#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 71 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->unselected_color = _tmp3_;
-#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 72 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp4_ = g_strdup (CONFIG_FACADE_DARK_UNFOCUSED_SELECTED_COLOR);
-#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 72 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->unfocused_selected_color);
-#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 72 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->unfocused_selected_color = _tmp4_;
-#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp5_ = g_strdup (CONFIG_FACADE_DARK_BORDER_COLOR);
-#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->border_color);
-#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp5_;
-#line 598 "Config.c"
+#line 618 "Config.c"
 	} else {
 		gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 79 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp6_ = g_strdup (CONFIG_FACADE_LIGHT_SELECTED_COLOR);
-#line 79 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->selected_color);
-#line 79 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 75 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->selected_color = _tmp6_;
-#line 80 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp7_ = g_strdup (CONFIG_FACADE_LIGHT_UNSELECTED_COLOR);
-#line 80 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->unselected_color);
-#line 80 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 76 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->unselected_color = _tmp7_;
-#line 81 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp8_ = g_strdup (CONFIG_FACADE_LIGHT_UNFOCUSED_SELECTED_COLOR);
-#line 81 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->unfocused_selected_color);
-#line 81 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->unfocused_selected_color = _tmp8_;
-#line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 78 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp9_ = g_strdup (CONFIG_FACADE_LIGHT_BORDER_COLOR);
-#line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 78 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->border_color);
-#line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 78 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp9_;
-#line 628 "Config.c"
+#line 648 "Config.c"
 	}
 }
 
@@ -635,37 +655,37 @@ static void config_facade_get_colors (ConfigFacade* self) {
 	gboolean _tmp2_;
 	const gchar* _tmp4_;
 	GdkRGBA _tmp5_ = {0};
-#line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 87 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 83 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->get_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 87 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 83 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->bg_color);
-#line 87 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 83 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->bg_color = _tmp0_;
-#line 89 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = self->priv->bg_color;
-#line 89 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = is_color_parsable (_tmp1_);
-#line 89 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 85 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (!_tmp2_) {
-#line 653 "Config.c"
+#line 673 "Config.c"
 		gchar* _tmp3_;
-#line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR);
-#line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_g_free0 (self->priv->bg_color);
-#line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 86 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->bg_color = _tmp3_;
-#line 661 "Config.c"
+#line 681 "Config.c"
 	}
-#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp4_ = self->priv->bg_color;
-#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
 	parse_color (_tmp4_, &_tmp5_);
-#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 88 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp5_);
-#line 669 "Config.c"
+#line 689 "Config.c"
 }
 
 
@@ -674,86 +694,86 @@ void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
 	gboolean _tmp1_;
 	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
-#line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 91 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 96 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->bg_color;
-#line 96 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 96 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_) {
-#line 97 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 93 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 688 "Config.c"
+#line 708 "Config.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->bg_color;
-#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	parse_color (_tmp2_, &_tmp3_);
-#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	*result = _tmp3_;
-#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 95 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 698 "Config.c"
+#line 718 "Config.c"
 }
 
 
 void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, GdkRGBA* result) {
 	gboolean _tmp0_;
-#line 102 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 98 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = in_focus;
-#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_) {
-#line 710 "Config.c"
+#line 730 "Config.c"
 		const gchar* _tmp1_;
 		gboolean _tmp2_;
 		const gchar* _tmp3_;
 		GdkRGBA _tmp4_ = {0};
-#line 104 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = self->priv->selected_color;
-#line 104 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp2_ = is_string_empty (_tmp1_);
-#line 104 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 100 "/home/jens/Source/shotwell/src/config/Config.vala"
 		if (_tmp2_) {
-#line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 101 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 723 "Config.c"
+#line 743 "Config.c"
 		}
-#line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = self->priv->selected_color;
-#line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 		parse_color (_tmp3_, &_tmp4_);
-#line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 		*result = _tmp4_;
-#line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 733 "Config.c"
+#line 753 "Config.c"
 	} else {
 		const gchar* _tmp5_;
 		gboolean _tmp6_;
 		const gchar* _tmp7_;
 		GdkRGBA _tmp8_ = {0};
-#line 109 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp5_ = self->priv->unfocused_selected_color;
-#line 109 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp6_ = is_string_empty (_tmp5_);
-#line 109 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
 		if (_tmp6_) {
-#line 110 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 106 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 747 "Config.c"
+#line 767 "Config.c"
 		}
-#line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp7_ = self->priv->unfocused_selected_color;
-#line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
 		parse_color (_tmp7_, &_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
 		*result = _tmp8_;
-#line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 757 "Config.c"
+#line 777 "Config.c"
 	}
 }
 
@@ -763,27 +783,27 @@ void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
 	gboolean _tmp1_;
 	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
-#line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 117 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->unselected_color;
-#line 117 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 117 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 113 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_) {
-#line 118 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 114 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 777 "Config.c"
+#line 797 "Config.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->unselected_color;
-#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	parse_color (_tmp2_, &_tmp3_);
-#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	*result = _tmp3_;
-#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 787 "Config.c"
+#line 807 "Config.c"
 }
 
 
@@ -792,27 +812,27 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
 	gboolean _tmp1_;
 	const gchar* _tmp2_;
 	GdkRGBA _tmp3_ = {0};
-#line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 119 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 124 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->border_color;
-#line 124 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 124 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_) {
-#line 125 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 121 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 806 "Config.c"
+#line 826 "Config.c"
 	}
-#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->border_color;
-#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	parse_color (_tmp2_, &_tmp3_);
-#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	*result = _tmp3_;
-#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 816 "Config.c"
+#line 836 "Config.c"
 }
 
 
@@ -823,43 +843,43 @@ void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
 	gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GdkRGBA _tmp4_;
-#line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 126 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 126 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (color != NULL);
-#line 131 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = *color;
-#line 131 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp1_ = _tmp0_.red;
-#line 131 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	col_tmp = (guint8) (_tmp1_ * 255.0);
-#line 133 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = g_strdup_printf ("#%02X%02X%02X", (guint) col_tmp, (guint) col_tmp, (guint) col_tmp);
-#line 133 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->bg_color);
-#line 133 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->bg_color = _tmp2_;
-#line 134 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp3_ = self->priv->bg_color;
-#line 134 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 130 "/home/jens/Source/shotwell/src/config/Config.vala"
 	configuration_facade_set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 132 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp4_ = *color;
-#line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 132 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp4_);
-#line 851 "Config.c"
+#line 871 "Config.c"
 }
 
 
 void config_facade_commit_bg_color (ConfigFacade* self) {
 	const gchar* _tmp0_;
-#line 139 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 135 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_return_if_fail (CONFIG_IS_FACADE (self));
-#line 140 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp0_ = self->priv->bg_color;
-#line 140 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
 	CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp0_);
-#line 863 "Config.c"
+#line 883 "Config.c"
 }
 
 
@@ -872,24 +892,24 @@ static void config_facade_class_init (ConfigFacadeClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = config_facade_finalize;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_signals[CONFIG_FACADE_COLORS_CHANGED_SIGNAL] = g_signal_new ("colors-changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 876 "Config.c"
+#line 896 "Config.c"
 }
 
 
 static void config_facade_instance_init (ConfigFacade * self) {
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv = CONFIG_FACADE_GET_PRIVATE (self);
-#line 42 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 36 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->bg_color = NULL;
-#line 43 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 37 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->selected_color = NULL;
-#line 44 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 38 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->unselected_color = NULL;
-#line 45 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 39 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->unfocused_selected_color = NULL;
-#line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 40 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->border_color = NULL;
-#line 893 "Config.c"
+#line 913 "Config.c"
 }
 
 
@@ -897,19 +917,19 @@ static void config_facade_finalize (GObject * obj) {
 	ConfigFacade * self;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, CONFIG_TYPE_FACADE, ConfigFacade);
-#line 42 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 36 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->bg_color);
-#line 43 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 37 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->selected_color);
-#line 44 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 38 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->unselected_color);
-#line 45 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 39 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->unfocused_selected_color);
-#line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
+#line 40 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_g_free0 (self->priv->border_color);
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	G_OBJECT_CLASS (config_facade_parent_class)->finalize (obj);
-#line 913 "Config.c"
+#line 933 "Config.c"
 }
 
 
diff --git a/src/config/Config.vala b/src/config/Config.vala
index c86abd1..f80bfce 100644
--- a/src/config/Config.vala
+++ b/src/config/Config.vala
@@ -16,12 +16,6 @@
 namespace Config {
 
 public class Facade : ConfigurationFacade {
-    public const double SLIDESHOW_DELAY_MAX = 30.0;
-    public const double SLIDESHOW_DELAY_MIN = 1.0;
-    public const double SLIDESHOW_DELAY_DEFAULT = 3.0;
-    public const double SLIDESHOW_TRANSITION_DELAY_MAX = 1.0;
-    public const double SLIDESHOW_TRANSITION_DELAY_MIN = 0.1;
-    public const double SLIDESHOW_TRANSITION_DELAY_DEFAULT = 0.3;
     public const int WIDTH_DEFAULT = 1024;
     public const int HEIGHT_DEFAULT = 768;
     public const int SIDEBAR_MIN_POSITION = 180;
@@ -53,6 +47,8 @@ public class Facade : ConfigurationFacade {
         base(new GSettingsConfigurationEngine());
 
         bg_color_name_changed.connect(on_color_name_changed);
+        transparent_background_type_changed.connect(on_color_name_changed);
+        transparent_background_color_changed.connect(on_color_name_changed);
     }
     
     public static Facade get_instance() {
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 1b7a93f..e5bfa56 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -64,6 +64,8 @@ typedef struct _Dimensions Dimensions;
 enum  {
 	CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL,
 	CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_TYPE_CHANGED_SIGNAL,
+	CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_COLOR_CHANGED_SIGNAL,
 	CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL,
 	CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL,
 	CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL,
@@ -86,6 +88,8 @@ typedef enum  {
 typedef enum  {
 	CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY = 0,
 	CONFIGURABLE_PROPERTY_BG_COLOR_NAME,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR,
 	CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE,
@@ -235,6 +239,10 @@ struct _ConfigurationFacadeClass {
 	void (*set_auto_import_from_library) (ConfigurationFacade* self, gboolean auto_import);
 	gchar* (*get_bg_color_name) (ConfigurationFacade* self);
 	void (*set_bg_color_name) (ConfigurationFacade* self, const gchar* color_name);
+	gchar* (*get_transparent_background_type) (ConfigurationFacade* self);
+	void (*set_transparent_background_type) (ConfigurationFacade* self, const gchar* type);
+	gchar* (*get_transparent_background_color) (ConfigurationFacade* self);
+	void (*set_transparent_background_color) (ConfigurationFacade* self, const gchar* color_name);
 	gboolean (*get_commit_metadata_to_masters) (ConfigurationFacade* self);
 	void (*set_commit_metadata_to_masters) (ConfigurationFacade* self, gboolean commit_metadata);
 	gchar* (*get_desktop_background) (ConfigurationFacade* self);
@@ -432,6 +440,14 @@ gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self);
 static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade* self);
 void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name);
 static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name);
+gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self);
+static gchar* configuration_facade_real_get_transparent_background_type (ConfigurationFacade* self);
+void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type);
+static void configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, const gchar* type);
+gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self);
+static gchar* configuration_facade_real_get_transparent_background_color (ConfigurationFacade* self);
+void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name);
+static void configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name);
 gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
 static gboolean configuration_facade_real_get_commit_metadata_to_masters (ConfigurationFacade* self);
 void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata);
@@ -723,911 +739,937 @@ GType fuzzy_property_state_get_type (void) {
 
 gchar* configurable_property_to_string (ConfigurableProperty self) {
 	gchar* result = NULL;
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	switch (self) {
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 731 "ConfigurationInterfaces.c"
+#line 747 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp0_;
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp0_ = g_strdup ("AUTO_IMPORT_FROM_LIBRARY");
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp0_;
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 740 "ConfigurationInterfaces.c"
+#line 756 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 744 "ConfigurationInterfaces.c"
+#line 760 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp1_ = g_strdup ("BG_COLOR_NAME");
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 753 "ConfigurationInterfaces.c"
+#line 769 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 757 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE:
+#line 773 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp2_;
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp2_ = g_strdup ("COMMIT_METADATA_TO_MASTERS");
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp2_ = g_strdup ("TRANSPARENT_BACKGROUND_TYPE");
+#line 107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp2_;
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 766 "ConfigurationInterfaces.c"
+#line 782 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
-#line 770 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR:
+#line 786 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp3_ = g_strdup ("DESKTOP_BACKGROUND_FILE");
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 110 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp3_ = g_strdup ("TRANSPARENT_BACKGROUND_COLOR");
+#line 110 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp3_;
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 110 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 779 "ConfigurationInterfaces.c"
+#line 795 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
-#line 783 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
+#line 799 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp4_ = g_strdup ("DESKTOP_BACKGROUND_MODE");
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp4_ = g_strdup ("COMMIT_METADATA_TO_MASTERS");
+#line 113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp4_;
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 792 "ConfigurationInterfaces.c"
+#line 808 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
-#line 796 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
+#line 812 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp5_ = g_strdup ("SCREENSAVER_FILE");
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp5_ = g_strdup ("DESKTOP_BACKGROUND_FILE");
+#line 116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 805 "ConfigurationInterfaces.c"
+#line 821 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
-#line 809 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
+#line 825 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp6_;
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp6_ = g_strdup ("SCREENSAVER_MODE");
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 119 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp6_ = g_strdup ("DESKTOP_BACKGROUND_MODE");
+#line 119 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp6_;
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 119 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 818 "ConfigurationInterfaces.c"
+#line 834 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
-#line 822 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
+#line 838 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp7_;
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp7_ = g_strdup ("DIRECTORY_PATTERN");
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp7_ = g_strdup ("SCREENSAVER_FILE");
+#line 122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp7_;
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 831 "ConfigurationInterfaces.c"
+#line 847 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
-#line 835 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
+#line 851 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp8_;
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp8_ = g_strdup ("DIRECTORY_PATTERN_CUSTOM");
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 125 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp8_ = g_strdup ("SCREENSAVER_MODE");
+#line 125 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp8_;
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 125 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 844 "ConfigurationInterfaces.c"
+#line 860 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
-#line 848 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
+#line 864 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp9_;
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp9_ = g_strdup ("DIRECT_WINDOW_HEIGHT");
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp9_ = g_strdup ("DIRECTORY_PATTERN");
+#line 128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp9_;
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 857 "ConfigurationInterfaces.c"
+#line 873 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
-#line 861 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
+#line 877 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp10_;
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp10_ = g_strdup ("DIRECT_WINDOW_MAXIMIZE");
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp10_ = g_strdup ("DIRECTORY_PATTERN_CUSTOM");
+#line 131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp10_;
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 870 "ConfigurationInterfaces.c"
+#line 886 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
-#line 874 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
+#line 890 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp11_;
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp11_ = g_strdup ("DIRECT_WINDOW_WIDTH");
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp11_ = g_strdup ("DIRECT_WINDOW_HEIGHT");
+#line 134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp11_;
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 883 "ConfigurationInterfaces.c"
+#line 899 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
-#line 887 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
+#line 903 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp12_;
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp12_ = g_strdup ("DISPLAY_BASIC_PROPERTIES");
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp12_ = g_strdup ("DIRECT_WINDOW_MAXIMIZE");
+#line 137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp12_;
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 896 "ConfigurationInterfaces.c"
+#line 912 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
-#line 900 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
+#line 916 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp13_;
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp13_ = g_strdup ("DISPLAY_EXTENDED_PROPERTIES");
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp13_ = g_strdup ("DIRECT_WINDOW_WIDTH");
+#line 140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp13_;
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 909 "ConfigurationInterfaces.c"
+#line 925 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
-#line 913 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
+#line 929 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp14_;
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp14_ = g_strdup ("DISPLAY_SIDEBAR");
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp14_ = g_strdup ("DISPLAY_BASIC_PROPERTIES");
+#line 143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp14_;
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 922 "ConfigurationInterfaces.c"
+#line 938 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
-#line 926 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
+#line 942 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp15_;
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp15_ = g_strdup ("DISPLAY_TOOLBAR");
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp15_ = g_strdup ("DISPLAY_EXTENDED_PROPERTIES");
+#line 146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp15_;
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 935 "ConfigurationInterfaces.c"
+#line 951 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
-#line 939 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
+#line 955 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp16_;
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp16_ = g_strdup ("DISPLAY_SEARCH_BAR");
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 149 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp16_ = g_strdup ("DISPLAY_SIDEBAR");
+#line 149 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp16_;
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 149 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 948 "ConfigurationInterfaces.c"
+#line 964 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
-#line 952 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
+#line 968 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp17_;
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp17_ = g_strdup ("DISPLAY_PHOTO_RATINGS");
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 152 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp17_ = g_strdup ("DISPLAY_TOOLBAR");
+#line 152 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp17_;
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 152 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 961 "ConfigurationInterfaces.c"
+#line 977 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
-#line 965 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
+#line 981 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp18_;
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp18_ = g_strdup ("DISPLAY_PHOTO_TAGS");
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp18_ = g_strdup ("DISPLAY_SEARCH_BAR");
+#line 155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp18_;
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 974 "ConfigurationInterfaces.c"
+#line 990 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
-#line 978 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
+#line 994 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp19_;
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp19_ = g_strdup ("DISPLAY_PHOTO_TITLES");
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp19_ = g_strdup ("DISPLAY_PHOTO_RATINGS");
+#line 158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp19_;
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 987 "ConfigurationInterfaces.c"
+#line 1003 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
-#line 991 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
+#line 1007 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp20_;
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp20_ = g_strdup ("DISPLAY_PHOTO_COMMENTS");
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 161 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp20_ = g_strdup ("DISPLAY_PHOTO_TAGS");
+#line 161 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp20_;
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 161 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1000 "ConfigurationInterfaces.c"
+#line 1016 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
-#line 1004 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
+#line 1020 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp21_;
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp21_ = g_strdup ("DISPLAY_EVENT_COMMENTS");
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp21_ = g_strdup ("DISPLAY_PHOTO_TITLES");
+#line 164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp21_;
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1013 "ConfigurationInterfaces.c"
+#line 1029 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
-#line 1017 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
+#line 1033 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp22_;
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp22_ = g_strdup ("EVENT_PHOTOS_SORT_ASCENDING");
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp22_ = g_strdup ("DISPLAY_PHOTO_COMMENTS");
+#line 167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp22_;
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1026 "ConfigurationInterfaces.c"
+#line 1042 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
-#line 1030 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
+#line 1046 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp23_;
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp23_ = g_strdup ("EVENT_PHOTOS_SORT_BY");
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp23_ = g_strdup ("DISPLAY_EVENT_COMMENTS");
+#line 170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp23_;
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1039 "ConfigurationInterfaces.c"
+#line 1055 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1043 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
+#line 1059 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp24_;
-#line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp24_ = g_strdup ("EVENTS_SORT_ASCENDING");
-#line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 173 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp24_ = g_strdup ("EVENT_PHOTOS_SORT_ASCENDING");
+#line 173 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp24_;
-#line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 173 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1052 "ConfigurationInterfaces.c"
+#line 1068 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
-#line 1056 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
+#line 1072 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp25_;
-#line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp25_ = g_strdup ("EXPORT_CONSTRAINT");
-#line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp25_ = g_strdup ("EVENT_PHOTOS_SORT_BY");
+#line 176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp25_;
-#line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1065 "ConfigurationInterfaces.c"
+#line 1081 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
-#line 1069 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
+#line 1085 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp26_;
-#line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp26_ = g_strdup ("EXPORT_EXPORT_FORMAT_MODE");
-#line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp26_ = g_strdup ("EVENTS_SORT_ASCENDING");
+#line 179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp26_;
-#line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1078 "ConfigurationInterfaces.c"
+#line 1094 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
-#line 1082 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
+#line 1098 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp27_;
-#line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp27_ = g_strdup ("EXPORT_EXPORT_METADATA");
-#line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp27_ = g_strdup ("EXPORT_CONSTRAINT");
+#line 182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp27_;
-#line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1091 "ConfigurationInterfaces.c"
+#line 1107 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
-#line 1095 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
+#line 1111 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp28_;
-#line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp28_ = g_strdup ("EXPORT_PHOTO_FILE_FORMAT");
-#line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp28_ = g_strdup ("EXPORT_EXPORT_FORMAT_MODE");
+#line 185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp28_;
-#line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1104 "ConfigurationInterfaces.c"
+#line 1120 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
-#line 1108 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
+#line 1124 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp29_;
-#line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp29_ = g_strdup ("EXPORT_QUALITY");
-#line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp29_ = g_strdup ("EXPORT_EXPORT_METADATA");
+#line 188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp29_;
-#line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1117 "ConfigurationInterfaces.c"
+#line 1133 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
-#line 1121 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
+#line 1137 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp30_;
-#line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp30_ = g_strdup ("EXPORT_SCALE");
-#line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 191 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp30_ = g_strdup ("EXPORT_PHOTO_FILE_FORMAT");
+#line 191 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp30_;
-#line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 191 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1130 "ConfigurationInterfaces.c"
+#line 1146 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 1134 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
+#line 1150 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp31_;
-#line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp31_ = g_strdup ("EXTERNAL_PHOTO_APP");
-#line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 194 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp31_ = g_strdup ("EXPORT_QUALITY");
+#line 194 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp31_;
-#line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 194 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1143 "ConfigurationInterfaces.c"
+#line 1159 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1147 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
+#line 1163 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp32_;
-#line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp32_ = g_strdup ("EXTERNAL_RAW_APP");
-#line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp32_ = g_strdup ("EXPORT_SCALE");
+#line 197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp32_;
-#line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1156 "ConfigurationInterfaces.c"
+#line 1172 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
-#line 1160 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
+#line 1176 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp33_;
-#line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp33_ = g_strdup ("HIDE_PHOTOS_ALREADY_IMPORTED");
-#line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp33_ = g_strdup ("EXTERNAL_PHOTO_APP");
+#line 200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp33_;
-#line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1169 "ConfigurationInterfaces.c"
+#line 1185 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1173 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
+#line 1189 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp34_;
-#line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp34_ = g_strdup ("IMPORT_DIR");
-#line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp34_ = g_strdup ("EXTERNAL_RAW_APP");
+#line 203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp34_;
-#line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1182 "ConfigurationInterfaces.c"
+#line 1198 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
-#line 1186 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
+#line 1202 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp35_;
-#line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp35_ = g_strdup ("KEEP_RELATIVITY");
-#line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp35_ = g_strdup ("HIDE_PHOTOS_ALREADY_IMPORTED");
+#line 206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp35_;
-#line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1195 "ConfigurationInterfaces.c"
+#line 1211 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
-#line 1199 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
+#line 1215 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp36_;
-#line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp36_ = g_strdup ("LAST_CROP_HEIGHT");
-#line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp36_ = g_strdup ("IMPORT_DIR");
+#line 209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp36_;
-#line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1208 "ConfigurationInterfaces.c"
+#line 1224 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
-#line 1212 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
+#line 1228 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp37_;
-#line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp37_ = g_strdup ("LAST_CROP_MENU_CHOICE");
-#line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp37_ = g_strdup ("KEEP_RELATIVITY");
+#line 212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp37_;
-#line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1221 "ConfigurationInterfaces.c"
+#line 1237 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
-#line 1225 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
+#line 1241 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp38_;
-#line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp38_ = g_strdup ("LAST_CROP_WIDTH");
-#line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp38_ = g_strdup ("LAST_CROP_HEIGHT");
+#line 215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp38_;
-#line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1234 "ConfigurationInterfaces.c"
+#line 1250 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
-#line 1238 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
+#line 1254 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp39_;
-#line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp39_ = g_strdup ("LAST_USED_SERVICE");
-#line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp39_ = g_strdup ("LAST_CROP_MENU_CHOICE");
+#line 218 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp39_;
-#line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1247 "ConfigurationInterfaces.c"
+#line 1263 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
-#line 1251 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
+#line 1267 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp40_;
-#line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp40_ = g_strdup ("LAST_USED_DATAIMPORTS_SERVICE");
-#line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp40_ = g_strdup ("LAST_CROP_WIDTH");
+#line 221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp40_;
-#line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1260 "ConfigurationInterfaces.c"
+#line 1276 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
-#line 1264 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
+#line 1280 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp41_;
-#line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp41_ = g_strdup ("LIBRARY_PHOTOS_SORT_ASCENDING");
-#line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp41_ = g_strdup ("LAST_USED_SERVICE");
+#line 224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp41_;
-#line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1273 "ConfigurationInterfaces.c"
+#line 1289 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
-#line 1277 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
+#line 1293 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp42_;
-#line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp42_ = g_strdup ("LIBRARY_PHOTOS_SORT_BY");
-#line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 227 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp42_ = g_strdup ("LAST_USED_DATAIMPORTS_SERVICE");
+#line 227 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp42_;
-#line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 227 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1286 "ConfigurationInterfaces.c"
+#line 1302 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
-#line 1290 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
+#line 1306 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp43_;
-#line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp43_ = g_strdup ("LIBRARY_WINDOW_HEIGHT");
-#line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp43_ = g_strdup ("LIBRARY_PHOTOS_SORT_ASCENDING");
+#line 230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp43_;
-#line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1299 "ConfigurationInterfaces.c"
+#line 1315 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
-#line 1303 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
+#line 1319 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp44_;
-#line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp44_ = g_strdup ("LIBRARY_WINDOW_MAXIMIZE");
-#line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 233 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp44_ = g_strdup ("LIBRARY_PHOTOS_SORT_BY");
+#line 233 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp44_;
-#line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 233 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1312 "ConfigurationInterfaces.c"
+#line 1328 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
-#line 1316 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
+#line 1332 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp45_;
-#line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp45_ = g_strdup ("LIBRARY_WINDOW_WIDTH");
-#line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp45_ = g_strdup ("LIBRARY_WINDOW_HEIGHT");
+#line 236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp45_;
-#line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1325 "ConfigurationInterfaces.c"
+#line 1341 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
-#line 1329 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
+#line 1345 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp46_;
-#line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp46_ = g_strdup ("MODIFY_ORIGINALS");
-#line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp46_ = g_strdup ("LIBRARY_WINDOW_MAXIMIZE");
+#line 239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp46_;
-#line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1338 "ConfigurationInterfaces.c"
+#line 1354 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
-#line 1342 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
+#line 1358 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp47_;
-#line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp47_ = g_strdup ("PHOTO_THUMBNAIL_SCALE");
-#line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp47_ = g_strdup ("LIBRARY_WINDOW_WIDTH");
+#line 242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp47_;
-#line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1351 "ConfigurationInterfaces.c"
+#line 1367 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
-#line 1355 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
+#line 1371 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp48_;
-#line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp48_ = g_strdup ("PIN_TOOLBAR_STATE");
-#line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp48_ = g_strdup ("MODIFY_ORIGINALS");
+#line 245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp48_;
-#line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1364 "ConfigurationInterfaces.c"
+#line 1380 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
-#line 1368 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
+#line 1384 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp49_;
-#line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp49_ = g_strdup ("PRINTING_CONTENT_HEIGHT");
-#line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp49_ = g_strdup ("PHOTO_THUMBNAIL_SCALE");
+#line 248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp49_;
-#line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1377 "ConfigurationInterfaces.c"
+#line 1393 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
-#line 1381 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
+#line 1397 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp50_;
-#line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp50_ = g_strdup ("PRINTING_CONTENT_LAYOUT");
-#line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp50_ = g_strdup ("PIN_TOOLBAR_STATE");
+#line 251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp50_;
-#line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1390 "ConfigurationInterfaces.c"
+#line 1406 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
-#line 1394 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
+#line 1410 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp51_;
-#line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp51_ = g_strdup ("PRINTING_CONTENT_PPI");
-#line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp51_ = g_strdup ("PRINTING_CONTENT_HEIGHT");
+#line 254 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp51_;
-#line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1403 "ConfigurationInterfaces.c"
+#line 1419 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
-#line 1407 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
+#line 1423 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp52_;
-#line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp52_ = g_strdup ("PRINTING_CONTENT_UNITS");
-#line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp52_ = g_strdup ("PRINTING_CONTENT_LAYOUT");
+#line 257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp52_;
-#line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1416 "ConfigurationInterfaces.c"
+#line 1432 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
-#line 1420 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
+#line 1436 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp53_;
-#line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp53_ = g_strdup ("PRINTING_CONTENT_WIDTH");
-#line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp53_ = g_strdup ("PRINTING_CONTENT_PPI");
+#line 260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp53_;
-#line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1429 "ConfigurationInterfaces.c"
+#line 1445 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
-#line 1433 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
+#line 1449 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp54_;
-#line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp54_ = g_strdup ("PRINTING_IMAGES_PER_PAGE");
-#line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp54_ = g_strdup ("PRINTING_CONTENT_UNITS");
+#line 263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp54_;
-#line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1442 "ConfigurationInterfaces.c"
+#line 1458 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
-#line 1446 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
+#line 1462 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp55_;
-#line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp55_ = g_strdup ("PRINTING_MATCH_ASPECT_RATIO");
-#line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp55_ = g_strdup ("PRINTING_CONTENT_WIDTH");
+#line 266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp55_;
-#line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1455 "ConfigurationInterfaces.c"
+#line 1471 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
-#line 1459 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
+#line 1475 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp56_;
-#line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp56_ = g_strdup ("PRINTING_PRINT_TITLES");
-#line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp56_ = g_strdup ("PRINTING_IMAGES_PER_PAGE");
+#line 269 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp56_;
-#line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1468 "ConfigurationInterfaces.c"
+#line 1484 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
-#line 1472 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
+#line 1488 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp57_;
-#line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp57_ = g_strdup ("PRINTING_SIZE_SELECTION");
-#line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp57_ = g_strdup ("PRINTING_MATCH_ASPECT_RATIO");
+#line 272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp57_;
-#line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1481 "ConfigurationInterfaces.c"
+#line 1497 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
-#line 1485 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
+#line 1501 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp58_;
-#line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp58_ = g_strdup ("PRINTING_TITLES_FONT");
-#line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp58_ = g_strdup ("PRINTING_PRINT_TITLES");
+#line 275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp58_;
-#line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1494 "ConfigurationInterfaces.c"
+#line 1510 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
-#line 1498 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
+#line 1514 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp59_;
-#line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp59_ = g_strdup ("RAW_DEVELOPER_DEFAULT");
-#line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp59_ = g_strdup ("PRINTING_SIZE_SELECTION");
+#line 278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp59_;
-#line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1507 "ConfigurationInterfaces.c"
+#line 1523 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
-#line 1511 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
+#line 1527 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp60_;
-#line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp60_ = g_strdup ("SHOW_WELCOME_DIALOG");
-#line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp60_ = g_strdup ("PRINTING_TITLES_FONT");
+#line 281 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp60_;
-#line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1520 "ConfigurationInterfaces.c"
+#line 1536 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
-#line 1524 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
+#line 1540 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp61_;
-#line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp61_ = g_strdup ("SIDEBAR_POSITION");
-#line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp61_ = g_strdup ("RAW_DEVELOPER_DEFAULT");
+#line 284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp61_;
-#line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1533 "ConfigurationInterfaces.c"
+#line 1549 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
-#line 1537 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
+#line 1553 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp62_;
-#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp62_ = g_strdup ("SLIDESHOW_DELAY");
-#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp62_ = g_strdup ("SHOW_WELCOME_DIALOG");
+#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp62_;
-#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1546 "ConfigurationInterfaces.c"
+#line 1562 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
-#line 1550 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
+#line 1566 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp63_;
-#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp63_ = g_strdup ("SLIDESHOW_TRANSITION_DELAY");
-#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp63_ = g_strdup ("SIDEBAR_POSITION");
+#line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp63_;
-#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1559 "ConfigurationInterfaces.c"
+#line 1575 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
-#line 1563 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
+#line 1579 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp64_;
-#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp64_ = g_strdup ("SLIDESHOW_TRANSITION_EFFECT_ID");
-#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp64_ = g_strdup ("SLIDESHOW_DELAY");
+#line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp64_;
-#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1572 "ConfigurationInterfaces.c"
+#line 1588 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
-#line 1576 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
+#line 1592 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp65_;
-#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp65_ = g_strdup ("SLIDESHOW_SHOW_TITLE");
-#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp65_ = g_strdup ("SLIDESHOW_TRANSITION_DELAY");
+#line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp65_;
-#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1585 "ConfigurationInterfaces.c"
+#line 1601 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
-#line 1589 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
+#line 1605 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp66_;
-#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp66_ = g_strdup ("USE_24_HOUR_TIME");
-#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp66_ = g_strdup ("SLIDESHOW_TRANSITION_EFFECT_ID");
+#line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp66_;
-#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1598 "ConfigurationInterfaces.c"
+#line 1614 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
-#line 1602 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
+#line 1618 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp67_;
-#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp67_ = g_strdup ("USE_LOWERCASE_FILENAMES");
-#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp67_ = g_strdup ("SLIDESHOW_SHOW_TITLE");
+#line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp67_;
-#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1611 "ConfigurationInterfaces.c"
+#line 1627 "ConfigurationInterfaces.c"
 		}
-#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
-#line 1615 "ConfigurationInterfaces.c"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
+#line 1631 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp68_;
-#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp68_ = g_strdup ("VIDEO_INTERPRETER_STATE_COOKIE");
-#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp68_ = g_strdup ("USE_24_HOUR_TIME");
+#line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp68_;
-#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1624 "ConfigurationInterfaces.c"
+#line 1640 "ConfigurationInterfaces.c"
+		}
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
+#line 1644 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp69_;
+#line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp69_ = g_strdup ("USE_LOWERCASE_FILENAMES");
+#line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp69_;
+#line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1653 "ConfigurationInterfaces.c"
+		}
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
+#line 1657 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp70_;
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp70_ = g_strdup ("VIDEO_INTERPRETER_STATE_COOKIE");
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp70_;
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1666 "ConfigurationInterfaces.c"
 		}
 		default:
 		{
-#line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_error ("ConfigurationInterfaces.vala:306: unknown ConfigurableProperty enumera" \
+#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_error ("ConfigurationInterfaces.vala:314: unknown ConfigurableProperty enumera" \
 "tion value");
-#line 1630 "ConfigurationInterfaces.c"
+#line 1672 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1636,7 +1678,7 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 GType configurable_property_get_type (void) {
 	static volatile gsize configurable_property_type_id__volatile = 0;
 	if (g_once_init_enter (&configurable_property_type_id__volatile)) {
-		static const GEnumValue values[] = {{CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, "CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY", "auto-import-from-library"}, {CONFIGURABLE_PROPERTY_BG_COLOR_NAME, "CONFIGURABLE_PROPERTY_BG_COLOR_NAME", "bg-color-name"}, {CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, "CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS", "commit-metadata-to-masters"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE", "desktop-background-file"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE", "desktop-background-mode"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, "CONFIGURABLE_PROPERTY_SCREENSAVER_FILE", "screensaver-file"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "CONFIGURABLE_PROPERTY_SCREENSAVER_MODE", "screensaver-mode"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN", "directory-pattern"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM", "directory-pattern-custom"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT", "direct-window-height"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE", "direct-window-maximize"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH", "direct-window-width"}, {CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES", "display-basic-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS", "display-event-comments"}, {CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES", "display-extended-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, "CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR", "display-sidebar"}, {CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, "CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR", "display-toolbar"}, {CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, "CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR", "display-search-bar"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS", "display-photo-ratings"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS", "display-photo-tags"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES", "display-photo-titles"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS", "display-photo-comments"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING", "event-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY", "event-photos-sort-by"}, {CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING", "events-sort-ascending"}, {CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, "CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT", "export-constraint"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE", "export-export-format-mode"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA", "export-export-metadata"}, {CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, "CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT", "export-photo-file-format"}, {CONFIGURABLE_PROPERTY_EXPORT_QUALITY, "CONFIGURABLE_PROPERTY_EXPORT_QUALITY", "export-quality"}, {CONFIGURABLE_PROPERTY_EXPORT_SCALE, "CONFIGURABLE_PROPERTY_EXPORT_SCALE", "export-scale"}, {CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP", "external-photo-app"}, {CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP", "external-raw-app"}, {CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, "CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED", "hide-photos-already-imported"}, {CONFIGURABLE_PROPERTY_IMPORT_DIR, "CONFIGURABLE_PROPERTY_IMPORT_DIR", "import-dir"}, {CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, "CONFIGURABLE_PROPERTY_KEEP_RELATIVITY", "keep-relativity"}, {CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, "CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT", "last-crop-height"}, {CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, "CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE", "last-crop-menu-choice"}, {CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, "CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH", "last-crop-width"}, {CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_SERVICE", "last-used-service"}, {CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE", "last-used-dataimports-service"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING", "library-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY", "library-photos-sort-by"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT", "library-window-height"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE", "library-window-maximize"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH", "library-window-width"}, {CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, "CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS", "modify-originals"}, {CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, "CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE", "photo-thumbnail-scale"}, {CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, "CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE", "pin-toolbar-state"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT", "printing-content-height"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT", "printing-content-layout"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI", "printing-content-ppi"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS", "printing-content-units"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH", "printing-content-width"}, {CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, "CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE", "printing-images-per-page"}, {CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, "CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO", "printing-match-aspect-ratio"}, {CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, "CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES", "printing-print-titles"}, {CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, "CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION", "printing-size-selection"}, {CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, "CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT", "printing-titles-font"}, {CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, "CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT", "raw-developer-default"}, {CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, "CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG", "show-welcome-dialog"}, {CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, "CONFIGURABLE_PROPERTY_SIDEBAR_POSITION", "sidebar-position"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY", "slideshow-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY", "slideshow-transition-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID", "slideshow-transition-effect-id"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, "CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE", "slideshow-show-title"}, {CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, "CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME", "use-24-hour-time"}, {CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, "CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES", "use-lowercase-filenames"}, {CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, "CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE", "video-interpreter-state-cookie"}, {CONFIGURABLE_PROPERTY_NUM_PROPERTIES, "CONFIGURABLE_PROPERTY_NUM_PROPERTIES", "num-properties"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, "CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY", "auto-import-from-library"}, {CONFIGURABLE_PROPERTY_BG_COLOR_NAME, "CONFIGURABLE_PROPERTY_BG_COLOR_NAME", "bg-color-name"}, {CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, "CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE", "transparent-background-type"}, {CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, "CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR", "transparent-background-color"}, {CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, "CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS", "commit-metadata-to-masters"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE", "desktop-background-file"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE", "desktop-background-mode"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, "CONFIGURABLE_PROPERTY_SCREENSAVER_FILE", "screensaver-file"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "CONFIGURABLE_PROPERTY_SCREENSAVER_MODE", "screensaver-mode"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN", "directory-pattern"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM", "directory-pattern-custom"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT", "direct-window-height"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE", "direct-window-maximize"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH", "direct-window-width"}, {CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES", "display-basic-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS", "display-event-comments"}, {CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES", "display-extended-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, "CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR", "display-sidebar"}, {CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, "CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR", "display-toolbar"}, {CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, "CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR", "display-search-bar"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS", "display-photo-ratings"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS", "display-photo-tags"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES", "display-photo-titles"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS", "display-photo-comments"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING", "event-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY", "event-photos-sort-by"}, {CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING", "events-sort-ascending"}, {CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, "CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT", "export-constraint"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE", "export-export-format-mode"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA", "export-export-metadata"}, {CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, "CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT", "export-photo-file-format"}, {CONFIGURABLE_PROPERTY_EXPORT_QUALITY, "CONFIGURABLE_PROPERTY_EXPORT_QUALITY", "export-quality"}, {CONFIGURABLE_PROPERTY_EXPORT_SCALE, "CONFIGURABLE_PROPERTY_EXPORT_SCALE", "export-scale"}, {CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP", "external-photo-app"}, {CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP", "external-raw-app"}, {CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, "CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED", "hide-photos-already-imported"}, {CONFIGURABLE_PROPERTY_IMPORT_DIR, "CONFIGURABLE_PROPERTY_IMPORT_DIR", "import-dir"}, {CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, "CONFIGURABLE_PROPERTY_KEEP_RELATIVITY", "keep-relativity"}, {CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, "CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT", "last-crop-height"}, {CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, "CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE", "last-crop-menu-choice"}, {CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, "CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH", "last-crop-width"}, {CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_SERVICE", "last-used-service"}, {CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE", "last-used-dataimports-service"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING", "library-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY", "library-photos-sort-by"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT", "library-window-height"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE", "library-window-maximize"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH", "library-window-width"}, {CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, "CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS", "modify-originals"}, {CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, "CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE", "photo-thumbnail-scale"}, {CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, "CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE", "pin-toolbar-state"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT", "printing-content-height"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT", "printing-content-layout"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI", "printing-content-ppi"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS", "printing-content-units"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH", "printing-content-width"}, {CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, "CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE", "printing-images-per-page"}, {CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, "CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO", "printing-match-aspect-ratio"}, {CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, "CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES", "printing-print-titles"}, {CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, "CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION", "printing-size-selection"}, {CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, "CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT", "printing-titles-font"}, {CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, "CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT", "raw-developer-default"}, {CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, "CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG", "show-welcome-dialog"}, {CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, "CONFIGURABLE_PROPERTY_SIDEBAR_POSITION", "sidebar-position"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY", "slideshow-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY", "slideshow-transition-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID", "slideshow-transition-effect-id"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, "CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE", "slideshow-show-title"}, {CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, "CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME", "use-24-hour-time"}, {CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, "CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES", "use-lowercase-filenames"}, {CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, "CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE", "video-interpreter-state-cookie"}, {CONFIGURABLE_PROPERTY_NUM_PROPERTIES, "CONFIGURABLE_PROPERTY_NUM_PROPERTIES", "num-properties"}, {0, NULL, NULL}};
 		GType configurable_property_type_id;
 		configurable_property_type_id = g_enum_register_static ("ConfigurableProperty", values);
 		g_once_init_leave (&configurable_property_type_id__volatile, configurable_property_type_id);
@@ -1646,213 +1688,213 @@ GType configurable_property_get_type (void) {
 
 
 gchar* configuration_engine_get_name (ConfigurationEngine* self) {
-#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self);
-#line 1653 "ConfigurationInterfaces.c"
+#line 1695 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_engine_get_int_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 324 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 324 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error);
-#line 1662 "ConfigurationInterfaces.c"
+#line 1704 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_int_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) {
-#line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error);
-#line 1671 "ConfigurationInterfaces.c"
+#line 1713 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_engine_get_enum_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_enum_property (self, p, error);
-#line 1680 "ConfigurationInterfaces.c"
+#line 1722 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_enum_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) {
-#line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_enum_property (self, p, val, error);
-#line 1689 "ConfigurationInterfaces.c"
+#line 1731 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_engine_get_string_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error);
-#line 1698 "ConfigurationInterfaces.c"
+#line 1740 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_string_property (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error) {
-#line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error);
-#line 1707 "ConfigurationInterfaces.c"
+#line 1749 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
-#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error);
-#line 1716 "ConfigurationInterfaces.c"
+#line 1758 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_bool_property (ConfigurationEngine* self, ConfigurableProperty p, gboolean val, GError** error) {
-#line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error);
-#line 1725 "ConfigurationInterfaces.c"
+#line 1767 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_engine_get_double_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
-#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error);
-#line 1734 "ConfigurationInterfaces.c"
+#line 1776 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_double_property (ConfigurationEngine* self, ConfigurableProperty p, gdouble val, GError** error) {
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error);
-#line 1743 "ConfigurationInterfaces.c"
+#line 1785 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
-#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_bool (self, domain, id, key, def);
-#line 1752 "ConfigurationInterfaces.c"
+#line 1794 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val);
-#line 1761 "ConfigurationInterfaces.c"
+#line 1803 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
-#line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_double (self, domain, id, key, def);
-#line 1770 "ConfigurationInterfaces.c"
+#line 1812 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val);
-#line 1779 "ConfigurationInterfaces.c"
+#line 1821 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_int (self, domain, id, key, def);
-#line 1788 "ConfigurationInterfaces.c"
+#line 1830 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val);
-#line 1797 "ConfigurationInterfaces.c"
+#line 1839 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_string (self, domain, id, key, def);
-#line 1806 "ConfigurationInterfaces.c"
+#line 1848 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val);
-#line 1815 "ConfigurationInterfaces.c"
+#line 1857 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key);
-#line 1824 "ConfigurationInterfaces.c"
+#line 1866 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine* self, const gchar* id) {
-#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id);
-#line 1833 "ConfigurationInterfaces.c"
+#line 1875 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const gchar* id, gboolean enabled) {
-#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled);
-#line 1842 "ConfigurationInterfaces.c"
+#line 1884 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_engine_base_init (ConfigurationEngineIface * iface) {
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	static gboolean initialized = FALSE;
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (!initialized) {
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		initialized = TRUE;
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_signals[CONFIGURATION_ENGINE_PROPERTY_CHANGED_SIGNAL] = g_signal_new ("property-changed", TYPE_CONFIGURATION_ENGINE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_CONFIGURABLE_PROPERTY);
-#line 1855 "ConfigurationInterfaces.c"
+#line 1897 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1871,16 +1913,16 @@ GType configuration_engine_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1876 "ConfigurationInterfaces.c"
+#line 1918 "ConfigurationInterfaces.c"
 }
 
 
 static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self) {
-#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_on_property_changed ((ConfigurationFacade*) self, p);
-#line 1883 "ConfigurationInterfaces.c"
+#line 1925 "ConfigurationInterfaces.c"
 }
 
 
@@ -1889,25 +1931,25 @@ ConfigurationFacade* configuration_facade_construct (GType object_type, Configur
 	ConfigurationEngine* _tmp0_;
 	ConfigurationEngine* _tmp1_;
 	ConfigurationEngine* _tmp2_;
-#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (engine), NULL);
-#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self = (ConfigurationFacade*) g_object_new (object_type, NULL);
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = engine;
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (self->priv->engine);
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv->engine = _tmp1_;
-#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = engine;
-#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_connect_object (_tmp2_, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0);
-#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self;
-#line 1910 "ConfigurationInterfaces.c"
+#line 1952 "ConfigurationInterfaces.c"
 }
 
 
@@ -1916,89 +1958,109 @@ static void configuration_facade_on_property_changed (ConfigurationFacade* self,
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	ConfigurableProperty _tmp3_;
-#line 361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = p;
-#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configurable_property_to_string (_tmp0_);
-#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_debug ("ConfigurationInterfaces.vala:362: ConfigurationFacade: engine reports " \
+#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_debug ("ConfigurationInterfaces.vala:372: ConfigurationFacade: engine reports " \
 "property '%s' changed.", _tmp2_);
-#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_tmp2_);
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = p;
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	switch (_tmp3_) {
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 1937 "ConfigurationInterfaces.c"
+#line 1979 "ConfigurationInterfaces.c"
 		{
-#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL], 0);
-#line 367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1943 "ConfigurationInterfaces.c"
+#line 1985 "ConfigurationInterfaces.c"
 		}
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 1947 "ConfigurationInterfaces.c"
+#line 1989 "ConfigurationInterfaces.c"
 		{
-#line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL], 0);
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 381 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1953 "ConfigurationInterfaces.c"
+#line 1995 "ConfigurationInterfaces.c"
 		}
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 1957 "ConfigurationInterfaces.c"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE:
+#line 1999 "ConfigurationInterfaces.c"
 		{
+#line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_TYPE_CHANGED_SIGNAL], 0);
+#line 385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			break;
+#line 2005 "ConfigurationInterfaces.c"
+		}
 #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR:
+#line 2009 "ConfigurationInterfaces.c"
+		{
+#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_COLOR_CHANGED_SIGNAL], 0);
+#line 389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			break;
+#line 2015 "ConfigurationInterfaces.c"
+		}
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
+#line 2019 "ConfigurationInterfaces.c"
+		{
+#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL], 0);
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1963 "ConfigurationInterfaces.c"
+#line 2025 "ConfigurationInterfaces.c"
 		}
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1967 "ConfigurationInterfaces.c"
+#line 2029 "ConfigurationInterfaces.c"
 		{
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL], 0);
-#line 379 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1973 "ConfigurationInterfaces.c"
+#line 2035 "ConfigurationInterfaces.c"
 		}
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1979 "ConfigurationInterfaces.c"
+#line 2041 "ConfigurationInterfaces.c"
 		{
-#line 383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL], 0);
-#line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1985 "ConfigurationInterfaces.c"
+#line 2047 "ConfigurationInterfaces.c"
 		}
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1989 "ConfigurationInterfaces.c"
+#line 2051 "ConfigurationInterfaces.c"
 		{
-#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit (self, configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL], 0);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1995 "ConfigurationInterfaces.c"
+#line 2057 "ConfigurationInterfaces.c"
 		}
 		default:
-#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		break;
-#line 2000 "ConfigurationInterfaces.c"
+#line 2062 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2007,100 +2069,100 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self)
 	ConfigurationEngine* result = NULL;
 	ConfigurationEngine* _tmp0_;
 	ConfigurationEngine* _tmp1_;
-#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = self->priv->engine;
-#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp1_;
-#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 2019 "ConfigurationInterfaces.c"
+#line 2081 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_on_configuration_error (ConfigurationFacade* self, GError* err) {
 	GError* _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = err;
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) {
-#line 2031 "ConfigurationInterfaces.c"
+#line 2093 "ConfigurationInterfaces.c"
 		ConfigurationEngine* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		GError* _tmp4_;
 		const gchar* _tmp5_;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = self->priv->engine;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = configuration_engine_get_name (_tmp1_);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = _tmp2_;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = err;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp4_->message;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		g_message ("ConfigurationInterfaces.vala:398: configuration engine '%s' reports PR" \
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_message ("ConfigurationInterfaces.vala:416: configuration engine '%s' reports PR" \
 "OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp3_);
-#line 2051 "ConfigurationInterfaces.c"
+#line 2113 "ConfigurationInterfaces.c"
 	} else {
 		GError* _tmp6_;
-#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) {
-#line 2058 "ConfigurationInterfaces.c"
+#line 2120 "ConfigurationInterfaces.c"
 			ConfigurationEngine* _tmp7_;
 			gchar* _tmp8_;
 			gchar* _tmp9_;
 			GError* _tmp10_;
 			const gchar* _tmp11_;
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = self->priv->engine;
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp8_ = configuration_engine_get_name (_tmp7_);
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp9_ = _tmp8_;
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp10_ = err;
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp11_ = _tmp10_->message;
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_critical ("ConfigurationInterfaces.vala:402: configuration engine '%s' reports EN" \
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("ConfigurationInterfaces.vala:420: configuration engine '%s' reports EN" \
 "GINE_ERROR: %s", _tmp9_, _tmp11_);
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp9_);
-#line 2078 "ConfigurationInterfaces.c"
+#line 2140 "ConfigurationInterfaces.c"
 		} else {
 			ConfigurationEngine* _tmp12_;
 			gchar* _tmp13_;
 			gchar* _tmp14_;
 			GError* _tmp15_;
 			const gchar* _tmp16_;
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp12_ = self->priv->engine;
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp13_ = configuration_engine_get_name (_tmp12_);
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp14_ = _tmp13_;
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp15_ = err;
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp16_ = _tmp15_->message;
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_critical ("ConfigurationInterfaces.vala:405: configuration engine '%s' reports un" \
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("ConfigurationInterfaces.vala:423: configuration engine '%s' reports un" \
 "known error: %s", _tmp14_, _tmp16_);
-#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp14_);
-#line 2099 "ConfigurationInterfaces.c"
+#line 2161 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -2116,79 +2178,79 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, &_inner_error_);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2129 "ConfigurationInterfaces.c"
+#line 2191 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2133 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+#line 2195 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 2142 "ConfigurationInterfaces.c"
+#line 2204 "ConfigurationInterfaces.c"
 		}
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2148 "ConfigurationInterfaces.c"
+#line 2210 "ConfigurationInterfaces.c"
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2169 "ConfigurationInterfaces.c"
+#line 2231 "ConfigurationInterfaces.c"
 	}
-	__finally83:
-#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally91:
+#line 432 "/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"
+#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 2178 "ConfigurationInterfaces.c"
+#line 2240 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self) {
-#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self);
-#line 2187 "ConfigurationInterfaces.c"
+#line 2249 "ConfigurationInterfaces.c"
 }
 
 
@@ -2198,71 +2260,71 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = auto_import;
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, _tmp2_, &_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2211 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+#line 2273 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2220 "ConfigurationInterfaces.c"
+#line 2282 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2240 "ConfigurationInterfaces.c"
+#line 2302 "ConfigurationInterfaces.c"
 	}
-	__finally84:
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally92:
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/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 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2251 "ConfigurationInterfaces.c"
+#line 2313 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import) {
-#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import);
-#line 2261 "ConfigurationInterfaces.c"
+#line 2323 "ConfigurationInterfaces.c"
 }
 
 
@@ -2276,163 +2338,503 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, &_inner_error_);
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2291 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+#line 2353 "ConfigurationInterfaces.c"
+				goto __catch93_configuration_error;
 			}
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2300 "ConfigurationInterfaces.c"
+#line 2362 "ConfigurationInterfaces.c"
 		}
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2312 "ConfigurationInterfaces.c"
+#line 2374 "ConfigurationInterfaces.c"
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2336 "ConfigurationInterfaces.c"
+#line 2398 "ConfigurationInterfaces.c"
 	}
-	__finally85:
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally93:
+#line 455 "/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"
+#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2345 "ConfigurationInterfaces.c"
+#line 2407 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) {
-#line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self);
-#line 2354 "ConfigurationInterfaces.c"
+#line 2416 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) {
 	GError * _inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (color_name != NULL);
-#line 2362 "ConfigurationInterfaces.c"
+#line 2424 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = color_name;
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, _tmp2_, &_inner_error_);
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2381 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2443 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2390 "ConfigurationInterfaces.c"
+#line 2452 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2410 "ConfigurationInterfaces.c"
+#line 2472 "ConfigurationInterfaces.c"
 	}
-	__finally86:
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally94:
+#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 465 "/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 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2421 "ConfigurationInterfaces.c"
+#line 2483 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) {
-#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name);
-#line 2431 "ConfigurationInterfaces.c"
+#line 2493 "ConfigurationInterfaces.c"
+}
+
+
+static gchar* configuration_facade_real_get_transparent_background_type (ConfigurationFacade* self) {
+	gchar* result = NULL;
+	GError * _inner_error_ = NULL;
+	{
+		gchar* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, &_inner_error_);
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2523 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
+			}
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("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 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return NULL;
+#line 2532 "ConfigurationInterfaces.c"
+		}
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = _tmp0_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = NULL;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = _tmp5_;
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_free0 (_tmp0_);
+#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 2544 "ConfigurationInterfaces.c"
+	}
+	goto __finally95;
+	__catch95_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
+#line 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp6_ = err;
+#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp6_);
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp7_ = g_strdup ("checkered");
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = _tmp7_;
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 2568 "ConfigurationInterfaces.c"
+	}
+	__finally95:
+#line 477 "/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 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_clear_error (&_inner_error_);
+#line 477 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	return NULL;
+#line 2577 "ConfigurationInterfaces.c"
+}
+
+
+gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self) {
+#line 476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
+#line 476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	return CONFIGURATION_FACADE_GET_CLASS (self)->get_transparent_background_type (self);
+#line 2586 "ConfigurationInterfaces.c"
+}
+
+
+static void configuration_facade_real_set_transparent_background_type (ConfigurationFacade* self, const gchar* type) {
+	GError * _inner_error_ = NULL;
+#line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_if_fail (type != NULL);
+#line 2594 "ConfigurationInterfaces.c"
+	{
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = type;
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE, _tmp2_, &_inner_error_);
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2613 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
+			}
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("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 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 2622 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally96;
+	__catch96_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_;
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 2642 "ConfigurationInterfaces.c"
+	}
+	__finally96:
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 487 "/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 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 2653 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type) {
+#line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
+#line 486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	CONFIGURATION_FACADE_GET_CLASS (self)->set_transparent_background_type (self, type);
+#line 2663 "ConfigurationInterfaces.c"
+}
+
+
+static gchar* configuration_facade_real_get_transparent_background_color (ConfigurationFacade* self) {
+	gchar* result = NULL;
+	GError * _inner_error_ = NULL;
+	{
+		gchar* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_;
+		ConfigurationEngine* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, &_inner_error_);
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2693 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
+			}
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("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 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return NULL;
+#line 2702 "ConfigurationInterfaces.c"
+		}
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = _tmp0_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = NULL;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = _tmp5_;
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_free0 (_tmp0_);
+#line 500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 2714 "ConfigurationInterfaces.c"
+	}
+	goto __finally97;
+	__catch97_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp6_;
+		gchar* _tmp7_;
+#line 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp6_ = err;
+#line 502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp6_);
+#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp7_ = g_strdup ("#444");
+#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = _tmp7_;
+#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 2738 "ConfigurationInterfaces.c"
+	}
+	__finally97:
+#line 499 "/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 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_clear_error (&_inner_error_);
+#line 499 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	return NULL;
+#line 2747 "ConfigurationInterfaces.c"
+}
+
+
+gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self) {
+#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
+#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	return CONFIGURATION_FACADE_GET_CLASS (self)->get_transparent_background_color (self);
+#line 2756 "ConfigurationInterfaces.c"
+}
+
+
+static void configuration_facade_real_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name) {
+	GError * _inner_error_ = NULL;
+#line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_if_fail (color_name != NULL);
+#line 2764 "ConfigurationInterfaces.c"
+	{
+		ConfigurationEngine* _tmp0_;
+		ConfigurationEngine* _tmp1_;
+		const gchar* _tmp2_;
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = color_name;
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR, _tmp2_, &_inner_error_);
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 2783 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
+			}
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("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 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 510 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 2792 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally98;
+	__catch98_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_;
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 2812 "ConfigurationInterfaces.c"
+	}
+	__finally98:
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 509 "/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 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 2823 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name) {
+#line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
+#line 508 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	CONFIGURATION_FACADE_GET_CLASS (self)->set_transparent_background_color (self, color_name);
+#line 2833 "ConfigurationInterfaces.c"
 }
 
 
@@ -2446,79 +2848,79 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, &_inner_error_);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2459 "ConfigurationInterfaces.c"
+#line 2861 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2463 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+#line 2865 "ConfigurationInterfaces.c"
+				goto __catch99_configuration_error;
 			}
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 2472 "ConfigurationInterfaces.c"
+#line 2874 "ConfigurationInterfaces.c"
 		}
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2478 "ConfigurationInterfaces.c"
+#line 2880 "ConfigurationInterfaces.c"
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2499 "ConfigurationInterfaces.c"
+#line 2901 "ConfigurationInterfaces.c"
 	}
-	__finally87:
-#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally99:
+#line 521 "/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"
+#line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 2508 "ConfigurationInterfaces.c"
+#line 2910 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self) {
-#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self);
-#line 2517 "ConfigurationInterfaces.c"
+#line 2919 "ConfigurationInterfaces.c"
 }
 
 
@@ -2528,71 +2930,71 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = commit_metadata;
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, _tmp2_, &_inner_error_);
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2541 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2943 "ConfigurationInterfaces.c"
+				goto __catch100_configuration_error;
 			}
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2550 "ConfigurationInterfaces.c"
+#line 2952 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2570 "ConfigurationInterfaces.c"
+#line 2972 "ConfigurationInterfaces.c"
 	}
-	__finally88:
-#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally100:
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/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 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2581 "ConfigurationInterfaces.c"
+#line 2983 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata) {
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata);
-#line 2591 "ConfigurationInterfaces.c"
+#line 2993 "ConfigurationInterfaces.c"
 }
 
 
@@ -2606,186 +3008,186 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, &_inner_error_);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2621 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 3023 "ConfigurationInterfaces.c"
+				goto __catch101_configuration_error;
 			}
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2630 "ConfigurationInterfaces.c"
+#line 3032 "ConfigurationInterfaces.c"
 		}
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2642 "ConfigurationInterfaces.c"
+#line 3044 "ConfigurationInterfaces.c"
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 485 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2666 "ConfigurationInterfaces.c"
+#line 3068 "ConfigurationInterfaces.c"
 	}
-	__finally89:
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally101:
+#line 544 "/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"
+#line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2675 "ConfigurationInterfaces.c"
+#line 3077 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) {
-#line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self);
-#line 2684 "ConfigurationInterfaces.c"
+#line 3086 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_desktop_background (ConfigurationFacade* self, const gchar* filename) {
 	GError * _inner_error_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2692 "ConfigurationInterfaces.c"
+#line 3094 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
 		ConfigurationEngine* _tmp3_;
 		ConfigurationEngine* _tmp4_;
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = filename;
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, _tmp2_, &_inner_error_);
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2713 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 3115 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2722 "ConfigurationInterfaces.c"
+#line 3124 "ConfigurationInterfaces.c"
 		}
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "zoom", &_inner_error_);
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2736 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 3138 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2745 "ConfigurationInterfaces.c"
+#line 3147 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2763 "ConfigurationInterfaces.c"
+#line 3165 "ConfigurationInterfaces.c"
 	}
-	__finally90:
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally102:
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/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 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2774 "ConfigurationInterfaces.c"
+#line 3176 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_desktop_background (ConfigurationFacade* self, const gchar* filename) {
-#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename);
-#line 2784 "ConfigurationInterfaces.c"
+#line 3186 "ConfigurationInterfaces.c"
 }
 
 
@@ -2799,186 +3201,186 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, &_inner_error_);
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2814 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 3216 "ConfigurationInterfaces.c"
+				goto __catch103_configuration_error;
 			}
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2823 "ConfigurationInterfaces.c"
+#line 3225 "ConfigurationInterfaces.c"
 		}
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2835 "ConfigurationInterfaces.c"
+#line 3237 "ConfigurationInterfaces.c"
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2859 "ConfigurationInterfaces.c"
+#line 3261 "ConfigurationInterfaces.c"
 	}
-	__finally91:
-#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally103:
+#line 568 "/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"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2868 "ConfigurationInterfaces.c"
+#line 3270 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) {
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self);
-#line 2877 "ConfigurationInterfaces.c"
+#line 3279 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_screensaver (ConfigurationFacade* self, const gchar* filename) {
 	GError * _inner_error_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2885 "ConfigurationInterfaces.c"
+#line 3287 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
 		ConfigurationEngine* _tmp3_;
 		ConfigurationEngine* _tmp4_;
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = filename;
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, _tmp2_, &_inner_error_);
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2906 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3308 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2915 "ConfigurationInterfaces.c"
+#line 3317 "ConfigurationInterfaces.c"
 		}
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "zoom", &_inner_error_);
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2929 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3331 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2938 "ConfigurationInterfaces.c"
+#line 3340 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2956 "ConfigurationInterfaces.c"
+#line 3358 "ConfigurationInterfaces.c"
 	}
-	__finally92:
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally104:
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/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 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2967 "ConfigurationInterfaces.c"
+#line 3369 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_screensaver (ConfigurationFacade* self, const gchar* filename) {
-#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename);
-#line 2977 "ConfigurationInterfaces.c"
+#line 3379 "ConfigurationInterfaces.c"
 }
 
 
@@ -2993,94 +3395,94 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		gchar* _tmp3_;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = configuration_engine_get_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, &_inner_error_);
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = _tmp2_;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		s = _tmp3_;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3008 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3410 "ConfigurationInterfaces.c"
+				goto __catch105_configuration_error;
 			}
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3017 "ConfigurationInterfaces.c"
+#line 3419 "ConfigurationInterfaces.c"
 		}
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_strcmp0 (s, "") == 0) {
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = NULL;
-#line 3023 "ConfigurationInterfaces.c"
+#line 3425 "ConfigurationInterfaces.c"
 		} else {
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 3027 "ConfigurationInterfaces.c"
+#line 3429 "ConfigurationInterfaces.c"
 		}
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (s);
-#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3037 "ConfigurationInterfaces.c"
+#line 3439 "ConfigurationInterfaces.c"
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3061 "ConfigurationInterfaces.c"
+#line 3463 "ConfigurationInterfaces.c"
 	}
-	__finally93:
-#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally105:
+#line 592 "/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"
+#line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3070 "ConfigurationInterfaces.c"
+#line 3472 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) {
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self);
-#line 3079 "ConfigurationInterfaces.c"
+#line 3481 "ConfigurationInterfaces.c"
 }
 
 
@@ -3091,77 +3493,77 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		ConfigurationEngine* _tmp1_;
 		ConfigurationEngine* _tmp2_;
 		const gchar* _tmp3_;
-#line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = s;
-#line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (_tmp0_ == NULL) {
-#line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 3096 "ConfigurationInterfaces.c"
+#line 3498 "ConfigurationInterfaces.c"
 		}
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = s;
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, _tmp3_, &_inner_error_);
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3112 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3514 "ConfigurationInterfaces.c"
+				goto __catch106_configuration_error;
 			}
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3121 "ConfigurationInterfaces.c"
+#line 3523 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = err;
-#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp4_);
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3139 "ConfigurationInterfaces.c"
+#line 3541 "ConfigurationInterfaces.c"
 	}
-	__finally94:
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally106:
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/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 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3150 "ConfigurationInterfaces.c"
+#line 3552 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s) {
-#line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s);
-#line 3160 "ConfigurationInterfaces.c"
+#line 3562 "ConfigurationInterfaces.c"
 }
 
 
@@ -3175,161 +3577,161 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, &_inner_error_);
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3190 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3592 "ConfigurationInterfaces.c"
+				goto __catch107_configuration_error;
 			}
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3199 "ConfigurationInterfaces.c"
+#line 3601 "ConfigurationInterfaces.c"
 		}
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3211 "ConfigurationInterfaces.c"
+#line 3613 "ConfigurationInterfaces.c"
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3235 "ConfigurationInterfaces.c"
+#line 3637 "ConfigurationInterfaces.c"
 	}
-	__finally95:
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally107:
+#line 617 "/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"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3244 "ConfigurationInterfaces.c"
+#line 3646 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self) {
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self);
-#line 3253 "ConfigurationInterfaces.c"
+#line 3655 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) {
 	GError * _inner_error_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (s != NULL);
-#line 3261 "ConfigurationInterfaces.c"
+#line 3663 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = s;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, _tmp2_, &_inner_error_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3280 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3682 "ConfigurationInterfaces.c"
+				goto __catch108_configuration_error;
 			}
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3289 "ConfigurationInterfaces.c"
+#line 3691 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3307 "ConfigurationInterfaces.c"
+#line 3709 "ConfigurationInterfaces.c"
 	}
-	__finally96:
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally108:
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/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 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3318 "ConfigurationInterfaces.c"
+#line 3720 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) {
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s);
-#line 3328 "ConfigurationInterfaces.c"
+#line 3730 "ConfigurationInterfaces.c"
 }
 
 
@@ -3337,11 +3739,11 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 	gboolean _vala_maximize = FALSE;
 	Dimensions _vala_dimensions = {0};
 	GError * _inner_error_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_maximize = FALSE;
-#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 3340 "ConfigurationInterfaces.c"
+#line 3742 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_;
@@ -3360,154 +3762,154 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		gint _tmp12_;
 		gint _tmp13_;
 		gint _tmp14_;
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, &_inner_error_);
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3375 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3777 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3384 "ConfigurationInterfaces.c"
+#line 3786 "ConfigurationInterfaces.c"
 		}
-#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = configuration_facade_get_engine (self);
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, &_inner_error_);
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp6_);
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		w = _tmp8_;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3404 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3806 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3413 "ConfigurationInterfaces.c"
+#line 3815 "ConfigurationInterfaces.c"
 		}
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, &_inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp12_ = _tmp11_;
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp10_);
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		h = _tmp12_;
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3431 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3833 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3440 "ConfigurationInterfaces.c"
+#line 3842 "ConfigurationInterfaces.c"
 		}
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp14_ = h;
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 3448 "ConfigurationInterfaces.c"
+#line 3850 "ConfigurationInterfaces.c"
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp15_ = err;
-#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp15_);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3465 "ConfigurationInterfaces.c"
+#line 3867 "ConfigurationInterfaces.c"
 	}
-	__finally97:
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally109:
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/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 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 640 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3476 "ConfigurationInterfaces.c"
+#line 3878 "ConfigurationInterfaces.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 3482 "ConfigurationInterfaces.c"
+#line 3884 "ConfigurationInterfaces.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 3488 "ConfigurationInterfaces.c"
+#line 3890 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) {
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions);
-#line 3498 "ConfigurationInterfaces.c"
+#line 3900 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
 	GError * _inner_error_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 3506 "ConfigurationInterfaces.c"
+#line 3908 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
@@ -3520,123 +3922,123 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		ConfigurationEngine* _tmp8_;
 		Dimensions _tmp9_;
 		gint _tmp10_;
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = maximize;
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_);
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3533 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3935 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3542 "ConfigurationInterfaces.c"
+#line 3944 "ConfigurationInterfaces.c"
 		}
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = *dimensions;
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_.width;
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, _tmp6_, &_inner_error_);
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3560 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3962 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3569 "ConfigurationInterfaces.c"
+#line 3971 "ConfigurationInterfaces.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = *dimensions;
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_.height;
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, _tmp10_, &_inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp8_);
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3587 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3989 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3596 "ConfigurationInterfaces.c"
+#line 3998 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_;
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = err;
-#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp11_);
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3614 "ConfigurationInterfaces.c"
+#line 4016 "ConfigurationInterfaces.c"
 	}
-	__finally98:
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally110:
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/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 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3625 "ConfigurationInterfaces.c"
+#line 4027 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions);
-#line 3635 "ConfigurationInterfaces.c"
+#line 4037 "ConfigurationInterfaces.c"
 }
 
 
@@ -3650,79 +4052,79 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, &_inner_error_);
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3663 "ConfigurationInterfaces.c"
+#line 4065 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3667 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+#line 4069 "ConfigurationInterfaces.c"
+				goto __catch111_configuration_error;
 			}
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3676 "ConfigurationInterfaces.c"
+#line 4078 "ConfigurationInterfaces.c"
 		}
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 667 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3682 "ConfigurationInterfaces.c"
+#line 4084 "ConfigurationInterfaces.c"
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3703 "ConfigurationInterfaces.c"
+#line 4105 "ConfigurationInterfaces.c"
 	}
-	__finally99:
-#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally111:
+#line 666 "/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"
+#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 3712 "ConfigurationInterfaces.c"
+#line 4114 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self) {
-#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self);
-#line 3721 "ConfigurationInterfaces.c"
+#line 4123 "ConfigurationInterfaces.c"
 }
 
 
@@ -3732,69 +4134,69 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, _tmp2_, &_inner_error_);
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3745 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+#line 4147 "ConfigurationInterfaces.c"
+				goto __catch112_configuration_error;
 			}
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3754 "ConfigurationInterfaces.c"
+#line 4156 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3772 "ConfigurationInterfaces.c"
+#line 4174 "ConfigurationInterfaces.c"
 	}
-	__finally100:
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally112:
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/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 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3783 "ConfigurationInterfaces.c"
+#line 4185 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display) {
-#line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display);
-#line 3793 "ConfigurationInterfaces.c"
+#line 4195 "ConfigurationInterfaces.c"
 }
 
 
@@ -3808,79 +4210,79 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3821 "ConfigurationInterfaces.c"
+#line 4223 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3825 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+#line 4227 "ConfigurationInterfaces.c"
+				goto __catch113_configuration_error;
 			}
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3834 "ConfigurationInterfaces.c"
+#line 4236 "ConfigurationInterfaces.c"
 		}
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3840 "ConfigurationInterfaces.c"
+#line 4242 "ConfigurationInterfaces.c"
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3861 "ConfigurationInterfaces.c"
+#line 4263 "ConfigurationInterfaces.c"
 	}
-	__finally101:
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally113:
+#line 687 "/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"
+#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 3870 "ConfigurationInterfaces.c"
+#line 4272 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self) {
-#line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self);
-#line 3879 "ConfigurationInterfaces.c"
+#line 4281 "ConfigurationInterfaces.c"
 }
 
 
@@ -3890,69 +4292,69 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, _tmp2_, &_inner_error_);
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3903 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+#line 4305 "ConfigurationInterfaces.c"
+				goto __catch114_configuration_error;
 			}
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3912 "ConfigurationInterfaces.c"
+#line 4314 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3930 "ConfigurationInterfaces.c"
+#line 4332 "ConfigurationInterfaces.c"
 	}
-	__finally102:
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally114:
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/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 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3941 "ConfigurationInterfaces.c"
+#line 4343 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display) {
-#line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display);
-#line 3951 "ConfigurationInterfaces.c"
+#line 4353 "ConfigurationInterfaces.c"
 }
 
 
@@ -3966,79 +4368,79 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, &_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3979 "ConfigurationInterfaces.c"
+#line 4381 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3983 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+#line 4385 "ConfigurationInterfaces.c"
+				goto __catch115_configuration_error;
 			}
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 3992 "ConfigurationInterfaces.c"
+#line 4394 "ConfigurationInterfaces.c"
 		}
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3998 "ConfigurationInterfaces.c"
+#line 4400 "ConfigurationInterfaces.c"
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4019 "ConfigurationInterfaces.c"
+#line 4421 "ConfigurationInterfaces.c"
 	}
-	__finally103:
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally115:
+#line 709 "/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"
+#line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4028 "ConfigurationInterfaces.c"
+#line 4430 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) {
-#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self);
-#line 4037 "ConfigurationInterfaces.c"
+#line 4439 "ConfigurationInterfaces.c"
 }
 
 
@@ -4048,69 +4450,69 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, _tmp2_, &_inner_error_);
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4061 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+#line 4463 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4070 "ConfigurationInterfaces.c"
+#line 4472 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4088 "ConfigurationInterfaces.c"
+#line 4490 "ConfigurationInterfaces.c"
 	}
-	__finally104:
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally116:
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/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 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4099 "ConfigurationInterfaces.c"
+#line 4501 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display) {
-#line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display);
-#line 4109 "ConfigurationInterfaces.c"
+#line 4511 "ConfigurationInterfaces.c"
 }
 
 
@@ -4124,79 +4526,79 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, &_inner_error_);
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4137 "ConfigurationInterfaces.c"
+#line 4539 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4141 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+#line 4543 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4150 "ConfigurationInterfaces.c"
+#line 4552 "ConfigurationInterfaces.c"
 		}
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4156 "ConfigurationInterfaces.c"
+#line 4558 "ConfigurationInterfaces.c"
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4177 "ConfigurationInterfaces.c"
+#line 4579 "ConfigurationInterfaces.c"
 	}
-	__finally105:
-#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally117:
+#line 731 "/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"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4186 "ConfigurationInterfaces.c"
+#line 4588 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) {
-#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self);
-#line 4195 "ConfigurationInterfaces.c"
+#line 4597 "ConfigurationInterfaces.c"
 }
 
 
@@ -4206,69 +4608,69 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, _tmp2_, &_inner_error_);
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4219 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+#line 4621 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4228 "ConfigurationInterfaces.c"
+#line 4630 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4246 "ConfigurationInterfaces.c"
+#line 4648 "ConfigurationInterfaces.c"
 	}
-	__finally106:
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally118:
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/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 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4257 "ConfigurationInterfaces.c"
+#line 4659 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display) {
-#line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display);
-#line 4267 "ConfigurationInterfaces.c"
+#line 4669 "ConfigurationInterfaces.c"
 }
 
 
@@ -4282,79 +4684,79 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, &_inner_error_);
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4295 "ConfigurationInterfaces.c"
+#line 4697 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4299 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+#line 4701 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4308 "ConfigurationInterfaces.c"
+#line 4710 "ConfigurationInterfaces.c"
 		}
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4314 "ConfigurationInterfaces.c"
+#line 4716 "ConfigurationInterfaces.c"
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4335 "ConfigurationInterfaces.c"
+#line 4737 "ConfigurationInterfaces.c"
 	}
-	__finally107:
-#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally119:
+#line 752 "/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"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4344 "ConfigurationInterfaces.c"
+#line 4746 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self) {
-#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self);
-#line 4353 "ConfigurationInterfaces.c"
+#line 4755 "ConfigurationInterfaces.c"
 }
 
 
@@ -4364,69 +4766,69 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, _tmp2_, &_inner_error_);
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4377 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+#line 4779 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4386 "ConfigurationInterfaces.c"
+#line 4788 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4404 "ConfigurationInterfaces.c"
+#line 4806 "ConfigurationInterfaces.c"
 	}
-	__finally108:
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally120:
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/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 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4415 "ConfigurationInterfaces.c"
+#line 4817 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display) {
-#line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display);
-#line 4425 "ConfigurationInterfaces.c"
+#line 4827 "ConfigurationInterfaces.c"
 }
 
 
@@ -4440,79 +4842,79 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, &_inner_error_);
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4453 "ConfigurationInterfaces.c"
+#line 4855 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4457 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+#line 4859 "ConfigurationInterfaces.c"
+				goto __catch121_configuration_error;
 			}
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4466 "ConfigurationInterfaces.c"
+#line 4868 "ConfigurationInterfaces.c"
 		}
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4472 "ConfigurationInterfaces.c"
+#line 4874 "ConfigurationInterfaces.c"
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 776 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 776 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4493 "ConfigurationInterfaces.c"
+#line 4895 "ConfigurationInterfaces.c"
 	}
-	__finally109:
-#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally121:
+#line 773 "/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"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4502 "ConfigurationInterfaces.c"
+#line 4904 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self) {
-#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 772 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 772 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self);
-#line 4511 "ConfigurationInterfaces.c"
+#line 4913 "ConfigurationInterfaces.c"
 }
 
 
@@ -4522,69 +4924,69 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, _tmp2_, &_inner_error_);
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4535 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+#line 4937 "ConfigurationInterfaces.c"
+				goto __catch122_configuration_error;
 			}
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4544 "ConfigurationInterfaces.c"
+#line 4946 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4562 "ConfigurationInterfaces.c"
+#line 4964 "ConfigurationInterfaces.c"
 	}
-	__finally110:
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally122:
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/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 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4573 "ConfigurationInterfaces.c"
+#line 4975 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display) {
-#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display);
-#line 4583 "ConfigurationInterfaces.c"
+#line 4985 "ConfigurationInterfaces.c"
 }
 
 
@@ -4598,79 +5000,79 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, &_inner_error_);
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4611 "ConfigurationInterfaces.c"
+#line 5013 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4615 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+#line 5017 "ConfigurationInterfaces.c"
+				goto __catch123_configuration_error;
 			}
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4624 "ConfigurationInterfaces.c"
+#line 5026 "ConfigurationInterfaces.c"
 		}
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4630 "ConfigurationInterfaces.c"
+#line 5032 "ConfigurationInterfaces.c"
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4651 "ConfigurationInterfaces.c"
+#line 5053 "ConfigurationInterfaces.c"
 	}
-	__finally111:
-#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally123:
+#line 794 "/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"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4660 "ConfigurationInterfaces.c"
+#line 5062 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self) {
-#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 793 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 793 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self);
-#line 4669 "ConfigurationInterfaces.c"
+#line 5071 "ConfigurationInterfaces.c"
 }
 
 
@@ -4680,69 +5082,69 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, _tmp2_, &_inner_error_);
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4693 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+#line 5095 "ConfigurationInterfaces.c"
+				goto __catch124_configuration_error;
 			}
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4702 "ConfigurationInterfaces.c"
+#line 5104 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally124;
+	__catch124_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4720 "ConfigurationInterfaces.c"
+#line 5122 "ConfigurationInterfaces.c"
 	}
-	__finally112:
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally124:
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/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 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4731 "ConfigurationInterfaces.c"
+#line 5133 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display) {
-#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display);
-#line 4741 "ConfigurationInterfaces.c"
+#line 5143 "ConfigurationInterfaces.c"
 }
 
 
@@ -4756,79 +5158,79 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, &_inner_error_);
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4769 "ConfigurationInterfaces.c"
+#line 5171 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4773 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+#line 5175 "ConfigurationInterfaces.c"
+				goto __catch125_configuration_error;
 			}
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4782 "ConfigurationInterfaces.c"
+#line 5184 "ConfigurationInterfaces.c"
 		}
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4788 "ConfigurationInterfaces.c"
+#line 5190 "ConfigurationInterfaces.c"
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally125;
+	__catch125_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4809 "ConfigurationInterfaces.c"
+#line 5211 "ConfigurationInterfaces.c"
 	}
-	__finally113:
-#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally125:
+#line 815 "/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"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4818 "ConfigurationInterfaces.c"
+#line 5220 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self) {
-#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self);
-#line 4827 "ConfigurationInterfaces.c"
+#line 5229 "ConfigurationInterfaces.c"
 }
 
 
@@ -4838,69 +5240,69 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, _tmp2_, &_inner_error_);
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4851 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+#line 5253 "ConfigurationInterfaces.c"
+				goto __catch126_configuration_error;
 			}
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4860 "ConfigurationInterfaces.c"
+#line 5262 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally126;
+	__catch126_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4878 "ConfigurationInterfaces.c"
+#line 5280 "ConfigurationInterfaces.c"
 	}
-	__finally114:
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally126:
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/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 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4889 "ConfigurationInterfaces.c"
+#line 5291 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display) {
-#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display);
-#line 4899 "ConfigurationInterfaces.c"
+#line 5301 "ConfigurationInterfaces.c"
 }
 
 
@@ -4914,79 +5316,79 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, &_inner_error_);
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4927 "ConfigurationInterfaces.c"
+#line 5329 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4931 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5333 "ConfigurationInterfaces.c"
+				goto __catch127_configuration_error;
 			}
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 4940 "ConfigurationInterfaces.c"
+#line 5342 "ConfigurationInterfaces.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4946 "ConfigurationInterfaces.c"
+#line 5348 "ConfigurationInterfaces.c"
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally127;
+	__catch127_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 839 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 839 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4967 "ConfigurationInterfaces.c"
+#line 5369 "ConfigurationInterfaces.c"
 	}
-	__finally115:
-#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally127:
+#line 836 "/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"
+#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 4976 "ConfigurationInterfaces.c"
+#line 5378 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* self) {
-#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 835 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 835 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self);
-#line 4985 "ConfigurationInterfaces.c"
+#line 5387 "ConfigurationInterfaces.c"
 }
 
 
@@ -4996,69 +5398,69 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, _tmp2_, &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5009 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5411 "ConfigurationInterfaces.c"
+				goto __catch128_configuration_error;
 			}
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5018 "ConfigurationInterfaces.c"
+#line 5420 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally128;
+	__catch128_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5036 "ConfigurationInterfaces.c"
+#line 5438 "ConfigurationInterfaces.c"
 	}
-	__finally116:
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally128:
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/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 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5047 "ConfigurationInterfaces.c"
+#line 5449 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display) {
-#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display);
-#line 5057 "ConfigurationInterfaces.c"
+#line 5459 "ConfigurationInterfaces.c"
 }
 
 
@@ -5072,79 +5474,79 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, &_inner_error_);
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5085 "ConfigurationInterfaces.c"
+#line 5487 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5089 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5491 "ConfigurationInterfaces.c"
+				goto __catch129_configuration_error;
 			}
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 5098 "ConfigurationInterfaces.c"
+#line 5500 "ConfigurationInterfaces.c"
 		}
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5104 "ConfigurationInterfaces.c"
+#line 5506 "ConfigurationInterfaces.c"
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally129;
+	__catch129_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5125 "ConfigurationInterfaces.c"
+#line 5527 "ConfigurationInterfaces.c"
 	}
-	__finally117:
-#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally129:
+#line 857 "/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"
+#line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 5134 "ConfigurationInterfaces.c"
+#line 5536 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self) {
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self);
-#line 5143 "ConfigurationInterfaces.c"
+#line 5545 "ConfigurationInterfaces.c"
 }
 
 
@@ -5154,69 +5556,69 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, _tmp2_, &_inner_error_);
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5167 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5569 "ConfigurationInterfaces.c"
+				goto __catch130_configuration_error;
 			}
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5176 "ConfigurationInterfaces.c"
+#line 5578 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally130;
+	__catch130_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5194 "ConfigurationInterfaces.c"
+#line 5596 "ConfigurationInterfaces.c"
 	}
-	__finally118:
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally130:
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/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 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5205 "ConfigurationInterfaces.c"
+#line 5607 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display) {
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 866 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 866 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display);
-#line 5215 "ConfigurationInterfaces.c"
+#line 5617 "ConfigurationInterfaces.c"
 }
 
 
@@ -5224,11 +5626,11 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
 	GError * _inner_error_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 878 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_order = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 5227 "ConfigurationInterfaces.c"
+#line 5629 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_;
@@ -5240,115 +5642,115 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		ConfigurationEngine* _tmp7_;
 		gint _tmp8_;
 		gint _tmp9_;
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, &_inner_error_);
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5255 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5657 "ConfigurationInterfaces.c"
+				goto __catch131_configuration_error;
 			}
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5264 "ConfigurationInterfaces.c"
+#line 5666 "ConfigurationInterfaces.c"
 		}
-#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 881 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = configuration_facade_get_engine (self);
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = _tmp6_;
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, &_inner_error_);
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = _tmp8_;
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp9_;
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5284 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5686 "ConfigurationInterfaces.c"
+				goto __catch131_configuration_error;
 			}
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5293 "ConfigurationInterfaces.c"
+#line 5695 "ConfigurationInterfaces.c"
 		}
-#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5297 "ConfigurationInterfaces.c"
+#line 5699 "ConfigurationInterfaces.c"
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally131;
+	__catch131_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 823 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 885 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = err;
-#line 823 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 885 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp10_);
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5314 "ConfigurationInterfaces.c"
+#line 5716 "ConfigurationInterfaces.c"
 	}
-	__finally119:
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally131:
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/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 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5325 "ConfigurationInterfaces.c"
+#line 5727 "ConfigurationInterfaces.c"
 	}
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 5331 "ConfigurationInterfaces.c"
+#line 5733 "ConfigurationInterfaces.c"
 	}
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 5337 "ConfigurationInterfaces.c"
+#line 5739 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) {
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 877 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by);
-#line 5347 "ConfigurationInterfaces.c"
+#line 5749 "ConfigurationInterfaces.c"
 }
 
 
@@ -5361,94 +5763,94 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		ConfigurationEngine* _tmp3_;
 		ConfigurationEngine* _tmp4_;
 		gint _tmp5_;
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort_order;
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5374 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5776 "ConfigurationInterfaces.c"
+				goto __catch132_configuration_error;
 			}
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 891 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5383 "ConfigurationInterfaces.c"
+#line 5785 "ConfigurationInterfaces.c"
 		}
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = sort_by;
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, _tmp5_, &_inner_error_);
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5399 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5801 "ConfigurationInterfaces.c"
+				goto __catch132_configuration_error;
 			}
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5408 "ConfigurationInterfaces.c"
+#line 5810 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally132;
+	__catch132_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 834 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5426 "ConfigurationInterfaces.c"
+#line 5828 "ConfigurationInterfaces.c"
 	}
-	__finally120:
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally132:
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/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 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5437 "ConfigurationInterfaces.c"
+#line 5839 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
-#line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by);
-#line 5447 "ConfigurationInterfaces.c"
+#line 5849 "ConfigurationInterfaces.c"
 }
 
 
@@ -5462,79 +5864,79 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, &_inner_error_);
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5475 "ConfigurationInterfaces.c"
+#line 5877 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5479 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+#line 5881 "ConfigurationInterfaces.c"
+				goto __catch133_configuration_error;
 			}
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 5488 "ConfigurationInterfaces.c"
+#line 5890 "ConfigurationInterfaces.c"
 		}
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 905 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5494 "ConfigurationInterfaces.c"
+#line 5896 "ConfigurationInterfaces.c"
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally133;
+	__catch133_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5515 "ConfigurationInterfaces.c"
+#line 5917 "ConfigurationInterfaces.c"
 	}
-	__finally121:
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally133:
+#line 904 "/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"
+#line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 904 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 5524 "ConfigurationInterfaces.c"
+#line 5926 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self) {
-#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 903 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 903 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self);
-#line 5533 "ConfigurationInterfaces.c"
+#line 5935 "ConfigurationInterfaces.c"
 }
 
 
@@ -5544,71 +5946,71 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort;
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5557 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+#line 5959 "ConfigurationInterfaces.c"
+				goto __catch134_configuration_error;
 			}
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5566 "ConfigurationInterfaces.c"
+#line 5968 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally134;
+	__catch134_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 855 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5586 "ConfigurationInterfaces.c"
+#line 5988 "ConfigurationInterfaces.c"
 	}
-	__finally122:
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally134:
+#line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 914 "/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 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 914 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5597 "ConfigurationInterfaces.c"
+#line 5999 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort) {
-#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort);
-#line 5607 "ConfigurationInterfaces.c"
+#line 6009 "ConfigurationInterfaces.c"
 }
 
 
@@ -5622,163 +6024,163 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, &_inner_error_);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5637 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+#line 6039 "ConfigurationInterfaces.c"
+				goto __catch135_configuration_error;
 			}
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5646 "ConfigurationInterfaces.c"
+#line 6048 "ConfigurationInterfaces.c"
 		}
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5658 "ConfigurationInterfaces.c"
+#line 6060 "ConfigurationInterfaces.c"
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally135;
+	__catch135_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5682 "ConfigurationInterfaces.c"
+#line 6084 "ConfigurationInterfaces.c"
 	}
-	__finally123:
-#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally135:
+#line 926 "/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"
+#line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 926 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5691 "ConfigurationInterfaces.c"
+#line 6093 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) {
-#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 925 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 925 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self);
-#line 5700 "ConfigurationInterfaces.c"
+#line 6102 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) {
 	GError * _inner_error_ = NULL;
-#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_photo_app != NULL);
-#line 5708 "ConfigurationInterfaces.c"
+#line 6110 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = external_photo_app;
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, _tmp2_, &_inner_error_);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5727 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+#line 6129 "ConfigurationInterfaces.c"
+				goto __catch136_configuration_error;
 			}
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5736 "ConfigurationInterfaces.c"
+#line 6138 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 878 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5756 "ConfigurationInterfaces.c"
+#line 6158 "ConfigurationInterfaces.c"
 	}
-	__finally124:
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally136:
+#line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 936 "/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 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 936 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5767 "ConfigurationInterfaces.c"
+#line 6169 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) {
-#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 935 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app);
-#line 5777 "ConfigurationInterfaces.c"
+#line 6179 "ConfigurationInterfaces.c"
 }
 
 
@@ -5792,163 +6194,163 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, &_inner_error_);
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5807 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+#line 6209 "ConfigurationInterfaces.c"
+				goto __catch137_configuration_error;
 			}
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5816 "ConfigurationInterfaces.c"
+#line 6218 "ConfigurationInterfaces.c"
 		}
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5828 "ConfigurationInterfaces.c"
+#line 6230 "ConfigurationInterfaces.c"
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 952 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 952 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5852 "ConfigurationInterfaces.c"
+#line 6254 "ConfigurationInterfaces.c"
 	}
-	__finally125:
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally137:
+#line 949 "/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"
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5861 "ConfigurationInterfaces.c"
+#line 6263 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) {
-#line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self);
-#line 5870 "ConfigurationInterfaces.c"
+#line 6272 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) {
 	GError * _inner_error_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_raw_app != NULL);
-#line 5878 "ConfigurationInterfaces.c"
+#line 6280 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = external_raw_app;
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, _tmp2_, &_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5897 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+#line 6299 "ConfigurationInterfaces.c"
+				goto __catch138_configuration_error;
 			}
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5906 "ConfigurationInterfaces.c"
+#line 6308 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 963 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 901 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 963 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 964 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 964 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5926 "ConfigurationInterfaces.c"
+#line 6328 "ConfigurationInterfaces.c"
 	}
-	__finally126:
-#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally138:
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 959 "/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 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5937 "ConfigurationInterfaces.c"
+#line 6339 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) {
-#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app);
-#line 5947 "ConfigurationInterfaces.c"
+#line 6349 "ConfigurationInterfaces.c"
 }
 
 
@@ -5961,77 +6363,77 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, &_inner_error_);
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5976 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+#line 6378 "ConfigurationInterfaces.c"
+				goto __catch139_configuration_error;
 			}
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 5985 "ConfigurationInterfaces.c"
+#line 6387 "ConfigurationInterfaces.c"
 		}
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ScaleConstraint) _tmp0_;
-#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5991 "ConfigurationInterfaces.c"
+#line 6393 "ConfigurationInterfaces.c"
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 975 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 975 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6012 "ConfigurationInterfaces.c"
+#line 6414 "ConfigurationInterfaces.c"
 	}
-	__finally127:
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally139:
+#line 972 "/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"
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6021 "ConfigurationInterfaces.c"
+#line 6423 "ConfigurationInterfaces.c"
 }
 
 
 ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self) {
-#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self);
-#line 6030 "ConfigurationInterfaces.c"
+#line 6432 "ConfigurationInterfaces.c"
 }
 
 
@@ -6041,71 +6443,71 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		ScaleConstraint _tmp2_;
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = constraint;
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, (gint) _tmp2_, &_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6054 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+#line 6456 "ConfigurationInterfaces.c"
+				goto __catch140_configuration_error;
 			}
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 983 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6063 "ConfigurationInterfaces.c"
+#line 6465 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 923 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6083 "ConfigurationInterfaces.c"
+#line 6485 "ConfigurationInterfaces.c"
 	}
-	__finally128:
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally140:
+#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 982 "/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 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6094 "ConfigurationInterfaces.c"
+#line 6496 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) {
-#line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint);
-#line 6104 "ConfigurationInterfaces.c"
+#line 6506 "ConfigurationInterfaces.c"
 }
 
 
@@ -6118,77 +6520,77 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, &_inner_error_);
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6133 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+#line 6535 "ConfigurationInterfaces.c"
+				goto __catch141_configuration_error;
 			}
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6142 "ConfigurationInterfaces.c"
+#line 6544 "ConfigurationInterfaces.c"
 		}
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ExportFormatMode) _tmp0_;
-#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 992 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6148 "ConfigurationInterfaces.c"
+#line 6550 "ConfigurationInterfaces.c"
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 932 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6169 "ConfigurationInterfaces.c"
+#line 6571 "ConfigurationInterfaces.c"
 	}
-	__finally129:
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally141:
+#line 991 "/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"
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6178 "ConfigurationInterfaces.c"
+#line 6580 "ConfigurationInterfaces.c"
 }
 
 
 ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self) {
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self);
-#line 6187 "ConfigurationInterfaces.c"
+#line 6589 "ConfigurationInterfaces.c"
 }
 
 
@@ -6198,71 +6600,71 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		ExportFormatMode _tmp2_;
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = export_format_mode;
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, (gint) _tmp2_, &_inner_error_);
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6211 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+#line 6613 "ConfigurationInterfaces.c"
+				goto __catch142_configuration_error;
 			}
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6220 "ConfigurationInterfaces.c"
+#line 6622 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 942 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 942 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6240 "ConfigurationInterfaces.c"
+#line 6642 "ConfigurationInterfaces.c"
 	}
-	__finally130:
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally142:
+#line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1001 "/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 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1001 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6251 "ConfigurationInterfaces.c"
+#line 6653 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) {
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode);
-#line 6261 "ConfigurationInterfaces.c"
+#line 6663 "ConfigurationInterfaces.c"
 }
 
 
@@ -6276,79 +6678,79 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, &_inner_error_);
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6289 "ConfigurationInterfaces.c"
+#line 6691 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6293 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+#line 6695 "ConfigurationInterfaces.c"
+				goto __catch143_configuration_error;
 			}
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 6302 "ConfigurationInterfaces.c"
+#line 6704 "ConfigurationInterfaces.c"
 		}
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6308 "ConfigurationInterfaces.c"
+#line 6710 "ConfigurationInterfaces.c"
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6329 "ConfigurationInterfaces.c"
+#line 6731 "ConfigurationInterfaces.c"
 	}
-	__finally131:
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally143:
+#line 1010 "/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"
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 6338 "ConfigurationInterfaces.c"
+#line 6740 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self) {
-#line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self);
-#line 6347 "ConfigurationInterfaces.c"
+#line 6749 "ConfigurationInterfaces.c"
 }
 
 
@@ -6358,71 +6760,71 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = export_metadata;
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, _tmp2_, &_inner_error_);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6371 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+#line 6773 "ConfigurationInterfaces.c"
+				goto __catch144_configuration_error;
 			}
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1021 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6380 "ConfigurationInterfaces.c"
+#line 6782 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 961 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6400 "ConfigurationInterfaces.c"
+#line 6802 "ConfigurationInterfaces.c"
 	}
-	__finally132:
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally144:
+#line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1020 "/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 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1020 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6411 "ConfigurationInterfaces.c"
+#line 6813 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) {
-#line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata);
-#line 6421 "ConfigurationInterfaces.c"
+#line 6823 "ConfigurationInterfaces.c"
 }
 
 
@@ -6436,79 +6838,79 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		gint _tmp3_;
 		gint _tmp4_;
 		PhotoFileFormat _tmp5_;
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, &_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6451 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+#line 6853 "ConfigurationInterfaces.c"
+				goto __catch145_configuration_error;
 			}
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6460 "ConfigurationInterfaces.c"
+#line 6862 "ConfigurationInterfaces.c"
 		}
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = photo_file_format_unserialize (_tmp0_);
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1030 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6468 "ConfigurationInterfaces.c"
+#line 6870 "ConfigurationInterfaces.c"
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1032 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1032 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6489 "ConfigurationInterfaces.c"
+#line 6891 "ConfigurationInterfaces.c"
 	}
-	__finally133:
-#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally145:
+#line 1029 "/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"
+#line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1029 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6498 "ConfigurationInterfaces.c"
+#line 6900 "ConfigurationInterfaces.c"
 }
 
 
 PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self) {
-#line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self);
-#line 6507 "ConfigurationInterfaces.c"
+#line 6909 "ConfigurationInterfaces.c"
 }
 
 
@@ -6519,73 +6921,73 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		ConfigurationEngine* _tmp1_;
 		PhotoFileFormat _tmp2_;
 		gint _tmp3_;
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = photo_file_format;
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = photo_file_format_serialize (_tmp2_);
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, _tmp3_, &_inner_error_);
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6534 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+#line 6936 "ConfigurationInterfaces.c"
+				goto __catch146_configuration_error;
 			}
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1040 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6543 "ConfigurationInterfaces.c"
+#line 6945 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
-#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = err;
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp4_);
-#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6563 "ConfigurationInterfaces.c"
+#line 6965 "ConfigurationInterfaces.c"
 	}
-	__finally134:
-#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally146:
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/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 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6574 "ConfigurationInterfaces.c"
+#line 6976 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) {
-#line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format);
-#line 6584 "ConfigurationInterfaces.c"
+#line 6986 "ConfigurationInterfaces.c"
 }
 
 
@@ -6598,77 +7000,77 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, &_inner_error_);
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6613 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+#line 7015 "ConfigurationInterfaces.c"
+				goto __catch147_configuration_error;
 			}
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6622 "ConfigurationInterfaces.c"
+#line 7024 "ConfigurationInterfaces.c"
 		}
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (JpegQuality) _tmp0_;
-#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1049 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6628 "ConfigurationInterfaces.c"
+#line 7030 "ConfigurationInterfaces.c"
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6649 "ConfigurationInterfaces.c"
+#line 7051 "ConfigurationInterfaces.c"
 	}
-	__finally135:
-#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally147:
+#line 1048 "/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"
+#line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1048 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6658 "ConfigurationInterfaces.c"
+#line 7060 "ConfigurationInterfaces.c"
 }
 
 
 JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self) {
-#line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1047 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1047 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self);
-#line 6667 "ConfigurationInterfaces.c"
+#line 7069 "ConfigurationInterfaces.c"
 }
 
 
@@ -6678,71 +7080,71 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		JpegQuality _tmp2_;
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = quality;
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, (gint) _tmp2_, &_inner_error_);
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6691 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+#line 7093 "ConfigurationInterfaces.c"
+				goto __catch148_configuration_error;
 			}
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1059 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6700 "ConfigurationInterfaces.c"
+#line 7102 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6720 "ConfigurationInterfaces.c"
+#line 7122 "ConfigurationInterfaces.c"
 	}
-	__finally136:
-#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally148:
+#line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1058 "/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 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1058 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6731 "ConfigurationInterfaces.c"
+#line 7133 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality) {
-#line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality);
-#line 6741 "ConfigurationInterfaces.c"
+#line 7143 "ConfigurationInterfaces.c"
 }
 
 
@@ -6756,79 +7158,79 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, &_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6769 "ConfigurationInterfaces.c"
+#line 7171 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6773 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+#line 7175 "ConfigurationInterfaces.c"
+				goto __catch149_configuration_error;
 			}
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 6782 "ConfigurationInterfaces.c"
+#line 7184 "ConfigurationInterfaces.c"
 		}
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6788 "ConfigurationInterfaces.c"
+#line 7190 "ConfigurationInterfaces.c"
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6809 "ConfigurationInterfaces.c"
+#line 7211 "ConfigurationInterfaces.c"
 	}
-	__finally137:
-#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally149:
+#line 1067 "/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"
+#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 6818 "ConfigurationInterfaces.c"
+#line 7220 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_export_scale (ConfigurationFacade* self) {
-#line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self);
-#line 6827 "ConfigurationInterfaces.c"
+#line 7229 "ConfigurationInterfaces.c"
 }
 
 
@@ -6838,71 +7240,71 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = scale;
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, _tmp2_, &_inner_error_);
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6851 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+#line 7253 "ConfigurationInterfaces.c"
+				goto __catch150_configuration_error;
 			}
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6860 "ConfigurationInterfaces.c"
+#line 7262 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1080 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1080 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6880 "ConfigurationInterfaces.c"
+#line 7282 "ConfigurationInterfaces.c"
 	}
-	__finally138:
-#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally150:
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/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 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6891 "ConfigurationInterfaces.c"
+#line 7293 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale) {
-#line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1076 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1076 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale);
-#line 6901 "ConfigurationInterfaces.c"
+#line 7303 "ConfigurationInterfaces.c"
 }
 
 
@@ -6916,81 +7318,81 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		RawDeveloper _tmp5_;
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, &_inner_error_);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6931 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+#line 7333 "ConfigurationInterfaces.c"
+				goto __catch151_configuration_error;
 			}
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6940 "ConfigurationInterfaces.c"
+#line 7342 "ConfigurationInterfaces.c"
 		}
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6950 "ConfigurationInterfaces.c"
+#line 7352 "ConfigurationInterfaces.c"
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1031 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1095 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6971 "ConfigurationInterfaces.c"
+#line 7373 "ConfigurationInterfaces.c"
 	}
-	__finally139:
-#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally151:
+#line 1089 "/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"
+#line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1089 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6980 "ConfigurationInterfaces.c"
+#line 7382 "ConfigurationInterfaces.c"
 }
 
 
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self) {
-#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1088 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1088 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self);
-#line 6989 "ConfigurationInterfaces.c"
+#line 7391 "ConfigurationInterfaces.c"
 }
 
 
@@ -7002,77 +7404,77 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		RawDeveloper _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = d;
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = raw_developer_to_string (_tmp2_);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, _tmp4_, &_inner_error_);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp4_);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7021 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+#line 7423 "ConfigurationInterfaces.c"
+				goto __catch152_configuration_error;
 			}
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7030 "ConfigurationInterfaces.c"
+#line 7432 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7050 "ConfigurationInterfaces.c"
+#line 7452 "ConfigurationInterfaces.c"
 	}
-	__finally140:
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally152:
+#line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1100 "/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 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1100 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7061 "ConfigurationInterfaces.c"
+#line 7463 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d) {
-#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1099 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1099 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d);
-#line 7071 "ConfigurationInterfaces.c"
+#line 7473 "ConfigurationInterfaces.c"
 }
 
 
@@ -7086,79 +7488,79 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, &_inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7099 "ConfigurationInterfaces.c"
+#line 7501 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7103 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+#line 7505 "ConfigurationInterfaces.c"
+				goto __catch153_configuration_error;
 			}
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7112 "ConfigurationInterfaces.c"
+#line 7514 "ConfigurationInterfaces.c"
 		}
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7118 "ConfigurationInterfaces.c"
+#line 7520 "ConfigurationInterfaces.c"
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1116 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7139 "ConfigurationInterfaces.c"
+#line 7541 "ConfigurationInterfaces.c"
 	}
-	__finally141:
-#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally153:
+#line 1113 "/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"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7148 "ConfigurationInterfaces.c"
+#line 7550 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self) {
-#line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1112 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1112 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self);
-#line 7157 "ConfigurationInterfaces.c"
+#line 7559 "ConfigurationInterfaces.c"
 }
 
 
@@ -7168,69 +7570,69 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = hide_imported;
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, _tmp2_, &_inner_error_);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7181 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+#line 7583 "ConfigurationInterfaces.c"
+				goto __catch154_configuration_error;
 			}
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7190 "ConfigurationInterfaces.c"
+#line 7592 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1064 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7208 "ConfigurationInterfaces.c"
+#line 7610 "ConfigurationInterfaces.c"
 	}
-	__finally142:
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally154:
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/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 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7219 "ConfigurationInterfaces.c"
+#line 7621 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported) {
-#line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported);
-#line 7229 "ConfigurationInterfaces.c"
+#line 7631 "ConfigurationInterfaces.c"
 }
 
 
@@ -7244,161 +7646,161 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_IMPORT_DIR, &_inner_error_);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7259 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 7661 "ConfigurationInterfaces.c"
+				goto __catch155_configuration_error;
 			}
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7268 "ConfigurationInterfaces.c"
+#line 7670 "ConfigurationInterfaces.c"
 		}
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7280 "ConfigurationInterfaces.c"
+#line 7682 "ConfigurationInterfaces.c"
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1075 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1139 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1139 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1139 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1139 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7304 "ConfigurationInterfaces.c"
+#line 7706 "ConfigurationInterfaces.c"
 	}
-	__finally143:
-#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally155:
+#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 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7313 "ConfigurationInterfaces.c"
+#line 7715 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) {
-#line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self);
-#line 7322 "ConfigurationInterfaces.c"
+#line 7724 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) {
 	GError * _inner_error_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (import_dir != NULL);
-#line 7330 "ConfigurationInterfaces.c"
+#line 7732 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = import_dir;
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_IMPORT_DIR, _tmp2_, &_inner_error_);
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7349 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 7751 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7358 "ConfigurationInterfaces.c"
+#line 7760 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1085 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7376 "ConfigurationInterfaces.c"
+#line 7778 "ConfigurationInterfaces.c"
 	}
-	__finally144:
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally156:
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/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 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7387 "ConfigurationInterfaces.c"
+#line 7789 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) {
-#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir);
-#line 7397 "ConfigurationInterfaces.c"
+#line 7799 "ConfigurationInterfaces.c"
 }
 
 
@@ -7412,79 +7814,79 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, &_inner_error_);
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7425 "ConfigurationInterfaces.c"
+#line 7827 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7429 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 7831 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7438 "ConfigurationInterfaces.c"
+#line 7840 "ConfigurationInterfaces.c"
 		}
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7444 "ConfigurationInterfaces.c"
+#line 7846 "ConfigurationInterfaces.c"
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1158 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1160 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7465 "ConfigurationInterfaces.c"
+#line 7867 "ConfigurationInterfaces.c"
 	}
-	__finally145:
-#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally157:
+#line 1155 "/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"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7474 "ConfigurationInterfaces.c"
+#line 7876 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) {
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self);
-#line 7483 "ConfigurationInterfaces.c"
+#line 7885 "ConfigurationInterfaces.c"
 }
 
 
@@ -7494,69 +7896,69 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = keep_relativity;
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, _tmp2_, &_inner_error_);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7507 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 7909 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7516 "ConfigurationInterfaces.c"
+#line 7918 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1106 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1106 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7534 "ConfigurationInterfaces.c"
+#line 7936 "ConfigurationInterfaces.c"
 	}
-	__finally146:
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally158:
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/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 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7545 "ConfigurationInterfaces.c"
+#line 7947 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity) {
-#line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1164 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity);
-#line 7555 "ConfigurationInterfaces.c"
+#line 7957 "ConfigurationInterfaces.c"
 }
 
 
@@ -7570,79 +7972,79 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, &_inner_error_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7583 "ConfigurationInterfaces.c"
+#line 7985 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7587 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+#line 7989 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7596 "ConfigurationInterfaces.c"
+#line 7998 "ConfigurationInterfaces.c"
 		}
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7602 "ConfigurationInterfaces.c"
+#line 8004 "ConfigurationInterfaces.c"
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7623 "ConfigurationInterfaces.c"
+#line 8025 "ConfigurationInterfaces.c"
 	}
-	__finally147:
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally159:
+#line 1176 "/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"
+#line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1176 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7632 "ConfigurationInterfaces.c"
+#line 8034 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self) {
-#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1175 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1175 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self);
-#line 7641 "ConfigurationInterfaces.c"
+#line 8043 "ConfigurationInterfaces.c"
 }
 
 
@@ -7652,69 +8054,69 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state;
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, _tmp2_, &_inner_error_);
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7665 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+#line 8067 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7674 "ConfigurationInterfaces.c"
+#line 8076 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7692 "ConfigurationInterfaces.c"
+#line 8094 "ConfigurationInterfaces.c"
 	}
-	__finally148:
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally160:
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/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 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1185 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7703 "ConfigurationInterfaces.c"
+#line 8105 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state) {
-#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1184 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1184 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state);
-#line 7713 "ConfigurationInterfaces.c"
+#line 8115 "ConfigurationInterfaces.c"
 }
 
 
@@ -7728,79 +8130,79 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, &_inner_error_);
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7741 "ConfigurationInterfaces.c"
+#line 8143 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7745 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+#line 8147 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7754 "ConfigurationInterfaces.c"
+#line 8156 "ConfigurationInterfaces.c"
 		}
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7760 "ConfigurationInterfaces.c"
+#line 8162 "ConfigurationInterfaces.c"
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
-#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1200 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7781 "ConfigurationInterfaces.c"
+#line 8183 "ConfigurationInterfaces.c"
 	}
-	__finally149:
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally161:
+#line 1196 "/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"
+#line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1196 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7790 "ConfigurationInterfaces.c"
+#line 8192 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) {
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self);
-#line 7799 "ConfigurationInterfaces.c"
+#line 8201 "ConfigurationInterfaces.c"
 }
 
 
@@ -7810,69 +8212,69 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, _tmp2_, &_inner_error_);
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7823 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+#line 8225 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7832 "ConfigurationInterfaces.c"
+#line 8234 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7850 "ConfigurationInterfaces.c"
+#line 8252 "ConfigurationInterfaces.c"
 	}
-	__finally150:
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally162:
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/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 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1205 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7861 "ConfigurationInterfaces.c"
+#line 8263 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice) {
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice);
-#line 7871 "ConfigurationInterfaces.c"
+#line 8273 "ConfigurationInterfaces.c"
 }
 
 
@@ -7886,79 +8288,79 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, &_inner_error_);
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7899 "ConfigurationInterfaces.c"
+#line 8301 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7903 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+#line 8305 "ConfigurationInterfaces.c"
+				goto __catch163_configuration_error;
 			}
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 7912 "ConfigurationInterfaces.c"
+#line 8314 "ConfigurationInterfaces.c"
 		}
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1217 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7918 "ConfigurationInterfaces.c"
+#line 8320 "ConfigurationInterfaces.c"
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1224 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7939 "ConfigurationInterfaces.c"
+#line 8341 "ConfigurationInterfaces.c"
 	}
-	__finally151:
-#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally163:
+#line 1216 "/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"
+#line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 7948 "ConfigurationInterfaces.c"
+#line 8350 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self) {
-#line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1215 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self);
-#line 7957 "ConfigurationInterfaces.c"
+#line 8359 "ConfigurationInterfaces.c"
 }
 
 
@@ -7968,69 +8370,69 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, _tmp2_, &_inner_error_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7981 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+#line 8383 "ConfigurationInterfaces.c"
+				goto __catch164_configuration_error;
 			}
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7990 "ConfigurationInterfaces.c"
+#line 8392 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1232 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1232 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8008 "ConfigurationInterfaces.c"
+#line 8410 "ConfigurationInterfaces.c"
 	}
-	__finally152:
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally164:
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/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 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8019 "ConfigurationInterfaces.c"
+#line 8421 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice) {
-#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice);
-#line 8029 "ConfigurationInterfaces.c"
+#line 8431 "ConfigurationInterfaces.c"
 }
 
 
@@ -8044,79 +8446,79 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, &_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8057 "ConfigurationInterfaces.c"
+#line 8459 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8061 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+#line 8463 "ConfigurationInterfaces.c"
+				goto __catch165_configuration_error;
 			}
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 8070 "ConfigurationInterfaces.c"
+#line 8472 "ConfigurationInterfaces.c"
 		}
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8076 "ConfigurationInterfaces.c"
+#line 8478 "ConfigurationInterfaces.c"
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1244 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8097 "ConfigurationInterfaces.c"
+#line 8499 "ConfigurationInterfaces.c"
 	}
-	__finally153:
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally165:
+#line 1240 "/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"
+#line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 8106 "ConfigurationInterfaces.c"
+#line 8508 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) {
-#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1239 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self);
-#line 8115 "ConfigurationInterfaces.c"
+#line 8517 "ConfigurationInterfaces.c"
 }
 
 
@@ -8126,69 +8528,69 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, _tmp2_, &_inner_error_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8139 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+#line 8541 "ConfigurationInterfaces.c"
+				goto __catch166_configuration_error;
 			}
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1250 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8148 "ConfigurationInterfaces.c"
+#line 8550 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8166 "ConfigurationInterfaces.c"
+#line 8568 "ConfigurationInterfaces.c"
 	}
-	__finally154:
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally166:
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/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 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8177 "ConfigurationInterfaces.c"
+#line 8579 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice) {
-#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice);
-#line 8187 "ConfigurationInterfaces.c"
+#line 8589 "ConfigurationInterfaces.c"
 }
 
 
@@ -8202,161 +8604,161 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, &_inner_error_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8217 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+#line 8619 "ConfigurationInterfaces.c"
+				goto __catch167_configuration_error;
 			}
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8226 "ConfigurationInterfaces.c"
+#line 8628 "ConfigurationInterfaces.c"
 		}
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8238 "ConfigurationInterfaces.c"
+#line 8640 "ConfigurationInterfaces.c"
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8262 "ConfigurationInterfaces.c"
+#line 8664 "ConfigurationInterfaces.c"
 	}
-	__finally155:
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally167:
+#line 1260 "/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"
+#line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1260 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8271 "ConfigurationInterfaces.c"
+#line 8673 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) {
-#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self);
-#line 8280 "ConfigurationInterfaces.c"
+#line 8682 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) {
 	GError * _inner_error_ = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8288 "ConfigurationInterfaces.c"
+#line 8690 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = service_name;
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, _tmp2_, &_inner_error_);
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8307 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+#line 8709 "ConfigurationInterfaces.c"
+				goto __catch168_configuration_error;
 			}
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8316 "ConfigurationInterfaces.c"
+#line 8718 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1214 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8334 "ConfigurationInterfaces.c"
+#line 8736 "ConfigurationInterfaces.c"
 	}
-	__finally156:
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally168:
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/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 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8345 "ConfigurationInterfaces.c"
+#line 8747 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) {
-#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name);
-#line 8355 "ConfigurationInterfaces.c"
+#line 8757 "ConfigurationInterfaces.c"
 }
 
 
@@ -8370,161 +8772,161 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, &_inner_error_);
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8385 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8787 "ConfigurationInterfaces.c"
+				goto __catch169_configuration_error;
 			}
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8394 "ConfigurationInterfaces.c"
+#line 8796 "ConfigurationInterfaces.c"
 		}
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8406 "ConfigurationInterfaces.c"
+#line 8808 "ConfigurationInterfaces.c"
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8430 "ConfigurationInterfaces.c"
+#line 8832 "ConfigurationInterfaces.c"
 	}
-	__finally157:
-#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally169:
+#line 1284 "/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"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8439 "ConfigurationInterfaces.c"
+#line 8841 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self) {
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1283 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1283 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self);
-#line 8448 "ConfigurationInterfaces.c"
+#line 8850 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) {
 	GError * _inner_error_ = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8456 "ConfigurationInterfaces.c"
+#line 8858 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = service_name;
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, _tmp2_, &_inner_error_);
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8475 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8877 "ConfigurationInterfaces.c"
+				goto __catch170_configuration_error;
 			}
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8484 "ConfigurationInterfaces.c"
+#line 8886 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1238 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8502 "ConfigurationInterfaces.c"
+#line 8904 "ConfigurationInterfaces.c"
 	}
-	__finally158:
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally170:
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/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 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8513 "ConfigurationInterfaces.c"
+#line 8915 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) {
-#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name);
-#line 8523 "ConfigurationInterfaces.c"
+#line 8925 "ConfigurationInterfaces.c"
 }
 
 
@@ -8532,11 +8934,11 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
 	GError * _inner_error_ = NULL;
-#line 1246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_order = FALSE;
-#line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1309 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 8535 "ConfigurationInterfaces.c"
+#line 8937 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_;
@@ -8548,115 +8950,115 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		ConfigurationEngine* _tmp7_;
 		gint _tmp8_;
 		gint _tmp9_;
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, &_inner_error_);
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8563 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8965 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8572 "ConfigurationInterfaces.c"
+#line 8974 "ConfigurationInterfaces.c"
 		}
-#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = configuration_facade_get_engine (self);
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = _tmp6_;
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, &_inner_error_);
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = _tmp8_;
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp9_;
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8592 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8994 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8601 "ConfigurationInterfaces.c"
+#line 9003 "ConfigurationInterfaces.c"
 		}
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1313 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 8605 "ConfigurationInterfaces.c"
+#line 9007 "ConfigurationInterfaces.c"
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = err;
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp10_);
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8622 "ConfigurationInterfaces.c"
+#line 9024 "ConfigurationInterfaces.c"
 	}
-	__finally159:
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally171:
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/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 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8633 "ConfigurationInterfaces.c"
+#line 9035 "ConfigurationInterfaces.c"
 	}
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 8639 "ConfigurationInterfaces.c"
+#line 9041 "ConfigurationInterfaces.c"
 	}
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 8645 "ConfigurationInterfaces.c"
+#line 9047 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) {
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by);
-#line 8655 "ConfigurationInterfaces.c"
+#line 9057 "ConfigurationInterfaces.c"
 }
 
 
@@ -8669,94 +9071,94 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		ConfigurationEngine* _tmp3_;
 		ConfigurationEngine* _tmp4_;
 		gint _tmp5_;
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort_order;
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8682 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 9084 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8691 "ConfigurationInterfaces.c"
+#line 9093 "ConfigurationInterfaces.c"
 		}
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = sort_by;
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, _tmp5_, &_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8707 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 9109 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8716 "ConfigurationInterfaces.c"
+#line 9118 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8734 "ConfigurationInterfaces.c"
+#line 9136 "ConfigurationInterfaces.c"
 	}
-	__finally160:
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally172:
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/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 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8745 "ConfigurationInterfaces.c"
+#line 9147 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
-#line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by);
-#line 8755 "ConfigurationInterfaces.c"
+#line 9157 "ConfigurationInterfaces.c"
 }
 
 
@@ -8764,11 +9166,11 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 	gboolean _vala_maximize = FALSE;
 	Dimensions _vala_dimensions = {0};
 	GError * _inner_error_ = NULL;
-#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_maximize = FALSE;
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 8767 "ConfigurationInterfaces.c"
+#line 9169 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_;
@@ -8787,154 +9189,154 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		gint _tmp12_;
 		gint _tmp13_;
 		gint _tmp14_;
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, &_inner_error_);
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8802 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9204 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8811 "ConfigurationInterfaces.c"
+#line 9213 "ConfigurationInterfaces.c"
 		}
-#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = configuration_facade_get_engine (self);
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_;
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, &_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		w = _tmp8_;
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8831 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9233 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8840 "ConfigurationInterfaces.c"
+#line 9242 "ConfigurationInterfaces.c"
 		}
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, &_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp12_ = _tmp11_;
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp10_);
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		h = _tmp12_;
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8858 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9260 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8867 "ConfigurationInterfaces.c"
+#line 9269 "ConfigurationInterfaces.c"
 		}
-#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
-#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp14_ = h;
-#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 8875 "ConfigurationInterfaces.c"
+#line 9277 "ConfigurationInterfaces.c"
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_;
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp15_ = err;
-#line 1280 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp15_);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8892 "ConfigurationInterfaces.c"
+#line 9294 "ConfigurationInterfaces.c"
 	}
-	__finally161:
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally173:
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/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 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8903 "ConfigurationInterfaces.c"
+#line 9305 "ConfigurationInterfaces.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 8909 "ConfigurationInterfaces.c"
+#line 9311 "ConfigurationInterfaces.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 8915 "ConfigurationInterfaces.c"
+#line 9317 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) {
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions);
-#line 8925 "ConfigurationInterfaces.c"
+#line 9327 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
 	GError * _inner_error_ = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 8933 "ConfigurationInterfaces.c"
+#line 9335 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
@@ -8947,123 +9349,123 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		ConfigurationEngine* _tmp8_;
 		Dimensions _tmp9_;
 		gint _tmp10_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = maximize;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8960 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9362 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8969 "ConfigurationInterfaces.c"
+#line 9371 "ConfigurationInterfaces.c"
 		}
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = *dimensions;
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_.width;
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, _tmp6_, &_inner_error_);
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8987 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9389 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1349 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8996 "ConfigurationInterfaces.c"
+#line 9398 "ConfigurationInterfaces.c"
 		}
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = *dimensions;
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_.height;
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, _tmp10_, &_inner_error_);
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9014 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9416 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9023 "ConfigurationInterfaces.c"
+#line 9425 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_;
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = err;
-#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp11_);
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9041 "ConfigurationInterfaces.c"
+#line 9443 "ConfigurationInterfaces.c"
 	}
-	__finally162:
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally174:
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/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 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9052 "ConfigurationInterfaces.c"
+#line 9454 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
-#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions);
-#line 9062 "ConfigurationInterfaces.c"
+#line 9464 "ConfigurationInterfaces.c"
 }
 
 
@@ -9077,79 +9479,79 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, &_inner_error_);
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9090 "ConfigurationInterfaces.c"
+#line 9492 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9094 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+#line 9496 "ConfigurationInterfaces.c"
+				goto __catch175_configuration_error;
 			}
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9103 "ConfigurationInterfaces.c"
+#line 9505 "ConfigurationInterfaces.c"
 		}
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9109 "ConfigurationInterfaces.c"
+#line 9511 "ConfigurationInterfaces.c"
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1368 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9130 "ConfigurationInterfaces.c"
+#line 9532 "ConfigurationInterfaces.c"
 	}
-	__finally163:
-#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally175:
+#line 1362 "/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"
+#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9139 "ConfigurationInterfaces.c"
+#line 9541 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) {
-#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self);
-#line 9148 "ConfigurationInterfaces.c"
+#line 9550 "ConfigurationInterfaces.c"
 }
 
 
@@ -9159,69 +9561,69 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = modify_originals;
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, _tmp2_, &_inner_error_);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9172 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+#line 9574 "ConfigurationInterfaces.c"
+				goto __catch176_configuration_error;
 			}
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9181 "ConfigurationInterfaces.c"
+#line 9583 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9199 "ConfigurationInterfaces.c"
+#line 9601 "ConfigurationInterfaces.c"
 	}
-	__finally164:
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally176:
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/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 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9210 "ConfigurationInterfaces.c"
+#line 9612 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals) {
-#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals);
-#line 9220 "ConfigurationInterfaces.c"
+#line 9622 "ConfigurationInterfaces.c"
 }
 
 
@@ -9235,85 +9637,85 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, &_inner_error_);
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9248 "ConfigurationInterfaces.c"
+#line 9650 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9252 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+#line 9654 "ConfigurationInterfaces.c"
+				goto __catch177_configuration_error;
 			}
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9261 "ConfigurationInterfaces.c"
+#line 9663 "ConfigurationInterfaces.c"
 		}
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9267 "ConfigurationInterfaces.c"
+#line 9669 "ConfigurationInterfaces.c"
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gint _tmp7_;
 		gint _tmp8_;
-#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = thumbnail_get_DEFAULT_SCALE ();
-#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp8_;
-#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9294 "ConfigurationInterfaces.c"
+#line 9696 "ConfigurationInterfaces.c"
 	}
-	__finally165:
-#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally177:
+#line 1384 "/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"
+#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp9_;
-#line 9303 "ConfigurationInterfaces.c"
+#line 9705 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self) {
-#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self);
-#line 9312 "ConfigurationInterfaces.c"
+#line 9714 "ConfigurationInterfaces.c"
 }
 
 
@@ -9323,69 +9725,69 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = scale;
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, _tmp2_, &_inner_error_);
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9336 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+#line 9738 "ConfigurationInterfaces.c"
+				goto __catch178_configuration_error;
 			}
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9345 "ConfigurationInterfaces.c"
+#line 9747 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9363 "ConfigurationInterfaces.c"
+#line 9765 "ConfigurationInterfaces.c"
 	}
-	__finally166:
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally178:
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/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 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9374 "ConfigurationInterfaces.c"
+#line 9776 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale) {
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale);
-#line 9384 "ConfigurationInterfaces.c"
+#line 9786 "ConfigurationInterfaces.c"
 }
 
 
@@ -9399,79 +9801,79 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		ConfigurationEngine* _tmp2_;
 		gdouble _tmp3_;
 		gdouble _tmp4_;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, &_inner_error_);
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9412 "ConfigurationInterfaces.c"
+#line 9814 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9416 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+#line 9818 "ConfigurationInterfaces.c"
+				goto __catch179_configuration_error;
 			}
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9425 "ConfigurationInterfaces.c"
+#line 9827 "ConfigurationInterfaces.c"
 		}
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9431 "ConfigurationInterfaces.c"
+#line 9833 "ConfigurationInterfaces.c"
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 5.0;
-#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9452 "ConfigurationInterfaces.c"
+#line 9854 "ConfigurationInterfaces.c"
 	}
-	__finally167:
-#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally179:
+#line 1404 "/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"
+#line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1404 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9461 "ConfigurationInterfaces.c"
+#line 9863 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* self) {
-#line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1403 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1403 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self);
-#line 9470 "ConfigurationInterfaces.c"
+#line 9872 "ConfigurationInterfaces.c"
 }
 
 
@@ -9481,69 +9883,69 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gdouble _tmp2_;
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_height;
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, _tmp2_, &_inner_error_);
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9494 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+#line 9896 "ConfigurationInterfaces.c"
+				goto __catch180_configuration_error;
 			}
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9503 "ConfigurationInterfaces.c"
+#line 9905 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9521 "ConfigurationInterfaces.c"
+#line 9923 "ConfigurationInterfaces.c"
 	}
-	__finally168:
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally180:
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/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 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9532 "ConfigurationInterfaces.c"
+#line 9934 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_height (ConfigurationFacade* self, gdouble content_height) {
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height);
-#line 9542 "ConfigurationInterfaces.c"
+#line 9944 "ConfigurationInterfaces.c"
 }
 
 
@@ -9557,79 +9959,79 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, &_inner_error_);
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9570 "ConfigurationInterfaces.c"
+#line 9972 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9574 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+#line 9976 "ConfigurationInterfaces.c"
+				goto __catch181_configuration_error;
 			}
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9583 "ConfigurationInterfaces.c"
+#line 9985 "ConfigurationInterfaces.c"
 		}
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9589 "ConfigurationInterfaces.c"
+#line 9991 "ConfigurationInterfaces.c"
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9610 "ConfigurationInterfaces.c"
+#line 10012 "ConfigurationInterfaces.c"
 	}
-	__finally169:
-#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally181:
+#line 1426 "/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"
+#line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1426 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9619 "ConfigurationInterfaces.c"
+#line 10021 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self) {
-#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self);
-#line 9628 "ConfigurationInterfaces.c"
+#line 10030 "ConfigurationInterfaces.c"
 }
 
 
@@ -9639,69 +10041,69 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = layout_code;
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, _tmp2_ + 1, &_inner_error_);
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9652 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+#line 10054 "ConfigurationInterfaces.c"
+				goto __catch182_configuration_error;
 			}
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9661 "ConfigurationInterfaces.c"
+#line 10063 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9679 "ConfigurationInterfaces.c"
+#line 10081 "ConfigurationInterfaces.c"
 	}
-	__finally170:
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally182:
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/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 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9690 "ConfigurationInterfaces.c"
+#line 10092 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, gint layout_code) {
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code);
-#line 9700 "ConfigurationInterfaces.c"
+#line 10102 "ConfigurationInterfaces.c"
 }
 
 
@@ -9715,79 +10117,79 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, &_inner_error_);
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9728 "ConfigurationInterfaces.c"
+#line 10130 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9732 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+#line 10134 "ConfigurationInterfaces.c"
+				goto __catch183_configuration_error;
 			}
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9741 "ConfigurationInterfaces.c"
+#line 10143 "ConfigurationInterfaces.c"
 		}
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9747 "ConfigurationInterfaces.c"
+#line 10149 "ConfigurationInterfaces.c"
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 600;
-#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9768 "ConfigurationInterfaces.c"
+#line 10170 "ConfigurationInterfaces.c"
 	}
-	__finally171:
-#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally183:
+#line 1448 "/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"
+#line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9777 "ConfigurationInterfaces.c"
+#line 10179 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) {
-#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self);
-#line 9786 "ConfigurationInterfaces.c"
+#line 10188 "ConfigurationInterfaces.c"
 }
 
 
@@ -9797,69 +10199,69 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_ppi;
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, _tmp2_, &_inner_error_);
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9810 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+#line 10212 "ConfigurationInterfaces.c"
+				goto __catch184_configuration_error;
 			}
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9819 "ConfigurationInterfaces.c"
+#line 10221 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1399 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1399 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9837 "ConfigurationInterfaces.c"
+#line 10239 "ConfigurationInterfaces.c"
 	}
-	__finally172:
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally184:
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/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 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9848 "ConfigurationInterfaces.c"
+#line 10250 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi) {
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1457 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1457 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi);
-#line 9858 "ConfigurationInterfaces.c"
+#line 10260 "ConfigurationInterfaces.c"
 }
 
 
@@ -9873,79 +10275,79 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, &_inner_error_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9886 "ConfigurationInterfaces.c"
+#line 10288 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9890 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+#line 10292 "ConfigurationInterfaces.c"
+				goto __catch185_configuration_error;
 			}
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 9899 "ConfigurationInterfaces.c"
+#line 10301 "ConfigurationInterfaces.c"
 		}
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9905 "ConfigurationInterfaces.c"
+#line 10307 "ConfigurationInterfaces.c"
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9926 "ConfigurationInterfaces.c"
+#line 10328 "ConfigurationInterfaces.c"
 	}
-	__finally173:
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally185:
+#line 1469 "/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"
+#line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 9935 "ConfigurationInterfaces.c"
+#line 10337 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_units (ConfigurationFacade* self) {
-#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self);
-#line 9944 "ConfigurationInterfaces.c"
+#line 10346 "ConfigurationInterfaces.c"
 }
 
 
@@ -9955,69 +10357,69 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = units_code;
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, _tmp2_ + 1, &_inner_error_);
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9968 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+#line 10370 "ConfigurationInterfaces.c"
+				goto __catch186_configuration_error;
 			}
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9977 "ConfigurationInterfaces.c"
+#line 10379 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9995 "ConfigurationInterfaces.c"
+#line 10397 "ConfigurationInterfaces.c"
 	}
-	__finally174:
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally186:
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/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 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10006 "ConfigurationInterfaces.c"
+#line 10408 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_units (ConfigurationFacade* self, gint units_code) {
-#line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code);
-#line 10016 "ConfigurationInterfaces.c"
+#line 10418 "ConfigurationInterfaces.c"
 }
 
 
@@ -10031,79 +10433,79 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		ConfigurationEngine* _tmp2_;
 		gdouble _tmp3_;
 		gdouble _tmp4_;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, &_inner_error_);
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10044 "ConfigurationInterfaces.c"
+#line 10446 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10048 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+#line 10450 "ConfigurationInterfaces.c"
+				goto __catch187_configuration_error;
 			}
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10057 "ConfigurationInterfaces.c"
+#line 10459 "ConfigurationInterfaces.c"
 		}
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10063 "ConfigurationInterfaces.c"
+#line 10465 "ConfigurationInterfaces.c"
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 7.0;
-#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10084 "ConfigurationInterfaces.c"
+#line 10486 "ConfigurationInterfaces.c"
 	}
-	__finally175:
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally187:
+#line 1491 "/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"
+#line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10093 "ConfigurationInterfaces.c"
+#line 10495 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* self) {
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self);
-#line 10102 "ConfigurationInterfaces.c"
+#line 10504 "ConfigurationInterfaces.c"
 }
 
 
@@ -10113,69 +10515,69 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gdouble _tmp2_;
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_width;
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, _tmp2_, &_inner_error_);
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10126 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+#line 10528 "ConfigurationInterfaces.c"
+				goto __catch188_configuration_error;
 			}
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10135 "ConfigurationInterfaces.c"
+#line 10537 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10153 "ConfigurationInterfaces.c"
+#line 10555 "ConfigurationInterfaces.c"
 	}
-	__finally176:
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally188:
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/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 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1501 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10164 "ConfigurationInterfaces.c"
+#line 10566 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_width (ConfigurationFacade* self, gdouble content_width) {
-#line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width);
-#line 10174 "ConfigurationInterfaces.c"
+#line 10576 "ConfigurationInterfaces.c"
 }
 
 
@@ -10189,79 +10591,79 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, &_inner_error_);
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10202 "ConfigurationInterfaces.c"
+#line 10604 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10206 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+#line 10608 "ConfigurationInterfaces.c"
+				goto __catch189_configuration_error;
 			}
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10215 "ConfigurationInterfaces.c"
+#line 10617 "ConfigurationInterfaces.c"
 		}
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10221 "ConfigurationInterfaces.c"
+#line 10623 "ConfigurationInterfaces.c"
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10242 "ConfigurationInterfaces.c"
+#line 10644 "ConfigurationInterfaces.c"
 	}
-	__finally177:
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally189:
+#line 1513 "/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"
+#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10251 "ConfigurationInterfaces.c"
+#line 10653 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* self) {
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1512 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self);
-#line 10260 "ConfigurationInterfaces.c"
+#line 10662 "ConfigurationInterfaces.c"
 }
 
 
@@ -10271,69 +10673,69 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = images_per_page_code;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, _tmp2_ + 1, &_inner_error_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10284 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+#line 10686 "ConfigurationInterfaces.c"
+				goto __catch190_configuration_error;
 			}
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1524 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10293 "ConfigurationInterfaces.c"
+#line 10695 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10311 "ConfigurationInterfaces.c"
+#line 10713 "ConfigurationInterfaces.c"
 	}
-	__finally178:
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally190:
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/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 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10322 "ConfigurationInterfaces.c"
+#line 10724 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code) {
-#line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code);
-#line 10332 "ConfigurationInterfaces.c"
+#line 10734 "ConfigurationInterfaces.c"
 }
 
 
@@ -10347,79 +10749,79 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, &_inner_error_);
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10360 "ConfigurationInterfaces.c"
+#line 10762 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10364 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+#line 10766 "ConfigurationInterfaces.c"
+				goto __catch191_configuration_error;
 			}
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10373 "ConfigurationInterfaces.c"
+#line 10775 "ConfigurationInterfaces.c"
 		}
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10379 "ConfigurationInterfaces.c"
+#line 10781 "ConfigurationInterfaces.c"
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10400 "ConfigurationInterfaces.c"
+#line 10802 "ConfigurationInterfaces.c"
 	}
-	__finally179:
-#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally191:
+#line 1535 "/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"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10409 "ConfigurationInterfaces.c"
+#line 10811 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFacade* self) {
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self);
-#line 10418 "ConfigurationInterfaces.c"
+#line 10820 "ConfigurationInterfaces.c"
 }
 
 
@@ -10429,69 +10831,69 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = match_aspect_ratio;
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, _tmp2_, &_inner_error_);
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10442 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+#line 10844 "ConfigurationInterfaces.c"
+				goto __catch192_configuration_error;
 			}
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10451 "ConfigurationInterfaces.c"
+#line 10853 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10469 "ConfigurationInterfaces.c"
+#line 10871 "ConfigurationInterfaces.c"
 	}
-	__finally180:
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally192:
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/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 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10480 "ConfigurationInterfaces.c"
+#line 10882 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio) {
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1544 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio);
-#line 10490 "ConfigurationInterfaces.c"
+#line 10892 "ConfigurationInterfaces.c"
 }
 
 
@@ -10505,79 +10907,79 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, &_inner_error_);
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10518 "ConfigurationInterfaces.c"
+#line 10920 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10522 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+#line 10924 "ConfigurationInterfaces.c"
+				goto __catch193_configuration_error;
 			}
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10531 "ConfigurationInterfaces.c"
+#line 10933 "ConfigurationInterfaces.c"
 		}
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10537 "ConfigurationInterfaces.c"
+#line 10939 "ConfigurationInterfaces.c"
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10558 "ConfigurationInterfaces.c"
+#line 10960 "ConfigurationInterfaces.c"
 	}
-	__finally181:
-#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally193:
+#line 1557 "/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"
+#line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 10567 "ConfigurationInterfaces.c"
+#line 10969 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* self) {
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self);
-#line 10576 "ConfigurationInterfaces.c"
+#line 10978 "ConfigurationInterfaces.c"
 }
 
 
@@ -10587,69 +10989,69 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = print_titles;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, _tmp2_, &_inner_error_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10600 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+#line 11002 "ConfigurationInterfaces.c"
+				goto __catch194_configuration_error;
 			}
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10609 "ConfigurationInterfaces.c"
+#line 11011 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10627 "ConfigurationInterfaces.c"
+#line 11029 "ConfigurationInterfaces.c"
 	}
-	__finally182:
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally194:
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/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 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10638 "ConfigurationInterfaces.c"
+#line 11040 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles) {
-#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles);
-#line 10648 "ConfigurationInterfaces.c"
+#line 11050 "ConfigurationInterfaces.c"
 }
 
 
@@ -10665,100 +11067,100 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		gint _tmp4_;
 		gint val = 0;
 		gint _tmp6_;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, &_inner_error_);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10678 "ConfigurationInterfaces.c"
+#line 11080 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10682 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+#line 11084 "ConfigurationInterfaces.c"
+				goto __catch195_configuration_error;
 			}
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 10691 "ConfigurationInterfaces.c"
+#line 11093 "ConfigurationInterfaces.c"
 		}
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = _tmp0_ - 1;
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = val;
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (_tmp6_ == -2) {
-#line 10699 "ConfigurationInterfaces.c"
+#line 11101 "ConfigurationInterfaces.c"
 			ResourcesUnitSystem _tmp7_;
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = resources_get_default_measurement_unit ();
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_tmp7_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
-#line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 2;
-#line 10707 "ConfigurationInterfaces.c"
+#line 11109 "ConfigurationInterfaces.c"
 			} else {
-#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 				val = 10;
-#line 10711 "ConfigurationInterfaces.c"
+#line 11113 "ConfigurationInterfaces.c"
 			}
 		}
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = val;
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10718 "ConfigurationInterfaces.c"
+#line 11120 "ConfigurationInterfaces.c"
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_;
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = err;
-#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp8_);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10739 "ConfigurationInterfaces.c"
+#line 11141 "ConfigurationInterfaces.c"
 	}
-	__finally183:
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally195:
+#line 1579 "/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"
+#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp9_;
-#line 10748 "ConfigurationInterfaces.c"
+#line 11150 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self) {
-#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self);
-#line 10757 "ConfigurationInterfaces.c"
+#line 11159 "ConfigurationInterfaces.c"
 }
 
 
@@ -10768,69 +11170,69 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = size_code;
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, _tmp2_ + 1, &_inner_error_);
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10781 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+#line 11183 "ConfigurationInterfaces.c"
+				goto __catch196_configuration_error;
 			}
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10790 "ConfigurationInterfaces.c"
+#line 11192 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10808 "ConfigurationInterfaces.c"
+#line 11210 "ConfigurationInterfaces.c"
 	}
-	__finally184:
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally196:
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/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 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10819 "ConfigurationInterfaces.c"
+#line 11221 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code) {
-#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code);
-#line 10829 "ConfigurationInterfaces.c"
+#line 11231 "ConfigurationInterfaces.c"
 }
 
 
@@ -10844,161 +11246,161 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, &_inner_error_);
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10859 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+#line 11261 "ConfigurationInterfaces.c"
+				goto __catch197_configuration_error;
 			}
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 10868 "ConfigurationInterfaces.c"
+#line 11270 "ConfigurationInterfaces.c"
 		}
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1611 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10880 "ConfigurationInterfaces.c"
+#line 11282 "ConfigurationInterfaces.c"
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("Sans Bold 12");
-#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10904 "ConfigurationInterfaces.c"
+#line 11306 "ConfigurationInterfaces.c"
 	}
-	__finally185:
-#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally197:
+#line 1610 "/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 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10913 "ConfigurationInterfaces.c"
+#line 11315 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) {
-#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self);
-#line 10922 "ConfigurationInterfaces.c"
+#line 11324 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
 	GError * _inner_error_ = NULL;
-#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (font_name != NULL);
-#line 10930 "ConfigurationInterfaces.c"
+#line 11332 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = font_name;
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, _tmp2_, &_inner_error_);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10949 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+#line 11351 "ConfigurationInterfaces.c"
+				goto __catch198_configuration_error;
 			}
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10958 "ConfigurationInterfaces.c"
+#line 11360 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10976 "ConfigurationInterfaces.c"
+#line 11378 "ConfigurationInterfaces.c"
 	}
-	__finally186:
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally198:
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/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 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10987 "ConfigurationInterfaces.c"
+#line 11389 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
-#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name);
-#line 10997 "ConfigurationInterfaces.c"
+#line 11399 "ConfigurationInterfaces.c"
 }
 
 
@@ -11012,79 +11414,79 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, &_inner_error_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11025 "ConfigurationInterfaces.c"
+#line 11427 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11029 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+#line 11431 "ConfigurationInterfaces.c"
+				goto __catch199_configuration_error;
 			}
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11038 "ConfigurationInterfaces.c"
+#line 11440 "ConfigurationInterfaces.c"
 		}
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11044 "ConfigurationInterfaces.c"
+#line 11446 "ConfigurationInterfaces.c"
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11065 "ConfigurationInterfaces.c"
+#line 11467 "ConfigurationInterfaces.c"
 	}
-	__finally187:
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally199:
+#line 1633 "/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 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11074 "ConfigurationInterfaces.c"
+#line 11476 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) {
-#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self);
-#line 11083 "ConfigurationInterfaces.c"
+#line 11485 "ConfigurationInterfaces.c"
 }
 
 
@@ -11094,69 +11496,69 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show;
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, _tmp2_, &_inner_error_);
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11107 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+#line 11509 "ConfigurationInterfaces.c"
+				goto __catch200_configuration_error;
 			}
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1644 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11116 "ConfigurationInterfaces.c"
+#line 11518 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11134 "ConfigurationInterfaces.c"
+#line 11536 "ConfigurationInterfaces.c"
 	}
-	__finally188:
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally200:
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/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 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11145 "ConfigurationInterfaces.c"
+#line 11547 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) {
-#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show);
-#line 11155 "ConfigurationInterfaces.c"
+#line 11557 "ConfigurationInterfaces.c"
 }
 
 
@@ -11170,79 +11572,79 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, &_inner_error_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11183 "ConfigurationInterfaces.c"
+#line 11585 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11187 "ConfigurationInterfaces.c"
-				goto __catch189_configuration_error;
+#line 11589 "ConfigurationInterfaces.c"
+				goto __catch201_configuration_error;
 			}
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11196 "ConfigurationInterfaces.c"
+#line 11598 "ConfigurationInterfaces.c"
 		}
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11202 "ConfigurationInterfaces.c"
+#line 11604 "ConfigurationInterfaces.c"
 	}
-	goto __finally189;
-	__catch189_configuration_error:
+	goto __finally201;
+	__catch201_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 180;
-#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11223 "ConfigurationInterfaces.c"
+#line 11625 "ConfigurationInterfaces.c"
 	}
-	__finally189:
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally201:
+#line 1655 "/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 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11232 "ConfigurationInterfaces.c"
+#line 11634 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) {
-#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self);
-#line 11241 "ConfigurationInterfaces.c"
+#line 11643 "ConfigurationInterfaces.c"
 }
 
 
@@ -11252,69 +11654,69 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = position;
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, _tmp2_, &_inner_error_);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11265 "ConfigurationInterfaces.c"
-				goto __catch190_configuration_error;
+#line 11667 "ConfigurationInterfaces.c"
+				goto __catch202_configuration_error;
 			}
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11274 "ConfigurationInterfaces.c"
+#line 11676 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally202;
+	__catch202_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11292 "ConfigurationInterfaces.c"
+#line 11694 "ConfigurationInterfaces.c"
 	}
-	__finally190:
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally202:
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/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 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11303 "ConfigurationInterfaces.c"
+#line 11705 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position) {
-#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position);
-#line 11313 "ConfigurationInterfaces.c"
+#line 11715 "ConfigurationInterfaces.c"
 }
 
 
@@ -11328,79 +11730,79 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		ConfigurationEngine* _tmp2_;
 		gdouble _tmp3_;
 		gdouble _tmp4_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, &_inner_error_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11341 "ConfigurationInterfaces.c"
+#line 11743 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11345 "ConfigurationInterfaces.c"
-				goto __catch191_configuration_error;
+#line 11747 "ConfigurationInterfaces.c"
+				goto __catch203_configuration_error;
 			}
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11354 "ConfigurationInterfaces.c"
+#line 11756 "ConfigurationInterfaces.c"
 		}
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11360 "ConfigurationInterfaces.c"
+#line 11762 "ConfigurationInterfaces.c"
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 3.0;
-#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1681 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11381 "ConfigurationInterfaces.c"
+#line 11783 "ConfigurationInterfaces.c"
 	}
-	__finally191:
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally203:
+#line 1676 "/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 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11390 "ConfigurationInterfaces.c"
+#line 11792 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) {
-#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self);
-#line 11399 "ConfigurationInterfaces.c"
+#line 11801 "ConfigurationInterfaces.c"
 }
 
 
@@ -11410,69 +11812,69 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gdouble _tmp2_;
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, _tmp2_, &_inner_error_);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11423 "ConfigurationInterfaces.c"
-				goto __catch192_configuration_error;
+#line 11825 "ConfigurationInterfaces.c"
+				goto __catch204_configuration_error;
 			}
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11432 "ConfigurationInterfaces.c"
+#line 11834 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally204;
+	__catch204_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11450 "ConfigurationInterfaces.c"
+#line 11852 "ConfigurationInterfaces.c"
 	}
-	__finally192:
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally204:
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/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 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11461 "ConfigurationInterfaces.c"
+#line 11863 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay);
-#line 11471 "ConfigurationInterfaces.c"
+#line 11873 "ConfigurationInterfaces.c"
 }
 
 
@@ -11486,79 +11888,79 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		ConfigurationEngine* _tmp2_;
 		gdouble _tmp3_;
 		gdouble _tmp4_;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, &_inner_error_);
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11499 "ConfigurationInterfaces.c"
+#line 11901 "ConfigurationInterfaces.c"
 			gdouble _tmp5_ = 0.0;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11503 "ConfigurationInterfaces.c"
-				goto __catch193_configuration_error;
+#line 11905 "ConfigurationInterfaces.c"
+				goto __catch205_configuration_error;
 			}
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11512 "ConfigurationInterfaces.c"
+#line 11914 "ConfigurationInterfaces.c"
 		}
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11518 "ConfigurationInterfaces.c"
+#line 11920 "ConfigurationInterfaces.c"
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally205;
+	__catch205_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0.3;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11539 "ConfigurationInterfaces.c"
+#line 11941 "ConfigurationInterfaces.c"
 	}
-	__finally193:
-#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally205:
+#line 1697 "/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 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11548 "ConfigurationInterfaces.c"
+#line 11950 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) {
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self);
-#line 11557 "ConfigurationInterfaces.c"
+#line 11959 "ConfigurationInterfaces.c"
 }
 
 
@@ -11568,69 +11970,69 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gdouble _tmp2_;
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, _tmp2_, &_inner_error_);
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11581 "ConfigurationInterfaces.c"
-				goto __catch194_configuration_error;
+#line 11983 "ConfigurationInterfaces.c"
+				goto __catch206_configuration_error;
 			}
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1709 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11590 "ConfigurationInterfaces.c"
+#line 11992 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11608 "ConfigurationInterfaces.c"
+#line 12010 "ConfigurationInterfaces.c"
 	}
-	__finally194:
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally206:
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/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 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11619 "ConfigurationInterfaces.c"
+#line 12021 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay);
-#line 11629 "ConfigurationInterfaces.c"
+#line 12031 "ConfigurationInterfaces.c"
 }
 
 
@@ -11644,161 +12046,161 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, &_inner_error_);
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11659 "ConfigurationInterfaces.c"
-				goto __catch195_configuration_error;
+#line 12061 "ConfigurationInterfaces.c"
+				goto __catch207_configuration_error;
 			}
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 11668 "ConfigurationInterfaces.c"
+#line 12070 "ConfigurationInterfaces.c"
 		}
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11680 "ConfigurationInterfaces.c"
+#line 12082 "ConfigurationInterfaces.c"
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		gchar* _tmp7_;
-#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11704 "ConfigurationInterfaces.c"
+#line 12106 "ConfigurationInterfaces.c"
 	}
-	__finally195:
-#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally207:
+#line 1720 "/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 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 11713 "ConfigurationInterfaces.c"
+#line 12115 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) {
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self);
-#line 11722 "ConfigurationInterfaces.c"
+#line 12124 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
 	GError * _inner_error_ = NULL;
-#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 11730 "ConfigurationInterfaces.c"
+#line 12132 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		const gchar* _tmp2_;
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = id;
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, _tmp2_, &_inner_error_);
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11749 "ConfigurationInterfaces.c"
-				goto __catch196_configuration_error;
+#line 12151 "ConfigurationInterfaces.c"
+				goto __catch208_configuration_error;
 			}
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1734 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11758 "ConfigurationInterfaces.c"
+#line 12160 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11776 "ConfigurationInterfaces.c"
+#line 12178 "ConfigurationInterfaces.c"
 	}
-	__finally196:
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally208:
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/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 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11787 "ConfigurationInterfaces.c"
+#line 12189 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
-#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id);
-#line 11797 "ConfigurationInterfaces.c"
+#line 12199 "ConfigurationInterfaces.c"
 }
 
 
@@ -11812,79 +12214,79 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, &_inner_error_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11825 "ConfigurationInterfaces.c"
+#line 12227 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11829 "ConfigurationInterfaces.c"
-				goto __catch197_configuration_error;
+#line 12231 "ConfigurationInterfaces.c"
+				goto __catch209_configuration_error;
 			}
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 11838 "ConfigurationInterfaces.c"
+#line 12240 "ConfigurationInterfaces.c"
 		}
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11844 "ConfigurationInterfaces.c"
+#line 12246 "ConfigurationInterfaces.c"
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11865 "ConfigurationInterfaces.c"
+#line 12267 "ConfigurationInterfaces.c"
 	}
-	__finally197:
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally209:
+#line 1745 "/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 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 11874 "ConfigurationInterfaces.c"
+#line 12276 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) {
-#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1744 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self);
-#line 11883 "ConfigurationInterfaces.c"
+#line 12285 "ConfigurationInterfaces.c"
 }
 
 
@@ -11894,69 +12296,69 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show_title;
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, _tmp2_, &_inner_error_);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11907 "ConfigurationInterfaces.c"
-				goto __catch198_configuration_error;
+#line 12309 "ConfigurationInterfaces.c"
+				goto __catch210_configuration_error;
 			}
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11916 "ConfigurationInterfaces.c"
+#line 12318 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11934 "ConfigurationInterfaces.c"
+#line 12336 "ConfigurationInterfaces.c"
 	}
-	__finally198:
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally210:
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/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 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1755 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11945 "ConfigurationInterfaces.c"
+#line 12347 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) {
-#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title);
-#line 11955 "ConfigurationInterfaces.c"
+#line 12357 "ConfigurationInterfaces.c"
 }
 
 
@@ -11971,7 +12373,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 11970 "ConfigurationInterfaces.c"
+#line 12372 "ConfigurationInterfaces.c"
 }
 
 
@@ -12017,7 +12419,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 12016 "ConfigurationInterfaces.c"
+#line 12418 "ConfigurationInterfaces.c"
 }
 
 
@@ -12031,43 +12433,43 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, &_inner_error_);
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12044 "ConfigurationInterfaces.c"
+#line 12446 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12048 "ConfigurationInterfaces.c"
-				goto __catch199_configuration_error;
+#line 12450 "ConfigurationInterfaces.c"
+				goto __catch211_configuration_error;
 			}
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12057 "ConfigurationInterfaces.c"
+#line 12459 "ConfigurationInterfaces.c"
 		}
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12063 "ConfigurationInterfaces.c"
+#line 12465 "ConfigurationInterfaces.c"
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
@@ -12076,51 +12478,51 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		gchar* _tmp9_;
 		gboolean _tmp10_;
 		gboolean _tmp11_;
-#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_time_local ((time_t) 0, &_tmp7_);
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = g_time_format (&_tmp7_, "%p");
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = _tmp8_;
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = is_string_empty (_tmp9_);
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = _tmp10_;
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp9_);
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp11_;
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12101 "ConfigurationInterfaces.c"
+#line 12503 "ConfigurationInterfaces.c"
 	}
-	__finally199:
-#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally211:
+#line 1766 "/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 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp12_;
-#line 12110 "ConfigurationInterfaces.c"
+#line 12512 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) {
-#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self);
-#line 12119 "ConfigurationInterfaces.c"
+#line 12521 "ConfigurationInterfaces.c"
 }
 
 
@@ -12130,69 +12532,69 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = use_24_hour_time;
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, _tmp2_, &_inner_error_);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12143 "ConfigurationInterfaces.c"
-				goto __catch200_configuration_error;
+#line 12545 "ConfigurationInterfaces.c"
+				goto __catch212_configuration_error;
 			}
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12152 "ConfigurationInterfaces.c"
+#line 12554 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12170 "ConfigurationInterfaces.c"
+#line 12572 "ConfigurationInterfaces.c"
 	}
-	__finally200:
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally212:
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/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 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12181 "ConfigurationInterfaces.c"
+#line 12583 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) {
-#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time);
-#line 12191 "ConfigurationInterfaces.c"
+#line 12593 "ConfigurationInterfaces.c"
 }
 
 
@@ -12206,79 +12608,79 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		ConfigurationEngine* _tmp2_;
 		gboolean _tmp3_;
 		gboolean _tmp4_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, &_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12219 "ConfigurationInterfaces.c"
+#line 12621 "ConfigurationInterfaces.c"
 			gboolean _tmp5_ = FALSE;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12223 "ConfigurationInterfaces.c"
-				goto __catch201_configuration_error;
+#line 12625 "ConfigurationInterfaces.c"
+				goto __catch213_configuration_error;
 			}
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12232 "ConfigurationInterfaces.c"
+#line 12634 "ConfigurationInterfaces.c"
 		}
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12238 "ConfigurationInterfaces.c"
+#line 12640 "ConfigurationInterfaces.c"
 	}
-	goto __finally201;
-	__catch201_configuration_error:
+	goto __finally213;
+	__catch213_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12259 "ConfigurationInterfaces.c"
+#line 12661 "ConfigurationInterfaces.c"
 	}
-	__finally201:
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally213:
+#line 1789 "/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 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 12268 "ConfigurationInterfaces.c"
+#line 12670 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) {
-#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self);
-#line 12277 "ConfigurationInterfaces.c"
+#line 12679 "ConfigurationInterfaces.c"
 }
 
 
@@ -12288,69 +12690,69 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gboolean _tmp2_;
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = b;
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, _tmp2_, &_inner_error_);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12301 "ConfigurationInterfaces.c"
-				goto __catch202_configuration_error;
+#line 12703 "ConfigurationInterfaces.c"
+				goto __catch214_configuration_error;
 			}
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12310 "ConfigurationInterfaces.c"
+#line 12712 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally202;
-	__catch202_configuration_error:
+	goto __finally214;
+	__catch214_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12328 "ConfigurationInterfaces.c"
+#line 12730 "ConfigurationInterfaces.c"
 	}
-	__finally202:
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally214:
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/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 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12339 "ConfigurationInterfaces.c"
+#line 12741 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) {
-#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b);
-#line 12349 "ConfigurationInterfaces.c"
+#line 12751 "ConfigurationInterfaces.c"
 }
 
 
@@ -12364,79 +12766,79 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, &_inner_error_);
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12377 "ConfigurationInterfaces.c"
+#line 12779 "ConfigurationInterfaces.c"
 			gint _tmp5_ = 0;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12381 "ConfigurationInterfaces.c"
-				goto __catch203_configuration_error;
+#line 12783 "ConfigurationInterfaces.c"
+				goto __catch215_configuration_error;
 			}
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return _tmp5_;
-#line 12390 "ConfigurationInterfaces.c"
+#line 12792 "ConfigurationInterfaces.c"
 		}
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1811 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12396 "ConfigurationInterfaces.c"
+#line 12798 "ConfigurationInterfaces.c"
 	}
-	goto __finally203;
-	__catch203_configuration_error:
+	goto __finally215;
+	__catch215_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
-#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = -1;
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12417 "ConfigurationInterfaces.c"
+#line 12819 "ConfigurationInterfaces.c"
 	}
-	__finally203:
-#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally215:
+#line 1810 "/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 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1810 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return _tmp7_;
-#line 12426 "ConfigurationInterfaces.c"
+#line 12828 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) {
-#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self);
-#line 12435 "ConfigurationInterfaces.c"
+#line 12837 "ConfigurationInterfaces.c"
 }
 
 
@@ -12446,69 +12848,69 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp0_;
 		ConfigurationEngine* _tmp1_;
 		gint _tmp2_;
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state_cookie;
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, _tmp2_, &_inner_error_);
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12459 "ConfigurationInterfaces.c"
-				goto __catch204_configuration_error;
+#line 12861 "ConfigurationInterfaces.c"
+				goto __catch216_configuration_error;
 			}
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1822 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12468 "ConfigurationInterfaces.c"
+#line 12870 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally204;
-	__catch204_configuration_error:
+	goto __finally216;
+	__catch216_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12486 "ConfigurationInterfaces.c"
+#line 12888 "ConfigurationInterfaces.c"
 	}
-	__finally204:
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally216:
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/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 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12497 "ConfigurationInterfaces.c"
+#line 12899 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) {
-#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie);
-#line 12507 "ConfigurationInterfaces.c"
+#line 12909 "ConfigurationInterfaces.c"
 }
 
 
@@ -12522,44 +12924,44 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade*
 	gboolean _tmp5_;
 	gboolean _tmp6_;
 	gboolean _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1833 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12549 "ConfigurationInterfaces.c"
+#line 12951 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1832 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def);
-#line 12558 "ConfigurationInterfaces.c"
+#line 12960 "ConfigurationInterfaces.c"
 }
 
 
@@ -12570,38 +12972,38 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
 	gboolean _tmp5_;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12591 "ConfigurationInterfaces.c"
+#line 12993 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val);
-#line 12600 "ConfigurationInterfaces.c"
+#line 13002 "ConfigurationInterfaces.c"
 }
 
 
@@ -12615,44 +13017,44 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade*
 	gdouble _tmp5_;
 	gdouble _tmp6_;
 	gdouble _tmp7_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12642 "ConfigurationInterfaces.c"
+#line 13044 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def);
-#line 12651 "ConfigurationInterfaces.c"
+#line 13053 "ConfigurationInterfaces.c"
 }
 
 
@@ -12663,38 +13065,38 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
 	gdouble _tmp5_;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12684 "ConfigurationInterfaces.c"
+#line 13086 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1844 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val);
-#line 12693 "ConfigurationInterfaces.c"
+#line 13095 "ConfigurationInterfaces.c"
 }
 
 
@@ -12708,44 +13110,44 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self,
 	gint _tmp5_;
 	gint _tmp6_;
 	gint _tmp7_;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1849 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12735 "ConfigurationInterfaces.c"
+#line 13137 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def);
-#line 12744 "ConfigurationInterfaces.c"
+#line 13146 "ConfigurationInterfaces.c"
 }
 
 
@@ -12756,38 +13158,38 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self,
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
 	gint _tmp5_;
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12777 "ConfigurationInterfaces.c"
+#line 13179 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val);
-#line 12786 "ConfigurationInterfaces.c"
+#line 13188 "ConfigurationInterfaces.c"
 }
 
 
@@ -12805,65 +13207,65 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_;
 	gchar* _tmp11_;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_string (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1857 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_result_ = _tmp7_;
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp9_ = _result_;
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_strcmp0 (_tmp9_, "") == 0) {
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = NULL;
-#line 12836 "ConfigurationInterfaces.c"
+#line 13238 "ConfigurationInterfaces.c"
 	} else {
 		const gchar* _tmp10_;
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _result_;
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp10_;
-#line 12843 "ConfigurationInterfaces.c"
+#line 13245 "ConfigurationInterfaces.c"
 	}
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp11_;
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_result_);
-#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1858 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12853 "ConfigurationInterfaces.c"
+#line 13255 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def);
-#line 12862 "ConfigurationInterfaces.c"
+#line 13264 "ConfigurationInterfaces.c"
 }
 
 
@@ -12875,46 +13277,46 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	const gchar* _tmp4_;
 	const gchar* _tmp5_;
 	const gchar* _tmp6_;
-#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = val;
-#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1862 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (_tmp0_ == NULL) {
-#line 1801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = "";
-#line 12886 "ConfigurationInterfaces.c"
+#line 13288 "ConfigurationInterfaces.c"
 	}
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configuration_facade_get_engine (self);
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = domain;
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = id;
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = key;
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = val;
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp2_);
-#line 12904 "ConfigurationInterfaces.c"
+#line 13306 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val);
-#line 12913 "ConfigurationInterfaces.c"
+#line 13315 "ConfigurationInterfaces.c"
 }
 
 
@@ -12924,36 +13326,36 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	const gchar* _tmp4_;
-#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12943 "ConfigurationInterfaces.c"
+#line 13345 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1868 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key);
-#line 12952 "ConfigurationInterfaces.c"
+#line 13354 "ConfigurationInterfaces.c"
 }
 
 
@@ -12964,34 +13366,34 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura
 	const gchar* _tmp2_;
 	FuzzyPropertyState _tmp3_;
 	FuzzyPropertyState _tmp4_;
-#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = configuration_engine_is_plugin_enabled (_tmp1_, _tmp2_);
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = _tmp3_;
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp4_;
-#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1876 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12981 "ConfigurationInterfaces.c"
+#line 13383 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) {
-#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id);
-#line 12990 "ConfigurationInterfaces.c"
+#line 13392 "ConfigurationInterfaces.c"
 }
 
 
@@ -13000,338 +13402,350 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s
 	ConfigurationEngine* _tmp1_;
 	const gchar* _tmp2_;
 	gboolean _tmp3_;
-#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = enabled;
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_);
-#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1880 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 13013 "ConfigurationInterfaces.c"
+#line 13415 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) {
-#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled);
-#line 13022 "ConfigurationInterfaces.c"
+#line 13424 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_parent_class = g_type_class_peek_parent (klass);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (ConfigurationFacadePrivate));
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_auto_import_from_library;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_auto_import_from_library;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_bg_color_name = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_bg_color_name;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_bg_color_name = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_bg_color_name;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_transparent_background_type = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_transparent_background_type;
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_transparent_background_type = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_transparent_background_type;
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_transparent_background_color = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_transparent_background_color;
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_transparent_background_color = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_transparent_background_color;
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_commit_metadata_to_masters;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_commit_metadata_to_masters;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_desktop_background = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_desktop_background;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_desktop_background = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_desktop_background;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_screensaver = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_screensaver;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_screensaver = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_screensaver;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_directory_pattern = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_directory_pattern;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_directory_pattern = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_directory_pattern;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_directory_pattern_custom;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_directory_pattern_custom;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_direct_window_state = (void (*) (ConfigurationFacade *, gboolean*, Dimensions*)) configuration_facade_real_get_direct_window_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_direct_window_state = (void (*) (ConfigurationFacade *, gboolean, Dimensions*)) configuration_facade_real_set_direct_window_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_basic_properties = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_basic_properties;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_basic_properties = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_basic_properties;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_extended_properties = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_extended_properties;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_extended_properties = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_extended_properties;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_sidebar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_sidebar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_sidebar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_sidebar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_toolbar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_toolbar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_toolbar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_toolbar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_search_bar = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_search_bar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_search_bar = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_search_bar;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_ratings;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_ratings;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_tags = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_tags;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_tags = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_tags;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_titles = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_titles;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_titles = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_titles;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_comments = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_photo_comments;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_comments = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_photo_comments;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_event_comments = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_display_event_comments;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_event_comments = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_display_event_comments;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_event_photos_sort = (void (*) (ConfigurationFacade *, gboolean*, gint*)) configuration_facade_real_get_event_photos_sort;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_event_photos_sort = (void (*) (ConfigurationFacade *, gboolean, gint)) configuration_facade_real_set_event_photos_sort;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_events_sort_ascending;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_events_sort_ascending;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_external_photo_app = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_external_photo_app;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_external_photo_app = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_external_photo_app;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_external_raw_app = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_external_raw_app;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_external_raw_app = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_external_raw_app;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_constraint = (ScaleConstraint (*) (ConfigurationFacade *)) configuration_facade_real_get_export_constraint;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_constraint = (void (*) (ConfigurationFacade *, ScaleConstraint)) configuration_facade_real_set_export_constraint;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = (ExportFormatMode (*) (ConfigurationFacade *)) configuration_facade_real_get_export_export_format_mode;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = (void (*) (ConfigurationFacade *, ExportFormatMode)) configuration_facade_real_set_export_export_format_mode;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_export_metadata = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_export_export_metadata;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_export_metadata = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_export_export_metadata;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = (PhotoFileFormat (*) (ConfigurationFacade *)) configuration_facade_real_get_export_photo_file_format;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = (void (*) (ConfigurationFacade *, PhotoFileFormat)) configuration_facade_real_set_export_photo_file_format;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_quality = (JpegQuality (*) (ConfigurationFacade *)) configuration_facade_real_get_export_quality;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_quality = (void (*) (ConfigurationFacade *, JpegQuality)) configuration_facade_real_set_export_quality;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_export_scale = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_export_scale;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_export_scale = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_export_scale;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_default_raw_developer = (RawDeveloper (*) (ConfigurationFacade *)) configuration_facade_real_get_default_raw_developer;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_default_raw_developer = (void (*) (ConfigurationFacade *, RawDeveloper)) configuration_facade_real_set_default_raw_developer;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_hide_photos_already_imported;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_hide_photos_already_imported;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_import_dir = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_import_dir;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_import_dir = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_import_dir;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_keep_relativity = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_keep_relativity;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_keep_relativity = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_keep_relativity;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_pin_toolbar_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_pin_toolbar_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_height = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_height;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_height = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_height;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_menu_choice;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_menu_choice;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_width = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_last_crop_width;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_width = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_last_crop_width;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_used_service = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_last_used_service;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_used_service = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_last_used_service;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_last_used_dataimports_service;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_last_used_dataimports_service;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_library_photos_sort = (void (*) (ConfigurationFacade *, gboolean*, gint*)) configuration_facade_real_get_library_photos_sort;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_library_photos_sort = (void (*) (ConfigurationFacade *, gboolean, gint)) configuration_facade_real_set_library_photos_sort;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_library_window_state = (void (*) (ConfigurationFacade *, gboolean*, Dimensions*)) configuration_facade_real_get_library_window_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_library_window_state = (void (*) (ConfigurationFacade *, gboolean, Dimensions*)) configuration_facade_real_set_library_window_state;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_modify_originals = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_modify_originals;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_modify_originals = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_modify_originals;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_photo_thumbnail_scale;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_photo_thumbnail_scale;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_height = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_height;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_height = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_printing_content_height;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_layout = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_layout;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_layout = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_layout;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_ppi;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_ppi;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_units = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_units;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_units = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_content_units;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_width = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_content_width;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_width = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_printing_content_width;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_images_per_page;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_images_per_page;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_match_aspect_ratio;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_printing_match_aspect_ratio;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_print_titles = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_print_titles;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_print_titles = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_printing_print_titles;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_size_selection = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_size_selection;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_size_selection = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_printing_size_selection;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_titles_font = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_printing_titles_font;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_titles_font = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_printing_titles_font;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_show_welcome_dialog;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_show_welcome_dialog;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_sidebar_position = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_sidebar_position;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_sidebar_position = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_sidebar_position;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_delay = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_delay;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_delay = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_slideshow_delay;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = (gdouble (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_transition_delay;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = (void (*) (ConfigurationFacade *, gdouble)) configuration_facade_real_set_slideshow_transition_delay;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = (gchar* (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_transition_effect_id;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = (void (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_set_slideshow_transition_effect_id;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_slideshow_show_title;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_slideshow_show_title;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_use_24_hour_time;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_use_24_hour_time;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = (gboolean (*) (ConfigurationFacade *)) configuration_facade_real_get_use_lowercase_filenames;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = (void (*) (ConfigurationFacade *, gboolean)) configuration_facade_real_set_use_lowercase_filenames;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = (gint (*) (ConfigurationFacade *)) configuration_facade_real_get_video_interpreter_state_cookie;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = (void (*) (ConfigurationFacade *, gint)) configuration_facade_real_set_video_interpreter_state_cookie;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_bool = (gboolean (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_get_plugin_bool;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_bool = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gboolean)) configuration_facade_real_set_plugin_bool;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_double = (gdouble (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_get_plugin_double;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_double = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gdouble)) configuration_facade_real_set_plugin_double;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_int = (gint (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_get_plugin_int;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_int = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, gint)) configuration_facade_real_set_plugin_int;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_string = (gchar* (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_get_plugin_string;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_string = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*, const gchar*)) configuration_facade_real_set_plugin_string;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->unset_plugin_key = (void (*) (ConfigurationFacade *, const gchar*, const gchar*, const gchar*)) configuration_facade_real_unset_plugin_key;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationFacade *, const gchar*)) configuration_facade_real_is_plugin_enabled;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_enabled = (void (*) (ConfigurationFacade *, const gchar*, gboolean)) configuration_facade_real_set_plugin_enabled;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (klass)->finalize = configuration_facade_finalize;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_AUTO_IMPORT_FROM_LIBRARY_CHANGED_SIGNAL] = g_signal_new ("auto-import-from-library-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_BG_COLOR_NAME_CHANGED_SIGNAL] = g_signal_new ("bg-color-name-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_TYPE_CHANGED_SIGNAL] = g_signal_new ("transparent-background-type-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	configuration_facade_signals[CONFIGURATION_FACADE_TRANSPARENT_BACKGROUND_COLOR_CHANGED_SIGNAL] = g_signal_new ("transparent-background-color-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_COMMIT_METADATA_TO_MASTERS_CHANGED_SIGNAL] = g_signal_new ("commit-metadata-to-masters-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_EVENTS_SORT_ASCENDING_CHANGED_SIGNAL] = g_signal_new ("events-sort-ascending-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_EXTERNAL_APP_CHANGED_SIGNAL] = g_signal_new ("external-app-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_signals[CONFIGURATION_FACADE_IMPORT_DIRECTORY_CHANGED_SIGNAL] = g_signal_new ("import-directory-changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13311 "ConfigurationInterfaces.c"
+#line 13725 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_instance_init (ConfigurationFacade * self) {
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self);
-#line 13318 "ConfigurationInterfaces.c"
+#line 13732 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_finalize (GObject * obj) {
 	ConfigurationFacade * self;
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONFIGURATION_FACADE, ConfigurationFacade);
-#line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (self->priv->engine);
-#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj);
-#line 13330 "ConfigurationInterfaces.c"
+#line 13744 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index a9636ef..c785144 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -22,6 +22,8 @@ public enum FuzzyPropertyState {
 public enum ConfigurableProperty {   
     AUTO_IMPORT_FROM_LIBRARY = 0,
     BG_COLOR_NAME,
+    TRANSPARENT_BACKGROUND_TYPE,
+    TRANSPARENT_BACKGROUND_COLOR,
     COMMIT_METADATA_TO_MASTERS,
     DESKTOP_BACKGROUND_FILE,
     DESKTOP_BACKGROUND_MODE,
@@ -100,6 +102,12 @@ public enum ConfigurableProperty {
                 
             case BG_COLOR_NAME:
                 return "BG_COLOR_NAME";
+
+            case TRANSPARENT_BACKGROUND_TYPE:
+                return "TRANSPARENT_BACKGROUND_TYPE";
+
+            case TRANSPARENT_BACKGROUND_COLOR:
+                return "TRANSPARENT_BACKGROUND_COLOR";
                 
             case COMMIT_METADATA_TO_MASTERS:
                 return "COMMIT_METADATA_TO_MASTERS";
@@ -347,6 +355,8 @@ public abstract class ConfigurationFacade : Object {
 
     public signal void auto_import_from_library_changed();
     public signal void bg_color_name_changed();
+    public signal void transparent_background_type_changed();
+    public signal void transparent_background_color_changed();
     public signal void commit_metadata_to_masters_changed();
     public signal void events_sort_ascending_changed();
     public signal void external_app_changed();
@@ -369,6 +379,14 @@ public abstract class ConfigurationFacade : Object {
             case ConfigurableProperty.BG_COLOR_NAME:
                 bg_color_name_changed();
             break;
+
+            case ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE:
+                transparent_background_type_changed();
+            break;
+
+            case ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR:
+                transparent_background_color_changed();
+            break;
             
             case ConfigurableProperty.COMMIT_METADATA_TO_MASTERS:
                 commit_metadata_to_masters_changed();
@@ -453,6 +471,50 @@ public abstract class ConfigurationFacade : Object {
     }
 
     //
+    // transparent background type
+    //
+    public virtual string get_transparent_background_type() {
+        try {
+            return get_engine().get_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return "checkered";
+        }
+    }
+
+    public virtual void set_transparent_background_type(string type) {
+        try {
+            get_engine().set_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE, type);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    //
+    // transparent background color
+    //
+    public virtual string get_transparent_background_color() {
+        try {
+            return get_engine().get_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return "#444";
+        }
+    }
+
+    public virtual void set_transparent_background_color(string color_name) {
+        try {
+            get_engine().set_string_property(ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR, color_name);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    //
     // commit metadata to masters
     //
     public virtual bool get_commit_metadata_to_masters() {
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index c1d8730..4f637b2 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -48,6 +48,8 @@ typedef struct _GSettingsConfigurationEnginePrivate GSettingsConfigurationEngine
 typedef enum  {
 	CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY = 0,
 	CONFIGURABLE_PROPERTY_BG_COLOR_NAME,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE,
+	CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR,
 	CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE,
 	CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE,
@@ -530,14 +532,14 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 	gchar* _tmp206_;
 	gchar* _tmp207_;
 	gchar** _tmp208_;
-	gchar** _tmp209_;
-	gint _tmp209__length1;
+	gint _tmp208__length1;
+	gchar* _tmp209_;
 	gchar* _tmp210_;
-	gchar* _tmp211_;
-	gchar** _tmp212_;
-	gint _tmp212__length1;
+	gchar** _tmp211_;
+	gint _tmp211__length1;
+	gchar* _tmp212_;
 	gchar* _tmp213_;
-	gchar* _tmp214_;
+	gchar** _tmp214_;
 	gchar** _tmp215_;
 	gint _tmp215__length1;
 	gchar* _tmp216_;
@@ -806,6 +808,22 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 	gint _tmp413__length1;
 	gchar* _tmp414_;
 	gchar* _tmp415_;
+	gchar** _tmp416_;
+	gint _tmp416__length1;
+	gchar* _tmp417_;
+	gchar* _tmp418_;
+	gchar** _tmp419_;
+	gint _tmp419__length1;
+	gchar* _tmp420_;
+	gchar* _tmp421_;
+	gchar** _tmp422_;
+	gint _tmp422__length1;
+	gchar* _tmp423_;
+	gchar* _tmp424_;
+	gchar** _tmp425_;
+	gint _tmp425__length1;
+	gchar* _tmp426_;
+	gchar* _tmp427_;
 #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = (GSettingsConfigurationEngine*) g_object_new (object_type, NULL);
 #line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -847,109 +865,109 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7__length1 = self->priv->schema_names_length1;
 #line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp8_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp8_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
+	_g_free0 (_tmp7_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE]);
 #line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp8_;
+	_tmp7_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE] = _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp9_ = _tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
+	_tmp9_ = _tmp7_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE];
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10_ = self->priv->schema_names;
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10__length1 = self->priv->schema_names_length1;
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp11_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
+	_tmp11_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
+	_g_free0 (_tmp10_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR]);
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp11_;
+	_tmp10_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR] = _tmp11_;
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp12_ = _tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
+	_tmp12_ = _tmp10_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR];
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp13_ = self->priv->schema_names;
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp13__length1 = self->priv->schema_names_length1;
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp14_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
+	_tmp14_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
+	_g_free0 (_tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp14_;
+	_tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp14_;
 #line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp15_ = _tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
+	_tmp15_ = _tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp16_ = self->priv->schema_names;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp16__length1 = self->priv->schema_names_length1;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp17_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
+	_tmp17_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
+	_g_free0 (_tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp17_;
+	_tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp17_;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp18_ = _tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
+	_tmp18_ = _tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp19_ = self->priv->schema_names;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp19__length1 = self->priv->schema_names_length1;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp20_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
+	_tmp20_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
+	_g_free0 (_tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp20_;
+	_tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp20_;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp21_ = _tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
+	_tmp21_ = _tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp22_ = self->priv->schema_names;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp22__length1 = self->priv->schema_names_length1;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp23_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp23_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
+	_g_free0 (_tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp23_;
+	_tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp23_;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp24_ = _tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
+	_tmp24_ = _tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp25_ = self->priv->schema_names;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp25__length1 = self->priv->schema_names_length1;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp26_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp26_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
+	_g_free0 (_tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp26_;
+	_tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp26_;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp27_ = _tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
+	_tmp27_ = _tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp28_ = self->priv->schema_names;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp28__length1 = self->priv->schema_names_length1;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp29_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp29_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
+	_g_free0 (_tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp29_;
+	_tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp29_;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp30_ = _tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
+	_tmp30_ = _tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp31_ = self->priv->schema_names;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp31__length1 = self->priv->schema_names_length1;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp32_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp32_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp32_;
+	_tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp32_;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp33_ = _tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
+	_tmp33_ = _tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp34_ = self->priv->schema_names;
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -957,35 +975,35 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp35_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
+	_g_free0 (_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp35_;
+	_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp35_;
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp36_ = _tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
+	_tmp36_ = _tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp37_ = self->priv->schema_names;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp37__length1 = self->priv->schema_names_length1;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp38_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp38_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
+	_g_free0 (_tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp38_;
+	_tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp38_;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp39_ = _tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
+	_tmp39_ = _tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp40_ = self->priv->schema_names;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp40__length1 = self->priv->schema_names_length1;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp41_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp41_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
+	_g_free0 (_tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp41_;
+	_tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp41_;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp42_ = _tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
+	_tmp42_ = _tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp43_ = self->priv->schema_names;
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -993,11 +1011,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp44_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
+	_g_free0 (_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp44_;
+	_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp44_;
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp45_ = _tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
+	_tmp45_ = _tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp46_ = self->priv->schema_names;
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1005,11 +1023,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp47_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
+	_g_free0 (_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp47_;
+	_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp47_;
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp48_ = _tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
+	_tmp48_ = _tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp49_ = self->priv->schema_names;
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1017,11 +1035,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp50_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
+	_g_free0 (_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp50_;
+	_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp50_;
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp51_ = _tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
+	_tmp51_ = _tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp52_ = self->priv->schema_names;
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1029,11 +1047,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp53_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
+	_g_free0 (_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp53_;
+	_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp53_;
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp54_ = _tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
+	_tmp54_ = _tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp55_ = self->priv->schema_names;
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1041,11 +1059,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp56_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
+	_g_free0 (_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp56_;
+	_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp56_;
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp57_ = _tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
+	_tmp57_ = _tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp58_ = self->priv->schema_names;
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1053,11 +1071,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp59_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
+	_g_free0 (_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp59_;
+	_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp59_;
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp60_ = _tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
+	_tmp60_ = _tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp61_ = self->priv->schema_names;
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1065,11 +1083,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp62_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
+	_g_free0 (_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp62_;
+	_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp62_;
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp63_ = _tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
+	_tmp63_ = _tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp64_ = self->priv->schema_names;
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1077,11 +1095,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp65_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
+	_g_free0 (_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp65_;
+	_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp65_;
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp66_ = _tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
+	_tmp66_ = _tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp67_ = self->priv->schema_names;
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1089,11 +1107,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp68_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp68_;
+	_tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp68_;
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp69_ = _tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
+	_tmp69_ = _tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp70_ = self->priv->schema_names;
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1101,11 +1119,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp71_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp71_;
+	_tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp71_;
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp72_ = _tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
+	_tmp72_ = _tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp73_ = self->priv->schema_names;
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1113,35 +1131,35 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp74_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
+	_g_free0 (_tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp74_;
+	_tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp74_;
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp75_ = _tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
+	_tmp75_ = _tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp76_ = self->priv->schema_names;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp76__length1 = self->priv->schema_names_length1;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp77_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
+	_tmp77_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
+	_g_free0 (_tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp77_;
+	_tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp77_;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp78_ = _tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
+	_tmp78_ = _tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp79_ = self->priv->schema_names;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp79__length1 = self->priv->schema_names_length1;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp80_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
+	_tmp80_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
+	_g_free0 (_tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp80_;
+	_tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp80_;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp81_ = _tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
+	_tmp81_ = _tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp82_ = self->priv->schema_names;
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1149,11 +1167,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp83_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
+	_g_free0 (_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp83_;
+	_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp83_;
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp84_ = _tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
+	_tmp84_ = _tmp82_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp85_ = self->priv->schema_names;
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1161,11 +1179,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp86_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
+	_g_free0 (_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp86_;
+	_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp86_;
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp87_ = _tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
+	_tmp87_ = _tmp85_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp88_ = self->priv->schema_names;
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1173,11 +1191,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp89_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
+	_g_free0 (_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp89_;
+	_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp89_;
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp90_ = _tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
+	_tmp90_ = _tmp88_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp91_ = self->priv->schema_names;
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1185,59 +1203,59 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp92_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
+	_g_free0 (_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp92_;
+	_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp92_;
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp93_ = _tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
+	_tmp93_ = _tmp91_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp94_ = self->priv->schema_names;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp94__length1 = self->priv->schema_names_length1;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp95_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
+	_tmp95_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
+	_g_free0 (_tmp94_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp95_;
+	_tmp94_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp95_;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp96_ = _tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
+	_tmp96_ = _tmp94_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp97_ = self->priv->schema_names;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp97__length1 = self->priv->schema_names_length1;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp98_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
+	_tmp98_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
+	_g_free0 (_tmp97_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp98_;
+	_tmp97_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp98_;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp99_ = _tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
+	_tmp99_ = _tmp97_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp100_ = self->priv->schema_names;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp100__length1 = self->priv->schema_names_length1;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp101_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp101_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
+	_g_free0 (_tmp100_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp101_;
+	_tmp100_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp101_;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp102_ = _tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
+	_tmp102_ = _tmp100_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp103_ = self->priv->schema_names;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp103__length1 = self->priv->schema_names_length1;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp104_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp104_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
+	_g_free0 (_tmp103_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp104_;
+	_tmp103_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp104_;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp105_ = _tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
+	_tmp105_ = _tmp103_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp106_ = self->priv->schema_names;
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1245,35 +1263,35 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp107_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
+	_g_free0 (_tmp106_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp107_;
+	_tmp106_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp107_;
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp108_ = _tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
+	_tmp108_ = _tmp106_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp109_ = self->priv->schema_names;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp109__length1 = self->priv->schema_names_length1;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp110_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
+	_tmp110_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
+	_g_free0 (_tmp109_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp110_;
+	_tmp109_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp110_;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp111_ = _tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
+	_tmp111_ = _tmp109_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp112_ = self->priv->schema_names;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp112__length1 = self->priv->schema_names_length1;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp113_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
+	_tmp113_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
+	_g_free0 (_tmp112_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp113_;
+	_tmp112_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp113_;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp114_ = _tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
+	_tmp114_ = _tmp112_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp115_ = self->priv->schema_names;
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1281,83 +1299,83 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp116_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
+	_g_free0 (_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp116_;
+	_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp116_;
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp117_ = _tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
+	_tmp117_ = _tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp118_ = self->priv->schema_names;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp118__length1 = self->priv->schema_names_length1;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp119_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SHARING_SCHEMA_NAME);
+	_tmp119_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
+	_g_free0 (_tmp118_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp119_;
+	_tmp118_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp119_;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp120_ = _tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
+	_tmp120_ = _tmp118_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp121_ = self->priv->schema_names;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp121__length1 = self->priv->schema_names_length1;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp122_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_IMPORTING_SCHEMA_NAME);
+	_tmp122_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
+	_g_free0 (_tmp121_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp122_;
+	_tmp121_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp122_;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp123_ = _tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
+	_tmp123_ = _tmp121_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp124_ = self->priv->schema_names;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp124__length1 = self->priv->schema_names_length1;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp125_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp125_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SHARING_SCHEMA_NAME);
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp124_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp125_;
+	_tmp124_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp125_;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp126_ = _tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
+	_tmp126_ = _tmp124_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp127_ = self->priv->schema_names;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp127__length1 = self->priv->schema_names_length1;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp128_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp128_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_IMPORTING_SCHEMA_NAME);
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp127_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp128_;
+	_tmp127_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp128_;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp129_ = _tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
+	_tmp129_ = _tmp127_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp130_ = self->priv->schema_names;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp130__length1 = self->priv->schema_names_length1;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp131_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp131_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
+	_g_free0 (_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp131_;
+	_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp131_;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp132_ = _tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
+	_tmp132_ = _tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp133_ = self->priv->schema_names;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp133__length1 = self->priv->schema_names_length1;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp134_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp134_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp134_;
+	_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp134_;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp135_ = _tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
+	_tmp135_ = _tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp136_ = self->priv->schema_names;
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1365,35 +1383,35 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp137_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
+	_g_free0 (_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp137_;
+	_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp137_;
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp138_ = _tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
+	_tmp138_ = _tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp139_ = self->priv->schema_names;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp139__length1 = self->priv->schema_names_length1;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp140_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp140_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
+	_g_free0 (_tmp139_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp140_;
+	_tmp139_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp140_;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp141_ = _tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
+	_tmp141_ = _tmp139_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp142_ = self->priv->schema_names;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp142__length1 = self->priv->schema_names_length1;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp143_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp143_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
+	_g_free0 (_tmp142_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp143_;
+	_tmp142_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp143_;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp144_ = _tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
+	_tmp144_ = _tmp142_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp145_ = self->priv->schema_names;
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1401,35 +1419,35 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp146_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
+	_g_free0 (_tmp145_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp146_;
+	_tmp145_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp146_;
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp147_ = _tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
+	_tmp147_ = _tmp145_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp148_ = self->priv->schema_names;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp148__length1 = self->priv->schema_names_length1;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp149_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp149_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
+	_g_free0 (_tmp148_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp149_;
+	_tmp148_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp149_;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp150_ = _tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
+	_tmp150_ = _tmp148_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp151_ = self->priv->schema_names;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp151__length1 = self->priv->schema_names_length1;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp152_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp152_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
+	_g_free0 (_tmp151_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp152_;
+	_tmp151_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp152_;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp153_ = _tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
+	_tmp153_ = _tmp151_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp154_ = self->priv->schema_names;
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1437,11 +1455,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp155_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
+	_g_free0 (_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp155_;
+	_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp155_;
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp156_ = _tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
+	_tmp156_ = _tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp157_ = self->priv->schema_names;
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1449,11 +1467,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp158_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
+	_g_free0 (_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp158_;
+	_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp158_;
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp159_ = _tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
+	_tmp159_ = _tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp160_ = self->priv->schema_names;
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1461,11 +1479,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp161_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
+	_g_free0 (_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp161_;
+	_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp161_;
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp162_ = _tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
+	_tmp162_ = _tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp163_ = self->priv->schema_names;
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1473,11 +1491,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp164_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
+	_g_free0 (_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp164_;
+	_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp164_;
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp165_ = _tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
+	_tmp165_ = _tmp163_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp166_ = self->priv->schema_names;
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1485,11 +1503,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp167_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
+	_g_free0 (_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp167_;
+	_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp167_;
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp168_ = _tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
+	_tmp168_ = _tmp166_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp169_ = self->priv->schema_names;
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1497,11 +1515,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp170_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
+	_g_free0 (_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp170_;
+	_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp170_;
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp171_ = _tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
+	_tmp171_ = _tmp169_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp172_ = self->priv->schema_names;
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1509,11 +1527,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp173_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
+	_g_free0 (_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp173_;
+	_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp173_;
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp174_ = _tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
+	_tmp174_ = _tmp172_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp175_ = self->priv->schema_names;
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1521,71 +1539,71 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp176_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
+	_g_free0 (_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp176_;
+	_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp176_;
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp177_ = _tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
+	_tmp177_ = _tmp175_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp178_ = self->priv->schema_names;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp178__length1 = self->priv->schema_names_length1;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp179_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp179_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
+	_g_free0 (_tmp178_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp179_;
+	_tmp178_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp179_;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp180_ = _tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
+	_tmp180_ = _tmp178_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp181_ = self->priv->schema_names;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp181__length1 = self->priv->schema_names_length1;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp182_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp182_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
+	_g_free0 (_tmp181_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp182_;
+	_tmp181_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp182_;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp183_ = _tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
+	_tmp183_ = _tmp181_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp184_ = self->priv->schema_names;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp184__length1 = self->priv->schema_names_length1;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp185_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp185_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
+	_g_free0 (_tmp184_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp185_;
+	_tmp184_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp185_;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp186_ = _tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
+	_tmp186_ = _tmp184_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp187_ = self->priv->schema_names;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp187__length1 = self->priv->schema_names_length1;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp188_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp188_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
+	_g_free0 (_tmp187_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp188_;
+	_tmp187_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp188_;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp189_ = _tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
+	_tmp189_ = _tmp187_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp190_ = self->priv->schema_names;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp190__length1 = self->priv->schema_names_length1;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp191_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp191_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
+	_g_free0 (_tmp190_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp191_;
+	_tmp190_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp191_;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp192_ = _tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
+	_tmp192_ = _tmp190_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp193_ = self->priv->schema_names;
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1593,11 +1611,11 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp194_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
+	_g_free0 (_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp194_;
+	_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp194_;
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp195_ = _tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
+	_tmp195_ = _tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp196_ = self->priv->schema_names;
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -1605,902 +1623,950 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp197_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
+	_g_free0 (_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp197_;
+	_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp197_;
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp198_ = _tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+	_tmp198_ = _tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp199_ = self->priv->schema_names;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp199__length1 = self->priv->schema_names_length1;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp200_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp200_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
+	_g_free0 (_tmp199_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp200_;
+	_tmp199_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp200_;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp201_ = _tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+	_tmp201_ = _tmp199_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp202_ = self->priv->schema_names;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp202__length1 = self->priv->schema_names_length1;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp203_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp203_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+	_g_free0 (_tmp202_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp203_;
+	_tmp202_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp203_;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp204_ = _tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+	_tmp204_ = _tmp202_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp205_ = self->priv->schema_names;
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp205__length1 = self->priv->schema_names_length1;
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp206_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_VIDEO_SCHEMA_NAME);
+	_tmp206_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+	_g_free0 (_tmp205_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp206_;
+	_tmp205_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp206_;
 #line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp207_ = _tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
+	_tmp207_ = _tmp205_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp208_ = self->priv->schema_names;
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp208__length1 = self->priv->schema_names_length1;
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp209_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp208_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp208_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp209_;
+#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp210_ = _tmp208_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
 #line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp208_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
+	_tmp211_ = self->priv->schema_names;
 #line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
+	_tmp211__length1 = self->priv->schema_names_length1;
 #line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->key_names = _tmp208_;
+	_tmp212_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_VIDEO_SCHEMA_NAME);
 #line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->key_names_length1 = CONFIGURABLE_PROPERTY_NUM_PROPERTIES;
+	_g_free0 (_tmp211_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
 #line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->_key_names_size_ = self->priv->key_names_length1;
-#line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209_ = self->priv->key_names;
+	_tmp211_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp212_;
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp213_ = _tmp211_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209__length1 = self->priv->key_names_length1;
+	_tmp214_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp210_ = g_strdup ("auto-import");
+	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
+	self->priv->key_names = _tmp214_;
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp210_;
+	self->priv->key_names_length1 = CONFIGURABLE_PROPERTY_NUM_PROPERTIES;
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp211_ = _tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212_ = self->priv->key_names;
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212__length1 = self->priv->key_names_length1;
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp213_ = g_strdup ("background-color");
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp213_;
-#line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp214_ = _tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
+	self->priv->_key_names_size_ = self->priv->key_names_length1;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp215_ = self->priv->key_names;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp215__length1 = self->priv->key_names_length1;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp216_ = g_strdup ("commit-metadata");
+	_tmp216_ = g_strdup ("auto-import");
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
+	_g_free0 (_tmp215_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp216_;
+	_tmp215_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp216_;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp217_ = _tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
+	_tmp217_ = _tmp215_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp218_ = self->priv->key_names;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp218__length1 = self->priv->key_names_length1;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp219_ = g_strdup ("picture-uri");
+	_tmp219_ = g_strdup ("background-color");
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
+	_g_free0 (_tmp218_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp219_;
+	_tmp218_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp219_;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp220_ = _tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
+	_tmp220_ = _tmp218_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp221_ = self->priv->key_names;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp221__length1 = self->priv->key_names_length1;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp222_ = g_strdup ("picture-options");
+	_tmp222_ = g_strdup ("transparent-background-type");
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
+	_g_free0 (_tmp221_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE]);
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp222_;
+	_tmp221_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE] = _tmp222_;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp223_ = _tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
+	_tmp223_ = _tmp221_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_TYPE];
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp224_ = self->priv->key_names;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp224__length1 = self->priv->key_names_length1;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp225_ = g_strdup ("picture-uri");
+	_tmp225_ = g_strdup ("transparent-background-color");
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
+	_g_free0 (_tmp224_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR]);
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp225_;
+	_tmp224_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR] = _tmp225_;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp226_ = _tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
+	_tmp226_ = _tmp224_[CONFIGURABLE_PROPERTY_TRANSPARENT_BACKGROUND_COLOR];
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp227_ = self->priv->key_names;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp227__length1 = self->priv->key_names_length1;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp228_ = g_strdup ("picture-options");
+	_tmp228_ = g_strdup ("commit-metadata");
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
+	_g_free0 (_tmp227_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp228_;
+	_tmp227_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp228_;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp229_ = _tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
+	_tmp229_ = _tmp227_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp230_ = self->priv->key_names;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp230__length1 = self->priv->key_names_length1;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp231_ = g_strdup ("directory-pattern");
+	_tmp231_ = g_strdup ("picture-uri");
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
+	_g_free0 (_tmp230_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp231_;
+	_tmp230_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp231_;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp232_ = _tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
+	_tmp232_ = _tmp230_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp233_ = self->priv->key_names;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp233__length1 = self->priv->key_names_length1;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp234_ = g_strdup ("directory-pattern-custom");
+	_tmp234_ = g_strdup ("picture-options");
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
+	_g_free0 (_tmp233_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp234_;
+	_tmp233_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp234_;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp235_ = _tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
+	_tmp235_ = _tmp233_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp236_ = self->priv->key_names;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp236__length1 = self->priv->key_names_length1;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp237_ = g_strdup ("direct-height");
+	_tmp237_ = g_strdup ("picture-uri");
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
+	_g_free0 (_tmp236_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp237_;
+	_tmp236_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp237_;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp238_ = _tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
+	_tmp238_ = _tmp236_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp239_ = self->priv->key_names;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp239__length1 = self->priv->key_names_length1;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp240_ = g_strdup ("direct-maximize");
+	_tmp240_ = g_strdup ("picture-options");
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp239_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp240_;
+	_tmp239_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp240_;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp241_ = _tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
+	_tmp241_ = _tmp239_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp242_ = self->priv->key_names;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp242__length1 = self->priv->key_names_length1;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp243_ = g_strdup ("direct-width");
+	_tmp243_ = g_strdup ("directory-pattern");
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
+	_g_free0 (_tmp242_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp243_;
+	_tmp242_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp243_;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp244_ = _tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
+	_tmp244_ = _tmp242_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp245_ = self->priv->key_names;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp245__length1 = self->priv->key_names_length1;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp246_ = g_strdup ("display-basic-properties");
+	_tmp246_ = g_strdup ("directory-pattern-custom");
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
+	_g_free0 (_tmp245_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp246_;
+	_tmp245_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp246_;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp247_ = _tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
+	_tmp247_ = _tmp245_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp248_ = self->priv->key_names;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp248__length1 = self->priv->key_names_length1;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp249_ = g_strdup ("display-extended-properties");
+	_tmp249_ = g_strdup ("direct-height");
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
+	_g_free0 (_tmp248_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp249_;
+	_tmp248_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp249_;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp250_ = _tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
+	_tmp250_ = _tmp248_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp251_ = self->priv->key_names;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp251__length1 = self->priv->key_names_length1;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp252_ = g_strdup ("display-sidebar");
+	_tmp252_ = g_strdup ("direct-maximize");
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
+	_g_free0 (_tmp251_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp252_;
+	_tmp251_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp252_;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp253_ = _tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
+	_tmp253_ = _tmp251_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp254_ = self->priv->key_names;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp254__length1 = self->priv->key_names_length1;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp255_ = g_strdup ("display-toolbar");
+	_tmp255_ = g_strdup ("direct-width");
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
+	_g_free0 (_tmp254_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp255_;
+	_tmp254_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp255_;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp256_ = _tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
+	_tmp256_ = _tmp254_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp257_ = self->priv->key_names;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp257__length1 = self->priv->key_names_length1;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp258_ = g_strdup ("display-search-bar");
+	_tmp258_ = g_strdup ("display-basic-properties");
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
+	_g_free0 (_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp258_;
+	_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp258_;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp259_ = _tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
+	_tmp259_ = _tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp260_ = self->priv->key_names;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp260__length1 = self->priv->key_names_length1;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp261_ = g_strdup ("display-photo-ratings");
+	_tmp261_ = g_strdup ("display-extended-properties");
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
+	_g_free0 (_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp261_;
+	_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp261_;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp262_ = _tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
+	_tmp262_ = _tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp263_ = self->priv->key_names;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp263__length1 = self->priv->key_names_length1;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp264_ = g_strdup ("display-photo-tags");
+	_tmp264_ = g_strdup ("display-sidebar");
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
+	_g_free0 (_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp264_;
+	_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp264_;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp265_ = _tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
+	_tmp265_ = _tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp266_ = self->priv->key_names;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp266__length1 = self->priv->key_names_length1;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp267_ = g_strdup ("display-photo-titles");
+	_tmp267_ = g_strdup ("display-toolbar");
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
+	_g_free0 (_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp267_;
+	_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp267_;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp268_ = _tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
+	_tmp268_ = _tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp269_ = self->priv->key_names;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp269__length1 = self->priv->key_names_length1;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp270_ = g_strdup ("display-photo-comments");
+	_tmp270_ = g_strdup ("display-search-bar");
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
+	_g_free0 (_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp270_;
+	_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp270_;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp271_ = _tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
+	_tmp271_ = _tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp272_ = self->priv->key_names;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp272__length1 = self->priv->key_names_length1;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp273_ = g_strdup ("display-event-comments");
+	_tmp273_ = g_strdup ("display-photo-ratings");
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
+	_g_free0 (_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp273_;
+	_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp273_;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp274_ = _tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
+	_tmp274_ = _tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp275_ = self->priv->key_names;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp275__length1 = self->priv->key_names_length1;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp276_ = g_strdup ("event-photos-sort-ascending");
+	_tmp276_ = g_strdup ("display-photo-tags");
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp275_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp276_;
+	_tmp275_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp276_;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp277_ = _tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
+	_tmp277_ = _tmp275_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp278_ = self->priv->key_names;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp278__length1 = self->priv->key_names_length1;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp279_ = g_strdup ("event-photos-sort-by");
+	_tmp279_ = g_strdup ("display-photo-titles");
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp278_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp279_;
+	_tmp278_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp279_;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp280_ = _tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
+	_tmp280_ = _tmp278_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp281_ = self->priv->key_names;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp281__length1 = self->priv->key_names_length1;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp282_ = g_strdup ("events-sort-ascending");
+	_tmp282_ = g_strdup ("display-photo-comments");
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
+	_g_free0 (_tmp281_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp282_;
+	_tmp281_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp282_;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp283_ = _tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
+	_tmp283_ = _tmp281_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp284_ = self->priv->key_names;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp284__length1 = self->priv->key_names_length1;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp285_ = g_strdup ("constraint");
+	_tmp285_ = g_strdup ("display-event-comments");
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
+	_g_free0 (_tmp284_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp285_;
+	_tmp284_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp285_;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp286_ = _tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
+	_tmp286_ = _tmp284_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp287_ = self->priv->key_names;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp287__length1 = self->priv->key_names_length1;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp288_ = g_strdup ("export-format-mode");
+	_tmp288_ = g_strdup ("event-photos-sort-ascending");
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
+	_g_free0 (_tmp287_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp288_;
+	_tmp287_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp288_;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp289_ = _tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
+	_tmp289_ = _tmp287_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp290_ = self->priv->key_names;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp290__length1 = self->priv->key_names_length1;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp291_ = g_strdup ("export-metadata");
+	_tmp291_ = g_strdup ("event-photos-sort-by");
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
+	_g_free0 (_tmp290_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp291_;
+	_tmp290_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp291_;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp292_ = _tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
+	_tmp292_ = _tmp290_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp293_ = self->priv->key_names;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp293__length1 = self->priv->key_names_length1;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp294_ = g_strdup ("photo-file-format");
+	_tmp294_ = g_strdup ("events-sort-ascending");
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
+	_g_free0 (_tmp293_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp294_;
+	_tmp293_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp294_;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp295_ = _tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
+	_tmp295_ = _tmp293_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp296_ = self->priv->key_names;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp296__length1 = self->priv->key_names_length1;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp297_ = g_strdup ("quality");
+	_tmp297_ = g_strdup ("constraint");
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
+	_g_free0 (_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp297_;
+	_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp297_;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp298_ = _tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
+	_tmp298_ = _tmp296_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp299_ = self->priv->key_names;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp299__length1 = self->priv->key_names_length1;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp300_ = g_strdup ("scale");
+	_tmp300_ = g_strdup ("export-format-mode");
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
+	_g_free0 (_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp300_;
+	_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp300_;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp301_ = _tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
+	_tmp301_ = _tmp299_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp302_ = self->priv->key_names;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp302__length1 = self->priv->key_names_length1;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp303_ = g_strdup ("external-photo-editor");
+	_tmp303_ = g_strdup ("export-metadata");
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
+	_g_free0 (_tmp302_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp303_;
+	_tmp302_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp303_;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp304_ = _tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
+	_tmp304_ = _tmp302_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp305_ = self->priv->key_names;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp305__length1 = self->priv->key_names_length1;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp306_ = g_strdup ("external-raw-editor");
+	_tmp306_ = g_strdup ("photo-file-format");
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
+	_g_free0 (_tmp305_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp306_;
+	_tmp305_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp306_;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp307_ = _tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
+	_tmp307_ = _tmp305_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp308_ = self->priv->key_names;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp308__length1 = self->priv->key_names_length1;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp309_ = g_strdup ("hide-photos-already-imported");
+	_tmp309_ = g_strdup ("quality");
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
+	_g_free0 (_tmp308_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp309_;
+	_tmp308_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp309_;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp310_ = _tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
+	_tmp310_ = _tmp308_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp311_ = self->priv->key_names;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp311__length1 = self->priv->key_names_length1;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp312_ = g_strdup ("import-dir");
+	_tmp312_ = g_strdup ("scale");
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
+	_g_free0 (_tmp311_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp312_;
+	_tmp311_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp312_;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp313_ = _tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
+	_tmp313_ = _tmp311_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp314_ = self->priv->key_names;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp314__length1 = self->priv->key_names_length1;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp315_ = g_strdup ("keep-relativity");
+	_tmp315_ = g_strdup ("external-photo-editor");
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
+	_g_free0 (_tmp314_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp315_;
+	_tmp314_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp315_;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp316_ = _tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
+	_tmp316_ = _tmp314_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp317_ = self->priv->key_names;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp317__length1 = self->priv->key_names_length1;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp318_ = g_strdup ("last-crop-height");
+	_tmp318_ = g_strdup ("external-raw-editor");
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
+	_g_free0 (_tmp317_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp318_;
+	_tmp317_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp318_;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp319_ = _tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
+	_tmp319_ = _tmp317_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp320_ = self->priv->key_names;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp320__length1 = self->priv->key_names_length1;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp321_ = g_strdup ("last-crop-menu-choice");
+	_tmp321_ = g_strdup ("hide-photos-already-imported");
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
+	_g_free0 (_tmp320_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp321_;
+	_tmp320_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp321_;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp322_ = _tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
+	_tmp322_ = _tmp320_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp323_ = self->priv->key_names;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp323__length1 = self->priv->key_names_length1;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp324_ = g_strdup ("last-crop-width");
+	_tmp324_ = g_strdup ("import-dir");
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
+	_g_free0 (_tmp323_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp324_;
+	_tmp323_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp324_;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp325_ = _tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
+	_tmp325_ = _tmp323_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp326_ = self->priv->key_names;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp326__length1 = self->priv->key_names_length1;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp327_ = g_strdup ("last-used-service");
+	_tmp327_ = g_strdup ("keep-relativity");
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
+	_g_free0 (_tmp326_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp327_;
+	_tmp326_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp327_;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp328_ = _tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
+	_tmp328_ = _tmp326_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp329_ = self->priv->key_names;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp329__length1 = self->priv->key_names_length1;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp330_ = g_strdup ("last-used-dataimports-service");
+	_tmp330_ = g_strdup ("last-crop-height");
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
+	_g_free0 (_tmp329_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp330_;
+	_tmp329_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp330_;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp331_ = _tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
+	_tmp331_ = _tmp329_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp332_ = self->priv->key_names;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp332__length1 = self->priv->key_names_length1;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp333_ = g_strdup ("library-photos-sort-ascending");
+	_tmp333_ = g_strdup ("last-crop-menu-choice");
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp332_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp333_;
+	_tmp332_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp333_;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp334_ = _tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
+	_tmp334_ = _tmp332_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp335_ = self->priv->key_names;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp335__length1 = self->priv->key_names_length1;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp336_ = g_strdup ("library-photos-sort-by");
+	_tmp336_ = g_strdup ("last-crop-width");
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp335_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp336_;
+	_tmp335_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp336_;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp337_ = _tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
+	_tmp337_ = _tmp335_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp338_ = self->priv->key_names;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp338__length1 = self->priv->key_names_length1;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp339_ = g_strdup ("library-height");
+	_tmp339_ = g_strdup ("last-used-service");
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
+	_g_free0 (_tmp338_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp339_;
+	_tmp338_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp339_;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp340_ = _tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
+	_tmp340_ = _tmp338_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp341_ = self->priv->key_names;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp341__length1 = self->priv->key_names_length1;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp342_ = g_strdup ("library-maximize");
+	_tmp342_ = g_strdup ("last-used-dataimports-service");
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp341_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp342_;
+	_tmp341_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp342_;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp343_ = _tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
+	_tmp343_ = _tmp341_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp344_ = self->priv->key_names;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp344__length1 = self->priv->key_names_length1;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp345_ = g_strdup ("library-width");
+	_tmp345_ = g_strdup ("library-photos-sort-ascending");
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
+	_g_free0 (_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp345_;
+	_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp345_;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp346_ = _tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
+	_tmp346_ = _tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp347_ = self->priv->key_names;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp347__length1 = self->priv->key_names_length1;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp348_ = g_strdup ("modify-originals");
+	_tmp348_ = g_strdup ("library-photos-sort-by");
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
+	_g_free0 (_tmp347_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp348_;
+	_tmp347_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp348_;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp349_ = _tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
+	_tmp349_ = _tmp347_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp350_ = self->priv->key_names;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp350__length1 = self->priv->key_names_length1;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp351_ = g_strdup ("photo-thumbnail-scale");
+	_tmp351_ = g_strdup ("library-height");
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
+	_g_free0 (_tmp350_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp351_;
+	_tmp350_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp351_;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp352_ = _tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
+	_tmp352_ = _tmp350_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp353_ = self->priv->key_names;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp353__length1 = self->priv->key_names_length1;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp354_ = g_strdup ("pin-toolbar-state");
+	_tmp354_ = g_strdup ("library-maximize");
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
+	_g_free0 (_tmp353_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp354_;
+	_tmp353_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp354_;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp355_ = _tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
+	_tmp355_ = _tmp353_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp356_ = self->priv->key_names;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp356__length1 = self->priv->key_names_length1;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp357_ = g_strdup ("content-height");
+	_tmp357_ = g_strdup ("library-width");
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
+	_g_free0 (_tmp356_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp357_;
+	_tmp356_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp357_;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp358_ = _tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
+	_tmp358_ = _tmp356_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp359_ = self->priv->key_names;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp359__length1 = self->priv->key_names_length1;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp360_ = g_strdup ("content-layout");
+	_tmp360_ = g_strdup ("modify-originals");
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
+	_g_free0 (_tmp359_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp360_;
+	_tmp359_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp360_;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp361_ = _tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
+	_tmp361_ = _tmp359_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp362_ = self->priv->key_names;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp362__length1 = self->priv->key_names_length1;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp363_ = g_strdup ("content-ppi");
+	_tmp363_ = g_strdup ("photo-thumbnail-scale");
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
+	_g_free0 (_tmp362_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp363_;
+	_tmp362_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp363_;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp364_ = _tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
+	_tmp364_ = _tmp362_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp365_ = self->priv->key_names;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp365__length1 = self->priv->key_names_length1;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp366_ = g_strdup ("content-units");
+	_tmp366_ = g_strdup ("pin-toolbar-state");
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
+	_g_free0 (_tmp365_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp366_;
+	_tmp365_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp366_;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp367_ = _tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
+	_tmp367_ = _tmp365_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp368_ = self->priv->key_names;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp368__length1 = self->priv->key_names_length1;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp369_ = g_strdup ("content-width");
+	_tmp369_ = g_strdup ("content-height");
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
+	_g_free0 (_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp369_;
+	_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp369_;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp370_ = _tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
+	_tmp370_ = _tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp371_ = self->priv->key_names;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp371__length1 = self->priv->key_names_length1;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp372_ = g_strdup ("images-per-page");
+	_tmp372_ = g_strdup ("content-layout");
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
+	_g_free0 (_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp372_;
+	_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp372_;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp373_ = _tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
+	_tmp373_ = _tmp371_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp374_ = self->priv->key_names;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp374__length1 = self->priv->key_names_length1;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp375_ = g_strdup ("match-aspect-ratio");
+	_tmp375_ = g_strdup ("content-ppi");
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
+	_g_free0 (_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp375_;
+	_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp375_;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp376_ = _tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
+	_tmp376_ = _tmp374_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp377_ = self->priv->key_names;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp377__length1 = self->priv->key_names_length1;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp378_ = g_strdup ("print-titles");
+	_tmp378_ = g_strdup ("content-units");
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
+	_g_free0 (_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp378_;
+	_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp378_;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp379_ = _tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
+	_tmp379_ = _tmp377_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp380_ = self->priv->key_names;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp380__length1 = self->priv->key_names_length1;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp381_ = g_strdup ("size-selection");
+	_tmp381_ = g_strdup ("content-width");
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
+	_g_free0 (_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp381_;
+	_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp381_;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp382_ = _tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
+	_tmp382_ = _tmp380_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp383_ = self->priv->key_names;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp383__length1 = self->priv->key_names_length1;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp384_ = g_strdup ("titles-font");
+	_tmp384_ = g_strdup ("images-per-page");
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
+	_g_free0 (_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp384_;
+	_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp384_;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp385_ = _tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
+	_tmp385_ = _tmp383_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp386_ = self->priv->key_names;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp386__length1 = self->priv->key_names_length1;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp387_ = g_strdup ("raw-developer-default");
+	_tmp387_ = g_strdup ("match-aspect-ratio");
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
+	_g_free0 (_tmp386_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp387_;
+	_tmp386_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp387_;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp388_ = _tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
+	_tmp388_ = _tmp386_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp389_ = self->priv->key_names;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp389__length1 = self->priv->key_names_length1;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp390_ = g_strdup ("show-welcome-dialog");
+	_tmp390_ = g_strdup ("print-titles");
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
+	_g_free0 (_tmp389_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp390_;
+	_tmp389_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp390_;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp391_ = _tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
+	_tmp391_ = _tmp389_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp392_ = self->priv->key_names;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp392__length1 = self->priv->key_names_length1;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp393_ = g_strdup ("sidebar-position");
+	_tmp393_ = g_strdup ("size-selection");
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
+	_g_free0 (_tmp392_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp393_;
+	_tmp392_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp393_;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp394_ = _tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
+	_tmp394_ = _tmp392_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp395_ = self->priv->key_names;
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp395__length1 = self->priv->key_names_length1;
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp396_ = g_strdup ("delay");
+	_tmp396_ = g_strdup ("titles-font");
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
+	_g_free0 (_tmp395_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp396_;
+	_tmp395_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp396_;
 #line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp397_ = _tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
+	_tmp397_ = _tmp395_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp398_ = self->priv->key_names;
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp398__length1 = self->priv->key_names_length1;
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp399_ = g_strdup ("transition-delay");
+	_tmp399_ = g_strdup ("raw-developer-default");
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
+	_g_free0 (_tmp398_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp399_;
+	_tmp398_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp399_;
 #line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp400_ = _tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
+	_tmp400_ = _tmp398_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp401_ = self->priv->key_names;
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp401__length1 = self->priv->key_names_length1;
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp402_ = g_strdup ("transition-effect-id");
+	_tmp402_ = g_strdup ("show-welcome-dialog");
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
+	_g_free0 (_tmp401_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp402_;
+	_tmp401_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp402_;
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp403_ = _tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
+	_tmp403_ = _tmp401_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp404_ = self->priv->key_names;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp404__length1 = self->priv->key_names_length1;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp405_ = g_strdup ("show-title");
+	_tmp405_ = g_strdup ("sidebar-position");
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
+	_g_free0 (_tmp404_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp405_;
+	_tmp404_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp405_;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp406_ = _tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+	_tmp406_ = _tmp404_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp407_ = self->priv->key_names;
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp407__length1 = self->priv->key_names_length1;
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp408_ = g_strdup ("use-24-hour-time");
+	_tmp408_ = g_strdup ("delay");
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
+	_g_free0 (_tmp407_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp408_;
+	_tmp407_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp408_;
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp409_ = _tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+	_tmp409_ = _tmp407_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp410_ = self->priv->key_names;
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp410__length1 = self->priv->key_names_length1;
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp411_ = g_strdup ("use-lowercase-filenames");
+	_tmp411_ = g_strdup ("transition-delay");
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+	_g_free0 (_tmp410_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp411_;
+	_tmp410_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp411_;
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp412_ = _tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+	_tmp412_ = _tmp410_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp413_ = self->priv->key_names;
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp413__length1 = self->priv->key_names_length1;
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp414_ = g_strdup ("interpreter-state-cookie");
+	_tmp414_ = g_strdup ("transition-effect-id");
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+	_g_free0 (_tmp413_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp414_;
+	_tmp413_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp414_;
 #line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp415_ = _tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
+	_tmp415_ = _tmp413_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp416_ = self->priv->key_names;
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp416__length1 = self->priv->key_names_length1;
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp417_ = g_strdup ("show-title");
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp416_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp416_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp417_;
+#line 173 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp418_ = _tmp416_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp419_ = self->priv->key_names;
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp419__length1 = self->priv->key_names_length1;
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp420_ = g_strdup ("use-24-hour-time");
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp419_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp419_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp420_;
+#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp421_ = _tmp419_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp422_ = self->priv->key_names;
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp422__length1 = self->priv->key_names_length1;
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp423_ = g_strdup ("use-lowercase-filenames");
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp422_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp422_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp423_;
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp424_ = _tmp422_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp425_ = self->priv->key_names;
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp425__length1 = self->priv->key_names_length1;
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp426_ = g_strdup ("interpreter-state-cookie");
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp425_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp425_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp426_;
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp427_ = _tmp425_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
 #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return self;
-#line 2490 "GSettingsEngine.c"
+#line 2556 "GSettingsEngine.c"
 }
 
 
 GSettingsConfigurationEngine* gsettings_configuration_engine_new (void) {
 #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return gsettings_configuration_engine_construct (TYPE_GSETTINGS_CONFIGURATION_ENGINE);
-#line 2497 "GSettingsEngine.c"
+#line 2563 "GSettingsEngine.c"
 }
 
 
 static gpointer _g_settings_schema_source_ref0 (gpointer self) {
-#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return self ? g_settings_schema_source_ref (self) : NULL;
-#line 2504 "GSettingsEngine.c"
+#line 2570 "GSettingsEngine.c"
 }
 
 
@@ -2517,136 +2583,136 @@ static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurati
 	const gchar* _tmp12_;
 	gboolean _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = g_settings_schema_source_get_default ();
-#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = _g_settings_schema_source_ref0 (_tmp0_);
-#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 180 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_source = _tmp1_;
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema_source;
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = schema;
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = g_settings_schema_source_lookup (_tmp2_, _tmp3_, TRUE);
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	settings_scheme = _tmp4_;
-#line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = settings_scheme;
-#line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp5_ == NULL) {
-#line 2545 "GSettingsEngine.c"
+#line 2611 "GSettingsEngine.c"
 		const gchar* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		GError* _tmp9_;
 		GError* _tmp10_;
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = schema;
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = g_strdup_printf ("schema '%s' is not installed", _tmp6_);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp8_);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = _tmp9_;
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp8_);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = _tmp10_;
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_unref0 (settings_scheme);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_source_unref0 (schema_source);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2575 "GSettingsEngine.c"
+#line 2641 "GSettingsEngine.c"
 		} else {
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_unref0 (settings_scheme);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_source_unref0 (schema_source);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2587 "GSettingsEngine.c"
+#line 2653 "GSettingsEngine.c"
 		}
 	}
-#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp11_ = settings_scheme;
-#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp12_ = key;
-#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp13_ = g_settings_schema_has_key (_tmp11_, _tmp12_);
-#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 186 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (!_tmp13_) {
-#line 2598 "GSettingsEngine.c"
+#line 2664 "GSettingsEngine.c"
 		const gchar* _tmp14_;
 		const gchar* _tmp15_;
 		gchar* _tmp16_;
 		gchar* _tmp17_;
 		GError* _tmp18_;
 		GError* _tmp19_;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp14_ = schema;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp15_ = key;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp16_ = g_strdup_printf ("schema '%s' does not define key '%s'", _tmp14_, _tmp15_);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp17_ = _tmp16_;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp18_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp17_);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp19_ = _tmp18_;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp17_);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = _tmp19_;
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_unref0 (settings_scheme);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_source_unref0 (schema_source);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2631 "GSettingsEngine.c"
+#line 2697 "GSettingsEngine.c"
 		} else {
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_unref0 (settings_scheme);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_settings_schema_source_unref0 (schema_source);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2643 "GSettingsEngine.c"
+#line 2709 "GSettingsEngine.c"
 		}
 	}
-#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_settings_schema_unref0 (settings_scheme);
-#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_settings_schema_source_unref0 (schema_source);
-#line 2650 "GSettingsEngine.c"
+#line 2716 "GSettingsEngine.c"
 }
 
 
@@ -2661,59 +2727,59 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati
 	const gchar* _tmp7_;
 	gboolean _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE);
-#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, FALSE);
-#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2681 "GSettingsEngine.c"
+#line 2747 "GSettingsEngine.c"
 			gboolean _tmp2_ = FALSE;
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp2_;
-#line 2687 "GSettingsEngine.c"
+#line 2753 "GSettingsEngine.c"
 		} else {
 			gboolean _tmp3_ = FALSE;
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp3_;
-#line 2696 "GSettingsEngine.c"
+#line 2762 "GSettingsEngine.c"
 		}
 	}
-#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema;
-#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = g_settings_new (_tmp4_);
-#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 194 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp5_;
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = schema_object;
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = key;
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_settings_get_boolean (_tmp6_, _tmp7_);
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2717 "GSettingsEngine.c"
+#line 2783 "GSettingsEngine.c"
 }
 
 
@@ -2727,54 +2793,54 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 	const gchar* _tmp5_;
 	gboolean _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2751 "GSettingsEngine.c"
+#line 2817 "GSettingsEngine.c"
 		} else {
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2759 "GSettingsEngine.c"
+#line 2825 "GSettingsEngine.c"
 		}
 	}
-#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 202 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_);
-#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2778 "GSettingsEngine.c"
+#line 2844 "GSettingsEngine.c"
 }
 
 
@@ -2788,54 +2854,54 @@ static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEn
 	const gchar* _tmp5_;
 	gint _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2812 "GSettingsEngine.c"
+#line 2878 "GSettingsEngine.c"
 		} else {
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 208 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2820 "GSettingsEngine.c"
+#line 2886 "GSettingsEngine.c"
 		}
 	}
-#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_);
-#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2839 "GSettingsEngine.c"
+#line 2905 "GSettingsEngine.c"
 }
 
 
@@ -2850,59 +2916,59 @@ static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEn
 	const gchar* _tmp7_;
 	gint _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
-#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, 0);
-#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2870 "GSettingsEngine.c"
+#line 2936 "GSettingsEngine.c"
 			gint _tmp2_ = 0;
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp2_;
-#line 2876 "GSettingsEngine.c"
+#line 2942 "GSettingsEngine.c"
 		} else {
 			gint _tmp3_ = 0;
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp3_;
-#line 2885 "GSettingsEngine.c"
+#line 2951 "GSettingsEngine.c"
 		}
 	}
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema;
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = g_settings_new (_tmp4_);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp5_;
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = schema_object;
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = key;
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_settings_get_enum (_tmp6_, _tmp7_);
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2906 "GSettingsEngine.c"
+#line 2972 "GSettingsEngine.c"
 }
 
 
@@ -2917,59 +2983,59 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng
 	const gchar* _tmp7_;
 	gint _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, 0);
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2937 "GSettingsEngine.c"
+#line 3003 "GSettingsEngine.c"
 			gint _tmp2_ = 0;
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp2_;
-#line 2943 "GSettingsEngine.c"
+#line 3009 "GSettingsEngine.c"
 		} else {
 			gint _tmp3_ = 0;
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp3_;
-#line 2952 "GSettingsEngine.c"
+#line 3018 "GSettingsEngine.c"
 		}
 	}
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema;
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = g_settings_new (_tmp4_);
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 224 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = schema_object;
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = key;
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_settings_get_int (_tmp6_, _tmp7_);
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2973 "GSettingsEngine.c"
+#line 3039 "GSettingsEngine.c"
 }
 
 
@@ -2983,54 +3049,54 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 	const gchar* _tmp5_;
 	gint _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3007 "GSettingsEngine.c"
+#line 3073 "GSettingsEngine.c"
 		} else {
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3015 "GSettingsEngine.c"
+#line 3081 "GSettingsEngine.c"
 		}
 	}
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 232 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_int (_tmp4_, _tmp5_, _tmp6_);
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3034 "GSettingsEngine.c"
+#line 3100 "GSettingsEngine.c"
 }
 
 
@@ -3045,59 +3111,59 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat
 	const gchar* _tmp7_;
 	gdouble _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0);
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, 0.0);
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3065 "GSettingsEngine.c"
+#line 3131 "GSettingsEngine.c"
 			gdouble _tmp2_ = 0.0;
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp2_;
-#line 3071 "GSettingsEngine.c"
+#line 3137 "GSettingsEngine.c"
 		} else {
 			gdouble _tmp3_ = 0.0;
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp3_;
-#line 3080 "GSettingsEngine.c"
+#line 3146 "GSettingsEngine.c"
 		}
 	}
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema;
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = g_settings_new (_tmp4_);
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 240 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp5_;
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = schema_object;
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = key;
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_settings_get_double (_tmp6_, _tmp7_);
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3101 "GSettingsEngine.c"
+#line 3167 "GSettingsEngine.c"
 }
 
 
@@ -3111,54 +3177,54 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 	const gchar* _tmp5_;
 	gdouble _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3135 "GSettingsEngine.c"
+#line 3201 "GSettingsEngine.c"
 		} else {
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3143 "GSettingsEngine.c"
+#line 3209 "GSettingsEngine.c"
 		}
 	}
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 248 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_double (_tmp4_, _tmp5_, _tmp6_);
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3162 "GSettingsEngine.c"
+#line 3228 "GSettingsEngine.c"
 }
 
 
@@ -3173,56 +3239,56 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 	const gchar* _tmp5_;
 	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), NULL);
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, NULL);
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3197 "GSettingsEngine.c"
+#line 3263 "GSettingsEngine.c"
 		} else {
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3205 "GSettingsEngine.c"
+#line 3271 "GSettingsEngine.c"
 		}
 	}
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 256 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = g_settings_get_string (_tmp4_, _tmp5_);
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp6_;
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3226 "GSettingsEngine.c"
+#line 3292 "GSettingsEngine.c"
 }
 
 
@@ -3236,56 +3302,56 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 	const gchar* _tmp5_;
 	const gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (value != NULL);
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3262 "GSettingsEngine.c"
+#line 3328 "GSettingsEngine.c"
 		} else {
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3270 "GSettingsEngine.c"
+#line 3336 "GSettingsEngine.c"
 		}
 	}
-#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_string (_tmp4_, _tmp5_, _tmp6_);
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3289 "GSettingsEngine.c"
+#line 3355 "GSettingsEngine.c"
 }
 
 
@@ -3298,52 +3364,52 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 	GSettings* _tmp4_;
 	const gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3322 "GSettingsEngine.c"
+#line 3388 "GSettingsEngine.c"
 		} else {
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3330 "GSettingsEngine.c"
+#line 3396 "GSettingsEngine.c"
 		}
 	}
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_reset (_tmp4_, _tmp5_);
-#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3347 "GSettingsEngine.c"
+#line 3413 "GSettingsEngine.c"
 }
 
 
@@ -3362,20 +3428,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3366 "GSettingsEngine.c"
+#line 3432 "GSettingsEngine.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 3373 "GSettingsEngine.c"
+#line 3439 "GSettingsEngine.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 3379 "GSettingsEngine.c"
+#line 3445 "GSettingsEngine.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -3385,11 +3451,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 3389 "GSettingsEngine.c"
+#line 3455 "GSettingsEngine.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3393 "GSettingsEngine.c"
+#line 3459 "GSettingsEngine.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -3397,7 +3463,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3401 "GSettingsEngine.c"
+#line 3467 "GSettingsEngine.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -3429,8 +3495,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3433 "GSettingsEngine.c"
-				goto __catch205_g_regex_error;
+#line 3499 "GSettingsEngine.c"
+				goto __catch217_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -3438,7 +3504,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3442 "GSettingsEngine.c"
+#line 3508 "GSettingsEngine.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -3454,8 +3520,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3458 "GSettingsEngine.c"
-				goto __catch205_g_regex_error;
+#line 3524 "GSettingsEngine.c"
+				goto __catch217_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3465,7 +3531,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3469 "GSettingsEngine.c"
+#line 3535 "GSettingsEngine.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -3479,10 +3545,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 3483 "GSettingsEngine.c"
+#line 3549 "GSettingsEngine.c"
 	}
-	goto __finally205;
-	__catch205_g_regex_error:
+	goto __finally217;
+	__catch217_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -3493,9 +3559,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3497 "GSettingsEngine.c"
+#line 3563 "GSettingsEngine.c"
 	}
-	__finally205:
+	__finally217:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -3504,7 +3570,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3508 "GSettingsEngine.c"
+#line 3574 "GSettingsEngine.c"
 	}
 }
 
@@ -3528,7 +3594,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 3532 "GSettingsEngine.c"
+#line 3598 "GSettingsEngine.c"
 }
 
 
@@ -3543,49 +3609,49 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) {
 	const gchar* _tmp5_;
 	gboolean _tmp6_;
 	gchar* _tmp8_;
-#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = string_replace (_tmp0_, "/", "-");
-#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned = _tmp1_;
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned;
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = string_strip (_tmp2_);
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned);
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned = _tmp3_;
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = cleaned;
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = is_string_empty (_tmp5_);
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (!_tmp6_) {
-#line 3569 "GSettingsEngine.c"
+#line 3635 "GSettingsEngine.c"
 		const gchar* _tmp7_;
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = cleaned;
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = _tmp7_;
-#line 3575 "GSettingsEngine.c"
+#line 3641 "GSettingsEngine.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = NULL;
-#line 3579 "GSettingsEngine.c"
+#line 3645 "GSettingsEngine.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup (_tmp4_);
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned);
-#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3589 "GSettingsEngine.c"
+#line 3655 "GSettingsEngine.c"
 }
 
 
@@ -3599,49 +3665,49 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 	gchar* _tmp5_;
 	const gchar* _tmp6_;
 	gchar* _tmp7_;
-#line 280 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned_id;
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3615 "GSettingsEngine.c"
+#line 3681 "GSettingsEngine.c"
 		gchar* _tmp3_;
-#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
-#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
-#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3623 "GSettingsEngine.c"
+#line 3689 "GSettingsEngine.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
-#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = string_replace (_tmp4_, "org.yorba.shotwell.", "");
-#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 289 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp5_;
-#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = cleaned_id;
-#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = string_replace (_tmp6_, ".", "-");
-#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 290 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp7_;
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = cleaned_id;
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3645 "GSettingsEngine.c"
+#line 3711 "GSettingsEngine.c"
 }
 
 
@@ -3656,51 +3722,51 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha
 	const gchar* _tmp6_;
 	const gchar* _tmp7_;
 	gchar* _tmp8_;
-#line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned_id;
-#line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3674 "GSettingsEngine.c"
+#line 3740 "GSettingsEngine.c"
 		gchar* _tmp3_;
-#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
-#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
-#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 298 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3682 "GSettingsEngine.c"
+#line 3748 "GSettingsEngine.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
-#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = string_replace (_tmp4_, ".", "-");
-#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp5_;
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = domain;
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = cleaned_id;
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", _tmp6_, _tmp7_);
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3704 "GSettingsEngine.c"
+#line 3770 "GSettingsEngine.c"
 }
 
 
@@ -3708,17 +3774,17 @@ static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gc
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (gconf_key != NULL, NULL);
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = gconf_key;
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = string_replace (_tmp0_, "_", "-");
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp1_;
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3722 "GSettingsEngine.c"
+#line 3788 "GSettingsEngine.c"
 }
 
 
@@ -3726,15 +3792,15 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine*
 	GSettingsConfigurationEngine * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 308 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = g_strdup ("GSettings");
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3738 "GSettingsEngine.c"
+#line 3804 "GSettingsEngine.c"
 }
 
 
@@ -3752,55 +3818,55 @@ static gint gsettings_configuration_engine_real_get_enum_property (Configuration
 	const gchar* _tmp6_;
 	gint _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_enum (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3782 "GSettingsEngine.c"
+#line 3848 "GSettingsEngine.c"
 			gint _tmp8_ = 0;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 3788 "GSettingsEngine.c"
+#line 3854 "GSettingsEngine.c"
 		} else {
 			gint _tmp9_ = 0;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 3797 "GSettingsEngine.c"
+#line 3863 "GSettingsEngine.c"
 		}
 	}
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3804 "GSettingsEngine.c"
+#line 3870 "GSettingsEngine.c"
 }
 
 
@@ -3817,52 +3883,52 @@ static void gsettings_configuration_engine_real_set_enum_property (Configuration
 	gint _tmp6_;
 	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 316 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_enum (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3851 "GSettingsEngine.c"
+#line 3917 "GSettingsEngine.c"
 		} else {
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3859 "GSettingsEngine.c"
+#line 3925 "GSettingsEngine.c"
 		}
 	}
-#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 3866 "GSettingsEngine.c"
+#line 3932 "GSettingsEngine.c"
 }
 
 
@@ -3880,55 +3946,55 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE
 	const gchar* _tmp6_;
 	gint _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_int (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3910 "GSettingsEngine.c"
+#line 3976 "GSettingsEngine.c"
 			gint _tmp8_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 3916 "GSettingsEngine.c"
+#line 3982 "GSettingsEngine.c"
 		} else {
 			gint _tmp9_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 3925 "GSettingsEngine.c"
+#line 3991 "GSettingsEngine.c"
 		}
 	}
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3932 "GSettingsEngine.c"
+#line 3998 "GSettingsEngine.c"
 }
 
 
@@ -3945,52 +4011,52 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE
 	gint _tmp6_;
 	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_int (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3979 "GSettingsEngine.c"
+#line 4045 "GSettingsEngine.c"
 		} else {
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3987 "GSettingsEngine.c"
+#line 4053 "GSettingsEngine.c"
 		}
 	}
-#line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 3994 "GSettingsEngine.c"
+#line 4060 "GSettingsEngine.c"
 }
 
 
@@ -4013,7 +4079,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 4017 "GSettingsEngine.c"
+#line 4083 "GSettingsEngine.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -4021,7 +4087,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4025 "GSettingsEngine.c"
+#line 4091 "GSettingsEngine.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -4033,7 +4099,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 4037 "GSettingsEngine.c"
+#line 4103 "GSettingsEngine.c"
 	}
 }
 
@@ -4057,21 +4123,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 4061 "GSettingsEngine.c"
+#line 4127 "GSettingsEngine.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 4067 "GSettingsEngine.c"
+#line 4133 "GSettingsEngine.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 4071 "GSettingsEngine.c"
+#line 4137 "GSettingsEngine.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 4075 "GSettingsEngine.c"
+#line 4141 "GSettingsEngine.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -4083,7 +4149,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 4087 "GSettingsEngine.c"
+#line 4153 "GSettingsEngine.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -4093,13 +4159,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 4097 "GSettingsEngine.c"
+#line 4163 "GSettingsEngine.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 4103 "GSettingsEngine.c"
+#line 4169 "GSettingsEngine.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -4113,7 +4179,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 4117 "GSettingsEngine.c"
+#line 4183 "GSettingsEngine.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -4123,13 +4189,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 4127 "GSettingsEngine.c"
+#line 4193 "GSettingsEngine.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 4133 "GSettingsEngine.c"
+#line 4199 "GSettingsEngine.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -4138,7 +4204,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 4142 "GSettingsEngine.c"
+#line 4208 "GSettingsEngine.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -4158,7 +4224,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4162 "GSettingsEngine.c"
+#line 4228 "GSettingsEngine.c"
 }
 
 
@@ -4179,72 +4245,72 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 	gchar* _tmp7_;
 	ConfigurableProperty _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = gsettings_configuration_engine_get_gs_string (self, _tmp2_, _tmp5_, &_inner_error_);
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gs_result = _tmp6_;
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 4213 "GSettingsEngine.c"
+#line 4279 "GSettingsEngine.c"
 		} else {
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 4221 "GSettingsEngine.c"
+#line 4287 "GSettingsEngine.c"
 		}
 	}
-#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = g_strdup (gs_result);
-#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_result_ = _tmp7_;
-#line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = p;
-#line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
-#line 4232 "GSettingsEngine.c"
+#line 4298 "GSettingsEngine.c"
 		gchar* _tmp9_;
-#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1);
-#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_result_);
-#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_result_ = _tmp9_;
-#line 4240 "GSettingsEngine.c"
+#line 4306 "GSettingsEngine.c"
 	}
-#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _result_;
-#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (gs_result);
-#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 340 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4248 "GSettingsEngine.c"
+#line 4314 "GSettingsEngine.c"
 }
 
 
@@ -4266,96 +4332,96 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 	const gchar* _tmp13_;
 	ConfigurableProperty _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (val != NULL);
-#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = val;
-#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	converted_val = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = p;
-#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
-#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = TRUE;
-#line 4286 "GSettingsEngine.c"
+#line 4352 "GSettingsEngine.c"
 	} else {
 		ConfigurableProperty _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = p;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE;
-#line 4293 "GSettingsEngine.c"
+#line 4359 "GSettingsEngine.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_) {
-#line 4297 "GSettingsEngine.c"
+#line 4363 "GSettingsEngine.c"
 		const gchar* _tmp5_;
 		gchar* _tmp6_;
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = val;
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = g_strconcat ("file://", _tmp5_, NULL);
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (converted_val);
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		converted_val = _tmp6_;
-#line 4308 "GSettingsEngine.c"
+#line 4374 "GSettingsEngine.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = self->priv->schema_names;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7__length1 = self->priv->schema_names_length1;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = p;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp9_ = _tmp7_[_tmp8_];
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10_ = self->priv->key_names;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10__length1 = self->priv->key_names_length1;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp11_ = p;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp12_ = _tmp10_[_tmp11_];
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp13_ = converted_val;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_string (self, _tmp9_, _tmp12_, _tmp13_, &_inner_error_);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4340 "GSettingsEngine.c"
+#line 4406 "GSettingsEngine.c"
 		} else {
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4350 "GSettingsEngine.c"
+#line 4416 "GSettingsEngine.c"
 		}
 	}
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp14_ = p;
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (converted_val);
-#line 4359 "GSettingsEngine.c"
+#line 4425 "GSettingsEngine.c"
 }
 
 
@@ -4373,55 +4439,55 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura
 	const gchar* _tmp6_;
 	gboolean _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4403 "GSettingsEngine.c"
+#line 4469 "GSettingsEngine.c"
 			gboolean _tmp8_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 4409 "GSettingsEngine.c"
+#line 4475 "GSettingsEngine.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4418 "GSettingsEngine.c"
+#line 4484 "GSettingsEngine.c"
 		}
 	}
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4425 "GSettingsEngine.c"
+#line 4491 "GSettingsEngine.c"
 }
 
 
@@ -4438,52 +4504,52 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration
 	gboolean _tmp6_;
 	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_bool (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4472 "GSettingsEngine.c"
+#line 4538 "GSettingsEngine.c"
 		} else {
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4480 "GSettingsEngine.c"
+#line 4546 "GSettingsEngine.c"
 		}
 	}
-#line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4487 "GSettingsEngine.c"
+#line 4553 "GSettingsEngine.c"
 }
 
 
@@ -4501,55 +4567,55 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur
 	const gchar* _tmp6_;
 	gdouble _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_double (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4531 "GSettingsEngine.c"
+#line 4597 "GSettingsEngine.c"
 			gdouble _tmp8_ = 0.0;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp8_;
-#line 4537 "GSettingsEngine.c"
+#line 4603 "GSettingsEngine.c"
 		} else {
 			gdouble _tmp9_ = 0.0;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4546 "GSettingsEngine.c"
+#line 4612 "GSettingsEngine.c"
 		}
 	}
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4553 "GSettingsEngine.c"
+#line 4619 "GSettingsEngine.c"
 }
 
 
@@ -4566,52 +4632,52 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati
 	gdouble _tmp6_;
 	ConfigurableProperty _tmp7_;
 	GError * _inner_error_ = NULL;
-#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_double (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4600 "GSettingsEngine.c"
+#line 4666 "GSettingsEngine.c"
 		} else {
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4608 "GSettingsEngine.c"
+#line 4674 "GSettingsEngine.c"
 		}
 	}
-#line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4615 "GSettingsEngine.c"
+#line 4681 "GSettingsEngine.c"
 }
 
 
@@ -4624,23 +4690,23 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	gchar* _tmp2_;
 	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4644 "GSettingsEngine.c"
+#line 4710 "GSettingsEngine.c"
 	{
 		gboolean _tmp3_ = FALSE;
 		const gchar* _tmp4_;
@@ -4648,86 +4714,86 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		gchar* _tmp6_;
 		gboolean _tmp7_;
 		gboolean _tmp8_;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp6_, &_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4668 "GSettingsEngine.c"
+#line 4734 "GSettingsEngine.c"
 			gboolean _tmp9_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4672 "GSettingsEngine.c"
-				goto __catch206_configuration_error;
+#line 4738 "GSettingsEngine.c"
+				goto __catch218_configuration_error;
 			}
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4683 "GSettingsEngine.c"
+#line 4749 "GSettingsEngine.c"
 		}
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 377 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4691 "GSettingsEngine.c"
+#line 4757 "GSettingsEngine.c"
 	}
-	goto __finally206;
-	__catch206_configuration_error:
+	goto __finally218;
+	__catch218_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
 		gboolean _tmp12_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = err;
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = _tmp10_->message;
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp11_);
-#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:379: GSettingsConfigurationEngine: error: %s", _tmp11_);
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp12_ = def;
-#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp12_;
-#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4720 "GSettingsEngine.c"
+#line 4786 "GSettingsEngine.c"
 	}
-	__finally206:
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally218:
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 4731 "GSettingsEngine.c"
+#line 4797 "GSettingsEngine.c"
 }
 
 
@@ -4738,94 +4804,94 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4758 "GSettingsEngine.c"
+#line 4824 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gboolean _tmp6_;
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4780 "GSettingsEngine.c"
-				goto __catch207_configuration_error;
+#line 4846 "GSettingsEngine.c"
+				goto __catch219_configuration_error;
 			}
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4791 "GSettingsEngine.c"
+#line 4857 "GSettingsEngine.c"
 		}
 	}
-	goto __finally207;
-	__catch207_configuration_error:
+	goto __finally219;
+	__catch219_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:386: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:390: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4812 "GSettingsEngine.c"
+#line 4878 "GSettingsEngine.c"
 	}
-	__finally207:
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally219:
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4825 "GSettingsEngine.c"
+#line 4891 "GSettingsEngine.c"
 	}
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4829 "GSettingsEngine.c"
+#line 4895 "GSettingsEngine.c"
 }
 
 
@@ -4838,23 +4904,23 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	gchar* _tmp2_;
 	gdouble _tmp13_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4858 "GSettingsEngine.c"
+#line 4924 "GSettingsEngine.c"
 	{
 		gdouble _tmp3_ = 0.0;
 		const gchar* _tmp4_;
@@ -4862,86 +4928,86 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		gchar* _tmp6_;
 		gdouble _tmp7_;
 		gdouble _tmp8_;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp6_, &_inner_error_);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4882 "GSettingsEngine.c"
+#line 4948 "GSettingsEngine.c"
 			gdouble _tmp9_ = 0.0;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4886 "GSettingsEngine.c"
-				goto __catch208_configuration_error;
+#line 4952 "GSettingsEngine.c"
+				goto __catch220_configuration_error;
 			}
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 4897 "GSettingsEngine.c"
+#line 4963 "GSettingsEngine.c"
 		}
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4905 "GSettingsEngine.c"
+#line 4971 "GSettingsEngine.c"
 	}
-	goto __finally208;
-	__catch208_configuration_error:
+	goto __finally220;
+	__catch220_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
 		gdouble _tmp12_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = err;
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = _tmp10_->message;
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp11_);
-#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:400: GSettingsConfigurationEngine: error: %s", _tmp11_);
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp12_ = def;
-#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp12_;
-#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4934 "GSettingsEngine.c"
+#line 5000 "GSettingsEngine.c"
 	}
-	__finally208:
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally220:
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 4945 "GSettingsEngine.c"
+#line 5011 "GSettingsEngine.c"
 }
 
 
@@ -4952,94 +5018,94 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4972 "GSettingsEngine.c"
+#line 5038 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gdouble _tmp6_;
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4994 "GSettingsEngine.c"
-				goto __catch209_configuration_error;
+#line 5060 "GSettingsEngine.c"
+				goto __catch221_configuration_error;
 			}
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 409 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5005 "GSettingsEngine.c"
+#line 5071 "GSettingsEngine.c"
 		}
 	}
-	goto __finally209;
-	__catch209_configuration_error:
+	goto __finally221;
+	__catch221_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:407: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:411: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5026 "GSettingsEngine.c"
+#line 5092 "GSettingsEngine.c"
 	}
-	__finally209:
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally221:
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 408 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5039 "GSettingsEngine.c"
+#line 5105 "GSettingsEngine.c"
 	}
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5043 "GSettingsEngine.c"
+#line 5109 "GSettingsEngine.c"
 }
 
 
@@ -5052,23 +5118,23 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	gchar* _tmp2_;
 	gint _tmp13_ = 0;
 	GError * _inner_error_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5072 "GSettingsEngine.c"
+#line 5138 "GSettingsEngine.c"
 	{
 		gint _tmp3_ = 0;
 		const gchar* _tmp4_;
@@ -5076,86 +5142,86 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		gchar* _tmp6_;
 		gint _tmp7_;
 		gint _tmp8_;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp6_, &_inner_error_);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5096 "GSettingsEngine.c"
+#line 5162 "GSettingsEngine.c"
 			gint _tmp9_ = 0;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5100 "GSettingsEngine.c"
-				goto __catch210_configuration_error;
+#line 5166 "GSettingsEngine.c"
+				goto __catch222_configuration_error;
 			}
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return _tmp9_;
-#line 5111 "GSettingsEngine.c"
+#line 5177 "GSettingsEngine.c"
 		}
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5119 "GSettingsEngine.c"
+#line 5185 "GSettingsEngine.c"
 	}
-	goto __finally210;
-	__catch210_configuration_error:
+	goto __finally222;
+	__catch222_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
 		gint _tmp12_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = err;
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = _tmp10_->message;
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp11_);
-#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:421: GSettingsConfigurationEngine: error: %s", _tmp11_);
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp12_ = def;
-#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp12_;
-#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5148 "GSettingsEngine.c"
+#line 5214 "GSettingsEngine.c"
 	}
-	__finally210:
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally222:
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %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/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return _tmp13_;
-#line 5159 "GSettingsEngine.c"
+#line 5225 "GSettingsEngine.c"
 }
 
 
@@ -5166,94 +5232,94 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5186 "GSettingsEngine.c"
+#line 5252 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		gint _tmp6_;
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5208 "GSettingsEngine.c"
-				goto __catch211_configuration_error;
+#line 5274 "GSettingsEngine.c"
+				goto __catch223_configuration_error;
 			}
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 430 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5219 "GSettingsEngine.c"
+#line 5285 "GSettingsEngine.c"
 		}
 	}
-	goto __finally211;
-	__catch211_configuration_error:
+	goto __finally223;
+	__catch223_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:428: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:432: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5240 "GSettingsEngine.c"
+#line 5306 "GSettingsEngine.c"
 	}
-	__finally211:
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally223:
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5253 "GSettingsEngine.c"
+#line 5319 "GSettingsEngine.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5257 "GSettingsEngine.c"
+#line 5323 "GSettingsEngine.c"
 }
 
 
@@ -5265,23 +5331,23 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5285 "GSettingsEngine.c"
+#line 5351 "GSettingsEngine.c"
 	{
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_;
@@ -5290,93 +5356,93 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp6_, &_inner_error_);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5312 "GSettingsEngine.c"
-				goto __catch212_configuration_error;
+#line 5378 "GSettingsEngine.c"
+				goto __catch224_configuration_error;
 			}
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 5323 "GSettingsEngine.c"
+#line 5389 "GSettingsEngine.c"
 		}
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = _tmp3_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = NULL;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp9_;
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp3_);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5337 "GSettingsEngine.c"
+#line 5403 "GSettingsEngine.c"
 	}
-	goto __finally212;
-	__catch212_configuration_error:
+	goto __finally224;
+	__catch224_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
 		const gchar* _tmp12_;
 		gchar* _tmp13_;
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = err;
-#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = _tmp10_->message;
-#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:438: GSettingsConfigurationEngine: error: %s", _tmp11_);
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:442: GSettingsConfigurationEngine: error: %s", _tmp11_);
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp12_ = def;
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp13_ = g_strdup (_tmp12_);
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp13_;
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5369 "GSettingsEngine.c"
+#line 5435 "GSettingsEngine.c"
 	}
-	__finally212:
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally224:
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return NULL;
-#line 5380 "GSettingsEngine.c"
+#line 5446 "GSettingsEngine.c"
 }
 
 
@@ -5387,94 +5453,94 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5407 "GSettingsEngine.c"
+#line 5473 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5429 "GSettingsEngine.c"
-				goto __catch213_configuration_error;
+#line 5495 "GSettingsEngine.c"
+				goto __catch225_configuration_error;
 			}
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5440 "GSettingsEngine.c"
+#line 5506 "GSettingsEngine.c"
 		}
 	}
-	goto __finally213;
-	__catch213_configuration_error:
+	goto __finally225;
+	__catch225_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
 		const gchar* _tmp8_;
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:449: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:453: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5461 "GSettingsEngine.c"
+#line 5527 "GSettingsEngine.c"
 	}
-	__finally213:
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally225:
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5474 "GSettingsEngine.c"
+#line 5540 "GSettingsEngine.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5478 "GSettingsEngine.c"
+#line 5544 "GSettingsEngine.c"
 }
 
 
@@ -5485,91 +5551,91 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5505 "GSettingsEngine.c"
+#line 5571 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp5_, &_inner_error_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5524 "GSettingsEngine.c"
-				goto __catch214_configuration_error;
+#line 5590 "GSettingsEngine.c"
+				goto __catch226_configuration_error;
 			}
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 461 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5535 "GSettingsEngine.c"
+#line 5601 "GSettingsEngine.c"
 		}
 	}
-	goto __finally214;
-	__catch214_configuration_error:
+	goto __finally226;
+	__catch226_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		const gchar* _tmp7_;
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = err;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = _tmp6_->message;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:459: GSettingsConfigurationEngine: error: %s", _tmp7_);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:463: GSettingsConfigurationEngine: error: %s", _tmp7_);
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5556 "GSettingsEngine.c"
+#line 5622 "GSettingsEngine.c"
 	}
-	__finally214:
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally226:
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5569 "GSettingsEngine.c"
+#line 5635 "GSettingsEngine.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5573 "GSettingsEngine.c"
+#line 5639 "GSettingsEngine.c"
 }
 
 
@@ -5580,96 +5646,96 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
-#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5594 "GSettingsEngine.c"
+#line 5660 "GSettingsEngine.c"
 	{
 		FuzzyPropertyState _tmp2_ = 0;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_;
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_);
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp4_;
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5607 "GSettingsEngine.c"
-				goto __catch215_configuration_error;
+#line 5673 "GSettingsEngine.c"
+				goto __catch227_configuration_error;
 			}
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 5618 "GSettingsEngine.c"
+#line 5684 "GSettingsEngine.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_tmp3_) {
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_ENABLED;
-#line 5624 "GSettingsEngine.c"
+#line 5690 "GSettingsEngine.c"
 		} else {
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 472 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_DISABLED;
-#line 5628 "GSettingsEngine.c"
+#line 5694 "GSettingsEngine.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp2_;
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5636 "GSettingsEngine.c"
+#line 5702 "GSettingsEngine.c"
 	}
-	goto __finally215;
-	__catch215_configuration_error:
+	goto __finally227;
+	__catch227_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_;
 		const gchar* _tmp6_;
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_inner_error_ = NULL;
 #line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_inner_error_ = NULL;
+#line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = err;
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_->message;
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:470: GSettingsConfigurationEngine: error: %s", _tmp6_);
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 474 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:474: GSettingsConfigurationEngine: error: %s", _tmp6_);
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = FUZZY_PROPERTY_STATE_UNKNOWN;
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5662 "GSettingsEngine.c"
+#line 5728 "GSettingsEngine.c"
 	}
-	__finally215:
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally227:
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return 0;
-#line 5673 "GSettingsEngine.c"
+#line 5739 "GSettingsEngine.c"
 }
 
 
@@ -5679,77 +5745,77 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
-#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 480 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5693 "GSettingsEngine.c"
+#line 5759 "GSettingsEngine.c"
 	{
 		gboolean _tmp2_;
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = enabled;
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, _tmp2_, &_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5704 "GSettingsEngine.c"
-				goto __catch216_configuration_error;
+#line 5770 "GSettingsEngine.c"
+				goto __catch228_configuration_error;
 			}
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5715 "GSettingsEngine.c"
+#line 5781 "GSettingsEngine.c"
 		}
 	}
-	goto __finally216;
-	__catch216_configuration_error:
+	goto __finally228;
+	__catch228_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
 		const gchar* _tmp4_;
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = err;
-#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = _tmp3_->message;
-#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:481: GSettingsConfigurationEngine: error: %s", _tmp4_);
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 485 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:485: GSettingsConfigurationEngine: error: %s", _tmp4_);
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5736 "GSettingsEngine.c"
+#line 5802 "GSettingsEngine.c"
 	}
-	__finally216:
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally228:
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5749 "GSettingsEngine.c"
+#line 5815 "GSettingsEngine.c"
 	}
-#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 5753 "GSettingsEngine.c"
+#line 5819 "GSettingsEngine.c"
 }
 
 
@@ -5762,70 +5828,70 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 	gchar* _tmp4_;
 	gchar* _tmp5_;
 	GError * _inner_error_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = app_dirs_get_settings_migrator_bin ();
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = _tmp0_;
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp2_;
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = g_strconcat ("sh ", _tmp3_, NULL);
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp4_;
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (_tmp3_);
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (_tmp1_);
-#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 494 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cmd_line = _tmp5_;
-#line 5784 "GSettingsEngine.c"
+#line 5850 "GSettingsEngine.c"
 	{
-#line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_);
-#line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 497 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5790 "GSettingsEngine.c"
-			goto __catch217_g_error;
+#line 5856 "GSettingsEngine.c"
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally217;
-	__catch217_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_;
 		const gchar* _tmp7_;
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 499 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = err;
-#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 499 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = _tmp6_->message;
-#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_message ("GSettingsEngine.vala:495: Error running shotwell-settings-migrator: %s", _tmp7_);
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 499 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_message ("GSettingsEngine.vala:499: Error running shotwell-settings-migrator: %s", _tmp7_);
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5812 "GSettingsEngine.c"
+#line 5878 "GSettingsEngine.c"
 	}
-	__finally217:
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally229:
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cmd_line);
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 496 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5825 "GSettingsEngine.c"
+#line 5891 "GSettingsEngine.c"
 	}
-#line 489 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cmd_line);
-#line 5829 "GSettingsEngine.c"
+#line 5895 "GSettingsEngine.c"
 }
 
 
@@ -5836,7 +5902,7 @@ static void gsettings_configuration_engine_class_init (GSettingsConfigurationEng
 	g_type_class_add_private (klass, sizeof (GSettingsConfigurationEnginePrivate));
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (klass)->finalize = gsettings_configuration_engine_finalize;
-#line 5840 "GSettingsEngine.c"
+#line 5906 "GSettingsEngine.c"
 }
 
 
@@ -5887,14 +5953,14 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (
 	iface->is_plugin_enabled = (FuzzyPropertyState (*) (ConfigurationEngine *, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	iface->set_plugin_enabled = (void (*) (ConfigurationEngine *, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled;
-#line 5891 "GSettingsEngine.c"
+#line 5957 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) {
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv = GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE (self);
-#line 5898 "GSettingsEngine.c"
+#line 5964 "GSettingsEngine.c"
 }
 
 
@@ -5908,7 +5974,7 @@ static void gsettings_configuration_engine_finalize (GObject * obj) {
 	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (gsettings_configuration_engine_parent_class)->finalize (obj);
-#line 5912 "GSettingsEngine.c"
+#line 5978 "GSettingsEngine.c"
 }
 
 
diff --git a/src/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index b4f32e2..89116a7 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -31,6 +31,8 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
 
         schema_names[ConfigurableProperty.AUTO_IMPORT_FROM_LIBRARY] = FILES_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.BG_COLOR_NAME] = UI_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE] = UI_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR] = UI_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.COMMIT_METADATA_TO_MASTERS] = FILES_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.DESKTOP_BACKGROUND_FILE] = SYSTEM_DESKTOP_SCHEMA_NAME;
         schema_names[ConfigurableProperty.DESKTOP_BACKGROUND_MODE] = SYSTEM_DESKTOP_SCHEMA_NAME;
@@ -103,6 +105,8 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         
         key_names[ConfigurableProperty.AUTO_IMPORT_FROM_LIBRARY] = "auto-import";
         key_names[ConfigurableProperty.BG_COLOR_NAME] = "background-color";
+        key_names[ConfigurableProperty.TRANSPARENT_BACKGROUND_TYPE] = "transparent-background-type";
+        key_names[ConfigurableProperty.TRANSPARENT_BACKGROUND_COLOR] = "transparent-background-color";
         key_names[ConfigurableProperty.COMMIT_METADATA_TO_MASTERS] = "commit-metadata";
         key_names[ConfigurableProperty.DESKTOP_BACKGROUND_FILE] = "picture-uri";
         key_names[ConfigurableProperty.DESKTOP_BACKGROUND_MODE] = "picture-options";
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index dc02548..dab0d7b 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -425,7 +425,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source);
 gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing);
 void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked);
 void data_source_internal_subscribe (DataSource* self, DataView* view);
-static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value);
+static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value);
 void data_source_internal_unsubscribe (DataSource* self, DataView* view);
 void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target);
 static void data_source_real_unlinked (DataSource* self, SourceCollection* sources);
@@ -2407,7 +2407,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 2409 "DataSource.c"
-				goto __catch50_g_error;
+				goto __catch54_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			ret = _tmp1_;
@@ -2429,8 +2429,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 2429 "DataSource.c"
 			}
 		}
-		goto __finally50;
-		__catch50_g_error:
+		goto __finally54;
+		__catch54_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp6_;
@@ -2459,7 +2459,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_g_error_free0 (err);
 #line 2460 "DataSource.c"
 		}
-		__finally50:
+		__finally54:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2465 "DataSource.c"
@@ -2497,7 +2497,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 }
 
 
-static void _vala_array_add63 (DataView** * array, int* length, int* size, DataView* value) {
+static void _vala_array_add66 (DataView** * array, int* length, int* size, DataView* value) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if ((*length) == (*size)) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2621,7 +2621,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
+	_vala_array_add66 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
 #line 2625 "DataSource.c"
 }
 
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 0e96c86..6742476 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -768,14 +768,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 771 "SourceCollection.c"
-			goto __catch49_g_error;
+			goto __catch53_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 776 "SourceCollection.c"
 	}
-	goto __finally49;
-	__catch49_g_error:
+	goto __finally53;
+	__catch53_g_error:
 	{
 		GError* err = NULL;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -788,7 +788,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_g_error_free0 (err);
 #line 790 "SourceCollection.c"
 	}
-	__finally49:
+	__finally53:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 795 "SourceCollection.c"
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 5b62a91..c9fdbcb 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -259,11 +259,13 @@ struct _BatchImportJobClass {
 	gchar* (*get_basename) (BatchImportJob* self);
 	gchar* (*get_path) (BatchImportJob* self);
 	DuplicatedFile* (*get_duplicated_file) (BatchImportJob* self);
+	GFile* (*get_associated_file) (BatchImportJob* self);
 	void (*set_associated) (BatchImportJob* self, BatchImportJob* associated);
 	gboolean (*determine_file_size) (BatchImportJob* self, guint64* filesize, GFile* * file_or_dir);
 	gboolean (*prepare) (BatchImportJob* self, GFile* * file_to_import, gboolean* copy_to_library, GError** error);
 	gboolean (*complete) (BatchImportJob* self, MediaSource* source, BatchImportRoll* import_roll, GError** error);
 	time_t (*get_exposure_time_override) (BatchImportJob* self);
+	gboolean (*recurse) (BatchImportJob* self);
 };
 
 struct _SpitDataImportsDataImportJob {
@@ -439,7 +441,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _spit_data_imports_data_import_source_ref0 (gpointer self) {
 #line 21 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? spit_data_imports_data_import_source_ref (self) : NULL;
-#line 443 "DataImportJob.c"
+#line 445 "DataImportJob.c"
 }
 
 
@@ -487,21 +489,21 @@ SpitDataImportsDataImportJob* spit_data_imports_data_import_job_construct (GType
 	self->priv->exposure_time = _tmp7_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self;
-#line 491 "DataImportJob.c"
+#line 493 "DataImportJob.c"
 }
 
 
 SpitDataImportsDataImportJob* spit_data_imports_data_import_job_new (SpitDataImportsDataImportSource* import_source) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return spit_data_imports_data_import_job_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_JOB, import_source);
-#line 498 "DataImportJob.c"
+#line 500 "DataImportJob.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 505 "DataImportJob.c"
+#line 507 "DataImportJob.c"
 }
 
 
@@ -525,7 +527,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_tmp1_ = src_tags;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp1__length1 = src_tags_length1;
-#line 529 "DataImportJob.c"
+#line 531 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
@@ -537,14 +539,14 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 		src_tag_collection_length1 = _tmp1__length1;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp1__length1; src_tag_it = src_tag_it + 1) {
-#line 541 "DataImportJob.c"
+#line 543 "DataImportJob.c"
 			SpitDataImportsImportableTag* _tmp2_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp2_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			src_tag = _tmp2_;
-#line 548 "DataImportJob.c"
+#line 550 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
 				SpitDataImportsImportableTag* _tmp3_;
@@ -588,7 +590,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 				_tmp13_ = prepped;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp13_ != NULL) {
-#line 592 "DataImportJob.c"
+#line 594 "DataImportJob.c"
 					const gchar* _tmp14_;
 					gboolean _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -597,15 +599,15 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 					_tmp15_ = g_str_has_prefix (_tmp14_, TAG_PATH_SEPARATOR_STRING);
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp12_ = _tmp15_;
-#line 601 "DataImportJob.c"
+#line 603 "DataImportJob.c"
 				} else {
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp12_ = FALSE;
-#line 605 "DataImportJob.c"
+#line 607 "DataImportJob.c"
 				}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp12_) {
-#line 609 "DataImportJob.c"
+#line 611 "DataImportJob.c"
 					GeeSet* _tmp16_;
 					const gchar* _tmp17_;
 					GeeList* parents = NULL;
@@ -623,7 +625,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 					_tmp19_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp18_);
 #line 42 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					parents = _tmp19_;
-#line 627 "DataImportJob.c"
+#line 629 "DataImportJob.c"
 					{
 						GeeList* _parent_list = NULL;
 						GeeList* _tmp20_;
@@ -651,7 +653,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 						_parent_index = -1;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						while (TRUE) {
-#line 655 "DataImportJob.c"
+#line 657 "DataImportJob.c"
 							gint _tmp25_;
 							gint _tmp26_;
 							gint _tmp27_;
@@ -673,7 +675,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 							if (!(_tmp26_ < _tmp27_)) {
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 								break;
-#line 677 "DataImportJob.c"
+#line 679 "DataImportJob.c"
 							}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_tmp28_ = _parent_list;
@@ -691,21 +693,21 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), _tmp32_);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_free0 (parent);
-#line 695 "DataImportJob.c"
+#line 697 "DataImportJob.c"
 						}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (_parent_list);
-#line 699 "DataImportJob.c"
+#line 701 "DataImportJob.c"
 					}
 #line 39 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (parents);
-#line 703 "DataImportJob.c"
+#line 705 "DataImportJob.c"
 				}
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 32 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 709 "DataImportJob.c"
+#line 711 "DataImportJob.c"
 			}
 		}
 	}
@@ -717,7 +719,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_tmp36_ = _tmp35_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp36_ > 0) {
-#line 721 "DataImportJob.c"
+#line 723 "DataImportJob.c"
 		GeeSet* _tmp37_;
 		HierarchicalTagIndex* _tmp38_;
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -728,13 +730,13 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 		_hierarchical_tag_index_unref0 (_tmp33_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp33_ = _tmp38_;
-#line 732 "DataImportJob.c"
+#line 734 "DataImportJob.c"
 	} else {
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_hierarchical_tag_index_unref0 (_tmp33_);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_tmp33_ = NULL;
-#line 738 "DataImportJob.c"
+#line 740 "DataImportJob.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	result = _tmp33_;
@@ -742,7 +744,7 @@ static HierarchicalTagIndex* spit_data_imports_data_import_job_build_exclusion_i
 	_g_object_unref0 (detected_htags);
 #line 48 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 746 "DataImportJob.c"
+#line 748 "DataImportJob.c"
 }
 
 
@@ -757,7 +759,7 @@ time_t spit_data_imports_data_import_job_get_exposure_time (SpitDataImportsDataI
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 761 "DataImportJob.c"
+#line 763 "DataImportJob.c"
 }
 
 
@@ -776,7 +778,7 @@ static gchar* spit_data_imports_data_import_job_real_get_dest_identifier (BatchI
 	result = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 780 "DataImportJob.c"
+#line 782 "DataImportJob.c"
 }
 
 
@@ -795,7 +797,7 @@ static gchar* spit_data_imports_data_import_job_real_get_source_identifier (Batc
 	result = _tmp1_;
 #line 60 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 799 "DataImportJob.c"
+#line 801 "DataImportJob.c"
 }
 
 
@@ -808,7 +810,7 @@ static gboolean spit_data_imports_data_import_job_real_is_directory (BatchImport
 	result = FALSE;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 812 "DataImportJob.c"
+#line 814 "DataImportJob.c"
 }
 
 
@@ -827,7 +829,7 @@ static gchar* spit_data_imports_data_import_job_real_get_basename (BatchImportJo
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 831 "DataImportJob.c"
+#line 833 "DataImportJob.c"
 }
 
 
@@ -857,14 +859,14 @@ static gchar* spit_data_imports_data_import_job_real_get_path (BatchImportJob* b
 	result = _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 861 "DataImportJob.c"
+#line 863 "DataImportJob.c"
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 868 "DataImportJob.c"
+#line 870 "DataImportJob.c"
 }
 
 
@@ -884,7 +886,7 @@ static void spit_data_imports_data_import_job_real_set_associated (BatchImportJo
 	_batch_import_job_unref0 (self->priv->associated);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->associated = _tmp1_;
-#line 888 "DataImportJob.c"
+#line 890 "DataImportJob.c"
 }
 
 
@@ -910,21 +912,21 @@ static gboolean spit_data_imports_data_import_job_real_determine_file_size (Batc
 	if (filesize) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*filesize = _vala_filesize;
-#line 914 "DataImportJob.c"
+#line 916 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (file) {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file = _vala_file;
-#line 920 "DataImportJob.c"
+#line 922 "DataImportJob.c"
 	} else {
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file);
-#line 924 "DataImportJob.c"
+#line 926 "DataImportJob.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 928 "DataImportJob.c"
+#line 930 "DataImportJob.c"
 }
 
 
@@ -983,21 +985,21 @@ static gboolean spit_data_imports_data_import_job_real_prepare (BatchImportJob*
 	if (file_to_import) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*file_to_import = _vala_file_to_import;
-#line 987 "DataImportJob.c"
+#line 989 "DataImportJob.c"
 	} else {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 991 "DataImportJob.c"
+#line 993 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (copy_to_library) {
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 997 "DataImportJob.c"
+#line 999 "DataImportJob.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1001 "DataImportJob.c"
+#line 1003 "DataImportJob.c"
 }
 
 
@@ -1065,7 +1067,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_g_object_unref0 (photo);
 #line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		return result;
-#line 1069 "DataImportJob.c"
+#line 1071 "DataImportJob.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp3_ = self->priv->import_source;
@@ -1077,7 +1079,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp5_ = self->priv->detected_htags;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp5_ != NULL) {
-#line 1081 "DataImportJob.c"
+#line 1083 "DataImportJob.c"
 		GeeCollection* paths = NULL;
 		HierarchicalTagIndex* _tmp6_;
 		GeeCollection* _tmp7_;
@@ -1087,7 +1089,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp7_ = hierarchical_tag_index_get_all_paths (_tmp6_);
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		paths = _tmp7_;
-#line 1091 "DataImportJob.c"
+#line 1093 "DataImportJob.c"
 		{
 			GeeIterator* _path_it = NULL;
 			GeeCollection* _tmp8_;
@@ -1100,7 +1102,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_path_it = _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1104 "DataImportJob.c"
+#line 1106 "DataImportJob.c"
 				GeeIterator* _tmp10_;
 				gboolean _tmp11_;
 				gchar* path = NULL;
@@ -1117,7 +1119,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				if (!_tmp11_) {
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1121 "DataImportJob.c"
+#line 1123 "DataImportJob.c"
 				}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp12_ = _path_it;
@@ -1135,15 +1137,15 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				_g_object_unref0 (_tmp16_);
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (path);
-#line 1139 "DataImportJob.c"
+#line 1141 "DataImportJob.c"
 			}
 #line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_g_object_unref0 (_path_it);
-#line 1143 "DataImportJob.c"
+#line 1145 "DataImportJob.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (paths);
-#line 1147 "DataImportJob.c"
+#line 1149 "DataImportJob.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp17_ = src_photo;
@@ -1159,7 +1161,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp20_ = src_tags;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp20__length1 = src_tags_length1;
-#line 1163 "DataImportJob.c"
+#line 1165 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag** src_tag_collection = NULL;
 		gint src_tag_collection_length1 = 0;
@@ -1171,14 +1173,14 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		src_tag_collection_length1 = _tmp20__length1;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		for (src_tag_it = 0; src_tag_it < _tmp20__length1; src_tag_it = src_tag_it + 1) {
-#line 1175 "DataImportJob.c"
+#line 1177 "DataImportJob.c"
 			SpitDataImportsImportableTag* _tmp21_;
 			SpitDataImportsImportableTag* src_tag = NULL;
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp21_ = _g_object_ref0 (src_tag_collection[src_tag_it]);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			src_tag = _tmp21_;
-#line 1182 "DataImportJob.c"
+#line 1184 "DataImportJob.c"
 			{
 				gchar* prepped = NULL;
 				SpitDataImportsImportableTag* _tmp22_;
@@ -1221,7 +1223,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 				_tmp31_ = prepped;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (_tmp31_ != NULL) {
-#line 1225 "DataImportJob.c"
+#line 1227 "DataImportJob.c"
 					const gchar* _tmp32_;
 					GeeList* _tmp33_;
 					GeeList* _tmp34_;
@@ -1248,7 +1250,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 					_g_object_unref0 (_tmp34_);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					if (_tmp37_) {
-#line 1252 "DataImportJob.c"
+#line 1254 "DataImportJob.c"
 						const gchar* _tmp38_;
 						gboolean _tmp39_;
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1257,7 +1259,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_tmp39_ = g_str_has_prefix (_tmp38_, TAG_PATH_SEPARATOR_STRING);
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp39_) {
-#line 1261 "DataImportJob.c"
+#line 1263 "DataImportJob.c"
 							const gchar* _tmp40_;
 							gchar* _tmp41_;
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1268,7 +1270,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 							_g_free0 (prepped);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							prepped = _tmp41_;
-#line 1272 "DataImportJob.c"
+#line 1274 "DataImportJob.c"
 						}
 					} else {
 						GeeList* parents = NULL;
@@ -1320,7 +1322,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_tmp53_ = tag_source_collection_exists (_tmp51_, _tmp52_, FALSE);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						if (_tmp53_) {
-#line 1324 "DataImportJob.c"
+#line 1326 "DataImportJob.c"
 							const gchar* _tmp54_;
 							Tag* _tmp55_;
 							Tag* _tmp56_;
@@ -1334,7 +1336,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 							tag_promote (_tmp56_);
 #line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 							_g_object_unref0 (_tmp56_);
-#line 1338 "DataImportJob.c"
+#line 1340 "DataImportJob.c"
 						}
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_free0 (flat_top_level_parent);
@@ -1342,7 +1344,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 						_g_free0 (top_level_parent);
 #line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 						_g_object_unref0 (parents);
-#line 1346 "DataImportJob.c"
+#line 1348 "DataImportJob.c"
 					}
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_tmp57_ = prepped;
@@ -1356,13 +1358,13 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 					tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					_g_object_unref0 (_tmp59_);
-#line 1360 "DataImportJob.c"
+#line 1362 "DataImportJob.c"
 				}
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (prepped);
 #line 111 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_object_unref0 (src_tag);
-#line 1366 "DataImportJob.c"
+#line 1368 "DataImportJob.c"
 			}
 		}
 	}
@@ -1376,7 +1378,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp63_ = src_event;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp63_ != NULL) {
-#line 1380 "DataImportJob.c"
+#line 1382 "DataImportJob.c"
 		gchar* prepped = NULL;
 		SpitDataImportsImportableEvent* _tmp64_;
 		gchar* _tmp65_;
@@ -1402,7 +1404,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp69_ = prepped;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		if (_tmp69_ != NULL) {
-#line 1406 "DataImportJob.c"
+#line 1408 "DataImportJob.c"
 			LibraryPhoto* _tmp70_;
 			BatchImportRoll* _tmp71_;
 			ViewCollection* _tmp72_;
@@ -1417,11 +1419,11 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_tmp73_ = prepped;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_SOURCE, MediaSource), _tmp72_, _tmp73_);
-#line 1421 "DataImportJob.c"
+#line 1423 "DataImportJob.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_free0 (prepped);
-#line 1425 "DataImportJob.c"
+#line 1427 "DataImportJob.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp74_ = src_photo;
@@ -1437,7 +1439,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	if (_tmp77_) {
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		dst_rating = RATING_REJECTED;
-#line 1441 "DataImportJob.c"
+#line 1443 "DataImportJob.c"
 	} else {
 		SpitDataImportsImportableRating* _tmp78_;
 		gboolean _tmp79_;
@@ -1449,7 +1451,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		if (_tmp79_) {
 #line 152 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			dst_rating = RATING_UNRATED;
-#line 1453 "DataImportJob.c"
+#line 1455 "DataImportJob.c"
 		} else {
 			SpitDataImportsImportableRating* _tmp80_;
 			gint _tmp81_;
@@ -1462,7 +1464,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 			_tmp82_ = rating_unserialize (_tmp81_);
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			dst_rating = _tmp82_;
-#line 1466 "DataImportJob.c"
+#line 1468 "DataImportJob.c"
 		}
 	}
 #line 155 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1481,7 +1483,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp87_ = title;
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp87_ != NULL) {
-#line 1485 "DataImportJob.c"
+#line 1487 "DataImportJob.c"
 		LibraryPhoto* _tmp88_;
 		const gchar* _tmp89_;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1490,7 +1492,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp89_ = title;
 #line 159 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_MEDIA_SOURCE, MediaSource), _tmp89_);
-#line 1494 "DataImportJob.c"
+#line 1496 "DataImportJob.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp90_ = src_photo;
@@ -1502,7 +1504,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_tmp92_ = date_time;
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	if (_tmp92_ != NULL) {
-#line 1506 "DataImportJob.c"
+#line 1508 "DataImportJob.c"
 		LibraryPhoto* _tmp93_;
 		time_t* _tmp94_;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1511,7 +1513,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 		_tmp94_ = date_time;
 #line 163 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_DATEABLE, Dateable), *_tmp94_);
-#line 1515 "DataImportJob.c"
+#line 1517 "DataImportJob.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp95_ = photo;
@@ -1539,7 +1541,7 @@ static gboolean spit_data_imports_data_import_job_real_complete (BatchImportJob*
 	_g_object_unref0 (photo);
 #line 167 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1543 "DataImportJob.c"
+#line 1545 "DataImportJob.c"
 }
 
 
@@ -1560,7 +1562,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	_tmp0_ = gee_linked_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	components = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1564 "DataImportJob.c"
+#line 1566 "DataImportJob.c"
 	{
 		SpitDataImportsImportableTag* current_tag = NULL;
 		SpitDataImportsImportableTag* _tmp1_;
@@ -1571,14 +1573,14 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 		_tmp2_ = _g_object_ref0 (_tmp1_);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		current_tag = _tmp2_;
-#line 1575 "DataImportJob.c"
+#line 1577 "DataImportJob.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			_tmp3_ = TRUE;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 			while (TRUE) {
-#line 1582 "DataImportJob.c"
+#line 1584 "DataImportJob.c"
 				SpitDataImportsImportableTag* _tmp6_;
 				GeeList* _tmp7_;
 				SpitDataImportsImportableTag* _tmp8_;
@@ -1588,7 +1590,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				gchar* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				if (!_tmp3_) {
-#line 1592 "DataImportJob.c"
+#line 1594 "DataImportJob.c"
 					SpitDataImportsImportableTag* _tmp4_;
 					SpitDataImportsImportableTag* _tmp5_;
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
@@ -1599,7 +1601,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 					_g_object_unref0 (current_tag);
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					current_tag = _tmp5_;
-#line 1603 "DataImportJob.c"
+#line 1605 "DataImportJob.c"
 				}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp3_ = FALSE;
@@ -1609,7 +1611,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				if (!(_tmp6_ != NULL)) {
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 					break;
-#line 1613 "DataImportJob.c"
+#line 1615 "DataImportJob.c"
 				}
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_tmp7_ = components;
@@ -1629,12 +1631,12 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 				_g_free0 (_tmp12_);
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 				_g_free0 (_tmp10_);
-#line 1633 "DataImportJob.c"
+#line 1635 "DataImportJob.c"
 			}
 		}
 #line 173 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		_g_object_unref0 (current_tag);
-#line 1638 "DataImportJob.c"
+#line 1640 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	_tmp13_ = components;
@@ -1648,7 +1650,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	if (result_length1) {
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 		*result_length1 = _tmp16__length1;
-#line 1652 "DataImportJob.c"
+#line 1654 "DataImportJob.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	result = _tmp16_;
@@ -1656,7 +1658,7 @@ static gchar** spit_data_imports_data_import_job_build_path_components (SpitData
 	_g_object_unref0 (components);
 #line 176 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	return result;
-#line 1660 "DataImportJob.c"
+#line 1662 "DataImportJob.c"
 }
 
 
@@ -1685,7 +1687,7 @@ static void spit_data_imports_data_import_job_class_init (SpitDataImportsDataImp
 	((BatchImportJobClass *) klass)->prepare = (gboolean (*) (BatchImportJob *, GFile* *, gboolean*, GError**)) spit_data_imports_data_import_job_real_prepare;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	((BatchImportJobClass *) klass)->complete = (gboolean (*) (BatchImportJob *, MediaSource*, BatchImportRoll*, GError**)) spit_data_imports_data_import_job_real_complete;
-#line 1689 "DataImportJob.c"
+#line 1691 "DataImportJob.c"
 }
 
 
@@ -1696,7 +1698,7 @@ static void spit_data_imports_data_import_job_instance_init (SpitDataImportsData
 	self->priv->associated = NULL;
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	self->priv->detected_htags = NULL;
-#line 1700 "DataImportJob.c"
+#line 1702 "DataImportJob.c"
 }
 
 
@@ -1714,7 +1716,7 @@ static void spit_data_imports_data_import_job_finalize (BatchImportJob * obj) {
 	_hierarchical_tag_index_unref0 (self->priv->detected_htags);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportJob.vala"
 	BATCH_IMPORT_JOB_CLASS (spit_data_imports_data_import_job_parent_class)->finalize (obj);
-#line 1718 "DataImportJob.c"
+#line 1720 "DataImportJob.c"
 }
 
 
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 715b62a..d3990dc 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -63,17 +63,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
-#define TYPE_PHOTO_PREVIEW (photo_preview_get_type ())
-#define PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_PREVIEW, PhotoPreview))
-#define PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_PREVIEW, PhotoPreviewClass))
-#define IS_PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_PREVIEW))
-#define IS_PHOTO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_PREVIEW))
-#define PHOTO_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_PREVIEW, PhotoPreviewClass))
-
-typedef struct _PhotoPreview PhotoPreview;
-typedef struct _PhotoPreviewClass PhotoPreviewClass;
-#define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL)))
-
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
 typedef struct _SpitDataImportsParamSpecDataImportSource SpitDataImportsParamSpecDataImportSource;
 
@@ -150,16 +139,7 @@ gchar* media_metadata_get_title (MediaMetadata* self);
 MetadataDateTime* metadata_date_time_new (time_t timestamp);
 MetadataDateTime* metadata_date_time_construct (GType object_type, time_t timestamp);
 MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self);
-gpointer photo_preview_ref (gpointer instance);
-void photo_preview_unref (gpointer instance);
-GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_photo_preview (GValue* value, gpointer v_object);
-void value_take_photo_preview (GValue* value, gpointer v_object);
-gpointer value_get_photo_preview (const GValue* value);
-GType photo_preview_get_type (void) G_GNUC_CONST;
-PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-gchar* md5_binary (guint8* buffer, gsize length);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
 guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
 time_t query_file_modified (GFile* file, GError** error);
 gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImportSource* self);
@@ -184,21 +164,14 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
 static gpointer _g_object_ref0 (gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 188 "DataImportSource.c"
+#line 168 "DataImportSource.c"
 }
 
 
 static gpointer _metadata_date_time_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 195 "DataImportSource.c"
-}
-
-
-static gpointer _photo_preview_ref0 (gpointer self) {
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-	return self ? photo_preview_ref (self) : NULL;
-#line 202 "DataImportSource.c"
+#line 175 "DataImportSource.c"
 }
 
 
@@ -248,21 +221,21 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 	_tmp7_ = folder_path;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp7_ != NULL) {
-#line 252 "DataImportSource.c"
+#line 225 "DataImportSource.c"
 		const gchar* _tmp8_;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp8_ = filename;
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 258 "DataImportSource.c"
+#line 231 "DataImportSource.c"
 	} else {
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp6_ = FALSE;
-#line 262 "DataImportSource.c"
+#line 235 "DataImportSource.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp6_) {
-#line 266 "DataImportSource.c"
+#line 239 "DataImportSource.c"
 		SpitDataImportsImportableMediaItem* _tmp9_;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
@@ -308,31 +281,31 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		_tmp19_ = g_file_query_exists (_tmp18_, NULL);
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		self->priv->backing_file_found = _tmp19_;
-#line 312 "DataImportSource.c"
+#line 285 "DataImportSource.c"
 	} else {
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		self->priv->backing_file_found = FALSE;
-#line 316 "DataImportSource.c"
+#line 289 "DataImportSource.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp21_ = photo;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp21_ != NULL) {
-#line 322 "DataImportSource.c"
+#line 295 "DataImportSource.c"
 		gboolean _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp22_ = self->priv->backing_file_found;
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp20_ = _tmp22_;
-#line 328 "DataImportSource.c"
+#line 301 "DataImportSource.c"
 	} else {
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp20_ = FALSE;
-#line 332 "DataImportSource.c"
+#line 305 "DataImportSource.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp20_) {
-#line 336 "DataImportSource.c"
+#line 309 "DataImportSource.c"
 		PhotoMetadata* metadata = NULL;
 		PhotoMetadata* _tmp23_;
 		SpitDataImportsImportableMediaItem* _tmp30_;
@@ -342,16 +315,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		SpitDataImportsImportableMediaItem* _tmp38_;
 		time_t* _tmp39_;
 		time_t* _tmp40_;
-		PhotoPreview* _tmp48_ = NULL;
-		PhotoMetadata* _tmp49_;
-		PhotoPreview* preview = NULL;
-		PhotoPreview* _tmp52_;
-		PhotoPreview* _tmp53_;
+		PhotoMetadata* _tmp48_;
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp23_ = photo_metadata_new ();
 #line 44 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		metadata = _tmp23_;
-#line 355 "DataImportSource.c"
+#line 324 "DataImportSource.c"
 		{
 			PhotoMetadata* _tmp24_;
 			GFile* _tmp25_;
@@ -363,12 +332,12 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp25_, &_inner_error_);
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 367 "DataImportSource.c"
-				goto __catch218_g_error;
+#line 336 "DataImportSource.c"
+				goto __catch230_g_error;
 			}
 		}
-		goto __finally218;
-		__catch218_g_error:
+		goto __finally230;
+		__catch230_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp26_;
@@ -397,9 +366,9 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			metadata = NULL;
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 401 "DataImportSource.c"
+#line 370 "DataImportSource.c"
 		}
-		__finally218:
+		__finally230:
 #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"
@@ -416,7 +385,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			g_clear_error (&_inner_error_);
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 420 "DataImportSource.c"
+#line 389 "DataImportSource.c"
 		}
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp30_ = db_photo;
@@ -430,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		_tmp32_ = self->priv->title;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (_tmp32_ == NULL) {
-#line 434 "DataImportSource.c"
+#line 403 "DataImportSource.c"
 			gchar* _tmp33_ = NULL;
 			PhotoMetadata* _tmp34_;
 			gchar* _tmp37_;
@@ -438,7 +407,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_tmp34_ = metadata;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (_tmp34_ != NULL) {
-#line 442 "DataImportSource.c"
+#line 411 "DataImportSource.c"
 				PhotoMetadata* _tmp35_;
 				gchar* _tmp36_;
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -449,13 +418,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_free0 (_tmp33_);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp33_ = _tmp36_;
-#line 453 "DataImportSource.c"
+#line 422 "DataImportSource.c"
 			} else {
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_g_free0 (_tmp33_);
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp33_ = NULL;
-#line 459 "DataImportSource.c"
+#line 428 "DataImportSource.c"
 			}
 #line 53 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp37_ = g_strdup (_tmp33_);
@@ -465,7 +434,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			self->priv->title = _tmp37_;
 #line 52 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (_tmp33_);
-#line 469 "DataImportSource.c"
+#line 438 "DataImportSource.c"
 		}
 #line 55 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp38_ = db_photo;
@@ -477,7 +446,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 		_tmp40_ = date_time;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (_tmp40_ != NULL) {
-#line 481 "DataImportSource.c"
+#line 450 "DataImportSource.c"
 			time_t* _tmp41_;
 			MetadataDateTime* _tmp42_;
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -488,7 +457,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_metadata_date_time_unref0 (self->priv->exposure_time);
 #line 57 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->exposure_time = _tmp42_;
-#line 492 "DataImportSource.c"
+#line 461 "DataImportSource.c"
 		} else {
 			MetadataDateTime* _tmp43_ = NULL;
 			PhotoMetadata* _tmp44_;
@@ -497,7 +466,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_tmp44_ = metadata;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (_tmp44_ != NULL) {
-#line 501 "DataImportSource.c"
+#line 470 "DataImportSource.c"
 				PhotoMetadata* _tmp45_;
 				MetadataDateTime* _tmp46_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -508,13 +477,13 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_metadata_date_time_unref0 (_tmp43_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp43_ = _tmp46_;
-#line 512 "DataImportSource.c"
+#line 481 "DataImportSource.c"
 			} else {
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_metadata_date_time_unref0 (_tmp43_);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp43_ = NULL;
-#line 518 "DataImportSource.c"
+#line 487 "DataImportSource.c"
 			}
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_tmp47_ = _metadata_date_time_ref0 (_tmp43_);
@@ -524,315 +493,189 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			self->priv->exposure_time = _tmp47_;
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_metadata_date_time_unref0 (_tmp43_);
-#line 528 "DataImportSource.c"
+#line 497 "DataImportSource.c"
 		}
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp49_ = metadata;
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		if (_tmp49_ != NULL) {
-#line 534 "DataImportSource.c"
-			PhotoMetadata* _tmp50_;
-			PhotoPreview* _tmp51_;
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp50_ = metadata;
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp51_ = photo_metadata_get_preview (_tmp50_, (guint) 0);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_photo_preview_unref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp48_ = _tmp51_;
-#line 545 "DataImportSource.c"
-		} else {
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_photo_preview_unref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp48_ = NULL;
-#line 551 "DataImportSource.c"
-		}
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp52_ = _photo_preview_ref0 (_tmp48_);
-#line 61 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		preview = _tmp52_;
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp53_ = preview;
+		_tmp48_ = metadata;
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		if (_tmp53_ != NULL) {
-#line 561 "DataImportSource.c"
-			{
-				guint8* preview_raw = NULL;
-				PhotoPreview* _tmp54_;
-				gint _tmp55_;
-				guint8* _tmp56_;
-				gint preview_raw_length1;
-				gint _preview_raw_size_;
-				guint8* _tmp57_;
-				gint _tmp57__length1;
-				guint8* _tmp58_;
-				gint _tmp58__length1;
-				gchar* _tmp59_;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp54_ = preview;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp56_ = photo_preview_flatten (_tmp54_, &_tmp55_, &_inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				preview_raw = _tmp56_;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				preview_raw_length1 = _tmp55_;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_preview_raw_size_ = preview_raw_length1;
-#line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 586 "DataImportSource.c"
-					goto __catch219_g_error;
-				}
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp57_ = preview_raw;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp57__length1 = preview_raw_length1;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp58_ = preview_raw;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp58__length1 = preview_raw_length1;
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp59_ = md5_binary (_tmp57_, (gsize) _tmp58__length1);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (self->priv->preview_md5);
-#line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				self->priv->preview_md5 = _tmp59_;
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				preview_raw = (g_free (preview_raw), NULL);
-#line 605 "DataImportSource.c"
-			}
-			goto __finally219;
-			__catch219_g_error:
-			{
-				GError* e = NULL;
-				gchar* _tmp60_;
-				gchar* _tmp61_;
-				GError* _tmp62_;
-				const gchar* _tmp63_;
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				e = _inner_error_;
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_inner_error_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp60_ = spit_data_imports_data_import_source_get_filename (self);
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp61_ = _tmp60_;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp62_ = e;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_tmp63_ = _tmp62_->message;
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				g_warning ("DataImportSource.vala:67: Could not get raw preview for %s: %s", _tmp61_, _tmp63_);
-#line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (_tmp61_);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_error_free0 (e);
-#line 633 "DataImportSource.c"
-			}
-			__finally219:
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			if (G_UNLIKELY (_inner_error_ != NULL)) {
+		if (_tmp48_ != NULL) {
+#line 503 "DataImportSource.c"
+			PhotoMetadata* _tmp49_;
+			gchar* _tmp50_;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_photo_preview_unref0 (preview);
+			_tmp49_ = metadata;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_photo_preview_unref0 (_tmp48_);
+			_tmp50_ = photo_metadata_thumbnail_hash (_tmp49_);
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (date_time);
+			_g_free0 (self->priv->preview_md5);
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_media_metadata_unref0 (metadata);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_object_unref0 (photo);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (filename);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				_g_free0 (folder_path);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				g_clear_error (&_inner_error_);
-#line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-				return NULL;
-#line 658 "DataImportSource.c"
-			}
+			self->priv->preview_md5 = _tmp50_;
+#line 514 "DataImportSource.c"
 		}
 		{
-			guint64 _tmp64_ = 0ULL;
-			GFile* _tmp65_;
-			guint64 _tmp66_;
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp65_ = photo;
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp66_ = query_total_file_size (_tmp65_, NULL, &_inner_error_);
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp64_ = _tmp66_;
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			guint64 _tmp51_ = 0ULL;
+			GFile* _tmp52_;
+			guint64 _tmp53_;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp52_ = photo;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp53_ = query_total_file_size (_tmp52_, NULL, &_inner_error_);
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp51_ = _tmp53_;
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "DataImportSource.c"
-				goto __catch220_g_error;
+#line 528 "DataImportSource.c"
+				goto __catch231_g_error;
 			}
-#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->file_size = _tmp64_;
-#line 678 "DataImportSource.c"
+#line 71 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			self->priv->file_size = _tmp51_;
+#line 533 "DataImportSource.c"
 		}
-		goto __finally220;
-		__catch220_g_error:
+		goto __finally231;
+		__catch231_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp67_;
-			gchar* _tmp68_;
-			GError* _tmp69_;
-			const gchar* _tmp70_;
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			gchar* _tmp54_;
+			gchar* _tmp55_;
+			GError* _tmp56_;
+			const gchar* _tmp57_;
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_inner_error_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp67_ = spit_data_imports_data_import_source_get_filename (self);
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp68_ = _tmp67_;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp69_ = e;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp70_ = _tmp69_->message;
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			g_warning ("DataImportSource.vala:77: Could not get file size for %s: %s", _tmp68_, _tmp70_);
-#line 77 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp68_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp54_ = spit_data_imports_data_import_source_get_filename (self);
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp55_ = _tmp54_;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp56_ = e;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp57_ = _tmp56_->message;
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			g_warning ("DataImportSource.vala:73: Could not get file size for %s: %s", _tmp55_, _tmp57_);
+#line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_g_free0 (_tmp55_);
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 706 "DataImportSource.c"
+#line 561 "DataImportSource.c"
 		}
-		__finally220:
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		__finally231:
+#line 70 "/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"
-			_photo_preview_unref0 (preview);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_photo_preview_unref0 (_tmp48_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (date_time);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_media_metadata_unref0 (metadata);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_object_unref0 (photo);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (filename);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (folder_path);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			g_clear_error (&_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 70 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 731 "DataImportSource.c"
+#line 582 "DataImportSource.c"
 		}
 		{
-			time_t _tmp71_ = 0;
-			GFile* _tmp72_;
-			time_t _tmp73_;
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp72_ = photo;
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp73_ = query_file_modified (_tmp72_, &_inner_error_);
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp71_ = _tmp73_;
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			time_t _tmp58_ = 0;
+			GFile* _tmp59_;
+			time_t _tmp60_;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp59_ = photo;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp60_ = query_file_modified (_tmp59_, &_inner_error_);
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp58_ = _tmp60_;
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 745 "DataImportSource.c"
-				goto __catch221_g_error;
+#line 596 "DataImportSource.c"
+				goto __catch232_g_error;
 			}
-#line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			self->priv->modification_time = _tmp71_;
-#line 750 "DataImportSource.c"
+#line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			self->priv->modification_time = _tmp58_;
+#line 601 "DataImportSource.c"
 		}
-		goto __finally221;
-		__catch221_g_error:
+		goto __finally232;
+		__catch232_g_error:
 		{
 			GError* e = NULL;
-			gchar* _tmp74_;
-			gchar* _tmp75_;
-			GError* _tmp76_;
-			const gchar* _tmp77_;
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			gchar* _tmp61_;
+			gchar* _tmp62_;
+			GError* _tmp63_;
+			const gchar* _tmp64_;
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			e = _inner_error_;
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_inner_error_ = NULL;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp74_ = spit_data_imports_data_import_source_get_filename (self);
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp75_ = _tmp74_;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp76_ = e;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_tmp77_ = _tmp76_->message;
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			g_warning ("DataImportSource.vala:82: Could not get modification time for %s: %s", _tmp75_, _tmp77_);
-#line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_g_free0 (_tmp75_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp61_ = spit_data_imports_data_import_source_get_filename (self);
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp62_ = _tmp61_;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp63_ = e;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_tmp64_ = _tmp63_->message;
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			g_warning ("DataImportSource.vala:78: Could not get modification time for %s: %s", _tmp62_, _tmp64_);
+#line 78 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+			_g_free0 (_tmp62_);
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_error_free0 (e);
-#line 778 "DataImportSource.c"
+#line 629 "DataImportSource.c"
 		}
-		__finally221:
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		__finally232:
+#line 75 "/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"
-			_photo_preview_unref0 (preview);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-			_photo_preview_unref0 (_tmp48_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (date_time);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_media_metadata_unref0 (metadata);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_object_unref0 (photo);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (filename);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			_g_free0 (folder_path);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			g_clear_error (&_inner_error_);
-#line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return NULL;
-#line 803 "DataImportSource.c"
+#line 650 "DataImportSource.c"
 		}
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_photo_preview_unref0 (preview);
-#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_photo_preview_unref0 (_tmp48_);
-#line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (date_time);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_media_metadata_unref0 (metadata);
-#line 813 "DataImportSource.c"
+#line 656 "DataImportSource.c"
 	} else {
-		GFile* _tmp78_;
-		gchar* _tmp79_;
-		gchar* _tmp80_;
-		gchar* _tmp81_;
-		gchar* _tmp82_;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp78_ = photo;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp79_ = g_file_get_path (_tmp78_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp80_ = _tmp79_;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp81_ = g_strdup_printf ("Photo file %s not found", _tmp80_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_tmp82_ = _tmp81_;
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		g_debug ("DataImportSource.vala:85: %s", _tmp82_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp82_);
-#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
-		_g_free0 (_tmp80_);
-#line 836 "DataImportSource.c"
+		GFile* _tmp65_;
+		gchar* _tmp66_;
+		gchar* _tmp67_;
+		gchar* _tmp68_;
+		gchar* _tmp69_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_tmp65_ = photo;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_tmp66_ = g_file_get_path (_tmp65_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_tmp67_ = _tmp66_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_tmp68_ = g_strdup_printf ("Photo file %s not found", _tmp67_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_tmp69_ = _tmp68_;
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		g_debug ("DataImportSource.vala:81: %s", _tmp69_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_g_free0 (_tmp69_);
+#line 81 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+		_g_free0 (_tmp67_);
+#line 679 "DataImportSource.c"
 	}
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_object_unref0 (photo);
@@ -842,14 +685,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 	_g_free0 (folder_path);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return self;
-#line 846 "DataImportSource.c"
+#line 689 "DataImportSource.c"
 }
 
 
 SpitDataImportsDataImportSource* spit_data_imports_data_import_source_new (SpitDataImportsImportableMediaItem* db_photo) {
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return spit_data_imports_data_import_source_construct (SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE, db_photo);
-#line 853 "DataImportSource.c"
+#line 696 "DataImportSource.c"
 }
 
 
@@ -857,17 +700,17 @@ gchar* spit_data_imports_data_import_source_get_filename (SpitDataImportsDataImp
 	gchar* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	gchar* _tmp1_;
-#line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 85 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->db_photo;
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = spit_data_imports_importable_media_item_get_filename (_tmp0_);
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp1_;
-#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 86 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 871 "DataImportSource.c"
+#line 714 "DataImportSource.c"
 }
 
 
@@ -875,17 +718,17 @@ gchar* spit_data_imports_data_import_source_get_fulldir (SpitDataImportsDataImpo
 	gchar* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	gchar* _tmp1_;
-#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 89 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->db_photo;
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = spit_data_imports_importable_media_item_get_folder_path (_tmp0_);
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp1_;
-#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 90 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 889 "DataImportSource.c"
+#line 732 "DataImportSource.c"
 }
 
 
@@ -899,35 +742,35 @@ GFile* spit_data_imports_data_import_source_get_file (SpitDataImportsDataImportS
 	gchar* _tmp5_;
 	GFile* _tmp6_;
 	GFile* _tmp7_;
-#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = spit_data_imports_data_import_source_get_fulldir (self);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = _tmp0_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp3_ = _tmp2_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp4_ = spit_data_imports_data_import_source_get_filename (self);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp5_ = _tmp4_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp6_ = g_file_get_child (_tmp3_, _tmp5_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp7_ = _tmp6_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_free0 (_tmp5_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_object_unref0 (_tmp3_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_free0 (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp7_;
-#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 94 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 931 "DataImportSource.c"
+#line 774 "DataImportSource.c"
 }
 
 
@@ -936,41 +779,41 @@ gchar* spit_data_imports_data_import_source_get_name (SpitDataImportsDataImportS
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_;
 	gboolean _tmp2_;
-#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 97 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = self->priv->title;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp2_ = is_string_empty (_tmp1_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!_tmp2_) {
-#line 948 "DataImportSource.c"
+#line 791 "DataImportSource.c"
 		const gchar* _tmp3_;
 		gchar* _tmp4_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp3_ = self->priv->title;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp4_ = g_strdup (_tmp3_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (_tmp0_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = _tmp4_;
-#line 959 "DataImportSource.c"
+#line 802 "DataImportSource.c"
 	} else {
 		gchar* _tmp5_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp5_ = spit_data_imports_data_import_source_get_filename (self);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_g_free0 (_tmp0_);
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = _tmp5_;
-#line 968 "DataImportSource.c"
+#line 811 "DataImportSource.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 98 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 974 "DataImportSource.c"
+#line 817 "DataImportSource.c"
 }
 
 
@@ -978,17 +821,17 @@ gchar* spit_data_imports_data_import_source_get_title (SpitDataImportsDataImport
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->title;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 992 "DataImportSource.c"
+#line 835 "DataImportSource.c"
 }
 
 
@@ -998,38 +841,38 @@ PhotoFileFormat spit_data_imports_data_import_source_get_file_format (SpitDataIm
 	gchar* _tmp1_;
 	PhotoFileFormat _tmp2_;
 	PhotoFileFormat _tmp3_;
-#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = spit_data_imports_data_import_source_get_filename (self);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = _tmp0_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp3_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_g_free0 (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 106 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1018 "DataImportSource.c"
+#line 861 "DataImportSource.c"
 }
 
 
 gchar* spit_data_imports_data_import_source_to_string (SpitDataImportsDataImportSource* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = spit_data_imports_data_import_source_get_name (self);
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1033 "DataImportSource.c"
+#line 876 "DataImportSource.c"
 }
 
 
@@ -1037,50 +880,50 @@ time_t spit_data_imports_data_import_source_get_exposure_time (SpitDataImportsDa
 	time_t result = 0;
 	time_t _tmp0_ = 0;
 	MetadataDateTime* _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0);
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = self->priv->exposure_time;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
-#line 1047 "DataImportSource.c"
+#line 890 "DataImportSource.c"
 		MetadataDateTime* _tmp2_;
 		time_t _tmp3_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->exposure_time;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp3_ = metadata_date_time_get_timestamp (_tmp2_);
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = _tmp3_;
-#line 1056 "DataImportSource.c"
+#line 899 "DataImportSource.c"
 	} else {
 		time_t _tmp4_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp4_ = self->priv->modification_time;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = _tmp4_;
-#line 1063 "DataImportSource.c"
+#line 906 "DataImportSource.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1069 "DataImportSource.c"
+#line 912 "DataImportSource.c"
 }
 
 
 guint64 spit_data_imports_data_import_source_get_filesize (SpitDataImportsDataImportSource* self) {
 	guint64 result = 0ULL;
 	guint64 _tmp0_;
-#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), 0ULL);
-#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->file_size;
-#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 118 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1084 "DataImportSource.c"
+#line 927 "DataImportSource.c"
 }
 
 
@@ -1088,17 +931,17 @@ SpitDataImportsImportableMediaItem* spit_data_imports_data_import_source_get_pho
 	SpitDataImportsImportableMediaItem* result = NULL;
 	SpitDataImportsImportableMediaItem* _tmp0_;
 	SpitDataImportsImportableMediaItem* _tmp1_;
-#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), NULL);
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->db_photo;
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 122 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1102 "DataImportSource.c"
+#line 945 "DataImportSource.c"
 }
 
 
@@ -1106,57 +949,57 @@ gboolean spit_data_imports_data_import_source_is_already_imported (SpitDataImpor
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_;
-#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp1_ = self->priv->preview_md5;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (_tmp1_ != NULL) {
-#line 1116 "DataImportSource.c"
+#line 959 "DataImportSource.c"
 		const gchar* _tmp2_;
 		PhotoFileFormat _tmp3_;
 		gboolean _tmp4_;
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp2_ = self->priv->preview_md5;
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp3_ = spit_data_imports_data_import_source_get_file_format (self);
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp4_ = library_photo_has_nontrash_duplicate (NULL, _tmp2_, NULL, _tmp3_);
-#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 128 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = _tmp4_;
-#line 1128 "DataImportSource.c"
+#line 971 "DataImportSource.c"
 	} else {
-#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		_tmp0_ = FALSE;
-#line 1132 "DataImportSource.c"
+#line 975 "DataImportSource.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 127 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1138 "DataImportSource.c"
+#line 981 "DataImportSource.c"
 }
 
 
 gboolean spit_data_imports_data_import_source_was_backing_file_found (SpitDataImportsDataImportSource* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 132 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_DATA_IMPORT_SOURCE (self), FALSE);
-#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_tmp0_ = self->priv->backing_file_found;
-#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	result = _tmp0_;
-#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
+#line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return result;
-#line 1153 "DataImportSource.c"
+#line 996 "DataImportSource.c"
 }
 
 
 static void spit_data_imports_value_data_import_source_init (GValue* value) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	value->data[0].v_pointer = NULL;
-#line 1160 "DataImportSource.c"
+#line 1003 "DataImportSource.c"
 }
 
 
@@ -1165,7 +1008,7 @@ static void spit_data_imports_value_data_import_source_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (value->data[0].v_pointer);
-#line 1169 "DataImportSource.c"
+#line 1012 "DataImportSource.c"
 	}
 }
 
@@ -1175,11 +1018,11 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		dest_value->data[0].v_pointer = spit_data_imports_data_import_source_ref (src_value->data[0].v_pointer);
-#line 1179 "DataImportSource.c"
+#line 1022 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1183 "DataImportSource.c"
+#line 1026 "DataImportSource.c"
 	}
 }
 
@@ -1187,37 +1030,37 @@ static void spit_data_imports_value_data_import_source_copy_value (const GValue*
 static gpointer spit_data_imports_value_data_import_source_peek_pointer (const GValue* value) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return value->data[0].v_pointer;
-#line 1191 "DataImportSource.c"
+#line 1034 "DataImportSource.c"
 }
 
 
 static gchar* spit_data_imports_value_data_import_source_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (collect_values[0].v_pointer) {
-#line 1198 "DataImportSource.c"
+#line 1041 "DataImportSource.c"
 		SpitDataImportsDataImportSource * object;
 		object = collect_values[0].v_pointer;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1205 "DataImportSource.c"
+#line 1048 "DataImportSource.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.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 1209 "DataImportSource.c"
+#line 1052 "DataImportSource.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = spit_data_imports_data_import_source_ref (object);
-#line 1213 "DataImportSource.c"
+#line 1056 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1217 "DataImportSource.c"
+#line 1060 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return NULL;
-#line 1221 "DataImportSource.c"
+#line 1064 "DataImportSource.c"
 }
 
 
@@ -1228,25 +1071,25 @@ static gchar* spit_data_imports_value_data_import_source_lcopy_value (const GVal
 	if (!object_p) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1232 "DataImportSource.c"
+#line 1075 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (!value->data[0].v_pointer) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = NULL;
-#line 1238 "DataImportSource.c"
+#line 1081 "DataImportSource.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1242 "DataImportSource.c"
+#line 1085 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		*object_p = spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1246 "DataImportSource.c"
+#line 1089 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return NULL;
-#line 1250 "DataImportSource.c"
+#line 1093 "DataImportSource.c"
 }
 
 
@@ -1260,7 +1103,7 @@ GParamSpec* spit_data_imports_param_spec_data_import_source (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return G_PARAM_SPEC (spec);
-#line 1264 "DataImportSource.c"
+#line 1107 "DataImportSource.c"
 }
 
 
@@ -1269,7 +1112,7 @@ gpointer spit_data_imports_value_get_data_import_source (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORT_SOURCE), NULL);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return value->data[0].v_pointer;
-#line 1273 "DataImportSource.c"
+#line 1116 "DataImportSource.c"
 }
 
 
@@ -1289,17 +1132,17 @@ void spit_data_imports_value_set_data_import_source (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_ref (value->data[0].v_pointer);
-#line 1293 "DataImportSource.c"
+#line 1136 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1297 "DataImportSource.c"
+#line 1140 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (old) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (old);
-#line 1303 "DataImportSource.c"
+#line 1146 "DataImportSource.c"
 	}
 }
 
@@ -1318,17 +1161,17 @@ void spit_data_imports_value_take_data_import_source (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = v_object;
-#line 1322 "DataImportSource.c"
+#line 1165 "DataImportSource.c"
 	} else {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		value->data[0].v_pointer = NULL;
-#line 1326 "DataImportSource.c"
+#line 1169 "DataImportSource.c"
 	}
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	if (old) {
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		spit_data_imports_data_import_source_unref (old);
-#line 1332 "DataImportSource.c"
+#line 1175 "DataImportSource.c"
 	}
 }
 
@@ -1340,7 +1183,7 @@ static void spit_data_imports_data_import_source_class_init (SpitDataImportsData
 	((SpitDataImportsDataImportSourceClass *) klass)->finalize = spit_data_imports_data_import_source_finalize;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsDataImportSourcePrivate));
-#line 1344 "DataImportSource.c"
+#line 1187 "DataImportSource.c"
 }
 
 
@@ -1353,7 +1196,7 @@ static void spit_data_imports_data_import_source_instance_init (SpitDataImportsD
 	self->priv->preview_md5 = NULL;
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	self->ref_count = 1;
-#line 1357 "DataImportSource.c"
+#line 1200 "DataImportSource.c"
 }
 
 
@@ -1371,7 +1214,7 @@ static void spit_data_imports_data_import_source_finalize (SpitDataImportsDataIm
 	_g_free0 (self->priv->preview_md5);
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	_metadata_date_time_unref0 (self->priv->exposure_time);
-#line 1375 "DataImportSource.c"
+#line 1218 "DataImportSource.c"
 }
 
 
@@ -1404,7 +1247,7 @@ gpointer spit_data_imports_data_import_source_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 	return instance;
-#line 1408 "DataImportSource.c"
+#line 1251 "DataImportSource.c"
 }
 
 
@@ -1417,7 +1260,7 @@ void spit_data_imports_data_import_source_unref (gpointer instance) {
 		SPIT_DATA_IMPORTS_DATA_IMPORT_SOURCE_GET_CLASS (self)->finalize (self);
 #line 17 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1421 "DataImportSource.c"
+#line 1264 "DataImportSource.c"
 	}
 }
 
diff --git a/src/data_imports/DataImportSource.vala b/src/data_imports/DataImportSource.vala
index 9d16761..ba00be3 100644
--- a/src/data_imports/DataImportSource.vala
+++ b/src/data_imports/DataImportSource.vala
@@ -58,15 +58,11 @@ public class DataImportSource {
             } else {
                 exposure_time = (metadata != null) ? metadata.get_exposure_date_time() : null;
             }
-            PhotoPreview? preview = metadata != null ? metadata.get_preview(0) : null;
-            if (preview != null) {
-                try {
-                    uint8[] preview_raw = preview.flatten();
-                    preview_md5 = md5_binary(preview_raw, preview_raw.length);
-                } catch(Error e) {
-                    warning("Could not get raw preview for %s: %s", get_filename(), e.message);
-                }
+
+            if (metadata != null) {
+                preview_md5 = metadata.thumbnail_hash();
             }
+
 #if TRACE_MD5
             debug("Photo MD5 %s: preview=%s", get_filename(), preview_md5);
 #endif
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 34a114f..47b2e0a 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -26,7 +26,7 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add71 (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 "import"
 void data_imports_terminate (void);
@@ -34,7 +34,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add71 (gchar** * array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -76,7 +76,7 @@ void data_imports_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.dataimports.fspot");
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add71 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp3_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 0c9913d..d07da46 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -442,6 +442,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -604,7 +605,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj)
 enum  {
 	SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_DUMMY_PROPERTY
 };
-static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length);
+static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length);
 static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_name (WelcomeServiceEntry* base);
 static void spit_data_imports_welcome_import_service_entry_real_execute (WelcomeServiceEntry* base);
 static void spit_data_imports_welcome_import_service_entry_finalize (GObject * obj);
@@ -623,10 +624,10 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj);
 SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
-static gint __lambda23_ (void* a, void* b);
+static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value);
+static gint __lambda25_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda23____compar_fn_t (void* key1, void* key2);
+static gint ___lambda25____compar_fn_t (void* key1, void* key2);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -668,14 +669,14 @@ SpitDataImportsCoreImporter* spit_data_imports_core_importer_construct (GType ob
 	self->priv->host = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 672 "DataImportsPluginHost.c"
+#line 673 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsCoreImporter* spit_data_imports_core_importer_new (SpitDataImportsPluginHost* host) {
 #line 14 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_core_importer_construct (SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER, host);
-#line 679 "DataImportsPluginHost.c"
+#line 680 "DataImportsPluginHost.c"
 }
 
 
@@ -684,21 +685,21 @@ static gint64 _spit_data_imports_import_job_comparator_comparator (void* a, void
 	result = spit_data_imports_import_job_comparator (a, b);
 #line 26 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 688 "DataImportsPluginHost.c"
+#line 689 "DataImportsPluginHost.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 695 "DataImportsPluginHost.c"
+#line 696 "DataImportsPluginHost.c"
 }
 
 
 static void _spit_data_imports_data_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
 #line 66 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_data_import_reporter (manifest, import_roll);
-#line 702 "DataImportsPluginHost.c"
+#line 703 "DataImportsPluginHost.c"
 }
 
 
@@ -761,7 +762,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 	_tmp8_ = items;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp8__length1 = items_length1;
-#line 765 "DataImportsPluginHost.c"
+#line 766 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsImportableMediaItem** src_item_collection = NULL;
 		gint src_item_collection_length1 = 0;
@@ -773,14 +774,14 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 		src_item_collection_length1 = _tmp8__length1;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (src_item_it = 0; src_item_it < _tmp8__length1; src_item_it = src_item_it + 1) {
-#line 777 "DataImportsPluginHost.c"
+#line 778 "DataImportsPluginHost.c"
 			SpitDataImportsImportableMediaItem* _tmp9_;
 			SpitDataImportsImportableMediaItem* src_item = NULL;
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp9_ = _g_object_ref0 (src_item_collection[src_item_it]);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			src_item = _tmp9_;
-#line 784 "DataImportsPluginHost.c"
+#line 785 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsDataImportSource* import_source = NULL;
 				SpitDataImportsImportableMediaItem* _tmp10_;
@@ -810,7 +811,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 				_tmp13_ = spit_data_imports_data_import_source_was_backing_file_found (_tmp12_);
 #line 38 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				if (!_tmp13_) {
-#line 814 "DataImportsPluginHost.c"
+#line 815 "DataImportsPluginHost.c"
 					SpitDataImportsDataImportSource* _tmp14_;
 					gchar* _tmp15_;
 					gchar* _tmp16_;
@@ -847,7 +848,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 					_g_object_unref0 (src_item);
 #line 43 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					continue;
-#line 850 "DataImportsPluginHost.c"
+#line 851 "DataImportsPluginHost.c"
 				}
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp21_ = import_source;
@@ -855,7 +856,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 				_tmp22_ = spit_data_imports_data_import_source_is_already_imported (_tmp21_);
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				if (_tmp22_) {
-#line 858 "DataImportsPluginHost.c"
+#line 859 "DataImportsPluginHost.c"
 					SpitDataImportsDataImportSource* _tmp23_;
 					gchar* _tmp24_;
 					gchar* _tmp25_;
@@ -892,7 +893,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 					_g_object_unref0 (src_item);
 #line 51 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					continue;
-#line 894 "DataImportsPluginHost.c"
+#line 895 "DataImportsPluginHost.c"
 				}
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp30_ = jobs;
@@ -924,7 +925,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 				_spit_data_imports_data_import_source_unref0 (import_source);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (src_item);
-#line 926 "DataImportsPluginHost.c"
+#line 927 "DataImportsPluginHost.c"
 			}
 		}
 	}
@@ -936,7 +937,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 	_tmp41_ = _tmp40_;
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp41_ > 0) {
-#line 938 "DataImportsPluginHost.c"
+#line 939 "DataImportsPluginHost.c"
 		BatchImportRoll* _tmp42_;
 		gchar* db_name = NULL;
 		SpitDataImportsPluginHost* _tmp44_;
@@ -965,7 +966,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 		_tmp42_ = self->current_import_roll;
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp42_ == NULL) {
-#line 967 "DataImportsPluginHost.c"
+#line 968 "DataImportsPluginHost.c"
 			BatchImportRoll* _tmp43_;
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp43_ = batch_import_roll_new ();
@@ -973,7 +974,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 			_batch_import_roll_unref0 (self->current_import_roll);
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			self->current_import_roll = _tmp43_;
-#line 975 "DataImportsPluginHost.c"
+#line 976 "DataImportsPluginHost.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp44_ = self->priv->host;
@@ -1035,7 +1036,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 		_g_object_unref0 (batch_import);
 #line 59 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_free0 (db_name);
-#line 1037 "DataImportsPluginHost.c"
+#line 1038 "DataImportsPluginHost.c"
 	}
 #line 73 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp65_ = self->priv->host;
@@ -1051,7 +1052,7 @@ void spit_data_imports_core_importer_prepare_media_items_for_import (SpitDataImp
 	_g_object_unref0 (already_imported);
 #line 18 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (jobs);
-#line 1053 "DataImportsPluginHost.c"
+#line 1054 "DataImportsPluginHost.c"
 }
 
 
@@ -1127,14 +1128,14 @@ void spit_data_imports_core_importer_finalize_import (SpitDataImportsCoreImporte
 	_g_object_unref0 (batch_import);
 #line 76 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (db_name);
-#line 1129 "DataImportsPluginHost.c"
+#line 1130 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_value_core_importer_init (GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	value->data[0].v_pointer = NULL;
-#line 1136 "DataImportsPluginHost.c"
+#line 1137 "DataImportsPluginHost.c"
 }
 
 
@@ -1143,7 +1144,7 @@ static void spit_data_imports_value_core_importer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (value->data[0].v_pointer);
-#line 1145 "DataImportsPluginHost.c"
+#line 1146 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1153,11 +1154,11 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = spit_data_imports_core_importer_ref (src_value->data[0].v_pointer);
-#line 1155 "DataImportsPluginHost.c"
+#line 1156 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1159 "DataImportsPluginHost.c"
+#line 1160 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1165,37 +1166,37 @@ static void spit_data_imports_value_core_importer_copy_value (const GValue* src_
 static gpointer spit_data_imports_value_core_importer_peek_pointer (const GValue* value) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1167 "DataImportsPluginHost.c"
+#line 1168 "DataImportsPluginHost.c"
 }
 
 
 static gchar* spit_data_imports_value_core_importer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (collect_values[0].v_pointer) {
-#line 1174 "DataImportsPluginHost.c"
+#line 1175 "DataImportsPluginHost.c"
 		SpitDataImportsCoreImporter * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1181 "DataImportsPluginHost.c"
+#line 1182 "DataImportsPluginHost.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.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 1185 "DataImportsPluginHost.c"
+#line 1186 "DataImportsPluginHost.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = spit_data_imports_core_importer_ref (object);
-#line 1189 "DataImportsPluginHost.c"
+#line 1190 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1193 "DataImportsPluginHost.c"
+#line 1194 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1197 "DataImportsPluginHost.c"
+#line 1198 "DataImportsPluginHost.c"
 }
 
 
@@ -1206,25 +1207,25 @@ static gchar* spit_data_imports_value_core_importer_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1208 "DataImportsPluginHost.c"
+#line 1209 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (!value->data[0].v_pointer) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = NULL;
-#line 1214 "DataImportsPluginHost.c"
+#line 1215 "DataImportsPluginHost.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1218 "DataImportsPluginHost.c"
+#line 1219 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*object_p = spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1222 "DataImportsPluginHost.c"
+#line 1223 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return NULL;
-#line 1226 "DataImportsPluginHost.c"
+#line 1227 "DataImportsPluginHost.c"
 }
 
 
@@ -1238,7 +1239,7 @@ GParamSpec* spit_data_imports_param_spec_core_importer (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return G_PARAM_SPEC (spec);
-#line 1240 "DataImportsPluginHost.c"
+#line 1241 "DataImportsPluginHost.c"
 }
 
 
@@ -1247,7 +1248,7 @@ gpointer spit_data_imports_value_get_core_importer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SPIT_DATA_IMPORTS_TYPE_CORE_IMPORTER), NULL);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return value->data[0].v_pointer;
-#line 1249 "DataImportsPluginHost.c"
+#line 1250 "DataImportsPluginHost.c"
 }
 
 
@@ -1267,17 +1268,17 @@ void spit_data_imports_value_set_core_importer (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_ref (value->data[0].v_pointer);
-#line 1269 "DataImportsPluginHost.c"
+#line 1270 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1273 "DataImportsPluginHost.c"
+#line 1274 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1279 "DataImportsPluginHost.c"
+#line 1280 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1296,17 +1297,17 @@ void spit_data_imports_value_take_core_importer (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = v_object;
-#line 1298 "DataImportsPluginHost.c"
+#line 1299 "DataImportsPluginHost.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		value->data[0].v_pointer = NULL;
-#line 1302 "DataImportsPluginHost.c"
+#line 1303 "DataImportsPluginHost.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (old) {
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_core_importer_unref (old);
-#line 1308 "DataImportsPluginHost.c"
+#line 1309 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1318,7 +1319,7 @@ static void spit_data_imports_core_importer_class_init (SpitDataImportsCoreImpor
 	((SpitDataImportsCoreImporterClass *) klass)->finalize = spit_data_imports_core_importer_finalize;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_type_class_add_private (klass, sizeof (SpitDataImportsCoreImporterPrivate));
-#line 1320 "DataImportsPluginHost.c"
+#line 1321 "DataImportsPluginHost.c"
 }
 
 
@@ -1331,7 +1332,7 @@ static void spit_data_imports_core_importer_instance_init (SpitDataImportsCoreIm
 	self->current_import_roll = NULL;
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->ref_count = 1;
-#line 1333 "DataImportsPluginHost.c"
+#line 1334 "DataImportsPluginHost.c"
 }
 
 
@@ -1343,7 +1344,7 @@ static void spit_data_imports_core_importer_finalize (SpitDataImportsCoreImporte
 	g_signal_handlers_destroy (self);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_batch_import_roll_unref0 (self->current_import_roll);
-#line 1345 "DataImportsPluginHost.c"
+#line 1346 "DataImportsPluginHost.c"
 }
 
 
@@ -1368,7 +1369,7 @@ gpointer spit_data_imports_core_importer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return instance;
-#line 1370 "DataImportsPluginHost.c"
+#line 1371 "DataImportsPluginHost.c"
 }
 
 
@@ -1381,7 +1382,7 @@ void spit_data_imports_core_importer_unref (gpointer instance) {
 		SPIT_DATA_IMPORTS_CORE_IMPORTER_GET_CLASS (self)->finalize (self);
 #line 9 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1383 "DataImportsPluginHost.c"
+#line 1384 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1421,14 +1422,14 @@ SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_
 	self->priv->core_importer = _tmp4_;
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 1423 "DataImportsPluginHost.c"
+#line 1424 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsConcreteDataImportsHost* spit_data_imports_concrete_data_imports_host_new (SpitDataImportsService* service, DataImportsUIDataImportsDialog* dialog) {
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_concrete_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_CONCRETE_DATA_IMPORTS_HOST, service, dialog);
-#line 1430 "DataImportsPluginHost.c"
+#line 1431 "DataImportsPluginHost.c"
 }
 
 
@@ -1447,7 +1448,7 @@ static SpitDataImportsDataImporter* spit_data_imports_concrete_data_imports_host
 	result = _tmp1_;
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 1449 "DataImportsPluginHost.c"
+#line 1450 "DataImportsPluginHost.c"
 }
 
 
@@ -1475,7 +1476,7 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
 	if (_tmp3_) {
 #line 110 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1477 "DataImportsPluginHost.c"
+#line 1478 "DataImportsPluginHost.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:112: ConcreteDataImportsHost.start_importin" \
@@ -1488,7 +1489,7 @@ static void spit_data_imports_concrete_data_imports_host_real_start_importing (S
 	spit_data_imports_data_importer_start (_tmp5_);
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1489 "DataImportsPluginHost.c"
+#line 1490 "DataImportsPluginHost.c"
 }
 
 
@@ -1515,7 +1516,7 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
 	_g_object_unref0 (_tmp1_);
 #line 120 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_) {
-#line 1515 "DataImportsPluginHost.c"
+#line 1516 "DataImportsPluginHost.c"
 		SpitDataImportsDataImporter* _tmp4_;
 		SpitDataImportsDataImporter* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -1526,13 +1527,13 @@ static void spit_data_imports_concrete_data_imports_host_real_stop_importing (Sp
 		spit_data_imports_data_importer_stop (_tmp5_);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1526 "DataImportsPluginHost.c"
+#line 1527 "DataImportsPluginHost.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 125 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 1532 "DataImportsPluginHost.c"
+#line 1533 "DataImportsPluginHost.c"
 }
 
 
@@ -1543,7 +1544,7 @@ static void spit_data_imports_concrete_data_imports_host_clean_up (SpitDataImpor
 	_g_object_unref0 (self->priv->progress_pane);
 #line 129 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->progress_pane = NULL;
-#line 1543 "DataImportsPluginHost.c"
+#line 1544 "DataImportsPluginHost.c"
 }
 
 
@@ -1555,31 +1556,31 @@ void spit_data_imports_concrete_data_imports_host_set_button_mode (SpitDataImpor
 	_tmp0_ = mode;
 #line 133 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 1555 "DataImportsPluginHost.c"
+#line 1556 "DataImportsPluginHost.c"
 		DataImportsUIDataImportsDialog* _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 134 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (_tmp1_);
-#line 1561 "DataImportsPluginHost.c"
+#line 1562 "DataImportsPluginHost.c"
 	} else {
 		SpitDataImportsPluginHostButtonMode _tmp2_;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp2_ = mode;
 #line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp2_ == SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1568 "DataImportsPluginHost.c"
+#line 1569 "DataImportsPluginHost.c"
 			DataImportsUIDataImportsDialog* _tmp3_;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp3_ = self->priv->dialog;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			data_imports_ui_data_imports_dialog_set_cancel_button_mode (_tmp3_);
-#line 1574 "DataImportsPluginHost.c"
+#line 1575 "DataImportsPluginHost.c"
 		} else {
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			g_error ("DataImportsPluginHost.vala:138: unrecognized button mode enumeration v" \
 "alue");
-#line 1578 "DataImportsPluginHost.c"
+#line 1579 "DataImportsPluginHost.c"
 		}
 	}
 }
@@ -1597,7 +1598,7 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error (SpitDa
 	_tmp1_ = _tmp0_->message;
 #line 144 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 1596 "DataImportsPluginHost.c"
+#line 1597 "DataImportsPluginHost.c"
 }
 
 
@@ -1701,7 +1702,7 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message
 	spit_data_imports_concrete_data_imports_host_clean_up (self);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 1700 "DataImportsPluginHost.c"
+#line 1701 "DataImportsPluginHost.c"
 }
 
 
@@ -1733,7 +1734,7 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 	if (_tmp3_) {
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = TRUE;
-#line 1731 "DataImportsPluginHost.c"
+#line 1732 "DataImportsPluginHost.c"
 	} else {
 		SpitDataImportsDataImporter* _tmp4_;
 		SpitDataImportsDataImporter* _tmp5_;
@@ -1748,13 +1749,13 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 		_tmp0_ = !_tmp6_;
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1746 "DataImportsPluginHost.c"
+#line 1747 "DataImportsPluginHost.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 170 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 1752 "DataImportsPluginHost.c"
+#line 1753 "DataImportsPluginHost.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp7_ = self->priv->dialog;
@@ -1766,7 +1767,7 @@ static void spit_data_imports_concrete_data_imports_host_real_install_dialog_pan
 	_tmp9_ = button_mode;
 #line 174 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, _tmp9_);
-#line 1764 "DataImportsPluginHost.c"
+#line 1765 "DataImportsPluginHost.c"
 }
 
 
@@ -1797,7 +1798,7 @@ static void spit_data_imports_concrete_data_imports_host_real_install_static_mes
 	data_imports_ui_data_imports_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 182 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1795 "DataImportsPluginHost.c"
+#line 1796 "DataImportsPluginHost.c"
 }
 
 
@@ -1816,23 +1817,23 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
 	_tmp1__length1 = discovered_libraries_length1;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp1__length1 == 0) {
-#line 1814 "DataImportsPluginHost.c"
+#line 1815 "DataImportsPluginHost.c"
 		const gchar* _tmp2_;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp2_ = file_select_label;
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1820 "DataImportsPluginHost.c"
+#line 1821 "DataImportsPluginHost.c"
 	} else {
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = FALSE;
-#line 1824 "DataImportsPluginHost.c"
+#line 1825 "DataImportsPluginHost.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), "Libraries or file option needed");
-#line 1830 "DataImportsPluginHost.c"
+#line 1831 "DataImportsPluginHost.c"
 	} else {
 		DataImportsUIDataImportsDialog* _tmp3_;
 		const gchar* _tmp4_;
@@ -1859,11 +1860,11 @@ static void spit_data_imports_concrete_data_imports_host_real_install_library_se
 		data_imports_ui_data_imports_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
 #line 193 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1857 "DataImportsPluginHost.c"
+#line 1858 "DataImportsPluginHost.c"
 	}
 #line 199 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_concrete_data_imports_host_set_button_mode (self, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 1861 "DataImportsPluginHost.c"
+#line 1862 "DataImportsPluginHost.c"
 }
 
 
@@ -1905,7 +1906,7 @@ static void spit_data_imports_concrete_data_imports_host_real_install_import_pro
 	_batch_import_roll_unref0 (_tmp5_->current_import_roll);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp5_->current_import_roll = NULL;
-#line 1903 "DataImportsPluginHost.c"
+#line 1904 "DataImportsPluginHost.c"
 }
 
 
@@ -1918,7 +1919,7 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
 	_tmp0_ = self->priv->progress_pane;
 #line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp0_ != NULL) {
-#line 1916 "DataImportsPluginHost.c"
+#line 1917 "DataImportsPluginHost.c"
 		DataImportsUIProgressPane* _tmp1_;
 		gdouble _tmp2_;
 		const gchar* _tmp3_;
@@ -1930,7 +1931,7 @@ static void spit_data_imports_concrete_data_imports_host_real_update_import_prog
 		_tmp3_ = progress_message;
 #line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		data_imports_ui_progress_pane_update_progress (_tmp1_, _tmp2_, _tmp3_);
-#line 1928 "DataImportsPluginHost.c"
+#line 1929 "DataImportsPluginHost.c"
 	}
 }
 
@@ -1959,7 +1960,7 @@ static void spit_data_imports_concrete_data_imports_host_real_prepare_media_item
 	_tmp4_ = progress_message;
 #line 228 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 1957 "DataImportsPluginHost.c"
+#line 1958 "DataImportsPluginHost.c"
 }
 
 
@@ -2001,7 +2002,7 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
 	_tmp6_ = _tmp5_->imported_items_count;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp6_ > 0) {
-#line 1999 "DataImportsPluginHost.c"
+#line 2000 "DataImportsPluginHost.c"
 		LibraryWindow* _tmp7_;
 		LibraryWindow* _tmp8_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2012,7 +2013,7 @@ static void spit_data_imports_concrete_data_imports_host_real_finalize_import (S
 		library_window_switch_to_import_queue_page (_tmp8_);
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2010 "DataImportsPluginHost.c"
+#line 2011 "DataImportsPluginHost.c"
 	}
 }
 
@@ -2024,7 +2025,7 @@ static void spit_data_imports_concrete_data_imports_host_class_init (SpitDataImp
 	g_type_class_add_private (klass, sizeof (SpitDataImportsConcreteDataImportsHostPrivate));
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_concrete_data_imports_host_finalize;
-#line 2022 "DataImportsPluginHost.c"
+#line 2023 "DataImportsPluginHost.c"
 }
 
 
@@ -2055,7 +2056,7 @@ static void spit_data_imports_concrete_data_imports_host_spit_data_imports_plugi
 	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_concrete_data_imports_host_real_prepare_media_items_for_import;
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_concrete_data_imports_host_real_finalize_import;
-#line 2053 "DataImportsPluginHost.c"
+#line 2054 "DataImportsPluginHost.c"
 }
 
 
@@ -2070,7 +2071,7 @@ static void spit_data_imports_concrete_data_imports_host_instance_init (SpitData
 	self->priv->progress_pane = NULL;
 #line 93 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2068 "DataImportsPluginHost.c"
+#line 2069 "DataImportsPluginHost.c"
 }
 
 
@@ -2086,7 +2087,7 @@ static void spit_data_imports_concrete_data_imports_host_finalize (GObject * obj
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 87 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_concrete_data_imports_host_parent_class)->finalize (obj);
-#line 2084 "DataImportsPluginHost.c"
+#line 2085 "DataImportsPluginHost.c"
 }
 
 
@@ -2139,14 +2140,14 @@ SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_ho
 	self->priv->meta_host = _tmp4_;
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2137 "DataImportsPluginHost.c"
+#line 2138 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeDataImportsHost* spit_data_imports_welcome_data_imports_host_new (SpitDataImportsService* service, SpitDataImportsWelcomeImportMetaHost* meta_host) {
 #line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_data_imports_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, service, meta_host);
-#line 2144 "DataImportsPluginHost.c"
+#line 2145 "DataImportsPluginHost.c"
 }
 
 
@@ -2165,7 +2166,7 @@ static SpitDataImportsDataImporter* spit_data_imports_welcome_data_imports_host_
 	result = _tmp1_;
 #line 261 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2163 "DataImportsPluginHost.c"
+#line 2164 "DataImportsPluginHost.c"
 }
 
 
@@ -2193,7 +2194,7 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
 	if (_tmp3_) {
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		return;
-#line 2191 "DataImportsPluginHost.c"
+#line 2192 "DataImportsPluginHost.c"
 	}
 #line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:268: WelcomeDataImportsHost.start_importing" \
@@ -2206,7 +2207,7 @@ static void spit_data_imports_welcome_data_imports_host_real_start_importing (Sp
 	spit_data_imports_data_importer_start (_tmp5_);
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2203 "DataImportsPluginHost.c"
+#line 2204 "DataImportsPluginHost.c"
 }
 
 
@@ -2233,7 +2234,7 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
 	_g_object_unref0 (_tmp1_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_) {
-#line 2229 "DataImportsPluginHost.c"
+#line 2230 "DataImportsPluginHost.c"
 		SpitDataImportsDataImporter* _tmp4_;
 		SpitDataImportsDataImporter* _tmp5_;
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2244,20 +2245,20 @@ static void spit_data_imports_welcome_data_imports_host_real_stop_importing (Spi
 		spit_data_imports_data_importer_stop (_tmp5_);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2240 "DataImportsPluginHost.c"
+#line 2241 "DataImportsPluginHost.c"
 	}
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = TRUE;
-#line 2246 "DataImportsPluginHost.c"
+#line 2247 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_data_imports_host_clean_up (SpitDataImportsWelcomeDataImportsHost* self) {
 #line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_WELCOME_DATA_IMPORTS_HOST (self));
-#line 2253 "DataImportsPluginHost.c"
+#line 2254 "DataImportsPluginHost.c"
 }
 
 
@@ -2273,7 +2274,7 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error (SpitDat
 	_tmp1_ = _tmp0_->message;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_post_error_message (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost), _tmp1_);
-#line 2269 "DataImportsPluginHost.c"
+#line 2270 "DataImportsPluginHost.c"
 }
 
 
@@ -2322,7 +2323,7 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message
 	spit_data_imports_welcome_data_imports_host_clean_up (self);
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_g_free0 (msg);
-#line 2318 "DataImportsPluginHost.c"
+#line 2319 "DataImportsPluginHost.c"
 }
 
 
@@ -2332,7 +2333,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_dialog_pane
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 2328 "DataImportsPluginHost.c"
+#line 2329 "DataImportsPluginHost.c"
 }
 
 
@@ -2342,7 +2343,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_static_mess
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2338 "DataImportsPluginHost.c"
+#line 2339 "DataImportsPluginHost.c"
 }
 
 
@@ -2389,7 +2390,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 	_tmp7__length1 = discovered_libraries_length1;
 #line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp7__length1 > 0) {
-#line 2385 "DataImportsPluginHost.c"
+#line 2386 "DataImportsPluginHost.c"
 		SpitDataImportsWelcomeImportMetaHost* _tmp8_;
 		SpitDataImportsDataImporter* _tmp9_;
 		SpitDataImportsDataImporter* _tmp10_;
@@ -2428,7 +2429,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_library_sel
 		_g_object_unref0 (_tmp12_);
 #line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_tmp10_);
-#line 2424 "DataImportsPluginHost.c"
+#line 2425 "DataImportsPluginHost.c"
 	}
 }
 
@@ -2439,7 +2440,7 @@ static void spit_data_imports_welcome_data_imports_host_real_install_import_prog
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
 #line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
-#line 2435 "DataImportsPluginHost.c"
+#line 2436 "DataImportsPluginHost.c"
 }
 
 
@@ -2447,7 +2448,7 @@ static void spit_data_imports_welcome_data_imports_host_real_update_import_progr
 	SpitDataImportsWelcomeDataImportsHost * self;
 #line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_DATA_IMPORTS_TYPE_WELCOME_DATA_IMPORTS_HOST, SpitDataImportsWelcomeDataImportsHost);
-#line 2443 "DataImportsPluginHost.c"
+#line 2444 "DataImportsPluginHost.c"
 }
 
 
@@ -2475,7 +2476,7 @@ static void spit_data_imports_welcome_data_imports_host_real_prepare_media_items
 	_tmp4_ = progress_message;
 #line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_core_importer_prepare_media_items_for_import (_tmp0_, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_);
-#line 2471 "DataImportsPluginHost.c"
+#line 2472 "DataImportsPluginHost.c"
 }
 
 
@@ -2507,7 +2508,7 @@ static void spit_data_imports_welcome_data_imports_host_real_finalize_import (Sp
 	_tmp4_ = self->priv->meta_host;
 #line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_welcome_import_meta_host_finalize_import (_tmp4_, self);
-#line 2503 "DataImportsPluginHost.c"
+#line 2504 "DataImportsPluginHost.c"
 }
 
 
@@ -2518,7 +2519,7 @@ static void spit_data_imports_welcome_data_imports_host_class_init (SpitDataImpo
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeDataImportsHostPrivate));
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_data_imports_host_finalize;
-#line 2514 "DataImportsPluginHost.c"
+#line 2515 "DataImportsPluginHost.c"
 }
 
 
@@ -2549,7 +2550,7 @@ static void spit_data_imports_welcome_data_imports_host_spit_data_imports_plugin
 	iface->prepare_media_items_for_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportableMediaItem**, int, gdouble, gdouble, const gchar*)) spit_data_imports_welcome_data_imports_host_real_prepare_media_items_for_import;
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->finalize_import = (void (*) (SpitDataImportsPluginHost *, SpitDataImportsImportedItemsCountCallback, void*, const gchar*)) spit_data_imports_welcome_data_imports_host_real_finalize_import;
-#line 2545 "DataImportsPluginHost.c"
+#line 2546 "DataImportsPluginHost.c"
 }
 
 
@@ -2560,7 +2561,7 @@ static void spit_data_imports_welcome_data_imports_host_instance_init (SpitDataI
 	self->priv->active_importer = NULL;
 #line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv->importing_halted = FALSE;
-#line 2556 "DataImportsPluginHost.c"
+#line 2557 "DataImportsPluginHost.c"
 }
 
 
@@ -2574,7 +2575,7 @@ static void spit_data_imports_welcome_data_imports_host_finalize (GObject * obj)
 	_spit_data_imports_core_importer_unref0 (self->priv->core_importer);
 #line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_data_imports_host_parent_class)->finalize (obj);
-#line 2570 "DataImportsPluginHost.c"
+#line 2571 "DataImportsPluginHost.c"
 }
 
 
@@ -2592,24 +2593,24 @@ GType spit_data_imports_welcome_data_imports_host_get_type (void) {
 }
 
 
-static SpitDataImportsImportableLibrary** _vala_array_dup25 (SpitDataImportsImportableLibrary** self, int length) {
+static SpitDataImportsImportableLibrary** _vala_array_dup21 (SpitDataImportsImportableLibrary** self, int length) {
 	SpitDataImportsImportableLibrary** result;
 	int i;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = g_new0 (SpitDataImportsImportableLibrary*, length + 1);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	for (i = 0; i < length; i++) {
-#line 2595 "DataImportsPluginHost.c"
+#line 2596 "DataImportsPluginHost.c"
 		SpitDataImportsImportableLibrary* _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		result[i] = _tmp0_;
-#line 2601 "DataImportsPluginHost.c"
+#line 2602 "DataImportsPluginHost.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2605 "DataImportsPluginHost.c"
+#line 2606 "DataImportsPluginHost.c"
 }
 
 
@@ -2650,7 +2651,7 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp4__length1 = discovered_libraries_length1;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup25 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
+	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup21 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp5__length1 = _tmp4__length1;
 #line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2663,14 +2664,14 @@ SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_servi
 	self->priv->_discovered_libraries_size_ = self->priv->discovered_libraries_length1;
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2659 "DataImportsPluginHost.c"
+#line 2660 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeImportServiceEntry* spit_data_imports_welcome_import_service_entry_new (SpitDataImportsPluginHost* host, const gchar* pluggable_name, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1) {
 #line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_service_entry_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_SERVICE_ENTRY, host, pluggable_name, discovered_libraries, discovered_libraries_length1);
-#line 2666 "DataImportsPluginHost.c"
+#line 2667 "DataImportsPluginHost.c"
 }
 
 
@@ -2689,7 +2690,7 @@ static gchar* spit_data_imports_welcome_import_service_entry_real_get_service_na
 	result = _tmp1_;
 #line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 2685 "DataImportsPluginHost.c"
+#line 2686 "DataImportsPluginHost.c"
 }
 
 
@@ -2703,7 +2704,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 	_tmp0_ = self->priv->discovered_libraries;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp0__length1 = self->priv->discovered_libraries_length1;
-#line 2699 "DataImportsPluginHost.c"
+#line 2700 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsImportableLibrary** library_collection = NULL;
 		gint library_collection_length1 = 0;
@@ -2715,14 +2716,14 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 		library_collection_length1 = _tmp0__length1;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (library_it = 0; library_it < _tmp0__length1; library_it = library_it + 1) {
-#line 2711 "DataImportsPluginHost.c"
+#line 2712 "DataImportsPluginHost.c"
 			SpitDataImportsImportableLibrary* _tmp1_;
 			SpitDataImportsImportableLibrary* library = NULL;
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp1_ = _g_object_ref0 (library_collection[library_it]);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			library = _tmp1_;
-#line 2718 "DataImportsPluginHost.c"
+#line 2719 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsPluginHost* _tmp2_;
 				SpitDataImportsDataImporter* _tmp3_;
@@ -2742,7 +2743,7 @@ static void spit_data_imports_welcome_import_service_entry_real_execute (Welcome
 				_g_object_unref0 (_tmp4_);
 #line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (library);
-#line 2738 "DataImportsPluginHost.c"
+#line 2739 "DataImportsPluginHost.c"
 			}
 		}
 	}
@@ -2756,7 +2757,7 @@ static void spit_data_imports_welcome_import_service_entry_class_init (SpitDataI
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportServiceEntryPrivate));
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_service_entry_finalize;
-#line 2752 "DataImportsPluginHost.c"
+#line 2753 "DataImportsPluginHost.c"
 }
 
 
@@ -2767,14 +2768,14 @@ static void spit_data_imports_welcome_import_service_entry_welcome_service_entry
 	iface->get_service_name = (gchar* (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_get_service_name;
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	iface->execute = (void (*) (WelcomeServiceEntry *)) spit_data_imports_welcome_import_service_entry_real_execute;
-#line 2763 "DataImportsPluginHost.c"
+#line 2764 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_import_service_entry_instance_init (SpitDataImportsWelcomeImportServiceEntry * self) {
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_SERVICE_ENTRY_GET_PRIVATE (self);
-#line 2770 "DataImportsPluginHost.c"
+#line 2771 "DataImportsPluginHost.c"
 }
 
 
@@ -2790,7 +2791,7 @@ static void spit_data_imports_welcome_import_service_entry_finalize (GObject * o
 	_g_object_unref0 (self->priv->host);
 #line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_service_entry_parent_class)->finalize (obj);
-#line 2786 "DataImportsPluginHost.c"
+#line 2787 "DataImportsPluginHost.c"
 }
 
 
@@ -2826,14 +2827,14 @@ SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host
 	self->priv->dialog = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return self;
-#line 2822 "DataImportsPluginHost.c"
+#line 2823 "DataImportsPluginHost.c"
 }
 
 
 SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog) {
 #line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return spit_data_imports_welcome_import_meta_host_construct (SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, dialog);
-#line 2829 "DataImportsPluginHost.c"
+#line 2830 "DataImportsPluginHost.c"
 }
 
 
@@ -2859,7 +2860,7 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 	_tmp2_ = services;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp2__length1 = services_length1;
-#line 2855 "DataImportsPluginHost.c"
+#line 2856 "DataImportsPluginHost.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2871,14 +2872,14 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 		service_collection_length1 = _tmp2__length1;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		for (service_it = 0; service_it < _tmp2__length1; service_it = service_it + 1) {
-#line 2867 "DataImportsPluginHost.c"
+#line 2868 "DataImportsPluginHost.c"
 			SpitDataImportsService* _tmp3_;
 			SpitDataImportsService* service = NULL;
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp3_ = _g_object_ref0 (service_collection[service_it]);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			service = _tmp3_;
-#line 2874 "DataImportsPluginHost.c"
+#line 2875 "DataImportsPluginHost.c"
 			{
 				SpitDataImportsWelcomeDataImportsHost* host = NULL;
 				SpitDataImportsService* _tmp4_;
@@ -2898,13 +2899,13 @@ void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImp
 				_g_object_unref0 (host);
 #line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_g_object_unref0 (service);
-#line 2894 "DataImportsPluginHost.c"
+#line 2895 "DataImportsPluginHost.c"
 			}
 		}
 	}
 #line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2900 "DataImportsPluginHost.c"
+#line 2901 "DataImportsPluginHost.c"
 }
 
 
@@ -2918,7 +2919,7 @@ void spit_data_imports_welcome_import_meta_host_finalize_import (SpitDataImports
 	_tmp0_ = host;
 #line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 2914 "DataImportsPluginHost.c"
+#line 2915 "DataImportsPluginHost.c"
 }
 
 
@@ -2956,7 +2957,7 @@ void spit_data_imports_welcome_import_meta_host_install_service_entry (SpitDataI
 	_tmp6_ = entry;
 #line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	welcome_dialog_install_service_entry (_tmp5_, _tmp6_);
-#line 2952 "DataImportsPluginHost.c"
+#line 2953 "DataImportsPluginHost.c"
 }
 
 
@@ -2967,14 +2968,14 @@ static void spit_data_imports_welcome_import_meta_host_class_init (SpitDataImpor
 	g_type_class_add_private (klass, sizeof (SpitDataImportsWelcomeImportMetaHostPrivate));
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_data_imports_welcome_import_meta_host_finalize;
-#line 2963 "DataImportsPluginHost.c"
+#line 2964 "DataImportsPluginHost.c"
 }
 
 
 static void spit_data_imports_welcome_import_meta_host_instance_init (SpitDataImportsWelcomeImportMetaHost * self) {
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	self->priv = SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_PRIVATE (self);
-#line 2970 "DataImportsPluginHost.c"
+#line 2971 "DataImportsPluginHost.c"
 }
 
 
@@ -2986,7 +2987,7 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject * obj)
 	_g_object_unref0 (self->priv->dialog);
 #line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	G_OBJECT_CLASS (spit_data_imports_welcome_import_meta_host_parent_class)->finalize (obj);
-#line 2982 "DataImportsPluginHost.c"
+#line 2983 "DataImportsPluginHost.c"
 }
 
 
@@ -3018,34 +3019,34 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length
 	if (result_length1) {
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*result_length1 = _tmp2__length1;
-#line 3014 "DataImportsPluginHost.c"
+#line 3015 "DataImportsPluginHost.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3020 "DataImportsPluginHost.c"
+#line 3021 "DataImportsPluginHost.c"
 }
 
 
-static void _vala_array_add69 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
+static void _vala_array_add72 (SpitDataImportsService** * array, int* length, int* size, SpitDataImportsService* value) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if ((*length) == (*size)) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*array = g_renew (SpitDataImportsService*, *array, (*size) + 1);
-#line 3031 "DataImportsPluginHost.c"
+#line 3032 "DataImportsPluginHost.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[(*length)++] = value;
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	(*array)[*length] = NULL;
-#line 3037 "DataImportsPluginHost.c"
+#line 3038 "DataImportsPluginHost.c"
 }
 
 
-static gint __lambda23_ (void* a, void* b) {
+static gint __lambda25_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	const gchar* _tmp1_;
@@ -3066,16 +3067,16 @@ static gint __lambda23_ (void* a, void* b) {
 	result = _tmp4_;
 #line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3062 "DataImportsPluginHost.c"
+#line 3063 "DataImportsPluginHost.c"
 }
 
 
-static gint ___lambda23____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda25____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda23_ (key1, key2);
+	result = __lambda25_ (key1, key2);
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3071 "DataImportsPluginHost.c"
+#line 3072 "DataImportsPluginHost.c"
 }
 
 
@@ -3120,7 +3121,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_debug ("DataImportsPluginHost.vala:429: DataImportsDialog: discovered %d plugg" \
 "able data import services.", _tmp5_);
-#line 3115 "DataImportsPluginHost.c"
+#line 3116 "DataImportsPluginHost.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
 		GeeCollection* _tmp6_;
@@ -3133,7 +3134,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 		_pluggable_it = _tmp7_;
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		while (TRUE) {
-#line 3128 "DataImportsPluginHost.c"
+#line 3129 "DataImportsPluginHost.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			SpitPluggable* pluggable = NULL;
@@ -3160,7 +3161,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 			if (!_tmp9_) {
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				break;
-#line 3155 "DataImportsPluginHost.c"
+#line 3156 "DataImportsPluginHost.c"
 			}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp10_ = _pluggable_it;
@@ -3178,7 +3179,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 			_tmp14_ = pluggable_interface;
 #line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			if (_tmp14_ != SPIT_DATA_IMPORTS_CURRENT_INTERFACE) {
-#line 3173 "DataImportsPluginHost.c"
+#line 3174 "DataImportsPluginHost.c"
 				SpitPluggable* _tmp15_;
 				gchar* _tmp16_;
 				gchar* _tmp17_;
@@ -3200,7 +3201,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 				_g_object_unref0 (pluggable);
 #line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				continue;
-#line 3194 "DataImportsPluginHost.c"
+#line 3195 "DataImportsPluginHost.c"
 			}
 #line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp19_ = pluggable;
@@ -3224,16 +3225,16 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_vala_array_add69 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
+			_vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (service);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (pluggable);
-#line 3222 "DataImportsPluginHost.c"
+#line 3223 "DataImportsPluginHost.c"
 		}
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 3226 "DataImportsPluginHost.c"
+#line 3227 "DataImportsPluginHost.c"
 	}
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp26_ = loaded_services;
@@ -3244,7 +3245,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp27__length1 = loaded_services_length1;
 #line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda23____compar_fn_t);
+	qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda25____compar_fn_t);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp28_ = loaded_services;
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3253,7 +3254,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 	if (result_length1) {
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		*result_length1 = _tmp28__length1;
-#line 3246 "DataImportsPluginHost.c"
+#line 3247 "DataImportsPluginHost.c"
 	}
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	result = _tmp28_;
@@ -3261,7 +3262,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 	_g_object_unref0 (pluggables);
 #line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3254 "DataImportsPluginHost.c"
+#line 3255 "DataImportsPluginHost.c"
 }
 
 
@@ -3284,13 +3285,13 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 	_tmp3_ = _tmp2_;
 #line 463 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if (_tmp3_ > 0) {
-#line 3277 "DataImportsPluginHost.c"
+#line 3278 "DataImportsPluginHost.c"
 		ImportManifest* _tmp4_;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		_tmp4_ = spit_data_imports_meta_manifest;
 #line 464 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		if (_tmp4_ == NULL) {
-#line 3283 "DataImportsPluginHost.c"
+#line 3284 "DataImportsPluginHost.c"
 			ImportManifest* _tmp5_;
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp5_ = import_manifest_new (NULL, NULL);
@@ -3298,7 +3299,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 			_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 465 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			spit_data_imports_meta_manifest = _tmp5_;
-#line 3291 "DataImportsPluginHost.c"
+#line 3292 "DataImportsPluginHost.c"
 		}
 		{
 			GeeList* _result_list = NULL;
@@ -3330,7 +3331,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 			_result_index = -1;
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			while (TRUE) {
-#line 3323 "DataImportsPluginHost.c"
+#line 3324 "DataImportsPluginHost.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
@@ -3352,7 +3353,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 				if (!(_tmp13_ < _tmp14_)) {
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 					break;
-#line 3345 "DataImportsPluginHost.c"
+#line 3346 "DataImportsPluginHost.c"
 				}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_tmp15_ = _result_list;
@@ -3370,11 +3371,11 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 				import_manifest_add_result (_tmp18_, _tmp19_);
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 				_batch_import_result_unref0 (_result_);
-#line 3363 "DataImportsPluginHost.c"
+#line 3364 "DataImportsPluginHost.c"
 			}
 #line 466 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (_result_list);
-#line 3367 "DataImportsPluginHost.c"
+#line 3368 "DataImportsPluginHost.c"
 		}
 	} else {
 		ImportManifest* _tmp20_;
@@ -3388,7 +3389,7 @@ void spit_data_imports_data_import_reporter (ImportManifest* manifest, BatchImpo
 		_import_manifest_unref0 (spit_data_imports_meta_manifest);
 #line 472 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 		spit_data_imports_meta_manifest = NULL;
-#line 3381 "DataImportsPluginHost.c"
+#line 3382 "DataImportsPluginHost.c"
 	}
 }
 
@@ -3411,7 +3412,7 @@ gint64 spit_data_imports_import_job_comparator (void* a, void* b) {
 	result = (gint64) (_tmp1_ - _tmp3_);
 #line 477 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	return result;
-#line 3404 "DataImportsPluginHost.c"
+#line 3405 "DataImportsPluginHost.c"
 }
 
 
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index 28039a9..b350abf 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -253,16 +253,16 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
 static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right);
 static Block11Data* block11_data_ref (Block11Data* _data11_);
 static void block11_data_unref (void * _userdata_);
-static void ___lambda21_ (Block11Data* _data11_);
+static void ___lambda23_ (Block11Data* _data11_);
 static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
-static void __lambda22_ (DataImportsUILibrarySelectionPane* self);
+static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void __lambda24_ (DataImportsUILibrarySelectionPane* self);
 static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static Block12Data* block12_data_ref (Block12Data* _data12_);
 static void block12_data_unref (void * _userdata_);
-static void __lambda20_ (Block12Data* _data12_);
-static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void __lambda22_ (Block12Data* _data12_);
+static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 static void data_imports_ui_library_selection_pane_finalize (GObject * obj);
 GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate))
@@ -293,6 +293,7 @@ enum  {
 #define DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_ACTION_BUTTON_WIDTH 128
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void);
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
 static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt);
 static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
 SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
@@ -342,21 +343,21 @@ DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_construct
 	self->priv->pane_widget = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 342 "DataImportsUI.c"
+#line 343 "DataImportsUI.c"
 }
 
 
 DataImportsUIConcreteDialogPane* data_imports_ui_concrete_dialog_pane_new (void) {
 #line 15 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_concrete_dialog_pane_construct (DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 349 "DataImportsUI.c"
+#line 350 "DataImportsUI.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 356 "DataImportsUI.c"
+#line 357 "DataImportsUI.c"
 }
 
 
@@ -375,7 +376,7 @@ static GtkWidget* data_imports_ui_concrete_dialog_pane_real_get_widget (SpitData
 	result = _tmp1_;
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 375 "DataImportsUI.c"
+#line 376 "DataImportsUI.c"
 }
 
 
@@ -388,7 +389,7 @@ static SpitDataImportsDialogPaneGeometryOptions data_imports_ui_concrete_dialog_
 	result = SPIT_DATA_IMPORTS_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 24 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 388 "DataImportsUI.c"
+#line 389 "DataImportsUI.c"
 }
 
 
@@ -396,7 +397,7 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_installed (SpitDat
 	DataImportsUIConcreteDialogPane * self;
 #line 27 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
-#line 396 "DataImportsUI.c"
+#line 397 "DataImportsUI.c"
 }
 
 
@@ -404,7 +405,7 @@ static void data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitD
 	DataImportsUIConcreteDialogPane * self;
 #line 30 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_UI_TYPE_CONCRETE_DIALOG_PANE, DataImportsUIConcreteDialogPane);
-#line 404 "DataImportsUI.c"
+#line 405 "DataImportsUI.c"
 }
 
 
@@ -415,7 +416,7 @@ static void data_imports_ui_concrete_dialog_pane_class_init (DataImportsUIConcre
 	g_type_class_add_private (klass, sizeof (DataImportsUIConcreteDialogPanePrivate));
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_concrete_dialog_pane_finalize;
-#line 415 "DataImportsUI.c"
+#line 416 "DataImportsUI.c"
 }
 
 
@@ -430,14 +431,14 @@ static void data_imports_ui_concrete_dialog_pane_spit_data_imports_dialog_pane_i
 	iface->on_pane_installed = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitDataImportsDialogPane *)) data_imports_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 430 "DataImportsUI.c"
+#line 431 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_concrete_dialog_pane_instance_init (DataImportsUIConcreteDialogPane * self) {
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_CONCRETE_DIALOG_PANE_GET_PRIVATE (self);
-#line 437 "DataImportsUI.c"
+#line 438 "DataImportsUI.c"
 }
 
 
@@ -449,7 +450,7 @@ static void data_imports_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->pane_widget);
 #line 12 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 449 "DataImportsUI.c"
+#line 450 "DataImportsUI.c"
 }
 
 
@@ -495,7 +496,7 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (G
 	if (_tmp3_ == NULL) {
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp2_);
-#line 495 "DataImportsUI.c"
+#line 496 "DataImportsUI.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4_ = _tmp3_;
@@ -507,14 +508,14 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct (G
 	_g_object_unref0 (message_label);
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 507 "DataImportsUI.c"
+#line 508 "DataImportsUI.c"
 }
 
 
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new (const gchar* message_string) {
 #line 35 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_static_message_pane_construct (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, message_string);
-#line 514 "DataImportsUI.c"
+#line 515 "DataImportsUI.c"
 }
 
 
@@ -550,7 +551,7 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi
 	if (_tmp3_ == NULL) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp2_);
-#line 550 "DataImportsUI.c"
+#line 551 "DataImportsUI.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4_ = _tmp3_;
@@ -562,21 +563,21 @@ DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_construct_wi
 	_g_object_unref0 (label);
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 562 "DataImportsUI.c"
+#line 563 "DataImportsUI.c"
 }
 
 
 DataImportsUIStaticMessagePane* data_imports_ui_static_message_pane_new_with_pango (const gchar* msg) {
 #line 40 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_static_message_pane_construct_with_pango (DATA_IMPORTS_UI_TYPE_STATIC_MESSAGE_PANE, msg);
-#line 569 "DataImportsUI.c"
+#line 570 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_static_message_pane_class_init (DataImportsUIStaticMessagePaneClass * klass) {
 #line 34 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_static_message_pane_parent_class = g_type_class_peek_parent (klass);
-#line 576 "DataImportsUI.c"
+#line 577 "DataImportsUI.c"
 }
 
 
@@ -601,7 +602,7 @@ static Block11Data* block11_data_ref (Block11Data* _data11_) {
 	g_atomic_int_inc (&_data11_->_ref_count_);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return _data11_;
-#line 601 "DataImportsUI.c"
+#line 602 "DataImportsUI.c"
 }
 
 
@@ -610,7 +611,7 @@ static void block11_data_unref (void * _userdata_) {
 	_data11_ = (Block11Data*) _userdata_;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) {
-#line 610 "DataImportsUI.c"
+#line 611 "DataImportsUI.c"
 		DataImportsUILibrarySelectionPane* self;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self = _data11_->self;
@@ -620,12 +621,12 @@ static void block11_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_slice_free (Block11Data, _data11_);
-#line 620 "DataImportsUI.c"
+#line 621 "DataImportsUI.c"
 	}
 }
 
 
-static void ___lambda21_ (Block11Data* _data11_) {
+static void ___lambda23_ (Block11Data* _data11_) {
 	DataImportsUILibrarySelectionPane* self;
 	GtkFileChooserButton* _tmp0_;
 	GFile* _tmp1_;
@@ -644,67 +645,67 @@ static void ___lambda21_ (Block11Data* _data11_) {
 	_tmp2_ = self->priv->file_radio;
 #line 103 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_ != NULL) {
-#line 644 "DataImportsUI.c"
+#line 645 "DataImportsUI.c"
 		GtkRadioButton* _tmp3_;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->file_radio;
 #line 104 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 650 "DataImportsUI.c"
+#line 651 "DataImportsUI.c"
 	}
 #line 105 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 654 "DataImportsUI.c"
+#line 655 "DataImportsUI.c"
 }
 
 
-static void ____lambda21__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void ____lambda23__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	___lambda21_ (self);
-#line 661 "DataImportsUI.c"
+	___lambda23_ (self);
+#line 662 "DataImportsUI.c"
 }
 
 
-static void __lambda22_ (DataImportsUILibrarySelectionPane* self) {
+static void __lambda24_ (DataImportsUILibrarySelectionPane* self) {
 	SpitDataImportsImportableLibrary* _tmp0_;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->selected_library;
 #line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 671 "DataImportsUI.c"
+#line 672 "DataImportsUI.c"
 		SpitDataImportsImportableLibrary* _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->selected_library;
 #line 115 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_on_library_selected (self, _tmp1_);
-#line 677 "DataImportsUI.c"
+#line 678 "DataImportsUI.c"
 	} else {
 		GFile* _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 116 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if (_tmp2_ != NULL) {
-#line 684 "DataImportsUI.c"
+#line 685 "DataImportsUI.c"
 			GFile* _tmp3_;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp3_ = self->priv->selected_file;
 #line 117 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_library_selection_pane_on_file_selected (self, _tmp3_);
-#line 690 "DataImportsUI.c"
+#line 691 "DataImportsUI.c"
 		} else {
 #line 119 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			g_debug ("DataImportsUI.vala:119: LibrarySelectionPane: Library or file should b" \
 "e selected.");
-#line 694 "DataImportsUI.c"
+#line 695 "DataImportsUI.c"
 		}
 	}
 }
 
 
-static void ___lambda22__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda24__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	__lambda22_ ((DataImportsUILibrarySelectionPane*) self);
-#line 703 "DataImportsUI.c"
+	__lambda24_ ((DataImportsUILibrarySelectionPane*) self);
+#line 704 "DataImportsUI.c"
 }
 
 
@@ -760,11 +761,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	if (_tmp1__length1 > 0) {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 759 "DataImportsUI.c"
+#line 760 "DataImportsUI.c"
 	} else {
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = data_imports_ui_library_selection_pane_on_file_selected != NULL;
-#line 763 "DataImportsUI.c"
+#line 764 "DataImportsUI.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_vala_assert (_tmp0_, "discovered_libraries.length > 0 || on_file_selected != null");
@@ -832,7 +833,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	_tmp15__length1 = discovered_libraries_length1;
 #line 82 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp15__length1 > 0) {
-#line 831 "DataImportsUI.c"
+#line 832 "DataImportsUI.c"
 		gint _tmp16_;
 		SpitDataImportsImportableLibrary** _tmp17_;
 		gint _tmp17__length1;
@@ -845,7 +846,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 		_tmp17_ = discovered_libraries;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp17__length1 = discovered_libraries_length1;
-#line 844 "DataImportsUI.c"
+#line 845 "DataImportsUI.c"
 		{
 			SpitDataImportsImportableLibrary** library_collection = NULL;
 			gint library_collection_length1 = 0;
@@ -857,14 +858,14 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 			library_collection_length1 = _tmp17__length1;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			for (library_it = 0; library_it < _tmp17__length1; library_it = library_it + 1) {
-#line 856 "DataImportsUI.c"
+#line 857 "DataImportsUI.c"
 				SpitDataImportsImportableLibrary* _tmp18_;
 				SpitDataImportsImportableLibrary* library = NULL;
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp18_ = _g_object_ref0 (library_collection[library_it]);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				library = _tmp18_;
-#line 863 "DataImportsUI.c"
+#line 864 "DataImportsUI.c"
 				{
 					gchar* lib_radio_label = NULL;
 					SpitDataImportsImportableLibrary* _tmp19_;
@@ -904,7 +905,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 					_g_free0 (lib_radio_label);
 #line 84 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (library);
-#line 903 "DataImportsUI.c"
+#line 904 "DataImportsUI.c"
 				}
 			}
 		}
@@ -912,7 +913,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 		_tmp28_ = file_select_label;
 #line 91 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if (_tmp28_ != NULL) {
-#line 911 "DataImportsUI.c"
+#line 912 "DataImportsUI.c"
 			GtkBox* _tmp29_;
 			GtkRadioButton* _tmp30_;
 			const gchar* _tmp31_;
@@ -945,14 +946,14 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 			_g_object_unref0 (self->priv->file_radio);
 #line 96 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			self->priv->file_radio = _tmp36_;
-#line 944 "DataImportsUI.c"
+#line 945 "DataImportsUI.c"
 		}
 	}
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp37_ = file_select_label;
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp37_ != NULL) {
-#line 951 "DataImportsUI.c"
+#line 952 "DataImportsUI.c"
 		Block11Data* _data11_;
 		GtkFileChooserButton* _tmp38_;
 		GtkFileChooserButton* _tmp39_;
@@ -977,7 +978,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp39_ = _data11_->file_chooser;
 #line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda21__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
+		g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda23__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp40_ = _data11_->file_chooser;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1000,7 +1001,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 		block11_data_unref (_data11_);
 #line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_data11_ = NULL;
-#line 999 "DataImportsUI.c"
+#line 1000 "DataImportsUI.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp46_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Import"));
@@ -1013,7 +1014,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp47_ = self->priv->import_button;
 #line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda22__gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp47_, "clicked", (GCallback) ___lambda24__gtk_button_clicked, self, 0);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp48_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 #line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1038,7 +1039,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	if (_tmp52_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp51_);
-#line 1037 "DataImportsUI.c"
+#line 1038 "DataImportsUI.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp53_ = _tmp52_;
@@ -1060,14 +1061,14 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 	_g_object_unref0 (content_box);
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1059 "DataImportsUI.c"
+#line 1060 "DataImportsUI.c"
 }
 
 
 DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label) {
 #line 56 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_library_selection_pane_construct (DATA_IMPORTS_UI_TYPE_LIBRARY_SELECTION_PANE, host, welcome_message, discovered_libraries, discovered_libraries_length1, file_select_label);
-#line 1066 "DataImportsUI.c"
+#line 1067 "DataImportsUI.c"
 }
 
 
@@ -1076,7 +1077,7 @@ static Block12Data* block12_data_ref (Block12Data* _data12_) {
 	g_atomic_int_inc (&_data12_->_ref_count_);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return _data12_;
-#line 1075 "DataImportsUI.c"
+#line 1076 "DataImportsUI.c"
 }
 
 
@@ -1085,7 +1086,7 @@ static void block12_data_unref (void * _userdata_) {
 	_data12_ = (Block12Data*) _userdata_;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) {
-#line 1084 "DataImportsUI.c"
+#line 1085 "DataImportsUI.c"
 		DataImportsUILibrarySelectionPane* self;
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self = _data12_->self;
@@ -1097,12 +1098,12 @@ static void block12_data_unref (void * _userdata_) {
 		_g_object_unref0 (self);
 #line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_slice_free (Block12Data, _data12_);
-#line 1096 "DataImportsUI.c"
+#line 1097 "DataImportsUI.c"
 	}
 }
 
 
-static void __lambda20_ (Block12Data* _data12_) {
+static void __lambda22_ (Block12Data* _data12_) {
 	DataImportsUILibrarySelectionPane* self;
 	GtkRadioButton* _tmp0_;
 	gboolean _tmp1_;
@@ -1117,7 +1118,7 @@ static void __lambda20_ (Block12Data* _data12_) {
 	_tmp2_ = _tmp1_;
 #line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_) {
-#line 1116 "DataImportsUI.c"
+#line 1117 "DataImportsUI.c"
 		SpitDataImportsImportableLibrary* _tmp3_;
 		SpitDataImportsImportableLibrary* _tmp4_;
 #line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1130,15 +1131,15 @@ static void __lambda20_ (Block12Data* _data12_) {
 		self->priv->selected_library = _tmp4_;
 #line 143 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_library_selection_pane_set_import_button_sensitivity (self);
-#line 1129 "DataImportsUI.c"
+#line 1130 "DataImportsUI.c"
 	}
 }
 
 
-static void ___lambda20__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void ___lambda22__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	__lambda20_ (self);
-#line 1137 "DataImportsUI.c"
+	__lambda22_ (self);
+#line 1138 "DataImportsUI.c"
 }
 
 
@@ -1198,7 +1199,7 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 	_tmp5_ = group;
 #line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp5_ == NULL) {
-#line 1197 "DataImportsUI.c"
+#line 1198 "DataImportsUI.c"
 		GtkRadioButton* _tmp6_;
 		SpitDataImportsImportableLibrary* _tmp7_;
 		SpitDataImportsImportableLibrary* _tmp8_;
@@ -1214,12 +1215,12 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 		_g_object_unref0 (self->priv->selected_library);
 #line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->selected_library = _tmp8_;
-#line 1213 "DataImportsUI.c"
+#line 1214 "DataImportsUI.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp9_ = _data12_->button;
 #line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda20__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
+	g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda22__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = _data12_->button;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1250,7 +1251,7 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 	_data12_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1249 "DataImportsUI.c"
+#line 1250 "DataImportsUI.c"
 }
 
 
@@ -1266,20 +1267,20 @@ static void data_imports_ui_library_selection_pane_set_import_button_sensitivity
 	if (_tmp1_ != NULL) {
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = TRUE;
-#line 1265 "DataImportsUI.c"
+#line 1266 "DataImportsUI.c"
 	} else {
 		GFile* _tmp2_;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->selected_file;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 1272 "DataImportsUI.c"
+#line 1273 "DataImportsUI.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = self->priv->import_button;
 #line 154 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1278 "DataImportsUI.c"
+#line 1279 "DataImportsUI.c"
 }
 
 
@@ -1304,7 +1305,7 @@ static void data_imports_ui_library_selection_pane_on_library_selected (DataImpo
 	spit_data_imports_data_importer_on_library_selected (_tmp2_, _tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1303 "DataImportsUI.c"
+#line 1304 "DataImportsUI.c"
 }
 
 
@@ -1329,7 +1330,7 @@ static void data_imports_ui_library_selection_pane_on_file_selected (DataImports
 	spit_data_imports_data_importer_on_file_selected (_tmp2_, _tmp3_);
 #line 162 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1328 "DataImportsUI.c"
+#line 1329 "DataImportsUI.c"
 }
 
 
@@ -1340,7 +1341,7 @@ static void data_imports_ui_library_selection_pane_class_init (DataImportsUILibr
 	g_type_class_add_private (klass, sizeof (DataImportsUILibrarySelectionPanePrivate));
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_library_selection_pane_finalize;
-#line 1339 "DataImportsUI.c"
+#line 1340 "DataImportsUI.c"
 }
 
 
@@ -1353,7 +1354,7 @@ static void data_imports_ui_library_selection_pane_instance_init (DataImportsUIL
 	self->priv->selected_file = NULL;
 #line 54 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->file_radio = NULL;
-#line 1352 "DataImportsUI.c"
+#line 1353 "DataImportsUI.c"
 }
 
 
@@ -1371,7 +1372,7 @@ static void data_imports_ui_library_selection_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->file_radio);
 #line 49 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_library_selection_pane_parent_class)->finalize (obj);
-#line 1370 "DataImportsUI.c"
+#line 1371 "DataImportsUI.c"
 }
 
 
@@ -1457,7 +1458,7 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
 	if (_tmp9_ == NULL) {
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1456 "DataImportsUI.c"
+#line 1457 "DataImportsUI.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = _tmp9_;
@@ -1469,14 +1470,14 @@ DataImportsUIProgressPane* data_imports_ui_progress_pane_construct (GType object
 	_g_object_unref0 (content_box);
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 1468 "DataImportsUI.c"
+#line 1469 "DataImportsUI.c"
 }
 
 
 DataImportsUIProgressPane* data_imports_ui_progress_pane_new (const gchar* message) {
 #line 171 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_progress_pane_construct (DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, message);
-#line 1475 "DataImportsUI.c"
+#line 1476 "DataImportsUI.c"
 }
 
 
@@ -1496,7 +1497,7 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
 	_tmp2_ = progress_message;
 #line 185 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_ != NULL) {
-#line 1495 "DataImportsUI.c"
+#line 1496 "DataImportsUI.c"
 		GtkLabel* _tmp3_;
 		const gchar* _tmp4_;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1505,11 +1506,11 @@ void data_imports_ui_progress_pane_update_progress (DataImportsUIProgressPane* s
 		_tmp4_ = progress_message;
 #line 186 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_label_set_label (_tmp3_, _tmp4_);
-#line 1504 "DataImportsUI.c"
+#line 1505 "DataImportsUI.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spin_event_loop ();
-#line 1508 "DataImportsUI.c"
+#line 1509 "DataImportsUI.c"
 }
 
 
@@ -1520,14 +1521,14 @@ static void data_imports_ui_progress_pane_class_init (DataImportsUIProgressPaneC
 	g_type_class_add_private (klass, sizeof (DataImportsUIProgressPanePrivate));
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_progress_pane_finalize;
-#line 1519 "DataImportsUI.c"
+#line 1520 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_progress_pane_instance_init (DataImportsUIProgressPane * self) {
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE (self);
-#line 1526 "DataImportsUI.c"
+#line 1527 "DataImportsUI.c"
 }
 
 
@@ -1543,7 +1544,7 @@ static void data_imports_ui_progress_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 166 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_progress_pane_parent_class)->finalize (obj);
-#line 1542 "DataImportsUI.c"
+#line 1543 "DataImportsUI.c"
 }
 
 
@@ -1562,535 +1563,522 @@ GType data_imports_ui_progress_pane_get_type (void) {
 static gboolean _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = data_imports_ui_data_imports_dialog_on_window_close ((DataImportsUIDataImportsDialog*) self, event);
-#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 1563 "DataImportsUI.c"
+#line 1564 "DataImportsUI.c"
 }
 
 
 static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_service_changed ((DataImportsUIDataImportsDialog*) self);
-#line 1570 "DataImportsUI.c"
+#line 1571 "DataImportsUI.c"
 }
 
 
 static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
-#line 1577 "DataImportsUI.c"
+#line 1578 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (GType object_type) {
 	DataImportsUIDataImportsDialog * self = NULL;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp0_;
-	gint _tmp1_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 	gchar* title = NULL;
-	gchar* _tmp5_;
+	gchar* _tmp4_;
 	gchar* label = NULL;
-	gchar* _tmp6_;
-	const gchar* _tmp7_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
 	SpitDataImportsService** loaded_services = NULL;
-	gint _tmp8_;
-	SpitDataImportsService** _tmp9_;
+	gint _tmp7_;
+	SpitDataImportsService** _tmp8_;
 	gint loaded_services_length1;
 	gint _loaded_services_size_;
-	SpitDataImportsService** _tmp10_;
-	gint _tmp10__length1;
+	SpitDataImportsService** _tmp9_;
+	gint _tmp9__length1;
+	GtkBox* _tmp64_;
 	GtkBox* _tmp65_;
 	GtkBox* _tmp66_;
-	GtkBox* _tmp67_;
-	gboolean _tmp68_;
-	GtkButton* _tmp78_;
-	SpitDataImportsService** _tmp79_;
-	gint _tmp79__length1;
+	gboolean _tmp67_;
+	GtkButton* _tmp77_;
+	SpitDataImportsService** _tmp78_;
+	gint _tmp78__length1;
 #line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	use_header = FALSE;
+	_tmp0_ = resources_use_header_bar ();
+#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	use_header = _tmp0_ == 1;
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp0_ = gtk_settings_get_default ();
+	_tmp1_ = resources_use_header_bar ();
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+	self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = use_header;
 #line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp2_) {
-#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp1_ = 1;
 #line 1619 "DataImportsUI.c"
-	} else {
-#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp1_ = 0;
-#line 1623 "DataImportsUI.c"
-	}
-#line 213 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self = (DataImportsUIDataImportsDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+		GtkWidget* _tmp3_;
 #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp3_ = use_header;
+		_tmp3_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 214 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp3_) {
-#line 1631 "DataImportsUI.c"
-		GtkWidget* _tmp4_;
-#line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp4_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 215 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1637 "DataImportsUI.c"
+		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1625 "DataImportsUI.c"
 	}
-#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 218 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _data_imports_ui_data_imports_dialog_on_window_close_gtk_widget_delete_event, self, 0);
+#line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp4_ = g_strdup (_ ("Import From Application"));
+#line 219 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	title = _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp5_ = g_strdup (_ ("Import From Application"));
+	_tmp5_ = g_strdup (_ ("Import media _from:"));
 #line 220 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	title = _tmp5_;
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp6_ = g_strdup (_ ("Import media _from:"));
-#line 221 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	label = _tmp6_;
-#line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp7_ = title;
-#line 223 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp9_ = spit_data_imports_load_services (FALSE, &_tmp8_);
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services = _tmp9_;
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	loaded_services_length1 = _tmp8_;
-#line 225 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	label = _tmp5_;
+#line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp6_ = title;
+#line 222 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp6_);
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp8_ = spit_data_imports_load_services (FALSE, &_tmp7_);
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	loaded_services = _tmp8_;
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	loaded_services_length1 = _tmp7_;
+#line 224 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10_ = loaded_services;
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp10__length1 = loaded_services_length1;
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp10__length1 > 0) {
-#line 1669 "DataImportsUI.c"
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp9_ = loaded_services;
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp9__length1 = loaded_services_length1;
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	if (_tmp9__length1 > 0) {
+#line 1657 "DataImportsUI.c"
+		GtkComboBoxText* _tmp10_;
 		GtkComboBoxText* _tmp11_;
-		GtkComboBoxText* _tmp12_;
 		gchar* last_used_service = NULL;
+		ConfigFacade* _tmp12_;
 		ConfigFacade* _tmp13_;
-		ConfigFacade* _tmp14_;
+		gchar* _tmp14_;
 		gchar* _tmp15_;
-		gchar* _tmp16_;
 		gint ticker = 0;
 		gint last_used_index = 0;
-		SpitDataImportsService** _tmp17_;
-		gint _tmp17__length1;
-		gint _tmp31_;
-		GtkComboBoxText* _tmp35_;
-		gboolean _tmp36_;
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp11_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp11_);
-#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		SpitDataImportsService** _tmp16_;
+		gint _tmp16__length1;
+		gint _tmp30_;
+		GtkComboBoxText* _tmp34_;
+		gboolean _tmp35_;
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp10_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		g_object_ref_sink (_tmp10_);
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->service_selector_box);
+#line 229 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		self->priv->service_selector_box = _tmp10_;
 #line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->service_selector_box = _tmp11_;
-#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp12_ = self->priv->service_selector_box;
-#line 231 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp13_ = config_facade_get_instance ();
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp14_ = _tmp13_;
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp15_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp16_ = _tmp15_;
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp14_);
-#line 234 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		last_used_service = _tmp16_;
-#line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp11_ = self->priv->service_selector_box;
+#line 230 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp12_ = config_facade_get_instance ();
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp13_ = _tmp12_;
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp14_ = configuration_facade_get_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp15_ = _tmp14_;
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_g_object_unref0 (_tmp13_);
+#line 233 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		last_used_service = _tmp15_;
+#line 235 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		ticker = 0;
-#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 236 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		last_used_index = -1;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp17_ = loaded_services;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp17__length1 = loaded_services_length1;
-#line 1716 "DataImportsUI.c"
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp16_ = loaded_services;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp16__length1 = loaded_services_length1;
+#line 1704 "DataImportsUI.c"
 		{
 			SpitDataImportsService** service_collection = NULL;
 			gint service_collection_length1 = 0;
 			gint _service_collection_size_ = 0;
 			gint service_it = 0;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			service_collection = _tmp16_;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			service_collection_length1 = _tmp16__length1;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			for (service_it = 0; service_it < _tmp16__length1; service_it = service_it + 1) {
+#line 1716 "DataImportsUI.c"
+				SpitDataImportsService* _tmp17_;
+				SpitDataImportsService* service = NULL;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+				_tmp17_ = _g_object_ref0 (service_collection[service_it]);
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+				service = _tmp17_;
+#line 1723 "DataImportsUI.c"
+				{
+					gchar* curr_service_id = NULL;
+					SpitDataImportsService* _tmp18_;
+					const gchar* _tmp19_;
+					gchar* _tmp20_;
+					gboolean _tmp21_ = FALSE;
+					const gchar* _tmp22_;
+					GtkComboBoxText* _tmp26_;
+					SpitDataImportsService* _tmp27_;
+					const gchar* _tmp28_;
+					gint _tmp29_;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection = _tmp17_;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_collection_length1 = _tmp17__length1;
+					_tmp18_ = service;
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			for (service_it = 0; service_it < _tmp17__length1; service_it = service_it + 1) {
-#line 1728 "DataImportsUI.c"
-				SpitDataImportsService* _tmp18_;
-				SpitDataImportsService* service = NULL;
+					_tmp19_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				_tmp18_ = _g_object_ref0 (service_collection[service_it]);
+					_tmp20_ = g_strdup (_tmp19_);
 #line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-				service = _tmp18_;
-#line 1735 "DataImportsUI.c"
-				{
-					gchar* curr_service_id = NULL;
-					SpitDataImportsService* _tmp19_;
-					const gchar* _tmp20_;
-					gchar* _tmp21_;
-					gboolean _tmp22_ = FALSE;
-					const gchar* _tmp23_;
-					GtkComboBoxText* _tmp27_;
-					SpitDataImportsService* _tmp28_;
-					const gchar* _tmp29_;
-					gint _tmp30_;
+					curr_service_id = _tmp20_;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp19_ = service;
+					_tmp22_ = last_used_service;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp20_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					if (_tmp22_ != NULL) {
+#line 1747 "DataImportsUI.c"
+						const gchar* _tmp23_;
+						const gchar* _tmp24_;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp21_ = g_strdup (_tmp20_);
+						_tmp23_ = last_used_service;
 #line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					curr_service_id = _tmp21_;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp23_ = last_used_service;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp23_ != NULL) {
-#line 1759 "DataImportsUI.c"
-						const gchar* _tmp24_;
-						const gchar* _tmp25_;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp24_ = last_used_service;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp25_ = curr_service_id;
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0;
-#line 1768 "DataImportsUI.c"
+						_tmp24_ = curr_service_id;
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+						_tmp21_ = g_strcmp0 (_tmp23_, _tmp24_) == 0;
+#line 1756 "DataImportsUI.c"
 					} else {
-#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp22_ = FALSE;
-#line 1772 "DataImportsUI.c"
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+						_tmp21_ = FALSE;
+#line 1760 "DataImportsUI.c"
 					}
+#line 239 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					if (_tmp21_) {
+#line 1764 "DataImportsUI.c"
+						gint _tmp25_;
 #line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					if (_tmp22_) {
-#line 1776 "DataImportsUI.c"
-						gint _tmp26_;
-#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						_tmp26_ = ticker;
-#line 241 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-						last_used_index = _tmp26_;
-#line 1782 "DataImportsUI.c"
+						_tmp25_ = ticker;
+#line 240 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+						last_used_index = _tmp25_;
+#line 1770 "DataImportsUI.c"
 					}
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					_tmp26_ = self->priv->service_selector_box;
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					_tmp27_ = service;
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					_tmp28_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 242 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					gtk_combo_box_text_append_text (_tmp26_, _tmp28_);
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp27_ = self->priv->service_selector_box;
-#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp28_ = service;
+					_tmp29_ = ticker;
 #line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp29_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 243 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					gtk_combo_box_text_append_text (_tmp27_, _tmp29_);
-#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					_tmp30_ = ticker;
-#line 244 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-					ticker = _tmp30_ + 1;
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+					ticker = _tmp29_ + 1;
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_free0 (curr_service_id);
-#line 238 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (service);
-#line 1800 "DataImportsUI.c"
+#line 1788 "DataImportsUI.c"
 				}
 			}
 		}
+#line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp30_ = last_used_index;
+#line 245 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		if (_tmp30_ >= 0) {
+#line 1796 "DataImportsUI.c"
+			GtkComboBoxText* _tmp31_;
+			gint _tmp32_;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp31_ = last_used_index;
+			_tmp31_ = self->priv->service_selector_box;
 #line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp31_ >= 0) {
-#line 1808 "DataImportsUI.c"
-			GtkComboBoxText* _tmp32_;
-			gint _tmp33_;
-#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp32_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp33_ = last_used_index;
-#line 247 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox), _tmp33_);
-#line 1817 "DataImportsUI.c"
+			_tmp32_ = last_used_index;
+#line 246 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), _tmp32_);
+#line 1805 "DataImportsUI.c"
 		} else {
-			GtkComboBoxText* _tmp34_;
-#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp34_ = self->priv->service_selector_box;
-#line 249 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1824 "DataImportsUI.c"
+			GtkComboBoxText* _tmp33_;
+#line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp33_ = self->priv->service_selector_box;
+#line 248 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1812 "DataImportsUI.c"
 		}
-#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp35_ = self->priv->service_selector_box;
-#line 251 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp36_ = use_header;
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (!_tmp36_) {
-#line 1834 "DataImportsUI.c"
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp34_ = self->priv->service_selector_box;
+#line 250 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp35_ = use_header;
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		if (!_tmp35_) {
+#line 1822 "DataImportsUI.c"
 			GtkLabel* service_selector_box_label = NULL;
-			const gchar* _tmp37_;
+			const gchar* _tmp36_;
+			GtkLabel* _tmp37_;
 			GtkLabel* _tmp38_;
-			GtkLabel* _tmp39_;
-			GtkComboBoxText* _tmp40_;
+			GtkComboBoxText* _tmp39_;
+			GtkLabel* _tmp40_;
 			GtkLabel* _tmp41_;
-			GtkLabel* _tmp42_;
+			GtkComboBoxText* _tmp42_;
 			GtkComboBoxText* _tmp43_;
 			GtkComboBoxText* _tmp44_;
 			GtkComboBoxText* _tmp45_;
-			GtkComboBoxText* _tmp46_;
 			GtkBox* service_selector_layouter = NULL;
+			GtkBox* _tmp46_;
 			GtkBox* _tmp47_;
 			GtkBox* _tmp48_;
-			GtkBox* _tmp49_;
-			GtkLabel* _tmp50_;
-			GtkBox* _tmp51_;
-			GtkComboBoxText* _tmp52_;
+			GtkLabel* _tmp49_;
+			GtkBox* _tmp50_;
+			GtkComboBoxText* _tmp51_;
 			GtkBox* service_area_layouter = NULL;
+			GtkBox* _tmp52_;
 			GtkBox* _tmp53_;
 			GtkBox* _tmp54_;
-			GtkBox* _tmp55_;
 			GtkSeparator* service_central_separator = NULL;
-			GtkSeparator* _tmp56_;
-			GtkBox* _tmp57_;
-			GtkSeparator* _tmp58_;
+			GtkSeparator* _tmp55_;
+			GtkBox* _tmp56_;
+			GtkSeparator* _tmp57_;
+			GtkBox* _tmp58_;
 			GtkBox* _tmp59_;
 			GtkBox* _tmp60_;
 			GtkBox* _tmp61_;
 			GtkBox* _tmp62_;
 			GtkBox* _tmp63_;
-			GtkBox* _tmp64_;
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp36_ = label;
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp37_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp36_);
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			g_object_ref_sink (_tmp37_);
+#line 254 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			service_selector_box_label = _tmp37_;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp37_ = label;
+			_tmp38_ = service_selector_box_label;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp38_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp37_);
+			_tmp39_ = self->priv->service_selector_box;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp38_);
-#line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_box_label = _tmp38_;
-#line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp39_ = service_selector_box_label;
+			gtk_label_set_mnemonic_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp40_ = self->priv->service_selector_box;
+			_tmp40_ = service_selector_box_label;
 #line 256 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_label_set_mnemonic_widget (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp41_ = service_selector_box_label;
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp42_ = service_selector_box_label;
-#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp42_ = self->priv->service_selector_box;
+#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp43_ = self->priv->service_selector_box;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp44_ = self->priv->service_selector_box;
 #line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp45_ = self->priv->service_selector_box;
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp46_ = self->priv->service_selector_box;
-#line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp46_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			g_object_ref_sink (_tmp46_);
+#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			service_selector_layouter = _tmp46_;
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp47_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+			_tmp47_ = service_selector_layouter;
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp47_);
-#line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_layouter = _tmp47_;
+			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_container_get_type (), GtkContainer), (guint) 12);
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp48_ = service_selector_layouter;
 #line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), (guint) 12);
+			_tmp49_ = service_selector_box_label;
+#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp49_ = service_selector_layouter;
+			_tmp50_ = service_selector_layouter;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp50_ = service_selector_box_label;
+			_tmp51_ = self->priv->service_selector_box;
 #line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
-#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp51_ = service_selector_layouter;
-#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp52_ = self->priv->service_selector_box;
-#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			gtk_box_pack_start (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp52_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			g_object_ref_sink (_tmp52_);
+#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			service_area_layouter = _tmp52_;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp53_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+			_tmp53_ = service_area_layouter;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp53_);
+			_tmp54_ = service_selector_layouter;
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_area_layouter = _tmp53_;
+			gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp54_ = service_area_layouter;
+			_tmp55_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp55_ = service_selector_layouter;
+			g_object_ref_sink (_tmp55_);
 #line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+			service_central_separator = _tmp55_;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp56_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+			_tmp56_ = service_area_layouter;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp56_);
+			_tmp57_ = service_central_separator;
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_central_separator = _tmp56_;
+			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 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp57_ = service_area_layouter;
+			_tmp58_ = service_area_layouter;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp58_ = service_central_separator;
-#line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp59_ = service_area_layouter;
 #line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp60_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp61_ = service_area_layouter;
 #line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp62_ = service_area_layouter;
-#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp63_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp64_ = service_area_layouter;
-#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp62_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp63_ = service_area_layouter;
+#line 284 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_central_separator);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_area_layouter);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_layouter);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_box_label);
-#line 1981 "DataImportsUI.c"
+#line 1969 "DataImportsUI.c"
 		}
-#line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 226 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_free0 (last_used_service);
-#line 1985 "DataImportsUI.c"
+#line 1973 "DataImportsUI.c"
 	}
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_object_ref_sink (_tmp64_);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_g_object_unref0 (self->priv->central_area_layouter);
+#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	self->priv->central_area_layouter = _tmp64_;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp65_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp65_);
+	_tmp66_ = self->priv->central_area_layouter;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (self->priv->central_area_layouter);
-#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->central_area_layouter = _tmp65_;
-#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp66_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp67_ = self->priv->central_area_layouter;
-#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp67_ = use_header;
+#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	if (_tmp67_) {
+#line 1993 "DataImportsUI.c"
+		GtkButton* _tmp68_;
+		GtkButton* _tmp69_;
+		GtkWidget* _tmp70_;
+		GtkButton* _tmp71_;
+		GtkComboBoxText* _tmp72_;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp68_ = use_header;
+		_tmp68_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		g_object_ref_sink (_tmp68_);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp68_) {
-#line 2005 "DataImportsUI.c"
-		GtkButton* _tmp69_;
-		GtkButton* _tmp70_;
-		GtkWidget* _tmp71_;
-		GtkButton* _tmp72_;
-		GtkComboBoxText* _tmp73_;
-#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp69_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_object_ref_sink (_tmp69_);
-#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
+#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		self->priv->close_cancel_button = _tmp68_;
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp69_;
+		_tmp69_ = self->priv->close_cancel_button;
+#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp70_ = self->priv->close_cancel_button;
+		_tmp70_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp71_ = self->priv->close_cancel_button;
+#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp72_ = self->priv->close_cancel_button;
+		_tmp72_ = self->priv->service_selector_box;
 #line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+		if (_tmp72_ != NULL) {
+#line 2021 "DataImportsUI.c"
+			GtkWidget* _tmp73_;
+			GtkComboBoxText* _tmp74_;
+#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp73_ = self->priv->service_selector_box;
+			_tmp74_ = self->priv->service_selector_box;
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		if (_tmp73_ != NULL) {
-#line 2033 "DataImportsUI.c"
-			GtkWidget* _tmp74_;
-			GtkComboBoxText* _tmp75_;
-#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp74_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp75_ = self->priv->service_selector_box;
-#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget));
-#line 2042 "DataImportsUI.c"
+			gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+#line 2030 "DataImportsUI.c"
 		}
 	} else {
-		GtkWidget* _tmp76_;
-		GtkButton* _tmp77_;
-#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		GtkWidget* _tmp75_;
+		GtkButton* _tmp76_;
+#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp76_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp76_, gtk_button_get_type ()) ? ((GtkButton*) _tmp76_) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp75_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_button_get_type ()) ? ((GtkButton*) _tmp75_) : NULL);
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
-#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		self->priv->close_cancel_button = _tmp77_;
-#line 2057 "DataImportsUI.c"
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		self->priv->close_cancel_button = _tmp76_;
+#line 2045 "DataImportsUI.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp78_ = self->priv->close_cancel_button;
-#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
-#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp77_ = self->priv->close_cancel_button;
+#line 305 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_signal_connect_object (_tmp77_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp79_ = loaded_services;
-#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp79__length1 = loaded_services_length1;
-#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp79__length1 > 0) {
-#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp78_ = loaded_services;
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp78__length1 = loaded_services_length1;
+#line 309 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	if (_tmp78__length1 > 0) {
+#line 311 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2073 "DataImportsUI.c"
+#line 2061 "DataImportsUI.c"
 	} else {
+		DataImportsUIStaticMessagePane* _tmp79_;
 		DataImportsUIStaticMessagePane* _tmp80_;
-		DataImportsUIStaticMessagePane* _tmp81_;
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp80_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp81_ = _tmp80_;
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp79_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp80_ = _tmp79_;
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_g_object_unref0 (_tmp80_);
 #line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp81_);
-#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2087 "DataImportsUI.c"
+#line 2075 "DataImportsUI.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2100,14 +2088,14 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	_g_free0 (title);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 2099 "DataImportsUI.c"
+#line 2087 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2106 "DataImportsUI.c"
+#line 2094 "DataImportsUI.c"
 }
 
 
@@ -2116,72 +2104,72 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 	DataImportsUIDataImportsDialog* _tmp0_;
 	DataImportsUIDataImportsDialog* _tmp2_;
 	DataImportsUIDataImportsDialog* _tmp3_;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ == NULL) {
-#line 2119 "DataImportsUI.c"
+#line 2107 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_;
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_new ();
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_object_ref_sink (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2129 "DataImportsUI.c"
+#line 2117 "DataImportsUI.c"
 	}
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = data_imports_ui_data_imports_dialog_instance;
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = _tmp3_;
-#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2139 "DataImportsUI.c"
+#line 2127 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_terminate_instance (void) {
 	DataImportsUIDataImportsDialog* _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2149 "DataImportsUI.c"
+#line 2137 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_instance;
-#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2155 "DataImportsUI.c"
+#line 2143 "DataImportsUI.c"
 	}
-#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2161 "DataImportsUI.c"
+#line 2149 "DataImportsUI.c"
 }
 
 
 static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE);
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (evt != NULL, FALSE);
-#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:337: DataImportsDialog: on_window_close( ): invoked" \
+#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:336: DataImportsDialog: on_window_close( ): invoked" \
 ".");
-#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = TRUE;
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2179 "DataImportsUI.c"
+#line 2167 "DataImportsUI.c"
 }
 
 
@@ -2205,232 +2193,232 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	SpitDataImportsService* _tmp16_;
 	SpitDataImportsConcreteDataImportsHost* _tmp17_;
 	SpitDataImportsConcreteDataImportsHost* _tmp18_;
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:343: DataImportsDialog: on_service_changed invoked.");
 #line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:344: DataImportsDialog: on_service_changed invoked.");
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	service_name = _tmp1_;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	selected_service = NULL;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = spit_data_imports_load_all_services (&_tmp2_);
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services = _tmp3_;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services_length1 = _tmp2_;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_services_size_ = services_length1;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4_ = services;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4__length1 = services_length1;
-#line 2227 "DataImportsUI.c"
+#line 2215 "DataImportsUI.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		service_collection = _tmp4_;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		service_collection_length1 = _tmp4__length1;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2239 "DataImportsUI.c"
+#line 2227 "DataImportsUI.c"
 			SpitDataImportsService* _tmp5_;
 			SpitDataImportsService* service = NULL;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp5_ = _g_object_ref0 (service_collection[service_it]);
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			service = _tmp5_;
-#line 2246 "DataImportsUI.c"
+#line 2234 "DataImportsUI.c"
 			{
 				SpitDataImportsService* _tmp6_;
 				const gchar* _tmp7_;
 				const gchar* _tmp8_;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp6_ = service;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp8_ = service_name;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2259 "DataImportsUI.c"
+#line 2247 "DataImportsUI.c"
 					SpitDataImportsService* _tmp9_;
 					SpitDataImportsService* _tmp10_;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp9_ = service;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (selected_service);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					selected_service = _tmp10_;
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (service);
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					break;
-#line 2274 "DataImportsUI.c"
+#line 2262 "DataImportsUI.c"
 				}
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_g_object_unref0 (service);
-#line 2278 "DataImportsUI.c"
+#line 2266 "DataImportsUI.c"
 			}
 		}
 	}
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp11_ = selected_service;
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_vala_assert (_tmp11_ != NULL, "selected_service != null");
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp13_ = _tmp12_;
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp14_ = selected_service;
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp15_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	configuration_facade_set_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp13_);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp16_ = selected_service;
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp17_ = spit_data_imports_concrete_data_imports_host_new (_tmp16_, self);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->host = _tmp17_;
-#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp18_ = self->priv->host;
-#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spit_data_imports_plugin_host_start_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (selected_service);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_free0 (service_name);
-#line 2316 "DataImportsUI.c"
+#line 2304 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) {
-#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:364: DataImportsDialog: on_close_cancel_clicked( ):" \
+#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:363: DataImportsDialog: on_close_cancel_clicked( ):" \
 " invoked.");
-#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 2327 "DataImportsUI.c"
+#line 2315 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
 	SpitDataImportsConcreteDataImportsHost* _tmp0_;
-#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:370: DataImportsDialog: terminate( ): invoked.");
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:369: DataImportsDialog: terminate( ): invoked.");
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2341 "DataImportsUI.c"
+#line 2329 "DataImportsUI.c"
 		SpitDataImportsConcreteDataImportsHost* _tmp1_;
-#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->host;
-#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->host);
-#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->host = NULL;
-#line 2351 "DataImportsUI.c"
+#line 2339 "DataImportsUI.c"
 	}
-#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2361 "DataImportsUI.c"
+#line 2349 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_;
-#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2377 "DataImportsUI.c"
+#line 2365 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_;
-#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 393 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2393 "DataImportsUI.c"
+#line 2381 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2409 "DataImportsUI.c"
+#line 2397 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2418 "DataImportsUI.c"
+#line 2406 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2427 "DataImportsUI.c"
+#line 2415 "DataImportsUI.c"
 }
 
 
@@ -2438,70 +2426,70 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
 	SpitDataImportsDialogPane* result = NULL;
 	SpitDataImportsDialogPane* _tmp0_;
 	SpitDataImportsDialogPane* _tmp1_;
-#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL);
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = _tmp1_;
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2445 "DataImportsUI.c"
+#line 2433 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDataImportsDialog* self) {
 	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
-#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Close"));
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = self->priv->close_cancel_button;
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2462 "DataImportsUI.c"
+#line 2450 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
 	GtkButton* _tmp0_;
-#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 2474 "DataImportsUI.c"
+#line 2462 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
 	GtkComboBoxText* _tmp0_;
-#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2486 "DataImportsUI.c"
+#line 2474 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
 	GtkComboBoxText* _tmp0_;
-#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2498 "DataImportsUI.c"
+#line 2486 "DataImportsUI.c"
 }
 
 
@@ -2519,110 +2507,110 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	SpitDataImportsDialogPane* _tmp15_;
 	SpitDataImportsDialogPane* _tmp16_;
 	SpitDataImportsDialogPane* _tmp17_;
-#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:433: DataImportsDialog: install_pane( ): invoked.");
-#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:432: DataImportsDialog: install_pane( ): invoked.");
+#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2526 "DataImportsUI.c"
+#line 2514 "DataImportsUI.c"
 		SpitDataImportsDialogPane* _tmp1_;
 		GtkBox* _tmp2_;
 		SpitDataImportsDialogPane* _tmp3_;
 		GtkWidget* _tmp4_;
 		GtkWidget* _tmp5_;
-#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_debug ("DataImportsUI.vala:436: DataImportsDialog: install_pane( ): a pane is " \
+#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		g_debug ("DataImportsUI.vala:435: DataImportsDialog: install_pane( ): a pane is " \
 "already installed; removing it.");
-#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->active_pane;
-#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		spit_data_imports_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->central_area_layouter;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->active_pane;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp4_ = spit_data_imports_dialog_pane_get_widget (_tmp3_);
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp5_ = _tmp4_;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2550 "DataImportsUI.c"
+#line 2538 "DataImportsUI.c"
 	}
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp7_ = pane;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_);
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp9_ = _tmp8_;
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = pane;
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	geometry_options = _tmp11_;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp12_ = geometry_options;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2578 "DataImportsUI.c"
+#line 2566 "DataImportsUI.c"
 	} else {
 		SpitDataImportsDialogPaneGeometryOptions _tmp13_;
-#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp13_ = geometry_options;
-#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2587 "DataImportsUI.c"
+#line 2575 "DataImportsUI.c"
 		} else {
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2591 "DataImportsUI.c"
+#line 2579 "DataImportsUI.c"
 		}
 	}
-#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp14_ = geometry_options;
-#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2600 "DataImportsUI.c"
+#line 2588 "DataImportsUI.c"
 	} else {
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 456 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2604 "DataImportsUI.c"
+#line 2592 "DataImportsUI.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp15_ = pane;
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->active_pane = _tmp16_;
-#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp17_ = pane;
-#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2618 "DataImportsUI.c"
+#line 2606 "DataImportsUI.c"
 }
 
 
@@ -2633,14 +2621,14 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp
 	g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2629 "DataImportsUI.c"
+#line 2617 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2636 "DataImportsUI.c"
+#line 2624 "DataImportsUI.c"
 }
 
 
@@ -2660,7 +2648,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->host);
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2656 "DataImportsUI.c"
+#line 2644 "DataImportsUI.c"
 }
 
 
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index 2c0cd40..29791a4 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -208,9 +208,8 @@ public class DataImportsDialog : Gtk.Dialog {
     private Spit.DataImports.ConcreteDataImportsHost host;
 
     protected DataImportsDialog() {
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
         if (use_header)
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
 
diff --git a/src/db/Db.c b/src/db/Db.c
index 0695500..b5200cf 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -374,13 +374,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	gint _tmp36_;
 	gboolean _tmp37_;
 	gboolean _tmp39_;
-	gboolean _tmp41_;
-	gint _tmp43_;
-	gint _tmp46_;
-	VersionTable* _tmp47_;
+	gboolean _tmp40_;
+	gboolean _tmp42_;
+	gint _tmp44_;
+	gint _tmp47_;
 	VersionTable* _tmp48_;
-	gint _tmp49_;
+	VersionTable* _tmp49_;
 	gint _tmp50_;
+	gint _tmp51_;
 #line 63 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp0_ = input_version;
 #line 63 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -397,7 +398,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 		result = DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE;
 #line 69 "/home/jens/Source/shotwell/src/db/Db.vala"
 		return result;
-#line 401 "Db.c"
+#line 402 "Db.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp3_ = version;
@@ -407,7 +408,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp4_ = database_table_has_column ("PhotoTable", "flags");
 #line 83 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp4_) {
-#line 411 "Db.c"
+#line 412 "Db.c"
 		gboolean _tmp5_;
 #line 84 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:84: upgrade_database: adding flags column to PhotoTable");
@@ -419,7 +420,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 86 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 423 "Db.c"
+#line 424 "Db.c"
 		}
 	}
 #line 89 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -428,7 +429,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp6_ = database_table_has_column ("PhotoTable", "file_format");
 #line 100 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp6_) {
-#line 432 "Db.c"
+#line 433 "Db.c"
 		gboolean _tmp7_;
 #line 101 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:101: upgrade_database: adding file_format column to PhotoTable");
@@ -440,7 +441,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 103 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 444 "Db.c"
+#line 445 "Db.c"
 		}
 	}
 #line 106 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -449,7 +450,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp8_ = database_table_has_column ("PhotoTable", "title");
 #line 113 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp8_) {
-#line 453 "Db.c"
+#line 454 "Db.c"
 		gboolean _tmp9_;
 #line 114 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:114: upgrade_database: adding title column to PhotoTable");
@@ -461,7 +462,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 116 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 465 "Db.c"
+#line 466 "Db.c"
 		}
 	}
 #line 119 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -470,7 +471,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp10_ = database_table_has_column ("PhotoTable", "backlinks");
 #line 126 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp10_) {
-#line 474 "Db.c"
+#line 475 "Db.c"
 		gboolean _tmp11_;
 #line 127 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:127: upgrade_database: adding backlinks column to PhotoTable");
@@ -482,7 +483,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 129 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 486 "Db.c"
+#line 487 "Db.c"
 		}
 	}
 #line 132 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -491,7 +492,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp12_ = database_table_has_column ("PhotoTable", "time_reimported");
 #line 146 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp12_) {
-#line 495 "Db.c"
+#line 496 "Db.c"
 		gboolean _tmp13_;
 #line 147 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:147: upgrade_database: adding time_reimported column to PhotoT" \
@@ -504,14 +505,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 149 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 507 "Db.c"
+#line 508 "Db.c"
 		}
 	}
 #line 152 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp14_ = database_table_has_column ("PhotoTable", "editable_id");
 #line 152 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp14_) {
-#line 514 "Db.c"
+#line 515 "Db.c"
 		gboolean _tmp15_;
 #line 153 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:153: upgrade_database: adding editable_id column to PhotoTable");
@@ -523,7 +524,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 155 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 526 "Db.c"
+#line 527 "Db.c"
 		}
 	}
 #line 158 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -532,7 +533,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp16_ = database_table_has_column ("PhotoTable", "rating");
 #line 170 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp16_) {
-#line 535 "Db.c"
+#line 536 "Db.c"
 		gboolean _tmp17_;
 #line 171 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:171: upgrade_database: adding rating column to PhotoTable");
@@ -544,14 +545,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 173 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 547 "Db.c"
+#line 548 "Db.c"
 		}
 	}
 #line 182 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp18_ = database_table_has_column ("PhotoTable", "metadata_dirty");
 #line 182 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp18_) {
-#line 554 "Db.c"
+#line 555 "Db.c"
 		gboolean _tmp19_;
 #line 183 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:183: upgrade_database: adding metadata_dirty column to PhotoTa" \
@@ -564,7 +565,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 185 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 566 "Db.c"
+#line 567 "Db.c"
 		}
 	}
 #line 188 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -573,21 +574,21 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp21_ = database_table_has_table ("VideoTable");
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp21_) {
-#line 575 "Db.c"
+#line 576 "Db.c"
 		gboolean _tmp22_;
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp22_ = database_table_has_column ("VideoTable", "flags");
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp20_ = !_tmp22_;
-#line 581 "Db.c"
+#line 582 "Db.c"
 	} else {
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 		_tmp20_ = FALSE;
-#line 585 "Db.c"
+#line 586 "Db.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (_tmp20_) {
-#line 589 "Db.c"
+#line 590 "Db.c"
 		gboolean _tmp23_;
 #line 196 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:196: upgrade_database: adding flags column to VideoTable");
@@ -599,7 +600,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 198 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 601 "Db.c"
+#line 602 "Db.c"
 		}
 	}
 #line 201 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -608,20 +609,20 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp24_ = database_table_has_column ("EventTable", "primary_source_id");
 #line 208 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp24_) {
-#line 610 "Db.c"
+#line 611 "Db.c"
 		gboolean _tmp25_;
 #line 209 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:209: upgrade_database: adding primary_source_id column to Even" \
 "tTable");
 #line 210 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp25_ = database_table_add_column ("EventTable", "primary_source_id", "INTEGER DEFAULT 0");
+		_tmp25_ = database_table_add_column ("EventTable", "primary_source_id", "TEXT");
 #line 210 "/home/jens/Source/shotwell/src/db/Db.vala"
 		if (!_tmp25_) {
 #line 211 "/home/jens/Source/shotwell/src/db/Db.vala"
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 211 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 622 "Db.c"
+#line 623 "Db.c"
 		}
 	}
 #line 214 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -634,7 +635,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 		result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 223 "/home/jens/Source/shotwell/src/db/Db.vala"
 		return result;
-#line 635 "Db.c"
+#line 636 "Db.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 12;
@@ -642,7 +643,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp27_ = database_table_has_column ("PhotoTable", "developer");
 #line 233 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp27_) {
-#line 643 "Db.c"
+#line 644 "Db.c"
 		gboolean _tmp28_;
 #line 234 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:234: upgrade_database: adding developer column to PhotoTable");
@@ -654,14 +655,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 236 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 655 "Db.c"
+#line 656 "Db.c"
 		}
 	}
 #line 239 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp29_ = database_table_has_column ("PhotoTable", "develop_shotwell_id");
 #line 239 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp29_) {
-#line 662 "Db.c"
+#line 663 "Db.c"
 		gboolean _tmp30_;
 #line 240 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:240: upgrade_database: adding develop_shotwell_id column to Ph" \
@@ -674,14 +675,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 242 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 674 "Db.c"
+#line 675 "Db.c"
 		}
 	}
 #line 245 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp31_ = database_table_has_column ("PhotoTable", "develop_camera_id");
 #line 245 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp31_) {
-#line 681 "Db.c"
+#line 682 "Db.c"
 		gboolean _tmp32_;
 #line 246 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:246: upgrade_database: adding develop_camera_id column to Phot" \
@@ -694,14 +695,14 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 248 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 693 "Db.c"
+#line 694 "Db.c"
 		}
 	}
 #line 251 "/home/jens/Source/shotwell/src/db/Db.vala"
 	_tmp33_ = database_table_has_column ("PhotoTable", "develop_embedded_id");
 #line 251 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp33_) {
-#line 700 "Db.c"
+#line 701 "Db.c"
 		gboolean _tmp34_;
 #line 252 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:252: upgrade_database: adding develop_embedded_id column to Ph" \
@@ -714,7 +715,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 254 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 712 "Db.c"
+#line 713 "Db.c"
 		}
 	}
 #line 257 "/home/jens/Source/shotwell/src/db/Db.vala"
@@ -725,7 +726,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	if (_tmp35_ < 14) {
 #line 265 "/home/jens/Source/shotwell/src/db/Db.vala"
 		tag_table_upgrade_for_htags ();
-#line 723 "Db.c"
+#line 724 "Db.c"
 	}
 #line 267 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 14;
@@ -737,7 +738,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	if (_tmp36_ < 16) {
 #line 292 "/home/jens/Source/shotwell/src/db/Db.vala"
 		gsettings_configuration_engine_run_gsettings_migrator ();
-#line 735 "Db.c"
+#line 736 "Db.c"
 	}
 #line 295 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 16;
@@ -745,7 +746,7 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 	_tmp37_ = database_table_has_column ("PhotoTable", "comment");
 #line 302 "/home/jens/Source/shotwell/src/db/Db.vala"
 	if (!_tmp37_) {
-#line 743 "Db.c"
+#line 744 "Db.c"
 		gboolean _tmp38_;
 #line 303 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:303: upgrade_database: adding comment column to PhotoTable");
@@ -757,95 +758,97 @@ DbVerifyResult db_upgrade_database (gint input_version) {
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 305 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 755 "Db.c"
+#line 756 "Db.c"
 		}
 	}
 #line 307 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp39_ = database_table_has_column ("VideoTable", "comment");
+	_tmp39_ = database_table_has_table ("VideoTable");
 #line 307 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!_tmp39_) {
-#line 762 "Db.c"
-		gboolean _tmp40_;
+	_tmp40_ = database_table_has_column ("VideoTable", "comment");
+#line 307 "/home/jens/Source/shotwell/src/db/Db.vala"
+	if (_tmp39_ & (!_tmp40_)) {
+#line 765 "Db.c"
+		gboolean _tmp41_;
 #line 308 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:308: upgrade_database: adding comment column to VideoTable");
 #line 309 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp40_ = database_table_add_column ("VideoTable", "comment", "TEXT");
+		_tmp41_ = database_table_add_column ("VideoTable", "comment", "TEXT");
 #line 309 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!_tmp40_) {
+		if (!_tmp41_) {
 #line 310 "/home/jens/Source/shotwell/src/db/Db.vala"
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 310 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 774 "Db.c"
+#line 777 "Db.c"
 		}
 	}
 #line 313 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 17;
 #line 320 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp41_ = database_table_has_column ("EventTable", "comment");
+	_tmp42_ = database_table_has_column ("EventTable", "comment");
 #line 320 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (!_tmp41_) {
-#line 783 "Db.c"
-		gboolean _tmp42_;
+	if (!_tmp42_) {
+#line 786 "Db.c"
+		gboolean _tmp43_;
 #line 321 "/home/jens/Source/shotwell/src/db/Db.vala"
 		g_message ("Db.vala:321: upgrade_database: adding comment column to EventTable");
 #line 322 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp42_ = database_table_add_column ("EventTable", "comment", "TEXT");
+		_tmp43_ = database_table_add_column ("EventTable", "comment", "TEXT");
 #line 322 "/home/jens/Source/shotwell/src/db/Db.vala"
-		if (!_tmp42_) {
+		if (!_tmp43_) {
 #line 323 "/home/jens/Source/shotwell/src/db/Db.vala"
 			result = DB_VERIFY_RESULT_UPGRADE_ERROR;
 #line 323 "/home/jens/Source/shotwell/src/db/Db.vala"
 			return result;
-#line 795 "Db.c"
+#line 798 "Db.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 18;
 #line 337 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp43_ = input_version;
+	_tmp44_ = input_version;
 #line 337 "/home/jens/Source/shotwell/src/db/Db.vala"
-	if (_tmp43_ < 19) {
-#line 804 "Db.c"
-		Application* _tmp44_;
+	if (_tmp44_ < 19) {
+#line 807 "Db.c"
 		Application* _tmp45_;
+		Application* _tmp46_;
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp44_ = application_get_instance ();
+		_tmp45_ = application_get_instance ();
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_tmp45_ = _tmp44_;
+		_tmp46_ = _tmp45_;
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		application_set_raw_thumbs_fix_required (_tmp45_, TRUE);
+		application_set_raw_thumbs_fix_required (_tmp46_, TRUE);
 #line 338 "/home/jens/Source/shotwell/src/db/Db.vala"
-		_application_unref0 (_tmp45_);
-#line 815 "Db.c"
+		_application_unref0 (_tmp46_);
+#line 818 "Db.c"
 	}
 #line 341 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 19;
 #line 351 "/home/jens/Source/shotwell/src/db/Db.vala"
 	version = 20;
 #line 357 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp46_ = version;
+	_tmp47_ = version;
 #line 357 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_vala_assert (_tmp46_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION");
+	_vala_assert (_tmp47_ == DATABASE_TABLE_SCHEMA_VERSION, "version == DatabaseTable.SCHEMA_VERSION");
 #line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp47_ = version_table_get_instance ();
+	_tmp48_ = version_table_get_instance ();
 #line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp48_ = _tmp47_;
+	_tmp49_ = _tmp48_;
 #line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp49_ = version;
+	_tmp50_ = version;
 #line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	version_table_update_version (_tmp48_, _tmp49_, RESOURCES_APP_VERSION);
+	version_table_update_version (_tmp49_, _tmp50_, RESOURCES_APP_VERSION);
 #line 358 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_database_table_unref0 (_tmp48_);
+	_database_table_unref0 (_tmp49_);
 #line 360 "/home/jens/Source/shotwell/src/db/Db.vala"
-	_tmp50_ = version;
+	_tmp51_ = version;
 #line 360 "/home/jens/Source/shotwell/src/db/Db.vala"
-	g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp50_);
+	g_message ("Db.vala:360: Database upgrade to schema version %d successful", _tmp51_);
 #line 362 "/home/jens/Source/shotwell/src/db/Db.vala"
 	result = DB_VERIFY_RESULT_OK;
 #line 362 "/home/jens/Source/shotwell/src/db/Db.vala"
 	return result;
-#line 843 "Db.c"
+#line 846 "Db.c"
 }
 
 
diff --git a/src/db/Db.vala b/src/db/Db.vala
index e4f83bf..3eca8ce 100644
--- a/src/db/Db.vala
+++ b/src/db/Db.vala
@@ -207,7 +207,7 @@ private VerifyResult upgrade_database(int input_version) {
 
     if (!DatabaseTable.has_column("EventTable", "primary_source_id")) {
         message("upgrade_database: adding primary_source_id column to EventTable");
-        if (!DatabaseTable.add_column("EventTable", "primary_source_id", "INTEGER DEFAULT 0"))
+        if (!DatabaseTable.add_column("EventTable", "primary_source_id", "TEXT"))
             return VerifyResult.UPGRADE_ERROR;
     }
     
@@ -304,7 +304,7 @@ private VerifyResult upgrade_database(int input_version) {
         if (!DatabaseTable.add_column("PhotoTable", "comment", "TEXT"))
             return VerifyResult.UPGRADE_ERROR;
     }
-    if (!DatabaseTable.has_column("VideoTable", "comment")) {
+    if (DatabaseTable.has_table("VideoTable") & !DatabaseTable.has_column("VideoTable", "comment")) {
         message("upgrade_database: adding comment column to VideoTable");
         if (!DatabaseTable.add_column("VideoTable", "comment", "TEXT"))
             return VerifyResult.UPGRADE_ERROR;
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 45e2254..3fd09f6 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <gee.h>
+#include "shotwell-graphics-processor.h"
 #include <sqlite3.h>
 #include <gio/gio.h>
 #include <gobject/gvaluecollector.h>
@@ -50,16 +51,6 @@ typedef struct _EventID EventID;
 
 #define TYPE_ORIENTATION (orientation_get_type ())
 
-#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
-#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
-#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
-#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
-#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-
-typedef struct _KeyValueMap KeyValueMap;
-typedef struct _KeyValueMapClass KeyValueMapClass;
-
 #define TYPE_RATING (rating_get_type ())
 
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
@@ -330,13 +321,6 @@ GType event_id_get_type (void) G_GNUC_CONST;
 EventID* event_id_dup (const EventID* self);
 void event_id_free (EventID* self);
 GType orientation_get_type (void) G_GNUC_CONST;
-gpointer key_value_map_ref (gpointer instance);
-void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
-gpointer value_get_key_value_map (const GValue* value);
-GType key_value_map_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 GType backing_photo_id_get_type (void) G_GNUC_CONST;
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self);
@@ -423,13 +407,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gchar* columns, sqlite3_stmt* * stmt);
 static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID* photo_id, const gchar* trans);
 gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_id, Orientation orientation, GeeHashMap* transformations);
-KeyValueMap* key_value_map_new (const gchar* group);
-KeyValueMap* key_value_map_construct (GType object_type, const gchar* group);
-void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value);
-GeeSet* key_value_map_get_keys (KeyValueMap* self);
-gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def);
 gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, KeyValueMap* map);
-gchar* key_value_map_get_group (KeyValueMap* self);
 gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id, const gchar* object);
 gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* photo_id);
 static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* file, const gchar* thumbnail_md5, const gchar* md5, PhotoFileFormat file_format);
@@ -480,7 +458,7 @@ void photo_id_init (PhotoID *self, gint64 id) {
 	_tmp0_ = id;
 #line 13 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
-#line 484 "PhotoTable.c"
+#line 462 "PhotoTable.c"
 }
 
 
@@ -493,7 +471,7 @@ gboolean photo_id_is_invalid (PhotoID *self) {
 	result = _tmp0_ == PHOTO_ID_INVALID;
 #line 17 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 497 "PhotoTable.c"
+#line 475 "PhotoTable.c"
 }
 
 
@@ -506,7 +484,7 @@ gboolean photo_id_is_valid (PhotoID *self) {
 	result = _tmp0_ != PHOTO_ID_INVALID;
 #line 21 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 510 "PhotoTable.c"
+#line 488 "PhotoTable.c"
 }
 
 
@@ -522,7 +500,7 @@ guint photo_id_hash (PhotoID *self) {
 	result = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 526 "PhotoTable.c"
+#line 504 "PhotoTable.c"
 }
 
 
@@ -544,7 +522,7 @@ gboolean photo_id_equal (void* a, void* b) {
 	result = _tmp1_ == _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 548 "PhotoTable.c"
+#line 526 "PhotoTable.c"
 }
 
 
@@ -565,7 +543,7 @@ gchar* photo_id_upgrade_photo_id_to_source_id (PhotoID* photo_id) {
 	result = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 569 "PhotoTable.c"
+#line 547 "PhotoTable.c"
 }
 
 
@@ -577,14 +555,14 @@ PhotoID* photo_id_dup (const PhotoID* self) {
 	memcpy (dup, self, sizeof (PhotoID));
 #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
-#line 581 "PhotoTable.c"
+#line 559 "PhotoTable.c"
 }
 
 
 void photo_id_free (PhotoID* self) {
 #line 7 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
-#line 588 "PhotoTable.c"
+#line 566 "PhotoTable.c"
 }
 
 
@@ -607,7 +585,7 @@ void import_id_init (ImportID *self, gint64 id) {
 	_tmp0_ = id;
 #line 43 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
-#line 611 "PhotoTable.c"
+#line 589 "PhotoTable.c"
 }
 
 
@@ -633,7 +611,7 @@ void import_id_generate (ImportID* result) {
 	*result = _tmp2_;
 #line 51 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return;
-#line 637 "PhotoTable.c"
+#line 615 "PhotoTable.c"
 }
 
 
@@ -646,7 +624,7 @@ gboolean import_id_is_invalid (ImportID *self) {
 	result = _tmp0_ == IMPORT_ID_INVALID;
 #line 55 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 650 "PhotoTable.c"
+#line 628 "PhotoTable.c"
 }
 
 
@@ -659,7 +637,7 @@ gboolean import_id_is_valid (ImportID *self) {
 	result = _tmp0_ != IMPORT_ID_INVALID;
 #line 59 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 663 "PhotoTable.c"
+#line 641 "PhotoTable.c"
 }
 
 
@@ -675,17 +653,17 @@ gint import_id_compare_func (ImportID* a, ImportID* b) {
 	_tmp1_ = a;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 679 "PhotoTable.c"
+#line 657 "PhotoTable.c"
 		ImportID* _tmp2_;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = b;
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 685 "PhotoTable.c"
+#line 663 "PhotoTable.c"
 	} else {
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = FALSE;
-#line 689 "PhotoTable.c"
+#line 667 "PhotoTable.c"
 	}
 #line 63 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp0_, "a != null && b != null");
@@ -701,7 +679,7 @@ gint import_id_compare_func (ImportID* a, ImportID* b) {
 	result = (gint) (_tmp4_ - _tmp6_);
 #line 64 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 705 "PhotoTable.c"
+#line 683 "PhotoTable.c"
 }
 
 
@@ -723,7 +701,7 @@ gint64 import_id_comparator (void* a, void* b) {
 	result = _tmp1_ - _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 727 "PhotoTable.c"
+#line 705 "PhotoTable.c"
 }
 
 
@@ -735,14 +713,14 @@ ImportID* import_id_dup (const ImportID* self) {
 	memcpy (dup, self, sizeof (ImportID));
 #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
-#line 739 "PhotoTable.c"
+#line 717 "PhotoTable.c"
 }
 
 
 void import_id_free (ImportID* self) {
 #line 37 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
-#line 746 "PhotoTable.c"
+#line 724 "PhotoTable.c"
 }
 
 
@@ -795,7 +773,7 @@ PhotoRow* photo_row_construct (GType object_type) {
 	_tmp3_ = (g_free (_tmp3_), NULL);
 #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = raw_developer_as_array (&_tmp5_);
-#line 799 "PhotoTable.c"
+#line 777 "PhotoTable.c"
 	{
 		RawDeveloper* d_collection = NULL;
 		gint d_collection_length1 = 0;
@@ -807,11 +785,11 @@ PhotoRow* photo_row_construct (GType object_type) {
 		d_collection_length1 = _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		for (d_it = 0; d_it < _tmp5_; d_it = d_it + 1) {
-#line 811 "PhotoTable.c"
+#line 789 "PhotoTable.c"
 			RawDeveloper d = 0;
 #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			d = d_collection[d_it];
-#line 815 "PhotoTable.c"
+#line 793 "PhotoTable.c"
 			{
 				BackingPhotoID* _tmp7_;
 				gint _tmp7__length1;
@@ -830,30 +808,30 @@ PhotoRow* photo_row_construct (GType object_type) {
 				_tmp7_[_tmp8_] = _tmp9_;
 #line 105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp10_ = _tmp7_[_tmp8_];
-#line 834 "PhotoTable.c"
+#line 812 "PhotoTable.c"
 			}
 		}
 #line 104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		d_collection = (g_free (d_collection), NULL);
-#line 839 "PhotoTable.c"
+#line 817 "PhotoTable.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 843 "PhotoTable.c"
+#line 821 "PhotoTable.c"
 }
 
 
 PhotoRow* photo_row_new (void) {
 #line 100 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return photo_row_construct (TYPE_PHOTO_ROW);
-#line 850 "PhotoTable.c"
+#line 828 "PhotoTable.c"
 }
 
 
 static void value_photo_row_init (GValue* value) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 857 "PhotoTable.c"
+#line 835 "PhotoTable.c"
 }
 
 
@@ -862,7 +840,7 @@ static void value_photo_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_row_unref (value->data[0].v_pointer);
-#line 866 "PhotoTable.c"
+#line 844 "PhotoTable.c"
 	}
 }
 
@@ -872,11 +850,11 @@ static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = photo_row_ref (src_value->data[0].v_pointer);
-#line 876 "PhotoTable.c"
+#line 854 "PhotoTable.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 880 "PhotoTable.c"
+#line 858 "PhotoTable.c"
 	}
 }
 
@@ -884,37 +862,37 @@ static void value_photo_row_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_photo_row_peek_pointer (const GValue* value) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 888 "PhotoTable.c"
+#line 866 "PhotoTable.c"
 }
 
 
 static gchar* value_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 895 "PhotoTable.c"
+#line 873 "PhotoTable.c"
 		PhotoRow * object;
 		object = collect_values[0].v_pointer;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 72 "/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 902 "PhotoTable.c"
+#line 880 "PhotoTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 72 "/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 906 "PhotoTable.c"
+#line 884 "PhotoTable.c"
 		}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = photo_row_ref (object);
-#line 910 "PhotoTable.c"
+#line 888 "PhotoTable.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 914 "PhotoTable.c"
+#line 892 "PhotoTable.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 918 "PhotoTable.c"
+#line 896 "PhotoTable.c"
 }
 
 
@@ -925,25 +903,25 @@ static gchar* value_photo_row_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 72 "/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 929 "PhotoTable.c"
+#line 907 "PhotoTable.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = NULL;
-#line 935 "PhotoTable.c"
+#line 913 "PhotoTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 939 "PhotoTable.c"
+#line 917 "PhotoTable.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = photo_row_ref (value->data[0].v_pointer);
-#line 943 "PhotoTable.c"
+#line 921 "PhotoTable.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 947 "PhotoTable.c"
+#line 925 "PhotoTable.c"
 }
 
 
@@ -957,7 +935,7 @@ GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 961 "PhotoTable.c"
+#line 939 "PhotoTable.c"
 }
 
 
@@ -966,7 +944,7 @@ gpointer value_get_photo_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_ROW), NULL);
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 970 "PhotoTable.c"
+#line 948 "PhotoTable.c"
 }
 
 
@@ -986,17 +964,17 @@ void value_set_photo_row (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_row_ref (value->data[0].v_pointer);
-#line 990 "PhotoTable.c"
+#line 968 "PhotoTable.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 994 "PhotoTable.c"
+#line 972 "PhotoTable.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_row_unref (old);
-#line 1000 "PhotoTable.c"
+#line 978 "PhotoTable.c"
 	}
 }
 
@@ -1015,17 +993,17 @@ void value_take_photo_row (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 1019 "PhotoTable.c"
+#line 997 "PhotoTable.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 1023 "PhotoTable.c"
+#line 1001 "PhotoTable.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_row_unref (old);
-#line 1029 "PhotoTable.c"
+#line 1007 "PhotoTable.c"
 	}
 }
 
@@ -1035,14 +1013,14 @@ static void photo_row_class_init (PhotoRowClass * klass) {
 	photo_row_parent_class = g_type_class_peek_parent (klass);
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((PhotoRowClass *) klass)->finalize = photo_row_finalize;
-#line 1039 "PhotoTable.c"
+#line 1017 "PhotoTable.c"
 }
 
 
 static void photo_row_instance_init (PhotoRow * self) {
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->ref_count = 1;
-#line 1046 "PhotoTable.c"
+#line 1024 "PhotoTable.c"
 }
 
 
@@ -1070,7 +1048,7 @@ static void photo_row_finalize (PhotoRow * obj) {
 	_g_free0 (self->backlinks);
 #line 97 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->development_ids = (g_free (self->development_ids), NULL);
-#line 1074 "PhotoTable.c"
+#line 1052 "PhotoTable.c"
 }
 
 
@@ -1095,7 +1073,7 @@ gpointer photo_row_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return instance;
-#line 1099 "PhotoTable.c"
+#line 1077 "PhotoTable.c"
 }
 
 
@@ -1108,7 +1086,7 @@ void photo_row_unref (gpointer instance) {
 		PHOTO_ROW_GET_CLASS (self)->finalize (self);
 #line 72 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1112 "PhotoTable.c"
+#line 1090 "PhotoTable.c"
 	}
 }
 
@@ -1187,13 +1165,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp6_ = res;
 #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
-#line 1191 "PhotoTable.c"
+#line 1169 "PhotoTable.c"
 		gint _tmp7_;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create photo table", _tmp7_);
-#line 1197 "PhotoTable.c"
+#line 1175 "PhotoTable.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = database_table_db;
@@ -1219,13 +1197,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp14_ = res2;
 #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 1223 "PhotoTable.c"
+#line 1201 "PhotoTable.c"
 		gint _tmp15_;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res2;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create photo table", _tmp15_);
-#line 1229 "PhotoTable.c"
+#line 1207 "PhotoTable.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = database_table_db;
@@ -1251,13 +1229,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp22_ = res;
 #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
-#line 1255 "PhotoTable.c"
+#line 1233 "PhotoTable.c"
 		gint _tmp23_;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp23_ = res;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("Failed to drop old PhotoTable index", _tmp23_);
-#line 1261 "PhotoTable.c"
+#line 1239 "PhotoTable.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = database_table_db;
@@ -1284,13 +1262,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp30_ = res;
 #line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
-#line 1287 "PhotoTable.c"
+#line 1265 "PhotoTable.c"
 		gint _tmp31_;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = res;
 #line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("Failed to create index on md5 and file_format", _tmp31_);
-#line 1293 "PhotoTable.c"
+#line 1271 "PhotoTable.c"
 	}
 #line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = database_table_db;
@@ -1317,13 +1295,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp38_ = res;
 #line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
-#line 1319 "PhotoTable.c"
+#line 1297 "PhotoTable.c"
 		gint _tmp39_;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = res;
 #line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("Failed to create index on md5 and file_format", _tmp39_);
-#line 1325 "PhotoTable.c"
+#line 1303 "PhotoTable.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = database_table_db;
@@ -1350,13 +1328,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp46_ = res;
 #line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != SQLITE_DONE) {
-#line 1351 "PhotoTable.c"
+#line 1329 "PhotoTable.c"
 		gint _tmp47_;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = res;
 #line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp47_);
-#line 1357 "PhotoTable.c"
+#line 1335 "PhotoTable.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable");
@@ -1366,21 +1344,21 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_sqlite3_finalize0 (stmt);
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 1367 "PhotoTable.c"
+#line 1345 "PhotoTable.c"
 }
 
 
 static PhotoTable* photo_table_new (void) {
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return photo_table_construct (TYPE_PHOTO_TABLE);
-#line 1374 "PhotoTable.c"
+#line 1352 "PhotoTable.c"
 }
 
 
 static gpointer _database_table_ref0 (gpointer self) {
 #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self ? database_table_ref (self) : NULL;
-#line 1381 "PhotoTable.c"
+#line 1359 "PhotoTable.c"
 }
 
 
@@ -1393,7 +1371,7 @@ PhotoTable* photo_table_get_instance (void) {
 	_tmp0_ = photo_table_instance;
 #line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
-#line 1394 "PhotoTable.c"
+#line 1372 "PhotoTable.c"
 		PhotoTable* _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = photo_table_new ();
@@ -1401,7 +1379,7 @@ PhotoTable* photo_table_get_instance (void) {
 		_database_table_unref0 (photo_table_instance);
 #line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_table_instance = _tmp1_;
-#line 1402 "PhotoTable.c"
+#line 1380 "PhotoTable.c"
 	}
 #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = photo_table_instance;
@@ -1411,7 +1389,7 @@ PhotoTable* photo_table_get_instance (void) {
 	result = _tmp3_;
 #line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 1412 "PhotoTable.c"
+#line 1390 "PhotoTable.c"
 }
 
 
@@ -1921,20 +1899,20 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 	_tmp129_ = res;
 #line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp129_ != SQLITE_DONE) {
-#line 1919 "PhotoTable.c"
+#line 1897 "PhotoTable.c"
 		gint _tmp130_;
 		PhotoID _tmp132_ = {0};
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp130_ = res;
 #line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp130_ != SQLITE_CONSTRAINT) {
-#line 1926 "PhotoTable.c"
+#line 1904 "PhotoTable.c"
 			gint _tmp131_;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp131_ = res;
 #line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("add_photo", _tmp131_);
-#line 1932 "PhotoTable.c"
+#line 1910 "PhotoTable.c"
 		}
 #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp132_, PHOTO_ID_INVALID);
@@ -1944,7 +1922,7 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 		_sqlite3_finalize0 (stmt);
 #line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return;
-#line 1942 "PhotoTable.c"
+#line 1920 "PhotoTable.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp133_ = photo_row;
@@ -1988,7 +1966,7 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 	_sqlite3_finalize0 (stmt);
 #line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return;
-#line 1986 "PhotoTable.c"
+#line 1964 "PhotoTable.c"
 }
 
 
@@ -2366,7 +2344,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 	_tmp95_ = res;
 #line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp95_ != SQLITE_DONE) {
-#line 2361 "PhotoTable.c"
+#line 2339 "PhotoTable.c"
 		gint _tmp96_;
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp96_ = res;
@@ -2382,7 +2360,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 				_sqlite3_finalize0 (stmt);
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 2377 "PhotoTable.c"
+#line 2355 "PhotoTable.c"
 			} else {
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -2392,7 +2370,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 2387 "PhotoTable.c"
+#line 2365 "PhotoTable.c"
 			}
 		}
 	}
@@ -2414,7 +2392,7 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 	_tmp99_->orientation = _tmp102_;
 #line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 2409 "PhotoTable.c"
+#line 2387 "PhotoTable.c"
 }
 
 
@@ -2594,19 +2572,19 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 	_tmp37_ = res;
 #line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp37_ != SQLITE_DONE) {
-#line 2588 "PhotoTable.c"
+#line 2566 "PhotoTable.c"
 		gint _tmp38_;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_ = res;
 #line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp38_ != SQLITE_CONSTRAINT) {
-#line 2594 "PhotoTable.c"
+#line 2572 "PhotoTable.c"
 			gint _tmp39_;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp39_ = res;
 #line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("write_update_photo", _tmp39_);
-#line 2600 "PhotoTable.c"
+#line 2578 "PhotoTable.c"
 		}
 #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
@@ -2614,7 +2592,7 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 		_sqlite3_finalize0 (stmt);
 #line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 2608 "PhotoTable.c"
+#line 2586 "PhotoTable.c"
 	}
 #line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = row;
@@ -2668,7 +2646,7 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 	_sqlite3_finalize0 (stmt);
 #line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 2662 "PhotoTable.c"
+#line 2640 "PhotoTable.c"
 }
 
 
@@ -2688,7 +2666,7 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 	if (_tmp2_ < ORIENTATION_MIN) {
 #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 2682 "PhotoTable.c"
+#line 2660 "PhotoTable.c"
 	} else {
 		PhotoRow* _tmp3_;
 		Orientation _tmp4_;
@@ -2698,11 +2676,11 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 		_tmp4_ = _tmp3_->orientation;
 #line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ > ORIENTATION_MAX;
-#line 2692 "PhotoTable.c"
+#line 2670 "PhotoTable.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
-#line 2696 "PhotoTable.c"
+#line 2674 "PhotoTable.c"
 		PhotoRow* _tmp5_;
 		PhotoID _tmp6_;
 		PhotoRow* _tmp7_;
@@ -2716,7 +2694,7 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 		_tmp7_ = row;
 #line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_->orientation = ORIENTATION_MIN;
-#line 2710 "PhotoTable.c"
+#line 2688 "PhotoTable.c"
 	}
 }
 
@@ -2899,7 +2877,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 		_sqlite3_finalize0 (stmt);
 #line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 2890 "PhotoTable.c"
+#line 2868 "PhotoTable.c"
 	}
 #line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = photo_row_new ();
@@ -3141,7 +3119,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 	_tmp99_ = sqlite3_column_text (_tmp98_, 23);
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp99_ != NULL) {
-#line 3132 "PhotoTable.c"
+#line 3110 "PhotoTable.c"
 		sqlite3_stmt* _tmp100_;
 		const gchar* _tmp101_;
 		RawDeveloper _tmp102_;
@@ -3153,11 +3131,11 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 		_tmp102_ = raw_developer_from_string (_tmp101_);
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp97_ = _tmp102_;
-#line 3144 "PhotoTable.c"
+#line 3122 "PhotoTable.c"
 	} else {
 #line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp97_ = RAW_DEVELOPER_CAMERA;
-#line 3148 "PhotoTable.c"
+#line 3126 "PhotoTable.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp103_ = row;
@@ -3229,7 +3207,7 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 	_sqlite3_finalize0 (stmt);
 #line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 3220 "PhotoTable.c"
+#line 3198 "PhotoTable.c"
 }
 
 
@@ -3269,7 +3247,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 	all = _tmp4_;
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
-#line 3256 "PhotoTable.c"
+#line 3234 "PhotoTable.c"
 		sqlite3_stmt* _tmp5_;
 		gint _tmp6_;
 		gint _tmp7_;
@@ -3405,7 +3383,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 		if (!(_tmp7_ == SQLITE_ROW)) {
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 3392 "PhotoTable.c"
+#line 3370 "PhotoTable.c"
 		}
 #line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = photo_row_new ();
@@ -3649,7 +3627,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 		_tmp97_ = sqlite3_column_text (_tmp96_, 24);
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp97_ != NULL) {
-#line 3636 "PhotoTable.c"
+#line 3614 "PhotoTable.c"
 			sqlite3_stmt* _tmp98_;
 			const gchar* _tmp99_;
 			RawDeveloper _tmp100_;
@@ -3661,11 +3639,11 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 			_tmp100_ = raw_developer_from_string (_tmp99_);
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp95_ = _tmp100_;
-#line 3648 "PhotoTable.c"
+#line 3626 "PhotoTable.c"
 		} else {
 #line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp95_ = RAW_DEVELOPER_CAMERA;
-#line 3652 "PhotoTable.c"
+#line 3630 "PhotoTable.c"
 		}
 #line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp101_ = row;
@@ -3743,7 +3721,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_);
 #line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_photo_row_unref0 (row);
-#line 3730 "PhotoTable.c"
+#line 3708 "PhotoTable.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = all;
@@ -3751,7 +3729,7 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 	_sqlite3_finalize0 (stmt);
 #line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 3738 "PhotoTable.c"
+#line 3716 "PhotoTable.c"
 }
 
 
@@ -4372,20 +4350,20 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 	_tmp159_ = res;
 #line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp159_ != SQLITE_DONE) {
-#line 4355 "PhotoTable.c"
+#line 4333 "PhotoTable.c"
 		gint _tmp160_;
 		PhotoID _tmp162_ = {0};
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp160_ = res;
 #line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp160_ != SQLITE_CONSTRAINT) {
-#line 4362 "PhotoTable.c"
+#line 4340 "PhotoTable.c"
 			gint _tmp161_;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp161_ = res;
 #line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("duplicate", _tmp161_);
-#line 4368 "PhotoTable.c"
+#line 4346 "PhotoTable.c"
 		}
 #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp162_, PHOTO_ID_INVALID);
@@ -4397,7 +4375,7 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 		_photo_row_unref0 (original);
 #line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return;
-#line 4380 "PhotoTable.c"
+#line 4358 "PhotoTable.c"
 	}
 #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp163_ = database_table_db;
@@ -4413,7 +4391,7 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 	_photo_row_unref0 (original);
 #line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return;
-#line 4396 "PhotoTable.c"
+#line 4374 "PhotoTable.c"
 }
 
 
@@ -4432,17 +4410,17 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 	_tmp1_ = new_title;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 4415 "PhotoTable.c"
+#line 4393 "PhotoTable.c"
 		const gchar* _tmp2_;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_title;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 4421 "PhotoTable.c"
+#line 4399 "PhotoTable.c"
 	} else {
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 4425 "PhotoTable.c"
+#line 4403 "PhotoTable.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
@@ -4454,7 +4432,7 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 	result = _tmp5_;
 #line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4437 "PhotoTable.c"
+#line 4415 "PhotoTable.c"
 }
 
 
@@ -4473,17 +4451,17 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 	_tmp1_ = new_comment;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 4456 "PhotoTable.c"
+#line 4434 "PhotoTable.c"
 		const gchar* _tmp2_;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_comment;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 4462 "PhotoTable.c"
+#line 4440 "PhotoTable.c"
 	} else {
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 4466 "PhotoTable.c"
+#line 4444 "PhotoTable.c"
 	}
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
@@ -4495,7 +4473,7 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 	result = _tmp5_;
 #line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4478 "PhotoTable.c"
+#line 4456 "PhotoTable.c"
 }
 
 
@@ -4526,7 +4504,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar*
 			g_propagate_error (error, _inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4509 "PhotoTable.c"
+#line 4487 "PhotoTable.c"
 		} else {
 #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4534,7 +4512,7 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar*
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4517 "PhotoTable.c"
+#line 4495 "PhotoTable.c"
 		}
 	}
 }
@@ -4565,7 +4543,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t
 			g_propagate_error (error, _inner_error_);
 #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4548 "PhotoTable.c"
+#line 4526 "PhotoTable.c"
 		} else {
 #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4573,7 +4551,7 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t
 			g_clear_error (&_inner_error_);
 #line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4556 "PhotoTable.c"
+#line 4534 "PhotoTable.c"
 		}
 	}
 }
@@ -4601,7 +4579,7 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim
 	result = _tmp3_;
 #line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4584 "PhotoTable.c"
+#line 4562 "PhotoTable.c"
 }
 
 
@@ -4635,7 +4613,7 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i
 			g_propagate_error (error, _inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4618 "PhotoTable.c"
+#line 4596 "PhotoTable.c"
 		} else {
 #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4643,7 +4621,7 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i
 			g_clear_error (&_inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4626 "PhotoTable.c"
+#line 4604 "PhotoTable.c"
 		}
 	}
 }
@@ -4710,7 +4688,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 	_tmp12_ = res;
 #line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
-#line 4693 "PhotoTable.c"
+#line 4671 "PhotoTable.c"
 		gint _tmp13_;
 #line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = res;
@@ -4722,7 +4700,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 		_sqlite3_finalize0 (stmt);
 #line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 4705 "PhotoTable.c"
+#line 4683 "PhotoTable.c"
 	}
 #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
@@ -4730,7 +4708,7 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 	_sqlite3_finalize0 (stmt);
 #line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4713 "PhotoTable.c"
+#line 4691 "PhotoTable.c"
 }
 
 
@@ -4756,7 +4734,7 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4739 "PhotoTable.c"
+#line 4717 "PhotoTable.c"
 		} else {
 #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4764,7 +4742,7 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4747 "PhotoTable.c"
+#line 4725 "PhotoTable.c"
 		}
 	}
 }
@@ -4800,14 +4778,14 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
 #line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_ids = _tmp4_;
-#line 4783 "PhotoTable.c"
+#line 4761 "PhotoTable.c"
 	{
 		gboolean _tmp5_ = FALSE;
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = TRUE;
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 4790 "PhotoTable.c"
+#line 4768 "PhotoTable.c"
 			sqlite3_stmt* _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -4817,7 +4795,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 			PhotoID _tmp14_ = {0};
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp5_) {
-#line 4800 "PhotoTable.c"
+#line 4778 "PhotoTable.c"
 			}
 #line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp5_ = FALSE;
@@ -4833,14 +4811,14 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 			if (_tmp8_ == SQLITE_DONE) {
 #line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 4816 "PhotoTable.c"
+#line 4794 "PhotoTable.c"
 			} else {
 				gint _tmp9_;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp9_ = res;
 #line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
-#line 4823 "PhotoTable.c"
+#line 4801 "PhotoTable.c"
 					gint _tmp10_;
 #line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp10_ = res;
@@ -4848,7 +4826,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 					database_table_fatal ("get_photos", _tmp10_);
 #line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 4831 "PhotoTable.c"
+#line 4809 "PhotoTable.c"
 				}
 			}
 #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4861,7 +4839,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 			photo_id_init (&_tmp14_, _tmp13_);
 #line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_);
-#line 4844 "PhotoTable.c"
+#line 4822 "PhotoTable.c"
 		}
 	}
 #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -4870,7 +4848,7 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 	_sqlite3_finalize0 (stmt);
 #line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4853 "PhotoTable.c"
+#line 4831 "PhotoTable.c"
 }
 
 
@@ -4896,7 +4874,7 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien
 	result = _tmp3_;
 #line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4879 "PhotoTable.c"
+#line 4857 "PhotoTable.c"
 }
 
 
@@ -4922,7 +4900,7 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64
 	result = _tmp3_;
 #line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4905 "PhotoTable.c"
+#line 4883 "PhotoTable.c"
 }
 
 
@@ -4951,7 +4929,7 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat
 	result = _tmp4_;
 #line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4934 "PhotoTable.c"
+#line 4912 "PhotoTable.c"
 }
 
 
@@ -5003,21 +4981,21 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
 #line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	count = 0;
-#line 4986 "PhotoTable.c"
+#line 4964 "PhotoTable.c"
 	{
 		gboolean _tmp9_ = FALSE;
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = TRUE;
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 4993 "PhotoTable.c"
+#line 4971 "PhotoTable.c"
 			sqlite3_stmt* _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
 			gint _tmp15_;
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp9_) {
-#line 5000 "PhotoTable.c"
+#line 4978 "PhotoTable.c"
 			}
 #line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = FALSE;
@@ -5033,14 +5011,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 			if (_tmp12_ == SQLITE_DONE) {
 #line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 5016 "PhotoTable.c"
+#line 4994 "PhotoTable.c"
 			} else {
 				gint _tmp13_;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp13_ = res;
 #line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp13_ != SQLITE_ROW) {
-#line 5023 "PhotoTable.c"
+#line 5001 "PhotoTable.c"
 					gint _tmp14_;
 #line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp14_ = res;
@@ -5048,14 +5026,14 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 					database_table_fatal ("get_event_photo_count", _tmp14_);
 #line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 5031 "PhotoTable.c"
+#line 5009 "PhotoTable.c"
 				}
 			}
 #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = count;
 #line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			count = _tmp15_ + 1;
-#line 5038 "PhotoTable.c"
+#line 5016 "PhotoTable.c"
 		}
 	}
 #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5064,7 +5042,7 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 	_sqlite3_finalize0 (stmt);
 #line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5047 "PhotoTable.c"
+#line 5025 "PhotoTable.c"
 }
 
 
@@ -5119,14 +5097,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_result_ = _tmp9_;
-#line 5102 "PhotoTable.c"
+#line 5080 "PhotoTable.c"
 	{
 		gboolean _tmp10_ = FALSE;
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = TRUE;
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 5109 "PhotoTable.c"
+#line 5087 "PhotoTable.c"
 			sqlite3_stmt* _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
@@ -5138,7 +5116,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 			gchar* _tmp21_;
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp10_) {
-#line 5121 "PhotoTable.c"
+#line 5099 "PhotoTable.c"
 			}
 #line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp10_ = FALSE;
@@ -5154,14 +5132,14 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 			if (_tmp13_ == SQLITE_DONE) {
 #line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 5137 "PhotoTable.c"
+#line 5115 "PhotoTable.c"
 			} else {
 				gint _tmp14_;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp14_ = res;
 #line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
-#line 5144 "PhotoTable.c"
+#line 5122 "PhotoTable.c"
 					gint _tmp15_;
 #line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp15_ = res;
@@ -5169,7 +5147,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 					database_table_fatal ("get_event_source_ids", _tmp15_);
 #line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 5152 "PhotoTable.c"
+#line 5130 "PhotoTable.c"
 				}
 			}
 #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5188,7 +5166,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
 #line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (_tmp21_);
-#line 5171 "PhotoTable.c"
+#line 5149 "PhotoTable.c"
 		}
 	}
 #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5197,7 +5175,7 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 	_sqlite3_finalize0 (stmt);
 #line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5180 "PhotoTable.c"
+#line 5158 "PhotoTable.c"
 }
 
 
@@ -5265,14 +5243,14 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 		_sqlite3_finalize0 (stmt);
 #line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5248 "PhotoTable.c"
+#line 5226 "PhotoTable.c"
 	} else {
 		gint _tmp12_;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
-#line 5255 "PhotoTable.c"
+#line 5233 "PhotoTable.c"
 			gint _tmp13_;
 #line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
@@ -5284,7 +5262,7 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 			_sqlite3_finalize0 (stmt);
 #line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 5267 "PhotoTable.c"
+#line 5245 "PhotoTable.c"
 		}
 	}
 #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5293,7 +5271,7 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 	_sqlite3_finalize0 (stmt);
 #line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5276 "PhotoTable.c"
+#line 5254 "PhotoTable.c"
 }
 
 
@@ -5368,7 +5346,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 	_tmp14_ = res;
 #line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 5351 "PhotoTable.c"
+#line 5329 "PhotoTable.c"
 		gint _tmp15_;
 #line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res;
@@ -5380,7 +5358,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 		_sqlite3_finalize0 (stmt);
 #line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5363 "PhotoTable.c"
+#line 5341 "PhotoTable.c"
 	}
 #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
@@ -5388,7 +5366,7 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 	_sqlite3_finalize0 (stmt);
 #line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5371 "PhotoTable.c"
+#line 5349 "PhotoTable.c"
 }
 
 
@@ -5419,7 +5397,7 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev
 	result = _tmp4_;
 #line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5402 "PhotoTable.c"
+#line 5380 "PhotoTable.c"
 }
 
 
@@ -5458,7 +5436,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 		_sqlite3_finalize0 (stmt);
 #line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5441 "PhotoTable.c"
+#line 5419 "PhotoTable.c"
 	}
 #line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
@@ -5474,7 +5452,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 	if (_tmp8_ == NULL) {
 #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = TRUE;
-#line 5457 "PhotoTable.c"
+#line 5435 "PhotoTable.c"
 	} else {
 		const gchar* _tmp9_;
 		gint _tmp10_;
@@ -5487,7 +5465,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 		_tmp11_ = _tmp10_;
 #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = _tmp11_ == 0;
-#line 5470 "PhotoTable.c"
+#line 5448 "PhotoTable.c"
 	}
 #line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp7_) {
@@ -5499,7 +5477,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 		_sqlite3_finalize0 (stmt);
 #line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5482 "PhotoTable.c"
+#line 5460 "PhotoTable.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = trans;
@@ -5507,7 +5485,7 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 	_sqlite3_finalize0 (stmt);
 #line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5490 "PhotoTable.c"
+#line 5468 "PhotoTable.c"
 }
 
 
@@ -5535,7 +5513,7 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID*
 	result = _tmp3_;
 #line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5518 "PhotoTable.c"
+#line 5496 "PhotoTable.c"
 }
 
 
@@ -5638,7 +5616,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 	_tmp21_ = res;
 #line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp21_ != SQLITE_DONE) {
-#line 5620 "PhotoTable.c"
+#line 5598 "PhotoTable.c"
 		gint _tmp22_;
 #line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = res;
@@ -5650,7 +5628,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 		_sqlite3_finalize0 (stmt);
 #line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5632 "PhotoTable.c"
+#line 5610 "PhotoTable.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
@@ -5658,7 +5636,7 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 	_sqlite3_finalize0 (stmt);
 #line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5640 "PhotoTable.c"
+#line 5618 "PhotoTable.c"
 }
 
 
@@ -5673,7 +5651,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	if (_tmp1_ == NULL) {
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 5655 "PhotoTable.c"
+#line 5633 "PhotoTable.c"
 	} else {
 		const gchar* _tmp2_;
 		gint _tmp3_;
@@ -5686,7 +5664,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_tmp4_ = _tmp3_;
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 5668 "PhotoTable.c"
+#line 5646 "PhotoTable.c"
 	}
 #line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
@@ -5694,7 +5672,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		result = NULL;
 #line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5676 "PhotoTable.c"
+#line 5654 "PhotoTable.c"
 	}
 	{
 		GKeyFile* keyfile = NULL;
@@ -5738,7 +5716,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 5720 "PhotoTable.c"
+#line 5698 "PhotoTable.c"
 			goto __catch17_g_error;
 		}
 #line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5749,7 +5727,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 			_g_key_file_unref0 (keyfile);
 #line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 5731 "PhotoTable.c"
+#line 5709 "PhotoTable.c"
 		}
 #line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -5769,7 +5747,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_tmp17_ = objects;
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17__length1 = objects_length1;
-#line 5751 "PhotoTable.c"
+#line 5729 "PhotoTable.c"
 		{
 			gchar** object_collection = NULL;
 			gint object_collection_length1 = 0;
@@ -5781,14 +5759,14 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 			object_collection_length1 = _tmp17__length1;
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) {
-#line 5763 "PhotoTable.c"
+#line 5741 "PhotoTable.c"
 				gchar* _tmp18_;
 				gchar* object = NULL;
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp18_ = g_strdup (object_collection[object_it]);
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				object = _tmp18_;
-#line 5770 "PhotoTable.c"
+#line 5748 "PhotoTable.c"
 				{
 					gchar** keys = NULL;
 					GKeyFile* _tmp19_;
@@ -5828,7 +5806,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 						_g_object_unref0 (map);
 #line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_key_file_unref0 (keyfile);
-#line 5810 "PhotoTable.c"
+#line 5788 "PhotoTable.c"
 						goto __catch17_g_error;
 					}
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5839,7 +5817,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 					if (_tmp24_ == NULL) {
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp23_ = TRUE;
-#line 5821 "PhotoTable.c"
+#line 5799 "PhotoTable.c"
 					} else {
 						gchar** _tmp25_;
 						gint _tmp25__length1;
@@ -5849,7 +5827,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 						_tmp25__length1 = keys_length1;
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp23_ = _tmp25__length1 == 0;
-#line 5831 "PhotoTable.c"
+#line 5809 "PhotoTable.c"
 					}
 #line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					if (_tmp23_) {
@@ -5859,7 +5837,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 						_g_free0 (object);
 #line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						continue;
-#line 5841 "PhotoTable.c"
+#line 5819 "PhotoTable.c"
 					}
 #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp26_ = object;
@@ -5867,19 +5845,19 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 					_tmp27_ = key_value_map_new (_tmp26_);
 #line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					key_map = _tmp27_;
-#line 5849 "PhotoTable.c"
+#line 5827 "PhotoTable.c"
 					{
 						gint ctr = 0;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						ctr = 0;
-#line 5854 "PhotoTable.c"
+#line 5832 "PhotoTable.c"
 						{
 							gboolean _tmp28_ = FALSE;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							_tmp28_ = TRUE;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							while (TRUE) {
-#line 5861 "PhotoTable.c"
+#line 5839 "PhotoTable.c"
 								gint _tmp30_;
 								gchar** _tmp31_;
 								gint _tmp31__length1;
@@ -5898,13 +5876,13 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 								const gchar* _tmp42_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (!_tmp28_) {
-#line 5880 "PhotoTable.c"
+#line 5858 "PhotoTable.c"
 									gint _tmp29_;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_tmp29_ = ctr;
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									ctr = _tmp29_ + 1;
-#line 5886 "PhotoTable.c"
+#line 5864 "PhotoTable.c"
 								}
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp28_ = FALSE;
@@ -5918,7 +5896,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 								if (!(_tmp30_ < _tmp31__length1)) {
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									break;
-#line 5900 "PhotoTable.c"
+#line 5878 "PhotoTable.c"
 								}
 #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp33_ = keyfile;
@@ -5950,7 +5928,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 									_g_object_unref0 (map);
 #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_g_key_file_unref0 (keyfile);
-#line 5932 "PhotoTable.c"
+#line 5910 "PhotoTable.c"
 									goto __catch17_g_error;
 								}
 #line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -5967,7 +5945,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 								key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_);
 #line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_g_free0 (_tmp32_);
-#line 5949 "PhotoTable.c"
+#line 5927 "PhotoTable.c"
 							}
 						}
 					}
@@ -5985,7 +5963,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_g_free0 (object);
-#line 5967 "PhotoTable.c"
+#line 5945 "PhotoTable.c"
 				}
 			}
 		}
@@ -5997,7 +5975,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		_g_key_file_unref0 (keyfile);
 #line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5979 "PhotoTable.c"
+#line 5957 "PhotoTable.c"
 	}
 	goto __finally17;
 	__catch17_g_error:
@@ -6014,7 +5992,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		g_error ("PhotoTable.vala:812: %s", _tmp46_);
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 5996 "PhotoTable.c"
+#line 5974 "PhotoTable.c"
 	}
 	__finally17:
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6023,7 +6001,7 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	g_clear_error (&_inner_error_);
 #line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 6005 "PhotoTable.c"
+#line 5983 "PhotoTable.c"
 }
 
 
@@ -6050,7 +6028,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 	if (_tmp1_ == NULL) {
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 6032 "PhotoTable.c"
+#line 6010 "PhotoTable.c"
 	} else {
 		GeeHashMap* _tmp2_;
 		GeeSet* _tmp3_;
@@ -6074,7 +6052,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		_tmp0_ = _tmp7_ == 0;
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_tmp5_);
-#line 6056 "PhotoTable.c"
+#line 6034 "PhotoTable.c"
 	}
 #line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
@@ -6082,13 +6060,13 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		result = NULL;
 #line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6064 "PhotoTable.c"
+#line 6042 "PhotoTable.c"
 	}
 #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = g_key_file_new ();
 #line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	keyfile = _tmp8_;
-#line 6070 "PhotoTable.c"
+#line 6048 "PhotoTable.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp9_;
@@ -6115,7 +6093,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		_object_it = _tmp14_;
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 6097 "PhotoTable.c"
+#line 6075 "PhotoTable.c"
 			GeeIterator* _tmp15_;
 			gboolean _tmp16_;
 			gchar* object = NULL;
@@ -6133,7 +6111,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 			if (!_tmp16_) {
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 6115 "PhotoTable.c"
+#line 6093 "PhotoTable.c"
 			}
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp17_ = _object_it;
@@ -6149,7 +6127,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 			_tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_);
 #line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			map = (KeyValueMap*) _tmp21_;
-#line 6131 "PhotoTable.c"
+#line 6109 "PhotoTable.c"
 			{
 				GeeIterator* _key_it = NULL;
 				KeyValueMap* _tmp22_;
@@ -6173,7 +6151,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 				_key_it = _tmp26_;
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				while (TRUE) {
-#line 6155 "PhotoTable.c"
+#line 6133 "PhotoTable.c"
 					GeeIterator* _tmp27_;
 					gboolean _tmp28_;
 					gchar* key = NULL;
@@ -6196,7 +6174,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 					if (!_tmp28_) {
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						break;
-#line 6178 "PhotoTable.c"
+#line 6156 "PhotoTable.c"
 					}
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp29_ = _key_it;
@@ -6230,21 +6208,21 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 					_g_free0 (value);
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_g_free0 (key);
-#line 6212 "PhotoTable.c"
+#line 6190 "PhotoTable.c"
 				}
 #line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_object_unref0 (_key_it);
-#line 6216 "PhotoTable.c"
+#line 6194 "PhotoTable.c"
 			}
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_key_value_map_unref0 (map);
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (object);
-#line 6222 "PhotoTable.c"
+#line 6200 "PhotoTable.c"
 		}
 #line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_object_it);
-#line 6226 "PhotoTable.c"
+#line 6204 "PhotoTable.c"
 	}
 #line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = keyfile;
@@ -6272,7 +6250,7 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 	_g_key_file_unref0 (keyfile);
 #line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6254 "PhotoTable.c"
+#line 6232 "PhotoTable.c"
 }
 
 
@@ -6297,7 +6275,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
 #line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	trans = _tmp1_;
-#line 6279 "PhotoTable.c"
+#line 6257 "PhotoTable.c"
 	{
 		GKeyFile* keyfile = NULL;
 		GKeyFile* _tmp2_;
@@ -6321,7 +6299,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		_tmp3_ = trans;
 #line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp3_ != NULL) {
-#line 6303 "PhotoTable.c"
+#line 6281 "PhotoTable.c"
 			gboolean _tmp4_ = FALSE;
 			GKeyFile* _tmp5_;
 			const gchar* _tmp6_;
@@ -6347,7 +6325,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_key_file_unref0 (keyfile);
-#line 6329 "PhotoTable.c"
+#line 6307 "PhotoTable.c"
 				goto __catch18_g_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6360,7 +6338,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 				_g_free0 (trans);
 #line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return result;
-#line 6342 "PhotoTable.c"
+#line 6320 "PhotoTable.c"
 			}
 		}
 #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6369,7 +6347,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		_tmp12_ = key_value_map_get_keys (_tmp11_);
 #line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		keys = _tmp12_;
-#line 6351 "PhotoTable.c"
+#line 6329 "PhotoTable.c"
 		{
 			GeeIterator* _key_it = NULL;
 			GeeSet* _tmp13_;
@@ -6382,7 +6360,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 			_key_it = _tmp14_;
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			while (TRUE) {
-#line 6364 "PhotoTable.c"
+#line 6342 "PhotoTable.c"
 				GeeIterator* _tmp15_;
 				gboolean _tmp16_;
 				gchar* key = NULL;
@@ -6407,7 +6385,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 				if (!_tmp16_) {
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 6389 "PhotoTable.c"
+#line 6367 "PhotoTable.c"
 				}
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp17_ = _key_it;
@@ -6447,11 +6425,11 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 				_g_free0 (value);
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (key);
-#line 6429 "PhotoTable.c"
+#line 6407 "PhotoTable.c"
 			}
 #line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_object_unref0 (_key_it);
-#line 6433 "PhotoTable.c"
+#line 6411 "PhotoTable.c"
 		}
 #line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp29_ = keyfile;
@@ -6479,7 +6457,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		_g_object_unref0 (keys);
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 6461 "PhotoTable.c"
+#line 6439 "PhotoTable.c"
 	}
 	goto __finally18;
 	__catch18_g_error:
@@ -6496,12 +6474,12 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		g_error ("PhotoTable.vala:864: %s", _tmp36_);
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 6478 "PhotoTable.c"
+#line 6456 "PhotoTable.c"
 	}
 	__finally18:
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6483 "PhotoTable.c"
+#line 6461 "PhotoTable.c"
 		gboolean _tmp37_ = FALSE;
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
@@ -6511,7 +6489,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		g_clear_error (&_inner_error_);
 #line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return _tmp37_;
-#line 6493 "PhotoTable.c"
+#line 6471 "PhotoTable.c"
 	}
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = *photo_id;
@@ -6525,7 +6503,7 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	_g_free0 (trans);
 #line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6507 "PhotoTable.c"
+#line 6485 "PhotoTable.c"
 }
 
 
@@ -6561,7 +6539,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_g_free0 (trans);
 #line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6543 "PhotoTable.c"
+#line 6521 "PhotoTable.c"
 	}
 	{
 		GKeyFile* keyfile = NULL;
@@ -6605,7 +6583,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6587 "PhotoTable.c"
+#line 6565 "PhotoTable.c"
 			goto __catch19_g_error;
 		}
 #line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6618,7 +6596,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 			_g_free0 (trans);
 #line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6600 "PhotoTable.c"
+#line 6578 "PhotoTable.c"
 		}
 #line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = keyfile;
@@ -6636,7 +6614,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 			_g_free0 (trans);
 #line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6618 "PhotoTable.c"
+#line 6596 "PhotoTable.c"
 		}
 #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = keyfile;
@@ -6648,7 +6626,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6630 "PhotoTable.c"
+#line 6608 "PhotoTable.c"
 			goto __catch19_g_error;
 		}
 #line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6667,7 +6645,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		_vala_assert (_tmp19_ != NULL, "trans != null");
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 6649 "PhotoTable.c"
+#line 6627 "PhotoTable.c"
 	}
 	goto __finally19;
 	__catch19_g_error:
@@ -6684,12 +6662,12 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		g_error ("PhotoTable.vala:889: %s", _tmp20_);
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 6666 "PhotoTable.c"
+#line 6644 "PhotoTable.c"
 	}
 	__finally19:
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6671 "PhotoTable.c"
+#line 6649 "PhotoTable.c"
 		gboolean _tmp21_ = FALSE;
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
@@ -6699,7 +6677,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		g_clear_error (&_inner_error_);
 #line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return _tmp21_;
-#line 6681 "PhotoTable.c"
+#line 6659 "PhotoTable.c"
 	}
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = *photo_id;
@@ -6713,7 +6691,7 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	_g_free0 (trans);
 #line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6695 "PhotoTable.c"
+#line 6673 "PhotoTable.c"
 }
 
 
@@ -6746,7 +6724,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 		result = FALSE;
 #line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6728 "PhotoTable.c"
+#line 6706 "PhotoTable.c"
 	}
 #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = *photo_id;
@@ -6758,7 +6736,7 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 	result = _tmp6_;
 #line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6740 "PhotoTable.c"
+#line 6718 "PhotoTable.c"
 }
 
 
@@ -6797,27 +6775,27 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp2_ != NULL) {
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = TRUE;
-#line 6779 "PhotoTable.c"
+#line 6757 "PhotoTable.c"
 	} else {
 		const gchar* _tmp3_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = thumbnail_md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6786 "PhotoTable.c"
+#line 6764 "PhotoTable.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_) {
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 6792 "PhotoTable.c"
+#line 6770 "PhotoTable.c"
 	} else {
 		const gchar* _tmp4_;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = md5;
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6799 "PhotoTable.c"
+#line 6777 "PhotoTable.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null");
@@ -6831,7 +6809,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_tmp6_ = file;
 #line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != NULL) {
-#line 6813 "PhotoTable.c"
+#line 6791 "PhotoTable.c"
 		const gchar* _tmp7_;
 		gchar* _tmp8_;
 #line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6844,7 +6822,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		sql = _tmp8_;
 #line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
-#line 6826 "PhotoTable.c"
+#line 6804 "PhotoTable.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = thumbnail_md5;
@@ -6852,18 +6830,18 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp10_ != NULL) {
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = TRUE;
-#line 6834 "PhotoTable.c"
+#line 6812 "PhotoTable.c"
 	} else {
 		const gchar* _tmp11_;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = md5;
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = _tmp11_ != NULL;
-#line 6841 "PhotoTable.c"
+#line 6819 "PhotoTable.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp9_) {
-#line 6845 "PhotoTable.c"
+#line 6823 "PhotoTable.c"
 		gboolean _tmp12_;
 		const gchar* _tmp17_;
 		const gchar* _tmp20_;
@@ -6876,7 +6854,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp12_ = first;
 #line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_) {
-#line 6858 "PhotoTable.c"
+#line 6836 "PhotoTable.c"
 			const gchar* _tmp13_;
 			gchar* _tmp14_;
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6887,7 +6865,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp14_;
-#line 6869 "PhotoTable.c"
+#line 6847 "PhotoTable.c"
 		} else {
 			const gchar* _tmp15_;
 			gchar* _tmp16_;
@@ -6899,7 +6877,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp16_;
-#line 6881 "PhotoTable.c"
+#line 6859 "PhotoTable.c"
 		}
 #line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
@@ -6907,7 +6885,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp17_ = md5;
 #line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
-#line 6889 "PhotoTable.c"
+#line 6867 "PhotoTable.c"
 			const gchar* _tmp18_;
 			gchar* _tmp19_;
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6918,19 +6896,19 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp19_;
-#line 6900 "PhotoTable.c"
+#line 6878 "PhotoTable.c"
 		}
 #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 6906 "PhotoTable.c"
+#line 6884 "PhotoTable.c"
 			const gchar* _tmp21_;
 #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 6912 "PhotoTable.c"
+#line 6890 "PhotoTable.c"
 				const gchar* _tmp22_;
 				gchar* _tmp23_;
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6941,7 +6919,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				_g_free0 (sql);
 #line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp23_;
-#line 6923 "PhotoTable.c"
+#line 6901 "PhotoTable.c"
 			} else {
 				const gchar* _tmp24_;
 				gchar* _tmp25_;
@@ -6953,7 +6931,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 				_g_free0 (sql);
 #line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp25_;
-#line 6935 "PhotoTable.c"
+#line 6913 "PhotoTable.c"
 			}
 		}
 #line 934 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6968,7 +6946,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp28_ = file_format;
 #line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 6950 "PhotoTable.c"
+#line 6928 "PhotoTable.c"
 			const gchar* _tmp29_;
 			gchar* _tmp30_;
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -6979,7 +6957,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 			_g_free0 (sql);
 #line 937 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp30_;
-#line 6961 "PhotoTable.c"
+#line 6939 "PhotoTable.c"
 		}
 #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = sql;
@@ -6989,7 +6967,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_g_free0 (sql);
 #line 939 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp32_;
-#line 6971 "PhotoTable.c"
+#line 6949 "PhotoTable.c"
 	}
 #line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = database_table_db;
@@ -7013,7 +6991,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_tmp38_ = file;
 #line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
-#line 6995 "PhotoTable.c"
+#line 6973 "PhotoTable.c"
 		sqlite3_stmt* _tmp39_;
 		gint _tmp40_;
 		GFile* _tmp41_;
@@ -7041,13 +7019,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp45_ = res;
 #line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7023 "PhotoTable.c"
+#line 7001 "PhotoTable.c"
 	}
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = thumbnail_md5;
 #line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
-#line 7029 "PhotoTable.c"
+#line 7007 "PhotoTable.c"
 		sqlite3_stmt* _tmp47_;
 		gint _tmp48_;
 		const gchar* _tmp49_;
@@ -7075,13 +7053,13 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp53_ = res;
 #line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7057 "PhotoTable.c"
+#line 7035 "PhotoTable.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = md5;
 #line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
-#line 7063 "PhotoTable.c"
+#line 7041 "PhotoTable.c"
 		sqlite3_stmt* _tmp55_;
 		gint _tmp56_;
 		const gchar* _tmp57_;
@@ -7109,7 +7087,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp61_ = res;
 #line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7091 "PhotoTable.c"
+#line 7069 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = thumbnail_md5;
@@ -7117,32 +7095,32 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	if (_tmp64_ != NULL) {
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = TRUE;
-#line 7099 "PhotoTable.c"
+#line 7077 "PhotoTable.c"
 	} else {
 		const gchar* _tmp65_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = _tmp65_ != NULL;
-#line 7106 "PhotoTable.c"
+#line 7084 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
-#line 7110 "PhotoTable.c"
+#line 7088 "PhotoTable.c"
 		PhotoFileFormat _tmp66_;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 7116 "PhotoTable.c"
+#line 7094 "PhotoTable.c"
 	} else {
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = FALSE;
-#line 7120 "PhotoTable.c"
+#line 7098 "PhotoTable.c"
 	}
 #line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
-#line 7124 "PhotoTable.c"
+#line 7102 "PhotoTable.c"
 		sqlite3_stmt* _tmp67_;
 		gint _tmp68_;
 		PhotoFileFormat _tmp69_;
@@ -7167,7 +7145,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		_tmp72_ = res;
 #line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7149 "PhotoTable.c"
+#line 7127 "PhotoTable.c"
 	}
 #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = stmt;
@@ -7175,7 +7153,7 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	_g_free0 (sql);
 #line 968 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7157 "PhotoTable.c"
+#line 7135 "PhotoTable.c"
 }
 
 
@@ -7223,7 +7201,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 		_sqlite3_finalize0 (stmt);
 #line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7205 "PhotoTable.c"
+#line 7183 "PhotoTable.c"
 	} else {
 		gint _tmp8_;
 #line 978 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7236,7 +7214,7 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			_sqlite3_finalize0 (stmt);
 #line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7218 "PhotoTable.c"
+#line 7196 "PhotoTable.c"
 		} else {
 			gint _tmp9_;
 #line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7249,12 +7227,12 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 			_sqlite3_finalize0 (stmt);
 #line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7231 "PhotoTable.c"
+#line 7209 "PhotoTable.c"
 		}
 	}
 #line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 7236 "PhotoTable.c"
+#line 7214 "PhotoTable.c"
 }
 
 
@@ -7265,11 +7243,11 @@ static void _vala_array_add2 (PhotoID* * array, int* length, int* size, const Ph
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*array = g_renew (PhotoID, *array, *size);
-#line 7247 "PhotoTable.c"
+#line 7225 "PhotoTable.c"
 	}
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*array)[(*length)++] = *value;
-#line 7251 "PhotoTable.c"
+#line 7229 "PhotoTable.c"
 }
 
 
@@ -7322,7 +7300,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	res = _tmp7_;
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
-#line 7304 "PhotoTable.c"
+#line 7282 "PhotoTable.c"
 		gint _tmp8_;
 		PhotoID* _tmp9_;
 		gint _tmp9__length1;
@@ -7337,7 +7315,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		if (!(_tmp8_ == SQLITE_ROW)) {
 #line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7319 "PhotoTable.c"
+#line 7297 "PhotoTable.c"
 		}
 #line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = ids;
@@ -7357,7 +7335,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		_tmp14_ = sqlite3_step (_tmp13_);
 #line 997 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp14_;
-#line 7339 "PhotoTable.c"
+#line 7317 "PhotoTable.c"
 	}
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = ids;
@@ -7367,7 +7345,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	if (result_length1) {
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result_length1 = _tmp15__length1;
-#line 7349 "PhotoTable.c"
+#line 7327 "PhotoTable.c"
 	}
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp15_;
@@ -7375,7 +7353,7 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	_sqlite3_finalize0 (stmt);
 #line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7357 "PhotoTable.c"
+#line 7335 "PhotoTable.c"
 }
 
 
@@ -7393,17 +7371,17 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 	_tmp1_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 7375 "PhotoTable.c"
+#line 7353 "PhotoTable.c"
 		const gchar* _tmp2_;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 7381 "PhotoTable.c"
+#line 7359 "PhotoTable.c"
 	} else {
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 7385 "PhotoTable.c"
+#line 7363 "PhotoTable.c"
 	}
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
@@ -7419,7 +7397,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 			g_propagate_error (error, _inner_error_);
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7401 "PhotoTable.c"
+#line 7379 "PhotoTable.c"
 		} else {
 #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);
@@ -7427,7 +7405,7 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 			g_clear_error (&_inner_error_);
 #line 1004 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7409 "PhotoTable.c"
+#line 7387 "PhotoTable.c"
 		}
 	}
 }
@@ -7468,7 +7446,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 			g_propagate_error (error, _inner_error_);
 #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7450 "PhotoTable.c"
+#line 7428 "PhotoTable.c"
 		} else {
 #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);
@@ -7476,7 +7454,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 			g_clear_error (&_inner_error_);
 #line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7458 "PhotoTable.c"
+#line 7436 "PhotoTable.c"
 		}
 	}
 #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7485,7 +7463,7 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 	_tmp6_ = *editable_id;
 #line 1010 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_->editable_id = _tmp6_;
-#line 7467 "PhotoTable.c"
+#line 7445 "PhotoTable.c"
 }
 
 
@@ -7515,7 +7493,7 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 			g_propagate_error (error, _inner_error_);
 #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7497 "PhotoTable.c"
+#line 7475 "PhotoTable.c"
 		} else {
 #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);
@@ -7523,14 +7501,14 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 			g_clear_error (&_inner_error_);
 #line 1014 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7505 "PhotoTable.c"
+#line 7483 "PhotoTable.c"
 		}
 	}
 #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = row;
 #line 1016 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID);
-#line 7512 "PhotoTable.c"
+#line 7490 "PhotoTable.c"
 }
 
 
@@ -7550,11 +7528,11 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 	if (_tmp1_) {
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 1;
-#line 7532 "PhotoTable.c"
+#line 7510 "PhotoTable.c"
 	} else {
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 0;
-#line 7536 "PhotoTable.c"
+#line 7514 "PhotoTable.c"
 	}
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *photo_id;
@@ -7570,7 +7548,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 			g_propagate_error (error, _inner_error_);
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7552 "PhotoTable.c"
+#line 7530 "PhotoTable.c"
 		} else {
 #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);
@@ -7578,7 +7556,7 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 			g_clear_error (&_inner_error_);
 #line 1020 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7560 "PhotoTable.c"
+#line 7538 "PhotoTable.c"
 		}
 	}
 }
@@ -7614,7 +7592,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	switch (_tmp0_) {
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 7596 "PhotoTable.c"
+#line 7574 "PhotoTable.c"
 		{
 			gchar* _tmp1_;
 #line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7625,11 +7603,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp1_;
 #line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7607 "PhotoTable.c"
+#line 7585 "PhotoTable.c"
 		}
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 7611 "PhotoTable.c"
+#line 7589 "PhotoTable.c"
 		{
 			gchar* _tmp2_;
 #line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7640,11 +7618,11 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp2_;
 #line 1034 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7622 "PhotoTable.c"
+#line 7600 "PhotoTable.c"
 		}
 #line 1027 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 7626 "PhotoTable.c"
+#line 7604 "PhotoTable.c"
 		{
 			gchar* _tmp3_;
 #line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7655,13 +7633,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			col = _tmp3_;
 #line 1038 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7637 "PhotoTable.c"
+#line 7615 "PhotoTable.c"
 		}
 		default:
 		{
 #line 1041 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_assert_not_reached ();
-#line 7643 "PhotoTable.c"
+#line 7621 "PhotoTable.c"
 		}
 	}
 #line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7702,7 +7680,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			_g_free0 (col);
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7684 "PhotoTable.c"
+#line 7662 "PhotoTable.c"
 		} else {
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
@@ -7712,7 +7690,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 			g_clear_error (&_inner_error_);
 #line 1045 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7694 "PhotoTable.c"
+#line 7672 "PhotoTable.c"
 		}
 	}
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -7721,7 +7699,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	_tmp16_ = _tmp15_.id;
 #line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
-#line 7703 "PhotoTable.c"
+#line 7681 "PhotoTable.c"
 		PhotoRow* _tmp17_;
 		PhotoID _tmp18_;
 		gint64 _tmp19_;
@@ -7754,7 +7732,7 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 				_g_free0 (col);
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7736 "PhotoTable.c"
+#line 7714 "PhotoTable.c"
 			} else {
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
@@ -7764,13 +7742,13 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 				g_clear_error (&_inner_error_);
 #line 1048 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7746 "PhotoTable.c"
+#line 7724 "PhotoTable.c"
 			}
 		}
 	}
 #line 1023 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (col);
-#line 7752 "PhotoTable.c"
+#line 7730 "PhotoTable.c"
 }
 
 
@@ -7799,7 +7777,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 			g_propagate_error (error, _inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7781 "PhotoTable.c"
+#line 7759 "PhotoTable.c"
 		} else {
 #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);
@@ -7807,7 +7785,7 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7789 "PhotoTable.c"
+#line 7767 "PhotoTable.c"
 		}
 	}
 }
@@ -7818,7 +7796,7 @@ static void photo_table_class_init (PhotoTableClass * klass) {
 	photo_table_parent_class = g_type_class_peek_parent (klass);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = photo_table_finalize;
-#line 7800 "PhotoTable.c"
+#line 7778 "PhotoTable.c"
 }
 
 
@@ -7832,7 +7810,7 @@ static void photo_table_finalize (DatabaseTable * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj);
-#line 7814 "PhotoTable.c"
+#line 7792 "PhotoTable.c"
 }
 
 
@@ -7856,7 +7834,7 @@ void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 	_tmp0_ = id;
 #line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
-#line 7838 "PhotoTable.c"
+#line 7816 "PhotoTable.c"
 }
 
 
@@ -7869,7 +7847,7 @@ gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	result = _tmp0_ == BACKING_PHOTO_ID_INVALID;
 #line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7851 "PhotoTable.c"
+#line 7829 "PhotoTable.c"
 }
 
 
@@ -7882,7 +7860,7 @@ gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	result = _tmp0_ != BACKING_PHOTO_ID_INVALID;
 #line 1081 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7864 "PhotoTable.c"
+#line 7842 "PhotoTable.c"
 }
 
 
@@ -7894,14 +7872,14 @@ BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) {
 	memcpy (dup, self, sizeof (BackingPhotoID));
 #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
-#line 7876 "PhotoTable.c"
+#line 7854 "PhotoTable.c"
 }
 
 
 void backing_photo_id_free (BackingPhotoID* self) {
 #line 1067 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
-#line 7883 "PhotoTable.c"
+#line 7861 "PhotoTable.c"
 }
 
 
@@ -7941,7 +7919,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 		result = FALSE;
 #line 1097 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7923 "PhotoTable.c"
+#line 7901 "PhotoTable.c"
 	}
 #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
@@ -7955,7 +7933,7 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 	result = _tmp3_ == ((time_t) _tmp6_);
 #line 1099 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7937 "PhotoTable.c"
+#line 7915 "PhotoTable.c"
 }
 
 
@@ -7984,7 +7962,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 		result = FALSE;
 #line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7966 "PhotoTable.c"
+#line 7944 "PhotoTable.c"
 	}
 #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
@@ -7998,7 +7976,7 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	result = _tmp3_ != ((time_t) _tmp6_);
 #line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7980 "PhotoTable.c"
+#line 7958 "PhotoTable.c"
 }
 
 
@@ -8076,7 +8054,7 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from)
 	_tmp16_ = _tmp15_->original_orientation;
 #line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->original_orientation = _tmp16_;
-#line 8058 "PhotoTable.c"
+#line 8036 "PhotoTable.c"
 }
 
 
@@ -8086,21 +8064,21 @@ BackingPhotoRow* backing_photo_row_construct (GType object_type) {
 	self = (BackingPhotoRow*) g_type_create_instance (object_type);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8068 "PhotoTable.c"
+#line 8046 "PhotoTable.c"
 }
 
 
 BackingPhotoRow* backing_photo_row_new (void) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW);
-#line 8075 "PhotoTable.c"
+#line 8053 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_init (GValue* value) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 8082 "PhotoTable.c"
+#line 8060 "PhotoTable.c"
 }
 
 
@@ -8109,7 +8087,7 @@ static void value_backing_photo_row_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (value->data[0].v_pointer);
-#line 8091 "PhotoTable.c"
+#line 8069 "PhotoTable.c"
 	}
 }
 
@@ -8119,11 +8097,11 @@ static void value_backing_photo_row_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #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 8101 "PhotoTable.c"
+#line 8079 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8105 "PhotoTable.c"
+#line 8083 "PhotoTable.c"
 	}
 }
 
@@ -8131,37 +8109,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 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8113 "PhotoTable.c"
+#line 8091 "PhotoTable.c"
 }
 
 
 static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 8120 "PhotoTable.c"
+#line 8098 "PhotoTable.c"
 		BackingPhotoRow * object;
 		object = collect_values[0].v_pointer;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #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 8127 "PhotoTable.c"
+#line 8105 "PhotoTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #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 8131 "PhotoTable.c"
+#line 8109 "PhotoTable.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = backing_photo_row_ref (object);
-#line 8135 "PhotoTable.c"
+#line 8113 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8139 "PhotoTable.c"
+#line 8117 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8143 "PhotoTable.c"
+#line 8121 "PhotoTable.c"
 }
 
 
@@ -8172,25 +8150,25 @@ static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_
 	if (!object_p) {
 #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 8154 "PhotoTable.c"
+#line 8132 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = NULL;
-#line 8160 "PhotoTable.c"
+#line 8138 "PhotoTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8164 "PhotoTable.c"
+#line 8142 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = backing_photo_row_ref (value->data[0].v_pointer);
-#line 8168 "PhotoTable.c"
+#line 8146 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8172 "PhotoTable.c"
+#line 8150 "PhotoTable.c"
 }
 
 
@@ -8204,7 +8182,7 @@ GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 8186 "PhotoTable.c"
+#line 8164 "PhotoTable.c"
 }
 
 
@@ -8213,7 +8191,7 @@ gpointer value_get_backing_photo_row (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8195 "PhotoTable.c"
+#line 8173 "PhotoTable.c"
 }
 
 
@@ -8233,17 +8211,17 @@ void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_ref (value->data[0].v_pointer);
-#line 8215 "PhotoTable.c"
+#line 8193 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8219 "PhotoTable.c"
+#line 8197 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8225 "PhotoTable.c"
+#line 8203 "PhotoTable.c"
 	}
 }
 
@@ -8262,17 +8240,17 @@ void value_take_backing_photo_row (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 8244 "PhotoTable.c"
+#line 8222 "PhotoTable.c"
 	} else {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8248 "PhotoTable.c"
+#line 8226 "PhotoTable.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8254 "PhotoTable.c"
+#line 8232 "PhotoTable.c"
 	}
 }
 
@@ -8282,7 +8260,7 @@ static void backing_photo_row_class_init (BackingPhotoRowClass * klass) {
 	backing_photo_row_parent_class = g_type_class_peek_parent (klass);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize;
-#line 8264 "PhotoTable.c"
+#line 8242 "PhotoTable.c"
 }
 
 
@@ -8291,7 +8269,7 @@ static void backing_photo_row_instance_init (BackingPhotoRow * self) {
 	self->filepath = NULL;
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->ref_count = 1;
-#line 8273 "PhotoTable.c"
+#line 8251 "PhotoTable.c"
 }
 
 
@@ -8303,7 +8281,7 @@ static void backing_photo_row_finalize (BackingPhotoRow * obj) {
 	g_signal_handlers_destroy (self);
 #line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
-#line 8285 "PhotoTable.c"
+#line 8263 "PhotoTable.c"
 }
 
 
@@ -8328,7 +8306,7 @@ gpointer backing_photo_row_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return instance;
-#line 8310 "PhotoTable.c"
+#line 8288 "PhotoTable.c"
 }
 
 
@@ -8341,7 +8319,7 @@ void backing_photo_row_unref (gpointer instance) {
 		BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self);
 #line 1085 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8323 "PhotoTable.c"
+#line 8301 "PhotoTable.c"
 	}
 }
 
@@ -8385,26 +8363,26 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	_tmp6_ = res;
 #line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
-#line 8367 "PhotoTable.c"
+#line 8345 "PhotoTable.c"
 		gint _tmp7_;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 1146 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create PhotoBackingTable", _tmp7_);
-#line 8373 "PhotoTable.c"
+#line 8351 "PhotoTable.c"
 	}
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8379 "PhotoTable.c"
+#line 8357 "PhotoTable.c"
 }
 
 
 static BackingPhotoTable* backing_photo_table_new (void) {
 #line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE);
-#line 8386 "PhotoTable.c"
+#line 8364 "PhotoTable.c"
 }
 
 
@@ -8417,7 +8395,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	_tmp0_ = backing_photo_table_instance;
 #line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
-#line 8399 "PhotoTable.c"
+#line 8377 "PhotoTable.c"
 		BackingPhotoTable* _tmp1_;
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = backing_photo_table_new ();
@@ -8425,7 +8403,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 		_database_table_unref0 (backing_photo_table_instance);
 #line 1151 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_table_instance = _tmp1_;
-#line 8407 "PhotoTable.c"
+#line 8385 "PhotoTable.c"
 	}
 #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = backing_photo_table_instance;
@@ -8435,7 +8413,7 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	result = _tmp3_;
 #line 1153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8417 "PhotoTable.c"
+#line 8395 "PhotoTable.c"
 }
 
 
@@ -8653,7 +8631,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	_tmp51_ = res;
 #line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
-#line 8635 "PhotoTable.c"
+#line 8613 "PhotoTable.c"
 		gint _tmp52_;
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
@@ -8669,7 +8647,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 				_sqlite3_finalize0 (stmt);
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8651 "PhotoTable.c"
+#line 8629 "PhotoTable.c"
 			} else {
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -8679,7 +8657,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 				g_clear_error (&_inner_error_);
 #line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8661 "PhotoTable.c"
+#line 8639 "PhotoTable.c"
 			}
 		}
 	}
@@ -8699,7 +8677,7 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	_tmp56_->time_created = _tmp57_;
 #line 1156 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 8681 "PhotoTable.c"
+#line 8659 "PhotoTable.c"
 }
 
 
@@ -8798,14 +8776,14 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 		_sqlite3_finalize0 (stmt);
 #line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 8779 "PhotoTable.c"
+#line 8757 "PhotoTable.c"
 	} else {
 		gint _tmp12_;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
 #line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
-#line 8786 "PhotoTable.c"
+#line 8764 "PhotoTable.c"
 			gint _tmp13_;
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
@@ -8821,7 +8799,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 					_sqlite3_finalize0 (stmt);
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8802 "PhotoTable.c"
+#line 8780 "PhotoTable.c"
 				} else {
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
@@ -8831,7 +8809,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 					g_clear_error (&_inner_error_);
 #line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8812 "PhotoTable.c"
+#line 8790 "PhotoTable.c"
 				}
 			}
 		}
@@ -8918,7 +8896,7 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	_sqlite3_finalize0 (stmt);
 #line 1218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8899 "PhotoTable.c"
+#line 8877 "PhotoTable.c"
 }
 
 
@@ -9106,7 +9084,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 	_tmp45_ = res;
 #line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
-#line 9087 "PhotoTable.c"
+#line 9065 "PhotoTable.c"
 		gint _tmp46_;
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
@@ -9122,7 +9100,7 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 				_sqlite3_finalize0 (stmt);
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9103 "PhotoTable.c"
+#line 9081 "PhotoTable.c"
 			} else {
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -9132,13 +9110,13 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 				g_clear_error (&_inner_error_);
 #line 1247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9113 "PhotoTable.c"
+#line 9091 "PhotoTable.c"
 			}
 		}
 	}
 #line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9119 "PhotoTable.c"
+#line 9097 "PhotoTable.c"
 }
 
 
@@ -9232,7 +9210,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 	_tmp19_ = res;
 #line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
-#line 9213 "PhotoTable.c"
+#line 9191 "PhotoTable.c"
 		gint _tmp20_;
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
@@ -9248,7 +9226,7 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 				_sqlite3_finalize0 (stmt);
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9229 "PhotoTable.c"
+#line 9207 "PhotoTable.c"
 			} else {
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -9258,13 +9236,13 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 				g_clear_error (&_inner_error_);
 #line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9239 "PhotoTable.c"
+#line 9217 "PhotoTable.c"
 			}
 		}
 	}
 #line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9245 "PhotoTable.c"
+#line 9223 "PhotoTable.c"
 }
 
 
@@ -9290,7 +9268,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 			g_propagate_error (error, _inner_error_);
 #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9271 "PhotoTable.c"
+#line 9249 "PhotoTable.c"
 		} else {
 #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);
@@ -9298,7 +9276,7 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 			g_clear_error (&_inner_error_);
 #line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9279 "PhotoTable.c"
+#line 9257 "PhotoTable.c"
 		}
 	}
 }
@@ -9331,7 +9309,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 			g_propagate_error (error, _inner_error_);
 #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9312 "PhotoTable.c"
+#line 9290 "PhotoTable.c"
 		} else {
 #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);
@@ -9339,7 +9317,7 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 			g_clear_error (&_inner_error_);
 #line 1273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9320 "PhotoTable.c"
+#line 9298 "PhotoTable.c"
 		}
 	}
 }
@@ -9370,7 +9348,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 			g_propagate_error (error, _inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9351 "PhotoTable.c"
+#line 9329 "PhotoTable.c"
 		} else {
 #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);
@@ -9378,7 +9356,7 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 			g_clear_error (&_inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9359 "PhotoTable.c"
+#line 9337 "PhotoTable.c"
 		}
 	}
 }
@@ -9389,7 +9367,7 @@ static void backing_photo_table_class_init (BackingPhotoTableClass * klass) {
 	backing_photo_table_parent_class = g_type_class_peek_parent (klass);
 #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize;
-#line 9370 "PhotoTable.c"
+#line 9348 "PhotoTable.c"
 }
 
 
@@ -9403,7 +9381,7 @@ static void backing_photo_table_finalize (DatabaseTable * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
 #line 1122 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj);
-#line 9384 "PhotoTable.c"
+#line 9362 "PhotoTable.c"
 }
 
 
diff --git a/src/dialogs/AdjustDateTimeDialog.c b/src/dialogs/AdjustDateTimeDialog.c
new file mode 100644
index 0000000..9eb3020
--- /dev/null
+++ b/src/dialogs/AdjustDateTimeDialog.c
@@ -0,0 +1,2353 @@
+/* AdjustDateTimeDialog.c generated by valac 0.36.6, the Vala compiler
+ * generated from AdjustDateTimeDialog.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <time.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <float.h>
+#include <math.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+
+#define TYPE_ADJUST_DATE_TIME_DIALOG (adjust_date_time_dialog_get_type ())
+#define ADJUST_DATE_TIME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog))
+#define ADJUST_DATE_TIME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogClass))
+#define IS_ADJUST_DATE_TIME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ADJUST_DATE_TIME_DIALOG))
+#define IS_ADJUST_DATE_TIME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ADJUST_DATE_TIME_DIALOG))
+#define ADJUST_DATE_TIME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogClass))
+
+typedef struct _AdjustDateTimeDialog AdjustDateTimeDialog;
+typedef struct _AdjustDateTimeDialogClass AdjustDateTimeDialogClass;
+typedef struct _AdjustDateTimeDialogPrivate AdjustDateTimeDialogPrivate;
+
+#define ADJUST_DATE_TIME_DIALOG_TYPE_TIME_SYSTEM (adjust_date_time_dialog_time_system_get_type ())
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_DATA_OBJECT (data_object_get_type ())
+#define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
+#define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass))
+#define IS_DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_OBJECT))
+#define IS_DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_OBJECT))
+#define DATA_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_OBJECT, DataObjectClass))
+
+typedef struct _DataObject DataObject;
+typedef struct _DataObjectClass DataObjectClass;
+
+#define TYPE_DATA_SOURCE (data_source_get_type ())
+#define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource))
+#define DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_SOURCE, DataSourceClass))
+#define IS_DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_SOURCE))
+#define IS_DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_SOURCE))
+#define DATA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_SOURCE, DataSourceClass))
+
+typedef struct _DataSource DataSource;
+typedef struct _DataSourceClass DataSourceClass;
+
+#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))
+#define IS_THUMBNAIL_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_THUMBNAIL_SOURCE))
+#define IS_THUMBNAIL_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_THUMBNAIL_SOURCE))
+#define THUMBNAIL_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_THUMBNAIL_SOURCE, ThumbnailSourceClass))
+
+typedef struct _ThumbnailSource ThumbnailSource;
+typedef struct _ThumbnailSourceClass ThumbnailSourceClass;
+
+#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_DATEABLE (dateable_get_type ())
+#define DATEABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATEABLE, Dateable))
+#define IS_DATEABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATEABLE))
+#define DATEABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_DATEABLE, DateableIface))
+
+typedef struct _Dateable Dateable;
+typedef struct _DateableIface DateableIface;
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _AdjustDateTimeDialog {
+	GtkDialog parent_instance;
+	AdjustDateTimeDialogPrivate * priv;
+};
+
+struct _AdjustDateTimeDialogClass {
+	GtkDialogClass parent_class;
+};
+
+typedef enum  {
+	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM,
+	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM,
+	ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR
+} AdjustDateTimeDialogTimeSystem;
+
+struct _AdjustDateTimeDialogPrivate {
+	gboolean no_original_time;
+	time_t original_time;
+	GtkLabel* original_time_label;
+	GtkCalendar* calendar;
+	GtkSpinButton* hour;
+	GtkSpinButton* minute;
+	GtkSpinButton* second;
+	GtkComboBoxText* system;
+	GtkRadioButton* relativity_radio_button;
+	GtkRadioButton* batch_radio_button;
+	GtkCheckButton* modify_originals_check_button;
+	GtkLabel* notification;
+	AdjustDateTimeDialogTimeSystem previous_time_system;
+};
+
+struct _DateableIface {
+	GTypeInterface parent_iface;
+	void (*set_exposure_time) (Dateable* self, time_t target_time);
+	time_t (*get_exposure_time) (Dateable* self);
+};
+
+
+static gpointer adjust_date_time_dialog_parent_class = NULL;
+
+GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
+static GType adjust_date_time_dialog_time_system_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+#define ADJUST_DATE_TIME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialogPrivate))
+enum  {
+	ADJUST_DATE_TIME_DIALOG_DUMMY_PROPERTY
+};
+#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY ((gint64) ((60 * 60) * 24))
+#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR ((gint64) (60 * 60))
+#define ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE ((gint64) 60)
+#define ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET 1900
+#define ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE 1
+GType data_object_get_type (void) G_GNUC_CONST;
+GType data_source_get_type (void) G_GNUC_CONST;
+GType thumbnail_source_get_type (void) G_GNUC_CONST;
+GType media_source_get_type (void) G_GNUC_CONST;
+GType dateable_get_type (void) G_GNUC_CONST;
+AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
+AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
+gint resources_use_header_bar (void);
+GType page_window_get_type (void) G_GNUC_CONST;
+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")
+#define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time")
+static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self);
+static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button);
+static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self);
+static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self);
+static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self);
+static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
+GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error);
+gchar* data_object_to_string (DataObject* self);
+time_t dateable_get_exposure_time (Dateable* self);
+static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time);
+static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format);
+static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self);
+gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals);
+void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity);
+void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals);
+void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time);
+static void adjust_date_time_dialog_finalize (GObject * obj);
+
+
+static GType adjust_date_time_dialog_time_system_get_type (void) {
+	static volatile gsize adjust_date_time_dialog_time_system_type_id__volatile = 0;
+	if (g_once_init_enter (&adjust_date_time_dialog_time_system_type_id__volatile)) {
+		static const GEnumValue values[] = {{ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM", "am"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM", "pm"}, {ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR, "ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR", "24hr"}, {0, NULL, NULL}};
+		GType adjust_date_time_dialog_time_system_type_id;
+		adjust_date_time_dialog_time_system_type_id = g_enum_register_static ("AdjustDateTimeDialogTimeSystem", values);
+		g_once_init_leave (&adjust_date_time_dialog_time_system_type_id__volatile, adjust_date_time_dialog_time_system_type_id);
+	}
+	return adjust_date_time_dialog_time_system_type_id__volatile;
+}
+
+
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
+#line 241 "AdjustDateTimeDialog.c"
+}
+
+
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
+#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
+#line 248 "AdjustDateTimeDialog.c"
+}
+
+
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
+#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
+#line 255 "AdjustDateTimeDialog.c"
+}
+
+
+static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
+#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
+#line 262 "AdjustDateTimeDialog.c"
+}
+
+
+static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
+	gboolean result;
+	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
+#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return result;
+#line 271 "AdjustDateTimeDialog.c"
+}
+
+
+static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
+#line 278 "AdjustDateTimeDialog.c"
+}
+
+
+static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
+#line 285 "AdjustDateTimeDialog.c"
+}
+
+
+static void g_time_gm (time_t time, struct tm* result) {
+	struct tm _result_ = {0};
+	struct tm _tmp0_ = {0};
+#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gmtime_r (&time, &_tmp0_);
+#line 2841 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	*result = _result_;
+#line 2842 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return;
+#line 300 "AdjustDateTimeDialog.c"
+}
+
+
+static gchar* g_time_format (struct tm *self, const gchar* format) {
+	gchar* result = NULL;
+	gchar* buffer = NULL;
+	gchar* _tmp0_;
+	gint buffer_length1;
+	gint _buffer_size_;
+	gchar* _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (format != NULL, NULL);
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = g_new0 (gchar, 64);
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	buffer = _tmp0_;
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	buffer_length1 = 64;
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_buffer_size_ = buffer_length1;
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = buffer;
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1__length1 = buffer_length1;
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = format;
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = buffer;
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3__length1 = buffer_length1;
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp4_;
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	buffer = (g_free (buffer), NULL);
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 346 "AdjustDateTimeDialog.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 353 "AdjustDateTimeDialog.c"
+}
+
+
+static void g_time_local (time_t time, struct tm* result) {
+	struct tm _result_ = {0};
+	struct tm _tmp0_ = {0};
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	localtime_r (&time, &_tmp0_);
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	*result = _result_;
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return;
+#line 368 "AdjustDateTimeDialog.c"
+}
+
+
+AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
+	AdjustDateTimeDialog * self = NULL;
+	Dateable* _tmp0_;
+	gint _tmp1_;
+	AppWindow* _tmp2_;
+	AppWindow* _tmp3_;
+	GtkCalendar* _tmp4_;
+	GtkCalendar* _tmp5_;
+	GtkCalendar* _tmp6_;
+	GtkCalendar* _tmp7_;
+	GtkCalendar* _tmp8_;
+	GtkCalendar* _tmp9_;
+	ConfigFacade* _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	GtkSpinButton* _tmp16_;
+	GtkSpinButton* _tmp17_;
+	GtkSpinButton* _tmp18_;
+	GtkSpinButton* _tmp19_;
+	GtkSpinButton* _tmp20_;
+	GtkSpinButton* _tmp21_;
+	GtkSpinButton* _tmp22_;
+	GtkSpinButton* _tmp23_;
+	GtkSpinButton* _tmp24_;
+	GtkSpinButton* _tmp25_;
+	GtkSpinButton* _tmp26_;
+	GtkComboBoxText* _tmp27_;
+	GtkComboBoxText* _tmp28_;
+	GtkComboBoxText* _tmp29_;
+	GtkComboBoxText* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkBox* clock = NULL;
+	GtkBox* _tmp32_;
+	GtkBox* _tmp33_;
+	GtkSpinButton* _tmp34_;
+	GtkBox* _tmp35_;
+	GtkLabel* _tmp36_;
+	GtkLabel* _tmp37_;
+	GtkBox* _tmp38_;
+	GtkSpinButton* _tmp39_;
+	GtkBox* _tmp40_;
+	GtkLabel* _tmp41_;
+	GtkLabel* _tmp42_;
+	GtkBox* _tmp43_;
+	GtkSpinButton* _tmp44_;
+	GtkBox* _tmp45_;
+	GtkComboBoxText* _tmp46_;
+	GtkRadioButton* _tmp47_;
+	GtkRadioButton* _tmp48_;
+	ConfigFacade* _tmp49_;
+	ConfigFacade* _tmp50_;
+	gboolean _tmp51_;
+	gboolean _tmp52_ = FALSE;
+	gboolean _tmp53_;
+	GtkRadioButton* _tmp55_;
+	GtkRadioButton* _tmp56_;
+	GSList* _tmp57_;
+	GtkRadioButton* _tmp58_;
+	GtkRadioButton* _tmp59_;
+	ConfigFacade* _tmp60_;
+	ConfigFacade* _tmp61_;
+	gboolean _tmp62_;
+	gboolean _tmp63_ = FALSE;
+	gboolean _tmp64_;
+	GtkRadioButton* _tmp66_;
+	GtkRadioButton* _tmp67_;
+	gboolean _tmp68_;
+	gboolean _tmp77_ = FALSE;
+	ConfigFacade* _tmp78_;
+	ConfigFacade* _tmp79_;
+	gboolean _tmp80_;
+	gboolean _tmp81_;
+	GtkCheckButton* _tmp83_;
+	gboolean _tmp84_ = FALSE;
+	gboolean _tmp85_;
+	GtkCheckButton* _tmp92_;
+	GtkBox* time_content = NULL;
+	GtkBox* _tmp93_;
+	GtkBox* picker = NULL;
+	GtkBox* _tmp94_;
+	GtkComboBoxText* combo = NULL;
+	GtkComboBoxText* _tmp95_;
+	GtkBox* _tmp104_;
+	GtkComboBoxText* _tmp105_;
+	GtkSpinButton* spin = NULL;
+	GtkSpinButton* _tmp106_;
+	GtkBox* _tmp107_;
+	GtkSpinButton* _tmp108_;
+	GtkSpinButton* _tmp109_;
+	GtkCalendar* _tmp110_;
+	GtkComboBoxText* _tmp111_;
+	GtkCalendar* _tmp112_;
+	GtkBox* _tmp113_;
+	GtkBox* _tmp114_;
+	GtkBox* _tmp115_;
+	GtkCalendar* _tmp116_;
+	GtkBox* _tmp117_;
+	GtkBox* _tmp118_;
+	gboolean _tmp119_;
+	GdkPixbuf* preview = NULL;
+	GtkBox* image_content = NULL;
+	GtkBox* _tmp133_;
+	GtkBox* _tmp134_;
+	GtkBox* _tmp135_;
+	GtkImage* _tmp136_ = NULL;
+	GdkPixbuf* _tmp137_;
+	GtkImage* image = NULL;
+	GtkImage* _tmp141_;
+	GtkLabel* _tmp142_;
+	GtkBox* _tmp143_;
+	GtkImage* _tmp144_;
+	GtkBox* _tmp145_;
+	GtkLabel* _tmp146_;
+	GtkBox* hbox = NULL;
+	GtkBox* _tmp147_;
+	GtkBox* _tmp148_;
+	GtkBox* _tmp149_;
+	GtkBox* _tmp150_;
+	GtkBox* _tmp151_;
+	GtkBox* _tmp152_;
+	GtkBox* _tmp153_;
+	GtkBox* _tmp154_;
+	GtkBox* _tmp155_;
+	GtkBox* _tmp156_;
+	GtkBox* _tmp157_;
+	GtkBox* _tmp158_;
+	GtkLabel* _tmp159_;
+	GtkLabel* _tmp160_;
+	GtkLabel* _tmp161_;
+	GtkBox* _tmp162_;
+	GtkLabel* _tmp163_;
+	Dateable* _tmp164_;
+	time_t _tmp165_;
+	time_t _tmp166_;
+	time_t _tmp168_;
+	struct tm _tmp169_ = {0};
+	ConfigFacade* _tmp170_;
+	ConfigFacade* _tmp171_;
+	gboolean _tmp172_;
+	GError * _inner_error_ = NULL;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_val_if_fail (IS_DATEABLE (source), NULL);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = source;
+#line 39 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_vala_assert (_tmp0_ != NULL, "source != null");
+#line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = resources_use_header_bar ();
+#line 41 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = app_window_get_instance ();
+#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = _tmp2_;
+#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow));
+#line 45 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp3_);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = (GtkCalendar*) gtk_calendar_new ();
+#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp4_);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->calendar);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->calendar = _tmp4_;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp5_ = self->priv->calendar;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_set (_tmp5_, "show-heading", FALSE, NULL);
+#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp6_ = self->priv->calendar;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp6_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp7_ = self->priv->calendar;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp7_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = self->priv->calendar;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp8_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp9_ = self->priv->calendar;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp9_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp10_ = config_facade_get_instance ();
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp11_ = _tmp10_;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp13_ = _tmp12_;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp11_);
+#line 58 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp13_) {
+#line 579 "AdjustDateTimeDialog.c"
+		GtkSpinButton* _tmp14_;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp14_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp14_);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (self->priv->hour);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->hour = _tmp14_;
+#line 589 "AdjustDateTimeDialog.c"
+	} else {
+		GtkSpinButton* _tmp15_;
+#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
+#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp15_);
+#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (self->priv->hour);
+#line 61 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->hour = _tmp15_;
+#line 600 "AdjustDateTimeDialog.c"
+	}
+#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp16_ = self->priv->hour;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp16_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+#line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp17_ = self->priv->hour;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_entry_get_type (), GtkEntry), 2);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp18_ = self->priv->hour;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp19_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp19_);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->minute);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->minute = _tmp19_;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp20_ = self->priv->minute;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_get_type (), GtkEntry), 2);
+#line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp21_ = self->priv->minute;
+#line 69 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp22_ = self->priv->minute;
+#line 70 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp22_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp23_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp23_);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->second);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->second = _tmp23_;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp24_ = self->priv->second;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_entry_get_type (), GtkEntry), 2);
+#line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp25_ = self->priv->second;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp26_ = self->priv->second;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (_tmp26_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
+#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp27_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp27_);
+#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->system);
+#line 77 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->system = _tmp27_;
+#line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp28_ = self->priv->system;
+#line 78 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_combo_box_text_append_text (_tmp28_, _ ("AM"));
+#line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp29_ = self->priv->system;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_combo_box_text_append_text (_tmp29_, _ ("PM"));
+#line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp30_ = self->priv->system;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_combo_box_text_append_text (_tmp30_, _ ("24 Hr"));
+#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp31_ = self->priv->system;
+#line 81 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
+#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp32_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp32_);
+#line 83 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	clock = _tmp32_;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp33_ = clock;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp34_ = self->priv->hour;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp35_ = clock;
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp36_ = (GtkLabel*) gtk_label_new (":");
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp36_);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp37_ = _tmp36_;
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp37_);
+#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp38_ = clock;
+#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp39_ = self->priv->minute;
+#line 87 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp40_ = clock;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp41_ = (GtkLabel*) gtk_label_new (":");
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp41_);
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp42_ = _tmp41_;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 88 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp42_);
+#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp43_ = clock;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp44_ = self->priv->second;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp45_ = clock;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp46_ = self->priv->system;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp47_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _ ("_Shift photos/videos by the same amount"));
+#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp47_);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->relativity_radio_button);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->relativity_radio_button = _tmp47_;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp48_ = self->priv->relativity_radio_button;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp49_ = config_facade_get_instance ();
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp50_ = _tmp49_;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp51_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp51_);
+#line 96 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp50_);
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp53_ = display_options;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp53_) {
+#line 758 "AdjustDateTimeDialog.c"
+		gint _tmp54_;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp54_ = photo_count;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp52_ = _tmp54_ > 1;
+#line 764 "AdjustDateTimeDialog.c"
+	} else {
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp52_ = FALSE;
+#line 768 "AdjustDateTimeDialog.c"
+	}
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp55_ = self->priv->relativity_radio_button;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), _tmp52_);
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp56_ = self->priv->relativity_radio_button;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp57_ = gtk_radio_button_get_group (_tmp56_);
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp58_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp57_, _ ("Set _all photos/videos to this time"));
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp58_);
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->batch_radio_button);
+#line 99 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->batch_radio_button = _tmp58_;
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp59_ = self->priv->batch_radio_button;
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp60_ = config_facade_get_instance ();
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp61_ = _tmp60_;
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp62_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp62_);
+#line 101 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp61_);
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp64_ = display_options;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp64_) {
+#line 802 "AdjustDateTimeDialog.c"
+		gint _tmp65_;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp65_ = photo_count;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp63_ = _tmp65_ > 1;
+#line 808 "AdjustDateTimeDialog.c"
+	} else {
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp63_ = FALSE;
+#line 812 "AdjustDateTimeDialog.c"
+	}
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp66_ = self->priv->batch_radio_button;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), _tmp63_);
+#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp67_ = self->priv->batch_radio_button;
+#line 103 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
+#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp68_ = contains_video;
+#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp68_) {
+#line 826 "AdjustDateTimeDialog.c"
+		gchar* text = NULL;
+		gint _tmp69_;
+		gchar* _tmp70_;
+		const gchar* _tmp71_;
+		GtkCheckButton* _tmp72_;
+#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp69_ = photo_count;
+#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp70_ = g_strdup (ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp69_));
+#line 106 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		text = _tmp70_;
+#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp71_ = text;
+#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
+#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp72_);
+#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (self->priv->modify_originals_check_button);
+#line 108 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->modify_originals_check_button = _tmp72_;
+#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_free0 (text);
+#line 850 "AdjustDateTimeDialog.c"
+	} else {
+		gchar* text = NULL;
+		gint _tmp73_;
+		gchar* _tmp74_;
+		const gchar* _tmp75_;
+		GtkCheckButton* _tmp76_;
+#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp73_ = photo_count;
+#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp74_ = g_strdup (ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp73_));
+#line 110 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		text = _tmp74_;
+#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp75_ = text;
+#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp76_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp75_);
+#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp76_);
+#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (self->priv->modify_originals_check_button);
+#line 111 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->modify_originals_check_button = _tmp76_;
+#line 105 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_free0 (text);
+#line 875 "AdjustDateTimeDialog.c"
+	}
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp78_ = config_facade_get_instance ();
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp79_ = _tmp78_;
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp80_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp81_ = _tmp80_;
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp79_);
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp81_) {
+#line 889 "AdjustDateTimeDialog.c"
+		gboolean _tmp82_;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp82_ = display_options;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp77_ = _tmp82_;
+#line 895 "AdjustDateTimeDialog.c"
+	} else {
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp77_ = FALSE;
+#line 899 "AdjustDateTimeDialog.c"
+	}
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp83_ = self->priv->modify_originals_check_button;
+#line 114 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp77_);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp85_ = only_video;
+#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (!_tmp85_) {
+#line 909 "AdjustDateTimeDialog.c"
+		gboolean _tmp86_ = FALSE;
+		ConfigFacade* _tmp87_;
+		ConfigFacade* _tmp88_;
+		gboolean _tmp89_;
+		gboolean _tmp90_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp87_ = config_facade_get_instance ();
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp88_ = _tmp87_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp89_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp90_ = !_tmp89_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (_tmp88_);
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp90_) {
+#line 927 "AdjustDateTimeDialog.c"
+			gboolean _tmp91_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp91_ = display_options;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp86_ = _tmp91_;
+#line 933 "AdjustDateTimeDialog.c"
+		} else {
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp86_ = FALSE;
+#line 937 "AdjustDateTimeDialog.c"
+		}
+#line 117 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp84_ = _tmp86_;
+#line 941 "AdjustDateTimeDialog.c"
+	} else {
+#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp84_ = FALSE;
+#line 945 "AdjustDateTimeDialog.c"
+	}
+#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp92_ = self->priv->modify_originals_check_button;
+#line 116 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, gtk_widget_get_type (), GtkWidget), _tmp84_);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp93_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp93_);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time_content = _tmp93_;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp94_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp94_);
+#line 121 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	picker = _tmp94_;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp95_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp95_);
+#line 122 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	combo = _tmp95_;
+#line 969 "AdjustDateTimeDialog.c"
+	{
+		gint i = 0;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		i = 0;
+#line 974 "AdjustDateTimeDialog.c"
+		{
+			gboolean _tmp96_ = FALSE;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp96_ = TRUE;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			while (TRUE) {
+#line 981 "AdjustDateTimeDialog.c"
+				gint _tmp98_;
+				GtkComboBoxText* _tmp99_;
+				gint _tmp100_;
+				struct tm _tmp101_ = {0};
+				gchar* _tmp102_;
+				gchar* _tmp103_;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				if (!_tmp96_) {
+#line 990 "AdjustDateTimeDialog.c"
+					gint _tmp97_;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+					_tmp97_ = i;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+					i = _tmp97_ + 1;
+#line 996 "AdjustDateTimeDialog.c"
+				}
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp96_ = FALSE;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp98_ = i;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				if (!(_tmp98_ < 12)) {
+#line 123 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+					break;
+#line 1006 "AdjustDateTimeDialog.c"
+				}
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp99_ = combo;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp100_ = i;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				g_time_gm ((time_t) (_tmp100_ * 2764800), &_tmp101_);
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp102_ = g_time_format (&_tmp101_, "%B");
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_tmp103_ = _tmp102_;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				gtk_combo_box_text_append_text (_tmp99_, _tmp103_);
+#line 124 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+				_g_free0 (_tmp103_);
+#line 1022 "AdjustDateTimeDialog.c"
+			}
+		}
+	}
+#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp104_ = picker;
+#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp105_ = combo;
+#line 126 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp106_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) (G_MAXINT >> 9), (gdouble) 1);
+#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp106_);
+#line 128 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	spin = _tmp106_;
+#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp107_ = picker;
+#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp108_ = spin;
+#line 129 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_end (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp109_ = spin;
+#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp110_ = self->priv->calendar;
+#line 130 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, G_TYPE_OBJECT, GObject), "value", G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, G_TYPE_OBJECT, GObject), "year", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp111_ = combo;
+#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp112_ = self->priv->calendar;
+#line 131 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, G_TYPE_OBJECT, GObject), "month", G_BINDING_BIDIRECTIONAL, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp113_ = time_content;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp114_ = picker;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp113_, G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp115_ = time_content;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp116_ = self->priv->calendar;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp117_ = time_content;
+#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp118_ = clock;
+#line 135 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp119_ = display_options;
+#line 137 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp119_) {
+#line 1078 "AdjustDateTimeDialog.c"
+		GtkBox* _tmp120_;
+		GtkRadioButton* _tmp121_;
+		GtkBox* _tmp122_;
+		GtkRadioButton* _tmp123_;
+		GtkBox* _tmp124_;
+		GtkCheckButton* _tmp125_;
+#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp120_ = time_content;
+#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp121_ = self->priv->relativity_radio_button;
+#line 138 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp122_ = time_content;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp123_ = self->priv->batch_radio_button;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp124_ = time_content;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp125_ = self->priv->modify_originals_check_button;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_box_pack_start (_tmp124_, G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 1103 "AdjustDateTimeDialog.c"
+	}
+#line 143 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	preview = NULL;
+#line 1107 "AdjustDateTimeDialog.c"
+	{
+		GdkPixbuf* _tmp126_ = NULL;
+		Dateable* _tmp127_;
+		GdkPixbuf* _tmp128_;
+		GdkPixbuf* _tmp129_;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp127_ = source;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp128_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp126_ = _tmp128_;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1121 "AdjustDateTimeDialog.c"
+			goto __catch25_g_error;
+		}
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp129_ = _tmp126_;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp126_ = NULL;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (preview);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		preview = _tmp129_;
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (_tmp126_);
+#line 1134 "AdjustDateTimeDialog.c"
+	}
+	goto __finally25;
+	__catch25_g_error:
+	{
+		GError* err = NULL;
+		Dateable* _tmp130_;
+		gchar* _tmp131_;
+		gchar* _tmp132_;
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		err = _inner_error_;
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_inner_error_ = NULL;
+#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp130_ = source;
+#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp131_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, TYPE_DATA_OBJECT, DataObject));
+#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp132_ = _tmp131_;
+#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_warning ("AdjustDateTimeDialog.vala:149: Unable to fetch preview for %s", _tmp132_);
+#line 149 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_free0 (_tmp132_);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_error_free0 (err);
+#line 1159 "AdjustDateTimeDialog.c"
+	}
+	__finally25:
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (preview);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (spin);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (combo);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (picker);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (time_content);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (clock);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_clear_error (&_inner_error_);
+#line 144 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		return NULL;
+#line 1182 "AdjustDateTimeDialog.c"
+	}
+#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp133_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp133_);
+#line 152 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	image_content = _tmp133_;
+#line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp134_ = image_content;
+#line 153 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp135_ = image_content;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_set_homogeneous (_tmp135_, TRUE);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp137_ = preview;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp137_ != NULL) {
+#line 1202 "AdjustDateTimeDialog.c"
+		GdkPixbuf* _tmp138_;
+		GtkImage* _tmp139_;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp138_ = preview;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp139_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp138_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp139_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (_tmp136_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp136_ = _tmp139_;
+#line 1215 "AdjustDateTimeDialog.c"
+	} else {
+		GtkImage* _tmp140_;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp140_ = (GtkImage*) gtk_image_new ();
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		g_object_ref_sink (_tmp140_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_object_unref0 (_tmp136_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp136_ = _tmp140_;
+#line 1226 "AdjustDateTimeDialog.c"
+	}
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp141_ = _g_object_ref0 (_tmp136_);
+#line 155 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	image = _tmp141_;
+#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp142_ = (GtkLabel*) gtk_label_new (NULL);
+#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp142_);
+#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->original_time_label);
+#line 156 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->original_time_label = _tmp142_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp143_ = image_content;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp144_ = image;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp143_, G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp145_ = image_content;
+#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp146_ = self->priv->original_time_label;
+#line 158 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp145_, G_TYPE_CHECK_INSTANCE_CAST (_tmp146_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp147_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp147_);
+#line 160 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	hbox = _tmp147_;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp148_ = hbox;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, gtk_container_get_type (), GtkContainer), (guint) 3);
+#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp149_ = hbox;
+#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp150_ = image_content;
+#line 162 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp149_, G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp151_ = hbox;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp152_ = time_content;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (_tmp151_, G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp153_ = hbox;
+#line 164 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp154_ = hbox;
+#line 165 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp155_ = hbox;
+#line 166 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp155_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp156_ = hbox;
+#line 167 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp156_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp157_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp158_ = hbox;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp159_ = (GtkLabel*) gtk_label_new ("");
+#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_ref_sink (_tmp159_);
+#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->notification);
+#line 171 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->notification = _tmp159_;
+#line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp160_ = self->priv->notification;
+#line 172 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_label_set_line_wrap (_tmp160_, TRUE);
+#line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp161_ = self->priv->notification;
+#line 173 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_label_set_justify (_tmp161_, GTK_JUSTIFY_CENTER);
+#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp162_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp163_ = self->priv->notification;
+#line 175 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp162_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp164_ = source;
+#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp165_ = dateable_get_exposure_time (_tmp164_);
+#line 177 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->original_time = _tmp165_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp166_ = self->priv->original_time;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp166_ == ((time_t) 0)) {
+#line 1328 "AdjustDateTimeDialog.c"
+		time_t _tmp167_;
+#line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp167_ = time (NULL);
+#line 180 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->original_time = _tmp167_;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		self->priv->no_original_time = TRUE;
+#line 1336 "AdjustDateTimeDialog.c"
+	}
+#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp168_ = self->priv->original_time;
+#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_time_local (_tmp168_, &_tmp169_);
+#line 184 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_set_time (self, &_tmp169_);
+#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp170_ = config_facade_get_instance ();
+#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp171_ = _tmp170_;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp172_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_set_original_time_label (self, _tmp172_);
+#line 185 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp171_);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (hbox);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (image);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp136_);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (image_content);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (preview);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (spin);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (combo);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (picker);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (time_content);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (clock);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return self;
+#line 1376 "AdjustDateTimeDialog.c"
+}
+
+
+AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
+#line 37 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
+#line 1383 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct tm* time) {
+	GtkCalendar* _tmp0_;
+	struct tm _tmp1_;
+	gint _tmp2_;
+	struct tm _tmp3_;
+	gint _tmp4_;
+	GtkCalendar* _tmp5_;
+	struct tm _tmp6_;
+	gint _tmp7_;
+	GtkCalendar* _tmp8_;
+	GtkCalendar* _tmp9_;
+	ConfigFacade* _tmp10_;
+	ConfigFacade* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	GtkSpinButton* _tmp28_;
+	struct tm _tmp29_;
+	gint _tmp30_;
+	GtkSpinButton* _tmp31_;
+	struct tm _tmp32_;
+	gint _tmp33_;
+	GtkComboBoxText* _tmp34_;
+	gint _tmp35_;
+#line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
+#line 188 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_if_fail (time != NULL);
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = self->priv->calendar;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = *time;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = _tmp1_.tm_mon;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = *time;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = _tmp3_.tm_year;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
+#line 190 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp5_ = self->priv->calendar;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp6_ = *time;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp7_ = _tmp6_.tm_mday;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
+#line 191 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = self->priv->calendar;
+#line 191 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, G_TYPE_OBJECT, GObject), "year");
+#line 192 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp9_ = self->priv->calendar;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject), "month");
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp10_ = config_facade_get_instance ();
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp11_ = _tmp10_;
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp12_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp13_ = _tmp12_;
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp11_);
+#line 194 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp13_) {
+#line 1454 "AdjustDateTimeDialog.c"
+		GtkComboBoxText* _tmp14_;
+		GtkSpinButton* _tmp15_;
+		struct tm _tmp16_;
+		gint _tmp17_;
+#line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp14_ = self->priv->system;
+#line 195 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
+#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp15_ = self->priv->hour;
+#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp16_ = *time;
+#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp17_ = _tmp16_.tm_hour;
+#line 196 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_value (_tmp15_, (gdouble) _tmp17_);
+#line 1471 "AdjustDateTimeDialog.c"
+	} else {
+		gint AMPM_hour = 0;
+		struct tm _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_ = 0;
+		gint _tmp21_;
+		GtkSpinButton* _tmp23_;
+		AdjustDateTimeDialogTimeSystem _tmp24_ = 0;
+		struct tm _tmp25_;
+		gint _tmp26_;
+		GtkComboBoxText* _tmp27_;
+#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp18_ = *time;
+#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp19_ = _tmp18_.tm_hour;
+#line 198 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		AMPM_hour = _tmp19_ % 12;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp21_ = AMPM_hour;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp21_ == 0) {
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp20_ = 12;
+#line 1495 "AdjustDateTimeDialog.c"
+		} else {
+			gint _tmp22_;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp22_ = AMPM_hour;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp20_ = _tmp22_;
+#line 1502 "AdjustDateTimeDialog.c"
+		}
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp23_ = self->priv->hour;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_value (_tmp23_, (gdouble) _tmp20_);
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp25_ = *time;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp26_ = _tmp25_.tm_hour;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp26_ >= 12) {
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
+#line 1516 "AdjustDateTimeDialog.c"
+		} else {
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp24_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
+#line 1520 "AdjustDateTimeDialog.c"
+		}
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp27_ = self->priv->system;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp24_);
+#line 1526 "AdjustDateTimeDialog.c"
+	}
+#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp28_ = self->priv->minute;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp29_ = *time;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp30_ = _tmp29_.tm_min;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_spin_button_set_value (_tmp28_, (gdouble) _tmp30_);
+#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp31_ = self->priv->second;
+#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp32_ = *time;
+#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp33_ = _tmp32_.tm_sec;
+#line 204 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_spin_button_set_value (_tmp31_, (gdouble) _tmp33_);
+#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp34_ = self->priv->system;
+#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp35_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox));
+#line 206 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp35_;
+#line 1550 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialog* self, gboolean use_24_hr_format) {
+	gboolean _tmp0_;
+	const gchar* _tmp1_ = NULL;
+	gboolean _tmp2_;
+	GtkLabel* _tmp3_;
+	time_t _tmp4_;
+	struct tm _tmp5_ = {0};
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+#line 209 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
+#line 210 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = self->priv->no_original_time;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp0_) {
+#line 211 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		return;
+#line 1573 "AdjustDateTimeDialog.c"
+	}
+#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = use_24_hr_format;
+#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp2_) {
+#line 214 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp1_ = _ ("%m/%d/%Y, %H:%M:%S");
+#line 1581 "AdjustDateTimeDialog.c"
+	} else {
+#line 215 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp1_ = _ ("%m/%d/%Y, %I:%M:%S %p");
+#line 1585 "AdjustDateTimeDialog.c"
+	}
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = self->priv->original_time_label;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = self->priv->original_time;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_time_local (_tmp4_, &_tmp5_);
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp6_ = g_time_format (&_tmp5_, _tmp1_);
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp7_ = _tmp6_;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = g_strconcat (_ ("Original: "), _tmp7_, NULL);
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp9_ = _tmp8_;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_label_set_text (_tmp3_, _tmp9_);
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_free0 (_tmp9_);
+#line 213 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_free0 (_tmp7_);
+#line 1607 "AdjustDateTimeDialog.c"
+}
+
+
+static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
+	time_t result = 0;
+	struct tm time = {0};
+	GtkSpinButton* _tmp0_;
+	gdouble _tmp1_;
+	GtkSpinButton* _tmp2_;
+	gdouble _tmp3_;
+	gint hour = 0;
+	GtkSpinButton* _tmp4_;
+	gdouble _tmp5_;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_;
+	gint _tmp12_ = 0;
+	GtkComboBoxText* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	guint year = 0U;
+	guint month = 0U;
+	guint day = 0U;
+	GtkCalendar* _tmp16_;
+	guint _tmp17_ = 0U;
+	guint _tmp18_ = 0U;
+	guint _tmp19_ = 0U;
+	time_t _tmp20_;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
+#line 219 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	memset (&time, 0, sizeof (struct tm));
+#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = self->priv->second;
+#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_sec = (gint) _tmp1_;
+#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = self->priv->minute;
+#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
+#line 222 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_min = (gint) _tmp3_;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = self->priv->hour;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
+#line 225 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	hour = (gint) _tmp5_;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = hour;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp8_ == 12) {
+#line 1662 "AdjustDateTimeDialog.c"
+		GtkComboBoxText* _tmp9_;
+		gint _tmp10_;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp9_ = self->priv->system;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
+#line 1671 "AdjustDateTimeDialog.c"
+	} else {
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp7_ = FALSE;
+#line 1675 "AdjustDateTimeDialog.c"
+	}
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp7_) {
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp6_ = 0;
+#line 1681 "AdjustDateTimeDialog.c"
+	} else {
+		gint _tmp11_;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp11_ = hour;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp6_ = _tmp11_;
+#line 1688 "AdjustDateTimeDialog.c"
+	}
+#line 226 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_hour = _tmp6_;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp13_ = self->priv->system;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp12_ = 12;
+#line 1700 "AdjustDateTimeDialog.c"
+	} else {
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp12_ = 0;
+#line 1704 "AdjustDateTimeDialog.c"
+	}
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp15_ = time.tm_hour;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_hour = _tmp15_ + _tmp12_;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp16_ = self->priv->calendar;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
+#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	year = _tmp17_;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	month = _tmp18_;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	day = _tmp19_;
+#line 231 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
+#line 232 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_mon = (gint) month;
+#line 233 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_mday = (gint) day;
+#line 235 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time.tm_isdst = -1;
+#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp20_ = mktime (&time);
+#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	result = _tmp20_;
+#line 237 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return result;
+#line 1734 "AdjustDateTimeDialog.c"
+}
+
+
+gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals) {
+	gint64 _vala_time_shift = 0LL;
+	gboolean _vala_keep_relativity = FALSE;
+	gboolean _vala_modify_originals = FALSE;
+	gboolean result = FALSE;
+	gboolean response = FALSE;
+	gint _tmp0_;
+#line 240 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
+#line 242 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 244 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	response = FALSE;
+#line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 246 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
+#line 1755 "AdjustDateTimeDialog.c"
+		gboolean _tmp1_;
+		GtkRadioButton* _tmp5_;
+		gboolean _tmp6_;
+		GtkRadioButton* _tmp7_;
+		gboolean _tmp8_;
+		gboolean _tmp9_;
+		GtkCheckButton* _tmp13_;
+		gboolean _tmp14_;
+		GtkCheckButton* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
+#line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp1_ = self->priv->no_original_time;
+#line 247 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp1_) {
+#line 1771 "AdjustDateTimeDialog.c"
+			time_t _tmp2_;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp2_ = adjust_date_time_dialog_get_time (self);
+#line 248 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_vala_time_shift = (gint64) _tmp2_;
+#line 1777 "AdjustDateTimeDialog.c"
+		} else {
+			time_t _tmp3_;
+			time_t _tmp4_;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp3_ = adjust_date_time_dialog_get_time (self);
+#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp4_ = self->priv->original_time;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
+#line 1787 "AdjustDateTimeDialog.c"
+		}
+#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp5_ = self->priv->relativity_radio_button;
+#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 252 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_vala_keep_relativity = _tmp6_;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp7_ = self->priv->relativity_radio_button;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp9_ = _tmp8_;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp9_) {
+#line 1803 "AdjustDateTimeDialog.c"
+			ConfigFacade* _tmp10_;
+			ConfigFacade* _tmp11_;
+			gboolean _tmp12_;
+#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp10_ = config_facade_get_instance ();
+#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp11_ = _tmp10_;
+#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp12_ = _vala_keep_relativity;
+#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+#line 255 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_g_object_unref0 (_tmp11_);
+#line 1817 "AdjustDateTimeDialog.c"
+		}
+#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp13_ = self->priv->modify_originals_check_button;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 257 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_vala_modify_originals = _tmp14_;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp15_ = self->priv->modify_originals_check_button;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
+#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp17_ = _tmp16_;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp17_) {
+#line 1833 "AdjustDateTimeDialog.c"
+			ConfigFacade* _tmp18_;
+			ConfigFacade* _tmp19_;
+			gboolean _tmp20_;
+#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp18_ = config_facade_get_instance ();
+#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp19_ = _tmp18_;
+#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp20_ = _vala_modify_originals;
+#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
+#line 260 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_g_object_unref0 (_tmp19_);
+#line 1847 "AdjustDateTimeDialog.c"
+		}
+#line 262 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		response = TRUE;
+#line 1851 "AdjustDateTimeDialog.c"
+	} else {
+#line 264 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_vala_time_shift = (gint64) 0;
+#line 265 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_vala_keep_relativity = TRUE;
+#line 266 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_vala_modify_originals = FALSE;
+#line 1859 "AdjustDateTimeDialog.c"
+	}
+#line 269 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	result = response;
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (time_shift) {
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		*time_shift = _vala_time_shift;
+#line 1869 "AdjustDateTimeDialog.c"
+	}
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (keep_relativity) {
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		*keep_relativity = _vala_keep_relativity;
+#line 1875 "AdjustDateTimeDialog.c"
+	}
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (modify_originals) {
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		*modify_originals = _vala_modify_originals;
+#line 1881 "AdjustDateTimeDialog.c"
+	}
+#line 271 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return result;
+#line 1885 "AdjustDateTimeDialog.c"
+}
+
+
+static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button) {
+	gboolean result = FALSE;
+	GtkSpinButton* _tmp0_;
+	GtkSpinButton* _tmp1_;
+	gdouble _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+#line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
+#line 274 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = button;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = button;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = _tmp3_;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
+#line 275 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_free0 (_tmp4_);
+#line 277 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed (self);
+#line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	result = TRUE;
+#line 279 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	return result;
+#line 1920 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self) {
+	gint64 time_shift = 0LL;
+	time_t _tmp0_;
+	time_t _tmp1_;
+	GtkCalendar* _tmp2_;
+	GtkCalendar* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	gint _tmp5_;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
+	gint64 _tmp8_;
+#line 282 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
+#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = adjust_date_time_dialog_get_time (self);
+#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = self->priv->original_time;
+#line 283 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
+#line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = self->priv->calendar;
+#line 284 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), "year");
+#line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = self->priv->calendar;
+#line 285 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_object_notify (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "month");
+#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = self->priv->system;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
+#line 287 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp5_;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = time_shift;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp8_ == ((gint64) 0)) {
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp7_ = TRUE;
+#line 1963 "AdjustDateTimeDialog.c"
+	} else {
+		gboolean _tmp9_;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp9_ = self->priv->no_original_time;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp7_ = _tmp9_;
+#line 1970 "AdjustDateTimeDialog.c"
+	}
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp7_) {
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp6_ = TRUE;
+#line 1976 "AdjustDateTimeDialog.c"
+	} else {
+		gboolean _tmp10_ = FALSE;
+		GtkRadioButton* _tmp11_;
+		gboolean _tmp12_;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp11_ = self->priv->batch_radio_button;
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp12_) {
+#line 1987 "AdjustDateTimeDialog.c"
+			GtkRadioButton* _tmp13_;
+			gboolean _tmp14_;
+			gboolean _tmp15_;
+#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp13_ = self->priv->batch_radio_button;
+#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp14_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp15_ = _tmp14_;
+#line 290 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp10_ = _tmp15_;
+#line 1999 "AdjustDateTimeDialog.c"
+		} else {
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp10_ = FALSE;
+#line 2003 "AdjustDateTimeDialog.c"
+		}
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp6_ = _tmp10_;
+#line 2007 "AdjustDateTimeDialog.c"
+	}
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp6_) {
+#line 2011 "AdjustDateTimeDialog.c"
+		GtkLabel* _tmp16_;
+#line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp16_ = self->priv->notification;
+#line 291 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+#line 2017 "AdjustDateTimeDialog.c"
+	} else {
+		gboolean forward = FALSE;
+		gint64 _tmp17_;
+		gint days = 0;
+		gint hours = 0;
+		gint minutes = 0;
+		gint seconds = 0;
+		gint64 _tmp18_;
+		gint64 _tmp19_;
+		gint64 _tmp20_;
+		gint64 _tmp21_;
+		gint64 _tmp22_;
+		gint64 _tmp23_;
+		gint64 _tmp24_;
+		gint64 _tmp25_;
+		const gchar* _tmp26_ = NULL;
+		gboolean _tmp27_;
+		gchar* shift_status = NULL;
+		gchar* _tmp28_;
+		GtkLabel* _tmp29_;
+		const gchar* _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		gint _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		GtkLabel* _tmp41_;
+#line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp17_ = time_shift;
+#line 293 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		forward = _tmp17_ > ((gint64) 0);
+#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp18_ = time_shift;
+#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp19_ = llabs (_tmp18_);
+#line 296 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		time_shift = _tmp19_;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp20_ = time_shift;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		days = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
+#line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp21_ = time_shift;
+#line 299 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
+#line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp22_ = time_shift;
+#line 300 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		hours = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
+#line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp23_ = time_shift;
+#line 301 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		time_shift = _tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
+#line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp24_ = time_shift;
+#line 302 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		minutes = (gint) (_tmp24_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
+#line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp25_ = time_shift;
+#line 303 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		seconds = (gint) (_tmp25_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
+#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp27_ = forward;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp27_) {
+#line 306 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
+"%d %s, %d %s, %d %s, and %d %s.");
+#line 2090 "AdjustDateTimeDialog.c"
+		} else {
+#line 307 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp26_ = _ ("Exposure time will be shifted backward by\n" \
+"%d %s, %d %s, %d %s, and %d %s.");
+#line 2094 "AdjustDateTimeDialog.c"
+		}
+#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp28_ = g_strdup (_tmp26_);
+#line 305 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		shift_status = _tmp28_;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp29_ = self->priv->notification;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp30_ = shift_status;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp31_ = days;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp32_ = days;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp33_ = hours;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp34_ = hours;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp35_ = minutes;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp36_ = minutes;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp37_ = seconds;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp38_ = seconds;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp39_ = g_strdup_printf (_tmp30_, _tmp31_, ngettext ("day", "days", (gulong) _tmp32_), _tmp33_, ngettext ("hour", "hours", (gulong) _tmp34_), _tmp35_, ngettext ("minute", "minutes", (gulong) _tmp36_), _tmp37_, ngettext ("second", "seconds", (gulong) _tmp38_));
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp40_ = _tmp39_;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_label_set_text (_tmp29_, _tmp40_);
+#line 309 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_free0 (_tmp40_);
+#line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp41_ = self->priv->notification;
+#line 314 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
+#line 289 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_g_free0 (shift_status);
+#line 2134 "AdjustDateTimeDialog.c"
+	}
+}
+
+
+static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog* self) {
+	AdjustDateTimeDialogTimeSystem _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	GtkComboBoxText* _tmp5_;
+	gint _tmp6_;
+	GtkComboBoxText* _tmp7_;
+	gint _tmp8_;
+#line 318 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
+#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp0_ = self->priv->previous_time_system;
+#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp1_ = self->priv->system;
+#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+#line 319 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp0_ == _tmp2_) {
+#line 320 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		return;
+#line 2161 "AdjustDateTimeDialog.c"
+	}
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp3_ = config_facade_get_instance ();
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp4_ = _tmp3_;
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp5_ = self->priv->system;
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
+#line 322 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (_tmp4_);
+#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp7_ = self->priv->system;
+#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
+#line 324 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
+#line 2181 "AdjustDateTimeDialog.c"
+		gint _tmp9_ = 0;
+		GtkSpinButton* _tmp10_;
+		gdouble _tmp11_;
+		gint time = 0;
+		gint _tmp14_ = 0;
+		AdjustDateTimeDialogTimeSystem _tmp15_;
+		gint _tmp16_;
+		GtkSpinButton* _tmp17_;
+		GtkSpinButton* _tmp18_;
+		gint _tmp19_;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp10_ = self->priv->hour;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp11_ == 12.0) {
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp9_ = 0;
+#line 2200 "AdjustDateTimeDialog.c"
+		} else {
+			GtkSpinButton* _tmp12_;
+			gdouble _tmp13_;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp12_ = self->priv->hour;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp9_ = (gint) _tmp13_;
+#line 2210 "AdjustDateTimeDialog.c"
+		}
+#line 325 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		time = _tmp9_;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp15_ = self->priv->previous_time_system;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp14_ = 12;
+#line 2220 "AdjustDateTimeDialog.c"
+		} else {
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp14_ = 0;
+#line 2224 "AdjustDateTimeDialog.c"
+		}
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp16_ = time;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		time = _tmp16_ + _tmp14_;
+#line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp17_ = self->priv->hour;
+#line 328 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
+#line 329 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		adjust_date_time_dialog_set_original_time_label (self, TRUE);
+#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp18_ = self->priv->hour;
+#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp19_ = time;
+#line 331 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
+#line 2242 "AdjustDateTimeDialog.c"
+	} else {
+		gint AMPM_hour = 0;
+		GtkSpinButton* _tmp20_;
+		gdouble _tmp21_;
+		GtkSpinButton* _tmp22_;
+		gint _tmp23_ = 0;
+		gint _tmp24_;
+		GtkSpinButton* _tmp26_;
+#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp20_ = self->priv->hour;
+#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
+#line 333 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		AMPM_hour = ((gint) _tmp21_) % 12;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp22_ = self->priv->hour;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
+#line 336 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		adjust_date_time_dialog_set_original_time_label (self, FALSE);
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp24_ = AMPM_hour;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		if (_tmp24_ == 0) {
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp23_ = 12;
+#line 2269 "AdjustDateTimeDialog.c"
+		} else {
+			gint _tmp25_;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp25_ = AMPM_hour;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+			_tmp23_ = _tmp25_;
+#line 2276 "AdjustDateTimeDialog.c"
+		}
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		_tmp26_ = self->priv->hour;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
+#line 2282 "AdjustDateTimeDialog.c"
+	}
+#line 341 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_on_time_changed (self);
+#line 2286 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
+#line 2297 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self->priv->no_original_time = FALSE;
+#line 2306 "AdjustDateTimeDialog.c"
+}
+
+
+static void adjust_date_time_dialog_finalize (GObject * obj) {
+	AdjustDateTimeDialog * self;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
+#line 18 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->original_time_label);
+#line 19 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->calendar);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->hour);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->minute);
+#line 22 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->second);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->system);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->relativity_radio_button);
+#line 25 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->batch_radio_button);
+#line 26 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->modify_originals_check_button);
+#line 27 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	_g_object_unref0 (self->priv->notification);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/AdjustDateTimeDialog.vala"
+	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
+#line 2336 "AdjustDateTimeDialog.c"
+}
+
+
+GType adjust_date_time_dialog_get_type (void) {
+	static volatile gsize adjust_date_time_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&adjust_date_time_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (AdjustDateTimeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) adjust_date_time_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (AdjustDateTimeDialog), 0, (GInstanceInitFunc) adjust_date_time_dialog_instance_init, NULL };
+		GType adjust_date_time_dialog_type_id;
+		adjust_date_time_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "AdjustDateTimeDialog", &g_define_type_info, 0);
+		g_once_init_leave (&adjust_date_time_dialog_type_id__volatile, adjust_date_time_dialog_type_id);
+	}
+	return adjust_date_time_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/AdjustDateTimeDialog.vala b/src/dialogs/AdjustDateTimeDialog.vala
new file mode 100644
index 0000000..cf2685b
--- /dev/null
+++ b/src/dialogs/AdjustDateTimeDialog.vala
@@ -0,0 +1,343 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class AdjustDateTimeDialog : Gtk.Dialog {
+    private const int64 SECONDS_IN_DAY = 60 * 60 * 24;
+    private const int64 SECONDS_IN_HOUR = 60 * 60;
+    private const int64 SECONDS_IN_MINUTE = 60;
+    private const int YEAR_OFFSET = 1900;
+    private bool no_original_time = false;
+
+    private const int CALENDAR_THUMBNAIL_SCALE = 1;
+
+    time_t original_time;
+    Gtk.Label original_time_label;
+    Gtk.Calendar calendar;
+    Gtk.SpinButton hour;
+    Gtk.SpinButton minute;
+    Gtk.SpinButton second;
+    Gtk.ComboBoxText system;
+    Gtk.RadioButton relativity_radio_button;
+    Gtk.RadioButton batch_radio_button;
+    Gtk.CheckButton modify_originals_check_button;
+    Gtk.Label notification;
+
+    private enum TimeSystem {
+        AM,
+        PM,
+        24HR;
+    }
+
+    TimeSystem previous_time_system;
+
+    public AdjustDateTimeDialog(Dateable source, int photo_count, bool display_options = true,
+        bool contains_video = false, bool only_video = false) {
+        assert(source != null);
+
+        Object(use_header_bar: Resources.use_header_bar());
+
+        set_modal(true);
+        set_resizable(false);
+        set_transient_for(AppWindow.get_instance());
+
+        add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
+                    Resources.OK_LABEL, Gtk.ResponseType.OK);
+        set_title(Resources.ADJUST_DATE_TIME_LABEL);
+
+        calendar = new Gtk.Calendar();
+        calendar.show_heading = false;
+        calendar.day_selected.connect(on_time_changed);
+        calendar.month_changed.connect(on_time_changed);
+        calendar.next_year.connect(on_time_changed);
+        calendar.prev_year.connect(on_time_changed);
+
+        if (Config.Facade.get_instance().get_use_24_hour_time())
+            hour = new Gtk.SpinButton.with_range(0, 23, 1);
+        else
+            hour = new Gtk.SpinButton.with_range(1, 12, 1);
+
+        hour.output.connect(on_spin_button_output);
+        hour.set_width_chars(2);
+        hour.set_max_width_chars(2);
+
+        minute = new Gtk.SpinButton.with_range(0, 59, 1);
+        minute.set_width_chars(2);
+        minute.set_max_width_chars(2);
+        minute.output.connect(on_spin_button_output);
+
+        second = new Gtk.SpinButton.with_range(0, 59, 1);
+        second.set_width_chars(2);
+        second.set_max_width_chars(2);
+        second.output.connect(on_spin_button_output);
+
+        system = new Gtk.ComboBoxText();
+        system.append_text(_("AM"));
+        system.append_text(_("PM"));
+        system.append_text(_("24 Hr"));
+        system.changed.connect(on_time_system_changed);
+
+        Gtk.Box clock = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
+
+        clock.pack_start(hour, false, false, 0);
+        clock.pack_start(new Gtk.Label(":"), false, false, 0); // internationalize?
+        clock.pack_start(minute, false, false, 0);
+        clock.pack_start(new Gtk.Label(":"), false, false, 0);
+        clock.pack_start(second, false, false, 0);
+        clock.pack_start(system, false, false, 0);
+
+        set_default_response(Gtk.ResponseType.OK);
+
+        relativity_radio_button = new Gtk.RadioButton.with_mnemonic(null,
+            _("_Shift photos/videos by the same amount"));
+        relativity_radio_button.set_active(Config.Facade.get_instance().get_keep_relativity());
+        relativity_radio_button.sensitive = display_options && photo_count > 1;
+
+        batch_radio_button = new Gtk.RadioButton.with_mnemonic(relativity_radio_button.get_group(),
+            _("Set _all photos/videos to this time"));
+        batch_radio_button.set_active(!Config.Facade.get_instance().get_keep_relativity());
+        batch_radio_button.sensitive = display_options && photo_count > 1;
+        batch_radio_button.toggled.connect(on_time_changed);
+
+        if (contains_video) {
+            var text = ngettext ("_Modify original photo file", "_Modify original photo files",
+                                 photo_count);
+            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
+        } else {
+            var text = ngettext ("_Modify original file", "_Modify original files", photo_count);
+            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
+        }
+
+        modify_originals_check_button.set_active(Config.Facade.get_instance().get_commit_metadata_to_masters() &&
+            display_options);
+        modify_originals_check_button.sensitive = (!only_video) &&
+            (!Config.Facade.get_instance().get_commit_metadata_to_masters() && display_options);
+
+        Gtk.Box time_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
+
+        var picker = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
+        var combo = new Gtk.ComboBoxText();
+        for (int i = 0; i < 12; i++){
+            combo.append_text(Time.gm((i * 2764800)).format("%B"));
+        }
+        picker.pack_start(combo, false, false, 0);
+        // Limits taken from GtkCalendar
+        var spin = new Gtk.SpinButton.with_range(0, int.MAX >> 9, 1);
+        picker.pack_end(spin, false, false, 0);
+        spin.bind_property("value", calendar, "year", GLib.BindingFlags.BIDIRECTIONAL);
+        combo.bind_property("active", calendar, "month", GLib.BindingFlags.BIDIRECTIONAL);
+
+        time_content.pack_start(picker, false, false, 0);
+        time_content.pack_start(calendar, true, false, 0);
+        time_content.pack_start(clock, true, false, 0);
+
+        if (display_options) {
+            time_content.pack_start(relativity_radio_button, true, false, 0);
+            time_content.pack_start(batch_radio_button, true, false, 0);
+            time_content.pack_start(modify_originals_check_button, true, false, 0);
+        }
+
+        Gdk.Pixbuf preview = null;
+        try {
+            // Instead of calling get_pixbuf() here, we use the thumbnail instead;
+            // this was needed for Videos, since they don't support get_pixbuf().
+            preview = source.get_thumbnail(CALENDAR_THUMBNAIL_SCALE);
+        } catch (Error err) {
+            warning("Unable to fetch preview for %s", source.to_string());
+        }
+
+        Gtk.Box image_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        image_content.set_valign(Gtk.Align.START);
+        image_content.set_homogeneous(true);
+        Gtk.Image image = (preview != null) ? new Gtk.Image.from_pixbuf(preview) : new Gtk.Image();
+        original_time_label = new Gtk.Label(null);
+        image_content.pack_start(image, true, false, 0);
+        image_content.pack_start(original_time_label, true, false, 0);
+
+        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 10);
+        hbox.set_border_width(3);
+        hbox.pack_start(image_content, true, false, 0);
+        hbox.pack_start(time_content, true, false, 0);
+        hbox.halign = Gtk.Align.CENTER;
+        hbox.valign = Gtk.Align.CENTER;
+        hbox.hexpand = false;
+        hbox.vexpand = false;
+
+        ((Gtk.Box) get_content_area()).pack_start(hbox, true, false, 0);
+
+        notification = new Gtk.Label("");
+        notification.set_line_wrap(true);
+        notification.set_justify(Gtk.Justification.CENTER);
+
+        ((Gtk.Box) get_content_area()).pack_start(notification, true, true, 0);
+
+        original_time = source.get_exposure_time();
+
+        if (original_time == 0) {
+            original_time = time_t();
+            no_original_time = true;
+        }
+
+        set_time(Time.local(original_time));
+        set_original_time_label(Config.Facade.get_instance().get_use_24_hour_time());
+    }
+
+    private void set_time(Time time) {
+        calendar.select_month(time.month, time.year + YEAR_OFFSET);
+        calendar.select_day(time.day);
+        calendar.notify_property("year");
+        calendar.notify_property("month");
+
+        if (Config.Facade.get_instance().get_use_24_hour_time()) {
+            system.set_active(TimeSystem.24HR);
+            hour.set_value(time.hour);
+        } else {
+            int AMPM_hour = time.hour % 12;
+            hour.set_value((AMPM_hour == 0) ? 12 : AMPM_hour);
+            system.set_active((time.hour >= 12) ? TimeSystem.PM : TimeSystem.AM);
+        }
+
+        minute.set_value(time.minute);
+        second.set_value(time.second);
+
+        previous_time_system = (TimeSystem) system.get_active();
+    }
+
+    private void set_original_time_label(bool use_24_hr_format) {
+        if (no_original_time)
+            return;
+
+        original_time_label.set_text(_("Original: ") +
+            Time.local(original_time).format(use_24_hr_format ? _("%m/%d/%Y, %H:%M:%S") :
+            _("%m/%d/%Y, %I:%M:%S %p")));
+    }
+
+    private time_t get_time() {
+        Time time = Time();
+
+        time.second = (int) second.get_value();
+        time.minute = (int) minute.get_value();
+
+        // convert to 24 hr
+        int hour = (int) hour.get_value();
+        time.hour = (hour == 12 && system.get_active() != TimeSystem.24HR) ? 0 : hour;
+        time.hour += ((system.get_active() == TimeSystem.PM) ? 12 : 0);
+
+        uint year, month, day;
+        calendar.get_date(out year, out month, out day);
+        time.year = ((int) year) - YEAR_OFFSET;
+        time.month = (int) month;
+        time.day = (int) day;
+
+        time.isdst = -1;
+
+        return time.mktime();
+    }
+
+    public bool execute(out int64 time_shift, out bool keep_relativity,
+        out bool modify_originals) {
+        show_all();
+
+        bool response = false;
+
+        if (run() == Gtk.ResponseType.OK) {
+            if (no_original_time)
+                time_shift = (int64) get_time();
+            else
+                time_shift = (int64) (get_time() - original_time);
+
+            keep_relativity = relativity_radio_button.get_active();
+
+            if (relativity_radio_button.sensitive)
+                Config.Facade.get_instance().set_keep_relativity(keep_relativity);
+
+            modify_originals = modify_originals_check_button.get_active();
+
+            if (modify_originals_check_button.sensitive)
+                Config.Facade.get_instance().set_modify_originals(modify_originals);
+
+            response = true;
+        } else {
+            time_shift = 0;
+            keep_relativity = true;
+            modify_originals = false;
+        }
+
+        destroy();
+
+        return response;
+    }
+
+    private bool on_spin_button_output(Gtk.SpinButton button) {
+        button.set_text("%02d".printf((int) button.get_value()));
+
+        on_time_changed();
+
+        return true;
+    }
+
+    private void on_time_changed() {
+        int64 time_shift = ((int64) get_time() - (int64) original_time);
+        calendar.notify_property("year");
+        calendar.notify_property("month");
+
+        previous_time_system = (TimeSystem) system.get_active();
+
+        if (time_shift == 0 || no_original_time || (batch_radio_button.get_active() &&
+            batch_radio_button.sensitive)) {
+            notification.hide();
+        } else {
+            bool forward = time_shift > 0;
+            int days, hours, minutes, seconds;
+
+            time_shift = time_shift.abs();
+
+            days = (int) (time_shift / SECONDS_IN_DAY);
+            time_shift = time_shift % SECONDS_IN_DAY;
+            hours = (int) (time_shift / SECONDS_IN_HOUR);
+            time_shift = time_shift % SECONDS_IN_HOUR;
+            minutes = (int) (time_shift / SECONDS_IN_MINUTE);
+            seconds = (int) (time_shift % SECONDS_IN_MINUTE);
+
+            string shift_status = (forward) ?
+                _("Exposure time will be shifted forward by\n%d %s, %d %s, %d %s, and %d %s.") :
+                _("Exposure time will be shifted backward by\n%d %s, %d %s, %d %s, and %d %s.");
+
+            notification.set_text(shift_status.printf(days, ngettext("day", "days", days),
+                hours, ngettext("hour", "hours", hours), minutes,
+                ngettext("minute", "minutes", minutes), seconds,
+                ngettext("second", "seconds", seconds)));
+
+            notification.show();
+        }
+    }
+
+    private void on_time_system_changed() {
+        if (previous_time_system == system.get_active())
+            return;
+
+        Config.Facade.get_instance().set_use_24_hour_time(system.get_active() == TimeSystem.24HR);
+
+        if (system.get_active() == TimeSystem.24HR) {
+            int time = (hour.get_value() == 12.0) ? 0 : (int) hour.get_value();
+            time = time + ((previous_time_system == TimeSystem.PM) ? 12 : 0);
+
+            hour.set_range(0, 23);
+            set_original_time_label(true);
+
+            hour.set_value(time);
+        } else {
+            int AMPM_hour = ((int) hour.get_value()) % 12;
+
+            hour.set_range(1, 12);
+            set_original_time_label(false);
+
+            hour.set_value((AMPM_hour == 0) ? 12 : AMPM_hour);
+        }
+
+        on_time_changed();
+    }
+}
diff --git a/src/dialogs/EntryMultiCompletion.c b/src/dialogs/EntryMultiCompletion.c
new file mode 100644
index 0000000..9dd3cd1
--- /dev/null
+++ b/src/dialogs/EntryMultiCompletion.c
@@ -0,0 +1,1124 @@
+/* EntryMultiCompletion.c generated by valac 0.36.6, the Vala compiler
+ * generated from EntryMultiCompletion.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+/* Entry completion for values separated by separators (e.g. comma in the case of tags)*/
+/* Partly inspired by the class of the same name in gtkmm-utils by Marko Anastasov*/
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gee.h>
+
+
+#define TYPE_ENTRY_MULTI_COMPLETION (entry_multi_completion_get_type ())
+#define ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion))
+#define ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
+#define IS_ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ENTRY_MULTI_COMPLETION))
+#define IS_ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ENTRY_MULTI_COMPLETION))
+#define ENTRY_MULTI_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
+
+typedef struct _EntryMultiCompletion EntryMultiCompletion;
+typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
+typedef struct _EntryMultiCompletionPrivate EntryMultiCompletionPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _EntryMultiCompletion {
+	GtkEntryCompletion parent_instance;
+	EntryMultiCompletionPrivate * priv;
+};
+
+struct _EntryMultiCompletionClass {
+	GtkEntryCompletionClass parent_class;
+};
+
+struct _EntryMultiCompletionPrivate {
+	gchar* delimiter;
+};
+
+
+static gpointer entry_multi_completion_parent_class = NULL;
+
+GType entry_multi_completion_get_type (void) G_GNUC_CONST;
+#define ENTRY_MULTI_COMPLETION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionPrivate))
+enum  {
+	ENTRY_MULTI_COMPLETION_DUMMY_PROPERTY
+};
+EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter);
+static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list);
+static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter);
+static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self);
+static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter);
+static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter);
+static void entry_multi_completion_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 gint _vala_array_length (gpointer array);
+
+
+static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self) {
+	gboolean result;
+	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
+#line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return result;
+#line 78 "EntryMultiCompletion.c"
+}
+
+
+EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter) {
+	EntryMultiCompletion * self = NULL;
+	gboolean _tmp0_ = FALSE;
+	const gchar* _tmp1_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	GeeCollection* _tmp7_;
+	GtkListStore* _tmp8_;
+	GtkListStore* _tmp9_;
+#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	self = (EntryMultiCompletion*) g_object_new (object_type, NULL);
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp1_ = delimiter;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (_tmp1_ == NULL) {
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp0_ = TRUE;
+#line 101 "EntryMultiCompletion.c"
+	} else {
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp2_ = delimiter;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp3_ = strlen (_tmp2_);
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp4_ = _tmp3_;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp0_ = _tmp4_ == 1;
+#line 114 "EntryMultiCompletion.c"
+	}
+#line 14 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
+#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp5_ = delimiter;
+#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp6_ = g_strdup (_tmp5_);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (self->priv->delimiter);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	self->priv->delimiter = _tmp6_;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp7_ = completion_list;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp8_ = entry_multi_completion_create_completion_store (_tmp7_);
+#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp9_ = _tmp8_;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+#line 17 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_object_unref0 (_tmp9_);
+#line 18 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_entry_completion_set_text_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), 0);
+#line 19 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return self;
+#line 142 "EntryMultiCompletion.c"
+}
+
+
+EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
+#line 13 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
+#line 149 "EntryMultiCompletion.c"
+}
+
+
+static GtkListStore* entry_multi_completion_create_completion_store (GeeCollection* completion_list) {
+	GtkListStore* result = NULL;
+	GtkListStore* completion_store = NULL;
+	GtkListStore* _tmp0_;
+	GtkTreeIter store_iter = {0};
+	GeeIterator* completion_iter = NULL;
+	GeeCollection* _tmp1_;
+	GeeIterator* _tmp2_;
+#line 22 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, -1);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	completion_store = _tmp0_;
+#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp1_ = completion_list;
+#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 25 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	completion_iter = _tmp2_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	while (TRUE) {
+#line 175 "EntryMultiCompletion.c"
+		GeeIterator* _tmp3_;
+		gboolean _tmp4_;
+		GtkListStore* _tmp5_;
+		GtkTreeIter _tmp6_ = {0};
+		GtkListStore* _tmp7_;
+		GtkTreeIter _tmp8_;
+		GeeIterator* _tmp9_;
+		gpointer _tmp10_;
+		gchar* _tmp11_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp3_ = completion_iter;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp4_ = gee_iterator_next (_tmp3_);
+#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		if (!_tmp4_) {
+#line 26 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			break;
+#line 193 "EntryMultiCompletion.c"
+		}
+#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp5_ = completion_store;
+#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		gtk_list_store_append (_tmp5_, &_tmp6_);
+#line 27 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		store_iter = _tmp6_;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp7_ = completion_store;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp8_ = store_iter;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp9_ = completion_iter;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp10_ = gee_iterator_get (_tmp9_);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp11_ = (gchar*) _tmp10_;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (_tmp11_);
+#line 215 "EntryMultiCompletion.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	result = completion_store;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_object_unref0 (completion_iter);
+#line 31 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return result;
+#line 223 "EntryMultiCompletion.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 230 "EntryMultiCompletion.c"
+}
+
+
+static gchar* string_strip (const gchar* self) {
+	gchar* result = NULL;
+	gchar* _result_ = NULL;
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = g_strdup (self);
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_result_ = _tmp0_;
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = _result_;
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_strstrip (_tmp1_);
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _result_;
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 253 "EntryMultiCompletion.c"
+}
+
+
+static gboolean string_contains (const gchar* self, const gchar* needle) {
+	gboolean result = FALSE;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (needle != NULL, FALSE);
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = needle;
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp1_ != NULL;
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 273 "EntryMultiCompletion.c"
+}
+
+
+static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = c;
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
+#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_result_ = _tmp2_;
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 298 "EntryMultiCompletion.c"
+		gchar* _tmp4_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 306 "EntryMultiCompletion.c"
+	} else {
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = -1;
+#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 312 "EntryMultiCompletion.c"
+	}
+}
+
+
+static gchar string_get (const gchar* self, glong index) {
+	gchar result = '\0';
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, '\0');
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = index;
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = ((gchar*) self)[_tmp0_];
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp1_;
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 331 "EntryMultiCompletion.c"
+}
+
+
+static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter) {
+	gboolean result = FALSE;
+	GtkTreeModel* model = NULL;
+	GtkEntryCompletion* _tmp0_;
+	GtkTreeModel* _tmp1_;
+	GtkTreeModel* _tmp2_;
+	gchar* possible_match = NULL;
+	GtkTreeModel* _tmp3_;
+	GtkTreeIter _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* normed_key = NULL;
+	const gchar* _tmp9_;
+	gchar* _tmp10_;
+	const gchar* _tmp11_;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), FALSE);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (key != NULL, FALSE);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (iter != NULL, FALSE);
+#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp0_ = completion;
+#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp1_ = gtk_entry_completion_get_model (_tmp0_);
+#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 35 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	model = _tmp2_;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp3_ = model;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp4_ = *iter;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_tree_model_get (_tmp3_, &_tmp4_, 0, &possible_match, -1);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp5_ = possible_match;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp6_ = g_utf8_casefold (_tmp5_, (gssize) -1);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp7_ = _tmp6_;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp8_ = g_utf8_normalize (_tmp7_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (possible_match);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	possible_match = _tmp8_;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (_tmp7_);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp9_ = key;
+#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp10_ = g_utf8_normalize (_tmp9_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	normed_key = _tmp10_;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp11_ = self->priv->delimiter;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (_tmp11_ == NULL) {
+#line 398 "EntryMultiCompletion.c"
+		const gchar* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gboolean _tmp16_;
+		gboolean _tmp17_;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp12_ = possible_match;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp13_ = normed_key;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp14_ = string_strip (_tmp13_);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp15_ = _tmp14_;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp16_ = g_str_has_prefix (_tmp12_, _tmp15_);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp17_ = _tmp16_;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (_tmp15_);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		result = _tmp17_;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (normed_key);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (possible_match);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_object_unref0 (model);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		return result;
+#line 429 "EntryMultiCompletion.c"
+	} else {
+		const gchar* _tmp18_;
+		const gchar* _tmp19_;
+		gboolean _tmp20_;
+		gchar* last_part = NULL;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		const gchar* _tmp34_;
+		gchar* _tmp35_;
+		gchar* _tmp36_;
+		const gchar* _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
+		const gchar* _tmp40_;
+		const gchar* _tmp41_;
+		gchar* _tmp42_;
+		gchar* _tmp43_;
+		gboolean _tmp44_;
+		gboolean _tmp45_;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp18_ = normed_key;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp19_ = self->priv->delimiter;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp20_ = string_contains (_tmp18_, _tmp19_);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		if (_tmp20_) {
+#line 458 "EntryMultiCompletion.c"
+			gint offset = 0;
+			const gchar* _tmp21_;
+			const gchar* _tmp22_;
+			const gchar* _tmp23_;
+			gchar _tmp24_;
+			gint _tmp25_;
+			gint _tmp26_;
+			gint position = 0;
+			GtkWidget* _tmp27_;
+			gint _tmp28_;
+			gint _tmp29_;
+			gint _tmp30_;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp21_ = normed_key;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp22_ = normed_key;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp23_ = self->priv->delimiter;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp24_ = string_get (_tmp23_, (glong) 0);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp25_ = string_last_index_of_char (_tmp22_, (gunichar) _tmp24_, 0);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp26_ = g_utf8_strlen (_tmp21_, (gssize) _tmp25_);
+#line 51 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			offset = _tmp26_;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp27_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
+#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp28_ = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), GTK_TYPE_EDITABLE, GtkEditable));
+#line 52 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			position = _tmp28_;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp29_ = position;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp30_ = offset;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			if (_tmp29_ <= _tmp30_) {
+#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				result = FALSE;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				_g_free0 (normed_key);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				_g_free0 (possible_match);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				_g_object_unref0 (model);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				return result;
+#line 507 "EntryMultiCompletion.c"
+			}
+		}
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp31_ = normed_key;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp32_ = string_strip (_tmp31_);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp33_ = _tmp32_;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp34_ = self->priv->delimiter;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp35_ = entry_multi_completion_get_last_part (_tmp33_, _tmp34_);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp36_ = _tmp35_;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (_tmp33_);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		last_part = _tmp36_;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp37_ = last_part;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp38_ = strlen (_tmp37_);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp39_ = _tmp38_;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		if (_tmp39_ == 0) {
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			result = FALSE;
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (last_part);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (normed_key);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (possible_match);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_object_unref0 (model);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			return result;
+#line 546 "EntryMultiCompletion.c"
+		}
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp40_ = possible_match;
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp41_ = last_part;
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp42_ = string_strip (_tmp41_);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp43_ = _tmp42_;
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp44_ = g_str_has_prefix (_tmp40_, _tmp43_);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp45_ = _tmp44_;
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (_tmp43_);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		result = _tmp45_;
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (last_part);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (normed_key);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_free0 (possible_match);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_g_object_unref0 (model);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		return result;
+#line 574 "EntryMultiCompletion.c"
+	}
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (normed_key);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (possible_match);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_object_unref0 (model);
+#line 582 "EntryMultiCompletion.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 605 "EntryMultiCompletion.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 613 "EntryMultiCompletion.c"
+	} else {
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 625 "EntryMultiCompletion.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 649 "EntryMultiCompletion.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 655 "EntryMultiCompletion.c"
+	} else {
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 659 "EntryMultiCompletion.c"
+	}
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 663 "EntryMultiCompletion.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 675 "EntryMultiCompletion.c"
+	} else {
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 685 "EntryMultiCompletion.c"
+	}
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 691 "EntryMultiCompletion.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 705 "EntryMultiCompletion.c"
+	} else {
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 715 "EntryMultiCompletion.c"
+	}
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 721 "EntryMultiCompletion.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 730 "EntryMultiCompletion.c"
+	}
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 750 "EntryMultiCompletion.c"
+}
+
+
+static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion* base, GtkTreeModel* model, GtkTreeIter* iter) {
+	EntryMultiCompletion * self;
+	gboolean result = FALSE;
+	gchar* match = NULL;
+	GtkTreeModel* _tmp0_;
+	GtkTreeIter _tmp1_;
+	GtkEntry* entry = NULL;
+	GtkWidget* _tmp2_;
+	GtkEntry* _tmp3_;
+	gchar* old_text = NULL;
+	GtkEntry* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	const gchar* _tmp24_ = NULL;
+	const gchar* _tmp25_;
+	gchar* new_text = NULL;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
+	gchar* _tmp28_;
+	gchar* _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	gchar* _tmp32_;
+	gchar* _tmp33_;
+	gchar* _tmp34_;
+	GtkEntry* _tmp35_;
+	GtkEntry* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
+#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
+#line 66 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (iter != NULL, FALSE);
+#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp0_ = model;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp1_ = *iter;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &match, -1);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp2_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
+#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry));
+#line 70 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	entry = _tmp3_;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp4_ = entry;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp5_ = gtk_entry_get_text (_tmp4_);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp6_ = g_utf8_normalize (_tmp5_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	old_text = _tmp6_;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp7_ = old_text;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp8_ = strlen (_tmp7_);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp9_ = _tmp8_;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (_tmp9_ > 0) {
+#line 820 "EntryMultiCompletion.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gboolean _tmp12_;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp10_ = old_text;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp11_ = self->priv->delimiter;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp12_ = string_contains (_tmp10_, _tmp11_);
+#line 74 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		if (_tmp12_) {
+#line 832 "EntryMultiCompletion.c"
+			const gchar* _tmp13_ = NULL;
+			const gchar* _tmp14_;
+			const gchar* _tmp15_;
+			const gchar* _tmp16_;
+			const gchar* _tmp17_;
+			gchar _tmp18_;
+			gint _tmp19_;
+			gchar* _tmp20_;
+			gchar* _tmp21_;
+			gchar* _tmp22_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp14_ = self->priv->delimiter;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			if (g_strcmp0 (_tmp14_, " ") != 0) {
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				_tmp13_ = " ";
+#line 849 "EntryMultiCompletion.c"
+			} else {
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+				_tmp13_ = "";
+#line 853 "EntryMultiCompletion.c"
+			}
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp15_ = old_text;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp16_ = old_text;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp17_ = self->priv->delimiter;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp18_ = string_get (_tmp17_, (glong) 0);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp19_ = string_last_index_of_char (_tmp16_, (gunichar) _tmp18_, 0);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp20_ = string_substring (_tmp15_, (glong) 0, (glong) (_tmp19_ + 1));
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp21_ = _tmp20_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp22_ = g_strconcat (_tmp21_, _tmp13_, NULL);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (old_text);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			old_text = _tmp22_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (_tmp21_);
+#line 877 "EntryMultiCompletion.c"
+		} else {
+			gchar* _tmp23_;
+#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_tmp23_ = g_strdup ("");
+#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			_g_free0 (old_text);
+#line 77 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+			old_text = _tmp23_;
+#line 886 "EntryMultiCompletion.c"
+		}
+	}
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp25_ = self->priv->delimiter;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (g_strcmp0 (_tmp25_, " ") != 0) {
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp24_ = " ";
+#line 895 "EntryMultiCompletion.c"
+	} else {
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp24_ = "";
+#line 899 "EntryMultiCompletion.c"
+	}
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp26_ = old_text;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp27_ = match;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp29_ = _tmp28_;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp30_ = self->priv->delimiter;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp32_ = _tmp31_;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp33_ = g_strconcat (_tmp32_, _tmp24_, NULL);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp34_ = _tmp33_;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (_tmp32_);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (_tmp29_);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	new_text = _tmp34_;
+#line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp35_ = entry;
+#line 81 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_entry_set_text (_tmp35_, new_text);
+#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp36_ = entry;
+#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp37_ = strlen (new_text);
+#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp38_ = _tmp37_;
+#line 82 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_EDITABLE, GtkEditable), (gint) _tmp38_);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	result = TRUE;
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (new_text);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (old_text);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_object_unref0 (entry);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (match);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	return result;
+#line 949 "EntryMultiCompletion.c"
+}
+
+
+static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar* delimiter) {
+	gchar* result = NULL;
+	gchar** split = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint split_length1;
+	gint _split_size_;
+	gboolean _tmp4_ = FALSE;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (s != NULL, NULL);
+#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_return_val_if_fail (delimiter != NULL, NULL);
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp0_ = s;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp1_ = delimiter;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0);
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	split = _tmp3_;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	split_length1 = _vala_array_length (_tmp2_);
+#line 89 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_split_size_ = split_length1;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp5_ = split;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_tmp5__length1 = split_length1;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (_tmp5_ != NULL) {
+#line 987 "EntryMultiCompletion.c"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+		const gchar* _tmp7_;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp6_ = split;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp6__length1 = split_length1;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp7_ = _tmp6_[0];
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp4_ = _tmp7_ != NULL;
+#line 999 "EntryMultiCompletion.c"
+	} else {
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp4_ = FALSE;
+#line 1003 "EntryMultiCompletion.c"
+	}
+#line 91 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	if (_tmp4_) {
+#line 1007 "EntryMultiCompletion.c"
+		gchar** _tmp8_;
+		gint _tmp8__length1;
+		gchar** _tmp9_;
+		gint _tmp9__length1;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp8_ = split;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp8__length1 = split_length1;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp9_ = split;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp9__length1 = split_length1;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp10_ = _tmp8_[_tmp9__length1 - 1];
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp11_ = g_strdup (_tmp10_);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		result = _tmp11_;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		return result;
+#line 1032 "EntryMultiCompletion.c"
+	} else {
+		gchar* _tmp12_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		_tmp12_ = g_strdup ("");
+#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		result = _tmp12_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+		return result;
+#line 1043 "EntryMultiCompletion.c"
+	}
+#line 88 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
+#line 1047 "EntryMultiCompletion.c"
+}
+
+
+static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	entry_multi_completion_parent_class = g_type_class_peek_parent (klass);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	g_type_class_add_private (klass, sizeof (EntryMultiCompletionPrivate));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	((GtkEntryCompletionClass *) klass)->match_selected = (gboolean (*) (GtkEntryCompletion *, GtkTreeModel*, GtkTreeIter*)) entry_multi_completion_real_match_selected;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
+#line 1060 "EntryMultiCompletion.c"
+}
+
+
+static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
+#line 1067 "EntryMultiCompletion.c"
+}
+
+
+static void entry_multi_completion_finalize (GObject * obj) {
+	EntryMultiCompletion * self;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
+#line 11 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	_g_free0 (self->priv->delimiter);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/EntryMultiCompletion.vala"
+	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
+#line 1079 "EntryMultiCompletion.c"
+}
+
+
+GType entry_multi_completion_get_type (void) {
+	static volatile gsize entry_multi_completion_type_id__volatile = 0;
+	if (g_once_init_enter (&entry_multi_completion_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (EntryMultiCompletionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) entry_multi_completion_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EntryMultiCompletion), 0, (GInstanceInitFunc) entry_multi_completion_instance_init, NULL };
+		GType entry_multi_completion_type_id;
+		entry_multi_completion_type_id = g_type_register_static (gtk_entry_completion_get_type (), "EntryMultiCompletion", &g_define_type_info, 0);
+		g_once_init_leave (&entry_multi_completion_type_id__volatile, entry_multi_completion_type_id);
+	}
+	return entry_multi_completion_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
+
diff --git a/src/dialogs/EntryMultiCompletion.vala b/src/dialogs/EntryMultiCompletion.vala
new file mode 100644
index 0000000..8700f21
--- /dev/null
+++ b/src/dialogs/EntryMultiCompletion.vala
@@ -0,0 +1,97 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+// Entry completion for values separated by separators (e.g. comma in the case of tags)
+// Partly inspired by the class of the same name in gtkmm-utils by Marko Anastasov
+public class EntryMultiCompletion : Gtk.EntryCompletion {
+    private string delimiter;
+
+    public EntryMultiCompletion(Gee.Collection<string> completion_list, string? delimiter) {
+        assert(delimiter == null || delimiter.length == 1);
+        this.delimiter = delimiter;
+
+        set_model(create_completion_store(completion_list));
+        set_text_column(0);
+        set_match_func(match_func);
+    }
+
+    private static Gtk.ListStore create_completion_store(Gee.Collection<string> completion_list) {
+        Gtk.ListStore completion_store = new Gtk.ListStore(1, typeof(string));
+        Gtk.TreeIter store_iter;
+        Gee.Iterator<string> completion_iter = completion_list.iterator();
+        while (completion_iter.next()) {
+            completion_store.append(out store_iter);
+            completion_store.set(store_iter, 0, completion_iter.get(), -1);
+        }
+
+        return completion_store;
+    }
+
+    private bool match_func(Gtk.EntryCompletion completion, string key, Gtk.TreeIter iter) {
+        Gtk.TreeModel model = completion.get_model();
+        string possible_match;
+        model.get(iter, 0, out possible_match);
+
+        // Normalize key and possible matches to allow comparison of non-ASCII characters.
+        // Use a "COMPOSE" normalization to allow comparison to the position value returned by
+        // Gtk.Entry, i.e. one character=one position. Using the default normalization a character
+        // like "é" or "ö" would have a length of two.
+        possible_match = possible_match.casefold().normalize(-1, NormalizeMode.ALL_COMPOSE);
+        string normed_key = key.normalize(-1, NormalizeMode.ALL_COMPOSE);
+
+        if (delimiter == null) {
+            return possible_match.has_prefix(normed_key.strip());
+        } else {
+            if (normed_key.contains(delimiter)) {
+                // check whether cursor is before last delimiter
+                int offset = normed_key.char_count(normed_key.last_index_of_char(delimiter[0]));
+                int position = ((Gtk.Entry) get_entry()).get_position();
+                if (position <= offset)
+                    return false; // TODO: Autocompletion for tags not last in list
+            }
+
+            string last_part = get_last_part(normed_key.strip(), delimiter);
+
+            if (last_part.length == 0)
+                return false; // need at least one character to show matches
+
+            return possible_match.has_prefix(last_part.strip());
+        }
+    }
+
+    public override bool match_selected(Gtk.TreeModel model, Gtk.TreeIter iter) {
+        string match;
+        model.get(iter, 0, out match);
+
+        Gtk.Entry entry = (Gtk.Entry)get_entry();
+
+        string old_text = entry.get_text().normalize(-1, NormalizeMode.ALL_COMPOSE);
+        if (old_text.length > 0) {
+            if (old_text.contains(delimiter)) {
+                old_text = old_text.substring(0, old_text.last_index_of_char(delimiter[0]) + 1) + (delimiter != " " ? " " : "");
+            } else
+                old_text = "";
+        }
+
+        string new_text = old_text + match + delimiter + (delimiter != " " ? " " : "");
+        entry.set_text(new_text);
+        entry.set_position((int) new_text.length);
+
+        return true;
+    }
+
+    // Find last string after any delimiter
+    private static string get_last_part(string s, string delimiter) {
+        string[] split = s.split(delimiter);
+
+        if((split != null) && (split[0] != null)) {
+            return split[split.length - 1];
+        } else {
+            return "";
+        }
+    }
+}
diff --git a/src/dialogs/ExportDialog.c b/src/dialogs/ExportDialog.c
new file mode 100644
index 0000000..f74f962
--- /dev/null
+++ b/src/dialogs/ExportDialog.c
@@ -0,0 +1,2107 @@
+/* ExportDialog.c generated by valac 0.36.6, the Vala compiler
+ * generated from ExportDialog.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <gee.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+
+#define TYPE_EXPORT_DIALOG (export_dialog_get_type ())
+#define EXPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPORT_DIALOG, ExportDialog))
+#define EXPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPORT_DIALOG, ExportDialogClass))
+#define IS_EXPORT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPORT_DIALOG))
+#define IS_EXPORT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPORT_DIALOG))
+#define EXPORT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPORT_DIALOG, ExportDialogClass))
+
+typedef struct _ExportDialog ExportDialog;
+typedef struct _ExportDialogClass ExportDialogClass;
+typedef struct _ExportDialogPrivate ExportDialogPrivate;
+
+#define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ())
+
+#define TYPE_EXPORT_FORMAT_PARAMETERS (export_format_parameters_get_type ())
+
+#define TYPE_EXPORT_FORMAT_MODE (export_format_mode_get_type ())
+
+#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
+
+#define JPEG_TYPE_QUALITY (jpeg_quality_get_type ())
+typedef struct _ExportFormatParameters ExportFormatParameters;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define TYPE_PHOTO_FILE_FORMAT_PROPERTIES (photo_file_format_properties_get_type ())
+#define PHOTO_FILE_FORMAT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties))
+#define PHOTO_FILE_FORMAT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatPropertiesClass))
+#define IS_PHOTO_FILE_FORMAT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES))
+#define IS_PHOTO_FILE_FORMAT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PHOTO_FILE_FORMAT_PROPERTIES))
+#define PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatPropertiesClass))
+
+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 _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _ExportDialog {
+	GtkDialog parent_instance;
+	ExportDialogPrivate * priv;
+};
+
+struct _ExportDialogClass {
+	GtkDialogClass parent_class;
+};
+
+struct _ExportDialogPrivate {
+	GtkGrid* table;
+	GtkComboBoxText* quality_combo;
+	GtkComboBoxText* constraint_combo;
+	GtkComboBoxText* format_combo;
+	GtkSwitch* export_metadata;
+	GeeArrayList* format_options;
+	GtkEntry* pixels_entry;
+	GtkWidget* ok_button;
+	gboolean in_insert;
+};
+
+typedef enum  {
+	SCALE_CONSTRAINT_ORIGINAL,
+	SCALE_CONSTRAINT_DIMENSIONS,
+	SCALE_CONSTRAINT_WIDTH,
+	SCALE_CONSTRAINT_HEIGHT,
+	SCALE_CONSTRAINT_FILL_VIEWPORT
+} ScaleConstraint;
+
+typedef enum  {
+	EXPORT_FORMAT_MODE_UNMODIFIED,
+	EXPORT_FORMAT_MODE_CURRENT,
+	EXPORT_FORMAT_MODE_SPECIFIED,
+	EXPORT_FORMAT_MODE_LAST
+} ExportFormatMode;
+
+typedef enum  {
+	PHOTO_FILE_FORMAT_JFIF,
+	PHOTO_FILE_FORMAT_RAW,
+	PHOTO_FILE_FORMAT_PNG,
+	PHOTO_FILE_FORMAT_TIFF,
+	PHOTO_FILE_FORMAT_BMP,
+	PHOTO_FILE_FORMAT_UNKNOWN
+} PhotoFileFormat;
+
+typedef enum  {
+	JPEG_QUALITY_LOW = 50,
+	JPEG_QUALITY_MEDIUM = 75,
+	JPEG_QUALITY_HIGH = 90,
+	JPEG_QUALITY_MAXIMUM = 100
+} JpegQuality;
+
+struct _ExportFormatParameters {
+	ExportFormatMode mode;
+	PhotoFileFormat specified_format;
+	JpegQuality quality;
+	gboolean export_metadata;
+};
+
+
+static gpointer export_dialog_parent_class = NULL;
+static ScaleConstraint export_dialog_current_constraint;
+static ScaleConstraint export_dialog_current_constraint = SCALE_CONSTRAINT_ORIGINAL;
+static ExportFormatParameters export_dialog_current_parameters;
+static ExportFormatParameters export_dialog_current_parameters = {0};
+static gint export_dialog_current_scale;
+static gint export_dialog_current_scale = 0;
+
+GType export_dialog_get_type (void) G_GNUC_CONST;
+#define EXPORT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EXPORT_DIALOG, ExportDialogPrivate))
+enum  {
+	EXPORT_DIALOG_DUMMY_PROPERTY
+};
+GType scale_constraint_get_type (void) G_GNUC_CONST;
+GType export_format_parameters_get_type (void) G_GNUC_CONST;
+GType export_format_mode_get_type (void) G_GNUC_CONST;
+GType photo_file_format_get_type (void) G_GNUC_CONST;
+GType jpeg_quality_get_type (void) G_GNUC_CONST;
+ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self);
+void export_format_parameters_free (ExportFormatParameters* self);
+void export_format_parameters_current (ExportFormatParameters* result);
+#define EXPORT_DIALOG_DEFAULT_SCALE 1200
+#define EXPORT_DIALOG_NUM_SPECIAL_FORMATS 2
+#define EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL _ ("Unmodified")
+#define EXPORT_DIALOG_CURRENT_FORMAT_LABEL _ ("Current")
+ExportDialog* export_dialog_new (const gchar* title);
+ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+gint resources_use_header_bar (void);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self);
+PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self);
+JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self);
+gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self);
+ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self);
+gint configuration_facade_get_export_scale (ConfigurationFacade* self);
+gchar* jpeg_quality_to_string (JpegQuality self);
+gchar* scale_constraint_to_string (ScaleConstraint self);
+static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name);
+PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
+gpointer photo_file_format_properties_ref (gpointer instance);
+void photo_file_format_properties_unref (gpointer instance);
+GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_photo_file_format_properties (GValue* value, gpointer v_object);
+void value_take_photo_file_format_properties (GValue* value, gpointer v_object);
+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_user_visible_name (PhotoFileFormatProperties* self);
+static void export_dialog_on_constraint_changed (ExportDialog* self);
+static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void export_dialog_on_format_changed (ExportDialog* self);
+static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void export_dialog_on_pixels_changed (ExportDialog* self);
+static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position);
+static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
+static void export_dialog_on_activate (ExportDialog* self);
+static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self);
+static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget);
+static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y);
+#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
+#define RESOURCES_OK_LABEL _ ("_OK")
+static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text);
+static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self);
+static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params);
+gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
+gboolean photo_file_format_can_write (PhotoFileFormat self);
+PhotoFileFormat photo_file_format_get_system_default_format (void);
+void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
+void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
+void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
+void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
+static void export_dialog_finalize (GObject * obj);
+
+const ScaleConstraint EXPORT_DIALOG_CONSTRAINT_ARRAY[4] = {SCALE_CONSTRAINT_ORIGINAL, SCALE_CONSTRAINT_DIMENSIONS, SCALE_CONSTRAINT_WIDTH, SCALE_CONSTRAINT_HEIGHT};
+const JpegQuality EXPORT_DIALOG_QUALITY_ARRAY[4] = {JPEG_QUALITY_LOW, JPEG_QUALITY_MEDIUM, JPEG_QUALITY_HIGH, JPEG_QUALITY_MAXIMUM};
+
+static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_constraint_changed ((ExportDialog*) self);
+#line 224 "ExportDialog.c"
+}
+
+
+static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_format_changed ((ExportDialog*) self);
+#line 231 "ExportDialog.c"
+}
+
+
+static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_pixels_changed ((ExportDialog*) self);
+#line 238 "ExportDialog.c"
+}
+
+
+static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
+#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
+#line 245 "ExportDialog.c"
+}
+
+
+static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
+#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_activate ((ExportDialog*) self);
+#line 252 "ExportDialog.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 259 "ExportDialog.c"
+}
+
+
+ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
+	ExportDialog * self = NULL;
+	gint _tmp0_;
+	const gchar* _tmp1_;
+	ConfigFacade* config = NULL;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	ExportFormatMode _tmp4_;
+	ConfigFacade* _tmp5_;
+	PhotoFileFormat _tmp6_;
+	ConfigFacade* _tmp7_;
+	JpegQuality _tmp8_;
+	ConfigFacade* _tmp9_;
+	gboolean _tmp10_;
+	ConfigFacade* _tmp11_;
+	ScaleConstraint _tmp12_;
+	ConfigFacade* _tmp13_;
+	gint _tmp14_;
+	GtkComboBoxText* _tmp15_;
+	gint ctr = 0;
+	GtkComboBoxText* _tmp26_;
+	GtkComboBoxText* _tmp36_;
+	gint _tmp37_;
+	PhotoFileFormat* _tmp38_;
+	GtkEntry* _tmp44_;
+	GtkEntry* _tmp45_;
+	GtkEntry* _tmp46_;
+	gint _tmp47_;
+	gchar* _tmp48_;
+	gchar* _tmp49_;
+	GtkComboBoxText* _tmp50_;
+	GtkComboBoxText* _tmp51_;
+	GtkEntry* _tmp52_;
+	GtkEntry* _tmp53_;
+	GtkEntry* _tmp54_;
+	GtkComboBoxText* _tmp55_;
+	GtkComboBoxText* _tmp56_;
+	GtkComboBoxText* _tmp57_;
+	GtkComboBoxText* _tmp58_;
+	GtkComboBoxText* _tmp59_;
+	GtkComboBoxText* _tmp60_;
+	GtkEntry* _tmp61_;
+	GtkEntry* _tmp62_;
+	GtkSwitch* _tmp63_;
+	GtkSwitch* _tmp64_;
+	GtkSwitch* _tmp65_;
+	GtkSwitch* _tmp66_;
+	GtkSwitch* _tmp67_;
+	GtkGrid* _tmp68_;
+	GtkGrid* _tmp69_;
+	GtkGrid* _tmp70_;
+	GtkBox* _tmp71_;
+	GtkGrid* _tmp72_;
+	GtkWidget* _tmp73_;
+	GtkWidget* _tmp74_;
+	GtkWidget* _tmp75_;
+	GtkWidget* _tmp76_;
+	GtkWidget* _tmp77_;
+	ScaleConstraint _tmp78_;
+	GtkWidget* _tmp81_;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (title != NULL, NULL);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 39 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = title;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_);
+#line 42 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = config_facade_get_instance ();
+#line 45 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	config = _tmp2_;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = config;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 46 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_parameters.mode = _tmp4_;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = config;
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_parameters.specified_format = _tmp6_;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp7_ = config;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp8_ = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_parameters.quality = _tmp8_;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp9_ = config;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp10_ = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 49 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_parameters.export_metadata = _tmp10_;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp11_ = config;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp12_ = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 50 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_constraint = _tmp12_;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp13_ = config;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp14_ = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 51 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_scale = _tmp14_;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp15_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp15_);
+#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->quality_combo);
+#line 53 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->quality_combo = _tmp15_;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	ctr = 0;
+#line 385 "ExportDialog.c"
+	{
+		JpegQuality* quality_collection = NULL;
+		gint quality_collection_length1 = 0;
+		gint _quality_collection_size_ = 0;
+		gint quality_it = 0;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		quality_collection = EXPORT_DIALOG_QUALITY_ARRAY;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
+#line 397 "ExportDialog.c"
+			JpegQuality quality = 0;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			quality = quality_collection[quality_it];
+#line 401 "ExportDialog.c"
+			{
+				GtkComboBoxText* _tmp16_;
+				JpegQuality _tmp17_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				JpegQuality _tmp20_;
+				ExportFormatParameters _tmp21_;
+				JpegQuality _tmp22_;
+				gint _tmp25_;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp16_ = self->priv->quality_combo;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp17_ = quality;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp18_ = jpeg_quality_to_string (_tmp17_);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp19_ = _tmp18_;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				gtk_combo_box_text_append_text (_tmp16_, _tmp19_);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_g_free0 (_tmp19_);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp20_ = quality;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp21_ = export_dialog_current_parameters;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp22_ = _tmp21_.quality;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (_tmp20_ == _tmp22_) {
+#line 431 "ExportDialog.c"
+					GtkComboBoxText* _tmp23_;
+					gint _tmp24_;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp23_ = self->priv->quality_combo;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp24_ = ctr;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), _tmp24_);
+#line 440 "ExportDialog.c"
+				}
+#line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp25_ = ctr;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				ctr = _tmp25_ + 1;
+#line 446 "ExportDialog.c"
+			}
+		}
+	}
+#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp26_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp26_);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->constraint_combo);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->constraint_combo = _tmp26_;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	ctr = 0;
+#line 460 "ExportDialog.c"
+	{
+		ScaleConstraint* constraint_collection = NULL;
+		gint constraint_collection_length1 = 0;
+		gint _constraint_collection_size_ = 0;
+		gint constraint_it = 0;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		constraint_collection = EXPORT_DIALOG_CONSTRAINT_ARRAY;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
+#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
+#line 472 "ExportDialog.c"
+			ScaleConstraint constraint = 0;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			constraint = constraint_collection[constraint_it];
+#line 476 "ExportDialog.c"
+			{
+				GtkComboBoxText* _tmp27_;
+				ScaleConstraint _tmp28_;
+				gchar* _tmp29_;
+				gchar* _tmp30_;
+				ScaleConstraint _tmp31_;
+				ScaleConstraint _tmp32_;
+				gint _tmp35_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp27_ = self->priv->constraint_combo;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp28_ = constraint;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp29_ = scale_constraint_to_string (_tmp28_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp30_ = _tmp29_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				gtk_combo_box_text_append_text (_tmp27_, _tmp30_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_g_free0 (_tmp30_);
+#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp31_ = constraint;
+#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp32_ = export_dialog_current_constraint;
+#line 66 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (_tmp31_ == _tmp32_) {
+#line 503 "ExportDialog.c"
+					GtkComboBoxText* _tmp33_;
+					gint _tmp34_;
+#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp33_ = self->priv->constraint_combo;
+#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp34_ = ctr;
+#line 67 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_combo_box_get_type (), GtkComboBox), _tmp34_);
+#line 512 "ExportDialog.c"
+				}
+#line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp35_ = ctr;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				ctr = _tmp35_ + 1;
+#line 518 "ExportDialog.c"
+			}
+		}
+	}
+#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp36_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp36_);
+#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->format_combo);
+#line 71 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->format_combo = _tmp36_;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_format_add_option (self, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp38_ = photo_file_format_get_writeable (&_tmp37_);
+#line 536 "ExportDialog.c"
+	{
+		PhotoFileFormat* format_collection = NULL;
+		gint format_collection_length1 = 0;
+		gint _format_collection_size_ = 0;
+		gint format_it = 0;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		format_collection = _tmp38_;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		format_collection_length1 = _tmp37_;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		for (format_it = 0; format_it < _tmp37_; format_it = format_it + 1) {
+#line 548 "ExportDialog.c"
+			PhotoFileFormat format = 0;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			format = format_collection[format_it];
+#line 552 "ExportDialog.c"
+			{
+				PhotoFileFormat _tmp39_;
+				PhotoFileFormatProperties* _tmp40_;
+				PhotoFileFormatProperties* _tmp41_;
+				gchar* _tmp42_;
+				gchar* _tmp43_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp39_ = format;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp40_ = photo_file_format_get_properties (_tmp39_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp41_ = _tmp40_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp42_ = photo_file_format_properties_get_user_visible_name (_tmp41_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp43_ = _tmp42_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				export_dialog_format_add_option (self, _tmp43_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_g_free0 (_tmp43_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_photo_file_format_properties_unref0 (_tmp41_);
+#line 575 "ExportDialog.c"
+			}
+		}
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		format_collection = (g_free (format_collection), NULL);
+#line 580 "ExportDialog.c"
+	}
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp44_ = (GtkEntry*) gtk_entry_new ();
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp44_);
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->pixels_entry);
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->pixels_entry = _tmp44_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp45_ = self->priv->pixels_entry;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_entry_set_max_length (_tmp45_, 6);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp46_ = self->priv->pixels_entry;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp47_ = export_dialog_current_scale;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp48_ = g_strdup_printf ("%d", _tmp47_);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp49_ = _tmp48_;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_entry_set_text (_tmp46_, _tmp49_);
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (_tmp49_);
+#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp50_ = self->priv->constraint_combo;
+#line 83 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
+#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp51_ = self->priv->format_combo;
+#line 84 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
+#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp52_ = self->priv->pixels_entry;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp53_ = self->priv->pixels_entry;
+#line 86 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
+#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp54_ = self->priv->pixels_entry;
+#line 87 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_connect_object (_tmp54_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
+#line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp55_ = self->priv->format_combo;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_label (self, _ ("_Format:"), 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget));
+#line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp56_ = self->priv->format_combo;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), 1, 0);
+#line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp57_ = self->priv->quality_combo;
+#line 93 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_label (self, _ ("_Quality:"), 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+#line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp58_ = self->priv->quality_combo;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 1);
+#line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp59_ = self->priv->constraint_combo;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_label (self, _ ("_Scaling constraint:"), 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp60_ = self->priv->constraint_combo;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), 1, 2);
+#line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp61_ = self->priv->pixels_entry;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_label (self, _ ("_Pixels:"), 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
+#line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp62_ = self->priv->pixels_entry;
+#line 100 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 3);
+#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp63_ = (GtkSwitch*) gtk_switch_new ();
+#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp63_);
+#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->export_metadata);
+#line 102 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->export_metadata = _tmp63_;
+#line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp64_ = self->priv->export_metadata;
+#line 103 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_label (self, _ ("Export _metadata:"), 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+#line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp65_ = self->priv->export_metadata;
+#line 104 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), 1, 4);
+#line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp66_ = self->priv->export_metadata;
+#line 105 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_switch_set_active (_tmp66_, TRUE);
+#line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp67_ = self->priv->export_metadata;
+#line 106 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp68_ = self->priv->table;
+#line 108 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_grid_set_row_spacing (_tmp68_, (guint) 6);
+#line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp69_ = self->priv->table;
+#line 109 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_grid_set_column_spacing (_tmp69_, (guint) 12);
+#line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp70_ = self->priv->table;
+#line 110 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_container_get_type (), GtkContainer), (guint) 18);
+#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp71_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp72_ = self->priv->table;
+#line 112 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+#line 115 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp73_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp74_ = _g_object_ref0 (_tmp73_);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->ok_button);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->ok_button = _tmp74_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp75_ = self->priv->ok_button;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_can_default (_tmp75_, TRUE);
+#line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp76_ = self->priv->ok_button;
+#line 120 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_set (_tmp76_, "has-default", TRUE, NULL);
+#line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp77_ = self->priv->ok_button;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp77_);
+#line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp78_ = export_dialog_current_constraint;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp78_ == SCALE_CONSTRAINT_ORIGINAL) {
+#line 728 "ExportDialog.c"
+		GtkEntry* _tmp79_;
+		GtkComboBoxText* _tmp80_;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp79_ = self->priv->pixels_entry;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp80_ = self->priv->quality_combo;
+#line 125 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 739 "ExportDialog.c"
+	}
+#line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp81_ = self->priv->ok_button;
+#line 128 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_grab_focus (_tmp81_);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (config);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	return self;
+#line 749 "ExportDialog.c"
+}
+
+
+ExportDialog* export_dialog_new (const gchar* title) {
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
+#line 756 "ExportDialog.c"
+}
+
+
+static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name) {
+	GeeArrayList* _tmp0_;
+	const gchar* _tmp1_;
+	GtkComboBoxText* _tmp2_;
+	const gchar* _tmp3_;
+#line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 131 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (format_name != NULL);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = self->priv->format_options;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = format_name;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
+#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = self->priv->format_combo;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = format_name;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
+#line 781 "ExportDialog.c"
+}
+
+
+static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) {
+	gint selection_ticker = 0;
+	const gchar* _tmp16_;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 136 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (text != NULL);
+#line 137 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	selection_ticker = 0;
+#line 794 "ExportDialog.c"
+	{
+		GeeArrayList* _current_text_list = NULL;
+		GeeArrayList* _tmp0_;
+		GeeArrayList* _tmp1_;
+		gint _current_text_size = 0;
+		GeeArrayList* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+		gint _current_text_index = 0;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp0_ = self->priv->format_options;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_current_text_list = _tmp1_;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp2_ = _current_text_list;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp4_ = _tmp3_;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_current_text_size = _tmp4_;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_current_text_index = -1;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		while (TRUE) {
+#line 822 "ExportDialog.c"
+			gint _tmp5_;
+			gint _tmp6_;
+			gint _tmp7_;
+			gchar* current_text = NULL;
+			GeeArrayList* _tmp8_;
+			gint _tmp9_;
+			gpointer _tmp10_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			gint _tmp15_;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp5_ = _current_text_index;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_current_text_index = _tmp5_ + 1;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp6_ = _current_text_index;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp7_ = _current_text_size;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			if (!(_tmp6_ < _tmp7_)) {
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				break;
+#line 845 "ExportDialog.c"
+			}
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp8_ = _current_text_list;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp9_ = _current_text_index;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_);
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			current_text = (gchar*) _tmp10_;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp11_ = current_text;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp12_ = text;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
+#line 861 "ExportDialog.c"
+				GtkComboBoxText* _tmp13_;
+				gint _tmp14_;
+#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp13_ = self->priv->format_combo;
+#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp14_ = selection_ticker;
+#line 141 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), _tmp14_);
+#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_g_free0 (current_text);
+#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_g_object_unref0 (_current_text_list);
+#line 142 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				return;
+#line 876 "ExportDialog.c"
+			}
+#line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp15_ = selection_ticker;
+#line 144 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			selection_ticker = _tmp15_ + 1;
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_g_free0 (current_text);
+#line 884 "ExportDialog.c"
+		}
+#line 139 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_g_object_unref0 (_current_text_list);
+#line 888 "ExportDialog.c"
+	}
+#line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp16_ = text;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_error ("ExportDialog.vala:147: format_set_active_text: text '%s' isn't in comb" \
+"o box", _tmp16_);
+#line 894 "ExportDialog.c"
+}
+
+
+static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
+	PhotoFileFormat result = 0;
+	gint index = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	PhotoFileFormat* writeable_formats = NULL;
+	gint _tmp4_;
+	PhotoFileFormat* _tmp5_;
+	gint writeable_formats_length1;
+	gint _writeable_formats_size_;
+	gint _tmp6_;
+	PhotoFileFormat _tmp7_;
+#line 150 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0);
+#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = self->priv->format_combo;
+#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 151 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	index = _tmp1_;
+#line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = index;
+#line 152 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
+#line 153 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
+#line 926 "ExportDialog.c"
+	}
+#line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = index;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	index = _tmp3_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
+#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = photo_file_format_get_writeable (&_tmp4_);
+#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	writeable_formats = _tmp5_;
+#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	writeable_formats_length1 = _tmp4_;
+#line 156 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_writeable_formats_size_ = writeable_formats_length1;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = index;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp7_ = writeable_formats[_tmp6_];
+#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	result = _tmp7_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	writeable_formats = (g_free (writeable_formats), NULL);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	return result;
+#line 950 "ExportDialog.c"
+}
+
+
+static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, ExportFormatParameters* params) {
+	gchar* result = NULL;
+	ExportFormatParameters _tmp0_;
+	ExportFormatMode _tmp1_;
+#line 160 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (IS_EXPORT_DIALOG (self), NULL);
+#line 160 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (params != NULL, NULL);
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = *params;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = _tmp0_.mode;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	switch (_tmp1_) {
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		case EXPORT_FORMAT_MODE_UNMODIFIED:
+#line 970 "ExportDialog.c"
+		{
+			gchar* _tmp2_;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp2_ = g_strdup (EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			result = _tmp2_;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			return result;
+#line 979 "ExportDialog.c"
+		}
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		case EXPORT_FORMAT_MODE_CURRENT:
+#line 983 "ExportDialog.c"
+		{
+			gchar* _tmp3_;
+#line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp3_ = g_strdup (EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
+#line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			result = _tmp3_;
+#line 166 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			return result;
+#line 992 "ExportDialog.c"
+		}
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		case EXPORT_FORMAT_MODE_SPECIFIED:
+#line 996 "ExportDialog.c"
+		{
+			ExportFormatParameters _tmp4_;
+			PhotoFileFormat _tmp5_;
+			PhotoFileFormatProperties* _tmp6_;
+			PhotoFileFormatProperties* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp4_ = *params;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp5_ = _tmp4_.specified_format;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp6_ = photo_file_format_get_properties (_tmp5_);
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp7_ = _tmp6_;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp9_ = _tmp8_;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_photo_file_format_properties_unref0 (_tmp7_);
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			result = _tmp9_;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			return result;
+#line 1022 "ExportDialog.c"
+		}
+		default:
+		{
+#line 172 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			g_error ("ExportDialog.vala:172: get_label_for_parameters: unrecognized export f" \
+"ormat mode");
+#line 1028 "ExportDialog.c"
+		}
+	}
+}
+
+
+gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters) {
+	gint _vala_scale = 0;
+	ScaleConstraint _vala_constraint = 0;
+	gboolean result = FALSE;
+	ExportFormatParameters _tmp0_;
+	ExportFormatMode _tmp1_;
+	ExportFormatParameters _tmp4_;
+	ExportFormatMode _tmp5_;
+	ExportFormatParameters _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gboolean ok = FALSE;
+	gint _tmp17_;
+	gboolean _tmp18_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE);
+#line 179 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_val_if_fail (parameters != NULL, FALSE);
+#line 181 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 185 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = *parameters;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = _tmp0_.mode;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
+#line 1060 "ExportDialog.c"
+		ScaleConstraint _tmp2_;
+		GtkComboBoxText* _tmp3_;
+#line 186 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
+#line 186 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp2_ = _vala_constraint;
+#line 186 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		export_dialog_current_constraint = _tmp2_;
+#line 187 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp3_ = self->priv->constraint_combo;
+#line 187 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1073 "ExportDialog.c"
+	}
+#line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = *parameters;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = _tmp4_.mode;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
+#line 1081 "ExportDialog.c"
+		ExportFormatParameters _tmp6_;
+#line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp6_ = export_dialog_current_parameters;
+#line 191 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		*parameters = _tmp6_;
+#line 1087 "ExportDialog.c"
+	} else {
+		gboolean _tmp7_ = FALSE;
+		ExportFormatParameters _tmp8_;
+		ExportFormatMode _tmp9_;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp8_ = *parameters;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp9_ = _tmp8_.mode;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
+#line 1098 "ExportDialog.c"
+			ExportFormatParameters _tmp10_;
+			PhotoFileFormat _tmp11_;
+			gboolean _tmp12_;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp10_ = *parameters;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp11_ = _tmp10_.specified_format;
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp12_ = photo_file_format_can_write (_tmp11_);
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp7_ = !_tmp12_;
+#line 1110 "ExportDialog.c"
+		} else {
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp7_ = FALSE;
+#line 1114 "ExportDialog.c"
+		}
+#line 192 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp7_) {
+#line 1118 "ExportDialog.c"
+			PhotoFileFormat _tmp13_;
+#line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp13_ = photo_file_format_get_system_default_format ();
+#line 193 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			(*parameters).specified_format = _tmp13_;
+#line 1124 "ExportDialog.c"
+		}
+	}
+#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp14_ = *parameters;
+#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp15_ = export_dialog_get_label_for_parameters (self, &_tmp14_);
+#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp16_ = _tmp15_;
+#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_format_set_active_text (self, _tmp16_);
+#line 195 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (_tmp16_);
+#line 196 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_on_format_changed (self);
+#line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 198 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	ok = _tmp17_ == ((gint) GTK_RESPONSE_OK);
+#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp18_ = ok;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp18_) {
+#line 1147 "ExportDialog.c"
+		gint index = 0;
+		GtkComboBoxText* _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+		ScaleConstraint _tmp23_;
+		ScaleConstraint _tmp24_;
+		GtkEntry* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		ScaleConstraint _tmp28_;
+		gint _tmp30_;
+		gboolean _tmp31_ = FALSE;
+		GtkSwitch* _tmp32_;
+		gboolean _tmp33_;
+		gboolean _tmp34_;
+		GtkComboBoxText* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gboolean _tmp41_;
+		ConfigFacade* config = NULL;
+		ConfigFacade* _tmp57_;
+		ConfigFacade* _tmp58_;
+		ExportFormatParameters _tmp59_;
+		ExportFormatMode _tmp60_;
+		ConfigFacade* _tmp61_;
+		ExportFormatParameters _tmp62_;
+		PhotoFileFormat _tmp63_;
+		ConfigFacade* _tmp64_;
+		ExportFormatParameters _tmp65_;
+		JpegQuality _tmp66_;
+		ConfigFacade* _tmp67_;
+		ExportFormatParameters _tmp68_;
+		gboolean _tmp69_;
+		ConfigFacade* _tmp70_;
+		ScaleConstraint _tmp71_;
+		ConfigFacade* _tmp72_;
+		gint _tmp73_;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp19_ = self->priv->constraint_combo;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp20_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox));
+#line 200 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		index = _tmp20_;
+#line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp21_ = index;
+#line 201 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_assert (_tmp21_ >= 0, "index >= 0");
+#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp22_ = index;
+#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp23_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp22_];
+#line 202 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_constraint = _tmp23_;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp24_ = _vala_constraint;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		export_dialog_current_constraint = _tmp24_;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp25_ = self->priv->pixels_entry;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp26_ = gtk_entry_get_text (_tmp25_);
+#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp27_ = atoi (_tmp26_);
+#line 205 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_scale = _tmp27_;
+#line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp28_ = _vala_constraint;
+#line 206 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
+#line 1218 "ExportDialog.c"
+			gint _tmp29_;
+#line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp29_ = _vala_scale;
+#line 207 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_vala_assert (_tmp29_ > 0, "scale > 0");
+#line 1224 "ExportDialog.c"
+		}
+#line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp30_ = _vala_scale;
+#line 208 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		export_dialog_current_scale = _tmp30_;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp32_ = self->priv->export_metadata;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp33_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp34_ = _tmp33_;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp34_) {
+#line 1238 "ExportDialog.c"
+			GtkSwitch* _tmp35_;
+			gboolean _tmp36_;
+			gboolean _tmp37_;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp35_ = self->priv->export_metadata;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp36_ = gtk_switch_get_active (_tmp35_);
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp37_ = _tmp36_;
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp31_ = _tmp37_;
+#line 1250 "ExportDialog.c"
+		} else {
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp31_ = FALSE;
+#line 1254 "ExportDialog.c"
+		}
+#line 210 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		(*parameters).export_metadata = _tmp31_;
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp38_ = self->priv->format_combo;
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_);
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp40_ = _tmp39_;
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_g_free0 (_tmp40_);
+#line 212 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp41_) {
+#line 1270 "ExportDialog.c"
+			ExportFormatMode _tmp42_;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp42_ = export_dialog_current_parameters.mode;
+#line 213 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			(*parameters).mode = _tmp42_;
+#line 1278 "ExportDialog.c"
+		} else {
+			GtkComboBoxText* _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
+			gboolean _tmp46_;
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp43_ = self->priv->format_combo;
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp44_ = gtk_combo_box_text_get_active_text (_tmp43_);
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp45_ = _tmp44_;
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp46_ = g_strcmp0 (_tmp45_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_g_free0 (_tmp45_);
+#line 214 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			if (_tmp46_) {
+#line 1296 "ExportDialog.c"
+				ExportFormatMode _tmp47_;
+#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
+#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp47_ = export_dialog_current_parameters.mode;
+#line 215 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				(*parameters).mode = _tmp47_;
+#line 1304 "ExportDialog.c"
+			} else {
+				ExportFormatMode _tmp48_;
+				PhotoFileFormat _tmp49_;
+				PhotoFileFormat _tmp50_;
+				ExportFormatParameters _tmp51_;
+				PhotoFileFormat _tmp52_;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp48_ = export_dialog_current_parameters.mode;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				(*parameters).mode = _tmp48_;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp49_ = export_dialog_get_specified_format (self);
+#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				export_dialog_current_parameters.specified_format = _tmp49_;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp50_ = export_dialog_current_parameters.specified_format;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				(*parameters).specified_format = _tmp50_;
+#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp51_ = export_dialog_current_parameters;
+#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp52_ = _tmp51_.specified_format;
+#line 219 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
+#line 1331 "ExportDialog.c"
+					GtkComboBoxText* _tmp53_;
+					gint _tmp54_;
+					JpegQuality _tmp55_;
+					JpegQuality _tmp56_;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp53_ = self->priv->quality_combo;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp54_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox));
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp55_ = EXPORT_DIALOG_QUALITY_ARRAY[_tmp54_];
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					export_dialog_current_parameters.quality = _tmp55_;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp56_ = export_dialog_current_parameters.quality;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					(*parameters).quality = _tmp56_;
+#line 1348 "ExportDialog.c"
+				}
+			}
+		}
+#line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp57_ = config_facade_get_instance ();
+#line 224 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		config = _tmp57_;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp58_ = config;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp59_ = export_dialog_current_parameters;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp60_ = _tmp59_.mode;
+#line 225 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp60_);
+#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp61_ = config;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp62_ = export_dialog_current_parameters;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp63_ = _tmp62_.specified_format;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp63_);
+#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp64_ = config;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp65_ = export_dialog_current_parameters;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp66_ = _tmp65_.quality;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_);
+#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp67_ = config;
+#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp68_ = export_dialog_current_parameters;
+#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp69_ = _tmp68_.export_metadata;
+#line 228 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp69_);
+#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp70_ = config;
+#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp71_ = export_dialog_current_constraint;
+#line 229 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp71_);
+#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp72_ = config;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp73_ = export_dialog_current_scale;
+#line 230 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
+#line 199 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_g_object_unref0 (config);
+#line 1402 "ExportDialog.c"
+	} else {
+#line 232 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_scale = 0;
+#line 233 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
+#line 1408 "ExportDialog.c"
+	}
+#line 236 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	result = ok;
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (scale) {
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		*scale = _vala_scale;
+#line 1418 "ExportDialog.c"
+	}
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (constraint) {
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		*constraint = _vala_constraint;
+#line 1424 "ExportDialog.c"
+	}
+#line 238 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	return result;
+#line 1428 "ExportDialog.c"
+}
+
+
+static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) {
+	GtkLabel* new_label = NULL;
+	const gchar* _tmp0_;
+	GtkLabel* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkLabel* _tmp3_;
+	GtkLabel* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkGrid* _tmp8_;
+	GtkLabel* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (text != NULL);
+#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail ((widget == NULL) || GTK_IS_WIDGET (widget));
+#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = text;
+#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
+#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp1_);
+#line 242 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	new_label = _tmp1_;
+#line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = new_label;
+#line 243 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+#line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = new_label;
+#line 244 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = new_label;
+#line 245 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_label_set_use_underline (_tmp4_, TRUE);
+#line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = widget;
+#line 247 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp5_ != NULL) {
+#line 1474 "ExportDialog.c"
+		GtkLabel* _tmp6_;
+		GtkWidget* _tmp7_;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp6_ = new_label;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp7_ = widget;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
+#line 1483 "ExportDialog.c"
+	}
+#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp8_ = self->priv->table;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp9_ = new_label;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp10_ = x;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp11_ = y;
+#line 250 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
+#line 241 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (new_label);
+#line 1497 "ExportDialog.c"
+}
+
+
+static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) {
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
+	GtkWidget* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkGrid* _tmp4_;
+	GtkWidget* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+#line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 253 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (GTK_IS_WIDGET (widget));
+#line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = widget;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_halign (_tmp0_, GTK_ALIGN_FILL);
+#line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = widget;
+#line 255 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_valign (_tmp1_, GTK_ALIGN_CENTER);
+#line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = widget;
+#line 256 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_hexpand (_tmp2_, TRUE);
+#line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = widget;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_vexpand (_tmp3_, TRUE);
+#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = self->priv->table;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = widget;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = x;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp7_ = y;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
+#line 1540 "ExportDialog.c"
+}
+
+
+static void export_dialog_on_constraint_changed (ExportDialog* self) {
+	gboolean original = FALSE;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	ScaleConstraint _tmp2_;
+	gboolean jpeg = FALSE;
+	GtkComboBoxText* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PhotoFileFormatProperties* _tmp6_;
+	PhotoFileFormatProperties* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gboolean _tmp10_;
+	GtkEntry* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp14_;
+	GtkComboBoxText* _tmp16_;
+	gboolean _tmp17_;
+#line 262 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = self->priv->constraint_combo;
+#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
+#line 263 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = self->priv->format_combo;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = _tmp4_;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp7_ = _tmp6_;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp9_ = _tmp8_;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp10_ = g_strcmp0 (_tmp5_, _tmp9_) == 0;
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (_tmp9_);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_photo_file_format_properties_unref0 (_tmp7_);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (_tmp5_);
+#line 264 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	jpeg = _tmp10_;
+#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp11_ = self->priv->pixels_entry;
+#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp12_ = original;
+#line 266 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), !_tmp12_);
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp14_ = original;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (!_tmp14_) {
+#line 1608 "ExportDialog.c"
+		gboolean _tmp15_;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp15_ = jpeg;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp13_ = _tmp15_;
+#line 1614 "ExportDialog.c"
+	} else {
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp13_ = FALSE;
+#line 1618 "ExportDialog.c"
+	}
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp16_ = self->priv->quality_combo;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp13_);
+#line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp17_ = original;
+#line 268 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp17_) {
+#line 1628 "ExportDialog.c"
+		GtkWidget* _tmp18_;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp18_ = self->priv->ok_button;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (_tmp18_, TRUE);
+#line 1634 "ExportDialog.c"
+	} else {
+#line 271 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		export_dialog_on_pixels_changed (self);
+#line 1638 "ExportDialog.c"
+	}
+}
+
+
+static void export_dialog_on_format_changed (ExportDialog* self) {
+	gboolean original = FALSE;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+	ScaleConstraint _tmp2_;
+	GtkComboBoxText* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gboolean _tmp6_;
+#line 274 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = self->priv->constraint_combo;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
+#line 275 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp3_ = self->priv->format_combo;
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = _tmp4_;
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = g_strcmp0 (_tmp5_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (_tmp5_);
+#line 277 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp6_) {
+#line 1674 "ExportDialog.c"
+		GtkComboBoxText* _tmp7_;
+		GtkComboBoxText* _tmp8_;
+		GtkComboBoxText* _tmp9_;
+		GtkEntry* _tmp10_;
+		GtkSwitch* _tmp11_;
+		GtkSwitch* _tmp12_;
+#line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp7_ = self->priv->constraint_combo;
+#line 282 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp8_ = self->priv->constraint_combo;
+#line 283 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp9_ = self->priv->quality_combo;
+#line 284 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp10_ = self->priv->pixels_entry;
+#line 285 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp11_ = self->priv->export_metadata;
+#line 286 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_switch_set_active (_tmp11_, FALSE);
+#line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp12_ = self->priv->export_metadata;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1705 "ExportDialog.c"
+	} else {
+		GtkComboBoxText* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gboolean _tmp16_;
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp13_ = self->priv->format_combo;
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp14_ = gtk_combo_box_text_get_active_text (_tmp13_);
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp15_ = _tmp14_;
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp16_ = g_strcmp0 (_tmp15_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_g_free0 (_tmp15_);
+#line 288 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		if (_tmp16_) {
+#line 1723 "ExportDialog.c"
+			GtkComboBoxText* _tmp17_;
+			GtkComboBoxText* _tmp18_;
+			GtkEntry* _tmp19_;
+			gboolean _tmp20_;
+			GtkSwitch* _tmp21_;
+#line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp17_ = self->priv->constraint_combo;
+#line 295 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp18_ = self->priv->quality_combo;
+#line 296 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp19_ = self->priv->pixels_entry;
+#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp20_ = original;
+#line 297 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), !_tmp20_);
+#line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp21_ = self->priv->export_metadata;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1747 "ExportDialog.c"
+		} else {
+			GtkComboBoxText* _tmp22_;
+			gboolean jpeg = FALSE;
+			PhotoFileFormat _tmp23_;
+			gboolean _tmp24_ = FALSE;
+			gboolean _tmp25_;
+			GtkComboBoxText* _tmp27_;
+			GtkSwitch* _tmp28_;
+#line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp22_ = self->priv->constraint_combo;
+#line 303 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp23_ = export_dialog_get_specified_format (self);
+#line 304 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			jpeg = _tmp23_ == PHOTO_FILE_FORMAT_JFIF;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp25_ = original;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			if (!_tmp25_) {
+#line 1768 "ExportDialog.c"
+				gboolean _tmp26_;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp26_ = jpeg;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp24_ = _tmp26_;
+#line 1774 "ExportDialog.c"
+			} else {
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp24_ = FALSE;
+#line 1778 "ExportDialog.c"
+			}
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp27_ = self->priv->quality_combo;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp24_);
+#line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp28_ = self->priv->export_metadata;
+#line 306 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1788 "ExportDialog.c"
+		}
+	}
+}
+
+
+static void export_dialog_on_activate (ExportDialog* self) {
+#line 310 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 311 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+#line 1799 "ExportDialog.c"
+}
+
+
+static void export_dialog_on_pixels_changed (ExportDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkEntry* _tmp1_;
+	guint16 _tmp2_;
+	GtkWidget* _tmp6_;
+#line 314 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = self->priv->pixels_entry;
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (((gint) _tmp2_) > 0) {
+#line 1816 "ExportDialog.c"
+		GtkEntry* _tmp3_;
+		const gchar* _tmp4_;
+		gint _tmp5_;
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp3_ = self->priv->pixels_entry;
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp4_ = gtk_entry_get_text (_tmp3_);
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp5_ = atoi (_tmp4_);
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp0_ = _tmp5_ > 0;
+#line 1828 "ExportDialog.c"
+	} else {
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp0_ = FALSE;
+#line 1832 "ExportDialog.c"
+	}
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp6_ = self->priv->ok_button;
+#line 315 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
+#line 1838 "ExportDialog.c"
+}
+
+
+static gchar string_get (const gchar* self, glong index) {
+	gchar result = '\0';
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, '\0');
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = index;
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = ((gchar*) self)[_tmp0_];
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp1_;
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 1856 "ExportDialog.c"
+}
+
+
+static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar* text, gint length, gint* position) {
+	gboolean _tmp0_;
+	gint _tmp1_;
+	gchar* new_text = NULL;
+	gchar* _tmp5_;
+	const gchar* _tmp21_;
+	gint _tmp22_;
+	gint _tmp23_;
+	GtkEntry* _tmp29_;
+#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (IS_EXPORT_DIALOG (self));
+#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_return_if_fail (text != NULL);
+#line 320 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = self->priv->in_insert;
+#line 320 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp0_) {
+#line 321 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		return;
+#line 1879 "ExportDialog.c"
+	}
+#line 323 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->in_insert = TRUE;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = length;
+#line 325 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp1_ == -1) {
+#line 1887 "ExportDialog.c"
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp2_ = text;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp3_ = strlen (_tmp2_);
+#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp4_ = _tmp3_;
+#line 326 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		length = (gint) _tmp4_;
+#line 1899 "ExportDialog.c"
+	}
+#line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp5_ = g_strdup ("");
+#line 329 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	new_text = _tmp5_;
+#line 1905 "ExportDialog.c"
+	{
+		gint ctr = 0;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		ctr = 0;
+#line 1910 "ExportDialog.c"
+		{
+			gboolean _tmp6_ = FALSE;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			_tmp6_ = TRUE;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+			while (TRUE) {
+#line 1917 "ExportDialog.c"
+				gint _tmp8_;
+				gint _tmp9_;
+				const gchar* _tmp10_;
+				gint _tmp11_;
+				gchar _tmp12_;
+				gboolean _tmp13_;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (!_tmp6_) {
+#line 1926 "ExportDialog.c"
+					gint _tmp7_;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp7_ = ctr;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					ctr = _tmp7_ + 1;
+#line 1932 "ExportDialog.c"
+				}
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp6_ = FALSE;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp8_ = ctr;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp9_ = length;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (!(_tmp8_ < _tmp9_)) {
+#line 330 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					break;
+#line 1944 "ExportDialog.c"
+				}
+#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp10_ = text;
+#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp11_ = ctr;
+#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
+#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				_tmp13_ = g_ascii_isdigit (_tmp12_);
+#line 331 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+				if (_tmp13_) {
+#line 1956 "ExportDialog.c"
+					const gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gint _tmp16_;
+					gchar _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
+					gchar* _tmp20_;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp14_ = new_text;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp15_ = text;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp16_ = ctr;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp19_ = _tmp18_;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_g_free0 (new_text);
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					new_text = _tmp20_;
+#line 332 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+					_g_free0 (_tmp19_);
+#line 1984 "ExportDialog.c"
+				}
+			}
+		}
+	}
+#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp21_ = new_text;
+#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp22_ = strlen (_tmp21_);
+#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp23_ = _tmp22_;
+#line 336 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	if (_tmp23_ > 0) {
+#line 1997 "ExportDialog.c"
+		GtkEntry* _tmp24_;
+		const gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gint _tmp27_;
+		gint _tmp28_;
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp24_ = self->priv->pixels_entry;
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp25_ = new_text;
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp26_ = new_text;
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp27_ = strlen (_tmp26_);
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		_tmp28_ = _tmp27_;
+#line 337 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
+#line 2015 "ExportDialog.c"
+	}
+#line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp29_ = self->priv->pixels_entry;
+#line 339 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
+#line 341 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->in_insert = FALSE;
+#line 318 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_free0 (new_text);
+#line 2025 "ExportDialog.c"
+}
+
+
+static void export_dialog_class_init (ExportDialogClass * klass) {
+	ExportFormatParameters _tmp0_ = {0};
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_type_class_add_private (klass, sizeof (ExportDialogPrivate));
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = export_dialog_finalize;
+#line 25 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_format_parameters_current (&_tmp0_);
+#line 25 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_parameters = _tmp0_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
+#line 2043 "ExportDialog.c"
+}
+
+
+static void export_dialog_instance_init (ExportDialog * self) {
+	GtkGrid* _tmp0_;
+	GeeArrayList* _tmp1_;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv = EXPORT_DIALOG_GET_PRIVATE (self);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp0_ = (GtkGrid*) gtk_grid_new ();
+#line 28 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	g_object_ref_sink (_tmp0_);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->table = _tmp0_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->format_options = _tmp1_;
+#line 36 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self->priv->in_insert = FALSE;
+#line 2064 "ExportDialog.c"
+}
+
+
+static void export_dialog_finalize (GObject * obj) {
+	ExportDialog * self;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->table);
+#line 29 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->quality_combo);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->constraint_combo);
+#line 31 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->format_combo);
+#line 32 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->export_metadata);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->format_options);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->pixels_entry);
+#line 35 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	_g_object_unref0 (self->priv->ok_button);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ExportDialog.vala"
+	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
+#line 2090 "ExportDialog.c"
+}
+
+
+GType export_dialog_get_type (void) {
+	static volatile gsize export_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&export_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ExportDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) export_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ExportDialog), 0, (GInstanceInitFunc) export_dialog_instance_init, NULL };
+		GType export_dialog_type_id;
+		export_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "ExportDialog", &g_define_type_info, 0);
+		g_once_init_leave (&export_dialog_type_id__volatile, export_dialog_type_id);
+	}
+	return export_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/ExportDialog.vala b/src/dialogs/ExportDialog.vala
new file mode 100644
index 0000000..5a61dc4
--- /dev/null
+++ b/src/dialogs/ExportDialog.vala
@@ -0,0 +1,343 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class ExportDialog : Gtk.Dialog {
+    public const int DEFAULT_SCALE = 1200;
+
+    // "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."
+    public const int NUM_SPECIAL_FORMATS = 2;
+    public const string UNMODIFIED_FORMAT_LABEL = _("Unmodified");
+    public const string CURRENT_FORMAT_LABEL = _("Current");
+
+    public const ScaleConstraint[] CONSTRAINT_ARRAY = { ScaleConstraint.ORIGINAL,
+        ScaleConstraint.DIMENSIONS, ScaleConstraint.WIDTH, ScaleConstraint.HEIGHT };
+
+    public const Jpeg.Quality[] QUALITY_ARRAY = { Jpeg.Quality.LOW, Jpeg.Quality.MEDIUM,
+        Jpeg.Quality.HIGH, Jpeg.Quality.MAXIMUM };
+
+    private static ScaleConstraint current_constraint = ScaleConstraint.ORIGINAL;
+    private static ExportFormatParameters current_parameters = ExportFormatParameters.current();
+    private static int current_scale = DEFAULT_SCALE;
+
+    private Gtk.Grid table = new Gtk.Grid();
+    private Gtk.ComboBoxText quality_combo;
+    private Gtk.ComboBoxText constraint_combo;
+    private Gtk.ComboBoxText format_combo;
+    private Gtk.Switch export_metadata;
+    private Gee.ArrayList<string> format_options = new Gee.ArrayList<string>();
+    private Gtk.Entry pixels_entry;
+    private Gtk.Widget ok_button;
+    private bool in_insert = false;
+
+    public ExportDialog(string title) {
+        Object (use_header_bar: Resources.use_header_bar());
+
+        this.title = title;
+        resizable = false;
+
+        //get information about the export settings out of our config backend
+        Config.Facade config = Config.Facade.get_instance();
+        current_parameters.mode = config.get_export_export_format_mode(); //ExportFormatMode
+        current_parameters.specified_format = config.get_export_photo_file_format(); //PhotoFileFormat
+        current_parameters.quality = config.get_export_quality(); //quality
+        current_parameters.export_metadata = config.get_export_export_metadata(); //export metadata
+        current_constraint = config.get_export_constraint(); //constraint
+        current_scale = config.get_export_scale(); //scale
+
+        quality_combo = new Gtk.ComboBoxText();
+        int ctr = 0;
+        foreach (Jpeg.Quality quality in QUALITY_ARRAY) {
+            quality_combo.append_text(quality.to_string());
+            if (quality == current_parameters.quality)
+                quality_combo.set_active(ctr);
+            ctr++;
+        }
+
+        constraint_combo = new Gtk.ComboBoxText();
+        ctr = 0;
+        foreach (ScaleConstraint constraint in CONSTRAINT_ARRAY) {
+            constraint_combo.append_text(constraint.to_string());
+            if (constraint == current_constraint)
+                constraint_combo.set_active(ctr);
+            ctr++;
+        }
+
+        format_combo = new Gtk.ComboBoxText();
+        format_add_option(UNMODIFIED_FORMAT_LABEL);
+        format_add_option(CURRENT_FORMAT_LABEL);
+        foreach (PhotoFileFormat format in PhotoFileFormat.get_writeable()) {
+            format_add_option(format.get_properties().get_user_visible_name());
+        }
+
+        pixels_entry = new Gtk.Entry();
+        pixels_entry.set_max_length(6);
+        pixels_entry.set_text("%d".printf(current_scale));
+
+        // register after preparation to avoid signals during init
+        constraint_combo.changed.connect(on_constraint_changed);
+        format_combo.changed.connect(on_format_changed);
+        pixels_entry.changed.connect(on_pixels_changed);
+        pixels_entry.insert_text.connect(on_pixels_insert_text);
+        pixels_entry.activate.connect(on_activate);
+
+        // layout controls
+        add_label(_("_Format:"), 0, 0, format_combo);
+        add_control(format_combo, 1, 0);
+
+        add_label(_("_Quality:"), 0, 1, quality_combo);
+        add_control(quality_combo, 1, 1);
+
+        add_label(_("_Scaling constraint:"), 0, 2, constraint_combo);
+        add_control(constraint_combo, 1, 2);
+
+        add_label(_("_Pixels:"), 0, 3, pixels_entry);
+        add_control(pixels_entry, 1, 3);
+
+        export_metadata = new Gtk.Switch ();
+        add_label(_("Export _metadata:"), 0, 4, export_metadata);
+        add_control(export_metadata, 1, 4);
+        export_metadata.active = true;
+        export_metadata.halign = Gtk.Align.START;
+
+        table.set_row_spacing(6);
+        table.set_column_spacing(12);
+        table.set_border_width(18);
+
+        ((Gtk.Box) get_content_area()).add(table);
+
+        // add buttons to action area
+        add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
+        ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
+        set_default_response(Gtk.ResponseType.OK);
+
+        ok_button.set_can_default(true);
+        ok_button.has_default = true;
+        set_default(ok_button);
+
+        if (current_constraint == ScaleConstraint.ORIGINAL) {
+            pixels_entry.sensitive = false;
+            quality_combo.sensitive = false;
+        }
+
+        ok_button.grab_focus();
+    }
+
+    private void format_add_option(string format_name) {
+        format_options.add(format_name);
+        format_combo.append_text(format_name);
+    }
+
+    private void format_set_active_text(string text) {
+        int selection_ticker = 0;
+
+        foreach (string current_text in format_options) {
+            if (current_text == text) {
+                format_combo.set_active(selection_ticker);
+                return;
+            }
+            selection_ticker++;
+        }
+
+        error("format_set_active_text: text '%s' isn't in combo box", text);
+    }
+
+    private PhotoFileFormat get_specified_format() {
+        int index = format_combo.get_active();
+        if (index < NUM_SPECIAL_FORMATS)
+            index = NUM_SPECIAL_FORMATS;
+
+        index -= NUM_SPECIAL_FORMATS;
+        PhotoFileFormat[] writeable_formats = PhotoFileFormat.get_writeable();
+        return writeable_formats[index];
+    }
+
+    private string get_label_for_parameters(ExportFormatParameters params) {
+        switch(params.mode) {
+            case ExportFormatMode.UNMODIFIED:
+                return UNMODIFIED_FORMAT_LABEL;
+
+            case ExportFormatMode.CURRENT:
+                return CURRENT_FORMAT_LABEL;
+
+            case ExportFormatMode.SPECIFIED:
+                return params.specified_format.get_properties().get_user_visible_name();
+
+            default:
+                error("get_label_for_parameters: unrecognized export format mode");
+        }
+    }
+
+    // unlike other parameters, which should be persisted across dialog executions, the
+    // format parameters must be set each time the dialog is executed -- this is why
+    // it's passed qualified as ref and not as out
+    public bool execute(out int scale, out ScaleConstraint constraint,
+        ref ExportFormatParameters parameters) {
+        show_all();
+
+        // if the export format mode isn't set to last (i.e., don't use the persisted settings),
+        // reset the scale constraint to original size
+        if (parameters.mode != ExportFormatMode.LAST) {
+            current_constraint = constraint = ScaleConstraint.ORIGINAL;
+            constraint_combo.set_active(0);
+        }
+
+        if (parameters.mode == ExportFormatMode.LAST)
+            parameters = current_parameters;
+        else if (parameters.mode == ExportFormatMode.SPECIFIED && !parameters.specified_format.can_write())
+            parameters.specified_format = PhotoFileFormat.get_system_default_format();
+
+        format_set_active_text(get_label_for_parameters(parameters));
+        on_format_changed();
+
+        bool ok = (run() == Gtk.ResponseType.OK);
+        if (ok) {
+            int index = constraint_combo.get_active();
+            assert(index >= 0);
+            constraint = CONSTRAINT_ARRAY[index];
+            current_constraint = constraint;
+
+            scale = int.parse(pixels_entry.get_text());
+            if (constraint != ScaleConstraint.ORIGINAL)
+                assert(scale > 0);
+            current_scale = scale;
+
+            parameters.export_metadata = export_metadata.sensitive ? export_metadata.active : false;
+
+            if (format_combo.get_active_text() == UNMODIFIED_FORMAT_LABEL) {
+                parameters.mode = current_parameters.mode = ExportFormatMode.UNMODIFIED;
+            } else if (format_combo.get_active_text() == CURRENT_FORMAT_LABEL) {
+                parameters.mode = current_parameters.mode = ExportFormatMode.CURRENT;
+            } else {
+                parameters.mode = current_parameters.mode = ExportFormatMode.SPECIFIED;
+                parameters.specified_format = current_parameters.specified_format = get_specified_format();
+                if (current_parameters.specified_format == PhotoFileFormat.JFIF)
+                    parameters.quality = current_parameters.quality = QUALITY_ARRAY[quality_combo.get_active()];
+            }
+
+            //save current settings in config backend for reusing later
+            Config.Facade config = Config.Facade.get_instance();
+            config.set_export_export_format_mode(current_parameters.mode); //ExportFormatMode
+            config.set_export_photo_file_format(current_parameters.specified_format); //PhotoFileFormat
+            config.set_export_quality(current_parameters.quality); //quality
+            config.set_export_export_metadata(current_parameters.export_metadata); //export metadata
+            config.set_export_constraint(current_constraint); //constraint
+            config.set_export_scale(current_scale); //scale
+        } else {
+            scale = 0;
+            constraint = ScaleConstraint.ORIGINAL;
+        }
+
+        destroy();
+
+        return ok;
+    }
+
+    private void add_label(string text, int x, int y, Gtk.Widget? widget = null) {
+        Gtk.Label new_label = new Gtk.Label.with_mnemonic(text);
+        new_label.halign = Gtk.Align.END;
+        new_label.valign = Gtk.Align.CENTER;
+        new_label.set_use_underline(true);
+
+        if (widget != null)
+            new_label.set_mnemonic_widget(widget);
+
+        table.attach(new_label, x, y, 1, 1);
+    }
+
+    private void add_control(Gtk.Widget widget, int x, int y) {
+        widget.halign = Gtk.Align.FILL;
+        widget.valign = Gtk.Align.CENTER;
+        widget.hexpand = true;
+        widget.vexpand = true;
+
+        table.attach(widget, x, y, 1, 1);
+    }
+
+    private void on_constraint_changed() {
+        bool original = CONSTRAINT_ARRAY[constraint_combo.get_active()] == ScaleConstraint.ORIGINAL;
+        bool jpeg = format_combo.get_active_text() ==
+            PhotoFileFormat.JFIF.get_properties().get_user_visible_name();
+        pixels_entry.sensitive = !original;
+        quality_combo.sensitive = !original && jpeg;
+        if (original)
+            ok_button.sensitive = true;
+        else
+            on_pixels_changed();
+    }
+
+    private void on_format_changed() {
+        bool original = CONSTRAINT_ARRAY[constraint_combo.get_active()] == ScaleConstraint.ORIGINAL;
+
+        if (format_combo.get_active_text() == UNMODIFIED_FORMAT_LABEL) {
+            // if the user wishes to export the media unmodified, then we just copy the original
+            // files, so parameterizing size, quality, etc. is impossible -- these are all
+            // just as they are in the original file. In this case, we set the scale constraint to
+            // original and lock out all the controls
+            constraint_combo.set_active(0); /* 0 == original size */
+            constraint_combo.set_sensitive(false);
+            quality_combo.set_sensitive(false);
+            pixels_entry.sensitive = false;
+            export_metadata.active = false;
+            export_metadata.sensitive = false;
+        } else if (format_combo.get_active_text() == CURRENT_FORMAT_LABEL) {
+            // if the user wishes to export the media in its current format, we allow sizing but
+            // not JPEG quality customization, because in a batch of many photos, it's not
+            // guaranteed that all of them will be JPEGs or RAWs that get converted to JPEGs. Some
+            // could be PNGs, and PNG has no notion of quality. So lock out the quality control.
+            // If the user wants to set JPEG quality, he or she can explicitly specify the JPEG
+            // format.
+            constraint_combo.set_sensitive(true);
+            quality_combo.set_sensitive(false);
+            pixels_entry.sensitive = !original;
+            export_metadata.sensitive = true;
+        } else {
+            // if the user has chosen a specific format, then allow JPEG quality customization if
+            // the format is JPEG and the user is re-sizing the image, otherwise, disallow JPEG
+            // quality customization; always allow scaling.
+            constraint_combo.set_sensitive(true);
+            bool jpeg = get_specified_format() == PhotoFileFormat.JFIF;
+            quality_combo.sensitive = !original && jpeg;
+            export_metadata.sensitive = true;
+        }
+    }
+
+    private void on_activate() {
+        response(Gtk.ResponseType.OK);
+    }
+
+    private void on_pixels_changed() {
+        ok_button.sensitive = (pixels_entry.get_text_length() > 0) && (int.parse(pixels_entry.get_text()) > 0);
+    }
+
+    private void on_pixels_insert_text(string text, int length, ref int position) {
+        // This is necessary because SignalHandler.block_by_func() is not properly bound
+        if (in_insert)
+            return;
+
+        in_insert = true;
+
+        if (length == -1)
+            length = (int) text.length;
+
+        // only permit numeric text
+        string new_text = "";
+        for (int ctr = 0; ctr < length; ctr++) {
+            if (text[ctr].isdigit()) {
+                new_text += ((char) text[ctr]).to_string();
+            }
+        }
+
+        if (new_text.length > 0)
+            pixels_entry.insert_text(new_text, (int) new_text.length, ref position);
+
+        Signal.stop_emission_by_name(pixels_entry, "insert-text");
+
+        in_insert = false;
+    }
+}
diff --git a/src/dialogs/MultiTextEntryDialog.c b/src/dialogs/MultiTextEntryDialog.c
new file mode 100644
index 0000000..7e682a6
--- /dev/null
+++ b/src/dialogs/MultiTextEntryDialog.c
@@ -0,0 +1,286 @@
+/* MultiTextEntryDialog.c generated by valac 0.36.6, the Vala compiler
+ * generated from MultiTextEntryDialog.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#define TYPE_MULTI_TEXT_ENTRY_DIALOG (multi_text_entry_dialog_get_type ())
+#define MULTI_TEXT_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog))
+#define MULTI_TEXT_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogClass))
+#define IS_MULTI_TEXT_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MULTI_TEXT_ENTRY_DIALOG))
+#define IS_MULTI_TEXT_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MULTI_TEXT_ENTRY_DIALOG))
+#define MULTI_TEXT_ENTRY_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogClass))
+
+typedef struct _MultiTextEntryDialog MultiTextEntryDialog;
+typedef struct _MultiTextEntryDialogClass MultiTextEntryDialogClass;
+typedef struct _MultiTextEntryDialogPrivate MultiTextEntryDialogPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+struct _MultiTextEntryDialog {
+	GtkDialog parent_instance;
+	MultiTextEntryDialogPrivate * priv;
+};
+
+struct _MultiTextEntryDialogClass {
+	GtkDialogClass parent_class;
+};
+
+typedef gboolean (*MultiTextEntryDialogOnModifyValidateType) (const gchar* text, void* user_data);
+struct _MultiTextEntryDialogPrivate {
+	MultiTextEntryDialogOnModifyValidateType on_modify_validate;
+	gpointer on_modify_validate_target;
+	GtkTextView* entry;
+};
+
+
+static gpointer multi_text_entry_dialog_parent_class = NULL;
+
+GType multi_text_entry_dialog_get_type (void) G_GNUC_CONST;
+#define MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialogPrivate))
+enum  {
+	MULTI_TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
+};
+MultiTextEntryDialog* multi_text_entry_dialog_new (void);
+MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
+void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self);
+static void multi_text_entry_dialog_finalize (GObject * obj);
+
+
+MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
+	MultiTextEntryDialog * self = NULL;
+	gint _tmp0_;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 17 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	return self;
+#line 96 "MultiTextEntryDialog.c"
+}
+
+
+MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
+#line 16 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
+#line 103 "MultiTextEntryDialog.c"
+}
+
+
+void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text) {
+	const gchar* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	MultiTextEntryDialogOnModifyValidateType _tmp6_;
+	void* _tmp6__target;
+	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_;
+	GtkTextView* _tmp10_;
+	GtkTextBuffer* _tmp11_;
+	GtkTextBuffer* _tmp12_;
+	GtkTextView* _tmp13_;
+#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
+#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_return_if_fail (title != NULL);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_return_if_fail (label != NULL);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp0_ = title;
+#line 21 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp2_ = _tmp1_;
+#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+#line 22 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_g_object_unref0 (_tmp2_);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp4_ = app_window_get_instance ();
+#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp5_ = _tmp4_;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+#line 23 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_g_object_unref0 (_tmp5_);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp6_ = modify_validate;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp6__target = modify_validate_target;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	self->priv->on_modify_validate = _tmp6_;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	self->priv->on_modify_validate_target = _tmp6__target;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp8_ = initial_text;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	if (_tmp8_ != NULL) {
+#line 162 "MultiTextEntryDialog.c"
+		const gchar* _tmp9_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp9_ = initial_text;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp7_ = _tmp9_;
+#line 168 "MultiTextEntryDialog.c"
+	} else {
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp7_ = "";
+#line 172 "MultiTextEntryDialog.c"
+	}
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp10_ = self->priv->entry;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp11_ = gtk_text_view_get_buffer (_tmp10_);
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp12_ = _tmp11_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_object_set (_tmp12_, "text", _tmp7_, NULL);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp13_ = self->priv->entry;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 186 "MultiTextEntryDialog.c"
+}
+
+
+gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
+	gchar* result = NULL;
+	gchar* text = NULL;
+	gint _tmp0_;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
+#line 32 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	text = NULL;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 36 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
+#line 204 "MultiTextEntryDialog.c"
+		GtkTextView* _tmp1_;
+		GtkTextBuffer* _tmp2_;
+		GtkTextBuffer* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp1_ = self->priv->entry;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp3_ = _tmp2_;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_tmp5_ = _tmp4_;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		_g_free0 (text);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+		text = _tmp5_;
+#line 224 "MultiTextEntryDialog.c"
+	}
+#line 39 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 41 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	result = text;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	return result;
+#line 232 "MultiTextEntryDialog.c"
+}
+
+
+static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
+	gint MultiTextEntryDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	MultiTextEntryDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/multitextentrydialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, MultiTextEntryDialog_private_offset + G_STRUCT_OFFSET (MultiTextEntryDialogPrivate, entry));
+#line 250 "MultiTextEntryDialog.c"
+}
+
+
+static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 259 "MultiTextEntryDialog.c"
+}
+
+
+static void multi_text_entry_dialog_finalize (GObject * obj) {
+	MultiTextEntryDialog * self;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
+#line 14 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	_g_object_unref0 (self->priv->entry);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/MultiTextEntryDialog.vala"
+	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
+#line 271 "MultiTextEntryDialog.c"
+}
+
+
+GType multi_text_entry_dialog_get_type (void) {
+	static volatile gsize multi_text_entry_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&multi_text_entry_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (MultiTextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) multi_text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MultiTextEntryDialog), 0, (GInstanceInitFunc) multi_text_entry_dialog_instance_init, NULL };
+		GType multi_text_entry_dialog_type_id;
+		multi_text_entry_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "MultiTextEntryDialog", &g_define_type_info, 0);
+		g_once_init_leave (&multi_text_entry_dialog_type_id__volatile, multi_text_entry_dialog_type_id);
+	}
+	return multi_text_entry_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/MultiTextEntryDialog.vala b/src/dialogs/MultiTextEntryDialog.vala
new file mode 100644
index 0000000..42e5318
--- /dev/null
+++ b/src/dialogs/MultiTextEntryDialog.vala
@@ -0,0 +1,43 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/multitextentrydialog.ui")]
+public class MultiTextEntryDialog : Gtk.Dialog {
+    public delegate bool OnModifyValidateType(string text);
+
+    private unowned OnModifyValidateType on_modify_validate;
+    [GtkChild]
+    private Gtk.TextView entry;
+
+    public MultiTextEntryDialog() {
+        Object (use_header_bar: Resources.use_header_bar());
+    }
+
+    public void setup(OnModifyValidateType? modify_validate, string title, string label, string? initial_text) {
+        set_title(title);
+        set_parent_window(AppWindow.get_instance().get_parent_window());
+        set_transient_for(AppWindow.get_instance());
+        on_modify_validate = modify_validate;
+
+        entry.buffer.text = (initial_text != null ? initial_text : "");
+
+        entry.grab_focus();
+    }
+
+    public string? execute() {
+        string? text = null;
+
+        show_all();
+
+        if (run() == Gtk.ResponseType.OK)
+            text = entry.buffer.text;
+
+        destroy();
+
+        return text;
+    }
+}
diff --git a/src/dialogs/Preferences.c b/src/dialogs/Preferences.c
new file mode 100644
index 0000000..855b11d
--- /dev/null
+++ b/src/dialogs/Preferences.c
@@ -0,0 +1,3245 @@
+/* Preferences.c generated by valac 0.36.6, the Vala compiler
+ * generated from Preferences.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gee.h>
+#include <gdk/gdk.h>
+#include <float.h>
+#include <math.h>
+#include <glib/gi18n-lib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gobject/gvaluecollector.h>
+
+
+#define TYPE_PREFERENCES_DIALOG (preferences_dialog_get_type ())
+#define PREFERENCES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PREFERENCES_DIALOG, PreferencesDialog))
+#define PREFERENCES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PREFERENCES_DIALOG, PreferencesDialogClass))
+#define IS_PREFERENCES_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PREFERENCES_DIALOG))
+#define IS_PREFERENCES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PREFERENCES_DIALOG))
+#define PREFERENCES_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PREFERENCES_DIALOG, PreferencesDialogClass))
+
+typedef struct _PreferencesDialog PreferencesDialog;
+typedef struct _PreferencesDialogClass PreferencesDialogClass;
+typedef struct _PreferencesDialogPrivate PreferencesDialogPrivate;
+
+#define TYPE_SORTED_LIST (sorted_list_get_type ())
+#define SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SORTED_LIST, SortedList))
+#define SORTED_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SORTED_LIST, SortedListClass))
+#define IS_SORTED_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SORTED_LIST))
+#define IS_SORTED_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SORTED_LIST))
+#define SORTED_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SORTED_LIST, SortedListClass))
+
+typedef struct _SortedList SortedList;
+typedef struct _SortedListClass SortedListClass;
+
+#define PREFERENCES_DIALOG_TYPE_PATH_FORMAT (preferences_dialog_path_format_get_type ())
+#define PREFERENCES_DIALOG_PATH_FORMAT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat))
+#define PREFERENCES_DIALOG_PATH_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormatClass))
+#define PREFERENCES_DIALOG_IS_PATH_FORMAT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT))
+#define PREFERENCES_DIALOG_IS_PATH_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PREFERENCES_DIALOG_TYPE_PATH_FORMAT))
+#define PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormatClass))
+
+typedef struct _PreferencesDialogPathFormat PreferencesDialogPathFormat;
+typedef struct _PreferencesDialogPathFormatClass PreferencesDialogPathFormatClass;
+
+#define PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR (plugins_manifest_widget_mediator_get_type ())
+#define PLUGINS_MANIFEST_WIDGET_MEDIATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator))
+#define PLUGINS_MANIFEST_WIDGET_MEDIATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorClass))
+#define PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR))
+#define PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR))
+#define PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorClass))
+
+typedef struct _PluginsManifestWidgetMediator PluginsManifestWidgetMediator;
+typedef struct _PluginsManifestWidgetMediatorClass PluginsManifestWidgetMediatorClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+
+#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
+
+#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+typedef struct _PreferencesDialogPathFormatPrivate PreferencesDialogPathFormatPrivate;
+#define _preferences_dialog_path_format_unref0(var) ((var == NULL) ? NULL : (var = (preferences_dialog_path_format_unref (var), NULL)))
+typedef struct _PreferencesDialogParamSpecPathFormat PreferencesDialogParamSpecPathFormat;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _PreferencesDialog {
+	GtkDialog parent_instance;
+	PreferencesDialogPrivate * priv;
+};
+
+struct _PreferencesDialogClass {
+	GtkDialogClass parent_class;
+};
+
+struct _PreferencesDialogPrivate {
+	GtkAdjustment* bg_color_adjustment;
+	GtkScale* bg_color_slider;
+	GtkComboBox* photo_editor_combo;
+	GtkComboBox* raw_editor_combo;
+	SortedList* external_raw_apps;
+	SortedList* external_photo_apps;
+	GtkFileChooserButton* library_dir_button;
+	GtkComboBoxText* dir_pattern_combo;
+	GtkEntry* dir_pattern_entry;
+	GtkLabel* dir_pattern_example;
+	gboolean allow_closing;
+	gchar* lib_dir;
+	GeeArrayList* path_formats;
+	GDateTime* example_date;
+	GtkCheckButton* lowercase;
+	PluginsManifestWidgetMediator* plugins_mediator;
+	GtkComboBoxText* default_raw_developer_combo;
+	GtkCheckButton* autoimport;
+	GtkCheckButton* write_metadata;
+	GtkLabel* pattern_help;
+	GtkNotebook* preferences_notebook;
+	GtkRadioButton* transparent_checker_radio;
+	GtkRadioButton* transparent_solid_radio;
+	GtkColorButton* transparent_solid_color;
+	GtkRadioButton* transparent_none_radio;
+};
+
+typedef enum  {
+	RAW_DEVELOPER_SHOTWELL = 0,
+	RAW_DEVELOPER_CAMERA,
+	RAW_DEVELOPER_EMBEDDED
+} RawDeveloper;
+
+typedef enum  {
+	PHOTO_FILE_FORMAT_JFIF,
+	PHOTO_FILE_FORMAT_RAW,
+	PHOTO_FILE_FORMAT_PNG,
+	PHOTO_FILE_FORMAT_TIFF,
+	PHOTO_FILE_FORMAT_BMP,
+	PHOTO_FILE_FORMAT_UNKNOWN
+} PhotoFileFormat;
+
+struct _PreferencesDialogPathFormat {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PreferencesDialogPathFormatPrivate * priv;
+	gchar* name;
+	gchar* pattern;
+};
+
+struct _PreferencesDialogPathFormatClass {
+	GTypeClass parent_class;
+	void (*finalize) (PreferencesDialogPathFormat *self);
+};
+
+struct _PreferencesDialogParamSpecPathFormat {
+	GParamSpec parent_instance;
+};
+
+
+static gpointer preferences_dialog_parent_class = NULL;
+static PreferencesDialog* preferences_dialog_preferences_dialog;
+static PreferencesDialog* preferences_dialog_preferences_dialog = NULL;
+static gpointer preferences_dialog_path_format_parent_class = NULL;
+
+GType preferences_dialog_get_type (void) G_GNUC_CONST;
+GType sorted_list_get_type (void) G_GNUC_CONST;
+static gpointer preferences_dialog_path_format_ref (gpointer instance);
+static void preferences_dialog_path_format_unref (gpointer instance);
+static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
+static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static gpointer preferences_dialog_value_get_path_format (const GValue* value) G_GNUC_UNUSED;
+static GType preferences_dialog_path_format_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST;
+#define PREFERENCES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PREFERENCES_DIALOG, PreferencesDialogPrivate))
+enum  {
+	PREFERENCES_DIALOG_DUMMY_PROPERTY
+};
+PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void);
+PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type);
+static PreferencesDialog* preferences_dialog_new (void);
+static PreferencesDialog* preferences_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+static gboolean preferences_dialog_on_delete (PreferencesDialog* self);
+static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+static void preferences_dialog_on_close (PreferencesDialog* self);
+static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result);
+static void preferences_dialog_on_value_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event);
+static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void preferences_dialog_on_radio_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self);
+static void preferences_dialog_on_color_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self);
+gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self);
+gchar* resources_get_help_path (void);
+#define RESOURCES_DIR_PATTERN_URI_SYSWIDE "help:shotwell/other-files"
+static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore);
+static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self);
+static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern);
+static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self);
+static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+void preferences_dialog_populate_preference_options (PreferencesDialog* self);
+static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self);
+gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self);
+GType raw_developer_get_type (void) G_GNUC_CONST;
+gchar* raw_developer_get_label (RawDeveloper self);
+static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d);
+RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
+static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self);
+static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps);
+gchar** photo_file_format_get_editable_mime_types (int* result_length1);
+gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
+GType photo_file_format_get_type (void) G_GNUC_CONST;
+gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
+gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
+static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry);
+gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self);
+void configuration_facade_set_transparent_background_type (ConfigurationFacade* self, const gchar* type);
+void configuration_facade_set_transparent_background_color (ConfigurationFacade* self, const gchar* color_name);
+void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
+SortedList* desktop_integration_get_apps_for_mime_types (gchar** mime_types, int mime_types_length1);
+GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
+#define RESOURCES_DEFAULT_ICON_SCALE 24
+gint sorted_list_index_of (SortedList* self, gconstpointer search);
+gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self);
+gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self);
+gboolean is_string_empty (const gchar* s);
+void preferences_dialog_show_preferences (void);
+GFile* app_dirs_get_import_dir (void);
+static void preferences_dialog_commit_on_close (PreferencesDialog* self);
+void config_facade_commit_bg_color (ConfigFacade* self);
+void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import);
+void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata);
+void app_dirs_set_import_dir (const gchar* path);
+void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s);
+void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s);
+static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self);
+static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value);
+gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
+void parse_color (const gchar* spec, GdkRGBA* result);
+#define CONFIG_FACADE_DEFAULT_BG_COLOR "#444"
+static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow);
+void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color);
+static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result);
+gpointer sorted_list_get_at (SortedList* self, gint index);
+void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app);
+gchar* desktop_integration_get_app_open_command (GAppInfo* app_info);
+void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app);
+static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self);
+void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d);
+static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self);
+static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event);
+static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self);
+static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern);
+static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern);
+void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b);
+enum  {
+	PREFERENCES_DIALOG_PATH_FORMAT_DUMMY_PROPERTY
+};
+static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj);
+static void preferences_dialog_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 gint _vala_array_length (gpointer array);
+
+
+static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+	gboolean result;
+	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 324 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+#line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_close ((PreferencesDialog*) self);
+#line 331 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
+#line 338 "Preferences.c"
+}
+
+
+static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+	gboolean result;
+	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 347 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_radio_changed ((PreferencesDialog*) self);
+#line 354 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_color_changed_gtk_color_button_color_set (GtkColorButton* _sender, gpointer self) {
+#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_color_changed ((PreferencesDialog*) self);
+#line 361 "Preferences.c"
+}
+
+
+static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
+	gboolean result;
+	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
+#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 370 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
+#line 377 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
+#line 384 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
+#line 391 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
+#line 398 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
+#line 405 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
+#line 412 "Preferences.c"
+}
+
+
+static PreferencesDialog* preferences_dialog_construct (GType object_type) {
+	PreferencesDialog * self = NULL;
+	gint _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	GtkAdjustment* _tmp6_;
+	GtkAdjustment* _tmp7_;
+	gdouble _tmp8_;
+	ConfigFacade* _tmp9_;
+	ConfigFacade* _tmp10_;
+	GdkRGBA _tmp11_ = {0};
+	gdouble _tmp12_;
+	GtkAdjustment* _tmp13_;
+	GtkScale* _tmp14_;
+	GtkRadioButton* _tmp15_;
+	GtkRadioButton* _tmp16_;
+	GtkRadioButton* _tmp17_;
+	GtkRadioButton* _tmp18_;
+	GtkColorButton* _tmp19_;
+	GdkRGBA color = {0};
+	ConfigFacade* _tmp20_;
+	ConfigFacade* _tmp21_;
+	gchar* _tmp22_;
+	gchar* _tmp23_;
+	GtkColorButton* _tmp24_;
+	GdkRGBA _tmp25_;
+	GtkColorButton* _tmp26_;
+	ConfigFacade* _tmp27_;
+	ConfigFacade* _tmp28_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	GQuark _tmp33_ = 0U;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	static GQuark _tmp32_label0 = 0;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	static GQuark _tmp32_label1 = 0;
+#line 456 "Preferences.c"
+	gchar* help_path = NULL;
+	gchar* _tmp37_;
+	const gchar* _tmp38_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	GtkComboBoxText* _tmp56_;
+	GtkEntry* _tmp57_;
+	GtkCheckButton* _tmp58_;
+	GtkNotebook* _tmp59_;
+	GtkWidget* _tmp60_;
+	PluginsManifestWidgetMediator* _tmp61_;
+	GtkComboBox* _tmp62_;
+	GtkComboBox* _tmp63_;
+	GtkCheckButton* _tmp64_;
+	ConfigFacade* _tmp65_;
+	ConfigFacade* _tmp66_;
+	gboolean _tmp67_;
+	GtkCheckButton* _tmp68_;
+	ConfigFacade* _tmp69_;
+	ConfigFacade* _tmp70_;
+	gboolean _tmp71_;
+	GtkComboBoxText* _tmp72_;
+	gchar* _tmp73_;
+	gchar* _tmp74_;
+	GtkComboBoxText* _tmp75_;
+	gchar* _tmp76_;
+	gchar* _tmp77_;
+	ConfigFacade* _tmp78_;
+	ConfigFacade* _tmp79_;
+	RawDeveloper _tmp80_;
+	GtkComboBoxText* _tmp81_;
+#line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 68 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self = (PreferencesDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = _tmp1_;
+#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp2_);
+#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = app_window_get_instance ();
+#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+#line 71 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp5_);
+#line 72 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self, 0);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self, 0);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = self->priv->bg_color_adjustment;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = self->priv->bg_color_adjustment;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp8_ = gtk_adjustment_get_upper (_tmp7_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp9_ = config_facade_get_instance ();
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp10_ = _tmp9_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	config_facade_get_bg_color (_tmp10_, &_tmp11_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = _tmp11_.red;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_adjustment_set_value (_tmp6_, _tmp8_ - (_tmp12_ * 65535.0));
+#line 75 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp10_);
+#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp13_ = self->priv->bg_color_adjustment;
+#line 77 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (_tmp13_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self, 0);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = self->priv->bg_color_slider;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self, 0);
+#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = self->priv->transparent_checker_radio;
+#line 81 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+#line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = self->priv->transparent_solid_radio;
+#line 82 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+#line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp17_ = self->priv->transparent_none_radio;
+#line 83 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_radio_changed_gtk_toggle_button_toggled, self, 0);
+#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp18_ = self->priv->transparent_solid_radio;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp19_ = self->priv->transparent_solid_color;
+#line 85 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_object_bind_property_with_closures (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject), "active", G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, G_TYPE_OBJECT, GObject), "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, (GClosureNotify) NULL)));
+#line 89 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	memset (&color, 0, sizeof (GdkRGBA));
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp20_ = config_facade_get_instance ();
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp21_ = _tmp20_;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp22_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp23_ = _tmp22_;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gdk_rgba_parse (&color, _tmp23_);
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp23_);
+#line 90 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp21_);
+#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp24_ = self->priv->transparent_solid_color;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp25_ = color;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_color_chooser_set_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp24_) : NULL, &_tmp25_);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp26_ = self->priv->transparent_solid_color;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (_tmp26_, "color-set", (GCallback) _preferences_dialog_on_color_changed_gtk_color_button_color_set, self, 0);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp27_ = config_facade_get_instance ();
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp28_ = _tmp27_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp29_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp30_ = _tmp29_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp28_);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp31_ = _tmp30_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp33_ = (NULL == _tmp31_) ? 0 : g_quark_from_string (_tmp31_);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_free (_tmp31_);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp33_ == ((0 != _tmp32_label0) ? _tmp32_label0 : (_tmp32_label0 = g_quark_from_static_string ("checkered")))) {
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		switch (0) {
+#line 608 "Preferences.c"
+			default:
+			{
+				GtkRadioButton* _tmp34_;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp34_ = self->priv->transparent_checker_radio;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 97 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				break;
+#line 618 "Preferences.c"
+			}
+		}
+	} else if (_tmp33_ == ((0 != _tmp32_label1) ? _tmp32_label1 : (_tmp32_label1 = g_quark_from_static_string ("solid")))) {
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		switch (0) {
+#line 624 "Preferences.c"
+			default:
+			{
+				GtkRadioButton* _tmp35_;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp35_ = self->priv->transparent_solid_radio;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 100 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				break;
+#line 634 "Preferences.c"
+			}
+		}
+	} else {
+#line 94 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		switch (0) {
+#line 640 "Preferences.c"
+			default:
+			{
+				GtkRadioButton* _tmp36_;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp36_ = self->priv->transparent_none_radio;
+#line 102 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 103 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				break;
+#line 650 "Preferences.c"
+			}
+		}
+	}
+#line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp37_ = resources_get_help_path ();
+#line 111 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	help_path = _tmp37_;
+#line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp38_ = help_path;
+#line 113 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp38_ == NULL) {
+#line 662 "Preferences.c"
+		GtkLabel* _tmp39_;
+		gchar* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
+		gchar* _tmp43_;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp39_ = self->priv->pattern_help;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp40_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _ ("(Help)"), NULL);
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp41_ = _tmp40_;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp42_ = g_strconcat (_tmp41_, "</a>", NULL);
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp43_ = _tmp42_;
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_label_set_markup (_tmp39_, _tmp43_);
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (_tmp43_);
+#line 115 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (_tmp41_);
+#line 684 "Preferences.c"
+	} else {
+		GtkLabel* _tmp44_;
+		gchar* _tmp45_;
+		gchar* _tmp46_;
+		gchar* _tmp47_;
+		gchar* _tmp48_;
+		GtkLabel* _tmp49_;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp44_ = self->priv->pattern_help;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp45_ = g_strconcat ("<a href=\"dummy:\">", _ ("(Help)"), NULL);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp46_ = _tmp45_;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp47_ = g_strconcat (_tmp46_, "</a>", NULL);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp48_ = _tmp47_;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_label_set_markup (_tmp44_, _tmp48_);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (_tmp48_);
+#line 119 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (_tmp46_);
+#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp49_ = self->priv->pattern_help;
+#line 120 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_signal_connect_object (_tmp49_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self, 0);
+#line 712 "Preferences.c"
+	}
+#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp50_ = g_strdup_printf (_ ("Year%sMonth%sDay"), G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
+#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp51_ = _tmp50_;
+#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp51_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
+#line 123 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp51_);
+#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp52_ = g_strdup_printf (_ ("Year%sMonth"), G_DIR_SEPARATOR_S);
+#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp53_ = _tmp52_;
+#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp53_, "%Y" G_DIR_SEPARATOR_S "%m");
+#line 125 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp53_);
+#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp54_ = g_strdup_printf (_ ("Year%sMonth-Day"), G_DIR_SEPARATOR_S);
+#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp55_ = _tmp54_;
+#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp55_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
+#line 127 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp55_);
+#line 129 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_add_to_dir_formats (self, _ ("Year-Month-Day"), "%Y-%m-%d");
+#line 130 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_add_to_dir_formats (self, _ ("Custom"), NULL);
+#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp56_ = self->priv->dir_pattern_combo;
+#line 131 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self, 0);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp57_ = self->priv->dir_pattern_entry;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self, 0);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp58_ = self->priv->lowercase;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self, 0);
+#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp59_ = self->priv->preferences_notebook;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp60_ = gtk_notebook_get_nth_page (_tmp59_, 2);
+#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp61_ = self->priv->plugins_mediator;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp60_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
+#line 138 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_populate_preference_options (self);
+#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp62_ = self->priv->photo_editor_combo;
+#line 140 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (_tmp62_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self, 0);
+#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp63_ = self->priv->raw_editor_combo;
+#line 141 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (_tmp63_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self, 0);
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp64_ = self->priv->autoimport;
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp65_ = config_facade_get_instance ();
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp66_ = _tmp65_;
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp67_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp67_);
+#line 143 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp66_);
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp68_ = self->priv->write_metadata;
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp69_ = config_facade_get_instance ();
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp70_ = _tmp69_;
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp71_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp71_);
+#line 145 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp70_);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp72_ = self->priv->default_raw_developer_combo;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp73_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp74_ = _tmp73_;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_combo_box_text_append_text (_tmp72_, _tmp74_);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp74_);
+#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp75_ = self->priv->default_raw_developer_combo;
+#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp76_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
+#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp77_ = _tmp76_;
+#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_combo_box_text_append_text (_tmp75_, _tmp77_);
+#line 148 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp77_);
+#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp78_ = config_facade_get_instance ();
+#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp79_ = _tmp78_;
+#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp80_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_set_raw_developer_combo (self, _tmp80_);
+#line 149 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp79_);
+#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp81_ = self->priv->default_raw_developer_combo;
+#line 150 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self, 0);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (help_path);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return self;
+#line 834 "Preferences.c"
+}
+
+
+static PreferencesDialog* preferences_dialog_new (void) {
+#line 67 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
+#line 841 "Preferences.c"
+}
+
+
+void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
+	GtkComboBox* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	SortedList* _tmp8_ = NULL;
+	GtkComboBox* _tmp9_;
+	gint _tmp10_;
+	gchar** _tmp11_;
+	gchar** _tmp12_;
+	gint _tmp12__length1;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	SortedList* _tmp17_ = NULL;
+	GtkComboBoxText* _tmp18_;
+	GtkEntry* _tmp19_;
+	GtkCheckButton* _tmp20_;
+	ConfigFacade* _tmp21_;
+	ConfigFacade* _tmp22_;
+	gboolean _tmp23_;
+#line 153 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->photo_editor_combo;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3__length1 = _tmp1_;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = config_facade_get_instance ();
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = _tmp6_;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->external_photo_apps);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->external_photo_apps = _tmp8_;
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp7_);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp5_);
+#line 154 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp9_ = self->priv->raw_editor_combo;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = _tmp11_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12__length1 = _tmp10_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp13_ = config_facade_get_instance ();
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = _tmp13_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = _tmp15_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->external_raw_apps);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->external_raw_apps = _tmp17_;
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp16_);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp14_);
+#line 157 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
+#line 160 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp18_ = self->priv->dir_pattern_combo;
+#line 160 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp19_ = self->priv->dir_pattern_entry;
+#line 160 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp20_ = self->priv->lowercase;
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp21_ = config_facade_get_instance ();
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp22_ = _tmp21_;
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
+#line 162 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp22_);
+#line 948 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_radio_changed (PreferencesDialog* self) {
+	ConfigFacade* config = NULL;
+	ConfigFacade* _tmp0_;
+	GtkRadioButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 165 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 166 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 166 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	config = _tmp0_;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = self->priv->transparent_checker_radio;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp3_) {
+#line 972 "Preferences.c"
+		ConfigFacade* _tmp4_;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp4_ = config;
+#line 169 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "checkered");
+#line 978 "Preferences.c"
+	} else {
+		GtkRadioButton* _tmp5_;
+		gboolean _tmp6_;
+		gboolean _tmp7_;
+#line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp5_ = self->priv->transparent_solid_radio;
+#line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp7_ = _tmp6_;
+#line 170 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (_tmp7_) {
+#line 991 "Preferences.c"
+			ConfigFacade* _tmp8_;
+#line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp8_ = config;
+#line 171 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "solid");
+#line 997 "Preferences.c"
+		} else {
+			ConfigFacade* _tmp9_;
+#line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp9_ = config;
+#line 173 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			configuration_facade_set_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "none");
+#line 1004 "Preferences.c"
+		}
+	}
+#line 165 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (config);
+#line 1009 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_color_changed (PreferencesDialog* self) {
+	gchar* color = NULL;
+	GtkColorButton* _tmp0_;
+	GdkRGBA _tmp1_ = {0};
+	GdkRGBA _tmp2_;
+	gchar* _tmp3_;
+	ConfigFacade* _tmp4_;
+	ConfigFacade* _tmp5_;
+#line 177 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->transparent_solid_color;
+#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_color_chooser_get_rgba (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_COLOR_CHOOSER) ? ((GtkColorChooser*) _tmp0_) : NULL, &_tmp1_);
+#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = _tmp1_;
+#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = gdk_rgba_to_string (&_tmp2_);
+#line 178 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	color = _tmp3_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = config_facade_get_instance ();
+#line 179 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), color);
+#line 179 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp5_);
+#line 177 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (color);
+#line 1043 "Preferences.c"
+}
+
+
+static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
+	gboolean result = FALSE;
+	GError * _inner_error_ = NULL;
+#line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
+#line 184 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (ignore != NULL, FALSE);
+#line 1054 "Preferences.c"
+	{
+		AppWindow* _tmp0_;
+		AppWindow* _tmp1_;
+		GdkScreen* _tmp2_;
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = app_window_get_instance ();
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp1_ = _tmp0_;
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp1_);
+#line 186 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1071 "Preferences.c"
+			goto __catch22_g_error;
+		}
+	}
+	goto __finally22;
+	__catch22_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		e = _inner_error_;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_inner_error_ = NULL;
+#line 188 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp3_ = e;
+#line 188 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp4_ = _tmp3_->message;
+#line 188 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_message ("Preferences.vala:188: Unable to launch help: %s", _tmp4_);
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_error_free0 (e);
+#line 1093 "Preferences.c"
+	}
+	__finally22:
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1098 "Preferences.c"
+		gboolean _tmp5_ = FALSE;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_clear_error (&_inner_error_);
+#line 185 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return _tmp5_;
+#line 1106 "Preferences.c"
+	}
+#line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = TRUE;
+#line 190 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 1112 "Preferences.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1119 "Preferences.c"
+}
+
+
+static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, GtkComboBox* combo_box, gchar** mime_types, int mime_types_length1, const gchar* current_app_executable, SortedList* * external_apps) {
+	SortedList* _vala_external_apps = NULL;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	SortedList* _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GtkCellRendererPixbuf* pixbuf_renderer = NULL;
+	GtkCellRendererPixbuf* _tmp6_;
+	GtkCellRendererText* text_renderer = NULL;
+	GtkCellRendererText* _tmp7_;
+	GtkComboBox* _tmp8_;
+	GtkComboBox* _tmp9_;
+	GtkCellRendererPixbuf* _tmp10_;
+	GtkComboBox* _tmp11_;
+	GtkCellRendererText* _tmp12_;
+	GtkComboBox* _tmp13_;
+	GtkCellRendererPixbuf* _tmp14_;
+	GtkComboBox* _tmp15_;
+	GtkCellRendererText* _tmp16_;
+	GtkListStore* combo_store = NULL;
+	GtkListStore* _tmp17_;
+	GtkTreeIter iter = {0};
+	gint current_app = 0;
+	GtkComboBox* _tmp67_;
+	GtkListStore* _tmp68_;
+	gint _tmp69_;
+	GError * _inner_error_ = NULL;
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (current_app_executable != NULL);
+#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = mime_types;
+#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0__length1 = mime_types_length1;
+#line 196 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
+#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = mime_types;
+#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1__length1 = mime_types_length1;
+#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
+#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_vala_external_apps);
+#line 197 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_vala_external_apps = _tmp2_;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _vala_external_apps;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 199 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp5_ == 0) {
+#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (external_apps) {
+#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			*external_apps = _vala_external_apps;
+#line 1188 "Preferences.c"
+		} else {
+#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_g_object_unref0 (_vala_external_apps);
+#line 1192 "Preferences.c"
+		}
+#line 200 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return;
+#line 1196 "Preferences.c"
+	}
+#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_object_ref_sink (_tmp6_);
+#line 203 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	pixbuf_renderer = _tmp6_;
+#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_object_ref_sink (_tmp7_);
+#line 204 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	text_renderer = _tmp7_;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp8_ = combo_box;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
+#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp9_ = combo_box;
+#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp10_ = pixbuf_renderer;
+#line 206 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
+#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp11_ = combo_box;
+#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = text_renderer;
+#line 207 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
+#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp13_ = combo_box;
+#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = pixbuf_renderer;
+#line 208 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = combo_box;
+#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = text_renderer;
+#line 209 "/home/jens/Source/shotwell/src/dialogs/Preferences.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 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+#line 212 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	combo_store = _tmp17_;
+#line 215 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	current_app = -1;
+#line 1244 "Preferences.c"
+	{
+		GeeIterator* _app_it = NULL;
+		SortedList* _tmp18_;
+		GeeIterator* _tmp19_;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp18_ = _vala_external_apps;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_app_it = _tmp19_;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		while (TRUE) {
+#line 1257 "Preferences.c"
+			GeeIterator* _tmp20_;
+			gboolean _tmp21_;
+			GAppInfo* app = NULL;
+			GeeIterator* _tmp22_;
+			gpointer _tmp23_;
+			GtkListStore* _tmp24_;
+			GtkTreeIter _tmp25_ = {0};
+			GIcon* app_icon = NULL;
+			GAppInfo* _tmp26_;
+			GIcon* _tmp27_;
+			GIcon* _tmp28_;
+			GtkListStore* _tmp56_;
+			GtkTreeIter _tmp57_;
+			GAppInfo* _tmp58_;
+			const gchar* _tmp59_;
+			GValue _tmp60_ = {0};
+			GAppInfo* _tmp61_;
+			const gchar* _tmp62_;
+			const gchar* _tmp63_;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp20_ = _app_it;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp21_ = gee_iterator_next (_tmp20_);
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			if (!_tmp21_) {
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				break;
+#line 1285 "Preferences.c"
+			}
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp22_ = _app_it;
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp23_ = gee_iterator_get (_tmp22_);
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			app = (GAppInfo*) _tmp23_;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp24_ = combo_store;
+#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			gtk_list_store_append (_tmp24_, &_tmp25_);
+#line 218 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			iter = _tmp25_;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp26_ = app;
+#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp27_ = g_app_info_get_icon (_tmp26_);
+#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp28_ = _g_object_ref0 (_tmp27_);
+#line 220 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			app_icon = _tmp28_;
+#line 1307 "Preferences.c"
+			{
+				GIcon* _tmp29_;
+#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp29_ = app_icon;
+#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
+#line 1314 "Preferences.c"
+					GdkPixbuf* _tmp30_ = NULL;
+					GIcon* _tmp31_;
+					GFile* _tmp32_;
+					gchar* _tmp33_;
+					gchar* _tmp34_;
+					GdkPixbuf* _tmp35_;
+					GdkPixbuf* _tmp36_;
+					GtkListStore* _tmp37_;
+					GtkTreeIter _tmp38_;
+					GdkPixbuf* _tmp39_;
+					GValue _tmp40_ = {0};
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp31_ = app_icon;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp33_ = g_file_get_path (_tmp32_);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp34_ = _tmp33_;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp36_ = _tmp35_;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_g_free0 (_tmp34_);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp30_ = _tmp36_;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1344 "Preferences.c"
+						goto __catch23_g_error;
+					}
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp37_ = combo_store;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp38_ = iter;
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					g_value_take_object (&_tmp40_, _tmp39_);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
+#line 223 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
+#line 222 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_g_object_unref0 (_tmp30_);
+#line 1363 "Preferences.c"
+				} else {
+					GIcon* _tmp41_;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp41_ = app_icon;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
+#line 1370 "Preferences.c"
+						GdkPixbuf* icon_pixbuf = NULL;
+						GtkIconTheme* _tmp42_;
+						GIcon* _tmp43_;
+						gchar** _tmp44_;
+						gchar** _tmp45_;
+						const gchar* _tmp46_;
+						GdkPixbuf* _tmp47_;
+						GtkListStore* _tmp48_;
+						GtkTreeIter _tmp49_;
+						GdkPixbuf* _tmp50_;
+						GValue _tmp51_ = {0};
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp42_ = gtk_icon_theme_get_default ();
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp43_ = app_icon;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp46_ = _tmp45_[0];
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						icon_pixbuf = _tmp47_;
+#line 227 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1396 "Preferences.c"
+							goto __catch23_g_error;
+						}
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp48_ = combo_store;
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp49_ = iter;
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_tmp50_ = icon_pixbuf;
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						g_value_set_object (&_tmp51_, _tmp50_);
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
+#line 231 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
+#line 226 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+						_g_object_unref0 (icon_pixbuf);
+#line 1415 "Preferences.c"
+					}
+				}
+			}
+			goto __finally23;
+			__catch23_g_error:
+			{
+				GError* _error_ = NULL;
+				GError* _tmp52_;
+				const gchar* _tmp53_;
+				gchar* _tmp54_;
+				gchar* _tmp55_;
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_error_ = _inner_error_;
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_inner_error_ = NULL;
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp52_ = _error_;
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp53_ = _tmp52_->message;
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp55_ = _tmp54_;
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				g_warning ("Preferences.vala:234: %s", _tmp55_);
+#line 234 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_free0 (_tmp55_);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_error_free0 (_error_);
+#line 1445 "Preferences.c"
+			}
+			__finally23:
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (app_icon);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (app);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (_app_it);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (combo_store);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (text_renderer);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_g_object_unref0 (pixbuf_renderer);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				g_clear_error (&_inner_error_);
+#line 221 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				return;
+#line 1468 "Preferences.c"
+			}
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp56_ = combo_store;
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp57_ = iter;
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp58_ = app;
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp59_ = g_app_info_get_name (_tmp58_);
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			g_value_init (&_tmp60_, G_TYPE_STRING);
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			g_value_set_string (&_tmp60_, _tmp59_);
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
+#line 237 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
+#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp61_ = app;
+#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp62_ = g_app_info_get_commandline (_tmp61_);
+#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp63_ = current_app_executable;
+#line 239 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
+#line 1494 "Preferences.c"
+				SortedList* _tmp64_;
+				GAppInfo* _tmp65_;
+				gint _tmp66_;
+#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp64_ = _vala_external_apps;
+#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp65_ = app;
+#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
+#line 240 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				current_app = _tmp66_;
+#line 1506 "Preferences.c"
+			}
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_g_object_unref0 (app_icon);
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_g_object_unref0 (app);
+#line 1512 "Preferences.c"
+		}
+#line 217 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_app_it);
+#line 1516 "Preferences.c"
+	}
+#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp67_ = combo_box;
+#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp68_ = combo_store;
+#line 245 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+#line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp69_ = current_app;
+#line 247 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp69_ != -1) {
+#line 1528 "Preferences.c"
+		GtkComboBox* _tmp70_;
+		gint _tmp71_;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp70_ = combo_box;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp71_ = current_app;
+#line 248 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_combo_box_set_active (_tmp70_, _tmp71_);
+#line 1537 "Preferences.c"
+	}
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (combo_store);
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (text_renderer);
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (pixbuf_renderer);
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (external_apps) {
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		*external_apps = _vala_external_apps;
+#line 1549 "Preferences.c"
+	} else {
+#line 193 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_vala_external_apps);
+#line 1553 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkComboBox* combo_box, GtkEntry* entry) {
+	gchar* pattern = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean found = FALSE;
+	const gchar* _tmp4_;
+	gboolean _tmp32_;
+#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (GTK_IS_ENTRY (entry));
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = _tmp0_;
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_;
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp1_);
+#line 252 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	pattern = _tmp3_;
+#line 253 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	found = FALSE;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = pattern;
+#line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (NULL != _tmp4_) {
+#line 1591 "Preferences.c"
+		gint i = 0;
+#line 256 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		i = 0;
+#line 1595 "Preferences.c"
+		{
+			GeeArrayList* _pf_list = NULL;
+			GeeArrayList* _tmp5_;
+			GeeArrayList* _tmp6_;
+			gint _pf_size = 0;
+			GeeArrayList* _tmp7_;
+			gint _tmp8_;
+			gint _tmp9_;
+			gint _pf_index = 0;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp5_ = self->priv->path_formats;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_pf_list = _tmp6_;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp7_ = _pf_list;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp9_ = _tmp8_;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_pf_size = _tmp9_;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_pf_index = -1;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			while (TRUE) {
+#line 1623 "Preferences.c"
+				gint _tmp10_;
+				gint _tmp11_;
+				gint _tmp12_;
+				PreferencesDialogPathFormat* pf = NULL;
+				GeeArrayList* _tmp13_;
+				gint _tmp14_;
+				gpointer _tmp15_;
+				PreferencesDialogPathFormat* _tmp16_;
+				const gchar* _tmp17_;
+				const gchar* _tmp18_;
+				gint _tmp21_;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp10_ = _pf_index;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_pf_index = _tmp10_ + 1;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp11_ = _pf_index;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp12_ = _pf_size;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				if (!(_tmp11_ < _tmp12_)) {
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					break;
+#line 1647 "Preferences.c"
+				}
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp13_ = _pf_list;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp14_ = _pf_index;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				pf = (PreferencesDialogPathFormat*) _tmp15_;
+#line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp16_ = pf;
+#line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp17_ = _tmp16_->pattern;
+#line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp18_ = pattern;
+#line 258 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
+#line 1665 "Preferences.c"
+					GtkComboBox* _tmp19_;
+					gint _tmp20_;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp19_ = combo_box;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_tmp20_ = i;
+#line 259 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					gtk_combo_box_set_active (_tmp19_, _tmp20_);
+#line 260 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					found = TRUE;
+#line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					_preferences_dialog_path_format_unref0 (pf);
+#line 261 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+					break;
+#line 1680 "Preferences.c"
+				}
+#line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_tmp21_ = i;
+#line 263 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				i = _tmp21_ + 1;
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+				_preferences_dialog_path_format_unref0 (pf);
+#line 1688 "Preferences.c"
+			}
+#line 257 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_g_object_unref0 (_pf_list);
+#line 1692 "Preferences.c"
+		}
+	} else {
+		gchar* s = NULL;
+		ConfigFacade* _tmp22_;
+		ConfigFacade* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gboolean _tmp27_;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp22_ = config_facade_get_instance ();
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp23_ = _tmp22_;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp25_ = _tmp24_;
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp23_);
+#line 267 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		s = _tmp25_;
+#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp26_ = s;
+#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp27_ = is_string_empty (_tmp26_);
+#line 268 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (!_tmp27_) {
+#line 1720 "Preferences.c"
+			GtkComboBox* _tmp28_;
+			GeeArrayList* _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp28_ = combo_box;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp29_ = self->priv->path_formats;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp31_ = _tmp30_;
+#line 269 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
+#line 270 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			found = TRUE;
+#line 1737 "Preferences.c"
+		}
+#line 254 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (s);
+#line 1741 "Preferences.c"
+	}
+#line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp32_ = found;
+#line 274 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (!_tmp32_) {
+#line 1747 "Preferences.c"
+		GtkComboBox* _tmp33_;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp33_ = combo_box;
+#line 275 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_combo_box_set_active (_tmp33_, 0);
+#line 1753 "Preferences.c"
+	}
+#line 278 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_dir_pattern_combo_changed (self);
+#line 251 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (pattern);
+#line 1759 "Preferences.c"
+}
+
+
+void preferences_dialog_show_preferences (void) {
+	PreferencesDialog* _tmp0_;
+	PreferencesDialog* _tmp2_;
+	PreferencesDialog* _tmp3_;
+	PreferencesDialog* _tmp4_;
+	GtkFileChooserButton* _tmp5_;
+	GFile* _tmp6_;
+	GFile* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	PreferencesDialog* _tmp10_;
+#line 282 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = preferences_dialog_preferences_dialog;
+#line 282 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp0_ == NULL) {
+#line 1778 "Preferences.c"
+		PreferencesDialog* _tmp1_;
+#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp1_ = preferences_dialog_new ();
+#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_object_ref_sink (_tmp1_);
+#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (preferences_dialog_preferences_dialog);
+#line 283 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_preferences_dialog = _tmp1_;
+#line 1788 "Preferences.c"
+	}
+#line 285 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = preferences_dialog_preferences_dialog;
+#line 285 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_populate_preference_options (_tmp2_);
+#line 286 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = preferences_dialog_preferences_dialog;
+#line 286 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = preferences_dialog_preferences_dialog;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_->priv->library_dir_button;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = app_dirs_get_import_dir ();
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = _tmp6_;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp8_ = g_file_get_path (_tmp7_);
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp9_ = _tmp8_;
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp9_);
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp9_);
+#line 287 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp7_);
+#line 291 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp10_ = preferences_dialog_preferences_dialog;
+#line 291 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow));
+#line 1820 "Preferences.c"
+}
+
+
+static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	ConfigFacade* _tmp2_;
+	ConfigFacade* _tmp3_;
+	GtkCheckButton* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	ConfigFacade* _tmp7_;
+	ConfigFacade* _tmp8_;
+	GtkCheckButton* _tmp9_;
+	gboolean _tmp10_;
+	gboolean _tmp11_;
+	const gchar* _tmp12_;
+	PreferencesDialogPathFormat* pf = NULL;
+	GeeArrayList* _tmp14_;
+	GtkComboBoxText* _tmp15_;
+	gint _tmp16_;
+	gpointer _tmp17_;
+	PreferencesDialogPathFormat* _tmp18_;
+	const gchar* _tmp19_;
+#line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = _tmp0_;
+#line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	config_facade_commit_bg_color (_tmp1_);
+#line 297 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp1_);
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = config_facade_get_instance ();
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = self->priv->autoimport;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = _tmp5_;
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
+#line 298 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp3_);
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = config_facade_get_instance ();
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp8_ = _tmp7_;
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp9_ = self->priv->write_metadata;
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp11_ = _tmp10_;
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_);
+#line 299 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp8_);
+#line 301 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = self->priv->lib_dir;
+#line 301 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp12_ != NULL) {
+#line 1887 "Preferences.c"
+		const gchar* _tmp13_;
+#line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp13_ = self->priv->lib_dir;
+#line 302 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		app_dirs_set_import_dir (_tmp13_);
+#line 1893 "Preferences.c"
+	}
+#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = self->priv->path_formats;
+#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = self->priv->dir_pattern_combo;
+#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox));
+#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp16_);
+#line 304 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	pf = (PreferencesDialogPathFormat*) _tmp17_;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp18_ = pf;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp19_ = _tmp18_->pattern;
+#line 305 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (NULL == _tmp19_) {
+#line 1911 "Preferences.c"
+		ConfigFacade* _tmp20_;
+		ConfigFacade* _tmp21_;
+		GtkEntry* _tmp22_;
+		const gchar* _tmp23_;
+		const gchar* _tmp24_;
+		ConfigFacade* _tmp25_;
+		ConfigFacade* _tmp26_;
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp20_ = config_facade_get_instance ();
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp21_ = _tmp20_;
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp22_ = self->priv->dir_pattern_entry;
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp23_ = gtk_entry_get_text (_tmp22_);
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp24_ = _tmp23_;
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp24_);
+#line 306 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp21_);
+#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp25_ = config_facade_get_instance ();
+#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp26_ = _tmp25_;
+#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
+#line 307 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp26_);
+#line 1941 "Preferences.c"
+	} else {
+		ConfigFacade* _tmp27_;
+		ConfigFacade* _tmp28_;
+		PreferencesDialogPathFormat* _tmp29_;
+		const gchar* _tmp30_;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp27_ = config_facade_get_instance ();
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp28_ = _tmp27_;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp29_ = pf;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp30_ = _tmp29_->pattern;
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp30_);
+#line 309 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp28_);
+#line 1959 "Preferences.c"
+	}
+#line 296 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_preferences_dialog_path_format_unref0 (pf);
+#line 1963 "Preferences.c"
+}
+
+
+static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+#line 313 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
+#line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = preferences_dialog_get_allow_closing (self);
+#line 314 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (!_tmp0_) {
+#line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		result = TRUE;
+#line 315 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return result;
+#line 1981 "Preferences.c"
+	}
+#line 317 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_commit_on_close (self);
+#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = _tmp1_;
+#line 318 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 1991 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_close (PreferencesDialog* self) {
+	gboolean _tmp0_;
+#line 321 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = preferences_dialog_get_allow_closing (self);
+#line 322 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (!_tmp0_) {
+#line 323 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return;
+#line 2005 "Preferences.c"
+	}
+#line 325 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 326 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_commit_on_close (self);
+#line 2011 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
+	GtkAdjustment* _tmp0_;
+	gdouble _tmp1_;
+	GtkAdjustment* _tmp2_;
+	gdouble _tmp3_;
+#line 329 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->bg_color_adjustment;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
+#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = self->priv->bg_color_adjustment;
+#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
+#line 330 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
+#line 2032 "Preferences.c"
+}
+
+
+static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, GdkEventButton* event) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	GdkEventButton* _tmp2_;
+	guint _tmp3_;
+#line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
+#line 334 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = event;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_->button;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp3_ == ((guint) 1)) {
+#line 2052 "Preferences.c"
+		GdkEventButton* _tmp4_;
+		GdkEventType _tmp5_;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp4_ = event;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp5_ = _tmp4_->type;
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
+#line 2061 "Preferences.c"
+	} else {
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp1_ = FALSE;
+#line 2065 "Preferences.c"
+	}
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp1_) {
+#line 2069 "Preferences.c"
+		GdkEventButton* _tmp6_;
+		GdkModifierType _tmp7_;
+		gboolean _tmp8_;
+#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp6_ = event;
+#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp7_ = _tmp6_->state;
+#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
+#line 336 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = _tmp8_;
+#line 2081 "Preferences.c"
+	} else {
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = FALSE;
+#line 2085 "Preferences.c"
+	}
+#line 335 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp0_) {
+#line 2089 "Preferences.c"
+		GtkScale* _tmp9_;
+		GtkAdjustment* _tmp10_;
+		gdouble _tmp11_;
+		GdkRGBA _tmp12_ = {0};
+		gdouble _tmp13_;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp9_ = self->priv->bg_color_slider;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp10_ = self->priv->bg_color_adjustment;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp13_ = _tmp12_.red;
+#line 338 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
+#line 340 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_on_value_changed (self);
+#line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		result = TRUE;
+#line 342 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return result;
+#line 2113 "Preferences.c"
+	}
+#line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = FALSE;
+#line 345 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 2119 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog* self) {
+	PreferencesDialogPathFormat* pf = NULL;
+	GeeArrayList* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
+	gpointer _tmp3_;
+	PreferencesDialogPathFormat* _tmp4_;
+	const gchar* _tmp5_;
+#line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->path_formats;
+#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = self->priv->dir_pattern_combo;
+#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
+#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
+#line 349 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	pf = (PreferencesDialogPathFormat*) _tmp3_;
+#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = pf;
+#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_->pattern;
+#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (NULL == _tmp5_) {
+#line 2149 "Preferences.c"
+		gchar* dir_pattern = NULL;
+		ConfigFacade* _tmp6_;
+		ConfigFacade* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		const gchar* _tmp10_;
+		gboolean _tmp11_;
+		GtkEntry* _tmp13_;
+		const gchar* _tmp14_;
+		GtkEntry* _tmp15_;
+		GtkEntry* _tmp16_;
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp6_ = config_facade_get_instance ();
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp7_ = _tmp6_;
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp9_ = _tmp8_;
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_object_unref0 (_tmp7_);
+#line 352 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		dir_pattern = _tmp9_;
+#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp10_ = dir_pattern;
+#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp11_ = is_string_empty (_tmp10_);
+#line 353 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (_tmp11_) {
+#line 2179 "Preferences.c"
+			gchar* _tmp12_;
+#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_tmp12_ = g_strdup ("");
+#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			_g_free0 (dir_pattern);
+#line 354 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			dir_pattern = _tmp12_;
+#line 2187 "Preferences.c"
+		}
+#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp13_ = self->priv->dir_pattern_entry;
+#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp14_ = dir_pattern;
+#line 355 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_entry_set_text (_tmp13_, _tmp14_);
+#line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp15_ = self->priv->dir_pattern_entry;
+#line 356 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_object_set (_tmp15_, "editable", TRUE, NULL);
+#line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp16_ = self->priv->dir_pattern_entry;
+#line 357 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 350 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_g_free0 (dir_pattern);
+#line 2205 "Preferences.c"
+	} else {
+		GtkEntry* _tmp17_;
+		PreferencesDialogPathFormat* _tmp18_;
+		const gchar* _tmp19_;
+		GtkEntry* _tmp20_;
+		GtkEntry* _tmp21_;
+#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp17_ = self->priv->dir_pattern_entry;
+#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp18_ = pf;
+#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp19_ = _tmp18_->pattern;
+#line 359 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_entry_set_text (_tmp17_, _tmp19_);
+#line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp20_ = self->priv->dir_pattern_entry;
+#line 360 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_object_set (_tmp20_, "editable", FALSE, NULL);
+#line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp21_ = self->priv->dir_pattern_entry;
+#line 361 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 2228 "Preferences.c"
+	}
+#line 348 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_preferences_dialog_path_format_unref0 (pf);
+#line 2232 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog* self) {
+	gchar* example = NULL;
+	GDateTime* _tmp0_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp6_;
+	gboolean _tmp7_;
+#line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->example_date;
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = self->priv->dir_pattern_entry;
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = gtk_entry_get_text (_tmp1_);
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = _tmp2_;
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
+#line 366 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	example = _tmp4_;
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp6_ = example;
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp7_ = is_string_empty (_tmp6_);
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp7_) {
+#line 2266 "Preferences.c"
+		GtkEntry* _tmp8_;
+		const gchar* _tmp9_;
+		const gchar* _tmp10_;
+		gboolean _tmp11_;
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp8_ = self->priv->dir_pattern_entry;
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp9_ = gtk_entry_get_text (_tmp8_);
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp10_ = _tmp9_;
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp11_ = is_string_empty (_tmp10_);
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp5_ = !_tmp11_;
+#line 2281 "Preferences.c"
+	} else {
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp5_ = FALSE;
+#line 2285 "Preferences.c"
+	}
+#line 367 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp5_) {
+#line 2289 "Preferences.c"
+		GtkLabel* _tmp12_;
+		GtkEntry* _tmp13_;
+		GtkEntry* _tmp14_;
+#line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp12_ = self->priv->dir_pattern_example;
+#line 369 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_label_set_text (_tmp12_, _ ("Invalid pattern"));
+#line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp13_ = self->priv->dir_pattern_entry;
+#line 370 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_entry_set_icon_from_icon_name (_tmp13_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
+#line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp14_ = self->priv->dir_pattern_entry;
+#line 371 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_entry_set_icon_activatable (_tmp14_, GTK_ENTRY_ICON_SECONDARY, FALSE);
+#line 372 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_set_allow_closing (self, FALSE);
+#line 2307 "Preferences.c"
+	} else {
+		GtkLabel* _tmp15_;
+		const gchar* _tmp16_;
+		GtkEntry* _tmp17_;
+#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp15_ = self->priv->dir_pattern_example;
+#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp16_ = example;
+#line 375 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_label_set_text (_tmp15_, _tmp16_);
+#line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp17_ = self->priv->dir_pattern_entry;
+#line 376 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_entry_set_icon_from_icon_name (_tmp17_, GTK_ENTRY_ICON_SECONDARY, NULL);
+#line 377 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_set_allow_closing (self, TRUE);
+#line 2324 "Preferences.c"
+	}
+#line 365 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (example);
+#line 2328 "Preferences.c"
+}
+
+
+static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gboolean allow) {
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+#line 381 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = allow;
+#line 382 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+#line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = allow;
+#line 383 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->allow_closing = _tmp1_;
+#line 2345 "Preferences.c"
+}
+
+
+static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+#line 386 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
+#line 387 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->allow_closing;
+#line 387 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = _tmp0_;
+#line 387 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 2360 "Preferences.c"
+}
+
+
+static void preferences_dialog_set_background_color (PreferencesDialog* self, gdouble bg_color_value) {
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gdouble _tmp2_;
+	GdkRGBA _tmp3_ = {0};
+#line 390 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = _tmp0_;
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = bg_color_value;
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	config_facade_set_bg_color (_tmp1_, &_tmp3_);
+#line 391 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp1_);
+#line 2383 "Preferences.c"
+}
+
+
+static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble color_value, GdkRGBA* result) {
+	GdkRGBA color = {0};
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+#line 394 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 395 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	memset (&color, 0, sizeof (GdkRGBA));
+#line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = color_value;
+#line 397 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	color.red = _tmp0_;
+#line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = color_value;
+#line 398 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	color.green = _tmp1_;
+#line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = color_value;
+#line 399 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	color.blue = _tmp2_;
+#line 400 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	color.alpha = 1.0;
+#line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	*result = color;
+#line 402 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return;
+#line 2414 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self) {
+	gint _tmp0_ = 0;
+	GtkComboBox* _tmp1_;
+	gint _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint photo_app_choice_index = 0;
+	GAppInfo* app = NULL;
+	SortedList* _tmp11_;
+	gpointer _tmp12_;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
+#line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = self->priv->photo_editor_combo;
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = self->priv->external_photo_apps;
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp2_ < _tmp5_) {
+#line 2449 "Preferences.c"
+		GtkComboBox* _tmp6_;
+		gint _tmp7_;
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp6_ = self->priv->photo_editor_combo;
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = _tmp7_;
+#line 2458 "Preferences.c"
+	} else {
+		SortedList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp8_ = self->priv->external_photo_apps;
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp10_ = _tmp9_;
+#line 407 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = _tmp10_;
+#line 2471 "Preferences.c"
+	}
+#line 406 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	photo_app_choice_index = _tmp0_;
+#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp11_ = self->priv->external_photo_apps;
+#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
+#line 409 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	app = (GAppInfo*) _tmp12_;
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp13_ = config_facade_get_instance ();
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = _tmp13_;
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = desktop_integration_get_app_open_command (app);
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = _tmp15_;
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp16_);
+#line 411 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp14_);
+#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp17_ = desktop_integration_get_app_open_command (app);
+#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp18_ = _tmp17_;
+#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_debug ("Preferences.vala:413: setting external photo editor to: %s", _tmp18_);
+#line 413 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (_tmp18_);
+#line 405 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (app);
+#line 2505 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
+	gint _tmp0_ = 0;
+	GtkComboBox* _tmp1_;
+	gint _tmp2_;
+	SortedList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint raw_app_choice_index = 0;
+	GAppInfo* app = NULL;
+	SortedList* _tmp11_;
+	gpointer _tmp12_;
+	ConfigFacade* _tmp13_;
+	ConfigFacade* _tmp14_;
+	const gchar* _tmp15_;
+	const gchar* _tmp16_;
+#line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = self->priv->raw_editor_combo;
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = self->priv->external_raw_apps;
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = _tmp4_;
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp2_ < _tmp5_) {
+#line 2538 "Preferences.c"
+		GtkComboBox* _tmp6_;
+		gint _tmp7_;
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp6_ = self->priv->raw_editor_combo;
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = _tmp7_;
+#line 2547 "Preferences.c"
+	} else {
+		SortedList* _tmp8_;
+		gint _tmp9_;
+		gint _tmp10_;
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp8_ = self->priv->external_raw_apps;
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp10_ = _tmp9_;
+#line 418 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp0_ = _tmp10_;
+#line 2560 "Preferences.c"
+	}
+#line 417 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	raw_app_choice_index = _tmp0_;
+#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp11_ = self->priv->external_raw_apps;
+#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
+#line 420 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	app = (GAppInfo*) _tmp12_;
+#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp13_ = config_facade_get_instance ();
+#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp14_ = _tmp13_;
+#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp15_ = g_app_info_get_commandline (app);
+#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
+#line 422 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp14_);
+#line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp16_ = g_app_info_get_commandline (app);
+#line 424 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_debug ("Preferences.vala:424: setting external raw editor to: %s", _tmp16_);
+#line 416 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (app);
+#line 2586 "Preferences.c"
+}
+
+
+static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDialog* self) {
+	RawDeveloper result = 0;
+	GtkComboBoxText* _tmp0_;
+	gint _tmp1_;
+#line 427 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
+#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->default_raw_developer_combo;
+#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 428 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp1_ == 0) {
+#line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		result = RAW_DEVELOPER_CAMERA;
+#line 429 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return result;
+#line 2606 "Preferences.c"
+	}
+#line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = RAW_DEVELOPER_SHOTWELL;
+#line 430 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 2612 "Preferences.c"
+}
+
+
+static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
+	RawDeveloper _tmp0_;
+#line 433 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = d;
+#line 434 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
+#line 2624 "Preferences.c"
+		GtkComboBoxText* _tmp1_;
+#line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp1_ = self->priv->default_raw_developer_combo;
+#line 435 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 2630 "Preferences.c"
+	} else {
+		GtkComboBoxText* _tmp2_;
+#line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		_tmp2_ = self->priv->default_raw_developer_combo;
+#line 437 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
+#line 2637 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_on_default_raw_developer_changed (PreferencesDialog* self) {
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	RawDeveloper _tmp2_;
+#line 440 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = _tmp0_;
+#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
+#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
+#line 441 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp1_);
+#line 2658 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
+	GtkFileChooserButton* _tmp0_;
+	gchar* _tmp1_;
+#line 444 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = self->priv->library_dir_button;
+#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->priv->lib_dir);
+#line 445 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->lib_dir = _tmp1_;
+#line 2675 "Preferences.c"
+}
+
+
+static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
+#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
+#line 2682 "Preferences.c"
+}
+
+
+static gboolean preferences_dialog_real_map_event (GtkWidget* base, GdkEventAny* event) {
+	PreferencesDialog * self;
+	gboolean result = FALSE;
+	gboolean _result_ = FALSE;
+	GdkEventAny* _tmp0_;
+	gboolean _tmp1_;
+	GtkFileChooserButton* _tmp2_;
+#line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
+#line 448 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = event;
+#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = GTK_WIDGET_CLASS (preferences_dialog_parent_class)->map_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 449 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_result_ = _tmp1_;
+#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = self->priv->library_dir_button;
+#line 454 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self, 0);
+#line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	result = _result_;
+#line 456 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return result;
+#line 2711 "Preferences.c"
+}
+
+
+static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, const gchar* name, const gchar* pattern) {
+	PreferencesDialogPathFormat* pf = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	PreferencesDialogPathFormat* _tmp2_;
+	GeeArrayList* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	const gchar* _tmp5_;
+#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (name != NULL);
+#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = name;
+#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = pattern;
+#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
+#line 460 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	pf = _tmp2_;
+#line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = self->priv->path_formats;
+#line 461 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
+#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp4_ = self->priv->dir_pattern_combo;
+#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp5_ = name;
+#line 462 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
+#line 459 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_preferences_dialog_path_format_unref0 (pf);
+#line 2747 "Preferences.c"
+}
+
+
+static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	GtkCheckButton* _tmp2_;
+	gboolean _tmp3_;
+#line 465 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = _tmp0_;
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = self->priv->lowercase;
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
+#line 466 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (_tmp1_);
+#line 2770 "Preferences.c"
+}
+
+
+static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GType object_type, const gchar* name, const gchar* pattern) {
+	PreferencesDialogPathFormat* self = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
+#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = name;
+#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->name);
+#line 12 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->name = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = pattern;
+#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->pattern);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->pattern = _tmp3_;
+#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return self;
+#line 2802 "Preferences.c"
+}
+
+
+static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
+#line 11 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
+#line 2809 "Preferences.c"
+}
+
+
+static void preferences_dialog_value_path_format_init (GValue* value) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	value->data[0].v_pointer = NULL;
+#line 2816 "Preferences.c"
+}
+
+
+static void preferences_dialog_value_path_format_free_value (GValue* value) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (value->data[0].v_pointer) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_path_format_unref (value->data[0].v_pointer);
+#line 2825 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (src_value->data[0].v_pointer) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
+#line 2835 "Preferences.c"
+	} else {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 2839 "Preferences.c"
+	}
+}
+
+
+static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return value->data[0].v_pointer;
+#line 2847 "Preferences.c"
+}
+
+
+static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (collect_values[0].v_pointer) {
+#line 2854 "Preferences.c"
+		PreferencesDialogPathFormat * object;
+		object = collect_values[0].v_pointer;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 2861 "Preferences.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.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 2865 "Preferences.c"
+		}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
+#line 2869 "Preferences.c"
+	} else {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = NULL;
+#line 2873 "Preferences.c"
+	}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return NULL;
+#line 2877 "Preferences.c"
+}
+
+
+static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	PreferencesDialogPathFormat ** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (!object_p) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 2888 "Preferences.c"
+	}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (!value->data[0].v_pointer) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		*object_p = NULL;
+#line 2894 "Preferences.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		*object_p = value->data[0].v_pointer;
+#line 2898 "Preferences.c"
+	} else {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
+#line 2902 "Preferences.c"
+	}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return NULL;
+#line 2906 "Preferences.c"
+}
+
+
+static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	PreferencesDialogParamSpecPathFormat* spec;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return G_PARAM_SPEC (spec);
+#line 2920 "Preferences.c"
+}
+
+
+static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return value->data[0].v_pointer;
+#line 2929 "Preferences.c"
+}
+
+
+static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
+	PreferencesDialogPathFormat * old;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	old = value->data[0].v_pointer;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (v_object) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = v_object;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_path_format_ref (value->data[0].v_pointer);
+#line 2949 "Preferences.c"
+	} else {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = NULL;
+#line 2953 "Preferences.c"
+	}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (old) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_path_format_unref (old);
+#line 2959 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
+	PreferencesDialogPathFormat * old;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	old = value->data[0].v_pointer;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (v_object) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = v_object;
+#line 2978 "Preferences.c"
+	} else {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		value->data[0].v_pointer = NULL;
+#line 2982 "Preferences.c"
+	}
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (old) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		preferences_dialog_path_format_unref (old);
+#line 2988 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
+#line 2998 "Preferences.c"
+}
+
+
+static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->ref_count = 1;
+#line 3005 "Preferences.c"
+}
+
+
+static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat * obj) {
+	PreferencesDialogPathFormat * self;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_signal_handlers_destroy (self);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->name);
+#line 16 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->pattern);
+#line 3019 "Preferences.c"
+}
+
+
+static GType preferences_dialog_path_format_get_type (void) {
+	static volatile gsize preferences_dialog_path_format_type_id__volatile = 0;
+	if (g_once_init_enter (&preferences_dialog_path_format_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { preferences_dialog_value_path_format_init, preferences_dialog_value_path_format_free_value, preferences_dialog_value_path_format_copy_value, preferences_dialog_value_path_format_peek_pointer, "p", preferences_dialog_value_path_format_collect_value, "p", preferences_dialog_value_path_format_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogPathFormatClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_path_format_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialogPathFormat), 0, (GInstanceInitFunc) preferences_dialog_path_format_instance_init, &g_define_type_value_table };
+		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		GType preferences_dialog_path_format_type_id;
+		preferences_dialog_path_format_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PreferencesDialogPathFormat", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&preferences_dialog_path_format_type_id__volatile, preferences_dialog_path_format_type_id);
+	}
+	return preferences_dialog_path_format_type_id__volatile;
+}
+
+
+static gpointer preferences_dialog_path_format_ref (gpointer instance) {
+	PreferencesDialogPathFormat * self;
+	self = instance;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	return instance;
+#line 3044 "Preferences.c"
+}
+
+
+static void preferences_dialog_path_format_unref (gpointer instance) {
+	PreferencesDialogPathFormat * self;
+	self = instance;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 3057 "Preferences.c"
+	}
+}
+
+
+static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
+	gint PreferencesDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	((GtkWidgetClass *) klass)->map_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) preferences_dialog_real_map_event;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	G_OBJECT_CLASS (klass)->finalize = preferences_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	PreferencesDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/preferences_dialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "bg_color_adjustment", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, bg_color_adjustment));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "bg_color_slider", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, bg_color_slider));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_editor_combo", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, photo_editor_combo));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "raw_editor_combo", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, raw_editor_combo));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "library_dir_button", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, library_dir_button));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "dir_pattern_combo", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, dir_pattern_combo));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "dir_pattern_entry", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, dir_pattern_entry));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "dir_pattern_example", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, dir_pattern_example));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "lowercase", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, lowercase));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "default_raw_developer_combo", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, default_raw_developer_combo));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "autoimport", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, autoimport));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "write_metadata", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, write_metadata));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "pattern_help", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, pattern_help));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "preferences_notebook", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, preferences_notebook));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_checker_radio", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_checker_radio));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_solid_radio", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_solid_radio));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_solid_color", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_solid_color));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "transparent_none_radio", FALSE, PreferencesDialog_private_offset + G_STRUCT_OFFSET (PreferencesDialogPrivate, transparent_none_radio));
+#line 3112 "Preferences.c"
+}
+
+
+static void preferences_dialog_instance_init (PreferencesDialog * self) {
+	GeeArrayList* _tmp0_;
+	GDateTime* _tmp1_;
+	PluginsManifestWidgetMediator* _tmp2_;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->allow_closing = FALSE;
+#line 40 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->lib_dir = NULL;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, (GDestroyNotify) preferences_dialog_path_format_unref, NULL, NULL, NULL);
+#line 41 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->path_formats = _tmp0_;
+#line 42 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
+#line 42 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->example_date = _tmp1_;
+#line 45 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_tmp2_ = plugins_manifest_widget_mediator_new ();
+#line 45 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	g_object_ref_sink (_tmp2_);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self->priv->plugins_mediator = _tmp2_;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 3142 "Preferences.c"
+}
+
+
+static void preferences_dialog_finalize (GObject * obj) {
+	PreferencesDialog * self;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
+#line 22 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->bg_color_adjustment);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->bg_color_slider);
+#line 26 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->photo_editor_combo);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->raw_editor_combo);
+#line 29 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->external_raw_apps);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->external_photo_apps);
+#line 32 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->library_dir_button);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->dir_pattern_combo);
+#line 36 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->dir_pattern_entry);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->dir_pattern_example);
+#line 40 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_free0 (self->priv->lib_dir);
+#line 41 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->path_formats);
+#line 42 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_date_time_unref0 (self->priv->example_date);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->lowercase);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->plugins_mediator);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->default_raw_developer_combo);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->autoimport);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->write_metadata);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->pattern_help);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->preferences_notebook);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->transparent_checker_radio);
+#line 61 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->transparent_solid_radio);
+#line 63 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->transparent_solid_color);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	_g_object_unref0 (self->priv->transparent_none_radio);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/Preferences.vala"
+	G_OBJECT_CLASS (preferences_dialog_parent_class)->finalize (obj);
+#line 3200 "Preferences.c"
+}
+
+
+GType preferences_dialog_get_type (void) {
+	static volatile gsize preferences_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&preferences_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PreferencesDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) preferences_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PreferencesDialog), 0, (GInstanceInitFunc) preferences_dialog_instance_init, NULL };
+		GType preferences_dialog_type_id;
+		preferences_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "PreferencesDialog", &g_define_type_info, 0);
+		g_once_init_leave (&preferences_dialog_type_id__volatile, preferences_dialog_type_id);
+	}
+	return preferences_dialog_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
+
diff --git a/src/dialogs/Preferences.vala b/src/dialogs/Preferences.vala
new file mode 100644
index 0000000..0a18547
--- /dev/null
+++ b/src/dialogs/Preferences.vala
@@ -0,0 +1,468 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/preferences_dialog.ui")]
+public class PreferencesDialog : Gtk.Dialog {
+    private class PathFormat {
+        public PathFormat(string name, string? pattern) {
+            this.name = name;
+            this.pattern = pattern;
+        }
+        public string name;
+        public string? pattern;
+    }
+
+    private static PreferencesDialog preferences_dialog;
+
+    [GtkChild]
+    private Gtk.Adjustment bg_color_adjustment;
+    [GtkChild]
+    private Gtk.Scale bg_color_slider;
+    [GtkChild]
+    private Gtk.ComboBox photo_editor_combo;
+    [GtkChild]
+    private Gtk.ComboBox raw_editor_combo;
+    private SortedList<AppInfo> external_raw_apps;
+    private SortedList<AppInfo> external_photo_apps;
+    [GtkChild]
+    private Gtk.FileChooserButton library_dir_button;
+    [GtkChild]
+    private Gtk.ComboBoxText dir_pattern_combo;
+    [GtkChild]
+    private Gtk.Entry dir_pattern_entry;
+    [GtkChild]
+    private Gtk.Label dir_pattern_example;
+    private bool allow_closing = false;
+    private string? lib_dir = null;
+    private Gee.ArrayList<PathFormat> path_formats = new Gee.ArrayList<PathFormat>();
+    private GLib.DateTime example_date = new GLib.DateTime.local(2009, 3, 10, 18, 16, 11);
+    [GtkChild]
+    private Gtk.CheckButton lowercase;
+    private Plugins.ManifestWidgetMediator plugins_mediator = new Plugins.ManifestWidgetMediator();
+    [GtkChild]
+    private Gtk.ComboBoxText default_raw_developer_combo;
+
+    [GtkChild]
+    private Gtk.CheckButton autoimport;
+    [GtkChild]
+    private Gtk.CheckButton write_metadata;
+    [GtkChild]
+    private Gtk.Label pattern_help;
+    [GtkChild]
+    private Gtk.Notebook preferences_notebook;
+
+    [GtkChild]
+    private Gtk.RadioButton transparent_checker_radio;
+    [GtkChild]
+    private Gtk.RadioButton transparent_solid_radio;
+    [GtkChild]
+    private Gtk.ColorButton transparent_solid_color;
+    [GtkChild]
+    private Gtk.RadioButton transparent_none_radio;
+
+    private PreferencesDialog() {
+        Object (use_header_bar: Resources.use_header_bar());
+
+        set_parent_window(AppWindow.get_instance().get_parent_window());
+        set_transient_for(AppWindow.get_instance());
+        delete_event.connect(on_delete);
+        response.connect(on_close);
+
+        bg_color_adjustment.set_value(bg_color_adjustment.get_upper() -
+            (Config.Facade.get_instance().get_bg_color().red * 65535.0));
+        bg_color_adjustment.value_changed.connect(on_value_changed);
+
+        bg_color_slider.button_press_event.connect(on_bg_color_reset);
+
+        transparent_checker_radio.toggled.connect(on_radio_changed);
+        transparent_solid_radio.toggled.connect(on_radio_changed);
+        transparent_none_radio.toggled.connect(on_radio_changed);
+
+        transparent_solid_radio.bind_property("active",
+                                              transparent_solid_color,
+                                              "sensitive");
+
+        Gdk.RGBA color = Gdk.RGBA();
+        color.parse(Config.Facade.get_instance().get_transparent_background_color());
+        (transparent_solid_color as Gtk.ColorChooser).rgba = color;
+        transparent_solid_color.color_set.connect(on_color_changed);
+
+        switch (Config.Facade.get_instance().get_transparent_background_type()) {
+            case "checkered":
+                transparent_checker_radio.active = true;
+            break;
+            case "solid":
+                transparent_solid_radio.active = true;
+            break;
+            default:
+                transparent_none_radio.active = true;
+            break;
+        }
+
+        // Ticket #3162 - Move dir pattern blurb into Gnome help.
+        // Because specifying a particular snippet of the help requires
+        // us to know where its located, we can't hardcode a URL anymore;
+        // instead, we ask for the help path, and if we find it, we tell
+        // yelp to read from there, otherwise, we read from system-wide.
+        string help_path = Resources.get_help_path();
+
+        if (help_path == null) {
+            // We're installed system-wide, so use the system help.
+            pattern_help.set_markup("<a href=\"" + Resources.DIR_PATTERN_URI_SYSWIDE + "\">" + _("(Help)") + "</a>");
+        } else {
+            // 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.
+            pattern_help.set_markup("<a href=\"dummy:\">" + _("(Help)") + "</a>");
+            pattern_help.activate_link.connect(on_local_pattern_help);
+        }
+
+        add_to_dir_formats(_("Year%sMonth%sDay").printf(Path.DIR_SEPARATOR_S, Path.DIR_SEPARATOR_S),
+            "%Y" + Path.DIR_SEPARATOR_S + "%m" + Path.DIR_SEPARATOR_S + "%d");
+        add_to_dir_formats(_("Year%sMonth").printf(Path.DIR_SEPARATOR_S), "%Y" +
+            Path.DIR_SEPARATOR_S + "%m");
+        add_to_dir_formats(_("Year%sMonth-Day").printf(Path.DIR_SEPARATOR_S),
+            "%Y" + Path.DIR_SEPARATOR_S + "%m-%d");
+        add_to_dir_formats(_("Year-Month-Day"), "%Y-%m-%d");
+        add_to_dir_formats(_("Custom"), null); // Custom must always be last.
+        dir_pattern_combo.changed.connect(on_dir_pattern_combo_changed);
+        dir_pattern_entry.changed.connect(on_dir_pattern_entry_changed);
+
+        lowercase.toggled.connect(on_lowercase_toggled);
+
+        (preferences_notebook.get_nth_page (2) as Gtk.Container).add (plugins_mediator);
+
+        populate_preference_options();
+
+        photo_editor_combo.changed.connect(on_photo_editor_changed);
+        raw_editor_combo.changed.connect(on_raw_editor_changed);
+
+        autoimport.set_active(Config.Facade.get_instance().get_auto_import_from_library());
+
+        write_metadata.set_active(Config.Facade.get_instance().get_commit_metadata_to_masters());
+
+        default_raw_developer_combo.append_text(RawDeveloper.CAMERA.get_label());
+        default_raw_developer_combo.append_text(RawDeveloper.SHOTWELL.get_label());
+        set_raw_developer_combo(Config.Facade.get_instance().get_default_raw_developer());
+        default_raw_developer_combo.changed.connect(on_default_raw_developer_changed);
+    }
+
+    public void populate_preference_options() {
+        populate_app_combo_box(photo_editor_combo, PhotoFileFormat.get_editable_mime_types(),
+            Config.Facade.get_instance().get_external_photo_app(), out external_photo_apps);
+
+        populate_app_combo_box(raw_editor_combo, PhotoFileFormat.RAW.get_mime_types(),
+            Config.Facade.get_instance().get_external_raw_app(), out external_raw_apps);
+
+        setup_dir_pattern(dir_pattern_combo, dir_pattern_entry);
+
+        lowercase.set_active(Config.Facade.get_instance().get_use_lowercase_filenames());
+    }
+
+    private void on_radio_changed() {
+        var config = Config.Facade.get_instance();
+
+        if (transparent_checker_radio.active) {
+            config.set_transparent_background_type("checkered");
+        } else if (transparent_solid_radio.active) {
+            config.set_transparent_background_type("solid");
+        } else {
+            config.set_transparent_background_type("none");
+        }
+    }
+
+    private void on_color_changed() {
+        var color = (transparent_solid_color as Gtk.ColorChooser).rgba.to_string();
+        Config.Facade.get_instance().set_transparent_background_color(color);
+    }
+
+    // Ticket #3162, part II - if we're not yet installed, then we have to manually launch
+    // the help viewer and specify the full path to the subsection we want...
+    private bool on_local_pattern_help(string ignore) {
+        try {
+            Resources.launch_help(AppWindow.get_instance().get_screen(), "other-files.page");
+        } catch (Error e) {
+            message("Unable to launch help: %s", e.message);
+        }
+        return true;
+    }
+
+    private void populate_app_combo_box(Gtk.ComboBox combo_box, string[] mime_types,
+        string current_app_executable, out SortedList<AppInfo> external_apps) {
+        // get list of all applications for the given mime types
+        assert(mime_types.length != 0);
+        external_apps = DesktopIntegration.get_apps_for_mime_types(mime_types);
+
+        if (external_apps.size == 0)
+            return;
+
+        // populate application ComboBox with app names and icons
+        Gtk.CellRendererPixbuf pixbuf_renderer = new Gtk.CellRendererPixbuf();
+        Gtk.CellRendererText text_renderer = new Gtk.CellRendererText();
+        combo_box.clear();
+        combo_box.pack_start(pixbuf_renderer, false);
+        combo_box.pack_start(text_renderer, false);
+        combo_box.add_attribute(pixbuf_renderer, "pixbuf", 0);
+        combo_box.add_attribute(text_renderer, "text", 1);
+
+        // TODO: need more space between icons and text
+        Gtk.ListStore combo_store = new Gtk.ListStore(2, typeof(Gdk.Pixbuf), typeof(string));
+        Gtk.TreeIter iter;
+
+        int current_app = -1;
+
+        foreach (AppInfo app in external_apps) {
+            combo_store.append(out iter);
+
+            Icon app_icon = app.get_icon();
+            try {
+                if (app_icon is FileIcon) {
+                    combo_store.set_value(iter, 0, scale_pixbuf(new Gdk.Pixbuf.from_file(
+                        ((FileIcon) app_icon).get_file().get_path()), Resources.DEFAULT_ICON_SCALE,
+                        Gdk.InterpType.BILINEAR, false));
+                } else if (app_icon is ThemedIcon) {
+                    Gdk.Pixbuf icon_pixbuf =
+                        Gtk.IconTheme.get_default().load_icon(((ThemedIcon) app_icon).get_names()[0],
+                        Resources.DEFAULT_ICON_SCALE, Gtk.IconLookupFlags.FORCE_SIZE);
+
+                    combo_store.set_value(iter, 0, icon_pixbuf);
+                }
+            } catch (GLib.Error error) {
+                warning("Error loading icon pixbuf: " + error.message);
+            }
+
+            combo_store.set_value(iter, 1, app.get_name());
+
+            if (app.get_commandline() == current_app_executable)
+                current_app = external_apps.index_of(app);
+        }
+
+        // TODO: allow users to choose unlisted applications like Nautilus's "Open with -> Other Application..."
+
+        combo_box.set_model(combo_store);
+
+        if (current_app != -1)
+            combo_box.set_active(current_app);
+    }
+
+    private void setup_dir_pattern(Gtk.ComboBox combo_box, Gtk.Entry entry) {
+        string? pattern = Config.Facade.get_instance().get_directory_pattern();
+        bool found = false;
+        if (null != pattern) {
+            // Locate pre-built text.
+            int i = 0;
+            foreach (PathFormat pf in path_formats) {
+                if (pf.pattern == pattern) {
+                    combo_box.set_active(i);
+                    found = true;
+                    break;
+                }
+                i++;
+            }
+        } else {
+            // Custom path.
+            string? s = Config.Facade.get_instance().get_directory_pattern_custom();
+            if (!is_string_empty(s)) {
+                combo_box.set_active(path_formats.size - 1); // Assume "custom" is last.
+                found = true;
+            }
+        }
+
+        if (!found) {
+            combo_box.set_active(0);
+        }
+
+        on_dir_pattern_combo_changed();
+    }
+
+    public static void show_preferences() {
+        if (preferences_dialog == null)
+            preferences_dialog = new PreferencesDialog();
+
+        preferences_dialog.populate_preference_options();
+        preferences_dialog.show_all();
+        preferences_dialog.library_dir_button.set_current_folder(AppDirs.get_import_dir().get_path());
+
+        // Ticket #3001: Cause the dialog to become active if the user chooses 'Preferences'
+        // from the menus a second time.
+        preferences_dialog.present();
+    }
+
+    // For items that should only be committed when the dialog is closed, not as soon as the change
+    // is made.
+    private void commit_on_close() {
+        Config.Facade.get_instance().commit_bg_color();
+        Config.Facade.get_instance().set_auto_import_from_library(autoimport.active);
+        Config.Facade.get_instance().set_commit_metadata_to_masters(write_metadata.active);
+
+        if (lib_dir != null)
+            AppDirs.set_import_dir(lib_dir);
+
+        PathFormat pf = path_formats.get(dir_pattern_combo.get_active());
+        if (null == pf.pattern) {
+            Config.Facade.get_instance().set_directory_pattern_custom(dir_pattern_entry.text);
+            Config.Facade.get_instance().set_directory_pattern(null);
+        } else {
+            Config.Facade.get_instance().set_directory_pattern(pf.pattern);
+        }
+    }
+
+    private bool on_delete() {
+        if (!get_allow_closing())
+            return true;
+
+        commit_on_close();
+        return hide_on_delete(); //prevent widgets from getting destroyed
+    }
+
+    private void on_close() {
+        if (!get_allow_closing())
+            return;
+
+        hide();
+        commit_on_close();
+    }
+
+    private void on_value_changed() {
+        set_background_color((double)(bg_color_adjustment.get_upper() -
+            bg_color_adjustment.get_value()) / 65535.0);
+    }
+
+    private bool on_bg_color_reset(Gdk.EventButton event) {
+        if (event.button == 1 && event.type == Gdk.EventType.BUTTON_PRESS
+            && has_only_key_modifier(event.state, Gdk.ModifierType.CONTROL_MASK)) {
+            // Left Mouse Button and CTRL pressed
+            bg_color_slider.set_value(bg_color_adjustment.get_upper() -
+                (parse_color(Config.Facade.DEFAULT_BG_COLOR).red * 65536.0f));
+            on_value_changed();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private void on_dir_pattern_combo_changed() {
+        PathFormat pf = path_formats.get(dir_pattern_combo.get_active());
+        if (null == pf.pattern) {
+            // Custom format.
+            string? dir_pattern = Config.Facade.get_instance().get_directory_pattern_custom();
+            if (is_string_empty(dir_pattern))
+                dir_pattern = "";
+            dir_pattern_entry.set_text(dir_pattern);
+            dir_pattern_entry.editable = true;
+            dir_pattern_entry.sensitive = true;
+        } else {
+            dir_pattern_entry.set_text(pf.pattern);
+            dir_pattern_entry.editable = false;
+            dir_pattern_entry.sensitive = false;
+        }
+    }
+
+    private void on_dir_pattern_entry_changed() {
+         string example = example_date.format(dir_pattern_entry.text);
+         if (is_string_empty(example) && !is_string_empty(dir_pattern_entry.text)) {
+            // Invalid pattern.
+            dir_pattern_example.set_text(_("Invalid pattern"));
+            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-error");
+            dir_pattern_entry.set_icon_activatable(Gtk.EntryIconPosition.SECONDARY, false);
+            set_allow_closing(false);
+         } else {
+            // Valid pattern.
+            dir_pattern_example.set_text(example);
+            dir_pattern_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, null);
+            set_allow_closing(true);
+         }
+    }
+
+    private void set_allow_closing(bool allow) {
+        set_deletable(allow);
+        allow_closing = allow;
+    }
+
+    private bool get_allow_closing() {
+        return allow_closing;
+    }
+
+    private void set_background_color(double bg_color_value) {
+        Config.Facade.get_instance().set_bg_color(to_grayscale(bg_color_value));
+    }
+
+    private Gdk.RGBA to_grayscale(double color_value) {
+        Gdk.RGBA color = Gdk.RGBA();
+
+        color.red = color_value;
+        color.green = color_value;
+        color.blue = color_value;
+        color.alpha = 1.0;
+
+        return color;
+    }
+
+    private void on_photo_editor_changed() {
+        int photo_app_choice_index = (photo_editor_combo.get_active() < external_photo_apps.size) ?
+            photo_editor_combo.get_active() : external_photo_apps.size;
+
+        AppInfo app = external_photo_apps.get_at(photo_app_choice_index);
+
+        Config.Facade.get_instance().set_external_photo_app(DesktopIntegration.get_app_open_command(app));
+
+        debug("setting external photo editor to: %s", DesktopIntegration.get_app_open_command(app));
+    }
+
+    private void on_raw_editor_changed() {
+        int raw_app_choice_index = (raw_editor_combo.get_active() < external_raw_apps.size) ?
+            raw_editor_combo.get_active() : external_raw_apps.size;
+
+        AppInfo app = external_raw_apps.get_at(raw_app_choice_index);
+
+        Config.Facade.get_instance().set_external_raw_app(app.get_commandline());
+
+        debug("setting external raw editor to: %s", app.get_commandline());
+    }
+
+    private RawDeveloper raw_developer_from_combo() {
+        if (default_raw_developer_combo.get_active() == 0)
+            return RawDeveloper.CAMERA;
+        return RawDeveloper.SHOTWELL;
+    }
+
+    private void set_raw_developer_combo(RawDeveloper d) {
+        if (d == RawDeveloper.CAMERA)
+            default_raw_developer_combo.set_active(0);
+        else
+            default_raw_developer_combo.set_active(1);
+    }
+
+    private void on_default_raw_developer_changed() {
+        Config.Facade.get_instance().set_default_raw_developer(raw_developer_from_combo());
+    }
+
+    private void on_current_folder_changed() {
+        lib_dir = library_dir_button.get_filename();
+    }
+
+    public override bool map_event(Gdk.EventAny event) {
+        var result = base.map_event(event);
+        // Set the signal for the lib dir button after the dialog is displayed,
+        // 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);
+
+        return result;
+    }
+
+    private void add_to_dir_formats(string name, string? pattern) {
+        PathFormat pf = new PathFormat(name, pattern);
+        path_formats.add(pf);
+        dir_pattern_combo.append_text(name);
+    }
+
+    private void on_lowercase_toggled() {
+        Config.Facade.get_instance().set_use_lowercase_filenames(lowercase.get_active());
+    }
+}
diff --git a/src/dialogs/ProgressDialog.c b/src/dialogs/ProgressDialog.c
new file mode 100644
index 0000000..5183c12
--- /dev/null
+++ b/src/dialogs/ProgressDialog.c
@@ -0,0 +1,715 @@
+/* ProgressDialog.c generated by valac 0.36.6, the Vala compiler
+ * generated from ProgressDialog.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gdk/gdk.h>
+#include <glib/gi18n-lib.h>
+#include <float.h>
+#include <math.h>
+
+
+#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))
+#define IS_PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROGRESS_DIALOG))
+#define IS_PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PROGRESS_DIALOG))
+#define PROGRESS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PROGRESS_DIALOG, ProgressDialogClass))
+
+typedef struct _ProgressDialog ProgressDialog;
+typedef struct _ProgressDialogClass ProgressDialogClass;
+typedef struct _ProgressDialogPrivate ProgressDialogPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _ProgressDialog {
+	GtkWindow parent_instance;
+	ProgressDialogPrivate * priv;
+};
+
+struct _ProgressDialogClass {
+	GtkWindowClass parent_class;
+};
+
+struct _ProgressDialogPrivate {
+	GtkProgressBar* progress_bar;
+	GtkButton* cancel_button;
+	GCancellable* cancellable;
+	guint64 last_count;
+	gint update_every;
+	gint minimum_on_screen_time_msec;
+	gulong time_started;
+};
+
+
+static gpointer progress_dialog_parent_class = NULL;
+
+GType progress_dialog_get_type (void) G_GNUC_CONST;
+#define PROGRESS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_DIALOG, ProgressDialogPrivate))
+enum  {
+	PROGRESS_DIALOG_DUMMY_PROPERTY
+};
+ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
+static void progress_dialog_on_cancel (ProgressDialog* self);
+static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static gboolean progress_dialog_on_window_closed (ProgressDialog* self);
+static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+gulong now_ms (void);
+static void progress_dialog_real_realize (GtkWidget* base);
+void progress_dialog_update_display_every (ProgressDialog* self, gint update_every);
+void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec);
+void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total);
+void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct);
+static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct);
+void progress_dialog_set_status (ProgressDialog* self, const gchar* text);
+gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
+void spin_event_loop (void);
+void progress_dialog_close (ProgressDialog* self);
+static void progress_dialog_finalize (GObject * obj);
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 92 "ProgressDialog.c"
+}
+
+
+static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	progress_dialog_on_cancel ((ProgressDialog*) self);
+#line 99 "ProgressDialog.c"
+}
+
+
+static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+	gboolean result;
+	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return result;
+#line 108 "ProgressDialog.c"
+}
+
+
+ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
+	ProgressDialog * self = NULL;
+	GCancellable* _tmp0_;
+	GCancellable* _tmp1_;
+	const gchar* _tmp2_;
+	GtkWindow* _tmp3_;
+	GtkProgressBar* _tmp5_;
+	GtkProgressBar* _tmp6_;
+	GtkBox* vbox_bar = NULL;
+	GtkBox* _tmp7_;
+	GtkBox* _tmp8_;
+	GtkProgressBar* _tmp9_;
+	GCancellable* _tmp10_;
+	GtkBox* hbox = NULL;
+	GtkBox* _tmp13_;
+	GtkBox* _tmp14_;
+	GtkBox* _tmp15_;
+	GtkButton* _tmp16_;
+	GtkLabel* primary_text_label = NULL;
+	GtkLabel* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	GtkBox* vbox = NULL;
+	GtkBox* _tmp23_;
+	GtkBox* _tmp24_;
+	gulong _tmp25_;
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_val_if_fail (text != NULL, NULL);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self = (ProgressDialog*) g_object_new (object_type, NULL);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = cancellable;
+#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (self->priv->cancellable);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->cancellable = _tmp1_;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp2_ = text;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+#line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp3_ = owner;
+#line 25 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp3_ != NULL) {
+#line 165 "ProgressDialog.c"
+		GtkWindow* _tmp4_;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp4_ = owner;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
+#line 171 "ProgressDialog.c"
+	}
+#line 27 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp5_ = self->priv->progress_bar;
+#line 30 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
+#line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp6_ = self->priv->progress_bar;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_object_ref_sink (_tmp7_);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	vbox_bar = _tmp7_;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp8_ = vbox_bar;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp9_ = self->priv->progress_bar;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp10_ = cancellable;
+#line 36 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp10_ != NULL) {
+#line 201 "ProgressDialog.c"
+		GtkButton* _tmp11_;
+		GtkButton* _tmp12_;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		g_object_ref_sink (_tmp11_);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_g_object_unref0 (self->priv->cancel_button);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		self->priv->cancel_button = _tmp11_;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp12_ = self->priv->cancel_button;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
+#line 218 "ProgressDialog.c"
+	}
+#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_object_ref_sink (_tmp13_);
+#line 42 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	hbox = _tmp13_;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp14_ = hbox;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp15_ = vbox_bar;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp16_ = self->priv->cancel_button;
+#line 44 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp16_ != NULL) {
+#line 236 "ProgressDialog.c"
+		GtkBox* _tmp17_;
+		GtkButton* _tmp18_;
+#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp17_ = hbox;
+#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp18_ = self->priv->cancel_button;
+#line 45 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 245 "ProgressDialog.c"
+	}
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp19_ = (GtkLabel*) gtk_label_new ("");
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_object_ref_sink (_tmp19_);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	primary_text_label = _tmp19_;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp20_ = text;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp22_ = _tmp21_;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_label_set_markup (primary_text_label, _tmp22_);
+#line 48 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_free0 (_tmp22_);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_label_set_xalign (primary_text_label, 0.0f);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_label_set_yalign (primary_text_label, 0.5f);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_object_ref_sink (_tmp23_);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	vbox = _tmp23_;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp24_ = hbox;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 58 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 61 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 62 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 64 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
+#line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp25_ = now_ms ();
+#line 66 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->time_started = _tmp25_;
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (vbox);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (primary_text_label);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (hbox);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (vbox_bar);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return self;
+#line 311 "ProgressDialog.c"
+}
+
+
+ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
+#line 20 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
+#line 318 "ProgressDialog.c"
+}
+
+
+static void progress_dialog_real_realize (GtkWidget* base) {
+	ProgressDialog * self;
+	GCancellable* _tmp0_;
+#line 69 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
+#line 73 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = self->priv->cancellable;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp0_ == NULL) {
+#line 333 "ProgressDialog.c"
+		GdkWindow* _tmp1_;
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 74 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
+#line 339 "ProgressDialog.c"
+	}
+}
+
+
+void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
+	gint _tmp0_;
+	gint _tmp1_;
+#line 77 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = update_every;
+#line 78 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = update_every;
+#line 80 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->update_every = _tmp1_;
+#line 357 "ProgressDialog.c"
+}
+
+
+void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
+	gint _tmp0_;
+#line 83 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = minimum_on_screen_time_msec;
+#line 84 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->minimum_on_screen_time_msec = _tmp0_;
+#line 369 "ProgressDialog.c"
+}
+
+
+void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
+	gint _tmp0_;
+	gint _tmp1_;
+#line 87 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = current;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = total;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
+#line 384 "ProgressDialog.c"
+}
+
+
+void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
+	gdouble _tmp0_;
+	gdouble _tmp1_;
+	gdouble _tmp2_;
+	GtkProgressBar* _tmp3_;
+	gdouble _tmp4_;
+	GtkProgressBar* _tmp5_;
+	gdouble _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+#line 91 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = pct;
+#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	pct = _tmp1_;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp2_ = pct;
+#line 94 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	progress_dialog_maybe_show_all (self, _tmp2_);
+#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp3_ = self->priv->progress_bar;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp4_ = pct;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp5_ = self->priv->progress_bar;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp6_ = pct;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp7_ = g_strdup_printf (_ ("%d%%"), (gint) (_tmp6_ * 100.0));
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp8_ = _tmp7_;
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_progress_bar_set_text (_tmp5_, _tmp8_);
+#line 97 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_free0 (_tmp8_);
+#line 428 "ProgressDialog.c"
+}
+
+
+void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
+	GtkProgressBar* _tmp0_;
+	const gchar* _tmp1_;
+#line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 105 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (text != NULL);
+#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = self->priv->progress_bar;
+#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = text;
+#line 106 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
+#line 112 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 447 "ProgressDialog.c"
+}
+
+
+gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	guint64 _tmp1_;
+	gboolean _tmp8_ = FALSE;
+	GCancellable* _tmp9_;
+	gboolean keep_going = FALSE;
+	gboolean _tmp12_;
+#line 116 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = self->priv->last_count;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp1_ == G_MAXUINT64) {
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp0_ = TRUE;
+#line 467 "ProgressDialog.c"
+	} else {
+		guint64 _tmp2_;
+		guint64 _tmp3_;
+		gint _tmp4_;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp2_ = count;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp3_ = self->priv->last_count;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp4_ = self->priv->update_every;
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
+#line 480 "ProgressDialog.c"
+	}
+#line 117 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp0_) {
+#line 484 "ProgressDialog.c"
+		guint64 _tmp5_;
+		guint64 _tmp6_;
+		guint64 _tmp7_;
+#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp5_ = count;
+#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp6_ = total;
+#line 118 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
+#line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp7_ = count;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		self->priv->last_count = _tmp7_;
+#line 498 "ProgressDialog.c"
+	}
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp9_ = self->priv->cancellable;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp9_ != NULL) {
+#line 504 "ProgressDialog.c"
+		GCancellable* _tmp10_;
+		gboolean _tmp11_;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp10_ = self->priv->cancellable;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp8_ = !_tmp11_;
+#line 513 "ProgressDialog.c"
+	} else {
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp8_ = TRUE;
+#line 517 "ProgressDialog.c"
+	}
+#line 122 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	keep_going = _tmp8_;
+#line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp12_ = do_event_loop;
+#line 130 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp12_) {
+#line 131 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		spin_event_loop ();
+#line 527 "ProgressDialog.c"
+	}
+#line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	result = keep_going;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return result;
+#line 533 "ProgressDialog.c"
+}
+
+
+void progress_dialog_close (ProgressDialog* self) {
+#line 136 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 141 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 142 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 544 "ProgressDialog.c"
+}
+
+
+static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
+	gboolean result = FALSE;
+#line 145 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
+#line 146 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	progress_dialog_on_cancel (self);
+#line 147 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	result = FALSE;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	return result;
+#line 558 "ProgressDialog.c"
+}
+
+
+static void progress_dialog_on_cancel (ProgressDialog* self) {
+	GCancellable* _tmp0_;
+	GtkButton* _tmp2_;
+#line 151 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 152 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = self->priv->cancellable;
+#line 152 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp0_ != NULL) {
+#line 571 "ProgressDialog.c"
+		GCancellable* _tmp1_;
+#line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp1_ = self->priv->cancellable;
+#line 153 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		g_cancellable_cancel (_tmp1_);
+#line 577 "ProgressDialog.c"
+	}
+#line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp2_ = self->priv->cancel_button;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 583 "ProgressDialog.c"
+}
+
+
+static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+#line 158 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_return_if_fail (IS_PROGRESS_DIALOG (self));
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp2_ = _tmp1_;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (!_tmp2_) {
+#line 599 "ProgressDialog.c"
+		gulong _tmp3_;
+		gulong _tmp4_;
+		gint _tmp5_;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp3_ = now_ms ();
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp4_ = self->priv->time_started;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp5_ = self->priv->minimum_on_screen_time_msec;
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
+#line 611 "ProgressDialog.c"
+	} else {
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp0_ = FALSE;
+#line 615 "ProgressDialog.c"
+	}
+#line 161 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	if (_tmp0_) {
+#line 619 "ProgressDialog.c"
+		gdouble pps = 0.0;
+		gdouble _tmp6_;
+		gint _tmp7_;
+		gdouble ttc = 0.0;
+		gdouble _tmp8_;
+		gdouble _tmp9_;
+		gint _tmp10_;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp6_ = pct;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp7_ = self->priv->minimum_on_screen_time_msec;
+#line 163 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		pps = (_tmp6_ * 100.0) / _tmp7_;
+#line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp8_ = pps;
+#line 165 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		ttc = 100.0 / _tmp8_;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp9_ = ttc;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		_tmp10_ = self->priv->minimum_on_screen_time_msec;
+#line 168 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+		if (_tmp9_ > ((gdouble) _tmp10_)) {
+#line 173 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 174 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+			spin_event_loop ();
+#line 647 "ProgressDialog.c"
+		}
+	}
+}
+
+
+static void progress_dialog_class_init (ProgressDialogClass * klass) {
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	progress_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) progress_dialog_real_realize;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
+#line 662 "ProgressDialog.c"
+}
+
+
+static void progress_dialog_instance_init (ProgressDialog * self) {
+	GtkProgressBar* _tmp0_;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
+#line 9 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	g_object_ref_sink (_tmp0_);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->progress_bar = _tmp0_;
+#line 10 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->cancel_button = NULL;
+#line 12 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->last_count = G_MAXUINT64;
+#line 13 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->update_every = 1;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self->priv->minimum_on_screen_time_msec = 500;
+#line 684 "ProgressDialog.c"
+}
+
+
+static void progress_dialog_finalize (GObject * obj) {
+	ProgressDialog * self;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (self->priv->progress_bar);
+#line 10 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (self->priv->cancel_button);
+#line 11 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	_g_object_unref0 (self->priv->cancellable);
+#line 8 "/home/jens/Source/shotwell/src/dialogs/ProgressDialog.vala"
+	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
+#line 700 "ProgressDialog.c"
+}
+
+
+GType progress_dialog_get_type (void) {
+	static volatile gsize progress_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&progress_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ProgressDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) progress_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ProgressDialog), 0, (GInstanceInitFunc) progress_dialog_instance_init, NULL };
+		GType progress_dialog_type_id;
+		progress_dialog_type_id = g_type_register_static (gtk_window_get_type (), "ProgressDialog", &g_define_type_info, 0);
+		g_once_init_leave (&progress_dialog_type_id__volatile, progress_dialog_type_id);
+	}
+	return progress_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/ProgressDialog.vala b/src/dialogs/ProgressDialog.vala
new file mode 100644
index 0000000..9368764
--- /dev/null
+++ b/src/dialogs/ProgressDialog.vala
@@ -0,0 +1,178 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class ProgressDialog : Gtk.Window {
+    private Gtk.ProgressBar progress_bar = new Gtk.ProgressBar();
+    private Gtk.Button cancel_button = null;
+    private Cancellable cancellable;
+    private uint64 last_count = uint64.MAX;
+    private int update_every = 1;
+    private int minimum_on_screen_time_msec = 500;
+    private ulong time_started;
+#if UNITY_SUPPORT
+    UnityProgressBar uniprobar = UnityProgressBar.get_instance();
+#endif
+
+    public ProgressDialog(Gtk.Window? owner, string text, Cancellable? cancellable = null) {
+        this.cancellable = cancellable;
+
+        set_title(text);
+        set_resizable(false);
+        if (owner != null)
+            set_transient_for(owner);
+        set_modal(true);
+        set_type_hint(Gdk.WindowTypeHint.DIALOG);
+
+        progress_bar.set_size_request(300, -1);
+        progress_bar.set_show_text(true);
+
+        Gtk.Box vbox_bar = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        vbox_bar.pack_start(progress_bar, true, false, 0);
+
+        if (cancellable != null) {
+            cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
+            cancel_button.clicked.connect(on_cancel);
+            delete_event.connect(on_window_closed);
+        }
+
+        Gtk.Box hbox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
+        hbox.pack_start(vbox_bar, true, false, 0);
+        if (cancel_button != null)
+            hbox.pack_end(cancel_button, false, false, 0);
+
+        Gtk.Label primary_text_label = new Gtk.Label("");
+        primary_text_label.set_markup("<span weight=\"bold\">%s</span>".printf(text));
+        primary_text_label.xalign = 0.0f;
+        primary_text_label.yalign = 0.5f;
+
+        Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 12);
+        vbox.pack_start(primary_text_label, false, false, 0);
+        vbox.pack_start(hbox, true, false, 0);
+        vbox.halign = Gtk.Align.CENTER;
+        vbox.valign = Gtk.Align.CENTER;
+        vbox.hexpand = true;
+        vbox.vexpand = true;
+        vbox.margin_start = 12;
+        vbox.margin_end = 12;
+        vbox.margin_top = 12;
+        vbox.margin_bottom = 12;
+
+        add(vbox);
+
+        time_started = now_ms();
+    }
+
+    public override void realize() {
+        base.realize();
+
+        // if unable to cancel the progress bar, remove the close button
+        if (cancellable == null)
+            get_window().set_functions(Gdk.WMFunction.MOVE);
+    }
+
+    public void update_display_every(int update_every) {
+        assert(update_every >= 1);
+
+        this.update_every = update_every;
+    }
+
+    public void set_minimum_on_screen_time_msec(int minimum_on_screen_time_msec) {
+        this.minimum_on_screen_time_msec = minimum_on_screen_time_msec;
+    }
+
+    public void set_fraction(int current, int total) {
+        set_percentage((double) current / (double) total);
+    }
+
+    public void set_percentage(double pct) {
+        pct = pct.clamp(0.0, 1.0);
+
+        maybe_show_all(pct);
+
+        progress_bar.set_fraction(pct);
+        progress_bar.set_text(_("%d%%").printf((int) (pct * 100.0)));
+
+#if UNITY_SUPPORT
+        //UnityProgressBar: set progress
+        uniprobar.set_progress(pct);
+#endif
+    }
+
+    public void set_status(string text) {
+        progress_bar.set_text(text);
+
+#if UNITY_SUPPORT
+        //UnityProgressBar: try to draw progress bar
+        uniprobar.set_visible(true);
+#endif
+        show_all();
+    }
+
+    // This can be used as a ProgressMonitor delegate.
+    public bool monitor(uint64 count, uint64 total, bool do_event_loop = true) {
+        if ((last_count == uint64.MAX) || (count - last_count) >= update_every) {
+            set_percentage((double) count / (double) total);
+            last_count = count;
+        }
+
+        bool keep_going = (cancellable != null) ? !cancellable.is_cancelled() : true;
+
+        // TODO: get rid of this.  non-trivial, as some progress-monitor operations are blocking
+        // and need to allow the event loop to spin
+        //
+        // Important: Since it's possible the progress dialog might be destroyed inside this call,
+        // avoid referring to "this" afterwards at all costs (in case all refs have been dropped)
+
+        if (do_event_loop)
+            spin_event_loop();
+
+        return keep_going;
+    }
+
+    public new void close() {
+#if UNITY_SUPPORT
+        //UnityProgressBar: reset
+        uniprobar.reset();
+#endif
+        hide();
+        destroy();
+    }
+
+    private bool on_window_closed() {
+        on_cancel();
+        return false; // return false so that the system handler will remove the window from
+                      // the screen
+    }
+
+    private void on_cancel() {
+        if (cancellable != null)
+            cancellable.cancel();
+
+        cancel_button.sensitive = false;
+    }
+
+    private void maybe_show_all(double pct) {
+        // Appear only after a while because some jobs may take only a
+        // fraction of second to complete so there's no point in showing progress.
+        if (!this.visible && now_ms() - time_started > minimum_on_screen_time_msec) {
+            // calculate percents completed in one ms
+            double pps = pct * 100.0 / minimum_on_screen_time_msec;
+            // calculate [very rough] estimate of time to complete in ms
+            double ttc = 100.0 / pps;
+            // If there is still more work to do for at least MINIMUM_ON_SCREEN_TIME_MSEC,
+            // finally display the dialog.
+            if (ttc > minimum_on_screen_time_msec) {
+#if UNITY_SUPPORT
+                //UnityProgressBar: try to draw progress bar
+                uniprobar.set_visible(true);
+#endif
+                show_all();
+                spin_event_loop();
+            }
+        }
+    }
+}
diff --git a/src/dialogs/SetBackground.c b/src/dialogs/SetBackground.c
new file mode 100644
index 0000000..3f4d45f
--- /dev/null
+++ b/src/dialogs/SetBackground.c
@@ -0,0 +1,274 @@
+/* SetBackground.c generated by valac 0.36.6, the Vala compiler
+ * generated from SetBackground.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+
+#define TYPE_SET_BACKGROUND_PHOTO_DIALOG (set_background_photo_dialog_get_type ())
+#define SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog))
+#define SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
+#define IS_SET_BACKGROUND_PHOTO_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG))
+#define IS_SET_BACKGROUND_PHOTO_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_PHOTO_DIALOG))
+#define SET_BACKGROUND_PHOTO_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogClass))
+
+typedef struct _SetBackgroundPhotoDialog SetBackgroundPhotoDialog;
+typedef struct _SetBackgroundPhotoDialogClass SetBackgroundPhotoDialogClass;
+typedef struct _SetBackgroundPhotoDialogPrivate SetBackgroundPhotoDialogPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
+struct _SetBackgroundPhotoDialog {
+	GtkDialog parent_instance;
+	SetBackgroundPhotoDialogPrivate * priv;
+};
+
+struct _SetBackgroundPhotoDialogClass {
+	GtkDialogClass parent_class;
+};
+
+struct _SetBackgroundPhotoDialogPrivate {
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
+};
+
+
+static gpointer set_background_photo_dialog_parent_class = NULL;
+
+GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
+#define SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialogPrivate))
+enum  {
+	SET_BACKGROUND_PHOTO_DIALOG_DUMMY_PROPERTY
+};
+SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
+SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self);
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
+static void set_background_photo_dialog_finalize (GObject * obj);
+
+
+SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type) {
+	SetBackgroundPhotoDialog * self = NULL;
+	gint _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 16 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	self = (SetBackgroundPhotoDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp2_ = _tmp1_;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
+#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_g_object_unref0 (_tmp2_);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	return self;
+#line 102 "SetBackground.c"
+}
+
+
+SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
+#line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
+#line 109 "SetBackground.c"
+}
+
+
+static void set_background_photo_dialog_on_checkbox_clicked (SetBackgroundPhotoDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	g_return_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self));
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp3_ = _tmp2_;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	if (_tmp3_) {
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		_tmp0_ = TRUE;
+#line 130 "SetBackground.c"
+	} else {
+		GtkCheckButton* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		_tmp4_ = self->priv->screensaver_checkbox;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		_tmp6_ = _tmp5_;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		_tmp0_ = _tmp6_;
+#line 143 "SetBackground.c"
+	}
+#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 147 "SetBackground.c"
+}
+
+
+static void _set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	set_background_photo_dialog_on_checkbox_clicked ((SetBackgroundPhotoDialog*) self);
+#line 154 "SetBackground.c"
+}
+
+
+gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver) {
+	gboolean _vala_desktop_background = FALSE;
+	gboolean _vala_screensaver = FALSE;
+	gboolean result = FALSE;
+	gboolean _result_ = FALSE;
+	gint _tmp0_;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+	GtkCheckButton* _tmp4_;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+#line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 29 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp3_ = _tmp2_;
+#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_vala_desktop_background = _tmp3_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp4_ = self->priv->screensaver_checkbox;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_tmp6_ = _tmp5_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_vala_screensaver = _tmp6_;
+#line 35 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	result = _result_;
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	if (desktop_background) {
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		*desktop_background = _vala_desktop_background;
+#line 204 "SetBackground.c"
+	}
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	if (screensaver) {
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+		*screensaver = _vala_screensaver;
+#line 210 "SetBackground.c"
+	}
+#line 36 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	return result;
+#line 214 "SetBackground.c"
+}
+
+
+static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
+	gint SetBackgroundPhotoDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	g_type_class_add_private (klass, sizeof (SetBackgroundPhotoDialogPrivate));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	G_OBJECT_CLASS (klass)->finalize = set_background_photo_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	SetBackgroundPhotoDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_dialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, desktop_background_checkbox));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundPhotoDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundPhotoDialogPrivate, screensaver_checkbox));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_photo_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 236 "SetBackground.c"
+}
+
+
+static void set_background_photo_dialog_instance_init (SetBackgroundPhotoDialog * self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	self->priv = SET_BACKGROUND_PHOTO_DIALOG_GET_PRIVATE (self);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 245 "SetBackground.c"
+}
+
+
+static void set_background_photo_dialog_finalize (GObject * obj) {
+	SetBackgroundPhotoDialog * self;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_PHOTO_DIALOG, SetBackgroundPhotoDialog);
+#line 11 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackground.vala"
+	G_OBJECT_CLASS (set_background_photo_dialog_parent_class)->finalize (obj);
+#line 259 "SetBackground.c"
+}
+
+
+GType set_background_photo_dialog_get_type (void) {
+	static volatile gsize set_background_photo_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&set_background_photo_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundPhotoDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_photo_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundPhotoDialog), 0, (GInstanceInitFunc) set_background_photo_dialog_instance_init, NULL };
+		GType set_background_photo_dialog_type_id;
+		set_background_photo_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundPhotoDialog", &g_define_type_info, 0);
+		g_once_init_leave (&set_background_photo_dialog_type_id__volatile, set_background_photo_dialog_type_id);
+	}
+	return set_background_photo_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/SetBackground.vala b/src/dialogs/SetBackground.vala
new file mode 100644
index 0000000..d9a77c4
--- /dev/null
+++ b/src/dialogs/SetBackground.vala
@@ -0,0 +1,38 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_dialog.ui")]
+public class SetBackgroundPhotoDialog : Gtk.Dialog {
+    [GtkChild]
+    private Gtk.CheckButton desktop_background_checkbox;
+    [GtkChild]
+    private Gtk.CheckButton screensaver_checkbox;
+
+    public SetBackgroundPhotoDialog() {
+        Object(use_header_bar: Resources.use_header_bar());
+        this.set_transient_for (AppWindow.get_instance());
+    }
+
+    [GtkCallback]
+    private void on_checkbox_clicked() {
+        set_response_sensitive (Gtk.ResponseType.OK,
+                                desktop_background_checkbox.active ||
+                                screensaver_checkbox.active);
+    }
+
+    public bool execute(out bool desktop_background, out bool screensaver) {
+        this.show_all();
+        var result = this.run() == Gtk.ResponseType.OK;
+        this.hide ();
+
+        desktop_background = desktop_background_checkbox.active;
+        screensaver = screensaver_checkbox.active;
+
+        this.destroy();
+        return result;
+    }
+}
diff --git a/src/dialogs/SetBackgroundSlideshow.c b/src/dialogs/SetBackgroundSlideshow.c
new file mode 100644
index 0000000..6e13d67
--- /dev/null
+++ b/src/dialogs/SetBackgroundSlideshow.c
@@ -0,0 +1,474 @@
+/* SetBackgroundSlideshow.c generated by valac 0.36.6, the Vala compiler
+ * generated from SetBackgroundSlideshow.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+
+#define TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG (set_background_slideshow_dialog_get_type ())
+#define SET_BACKGROUND_SLIDESHOW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog))
+#define SET_BACKGROUND_SLIDESHOW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogClass))
+#define IS_SET_BACKGROUND_SLIDESHOW_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG))
+#define IS_SET_BACKGROUND_SLIDESHOW_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG))
+#define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogClass))
+
+typedef struct _SetBackgroundSlideshowDialog SetBackgroundSlideshowDialog;
+typedef struct _SetBackgroundSlideshowDialogClass SetBackgroundSlideshowDialogClass;
+typedef struct _SetBackgroundSlideshowDialogPrivate SetBackgroundSlideshowDialogPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+struct _SetBackgroundSlideshowDialog {
+	GtkDialog parent_instance;
+	SetBackgroundSlideshowDialogPrivate * priv;
+};
+
+struct _SetBackgroundSlideshowDialogClass {
+	GtkDialogClass parent_class;
+};
+
+struct _SetBackgroundSlideshowDialogPrivate {
+	GtkCheckButton* desktop_background_checkbox;
+	GtkCheckButton* screensaver_checkbox;
+	GtkScale* delay_scale;
+	GtkLabel* delay_value_label;
+	gint delay_value;
+};
+
+
+static gpointer set_background_slideshow_dialog_parent_class = NULL;
+
+GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
+#define SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialogPrivate))
+enum  {
+	SET_BACKGROUND_SLIDESHOW_DIALOG_DUMMY_PROPERTY
+};
+SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
+SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+static void set_background_slideshow_dialog_real_constructed (GObject* base);
+static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self);
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self);
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
+gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
+static void set_background_slideshow_dialog_finalize (GObject * obj);
+
+
+SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type) {
+	SetBackgroundSlideshowDialog * self = NULL;
+	gint _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 22 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self = (SetBackgroundSlideshowDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp2_ = _tmp1_;
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow));
+#line 23 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_object_unref0 (_tmp2_);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	return self;
+#line 114 "SetBackgroundSlideshow.c"
+}
+
+
+SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
+#line 21 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
+#line 121 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_real_constructed (GObject* base) {
+	SetBackgroundSlideshowDialog * self;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
+#line 27 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed (self);
+#line 131 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_on_checkbox_clicked (SetBackgroundSlideshowDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	GtkCheckButton* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp1_ = self->priv->desktop_background_checkbox;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp2_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp3_ = _tmp2_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	if (_tmp3_) {
+#line 33 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp0_ = TRUE;
+#line 152 "SetBackgroundSlideshow.c"
+	} else {
+		GtkCheckButton* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp6_;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp4_ = self->priv->screensaver_checkbox;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp6_ = _tmp5_;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp0_ = _tmp6_;
+#line 165 "SetBackgroundSlideshow.c"
+	}
+#line 32 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp0_);
+#line 169 "SetBackgroundSlideshow.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	set_background_slideshow_dialog_on_checkbox_clicked ((SetBackgroundSlideshowDialog*) self);
+#line 176 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBackgroundSlideshowDialog* self) {
+	gdouble value = 0.0;
+	GtkScale* _tmp0_;
+	GtkAdjustment* _tmp1_;
+	GtkAdjustment* _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gdouble _tmp7_;
+	gchar* text = NULL;
+	gint _tmp8_;
+	GtkLabel* _tmp25_;
+	const gchar* _tmp26_;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp0_ = self->priv->delay_scale;
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp1_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp2_ = _tmp1_;
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp4_ = _tmp3_;
+#line 39 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	value = _tmp4_;
+#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp5_ = value;
+#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp6_ = pow (_tmp5_, (gdouble) 5);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
+#line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp8_ = self->priv->delay_value;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	if (_tmp8_ < 60) {
+#line 220 "SetBackgroundSlideshow.c"
+		gint _tmp9_;
+		gint _tmp10_;
+		gchar* _tmp11_;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp9_ = self->priv->delay_value;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp10_ = self->priv->delay_value;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp11_ = g_strdup_printf (ngettext ("%d second", "%d seconds", (gulong) _tmp9_), _tmp10_);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_g_free0 (text);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		text = _tmp11_;
+#line 234 "SetBackgroundSlideshow.c"
+	} else {
+		gint _tmp12_;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		_tmp12_ = self->priv->delay_value;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		if (_tmp12_ < (60 * 60)) {
+#line 241 "SetBackgroundSlideshow.c"
+			gint minutes = 0;
+			gint _tmp13_;
+			gint _tmp14_;
+			gint _tmp15_;
+			gchar* _tmp16_;
+			gint _tmp17_;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp13_ = self->priv->delay_value;
+#line 51 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			minutes = _tmp13_ / 60;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp14_ = minutes;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp15_ = minutes;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp16_ = g_strdup_printf (ngettext ("%d minute", "%d minutes", (gulong) _tmp14_), _tmp15_);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_g_free0 (text);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			text = _tmp16_;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp17_ = minutes;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			self->priv->delay_value = _tmp17_ * 60;
+#line 266 "SetBackgroundSlideshow.c"
+		} else {
+			gint _tmp18_;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			_tmp18_ = self->priv->delay_value;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+			if (_tmp18_ < ((60 * 60) * 24)) {
+#line 273 "SetBackgroundSlideshow.c"
+				gint hours = 0;
+				gint _tmp19_;
+				gint _tmp20_;
+				gint _tmp21_;
+				gchar* _tmp22_;
+				gint _tmp23_;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp19_ = self->priv->delay_value;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				hours = _tmp19_ / (60 * 60);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp20_ = hours;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp21_ = hours;
+#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp22_ = g_strdup_printf (ngettext ("%d hour", "%d hours", (gulong) _tmp20_), _tmp21_);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_g_free0 (text);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				text = _tmp22_;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp23_ = hours;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				self->priv->delay_value = _tmp23_ * (60 * 60);
+#line 298 "SetBackgroundSlideshow.c"
+			} else {
+				gchar* _tmp24_;
+#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_tmp24_ = g_strdup (_ ("1 day"));
+#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				_g_free0 (text);
+#line 59 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				text = _tmp24_;
+#line 60 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+				self->priv->delay_value = (60 * 60) * 24;
+#line 309 "SetBackgroundSlideshow.c"
+			}
+		}
+	}
+#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp25_ = self->priv->delay_value_label;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp26_ = text;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_label_set_label (_tmp25_, _tmp26_);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_free0 (text);
+#line 321 "SetBackgroundSlideshow.c"
+}
+
+
+static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
+#line 328 "SetBackgroundSlideshow.c"
+}
+
+
+gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver) {
+	gint _vala_delay_value = 0;
+	gboolean _vala_desktop_background = FALSE;
+	gboolean _vala_screensaver = FALSE;
+	gboolean result = FALSE;
+	gboolean _result_ = FALSE;
+	gint _tmp0_;
+	gint _tmp1_;
+	GtkCheckButton* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+	GtkCheckButton* _tmp5_;
+	gboolean _tmp6_;
+	gboolean _tmp7_;
+#line 66 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
+#line 67 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 68 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_result_ = _tmp0_ == ((gint) GTK_RESPONSE_OK);
+#line 69 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp1_ = self->priv->delay_value;
+#line 71 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_vala_delay_value = _tmp1_;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp2_ = self->priv->desktop_background_checkbox;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp4_ = _tmp3_;
+#line 72 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_vala_desktop_background = _tmp4_;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp5_ = self->priv->screensaver_checkbox;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_tmp7_ = _tmp6_;
+#line 73 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_vala_screensaver = _tmp7_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	result = _result_;
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	if (delay_value) {
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		*delay_value = _vala_delay_value;
+#line 384 "SetBackgroundSlideshow.c"
+	}
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	if (desktop_background) {
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		*desktop_background = _vala_desktop_background;
+#line 390 "SetBackgroundSlideshow.c"
+	}
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	if (screensaver) {
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+		*screensaver = _vala_screensaver;
+#line 396 "SetBackgroundSlideshow.c"
+	}
+#line 76 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	return result;
+#line 400 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
+	gint SetBackgroundSlideshowDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) set_background_slideshow_dialog_real_constructed;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	G_OBJECT_CLASS (klass)->finalize = set_background_slideshow_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	SetBackgroundSlideshowDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "desktop_background_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, desktop_background_checkbox));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "screensaver_checkbox", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, screensaver_checkbox));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_scale", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_scale));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "delay_value_label", FALSE, SetBackgroundSlideshowDialog_private_offset + G_STRUCT_OFFSET (SetBackgroundSlideshowDialogPrivate, delay_value_label));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_checkbox_clicked", G_CALLBACK(_set_background_slideshow_dialog_on_checkbox_clicked_gtk_toggle_button_toggled));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "on_delay_scale_value_changed", G_CALLBACK(_set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed));
+#line 430 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
+#line 19 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self->priv->delay_value = 0;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 441 "SetBackgroundSlideshow.c"
+}
+
+
+static void set_background_slideshow_dialog_finalize (GObject * obj) {
+	SetBackgroundSlideshowDialog * self;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
+#line 11 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_object_unref0 (self->priv->desktop_background_checkbox);
+#line 13 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_object_unref0 (self->priv->screensaver_checkbox);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_object_unref0 (self->priv->delay_scale);
+#line 17 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	_g_object_unref0 (self->priv->delay_value_label);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/SetBackgroundSlideshow.vala"
+	G_OBJECT_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
+#line 459 "SetBackgroundSlideshow.c"
+}
+
+
+GType set_background_slideshow_dialog_get_type (void) {
+	static volatile gsize set_background_slideshow_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&set_background_slideshow_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SetBackgroundSlideshowDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) set_background_slideshow_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SetBackgroundSlideshowDialog), 0, (GInstanceInitFunc) set_background_slideshow_dialog_instance_init, NULL };
+		GType set_background_slideshow_dialog_type_id;
+		set_background_slideshow_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SetBackgroundSlideshowDialog", &g_define_type_info, 0);
+		g_once_init_leave (&set_background_slideshow_dialog_type_id__volatile, set_background_slideshow_dialog_type_id);
+	}
+	return set_background_slideshow_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/SetBackgroundSlideshow.vala b/src/dialogs/SetBackgroundSlideshow.vala
new file mode 100644
index 0000000..914af76
--- /dev/null
+++ b/src/dialogs/SetBackgroundSlideshow.vala
@@ -0,0 +1,78 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/set_background_slideshow_dialog.ui")]
+public class SetBackgroundSlideshowDialog : Gtk.Dialog {
+    [GtkChild]
+    private Gtk.CheckButton desktop_background_checkbox;
+    [GtkChild]
+    private Gtk.CheckButton screensaver_checkbox;
+    [GtkChild]
+    private Gtk.Scale delay_scale;
+    [GtkChild]
+    private Gtk.Label delay_value_label;
+
+    private int delay_value = 0;
+
+    public SetBackgroundSlideshowDialog() {
+        Object(use_header_bar: Resources.use_header_bar());
+        this.set_transient_for (AppWindow.get_instance());
+    }
+
+    public override void constructed () {
+        on_delay_scale_value_changed ();
+    }
+
+    [GtkCallback]
+    private void on_checkbox_clicked() {
+        set_response_sensitive (Gtk.ResponseType.OK,
+                                desktop_background_checkbox.active ||
+                                screensaver_checkbox.active);
+    }
+
+    [GtkCallback]
+    private void on_delay_scale_value_changed() {
+        double value = delay_scale.adjustment.value;
+
+        // f(x)=x^5 allows to have fine-grained values (seconds) to the left
+        // and very coarse-grained values (hours) to the right of the slider.
+        // We limit maximum value to 1 day and minimum to 5 seconds.
+        delay_value = (int) (Math.pow(value, 5) / Math.pow(90, 5) * 60 * 60 * 24 + 5);
+
+        // convert to text and remove fractions from values > 1 minute
+        string text;
+        if (delay_value < 60) {
+            text = ngettext("%d second", "%d seconds", delay_value).printf(delay_value);
+        } else if (delay_value < 60 * 60) {
+            int minutes = delay_value / 60;
+            text = ngettext("%d minute", "%d minutes", minutes).printf(minutes);
+            delay_value = minutes * 60;
+        } else if (delay_value < 60 * 60 * 24) {
+            int hours = delay_value / (60 * 60);
+            text = ngettext("%d hour", "%d hours", hours).printf(hours);
+            delay_value = hours * (60 * 60);
+        } else {
+            text = _("1 day");
+            delay_value = 60 * 60 * 24;
+        }
+
+        delay_value_label.label = text;
+    }
+
+    public bool execute(out int delay_value, out bool desktop_background, out bool screensaver) {
+        this.show_all();
+        var result = this.run() == Gtk.ResponseType.OK;
+        this.hide ();
+
+        delay_value = this.delay_value;
+        desktop_background = desktop_background_checkbox.active;
+        screensaver = screensaver_checkbox.active;
+
+        this.destroy();
+        return result;
+    }
+}
diff --git a/src/dialogs/TextEntry.c b/src/dialogs/TextEntry.c
new file mode 100644
index 0000000..6fa478f
--- /dev/null
+++ b/src/dialogs/TextEntry.c
@@ -0,0 +1,398 @@
+/* TextEntry.c generated by valac 0.36.6, the Vala compiler
+ * generated from TextEntry.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gee.h>
+
+
+#define TYPE_TEXT_ENTRY_DIALOG (text_entry_dialog_get_type ())
+#define TEXT_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog))
+#define TEXT_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogClass))
+#define IS_TEXT_ENTRY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TEXT_ENTRY_DIALOG))
+#define IS_TEXT_ENTRY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TEXT_ENTRY_DIALOG))
+#define TEXT_ENTRY_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogClass))
+
+typedef struct _TextEntryDialog TextEntryDialog;
+typedef struct _TextEntryDialogClass TextEntryDialogClass;
+typedef struct _TextEntryDialogPrivate TextEntryDialogPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
+#define TYPE_ENTRY_MULTI_COMPLETION (entry_multi_completion_get_type ())
+#define ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion))
+#define ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
+#define IS_ENTRY_MULTI_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ENTRY_MULTI_COMPLETION))
+#define IS_ENTRY_MULTI_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ENTRY_MULTI_COMPLETION))
+#define ENTRY_MULTI_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletionClass))
+
+typedef struct _EntryMultiCompletion EntryMultiCompletion;
+typedef struct _EntryMultiCompletionClass EntryMultiCompletionClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+struct _TextEntryDialog {
+	GtkDialog parent_instance;
+	TextEntryDialogPrivate * priv;
+};
+
+struct _TextEntryDialogClass {
+	GtkDialogClass parent_class;
+};
+
+typedef gboolean (*TextEntryDialogOnModifyValidateType) (const gchar* text, void* user_data);
+struct _TextEntryDialogPrivate {
+	TextEntryDialogOnModifyValidateType on_modify_validate;
+	gpointer on_modify_validate_target;
+	GtkEntry* entry;
+	GtkLabel* label;
+};
+
+
+static gpointer text_entry_dialog_parent_class = NULL;
+
+GType text_entry_dialog_get_type (void) G_GNUC_CONST;
+#define TEXT_ENTRY_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TEXT_ENTRY_DIALOG, TextEntryDialogPrivate))
+enum  {
+	TEXT_ENTRY_DIALOG_DUMMY_PROPERTY
+};
+TextEntryDialog* text_entry_dialog_new (void);
+TextEntryDialog* text_entry_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
+void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+void text_entry_dialog_on_entry_changed (TextEntryDialog* self);
+static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+GType entry_multi_completion_get_type (void) G_GNUC_CONST;
+EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter);
+EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCollection* completion_list, const gchar* delimiter);
+gchar* text_entry_dialog_execute (TextEntryDialog* self);
+static void text_entry_dialog_finalize (GObject * obj);
+
+
+TextEntryDialog* text_entry_dialog_construct (GType object_type) {
+	TextEntryDialog * self = NULL;
+	gint _tmp0_;
+#line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 21 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	return self;
+#line 113 "TextEntry.c"
+}
+
+
+TextEntryDialog* text_entry_dialog_new (void) {
+#line 20 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
+#line 120 "TextEntry.c"
+}
+
+
+static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
+#line 127 "TextEntry.c"
+}
+
+
+void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyValidateType modify_validate, void* modify_validate_target, const gchar* title, const gchar* label, const gchar* initial_text, GeeCollection* completion_list, const gchar* completion_delimiter) {
+	const gchar* _tmp0_;
+	AppWindow* _tmp1_;
+	AppWindow* _tmp2_;
+	GdkWindow* _tmp3_;
+	AppWindow* _tmp4_;
+	AppWindow* _tmp5_;
+	TextEntryDialogOnModifyValidateType _tmp6_;
+	void* _tmp6__target;
+	GtkLabel* _tmp7_;
+	const gchar* _tmp8_;
+	const gchar* _tmp9_ = NULL;
+	const gchar* _tmp10_;
+	GtkEntry* _tmp12_;
+	GtkEntry* _tmp13_;
+	GtkEntry* _tmp14_;
+	GeeCollection* _tmp15_;
+#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
+#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_if_fail (title != NULL);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_if_fail (label != NULL);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
+#line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0_ = title;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp2_ = _tmp1_;
+#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
+#line 27 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_g_object_unref0 (_tmp2_);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp4_ = app_window_get_instance ();
+#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp5_ = _tmp4_;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
+#line 28 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_g_object_unref0 (_tmp5_);
+#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp6_ = modify_validate;
+#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp6__target = modify_validate_target;
+#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	self->priv->on_modify_validate = _tmp6_;
+#line 29 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	self->priv->on_modify_validate_target = _tmp6__target;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp7_ = self->priv->label;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp8_ = label;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_label_set_text (_tmp7_, _tmp8_);
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp10_ = initial_text;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	if (_tmp10_ != NULL) {
+#line 196 "TextEntry.c"
+		const gchar* _tmp11_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp11_ = initial_text;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp9_ = _tmp11_;
+#line 202 "TextEntry.c"
+	} else {
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp9_ = "";
+#line 206 "TextEntry.c"
+	}
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp12_ = self->priv->entry;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_entry_set_text (_tmp12_, _tmp9_);
+#line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp13_ = self->priv->entry;
+#line 34 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp14_ = self->priv->entry;
+#line 35 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp15_ = completion_list;
+#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	if (_tmp15_ != NULL) {
+#line 224 "TextEntry.c"
+		EntryMultiCompletion* completion = NULL;
+		GeeCollection* _tmp16_;
+		const gchar* _tmp17_;
+		EntryMultiCompletion* _tmp18_;
+		GtkEntry* _tmp19_;
+		EntryMultiCompletion* _tmp20_;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp16_ = completion_list;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp17_ = completion_delimiter;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp18_ = entry_multi_completion_new (_tmp16_, _tmp17_);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		completion = _tmp18_;
+#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp19_ = self->priv->entry;
+#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp20_ = completion;
+#line 40 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		gtk_entry_set_completion (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_entry_completion_get_type (), GtkEntryCompletion));
+#line 37 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_g_object_unref0 (completion);
+#line 247 "TextEntry.c"
+	}
+#line 43 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+#line 251 "TextEntry.c"
+}
+
+
+gchar* text_entry_dialog_execute (TextEntryDialog* self) {
+	gchar* result = NULL;
+	gchar* text = NULL;
+	TextEntryDialogOnModifyValidateType _tmp0_;
+	void* _tmp0__target;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gint _tmp4_;
+	GtkEntry* _tmp8_;
+	guint _tmp9_;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
+#line 47 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	text = NULL;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0_ = self->priv->on_modify_validate;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0__target = self->priv->on_modify_validate_target;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp1_ = self->priv->entry;
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp2_ = gtk_entry_get_text (_tmp1_);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 54 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
+#line 288 "TextEntry.c"
+		GtkEntry* _tmp5_;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp5_ = self->priv->entry;
+#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp6_ = gtk_entry_get_text (_tmp5_);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		_g_free0 (text);
+#line 55 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+		text = _tmp7_;
+#line 302 "TextEntry.c"
+	}
+#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp8_ = self->priv->entry;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
+#line 57 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
+#line 58 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	result = text;
+#line 60 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	return result;
+#line 316 "TextEntry.c"
+}
+
+
+void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
+	TextEntryDialogOnModifyValidateType _tmp0_;
+	void* _tmp0__target;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0_ = self->priv->on_modify_validate;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp0__target = self->priv->on_modify_validate_target;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp1_ = self->priv->entry;
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp2_ = gtk_entry_get_text (_tmp1_);
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
+#line 64 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
+#line 340 "TextEntry.c"
+}
+
+
+static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
+	gint TextEntryDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	TextEntryDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/textentrydialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "entry", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, entry));
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "label", FALSE, TextEntryDialog_private_offset + G_STRUCT_OFFSET (TextEntryDialogPrivate, label));
+#line 360 "TextEntry.c"
+}
+
+
+static void text_entry_dialog_instance_init (TextEntryDialog * self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 369 "TextEntry.c"
+}
+
+
+static void text_entry_dialog_finalize (GObject * obj) {
+	TextEntryDialog * self;
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_g_object_unref0 (self->priv->entry);
+#line 18 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	_g_object_unref0 (self->priv->label);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/TextEntry.vala"
+	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
+#line 383 "TextEntry.c"
+}
+
+
+GType text_entry_dialog_get_type (void) {
+	static volatile gsize text_entry_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&text_entry_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (TextEntryDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) text_entry_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TextEntryDialog), 0, (GInstanceInitFunc) text_entry_dialog_instance_init, NULL };
+		GType text_entry_dialog_type_id;
+		text_entry_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "TextEntryDialog", &g_define_type_info, 0);
+		g_once_init_leave (&text_entry_dialog_type_id__volatile, text_entry_dialog_type_id);
+	}
+	return text_entry_dialog_type_id__volatile;
+}
+
+
+
diff --git a/src/dialogs/TextEntry.vala b/src/dialogs/TextEntry.vala
new file mode 100644
index 0000000..d82fdbd
--- /dev/null
+++ b/src/dialogs/TextEntry.vala
@@ -0,0 +1,66 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/textentrydialog.ui")]
+public class TextEntryDialog : Gtk.Dialog {
+    public delegate bool OnModifyValidateType(string text);
+
+    private unowned OnModifyValidateType on_modify_validate;
+
+    [GtkChild]
+    private Gtk.Entry entry;
+
+    [GtkChild]
+    private Gtk.Label label;
+
+    public TextEntryDialog() {
+        Object (use_header_bar: Resources.use_header_bar());
+    }
+
+    public void setup(OnModifyValidateType? modify_validate, string title, string label,
+        string? initial_text, Gee.Collection<string>? completion_list, string? completion_delimiter) {
+        set_title(title);
+        set_parent_window(AppWindow.get_instance().get_parent_window());
+        set_transient_for(AppWindow.get_instance());
+        on_modify_validate = modify_validate;
+
+        this.label.set_text(label);
+
+        entry.set_text(initial_text != null ? initial_text : "");
+        entry.grab_focus();
+        entry.changed.connect(on_entry_changed);
+
+        if (completion_list != null) { // Textfield with autocompletion
+            EntryMultiCompletion completion = new EntryMultiCompletion(completion_list,
+                completion_delimiter);
+            entry.set_completion(completion);
+        }
+
+        set_default_response(Gtk.ResponseType.OK);
+    }
+
+    public string? execute() {
+        string? text = null;
+
+        // validate entry to start with
+        set_response_sensitive(Gtk.ResponseType.OK, on_modify_validate(entry.get_text()));
+
+        show_all();
+
+        if (run() == Gtk.ResponseType.OK)
+            text = entry.get_text();
+
+        entry.changed.disconnect(on_entry_changed);
+        destroy();
+
+        return text;
+    }
+
+    public void on_entry_changed() {
+        set_response_sensitive(Gtk.ResponseType.OK, on_modify_validate(entry.get_text()));
+    }
+}
diff --git a/src/dialogs/WelcomeDialog.c b/src/dialogs/WelcomeDialog.c
new file mode 100644
index 0000000..153175b
--- /dev/null
+++ b/src/dialogs/WelcomeDialog.c
@@ -0,0 +1,1377 @@
+/* WelcomeDialog.c generated by valac 0.36.6, the Vala compiler
+ * generated from WelcomeDialog.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+#include <gdk/gdk.h>
+#include <gio/gio.h>
+
+
+#define TYPE_WELCOME_SERVICE_ENTRY (welcome_service_entry_get_type ())
+#define WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntry))
+#define IS_WELCOME_SERVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WELCOME_SERVICE_ENTRY))
+#define WELCOME_SERVICE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_WELCOME_SERVICE_ENTRY, WelcomeServiceEntryIface))
+
+typedef struct _WelcomeServiceEntry WelcomeServiceEntry;
+typedef struct _WelcomeServiceEntryIface WelcomeServiceEntryIface;
+
+#define TYPE_WELCOME_DIALOG (welcome_dialog_get_type ())
+#define WELCOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WELCOME_DIALOG, WelcomeDialog))
+#define WELCOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WELCOME_DIALOG, WelcomeDialogClass))
+#define IS_WELCOME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WELCOME_DIALOG))
+#define IS_WELCOME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_WELCOME_DIALOG))
+#define WELCOME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_WELCOME_DIALOG, WelcomeDialogClass))
+
+typedef struct _WelcomeDialog WelcomeDialog;
+typedef struct _WelcomeDialogClass WelcomeDialogClass;
+typedef struct _WelcomeDialogPrivate WelcomeDialogPrivate;
+
+#define SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST (spit_data_imports_welcome_import_meta_host_get_type ())
+#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHost))
+#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostClass))
+#define SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST))
+#define SPIT_DATA_IMPORTS_IS_WELCOME_IMPORT_META_HOST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST))
+#define SPIT_DATA_IMPORTS_WELCOME_IMPORT_META_HOST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPIT_DATA_IMPORTS_TYPE_WELCOME_IMPORT_META_HOST, SpitDataImportsWelcomeImportMetaHostClass))
+
+typedef struct _SpitDataImportsWelcomeImportMetaHost SpitDataImportsWelcomeImportMetaHost;
+typedef struct _SpitDataImportsWelcomeImportMetaHostClass SpitDataImportsWelcomeImportMetaHostClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+
+struct _WelcomeServiceEntryIface {
+	GTypeInterface parent_iface;
+	gchar* (*get_service_name) (WelcomeServiceEntry* self);
+	void (*execute) (WelcomeServiceEntry* self);
+};
+
+struct _WelcomeDialog {
+	GtkDialog parent_instance;
+	WelcomeDialogPrivate * priv;
+};
+
+struct _WelcomeDialogClass {
+	GtkDialogClass parent_class;
+};
+
+struct _WelcomeDialogPrivate {
+	GtkCheckButton* hide_button;
+	GtkCheckButton* system_pictures_import_check;
+	GtkCheckButton** external_import_checks;
+	gint external_import_checks_length1;
+	gint _external_import_checks_size_;
+	WelcomeServiceEntry** external_import_entries;
+	gint external_import_entries_length1;
+	gint _external_import_entries_size_;
+	GtkLabel* secondary_text;
+	GtkLabel* instruction_header;
+	GtkBox* import_content;
+	GtkBox* import_action_checkbox_packer;
+	GtkBox* external_import_action_checkbox_packer;
+	SpitDataImportsWelcomeImportMetaHost* import_meta_host;
+	gboolean import_content_already_installed;
+	gboolean ok_clicked;
+};
+
+
+static gpointer welcome_dialog_parent_class = NULL;
+
+GType welcome_service_entry_get_type (void) G_GNUC_CONST;
+gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self);
+void welcome_service_entry_execute (WelcomeServiceEntry* self);
+GType welcome_dialog_get_type (void) G_GNUC_CONST;
+GType spit_data_imports_welcome_import_meta_host_get_type (void) G_GNUC_CONST;
+#define WELCOME_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WELCOME_DIALOG, WelcomeDialogPrivate))
+enum  {
+	WELCOME_DIALOG_DUMMY_PROPERTY
+};
+WelcomeDialog* welcome_dialog_new (GtkWindow* owner);
+WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner);
+gint resources_use_header_bar (void);
+SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_new (WelcomeDialog* dialog);
+SpitDataImportsWelcomeImportMetaHost* spit_data_imports_welcome_import_meta_host_construct (GType object_type, WelcomeDialog* dialog);
+static gboolean welcome_dialog_is_system_pictures_import_possible (void);
+#define RESOURCES_OK_LABEL _ ("_OK")
+gchar* get_display_pathname (GFile* file);
+GFile* app_dirs_get_import_dir (void);
+static void welcome_dialog_install_import_content (WelcomeDialog* self);
+void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
+void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
+static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
+static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value);
+static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp);
+gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
+static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value);
+static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length);
+static void welcome_dialog_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);
+
+
+gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
+#line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
+#line 9 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
+#line 129 "WelcomeDialog.c"
+}
+
+
+void welcome_service_entry_execute (WelcomeServiceEntry* self) {
+#line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
+#line 11 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
+#line 138 "WelcomeDialog.c"
+}
+
+
+static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
+#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	static gboolean initialized = FALSE;
+#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (!initialized) {
+#line 8 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		initialized = TRUE;
+#line 149 "WelcomeDialog.c"
+	}
+}
+
+
+GType welcome_service_entry_get_type (void) {
+	static volatile gsize welcome_service_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&welcome_service_entry_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (WelcomeServiceEntryIface), (GBaseInitFunc) welcome_service_entry_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType welcome_service_entry_type_id;
+		welcome_service_entry_type_id = g_type_register_static (G_TYPE_INTERFACE, "WelcomeServiceEntry", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (welcome_service_entry_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&welcome_service_entry_type_id__volatile, welcome_service_entry_type_id);
+	}
+	return welcome_service_entry_type_id__volatile;
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 170 "WelcomeDialog.c"
+}
+
+
+WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
+	WelcomeDialog * self = NULL;
+	gint _tmp0_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp1_;
+	gboolean show_system_pictures_import = FALSE;
+	gboolean _tmp2_;
+	GtkWidget* ok_button = NULL;
+	GtkWidget* _tmp3_;
+	GtkWidget* _tmp4_;
+	GtkWindow* _tmp5_;
+	GtkLabel* primary_text = NULL;
+	GtkLabel* _tmp6_;
+	GtkLabel* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkLabel* _tmp11_;
+	GtkLabel* _tmp12_;
+	GtkLabel* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
+	GtkLabel* _tmp16_;
+	GtkLabel* _tmp17_;
+	GtkImage* image = NULL;
+	GtkImage* _tmp18_;
+	GtkBox* header_text = NULL;
+	GtkBox* _tmp19_;
+	GtkBox* _tmp20_;
+	GtkLabel* _tmp21_;
+	GtkBox* _tmp22_;
+	GtkLabel* _tmp23_;
+	GtkBox* header_content = NULL;
+	GtkBox* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkImage* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkBox* _tmp28_;
+	GtkLabel* instructions = NULL;
+	GtkLabel* _tmp29_;
+	gchar* indent_prefix = NULL;
+	gchar* _tmp30_;
+	const gchar* _tmp31_ = NULL;
+	GtkTextDirection _tmp32_;
+	gchar* arrow_glyph = NULL;
+	gchar* _tmp33_;
+	GtkLabel* _tmp34_;
+	const gchar* _tmp35_;
+	gchar* _tmp36_;
+	gchar* _tmp37_;
+	const gchar* _tmp38_;
+	gchar* _tmp39_;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	gchar* _tmp42_;
+	const gchar* _tmp43_;
+	gchar* _tmp44_;
+	gchar* _tmp45_;
+	gchar* _tmp46_;
+	gchar* _tmp47_;
+	const gchar* _tmp48_;
+	gchar* _tmp49_;
+	gchar* _tmp50_;
+	gchar* _tmp51_;
+	gchar* _tmp52_;
+	GtkLabel* _tmp53_;
+	GtkLabel* _tmp54_;
+	GtkBox* _tmp55_;
+	GtkBox* _tmp56_;
+	GtkBox* _tmp57_;
+	GtkBox* _tmp58_;
+	gboolean _tmp59_;
+	GtkLabel* _tmp70_;
+	GtkLabel* _tmp71_;
+	GtkLabel* _tmp72_;
+	GtkLabel* _tmp73_;
+	GtkBox* content = NULL;
+	GtkBox* _tmp74_;
+	GtkBox* _tmp75_;
+	GtkBox* _tmp76_;
+	GtkBox* _tmp77_;
+	GtkLabel* _tmp78_;
+	GtkCheckButton* _tmp79_;
+	GtkCheckButton* _tmp80_;
+	GtkCheckButton* _tmp81_;
+	GtkBox* _tmp82_;
+	GtkWidget* _tmp83_;
+	SpitDataImportsWelcomeImportMetaHost* _tmp84_;
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
+#line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 29 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self = (WelcomeDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp1_ = spit_data_imports_welcome_import_meta_host_new (self);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_meta_host);
+#line 30 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->import_meta_host = _tmp1_;
+#line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2_ = welcome_dialog_is_system_pictures_import_possible ();
+#line 31 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	show_system_pictures_import = _tmp2_;
+#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp3_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_CLOSE);
+#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 32 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	ok_button = _tmp4_;
+#line 33 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CLOSE);
+#line 35 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _ ("Welcome!"));
+#line 36 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+#line 37 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
+#line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp5_ = owner;
+#line 38 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
+#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp6_ = (GtkLabel*) gtk_label_new ("");
+#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp6_);
+#line 40 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	primary_text = _tmp6_;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp7_ = primary_text;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp8_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _ ("Welcome to Shotwell!"));
+#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp9_ = _tmp8_;
+#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_markup (_tmp7_, _tmp9_);
+#line 41 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp9_);
+#line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp10_ = primary_text;
+#line 43 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_xalign (_tmp10_, 0.0f);
+#line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp11_ = primary_text;
+#line 44 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_yalign (_tmp11_, 0.5f);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp12_ = (GtkLabel*) gtk_label_new ("");
+#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp12_);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->secondary_text);
+#line 45 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->secondary_text = _tmp12_;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp13_ = self->priv->secondary_text;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp14_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _ ("To get started, import photos in any of these ways:"));
+#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp15_ = _tmp14_;
+#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_markup (_tmp13_, _tmp15_);
+#line 46 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp15_);
+#line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp16_ = self->priv->secondary_text;
+#line 48 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_xalign (_tmp16_, 0.0f);
+#line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp17_ = self->priv->secondary_text;
+#line 49 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_yalign (_tmp17_, 0.5f);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp18_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp18_);
+#line 50 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	image = _tmp18_;
+#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp19_);
+#line 52 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	header_text = _tmp19_;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp20_ = header_text;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp21_ = primary_text;
+#line 53 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
+#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp22_ = header_text;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp23_ = self->priv->secondary_text;
+#line 54 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp24_);
+#line 56 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	header_content = _tmp24_;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp25_ = header_content;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp26_ = image;
+#line 57 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp27_ = header_content;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp28_ = header_text;
+#line 58 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp29_ = (GtkLabel*) gtk_label_new ("");
+#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp29_);
+#line 60 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	instructions = _tmp29_;
+#line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp30_ = g_strdup ("   ");
+#line 61 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	indent_prefix = _tmp30_;
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp32_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp32_ == GTK_TEXT_DIR_RTL) {
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp31_ = "◂";
+#line 403 "WelcomeDialog.c"
+	} else {
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp31_ = "▸";
+#line 407 "WelcomeDialog.c"
+	}
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp33_ = g_strdup (_tmp31_);
+#line 63 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	arrow_glyph = _tmp33_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp34_ = instructions;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp35_ = indent_prefix;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp36_ = g_strconcat (_tmp35_, "&#8226; %s\n", NULL);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp37_ = _tmp36_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp38_ = indent_prefix;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp39_ = g_strconcat (_tmp38_, "&#8226; %s\n", NULL);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp40_ = _tmp39_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp42_ = _tmp41_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp43_ = indent_prefix;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp44_ = g_strconcat (_tmp43_, "&#8226; %s", NULL);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp45_ = _tmp44_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp47_ = _tmp46_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp48_ = arrow_glyph;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp49_ = g_strdup_printf (_ ("Choose <span weight=\"bold\">File %s Import From Folder</span>"), _tmp48_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp50_ = _tmp49_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp51_ = g_strdup_printf (_tmp47_, _tmp50_, _ ("Drag and drop photos onto the Shotwell window"), _ ("Connect a camera to your computer and import"));
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp52_ = _tmp51_;
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_markup (_tmp34_, _tmp52_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp52_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp50_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp47_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp45_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp42_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp40_);
+#line 65 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp37_);
+#line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp53_ = instructions;
+#line 70 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_xalign (_tmp53_, 0.0f);
+#line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp54_ = instructions;
+#line 71 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_yalign (_tmp54_, 0.5f);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp55_);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_action_checkbox_packer);
+#line 73 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->import_action_checkbox_packer = _tmp55_;
+#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp56_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp56_);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
+#line 75 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_action_checkbox_packer = _tmp56_;
+#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp57_ = self->priv->import_action_checkbox_packer;
+#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp58_ = self->priv->external_import_action_checkbox_packer;
+#line 76 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+#line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp59_ = show_system_pictures_import;
+#line 78 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp59_) {
+#line 501 "WelcomeDialog.c"
+		GFile* _tmp60_;
+		GFile* _tmp61_;
+		gchar* _tmp62_;
+		gchar* _tmp63_;
+		gchar* _tmp64_;
+		gchar* _tmp65_;
+		GtkCheckButton* _tmp66_;
+		GtkBox* _tmp67_;
+		GtkCheckButton* _tmp68_;
+		GtkCheckButton* _tmp69_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp60_ = app_dirs_get_import_dir ();
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp61_ = _tmp60_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp62_ = get_display_pathname (_tmp61_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp63_ = _tmp62_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp64_ = g_strdup_printf (_ ("_Import photos from your %s folder"), _tmp63_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp65_ = _tmp64_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp66_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp65_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		g_object_ref_sink (_tmp66_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (self->priv->system_pictures_import_check);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		self->priv->system_pictures_import_check = _tmp66_;
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_free0 (_tmp65_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_free0 (_tmp63_);
+#line 79 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (_tmp61_);
+#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp67_ = self->priv->import_action_checkbox_packer;
+#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp68_ = self->priv->system_pictures_import_check;
+#line 82 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget));
+#line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp69_ = self->priv->system_pictures_import_check;
+#line 83 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 548 "WelcomeDialog.c"
+	}
+#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp70_ = (GtkLabel*) gtk_label_new (_ ("You can also import photos in any of these ways:"));
+#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp70_);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->instruction_header);
+#line 86 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->instruction_header = _tmp70_;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp71_ = self->priv->instruction_header;
+#line 88 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_xalign (_tmp71_, 0.0f);
+#line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp72_ = self->priv->instruction_header;
+#line 89 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_label_set_yalign (_tmp72_, 0.5f);
+#line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp73_ = self->priv->instruction_header;
+#line 90 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget), 20);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp74_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp74_);
+#line 92 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	content = _tmp74_;
+#line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp75_ = header_content;
+#line 93 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp76_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp76_);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_content);
+#line 94 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->import_content = _tmp76_;
+#line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp77_ = self->priv->import_content;
+#line 95 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget));
+#line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp78_ = instructions;
+#line 96 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_ ("_Don’t show this message again"));
+#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp79_);
+#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->hide_button);
+#line 98 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->hide_button = _tmp79_;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp80_ = self->priv->hide_button;
+#line 99 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp81_ = self->priv->hide_button;
+#line 100 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+#line 101 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 102 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 103 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 104 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 105 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
+#line 106 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 0);
+#line 107 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
+#line 108 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
+#line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp82_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 110 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp83_ = ok_button;
+#line 112 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_grab_focus (_tmp83_);
+#line 114 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	welcome_dialog_install_import_content (self);
+#line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp84_ = self->priv->import_meta_host;
+#line 116 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	spit_data_imports_welcome_import_meta_host_start (_tmp84_);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (content);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (arrow_glyph);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (indent_prefix);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (instructions);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (header_content);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (header_text);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (image);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (primary_text);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (ok_button);
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return self;
+#line 662 "WelcomeDialog.c"
+}
+
+
+WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
+#line 28 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
+#line 669 "WelcomeDialog.c"
+}
+
+
+static void welcome_dialog_install_import_content (WelcomeDialog* self) {
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	GtkCheckButton** _tmp2_;
+	gint _tmp2__length1;
+#line 119 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_if_fail (IS_WELCOME_DIALOG (self));
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2_ = self->priv->external_import_checks;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2__length1 = self->priv->external_import_checks_length1;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp2__length1 > 0) {
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp1_ = TRUE;
+#line 688 "WelcomeDialog.c"
+	} else {
+		GtkCheckButton* _tmp3_;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp3_ = self->priv->system_pictures_import_check;
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp1_ = _tmp3_ != NULL;
+#line 695 "WelcomeDialog.c"
+	}
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp1_) {
+#line 699 "WelcomeDialog.c"
+		gboolean _tmp4_;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp4_ = self->priv->import_content_already_installed;
+#line 122 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp0_ = _tmp4_ == FALSE;
+#line 705 "WelcomeDialog.c"
+	} else {
+#line 121 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp0_ = FALSE;
+#line 709 "WelcomeDialog.c"
+	}
+#line 120 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp0_) {
+#line 713 "WelcomeDialog.c"
+		GtkLabel* _tmp5_;
+		GtkBox* _tmp6_;
+		GtkBox* _tmp7_;
+		GtkBox* _tmp8_;
+		GtkLabel* _tmp9_;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp5_ = self->priv->secondary_text;
+#line 124 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		gtk_label_set_markup (_tmp5_, "");
+#line 125 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp6_ = self->priv->import_content;
+#line 125 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp7_ = self->priv->import_action_checkbox_packer;
+#line 125 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 126 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp8_ = self->priv->import_content;
+#line 126 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp9_ = self->priv->instruction_header;
+#line 126 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 127 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		self->priv->import_content_already_installed = TRUE;
+#line 737 "WelcomeDialog.c"
+	}
+}
+
+
+static void _vala_array_add4 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if ((*length) == (*size)) {
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
+#line 749 "WelcomeDialog.c"
+	}
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[(*length)++] = value;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[*length] = NULL;
+#line 755 "WelcomeDialog.c"
+}
+
+
+static void _vala_array_add5 (GtkCheckButton** * array, int* length, int* size, GtkCheckButton* value) {
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if ((*length) == (*size)) {
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
+#line 766 "WelcomeDialog.c"
+	}
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[(*length)++] = value;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[*length] = NULL;
+#line 772 "WelcomeDialog.c"
+}
+
+
+void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry) {
+	WelcomeServiceEntry* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	WelcomeServiceEntry** _tmp5_;
+	gint _tmp5__length1;
+	WelcomeServiceEntry* _tmp6_;
+	WelcomeServiceEntry* _tmp7_;
+	GtkCheckButton* entry_check = NULL;
+	WelcomeServiceEntry* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gchar* _tmp12_;
+	GtkCheckButton* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	GtkCheckButton** _tmp15_;
+	gint _tmp15__length1;
+	GtkCheckButton* _tmp16_;
+	GtkBox* _tmp17_;
+#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_if_fail (IS_WELCOME_DIALOG (self));
+#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp0_ = entry;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2_ = _tmp1_;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp4_ = _tmp3_;
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_debug ("WelcomeDialog.vala:132: %s", _tmp4_);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp4_);
+#line 132 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp2_);
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp5_ = self->priv->external_import_entries;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp5__length1 = self->priv->external_import_entries_length1;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp6_ = entry;
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp7_ = _g_object_ref0 (_tmp6_);
+#line 133 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_array_add4 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp8_ = entry;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp9_ = welcome_service_entry_get_service_name (_tmp8_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp10_ = _tmp9_;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp11_ = g_strdup_printf (_ ("Import photos from your %s library"), _tmp10_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp12_ = _tmp11_;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp13_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp12_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_object_ref_sink (_tmp13_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp14_ = _tmp13_;
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp12_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_free0 (_tmp10_);
+#line 134 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	entry_check = _tmp14_;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp15_ = self->priv->external_import_checks;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp15__length1 = self->priv->external_import_checks_length1;
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp16_ = _g_object_ref0 (entry_check);
+#line 136 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_array_add5 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp16_);
+#line 137 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp17_ = self->priv->external_import_action_checkbox_packer;
+#line 138 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
+#line 139 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	welcome_dialog_install_import_content (self);
+#line 131 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (entry_check);
+#line 868 "WelcomeDialog.c"
+}
+
+
+/**
+     * Connected to the 'response' signal.  This is part of a workaround
+     * for the fact that run()-ning this dialog can interfere with displaying
+     * images from a camera; please see #4997 for details.
+     */
+static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
+	gint _tmp0_;
+#line 147 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_if_fail (IS_WELCOME_DIALOG (self));
+#line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp0_ = resp;
+#line 148 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp0_ == ((gint) GTK_RESPONSE_CLOSE)) {
+#line 149 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		self->priv->ok_clicked = TRUE;
+#line 887 "WelcomeDialog.c"
+	}
+#line 151 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 152 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_main_quit ();
+#line 893 "WelcomeDialog.c"
+}
+
+
+static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+#line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
+#line 900 "WelcomeDialog.c"
+}
+
+
+static void _vala_array_add6 (WelcomeServiceEntry** * array, int* length, int* size, WelcomeServiceEntry* value) {
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if ((*length) == (*size)) {
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
+#line 911 "WelcomeDialog.c"
+	}
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[(*length)++] = value;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	(*array)[*length] = NULL;
+#line 917 "WelcomeDialog.c"
+}
+
+
+static WelcomeServiceEntry** _vala_array_dup1 (WelcomeServiceEntry** self, int length) {
+	WelcomeServiceEntry** result;
+	int i;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	result = g_new0 (WelcomeServiceEntry*, length + 1);
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	for (i = 0; i < length; i++) {
+#line 928 "WelcomeDialog.c"
+		WelcomeServiceEntry* _tmp0_;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp0_ = _g_object_ref0 (self[i]);
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		result[i] = _tmp0_;
+#line 934 "WelcomeDialog.c"
+	}
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return result;
+#line 938 "WelcomeDialog.c"
+}
+
+
+gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import) {
+	WelcomeServiceEntry** _vala_selected_import_entries = NULL;
+	int _vala_selected_import_entries_length1 = 0;
+	gboolean _vala_do_system_pictures_import = FALSE;
+	gboolean result = FALSE;
+	guint _tmp0_;
+	gboolean ok = FALSE;
+	gboolean _tmp1_;
+	gboolean show_dialog = FALSE;
+	gboolean _tmp2_;
+	WelcomeServiceEntry** _result_ = NULL;
+	WelcomeServiceEntry** _tmp5_;
+	gint _result__length1;
+	gint __result__size_;
+	WelcomeServiceEntry** _tmp19_;
+	gint _tmp19__length1;
+	WelcomeServiceEntry** _tmp20_;
+	gint _tmp20__length1;
+	gboolean _tmp21_ = FALSE;
+	GtkCheckButton* _tmp22_;
+#line 155 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
+#line 158 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
+#line 159 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 160 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 165 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_main ();
+#line 169 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
+#line 169 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
+#line 171 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp1_ = self->priv->ok_clicked;
+#line 171 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	ok = _tmp1_;
+#line 172 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	show_dialog = TRUE;
+#line 174 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2_ = ok;
+#line 174 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp2_) {
+#line 986 "WelcomeDialog.c"
+		GtkCheckButton* _tmp3_;
+		gboolean _tmp4_;
+#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp3_ = self->priv->hide_button;
+#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 175 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		show_dialog = !_tmp4_;
+#line 995 "WelcomeDialog.c"
+	}
+#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_result_ = _tmp5_;
+#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_result__length1 = 0;
+#line 178 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	__result__size_ = _result__length1;
+#line 1005 "WelcomeDialog.c"
+	{
+		gint i = 0;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		i = 0;
+#line 1010 "WelcomeDialog.c"
+		{
+			gboolean _tmp6_ = FALSE;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+			_tmp6_ = TRUE;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+			while (TRUE) {
+#line 1017 "WelcomeDialog.c"
+				gint _tmp8_;
+				WelcomeServiceEntry** _tmp9_;
+				gint _tmp9__length1;
+				GtkCheckButton** _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				GtkCheckButton* _tmp12_;
+				gboolean _tmp13_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				if (!_tmp6_) {
+#line 1028 "WelcomeDialog.c"
+					gint _tmp7_;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp7_ = i;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					i = _tmp7_ + 1;
+#line 1034 "WelcomeDialog.c"
+				}
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp6_ = FALSE;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp8_ = i;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp9_ = self->priv->external_import_entries;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp9__length1 = self->priv->external_import_entries_length1;
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				if (!(_tmp8_ < _tmp9__length1)) {
+#line 179 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					break;
+#line 1048 "WelcomeDialog.c"
+				}
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp10_ = self->priv->external_import_checks;
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp10__length1 = self->priv->external_import_checks_length1;
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp11_ = i;
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp12_ = _tmp10_[_tmp11_];
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 180 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+				if (_tmp13_ == TRUE) {
+#line 1062 "WelcomeDialog.c"
+					WelcomeServiceEntry** _tmp14_;
+					gint _tmp14__length1;
+					WelcomeServiceEntry** _tmp15_;
+					gint _tmp15__length1;
+					gint _tmp16_;
+					WelcomeServiceEntry* _tmp17_;
+					WelcomeServiceEntry* _tmp18_;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp14_ = _result_;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp14__length1 = _result__length1;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp15_ = self->priv->external_import_entries;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp15__length1 = self->priv->external_import_entries_length1;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp16_ = i;
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp17_ = _tmp15_[_tmp16_];
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_tmp18_ = _g_object_ref0 (_tmp17_);
+#line 181 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+					_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+#line 1086 "WelcomeDialog.c"
+				}
+			}
+		}
+	}
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp19_ = _result_;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp19__length1 = _result__length1;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup1 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp20__length1 = _tmp19__length1;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_selected_import_entries = _tmp20_;
+#line 183 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_selected_import_entries_length1 = _tmp20__length1;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp22_ = self->priv->system_pictures_import_check;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (_tmp22_ != NULL) {
+#line 1109 "WelcomeDialog.c"
+		GtkCheckButton* _tmp23_;
+		gboolean _tmp24_;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp23_ = self->priv->system_pictures_import_check;
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp21_ = _tmp24_;
+#line 1118 "WelcomeDialog.c"
+	} else {
+#line 185 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp21_ = FALSE;
+#line 1122 "WelcomeDialog.c"
+	}
+#line 184 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_vala_do_system_pictures_import = _tmp21_;
+#line 187 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	result = show_dialog;
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (selected_import_entries) {
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*selected_import_entries = _vala_selected_import_entries;
+#line 1136 "WelcomeDialog.c"
+	} else {
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 1140 "WelcomeDialog.c"
+	}
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (selected_import_entries_length1) {
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
+#line 1146 "WelcomeDialog.c"
+	}
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (do_system_pictures_import) {
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		*do_system_pictures_import = _vala_do_system_pictures_import;
+#line 1152 "WelcomeDialog.c"
+	}
+#line 189 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return result;
+#line 1156 "WelcomeDialog.c"
+}
+
+
+static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
+	gboolean result = FALSE;
+	GFile* system_pictures = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gboolean _tmp2_;
+	GFile* _tmp3_;
+	GFileType _tmp4_;
+	gboolean _tmp10_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 193 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp0_ = app_dirs_get_import_dir ();
+#line 193 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	system_pictures = _tmp0_;
+#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp1_ = system_pictures;
+#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
+#line 194 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (!_tmp2_) {
+#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		result = FALSE;
+#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (system_pictures);
+#line 195 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		return result;
+#line 1186 "WelcomeDialog.c"
+	}
+#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp3_ = system_pictures;
+#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
+#line 197 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
+#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		result = FALSE;
+#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (system_pictures);
+#line 198 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		return result;
+#line 1200 "WelcomeDialog.c"
+	}
+	{
+		GFileEnumerator* syspics_child_enum = NULL;
+		GFile* _tmp5_;
+		GFileEnumerator* _tmp6_;
+		GFileInfo* _tmp7_ = NULL;
+		GFileEnumerator* _tmp8_;
+		GFileInfo* _tmp9_;
+#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp5_ = system_pictures;
+#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		syspics_child_enum = _tmp6_;
+#line 201 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1217 "WelcomeDialog.c"
+			goto __catch24_g_error;
+		}
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp8_ = syspics_child_enum;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_tmp7_ = _tmp9_;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+			_g_object_unref0 (syspics_child_enum);
+#line 1230 "WelcomeDialog.c"
+			goto __catch24_g_error;
+		}
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		result = _tmp7_ != NULL;
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (_tmp7_);
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (syspics_child_enum);
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (system_pictures);
+#line 203 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		return result;
+#line 1243 "WelcomeDialog.c"
+	}
+	goto __finally24;
+	__catch24_g_error:
+	{
+		GError* e = NULL;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		e = _inner_error_;
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_inner_error_ = NULL;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		result = FALSE;
+#line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_error_free0 (e);
+#line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		_g_object_unref0 (system_pictures);
+#line 205 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+		return result;
+#line 1261 "WelcomeDialog.c"
+	}
+	__finally24:
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (system_pictures);
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_clear_error (&_inner_error_);
+#line 200 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	return _tmp10_;
+#line 1272 "WelcomeDialog.c"
+}
+
+
+static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
+#line 1283 "WelcomeDialog.c"
+}
+
+
+static void welcome_dialog_instance_init (WelcomeDialog * self) {
+	GtkCheckButton** _tmp0_;
+	WelcomeServiceEntry** _tmp1_;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
+#line 16 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->system_pictures_import_check = NULL;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
+#line 17 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_checks = _tmp0_;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_checks_length1 = 0;
+#line 17 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
+#line 18 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+#line 18 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_entries = _tmp1_;
+#line 18 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_entries_length1 = 0;
+#line 18 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
+#line 25 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->import_content_already_installed = FALSE;
+#line 26 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->ok_clicked = FALSE;
+#line 1314 "WelcomeDialog.c"
+}
+
+
+static void welcome_dialog_finalize (GObject * obj) {
+	WelcomeDialog * self;
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
+#line 15 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->hide_button);
+#line 16 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->system_pictures_import_check);
+#line 17 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 18 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
+#line 19 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->secondary_text);
+#line 20 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->instruction_header);
+#line 21 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_content);
+#line 22 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_action_checkbox_packer);
+#line 23 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
+#line 24 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	_g_object_unref0 (self->priv->import_meta_host);
+#line 14 "/home/jens/Source/shotwell/src/dialogs/WelcomeDialog.vala"
+	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
+#line 1344 "WelcomeDialog.c"
+}
+
+
+GType welcome_dialog_get_type (void) {
+	static volatile gsize welcome_dialog_type_id__volatile = 0;
+	if (g_once_init_enter (&welcome_dialog_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (WelcomeDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) welcome_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WelcomeDialog), 0, (GInstanceInitFunc) welcome_dialog_instance_init, NULL };
+		GType welcome_dialog_type_id;
+		welcome_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "WelcomeDialog", &g_define_type_info, 0);
+		g_once_init_leave (&welcome_dialog_type_id__volatile, welcome_dialog_type_id);
+	}
+	return welcome_dialog_type_id__volatile;
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff --git a/src/dialogs/WelcomeDialog.vala b/src/dialogs/WelcomeDialog.vala
new file mode 100644
index 0000000..e40686d
--- /dev/null
+++ b/src/dialogs/WelcomeDialog.vala
@@ -0,0 +1,208 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ * Copyright 2017 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public interface WelcomeServiceEntry : GLib.Object {
+    public abstract string get_service_name();
+
+    public abstract void execute();
+}
+
+public class WelcomeDialog : Gtk.Dialog {
+    Gtk.CheckButton hide_button;
+    Gtk.CheckButton? system_pictures_import_check = null;
+    Gtk.CheckButton[] external_import_checks = new Gtk.CheckButton[0];
+    WelcomeServiceEntry[] external_import_entries = new WelcomeServiceEntry[0];
+    Gtk.Label secondary_text;
+    Gtk.Label instruction_header;
+    Gtk.Box import_content;
+    Gtk.Box import_action_checkbox_packer;
+    Gtk.Box external_import_action_checkbox_packer;
+    Spit.DataImports.WelcomeImportMetaHost import_meta_host;
+    bool import_content_already_installed = false;
+    bool ok_clicked = false;
+
+    public WelcomeDialog(Gtk.Window owner) {
+        Object(use_header_bar : Resources.use_header_bar());
+        import_meta_host = new Spit.DataImports.WelcomeImportMetaHost(this);
+        bool show_system_pictures_import = is_system_pictures_import_possible();
+        Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.CLOSE);
+        set_default_response(Gtk.ResponseType.CLOSE);
+
+        set_title(_("Welcome!"));
+        set_resizable(false);
+        set_type_hint(Gdk.WindowTypeHint.DIALOG);
+        set_transient_for(owner);
+
+        Gtk.Label primary_text = new Gtk.Label("");
+        primary_text.set_markup(
+            "<span size=\"large\" weight=\"bold\">%s</span>".printf(_("Welcome to Shotwell!")));
+        primary_text.xalign = 0.0f;
+        primary_text.yalign = 0.5f;
+        secondary_text = new Gtk.Label("");
+        secondary_text.set_markup("<span weight=\"normal\">%s</span>".printf(
+            _("To get started, import photos in any of these ways:")));
+        secondary_text.xalign = 0.0f;
+        secondary_text.yalign = 0.5f;
+        var image = new Gtk.Image.from_icon_name ("shotwell", Gtk.IconSize.DIALOG);
+
+        Gtk.Box header_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        header_text.pack_start(primary_text, false, false, 5);
+        header_text.pack_start(secondary_text, false, false, 0);
+
+        Gtk.Box header_content = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 12);
+        header_content.pack_start(image, false, false, 0);
+        header_content.pack_start(header_text, false, false, 0);
+
+        Gtk.Label instructions = new Gtk.Label("");
+        string indent_prefix = "   "; // we can't tell what the indent prefix is going to be so assume we need one
+
+        string arrow_glyph = (get_direction() == Gtk.TextDirection.RTL) ? "◂" : "▸";
+
+        instructions.set_markup(((indent_prefix + "&#8226; %s\n") + (indent_prefix + "&#8226; %s\n")
+            + (indent_prefix + "&#8226; %s")).printf(
+            _("Choose <span weight=\"bold\">File %s Import From Folder</span>").printf(arrow_glyph),
+            _("Drag and drop photos onto the Shotwell window"),
+            _("Connect a camera to your computer and import")));
+        instructions.xalign = 0.0f;
+        instructions.yalign = 0.5f;
+
+        import_action_checkbox_packer = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
+
+        external_import_action_checkbox_packer = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
+        import_action_checkbox_packer.add(external_import_action_checkbox_packer);
+
+        if (show_system_pictures_import) {
+            system_pictures_import_check = new Gtk.CheckButton.with_mnemonic(
+                _("_Import photos from your %s folder").printf(
+                get_display_pathname(AppDirs.get_import_dir())));
+            import_action_checkbox_packer.add(system_pictures_import_check);
+            system_pictures_import_check.set_active(true);
+        }
+
+        instruction_header = new Gtk.Label(
+            _("You can also import photos in any of these ways:"));
+        instruction_header.xalign = 0.0f;
+        instruction_header.yalign = 0.5f;
+        instruction_header.set_margin_top(20);
+
+        Gtk.Box content = new Gtk.Box(Gtk.Orientation.VERTICAL, 16);
+        content.pack_start(header_content, true, true, 0);
+        import_content = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
+        content.add(import_content);
+        content.pack_start(instructions, false, false, 0);
+
+        hide_button = new Gtk.CheckButton.with_mnemonic(_("_Don’t show this message again"));
+        hide_button.set_active(true);
+        content.pack_start(hide_button, false, false, 6);
+        content.halign = Gtk.Align.FILL;
+        content.valign = Gtk.Align.FILL;
+        content.hexpand = false;
+        content.vexpand = false;
+        content.margin_top = 12;
+        content.margin_bottom = 0;
+        content.margin_start = 12;
+        content.margin_end = 12;
+
+        ((Gtk.Box) get_content_area()).pack_start(content, false, false, 0);
+
+        ok_button.grab_focus();
+
+        install_import_content();
+
+        import_meta_host.start();
+    }
+
+    private void install_import_content() {
+        if (
+            (external_import_checks.length > 0 || system_pictures_import_check != null) &&
+            (import_content_already_installed == false)
+        ) {
+            secondary_text.set_markup("");
+            import_content.add(import_action_checkbox_packer);
+            import_content.add(instruction_header);
+            import_content_already_installed = true;
+        }
+    }
+
+    public void install_service_entry(WelcomeServiceEntry entry) {
+        debug("WelcomeDialog: Installing service entry for %s".printf(entry.get_service_name()));
+        external_import_entries += entry;
+        Gtk.CheckButton entry_check = new Gtk.CheckButton.with_label(
+            _("Import photos from your %s library").printf(entry.get_service_name()));
+        external_import_checks += entry_check;
+        entry_check.set_active(true);
+        external_import_action_checkbox_packer.add(entry_check);
+        install_import_content();
+    }
+
+    /**
+     * Connected to the 'response' signal.  This is part of a workaround
+     * for the fact that run()-ning this dialog can interfere with displaying
+     * images from a camera; please see #4997 for details.
+     */
+    private void on_dismiss(int resp) {
+        if (resp == Gtk.ResponseType.CLOSE) {
+            ok_clicked = true;
+        }
+        hide();
+        Gtk.main_quit();
+    }
+
+    public bool execute(out WelcomeServiceEntry[] selected_import_entries, out bool do_system_pictures_import) {
+        // it's unsafe to call run() here - it interferes with displaying
+        // images from a camera - so we process the dialog ourselves.
+        response.connect(on_dismiss);
+        show_all();
+        show();
+
+        // this will block the thread we're in until a matching call
+        // to main_quit() is encountered; this happens when either the window
+        // is closed or OK is clicked.
+        Gtk.main();
+
+        // at this point, the inner main loop will have been exited.
+        // we've got the response, so we don't need this signal anymore.
+        response.disconnect(on_dismiss);
+
+        bool ok = ok_clicked;
+        bool show_dialog = true;
+
+        if (ok)
+            show_dialog = !hide_button.get_active();
+
+        // Use a temporary variable as += cannot be used on parameters
+        WelcomeServiceEntry[] result = new WelcomeServiceEntry[0];
+        for (int i = 0; i < external_import_entries.length; i++) {
+            if (external_import_checks[i].get_active() == true)
+                result += external_import_entries[i];
+        }
+        selected_import_entries = result;
+        do_system_pictures_import =
+            (system_pictures_import_check != null) ? system_pictures_import_check.get_active() : false;
+
+        destroy();
+
+        return show_dialog;
+    }
+
+    private static bool is_system_pictures_import_possible() {
+        File system_pictures = AppDirs.get_import_dir();
+        if (!system_pictures.query_exists(null))
+            return false;
+
+        if (!(system_pictures.query_file_type(FileQueryInfoFlags.NONE, null) == FileType.DIRECTORY))
+            return false;
+
+        try {
+            FileEnumerator syspics_child_enum = system_pictures.enumerate_children("standard::*",
+                FileQueryInfoFlags.NONE, null);
+            return (syspics_child_enum.next_file(null) != null);
+        } catch (Error e) {
+            return false;
+        }
+    }
+}
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 013bb80..0a51b29 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -15,6 +15,7 @@
 #include <gio/gio.h>
 #include <time.h>
 #include <gee.h>
+#include "shotwell-graphics-processor.h"
 
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -259,16 +260,6 @@ typedef struct _PhotoRowPrivate PhotoRowPrivate;
 #define TYPE_PHOTO_ID (photo_id_get_type ())
 typedef struct _PhotoID PhotoID;
 
-#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
-#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
-#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
-#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
-#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
-
-typedef struct _KeyValueMap KeyValueMap;
-typedef struct _KeyValueMapClass KeyValueMapClass;
-
 #define TYPE_BACKING_PHOTO_ID (backing_photo_id_get_type ())
 typedef struct _BackingPhotoID BackingPhotoID;
 
@@ -965,13 +956,6 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati
 GType photo_id_get_type (void) G_GNUC_CONST;
 PhotoID* photo_id_dup (const PhotoID* self);
 void photo_id_free (PhotoID* self);
-gpointer key_value_map_ref (gpointer instance);
-void key_value_map_unref (gpointer instance);
-GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_key_value_map (GValue* value, gpointer v_object);
-void value_take_key_value_map (GValue* value, gpointer v_object);
-gpointer value_get_key_value_map (const GValue* value);
-GType key_value_map_get_type (void) G_GNUC_CONST;
 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);
@@ -1126,14 +1110,14 @@ static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) {
 	self = (DirectPhoto*) photo_construct (object_type, _tmp0_);
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1130 "DirectPhoto.c"
+#line 1114 "DirectPhoto.c"
 }
 
 
 static DirectPhoto* direct_photo_new (PhotoRow* row) {
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_construct (TYPE_DIRECT_PHOTO, row);
-#line 1137 "DirectPhoto.c"
+#line 1121 "DirectPhoto.c"
 }
 
 
@@ -1170,7 +1154,7 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati
 	_tmp3_ = dest;
 #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_->original_orientation = _tmp3_;
-#line 1174 "DirectPhoto.c"
+#line 1158 "DirectPhoto.c"
 }
 
 
@@ -1214,13 +1198,13 @@ void direct_photo_init (GFile* initial_file) {
 	_tmp6_ = reason;
 #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp6_ != NULL) {
-#line 1218 "DirectPhoto.c"
+#line 1202 "DirectPhoto.c"
 		const gchar* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp7_ = reason;
 #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_);
-#line 1224 "DirectPhoto.c"
+#line 1208 "DirectPhoto.c"
 	}
 #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp8_ = direct_photo_global;
@@ -1232,14 +1216,14 @@ void direct_photo_init (GFile* initial_file) {
 	_g_free0 (reason);
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 1236 "DirectPhoto.c"
+#line 1220 "DirectPhoto.c"
 }
 
 
 void direct_photo_terminate (void) {
 #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	photo_terminate_photo ();
-#line 1243 "DirectPhoto.c"
+#line 1227 "DirectPhoto.c"
 }
 
 
@@ -1247,7 +1231,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO (self));
-#line 1251 "DirectPhoto.c"
+#line 1235 "DirectPhoto.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
@@ -1262,8 +1246,8 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp0_ = _tmp2_;
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1266 "DirectPhoto.c"
-			goto __catch45_g_error;
+#line 1250 "DirectPhoto.c"
+			goto __catch49_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;
@@ -1273,10 +1257,10 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_tmp3_->dim = _tmp4_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1277 "DirectPhoto.c"
+#line 1261 "DirectPhoto.c"
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_;
@@ -1295,9 +1279,9 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_free0 (_tmp6_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_error_free0 (e);
-#line 1299 "DirectPhoto.c"
+#line 1283 "DirectPhoto.c"
 	}
-	__finally45:
+	__finally49:
 #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"
@@ -1306,7 +1290,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 1310 "DirectPhoto.c"
+#line 1294 "DirectPhoto.c"
 	}
 }
 
@@ -1328,7 +1312,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		result = IMPORT_RESULT_SUCCESS;
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1332 "DirectPhoto.c"
+#line 1316 "DirectPhoto.c"
 	}
 	{
 		PhotoReimportMasterState* _tmp1_ = NULL;
@@ -1341,8 +1325,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		reimport_state = _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1345 "DirectPhoto.c"
-			goto __catch46_g_error;
+#line 1329 "DirectPhoto.c"
+			goto __catch50_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1350,12 +1334,12 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_);
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1354 "DirectPhoto.c"
-			goto __catch46_g_error;
+#line 1338 "DirectPhoto.c"
+			goto __catch50_g_error;
 		}
 	}
-	goto __finally46;
-	__catch46_g_error:
+	goto __finally50;
+	__catch50_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
@@ -1378,9 +1362,9 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		_photo_reimport_master_state_unref0 (reimport_state);
 #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 1382 "DirectPhoto.c"
+#line 1366 "DirectPhoto.c"
 	}
-	__finally46:
+	__finally50:
 #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"
@@ -1391,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return 0;
-#line 1395 "DirectPhoto.c"
+#line 1379 "DirectPhoto.c"
 	}
 #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = TRUE;
@@ -1403,7 +1387,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 	_photo_reimport_master_state_unref0 (reimport_state);
 #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1407 "DirectPhoto.c"
+#line 1391 "DirectPhoto.c"
 }
 
 
@@ -1458,15 +1442,15 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) {
 	if (photo) {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 1462 "DirectPhoto.c"
+#line 1446 "DirectPhoto.c"
 	} else {
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 1466 "DirectPhoto.c"
+#line 1450 "DirectPhoto.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1470 "DirectPhoto.c"
+#line 1454 "DirectPhoto.c"
 }
 
 
@@ -1485,7 +1469,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	_tmp0_ = self->priv->preview;
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp0_ == NULL) {
-#line 1489 "DirectPhoto.c"
+#line 1473 "DirectPhoto.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
@@ -1500,7 +1484,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			g_propagate_error (error, _inner_error_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1504 "DirectPhoto.c"
+#line 1488 "DirectPhoto.c"
 		}
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = _tmp1_;
@@ -1514,7 +1498,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 		_tmp4_ = self->priv->preview;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_ == NULL) {
-#line 1518 "DirectPhoto.c"
+#line 1502 "DirectPhoto.c"
 			GdkPixbuf* _tmp5_ = NULL;
 			Scaling _tmp6_;
 			GdkPixbuf* _tmp7_;
@@ -1533,7 +1517,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 				_g_object_unref0 (_tmp1_);
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 1537 "DirectPhoto.c"
+#line 1521 "DirectPhoto.c"
 			}
 #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp8_ = _tmp5_;
@@ -1545,11 +1529,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 			self->priv->preview = _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1549 "DirectPhoto.c"
+#line 1533 "DirectPhoto.c"
 		}
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1553 "DirectPhoto.c"
+#line 1537 "DirectPhoto.c"
 	}
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->preview;
@@ -1559,7 +1543,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali
 	result = _tmp10_;
 #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1563 "DirectPhoto.c"
+#line 1547 "DirectPhoto.c"
 }
 
 
@@ -1576,7 +1560,7 @@ static void direct_photo_real_rotate (Photo* base, Rotation rotation) {
 	_tmp0_ = rotation;
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
-#line 1580 "DirectPhoto.c"
+#line 1564 "DirectPhoto.c"
 }
 
 
@@ -1603,7 +1587,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 		g_propagate_error (error, _inner_error_);
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return NULL;
-#line 1607 "DirectPhoto.c"
+#line 1591 "DirectPhoto.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE);
@@ -1613,7 +1597,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal
 	result = ret;
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1617 "DirectPhoto.c"
+#line 1601 "DirectPhoto.c"
 }
 
 
@@ -1638,7 +1622,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	if (_tmp3_ == NULL) {
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = TRUE;
-#line 1642 "DirectPhoto.c"
+#line 1626 "DirectPhoto.c"
 	} else {
 		PhotoMetadata* _tmp4_;
 		guint _tmp5_;
@@ -1648,7 +1632,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_tmp5_ = photo_metadata_get_preview_count (_tmp4_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = _tmp5_ == ((guint) 0);
-#line 1652 "DirectPhoto.c"
+#line 1636 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp2_) {
@@ -1656,7 +1640,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_g_object_unref0 (_tmp1_);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp1_ = NULL;
-#line 1660 "DirectPhoto.c"
+#line 1644 "DirectPhoto.c"
 	} else {
 		GdkPixbuf* _tmp6_ = NULL;
 		PhotoMetadata* _tmp7_;
@@ -1690,7 +1674,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 			_media_metadata_unref0 (metadata);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			return NULL;
-#line 1694 "DirectPhoto.c"
+#line 1678 "DirectPhoto.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -1702,7 +1686,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 		_tmp1_ = _tmp13_;
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1706 "DirectPhoto.c"
+#line 1690 "DirectPhoto.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp1_;
@@ -1710,7 +1694,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s
 	_media_metadata_unref0 (metadata);
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1714 "DirectPhoto.c"
+#line 1698 "DirectPhoto.c"
 }
 
 
@@ -1729,7 +1713,7 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte
 	_tmp0_ = alteration;
 #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_);
-#line 1733 "DirectPhoto.c"
+#line 1717 "DirectPhoto.c"
 }
 
 
@@ -1742,7 +1726,7 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) {
 	result = FALSE;
 #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1746 "DirectPhoto.c"
+#line 1730 "DirectPhoto.c"
 }
 
 
@@ -1752,7 +1736,7 @@ static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMe
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1756 "DirectPhoto.c"
+#line 1740 "DirectPhoto.c"
 }
 
 
@@ -1762,7 +1746,7 @@ static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, Pho
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1766 "DirectPhoto.c"
+#line 1750 "DirectPhoto.c"
 }
 
 
@@ -1775,7 +1759,7 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) {
 	result = FALSE;
 #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1779 "DirectPhoto.c"
+#line 1763 "DirectPhoto.c"
 }
 
 
@@ -1788,7 +1772,7 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) {
 	result = FALSE;
 #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1792 "DirectPhoto.c"
+#line 1776 "DirectPhoto.c"
 }
 
 
@@ -1796,7 +1780,7 @@ static void direct_photo_real_trash (MediaSource* base) {
 	DirectPhoto * self;
 #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1800 "DirectPhoto.c"
+#line 1784 "DirectPhoto.c"
 }
 
 
@@ -1804,7 +1788,7 @@ static void direct_photo_real_untrash (MediaSource* base) {
 	DirectPhoto * self;
 #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1808 "DirectPhoto.c"
+#line 1792 "DirectPhoto.c"
 }
 
 
@@ -1812,7 +1796,7 @@ static void direct_photo_real_mark_offline (MediaSource* base) {
 	DirectPhoto * self;
 #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1816 "DirectPhoto.c"
+#line 1800 "DirectPhoto.c"
 }
 
 
@@ -1820,7 +1804,7 @@ static void direct_photo_real_mark_online (MediaSource* base) {
 	DirectPhoto * self;
 #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto);
-#line 1824 "DirectPhoto.c"
+#line 1808 "DirectPhoto.c"
 }
 
 
@@ -1861,7 +1845,7 @@ static void direct_photo_class_init (DirectPhotoClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1865 "DirectPhoto.c"
+#line 1849 "DirectPhoto.c"
 }
 
 
@@ -1872,7 +1856,7 @@ static void direct_photo_instance_init (DirectPhoto * self) {
 	self->priv->preview = NULL;
 #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	self->priv->loaded = FALSE;
-#line 1876 "DirectPhoto.c"
+#line 1860 "DirectPhoto.c"
 }
 
 
@@ -1884,7 +1868,7 @@ static void direct_photo_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->preview);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj);
-#line 1888 "DirectPhoto.c"
+#line 1872 "DirectPhoto.c"
 }
 
 
@@ -1905,7 +1889,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1909 "DirectPhoto.c"
+#line 1893 "DirectPhoto.c"
 }
 
 
@@ -1914,7 +1898,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1918 "DirectPhoto.c"
+#line 1902 "DirectPhoto.c"
 }
 
 
@@ -1923,21 +1907,21 @@ static gint64 _direct_photo_source_collection_get_direct_key_get_source_database
 	result = direct_photo_source_collection_get_direct_key (source);
 #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 1927 "DirectPhoto.c"
+#line 1911 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) {
 #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info);
-#line 1934 "DirectPhoto.c"
+#line 1918 "DirectPhoto.c"
 }
 
 
 static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
 #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self);
-#line 1941 "DirectPhoto.c"
+#line 1925 "DirectPhoto.c"
 }
 
 
@@ -1982,14 +1966,14 @@ DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType obj
 	directory_monitor_start_discovery (_tmp6_);
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self;
-#line 1986 "DirectPhoto.c"
+#line 1970 "DirectPhoto.c"
 }
 
 
 DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) {
 #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file);
-#line 1993 "DirectPhoto.c"
+#line 1977 "DirectPhoto.c"
 }
 
 
@@ -2007,14 +1991,14 @@ static gboolean direct_photo_source_collection_real_holds_type_of_source (Source
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO);
 #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2011 "DirectPhoto.c"
+#line 1995 "DirectPhoto.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2018 "DirectPhoto.c"
+#line 2002 "DirectPhoto.c"
 }
 
 
@@ -2049,7 +2033,7 @@ static gint64 direct_photo_source_collection_get_direct_key (DataSource* source)
 	_g_object_unref0 (photo);
 #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2053 "DirectPhoto.c"
+#line 2037 "DirectPhoto.c"
 }
 
 
@@ -2060,7 +2044,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (added));
-#line 2064 "DirectPhoto.c"
+#line 2048 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp0_;
@@ -2073,7 +2057,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 		_object_it = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2077 "DirectPhoto.c"
+#line 2061 "DirectPhoto.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataObject* object = NULL;
@@ -2099,7 +2083,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			if (!_tmp3_) {
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2103 "DirectPhoto.c"
+#line 2087 "DirectPhoto.c"
 			}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2141,17 +2125,17 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti
 			_g_object_unref0 (photo);
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2145 "DirectPhoto.c"
+#line 2129 "DirectPhoto.c"
 		}
 #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2149 "DirectPhoto.c"
+#line 2133 "DirectPhoto.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp16_ = added;
 #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_);
-#line 2155 "DirectPhoto.c"
+#line 2139 "DirectPhoto.c"
 }
 
 
@@ -2162,7 +2146,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection);
 #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 2166 "DirectPhoto.c"
+#line 2150 "DirectPhoto.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp0_;
@@ -2175,7 +2159,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 		_object_it = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		while (TRUE) {
-#line 2179 "DirectPhoto.c"
+#line 2163 "DirectPhoto.c"
 			GeeIterator* _tmp2_;
 			gboolean _tmp3_;
 			DataObject* object = NULL;
@@ -2200,7 +2184,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			if (!_tmp3_) {
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				break;
-#line 2204 "DirectPhoto.c"
+#line 2188 "DirectPhoto.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_tmp4_ = _object_it;
@@ -2238,17 +2222,17 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec
 			_g_object_unref0 (photo);
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (object);
-#line 2242 "DirectPhoto.c"
+#line 2226 "DirectPhoto.c"
 		}
 #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_object_it);
-#line 2246 "DirectPhoto.c"
+#line 2230 "DirectPhoto.c"
 	}
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp14_ = removed;
 #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2252 "DirectPhoto.c"
+#line 2236 "DirectPhoto.c"
 }
 
 
@@ -2271,7 +2255,7 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo
 	result = _tmp2_;
 #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2275 "DirectPhoto.c"
+#line 2259 "DirectPhoto.c"
 }
 
 
@@ -2305,7 +2289,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp1_) {
 #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2309 "DirectPhoto.c"
+#line 2293 "DirectPhoto.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp2_ = file;
@@ -2315,7 +2299,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (!_tmp3_) {
 #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return;
-#line 2319 "DirectPhoto.c"
+#line 2303 "DirectPhoto.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp4_ = file;
@@ -2331,13 +2315,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	_tmp7_ = reason;
 #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp7_ != NULL) {
-#line 2335 "DirectPhoto.c"
+#line 2319 "DirectPhoto.c"
 		const gchar* _tmp8_;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp8_ = reason;
 #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_);
-#line 2341 "DirectPhoto.c"
+#line 2325 "DirectPhoto.c"
 	}
 #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp9_ = self->priv->prepared_photos;
@@ -2355,13 +2339,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource
 	if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) {
 #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		direct_photo_source_collection_flush_prepared_photos (self);
-#line 2359 "DirectPhoto.c"
+#line 2343 "DirectPhoto.c"
 	}
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_free0 (reason);
 #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (photo);
-#line 2365 "DirectPhoto.c"
+#line 2349 "DirectPhoto.c"
 }
 
 
@@ -2370,7 +2354,7 @@ static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSo
 	g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self));
 #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	direct_photo_source_collection_flush_prepared_photos (self);
-#line 2374 "DirectPhoto.c"
+#line 2358 "DirectPhoto.c"
 }
 
 
@@ -2393,7 +2377,7 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou
 	_tmp3_ = self->priv->prepared_photos;
 #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	gee_collection_clear (_tmp3_);
-#line 2397 "DirectPhoto.c"
+#line 2381 "DirectPhoto.c"
 }
 
 
@@ -2416,7 +2400,7 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s
 	result = _tmp2_;
 #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2420 "DirectPhoto.c"
+#line 2404 "DirectPhoto.c"
 }
 
 
@@ -2457,7 +2441,7 @@ void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection*
 	_g_object_unref0 (_tmp3_);
 #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_g_object_unref0 (reimported_photo);
-#line 2461 "DirectPhoto.c"
+#line 2445 "DirectPhoto.c"
 }
 
 
@@ -2493,7 +2477,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	_tmp3_ = _vala_photo;
 #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (_tmp3_ != NULL) {
-#line 2497 "DirectPhoto.c"
+#line 2481 "DirectPhoto.c"
 		gchar* reason = NULL;
 		gboolean _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2502,7 +2486,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_tmp4_ = reimport;
 #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (_tmp4_) {
-#line 2506 "DirectPhoto.c"
+#line 2490 "DirectPhoto.c"
 			{
 				Orientation ori_tmp = 0;
 				gboolean should_restore_ori = FALSE;
@@ -2526,7 +2510,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (_tmp7_) {
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = TRUE;
-#line 2530 "DirectPhoto.c"
+#line 2514 "DirectPhoto.c"
 				} else {
 					DirectPhoto* _tmp8_;
 					PhotoFileFormat _tmp9_;
@@ -2536,11 +2520,11 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					_tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
 #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF;
-#line 2540 "DirectPhoto.c"
+#line 2524 "DirectPhoto.c"
 				}
 #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp5_) {
-#line 2544 "DirectPhoto.c"
+#line 2528 "DirectPhoto.c"
 					DirectPhoto* _tmp10_;
 					Orientation _tmp11_;
 #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2551,7 +2535,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					ori_tmp = _tmp11_;
 #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					should_restore_ori = TRUE;
-#line 2555 "DirectPhoto.c"
+#line 2539 "DirectPhoto.c"
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_tmp13_ = _vala_photo;
@@ -2567,12 +2551,12 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
-#line 2571 "DirectPhoto.c"
-					goto __catch47_g_error;
+#line 2555 "DirectPhoto.c"
+					goto __catch51_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
-#line 2576 "DirectPhoto.c"
+#line 2560 "DirectPhoto.c"
 					DirectPhoto* _tmp16_;
 					PhotoReimportMasterState* _tmp17_;
 					gboolean _tmp18_;
@@ -2586,14 +2570,14 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
-#line 2590 "DirectPhoto.c"
-						goto __catch47_g_error;
+#line 2574 "DirectPhoto.c"
+						goto __catch51_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					if (_tmp18_) {
-#line 2597 "DirectPhoto.c"
+#line 2581 "DirectPhoto.c"
 						DirectPhoto* _tmp19_;
 						Orientation _tmp20_;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2602,7 +2586,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 						_tmp20_ = ori_tmp;
 #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_);
-#line 2606 "DirectPhoto.c"
+#line 2590 "DirectPhoto.c"
 					}
 				} else {
 					gchar* _tmp21_;
@@ -2612,14 +2596,14 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 					_g_free0 (reason);
 #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					reason = _tmp21_;
-#line 2616 "DirectPhoto.c"
+#line 2600 "DirectPhoto.c"
 				}
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 2620 "DirectPhoto.c"
+#line 2604 "DirectPhoto.c"
 			}
-			goto __finally47;
-			__catch47_g_error:
+			goto __finally51;
+			__catch51_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_;
@@ -2641,9 +2625,9 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				reason = _tmp24_;
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				_g_error_free0 (err);
-#line 2645 "DirectPhoto.c"
+#line 2629 "DirectPhoto.c"
 			}
-			__finally47:
+			__finally51:
 #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"
@@ -2654,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				g_clear_error (&_inner_error_);
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				return NULL;
-#line 2658 "DirectPhoto.c"
+#line 2642 "DirectPhoto.c"
 			}
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2663,15 +2647,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		if (photo) {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			*photo = _vala_photo;
-#line 2667 "DirectPhoto.c"
+#line 2651 "DirectPhoto.c"
 		} else {
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			_g_object_unref0 (_vala_photo);
-#line 2671 "DirectPhoto.c"
+#line 2655 "DirectPhoto.c"
 		}
 #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		return result;
-#line 2675 "DirectPhoto.c"
+#line 2659 "DirectPhoto.c"
 	}
 #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	_tmp25_ = file;
@@ -2691,7 +2675,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = NULL;
-#line 2695 "DirectPhoto.c"
+#line 2679 "DirectPhoto.c"
 	} else {
 		ImportResult _tmp30_;
 		gchar* _tmp31_;
@@ -2703,7 +2687,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 		_g_free0 (_tmp28_);
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp28_ = _tmp31_;
-#line 2707 "DirectPhoto.c"
+#line 2691 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	result = _tmp28_;
@@ -2711,15 +2695,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 	if (photo) {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		*photo = _vala_photo;
-#line 2715 "DirectPhoto.c"
+#line 2699 "DirectPhoto.c"
 	} else {
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_g_object_unref0 (_vala_photo);
-#line 2719 "DirectPhoto.c"
+#line 2703 "DirectPhoto.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2723 "DirectPhoto.c"
+#line 2707 "DirectPhoto.c"
 }
 
 
@@ -2742,7 +2726,7 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec
 	result = _tmp2_;
 #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2746 "DirectPhoto.c"
+#line 2730 "DirectPhoto.c"
 }
 
 
@@ -2765,7 +2749,7 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo
 	result = (DirectPhoto*) _tmp2_;
 #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	return result;
-#line 2769 "DirectPhoto.c"
+#line 2753 "DirectPhoto.c"
 }
 
 
@@ -2782,7 +2766,7 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti
 	((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added;
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed;
-#line 2786 "DirectPhoto.c"
+#line 2770 "DirectPhoto.c"
 }
 
 
@@ -2799,7 +2783,7 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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 2803 "DirectPhoto.c"
+#line 2787 "DirectPhoto.c"
 }
 
 
@@ -2815,7 +2799,7 @@ static void direct_photo_source_collection_finalize (DataCollection * obj) {
 	_g_object_unref0 (self->priv->monitor);
 #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj);
-#line 2819 "DirectPhoto.c"
+#line 2803 "DirectPhoto.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 07f26d9..ae2a47c 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -722,8 +722,8 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gboolean photo_file_format_is_file_supported (GFile* file);
 #define RESOURCES_APP_TITLE "Shotwell"
@@ -846,9 +846,9 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
 static Block7Data* block7_data_ref (Block7Data* _data7_);
 static void block7_data_unref (void * _userdata_);
-static gboolean __lambda16_ (Block7Data* _data7_);
+static gboolean __lambda17_ (Block7Data* _data7_);
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
-static gboolean ___lambda16__gsource_func (gpointer self);
+static gboolean ___lambda17__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;
@@ -1242,7 +1242,7 @@ static gpointer _injection_group_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add64 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1259,7 +1259,7 @@ static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size,
 }
 
 
-static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add65 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1319,7 +1319,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = _injection_group_ref0 (print_group);
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp4_);
+	_vala_array_add64 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1333,7 +1333,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = _injection_group_ref0 (bg_group);
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add65 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = groups;
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -2871,11 +2871,11 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2874 "DirectPhotoPage.c"
-			goto __catch48_g_error;
+			goto __catch52_g_error;
 		}
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally52;
+	__catch52_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp11_;
@@ -2915,7 +2915,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		return;
 #line 2917 "DirectPhotoPage.c"
 	}
-	__finally48:
+	__finally52:
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3666,7 +3666,7 @@ static void block7_data_unref (void * _userdata_) {
 }
 
 
-static gboolean __lambda16_ (Block7Data* _data7_) {
+static gboolean __lambda17_ (Block7Data* _data7_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
@@ -3684,9 +3684,9 @@ static gboolean __lambda16_ (Block7Data* _data7_) {
 }
 
 
-static gboolean ___lambda16__gsource_func (gpointer self) {
+static gboolean ___lambda17__gsource_func (gpointer self) {
 	gboolean result;
-	result = __lambda16_ (self);
+	result = __lambda17_ (self);
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
 #line 3693 "DirectPhotoPage.c"
@@ -3709,7 +3709,7 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data7_->should_allow_rotation = _tmp0_;
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda16__gsource_func, block7_data_ref (_data7_), block7_data_unref);
+	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda17__gsource_func, block7_data_ref (_data7_), block7_data_unref);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block7_data_unref (_data7_);
 #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index f101fb4..06abe20 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -27,7 +27,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n-lib.h>
 #include <gee.h>
-#include <gio/gio.h>
+#include "shotwell-graphics-processor.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -383,26 +383,6 @@ typedef struct _EditingToolsAdjustToolPrivate EditingToolsAdjustToolPrivate;
 typedef struct _EditingToolsAdjustToolAdjustToolWindow EditingToolsAdjustToolAdjustToolWindow;
 typedef struct _EditingToolsAdjustToolAdjustToolWindowClass EditingToolsAdjustToolAdjustToolWindowClass;
 
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
-
 #define TYPE_ONE_SHOT_SCHEDULER (one_shot_scheduler_get_type ())
 #define ONE_SHOT_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler))
 #define ONE_SHOT_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerClass))
@@ -415,38 +395,6 @@ typedef struct _OneShotSchedulerClass OneShotSchedulerClass;
 #define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
 #define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
 #define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL)))
-
-#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
-#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
-#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
-#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
-#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-
-typedef struct _PixelTransformation PixelTransformation;
-typedef struct _PixelTransformationClass PixelTransformationClass;
-
-#define TYPE_HSV_TRANSFORMATION (hsv_transformation_get_type ())
-#define HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformation))
-#define HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
-#define IS_HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HSV_TRANSFORMATION))
-#define IS_HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HSV_TRANSFORMATION))
-#define HSV_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
-
-typedef struct _HSVTransformation HSVTransformation;
-typedef struct _HSVTransformationClass HSVTransformationClass;
-
-#define TYPE_EXPANSION_TRANSFORMATION (expansion_transformation_get_type ())
-#define EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation))
-#define EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
-#define IS_EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPANSION_TRANSFORMATION))
-#define IS_EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPANSION_TRANSFORMATION))
-#define EXPANSION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
-
-typedef struct _ExpansionTransformation ExpansionTransformation;
-typedef struct _ExpansionTransformationClass ExpansionTransformationClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_TYPE (pixel_transformation_type_get_type ())
 typedef struct _EditingToolsAdjustToolAdjustToolWindowPrivate EditingToolsAdjustToolAdjustToolWindowPrivate;
 
 #define TYPE_RGB_HISTOGRAM_MANIPULATOR (rgb_histogram_manipulator_get_type ())
@@ -458,86 +406,6 @@ typedef struct _EditingToolsAdjustToolAdjustToolWindowPrivate EditingToolsAdjust
 
 typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
 typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
-
-#define TYPE_SHADOW_DETAIL_TRANSFORMATION (shadow_detail_transformation_get_type ())
-#define SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation))
-#define SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
-#define IS_SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION))
-#define IS_SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION))
-#define SHADOW_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
-
-typedef struct _ShadowDetailTransformation ShadowDetailTransformation;
-typedef struct _ShadowDetailTransformationClass ShadowDetailTransformationClass;
-
-#define TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION (highlight_detail_transformation_get_type ())
-#define HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation))
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
-#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
-#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
-
-typedef struct _HighlightDetailTransformation HighlightDetailTransformation;
-typedef struct _HighlightDetailTransformationClass HighlightDetailTransformationClass;
-
-#define TYPE_RGB_TRANSFORMATION (rgb_transformation_get_type ())
-#define RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformation))
-#define RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-#define IS_RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_TRANSFORMATION))
-#define IS_RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_TRANSFORMATION))
-#define RGB_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-
-typedef struct _RGBTransformation RGBTransformation;
-typedef struct _RGBTransformationClass RGBTransformationClass;
-
-#define TYPE_TEMPERATURE_TRANSFORMATION (temperature_transformation_get_type ())
-#define TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation))
-#define TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
-#define IS_TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TEMPERATURE_TRANSFORMATION))
-#define IS_TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TEMPERATURE_TRANSFORMATION))
-#define TEMPERATURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
-
-typedef struct _TemperatureTransformation TemperatureTransformation;
-typedef struct _TemperatureTransformationClass TemperatureTransformationClass;
-
-#define TYPE_TINT_TRANSFORMATION (tint_transformation_get_type ())
-#define TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TINT_TRANSFORMATION, TintTransformation))
-#define TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
-#define IS_TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TINT_TRANSFORMATION))
-#define IS_TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TINT_TRANSFORMATION))
-#define TINT_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
-
-typedef struct _TintTransformation TintTransformation;
-typedef struct _TintTransformationClass TintTransformationClass;
-
-#define TYPE_SATURATION_TRANSFORMATION (saturation_transformation_get_type ())
-#define SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))
-#define SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-#define IS_SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SATURATION_TRANSFORMATION))
-#define IS_SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SATURATION_TRANSFORMATION))
-#define SATURATION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-
-typedef struct _SaturationTransformation SaturationTransformation;
-typedef struct _SaturationTransformationClass SaturationTransformationClass;
-
-#define TYPE_EXPOSURE_TRANSFORMATION (exposure_transformation_get_type ())
-#define EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation))
-#define EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
-#define IS_EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPOSURE_TRANSFORMATION))
-#define IS_EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPOSURE_TRANSFORMATION))
-#define EXPOSURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
-
-typedef struct _ExposureTransformation ExposureTransformation;
-typedef struct _ExposureTransformationClass ExposureTransformationClass;
-
-#define TYPE_CONTRAST_TRANSFORMATION (contrast_transformation_get_type ())
-#define CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))
-#define CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
-#define IS_CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTRAST_TRANSFORMATION))
-#define IS_CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTRAST_TRANSFORMATION))
-#define CONTRAST_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
-
-typedef struct _ContrastTransformation ContrastTransformation;
-typedef struct _ContrastTransformationClass ContrastTransformationClass;
 #define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
 
 #define EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND (editing_tools_adjust_tool_adjust_tool_command_get_type ())
@@ -917,17 +785,6 @@ struct _EditingToolsAdjustToolPrivate {
 	OneShotScheduler* highlights_scheduler;
 };
 
-typedef enum  {
-	PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION,
-	PIXEL_TRANSFORMATION_TYPE_SHADOWS,
-	PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS,
-	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
-	PIXEL_TRANSFORMATION_TYPE_TINT,
-	PIXEL_TRANSFORMATION_TYPE_SATURATION,
-	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
-	PIXEL_TRANSFORMATION_TYPE_CONTRAST
-} PixelTransformationType;
-
 struct _EditingToolsAdjustToolAdjustToolWindow {
 	EditingToolsEditingToolWindow parent_instance;
 	EditingToolsAdjustToolAdjustToolWindowPrivate * priv;
@@ -1113,14 +970,14 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self);
 static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self);
 void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf);
 void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
+void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over);
 GType box_get_type (void) G_GNUC_CONST;
 Box* box_dup (const Box* self);
 void box_free (Box* self);
-void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area);
+void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over);
 gint box_get_width (Box *self);
 gint box_get_height (Box *self);
-void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over);
-void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over);
 void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box);
 void box_get_rectangle (Box *self, GdkRectangle* result);
 void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos);
@@ -1218,9 +1075,6 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
 void photo_get_original_dimensions (Photo* self, Dimensions* result);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
@@ -1247,6 +1101,9 @@ static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * arr
 static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self);
 static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
@@ -1439,20 +1296,6 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj
 static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
 gpointer one_shot_scheduler_ref (gpointer instance);
 void one_shot_scheduler_unref (gpointer instance);
 GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1464,7 +1307,7 @@ GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_DUMMY_PROPERTY
 };
-#define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 160
+#define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 200
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC ((guint) 100)
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void);
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type);
@@ -1474,41 +1317,9 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container);
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
-PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self);
-PixelTransformer* pixel_transformer_new (void);
-PixelTransformer* pixel_transformer_construct (GType object_type);
-gpointer pixel_transformation_ref (gpointer instance);
-void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation (const GValue* value);
-GType pixel_transformation_get_type (void) G_GNUC_CONST;
-GType hsv_transformation_get_type (void) G_GNUC_CONST;
-GType expansion_transformation_get_type (void) G_GNUC_CONST;
-GType pixel_transformation_type_get_type (void) G_GNUC_CONST;
-PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type);
 GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
 void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-gint expansion_transformation_get_black_point (ExpansionTransformation* self);
 void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-gint expansion_transformation_get_white_point (ExpansionTransformation* self);
-GType shadow_detail_transformation_get_type (void) G_GNUC_CONST;
-void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
-gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self);
-GType highlight_detail_transformation_get_type (void) G_GNUC_CONST;
-gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self);
-GType rgb_transformation_get_type (void) G_GNUC_CONST;
-GType temperature_transformation_get_type (void) G_GNUC_CONST;
-gfloat temperature_transformation_get_parameter (TemperatureTransformation* self);
-GType tint_transformation_get_type (void) G_GNUC_CONST;
-gfloat tint_transformation_get_parameter (TintTransformation* self);
-GType saturation_transformation_get_type (void) G_GNUC_CONST;
-gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
-GType exposure_transformation_get_type (void) G_GNUC_CONST;
-gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
-GType contrast_transformation_get_type (void) G_GNUC_CONST;
-gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
 static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source);
@@ -1519,8 +1330,6 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
 static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx);
-void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
 void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
 static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
 gboolean photo_has_color_adjustments (Photo* self);
@@ -1536,11 +1345,7 @@ AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, Pixel
 AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
 static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations);
-GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
 static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation);
-PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self);
-void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
-void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation);
 static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name);
 static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name);
@@ -1551,43 +1356,27 @@ static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_sho
 OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
-TemperatureTransformation* temperature_transformation_new (gfloat client_parameter);
-TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter);
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self);
-TintTransformation* tint_transformation_new (gfloat client_param);
-TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param);
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self);
-ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
-ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self);
-SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
-SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self);
-ExposureTransformation* exposure_transformation_new (gfloat client_parameter);
-ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter);
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self);
-ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity);
-ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity);
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self);
-HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity);
-HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity);
 static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self);
 gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
 gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
-ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point);
-ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point);
 static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self);
 static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event);
 gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
@@ -1613,20 +1402,6 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_DUMMY_PROPERTY
 };
-#define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER 0.0f
-#define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f)
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f
 #define RESOURCES_OK_LABEL _ ("_OK")
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
@@ -1645,10 +1420,6 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob
 enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY
 };
-PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
-PixelTransformationBundle* pixel_transformation_bundle_new (void);
-PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type);
-void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self);
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base);
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base);
 static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command);
@@ -1697,7 +1468,7 @@ void editing_tools_terminate (void) {
 static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
 #line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
-#line 1701 "EditingTools.c"
+#line 1472 "EditingTools.c"
 }
 
 
@@ -1757,7 +1528,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1761 "EditingTools.c"
+#line 1532 "EditingTools.c"
 }
 
 
@@ -1775,7 +1546,7 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	_tmp1_ = widget;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1779 "EditingTools.c"
+#line 1550 "EditingTools.c"
 }
 
 
@@ -1790,7 +1561,7 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
 	result = _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1794 "EditingTools.c"
+#line 1565 "EditingTools.c"
 }
 
 
@@ -1818,7 +1589,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 		result = TRUE;
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1822 "EditingTools.c"
+#line 1593 "EditingTools.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -1836,7 +1607,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	result = _tmp6_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1840 "EditingTools.c"
+#line 1611 "EditingTools.c"
 }
 
 
@@ -1863,11 +1634,11 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	_tmp1_ = _tmp0_->button;
 #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 1867 "EditingTools.c"
+#line 1638 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1871 "EditingTools.c"
+#line 1642 "EditingTools.c"
 			GdkEventButton* _tmp3_;
 			gboolean _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1876,17 +1647,17 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
-#line 1880 "EditingTools.c"
+#line 1651 "EditingTools.c"
 		} else {
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
-#line 1884 "EditingTools.c"
+#line 1655 "EditingTools.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1890 "EditingTools.c"
+#line 1661 "EditingTools.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
@@ -1912,7 +1683,7 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	result = TRUE;
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1916 "EditingTools.c"
+#line 1687 "EditingTools.c"
 }
 
 
@@ -1924,7 +1695,7 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1928 "EditingTools.c"
+#line 1699 "EditingTools.c"
 }
 
 
@@ -1933,7 +1704,7 @@ static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEdi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (message != NULL);
-#line 1937 "EditingTools.c"
+#line 1708 "EditingTools.c"
 }
 
 
@@ -1952,7 +1723,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1956 "EditingTools.c"
+#line 1727 "EditingTools.c"
 }
 
 
@@ -1968,7 +1739,7 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1972 "EditingTools.c"
+#line 1743 "EditingTools.c"
 }
 
 
@@ -1988,7 +1759,7 @@ static void editing_tools_editing_tool_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1992 "EditingTools.c"
+#line 1763 "EditingTools.c"
 }
 
 
@@ -2007,14 +1778,14 @@ GType editing_tools_editing_tool_window_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2011 "EditingTools.c"
+#line 1782 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 2018 "EditingTools.c"
+#line 1789 "EditingTools.c"
 }
 
 
@@ -2114,7 +1885,7 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	self->priv->scaled = _tmp15_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2118 "EditingTools.c"
+#line 1889 "EditingTools.c"
 }
 
 
@@ -2136,7 +1907,7 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	*result = _tmp2_;
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2140 "EditingTools.c"
+#line 1911 "EditingTools.c"
 }
 
 
@@ -2216,7 +1987,7 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	*result = _result_;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2220 "EditingTools.c"
+#line 1991 "EditingTools.c"
 }
 
 
@@ -2348,7 +2119,7 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	*result = unscaled_rect;
 #line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2352 "EditingTools.c"
+#line 2123 "EditingTools.c"
 }
 
 
@@ -2401,7 +2172,7 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	*result = _result_;
 #line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2405 "EditingTools.c"
+#line 2176 "EditingTools.c"
 }
 
 
@@ -2533,7 +2304,7 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	*result = active_rect;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2537 "EditingTools.c"
+#line 2308 "EditingTools.c"
 }
 
 
@@ -2551,7 +2322,7 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	result = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2555 "EditingTools.c"
+#line 2326 "EditingTools.c"
 }
 
 
@@ -2569,7 +2340,7 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2573 "EditingTools.c"
+#line 2344 "EditingTools.c"
 }
 
 
@@ -2587,7 +2358,7 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	result = _tmp1_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2591 "EditingTools.c"
+#line 2362 "EditingTools.c"
 }
 
 
@@ -2605,7 +2376,7 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2609 "EditingTools.c"
+#line 2380 "EditingTools.c"
 }
 
 
@@ -2619,7 +2390,7 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
 	*result = _tmp0_;
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2623 "EditingTools.c"
+#line 2394 "EditingTools.c"
 }
 
 
@@ -2636,7 +2407,7 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
 	*result = _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2640 "EditingTools.c"
+#line 2411 "EditingTools.c"
 }
 
 
@@ -2670,14 +2441,14 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 	_tmp4_ = *surface_dim;
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_);
-#line 2674 "EditingTools.c"
+#line 2445 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2681 "EditingTools.c"
+#line 2452 "EditingTools.c"
 }
 
 
@@ -2695,7 +2466,7 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2699 "EditingTools.c"
+#line 2470 "EditingTools.c"
 }
 
 
@@ -2713,7 +2484,7 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2717 "EditingTools.c"
+#line 2488 "EditingTools.c"
 }
 
 
@@ -2727,7 +2498,7 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
 	*result = _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2731 "EditingTools.c"
+#line 2502 "EditingTools.c"
 }
 
 
@@ -2782,7 +2553,7 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 	_tmp9_ = *scaled_position;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_);
-#line 2786 "EditingTools.c"
+#line 2557 "EditingTools.c"
 }
 
 
@@ -2791,7 +2562,7 @@ static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* se
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2795 "EditingTools.c"
+#line 2566 "EditingTools.c"
 }
 
 
@@ -2800,7 +2571,7 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2804 "EditingTools.c"
+#line 2575 "EditingTools.c"
 }
 
 
@@ -2820,16 +2591,6 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	GdkRectangle _tmp12_;
 	gint _tmp13_;
 	cairo_t* _tmp14_;
-	GdkRectangle _tmp15_;
-	gint _tmp16_;
-	GdkRectangle _tmp17_;
-	gint _tmp18_;
-	GdkPixbuf* _tmp19_;
-	gint _tmp20_;
-	GdkPixbuf* _tmp21_;
-	gint _tmp22_;
-	cairo_t* _tmp23_;
-	cairo_t* _tmp24_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2871,173 +2632,12 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gdk_cairo_set_source_pixbuf (_tmp8_, _tmp9_, (gdouble) _tmp11_, (gdouble) _tmp13_);
+	paint_pixmap_with_background (_tmp8_, _tmp9_, _tmp11_, _tmp13_);
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->default_ctx;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->priv->scaled_position;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_.x;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->priv->scaled_position;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_.y;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = pixbuf;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = gdk_pixbuf_get_width (_tmp19_);
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = pixbuf;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) _tmp20_, (gdouble) _tmp22_);
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->priv->default_ctx;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp23_);
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->default_ctx;
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp24_);
-#line 2904 "EditingTools.c"
-}
-
-
-void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area) {
-	cairo_t* _tmp0_;
-	GdkPixbuf* _tmp1_;
-	gboolean _tmp2_;
-	cairo_t* _tmp16_;
-	GdkPixbuf* _tmp17_;
-	GdkRectangle _tmp18_;
-	gint _tmp19_;
-	GdkRectangle _tmp20_;
-	gint _tmp21_;
-	cairo_t* _tmp22_;
-	GdkRectangle _tmp23_;
-	gint _tmp24_;
-	Box _tmp25_;
-	gint _tmp26_;
-	GdkRectangle _tmp27_;
-	gint _tmp28_;
-	Box _tmp29_;
-	gint _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
-	cairo_t* _tmp33_;
-	cairo_t* _tmp34_;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (source_area != NULL);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = self->priv->default_ctx;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_save (_tmp0_);
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = pixbuf;
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_) {
-#line 2947 "EditingTools.c"
-		cairo_t* _tmp3_;
-		cairo_t* _tmp4_;
-		GdkRectangle _tmp5_;
-		gint _tmp6_;
-		Box _tmp7_;
-		gint _tmp8_;
-		GdkRectangle _tmp9_;
-		gint _tmp10_;
-		Box _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
-		gint _tmp14_;
-		cairo_t* _tmp15_;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = self->priv->default_ctx;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		set_source_color_from_string (_tmp3_, "#000");
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = self->priv->default_ctx;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = self->priv->scaled_position;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.x;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = *source_area;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp7_.left;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = self->priv->scaled_position;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = _tmp9_.y;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = *source_area;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = _tmp11_.top;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = box_get_width (source_area);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = box_get_height (source_area);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_rectangle (_tmp4_, (gdouble) (_tmp6_ + _tmp8_), (gdouble) (_tmp10_ + _tmp12_), (gdouble) _tmp13_, (gdouble) _tmp14_);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = self->priv->default_ctx;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_fill (_tmp15_);
-#line 2993 "EditingTools.c"
-	}
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->priv->default_ctx;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = pixbuf;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->scaled_position;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_.x;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->priv->scaled_position;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = _tmp20_.y;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gdk_cairo_set_source_pixbuf (_tmp16_, _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->priv->default_ctx;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->priv->scaled_position;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = _tmp23_.x;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = *source_area;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _tmp25_.left;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = self->priv->scaled_position;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = _tmp27_.y;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = *source_area;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = _tmp29_.top;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = box_get_width (source_area);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = box_get_height (source_area);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp22_, (gdouble) (_tmp24_ + _tmp26_), (gdouble) (_tmp28_ + _tmp30_), (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->priv->default_ctx;
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp33_);
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->priv->default_ctx;
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp34_);
-#line 3041 "EditingTools.c"
+	cairo_restore (_tmp14_);
+#line 2641 "EditingTools.c"
 }
 
 
@@ -3059,74 +2659,74 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	gint _tmp16_;
 	cairo_t* _tmp17_;
 	cairo_t* _tmp18_;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3075 "EditingTools.c"
+#line 2675 "EditingTools.c"
 		cairo_t* _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3081 "EditingTools.c"
+#line 2681 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3088 "EditingTools.c"
+#line 2688 "EditingTools.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->default_ctx;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = surface;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->scaled_position;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->default_ctx;
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3130 "EditingTools.c"
+#line 2730 "EditingTools.c"
 }
 
 
@@ -3170,124 +2770,124 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	gint _tmp38_;
 	cairo_t* _tmp39_;
 	cairo_t* _tmp40_;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (source_area != NULL);
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3188 "EditingTools.c"
+#line 2788 "EditingTools.c"
 		cairo_t* _tmp2_;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3194 "EditingTools.c"
+#line 2794 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3201 "EditingTools.c"
+#line 2801 "EditingTools.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = *source_area;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.left;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *source_area;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_width (source_area);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_height (source_area);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_);
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->default_ctx;
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp21_);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->default_ctx;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = surface;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->default_ctx;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->scaled_position;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_.x;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = *source_area;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_.left;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->scaled_position;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_.y;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = *source_area;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_.top;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = box_get_width (source_area);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = box_get_height (source_area);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->default_ctx;
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp39_);
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->default_ctx;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3291 "EditingTools.c"
+#line 2891 "EditingTools.c"
 }
 
 
@@ -3310,57 +2910,57 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	GdkRectangle _tmp14_;
 	gint _tmp15_;
 	cairo_t* _tmp16_;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (box, &_tmp0_);
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.x;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_.height;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1));
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3364 "EditingTools.c"
+#line 2964 "EditingTools.c"
 }
 
 
@@ -3391,106 +2991,106 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	cairo_t* _tmp27_;
 	cairo_t* _tmp28_;
 	const gchar* _tmp29_;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3405 "EditingTools.c"
+#line 3005 "EditingTools.c"
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
 		GdkRectangle _tmp5_;
 		gint _tmp6_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3428 "EditingTools.c"
+#line 3028 "EditingTools.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = text;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_);
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	extents = _tmp9_;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = extents;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.width;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - (((gint) _tmp12_) / 2);
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = ctx;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND);
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pane_border = 5;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = x;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = y;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.height;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.width;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_.height;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border));
-#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = ctx;
-#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp23_);
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = ctx;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = x;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = y;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = ctx;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = ctx;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = text;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3494 "EditingTools.c"
+#line 3094 "EditingTools.c"
 }
 
 
@@ -3515,62 +3115,62 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	gint _tmp12_;
 	gint _tmp13_;
 	cairo_t* _tmp14_;
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3527 "EditingTools.c"
+#line 3127 "EditingTools.c"
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
 		GdkRectangle _tmp5_;
 		gint _tmp6_;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3550 "EditingTools.c"
+#line 3150 "EditingTools.c"
 	}
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = width;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = y;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5);
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3574 "EditingTools.c"
+#line 3174 "EditingTools.c"
 }
 
 
@@ -3595,62 +3195,62 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	gint _tmp12_;
 	gint _tmp13_;
 	cairo_t* _tmp14_;
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3607 "EditingTools.c"
+#line 3207 "EditingTools.c"
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
 		GdkRectangle _tmp5_;
 		gint _tmp6_;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3630 "EditingTools.c"
+#line 3230 "EditingTools.c"
 	}
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = y;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = height;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1));
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3654 "EditingTools.c"
+#line 3254 "EditingTools.c"
 }
 
 
@@ -3673,57 +3273,57 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	gint _tmp15_;
 	cairo_t* _tmp16_;
 	cairo_t* _tmp17_;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = width;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1);
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3727 "EditingTools.c"
+#line 3327 "EditingTools.c"
 }
 
 
@@ -3739,37 +3339,37 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	cairo_t* _tmp6_;
 	gint _tmp7_;
 	cairo_t* _tmp8_;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = active_center_x;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->scaled_position;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = _tmp0_ + _tmp2_;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = active_center_y;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = _tmp3_ + _tmp5_;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = ctx;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = radius;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = ctx;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3773 "EditingTools.c"
+#line 3373 "EditingTools.c"
 }
 
 
@@ -3792,57 +3392,57 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	gint _tmp15_;
 	cairo_t* _tmp16_;
 	cairo_t* _tmp17_;
-#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = height;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_);
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3846 "EditingTools.c"
+#line 3446 "EditingTools.c"
 }
 
 
@@ -3867,59 +3467,59 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	Box _tmp17_;
 	gint _tmp18_;
 	gint _tmp19_;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.left;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.top;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_width (box);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_);
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *box;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.left;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *box;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.bottom;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_get_width (box);
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.left;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.top;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = box_get_height (box);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *box;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.right;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *box;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_height (box);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3923 "EditingTools.c"
+#line 3523 "EditingTools.c"
 }
 
 
@@ -3934,37 +3534,37 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	gint _tmp6_;
 	GdkWindow* _tmp7_;
 	GdkRectangle _tmp8_;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (area, &_tmp0_);
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->drawing_window;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3968 "EditingTools.c"
+#line 3568 "EditingTools.c"
 }
 
 
@@ -3981,47 +3581,47 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	cairo_t* ctx = NULL;
 	cairo_t* _tmp7_;
 	GdkPixbuf* _tmp8_;
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (pos != NULL, NULL);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_ctx;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *pos;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.width;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *pos;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.height;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface = _tmp6_;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (surface);
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixbuf;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gdk_cairo_set_source_pixbuf (ctx, _tmp8_, (gdouble) 0, (gdouble) 0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	paint_pixmap_with_background (ctx, _tmp8_, 0, 0);
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = surface;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4025 "EditingTools.c"
+#line 3625 "EditingTools.c"
 }
 
 
@@ -4040,19 +3640,19 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4044 "EditingTools.c"
+#line 3644 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4050 "EditingTools.c"
+#line 3650 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4056 "EditingTools.c"
+#line 3656 "EditingTools.c"
 }
 
 
@@ -4071,26 +3671,26 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4075 "EditingTools.c"
+#line 3675 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4081 "EditingTools.c"
+#line 3681 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4087 "EditingTools.c"
+#line 3687 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4094 "EditingTools.c"
+#line 3694 "EditingTools.c"
 }
 
 
@@ -4099,7 +3699,7 @@ static void editing_tools_value_photo_canvas_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4103 "EditingTools.c"
+#line 3703 "EditingTools.c"
 	}
 }
 
@@ -4109,11 +3709,11 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4113 "EditingTools.c"
+#line 3713 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4117 "EditingTools.c"
+#line 3717 "EditingTools.c"
 	}
 }
 
@@ -4121,37 +3721,37 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4125 "EditingTools.c"
+#line 3725 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4132 "EditingTools.c"
+#line 3732 "EditingTools.c"
 		EditingToolsPhotoCanvas * object;
 		object = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4139 "EditingTools.c"
+#line 3739 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4143 "EditingTools.c"
+#line 3743 "EditingTools.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4147 "EditingTools.c"
+#line 3747 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4151 "EditingTools.c"
+#line 3751 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4155 "EditingTools.c"
+#line 3755 "EditingTools.c"
 }
 
 
@@ -4162,25 +3762,25 @@ static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4166 "EditingTools.c"
+#line 3766 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4172 "EditingTools.c"
+#line 3772 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4176 "EditingTools.c"
+#line 3776 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4180 "EditingTools.c"
+#line 3780 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4184 "EditingTools.c"
+#line 3784 "EditingTools.c"
 }
 
 
@@ -4194,7 +3794,7 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4198 "EditingTools.c"
+#line 3798 "EditingTools.c"
 }
 
 
@@ -4203,7 +3803,7 @@ gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4207 "EditingTools.c"
+#line 3807 "EditingTools.c"
 }
 
 
@@ -4223,17 +3823,17 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4227 "EditingTools.c"
+#line 3827 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4231 "EditingTools.c"
+#line 3831 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4237 "EditingTools.c"
+#line 3837 "EditingTools.c"
 	}
 }
 
@@ -4252,17 +3852,17 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4256 "EditingTools.c"
+#line 3856 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4260 "EditingTools.c"
+#line 3860 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4266 "EditingTools.c"
+#line 3866 "EditingTools.c"
 	}
 }
 
@@ -4280,7 +3880,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = 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"
 	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = 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 4284 "EditingTools.c"
+#line 3884 "EditingTools.c"
 }
 
 
@@ -4289,7 +3889,7 @@ static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas *
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4293 "EditingTools.c"
+#line 3893 "EditingTools.c"
 }
 
 
@@ -4311,7 +3911,7 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj)
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4315 "EditingTools.c"
+#line 3915 "EditingTools.c"
 }
 
 
@@ -4336,7 +3936,7 @@ gpointer editing_tools_photo_canvas_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4340 "EditingTools.c"
+#line 3940 "EditingTools.c"
 }
 
 
@@ -4349,7 +3949,7 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4353 "EditingTools.c"
+#line 3953 "EditingTools.c"
 	}
 }
 
@@ -4358,37 +3958,37 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	EditingToolsEditingTool* self = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsEditingTool*) g_type_create_instance (object_type);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4376 "EditingTools.c"
+#line 3976 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4383 "EditingTools.c"
+#line 3983 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4392 "EditingTools.c"
+#line 3992 "EditingTools.c"
 }
 
 
@@ -4399,54 +3999,54 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	EditingToolsPhotoCanvas* _tmp3_;
 	EditingToolsEditingToolWindow* _tmp4_;
 	EditingToolsEditingToolWindow* _tmp5_;
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp0_ == NULL, "this.canvas == null");
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->tool_window;
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp1_ == NULL, "tool_window == null");
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_);
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = _tmp3_;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (self);
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = _tmp4_;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->tool_window;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4431 "EditingTools.c"
+#line 4031 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4437 "EditingTools.c"
+#line 4037 "EditingTools.c"
 	}
-#line 509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0);
-#line 4441 "EditingTools.c"
+#line 4041 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4450 "EditingTools.c"
+#line 4050 "EditingTools.c"
 }
 
 
@@ -4454,129 +4054,129 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp1_;
 	EditingToolsEditingToolWindow* _tmp3_;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->canvas;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4462 "EditingTools.c"
+#line 4062 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp2_;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4468 "EditingTools.c"
+#line 4068 "EditingTools.c"
 	} else {
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4472 "EditingTools.c"
+#line 4072 "EditingTools.c"
 	}
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4478 "EditingTools.c"
+#line 4078 "EditingTools.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->tool_window;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4488 "EditingTools.c"
+#line 4088 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp4_;
 		guint _tmp5_;
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->tool_window;
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->tool_window);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4501 "EditingTools.c"
+#line 4101 "EditingTools.c"
 	}
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0);
-#line 4505 "EditingTools.c"
+#line 4105 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4514 "EditingTools.c"
+#line 4114 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
 	EditingToolsPhotoCanvas* _tmp0_;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_ != NULL;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4529 "EditingTools.c"
+#line 4129 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) {
 	EditingToolsEditingToolWindow* result = NULL;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4539 "EditingTools.c"
+#line 4139 "EditingTools.c"
 }
 
 
 EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) {
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4548 "EditingTools.c"
+#line 4148 "EditingTools.c"
 }
 
 
 static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_init (&_vala_max_dim, 0, 0);
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4567 "EditingTools.c"
+#line 4167 "EditingTools.c"
 	}
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4571 "EditingTools.c"
+#line 4171 "EditingTools.c"
 }
 
 
 GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4580 "EditingTools.c"
+#line 4180 "EditingTools.c"
 }
 
 
@@ -4585,11 +4185,11 @@ static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTo
 
 
 void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4593 "EditingTools.c"
+#line 4193 "EditingTools.c"
 }
 
 
@@ -4598,11 +4198,11 @@ static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditin
 
 
 void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4606 "EditingTools.c"
+#line 4206 "EditingTools.c"
 }
 
 
@@ -4611,30 +4211,30 @@ static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool*
 
 
 void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4619 "EditingTools.c"
+#line 4219 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4629 "EditingTools.c"
+#line 4229 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) {
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4638 "EditingTools.c"
+#line 4238 "EditingTools.c"
 }
 
 
@@ -4643,63 +4243,63 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 	GdkEventKey* _tmp0_;
 	guint _tmp1_;
 	const gchar* _tmp2_;
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_notify_cancel (self);
-#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4663 "EditingTools.c"
+#line 4263 "EditingTools.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4669 "EditingTools.c"
+#line 4269 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4678 "EditingTools.c"
+#line 4278 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4685 "EditingTools.c"
+#line 4285 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4694 "EditingTools.c"
+#line 4294 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0);
-#line 4703 "EditingTools.c"
+#line 4303 "EditingTools.c"
 }
 
 
@@ -4710,279 +4310,279 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4722 "EditingTools.c"
+#line 4322 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4728 "EditingTools.c"
+#line 4328 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4734 "EditingTools.c"
+#line 4334 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4741 "EditingTools.c"
+#line 4341 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_free_value (GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4750 "EditingTools.c"
+#line 4350 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4760 "EditingTools.c"
+#line 4360 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4764 "EditingTools.c"
+#line 4364 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4772 "EditingTools.c"
+#line 4372 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4779 "EditingTools.c"
+#line 4379 "EditingTools.c"
 		EditingToolsEditingTool * object;
 		object = collect_values[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4786 "EditingTools.c"
+#line 4386 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4790 "EditingTools.c"
+#line 4390 "EditingTools.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4794 "EditingTools.c"
+#line 4394 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4798 "EditingTools.c"
+#line 4398 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4802 "EditingTools.c"
+#line 4402 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsEditingTool ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4813 "EditingTools.c"
+#line 4413 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4819 "EditingTools.c"
+#line 4419 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4823 "EditingTools.c"
+#line 4423 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4827 "EditingTools.c"
+#line 4427 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4831 "EditingTools.c"
+#line 4431 "EditingTools.c"
 }
 
 
 GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsParamSpecEditingTool* spec;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4845 "EditingTools.c"
+#line 4445 "EditingTools.c"
 }
 
 
 gpointer editing_tools_value_get_editing_tool (const GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4854 "EditingTools.c"
+#line 4454 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool * old;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4874 "EditingTools.c"
+#line 4474 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4878 "EditingTools.c"
+#line 4478 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4884 "EditingTools.c"
+#line 4484 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool * old;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4903 "EditingTools.c"
+#line 4503 "EditingTools.c"
 	} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4907 "EditingTools.c"
+#line 4507 "EditingTools.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4913 "EditingTools.c"
+#line 4513 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_editing_tool_finalize;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_deactivate;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_get_tool_window;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_click;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_released;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_on_leave_notify_event;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_editing_tool_real_paint;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL] = g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL] = 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"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL] = 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"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = 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"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4955 "EditingTools.c"
+#line 4555 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = NULL;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4968 "EditingTools.c"
+#line 4568 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsEditingTool * self;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4986 "EditingTools.c"
+#line 4586 "EditingTools.c"
 }
 
 
@@ -5003,24 +4603,24 @@ GType editing_tools_editing_tool_get_type (void) {
 gpointer editing_tools_editing_tool_ref (gpointer instance) {
 	EditingToolsEditingTool * self;
 	self = instance;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 5011 "EditingTools.c"
+#line 4611 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_unref (gpointer instance) {
 	EditingToolsEditingTool * self;
 	self = instance;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5024 "EditingTools.c"
+#line 4624 "EditingTools.c"
 	}
 }
 
@@ -5028,21 +4628,21 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) {
 	EditingToolsCropToolReticleOrientation result = 0;
 	EditingToolsCropToolReticleOrientation _tmp0_ = 0;
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5036 "EditingTools.c"
+#line 4636 "EditingTools.c"
 	} else {
-#line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5040 "EditingTools.c"
+#line 4640 "EditingTools.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5046 "EditingTools.c"
+#line 4646 "EditingTools.c"
 }
 
 
@@ -5072,31 +4672,31 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
 
 static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) {
 	EditingToolsCropTool* self = NULL;
-#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5080 "EditingTools.c"
+#line 4680 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5087 "EditingTools.c"
+#line 4687 "EditingTools.c"
 }
 
 
 EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	EditingToolsCropTool* result = NULL;
 	EditingToolsCropTool* _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_new ();
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5100 "EditingTools.c"
+#line 4700 "EditingTools.c"
 }
 
 
@@ -5109,537 +4709,537 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_;
 	gint _tmp5_;
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_original_dimensions (_tmp0_, &_tmp1_);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5131 "EditingTools.c"
+#line 4731 "EditingTools.c"
 		Dimensions _tmp6_;
 		gint _tmp7_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5140 "EditingTools.c"
+#line 4740 "EditingTools.c"
 	} else {
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5144 "EditingTools.c"
+#line 4744 "EditingTools.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5150 "EditingTools.c"
+#line 4750 "EditingTools.c"
 }
 
 
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5161 "EditingTools.c"
+#line 4761 "EditingTools.c"
 	}
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5167 "EditingTools.c"
+#line 4767 "EditingTools.c"
 }
 
 
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5178 "EditingTools.c"
+#line 4778 "EditingTools.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5184 "EditingTools.c"
+#line 4784 "EditingTools.c"
 }
 
 
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5195 "EditingTools.c"
+#line 4795 "EditingTools.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5201 "EditingTools.c"
+#line 4801 "EditingTools.c"
 }
 
 
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5212 "EditingTools.c"
+#line 4812 "EditingTools.c"
 	}
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5218 "EditingTools.c"
+#line 4818 "EditingTools.c"
 }
 
 
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5229 "EditingTools.c"
+#line 4829 "EditingTools.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5235 "EditingTools.c"
+#line 4835 "EditingTools.c"
 }
 
 
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5246 "EditingTools.c"
+#line 4846 "EditingTools.c"
 	}
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5252 "EditingTools.c"
+#line 4852 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5263 "EditingTools.c"
+#line 4863 "EditingTools.c"
 	}
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5269 "EditingTools.c"
+#line 4869 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5280 "EditingTools.c"
+#line 4880 "EditingTools.c"
 	}
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5286 "EditingTools.c"
+#line 4886 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5297 "EditingTools.c"
+#line 4897 "EditingTools.c"
 	}
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5303 "EditingTools.c"
+#line 4903 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5314 "EditingTools.c"
+#line 4914 "EditingTools.c"
 	}
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5320 "EditingTools.c"
+#line 4920 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5331 "EditingTools.c"
+#line 4931 "EditingTools.c"
 	}
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5337 "EditingTools.c"
+#line 4937 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5348 "EditingTools.c"
+#line 4948 "EditingTools.c"
 	}
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5354 "EditingTools.c"
+#line 4954 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5365 "EditingTools.c"
+#line 4965 "EditingTools.c"
 	}
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5371 "EditingTools.c"
+#line 4971 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5382 "EditingTools.c"
+#line 4982 "EditingTools.c"
 	}
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5388 "EditingTools.c"
+#line 4988 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5399 "EditingTools.c"
+#line 4999 "EditingTools.c"
 	}
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5405 "EditingTools.c"
+#line 5005 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5416 "EditingTools.c"
+#line 5016 "EditingTools.c"
 	}
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5422 "EditingTools.c"
+#line 5022 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5433 "EditingTools.c"
+#line 5033 "EditingTools.c"
 	}
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5439 "EditingTools.c"
+#line 5039 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5450 "EditingTools.c"
+#line 5050 "EditingTools.c"
 	}
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5456 "EditingTools.c"
+#line 5056 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5467 "EditingTools.c"
+#line 5067 "EditingTools.c"
 	}
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5473 "EditingTools.c"
+#line 5073 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5484 "EditingTools.c"
+#line 5084 "EditingTools.c"
 	}
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5490 "EditingTools.c"
+#line 5090 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5501 "EditingTools.c"
+#line 5101 "EditingTools.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5507 "EditingTools.c"
+#line 5107 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5518 "EditingTools.c"
+#line 5118 "EditingTools.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5524 "EditingTools.c"
+#line 5124 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5535 "EditingTools.c"
+#line 5135 "EditingTools.c"
 	}
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5541 "EditingTools.c"
+#line 5141 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5552 "EditingTools.c"
+#line 5152 "EditingTools.c"
 	}
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5558 "EditingTools.c"
+#line 5158 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5569 "EditingTools.c"
+#line 5169 "EditingTools.c"
 	}
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5575 "EditingTools.c"
+#line 5175 "EditingTools.c"
 }
 
 
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5586 "EditingTools.c"
+#line 5186 "EditingTools.c"
 	}
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5592 "EditingTools.c"
+#line 5192 "EditingTools.c"
 }
 
 
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5603 "EditingTools.c"
+#line 5203 "EditingTools.c"
 	}
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5609 "EditingTools.c"
+#line 5209 "EditingTools.c"
 }
 
 
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5620 "EditingTools.c"
+#line 5220 "EditingTools.c"
 	}
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5626 "EditingTools.c"
+#line 5226 "EditingTools.c"
 }
 
 
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5637 "EditingTools.c"
+#line 5237 "EditingTools.c"
 	}
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5643 "EditingTools.c"
+#line 5243 "EditingTools.c"
 }
 
 
@@ -5738,268 +5338,268 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 	EditingToolsCropToolConstraintDescription* _tmp58_;
 	EditingToolsCropToolConstraintDescription** _tmp59_;
 	gint _tmp59__length1;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result__length1 = 0;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	__result__size_ = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _result_;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_crop_tool_constraint_description_new (_ ("Unconstrained"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _result_;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3__length1 = _result__length1;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = editing_tools_crop_tool_constraint_description_new (_ ("Square"), 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _result_;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5__length1 = _result__length1;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_ ("Screen"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7__length1 = _result__length1;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = editing_tools_crop_tool_constraint_description_new (_ ("Original Size"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _result_;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9__length1 = _result__length1;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _result_;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11__length1 = _result__length1;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_ ("SD Video (4 ∶ 3)"), 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13__length1 = _result__length1;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = editing_tools_crop_tool_constraint_description_new (_ ("HD Video (16 ∶ 9)"), 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp14_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp14_);
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _result_;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15__length1 = _result__length1;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp16_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp16_);
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _result_;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17__length1 = _result__length1;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_ ("Wallet (2 × 3 in.)"), 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _result_;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19__length1 = _result__length1;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = editing_tools_crop_tool_constraint_description_new (_ ("Notecard (3 × 5 in.)"), 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _result_;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21__length1 = _result__length1;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = editing_tools_crop_tool_constraint_description_new (_ ("4 × 6 in."), 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp22_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp22_);
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _result_;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23__length1 = _result__length1;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_ ("5 × 7 in."), 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp24_);
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25__length1 = _result__length1;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = editing_tools_crop_tool_constraint_description_new (_ ("8 × 10 in."), 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp26_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp26_);
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _result_;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27__length1 = _result__length1;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = editing_tools_crop_tool_constraint_description_new (_ ("Letter (8.5 × 11 in.)"), 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp28_);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp28_);
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _result_;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_ ("11 × 14 in."), 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp30_);
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31__length1 = _result__length1;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = editing_tools_crop_tool_constraint_description_new (_ ("Tabloid (11 × 17 in.)"), 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp32_);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp32_);
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _result_;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33__length1 = _result__length1;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = editing_tools_crop_tool_constraint_description_new (_ ("16 × 20 in."), 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp34_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp34_);
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _result_;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35__length1 = _result__length1;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp36_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp36_);
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _result_;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37__length1 = _result__length1;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = editing_tools_crop_tool_constraint_description_new (_ ("Metric Wallet (9 × 13 cm)"), 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp38_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp38_);
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = _result_;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39__length1 = _result__length1;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = editing_tools_crop_tool_constraint_description_new (_ ("Postcard (10 × 15 cm)"), 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp40_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp40_);
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _result_;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41__length1 = _result__length1;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_ ("13 × 18 cm"), 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp42_);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp42_);
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43__length1 = _result__length1;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = editing_tools_crop_tool_constraint_description_new (_ ("18 × 24 cm"), 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp44_);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp44_);
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = _result_;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45__length1 = _result__length1;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = editing_tools_crop_tool_constraint_description_new (_ ("A4 (210 × 297 mm)"), 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp46_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp46_);
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = _result_;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47__length1 = _result__length1;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_ ("20 × 30 cm"), 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp48_);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp48_);
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _result_;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49__length1 = _result__length1;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = editing_tools_crop_tool_constraint_description_new (_ ("24 × 40 cm"), 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp50_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp50_);
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = _result_;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51__length1 = _result__length1;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = editing_tools_crop_tool_constraint_description_new (_ ("30 × 40 cm"), 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp52_);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp52_);
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = _result_;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53__length1 = _result__length1;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_ ("A3 (297 × 420 mm)"), 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp54_);
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = _result_;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55__length1 = _result__length1;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp56_);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp56_);
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = _result_;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57__length1 = _result__length1;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = editing_tools_crop_tool_constraint_description_new (_ ("Custom"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp58_);
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp58_);
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = _result_;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59__length1 = _result__length1;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (result_length1) {
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result_length1 = _tmp59__length1;
-#line 5990 "EditingTools.c"
+#line 5590 "EditingTools.c"
 	}
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp59_;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5996 "EditingTools.c"
+#line 5596 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6003 "EditingTools.c"
+#line 5603 "EditingTools.c"
 }
 
 
@@ -6010,34 +5610,34 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	GtkTreeIter iter = {0};
 	EditingToolsCropToolConstraintDescription** _tmp1_;
 	gint _tmp1__length1;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = constraint_data;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6022 "EditingTools.c"
+#line 5622 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
 		gint _constraint_collection_size_ = 0;
 		gint constraint_it = 0;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection = _tmp1_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection_length1 = _tmp1__length1;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6034 "EditingTools.c"
+#line 5634 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp2_;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6041 "EditingTools.c"
+#line 5641 "EditingTools.c"
 			{
 				GtkListStore* _tmp3_;
 				GtkTreeIter _tmp4_ = {0};
@@ -6046,39 +5646,39 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				EditingToolsCropToolConstraintDescription* _tmp7_;
 				const gchar* _tmp8_;
 				GValue _tmp9_ = {0};
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp3_ = _result_;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_append (_tmp3_, &_tmp4_);
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				iter = _tmp4_;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = _result_;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = iter;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = constraint;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = _tmp7_->name;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_init (&_tmp9_, G_TYPE_STRING);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_set_string (&_tmp9_, _tmp8_);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6074 "EditingTools.c"
+#line 5674 "EditingTools.c"
 			}
 		}
 	}
-#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6082 "EditingTools.c"
+#line 5682 "EditingTools.c"
 }
 
 
@@ -6088,23 +5688,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	EditingToolsCropToolConstraintDescription* _tmp2_;
 	EditingToolsCropToolConstraintDescription* _tmp3_;
 	gboolean _tmp4_;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->pivot_reticle_button;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->is_pivotable;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6108 "EditingTools.c"
+#line 5708 "EditingTools.c"
 }
 
 
@@ -6120,31 +5720,31 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	EditingToolsCropToolConstraintDescription* _tmp5_;
 	EditingToolsCropToolConstraintDescription* _tmp6_;
 	gfloat _tmp7_;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraints;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0__length1 = self->priv->constraints_length1;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->constraint_combo;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gtk_combo_box_get_active (_tmp2_);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp0_[_tmp3_];
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp5_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _result_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->aspect_ratio;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6148 "EditingTools.c"
+#line 5748 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* _tmp8_;
 		EditingToolsPhotoCanvas* _tmp9_;
 		GdkRectangle _tmp10_ = {0};
@@ -6153,37 +5753,37 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		EditingToolsPhotoCanvas* _tmp13_;
 		GdkRectangle _tmp14_ = {0};
 		gint _tmp15_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _result_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_);
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_.width;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->basis_width = _tmp11_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _result_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_);
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_.height;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6177 "EditingTools.c"
+#line 5777 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp16_;
 		gfloat _tmp17_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _result_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_->aspect_ratio;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6187 "EditingTools.c"
+#line 5787 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp18_;
 			GdkScreen* _tmp19_;
@@ -6193,38 +5793,38 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			EditingToolsCropToolConstraintDescription* _tmp23_;
 			GdkScreen* _tmp24_;
 			gint _tmp25_;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = gdk_screen_get_default ();
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp19_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = _result_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = screen;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = gdk_screen_get_width (_tmp21_);
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_->basis_width = _tmp22_;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = _result_;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = screen;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = gdk_screen_get_height (_tmp24_);
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_->basis_height = _tmp25_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6221 "EditingTools.c"
+#line 5821 "EditingTools.c"
 		}
 	}
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6228 "EditingTools.c"
+#line 5828 "EditingTools.c"
 }
 
 
@@ -6236,31 +5836,31 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	GtkEntry* _tmp3_;
 	GdkEventFocus* _tmp4_;
 	gboolean _tmp5_;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_width_entry;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6264 "EditingTools.c"
+#line 5864 "EditingTools.c"
 }
 
 
@@ -6272,31 +5872,31 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	GtkEntry* _tmp3_;
 	GdkEventFocus* _tmp4_;
 	gboolean _tmp5_;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_height_entry;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6300 "EditingTools.c"
+#line 5900 "EditingTools.c"
 }
 
 
@@ -6334,170 +5934,170 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	EditingToolsPhotoCanvas* _tmp71_;
 	gint _tmp72_;
 	gint _tmp73_;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = atoi (_tmp3_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = _tmp4_;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->custom_height_entry;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = _tmp9_;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = width;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6370 "EditingTools.c"
+#line 5970 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp11_;
 		GtkEntry* _tmp12_;
 		gint _tmp13_;
 		gchar* _tmp14_;
 		gchar* _tmp15_;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->crop_tool_window;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_->custom_width_entry;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = width;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = g_strdup_printf ("%d", _tmp13_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp12_, _tmp15_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6392 "EditingTools.c"
+#line 5992 "EditingTools.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6398 "EditingTools.c"
+#line 5998 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp17_;
 		GtkEntry* _tmp18_;
 		gint _tmp19_;
 		gchar* _tmp20_;
 		gchar* _tmp21_;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = self->priv->crop_tool_window;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_->custom_height_entry;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = height;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = g_strdup_printf ("%d", _tmp19_);
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _tmp20_;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp18_, _tmp21_);
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6420 "EditingTools.c"
+#line 6020 "EditingTools.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->custom_width;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6428 "EditingTools.c"
+#line 6028 "EditingTools.c"
 		gint _tmp25_;
 		gint _tmp26_;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = height;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = self->priv->custom_height;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6437 "EditingTools.c"
+#line 6037 "EditingTools.c"
 	} else {
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6441 "EditingTools.c"
+#line 6041 "EditingTools.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6449 "EditingTools.c"
+#line 6049 "EditingTools.c"
 	}
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = height;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_);
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->custom_aspect_ratio;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6461 "EditingTools.c"
+#line 6061 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp30_;
 		GtkEntry* _tmp31_;
 		EditingToolsCropToolCropToolWindow* _tmp32_;
 		GtkEntry* _tmp33_;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = self->priv->crop_tool_window;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = _tmp30_->most_recently_edited;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->crop_tool_window;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_->custom_height_entry;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6476 "EditingTools.c"
+#line 6076 "EditingTools.c"
 			gint _tmp34_;
 			EditingToolsCropToolCropToolWindow* _tmp35_;
 			GtkEntry* _tmp36_;
 			gint _tmp37_;
 			gchar* _tmp38_;
 			gchar* _tmp39_;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = width;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = self->priv->crop_tool_window;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = _tmp35_->custom_height_entry;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = height;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = g_strdup_printf ("%d", _tmp37_);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = _tmp38_;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp36_, _tmp39_);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6501 "EditingTools.c"
+#line 6101 "EditingTools.c"
 		} else {
 			gint _tmp40_;
 			EditingToolsCropToolCropToolWindow* _tmp41_;
@@ -6505,73 +6105,73 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gint _tmp43_;
 			gchar* _tmp44_;
 			gchar* _tmp45_;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = height;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = self->priv->crop_tool_window;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = _tmp41_->custom_width_entry;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp43_ = width;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp44_ = g_strdup_printf ("%d", _tmp43_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp45_ = _tmp44_;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp42_, _tmp45_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6527 "EditingTools.c"
+#line 6127 "EditingTools.c"
 		}
 	} else {
 		gfloat _tmp46_;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = self->priv->custom_aspect_ratio;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6535 "EditingTools.c"
+#line 6135 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp47_;
 			GtkEntry* _tmp48_;
 			EditingToolsCropToolCropToolWindow* _tmp49_;
 			GtkEntry* _tmp50_;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = self->priv->crop_tool_window;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = _tmp47_->most_recently_edited;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp49_ = self->priv->crop_tool_window;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp50_ = _tmp49_->custom_height_entry;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6550 "EditingTools.c"
+#line 6150 "EditingTools.c"
 				gint _tmp51_;
 				EditingToolsCropToolCropToolWindow* _tmp52_;
 				GtkEntry* _tmp53_;
 				gint _tmp54_;
 				gchar* _tmp55_;
 				gchar* _tmp56_;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = width;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = self->priv->crop_tool_window;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = _tmp52_->custom_height_entry;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp54_ = height;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp55_ = g_strdup_printf ("%d", _tmp54_);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = _tmp55_;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp53_, _tmp56_);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6575 "EditingTools.c"
+#line 6175 "EditingTools.c"
 			} else {
 				gint _tmp57_;
 				EditingToolsCropToolCropToolWindow* _tmp58_;
@@ -6579,71 +6179,71 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gint _tmp60_;
 				gchar* _tmp61_;
 				gchar* _tmp62_;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = height;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = self->priv->crop_tool_window;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = _tmp58_->custom_width_entry;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = width;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = _tmp61_;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6601 "EditingTools.c"
+#line 6201 "EditingTools.c"
 			}
 		}
 	}
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = width;
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = height;
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_);
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->scaled_crop;
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_);
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp66_;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = new_crop;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp67_);
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = new_crop;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp68_;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = new_crop;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_);
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp71_);
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = width;
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp72_;
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = height;
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp73_;
-#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6647 "EditingTools.c"
+#line 6247 "EditingTools.c"
 }
 
 
@@ -6652,21 +6252,21 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_;
 	const gchar* _tmp2_;
 	gint _tmp3_;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6670 "EditingTools.c"
+#line 6270 "EditingTools.c"
 }
 
 
@@ -6675,21 +6275,21 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_;
 	const gchar* _tmp2_;
 	gint _tmp3_;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_height_entry;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6693 "EditingTools.c"
+#line 6293 "EditingTools.c"
 }
 
 
@@ -6707,7 +6307,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6711 "EditingTools.c"
+#line 6311 "EditingTools.c"
 }
 
 
@@ -6720,96 +6320,96 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	gint _tmp22_;
 	gint _tmp23_;
 	GtkEntry* _tmp29_;
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GTK_IS_ENTRY (sender));
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->entry_insert_in_progress;
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6736 "EditingTools.c"
+#line 6336 "EditingTools.c"
 	}
-#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = length;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6744 "EditingTools.c"
+#line 6344 "EditingTools.c"
 		const gchar* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = text;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6756 "EditingTools.c"
+#line 6356 "EditingTools.c"
 	}
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6762 "EditingTools.c"
+#line 6362 "EditingTools.c"
 	{
 		gint ctr = 0;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6767 "EditingTools.c"
+#line 6367 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6774 "EditingTools.c"
+#line 6374 "EditingTools.c"
 				gint _tmp8_;
 				gint _tmp9_;
 				const gchar* _tmp10_;
 				gint _tmp11_;
 				gchar _tmp12_;
 				gboolean _tmp13_;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6783 "EditingTools.c"
+#line 6383 "EditingTools.c"
 					gint _tmp7_;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6789 "EditingTools.c"
+#line 6389 "EditingTools.c"
 				}
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = ctr;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = length;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp8_ < _tmp9_)) {
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6801 "EditingTools.c"
+#line 6401 "EditingTools.c"
 				}
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = ctr;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6813 "EditingTools.c"
+#line 6413 "EditingTools.c"
 					const gchar* _tmp14_;
 					const gchar* _tmp15_;
 					gint _tmp16_;
@@ -6817,68 +6417,68 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					gchar* _tmp18_;
 					gchar* _tmp19_;
 					gchar* _tmp20_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = new_text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp15_ = text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp16_ = ctr;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp19_ = _tmp18_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (new_text);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_text = _tmp20_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6841 "EditingTools.c"
+#line 6441 "EditingTools.c"
 				}
 			}
 		}
 	}
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = new_text;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = strlen (_tmp21_);
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6854 "EditingTools.c"
+#line 6454 "EditingTools.c"
 		GtkEntry* _tmp24_;
 		const gchar* _tmp25_;
 		const gchar* _tmp26_;
 		gint _tmp27_;
 		gint _tmp28_;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = sender;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = new_text;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = new_text;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = strlen (_tmp26_);
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6872 "EditingTools.c"
+#line 6472 "EditingTools.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
-#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->entry_insert_in_progress = FALSE;
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->entry_insert_in_progress = FALSE;
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6882 "EditingTools.c"
+#line 6482 "EditingTools.c"
 }
 
 
@@ -6891,53 +6491,53 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	gfloat _tmp3_;
 	gfloat _tmp4_;
 	EditingToolsCropToolReticleOrientation _tmp20_;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp3_;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _result_;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6913 "EditingTools.c"
+#line 6513 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp5_;
 		GdkRectangle _tmp6_ = {0};
 		gint _tmp7_;
 		EditingToolsPhotoCanvas* _tmp8_;
 		GdkRectangle _tmp9_ = {0};
 		gint _tmp10_;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp5_, &_tmp6_);
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.width;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.height;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 6934 "EditingTools.c"
+#line 6534 "EditingTools.c"
 	} else {
 		gfloat _tmp11_;
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6941 "EditingTools.c"
+#line 6541 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp12_;
 			GdkScreen* _tmp13_;
@@ -6945,58 +6545,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			gint _tmp15_;
 			GdkScreen* _tmp16_;
 			gint _tmp17_;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp13_;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_width (_tmp14_);
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = screen;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = gdk_screen_get_height (_tmp16_);
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6967 "EditingTools.c"
+#line 6567 "EditingTools.c"
 		} else {
 			gfloat _tmp18_;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 6974 "EditingTools.c"
+#line 6574 "EditingTools.c"
 				gfloat _tmp19_;
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 6980 "EditingTools.c"
+#line 6580 "EditingTools.c"
 			}
 		}
 	}
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->reticle_orientation;
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 6988 "EditingTools.c"
+#line 6588 "EditingTools.c"
 		gfloat _tmp21_;
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 6994 "EditingTools.c"
+#line 6594 "EditingTools.c"
 	}
-#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7000 "EditingTools.c"
+#line 6600 "EditingTools.c"
 }
 
 
@@ -7007,23 +6607,23 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	gfloat _tmp1_;
 	gfloat _tmp2_;
 	EditingToolsCropToolReticleOrientation _tmp18_;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (constraint), 0.0F);
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), 0.0F);
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = constraint;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->aspect_ratio;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp1_;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _result_;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7027 "EditingTools.c"
+#line 6627 "EditingTools.c"
 		Dimensions orig_dim = {0};
 		Photo* _tmp3_;
 		Dimensions _tmp4_ = {0};
@@ -7031,30 +6631,30 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		gint _tmp6_;
 		Dimensions _tmp7_;
 		gint _tmp8_;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = photo;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo_get_original_dimensions (_tmp3_, &_tmp4_);
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		orig_dim = _tmp4_;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = orig_dim;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.width;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = orig_dim;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.height;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7051 "EditingTools.c"
+#line 6651 "EditingTools.c"
 	} else {
 		gfloat _tmp9_;
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7058 "EditingTools.c"
+#line 6658 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp10_;
 			GdkScreen* _tmp11_;
@@ -7062,58 +6662,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			gint _tmp13_;
 			GdkScreen* _tmp14_;
 			gint _tmp15_;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = gdk_screen_get_default ();
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp11_;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = screen;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = gdk_screen_get_width (_tmp12_);
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_height (_tmp14_);
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7084 "EditingTools.c"
+#line 6684 "EditingTools.c"
 		} else {
 			gfloat _tmp16_;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7091 "EditingTools.c"
+#line 6691 "EditingTools.c"
 				gfloat _tmp17_;
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7097 "EditingTools.c"
+#line 6697 "EditingTools.c"
 			}
 		}
 	}
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->reticle_orientation;
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7105 "EditingTools.c"
+#line 6705 "EditingTools.c"
 		gfloat _tmp19_;
-#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
-#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7111 "EditingTools.c"
+#line 6711 "EditingTools.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7117 "EditingTools.c"
+#line 6717 "EditingTools.c"
 }
 
 
@@ -7128,33 +6728,33 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	gboolean _tmp16_;
 	gfloat _tmp17_;
 	gfloat _tmp18_;
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	selected_constraint = _tmp0_;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = selected_constraint;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7146 "EditingTools.c"
+#line 6746 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp3_;
 		gfloat _tmp4_;
-#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_normal_constraint_mode (self);
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = selected_constraint;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_->aspect_ratio;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7158 "EditingTools.c"
+#line 6758 "EditingTools.c"
 			ConfigFacade* _tmp5_;
 			ConfigFacade* _tmp6_;
 			gint _tmp7_;
@@ -7163,60 +6763,60 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _tmp5_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_width = _tmp7_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp6_);
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = config_facade_get_instance ();
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = _tmp8_;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_height = _tmp10_;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp9_);
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = self->priv->custom_init_width;
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = self->priv->custom_init_height;
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7193 "EditingTools.c"
+#line 6793 "EditingTools.c"
 		}
 	}
-#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->is_pivotable;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = !_tmp15_;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp14_);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_) {
-#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7212 "EditingTools.c"
+#line 6812 "EditingTools.c"
 	}
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->pre_aspect_ratio;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7220 "EditingTools.c"
+#line 6820 "EditingTools.c"
 		Box new_crop = {0};
 		Box _tmp19_;
 		Box _tmp20_ = {0};
@@ -7226,39 +6826,39 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		Box _tmp24_;
 		EditingToolsPhotoCanvas* _tmp25_;
 		gfloat _tmp26_;
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->scaled_crop;
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_);
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp20_;
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = new_crop;
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp21_);
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = new_crop;
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->scaled_crop = _tmp22_;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = new_crop;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
-#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp25_);
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7258 "EditingTools.c"
+#line 6858 "EditingTools.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7262 "EditingTools.c"
+#line 6862 "EditingTools.c"
 }
 
 
@@ -7307,153 +6907,153 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gint _tmp68_;
 	gint _tmp69_;
 	EditingToolsCropToolCropToolWindow* _tmp70_;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
-#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7319 "EditingTools.c"
+#line 6919 "EditingTools.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->normal_width;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ == -1) {
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7329 "EditingTools.c"
+#line 6929 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp4_;
 		gint _tmp5_;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->normal_height;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7339 "EditingTools.c"
+#line 6939 "EditingTools.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7343 "EditingTools.c"
+#line 6943 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp6_;
 		EditingToolsCropToolCropToolWindow* _tmp7_;
 		EditingToolsCropToolCropToolWindow* _tmp8_;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_);
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_->normal_width = _tmp9_;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7361 "EditingTools.c"
+#line 6961 "EditingTools.c"
 	}
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->layout;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->constraint_combo;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->layout;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->pivot_reticle_button;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->layout;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->response_layout;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->layout;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->constraint_combo;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->layout;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->custom_width_entry;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->layout;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->custom_mulsign_label;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->layout;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _tmp37_->custom_height_entry;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->layout;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->pivot_reticle_button;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = self->priv->crop_tool_window;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = _tmp43_->layout;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->crop_tool_window;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->response_layout;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->reticle_orientation;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7457 "EditingTools.c"
+#line 7057 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp48_;
 		GtkEntry* _tmp49_;
 		gint _tmp50_;
@@ -7464,35 +7064,35 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp55_;
 		gchar* _tmp56_;
 		gchar* _tmp57_;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->crop_tool_window;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = _tmp48_->custom_width_entry;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = self->priv->custom_init_width;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = g_strdup_printf ("%d", _tmp50_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = _tmp51_;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp49_, _tmp52_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp52_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = self->priv->crop_tool_window;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = _tmp53_->custom_height_entry;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = self->priv->custom_init_height;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = g_strdup_printf ("%d", _tmp55_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = _tmp56_;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp54_, _tmp57_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7496 "EditingTools.c"
+#line 7096 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp58_;
 		GtkEntry* _tmp59_;
@@ -7504,49 +7104,49 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp65_;
 		gchar* _tmp66_;
 		gchar* _tmp67_;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = self->priv->crop_tool_window;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = _tmp58_->custom_width_entry;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = self->priv->custom_init_height;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = _tmp61_;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp62_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = self->priv->crop_tool_window;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = _tmp63_->custom_height_entry;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp65_ = self->priv->custom_init_width;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp66_ = g_strdup_printf ("%d", _tmp65_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp67_ = _tmp66_;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp64_, _tmp67_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7536 "EditingTools.c"
+#line 7136 "EditingTools.c"
 	}
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->custom_init_height;
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp68_) / ((gfloat) _tmp69_);
-#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = self->priv->crop_tool_window;
-#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
-#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7550 "EditingTools.c"
+#line 7150 "EditingTools.c"
 }
 
 
@@ -7594,125 +7194,125 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	EditingToolsCropToolCropToolWindow* _tmp40_;
 	gint _tmp41_;
 	EditingToolsCropToolCropToolWindow* _tmp42_;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7606 "EditingTools.c"
+#line 7206 "EditingTools.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->layout;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->constraint_combo;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->layout;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->custom_width_entry;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->layout;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_mulsign_label;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->layout;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->pivot_reticle_button;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->layout;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->response_layout;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->layout;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->constraint_combo;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->layout;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->pivot_reticle_button;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->layout;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->response_layout;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = _tmp38_->normal_width;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _tmp40_->normal_height;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_resize (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), _tmp39_, _tmp41_);
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->crop_tool_window;
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7716 "EditingTools.c"
+#line 7316 "EditingTools.c"
 }
 
 
@@ -7747,118 +7347,118 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	gint _tmp24_;
 	gfloat _tmp25_;
 	Box _tmp30_;
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	user_aspect_ratio = _tmp0_;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = user_aspect_ratio;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7763 "EditingTools.c"
+#line 7363 "EditingTools.c"
 		Box _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result = _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7771 "EditingTools.c"
+#line 7371 "EditingTools.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_height (crop);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_area = (gfloat) (_tmp3_ * _tmp4_);
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_area;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_aspect_ratio;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_));
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_height (crop, (gint) _tmp7_);
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = old_area;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = user_aspect_ratio;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_));
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_width (crop, (gint) _tmp10_);
-#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_);
-#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	image_size = _tmp11_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp14_, &_tmp15_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp15_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = *crop;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = image_size;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.width;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = image_size;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.height;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = angle;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_);
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*crop = _tmp22_;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = box_get_width (crop);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = box_get_height (crop);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = user_aspect_ratio;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7835 "EditingTools.c"
+#line 7435 "EditingTools.c"
 		gint _tmp26_;
 		gfloat _tmp27_;
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = user_aspect_ratio;
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7844 "EditingTools.c"
+#line 7444 "EditingTools.c"
 	} else {
 		gint _tmp28_;
 		gfloat _tmp29_;
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = box_get_width (crop);
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = user_aspect_ratio;
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7854 "EditingTools.c"
+#line 7454 "EditingTools.c"
 	}
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp30_;
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7862 "EditingTools.c"
+#line 7462 "EditingTools.c"
 }
 
 
@@ -7873,60 +7473,60 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	EditingToolsCropToolConstraintDescription** _tmp5_;
 	gint _tmp5__length1;
 	EditingToolsCropToolConstraintDescription* _tmp9_;
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_index = _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _vala_index;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->constraints;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5__length1 = self->priv->constraints_length1;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7897 "EditingTools.c"
+#line 7497 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription** _tmp6_;
 		gint _tmp6__length1;
 		gint _tmp7_;
 		EditingToolsCropToolConstraintDescription* _tmp8_;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->constraints;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6__length1 = self->priv->constraints_length1;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _vala_index;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp6_[_tmp7_];
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7912 "EditingTools.c"
+#line 7512 "EditingTools.c"
 	} else {
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7916 "EditingTools.c"
+#line 7516 "EditingTools.c"
 	}
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp9_;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (index) {
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7926 "EditingTools.c"
+#line 7526 "EditingTools.c"
 	}
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7930 "EditingTools.c"
+#line 7530 "EditingTools.c"
 }
 
 
@@ -8007,159 +7607,159 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	Box _tmp119_;
 	EditingToolsPhotoCanvas* _tmp120_;
 	gfloat _tmp121_;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp3_);
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->crop_surface;
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp6_ != NULL) {
-#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8041 "EditingTools.c"
+#line 7641 "EditingTools.c"
 	}
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = _tmp13_;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp15_;
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0);
-#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = ctx;
-#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = canvas;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = _tmp21_;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->crop_tool_window;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->constraint_combo;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->constraint_list;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = canvas;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = photo_has_crop (_tmp27_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = !_tmp28_;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp27_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8113 "EditingTools.c"
+#line 7713 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
 		EditingToolsCropToolConstraintDescription* _tmp31_;
 		gboolean _tmp32_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp33_;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		index = _tmp30_;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp31_;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = desc;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8130 "EditingTools.c"
+#line 7730 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp34_;
 			gboolean _tmp35_;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = desc;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8139 "EditingTools.c"
+#line 7739 "EditingTools.c"
 		} else {
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8143 "EditingTools.c"
+#line 7743 "EditingTools.c"
 		}
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8147 "EditingTools.c"
+#line 7747 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp36_;
 			GtkComboBox* _tmp37_;
 			gint _tmp38_;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = self->priv->crop_tool_window;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = _tmp36_->constraint_combo;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = index;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8159 "EditingTools.c"
+#line 7759 "EditingTools.c"
 		}
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8163 "EditingTools.c"
+#line 7763 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
 		EditingToolsPhotoCanvas* _tmp39_;
@@ -8172,41 +7772,41 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		gint _tmp44_;
 		Dimensions _tmp45_;
 		gint _tmp46_;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = canvas;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_);
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = _tmp40_;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = photo;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_);
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cropped_dim = _tmp42_;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = cropped_dim;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = _tmp43_.width;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = cropped_dim;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_.height;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8198 "EditingTools.c"
+#line 7798 "EditingTools.c"
 		{
 			gint index = 0;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8203 "EditingTools.c"
+#line 7803 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8210 "EditingTools.c"
+#line 7810 "EditingTools.c"
 					gint _tmp49_;
 					EditingToolsCropToolConstraintDescription** _tmp50_;
 					gint _tmp50__length1;
@@ -8218,106 +7818,106 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					Photo* _tmp55_;
 					gfloat _tmp56_;
 					gdouble _tmp57_;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8224 "EditingTools.c"
+#line 7824 "EditingTools.c"
 						gint _tmp48_;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8230 "EditingTools.c"
+#line 7830 "EditingTools.c"
 					}
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp49_ = index;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50_ = self->priv->constraints;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50__length1 = self->priv->constraints_length1;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!(_tmp49_ < _tmp50__length1)) {
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8244 "EditingTools.c"
+#line 7844 "EditingTools.c"
 					}
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52_ = self->priv->constraints;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52__length1 = self->priv->constraints_length1;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp53_ = index;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp54_ = _tmp52_[_tmp53_];
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp55_ = photo;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_);
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8264 "EditingTools.c"
+#line 7864 "EditingTools.c"
 						EditingToolsCropToolCropToolWindow* _tmp58_;
 						GtkComboBox* _tmp59_;
 						gint _tmp60_;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp58_ = self->priv->crop_tool_window;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp59_ = _tmp58_->constraint_combo;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp60_ = index;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8276 "EditingTools.c"
+#line 7876 "EditingTools.c"
 					}
 				}
 			}
 		}
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8283 "EditingTools.c"
+#line 7883 "EditingTools.c"
 	}
-#line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_window_handlers (self);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = canvas;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = _tmp62_;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = _tmp64_;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp63_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp65_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = canvas;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = _tmp67_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp69_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = !_tmp70_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp68_);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8321 "EditingTools.c"
+#line 7921 "EditingTools.c"
 		gint xofs = 0;
 		Dimensions _tmp72_;
 		gint _tmp73_;
@@ -8332,228 +7932,228 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		Dimensions _tmp81_;
 		gint _tmp82_;
 		gint _tmp83_;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp72_ = uncropped_dim;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp73_ = _tmp72_.width;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp74_ = uncropped_dim;
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp75_ = _tmp74_.height;
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp76_ = xofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp77_ = yofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp78_ = uncropped_dim;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp79_ = _tmp78_.width;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp80_ = xofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp81_ = uncropped_dim;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp82_ = _tmp81_.height;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp83_ = yofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8366 "EditingTools.c"
+#line 7966 "EditingTools.c"
 	}
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85_ = canvas;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp86_, &_tmp87_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp88_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp89_ = config_facade_get_instance ();
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp90_ = _tmp89_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp91_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp90_);
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp92_ = config_facade_get_instance ();
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp93_ = _tmp92_;
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp94_;
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp93_);
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = self->priv->custom_width;
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = _tmp95_;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = self->priv->custom_height;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = _tmp96_;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->custom_init_width;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = self->priv->custom_init_height;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_);
-#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = canvas;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_);
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp100_ = self->priv->crop_tool_window;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp101_ = canvas;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp103_ = _tmp102_;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp104_ = photo_has_crop (_tmp103_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp105_ = !_tmp104_;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp103_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8438 "EditingTools.c"
+#line 8038 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		EditingToolsCropToolConstraintDescription* _tmp106_;
 		gboolean _tmp107_ = FALSE;
 		gboolean _tmp108_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp109_;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp106_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8452 "EditingTools.c"
+#line 8052 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp110_;
 			gboolean _tmp111_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp110_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8461 "EditingTools.c"
+#line 8061 "EditingTools.c"
 		} else {
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8465 "EditingTools.c"
+#line 8065 "EditingTools.c"
 		}
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8469 "EditingTools.c"
+#line 8069 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp112_;
 			gfloat _tmp113_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp112_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp113_ = _tmp112_->aspect_ratio;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8478 "EditingTools.c"
+#line 8078 "EditingTools.c"
 		} else {
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8482 "EditingTools.c"
+#line 8082 "EditingTools.c"
 		}
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
-#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8488 "EditingTools.c"
+#line 8088 "EditingTools.c"
 		}
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8492 "EditingTools.c"
+#line 8092 "EditingTools.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_);
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp115_;
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = new_crop;
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp116_);
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = new_crop;
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp117_;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = new_crop;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_);
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = canvas;
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp120_);
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = _tmp121_;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8524 "EditingTools.c"
+#line 8124 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8531 "EditingTools.c"
+#line 8131 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8538 "EditingTools.c"
+#line 8138 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp1_;
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8557 "EditingTools.c"
+#line 8157 "EditingTools.c"
 }
 
 
@@ -8562,83 +8162,83 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	guint _tmp1_;
 	EditingToolsPhotoCanvas* _tmp2_;
 	guint _tmp3_;
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8582 "EditingTools.c"
+#line 8182 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8589 "EditingTools.c"
+#line 8189 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8596 "EditingTools.c"
+#line 8196 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8603 "EditingTools.c"
+#line 8203 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8610 "EditingTools.c"
+#line 8210 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8619 "EditingTools.c"
+#line 8219 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8628 "EditingTools.c"
+#line 8228 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8635 "EditingTools.c"
+#line 8235 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8642 "EditingTools.c"
+#line 8242 "EditingTools.c"
 }
 
 
@@ -8660,61 +8260,61 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	GtkEntry* _tmp14_;
 	EditingToolsCropToolCropToolWindow* _tmp15_;
 	GtkEntry* _tmp16_;
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->ok_button;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->cancel_button;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->constraint_combo;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp6_, "changed", (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->pivot_reticle_button;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp8_, "clicked", (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->custom_width_entry;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_height_entry;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->custom_width_entry;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8718 "EditingTools.c"
+#line 8318 "EditingTools.c"
 }
 
 
@@ -8742,71 +8342,71 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	EditingToolsCropToolCropToolWindow* _tmp20_;
 	GtkEntry* _tmp21_;
 	guint _tmp22_;
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->ok_button;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->cancel_button;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->crop_tool_window;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->constraint_combo;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp10_, NULL, FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->pivot_reticle_button;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp13_, NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_tool_window;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->custom_width_entry;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->custom_height_entry;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->crop_tool_window;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->custom_width_entry;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8810 "EditingTools.c"
+#line 8410 "EditingTools.c"
 }
 
 
@@ -8820,73 +8420,73 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	const gchar* _tmp4_;
 	GdkEventKey* _tmp11_;
 	gboolean _tmp12_;
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8838 "EditingTools.c"
+#line 8438 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_;
 		guint _tmp6_;
 		const gchar* _tmp7_;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8851 "EditingTools.c"
+#line 8451 "EditingTools.c"
 	}
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8857 "EditingTools.c"
+#line 8457 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_;
 		guint _tmp9_;
 		const gchar* _tmp10_;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8870 "EditingTools.c"
+#line 8470 "EditingTools.c"
 	}
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_crop_ok (self);
-#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8880 "EditingTools.c"
+#line 8480 "EditingTools.c"
 	}
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8890 "EditingTools.c"
+#line 8490 "EditingTools.c"
 }
 
 
@@ -8897,21 +8497,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	gboolean _tmp3_;
 	EditingToolsCropToolReticleOrientation _tmp21_;
 	EditingToolsCropToolReticleOrientation _tmp22_;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8915 "EditingTools.c"
+#line 8515 "EditingTools.c"
 		gchar* width_text = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_;
 		GtkEntry* _tmp5_;
@@ -8932,69 +8532,69 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		gint _tmp18_;
 		gint _tmp19_;
 		gint _tmp20_;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->custom_width_entry;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width_text = _tmp7_;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->custom_height_entry;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height_text = _tmp11_;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->crop_tool_window;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_->custom_width_entry;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = height_text;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->crop_tool_window;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->custom_height_entry;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = width_text;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp16_, _tmp17_);
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = self->priv->custom_width;
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		temp = _tmp18_;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->custom_height;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_width = _tmp19_;
-#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = temp;
-#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_height = _tmp20_;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (height_text);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 8988 "EditingTools.c"
+#line 8588 "EditingTools.c"
 	}
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = _tmp22_;
-#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 8998 "EditingTools.c"
+#line 8598 "EditingTools.c"
 }
 
 
@@ -9003,48 +8603,48 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp2_;
 	EditingToolsPhotoCanvas* _tmp5_;
-#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9013 "EditingTools.c"
+#line 8613 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp1_;
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9019 "EditingTools.c"
+#line 8619 "EditingTools.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9025 "EditingTools.c"
+#line 8625 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp3_;
 		EditingToolsCropToolCropToolWindow* _tmp4_;
-#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_window_handlers (self);
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->crop_tool_window;
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->crop_tool_window);
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9042 "EditingTools.c"
+#line 8642 "EditingTools.c"
 	}
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9048 "EditingTools.c"
+#line 8648 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp6_;
 		GdkWindow* _tmp7_;
@@ -9057,47 +8657,47 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		GdkCursor* _tmp12_;
 		GdkWindow* _tmp13_;
 		GdkCursor* _tmp14_;
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = editing_tools_photo_canvas_get_drawing_window (_tmp6_);
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		drawing_window = _tmp7_;
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = drawing_window;
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = gdk_window_get_display (_tmp8_);
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		display = _tmp10_;
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = display;
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp11_, GDK_LEFT_PTR);
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cursor = _tmp12_;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = drawing_window;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = cursor;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gdk_window_set_cursor (_tmp13_, _tmp14_);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (display);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 9093 "EditingTools.c"
+#line 8693 "EditingTools.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9101 "EditingTools.c"
+#line 8701 "EditingTools.c"
 }
 
 
@@ -9106,17 +8706,17 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
-#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9120 "EditingTools.c"
+#line 8720 "EditingTools.c"
 }
 
 
@@ -9132,51 +8732,51 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp1_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *scaling;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp5_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9162 "EditingTools.c"
+#line 8762 "EditingTools.c"
 	}
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp6_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9176 "EditingTools.c"
+#line 8776 "EditingTools.c"
 	}
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9180 "EditingTools.c"
+#line 8780 "EditingTools.c"
 }
 
 
@@ -9200,81 +8800,81 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	cairo_surface_t* _tmp16_;
 	cairo_t* _tmp17_;
 	cairo_t* _tmp18_;
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_black_ctx = _tmp2_;
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wide_black_ctx;
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp3_, "#000");
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wide_black_ctx;
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 1);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_white_ctx = _tmp7_;
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->wide_white_ctx;
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp8_, "#FFF");
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->wide_white_ctx;
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = cairo_get_target (_tmp10_);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = cairo_create (_tmp11_);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = _tmp12_;
-#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->thin_white_ctx;
-#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp13_, "#FFF");
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->thin_white_ctx;
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp14_, 0.5);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = ctx;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = cairo_get_target (_tmp15_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = cairo_create (_tmp16_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->text_ctx = _tmp17_;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->text_ctx;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9278 "EditingTools.c"
+#line 8878 "EditingTools.c"
 }
 
 
@@ -9306,91 +8906,91 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_t* ctx = NULL;
 	cairo_surface_t* _tmp21_;
 	cairo_t* _tmp22_;
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = scaled;
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_dim = _tmp1_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp6_;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *old_dim;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = uncropped_dim;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp9_;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = uncropped_dim;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = new_dim;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp12_;
-#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_surface;
-#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp13_ != NULL) {
-#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9362 "EditingTools.c"
+#line 8962 "EditingTools.c"
 	}
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = scaled;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = _tmp20_;
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_surface;
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = cairo_create (_tmp21_);
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp22_;
-#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
-#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9394 "EditingTools.c"
+#line 8994 "EditingTools.c"
 }
 
 
@@ -9417,63 +9017,63 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	gint _tmp16_;
 	gint _tmp17_;
 	EditingToolsPhotoCanvas* _tmp18_;
-#line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pixbuf_pos = _tmp1_;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pixbuf_pos;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pixbuf_pos;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = _tmp9_;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = scaled_pixbuf_pos;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - _tmp12_;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = _tmp13_;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = scaled_pixbuf_pos;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp14_ - _tmp16_;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = _tmp17_;
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9477 "EditingTools.c"
+#line 9077 "EditingTools.c"
 }
 
 
@@ -9483,33 +9083,33 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	gint _tmp1_;
 	gint _tmp2_;
 	EditingToolsPhotoCanvas* _tmp3_;
-#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
-#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9495 "EditingTools.c"
+#line 9095 "EditingTools.c"
 	}
-#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = -1;
-#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = x;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = y;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_);
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9513 "EditingTools.c"
+#line 9113 "EditingTools.c"
 }
 
 
@@ -9519,34 +9119,34 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	gint _tmp3_;
 	gint _tmp4_;
 	EditingToolsPhotoCanvas* _tmp5_;
-#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9529 "EditingTools.c"
+#line 9129 "EditingTools.c"
 		gint _tmp1_;
 		gint _tmp2_;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = y;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9538 "EditingTools.c"
+#line 9138 "EditingTools.c"
 	}
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = y;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9550 "EditingTools.c"
+#line 9150 "EditingTools.c"
 }
 
 
@@ -9580,97 +9180,97 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	EditingToolsPhotoCanvas* _tmp22_;
 	cairo_surface_t* _tmp23_;
 	Box _tmp24_;
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	w = _tmp4_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	h = _tmp9_;
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = default_ctx;
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
-#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = default_ctx;
-#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = default_ctx;
-#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp12_);
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = default_ctx;
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp13_);
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp15_;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5);
-#line 1358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->scaled_crop;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.left;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->scaled_crop;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.top;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_width (&self->priv->scaled_crop);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = box_get_height (&self->priv->scaled_crop);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_);
-#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_surface;
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE);
-#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9674 "EditingTools.c"
+#line 9274 "EditingTools.c"
 }
 
 
@@ -9715,113 +9315,113 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 	CropCommand* _tmp35_;
 	CropCommand* _tmp36_;
 	Dimensions _tmp37_ = {0};
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->constraint_combo;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->custom_width;
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_);
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->custom_height;
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp12_, &_tmp13_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp16_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp19_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->scaled_crop;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_.left;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->scaled_crop;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.top;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = box_get_width (&self->priv->scaled_crop);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = box_get_height (&self->priv->scaled_crop);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp22_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cropped = _tmp30_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = crop;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_dimensions (&crop, &_tmp37_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp36_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9825 "EditingTools.c"
+#line 9425 "EditingTools.c"
 }
 
 
@@ -9841,140 +9441,140 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	BoxLocation _tmp9_;
 	GdkCursorType _tmp10_;
 	GdkCursorType _tmp11_;
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pos;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pos;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cursor_type = GDK_LEFT_PTR;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp9_) {
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9877 "EditingTools.c"
+#line 9477 "EditingTools.c"
 		{
-#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
-#line 1404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9883 "EditingTools.c"
+#line 9483 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9887 "EditingTools.c"
+#line 9487 "EditingTools.c"
 		{
-#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
-#line 1408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9893 "EditingTools.c"
+#line 9493 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9897 "EditingTools.c"
+#line 9497 "EditingTools.c"
 		{
-#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
-#line 1412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9903 "EditingTools.c"
+#line 9503 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9907 "EditingTools.c"
+#line 9507 "EditingTools.c"
 		{
-#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
-#line 1416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9913 "EditingTools.c"
+#line 9513 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9917 "EditingTools.c"
+#line 9517 "EditingTools.c"
 		{
-#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
-#line 1420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9923 "EditingTools.c"
+#line 9523 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9927 "EditingTools.c"
+#line 9527 "EditingTools.c"
 		{
-#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
-#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9933 "EditingTools.c"
+#line 9533 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 9937 "EditingTools.c"
+#line 9537 "EditingTools.c"
 		{
-#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
-#line 1428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9943 "EditingTools.c"
+#line 9543 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 9947 "EditingTools.c"
+#line 9547 "EditingTools.c"
 		{
-#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9953 "EditingTools.c"
+#line 9553 "EditingTools.c"
 		}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 9957 "EditingTools.c"
+#line 9557 "EditingTools.c"
 		{
-#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
-#line 1436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9963 "EditingTools.c"
+#line 9563 "EditingTools.c"
 		}
 		default:
 		{
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9969 "EditingTools.c"
+#line 9569 "EditingTools.c"
 		}
 	}
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = cursor_type;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->current_cursor_type;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 9978 "EditingTools.c"
+#line 9578 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp12_;
 		GdkWindow* _tmp13_;
@@ -9989,45 +9589,45 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 		GdkWindow* _tmp20_;
 		GdkCursor* _tmp21_;
 		GdkCursorType _tmp22_;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_);
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		drawing_window = _tmp13_;
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = drawing_window;
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = gdk_window_get_display (_tmp14_);
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		display = _tmp16_;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = display;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = cursor_type;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_);
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cursor = _tmp19_;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = drawing_window;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = cursor;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gdk_window_set_cursor (_tmp20_, _tmp21_);
-#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = cursor_type;
-#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->current_cursor_type = _tmp22_;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (display);
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 10031 "EditingTools.c"
+#line 9631 "EditingTools.c"
 	}
 }
 
@@ -10043,31 +9643,31 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	gdouble _tmp4_;
 	gdouble _tmp5_;
 	gdouble _tmp6_;
-#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = bounds_y;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = center_y;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = bounds_x;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = center_x;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_);
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_y;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = bounds_x;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_intercept = _tmp4_ - (decision_slope * _tmp5_);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_x;
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10071 "EditingTools.c"
+#line 9671 "EditingTools.c"
 }
 
 
@@ -10104,136 +9704,136 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	gint _tmp26_;
 	gdouble _tmp27_;
 	Dimensions _tmp28_ = {0};
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp3_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp4_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface_dims = _tmp6_;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = surface_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = surface_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.height;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp15_;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = scale_factor;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = MIN (_tmp16_, 1.0);
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp17_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp21_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = photo_dims;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.width;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scale_factor;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = photo_dims;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.height;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = scale_factor;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.width = (gint) (_tmp23_ * _tmp24_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.height = (gint) (_tmp26_ * _tmp27_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp28_;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10188 "EditingTools.c"
+#line 9788 "EditingTools.c"
 }
 
 
 static gboolean _box_equal (const Box * s1, const Box * s2) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10197 "EditingTools.c"
+#line 9797 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10203 "EditingTools.c"
+#line 9803 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10209 "EditingTools.c"
+#line 9809 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10215 "EditingTools.c"
+#line 9815 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10221 "EditingTools.c"
+#line 9821 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10227 "EditingTools.c"
+#line 9827 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10233 "EditingTools.c"
+#line 9833 "EditingTools.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10237 "EditingTools.c"
+#line 9837 "EditingTools.c"
 }
 
 
@@ -10287,317 +9887,317 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	BoxLocation _tmp254_;
 	Box _tmp257_;
 	gfloat _tmp258_;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = scaled_pos;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp2_ - _tmp4_;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = x;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ < 0) {
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10313 "EditingTools.c"
+#line 9913 "EditingTools.c"
 	} else {
 		gint _tmp6_;
 		GdkRectangle _tmp7_;
 		gint _tmp8_;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = scaled_pos;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.width;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10326 "EditingTools.c"
+#line 9926 "EditingTools.c"
 			GdkRectangle _tmp9_;
 			gint _tmp10_;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = scaled_pos;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = _tmp9_.width;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10335 "EditingTools.c"
+#line 9935 "EditingTools.c"
 		}
 	}
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = y;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = scaled_pos;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp11_ - _tmp13_;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ < 0) {
-#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10352 "EditingTools.c"
+#line 9952 "EditingTools.c"
 	} else {
 		gint _tmp15_;
 		GdkRectangle _tmp16_;
 		gint _tmp17_;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = y;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = scaled_pos;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_.height;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10365 "EditingTools.c"
+#line 9965 "EditingTools.c"
 			GdkRectangle _tmp18_;
 			gint _tmp19_;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = scaled_pos;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _tmp18_.height;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10374 "EditingTools.c"
+#line 9974 "EditingTools.c"
 		}
 	}
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->scaled_crop;
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.left;
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	left = _tmp21_;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->scaled_crop;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.top;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	top = _tmp23_;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.right;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	right = _tmp25_;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_crop;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.bottom;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bottom = _tmp27_;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = left;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = right;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = (_tmp28_ + _tmp29_) / 2;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = top;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = bottom;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = (_tmp30_ + _tmp31_) / 2;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->in_manipulation;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp32_) {
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10419 "EditingTools.c"
+#line 10019 "EditingTools.c"
 		{
 			gint _tmp33_;
 			gfloat _tmp34_;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = x;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp33_;
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10431 "EditingTools.c"
+#line 10031 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp35_;
 				gint _tmp36_;
 				gfloat _tmp37_;
 				gint _tmp38_;
 				gfloat _tmp39_;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp35_ = right;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp36_ = left;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp38_ = top;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp39_ = new_height;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10452 "EditingTools.c"
+#line 10052 "EditingTools.c"
 			}
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10456 "EditingTools.c"
+#line 10056 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10460 "EditingTools.c"
+#line 10060 "EditingTools.c"
 		{
 			gint _tmp40_;
 			gfloat _tmp41_;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = y;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp40_;
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10472 "EditingTools.c"
+#line 10072 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp42_;
 				gint _tmp43_;
 				gfloat _tmp44_;
 				gint _tmp45_;
 				gfloat _tmp46_;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp42_ = bottom;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp43_ = top;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp45_ = left;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp46_ = new_width;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10493 "EditingTools.c"
+#line 10093 "EditingTools.c"
 			}
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10497 "EditingTools.c"
+#line 10097 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10501 "EditingTools.c"
+#line 10101 "EditingTools.c"
 		{
 			gint _tmp47_;
 			gfloat _tmp48_;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = x;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp47_;
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10513 "EditingTools.c"
+#line 10113 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp49_;
 				gint _tmp50_;
 				gfloat _tmp51_;
 				gint _tmp52_;
 				gfloat _tmp53_;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp49_ = right;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp50_ = left;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = top;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = new_height;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10534 "EditingTools.c"
+#line 10134 "EditingTools.c"
 			}
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10538 "EditingTools.c"
+#line 10138 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10542 "EditingTools.c"
+#line 10142 "EditingTools.c"
 		{
 			gint _tmp54_;
 			gfloat _tmp55_;
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = y;
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			bottom = _tmp54_;
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10554 "EditingTools.c"
+#line 10154 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp56_;
 				gint _tmp57_;
 				gfloat _tmp58_;
 				gint _tmp59_;
 				gfloat _tmp60_;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = bottom;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = top;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = left;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = new_width;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10575 "EditingTools.c"
+#line 10175 "EditingTools.c"
 			}
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10579 "EditingTools.c"
+#line 10179 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10583 "EditingTools.c"
+#line 10183 "EditingTools.c"
 		{
 			gfloat _tmp61_;
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10590 "EditingTools.c"
+#line 10190 "EditingTools.c"
 				gint _tmp62_;
 				gint _tmp63_;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = y;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp62_;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp63_ = x;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10601 "EditingTools.c"
+#line 10201 "EditingTools.c"
 			} else {
 				gint _tmp64_;
 				gint _tmp65_;
@@ -10606,23 +10206,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp68_;
 				gint _tmp69_;
 				gint _tmp70_;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp64_ = y;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp65_ = center_x;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp66_ = center_y;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp67_ = left;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp68_ = top;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp69_ = x;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10626 "EditingTools.c"
+#line 10226 "EditingTools.c"
 					gint _tmp71_;
 					gfloat new_width = 0.0F;
 					gint _tmp72_;
@@ -10630,25 +10230,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp74_;
 					gint _tmp75_;
 					gfloat _tmp76_;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp71_ = y;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp71_;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp72_ = bottom;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp73_ = top;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp75_ = right;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp76_ = new_width;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10652 "EditingTools.c"
+#line 10252 "EditingTools.c"
 				} else {
 					gint _tmp77_;
 					gfloat new_height = 0.0F;
@@ -10657,52 +10257,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp80_;
 					gint _tmp81_;
 					gfloat _tmp82_;
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp77_ = x;
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp77_;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp78_ = right;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp79_ = left;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp81_ = bottom;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp82_ = new_height;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10679 "EditingTools.c"
+#line 10279 "EditingTools.c"
 				}
 			}
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10684 "EditingTools.c"
+#line 10284 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10688 "EditingTools.c"
+#line 10288 "EditingTools.c"
 		{
 			gfloat _tmp83_;
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10695 "EditingTools.c"
+#line 10295 "EditingTools.c"
 				gint _tmp84_;
 				gint _tmp85_;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp84_ = y;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp84_;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp85_ = x;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10706 "EditingTools.c"
+#line 10306 "EditingTools.c"
 			} else {
 				gint _tmp86_;
 				gint _tmp87_;
@@ -10711,23 +10311,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp90_;
 				gint _tmp91_;
 				gint _tmp92_;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp86_ = y;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp87_ = center_x;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp88_ = center_y;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp89_ = left;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp90_ = bottom;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp91_ = x;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10731 "EditingTools.c"
+#line 10331 "EditingTools.c"
 					gint _tmp93_;
 					gfloat new_height = 0.0F;
 					gint _tmp94_;
@@ -10735,25 +10335,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp96_;
 					gint _tmp97_;
 					gfloat _tmp98_;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp93_ = x;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp93_;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp94_ = right;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp95_ = left;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp97_ = top;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp98_ = new_height;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10757 "EditingTools.c"
+#line 10357 "EditingTools.c"
 				} else {
 					gint _tmp99_;
 					gfloat new_width = 0.0F;
@@ -10762,52 +10362,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp102_;
 					gint _tmp103_;
 					gfloat _tmp104_;
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp99_ = y;
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp99_;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp100_ = bottom;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp101_ = top;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp103_ = right;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp104_ = new_width;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10784 "EditingTools.c"
+#line 10384 "EditingTools.c"
 				}
 			}
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10789 "EditingTools.c"
+#line 10389 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10793 "EditingTools.c"
+#line 10393 "EditingTools.c"
 		{
 			gfloat _tmp105_;
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10800 "EditingTools.c"
+#line 10400 "EditingTools.c"
 				gint _tmp106_;
 				gint _tmp107_;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp106_ = y;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp106_;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp107_ = x;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10811 "EditingTools.c"
+#line 10411 "EditingTools.c"
 			} else {
 				gint _tmp108_;
 				gint _tmp109_;
@@ -10816,23 +10416,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp112_;
 				gint _tmp113_;
 				gint _tmp114_;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp108_ = y;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp109_ = center_x;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp110_ = center_y;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp111_ = right;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp112_ = top;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp113_ = x;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10836 "EditingTools.c"
+#line 10436 "EditingTools.c"
 					gint _tmp115_;
 					gfloat new_width = 0.0F;
 					gint _tmp116_;
@@ -10840,25 +10440,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp118_;
 					gint _tmp119_;
 					gfloat _tmp120_;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp115_ = y;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp115_;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp116_ = bottom;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp117_ = top;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp119_ = left;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp120_ = new_width;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10862 "EditingTools.c"
+#line 10462 "EditingTools.c"
 				} else {
 					gint _tmp121_;
 					gfloat new_height = 0.0F;
@@ -10867,52 +10467,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp124_;
 					gint _tmp125_;
 					gfloat _tmp126_;
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp121_ = x;
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp121_;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp122_ = right;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp123_ = left;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp125_ = bottom;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp126_ = new_height;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10889 "EditingTools.c"
+#line 10489 "EditingTools.c"
 				}
 			}
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10894 "EditingTools.c"
+#line 10494 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10898 "EditingTools.c"
+#line 10498 "EditingTools.c"
 		{
 			gfloat _tmp127_;
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10905 "EditingTools.c"
+#line 10505 "EditingTools.c"
 				gint _tmp128_;
 				gint _tmp129_;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp128_ = y;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp128_;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp129_ = x;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10916 "EditingTools.c"
+#line 10516 "EditingTools.c"
 			} else {
 				gint _tmp130_;
 				gint _tmp131_;
@@ -10921,23 +10521,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp134_;
 				gint _tmp135_;
 				gint _tmp136_;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp130_ = y;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp131_ = center_x;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp132_ = center_y;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp133_ = right;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp134_ = bottom;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp135_ = x;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 10941 "EditingTools.c"
+#line 10541 "EditingTools.c"
 					gint _tmp137_;
 					gfloat new_height = 0.0F;
 					gint _tmp138_;
@@ -10945,25 +10545,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp140_;
 					gint _tmp141_;
 					gfloat _tmp142_;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp137_ = x;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp137_;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp138_ = right;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp139_ = left;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp141_ = top;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp142_ = new_height;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 10967 "EditingTools.c"
+#line 10567 "EditingTools.c"
 				} else {
 					gint _tmp143_;
 					gfloat new_width = 0.0F;
@@ -10972,34 +10572,34 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp146_;
 					gint _tmp147_;
 					gfloat _tmp148_;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp143_ = y;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp143_;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp144_ = bottom;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp145_ = top;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp147_ = left;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp148_ = new_width;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 10994 "EditingTools.c"
+#line 10594 "EditingTools.c"
 				}
 			}
-#line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10999 "EditingTools.c"
+#line 10599 "EditingTools.c"
 		}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11003 "EditingTools.c"
+#line 10603 "EditingTools.c"
 		{
 			gint _tmp149_;
 			gint _tmp150_;
@@ -11043,250 +10643,250 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			gint _tmp186_;
 			gint _tmp192_;
 			gint _tmp193_;
-#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp149_ = self->priv->last_grab_x;
-#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp149_ >= 0, "last_grab_x >= 0");
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp150_ = self->priv->last_grab_y;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp150_ >= 0, "last_grab_y >= 0");
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp151_ = x;
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp152_ = self->priv->last_grab_x;
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_x = _tmp151_ - _tmp152_;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp153_ = y;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp154_ = self->priv->last_grab_y;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_y = _tmp153_ - _tmp154_;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp155_ = x;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_x = _tmp155_;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp156_ = y;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_y = _tmp156_;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp157_ = right;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp158_ = left;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (_tmp157_ - _tmp158_) + 1;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp159_ = bottom;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp160_ = top;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (_tmp159_ - _tmp160_) + 1;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp161_ = left;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp162_ = delta_x;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp161_ + _tmp162_;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp163_ = top;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp164_ = delta_y;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp163_ + _tmp164_;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp165_ = right;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp166_ = delta_x;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp165_ + _tmp166_;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp167_ = bottom;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp168_ = delta_y;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			bottom = _tmp167_ + _tmp168_;
-#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp169_ = left;
-#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp169_ < 0) {
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11117 "EditingTools.c"
+#line 10717 "EditingTools.c"
 			}
-#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
-#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp170_ < 0) {
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11125 "EditingTools.c"
+#line 10725 "EditingTools.c"
 			}
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp172_ = scaled_pos;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp173_ = _tmp172_.width;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11135 "EditingTools.c"
+#line 10735 "EditingTools.c"
 				GdkRectangle _tmp174_;
 				gint _tmp175_;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp174_ = scaled_pos;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp175_ = _tmp174_.width;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11144 "EditingTools.c"
+#line 10744 "EditingTools.c"
 			}
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp177_ = scaled_pos;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp178_ = _tmp177_.height;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11154 "EditingTools.c"
+#line 10754 "EditingTools.c"
 				GdkRectangle _tmp179_;
 				gint _tmp180_;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp179_ = scaled_pos;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp180_ = _tmp179_.height;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11163 "EditingTools.c"
+#line 10763 "EditingTools.c"
 			}
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp182_ = left;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adj_width = (_tmp181_ - _tmp182_) + 1;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp183_ = bottom;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp184_ = top;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adj_height = (_tmp183_ - _tmp184_) + 1;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp185_ = adj_width;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp186_ = width;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11183 "EditingTools.c"
+#line 10783 "EditingTools.c"
 				gint _tmp187_;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11189 "EditingTools.c"
+#line 10789 "EditingTools.c"
 					gint _tmp188_;
 					gint _tmp189_;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp188_ = left;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp189_ = width;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11198 "EditingTools.c"
+#line 10798 "EditingTools.c"
 				} else {
 					gint _tmp190_;
 					gint _tmp191_;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp190_ = right;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp191_ = width;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11208 "EditingTools.c"
+#line 10808 "EditingTools.c"
 				}
 			}
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp192_ = adj_height;
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp193_ = height;
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11217 "EditingTools.c"
+#line 10817 "EditingTools.c"
 				gint _tmp194_;
-#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
-#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11223 "EditingTools.c"
+#line 10823 "EditingTools.c"
 					gint _tmp195_;
 					gint _tmp196_;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp195_ = top;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp196_ = height;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11232 "EditingTools.c"
+#line 10832 "EditingTools.c"
 				} else {
 					gint _tmp197_;
 					gint _tmp198_;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp197_ = bottom;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp198_ = height;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11242 "EditingTools.c"
+#line 10842 "EditingTools.c"
 				}
 			}
-#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11247 "EditingTools.c"
+#line 10847 "EditingTools.c"
 		}
 		default:
 		{
-#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			result = FALSE;
-#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11255 "EditingTools.c"
+#line 10855 "EditingTools.c"
 		}
 	}
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp199_ = right;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp200_ = left;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = (_tmp199_ - _tmp200_) + 1;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp201_ = bottom;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp202_ = top;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = (_tmp201_ - _tmp202_) + 1;
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_);
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp203_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_);
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp206_ = _tmp205_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp206_, &_tmp207_);
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp207_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp206_);
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11290 "EditingTools.c"
+#line 10890 "EditingTools.c"
 		gint _tmp209_;
 		gint _tmp210_;
 		gint _tmp211_;
@@ -11305,167 +10905,167 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gdouble _tmp232_;
 		BoxLocation _tmp233_;
 		Box _tmp234_ = {0};
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp209_ = right;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp210_ = left;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = (_tmp209_ - _tmp210_) + 1;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp211_ = bottom;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp212_ = top;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = (_tmp211_ - _tmp212_) + 1;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp213_ = self->priv->in_manipulation;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp213_) {
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_LEFT_SIDE:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11331 "EditingTools.c"
+#line 10931 "EditingTools.c"
 			{
 				gint _tmp214_;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11338 "EditingTools.c"
+#line 10938 "EditingTools.c"
 					gint _tmp215_;
-#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
-#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11344 "EditingTools.c"
+#line 10944 "EditingTools.c"
 				}
-#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11348 "EditingTools.c"
+#line 10948 "EditingTools.c"
 			}
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11356 "EditingTools.c"
+#line 10956 "EditingTools.c"
 			{
 				gint _tmp216_;
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11363 "EditingTools.c"
+#line 10963 "EditingTools.c"
 					gint _tmp217_;
-#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
-#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11369 "EditingTools.c"
+#line 10969 "EditingTools.c"
 				}
-#line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11373 "EditingTools.c"
+#line 10973 "EditingTools.c"
 			}
 			default:
 			{
-#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11379 "EditingTools.c"
+#line 10979 "EditingTools.c"
 			}
 		}
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp218_ = self->priv->in_manipulation;
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp218_) {
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_SIDE:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11392 "EditingTools.c"
+#line 10992 "EditingTools.c"
 			{
 				gint _tmp219_;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11399 "EditingTools.c"
+#line 10999 "EditingTools.c"
 					gint _tmp220_;
-#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
-#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11405 "EditingTools.c"
+#line 11005 "EditingTools.c"
 				}
-#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11409 "EditingTools.c"
+#line 11009 "EditingTools.c"
 			}
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11417 "EditingTools.c"
+#line 11017 "EditingTools.c"
 			{
 				gint _tmp221_;
-#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
-#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11424 "EditingTools.c"
+#line 11024 "EditingTools.c"
 					gint _tmp222_;
-#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
-#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11430 "EditingTools.c"
+#line 11030 "EditingTools.c"
 				}
-#line 1710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11434 "EditingTools.c"
+#line 11034 "EditingTools.c"
 			}
 			default:
 			{
-#line 1713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11440 "EditingTools.c"
+#line 11040 "EditingTools.c"
 			}
 		}
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp223_ = left;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp224_ = top;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp225_ = right;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp226_ = bottom;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_);
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp228_ = photo_dims;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp229_ = _tmp228_.width;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp230_ = photo_dims;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp231_ = _tmp230_.height;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp232_ = angle;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp233_ = self->priv->in_manipulation;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11469 "EditingTools.c"
+#line 11069 "EditingTools.c"
 	} else {
 		gint _tmp235_;
 		gint _tmp236_;
@@ -11484,128 +11084,128 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gboolean _tmp248_ = FALSE;
 		Box _tmp249_;
 		Box _tmp250_;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp235_ = left;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp236_ = top;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp237_ = right;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp238_ = bottom;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_);
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp239_ = new_crop;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp240_ = photo_dims;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp241_ = _tmp240_.width;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp242_ = photo_dims;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp243_ = _tmp242_.height;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp244_ = angle;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp245_ = self->priv->in_manipulation;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_);
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		adjusted = _tmp246_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp249_ = adjusted;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp250_ = new_crop;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11524 "EditingTools.c"
+#line 11124 "EditingTools.c"
 		} else {
 			gint _tmp251_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11531 "EditingTools.c"
+#line 11131 "EditingTools.c"
 		}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11537 "EditingTools.c"
+#line 11137 "EditingTools.c"
 		} else {
 			gint _tmp252_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11544 "EditingTools.c"
+#line 11144 "EditingTools.c"
 		}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11548 "EditingTools.c"
+#line 11148 "EditingTools.c"
 			Box _tmp253_;
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11554 "EditingTools.c"
+#line 11154 "EditingTools.c"
 		}
 	}
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11561 "EditingTools.c"
+#line 11161 "EditingTools.c"
 		Box _tmp255_;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11567 "EditingTools.c"
+#line 11167 "EditingTools.c"
 	} else {
 		Box _tmp256_;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11574 "EditingTools.c"
+#line 11174 "EditingTools.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp257_;
-#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11584 "EditingTools.c"
+#line 11184 "EditingTools.c"
 		gint _tmp259_;
 		gint _tmp260_;
 		gint _tmp261_;
 		gint _tmp262_;
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp259_ = box_get_width (&self->priv->scaled_crop);
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_width = _tmp259_;
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp260_ = box_get_height (&self->priv->scaled_crop);
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_height = _tmp260_;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp261_ = self->priv->custom_init_width;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp262_ = self->priv->custom_init_height;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11603 "EditingTools.c"
+#line 11203 "EditingTools.c"
 	}
-#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11609 "EditingTools.c"
+#line 11209 "EditingTools.c"
 }
 
 
@@ -11633,133 +11233,133 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	Box _tmp23_;
 	EditingToolsPhotoCanvas* _tmp24_;
 	Box _tmp25_;
-#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11649 "EditingTools.c"
+#line 11249 "EditingTools.c"
 	}
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *new_crop;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal = _tmp5_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal_enlarged = _tmp6_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical = _tmp7_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical_enlarged = _tmp8_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	complements = _tmp9_;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = complements;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = complements;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11681 "EditingTools.c"
+#line 11281 "EditingTools.c"
 	} else {
 		BoxComplements _tmp13_;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11688 "EditingTools.c"
+#line 11288 "EditingTools.c"
 	}
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11692 "EditingTools.c"
+#line 11292 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
 		gboolean _tmp15_;
 		Box _tmp16_;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = horizontal_enlarged;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_) {
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11702 "EditingTools.c"
+#line 11302 "EditingTools.c"
 		} else {
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11706 "EditingTools.c"
+#line 11306 "EditingTools.c"
 		}
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11712 "EditingTools.c"
+#line 11312 "EditingTools.c"
 	}
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11720 "EditingTools.c"
+#line 11320 "EditingTools.c"
 	} else {
 		BoxComplements _tmp19_;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11727 "EditingTools.c"
+#line 11327 "EditingTools.c"
 	}
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11731 "EditingTools.c"
+#line 11331 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
 		gboolean _tmp21_;
 		Box _tmp22_;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = vertical_enlarged;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp21_) {
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11741 "EditingTools.c"
+#line 11341 "EditingTools.c"
 		} else {
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11745 "EditingTools.c"
+#line 11345 "EditingTools.c"
 		}
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11751 "EditingTools.c"
+#line 11351 "EditingTools.c"
 	}
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_);
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = *new_crop;
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11763 "EditingTools.c"
+#line 11363 "EditingTools.c"
 }
 
 
@@ -11773,45 +11373,45 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	Box _tmp6_;
 	EditingToolsPhotoCanvas* _tmp7_;
 	Box _tmp8_;
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11789 "EditingTools.c"
+#line 11389 "EditingTools.c"
 	}
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_crop;
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5);
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *new_crop;
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *new_crop;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_);
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *new_crop;
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11815 "EditingTools.c"
+#line 11415 "EditingTools.c"
 }
 
 
@@ -11829,49 +11429,49 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp9_;
 	cairo_surface_t* _tmp10_;
 	Box _tmp11_;
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_surface;
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp1_;
-#line 1802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = alpha;
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *area;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.left;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *area;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.top;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = box_get_width (area);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = box_get_height (area);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_);
-#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->crop_surface;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = *area;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11875 "EditingTools.c"
+#line 11475 "EditingTools.c"
 }
 
 
@@ -11886,15 +11486,15 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp71_;
 	cairo_t* _tmp72_;
 	Box _tmp73_ = {0};
-#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11898 "EditingTools.c"
+#line 11498 "EditingTools.c"
 		gint one_third_x = 0;
 		gint _tmp1_;
 		gint one_third_y = 0;
@@ -11965,193 +11565,193 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		const gchar* _tmp62_;
 		gint _tmp63_;
 		gint _tmp64_;
-#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = box_get_width (crop);
-#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_x = _tmp1_ / 3;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = box_get_height (crop);
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_y = _tmp2_ / 3;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->thin_white_ctx;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = *crop;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.left;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = *crop;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.top;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = one_third_y;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = box_get_width (crop);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE);
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->thin_white_ctx;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = *crop;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.left;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = *crop;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.top;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = one_third_y;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = box_get_width (crop);
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = self->priv->thin_white_ctx;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = *crop;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.left;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = one_third_x;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = *crop;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.top;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE);
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = self->priv->thin_white_ctx;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = *crop;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.left;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = one_third_x;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = *crop;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.top;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = box_get_height (crop);
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_for_rectangle (&_tmp36_, &_tmp37_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = _tmp39_;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = _tmp42_;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp40_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		adj_crop = _tmp43_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = box_get_width (&adj_crop);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = g_strdup_printf ("%i", _tmp44_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = g_strconcat (_tmp46_, "x", NULL);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = _tmp47_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = box_get_height (&adj_crop);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = g_strdup_printf ("%i", _tmp49_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = _tmp50_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = _tmp52_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp51_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp48_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp46_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		text = _tmp53_;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = *crop;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = _tmp54_.left;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = box_get_width (crop);
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp55_ + (_tmp56_ / 2);
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = *crop;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = _tmp57_.top;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = box_get_height (crop);
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp58_ + (_tmp59_ / 2);
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = self->priv->text_ctx;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = text;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = x;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = y;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12129 "EditingTools.c"
+#line 11729 "EditingTools.c"
 	}
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = self->priv->wide_black_ctx;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = *crop;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_);
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->wide_white_ctx;
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 1, &_tmp70_);
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_);
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = self->priv->wide_white_ctx;
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 2, &_tmp73_);
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12155 "EditingTools.c"
+#line 11755 "EditingTools.c"
 }
 
 
@@ -12163,62 +11763,62 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	gint _tmp3_;
 	gfloat _tmp4_;
 	gboolean _tmp8_;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_name;
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = new_basis_width;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_width = _tmp2_;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = new_basis_height;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_height = _tmp3_;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_aspect_ratio;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12191 "EditingTools.c"
+#line 11791 "EditingTools.c"
 		gint _tmp5_;
 		gint _tmp6_;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->basis_width;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->basis_height;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12200 "EditingTools.c"
+#line 11800 "EditingTools.c"
 	} else {
 		gfloat _tmp7_;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12207 "EditingTools.c"
+#line 11807 "EditingTools.c"
 	}
-#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
-#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->is_pivotable = _tmp8_;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12215 "EditingTools.c"
+#line 11815 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12222 "EditingTools.c"
+#line 11822 "EditingTools.c"
 }
 
 
@@ -12226,237 +11826,237 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->is_pivotable;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12236 "EditingTools.c"
+#line 11836 "EditingTools.c"
 		gfloat _tmp2_;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12242 "EditingTools.c"
+#line 11842 "EditingTools.c"
 	} else {
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12246 "EditingTools.c"
+#line 11846 "EditingTools.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12252 "EditingTools.c"
+#line 11852 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12259 "EditingTools.c"
+#line 11859 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12268 "EditingTools.c"
+#line 11868 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12278 "EditingTools.c"
+#line 11878 "EditingTools.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12282 "EditingTools.c"
+#line 11882 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12290 "EditingTools.c"
+#line 11890 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12297 "EditingTools.c"
+#line 11897 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription * object;
 		object = collect_values[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12304 "EditingTools.c"
+#line 11904 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12308 "EditingTools.c"
+#line 11908 "EditingTools.c"
 		}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12312 "EditingTools.c"
+#line 11912 "EditingTools.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12316 "EditingTools.c"
+#line 11916 "EditingTools.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12320 "EditingTools.c"
+#line 11920 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsCropToolConstraintDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12331 "EditingTools.c"
+#line 11931 "EditingTools.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12337 "EditingTools.c"
+#line 11937 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12341 "EditingTools.c"
+#line 11941 "EditingTools.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12345 "EditingTools.c"
+#line 11945 "EditingTools.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12349 "EditingTools.c"
+#line 11949 "EditingTools.c"
 }
 
 
 static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsCropToolParamSpecConstraintDescription* spec;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12363 "EditingTools.c"
+#line 11963 "EditingTools.c"
 }
 
 
 static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12372 "EditingTools.c"
+#line 11972 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription * old;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12392 "EditingTools.c"
+#line 11992 "EditingTools.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12396 "EditingTools.c"
+#line 11996 "EditingTools.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12402 "EditingTools.c"
+#line 12002 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription * old;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12421 "EditingTools.c"
+#line 12021 "EditingTools.c"
 	} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12425 "EditingTools.c"
+#line 12025 "EditingTools.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12431 "EditingTools.c"
+#line 12031 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12441 "EditingTools.c"
+#line 12041 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12448 "EditingTools.c"
+#line 12048 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) {
 	EditingToolsCropToolConstraintDescription * self;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12460 "EditingTools.c"
+#line 12060 "EditingTools.c"
 }
 
 
@@ -12477,24 +12077,24 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12485 "EditingTools.c"
+#line 12085 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12498 "EditingTools.c"
+#line 12098 "EditingTools.c"
 	}
 }
 
@@ -12502,9 +12102,9 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12508 "EditingTools.c"
+#line 12108 "EditingTools.c"
 }
 
 
@@ -12544,156 +12144,156 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 	GtkBox* _tmp29_;
 	GtkBox* _tmp30_;
 	GtkBox* _tmp31_;
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->cancel_button;
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->cancel_button;
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT);
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->ok_button;
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->ok_button;
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkComboBox*) gtk_combo_box_new ();
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->constraint_combo = _tmp5_;
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp6_);
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	combo_text_renderer = _tmp6_;
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->constraint_combo;
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->constraint_combo;
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->constraint_combo;
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
-#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->constraint_combo;
-#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_active (_tmp10_, 0);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp11_);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	image = _tmp11_;
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->pivot_reticle_button;
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->pivot_reticle_button;
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->custom_width_entry;
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_entry_set_width_chars (_tmp14_, 4);
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->custom_width_entry;
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->custom_height_entry;
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_entry_set_width_chars (_tmp16_, 4);
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->custom_height_entry;
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_set (_tmp17_, "editable", TRUE, NULL);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp18_);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->response_layout = _tmp18_;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->response_layout;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (_tmp19_, TRUE);
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->response_layout;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->cancel_button;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->response_layout;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->ok_button;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp24_);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->layout = _tmp24_;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->layout;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->constraint_combo;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->layout;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->pivot_reticle_button;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.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 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->layout;
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->response_layout;
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->layout;
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (image);
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12690 "EditingTools.c"
+#line 12290 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12697 "EditingTools.c"
+#line 12297 "EditingTools.c"
 }
 
 
@@ -12706,44 +12306,44 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	gchar* _tmp3_;
 	gchar* _tmp4_;
 	gboolean _tmp5_;
-#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = model;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = *iter;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	val = _tmp2_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = g_value_dup_string (&val);
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (_tmp4_);
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12738 "EditingTools.c"
+#line 12338 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) {
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12747 "EditingTools.c"
+#line 12347 "EditingTools.c"
 }
 
 
@@ -12754,83 +12354,83 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	GtkEntry* _tmp3_;
 	GtkEntry* _tmp4_;
 	GtkLabel* _tmp5_;
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp0_;
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp1_;
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new ();
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->pivot_reticle_button = _tmp2_;
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkEntry*) gtk_entry_new ();
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_width_entry = _tmp3_;
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkEntry*) gtk_entry_new ();
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_height_entry = _tmp4_;
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkLabel*) gtk_label_new_with_mnemonic ("x");
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_mulsign_label = _tmp5_;
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->most_recently_edited = NULL;
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->response_layout = NULL;
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->layout = NULL;
-#line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_width = -1;
-#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12804 "EditingTools.c"
+#line 12404 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
 	EditingToolsCropToolCropToolWindow * self;
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->pivot_reticle_button);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_width_entry);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_height_entry);
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_mulsign_label);
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->most_recently_edited);
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12834 "EditingTools.c"
+#line 12434 "EditingTools.c"
 }
 
 
@@ -12847,31 +12447,31 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
 
 
 static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) {
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass);
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_crop_tool_finalize;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_deactivate;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_get_tool_window;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_click;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_released;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint;
-#line 12875 "EditingTools.c"
+#line 12475 "EditingTools.c"
 }
 
 
@@ -12883,93 +12483,93 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	EditingToolsCropToolConstraintDescription** _tmp4_;
 	gint _tmp4__length1;
 	GtkListStore* _tmp5_;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = NULL;
-#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_cursor_type = GDK_LEFT_PTR;
-#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_black_ctx = NULL;
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_white_ctx = NULL;
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->text_ctx = NULL;
-#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = -1;
-#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_crop_tool_create_constraints (&_tmp0_);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = _tmp1_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints_length1 = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_constraints_size_ = self->priv->constraints_length1;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_crop_tool_create_constraints (&_tmp2_);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4__length1 = _tmp2_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_create_constraint_list (_tmp4_, _tmp2_);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_list = _tmp5_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = 1.0f;
-#line 731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = -1;
-#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = -1;
-#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = -1;
-#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = -1;
-#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 12947 "EditingTools.c"
+#line 12547 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsCropTool * self;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = (_vala_array_free (self->priv->constraints, self->priv->constraints_length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->constraint_list);
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 12973 "EditingTools.c"
+#line 12573 "EditingTools.c"
 }
 
 
@@ -12988,17 +12588,17 @@ GType editing_tools_crop_tool_get_type (void) {
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
 	GdkPoint default_center = {0};
 	GdkPoint _tmp0_;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (self, 0, sizeof (EditingToolsRedeyeInstance));
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&default_center, 0, sizeof (GdkPoint));
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_center;
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).center = _tmp0_;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13002 "EditingTools.c"
+#line 12602 "EditingTools.c"
 }
 
 
@@ -13018,51 +12618,51 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	gint _tmp11_;
 	GdkRectangle _tmp12_;
 	gint _tmp13_;
-#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&_result_, 0, sizeof (GdkRectangle));
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *inst;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.center;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *inst;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.radius;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = _tmp2_ - _tmp4_;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = _tmp7_ - _tmp9_;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *inst;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.radius;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.width = 2 * _tmp11_;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _result_;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.height = _tmp13_;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13066 "EditingTools.c"
+#line 12666 "EditingTools.c"
 }
 
 
@@ -13082,68 +12682,68 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	gint _tmp10_;
 	EditingToolsRedeyeInstance _tmp11_;
 	gint _tmp12_;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rect != NULL);
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *rect;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	in_rect = _tmp0_;
-#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = in_rect;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.width;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = in_rect;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.height;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = (_tmp2_ + _tmp4_) / 4;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = in_rect;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.x;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.radius;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp6_ + _tmp8_;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = in_rect;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.y;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _result_;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.radius;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp10_ + _tmp12_;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13128 "EditingTools.c"
+#line 12728 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) {
 	EditingToolsRedeyeInstance* dup;
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dup = g_new0 (EditingToolsRedeyeInstance, 1);
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13140 "EditingTools.c"
+#line 12740 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13147 "EditingTools.c"
+#line 12747 "EditingTools.c"
 }
 
 
@@ -13160,31 +12760,31 @@ GType editing_tools_redeye_instance_get_type (void) {
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) {
 	EditingToolsRedeyeTool* self = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13168 "EditingTools.c"
+#line 12768 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13175 "EditingTools.c"
+#line 12775 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	EditingToolsRedeyeTool* result = NULL;
 	EditingToolsRedeyeTool* _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_redeye_tool_new ();
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13188 "EditingTools.c"
+#line 12788 "EditingTools.c"
 }
 
 
@@ -13197,44 +12797,44 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_;
 	gint _tmp5_;
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13219 "EditingTools.c"
+#line 12819 "EditingTools.c"
 		Dimensions _tmp6_;
 		gint _tmp7_;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13228 "EditingTools.c"
+#line 12828 "EditingTools.c"
 	} else {
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13232 "EditingTools.c"
+#line 12832 "EditingTools.c"
 	}
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13238 "EditingTools.c"
+#line 12838 "EditingTools.c"
 }
 
 
@@ -13257,61 +12857,61 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	gint _tmp12_;
 	GdkPoint _tmp13_;
 	gint _tmp14_;
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_bounds = _tmp1_;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_.x = 0;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center = _tmp2_;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo_bounds;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_bounds;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.width;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.x = _tmp4_ + (_tmp6_ / 2);
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_bounds;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.y;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_bounds;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.height;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.y = _tmp8_ + (_tmp10_ / 2);
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = photo_center;
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp12_;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_center;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.y;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp14_;
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13315 "EditingTools.c"
+#line 12915 "EditingTools.c"
 }
 
 
@@ -13326,49 +12926,49 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	cairo_t* _tmp7_;
 	cairo_t* _tmp8_;
 	cairo_t* _tmp9_;
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = _tmp2_;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wider_gray_ctx;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp3_, "#111");
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wider_gray_ctx;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 3);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = _tmp7_;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->thin_white_ctx;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp8_, "#FFF");
-#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->thin_white_ctx;
-#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13372 "EditingTools.c"
+#line 12972 "EditingTools.c"
 }
 
 
@@ -13393,55 +12993,55 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	gint _tmp17_;
 	EditingToolsRedeyeInstance _tmp18_;
 	gint _tmp19_;
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->wider_gray_ctx;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.center;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp0_, _tmp1_, _tmp4_, _tmp7_, _tmp9_);
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->thin_white_ctx;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13445 "EditingTools.c"
+#line 13045 "EditingTools.c"
 }
 
 
@@ -13451,25 +13051,25 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	EditingToolsPhotoCanvas* _tmp3_;
-#line 1969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->slider;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.radius = (gint) _tmp2_;
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13473 "EditingTools.c"
+#line 13073 "EditingTools.c"
 }
 
 
@@ -13520,117 +13120,117 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	RedeyeCommand* _tmp35_;
 	CommandManager* _tmp36_;
 	CommandManager* _tmp37_;
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_user = _tmp1_;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = bounds_rect_user;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_rect (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_active = _tmp4_;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = bounds_rect_active;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_rect (_tmp5_, &_tmp6_, &_tmp7_);
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_unscaled = _tmp7_;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = bounds_rect_unscaled;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_unscaled_to_raw_rect (_tmp8_, &_tmp9_, &_tmp10_);
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_raw = _tmp10_;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = bounds_rect_raw;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_from_bounds_rect (&_tmp11_, &_tmp12_);
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	instance_raw = _tmp12_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp16_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp15_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions = _tmp17_;
-#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = 0.0;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp20_, &_tmp21_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = _tmp21_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = instance_raw;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.center;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = dimensions;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.width;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = dimensions;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.height;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = theta;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	derotate_point_arb (&_tmp23_, _tmp25_, _tmp27_, _tmp28_, &_tmp29_);
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	instance_raw.center = _tmp29_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = instance_raw;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = redeye_command_new (_tmp32_, &_tmp33_, RESOURCES_RED_EYE_LABEL, RESOURCES_RED_EYE_TOOLTIP);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp32_);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp35_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = app_window_get_command_manager ();
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp37_);
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13634 "EditingTools.c"
+#line 13234 "EditingTools.c"
 }
 
 
@@ -13643,29 +13243,29 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	gboolean _tmp5_;
 	EditingToolsPhotoCanvas* _tmp17_;
 	GError * _inner_error_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13669 "EditingTools.c"
+#line 13269 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
@@ -13677,81 +13277,81 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		GdkPixbuf* _tmp12_;
 		GdkPixbuf* _tmp13_;
 		GdkPixbuf* _tmp14_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp13_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13701 "EditingTools.c"
-			goto __catch22_g_error;
+#line 13301 "EditingTools.c"
+			goto __catch26_g_error;
 		}
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp6_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->current_pixbuf);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->current_pixbuf = _tmp14_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13714 "EditingTools.c"
+#line 13314 "EditingTools.c"
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_;
 		const gchar* _tmp16_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_inner_error_ = NULL;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = err;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->message;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_warning ("EditingTools.vala:2016: %s", _tmp16_);
-#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_warning ("EditingTools.vala:1994: %s", _tmp16_);
+#line 1995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0);
-#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
-#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13738 "EditingTools.c"
+#line 13338 "EditingTools.c"
 	}
-	__finally22:
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	__finally26:
+#line 1991 "/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"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_clear_error (&_inner_error_);
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13749 "EditingTools.c"
+#line 13349 "EditingTools.c"
 	}
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13755 "EditingTools.c"
+#line 13355 "EditingTools.c"
 }
 
 
@@ -13761,23 +13361,23 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 	Photo* _tmp2_;
 	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->current_pixbuf;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13781 "EditingTools.c"
+#line 13381 "EditingTools.c"
 }
 
 
@@ -13809,88 +13409,88 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	GdkRectangle _tmp22_;
 	gint _tmp23_;
 	GdkRectangle _tmp24_;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pixbuf_position = _tmp1_;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->user_interaction_instance.center.x;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->old_scaled_pixbuf_position;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp2_ - _tmp4_;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->user_interaction_instance.center.y;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->old_scaled_pixbuf_position;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp5_ - _tmp7_;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = scaled_pixbuf_position;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->old_scaled_pixbuf_position;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.width;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_);
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->user_interaction_instance;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5);
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->user_interaction_instance;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = (gint) ((((gdouble) _tmp17_) * scale_factor) + 0.5);
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance.center.x;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = scaled_pixbuf_position;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.x;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp18_ + _tmp20_;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->user_interaction_instance.center.y;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = scaled_pixbuf_position;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.y;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp21_ + _tmp23_;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scaled_pixbuf_position;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp24_;
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13887 "EditingTools.c"
+#line 13487 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13894 "EditingTools.c"
+#line 13494 "EditingTools.c"
 }
 
 
@@ -13935,143 +13535,143 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	DataCollection* _tmp34_;
 	DataCollection* _tmp35_;
 	EditingToolsPhotoCanvas* _tmp37_;
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_);
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance = _tmp1_;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = canvas;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp4_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = canvas;
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp9_;
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = _tmp11_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = canvas;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp15_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = _tmp15_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->redeye_tool_window;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->slider;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_);
-#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_window_handlers (self);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = canvas;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = gdk_window_get_display (_tmp22_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp22_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	display = _tmp25_;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = display;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR);
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->cached_arrow_cursor = _tmp27_;
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = display;
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR);
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->cached_grab_cursor = _tmp29_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = canvas;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp32_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	owner = _tmp34_;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = owner;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp35_ != NULL) {
-#line 14059 "EditingTools.c"
+#line 13659 "EditingTools.c"
 		DataCollection* _tmp36_;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = owner;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14065 "EditingTools.c"
+#line 13665 "EditingTools.c"
 	}
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = canvas;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (display);
-#line 14075 "EditingTools.c"
+#line 13675 "EditingTools.c"
 }
 
 
@@ -14079,13 +13679,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsRedeyeTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_;
-#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14089 "EditingTools.c"
+#line 13689 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_;
 		Photo* _tmp2_;
@@ -14094,102 +13694,102 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_;
 		DataCollection* _tmp6_;
 		EditingToolsPhotoCanvas* _tmp9_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14116 "EditingTools.c"
+#line 13716 "EditingTools.c"
 			DataCollection* _tmp7_;
 			guint _tmp8_;
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14125 "EditingTools.c"
+#line 13725 "EditingTools.c"
 		}
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14133 "EditingTools.c"
+#line 13733 "EditingTools.c"
 	}
-#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
-#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14139 "EditingTools.c"
+#line 13739 "EditingTools.c"
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_;
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_;
-#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_window_handlers (self);
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->redeye_tool_window;
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->redeye_tool_window;
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14156 "EditingTools.c"
+#line 13756 "EditingTools.c"
 	}
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14160 "EditingTools.c"
+#line 13760 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14167 "EditingTools.c"
+#line 13767 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14174 "EditingTools.c"
+#line 13774 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp1_;
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14193 "EditingTools.c"
+#line 13793 "EditingTools.c"
 }
 
 
@@ -14198,46 +13798,46 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	guint _tmp1_;
 	EditingToolsPhotoCanvas* _tmp2_;
 	guint _tmp3_;
-#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14218 "EditingTools.c"
+#line 13818 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14225 "EditingTools.c"
+#line 13825 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14232 "EditingTools.c"
+#line 13832 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) {
 	gboolean result;
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14241 "EditingTools.c"
+#line 13841 "EditingTools.c"
 }
 
 
@@ -14248,27 +13848,27 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	GtkButton* _tmp3_;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_;
 	GtkScale* _tmp5_;
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->redeye_tool_window;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->close_button;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->redeye_tool_window;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->slider;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14272 "EditingTools.c"
+#line 13872 "EditingTools.c"
 }
 
 
@@ -14282,33 +13882,33 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_;
 	GtkScale* _tmp7_;
 	guint _tmp8_;
-#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->redeye_tool_window;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->close_button;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->redeye_tool_window;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->slider;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14312 "EditingTools.c"
+#line 13912 "EditingTools.c"
 }
 
 
@@ -14317,17 +13917,17 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14331 "EditingTools.c"
+#line 13931 "EditingTools.c"
 }
 
 
@@ -14343,64 +13943,64 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	GdkPoint _tmp10_;
 	GdkPoint _tmp11_ = {0};
 	EditingToolsRedeyeInstance _tmp12_;
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->current_pixbuf;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14355 "EditingTools.c"
+#line 13955 "EditingTools.c"
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->current_pixbuf;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14366 "EditingTools.c"
+#line 13966 "EditingTools.c"
 	} else {
 		EditingToolsPhotoCanvas* _tmp4_;
 		GdkPixbuf* _tmp5_;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14378 "EditingTools.c"
+#line 13978 "EditingTools.c"
 	}
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_);
-#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->user_interaction_instance;
-#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst = _tmp7_;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->user_interaction_instance;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.center;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (_tmp8_, &_tmp10_, &_tmp11_);
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst.center = _tmp11_;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = active_inst;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14404 "EditingTools.c"
+#line 14004 "EditingTools.c"
 }
 
 
@@ -14413,70 +14013,70 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	gint _tmp3_;
 	GdkRectangle _tmp4_;
 	gboolean _tmp5_;
-#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect = _tmp1_;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = y;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_rect;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14435 "EditingTools.c"
+#line 14035 "EditingTools.c"
 		gint _tmp6_;
 		gint _tmp7_;
 		EditingToolsRedeyeInstance _tmp8_;
 		GdkPoint _tmp9_;
-#line 2141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
-#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.x = _tmp6_;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = y;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.y = _tmp7_;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->user_interaction_instance;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_.center;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14456 "EditingTools.c"
+#line 14056 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsRedeyeTool * self;
-#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14467 "EditingTools.c"
+#line 14067 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsRedeyeTool * self;
 	gboolean _tmp0_;
-#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14480 "EditingTools.c"
+#line 14080 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
 		EditingToolsPhotoCanvas* _tmp1_;
 		GdkRectangle _tmp2_ = {0};
@@ -14531,125 +14131,125 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp45_;
 		gint _tmp46_;
 		EditingToolsPhotoCanvas* _tmp47_;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp1_, &_tmp2_);
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		active_region_rect = _tmp2_;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = active_region_rect;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_.x;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->user_interaction_instance;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.radius;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_low = (_tmp4_ + _tmp6_) + 1;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = active_region_rect;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.y;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->user_interaction_instance;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.radius;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_low = (_tmp8_ + _tmp10_) + 1;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = active_region_rect;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_.x;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = active_region_rect;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->user_interaction_instance;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.radius;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_high = ((_tmp12_ + _tmp14_) - _tmp16_) - 1;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = active_region_rect;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_.y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = active_region_rect;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = _tmp19_.height;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = self->priv->user_interaction_instance;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.radius;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = x;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = self->priv->reticle_move_mouse_start_point;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.x;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_x = _tmp23_ - _tmp25_;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = y;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = self->priv->reticle_move_mouse_start_point;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_.y;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_y = _tmp26_ - _tmp28_;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = self->priv->reticle_move_anchor;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = delta_x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->reticle_move_anchor;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.y;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = delta_y;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = self->priv->reticle_move_anchor;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = _tmp35_.x;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp37_ = delta_x;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = x_clamp_low;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = x_clamp_high;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_);
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp40_;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = self->priv->reticle_move_anchor;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp42_ = _tmp41_.y;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = delta_y;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = y_clamp_low;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = y_clamp_high;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_);
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.y = _tmp46_;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14653 "EditingTools.c"
+#line 14253 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
 		EditingToolsRedeyeInstance _tmp48_;
@@ -14658,58 +14258,58 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp51_;
 		GdkRectangle _tmp52_;
 		gboolean _tmp53_;
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->user_interaction_instance;
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_);
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		bounds = _tmp49_;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = x;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = y;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = bounds;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14678 "EditingTools.c"
+#line 14278 "EditingTools.c"
 			EditingToolsPhotoCanvas* _tmp54_;
 			GdkWindow* _tmp55_;
 			GdkWindow* _tmp56_;
 			GdkCursor* _tmp57_;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_);
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp56_ = _tmp55_;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp57_ = self->priv->cached_grab_cursor;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14695 "EditingTools.c"
+#line 14295 "EditingTools.c"
 		} else {
 			EditingToolsPhotoCanvas* _tmp58_;
 			GdkWindow* _tmp59_;
 			GdkWindow* _tmp60_;
 			GdkCursor* _tmp61_;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_);
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp60_ = _tmp59_;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = self->priv->cached_arrow_cursor;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14713 "EditingTools.c"
+#line 14313 "EditingTools.c"
 		}
 	}
 }
@@ -14725,73 +14325,73 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_;
 	GdkEventKey* _tmp11_;
 	gboolean _tmp12_;
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14743 "EditingTools.c"
+#line 14343 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_;
 		guint _tmp6_;
 		const gchar* _tmp7_;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14756 "EditingTools.c"
+#line 14356 "EditingTools.c"
 	}
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14762 "EditingTools.c"
+#line 14362 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_;
 		guint _tmp9_;
 		const gchar* _tmp10_;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14775 "EditingTools.c"
+#line 14375 "EditingTools.c"
 	}
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_on_close (self);
-#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14785 "EditingTools.c"
+#line 14385 "EditingTools.c"
 	}
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14795 "EditingTools.c"
+#line 14395 "EditingTools.c"
 }
 
 
@@ -14810,83 +14410,83 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 	GtkScale* _tmp9_;
 	GtkButton* _tmp10_;
 	GtkButton* _tmp11_;
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->slider;
-#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->slider;
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp2_, FALSE);
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->close_button;
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->close_button;
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->apply_button;
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->apply_button;
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	layout = _tmp7_;
-#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->slider_label;
-#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->slider;
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->close_button;
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->apply_button;
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14872 "EditingTools.c"
+#line 14472 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14879 "EditingTools.c"
+#line 14479 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) {
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14890 "EditingTools.c"
+#line 14490 "EditingTools.c"
 }
 
 
@@ -14895,51 +14495,51 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
 	GtkButton* _tmp1_;
 	GtkButton* _tmp2_;
 	GtkScale* _tmp3_;
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Size:"));
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->slider_label = _tmp0_;
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->apply_button = _tmp1_;
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->close_button = _tmp2_;
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->slider = _tmp3_;
-#line 14925 "EditingTools.c"
+#line 14525 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->slider_label);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->apply_button);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->close_button);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->slider);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 14943 "EditingTools.c"
+#line 14543 "EditingTools.c"
 }
 
 
@@ -14956,68 +14556,68 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
 
 
 static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) {
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_redeye_tool_finalize;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_deactivate;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_get_tool_window;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_redeye_tool_real_paint;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
-#line 14982 "EditingTools.c"
+#line 14582 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) {
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self);
-#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = NULL;
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = NULL;
-#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 14999 "EditingTools.c"
+#line 14599 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsRedeyeTool * self;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
-#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15021 "EditingTools.c"
+#line 14621 "EditingTools.c"
 }
 
 
@@ -15035,52 +14635,52 @@ GType editing_tools_redeye_tool_get_type (void) {
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
 	EditingToolsAdjustTool* self = NULL;
-#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15043 "EditingTools.c"
+#line 14643 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15050 "EditingTools.c"
+#line 14650 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
 	EditingToolsAdjustTool* _tmp0_;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15063 "EditingTools.c"
+#line 14663 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15077 "EditingTools.c"
+#line 14677 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15084 "EditingTools.c"
+#line 14684 "EditingTools.c"
 }
 
 
@@ -15202,351 +14802,351 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	DataCollection* _tmp122_;
 	DataCollection* _tmp123_;
 	EditingToolsPhotoCanvas* _tmp125_;
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = _tmp3_;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo = _tmp5_;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = photo;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_color_adjustments (_tmp6_);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = _tmp7_;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformations;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = _tmp9_;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformer_new ();
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = _tmp10_;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformations;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->adjust_tool_window;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->histogram_manipulator;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = expansion_trans;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->adjust_tool_window;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->histogram_manipulator;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = expansion_trans;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->transformations;
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->histogram_transformer;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = shadows_trans;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->adjust_tool_window;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->shadows_slider;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = shadows_trans;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->transformations;
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->histogram_transformer;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = highlights_trans;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->highlights_slider;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = highlights_trans;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->transformations;
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->histogram_transformer;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = temp_trans;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->adjust_tool_window;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->temperature_slider;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = temp_trans;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->transformations;
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->histogram_transformer;
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = tint_trans;
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = self->priv->adjust_tool_window;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _tmp49_->tint_slider;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = tint_trans;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = tint_transformation_get_parameter (_tmp51_);
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = self->priv->transformations;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = self->priv->histogram_transformer;
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = sat_trans;
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = self->priv->adjust_tool_window;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _tmp57_->saturation_slider;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = sat_trans;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = self->priv->transformations;
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = self->priv->histogram_transformer;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = exposure_trans;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->adjust_tool_window;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = _tmp65_->exposure_slider;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = exposure_trans;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->transformations;
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = self->priv->histogram_transformer;
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = contrast_trans;
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = self->priv->adjust_tool_window;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp74_ = _tmp73_->contrast_slider;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = contrast_trans;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp77_ = canvas;
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = canvas;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp80_ = _tmp79_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = gdk_pixbuf_copy (_tmp80_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp81_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp80_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82_ = canvas;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = _tmp83_;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp84_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp86_ = self->priv->draw_to_pixbuf;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88_ = _tmp87_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp88_ == 1) {
-#line 15472 "EditingTools.c"
+#line 15072 "EditingTools.c"
 		GdkPixbuf* _tmp89_;
 		gint _tmp90_;
 		gint _tmp91_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp89_ = self->priv->draw_to_pixbuf;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp91_ = _tmp90_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = _tmp91_ == 1;
-#line 15484 "EditingTools.c"
+#line 15084 "EditingTools.c"
 	} else {
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15488 "EditingTools.c"
+#line 15088 "EditingTools.c"
 	}
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15494 "EditingTools.c"
+#line 15094 "EditingTools.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = _tmp95_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = _tmp98_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15510 "EditingTools.c"
+#line 15110 "EditingTools.c"
 		GdkPixbuf* _tmp100_;
 		gint _tmp101_;
 		gint _tmp102_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp100_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp102_ = _tmp101_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = _tmp102_ > 1;
-#line 15522 "EditingTools.c"
+#line 15122 "EditingTools.c"
 	} else {
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = FALSE;
-#line 15526 "EditingTools.c"
+#line 15126 "EditingTools.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp93_) {
-#line 15530 "EditingTools.c"
+#line 15130 "EditingTools.c"
 		GdkPixbuf* _tmp103_;
 		gint _tmp104_;
 		gint _tmp105_;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp103_ = self->priv->draw_to_pixbuf;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp105_ = _tmp104_;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = _tmp105_ > 1;
-#line 15542 "EditingTools.c"
+#line 15142 "EditingTools.c"
 	} else {
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = FALSE;
-#line 15546 "EditingTools.c"
+#line 15146 "EditingTools.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp92_) {
-#line 15550 "EditingTools.c"
+#line 15150 "EditingTools.c"
 		GdkPixbuf* _tmp106_;
 		GdkPixbuf* _tmp107_;
 		gint _tmp108_;
@@ -15555,99 +15155,99 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		gint _tmp111_;
 		gint _tmp112_;
 		GdkPixbuf* _tmp113_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp107_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = _tmp108_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp110_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp112_ = _tmp111_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp113_;
-#line 15579 "EditingTools.c"
+#line 15179 "EditingTools.c"
 	} else {
 		GdkPixbuf* _tmp114_;
 		GdkPixbuf* _tmp115_;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp114_ = self->priv->draw_to_pixbuf;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp115_ = gdk_pixbuf_copy (_tmp114_);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp115_;
-#line 15591 "EditingTools.c"
+#line 15191 "EditingTools.c"
 	}
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = self->priv->histogram_pixbuf;
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = gdk_pixbuf_copy (_tmp116_);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = _tmp117_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = _tmp119_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp122_ = _tmp121_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp120_);
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	owner = _tmp122_;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp123_ = owner;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp123_ != NULL) {
-#line 15619 "EditingTools.c"
+#line 15219 "EditingTools.c"
 		DataCollection* _tmp124_;
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp124_ = owner;
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15625 "EditingTools.c"
+#line 15225 "EditingTools.c"
 	}
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp125_ = canvas;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (contrast_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (exposure_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (sat_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (tint_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (temp_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (highlights_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (shadows_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (expansion_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15651 "EditingTools.c"
+#line 15251 "EditingTools.c"
 }
 
 
@@ -15656,17 +15256,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15670 "EditingTools.c"
+#line 15270 "EditingTools.c"
 }
 
 
@@ -15674,13 +15274,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsAdjustTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15684 "EditingTools.c"
+#line 15284 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_;
 		Photo* _tmp2_;
@@ -15689,81 +15289,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_;
 		DataCollection* _tmp6_;
 		EditingToolsPhotoCanvas* _tmp9_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15711 "EditingTools.c"
+#line 15311 "EditingTools.c"
 			DataCollection* _tmp7_;
 			guint _tmp8_;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15720 "EditingTools.c"
+#line 15320 "EditingTools.c"
 		}
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15728 "EditingTools.c"
+#line 15328 "EditingTools.c"
 	}
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15734 "EditingTools.c"
+#line 15334 "EditingTools.c"
 		EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
 		EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
-#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->adjust_tool_window;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->adjust_tool_window;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15751 "EditingTools.c"
+#line 15351 "EditingTools.c"
 	}
-#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15767 "EditingTools.c"
+#line 15367 "EditingTools.c"
 }
 
 
@@ -15772,61 +15372,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	gboolean _tmp0_;
 	EditingToolsPhotoCanvas* _tmp10_;
 	GdkPixbuf* _tmp11_;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->suppress_effect_redraw;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15784 "EditingTools.c"
+#line 15384 "EditingTools.c"
 		PixelTransformer* _tmp1_;
 		GdkPixbuf* _tmp2_;
 		PixelTransformer* _tmp3_;
 		GdkPixbuf* _tmp4_;
 		GdkPixbuf* _tmp5_;
 		gboolean _tmp6_;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->draw_to_pixbuf;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_from_fp (_tmp1_, &self->priv->fp_pixel_cache, &self->priv->fp_pixel_cache_length1, _tmp2_);
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->histogram_transformer;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->virgin_histogram_pixbuf;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->histogram_pixbuf;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL);
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL, -1);
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->disable_histogram_refresh;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15809 "EditingTools.c"
+#line 15409 "EditingTools.c"
 			EditingToolsAdjustToolAdjustToolWindow* _tmp7_;
 			RGBHistogramManipulator* _tmp8_;
 			GdkPixbuf* _tmp9_;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _tmp7_->histogram_manipulator;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = self->priv->histogram_pixbuf;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15821 "EditingTools.c"
+#line 15421 "EditingTools.c"
 		}
 	}
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->draw_to_pixbuf;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15830 "EditingTools.c"
+#line 15430 "EditingTools.c"
 }
 
 
@@ -15844,71 +15444,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	GdkPixbuf* _tmp7_;
 	GdkPixbuf* _tmp8_;
 	GError * _inner_error_ = NULL;
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_init (&_vala_max_dim, 0, 0);
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = NULL;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (max_dim) {
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15868 "EditingTools.c"
+#line 15468 "EditingTools.c"
 		}
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15872 "EditingTools.c"
+#line 15472 "EditingTools.c"
 	}
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp3_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaling;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp7_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15894 "EditingTools.c"
+#line 15494 "EditingTools.c"
 	}
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = NULL;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp8_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15908 "EditingTools.c"
+#line 15508 "EditingTools.c"
 	}
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15912 "EditingTools.c"
+#line 15512 "EditingTools.c"
 }
 
 
@@ -15918,25 +15518,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
 	CommandManager* _tmp2_;
 	CommandManager* _tmp3_;
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_);
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp1_;
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 15940 "EditingTools.c"
+#line 15540 "EditingTools.c"
 }
 
 
@@ -15954,58 +15554,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 	Photo* _tmp10_;
 	Photo* _tmp11_;
 	Dimensions _tmp12_ = {0};
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = TRUE;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_editing_tool_get_tool_window (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->transformations;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->draw_to_pixbuf;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 16000 "EditingTools.c"
+#line 15600 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16009 "EditingTools.c"
+#line 15609 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		PixelTransformationBundle* _tmp0_;
@@ -16013,56 +15613,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		GeeIterable* _tmp2_;
 		GeeIterator* _tmp3_;
 		GeeIterator* _tmp4_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp1_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_transformation_it = _tmp4_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16033 "EditingTools.c"
+#line 15633 "EditingTools.c"
 			GeeIterator* _tmp5_;
 			gboolean _tmp6_;
 			PixelTransformation* transformation = NULL;
 			GeeIterator* _tmp7_;
 			gpointer _tmp8_;
 			PixelTransformation* _tmp9_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp6_) {
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16048 "EditingTools.c"
+#line 15648 "EditingTools.c"
 			}
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = transformation;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16062 "EditingTools.c"
+#line 15662 "EditingTools.c"
 		}
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16066 "EditingTools.c"
+#line 15666 "EditingTools.c"
 	}
 }
 
@@ -16080,57 +15680,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	PixelTransformationType _tmp8_;
 	PixelTransformationBundle* _tmp12_;
 	PixelTransformation* _tmp13_;
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->transformer;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_transformation;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = new_transformation;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = new_transformation;
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16112 "EditingTools.c"
+#line 15712 "EditingTools.c"
 		PixelTransformer* _tmp9_;
 		PixelTransformation* _tmp10_;
 		PixelTransformation* _tmp11_;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = old_transformation;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = new_transformation;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16124 "EditingTools.c"
+#line 15724 "EditingTools.c"
 	}
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = new_transformation;
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16134 "EditingTools.c"
+#line 15734 "EditingTools.c"
 }
 
 
@@ -16146,77 +15746,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
 	CommandManager* _tmp7_;
 	CommandManager* _tmp8_;
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (name != NULL);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_transformation;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = name;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp6_;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16186 "EditingTools.c"
+#line 15786 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16193 "EditingTools.c"
+#line 15793 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16206 "EditingTools.c"
+#line 15806 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16214 "EditingTools.c"
+#line 15814 "EditingTools.c"
 	}
-#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
-#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16220 "EditingTools.c"
+#line 15820 "EditingTools.c"
 }
 
 
@@ -16226,57 +15826,57 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	TemperatureTransformation* _tmp3_;
-#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->temperature_slider;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature"));
-#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16246 "EditingTools.c"
+#line 15846 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16253 "EditingTools.c"
+#line 15853 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16266 "EditingTools.c"
+#line 15866 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16274 "EditingTools.c"
+#line 15874 "EditingTools.c"
 	}
-#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
-#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16280 "EditingTools.c"
+#line 15880 "EditingTools.c"
 }
 
 
@@ -16286,57 +15886,57 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	TintTransformation* _tmp3_;
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->tint_slider;
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint"));
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16306 "EditingTools.c"
+#line 15906 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16313 "EditingTools.c"
+#line 15913 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->contrast_scheduler;
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16326 "EditingTools.c"
+#line 15926 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 16334 "EditingTools.c"
+#line 15934 "EditingTools.c"
 	}
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16340 "EditingTools.c"
+#line 15940 "EditingTools.c"
 }
 
 
@@ -16346,57 +15946,57 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	ContrastTransformation* _tmp3_;
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->contrast_slider;
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast"));
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16366 "EditingTools.c"
+#line 15966 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16373 "EditingTools.c"
+#line 15973 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
-#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16386 "EditingTools.c"
+#line 15986 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16394 "EditingTools.c"
+#line 15994 "EditingTools.c"
 	}
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16400 "EditingTools.c"
+#line 16000 "EditingTools.c"
 }
 
 
@@ -16406,57 +16006,57 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	SaturationTransformation* _tmp3_;
-#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->saturation_slider;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation"));
-#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16426 "EditingTools.c"
+#line 16026 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16433 "EditingTools.c"
+#line 16033 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
-#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16446 "EditingTools.c"
+#line 16046 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16454 "EditingTools.c"
+#line 16054 "EditingTools.c"
 	}
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16460 "EditingTools.c"
+#line 16060 "EditingTools.c"
 }
 
 
@@ -16466,57 +16066,57 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	ExposureTransformation* _tmp3_;
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->exposure_slider;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure"));
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16486 "EditingTools.c"
+#line 16086 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16493 "EditingTools.c"
+#line 16093 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
-#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16506 "EditingTools.c"
+#line 16106 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16514 "EditingTools.c"
+#line 16114 "EditingTools.c"
 	}
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16520 "EditingTools.c"
+#line 16120 "EditingTools.c"
 }
 
 
@@ -16526,57 +16126,57 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	ShadowDetailTransformation* _tmp3_;
-#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->shadows_slider;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows"));
-#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16546 "EditingTools.c"
+#line 16146 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16553 "EditingTools.c"
+#line 16153 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
-#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16566 "EditingTools.c"
+#line 16166 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16574 "EditingTools.c"
+#line 16174 "EditingTools.c"
 	}
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16580 "EditingTools.c"
+#line 16180 "EditingTools.c"
 }
 
 
@@ -16586,23 +16186,23 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 	GtkScale* _tmp1_;
 	gdouble _tmp2_;
 	HighlightDetailTransformation* _tmp3_;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->highlights_slider;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights"));
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16606 "EditingTools.c"
+#line 16206 "EditingTools.c"
 }
 
 
@@ -16617,33 +16217,33 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 	gint _tmp5_;
 	ExpansionTransformation* new_exp_trans = NULL;
 	ExpansionTransformation* _tmp6_;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->histogram_manipulator;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_black_point = _tmp2_;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->histogram_manipulator;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_white_point = _tmp5_;
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion"));
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16647 "EditingTools.c"
+#line 16247 "EditingTools.c"
 }
 
 
@@ -16655,33 +16255,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	EditingToolsPhotoCanvas* _tmp4_;
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_;
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp3_;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16685 "EditingTools.c"
+#line 16285 "EditingTools.c"
 }
 
 
@@ -16694,199 +16294,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	gboolean _tmp3_ = FALSE;
 	GdkEventButton* _tmp4_;
 	guint _tmp5_;
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = widget;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source = _tmp1_;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->button;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16716 "EditingTools.c"
+#line 16316 "EditingTools.c"
 		GdkEventButton* _tmp6_;
 		GdkEventType _tmp7_;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16725 "EditingTools.c"
+#line 16325 "EditingTools.c"
 	} else {
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16729 "EditingTools.c"
+#line 16329 "EditingTools.c"
 	}
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16733 "EditingTools.c"
+#line 16333 "EditingTools.c"
 		GdkEventButton* _tmp8_;
 		GdkModifierType _tmp9_;
 		gboolean _tmp10_;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->state;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16745 "EditingTools.c"
+#line 16345 "EditingTools.c"
 	} else {
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16749 "EditingTools.c"
+#line 16349 "EditingTools.c"
 	}
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16753 "EditingTools.c"
+#line 16353 "EditingTools.c"
 		GtkScale* _tmp11_;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (source);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16765 "EditingTools.c"
+#line 16365 "EditingTools.c"
 	}
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (source);
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16773 "EditingTools.c"
+#line 16373 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16780 "EditingTools.c"
+#line 16380 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16794 "EditingTools.c"
+#line 16394 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
 	guint _tmp1_;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16811 "EditingTools.c"
+#line 16411 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16818 "EditingTools.c"
+#line 16418 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16825 "EditingTools.c"
+#line 16425 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16832 "EditingTools.c"
+#line 16432 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16839 "EditingTools.c"
+#line 16439 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16846 "EditingTools.c"
+#line 16446 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16853 "EditingTools.c"
+#line 16453 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16860 "EditingTools.c"
+#line 16460 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16867 "EditingTools.c"
+#line 16467 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16874 "EditingTools.c"
+#line 16474 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16881 "EditingTools.c"
+#line 16481 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16890 "EditingTools.c"
+#line 16490 "EditingTools.c"
 }
 
 
@@ -16927,117 +16527,117 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	GtkScale* _tmp33_;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp34_;
 	GtkScale* _tmp35_;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->adjust_tool_window;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->reset_button;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->adjust_tool_window;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->cancel_button;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp5_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->exposure_slider;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->adjust_tool_window;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->contrast_slider;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->saturation_slider;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->tint_slider;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->adjust_tool_window;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->temperature_slider;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->adjust_tool_window;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->shadows_slider;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->highlights_slider;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->adjust_tool_window;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->histogram_manipulator;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp21_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->adjust_tool_window;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->saturation_slider;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->exposure_slider;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->adjust_tool_window;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_->contrast_slider;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->adjust_tool_window;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_->tint_slider;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->temperature_slider;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->adjust_tool_window;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_->shadows_slider;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->priv->adjust_tool_window;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_->highlights_slider;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17041 "EditingTools.c"
+#line 16641 "EditingTools.c"
 }
 
 
@@ -17096,153 +16696,153 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	EditingToolsAdjustToolAdjustToolWindow* _tmp51_;
 	GtkScale* _tmp52_;
 	guint _tmp53_;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->reset_button;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->cancel_button;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->adjust_tool_window;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->exposure_slider;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE);
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->contrast_slider;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->adjust_tool_window;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->saturation_slider;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->tint_slider;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE);
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->adjust_tool_window;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->temperature_slider;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->shadows_slider;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->adjust_tool_window;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->highlights_slider;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->histogram_manipulator;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->saturation_slider;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp35_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->priv->adjust_tool_window;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_->exposure_slider;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->adjust_tool_window;
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->contrast_slider;
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE);
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->adjust_tool_window;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _tmp42_->tint_slider;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->adjust_tool_window;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->temperature_slider;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE);
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp47_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = self->priv->adjust_tool_window;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _tmp48_->shadows_slider;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp50_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = self->priv->adjust_tool_window;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = _tmp51_->highlights_slider;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17246 "EditingTools.c"
+#line 16846 "EditingTools.c"
 }
 
 
@@ -17256,37 +16856,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_;
 	CommandManager* _tmp5_;
 	CommandManager* _tmp6_;
-#line 2883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp4_;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = app_window_get_command_manager ();
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp6_);
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17290 "EditingTools.c"
+#line 16890 "EditingTools.c"
 }
 
 
@@ -17304,68 +16904,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	PixelTransformationBundle* _tmp9_;
 	PixelTransformationBundle* _tmp10_;
 	PixelTransformationBundle* _tmp11_;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17330 "EditingTools.c"
+#line 16930 "EditingTools.c"
 	}
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_get_color_adjustments (_tmp8_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	adjustments = _tmp10_;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = adjustments;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17352 "EditingTools.c"
+#line 16952 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
 	PixelTransformationBundle* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp11_;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_adjustments;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17369 "EditingTools.c"
+#line 16969 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		PixelTransformationBundle* _tmp1_;
@@ -17373,106 +16973,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		GeeIterable* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = gee_iterable_iterator (_tmp3_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_adjustment_it = _tmp5_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17393 "EditingTools.c"
+#line 16993 "EditingTools.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			PixelTransformation* adjustment = NULL;
 			GeeIterator* _tmp8_;
 			gpointer _tmp9_;
 			PixelTransformation* _tmp10_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp7_) {
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17408 "EditingTools.c"
+#line 17008 "EditingTools.c"
 			}
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adjustment = (PixelTransformation*) _tmp9_;
-#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = adjustment;
-#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17422 "EditingTools.c"
+#line 17022 "EditingTools.c"
 		}
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17426 "EditingTools.c"
+#line 17026 "EditingTools.c"
 	}
-#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17434 "EditingTools.c"
+#line 17034 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17441 "EditingTools.c"
+#line 17041 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
 	PixelTransformation* _tmp0_;
 	PixelTransformationType _tmp1_;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = transformation;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp1_) {
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17460 "EditingTools.c"
+#line 17060 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
 			PixelTransformation* _tmp2_;
 			ExpansionTransformation* _tmp3_;
 			gboolean _tmp4_;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			expansion = _tmp3_;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = self->priv->disable_histogram_refresh;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17476 "EditingTools.c"
+#line 17076 "EditingTools.c"
 				EditingToolsAdjustToolAdjustToolWindow* _tmp5_;
 				RGBHistogramManipulator* _tmp6_;
 				ExpansionTransformation* _tmp7_;
@@ -17481,199 +17081,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				RGBHistogramManipulator* _tmp10_;
 				ExpansionTransformation* _tmp11_;
 				gint _tmp12_;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = expansion;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = self->priv->adjust_tool_window;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = _tmp9_->histogram_manipulator;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = expansion;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17505 "EditingTools.c"
+#line 17105 "EditingTools.c"
 			}
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17511 "EditingTools.c"
+#line 17111 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17515 "EditingTools.c"
+#line 17115 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
 			GtkScale* _tmp14_;
 			PixelTransformation* _tmp15_;
 			gfloat _tmp16_;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = _tmp13_->shadows_slider;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = transformation;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
-#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17533 "EditingTools.c"
+#line 17133 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17537 "EditingTools.c"
+#line 17137 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
 			GtkScale* _tmp18_;
 			PixelTransformation* _tmp19_;
 			gfloat _tmp20_;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _tmp17_->contrast_slider;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = transformation;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17555 "EditingTools.c"
+#line 17155 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17559 "EditingTools.c"
+#line 17159 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
 			GtkScale* _tmp22_;
 			PixelTransformation* _tmp23_;
 			gfloat _tmp24_;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = _tmp21_->highlights_slider;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = transformation;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
-#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17577 "EditingTools.c"
+#line 17177 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17581 "EditingTools.c"
+#line 17181 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
 			GtkScale* _tmp26_;
 			PixelTransformation* _tmp27_;
 			gfloat _tmp28_;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp26_ = _tmp25_->exposure_slider;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp27_ = transformation;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17599 "EditingTools.c"
+#line 17199 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17603 "EditingTools.c"
+#line 17203 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp29_;
 			GtkScale* _tmp30_;
 			PixelTransformation* _tmp31_;
 			gfloat _tmp32_;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp30_ = _tmp29_->saturation_slider;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp31_ = transformation;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17621 "EditingTools.c"
+#line 17221 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17625 "EditingTools.c"
+#line 17225 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
 			GtkScale* _tmp34_;
 			PixelTransformation* _tmp35_;
 			gfloat _tmp36_;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = _tmp33_->tint_slider;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = transformation;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17643 "EditingTools.c"
+#line 17243 "EditingTools.c"
 		}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17647 "EditingTools.c"
+#line 17247 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp37_;
 			GtkScale* _tmp38_;
 			PixelTransformation* _tmp39_;
 			gfloat _tmp40_;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = self->priv->adjust_tool_window;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = _tmp37_->temperature_slider;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = transformation;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
-#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17665 "EditingTools.c"
+#line 17265 "EditingTools.c"
 		}
 		default:
 		{
 			PixelTransformation* _tmp41_;
 			PixelTransformationType _tmp42_;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = transformation;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			g_error ("EditingTools.vala:2961: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17677 "EditingTools.c"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) _tmp42_);
+#line 17277 "EditingTools.c"
 		}
 	}
 }
@@ -17701,76 +17301,73 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	gint _tmp11_;
 	gfloat* _tmp12_;
 	gint cache_pixel_index = 0;
-	gfloat INV_255 = 0.0F;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = source;
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_width = _tmp1_;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = source;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_height = _tmp3_;
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = source;
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_num_channels = _tmp5_;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = source;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_rowstride = _tmp7_;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = source;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels = _tmp9_;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels_length1 = -1;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_source_pixels_size_ = source_pixels_length1;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = source_width;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = source_height;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = _tmp12_;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cache_pixel_index = 0;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	INV_255 = 1.0f / 255.0f;
-#line 17762 "EditingTools.c"
+#line 17359 "EditingTools.c"
 	{
 		gint j = 0;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17767 "EditingTools.c"
+#line 17364 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17774 "EditingTools.c"
+#line 17371 "EditingTools.c"
 				gint _tmp15_;
 				gint _tmp16_;
 				gint row_start_index = 0;
@@ -17780,58 +17377,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				gint _tmp19_;
 				gint _tmp20_;
 				gint _tmp21_;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17786 "EditingTools.c"
+#line 17383 "EditingTools.c"
 					gint _tmp14_;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17792 "EditingTools.c"
+#line 17389 "EditingTools.c"
 				}
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp15_ = j;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp16_ = source_height;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17804 "EditingTools.c"
+#line 17401 "EditingTools.c"
 				}
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp18_ = source_rowstride;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_start_index = _tmp17_ * _tmp18_;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = row_start_index;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp20_ = source_width;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp21_ = source_num_channels;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17820 "EditingTools.c"
+#line 17417 "EditingTools.c"
 				{
 					gint i = 0;
 					gint _tmp22_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17828 "EditingTools.c"
+#line 17425 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17835 "EditingTools.c"
+#line 17432 "EditingTools.c"
 							gint _tmp26_;
 							gint _tmp27_;
 							gfloat* _tmp28_;
@@ -17861,98 +17458,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							guchar _tmp46_;
 							gfloat _tmp47_;
 							gfloat _tmp48_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17867 "EditingTools.c"
+#line 17464 "EditingTools.c"
 								gint _tmp24_;
 								gint _tmp25_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17876 "EditingTools.c"
+#line 17473 "EditingTools.c"
 							}
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp26_ = i;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp27_ = row_end_index;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!(_tmp26_ < _tmp27_)) {
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 17888 "EditingTools.c"
+#line 17485 "EditingTools.c"
 							}
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28__length1 = self->priv->fp_pixel_cache_length1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp29_ = cache_pixel_index;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp29_ + 1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30_ = source_pixels;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30__length1 = source_pixels_length1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp31_ = i;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp32_ = _tmp30_[_tmp31_];
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp33_ = INV_255;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp33_ = rgb_lookup_table[_tmp32_];
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp28_[_tmp29_] = _tmp33_;
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp34_ = _tmp28_[_tmp29_];
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_ = self->priv->fp_pixel_cache;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35__length1 = self->priv->fp_pixel_cache_length1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp36_ = cache_pixel_index;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp36_ + 1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37_ = source_pixels;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37__length1 = source_pixels_length1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp38_ = i;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp40_ = INV_255;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp40_ = rgb_lookup_table[_tmp39_];
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp35_[_tmp36_] = _tmp40_;
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp41_ = _tmp35_[_tmp36_];
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_ = self->priv->fp_pixel_cache;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42__length1 = self->priv->fp_pixel_cache_length1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp43_ = cache_pixel_index;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp43_ + 1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44_ = source_pixels;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44__length1 = source_pixels_length1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp45_ = i;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp46_ = _tmp44_[_tmp45_ + 2];
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp47_ = INV_255;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp47_ = rgb_lookup_table[_tmp46_];
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+							_tmp42_[_tmp43_] = _tmp47_;
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 17956 "EditingTools.c"
+#line 17553 "EditingTools.c"
 						}
 					}
 				}
@@ -17972,73 +17569,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_;
 	GdkEventKey* _tmp11_;
 	gboolean _tmp12_;
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 17990 "EditingTools.c"
+#line 17587 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_;
 		guint _tmp6_;
 		const gchar* _tmp7_;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18003 "EditingTools.c"
+#line 17600 "EditingTools.c"
 	}
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 18009 "EditingTools.c"
+#line 17606 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_;
 		guint _tmp9_;
 		const gchar* _tmp10_;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18022 "EditingTools.c"
+#line 17619 "EditingTools.c"
 	}
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_on_ok (self);
-#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18032 "EditingTools.c"
+#line 17629 "EditingTools.c"
 	}
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18042 "EditingTools.c"
+#line 17639 "EditingTools.c"
 }
 
 
@@ -18088,328 +17685,333 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	GtkScale* _tmp33_;
 	GtkScale* _tmp34_;
 	GtkScale* _tmp35_;
+	GtkScale* _tmp36_;
 	GtkBox* button_layouter = NULL;
-	GtkBox* _tmp36_;
-	GtkButton* _tmp37_;
+	GtkBox* _tmp37_;
 	GtkButton* _tmp38_;
 	GtkButton* _tmp39_;
-	RGBHistogramManipulator* _tmp40_;
+	GtkButton* _tmp40_;
 	RGBHistogramManipulator* _tmp41_;
 	RGBHistogramManipulator* _tmp42_;
 	RGBHistogramManipulator* _tmp43_;
+	RGBHistogramManipulator* _tmp44_;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp44_;
-	RGBHistogramManipulator* _tmp45_;
+	GtkBox* _tmp45_;
 	RGBHistogramManipulator* _tmp46_;
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	RGBHistogramManipulator* _tmp47_;
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkGrid*) gtk_grid_new ();
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_organizer = _tmp1_;
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_row_spacing (slider_organizer, (guint) 12);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_spacing (slider_organizer, (guint) 12);
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_label = _tmp2_;
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->exposure_slider;
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->exposure_slider;
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->exposure_slider;
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp5_, FALSE);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp5_, GTK_POS_RIGHT);
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->exposure_slider;
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_label = _tmp7_;
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->contrast_slider;
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->contrast_slider;
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->contrast_slider;
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp10_, FALSE);
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp10_, GTK_POS_RIGHT);
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->contrast_slider;
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp12_);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	saturation_label = _tmp12_;
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->saturation_slider;
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->saturation_slider;
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->saturation_slider;
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp15_, FALSE);
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp15_, GTK_POS_RIGHT);
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->saturation_slider;
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp17_);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_label = _tmp17_;
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->tint_slider;
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->tint_slider;
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->tint_slider;
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp20_, FALSE);
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp20_, GTK_POS_RIGHT);
+#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->tint_slider;
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp22_);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temperature_label = _tmp22_;
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->temperature_slider;
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->temperature_slider;
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->temperature_slider;
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp25_, FALSE);
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp25_, GTK_POS_RIGHT);
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->temperature_slider;
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp27_);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_label = _tmp27_;
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->shadows_slider;
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->shadows_slider;
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->shadows_slider;
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp30_, FALSE);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp30_, GTK_POS_RIGHT);
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->shadows_slider;
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 5);
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp32_);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_label = _tmp32_;
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->highlights_slider;
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->highlights_slider;
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->highlights_slider;
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp35_, FALSE);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp36_);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	button_layouter = _tmp36_;
-#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_value_pos (_tmp35_, GTK_POS_RIGHT);
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp36_ = self->highlights_slider;
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp37_);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	button_layouter = _tmp37_;
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = self->cancel_button;
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = self->reset_button;
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp38_ = self->cancel_button;
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = self->ok_button;
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp39_ = self->reset_button;
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->histogram_manipulator;
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp40_ = self->ok_button;
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->histogram_manipulator;
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->histogram_manipulator;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = self->histogram_manipulator;
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp44_);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp44_;
-#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = self->histogram_manipulator;
-#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp44_ = self->histogram_manipulator;
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), 8);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp45_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp45_);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	pane_layouter = _tmp45_;
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp46_ = self->histogram_manipulator;
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
-#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = self->histogram_manipulator;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp47_ = self->histogram_manipulator;
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START);
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (pane_layouter);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (button_layouter);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (highlights_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (shadows_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (temperature_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (tint_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (saturation_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (contrast_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (exposure_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_organizer);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18397 "EditingTools.c"
+#line 17999 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18404 "EditingTools.c"
+#line 18006 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) {
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18413 "EditingTools.c"
+#line 18015 "EditingTools.c"
 }
 
 
@@ -18425,105 +18027,105 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 	GtkButton* _tmp8_;
 	GtkButton* _tmp9_;
 	RGBHistogramManipulator* _tmp10_;
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->exposure_slider = _tmp0_;
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->contrast_slider = _tmp1_;
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->saturation_slider = _tmp2_;
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->tint_slider = _tmp3_;
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->temperature_slider = _tmp4_;
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->shadows_slider = _tmp5_;
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->highlights_slider = _tmp6_;
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp7_;
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset"));
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->reset_button = _tmp8_;
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp9_;
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = rgb_histogram_manipulator_new ();
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp10_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->histogram_manipulator = _tmp10_;
-#line 18495 "EditingTools.c"
+#line 18097 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolWindow * self;
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->exposure_slider);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->contrast_slider);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->saturation_slider);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->tint_slider);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->temperature_slider);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->shadows_slider);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->highlights_slider);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->reset_button);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->histogram_manipulator);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18527 "EditingTools.c"
+#line 18129 "EditingTools.c"
 }
 
 
@@ -18540,9 +18142,9 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 
 
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18546 "EditingTools.c"
+#line 18148 "EditingTools.c"
 }
 
 
@@ -18552,55 +18154,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	const gchar* _tmp1_;
 	EditingToolsAdjustTool* _tmp2_;
 	EditingToolsAdjustTool* _tmp3_;
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (explanation != NULL, NULL);
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = explanation;
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = owner;
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->owner = _tmp2_;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = owner;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18578 "EditingTools.c"
+#line 18180 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
-#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_reset (_tmp1_);
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18595 "EditingTools.c"
+#line 18197 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18604 "EditingTools.c"
+#line 18206 "EditingTools.c"
 }
 
 
@@ -18611,26 +18213,26 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18621 "EditingTools.c"
+#line 18223 "EditingTools.c"
 		EditingToolsAdjustTool* _tmp1_;
 		guint _tmp2_;
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18630 "EditingTools.c"
+#line 18232 "EditingTools.c"
 	}
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18634 "EditingTools.c"
+#line 18236 "EditingTools.c"
 }
 
 
@@ -18653,42 +18255,42 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 	PixelTransformationBundle* _tmp2_;
 	PixelTransformationBundle* _tmp3_;
 	PixelTransformationBundle* _tmp4_;
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = current;
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_bundle_copy (_tmp1_);
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp2_;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_new ();
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reset = _tmp3_;
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->reset;
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set_to_identity (_tmp4_);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18685 "EditingTools.c"
+#line 18287 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18692 "EditingTools.c"
+#line 18294 "EditingTools.c"
 }
 
 
@@ -18696,15 +18298,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->reset;
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18708 "EditingTools.c"
+#line 18310 "EditingTools.c"
 }
 
 
@@ -18712,15 +18314,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18724 "EditingTools.c"
+#line 18326 "EditingTools.c"
 }
 
 
@@ -18734,89 +18336,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand* _tmp3_;
 	EditingToolsAdjustTool* _tmp4_;
 	EditingToolsAdjustTool* _tmp5_;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	reset_command = _tmp1_;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = reset_command;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18758 "EditingTools.c"
+#line 18360 "EditingTools.c"
 	}
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18774 "EditingTools.c"
+#line 18376 "EditingTools.c"
 	}
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (reset_command);
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18782 "EditingTools.c"
+#line 18384 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18799 "EditingTools.c"
+#line 18401 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18806 "EditingTools.c"
+#line 18408 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18820 "EditingTools.c"
+#line 18422 "EditingTools.c"
 }
 
 
@@ -18846,62 +18448,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	PixelTransformation* _tmp9_;
 	PixelTransformationType _tmp10_;
 	PixelTransformationType _tmp11_;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = name;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = name;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = old_transformation;
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_transformation = _tmp4_;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = new_transformation;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp6_;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = old_transformation;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformation_type = _tmp8_;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = new_transformation;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformation_type;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18898 "EditingTools.c"
+#line 18500 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 18905 "EditingTools.c"
+#line 18507 "EditingTools.c"
 }
 
 
@@ -18911,21 +18513,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	PixelTransformation* _tmp1_;
 	EditingToolsAdjustTool* _tmp2_;
 	EditingToolsPhotoCanvas* _tmp3_;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 18929 "EditingTools.c"
+#line 18531 "EditingTools.c"
 }
 
 
@@ -18939,35 +18541,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	EditingToolsAdjustTool* _tmp5_;
 	EditingToolsAdjustTool* _tmp6_;
 	EditingToolsPhotoCanvas* _tmp7_;
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->old_transformation;
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->old_transformation;
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18971 "EditingTools.c"
+#line 18573 "EditingTools.c"
 }
 
 
@@ -18981,35 +18583,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	EditingToolsAdjustTool* _tmp5_;
 	EditingToolsAdjustTool* _tmp6_;
 	EditingToolsPhotoCanvas* _tmp7_;
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->new_transformation;
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19013 "EditingTools.c"
+#line 18615 "EditingTools.c"
 }
 
 
@@ -19030,121 +18632,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_;
 	PixelTransformation* _tmp11_;
 	PixelTransformation* _tmp12_;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_adjustment = _tmp1_;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = slider_adjustment;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19054 "EditingTools.c"
+#line 18656 "EditingTools.c"
 	}
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19070 "EditingTools.c"
+#line 18672 "EditingTools.c"
 	}
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->priv->transformation_type;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformation_type;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ != _tmp8_) {
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19086 "EditingTools.c"
+#line 18688 "EditingTools.c"
 	}
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = slider_adjustment;
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->priv->new_transformation;
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp12_;
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_adjustment);
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19108 "EditingTools.c"
+#line 18710 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->redo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 19127 "EditingTools.c"
+#line 18729 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19134 "EditingTools.c"
+#line 18736 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19148 "EditingTools.c"
+#line 18750 "EditingTools.c"
 }
 
 
@@ -19167,40 +18769,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	Photo* _tmp2_;
 	Photo* _tmp3_;
 	PixelTransformationBundle* _tmp4_;
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo;
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp2_;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo_get_color_adjustments (_tmp3_);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19197 "EditingTools.c"
+#line 18799 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19204 "EditingTools.c"
+#line 18806 "EditingTools.c"
 }
 
 
@@ -19209,32 +18811,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	PixelTransformationBundle* _tmp0_;
 	EditingToolsAdjustTool* _tmp3_;
 	PixelTransformationBundle* _tmp4_;
-#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
-#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19219 "EditingTools.c"
+#line 18821 "EditingTools.c"
 		Photo* _tmp1_;
 		PixelTransformationBundle* _tmp2_;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = photo_get_enhance_transformations (_tmp1_);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19230 "EditingTools.c"
+#line 18832 "EditingTools.c"
 	}
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->enhanced;
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19238 "EditingTools.c"
+#line 18840 "EditingTools.c"
 }
 
 
@@ -19242,15 +18844,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19254 "EditingTools.c"
+#line 18856 "EditingTools.c"
 }
 
 
@@ -19268,21 +18870,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_;
 	EditingToolsAdjustTool* _tmp16_;
 	EditingToolsAdjustTool* _tmp17_;
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_single = _tmp1_;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = enhance_single;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19286 "EditingTools.c"
+#line 18888 "EditingTools.c"
 		Photo* photo = NULL;
 		EnhanceSingleCommand* _tmp3_;
 		DataSource* _tmp4_;
@@ -19293,127 +18895,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		Photo* _tmp9_;
 		gboolean _tmp10_;
 		gboolean _tmp11_;
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = photo;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp11_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19327 "EditingTools.c"
+#line 18929 "EditingTools.c"
 	}
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_command = _tmp13_;
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = enhance_command;
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ == NULL) {
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19347 "EditingTools.c"
+#line 18949 "EditingTools.c"
 	}
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19365 "EditingTools.c"
+#line 18967 "EditingTools.c"
 	}
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_command);
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_single);
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19375 "EditingTools.c"
+#line 18977 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19392 "EditingTools.c"
+#line 18994 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19401 "EditingTools.c"
+#line 19003 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19417 "EditingTools.c"
+#line 19019 "EditingTools.c"
 }
 
 
@@ -19430,110 +19032,110 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
 
 
 static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) {
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_adjust_tool_finalize;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_get_tool_window;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_deactivate;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_adjust_tool_real_paint;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
-#line 19452 "EditingTools.c"
+#line 19054 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = FALSE;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_pixbuf = NULL;
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = NULL;
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->disable_histogram_refresh = FALSE;
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->temperature_scheduler = NULL;
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tint_scheduler = NULL;
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->contrast_scheduler = NULL;
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->saturation_scheduler = NULL;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->exposure_scheduler = NULL;
-#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->shadows_scheduler = NULL;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19497 "EditingTools.c"
+#line 19099 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
 	EditingToolsAdjustTool * self;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19537 "EditingTools.c"
+#line 19139 "EditingTools.c"
 }
 
 
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index d160f23..ee08f84 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -265,29 +265,7 @@ public abstract class PhotoCanvas {
         default_ctx.fill();
 
         // paint the actual image
-        Gdk.cairo_set_source_pixbuf(default_ctx, pixbuf, scaled_position.x, scaled_position.y);
-        default_ctx.rectangle(scaled_position.x, scaled_position.y,
-            pixbuf.get_width(), pixbuf.get_height());
-        default_ctx.fill();
-        default_ctx.restore();
-    }
-
-    public void paint_pixbuf_area(Gdk.Pixbuf pixbuf, Box source_area) {
-        default_ctx.save();
-        if (pixbuf.get_has_alpha()) {
-            set_source_color_from_string(default_ctx, "#000");
-            default_ctx.rectangle(scaled_position.x + source_area.left,
-                scaled_position.y + source_area.top,
-                source_area.get_width(), source_area.get_height());
-            default_ctx.fill();
-
-        }
-        Gdk.cairo_set_source_pixbuf(default_ctx, pixbuf, scaled_position.x,
-            scaled_position.y);
-        default_ctx.rectangle(scaled_position.x + source_area.left,
-            scaled_position.y + source_area.top,
-            source_area.get_width(), source_area.get_height());
-        default_ctx.fill();
+        paint_pixmap_with_background(default_ctx, pixbuf, scaled_position.x, scaled_position.y);
         default_ctx.restore();
     }
 
@@ -460,7 +438,7 @@ public abstract class PhotoCanvas {
         Cairo.Surface surface = new Cairo.Surface.similar(default_ctx.get_target(),
             Cairo.Content.COLOR_ALPHA, pos.width, pos.height);
         Cairo.Context ctx = new Cairo.Context(surface);
-        Gdk.cairo_set_source_pixbuf(ctx, pixbuf, 0, 0);
+        paint_pixmap_with_background(ctx, pixbuf, 0, 0);
         ctx.paint();
         return surface;
     }
@@ -2207,7 +2185,7 @@ public class RedeyeTool : EditingTool {
 }
 
 public class AdjustTool : EditingTool {
-    private const int SLIDER_WIDTH = 160;
+    private const int SLIDER_WIDTH = 200;
     private const uint SLIDER_DELAY_MSEC = 100;
 
     private class AdjustToolWindow : EditingToolWindow {
@@ -2255,7 +2233,7 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(exposure_label, 0, 0, 1, 1);
             slider_organizer.attach(exposure_slider, 1, 0, 1, 1);
             exposure_slider.set_size_request(SLIDER_WIDTH, -1);
-            exposure_slider.set_draw_value(false);
+            exposure_slider.set_value_pos(Gtk.PositionType.RIGHT);
             exposure_slider.set_margin_end(0);
 
             Gtk.Label contrast_label = new Gtk.Label.with_mnemonic(_("Contrast:"));
@@ -2264,7 +2242,7 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(contrast_label, 0, 1, 1, 1);
             slider_organizer.attach(contrast_slider, 1, 1, 1, 1);
             contrast_slider.set_size_request(SLIDER_WIDTH, -1);
-            contrast_slider.set_draw_value(false);
+            contrast_slider.set_value_pos(Gtk.PositionType.RIGHT);
             contrast_slider.set_margin_end(0);
 
             Gtk.Label saturation_label = new Gtk.Label.with_mnemonic(_("Saturation:"));
@@ -2273,7 +2251,7 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(saturation_label, 0, 2, 1, 1);
             slider_organizer.attach(saturation_slider, 1, 2, 1, 1);
             saturation_slider.set_size_request(SLIDER_WIDTH, -1);
-            saturation_slider.set_draw_value(false);
+            saturation_slider.set_value_pos(Gtk.PositionType.RIGHT);
             saturation_slider.set_margin_end(0);
 
             Gtk.Label tint_label = new Gtk.Label.with_mnemonic(_("Tint:"));
@@ -2282,7 +2260,7 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(tint_label, 0, 3, 1, 1);
             slider_organizer.attach(tint_slider, 1, 3, 1, 1);
             tint_slider.set_size_request(SLIDER_WIDTH, -1);
-            tint_slider.set_draw_value(false);
+            tint_slider.set_value_pos(Gtk.PositionType.RIGHT);
             tint_slider.set_margin_end(0);
 
             Gtk.Label temperature_label =
@@ -2292,7 +2270,7 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(temperature_label, 0, 4, 1, 1);
             slider_organizer.attach(temperature_slider, 1, 4, 1, 1);
             temperature_slider.set_size_request(SLIDER_WIDTH, -1);
-            temperature_slider.set_draw_value(false);
+            temperature_slider.set_value_pos(Gtk.PositionType.RIGHT);
             temperature_slider.set_margin_end(0);
 
             Gtk.Label shadows_label = new Gtk.Label.with_mnemonic(_("Shadows:"));
@@ -2301,8 +2279,10 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(shadows_label, 0, 5, 1, 1);
             slider_organizer.attach(shadows_slider, 1, 5, 1, 1);
             shadows_slider.set_size_request(SLIDER_WIDTH, -1);
-            shadows_slider.set_draw_value(false);
-            shadows_slider.set_margin_end(0);
+            shadows_slider.set_value_pos(Gtk.PositionType.RIGHT);
+            // FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+            // Differently (probably because it only has positive values)
+            shadows_slider.set_margin_end(5);
 
             Gtk.Label highlights_label = new Gtk.Label.with_mnemonic(_("Highlights:"));
             highlights_label.halign = Gtk.Align.START;
@@ -2310,7 +2290,8 @@ public class AdjustTool : EditingTool {
             slider_organizer.attach(highlights_label, 0, 6, 1, 1);
             slider_organizer.attach(highlights_slider, 1, 6, 1, 1);
             highlights_slider.set_size_request(SLIDER_WIDTH, -1);
-            highlights_slider.set_draw_value(false);
+            highlights_slider.set_value_pos(Gtk.PositionType.RIGHT);
+            highlights_slider.set_margin_end(0);
 
             Gtk.Box button_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
             button_layouter.set_homogeneous(true);
@@ -2327,7 +2308,7 @@ public class AdjustTool : EditingTool {
             pane_layouter.add(histogram_manipulator);
             pane_layouter.add(slider_organizer);
             pane_layouter.add(button_layouter);
-            pane_layouter.set_child_packing(histogram_manipulator, true, true, 0, Gtk.PackType.START);
+            pane_layouter.set_child_packing(histogram_manipulator, false, true, 0, Gtk.PackType.START);
 
             add(pane_layouter);
         }
@@ -2971,15 +2952,14 @@ public class AdjustTool : EditingTool {
 
         fp_pixel_cache = new float[3 * source_width * source_height];
         int cache_pixel_index = 0;
-        float INV_255 = 1.0f / 255.0f;
 
         for (int j = 0; j < source_height; j++) {
             int row_start_index = j * source_rowstride;
             int row_end_index = row_start_index + (source_width * source_num_channels);
             for (int i = row_start_index; i < row_end_index; i += source_num_channels) {
-                fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i]) * INV_255;
-                fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i + 1]) * INV_255;
-                fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i + 2]) * INV_255;
+                fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i]];
+                fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i + 1]];
+                fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i + 2]];
             }
         }
     }
diff --git a/src/editing_tools/RGBHistogramManipulator.c b/src/editing_tools/RGBHistogramManipulator.c
new file mode 100644
index 0000000..ffbf0b8
--- /dev/null
+++ b/src/editing_tools/RGBHistogramManipulator.c
@@ -0,0 +1,1596 @@
+/* RGBHistogramManipulator.c generated by valac 0.36.6, the Vala compiler
+ * generated from RGBHistogramManipulator.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include "shotwell-graphics-processor.h"
+#include <gdk/gdk.h>
+#include <cairo.h>
+#include <string.h>
+#include <float.h>
+#include <math.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+
+#define TYPE_RGB_HISTOGRAM_MANIPULATOR (rgb_histogram_manipulator_get_type ())
+#define RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator))
+#define RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
+#define IS_RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR))
+#define IS_RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR))
+#define RGB_HISTOGRAM_MANIPULATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
+
+typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
+typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
+typedef struct _RGBHistogramManipulatorPrivate RGBHistogramManipulatorPrivate;
+
+#define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ())
+#define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+enum  {
+	RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL,
+	RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL
+};
+static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0};
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _RGBHistogramManipulator {
+	GtkDrawingArea parent_instance;
+	RGBHistogramManipulatorPrivate * priv;
+};
+
+struct _RGBHistogramManipulatorClass {
+	GtkDrawingAreaClass parent_class;
+};
+
+struct _RGBHistogramManipulatorPrivate {
+	gint left_nub_max;
+	gint right_nub_min;
+	RGBHistogram* histogram;
+	gint left_nub_position;
+	gint right_nub_position;
+	gboolean is_left_nub_tracking;
+	gboolean is_right_nub_tracking;
+	gint track_start_x;
+	gint track_nub_start_position;
+	gint offset;
+};
+
+typedef enum  {
+	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB,
+	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB,
+	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH,
+	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH,
+	RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA
+} RGBHistogramManipulatorLocationCode;
+
+
+static gpointer rgb_histogram_manipulator_parent_class = NULL;
+static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path;
+static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path = NULL;
+static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path;
+static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path = NULL;
+static gboolean rgb_histogram_manipulator_paths_setup;
+static gboolean rgb_histogram_manipulator_paths_setup = FALSE;
+
+GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
+#define RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorPrivate))
+enum  {
+	RGB_HISTOGRAM_MANIPULATOR_DUMMY_PROPERTY
+};
+static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE 13
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH (RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE / 2)
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE 4
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH (256 + (2 * RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH))
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT 4
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET 1
+#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH (RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH + 2)
+#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT 118
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION (((((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - ((RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) / 2)) - RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) - 2)
+RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
+RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
+static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self);
+static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region);
+static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
+static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y);
+static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self);
+static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self);
+static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event);
+static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx);
+static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
+static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position);
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
+gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
+gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
+static void rgb_histogram_manipulator_finalize (GObject * obj);
+
+
+static GType rgb_histogram_manipulator_location_code_get_type (void) {
+	static volatile gsize rgb_histogram_manipulator_location_code_type_id__volatile = 0;
+	if (g_once_init_enter (&rgb_histogram_manipulator_location_code_type_id__volatile)) {
+		static const GEnumValue values[] = {{RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB", "left-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB", "right-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH", "left-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH", "right-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA", "insensitive-area"}, {0, NULL, NULL}};
+		GType rgb_histogram_manipulator_location_code_type_id;
+		rgb_histogram_manipulator_location_code_type_id = g_enum_register_static ("RGBHistogramManipulatorLocationCode", values);
+		g_once_init_leave (&rgb_histogram_manipulator_location_code_type_id__volatile, rgb_histogram_manipulator_location_code_type_id);
+	}
+	return rgb_histogram_manipulator_location_code_type_id__volatile;
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+	gboolean result;
+	result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event);
+#line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 144 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+	gboolean result;
+	result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event);
+#line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 153 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
+	gboolean result;
+	result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event);
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 162 "RGBHistogramManipulator.c"
+}
+
+
+static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
+#line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_on_size_allocate ((RGBHistogramManipulator*) self, allocation);
+#line 169 "RGBHistogramManipulator.c"
+}
+
+
+RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) {
+	RGBHistogramManipulator * self = NULL;
+	gboolean _tmp0_;
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self = (RGBHistogramManipulator*) g_object_new (object_type, NULL);
+#line 37 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH, RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT);
+#line 38 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "can-focus", TRUE, NULL);
+#line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = rgb_histogram_manipulator_paths_setup;
+#line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (!_tmp0_) {
+#line 186 "RGBHistogramManipulator.c"
+		GtkWidgetPath* _tmp1_;
+		GtkWidgetPath* _tmp2_;
+		GtkWidgetPath* _tmp3_;
+		GtkWidgetPath* _tmp4_;
+		GtkWidgetPath* _tmp5_;
+#line 41 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp1_ = rgb_histogram_manipulator_slider_draw_path;
+#line 41 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_widget_path_append_type (_tmp1_, gtk_scale_get_type ());
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = rgb_histogram_manipulator_slider_draw_path;
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_widget_path_iter_add_class (_tmp2_, 0, "scale");
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp3_ = rgb_histogram_manipulator_slider_draw_path;
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_widget_path_iter_add_class (_tmp3_, 0, "range");
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp4_ = rgb_histogram_manipulator_frame_draw_path;
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_widget_path_append_type (_tmp4_, gtk_frame_get_type ());
+#line 46 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp5_ = rgb_histogram_manipulator_frame_draw_path;
+#line 46 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_widget_path_iter_add_class (_tmp5_, 0, "default");
+#line 48 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		rgb_histogram_manipulator_paths_setup = TRUE;
+#line 214 "RGBHistogramManipulator.c"
+	}
+#line 51 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK);
+#line 52 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_RELEASE_MASK);
+#line 53 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_MOTION_MASK);
+#line 54 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_FOCUS_CHANGE_MASK);
+#line 55 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_KEY_PRESS_MASK);
+#line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event, self, 0);
+#line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event, self, 0);
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "motion-notify-event", (GCallback) _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event, self, 0);
+#line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate, self, 0);
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return self;
+#line 236 "RGBHistogramManipulator.c"
+}
+
+
+RGBHistogramManipulator* rgb_histogram_manipulator_new (void) {
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR);
+#line 243 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region) {
+	GtkAllocation _tmp0_;
+	gint _tmp1_;
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (region != NULL);
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = *region;
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = _tmp0_.width;
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->offset = ((_tmp1_ - RGB_HISTOGRAM_GRAPHIC_WIDTH) - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) / 2;
+#line 260 "RGBHistogramManipulator.c"
+}
+
+
+static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) {
+	RGBHistogramManipulatorLocationCode result = 0;
+	gint _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	gint _tmp2_;
+	gint _tmp3_;
+	gboolean _tmp6_ = FALSE;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
+#line 68 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = y;
+#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp0_ < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) {
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 292 "RGBHistogramManipulator.c"
+	}
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp2_ = x;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = self->priv->left_nub_position;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp2_ > _tmp3_) {
+#line 300 "RGBHistogramManipulator.c"
+		gint _tmp4_;
+		gint _tmp5_;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp4_ = x;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp5_ = self->priv->left_nub_position;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 309 "RGBHistogramManipulator.c"
+	} else {
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp1_ = FALSE;
+#line 313 "RGBHistogramManipulator.c"
+	}
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_) {
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB;
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 321 "RGBHistogramManipulator.c"
+	}
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = x;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = self->priv->right_nub_position;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp7_ > _tmp8_) {
+#line 329 "RGBHistogramManipulator.c"
+		gint _tmp9_;
+		gint _tmp10_;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp9_ = x;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp10_ = self->priv->right_nub_position;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 338 "RGBHistogramManipulator.c"
+	} else {
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp6_ = FALSE;
+#line 342 "RGBHistogramManipulator.c"
+	}
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp6_) {
+#line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB;
+#line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 350 "RGBHistogramManipulator.c"
+	}
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp11_ = y;
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp11_ < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) {
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 360 "RGBHistogramManipulator.c"
+	}
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp12_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp13_ = self->priv->left_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp14_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp15_ = self->priv->left_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp16_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp17_ = self->priv->right_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp18_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp19_ = self->priv->right_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (((_tmp12_ - _tmp13_) * (_tmp14_ - _tmp15_)) < ((_tmp16_ - _tmp17_) * (_tmp18_ - _tmp19_))) {
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH;
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 384 "RGBHistogramManipulator.c"
+	} else {
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH;
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 390 "RGBHistogramManipulator.c"
+	}
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+	gboolean result = FALSE;
+	GdkEventButton* _tmp0_;
+	GdkEventButton* _tmp1_;
+	gdouble _tmp2_;
+	gint _tmp3_;
+	RGBHistogramManipulatorLocationCode loc = 0;
+	GdkEventButton* _tmp4_;
+	gdouble _tmp5_;
+	GdkEventButton* _tmp6_;
+	gdouble _tmp7_;
+	RGBHistogramManipulatorLocationCode _tmp8_;
+	gboolean retval = FALSE;
+	RGBHistogramManipulatorLocationCode _tmp9_;
+	GdkEventButton* _tmp26_;
+	GdkEventButton* _tmp27_;
+	gdouble _tmp28_;
+	gint _tmp29_;
+#line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (event_record != NULL, FALSE);
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = event_record;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = event_record;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp2_ = _tmp1_->x;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = self->priv->offset;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_->x = _tmp2_ - _tmp3_;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = event_record;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = _tmp4_->x;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp6_ = event_record;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = _tmp6_->y;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp5_, (gint) _tmp7_);
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	loc = _tmp8_;
+#line 93 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	retval = TRUE;
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp9_ = loc;
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	switch (_tmp9_) {
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB:
+#line 447 "RGBHistogramManipulator.c"
+		{
+			GdkEventButton* _tmp10_;
+			gdouble _tmp11_;
+			gint _tmp12_;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp10_ = event_record;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp11_ = _tmp10_->x;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->track_start_x = (gint) _tmp11_;
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp12_ = self->priv->left_nub_position;
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->track_nub_start_position = _tmp12_;
+#line 99 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->is_left_nub_tracking = TRUE;
+#line 100 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			break;
+#line 466 "RGBHistogramManipulator.c"
+		}
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB:
+#line 470 "RGBHistogramManipulator.c"
+		{
+			GdkEventButton* _tmp13_;
+			gdouble _tmp14_;
+			gint _tmp15_;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp13_ = event_record;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp14_ = _tmp13_->x;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->track_start_x = (gint) _tmp14_;
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp15_ = self->priv->right_nub_position;
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->track_nub_start_position = _tmp15_;
+#line 105 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->is_right_nub_tracking = TRUE;
+#line 106 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			break;
+#line 489 "RGBHistogramManipulator.c"
+		}
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH:
+#line 493 "RGBHistogramManipulator.c"
+		{
+			GdkEventButton* _tmp16_;
+			gdouble _tmp17_;
+			gint _tmp18_;
+			gint _tmp19_;
+			gint _tmp20_;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp16_ = event_record;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp17_ = _tmp16_->x;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->left_nub_position = ((gint) _tmp17_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp18_ = self->priv->left_nub_position;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp19_ = self->priv->left_nub_max;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp20_ = CLAMP (_tmp18_, 0, _tmp19_);
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->left_nub_position = _tmp20_;
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			rgb_histogram_manipulator_force_update (self);
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			rgb_histogram_manipulator_update_nub_extrema (self);
+#line 114 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			break;
+#line 522 "RGBHistogramManipulator.c"
+		}
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH:
+#line 526 "RGBHistogramManipulator.c"
+		{
+			GdkEventButton* _tmp21_;
+			gdouble _tmp22_;
+			gint _tmp23_;
+			gint _tmp24_;
+			gint _tmp25_;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp21_ = event_record;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp22_ = _tmp21_->x;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->right_nub_position = ((gint) _tmp22_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp23_ = self->priv->right_nub_position;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp24_ = self->priv->right_nub_min;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			_tmp25_ = CLAMP (_tmp23_, _tmp24_, 255);
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			self->priv->right_nub_position = _tmp25_;
+#line 119 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			rgb_histogram_manipulator_force_update (self);
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			rgb_histogram_manipulator_update_nub_extrema (self);
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			break;
+#line 555 "RGBHistogramManipulator.c"
+		}
+		default:
+		{
+#line 125 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			retval = FALSE;
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+			break;
+#line 563 "RGBHistogramManipulator.c"
+		}
+	}
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp26_ = event_record;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp27_ = event_record;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp28_ = _tmp27_->x;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp29_ = self->priv->offset;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp27_->x = _tmp28_ + _tmp29_;
+#line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = retval;
+#line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 580 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_;
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (event_record != NULL, FALSE);
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = self->priv->is_left_nub_tracking;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_) {
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = TRUE;
+#line 598 "RGBHistogramManipulator.c"
+	} else {
+		gboolean _tmp2_;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = self->priv->is_right_nub_tracking;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = _tmp2_;
+#line 605 "RGBHistogramManipulator.c"
+	}
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp0_) {
+#line 137 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		rgb_histogram_manipulator_update_nub_extrema (self);
+#line 613 "RGBHistogramManipulator.c"
+	}
+#line 141 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->is_left_nub_tracking = FALSE;
+#line 142 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->is_right_nub_tracking = FALSE;
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = FALSE;
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 623 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_;
+	GdkEventMotion* _tmp3_;
+	GdkEventMotion* _tmp4_;
+	gdouble _tmp5_;
+	gint _tmp6_;
+	gboolean _tmp7_;
+	GdkEventMotion* _tmp24_;
+	GdkEventMotion* _tmp25_;
+	gdouble _tmp26_;
+	gint _tmp27_;
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (event_record != NULL, FALSE);
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = self->priv->is_left_nub_tracking;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (!_tmp1_) {
+#line 648 "RGBHistogramManipulator.c"
+		gboolean _tmp2_;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = self->priv->is_right_nub_tracking;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = !_tmp2_;
+#line 654 "RGBHistogramManipulator.c"
+	} else {
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = FALSE;
+#line 658 "RGBHistogramManipulator.c"
+	}
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp0_) {
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = FALSE;
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 666 "RGBHistogramManipulator.c"
+	}
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = event_record;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = event_record;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = _tmp4_->x;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp6_ = self->priv->offset;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_->x = _tmp5_ - _tmp6_;
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = self->priv->is_left_nub_tracking;
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp7_) {
+#line 682 "RGBHistogramManipulator.c"
+		gint track_x_delta = 0;
+		GdkEventMotion* _tmp8_;
+		gdouble _tmp9_;
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp8_ = event_record;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp9_ = _tmp8_->x;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp10_ = self->priv->track_start_x;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		track_x_delta = ((gint) _tmp9_) - _tmp10_;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp11_ = self->priv->track_nub_start_position;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp12_ = track_x_delta;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->left_nub_position = _tmp11_ + _tmp12_;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp13_ = self->priv->left_nub_position;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp14_ = self->priv->left_nub_max;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp15_ = CLAMP (_tmp13_, 0, _tmp14_);
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->left_nub_position = _tmp15_;
+#line 714 "RGBHistogramManipulator.c"
+	} else {
+		gint track_x_delta = 0;
+		GdkEventMotion* _tmp16_;
+		gdouble _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp16_ = event_record;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp17_ = _tmp16_->x;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp18_ = self->priv->track_start_x;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		track_x_delta = ((gint) _tmp17_) - _tmp18_;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp19_ = self->priv->track_nub_start_position;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp20_ = track_x_delta;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->right_nub_position = _tmp19_ + _tmp20_;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp21_ = self->priv->right_nub_position;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp22_ = self->priv->right_nub_min;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp23_ = CLAMP (_tmp21_, _tmp22_, 255);
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->right_nub_position = _tmp23_;
+#line 747 "RGBHistogramManipulator.c"
+	}
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_force_update (self);
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp24_ = event_record;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp25_ = event_record;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp26_ = _tmp25_->x;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp27_ = self->priv->offset;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp25_->x = _tmp26_ + _tmp27_;
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = TRUE;
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 765 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) {
+	RGBHistogramManipulator * self;
+	gboolean result = FALSE;
+	GdkEventFocus* _tmp0_;
+	gboolean _tmp1_;
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = event;
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_) {
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = TRUE;
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 788 "RGBHistogramManipulator.c"
+	}
+#line 173 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = FALSE;
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 796 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+	RGBHistogramManipulator * self;
+	gboolean result = FALSE;
+	GdkEventKey* _tmp0_;
+	gboolean _tmp1_;
+	gint delta = 0;
+	gboolean _tmp2_ = FALSE;
+	GdkEventKey* _tmp3_;
+	guint _tmp4_;
+	gboolean _tmp7_ = FALSE;
+	GdkEventKey* _tmp8_;
+	guint _tmp9_;
+	GdkEventKey* _tmp12_;
+	GdkModifierType _tmp13_;
+	gint _tmp15_;
+	GdkEventKey* _tmp16_;
+	GdkModifierType _tmp17_;
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = event;
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_) {
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = TRUE;
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 831 "RGBHistogramManipulator.c"
+	}
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	delta = 0;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = event;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = _tmp3_->keyval;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp4_ == ((guint) GDK_KEY_Left)) {
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = TRUE;
+#line 843 "RGBHistogramManipulator.c"
+	} else {
+		GdkEventKey* _tmp5_;
+		guint _tmp6_;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp5_ = event;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp6_ = _tmp5_->keyval;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = _tmp6_ == ((guint) GDK_KEY_Up);
+#line 853 "RGBHistogramManipulator.c"
+	}
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp2_) {
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		delta = -1;
+#line 859 "RGBHistogramManipulator.c"
+	}
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = event;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp9_ = _tmp8_->keyval;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp9_ == ((guint) GDK_KEY_Right)) {
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp7_ = TRUE;
+#line 869 "RGBHistogramManipulator.c"
+	} else {
+		GdkEventKey* _tmp10_;
+		guint _tmp11_;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp10_ = event;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp11_ = _tmp10_->keyval;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp7_ = _tmp11_ == ((guint) GDK_KEY_Down);
+#line 879 "RGBHistogramManipulator.c"
+	}
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp7_) {
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		delta = 1;
+#line 885 "RGBHistogramManipulator.c"
+	}
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp12_ = event;
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp13_ = _tmp12_->state;
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (!((_tmp13_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) {
+#line 893 "RGBHistogramManipulator.c"
+		gint _tmp14_;
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp14_ = delta;
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		delta = _tmp14_ * 5;
+#line 899 "RGBHistogramManipulator.c"
+	}
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp15_ = delta;
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp15_ == 0) {
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		result = FALSE;
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return result;
+#line 909 "RGBHistogramManipulator.c"
+	}
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp16_ = event;
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp17_ = _tmp16_->state;
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if ((_tmp17_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) {
+#line 917 "RGBHistogramManipulator.c"
+		gint _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp18_ = self->priv->right_nub_position;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp19_ = delta;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->right_nub_position = _tmp18_ + _tmp19_;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp20_ = self->priv->right_nub_position;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp21_ = self->priv->right_nub_min;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp22_ = CLAMP (_tmp20_, _tmp21_, 255);
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->right_nub_position = _tmp22_;
+#line 937 "RGBHistogramManipulator.c"
+	} else {
+		gint _tmp23_;
+		gint _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		gint _tmp27_;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp23_ = self->priv->left_nub_position;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp24_ = delta;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->left_nub_position = _tmp23_ + _tmp24_;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp25_ = self->priv->left_nub_position;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp26_ = self->priv->left_nub_max;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp27_ = CLAMP (_tmp25_, 0, _tmp26_);
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		self->priv->left_nub_position = _tmp27_;
+#line 958 "RGBHistogramManipulator.c"
+	}
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 211 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_update_nub_extrema (self);
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_force_update (self);
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = TRUE;
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 970 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx) {
+	RGBHistogramManipulator * self;
+	gboolean result = FALSE;
+	GtkBorder padding = {0};
+	GtkStyleContext* _tmp0_;
+	GtkBorder _tmp1_ = {0};
+	GdkRectangle area = {0};
+	GtkBorder _tmp2_;
+	gint16 _tmp3_;
+	gint _tmp4_;
+	GtkBorder _tmp5_;
+	gint16 _tmp6_;
+	GtkBorder _tmp7_;
+	gint16 _tmp8_;
+	GtkBorder _tmp9_;
+	gint16 _tmp10_;
+	gboolean _tmp11_;
+	gboolean _tmp12_;
+	cairo_t* _tmp23_;
+	GdkRectangle _tmp24_;
+	cairo_t* _tmp25_;
+	GdkRectangle _tmp26_;
+	gint _tmp27_;
+	cairo_t* _tmp28_;
+	GdkRectangle _tmp29_;
+	gint _tmp30_;
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (ctx != NULL, FALSE);
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gtk_style_context_get_padding (_tmp0_, GTK_STATE_FLAG_NORMAL, &_tmp1_);
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	padding = _tmp1_;
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	memset (&area, 0, sizeof (GdkRectangle));
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp2_ = padding;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = _tmp2_.left;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = self->priv->offset;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	area.x = _tmp3_ + _tmp4_;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = padding;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp6_ = _tmp5_.top;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	area.y = (gint) _tmp6_;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = padding;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = _tmp7_.right;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	area.width = RGB_HISTOGRAM_GRAPHIC_WIDTH + _tmp8_;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp9_ = padding;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp10_ = _tmp9_.bottom;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	area.height = RGB_HISTOGRAM_GRAPHIC_HEIGHT + _tmp10_;
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp11_, NULL);
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp12_ = _tmp11_;
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp12_) {
+#line 1044 "RGBHistogramManipulator.c"
+		GtkStyleContext* _tmp13_;
+		cairo_t* _tmp14_;
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
+		GdkRectangle _tmp19_;
+		gint _tmp20_;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp13_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp14_ = ctx;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp15_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp16_ = _tmp15_.x;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp17_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp18_ = _tmp17_.y;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp19_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp20_ = _tmp19_.width;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp21_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp22_ = _tmp21_.height;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		gtk_render_focus (_tmp13_, _tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) (_tmp20_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp22_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH));
+#line 1077 "RGBHistogramManipulator.c"
+	}
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp23_ = ctx;
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp24_ = area;
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_draw_histogram (self, _tmp23_, &_tmp24_);
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp25_ = ctx;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp26_ = area;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp27_ = self->priv->left_nub_position;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_draw_nub (self, _tmp25_, &_tmp26_, _tmp27_);
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp28_ = ctx;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp29_ = area;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp30_ = self->priv->right_nub_position;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_draw_nub (self, _tmp28_, &_tmp29_, _tmp30_);
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = TRUE;
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 1105 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
+	RGBHistogram* _tmp0_;
+	GdkPixbuf* histogram_graphic = NULL;
+	RGBHistogram* _tmp1_;
+	GdkPixbuf* _tmp2_;
+	cairo_t* _tmp3_;
+	GdkPixbuf* _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	cairo_t* _tmp9_;
+	gint _tmp10_;
+	gint _tmp22_;
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (ctx != NULL);
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (area != NULL);
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = self->priv->histogram;
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp0_ == NULL) {
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		return;
+#line 1135 "RGBHistogramManipulator.c"
+	}
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = self->priv->histogram;
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp2_ = rgb_histogram_get_graphic (_tmp1_);
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	histogram_graphic = _tmp2_;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = ctx;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = histogram_graphic;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = *area;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp6_ = _tmp5_.x;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = *area;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = _tmp7_.y;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gdk_cairo_set_source_pixbuf (_tmp3_, _tmp4_, (gdouble) (_tmp6_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp8_ + 2));
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp9_ = ctx;
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_paint (_tmp9_);
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp10_ = self->priv->left_nub_position;
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp10_ > 0) {
+#line 1165 "RGBHistogramManipulator.c"
+		cairo_t* _tmp11_;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
+		GdkRectangle _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		GdkPixbuf* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		cairo_t* _tmp20_;
+		cairo_t* _tmp21_;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp11_ = ctx;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp12_ = *area;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp13_ = _tmp12_.x;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp14_ = *area;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp15_ = _tmp14_.y;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp16_ = self->priv->left_nub_position;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp17_ = histogram_graphic;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp19_ = _tmp18_;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_rectangle (_tmp11_, (gdouble) (_tmp13_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp15_ + 2), (gdouble) _tmp16_, (gdouble) _tmp19_);
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp20_ = ctx;
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_set_source_rgba (_tmp20_, 0.0, 0.0, 0.0, 0.45);
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp21_ = ctx;
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_fill (_tmp21_);
+#line 1205 "RGBHistogramManipulator.c"
+	}
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp22_ = self->priv->right_nub_position;
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp22_ < 255) {
+#line 1211 "RGBHistogramManipulator.c"
+		cairo_t* _tmp23_;
+		GdkRectangle _tmp24_;
+		gint _tmp25_;
+		gint _tmp26_;
+		GdkRectangle _tmp27_;
+		gint _tmp28_;
+		GdkPixbuf* _tmp29_;
+		gint _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		GdkPixbuf* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		cairo_t* _tmp36_;
+		cairo_t* _tmp37_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp23_ = ctx;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp24_ = *area;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp25_ = _tmp24_.x;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp26_ = self->priv->right_nub_position;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp27_ = *area;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp28_ = _tmp27_.y;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp29_ = histogram_graphic;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp30_ = gdk_pixbuf_get_width (_tmp29_);
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp31_ = _tmp30_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp32_ = self->priv->right_nub_position;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp33_ = histogram_graphic;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp34_ = gdk_pixbuf_get_height (_tmp33_);
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp35_ = _tmp34_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_rectangle (_tmp23_, (gdouble) ((_tmp25_ + _tmp26_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp28_ + 2), (gdouble) (_tmp31_ - _tmp32_), (gdouble) _tmp35_);
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp36_ = ctx;
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_set_source_rgba (_tmp36_, 1.0, 1.0, 1.0, 0.45);
+#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp37_ = ctx;
+#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		cairo_fill (_tmp37_);
+#line 1263 "RGBHistogramManipulator.c"
+	}
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_g_object_unref0 (histogram_graphic);
+#line 1267 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) {
+	cairo_t* _tmp0_;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	cairo_t* _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	cairo_t* _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
+	GdkRectangle _tmp16_;
+	gint _tmp17_;
+	cairo_t* _tmp18_;
+	cairo_t* _tmp19_;
+	cairo_t* _tmp20_;
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (ctx != NULL);
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (area != NULL);
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = ctx;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = *area;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp2_ = _tmp1_.x;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = position;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = *area;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = _tmp4_.y;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_move_to (_tmp0_, (gdouble) (_tmp2_ + _tmp3_), (gdouble) ((_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp6_ = ctx;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp7_ = *area;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp8_ = _tmp7_.x;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp9_ = position;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp10_ = *area;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp11_ = _tmp10_.y;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_line_to (_tmp6_, (gdouble) ((_tmp8_ + _tmp9_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION));
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp12_ = ctx;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp13_ = *area;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp14_ = _tmp13_.x;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp15_ = position;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp16_ = *area;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp17_ = _tmp16_.y;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_line_to (_tmp12_, (gdouble) ((_tmp14_ + _tmp15_) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp17_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp18_ = ctx;
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_close_path (_tmp18_);
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp19_ = ctx;
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_set_source_rgb (_tmp19_, 0.333, 0.333, 0.333);
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp20_ = ctx;
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	cairo_fill (_tmp20_);
+#line 1353 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) {
+	GdkWindow* _tmp0_;
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	gdk_window_invalidate_rect (_tmp0_, NULL, TRUE);
+#line 1365 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) {
+	gint _tmp0_;
+	gint _tmp1_;
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = self->priv->left_nub_position;
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->right_nub_min = (_tmp0_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + 1;
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = self->priv->right_nub_position;
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
+#line 1382 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) {
+	GdkPixbuf* _tmp0_;
+	RGBHistogram* _tmp1_;
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (GDK_IS_PIXBUF (source_pixbuf));
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = source_pixbuf;
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = rgb_histogram_new (_tmp0_);
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_rgb_histogram_unref0 (self->priv->histogram);
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->histogram = _tmp1_;
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_force_update (self);
+#line 1403 "RGBHistogramManipulator.c"
+}
+
+
+gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) {
+	gint result = 0;
+	gint _tmp0_;
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = self->priv->left_nub_position;
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = _tmp0_;
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 1418 "RGBHistogramManipulator.c"
+}
+
+
+gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) {
+	gint result = 0;
+	gint _tmp0_;
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = self->priv->right_nub_position;
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	result = _tmp0_;
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	return result;
+#line 1433 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = user_nub_pos;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_ >= 0) {
+#line 1449 "RGBHistogramManipulator.c"
+		gint _tmp2_;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = user_nub_pos;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = _tmp2_ <= 255;
+#line 1455 "RGBHistogramManipulator.c"
+	} else {
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = FALSE;
+#line 1459 "RGBHistogramManipulator.c"
+	}
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = user_nub_pos;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = self->priv->left_nub_max;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = CLAMP (_tmp3_, 0, _tmp4_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->left_nub_position = _tmp5_;
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_update_nub_extrema (self);
+#line 1473 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = user_nub_pos;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	if (_tmp1_ >= 0) {
+#line 1489 "RGBHistogramManipulator.c"
+		gint _tmp2_;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp2_ = user_nub_pos;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = _tmp2_ <= 255;
+#line 1495 "RGBHistogramManipulator.c"
+	} else {
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+		_tmp0_ = FALSE;
+#line 1499 "RGBHistogramManipulator.c"
+	}
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp3_ = user_nub_pos;
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp4_ = self->priv->right_nub_min;
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp5_ = CLAMP (_tmp3_, _tmp4_, 255);
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->right_nub_position = _tmp5_;
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_update_nub_extrema (self);
+#line 1513 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) {
+	GtkWidgetPath* _tmp0_;
+	GtkWidgetPath* _tmp1_;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_parent_class = g_type_class_peek_parent (klass);
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	g_type_class_add_private (klass, sizeof (RGBHistogramManipulatorPrivate));
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) rgb_histogram_manipulator_real_focus_out_event;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) rgb_histogram_manipulator_real_key_press_event;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) rgb_histogram_manipulator_real_draw;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	G_OBJECT_CLASS (klass)->finalize = rgb_histogram_manipulator_finalize;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL] = g_signal_new ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 23 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp0_ = gtk_widget_path_new ();
+#line 23 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_slider_draw_path = _tmp0_;
+#line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_tmp1_ = gtk_widget_path_new ();
+#line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	rgb_histogram_manipulator_frame_draw_path = _tmp1_;
+#line 1542 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) {
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self);
+#line 20 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->left_nub_max = (255 - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
+#line 21 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->right_nub_min = RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE + 1;
+#line 27 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->histogram = NULL;
+#line 28 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->left_nub_position = 0;
+#line 29 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->right_nub_position = 255;
+#line 30 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->is_left_nub_tracking = FALSE;
+#line 31 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->is_right_nub_tracking = FALSE;
+#line 32 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->track_start_x = 0;
+#line 33 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->track_nub_start_position = 0;
+#line 34 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self->priv->offset = 0;
+#line 1569 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_finalize (GObject * obj) {
+	RGBHistogramManipulator * self;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 27 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	_rgb_histogram_unref0 (self->priv->histogram);
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+	G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj);
+#line 1581 "RGBHistogramManipulator.c"
+}
+
+
+GType rgb_histogram_manipulator_get_type (void) {
+	static volatile gsize rgb_histogram_manipulator_type_id__volatile = 0;
+	if (g_once_init_enter (&rgb_histogram_manipulator_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (RGBHistogramManipulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_histogram_manipulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBHistogramManipulator), 0, (GInstanceInitFunc) rgb_histogram_manipulator_instance_init, NULL };
+		GType rgb_histogram_manipulator_type_id;
+		rgb_histogram_manipulator_type_id = g_type_register_static (gtk_drawing_area_get_type (), "RGBHistogramManipulator", &g_define_type_info, 0);
+		g_once_init_leave (&rgb_histogram_manipulator_type_id__volatile, rgb_histogram_manipulator_type_id);
+	}
+	return rgb_histogram_manipulator_type_id__volatile;
+}
+
+
+
diff --git a/src/editing_tools/RGBHistogramManipulator.vala b/src/editing_tools/RGBHistogramManipulator.vala
new file mode 100644
index 0000000..4b0a8a2
--- /dev/null
+++ b/src/editing_tools/RGBHistogramManipulator.vala
@@ -0,0 +1,311 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class RGBHistogramManipulator : Gtk.DrawingArea {
+    private enum LocationCode { LEFT_NUB, RIGHT_NUB, LEFT_TROUGH, RIGHT_TROUGH,
+        INSENSITIVE_AREA }
+    private const int NUB_SIZE = 13;
+    private const int NUB_HALF_WIDTH = NUB_SIZE / 2;
+    private const int NUB_V_NUDGE = 4;
+    private const int TROUGH_WIDTH = 256 + (2 * NUB_HALF_WIDTH);
+    private const int TROUGH_HEIGHT = 4;
+    private const int TROUGH_BOTTOM_OFFSET = 1;
+    private const int CONTROL_WIDTH = TROUGH_WIDTH + 2;
+    private const int CONTROL_HEIGHT = 118;
+    private const int NUB_V_POSITION = CONTROL_HEIGHT - TROUGH_HEIGHT - TROUGH_BOTTOM_OFFSET
+        - (NUB_SIZE - TROUGH_HEIGHT) / 2 - NUB_V_NUDGE - 2;
+    private int left_nub_max = 255 - NUB_SIZE - 1;
+    private int right_nub_min = NUB_SIZE + 1;
+
+    private static Gtk.WidgetPath slider_draw_path = new Gtk.WidgetPath();
+    private static Gtk.WidgetPath frame_draw_path = new Gtk.WidgetPath();
+    private static bool paths_setup = false;
+
+    private RGBHistogram histogram = null;
+    private int left_nub_position = 0;
+    private int right_nub_position = 255;
+    private bool is_left_nub_tracking = false;
+    private bool is_right_nub_tracking = false;
+    private int track_start_x = 0;
+    private int track_nub_start_position = 0;
+    private int offset = 0;
+
+    public RGBHistogramManipulator( ) {
+        set_size_request(CONTROL_WIDTH, CONTROL_HEIGHT);
+        can_focus = true;
+        
+        if (!paths_setup) {
+            slider_draw_path.append_type(typeof(Gtk.Scale));
+            slider_draw_path.iter_add_class(0, "scale");
+            slider_draw_path.iter_add_class(0, "range");
+            
+            frame_draw_path.append_type(typeof(Gtk.Frame));
+            frame_draw_path.iter_add_class(0, "default");
+            
+            paths_setup = true;
+        }
+            
+        add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+        add_events(Gdk.EventMask.BUTTON_RELEASE_MASK);
+        add_events(Gdk.EventMask.BUTTON_MOTION_MASK);
+        add_events(Gdk.EventMask.FOCUS_CHANGE_MASK);
+        add_events(Gdk.EventMask.KEY_PRESS_MASK);
+
+        button_press_event.connect(on_button_press);
+        button_release_event.connect(on_button_release);
+        motion_notify_event.connect(on_button_motion);
+
+        this.size_allocate.connect(on_size_allocate);
+    }
+
+    private void on_size_allocate(Gtk.Allocation region) {
+        this.offset = (region.width - RGBHistogram.GRAPHIC_WIDTH - NUB_SIZE) / 2;
+    }
+
+    private LocationCode hit_test_point(int x, int y) {
+        if (y < NUB_V_POSITION)
+            return LocationCode.INSENSITIVE_AREA;
+
+        if ((x > left_nub_position) && (x < left_nub_position + NUB_SIZE))
+            return LocationCode.LEFT_NUB;
+
+        if ((x > right_nub_position) && (x < right_nub_position + NUB_SIZE))
+            return LocationCode.RIGHT_NUB;
+
+        if (y < (NUB_V_POSITION + NUB_V_NUDGE + 1))
+            return LocationCode.INSENSITIVE_AREA;
+
+        if ((x - left_nub_position) * (x - left_nub_position) <
+            (x - right_nub_position) * (x - right_nub_position))
+            return LocationCode.LEFT_TROUGH;
+        else
+            return LocationCode.RIGHT_TROUGH;
+    }
+    
+    private bool on_button_press(Gdk.EventButton event_record) {
+        // Adjust mouse position to drawing offset
+        // Easier to modify the event and shit the whole drawing then adjusting the nub drawing code
+        event_record.x -= this.offset;
+        LocationCode loc = hit_test_point((int) event_record.x, (int) event_record.y);
+        bool retval = true;
+
+        switch (loc) {
+            case LocationCode.LEFT_NUB:
+                track_start_x = ((int) event_record.x);
+                track_nub_start_position = left_nub_position;
+                is_left_nub_tracking = true;
+                break;
+
+            case LocationCode.RIGHT_NUB:
+                track_start_x = ((int) event_record.x);
+                track_nub_start_position = right_nub_position;
+                is_right_nub_tracking = true;
+                break;
+
+            case LocationCode.LEFT_TROUGH:
+                left_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
+                left_nub_position = left_nub_position.clamp(0, left_nub_max);
+                force_update();
+                nub_position_changed();
+                update_nub_extrema();
+                break;
+
+            case LocationCode.RIGHT_TROUGH:
+                right_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
+                right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+                force_update();
+                nub_position_changed();
+                update_nub_extrema();
+                break;
+
+            default:
+                retval = false;
+                break;
+        }
+
+        // Remove adjustment position to drawing offset
+        event_record.x += this.offset;
+
+        return retval;
+    }
+    
+    private bool on_button_release(Gdk.EventButton event_record) {
+        if (is_left_nub_tracking || is_right_nub_tracking) {
+            nub_position_changed();
+            update_nub_extrema();
+        }
+
+        is_left_nub_tracking = false;
+        is_right_nub_tracking = false;
+
+        return false;
+    }
+    
+    private bool on_button_motion(Gdk.EventMotion event_record) {
+        if ((!is_left_nub_tracking) && (!is_right_nub_tracking))
+            return false;
+    
+        event_record.x -= this.offset;
+        if (is_left_nub_tracking) {
+            int track_x_delta = ((int) event_record.x) - track_start_x;
+            left_nub_position = (track_nub_start_position + track_x_delta);
+            left_nub_position = left_nub_position.clamp(0, left_nub_max);
+        } else { /* right nub is tracking */
+            int track_x_delta = ((int) event_record.x) - track_start_x;
+            right_nub_position = (track_nub_start_position + track_x_delta);
+            right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+        }
+        
+        force_update();
+        event_record.x += this.offset;
+
+        return true;
+    }
+
+    public override bool focus_out_event(Gdk.EventFocus event) {
+        if (base.focus_out_event(event)) {
+            return true;
+        }
+
+        queue_draw();
+
+        return false;
+    }
+
+    public override bool key_press_event(Gdk.EventKey event) {
+        if (base.key_press_event(event)) {
+            return true;
+        }
+
+        int delta = 0;
+
+        if (event.keyval == Gdk.Key.Left || event.keyval == Gdk.Key.Up) {
+            delta = -1;
+        }
+
+        if (event.keyval == Gdk.Key.Right || event.keyval == Gdk.Key.Down) {
+            delta = 1;
+        }
+
+        if (!(Gdk.ModifierType.CONTROL_MASK in event.state)) {
+            delta *= 5;
+        }
+
+        if (delta == 0) {
+            return false;
+        }
+
+        if (Gdk.ModifierType.SHIFT_MASK in event.state) {
+            right_nub_position += delta;
+            right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+        } else {
+            left_nub_position += delta;
+            left_nub_position = left_nub_position.clamp(0, left_nub_max);
+
+        }
+
+        nub_position_changed();
+        update_nub_extrema();
+        force_update();
+
+        return true;
+    }
+    
+    public override bool draw(Cairo.Context ctx) {
+        Gtk.Border padding = get_style_context().get_padding(Gtk.StateFlags.NORMAL);
+
+        Gdk.Rectangle area = Gdk.Rectangle();
+        area.x = padding.left + this.offset;
+        area.y = padding.top;
+        area.width = RGBHistogram.GRAPHIC_WIDTH + padding.right;
+        area.height = RGBHistogram.GRAPHIC_HEIGHT + padding.bottom;
+
+        if (has_focus) {
+            get_style_context().render_focus(ctx, area.x, area.y,
+                                             area.width + NUB_SIZE,
+                                             area.height + NUB_SIZE + NUB_HALF_WIDTH);
+        }
+
+        draw_histogram(ctx, area);
+        draw_nub(ctx, area, left_nub_position);
+        draw_nub(ctx, area, right_nub_position);
+
+        return true;
+    }
+    
+    private void draw_histogram(Cairo.Context ctx, Gdk.Rectangle area) {
+        if (histogram == null)
+            return;
+
+        var histogram_graphic = histogram.get_graphic();
+
+        Gdk.cairo_set_source_pixbuf(ctx, histogram_graphic, area.x + NUB_HALF_WIDTH, area.y + 2);
+        ctx.paint();
+
+        if (left_nub_position > 0) {
+            ctx.rectangle(area.x + NUB_HALF_WIDTH, area.y + 2,
+                          left_nub_position,
+                          histogram_graphic.height);
+            ctx.set_source_rgba(0.0, 0.0, 0.0, 0.45);
+            ctx.fill();
+        }
+
+        if (right_nub_position < 255) {
+            ctx.rectangle(area.x + right_nub_position + NUB_HALF_WIDTH,
+                          area.y + 2,
+                          histogram_graphic.width - right_nub_position,
+                          histogram_graphic.height);
+            ctx.set_source_rgba(1.0, 1.0, 1.0, 0.45);
+            ctx.fill();
+        }
+    }
+
+    private void draw_nub(Cairo.Context ctx, Gdk.Rectangle area, int position) {
+        ctx.move_to(area.x + position, area.y + NUB_V_POSITION + NUB_SIZE);
+        ctx.line_to(area.x + position + NUB_HALF_WIDTH, area.y + NUB_V_POSITION);
+        ctx.line_to(area.x + position + NUB_SIZE, area.y + NUB_V_POSITION + NUB_SIZE);
+        ctx.close_path();
+        ctx.set_source_rgb(0.333, 0.333, 0.333);
+        ctx.fill();
+    }
+    
+    private void force_update() {
+        get_window().invalidate_rect(null, true);
+    }
+    
+    private void update_nub_extrema() {
+        right_nub_min = left_nub_position + NUB_SIZE + 1;
+        left_nub_max = right_nub_position - NUB_SIZE - 1;
+    }
+
+    public signal void nub_position_changed();
+
+    public void update_histogram(Gdk.Pixbuf source_pixbuf) {
+        histogram = new RGBHistogram(source_pixbuf);
+        force_update();
+    }
+    
+    public int get_left_nub_position() {
+        return left_nub_position;
+    }
+    
+    public int get_right_nub_position() {
+        return right_nub_position;
+    }
+
+    public void set_left_nub_position(int user_nub_pos) {
+        assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
+        left_nub_position = user_nub_pos.clamp(0, left_nub_max);
+        update_nub_extrema();
+    }
+    
+    public void set_right_nub_position(int user_nub_pos) {
+        assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
+        right_nub_position = user_nub_pos.clamp(right_nub_min, 255);
+        update_nub_extrema();
+    }
+}
+
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index 9420cb8..11bf36a 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -486,6 +486,7 @@ GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
 GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
 void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result);
 gchar* data_object_to_string (DataObject* self);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
 static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self);
 void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height);
 static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
@@ -552,14 +553,14 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GTyp
 	self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool");
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 556 "StraightenTool.c"
+#line 557 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL);
-#line 563 "StraightenTool.c"
+#line 564 "StraightenTool.c"
 }
 
 
@@ -572,7 +573,7 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
 	result = _tmp0_;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 576 "StraightenTool.c"
+#line 577 "StraightenTool.c"
 }
 
 
@@ -586,7 +587,7 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 590 "StraightenTool.c"
+#line 591 "StraightenTool.c"
 }
 
 
@@ -692,7 +693,7 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE);
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (command);
-#line 696 "StraightenTool.c"
+#line 697 "StraightenTool.c"
 }
 
 
@@ -708,7 +709,7 @@ static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraigh
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_repaint (_tmp0_);
-#line 712 "StraightenTool.c"
+#line 713 "StraightenTool.c"
 }
 
 
@@ -717,7 +718,7 @@ static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingTool
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
-#line 721 "StraightenTool.c"
+#line 722 "StraightenTool.c"
 }
 
 
@@ -739,7 +740,7 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin
 	_tmp3_ = self->priv->photo_angle;
 #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 743 "StraightenTool.c"
+#line 744 "StraightenTool.c"
 }
 
 
@@ -777,7 +778,7 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
 	_tmp6_ = a;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp6_ != NULL) {
-#line 781 "StraightenTool.c"
+#line 782 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
 		GtkScale* _tmp8_;
 		gdouble* _tmp9_;
@@ -791,11 +792,11 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_);
 #line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_high_qual_repaint (self);
-#line 795 "StraightenTool.c"
+#line 796 "StraightenTool.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (a);
-#line 799 "StraightenTool.c"
+#line 800 "StraightenTool.c"
 }
 
 
@@ -817,13 +818,13 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo
 	_tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp3_) {
-#line 821 "StraightenTool.c"
+#line 822 "StraightenTool.c"
 		EditingToolsPhotoCanvas* _tmp4_;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_photo_canvas_repaint (_tmp4_);
-#line 827 "StraightenTool.c"
+#line 828 "StraightenTool.c"
 	}
 }
 
@@ -855,7 +856,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = TRUE;
-#line 859 "StraightenTool.c"
+#line 860 "StraightenTool.c"
 	} else {
 		GdkEventKey* _tmp5_;
 		guint _tmp6_;
@@ -868,13 +869,13 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 872 "StraightenTool.c"
+#line 873 "StraightenTool.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_) {
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp0_ = TRUE;
-#line 878 "StraightenTool.c"
+#line 879 "StraightenTool.c"
 	} else {
 		GdkEventKey* _tmp8_;
 		guint _tmp9_;
@@ -887,7 +888,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 891 "StraightenTool.c"
+#line 892 "StraightenTool.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
@@ -897,7 +898,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		result = TRUE;
 #line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 901 "StraightenTool.c"
+#line 902 "StraightenTool.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = event;
@@ -913,7 +914,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		result = TRUE;
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 917 "StraightenTool.c"
+#line 918 "StraightenTool.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = event;
@@ -923,7 +924,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 	result = _tmp15_;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 927 "StraightenTool.c"
+#line 928 "StraightenTool.c"
 }
 
 
@@ -932,35 +933,35 @@ static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2)
 	if (s1 == s2) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return TRUE;
-#line 936 "StraightenTool.c"
+#line 937 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == NULL) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 942 "StraightenTool.c"
+#line 943 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s2 == NULL) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 948 "StraightenTool.c"
+#line 949 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->width != s2->width) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 954 "StraightenTool.c"
+#line 955 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->height != s2->height) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 960 "StraightenTool.c"
+#line 961 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return TRUE;
-#line 964 "StraightenTool.c"
+#line 965 "StraightenTool.c"
 }
 
 
@@ -991,24 +992,15 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	cairo_t* _tmp34_;
 	cairo_t* _tmp35_;
 	GdkPixbuf* _tmp36_;
-	cairo_t* _tmp37_;
-	GdkPixbuf* _tmp38_;
+	gint _tmp37_;
+	gdouble _tmp38_;
 	gint _tmp39_;
-	gint _tmp40_;
-	GdkPixbuf* _tmp41_;
+	gdouble _tmp40_;
+	gint _tmp41_;
 	gint _tmp42_;
-	gint _tmp43_;
-	cairo_t* _tmp44_;
+	cairo_surface_t* _tmp43_;
+	cairo_surface_t* _tmp44_;
 	cairo_t* _tmp45_;
-	gint _tmp46_;
-	gdouble _tmp47_;
-	gint _tmp48_;
-	gdouble _tmp49_;
-	gint _tmp50_;
-	gint _tmp51_;
-	cairo_surface_t* _tmp52_;
-	cairo_surface_t* _tmp53_;
-	cairo_t* _tmp54_;
 	GError * _inner_error_ = NULL;
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
@@ -1030,7 +1022,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) {
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 1034 "StraightenTool.c"
+#line 1026 "StraightenTool.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = viewport;
@@ -1038,7 +1030,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	self->priv->last_viewport = _tmp5_;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	low_res_tmp = NULL;
-#line 1042 "StraightenTool.c"
+#line 1034 "StraightenTool.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp7_;
@@ -1069,8 +1061,8 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		_tmp6_ = _tmp13_;
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1073 "StraightenTool.c"
-			goto __catch23_g_error;
+#line 1065 "StraightenTool.c"
+			goto __catch27_g_error;
 		}
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp14_ = _tmp6_;
@@ -1082,10 +1074,10 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		low_res_tmp = _tmp14_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1086 "StraightenTool.c"
+#line 1078 "StraightenTool.c"
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
 		EditingToolsPhotoCanvas* _tmp15_;
@@ -1122,9 +1114,9 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		low_res_tmp = _tmp20_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_error_free0 (e);
-#line 1126 "StraightenTool.c"
+#line 1118 "StraightenTool.c"
 	}
-	__finally23:
+	__finally27:
 #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"
@@ -1135,7 +1127,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		g_clear_error (&_inner_error_);
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 1139 "StraightenTool.c"
+#line 1131 "StraightenTool.c"
 	}
 #line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = low_res_tmp;
@@ -1178,66 +1170,42 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = low_res_tmp;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gdk_cairo_set_source_pixbuf (_tmp35_, _tmp36_, (gdouble) 0, (gdouble) 0);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp37_ = ctx;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp38_ = low_res_tmp;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp39_ = gdk_pixbuf_get_width (_tmp38_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp40_ = _tmp39_;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp41_ = low_res_tmp;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp42_ = gdk_pixbuf_get_height (_tmp41_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp43_ = _tmp42_;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp44_ = ctx;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_fill (_tmp44_);
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp45_ = ctx;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_paint (_tmp45_);
+	paint_pixmap_with_background (_tmp35_, _tmp36_, 0, 0);
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp37_ = self->priv->crop_width;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp38_ = self->priv->preview_scale;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	self->priv->view_width = (gint) (_tmp37_ * _tmp38_);
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp39_ = self->priv->crop_height;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp40_ = self->priv->preview_scale;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	self->priv->view_height = (gint) (_tmp39_ * _tmp40_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp41_ = self->priv->view_width;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp42_ = self->priv->view_height;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp43_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp41_, _tmp42_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_cairo_surface_destroy0 (self->priv->rotate_surf);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	self->priv->rotate_surf = _tmp43_;
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp46_ = self->priv->crop_width;
+	_tmp44_ = self->priv->rotate_surf;
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp47_ = self->priv->preview_scale;
+	_tmp45_ = cairo_create (_tmp44_);
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->view_width = (gint) (_tmp46_ * _tmp47_);
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp48_ = self->priv->crop_height;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp49_ = self->priv->preview_scale;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->view_height = (gint) (_tmp48_ * _tmp49_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp50_ = self->priv->view_width;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp51_ = self->priv->view_height;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp52_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp50_, _tmp51_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_surface_destroy0 (self->priv->rotate_surf);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotate_surf = _tmp52_;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp53_ = self->priv->rotate_surf;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp54_ = cairo_create (_tmp53_);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (self->priv->rotate_ctx);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotate_ctx = _tmp54_;
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	self->priv->rotate_ctx = _tmp45_;
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (ctx);
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (low_res_tmp);
-#line 1241 "StraightenTool.c"
+#line 1209 "StraightenTool.c"
 }
 
 
@@ -1271,75 +1239,75 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
 	Dimensions _tmp22_;
 	gint _tmp23_;
 	gint _tmp24_;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->crop_width;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->crop_height;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->photo_angle;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	compute_arb_rotated_size ((gdouble) _tmp0_, (gdouble) _tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	width = _tmp3_;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	height = _tmp4_;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->image_dims;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_.width;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->image_dims;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_.height;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height);
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_scale = _tmp9_;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->rotate_scale;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = MIN (_tmp10_, 1.0);
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_scale = _tmp11_;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = self->priv->crop_center;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center = _tmp12_;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = self->priv->rotate_scale;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	radius_x = (gint) ((_tmp13_ * width) / 2);
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->rotate_scale;
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	radius_y = (gint) ((_tmp14_ * height) / 2);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = self->priv->rotated_center;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = _tmp15_.x;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = self->priv->image_dims;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = _tmp17_.width;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center.x = _tmp19_;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = self->priv->rotated_center;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = _tmp20_.y;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = self->priv->image_dims;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = _tmp22_.height;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center.y = _tmp24_;
-#line 1343 "StraightenTool.c"
+#line 1311 "StraightenTool.c"
 }
 
 
@@ -1351,16 +1319,16 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
      * @param canvas The PhotoCanvas the tool's output should be painted to.
      */
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 1357 "StraightenTool.c"
+#line 1325 "StraightenTool.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1364 "StraightenTool.c"
+#line 1332 "StraightenTool.c"
 }
 
 
@@ -1417,194 +1385,194 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
 	EditingToolsStraightenToolStraightenToolWindow* _tmp46_;
 	GtkLabel* _tmp47_;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp48_;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = canvas;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = canvas;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->image_dims = _tmp7_;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp6_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = canvas;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = _tmp9_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	crop_region = _tmp11_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = !_tmp12_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp10_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp13_) {
-#line 1469 "StraightenTool.c"
+#line 1437 "StraightenTool.c"
 		Dimensions _tmp14_;
 		gint _tmp15_;
 		Dimensions _tmp16_;
 		gint _tmp17_;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.left = 0;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp14_ = self->priv->image_dims;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp15_ = _tmp14_.width;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.right = _tmp15_;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.top = 0;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp16_ = self->priv->image_dims;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp17_ = _tmp16_.height;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.bottom = _tmp17_;
-#line 1490 "StraightenTool.c"
+#line 1458 "StraightenTool.c"
 	}
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	incoming_angle = 0.0;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = canvas;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = _tmp19_;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	photo_get_straighten (_tmp20_, &_tmp21_);
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	incoming_angle = _tmp21_;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp20_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	box_get_center (&crop_region, &_tmp22_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = self->priv->image_dims;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = _tmp23_.width;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = self->priv->image_dims;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = _tmp25_.height;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = incoming_angle;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_center = _tmp28_;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = box_get_width (&crop_region);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_width = _tmp29_;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = box_get_height (&crop_region);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_height = _tmp30_;
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 359 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = canvas;
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_);
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	drawing_window = _tmp32_;
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = gdk_window_get_display (drawing_window);
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	display = _tmp34_;
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cursor = _tmp35_;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gdk_window_set_cursor (drawing_window, cursor);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = canvas;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = _tmp37_;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_object_ref_sink (_tmp39_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (self->priv->window);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->window = _tmp39_;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp38_);
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_bind_window_handlers (self);
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp40_ = self->priv->window;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp41_ = _tmp40_->angle_slider;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp42_ = incoming_angle;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_);
-#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp43_ = incoming_angle;
-#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_angle = _tmp43_;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp44_ = incoming_angle;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_);
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	tmp = _tmp45_;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp46_ = self->priv->window;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp47_ = _tmp46_->angle_label;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_label_set_text (_tmp47_, tmp);
-#line 381 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp48_ = self->priv->window;
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (cursor);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (display);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (drawing_window);
-#line 1608 "StraightenTool.c"
+#line 1576 "StraightenTool.c"
 }
 
 
@@ -1615,122 +1583,122 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp2_;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 385 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_ != NULL) {
-#line 1625 "StraightenTool.c"
+#line 1593 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_window_handlers (self);
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = self->priv->window;
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (self->priv->window);
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		self->priv->window = NULL;
-#line 1637 "StraightenTool.c"
+#line 1605 "StraightenTool.c"
 	}
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp2_ != NULL) {
-#line 1643 "StraightenTool.c"
+#line 1611 "StraightenTool.c"
 		EditingToolsPhotoCanvas* _tmp3_;
 		EditingToolsPhotoCanvas* _tmp4_;
 		GdkWindow* _tmp5_;
 		GdkWindow* _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_canvas_handlers (self, _tmp3_);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp6_ = _tmp5_;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		gdk_window_set_cursor (_tmp6_, NULL);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1662 "StraightenTool.c"
+#line 1630 "StraightenTool.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1666 "StraightenTool.c"
+#line 1634 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position);
-#line 1673 "StraightenTool.c"
+#line 1641 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1687 "StraightenTool.c"
+#line 1655 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_;
 	guint _tmp1_;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1704 "StraightenTool.c"
+#line 1672 "StraightenTool.c"
 }
 
 
 static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1713 "StraightenTool.c"
+#line 1681 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self);
-#line 1720 "StraightenTool.c"
+#line 1688 "StraightenTool.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 1727 "StraightenTool.c"
+#line 1695 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self);
-#line 1734 "StraightenTool.c"
+#line 1702 "StraightenTool.c"
 }
 
 
@@ -1742,31 +1710,31 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra
 	GtkButton* _tmp4_;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
 	GtkScale* _tmp6_;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->window;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _tmp1_->ok_button;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->window;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->cancel_button;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->window;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_->angle_slider;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1770 "StraightenTool.c"
+#line 1738 "StraightenTool.c"
 }
 
 
@@ -1782,46 +1750,46 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt
 	EditingToolsStraightenToolStraightenToolWindow* _tmp8_;
 	GtkScale* _tmp9_;
 	guint _tmp10_;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->window;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = _tmp2_->ok_button;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->window;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_->cancel_button;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = self->priv->window;
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = _tmp8_->angle_slider;
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE);
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1818 "StraightenTool.c"
+#line 1786 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) {
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self);
-#line 1825 "StraightenTool.c"
+#line 1793 "StraightenTool.c"
 }
 
 
@@ -1840,65 +1808,65 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
 	OneShotScheduler* _tmp10_;
 	OneShotScheduler* _tmp12_;
 	EditingToolsPhotoCanvas* _tmp13_;
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = _tmp0_->angle_slider;
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_angle = _tmp2_;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->window;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->angle_slider;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_);
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	tmp = _tmp6_;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->window;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_->angle_label;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = tmp;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_label_set_text (_tmp8_, _tmp9_);
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->slider_sched;
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp10_ == NULL) {
-#line 1876 "StraightenTool.c"
+#line 1844 "StraightenTool.c"
 		OneShotScheduler* _tmp11_;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_one_shot_scheduler_unref0 (self->priv->slider_sched);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		self->priv->slider_sched = _tmp11_;
-#line 1884 "StraightenTool.c"
+#line 1852 "StraightenTool.c"
 	}
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = self->priv->slider_sched;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE);
-#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->use_high_qual = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_update_rotated_surface (self);
-#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_repaint (_tmp13_);
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
-#line 1902 "StraightenTool.c"
+#line 1870 "StraightenTool.c"
 }
 
 
@@ -1906,17 +1874,17 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
      * @brief Called by the EditingHostPage when a resize event occurs.
      */
 static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
-#line 1920 "StraightenTool.c"
+#line 1888 "StraightenTool.c"
 }
 
 
@@ -1929,17 +1897,17 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = _tmp1_;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1943 "StraightenTool.c"
+#line 1911 "StraightenTool.c"
 }
 
 
@@ -1956,33 +1924,33 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
 	cairo_t* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->photo_surf;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->rotate_ctx;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->view_width;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->view_height;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = self->priv->photo_angle;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_draw_rotated_source (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->rotate_ctx;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_line_width (_tmp5_, 1.0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = self->priv->rotate_ctx;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->view_width;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = self->priv->view_height;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1986 "StraightenTool.c"
+#line 1954 "StraightenTool.c"
 }
 
 
@@ -2046,161 +2014,161 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
 	EditingToolsPhotoCanvas* _tmp46_;
 	cairo_t* _tmp47_;
 	cairo_t* _tmp48_;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (ctx != NULL);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _tmp1_;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp2_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	w = _tmp4_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = _tmp6_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = _tmp8_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp7_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	h = _tmp9_;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_);
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = _tmp11_;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp12_);
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp12_);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = _tmp14_;
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp15_);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = _tmp17_;
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp18_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = _tmp20_;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp21_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp21_);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = _tmp23_;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = self->priv->view_width;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = self->priv->view_height;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp24_);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = _tmp28_;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = self->priv->rotate_surf;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp29_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = _tmp32_;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = self->priv->view_width;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = self->priv->view_height;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp33_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = _tmp37_;
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp38_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp38_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp41_ = _tmp40_;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_paint (_tmp41_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp41_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp44_ = _tmp43_;
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp44_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp44_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp45_ = self->priv->guide;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp48_ = _tmp47_;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp48_);
-#line 2204 "StraightenTool.c"
+#line 2172 "StraightenTool.c"
 }
 
 
@@ -2251,121 +2219,121 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
 	gint _tmp32_;
 	cairo_t* _tmp33_;
 	cairo_t* _tmp34_;
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (src_surf != NULL);
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = angle;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = degrees_to_radians (_tmp0_);
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	angle_internal = _tmp1_;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = dest_ctx;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp2_);
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = dest_ctx;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0);
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = dest_ctx;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->view_width;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = self->priv->view_height;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = dest_ctx;
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp7_);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = dest_ctx;
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp8_);
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = dest_ctx;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->view_width;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = self->priv->view_height;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2));
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = dest_ctx;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = self->priv->rotate_scale;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->rotate_scale;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_);
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = dest_ctx;
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = angle_internal;
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rotate (_tmp15_, _tmp16_);
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = dest_ctx;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = self->priv->rotated_center;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = _tmp18_.x;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = self->priv->preview_scale;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = self->priv->rotated_center;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = _tmp21_.y;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = self->priv->preview_scale;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_);
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = dest_ctx;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = src_surf;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0);
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = self->priv->use_high_qual;
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp27_) {
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp26_ = CAIRO_FILTER_BEST;
-#line 2341 "StraightenTool.c"
+#line 2309 "StraightenTool.c"
 	} else {
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp26_ = CAIRO_FILTER_NEAREST;
-#line 2345 "StraightenTool.c"
+#line 2313 "StraightenTool.c"
 	}
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = dest_ctx;
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = cairo_get_source (_tmp28_);
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_pattern_set_filter (_tmp29_, _tmp26_);
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = dest_ctx;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = src_width;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = src_height;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = dest_ctx;
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp33_);
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = dest_ctx;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_paint (_tmp34_);
-#line 2369 "StraightenTool.c"
+#line 2337 "StraightenTool.c"
 }
 
 
@@ -2420,123 +2388,123 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt
 	EditingToolsPhotoCanvas* _tmp36_;
 	cairo_t* _tmp37_;
 	gint _tmp38_;
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = width;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	half_width = _tmp0_ / 2;
-#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = width;
-#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	quarter_width = _tmp1_ / 4;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = height;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	half_height = _tmp2_ / 2;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = height;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	quarter_height = _tmp3_ / 4;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = dest_ctx;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp4_);
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = dest_ctx;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0);
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = dest_ctx;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = width;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE);
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = dest_ctx;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = width;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE);
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = dest_ctx;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->view_height;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = width;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE);
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = dest_ctx;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = height;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE);
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = dest_ctx;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = height;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE);
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = dest_ctx;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = width;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = height;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE);
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = dest_ctx;
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33);
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = dest_ctx;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = width;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE);
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = dest_ctx;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = width;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE);
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = dest_ctx;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = height;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE);
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = dest_ctx;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = height;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE);
-#line 2540 "StraightenTool.c"
+#line 2508 "StraightenTool.c"
 }
 
 
@@ -2576,7 +2544,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt
 	_tmp6_ = angle;
 #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->angle0 = _tmp6_;
-#line 2580 "StraightenTool.c"
+#line 2548 "StraightenTool.c"
 }
 
 
@@ -2589,7 +2557,7 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 	_tmp0_ = self->priv->is_active;
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
-#line 2593 "StraightenTool.c"
+#line 2561 "StraightenTool.c"
 		gint _tmp1_;
 		gint _tmp2_;
 		gint _tmp3_;
@@ -2610,13 +2578,13 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 		result = TRUE;
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2614 "StraightenTool.c"
+#line 2582 "StraightenTool.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = FALSE;
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 2620 "StraightenTool.c"
+#line 2588 "StraightenTool.c"
 }
 
 
@@ -2625,7 +2593,7 @@ static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsSt
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->is_active = FALSE;
-#line 2629 "StraightenTool.c"
+#line 2597 "StraightenTool.c"
 }
 
 
@@ -2637,14 +2605,14 @@ static gdouble* _double_dup (gdouble* self) {
 	memcpy (dup, self, sizeof (gdouble));
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return dup;
-#line 2641 "StraightenTool.c"
+#line 2609 "StraightenTool.c"
 }
 
 
 static gpointer __double_dup0 (gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? _double_dup (self) : NULL;
-#line 2648 "StraightenTool.c"
+#line 2616 "StraightenTool.c"
 }
 
 
@@ -2692,7 +2660,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = NULL;
 #line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2696 "StraightenTool.c"
+#line 2664 "StraightenTool.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = dy;
@@ -2704,7 +2672,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 	_tmp11_ = fabs (_tmp10_);
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_ > _tmp11_) {
-#line 2708 "StraightenTool.c"
+#line 2676 "StraightenTool.c"
 		gdouble _tmp12_;
 		gdouble _tmp13_;
 		gdouble _tmp14_;
@@ -2727,7 +2695,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = _tmp17_;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2731 "StraightenTool.c"
+#line 2699 "StraightenTool.c"
 	} else {
 		gdouble _tmp18_;
 		gdouble _tmp19_;
@@ -2751,7 +2719,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = _tmp23_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2755 "StraightenTool.c"
+#line 2723 "StraightenTool.c"
 	}
 }
 
@@ -2800,7 +2768,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (!_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2804 "StraightenTool.c"
+#line 2772 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self);
@@ -2808,7 +2776,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	_tmp1_ = _tmp2_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_ == NULL) {
-#line 2812 "StraightenTool.c"
+#line 2780 "StraightenTool.c"
 		gdouble _tmp3_;
 		gdouble* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2819,7 +2787,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = _tmp4_;
-#line 2823 "StraightenTool.c"
+#line 2791 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = _tmp1_;
@@ -2841,7 +2809,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2845 "StraightenTool.c"
+#line 2813 "StraightenTool.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	alpha = 1.0;
@@ -2851,20 +2819,20 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) {
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = TRUE;
-#line 2855 "StraightenTool.c"
+#line 2823 "StraightenTool.c"
 	} else {
 		gdouble _tmp11_;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = angle;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE;
-#line 2862 "StraightenTool.c"
+#line 2830 "StraightenTool.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_) {
 #line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		alpha = 0.35;
-#line 2868 "StraightenTool.c"
+#line 2836 "StraightenTool.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = ctx;
@@ -2932,7 +2900,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	cairo_stroke (_tmp33_);
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (_tmp1_);
-#line 2936 "StraightenTool.c"
+#line 2904 "StraightenTool.c"
 }
 
 
@@ -2942,21 +2910,21 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_
 	self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 2946 "StraightenTool.c"
+#line 2914 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE);
-#line 2953 "StraightenTool.c"
+#line 2921 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	value->data[0].v_pointer = NULL;
-#line 2960 "StraightenTool.c"
+#line 2928 "StraightenTool.c"
 }
 
 
@@ -2965,7 +2933,7 @@ static void editing_tools_straighten_tool_value_straighten_guide_free_value (GVa
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer);
-#line 2969 "StraightenTool.c"
+#line 2937 "StraightenTool.c"
 	}
 }
 
@@ -2975,11 +2943,11 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer);
-#line 2979 "StraightenTool.c"
+#line 2947 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2983 "StraightenTool.c"
+#line 2951 "StraightenTool.c"
 	}
 }
 
@@ -2987,37 +2955,37 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
 static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 2991 "StraightenTool.c"
+#line 2959 "StraightenTool.c"
 }
 
 
 static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (collect_values[0].v_pointer) {
-#line 2998 "StraightenTool.c"
+#line 2966 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenGuide * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3005 "StraightenTool.c"
+#line 2973 "StraightenTool.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3009 "StraightenTool.c"
+#line 2977 "StraightenTool.c"
 		}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object);
-#line 3013 "StraightenTool.c"
+#line 2981 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3017 "StraightenTool.c"
+#line 2985 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 3021 "StraightenTool.c"
+#line 2989 "StraightenTool.c"
 }
 
 
@@ -3028,25 +2996,25 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3032 "StraightenTool.c"
+#line 3000 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = NULL;
-#line 3038 "StraightenTool.c"
+#line 3006 "StraightenTool.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3042 "StraightenTool.c"
+#line 3010 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3046 "StraightenTool.c"
+#line 3014 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 3050 "StraightenTool.c"
+#line 3018 "StraightenTool.c"
 }
 
 
@@ -3060,7 +3028,7 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return G_PARAM_SPEC (spec);
-#line 3064 "StraightenTool.c"
+#line 3032 "StraightenTool.c"
 }
 
 
@@ -3069,7 +3037,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 3073 "StraightenTool.c"
+#line 3041 "StraightenTool.c"
 }
 
 
@@ -3089,17 +3057,17 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3093 "StraightenTool.c"
+#line 3061 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3097 "StraightenTool.c"
+#line 3065 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3103 "StraightenTool.c"
+#line 3071 "StraightenTool.c"
 	}
 }
 
@@ -3118,17 +3086,17 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = v_object;
-#line 3122 "StraightenTool.c"
+#line 3090 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3126 "StraightenTool.c"
+#line 3094 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3132 "StraightenTool.c"
+#line 3100 "StraightenTool.c"
 	}
 }
 
@@ -3140,7 +3108,7 @@ static void editing_tools_straighten_tool_straighten_guide_class_init (EditingTo
 	((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate));
-#line 3144 "StraightenTool.c"
+#line 3112 "StraightenTool.c"
 }
 
 
@@ -3151,7 +3119,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin
 	self->priv->is_active = FALSE;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->ref_count = 1;
-#line 3155 "StraightenTool.c"
+#line 3123 "StraightenTool.c"
 }
 
 
@@ -3161,7 +3129,7 @@ static void editing_tools_straighten_tool_straighten_guide_finalize (EditingTool
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_destroy (self);
-#line 3165 "StraightenTool.c"
+#line 3133 "StraightenTool.c"
 }
 
 
@@ -3186,7 +3154,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return instance;
-#line 3190 "StraightenTool.c"
+#line 3158 "StraightenTool.c"
 }
 
 
@@ -3199,7 +3167,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
 		EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3203 "StraightenTool.c"
+#line 3171 "StraightenTool.c"
 	}
 }
 
@@ -3212,7 +3180,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
 static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self);
-#line 3216 "StraightenTool.c"
+#line 3184 "StraightenTool.c"
 }
 
 
@@ -3380,14 +3348,14 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 	_g_object_unref0 (slider_layout);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 3384 "StraightenTool.c"
+#line 3352 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) {
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container);
-#line 3391 "StraightenTool.c"
+#line 3359 "StraightenTool.c"
 }
 
 
@@ -3399,7 +3367,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicke
 	_tmp0_ = self->angle_slider;
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 3403 "StraightenTool.c"
+#line 3371 "StraightenTool.c"
 }
 
 
@@ -3408,7 +3376,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi
 	editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize;
-#line 3412 "StraightenTool.c"
+#line 3380 "StraightenTool.c"
 }
 
 
@@ -3455,7 +3423,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init (
 	g_object_ref_sink (_tmp5_);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->reset_button = _tmp5_;
-#line 3459 "StraightenTool.c"
+#line 3427 "StraightenTool.c"
 }
 
 
@@ -3477,7 +3445,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje
 	_g_object_unref0 (self->reset_button);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj);
-#line 3481 "StraightenTool.c"
+#line 3449 "StraightenTool.c"
 }
 
 
@@ -3516,7 +3484,7 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint;
-#line 3520 "StraightenTool.c"
+#line 3488 "StraightenTool.c"
 }
 
 
@@ -3534,7 +3502,7 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT
 	_tmp0_ = editing_tools_straighten_tool_straighten_guide_new ();
 #line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->guide = _tmp0_;
-#line 3538 "StraightenTool.c"
+#line 3506 "StraightenTool.c"
 }
 
 
@@ -3556,7 +3524,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob
 	_editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide);
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj);
-#line 3560 "StraightenTool.c"
+#line 3528 "StraightenTool.c"
 }
 
 
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index 5c0eb98..023b636 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -292,10 +292,7 @@ public class StraightenTool : EditingTool {
         // copy image data from photo into a cairo surface.
         photo_surf = new Cairo.ImageSurface(Cairo.Format.ARGB32, low_res_tmp.width, low_res_tmp.height);
         Cairo.Context ctx = new Cairo.Context(photo_surf);
-        Gdk.cairo_set_source_pixbuf(ctx, low_res_tmp, 0, 0);
-        ctx.rectangle(0, 0, low_res_tmp.width, low_res_tmp.height);
-        ctx.fill();
-        ctx.paint();
+        paint_pixmap_with_background(ctx, low_res_tmp, 0, 0);
 
         // prepare rotation surface and context. we paint a rotated,
         // low-res copy of the image into it, followed by a faint grid.
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index fd09328..5141809 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -415,8 +415,8 @@ GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling,
 void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable);
 GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
 #define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER
-static void ___lambda17_ (void);
-static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self);
+static void ___lambda19_ (void);
+static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self);
 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;
@@ -656,13 +656,13 @@ static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRe
 }
 
 
-static void ___lambda17_ (void) {
+static void ___lambda19_ (void) {
 }
 
 
-static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
+static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-	___lambda17_ ();
+	___lambda19_ ();
 #line 667 "EventDirectoryItem.c"
 }
 
@@ -721,7 +721,7 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe
 #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 724 "EventDirectoryItem.c"
-			goto __catch52_g_error;
+			goto __catch58_g_error;
 		}
 #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp4_ = _tmp0_;
@@ -735,8 +735,8 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe
 		_g_object_unref0 (_tmp0_);
 #line 737 "EventDirectoryItem.c"
 	}
-	goto __finally52;
-	__catch52_g_error:
+	goto __finally58;
+	__catch58_g_error:
 	{
 		GError* _error_ = NULL;
 		MediaSource* _tmp5_;
@@ -751,7 +751,7 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		dimensions_init (&_tmp6_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG);
 #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
-		thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda17__thumbnail_cache_async_fetch_callback, NULL, NULL);
+		thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda19__thumbnail_cache_async_fetch_callback, NULL, NULL);
 #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_tmp7_ = media;
 #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -786,7 +786,7 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe
 #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 				_g_error_free0 (_error_);
 #line 789 "EventDirectoryItem.c"
-				goto __finally52;
+				goto __finally58;
 			}
 #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_tmp14_ = _tmp10_;
@@ -813,13 +813,13 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe
 #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			_g_error_free0 (_error_);
 #line 816 "EventDirectoryItem.c"
-			goto __finally52;
+			goto __finally58;
 		}
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		_g_error_free0 (_error_);
 #line 821 "EventDirectoryItem.c"
 	}
-	__finally52:
+	__finally58:
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1278,7 +1278,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1281 "EventDirectoryItem.c"
-			goto __catch53_g_error;
+			goto __catch59_g_error;
 		}
 #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
@@ -1286,8 +1286,8 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_object_unref0 (_tmp1_);
 #line 1288 "EventDirectoryItem.c"
 	}
-	goto __finally53;
-	__catch53_g_error:
+	goto __finally59;
+	__catch59_g_error:
 	{
 		GError* err = NULL;
 		Event* _tmp8_;
@@ -1317,7 +1317,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_error_free0 (err);
 #line 1319 "EventDirectoryItem.c"
 	}
-	__finally53:
+	__finally59:
 #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1444,7 +1444,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1447 "EventDirectoryItem.c"
-				goto __catch54_g_error;
+				goto __catch60_g_error;
 			}
 #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
@@ -1452,8 +1452,8 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_object_unref0 (_tmp5_);
 #line 1454 "EventDirectoryItem.c"
 		}
-		goto __finally54;
-		__catch54_g_error:
+		goto __finally60;
+		__catch60_g_error:
 		{
 			GError* err = NULL;
 			Event* _tmp9_;
@@ -1483,7 +1483,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_error_free0 (err);
 #line 1485 "EventDirectoryItem.c"
 		}
-		__finally54:
+		__finally60:
 #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 7b747fc..d701b8e 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -838,7 +838,6 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 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);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
 void page_update_actions (Page* self, gint selected_count, gint count);
 static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
@@ -937,35 +936,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 941 "EventPage.c"
+#line 940 "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 948 "EventPage.c"
+#line 947 "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 955 "EventPage.c"
+#line 954 "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 962 "EventPage.c"
+#line 961 "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 969 "EventPage.c"
+#line 968 "EventPage.c"
 }
 
 
@@ -974,7 +973,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 978 "EventPage.c"
+#line 977 "EventPage.c"
 }
 
 
@@ -1027,14 +1026,14 @@ EventPage* event_page_construct (GType object_type, Event* page_event) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1031 "EventPage.c"
+#line 1030 "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 1038 "EventPage.c"
+#line 1037 "EventPage.c"
 }
 
 
@@ -1052,7 +1051,7 @@ Event* event_page_get_event (EventPage* self) {
 	result = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1056 "EventPage.c"
+#line 1055 "EventPage.c"
 }
 
 
@@ -1076,7 +1075,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 1080 "EventPage.c"
+#line 1079 "EventPage.c"
 		ViewCollection* _tmp3_;
 		ViewCollection* _tmp4_;
 		gint _tmp5_;
@@ -1097,7 +1096,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 1101 "EventPage.c"
+#line 1100 "EventPage.c"
 		}
 	}
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1108,7 +1107,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 1112 "EventPage.c"
+#line 1111 "EventPage.c"
 }
 
 
@@ -1128,7 +1127,7 @@ 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 1132 "EventPage.c"
+#line 1131 "EventPage.c"
 }
 
 
@@ -1148,7 +1147,7 @@ static void event_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
-#line 1152 "EventPage.c"
+#line 1151 "EventPage.c"
 }
 
 
@@ -1163,7 +1162,7 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 	_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"
+#line 1166 "EventPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1175,11 +1174,11 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 		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"
+#line 1178 "EventPage.c"
 			GActionEntry entry = {0};
 #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			entry = entry_collection[entry_it];
-#line 1183 "EventPage.c"
+#line 1182 "EventPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1192,7 +1191,7 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1196 "EventPage.c"
+#line 1195 "EventPage.c"
 			}
 		}
 	}
@@ -1211,7 +1210,7 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 	_tmp1_ = count;
 #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 1215 "EventPage.c"
+#line 1214 "EventPage.c"
 }
 
 
@@ -1227,7 +1226,7 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
 #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 77 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
 #line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = selected_count;
 #line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1236,7 +1235,7 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
 	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 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 1240 "EventPage.c"
+#line 1239 "EventPage.c"
 }
 
 
@@ -1266,13 +1265,13 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	if (sort_order) {
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1270 "EventPage.c"
+#line 1269 "EventPage.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
 #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1276 "EventPage.c"
+#line 1275 "EventPage.c"
 	}
 }
 
@@ -1297,7 +1296,7 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1301 "EventPage.c"
+#line 1300 "EventPage.c"
 }
 
 
@@ -1317,7 +1316,7 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 	_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp2_) {
-#line 1321 "EventPage.c"
+#line 1320 "EventPage.c"
 		Event* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
@@ -1331,7 +1330,7 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
 #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp5_);
-#line 1335 "EventPage.c"
+#line 1334 "EventPage.c"
 	}
 }
 
@@ -1356,7 +1355,7 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 	_data_collection_unref0 (_tmp1_);
 #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 1360 "EventPage.c"
+#line 1359 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
 		Event* _tmp4_;
 		gchar* _tmp5_;
@@ -1404,7 +1403,7 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 			_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return;
-#line 1408 "EventPage.c"
+#line 1407 "EventPage.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp12_ = self->priv->page_event;
@@ -1432,11 +1431,11 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1436 "EventPage.c"
+#line 1435 "EventPage.c"
 	}
 #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 1440 "EventPage.c"
+#line 1439 "EventPage.c"
 }
 
 
@@ -1468,7 +1467,7 @@ static void event_page_on_make_primary (EventPage* self) {
 	if (_tmp3_) {
 #line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1472 "EventPage.c"
+#line 1471 "EventPage.c"
 	}
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = self->priv->page_event;
@@ -1492,7 +1491,7 @@ static void event_page_on_make_primary (EventPage* self) {
 	_g_object_unref0 (_tmp8_);
 #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1496 "EventPage.c"
+#line 1495 "EventPage.c"
 }
 
 
@@ -1512,7 +1511,7 @@ static void event_page_on_rename (EventPage* self) {
 	library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
 #line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1516 "EventPage.c"
+#line 1515 "EventPage.c"
 }
 
 
@@ -1541,14 +1540,14 @@ static void event_page_class_init (EventPageClass * klass) {
 	((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) 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 1545 "EventPage.c"
+#line 1544 "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 1552 "EventPage.c"
+#line 1551 "EventPage.c"
 }
 
 
@@ -1578,7 +1577,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 1582 "EventPage.c"
+#line 1581 "EventPage.c"
 }
 
 
@@ -1652,14 +1651,14 @@ NoEventPage* no_event_page_construct (GType object_type) {
 	_view_manager_unref0 (filter);
 #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1656 "EventPage.c"
+#line 1655 "EventPage.c"
 }
 
 
 NoEventPage* no_event_page_new (void) {
 #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1663 "EventPage.c"
+#line 1662 "EventPage.c"
 }
 
 
@@ -1689,13 +1688,13 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	if (sort_order) {
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1693 "EventPage.c"
+#line 1692 "EventPage.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
 #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1699 "EventPage.c"
+#line 1698 "EventPage.c"
 	}
 }
 
@@ -1720,7 +1719,7 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1724 "EventPage.c"
+#line 1723 "EventPage.c"
 }
 
 
@@ -1735,14 +1734,14 @@ static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_constr
 	self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1739 "EventPage.c"
+#line 1738 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
 #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 1746 "EventPage.c"
+#line 1745 "EventPage.c"
 }
 
 
@@ -1767,7 +1766,7 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 	if (_tmp3_ != EVENT_ID_INVALID) {
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = FALSE;
-#line 1771 "EventPage.c"
+#line 1770 "EventPage.c"
 	} else {
 		DataSource* _tmp4_;
 		gboolean _tmp5_;
@@ -1777,13 +1776,13 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 		_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 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1781 "EventPage.c"
+#line 1780 "EventPage.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	result = _tmp0_;
 #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1787 "EventPage.c"
+#line 1786 "EventPage.c"
 }
 
 
@@ -1792,7 +1791,7 @@ static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventVi
 	no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
-#line 1796 "EventPage.c"
+#line 1795 "EventPage.c"
 }
 
 
@@ -1826,7 +1825,7 @@ static void no_event_page_class_init (NoEventPageClass * klass) {
 	_tmp0_ = alteration_new ("metadata", "event");
 #line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_page_alteration = _tmp0_;
-#line 1830 "EventPage.c"
+#line 1829 "EventPage.c"
 }
 
 
@@ -1840,7 +1839,7 @@ static void no_event_page_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
 #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1844 "EventPage.c"
+#line 1843 "EventPage.c"
 }
 
 
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala
index 960eee8..a482ab8 100644
--- a/src/events/EventPage.vala
+++ b/src/events/EventPage.vala
@@ -74,7 +74,7 @@ public class EventPage : CollectionPage {
         set_action_sensitive("MakePrimary", selected_count == 1);
         
         // hide this command in CollectionPage, as it does not apply here
-        set_action_visible("CommonJumpToEvent", false);
+        set_action_sensitive("CommonJumpToEvent", false);
         
         base.update_actions(selected_count, count);
 
diff --git a/src/events/Branch.c b/src/events/EventsBranch.c
index 32d331d..17ff6eb 100644
--- a/src/events/Branch.c
+++ b/src/events/EventsBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* EventsBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from EventsBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -812,8 +812,8 @@ EventsMasterDirectoryEntry* events_master_directory_entry_new (void);
 EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type);
 EventsBranch* events_branch_new (void);
 EventsBranch* events_branch_construct (GType object_type);
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
@@ -875,12 +875,12 @@ static Block8Data* block8_data_ref (Block8Data* _data8_);
 static void block8_data_unref (void * _userdata_);
 static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
 SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry);
-static gboolean ___lambda19__locator (gconstpointer item, gpointer self);
+static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry);
+static gboolean ___lambda21__locator (gconstpointer item, gpointer self);
 static Block9Data* block9_data_ref (Block9Data* _data9_);
 static void block9_data_unref (void * _userdata_);
-static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry);
-static gboolean ___lambda18__locator (gconstpointer item, gpointer self);
+static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry);
+static gboolean ___lambda20__locator (gconstpointer item, gpointer self);
 gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
 static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
 EventsEventEntry* events_event_entry_new (Event* event);
@@ -991,39 +991,39 @@ GType no_event_page_get_type (void) G_GNUC_CONST;
 
 
 static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_on_events_added_removed ((EventsBranch*) self, added, removed);
-#line 997 "Branch.c"
+#line 997 "EventsBranch.c"
 }
 
 
 static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 47 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_on_events_altered ((EventsBranch*) self, items);
-#line 1004 "Branch.c"
+#line 1004 "EventsBranch.c"
 }
 
 
 static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self) {
-#line 48 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_on_no_event_collection_altered ((EventsBranch*) self);
-#line 1011 "Branch.c"
+#line 1011 "EventsBranch.c"
 }
 
 
 static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_on_config_changed ((EventsBranch*) self);
-#line 1018 "Branch.c"
+#line 1018 "EventsBranch.c"
 }
 
 
 static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = events_branch_event_year_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1027 "Branch.c"
+#line 1027 "EventsBranch.c"
 }
 
 
@@ -1044,25 +1044,25 @@ EventsBranch* events_branch_construct (GType object_type) {
 	EventSourceCollection* _tmp22_;
 	ConfigFacade* _tmp23_;
 	ConfigFacade* _tmp24_;
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp0_ = sidebar_header_new (_ ("Events"), TRUE);
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
+	_tmp0_ = sidebar_header_new (_ ("Events"), _ ("Browse through your events"), TRUE);
+#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL);
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = self->priv->all_events_entry;
-#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1066 "Branch.c"
+#line 1066 "EventsBranch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		EventSourceCollection* _tmp5_;
@@ -1070,101 +1070,101 @@ EventsBranch* events_branch_construct (GType object_type) {
 		GeeCollection* _tmp7_;
 		GeeIterator* _tmp8_;
 		GeeIterator* _tmp9_;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = event_global;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp7_ = _tmp6_;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp9_ = _tmp8_;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp7_);
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_object_it = _tmp9_;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		while (TRUE) {
-#line 1090 "Branch.c"
+#line 1090 "EventsBranch.c"
 			GeeIterator* _tmp10_;
 			gboolean _tmp11_;
 			DataObject* object = NULL;
 			GeeIterator* _tmp12_;
 			gpointer _tmp13_;
 			DataObject* _tmp14_;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp10_ = _object_it;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			if (!_tmp11_) {
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				break;
-#line 1105 "Branch.c"
+#line 1105 "EventsBranch.c"
 			}
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp12_ = _object_it;
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			object = (DataObject*) _tmp13_;
-#line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp14_ = object;
-#line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event));
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (object);
-#line 1119 "Branch.c"
+#line 1119 "EventsBranch.c"
 		}
-#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_object_it);
-#line 1123 "Branch.c"
+#line 1123 "EventsBranch.c"
 	}
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp15_ = event_global;
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp16_ = event_source_collection_get_no_event_objects (_tmp15_);
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp17_ = _tmp16_;
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp18_ = gee_collection_get_size (_tmp17_);
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp19_ = _tmp18_;
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_show_no_events (self, _tmp19_ > 0);
-#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp17_);
-#line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp20_ = event_global;
-#line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
-#line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp21_ = event_global;
-#line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
-#line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp22_ = event_global;
-#line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
-#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp23_ = config_facade_get_instance ();
-#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp24_ = _tmp23_;
-#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
-#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp24_);
-#line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 1161 "Branch.c"
+#line 1161 "EventsBranch.c"
 }
 
 
 EventsBranch* events_branch_new (void) {
-#line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_branch_construct (EVENTS_TYPE_BRANCH);
-#line 1168 "Branch.c"
+#line 1168 "EventsBranch.c"
 }
 
 
@@ -1172,17 +1172,17 @@ void events_branch_init (void) {
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_sort_ascending = _tmp2_;
-#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1186 "Branch.c"
+#line 1186 "EventsBranch.c"
 }
 
 
@@ -1192,20 +1192,20 @@ void events_branch_terminate (void) {
 
 gboolean events_branch_is_user_renameable (EventsBranch* self) {
 	gboolean result = FALSE;
-#line 60 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), FALSE);
-#line 61 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 62 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = TRUE;
-#line 61 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 62 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1202 "Branch.c"
+#line 1202 "EventsBranch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1209 "Branch.c"
+#line 1209 "EventsBranch.c"
 }
 
 
@@ -1213,17 +1213,17 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self)
 	EventsMasterDirectoryEntry* result = NULL;
 	EventsMasterDirectoryEntry* _tmp0_;
 	EventsMasterDirectoryEntry* _tmp1_;
-#line 64 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->all_events_entry;
-#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1227 "Branch.c"
+#line 1227 "EventsBranch.c"
 }
 
 
@@ -1241,159 +1241,159 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
 	SidebarEntry* _tmp17_;
 	gint _tmp18_;
 	gint _tmp19_;
-#line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 69 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = a;
-#line 69 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = b;
-#line 69 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 70 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 0;
-#line 70 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1259 "Branch.c"
+#line 1259 "EventsBranch.c"
 	}
-#line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = a;
-#line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1265 "Branch.c"
+#line 1265 "EventsBranch.c"
 		SidebarEntry* _tmp3_;
-#line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = b;
-#line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
-#line 76 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			result = -1;
-#line 76 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			return result;
-#line 1275 "Branch.c"
+#line 1275 "EventsBranch.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 1;
-#line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1281 "Branch.c"
+#line 1281 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp4_;
-#line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = b;
-#line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1288 "Branch.c"
+#line 1288 "EventsBranch.c"
 			SidebarEntry* _tmp5_;
-#line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp5_ = a;
-#line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
-#line 80 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				result = 1;
-#line 80 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				return result;
-#line 1298 "Branch.c"
+#line 1298 "EventsBranch.c"
 			}
-#line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			result = -1;
-#line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			return result;
-#line 1304 "Branch.c"
+#line 1304 "EventsBranch.c"
 		}
 	}
-#line 84 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = a;
-#line 84 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
-#line 85 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 1;
-#line 85 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1315 "Branch.c"
+#line 1315 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp7_;
-#line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp7_ = b;
-#line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
-#line 87 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			result = -1;
-#line 87 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			return result;
-#line 1326 "Branch.c"
+#line 1326 "EventsBranch.c"
 		}
 	}
-#line 90 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = a;
-#line 90 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
-#line 91 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = -1;
-#line 91 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1337 "Branch.c"
+#line 1337 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp9_;
-#line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp9_ = b;
-#line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
-#line 93 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			result = 1;
-#line 93 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			return result;
-#line 1348 "Branch.c"
+#line 1348 "EventsBranch.c"
 		}
 	}
-#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = events_branch_sort_ascending;
-#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp10_) {
-#line 1355 "Branch.c"
+#line 1355 "EventsBranch.c"
 		SidebarEntry* swap = NULL;
 		SidebarEntry* _tmp11_;
 		SidebarEntry* _tmp12_;
 		SidebarEntry* _tmp13_;
 		SidebarEntry* _tmp14_;
-#line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp11_ = a;
-#line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		swap = _tmp12_;
-#line 97 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp13_ = b;
-#line 97 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		a = _tmp13_;
-#line 98 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp14_ = swap;
-#line 98 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		b = _tmp14_;
-#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (swap);
-#line 1377 "Branch.c"
+#line 1377 "EventsBranch.c"
 	}
-#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp15_ = a;
-#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp16_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp17_ = b;
-#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp18_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_result_ = _tmp16_ - _tmp18_;
-#line 103 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp19_ = _result_;
-#line 103 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp19_ != 0, "result != 0");
-#line 105 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _result_;
-#line 105 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1397 "Branch.c"
+#line 1397 "EventsBranch.c"
 }
 
 
@@ -1408,69 +1408,69 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
 	SidebarEntry* _tmp9_;
 	gint _tmp10_;
 	gint _tmp11_;
-#line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 109 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = a;
-#line 109 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = b;
-#line 109 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 110 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 0;
-#line 110 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1426 "Branch.c"
+#line 1426 "EventsBranch.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = events_branch_sort_ascending;
-#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp2_) {
-#line 1432 "Branch.c"
+#line 1432 "EventsBranch.c"
 		SidebarEntry* swap = NULL;
 		SidebarEntry* _tmp3_;
 		SidebarEntry* _tmp4_;
 		SidebarEntry* _tmp5_;
 		SidebarEntry* _tmp6_;
-#line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = a;
-#line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		swap = _tmp4_;
-#line 114 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = b;
-#line 114 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		a = _tmp5_;
-#line 115 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = swap;
-#line 115 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		b = _tmp6_;
-#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (swap);
-#line 1454 "Branch.c"
+#line 1454 "EventsBranch.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = a;
-#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp9_ = b;
-#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_result_ = _tmp8_ - _tmp10_;
-#line 120 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp11_ = _result_;
-#line 120 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp11_ != 0, "result != 0");
-#line 122 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _result_;
-#line 122 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1474 "Branch.c"
+#line 1474 "EventsBranch.c"
 }
 
 
@@ -1493,79 +1493,79 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint64 _tmp27_;
 	gint _tmp28_ = 0;
 	gint64 _tmp29_;
-#line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 126 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = a;
-#line 126 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = b;
-#line 126 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 127 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 0;
-#line 127 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1511 "Branch.c"
+#line 1511 "EventsBranch.c"
 	}
-#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = events_branch_sort_ascending;
-#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp2_) {
-#line 1517 "Branch.c"
+#line 1517 "EventsBranch.c"
 		SidebarEntry* swap = NULL;
 		SidebarEntry* _tmp3_;
 		SidebarEntry* _tmp4_;
 		SidebarEntry* _tmp5_;
 		SidebarEntry* _tmp6_;
-#line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = a;
-#line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		swap = _tmp4_;
-#line 131 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = b;
-#line 131 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		a = _tmp5_;
-#line 132 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = swap;
-#line 132 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		b = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (swap);
-#line 1539 "Branch.c"
+#line 1539 "EventsBranch.c"
 	}
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = a;
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp11_ = b;
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp12_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp13_ = _tmp12_;
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp14_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT_SOURCE, EventSource));
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp15_ = (gint64) (_tmp10_ - _tmp14_);
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp13_);
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp9_);
-#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_result_ = _tmp15_;
-#line 139 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp16_ = _result_;
-#line 139 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp16_ == ((gint64) 0)) {
-#line 1569 "Branch.c"
+#line 1569 "EventsBranch.c"
 		SidebarEntry* _tmp17_;
 		Event* _tmp18_;
 		Event* _tmp19_;
@@ -1576,55 +1576,55 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
 		Event* _tmp24_;
 		EventID _tmp25_ = {0};
 		gint64 _tmp26_;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp17_ = a;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp18_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp19_ = _tmp18_;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		event_get_event_id (_tmp19_, &_tmp20_);
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp21_ = _tmp20_.id;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp22_ = b;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp23_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp24_ = _tmp23_;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		event_get_event_id (_tmp24_, &_tmp25_);
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp26_ = _tmp25_.id;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_result_ = _tmp21_ - _tmp26_;
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp24_);
-#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1606 "Branch.c"
+#line 1606 "EventsBranch.c"
 	}
-#line 144 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp27_ = _result_;
-#line 144 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp27_ != ((gint64) 0), "result != 0");
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp29_ = _result_;
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp29_ < ((gint64) 0)) {
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp28_ = -1;
-#line 1618 "Branch.c"
+#line 1618 "EventsBranch.c"
 	} else {
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp28_ = 1;
-#line 1622 "Branch.c"
+#line 1622 "EventsBranch.c"
 	}
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp28_;
-#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1628 "Branch.c"
+#line 1628 "EventsBranch.c"
 }
 
 
@@ -1647,89 +1647,89 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 	gint _tmp17_;
 	gint _tmp18_;
 	gint _tmp19_;
-#line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 150 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = a;
-#line 150 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = b;
-#line 150 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 151 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = 0;
-#line 151 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 1665 "Branch.c"
+#line 1665 "EventsBranch.c"
 	}
-#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = events_branch_sort_ascending;
-#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp2_) {
-#line 1671 "Branch.c"
+#line 1671 "EventsBranch.c"
 		SidebarEntry* swap = NULL;
 		SidebarEntry* _tmp3_;
 		SidebarEntry* _tmp4_;
 		SidebarEntry* _tmp5_;
 		SidebarEntry* _tmp6_;
-#line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = a;
-#line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		swap = _tmp4_;
-#line 155 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = b;
-#line 155 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		a = _tmp5_;
-#line 156 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = swap;
-#line 156 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		b = _tmp6_;
-#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (swap);
-#line 1693 "Branch.c"
+#line 1693 "EventsBranch.c"
 	}
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = a;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp11_ = _tmp10_;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp12_ = b;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp14_ = _tmp13_;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp16_ = _tmp15_;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp17_ = g_utf8_collate (_tmp11_, _tmp16_);
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp18_ = _tmp17_;
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (_tmp16_);
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp14_);
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (_tmp11_);
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp9_);
-#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	ret = _tmp18_;
-#line 162 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp19_ = ret;
-#line 162 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp19_ == 0) {
-#line 1733 "Branch.c"
+#line 1733 "EventsBranch.c"
 		SidebarEntry* _tmp20_;
 		Event* _tmp21_;
 		Event* _tmp22_;
@@ -1738,35 +1738,35 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
 		Event* _tmp25_;
 		Event* _tmp26_;
 		gint64 _tmp27_;
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp20_ = b;
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp21_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp22_ = _tmp21_;
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp23_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource));
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp24_ = a;
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp25_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp26_ = _tmp25_;
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp27_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		ret = (gint) (_tmp23_ - _tmp27_);
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp26_);
-#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1764 "Branch.c"
+#line 1764 "EventsBranch.c"
 	}
-#line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = ret;
-#line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1770 "Branch.c"
+#line 1770 "EventsBranch.c"
 }
 
 
@@ -1775,21 +1775,21 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event*
 	GeeHashMap* _tmp0_;
 	Event* _tmp1_;
 	gpointer _tmp2_;
-#line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
-#line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event;
-#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = (EventsEventEntry*) _tmp2_;
-#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 1793 "Branch.c"
+#line 1793 "EventsBranch.c"
 }
 
 
@@ -1799,152 +1799,152 @@ static void events_branch_on_config_changed (EventsBranch* self) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 173 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	value = _tmp3_;
-#line 176 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_sort_ascending = value;
-#line 177 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1821 "Branch.c"
+#line 1821 "EventsBranch.c"
 }
 
 
 static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) {
 	GeeIterable* _tmp0_;
 	GeeIterable* _tmp8_;
-#line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 182 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = added;
-#line 182 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_ != NULL) {
-#line 1838 "Branch.c"
+#line 1838 "EventsBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp1_ = added;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_object_it = _tmp2_;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			while (TRUE) {
-#line 1851 "Branch.c"
+#line 1851 "EventsBranch.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataObject* object = NULL;
 				GeeIterator* _tmp5_;
 				gpointer _tmp6_;
 				DataObject* _tmp7_;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp3_ = _object_it;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				if (!_tmp4_) {
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					break;
-#line 1866 "Branch.c"
+#line 1866 "EventsBranch.c"
 				}
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp5_ = _object_it;
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				object = (DataObject*) _tmp6_;
-#line 184 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp7_ = object;
-#line 184 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event));
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_g_object_unref0 (object);
-#line 1880 "Branch.c"
+#line 1880 "EventsBranch.c"
 			}
-#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 1884 "Branch.c"
+#line 1884 "EventsBranch.c"
 		}
 	}
-#line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = removed;
-#line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp8_ != NULL) {
-#line 1891 "Branch.c"
+#line 1891 "EventsBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp9_;
 			GeeIterator* _tmp10_;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = removed;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp10_ = gee_iterable_iterator (_tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_object_it = _tmp10_;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			while (TRUE) {
-#line 1904 "Branch.c"
+#line 1904 "EventsBranch.c"
 				GeeIterator* _tmp11_;
 				gboolean _tmp12_;
 				DataObject* object = NULL;
 				GeeIterator* _tmp13_;
 				gpointer _tmp14_;
 				DataObject* _tmp15_;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp11_ = _object_it;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp12_ = gee_iterator_next (_tmp11_);
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				if (!_tmp12_) {
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					break;
-#line 1919 "Branch.c"
+#line 1919 "EventsBranch.c"
 				}
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp13_ = _object_it;
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp14_ = gee_iterator_get (_tmp13_);
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				object = (DataObject*) _tmp14_;
-#line 189 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp15_ = object;
-#line 189 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_g_object_unref0 (object);
-#line 1933 "Branch.c"
+#line 1933 "EventsBranch.c"
 			}
-#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 1937 "Branch.c"
+#line 1937 "EventsBranch.c"
 		}
 	}
 }
 
 
 static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered) {
-#line 193 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 193 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1948 "Branch.c"
+#line 1948 "EventsBranch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -1953,25 +1953,25 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp0_ = altered;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp2_ = _tmp1_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_object_it = _tmp5_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		while (TRUE) {
-#line 1975 "Branch.c"
+#line 1975 "EventsBranch.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -1986,59 +1986,59 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 			gpointer _tmp14_;
 			Alteration* _tmp15_;
 			gboolean _tmp16_;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp6_ = _object_it;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			if (!_tmp7_) {
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				break;
-#line 1998 "Branch.c"
+#line 1998 "EventsBranch.c"
 			}
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp8_ = _object_it;
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			object = (DataObject*) _tmp9_;
-#line 195 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp10_ = object;
-#line 195 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT, Event));
-#line 195 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			event = _tmp11_;
-#line 196 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp12_ = altered;
-#line 196 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp13_ = object;
-#line 196 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp14_ = gee_map_get (_tmp12_, _tmp13_);
-#line 196 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			alteration = (Alteration*) _tmp14_;
-#line 198 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp15_ = alteration;
-#line 198 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time");
-#line 198 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			if (_tmp16_) {
-#line 2026 "Branch.c"
+#line 2026 "EventsBranch.c"
 				Event* _tmp17_;
-#line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp17_ = event;
-#line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				events_branch_move_event (self, _tmp17_);
-#line 2032 "Branch.c"
+#line 2032 "EventsBranch.c"
 			} else {
 				Alteration* _tmp18_;
 				gboolean _tmp19_;
-#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp18_ = alteration;
-#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name");
-#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				if (_tmp19_) {
-#line 2042 "Branch.c"
+#line 2042 "EventsBranch.c"
 					EventsEventEntry* entry = NULL;
 					GeeHashMap* _tmp20_;
 					Event* _tmp21_;
@@ -2052,58 +2052,58 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
 					Event* _tmp29_;
 					gchar* _tmp30_;
 					gchar* _tmp31_;
-#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp20_ = self->priv->entry_map;
-#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp21_ = event;
-#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_);
-#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					entry = (EventsEventEntry*) _tmp22_;
-#line 204 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp23_ = entry;
-#line 204 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_vala_assert (_tmp23_ != NULL, "entry != null");
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp24_ = entry;
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp25_ = event;
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp27_ = _tmp26_;
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp27_);
-#line 206 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_g_free0 (_tmp27_);
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp28_ = entry;
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp29_ = event;
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_tmp31_ = _tmp30_;
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp31_);
-#line 207 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_g_free0 (_tmp31_);
-#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 					_g_object_unref0 (entry);
-#line 2094 "Branch.c"
+#line 2094 "EventsBranch.c"
 				}
 			}
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_alteration_unref0 (alteration);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (event);
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (object);
-#line 2103 "Branch.c"
+#line 2103 "EventsBranch.c"
 		}
-#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_object_it);
-#line 2107 "Branch.c"
+#line 2107 "EventsBranch.c"
 	}
 }
 
@@ -2114,23 +2114,23 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
 	GeeCollection* _tmp2_;
 	gint _tmp3_;
 	gint _tmp4_;
-#line 212 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 213 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event_global;
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event_source_collection_get_no_event_objects (_tmp0_);
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_show_no_events (self, _tmp4_ > 0);
-#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2134 "Branch.c"
+#line 2134 "EventsBranch.c"
 }
 
 
@@ -2145,16 +2145,16 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 2149 "Branch.c"
+#line 2149 "EventsBranch.c"
 }
 
 
 static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2158 "Branch.c"
+#line 2158 "EventsBranch.c"
 }
 
 
@@ -2200,16 +2200,16 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2204 "Branch.c"
+#line 2204 "EventsBranch.c"
 }
 
 
 static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2213 "Branch.c"
+#line 2213 "EventsBranch.c"
 }
 
 
@@ -2237,74 +2237,74 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 	SidebarEntry* _tmp26_;
 	SidebarEntry* _tmp27_;
 	Event* _tmp28_;
-#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 217 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event;
-#line 217 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 217 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	event_time = _tmp1_;
-#line 218 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = event_time;
-#line 218 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp2_ == ((time_t) 0)) {
-#line 2255 "Branch.c"
+#line 2255 "EventsBranch.c"
 		Event* _tmp3_;
-#line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = event;
-#line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		events_branch_add_undated_event (self, _tmp3_);
-#line 221 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return;
-#line 2263 "Branch.c"
+#line 2263 "EventsBranch.c"
 	}
-#line 224 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = event_time;
-#line 224 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_time_local (_tmp4_, &_tmp5_);
-#line 224 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	event_tm = _tmp5_;
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = event;
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = event_tm;
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_);
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (year);
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	year = _tmp8_;
-#line 227 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	month = _tmp9_;
-#line 228 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = month;
-#line 228 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp10_ != NULL) {
-#line 2287 "Branch.c"
+#line 2287 "EventsBranch.c"
 		SidebarEntry* _tmp11_;
 		Event* _tmp12_;
-#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp11_ = month;
-#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp12_ = event;
-#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		events_branch_graft_event (self, _tmp11_, _tmp12_, _events_branch_event_comparator_gcompare_func);
-#line 231 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (month);
-#line 231 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (year);
-#line 231 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return;
-#line 2302 "Branch.c"
+#line 2302 "EventsBranch.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp13_ = year;
-#line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp13_ == NULL) {
-#line 2308 "Branch.c"
+#line 2308 "EventsBranch.c"
 		gchar* _tmp14_;
 		gchar* _tmp15_;
 		struct tm _tmp16_;
@@ -2312,63 +2312,63 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
 		SidebarEntry* _tmp18_;
 		SidebarEntry* _tmp19_;
 		SidebarEntry* _tmp20_;
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp15_ = _tmp14_;
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp16_ = event_tm;
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp17_ = events_year_directory_entry_new (_tmp15_, &_tmp16_);
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (year);
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		year = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
-#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_free0 (_tmp15_);
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp18_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp19_ = _tmp18_;
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp20_ = year;
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func);
-#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp19_);
-#line 2340 "Branch.c"
+#line 2340 "EventsBranch.c"
 	}
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp22_ = _tmp21_;
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp23_ = event_tm;
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp24_ = events_month_directory_entry_new (_tmp22_, &_tmp23_);
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (month);
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	month = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
-#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (_tmp22_);
-#line 242 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp25_ = year;
-#line 242 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp26_ = month;
-#line 242 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp25_, _tmp26_, _events_branch_event_comparator_gcompare_func);
-#line 244 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp27_ = month;
-#line 244 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp28_ = event;
-#line 244 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_graft_event (self, _tmp27_, _tmp28_, _events_branch_event_comparator_gcompare_func);
-#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (month);
-#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (year);
-#line 2372 "Branch.c"
+#line 2372 "EventsBranch.c"
 }
 
 
@@ -2390,53 +2390,53 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 	SidebarEntry* _tmp18_;
 	Event* _tmp25_;
 	SidebarEntry* _tmp26_;
-#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 248 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event;
-#line 248 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 248 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	event_time = _tmp1_;
-#line 249 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = event_time;
-#line 249 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp2_ == ((time_t) 0)) {
-#line 2408 "Branch.c"
+#line 2408 "EventsBranch.c"
 		Event* _tmp3_;
-#line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = event;
-#line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		events_branch_move_to_undated_event (self, _tmp3_);
-#line 252 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return;
-#line 2416 "Branch.c"
+#line 2416 "EventsBranch.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = event_time;
-#line 255 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_time_local (_tmp4_, &_tmp5_);
-#line 255 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	event_tm = _tmp5_;
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = event;
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = event_tm;
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_);
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (year);
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	year = _tmp8_;
-#line 258 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	month = _tmp9_;
-#line 260 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp10_ = year;
-#line 260 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp10_ == NULL) {
-#line 2440 "Branch.c"
+#line 2440 "EventsBranch.c"
 		gchar* _tmp11_;
 		gchar* _tmp12_;
 		struct tm _tmp13_;
@@ -2444,76 +2444,76 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
 		SidebarEntry* _tmp15_;
 		SidebarEntry* _tmp16_;
 		SidebarEntry* _tmp17_;
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp12_ = _tmp11_;
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp13_ = event_tm;
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp14_ = events_year_directory_entry_new (_tmp12_, &_tmp13_);
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (year);
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		year = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
-#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_free0 (_tmp12_);
-#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp15_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp16_ = _tmp15_;
-#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp17_ = year;
-#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func);
-#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2472 "Branch.c"
+#line 2472 "EventsBranch.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp18_ = month;
-#line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp18_ == NULL) {
-#line 2478 "Branch.c"
+#line 2478 "EventsBranch.c"
 		gchar* _tmp19_;
 		gchar* _tmp20_;
 		struct tm _tmp21_;
 		EventsMonthDirectoryEntry* _tmp22_;
 		SidebarEntry* _tmp23_;
 		SidebarEntry* _tmp24_;
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp20_ = _tmp19_;
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp21_ = event_tm;
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp22_ = events_month_directory_entry_new (_tmp20_, &_tmp21_);
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (month);
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		month = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
-#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_free0 (_tmp20_);
-#line 269 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp23_ = year;
-#line 269 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp24_ = month;
-#line 269 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func);
-#line 2505 "Branch.c"
+#line 2505 "EventsBranch.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp25_ = event;
-#line 272 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp26_ = month;
-#line 272 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_reparent_event (self, _tmp25_, _tmp26_);
-#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (month);
-#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (year);
-#line 2517 "Branch.c"
+#line 2517 "EventsBranch.c"
 }
 
 
@@ -2530,43 +2530,43 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
 	SidebarEntry* _tmp6_;
 	SidebarEntry* _tmp7_;
 	SidebarEntry* _tmp8_;
-#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event;
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, &_tmp2_);
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (entry);
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
-#line 279 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	removed = _tmp3_;
-#line 280 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = removed;
-#line 280 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp4_, "removed");
-#line 282 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = entry;
-#line 282 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_);
-#line 282 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	parent = _tmp6_;
-#line 283 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = parent;
-#line 283 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp7_ != NULL, "parent != null");
-#line 285 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = entry;
-#line 285 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_);
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	while (TRUE) {
-#line 2570 "Branch.c"
+#line 2570 "EventsBranch.c"
 		gboolean _tmp9_ = FALSE;
 		SidebarEntry* _tmp10_;
 		gint _tmp11_;
@@ -2577,129 +2577,129 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
 		SidebarEntry* _tmp18_;
 		SidebarEntry* _tmp19_;
 		SidebarEntry* _tmp20_;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp10_ = parent;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (_tmp11_ == 0) {
-#line 2587 "Branch.c"
+#line 2587 "EventsBranch.c"
 			SidebarEntry* _tmp12_;
 			SidebarEntry* _tmp13_;
 			SidebarEntry* _tmp14_;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp12_ = parent;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp14_ = _tmp13_;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = _tmp12_ != _tmp14_;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2601 "Branch.c"
+#line 2601 "EventsBranch.c"
 		} else {
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = FALSE;
-#line 2605 "Branch.c"
+#line 2605 "EventsBranch.c"
 		}
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (!_tmp9_) {
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			break;
-#line 2611 "Branch.c"
+#line 2611 "EventsBranch.c"
 		}
-#line 289 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp15_ = parent;
-#line 289 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_);
-#line 289 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		grandparent = _tmp16_;
-#line 290 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp17_ = grandparent;
-#line 290 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_vala_assert (_tmp17_ != NULL, "grandparent != null");
-#line 292 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp18_ = parent;
-#line 292 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_);
-#line 294 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp19_ = grandparent;
-#line 294 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 294 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (parent);
-#line 294 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		parent = _tmp20_;
-#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (grandparent);
-#line 2637 "Branch.c"
+#line 2637 "EventsBranch.c"
 	}
-#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (parent);
-#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (entry);
-#line 2643 "Branch.c"
+#line 2643 "EventsBranch.c"
 }
 
 
 static Block8Data* block8_data_ref (Block8Data* _data8_) {
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_atomic_int_inc (&_data8_->_ref_count_);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return _data8_;
-#line 2652 "Branch.c"
+#line 2652 "EventsBranch.c"
 }
 
 
 static void block8_data_unref (void * _userdata_) {
 	Block8Data* _data8_;
 	_data8_ = (Block8Data*) _userdata_;
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
-#line 2661 "Branch.c"
+#line 2661 "EventsBranch.c"
 		EventsBranch* self;
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		self = _data8_->self;
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (self);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		g_slice_free (Block8Data, _data8_);
-#line 2669 "Branch.c"
+#line 2669 "EventsBranch.c"
 	}
 }
 
 
-static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry) {
+static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry) {
 	EventsBranch* self;
 	gboolean result = FALSE;
 	SidebarEntry* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = _data8_->self;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = entry;
-#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = _data8_->event_month;
-#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_ == _tmp2_;
-#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2694 "Branch.c"
+#line 2694 "EventsBranch.c"
 }
 
 
-static gboolean ___lambda19__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda21__locator (gconstpointer item, gpointer self) {
 	gboolean result;
-	result = __lambda19_ (self, (SidebarEntry*) item);
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+	result = __lambda21_ (self, (SidebarEntry*) item);
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2703 "Branch.c"
+#line 2703 "EventsBranch.c"
 }
 
 
@@ -2715,178 +2715,178 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
 	gint _tmp5_;
 	SidebarEntry* _tmp6_;
 	SidebarEntry* _tmp7_;
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (event_tm != NULL, NULL);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data8_ = g_slice_new0 (Block8Data);
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data8_->_ref_count_ = 1;
-#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data8_->self = g_object_ref (self);
-#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event;
-#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = *event_tm;
-#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = events_branch_find_event_year (self, _tmp0_, &_tmp1_);
-#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_vala_found_year);
-#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_found_year = _tmp2_;
-#line 301 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = _vala_found_year;
-#line 301 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp3_ == NULL) {
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = NULL;
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		block8_data_unref (_data8_);
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_data8_ = NULL;
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (found_year) {
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			*found_year = _vala_found_year;
-#line 2755 "Branch.c"
+#line 2755 "EventsBranch.c"
 		} else {
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_vala_found_year);
-#line 2759 "Branch.c"
+#line 2759 "EventsBranch.c"
 		}
-#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 2763 "Branch.c"
+#line 2763 "EventsBranch.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = *event_tm;
-#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = _tmp4_.tm_mon;
-#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data8_->event_month = _tmp5_ + 1;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = _vala_found_year;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda19__locator, _data8_);
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
+	_tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda21__locator, _data8_);
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp7_;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	block8_data_unref (_data8_);
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data8_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (found_year) {
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		*found_year = _vala_found_year;
-#line 2785 "Branch.c"
+#line 2785 "EventsBranch.c"
 	} else {
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_vala_found_year);
-#line 2789 "Branch.c"
+#line 2789 "EventsBranch.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2793 "Branch.c"
+#line 2793 "EventsBranch.c"
 }
 
 
 static Block9Data* block9_data_ref (Block9Data* _data9_) {
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_atomic_int_inc (&_data9_->_ref_count_);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return _data9_;
-#line 2802 "Branch.c"
+#line 2802 "EventsBranch.c"
 }
 
 
 static void block9_data_unref (void * _userdata_) {
 	Block9Data* _data9_;
 	_data9_ = (Block9Data*) _userdata_;
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 2811 "Branch.c"
+#line 2811 "EventsBranch.c"
 		EventsBranch* self;
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		self = _data9_->self;
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (self);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		g_slice_free (Block9Data, _data9_);
-#line 2819 "Branch.c"
+#line 2819 "EventsBranch.c"
 	}
 }
 
 
-static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry) {
+static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) {
 	EventsBranch* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	SidebarEntry* _tmp2_;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = _data9_->self;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = entry;
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp1_ = TRUE;
-#line 2840 "Branch.c"
+#line 2840 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp3_;
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = entry;
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 2847 "Branch.c"
+#line 2847 "EventsBranch.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp1_) {
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp0_ = TRUE;
-#line 2853 "Branch.c"
+#line 2853 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp4_;
-#line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = entry;
-#line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 2860 "Branch.c"
+#line 2860 "EventsBranch.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_) {
-#line 318 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 319 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = FALSE;
-#line 318 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 319 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 2868 "Branch.c"
+#line 2868 "EventsBranch.c"
 	} else {
 		SidebarEntry* _tmp5_;
 		gint _tmp6_;
-#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = entry;
-#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		result = _tmp6_ == _data9_->event_year;
-#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		return result;
-#line 2880 "Branch.c"
+#line 2880 "EventsBranch.c"
 	}
 }
 
 
-static gboolean ___lambda18__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda20__locator (gconstpointer item, gpointer self) {
 	gboolean result;
-	result = __lambda18_ (self, (SidebarEntry*) item);
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+	result = __lambda20_ (self, (SidebarEntry*) item);
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2890 "Branch.c"
+#line 2890 "EventsBranch.c"
 }
 
 
@@ -2899,52 +2899,52 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
 	SidebarEntry* _tmp3_;
 	SidebarEntry* _tmp4_;
 	SidebarEntry* _tmp5_;
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (event_tm != NULL, NULL);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data9_ = g_slice_new0 (Block9Data);
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data9_->_ref_count_ = 1;
-#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data9_->self = g_object_ref (self);
-#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 314 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = *event_tm;
-#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 314 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_.tm_year;
-#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 314 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data9_->event_year = _tmp1_ + 1900;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
-	_tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda18__locator, _data9_);
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
+	_tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda20__locator, _data9_);
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp5_;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	block9_data_unref (_data9_);
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_data9_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2939 "Branch.c"
+#line 2939 "EventsBranch.c"
 }
 
 
 static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 2948 "Branch.c"
+#line 2948 "EventsBranch.c"
 }
 
 
@@ -2953,39 +2953,39 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
 	gboolean _tmp1_;
 	EventsUndatedDirectoryEntry* _tmp5_;
 	Event* _tmp6_;
-#line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 325 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->undated_entry;
-#line 325 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 325 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp1_) {
-#line 2967 "Branch.c"
+#line 2967 "EventsBranch.c"
 		SidebarEntry* _tmp2_;
 		SidebarEntry* _tmp3_;
 		EventsUndatedDirectoryEntry* _tmp4_;
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = self->priv->undated_entry;
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func);
-#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2981 "Branch.c"
+#line 2981 "EventsBranch.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = self->priv->undated_entry;
-#line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = event;
-#line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL);
-#line 2989 "Branch.c"
+#line 2989 "EventsBranch.c"
 }
 
 
@@ -2994,39 +2994,39 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
 	gboolean _tmp1_;
 	Event* _tmp5_;
 	EventsUndatedDirectoryEntry* _tmp6_;
-#line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 332 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->undated_entry;
-#line 332 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 332 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (!_tmp1_) {
-#line 3008 "Branch.c"
+#line 3008 "EventsBranch.c"
 		SidebarEntry* _tmp2_;
 		SidebarEntry* _tmp3_;
 		EventsUndatedDirectoryEntry* _tmp4_;
-#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = self->priv->undated_entry;
-#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3022 "Branch.c"
+#line 3022 "EventsBranch.c"
 	}
-#line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = event;
-#line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = self->priv->undated_entry;
-#line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3030 "Branch.c"
+#line 3030 "EventsBranch.c"
 }
 
 
@@ -3038,33 +3038,33 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent,
 	Event* _tmp3_;
 	SidebarEntry* _tmp4_;
 	GCompareFunc _tmp5_;
-#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (parent));
-#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 340 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event;
-#line 340 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = events_event_entry_new (_tmp0_);
-#line 340 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	entry = _tmp1_;
-#line 341 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = self->priv->entry_map;
-#line 341 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = event;
-#line 341 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
-#line 343 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = parent;
-#line 343 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = comparator;
-#line 343 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_);
-#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (entry);
-#line 3068 "Branch.c"
+#line 3068 "EventsBranch.c"
 }
 
 
@@ -3080,43 +3080,43 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
 	SidebarEntry* _tmp6_;
 	SidebarEntry* _tmp7_;
 	EventsEventEntry* _tmp8_;
-#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (new_parent));
-#line 347 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 347 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event;
-#line 347 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 347 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	entry = (EventsEventEntry*) _tmp2_;
-#line 348 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = entry;
-#line 348 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp3_ != NULL, "entry != null");
-#line 350 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = entry;
-#line 350 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 350 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	old_parent = _tmp5_;
-#line 351 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = old_parent;
-#line 351 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_vala_assert (_tmp6_ != NULL, "old_parent != null");
-#line 353 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = new_parent;
-#line 353 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp8_ = entry;
-#line 353 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	while (TRUE) {
-#line 3120 "Branch.c"
+#line 3120 "EventsBranch.c"
 		gboolean _tmp9_ = FALSE;
 		SidebarEntry* _tmp10_;
 		gint _tmp11_;
@@ -3127,144 +3127,144 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
 		SidebarEntry* _tmp18_;
 		SidebarEntry* _tmp19_;
 		SidebarEntry* _tmp20_;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp10_ = old_parent;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (_tmp11_ == 0) {
-#line 3137 "Branch.c"
+#line 3137 "EventsBranch.c"
 			SidebarEntry* _tmp12_;
 			SidebarEntry* _tmp13_;
 			SidebarEntry* _tmp14_;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp12_ = old_parent;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp14_ = _tmp13_;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = _tmp12_ != _tmp14_;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_tmp14_);
-#line 3151 "Branch.c"
+#line 3151 "EventsBranch.c"
 		} else {
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = FALSE;
-#line 3155 "Branch.c"
+#line 3155 "EventsBranch.c"
 		}
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (!_tmp9_) {
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			break;
-#line 3161 "Branch.c"
+#line 3161 "EventsBranch.c"
 		}
-#line 356 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp15_ = old_parent;
-#line 356 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_);
-#line 356 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		grandparent = _tmp16_;
-#line 357 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp17_ = grandparent;
-#line 357 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_vala_assert (_tmp17_ != NULL, "grandparent != null");
-#line 359 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp18_ = old_parent;
-#line 359 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_);
-#line 361 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp19_ = grandparent;
-#line 361 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 361 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (old_parent);
-#line 361 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		old_parent = _tmp20_;
-#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (grandparent);
-#line 3187 "Branch.c"
+#line 3187 "EventsBranch.c"
 	}
-#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (old_parent);
-#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (entry);
-#line 3193 "Branch.c"
+#line 3193 "EventsBranch.c"
 }
 
 
 static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 365 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 366 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (EVENTS_IS_BRANCH (self));
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = show;
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp1_) {
-#line 3206 "Branch.c"
+#line 3206 "EventsBranch.c"
 		EventsNoEventEntry* _tmp2_;
 		gboolean _tmp3_;
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp2_ = self->priv->no_event_entry;
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp0_ = !_tmp3_;
-#line 3215 "Branch.c"
+#line 3215 "EventsBranch.c"
 	} else {
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp0_ = FALSE;
-#line 3219 "Branch.c"
+#line 3219 "EventsBranch.c"
 	}
-#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp0_) {
-#line 3223 "Branch.c"
+#line 3223 "EventsBranch.c"
 		SidebarEntry* _tmp4_;
 		SidebarEntry* _tmp5_;
 		EventsNoEventEntry* _tmp6_;
-#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = self->priv->no_event_entry;
-#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3237 "Branch.c"
+#line 3237 "EventsBranch.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_;
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp8_ = show;
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (!_tmp8_) {
-#line 3245 "Branch.c"
+#line 3245 "EventsBranch.c"
 			EventsNoEventEntry* _tmp9_;
 			gboolean _tmp10_;
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = self->priv->no_event_entry;
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp7_ = _tmp10_;
-#line 3254 "Branch.c"
+#line 3254 "EventsBranch.c"
 		} else {
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp7_ = FALSE;
-#line 3258 "Branch.c"
+#line 3258 "EventsBranch.c"
 		}
-#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		if (_tmp7_) {
-#line 3262 "Branch.c"
+#line 3262 "EventsBranch.c"
 			EventsNoEventEntry* _tmp11_;
-#line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp11_ = self->priv->no_event_entry;
-#line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3268 "Branch.c"
+#line 3268 "EventsBranch.c"
 		}
 	}
 }
@@ -3275,29 +3275,29 @@ static void events_branch_class_init (EventsBranchClass * klass) {
 	gchar* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_type_class_add_private (klass, sizeof (EventsBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_branch_finalize;
-#line 8 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_FOLDER);
-#line 8 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_icon = _tmp0_;
-#line 9 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 9 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (RESOURCES_ICON_EVENTS);
-#line 9 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 9 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_events_icon = _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = g_strdup (RESOURCES_ICON_ONE_EVENT);
-#line 10 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_single_event_icon = _tmp2_;
-#line 11 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT);
-#line 11 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_branch_no_event_icon = _tmp3_;
-#line 3301 "Branch.c"
+#line 3301 "EventsBranch.c"
 }
 
 
@@ -3306,25 +3306,25 @@ static void events_branch_instance_init (EventsBranch * self) {
 	EventsUndatedDirectoryEntry* _tmp1_;
 	EventsNoEventEntry* _tmp2_;
 	EventsMasterDirectoryEntry* _tmp3_;
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv = EVENTS_BRANCH_GET_PRIVATE (self);
-#line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, EVENTS_TYPE_EVENT_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 20 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = events_undated_directory_entry_new ();
-#line 20 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->undated_entry = _tmp1_;
-#line 21 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = events_no_event_entry_new ();
-#line 21 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->no_event_entry = _tmp2_;
-#line 22 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp3_ = events_master_directory_entry_new ();
-#line 22 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->all_events_entry = _tmp3_;
-#line 3328 "Branch.c"
+#line 3328 "EventsBranch.c"
 }
 
 
@@ -3339,47 +3339,47 @@ static void events_branch_finalize (GObject * obj) {
 	ConfigFacade* _tmp6_;
 	ConfigFacade* _tmp7_;
 	guint _tmp8_;
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_BRANCH, EventsBranch);
-#line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event_global;
-#line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.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) _events_branch_on_events_added_removed_data_collection_contents_altered, self);
-#line 47 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = event_global;
-#line 47 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 47 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.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) _events_branch_on_events_altered_data_collection_items_altered, self);
-#line 48 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp4_ = event_global;
-#line 48 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_parse_name ("no-event-collection-altered", TYPE_EVENT_SOURCE_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 48 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self);
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp6_ = config_facade_get_instance ();
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp7_ = _tmp6_;
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_parse_name ("events-sort-ascending-changed", TYPE_CONFIGURATION_FACADE, &_tmp8_, NULL, FALSE);
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self);
-#line 50 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp7_);
-#line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->entry_map);
-#line 20 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->undated_entry);
-#line 21 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->no_event_entry);
-#line 22 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->all_events_entry);
-#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj);
-#line 3383 "Branch.c"
+#line 3383 "EventsBranch.c"
 }
 
 
@@ -3397,11 +3397,11 @@ GType events_branch_get_type (void) {
 
 EventsDirectoryEntry* events_directory_entry_construct (GType object_type) {
 	EventsDirectoryEntry * self = NULL;
-#line 374 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 374 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3405 "Branch.c"
+#line 3405 "EventsBranch.c"
 }
 
 
@@ -3410,48 +3410,48 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 377 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 378 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_DIRECTORY_ENTRY, EventsDirectoryEntry);
-#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = events_branch_icon;
-#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3424 "Branch.c"
+#line 3424 "EventsBranch.c"
 }
 
 
 static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	EventsDirectoryEntry * self;
 	gboolean result = FALSE;
-#line 381 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 382 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_DIRECTORY_ENTRY, EventsDirectoryEntry);
-#line 382 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 383 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = TRUE;
-#line 382 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 383 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3437 "Branch.c"
+#line 3437 "EventsBranch.c"
 }
 
 
 static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass) {
-#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_directory_entry_parent_class = g_type_class_peek_parent (klass);
-#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon;
-#line 3446 "Branch.c"
+#line 3446 "EventsBranch.c"
 }
 
 
 static void events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select;
-#line 3455 "Branch.c"
+#line 3455 "EventsBranch.c"
 }
 
 
@@ -3475,18 +3475,18 @@ GType events_directory_entry_get_type (void) {
 
 EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type) {
 	EventsMasterDirectoryEntry * self = NULL;
-#line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type);
-#line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3483 "Branch.c"
+#line 3483 "EventsBranch.c"
 }
 
 
 EventsMasterDirectoryEntry* events_master_directory_entry_new (void) {
-#line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 3490 "Branch.c"
+#line 3490 "EventsBranch.c"
 }
 
 
@@ -3494,15 +3494,15 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple
 	EventsMasterDirectoryEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 390 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 391 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
-#line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = g_strdup (MASTER_EVENTS_DIRECTORY_PAGE_NAME);
-#line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp0_;
-#line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3506 "Branch.c"
+#line 3506 "EventsBranch.c"
 }
 
 
@@ -3511,17 +3511,17 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 394 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 395 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
-#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = events_branch_events_icon;
-#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3525 "Branch.c"
+#line 3525 "EventsBranch.c"
 }
 
 
@@ -3529,30 +3529,30 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn
 	EventsMasterDirectoryEntry * self;
 	Page* result = NULL;
 	MasterEventsDirectoryPage* _tmp0_;
-#line 398 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 399 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
-#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = master_events_directory_page_new ();
-#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp0_);
-#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
-#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3543 "Branch.c"
+#line 3543 "EventsBranch.c"
 }
 
 
 static void events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) {
-#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_master_directory_entry_parent_class = g_type_class_peek_parent (klass);
-#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_name;
-#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon;
-#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page;
-#line 3556 "Branch.c"
+#line 3556 "EventsBranch.c"
 }
 
 
@@ -3577,34 +3577,34 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	struct tm _tmp2_;
-#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (tm != NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsYearDirectoryEntry*) events_directory_entry_construct (object_type);
-#line 408 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = name;
-#line 408 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 408 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (self->priv->name);
-#line 408 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->name = _tmp1_;
-#line 409 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = *tm;
-#line 409 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->tm = _tmp2_;
-#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3601 "Branch.c"
+#line 3601 "EventsBranch.c"
 }
 
 
 EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) {
-#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm);
-#line 3608 "Branch.c"
+#line 3608 "EventsBranch.c"
 }
 
 
@@ -3613,17 +3613,17 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 412 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 413 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
-#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->name;
-#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3627 "Branch.c"
+#line 3627 "EventsBranch.c"
 }
 
 
@@ -3631,17 +3631,17 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
 	gint result = 0;
 	struct tm _tmp0_;
 	gint _tmp1_;
-#line 416 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 417 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_YEAR_DIRECTORY_ENTRY (self), 0);
-#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->tm;
-#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_.tm_year;
-#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_ + 1900;
-#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3645 "Branch.c"
+#line 3645 "EventsBranch.c"
 }
 
 
@@ -3650,53 +3650,53 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr
 	Page* result = NULL;
 	struct tm _tmp0_;
 	SubEventsDirectoryPage* _tmp1_;
-#line 420 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 421 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
-#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->tm;
-#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = sub_events_directory_page_new (SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR, &_tmp0_);
-#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3666 "Branch.c"
+#line 3666 "EventsBranch.c"
 }
 
 
 static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) {
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_year_directory_entry_parent_class = g_type_class_peek_parent (klass);
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_type_class_add_private (klass, sizeof (EventsYearDirectoryEntryPrivate));
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_get_sidebar_name;
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page;
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize;
-#line 3681 "Branch.c"
+#line 3681 "EventsBranch.c"
 }
 
 
 static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) {
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3688 "Branch.c"
+#line 3688 "EventsBranch.c"
 }
 
 
 static void events_year_directory_entry_finalize (GObject * obj) {
 	EventsYearDirectoryEntry * self;
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
-#line 404 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 405 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (self->priv->name);
-#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj);
-#line 3700 "Branch.c"
+#line 3700 "EventsBranch.c"
 }
 
 
@@ -3717,34 +3717,34 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	struct tm _tmp2_;
-#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (tm != NULL, NULL);
-#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsMonthDirectoryEntry*) events_directory_entry_construct (object_type);
-#line 430 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = name;
-#line 430 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 430 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (self->priv->name);
-#line 430 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->name = _tmp1_;
-#line 431 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = *tm;
-#line 431 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->tm = _tmp2_;
-#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3741 "Branch.c"
+#line 3741 "EventsBranch.c"
 }
 
 
 EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) {
-#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm);
-#line 3748 "Branch.c"
+#line 3748 "EventsBranch.c"
 }
 
 
@@ -3753,17 +3753,17 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 434 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 435 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
-#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->name;
-#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3767 "Branch.c"
+#line 3767 "EventsBranch.c"
 }
 
 
@@ -3771,17 +3771,17 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
 	gint result = 0;
 	struct tm _tmp0_;
 	gint _tmp1_;
-#line 438 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 439 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
-#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->tm;
-#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_.tm_year;
-#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_ + 1900;
-#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3785 "Branch.c"
+#line 3785 "EventsBranch.c"
 }
 
 
@@ -3789,17 +3789,17 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
 	gint result = 0;
 	struct tm _tmp0_;
 	gint _tmp1_;
-#line 442 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 443 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
-#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->tm;
-#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _tmp0_.tm_mon;
-#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_ + 1;
-#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3803 "Branch.c"
+#line 3803 "EventsBranch.c"
 }
 
 
@@ -3808,53 +3808,53 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt
 	Page* result = NULL;
 	struct tm _tmp0_;
 	SubEventsDirectoryPage* _tmp1_;
-#line 446 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 447 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
-#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->tm;
-#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = sub_events_directory_page_new (SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH, &_tmp0_);
-#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3824 "Branch.c"
+#line 3824 "EventsBranch.c"
 }
 
 
 static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) {
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_month_directory_entry_parent_class = g_type_class_peek_parent (klass);
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_type_class_add_private (klass, sizeof (EventsMonthDirectoryEntryPrivate));
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_get_sidebar_name;
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page;
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize;
-#line 3839 "Branch.c"
+#line 3839 "EventsBranch.c"
 }
 
 
 static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) {
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3846 "Branch.c"
+#line 3846 "EventsBranch.c"
 }
 
 
 static void events_month_directory_entry_finalize (GObject * obj) {
 	EventsMonthDirectoryEntry * self;
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
-#line 426 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 427 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (self->priv->name);
-#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj);
-#line 3858 "Branch.c"
+#line 3858 "EventsBranch.c"
 }
 
 
@@ -3872,18 +3872,18 @@ GType events_month_directory_entry_get_type (void) {
 
 EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType object_type) {
 	EventsUndatedDirectoryEntry * self = NULL;
-#line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type);
-#line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3880 "Branch.c"
+#line 3880 "EventsBranch.c"
 }
 
 
 EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) {
-#line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY);
-#line 3887 "Branch.c"
+#line 3887 "EventsBranch.c"
 }
 
 
@@ -3891,15 +3891,15 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl
 	EventsUndatedDirectoryEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 455 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 456 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
-#line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
-#line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp0_;
-#line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3903 "Branch.c"
+#line 3903 "EventsBranch.c"
 }
 
 
@@ -3908,30 +3908,30 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
 	Page* result = NULL;
 	struct tm _tmp0_ = {0};
 	SubEventsDirectoryPage* _tmp1_;
-#line 459 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 460 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
-#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_time_local ((time_t) 0, &_tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = sub_events_directory_page_new (SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED, &_tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3924 "Branch.c"
+#line 3924 "EventsBranch.c"
 }
 
 
 static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) {
-#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass);
-#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name;
-#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page;
-#line 3935 "Branch.c"
+#line 3935 "EventsBranch.c"
 }
 
 
@@ -3955,28 +3955,28 @@ EventsEventEntry* events_event_entry_construct (GType object_type, Event* event)
 	EventsEventEntry * self = NULL;
 	Event* _tmp0_;
 	Event* _tmp1_;
-#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsEventEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 470 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = event;
-#line 470 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 470 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->event);
-#line 470 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv->event = _tmp1_;
-#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 3973 "Branch.c"
+#line 3973 "EventsBranch.c"
 }
 
 
 EventsEventEntry* events_event_entry_new (Event* event) {
-#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event);
-#line 3980 "Branch.c"
+#line 3980 "EventsBranch.c"
 }
 
 
@@ -3984,17 +3984,17 @@ Event* events_event_entry_get_event (EventsEventEntry* self) {
 	Event* result = NULL;
 	Event* _tmp0_;
 	Event* _tmp1_;
-#line 473 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 474 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (EVENTS_IS_EVENT_ENTRY (self), NULL);
-#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->event;
-#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 3998 "Branch.c"
+#line 3998 "EventsBranch.c"
 }
 
 
@@ -4003,17 +4003,17 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	Event* _tmp0_;
 	gchar* _tmp1_;
-#line 477 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 478 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->event;
-#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4017 "Branch.c"
+#line 4017 "EventsBranch.c"
 }
 
 
@@ -4022,17 +4022,17 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 481 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 482 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = events_branch_single_event_icon;
-#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4036 "Branch.c"
+#line 4036 "EventsBranch.c"
 }
 
 
@@ -4041,32 +4041,32 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base)
 	Page* result = NULL;
 	Event* _tmp0_;
 	EventPage* _tmp1_;
-#line 485 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 486 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = self->priv->event;
-#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event_page_new (_tmp0_);
-#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4057 "Branch.c"
+#line 4057 "EventsBranch.c"
 }
 
 
 static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	EventsEventEntry * self;
 	gboolean result = FALSE;
-#line 489 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 490 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 490 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 491 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = TRUE;
-#line 490 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 491 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4070 "Branch.c"
+#line 4070 "EventsBranch.c"
 }
 
 
@@ -4076,50 +4076,50 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	const gchar* _tmp2_;
-#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 494 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = new_name;
-#line 494 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = event_prep_event_name (_tmp0_);
-#line 494 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	prepped = _tmp1_;
-#line 495 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp2_ = prepped;
-#line 495 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	if (_tmp2_ != NULL) {
-#line 4094 "Branch.c"
+#line 4094 "EventsBranch.c"
 		CommandManager* _tmp3_;
 		CommandManager* _tmp4_;
 		Event* _tmp5_;
 		const gchar* _tmp6_;
 		RenameEventCommand* _tmp7_;
 		RenameEventCommand* _tmp8_;
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = app_window_get_command_manager ();
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = _tmp3_;
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = self->priv->event;
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp6_ = prepped;
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp7_ = rename_event_command_new (_tmp5_, _tmp6_);
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp8_ = _tmp7_;
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_tmp8_);
-#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_command_manager_unref0 (_tmp4_);
-#line 4119 "Branch.c"
+#line 4119 "EventsBranch.c"
 	}
-#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_free0 (prepped);
-#line 4123 "Branch.c"
+#line 4123 "EventsBranch.c"
 }
 
 
@@ -4134,15 +4134,15 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 	Event* _tmp19_;
 	SetEventCommand* _tmp20_;
 	SetEventCommand* _tmp21_;
-#line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 503 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 503 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	views = _tmp0_;
-#line 4146 "Branch.c"
+#line 4146 "EventsBranch.c"
 	{
 		GeeList* _media_source_list = NULL;
 		GeeList* _tmp1_;
@@ -4152,25 +4152,25 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 		gint _tmp4_;
 		gint _tmp5_;
 		gint _media_source_index = 0;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp1_ = media;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_media_source_list = _tmp2_;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp3_ = _media_source_list;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_media_source_size = _tmp5_;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_media_source_index = -1;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		while (TRUE) {
-#line 4174 "Branch.c"
+#line 4174 "EventsBranch.c"
 			gint _tmp6_;
 			gint _tmp7_;
 			gint _tmp8_;
@@ -4182,146 +4182,146 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
 			MediaSource* _tmp13_;
 			DataView* _tmp14_;
 			DataView* _tmp15_;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp6_ = _media_source_index;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_media_source_index = _tmp6_ + 1;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp7_ = _media_source_index;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp8_ = _media_source_size;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			if (!(_tmp7_ < _tmp8_)) {
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 				break;
-#line 4198 "Branch.c"
+#line 4198 "EventsBranch.c"
 			}
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp9_ = _media_source_list;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp10_ = _media_source_index;
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			media_source = (MediaSource*) _tmp11_;
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp12_ = views;
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp13_ = media_source;
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp14_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource));
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_tmp15_ = _tmp14_;
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
-#line 504 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (_tmp15_);
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 			_g_object_unref0 (media_source);
-#line 4222 "Branch.c"
+#line 4222 "EventsBranch.c"
 		}
-#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 		_g_object_unref0 (_media_source_list);
-#line 4226 "Branch.c"
+#line 4226 "EventsBranch.c"
 	}
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp16_ = app_window_get_command_manager ();
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp17_ = _tmp16_;
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp18_ = views;
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp19_ = self->priv->event;
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp20_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable), _tmp19_);
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp21_ = _tmp20_;
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command));
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (_tmp21_);
-#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 508 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = TRUE;
-#line 508 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (views);
-#line 508 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4252 "Branch.c"
+#line 4252 "EventsBranch.c"
 }
 
 
 static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
 	EventsEventEntry * self;
 	gboolean result = FALSE;
-#line 511 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 512 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 511 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 512 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 512 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 513 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = FALSE;
-#line 512 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 513 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4267 "Branch.c"
+#line 4267 "EventsBranch.c"
 }
 
 
 static void events_event_entry_class_init (EventsEventEntryClass * klass) {
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_event_entry_parent_class = g_type_class_peek_parent (klass);
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_type_class_add_private (klass, sizeof (EventsEventEntryPrivate));
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_name;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_icon;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize;
-#line 4284 "Branch.c"
+#line 4284 "EventsBranch.c"
 }
 
 
 static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename;
-#line 4295 "Branch.c"
+#line 4295 "EventsBranch.c"
 }
 
 
 static void events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
-#line 4306 "Branch.c"
+#line 4306 "EventsBranch.c"
 }
 
 
 static void events_event_entry_instance_init (EventsEventEntry * self) {
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self);
-#line 4313 "Branch.c"
+#line 4313 "EventsBranch.c"
 }
 
 
 static void events_event_entry_finalize (GObject * obj) {
 	EventsEventEntry * self;
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
-#line 467 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 468 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_g_object_unref0 (self->priv->event);
-#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj);
-#line 4325 "Branch.c"
+#line 4325 "EventsBranch.c"
 }
 
 
@@ -4343,18 +4343,18 @@ GType events_event_entry_get_type (void) {
 
 EventsNoEventEntry* events_no_event_entry_construct (GType object_type) {
 	EventsNoEventEntry * self = NULL;
-#line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return self;
-#line 4351 "Branch.c"
+#line 4351 "EventsBranch.c"
 }
 
 
 EventsNoEventEntry* events_no_event_entry_new (void) {
-#line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 4358 "Branch.c"
+#line 4358 "EventsBranch.c"
 }
 
 
@@ -4362,15 +4362,15 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr
 	EventsNoEventEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 521 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 522 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
-#line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = g_strdup (NO_EVENT_PAGE_NAME);
-#line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp0_;
-#line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4374 "Branch.c"
+#line 4374 "EventsBranch.c"
 }
 
 
@@ -4379,17 +4379,17 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 525 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 526 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
-#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = events_branch_no_event_icon;
-#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = _tmp1_;
-#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4393 "Branch.c"
+#line 4393 "EventsBranch.c"
 }
 
 
@@ -4397,30 +4397,30 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas
 	EventsNoEventEntry * self;
 	Page* result = NULL;
 	NoEventPage* _tmp0_;
-#line 529 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 530 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
-#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	_tmp0_ = no_event_page_new ();
-#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	g_object_ref_sink (_tmp0_);
-#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
-#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	return result;
-#line 4411 "Branch.c"
+#line 4411 "EventsBranch.c"
 }
 
 
 static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
-#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	events_no_event_entry_parent_class = g_type_class_peek_parent (klass);
-#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_name;
-#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon;
-#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
+#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page;
-#line 4424 "Branch.c"
+#line 4424 "EventsBranch.c"
 }
 
 
diff --git a/src/events/Branch.vala b/src/events/EventsBranch.vala
index 15144f2..8980d60 100644
--- a/src/events/Branch.vala
+++ b/src/events/EventsBranch.vala
@@ -22,7 +22,8 @@ public class Events.Branch : Sidebar.Branch {
     private Events.MasterDirectoryEntry all_events_entry = new Events.MasterDirectoryEntry();
     
     public Branch() {
-        base (new Sidebar.Header(_("Events")), Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
+        base (new Sidebar.Header(_("Events"), _("Browse through your events")),
+            Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
             event_year_comparator);
         
         graft(get_root(), all_events_entry);
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 897a401..44368cb 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1006,7 +1006,6 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 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);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_update_actions (Page* self, gint selected_count, gint count);
 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);
@@ -1132,42 +1131,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 1136 "EventsDirectoryPage.c"
+#line 1135 "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 1143 "EventsDirectoryPage.c"
+#line 1142 "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 1150 "EventsDirectoryPage.c"
+#line 1149 "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 1157 "EventsDirectoryPage.c"
+#line 1156 "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 1164 "EventsDirectoryPage.c"
+#line 1163 "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 1171 "EventsDirectoryPage.c"
+#line 1170 "EventsDirectoryPage.c"
 }
 
 
@@ -1176,14 +1175,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 1180 "EventsDirectoryPage.c"
+#line 1179 "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 1187 "EventsDirectoryPage.c"
+#line 1186 "EventsDirectoryPage.c"
 }
 
 
@@ -1338,7 +1337,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 1342 "EventsDirectoryPage.c"
+#line 1341 "EventsDirectoryPage.c"
 }
 
 
@@ -1358,7 +1357,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 1362 "EventsDirectoryPage.c"
+#line 1361 "EventsDirectoryPage.c"
 }
 
 
@@ -1378,7 +1377,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 1382 "EventsDirectoryPage.c"
+#line 1381 "EventsDirectoryPage.c"
 }
 
 
@@ -1412,7 +1411,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 1416 "EventsDirectoryPage.c"
+#line 1415 "EventsDirectoryPage.c"
 }
 
 
@@ -1431,7 +1430,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 1435 "EventsDirectoryPage.c"
+#line 1434 "EventsDirectoryPage.c"
 }
 
 
@@ -1440,7 +1439,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 1444 "EventsDirectoryPage.c"
+#line 1443 "EventsDirectoryPage.c"
 }
 
 
@@ -1449,7 +1448,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 1453 "EventsDirectoryPage.c"
+#line 1452 "EventsDirectoryPage.c"
 }
 
 
@@ -1460,7 +1459,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 1464 "EventsDirectoryPage.c"
+#line 1463 "EventsDirectoryPage.c"
 		Comparator _tmp1_;
 		void* _tmp1__target;
 		GDestroyNotify _tmp1__target_destroy_notify;
@@ -1478,7 +1477,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 1482 "EventsDirectoryPage.c"
+#line 1481 "EventsDirectoryPage.c"
 	} else {
 		Comparator _tmp2_;
 		void* _tmp2__target;
@@ -1497,7 +1496,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 1501 "EventsDirectoryPage.c"
+#line 1500 "EventsDirectoryPage.c"
 	}
 }
 
@@ -1505,7 +1504,7 @@ 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 1509 "EventsDirectoryPage.c"
+#line 1508 "EventsDirectoryPage.c"
 }
 
 
@@ -1557,7 +1556,7 @@ static void events_directory_page_real_add_actions (Page* base, GActionMap* map)
 	_g_variant_unref0 (_tmp8_);
 #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 1561 "EventsDirectoryPage.c"
+#line 1560 "EventsDirectoryPage.c"
 }
 
 
@@ -1572,7 +1571,7 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 	_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"
+#line 1575 "EventsDirectoryPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1584,11 +1583,11 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 		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"
+#line 1587 "EventsDirectoryPage.c"
 			GActionEntry entry = {0};
 #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			entry = entry_collection[entry_it];
-#line 1592 "EventsDirectoryPage.c"
+#line 1591 "EventsDirectoryPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1601,7 +1600,7 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
 				_tmp3_ = _tmp2_.name;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1605 "EventsDirectoryPage.c"
+#line 1604 "EventsDirectoryPage.c"
 			}
 		}
 	}
@@ -1631,7 +1630,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	if (_tmp3_ == NULL) {
 #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1635 "EventsDirectoryPage.c"
+#line 1634 "EventsDirectoryPage.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp3_;
@@ -1641,7 +1640,7 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
 	g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0);
 #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
-#line 1645 "EventsDirectoryPage.c"
+#line 1644 "EventsDirectoryPage.c"
 }
 
 
@@ -1659,22 +1658,20 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 #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 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 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = selected_count;
-#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 142 "/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 144 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = selected_count;
-#line 144 "/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), "EditComment", _tmp2_ == 1);
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = selected_count;
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = count;
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 145 "/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 1678 "EventsDirectoryPage.c"
+#line 1675 "EventsDirectoryPage.c"
 }
 
 
@@ -1682,15 +1679,15 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 148 "/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 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = g_strdup (_ ("No events"));
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1694 "EventsDirectoryPage.c"
+#line 1691 "EventsDirectoryPage.c"
 }
 
 
@@ -1698,22 +1695,22 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
 	EventsDirectoryPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = g_strdup (_ ("No events found"));
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1710 "EventsDirectoryPage.c"
+#line 1707 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1717 "EventsDirectoryPage.c"
+#line 1714 "EventsDirectoryPage.c"
 }
 
 
@@ -1725,31 +1722,31 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	LibraryWindow* _tmp2_;
 	LibraryWindow* _tmp3_;
 	Event* _tmp4_;
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = item;
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem));
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp1_;
-#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = library_window_get_app ();
-#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event->event;
-#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	library_window_switch_to_event (_tmp3_, _tmp4_);
-#line 160 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1753 "EventsDirectoryPage.c"
+#line 1750 "EventsDirectoryPage.c"
 }
 
 
@@ -1766,45 +1763,45 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
 	GDestroyNotify _tmp7__target_destroy_notify;
 	GSimpleAction* _tmp8_;
 	GVariant* _tmp9_;
-#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = value;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/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 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = _tmp6_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target = _tmp4_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target_destroy_notify = _tmp5_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/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 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	(_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target = NULL;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7__target_destroy_notify = NULL;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = action;
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = value;
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1808 "EventsDirectoryPage.c"
+#line 1805 "EventsDirectoryPage.c"
 }
 
 
@@ -1837,101 +1834,101 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_;
 	CommandManager* _tmp22_;
 	RenameEventCommand* _tmp23_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1857 "EventsDirectoryPage.c"
+#line 1854 "EventsDirectoryPage.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_get_raw_name (_tmp9_);
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = event_rename_dialog_new (_tmp11_);
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	rename_dialog = _tmp13_;
-#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = rename_dialog;
-#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = event_rename_dialog_execute (_tmp14_);
-#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_name = _tmp15_;
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_name;
-#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_name);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1905 "EventsDirectoryPage.c"
+#line 1902 "EventsDirectoryPage.c"
 	}
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_name;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = rename_event_command_new (_tmp18_, _tmp19_);
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_name);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 1935 "EventsDirectoryPage.c"
+#line 1932 "EventsDirectoryPage.c"
 }
 
 
@@ -1964,101 +1961,101 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_;
 	CommandManager* _tmp22_;
 	EditEventCommentCommand* _tmp23_;
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 1984 "EventsDirectoryPage.c"
+#line 1981 "EventsDirectoryPage.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE);
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	edit_comment_dialog = _tmp13_;
-#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = edit_comment_dialog;
-#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = edit_comment_dialog_execute (_tmp14_);
-#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_comment = _tmp15_;
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_comment;
-#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_comment);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2032 "EventsDirectoryPage.c"
+#line 2029 "EventsDirectoryPage.c"
 	}
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_comment;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_);
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_comment);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2062 "EventsDirectoryPage.c"
+#line 2059 "EventsDirectoryPage.c"
 }
 
 
@@ -2077,55 +2074,55 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
 	MergeEventsCommand* _tmp12_;
-#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 202 "/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 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ <= 1;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2097 "EventsDirectoryPage.c"
+#line 2094 "EventsDirectoryPage.c"
 	}
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = _tmp6_;
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp9_;
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = command;
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2129 "EventsDirectoryPage.c"
+#line 2126 "EventsDirectoryPage.c"
 }
 
 
@@ -2137,40 +2134,40 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = value;
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	display = _tmp1_;
-#line 214 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 213 "/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 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/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 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = action;
-#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = value;
-#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2167 "EventsDirectoryPage.c"
+#line 2164 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2174 "EventsDirectoryPage.c"
+#line 2171 "EventsDirectoryPage.c"
 }
 
 
@@ -2179,17 +2176,17 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	SearchViewFilter* result = NULL;
 	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
 	SearchViewFilter* _tmp1_;
-#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2193 "EventsDirectoryPage.c"
+#line 2190 "EventsDirectoryPage.c"
 }
 
 
@@ -2210,7 +2207,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 2214 "EventsDirectoryPage.c"
+#line 2211 "EventsDirectoryPage.c"
 }
 
 
@@ -2220,14 +2217,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 2224 "EventsDirectoryPage.c"
+#line 2221 "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 2231 "EventsDirectoryPage.c"
+#line 2228 "EventsDirectoryPage.c"
 }
 
 
@@ -2236,7 +2233,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 = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
-#line 2240 "EventsDirectoryPage.c"
+#line 2237 "EventsDirectoryPage.c"
 }
 
 
@@ -2265,7 +2262,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 2269 "EventsDirectoryPage.c"
+#line 2266 "EventsDirectoryPage.c"
 }
 
 
@@ -2285,7 +2282,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2289 "EventsDirectoryPage.c"
+#line 2286 "EventsDirectoryPage.c"
 }
 
 
@@ -2331,7 +2328,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 2335 "EventsDirectoryPage.c"
+#line 2332 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2357,11 +2354,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 2361 "EventsDirectoryPage.c"
+#line 2358 "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 2365 "EventsDirectoryPage.c"
+#line 2362 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2373,11 +2370,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 2377 "EventsDirectoryPage.c"
+#line 2374 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2381 "EventsDirectoryPage.c"
+#line 2378 "EventsDirectoryPage.c"
 			{
 				const gchar* _tmp13_;
 				const gchar* _tmp14_;
@@ -2396,7 +2393,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 2400 "EventsDirectoryPage.c"
+#line 2397 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2407,7 +2404,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 2411 "EventsDirectoryPage.c"
+#line 2408 "EventsDirectoryPage.c"
 }
 
 
@@ -2417,14 +2414,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 2421 "EventsDirectoryPage.c"
+#line 2418 "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 2428 "EventsDirectoryPage.c"
+#line 2425 "EventsDirectoryPage.c"
 }
 
 
@@ -2435,7 +2432,7 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2439 "EventsDirectoryPage.c"
+#line 2436 "EventsDirectoryPage.c"
 }
 
 
@@ -2480,7 +2477,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 2484 "EventsDirectoryPage.c"
+#line 2481 "EventsDirectoryPage.c"
 }
 
 
@@ -2492,7 +2489,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 2496 "EventsDirectoryPage.c"
+#line 2493 "EventsDirectoryPage.c"
 }
 
 
@@ -2514,7 +2511,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 2518 "EventsDirectoryPage.c"
+#line 2515 "EventsDirectoryPage.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
@@ -2536,7 +2533,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 2540 "EventsDirectoryPage.c"
+#line 2537 "EventsDirectoryPage.c"
 }
 
 
@@ -2559,39 +2556,39 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	EventSourceCollection* _tmp2_;
 	GeeCollection* _tmp3_;
 	GeeCollection* _tmp4_;
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_event_directory_manager_new ();
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = event_global;
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection));
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/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 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_view_manager_unref0 (_tmp1_);
 #line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_view_manager_unref0 (_tmp1_);
+#line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2581 "EventsDirectoryPage.c"
+#line 2578 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
-#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2588 "EventsDirectoryPage.c"
+#line 2585 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
-#line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2595 "EventsDirectoryPage.c"
+#line 2592 "EventsDirectoryPage.c"
 }
 
 
@@ -2665,7 +2662,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2669 "EventsDirectoryPage.c"
+#line 2666 "EventsDirectoryPage.c"
 }
 
 
@@ -2678,71 +2675,71 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	struct tm _tmp7_;
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_;
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_;
-#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2688 "EventsDirectoryPage.c"
+#line 2685 "EventsDirectoryPage.c"
 		gchar* _tmp1_;
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2696 "EventsDirectoryPage.c"
+#line 2693 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		SubEventsDirectoryPageDirectoryType _tmp3_;
 		gchar* _tmp4_;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp3_ = type;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2707 "EventsDirectoryPage.c"
+#line 2704 "EventsDirectoryPage.c"
 		} else {
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2711 "EventsDirectoryPage.c"
+#line 2708 "EventsDirectoryPage.c"
 		}
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2719 "EventsDirectoryPage.c"
+#line 2716 "EventsDirectoryPage.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = type;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = *time;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_);
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/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 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_view_manager_unref0 (_tmp9_);
-#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (page_name);
-#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2739 "EventsDirectoryPage.c"
+#line 2736 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2746 "EventsDirectoryPage.c"
+#line 2743 "EventsDirectoryPage.c"
 }
 
 
@@ -2750,17 +2747,17 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_;
 	gint _tmp1_;
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/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 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2764 "EventsDirectoryPage.c"
+#line 2761 "EventsDirectoryPage.c"
 }
 
 
@@ -2768,17 +2765,17 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_;
 	gint _tmp1_;
-#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/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 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2782 "EventsDirectoryPage.c"
+#line 2779 "EventsDirectoryPage.c"
 }
 
 
@@ -2786,17 +2783,17 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	SubEventsDirectoryPageDirectoryType result = 0;
 	ViewManager* _tmp0_;
 	SubEventsDirectoryPageDirectoryType _tmp1_;
-#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/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 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2800 "EventsDirectoryPage.c"
+#line 2797 "EventsDirectoryPage.c"
 }
 
 
@@ -2806,45 +2803,45 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	SubEventsDirectoryPageDirectoryType _tmp3_;
 	struct tm _tmp4_;
 	gint _tmp5_;
-#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type);
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2818 "EventsDirectoryPage.c"
+#line 2815 "EventsDirectoryPage.c"
 		struct tm _tmp1_;
 		gint _tmp2_;
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = *time;
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _tmp1_.tm_mon;
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 2827 "EventsDirectoryPage.c"
+#line 2824 "EventsDirectoryPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
-#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->type = _tmp3_;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = *time;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_.tm_year;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = _tmp5_;
-#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2841 "EventsDirectoryPage.c"
+#line 2838 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/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 2848 "EventsDirectoryPage.c"
+#line 2845 "EventsDirectoryPage.c"
 }
 
 
@@ -2859,7 +2856,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
-#line 2863 "EventsDirectoryPage.c"
+#line 2860 "EventsDirectoryPage.c"
 }
 
 
@@ -2878,162 +2875,162 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	struct tm _tmp7_;
 	gint _tmp8_;
 	gint _tmp9_;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/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 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = source;
-#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/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 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (!_tmp1_) {
-#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = FALSE;
-#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2896 "EventsDirectoryPage.c"
+#line 2893 "EventsDirectoryPage.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource));
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp3_;
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event;
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = event_source_get_start_time (_tmp4_);
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_time_local (_tmp5_, &_tmp6_);
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event_time = _tmp6_;
-#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = event_time;
-#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = _tmp7_.tm_year;
-#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = self->priv->year;
-#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 2920 "EventsDirectoryPage.c"
+#line 2917 "EventsDirectoryPage.c"
 		SubEventsDirectoryPageDirectoryType _tmp10_;
-#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
-#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2926 "EventsDirectoryPage.c"
+#line 2923 "EventsDirectoryPage.c"
 			struct tm _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp11_ = event_time;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp12_ = _tmp11_.tm_mon;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp13_ = self->priv->month;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			result = _tmp12_ == _tmp13_;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_g_object_unref0 (event);
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 2942 "EventsDirectoryPage.c"
+#line 2939 "EventsDirectoryPage.c"
 		}
-#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
-#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (event);
-#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2950 "EventsDirectoryPage.c"
+#line 2947 "EventsDirectoryPage.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
-#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2958 "EventsDirectoryPage.c"
+#line 2955 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 273 "/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 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->month;
-#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2973 "EventsDirectoryPage.c"
+#line 2970 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_;
-#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 277 "/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 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->year;
-#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2988 "EventsDirectoryPage.c"
+#line 2985 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
 	SubEventsDirectoryPageDirectoryType _tmp0_;
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 281 "/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 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->type;
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3003 "EventsDirectoryPage.c"
+#line 3000 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) {
-#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/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 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->finalize = sub_events_directory_page_sub_event_directory_manager_finalize;
-#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
-#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 3016 "EventsDirectoryPage.c"
+#line 3013 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) {
-#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self);
-#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->month = 0;
-#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 3027 "EventsDirectoryPage.c"
+#line 3024 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
-#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/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 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 3037 "EventsDirectoryPage.c"
+#line 3034 "EventsDirectoryPage.c"
 }
 
 
@@ -3050,9 +3047,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 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3056 "EventsDirectoryPage.c"
+#line 3053 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 4650fd2..241abfe 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -139,7 +139,6 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
     
     protected override void update_actions(int selected_count, int count) {
         set_action_sensitive("Merge", selected_count > 1);
-        set_action_important("Merge", true);
         set_action_sensitive("Rename", selected_count == 1);
         set_action_sensitive("EditComment", selected_count == 1);
         
diff --git a/src/folders/Branch.c b/src/folders/FoldersBranch.c
index 95fb127..ff8f49a 100644
--- a/src/folders/Branch.c
+++ b/src/folders/FoldersBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* FoldersBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from FoldersBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -523,8 +523,8 @@ GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 enum  {
 	FOLDERS_ROOT_DUMMY_PROPERTY
 };
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -538,7 +538,6 @@ enum  {
 };
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value);
-gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len);
 static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value);
 static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -558,36 +557,36 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr
 
 
 static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_branch_on_media_contents_altered ((FoldersBranch*) self, added, removed);
-#line 564 "Branch.c"
+#line 563 "FoldersBranch.c"
 }
 
 
 static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	guint result;
 	result = file_hash ((GFile*) v);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 573 "Branch.c"
+#line 572 "FoldersBranch.c"
 }
 
 
 static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gboolean result;
 	result = file_equal ((GFile*) a, (GFile*) b);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 582 "Branch.c"
+#line 581 "FoldersBranch.c"
 }
 
 
 static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = folders_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 591 "Branch.c"
+#line 590 "FoldersBranch.c"
 }
 
 
@@ -597,23 +596,23 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 	FoldersRoot* _tmp1_;
 	const gchar* _tmp2_;
 	GFile* _tmp3_;
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = folders_root_new ();
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = (FoldersBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING | SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, _folders_branch_comparator_gcompare_func, NULL);
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = g_get_home_dir ();
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (self->priv->home_dir);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv->home_dir = _tmp3_;
-#line 617 "Branch.c"
+#line 616 "FoldersBranch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp4_;
@@ -622,27 +621,27 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 		GeeCollection* _tmp7_;
 		GeeIterator* _tmp8_;
 		GeeIterator* _tmp9_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp4_ = media_collection_registry_get_instance ();
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp6_ = media_collection_registry_get_all (_tmp5_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp7_ = _tmp6_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp9_ = _tmp8_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (_tmp7_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_media_collection_registry_unref0 (_tmp5_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_sources_it = _tmp9_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		while (TRUE) {
-#line 646 "Branch.c"
+#line 645 "FoldersBranch.c"
 			GeeIterator* _tmp10_;
 			gboolean _tmp11_;
 			MediaSourceCollection* sources = NULL;
@@ -652,54 +651,54 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 			GeeCollection* _tmp15_;
 			GeeCollection* _tmp16_;
 			MediaSourceCollection* _tmp17_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp10_ = _sources_it;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (!_tmp11_) {
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				break;
-#line 664 "Branch.c"
+#line 663 "FoldersBranch.c"
 			}
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp12_ = _sources_it;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			sources = (MediaSourceCollection*) _tmp13_;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp14_ = sources;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp15_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp16_ = _tmp15_;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_g_object_unref0 (_tmp16_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp17_ = sources;
-#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self, 0);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_data_collection_unref0 (sources);
-#line 688 "Branch.c"
+#line 687 "FoldersBranch.c"
 		}
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (_sources_it);
-#line 692 "Branch.c"
+#line 691 "FoldersBranch.c"
 	}
-#line 12 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return self;
-#line 696 "Branch.c"
+#line 695 "FoldersBranch.c"
 }
 
 
 FoldersBranch* folders_branch_new (void) {
-#line 12 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return folders_branch_construct (FOLDERS_TYPE_BRANCH);
-#line 703 "Branch.c"
+#line 702 "FoldersBranch.c"
 }
 
 
@@ -717,45 +716,45 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	const gchar* _tmp8_;
 	gint _tmp9_;
 	gint _tmp10_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = a;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = b;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		result = 0;
-#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		return result;
-#line 735 "Branch.c"
+#line 734 "FoldersBranch.c"
 	}
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = g_strcmp0;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp3_ = a;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp4_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp6_ = b;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp7_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp8_ = _tmp7_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp9_ = _tmp2_ (_tmp5_, _tmp8_);
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	coll_key_equality = _tmp9_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp10_ = coll_key_equality;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp10_ == 0) {
-#line 759 "Branch.c"
+#line 758 "FoldersBranch.c"
 		GCompareFunc _tmp11_;
 		SidebarEntry* _tmp12_;
 		gchar* _tmp13_;
@@ -765,99 +764,99 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		gchar* _tmp17_;
 		gint _tmp18_;
 		gint _tmp19_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp11_ = g_strcmp0;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp12_ = a;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp13_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp14_ = _tmp13_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp15_ = b;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp16_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp17_ = _tmp16_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp18_ = _tmp11_ (_tmp14_, _tmp17_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp19_ = _tmp18_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_free0 (_tmp17_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_free0 (_tmp14_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		result = _tmp19_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		return result;
-#line 795 "Branch.c"
+#line 794 "FoldersBranch.c"
 	}
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = coll_key_equality;
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 801 "Branch.c"
+#line 800 "FoldersBranch.c"
 }
 
 
 static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) {
 	GFile* _tmp0_;
 	MediaSource* _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media_source));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = old_file;
-#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_branch_remove_entry (self, _tmp0_);
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = media_source;
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_branch_add_entry (self, _tmp1_);
-#line 824 "Branch.c"
+#line 823 "FoldersBranch.c"
 }
 
 
 static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_branch_on_master_source_replaced ((FoldersBranch*) self, _sender, old_file, new_file);
-#line 831 "Branch.c"
+#line 830 "FoldersBranch.c"
 }
 
 
 static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) {
 	GeeIterable* _tmp0_;
 	GeeIterable* _tmp9_;
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = added;
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp0_ != NULL) {
-#line 848 "Branch.c"
+#line 847 "FoldersBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp1_ = added;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_object_it = _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			while (TRUE) {
-#line 861 "Branch.c"
+#line 860 "FoldersBranch.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				DataObject* object = NULL;
@@ -865,57 +864,57 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 				gpointer _tmp6_;
 				DataObject* _tmp7_;
 				DataObject* _tmp8_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp3_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				if (!_tmp4_) {
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 					break;
-#line 877 "Branch.c"
+#line 876 "FoldersBranch.c"
 				}
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp5_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				object = (DataObject*) _tmp6_;
-#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp7_ = object;
-#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp8_ = object;
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), "master-replaced", (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self, 0);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (object);
-#line 895 "Branch.c"
+#line 894 "FoldersBranch.c"
 			}
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 899 "Branch.c"
+#line 898 "FoldersBranch.c"
 		}
 	}
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp9_ = removed;
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp9_ != NULL) {
-#line 906 "Branch.c"
+#line 905 "FoldersBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp10_;
 			GeeIterator* _tmp11_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp10_ = removed;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp11_ = gee_iterable_iterator (_tmp10_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_object_it = _tmp11_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			while (TRUE) {
-#line 919 "Branch.c"
+#line 918 "FoldersBranch.c"
 				GeeIterator* _tmp12_;
 				gboolean _tmp13_;
 				DataObject* object = NULL;
@@ -926,54 +925,54 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 				GFile* _tmp18_;
 				DataObject* _tmp19_;
 				guint _tmp20_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp12_ = _object_it;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				if (!_tmp13_) {
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 					break;
-#line 938 "Branch.c"
+#line 937 "FoldersBranch.c"
 				}
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp14_ = _object_it;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				object = (DataObject*) _tmp15_;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp16_ = object;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp18_ = _tmp17_;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				folders_branch_remove_entry (self, _tmp18_);
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (_tmp18_);
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp19_ = object;
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp20_, NULL, FALSE);
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (object);
-#line 964 "Branch.c"
+#line 963 "FoldersBranch.c"
 			}
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 968 "Branch.c"
+#line 967 "FoldersBranch.c"
 		}
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 977 "Branch.c"
+#line 976 "FoldersBranch.c"
 }
 
 
@@ -987,263 +986,286 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 	GFile* _tmp3_;
 	GFile* _tmp4_;
 	FoldersSidebarEntry* parent_entry = NULL;
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = media;
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = media_source_get_file (_tmp0_);
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	file = _tmp1_;
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	elements = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp3_ = file;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp4_ = g_file_get_parent (_tmp3_);
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	parent = _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	while (TRUE) {
-#line 1013 "Branch.c"
-		GFile* _tmp5_;
+#line 1012 "FoldersBranch.c"
+		gboolean _tmp5_ = FALSE;
 		GFile* _tmp6_;
-		GFile* _tmp7_;
-		GFile* _tmp8_;
-		GFile* _tmp9_;
-		gboolean _tmp10_;
-		gboolean _tmp11_;
-		GeeArrayList* _tmp12_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		GFile* _tmp12_;
 		GFile* _tmp13_;
-		GFile* _tmp14_;
-		GFile* _tmp15_;
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp5_ = parent;
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		if (!(_tmp5_ != NULL)) {
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+		gboolean _tmp14_;
+		gboolean _tmp15_;
+		GeeArrayList* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		GFile* _tmp19_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp6_ = parent;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		if (_tmp6_ != NULL) {
+#line 1029 "FoldersBranch.c"
+			GFile* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp7_ = parent;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp8_ = g_file_get_path (_tmp7_);
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp9_ = _tmp8_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp5_ = _tmp9_ != NULL;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_g_free0 (_tmp9_);
+#line 1043 "FoldersBranch.c"
+		} else {
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp5_ = FALSE;
+#line 1047 "FoldersBranch.c"
+		}
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		if (!_tmp5_) {
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			break;
-#line 1031 "Branch.c"
+#line 1053 "FoldersBranch.c"
 		}
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp6_ = parent;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp7_ = self->priv->home_dir;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp8_ = g_file_get_parent (_tmp7_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp9_ = _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp10_ = g_file_equal (_tmp6_, _tmp9_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp11_ = _tmp10_;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_g_object_unref0 (_tmp9_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		if (_tmp11_) {
-#line 82 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp10_ = parent;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp11_ = self->priv->home_dir;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp12_ = g_file_get_parent (_tmp11_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp13_ = _tmp12_;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp14_ = g_file_equal (_tmp10_, _tmp13_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp15_ = _tmp14_;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_g_object_unref0 (_tmp13_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		if (_tmp15_) {
+#line 82 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			break;
-#line 1051 "Branch.c"
+#line 1073 "FoldersBranch.c"
 		}
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp12_ = elements;
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp13_ = parent;
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp14_ = parent;
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp15_ = g_file_get_parent (_tmp14_);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp16_ = elements;
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp17_ = parent;
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp18_ = parent;
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp19_ = g_file_get_parent (_tmp18_);
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (parent);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		parent = _tmp15_;
-#line 1067 "Branch.c"
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		parent = _tmp19_;
+#line 1089 "FoldersBranch.c"
 	}
-#line 91 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	parent_entry = NULL;
-#line 1071 "Branch.c"
+#line 1093 "FoldersBranch.c"
 	{
 		gint ctr = 0;
-		GeeArrayList* _tmp16_;
-		gint _tmp17_;
-		gint _tmp18_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp16_ = elements;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		_tmp18_ = _tmp17_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-		ctr = _tmp18_ - 1;
-#line 1085 "Branch.c"
+		GeeArrayList* _tmp20_;
+		gint _tmp21_;
+		gint _tmp22_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp20_ = elements;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		_tmp22_ = _tmp21_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+		ctr = _tmp22_ - 1;
+#line 1107 "FoldersBranch.c"
 		{
-			gboolean _tmp19_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-			_tmp19_ = TRUE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+			gboolean _tmp23_ = FALSE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+			_tmp23_ = TRUE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			while (TRUE) {
-#line 1092 "Branch.c"
-				gint _tmp21_;
+#line 1114 "FoldersBranch.c"
+				gint _tmp25_;
 				GFile* parent_dir = NULL;
-				GeeArrayList* _tmp22_;
-				gint _tmp23_;
-				gpointer _tmp24_;
+				GeeArrayList* _tmp26_;
+				gint _tmp27_;
+				gpointer _tmp28_;
 				FoldersSidebarEntry* old_parent_entry = NULL;
-				FoldersSidebarEntry* _tmp25_;
-				FoldersSidebarEntry* _tmp26_;
-				GeeHashMap* _tmp27_;
-				GFile* _tmp28_;
-				gpointer _tmp29_;
+				FoldersSidebarEntry* _tmp29_;
 				FoldersSidebarEntry* _tmp30_;
-				gint _tmp42_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				if (!_tmp19_) {
-#line 1108 "Branch.c"
-					gint _tmp20_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp20_ = ctr;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					ctr = _tmp20_ - 1;
-#line 1114 "Branch.c"
+				GeeHashMap* _tmp31_;
+				GFile* _tmp32_;
+				gpointer _tmp33_;
+				FoldersSidebarEntry* _tmp34_;
+				gint _tmp46_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				if (!_tmp23_) {
+#line 1130 "FoldersBranch.c"
+					gint _tmp24_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp24_ = ctr;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					ctr = _tmp24_ - 1;
+#line 1136 "FoldersBranch.c"
 				}
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp19_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp21_ = ctr;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				if (!(_tmp21_ >= 0)) {
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp23_ = FALSE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp25_ = ctr;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				if (!(_tmp25_ >= 0)) {
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 					break;
-#line 1124 "Branch.c"
+#line 1146 "FoldersBranch.c"
 				}
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp22_ = elements;
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp23_ = ctr;
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				parent_dir = (GFile*) _tmp24_;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp25_ = parent_entry;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp26_ = _g_object_ref0 (_tmp25_);
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				old_parent_entry = _tmp26_;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp27_ = self->priv->entries;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp28_ = parent_dir;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp26_ = elements;
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp27_ = ctr;
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_);
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				parent_dir = (GFile*) _tmp28_;
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp29_ = parent_entry;
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp30_ = _g_object_ref0 (_tmp29_);
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				old_parent_entry = _tmp30_;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp31_ = self->priv->entries;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp32_ = parent_dir;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp33_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_);
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (parent_entry);
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				parent_entry = (FoldersSidebarEntry*) _tmp29_;
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp30_ = parent_entry;
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				if (_tmp30_ == NULL) {
-#line 1154 "Branch.c"
-					GFile* _tmp31_;
-					FoldersSidebarEntry* _tmp32_;
-					GeeHashMap* _tmp33_;
-					GFile* _tmp34_;
-					FoldersSidebarEntry* _tmp35_;
-					SidebarEntry* _tmp36_ = NULL;
-					FoldersSidebarEntry* _tmp37_;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				parent_entry = (FoldersSidebarEntry*) _tmp33_;
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp34_ = parent_entry;
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				if (_tmp34_ == NULL) {
+#line 1176 "FoldersBranch.c"
+					GFile* _tmp35_;
+					FoldersSidebarEntry* _tmp36_;
+					GeeHashMap* _tmp37_;
+					GFile* _tmp38_;
+					FoldersSidebarEntry* _tmp39_;
+					SidebarEntry* _tmp40_ = NULL;
 					FoldersSidebarEntry* _tmp41_;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp31_ = parent_dir;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp32_ = folders_sidebar_entry_new (_tmp31_);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+					FoldersSidebarEntry* _tmp45_;
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp35_ = parent_dir;
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp36_ = folders_sidebar_entry_new (_tmp35_);
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 					_g_object_unref0 (parent_entry);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					parent_entry = _tmp32_;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp33_ = self->priv->entries;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp34_ = parent_dir;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp35_ = parent_entry;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp37_ = old_parent_entry;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					if (_tmp37_ == NULL) {
-#line 1183 "Branch.c"
-						SidebarEntry* _tmp38_;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_tmp38_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_g_object_unref0 (_tmp36_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_tmp36_ = _tmp38_;
-#line 1191 "Branch.c"
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					parent_entry = _tmp36_;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp37_ = self->priv->entries;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp38_ = parent_dir;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp39_ = parent_entry;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp41_ = old_parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					if (_tmp41_ == NULL) {
+#line 1205 "FoldersBranch.c"
+						SidebarEntry* _tmp42_;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_tmp42_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_g_object_unref0 (_tmp40_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_tmp40_ = _tmp42_;
+#line 1213 "FoldersBranch.c"
 					} else {
-						FoldersSidebarEntry* _tmp39_;
-						SidebarEntry* _tmp40_;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_tmp39_ = old_parent_entry;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_g_object_unref0 (_tmp36_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-						_tmp36_ = _tmp40_;
-#line 1203 "Branch.c"
+						FoldersSidebarEntry* _tmp43_;
+						SidebarEntry* _tmp44_;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_tmp43_ = old_parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_g_object_unref0 (_tmp40_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+						_tmp40_ = _tmp44_;
+#line 1225 "FoldersBranch.c"
 					}
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp41_ = parent_entry;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_g_object_unref0 (_tmp36_);
-#line 1211 "Branch.c"
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp45_ = parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_g_object_unref0 (_tmp40_);
+#line 1233 "FoldersBranch.c"
 				}
-#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				_tmp42_ = ctr;
-#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				if (_tmp42_ == 0) {
-#line 1217 "Branch.c"
-					FoldersSidebarEntry* _tmp43_;
-					gint _tmp44_;
-					gint _tmp45_;
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp43_ = parent_entry;
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp44_ = folders_sidebar_entry_get_count (_tmp43_);
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					_tmp45_ = _tmp44_;
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-					folders_sidebar_entry_set_count (_tmp43_, _tmp45_ + 1);
-#line 1229 "Branch.c"
+#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				_tmp46_ = ctr;
+#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+				if (_tmp46_ == 0) {
+#line 1239 "FoldersBranch.c"
+					FoldersSidebarEntry* _tmp47_;
+					gint _tmp48_;
+					gint _tmp49_;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp47_ = parent_entry;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp48_ = folders_sidebar_entry_get_count (_tmp47_);
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					_tmp49_ = _tmp48_;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+					folders_sidebar_entry_set_count (_tmp47_, _tmp49_ + 1);
+#line 1251 "FoldersBranch.c"
 				}
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (old_parent_entry);
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (parent_dir);
-#line 1235 "Branch.c"
+#line 1257 "FoldersBranch.c"
 			}
 		}
 	}
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (parent_entry);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (parent);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (elements);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (file);
-#line 1247 "Branch.c"
+#line 1269 "FoldersBranch.c"
 }
 
 
@@ -1269,96 +1291,96 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 	FoldersSidebarEntry* _tmp18_;
 	FoldersSidebarEntry* _tmp19_;
 	FoldersSidebarEntry* _tmp40_;
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->entries;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = file;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = g_file_get_parent (_tmp1_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp5_ = (FoldersSidebarEntry*) _tmp4_;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folder_entry = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp6_ = folder_entry;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp6_ == NULL) {
-#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (folder_entry);
-#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		return;
-#line 1301 "Branch.c"
+#line 1323 "FoldersBranch.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp7_ = folder_entry;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp8_ = folders_sidebar_entry_get_count (_tmp7_);
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_vala_assert (_tmp9_ > 0, "folder_entry.count > 0");
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp11_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp12_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp13_ = folders_sidebar_entry_get_count (_tmp12_);
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp14_ = _tmp13_;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_sidebar_entry_set_count (_tmp12_, _tmp14_ - 1);
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if ((_tmp14_ - 1) > 0) {
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp10_ = TRUE;
-#line 1325 "Branch.c"
+#line 1347 "FoldersBranch.c"
 	} else {
 		FoldersSidebarEntry* _tmp15_;
 		gint _tmp16_;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp15_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp16_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp10_ = _tmp16_ > 0;
-#line 1335 "Branch.c"
+#line 1357 "FoldersBranch.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp10_) {
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (folder_entry);
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		return;
-#line 1343 "Branch.c"
+#line 1365 "FoldersBranch.c"
 	}
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp17_ = folder_entry;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	prune_point = _tmp18_;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp19_ = prune_point;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_vala_assert (_tmp19_ != NULL, "prune_point != null");
-#line 1355 "Branch.c"
+#line 1377 "FoldersBranch.c"
 	{
 		gboolean _tmp20_ = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp20_ = TRUE;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		while (TRUE) {
-#line 1362 "Branch.c"
+#line 1384 "FoldersBranch.c"
 			gboolean removed = FALSE;
 			GeeHashMap* _tmp21_;
 			FoldersSidebarEntry* _tmp22_;
@@ -1375,140 +1397,140 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 			FoldersSidebarEntry* _tmp32_;
 			FoldersSidebarEntry* _tmp38_;
 			FoldersSidebarEntry* _tmp39_;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (!_tmp20_) {
-#line 1381 "Branch.c"
+#line 1403 "FoldersBranch.c"
 			}
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp20_ = FALSE;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp21_ = self->priv->entries;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp22_ = prune_point;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp23_ = folders_sidebar_entry_get_dir (_tmp22_);
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp24_ = _tmp23_;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL);
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			removed = _tmp25_;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp26_ = removed;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_vala_assert (_tmp26_, "removed");
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp27_ = prune_point;
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp28_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp28_) : NULL;
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (_tmp29_ == NULL) {
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (_tmp28_);
-#line 1411 "Branch.c"
+#line 1433 "FoldersBranch.c"
 			}
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			parent = _tmp29_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp32_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (_tmp32_ == NULL) {
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp31_ = TRUE;
-#line 1421 "Branch.c"
+#line 1443 "FoldersBranch.c"
 			} else {
 				FoldersSidebarEntry* _tmp33_;
 				gint _tmp34_;
 				gint _tmp35_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp33_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp34_ = folders_sidebar_entry_get_count (_tmp33_);
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp35_ = _tmp34_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp31_ = _tmp35_ != 0;
-#line 1434 "Branch.c"
+#line 1456 "FoldersBranch.c"
 			}
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (_tmp31_) {
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp30_ = TRUE;
-#line 1440 "Branch.c"
+#line 1462 "FoldersBranch.c"
 			} else {
 				FoldersSidebarEntry* _tmp36_;
 				gint _tmp37_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp36_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp37_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_tmp30_ = _tmp37_ > 1;
-#line 1450 "Branch.c"
+#line 1472 "FoldersBranch.c"
 			}
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (_tmp30_) {
-#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				_g_object_unref0 (parent);
-#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				break;
-#line 1458 "Branch.c"
+#line 1480 "FoldersBranch.c"
 			}
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp38_ = parent;
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_g_object_unref0 (prune_point);
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			prune_point = _tmp39_;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_g_object_unref0 (parent);
-#line 1470 "Branch.c"
+#line 1492 "FoldersBranch.c"
 		}
 	}
-#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp40_ = prune_point;
-#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (prune_point);
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (folder_entry);
-#line 1481 "Branch.c"
+#line 1503 "FoldersBranch.c"
 }
 
 
 static void folders_branch_class_init (FoldersBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_type_class_add_private (klass, sizeof (FoldersBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_branch_finalize;
-#line 1492 "Branch.c"
+#line 1514 "FoldersBranch.c"
 }
 
 
 static void folders_branch_instance_init (FoldersBranch * self) {
 	GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv = FOLDERS_BRANCH_GET_PRIVATE (self);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv->entries = _tmp0_;
-#line 1504 "Branch.c"
+#line 1526 "FoldersBranch.c"
 }
 
 
 static void folders_branch_finalize (GObject * obj) {
 	FoldersBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch);
-#line 1512 "Branch.c"
+#line 1534 "FoldersBranch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -1517,27 +1539,27 @@ static void folders_branch_finalize (GObject * obj) {
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp1_ = _tmp0_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp2_ = media_collection_registry_get_all (_tmp1_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_media_collection_registry_unref0 (_tmp1_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_sources_it = _tmp5_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		while (TRUE) {
-#line 1541 "Branch.c"
+#line 1563 "FoldersBranch.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
@@ -1545,43 +1567,43 @@ static void folders_branch_finalize (GObject * obj) {
 			gpointer _tmp9_;
 			MediaSourceCollection* _tmp10_;
 			guint _tmp11_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp6_ = _sources_it;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			if (!_tmp7_) {
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 				break;
-#line 1557 "Branch.c"
+#line 1579 "FoldersBranch.c"
 			}
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp8_ = _sources_it;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			sources = (MediaSourceCollection*) _tmp9_;
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp10_ = sources;
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_data_collection_unref0 (sources);
-#line 1573 "Branch.c"
+#line 1595 "FoldersBranch.c"
 		}
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (_sources_it);
-#line 1577 "Branch.c"
+#line 1599 "FoldersBranch.c"
 	}
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (self->priv->entries);
-#line 10 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (self->priv->home_dir);
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (folders_branch_parent_class)->finalize (obj);
-#line 1585 "Branch.c"
+#line 1607 "FoldersBranch.c"
 }
 
 
@@ -1599,25 +1621,25 @@ GType folders_branch_get_type (void) {
 
 FoldersRoot* folders_root_construct (GType object_type) {
 	FoldersRoot * self = NULL;
-#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), TRUE);
-#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+	self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), _ ("Browse the library’s folder structure"), TRUE);
+#line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return self;
-#line 1607 "Branch.c"
+#line 1629 "FoldersBranch.c"
 }
 
 
 FoldersRoot* folders_root_new (void) {
-#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return folders_root_construct (FOLDERS_TYPE_ROOT);
-#line 1614 "Branch.c"
+#line 1636 "FoldersBranch.c"
 }
 
 
 static void folders_root_class_init (FoldersRootClass * klass) {
-#line 142 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_root_parent_class = g_type_class_peek_parent (klass);
-#line 1621 "Branch.c"
+#line 1643 "FoldersBranch.c"
 }
 
 
@@ -1645,40 +1667,40 @@ FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile*
 	gchar* _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = (FoldersSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = dir;
-#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_sidebar_entry_set_dir (self, _tmp0_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = dir;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp4_ = g_utf8_collate_key_for_filename (_tmp3_, (gssize) -1);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_sidebar_entry_set_collation (self, _tmp5_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_free0 (_tmp5_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_free0 (_tmp3_);
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return self;
-#line 1675 "Branch.c"
+#line 1697 "FoldersBranch.c"
 }
 
 
 FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) {
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir);
-#line 1682 "Branch.c"
+#line 1704 "FoldersBranch.c"
 }
 
 
@@ -1687,17 +1709,17 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr
 	gchar* result = NULL;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
-#line 174 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = g_file_get_basename (_tmp0_);
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp1_;
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1701 "Branch.c"
+#line 1723 "FoldersBranch.c"
 }
 
 
@@ -1708,36 +1730,36 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	gint _tmp1_;
 	gint _tmp2_;
 	gchar* _tmp5_;
-#line 178 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = folders_sidebar_entry_get_count (self);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp2_ = _tmp1_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp2_ == 0) {
-#line 1720 "Branch.c"
+#line 1742 "FoldersBranch.c"
 		const gchar* _tmp3_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp3_ = folders_icon;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp0_ = _tmp3_;
-#line 1726 "Branch.c"
+#line 1748 "FoldersBranch.c"
 	} else {
 		const gchar* _tmp4_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp4_ = folders_have_photos_icon;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp0_ = _tmp4_;
-#line 1733 "Branch.c"
+#line 1755 "FoldersBranch.c"
 	}
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp5_ = g_strdup (_tmp0_);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp5_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1741 "Branch.c"
+#line 1763 "FoldersBranch.c"
 }
 
 
@@ -1746,30 +1768,30 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
 	gchar* result = NULL;
 	GFile* _tmp0_;
 	gchar* _tmp1_;
-#line 182 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp1_;
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1760 "Branch.c"
+#line 1782 "FoldersBranch.c"
 }
 
 
 static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	FoldersSidebarEntry * self;
 	gboolean result = FALSE;
-#line 186 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = TRUE;
-#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1773 "Branch.c"
+#line 1795 "FoldersBranch.c"
 }
 
 
@@ -1778,56 +1800,56 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
 	Page* result = NULL;
 	GFile* _tmp0_;
 	FoldersPage* _tmp1_;
-#line 190 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = folders_page_new (_tmp0_);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1794 "Branch.c"
+#line 1816 "FoldersBranch.c"
 }
 
 
 GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
 	GFile* result;
 	GFile* _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1809 "Branch.c"
+#line 1831 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) {
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (folders_sidebar_entry_get_dir (self) != value) {
-#line 1818 "Branch.c"
+#line 1840 "FoldersBranch.c"
 		GFile* _tmp0_;
 		GFile* _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp0_ = value;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_object_unref0 (self->priv->_dir);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		self->priv->_dir = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_object_notify ((GObject *) self, "dir");
-#line 1831 "Branch.c"
+#line 1853 "FoldersBranch.c"
 	}
 }
 
@@ -1835,37 +1857,37 @@ static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* val
 const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
 	const gchar* result;
 	const gchar* _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_collation;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1847 "Branch.c"
+#line 1869 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) {
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) {
-#line 1856 "Branch.c"
+#line 1878 "FoldersBranch.c"
 		const gchar* _tmp0_;
 		gchar* _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp0_ = value;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_free0 (self->priv->_collation);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		self->priv->_collation = _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_object_notify ((GObject *) self, "collation");
-#line 1869 "Branch.c"
+#line 1891 "FoldersBranch.c"
 	}
 }
 
@@ -1873,15 +1895,15 @@ static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, cons
 gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
 	gint result;
 	gint _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), 0);
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_count;
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	result = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	return result;
-#line 1885 "Branch.c"
+#line 1907 "FoldersBranch.c"
 }
 
 
@@ -1892,139 +1914,139 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gint _tmp4_;
-#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp0_ = self->priv->_count;
-#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	prev_count = _tmp0_;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp1_ = value;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv->_count = _tmp1_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_tmp4_ = prev_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp4_ == 0) {
-#line 1910 "Branch.c"
+#line 1932 "FoldersBranch.c"
 		gint _tmp5_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp5_ = self->priv->_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp3_ = _tmp5_ == 1;
-#line 1916 "Branch.c"
+#line 1938 "FoldersBranch.c"
 	} else {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp3_ = FALSE;
-#line 1920 "Branch.c"
+#line 1942 "FoldersBranch.c"
 	}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp3_) {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp2_ = TRUE;
-#line 1926 "Branch.c"
+#line 1948 "FoldersBranch.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
 		gint _tmp7_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp7_ = prev_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		if (_tmp7_ == 1) {
-#line 1934 "Branch.c"
+#line 1956 "FoldersBranch.c"
 			gint _tmp8_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp8_ = self->priv->_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp6_ = _tmp8_ == 0;
-#line 1940 "Branch.c"
+#line 1962 "FoldersBranch.c"
 		} else {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 			_tmp6_ = FALSE;
-#line 1944 "Branch.c"
+#line 1966 "FoldersBranch.c"
 		}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp2_ = _tmp6_;
-#line 1948 "Branch.c"
+#line 1970 "FoldersBranch.c"
 	}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	if (_tmp2_) {
-#line 1952 "Branch.c"
+#line 1974 "FoldersBranch.c"
 		gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp9_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_tmp10_ = _tmp9_;
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp10_);
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		_g_free0 (_tmp10_);
-#line 1963 "Branch.c"
+#line 1985 "FoldersBranch.c"
 	}
-#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_object_notify ((GObject *) self, "count");
-#line 1967 "Branch.c"
+#line 1989 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_name;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_icon;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_to_string;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_create_page;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_folders_sidebar_entry_set_property;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, 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"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, 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"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 1996 "Branch.c"
+#line 2018 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	folders_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select;
-#line 2005 "Branch.c"
+#line 2027 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self->priv->_count = 0;
-#line 2014 "Branch.c"
+#line 2036 "FoldersBranch.c"
 }
 
 
 static void folders_sidebar_entry_finalize (GObject * obj) {
 	FoldersSidebarEntry * self;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_object_unref0 (self->priv->_dir);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	_g_free0 (self->priv->_collation);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj);
-#line 2028 "Branch.c"
+#line 2050 "FoldersBranch.c"
 }
 
 
@@ -2045,33 +2067,33 @@ GType folders_sidebar_entry_get_type (void) {
 static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	FoldersSidebarEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	switch (property_id) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_value_set_object (value, folders_sidebar_entry_get_dir (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_value_set_string (value, folders_sidebar_entry_get_collation (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		g_value_set_int (value, folders_sidebar_entry_get_count (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 2069 "Branch.c"
+#line 2091 "FoldersBranch.c"
 		default:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 2075 "Branch.c"
+#line 2097 "FoldersBranch.c"
 	}
 }
 
@@ -2079,33 +2101,33 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr
 static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	FoldersSidebarEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 	switch (property_id) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		folders_sidebar_entry_set_dir (self, g_value_get_object (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		folders_sidebar_entry_set_collation (self, g_value_get_string (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		folders_sidebar_entry_set_count (self, g_value_get_int (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 2103 "Branch.c"
+#line 2125 "FoldersBranch.c"
 		default:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
 		break;
-#line 2109 "Branch.c"
+#line 2131 "FoldersBranch.c"
 	}
 }
 
diff --git a/src/folders/Branch.vala b/src/folders/FoldersBranch.vala
index d14a148..5de7082 100644
--- a/src/folders/Branch.vala
+++ b/src/folders/FoldersBranch.vala
@@ -76,7 +76,7 @@ public class Folders.Branch : Sidebar.Branch {
         
         // add the path elements in reverse order up to home directory
         File? parent = file.get_parent();
-        while (parent != null) {
+        while (parent != null && parent.get_path() != null) {
             // don't process paths above the user's home directory
             if (parent.equal(home_dir.get_parent()))
                 break;
@@ -141,7 +141,7 @@ public class Folders.Branch : Sidebar.Branch {
 
 private class Folders.Root : Sidebar.Header {
     public Root() {
-        base (_("Folders"));
+        base (_("Folders"), _("Browse the library’s folder structure"));
     }
 }
 
@@ -168,7 +168,7 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE
     
     public SidebarEntry(File dir) {
         this.dir = dir;
-        collation = g_utf8_collate_key_for_filename(dir.get_path());
+        collation = dir.get_path().collate_key_for_filename();
     }
     
     public override string get_sidebar_name() {
diff --git a/src/folders/Page.c b/src/folders/FoldersPage.c
index 49bb21a..abc3f83 100644
--- a/src/folders/Page.c
+++ b/src/folders/FoldersPage.c
@@ -1,5 +1,5 @@
-/* Page.c generated by valac 0.36.6, the Vala compiler
- * generated from Page.vala, do not modify */
+/* FoldersPage.c generated by valac 0.36.6, the Vala compiler
+ * generated from FoldersPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -686,27 +686,27 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 	gchar* _tmp2_;
 	GFile* _tmp3_;
 	FoldersPageFolderViewManager* _tmp4_;
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp0_ = dir;
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp2_ = _tmp1_;
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = (FoldersPage*) collection_page_construct (object_type, _tmp2_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_free0 (_tmp2_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp3_ = dir;
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp4_ = folders_page_folder_view_manager_new (self, _tmp3_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_view_manager_unref0 (self->priv->view_manager);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self->priv->view_manager = _tmp4_;
-#line 710 "Page.c"
+#line 710 "FoldersPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_;
@@ -715,27 +715,27 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 		GeeCollection* _tmp8_;
 		GeeIterator* _tmp9_;
 		GeeIterator* _tmp10_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp5_ = media_collection_registry_get_instance ();
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp6_ = _tmp5_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp7_ = media_collection_registry_get_all (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp8_ = _tmp7_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_tmp10_ = _tmp9_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_media_collection_registry_unref0 (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_sources_it = _tmp10_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		while (TRUE) {
-#line 739 "Page.c"
+#line 739 "FoldersPage.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
@@ -747,56 +747,56 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 			FoldersPageFolderViewManager* _tmp18_;
 			ViewCollectionMonitor* _tmp19_;
 			ViewCollectionMonitor* _tmp20_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp11_ = _sources_it;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp12_ = gee_iterator_next (_tmp11_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			if (!_tmp12_) {
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 				break;
-#line 759 "Page.c"
+#line 759 "FoldersPage.c"
 			}
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp13_ = _sources_it;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp14_ = gee_iterator_get (_tmp13_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			sources = (MediaSourceCollection*) _tmp14_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp16_ = _tmp15_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp17_ = sources;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp18_ = self->priv->view_manager;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp19_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_tmp20_ = _tmp19_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_view_collection_monitor_unref0 (_tmp20_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_data_collection_unref0 (_tmp16_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_data_collection_unref0 (sources);
-#line 785 "Page.c"
+#line 785 "FoldersPage.c"
 		}
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 789 "Page.c"
+#line 789 "FoldersPage.c"
 	}
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self;
-#line 793 "Page.c"
+#line 793 "FoldersPage.c"
 }
 
 
 FoldersPage* folders_page_new (GFile* dir) {
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return folders_page_construct (FOLDERS_TYPE_PAGE, dir);
-#line 800 "Page.c"
+#line 800 "FoldersPage.c"
 }
 
 
@@ -808,31 +808,31 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = _tmp0_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	configuration_facade_get_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	if (sort_order) {
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		*sort_order = _vala_sort_order;
-#line 830 "Page.c"
+#line 830 "FoldersPage.c"
 	}
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	if (sort_by) {
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		*sort_by = _vala_sort_by;
-#line 836 "Page.c"
+#line 836 "FoldersPage.c"
 	}
 }
 
@@ -843,28 +843,28 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gint _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 37 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp2_ = sort_order;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp3_ = sort_by;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	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"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 861 "Page.c"
+#line 861 "FoldersPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 868 "Page.c"
+#line 868 "FoldersPage.c"
 }
 
 
@@ -873,32 +873,32 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct
 	FoldersPage* _tmp0_;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL);
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 12 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp0_ = owner;
-#line 12 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = dir;
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (self->dir);
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self->dir = _tmp2_;
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self;
-#line 895 "Page.c"
+#line 895 "FoldersPage.c"
 }
 
 
 static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) {
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir);
-#line 902 "Page.c"
+#line 902 "FoldersPage.c"
 }
 
 
@@ -911,40 +911,40 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag
 	GFile* _tmp3_;
 	gboolean _tmp4_;
 	gboolean _tmp5_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
-#line 17 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp0_ = source;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp2_ = _tmp1_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp3_ = self->dir;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	result = _tmp5_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return result;
-#line 937 "Page.c"
+#line 937 "FoldersPage.c"
 }
 
 
 static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass) {
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	folders_page_folder_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize;
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view;
-#line 948 "Page.c"
+#line 948 "FoldersPage.c"
 }
 
 
@@ -954,13 +954,13 @@ static void folders_page_folder_view_manager_instance_init (FoldersPageFolderVie
 
 static void folders_page_folder_view_manager_finalize (ViewManager * obj) {
 	FoldersPageFolderViewManager * self;
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
-#line 9 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 9 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (self->dir);
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj);
-#line 964 "Page.c"
+#line 964 "FoldersPage.c"
 }
 
 
@@ -977,36 +977,36 @@ static GType folders_page_folder_view_manager_get_type (void) {
 
 
 static void folders_page_class_init (FoldersPageClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	folders_page_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_type_class_add_private (klass, sizeof (FoldersPagePrivate));
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) folders_page_real_get_config_photos_sort;
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort;
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_page_finalize;
-#line 991 "Page.c"
+#line 991 "FoldersPage.c"
 }
 
 
 static void folders_page_instance_init (FoldersPage * self) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self->priv = FOLDERS_PAGE_GET_PRIVATE (self);
-#line 998 "Page.c"
+#line 998 "FoldersPage.c"
 }
 
 
 static void folders_page_finalize (GObject * obj) {
 	FoldersPage * self;
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 22 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_view_manager_unref0 (self->priv->view_manager);
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj);
-#line 1010 "Page.c"
+#line 1010 "FoldersPage.c"
 }
 
 
diff --git a/src/folders/Page.vala b/src/folders/FoldersPage.vala
index 6145c95..6145c95 100644
--- a/src/folders/Page.vala
+++ b/src/folders/FoldersPage.vala
diff --git a/src/graphics-processor.c b/src/graphics-processor.c
new file mode 100644
index 0000000..d0ce76a
--- /dev/null
+++ b/src/graphics-processor.c
@@ -0,0 +1,1237 @@
+/* graphics-processor.c generated by valac 0.36.6, the Vala compiler
+ * generated from graphics-processor.vala, do not modify */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gee.h>
+#include "shotwell-graphics-processor.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <float.h>
+#include <math.h>
+#include <gio/gio.h>
+
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _key_value_map_unref0(var) ((var == NULL) ? NULL : (var = (key_value_map_unref (var), NULL)))
+#define _g_option_context_free0(var) ((var == NULL) ? NULL : (var = (g_option_context_free (var), NULL)))
+#define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
+#define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
+#define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
+
+
+extern gchar* input_file;
+gchar* input_file = NULL;
+extern gchar* output_file;
+gchar* output_file = NULL;
+extern gchar* pipeline;
+gchar* pipeline = NULL;
+extern gboolean auto_enhance;
+gboolean auto_enhance = FALSE;
+extern gchar* format;
+gchar* format = NULL;
+extern gint jobs;
+gint jobs = -1;
+
+GeeHashMap* marshall_all_transformations (const gchar* filename);
+gint _vala_main (gchar** args, int args_length1);
+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);
+
+const GOptionEntry options[7] = {{"input", 'i', 0, G_OPTION_ARG_FILENAME, &input_file, "FILE to process", "FILE"}, {"output", 'o', 0, G_OPTION_ARG_FILENAME, &output_file, "destination FILE", "FILE"}, {"pipeline", 'p', 0, G_OPTION_ARG_FILENAME, &pipeline, "graphics PIPELINE to run", "PIPELINE"}, {"auto-enance", 'a', 0, G_OPTION_ARG_NONE, &auto_enhance, "run auto-enhance on input file", NULL}, {"format", 'f', 0, G_OPTION_ARG_STRING, &format, "Save output file in specific format [png, jpeg (default)]", NULL}, {"jobs", 'j', 0, G_OPTION_ARG_INT, &jobs, "Number of parallel jobs to run on an image", NULL}, {NULL, (gchar) 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}};
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 68 "graphics-processor.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 76 "graphics-processor.c"
+	} else {
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 88 "graphics-processor.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 112 "graphics-processor.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 118 "graphics-processor.c"
+	} else {
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 122 "graphics-processor.c"
+	}
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 126 "graphics-processor.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 138 "graphics-processor.c"
+	} else {
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 148 "graphics-processor.c"
+	}
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 154 "graphics-processor.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 168 "graphics-processor.c"
+	} else {
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 178 "graphics-processor.c"
+	}
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 184 "graphics-processor.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 193 "graphics-processor.c"
+	}
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	return result;
+#line 213 "graphics-processor.c"
+}
+
+
+static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (old != NULL, NULL);
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (replacement != NULL, NULL);
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 232 "graphics-processor.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 239 "graphics-processor.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 245 "graphics-processor.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 255 "graphics-processor.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 259 "graphics-processor.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 267 "graphics-processor.c"
+	}
+	{
+		GRegex* regex = NULL;
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 299 "graphics-processor.c"
+				goto __catch1_g_regex_error;
+			}
+#line 1412 "/usr/share/vala-0.36/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 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			return NULL;
+#line 308 "graphics-processor.c"
+		}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 324 "graphics-processor.c"
+				goto __catch1_g_regex_error;
+			}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/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 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+			return NULL;
+#line 335 "graphics-processor.c"
+		}
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_regex_unref0 (regex);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 349 "graphics-processor.c"
+	}
+	goto __finally1;
+	__catch1_g_regex_error:
+	{
+		GError* e = NULL;
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		e = _inner_error_;
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_inner_error_ = NULL;
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_assert_not_reached ();
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_error_free0 (e);
+#line 363 "graphics-processor.c"
+	}
+	__finally1:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1411 "/usr/share/vala-0.36/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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		g_clear_error (&_inner_error_);
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return NULL;
+#line 374 "graphics-processor.c"
+	}
+}
+
+
+GeeHashMap* marshall_all_transformations (const gchar* filename) {
+	GeeHashMap* result = NULL;
+	GError * _inner_error_ = NULL;
+#line 18 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_return_val_if_fail (filename != NULL, NULL);
+#line 384 "graphics-processor.c"
+	{
+		GKeyFile* keyfile = NULL;
+		GKeyFile* _tmp0_;
+		const gchar* _tmp1_;
+		gboolean _tmp2_;
+		GeeHashMap* map = NULL;
+		GeeHashMap* _tmp17_;
+		gchar** objects = NULL;
+		GKeyFile* _tmp18_;
+		gsize _tmp19_;
+		gchar** _tmp20_;
+		gint objects_length1;
+		gint _objects_size_;
+		gchar** _tmp21_;
+		gint _tmp21__length1;
+#line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp0_ = g_key_file_new ();
+#line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		keyfile = _tmp0_;
+#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp1_ = filename;
+#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp2_ = g_str_has_prefix (_tmp1_, "string:");
+#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (_tmp2_) {
+#line 410 "graphics-processor.c"
+			gchar* data = NULL;
+			const gchar* _tmp3_;
+			gchar* _tmp4_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
+			gchar* _tmp7_;
+			gchar* _tmp8_;
+			gchar* _tmp9_;
+			GKeyFile* _tmp10_;
+			const gchar* _tmp11_;
+			const gchar* _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp3_ = filename;
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp4_ = string_substring (_tmp3_, (glong) 7, (glong) -1);
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp5_ = _tmp4_;
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp6_ = string_replace (_tmp5_, "&", "\n");
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp7_ = _tmp6_;
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp8_ = g_strconcat ("[adjustments]\n", _tmp7_, NULL);
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp9_ = _tmp8_;
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_g_free0 (_tmp7_);
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_g_free0 (_tmp5_);
+#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			data = _tmp9_;
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp10_ = keyfile;
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp11_ = data;
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp12_ = data;
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp13_ = strlen (_tmp12_);
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp14_ = _tmp13_;
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			g_key_file_load_from_data (_tmp10_, _tmp11_, (gsize) _tmp14_, G_KEY_FILE_NONE, &_inner_error_);
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+				_g_free0 (data);
+#line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+				_g_key_file_unref0 (keyfile);
+#line 462 "graphics-processor.c"
+				goto __catch0_g_error;
+			}
+#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_g_free0 (data);
+#line 467 "graphics-processor.c"
+		} else {
+			GKeyFile* _tmp15_;
+			const gchar* _tmp16_;
+#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp15_ = keyfile;
+#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp16_ = filename;
+#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			g_key_file_load_from_file (_tmp15_, _tmp16_, G_KEY_FILE_NONE, &_inner_error_);
+#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+				_g_key_file_unref0 (keyfile);
+#line 481 "graphics-processor.c"
+				goto __catch0_g_error;
+			}
+		}
+#line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp17_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		map = _tmp17_;
+#line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp18_ = keyfile;
+#line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp20_ = g_key_file_get_groups (_tmp18_, &_tmp19_);
+#line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		objects = _tmp20_;
+#line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		objects_length1 = _tmp19_;
+#line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_objects_size_ = objects_length1;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp21_ = objects;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp21__length1 = objects_length1;
+#line 503 "graphics-processor.c"
+		{
+			gchar** object_collection = NULL;
+			gint object_collection_length1 = 0;
+			gint _object_collection_size_ = 0;
+			gint object_it = 0;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			object_collection = _tmp21_;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			object_collection_length1 = _tmp21__length1;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			for (object_it = 0; object_it < _tmp21__length1; object_it = object_it + 1) {
+#line 515 "graphics-processor.c"
+				gchar* _tmp22_;
+				gchar* object = NULL;
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+				_tmp22_ = g_strdup (object_collection[object_it]);
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+				object = _tmp22_;
+#line 522 "graphics-processor.c"
+				{
+					gchar** keys = NULL;
+					GKeyFile* _tmp23_;
+					const gchar* _tmp24_;
+					gsize _tmp25_;
+					gchar** _tmp26_;
+					gint keys_length1;
+					gint _keys_size_;
+					gboolean _tmp27_ = FALSE;
+					gchar** _tmp28_;
+					gint _tmp28__length1;
+					KeyValueMap* key_map = NULL;
+					const gchar* _tmp30_;
+					KeyValueMap* _tmp31_;
+					gchar** _tmp32_;
+					gint _tmp32__length1;
+					GeeHashMap* _tmp41_;
+					const gchar* _tmp42_;
+					KeyValueMap* _tmp43_;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp23_ = keyfile;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp24_ = object;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp26_ = g_key_file_get_keys (_tmp23_, _tmp24_, &_tmp25_, &_inner_error_);
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					keys = _tmp26_;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					keys_length1 = _tmp25_;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_keys_size_ = keys_length1;
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_g_free0 (object);
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_g_object_unref0 (map);
+#line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_g_key_file_unref0 (keyfile);
+#line 564 "graphics-processor.c"
+						goto __catch0_g_error;
+					}
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp28_ = keys;
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp28__length1 = keys_length1;
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					if (_tmp28_ == NULL) {
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_tmp27_ = TRUE;
+#line 575 "graphics-processor.c"
+					} else {
+						gchar** _tmp29_;
+						gint _tmp29__length1;
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_tmp29_ = keys;
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_tmp29__length1 = keys_length1;
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_tmp27_ = _tmp29__length1 == 0;
+#line 585 "graphics-processor.c"
+					}
+#line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					if (_tmp27_) {
+#line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						_g_free0 (object);
+#line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						continue;
+#line 595 "graphics-processor.c"
+					}
+#line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp30_ = object;
+#line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp31_ = key_value_map_new (_tmp30_);
+#line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					key_map = _tmp31_;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp32_ = keys;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp32__length1 = keys_length1;
+#line 607 "graphics-processor.c"
+					{
+						gchar** key_collection = NULL;
+						gint key_collection_length1 = 0;
+						gint _key_collection_size_ = 0;
+						gint key_it = 0;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						key_collection = _tmp32_;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						key_collection_length1 = _tmp32__length1;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+						for (key_it = 0; key_it < _tmp32__length1; key_it = key_it + 1) {
+#line 619 "graphics-processor.c"
+							gchar* _tmp33_;
+							gchar* key = NULL;
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+							_tmp33_ = g_strdup (key_collection[key_it]);
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+							key = _tmp33_;
+#line 626 "graphics-processor.c"
+							{
+								gchar* _tmp34_ = NULL;
+								GKeyFile* _tmp35_;
+								const gchar* _tmp36_;
+								const gchar* _tmp37_;
+								gchar* _tmp38_;
+								KeyValueMap* _tmp39_;
+								const gchar* _tmp40_;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp35_ = keyfile;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp36_ = object;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp37_ = key;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp38_ = g_key_file_get_string (_tmp35_, _tmp36_, _tmp37_, &_inner_error_);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp34_ = _tmp38_;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									_g_free0 (key);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									_key_value_map_unref0 (key_map);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									_g_free0 (object);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									_g_object_unref0 (map);
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+									_g_key_file_unref0 (keyfile);
+#line 661 "graphics-processor.c"
+									goto __catch0_g_error;
+								}
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp39_ = key_map;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_tmp40_ = key;
+#line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								key_value_map_set_string (_tmp39_, _tmp40_, _tmp34_);
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_g_free0 (_tmp34_);
+#line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+								_g_free0 (key);
+#line 674 "graphics-processor.c"
+							}
+						}
+					}
+#line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp41_ = map;
+#line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp42_ = object;
+#line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_tmp43_ = key_map;
+#line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_key_value_map_unref0 (key_map);
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
+#line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+					_g_free0 (object);
+#line 692 "graphics-processor.c"
+				}
+			}
+		}
+#line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		result = map;
+#line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
+#line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_key_file_unref0 (keyfile);
+#line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return result;
+#line 704 "graphics-processor.c"
+	}
+	goto __finally0;
+	__catch0_g_error:
+	{
+		GError* err = NULL;
+		const gchar* _tmp44_;
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		err = _inner_error_;
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_inner_error_ = NULL;
+#line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp44_ = err->message;
+#line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_error ("graphics-processor.vala:46: %s", _tmp44_);
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_error_free0 (err);
+#line 721 "graphics-processor.c"
+	}
+	__finally0:
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_clear_error (&_inner_error_);
+#line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	return NULL;
+#line 730 "graphics-processor.c"
+}
+
+
+gint _vala_main (gchar** args, int args_length1) {
+	gint result = 0;
+	GOptionContext* ctx = NULL;
+	GOptionContext* _tmp0_;
+	GOptionContext* _tmp1_;
+	GOptionContext* _tmp2_;
+	GOptionContext* _tmp3_;
+	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp10_;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp16_;
+	GdkPixbuf* src = NULL;
+	GdkPixbuf* output = NULL;
+	GdkPixbuf* _tmp24_;
+	GdkPixbuf* _tmp25_;
+	PixelTransformationBundle* adjustments = NULL;
+	const gchar* _tmp26_;
+	gboolean _tmp36_;
+	PixelTransformer* transformer = NULL;
+	PixelTransformationBundle* _tmp39_;
+	PixelTransformer* _tmp40_;
+	GTimer* timer = NULL;
+	GTimer* _tmp41_;
+	PixelTransformer* _tmp42_;
+	GdkPixbuf* _tmp43_;
+	GdkPixbuf* _tmp44_;
+	gint _tmp45_;
+	gdouble elapsed = 0.0;
+	GTimer* _tmp46_;
+	gdouble _tmp47_;
+	gdouble _tmp48_;
+	const gchar* _tmp49_;
+	GError * _inner_error_ = NULL;
+#line 51 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp0_ = g_option_context_new ("- Apply shotwell transformations on commandline");
+#line 51 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	ctx = _tmp0_;
+#line 52 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp1_ = ctx;
+#line 52 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_option_context_set_help_enabled (_tmp1_, TRUE);
+#line 53 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp2_ = ctx;
+#line 53 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_option_context_set_ignore_unknown_options (_tmp2_, TRUE);
+#line 54 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp3_ = ctx;
+#line 54 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_option_context_add_main_entries (_tmp3_, options, NULL);
+#line 783 "graphics-processor.c"
+	{
+		GOptionContext* _tmp4_;
+#line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp4_ = ctx;
+#line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_option_context_parse (_tmp4_, &args_length1, &args, &_inner_error_);
+#line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 792 "graphics-processor.c"
+			goto __catch2_g_error;
+		}
+	}
+	goto __finally2;
+	__catch2_g_error:
+	{
+		GError* _error_ = NULL;
+		GOptionContext* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_error_ = _inner_error_;
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_inner_error_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp5_ = ctx;
+#line 59 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp6_ = g_option_context_get_help (_tmp5_, TRUE, NULL);
+#line 59 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp7_ = _tmp6_;
+#line 59 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_print ("%s", _tmp7_);
+#line 59 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_free0 (_tmp7_);
+#line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		result = 1;
+#line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_error_free0 (_error_);
+#line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return result;
+#line 825 "graphics-processor.c"
+	}
+	__finally2:
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 830 "graphics-processor.c"
+		gint _tmp8_ = 0;
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_clear_error (&_inner_error_);
+#line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return _tmp8_;
+#line 840 "graphics-processor.c"
+	}
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp10_ = input_file;
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp10_ == NULL) {
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp9_ = TRUE;
+#line 848 "graphics-processor.c"
+	} else {
+		const gchar* _tmp11_;
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp11_ = output_file;
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp9_ = _tmp11_ == NULL;
+#line 855 "graphics-processor.c"
+	}
+#line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp9_) {
+#line 859 "graphics-processor.c"
+		GOptionContext* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+#line 65 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_print ("You need to provide and input and output file\n");
+#line 66 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp12_ = ctx;
+#line 66 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp13_ = g_option_context_get_help (_tmp12_, TRUE, NULL);
+#line 66 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp14_ = _tmp13_;
+#line 66 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_print ("%s", _tmp14_);
+#line 66 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_free0 (_tmp14_);
+#line 68 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		result = 1;
+#line 68 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 68 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return result;
+#line 881 "graphics-processor.c"
+	}
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp16_ = auto_enhance;
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp16_ == FALSE) {
+#line 887 "graphics-processor.c"
+		const gchar* _tmp17_;
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp17_ = pipeline;
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp15_ = _tmp17_ == NULL;
+#line 893 "graphics-processor.c"
+	} else {
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp15_ = FALSE;
+#line 897 "graphics-processor.c"
+	}
+#line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp15_) {
+#line 72 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_print ("No operation provided. Nothing to do.\n");
+#line 74 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		result = 0;
+#line 74 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 74 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return result;
+#line 909 "graphics-processor.c"
+	}
+#line 77 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	src = NULL;
+#line 913 "graphics-processor.c"
+	{
+		GdkPixbuf* _tmp18_ = NULL;
+		const gchar* _tmp19_;
+		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp21_;
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp19_ = input_file;
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp20_ = gdk_pixbuf_new_from_file (_tmp19_, &_inner_error_);
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp18_ = _tmp20_;
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 927 "graphics-processor.c"
+			goto __catch3_g_error;
+		}
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp21_ = _tmp18_;
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp18_ = NULL;
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (src);
+#line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		src = _tmp21_;
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (_tmp18_);
+#line 940 "graphics-processor.c"
+	}
+	goto __finally3;
+	__catch3_g_error:
+	{
+		GError* err = NULL;
+		const gchar* _tmp22_;
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		err = _inner_error_;
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_inner_error_ = NULL;
+#line 81 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp22_ = err->message;
+#line 81 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_error ("graphics-processor.vala:81: %s", _tmp22_);
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_error_free0 (err);
+#line 957 "graphics-processor.c"
+	}
+	__finally3:
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 962 "graphics-processor.c"
+		gint _tmp23_ = 0;
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (src);
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_clear_error (&_inner_error_);
+#line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return _tmp23_;
+#line 974 "graphics-processor.c"
+	}
+#line 84 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp24_ = src;
+#line 84 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp25_ = gdk_pixbuf_copy (_tmp24_);
+#line 84 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	output = _tmp25_;
+#line 85 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	adjustments = NULL;
+#line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp26_ = pipeline;
+#line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp26_ != NULL) {
+#line 988 "graphics-processor.c"
+		GeeHashMap* transformations = NULL;
+		const gchar* _tmp27_;
+		GeeHashMap* _tmp28_;
+		PixelTransformationBundle* _tmp29_;
+		KeyValueMap* map = NULL;
+		GeeHashMap* _tmp30_;
+		gpointer _tmp31_;
+		KeyValueMap* _tmp32_;
+#line 88 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp27_ = pipeline;
+#line 88 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp28_ = marshall_all_transformations (_tmp27_);
+#line 88 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		transformations = _tmp28_;
+#line 90 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp29_ = pixel_transformation_bundle_new ();
+#line 90 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_pixel_transformation_bundle_unref0 (adjustments);
+#line 90 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		adjustments = _tmp29_;
+#line 91 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp30_ = transformations;
+#line 91 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), "adjustments");
+#line 91 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		map = (KeyValueMap*) _tmp31_;
+#line 92 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp32_ = map;
+#line 92 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (_tmp32_ == NULL) {
+#line 1019 "graphics-processor.c"
+			PixelTransformationBundle* _tmp33_;
+#line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp33_ = adjustments;
+#line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			pixel_transformation_bundle_set_to_identity (_tmp33_);
+#line 1025 "graphics-processor.c"
+		} else {
+			PixelTransformationBundle* _tmp34_;
+			KeyValueMap* _tmp35_;
+#line 95 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp34_ = adjustments;
+#line 95 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp35_ = map;
+#line 95 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			pixel_transformation_bundle_load (_tmp34_, _tmp35_);
+#line 1035 "graphics-processor.c"
+		}
+#line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_key_value_map_unref0 (map);
+#line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (transformations);
+#line 1041 "graphics-processor.c"
+	}
+#line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp36_ = auto_enhance;
+#line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp36_) {
+#line 1047 "graphics-processor.c"
+		GdkPixbuf* _tmp37_;
+		PixelTransformationBundle* _tmp38_;
+#line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp37_ = src;
+#line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp38_ = auto_enhance_create_auto_enhance_adjustments (_tmp37_);
+#line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_pixel_transformation_bundle_unref0 (adjustments);
+#line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		adjustments = _tmp38_;
+#line 1058 "graphics-processor.c"
+	}
+#line 103 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp39_ = adjustments;
+#line 103 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp40_ = pixel_transformation_bundle_generate_transformer (_tmp39_);
+#line 103 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	transformer = _tmp40_;
+#line 104 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp41_ = g_timer_new ();
+#line 104 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	timer = _tmp41_;
+#line 105 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp42_ = transformer;
+#line 105 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp43_ = src;
+#line 105 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp44_ = output;
+#line 105 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp45_ = jobs;
+#line 105 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	pixel_transformer_transform_to_other_pixbuf (_tmp42_, _tmp43_, _tmp44_, NULL, _tmp45_);
+#line 106 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp46_ = timer;
+#line 106 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp47_ = g_timer_elapsed (_tmp46_, NULL);
+#line 106 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	elapsed = _tmp47_;
+#line 108 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp48_ = elapsed;
+#line 108 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	g_print ("Transformation took %f\n", _tmp48_);
+#line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_tmp49_ = format;
+#line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (_tmp49_ == NULL) {
+#line 1094 "graphics-processor.c"
+		gchar* content_type = NULL;
+		const gchar* _tmp50_;
+		gchar* _tmp51_;
+		const gchar* _tmp52_;
+		gchar* _tmp54_;
+#line 112 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp50_ = output_file;
+#line 112 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp51_ = g_content_type_guess (_tmp50_, NULL, (gsize) 0, NULL);
+#line 112 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		content_type = _tmp51_;
+#line 113 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp52_ = content_type;
+#line 113 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (g_strcmp0 (_tmp52_, "image/png") == 0) {
+#line 1110 "graphics-processor.c"
+			gchar* _tmp53_;
+#line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_tmp53_ = g_strdup ("png");
+#line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			_g_free0 (format);
+#line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+			format = _tmp53_;
+#line 1118 "graphics-processor.c"
+		}
+#line 117 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp54_ = g_strdup ("jpeg");
+#line 117 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_free0 (format);
+#line 117 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		format = _tmp54_;
+#line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_free0 (content_type);
+#line 1128 "graphics-processor.c"
+	}
+	{
+		GdkPixbuf* _tmp55_;
+		const gchar* _tmp56_;
+		const gchar* _tmp57_;
+#line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp55_ = output;
+#line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp56_ = output_file;
+#line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp57_ = format;
+#line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		gdk_pixbuf_save (_tmp55_, _tmp56_, _tmp57_, &_inner_error_, NULL, NULL);
+#line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1144 "graphics-processor.c"
+			goto __catch4_g_error;
+		}
+	}
+	goto __finally4;
+	__catch4_g_error:
+	{
+		GError* err = NULL;
+		const gchar* _tmp58_;
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		err = _inner_error_;
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_inner_error_ = NULL;
+#line 123 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_tmp58_ = err->message;
+#line 123 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_error ("graphics-processor.vala:123: %s", _tmp58_);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_error_free0 (err);
+#line 1163 "graphics-processor.c"
+	}
+	__finally4:
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1168 "graphics-processor.c"
+		gint _tmp59_ = 0;
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_timer_destroy0 (timer);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_pixel_transformer_unref0 (transformer);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_pixel_transformation_bundle_unref0 (adjustments);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (output);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_object_unref0 (src);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		_g_option_context_free0 (ctx);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		g_clear_error (&_inner_error_);
+#line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+		return _tmp59_;
+#line 1188 "graphics-processor.c"
+	}
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	result = 0;
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_g_timer_destroy0 (timer);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_pixel_transformer_unref0 (transformer);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_pixel_transformation_bundle_unref0 (adjustments);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_g_object_unref0 (output);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_g_object_unref0 (src);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	_g_option_context_free0 (ctx);
+#line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	return result;
+#line 1206 "graphics-processor.c"
+}
+
+
+int main (int argc, char ** argv) {
+#if !GLIB_CHECK_VERSION (2,35,0)
+	g_type_init ();
+#endif
+#line 50 "/home/jens/Source/shotwell/src/graphics-processor.vala"
+	return _vala_main (argv, argc);
+#line 1216 "graphics-processor.c"
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+
diff --git a/src/graphics-processor.vala b/src/graphics-processor.vala
new file mode 100644
index 0000000..dc46845
--- /dev/null
+++ b/src/graphics-processor.vala
@@ -0,0 +1,127 @@
+static string? input_file = null;
+static string? output_file = null;
+static string? pipeline = null;
+static bool auto_enhance = false;
+static string? format = null;
+static int jobs = -1;
+
+const GLib.OptionEntry[] options = {
+    { "input", 'i', 0, GLib.OptionArg.FILENAME, ref input_file, "FILE to process", "FILE" },
+    { "output", 'o', 0, GLib.OptionArg.FILENAME, ref output_file, "destination FILE", "FILE" },
+    { "pipeline", 'p', 0, GLib.OptionArg.FILENAME, ref pipeline, "graphics PIPELINE to run", "PIPELINE" },
+    { "auto-enance", 'a', 0, GLib.OptionArg.NONE, ref auto_enhance, "run auto-enhance on input file", null },
+    { "format", 'f', 0, GLib.OptionArg.STRING, ref format, "Save output file in specific format [png, jpeg (default)]", null},
+    { "jobs", 'j', 0, GLib.OptionArg.INT, ref jobs, "Number of parallel jobs to run on an image", null },
+    { null, 0, 0, GLib.OptionArg.NONE, null, null, null }
+};
+
+Gee.HashMap<string, KeyValueMap>? marshall_all_transformations(string filename) {
+    try {
+        var keyfile = new KeyFile();
+        if (filename.has_prefix("string:")) {
+            var data = "[adjustments]\n" + filename.substring(7).replace("&", "\n");
+            keyfile.load_from_data(data, data.length, KeyFileFlags.NONE);
+        } else {
+            keyfile.load_from_file(filename, KeyFileFlags.NONE);
+        }
+
+        var map = new Gee.HashMap<string, KeyValueMap>();
+
+        var objects = keyfile.get_groups();
+        foreach (var object in objects) {
+            var keys = keyfile.get_keys(object);
+            if (keys == null || keys.length == 0) {
+                continue;
+            }
+
+            var key_map = new KeyValueMap(object);
+            foreach (var key in keys) {
+                key_map.set_string(key, keyfile.get_string(object, key));
+            }
+            map.set(object, key_map);
+        }
+
+        return map;
+    } catch (Error err) {
+        error("%s", err.message);
+    }
+}
+
+int main(string[] args) {
+    var ctx = new OptionContext("- Apply shotwell transformations on commandline");
+    ctx.set_help_enabled(true);
+    ctx.set_ignore_unknown_options(true);
+    ctx.add_main_entries(options, null);
+
+    try {
+        ctx.parse(ref args);
+    } catch (Error error) {
+        print(ctx.get_help(true, null));
+
+        return 1;
+    }
+
+    if (input_file == null || output_file == null) {
+        print("You need to provide and input and output file\n");
+        print(ctx.get_help(true, null));
+
+        return 1;
+    }
+
+    if (auto_enhance == false && pipeline == null) {
+        print("No operation provided. Nothing to do.\n");
+
+        return 0;
+    }
+
+    Gdk.Pixbuf? src = null;
+    try {
+        src = new Gdk.Pixbuf.from_file(input_file);
+    } catch (Error err) {
+        error ("%s", err.message);
+    }
+
+    var output = src.copy();
+    PixelTransformationBundle? adjustments = null;
+
+    if (pipeline != null) {
+        var transformations = marshall_all_transformations(pipeline);
+
+        adjustments = new PixelTransformationBundle();
+        var map = transformations.get("adjustments");
+        if (map == null) {
+            adjustments.set_to_identity();
+        } else {
+            adjustments.load(map);
+        }
+    }
+
+    if (auto_enhance) {
+        adjustments = AutoEnhance.create_auto_enhance_adjustments(src);
+    }
+
+    var transformer = adjustments.generate_transformer();
+    var timer = new Timer();
+    transformer.transform_to_other_pixbuf(src, output, null, jobs);
+    var elapsed = timer.elapsed();
+
+    print("Transformation took %f\n", elapsed);
+
+    // Trz to guess output format. If it's not PNG, assume JPEG.
+    if (format == null) {
+        var content_type = ContentType.guess(output_file, null, null);
+        if (content_type == "image/png") {
+            format = "png";
+        }
+
+        format = "jpeg";
+    }
+
+    try {
+        output.save(output_file, format, null);
+    } catch (Error err) {
+        error("%s", err.message);
+    }
+
+    return 0;
+}
diff --git a/src/library/Branch.c b/src/library/LibraryBranch.c
index 92955e2..1cd27cb 100644
--- a/src/library/Branch.c
+++ b/src/library/LibraryBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* LibraryBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from LibraryBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -802,8 +802,8 @@ static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_U
 #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
 LibraryBranch* library_branch_new (void);
 LibraryBranch* library_branch_construct (GType object_type);
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
@@ -994,37 +994,37 @@ static GType library_branch_entry_position_get_type (void) {
 static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1000 "Branch.c"
+#line 1000 "LibraryBranch.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"
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1007 "Branch.c"
+#line 1007 "LibraryBranch.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"
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1014 "Branch.c"
+#line 1014 "LibraryBranch.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"
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1021 "Branch.c"
+#line 1021 "LibraryBranch.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"
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1028 "Branch.c"
+#line 1028 "LibraryBranch.c"
 }
 
 
@@ -1050,104 +1050,104 @@ LibraryBranch* library_branch_construct (GType object_type) {
 	LibraryLastImportSidebarEntry* _tmp17_;
 	LibraryImportQueueSidebarEntry* _tmp18_;
 	LibraryOfflineSidebarEntry* _tmp19_;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = sidebar_header_new (_ ("Library"), TRUE);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = sidebar_header_new (_ ("Library"), _ ("Organize and browse your photos"), TRUE);
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = library_photos_entry_new ();
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_photos_entry (self, _tmp3_);
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp4_ = library_trash_sidebar_entry_new ();
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_trash_entry (self, _tmp5_);
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp5_);
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp6_ = library_last_import_sidebar_entry_new ();
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp7_ = _tmp6_;
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_last_imported_entry (self, _tmp7_);
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp8_ = library_flagged_sidebar_entry_new ();
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_flagged_entry (self, _tmp9_);
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp9_);
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp10_ = library_offline_sidebar_entry_new ();
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp11_ = _tmp10_;
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_offline_entry (self, _tmp11_);
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp11_);
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp12_ = library_import_queue_sidebar_entry_new ();
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp13_ = _tmp12_;
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_set_import_queue_entry (self, _tmp13_);
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp13_);
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp14_ = self->priv->_photos_entry;
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
-#line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp15_ = self->priv->_trash_entry;
-#line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp16_ = self->priv->_flagged_entry;
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 44 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_flagged_visibility_changed (self);
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp17_ = self->priv->_last_imported_entry;
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 47 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_last_imported_visibility_changed (self);
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp18_ = self->priv->_import_queue_entry;
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 50 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 50 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_import_queue_visibility_changed (self);
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp19_ = self->priv->_offline_entry;
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 53 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_offline_visibility_changed (self);
-#line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1144 "Branch.c"
+#line 1144 "LibraryBranch.c"
 }
 
 
 LibraryBranch* library_branch_new (void) {
-#line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1151 "Branch.c"
+#line 1151 "LibraryBranch.c"
 }
 
 
@@ -1157,75 +1157,75 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin
 	SidebarEntry* _tmp2_;
 	SidebarEntry* _tmp3_;
 	SidebarEntry* _tmp4_;
-#line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = entry;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = position;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) _tmp1_), NULL);
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp4_ = entry;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	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"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1181 "Branch.c"
+#line 1181 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 61 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 61 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
-#line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1193 "Branch.c"
+#line 1193 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
 	LibraryLastImportSidebarEntry* _tmp0_;
-#line 65 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
-#line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1205 "Branch.c"
+#line 1205 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
 	LibraryImportQueueSidebarEntry* _tmp0_;
-#line 69 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
-#line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1217 "Branch.c"
+#line 1217 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* _tmp0_;
-#line 73 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_offline_entry;
-#line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1229 "Branch.c"
+#line 1229 "LibraryBranch.c"
 }
 
 
@@ -1233,54 +1233,54 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 	LibraryHideablePageEntry* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (entry));
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = entry;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = library_hideable_page_entry_get_visible (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (_tmp2_) {
-#line 1249 "Branch.c"
+#line 1249 "LibraryBranch.c"
 		LibraryHideablePageEntry* _tmp3_;
 		gboolean _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp3_ = entry;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_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"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		if (!_tmp4_) {
-#line 1258 "Branch.c"
+#line 1258 "LibraryBranch.c"
 			LibraryHideablePageEntry* _tmp5_;
 			gint _tmp6_;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp5_ = entry;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp6_ = position;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1267 "Branch.c"
+#line 1267 "LibraryBranch.c"
 		}
 	} else {
 		LibraryHideablePageEntry* _tmp7_;
 		gboolean _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp7_ = entry;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_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"
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		if (_tmp8_) {
-#line 1278 "Branch.c"
+#line 1278 "LibraryBranch.c"
 			LibraryHideablePageEntry* _tmp9_;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp9_ = entry;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1284 "Branch.c"
+#line 1284 "LibraryBranch.c"
 		}
 	}
 }
@@ -1292,67 +1292,67 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gconstpointer _tmp1_;
 	SidebarEntry* _tmp2_;
 	gconstpointer _tmp3_;
-#line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = a;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = b;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1312 "Branch.c"
+#line 1312 "LibraryBranch.c"
 }
 
 
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	LibraryPhotosEntry* result;
 	LibraryPhotosEntry* _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_photos_entry;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1327 "Branch.c"
+#line 1327 "LibraryBranch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1334 "Branch.c"
+#line 1334 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_photos_entry (self) != value) {
-#line 1343 "Branch.c"
+#line 1343 "LibraryBranch.c"
 		LibraryPhotosEntry* _tmp0_;
 		LibraryPhotosEntry* _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_photos_entry);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_photos_entry = _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "photos-entry");
-#line 1356 "Branch.c"
+#line 1356 "LibraryBranch.c"
 	}
 }
 
@@ -1360,37 +1360,37 @@ static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosE
 LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* result;
 	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1372 "Branch.c"
+#line 1372 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_flagged_entry (self) != value) {
-#line 1381 "Branch.c"
+#line 1381 "LibraryBranch.c"
 		LibraryFlaggedSidebarEntry* _tmp0_;
 		LibraryFlaggedSidebarEntry* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_flagged_entry);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_flagged_entry = _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "flagged-entry");
-#line 1394 "Branch.c"
+#line 1394 "LibraryBranch.c"
 	}
 }
 
@@ -1398,37 +1398,37 @@ static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlagge
 LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
 	LibraryLastImportSidebarEntry* result;
 	LibraryLastImportSidebarEntry* _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1410 "Branch.c"
+#line 1410 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_last_imported_entry (self) != value) {
-#line 1419 "Branch.c"
+#line 1419 "LibraryBranch.c"
 		LibraryLastImportSidebarEntry* _tmp0_;
 		LibraryLastImportSidebarEntry* _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_last_imported_entry);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_last_imported_entry = _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1432 "Branch.c"
+#line 1432 "LibraryBranch.c"
 	}
 }
 
@@ -1436,37 +1436,37 @@ static void library_branch_set_last_imported_entry (LibraryBranch* self, Library
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
 	LibraryImportQueueSidebarEntry* result;
 	LibraryImportQueueSidebarEntry* _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1448 "Branch.c"
+#line 1448 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_import_queue_entry (self) != value) {
-#line 1457 "Branch.c"
+#line 1457 "LibraryBranch.c"
 		LibraryImportQueueSidebarEntry* _tmp0_;
 		LibraryImportQueueSidebarEntry* _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_import_queue_entry);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_import_queue_entry = _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1470 "Branch.c"
+#line 1470 "LibraryBranch.c"
 	}
 }
 
@@ -1474,37 +1474,37 @@ static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryI
 LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* result;
 	LibraryOfflineSidebarEntry* _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_offline_entry;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1486 "Branch.c"
+#line 1486 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_offline_entry (self) != value) {
-#line 1495 "Branch.c"
+#line 1495 "LibraryBranch.c"
 		LibraryOfflineSidebarEntry* _tmp0_;
 		LibraryOfflineSidebarEntry* _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_offline_entry);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_offline_entry = _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "offline-entry");
-#line 1508 "Branch.c"
+#line 1508 "LibraryBranch.c"
 	}
 }
 
@@ -1512,94 +1512,94 @@ static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflin
 LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	LibraryTrashSidebarEntry* result;
 	LibraryTrashSidebarEntry* _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_trash_entry;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1524 "Branch.c"
+#line 1524 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_trash_entry (self) != value) {
-#line 1533 "Branch.c"
+#line 1533 "LibraryBranch.c"
 		LibraryTrashSidebarEntry* _tmp0_;
 		LibraryTrashSidebarEntry* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_trash_entry);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_trash_entry = _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "trash-entry");
-#line 1546 "Branch.c"
+#line 1546 "LibraryBranch.c"
 	}
 }
 
 
 static void library_branch_class_init (LibraryBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_type_class_add_private (klass, sizeof (LibraryBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_branch_get_property;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_library_branch_set_property;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, 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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, 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 1574 "Branch.c"
+#line 1574 "LibraryBranch.c"
 }
 
 
 static void library_branch_instance_init (LibraryBranch * self) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1581 "Branch.c"
+#line 1581 "LibraryBranch.c"
 }
 
 
 static void library_branch_finalize (GObject * obj) {
 	LibraryBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_photos_entry);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_flagged_entry);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_last_imported_entry);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_import_queue_entry);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_offline_entry);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (self->priv->_trash_entry);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1603 "Branch.c"
+#line 1603 "LibraryBranch.c"
 }
 
 
@@ -1618,51 +1618,51 @@ GType library_branch_get_type (void) {
 static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	LibraryBranch * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_photos_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_flagged_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_last_imported_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_import_queue_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_offline_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_object (value, library_branch_get_trash_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1660 "Branch.c"
+#line 1660 "LibraryBranch.c"
 		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1666 "Branch.c"
+#line 1666 "LibraryBranch.c"
 	}
 }
 
@@ -1670,69 +1670,69 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	LibraryBranch * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_photos_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_flagged_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_last_imported_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_import_queue_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_offline_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_branch_set_trash_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1712 "Branch.c"
+#line 1712 "LibraryBranch.c"
 		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1718 "Branch.c"
+#line 1718 "LibraryBranch.c"
 	}
 }
 
 
 LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
 	LibraryPhotosEntry * self = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1729 "Branch.c"
+#line 1729 "LibraryBranch.c"
 }
 
 
 LibraryPhotosEntry* library_photos_entry_new (void) {
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1736 "Branch.c"
+#line 1736 "LibraryBranch.c"
 }
 
 
@@ -1740,15 +1740,15 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 96 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = g_strdup (_ ("Photos"));
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1752 "Branch.c"
+#line 1752 "LibraryBranch.c"
 }
 
 
@@ -1756,15 +1756,15 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_PHOTOS);
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1768 "Branch.c"
+#line 1768 "LibraryBranch.c"
 }
 
 
@@ -1772,30 +1772,30 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base
 	LibraryPhotosEntry * self;
 	Page* result = NULL;
 	LibraryMainPage* _tmp0_;
-#line 104 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 104 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = library_main_page_new (NULL, NULL);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_ref_sink (_tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1786 "Branch.c"
+#line 1786 "LibraryBranch.c"
 }
 
 
 static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name;
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
-#line 1799 "Branch.c"
+#line 1799 "LibraryBranch.c"
 }
 
 
@@ -1817,26 +1817,26 @@ GType library_photos_entry_get_type (void) {
 
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) {
 	LibraryHideablePageEntry * self = NULL;
-#line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1825 "Branch.c"
+#line 1825 "LibraryBranch.c"
 }
 
 
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
 	gboolean result;
 	gboolean _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE);
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->show_entry;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1840 "Branch.c"
+#line 1840 "LibraryBranch.c"
 }
 
 
@@ -1845,67 +1845,67 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	gboolean _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = value;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = self->priv->show_entry;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		return;
-#line 1859 "Branch.c"
+#line 1859 "LibraryBranch.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = value;
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv->show_entry = _tmp2_;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = value;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
-#line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_notify ((GObject *) self, "visible");
-#line 1871 "Branch.c"
+#line 1871 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_hideable_page_entry_parent_class = g_type_class_peek_parent (klass);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_type_class_add_private (klass, sizeof (LibraryHideablePageEntryPrivate));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_hideable_page_entry_get_property;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_library_hideable_page_entry_set_property;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, 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"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = 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 1890 "Branch.c"
+#line 1890 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
-#line 113 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv->show_entry = FALSE;
-#line 1899 "Branch.c"
+#line 1899 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_finalize (GObject * obj) {
 	LibraryHideablePageEntry * self;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1909 "Branch.c"
+#line 1909 "LibraryBranch.c"
 }
 
 
@@ -1924,21 +1924,21 @@ GType library_hideable_page_entry_get_type (void) {
 static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	LibraryHideablePageEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1936 "Branch.c"
+#line 1936 "LibraryBranch.c"
 		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1942 "Branch.c"
+#line 1942 "LibraryBranch.c"
 	}
 }
 
@@ -1946,30 +1946,30 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	LibraryHideablePageEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1958 "Branch.c"
+#line 1958 "LibraryBranch.c"
 		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1964 "Branch.c"
+#line 1964 "LibraryBranch.c"
 	}
 }
 
 
 LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target) {
 	LibraryMainPage * self = NULL;
-#line 133 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1973 "Branch.c"
+#line 1973 "LibraryBranch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -1978,27 +1978,27 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _tmp0_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp2_ = media_collection_registry_get_all (_tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_media_collection_registry_unref0 (_tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_sources_it = _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		while (TRUE) {
-#line 2002 "Branch.c"
+#line 2002 "LibraryBranch.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
@@ -2013,64 +2013,64 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			void* _tmp15__target;
 			ViewCollectionMonitor* _tmp16_;
 			ViewCollectionMonitor* _tmp17_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp6_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			if (!_tmp7_) {
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 				break;
-#line 2025 "Branch.c"
+#line 2025 "LibraryBranch.c"
 			}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp8_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			sources = (MediaSourceCollection*) _tmp9_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp11_ = _tmp10_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp12_ = sources;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp13_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp14_ = _tmp13_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp15_ = monitor;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp15__target = monitor_target;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp16_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, _tmp15_, _tmp15__target);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp17_ = _tmp16_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_view_collection_monitor_unref0 (_tmp17_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_view_manager_unref0 (_tmp14_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_data_collection_unref0 (_tmp11_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_data_collection_unref0 (sources);
-#line 2059 "Branch.c"
+#line 2059 "LibraryBranch.c"
 		}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2063 "Branch.c"
+#line 2063 "LibraryBranch.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 2067 "Branch.c"
+#line 2067 "LibraryBranch.c"
 }
 
 
 LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2074 "Branch.c"
+#line 2074 "LibraryBranch.c"
 }
 
 
@@ -2082,31 +2082,31 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	configuration_facade_get_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_vala_sort_order = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_vala_sort_by = _tmp3_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (sort_order) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_order = _vala_sort_order;
-#line 2104 "Branch.c"
+#line 2104 "LibraryBranch.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (sort_by) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_by = _vala_sort_by;
-#line 2110 "Branch.c"
+#line 2110 "LibraryBranch.c"
 	}
 }
 
@@ -2117,32 +2117,32 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gint _tmp3_;
-#line 143 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = sort_order;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = sort_by;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	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"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2135 "Branch.c"
+#line 2135 "LibraryBranch.c"
 }
 
 
 static void library_main_page_class_init (LibraryMainPageClass * klass) {
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_main_page_parent_class = g_type_class_peek_parent (klass);
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
-#line 2146 "Branch.c"
+#line 2146 "LibraryBranch.c"
 }
 
 
diff --git a/src/library/Branch.vala b/src/library/LibraryBranch.vala
index bab17fc..f9113f5 100644
--- a/src/library/Branch.vala
+++ b/src/library/LibraryBranch.vala
@@ -27,7 +27,7 @@ public class Library.Branch : Sidebar.Branch {
     }
     
     public Branch() {
-        base(new Sidebar.Header(_("Library")),
+        base(new Sidebar.Header(_("Library"), _("Organize and browse your photos")),
             Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
 
         photos_entry = new Library.PhotosEntry();
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 00ba201..bb92872 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -718,7 +718,6 @@ typedef struct _CommandManagerClass CommandManagerClass;
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 #define TYPE_BATCH_IMPORT (batch_import_get_type ())
 #define BATCH_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BATCH_IMPORT, BatchImport))
@@ -983,6 +982,7 @@ struct _SidebarEntryIface {
 
 struct _LibraryWindowPrivate {
 	gchar* import_dir;
+	gboolean import_recursive;
 	GtkPaned* sidebar_paned;
 	GtkPaned* client_paned;
 	GtkFrame* bottom_frame;
@@ -1525,7 +1525,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page);
 #define RESOURCES_OK_LABEL _ ("_OK")
 gboolean app_dirs_is_in_import_dir (GFile* file);
 GtkResponseType copy_files_dialog (void);
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library);
+static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse);
 static void _g_free0_ (gpointer var);
 static void _g_slist_free__g_free0_ (GSList* self);
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
@@ -1554,12 +1554,6 @@ CommandManager* app_window_get_command_manager (void);
 void command_manager_reset (CommandManager* self);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 void saved_search_dialog_show (SavedSearchDialog* self);
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
@@ -1571,7 +1565,7 @@ static void library_window_on_clear_search (LibraryWindow* self);
 void search_filter_actions_reset (SearchFilterActions* self);
 gint library_window_get_events_sort (LibraryWindow* self);
 void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort);
-void preferences_dialog_show (void);
+void preferences_dialog_show_preferences (void);
 void properties_update_properties (Properties* self, Page* page);
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
 static gboolean _variant_get6 (GVariant* value);
@@ -1623,8 +1617,8 @@ gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
 GType file_import_job_get_type (void) G_GNUC_CONST;
 void app_window_error_message (const gchar* message, GtkWindow* parent);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
 gpointer batch_import_roll_ref (gpointer instance);
 void batch_import_roll_unref (gpointer instance);
 GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1744,86 +1738,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 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1750 "LibraryWindow.c"
+#line 1744 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1757 "LibraryWindow.c"
+#line 1751 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1764 "LibraryWindow.c"
+#line 1758 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1771 "LibraryWindow.c"
+#line 1765 "LibraryWindow.c"
 }
 
 
 static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1778 "LibraryWindow.c"
+#line 1772 "LibraryWindow.c"
 }
 
 
 static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1785 "LibraryWindow.c"
+#line 1779 "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 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1792 "LibraryWindow.c"
+#line 1786 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1799 "LibraryWindow.c"
+#line 1793 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1806 "LibraryWindow.c"
+#line 1800 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1813 "LibraryWindow.c"
+#line 1807 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1820 "LibraryWindow.c"
+#line 1814 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1827 "LibraryWindow.c"
+#line 1821 "LibraryWindow.c"
 }
 
 
@@ -1852,121 +1846,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 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
-#line 1858 "LibraryWindow.c"
+#line 1852 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1865 "LibraryWindow.c"
+#line 1859 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
-#line 1872 "LibraryWindow.c"
+#line 1866 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1879 "LibraryWindow.c"
+#line 1873 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1886 "LibraryWindow.c"
+#line 1880 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
-#line 1893 "LibraryWindow.c"
+#line 1887 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
-#line 1900 "LibraryWindow.c"
+#line 1894 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1907 "LibraryWindow.c"
+#line 1901 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1914 "LibraryWindow.c"
+#line 1908 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1921 "LibraryWindow.c"
+#line 1915 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1928 "LibraryWindow.c"
+#line 1922 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1935 "LibraryWindow.c"
+#line 1929 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1942 "LibraryWindow.c"
+#line 1936 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1949 "LibraryWindow.c"
+#line 1943 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1956 "LibraryWindow.c"
+#line 1950 "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 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1963 "LibraryWindow.c"
+#line 1957 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1970 "LibraryWindow.c"
+#line 1964 "LibraryWindow.c"
 }
 
 
@@ -2023,119 +2017,119 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	CameraTable* _tmp56_;
 	CameraTable* _tmp57_;
 	GtkProgressBar* _tmp58_;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/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"
+#line 153 "/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"
+#line 155 "/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 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#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 158 "/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 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#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 159 "/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 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#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 160 "/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 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/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"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#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 163 "/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 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#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 164 "/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 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#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 165 "/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 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#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 166 "/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 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#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 167 "/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 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/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 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/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 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->extended_properties = _tmp17_;
 #line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->extended_properties = _tmp17_;
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#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 172 "/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 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 173 "/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"
+#line 175 "/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 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->library_branch;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _tmp24_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/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 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_create_layout (self, _tmp27_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp27_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2139 "LibraryWindow.c"
+#line 2133 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp28_;
@@ -2144,27 +2138,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		GeeCollection* _tmp31_;
 		GeeIterator* _tmp32_;
 		GeeIterator* _tmp33_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = media_collection_registry_get_all (_tmp29_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _tmp30_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = _tmp32_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp31_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp29_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp33_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2168 "LibraryWindow.c"
+#line 2162 "LibraryWindow.c"
 			GeeIterator* _tmp34_;
 			gboolean _tmp35_;
 			MediaSourceCollection* media_sources = NULL;
@@ -2172,178 +2166,178 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 			gpointer _tmp37_;
 			MediaSourceCollection* _tmp38_;
 			MediaSourceCollection* _tmp39_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp35_ = gee_iterator_next (_tmp34_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp35_) {
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2184 "LibraryWindow.c"
+#line 2178 "LibraryWindow.c"
 			}
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp36_ = _media_sources_it;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp37_ = gee_iterator_get (_tmp36_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp37_;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp37_;
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp38_ = media_sources;
-#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 188 "/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 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp39_ = media_sources;
-#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 189 "/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 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 2202 "LibraryWindow.c"
+#line 2196 "LibraryWindow.c"
 		}
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 2206 "LibraryWindow.c"
+#line 2200 "LibraryWindow.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = g_new0 (GtkTargetEntry, 2);
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[0] = _tmp40_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[1] = _tmp41_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = _tmp42_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = main_window_dnd_targets;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43__length1 = main_window_dnd_targets_length1;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/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 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = metadata_writer_get_instance ();
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/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 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = library_monitor_pool_get_instance ();
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = _tmp46_;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = _tmp48_;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp47_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp49_;
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp49_;
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = monitor;
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp50_ != NULL) {
-#line 2254 "LibraryWindow.c"
+#line 2248 "LibraryWindow.c"
 		LibraryMonitor* _tmp51_;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = monitor;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2260 "LibraryWindow.c"
+#line 2254 "LibraryWindow.c"
 	}
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = library_monitor_pool_get_instance ();
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = _tmp52_;
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/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 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp53_);
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp53_);
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = library_monitor_pool_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = _tmp54_;
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/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 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp55_);
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp56_ = camera_table_get_instance ();
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp57_ = _tmp56_;
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/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 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp57_);
-#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp58_ = self->priv->background_progress_bar;
-#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/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"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2298 "LibraryWindow.c"
+#line 2292 "LibraryWindow.c"
 }
 
 
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2305 "LibraryWindow.c"
+#line 2299 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2312 "LibraryWindow.c"
+#line 2306 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
-#line 253 "/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 2319 "LibraryWindow.c"
+#line 2313 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2326 "LibraryWindow.c"
+#line 2320 "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 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2333 "LibraryWindow.c"
+#line 2327 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
-#line 256 "/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_preparing ((LibraryWindow*) self);
-#line 2340 "LibraryWindow.c"
+#line 2334 "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 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2347 "LibraryWindow.c"
+#line 2341 "LibraryWindow.c"
 }
 
 
@@ -2359,51 +2353,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 	LibraryMonitor* _tmp8_;
 	LibraryMonitor* _tmp9_;
 	LibraryMonitor* _tmp10_;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#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"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp4_);
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#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 253 "/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 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = monitor;
-#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 254 "/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 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#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 255 "/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 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = monitor;
-#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 256 "/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 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#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 257 "/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 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = monitor;
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/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 2407 "LibraryWindow.c"
+#line 2401 "LibraryWindow.c"
 }
 
 
@@ -2425,84 +2419,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li
 	guint _tmp14_;
 	LibraryMonitor* _tmp15_;
 	guint _tmp16_;
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#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"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp4_);
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#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 264 "/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 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#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 265 "/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 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#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 266 "/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 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = monitor;
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#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 267 "/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 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = monitor;
-#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#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 268 "/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 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = monitor;
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 269 "/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 2485 "LibraryWindow.c"
+#line 2479 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new1 (gboolean value) {
-#line 297 "/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 2492 "LibraryWindow.c"
+#line 2486 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new2 (gboolean value) {
-#line 298 "/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 2499 "LibraryWindow.c"
+#line 2493 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new3 (gboolean value) {
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2506 "LibraryWindow.c"
+#line 2500 "LibraryWindow.c"
 }
 
 
@@ -2523,71 +2517,71 @@ static void library_window_real_add_actions (AppWindow* base) {
 	GAction* _tmp12_;
 	gboolean _tmp13_;
 	GVariant* _tmp14_;
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #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));
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #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);
+	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #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), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_actions;
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_actions;
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/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 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/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 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/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 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _variant_new1 (_tmp7_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp4_, _tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp6_);
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp6_);
+#line 299 "/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 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_is_sidebar_visible (self);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _variant_new2 (_tmp10_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp9_, _tmp11_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp11_);
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp11_);
+#line 300 "/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 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = library_window_is_toolbar_visible (self);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _variant_new3 (_tmp13_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp12_, _tmp14_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp14_);
-#line 2577 "LibraryWindow.c"
+#line 2571 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2584 "LibraryWindow.c"
+#line 2578 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2591 "LibraryWindow.c"
+#line 2585 "LibraryWindow.c"
 }
 
 
@@ -2600,23 +2594,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	SearchFilterActions* _tmp18_;
 	Page* _tmp19_;
 	Page* _tmp20_;
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/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 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = old_page;
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 2620 "LibraryWindow.c"
+#line 2614 "LibraryWindow.c"
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
@@ -2625,126 +2619,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		ViewCollection* _tmp8_;
 		ViewCollection* _tmp9_;
 		guint _tmp10_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = old_page;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/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 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = old_page;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/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 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 2653 "LibraryWindow.c"
+#line 2647 "LibraryWindow.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = new_page;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 2659 "LibraryWindow.c"
+#line 2653 "LibraryWindow.c"
 		Page* _tmp12_;
 		ViewCollection* _tmp13_;
 		ViewCollection* _tmp14_;
 		Page* _tmp15_;
 		ViewCollection* _tmp16_;
 		ViewCollection* _tmp17_;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = new_page;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = page_get_view (_tmp12_);
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/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 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp14_);
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp14_);
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = new_page;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = page_get_view (_tmp15_);
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/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 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 2686 "LibraryWindow.c"
+#line 2680 "LibraryWindow.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->search_actions;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = old_page;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = new_page;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2696 "LibraryWindow.c"
+#line 2690 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2703 "LibraryWindow.c"
+#line 2697 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 321 "/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 2717 "LibraryWindow.c"
+#line 2711 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_;
 	guint _tmp1_;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/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 2734 "LibraryWindow.c"
+#line 2728 "LibraryWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2741 "LibraryWindow.c"
+#line 2735 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new4 (gboolean value) {
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2748 "LibraryWindow.c"
+#line 2742 "LibraryWindow.c"
 }
 
 
@@ -2759,56 +2753,56 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	GAction* _tmp6_;
 	GAction* _tmp7_;
 	GAction* _tmp8_;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/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 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = !_tmp4_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_) {
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp5_) {
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 2785 "LibraryWindow.c"
+#line 2779 "LibraryWindow.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/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 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp7_;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 2797 "LibraryWindow.c"
+#line 2791 "LibraryWindow.c"
 		GAction* _tmp9_;
 		GVariant* _tmp10_;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = action;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _variant_new4 (TRUE);
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_action_change_state (_tmp9_, _tmp10_);
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp10_);
-#line 2808 "LibraryWindow.c"
+#line 2802 "LibraryWindow.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 2812 "LibraryWindow.c"
+#line 2806 "LibraryWindow.c"
 }
 
 
@@ -2832,87 +2826,87 @@ static void library_window_real_show_all (GtkWidget* base) {
 	gboolean _tmp15_;
 	CheckerboardPage* _tmp16_;
 	gboolean _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 343 "/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 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/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 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE);
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_properties_action = _tmp3_;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = basic_properties_action;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp4_ != NULL, "basic_properties_action != null");
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = basic_properties_action;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_get_state (_tmp5_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_variant_get_boolean (_tmp7_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = !_tmp8_;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 2870 "LibraryWindow.c"
+#line 2864 "LibraryWindow.c"
 		GtkFrame* _tmp10_;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = self->priv->bottom_frame;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2876 "LibraryWindow.c"
+#line 2870 "LibraryWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/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 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == NULL) {
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2886 "LibraryWindow.c"
+#line 2880 "LibraryWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp12_;
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp12_;
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = current_page;
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_ != NULL) {
-#line 2894 "LibraryWindow.c"
+#line 2888 "LibraryWindow.c"
 		CheckerboardPage* _tmp14_;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, _tmp14_);
-#line 2900 "LibraryWindow.c"
+#line 2894 "LibraryWindow.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = library_window_should_show_search_bar (self);
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = current_page;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp15_, _tmp16_);
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = library_window_is_sidebar_visible (self);
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp17_);
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 2916 "LibraryWindow.c"
+#line 2910 "LibraryWindow.c"
 }
 
 
@@ -2921,77 +2915,77 @@ LibraryWindow* library_window_get_app (void) {
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
 	LibraryWindow* _tmp2_;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow");
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_window_instance;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow));
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2937 "LibraryWindow.c"
+#line 2931 "LibraryWindow.c"
 }
 
 
 gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	gboolean result = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 2945 "LibraryWindow.c"
+#line 2939 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
 		gint _scheme_collection_size_ = 0;
 		gint scheme_it = 0;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/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 2957 "LibraryWindow.c"
+#line 2951 "LibraryWindow.c"
 			gchar* _tmp0_;
 			gchar* scheme = NULL;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 2964 "LibraryWindow.c"
+#line 2958 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_;
 				const gchar* _tmp2_;
 				gboolean _tmp3_;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = uri;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp2_ = scheme;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (_tmp3_) {
 #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				if (_tmp3_) {
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 2983 "LibraryWindow.c"
+#line 2977 "LibraryWindow.c"
 				}
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 2987 "LibraryWindow.c"
+#line 2981 "LibraryWindow.c"
 			}
 		}
 	}
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2995 "LibraryWindow.c"
+#line 2989 "LibraryWindow.c"
 }
 
 
@@ -2999,15 +2993,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE);
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3011 "LibraryWindow.c"
+#line 3005 "LibraryWindow.c"
 }
 
 
@@ -3017,40 +3011,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
 	TagsSidebarEntry* _tmp3_;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_TAG (tag));
 #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_TAG (tag));
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3037 "LibraryWindow.c"
+#line 3031 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		TagsSidebarEntry* _tmp5_;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/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 3046 "LibraryWindow.c"
+#line 3040 "LibraryWindow.c"
 	} else {
-#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 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:388: No tag entry found for rename");
+#line 3044 "LibraryWindow.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3054 "LibraryWindow.c"
+#line 3048 "LibraryWindow.c"
 }
 
 
@@ -3060,40 +3054,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 	Event* _tmp1_;
 	EventsEventEntry* _tmp2_;
 	EventsEventEntry* _tmp3_;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_EVENT (event));
 #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_EVENT (event));
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3080 "LibraryWindow.c"
+#line 3074 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		EventsEventEntry* _tmp5_;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/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 3089 "LibraryWindow.c"
+#line 3083 "LibraryWindow.c"
 	} else {
-#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 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:396: No event entry found for rename");
+#line 3087 "LibraryWindow.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3097 "LibraryWindow.c"
+#line 3091 "LibraryWindow.c"
 }
 
 
@@ -3103,40 +3097,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 	SavedSearch* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
 	SearchesSidebarEntry* _tmp3_;
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
 #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3123 "LibraryWindow.c"
+#line 3117 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		SearchesSidebarEntry* _tmp5_;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/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 3132 "LibraryWindow.c"
+#line 3126 "LibraryWindow.c"
 	} else {
-#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 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:404: No search entry found for rename");
+#line 3130 "LibraryWindow.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3140 "LibraryWindow.c"
+#line 3134 "LibraryWindow.c"
 }
 
 
@@ -3151,37 +3145,37 @@ static void library_window_real_on_quit (AppWindow* base) {
 	GtkPaned* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/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 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->client_paned;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_paned_get_position (_tmp6_);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/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 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 412 "/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 3185 "LibraryWindow.c"
+#line 3179 "LibraryWindow.c"
 }
 
 
@@ -3198,105 +3192,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	Photo* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
 	GeeList* _tmp12_;
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
 #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = view;
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
-#line 3218 "LibraryWindow.c"
+#line 3212 "LibraryWindow.c"
 		ViewCollection* _tmp5_;
 		GeeList* _tmp6_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp6_;
-#line 3229 "LibraryWindow.c"
+#line 3223 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp7_;
 		GeeList* _tmp8_;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp8_;
-#line 3241 "LibraryWindow.c"
+#line 3235 "LibraryWindow.c"
 	}
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sources = _tmp9_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = sources;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
-#line 3251 "LibraryWindow.c"
+#line 3245 "LibraryWindow.c"
 		GeeList* _tmp13_;
 		gint _tmp14_;
 		gint _tmp15_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = sources;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp15_ != 0;
-#line 3263 "LibraryWindow.c"
+#line 3257 "LibraryWindow.c"
 	} else {
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
-#line 3267 "LibraryWindow.c"
+#line 3261 "LibraryWindow.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
-#line 3271 "LibraryWindow.c"
+#line 3265 "LibraryWindow.c"
 		GeeList* _tmp16_;
 		gpointer _tmp17_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sources;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = gee_list_get (_tmp16_, 0);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3282 "LibraryWindow.c"
+#line 3276 "LibraryWindow.c"
 	} else {
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = NULL;
-#line 3288 "LibraryWindow.c"
+#line 3282 "LibraryWindow.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp10_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3300 "LibraryWindow.c"
+#line 3294 "LibraryWindow.c"
 }
 
 
@@ -3308,27 +3302,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	Page* _tmp0_;
 	Page* _tmp8_;
 	Page* _tmp30_;
-#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), FALSE);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_collection);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_collection = NULL;
 #line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_collection = NULL;
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_start);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_start = NULL;
 #line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_start = NULL;
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_vala_view_collection);
-#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3332 "LibraryWindow.c"
+#line 3326 "LibraryWindow.c"
 		Page* _tmp1_;
 		CollectionPage* _tmp2_;
 		Photo* photo = NULL;
@@ -3337,117 +3331,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp5_;
 		Photo* _tmp6_;
 		Photo* _tmp7_;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = page;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp2_;
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _vala_collection;
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp4_;
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp4_;
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = photo;
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp5_ == NULL) {
 #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp5_ == NULL) {
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3367 "LibraryWindow.c"
+#line 3361 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3371 "LibraryWindow.c"
+#line 3365 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3377 "LibraryWindow.c"
+#line 3371 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3381 "LibraryWindow.c"
+#line 3375 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3387 "LibraryWindow.c"
+#line 3381 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3391 "LibraryWindow.c"
+#line 3385 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3395 "LibraryWindow.c"
+#line 3389 "LibraryWindow.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp7_;
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp7_;
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3417 "LibraryWindow.c"
+#line 3411 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3421 "LibraryWindow.c"
+#line 3415 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3427 "LibraryWindow.c"
+#line 3421 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3431 "LibraryWindow.c"
+#line 3425 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3437 "LibraryWindow.c"
+#line 3431 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3441 "LibraryWindow.c"
+#line 3435 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3445 "LibraryWindow.c"
+#line 3439 "LibraryWindow.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page;
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3451 "LibraryWindow.c"
+#line 3445 "LibraryWindow.c"
 		ViewCollection* view = NULL;
 		Page* _tmp9_;
 		ViewCollection* _tmp10_;
@@ -3473,291 +3467,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp27_;
 		Photo* _tmp28_;
 		Photo* _tmp29_;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_get_view (_tmp9_);
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		view = _tmp10_;
 #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		view = _tmp10_;
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = view;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp12_ == 0) {
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp12_ == 0) {
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3497 "LibraryWindow.c"
+#line 3491 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3501 "LibraryWindow.c"
+#line 3495 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3507 "LibraryWindow.c"
+#line 3501 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3511 "LibraryWindow.c"
+#line 3505 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3517 "LibraryWindow.c"
+#line 3511 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3521 "LibraryWindow.c"
+#line 3515 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3525 "LibraryWindow.c"
+#line 3519 "LibraryWindow.c"
 		}
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = view;
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/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 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = data_view_get_source (_tmp15_);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		event = _tmp17_;
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		event = _tmp17_;
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = event;
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp18_ == NULL) {
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp18_ == NULL) {
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3555 "LibraryWindow.c"
+#line 3549 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3559 "LibraryWindow.c"
+#line 3553 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3565 "LibraryWindow.c"
+#line 3559 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3569 "LibraryWindow.c"
+#line 3563 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3575 "LibraryWindow.c"
+#line 3569 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3579 "LibraryWindow.c"
+#line 3573 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3583 "LibraryWindow.c"
+#line 3577 "LibraryWindow.c"
 		}
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = event;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		entry = _tmp21_;
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		entry = _tmp21_;
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = entry;
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp22_ == NULL) {
 #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp22_ == NULL) {
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3609 "LibraryWindow.c"
+#line 3603 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3613 "LibraryWindow.c"
+#line 3607 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3619 "LibraryWindow.c"
+#line 3613 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3623 "LibraryWindow.c"
+#line 3617 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3629 "LibraryWindow.c"
+#line 3623 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3633 "LibraryWindow.c"
+#line 3627 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3637 "LibraryWindow.c"
+#line 3631 "LibraryWindow.c"
 		}
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = entry;
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/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 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#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 460 "/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 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = _vala_collection;
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp26_;
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp26_;
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = photo;
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp27_ == NULL) {
 #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp27_ == NULL) {
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3671 "LibraryWindow.c"
+#line 3665 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3675 "LibraryWindow.c"
+#line 3669 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3681 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3685 "LibraryWindow.c"
+#line 3679 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3691 "LibraryWindow.c"
+#line 3685 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3695 "LibraryWindow.c"
+#line 3689 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3699 "LibraryWindow.c"
+#line 3693 "LibraryWindow.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = photo;
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp29_;
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp29_;
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (event);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3727 "LibraryWindow.c"
+#line 3721 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3731 "LibraryWindow.c"
+#line 3725 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3737 "LibraryWindow.c"
+#line 3731 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3741 "LibraryWindow.c"
+#line 3735 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3747 "LibraryWindow.c"
+#line 3741 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3751 "LibraryWindow.c"
+#line 3745 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3755 "LibraryWindow.c"
+#line 3749 "LibraryWindow.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = page;
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3761 "LibraryWindow.c"
+#line 3755 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp31_;
 		LibraryPhotoPage* _tmp32_;
@@ -3773,207 +3767,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp41_;
 		LibraryPhotoPage* _tmp42_;
 		ViewCollection* _tmp43_;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = page;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo_page = _tmp32_;
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = photo_page;
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp34_ = library_photo_page_get_controller_page (_tmp33_);
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		controller = _tmp34_;
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		controller = _tmp34_;
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = controller;
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp35_ == NULL) {
 #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp35_ == NULL) {
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3803 "LibraryWindow.c"
+#line 3797 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3807 "LibraryWindow.c"
+#line 3801 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3813 "LibraryWindow.c"
+#line 3807 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3817 "LibraryWindow.c"
+#line 3811 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3823 "LibraryWindow.c"
+#line 3817 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3827 "LibraryWindow.c"
+#line 3821 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3831 "LibraryWindow.c"
+#line 3825 "LibraryWindow.c"
 		}
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = photo_page;
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/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 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!_tmp37_) {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (!_tmp37_) {
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3849 "LibraryWindow.c"
+#line 3843 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3853 "LibraryWindow.c"
+#line 3847 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3859 "LibraryWindow.c"
+#line 3853 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3863 "LibraryWindow.c"
+#line 3857 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3869 "LibraryWindow.c"
+#line 3863 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3873 "LibraryWindow.c"
+#line 3867 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3877 "LibraryWindow.c"
+#line 3871 "LibraryWindow.c"
 		}
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = controller;
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp39_;
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp39_;
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp40_ = photo_page;
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/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 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp41_;
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp41_;
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp42_ = photo_page;
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = _tmp43_;
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (controller);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo_page);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3913 "LibraryWindow.c"
+#line 3907 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3917 "LibraryWindow.c"
+#line 3911 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3923 "LibraryWindow.c"
+#line 3917 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3927 "LibraryWindow.c"
+#line 3921 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3933 "LibraryWindow.c"
+#line 3927 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3937 "LibraryWindow.c"
+#line 3931 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3941 "LibraryWindow.c"
+#line 3935 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (collection) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 3949 "LibraryWindow.c"
+#line 3943 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 3953 "LibraryWindow.c"
+#line 3947 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 3959 "LibraryWindow.c"
+#line 3953 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 3963 "LibraryWindow.c"
+#line 3957 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 3969 "LibraryWindow.c"
+#line 3963 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 3973 "LibraryWindow.c"
+#line 3967 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3977 "LibraryWindow.c"
+#line 3971 "LibraryWindow.c"
 }
 
 
@@ -3996,97 +3990,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	ViewCollection* _tmp9_;
 	LibraryWindowFullscreenPhotoPage* _tmp10_;
 	LibraryWindowFullscreenPhotoPage* _tmp11_;
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 492 "/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 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp0_;
 #line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp0_;
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = current_page;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
 #line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp1_ == NULL) {
+#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4014 "LibraryWindow.c"
+#line 4008 "LibraryWindow.c"
 	}
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = NULL;
 #line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	view = NULL;
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = current_page;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp3_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp4_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp5_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp6_) {
 #line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (!_tmp6_) {
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (start);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (collection);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4046 "LibraryWindow.c"
+#line 4040 "LibraryWindow.c"
 	}
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = start;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = view;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_);
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fs_photo = _tmp10_;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = fs_photo;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/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 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (fs_photo);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 4074 "LibraryWindow.c"
+#line 4068 "LibraryWindow.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 4081 "LibraryWindow.c"
+#line 4075 "LibraryWindow.c"
 }
 
 
 static void _g_slist_free__g_free0_ (GSList* self) {
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free (self);
-#line 4090 "LibraryWindow.c"
+#line 4084 "LibraryWindow.c"
 }
 
 
@@ -4097,145 +4091,196 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	GtkFileChooserDialog* _tmp2_;
 	GtkFileChooserDialog* _tmp3_;
 	const gchar* _tmp4_;
+	GtkCheckButton* recursive = NULL;
+	GtkCheckButton* _tmp5_;
+	GtkCheckButton* _tmp6_;
+	gboolean _tmp7_;
+	GtkFileChooserDialog* _tmp8_;
+	GtkCheckButton* _tmp9_;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	GtkFileChooserDialog* _tmp22_;
-	gchar* _tmp23_;
-	GtkFileChooserDialog* _tmp24_;
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+	GtkFileChooserDialog* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	GtkFileChooserDialog* _tmp31_;
+	gchar* _tmp32_;
+	GtkCheckButton* _tmp33_;
+	gboolean _tmp34_;
+	gboolean _tmp35_;
+	GtkFileChooserDialog* _tmp36_;
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Import From Folder"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = _tmp0_;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = import_dialog;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
-#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->import_dir;
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = import_dialog;
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_dialog_get_type (), GtkDialog));
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	response = _tmp6_;
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders"));
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp5_);
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	recursive = _tmp5_;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = response;
+	_tmp6_ = recursive;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp7_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4140 "LibraryWindow.c"
-		GtkResponseType _tmp8_ = 0;
-		GtkFileChooserDialog* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		GFile* _tmp12_;
-		GFile* _tmp13_;
-		gboolean _tmp14_;
-		gboolean _tmp15_;
-		GtkResponseType copy_files_response = 0;
-		GtkResponseType _tmp17_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = import_dialog;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _tmp10_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = g_file_new_for_uri (_tmp11_);
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = _tmp12_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = app_dirs_is_in_import_dir (_tmp13_);
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = _tmp14_;
+	_tmp7_ = self->priv->import_recursive;
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp7_);
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = import_dialog;
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = recursive;
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp13_);
+	_tmp10_ = import_dialog;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp11_);
+	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp15_) {
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp8_ = GTK_RESPONSE_REJECT;
-#line 4173 "LibraryWindow.c"
-		} else {
-			GtkResponseType _tmp16_;
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp16_ = copy_files_dialog ();
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp8_ = _tmp16_;
-#line 4180 "LibraryWindow.c"
-		}
-#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		copy_files_response = _tmp8_;
+	response = _tmp11_;
+#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = response;
+#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp12_ == ((gint) GTK_RESPONSE_OK)) {
+#line 4161 "LibraryWindow.c"
+		GtkFileChooserDialog* _tmp13_;
+		GtkResponseType _tmp14_ = 0;
+		GtkFileChooserDialog* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		GFile* _tmp18_;
+		GFile* _tmp19_;
+		gboolean _tmp20_;
+		gboolean _tmp21_;
+		GtkResponseType copy_files_response = 0;
+		GtkResponseType _tmp23_;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = copy_files_response;
+		_tmp13_ = import_dialog;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp17_ != GTK_RESPONSE_CANCEL) {
-#line 4188 "LibraryWindow.c"
-			GtkFileChooserDialog* _tmp18_;
-			GSList* _tmp19_;
-			GSList* _tmp20_;
-			GtkResponseType _tmp21_;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp18_ = import_dialog;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp19_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp20_ = _tmp19_;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = copy_files_response;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			library_window_dispatch_import_jobs (self, _tmp20_, "folders", _tmp21_ == GTK_RESPONSE_ACCEPT);
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			__g_slist_free__g_free0_0 (_tmp20_);
-#line 4205 "LibraryWindow.c"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp15_ = import_dialog;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp16_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp17_ = _tmp16_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp18_ = g_file_new_for_uri (_tmp17_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp19_ = _tmp18_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp20_ = app_dirs_is_in_import_dir (_tmp19_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp21_ = _tmp20_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_tmp19_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_free0 (_tmp17_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp21_) {
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp14_ = GTK_RESPONSE_REJECT;
+#line 4199 "LibraryWindow.c"
+		} else {
+			GtkResponseType _tmp22_;
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp22_ = copy_files_dialog ();
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp14_ = _tmp22_;
+#line 4206 "LibraryWindow.c"
 		}
-	}
+#line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		copy_files_response = _tmp14_;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = import_dialog;
+		_tmp23_ = copy_files_response;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (self->priv->import_dir);
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp23_;
+		if (_tmp23_ != GTK_RESPONSE_CANCEL) {
+#line 4214 "LibraryWindow.c"
+			GtkFileChooserDialog* _tmp24_;
+			GSList* _tmp25_;
+			GSList* _tmp26_;
+			GtkResponseType _tmp27_;
+			GtkCheckButton* _tmp28_;
+			gboolean _tmp29_;
+			gboolean _tmp30_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp24_ = import_dialog;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp25_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp26_ = _tmp25_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp27_ = copy_files_response;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp28_ = recursive;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = import_dialog;
+			_tmp29_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp30_ = _tmp29_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_);
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			__g_slist_free__g_free0_0 (_tmp26_);
+#line 4240 "LibraryWindow.c"
+		}
+	}
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = import_dialog;
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_free0 (self->priv->import_dir);
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_dir = _tmp32_;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp33_ = recursive;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp35_ = _tmp34_;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_recursive = _tmp35_;
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp36_ = import_dialog;
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (recursive);
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4222 "LibraryWindow.c"
+#line 4267 "LibraryWindow.c"
 }
 
 
 static void library_window_on_external_library_import (LibraryWindow* self) {
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_;
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance ();
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog);
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_dialog_run (import_dialog);
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4239 "LibraryWindow.c"
+#line 4284 "LibraryWindow.c"
 }
 
 
@@ -4245,27 +4290,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	Page* _tmp1_;
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp2_;
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/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 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = new_page;
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 550 "/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 544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 4269 "LibraryWindow.c"
+#line 4314 "LibraryWindow.c"
 }
 
 
@@ -4283,61 +4328,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	Page* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/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"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp1_;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp2_;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	can_fullscreen = _tmp3_;
-#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_can_empty_trash (self);
-#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/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 556 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 563 "/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 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_window_can_jump_to_event (self);
-#line 557 "/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), "CommonJumpToEvent", _tmp5_);
-#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 565 "/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 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = selected_count;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = count;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/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 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4329 "LibraryWindow.c"
+#line 4374 "LibraryWindow.c"
 }
 
 
 static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_empty_trash (self);
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/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 4341 "LibraryWindow.c"
+#line 4386 "LibraryWindow.c"
 }
 
 
@@ -4346,33 +4391,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_;
 	gint _tmp2_;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/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 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ > 0) {
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4360 "LibraryWindow.c"
+#line 4405 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp3_;
 		gint _tmp4_;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = video_global;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/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 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 4370 "LibraryWindow.c"
+#line 4415 "LibraryWindow.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4376 "LibraryWindow.c"
+#line 4421 "LibraryWindow.c"
 }
 
 
@@ -4387,62 +4432,64 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	GeeCollection* _tmp6_;
 	CommandManager* _tmp7_;
 	CommandManager* _tmp8_;
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/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 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp3_);
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = video_global;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/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 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp6_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _ ("Empty Trash"), _ ("Emptying Trash…"));
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	command_manager_reset (_tmp8_);
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4429 "LibraryWindow.c"
+#line 4474 "LibraryWindow.c"
 }
 
 
 static void library_window_on_new_search (LibraryWindow* self) {
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp0_);
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_saved_search_dialog_unref0 (_tmp1_);
-#line 4446 "LibraryWindow.c"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp1_);
+#line 4493 "LibraryWindow.c"
 }
 
 
@@ -4455,115 +4502,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
 	gint _tmp5_;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/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 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 4479 "LibraryWindow.c"
+#line 4526 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp6_;
 		DataSource* _tmp7_;
 		DataSource* _tmp8_;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		selected_source = _tmp7_;
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = selected_source;
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (selected_source);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4502 "LibraryWindow.c"
+#line 4549 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp9_;
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4509 "LibraryWindow.c"
+#line 4556 "LibraryWindow.c"
 				ViewCollection* _tmp10_;
 				DataSource* _tmp11_;
 				MediaSource* _tmp12_;
 				Event* _tmp13_;
 				Event* _tmp14_;
 				gboolean _tmp15_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp13_ = media_source_get_event (_tmp12_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp14_ = _tmp13_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp15_ = _tmp14_ != NULL;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp14_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp12_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = _tmp15_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4540 "LibraryWindow.c"
+#line 4587 "LibraryWindow.c"
 			} else {
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4550 "LibraryWindow.c"
+#line 4597 "LibraryWindow.c"
 			}
 		}
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4555 "LibraryWindow.c"
+#line 4602 "LibraryWindow.c"
 	} else {
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4563 "LibraryWindow.c"
+#line 4610 "LibraryWindow.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4567 "LibraryWindow.c"
+#line 4614 "LibraryWindow.c"
 }
 
 
@@ -4584,98 +4631,98 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	Event* _tmp11_;
 	Event* _tmp12_;
 	gboolean _tmp13_;
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/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 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ != 1) {
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4612 "LibraryWindow.c"
+#line 4659 "LibraryWindow.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == NULL) {
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4624 "LibraryWindow.c"
+#line 4671 "LibraryWindow.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = media;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == NULL) {
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4638 "LibraryWindow.c"
+#line 4685 "LibraryWindow.c"
 	}
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = media_source_get_event (_tmp10_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_ != NULL;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp12_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 4652 "LibraryWindow.c"
+#line 4699 "LibraryWindow.c"
 		MediaSource* _tmp14_;
 		Event* _tmp15_;
 		Event* _tmp16_;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = media_source_get_event (_tmp14_);
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_event (self, _tmp16_);
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 4666 "LibraryWindow.c"
+#line 4713 "LibraryWindow.c"
 	}
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4672 "LibraryWindow.c"
+#line 4719 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new5 (gboolean value) {
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4679 "LibraryWindow.c"
+#line 4726 "LibraryWindow.c"
 }
 
 
@@ -4685,57 +4732,57 @@ static void library_window_on_find (LibraryWindow* self) {
 	GAction* _tmp1_;
 	GVariant* _tmp2_;
 	SearchFilterToolbar* _tmp3_;
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/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 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new5 (TRUE);
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_toolbar;
-#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_take_focus (_tmp3_);
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4709 "LibraryWindow.c"
+#line 4756 "LibraryWindow.c"
 }
 
 
 static void library_window_on_media_altered (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_jump_to_event (self);
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 630 "/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 4721 "LibraryWindow.c"
+#line 4768 "LibraryWindow.c"
 }
 
 
 static void library_window_on_clear_search (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4733 "LibraryWindow.c"
+#line 4780 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4739 "LibraryWindow.c"
+#line 4786 "LibraryWindow.c"
 	}
 }
 
@@ -4747,19 +4794,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	GSimpleAction* _tmp1_;
 	gint _tmp2_ = 0;
 	GSimpleAction* _tmp3_;
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/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 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/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 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = action;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4763 "LibraryWindow.c"
+#line 4810 "LibraryWindow.c"
 		gint _tmp4_ = 0;
 		GSimpleAction* _tmp5_;
 		GVariant* _tmp6_;
@@ -4767,45 +4814,45 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		GVariant* _tmp8_;
 		const gchar* _tmp9_;
 		gboolean _tmp10_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = action;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/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 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_variant_get_string (_tmp8_, NULL);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp8_);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp10_) {
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4789 "LibraryWindow.c"
+#line 4836 "LibraryWindow.c"
 		} else {
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4793 "LibraryWindow.c"
+#line 4840 "LibraryWindow.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4797 "LibraryWindow.c"
+#line 4844 "LibraryWindow.c"
 	} else {
-#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4801 "LibraryWindow.c"
+#line 4848 "LibraryWindow.c"
 	}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4809 "LibraryWindow.c"
+#line 4856 "LibraryWindow.c"
 }
 
 
@@ -4816,38 +4863,38 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 	const gchar* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = value;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/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 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = value;
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4842 "LibraryWindow.c"
+#line 4889 "LibraryWindow.c"
 }
 
 
 static void library_window_on_preferences (LibraryWindow* self) {
-#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	preferences_dialog_show ();
-#line 4851 "LibraryWindow.c"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	preferences_dialog_show_preferences ();
+#line 4898 "LibraryWindow.c"
 }
 
 
@@ -4861,89 +4908,89 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	gboolean _tmp12_;
 	GSimpleAction* _tmp13_;
 	GVariant* _tmp14_;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4879 "LibraryWindow.c"
+#line 4926 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
 		GtkFrame* _tmp6_;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/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 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->bottom_frame;
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4898 "LibraryWindow.c"
+#line 4945 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp7_;
 		GtkWidget* _tmp8_;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->sidebar_paned;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 4908 "LibraryWindow.c"
+#line 4955 "LibraryWindow.c"
 			GtkFrame* _tmp9_;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4914 "LibraryWindow.c"
+#line 4961 "LibraryWindow.c"
 		}
 	}
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = display;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/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 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = action;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = value;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4933 "LibraryWindow.c"
+#line 4980 "LibraryWindow.c"
 }
 
 
 static gboolean _variant_get6 (GVariant* value) {
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4940 "LibraryWindow.c"
+#line 4987 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new7 (gboolean value) {
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4947 "LibraryWindow.c"
+#line 4994 "LibraryWindow.c"
 }
 
 
@@ -4956,50 +5003,50 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 	GVariant* _tmp4_;
 	GVariant* _tmp5_;
 	GAction* _tmp6_;
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_get6 (_tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _variant_new7 (!_tmp3_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	new_state = _tmp5_;
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = action;
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 4986 "LibraryWindow.c"
+#line 5033 "LibraryWindow.c"
 }
 
 
 static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_;
 	GVariant* _tmp1_;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = value;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 5003 "LibraryWindow.c"
+#line 5050 "LibraryWindow.c"
 }
 
 
@@ -5010,62 +5057,62 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	gboolean _tmp2_;
 	GSimpleAction* _tmp8_;
 	GVariant* _tmp9_;
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 5028 "LibraryWindow.c"
+#line 5075 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
 		ExtendedPropertiesWindow* _tmp6_;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->extended_properties;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/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 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp3_, _tmp5_);
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->extended_properties;
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5047 "LibraryWindow.c"
+#line 5094 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp7_;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5054 "LibraryWindow.c"
+#line 5101 "LibraryWindow.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = value;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5062 "LibraryWindow.c"
+#line 5109 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new8 (gboolean value) {
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5069 "LibraryWindow.c"
+#line 5116 "LibraryWindow.c"
 }
 
 
@@ -5077,35 +5124,35 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_shown = _tmp1_;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/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 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _variant_new8 (is_shown);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp5_);
-#line 5109 "LibraryWindow.c"
+#line 5156 "LibraryWindow.c"
 }
 
 
@@ -5119,55 +5166,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	CheckerboardPage* _tmp6_;
 	CheckerboardPage* _tmp7_;
 	gboolean _tmp8_;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/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 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5137 "LibraryWindow.c"
+#line 5184 "LibraryWindow.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_should_show_search_bar (self);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/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 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 5153 "LibraryWindow.c"
+#line 5200 "LibraryWindow.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = display;
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 5165 "LibraryWindow.c"
+#line 5212 "LibraryWindow.c"
 		SearchFilterActions* _tmp9_;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 5171 "LibraryWindow.c"
+#line 5218 "LibraryWindow.c"
 	}
 }
 
@@ -5177,23 +5224,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_;
 	GSimpleAction* _tmp2_;
 	GVariant* _tmp3_;
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp1_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5197 "LibraryWindow.c"
+#line 5244 "LibraryWindow.c"
 }
 
 
@@ -5203,25 +5250,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
 	gboolean _tmp4_;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = visible;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/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 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = visible;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/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 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 5225 "LibraryWindow.c"
+#line 5272 "LibraryWindow.c"
 }
 
 
@@ -5231,23 +5278,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/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 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5251 "LibraryWindow.c"
+#line 5298 "LibraryWindow.c"
 }
 
 
@@ -5256,23 +5303,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_;
 	GSimpleAction* _tmp2_;
 	GVariant* _tmp3_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, _tmp1_);
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5276 "LibraryWindow.c"
+#line 5323 "LibraryWindow.c"
 }
 
 
@@ -5289,62 +5336,62 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp10_;
 	ConfigFacade* _tmp11_;
 	gboolean _tmp12_;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/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 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ == NULL;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5307 "LibraryWindow.c"
+#line 5354 "LibraryWindow.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/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 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_toolbar (_tmp4_);
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp6_;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = toolbar;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
-#line 5325 "LibraryWindow.c"
+#line 5372 "LibraryWindow.c"
 		GtkRevealer* _tmp8_;
 		gboolean _tmp9_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = visible;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5334 "LibraryWindow.c"
+#line 5381 "LibraryWindow.c"
 	}
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = visible;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/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 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5348 "LibraryWindow.c"
+#line 5395 "LibraryWindow.c"
 }
 
 
@@ -5354,48 +5401,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/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 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5374 "LibraryWindow.c"
+#line 5421 "LibraryWindow.c"
 }
 
 
 static void library_window_show_extended_properties (LibraryWindow* self) {
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5383 "LibraryWindow.c"
+#line 5430 "LibraryWindow.c"
 }
 
 
 static void library_window_hide_extended_properties (LibraryWindow* self) {
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5392 "LibraryWindow.c"
+#line 5439 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new9 (gboolean value) {
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5399 "LibraryWindow.c"
+#line 5446 "LibraryWindow.c"
 }
 
 
@@ -5408,35 +5455,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 	ConfigFacade* _tmp4_;
 	ConfigFacade* _tmp5_;
 	gboolean _tmp6_;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/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 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_new9 (_tmp2_);
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = show;
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/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 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5440 "LibraryWindow.c"
+#line 5487 "LibraryWindow.c"
 }
 
 
@@ -5446,48 +5493,48 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	LibraryImportQueueSidebarEntry* _tmp2_;
 	BatchImport* _tmp3_;
 	gboolean _tmp4_;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = batch_import;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = allow_user_cancel;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5466 "LibraryWindow.c"
+#line 5513 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
 	ImportManifest* _tmp0_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = manifest;
-#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5480 "LibraryWindow.c"
+#line 5527 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5487 "LibraryWindow.c"
+#line 5534 "LibraryWindow.c"
 }
 
 
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library) {
+static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse) {
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
@@ -5498,46 +5545,46 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	GeeArrayList* jobs = NULL;
 	GeeArrayList* _tmp15_;
 	GSList* _tmp16_;
-	GeeArrayList* _tmp29_;
-	gint _tmp30_;
+	GeeArrayList* _tmp30_;
 	gint _tmp31_;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gint _tmp32_;
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (job_name != NULL);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5527 "LibraryWindow.c"
+#line 5574 "LibraryWindow.c"
 		gboolean _tmp7_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5533 "LibraryWindow.c"
+#line 5580 "LibraryWindow.c"
 	} else {
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5537 "LibraryWindow.c"
+#line 5584 "LibraryWindow.c"
 	}
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5541 "LibraryWindow.c"
+#line 5588 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -5546,59 +5593,59 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		GtkResponseType _tmp12_;
 		GtkResponseType _tmp13_;
 		GtkResponseType _tmp14_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_strdup_printf (_ ("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 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp9_);
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		response = _tmp13_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = response;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ == GTK_RESPONSE_CANCEL) {
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5574 "LibraryWindow.c"
+#line 5621 "LibraryWindow.c"
 		}
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5578 "LibraryWindow.c"
+#line 5625 "LibraryWindow.c"
 	}
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp15_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = uris;
-#line 5586 "LibraryWindow.c"
+#line 5633 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp16_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5594 "LibraryWindow.c"
+#line 5641 "LibraryWindow.c"
 			gchar* _tmp17_;
 			gchar* uri = NULL;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = g_strdup ((const gchar*) uri_it->data);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp17_;
-#line 5601 "LibraryWindow.c"
+#line 5648 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
 				const gchar* _tmp18_;
@@ -5610,93 +5657,96 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 				GeeArrayList* _tmp24_;
 				GFile* _tmp25_;
 				gboolean _tmp26_;
-				FileImportJob* _tmp27_;
+				gboolean _tmp27_;
 				FileImportJob* _tmp28_;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				FileImportJob* _tmp29_;
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = uri;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = g_file_new_for_uri (_tmp18_);
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				file_or_dir = _tmp19_;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = file_or_dir;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = g_file_get_path (_tmp20_);
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = _tmp21_;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = _tmp22_ == NULL;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp22_);
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp23_) {
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5641 "LibraryWindow.c"
+#line 5689 "LibraryWindow.c"
 				}
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = jobs;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = file_or_dir;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp26_ = copy_to_library;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp27_ = file_import_job_new (_tmp25_, _tmp26_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp28_ = _tmp27_;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_batch_import_job_unref0 (_tmp28_);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp27_ = recurse;
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp28_ = file_import_job_new (_tmp25_, _tmp26_, _tmp27_);
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp29_ = _tmp28_;
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_batch_import_job_unref0 (_tmp29_);
+#line 791 "/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 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5661 "LibraryWindow.c"
+#line 5711 "LibraryWindow.c"
 			}
 		}
 	}
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = jobs;
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = _tmp30_;
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp31_ > 0) {
-#line 5673 "LibraryWindow.c"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp30_ = jobs;
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = _tmp31_;
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp32_ > 0) {
+#line 5723 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
-		GeeArrayList* _tmp32_;
-		const gchar* _tmp33_;
-		BatchImport* _tmp34_;
+		GeeArrayList* _tmp33_;
+		const gchar* _tmp34_;
 		BatchImport* _tmp35_;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp32_ = jobs;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp33_ = job_name;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp34_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ITERABLE, GeeIterable), _tmp33_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		batch_import = _tmp34_;
-#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp35_ = batch_import;
-#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_enqueue_batch_import (self, _tmp35_, TRUE);
-#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		BatchImport* _tmp36_;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp33_ = jobs;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp34_ = job_name;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp35_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable), _tmp34_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		batch_import = _tmp35_;
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp36_ = batch_import;
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_enqueue_batch_import (self, _tmp36_, TRUE);
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5695 "LibraryWindow.c"
+#line 5745 "LibraryWindow.c"
 	}
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5699 "LibraryWindow.c"
+#line 5749 "LibraryWindow.c"
 }
 
 
@@ -5717,157 +5767,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/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 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mask = _tmp4_;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5750 "LibraryWindow.c"
+#line 5800 "LibraryWindow.c"
 		gboolean _tmp11_;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5756 "LibraryWindow.c"
+#line 5806 "LibraryWindow.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5760 "LibraryWindow.c"
+#line 5810 "LibraryWindow.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5764 "LibraryWindow.c"
+#line 5814 "LibraryWindow.c"
 		gboolean _tmp12_;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5770 "LibraryWindow.c"
+#line 5820 "LibraryWindow.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5774 "LibraryWindow.c"
+#line 5824 "LibraryWindow.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5782 "LibraryWindow.c"
+#line 5832 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5791 "LibraryWindow.c"
+#line 5841 "LibraryWindow.c"
 			gboolean _tmp16_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5797 "LibraryWindow.c"
+#line 5847 "LibraryWindow.c"
 		} else {
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5801 "LibraryWindow.c"
+#line 5851 "LibraryWindow.c"
 		}
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5805 "LibraryWindow.c"
+#line 5855 "LibraryWindow.c"
 			gboolean _tmp17_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5811 "LibraryWindow.c"
+#line 5861 "LibraryWindow.c"
 		} else {
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5815 "LibraryWindow.c"
+#line 5865 "LibraryWindow.c"
 		}
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5823 "LibraryWindow.c"
+#line 5873 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5832 "LibraryWindow.c"
+#line 5882 "LibraryWindow.c"
 				gboolean _tmp21_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5838 "LibraryWindow.c"
+#line 5888 "LibraryWindow.c"
 			} else {
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5842 "LibraryWindow.c"
+#line 5892 "LibraryWindow.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5846 "LibraryWindow.c"
+#line 5896 "LibraryWindow.c"
 				gboolean _tmp22_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5852 "LibraryWindow.c"
+#line 5902 "LibraryWindow.c"
 			} else {
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5856 "LibraryWindow.c"
+#line 5906 "LibraryWindow.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5864 "LibraryWindow.c"
+#line 5914 "LibraryWindow.c"
 			} else {
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5870 "LibraryWindow.c"
+#line 5920 "LibraryWindow.c"
 			}
 		}
 	}
@@ -5891,87 +5941,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	GdkDragContext* _tmp13_;
 	GdkDragAction _tmp14_;
 	guint _tmp15_;
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = context;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/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 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/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 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	target = _tmp2_;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = target;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = GDK_NONE;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 5912 "LibraryWindow.c"
+#line 5962 "LibraryWindow.c"
 		GdkDragContext* _tmp5_;
 		guint _tmp6_;
-#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"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE");
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = context;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = time;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
-#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5927 "LibraryWindow.c"
+#line 5977 "LibraryWindow.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 5935 "LibraryWindow.c"
+#line 5985 "LibraryWindow.c"
 		GdkDragContext* _tmp9_;
 		guint _tmp10_;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = context;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = time;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5948 "LibraryWindow.c"
+#line 5998 "LibraryWindow.c"
 	}
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = library_window_get_drag_action (self);
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	drag_action = _tmp11_;
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = drag_action;
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == GDK_ACTION_DEFAULT) {
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 5960 "LibraryWindow.c"
+#line 6010 "LibraryWindow.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = context;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = drag_action;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = time;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5974 "LibraryWindow.c"
+#line 6024 "LibraryWindow.c"
 }
 
 
@@ -5981,54 +6031,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	guchar* _tmp1_;
 	GdkDragContext* _tmp2_;
 	GtkWidget* _tmp3_;
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selection_data;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData");
-#line 5998 "LibraryWindow.c"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData");
+#line 6048 "LibraryWindow.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 6006 "LibraryWindow.c"
+#line 6056 "LibraryWindow.c"
 		GdkDragContext* _tmp4_;
 		GtkSelectionData* _tmp5_;
 		guint _tmp6_;
 		guint _tmp7_;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = selection_data;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = info;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = time;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6021 "LibraryWindow.c"
+#line 6071 "LibraryWindow.c"
 	} else {
 		GdkDragContext* _tmp8_;
 		guint _tmp9_;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6031 "LibraryWindow.c"
+#line 6081 "LibraryWindow.c"
 	}
 }
 
@@ -6051,198 +6101,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	GdkDragAction _tmp22_;
 	GdkDragContext* _tmp23_;
 	guint _tmp24_;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp2_;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp1_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = uris_array;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 6078 "LibraryWindow.c"
+#line 6128 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp3_;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp3__length1;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6090 "LibraryWindow.c"
+#line 6140 "LibraryWindow.c"
 			gchar* _tmp4_;
 			gchar* uri = NULL;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 6097 "LibraryWindow.c"
+#line 6147 "LibraryWindow.c"
 			{
 				const gchar* _tmp5_;
 				gchar* _tmp6_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp6_ = g_strdup (_tmp5_);
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp6_);
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6109 "LibraryWindow.c"
+#line 6159 "LibraryWindow.c"
 			}
 		}
 	}
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	selected_action = _tmp8_;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = selected_action;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6123 "LibraryWindow.c"
+#line 6173 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp10_;
 		GtkResponseType _tmp18_;
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 6131 "LibraryWindow.c"
+#line 6181 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp10_;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6139 "LibraryWindow.c"
+#line 6189 "LibraryWindow.c"
 				gchar* _tmp11_;
 				gchar* uri = NULL;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 6146 "LibraryWindow.c"
+#line 6196 "LibraryWindow.c"
 				{
 					const gchar* _tmp12_;
 					GFile* _tmp13_;
 					GFile* _tmp14_;
 					gboolean _tmp15_;
 					gboolean _tmp16_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp14_ = _tmp13_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp16_ = !_tmp15_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp14_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 6167 "LibraryWindow.c"
+#line 6217 "LibraryWindow.c"
 						GtkResponseType _tmp17_;
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = _tmp17_;
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6177 "LibraryWindow.c"
+#line 6227 "LibraryWindow.c"
 					}
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6181 "LibraryWindow.c"
+#line 6231 "LibraryWindow.c"
 				}
 			}
 		}
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _result_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp18_) {
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6191 "LibraryWindow.c"
+#line 6241 "LibraryWindow.c"
 			{
-#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
-#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6197 "LibraryWindow.c"
+#line 6247 "LibraryWindow.c"
 			}
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6201 "LibraryWindow.c"
+#line 6251 "LibraryWindow.c"
 			{
-#line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6207 "LibraryWindow.c"
+#line 6257 "LibraryWindow.c"
 			}
 			default:
 			{
 				GdkDragContext* _tmp19_;
 				guint _tmp20_;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = time;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6225 "LibraryWindow.c"
+#line 6275 "LibraryWindow.c"
 			}
 		}
 	}
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = uris;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selected_action;
-#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 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY, TRUE);
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = context;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = time;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6245 "LibraryWindow.c"
+#line 6295 "LibraryWindow.c"
 }
 
 
@@ -6252,23 +6302,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	LibraryPhotosEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/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 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6271 "LibraryWindow.c"
+#line 6321 "LibraryWindow.c"
 }
 
 
@@ -6278,41 +6328,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	Event* _tmp1_;
 	EventsEventEntry* _tmp2_;
 	EventsEventEntry* _tmp3_;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/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 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6297 "LibraryWindow.c"
+#line 6347 "LibraryWindow.c"
 		EventsEventEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/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 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/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 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6311 "LibraryWindow.c"
+#line 6361 "LibraryWindow.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6315 "LibraryWindow.c"
+#line 6365 "LibraryWindow.c"
 }
 
 
@@ -6322,41 +6372,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
 	TagsSidebarEntry* _tmp3_;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/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 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6341 "LibraryWindow.c"
+#line 6391 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/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 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/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 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6355 "LibraryWindow.c"
+#line 6405 "LibraryWindow.c"
 	}
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6359 "LibraryWindow.c"
+#line 6409 "LibraryWindow.c"
 }
 
 
@@ -6366,41 +6416,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	SavedSearch* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
 	SearchesSidebarEntry* _tmp3_;
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/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 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6385 "LibraryWindow.c"
+#line 6435 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/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 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6399 "LibraryWindow.c"
+#line 6449 "LibraryWindow.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6403 "LibraryWindow.c"
+#line 6453 "LibraryWindow.c"
 }
 
 
@@ -6416,66 +6466,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	CollectionPage* _tmp10_;
 	Photo* _tmp11_;
 	LibraryPhotoPage* _tmp12_;
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = controller;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = current;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/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 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->photo_page;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 6447 "LibraryWindow.c"
+#line 6497 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp7_;
 		LibraryPhotoPage* _tmp8_;
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->photo_page = _tmp7_;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->photo_page;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6464 "LibraryWindow.c"
+#line 6514 "LibraryWindow.c"
 	}
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = controller;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = current;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->photo_page;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6478 "LibraryWindow.c"
+#line 6528 "LibraryWindow.c"
 }
 
 
@@ -6485,23 +6535,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	LibraryImportQueueSidebarEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/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 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6504 "LibraryWindow.c"
+#line 6554 "LibraryWindow.c"
 }
 
 
@@ -6522,169 +6572,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	gboolean _tmp13_ = FALSE;
 	GMount* _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6545 "LibraryWindow.c"
+#line 6595 "LibraryWindow.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/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 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = camera;
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_->uri;
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp8_;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6563 "LibraryWindow.c"
+#line 6613 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
 		GFile* _tmp10_;
 		GMount* _tmp11_;
 		GMount* _tmp12_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp11_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6577 "LibraryWindow.c"
-			goto __catch42_g_error;
+#line 6627 "LibraryWindow.c"
+			goto __catch46_g_error;
 		}
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp12_;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 6590 "LibraryWindow.c"
+#line 6640 "LibraryWindow.c"
 	}
-	goto __finally42;
-	__catch42_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6602 "LibraryWindow.c"
+#line 6652 "LibraryWindow.c"
 	}
-	__finally42:
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally46:
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/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 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6621 "LibraryWindow.c"
+#line 6671 "LibraryWindow.c"
 	}
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 6627 "LibraryWindow.c"
+#line 6677 "LibraryWindow.c"
 		DiscoveredCamera* _tmp15_;
 		const gchar* _tmp16_;
 		gboolean _tmp17_;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_->uri;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 6639 "LibraryWindow.c"
+#line 6689 "LibraryWindow.c"
 	} else {
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 6643 "LibraryWindow.c"
+#line 6693 "LibraryWindow.c"
 	}
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6647 "LibraryWindow.c"
+#line 6697 "LibraryWindow.c"
 		ImportPage* _tmp18_;
 		GMount* _tmp19_;
 		gboolean _tmp20_;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = mount;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 6659 "LibraryWindow.c"
+#line 6709 "LibraryWindow.c"
 			ImportPage* _tmp21_;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6665 "LibraryWindow.c"
+#line 6715 "LibraryWindow.c"
 		} else {
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6669 "LibraryWindow.c"
+#line 6719 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp22_;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6677 "LibraryWindow.c"
+#line 6727 "LibraryWindow.c"
 	}
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6687 "LibraryWindow.c"
+#line 6737 "LibraryWindow.c"
 }
 
 
@@ -6693,25 +6743,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp1_;
 	Page* _tmp2_;
 	GtkStack* _tmp3_;
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/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 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->stack;
-#line 980 "/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 (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6714 "LibraryWindow.c"
+#line 6764 "LibraryWindow.c"
 }
 
 
@@ -6719,49 +6769,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp0_;
 	Page* _tmp1_;
 	GtkStack* _tmp2_;
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/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 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->stack;
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6736 "LibraryWindow.c"
+#line 6786 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new10 (gboolean value) {
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6743 "LibraryWindow.c"
+#line 6793 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new11 (gboolean value) {
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6750 "LibraryWindow.c"
+#line 6800 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new12 (gboolean value) {
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6757 "LibraryWindow.c"
+#line 6807 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new13 (const gchar* value) {
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6764 "LibraryWindow.c"
+#line 6814 "LibraryWindow.c"
 }
 
 
@@ -6806,148 +6856,148 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	gchar* _tmp32_;
 	GAction* _tmp33_;
 	GVariant* _tmp34_;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/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 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_display_action = _tmp1_;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/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 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _variant_new10 (_tmp6_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/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 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	extended_display_action = _tmp9_;
-#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = extended_display_action;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/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 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = _variant_new11 (_tmp14_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/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 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_bar_display_action = _tmp17_;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = search_bar_display_action;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = search_bar_display_action;
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = config_facade_get_instance ();
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = _tmp20_;
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/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 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = _variant_new12 (_tmp22_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp19_, _tmp23_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp23_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp21_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/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 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sort_events_action = _tmp25_;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sort_events_action;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = config_facade_get_instance ();
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/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 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = _tmp30_;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp31_) {
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6913 "LibraryWindow.c"
+#line 6963 "LibraryWindow.c"
 	} else {
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6917 "LibraryWindow.c"
+#line 6967 "LibraryWindow.c"
 	}
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = g_strdup (_tmp27_);
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	event_sort_val = _tmp32_;
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sort_events_action;
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _variant_new13 (event_sort_val);
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp33_, _tmp34_);
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp34_);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6941 "LibraryWindow.c"
+#line 6991 "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 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6950 "LibraryWindow.c"
+#line 7000 "LibraryWindow.c"
 }
 
 
@@ -6960,62 +7010,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	const gchar* _tmp5_;
 	GtkProgressBar* _tmp6_;
 	guint _tmp7_;
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6975 "LibraryWindow.c"
+#line 7025 "LibraryWindow.c"
 	}
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = priority;
-#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp3_;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = label;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->background_progress_bar;
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp6_);
-#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/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 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 7001 "LibraryWindow.c"
+#line 7051 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_;
-#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7018 "LibraryWindow.c"
+#line 7068 "LibraryWindow.c"
 }
 
 
@@ -7024,43 +7074,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	gint _tmp1_;
 	guint _tmp2_;
 	gboolean _tmp4_;
-#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7037 "LibraryWindow.c"
+#line 7087 "LibraryWindow.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 7043 "LibraryWindow.c"
+#line 7093 "LibraryWindow.c"
 		guint _tmp3_;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
-#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 7051 "LibraryWindow.c"
+#line 7101 "LibraryWindow.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 7057 "LibraryWindow.c"
+#line 7107 "LibraryWindow.c"
 		gint _tmp5_;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7063 "LibraryWindow.c"
+#line 7113 "LibraryWindow.c"
 	}
 }
 
@@ -7083,100 +7133,100 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp17_;
 	gchar* _tmp18_;
 	gchar* _tmp19_;
-#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7098 "LibraryWindow.c"
+#line 7148 "LibraryWindow.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = count;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ <= 0.0) {
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 7110 "LibraryWindow.c"
+#line 7160 "LibraryWindow.c"
 	} else {
 		gdouble _tmp6_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 7117 "LibraryWindow.c"
+#line 7167 "LibraryWindow.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 7123 "LibraryWindow.c"
+#line 7173 "LibraryWindow.c"
 	} else {
 		gdouble _tmp7_;
 		gdouble _tmp8_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7133 "LibraryWindow.c"
+#line 7183 "LibraryWindow.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7137 "LibraryWindow.c"
+#line 7187 "LibraryWindow.c"
 		gint _tmp9_;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7145 "LibraryWindow.c"
+#line 7195 "LibraryWindow.c"
 	}
-#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
-#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp10_;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = count;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = total;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fraction = _tmp11_ / _tmp12_;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->background_progress_bar;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = fraction;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = label;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = fraction;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0));
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = _tmp18_;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp19_);
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp19_);
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7179 "LibraryWindow.c"
+#line 7229 "LibraryWindow.c"
 }
 
 
@@ -7186,179 +7236,179 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gint _tmp2_;
 	GtkProgressBar* _tmp3_;
 	GtkProgressBar* _tmp4_;
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7199 "LibraryWindow.c"
+#line 7249 "LibraryWindow.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1084 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, "");
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7217 "LibraryWindow.c"
+#line 7267 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7229 "LibraryWindow.c"
+#line 7279 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
 		GtkFrame* _tmp3_;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/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 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7245 "LibraryWindow.c"
+#line 7295 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 1104 "/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 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7258 "LibraryWindow.c"
+#line 7308 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/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 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7269 "LibraryWindow.c"
+#line 7319 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7279 "LibraryWindow.c"
+#line 7329 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7288 "LibraryWindow.c"
+#line 7338 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
 	gint _tmp0_;
-#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total_files;
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
-#line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7302 "LibraryWindow.c"
+#line 7352 "LibraryWindow.c"
 	} else {
 		gint _tmp1_;
 		gint _tmp2_;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = completed_files;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = total_files;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7312 "LibraryWindow.c"
+#line 7362 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7322 "LibraryWindow.c"
+#line 7372 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) {
 	guint64 _tmp0_;
 	guint64 _tmp1_;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = completed_bytes;
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = total_bytes;
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 7337 "LibraryWindow.c"
+#line 7387 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
 	guint _tmp0_;
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total;
-#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
-#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7351 "LibraryWindow.c"
+#line 7401 "LibraryWindow.c"
 	} else {
 		guint _tmp1_;
 		guint _tmp2_;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = completed;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = total;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7361 "LibraryWindow.c"
+#line 7411 "LibraryWindow.c"
 	}
 }
 
@@ -7415,220 +7465,220 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	GtkBox* _tmp47_;
 	Page* _tmp48_;
 	Page* _tmp49_;
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (start_page));
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	scrolled_sidebar = _tmp0_;
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/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 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/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 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/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 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/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 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp6_, "frame");
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->basic_properties;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/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 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/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 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->basic_properties;
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/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 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->basic_properties;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/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 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->basic_properties;
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/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 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->basic_properties;
-#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/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 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->basic_properties;
-#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1172 "/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 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->basic_properties;
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/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 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->bottom_frame;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->basic_properties;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/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 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->bottom_frame;
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/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 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp18_, "frame");
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->top_section;
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/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 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = self->priv->sidebar_paned;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->top_section;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/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 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = self->priv->sidebar_paned;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->bottom_frame;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/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 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = self->priv->sidebar_paned;
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp24_, 1000);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->right_vbox = _tmp25_;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = self->priv->right_vbox;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = self->priv->search_toolbar;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/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 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = self->priv->right_vbox;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = self->priv->stack;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/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 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->right_vbox;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = self->priv->toolbar_revealer;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/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 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp32_);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->client_paned);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->client_paned = _tmp32_;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = self->priv->client_paned;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = self->priv->sidebar_paned;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/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 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = self->priv->sidebar_tree;
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1193 "/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 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = self->priv->client_paned;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = self->priv->right_vbox;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/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 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = self->priv->client_paned;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/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 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp38_, _tmp41_);
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp40_);
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = self->priv->stack;
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/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 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = self->priv->layout;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = self->priv->client_paned;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/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 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = self->priv->layout;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1201 "/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"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = start_page;
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/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"
+#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = start_page;
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1204 "/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"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7604 "LibraryWindow.c"
+#line 7654 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
 	Page* _tmp0_;
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 7619 "LibraryWindow.c"
+#line 7669 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
 	gboolean _tmp0_;
-#line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1212 "/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 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 7631 "LibraryWindow.c"
+#line 7681 "LibraryWindow.c"
 }
 
 
@@ -7673,43 +7723,43 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	GtkToolbar* _tmp54_;
 	GtkToolbar* _tmp55_;
 	Page* _tmp61_;
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7686 "LibraryWindow.c"
+#line 7736 "LibraryWindow.c"
 	}
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/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 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp1_ == _tmp3_;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7702 "LibraryWindow.c"
+#line 7752 "LibraryWindow.c"
 	}
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/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 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp5_;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = current_page;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 7712 "LibraryWindow.c"
+#line 7762 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
 		Page* _tmp7_;
 		GtkToolbar* _tmp8_;
@@ -7717,96 +7767,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		Page* _tmp12_;
 		Page* _tmp13_;
 		Page* _tmp15_;
-#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/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 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = current_page;
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_toolbar (_tmp7_);
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		toolbar = _tmp8_;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = toolbar;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 7734 "LibraryWindow.c"
+#line 7784 "LibraryWindow.c"
 			GtkRevealer* _tmp10_;
 			GtkToolbar* _tmp11_;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = self->priv->toolbar_revealer;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/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 7743 "LibraryWindow.c"
+#line 7793 "LibraryWindow.c"
 		}
-#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp12_);
-#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7753 "LibraryWindow.c"
+#line 7803 "LibraryWindow.c"
 			SidebarTree* _tmp14_;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 7759 "LibraryWindow.c"
+#line 7809 "LibraryWindow.c"
 		}
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7767 "LibraryWindow.c"
+#line 7817 "LibraryWindow.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = page;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/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 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = page;
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/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 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = page;
-#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7783 "LibraryWindow.c"
+#line 7833 "LibraryWindow.c"
 		SidebarTree* _tmp20_;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 7789 "LibraryWindow.c"
+#line 7839 "LibraryWindow.c"
 	}
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = page;
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/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"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->page_map;
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = page;
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/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 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = (SidebarEntry*) _tmp25_;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = entry;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 7809 "LibraryWindow.c"
+#line 7859 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
 		SidebarEntry* _tmp27_;
 		SidebarExpandableEntry* _tmp28_;
@@ -7814,161 +7864,161 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		SidebarExpandableEntry* _tmp30_;
 		SidebarTree* _tmp35_;
 		SidebarEntry* _tmp36_;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/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 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		expandable_entry = _tmp28_;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = expandable_entry;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 7827 "LibraryWindow.c"
+#line 7877 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp31_;
 			gboolean _tmp32_;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 7836 "LibraryWindow.c"
+#line 7886 "LibraryWindow.c"
 		} else {
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 7840 "LibraryWindow.c"
+#line 7890 "LibraryWindow.c"
 		}
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 7844 "LibraryWindow.c"
+#line 7894 "LibraryWindow.c"
 			SidebarTree* _tmp33_;
 			SidebarEntry* _tmp34_;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7853 "LibraryWindow.c"
+#line 7903 "LibraryWindow.c"
 		}
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = entry;
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7863 "LibraryWindow.c"
+#line 7913 "LibraryWindow.c"
 	}
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = page;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7871 "LibraryWindow.c"
+#line 7921 "LibraryWindow.c"
 		Page* _tmp38_;
-#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
-#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/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 7877 "LibraryWindow.c"
+#line 7927 "LibraryWindow.c"
 	}
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/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"
+#line 1279 "/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 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp41_);
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = page;
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (_tmp42_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = page;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = page_get_menubar (_tmp43_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_menubar (_tmp45_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/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 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_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"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL);
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = _tmp47_;
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	old = _tmp48_;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/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"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = old;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL);
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_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"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = old;
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL);
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = page;
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = page_get_toolbar (_tmp53_);
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp54_;
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = toolbar;
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp55_ != NULL) {
-#line 7937 "LibraryWindow.c"
+#line 7987 "LibraryWindow.c"
 		GtkRevealer* _tmp56_;
 		GtkToolbar* _tmp57_;
 		GtkToolbar* _tmp58_;
 		GtkRevealer* _tmp59_;
 		gboolean _tmp60_;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp56_ = self->priv->toolbar_revealer;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp57_ = toolbar;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/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"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp58_ = toolbar;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/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"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp59_ = self->priv->toolbar_revealer;
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/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"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
-#line 7959 "LibraryWindow.c"
+#line 8009 "LibraryWindow.c"
 	}
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp61_ = page;
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_ready (_tmp61_);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 7971 "LibraryWindow.c"
+#line 8021 "LibraryWindow.c"
 }
 
 
@@ -7983,41 +8033,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	CheckerboardPage* _tmp7_;
 	SearchViewFilter* _tmp8_;
 	SearchViewFilter* _tmp9_;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp3_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/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 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp9_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 8020 "LibraryWindow.c"
+#line 8070 "LibraryWindow.c"
 }
 
 
@@ -8027,35 +8077,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	Page* _tmp1_;
 	Page* _tmp2_;
 	gboolean _tmp3_;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/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 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8042 "LibraryWindow.c"
+#line 8092 "LibraryWindow.c"
 		gboolean _tmp4_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 8048 "LibraryWindow.c"
+#line 8098 "LibraryWindow.c"
 	} else {
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8052 "LibraryWindow.c"
+#line 8102 "LibraryWindow.c"
 	}
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8058 "LibraryWindow.c"
+#line 8108 "LibraryWindow.c"
 }
 
 
@@ -8063,21 +8113,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	SearchFilterToolbar* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = show;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/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 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8080 "LibraryWindow.c"
+#line 8130 "LibraryWindow.c"
 		CheckerboardPage* _tmp3_;
 		SearchFilterToolbar* _tmp4_;
 		CheckerboardPage* _tmp5_;
@@ -8089,70 +8139,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		CheckerboardPage* _tmp11_;
 		SearchViewFilter* _tmp12_;
 		SearchViewFilter* _tmp13_;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_assert (NULL != _tmp3_, "null != page");
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->search_toolbar;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = page;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = page;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/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 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp13_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 8126 "LibraryWindow.c"
+#line 8176 "LibraryWindow.c"
 	} else {
 		CheckerboardPage* _tmp14_;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 8133 "LibraryWindow.c"
+#line 8183 "LibraryWindow.c"
 			CheckerboardPage* _tmp15_;
 			ViewCollection* _tmp16_;
 			ViewCollection* _tmp17_;
 			DisabledViewFilter* _tmp18_;
 			DisabledViewFilter* _tmp19_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = _tmp16_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp18_ = disabled_view_filter_new ();
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = _tmp18_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/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 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp19_);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 8155 "LibraryWindow.c"
+#line 8205 "LibraryWindow.c"
 		}
 	}
 }
@@ -8166,33 +8216,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	Page* _tmp4_;
 	SidebarPageRepresentative* _tmp5_;
 	Page* _tmp6_;
-#line 1314 "/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 1314 "/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 1314 "/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 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/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 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->page_map;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = entry;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/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 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 8195 "LibraryWindow.c"
+#line 8245 "LibraryWindow.c"
 }
 
 
@@ -8206,61 +8256,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	GeeHashMap* _tmp10_;
 	Page* _tmp11_;
 	gboolean _tmp12_;
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/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 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp0_ == _tmp2_;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8227 "LibraryWindow.c"
+#line 8277 "LibraryWindow.c"
 		LibraryBranch* _tmp4_;
 		LibraryPhotosEntry* _tmp5_;
 		LibraryPhotosEntry* _tmp6_;
 		Page* _tmp7_;
 		Page* _tmp8_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/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 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp8_);
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8247 "LibraryWindow.c"
+#line 8297 "LibraryWindow.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, _tmp9_);
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->page_map;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/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 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	removed = _tmp12_;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8263 "LibraryWindow.c"
+#line 8313 "LibraryWindow.c"
 }
 
 
@@ -8269,39 +8319,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	SidebarSelectableEntry* _tmp0_;
 	SidebarPageRepresentative* _tmp1_;
 	SidebarPageRepresentative* _tmp2_;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/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 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selectable;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/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 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_rep = _tmp1_;
-#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_rep;
-#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 8286 "LibraryWindow.c"
+#line 8336 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8300 "LibraryWindow.c"
+#line 8350 "LibraryWindow.c"
 	}
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8304 "LibraryWindow.c"
+#line 8354 "LibraryWindow.c"
 }
 
 
@@ -8322,207 +8372,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	LibraryPhotosEntry* _tmp32_;
 	Page* _tmp33_;
 	Page* _tmp34_;
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = selectable;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8343 "LibraryWindow.c"
+#line 8393 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp6_;
 		gboolean _tmp7_;
 		gboolean _tmp8_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/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 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 8355 "LibraryWindow.c"
+#line 8405 "LibraryWindow.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8359 "LibraryWindow.c"
+#line 8409 "LibraryWindow.c"
 	}
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8363 "LibraryWindow.c"
+#line 8413 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/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 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp11_);
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1348 "/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 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8381 "LibraryWindow.c"
+#line 8431 "LibraryWindow.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8387 "LibraryWindow.c"
+#line 8437 "LibraryWindow.c"
 		EventsBranch* _tmp14_;
 		gboolean _tmp15_;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/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 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 8396 "LibraryWindow.c"
+#line 8446 "LibraryWindow.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 8400 "LibraryWindow.c"
+#line 8450 "LibraryWindow.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 8404 "LibraryWindow.c"
+#line 8454 "LibraryWindow.c"
 		EventsBranch* _tmp16_;
 		EventsMasterDirectoryEntry* _tmp17_;
 		EventsMasterDirectoryEntry* _tmp18_;
 		Page* _tmp19_;
 		Page* _tmp20_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = events_branch_get_master_entry (_tmp16_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/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 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp20_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1355 "/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 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8430 "LibraryWindow.c"
+#line 8480 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8436 "LibraryWindow.c"
+#line 8486 "LibraryWindow.c"
 		EventsBranch* _tmp23_;
 		gboolean _tmp24_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/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 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 8445 "LibraryWindow.c"
+#line 8495 "LibraryWindow.c"
 	} else {
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 8449 "LibraryWindow.c"
+#line 8499 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 8453 "LibraryWindow.c"
+#line 8503 "LibraryWindow.c"
 		EventsBranch* _tmp25_;
 		EventsMasterDirectoryEntry* _tmp26_;
 		EventsMasterDirectoryEntry* _tmp27_;
 		Page* _tmp28_;
 		Page* _tmp29_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = events_branch_get_master_entry (_tmp25_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = _tmp26_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/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 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp29_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp29_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp27_);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8479 "LibraryWindow.c"
+#line 8529 "LibraryWindow.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/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 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp34_);
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8497 "LibraryWindow.c"
+#line 8547 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8504 "LibraryWindow.c"
+#line 8554 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8511 "LibraryWindow.c"
+#line 8561 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8518 "LibraryWindow.c"
+#line 8568 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8525 "LibraryWindow.c"
+#line 8575 "LibraryWindow.c"
 }
 
 
@@ -8530,27 +8580,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	ViewCollection* view = NULL;
 	Page* _tmp0_;
 	ViewCollection* _tmp1_;
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/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 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/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 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/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 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/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 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8553 "LibraryWindow.c"
+#line 8603 "LibraryWindow.c"
 }
 
 
@@ -8562,47 +8612,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	guint _tmp3_;
 	guint _tmp4_;
 	guint _tmp5_;
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/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 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/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 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/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 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/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 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8593 "LibraryWindow.c"
+#line 8643 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
 	OneShotScheduler* _tmp0_;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8605 "LibraryWindow.c"
+#line 8655 "LibraryWindow.c"
 }
 
 
@@ -8613,55 +8663,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	ExtendedPropertiesWindow* _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp8_;
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/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 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8626 "LibraryWindow.c"
+#line 8676 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/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 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8640 "LibraryWindow.c"
+#line 8690 "LibraryWindow.c"
 	}
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/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 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8650 "LibraryWindow.c"
+#line 8700 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/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 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8664 "LibraryWindow.c"
+#line 8714 "LibraryWindow.c"
 	}
 }
 
@@ -8681,20 +8731,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 8684 "LibraryWindow.c"
+#line 8734 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 8691 "LibraryWindow.c"
+#line 8741 "LibraryWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 8697 "LibraryWindow.c"
+#line 8747 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -8704,11 +8754,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 8707 "LibraryWindow.c"
+#line 8757 "LibraryWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8711 "LibraryWindow.c"
+#line 8761 "LibraryWindow.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -8716,7 +8766,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8719 "LibraryWindow.c"
+#line 8769 "LibraryWindow.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -8748,8 +8798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8751 "LibraryWindow.c"
-				goto __catch44_g_regex_error;
+#line 8801 "LibraryWindow.c"
+				goto __catch48_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -8757,7 +8807,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8760 "LibraryWindow.c"
+#line 8810 "LibraryWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -8773,8 +8823,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8776 "LibraryWindow.c"
-				goto __catch44_g_regex_error;
+#line 8826 "LibraryWindow.c"
+				goto __catch48_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -8784,7 +8834,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8787 "LibraryWindow.c"
+#line 8837 "LibraryWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -8798,10 +8848,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8801 "LibraryWindow.c"
+#line 8851 "LibraryWindow.c"
 	}
-	goto __finally44;
-	__catch44_g_regex_error:
+	goto __finally48;
+	__catch48_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8812,9 +8862,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8815 "LibraryWindow.c"
+#line 8865 "LibraryWindow.c"
 	}
-	__finally44:
+	__finally48:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8823,7 +8873,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8826 "LibraryWindow.c"
+#line 8876 "LibraryWindow.c"
 	}
 }
 
@@ -8841,188 +8891,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	gboolean _tmp13_;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = uri;
-#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"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1407: mount point reported: %s", _tmp0_);
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = uri;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 8858 "LibraryWindow.c"
+#line 8908 "LibraryWindow.c"
 		const gchar* _tmp3_;
-#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
-#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"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", _tmp3_);
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8866 "LibraryWindow.c"
+#line 8916 "LibraryWindow.c"
 	}
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_file_new_for_uri (_tmp4_);
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp5_;
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8876 "LibraryWindow.c"
+#line 8926 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
 		GFile* _tmp7_;
 		GMount* _tmp8_;
 		GMount* _tmp9_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp8_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8890 "LibraryWindow.c"
-			goto __catch43_g_error;
+#line 8940 "LibraryWindow.c"
+			goto __catch47_g_error;
 		}
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = NULL;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp9_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 8903 "LibraryWindow.c"
+#line 8953 "LibraryWindow.c"
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally47;
+	__catch47_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = err;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#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"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1423: %s", _tmp11_);
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8929 "LibraryWindow.c"
+#line 8979 "LibraryWindow.c"
 	}
-	__finally43:
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally47:
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/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 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8944 "LibraryWindow.c"
+#line 8994 "LibraryWindow.c"
 	}
-#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = uri;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8954 "LibraryWindow.c"
+#line 9004 "LibraryWindow.c"
 		const gchar* _tmp14_;
 		gchar* _tmp15_;
 		gchar* _tmp16_;
 		gchar* _tmp17_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = camera_table_get_port_uri (_tmp16_);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp17_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 8973 "LibraryWindow.c"
+#line 9023 "LibraryWindow.c"
 	}
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 8979 "LibraryWindow.c"
+#line 9029 "LibraryWindow.c"
 		const gchar* _tmp19_;
 		gboolean _tmp20_;
 		const gchar* _tmp23_;
 		gboolean _tmp24_;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 8990 "LibraryWindow.c"
+#line 9040 "LibraryWindow.c"
 			GeeHashSet* _tmp21_;
 			const gchar* _tmp22_;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/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 8999 "LibraryWindow.c"
+#line 9049 "LibraryWindow.c"
 		}
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = is_string_empty (_tmp23_);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 9007 "LibraryWindow.c"
+#line 9057 "LibraryWindow.c"
 			GeeHashSet* _tmp25_;
 			const gchar* _tmp26_;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/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 9016 "LibraryWindow.c"
+#line 9066 "LibraryWindow.c"
 		}
 	}
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 9025 "LibraryWindow.c"
+#line 9075 "LibraryWindow.c"
 }
 
 
@@ -9039,97 +9089,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	GdkEventKey* _tmp13_;
 	guint _tmp14_;
 	const gchar* _tmp15_;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/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 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9054 "LibraryWindow.c"
+#line 9104 "LibraryWindow.c"
 		SidebarTree* _tmp5_;
 		GdkEventKey* _tmp6_;
 		gboolean _tmp7_;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = event;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 9066 "LibraryWindow.c"
+#line 9116 "LibraryWindow.c"
 	} else {
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 9070 "LibraryWindow.c"
+#line 9120 "LibraryWindow.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 9074 "LibraryWindow.c"
+#line 9124 "LibraryWindow.c"
 		SidebarTree* _tmp8_;
 		GdkEventKey* _tmp9_;
 		gboolean _tmp10_ = FALSE;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = event;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/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 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 9086 "LibraryWindow.c"
+#line 9136 "LibraryWindow.c"
 	} else {
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9090 "LibraryWindow.c"
+#line 9140 "LibraryWindow.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9098 "LibraryWindow.c"
+#line 9148 "LibraryWindow.c"
 	}
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/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 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9110 "LibraryWindow.c"
+#line 9160 "LibraryWindow.c"
 	}
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _tmp13_->keyval;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
-#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9126 "LibraryWindow.c"
+#line 9176 "LibraryWindow.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9132 "LibraryWindow.c"
+#line 9182 "LibraryWindow.c"
 }
 
 
@@ -9145,14 +9195,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 9148 "LibraryWindow.c"
+#line 9198 "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 9155 "LibraryWindow.c"
+#line 9205 "LibraryWindow.c"
 }
 
 
@@ -9198,14 +9248,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 9201 "LibraryWindow.c"
+#line 9251 "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 9208 "LibraryWindow.c"
+#line 9258 "LibraryWindow.c"
 }
 
 
@@ -9226,7 +9276,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 9229 "LibraryWindow.c"
+#line 9279 "LibraryWindow.c"
 }
 
 
@@ -9234,7 +9284,7 @@ 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 9237 "LibraryWindow.c"
+#line 9287 "LibraryWindow.c"
 }
 
 
@@ -9249,7 +9299,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames
 	_tmp0_ = ui_filenames;
 #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 9252 "LibraryWindow.c"
+#line 9302 "LibraryWindow.c"
 }
 
 
@@ -9266,14 +9316,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) 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 9269 "LibraryWindow.c"
+#line 9319 "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 9276 "LibraryWindow.c"
+#line 9326 "LibraryWindow.c"
 }
 
 
@@ -9289,7 +9339,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 9292 "LibraryWindow.c"
+#line 9342 "LibraryWindow.c"
 }
 
 
@@ -9339,11 +9389,11 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9346 "LibraryWindow.c"
+#line 9396 "LibraryWindow.c"
 }
 
 
@@ -9376,115 +9426,117 @@ static void library_window_instance_init (LibraryWindow * self) {
 	_tmp1_ = g_strdup (_tmp0_);
 #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"
+#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_recursive = TRUE;
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp2_);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->sidebar_paned = _tmp2_;
 #line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->sidebar_paned = _tmp2_;
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp3_);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp3_;
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->client_paned = _tmp3_;
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/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 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->properties_scheduler = NULL;
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->notify_library_is_home_dir = TRUE;
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_branch_new ();
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->library_branch = _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->library_branch = _tmp5_;
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = tags_branch_new ();
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->tags_branch = _tmp6_;
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->tags_branch = _tmp6_;
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = folders_branch_new ();
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->folders_branch = _tmp7_;
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->folders_branch = _tmp7_;
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = events_branch_new ();
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->events_branch = _tmp8_;
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->events_branch = _tmp8_;
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = camera_branch_new ();
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->camera_branch = _tmp9_;
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->camera_branch = _tmp9_;
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = searches_branch_new ();
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->saved_search_branch = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->saved_search_branch = _tmp10_;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->photo_page = NULL;
-#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = FALSE;
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = search_filter_actions_new ();
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_actions = _tmp12_;
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp13_);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->top_section = _tmp13_;
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->top_section = _tmp13_;
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp14_);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_frame = _tmp14_;
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_frame = _tmp14_;
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp15_);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_bar = _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_bar = _tmp15_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_displayed = FALSE;
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = basic_properties_new ();
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp16_);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->basic_properties = _tmp16_;
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = (GtkStack*) gtk_stack_new ();
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->stack = _tmp17_;
 #line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->stack = _tmp17_;
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp18_);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->layout = _tmp18_;
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = (GtkRevealer*) gtk_revealer_new ();
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp19_);
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/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 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->current_progress_priority = 0;
+#line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9487 "LibraryWindow.c"
+#line 9539 "LibraryWindow.c"
 }
 
 
@@ -9524,51 +9576,51 @@ static void library_window_finalize (GObject * obj) {
 	guint _tmp45_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#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 223 "/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 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#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 224 "/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 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#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 225 "/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 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/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 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/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 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#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 230 "/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 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/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 9571 "LibraryWindow.c"
+#line 9623 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_;
@@ -9577,27 +9629,27 @@ static void library_window_finalize (GObject * obj) {
 		GeeCollection* _tmp17_;
 		GeeIterator* _tmp18_;
 		GeeIterator* _tmp19_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9600 "LibraryWindow.c"
+#line 9652 "LibraryWindow.c"
 			GeeIterator* _tmp20_;
 			gboolean _tmp21_;
 			MediaSourceCollection* media_sources = NULL;
@@ -9607,161 +9659,161 @@ static void library_window_finalize (GObject * obj) {
 			guint _tmp25_;
 			MediaSourceCollection* _tmp26_;
 			guint _tmp27_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp21_) {
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9618 "LibraryWindow.c"
+#line 9670 "LibraryWindow.c"
 			}
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp23_;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp23_;
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = media_sources;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
-#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 234 "/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 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = media_sources;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/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 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9640 "LibraryWindow.c"
+#line 9692 "LibraryWindow.c"
 		}
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9644 "LibraryWindow.c"
+#line 9696 "LibraryWindow.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/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 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_monitor_pool_get_instance ();
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp32_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp34_;
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp34_;
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = monitor;
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 9672 "LibraryWindow.c"
+#line 9724 "LibraryWindow.c"
 		LibraryMonitor* _tmp36_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9678 "LibraryWindow.c"
+#line 9730 "LibraryWindow.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = _tmp37_;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/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 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp38_);
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp38_);
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = library_monitor_pool_get_instance ();
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/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 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp41_);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = camera_table_get_instance ();
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/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 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/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 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 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->client_paned);
+	_g_object_unref0 (self->priv->sidebar_paned);
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->client_paned);
+#line 102 "/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"
+#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->sidebar_tree);
 #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->library_branch);
+	_g_object_unref0 (self->priv->sidebar_tree);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->tags_branch);
+	_g_object_unref0 (self->priv->library_branch);
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->folders_branch);
+	_g_object_unref0 (self->priv->tags_branch);
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->events_branch);
+	_g_object_unref0 (self->priv->folders_branch);
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->camera_branch);
+	_g_object_unref0 (self->priv->events_branch);
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->camera_branch);
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->saved_search_branch);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->page_map);
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->photo_page);
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_search_filter_actions_unref0 (self->priv->search_actions);
 #line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_search_filter_actions_unref0 (self->priv->search_actions);
+#line 130 "/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 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->background_progress_frame);
+	_g_object_unref0 (self->priv->top_section);
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->background_progress_frame);
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_bar);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->basic_properties);
 #line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->basic_properties);
+#line 138 "/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 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->layout);
+	_g_object_unref0 (self->priv->stack);
 #line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->right_vbox);
+	_g_object_unref0 (self->priv->layout);
 #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->right_vbox);
+#line 143 "/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 9764 "LibraryWindow.c"
+#line 9816 "LibraryWindow.c"
 }
 
 
@@ -9782,13 +9834,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 9785 "LibraryWindow.c"
+#line 9837 "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 9791 "LibraryWindow.c"
+#line 9843 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 0a39318..47a0ad9 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -95,6 +95,7 @@ public class LibraryWindow : AppWindow {
     }
 
     private string import_dir = Environment.get_home_dir();
+    private bool import_recursive = true;
 
     private Gtk.Paned sidebar_paned = new Gtk.Paned(Gtk.Orientation.VERTICAL);
     private Gtk.Paned client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
@@ -510,10 +511,15 @@ public class LibraryWindow : AppWindow {
         import_dialog.set_local_only(false);
         import_dialog.set_select_multiple(true);
         import_dialog.set_current_folder(import_dir);
+
+        var recursive = new Gtk.CheckButton.with_label(_("Recurse Into Subfolders"));
+        recursive.active = import_recursive;
+        import_dialog.set_extra_widget(recursive);
         
         int response = import_dialog.run();
         
         if (response == Gtk.ResponseType.OK) {
+            import_dialog.hide();
             // force file linking if directory is inside current library directory
             Gtk.ResponseType copy_files_response =
                 AppDirs.is_in_import_dir(File.new_for_uri(import_dialog.get_uri()))
@@ -521,11 +527,12 @@ public class LibraryWindow : AppWindow {
             
             if (copy_files_response != Gtk.ResponseType.CANCEL) {
                 dispatch_import_jobs(import_dialog.get_uris(), "folders",
-                    copy_files_response == Gtk.ResponseType.ACCEPT);
+                    copy_files_response == Gtk.ResponseType.ACCEPT, recursive.active);
             }
         }
         
         import_dir = import_dialog.get_current_folder();
+        import_recursive = recursive.active;
         import_dialog.destroy();
     }
     
@@ -645,7 +652,7 @@ public class LibraryWindow : AppWindow {
     }
     
     private void on_preferences() {
-        PreferencesDialog.show();
+        PreferencesDialog.show_preferences();
     }
     
     private void on_display_basic_properties(GLib.SimpleAction action, Variant? value) {
@@ -766,7 +773,7 @@ public class LibraryWindow : AppWindow {
         ImportUI.report_manifest(manifest, true);
     }
     
-    private void dispatch_import_jobs(GLib.SList<string> uris, string job_name, bool copy_to_library) {
+    private void dispatch_import_jobs(GLib.SList<string> uris, string job_name, bool copy_to_library, bool recurse) {
         if (AppDirs.get_import_dir().get_path() == Environment.get_home_dir() && notify_library_is_home_dir) {
             Gtk.ResponseType response = AppWindow.affirm_cancel_question(
                 _("Shotwell is configured to import photos to your home directory.\n" + 
@@ -790,7 +797,7 @@ public class LibraryWindow : AppWindow {
                 continue;
             }
 
-            jobs.add(new FileImportJob(file_or_dir, copy_to_library));
+            jobs.add(new FileImportJob(file_or_dir, copy_to_library, recurse));
         }
         
         if (jobs.size > 0) {
@@ -897,7 +904,7 @@ public class LibraryWindow : AppWindow {
             }
         }
         
-        dispatch_import_jobs(uris, "drag-and-drop", selected_action == Gdk.DragAction.COPY);
+        dispatch_import_jobs(uris, "drag-and-drop", selected_action == Gdk.DragAction.COPY, true);
         
         Gtk.drag_finish(context, true, false, time);
     }
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 98ee9c1..1e3ffc8 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -805,7 +805,6 @@ 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);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important);
 void page_update_actions (Page* self, gint selected_count, gint count);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
@@ -871,21 +870,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 875 "TrashPage.c"
+#line 874 "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 882 "TrashPage.c"
+#line 881 "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 889 "TrashPage.c"
+#line 888 "TrashPage.c"
 }
 
 
@@ -952,14 +951,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 956 "TrashPage.c"
+#line 955 "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 963 "TrashPage.c"
+#line 962 "TrashPage.c"
 }
 
 
@@ -979,7 +978,7 @@ 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 983 "TrashPage.c"
+#line 982 "TrashPage.c"
 }
 
 
@@ -999,7 +998,7 @@ static void trash_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
-#line 1003 "TrashPage.c"
+#line 1002 "TrashPage.c"
 }
 
 
@@ -1014,7 +1013,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 	_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"
+#line 1017 "TrashPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1026,11 +1025,11 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 		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"
+#line 1029 "TrashPage.c"
 			GActionEntry entry = {0};
 #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			entry = entry_collection[entry_it];
-#line 1034 "TrashPage.c"
+#line 1033 "TrashPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1043,7 +1042,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1047 "TrashPage.c"
+#line 1046 "TrashPage.c"
 			}
 		}
 	}
@@ -1053,7 +1052,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 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 1057 "TrashPage.c"
+#line 1056 "TrashPage.c"
 }
 
 
@@ -1072,7 +1071,7 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1076 "TrashPage.c"
+#line 1075 "TrashPage.c"
 }
 
 
@@ -1091,50 +1090,46 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 #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 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 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 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 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE);
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = selected_count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/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 1108 "TrashPage.c"
+#line 1103 "TrashPage.c"
 }
 
 
 static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp12_;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = added;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp0_ != NULL) {
-#line 1125 "TrashPage.c"
+#line 1120 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp1_ = added;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1138 "TrashPage.c"
+#line 1133 "TrashPage.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				MediaSource* source = NULL;
@@ -1145,52 +1140,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp9_;
 				TrashPageTrashView* _tmp10_;
 				TrashPageTrashView* _tmp11_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp3_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp4_) {
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1157 "TrashPage.c"
+#line 1152 "TrashPage.c"
 				}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp5_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp8_ = _tmp7_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp9_ = source;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp10_ = trash_page_trash_view_new (_tmp9_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp11_ = _tmp10_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1183 "TrashPage.c"
+#line 1178 "TrashPage.c"
 			}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1187 "TrashPage.c"
+#line 1182 "TrashPage.c"
 		}
 	}
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp12_ = removed;
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp12_ != NULL) {
-#line 1194 "TrashPage.c"
+#line 1189 "TrashPage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_;
 		ViewCollection* _tmp14_;
@@ -1199,32 +1194,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 		ViewCollection* _tmp29_;
 		ViewCollection* _tmp30_;
 		Marker* _tmp31_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp14_ = _tmp13_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp16_ = _tmp15_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		marker = _tmp16_;
-#line 1215 "TrashPage.c"
+#line 1210 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_;
 			GeeIterator* _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp17_ = removed;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1228 "TrashPage.c"
+#line 1223 "TrashPage.c"
 				GeeIterator* _tmp19_;
 				gboolean _tmp20_;
 				MediaSource* source = NULL;
@@ -1236,61 +1231,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp26_;
 				DataView* _tmp27_;
 				DataView* _tmp28_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp19_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp20_) {
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1248 "TrashPage.c"
+#line 1243 "TrashPage.c"
 				}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp21_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp23_ = marker;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp25_ = _tmp24_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp26_ = source;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp28_ = _tmp27_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1276 "TrashPage.c"
+#line 1271 "TrashPage.c"
 			}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1280 "TrashPage.c"
+#line 1275 "TrashPage.c"
 		}
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp30_ = _tmp29_;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp31_ = marker;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_g_object_unref0 (marker);
-#line 1294 "TrashPage.c"
+#line 1289 "TrashPage.c"
 	}
 }
 
@@ -1308,51 +1303,51 @@ static void trash_page_on_restore (TrashPage* self) {
 	GeeCollection* _tmp9_;
 	TrashUntrashPhotosCommand* _tmp10_;
 	TrashUntrashPhotosCommand* _tmp11_;
-#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp3_) {
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		return;
-#line 1328 "TrashPage.c"
+#line 1323 "TrashPage.c"
 	}
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp11_ = _tmp10_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_command_manager_unref0 (_tmp5_);
-#line 1356 "TrashPage.c"
+#line 1351 "TrashPage.c"
 }
 
 
@@ -1360,15 +1355,15 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	TrashPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = g_strdup (_ ("Trash is empty"));
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp0_;
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1372 "TrashPage.c"
+#line 1367 "TrashPage.c"
 }
 
 
@@ -1382,50 +1377,50 @@ static void trash_page_on_delete (TrashPage* self) {
 	ViewCollection* _tmp6_;
 	GeeList* _tmp7_;
 	GeeCollection* _tmp8_;
-#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = _tmp1_;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = _tmp3_ == 1;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp4_) {
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1402 "TrashPage.c"
+#line 1397 "TrashPage.c"
 	} else {
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = _ ("Deleting Photos");
-#line 1406 "TrashPage.c"
+#line 1401 "TrashPage.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = view_collection_get_selected_sources (_tmp6_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	remove_from_app (_tmp8_, _ ("Delete"), _tmp0_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1422 "TrashPage.c"
+#line 1417 "TrashPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1429 "TrashPage.c"
+#line 1424 "TrashPage.c"
 }
 
 
@@ -1434,17 +1429,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	SearchViewFilter* result = NULL;
 	TrashPageTrashSearchViewFilter* _tmp0_;
 	SearchViewFilter* _tmp1_;
-#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1448 "TrashPage.c"
+#line 1443 "TrashPage.c"
 }
 
 
@@ -1473,21 +1468,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 1477 "TrashPage.c"
+#line 1472 "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 1484 "TrashPage.c"
+#line 1479 "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 1491 "TrashPage.c"
+#line 1486 "TrashPage.c"
 }
 
 
@@ -1516,7 +1511,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 1520 "TrashPage.c"
+#line 1515 "TrashPage.c"
 }
 
 
@@ -1526,14 +1521,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 1530 "TrashPage.c"
+#line 1525 "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 1537 "TrashPage.c"
+#line 1532 "TrashPage.c"
 }
 
 
@@ -1542,7 +1537,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 = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria;
-#line 1546 "TrashPage.c"
+#line 1541 "TrashPage.c"
 }
 
 
@@ -1583,7 +1578,7 @@ static void trash_page_class_init (TrashPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) 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 1587 "TrashPage.c"
+#line 1582 "TrashPage.c"
 }
 
 
@@ -1595,7 +1590,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 1599 "TrashPage.c"
+#line 1594 "TrashPage.c"
 }
 
 
@@ -1609,7 +1604,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 1613 "TrashPage.c"
+#line 1608 "TrashPage.c"
 }
 
 
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index c06fbbf..35dee4e 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -73,9 +73,7 @@ public class TrashPage : CheckerboardPage {
         bool has_selected = selected_count > 0;
         
         set_action_sensitive("Delete", has_selected);
-        set_action_important("Delete", true);
         set_action_sensitive("Restore", has_selected);
-        set_action_important("Restore", true);
         set_common_action_important("CommonEmptyTrash", true);
         
         base.update_actions(selected_count, count);
diff --git a/src/main.c b/src/main.c
index 0cc8e90..5659731 100644
--- a/src/main.c
+++ b/src/main.c
@@ -418,6 +418,7 @@ struct _ImportManifest {
 	GeeList* already_imported;
 	GeeList* corrupt_files;
 	GeeList* all;
+	GTimer* timer;
 };
 
 struct _ImportManifestClass {
@@ -444,6 +445,8 @@ extern gboolean commandline_options_show_version;
 gboolean commandline_options_show_version = FALSE;
 extern gboolean commandline_options_no_runtime_monitoring;
 gboolean commandline_options_no_runtime_monitoring = FALSE;
+extern gboolean commandline_options_fullscreen;
+gboolean commandline_options_fullscreen = FALSE;
 extern GOptionEntry* commandline_options_entries;
 extern gint commandline_options_entries_length1;
 GOptionEntry* commandline_options_entries = NULL;
@@ -514,6 +517,7 @@ gboolean aggregate_progress_monitor_monitor (AggregateProgressMonitor* self, gui
 static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
 void thumbnail_cache_init (void);
 void tombstone_init (void);
+void library_files_select_copy_function (void);
 void aggregate_progress_monitor_next_step (AggregateProgressMonitor* self, const gchar* name);
 void library_photo_init (ProgressMonitor monitor, void* monitor_target);
 void video_init (ProgressMonitor monitor, void* monitor_target);
@@ -600,8 +604,8 @@ gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
 GType file_import_job_get_type (void) G_GNUC_CONST;
 GFile* app_dirs_get_import_dir (void);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
 AppWindow* app_window_get_instance (void);
 GType batch_import_get_type (void) G_GNUC_CONST;
 gpointer batch_import_roll_ref (gpointer instance);
@@ -636,30 +640,32 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object);
 gpointer import_ui_value_get_question_params (const GValue* value);
 GType import_ui_question_params_get_type (void) G_GNUC_CONST;
 gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
-void editing_exec (const gchar* filename);
+void editing_exec (const gchar* filename, gboolean fullscreen);
 void direct_preconfigure (GFile* initial_file);
 void direct_app_init (GError** error);
 GType direct_window_get_type (void) G_GNUC_CONST;
 DirectWindow* direct_window_new (GFile* file);
 DirectWindow* direct_window_construct (GType object_type, GFile* file);
+GAction* app_window_get_common_action (AppWindow* self, const gchar* name);
 void direct_app_terminate (void);
 GOptionEntry* commandline_options_get_options (int* result_length1);
-static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length);
-static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length);
 static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
 static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
-static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length);
+static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value);
+static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length);
 void _vala_main (gchar** args, int args_length1);
 void app_dirs_init (const gchar* arg0);
 GFile* app_dirs_get_install_dir (void);
-GFile* app_dirs_get_exec_dir (void);
+GFile* app_dirs_get_lib_dir (void);
 #define RESOURCES_APP_GETTEXT_PACKAGE GETTEXT_PACKAGE
 void app_dirs_terminate (void);
 #define RESOURCES_GIT_VERSION _GIT_VERSION
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
-static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value);
 gboolean is_string_empty (const gchar* s);
 #define DEBUG_LIBRARY_PREFIX "L"
 #define DEBUG_VIEWER_PREFIX "V"
@@ -698,7 +704,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 702 "main.c"
+#line 708 "main.c"
 }
 
 
@@ -707,14 +713,14 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu
 	result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 711 "main.c"
+#line 717 "main.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 718 "main.c"
+#line 724 "main.c"
 }
 
 
@@ -798,7 +804,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_tmp1_ = was_already_running;
 #line 18 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 802 "main.c"
+#line 808 "main.c"
 		gchar** _tmp2_;
 		gint _tmp2__length1;
 #line 25 "/home/jens/Source/shotwell/src/main.vala"
@@ -811,7 +817,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		application_send_to_primary_instance (_tmp2_, _tmp2__length1);
 #line 27 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 815 "main.c"
+#line 821 "main.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_data_subdir ("data", NULL);
@@ -827,18 +833,18 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_g_object_unref0 (_tmp6_);
 #line 31 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp4_);
-#line 831 "main.c"
+#line 837 "main.c"
 	{
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		library_app_init (&_inner_error_);
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 837 "main.c"
-			goto __catch222_g_error;
+#line 843 "main.c"
+			goto __catch233_g_error;
 		}
 	}
-	goto __finally222;
-	__catch222_g_error:
+	goto __finally233;
+	__catch233_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -857,9 +863,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_error_free0 (err);
 #line 39 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 861 "main.c"
+#line 867 "main.c"
 	}
-	__finally222:
+	__finally233:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -868,7 +874,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		g_clear_error (&_inner_error_);
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 872 "main.c"
+#line 878 "main.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/main.vala"
 	g_message ("main.vala:43: Verifying database…");
@@ -890,15 +896,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	switch (_tmp12_) {
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_OK:
-#line 894 "main.c"
+#line 900 "main.c"
 		{
 #line 51 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 898 "main.c"
+#line 904 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 902 "main.c"
+#line 908 "main.c"
 		{
 			const gchar* _tmp13_;
 			gint _tmp14_;
@@ -917,11 +923,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp15_;
 #line 56 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 919 "main.c"
+#line 925 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 923 "main.c"
+#line 929 "main.c"
 		{
 			const gchar* _tmp16_;
 			gint _tmp17_;
@@ -940,11 +946,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp18_;
 #line 62 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 940 "main.c"
+#line 946 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 944 "main.c"
+#line 950 "main.c"
 		{
 			const gchar* _tmp19_;
 			gint _tmp20_;
@@ -980,7 +986,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_g_object_unref0 (_tmp22_);
 #line 68 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 977 "main.c"
+#line 983 "main.c"
 		}
 		default:
 		{
@@ -999,14 +1005,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp28_;
 #line 73 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 996 "main.c"
+#line 1002 "main.c"
 		}
 	}
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp29_ = errormsg;
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp29_ != NULL) {
-#line 1003 "main.c"
+#line 1009 "main.c"
 		GtkMessageDialog* dialog = NULL;
 		const gchar* _tmp30_;
 		GtkMessageDialog* _tmp31_;
@@ -1043,7 +1049,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_free0 (errormsg);
 #line 85 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1040 "main.c"
+#line 1046 "main.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/main.vala"
 	upgrades_init ();
@@ -1061,7 +1067,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_tmp35_ = commandline_options_no_startup_progress;
 #line 94 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp35_) {
-#line 1058 "main.c"
+#line 1064 "main.c"
 		guint64 grand_total = 0ULL;
 		PhotoTable* _tmp36_;
 		PhotoTable* _tmp37_;
@@ -1128,7 +1134,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_tmp52_ = grand_total;
 #line 103 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp52_ > ((guint64) 5000)) {
-#line 1125 "main.c"
+#line 1131 "main.c"
 			ProgressDialog* _tmp53_;
 			ProgressDialog* _tmp54_;
 			ProgressDialog* _tmp55_;
@@ -1152,7 +1158,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_tmp55_ = progress_dialog;
 #line 106 "/home/jens/Source/shotwell/src/main.vala"
 			progress_dialog_set_minimum_on_screen_time_msec (_tmp55_, 250);
-#line 1149 "main.c"
+#line 1155 "main.c"
 			{
 				GdkPixbuf* _tmp56_ = NULL;
 				GdkPixbuf* _tmp57_;
@@ -1163,8 +1169,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				_tmp56_ = _tmp57_;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1160 "main.c"
-					goto __catch223_g_error;
+#line 1166 "main.c"
+					goto __catch234_g_error;
 				}
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp58_ = progress_dialog;
@@ -1172,10 +1178,10 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_window_get_type (), GtkWindow), _tmp56_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (_tmp56_);
-#line 1169 "main.c"
+#line 1175 "main.c"
 			}
-			goto __finally223;
-			__catch223_g_error:
+			goto __finally234;
+			__catch234_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp59_;
@@ -1193,9 +1199,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
 "indow: %s", _tmp60_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_g_error_free0 (err);
-#line 1189 "main.c"
+#line 1195 "main.c"
 			}
-			__finally223:
+			__finally234:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1220,7 +1226,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				return;
-#line 1216 "main.c"
+#line 1222 "main.c"
 			}
 #line 113 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp61_ = grand_total;
@@ -1248,7 +1254,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			monitor_target = aggregate_progress_monitor_ref (_tmp64_);
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1244 "main.c"
+#line 1250 "main.c"
 		}
 	}
 #line 118 "/home/jens/Source/shotwell/src/main.vala"
@@ -1256,278 +1262,280 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 119 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_init ();
 #line 121 "/home/jens/Source/shotwell/src/main.vala"
+	library_files_select_copy_function ();
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp65_ = aggregate_monitor;
-#line 121 "/home/jens/Source/shotwell/src/main.vala"
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp65_ != NULL) {
-#line 1255 "main.c"
+#line 1263 "main.c"
 		AggregateProgressMonitor* _tmp66_;
-#line 122 "/home/jens/Source/shotwell/src/main.vala"
+#line 124 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp66_ = aggregate_monitor;
-#line 122 "/home/jens/Source/shotwell/src/main.vala"
+#line 124 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp66_, "LibraryPhoto.init");
-#line 1261 "main.c"
+#line 1269 "main.c"
 	}
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp67_ = monitor;
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp67__target = monitor_target;
-#line 123 "/home/jens/Source/shotwell/src/main.vala"
+#line 125 "/home/jens/Source/shotwell/src/main.vala"
 	library_photo_init (_tmp67_, _tmp67__target);
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp68_ = aggregate_monitor;
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp68_ != NULL) {
-#line 1273 "main.c"
+#line 1281 "main.c"
 		AggregateProgressMonitor* _tmp69_;
-#line 125 "/home/jens/Source/shotwell/src/main.vala"
+#line 127 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp69_ = aggregate_monitor;
-#line 125 "/home/jens/Source/shotwell/src/main.vala"
+#line 127 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp69_, "Video.init");
-#line 1279 "main.c"
+#line 1287 "main.c"
 	}
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp70_ = monitor;
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp70__target = monitor_target;
-#line 126 "/home/jens/Source/shotwell/src/main.vala"
+#line 128 "/home/jens/Source/shotwell/src/main.vala"
 	video_init (_tmp70_, _tmp70__target);
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp71_ = aggregate_monitor;
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp71_ != NULL) {
-#line 1291 "main.c"
+#line 1299 "main.c"
 		AggregateProgressMonitor* _tmp72_;
-#line 128 "/home/jens/Source/shotwell/src/main.vala"
+#line 130 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp72_ = aggregate_monitor;
-#line 128 "/home/jens/Source/shotwell/src/main.vala"
+#line 130 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp72_, "Upgrades.execute");
-#line 1297 "main.c"
+#line 1305 "main.c"
 	}
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp73_ = upgrades_get_instance ();
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp74_ = _tmp73_;
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
 	upgrades_execute (_tmp74_, NULL, NULL);
-#line 129 "/home/jens/Source/shotwell/src/main.vala"
-	_upgrades_unref0 (_tmp74_);
 #line 131 "/home/jens/Source/shotwell/src/main.vala"
+	_upgrades_unref0 (_tmp74_);
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_init ();
-#line 132 "/home/jens/Source/shotwell/src/main.vala"
+#line 134 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_init ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 135 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp75_ = media_collection_registry_get_instance ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 135 "/home/jens/Source/shotwell/src/main.vala"
 	registry = _tmp75_;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp76_ = registry;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp77_ = library_photo_global;
-#line 134 "/home/jens/Source/shotwell/src/main.vala"
+#line 136 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_register_collection (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 135 "/home/jens/Source/shotwell/src/main.vala"
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp78_ = registry;
-#line 135 "/home/jens/Source/shotwell/src/main.vala"
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp79_ = video_global;
-#line 135 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 137 "/home/jens/Source/shotwell/src/main.vala"
+	media_collection_registry_register_collection (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp80_ = aggregate_monitor;
-#line 137 "/home/jens/Source/shotwell/src/main.vala"
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp80_ != NULL) {
-#line 1331 "main.c"
+#line 1339 "main.c"
 		AggregateProgressMonitor* _tmp81_;
-#line 138 "/home/jens/Source/shotwell/src/main.vala"
+#line 140 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp81_ = aggregate_monitor;
-#line 138 "/home/jens/Source/shotwell/src/main.vala"
+#line 140 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp81_, "Event.init");
-#line 1337 "main.c"
+#line 1345 "main.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp82_ = monitor;
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp82__target = monitor_target;
-#line 139 "/home/jens/Source/shotwell/src/main.vala"
+#line 141 "/home/jens/Source/shotwell/src/main.vala"
 	event_init (_tmp82_, _tmp82__target);
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp83_ = aggregate_monitor;
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp83_ != NULL) {
-#line 1349 "main.c"
+#line 1357 "main.c"
 		AggregateProgressMonitor* _tmp84_;
-#line 141 "/home/jens/Source/shotwell/src/main.vala"
+#line 143 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp84_ = aggregate_monitor;
-#line 141 "/home/jens/Source/shotwell/src/main.vala"
+#line 143 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp84_, "Tag.init");
-#line 1355 "main.c"
+#line 1363 "main.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp85_ = monitor;
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp85__target = monitor_target;
-#line 142 "/home/jens/Source/shotwell/src/main.vala"
-	tag_init (_tmp85_, _tmp85__target);
 #line 144 "/home/jens/Source/shotwell/src/main.vala"
+	tag_init (_tmp85_, _tmp85__target);
+#line 146 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_init ();
-#line 145 "/home/jens/Source/shotwell/src/main.vala"
-	desktop_integration_init ();
 #line 147 "/home/jens/Source/shotwell/src/main.vala"
+	desktop_integration_init ();
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp86_ = application_get_instance ();
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp87_ = _tmp86_;
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
 	g_signal_emit_by_name (_tmp87_, "init-done");
-#line 147 "/home/jens/Source/shotwell/src/main.vala"
+#line 149 "/home/jens/Source/shotwell/src/main.vala"
 	_application_unref0 (_tmp87_);
-#line 150 "/home/jens/Source/shotwell/src/main.vala"
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp88_ = aggregate_monitor;
-#line 150 "/home/jens/Source/shotwell/src/main.vala"
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp88_ != NULL) {
-#line 1379 "main.c"
+#line 1387 "main.c"
 		AggregateProgressMonitor* _tmp89_;
-#line 151 "/home/jens/Source/shotwell/src/main.vala"
+#line 153 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp89_ = aggregate_monitor;
-#line 151 "/home/jens/Source/shotwell/src/main.vala"
+#line 153 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp89_, "LibraryWindow");
-#line 1385 "main.c"
+#line 1393 "main.c"
 	}
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp90_ = monitor;
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp90__target = monitor_target;
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp91_ = library_window_new (_tmp90_, _tmp90__target);
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
 	g_object_ref_sink (_tmp91_);
-#line 152 "/home/jens/Source/shotwell/src/main.vala"
-	library_window = _tmp91_;
 #line 154 "/home/jens/Source/shotwell/src/main.vala"
+	library_window = _tmp91_;
+#line 156 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp92_ = aggregate_monitor;
-#line 154 "/home/jens/Source/shotwell/src/main.vala"
+#line 156 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp92_ != NULL) {
-#line 1401 "main.c"
+#line 1409 "main.c"
 		AggregateProgressMonitor* _tmp93_;
-#line 155 "/home/jens/Source/shotwell/src/main.vala"
+#line 157 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp93_ = aggregate_monitor;
-#line 155 "/home/jens/Source/shotwell/src/main.vala"
+#line 157 "/home/jens/Source/shotwell/src/main.vala"
 		aggregate_progress_monitor_next_step (_tmp93_, "done");
-#line 1407 "main.c"
+#line 1415 "main.c"
 	}
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 160 "/home/jens/Source/shotwell/src/main.vala"
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 163 "/home/jens/Source/shotwell/src/main.vala"
 	_aggregate_progress_monitor_unref0 (aggregate_monitor);
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 163 "/home/jens/Source/shotwell/src/main.vala"
 	aggregate_monitor = NULL;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp94_ = progress_dialog;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp94_ != NULL) {
-#line 1431 "main.c"
+#line 1439 "main.c"
 		ProgressDialog* _tmp95_;
-#line 163 "/home/jens/Source/shotwell/src/main.vala"
+#line 165 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp95_ = progress_dialog;
-#line 163 "/home/jens/Source/shotwell/src/main.vala"
+#line 165 "/home/jens/Source/shotwell/src/main.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, gtk_widget_get_type (), GtkWidget));
-#line 1437 "main.c"
+#line 1445 "main.c"
 	}
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
+#line 166 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (progress_dialog);
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
+#line 166 "/home/jens/Source/shotwell/src/main.vala"
 	progress_dialog = NULL;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp96_ = mounts;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp96__length1 = mounts_length1;
-#line 1447 "main.c"
+#line 1455 "main.c"
 	{
 		gchar** mount_collection = NULL;
 		gint mount_collection_length1 = 0;
 		gint _mount_collection_size_ = 0;
 		gint mount_it = 0;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 		mount_collection = _tmp96_;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 		mount_collection_length1 = _tmp96__length1;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 		for (mount_it = 0; mount_it < _tmp96__length1; mount_it = mount_it + 1) {
-#line 1459 "main.c"
+#line 1467 "main.c"
 			gchar* _tmp97_;
 			gchar* mount = NULL;
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp97_ = g_strdup (mount_collection[mount_it]);
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 			mount = _tmp97_;
-#line 1466 "main.c"
+#line 1474 "main.c"
 			{
 				LibraryWindow* _tmp98_;
 				const gchar* _tmp99_;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp98_ = library_window;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp99_ = mount;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
 				library_window_mounted_camera_shell_notification (_tmp98_, _tmp99_, TRUE);
-#line 167 "/home/jens/Source/shotwell/src/main.vala"
+#line 169 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (mount);
-#line 1478 "main.c"
+#line 1486 "main.c"
 			}
 		}
 	}
-#line 170 "/home/jens/Source/shotwell/src/main.vala"
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp100_ = library_window;
-#line 170 "/home/jens/Source/shotwell/src/main.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
 #line 172 "/home/jens/Source/shotwell/src/main.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp101_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
 	selected_import_entries = _tmp101_;
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
 	selected_import_entries_length1 = 0;
-#line 172 "/home/jens/Source/shotwell/src/main.vala"
+#line 174 "/home/jens/Source/shotwell/src/main.vala"
 	_selected_import_entries_size_ = selected_import_entries_length1;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp103_ = config_facade_get_instance ();
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp104_ = _tmp103_;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp105_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp106_ = _tmp105_;
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp104_);
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp106_) {
-#line 1506 "main.c"
+#line 1514 "main.c"
 		LibraryPhotoSourceCollection* _tmp107_;
 		gint _tmp108_;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp107_ = library_photo_global;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp108_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_DATA_COLLECTION, DataCollection));
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp102_ = _tmp108_ == 0;
-#line 1515 "main.c"
+#line 1523 "main.c"
 	} else {
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp102_ = FALSE;
-#line 1519 "main.c"
+#line 1527 "main.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp102_) {
-#line 1523 "main.c"
+#line 1531 "main.c"
 		WelcomeDialog* welcome = NULL;
 		LibraryWindow* _tmp109_;
 		WelcomeDialog* _tmp110_;
@@ -1538,143 +1546,143 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		gint _tmp115_;
 		gboolean _tmp116_ = FALSE;
 		gboolean _tmp117_;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp109_ = library_window;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp110_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_window_get_type (), GtkWindow));
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
 		g_object_ref_sink (_tmp110_);
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
+#line 177 "/home/jens/Source/shotwell/src/main.vala"
 		welcome = _tmp110_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp111_ = config_facade_get_instance ();
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp112_ = _tmp111_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp113_ = welcome;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp117_ = welcome_dialog_execute (_tmp113_, &_tmp114_, &_tmp115_, &_tmp116_);
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		selected_import_entries = _tmp114_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		selected_import_entries_length1 = _tmp115_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_selected_import_entries_size_ = selected_import_entries_length1;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		do_system_pictures_import = _tmp116_;
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp117_);
-#line 176 "/home/jens/Source/shotwell/src/main.vala"
+#line 178 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp112_);
-#line 173 "/home/jens/Source/shotwell/src/main.vala"
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (welcome);
-#line 1566 "main.c"
+#line 1574 "main.c"
 	} else {
 		ConfigFacade* _tmp118_;
 		ConfigFacade* _tmp119_;
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp118_ = config_facade_get_instance ();
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp119_ = _tmp118_;
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
 		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
-#line 179 "/home/jens/Source/shotwell/src/main.vala"
+#line 181 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp119_);
-#line 1578 "main.c"
+#line 1586 "main.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp120_ = selected_import_entries;
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp120__length1 = selected_import_entries_length1;
-#line 182 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp120__length1 > 0) {
-#line 1586 "main.c"
+#line 1594 "main.c"
 		WelcomeServiceEntry** _tmp121_;
 		gint _tmp121__length1;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
+#line 185 "/home/jens/Source/shotwell/src/main.vala"
 		do_external_import = TRUE;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp121_ = selected_import_entries;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp121__length1 = selected_import_entries_length1;
-#line 1595 "main.c"
+#line 1603 "main.c"
 		{
 			WelcomeServiceEntry** entry_collection = NULL;
 			gint entry_collection_length1 = 0;
 			gint _entry_collection_size_ = 0;
 			gint entry_it = 0;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 			entry_collection = _tmp121_;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 			entry_collection_length1 = _tmp121__length1;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 			for (entry_it = 0; entry_it < _tmp121__length1; entry_it = entry_it + 1) {
-#line 1607 "main.c"
+#line 1615 "main.c"
 				WelcomeServiceEntry* _tmp122_;
 				WelcomeServiceEntry* entry = NULL;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp122_ = _g_object_ref0 (entry_collection[entry_it]);
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 				entry = _tmp122_;
-#line 1614 "main.c"
+#line 1622 "main.c"
 				{
 					WelcomeServiceEntry* _tmp123_;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp123_ = entry;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
 					welcome_service_entry_execute (_tmp123_);
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
+#line 186 "/home/jens/Source/shotwell/src/main.vala"
 					_g_object_unref0 (entry);
-#line 1623 "main.c"
+#line 1631 "main.c"
 				}
 			}
 		}
 	}
-#line 187 "/home/jens/Source/shotwell/src/main.vala"
+#line 189 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp124_ = do_system_pictures_import;
-#line 187 "/home/jens/Source/shotwell/src/main.vala"
+#line 189 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp124_) {
-#line 191 "/home/jens/Source/shotwell/src/main.vala"
+#line 193 "/home/jens/Source/shotwell/src/main.vala"
 		run_system_pictures_import (NULL);
-#line 1634 "main.c"
+#line 1642 "main.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/main.vala"
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp125_ = startup_timer;
-#line 194 "/home/jens/Source/shotwell/src/main.vala"
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp126_ = g_timer_elapsed (_tmp125_, NULL);
-#line 194 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp126_);
 #line 196 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:196: %lf seconds to Gtk.main()", _tmp126_);
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp127_ = application_get_instance ();
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp128_ = _tmp127_;
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
 	application_start (_tmp128_, NULL, 0);
-#line 196 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp128_);
 #line 198 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp128_);
+#line 200 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
-#line 199 "/home/jens/Source/shotwell/src/main.vala"
+#line 201 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_terminate ();
-#line 200 "/home/jens/Source/shotwell/src/main.vala"
+#line 202 "/home/jens/Source/shotwell/src/main.vala"
 	tag_terminate ();
-#line 201 "/home/jens/Source/shotwell/src/main.vala"
+#line 203 "/home/jens/Source/shotwell/src/main.vala"
 	event_terminate ();
-#line 202 "/home/jens/Source/shotwell/src/main.vala"
+#line 204 "/home/jens/Source/shotwell/src/main.vala"
 	library_photo_terminate ();
-#line 203 "/home/jens/Source/shotwell/src/main.vala"
+#line 205 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_terminate ();
-#line 204 "/home/jens/Source/shotwell/src/main.vala"
+#line 206 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_terminate ();
-#line 205 "/home/jens/Source/shotwell/src/main.vala"
+#line 207 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_terminate ();
-#line 206 "/home/jens/Source/shotwell/src/main.vala"
+#line 208 "/home/jens/Source/shotwell/src/main.vala"
 	thumbnail_cache_terminate ();
-#line 207 "/home/jens/Source/shotwell/src/main.vala"
+#line 209 "/home/jens/Source/shotwell/src/main.vala"
 	video_terminate ();
-#line 208 "/home/jens/Source/shotwell/src/main.vala"
+#line 210 "/home/jens/Source/shotwell/src/main.vala"
 	library_app_terminate ();
 #line 15 "/home/jens/Source/shotwell/src/main.vala"
 	selected_import_entries = (_vala_array_free (selected_import_entries, selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -1698,14 +1706,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_g_free0 (app_version);
 #line 15 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (errormsg);
-#line 1694 "main.c"
+#line 1702 "main.c"
 }
 
 
 static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	report_system_pictures_import (manifest, import_roll);
-#line 1701 "main.c"
+#line 1709 "main.c"
 }
 
 
@@ -1727,65 +1735,65 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 	LibraryWindow* _tmp11_;
 	BatchImport* _tmp12_;
 	LibraryWindow* _tmp13_;
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest));
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 217 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = do_system_pictures_import;
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 217 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp0_) {
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1731 "main.c"
+#line 1739 "main.c"
 	}
-#line 218 "/home/jens/Source/shotwell/src/main.vala"
+#line 220 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/main.vala"
+#line 220 "/home/jens/Source/shotwell/src/main.vala"
 	jobs = _tmp1_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = jobs;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_import_dir ();
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp5_ = file_import_job_new (_tmp4_, FALSE);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp5_ = file_import_job_new (_tmp4_, FALSE, TRUE);
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = _tmp5_;
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_batch_import_job_unref0 (_tmp6_);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
-	_g_object_unref0 (_tmp4_);
 #line 221 "/home/jens/Source/shotwell/src/main.vala"
+	_g_object_unref0 (_tmp4_);
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 221 "/home/jens/Source/shotwell/src/main.vala"
-	library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 223 "/home/jens/Source/shotwell/src/main.vala"
+	library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = jobs;
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = external_exclusion_manifest;
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable), "startup_import", _report_system_pictures_import_batch_import_import_reporter, NULL, NULL, NULL, NULL, NULL, _tmp9_);
-#line 223 "/home/jens/Source/shotwell/src/main.vala"
-	batch_import = _tmp10_;
 #line 225 "/home/jens/Source/shotwell/src/main.vala"
+	batch_import = _tmp10_;
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = library_window;
-#line 225 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = batch_import;
-#line 225 "/home/jens/Source/shotwell/src/main.vala"
-	library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
 #line 227 "/home/jens/Source/shotwell/src/main.vala"
+	library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
+#line 229 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = library_window;
-#line 227 "/home/jens/Source/shotwell/src/main.vala"
+#line 229 "/home/jens/Source/shotwell/src/main.vala"
 	library_window_switch_to_import_queue_page (_tmp13_);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (batch_import);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (library_window);
-#line 214 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (jobs);
-#line 1781 "main.c"
+#line 1789 "main.c"
 }
 
 
@@ -1793,50 +1801,50 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
 	ImportManifest* _tmp6_;
-#line 230 "/home/jens/Source/shotwell/src/main.vala"
+#line 232 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 230 "/home/jens/Source/shotwell/src/main.vala"
+#line 232 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = do_external_import;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 1797 "main.c"
+#line 1805 "main.c"
 		ImportManifest* _tmp2_;
 		GeeList* _tmp3_;
 		gint _tmp4_;
 		gint _tmp5_;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = manifest;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_->all;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = _tmp4_;
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = _tmp5_ == 0;
-#line 1812 "main.c"
+#line 1820 "main.c"
 	} else {
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = FALSE;
-#line 1816 "main.c"
+#line 1824 "main.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/main.vala"
+#line 239 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_) {
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1822 "main.c"
+#line 1830 "main.c"
 	}
-#line 240 "/home/jens/Source/shotwell/src/main.vala"
+#line 242 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = manifest;
-#line 240 "/home/jens/Source/shotwell/src/main.vala"
+#line 242 "/home/jens/Source/shotwell/src/main.vala"
 	import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1828 "main.c"
+#line 1836 "main.c"
 }
 
 
-void editing_exec (const gchar* filename) {
+void editing_exec (const gchar* filename, gboolean fullscreen) {
 	GFile* initial_file = NULL;
 	const gchar* _tmp0_;
 	GFile* _tmp1_;
@@ -1847,196 +1855,243 @@ void editing_exec (const gchar* filename) {
 	DirectWindow* _tmp7_;
 	GTimer* _tmp8_;
 	gdouble _tmp9_;
-	Application* _tmp10_;
-	Application* _tmp11_;
+	gboolean _tmp10_;
+	Application* _tmp15_;
+	Application* _tmp16_;
 	GError * _inner_error_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (filename != NULL);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = filename;
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 246 "/home/jens/Source/shotwell/src/main.vala"
 	initial_file = _tmp1_;
-#line 247 "/home/jens/Source/shotwell/src/main.vala"
+#line 249 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = initial_file;
-#line 247 "/home/jens/Source/shotwell/src/main.vala"
+#line 249 "/home/jens/Source/shotwell/src/main.vala"
 	direct_preconfigure (_tmp2_);
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 250 "/home/jens/Source/shotwell/src/main.vala"
 	db_preconfigure (NULL);
-#line 1860 "main.c"
+#line 1869 "main.c"
 	{
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		direct_app_init (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1866 "main.c"
-			goto __catch224_g_error;
+#line 1875 "main.c"
+			goto __catch235_g_error;
 		}
 	}
-	goto __finally224;
-	__catch224_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_;
 		const gchar* _tmp4_;
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		err = _inner_error_;
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		_inner_error_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = err;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = _tmp3_->message;
-#line 254 "/home/jens/Source/shotwell/src/main.vala"
-		app_window_panic (_tmp4_);
 #line 256 "/home/jens/Source/shotwell/src/main.vala"
+		app_window_panic (_tmp4_);
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (err);
-#line 256 "/home/jens/Source/shotwell/src/main.vala"
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 256 "/home/jens/Source/shotwell/src/main.vala"
+#line 258 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1892 "main.c"
+#line 1901 "main.c"
 	}
-	__finally224:
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+	__finally235:
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/main.vala"
+#line 253 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1905 "main.c"
+#line 1914 "main.c"
 	}
-#line 260 "/home/jens/Source/shotwell/src/main.vala"
+#line 262 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = initial_file;
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = direct_window_new (_tmp5_);
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
 	g_object_ref_sink (_tmp6_);
-#line 266 "/home/jens/Source/shotwell/src/main.vala"
+#line 268 "/home/jens/Source/shotwell/src/main.vala"
 	direct_window = _tmp6_;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp7_ = direct_window;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 269 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp8_ = startup_timer;
-#line 269 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
+	_tmp7_ = direct_window;
 #line 269 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:269: %lf seconds to Gtk.main()", _tmp9_);
-#line 271 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp10_ = application_get_instance ();
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 271 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp11_ = _tmp10_;
+	_tmp8_ = startup_timer;
 #line 271 "/home/jens/Source/shotwell/src/main.vala"
-	application_start (_tmp11_, NULL, 0);
+	_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
 #line 271 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp11_);
+	g_debug ("main.vala:271: %lf seconds to Gtk.main()", _tmp9_);
 #line 273 "/home/jens/Source/shotwell/src/main.vala"
-	desktop_integration_terminate ();
+	_tmp10_ = fullscreen;
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp10_) {
+#line 1940 "main.c"
+		GAction* action = NULL;
+		DirectWindow* _tmp11_;
+		GAction* _tmp12_;
+		GAction* _tmp13_;
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp11_ = direct_window;
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp12_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen");
+#line 274 "/home/jens/Source/shotwell/src/main.vala"
+		action = _tmp12_;
+#line 275 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp13_ = action;
+#line 275 "/home/jens/Source/shotwell/src/main.vala"
+		if (_tmp13_ != NULL) {
+#line 1955 "main.c"
+			GAction* _tmp14_;
+#line 276 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp14_ = action;
 #line 276 "/home/jens/Source/shotwell/src/main.vala"
+			g_action_activate (_tmp14_, NULL);
+#line 1961 "main.c"
+		}
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (action);
+#line 1965 "main.c"
+	}
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp15_ = application_get_instance ();
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_ = _tmp15_;
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+	application_start (_tmp16_, NULL, 0);
+#line 280 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp16_);
+#line 282 "/home/jens/Source/shotwell/src/main.vala"
+	desktop_integration_terminate ();
+#line 285 "/home/jens/Source/shotwell/src/main.vala"
 	direct_app_terminate ();
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (direct_window);
-#line 243 "/home/jens/Source/shotwell/src/main.vala"
+#line 245 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (initial_file);
-#line 1943 "main.c"
+#line 1983 "main.c"
 }
 
 
-static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+static GOptionEntry* _vala_array_dup22 (GOptionEntry* self, int length) {
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 1950 "main.c"
+#line 1990 "main.c"
 }
 
 
-static void _vala_array_add70 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 1961 "main.c"
+#line 2001 "main.c"
 	}
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 1965 "main.c"
+#line 2005 "main.c"
 }
 
 
-static void _vala_array_add71 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 1976 "main.c"
+#line 2016 "main.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 1980 "main.c"
+#line 2020 "main.c"
 }
 
 
-static void _vala_array_add72 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add75 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 1991 "main.c"
+#line 2031 "main.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 1995 "main.c"
+#line 2035 "main.c"
 }
 
 
-static void _vala_array_add73 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add76 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2006 "main.c"
+#line 2046 "main.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2010 "main.c"
+#line 2050 "main.c"
 }
 
 
-static void _vala_array_add74 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add77 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+	if ((*length) == (*size)) {
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+		*array = g_renew (GOptionEntry, *array, *size);
+#line 2061 "main.c"
+	}
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+	(*array)[(*length)++] = *value;
+#line 2065 "main.c"
+}
+
+
+static void _vala_array_add78 (GOptionEntry* * array, int* length, int* size, const GOptionEntry* value) {
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2021 "main.c"
+#line 2076 "main.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2025 "main.c"
+#line 2080 "main.c"
 }
 
 
-static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+static GOptionEntry* _vala_array_dup23 (GOptionEntry* self, int length) {
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2032 "main.c"
+#line 2087 "main.c"
 }
 
 
@@ -2064,214 +2119,243 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 	GOptionEntry* _tmp14_;
 	gint _tmp14__length1;
 	GOptionEntry _tmp15_;
-	GOptionEntry terminator = {0};
+	GOptionEntry fullscreen = {0};
 	GOptionEntry _tmp16_ = {0};
 	GOptionEntry* _tmp17_;
 	gint _tmp17__length1;
 	GOptionEntry _tmp18_;
-	GOptionEntry* _tmp19_;
-	gint _tmp19__length1;
+	GOptionEntry terminator = {0};
+	GOptionEntry _tmp19_ = {0};
 	GOptionEntry* _tmp20_;
 	gint _tmp20__length1;
-	GOptionEntry* _tmp21_;
-	gint _tmp21__length1;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+	GOptionEntry _tmp21_;
+	GOptionEntry* _tmp22_;
+	gint _tmp22__length1;
+	GOptionEntry* _tmp23_;
+	gint _tmp23__length1;
+	GOptionEntry* _tmp24_;
+	gint _tmp24__length1;
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = commandline_options_entries;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = commandline_options_entries_length1;
-#line 289 "/home/jens/Source/shotwell/src/main.vala"
+#line 299 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_ != NULL) {
-#line 2077 "main.c"
+#line 2137 "main.c"
 		GOptionEntry* _tmp1_;
 		gint _tmp1__length1;
 		GOptionEntry* _tmp2_;
 		gint _tmp2__length1;
 		GOptionEntry* _tmp3_;
 		gint _tmp3__length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1_ = commandline_options_entries;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1__length1 = commandline_options_entries_length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup26 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup22 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2__length1 = _tmp1__length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3__length1 = _tmp2__length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		if (result_length1) {
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 			*result_length1 = _tmp3__length1;
-#line 2100 "main.c"
+#line 2160 "main.c"
 		}
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		result = _tmp3_;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 		return result;
-#line 2106 "main.c"
+#line 2166 "main.c"
 	}
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.long_name = "datadir";
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.short_name = 'd';
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.flags = 0;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.arg = G_OPTION_ARG_FILENAME;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.arg_data = &commandline_options_data_dir;
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.description = _ ("Path to Shotwell’s private data");
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_.arg_description = _ ("DIRECTORY");
-#line 292 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	datadir = _tmp4_;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = commandline_options_entries;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5__length1 = commandline_options_entries_length1;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = datadir;
-#line 294 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.long_name = "no-runtime-monitoring";
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.short_name = (gchar) 0;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.flags = 0;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.arg = G_OPTION_ARG_NONE;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.arg_data = &commandline_options_no_runtime_monitoring;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.description = _ ("Do not monitor library directory at runtime for changes");
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.arg_description = NULL;
-#line 296 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	no_monitoring = _tmp7_;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = commandline_options_entries;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8__length1 = commandline_options_entries_length1;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = no_monitoring;
-#line 298 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.long_name = "no-startup-progress";
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.short_name = (gchar) 0;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.flags = 0;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg = G_OPTION_ARG_NONE;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_data = &commandline_options_no_startup_progress;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.description = _ ("Don’t display startup progress meter");
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_description = NULL;
-#line 300 "/home/jens/Source/shotwell/src/main.vala"
+#line 310 "/home/jens/Source/shotwell/src/main.vala"
 	no_startup = _tmp10_;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = commandline_options_entries;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11__length1 = commandline_options_entries_length1;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = no_startup;
-#line 302 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 312 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add75 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.long_name = "version";
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.short_name = 'V';
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.flags = 0;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.arg = G_OPTION_ARG_NONE;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.arg_data = &commandline_options_show_version;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.description = _ ("Show the application’s version");
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.arg_description = NULL;
-#line 304 "/home/jens/Source/shotwell/src/main.vala"
+#line 314 "/home/jens/Source/shotwell/src/main.vala"
 	version = _tmp13_;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_ = commandline_options_entries;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14__length1 = commandline_options_entries_length1;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15_ = version;
-#line 306 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_.long_name = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_.short_name = (gchar) 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add76 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_.long_name = "fullscreen";
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_.short_name = 'f';
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_.flags = 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_.arg = 0;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_.arg_data = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp16_.description = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_.arg = G_OPTION_ARG_NONE;
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_.arg_data = &commandline_options_fullscreen;
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp16_.description = _ ("Start the application in fullscreen mode");
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_.arg_description = NULL;
-#line 308 "/home/jens/Source/shotwell/src/main.vala"
-	terminator = _tmp16_;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 318 "/home/jens/Source/shotwell/src/main.vala"
+	fullscreen = _tmp16_;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp17_ = commandline_options_entries;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp17__length1 = commandline_options_entries_length1;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp18_ = terminator;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp19_ = commandline_options_entries;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp19__length1 = commandline_options_entries_length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup27 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp20__length1 = _tmp19__length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21_ = _tmp20_;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp21__length1 = _tmp20__length1;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp18_ = fullscreen;
+#line 320 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add77 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.long_name = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.short_name = (gchar) 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.flags = 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.arg = 0;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.arg_data = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.description = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp19_.arg_description = NULL;
+#line 322 "/home/jens/Source/shotwell/src/main.vala"
+	terminator = _tmp19_;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp20_ = commandline_options_entries;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp20__length1 = commandline_options_entries_length1;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp21_ = terminator;
+#line 323 "/home/jens/Source/shotwell/src/main.vala"
+	_vala_array_add78 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp21_);
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp22_ = commandline_options_entries;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp22__length1 = commandline_options_entries_length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp23_ = (_tmp22_ != NULL) ? _vala_array_dup23 (_tmp22_, _tmp22__length1) : ((gpointer) _tmp22_);
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp23__length1 = _tmp22__length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp24_ = _tmp23_;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp24__length1 = _tmp23__length1;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
 	if (result_length1) {
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-		*result_length1 = _tmp21__length1;
-#line 2244 "main.c"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+		*result_length1 = _tmp24__length1;
+#line 2328 "main.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
-	result = _tmp21_;
-#line 311 "/home/jens/Source/shotwell/src/main.vala"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	result = _tmp24_;
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 2250 "main.c"
+#line 2334 "main.c"
 }
 
 
-static void _vala_array_add75 (gchar** * array, int* length, int* size, gchar* value) {
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+static void _vala_array_add79 (gchar** * array, int* length, int* size, gchar* value) {
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2261 "main.c"
+#line 2345 "main.c"
 	}
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = value;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[*length] = NULL;
-#line 2267 "main.c"
+#line 2351 "main.c"
 }
 
 
@@ -2291,7 +2375,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2287 "main.c"
+#line 2371 "main.c"
 }
 
 
@@ -2323,86 +2407,86 @@ void _vala_main (gchar** args, int args_length1) {
 	GTimer* _tmp60_;
 	const gchar* _tmp61_;
 	gboolean _tmp62_;
-	gboolean _tmp65_ = FALSE;
-	const gchar* _tmp66_;
-	gboolean _tmp67_;
+	gboolean _tmp66_ = FALSE;
+	const gchar* _tmp67_;
+	gboolean _tmp68_;
 	GError * _inner_error_ = NULL;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = args;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = args_length1;
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = _tmp0_[0];
-#line 319 "/home/jens/Source/shotwell/src/main.vala"
+#line 333 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_init (_tmp1_);
-#line 324 "/home/jens/Source/shotwell/src/main.vala"
+#line 338 "/home/jens/Source/shotwell/src/main.vala"
 	gexiv2_initialize ();
-#line 325 "/home/jens/Source/shotwell/src/main.vala"
+#line 339 "/home/jens/Source/shotwell/src/main.vala"
 	gexiv2_log_use_glib_logging ();
-#line 329 "/home/jens/Source/shotwell/src/main.vala"
+#line 343 "/home/jens/Source/shotwell/src/main.vala"
 	gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG);
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = app_dirs_get_install_dir ();
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = _tmp2_;
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_ == NULL;
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp3_);
-#line 335 "/home/jens/Source/shotwell/src/main.vala"
+#line 349 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp4_) {
-#line 2347 "main.c"
+#line 2431 "main.c"
 		GFile* _tmp5_;
 		GFile* _tmp6_;
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp5_ = app_dirs_get_exec_dir ();
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp5_ = app_dirs_get_lib_dir ();
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp6_ = _tmp5_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp8_ = _tmp7_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp9_ = g_strconcat (_tmp8_, "/misc", NULL);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp10_ = _tmp9_;
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp10_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp8_);
-#line 336 "/home/jens/Source/shotwell/src/main.vala"
+#line 350 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2374 "main.c"
+#line 2458 "main.c"
 	}
 	{
 		gint _tmp11_;
 		GOptionEntry* _tmp12_;
 		GOptionEntry* _tmp13_;
 		gint _tmp13__length1;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp12_ = commandline_options_get_options (&_tmp11_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp13_ = _tmp12_;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp13__length1 = _tmp11_;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		gtk_init_with_args (&args_length1, &args, _ ("[FILE]"), _tmp13_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp13_ = (g_free (_tmp13_), NULL);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 356 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2393 "main.c"
-			goto __catch225_g_error;
+#line 2477 "main.c"
+			goto __catch236_g_error;
 		}
 	}
-	goto __finally225;
-	__catch225_g_error:
+	goto __finally236;
+	__catch236_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_;
@@ -2412,92 +2496,92 @@ void _vala_main (gchar** args, int args_length1) {
 		gchar** _tmp18_;
 		gint _tmp18__length1;
 		const gchar* _tmp19_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 		e = _inner_error_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 		_inner_error_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14_ = e;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp15_ = _tmp14_->message;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp16_ = g_strconcat (_tmp15_, "\n", NULL);
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp17_ = _tmp16_;
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		g_print ("%s", _tmp17_);
-#line 345 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp17_);
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp18_ = args;
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp18__length1 = args_length1;
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp19_ = _tmp18_[0];
-#line 346 "/home/jens/Source/shotwell/src/main.vala"
+#line 360 "/home/jens/Source/shotwell/src/main.vala"
 		g_print (_ ("Run “%s --help” to see a full list of available command line options.\n"), _tmp19_);
-#line 347 "/home/jens/Source/shotwell/src/main.vala"
+#line 361 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 362 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (e);
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 362 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2438 "main.c"
+#line 2522 "main.c"
 	}
-	__finally225:
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+	__finally236:
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2449 "main.c"
+#line 2533 "main.c"
 	}
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 365 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp20_ = commandline_options_show_version;
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 365 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp20_) {
-#line 352 "/home/jens/Source/shotwell/src/main.vala"
+#line 366 "/home/jens/Source/shotwell/src/main.vala"
 		if (RESOURCES_GIT_VERSION != NULL) {
-#line 353 "/home/jens/Source/shotwell/src/main.vala"
+#line 367 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2459 "main.c"
+#line 2543 "main.c"
 		} else {
-#line 355 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2463 "main.c"
+#line 2547 "main.c"
 		}
-#line 357 "/home/jens/Source/shotwell/src/main.vala"
+#line 371 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 359 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2469 "main.c"
+#line 2553 "main.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_ = g_new0 (gchar*, 0 + 1);
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = _tmp21_;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
 	mounts_length1 = 0;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 383 "/home/jens/Source/shotwell/src/main.vala"
 	_mounts_size_ = mounts_length1;
-#line 370 "/home/jens/Source/shotwell/src/main.vala"
+#line 384 "/home/jens/Source/shotwell/src/main.vala"
 	filename = NULL;
-#line 2481 "main.c"
+#line 2565 "main.c"
 	{
 		gint ctr = 0;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		ctr = 1;
-#line 2486 "main.c"
+#line 2570 "main.c"
 		{
 			gboolean _tmp22_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp22_ = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			while (TRUE) {
-#line 2493 "main.c"
+#line 2577 "main.c"
 				gint _tmp24_;
 				gchar** _tmp25_;
 				gint _tmp25__length1;
@@ -2509,410 +2593,413 @@ void _vala_main (gchar** args, int args_length1) {
 				gchar* _tmp29_;
 				const gchar* _tmp30_;
 				gboolean _tmp31_;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				if (!_tmp22_) {
-#line 2507 "main.c"
+#line 2591 "main.c"
 					gint _tmp23_;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp23_ = ctr;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 					ctr = _tmp23_ + 1;
-#line 2513 "main.c"
+#line 2597 "main.c"
 				}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp22_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp24_ = ctr;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp25_ = args;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp25__length1 = args_length1;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				if (!(_tmp24_ < _tmp25__length1)) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 					break;
-#line 2527 "main.c"
+#line 2611 "main.c"
 				}
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp26_ = args;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp26__length1 = args_length1;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp27_ = ctr;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp28_ = _tmp26_[_tmp27_];
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp29_ = g_strdup (_tmp28_);
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 387 "/home/jens/Source/shotwell/src/main.vala"
 				arg = _tmp29_;
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp30_ = arg;
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp31_ = library_window_is_mount_uri_supported (_tmp30_);
-#line 375 "/home/jens/Source/shotwell/src/main.vala"
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
 				if (_tmp31_) {
-#line 2547 "main.c"
+#line 2631 "main.c"
 					gchar** _tmp32_;
 					gint _tmp32__length1;
 					const gchar* _tmp33_;
 					gchar* _tmp34_;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp32_ = mounts;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp32__length1 = mounts_length1;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp33_ = arg;
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp34_ = g_strdup (_tmp33_);
-#line 376 "/home/jens/Source/shotwell/src/main.vala"
-					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
-#line 2562 "main.c"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
+					_vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp34_);
+#line 2646 "main.c"
 				} else {
 					gboolean _tmp35_ = FALSE;
 					const gchar* _tmp36_;
 					gboolean _tmp37_;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp36_ = filename;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp37_ = is_string_empty (_tmp36_);
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp37_) {
-#line 2573 "main.c"
+#line 2657 "main.c"
 						const gchar* _tmp38_;
 						gboolean _tmp39_;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp38_ = arg;
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp39_ = string_contains (_tmp38_, "://");
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp35_ = !_tmp39_;
-#line 2582 "main.c"
+#line 2666 "main.c"
 					} else {
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp35_ = FALSE;
-#line 2586 "main.c"
+#line 2670 "main.c"
 					}
-#line 377 "/home/jens/Source/shotwell/src/main.vala"
+#line 391 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp35_) {
-#line 2590 "main.c"
+#line 2674 "main.c"
 						const gchar* _tmp40_;
 						gchar* _tmp41_;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp40_ = arg;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp41_ = g_strdup (_tmp40_);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
 						_g_free0 (filename);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 392 "/home/jens/Source/shotwell/src/main.vala"
 						filename = _tmp41_;
-#line 2601 "main.c"
+#line 2685 "main.c"
 					}
 				}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (arg);
-#line 2606 "main.c"
+#line 2690 "main.c"
 			}
 		}
 	}
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp43_ = filename;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp44_ = is_string_empty (_tmp43_);
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp44_) {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp42_ = DEBUG_LIBRARY_PREFIX;
-#line 2618 "main.c"
+#line 2702 "main.c"
 	} else {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp42_ = DEBUG_VIEWER_PREFIX;
-#line 2622 "main.c"
+#line 2706 "main.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 396 "/home/jens/Source/shotwell/src/main.vala"
 	debug_init (_tmp42_);
-#line 384 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	if (RESOURCES_GIT_VERSION != NULL) {
-#line 2628 "main.c"
+#line 2712 "main.c"
 		const gchar* _tmp45_ = NULL;
 		const gchar* _tmp46_;
 		gboolean _tmp47_;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp46_ = filename;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp47_ = is_string_empty (_tmp46_);
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp47_) {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp45_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2640 "main.c"
+#line 2724 "main.c"
 		} else {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp45_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2644 "main.c"
+#line 2728 "main.c"
 		}
-#line 385 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2648 "main.c"
+#line 399 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:399: Shotwell %s %s (%s)", _tmp45_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2732 "main.c"
 	} else {
 		const gchar* _tmp48_ = NULL;
 		const gchar* _tmp49_;
 		gboolean _tmp50_;
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp49_ = filename;
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp50_ = is_string_empty (_tmp49_);
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp50_) {
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp48_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2661 "main.c"
+#line 2745 "main.c"
 		} else {
-#line 390 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp48_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2665 "main.c"
+#line 2749 "main.c"
 		}
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:389: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION);
-#line 2669 "main.c"
+#line 403 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:403: Shotwell %s %s", _tmp48_, RESOURCES_APP_VERSION);
+#line 2753 "main.c"
 	}
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp51_ = g_date_time_new_now_local ();
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp52_ = _tmp51_;
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp53_ = g_date_time_get_timezone_abbreviation (_tmp52_);
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp53_);
-#line 393 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:407: Shotwell is running in timezone %s", _tmp53_);
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	_g_date_time_unref0 (_tmp52_);
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp54_ = filename;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp55_ = is_string_empty (_tmp54_);
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 412 "/home/jens/Source/shotwell/src/main.vala"
 	application_init (!_tmp55_);
-#line 401 "/home/jens/Source/shotwell/src/main.vala"
+#line 415 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp56_ = commandline_options_data_dir;
-#line 401 "/home/jens/Source/shotwell/src/main.vala"
+#line 415 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp56_ != NULL) {
-#line 2691 "main.c"
+#line 2775 "main.c"
 		const gchar* _tmp57_;
-#line 402 "/home/jens/Source/shotwell/src/main.vala"
+#line 416 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp57_ = commandline_options_data_dir;
-#line 402 "/home/jens/Source/shotwell/src/main.vala"
+#line 416 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_set_data_dir (_tmp57_);
-#line 2697 "main.c"
+#line 2781 "main.c"
 	} else {
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
+#line 418 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_try_migrate_data ();
-#line 2701 "main.c"
+#line 2785 "main.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 421 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_data_dir ();
-#line 408 "/home/jens/Source/shotwell/src/main.vala"
+#line 422 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_cache_dir ();
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp58_ = args;
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp58__length1 = args_length1;
-#line 411 "/home/jens/Source/shotwell/src/main.vala"
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
 	international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp58_, _tmp58__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp59_ = g_timer_new ();
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 	_g_timer_destroy0 (startup_timer);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 	startup_timer = _tmp59_;
-#line 414 "/home/jens/Source/shotwell/src/main.vala"
+#line 428 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp60_ = startup_timer;
-#line 414 "/home/jens/Source/shotwell/src/main.vala"
+#line 428 "/home/jens/Source/shotwell/src/main.vala"
 	g_timer_start (_tmp60_);
-#line 417 "/home/jens/Source/shotwell/src/main.vala"
+#line 431 "/home/jens/Source/shotwell/src/main.vala"
 	g_set_application_name (RESOURCES_APP_TITLE);
-#line 421 "/home/jens/Source/shotwell/src/main.vala"
+#line 435 "/home/jens/Source/shotwell/src/main.vala"
 	resources_init ();
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp61_ = filename;
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp62_ = is_string_empty (_tmp61_);
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp62_) {
-#line 2733 "main.c"
+#line 2817 "main.c"
 		gchar** _tmp63_;
 		gint _tmp63__length1;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp63_ = mounts;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp63__length1 = mounts_length1;
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		library_exec (_tmp63_, _tmp63__length1);
-#line 2742 "main.c"
+#line 2826 "main.c"
 	} else {
 		const gchar* _tmp64_;
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
+		gboolean _tmp65_;
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp64_ = filename;
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
-		editing_exec (_tmp64_);
-#line 2749 "main.c"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp65_ = commandline_options_fullscreen;
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
+		editing_exec (_tmp64_, _tmp65_);
+#line 2836 "main.c"
 	}
-#line 432 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 	resources_terminate ();
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
+#line 447 "/home/jens/Source/shotwell/src/main.vala"
 	application_terminate ();
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
+#line 448 "/home/jens/Source/shotwell/src/main.vala"
 	debug_terminate ();
-#line 435 "/home/jens/Source/shotwell/src/main.vala"
+#line 449 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_terminate ();
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp66_ = filename;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp67_ = is_string_empty (_tmp66_);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp67_) {
-#line 2765 "main.c"
-		gboolean _tmp68_;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp68_ = was_already_running;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp65_ = !_tmp68_;
-#line 2771 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp67_ = filename;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp68_ = is_string_empty (_tmp67_);
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp68_) {
+#line 2852 "main.c"
+		gboolean _tmp69_;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp69_ = was_already_running;
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp66_ = !_tmp69_;
+#line 2858 "main.c"
 	} else {
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp65_ = FALSE;
-#line 2775 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp66_ = FALSE;
+#line 2862 "main.c"
 	}
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp65_) {
-#line 2779 "main.c"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp66_) {
+#line 2866 "main.c"
 		gchar* orig_path = NULL;
-		GFile* _tmp69_;
 		GFile* _tmp70_;
 		GFile* _tmp71_;
 		GFile* _tmp72_;
-		gchar* _tmp73_;
+		GFile* _tmp73_;
 		gchar* _tmp74_;
+		gchar* _tmp75_;
 		gchar* backup_path = NULL;
-		const gchar* _tmp75_;
-		gchar* _tmp76_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp69_ = app_dirs_get_data_subdir ("data", NULL);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp70_ = _tmp69_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp71_ = g_file_get_child (_tmp70_, "photo.db");
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp72_ = _tmp71_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp73_ = g_file_get_path (_tmp72_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp74_ = _tmp73_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp72_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp70_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
-		orig_path = _tmp74_;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp75_ = orig_path;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp76_ = g_strconcat (_tmp75_, ".bak", NULL);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
-		backup_path = _tmp76_;
-#line 2814 "main.c"
+		const gchar* _tmp76_;
+		gchar* _tmp77_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp70_ = app_dirs_get_data_subdir ("data", NULL);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp71_ = _tmp70_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp72_ = g_file_get_child (_tmp71_, "photo.db");
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp73_ = _tmp72_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp74_ = g_file_get_path (_tmp73_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp75_ = _tmp74_;
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp73_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp71_);
+#line 455 "/home/jens/Source/shotwell/src/main.vala"
+		orig_path = _tmp75_;
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp76_ = orig_path;
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp77_ = g_strconcat (_tmp76_, ".bak", NULL);
+#line 456 "/home/jens/Source/shotwell/src/main.vala"
+		backup_path = _tmp77_;
+#line 2901 "main.c"
 		{
 			GFile* src = NULL;
-			const gchar* _tmp77_;
-			GFile* _tmp78_;
+			const gchar* _tmp78_;
+			GFile* _tmp79_;
 			GFile* dest = NULL;
-			const gchar* _tmp79_;
-			GFile* _tmp80_;
+			const gchar* _tmp80_;
 			GFile* _tmp81_;
 			GFile* _tmp82_;
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp77_ = orig_path;
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp78_ = g_file_new_for_commandline_arg (_tmp77_);
-#line 444 "/home/jens/Source/shotwell/src/main.vala"
-			src = _tmp78_;
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp79_ = backup_path;
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
-#line 445 "/home/jens/Source/shotwell/src/main.vala"
-			dest = _tmp80_;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp81_ = src;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp82_ = dest;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
-			g_file_copy (_tmp81_, _tmp82_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+			GFile* _tmp83_;
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp78_ = orig_path;
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp79_ = g_file_new_for_commandline_arg (_tmp78_);
+#line 458 "/home/jens/Source/shotwell/src/main.vala"
+			src = _tmp79_;
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp80_ = backup_path;
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp81_ = g_file_new_for_commandline_arg (_tmp80_);
+#line 459 "/home/jens/Source/shotwell/src/main.vala"
+			dest = _tmp81_;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp82_ = src;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp83_ = dest;
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
+			g_file_copy (_tmp82_, _tmp83_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (dest);
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 460 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
-#line 2848 "main.c"
-				goto __catch226_g_error;
+#line 2935 "main.c"
+				goto __catch237_g_error;
 			}
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (src);
-#line 2855 "main.c"
+#line 2942 "main.c"
 		}
-		goto __finally226;
-		__catch226_g_error:
+		goto __finally237;
+		__catch237_g_error:
 		{
 			GError* _error_ = NULL;
-			GError* _tmp83_;
-			const gchar* _tmp84_;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+			GError* _tmp84_;
+			const gchar* _tmp85_;
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_error_ = _inner_error_;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_inner_error_ = NULL;
-#line 450 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp83_ = _error_;
-#line 450 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp84_ = _tmp83_->message;
-#line 450 "/home/jens/Source/shotwell/src/main.vala"
-			g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp84_);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp84_ = _error_;
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp85_ = _tmp84_->message;
+#line 464 "/home/jens/Source/shotwell/src/main.vala"
+			g_warning ("main.vala:464: Failed to create backup file of database: %s", _tmp85_);
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_error_free0 (_error_);
-#line 2875 "main.c"
+#line 2962 "main.c"
 		}
-		__finally226:
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+		__finally237:
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (backup_path);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (orig_path);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (filename);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			g_clear_error (&_inner_error_);
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
+#line 457 "/home/jens/Source/shotwell/src/main.vala"
 			return;
-#line 2894 "main.c"
+#line 2981 "main.c"
 		}
-#line 453 "/home/jens/Source/shotwell/src/main.vala"
+#line 467 "/home/jens/Source/shotwell/src/main.vala"
 		sync ();
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (backup_path);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 454 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (orig_path);
-#line 2902 "main.c"
+#line 2989 "main.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (filename);
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2908 "main.c"
+#line 2995 "main.c"
 }
 
 
@@ -2920,11 +3007,11 @@ int main (int argc, char ** argv) {
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_main (argv, argc);
-#line 316 "/home/jens/Source/shotwell/src/main.vala"
+#line 330 "/home/jens/Source/shotwell/src/main.vala"
 	return 0;
-#line 2920 "main.c"
+#line 3007 "main.c"
 }
 
 
diff --git a/src/main.vala b/src/main.vala
index 0755f62..d09c827 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -117,6 +117,8 @@ void library_exec(string[] mounts) {
     
     ThumbnailCache.init();
     Tombstone.init();
+
+    LibraryFiles.select_copy_function();
     
     if (aggregate_monitor != null)
         aggregate_monitor.next_step("LibraryPhoto.init");
@@ -216,7 +218,7 @@ public void run_system_pictures_import(ImportManifest? external_exclusion_manife
         return;
 
     Gee.ArrayList<FileImportJob> jobs = new Gee.ArrayList<FileImportJob>();
-    jobs.add(new FileImportJob(AppDirs.get_import_dir(), false));
+    jobs.add(new FileImportJob(AppDirs.get_import_dir(), false, true));
     
     LibraryWindow library_window = (LibraryWindow) AppWindow.get_instance();
     
@@ -240,7 +242,7 @@ private void report_system_pictures_import(ImportManifest manifest, BatchImportR
     ImportUI.report_manifest(manifest, true);
 }
 
-void editing_exec(string filename) {
+void editing_exec(string filename, bool fullscreen) {
     File initial_file = File.new_for_commandline_arg(filename);
     
     // preconfigure units
@@ -267,9 +269,16 @@ void editing_exec(string filename) {
     direct_window.show_all();
     
     debug("%lf seconds to Gtk.main()", startup_timer.elapsed());
+
+    if (fullscreen) {
+        var action = direct_window.get_common_action("CommonFullscreen");
+        if (action != null) {
+            action.activate(null);
+        }
+    }
     
     Application.get_instance().start();
-    
+
     DesktopIntegration.terminate();
     
     // terminate units for direct-edit mode
@@ -282,6 +291,7 @@ bool no_startup_progress = false;
 string data_dir = null;
 bool show_version = false;
 bool no_runtime_monitoring = false;
+bool fullscreen = false;
 
 private OptionEntry[]? entries = null;
 
@@ -304,6 +314,10 @@ public OptionEntry[] get_options() {
     OptionEntry version = { "version", 'V', 0, OptionArg.NONE, &show_version, 
         _("Show the application’s version"), null };
     entries += version;
+
+    OptionEntry fullscreen = { "fullscreen", 'f', 0, OptionArg.NONE,
+        &fullscreen, _("Start the application in fullscreen mode"), null };
+    entries += fullscreen;
     
     OptionEntry terminator = { null, 0, 0, 0, null, null, null };
     entries += terminator;
@@ -333,7 +347,7 @@ void main(string[] args) {
     // the build directory. this allows us to access local GSettings schemas without having to
     // muck with the user's XDG_... directories, which is seriously frowned upon
     if (AppDirs.get_install_dir() == null) {
-        GLib.Environment.set_variable("GSETTINGS_SCHEMA_DIR", AppDirs.get_exec_dir().get_path() +
+        GLib.Environment.set_variable("GSETTINGS_SCHEMA_DIR", AppDirs.get_lib_dir().get_path() +
             "/misc", true);
     }
     
@@ -426,7 +440,7 @@ void main(string[] args) {
     if (is_string_empty(filename))
         library_exec(mounts);
     else
-        editing_exec(filename);
+        editing_exec(filename, CommandlineOptions.fullscreen);
     
     // terminate mode-inspecific modules
     Resources.terminate();
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..ba260e7
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,238 @@
+subdir('plugins')
+
+sw_graphics_processor = static_library('shotwell-graphics-processor',
+               ['ColorTransformation.vala',
+                'util/KeyValueMap.vala',
+                '_transformation.c'],
+               vala_header : 'shotwell-graphics-processor.h',
+               vala_vapi : 'shotwell-graphics-processor.vapi',
+               dependencies : [gio, gee, gdk],
+               include_directories : config_incdir,
+               c_args : '-DG_DISABLE_CAST_CHECKS',
+               vala_args : '--disable-assert',
+               install : false)
+
+processor = executable('shotwell-graphics-processor',
+                       ['graphics-processor.vala'],
+                       dependencies: [gio, gdk, gee],
+                       link_with: sw_graphics_processor)
+
+shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2,
+                 gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule,
+                 libraw, libexif, sw_plugin]
+if unity_available
+    shotwell_deps += [unity]
+endif
+
+executable('shotwell',
+           ['unit/Unit.vala',
+            'util/Util.vala',
+            'util/file.vala',
+            'util/image.vala',
+            'util/misc.vala',
+            'util/string.vala',
+            'util/system.vala',
+            'util/ui.vala',
+            'threads/Threads.vala',
+            'threads/Workers.vala',
+            'threads/BackgroundJob.vala',
+            'threads/Semaphore.vala',
+            'db/Db.vala',
+            'db/DatabaseTable.vala',
+            'db/PhotoTable.vala',
+            'db/EventTable.vala',
+            'db/TagTable.vala',
+            'db/TombstoneTable.vala',
+            'db/VideoTable.vala',
+            'db/VersionTable.vala',
+            'db/SavedSearchDBTable.vala',
+            'editing_tools/EditingTools.vala',
+            'editing_tools/RGBHistogramManipulator.vala',
+            'editing_tools/StraightenTool.vala',
+            'slideshow/Slideshow.vala',
+            'slideshow/TransitionEffects.vala',
+            'photos/Photos.vala',
+            'photos/PhotoFileAdapter.vala',
+            'photos/PhotoFileFormat.vala',
+            'photos/PhotoFileSniffer.vala',
+            'photos/PhotoMetadata.vala',
+            'photos/GRaw.vala',
+            'photos/GdkSupport.vala',
+            'photos/JfifSupport.vala',
+            'photos/BmpSupport.vala',
+            'photos/RawSupport.vala',
+            'photos/PngSupport.vala',
+            'photos/TiffSupport.vala',
+            'plugins/Plugins.vala',
+            'plugins/StandardHostInterface.vala',
+            'plugins/ManifestWidget.vala',
+            'publishing/Publishing.vala',
+            'publishing/PublishingUI.vala',
+            'publishing/PublishingPluginHost.vala',
+            'publishing/APIGlue.vala',
+            'library/Library.vala',
+            'library/LibraryWindow.vala',
+            'library/LibraryBranch.vala',
+            'library/TrashSidebarEntry.vala',
+            'library/OfflineSidebarEntry.vala',
+            'library/FlaggedSidebarEntry.vala',
+            'library/LastImportSidebarEntry.vala',
+            'library/ImportQueueSidebarEntry.vala',
+            'library/FlaggedPage.vala',
+            'library/ImportQueuePage.vala',
+            'library/LastImportPage.vala',
+            'library/OfflinePage.vala',
+            'library/TrashPage.vala',
+            'direct/Direct.vala',
+            'direct/DirectWindow.vala',
+            'direct/DirectPhoto.vala',
+            'direct/DirectPhotoPage.vala',
+            'direct/DirectView.vala',
+            'core/Core.vala',
+            'core/DataCollection.vala',
+            'core/DataSet.vala',
+            'core/util.vala',
+            'core/SourceCollection.vala',
+            'core/SourceHoldingTank.vala',
+            'core/DatabaseSourceCollection.vala',
+            'core/ContainerSourceCollection.vala',
+            'core/ViewCollection.vala',
+            'core/DataObject.vala',
+            'core/Alteration.vala',
+            'core/DataSource.vala',
+            'core/DataSourceTypes.vala',
+            'core/DataView.vala',
+            'core/DataViewTypes.vala',
+            'core/Tracker.vala',
+            'core/SourceInterfaces.vala',
+            'sidebar/Sidebar.vala',
+            'sidebar/Branch.vala',
+            'sidebar/Entry.vala',
+            'sidebar/Tree.vala',
+            'sidebar/common.vala',
+            'events/Events.vala',
+            'events/EventsBranch.vala',
+            'events/EventsDirectoryPage.vala',
+            'events/EventPage.vala',
+            'events/EventDirectoryItem.vala',
+            'tags/Tags.vala',
+            'tags/TagsBranch.vala',
+            'tags/TagPage.vala',
+            'tags/HierarchicalTagIndex.vala',
+            'tags/HierarchicalTagUtilities.vala',
+            'camera/Camera.vala',
+            'camera/CameraBranch.vala',
+            'camera/CameraTable.vala',
+            'camera/GPhoto.vala',
+            'camera/ImportPage.vala',
+            'searches/Searches.vala',
+            'searches/SearchesBranch.vala',
+            'searches/SearchBoolean.vala',
+            'searches/SavedSearchPage.vala',
+            'searches/SavedSearchDialog.vala',
+            'config/Config.vala',
+            'config/ConfigurationInterfaces.vala',
+            'config/GSettingsEngine.vala',
+            'data_imports/DataImports.vala',
+            'data_imports/DataImportsPluginHost.vala',
+            'data_imports/DataImportsUI.vala',
+            'data_imports/DataImportJob.vala',
+            'data_imports/DataImportSource.vala',
+            'folders/Folders.vala',
+            'folders/FoldersBranch.vala',
+            'folders/FoldersPage.vala',
+            'main.vala',
+            'AppWindow.vala',
+            'CollectionPage.vala',
+            'NaturalCollate.vala',
+            'Thumbnail.vala',
+            'ThumbnailCache.vala',
+            'CheckerboardLayout.vala',
+            'PhotoPage.vala',
+            'Page.vala',
+            'SortedList.vala',
+            'Dimensions.vala',
+            'Box.vala',
+            'Photo.vala',
+            'Orientation.vala',
+            'BatchImport.vala',
+            'Dialogs.vala',
+            'Resources.vala',
+            'Debug.vala',
+            'Properties.vala',
+            'Event.vala',
+            'International.vala',
+            'AppDirs.vala',
+            'PixbufCache.vala',
+            'CommandManager.vala',
+            'Commands.vala',
+            'SlideshowPage.vala',
+            'LibraryFiles.vala',
+            'Printing.vala',
+            'Tag.vala',
+            'Screensaver.vala',
+            'Exporter.vala',
+            'DirectoryMonitor.vala',
+            'LibraryMonitor.vala',
+            'VideoSupport.vala',
+            'Tombstone.vala',
+            'MetadataWriter.vala',
+            'Application.vala',
+            'TimedQueue.vala',
+            'MediaPage.vala',
+            'MediaDataRepresentation.vala',
+            'DesktopIntegration.vala',
+            'MediaInterfaces.vala',
+            'MediaMetadata.vala',
+            'VideoMetadata.vala',
+            'MediaMonitor.vala',
+            'PhotoMonitor.vala',
+            'VideoMonitor.vala',
+            'SearchFilter.vala',
+            'MediaViewTracker.vala',
+            'UnityProgressBar.vala',
+            'Upgrades.vala',
+            'dialogs/AdjustDateTimeDialog.vala',
+            'dialogs/EntryMultiCompletion.vala',
+            'dialogs/ExportDialog.vala',
+            'dialogs/MultiTextEntryDialog.vala',
+            'dialogs/Preferences.vala',
+            'dialogs/ProgressDialog.vala',
+            'dialogs/SetBackgroundSlideshow.vala',
+            'dialogs/SetBackground.vala',
+            'dialogs/TextEntry.vala',
+            'dialogs/WelcomeDialog.vala',
+            '.unitize/_UnitInternals.vala',
+            '.unitize/_UtilInternals.vala',
+            '.unitize/_ThreadsInternals.vala',
+            '.unitize/_DbInternals.vala',
+            '.unitize/_EditingToolsInternals.vala',
+            '.unitize/_PluginsInternals.vala',
+            '.unitize/_SlideshowInternals.vala',
+            '.unitize/_PhotosInternals.vala',
+            '.unitize/_PublishingInternals.vala',
+            '.unitize/_LibraryInternals.vala',
+            '.unitize/_DirectInternals.vala',
+            '.unitize/_CoreInternals.vala',
+            '.unitize/_SidebarInternals.vala',
+            '.unitize/_EventsInternals.vala',
+            '.unitize/_TagsInternals.vala',
+            '.unitize/_CameraInternals.vala',
+            '.unitize/_SearchesInternals.vala',
+            '.unitize/_ConfigInternals.vala',
+            '.unitize/_DataImportsInternals.vala',
+            '.unitize/_FoldersInternals.vala',
+            '.unitize/_Library_unitize_entry.vala',
+            '.unitize/_Direct_unitize_entry.vala'] + shotwell_resources,
+           include_directories : vapi_incdir,
+           dependencies : shotwell_deps,
+           vala_args : ['--pkg', 'libgphoto2',
+                        '--pkg', 'libraw',
+                        '--pkg', 'libexif',
+                        '--pkg', 'misc',
+                        '--gresources',
+                        join_paths(meson.source_root(),
+                          'org.gnome.Shotwell.gresource.xml')
+                       ],
+           link_with: [sw_graphics_processor],
+           install : true)
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index eeffbb9..e6f204c 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -502,10 +502,10 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph
 static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup10 (gchar** self, int length);
+static gchar** _vala_array_dup8 (gchar** self, int length);
 static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
 static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup11 (gchar** self, int length);
+static gchar** _vala_array_dup9 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer photo_file_sniffer_ref (gpointer instance);
@@ -716,7 +716,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot
 }
 
 
-static gchar** _vala_array_dup10 (gchar** self, int length) {
+static gchar** _vala_array_dup8 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -753,7 +753,7 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0__length1 = photos_bmp_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -799,7 +799,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot
 }
 
 
-static gchar** _vala_array_dup11 (gchar** self, int length) {
+static gchar** _vala_array_dup9 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -836,7 +836,7 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp0__length1 = photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 6ea3ba4..304cc1a 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -531,7 +531,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_bytes_unref0 (bytes);
 #line 534 "GRaw.c"
-			goto __catch29_g_error;
+			goto __catch33_g_error;
 		}
 #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp13_ = _tmp7_;
@@ -547,8 +547,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		_g_bytes_unref0 (bytes);
 #line 549 "GRaw.c"
 	}
-	goto __finally29;
-	__catch29_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_;
@@ -569,9 +569,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_error_free0 (err);
 #line 572 "GRaw.c"
-		goto __finally29;
+		goto __finally33;
 	}
-	__finally29:
+	__finally33:
 #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index 4b94f76..8955711 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -283,10 +283,9 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa
 static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self);
 static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader);
 static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
-static guint8* _vala_array_dup7 (guint8* self, int length);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
+static guint8* _vala_array_dup5 (guint8* self, int length);
 void dimensions_init (Dimensions *self, gint width, gint height);
 PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name);
 static void gdk_sniffer_finalize (PhotoFileSniffer * obj);
@@ -306,7 +305,7 @@ GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, Photo
 	self = (GdkReader*) photo_file_reader_construct (object_type, _tmp0_, _tmp1_);
 #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return self;
-#line 310 "GdkSupport.c"
+#line 309 "GdkSupport.c"
 }
 
 
@@ -340,13 +339,13 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr
 		_media_metadata_unref0 (metadata);
 #line 14 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 344 "GdkSupport.c"
+#line 343 "GdkSupport.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	result = metadata;
 #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return result;
-#line 350 "GdkSupport.c"
+#line 349 "GdkSupport.c"
 }
 
 
@@ -380,7 +379,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		g_propagate_error (error, _inner_error_);
 #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 384 "GdkSupport.c"
+#line 383 "GdkSupport.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp5_ = _tmp0_;
@@ -392,7 +391,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	_g_object_unref0 (_tmp0_);
 #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return result;
-#line 396 "GdkSupport.c"
+#line 395 "GdkSupport.c"
 }
 
 
@@ -442,7 +441,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		g_propagate_error (error, _inner_error_);
 #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 446 "GdkSupport.c"
+#line 445 "GdkSupport.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp9_ = _tmp0_;
@@ -454,7 +453,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	_g_object_unref0 (_tmp0_);
 #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return result;
-#line 458 "GdkSupport.c"
+#line 457 "GdkSupport.c"
 }
 
 
@@ -467,7 +466,7 @@ static void gdk_reader_class_init (GdkReaderClass * klass) {
 	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read;
 #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read;
-#line 471 "GdkSupport.c"
+#line 470 "GdkSupport.c"
 }
 
 
@@ -501,35 +500,35 @@ GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
 	self = (GdkSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return self;
-#line 505 "GdkSupport.c"
+#line 504 "GdkSupport.c"
 }
 
 
 static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	gdk_sniffer_on_size_prepared ((GdkSniffer*) self, _sender, width, height);
-#line 512 "GdkSupport.c"
+#line 511 "GdkSupport.c"
 }
 
 
 static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	gdk_sniffer_on_area_prepared ((GdkSniffer*) self, _sender);
-#line 519 "GdkSupport.c"
+#line 518 "GdkSupport.c"
 }
 
 
-static guint8* _vala_array_dup7 (guint8* self, int length) {
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+static guint8* _vala_array_dup5 (guint8* self, int length) {
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 526 "GdkSupport.c"
+#line 525 "GdkSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 533 "GdkSupport.c"
+#line 532 "GdkSupport.c"
 }
 
 
@@ -548,25 +547,25 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	PhotoMetadata* _tmp7_;
 	gboolean _tmp12_ = FALSE;
 	gboolean _tmp13_;
-	guint8* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	gint __tmp38__size_ = 0;
-	gboolean _tmp39_;
+	guint8* _tmp24_ = NULL;
+	gint _tmp24__length1 = 0;
+	gint __tmp24__size_ = 0;
+	gboolean _tmp25_;
 	guint8* buffer = NULL;
-	guint8* _tmp42_;
-	gint _tmp42__length1;
+	guint8* _tmp28_;
+	gint _tmp28__length1;
 	gint buffer_length1;
 	gint _buffer_size_;
 	gsize count = 0UL;
 	GFileInputStream* fins = NULL;
-	GFile* _tmp43_;
-	GFileInputStream* _tmp44_;
-	GFileInputStream* _tmp68_;
-	gboolean _tmp70_;
-	gboolean _tmp75_ = FALSE;
-	gboolean _tmp76_;
-	DetectedPhotoInformation* _tmp78_;
-	DetectedPhotoInformation* _tmp79_;
+	GFile* _tmp29_;
+	GFileInputStream* _tmp30_;
+	GFileInputStream* _tmp54_;
+	gboolean _tmp56_;
+	gboolean _tmp61_ = FALSE;
+	gboolean _tmp62_;
+	DetectedPhotoInformation* _tmp64_;
+	DetectedPhotoInformation* _tmp65_;
 	GError * _inner_error_ = NULL;
 #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer);
@@ -594,7 +593,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp4_) {
-#line 598 "GdkSupport.c"
+#line 597 "GdkSupport.c"
 		GChecksum* _tmp5_;
 #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp5_ = g_checksum_new (G_CHECKSUM_MD5);
@@ -602,7 +601,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_checksum_free0 (md5_checksum);
 #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		md5_checksum = _tmp5_;
-#line 606 "GdkSupport.c"
+#line 605 "GdkSupport.c"
 	}
 #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp6_ = self->priv->detected;
@@ -612,7 +611,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 	_media_metadata_unref0 (_tmp6_->metadata);
 #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp6_->metadata = _tmp7_;
-#line 616 "GdkSupport.c"
+#line 615 "GdkSupport.c"
 	{
 		DetectedPhotoInformation* _tmp8_;
 		PhotoMetadata* _tmp9_;
@@ -627,12 +626,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp10_, &_inner_error_);
 #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 631 "GdkSupport.c"
-			goto __catch30_g_error;
+#line 630 "GdkSupport.c"
+			goto __catch34_g_error;
 		}
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally34;
+	__catch34_g_error:
 	{
 		GError* err = NULL;
 		DetectedPhotoInformation* _tmp11_;
@@ -648,9 +647,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp11_->metadata = NULL;
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_error_free0 (err);
-#line 652 "GdkSupport.c"
+#line 651 "GdkSupport.c"
 	}
-	__finally30:
+	__finally34:
 #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"
@@ -661,13 +660,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_object_unref0 (pixbuf_loader);
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 665 "GdkSupport.c"
+#line 664 "GdkSupport.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp13_) {
-#line 671 "GdkSupport.c"
+#line 670 "GdkSupport.c"
 		DetectedPhotoInformation* _tmp14_;
 		PhotoMetadata* _tmp15_;
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -676,542 +675,430 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp15_ = _tmp14_->metadata;
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 680 "GdkSupport.c"
+#line 679 "GdkSupport.c"
 	} else {
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp12_ = FALSE;
-#line 684 "GdkSupport.c"
+#line 683 "GdkSupport.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp12_) {
-#line 688 "GdkSupport.c"
-		guint8* flattened_sans_thumbnail = NULL;
+#line 687 "GdkSupport.c"
 		DetectedPhotoInformation* _tmp16_;
-		PhotoMetadata* _tmp17_;
-		gint _tmp18_;
-		guint8* _tmp19_;
-		gint flattened_sans_thumbnail_length1;
-		gint _flattened_sans_thumbnail_size_;
-		gboolean _tmp20_ = FALSE;
-		guint8* _tmp21_;
-		gint _tmp21__length1;
-		guint8* flattened_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp27_;
-		PhotoMetadata* _tmp28_;
-		gint _tmp29_;
-		guint8* _tmp30_;
-		gint flattened_thumbnail_length1;
-		gint _flattened_thumbnail_size_;
-		gboolean _tmp31_ = FALSE;
-		guint8* _tmp32_;
-		gint _tmp32__length1;
+		DetectedPhotoInformation* _tmp17_;
+		PhotoMetadata* _tmp18_;
+		gchar* _tmp19_;
+		DetectedPhotoInformation* _tmp20_;
+		DetectedPhotoInformation* _tmp21_;
+		PhotoMetadata* _tmp22_;
+		gchar* _tmp23_;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_tmp16_ = self->priv->detected;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp17_ = _tmp16_->metadata;
+		_tmp17_ = self->priv->detected;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp19_ = photo_metadata_flatten_exif (_tmp17_, FALSE, &_tmp18_);
+		_tmp18_ = _tmp17_->metadata;
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_sans_thumbnail = _tmp19_;
+		_tmp19_ = photo_metadata_exif_hash (_tmp18_);
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_sans_thumbnail_length1 = _tmp18_;
+		_g_free0 (_tmp16_->exif_md5);
 #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp21_ = flattened_sans_thumbnail;
+		_tmp16_->exif_md5 = _tmp19_;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp21__length1 = flattened_sans_thumbnail_length1;
+		_tmp20_ = self->priv->detected;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		if (_tmp21_ != NULL) {
-#line 727 "GdkSupport.c"
-			guint8* _tmp22_;
-			gint _tmp22__length1;
+		_tmp21_ = self->priv->detected;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp22_ = flattened_sans_thumbnail;
+		_tmp22_ = _tmp21_->metadata;
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp22__length1 = flattened_sans_thumbnail_length1;
+		_tmp23_ = photo_metadata_thumbnail_hash (_tmp22_);
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp20_ = _tmp22__length1 > 0;
-#line 736 "GdkSupport.c"
-		} else {
-#line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp20_ = FALSE;
-#line 740 "GdkSupport.c"
-		}
+		_g_free0 (_tmp20_->thumbnail_md5);
 #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		if (_tmp20_) {
-#line 744 "GdkSupport.c"
-			DetectedPhotoInformation* _tmp23_;
-			guint8* _tmp24_;
-			gint _tmp24__length1;
-			guint8* _tmp25_;
-			gint _tmp25__length1;
-			gchar* _tmp26_;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp23_ = self->priv->detected;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp24_ = flattened_sans_thumbnail;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp24__length1 = flattened_sans_thumbnail_length1;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp25_ = flattened_sans_thumbnail;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp25__length1 = flattened_sans_thumbnail_length1;
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp26_ = md5_binary (_tmp24_, (gsize) _tmp25__length1);
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_g_free0 (_tmp23_->exif_md5);
-#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp23_->exif_md5 = _tmp26_;
-#line 767 "GdkSupport.c"
-		}
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp27_ = self->priv->detected;
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp28_ = _tmp27_->metadata;
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp30_ = photo_metadata_flatten_exif_preview (_tmp28_, &_tmp29_);
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_thumbnail = _tmp30_;
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_thumbnail_length1 = _tmp29_;
-#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_flattened_thumbnail_size_ = flattened_thumbnail_length1;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp32_ = flattened_thumbnail;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp32__length1 = flattened_thumbnail_length1;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		if (_tmp32_ != NULL) {
-#line 787 "GdkSupport.c"
-			guint8* _tmp33_;
-			gint _tmp33__length1;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp33_ = flattened_thumbnail;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp33__length1 = flattened_thumbnail_length1;
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp31_ = _tmp33__length1 > 0;
-#line 796 "GdkSupport.c"
-		} else {
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp31_ = FALSE;
-#line 800 "GdkSupport.c"
-		}
-#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		if (_tmp31_) {
-#line 804 "GdkSupport.c"
-			DetectedPhotoInformation* _tmp34_;
-			guint8* _tmp35_;
-			gint _tmp35__length1;
-			guint8* _tmp36_;
-			gint _tmp36__length1;
-			gchar* _tmp37_;
-#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp34_ = self->priv->detected;
+		_tmp20_->thumbnail_md5 = _tmp23_;
+#line 720 "GdkSupport.c"
+	}
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp35_ = flattened_thumbnail;
+	_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp35__length1 = flattened_thumbnail_length1;
+	if (_tmp25_) {
+#line 726 "GdkSupport.c"
+		guint8* _tmp26_;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp36_ = flattened_thumbnail;
+		_tmp26_ = g_new0 (guint8, 64 * 1024);
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp36__length1 = flattened_thumbnail_length1;
+		_tmp24_ = (g_free (_tmp24_), NULL);
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp37_ = md5_binary (_tmp35_, (gsize) _tmp36__length1);
+		_tmp24_ = _tmp26_;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_g_free0 (_tmp34_->thumbnail_md5);
+		_tmp24__length1 = 64 * 1024;
 #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp34_->thumbnail_md5 = _tmp37_;
-#line 827 "GdkSupport.c"
-		}
-#line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
-#line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 833 "GdkSupport.c"
-	}
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	if (_tmp39_) {
-#line 839 "GdkSupport.c"
-		guint8* _tmp40_;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp40_ = g_new0 (guint8, 64 * 1024);
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = (g_free (_tmp38_), NULL);
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = _tmp40_;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38__length1 = 64 * 1024;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		__tmp38__size_ = _tmp38__length1;
-#line 851 "GdkSupport.c"
+		__tmp24__size_ = _tmp24__length1;
+#line 738 "GdkSupport.c"
 	} else {
-		guint8* _tmp41_;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp41_ = g_new0 (guint8, 8 * 1024);
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = (g_free (_tmp38_), NULL);
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = _tmp41_;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38__length1 = 8 * 1024;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		__tmp38__size_ = _tmp38__length1;
-#line 864 "GdkSupport.c"
+		guint8* _tmp27_;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp27_ = g_new0 (guint8, 8 * 1024);
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp24_ = (g_free (_tmp24_), NULL);
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp24_ = _tmp27_;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp24__length1 = 8 * 1024;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		__tmp24__size_ = _tmp24__length1;
+#line 751 "GdkSupport.c"
 	}
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp42_ = (_tmp38_ != NULL) ? _vala_array_dup7 (_tmp38_, _tmp38__length1) : ((gpointer) _tmp38_);
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp42__length1 = _tmp38__length1;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	buffer = _tmp42_;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	buffer_length1 = _tmp42__length1;
-#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp28_ = (_tmp24_ != NULL) ? _vala_array_dup5 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp28__length1 = _tmp24__length1;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	buffer = _tmp28_;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	buffer_length1 = _tmp28__length1;
+#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_buffer_size_ = buffer_length1;
-#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 65 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	count = (gsize) 0;
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp44_ = g_file_read (_tmp43_, NULL, &_inner_error_);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	fins = _tmp44_;
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp30_ = g_file_read (_tmp29_, NULL, &_inner_error_);
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	fins = _tmp30_;
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		buffer = (g_free (buffer), NULL);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = (g_free (_tmp38_), NULL);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp24_ = (g_free (_tmp24_), NULL);
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_checksum_free0 (md5_checksum);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_object_unref0 (pixbuf_loader);
-#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 898 "GdkSupport.c"
+#line 785 "GdkSupport.c"
 	}
 	{
-		gboolean _tmp45_ = FALSE;
-#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp45_ = TRUE;
-#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		gboolean _tmp31_ = FALSE;
+#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp31_ = TRUE;
+#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		while (TRUE) {
-#line 906 "GdkSupport.c"
+#line 793 "GdkSupport.c"
 			gsize bytes_read = 0UL;
-			GFileInputStream* _tmp46_;
-			guint8* _tmp47_;
-			gint _tmp47__length1;
-			gssize _tmp48_;
-			gsize _tmp49_;
-			gsize _tmp50_;
-			gsize _tmp51_;
-			gboolean _tmp52_;
-			gboolean _tmp56_ = FALSE;
-			gboolean _tmp57_;
-			gboolean _tmp62_ = FALSE;
-			gboolean _tmp63_ = FALSE;
-			gboolean _tmp64_;
-#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (!_tmp45_) {
-#line 923 "GdkSupport.c"
+			GFileInputStream* _tmp32_;
+			guint8* _tmp33_;
+			gint _tmp33__length1;
+			gssize _tmp34_;
+			gsize _tmp35_;
+			gsize _tmp36_;
+			gsize _tmp37_;
+			gboolean _tmp38_;
+			gboolean _tmp42_ = FALSE;
+			gboolean _tmp43_;
+			gboolean _tmp48_ = FALSE;
+			gboolean _tmp49_ = FALSE;
+			gboolean _tmp50_;
+#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (!_tmp31_) {
+#line 810 "GdkSupport.c"
 			}
-#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp45_ = FALSE;
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp46_ = fins;
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp47_ = buffer;
-#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_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"
+#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp31_ = FALSE;
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp32_ = fins;
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp33_ = buffer;
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp33__length1 = buffer_length1;
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp34_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_);
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			bytes_read = (gsize) _tmp34_;
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_g_object_unref0 (fins);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				buffer = (g_free (buffer), NULL);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp38_ = (g_free (_tmp38_), NULL);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp24_ = (g_free (_tmp24_), NULL);
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_g_checksum_free0 (md5_checksum);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				_g_object_unref0 (pixbuf_loader);
-#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				return NULL;
-#line 953 "GdkSupport.c"
+#line 840 "GdkSupport.c"
 			}
+#line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp35_ = bytes_read;
+#line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (_tmp35_ <= ((gsize) 0)) {
+#line 72 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				break;
+#line 848 "GdkSupport.c"
+			}
+#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp36_ = count;
+#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp37_ = bytes_read;
+#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			count = _tmp36_ + _tmp37_;
 #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp49_ = bytes_read;
+			_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (_tmp49_ <= ((gsize) 0)) {
+			if (_tmp38_) {
+#line 860 "GdkSupport.c"
+				GChecksum* _tmp39_;
+				guint8* _tmp40_;
+				gint _tmp40__length1;
+				gsize _tmp41_;
 #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				break;
-#line 961 "GdkSupport.c"
-			}
-#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp50_ = count;
-#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp51_ = bytes_read;
-#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			count = _tmp50_ + _tmp51_;
-#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (_tmp52_) {
-#line 973 "GdkSupport.c"
-				GChecksum* _tmp53_;
-				guint8* _tmp54_;
-				gint _tmp54__length1;
-				gsize _tmp55_;
-#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp53_ = md5_checksum;
-#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp54_ = buffer;
-#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp54__length1 = buffer_length1;
-#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp55_ = bytes_read;
-#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				g_checksum_update (_tmp53_, _tmp54_, _tmp55_);
-#line 988 "GdkSupport.c"
+				_tmp39_ = md5_checksum;
+#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp40_ = buffer;
+#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp40__length1 = buffer_length1;
+#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp41_ = bytes_read;
+#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				g_checksum_update (_tmp39_, _tmp40_, _tmp41_);
+#line 875 "GdkSupport.c"
 			}
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp57_ = self->priv->size_ready;
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (!_tmp57_) {
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp56_ = TRUE;
-#line 996 "GdkSupport.c"
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp43_ = self->priv->size_ready;
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (!_tmp43_) {
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp42_ = TRUE;
+#line 883 "GdkSupport.c"
 			} else {
-				gboolean _tmp58_;
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp58_ = self->priv->area_prepared;
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp56_ = !_tmp58_;
-#line 1003 "GdkSupport.c"
+				gboolean _tmp44_;
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp44_ = self->priv->area_prepared;
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp42_ = !_tmp44_;
+#line 890 "GdkSupport.c"
 			}
-#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (_tmp56_) {
-#line 1007 "GdkSupport.c"
-				GdkPixbufLoader* _tmp59_;
-				guint8* _tmp60_;
-				gint _tmp60__length1;
-				gsize _tmp61_;
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp59_ = pixbuf_loader;
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp60_ = buffer;
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp60__length1 = buffer_length1;
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp61_ = bytes_read;
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				gdk_pixbuf_loader_write (_tmp59_, _tmp60_ + 0, (gsize) (((gint) _tmp61_) - 0), &_inner_error_);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (_tmp42_) {
+#line 894 "GdkSupport.c"
+				GdkPixbufLoader* _tmp45_;
+				guint8* _tmp46_;
+				gint _tmp46__length1;
+				gsize _tmp47_;
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp45_ = pixbuf_loader;
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp46_ = buffer;
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp46__length1 = buffer_length1;
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp47_ = bytes_read;
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				gdk_pixbuf_loader_write (_tmp45_, _tmp46_ + 0, (gsize) (((gint) _tmp47_) - 0), &_inner_error_);
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					g_propagate_error (error, _inner_error_);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					_g_object_unref0 (fins);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					buffer = (g_free (buffer), NULL);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-					_tmp38_ = (g_free (_tmp38_), NULL);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+					_tmp24_ = (g_free (_tmp24_), NULL);
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					_g_checksum_free0 (md5_checksum);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					_g_object_unref0 (pixbuf_loader);
-#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 					return NULL;
-#line 1038 "GdkSupport.c"
+#line 925 "GdkSupport.c"
 				}
 			}
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp64_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (!_tmp64_) {
-#line 1045 "GdkSupport.c"
-				gboolean _tmp65_;
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp65_ = self->priv->size_ready;
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp63_ = _tmp65_;
-#line 1051 "GdkSupport.c"
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (!_tmp50_) {
+#line 932 "GdkSupport.c"
+				gboolean _tmp51_;
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp51_ = self->priv->size_ready;
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp49_ = _tmp51_;
+#line 938 "GdkSupport.c"
 			} else {
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp63_ = FALSE;
-#line 1055 "GdkSupport.c"
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp49_ = FALSE;
+#line 942 "GdkSupport.c"
 			}
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (_tmp63_) {
-#line 1059 "GdkSupport.c"
-				gboolean _tmp66_;
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp66_ = self->priv->area_prepared;
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp62_ = _tmp66_;
-#line 1065 "GdkSupport.c"
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (_tmp49_) {
+#line 946 "GdkSupport.c"
+				gboolean _tmp52_;
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp52_ = self->priv->area_prepared;
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp48_ = _tmp52_;
+#line 952 "GdkSupport.c"
 			} else {
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-				_tmp62_ = FALSE;
-#line 1069 "GdkSupport.c"
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+				_tmp48_ = FALSE;
+#line 956 "GdkSupport.c"
 			}
-#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			if (_tmp62_) {
-#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			if (_tmp48_) {
+#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 				break;
-#line 1075 "GdkSupport.c"
+#line 962 "GdkSupport.c"
 			}
 		}
 	}
 	{
-		GdkPixbufLoader* _tmp67_;
-#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp67_ = pixbuf_loader;
-#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		gdk_pixbuf_loader_close (_tmp67_, &_inner_error_);
-#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		GdkPixbufLoader* _tmp53_;
+#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp53_ = pixbuf_loader;
+#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		gdk_pixbuf_loader_close (_tmp53_, &_inner_error_);
+#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1087 "GdkSupport.c"
-			goto __catch31_g_error;
+#line 974 "GdkSupport.c"
+			goto __catch35_g_error;
 		}
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally35;
+	__catch35_g_error:
 	{
 		GError* err = NULL;
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		err = _inner_error_;
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_inner_error_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_error_free0 (err);
-#line 1101 "GdkSupport.c"
+#line 988 "GdkSupport.c"
 	}
-	__finally31:
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	__finally35:
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_object_unref0 (fins);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		buffer = (g_free (buffer), NULL);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp38_ = (g_free (_tmp38_), NULL);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp24_ = (g_free (_tmp24_), NULL);
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_checksum_free0 (md5_checksum);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_object_unref0 (pixbuf_loader);
-#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return NULL;
-#line 1120 "GdkSupport.c"
+#line 1007 "GdkSupport.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp68_ = fins;
-#line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	if (_tmp68_ != NULL) {
-#line 1126 "GdkSupport.c"
-		GFileInputStream* _tmp69_;
-#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_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp54_ = fins;
+#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	if (_tmp54_ != NULL) {
+#line 1013 "GdkSupport.c"
+		GFileInputStream* _tmp55_;
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp55_ = fins;
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_g_object_unref0 (fins);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			buffer = (g_free (buffer), NULL);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-			_tmp38_ = (g_free (_tmp38_), NULL);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+			_tmp24_ = (g_free (_tmp24_), NULL);
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_g_checksum_free0 (md5_checksum);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			_g_object_unref0 (pixbuf_loader);
-#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 			return NULL;
-#line 1148 "GdkSupport.c"
+#line 1035 "GdkSupport.c"
 		}
 	}
-#line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp70_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	if (_tmp70_) {
-#line 1155 "GdkSupport.c"
-		DetectedPhotoInformation* _tmp71_;
-		GChecksum* _tmp72_;
-		const gchar* _tmp73_;
-		gchar* _tmp74_;
-#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp71_ = self->priv->detected;
-#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp72_ = md5_checksum;
+#line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
+#line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	if (_tmp56_) {
+#line 1042 "GdkSupport.c"
+		DetectedPhotoInformation* _tmp57_;
+		GChecksum* _tmp58_;
+		const gchar* _tmp59_;
+		gchar* _tmp60_;
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp57_ = self->priv->detected;
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp58_ = md5_checksum;
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp59_ = g_checksum_get_string (_tmp58_);
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp60_ = g_strdup (_tmp59_);
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_g_free0 (_tmp57_->md5);
+#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp57_->md5 = _tmp60_;
+#line 1059 "GdkSupport.c"
+	}
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp62_ = self->priv->size_ready;
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	if (!_tmp62_) {
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp61_ = TRUE;
+#line 1067 "GdkSupport.c"
+	} else {
+		gboolean _tmp63_;
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp63_ = self->priv->area_prepared;
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+		_tmp61_ = !_tmp63_;
+#line 1074 "GdkSupport.c"
+	}
+#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_vala_is_corrupted = _tmp61_;
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp73_ = g_checksum_get_string (_tmp72_);
+	_tmp64_ = self->priv->detected;
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp74_ = g_strdup (_tmp73_);
+	_tmp65_ = _detected_photo_information_ref0 (_tmp64_);
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_g_free0 (_tmp71_->md5);
+	result = _tmp65_;
 #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp71_->md5 = _tmp74_;
-#line 1172 "GdkSupport.c"
-	}
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp76_ = self->priv->size_ready;
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	if (!_tmp76_) {
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp75_ = TRUE;
-#line 1180 "GdkSupport.c"
-	} else {
-		gboolean _tmp77_;
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp77_ = self->priv->area_prepared;
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-		_tmp75_ = !_tmp77_;
-#line 1187 "GdkSupport.c"
-	}
-#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_vala_is_corrupted = _tmp75_;
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp78_ = self->priv->detected;
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp79_ = _detected_photo_information_ref0 (_tmp78_);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	result = _tmp79_;
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_g_object_unref0 (fins);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	buffer = (g_free (buffer), NULL);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
-	_tmp38_ = (g_free (_tmp38_), NULL);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+	_tmp24_ = (g_free (_tmp24_), NULL);
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_g_checksum_free0 (md5_checksum);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_g_object_unref0 (pixbuf_loader);
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (is_corrupted) {
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1211 "GdkSupport.c"
+#line 1098 "GdkSupport.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return result;
-#line 1215 "GdkSupport.c"
+#line 1102 "GdkSupport.c"
 }
 
 
@@ -1219,28 +1106,28 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa
 	DetectedPhotoInformation* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (IS_GDK_SNIFFER (self));
-#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (GDK_IS_PIXBUF_LOADER (loader));
-#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp0_ = self->priv->detected;
-#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp1_ = width;
-#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp2_ = height;
-#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	dimensions_init (&_tmp0_->image_dim, _tmp1_, _tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self->priv->size_ready = TRUE;
-#line 1237 "GdkSupport.c"
+#line 1124 "GdkSupport.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1244 "GdkSupport.c"
+#line 1131 "GdkSupport.c"
 }
 
 
@@ -1269,83 +1156,83 @@ static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pix
 	DetectedPhotoInformation* _tmp19_;
 	const gchar* _tmp20_;
 	PhotoFileFormat _tmp21_;
-#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (IS_GDK_SNIFFER (self));
-#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	g_return_if_fail (GDK_IS_PIXBUF_LOADER (pixbuf_loader));
-#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp0_ = pixbuf_loader;
-#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp1_ = gdk_pixbuf_loader_get_pixbuf (_tmp0_);
-#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	pixbuf = _tmp2_;
-#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp3_ = pixbuf;
-#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 119 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		_g_object_unref0 (pixbuf);
-#line 119 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		return;
-#line 1293 "GdkSupport.c"
+#line 1180 "GdkSupport.c"
 	}
-#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp4_ = self->priv->detected;
-#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp5_ = pixbuf;
-#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp6_ = gdk_pixbuf_get_colorspace (_tmp5_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp4_->colorspace = _tmp6_;
-#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp7_ = self->priv->detected;
-#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp8_ = pixbuf;
-#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp9_ = gdk_pixbuf_get_n_channels (_tmp8_);
-#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp7_->channels = _tmp9_;
-#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp10_ = self->priv->detected;
-#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp11_ = pixbuf;
-#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp12_ = gdk_pixbuf_get_bits_per_sample (_tmp11_);
-#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp10_->bits_per_channel = _tmp12_;
-#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp13_ = pixbuf_loader;
-#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp14_ = gdk_pixbuf_loader_get_format (_tmp13_);
-#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	format = _tmp14_;
-#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp15_ = self->priv->detected;
-#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp16_ = format;
-#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp17_ = gdk_pixbuf_format_get_name (_tmp16_);
-#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_g_free0 (_tmp15_->format_name);
-#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp15_->format_name = _tmp17_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp18_ = self->priv->detected;
-#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp19_ = self->priv->detected;
-#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp20_ = _tmp19_->format_name;
-#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp21_ = photo_file_format_from_pixbuf_name (_tmp20_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_tmp18_->file_format = _tmp21_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self->priv->area_prepared = TRUE;
-#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 1349 "GdkSupport.c"
+#line 1236 "GdkSupport.c"
 }
 
 
@@ -1358,7 +1245,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) {
 	g_type_class_add_private (klass, sizeof (GdkSnifferPrivate));
 #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff;
-#line 1362 "GdkSupport.c"
+#line 1249 "GdkSupport.c"
 }
 
 
@@ -1371,7 +1258,7 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) {
 	self->priv->size_ready = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	self->priv->area_prepared = FALSE;
-#line 1375 "GdkSupport.c"
+#line 1262 "GdkSupport.c"
 }
 
 
@@ -1383,7 +1270,7 @@ static void gdk_sniffer_finalize (PhotoFileSniffer * obj) {
 	_detected_photo_information_unref0 (self->priv->detected);
 #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	PHOTO_FILE_SNIFFER_CLASS (gdk_sniffer_parent_class)->finalize (obj);
-#line 1387 "GdkSupport.c"
+#line 1274 "GdkSupport.c"
 }
 
 
diff --git a/src/photos/GdkSupport.vala b/src/photos/GdkSupport.vala
index 51ae72c..2fd1926 100644
--- a/src/photos/GdkSupport.vala
+++ b/src/photos/GdkSupport.vala
@@ -55,13 +55,8 @@ public abstract class GdkSniffer : PhotoFileSniffer {
         }
         
         if (calc_md5 && detected.metadata != null) {
-            uint8[]? flattened_sans_thumbnail = detected.metadata.flatten_exif(false);
-            if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
-                detected.exif_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
-            
-            uint8[]? flattened_thumbnail = detected.metadata.flatten_exif_preview();
-            if (flattened_thumbnail != null && flattened_thumbnail.length > 0)
-                detected.thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length);
+            detected.exif_md5 = detected.metadata.exif_hash();
+            detected.thumbnail_md5 = detected.metadata.thumbnail_hash();
         }
         
         // if no MD5, don't read as much, as the needed info will probably be gleaned
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index baaaf55..190c4c2 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -568,10 +568,10 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil
 static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup8 (gchar** self, int length);
+static gchar** _vala_array_dup6 (gchar** self, int length);
 static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
 static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup9 (gchar** self, int length);
+static gchar** _vala_array_dup7 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
@@ -616,7 +616,9 @@ guint8 jpeg_marker_get_byte (JpegMarker self);
 gint jpeg_quality_get_pct (JpegQuality self);
 JpegQuality* jpeg_quality_get_all (int* result_length1);
 gchar* jpeg_quality_to_string (JpegQuality self);
-gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** error);
+gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error);
+gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error);
+gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error);
 
 
 void jfif_file_format_driver_init (void) {
@@ -629,14 +631,14 @@ void jfif_file_format_driver_init (void) {
 	jfif_file_format_driver_instance = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_file_format_properties_init ();
-#line 633 "JfifSupport.c"
+#line 635 "JfifSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 640 "JfifSupport.c"
+#line 642 "JfifSupport.c"
 }
 
 
@@ -652,7 +654,7 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 656 "JfifSupport.c"
+#line 658 "JfifSupport.c"
 }
 
 
@@ -668,7 +670,7 @@ static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (P
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 20 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 672 "JfifSupport.c"
+#line 674 "JfifSupport.c"
 }
 
 
@@ -689,7 +691,7 @@ static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFor
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 693 "JfifSupport.c"
+#line 695 "JfifSupport.c"
 }
 
 
@@ -705,7 +707,7 @@ static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFor
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 709 "JfifSupport.c"
+#line 711 "JfifSupport.c"
 }
 
 
@@ -718,7 +720,7 @@ static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDri
 	result = TRUE;
 #line 32 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 722 "JfifSupport.c"
+#line 724 "JfifSupport.c"
 }
 
 
@@ -731,7 +733,7 @@ static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormat
 	result = TRUE;
 #line 36 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 735 "JfifSupport.c"
+#line 737 "JfifSupport.c"
 }
 
 
@@ -752,7 +754,7 @@ static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFor
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
 #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 756 "JfifSupport.c"
+#line 758 "JfifSupport.c"
 }
 
 
@@ -773,7 +775,7 @@ static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_wri
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
 #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 777 "JfifSupport.c"
+#line 779 "JfifSupport.c"
 }
 
 
@@ -797,7 +799,7 @@ static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileF
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 801 "JfifSupport.c"
+#line 803 "JfifSupport.c"
 }
 
 
@@ -807,14 +809,14 @@ JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type) {
 	self = (JfifFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 811 "JfifSupport.c"
+#line 813 "JfifSupport.c"
 }
 
 
 JfifFileFormatDriver* jfif_file_format_driver_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_file_format_driver_construct (TYPE_JFIF_FILE_FORMAT_DRIVER);
-#line 818 "JfifSupport.c"
+#line 820 "JfifSupport.c"
 }
 
 
@@ -839,7 +841,7 @@ static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klas
 	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer;
-#line 843 "JfifSupport.c"
+#line 845 "JfifSupport.c"
 }
 
 
@@ -853,7 +855,7 @@ static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver);
 #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (jfif_file_format_driver_parent_class)->finalize (obj);
-#line 857 "JfifSupport.c"
+#line 859 "JfifSupport.c"
 }
 
 
@@ -877,14 +879,14 @@ void jfif_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (jfif_file_format_properties_instance);
 #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_file_format_properties_instance = _tmp0_;
-#line 881 "JfifSupport.c"
+#line 883 "JfifSupport.c"
 }
 
 
 static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 888 "JfifSupport.c"
+#line 890 "JfifSupport.c"
 }
 
 
@@ -900,7 +902,7 @@ JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) {
 	result = _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 904 "JfifSupport.c"
+#line 906 "JfifSupport.c"
 }
 
 
@@ -913,7 +915,7 @@ static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFi
 	result = PHOTO_FILE_FORMAT_JFIF;
 #line 72 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 917 "JfifSupport.c"
+#line 919 "JfifSupport.c"
 }
 
 
@@ -926,7 +928,7 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 76 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 930 "JfifSupport.c"
+#line 932 "JfifSupport.c"
 }
 
 
@@ -942,7 +944,7 @@ static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileF
 	result = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 946 "JfifSupport.c"
+#line 948 "JfifSupport.c"
 }
 
 
@@ -958,28 +960,28 @@ static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileF
 	result = _tmp0_;
 #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 962 "JfifSupport.c"
+#line 964 "JfifSupport.c"
 }
 
 
-static gchar** _vala_array_dup8 (gchar** self, int length) {
+static gchar** _vala_array_dup6 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 973 "JfifSupport.c"
+#line 975 "JfifSupport.c"
 		gchar* _tmp0_;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result[i] = _tmp0_;
-#line 979 "JfifSupport.c"
+#line 981 "JfifSupport.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 983 "JfifSupport.c"
+#line 985 "JfifSupport.c"
 }
 
 
@@ -999,7 +1001,7 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0__length1 = jfif_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1010,13 +1012,13 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF
 	if (result_length1) {
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1014 "JfifSupport.c"
+#line 1016 "JfifSupport.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp2_;
 #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1020 "JfifSupport.c"
+#line 1022 "JfifSupport.c"
 }
 
 
@@ -1041,28 +1043,28 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF
 	result = _tmp2_;
 #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1045 "JfifSupport.c"
+#line 1047 "JfifSupport.c"
 }
 
 
-static gchar** _vala_array_dup9 (gchar** self, int length) {
+static gchar** _vala_array_dup7 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1056 "JfifSupport.c"
+#line 1058 "JfifSupport.c"
 		gchar* _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result[i] = _tmp0_;
-#line 1062 "JfifSupport.c"
+#line 1064 "JfifSupport.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1066 "JfifSupport.c"
+#line 1068 "JfifSupport.c"
 }
 
 
@@ -1082,7 +1084,7 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp0__length1 = jfif_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1093,13 +1095,13 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP
 	if (result_length1) {
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1097 "JfifSupport.c"
+#line 1099 "JfifSupport.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp2_;
 #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1103 "JfifSupport.c"
+#line 1105 "JfifSupport.c"
 }
 
 
@@ -1109,14 +1111,14 @@ JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_ty
 	self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1113 "JfifSupport.c"
+#line 1115 "JfifSupport.c"
 }
 
 
 JfifFileFormatProperties* jfif_file_format_properties_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_file_format_properties_construct (TYPE_JFIF_FILE_FORMAT_PROPERTIES);
-#line 1120 "JfifSupport.c"
+#line 1122 "JfifSupport.c"
 }
 
 
@@ -1178,7 +1180,7 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas
 	jfif_file_format_properties_KNOWN_MIME_TYPES = _tmp6_;
 #line 57 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_file_format_properties_KNOWN_MIME_TYPES_length1 = 1;
-#line 1182 "JfifSupport.c"
+#line 1184 "JfifSupport.c"
 }
 
 
@@ -1192,7 +1194,7 @@ static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * ob
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (jfif_file_format_properties_parent_class)->finalize (obj);
-#line 1196 "JfifSupport.c"
+#line 1198 "JfifSupport.c"
 }
 
 
@@ -1222,21 +1224,21 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn
 	self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1226 "JfifSupport.c"
+#line 1228 "JfifSupport.c"
 }
 
 
 JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_sniffer_construct (TYPE_JFIF_SNIFFER, file, options);
-#line 1233 "JfifSupport.c"
+#line 1235 "JfifSupport.c"
 }
 
 
 static gpointer _detected_photo_information_ref0 (gpointer self) {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self ? detected_photo_information_ref (self) : NULL;
-#line 1240 "JfifSupport.c"
+#line 1242 "JfifSupport.c"
 }
 
 
@@ -1272,7 +1274,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		g_propagate_error (error, _inner_error_);
 #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return NULL;
-#line 1276 "JfifSupport.c"
+#line 1278 "JfifSupport.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (!_tmp0_) {
@@ -1282,11 +1284,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		if (is_corrupted) {
 #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1286 "JfifSupport.c"
+#line 1288 "JfifSupport.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1290 "JfifSupport.c"
+#line 1292 "JfifSupport.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (jfif_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1300,7 +1302,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		g_propagate_error (error, _inner_error_);
 #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return NULL;
-#line 1304 "JfifSupport.c"
+#line 1306 "JfifSupport.c"
 	}
 #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp5_ = detected;
@@ -1314,11 +1316,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 		if (is_corrupted) {
 #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*is_corrupted = _vala_is_corrupted;
-#line 1318 "JfifSupport.c"
+#line 1320 "JfifSupport.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1322 "JfifSupport.c"
+#line 1324 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp7_ = detected;
@@ -1326,17 +1328,17 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 	_tmp8_ = _tmp7_->file_format;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 1330 "JfifSupport.c"
+#line 1332 "JfifSupport.c"
 		DetectedPhotoInformation* _tmp9_;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp9_ = detected;
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 1336 "JfifSupport.c"
+#line 1338 "JfifSupport.c"
 	} else {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp6_ = NULL;
-#line 1340 "JfifSupport.c"
+#line 1342 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1348,11 +1350,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base
 	if (is_corrupted) {
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 1352 "JfifSupport.c"
+#line 1354 "JfifSupport.c"
 	}
 #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1356 "JfifSupport.c"
+#line 1358 "JfifSupport.c"
 }
 
 
@@ -1361,7 +1363,7 @@ static void jfif_sniffer_class_init (JfifSnifferClass * klass) {
 	jfif_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) jfif_sniffer_real_sniff;
-#line 1365 "JfifSupport.c"
+#line 1367 "JfifSupport.c"
 }
 
 
@@ -1392,21 +1394,21 @@ JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) {
 	self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1396 "JfifSupport.c"
+#line 1398 "JfifSupport.c"
 }
 
 
 JfifReader* jfif_reader_new (const gchar* filepath) {
 #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_reader_construct (TYPE_JFIF_READER, filepath);
-#line 1403 "JfifSupport.c"
+#line 1405 "JfifSupport.c"
 }
 
 
 static void jfif_reader_class_init (JfifReaderClass * klass) {
 #line 120 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	jfif_reader_parent_class = g_type_class_peek_parent (klass);
-#line 1410 "JfifSupport.c"
+#line 1412 "JfifSupport.c"
 }
 
 
@@ -1437,14 +1439,14 @@ JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) {
 	self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1441 "JfifSupport.c"
+#line 1443 "JfifSupport.c"
 }
 
 
 JfifWriter* jfif_writer_new (const gchar* filepath) {
 #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_writer_construct (TYPE_JFIF_WRITER, filepath);
-#line 1448 "JfifSupport.c"
+#line 1450 "JfifSupport.c"
 }
 
 
@@ -1485,7 +1487,7 @@ static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jp
 		g_propagate_error (error, _inner_error_);
 #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return;
-#line 1489 "JfifSupport.c"
+#line 1491 "JfifSupport.c"
 	}
 }
 
@@ -1495,7 +1497,7 @@ static void jfif_writer_class_init (JfifWriterClass * klass) {
 	jfif_writer_parent_class = g_type_class_peek_parent (klass);
 #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write;
-#line 1499 "JfifSupport.c"
+#line 1501 "JfifSupport.c"
 }
 
 
@@ -1526,14 +1528,14 @@ JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gch
 	self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF);
 #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return self;
-#line 1530 "JfifSupport.c"
+#line 1532 "JfifSupport.c"
 }
 
 
 JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) {
 #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return jfif_metadata_writer_construct (TYPE_JFIF_METADATA_WRITER, filepath);
-#line 1537 "JfifSupport.c"
+#line 1539 "JfifSupport.c"
 }
 
 
@@ -1563,7 +1565,7 @@ static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* b
 		g_propagate_error (error, _inner_error_);
 #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return;
-#line 1567 "JfifSupport.c"
+#line 1569 "JfifSupport.c"
 	}
 }
 
@@ -1573,7 +1575,7 @@ static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) {
 	jfif_metadata_writer_parent_class = g_type_class_peek_parent (klass);
 #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata;
-#line 1577 "JfifSupport.c"
+#line 1579 "JfifSupport.c"
 }
 
 
@@ -1599,7 +1601,7 @@ guint8 jpeg_marker_get_byte (JpegMarker self) {
 	result = (guint8) self;
 #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1603 "JfifSupport.c"
+#line 1605 "JfifSupport.c"
 }
 
 
@@ -1621,7 +1623,7 @@ gint jpeg_quality_get_pct (JpegQuality self) {
 	result = (gint) self;
 #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1625 "JfifSupport.c"
+#line 1627 "JfifSupport.c"
 }
 
 
@@ -1634,7 +1636,7 @@ gchar* jpeg_quality_get_pct_text (JpegQuality self) {
 	result = _tmp0_;
 #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1638 "JfifSupport.c"
+#line 1640 "JfifSupport.c"
 }
 
 
@@ -1661,13 +1663,13 @@ JpegQuality* jpeg_quality_get_all (int* result_length1) {
 	if (result_length1) {
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 1665 "JfifSupport.c"
+#line 1667 "JfifSupport.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	result = _tmp1_;
 #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1671 "JfifSupport.c"
+#line 1673 "JfifSupport.c"
 }
 
 
@@ -1677,7 +1679,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 	switch (self) {
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_LOW:
-#line 1681 "JfifSupport.c"
+#line 1683 "JfifSupport.c"
 		{
 			gchar* _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1686,11 +1688,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 			result = _tmp0_;
 #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1690 "JfifSupport.c"
+#line 1692 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_MEDIUM:
-#line 1694 "JfifSupport.c"
+#line 1696 "JfifSupport.c"
 		{
 			gchar* _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1699,11 +1701,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 			result = _tmp1_;
 #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1703 "JfifSupport.c"
+#line 1705 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_HIGH:
-#line 1707 "JfifSupport.c"
+#line 1709 "JfifSupport.c"
 		{
 			gchar* _tmp2_;
 #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1712,11 +1714,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 			result = _tmp2_;
 #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1716 "JfifSupport.c"
+#line 1718 "JfifSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		case JPEG_QUALITY_MAXIMUM:
-#line 1720 "JfifSupport.c"
+#line 1722 "JfifSupport.c"
 		{
 			gchar* _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1725,12 +1727,12 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 			result = _tmp3_;
 #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			return result;
-#line 1729 "JfifSupport.c"
+#line 1731 "JfifSupport.c"
 		}
 		default:
 #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		break;
-#line 1734 "JfifSupport.c"
+#line 1736 "JfifSupport.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_warn_if_reached ();
@@ -1738,7 +1740,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) {
 	result = NULL;
 #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1742 "JfifSupport.c"
+#line 1744 "JfifSupport.c"
 }
 
 
@@ -1759,13 +1761,9 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	GFileInputStream* fins = NULL;
 	GFile* _tmp0_;
 	GFileInputStream* _tmp1_;
-	JpegMarker marker = 0;
-	gint segment_length = 0;
-	GFileInputStream* _tmp3_;
-	JpegMarker _tmp4_ = 0;
-	gint _tmp5_;
-	gboolean _tmp7_ = FALSE;
-	JpegMarker _tmp8_;
+	gboolean _tmp3_ = FALSE;
+	GFileInputStream* _tmp4_;
+	gboolean _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1777,65 +1775,136 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
 	fins = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1781 "JfifSupport.c"
+#line 1779 "JfifSupport.c"
 		gboolean _tmp2_ = FALSE;
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp2_;
-#line 1787 "JfifSupport.c"
+#line 1785 "JfifSupport.c"
 	}
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp3_ = fins;
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp5_ = jpeg_read_marker (_tmp3_, &_tmp4_, &_inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	marker = _tmp4_;
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	segment_length = _tmp5_;
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp4_ = fins;
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp5_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), &_inner_error_);
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp3_ = _tmp5_;
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1799 "JfifSupport.c"
+#line 1795 "JfifSupport.c"
 		gboolean _tmp6_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (fins);
-#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp6_;
-#line 1807 "JfifSupport.c"
+#line 1803 "JfifSupport.c"
 	}
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	result = _tmp3_;
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_g_object_unref0 (fins);
+#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	return result;
+#line 1811 "JfifSupport.c"
+}
+
+
+gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error) {
+	gboolean result = FALSE;
+	JpegMarker marker = 0;
+	gint segment_length = 0;
+	GInputStream* _tmp0_;
+	JpegMarker _tmp1_ = 0;
+	gint _tmp2_;
+	gboolean _tmp4_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 208 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	g_return_val_if_fail (G_IS_INPUT_STREAM (ins), FALSE);
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp8_ = marker;
-#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (_tmp8_ == JPEG_MARKER_SOI) {
-#line 1813 "JfifSupport.c"
-		gint _tmp9_;
+	_tmp0_ = ins;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp9_ = segment_length;
+	_tmp2_ = jpeg_read_marker (_tmp0_, &_tmp1_, &_inner_error_);
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp7_ = _tmp9_ == 0;
-#line 1819 "JfifSupport.c"
-	} else {
+	marker = _tmp1_;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp7_ = FALSE;
-#line 1823 "JfifSupport.c"
-	}
+	segment_length = _tmp2_;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	result = _tmp7_;
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1836 "JfifSupport.c"
+		gboolean _tmp3_ = FALSE;
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_g_object_unref0 (fins);
+		g_propagate_error (error, _inner_error_);
 #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		return _tmp3_;
+#line 1842 "JfifSupport.c"
+	}
+#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	if (marker == JPEG_MARKER_SOI) {
+#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp4_ = segment_length == 0;
+#line 1848 "JfifSupport.c"
+	} else {
+#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp4_ = FALSE;
+#line 1852 "JfifSupport.c"
+	}
+#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	result = _tmp4_;
+#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	return result;
+#line 1858 "JfifSupport.c"
+}
+
+
+gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error) {
+	gboolean result = FALSE;
+	GMemoryInputStream* mins = NULL;
+	GBytes* _tmp0_;
+	GMemoryInputStream* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_;
+	GError * _inner_error_ = NULL;
+#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	g_return_val_if_fail (bytes != NULL, FALSE);
+#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp0_ = bytes;
+#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp1_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp0_);
+#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	mins = _tmp1_;
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp3_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), &_inner_error_);
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp2_ = _tmp3_;
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1884 "JfifSupport.c"
+		gboolean _tmp4_ = FALSE;
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		g_propagate_error (error, _inner_error_);
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_g_object_unref0 (mins);
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		return _tmp4_;
+#line 1892 "JfifSupport.c"
+	}
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	result = _tmp2_;
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_g_object_unref0 (mins);
+#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 1831 "JfifSupport.c"
+#line 1900 "JfifSupport.c"
 }
 
 
-gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** error) {
+gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) {
 	JpegMarker _vala_marker = 0;
 	gint result = 0;
 	GDataInputStream* dins = NULL;
-	GFileInputStream* _tmp0_;
+	GInputStream* _tmp0_;
 	GDataInputStream* _tmp1_;
 	GDataInputStream* _tmp2_;
 	guint8 _tmp3_ = 0U;
@@ -1849,171 +1918,186 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
 	guint16 length = 0U;
 	GDataInputStream* _tmp14_;
 	guint16 _tmp15_;
-	guint16 _tmp17_;
-	guint16 _tmp21_;
+	gboolean _tmp17_ = FALSE;
+	guint16 _tmp18_;
+	guint16 _tmp23_;
 	GError * _inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	g_return_val_if_fail (G_IS_FILE_INPUT_STREAM (fins), 0);
-#line 214 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	g_return_val_if_fail (G_IS_INPUT_STREAM (fins), 0);
+#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_vala_marker = JPEG_MARKER_INVALID;
-#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 225 "/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_input_stream_get_type (), GInputStream));
-#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp1_ = g_data_input_stream_new (_tmp0_);
+#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	dins = _tmp1_;
-#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp2_ = dins;
-#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	g_data_input_stream_set_byte_order (_tmp2_, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN);
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp4_ = dins;
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp5_ = g_data_input_stream_read_byte (_tmp4_, NULL, &_inner_error_);
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp3_ = _tmp5_;
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1878 "JfifSupport.c"
+#line 1948 "JfifSupport.c"
 		gint _tmp6_ = 0;
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp6_;
-#line 1886 "JfifSupport.c"
+#line 1956 "JfifSupport.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp3_ != JPEG_MARKER_PREFIX) {
-#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result = -1;
-#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		if (marker) {
-#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 1898 "JfifSupport.c"
+#line 1968 "JfifSupport.c"
 		}
-#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1902 "JfifSupport.c"
+#line 1972 "JfifSupport.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp8_ = dins;
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_);
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp7_ = _tmp9_;
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1912 "JfifSupport.c"
+#line 1982 "JfifSupport.c"
 		gint _tmp10_ = 0;
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp10_;
-#line 1920 "JfifSupport.c"
+#line 1990 "JfifSupport.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_vala_marker = (JpegMarker) _tmp7_;
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp12_ = _vala_marker;
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp12_ == JPEG_MARKER_SOI) {
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp11_ = TRUE;
-#line 1930 "JfifSupport.c"
+#line 2000 "JfifSupport.c"
 	} else {
 		JpegMarker _tmp13_;
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp13_ = _vala_marker;
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp11_ = _tmp13_ == JPEG_MARKER_EOI;
-#line 1937 "JfifSupport.c"
+#line 2007 "JfifSupport.c"
 	}
-#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (_tmp11_) {
-#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result = 0;
-#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		if (marker) {
-#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 1949 "JfifSupport.c"
+#line 2019 "JfifSupport.c"
 		}
-#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 1953 "JfifSupport.c"
+#line 2023 "JfifSupport.c"
 	}
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp14_ = dins;
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_);
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	length = _tmp15_;
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1963 "JfifSupport.c"
+#line 2033 "JfifSupport.c"
 		gint _tmp16_ = 0;
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return _tmp16_;
-#line 1971 "JfifSupport.c"
+#line 2041 "JfifSupport.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp17_ = length;
-#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	if (((gint) _tmp17_) < 2) {
-#line 1977 "JfifSupport.c"
-		guint16 _tmp18_;
-		GFileInputStream* _tmp19_;
-		gint64 _tmp20_;
-#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp18_ = length;
-#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp18_ = length;
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	if (((gint) _tmp18_) < 2) {
+#line 2047 "JfifSupport.c"
+		GInputStream* _tmp19_;
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_tmp19_ = fins;
-#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		_tmp20_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp19_)->tell (_tmp19_);
-#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-		g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp18_, _tmp20_ - 2);
-#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, g_seekable_get_type ());
+#line 2053 "JfifSupport.c"
+	} else {
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp17_ = FALSE;
+#line 2057 "JfifSupport.c"
+	}
+#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	if (_tmp17_) {
+#line 2061 "JfifSupport.c"
+		guint16 _tmp20_;
+		GInputStream* _tmp21_;
+		gint64 _tmp22_;
+#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp20_ = length;
+#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp21_ = fins;
+#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		_tmp22_ = g_seekable_tell (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, g_seekable_get_type ()) ? ((GSeekable*) _tmp21_) : NULL);
+#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+		g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp20_, _tmp22_ - 2);
+#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		result = -1;
-#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		_g_object_unref0 (dins);
-#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		if (marker) {
-#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 			*marker = _vala_marker;
-#line 1997 "JfifSupport.c"
+#line 2081 "JfifSupport.c"
 		}
-#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		return result;
-#line 2001 "JfifSupport.c"
+#line 2085 "JfifSupport.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	_tmp21_ = length;
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
-	result = _tmp21_ - 2;
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	_tmp23_ = length;
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+	result = _tmp23_ - 2;
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	_g_object_unref0 (dins);
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	if (marker) {
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 		*marker = _vala_marker;
-#line 2013 "JfifSupport.c"
+#line 2097 "JfifSupport.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
 	return result;
-#line 2017 "JfifSupport.c"
+#line 2101 "JfifSupport.c"
 }
 
 
diff --git a/src/photos/JfifSupport.vala b/src/photos/JfifSupport.vala
index 2861353..5ea64a5 100644
--- a/src/photos/JfifSupport.vala
+++ b/src/photos/JfifSupport.vala
@@ -201,16 +201,25 @@ namespace Jpeg {
     }
     
     public bool is_jpeg(File file) throws Error {
-        FileInputStream fins = file.read(null);
-        
+        var fins = file.read(null);
+        return is_jpeg_stream(fins);
+    }
+
+    public bool is_jpeg_stream(InputStream ins) throws Error {
         Marker marker;
-        int segment_length = read_marker(fins, out marker);
+        int segment_length = read_marker(ins, out marker);
         
         // for now, merely checking for SOI
         return (marker == Marker.SOI) && (segment_length == 0);
     }
 
-    private int read_marker(FileInputStream fins, out Jpeg.Marker marker) throws Error {
+    public bool is_jpeg_bytes(Bytes bytes) throws Error {
+        var mins = new MemoryInputStream.from_bytes(bytes);
+
+        return is_jpeg_stream(mins);
+    }
+
+    private int read_marker(InputStream fins, out Jpeg.Marker marker) throws Error {
         marker = Jpeg.Marker.INVALID;
         
         DataInputStream dins = new DataInputStream(fins);
@@ -226,8 +235,9 @@ namespace Jpeg {
         }
         
         uint16 length = dins.read_uint16();
-        if (length < 2) {
-            debug("Invalid length %Xh at ofs %" + int64.FORMAT + "Xh", length, fins.tell() - 2);
+        if (length < 2 && fins is Seekable) {
+            debug("Invalid length %Xh at ofs %" + int64.FORMAT + "Xh", length,
+                    (fins as Seekable).tell() - 2);
             
             return -1;
         }
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 6ec6ea2..4f46fdc 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -386,7 +386,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_result_ = _tmp5_;
 #line 388 "PhotoFileAdapter.c"
 		}
-		__finally24:
+		__finally28:
 		{
 			GFile* _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index a6cb235..604499f 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -263,22 +263,22 @@ GQuark photo_format_error_quark (void);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1);
 PhotoFileFormat* photo_file_format_get_supported (int* result_length1);
-static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value);
+static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value);
 PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1);
 static gboolean ___lambda4_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write (PhotoFileFormat self);
 static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
-static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length);
+static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1);
-static gboolean ___lambda24_ (PhotoFileFormat format);
+static gboolean ___lambda26_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_image (PhotoFileFormat self);
-static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
-static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length);
+static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1);
-static gboolean ___lambda25_ (PhotoFileFormat format);
+static gboolean ___lambda27_ (PhotoFileFormat format);
 gboolean photo_file_format_can_write_metadata (PhotoFileFormat self);
-static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
-static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length);
+static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length);
 PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1);
 PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1);
@@ -373,7 +373,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper
 gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1);
 gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1);
 gchar** photo_file_format_get_editable_mime_types (int* result_length1);
-static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value);
 enum  {
 	PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY
 };
@@ -416,7 +416,7 @@ GQuark photo_format_error_quark (void) {
 }
 
 
-static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) {
+static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -494,7 +494,7 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 					_tmp7_ = format;
 #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-					_vala_array_add43 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_);
+					_vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_);
 #line 499 "PhotoFileFormat.c"
 				}
 			}
@@ -546,7 +546,7 @@ static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFo
 }
 
 
-static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length) {
+static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) {
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return g_memdup (self, length * sizeof (PhotoFileFormat));
 #line 553 "PhotoFileFormat.c"
@@ -589,7 +589,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp3__length1 = photo_file_format_data_writeable_length1;
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup1 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
+	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup2 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp4__length1 = _tmp3__length1;
 #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -610,7 +610,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
 }
 
 
-static gboolean ___lambda24_ (PhotoFileFormat format) {
+static gboolean ___lambda26_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
 	PhotoFileFormat _tmp0_;
 	gboolean _tmp1_;
@@ -626,16 +626,16 @@ static gboolean ___lambda24_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda24_ (format);
+	result = ___lambda26_ (format);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 635 "PhotoFileFormat.c"
 }
 
 
-static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) {
+static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) {
 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return g_memdup (self, length * sizeof (PhotoFileFormat));
 #line 642 "PhotoFileFormat.c"
@@ -662,7 +662,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 		gint _tmp1_;
 		PhotoFileFormat* _tmp2_;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda26__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL);
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -678,7 +678,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp3__length1 = photo_file_format_data_image_writeable_length1;
 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup2 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
+	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup3 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp4__length1 = _tmp3__length1;
 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -699,7 +699,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
 }
 
 
-static gboolean ___lambda25_ (PhotoFileFormat format) {
+static gboolean ___lambda27_ (PhotoFileFormat format) {
 	gboolean result = FALSE;
 	PhotoFileFormat _tmp0_;
 	gboolean _tmp1_;
@@ -715,16 +715,16 @@ static gboolean ___lambda25_ (PhotoFileFormat format) {
 }
 
 
-static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
 	gboolean result;
-	result = ___lambda25_ (format);
+	result = ___lambda27_ (format);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return result;
 #line 724 "PhotoFileFormat.c"
 }
 
 
-static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) {
+static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length) {
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	return g_memdup (self, length * sizeof (PhotoFileFormat));
 #line 731 "PhotoFileFormat.c"
@@ -751,7 +751,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 		gint _tmp1_;
 		PhotoFileFormat* _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-		_tmp2_ = photo_file_format_data_find_applicable (____lambda25__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+		_tmp2_ = photo_file_format_data_find_applicable (____lambda27__photo_file_format_data_applicable_test, NULL, &_tmp1_);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 		photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL);
 #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -767,7 +767,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp3__length1 = photo_file_format_data_metadata_writeable_length1;
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup3 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
+	_tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup4 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_);
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	_tmp4__length1 = _tmp3__length1;
 #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2122,7 +2122,7 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng
 }
 
 
-static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 	if ((*length) == (*size)) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2218,7 +2218,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) {
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 							_tmp9_ = g_strdup (_tmp8_);
 #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
-							_vala_array_add44 (&mime_types, &mime_types_length1, &_mime_types_size_, _tmp9_);
+							_vala_array_add47 (&mime_types, &mime_types_length1, &_mime_types_size_, _tmp9_);
 #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
 							_g_free0 (mime_type);
 #line 2225 "PhotoFileFormat.c"
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 9950bc1..144f24a 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -105,6 +105,7 @@ typedef struct _PhotoPreviewPrivate PhotoPreviewPrivate;
 
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
+#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL)))
 typedef struct _ParamSpecPhotoPreview ParamSpecPhotoPreview;
 
 #define TYPE_MEDIA_METADATA (media_metadata_get_type ())
@@ -154,6 +155,7 @@ typedef struct _Block4Data Block4Data;
 #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL)))
 typedef struct _Block5Data Block5Data;
 #define _exif_mem_unref0(var) ((var == NULL) ? NULL : (var = (exif_mem_unref (var), NULL)))
+#define _g_checksum_free0(var) ((var == NULL) ? NULL : (var = (g_checksum_free (var), NULL)))
 
 #define PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW (photo_metadata_internal_photo_preview_get_type ())
 #define PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview))
@@ -266,7 +268,7 @@ struct _PhotoPreview {
 struct _PhotoPreviewClass {
 	GTypeClass parent_class;
 	void (*finalize) (PhotoPreview *self);
-	guint8* (*flatten) (PhotoPreview* self, int* result_length1, GError** error);
+	GBytes* (*flatten) (PhotoPreview* self, GError** error);
 	GdkPixbuf* (*get_pixbuf) (PhotoPreview* self, GError** error);
 };
 
@@ -315,6 +317,8 @@ struct _PhotoMetadataPrivate {
 	GExiv2Metadata* exiv2;
 	ExifData* exif;
 	gchar* source_name;
+	gchar* metadata_hash;
+	gchar* thumbnail_md5;
 };
 
 typedef enum  {
@@ -549,11 +553,10 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
 guint32 photo_preview_get_size (PhotoPreview* self);
 gchar* photo_preview_get_mime_type (PhotoPreview* self);
 gchar* photo_preview_get_extension (PhotoPreview* self);
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error);
-static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_length1, GError** error);
+GBytes* photo_preview_flatten (PhotoPreview* self, GError** error);
+static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error);
 GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error);
 static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error);
-static guint8* _vala_array_dup4 (guint8* self, int length);
 static void photo_preview_finalize (PhotoPreview * obj);
 gpointer media_metadata_ref (gpointer instance);
 void media_metadata_unref (gpointer instance);
@@ -584,7 +587,7 @@ MediaMetadata* media_metadata_construct (GType object_type);
 static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error);
 void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error);
 void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error);
-void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error);
+void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error);
 MetadataDomain photo_metadata_get_tag_domain (const gchar* tag);
 gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain);
 gboolean photo_metadata_has_exif (PhotoMetadata* self);
@@ -616,8 +619,8 @@ static void block1_data_unref (void * _userdata_);
 static void __lambda5_ (Block1Data* _data1_, const gchar* tag);
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self);
 void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection);
-static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value);
 void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option);
 static Block2Data* block2_data_ref (Block2Data* _data2_);
 static void block2_data_unref (void * _userdata_);
@@ -660,9 +663,8 @@ static Block5Data* block5_data_ref (Block5Data* _data5_);
 static void block5_data_unref (void * _userdata_);
 static void __lambda9_ (Block5Data* _data5_, const gchar* tag);
 static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
-static guint8* _vala_array_dup5 (guint8* self, int length);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
 guint photo_metadata_get_preview_count (PhotoMetadata* self);
 PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number);
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props);
@@ -745,8 +747,7 @@ gint rating_serialize (Rating self);
 enum  {
 	PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW_DUMMY_PROPERTY
 };
-static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error);
-static guint8* _vala_array_dup6 (guint8* self, int length);
+static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error);
 static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj);
 static void photo_metadata_finalize (MediaMetadata * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -772,7 +773,7 @@ static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, co
 	g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 776 "PhotoMetadata.c"
+#line 777 "PhotoMetadata.c"
 }
 
 
@@ -781,7 +782,7 @@ GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* i
 	g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error);
-#line 785 "PhotoMetadata.c"
+#line 786 "PhotoMetadata.c"
 }
 
 
@@ -791,14 +792,14 @@ KeywordTransformer* keyword_transformer_construct (GType object_type) {
 	self = (KeywordTransformer*) g_type_create_instance (object_type);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 795 "PhotoMetadata.c"
+#line 796 "PhotoMetadata.c"
 }
 
 
 static void value_keyword_transformer_init (GValue* value) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 802 "PhotoMetadata.c"
+#line 803 "PhotoMetadata.c"
 }
 
 
@@ -807,7 +808,7 @@ static void value_keyword_transformer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		keyword_transformer_unref (value->data[0].v_pointer);
-#line 811 "PhotoMetadata.c"
+#line 812 "PhotoMetadata.c"
 	}
 }
 
@@ -817,11 +818,11 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer);
-#line 821 "PhotoMetadata.c"
+#line 822 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 825 "PhotoMetadata.c"
+#line 826 "PhotoMetadata.c"
 	}
 }
 
@@ -829,37 +830,37 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu
 static gpointer value_keyword_transformer_peek_pointer (const GValue* value) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 833 "PhotoMetadata.c"
+#line 834 "PhotoMetadata.c"
 }
 
 
 static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 840 "PhotoMetadata.c"
+#line 841 "PhotoMetadata.c"
 		KeywordTransformer * object;
 		object = collect_values[0].v_pointer;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 847 "PhotoMetadata.c"
+#line 848 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 851 "PhotoMetadata.c"
+#line 852 "PhotoMetadata.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = keyword_transformer_ref (object);
-#line 855 "PhotoMetadata.c"
+#line 856 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 859 "PhotoMetadata.c"
+#line 860 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 863 "PhotoMetadata.c"
+#line 864 "PhotoMetadata.c"
 }
 
 
@@ -870,25 +871,25 @@ static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 874 "PhotoMetadata.c"
+#line 875 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 880 "PhotoMetadata.c"
+#line 881 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 884 "PhotoMetadata.c"
+#line 885 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = keyword_transformer_ref (value->data[0].v_pointer);
-#line 888 "PhotoMetadata.c"
+#line 889 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 892 "PhotoMetadata.c"
+#line 893 "PhotoMetadata.c"
 }
 
 
@@ -902,7 +903,7 @@ GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 906 "PhotoMetadata.c"
+#line 907 "PhotoMetadata.c"
 }
 
 
@@ -911,7 +912,7 @@ gpointer value_get_keyword_transformer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 915 "PhotoMetadata.c"
+#line 916 "PhotoMetadata.c"
 }
 
 
@@ -931,17 +932,17 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		keyword_transformer_ref (value->data[0].v_pointer);
-#line 935 "PhotoMetadata.c"
+#line 936 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 939 "PhotoMetadata.c"
+#line 940 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		keyword_transformer_unref (old);
-#line 945 "PhotoMetadata.c"
+#line 946 "PhotoMetadata.c"
 	}
 }
 
@@ -960,17 +961,17 @@ void value_take_keyword_transformer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 964 "PhotoMetadata.c"
+#line 965 "PhotoMetadata.c"
 	} else {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 968 "PhotoMetadata.c"
+#line 969 "PhotoMetadata.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		keyword_transformer_unref (old);
-#line 974 "PhotoMetadata.c"
+#line 975 "PhotoMetadata.c"
 	}
 }
 
@@ -982,14 +983,14 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) {
 	((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) keyword_transformer_real_transform;
-#line 986 "PhotoMetadata.c"
+#line 987 "PhotoMetadata.c"
 }
 
 
 static void keyword_transformer_instance_init (KeywordTransformer * self) {
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 993 "PhotoMetadata.c"
+#line 994 "PhotoMetadata.c"
 }
 
 
@@ -999,7 +1000,7 @@ static void keyword_transformer_finalize (KeywordTransformer * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_signal_handlers_destroy (self);
-#line 1003 "PhotoMetadata.c"
+#line 1004 "PhotoMetadata.c"
 }
 
 
@@ -1024,7 +1025,7 @@ gpointer keyword_transformer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 1028 "PhotoMetadata.c"
+#line 1029 "PhotoMetadata.c"
 }
 
 
@@ -1037,7 +1038,7 @@ void keyword_transformer_unref (gpointer instance) {
 		KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self);
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1041 "PhotoMetadata.c"
+#line 1042 "PhotoMetadata.c"
 	}
 }
 
@@ -1064,7 +1065,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas
 	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList);
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1068 "PhotoMetadata.c"
+#line 1069 "PhotoMetadata.c"
 }
 
 
@@ -1074,14 +1075,14 @@ NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) {
 	self = (NullKeywordTransformer*) keyword_transformer_construct (object_type);
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1078 "PhotoMetadata.c"
+#line 1079 "PhotoMetadata.c"
 }
 
 
 NullKeywordTransformer* null_keyword_transformer_new (void) {
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER);
-#line 1085 "PhotoMetadata.c"
+#line 1086 "PhotoMetadata.c"
 }
 
 
@@ -1090,7 +1091,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k
 	null_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) null_keyword_transformer_real_transform;
-#line 1094 "PhotoMetadata.c"
+#line 1095 "PhotoMetadata.c"
 }
 
 
@@ -1113,28 +1114,28 @@ GType null_keyword_transformer_get_type (void) {
 static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) {
 #line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error);
-#line 1117 "PhotoMetadata.c"
+#line 1118 "PhotoMetadata.c"
 }
 
 
 static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) {
 #line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error);
-#line 1124 "PhotoMetadata.c"
+#line 1125 "PhotoMetadata.c"
 }
 
 
 static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) {
 #line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error);
-#line 1131 "PhotoMetadata.c"
+#line 1132 "PhotoMetadata.c"
 }
 
 
 static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) {
 #line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_);
-#line 1138 "PhotoMetadata.c"
+#line 1139 "PhotoMetadata.c"
 }
 
 
@@ -1168,21 +1169,21 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty
 	self->priv->stack = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1172 "PhotoMetadata.c"
+#line 1173 "PhotoMetadata.c"
 }
 
 
 ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) {
 #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER);
-#line 1179 "PhotoMetadata.c"
+#line 1180 "PhotoMetadata.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1186 "PhotoMetadata.c"
+#line 1187 "PhotoMetadata.c"
 }
 
 
@@ -1227,7 +1228,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
 		_g_markup_parse_context_unref0 (ctx);
 #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return NULL;
-#line 1231 "PhotoMetadata.c"
+#line 1232 "PhotoMetadata.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = self->priv->result;
@@ -1239,7 +1240,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
 	_g_markup_parse_context_unref0 (ctx);
 #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1243 "PhotoMetadata.c"
+#line 1244 "PhotoMetadata.c"
 }
 
 
@@ -1266,7 +1267,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
 	if (g_strcmp0 (_tmp0_, "Categories") == 0) {
 #line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1270 "PhotoMetadata.c"
+#line 1271 "PhotoMetadata.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = name;
@@ -1274,7 +1275,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
 	if (g_strcmp0 (_tmp1_, "Category") != 0) {
 #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1278 "PhotoMetadata.c"
+#line 1279 "PhotoMetadata.c"
 	}
 #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = name;
@@ -1296,7 +1297,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
 			g_propagate_error (error, _inner_error_);
 #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return;
-#line 1300 "PhotoMetadata.c"
+#line 1301 "PhotoMetadata.c"
 		} else {
 #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1304,7 +1305,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
 			g_clear_error (&_inner_error_);
 #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return;
-#line 1308 "PhotoMetadata.c"
+#line 1309 "PhotoMetadata.c"
 		}
 	}
 }
@@ -1322,7 +1323,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
 	_tmp0_ = name;
 #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_strcmp0 (_tmp0_, "Category") == 0) {
-#line 1326 "PhotoMetadata.c"
+#line 1327 "PhotoMetadata.c"
 		GeeArrayQueue* _tmp1_;
 		gpointer _tmp2_;
 		gchar* _tmp3_;
@@ -1334,7 +1335,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
 		_tmp3_ = (gchar*) _tmp2_;
 #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp3_);
-#line 1338 "PhotoMetadata.c"
+#line 1339 "PhotoMetadata.c"
 	}
 }
 
@@ -1356,7 +1357,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 	if (g_strcmp0 (_tmp0_, "") == 0) {
 #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1360 "PhotoMetadata.c"
+#line 1361 "PhotoMetadata.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->stack;
@@ -1368,7 +1369,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 	_tmp3_ = self->priv->assigned;
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 1372 "PhotoMetadata.c"
+#line 1373 "PhotoMetadata.c"
 		GString* builder = NULL;
 		GString* _tmp4_;
 		GString* _tmp13_;
@@ -1380,7 +1381,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 		_tmp4_ = g_string_new ("");
 #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		builder = _tmp4_;
-#line 1384 "PhotoMetadata.c"
+#line 1385 "PhotoMetadata.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeArrayQueue* _tmp5_;
@@ -1393,7 +1394,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 			_f_it = _tmp6_;
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 1397 "PhotoMetadata.c"
+#line 1398 "PhotoMetadata.c"
 				GeeIterator* _tmp7_;
 				gboolean _tmp8_;
 				gchar* f = NULL;
@@ -1409,7 +1410,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 				if (!_tmp8_) {
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 1413 "PhotoMetadata.c"
+#line 1414 "PhotoMetadata.c"
 				}
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = _f_it;
@@ -1425,11 +1426,11 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 				g_string_append_printf (_tmp11_, "%s|", _tmp12_);
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (f);
-#line 1429 "PhotoMetadata.c"
+#line 1430 "PhotoMetadata.c"
 			}
 #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_f_it);
-#line 1433 "PhotoMetadata.c"
+#line 1434 "PhotoMetadata.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = builder;
@@ -1437,7 +1438,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 		_tmp14_ = _tmp13_->len;
 #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp14_ > ((gssize) 0)) {
-#line 1441 "PhotoMetadata.c"
+#line 1442 "PhotoMetadata.c"
 			GString* _tmp15_;
 			GString* _tmp16_;
 			gssize _tmp17_;
@@ -1449,7 +1450,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 			_tmp17_ = _tmp16_->len;
 #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1));
-#line 1453 "PhotoMetadata.c"
+#line 1454 "PhotoMetadata.c"
 		}
 #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = self->priv->result;
@@ -1461,7 +1462,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
 #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_string_free0 (builder);
-#line 1465 "PhotoMetadata.c"
+#line 1466 "PhotoMetadata.c"
 	}
 }
 
@@ -1469,7 +1470,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
 static gpointer _g_error_copy0 (gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1473 "PhotoMetadata.c"
+#line 1474 "PhotoMetadata.c"
 }
 
 
@@ -1488,7 +1489,7 @@ static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self
 	_g_error_free0 (self->priv->error);
 #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->error = _tmp1_;
-#line 1492 "PhotoMetadata.c"
+#line 1493 "PhotoMetadata.c"
 }
 
 
@@ -1501,14 +1502,14 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas
 	g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate));
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
-#line 1505 "PhotoMetadata.c"
+#line 1506 "PhotoMetadata.c"
 }
 
 
 static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) {
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self);
-#line 1512 "PhotoMetadata.c"
+#line 1513 "PhotoMetadata.c"
 }
 
 
@@ -1524,7 +1525,7 @@ static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) {
 	_g_object_unref0 (self->priv->result);
 #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj);
-#line 1528 "PhotoMetadata.c"
+#line 1529 "PhotoMetadata.c"
 }
 
 
@@ -1543,7 +1544,7 @@ GType acd_see_keyword_transformer_get_type (void) {
 static gpointer _keyword_transformer_ref0 (gpointer self) {
 #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? keyword_transformer_ref (self) : NULL;
-#line 1547 "PhotoMetadata.c"
+#line 1548 "PhotoMetadata.c"
 }
 
 
@@ -1599,21 +1600,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ
 	self->transformer = _tmp7_;
 #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1603 "PhotoMetadata.c"
+#line 1604 "PhotoMetadata.c"
 }
 
 
 HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) {
 #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer);
-#line 1610 "PhotoMetadata.c"
+#line 1611 "PhotoMetadata.c"
 }
 
 
 static void value_hierarchical_keyword_field_init (GValue* value) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 1617 "PhotoMetadata.c"
+#line 1618 "PhotoMetadata.c"
 }
 
 
@@ -1622,7 +1623,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (value->data[0].v_pointer);
-#line 1626 "PhotoMetadata.c"
+#line 1627 "PhotoMetadata.c"
 	}
 }
 
@@ -1632,11 +1633,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer);
-#line 1636 "PhotoMetadata.c"
+#line 1637 "PhotoMetadata.c"
 	} else {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1640 "PhotoMetadata.c"
+#line 1641 "PhotoMetadata.c"
 	}
 }
 
@@ -1644,37 +1645,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
 static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1648 "PhotoMetadata.c"
+#line 1649 "PhotoMetadata.c"
 }
 
 
 static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 1655 "PhotoMetadata.c"
+#line 1656 "PhotoMetadata.c"
 		HierarchicalKeywordField * object;
 		object = collect_values[0].v_pointer;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1662 "PhotoMetadata.c"
+#line 1663 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 1666 "PhotoMetadata.c"
+#line 1667 "PhotoMetadata.c"
 		}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = hierarchical_keyword_field_ref (object);
-#line 1670 "PhotoMetadata.c"
+#line 1671 "PhotoMetadata.c"
 	} else {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1674 "PhotoMetadata.c"
+#line 1675 "PhotoMetadata.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1678 "PhotoMetadata.c"
+#line 1679 "PhotoMetadata.c"
 }
 
 
@@ -1685,25 +1686,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1689 "PhotoMetadata.c"
+#line 1690 "PhotoMetadata.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 1695 "PhotoMetadata.c"
+#line 1696 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1699 "PhotoMetadata.c"
+#line 1700 "PhotoMetadata.c"
 	} else {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 1703 "PhotoMetadata.c"
+#line 1704 "PhotoMetadata.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1707 "PhotoMetadata.c"
+#line 1708 "PhotoMetadata.c"
 }
 
 
@@ -1717,7 +1718,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 1721 "PhotoMetadata.c"
+#line 1722 "PhotoMetadata.c"
 }
 
 
@@ -1726,7 +1727,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1730 "PhotoMetadata.c"
+#line 1731 "PhotoMetadata.c"
 }
 
 
@@ -1746,17 +1747,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 1750 "PhotoMetadata.c"
+#line 1751 "PhotoMetadata.c"
 	} else {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1754 "PhotoMetadata.c"
+#line 1755 "PhotoMetadata.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 1760 "PhotoMetadata.c"
+#line 1761 "PhotoMetadata.c"
 	}
 }
 
@@ -1775,17 +1776,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 1779 "PhotoMetadata.c"
+#line 1780 "PhotoMetadata.c"
 	} else {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1783 "PhotoMetadata.c"
+#line 1784 "PhotoMetadata.c"
 	}
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 1789 "PhotoMetadata.c"
+#line 1790 "PhotoMetadata.c"
 	}
 }
 
@@ -1795,14 +1796,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass
 	hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass);
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize;
-#line 1799 "PhotoMetadata.c"
+#line 1800 "PhotoMetadata.c"
 }
 
 
 static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) {
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 1806 "PhotoMetadata.c"
+#line 1807 "PhotoMetadata.c"
 }
 
 
@@ -1818,7 +1819,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj)
 	_g_free0 (self->path_separator);
 #line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_keyword_transformer_unref0 (self->transformer);
-#line 1822 "PhotoMetadata.c"
+#line 1823 "PhotoMetadata.c"
 }
 
 
@@ -1843,7 +1844,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 1847 "PhotoMetadata.c"
+#line 1848 "PhotoMetadata.c"
 }
 
 
@@ -1856,7 +1857,7 @@ void hierarchical_keyword_field_unref (gpointer instance) {
 		HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self);
 #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1860 "PhotoMetadata.c"
+#line 1861 "PhotoMetadata.c"
 	}
 }
 
@@ -1915,7 +1916,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
 	self->priv->extension = _tmp7_;
 #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1919 "PhotoMetadata.c"
+#line 1920 "PhotoMetadata.c"
 }
 
 
@@ -1933,7 +1934,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
 	result = _tmp1_;
 #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1937 "PhotoMetadata.c"
+#line 1938 "PhotoMetadata.c"
 }
 
 
@@ -1947,7 +1948,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
 	*result = _tmp0_;
 #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return;
-#line 1951 "PhotoMetadata.c"
+#line 1952 "PhotoMetadata.c"
 }
 
 
@@ -1962,7 +1963,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) {
 	result = _tmp0_;
 #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1966 "PhotoMetadata.c"
+#line 1967 "PhotoMetadata.c"
 }
 
 
@@ -1980,7 +1981,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
 	result = _tmp1_;
 #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1984 "PhotoMetadata.c"
+#line 1985 "PhotoMetadata.c"
 }
 
 
@@ -1998,140 +1999,120 @@ gchar* photo_preview_get_extension (PhotoPreview* self) {
 	result = _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2002 "PhotoMetadata.c"
+#line 2003 "PhotoMetadata.c"
 }
 
 
-static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_length1, GError** error) {
+static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error) {
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 2011 "PhotoMetadata.c"
+#line 2012 "PhotoMetadata.c"
 }
 
 
-guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error) {
+GBytes* photo_preview_flatten (PhotoPreview* self, GError** error) {
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error);
-#line 2020 "PhotoMetadata.c"
-}
-
-
-static guint8* _vala_array_dup4 (guint8* self, int length) {
-#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 2027 "PhotoMetadata.c"
+	return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, error);
+#line 2021 "PhotoMetadata.c"
 }
 
 
 static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) {
 	GdkPixbuf* result = NULL;
-	guint8* flattened = NULL;
-	gint _tmp0_;
-	guint8* _tmp1_;
-	gint flattened_length1;
-	gint _flattened_size_;
+	GBytes* flattened = NULL;
+	GBytes* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp1_ = photo_preview_flatten (self, &_tmp0_, &_inner_error_);
+	_tmp0_ = photo_preview_flatten (self, &_inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	flattened = _tmp1_;
-#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	flattened_length1 = _tmp0_;
-#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_flattened_size_ = flattened_length1;
+	flattened = _tmp0_;
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
 #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return NULL;
-#line 2053 "PhotoMetadata.c"
+#line 2040 "PhotoMetadata.c"
 	}
 	{
-		GdkPixbuf* _tmp2_ = NULL;
-		guint8* _tmp3_;
-		gint _tmp3__length1;
-		GMemoryInputStream* _tmp4_;
-		GMemoryInputStream* _tmp5_;
+		GdkPixbuf* _tmp1_ = NULL;
+		GMemoryInputStream* _tmp2_;
+		GMemoryInputStream* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
 		GdkPixbuf* _tmp6_;
-		GdkPixbuf* _tmp7_;
-		GdkPixbuf* _tmp8_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp3_ = (flattened != NULL) ? _vala_array_dup4 (flattened, flattened_length1) : ((gpointer) flattened);
+		_tmp2_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (flattened);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp3__length1 = flattened_length1;
+		_tmp3_ = _tmp2_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp4_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp3_, _tmp3__length1, NULL);
+		_tmp4_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
 #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_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		_g_object_unref0 (_tmp3_);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp7_ = _tmp6_;
-#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_g_object_unref0 (_tmp5_);
-#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp2_ = _tmp7_;
+		_tmp1_ = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2082 "PhotoMetadata.c"
-			goto __catch25_g_error;
+#line 2063 "PhotoMetadata.c"
+			goto __catch29_g_error;
 		}
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp8_ = _tmp2_;
+		_tmp6_ = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp2_ = NULL;
+		_tmp1_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		result = _tmp8_;
+		result = _tmp6_;
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		flattened = (g_free (flattened), NULL);
+		_g_bytes_unref0 (flattened);
 #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2097 "PhotoMetadata.c"
+#line 2078 "PhotoMetadata.c"
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* err = NULL;
+		const gchar* _tmp7_;
+		GError* _tmp8_;
 		const gchar* _tmp9_;
-		GError* _tmp10_;
-		const gchar* _tmp11_;
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_inner_error_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp9_ = self->priv->name;
+		_tmp7_ = self->priv->name;
 #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp10_ = err;
+		_tmp8_ = err;
 #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp11_ = _tmp10_->message;
+		_tmp9_ = _tmp8_->message;
 #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:204: Unable to decode thumbnail for %s: %s", _tmp9_, _tmp11_);
+		g_warning ("PhotoMetadata.vala:204: Unable to decode thumbnail for %s: %s", _tmp7_, _tmp9_);
 #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
 #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_error_free0 (err);
 #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		flattened = (g_free (flattened), NULL);
+		_g_bytes_unref0 (flattened);
 #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2126 "PhotoMetadata.c"
+#line 2107 "PhotoMetadata.c"
 	}
-	__finally25:
+	__finally29:
 #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"
-	flattened = (g_free (flattened), NULL);
+	_g_bytes_unref0 (flattened);
 #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 2135 "PhotoMetadata.c"
+#line 2116 "PhotoMetadata.c"
 }
 
 
@@ -2140,14 +2121,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) {
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
 #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error);
-#line 2144 "PhotoMetadata.c"
+#line 2125 "PhotoMetadata.c"
 }
 
 
 static void value_photo_preview_init (GValue* value) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 2151 "PhotoMetadata.c"
+#line 2132 "PhotoMetadata.c"
 }
 
 
@@ -2156,7 +2137,7 @@ static void value_photo_preview_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (value->data[0].v_pointer);
-#line 2160 "PhotoMetadata.c"
+#line 2141 "PhotoMetadata.c"
 	}
 }
 
@@ -2166,11 +2147,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer);
-#line 2170 "PhotoMetadata.c"
+#line 2151 "PhotoMetadata.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2174 "PhotoMetadata.c"
+#line 2155 "PhotoMetadata.c"
 	}
 }
 
@@ -2178,37 +2159,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
 static gpointer value_photo_preview_peek_pointer (const GValue* value) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 2182 "PhotoMetadata.c"
+#line 2163 "PhotoMetadata.c"
 }
 
 
 static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 2189 "PhotoMetadata.c"
+#line 2170 "PhotoMetadata.c"
 		PhotoPreview * object;
 		object = collect_values[0].v_pointer;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2196 "PhotoMetadata.c"
+#line 2177 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 2200 "PhotoMetadata.c"
+#line 2181 "PhotoMetadata.c"
 		}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = photo_preview_ref (object);
-#line 2204 "PhotoMetadata.c"
+#line 2185 "PhotoMetadata.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2208 "PhotoMetadata.c"
+#line 2189 "PhotoMetadata.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 2212 "PhotoMetadata.c"
+#line 2193 "PhotoMetadata.c"
 }
 
 
@@ -2219,25 +2200,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2223 "PhotoMetadata.c"
+#line 2204 "PhotoMetadata.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 2229 "PhotoMetadata.c"
+#line 2210 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2233 "PhotoMetadata.c"
+#line 2214 "PhotoMetadata.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = photo_preview_ref (value->data[0].v_pointer);
-#line 2237 "PhotoMetadata.c"
+#line 2218 "PhotoMetadata.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 2241 "PhotoMetadata.c"
+#line 2222 "PhotoMetadata.c"
 }
 
 
@@ -2251,7 +2232,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 2255 "PhotoMetadata.c"
+#line 2236 "PhotoMetadata.c"
 }
 
 
@@ -2260,7 +2241,7 @@ gpointer value_get_photo_preview (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL);
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 2264 "PhotoMetadata.c"
+#line 2245 "PhotoMetadata.c"
 }
 
 
@@ -2280,17 +2261,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_ref (value->data[0].v_pointer);
-#line 2284 "PhotoMetadata.c"
+#line 2265 "PhotoMetadata.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2288 "PhotoMetadata.c"
+#line 2269 "PhotoMetadata.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 2294 "PhotoMetadata.c"
+#line 2275 "PhotoMetadata.c"
 	}
 }
 
@@ -2309,17 +2290,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 2313 "PhotoMetadata.c"
+#line 2294 "PhotoMetadata.c"
 	} else {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 2317 "PhotoMetadata.c"
+#line 2298 "PhotoMetadata.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 2323 "PhotoMetadata.c"
+#line 2304 "PhotoMetadata.c"
 	}
 }
 
@@ -2332,10 +2313,10 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate));
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_preview_real_flatten;
+	((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_preview_real_flatten;
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoPreview *, GError**)) photo_preview_real_get_pixbuf;
-#line 2339 "PhotoMetadata.c"
+#line 2320 "PhotoMetadata.c"
 }
 
 
@@ -2344,7 +2325,7 @@ static void photo_preview_instance_init (PhotoPreview * self) {
 	self->priv = PHOTO_PREVIEW_GET_PRIVATE (self);
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 2348 "PhotoMetadata.c"
+#line 2329 "PhotoMetadata.c"
 }
 
 
@@ -2360,7 +2341,7 @@ static void photo_preview_finalize (PhotoPreview * obj) {
 	_g_free0 (self->priv->mime_type);
 #line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->extension);
-#line 2364 "PhotoMetadata.c"
+#line 2345 "PhotoMetadata.c"
 }
 
 
@@ -2385,7 +2366,7 @@ gpointer photo_preview_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 2389 "PhotoMetadata.c"
+#line 2370 "PhotoMetadata.c"
 }
 
 
@@ -2398,7 +2379,7 @@ void photo_preview_unref (gpointer instance) {
 		PHOTO_PREVIEW_GET_CLASS (self)->finalize (self);
 #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2402 "PhotoMetadata.c"
+#line 2383 "PhotoMetadata.c"
 	}
 }
 
@@ -2417,18 +2398,18 @@ GType photo_metadata_set_option_get_type (void) {
 
 PhotoMetadata* photo_metadata_construct (GType object_type) {
 	PhotoMetadata* self = NULL;
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (PhotoMetadata*) media_metadata_construct (object_type);
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 2425 "PhotoMetadata.c"
+#line 2406 "PhotoMetadata.c"
 }
 
 
 PhotoMetadata* photo_metadata_new (void) {
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_construct (TYPE_PHOTO_METADATA);
-#line 2432 "PhotoMetadata.c"
+#line 2413 "PhotoMetadata.c"
 }
 
 
@@ -2446,63 +2427,63 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 	GFile* _tmp9_;
 	gchar* _tmp10_;
 	GError * _inner_error_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = gexiv2_metadata_new ();
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp0_;
-#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->exiv2;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = file;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _tmp3_;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_open_path (_tmp1_, _tmp4_, &_inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp4_);
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 2482 "PhotoMetadata.c"
+#line 2463 "PhotoMetadata.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = file;
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = _tmp6_;
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = exif_data_new_from_file (_tmp7_);
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = _tmp8_;
-#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp7_);
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = file;
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = g_file_get_basename (_tmp9_);
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp10_;
-#line 2506 "PhotoMetadata.c"
+#line 2487 "PhotoMetadata.c"
 }
 
 
@@ -2512,29 +2493,29 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = file;
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_save_file (_tmp0_, _tmp3_, &_inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 2538 "PhotoMetadata.c"
+#line 2519 "PhotoMetadata.c"
 	}
 }
 
@@ -2556,174 +2537,160 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 	gint _tmp11_;
 	gchar* _tmp12_;
 	GError * _inner_error_ = NULL;
-#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = length;
-#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
-#line 2566 "PhotoMetadata.c"
+#line 2547 "PhotoMetadata.c"
 		guint8* _tmp1_;
 		gint _tmp1__length1;
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = buffer;
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = buffer_length1;
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		length = _tmp1__length1;
-#line 2575 "PhotoMetadata.c"
+#line 2556 "PhotoMetadata.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = buffer;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = buffer_length1;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = length;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length");
-#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_new ();
-#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp4_;
-#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = self->priv->exiv2;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = buffer;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6__length1 = buffer_length1;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = length;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_open_buf (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 2611 "PhotoMetadata.c"
+#line 2592 "PhotoMetadata.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = buffer;
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8__length1 = buffer_length1;
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = length;
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_);
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = _tmp10_;
-#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = length;
-#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup_printf ("<memory buffer %d bytes>", _tmp11_);
-#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp12_;
-#line 2633 "PhotoMetadata.c"
+#line 2614 "PhotoMetadata.c"
 }
 
 
-void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) {
-	gint _tmp0_;
-	guint8* _tmp2_;
-	gint _tmp2__length1;
-	gint _tmp3_;
-	GExiv2Metadata* _tmp4_;
-	GExiv2Metadata* _tmp5_;
-	guint8* _tmp6_;
-	gint _tmp6__length1;
-	gint _tmp7_;
-	guint8* _tmp8_;
-	gint _tmp8__length1;
-	gint _tmp9_;
-	ExifData* _tmp10_;
-	gint _tmp11_;
-	gchar* _tmp12_;
+void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error) {
+	GExiv2Metadata* _tmp0_;
+	GExiv2Metadata* _tmp1_;
+	GBytes* _tmp2_;
+	gsize _tmp3_;
+	guint8* _tmp4_;
+	GBytes* _tmp5_;
+	gsize _tmp6_;
+	GBytes* _tmp7_;
+	gsize _tmp8_;
+	guint8* _tmp9_;
+	GBytes* _tmp10_;
+	gsize _tmp11_;
+	ExifData* _tmp12_;
+	GBytes* _tmp13_;
+	gsize _tmp14_;
+	gchar* _tmp15_;
 	GError * _inner_error_ = NULL;
-#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp0_ = length;
-#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (_tmp0_ <= 0) {
-#line 2660 "PhotoMetadata.c"
-		guint8* _tmp1_;
-		gint _tmp1__length1;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp1_ = buffer;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp1__length1 = buffer_length1;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		length = _tmp1__length1;
-#line 2669 "PhotoMetadata.c"
-	}
+#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (buffer != NULL);
 #line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp2_ = buffer;
-#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp2__length1 = buffer_length1;
-#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_ = length;
+	_tmp0_ = gexiv2_metadata_new ();
 #line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length");
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp4_ = gexiv2_metadata_new ();
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	self->priv->exiv2 = _tmp4_;
-#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->exiv2 = _tmp0_;
+#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp5_ = self->priv->exiv2;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6_ = buffer;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6__length1 = buffer_length1;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp7_ = length;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	gexiv2_metadata_from_app1_segment (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_);
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = self->priv->exiv2;
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp2_ = buffer;
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_ = g_bytes_get_data (_tmp2_, &_tmp3_);
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp5_ = buffer;
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp6_ = g_bytes_get_size (_tmp5_);
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	gexiv2_metadata_from_app1_segment (_tmp1_, _tmp4_, (glong) _tmp6_, &_inner_error_);
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 2705 "PhotoMetadata.c"
-	}
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp8_ = buffer;
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp8__length1 = buffer_length1;
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp9_ = length;
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_);
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 2668 "PhotoMetadata.c"
+	}
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp7_ = buffer;
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp9_ = g_bytes_get_data (_tmp7_, &_tmp8_);
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp10_ = buffer;
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_ = g_bytes_get_size (_tmp10_);
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp12_ = exif_data_new_from_data (_tmp9_, _tmp11_);
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	self->priv->exif = _tmp10_;
-#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp11_ = length;
-#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp12_ = g_strdup_printf ("<app1 segment %d bytes>", _tmp11_);
-#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->exif = _tmp12_;
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp13_ = buffer;
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp14_ = g_bytes_get_size (_tmp13_);
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp15_ = g_strdup_printf ("<app1 segment %zu bytes>", _tmp14_);
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	self->priv->source_name = _tmp12_;
-#line 2727 "PhotoMetadata.c"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->source_name = _tmp15_;
+#line 2694 "PhotoMetadata.c"
 }
 
 
@@ -2735,119 +2702,119 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 	gboolean _tmp3_;
 	const gchar* _tmp4_;
 	gboolean _tmp5_;
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, 0);
-#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_is_exif_tag (_tmp0_);
-#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_EXIF;
-#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2751 "PhotoMetadata.c"
+#line 2718 "PhotoMetadata.c"
 	}
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tag;
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = gexiv2_metadata_is_xmp_tag (_tmp2_);
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_XMP;
-#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2763 "PhotoMetadata.c"
+#line 2730 "PhotoMetadata.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = tag;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = gexiv2_metadata_is_iptc_tag (_tmp4_);
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_) {
-#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_IPTC;
-#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2775 "PhotoMetadata.c"
+#line 2742 "PhotoMetadata.c"
 	}
-#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = METADATA_DOMAIN_UNKNOWN;
-#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2781 "PhotoMetadata.c"
+#line 2748 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
 	MetadataDomain _tmp0_;
-#line 308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 2796 "PhotoMetadata.c"
+#line 2763 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_;
 			gboolean _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = gexiv2_metadata_has_exif (_tmp1_);
-#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2808 "PhotoMetadata.c"
+#line 2775 "PhotoMetadata.c"
 		}
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 2812 "PhotoMetadata.c"
+#line 2779 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_;
 			gboolean _tmp4_;
-#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gexiv2_metadata_has_xmp (_tmp3_);
-#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp4_;
-#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2824 "PhotoMetadata.c"
+#line 2791 "PhotoMetadata.c"
 		}
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2828 "PhotoMetadata.c"
+#line 2795 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_;
 			gboolean _tmp6_;
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gexiv2_metadata_has_iptc (_tmp5_);
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp6_;
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2840 "PhotoMetadata.c"
+#line 2807 "PhotoMetadata.c"
 		}
 		default:
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 2845 "PhotoMetadata.c"
+#line 2812 "PhotoMetadata.c"
 		{
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2851 "PhotoMetadata.c"
+#line 2818 "PhotoMetadata.c"
 		}
 	}
 }
@@ -2856,115 +2823,115 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 gboolean photo_metadata_has_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF);
-#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2868 "PhotoMetadata.c"
+#line 2835 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 327 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP);
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2883 "PhotoMetadata.c"
+#line 2850 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 333 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC);
-#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2898 "PhotoMetadata.c"
+#line 2865 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
 	MetadataDomain _tmp0_;
-#line 337 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 2913 "PhotoMetadata.c"
+#line 2880 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_;
 			gboolean _tmp2_;
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = gexiv2_metadata_get_supports_exif (_tmp1_);
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp2_;
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2925 "PhotoMetadata.c"
+#line 2892 "PhotoMetadata.c"
 		}
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 2929 "PhotoMetadata.c"
+#line 2896 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_;
 			gboolean _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gexiv2_metadata_get_supports_xmp (_tmp3_);
-#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2941 "PhotoMetadata.c"
+#line 2908 "PhotoMetadata.c"
 		}
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2945 "PhotoMetadata.c"
+#line 2912 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_;
 			gboolean _tmp6_;
-#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
-#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gexiv2_metadata_get_supports_iptc (_tmp5_);
-#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp6_;
-#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2957 "PhotoMetadata.c"
+#line 2924 "PhotoMetadata.c"
 		}
 		default:
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 2962 "PhotoMetadata.c"
+#line 2929 "PhotoMetadata.c"
 		{
-#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
-#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2968 "PhotoMetadata.c"
+#line 2935 "PhotoMetadata.c"
 		}
 	}
 }
@@ -2973,45 +2940,45 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF);
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2985 "PhotoMetadata.c"
+#line 2952 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 358 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP);
-#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3000 "PhotoMetadata.c"
+#line 2967 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 360 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC);
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3015 "PhotoMetadata.c"
+#line 2982 "PhotoMetadata.c"
 }
 
 
@@ -3020,21 +2987,21 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
 	GExiv2Metadata* _tmp0_;
 	const gchar* _tmp1_;
 	gboolean _tmp2_;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_has_tag (_tmp0_, _tmp1_);
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3038 "PhotoMetadata.c"
+#line 3005 "PhotoMetadata.c"
 }
 
 
@@ -3042,73 +3009,73 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 	GeeSet* result = NULL;
 	GCompareDataFunc _tmp0_;
 	void* _tmp0__target;
-#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = compare_func;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target = compare_func_target;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 3054 "PhotoMetadata.c"
+#line 3021 "PhotoMetadata.c"
 		GeeHashSet* _tmp1_;
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3070 "PhotoMetadata.c"
+#line 3037 "PhotoMetadata.c"
 	} else {
 		GCompareDataFunc _tmp2_;
 		void* _tmp2__target;
 		GDestroyNotify _tmp2__target_destroy_notify;
 		GeeTreeSet* _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = compare_func;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2__target = compare_func_target;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2__target_destroy_notify = compare_func_target_destroy_notify;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3102 "PhotoMetadata.c"
+#line 3069 "PhotoMetadata.c"
 	}
-#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 3112 "PhotoMetadata.c"
+#line 3079 "PhotoMetadata.c"
 }
 
 
@@ -3128,200 +3095,200 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	GeeSet* _tmp14_;
 	gchar** _tmp15_;
 	gint _tmp15__length1;
-#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 376 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags = NULL;
-#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags_length1 = 0;
-#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tags_size_ = tags_length1;
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 3146 "PhotoMetadata.c"
+#line 3113 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_;
 			gchar** _tmp2_;
 			gchar** _tmp3_;
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _tmp2_ = gexiv2_metadata_get_exif_tags (_tmp1_);
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp3_;
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp2_);
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3165 "PhotoMetadata.c"
+#line 3132 "PhotoMetadata.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 3169 "PhotoMetadata.c"
+#line 3136 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp4_;
 			gchar** _tmp5_;
 			gchar** _tmp6_;
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = self->priv->exiv2;
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _tmp5_ = gexiv2_metadata_get_xmp_tags (_tmp4_);
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp6_;
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp5_);
-#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 386 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3188 "PhotoMetadata.c"
+#line 3155 "PhotoMetadata.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 3192 "PhotoMetadata.c"
+#line 3159 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp7_;
 			gchar** _tmp8_;
 			gchar** _tmp9_;
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = self->priv->exiv2;
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = _tmp8_ = gexiv2_metadata_get_iptc_tags (_tmp7_);
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp9_;
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp8_);
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 390 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 3211 "PhotoMetadata.c"
+#line 3178 "PhotoMetadata.c"
 		}
 		default:
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 3216 "PhotoMetadata.c"
+#line 3183 "PhotoMetadata.c"
 	}
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = tags;
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11__length1 = tags_length1;
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == NULL) {
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = TRUE;
-#line 3226 "PhotoMetadata.c"
+#line 3193 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp12_;
 		gint _tmp12__length1;
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = tags;
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12__length1 = tags_length1;
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12__length1 == 0;
-#line 3236 "PhotoMetadata.c"
+#line 3203 "PhotoMetadata.c"
 	}
-#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3254 "PhotoMetadata.c"
+#line 3221 "PhotoMetadata.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = compare_func;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13__target = compare_func_target;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13__target_destroy_notify = compare_func_target_destroy_notify;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify);
-#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = tags;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = tags_length1;
-#line 3276 "PhotoMetadata.c"
+#line 3243 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp15_;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp15__length1;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 3288 "PhotoMetadata.c"
+#line 3255 "PhotoMetadata.c"
 			gchar* _tmp16_;
 			gchar* tag = NULL;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp16_ = g_strdup (tag_collection[tag_it]);
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp16_;
-#line 3295 "PhotoMetadata.c"
+#line 3262 "PhotoMetadata.c"
 			{
 				GeeCollection* _tmp17_;
 				const gchar* _tmp18_;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp17_ = collection;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp18_ = tag;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				gee_collection_add (_tmp17_, _tmp18_);
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3307 "PhotoMetadata.c"
+#line 3274 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = collection;
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3325 "PhotoMetadata.c"
+#line 3292 "PhotoMetadata.c"
 }
 
 
@@ -3349,184 +3316,184 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	gint _tmp28_;
 	gint _tmp29_;
 	GeeCollection* _tmp31_;
-#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 403 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = compare_func;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target = compare_func_target;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target_destroy_notify = compare_func_target_destroy_notify;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_create_string_set (self, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	all_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_tags (self, METADATA_DOMAIN_EXIF, NULL, NULL, NULL);
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	exif_tags = _tmp2_;
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = exif_tags;
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 3379 "PhotoMetadata.c"
+#line 3346 "PhotoMetadata.c"
 		GeeCollection* _tmp5_;
 		gint _tmp6_;
 		gint _tmp7_;
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = exif_tags;
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp7_ > 0;
-#line 3391 "PhotoMetadata.c"
+#line 3358 "PhotoMetadata.c"
 	} else {
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = FALSE;
-#line 3395 "PhotoMetadata.c"
+#line 3362 "PhotoMetadata.c"
 	}
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 3399 "PhotoMetadata.c"
+#line 3366 "PhotoMetadata.c"
 		GeeCollection* _tmp8_;
 		GeeCollection* _tmp9_;
-#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = all_tags;
-#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = exif_tags;
-#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp8_, _tmp9_);
-#line 3408 "PhotoMetadata.c"
+#line 3375 "PhotoMetadata.c"
 	}
-#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
-#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	xmp_tags = _tmp10_;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = xmp_tags;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp12_ != NULL) {
-#line 3418 "PhotoMetadata.c"
+#line 3385 "PhotoMetadata.c"
 		GeeCollection* _tmp13_;
 		gint _tmp14_;
 		gint _tmp15_;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = xmp_tags;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp15_ > 0;
-#line 3430 "PhotoMetadata.c"
+#line 3397 "PhotoMetadata.c"
 	} else {
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = FALSE;
-#line 3434 "PhotoMetadata.c"
+#line 3401 "PhotoMetadata.c"
 	}
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_) {
-#line 3438 "PhotoMetadata.c"
+#line 3405 "PhotoMetadata.c"
 		GeeCollection* _tmp16_;
 		GeeCollection* _tmp17_;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = all_tags;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = xmp_tags;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp16_, _tmp17_);
-#line 3447 "PhotoMetadata.c"
+#line 3414 "PhotoMetadata.c"
 	}
-#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
-#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	iptc_tags = _tmp18_;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp20_ = iptc_tags;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_ != NULL) {
-#line 3457 "PhotoMetadata.c"
+#line 3424 "PhotoMetadata.c"
 		GeeCollection* _tmp21_;
 		gint _tmp22_;
 		gint _tmp23_;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = iptc_tags;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = gee_collection_get_size (_tmp21_);
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp22_;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp23_ > 0;
-#line 3469 "PhotoMetadata.c"
+#line 3436 "PhotoMetadata.c"
 	} else {
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 3473 "PhotoMetadata.c"
+#line 3440 "PhotoMetadata.c"
 	}
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 3477 "PhotoMetadata.c"
+#line 3444 "PhotoMetadata.c"
 		GeeCollection* _tmp24_;
 		GeeCollection* _tmp25_;
-#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = all_tags;
-#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = iptc_tags;
-#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp24_, _tmp25_);
-#line 3486 "PhotoMetadata.c"
+#line 3453 "PhotoMetadata.c"
 	}
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = all_tags;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = gee_collection_get_size (_tmp27_);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _tmp28_;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp29_ > 0) {
-#line 3496 "PhotoMetadata.c"
+#line 3463 "PhotoMetadata.c"
 		GeeCollection* _tmp30_;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = all_tags;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = _tmp30_;
-#line 3502 "PhotoMetadata.c"
+#line 3469 "PhotoMetadata.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = NULL;
-#line 3506 "PhotoMetadata.c"
+#line 3473 "PhotoMetadata.c"
 	}
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp31_ = _g_object_ref0 (_tmp26_);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp31_;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (iptc_tags);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (xmp_tags);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (exif_tags);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (all_tags);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3530 "PhotoMetadata.c"
+#line 3497 "PhotoMetadata.c"
 }
 
 
@@ -3535,21 +3502,21 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_tag_label (_tmp0_);
-#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3553 "PhotoMetadata.c"
+#line 3520 "PhotoMetadata.c"
 }
 
 
@@ -3558,21 +3525,21 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_tag_description (_tmp0_);
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3576 "PhotoMetadata.c"
+#line 3543 "PhotoMetadata.c"
 }
 
 
@@ -3585,31 +3552,31 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
 	PrepareInputTextOptions _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_get_tag_string (_tmp0_, _tmp1_);
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = options;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = _tmp5_;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp6_;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3613 "PhotoMetadata.c"
+#line 3580 "PhotoMetadata.c"
 }
 
 
@@ -3622,31 +3589,31 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
 	PrepareInputTextOptions _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, _tmp1_);
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = options;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = _tmp5_;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp6_;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3650 "PhotoMetadata.c"
+#line 3617 "PhotoMetadata.c"
 }
 
 
@@ -3654,68 +3621,68 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	gchar* result = NULL;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 438 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3664 "PhotoMetadata.c"
+#line 3631 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3676 "PhotoMetadata.c"
+#line 3643 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3683 "PhotoMetadata.c"
+#line 3650 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_;
 				gchar* _tmp3_;
 				const gchar* _tmp4_;
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				value = _tmp3_;
-#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = value;
-#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = value;
-#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3705 "PhotoMetadata.c"
+#line 3672 "PhotoMetadata.c"
 				}
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3711 "PhotoMetadata.c"
+#line 3678 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3719 "PhotoMetadata.c"
+#line 3686 "PhotoMetadata.c"
 }
 
 
@@ -3723,68 +3690,68 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	gchar* result = NULL;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 448 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3733 "PhotoMetadata.c"
+#line 3700 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3745 "PhotoMetadata.c"
+#line 3712 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3752 "PhotoMetadata.c"
+#line 3719 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_;
 				gchar* _tmp3_;
 				const gchar* _tmp4_;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_interpreted (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				value = _tmp3_;
-#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = value;
-#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = value;
-#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3774 "PhotoMetadata.c"
+#line 3741 "PhotoMetadata.c"
 				}
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3780 "PhotoMetadata.c"
+#line 3747 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3788 "PhotoMetadata.c"
+#line 3755 "PhotoMetadata.c"
 }
 
 
@@ -3811,180 +3778,180 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	gint _tmp24_;
 	gint _tmp25_;
 	GeeList* _tmp27_;
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_ = gexiv2_metadata_get_tag_multiple (_tmp0_, _tmp1_);
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = _tmp3_;
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values_length1 = _vala_array_length (_tmp2_);
-#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = values;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = values_length1;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ == NULL) {
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = TRUE;
-#line 3839 "PhotoMetadata.c"
+#line 3806 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp6_;
 		gint _tmp6__length1;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = values;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6__length1 = values_length1;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 3849 "PhotoMetadata.c"
+#line 3816 "PhotoMetadata.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3859 "PhotoMetadata.c"
+#line 3826 "PhotoMetadata.c"
 	}
-#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	collection = _tmp8_;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = values;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = values_length1;
-#line 3873 "PhotoMetadata.c"
+#line 3840 "PhotoMetadata.c"
 	{
 		gchar** value_collection = NULL;
 		gint value_collection_length1 = 0;
 		gint _value_collection_size_ = 0;
 		gint value_it = 0;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value_collection = _tmp9_;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value_collection_length1 = _tmp9__length1;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 3885 "PhotoMetadata.c"
+#line 3852 "PhotoMetadata.c"
 			gchar* _tmp10_;
 			gchar* value = NULL;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = g_strdup (value_collection[value_it]);
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = _tmp10_;
-#line 3892 "PhotoMetadata.c"
+#line 3859 "PhotoMetadata.c"
 			{
 				gchar* prepped = NULL;
 				const gchar* _tmp11_;
 				gchar* _tmp12_;
 				gboolean _tmp13_ = FALSE;
 				const gchar* _tmp14_;
-#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = value;
-#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = prepare_input_text (_tmp11_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				prepped = _tmp12_;
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = prepped;
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp14_ != NULL) {
-#line 3909 "PhotoMetadata.c"
+#line 3876 "PhotoMetadata.c"
 					GeeHashSet* _tmp15_;
 					const gchar* _tmp16_;
 					gboolean _tmp17_;
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp15_ = collection;
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp16_ = prepped;
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = !_tmp17_;
-#line 3921 "PhotoMetadata.c"
+#line 3888 "PhotoMetadata.c"
 				} else {
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = FALSE;
-#line 3925 "PhotoMetadata.c"
+#line 3892 "PhotoMetadata.c"
 				}
-#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_) {
-#line 3929 "PhotoMetadata.c"
+#line 3896 "PhotoMetadata.c"
 					GeeList* _tmp18_;
 					const gchar* _tmp19_;
 					GeeHashSet* _tmp20_;
 					const gchar* _tmp21_;
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp18_ = list;
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp19_ = prepped;
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = collection;
-#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp21_ = prepped;
-#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3946 "PhotoMetadata.c"
+#line 3913 "PhotoMetadata.c"
 				}
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (prepped);
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 3952 "PhotoMetadata.c"
+#line 3919 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp23_ = list;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp25_ = _tmp24_;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp25_ > 0) {
-#line 3964 "PhotoMetadata.c"
+#line 3931 "PhotoMetadata.c"
 		GeeList* _tmp26_;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = list;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp26_;
-#line 3970 "PhotoMetadata.c"
+#line 3937 "PhotoMetadata.c"
 	} else {
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 3974 "PhotoMetadata.c"
+#line 3941 "PhotoMetadata.c"
 	}
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = _g_object_ref0 (_tmp22_);
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp27_;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (collection);
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (list);
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3988 "PhotoMetadata.c"
+#line 3955 "PhotoMetadata.c"
 }
 
 
@@ -3992,89 +3959,89 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	GeeList* result = NULL;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4002 "PhotoMetadata.c"
+#line 3969 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4014 "PhotoMetadata.c"
+#line 3981 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4021 "PhotoMetadata.c"
+#line 3988 "PhotoMetadata.c"
 			{
 				GeeList* values = NULL;
 				const gchar* _tmp2_;
 				GeeList* _tmp3_;
 				gboolean _tmp4_ = FALSE;
 				GeeList* _tmp5_;
-#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_);
-#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = _tmp3_;
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = values;
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 4038 "PhotoMetadata.c"
+#line 4005 "PhotoMetadata.c"
 					GeeList* _tmp6_;
 					gint _tmp7_;
 					gint _tmp8_;
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = _tmp7_;
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 4050 "PhotoMetadata.c"
+#line 4017 "PhotoMetadata.c"
 				} else {
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 4054 "PhotoMetadata.c"
+#line 4021 "PhotoMetadata.c"
 				}
-#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = values;
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4064 "PhotoMetadata.c"
+#line 4031 "PhotoMetadata.c"
 				}
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4070 "PhotoMetadata.c"
+#line 4037 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4078 "PhotoMetadata.c"
+#line 4045 "PhotoMetadata.c"
 }
 
 
@@ -4088,67 +4055,67 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	const gchar* _tmp7_;
 	const gchar* _tmp8_;
 	gboolean _tmp9_;
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (value != NULL);
-#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = options;
-#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = prepare_input_text (_tmp0_, _tmp1_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	prepped = _tmp2_;
-#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = prepped;
-#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_ == NULL) {
-#line 4110 "PhotoMetadata.c"
+#line 4077 "PhotoMetadata.c"
 		const gchar* _tmp4_;
 		const gchar* _tmp5_;
-#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
-#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = value;
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:504: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_);
 #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:506: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_);
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (prepped);
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 4123 "PhotoMetadata.c"
+#line 4090 "PhotoMetadata.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = self->priv->exiv2;
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = tag;
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = prepped;
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp9_) {
-#line 4135 "PhotoMetadata.c"
+#line 4102 "PhotoMetadata.c"
 		const gchar* _tmp10_;
 		const gchar* _tmp11_;
 		const gchar* _tmp12_;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = tag;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = value;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = self->priv->source_name;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \
+#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:510: Unable to set tag %s to string %s from source " \
 "%s", _tmp10_, _tmp11_, _tmp12_);
-#line 4147 "PhotoMetadata.c"
+#line 4114 "PhotoMetadata.c"
 	}
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (prepped);
-#line 4151 "PhotoMetadata.c"
+#line 4118 "PhotoMetadata.c"
 }
 
 
@@ -4159,118 +4126,118 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
 	PhotoMetadataSetOption _tmp11_;
-#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 515 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 516 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	written = FALSE;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4170 "PhotoMetadata.c"
+#line 4137 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4182 "PhotoMetadata.c"
+#line 4149 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4189 "PhotoMetadata.c"
+#line 4156 "PhotoMetadata.c"
 			{
 				gboolean _tmp2_ = FALSE;
 				PhotoMetadataSetOption _tmp3_;
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = option;
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = TRUE;
-#line 4199 "PhotoMetadata.c"
+#line 4166 "PhotoMetadata.c"
 				} else {
 					const gchar* _tmp4_;
 					MetadataDomain _tmp5_;
 					gboolean _tmp6_;
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = tag;
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = photo_metadata_get_tag_domain (_tmp4_);
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = _tmp6_;
-#line 4212 "PhotoMetadata.c"
+#line 4179 "PhotoMetadata.c"
 				}
-#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp2_) {
-#line 4216 "PhotoMetadata.c"
+#line 4183 "PhotoMetadata.c"
 					PhotoMetadataSetGenericValue _tmp7_;
 					void* _tmp7__target;
 					const gchar* _tmp8_;
-#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = setter;
-#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7__target = setter_target;
-#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = tag;
-#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ (_tmp8_, _tmp7__target);
-#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					written = TRUE;
-#line 4230 "PhotoMetadata.c"
+#line 4197 "PhotoMetadata.c"
 				}
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4234 "PhotoMetadata.c"
+#line 4201 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = option;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 4242 "PhotoMetadata.c"
+#line 4209 "PhotoMetadata.c"
 		gboolean _tmp12_;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = written;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = !_tmp12_;
-#line 4248 "PhotoMetadata.c"
+#line 4215 "PhotoMetadata.c"
 	} else {
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 4252 "PhotoMetadata.c"
+#line 4219 "PhotoMetadata.c"
 	}
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 4256 "PhotoMetadata.c"
+#line 4223 "PhotoMetadata.c"
 		gchar** _tmp13_;
 		gint _tmp13__length1;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = tags;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13__length1 = tags_length1;
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp13__length1 > 0;
-#line 4265 "PhotoMetadata.c"
+#line 4232 "PhotoMetadata.c"
 	} else {
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = FALSE;
-#line 4269 "PhotoMetadata.c"
+#line 4236 "PhotoMetadata.c"
 	}
-#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp9_) {
-#line 4273 "PhotoMetadata.c"
+#line 4240 "PhotoMetadata.c"
 		MetadataDomain default_domain = 0;
 		gchar** _tmp14_;
 		gint _tmp14__length1;
@@ -4281,41 +4248,41 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		gchar** _tmp18_;
 		gint _tmp18__length1;
 		const gchar* _tmp19_;
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = tags;
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14__length1 = tags_length1;
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_[0];
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = photo_metadata_get_tag_domain (_tmp15_);
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		default_domain = _tmp16_;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = setter;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17__target = setter_target;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = tags;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18__length1 = tags_length1;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp18_[0];
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ (_tmp19_, _tmp17__target);
-#line 4306 "PhotoMetadata.c"
+#line 4273 "PhotoMetadata.c"
 		{
 			gint ctr = 0;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			ctr = 1;
-#line 4311 "PhotoMetadata.c"
+#line 4278 "PhotoMetadata.c"
 			{
 				gboolean _tmp20_ = FALSE;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp20_ = TRUE;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				while (TRUE) {
-#line 4318 "PhotoMetadata.c"
+#line 4285 "PhotoMetadata.c"
 					gint _tmp22_;
 					gchar** _tmp23_;
 					gint _tmp23__length1;
@@ -4325,66 +4292,66 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					const gchar* _tmp26_;
 					MetadataDomain _tmp27_;
 					MetadataDomain _tmp28_;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!_tmp20_) {
-#line 4330 "PhotoMetadata.c"
+#line 4297 "PhotoMetadata.c"
 						gint _tmp21_;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = ctr;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						ctr = _tmp21_ + 1;
-#line 4336 "PhotoMetadata.c"
+#line 4303 "PhotoMetadata.c"
 					}
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = FALSE;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp22_ = ctr;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23_ = tags;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23__length1 = tags_length1;
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!(_tmp22_ < _tmp23__length1)) {
-#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						break;
-#line 4350 "PhotoMetadata.c"
+#line 4317 "PhotoMetadata.c"
 					}
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24_ = tags;
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24__length1 = tags_length1;
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp25_ = ctr;
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp26_ = _tmp24_[_tmp25_];
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp27_ = photo_metadata_get_tag_domain (_tmp26_);
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp28_ = default_domain;
-#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp27_ == _tmp28_) {
-#line 4366 "PhotoMetadata.c"
+#line 4333 "PhotoMetadata.c"
 						PhotoMetadataSetGenericValue _tmp29_;
 						void* _tmp29__target;
 						gchar** _tmp30_;
 						gint _tmp30__length1;
 						gint _tmp31_;
 						const gchar* _tmp32_;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ = setter;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29__target = setter_target;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp30_ = tags;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp30__length1 = tags_length1;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp31_ = ctr;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp32_ = _tmp30_[_tmp31_];
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ (_tmp32_, _tmp29__target);
-#line 4387 "PhotoMetadata.c"
+#line 4354 "PhotoMetadata.c"
 					}
 				}
 			}
@@ -4394,30 +4361,30 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data1_;
-#line 4401 "PhotoMetadata.c"
+#line 4368 "PhotoMetadata.c"
 }
 
 
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 4410 "PhotoMetadata.c"
+#line 4377 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data1_->self;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_data1_->value);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 4420 "PhotoMetadata.c"
+#line 4387 "PhotoMetadata.c"
 	}
 }
 
@@ -4426,24 +4393,24 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data1_->self;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data1_->value;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 4439 "PhotoMetadata.c"
+#line 4406 "PhotoMetadata.c"
 }
 
 
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda5_ (self, tag);
-#line 4446 "PhotoMetadata.c"
+#line 4413 "PhotoMetadata.c"
 }
 
 
@@ -4454,71 +4421,71 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
 	gchar** _tmp2_;
 	gint _tmp2__length1;
 	PhotoMetadataSetOption _tmp3_;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (value != NULL);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->_ref_count_ = 1;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->self = media_metadata_ref (self);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_data1_->value);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->value = _tmp1_;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda5__photo_metadata_set_generic_value, _data1_);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block1_data_unref (_data1_);
-#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = NULL;
-#line 4487 "PhotoMetadata.c"
+#line 4454 "PhotoMetadata.c"
 }
 
 
-static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) {
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value) {
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4498 "PhotoMetadata.c"
+#line 4465 "PhotoMetadata.c"
 	}
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 4504 "PhotoMetadata.c"
+#line 4471 "PhotoMetadata.c"
 }
 
 
-static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value) {
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) {
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4515 "PhotoMetadata.c"
+#line 4482 "PhotoMetadata.c"
 	}
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 4521 "PhotoMetadata.c"
+#line 4488 "PhotoMetadata.c"
 }
 
 
@@ -4536,34 +4503,34 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	gchar** _tmp19_;
 	gint _tmp19__length1;
 	gboolean _tmp20_;
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (collection));
-#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = _tmp0_;
-#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values_length1 = 0;
-#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 4553 "PhotoMetadata.c"
+#line 4520 "PhotoMetadata.c"
 	{
 		GeeIterator* _value_it = NULL;
 		GeeCollection* _tmp1_;
 		GeeIterator* _tmp2_;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = collection;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_value_it = _tmp2_;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		while (TRUE) {
-#line 4566 "PhotoMetadata.c"
+#line 4533 "PhotoMetadata.c"
 			GeeIterator* _tmp3_;
 			gboolean _tmp4_;
 			gchar* value = NULL;
@@ -4573,148 +4540,148 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			const gchar* _tmp7_;
 			gchar* _tmp8_;
 			const gchar* _tmp9_;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _value_it;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (!_tmp4_) {
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				break;
-#line 4584 "PhotoMetadata.c"
+#line 4551 "PhotoMetadata.c"
 			}
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _value_it;
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = (gchar*) _tmp6_;
-#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = value;
-#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp8_ = prepare_input_text (_tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1);
-#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			prepped = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = prepped;
-#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (_tmp9_ != NULL) {
-#line 4602 "PhotoMetadata.c"
+#line 4569 "PhotoMetadata.c"
 				gchar** _tmp10_;
 				gint _tmp10__length1;
 				const gchar* _tmp11_;
 				gchar* _tmp12_;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = values;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10__length1 = values_length1;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = prepped;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = g_strdup (_tmp11_);
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-				_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 4617 "PhotoMetadata.c"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_vala_array_add48 (&values, &values_length1, &_values_size_, _tmp12_);
+#line 4584 "PhotoMetadata.c"
 			} else {
 				const gchar* _tmp13_;
 				const gchar* _tmp14_;
-#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = value;
-#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = tag;
-#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-				g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 4627 "PhotoMetadata.c"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				g_warning ("PhotoMetadata.vala:549: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
+#line 4594 "PhotoMetadata.c"
 			}
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (prepped);
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (value);
-#line 4633 "PhotoMetadata.c"
+#line 4600 "PhotoMetadata.c"
 		}
-#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_value_it);
-#line 4637 "PhotoMetadata.c"
+#line 4604 "PhotoMetadata.c"
 	}
-#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = values;
-#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = values_length1;
-#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15__length1 == 0) {
-#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 4649 "PhotoMetadata.c"
+#line 4616 "PhotoMetadata.c"
 	}
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = values;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16__length1 = values_length1;
+#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_vala_array_add49 (&values, &values_length1, &_values_size_, NULL);
 #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_vala_array_add46 (&values, &values_length1, &_values_size_, NULL);
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp17_ = self->priv->exiv2;
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = tag;
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_ = values;
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19__length1 = values_length1;
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
-#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp20_) {
-#line 4669 "PhotoMetadata.c"
+#line 4636 "PhotoMetadata.c"
 		gchar** _tmp21_;
 		gint _tmp21__length1;
 		const gchar* _tmp22_;
 		const gchar* _tmp23_;
-#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = values;
-#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21__length1 = values_length1;
-#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = tag;
-#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = self->priv->source_name;
-#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \
+#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:562: Unable to set %d strings to tag %s from source" \
 " %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 4684 "PhotoMetadata.c"
+#line 4651 "PhotoMetadata.c"
 	}
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 4688 "PhotoMetadata.c"
+#line 4655 "PhotoMetadata.c"
 }
 
 
 static Block2Data* block2_data_ref (Block2Data* _data2_) {
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data2_->_ref_count_);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data2_;
-#line 4697 "PhotoMetadata.c"
+#line 4664 "PhotoMetadata.c"
 }
 
 
 static void block2_data_unref (void * _userdata_) {
 	Block2Data* _data2_;
 	_data2_ = (Block2Data*) _userdata_;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 4706 "PhotoMetadata.c"
+#line 4673 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data2_->self;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_data2_->values);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 4716 "PhotoMetadata.c"
+#line 4683 "PhotoMetadata.c"
 	}
 }
 
@@ -4723,24 +4690,24 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	GeeCollection* _tmp1_;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data2_->self;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data2_->values;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 4735 "PhotoMetadata.c"
+#line 4702 "PhotoMetadata.c"
 }
 
 
 static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda6_ (self, tag);
-#line 4742 "PhotoMetadata.c"
+#line 4709 "PhotoMetadata.c"
 }
 
 
@@ -4751,37 +4718,37 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
 	gchar** _tmp2_;
 	gint _tmp2__length1;
 	PhotoMetadataSetOption _tmp3_;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (values));
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = g_slice_new0 (Block2Data);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->_ref_count_ = 1;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->self = media_metadata_ref (self);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = values;
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_data2_->values);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->values = _tmp1_;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda6__photo_metadata_set_generic_value, _data2_);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block2_data_unref (_data2_);
-#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = NULL;
-#line 4783 "PhotoMetadata.c"
+#line 4750 "PhotoMetadata.c"
 }
 
 
@@ -4793,49 +4760,49 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 	GExiv2Metadata* _tmp2_;
 	const gchar* _tmp3_;
 	glong _tmp4_;
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_has_tag (self, _tmp0_);
-#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_value = (glong) 0;
-#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (value) {
-#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*value = _vala_value;
-#line 4813 "PhotoMetadata.c"
+#line 4780 "PhotoMetadata.c"
 		}
-#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4817 "PhotoMetadata.c"
+#line 4784 "PhotoMetadata.c"
 	}
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exiv2;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = tag;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_tag_long (_tmp2_, _tmp3_);
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_value = _tmp4_;
-#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value) {
-#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 4833 "PhotoMetadata.c"
+#line 4800 "PhotoMetadata.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4837 "PhotoMetadata.c"
+#line 4804 "PhotoMetadata.c"
 }
 
 
@@ -4844,77 +4811,77 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	gboolean result = FALSE;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 581 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4852 "PhotoMetadata.c"
+#line 4819 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4864 "PhotoMetadata.c"
+#line 4831 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4871 "PhotoMetadata.c"
+#line 4838 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_;
 				glong _tmp3_ = 0L;
 				gboolean _tmp4_;
-#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_long (self, _tmp2_, &_tmp3_);
-#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_value = _tmp3_;
-#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (value) {
-#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*value = _vala_value;
-#line 4892 "PhotoMetadata.c"
+#line 4859 "PhotoMetadata.c"
 					}
-#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4896 "PhotoMetadata.c"
+#line 4863 "PhotoMetadata.c"
 				}
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4900 "PhotoMetadata.c"
+#line 4867 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 587 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_value = (glong) 0;
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value) {
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 4912 "PhotoMetadata.c"
+#line 4879 "PhotoMetadata.c"
 	}
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4916 "PhotoMetadata.c"
+#line 4883 "PhotoMetadata.c"
 }
 
 
@@ -4923,61 +4890,61 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 	const gchar* _tmp1_;
 	glong _tmp2_;
 	gboolean _tmp3_;
-#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = value;
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
-#line 4939 "PhotoMetadata.c"
+#line 4906 "PhotoMetadata.c"
 		const gchar* _tmp4_;
 		glong _tmp5_;
 		const gchar* _tmp6_;
-#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
-#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = value;
-#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = self->priv->source_name;
-#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:594: Unable to set tag %s to long %ld from source %" \
 "s", _tmp4_, _tmp5_, _tmp6_);
-#line 4951 "PhotoMetadata.c"
+#line 4918 "PhotoMetadata.c"
 	}
 }
 
 
 static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data3_;
-#line 4961 "PhotoMetadata.c"
+#line 4928 "PhotoMetadata.c"
 }
 
 
 static void block3_data_unref (void * _userdata_) {
 	Block3Data* _data3_;
 	_data3_ = (Block3Data*) _userdata_;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4970 "PhotoMetadata.c"
+#line 4937 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data3_->self;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 4978 "PhotoMetadata.c"
+#line 4945 "PhotoMetadata.c"
 	}
 }
 
@@ -4986,24 +4953,24 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	glong _tmp1_;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data3_->self;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data3_->value;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4997 "PhotoMetadata.c"
+#line 4964 "PhotoMetadata.c"
 }
 
 
 static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda7_ (self, tag);
-#line 5004 "PhotoMetadata.c"
+#line 4971 "PhotoMetadata.c"
 }
 
 
@@ -5013,31 +4980,31 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
 	gchar** _tmp1_;
 	gint _tmp1__length1;
 	PhotoMetadataSetOption _tmp2_;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = g_slice_new0 (Block3Data);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->_ref_count_ = 1;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->self = media_metadata_ref (self);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->value = _tmp0_;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tags;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = tags_length1;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = option;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda7__photo_metadata_set_generic_value, _data3_);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block3_data_unref (_data3_);
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = NULL;
-#line 5038 "PhotoMetadata.c"
+#line 5005 "PhotoMetadata.c"
 }
 
 
@@ -5052,35 +5019,35 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	numerator = _tmp2_;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	denominator = _tmp3_;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_result_ = _tmp4_;
-#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	metadata_rational_init (&_vala_rational, numerator, denominator);
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _result_;
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (rational) {
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 5077 "PhotoMetadata.c"
+#line 5044 "PhotoMetadata.c"
 	}
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5081 "PhotoMetadata.c"
+#line 5048 "PhotoMetadata.c"
 }
 
 
@@ -5089,77 +5056,77 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	gboolean result = FALSE;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5096 "PhotoMetadata.c"
+#line 5063 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5108 "PhotoMetadata.c"
+#line 5075 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5115 "PhotoMetadata.c"
+#line 5082 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_;
 				MetadataRational _tmp3_ = {0};
 				gboolean _tmp4_;
-#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_rational (self, _tmp2_, &_tmp3_);
-#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_rational = _tmp3_;
-#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (rational) {
-#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*rational = _vala_rational;
-#line 5136 "PhotoMetadata.c"
+#line 5103 "PhotoMetadata.c"
 					}
-#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 5140 "PhotoMetadata.c"
+#line 5107 "PhotoMetadata.c"
 				}
-#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5144 "PhotoMetadata.c"
+#line 5111 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 616 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	metadata_rational_init (&_vala_rational, 0, 0);
-#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (rational) {
-#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 5156 "PhotoMetadata.c"
+#line 5123 "PhotoMetadata.c"
 	}
-#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5160 "PhotoMetadata.c"
+#line 5127 "PhotoMetadata.c"
 }
 
 
@@ -5171,74 +5138,74 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 	MetadataRational _tmp4_;
 	gint _tmp5_;
 	gboolean _tmp6_;
-#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (rational != NULL);
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = *rational;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_.numerator;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = *rational;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _tmp4_.denominator;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 5194 "PhotoMetadata.c"
+#line 5161 "PhotoMetadata.c"
 		const gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
 		const gchar* _tmp10_;
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = tag;
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = metadata_rational_to_string (rational);
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp8_;
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = self->priv->source_name;
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:625: Unable to set tag %s to rational %s from sourc" \
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:623: Unable to set tag %s to rational %s from sourc" \
 "e %s", _tmp7_, _tmp9_, _tmp10_);
-#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp9_);
-#line 5211 "PhotoMetadata.c"
+#line 5178 "PhotoMetadata.c"
 	}
 }
 
 
 static Block4Data* block4_data_ref (Block4Data* _data4_) {
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data4_->_ref_count_);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data4_;
-#line 5221 "PhotoMetadata.c"
+#line 5188 "PhotoMetadata.c"
 }
 
 
 static void block4_data_unref (void * _userdata_) {
 	Block4Data* _data4_;
 	_data4_ = (Block4Data*) _userdata_;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 5230 "PhotoMetadata.c"
+#line 5197 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data4_->self;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block4Data, _data4_);
-#line 5238 "PhotoMetadata.c"
+#line 5205 "PhotoMetadata.c"
 	}
 }
 
@@ -5247,24 +5214,24 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	MetadataRational _tmp1_;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data4_->self;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data4_->rational;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 5257 "PhotoMetadata.c"
+#line 5224 "PhotoMetadata.c"
 }
 
 
 static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda8_ (self, tag);
-#line 5264 "PhotoMetadata.c"
+#line 5231 "PhotoMetadata.c"
 }
 
 
@@ -5274,33 +5241,33 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
 	gchar** _tmp1_;
 	gint _tmp1__length1;
 	PhotoMetadataSetOption _tmp2_;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (rational != NULL);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = g_slice_new0 (Block4Data);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->_ref_count_ = 1;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->self = media_metadata_ref (self);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = *rational;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->rational = _tmp0_;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tags;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = tags_length1;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = option;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda8__photo_metadata_set_generic_value, _data4_);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block4_data_unref (_data4_);
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = NULL;
-#line 5300 "PhotoMetadata.c"
+#line 5267 "PhotoMetadata.c"
 }
 
 
@@ -5311,160 +5278,160 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 	gchar* _tmp1_;
 	const gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_string (self, _tmp0_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value = _tmp1_;
-#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = value;
-#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ == NULL) {
-#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (value);
-#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5331 "PhotoMetadata.c"
+#line 5298 "PhotoMetadata.c"
 	}
 	{
 		const gchar* _tmp3_;
 		MetadataDomain _tmp4_;
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = tag;
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_get_tag_domain (_tmp3_);
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		switch (_tmp4_) {
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_XMP:
-#line 5344 "PhotoMetadata.c"
+#line 5311 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp5_ = NULL;
 				const gchar* _tmp6_;
 				MetadataDateTime* _tmp7_;
 				MetadataDateTime* _tmp8_;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = value;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = metadata_date_time_new_from_xmp (_tmp6_, &_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _tmp7_;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5358 "PhotoMetadata.c"
-					goto __catch26_g_error;
+#line 5325 "PhotoMetadata.c"
+					goto __catch30_g_error;
 				}
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp5_;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp8_;
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (_tmp5_);
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5373 "PhotoMetadata.c"
+#line 5340 "PhotoMetadata.c"
 			}
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_IPTC:
-#line 5377 "PhotoMetadata.c"
+#line 5344 "PhotoMetadata.c"
 			{
-#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = NULL;
-#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5385 "PhotoMetadata.c"
+#line 5352 "PhotoMetadata.c"
 			}
 			default:
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_EXIF:
-#line 5390 "PhotoMetadata.c"
+#line 5357 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp9_ = NULL;
 				const gchar* _tmp10_;
 				MetadataDateTime* _tmp11_;
 				MetadataDateTime* _tmp12_;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = value;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = metadata_date_time_new_from_exif (_tmp10_, &_inner_error_);
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = _tmp11_;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5404 "PhotoMetadata.c"
-					goto __catch26_g_error;
+#line 5371 "PhotoMetadata.c"
+					goto __catch30_g_error;
 				}
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = _tmp9_;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = NULL;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp12_;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (_tmp9_);
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5419 "PhotoMetadata.c"
+#line 5386 "PhotoMetadata.c"
 			}
 		}
 	}
-	goto __finally26;
-	__catch26_g_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_;
 		const gchar* _tmp14_;
 		GError* _tmp15_;
 		const gchar* _tmp16_;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_inner_error_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = tag;
-#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = self->priv->source_name;
-#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = err;
-#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = _tmp15_->message;
+#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:652: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_);
 #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:654: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_);
-#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_error_free0 (err);
-#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (value);
-#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5453 "PhotoMetadata.c"
+#line 5420 "PhotoMetadata.c"
 	}
-	__finally26:
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	__finally30:
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (value);
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_clear_error (&_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 5464 "PhotoMetadata.c"
+#line 5431 "PhotoMetadata.c"
 }
 
 
@@ -5472,197 +5439,197 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	MetadataDateTime* result = NULL;
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5478 "PhotoMetadata.c"
+#line 5445 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5490 "PhotoMetadata.c"
+#line 5457 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5497 "PhotoMetadata.c"
+#line 5464 "PhotoMetadata.c"
 			{
 				MetadataDateTime* date_time = NULL;
 				const gchar* _tmp2_;
 				MetadataDateTime* _tmp3_;
 				MetadataDateTime* _tmp4_;
-#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_date_time (self, _tmp2_);
-#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				date_time = _tmp3_;
-#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = date_time;
-#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = date_time;
-#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 5519 "PhotoMetadata.c"
+#line 5486 "PhotoMetadata.c"
 				}
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (date_time);
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5525 "PhotoMetadata.c"
+#line 5492 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5533 "PhotoMetadata.c"
+#line 5500 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) {
 	const gchar* _tmp0_;
 	MetadataDomain _tmp1_;
-#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_METADATA_DATE_TIME (date_time));
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_tag_domain (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp1_) {
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 5554 "PhotoMetadata.c"
+#line 5521 "PhotoMetadata.c"
 		{
 			const gchar* _tmp2_;
 			MetadataDateTime* _tmp3_;
 			gchar* _tmp4_;
 			gchar* _tmp5_;
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = tag;
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = date_time;
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = metadata_date_time_get_exif_label (_tmp3_);
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _tmp4_;
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, _tmp2_, _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_tmp5_);
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 672 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5574 "PhotoMetadata.c"
+#line 5541 "PhotoMetadata.c"
 		}
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 5578 "PhotoMetadata.c"
+#line 5545 "PhotoMetadata.c"
 		{
 			const gchar* _tmp6_;
 			MetadataDateTime* _tmp7_;
 			gchar* _tmp8_;
 			gchar* _tmp9_;
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = tag;
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = date_time;
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp8_ = metadata_date_time_get_xmp_label (_tmp7_);
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = _tmp8_;
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, _tmp6_, _tmp9_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_tmp9_);
-#line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 676 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5598 "PhotoMetadata.c"
+#line 5565 "PhotoMetadata.c"
 		}
 		default:
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 5603 "PhotoMetadata.c"
+#line 5570 "PhotoMetadata.c"
 		{
 			const gchar* _tmp10_;
 			const gchar* _tmp11_;
 			const gchar* _tmp12_;
 			MetadataDomain _tmp13_;
 			GEnumValue* _tmp14_;
-#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = tag;
-#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp11_ = self->priv->source_name;
-#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp12_ = tag;
-#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp13_ = photo_metadata_get_tag_domain (_tmp12_);
-#line 684 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 682 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp14_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), _tmp13_);
-#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-			g_warning ("PhotoMetadata.vala:683: Cannot set date/time for %s from source %s: un" \
+#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_warning ("PhotoMetadata.vala:681: Cannot set date/time for %s from source %s: un" \
 "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
-#line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5624 "PhotoMetadata.c"
+#line 5591 "PhotoMetadata.c"
 		}
 	}
 }
 
 
 static gpointer _metadata_date_time_ref0 (gpointer self) {
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 5633 "PhotoMetadata.c"
+#line 5600 "PhotoMetadata.c"
 }
 
 
 static Block5Data* block5_data_ref (Block5Data* _data5_) {
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data5_->_ref_count_);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data5_;
-#line 5642 "PhotoMetadata.c"
+#line 5609 "PhotoMetadata.c"
 }
 
 
 static void block5_data_unref (void * _userdata_) {
 	Block5Data* _data5_;
 	_data5_ = (Block5Data*) _userdata_;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 5651 "PhotoMetadata.c"
+#line 5618 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data5_->self;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_metadata_date_time_unref0 (_data5_->date_time);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block5Data, _data5_);
-#line 5661 "PhotoMetadata.c"
+#line 5628 "PhotoMetadata.c"
 	}
 }
 
@@ -5671,24 +5638,24 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	MetadataDateTime* _tmp1_;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data5_->self;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data5_->date_time;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 5680 "PhotoMetadata.c"
+#line 5647 "PhotoMetadata.c"
 }
 
 
 static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda9_ (self, tag);
-#line 5687 "PhotoMetadata.c"
+#line 5654 "PhotoMetadata.c"
 }
 
 
@@ -5699,307 +5666,310 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
 	gchar** _tmp2_;
 	gint _tmp2__length1;
 	PhotoMetadataSetOption _tmp3_;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_METADATA_DATE_TIME (date_time));
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = g_slice_new0 (Block5Data);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->_ref_count_ = 1;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->self = media_metadata_ref (self);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _metadata_date_time_ref0 (_tmp0_);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_metadata_date_time_unref0 (_data5_->date_time);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->date_time = _tmp1_;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda9__photo_metadata_set_generic_value, _data5_);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block5_data_unref (_data5_);
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = NULL;
-#line 5728 "PhotoMetadata.c"
+#line 5695 "PhotoMetadata.c"
 }
 
 
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1) {
-	guint8* result = NULL;
+gchar* photo_metadata_exif_hash (PhotoMetadata* self) {
+	gchar* result = NULL;
 	ExifData* _tmp0_;
-	guchar* thumbnail = NULL;
-	ExifData* _tmp2_;
-	guchar* _tmp3_;
-	guint thumbnail_size = 0U;
+	const gchar* _tmp1_;
+	gchar* hash = NULL;
+	guchar* thumb = NULL;
 	ExifData* _tmp4_;
-	guint _tmp5_;
-	gboolean _tmp6_;
-	guint8* flattened = NULL;
-	gint flattened_length1;
-	gint _flattened_size_;
+	guchar* _tmp5_;
+	guint thumb_size = 0U;
+	ExifData* _tmp6_;
+	guint _tmp7_;
+	ExifData* _tmp8_;
+	ExifData* _tmp9_;
 	guchar* saved_data = NULL;
 	guint saved_size = 0U;
-	ExifData* _tmp9_;
-	gboolean _tmp10_ = FALSE;
-	guint _tmp11_;
-	ExifData* _tmp21_;
-	guchar* _tmp22_;
-	ExifData* _tmp23_;
-	guint _tmp24_;
-	guint8* _tmp25_;
-	gint _tmp25__length1;
-#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	ExifData* _tmp10_;
+	ExifData* _tmp11_;
+	guchar* _tmp12_;
+	ExifData* _tmp13_;
+	guint _tmp14_;
+	gboolean _tmp15_ = FALSE;
+	guint _tmp16_;
+#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 693 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exif;
-#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 693 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 5762 "PhotoMetadata.c"
-		guint8* _tmp1_;
-		gint _tmp1__length1;
-#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp1_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp1__length1 = 0;
-#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		if (result_length1) {
-#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-			*result_length1 = _tmp1__length1;
-#line 5773 "PhotoMetadata.c"
-		}
+#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		result = NULL;
+#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return result;
+#line 5731 "PhotoMetadata.c"
+	}
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		result = _tmp1_;
+	_tmp1_ = self->priv->metadata_hash;
 #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (_tmp1_ != NULL) {
+#line 5737 "PhotoMetadata.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
+#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp2_ = self->priv->metadata_hash;
+#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp3_ = g_strdup (_tmp2_);
+#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		result = _tmp3_;
+#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5779 "PhotoMetadata.c"
+#line 5748 "PhotoMetadata.c"
 	}
 #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp2_ = self->priv->exif;
-#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_ = _tmp2_->data;
-#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	thumbnail = _tmp3_;
-#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	hash = NULL;
+#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = self->priv->exif;
-#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp5_ = _tmp4_->size;
-#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	thumbnail_size = _tmp5_;
 #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6_ = include_preview;
+	_tmp5_ = _tmp4_->data;
 #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (!_tmp6_) {
-#line 5797 "PhotoMetadata.c"
-		ExifData* _tmp7_;
-		ExifData* _tmp8_;
+	thumb = _tmp5_;
 #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp7_ = self->priv->exif;
+	_tmp6_ = self->priv->exif;
 #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp7_->data = NULL;
-#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp8_ = self->priv->exif;
-#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp8_->size = (guint) 0;
-#line 5808 "PhotoMetadata.c"
-	}
-#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	flattened = NULL;
+	_tmp7_ = _tmp6_->size;
+#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	thumb_size = _tmp7_;
+#line 706 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp8_ = self->priv->exif;
+#line 706 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp8_->data = NULL;
 #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	flattened_length1 = 0;
+	_tmp9_ = self->priv->exif;
 #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_flattened_size_ = flattened_length1;
-#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp9_->size = (guint) 0;
+#line 709 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	saved_data = NULL;
-#line 711 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	saved_size = (guint) 0;
 #line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp9_ = self->priv->exif;
+	_tmp10_ = self->priv->exif;
 #line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	exif_data_save_data (_tmp9_, &saved_data, &saved_size);
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp11_ = saved_size;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (_tmp11_ > ((guint) 0)) {
-#line 5828 "PhotoMetadata.c"
-		guchar* _tmp12_;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp12_ = saved_data;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp10_ = _tmp12_ != NULL;
-#line 5834 "PhotoMetadata.c"
-	} else {
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp10_ = FALSE;
-#line 5838 "PhotoMetadata.c"
-	}
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (_tmp10_) {
-#line 5842 "PhotoMetadata.c"
-		guint _tmp13_;
-		guint8* _tmp14_;
-		guint8* _tmp15_;
-		gint _tmp15__length1;
-		guchar* _tmp16_;
-		guint _tmp17_;
-		ExifMem* _tmp18_;
-		ExifMem* _tmp19_;
-		guchar* _tmp20_;
-#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp13_ = saved_size;
+	exif_data_save_data (_tmp10_, &saved_data, &saved_size);
 #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp14_ = g_new0 (guint8, _tmp13_);
+	_tmp11_ = self->priv->exif;
 #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		flattened = (g_free (flattened), NULL);
+	_tmp12_ = thumb;
 #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		flattened = _tmp14_;
-#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		flattened_length1 = _tmp13_;
-#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_flattened_size_ = flattened_length1;
-#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp15_ = flattened;
-#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp15__length1 = flattened_length1;
+	_tmp11_->data = _tmp12_;
 #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp16_ = saved_data;
+	_tmp13_ = self->priv->exif;
 #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp17_ = saved_size;
+	_tmp14_ = thumb_size;
 #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		memcpy (_tmp15_, _tmp16_, (gsize) _tmp17_);
+	_tmp13_->size = _tmp14_;
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp18_ = exif_mem_new_default ();
+	_tmp16_ = saved_size;
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp19_ = _tmp18_;
+	if (_tmp16_ > ((guint) 0)) {
+#line 5796 "PhotoMetadata.c"
+		guchar* _tmp17_;
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp20_ = saved_data;
+		_tmp17_ = saved_data;
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp15_ = _tmp17_ != NULL;
+#line 5802 "PhotoMetadata.c"
+	} else {
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		exif_mem_free (_tmp19_, _tmp20_);
+		_tmp15_ = FALSE;
+#line 5806 "PhotoMetadata.c"
+	}
 #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_exif_mem_unref0 (_tmp19_);
-#line 5884 "PhotoMetadata.c"
-	}
-#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp21_ = self->priv->exif;
-#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp22_ = thumbnail;
-#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp21_->data = _tmp22_;
+	if (_tmp15_) {
+#line 5810 "PhotoMetadata.c"
+		GChecksum* md5 = NULL;
+		GChecksum* _tmp18_;
+		GChecksum* _tmp19_;
+		guchar* _tmp20_;
+		guint _tmp21_;
+		ExifMem* _tmp22_;
+		ExifMem* _tmp23_;
+		guchar* _tmp24_;
+		GChecksum* _tmp25_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+#line 718 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp18_ = g_checksum_new (G_CHECKSUM_MD5);
+#line 718 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		md5 = _tmp18_;
+#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp19_ = md5;
+#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp20_ = saved_data;
+#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp21_ = saved_size;
+#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_checksum_update (_tmp19_, (guchar*) _tmp20_, (gsize) _tmp21_);
+#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp22_ = exif_mem_new_default ();
+#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp23_ = _tmp22_;
+#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp24_ = saved_data;
+#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		exif_mem_free (_tmp23_, _tmp24_);
+#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_exif_mem_unref0 (_tmp23_);
+#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp25_ = md5;
+#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp26_ = g_checksum_get_string (_tmp25_);
 #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_ = self->priv->exif;
+		_tmp27_ = g_strdup (_tmp26_);
 #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp24_ = thumbnail_size;
+		_g_free0 (self->priv->metadata_hash);
 #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_->size = _tmp24_;
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp25_ = flattened;
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp25__length1 = flattened_length1;
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (result_length1) {
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		*result_length1 = _tmp25__length1;
-#line 5906 "PhotoMetadata.c"
-	}
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	result = _tmp25_;
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		self->priv->metadata_hash = _tmp27_;
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_checksum_free0 (md5);
+#line 5856 "PhotoMetadata.c"
+	}
+#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	result = hash;
+#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5912 "PhotoMetadata.c"
+#line 5862 "PhotoMetadata.c"
 }
 
 
-static guint8* _vala_array_dup5 (guint8* self, int length) {
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 5919 "PhotoMetadata.c"
-}
-
-
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1) {
-	guint8* result = NULL;
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_;
 	guchar* buffer = NULL;
 	gint buffer_length1 = 0;
 	gint _buffer_size_ = 0;
-	guchar* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint __tmp0__size_ = 0;
-	GExiv2Metadata* _tmp1_;
-	guint8* _tmp2_ = NULL;
-	gint _tmp3_;
-	gboolean _tmp4_;
-	guint8* _tmp6_;
-	gint _tmp6__length1;
-	guint8* _tmp7_;
-	gint _tmp7__length1;
-#line 728 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	GExiv2Metadata* _tmp3_;
+	guint8* _tmp4_ = NULL;
+	gint _tmp5_;
+	gboolean _tmp6_;
+#line 729 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp1_ = self->priv->exiv2;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp4_ = gexiv2_metadata_get_exif_thumbnail (_tmp1_, &_tmp2_, &_tmp3_);
+	_tmp0_ = self->priv->thumbnail_md5;
 #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (_tmp0_ != NULL) {
+#line 5882 "PhotoMetadata.c"
+		const gchar* _tmp1_;
+		gchar* _tmp2_;
+#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp1_ = self->priv->thumbnail_md5;
+#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp2_ = g_strdup (_tmp1_);
+#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		result = _tmp2_;
+#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return result;
+#line 5893 "PhotoMetadata.c"
+	}
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3_ = self->priv->exiv2;
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp6_ = gexiv2_metadata_get_exif_thumbnail (_tmp3_, &_tmp4_, &_tmp5_);
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer = (g_free (buffer), NULL);
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	buffer = _tmp2_;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	buffer_length1 = _tmp3_;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	buffer = _tmp4_;
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	buffer_length1 = _tmp5_;
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_buffer_size_ = buffer_length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (_tmp4_) {
-#line 5955 "PhotoMetadata.c"
-		guchar* _tmp5_;
-		gint _tmp5__length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp5_ = buffer;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp5__length1 = buffer_length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp0_ = _tmp5_;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp0__length1 = _tmp5__length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		__tmp0__size_ = _tmp0__length1;
-#line 5968 "PhotoMetadata.c"
-	} else {
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp0_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp0__length1 = 0;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		__tmp0__size_ = _tmp0__length1;
-#line 5976 "PhotoMetadata.c"
-	}
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6__length1 = _tmp0__length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp7_ = _tmp6_;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp7__length1 = _tmp6__length1;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (result_length1) {
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		*result_length1 = _tmp7__length1;
-#line 5990 "PhotoMetadata.c"
+#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (_tmp6_) {
+#line 5909 "PhotoMetadata.c"
+		GChecksum* md5 = NULL;
+		GChecksum* _tmp7_;
+		GChecksum* _tmp8_;
+		guchar* _tmp9_;
+		gint _tmp9__length1;
+		guchar* _tmp10_;
+		gint _tmp10__length1;
+		GChecksum* _tmp11_;
+		const gchar* _tmp12_;
+		gchar* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp7_ = g_checksum_new (G_CHECKSUM_MD5);
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		md5 = _tmp7_;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp8_ = md5;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp9_ = buffer;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp9__length1 = buffer_length1;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp10_ = buffer;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp10__length1 = buffer_length1;
+#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_checksum_update (_tmp8_, _tmp9_, (gsize) _tmp10__length1);
+#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp11_ = md5;
+#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp12_ = g_checksum_get_string (_tmp11_);
+#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp13_ = g_strdup (_tmp12_);
+#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_free0 (self->priv->thumbnail_md5);
+#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		self->priv->thumbnail_md5 = _tmp13_;
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp14_ = self->priv->thumbnail_md5;
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp15_ = g_strdup (_tmp14_);
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		result = _tmp15_;
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_checksum_free0 (md5);
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		buffer = (g_free (buffer), NULL);
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return result;
+#line 5960 "PhotoMetadata.c"
 	}
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	result = _tmp7_;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	result = NULL;
+#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer = (g_free (buffer), NULL);
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5998 "PhotoMetadata.c"
+#line 5968 "PhotoMetadata.c"
 }
 
 
@@ -6014,44 +5984,44 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 	gint _tmp3_ = 0;
 	GExiv2PreviewProperties** _tmp4_;
 	gint _tmp4__length1;
-#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 747 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0U);
-#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_);
-#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props = _tmp2_;
-#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props_length1 = _vala_array_length (_tmp1_);
-#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_props_size_ = props_length1;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = props;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4__length1 = props_length1;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 6031 "PhotoMetadata.c"
+#line 6001 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp5_;
 		gint _tmp5__length1;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = props_length1;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5__length1;
-#line 6040 "PhotoMetadata.c"
+#line 6010 "PhotoMetadata.c"
 	} else {
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = 0;
-#line 6044 "PhotoMetadata.c"
+#line 6014 "PhotoMetadata.c"
 	}
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = (guint) _tmp3_;
-#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6050 "PhotoMetadata.c"
+#line 6020 "PhotoMetadata.c"
 }
 
 
@@ -6073,112 +6043,112 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	guint _tmp10_;
 	GExiv2PreviewProperties* _tmp11_;
 	PhotoMetadataInternalPhotoPreview* _tmp12_;
-#line 740 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_);
-#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props = _tmp2_;
-#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props_length1 = _vala_array_length (_tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_props_size_ = props_length1;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = props;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4__length1 = props_length1;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == NULL) {
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 6092 "PhotoMetadata.c"
+#line 6062 "PhotoMetadata.c"
 	} else {
 		GExiv2PreviewProperties** _tmp5_;
 		gint _tmp5__length1;
 		guint _tmp6_;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = props_length1;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = number;
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 6105 "PhotoMetadata.c"
+#line 6075 "PhotoMetadata.c"
 	}
-#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 6113 "PhotoMetadata.c"
+#line 6083 "PhotoMetadata.c"
 	}
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = self->priv->source_name;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = number;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = props;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = props_length1;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = number;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = _tmp9_[_tmp10_];
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = photo_metadata_internal_photo_preview_new (self, _tmp7_, _tmp8_, _tmp11_);
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6133 "PhotoMetadata.c"
+#line 6103 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 	GExiv2Metadata* _tmp0_;
 	ExifData* _tmp1_;
-#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_erase_exif_thumbnail (_tmp0_);
-#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->exif;
-#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ != NULL) {
-#line 6150 "PhotoMetadata.c"
+#line 6120 "PhotoMetadata.c"
 		ExifMem* _tmp2_;
 		ExifMem* _tmp3_;
 		ExifData* _tmp4_;
 		guchar* _tmp5_;
 		ExifData* _tmp6_;
 		ExifData* _tmp7_;
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = exif_mem_new_default ();
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp2_;
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = self->priv->exif;
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_->data;
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		exif_mem_free (_tmp3_, _tmp5_);
-#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_exif_mem_unref0 (_tmp3_);
-#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = self->priv->exif;
-#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_->data = NULL;
-#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = self->priv->exif;
-#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_->size = (guint) 0;
-#line 6177 "PhotoMetadata.c"
+#line 6147 "PhotoMetadata.c"
 	}
 }
 
@@ -6186,58 +6156,58 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
 	GExiv2Metadata* _tmp0_;
 	const gchar* _tmp1_;
-#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 6195 "PhotoMetadata.c"
+#line 6165 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	gchar** _tmp0_;
 	gint _tmp0__length1;
-#line 761 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 6208 "PhotoMetadata.c"
+#line 6178 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6220 "PhotoMetadata.c"
+#line 6190 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 6227 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_remove_tag (self, _tmp2_);
-#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 6236 "PhotoMetadata.c"
+#line 6206 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6246,68 +6216,68 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 
 void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 	MetadataDomain _tmp0_;
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 780 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 6253 "PhotoMetadata.c"
+#line 6223 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_;
-#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_exif (_tmp1_);
-#line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 784 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6262 "PhotoMetadata.c"
+#line 6232 "PhotoMetadata.c"
 		}
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 6266 "PhotoMetadata.c"
+#line 6236 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp2_;
-#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = self->priv->exiv2;
-#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_xmp (_tmp2_);
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 788 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6275 "PhotoMetadata.c"
+#line 6245 "PhotoMetadata.c"
 		}
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 6279 "PhotoMetadata.c"
+#line 6249 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_;
-#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_iptc (_tmp3_);
-#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 792 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 6288 "PhotoMetadata.c"
+#line 6258 "PhotoMetadata.c"
 		}
 		default:
-#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 6293 "PhotoMetadata.c"
+#line 6263 "PhotoMetadata.c"
 	}
 }
 
 
 void photo_metadata_clear (PhotoMetadata* self) {
 	GExiv2Metadata* _tmp0_;
-#line 782 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 796 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear (_tmp0_);
-#line 6306 "PhotoMetadata.c"
+#line 6276 "PhotoMetadata.c"
 }
 
 
@@ -6316,58 +6286,58 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
 	gchar** _tmp0_;
 	gint _tmp0__length1;
 	MetadataDateTime* _tmp1_;
-#line 793 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 807 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_DATE_TIME_TAGS;
-#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6327 "PhotoMetadata.c"
+#line 6297 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_;
-#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6341 "PhotoMetadata.c"
+#line 6311 "PhotoMetadata.c"
 		gchar** _tmp1_;
 		gint _tmp1__length1;
 		MetadataDateTime* _tmp2_;
 		PhotoMetadataSetOption _tmp3_;
-#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DATE_TIME_TAGS;
-#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6356 "PhotoMetadata.c"
+#line 6326 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_;
 		gint _tmp4__length1;
-#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DATE_TIME_TAGS;
-#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6366 "PhotoMetadata.c"
+#line 6336 "PhotoMetadata.c"
 	}
 }
 
@@ -6377,58 +6347,58 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 	gchar** _tmp0_;
 	gint _tmp0__length1;
 	MetadataDateTime* _tmp1_;
-#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 828 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6388 "PhotoMetadata.c"
+#line 6358 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_;
-#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6402 "PhotoMetadata.c"
+#line 6372 "PhotoMetadata.c"
 		gchar** _tmp1_;
 		gint _tmp1__length1;
 		MetadataDateTime* _tmp2_;
 		PhotoMetadataSetOption _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6417 "PhotoMetadata.c"
+#line 6387 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_;
 		gint _tmp4__length1;
-#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6427 "PhotoMetadata.c"
+#line 6397 "PhotoMetadata.c"
 	}
 }
 
@@ -6438,58 +6408,58 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 	gchar** _tmp0_;
 	gint _tmp0__length1;
 	MetadataDateTime* _tmp1_;
-#line 831 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6449 "PhotoMetadata.c"
+#line 6419 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_;
-#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6463 "PhotoMetadata.c"
+#line 6433 "PhotoMetadata.c"
 		gchar** _tmp1_;
 		gint _tmp1__length1;
 		MetadataDateTime* _tmp2_;
 		PhotoMetadataSetOption _tmp3_;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6478 "PhotoMetadata.c"
+#line 6448 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_;
 		gint _tmp4__length1;
-#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6488 "PhotoMetadata.c"
+#line 6458 "PhotoMetadata.c"
 	}
 }
 
@@ -6500,38 +6470,38 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 	MetadataDateTime* creation = NULL;
 	MetadataDateTime* _tmp0_;
 	MetadataDateTime* _tmp1_;
-#line 843 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 857 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_exposure_date_time (self);
-#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	creation = _tmp0_;
-#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = creation;
-#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ == NULL) {
-#line 6509 "PhotoMetadata.c"
+#line 6479 "PhotoMetadata.c"
 		MetadataDateTime* _tmp2_;
-#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_digitized_date_time (self);
-#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_metadata_date_time_unref0 (creation);
-#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		creation = _tmp2_;
-#line 6517 "PhotoMetadata.c"
+#line 6487 "PhotoMetadata.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = creation;
-#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6523 "PhotoMetadata.c"
+#line 6493 "PhotoMetadata.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 6530 "PhotoMetadata.c"
+#line 6500 "PhotoMetadata.c"
 }
 
 
@@ -6541,31 +6511,31 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	gint _tmp0__length1;
 	gchar** _tmp1_;
 	gint _tmp1__length1;
-#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_WIDTH_TAGS;
-#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_HEIGHT_TAGS;
-#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 6552 "PhotoMetadata.c"
+#line 6522 "PhotoMetadata.c"
 	{
 		gint ctr = 0;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		ctr = 0;
-#line 6557 "PhotoMetadata.c"
+#line 6527 "PhotoMetadata.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = TRUE;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 6564 "PhotoMetadata.c"
+#line 6534 "PhotoMetadata.c"
 				gint _tmp4_;
 				gchar** _tmp5_;
 				gint _tmp5__length1;
@@ -6587,99 +6557,99 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				glong _tmp17_;
 				Dimensions _tmp18_ = {0};
 				Dimensions* _tmp19_;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp2_) {
-#line 6588 "PhotoMetadata.c"
+#line 6558 "PhotoMetadata.c"
 					gint _tmp3_;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp3_ = ctr;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					ctr = _tmp3_ + 1;
-#line 6594 "PhotoMetadata.c"
+#line 6564 "PhotoMetadata.c"
 				}
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = ctr;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = photo_metadata_WIDTH_TAGS;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!(_tmp4_ < _tmp5__length1)) {
-#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 6608 "PhotoMetadata.c"
+#line 6578 "PhotoMetadata.c"
 				}
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_WIDTH_TAGS;
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = ctr;
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = photo_metadata_get_long (self, _tmp8_, &_tmp9_);
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				width = _tmp9_;
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6626 "PhotoMetadata.c"
+#line 6596 "PhotoMetadata.c"
 				}
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = photo_metadata_HEIGHT_TAGS;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = ctr;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = _tmp11_[_tmp12_];
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp15_ = photo_metadata_get_long (self, _tmp13_, &_tmp14_);
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				height = _tmp14_;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp15_) {
-#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6644 "PhotoMetadata.c"
+#line 6614 "PhotoMetadata.c"
 				}
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp16_ = width;
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp17_ = height;
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				dimensions_init (&_tmp18_, (gint) _tmp16_, (gint) _tmp17_);
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp19_ = _dimensions_dup0 (&_tmp18_);
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp19_;
-#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 6658 "PhotoMetadata.c"
+#line 6628 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6666 "PhotoMetadata.c"
+#line 6636 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) {
 	Dimensions* _tmp0_;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = dim;
-#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 6678 "PhotoMetadata.c"
+#line 6648 "PhotoMetadata.c"
 		gchar** _tmp1_;
 		gint _tmp1__length1;
 		Dimensions* _tmp2_;
@@ -6690,49 +6660,49 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		Dimensions* _tmp6_;
 		gint _tmp7_;
 		PhotoMetadataSetOption _tmp8_;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_WIDTH_TAGS;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = dim;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = (*_tmp2_).width;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = option;
-#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp1_, _tmp1__length1, (glong) _tmp3_, _tmp4_);
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = photo_metadata_HEIGHT_TAGS;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = dim;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = (*_tmp6_).height;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = option;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 6713 "PhotoMetadata.c"
+#line 6683 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp9_;
 		gint _tmp9__length1;
 		gchar** _tmp10_;
 		gint _tmp10__length1;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = photo_metadata_WIDTH_TAGS;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp9_, _tmp9__length1);
-#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = photo_metadata_HEIGHT_TAGS;
-#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 6731 "PhotoMetadata.c"
+#line 6701 "PhotoMetadata.c"
 	}
 }
 
@@ -6756,7 +6726,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6755 "PhotoMetadata.c"
+#line 6725 "PhotoMetadata.c"
 }
 
 
@@ -6776,7 +6746,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6775 "PhotoMetadata.c"
+#line 6745 "PhotoMetadata.c"
 }
 
 
@@ -6799,226 +6769,226 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	const gchar* _tmp21_;
 	gboolean _tmp22_;
 	gchar* _tmp28_;
-#line 925 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 939 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 6804 "PhotoMetadata.c"
+#line 6774 "PhotoMetadata.c"
 		GeeList* _tmp2_;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp0_);
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp2_;
-#line 6812 "PhotoMetadata.c"
+#line 6782 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp3_;
 		gint _tmp3__length1;
 		GeeList* _tmp4_;
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_get_first_string_multiple (self, _tmp3_, _tmp3__length1);
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp0_);
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp4_;
-#line 6827 "PhotoMetadata.c"
+#line 6797 "PhotoMetadata.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _g_object_ref0 (_tmp0_);
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	titles = _tmp5_;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = titles;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_ != NULL) {
-#line 6837 "PhotoMetadata.c"
+#line 6807 "PhotoMetadata.c"
 		GeeList* _tmp9_;
 		gint _tmp10_;
 		gint _tmp11_;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = titles;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp10_;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp11_ > 0;
-#line 6849 "PhotoMetadata.c"
+#line 6819 "PhotoMetadata.c"
 	} else {
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = FALSE;
-#line 6853 "PhotoMetadata.c"
+#line 6823 "PhotoMetadata.c"
 	}
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_) {
-#line 6857 "PhotoMetadata.c"
+#line 6827 "PhotoMetadata.c"
 		GeeList* _tmp12_;
 		gpointer _tmp13_;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = titles;
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = gee_list_get (_tmp12_, 0);
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = (gchar*) _tmp13_;
-#line 6868 "PhotoMetadata.c"
+#line 6838 "PhotoMetadata.c"
 	} else {
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = NULL;
-#line 6874 "PhotoMetadata.c"
+#line 6844 "PhotoMetadata.c"
 	}
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strdup (_tmp6_);
-#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	title = _tmp14_;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = title;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15_ != NULL) {
-#line 6884 "PhotoMetadata.c"
+#line 6854 "PhotoMetadata.c"
 		const gchar* _tmp16_;
 		gchar* _tmp17_;
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = title;
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = string_strip (_tmp16_);
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (title);
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		title = _tmp17_;
-#line 6895 "PhotoMetadata.c"
+#line 6865 "PhotoMetadata.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = title;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp22_ = is_string_empty (_tmp21_);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp22_) {
-#line 6903 "PhotoMetadata.c"
+#line 6873 "PhotoMetadata.c"
 		const gchar* _tmp23_;
 		gboolean _tmp24_;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = title;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = string_contains (_tmp23_, "\n");
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = !_tmp24_;
-#line 6912 "PhotoMetadata.c"
+#line 6882 "PhotoMetadata.c"
 	} else {
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = FALSE;
-#line 6916 "PhotoMetadata.c"
+#line 6886 "PhotoMetadata.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_) {
-#line 6920 "PhotoMetadata.c"
+#line 6890 "PhotoMetadata.c"
 		const gchar* _tmp25_;
 		gboolean _tmp26_;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = title;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = string_contains (_tmp25_, "\r");
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = !_tmp26_;
-#line 6929 "PhotoMetadata.c"
+#line 6899 "PhotoMetadata.c"
 	} else {
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 6933 "PhotoMetadata.c"
+#line 6903 "PhotoMetadata.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 6937 "PhotoMetadata.c"
+#line 6907 "PhotoMetadata.c"
 		const gchar* _tmp27_;
-#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = title;
-#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = _tmp27_;
-#line 6943 "PhotoMetadata.c"
+#line 6913 "PhotoMetadata.c"
 	} else {
-#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = NULL;
-#line 6947 "PhotoMetadata.c"
+#line 6917 "PhotoMetadata.c"
 	}
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = g_strdup (_tmp18_);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp28_;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (title);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp6_);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (titles);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_tmp0_);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6963 "PhotoMetadata.c"
+#line 6933 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) {
 	const gchar* _tmp0_;
 	gboolean _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = title;
-#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6978 "PhotoMetadata.c"
+#line 6948 "PhotoMetadata.c"
 		gboolean _tmp2_;
-#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp2_) {
-#line 6984 "PhotoMetadata.c"
+#line 6954 "PhotoMetadata.c"
 			const gchar* _tmp3_;
-#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = title;
-#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6990 "PhotoMetadata.c"
+#line 6960 "PhotoMetadata.c"
 		} else {
 			gchar** _tmp4_;
 			gint _tmp4__length1;
 			const gchar* _tmp5_;
 			PhotoMetadataSetOption _tmp6_;
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = title;
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = option;
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 7006 "PhotoMetadata.c"
+#line 6976 "PhotoMetadata.c"
 		}
 	} else {
 		gchar** _tmp7_;
 		gint _tmp7__length1;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 7017 "PhotoMetadata.c"
+#line 6987 "PhotoMetadata.c"
 	}
 }
 
@@ -7029,47 +6999,47 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
 	gchar** _tmp0_;
 	gint _tmp0__length1;
 	gchar* _tmp1_;
-#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_COMMENT_TAGS;
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_COMMENT_TAGS_length1;
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1);
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7040 "PhotoMetadata.c"
+#line 7010 "PhotoMetadata.c"
 }
 
 
 static Block6Data* block6_data_ref (Block6Data* _data6_) {
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data6_->_ref_count_);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data6_;
-#line 7049 "PhotoMetadata.c"
+#line 7019 "PhotoMetadata.c"
 }
 
 
 static void block6_data_unref (void * _userdata_) {
 	Block6Data* _data6_;
 	_data6_ = (Block6Data*) _userdata_;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
-#line 7058 "PhotoMetadata.c"
+#line 7028 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data6_->self;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_data6_->comment);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block6Data, _data6_);
-#line 7068 "PhotoMetadata.c"
+#line 7038 "PhotoMetadata.c"
 	}
 }
 
@@ -7078,24 +7048,24 @@ static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data6_->self;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data6_->comment;
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
-#line 7087 "PhotoMetadata.c"
+#line 7057 "PhotoMetadata.c"
 }
 
 
 static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	___lambda10_ (self, tag);
-#line 7094 "PhotoMetadata.c"
+#line 7064 "PhotoMetadata.c"
 }
 
 
@@ -7105,57 +7075,57 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
 	gchar* _tmp1_;
 	const gchar* _tmp2_;
 	gboolean _tmp3_;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data6_ = g_slice_new0 (Block6Data);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data6_->_ref_count_ = 1;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data6_->self = media_metadata_ref (self);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = comment;
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_data6_->comment);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data6_->comment = _tmp1_;
-#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = _data6_->comment;
-#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = is_string_empty (_tmp2_);
-#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
-#line 7126 "PhotoMetadata.c"
+#line 7096 "PhotoMetadata.c"
 		gchar** _tmp4_;
 		gint _tmp4__length1;
 		PhotoMetadataSetOption _tmp5_;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_COMMENT_TAGS;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_COMMENT_TAGS_length1;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = option;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_);
-#line 7138 "PhotoMetadata.c"
+#line 7108 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp6_;
 		gint _tmp6__length1;
-#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = photo_metadata_COMMENT_TAGS;
-#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6__length1 = photo_metadata_COMMENT_TAGS_length1;
-#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1);
-#line 7148 "PhotoMetadata.c"
+#line 7118 "PhotoMetadata.c"
 	}
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block6_data_unref (_data6_);
-#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data6_ = NULL;
-#line 7154 "PhotoMetadata.c"
+#line 7124 "PhotoMetadata.c"
 }
 
 
@@ -7168,114 +7138,114 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	gboolean _tmp23_ = FALSE;
 	GeeSet* _tmp24_;
 	GeeSet* _tmp29_;
-#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1015 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	keywords = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_KEYWORD_TAGS;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 7175 "PhotoMetadata.c"
+#line 7145 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 7187 "PhotoMetadata.c"
+#line 7157 "PhotoMetadata.c"
 			gchar* _tmp1_;
 			gchar* tag = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 7194 "PhotoMetadata.c"
+#line 7164 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				const gchar* _tmp2_;
 				GeeList* _tmp3_;
 				gboolean _tmp4_ = FALSE;
 				GeeCollection* _tmp5_;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_);
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = values;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 7211 "PhotoMetadata.c"
+#line 7181 "PhotoMetadata.c"
 					GeeCollection* _tmp6_;
 					gint _tmp7_;
 					gint _tmp8_;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = gee_collection_get_size (_tmp6_);
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = _tmp7_;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 7223 "PhotoMetadata.c"
+#line 7193 "PhotoMetadata.c"
 				} else {
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 7227 "PhotoMetadata.c"
+#line 7197 "PhotoMetadata.c"
 				}
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 7231 "PhotoMetadata.c"
+#line 7201 "PhotoMetadata.c"
 					GeeSet* _tmp9_;
-#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = keywords;
-#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp9_ == NULL) {
-#line 7237 "PhotoMetadata.c"
+#line 7207 "PhotoMetadata.c"
 						GCompareDataFunc _tmp10_;
 						void* _tmp10__target;
 						GDestroyNotify _tmp10__target_destroy_notify;
 						GeeSet* _tmp11_;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10_ = compare_func;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10__target = compare_func_target;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10__target_destroy_notify = compare_func_target_destroy_notify;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						compare_func = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						compare_func_target = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						compare_func_target_destroy_notify = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify);
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (keywords);
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						keywords = _tmp11_;
-#line 7260 "PhotoMetadata.c"
+#line 7230 "PhotoMetadata.c"
 					}
 					{
 						GeeIterator* _current_value_it = NULL;
 						GeeCollection* _tmp12_;
 						GeeIterator* _tmp13_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp12_ = values;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_current_value_it = _tmp13_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 7274 "PhotoMetadata.c"
+#line 7244 "PhotoMetadata.c"
 							GeeIterator* _tmp14_;
 							gboolean _tmp15_;
 							gchar* current_value = NULL;
@@ -7285,111 +7255,111 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							const gchar* _tmp19_;
 							gchar* _tmp20_;
 							gchar* _tmp21_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp14_ = _current_value_it;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp15_ = gee_iterator_next (_tmp14_);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (!_tmp15_) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 7292 "PhotoMetadata.c"
+#line 7262 "PhotoMetadata.c"
 							}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = _current_value_it;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = gee_iterator_get (_tmp16_);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							current_value = (gchar*) _tmp17_;
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp18_ = keywords;
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = current_value;
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_);
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp21_ = _tmp20_;
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (_tmp21_);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (current_value);
-#line 7314 "PhotoMetadata.c"
+#line 7284 "PhotoMetadata.c"
 						}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_current_value_it);
-#line 7318 "PhotoMetadata.c"
+#line 7288 "PhotoMetadata.c"
 					}
 				}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 7325 "PhotoMetadata.c"
+#line 7295 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = keywords;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp24_ != NULL) {
-#line 7333 "PhotoMetadata.c"
+#line 7303 "PhotoMetadata.c"
 		GeeSet* _tmp25_;
 		gint _tmp26_;
 		gint _tmp27_;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = keywords;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = _tmp26_;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp27_ > 0;
-#line 7345 "PhotoMetadata.c"
+#line 7315 "PhotoMetadata.c"
 	} else {
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = FALSE;
-#line 7349 "PhotoMetadata.c"
+#line 7319 "PhotoMetadata.c"
 	}
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp23_) {
-#line 7353 "PhotoMetadata.c"
+#line 7323 "PhotoMetadata.c"
 		GeeSet* _tmp28_;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp28_ = keywords;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp28_;
-#line 7359 "PhotoMetadata.c"
+#line 7329 "PhotoMetadata.c"
 	} else {
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 7363 "PhotoMetadata.c"
+#line 7333 "PhotoMetadata.c"
 	}
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp29_;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (keywords);
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7381 "PhotoMetadata.c"
+#line 7351 "PhotoMetadata.c"
 }
 
 
 static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 7388 "PhotoMetadata.c"
+#line 7358 "PhotoMetadata.c"
 }
 
 
@@ -7408,20 +7378,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 7407 "PhotoMetadata.c"
+#line 7377 "PhotoMetadata.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 7414 "PhotoMetadata.c"
+#line 7384 "PhotoMetadata.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 7420 "PhotoMetadata.c"
+#line 7390 "PhotoMetadata.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -7431,11 +7401,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 7430 "PhotoMetadata.c"
+#line 7400 "PhotoMetadata.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7434 "PhotoMetadata.c"
+#line 7404 "PhotoMetadata.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -7443,7 +7413,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7442 "PhotoMetadata.c"
+#line 7412 "PhotoMetadata.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -7475,8 +7445,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7474 "PhotoMetadata.c"
-				goto __catch27_g_regex_error;
+#line 7444 "PhotoMetadata.c"
+				goto __catch31_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -7484,7 +7454,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7483 "PhotoMetadata.c"
+#line 7453 "PhotoMetadata.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -7500,8 +7470,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7499 "PhotoMetadata.c"
-				goto __catch27_g_regex_error;
+#line 7469 "PhotoMetadata.c"
+				goto __catch31_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -7511,7 +7481,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7510 "PhotoMetadata.c"
+#line 7480 "PhotoMetadata.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -7525,10 +7495,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7524 "PhotoMetadata.c"
+#line 7494 "PhotoMetadata.c"
 	}
-	goto __finally27;
-	__catch27_g_regex_error:
+	goto __finally31;
+	__catch31_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -7539,9 +7509,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7538 "PhotoMetadata.c"
+#line 7508 "PhotoMetadata.c"
 	}
-	__finally27:
+	__finally31:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -7550,7 +7520,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7549 "PhotoMetadata.c"
+#line 7519 "PhotoMetadata.c"
 	}
 }
 
@@ -7574,7 +7544,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7573 "PhotoMetadata.c"
+#line 7543 "PhotoMetadata.c"
 		glong _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -7582,7 +7552,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7581 "PhotoMetadata.c"
+#line 7551 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -7594,7 +7564,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 7593 "PhotoMetadata.c"
+#line 7563 "PhotoMetadata.c"
 	}
 }
 
@@ -7618,21 +7588,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7617 "PhotoMetadata.c"
+#line 7587 "PhotoMetadata.c"
 		glong _tmp2_;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7623 "PhotoMetadata.c"
+#line 7593 "PhotoMetadata.c"
 	} else {
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7627 "PhotoMetadata.c"
+#line 7597 "PhotoMetadata.c"
 	}
 #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7631 "PhotoMetadata.c"
+#line 7601 "PhotoMetadata.c"
 		glong _tmp3_;
 		glong _tmp4_;
 		glong _tmp5_;
@@ -7644,7 +7614,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7643 "PhotoMetadata.c"
+#line 7613 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_;
 		gint _tmp7_;
@@ -7654,13 +7624,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7653 "PhotoMetadata.c"
+#line 7623 "PhotoMetadata.c"
 	}
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7659 "PhotoMetadata.c"
+#line 7629 "PhotoMetadata.c"
 		glong _tmp9_;
 		glong _tmp10_;
 		glong _tmp11_;
@@ -7674,7 +7644,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7673 "PhotoMetadata.c"
+#line 7643 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_;
 		glong _tmp13_;
@@ -7684,13 +7654,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7683 "PhotoMetadata.c"
+#line 7653 "PhotoMetadata.c"
 	}
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7689 "PhotoMetadata.c"
+#line 7659 "PhotoMetadata.c"
 		glong _tmp15_;
 		glong _tmp16_;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -7699,7 +7669,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7698 "PhotoMetadata.c"
+#line 7668 "PhotoMetadata.c"
 	}
 #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -7719,7 +7689,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 7718 "PhotoMetadata.c"
+#line 7688 "PhotoMetadata.c"
 }
 
 
@@ -7729,81 +7699,81 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	HierarchicalTagIndex* _tmp4_;
 	HierarchicalKeywordField** _tmp5_;
 	gint _tmp5__length1;
-#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((index == NULL) || IS_HIERARCHICAL_TAG_INDEX (index));
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7736 "PhotoMetadata.c"
+#line 7706 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
 		gint _current_field_collection_size_ = 0;
 		gint current_field_it = 0;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection = _tmp0_;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection_length1 = _tmp0__length1;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 7748 "PhotoMetadata.c"
+#line 7718 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_;
 			HierarchicalKeywordField* current_field = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp1_;
-#line 7755 "PhotoMetadata.c"
+#line 7725 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp2_;
 				const gchar* _tmp3_;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = current_field;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = _tmp2_->field_name;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_remove_tag (self, _tmp3_);
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7767 "PhotoMetadata.c"
+#line 7737 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = index;
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == NULL) {
-#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 7777 "PhotoMetadata.c"
+#line 7747 "PhotoMetadata.c"
 	}
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7783 "PhotoMetadata.c"
+#line 7753 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
 		gint _current_field_collection_size_ = 0;
 		gint current_field_it = 0;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection = _tmp5_;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection_length1 = _tmp5__length1;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 7795 "PhotoMetadata.c"
+#line 7765 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp6_;
 			HierarchicalKeywordField* current_field = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp6_;
-#line 7802 "PhotoMetadata.c"
+#line 7772 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp7_;
 				gboolean _tmp8_;
@@ -7812,23 +7782,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				HierarchicalKeywordField* _tmp29_;
 				const gchar* _tmp30_;
 				GeeSet* _tmp31_;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = current_field;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp7_->is_writeable;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp8_) {
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (current_field);
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 7821 "PhotoMetadata.c"
+#line 7791 "PhotoMetadata.c"
 				}
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 7827 "PhotoMetadata.c"
+#line 7797 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_path_it = NULL;
 					HierarchicalTagIndex* _tmp10_;
@@ -7836,23 +7806,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					GeeCollection* _tmp12_;
 					GeeIterator* _tmp13_;
 					GeeIterator* _tmp14_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp10_ = index;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp12_ = _tmp11_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp14_ = _tmp13_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_tmp12_);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_path_it = _tmp14_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 7851 "PhotoMetadata.c"
+#line 7821 "PhotoMetadata.c"
 						GeeIterator* _tmp15_;
 						gboolean _tmp16_;
 						gchar* current_path = NULL;
@@ -7867,80 +7837,80 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						gboolean _tmp24_;
 						GeeSet* _tmp27_;
 						const gchar* _tmp28_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp15_ = _current_path_it;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp16_) {
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 7874 "PhotoMetadata.c"
+#line 7844 "PhotoMetadata.c"
 						}
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_path_it;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_path = (gchar*) _tmp18_;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp19_ = current_path;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp20_ = current_field;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = _tmp20_->path_separator;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_);
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						writeable_path = _tmp22_;
-#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp23_ = current_field;
-#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp24_ = _tmp23_->wants_leading_separator;
-#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp24_) {
-#line 7898 "PhotoMetadata.c"
+#line 7868 "PhotoMetadata.c"
 							const gchar* _tmp25_;
 							gchar* _tmp26_;
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp25_ = writeable_path;
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1);
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (writeable_path);
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							writeable_path = _tmp26_;
-#line 7909 "PhotoMetadata.c"
+#line 7879 "PhotoMetadata.c"
 						}
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp27_ = writeable_set;
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp28_ = writeable_path;
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (writeable_path);
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_path);
-#line 7921 "PhotoMetadata.c"
+#line 7891 "PhotoMetadata.c"
 					}
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_path_it);
-#line 7925 "PhotoMetadata.c"
+#line 7895 "PhotoMetadata.c"
 				}
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp29_ = current_field;
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp30_ = _tmp29_->field_name;
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp31_ = writeable_set;
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (writeable_set);
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 7939 "PhotoMetadata.c"
+#line 7909 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -7954,23 +7924,23 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 	GeeTreeSet* _tmp1_;
 	GeeCollection* _tmp2_;
 	GeeCollection* _tmp28_;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((keywords == NULL) || GEE_IS_COLLECTION (keywords));
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = hierarchical_tag_index_new ();
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	htag_index = _tmp0_;
-#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = keywords;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 7969 "PhotoMetadata.c"
+#line 7939 "PhotoMetadata.c"
 		GeeSet* _tmp24_;
 		HierarchicalTagIndex* _tmp25_;
 		GeeCollection* _tmp26_;
@@ -7979,15 +7949,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp3_;
 			GeeIterator* _tmp4_;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = keywords;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_keyword_it = _tmp4_;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 7986 "PhotoMetadata.c"
+#line 7956 "PhotoMetadata.c"
 				GeeIterator* _tmp5_;
 				gboolean _tmp6_;
 				gchar* keyword = NULL;
@@ -7995,52 +7965,52 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				gpointer _tmp8_;
 				const gchar* _tmp9_;
 				gboolean _tmp10_;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _keyword_it;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = gee_iterator_next (_tmp5_);
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp6_) {
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 8002 "PhotoMetadata.c"
+#line 7972 "PhotoMetadata.c"
 				}
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _keyword_it;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = gee_iterator_get (_tmp7_);
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				keyword = (gchar*) _tmp8_;
-#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = keyword;
-#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
-#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp10_) {
-#line 8016 "PhotoMetadata.c"
+#line 7986 "PhotoMetadata.c"
 					GeeCollection* path_components = NULL;
 					const gchar* _tmp11_;
 					GeeList* _tmp12_;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = keyword;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 8026 "PhotoMetadata.c"
+#line 7996 "PhotoMetadata.c"
 					{
 						GeeIterator* _component_it = NULL;
 						GeeCollection* _tmp13_;
 						GeeIterator* _tmp14_;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp13_ = path_components;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_component_it = _tmp14_;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 8039 "PhotoMetadata.c"
+#line 8009 "PhotoMetadata.c"
 							GeeIterator* _tmp15_;
 							gboolean _tmp16_;
 							gchar* component = NULL;
@@ -8049,117 +8019,117 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							HierarchicalTagIndex* _tmp19_;
 							const gchar* _tmp20_;
 							const gchar* _tmp21_;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp15_ = _component_it;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (!_tmp16_) {
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 8056 "PhotoMetadata.c"
+#line 8026 "PhotoMetadata.c"
 							}
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = _component_it;
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							component = (gchar*) _tmp18_;
-#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = htag_index;
-#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp20_ = component;
-#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp21_ = keyword;
-#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (component);
-#line 8074 "PhotoMetadata.c"
+#line 8044 "PhotoMetadata.c"
 						}
-#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_component_it);
-#line 8078 "PhotoMetadata.c"
+#line 8048 "PhotoMetadata.c"
 					}
-#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (path_components);
-#line 8082 "PhotoMetadata.c"
+#line 8052 "PhotoMetadata.c"
 				} else {
 					GeeSet* _tmp22_;
 					const gchar* _tmp23_;
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp22_ = flat_keywords;
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23_ = keyword;
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 8092 "PhotoMetadata.c"
+#line 8062 "PhotoMetadata.c"
 				}
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (keyword);
-#line 8096 "PhotoMetadata.c"
+#line 8066 "PhotoMetadata.c"
 			}
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_keyword_it);
-#line 8100 "PhotoMetadata.c"
+#line 8070 "PhotoMetadata.c"
 		}
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = flat_keywords;
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = htag_index;
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_);
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = _tmp26_;
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp27_);
-#line 8114 "PhotoMetadata.c"
+#line 8084 "PhotoMetadata.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = keywords;
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp28_ != NULL) {
-#line 8120 "PhotoMetadata.c"
+#line 8090 "PhotoMetadata.c"
 		gchar** _tmp29_;
 		gint _tmp29__length1;
 		GeeSet* _tmp30_;
 		PhotoMetadataSetOption _tmp31_;
 		HierarchicalTagIndex* _tmp32_;
-#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp29_ = photo_metadata_KEYWORD_TAGS;
-#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = flat_keywords;
-#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp31_ = option;
-#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp32_ = htag_index;
-#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 8140 "PhotoMetadata.c"
+#line 8110 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp33_;
 		gint _tmp33__length1;
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp33_ = photo_metadata_KEYWORD_TAGS;
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1081 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 8152 "PhotoMetadata.c"
+#line 8122 "PhotoMetadata.c"
 	}
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (flat_keywords);
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_hierarchical_tag_index_unref0 (htag_index);
-#line 8158 "PhotoMetadata.c"
+#line 8128 "PhotoMetadata.c"
 }
 
 
@@ -8167,32 +8137,32 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	HierarchicalKeywordField** _tmp0_;
 	gint _tmp0__length1;
-#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8172 "PhotoMetadata.c"
+#line 8142 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
 		gint _field_collection_size_ = 0;
 		gint field_it = 0;
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection = _tmp0_;
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection_length1 = _tmp0__length1;
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 8184 "PhotoMetadata.c"
+#line 8154 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_;
 			HierarchicalKeywordField* field = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp1_;
-#line 8191 "PhotoMetadata.c"
+#line 8161 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp2_;
@@ -8200,61 +8170,61 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 				GeeList* _tmp4_;
 				gboolean _tmp5_ = FALSE;
 				GeeCollection* _tmp6_;
-#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = field;
-#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = _tmp2_->field_name;
-#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_string_multiple (self, _tmp3_);
-#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = values;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp6_ != NULL) {
-#line 8211 "PhotoMetadata.c"
+#line 8181 "PhotoMetadata.c"
 					GeeCollection* _tmp7_;
 					gint _tmp8_;
 					gint _tmp9_;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = values;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = gee_collection_get_size (_tmp7_);
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = _tmp8_;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = _tmp9_ > 0;
-#line 8223 "PhotoMetadata.c"
+#line 8193 "PhotoMetadata.c"
 				} else {
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = FALSE;
-#line 8227 "PhotoMetadata.c"
+#line 8197 "PhotoMetadata.c"
 				}
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_) {
-#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (values);
-#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (field);
-#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 8239 "PhotoMetadata.c"
+#line 8209 "PhotoMetadata.c"
 				}
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8245 "PhotoMetadata.c"
+#line 8215 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8253 "PhotoMetadata.c"
+#line 8223 "PhotoMetadata.c"
 }
 
 
@@ -8266,40 +8236,40 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	HierarchicalKeywordField** _tmp2_;
 	gint _tmp2__length1;
 	GError * _inner_error_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_hierarchical_keywords (self);
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0_, "has_hierarchical_keywords()");
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL);
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	h_keywords = _tmp1_;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8279 "PhotoMetadata.c"
+#line 8249 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
 		gint _field_collection_size_ = 0;
 		gint field_it = 0;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection = _tmp2_;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection_length1 = _tmp2__length1;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 8291 "PhotoMetadata.c"
+#line 8261 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp3_;
 			HierarchicalKeywordField* field = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp3_;
-#line 8298 "PhotoMetadata.c"
+#line 8268 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp4_;
@@ -8309,85 +8279,85 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				GeeCollection* _tmp8_;
 				GeeArrayList* transformed_values = NULL;
 				GeeArrayList* _tmp12_;
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = field;
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _tmp4_->field_name;
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_);
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = values;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp8_ == NULL) {
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = TRUE;
-#line 8322 "PhotoMetadata.c"
+#line 8292 "PhotoMetadata.c"
 				} else {
 					GeeCollection* _tmp9_;
 					gint _tmp10_;
 					gint _tmp11_;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = values;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp10_ = gee_collection_get_size (_tmp9_);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = _tmp10_;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = _tmp11_ < 1;
-#line 8335 "PhotoMetadata.c"
+#line 8305 "PhotoMetadata.c"
 				}
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp7_) {
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (values);
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (field);
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 8345 "PhotoMetadata.c"
+#line 8315 "PhotoMetadata.c"
 				}
-#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				transformed_values = _tmp12_;
-#line 8351 "PhotoMetadata.c"
+#line 8321 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_value_it = NULL;
 					GeeCollection* _tmp13_;
 					GeeIterator* _tmp14_;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = values;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_value_it = _tmp14_;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8364 "PhotoMetadata.c"
+#line 8334 "PhotoMetadata.c"
 						GeeIterator* _tmp15_;
 						gboolean _tmp16_;
 						gchar* current_value = NULL;
 						GeeIterator* _tmp17_;
 						gpointer _tmp18_;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp15_ = _current_value_it;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp16_) {
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8378 "PhotoMetadata.c"
+#line 8348 "PhotoMetadata.c"
 						}
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_value_it;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_value = (gchar*) _tmp18_;
-#line 8386 "PhotoMetadata.c"
+#line 8356 "PhotoMetadata.c"
 						{
 							GeeList* transformed = NULL;
 							HierarchicalKeywordField* _tmp19_;
@@ -8396,84 +8366,84 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 							GeeList* _tmp22_;
 							GeeArrayList* _tmp23_;
 							GeeList* _tmp24_;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = field;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp20_ = _tmp19_->transformer;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp21_ = current_value;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_);
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							transformed = _tmp22_;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8407 "PhotoMetadata.c"
-								goto __catch28_g_error;
+#line 8377 "PhotoMetadata.c"
+								goto __catch32_g_error;
 							}
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp23_ = transformed_values;
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp24_ = transformed;
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (transformed);
-#line 8418 "PhotoMetadata.c"
+#line 8388 "PhotoMetadata.c"
 						}
-						goto __finally28;
-						__catch28_g_error:
+						goto __finally32;
+						__catch32_g_error:
 						{
 							GError* _error_ = NULL;
 							const gchar* _tmp25_;
 							GError* _tmp26_;
 							const gchar* _tmp27_;
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_error_ = _inner_error_;
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_inner_error_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp25_ = current_value;
-#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp26_ = _error_;
-#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp27_ = _tmp26_->message;
-#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-							g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_error_free0 (_error_);
-#line 8441 "PhotoMetadata.c"
+#line 8411 "PhotoMetadata.c"
 						}
-						__finally28:
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						__finally32:
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (current_value);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (_current_value_it);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (transformed_values);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (values);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_hierarchical_keyword_field_unref0 (field);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_object_unref0 (h_keywords);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							g_clear_error (&_inner_error_);
-#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							return NULL;
-#line 8464 "PhotoMetadata.c"
+#line 8434 "PhotoMetadata.c"
 						}
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8468 "PhotoMetadata.c"
+#line 8438 "PhotoMetadata.c"
 					}
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_it);
-#line 8472 "PhotoMetadata.c"
+#line 8442 "PhotoMetadata.c"
 				}
 				{
 					GeeArrayList* _current_value_list = NULL;
@@ -8484,25 +8454,25 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 					gint _tmp31_;
 					gint _tmp32_;
 					gint _current_value_index = 0;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp28_ = transformed_values;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_value_list = _tmp29_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp30_ = _current_value_list;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp32_ = _tmp31_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_value_size = _tmp32_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_value_index = -1;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 8501 "PhotoMetadata.c"
+#line 8471 "PhotoMetadata.c"
 						gint _tmp33_;
 						gint _tmp34_;
 						gint _tmp35_;
@@ -8516,78 +8486,78 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 						const gchar* _tmp41_;
 						gchar* _tmp42_;
 						const gchar* _tmp43_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp33_ = _current_value_index;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_current_value_index = _tmp33_ + 1;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp34_ = _current_value_index;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp35_ = _current_value_size;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!(_tmp34_ < _tmp35_)) {
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 8527 "PhotoMetadata.c"
+#line 8497 "PhotoMetadata.c"
 						}
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp36_ = _current_value_list;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp37_ = _current_value_index;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_value = (gchar*) _tmp38_;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp39_ = current_value;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp40_ = field;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp41_ = _tmp40_->path_separator;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_);
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						canonicalized = _tmp42_;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp43_ = canonicalized;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (_tmp43_ != NULL) {
-#line 8551 "PhotoMetadata.c"
+#line 8521 "PhotoMetadata.c"
 							GeeSet* _tmp44_;
 							const gchar* _tmp45_;
-#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp44_ = h_keywords;
-#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp45_ = canonicalized;
-#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
-#line 8560 "PhotoMetadata.c"
+#line 8530 "PhotoMetadata.c"
 						}
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (canonicalized);
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 8566 "PhotoMetadata.c"
+#line 8536 "PhotoMetadata.c"
 					}
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_value_list);
-#line 8570 "PhotoMetadata.c"
+#line 8540 "PhotoMetadata.c"
 				}
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (transformed_values);
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 8578 "PhotoMetadata.c"
+#line 8548 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = h_keywords;
-#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8586 "PhotoMetadata.c"
+#line 8556 "PhotoMetadata.c"
 }
 
 
@@ -8595,17 +8565,17 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	GExiv2Metadata* _tmp0_;
 	GExiv2Orientation _tmp1_;
-#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1132 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
-#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8604 "PhotoMetadata.c"
+#line 8574 "PhotoMetadata.c"
 }
 
 
@@ -8617,58 +8587,58 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GExiv2Orientation _tmp4_;
-#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	orientation = _tmp1_;
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = orientation;
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8630 "PhotoMetadata.c"
+#line 8600 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp5_;
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = orientation;
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 8637 "PhotoMetadata.c"
+#line 8607 "PhotoMetadata.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = TRUE;
-#line 8643 "PhotoMetadata.c"
+#line 8613 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp6_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = orientation;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 8650 "PhotoMetadata.c"
+#line 8620 "PhotoMetadata.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_) {
-#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = ORIENTATION_TOP_LEFT;
-#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8658 "PhotoMetadata.c"
+#line 8628 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp7_;
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = orientation;
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = (Orientation) _tmp7_;
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8667 "PhotoMetadata.c"
+#line 8637 "PhotoMetadata.c"
 	}
 }
 
@@ -8676,15 +8646,15 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) {
 	GExiv2Metadata* _tmp0_;
 	Orientation _tmp1_;
-#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = orientation;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 8683 "PhotoMetadata.c"
+#line 8653 "PhotoMetadata.c"
 }
 
 
@@ -8702,127 +8672,127 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 	gboolean _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_gps_info (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_longitude = _tmp1_;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_latitude = _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_altitude = _tmp3_;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp4_) {
-#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_long_ref = NULL;
-#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_lat_ref = NULL;
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (longitude) {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*longitude = _vala_longitude;
-#line 8729 "PhotoMetadata.c"
+#line 8699 "PhotoMetadata.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (long_ref) {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*long_ref = _vala_long_ref;
-#line 8735 "PhotoMetadata.c"
+#line 8705 "PhotoMetadata.c"
 		} else {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_long_ref);
-#line 8739 "PhotoMetadata.c"
+#line 8709 "PhotoMetadata.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (latitude) {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*latitude = _vala_latitude;
-#line 8745 "PhotoMetadata.c"
+#line 8715 "PhotoMetadata.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (lat_ref) {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*lat_ref = _vala_lat_ref;
-#line 8751 "PhotoMetadata.c"
+#line 8721 "PhotoMetadata.c"
 		} else {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_lat_ref);
-#line 8755 "PhotoMetadata.c"
+#line 8725 "PhotoMetadata.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (altitude) {
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*altitude = _vala_altitude;
-#line 8761 "PhotoMetadata.c"
+#line 8731 "PhotoMetadata.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8765 "PhotoMetadata.c"
+#line 8735 "PhotoMetadata.c"
 	}
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_vala_long_ref);
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_long_ref = _tmp5_;
-#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLatitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_vala_lat_ref);
-#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_lat_ref = _tmp6_;
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (longitude) {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*longitude = _vala_longitude;
-#line 8785 "PhotoMetadata.c"
+#line 8755 "PhotoMetadata.c"
 	}
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (long_ref) {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*long_ref = _vala_long_ref;
-#line 8791 "PhotoMetadata.c"
+#line 8761 "PhotoMetadata.c"
 	} else {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 8795 "PhotoMetadata.c"
+#line 8765 "PhotoMetadata.c"
 	}
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (latitude) {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*latitude = _vala_latitude;
-#line 8801 "PhotoMetadata.c"
+#line 8771 "PhotoMetadata.c"
 	}
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (lat_ref) {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*lat_ref = _vala_lat_ref;
-#line 8807 "PhotoMetadata.c"
+#line 8777 "PhotoMetadata.c"
 	} else {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 8811 "PhotoMetadata.c"
+#line 8781 "PhotoMetadata.c"
 	}
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (altitude) {
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*altitude = _vala_altitude;
-#line 8817 "PhotoMetadata.c"
+#line 8787 "PhotoMetadata.c"
 	}
-#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8821 "PhotoMetadata.c"
+#line 8791 "PhotoMetadata.c"
 }
 
 
@@ -8831,23 +8801,23 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_;
-#line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_exposure = _tmp0_;
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (exposure) {
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*exposure = _vala_exposure;
-#line 8842 "PhotoMetadata.c"
+#line 8812 "PhotoMetadata.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8846 "PhotoMetadata.c"
+#line 8816 "PhotoMetadata.c"
 }
 
 
@@ -8858,37 +8828,37 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	gboolean _tmp1_;
 	gboolean _tmp2_;
 	gchar* _tmp3_;
-#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	exposure_time = _tmp0_;
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8869 "PhotoMetadata.c"
+#line 8839 "PhotoMetadata.c"
 	}
-#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = metadata_rational_is_valid (&exposure_time);
-#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp2_) {
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8879 "PhotoMetadata.c"
+#line 8849 "PhotoMetadata.c"
 	}
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp3_;
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8887 "PhotoMetadata.c"
+#line 8857 "PhotoMetadata.c"
 }
 
 
@@ -8901,70 +8871,70 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	gboolean _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	glong _tmp4_;
-#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.ISOSpeedRatings", &_tmp0_);
-#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_iso = _tmp0_;
-#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	fetched_ok = _tmp1_;
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = fetched_ok;
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ == FALSE) {
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (iso) {
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 8918 "PhotoMetadata.c"
+#line 8888 "PhotoMetadata.c"
 		}
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8922 "PhotoMetadata.c"
+#line 8892 "PhotoMetadata.c"
 	}
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _vala_iso;
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ < ((glong) 6)) {
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 8930 "PhotoMetadata.c"
+#line 8900 "PhotoMetadata.c"
 	} else {
 		glong _tmp5_;
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _vala_iso;
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 8937 "PhotoMetadata.c"
+#line 8907 "PhotoMetadata.c"
 	}
-#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (iso) {
-#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 8947 "PhotoMetadata.c"
+#line 8917 "PhotoMetadata.c"
 		}
-#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8951 "PhotoMetadata.c"
+#line 8921 "PhotoMetadata.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (iso) {
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*iso = _vala_iso;
-#line 8959 "PhotoMetadata.c"
+#line 8929 "PhotoMetadata.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8963 "PhotoMetadata.c"
+#line 8933 "PhotoMetadata.c"
 }
 
 
@@ -8974,27 +8944,27 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	glong _tmp0_ = 0L;
 	gboolean _tmp1_;
 	gchar* _tmp2_;
-#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_iso (self, &_tmp0_);
-#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	iso = _tmp0_;
-#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8985 "PhotoMetadata.c"
+#line 8955 "PhotoMetadata.c"
 	}
-#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8993 "PhotoMetadata.c"
+#line 8963 "PhotoMetadata.c"
 }
 
 
@@ -9003,23 +8973,23 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_;
-#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FNumber", &_tmp0_);
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_aperture = _tmp0_;
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (aperture) {
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*aperture = _vala_aperture;
-#line 9014 "PhotoMetadata.c"
+#line 8984 "PhotoMetadata.c"
 	}
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9018 "PhotoMetadata.c"
+#line 8988 "PhotoMetadata.c"
 }
 
 
@@ -9043,105 +9013,105 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	gchar* _tmp13_;
 	gchar* _tmp14_;
 	gchar* _tmp15_;
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_aperture (self, &_tmp0_);
-#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture = _tmp0_;
-#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9054 "PhotoMetadata.c"
+#line 9024 "PhotoMetadata.c"
 	}
-#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = aperture;
-#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_.numerator;
-#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = aperture;
-#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _tmp4_.denominator;
-#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture_value = ((gdouble) _tmp3_) / ((gdouble) _tmp5_);
-#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = aperture_value;
-#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = pango_formatted;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_) {
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "<i>f</i>/";
-#line 9076 "PhotoMetadata.c"
+#line 9046 "PhotoMetadata.c"
 	} else {
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "f/";
-#line 9080 "PhotoMetadata.c"
+#line 9050 "PhotoMetadata.c"
 	}
-#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = aperture_value;
-#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
-#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.0f";
-#line 9088 "PhotoMetadata.c"
+#line 9058 "PhotoMetadata.c"
 	} else {
-#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.1f";
-#line 9092 "PhotoMetadata.c"
+#line 9062 "PhotoMetadata.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = aperture_value;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup_printf (_tmp9_, _tmp11_);
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = _tmp12_;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL);
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = _tmp14_;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp13_);
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp15_;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9110 "PhotoMetadata.c"
+#line 9080 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Make", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9125 "PhotoMetadata.c"
+#line 9095 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Model", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9140 "PhotoMetadata.c"
+#line 9110 "PhotoMetadata.c"
 }
 
 
@@ -9150,38 +9120,38 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	gboolean result = FALSE;
 	glong _tmp0_ = 0L;
 	gboolean _tmp1_;
-#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.Flash", &_tmp0_);
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_flash = _tmp0_;
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (flash) {
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*flash = _vala_flash;
-#line 9161 "PhotoMetadata.c"
+#line 9131 "PhotoMetadata.c"
 	}
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9165 "PhotoMetadata.c"
+#line 9135 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.Flash", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9180 "PhotoMetadata.c"
+#line 9150 "PhotoMetadata.c"
 }
 
 
@@ -9190,38 +9160,38 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_;
-#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FocalLength", &_tmp0_);
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_focal_length = _tmp0_;
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (focal_length) {
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*focal_length = _vala_focal_length;
-#line 9201 "PhotoMetadata.c"
+#line 9171 "PhotoMetadata.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9205 "PhotoMetadata.c"
+#line 9175 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.FocalLength", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9220 "PhotoMetadata.c"
+#line 9190 "PhotoMetadata.c"
 }
 
 
@@ -9230,49 +9200,49 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	gchar** _tmp0_;
 	gint _tmp0__length1;
 	gchar* _tmp1_;
-#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_ARTIST_TAGS;
-#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_ARTIST_TAGS_length1;
-#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1);
-#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9241 "PhotoMetadata.c"
+#line 9211 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Copyright", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9256 "PhotoMetadata.c"
+#line 9226 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Software", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9271 "PhotoMetadata.c"
+#line 9241 "PhotoMetadata.c"
 }
 
 
@@ -9282,69 +9252,69 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gboolean _tmp4_;
-#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (software != NULL);
-#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (version != NULL);
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = software;
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = version;
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_);
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = photo_metadata_has_iptc (self);
-#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 9303 "PhotoMetadata.c"
+#line 9273 "PhotoMetadata.c"
 		const gchar* _tmp5_;
 		const gchar* _tmp6_;
-#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = software;
-#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = version;
-#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 9314 "PhotoMetadata.c"
+#line 9284 "PhotoMetadata.c"
 	}
 }
 
 
 void photo_metadata_remove_software (PhotoMetadata* self) {
-#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Exif.Image.Software");
-#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.Program");
-#line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 9328 "PhotoMetadata.c"
+#line 9298 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureBiasValue", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9343 "PhotoMetadata.c"
+#line 9313 "PhotoMetadata.c"
 }
 
 
@@ -9361,134 +9331,134 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	const gchar* _tmp8_;
 	gint _tmp9_;
 	Rating _tmp18_;
-#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_RATING_TAGS;
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_RATING_TAGS_length1;
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_string (self, _tmp0_, _tmp0__length1);
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	rating_string = _tmp1_;
-#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = rating_string;
-#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 9374 "PhotoMetadata.c"
+#line 9344 "PhotoMetadata.c"
 		const gchar* _tmp3_;
 		gint _tmp4_;
 		Rating _tmp5_;
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = rating_string;
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = atoi (_tmp3_);
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = rating_unserialize (_tmp4_);
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp5_;
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (rating_string);
-#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9390 "PhotoMetadata.c"
+#line 9360 "PhotoMetadata.c"
 	}
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (rating_string);
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	rating_string = _tmp6_;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = rating_string;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_ == NULL) {
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = RATING_UNRATED;
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (rating_string);
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 9408 "PhotoMetadata.c"
+#line 9378 "PhotoMetadata.c"
 	}
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = rating_string;
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_percent_rating = _tmp9_;
-#line 9416 "PhotoMetadata.c"
+#line 9386 "PhotoMetadata.c"
 	{
 		gint i = 0;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		i = 5;
-#line 9421 "PhotoMetadata.c"
+#line 9391 "PhotoMetadata.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = TRUE;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 9428 "PhotoMetadata.c"
+#line 9398 "PhotoMetadata.c"
 				gint _tmp12_;
 				gint _tmp13_;
 				gint _tmp14_;
 				gint _tmp15_;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 9435 "PhotoMetadata.c"
+#line 9405 "PhotoMetadata.c"
 					gint _tmp11_;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = i;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					i = _tmp11_ - 1;
-#line 9441 "PhotoMetadata.c"
+#line 9411 "PhotoMetadata.c"
 				}
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = FALSE;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = i;
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!(_tmp12_ >= 0)) {
-#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 9451 "PhotoMetadata.c"
+#line 9421 "PhotoMetadata.c"
 				}
-#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = int_percent_rating;
-#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = i;
-#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
-#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_ >= _tmp15_) {
-#line 9461 "PhotoMetadata.c"
+#line 9431 "PhotoMetadata.c"
 					gint _tmp16_;
 					Rating _tmp17_;
-#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp16_ = i;
-#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp17_ = rating_unserialize (_tmp16_);
-#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = _tmp17_;
-#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (rating_string);
-#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 9474 "PhotoMetadata.c"
+#line 9444 "PhotoMetadata.c"
 				}
 			}
 		}
 	}
-#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = rating_unserialize (-1);
-#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp18_;
-#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (rating_string);
-#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9487 "PhotoMetadata.c"
+#line 9457 "PhotoMetadata.c"
 }
 
 
@@ -9503,71 +9473,71 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	gchar* _tmp6_;
 	gchar* _tmp7_;
 	gint _tmp8_;
-#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = rating;
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = rating_serialize (_tmp0_);
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_rating = _tmp1_;
-#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = int_rating;
-#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_strdup_printf ("%i", _tmp2_);
-#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _tmp3_;
-#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp4_);
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = int_rating;
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = _tmp6_;
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp7_);
-#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = int_rating;
-#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (0 <= _tmp8_) {
-#line 9534 "PhotoMetadata.c"
+#line 9504 "PhotoMetadata.c"
 		gint _tmp9_;
 		gint _tmp10_;
 		gchar* _tmp11_;
 		gchar* _tmp12_;
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = int_rating;
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = RESOURCES_rating_thresholds[_tmp9_];
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = g_strdup_printf ("%i", _tmp10_);
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = _tmp11_;
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp12_);
-#line 9551 "PhotoMetadata.c"
+#line 9521 "PhotoMetadata.c"
 	} else {
 		gint _tmp13_;
 		gchar* _tmp14_;
 		gchar* _tmp15_;
-#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = int_rating;
-#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = g_strdup_printf ("%i", _tmp13_);
-#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_;
-#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp15_);
-#line 9566 "PhotoMetadata.c"
+#line 9536 "PhotoMetadata.c"
 	}
 }
 
@@ -9575,7 +9545,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 9574 "PhotoMetadata.c"
+#line 9544 "PhotoMetadata.c"
 }
 
 
@@ -9642,27 +9612,20 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 	self->number = _tmp14_;
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 9641 "PhotoMetadata.c"
+#line 9611 "PhotoMetadata.c"
 }
 
 
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
 #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 9648 "PhotoMetadata.c"
+#line 9618 "PhotoMetadata.c"
 }
 
 
-static guint8* _vala_array_dup6 (guint8* self, int length) {
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return g_memdup (self, length * sizeof (guint8));
-#line 9655 "PhotoMetadata.c"
-}
-
-
-static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error) {
+static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error) {
 	PhotoMetadataInternalPhotoPreview * self;
-	guint8* result = NULL;
+	GBytes* result = NULL;
 	GExiv2PreviewProperties** props = NULL;
 	PhotoMetadata* _tmp0_;
 	GExiv2Metadata* _tmp1_;
@@ -9683,12 +9646,8 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	GExiv2PreviewImage* _tmp14_;
 	guint32 _tmp15_;
 	guint8* _tmp16_;
-	guint8* _tmp17_;
-	gint _tmp17__length1;
-	guint8* _tmp18_;
-	gint _tmp18__length1;
-	guint8* _tmp19_;
-	gint _tmp19__length1;
+	GBytes* _tmp17_;
+	GBytes* _tmp18_;
 #line 239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview);
 #line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9709,7 +9668,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	_tmp5__length1 = props_length1;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ != NULL) {
-#line 9708 "PhotoMetadata.c"
+#line 9667 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp6_;
 		gint _tmp6__length1;
 		guint _tmp7_;
@@ -9721,11 +9680,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 		_tmp7_ = self->number;
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 9720 "PhotoMetadata.c"
+#line 9679 "PhotoMetadata.c"
 	} else {
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = FALSE;
-#line 9724 "PhotoMetadata.c"
+#line 9683 "PhotoMetadata.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -9748,30 +9707,16 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = gexiv2_preview_image_get_data (_tmp14_, &_tmp15_);
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp17_ = (_tmp16_ != NULL) ? _vala_array_dup6 (_tmp16_, _tmp15_) : ((gpointer) _tmp16_);
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp17__length1 = _tmp15_;
+	_tmp17_ = g_bytes_new (_tmp16_, _tmp15_);
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = _tmp17_;
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18__length1 = _tmp17__length1;
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_tmp14_);
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp19_ = _tmp18_;
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp19__length1 = _tmp18__length1;
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	if (result_length1) {
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		*result_length1 = _tmp19__length1;
-#line 9764 "PhotoMetadata.c"
-	}
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	result = _tmp19_;
+	result = _tmp18_;
 #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 9770 "PhotoMetadata.c"
+#line 9715 "PhotoMetadata.c"
 }
 
 
@@ -9781,8 +9726,8 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
-#line 9781 "PhotoMetadata.c"
+	((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_metadata_internal_photo_preview_real_flatten;
+#line 9726 "PhotoMetadata.c"
 }
 
 
@@ -9798,7 +9743,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj)
 	_media_metadata_unref0 (self->owner);
 #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 9797 "PhotoMetadata.c"
+#line 9742 "PhotoMetadata.c"
 }
 
 
@@ -9893,265 +9838,265 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 	((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_title;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_comment;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = g_strdup ("Exif.Image.DateTime");
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup ("Xmp.tiff.DateTime");
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup ("Xmp.xmp.ModifyDate");
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_strdup ("Xmp.acdsee.datetime");
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = g_new0 (gchar*, 4 + 1);
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_[0] = _tmp0_;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_[1] = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_[2] = _tmp2_;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_[3] = _tmp3_;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_DATE_TIME_TAGS = _tmp4_;
-#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_DATE_TIME_TAGS_length1 = 4;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = g_strdup ("Exif.Photo.DateTimeOriginal");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = g_strdup ("Xmp.exif.DateTimeOriginal");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = g_strdup ("Xmp.xmp.CreateDate");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = g_strdup ("Exif.Photo.DateTimeDigitized");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = g_strdup ("Xmp.exif.DateTimeDigitized");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = g_strdup ("Exif.Image.DateTime");
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = g_new0 (gchar*, 6 + 1);
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[0] = _tmp5_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[1] = _tmp6_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[2] = _tmp7_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[3] = _tmp8_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[4] = _tmp9_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_[5] = _tmp10_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_EXPOSURE_DATE_TIME_TAGS = _tmp11_;
-#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1 = 6;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup ("Exif.Photo.DateTimeDigitized");
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = g_strdup ("Xmp.exif.DateTimeDigitized");
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_new0 (gchar*, 2 + 1);
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_[0] = _tmp12_;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_[1] = _tmp13_;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_DIGITIZED_DATE_TIME_TAGS = _tmp14_;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1 = 2;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = g_strdup ("Exif.Photo.PixelXDimension");
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = g_strdup ("Xmp.exif.PixelXDimension");
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp17_ = g_strdup ("Xmp.tiff.ImageWidth");
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = g_strdup ("Xmp.exif.PixelXDimension");
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_ = g_new0 (gchar*, 4 + 1);
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_[0] = _tmp15_;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_[1] = _tmp16_;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_[2] = _tmp17_;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_[3] = _tmp18_;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_WIDTH_TAGS = _tmp19_;
-#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_WIDTH_TAGS_length1 = 4;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp20_ = g_strdup ("Exif.Photo.PixelYDimension");
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = g_strdup ("Xmp.exif.PixelYDimension");
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp22_ = g_strdup ("Xmp.tiff.ImageHeight");
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp23_ = g_strdup ("Xmp.exif.PixelYDimension");
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = g_new0 (gchar*, 4 + 1);
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_[0] = _tmp20_;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_[1] = _tmp21_;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_[2] = _tmp22_;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_[3] = _tmp23_;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_HEIGHT_TAGS = _tmp24_;
-#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_HEIGHT_TAGS_length1 = 4;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp25_ = g_strdup ("Iptc.Application2.Caption");
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp26_ = g_strdup ("Xmp.dc.title");
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = g_strdup ("Iptc.Application2.Headline");
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = g_strdup ("Xmp.photoshop.Headline");
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = g_strdup ("Xmp.acdsee.caption");
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_ = g_new0 (gchar*, 5 + 1);
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_[0] = _tmp25_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_[1] = _tmp26_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_[2] = _tmp27_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_[3] = _tmp28_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp30_[4] = _tmp29_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_STANDARD_TITLE_TAGS = _tmp30_;
-#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_STANDARD_TITLE_TAGS_length1 = 5;
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp31_ = g_strdup ("Exif.Photo.UserComment");
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp32_ = g_strdup ("Xmp.acdsee.notes");
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp33_ = g_new0 (gchar*, 2 + 1);
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp33_[0] = _tmp31_;
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp33_[1] = _tmp32_;
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_COMMENT_TAGS = _tmp33_;
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_COMMENT_TAGS_length1 = 2;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp34_ = g_strdup ("Xmp.dc.subject");
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp35_ = g_strdup ("Iptc.Application2.Keywords");
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp36_ = g_strdup ("Xmp.xmp.Label");
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp37_ = g_new0 (gchar*, 3 + 1);
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp37_[0] = _tmp34_;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp37_[1] = _tmp35_;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp37_[2] = _tmp36_;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_KEYWORD_TAGS = _tmp37_;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_KEYWORD_TAGS_length1 = 3;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp38_ = null_keyword_transformer_new ();
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp39_ = _tmp38_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp40_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp41_ = null_keyword_transformer_new ();
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp42_ = _tmp41_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp43_ = hierarchical_keyword_field_new ("Xmp.acdsee.keywords", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp44_ = acd_see_keyword_transformer_new ();
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp45_ = _tmp44_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp46_ = hierarchical_keyword_field_new ("Xmp.acdsee.categories", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp47_ = null_keyword_transformer_new ();
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp48_ = _tmp47_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp49_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp50_ = null_keyword_transformer_new ();
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp51_ = _tmp50_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp52_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_ = g_new0 (HierarchicalKeywordField*, 5 + 1);
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_[0] = _tmp40_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_[1] = _tmp43_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_[2] = _tmp46_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_[3] = _tmp49_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp53_[4] = _tmp52_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp53_;
-#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 5;
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp54_ = g_strdup ("Exif.Image.Artist");
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp55_ = g_strdup ("Exif.Canon.OwnerName");
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp56_ = g_strdup ("Xmp.acdsee.author");
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp57_ = g_new0 (gchar*, 3 + 1);
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp57_[0] = _tmp54_;
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp57_[1] = _tmp55_;
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp57_[2] = _tmp56_;
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_ARTIST_TAGS = _tmp57_;
-#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_ARTIST_TAGS_length1 = 3;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp58_ = g_strdup ("Xmp.xmp.Rating");
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp59_ = g_strdup ("Iptc.Application2.Urgency");
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp60_ = g_strdup ("Xmp.photoshop.Urgency");
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp61_ = g_strdup ("Exif.Image.Rating");
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp62_ = g_strdup ("Xmp.acdsee.rating");
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_ = g_new0 (gchar*, 5 + 1);
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_[0] = _tmp58_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_[1] = _tmp59_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_[2] = _tmp60_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_[3] = _tmp61_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp63_[4] = _tmp62_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_RATING_TAGS = _tmp63_;
-#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_RATING_TAGS_length1 = 5;
-#line 10150 "PhotoMetadata.c"
+#line 10095 "PhotoMetadata.c"
 }
 
 
@@ -10160,17 +10105,21 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
 	gchar* _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv = PHOTO_METADATA_GET_PRIVATE (self);
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = gexiv2_metadata_new ();
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	self->priv->exiv2 = _tmp0_;
 #line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	self->priv->exif = NULL;
+	self->priv->exiv2 = _tmp0_;
 #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->exif = NULL;
+#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup ("<uninitialized>");
-#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp1_;
-#line 10169 "PhotoMetadata.c"
+#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->metadata_hash = NULL;
+#line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->thumbnail_md5 = NULL;
+#line 10118 "PhotoMetadata.c"
 }
 
 
@@ -10178,15 +10127,19 @@ static void photo_metadata_finalize (MediaMetadata * obj) {
 	PhotoMetadata * self;
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_g_object_unref0 (self->priv->exiv2);
 #line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_exif_data_unref0 (self->priv->exif);
+	_g_object_unref0 (self->priv->exiv2);
 #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_exif_data_unref0 (self->priv->exif);
+#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
+#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_free0 (self->priv->metadata_hash);
+#line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_free0 (self->priv->thumbnail_md5);
 #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 10185 "PhotoMetadata.c"
+#line 10138 "PhotoMetadata.c"
 }
 
 
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index e9a9042..2c2d6c5 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -190,16 +190,16 @@ public abstract class PhotoPreview {
         return extension;
     }
     
-    public abstract uint8[] flatten() throws Error;
+    public abstract Bytes flatten() throws Error;
     
     public virtual Gdk.Pixbuf? get_pixbuf() throws Error {
-        uint8[] flattened = flatten();
+        var flattened = flatten();
         
         // Need to create from stream or file for decode ... catch decode error and return null,
         // different from an I/O error causing the problem
         try {
-            return new Gdk.Pixbuf.from_stream(new MemoryInputStream.from_data(flattened, null),
-                null);
+            return new Gdk.Pixbuf.from_stream(new
+                    MemoryInputStream.from_bytes(flattened));
         } catch (Error err) {
             warning("Unable to decode thumbnail for %s: %s", name, err.message);
             
@@ -236,17 +236,20 @@ public class PhotoMetadata : MediaMetadata {
             this.number = number;
         }
         
-        public override uint8[] flatten() throws Error {
+        public override Bytes flatten() throws Error {
             unowned GExiv2.PreviewProperties?[] props = owner.exiv2.get_preview_properties();
             assert(props != null && props.length > number);
             
-            return owner.exiv2.get_preview_image(props[number]).get_data();
+            return new
+                Bytes(owner.exiv2.get_preview_image(props[number]).get_data());
         }
     }
     
     private GExiv2.Metadata exiv2 = new GExiv2.Metadata();
     private Exif.Data? exif = null;
     string source_name = "<uninitialized>";
+    private string? metadata_hash = null;
+    private string? thumbnail_md5 = null;
     
     public PhotoMetadata() {
     }
@@ -278,18 +281,13 @@ public class PhotoMetadata : MediaMetadata {
         source_name = "<memory buffer %d bytes>".printf(length);
     }
     
-    public void read_from_app1_segment(uint8[] buffer, int length = 0) throws Error {
-        if (length <= 0)
-            length = buffer.length;
-        
-        assert(buffer.length >= length);
-        
+    public void read_from_app1_segment(Bytes buffer) throws Error {
         exiv2 = new GExiv2.Metadata();
         exif = null;
         
-        exiv2.from_app1_segment(buffer, length);
-        exif = Exif.Data.new_from_data(buffer, length);
-        source_name = "<app1 segment %d bytes>".printf(length);
+        exiv2.from_app1_segment(buffer.get_data(), (long) buffer.get_size());
+        exif = Exif.Data.new_from_data(buffer.get_data(), buffer.get_size());
+        source_name = "<app1 segment %zu bytes>".printf(buffer.get_size());
     }
     
     public static MetadataDomain get_tag_domain(string tag) {
@@ -691,43 +689,59 @@ public class PhotoMetadata : MediaMetadata {
     }
     
     // Returns raw bytes of EXIF metadata, including signature and optionally the preview (if present).
-    public uint8[]? flatten_exif(bool include_preview) {
+    public string? exif_hash() {
         if (exif == null)
             return null;
-        
-        // save thumbnail to strip if no attachments requested (so it can be added back and
-        // deallocated automatically)
-        uchar *thumbnail = exif.data;
-        uint thumbnail_size = exif.size;
-        if (!include_preview) {
-            exif.data = null;
-            exif.size = 0;
+
+        if (this.metadata_hash != null) {
+            return this.metadata_hash;
         }
-        
-        uint8[]? flattened = null;
-        
-        // save the struct to a buffer and copy into a Vala-friendly one
+
+        string? hash = null;
+
+        var thumb = exif.data;
+        var thumb_size = exif.size;
+
+        // Strip potential thumbnail
+        exif.data = null;
+        exif.size = 0;
+
         uchar *saved_data = null;
         uint saved_size = 0;
+
         exif.save_data(&saved_data, &saved_size);
+
+        exif.data = thumb;
+        exif.size = thumb_size;
+
         if (saved_size > 0 && saved_data != null) {
-            flattened = new uint8[saved_size];
-            Memory.copy(flattened, saved_data, saved_size);
-            
+            var md5 = new Checksum(ChecksumType.MD5);
+            md5.update((uchar []) saved_data, saved_size);
             Exif.Mem.new_default().free(saved_data);
+
+            this.metadata_hash = md5.get_string ();
         }
-        
-        // restore thumbnail (this works in either case)
-        exif.data = thumbnail;
-        exif.size = thumbnail_size;
-        
-        return flattened;
+
+        return hash;
     }
     
     // Returns raw bytes of EXIF preview, if present
-    public uint8[]? flatten_exif_preview() {
+    public string? thumbnail_hash() {
+        if (this.thumbnail_md5 != null) {
+            return this.thumbnail_md5;
+        }
+
         uchar[] buffer;
-        return exiv2.get_exif_thumbnail(out buffer) ? buffer : null;
+        if (exiv2.get_exif_thumbnail(out buffer)) {
+            var md5 = new Checksum(ChecksumType.MD5);
+            md5.update(buffer, buffer.length);
+
+            this.thumbnail_md5 = md5.get_string();
+
+            return this.thumbnail_md5;
+         }
+
+        return null;
     }
     
     public uint get_preview_count() {
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 4658dd2..28fa710 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -501,10 +501,10 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile
 static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup14 (gchar** self, int length);
+static gchar** _vala_array_dup12 (gchar** self, int length);
 static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
 static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup15 (gchar** self, int length);
+static gchar** _vala_array_dup13 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer photo_file_sniffer_ref (gpointer instance);
@@ -717,7 +717,7 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo
 }
 
 
-static gchar** _vala_array_dup14 (gchar** self, int length) {
+static gchar** _vala_array_dup12 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -754,7 +754,7 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0__length1 = png_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup14 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup12 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -800,7 +800,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo
 }
 
 
-static gchar** _vala_array_dup15 (gchar** self, int length) {
+static gchar** _vala_array_dup13 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -837,7 +837,7 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp0__length1 = png_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup15 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 8b670ea..c22f941 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -559,10 +559,10 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
 static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base);
 static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup12 (gchar** self, int length);
+static gchar** _vala_array_dup10 (gchar** self, int length);
 static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
 static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup13 (gchar** self, int length);
+static gchar** _vala_array_dup11 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
@@ -600,9 +600,8 @@ void dimensions_free (Dimensions* self);
 libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self);
 void dimensions_init (Dimensions *self, gint width, gint height);
 PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error);
-guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1);
-gchar* md5_binary (guint8* buffer, gsize length);
-guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1);
+gchar* photo_metadata_exif_hash (PhotoMetadata* self);
+gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self);
 gchar* md5_file (GFile* file, GError** error);
 enum  {
 	RAW_READER_DUMMY_PROPERTY
@@ -666,14 +665,14 @@ void raw_file_format_driver_init (void) {
 	raw_file_format_driver_instance = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_init ();
-#line 670 "RawSupport.c"
+#line 669 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_driver_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_driver_ref (self) : NULL;
-#line 677 "RawSupport.c"
+#line 676 "RawSupport.c"
 }
 
 
@@ -689,7 +688,7 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) {
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 693 "RawSupport.c"
+#line 692 "RawSupport.c"
 }
 
 
@@ -705,7 +704,7 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
 #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 709 "RawSupport.c"
+#line 708 "RawSupport.c"
 }
 
 
@@ -726,7 +725,7 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
 #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 730 "RawSupport.c"
+#line 729 "RawSupport.c"
 }
 
 
@@ -742,7 +741,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm
 	result = _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 746 "RawSupport.c"
+#line 745 "RawSupport.c"
 }
 
 
@@ -755,7 +754,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv
 	result = FALSE;
 #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 759 "RawSupport.c"
+#line 758 "RawSupport.c"
 }
 
 
@@ -768,7 +767,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD
 	result = FALSE;
 #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 772 "RawSupport.c"
+#line 771 "RawSupport.c"
 }
 
 
@@ -783,7 +782,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm
 	result = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 787 "RawSupport.c"
+#line 786 "RawSupport.c"
 }
 
 
@@ -798,7 +797,7 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ
 	result = NULL;
 #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 802 "RawSupport.c"
+#line 801 "RawSupport.c"
 }
 
 
@@ -822,7 +821,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
 #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 826 "RawSupport.c"
+#line 825 "RawSupport.c"
 }
 
 
@@ -832,14 +831,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) {
 	self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 836 "RawSupport.c"
+#line 835 "RawSupport.c"
 }
 
 
 RawFileFormatDriver* raw_file_format_driver_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER);
-#line 843 "RawSupport.c"
+#line 842 "RawSupport.c"
 }
 
 
@@ -864,7 +863,7 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
-#line 868 "RawSupport.c"
+#line 867 "RawSupport.c"
 }
 
 
@@ -878,7 +877,7 @@ static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver);
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj);
-#line 882 "RawSupport.c"
+#line 881 "RawSupport.c"
 }
 
 
@@ -902,14 +901,14 @@ void raw_file_format_properties_init (void) {
 	_photo_file_format_properties_unref0 (raw_file_format_properties_instance);
 #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_instance = _tmp0_;
-#line 906 "RawSupport.c"
+#line 905 "RawSupport.c"
 }
 
 
 static gpointer _photo_file_format_properties_ref0 (gpointer self) {
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? photo_file_format_properties_ref (self) : NULL;
-#line 913 "RawSupport.c"
+#line 912 "RawSupport.c"
 }
 
 
@@ -925,7 +924,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) {
 	result = _tmp1_;
 #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 929 "RawSupport.c"
+#line 928 "RawSupport.c"
 }
 
 
@@ -938,7 +937,7 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil
 	result = PHOTO_FILE_FORMAT_RAW;
 #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 942 "RawSupport.c"
+#line 941 "RawSupport.c"
 }
 
 
@@ -954,7 +953,7 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
 	result = _tmp0_;
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 958 "RawSupport.c"
+#line 957 "RawSupport.c"
 }
 
 
@@ -967,7 +966,7 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile
 	result = PHOTO_FILE_FORMAT_FLAGS_NONE;
 #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 971 "RawSupport.c"
+#line 970 "RawSupport.c"
 }
 
 
@@ -983,28 +982,28 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo
 	result = _tmp0_;
 #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 987 "RawSupport.c"
+#line 986 "RawSupport.c"
 }
 
 
-static gchar** _vala_array_dup12 (gchar** self, int length) {
+static gchar** _vala_array_dup10 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 998 "RawSupport.c"
+#line 997 "RawSupport.c"
 		gchar* _tmp0_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1004 "RawSupport.c"
+#line 1003 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1008 "RawSupport.c"
+#line 1007 "RawSupport.c"
 }
 
 
@@ -1024,7 +1023,7 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0__length1 = raw_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup12 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1035,13 +1034,13 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo
 	if (result_length1) {
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1039 "RawSupport.c"
+#line 1038 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1045 "RawSupport.c"
+#line 1044 "RawSupport.c"
 }
 
 
@@ -1066,28 +1065,28 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo
 	result = _tmp2_;
 #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1070 "RawSupport.c"
+#line 1069 "RawSupport.c"
 }
 
 
-static gchar** _vala_array_dup13 (gchar** self, int length) {
+static gchar** _vala_array_dup11 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1081 "RawSupport.c"
+#line 1080 "RawSupport.c"
 		gchar* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result[i] = _tmp0_;
-#line 1087 "RawSupport.c"
+#line 1086 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1091 "RawSupport.c"
+#line 1090 "RawSupport.c"
 }
 
 
@@ -1107,7 +1106,7 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0__length1 = raw_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1118,13 +1117,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr
 	if (result_length1) {
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 1122 "RawSupport.c"
+#line 1121 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp2_;
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1128 "RawSupport.c"
+#line 1127 "RawSupport.c"
 }
 
 
@@ -1134,14 +1133,14 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type
 	self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1138 "RawSupport.c"
+#line 1137 "RawSupport.c"
 }
 
 
 RawFileFormatProperties* raw_file_format_properties_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES);
-#line 1145 "RawSupport.c"
+#line 1144 "RawSupport.c"
 }
 
 
@@ -1613,7 +1612,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
 	raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_;
 #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51;
-#line 1617 "RawSupport.c"
+#line 1616 "RawSupport.c"
 }
 
 
@@ -1627,7 +1626,7 @@ static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties);
 #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj);
-#line 1631 "RawSupport.c"
+#line 1630 "RawSupport.c"
 }
 
 
@@ -1657,21 +1656,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif
 	self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_);
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 1661 "RawSupport.c"
+#line 1660 "RawSupport.c"
 }
 
 
 RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) {
 #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options);
-#line 1668 "RawSupport.c"
+#line 1667 "RawSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1675 "RawSupport.c"
+#line 1674 "RawSupport.c"
 }
 
 
@@ -1704,10 +1703,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	RawReader* _tmp28_;
 	DetectedPhotoInformation* _tmp34_;
 	PhotoMetadata* _tmp35_;
-	gboolean _tmp58_;
-	DetectedPhotoInformation* _tmp64_;
-	gchar* _tmp65_;
-	DetectedPhotoInformation* _tmp66_;
+	gboolean _tmp44_;
+	DetectedPhotoInformation* _tmp50_;
+	gchar* _tmp51_;
+	DetectedPhotoInformation* _tmp52_;
 	GError * _inner_error_ = NULL;
 #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer);
@@ -1729,7 +1728,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp4_ = _tmp3_;
 #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 1733 "RawSupport.c"
+#line 1732 "RawSupport.c"
 	{
 		GRawProcessor* _tmp5_;
 		GFile* _tmp6_;
@@ -1753,8 +1752,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1757 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1756 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1766,7 +1765,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1770 "RawSupport.c"
+#line 1769 "RawSupport.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp9_ = processor;
@@ -1776,8 +1775,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1780 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1779 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1789,7 +1788,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1793 "RawSupport.c"
+#line 1792 "RawSupport.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = processor;
@@ -1799,8 +1798,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 1803 "RawSupport.c"
-				goto __catch32_graw_exception;
+#line 1802 "RawSupport.c"
+				goto __catch36_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1812,11 +1811,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			g_clear_error (&_inner_error_);
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 1816 "RawSupport.c"
+#line 1815 "RawSupport.c"
 		}
 	}
-	goto __finally32;
-	__catch32_graw_exception:
+	goto __finally36;
+	__catch36_graw_exception:
 	{
 		GError* exception = NULL;
 		GError* _tmp11_;
@@ -1842,11 +1841,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			if (is_corrupted) {
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				*is_corrupted = _vala_is_corrupted;
-#line 1846 "RawSupport.c"
+#line 1845 "RawSupport.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 1850 "RawSupport.c"
+#line 1849 "RawSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp12_ = exception;
@@ -1856,10 +1855,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = _tmp13_;
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
-#line 1860 "RawSupport.c"
-		goto __finally32;
+#line 1859 "RawSupport.c"
+		goto __finally36;
 	}
-	__finally32:
+	__finally36:
 #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"
@@ -1870,7 +1869,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1874 "RawSupport.c"
+#line 1873 "RawSupport.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = detected;
@@ -1914,7 +1913,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_g_free0 (_tmp26_);
 #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	reader = _tmp28_;
-#line 1918 "RawSupport.c"
+#line 1917 "RawSupport.c"
 	{
 		PhotoMetadata* _tmp29_ = NULL;
 		RawReader* _tmp30_;
@@ -1929,8 +1928,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp29_ = _tmp31_;
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1933 "RawSupport.c"
-			goto __catch33_g_error;
+#line 1932 "RawSupport.c"
+			goto __catch37_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp32_ = detected;
@@ -1944,10 +1943,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp32_->metadata = _tmp33_;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_media_metadata_unref0 (_tmp29_);
-#line 1948 "RawSupport.c"
+#line 1947 "RawSupport.c"
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally37;
+	__catch37_g_error:
 	{
 		GError* err = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1956,9 +1955,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_inner_error_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (err);
-#line 1960 "RawSupport.c"
+#line 1959 "RawSupport.c"
 	}
-	__finally33:
+	__finally37:
 #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"
@@ -1971,7 +1970,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_detected_photo_information_unref0 (detected);
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 1975 "RawSupport.c"
+#line 1974 "RawSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = detected;
@@ -1979,224 +1978,112 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	_tmp35_ = _tmp34_->metadata;
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp35_ != NULL) {
-#line 1983 "RawSupport.c"
-		guint8* flattened_sans_thumbnail = NULL;
+#line 1982 "RawSupport.c"
 		DetectedPhotoInformation* _tmp36_;
-		PhotoMetadata* _tmp37_;
-		gint _tmp38_;
-		guint8* _tmp39_;
-		gint flattened_sans_thumbnail_length1;
-		gint _flattened_sans_thumbnail_size_;
-		gboolean _tmp40_ = FALSE;
-		guint8* _tmp41_;
-		gint _tmp41__length1;
-		guint8* flattened_thumbnail = NULL;
-		DetectedPhotoInformation* _tmp47_;
-		PhotoMetadata* _tmp48_;
-		gint _tmp49_;
-		guint8* _tmp50_;
-		gint flattened_thumbnail_length1;
-		gint _flattened_thumbnail_size_;
-		gboolean _tmp51_ = FALSE;
-		guint8* _tmp52_;
-		gint _tmp52__length1;
+		DetectedPhotoInformation* _tmp37_;
+		PhotoMetadata* _tmp38_;
+		gchar* _tmp39_;
+		DetectedPhotoInformation* _tmp40_;
+		DetectedPhotoInformation* _tmp41_;
+		PhotoMetadata* _tmp42_;
+		gchar* _tmp43_;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp36_ = detected;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp37_ = _tmp36_->metadata;
+		_tmp37_ = detected;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp39_ = photo_metadata_flatten_exif (_tmp37_, FALSE, &_tmp38_);
+		_tmp38_ = _tmp37_->metadata;
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail = _tmp39_;
+		_tmp39_ = photo_metadata_exif_hash (_tmp38_);
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail_length1 = _tmp38_;
+		_g_free0 (_tmp36_->exif_md5);
 #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp41_ = flattened_sans_thumbnail;
+		_tmp36_->exif_md5 = _tmp39_;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp41__length1 = flattened_sans_thumbnail_length1;
+		_tmp40_ = detected;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp41_ != NULL) {
-#line 2022 "RawSupport.c"
-			guint8* _tmp42_;
-			gint _tmp42__length1;
+		_tmp41_ = detected;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp42_ = flattened_sans_thumbnail;
+		_tmp42_ = _tmp41_->metadata;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp42__length1 = flattened_sans_thumbnail_length1;
+		_tmp43_ = photo_metadata_thumbnail_hash (_tmp42_);
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp40_ = _tmp42__length1 > 0;
-#line 2031 "RawSupport.c"
-		} else {
-#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp40_ = FALSE;
-#line 2035 "RawSupport.c"
-		}
+		_g_free0 (_tmp40_->thumbnail_md5);
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp40_) {
-#line 2039 "RawSupport.c"
-			DetectedPhotoInformation* _tmp43_;
-			guint8* _tmp44_;
-			gint _tmp44__length1;
-			guint8* _tmp45_;
-			gint _tmp45__length1;
-			gchar* _tmp46_;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp43_ = detected;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp44_ = flattened_sans_thumbnail;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp44__length1 = flattened_sans_thumbnail_length1;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp45_ = flattened_sans_thumbnail;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp45__length1 = flattened_sans_thumbnail_length1;
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp46_ = md5_binary (_tmp44_, (gsize) _tmp45__length1);
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp43_->exif_md5);
-#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp43_->exif_md5 = _tmp46_;
-#line 2062 "RawSupport.c"
-		}
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp47_ = detected;
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp48_ = _tmp47_->metadata;
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp50_ = photo_metadata_flatten_exif_preview (_tmp48_, &_tmp49_);
-#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail = _tmp50_;
+		_tmp40_->thumbnail_md5 = _tmp43_;
+#line 2015 "RawSupport.c"
+	}
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail_length1 = _tmp49_;
+	_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_flattened_thumbnail_size_ = flattened_thumbnail_length1;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp52_ = flattened_thumbnail;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp52__length1 = flattened_thumbnail_length1;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp52_ != NULL) {
-#line 2082 "RawSupport.c"
-			guint8* _tmp53_;
-			gint _tmp53__length1;
-#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp53_ = flattened_thumbnail;
+	if (_tmp44_) {
+#line 2021 "RawSupport.c"
+		gchar* _tmp45_ = NULL;
+		GFile* _tmp46_;
+		gchar* _tmp47_;
+		DetectedPhotoInformation* _tmp48_;
+		gchar* _tmp49_;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp53__length1 = flattened_thumbnail_length1;
+		_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp51_ = _tmp53__length1 > 0;
-#line 2091 "RawSupport.c"
-		} else {
+		_tmp47_ = md5_file (_tmp46_, &_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp51_ = FALSE;
-#line 2095 "RawSupport.c"
-		}
+		_tmp45_ = _tmp47_;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		if (_tmp51_) {
-#line 2099 "RawSupport.c"
-			DetectedPhotoInformation* _tmp54_;
-			guint8* _tmp55_;
-			gint _tmp55__length1;
-			guint8* _tmp56_;
-			gint _tmp56__length1;
-			gchar* _tmp57_;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp54_ = detected;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp55_ = flattened_thumbnail;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp55__length1 = flattened_thumbnail_length1;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp56_ = flattened_thumbnail;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp56__length1 = flattened_thumbnail_length1;
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_g_free0 (_tmp54_->thumbnail_md5);
-#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-			_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2122 "RawSupport.c"
-		}
-#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_thumbnail = (g_free (flattened_thumbnail), NULL);
-#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 2128 "RawSupport.c"
-	}
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5;
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (_tmp58_) {
-#line 2134 "RawSupport.c"
-		gchar* _tmp59_ = NULL;
-		GFile* _tmp60_;
-		gchar* _tmp61_;
-		DetectedPhotoInformation* _tmp62_;
-		gchar* _tmp63_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp61_ = md5_file (_tmp60_, &_inner_error_);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp59_ = _tmp61_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_detected_photo_information_unref0 (detected);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 2158 "RawSupport.c"
+#line 2045 "RawSupport.c"
 		}
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp62_ = detected;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp63_ = _tmp59_;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp59_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp62_->md5);
-#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_tmp62_->md5 = _tmp63_;
-#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_g_free0 (_tmp59_);
-#line 2172 "RawSupport.c"
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp48_ = detected;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp49_ = _tmp45_;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp45_ = NULL;
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp48_->md5);
+#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_tmp48_->md5 = _tmp49_;
+#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_g_free0 (_tmp45_);
+#line 2059 "RawSupport.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp64_ = detected;
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp65_ = g_strdup ("raw");
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp64_->format_name);
-#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp64_->format_name = _tmp65_;
-#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp66_ = detected;
-#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp66_->file_format = PHOTO_FILE_FORMAT_RAW;
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp50_ = detected;
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp51_ = g_strdup ("raw");
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_free0 (_tmp50_->format_name);
+#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp50_->format_name = _tmp51_;
+#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp52_ = detected;
+#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp52_->file_format = PHOTO_FILE_FORMAT_RAW;
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = detected;
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (is_corrupted) {
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 2196 "RawSupport.c"
+#line 2083 "RawSupport.c"
 	}
-#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2200 "RawSupport.c"
+#line 2087 "RawSupport.c"
 }
 
 
@@ -2205,7 +2092,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
 	raw_sniffer_parent_class = g_type_class_peek_parent (klass);
 #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff;
-#line 2209 "RawSupport.c"
+#line 2096 "RawSupport.c"
 }
 
 
@@ -2228,22 +2115,22 @@ GType raw_sniffer_get_type (void) {
 RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
 	RawReader* self = NULL;
 	const gchar* _tmp0_;
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = filepath;
-#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 2240 "RawSupport.c"
+#line 2127 "RawSupport.c"
 }
 
 
 RawReader* raw_reader_new (const gchar* filepath) {
-#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2247 "RawSupport.c"
+#line 2134 "RawSupport.c"
 }
 
 
@@ -2255,35 +2142,35 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 	GFile* _tmp1_;
 	GFile* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = photo_metadata_new ();
-#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	metadata = _tmp0_;
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp2_, &_inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2281 "RawSupport.c"
+#line 2168 "RawSupport.c"
 	}
-#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = metadata;
-#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2287 "RawSupport.c"
+#line 2174 "RawSupport.c"
 }
 
 
@@ -2306,99 +2193,99 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	GRawProcessedImage* _tmp12_;
 	GdkPixbuf* _tmp13_;
 	GError * _inner_error_ = NULL;
-#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	processor = _tmp0_;
-#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = processor;
-#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_configure_for_rgb_display (_tmp1_, FALSE);
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = processor;
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = graw_processor_get_output_params (_tmp2_);
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = processor;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_open_file (_tmp5_, _tmp7_, &_inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp7_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2346 "RawSupport.c"
+#line 2233 "RawSupport.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = processor;
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_unpack (_tmp8_, &_inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2360 "RawSupport.c"
+#line 2247 "RawSupport.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = processor;
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_process (_tmp9_, &_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2374 "RawSupport.c"
+#line 2261 "RawSupport.c"
 	}
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = processor;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = graw_processor_make_mem_image (_tmp11_, &_inner_error_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp10_ = _tmp12_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2390 "RawSupport.c"
+#line 2277 "RawSupport.c"
 	}
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp13_;
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (_tmp10_);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2402 "RawSupport.c"
+#line 2289 "RawSupport.c"
 }
 
 
@@ -2440,95 +2327,95 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GdkPixbuf* _tmp38_;
 	GdkPixbuf* _tmp39_;
 	GError * _inner_error_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (full != NULL, NULL);
-#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = *scaled;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_.width;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = *full;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = _tmp2_.width;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = *scaled;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_.height;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = *full;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_.height;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = width_proportion;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp9_ < 0.5) {
-#line 2474 "RawSupport.c"
+#line 2361 "RawSupport.c"
 		gdouble _tmp10_;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = height_proportion;
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = _tmp10_ < 0.5;
-#line 2480 "RawSupport.c"
+#line 2367 "RawSupport.c"
 	} else {
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = FALSE;
-#line 2484 "RawSupport.c"
+#line 2371 "RawSupport.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	half_size = _tmp8_;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	processor = _tmp11_;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = processor;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = half_size;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = processor;
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp15_ = graw_processor_get_output_params (_tmp14_);
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp16_ = _tmp15_;
-#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp17_ = processor;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp18_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp19_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2524 "RawSupport.c"
+#line 2411 "RawSupport.c"
 	}
 	{
 		PhotoFileReaderRole _tmp20_;
-#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader));
-#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
-#line 2532 "RawSupport.c"
+#line 2419 "RawSupport.c"
 			GRawProcessor* _tmp21_;
 			GRawProcessedImage* image = NULL;
 			GRawProcessor* _tmp22_;
@@ -2539,154 +2426,154 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 			Dimensions _tmp27_;
 			GdkPixbuf* _tmp28_;
 			GdkPixbuf* _tmp29_;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp21_ = processor;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			graw_processor_unpack_thumb (_tmp21_, &_inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2549 "RawSupport.c"
-				goto __catch34_g_error;
+#line 2436 "RawSupport.c"
+				goto __catch38_g_error;
 			}
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp22_ = processor;
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_);
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			image = _tmp23_;
-#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2560 "RawSupport.c"
-				goto __catch34_g_error;
+#line 2447 "RawSupport.c"
+				goto __catch38_g_error;
 			}
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp24_ = image;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp26_ = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp27_ = *scaled;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp29_ = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_object_unref0 (_tmp26_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processed_image_unref0 (image);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2585 "RawSupport.c"
+#line 2472 "RawSupport.c"
 		}
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally38;
+	__catch38_g_error:
 	{
 		GError* _error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_error_ = _inner_error_;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_inner_error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (_error_);
-#line 2598 "RawSupport.c"
+#line 2485 "RawSupport.c"
 	}
-	__finally34:
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	__finally38:
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2609 "RawSupport.c"
+#line 2496 "RawSupport.c"
 	}
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp30_ = processor;
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_unpack (_tmp30_, &_inner_error_);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2623 "RawSupport.c"
+#line 2510 "RawSupport.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp31_ = processor;
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	graw_processor_process (_tmp31_, &_inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2637 "RawSupport.c"
+#line 2524 "RawSupport.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp32_ = processor;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	image = _tmp33_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2653 "RawSupport.c"
+#line 2540 "RawSupport.c"
 	}
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = image;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_ = _tmp35_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp37_ = *scaled;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp39_ = _tmp38_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp36_);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp39_;
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (image);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2677 "RawSupport.c"
+#line 2564 "RawSupport.c"
 }
 
 
 static void raw_reader_class_init (RawReaderClass * klass) {
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	raw_reader_parent_class = g_type_class_peek_parent (klass);
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata;
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read;
-#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
-#line 2690 "RawSupport.c"
+#line 2577 "RawSupport.c"
 }
 
 
@@ -2711,80 +2598,80 @@ RawDeveloper* raw_developer_as_array (int* result_length1) {
 	RawDeveloper* _tmp0_;
 	RawDeveloper* _tmp1_;
 	gint _tmp1__length1;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_new0 (RawDeveloper, 3);
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[0] = RAW_DEVELOPER_SHOTWELL;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[1] = RAW_DEVELOPER_CAMERA;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[2] = RAW_DEVELOPER_EMBEDDED;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = 3;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (result_length1) {
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 2731 "RawSupport.c"
+#line 2618 "RawSupport.c"
 	}
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp1_;
-#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2737 "RawSupport.c"
+#line 2624 "RawSupport.c"
 }
 
 
 gchar* raw_developer_to_string (RawDeveloper self) {
 	gchar* result = NULL;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2747 "RawSupport.c"
+#line 2634 "RawSupport.c"
 		{
 			gchar* _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup ("SHOTWELL");
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2756 "RawSupport.c"
+#line 2643 "RawSupport.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 2760 "RawSupport.c"
+#line 2647 "RawSupport.c"
 		{
 			gchar* _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup ("CAMERA");
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2769 "RawSupport.c"
+#line 2656 "RawSupport.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2773 "RawSupport.c"
+#line 2660 "RawSupport.c"
 		{
 			gchar* _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = g_strdup ("EMBEDDED");
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2782 "RawSupport.c"
+#line 2669 "RawSupport.c"
 		}
 		default:
 		{
-#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2788 "RawSupport.c"
+#line 2675 "RawSupport.c"
 		}
 	}
 }
@@ -2795,69 +2682,69 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 	const gchar* _tmp0_;
 	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (value != NULL, 0);
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = value;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2817 "RawSupport.c"
+#line 2704 "RawSupport.c"
 			default:
 			{
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_SHOTWELL;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2824 "RawSupport.c"
+#line 2711 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2830 "RawSupport.c"
+#line 2717 "RawSupport.c"
 			default:
 			{
-#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_CAMERA;
-#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2837 "RawSupport.c"
+#line 2724 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2843 "RawSupport.c"
+#line 2730 "RawSupport.c"
 			default:
 			{
-#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_EMBEDDED;
-#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2850 "RawSupport.c"
+#line 2737 "RawSupport.c"
 			}
 		}
 	} else {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2856 "RawSupport.c"
+#line 2743 "RawSupport.c"
 			default:
 			{
-#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				g_assert_not_reached ();
-#line 2861 "RawSupport.c"
+#line 2748 "RawSupport.c"
 			}
 		}
 	}
@@ -2866,41 +2753,41 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 
 gchar* raw_developer_get_label (RawDeveloper self) {
 	gchar* result = NULL;
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2874 "RawSupport.c"
+#line 2761 "RawSupport.c"
 		{
 			gchar* _tmp0_;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup (_ ("Shotwell"));
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2883 "RawSupport.c"
+#line 2770 "RawSupport.c"
 		}
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2889 "RawSupport.c"
+#line 2776 "RawSupport.c"
 		{
 			gchar* _tmp1_;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup (_ ("Camera"));
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2898 "RawSupport.c"
+#line 2785 "RawSupport.c"
 		}
 		default:
 		{
-#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2904 "RawSupport.c"
+#line 2791 "RawSupport.c"
 		}
 	}
 }
@@ -2911,68 +2798,68 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 	RawDeveloper _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = d;
-#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == _tmp0_) {
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2923 "RawSupport.c"
+#line 2810 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == RAW_DEVELOPER_CAMERA) {
-#line 2927 "RawSupport.c"
+#line 2814 "RawSupport.c"
 		RawDeveloper _tmp3_;
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp3_ = d;
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2933 "RawSupport.c"
+#line 2820 "RawSupport.c"
 	} else {
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = FALSE;
-#line 2937 "RawSupport.c"
+#line 2824 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp2_) {
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = TRUE;
-#line 2943 "RawSupport.c"
+#line 2830 "RawSupport.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2948 "RawSupport.c"
+#line 2835 "RawSupport.c"
 			RawDeveloper _tmp5_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp5_ = d;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2954 "RawSupport.c"
+#line 2841 "RawSupport.c"
 		} else {
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = FALSE;
-#line 2958 "RawSupport.c"
+#line 2845 "RawSupport.c"
 		}
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = _tmp4_;
-#line 2962 "RawSupport.c"
+#line 2849 "RawSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp1_) {
-#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2970 "RawSupport.c"
+#line 2857 "RawSupport.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = FALSE;
-#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2976 "RawSupport.c"
+#line 2863 "RawSupport.c"
 }
 
 
@@ -3010,41 +2897,41 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 	GFile* _tmp39_;
 	gchar* _tmp40_;
 	GError * _inner_error_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (raw_filepath != NULL, NULL);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ns = _tmp0_;
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = raw_filepath;
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	master = _tmp2_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = master;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = g_file_get_basename (_tmp3_);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	name = _tmp6_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ext = _tmp7_;
-#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp5_);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = camera_development_filename;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp8_ == NULL) {
-#line 3048 "RawSupport.c"
+#line 2935 "RawSupport.c"
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp16_;
 		gchar* _tmp17_;
@@ -3055,188 +2942,188 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 		gchar* _tmp22_;
 		gchar* _tmp23_;
 		gchar* _tmp24_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self != RAW_DEVELOPER_CAMERA) {
-#line 3061 "RawSupport.c"
+#line 2948 "RawSupport.c"
 			gchar* _tmp10_;
 			gchar* _tmp11_;
 			gchar* _tmp12_;
 			gchar* _tmp13_;
 			gchar* _tmp14_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp10_ = raw_developer_to_string (self);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp13_ = _tmp12_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp14_ = g_strconcat ("_", _tmp13_, NULL);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp14_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp13_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp11_);
-#line 3085 "RawSupport.c"
+#line 2972 "RawSupport.c"
 		} else {
 			gchar* _tmp15_;
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp15_ = g_strdup ("");
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp15_;
-#line 3094 "RawSupport.c"
+#line 2981 "RawSupport.c"
 		}
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp16_ = name;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp17_ = g_strconcat (_tmp16_, "_", NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp18_ = _tmp17_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp19_ = ext;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp21_ = _tmp20_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp23_ = _tmp22_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp24_;
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp23_);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp21_);
-#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp18_);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp9_);
-#line 3126 "RawSupport.c"
+#line 3013 "RawSupport.c"
 	} else {
 		const gchar* _tmp25_;
 		gchar* _tmp26_;
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp25_ = camera_development_filename;
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp26_ = g_strdup (_tmp25_);
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp26_;
-#line 3138 "RawSupport.c"
+#line 3025 "RawSupport.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp27_ = basename;
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp28_ = library_files_convert_basename (_tmp27_);
-#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	newbasename = _tmp28_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp29_ = master;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp30_ = g_file_get_parent (_tmp29_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp32_ = newbasename;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	c = _tmp33_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_ = _tmp34_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp31_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	new_back = _tmp35_;
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (newbasename);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3182 "RawSupport.c"
+#line 3069 "RawSupport.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_ = new_back;
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	claim_file (_tmp36_, &_inner_error_);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (new_back);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (newbasename);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3208 "RawSupport.c"
+#line 3095 "RawSupport.c"
 	}
-#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp37_ = ns;
-#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp38_ = ns;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp39_ = new_back;
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp40_ = g_file_get_path (_tmp39_);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp38_->filepath);
-#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp38_->filepath = _tmp40_;
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = ns;
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (new_back);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (newbasename);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (basename);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (master);
-#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 3240 "RawSupport.c"
+#line 3127 "RawSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index d11d06e..8c23826 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -196,13 +196,8 @@ public class RawSniffer : PhotoFileSniffer {
         }
         
         if (detected.metadata != null) {
-            uint8[]? flattened_sans_thumbnail = detected.metadata.flatten_exif(false);
-            if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
-                detected.exif_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
-            
-            uint8[]? flattened_thumbnail = detected.metadata.flatten_exif_preview();
-            if (flattened_thumbnail != null && flattened_thumbnail.length > 0)
-                detected.thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length);
+            detected.exif_md5 = detected.metadata.exif_hash();
+            detected.thumbnail_md5 = detected.metadata.thumbnail_hash();
         }
         
         if (calc_md5)
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 4962cb8..70e930b 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -558,10 +558,10 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P
 static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base);
 static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base);
 static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup16 (gchar** self, int length);
+static gchar** _vala_array_dup14 (gchar** self, int length);
 static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base);
 static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1);
-static gchar** _vala_array_dup17 (gchar** self, int length);
+static gchar** _vala_array_dup15 (gchar** self, int length);
 PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type);
 static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj);
 gpointer detected_photo_information_ref (gpointer instance);
@@ -949,7 +949,7 @@ static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (Pho
 }
 
 
-static gchar** _vala_array_dup16 (gchar** self, int length) {
+static gchar** _vala_array_dup14 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -986,7 +986,7 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0__length1 = photos_tiff_file_format_properties_KNOWN_EXTENSIONS_length1;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup14 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1032,7 +1032,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho
 }
 
 
-static gchar** _vala_array_dup17 (gchar** self, int length) {
+static gchar** _vala_array_dup15 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1069,7 +1069,7 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp0__length1 = photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup17 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup15 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index b309c95..dc9624f 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -17,7 +17,6 @@
 #include <gdk/gdk.h>
 #include <gee.h>
 #include <gio/gio.h>
-#include <gobject/gvaluecollector.h>
 
 
 #define PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR (plugins_manifest_widget_mediator_get_type ())
@@ -42,7 +41,6 @@ typedef struct _PluginsManifestListView PluginsManifestListView;
 typedef struct _PluginsManifestListViewClass PluginsManifestListViewClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _PluginsParamSpecManifestWidgetMediator PluginsParamSpecManifestWidgetMediator;
 typedef struct _PluginsManifestListViewPrivate PluginsManifestListViewPrivate;
 
 #define PLUGINS_MANIFEST_LIST_VIEW_TYPE_COLUMN (plugins_manifest_list_view_column_get_type ())
@@ -63,25 +61,20 @@ typedef struct _PluginsExtensionPointClass PluginsExtensionPointClass;
 #define __g_list_free__gtk_tree_path_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__gtk_tree_path_free0_ (var), NULL)))
 
 struct _PluginsManifestWidgetMediator {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
+	GtkBox parent_instance;
 	PluginsManifestWidgetMediatorPrivate * priv;
 };
 
 struct _PluginsManifestWidgetMediatorClass {
-	GTypeClass parent_class;
-	void (*finalize) (PluginsManifestWidgetMediator *self);
+	GtkBoxClass parent_class;
 };
 
 struct _PluginsManifestWidgetMediatorPrivate {
-	GtkBuilder* builder;
+	GtkButton* about_button;
+	GtkScrolledWindow* list_bin;
 	PluginsManifestListView* list;
 };
 
-struct _PluginsParamSpecManifestWidgetMediator {
-	GParamSpec parent_instance;
-};
-
 struct _PluginsManifestListView {
 	GtkTreeView parent_instance;
 	PluginsManifestListViewPrivate * priv;
@@ -108,40 +101,30 @@ typedef enum  {
 static gpointer plugins_manifest_widget_mediator_parent_class = NULL;
 static gpointer plugins_manifest_list_view_parent_class = NULL;
 
-gpointer plugins_manifest_widget_mediator_ref (gpointer instance);
-void plugins_manifest_widget_mediator_unref (gpointer instance);
-GParamSpec* plugins_param_spec_manifest_widget_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object);
-void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object);
-gpointer plugins_value_get_manifest_widget_mediator (const GValue* value);
 GType plugins_manifest_widget_mediator_get_type (void) G_GNUC_CONST;
 GType plugins_manifest_list_view_get_type (void) G_GNUC_CONST;
 #define PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediatorPrivate))
 enum  {
 	PLUGINS_MANIFEST_WIDGET_MEDIATOR_DUMMY_PROPERTY
 };
-static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsManifestWidgetMediator* self);
-static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self);
-static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self);
-static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 PluginsManifestListView* plugins_manifest_list_view_new (void);
 PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type);
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void);
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type);
-static GtkScrolledWindow* plugins_manifest_widget_mediator_get_list_bin (PluginsManifestWidgetMediator* self);
+static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMediator* self);
+static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self);
+static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self);
 static void plugins_manifest_widget_mediator_set_about_button_sensitivity (PluginsManifestWidgetMediator* self);
 gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* self, int* result_length1);
 gboolean plugins_get_pluggable_info (const gchar* id, SpitPluggableInfo* info);
 gboolean is_string_empty (const gchar* s);
-static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value);
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
 #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png"
 #define RESOURCES_DEFAULT_ICON_SCALE 24
 gchar* plugins_get_pluggable_name (const gchar* id);
-GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self);
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj);
+static void plugins_manifest_widget_mediator_finalize (GObject * obj);
 #define PLUGINS_MANIFEST_LIST_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListViewPrivate))
 enum  {
 	PLUGINS_MANIFEST_LIST_VIEW_DUMMY_PROPERTY
@@ -169,7 +152,7 @@ gint plugins_compare_pluggable_names (void* a, void* b);
 static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 gboolean plugins_get_pluggable_enabled (const gchar* id, gboolean* enabled);
 static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView* self, GtkTreePath* path, GtkTreeIter* iter);
-static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value);
 static void _gtk_tree_path_free0_ (gpointer var);
 static void _g_list_free__gtk_tree_path_free0_ (GList* self);
 static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* base, GdkEventButton* event);
@@ -181,62 +164,56 @@ static gint _vala_array_length (gpointer array);
 
 
 static void _plugins_manifest_widget_mediator_on_about_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 41 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 25 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_widget_mediator_on_about ((PluginsManifestWidgetMediator*) self);
-#line 187 "ManifestWidget.c"
+#line 170 "ManifestWidget.c"
 }
 
 
 static void _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
-#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 26 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_widget_mediator_on_selection_changed ((PluginsManifestWidgetMediator*) self);
-#line 194 "ManifestWidget.c"
+#line 177 "ManifestWidget.c"
 }
 
 
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType object_type) {
-	PluginsManifestWidgetMediator* self = NULL;
+	PluginsManifestWidgetMediator * self = NULL;
 	GtkScrolledWindow* _tmp0_;
-	GtkScrolledWindow* _tmp1_;
-	PluginsManifestListView* _tmp2_;
-	GtkButton* _tmp3_;
-	GtkButton* _tmp4_;
-	PluginsManifestListView* _tmp5_;
-	GtkTreeSelection* _tmp6_;
-#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	self = (PluginsManifestWidgetMediator*) g_type_create_instance (object_type);
-#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = plugins_manifest_widget_mediator_get_list_bin (self);
-#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = _tmp0_;
-#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp2_ = self->priv->list;
-#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp3_ = plugins_manifest_widget_mediator_get_about_button (self);
-#line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp4_ = _tmp3_;
-#line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_connect (_tmp4_, "clicked", (GCallback) _plugins_manifest_widget_mediator_on_about_gtk_button_clicked, self);
-#line 35 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp5_ = self->priv->list;
-#line 35 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp6_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_tree_view_get_type (), GtkTreeView));
-#line 35 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_connect (_tmp6_, "changed", (GCallback) _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed, self);
-#line 37 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	PluginsManifestListView* _tmp1_;
+	GtkButton* _tmp2_;
+	PluginsManifestListView* _tmp3_;
+	GtkTreeSelection* _tmp4_;
+#line 21 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	self = (PluginsManifestWidgetMediator*) g_object_new (object_type, NULL);
+#line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp0_ = self->priv->list_bin;
+#line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp1_ = self->priv->list;
+#line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 25 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp2_ = self->priv->about_button;
+#line 25 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	g_signal_connect_object (_tmp2_, "clicked", (GCallback) _plugins_manifest_widget_mediator_on_about_gtk_button_clicked, self, 0);
+#line 26 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp3_ = self->priv->list;
+#line 26 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp4_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tree_view_get_type (), GtkTreeView));
+#line 26 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	g_signal_connect_object (_tmp4_, "changed", (GCallback) _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed, self, 0);
+#line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_widget_mediator_set_about_button_sensitivity (self);
-#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 20 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self;
-#line 233 "ManifestWidget.c"
+#line 210 "ManifestWidget.c"
 }
 
 
 PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_new (void) {
-#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 20 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return plugins_manifest_widget_mediator_construct (PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR);
-#line 240 "ManifestWidget.c"
+#line 217 "ManifestWidget.c"
 }
 
 
@@ -259,31 +236,31 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 263 "ManifestWidget.c"
+#line 240 "ManifestWidget.c"
 }
 
 
-static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) {
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 274 "ManifestWidget.c"
+#line 251 "ManifestWidget.c"
 	}
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[(*length)++] = value;
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[*length] = NULL;
-#line 280 "ManifestWidget.c"
+#line 257 "ManifestWidget.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 287 "ManifestWidget.c"
+#line 264 "ManifestWidget.c"
 }
 
 
@@ -350,77 +327,77 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 	const gchar* _tmp73_;
 	GtkAboutDialog* _tmp74_;
 	GtkAboutDialog* _tmp75_;
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
-#line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = self->priv->list;
-#line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = plugins_manifest_list_view_get_selected_ids (_tmp0_, &_tmp1_);
-#line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids_length1 = _tmp1_;
-#line 46 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_ids_size_ = ids_length1;
-#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 33 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = ids;
-#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 33 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3__length1 = ids_length1;
-#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 33 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp3__length1 == 0) {
-#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL);
-#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return;
-#line 376 "ManifestWidget.c"
+#line 353 "ManifestWidget.c"
 	}
-#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp4_ = ids;
-#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp4__length1 = ids_length1;
-#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp5_ = _tmp4_[0];
-#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 36 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	id = _tmp6_;
-#line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 38 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	memset (&info, 0, sizeof (SpitPluggableInfo));
-#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 39 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp7_ = id;
-#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 39 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp8_ = plugins_get_pluggable_info (_tmp7_, &info);
-#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 39 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
-#line 396 "ManifestWidget.c"
+#line 373 "ManifestWidget.c"
 		const gchar* _tmp9_;
-#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 40 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp9_ = id;
-#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_warning ("ManifestWidget.vala:54: Unable to retrieve information for plugin %s", _tmp9_);
-#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 40 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+		g_warning ("ManifestWidget.vala:40: Unable to retrieve information for plugin %s", _tmp9_);
+#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		spit_pluggable_info_destroy (&info);
-#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_free0 (id);
-#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL);
-#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return;
-#line 410 "ManifestWidget.c"
+#line 387 "ManifestWidget.c"
 	}
-#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	authors = NULL;
-#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	authors_length1 = 0;
-#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 47 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_authors_size_ = authors_length1;
-#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp10_ = info;
-#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp11_ = _tmp10_.authors;
-#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp11_ != NULL) {
-#line 424 "ManifestWidget.c"
+#line 401 "ManifestWidget.c"
 		gchar** split = NULL;
 		SpitPluggableInfo _tmp12_;
 		const gchar* _tmp13_;
@@ -428,31 +405,31 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 		gchar** _tmp15_;
 		gint split_length1;
 		gint _split_size_;
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = info;
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp13_ = _tmp12_.authors;
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp15_ = _tmp14_ = g_strsplit (_tmp13_, ",", 0);
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		split = _tmp15_;
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		split_length1 = _vala_array_length (_tmp14_);
-#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 49 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_split_size_ = split_length1;
-#line 444 "ManifestWidget.c"
+#line 421 "ManifestWidget.c"
 		{
 			gint ctr = 0;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			ctr = 0;
-#line 449 "ManifestWidget.c"
+#line 426 "ManifestWidget.c"
 			{
 				gboolean _tmp16_ = FALSE;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp16_ = TRUE;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
-#line 456 "ManifestWidget.c"
+#line 433 "ManifestWidget.c"
 					gint _tmp18_;
 					gchar** _tmp19_;
 					gint _tmp19__length1;
@@ -464,280 +441,280 @@ static void plugins_manifest_widget_mediator_on_about (PluginsManifestWidgetMedi
 					gchar* _tmp23_;
 					const gchar* _tmp24_;
 					gboolean _tmp25_;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp16_) {
-#line 470 "ManifestWidget.c"
+#line 447 "ManifestWidget.c"
 						gint _tmp17_;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp17_ = ctr;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						ctr = _tmp17_ + 1;
-#line 476 "ManifestWidget.c"
+#line 453 "ManifestWidget.c"
 					}
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp16_ = FALSE;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp18_ = ctr;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp19_ = split;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp19__length1 = split_length1;
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!(_tmp18_ < _tmp19__length1)) {
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						break;
-#line 490 "ManifestWidget.c"
+#line 467 "ManifestWidget.c"
 					}
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp20_ = split;
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp20__length1 = split_length1;
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp21_ = ctr;
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp22_ = _tmp20_[_tmp21_];
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp23_ = string_strip (_tmp22_);
-#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 51 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					stripped = _tmp23_;
-#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp24_ = stripped;
-#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp25_ = is_string_empty (_tmp24_);
-#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 52 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp25_) {
-#line 510 "ManifestWidget.c"
+#line 487 "ManifestWidget.c"
 						gchar** _tmp26_;
 						gint _tmp26__length1;
 						gchar** _tmp28_;
 						gint _tmp28__length1;
 						const gchar* _tmp29_;
 						gchar* _tmp30_;
-#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp26_ = authors;
-#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp26__length1 = authors_length1;
-#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 53 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (_tmp26_ == NULL) {
-#line 523 "ManifestWidget.c"
+#line 500 "ManifestWidget.c"
 							gchar** _tmp27_;
-#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							_tmp27_ = g_new0 (gchar*, 0 + 1);
-#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							authors = _tmp27_;
-#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							authors_length1 = 0;
-#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 54 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 							_authors_size_ = authors_length1;
-#line 535 "ManifestWidget.c"
+#line 512 "ManifestWidget.c"
 						}
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp28_ = authors;
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp28__length1 = authors_length1;
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp29_ = stripped;
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp30_ = g_strdup (_tmp29_);
-#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-						_vala_array_add49 (&authors, &authors_length1, &_authors_size_, _tmp30_);
-#line 547 "ManifestWidget.c"
+#line 56 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+						_vala_array_add52 (&authors, &authors_length1, &_authors_size_, _tmp30_);
+#line 524 "ManifestWidget.c"
 					}
-#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 50 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_free0 (stripped);
-#line 551 "ManifestWidget.c"
+#line 528 "ManifestWidget.c"
 				}
 			}
 		}
-#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 48 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 557 "ManifestWidget.c"
+#line 534 "ManifestWidget.c"
 	}
-#line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp31_ = (GtkAboutDialog*) gtk_about_dialog_new ();
-#line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_ref_sink (_tmp31_);
-#line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 61 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	about_dialog = _tmp31_;
-#line 76 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp32_ = about_dialog;
-#line 76 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp33_ = authors;
-#line 76 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp33__length1 = authors_length1;
-#line 76 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 62 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_authors (_tmp32_, _tmp33_);
-#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp34_ = about_dialog;
-#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp35_ = info;
-#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp36_ = _tmp35_.brief_description;
-#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 63 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_comments (_tmp34_, _tmp36_);
-#line 78 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp37_ = about_dialog;
-#line 78 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp38_ = info;
-#line 78 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp39_ = _tmp38_.copyright;
-#line 78 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 64 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_copyright (_tmp37_, _tmp39_);
-#line 79 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp40_ = about_dialog;
-#line 79 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp41_ = info;
-#line 79 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp42_ = _tmp41_.license;
-#line 79 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 65 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_license (_tmp40_, _tmp42_);
-#line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp43_ = about_dialog;
-#line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp44_ = info;
-#line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp45_ = _tmp44_.is_license_wordwrapped;
-#line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 66 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_wrap_license (_tmp43_, _tmp45_);
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp48_ = info;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp49_ = _tmp48_.icons;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp49__length1 = _tmp48_.icons_length1;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp49_ != NULL) {
-#line 613 "ManifestWidget.c"
+#line 590 "ManifestWidget.c"
 		SpitPluggableInfo _tmp50_;
 		GdkPixbuf** _tmp51_;
 		gint _tmp51__length1;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp50_ = info;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp51_ = _tmp50_.icons;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp51__length1 = _tmp50_.icons_length1;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp47_ = _tmp51__length1 > 0;
-#line 625 "ManifestWidget.c"
+#line 602 "ManifestWidget.c"
 	} else {
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp47_ = FALSE;
-#line 629 "ManifestWidget.c"
+#line 606 "ManifestWidget.c"
 	}
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp47_) {
-#line 633 "ManifestWidget.c"
+#line 610 "ManifestWidget.c"
 		SpitPluggableInfo _tmp52_;
 		GdkPixbuf** _tmp53_;
 		gint _tmp53__length1;
 		GdkPixbuf* _tmp54_;
 		GdkPixbuf* _tmp55_;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp52_ = info;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp53_ = _tmp52_.icons;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp53__length1 = _tmp52_.icons_length1;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp54_ = _tmp53_[0];
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp55_ = _g_object_ref0 (_tmp54_);
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_tmp46_);
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp46_ = _tmp55_;
-#line 653 "ManifestWidget.c"
+#line 630 "ManifestWidget.c"
 	} else {
 		GdkPixbuf* _tmp56_;
-#line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp56_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_tmp46_);
-#line 82 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 68 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp46_ = _tmp56_;
-#line 662 "ManifestWidget.c"
+#line 639 "ManifestWidget.c"
 	}
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp57_ = about_dialog;
-#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 67 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_logo (_tmp57_, _tmp46_);
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp58_ = about_dialog;
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp59_ = id;
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp60_ = plugins_get_pluggable_name (_tmp59_);
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp61_ = _tmp60_;
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_program_name (_tmp58_, _tmp61_);
-#line 83 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 69 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_free0 (_tmp61_);
-#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp62_ = about_dialog;
-#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp63_ = info;
-#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp64_ = _tmp63_.translators;
-#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 70 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_translator_credits (_tmp62_, _tmp64_);
-#line 85 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp65_ = about_dialog;
-#line 85 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp66_ = info;
-#line 85 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp67_ = _tmp66_.version;
-#line 85 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 71 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_version (_tmp65_, _tmp67_);
-#line 86 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp68_ = about_dialog;
-#line 86 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp69_ = info;
-#line 86 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp70_ = _tmp69_.website_url;
-#line 86 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 72 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_website (_tmp68_, _tmp70_);
-#line 87 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp71_ = about_dialog;
-#line 87 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp72_ = info;
-#line 87 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp73_ = _tmp72_.website_name;
-#line 87 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 73 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_about_dialog_set_website_label (_tmp71_, _tmp73_);
-#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp74_ = about_dialog;
-#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 75 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_dialog_get_type (), GtkDialog));
-#line 91 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp75_ = about_dialog;
-#line 91 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 77 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget));
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (_tmp46_);
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (about_dialog);
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	spit_pluggable_info_destroy (&info);
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_free0 (id);
-#line 45 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 31 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL);
-#line 732 "ManifestWidget.c"
+#line 709 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_widget_mediator_on_selection_changed (PluginsManifestWidgetMediator* self) {
-#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 80 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
-#line 95 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 81 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_widget_mediator_set_about_button_sensitivity (self);
-#line 741 "ManifestWidget.c"
+#line 718 "ManifestWidget.c"
 }
 
 
@@ -749,372 +726,92 @@ static void plugins_manifest_widget_mediator_set_about_button_sensitivity (Plugi
 	gint ids_length1;
 	gint _ids_size_;
 	GtkButton* _tmp3_;
-	GtkButton* _tmp4_;
-#line 98 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self));
-#line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = self->priv->list;
-#line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = plugins_manifest_list_view_get_selected_ids (_tmp0_, &_tmp1_);
-#line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids_length1 = _tmp1_;
-#line 103 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 89 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_ids_size_ = ids_length1;
-#line 104 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp3_ = plugins_manifest_widget_mediator_get_about_button (self);
-#line 104 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp4_ = _tmp3_;
-#line 104 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), ids_length1 == 1);
-#line 98 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 90 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp3_ = self->priv->about_button;
+#line 90 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), ids_length1 == 1);
+#line 84 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = (_vala_array_free (ids, ids_length1, (GDestroyNotify) g_free), NULL);
-#line 774 "ManifestWidget.c"
-}
-
-
-GtkWidget* plugins_manifest_widget_mediator_get_widget (PluginsManifestWidgetMediator* self) {
-	GtkWidget* result;
-	GtkBuilder* _tmp0_;
-	GObject* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
-#line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = self->priv->builder;
-#line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "plugin-manifest");
-#line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp1_) : NULL;
-#line 12 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return result;
-#line 792 "ManifestWidget.c"
-}
-
-
-static GtkButton* plugins_manifest_widget_mediator_get_about_button (PluginsManifestWidgetMediator* self) {
-	GtkButton* result;
-	GtkBuilder* _tmp0_;
-	GObject* _tmp1_;
-#line 17 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
-#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = self->priv->builder;
-#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "about-plugin-button");
-#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_button_get_type ()) ? ((GtkButton*) _tmp1_) : NULL;
-#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return result;
-#line 810 "ManifestWidget.c"
-}
-
-
-static GtkScrolledWindow* plugins_manifest_widget_mediator_get_list_bin (PluginsManifestWidgetMediator* self) {
-	GtkScrolledWindow* result;
-	GtkBuilder* _tmp0_;
-	GObject* _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_val_if_fail (PLUGINS_IS_MANIFEST_WIDGET_MEDIATOR (self), NULL);
-#line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = self->priv->builder;
-#line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "plugin-list-scrolled-window");
-#line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_scrolled_window_get_type ()) ? ((GtkScrolledWindow*) _tmp1_) : NULL;
-#line 24 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return result;
-#line 828 "ManifestWidget.c"
-}
-
-
-static void plugins_value_manifest_widget_mediator_init (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	value->data[0].v_pointer = NULL;
-#line 835 "ManifestWidget.c"
-}
-
-
-static void plugins_value_manifest_widget_mediator_free_value (GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		plugins_manifest_widget_mediator_unref (value->data[0].v_pointer);
-#line 844 "ManifestWidget.c"
-	}
-}
-
-
-static void plugins_value_manifest_widget_mediator_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (src_value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		dest_value->data[0].v_pointer = plugins_manifest_widget_mediator_ref (src_value->data[0].v_pointer);
-#line 854 "ManifestWidget.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 858 "ManifestWidget.c"
-	}
-}
-
-
-static gpointer plugins_value_manifest_widget_mediator_peek_pointer (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return value->data[0].v_pointer;
-#line 866 "ManifestWidget.c"
-}
-
-
-static gchar* plugins_value_manifest_widget_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (collect_values[0].v_pointer) {
-#line 873 "ManifestWidget.c"
-		PluginsManifestWidgetMediator * object;
-		object = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 880 "ManifestWidget.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.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 884 "ManifestWidget.c"
-		}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = plugins_manifest_widget_mediator_ref (object);
-#line 888 "ManifestWidget.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = NULL;
-#line 892 "ManifestWidget.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return NULL;
-#line 896 "ManifestWidget.c"
-}
-
-
-static gchar* plugins_value_manifest_widget_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PluginsManifestWidgetMediator ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (!object_p) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 907 "ManifestWidget.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (!value->data[0].v_pointer) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		*object_p = NULL;
-#line 913 "ManifestWidget.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		*object_p = value->data[0].v_pointer;
-#line 917 "ManifestWidget.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		*object_p = plugins_manifest_widget_mediator_ref (value->data[0].v_pointer);
-#line 921 "ManifestWidget.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return NULL;
-#line 925 "ManifestWidget.c"
-}
-
-
-GParamSpec* plugins_param_spec_manifest_widget_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	PluginsParamSpecManifestWidgetMediator* spec;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR), NULL);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return G_PARAM_SPEC (spec);
-#line 939 "ManifestWidget.c"
-}
-
-
-gpointer plugins_value_get_manifest_widget_mediator (const GValue* value) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR), NULL);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return value->data[0].v_pointer;
-#line 948 "ManifestWidget.c"
-}
-
-
-void plugins_value_set_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator * old;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = v_object;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		plugins_manifest_widget_mediator_ref (value->data[0].v_pointer);
-#line 968 "ManifestWidget.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = NULL;
-#line 972 "ManifestWidget.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		plugins_manifest_widget_mediator_unref (old);
-#line 978 "ManifestWidget.c"
-	}
-}
-
-
-void plugins_value_take_manifest_widget_mediator (GValue* value, gpointer v_object) {
-	PluginsManifestWidgetMediator * old;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	old = value->data[0].v_pointer;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (v_object) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = v_object;
-#line 997 "ManifestWidget.c"
-	} else {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		value->data[0].v_pointer = NULL;
-#line 1001 "ManifestWidget.c"
-	}
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (old) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		plugins_manifest_widget_mediator_unref (old);
-#line 1007 "ManifestWidget.c"
-	}
+#line 748 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_widget_mediator_class_init (PluginsManifestWidgetMediatorClass * klass) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gint PluginsManifestWidgetMediator_private_offset;
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_widget_mediator_parent_class = g_type_class_peek_parent (klass);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	((PluginsManifestWidgetMediatorClass *) klass)->finalize = plugins_manifest_widget_mediator_finalize;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_type_class_add_private (klass, sizeof (PluginsManifestWidgetMediatorPrivate));
-#line 1019 "ManifestWidget.c"
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	G_OBJECT_CLASS (klass)->finalize = plugins_manifest_widget_mediator_finalize;
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	PluginsManifestWidgetMediator_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/manifest_widget.ui");
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "about_button", FALSE, PluginsManifestWidgetMediator_private_offset + G_STRUCT_OFFSET (PluginsManifestWidgetMediatorPrivate, about_button));
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "list_bin", FALSE, PluginsManifestWidgetMediator_private_offset + G_STRUCT_OFFSET (PluginsManifestWidgetMediatorPrivate, list_bin));
+#line 768 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_widget_mediator_instance_init (PluginsManifestWidgetMediator * self) {
-	GtkBuilder* _tmp0_;
-	PluginsManifestListView* _tmp1_;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	PluginsManifestListView* _tmp0_;
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv = PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_PRIVATE (self);
-#line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	self->priv->builder = _tmp0_;
-#line 29 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = plugins_manifest_list_view_new ();
-#line 29 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_object_ref_sink (_tmp1_);
-#line 29 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	self->priv->list = _tmp1_;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	self->ref_count = 1;
-#line 1040 "ManifestWidget.c"
+#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_tmp0_ = plugins_manifest_list_view_new ();
+#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	g_object_ref_sink (_tmp0_);
+#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	self->priv->list = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 784 "ManifestWidget.c"
 }
 
 
-static void plugins_manifest_widget_mediator_finalize (PluginsManifestWidgetMediator * obj) {
+static void plugins_manifest_widget_mediator_finalize (GObject * obj) {
 	PluginsManifestWidgetMediator * self;
-	GtkButton* _tmp0_;
-	GtkButton* _tmp1_;
-	guint _tmp2_;
-	PluginsManifestListView* _tmp3_;
-	GtkTreeSelection* _tmp4_;
-	guint _tmp5_;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_WIDGET_MEDIATOR, PluginsManifestWidgetMediator);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_handlers_destroy (self);
-#line 41 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp0_ = plugins_manifest_widget_mediator_get_about_button (self);
-#line 41 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp1_ = _tmp0_;
-#line 41 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 41 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _plugins_manifest_widget_mediator_on_about_gtk_button_clicked, self);
-#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp3_ = self->priv->list;
-#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_tmp4_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_tree_view_get_type (), GtkTreeView));
-#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_parse_name ("changed", gtk_tree_selection_get_type (), &_tmp5_, NULL, FALSE);
-#line 42 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _plugins_manifest_widget_mediator_on_selection_changed_gtk_tree_selection_changed, self);
-#line 28 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 29 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 13 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_g_object_unref0 (self->priv->about_button);
+#line 16 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_g_object_unref0 (self->priv->list_bin);
+#line 18 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (self->priv->list);
-#line 1076 "ManifestWidget.c"
+#line 11 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	G_OBJECT_CLASS (plugins_manifest_widget_mediator_parent_class)->finalize (obj);
+#line 800 "ManifestWidget.c"
 }
 
 
 GType plugins_manifest_widget_mediator_get_type (void) {
 	static volatile gsize plugins_manifest_widget_mediator_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_manifest_widget_mediator_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { plugins_value_manifest_widget_mediator_init, plugins_value_manifest_widget_mediator_free_value, plugins_value_manifest_widget_mediator_copy_value, plugins_value_manifest_widget_mediator_peek_pointer, "p", plugins_value_manifest_widget_mediator_collect_value, "p", plugins_value_manifest_widget_mediator_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PluginsManifestWidgetMediatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) plugins_manifest_widget_mediator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PluginsManifestWidgetMediator), 0, (GInstanceInitFunc) plugins_manifest_widget_mediator_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		static const GTypeInfo g_define_type_info = { sizeof (PluginsManifestWidgetMediatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) plugins_manifest_widget_mediator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PluginsManifestWidgetMediator), 0, (GInstanceInitFunc) plugins_manifest_widget_mediator_instance_init, NULL };
 		GType plugins_manifest_widget_mediator_type_id;
-		plugins_manifest_widget_mediator_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PluginsManifestWidgetMediator", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		plugins_manifest_widget_mediator_type_id = g_type_register_static (gtk_box_get_type (), "PluginsManifestWidgetMediator", &g_define_type_info, 0);
 		g_once_init_leave (&plugins_manifest_widget_mediator_type_id__volatile, plugins_manifest_widget_mediator_type_id);
 	}
 	return plugins_manifest_widget_mediator_type_id__volatile;
 }
 
 
-gpointer plugins_manifest_widget_mediator_ref (gpointer instance) {
-	PluginsManifestWidgetMediator * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	return instance;
-#line 1101 "ManifestWidget.c"
-}
-
-
-void plugins_manifest_widget_mediator_unref (gpointer instance) {
-	PluginsManifestWidgetMediator * self;
-	self = instance;
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		PLUGINS_MANIFEST_WIDGET_MEDIATOR_GET_CLASS (self)->finalize (self);
-#line 9 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 1114 "ManifestWidget.c"
-	}
-}
-
-
 static GType plugins_manifest_list_view_column_get_type (void) {
 	static volatile gsize plugins_manifest_list_view_column_type_id__volatile = 0;
 	if (g_once_init_enter (&plugins_manifest_list_view_column_type_id__volatile)) {
@@ -1130,18 +827,18 @@ static GType plugins_manifest_list_view_column_get_type (void) {
 static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = plugins_compare_extension_point_names (a, b);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1136 "ManifestWidget.c"
+#line 833 "ManifestWidget.c"
 }
 
 
 static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = plugins_compare_pluggable_names (a, b);
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1145 "ManifestWidget.c"
+#line 842 "ManifestWidget.c"
 }
 
 
@@ -1181,148 +878,148 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 	GtkIconTheme* icon_theme = NULL;
 	GtkIconTheme* _tmp27_;
 	GError * _inner_error_ = NULL;
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = (PluginsManifestListView*) g_object_new (object_type, NULL);
-#line 131 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 117 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = self->priv->store;
-#line 131 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 117 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 119 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = (GtkCellRendererToggle*) gtk_cell_renderer_toggle_new ();
-#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 119 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_ref_sink (_tmp1_);
-#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 119 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	checkbox_renderer = _tmp1_;
-#line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 120 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = checkbox_renderer;
-#line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 120 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_renderer_toggle_set_radio (_tmp2_, FALSE);
-#line 135 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 121 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = checkbox_renderer;
-#line 135 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 121 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_renderer_toggle_set_activatable (_tmp3_, TRUE);
-#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 123 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp4_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 123 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_ref_sink (_tmp4_);
-#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 123 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	icon_renderer = _tmp4_;
-#line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 124 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp5_ = icon_renderer;
-#line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 124 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_set (_tmp5_, "stock-size", (guint) GTK_ICON_SIZE_MENU, NULL);
-#line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 125 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp6_ = icon_renderer;
-#line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 125 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), "xpad", (guint) PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING, NULL);
-#line 140 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 126 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp7_ = icon_renderer;
-#line 140 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 126 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), "ypad", (guint) PLUGINS_MANIFEST_LIST_VIEW_ICON_Y_PADDING, NULL);
-#line 142 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 128 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 142 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 128 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_ref_sink (_tmp8_);
-#line 142 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 128 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	text_renderer = _tmp8_;
-#line 144 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp9_ = gtk_tree_view_column_new ();
-#line 144 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_object_ref_sink (_tmp9_);
-#line 144 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	column = _tmp9_;
-#line 145 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 131 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp10_ = column;
-#line 145 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 131 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_column_set_sizing (_tmp10_, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-#line 146 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 132 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp11_ = column;
-#line 146 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 132 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp12_ = checkbox_renderer;
-#line 146 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 132 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 147 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp13_ = column;
-#line 147 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp14_ = icon_renderer;
-#line 147 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 133 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 148 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp15_ = column;
-#line 148 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp16_ = text_renderer;
-#line 148 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 134 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 150 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp17_ = column;
-#line 150 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp18_ = checkbox_renderer;
-#line 150 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 136 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_cell_renderer_get_type (), GtkCellRenderer), "active", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED);
-#line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp19_ = column;
-#line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp20_ = checkbox_renderer;
-#line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 137 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_cell_renderer_get_type (), GtkCellRenderer), "visible", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE);
-#line 152 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp21_ = column;
-#line 152 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp22_ = icon_renderer;
-#line 152 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 138 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON);
-#line 153 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp23_ = column;
-#line 153 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp24_ = text_renderer;
-#line 153 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 139 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", (gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME);
-#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 141 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp25_ = column;
-#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 141 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp25_);
-#line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 143 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_headers_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 158 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 144 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_enable_search (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 159 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 145 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_show_expanders (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE);
-#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 146 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_reorderable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 147 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_enable_tree_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 162 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 148 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_grid_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GTK_TREE_VIEW_GRID_LINES_NONE);
-#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 149 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp26_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 149 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_selection_set_mode (_tmp26_, GTK_SELECTION_BROWSE);
-#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp27_ = resources_get_icon_theme_engine ();
-#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 151 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	icon_theme = _tmp27_;
-#line 1305 "ManifestWidget.c"
+#line 1002 "ManifestWidget.c"
 	{
 		GeeIterator* _extension_point_it = NULL;
 		GeeCollection* _tmp28_;
 		GeeCollection* _tmp29_;
 		GeeIterator* _tmp30_;
 		GeeIterator* _tmp31_;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp28_ = plugins_get_extension_points (_plugins_compare_extension_point_names_gcompare_data_func, NULL, NULL);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp29_ = _tmp28_;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp31_ = _tmp30_;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_tmp29_);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_extension_point_it = _tmp31_;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		while (TRUE) {
-#line 1326 "ManifestWidget.c"
+#line 1023 "ManifestWidget.c"
 			GeeIterator* _tmp32_;
 			gboolean _tmp33_;
 			PluginsExtensionPoint* extension_point = NULL;
@@ -1346,39 +1043,39 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 			GType _tmp66_;
 			GType _tmp67_;
 			GeeCollection* _tmp68_;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp32_ = _extension_point_it;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp33_ = gee_iterator_next (_tmp32_);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			if (!_tmp33_) {
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				break;
-#line 1358 "ManifestWidget.c"
+#line 1055 "ManifestWidget.c"
 			}
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp34_ = _extension_point_it;
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp35_ = gee_iterator_get (_tmp34_);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			extension_point = (PluginsExtensionPoint*) _tmp35_;
-#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp36_ = self->priv->store;
-#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			gtk_tree_store_append (_tmp36_, &_tmp37_, NULL);
-#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 157 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			category_iter = _tmp37_;
-#line 173 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 159 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			icon = NULL;
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp38_ = extension_point;
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp39_ = plugins_extension_point_get_icon_name (_tmp38_);
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp40_ = _tmp39_;
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			if (_tmp40_ != NULL) {
-#line 1382 "ManifestWidget.c"
+#line 1079 "ManifestWidget.c"
 				GtkIconInfo* icon_info = NULL;
 				GtkIconTheme* _tmp41_;
 				PluginsExtensionPoint* _tmp42_;
@@ -1389,61 +1086,61 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 				GtkIconInfo* _tmp47_;
 				GtkIconInfo* _tmp48_;
 				GtkIconInfo* _tmp49_;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp41_ = icon_theme;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp42_ = extension_point;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp43_ = plugins_extension_point_get_icon_name (_tmp42_);
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp44_ = _tmp43_;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp45_ = (GThemedIcon*) g_themed_icon_new (_tmp44_);
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp46_ = _tmp45_;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp48_ = _tmp47_;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_object_unref0 (_tmp46_);
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				icon_info = _tmp48_;
-#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp49_ = icon_info;
-#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp49_ != NULL) {
-#line 1417 "ManifestWidget.c"
+#line 1114 "ManifestWidget.c"
 					{
 						GdkPixbuf* _tmp50_ = NULL;
 						GtkIconInfo* _tmp51_;
 						GdkPixbuf* _tmp52_;
 						GdkPixbuf* _tmp53_;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp51_ = icon_info;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp52_ = gtk_icon_info_load_icon (_tmp51_, &_inner_error_);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp50_ = _tmp52_;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1431 "ManifestWidget.c"
-							goto __catch37_g_error;
+#line 1128 "ManifestWidget.c"
+							goto __catch41_g_error;
 						}
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp50_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						icon = _tmp53_;
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp50_);
-#line 1444 "ManifestWidget.c"
+#line 1141 "ManifestWidget.c"
 					}
-					goto __finally37;
-					__catch37_g_error:
+					goto __finally41;
+					__catch41_g_error:
 					{
 						GError* err = NULL;
 						PluginsExtensionPoint* _tmp54_;
@@ -1451,98 +1148,98 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						const gchar* _tmp56_;
 						GError* _tmp57_;
 						const gchar* _tmp58_;
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						err = _inner_error_;
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp54_ = extension_point;
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp55_ = plugins_extension_point_get_icon_name (_tmp54_);
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp56_ = _tmp55_;
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp57_ = err;
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp58_ = _tmp57_->message;
-#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-						g_warning ("ManifestWidget.vala:181: Unable to load icon %s: %s", _tmp56_, _tmp58_);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 167 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+						g_warning ("ManifestWidget.vala:167: Unable to load icon %s: %s", _tmp56_, _tmp58_);
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_error_free0 (err);
-#line 1473 "ManifestWidget.c"
+#line 1170 "ManifestWidget.c"
 					}
-					__finally37:
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+					__finally41:
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_gtk_icon_info_free0 (icon_info);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_plugins_extension_point_unref0 (extension_point);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_extension_point_it);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon_theme);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (column);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (text_renderer);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon_renderer);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (checkbox_renderer);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						g_clear_error (&_inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						return NULL;
-#line 1502 "ManifestWidget.c"
+#line 1199 "ManifestWidget.c"
 					}
 				}
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_gtk_icon_info_free0 (icon_info);
-#line 1507 "ManifestWidget.c"
+#line 1204 "ManifestWidget.c"
 			}
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp59_ = self->priv->store;
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp60_ = category_iter;
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp61_ = extension_point;
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp62_ = plugins_extension_point_get_name (_tmp61_);
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp63_ = _tmp62_;
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp64_ = icon;
-#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			gtk_tree_store_set (_tmp59_, &_tmp60_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp63_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, FALSE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp64_, -1);
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp65_ = extension_point;
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp66_ = plugins_extension_point_get_pluggable_type (_tmp65_);
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp67_ = _tmp66_;
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp68_ = plugins_get_pluggables_for_type (_tmp67_, _plugins_compare_pluggable_names_gcompare_data_func, NULL, NULL, TRUE);
-#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			pluggables = _tmp68_;
-#line 1533 "ManifestWidget.c"
+#line 1230 "ManifestWidget.c"
 			{
 				GeeIterator* _pluggable_it = NULL;
 				GeeCollection* _tmp69_;
 				GeeIterator* _tmp70_;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp69_ = pluggables;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp70_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_pluggable_it = _tmp70_;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
-#line 1546 "ManifestWidget.c"
+#line 1243 "ManifestWidget.c"
 					GeeIterator* _tmp71_;
 					gboolean _tmp72_;
 					SpitPluggable* pluggable = NULL;
@@ -1573,221 +1270,221 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 					SpitPluggable* _tmp100_;
 					const gchar* _tmp101_;
 					GdkPixbuf* _tmp102_;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp71_ = _pluggable_it;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp72_ = gee_iterator_next (_tmp71_);
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp72_) {
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						break;
-#line 1585 "ManifestWidget.c"
+#line 1282 "ManifestWidget.c"
 					}
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp73_ = _pluggable_it;
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp74_ = gee_iterator_get (_tmp73_);
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					pluggable = (SpitPluggable*) _tmp74_;
-#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp75_ = pluggable;
-#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp76_ = spit_pluggable_get_id (_tmp75_);
-#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp78_ = plugins_get_pluggable_enabled (_tmp76_, &_tmp77_);
-#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					enabled = _tmp77_;
-#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp78_) {
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (pluggable);
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						continue;
-#line 1607 "ManifestWidget.c"
+#line 1304 "ManifestWidget.c"
 					}
-#line 196 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					memset (&info, 0, sizeof (SpitPluggableInfo));
-#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 183 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp79_ = pluggable;
-#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 183 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					spit_pluggable_get_info (_tmp79_, &info);
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp82_ = info;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp83_ = _tmp82_.icons;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp83__length1 = _tmp82_.icons_length1;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp83_ != NULL) {
-#line 1623 "ManifestWidget.c"
+#line 1320 "ManifestWidget.c"
 						SpitPluggableInfo _tmp84_;
 						GdkPixbuf** _tmp85_;
 						gint _tmp85__length1;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp84_ = info;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp85_ = _tmp84_.icons;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp85__length1 = _tmp84_.icons_length1;
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp81_ = _tmp85__length1 > 0;
-#line 1635 "ManifestWidget.c"
+#line 1332 "ManifestWidget.c"
 					} else {
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp81_ = FALSE;
-#line 1639 "ManifestWidget.c"
+#line 1336 "ManifestWidget.c"
 					}
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp81_) {
-#line 1643 "ManifestWidget.c"
+#line 1340 "ManifestWidget.c"
 						SpitPluggableInfo _tmp86_;
 						GdkPixbuf** _tmp87_;
 						gint _tmp87__length1;
 						GdkPixbuf* _tmp88_;
 						GdkPixbuf* _tmp89_;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp86_ = info;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp87_ = _tmp86_.icons;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp87__length1 = _tmp86_.icons_length1;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp88_ = _tmp87_[0];
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp89_ = _g_object_ref0 (_tmp88_);
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp80_);
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp80_ = _tmp89_;
-#line 1663 "ManifestWidget.c"
+#line 1360 "ManifestWidget.c"
 					} else {
 						GdkPixbuf* _tmp90_;
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE);
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp80_);
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp80_ = _tmp90_;
-#line 1672 "ManifestWidget.c"
+#line 1369 "ManifestWidget.c"
 					}
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp91_ = _g_object_ref0 (_tmp80_);
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (icon);
-#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 185 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					icon = _tmp91_;
-#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp92_ = self->priv->store;
-#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp93_ = category_iter;
-#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					gtk_tree_store_append (_tmp92_, &_tmp94_, &_tmp93_);
-#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					plugin_iter = _tmp94_;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp95_ = self->priv->store;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp96_ = plugin_iter;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp97_ = enabled;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp98_ = pluggable;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp99_ = spit_pluggable_get_pluggable_name (_tmp98_);
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp100_ = pluggable;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp101_ = spit_pluggable_get_id (_tmp100_);
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp102_ = icon;
-#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					gtk_tree_store_set (_tmp95_, &_tmp96_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp97_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp99_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, _tmp101_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, TRUE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp102_, -1);
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (_tmp80_);
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					spit_pluggable_info_destroy (&info);
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (pluggable);
-#line 1712 "ManifestWidget.c"
+#line 1409 "ManifestWidget.c"
 				}
-#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_object_unref0 (_pluggable_it);
-#line 1716 "ManifestWidget.c"
+#line 1413 "ManifestWidget.c"
 			}
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_g_object_unref0 (pluggables);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_g_object_unref0 (icon);
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_plugins_extension_point_unref0 (extension_point);
-#line 1724 "ManifestWidget.c"
+#line 1421 "ManifestWidget.c"
 		}
-#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 155 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_extension_point_it);
-#line 1728 "ManifestWidget.c"
+#line 1425 "ManifestWidget.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_expand_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (icon_theme);
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (column);
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (text_renderer);
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (icon_renderer);
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (checkbox_renderer);
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self;
-#line 1744 "ManifestWidget.c"
+#line 1441 "ManifestWidget.c"
 }
 
 
 PluginsManifestListView* plugins_manifest_list_view_new (void) {
-#line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 116 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return plugins_manifest_list_view_construct (PLUGINS_TYPE_MANIFEST_LIST_VIEW);
-#line 1751 "ManifestWidget.c"
+#line 1448 "ManifestWidget.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1758 "ManifestWidget.c"
+#line 1455 "ManifestWidget.c"
 }
 
 
-static void _vala_array_add50 (gchar** * array, int* length, int* size, gchar* value) {
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1769 "ManifestWidget.c"
+#line 1466 "ManifestWidget.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[(*length)++] = value;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[*length] = NULL;
-#line 1775 "ManifestWidget.c"
+#line 1472 "ManifestWidget.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1782 "ManifestWidget.c"
+#line 1479 "ManifestWidget.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_list_free (self);
-#line 1791 "ManifestWidget.c"
+#line 1488 "ManifestWidget.c"
 }
 
 
@@ -1803,40 +1500,40 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 	GList* _tmp3_;
 	gchar** _tmp12_;
 	gint _tmp12__length1;
-#line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
-#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = _tmp0_;
-#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids_length1 = 0;
-#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_ids_size_ = ids_length1;
-#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 203 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 203 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp1_, NULL);
-#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 203 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	selected = _tmp2_;
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = selected;
-#line 1825 "ManifestWidget.c"
+#line 1522 "ManifestWidget.c"
 	{
 		GList* path_collection = NULL;
 		GList* path_it = NULL;
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		path_collection = _tmp3_;
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		for (path_it = path_collection; path_it != NULL; path_it = path_it->next) {
-#line 1833 "ManifestWidget.c"
+#line 1530 "ManifestWidget.c"
 			GtkTreePath* _tmp4_;
 			GtkTreePath* path = NULL;
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data);
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			path = _tmp4_;
-#line 1840 "ManifestWidget.c"
+#line 1537 "ManifestWidget.c"
 			{
 				GtkTreeIter iter = {0};
 				gchar* id = NULL;
@@ -1844,60 +1541,60 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 				GtkTreeIter _tmp6_ = {0};
 				gchar* _tmp7_;
 				const gchar* _tmp8_;
-#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp5_ = path;
-#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp7_ = plugins_manifest_list_view_get_id_at_path (self, _tmp5_, &_tmp6_);
-#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				iter = _tmp6_;
-#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				id = _tmp7_;
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp8_ = id;
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp8_ != NULL) {
-#line 1860 "ManifestWidget.c"
+#line 1557 "ManifestWidget.c"
 					gchar** _tmp9_;
 					gint _tmp9__length1;
 					const gchar* _tmp10_;
 					gchar* _tmp11_;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9_ = ids;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9__length1 = ids_length1;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp10_ = id;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp11_ = g_strdup (_tmp10_);
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-					_vala_array_add50 (&ids, &ids_length1, &_ids_size_, _tmp11_);
-#line 1875 "ManifestWidget.c"
+#line 208 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+					_vala_array_add53 (&ids, &ids_length1, &_ids_size_, _tmp11_);
+#line 1572 "ManifestWidget.c"
 				}
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_free0 (id);
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_gtk_tree_path_free0 (path);
-#line 1881 "ManifestWidget.c"
+#line 1578 "ManifestWidget.c"
 			}
 		}
 	}
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp12_ = ids;
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp12__length1 = ids_length1;
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (result_length1) {
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*result_length1 = _tmp12__length1;
-#line 1893 "ManifestWidget.c"
+#line 1590 "ManifestWidget.c"
 	}
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = _tmp12_;
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	__g_list_free__gtk_tree_path_free0_0 (selected);
-#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1901 "ManifestWidget.c"
+#line 1598 "ManifestWidget.c"
 }
 
 
@@ -1913,53 +1610,53 @@ static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView
 	GtkTreeIter _tmp5_;
 	const gchar* _tmp6_;
 	gchar* _tmp7_;
-#line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
-#line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = self->priv->store;
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = path;
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_vala_iter = _tmp2_;
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp3_) {
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = NULL;
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		if (iter) {
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			*iter = _vala_iter;
-#line 1937 "ManifestWidget.c"
+#line 1634 "ManifestWidget.c"
 		}
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 1941 "ManifestWidget.c"
+#line 1638 "ManifestWidget.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp4_ = self->priv->store;
-#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp5_ = _vala_iter;
-#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_model_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp5_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, &id, -1);
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp6_ = id;
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = _tmp7_;
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (iter) {
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*iter = _vala_iter;
-#line 1959 "ManifestWidget.c"
+#line 1656 "ManifestWidget.c"
 	}
-#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1963 "ManifestWidget.c"
+#line 1660 "ManifestWidget.c"
 }
 
 
@@ -1998,211 +1695,211 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 	GtkTreeStore* _tmp31_;
 	GtkTreeIter _tmp32_;
 	gboolean _tmp33_;
-#line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 232 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
-#line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 232 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = event;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = _tmp0_->x;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = event;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = _tmp2_->y;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp8_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) _tmp1_, (gint) _tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_gtk_tree_path_free0 (path);
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	path = _tmp4_;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (col);
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp9_ = _g_object_ref0 (_tmp5_);
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	col = _tmp9_;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	cellx = _tmp6_;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	celly = _tmp7_;
-#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 237 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
-#line 2032 "ManifestWidget.c"
+#line 1729 "ManifestWidget.c"
 		GdkEventButton* _tmp10_;
 		gboolean _tmp11_;
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp10_ = event;
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp11_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp11_;
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 239 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2047 "ManifestWidget.c"
+#line 1744 "ManifestWidget.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp13_ = cellx;
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp13_ < (PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE + PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING)) {
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = TRUE;
-#line 2055 "ManifestWidget.c"
+#line 1752 "ManifestWidget.c"
 	} else {
 		gint _tmp14_;
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp14_ = cellx;
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = _tmp14_ > (2 * (PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING + PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE));
-#line 2062 "ManifestWidget.c"
+#line 1759 "ManifestWidget.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 244 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp12_) {
-#line 2066 "ManifestWidget.c"
+#line 1763 "ManifestWidget.c"
 		GdkEventButton* _tmp15_;
 		gboolean _tmp16_;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp15_ = event;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp16_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_);
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp16_;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 245 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2081 "ManifestWidget.c"
+#line 1778 "ManifestWidget.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp17_ = path;
-#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp19_ = plugins_manifest_list_view_get_id_at_path (self, _tmp17_, &_tmp18_);
-#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	iter = _tmp18_;
-#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 248 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	id = _tmp19_;
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 249 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp20_ = id;
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 249 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp20_ == NULL) {
-#line 2095 "ManifestWidget.c"
+#line 1792 "ManifestWidget.c"
 		GdkEventButton* _tmp21_;
 		gboolean _tmp22_;
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp21_ = event;
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp22_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_);
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp22_;
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_free0 (id);
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 250 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2112 "ManifestWidget.c"
+#line 1809 "ManifestWidget.c"
 	}
-#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp23_ = id;
-#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp25_ = plugins_get_pluggable_enabled (_tmp23_, &_tmp24_);
-#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	enabled = _tmp24_;
-#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp25_) {
-#line 2122 "ManifestWidget.c"
+#line 1819 "ManifestWidget.c"
 		GdkEventButton* _tmp26_;
 		gboolean _tmp27_;
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp26_ = event;
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp27_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_);
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp27_;
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_free0 (id);
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2139 "ManifestWidget.c"
+#line 1836 "ManifestWidget.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 257 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp28_ = enabled;
-#line 271 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 257 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	enabled = !_tmp28_;
-#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp29_ = id;
-#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp30_ = enabled;
-#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_set_pluggable_enabled (_tmp29_, _tmp30_);
-#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp31_ = self->priv->store;
-#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp32_ = iter;
-#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp33_ = enabled;
-#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_store_set (_tmp31_, &_tmp32_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp33_, -1);
-#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = TRUE;
-#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_free0 (id);
-#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (col);
-#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_gtk_tree_path_free0 (path);
-#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 2169 "ManifestWidget.c"
+#line 1866 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass * klass) {
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_manifest_list_view_parent_class = g_type_class_peek_parent (klass);
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_type_class_add_private (klass, sizeof (PluginsManifestListViewPrivate));
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) plugins_manifest_list_view_real_button_press_event;
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize;
-#line 2182 "ManifestWidget.c"
+#line 1879 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_list_view_instance_init (PluginsManifestListView * self) {
 	GtkTreeStore* _tmp0_;
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/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"
+#line 108 "/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_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING);
-#line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv->store = _tmp0_;
-#line 2194 "ManifestWidget.c"
+#line 1891 "ManifestWidget.c"
 }
 
 
 static void plugins_manifest_list_view_finalize (GObject * obj) {
 	PluginsManifestListView * self;
-#line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
-#line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	_g_object_unref0 (self->priv->store);
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+	_g_object_unref0 (self->priv->store);
+#line 94 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (plugins_manifest_list_view_parent_class)->finalize (obj);
-#line 2206 "ManifestWidget.c"
+#line 1903 "ManifestWidget.c"
 }
 
 
diff --git a/src/plugins/ManifestWidget.vala b/src/plugins/ManifestWidget.vala
index b6897ba..8fb0ba2 100644
--- a/src/plugins/ManifestWidget.vala
+++ b/src/plugins/ManifestWidget.vala
@@ -6,29 +6,20 @@
 
 namespace Plugins {
 
-public class ManifestWidgetMediator {
-    public Gtk.Widget widget {
-        get {
-            return builder.get_object("plugin-manifest") as Gtk.Widget;
-        }
-    }
+
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/manifest_widget.ui")]
+public class ManifestWidgetMediator : Gtk.Box {
+    [GtkChild]
+    private Gtk.Button about_button;
     
-    private Gtk.Button about_button {
-        get {
-            return builder.get_object("about-plugin-button") as Gtk.Button;
-        }
-    }
+    [GtkChild]
+    private Gtk.ScrolledWindow list_bin;
     
-    private Gtk.ScrolledWindow list_bin {
-        get {
-            return builder.get_object("plugin-list-scrolled-window") as Gtk.ScrolledWindow;
-        }
-    }
-    
-    private Gtk.Builder builder = AppWindow.create_builder();
     private ManifestListView list = new ManifestListView();
     
     public ManifestWidgetMediator() {
+        Object();
+
         list_bin.add(list);
         
         about_button.clicked.connect(on_about);
@@ -37,11 +28,6 @@ public class ManifestWidgetMediator {
         set_about_button_sensitivity();
     }
     
-    ~ManifestWidgetMediator() {
-        about_button.clicked.disconnect(on_about);
-        list.get_selection().changed.disconnect(on_selection_changed);
-    }
-    
     private void on_about() {
         string[] ids = list.get_selected_ids();
         if (ids.length == 0)
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 3817292..f6a6639 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -249,7 +249,7 @@ GType plugins_extension_point_get_pluggable_type (PluginsExtensionPoint* self);
 const gchar* plugins_extension_point_get_name (PluginsExtensionPoint* self);
 const gchar* plugins_extension_point_get_icon_name (PluginsExtensionPoint* self);
 gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int* result_length1);
-static gchar** _vala_array_dup18 (gchar** self, int length);
+static gchar** _vala_array_dup16 (gchar** self, int length);
 static void plugins_extension_point_finalize (PluginsExtensionPoint * obj);
 gpointer plugins_module_rep_ref (gpointer instance);
 void plugins_module_rep_unref (gpointer instance);
@@ -299,9 +299,9 @@ gboolean plugins_pluggable_rep_get_activated (PluginsPluggableRep* self);
 static void plugins_pluggable_rep_finalize (PluginsPluggableRep * obj);
 void plugins_init (GError** error);
 GFile* app_dirs_get_user_plugins_dir (void);
-static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value);
 GFile* app_dirs_get_system_plugins_dir (void);
-static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value);
+static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value);
 void plugins_search_for_plugins (GFile* dir, GError** error);
 void plugins_terminate (void);
 gpointer plugins_notifier_ref (gpointer instance);
@@ -322,7 +322,7 @@ static void plugins_notifier_finalize (PluginsNotifier * obj);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 GeeCollection* plugins_get_pluggables (gboolean include_disabled);
 PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle);
-static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length);
+static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
 GeeCollection* plugins_get_extension_points (GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
@@ -507,7 +507,7 @@ gchar** plugins_extension_point_get_core_ids (PluginsExtensionPoint* self, int*
 }
 
 
-static gchar** _vala_array_dup18 (gchar** self, int length) {
+static gchar** _vala_array_dup16 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -540,7 +540,7 @@ static void plugins_extension_point_set_core_ids (PluginsExtensionPoint* self, g
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp0__length1 = value_length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup18 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 23 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1754,7 +1754,7 @@ void plugins_pluggable_rep_unref (gpointer instance) {
 }
 
 
-static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add50 (GFile** * array, int* length, int* size, GFile* value) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1771,7 +1771,7 @@ static void _vala_array_add47 (GFile** * array, int* length, int* size, GFile* v
 }
 
 
-static void _vala_array_add48 (GFile** * array, int* length, int* size, GFile* value) {
+static void _vala_array_add51 (GFile** * array, int* length, int* size, GFile* value) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	if ((*length) == (*size)) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1821,7 +1821,7 @@ void plugins_init (GError** error) {
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = app_dirs_get_user_plugins_dir ();
 #line 115 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_array_add47 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp2_);
+	_vala_array_add50 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp2_);
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp3_ = plugins_search_dirs;
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1829,7 +1829,7 @@ void plugins_init (GError** error) {
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp4_ = app_dirs_get_system_plugins_dir ();
 #line 116 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	_vala_array_add48 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp4_);
+	_vala_array_add51 (&plugins_search_dirs, &plugins_search_dirs_length1, &_plugins_search_dirs_size_, _tmp4_);
 #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, PLUGINS_TYPE_MODULE_REP, (GBoxedCopyFunc) plugins_module_rep_ref, (GDestroyNotify) plugins_module_rep_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 118 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -1899,11 +1899,11 @@ void plugins_init (GError** error) {
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1901 "Plugins.c"
-						goto __catch35_g_error;
+						goto __catch39_g_error;
 					}
 				}
-				goto __finally35;
-				__catch35_g_error:
+				goto __finally39;
+				__catch39_g_error:
 				{
 					GError* err = NULL;
 					GFile* _tmp13_;
@@ -1933,7 +1933,7 @@ void plugins_init (GError** error) {
 					_g_error_free0 (err);
 #line 1934 "Plugins.c"
 				}
-				__finally35:
+				__finally39:
 #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"
@@ -2683,7 +2683,7 @@ gboolean plugins_is_core_pluggable (SpitPluggable* pluggable) {
 }
 
 
-static SpitPluggable** _vala_array_dup19 (SpitPluggable** self, int length) {
+static SpitPluggable** _vala_array_dup17 (SpitPluggable** self, int length) {
 	SpitPluggable** result;
 	int i;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -2775,7 +2775,7 @@ PluginsModuleRep* plugins_get_module_for_pluggable (SpitPluggable* needle) {
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp13_ = spit_module_get_pluggables (_tmp11_, &_tmp12_);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-			_tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup19 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_);
+			_tmp14_ = (_tmp13_ != NULL) ? _vala_array_dup17 (_tmp13_, _tmp12_) : ((gpointer) _tmp13_);
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 			_tmp14__length1 = _tmp12_;
 #line 202 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3814,11 +3814,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 3816 "Plugins.c"
-							goto __catch36_g_error;
+							goto __catch40_g_error;
 						}
 					}
-					goto __finally36;
-					__catch36_g_error:
+					goto __finally40;
+					__catch40_g_error:
 					{
 						GError* err = NULL;
 						GFile* _tmp18_;
@@ -3848,7 +3848,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_error_free0 (err);
 #line 3849 "Plugins.c"
 					}
-					__finally36:
+					__finally40:
 #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/meson.build b/src/plugins/meson.build
new file mode 100644
index 0000000..e5bce92
--- /dev/null
+++ b/src/plugins/meson.build
@@ -0,0 +1,15 @@
+# Plugin helper library
+sw_plugin_dev = library('shotwell-plugin-dev-1.0',
+                               ['DataImportsInterfaces.vala',
+                                'PublishingInterfaces.vala',
+                                'SpitInterfaces.vala',
+                                'TransitionsInterfaces.vala'],
+                                version: meson.project_version(),
+                                vala_header : 'shotwell-plugin-dev-1.0.h',
+                                vala_vapi : 'shotwell-plugin-dev-1.0.vapi',
+                                dependencies : [gmodule, gtk, gio, gee],
+                                include_directories : config_incdir,
+                                install : true)
+
+sw_plugin = declare_dependency(include_directories : include_directories('.'),
+        link_with : sw_plugin_dev)
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 04da15d..08c99ff 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -331,8 +331,8 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
 GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo);
-static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value);
-static gchar** _vala_array_dup22 (gchar** self, int length);
+static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value);
+static gchar** _vala_array_dup20 (gchar** self, int length);
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base);
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base);
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base);
@@ -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 __catch39_g_error;
+			goto __catch43_g_error;
 		}
 	}
-	goto __finally39;
-	__catch39_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally39:
+	__finally43:
 #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 __catch40_g_error;
+				goto __catch44_g_error;
 			}
 		}
-		goto __finally40;
-		__catch40_g_error:
+		goto __finally44;
+		__catch44_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_;
@@ -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 __finally40;
+			goto __finally44;
 		}
-		__finally40:
+		__finally44:
 #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 __catch41_g_error;
+					goto __catch45_g_error;
 				}
 			}
-			goto __finally41;
-			__catch41_g_error:
+			goto __finally45;
+			__catch45_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_;
@@ -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 __finally41;
+				goto __finally45;
 			}
-			__finally41:
+			__finally45:
 #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"
@@ -1065,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st
 }
 
 
-static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if ((*length) == (*size)) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1082,7 +1082,7 @@ static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static gchar** _vala_array_dup22 (gchar** self, int length) {
+static gchar** _vala_array_dup20 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1194,7 +1194,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-				_vala_array_add60 (&_result_, &_result__length1, &__result__size_, _tmp13_);
+				_vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp13_);
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_object_unref0 (tag);
 #line 1198 "APIGlue.c"
@@ -1234,7 +1234,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 1232 "APIGlue.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	_tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup22 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
+	_tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup20 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	_tmp17__length1 = _tmp14__length1;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 5ae726a..a502118 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -18,10 +18,10 @@
 
 
 void publishing_init (GError** error);
-static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add55 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add56 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add57 (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_PUBLISH "applications-internet"
 void publishing_terminate (void);
@@ -29,7 +29,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -46,7 +46,7 @@ static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add55 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -63,7 +63,7 @@ static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add56 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -80,7 +80,7 @@ static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add57 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -131,7 +131,7 @@ void publishing_init (GError** error) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.publishing.facebook");
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add51 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp3_ = core_ids;
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -139,7 +139,7 @@ void publishing_init (GError** error) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp4_ = g_strdup ("org.yorba.shotwell.publishing.picasa");
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add52 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
+	_vala_array_add55 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp5_ = core_ids;
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -147,7 +147,7 @@ void publishing_init (GError** error) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp6_ = g_strdup ("org.yorba.shotwell.publishing.flickr");
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add53 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
+	_vala_array_add56 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp7_ = core_ids;
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -155,7 +155,7 @@ void publishing_init (GError** error) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp8_ = g_strdup ("org.yorba.shotwell.publishing.youtube");
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
+	_vala_array_add57 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp9_ = core_ids;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 54f1495..aee15c9 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -183,7 +183,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_n
 SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
 PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain);
 PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain);
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length);
 static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self);
 static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self);
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
@@ -233,7 +233,7 @@ void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublish
 static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget);
 static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base);
 static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1);
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length);
 static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify);
 void spin_event_loop (void);
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error);
@@ -250,7 +250,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -300,7 +300,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp2__length1 = publishables_length1;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup20 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
+	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup18 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp3__length1 = _tmp2__length1;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1060,7 +1060,7 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1097,7 +1097,7 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup21 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup19 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1267,7 +1267,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 1266 "PublishingPluginHost.c"
-							goto __catch38_spit_publishing_publishing_error;
+							goto __catch42_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1287,8 +1287,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1285 "PublishingPluginHost.c"
 				}
-				goto __finally38;
-				__catch38_spit_publishing_publishing_error:
+				goto __finally42;
+				__catch42_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_;
@@ -1325,7 +1325,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1323 "PublishingPluginHost.c"
 				}
-				__finally38:
+				__finally42:
 #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 a0fe079..86bf534 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -480,6 +480,7 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish);
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish);
+gint resources_use_header_bar (void);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
@@ -488,7 +489,7 @@ static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_dele
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap);
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap);
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
-static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value);
+static void _vala_array_add58 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
@@ -505,13 +506,13 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing
 static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
-static gint __lambda15_ (void* a, void* b);
-gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda15____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);
+static gint __lambda16_ (void* a, void* b);
+gint utf8_cs_compare (void* a, void* b);
+static gint ___lambda16____compar_fn_t (void* key1, void* key2);
+static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add62 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
@@ -553,21 +554,21 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
 	self->builder = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 557 "PublishingUI.c"
+#line 558 "PublishingUI.c"
 }
 
 
 PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 564 "PublishingUI.c"
+#line 565 "PublishingUI.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 571 "PublishingUI.c"
+#line 572 "PublishingUI.c"
 }
 
 
@@ -586,7 +587,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
 	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 590 "PublishingUI.c"
+#line 591 "PublishingUI.c"
 }
 
 
@@ -599,7 +600,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 603 "PublishingUI.c"
+#line 604 "PublishingUI.c"
 }
 
 
@@ -607,7 +608,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPubli
 	PublishingUIConcreteDialogPane * self;
 #line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 611 "PublishingUI.c"
+#line 612 "PublishingUI.c"
 }
 
 
@@ -615,7 +616,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub
 	PublishingUIConcreteDialogPane * self;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 619 "PublishingUI.c"
+#line 620 "PublishingUI.c"
 }
 
 
@@ -624,7 +625,7 @@ static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteD
 	publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize;
-#line 628 "PublishingUI.c"
+#line 629 "PublishingUI.c"
 }
 
 
@@ -639,7 +640,7 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
 	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 643 "PublishingUI.c"
+#line 644 "PublishingUI.c"
 }
 
 
@@ -648,7 +649,7 @@ static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcre
 	self->pane_widget = NULL;
 #line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->builder = NULL;
-#line 652 "PublishingUI.c"
+#line 653 "PublishingUI.c"
 }
 
 
@@ -662,7 +663,7 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->builder);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 666 "PublishingUI.c"
+#line 667 "PublishingUI.c"
 }
 
 
@@ -717,7 +718,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 	_tmp6_ = enable_markup;
 #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 721 "PublishingUI.c"
+#line 722 "PublishingUI.c"
 		GtkLabel* _tmp7_;
 		const gchar* _tmp8_;
 		GtkLabel* _tmp9_;
@@ -736,7 +737,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 		_tmp10_ = self->priv->msg_label;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_use_markup (_tmp10_, TRUE);
-#line 740 "PublishingUI.c"
+#line 741 "PublishingUI.c"
 	} else {
 		GtkLabel* _tmp11_;
 		const gchar* _tmp12_;
@@ -746,18 +747,18 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 		_tmp12_ = message_string;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_label (_tmp11_, _tmp12_);
-#line 750 "PublishingUI.c"
+#line 751 "PublishingUI.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 754 "PublishingUI.c"
+#line 755 "PublishingUI.c"
 }
 
 
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) {
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup);
-#line 761 "PublishingUI.c"
+#line 762 "PublishingUI.c"
 }
 
 
@@ -768,7 +769,7 @@ static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMess
 	g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate));
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize;
-#line 772 "PublishingUI.c"
+#line 773 "PublishingUI.c"
 }
 
 
@@ -777,7 +778,7 @@ static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticM
 	self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self);
 #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->msg_label = NULL;
-#line 781 "PublishingUI.c"
+#line 782 "PublishingUI.c"
 }
 
 
@@ -789,7 +790,7 @@ static void publishing_ui_static_message_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->msg_label);
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj);
-#line 793 "PublishingUI.c"
+#line 794 "PublishingUI.c"
 }
 
 
@@ -808,7 +809,7 @@ GType publishing_ui_static_message_pane_get_type (void) {
 static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self);
-#line 812 "PublishingUI.c"
+#line 813 "PublishingUI.c"
 }
 
 
@@ -877,14 +878,14 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
 	gtk_label_set_markup (_tmp11_, _tmp12_);
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 881 "PublishingUI.c"
+#line 882 "PublishingUI.c"
 }
 
 
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) {
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message);
-#line 888 "PublishingUI.c"
+#line 889 "PublishingUI.c"
 }
 
 
@@ -893,7 +894,7 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin
 	g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0);
-#line 897 "PublishingUI.c"
+#line 898 "PublishingUI.c"
 }
 
 
@@ -906,7 +907,7 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL] = g_signal_new ("login-requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 910 "PublishingUI.c"
+#line 911 "PublishingUI.c"
 }
 
 
@@ -917,7 +918,7 @@ static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWel
 	self->priv->login_button = NULL;
 #line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->not_logged_in_label = NULL;
-#line 921 "PublishingUI.c"
+#line 922 "PublishingUI.c"
 }
 
 
@@ -931,7 +932,7 @@ static void publishing_ui_login_welcome_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->not_logged_in_label);
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj);
-#line 935 "PublishingUI.c"
+#line 936 "PublishingUI.c"
 }
 
 
@@ -979,14 +980,14 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
 	self->priv->progress_bar = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 983 "PublishingUI.c"
+#line 984 "PublishingUI.c"
 }
 
 
 PublishingUIProgressPane* publishing_ui_progress_pane_new (void) {
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE);
-#line 990 "PublishingUI.c"
+#line 991 "PublishingUI.c"
 }
 
 
@@ -1003,7 +1004,7 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const
 	_tmp1_ = text;
 #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1007 "PublishingUI.c"
+#line 1008 "PublishingUI.c"
 }
 
 
@@ -1018,7 +1019,7 @@ void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, g
 	_tmp1_ = progress;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 1022 "PublishingUI.c"
+#line 1023 "PublishingUI.c"
 }
 
 
@@ -1039,7 +1040,7 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
 	_tmp2_ = gtk_progress_bar_get_text (_tmp1_);
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (g_strcmp0 (_tmp0_, _tmp2_) != 0) {
-#line 1043 "PublishingUI.c"
+#line 1044 "PublishingUI.c"
 		GtkProgressBar* _tmp3_;
 		const gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1048,13 +1049,13 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
 		_tmp4_ = status_text;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1052 "PublishingUI.c"
+#line 1053 "PublishingUI.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = progress;
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_progress_pane_set_progress (self, _tmp5_);
-#line 1058 "PublishingUI.c"
+#line 1059 "PublishingUI.c"
 }
 
 
@@ -1065,7 +1066,7 @@ static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClas
 	g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate));
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize;
-#line 1069 "PublishingUI.c"
+#line 1070 "PublishingUI.c"
 }
 
 
@@ -1074,7 +1075,7 @@ static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane
 	self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->progress_bar = NULL;
-#line 1078 "PublishingUI.c"
+#line 1079 "PublishingUI.c"
 }
 
 
@@ -1086,7 +1087,7 @@ static void publishing_ui_progress_pane_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj);
-#line 1090 "PublishingUI.c"
+#line 1091 "PublishingUI.c"
 }
 
 
@@ -1113,7 +1114,7 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 	_tmp0_ = published_media;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1117 "PublishingUI.c"
+#line 1118 "PublishingUI.c"
 		gint _tmp1_;
 		gchar* _tmp2_;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1124,14 +1125,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 		_g_free0 (message_string);
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		message_string = _tmp2_;
-#line 1128 "PublishingUI.c"
+#line 1129 "PublishingUI.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = published_media;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1135 "PublishingUI.c"
+#line 1136 "PublishingUI.c"
 			gint _tmp4_;
 			gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1142,14 +1143,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 			_g_free0 (message_string);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			message_string = _tmp5_;
-#line 1146 "PublishingUI.c"
+#line 1147 "PublishingUI.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp6_ = published_media;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1153 "PublishingUI.c"
+#line 1154 "PublishingUI.c"
 				gchar* _tmp7_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published."));
@@ -1157,11 +1158,11 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 				_g_free0 (message_string);
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				message_string = _tmp7_;
-#line 1161 "PublishingUI.c"
+#line 1162 "PublishingUI.c"
 			} else {
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				g_assert_not_reached ();
-#line 1165 "PublishingUI.c"
+#line 1166 "PublishingUI.c"
 			}
 		}
 	}
@@ -1173,21 +1174,21 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 	_g_free0 (message_string);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1177 "PublishingUI.c"
+#line 1178 "PublishingUI.c"
 }
 
 
 PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1184 "PublishingUI.c"
+#line 1185 "PublishingUI.c"
 }
 
 
 static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
 #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1191 "PublishingUI.c"
+#line 1192 "PublishingUI.c"
 }
 
 
@@ -1213,21 +1214,21 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc
 	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Fetching account information…"), FALSE);
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1217 "PublishingUI.c"
+#line 1218 "PublishingUI.c"
 }
 
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1224 "PublishingUI.c"
+#line 1225 "PublishingUI.c"
 }
 
 
 static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
 #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1231 "PublishingUI.c"
+#line 1232 "PublishingUI.c"
 }
 
 
@@ -1253,21 +1254,21 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object
 	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Logging in…"), FALSE);
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1257 "PublishingUI.c"
+#line 1258 "PublishingUI.c"
 }
 
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1264 "PublishingUI.c"
+#line 1265 "PublishingUI.c"
 }
 
 
 static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
 #line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1271 "PublishingUI.c"
+#line 1272 "PublishingUI.c"
 }
 
 
@@ -1290,40 +1291,40 @@ GType publishing_ui_login_wait_pane_get_type (void) {
 static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 1296 "PublishingUI.c"
+#line 1297 "PublishingUI.c"
 }
 
 
-static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add58 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1307 "PublishingUI.c"
+#line 1308 "PublishingUI.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 1313 "PublishingUI.c"
+#line 1314 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1320 "PublishingUI.c"
+#line 1321 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1327 "PublishingUI.c"
+#line 1328 "PublishingUI.c"
 }
 
 
@@ -1333,10 +1334,9 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	gint _tmp1_;
 	gint _tmp2_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp3_;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gboolean _tmp5_;
-	gboolean _tmp6_;
 	AppWindow* _tmp8_;
 	AppWindow* _tmp9_;
 	SpitPublishingPublishable** _tmp10_;
@@ -1396,79 +1396,74 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp2_ > 0, "to_publish.size > 0");
 #line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	use_header = FALSE;
+	_tmp3_ = resources_use_header_bar ();
+#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	use_header = _tmp3_ == 1;
 #line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp3_ = gtk_settings_get_default ();
+	_tmp4_ = resources_use_header_bar ();
 #line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = use_header;
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp5_) {
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = 1;
 #line 1411 "PublishingUI.c"
-	} else {
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = 0;
-#line 1415 "PublishingUI.c"
-	}
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
+		GtkWidget* _tmp6_;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp6_ = use_header;
+		_tmp6_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp6_) {
-#line 1423 "PublishingUI.c"
-		GtkWidget* _tmp7_;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1429 "PublishingUI.c"
+		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1417 "PublishingUI.c"
+	} else {
+		GtkBox* _tmp7_;
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp7_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_box_set_spacing (_tmp7_, 6);
+#line 1424 "PublishingUI.c"
 	}
-#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp9_ = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = _tmp10_;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables_length1 = 0;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_photos = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_videos = FALSE;
-#line 1459 "PublishingUI.c"
+#line 1454 "PublishingUI.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp11_;
 		GeeIterator* _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = to_publish;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_media_it = _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 1472 "PublishingUI.c"
+#line 1467 "PublishingUI.c"
 			GeeIterator* _tmp13_;
 			gboolean _tmp14_;
 			MediaSource* media = NULL;
@@ -1483,276 +1478,276 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			gint _tmp23__length1;
 			SpitPublishingPublishable* _tmp24_;
 			SpitPublishingPublishable* _tmp25_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp14_ = gee_iterator_next (_tmp13_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp14_) {
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 1495 "PublishingUI.c"
+#line 1490 "PublishingUI.c"
 			}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp16_ = gee_iterator_get (_tmp15_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			media = (MediaSource*) _tmp16_;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp17_ = media;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_);
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
 #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp19_ = publishable;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				has_photos = TRUE;
-#line 1517 "PublishingUI.c"
+#line 1512 "PublishingUI.c"
 			} else {
 				SpitPublishingPublishable* _tmp21_;
 				SpitPublishingPublisherMediaType _tmp22_;
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp21_ = publishable;
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_);
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					has_videos = TRUE;
-#line 1529 "PublishingUI.c"
+#line 1524 "PublishingUI.c"
 				} else {
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					g_assert_not_reached ();
-#line 1533 "PublishingUI.c"
+#line 1528 "PublishingUI.c"
 				}
 			}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = self->priv->publishables;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23__length1 = self->priv->publishables_length1;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp24_ = publishable;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			_vala_array_add58 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (publishable);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (media);
-#line 1550 "PublishingUI.c"
+#line 1545 "PublishingUI.c"
 		}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_media_it);
-#line 1554 "PublishingUI.c"
+#line 1549 "PublishingUI.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	title = NULL;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	label = NULL;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	label = NULL;
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = has_photos;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp27_) {
-#line 1564 "PublishingUI.c"
+#line 1559 "PublishingUI.c"
 		gboolean _tmp28_;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp28_ = has_videos;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = !_tmp28_;
-#line 1570 "PublishingUI.c"
+#line 1565 "PublishingUI.c"
 	} else {
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = FALSE;
-#line 1574 "PublishingUI.c"
+#line 1569 "PublishingUI.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp26_) {
-#line 1578 "PublishingUI.c"
+#line 1573 "PublishingUI.c"
 		gchar* _tmp29_;
 		gchar* _tmp30_;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp29_ = g_strdup (_ ("Publish Photos"));
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (title);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		title = _tmp29_;
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp30_ = g_strdup (_ ("Publish photos _to:"));
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (label);
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		label = _tmp30_;
-#line 1593 "PublishingUI.c"
+#line 1588 "PublishingUI.c"
 	} else {
 		gboolean _tmp31_ = FALSE;
 		gboolean _tmp32_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp32_ = has_photos;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (!_tmp32_) {
-#line 1601 "PublishingUI.c"
+#line 1596 "PublishingUI.c"
 			gboolean _tmp33_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp33_ = has_videos;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = _tmp33_;
-#line 1607 "PublishingUI.c"
+#line 1602 "PublishingUI.c"
 		} else {
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = FALSE;
-#line 1611 "PublishingUI.c"
+#line 1606 "PublishingUI.c"
 		}
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp31_) {
-#line 1615 "PublishingUI.c"
+#line 1610 "PublishingUI.c"
 			gchar* _tmp34_;
 			gchar* _tmp35_;
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp34_ = g_strdup (_ ("Publish Videos"));
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp34_;
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp35_ = g_strdup (_ ("Publish videos _to"));
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp35_;
-#line 1630 "PublishingUI.c"
+#line 1625 "PublishingUI.c"
 		} else {
 			gchar* _tmp36_;
 			gchar* _tmp37_;
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp36_ = g_strdup (_ ("Publish Photos and Videos"));
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp36_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp37_ = g_strdup (_ ("Publish photos and videos _to"));
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp37_;
-#line 1646 "PublishingUI.c"
+#line 1641 "PublishingUI.c"
 		}
 	}
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp38_ = title;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->service_selector_box_model = _tmp39_;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp40_ = self->priv->service_selector_box_model;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp41_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp41_);
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box);
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->service_selector_box = _tmp41_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->service_selector_box = _tmp41_;
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp42_);
-#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_pix = _tmp42_;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp43_ = self->priv->service_selector_box;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp44_ = renderer_pix;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp45_ = self->priv->service_selector_box;
-#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp46_ = renderer_pix;
-#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp47_);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_text = _tmp47_;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp48_ = self->priv->service_selector_box;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp49_ = renderer_text;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp50_ = self->priv->service_selector_box;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp51_ = renderer_text;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
 #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp52_ = self->priv->service_selector_box;
-#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_combo_box_set_active (_tmp52_, 0);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp53_ = config_facade_get_instance ();
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp54_ = _tmp53_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp55_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp56_ = _tmp55_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp54_);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	last_used_service = _tmp56_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	last_used_service = _tmp56_;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp57_ = has_photos;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp58_ = has_videos;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_);
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp60_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = _tmp59_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp61_ = loaded_services;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp61__length1 = loaded_services_length1;
-#line 1737 "PublishingUI.c"
+#line 1732 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp61_;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp61__length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) {
-#line 1749 "PublishingUI.c"
+#line 1744 "PublishingUI.c"
 			SpitPublishingService* _tmp62_;
 			SpitPublishingService* service = NULL;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp62_ = _g_object_ref0 (service_collection[service_it]);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp62_;
-#line 1756 "PublishingUI.c"
+#line 1751 "PublishingUI.c"
 			{
 				GtkListStore* _tmp63_;
 				GtkTreeIter _tmp64_ = {0};
@@ -1766,53 +1761,53 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 				GdkPixbuf** _tmp71_;
 				gint _tmp71__length1;
 				const gchar* _tmp89_;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp63_ = self->priv->service_selector_box_model;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				gtk_list_store_append (_tmp63_, &_tmp64_);
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				iter = _tmp64_;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				iter = _tmp64_;
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp65_ = service;
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp66_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp67_ = g_strdup (_tmp66_);
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				curr_service_id = _tmp67_;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				curr_service_id = _tmp67_;
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp68_ = service;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp70_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp71_ = _tmp70_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp71__length1 = _tmp70_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (NULL != _tmp71_) {
-#line 1796 "PublishingUI.c"
+#line 1791 "PublishingUI.c"
 					SpitPluggableInfo _tmp72_;
 					GdkPixbuf** _tmp73_;
 					gint _tmp73__length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp72_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73_ = _tmp72_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73__length1 = _tmp72_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp69_ = 0 < _tmp73__length1;
-#line 1808 "PublishingUI.c"
+#line 1803 "PublishingUI.c"
 				} else {
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp69_ = FALSE;
-#line 1812 "PublishingUI.c"
+#line 1807 "PublishingUI.c"
 				}
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp69_) {
-#line 1816 "PublishingUI.c"
+#line 1811 "PublishingUI.c"
 					GtkListStore* _tmp74_;
 					GtkTreeIter _tmp75_;
 					SpitPluggableInfo _tmp76_;
@@ -1823,33 +1818,33 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					const gchar* _tmp80_;
 					GdkPixbuf* _tmp81_;
 					GdkPixbuf* _tmp82_;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp74_ = self->priv->service_selector_box_model;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp75_ = iter;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp76_ = self->priv->info;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77_ = _tmp76_.icons;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77__length1 = _tmp76_.icons_length1;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp78_ = _tmp77_[0];
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp79_ = service;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp80_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (self->priv->info.icons[0]);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					self->priv->info.icons[0] = _tmp81_;
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp82_ = self->priv->info.icons[0];
-#line 1853 "PublishingUI.c"
+#line 1848 "PublishingUI.c"
 				} else {
 					GtkListStore* _tmp83_;
 					GtkTreeIter _tmp84_;
@@ -1857,89 +1852,89 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					GdkPixbuf* _tmp86_;
 					SpitPublishingService* _tmp87_;
 					const gchar* _tmp88_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp83_ = self->priv->service_selector_box_model;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp84_ = iter;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp86_ = _tmp85_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp87_ = service;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp88_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (_tmp86_);
-#line 1877 "PublishingUI.c"
+#line 1872 "PublishingUI.c"
 				}
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp89_ = last_used_service;
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp89_ == NULL) {
-#line 1883 "PublishingUI.c"
+#line 1878 "PublishingUI.c"
 					GtkComboBox* _tmp90_;
 					GtkTreeIter _tmp91_;
 					SpitPublishingService* _tmp92_;
 					const gchar* _tmp93_;
 					gchar* _tmp94_;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp90_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp91_ = iter;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp92_ = service;
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp93_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp94_ = g_strdup (_tmp93_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_free0 (last_used_service);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					last_used_service = _tmp94_;
-#line 1905 "PublishingUI.c"
+#line 1900 "PublishingUI.c"
 				} else {
 					const gchar* _tmp95_;
 					const gchar* _tmp96_;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp95_ = last_used_service;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp96_ = curr_service_id;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (g_strcmp0 (_tmp95_, _tmp96_) == 0) {
-#line 1915 "PublishingUI.c"
+#line 1910 "PublishingUI.c"
 						GtkComboBox* _tmp97_;
 						GtkTreeIter _tmp98_;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp97_ = self->priv->service_selector_box;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp98_ = iter;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_);
-#line 1924 "PublishingUI.c"
+#line 1919 "PublishingUI.c"
 					}
 				}
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (curr_service_id);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 1931 "PublishingUI.c"
+#line 1926 "PublishingUI.c"
 			}
 		}
 	}
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp99_ = self->priv->service_selector_box;
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp100_ = use_header;
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp100_) {
-#line 1943 "PublishingUI.c"
+#line 1938 "PublishingUI.c"
 		GtkLabel* service_selector_box_label = NULL;
 		const gchar* _tmp101_;
 		GtkLabel* _tmp102_;
@@ -1972,196 +1967,196 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 		GtkBox* _tmp127_;
 		GtkBox* _tmp128_;
 		GtkBox* _tmp129_;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp101_ = label;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp102_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_selector_box_label = _tmp102_;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp103_ = service_selector_box_label;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp104_ = self->priv->service_selector_box;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_mnemonic_widget (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp105_ = service_selector_box_label;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp106_ = service_selector_box_label;
-#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp107_ = self->priv->service_selector_box;
-#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
-#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp108_ = self->priv->service_selector_box;
-#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp109_ = self->priv->service_selector_box;
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp110_ = self->priv->service_selector_box;
-#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp111_);
-#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_selector_layouter = _tmp111_;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp112_ = service_selector_layouter;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), (guint) 12);
-#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp113_ = service_selector_layouter;
-#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp114_ = service_selector_layouter;
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp115_ = service_selector_box_label;
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget));
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp116_ = service_selector_layouter;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp117_ = self->priv->service_selector_box;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_box_pack_start (_tmp116_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp118_);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_area_layouter = _tmp118_;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp119_ = service_area_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp120_ = service_selector_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget));
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp121_ = service_area_layouter;
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp122_);
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp123_ = _tmp122_;
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget));
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp123_);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp124_ = service_area_layouter;
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp125_ = service_area_layouter;
-#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp126_ = service_area_layouter;
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp127_ = service_area_layouter;
-#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp129_ = service_area_layouter;
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_area_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_box_label);
-#line 2092 "PublishingUI.c"
+#line 2087 "PublishingUI.c"
 	}
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp130_);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->central_area_layouter = _tmp130_;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->central_area_layouter = _tmp130_;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp132_ = self->priv->central_area_layouter;
-#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp133_ = use_header;
-#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp133_) {
-#line 2112 "PublishingUI.c"
+#line 2107 "PublishingUI.c"
 		GtkButton* _tmp134_;
 		GtkButton* _tmp135_;
 		GtkWidget* _tmp136_;
 		GtkButton* _tmp137_;
 		GtkWidget* _tmp138_;
 		GtkComboBox* _tmp139_;
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp134_);
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		self->priv->close_cancel_button = _tmp134_;
-#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp135_ = self->priv->close_cancel_button;
-#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp136_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp137_ = self->priv->close_cancel_button;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget));
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp138_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp139_ = self->priv->service_selector_box;
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget));
-#line 2143 "PublishingUI.c"
+#line 2138 "PublishingUI.c"
 	} else {
 		GtkWidget* _tmp140_;
 		GtkButton* _tmp141_;
-#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp140_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp141_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp140_, gtk_button_get_type ()) ? ((GtkButton*) _tmp140_) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		self->priv->close_cancel_button = _tmp141_;
-#line 2157 "PublishingUI.c"
+#line 2152 "PublishingUI.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp142_ = self->priv->close_cancel_button;
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_set_standard_window_mode (self);
+	g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2177,65 +2172,65 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_g_free0 (title);
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 2181 "PublishingUI.c"
+#line 2176 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2188 "PublishingUI.c"
+#line 2183 "PublishingUI.c"
 }
 
 
-static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2199 "PublishingUI.c"
+#line 2194 "PublishingUI.c"
 	}
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2205 "PublishingUI.c"
+#line 2200 "PublishingUI.c"
 }
 
 
-static gint __lambda15_ (void* a, void* b) {
+static gint __lambda16_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	const gchar* _tmp1_;
 	void* _tmp2_;
 	const gchar* _tmp3_;
 	gint _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = a;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = b;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2230 "PublishingUI.c"
+#line 2225 "PublishingUI.c"
 }
 
 
-static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda16____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda15_ (key1, key2);
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	result = __lambda16_ (key1, key2);
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2239 "PublishingUI.c"
+#line 2234 "PublishingUI.c"
 }
 
 
@@ -2256,41 +2251,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	gint _tmp26__length1;
 	SpitPublishingService** _tmp27_;
 	gint _tmp27__length1;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp0_;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = 0;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	pluggables = _tmp1_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = pluggables;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:322: PublisingDialog: discovered %d pluggable publis" \
 "hing services.", _tmp4_);
-#line 2280 "PublishingUI.c"
+#line 2275 "PublishingUI.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
 		GeeCollection* _tmp5_;
 		GeeIterator* _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = pluggables;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_pluggable_it = _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 2293 "PublishingUI.c"
+#line 2288 "PublishingUI.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			SpitPluggable* pluggable = NULL;
@@ -2309,167 +2304,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			gint _tmp22__length1;
 			SpitPublishingService* _tmp23_;
 			SpitPublishingService* _tmp24_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp8_) {
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 2320 "PublishingUI.c"
+#line 2315 "PublishingUI.c"
 			}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			pluggable = (SpitPluggable*) _tmp10_;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp11_ = pluggable;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			pluggable_interface = _tmp12_;
 #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			pluggable_interface = _tmp12_;
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = pluggable_interface;
-#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2338 "PublishingUI.c"
+#line 2333 "PublishingUI.c"
 				SpitPluggable* _tmp14_;
 				gchar* _tmp15_;
 				gchar* _tmp16_;
 				gint _tmp17_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp14_ = pluggable;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = _tmp15_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = pluggable_interface;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				g_warning ("PublishingUI.vala:326: Unable to load publisher %s: reported interface" \
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				g_warning ("PublishingUI.vala:328: Unable to load publisher %s: reported interface" \
 " %d.", _tmp16_, _tmp17_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (_tmp16_);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (pluggable);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				continue;
-#line 2359 "PublishingUI.c"
+#line 2354 "PublishingUI.c"
 			}
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = pluggable;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp19_;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp20_ = service;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			g_debug ("PublishingUI.vala:335: PublishingDialog: discovered pluggable publishi" \
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			g_debug ("PublishingUI.vala:337: PublishingDialog: discovered pluggable publishi" \
 "ng service '%s'.", _tmp21_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22_ = loaded_services;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22__length1 = loaded_services_length1;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = service;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			_vala_array_add59 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (service);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (pluggable);
-#line 2387 "PublishingUI.c"
+#line 2382 "PublishingUI.c"
 		}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 2391 "PublishingUI.c"
+#line 2386 "PublishingUI.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda16____compar_fn_t);
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = loaded_services;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = loaded_services_length1;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp27__length1;
-#line 2411 "PublishingUI.c"
+#line 2406 "PublishingUI.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp27_;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (pluggables);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2419 "PublishingUI.c"
+#line 2414 "PublishingUI.c"
 }
 
 
-static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2430 "PublishingUI.c"
+#line 2425 "PublishingUI.c"
 	}
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2436 "PublishingUI.c"
+#line 2431 "PublishingUI.c"
 }
 
 
-static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2447 "PublishingUI.c"
+#line 2442 "PublishingUI.c"
 	}
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2453 "PublishingUI.c"
+#line 2448 "PublishingUI.c"
 }
 
 
-static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add62 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2464 "PublishingUI.c"
+#line 2459 "PublishingUI.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2470 "PublishingUI.c"
+#line 2465 "PublishingUI.c"
 }
 
 
@@ -2490,226 +2485,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	gint _tmp6__length1;
 	SpitPublishingService** _tmp32_;
 	gint _tmp32__length1;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = has_photos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_) {
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = TRUE;
-#line 2497 "PublishingUI.c"
+#line 2492 "PublishingUI.c"
 	} else {
 		gboolean _tmp2_;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = has_videos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = _tmp2_;
-#line 2504 "PublishingUI.c"
+#line 2499 "PublishingUI.c"
 	}
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_vala_assert (_tmp0_, "has_photos || has_videos");
 #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_vala_assert (_tmp0_, "has_photos || has_videos");
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services = _tmp3_;
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services_length1 = 0;
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_filtered_services_size_ = filtered_services_length1;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services = _tmp5_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services_length1 = _tmp4_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_all_services_size_ = all_services_length1;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_all_services_size_ = all_services_length1;
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = all_services;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6__length1 = all_services_length1;
-#line 2528 "PublishingUI.c"
+#line 2523 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp6_;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp6__length1;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2540 "PublishingUI.c"
+#line 2535 "PublishingUI.c"
 			SpitPublishingService* _tmp7_;
 			SpitPublishingService* service = NULL;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _g_object_ref0 (service_collection[service_it]);
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp7_;
-#line 2547 "PublishingUI.c"
+#line 2542 "PublishingUI.c"
 			{
 				gboolean _tmp8_ = FALSE;
 				gboolean _tmp9_;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp9_ = has_photos;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp9_) {
-#line 2555 "PublishingUI.c"
+#line 2550 "PublishingUI.c"
 					gboolean _tmp10_;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp10_ = has_videos;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = !_tmp10_;
-#line 2561 "PublishingUI.c"
+#line 2556 "PublishingUI.c"
 				} else {
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = FALSE;
-#line 2565 "PublishingUI.c"
+#line 2560 "PublishingUI.c"
 				}
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp8_) {
-#line 2569 "PublishingUI.c"
+#line 2564 "PublishingUI.c"
 					SpitPublishingService* _tmp11_;
 					SpitPublishingPublisherMediaType _tmp12_;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp11_ = service;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2578 "PublishingUI.c"
+#line 2573 "PublishingUI.c"
 						SpitPublishingService** _tmp13_;
 						gint _tmp13__length1;
 						SpitPublishingService* _tmp14_;
 						SpitPublishingService* _tmp15_;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13_ = filtered_services;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13__length1 = filtered_services_length1;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp14_ = service;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2593 "PublishingUI.c"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+						_vala_array_add60 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
+#line 2588 "PublishingUI.c"
 					}
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gboolean _tmp17_;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp17_ = has_photos;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (!_tmp17_) {
-#line 2602 "PublishingUI.c"
+#line 2597 "PublishingUI.c"
 						gboolean _tmp18_;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp18_ = has_videos;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = _tmp18_;
-#line 2608 "PublishingUI.c"
+#line 2603 "PublishingUI.c"
 					} else {
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = FALSE;
-#line 2612 "PublishingUI.c"
+#line 2607 "PublishingUI.c"
 					}
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (_tmp16_) {
-#line 2616 "PublishingUI.c"
+#line 2611 "PublishingUI.c"
 						SpitPublishingService* _tmp19_;
 						SpitPublishingPublisherMediaType _tmp20_;
-#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp19_ = service;
-#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
-#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2625 "PublishingUI.c"
+#line 2620 "PublishingUI.c"
 							SpitPublishingService** _tmp21_;
 							gint _tmp21__length1;
 							SpitPublishingService* _tmp22_;
 							SpitPublishingService* _tmp23_;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21_ = filtered_services;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21__length1 = filtered_services_length1;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp22_ = service;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-							_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2640 "PublishingUI.c"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+							_vala_array_add61 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
+#line 2635 "PublishingUI.c"
 						}
 					} else {
 						gboolean _tmp24_ = FALSE;
 						SpitPublishingService* _tmp25_;
 						SpitPublishingPublisherMediaType _tmp26_;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp25_ = service;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2652 "PublishingUI.c"
+#line 2647 "PublishingUI.c"
 							SpitPublishingService* _tmp27_;
 							SpitPublishingPublisherMediaType _tmp28_;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp27_ = service;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2661 "PublishingUI.c"
+#line 2656 "PublishingUI.c"
 						} else {
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = FALSE;
-#line 2665 "PublishingUI.c"
+#line 2660 "PublishingUI.c"
 						}
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if (_tmp24_) {
-#line 2669 "PublishingUI.c"
+#line 2664 "PublishingUI.c"
 							SpitPublishingService** _tmp29_;
 							gint _tmp29__length1;
 							SpitPublishingService* _tmp30_;
 							SpitPublishingService* _tmp31_;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29_ = filtered_services;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29__length1 = filtered_services_length1;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp30_ = service;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-							_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2684 "PublishingUI.c"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+							_vala_array_add62 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
+#line 2679 "PublishingUI.c"
 						}
 					}
 				}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 2690 "PublishingUI.c"
+#line 2685 "PublishingUI.c"
 			}
 		}
 	}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32_ = filtered_services;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32__length1 = filtered_services_length1;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp32__length1;
-#line 2702 "PublishingUI.c"
+#line 2697 "PublishingUI.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp32_;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2710 "PublishingUI.c"
+#line 2705 "PublishingUI.c"
 }
 
 
@@ -2740,202 +2735,202 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	PublishingUIPublishingDialog* _tmp27_;
 	PublishingUIPublishingDialog* _tmp28_;
 	GTimer* _tmp29_;
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_publish));
-#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2749 "PublishingUI.c"
+#line 2744 "PublishingUI.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_ == NULL) {
-#line 2755 "PublishingUI.c"
+#line 2750 "PublishingUI.c"
 		GTimer* _tmp2_;
 		GTimer* _tmp3_;
 		GTimer* _tmp4_;
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = g_timer_new ();
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_stop (_tmp3_);
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_reset (_tmp4_);
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2775 "PublishingUI.c"
+#line 2770 "PublishingUI.c"
 	} else {
 		gdouble elapsed = 0.0;
 		GTimer* _tmp5_;
 		gdouble _tmp6_;
 		gboolean _tmp7_ = FALSE;
 		gdouble _tmp8_;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		elapsed = _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp8_ = elapsed;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp8_ < 0.05) {
-#line 2792 "PublishingUI.c"
+#line 2787 "PublishingUI.c"
 			gboolean _tmp9_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _tmp9_;
-#line 2798 "PublishingUI.c"
+#line 2793 "PublishingUI.c"
 		} else {
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = FALSE;
-#line 2802 "PublishingUI.c"
+#line 2797 "PublishingUI.c"
 		}
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp7_) {
-#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			return;
-#line 2808 "PublishingUI.c"
+#line 2803 "PublishingUI.c"
 		}
 	}
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	photos = _tmp10_;
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	videos = _tmp11_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = to_publish;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = photos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = videos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = photos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = _tmp16_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp18_ = videos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp20_ = _tmp19_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = _tmp22_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services_length1 = _tmp21_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_avail_services_size_ = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = avail_services;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23__length1 = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp23__length1 == 0) {
-#line 2853 "PublishingUI.c"
+#line 2848 "PublishingUI.c"
 		gchar* _tmp24_;
 		gchar* _tmp25_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp24_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \
 "ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
 "s Preferences</b> and enable one or more of the publishing plugins on " \
 "the <b>Plugins</b> tab."), "▸");
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp25_ = _tmp24_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (_tmp25_);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (videos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (photos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2872 "PublishingUI.c"
+#line 2867 "PublishingUI.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:422: PublishingDialog.go( )");
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:424: PublishingDialog.go( )");
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = to_publish;
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp27_);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_active_instance = _tmp27_;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_active_instance = _tmp27_;
+#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = publishing_ui_publishing_dialog_active_instance;
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_run (_tmp28_);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_run (_tmp28_);
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_active_instance = NULL;
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = publishing_ui_publishing_dialog_since_last_start;
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_timer_start (_tmp29_);
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (videos);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (photos);
-#line 2906 "PublishingUI.c"
+#line 2901 "PublishingUI.c"
 }
 
 
 static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
 	SpitPublishingConcretePublishingHost* _tmp0_;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (evt != NULL, FALSE);
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = TRUE;
-#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2933 "PublishingUI.c"
+#line 2928 "PublishingUI.c"
 }
 
 
@@ -2971,253 +2966,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	gint _tmp27__length1;
 	SpitPublishingConcretePublishingHost* _tmp28_;
 	SpitPublishingConcretePublishingHost* _tmp29_;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	iter = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = _tmp2_;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = have_active_iter;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp3_) {
-#line 2985 "PublishingUI.c"
+#line 2980 "PublishingUI.c"
 		GtkComboBox* _tmp4_;
 		GtkComboBox* _tmp5_;
 		GtkTreeIter _tmp6_ = {0};
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = self->priv->service_selector_box;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_set_active (_tmp4_, 0);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = self->priv->service_selector_box;
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		iter = _tmp6_;
-#line 2999 "PublishingUI.c"
+#line 2994 "PublishingUI.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = self->priv->service_selector_box_model;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = iter;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	service_name_val = _tmp9_;
 #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	service_name_val = _tmp9_;
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = service_name_val;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	service_name = _tmp11_;
 #line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	service_name = _tmp11_;
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	selected_service = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = _tmp13_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services_length1 = _tmp12_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_services_size_ = services_length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = services;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14__length1 = services_length1;
-#line 3031 "PublishingUI.c"
+#line 3026 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp14_;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp14__length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3043 "PublishingUI.c"
+#line 3038 "PublishingUI.c"
 			SpitPublishingService* _tmp15_;
 			SpitPublishingService* service = NULL;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _g_object_ref0 (service_collection[service_it]);
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp15_;
-#line 3050 "PublishingUI.c"
+#line 3045 "PublishingUI.c"
 			{
 				SpitPublishingService* _tmp16_;
 				const gchar* _tmp17_;
 				const gchar* _tmp18_;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = service;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp18_ = service_name;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3063 "PublishingUI.c"
+#line 3058 "PublishingUI.c"
 					SpitPublishingService* _tmp19_;
 					SpitPublishingService* _tmp20_;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp19_ = service;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (selected_service);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					selected_service = _tmp20_;
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (service);
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					break;
-#line 3078 "PublishingUI.c"
+#line 3073 "PublishingUI.c"
 				}
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 3082 "PublishingUI.c"
+#line 3077 "PublishingUI.c"
 			}
 		}
 	}
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp21_ = selected_service;
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_vala_assert (_tmp21_ != NULL, "selected_service != null");
 #line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_vala_assert (_tmp21_ != NULL, "selected_service != null");
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = config_facade_get_instance ();
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = _tmp22_;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp24_ = selected_service;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (_tmp23_);
 #line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_g_object_unref0 (_tmp23_);
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = selected_service;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = self->priv->publishables;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = self->priv->publishables_length1;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = _tmp28_;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = self->priv->host;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (selected_service);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (service_name);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3126 "PublishingUI.c"
+#line 3121 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
 	SpitPublishingConcretePublishingHost* _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:480: PublishingDialog: on_close_cancel_clicked( ): i" \
-"nvoked.");
 #line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:482: PublishingDialog: on_close_cancel_clicked( ): i" \
+"nvoked.");
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3148 "PublishingUI.c"
+#line 3143 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 491 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3164 "PublishingUI.c"
+#line 3159 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 498 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3180 "PublishingUI.c"
+#line 3175 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 505 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3196 "PublishingUI.c"
+#line 3191 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 509 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3205 "PublishingUI.c"
+#line 3200 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 513 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3214 "PublishingUI.c"
+#line 3209 "PublishingUI.c"
 }
 
 
@@ -3225,70 +3220,70 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
 	SpitPublishingDialogPane* result = NULL;
 	SpitPublishingDialogPane* _tmp0_;
 	SpitPublishingDialogPane* _tmp1_;
-#line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3232 "PublishingUI.c"
+#line 3227 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) {
 	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
-#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Close"));
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = self->priv->close_cancel_button;
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 3249 "PublishingUI.c"
+#line 3244 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
 	GtkButton* _tmp0_;
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 3261 "PublishingUI.c"
+#line 3256 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3273 "PublishingUI.c"
+#line 3268 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_;
-#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3285 "PublishingUI.c"
+#line 3280 "PublishingUI.c"
 }
 
 
@@ -3306,110 +3301,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	SpitPublishingDialogPane* _tmp15_;
 	SpitPublishingDialogPane* _tmp16_;
 	SpitPublishingDialogPane* _tmp17_;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:539: PublishingDialog: install_pane( ): invoked.");
 #line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:541: PublishingDialog: install_pane( ): invoked.");
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 3313 "PublishingUI.c"
+#line 3308 "PublishingUI.c"
 		SpitPublishingDialogPane* _tmp1_;
 		GtkBox* _tmp2_;
 		SpitPublishingDialogPane* _tmp3_;
 		GtkWidget* _tmp4_;
 		GtkWidget* _tmp5_;
-#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \
-"ready installed; removing it.");
 #line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_debug ("PublishingUI.vala:544: PublishingDialog: install_pane( ): a pane is al" \
+"ready installed; removing it.");
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp1_ = self->priv->active_pane;
-#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = self->priv->central_area_layouter;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = self->priv->active_pane;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = _tmp4_;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3337 "PublishingUI.c"
+#line 3332 "PublishingUI.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = pane;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp9_ = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = pane;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	geometry_options = _tmp11_;
 #line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	geometry_options = _tmp11_;
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = geometry_options;
-#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3365 "PublishingUI.c"
+#line 3360 "PublishingUI.c"
 	} else {
 		SpitPublishingDialogPaneGeometryOptions _tmp13_;
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp13_ = geometry_options;
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3374 "PublishingUI.c"
+#line 3369 "PublishingUI.c"
 		} else {
-#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3378 "PublishingUI.c"
+#line 3373 "PublishingUI.c"
 		}
 	}
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = geometry_options;
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3387 "PublishingUI.c"
+#line 3382 "PublishingUI.c"
 	} else {
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3391 "PublishingUI.c"
+#line 3386 "PublishingUI.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = pane;
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->active_pane = _tmp16_;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = pane;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3405 "PublishingUI.c"
+#line 3400 "PublishingUI.c"
 }
 
 
@@ -3417,23 +3412,23 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	gint result = 0;
 	gint _result_ = 0;
 	gint _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 571 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
-#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_on_service_changed (self);
 #line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_on_service_changed (self);
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_result_ = _tmp0_;
 #line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_result_ = _tmp0_;
+#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->host = NULL;
 #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->host = NULL;
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _result_;
-#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3429 "PublishingUI.c"
+#line 3424 "PublishingUI.c"
 }
 
 
@@ -3444,14 +3439,14 @@ static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDi
 	g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3440 "PublishingUI.c"
+#line 3435 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3447 "PublishingUI.c"
+#line 3442 "PublishingUI.c"
 }
 
 
@@ -3477,7 +3472,7 @@ static void publishing_ui_publishing_dialog_finalize (GObject * obj) {
 	spit_pluggable_info_destroy (&self->priv->info);
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3473 "PublishingUI.c"
+#line 3468 "PublishingUI.c"
 }
 
 
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c975564..3d4f609 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -161,11 +161,13 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        if (use_header)
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
+        if (use_header) {
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
+        } else {
+            get_content_area().set_spacing(6);
+        }
 
         resizable = false;
         modal = true;
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 86fd417..09e5fec 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gdk/gdk.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -285,30 +284,25 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow
 typedef struct _SearchConditionDate SearchConditionDate;
 typedef struct _SearchConditionDateClass SearchConditionDateClass;
 typedef struct _Block10Data Block10Data;
-typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
 #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
 struct _SavedSearchDialog {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
+	GtkDialog parent_instance;
 	SavedSearchDialogPrivate * priv;
 };
 
 struct _SavedSearchDialogClass {
-	GTypeClass parent_class;
-	void (*finalize) (SavedSearchDialog *self);
+	GtkDialogClass parent_class;
 };
 
 struct _SavedSearchDialogPrivate {
-	GtkBuilder* builder;
-	GtkDialog* dialog;
 	GtkButton* add_criteria;
 	GtkComboBoxText* operator;
-	GtkBox* row_box;
 	GtkEntry* search_title;
+	GtkListBox* row_listbox;
 	GeeArrayList* row_list;
 	gboolean edit_mode;
 	SavedSearch* previous_search;
@@ -546,10 +540,6 @@ struct _Block10Data {
 	GtkDialog* d;
 };
 
-struct _ParamSpecSavedSearchDialog {
-	GParamSpec parent_instance;
-};
-
 
 static gpointer saved_search_dialog_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_container_parent_class = NULL;
@@ -561,12 +551,6 @@ static gpointer saved_search_dialog_search_row_flagged_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_rating_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_date_parent_class = NULL;
 
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance);
 static void saved_search_dialog_search_row_container_unref (gpointer instance);
@@ -582,10 +566,9 @@ GType saved_search_get_type (void) G_GNUC_CONST;
 enum  {
 	SAVED_SEARCH_DIALOG_DUMMY_PROPERTY
 };
-static void saved_search_dialog_on_title_changed (SavedSearchDialog* self);
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self);
 gpointer saved_search_table_ref (gpointer instance);
 void saved_search_table_unref (gpointer instance);
@@ -615,14 +598,15 @@ GeeList* saved_search_get_conditions (SavedSearch* self);
 static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id);
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event);
-static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self);
+static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void saved_search_dialog_on_title_changed (SavedSearchDialog* self);
+static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 void saved_search_dialog_show (SavedSearchDialog* self);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type);
@@ -661,8 +645,8 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self);
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event);
-static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self);
+static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self);
 static GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self);
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent);
@@ -818,100 +802,93 @@ static Block10Data* block10_data_ref (Block10Data* _data10_);
 static void block10_data_unref (void * _userdata_);
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define RESOURCES_OK_LABEL _ ("_OK")
-static void __lambda13_ (SavedSearchDialogSearchRowDate* self);
-static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
-static void __lambda14_ (Block10Data* _data10_);
-static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
+static void __lambda14_ (SavedSearchDialogSearchRowDate* self);
+static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
+static void __lambda15_ (Block10Data* _data10_);
+static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
 static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj);
-static void saved_search_dialog_finalize (SavedSearchDialog * obj);
-
-
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
-#line 833 "SavedSearchDialog.c"
-}
+static void saved_search_dialog_finalize (GObject * obj);
 
 
 SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
-	SavedSearchDialog* self = NULL;
-	GtkEntry* _tmp0_;
-	SavedSearchTable* _tmp1_;
+	SavedSearchDialog * self = NULL;
+	gint _tmp0_;
+	GtkEntry* _tmp1_;
 	SavedSearchTable* _tmp2_;
-	gchar* _tmp3_;
+	SavedSearchTable* _tmp3_;
 	gchar* _tmp4_;
-	GtkEntry* _tmp5_;
-	GeeArrayList* _tmp6_;
-	gpointer _tmp7_;
-	SavedSearchDialogSearchRowContainer* _tmp8_;
-	GtkDialog* _tmp9_;
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_setup_dialog (self);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->search_title;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_table_get_instance ();
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = saved_search_table_generate_unique_name (_tmp2_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_text (_tmp0_, _tmp4_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp4_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_table_unref0 (_tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->search_title;
-#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
-#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_add_text_search (self);
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->row_list;
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_;
+	gchar* _tmp5_;
+	GtkEntry* _tmp6_;
+	GeeArrayList* _tmp7_;
+	gpointer _tmp8_;
+	SavedSearchDialogSearchRowContainer* _tmp9_;
 #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE);
+	_tmp0_ = resources_use_header_bar ();
 #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_dialog_search_row_container_unref0 (_tmp8_);
-#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->dialog;
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
 #line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 660 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_setup_dialog (self);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = self->priv->search_title;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp2_ = saved_search_table_get_instance ();
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp3_ = _tmp2_;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp4_ = saved_search_table_generate_unique_name (_tmp3_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp5_ = _tmp4_;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_entry_set_text (_tmp1_, _tmp5_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_free0 (_tmp5_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_saved_search_table_unref0 (_tmp3_);
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp6_ = self->priv->search_title;
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
+#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_add_text_search (self);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp7_ = self->priv->row_list;
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp9_ = (SavedSearchDialogSearchRowContainer*) _tmp8_;
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_allow_removal (_tmp9_, FALSE);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_saved_search_dialog_search_row_container_unref0 (_tmp9_);
+#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, FALSE);
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 893 "SavedSearchDialog.c"
+#line 870 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new (void) {
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG);
-#line 900 "SavedSearchDialog.c"
+#line 877 "SavedSearchDialog.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 907 "SavedSearchDialog.c"
+#line 884 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) {
-	SavedSearchDialog* self = NULL;
-	SavedSearch* _tmp0_;
+	SavedSearchDialog * self = NULL;
+	gint _tmp0_;
 	SavedSearch* _tmp1_;
-	GtkDialog* _tmp2_;
+	SavedSearch* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	SavedSearch* _tmp4_;
 	SearchOperator _tmp5_;
@@ -922,47 +899,47 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 	GeeArrayList* _tmp24_;
 	gint _tmp25_;
 	gint _tmp26_;
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = saved_search;
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = saved_search;
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->previous_search = _tmp1_;
-#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->previous_search = _tmp2_;
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = TRUE;
-#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_setup_dialog (self);
-#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->dialog;
-#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->operator;
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search;
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_get_operator (_tmp4_);
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_));
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->search_title;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = saved_search;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp6_, _tmp9_);
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp9_);
-#line 966 "SavedSearchDialog.c"
+#line 943 "SavedSearchDialog.c"
 	{
 		GeeList* _sc_list = NULL;
 		SavedSearch* _tmp10_;
@@ -972,25 +949,25 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 		gint _tmp13_;
 		gint _tmp14_;
 		gint _sc_index = 0;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp10_ = saved_search;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp11_ = saved_search_get_conditions (_tmp10_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_list = _tmp11_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp12_ = _sc_list;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp14_ = _tmp13_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_size = _tmp14_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_index = -1;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		while (TRUE) {
-#line 994 "SavedSearchDialog.c"
+#line 971 "SavedSearchDialog.c"
 			gint _tmp15_;
 			gint _tmp16_;
 			gint _tmp17_;
@@ -1001,330 +978,183 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 			SearchCondition* _tmp21_;
 			SavedSearchDialogSearchRowContainer* _tmp22_;
 			SavedSearchDialogSearchRowContainer* _tmp23_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_sc_index = _tmp15_ + 1;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = _sc_size;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (!(_tmp16_ < _tmp17_)) {
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				break;
-#line 1017 "SavedSearchDialog.c"
+#line 994 "SavedSearchDialog.c"
 			}
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _sc_list;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp19_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = gee_list_get (_tmp18_, _tmp19_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			sc = (SearchCondition*) _tmp20_;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = sc;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_);
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp23_ = _tmp22_;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_dialog_add_row (self, _tmp23_);
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_container_unref0 (_tmp23_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_search_condition_unref0 (sc);
-#line 1039 "SavedSearchDialog.c"
+#line 1016 "SavedSearchDialog.c"
 		}
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_sc_list);
-#line 1043 "SavedSearchDialog.c"
+#line 1020 "SavedSearchDialog.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = _tmp25_;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp26_ == 1) {
-#line 1053 "SavedSearchDialog.c"
+#line 1030 "SavedSearchDialog.c"
 		GeeArrayList* _tmp27_;
 		gpointer _tmp28_;
 		SavedSearchDialogSearchRowContainer* _tmp29_;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = self->priv->row_list;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE);
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp29_);
-#line 1067 "SavedSearchDialog.c"
+#line 1044 "SavedSearchDialog.c"
 	}
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 692 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1073 "SavedSearchDialog.c"
+#line 1050 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) {
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search);
-#line 1080 "SavedSearchDialog.c"
+#line 1057 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id);
-#line 1087 "SavedSearchDialog.c"
+#line 1064 "SavedSearchDialog.c"
 }
 
 
-static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event);
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 1096 "SavedSearchDialog.c"
+static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self);
+#line 1071 "SavedSearchDialog.c"
+}
+
+
+static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
+#line 1078 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
-	GtkBuilder* _tmp0_;
+	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-	GdkWindow* _tmp3_;
-	GtkDialog* _tmp4_;
-	GtkDialog* _tmp5_;
-	GtkDialog* _tmp6_;
-	AppWindow* _tmp7_;
-	AppWindow* _tmp8_;
-	GtkDialog* _tmp9_;
-	GtkDialog* _tmp10_;
-	GtkDialog* _tmp11_;
-	GtkBox* _tmp12_;
-	GtkBuilder* _tmp13_;
-	GObject* _tmp14_;
-	GtkDialog* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkButton* _tmp18_;
-	GtkButton* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_;
-	GtkEntry* _tmp22_;
-	GtkEntry* _tmp23_;
-	GtkEntry* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_;
-	GtkBox* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkComboBoxText* _tmp30_;
-	GtkComboBoxText* _tmp31_;
-	GtkComboBoxText* _tmp32_;
-	GtkComboBoxText* _tmp33_;
-	GtkComboBoxText* _tmp34_;
-#line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	GtkButton* _tmp2_;
+	GtkEntry* _tmp3_;
+#line 696 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->builder = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = app_window_get_instance ();
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = (GtkDialog*) gtk_dialog_new_with_buttons (_ ("Search"), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("OK"), GTK_RESPONSE_OK, NULL, NULL);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp4_);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->dialog = _tmp4_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp2_);
-#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->dialog;
-#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->dialog;
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = app_window_get_instance ();
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _tmp7_;
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = _tmp0_;
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (_tmp1_);
+#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self, 0);
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
+	_tmp2_ = self->priv->add_criteria;
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp8_);
-#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->dialog;
-#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK);
+	g_signal_connect_object (_tmp2_, "clicked", (GCallback) _saved_search_dialog_on_add_criteria_gtk_button_clicked, self, 0);
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->dialog;
+	_tmp3_ = self->priv->search_title;
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp10_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self);
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->dialog;
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_);
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->builder;
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "criteria");
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp14_) : NULL);
-#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->dialog;
-#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->builder;
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button");
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->add_criteria);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->add_criteria = _tmp18_;
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->add_criteria;
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->builder;
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "Search title");
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->search_title);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_title = _tmp22_;
-#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->search_title;
-#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp23_, TRUE);
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->search_title;
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->builder;
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "row_box");
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_box_get_type ()) ? ((GtkBox*) _tmp26_) : NULL);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->row_box);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->row_box = _tmp27_;
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = self->priv->builder;
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria");
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->operator);
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->operator = _tmp30_;
-#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->operator;
-#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp31_, _ ("any"));
-#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = self->priv->operator;
-#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp32_, _ ("all"));
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = self->priv->operator;
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp33_, _ ("none"));
-#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = self->priv->operator;
-#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1264 "SavedSearchDialog.c"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0);
+#line 1107 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_show (SavedSearchDialog* self) {
-	GtkDialog* _tmp0_;
-	GtkDialog* _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->dialog;
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_run (_tmp0_);
-#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = self->priv->dialog;
-#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1281 "SavedSearchDialog.c"
+#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1118 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event) {
-	gboolean result = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self) {
+#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
-#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 1297 "SavedSearchDialog.c"
+#line 1127 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	SavedSearchDialogSearchRowContainer* text = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_new ();
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_row (self, text);
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (text);
-#line 1314 "SavedSearchDialog.c"
+#line 1144 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row);
-#line 1321 "SavedSearchDialog.c"
+#line 1151 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row);
-#line 1328 "SavedSearchDialog.c"
+#line 1158 "SavedSearchDialog.c"
 }
 
 
@@ -1332,7 +1162,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-	GtkBox* _tmp6_;
+	GtkListBox* _tmp6_;
 	SavedSearchDialogSearchRowContainer* _tmp7_;
 	GtkWidget* _tmp8_;
 	GtkWidget* _tmp9_;
@@ -1342,67 +1172,67 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	SavedSearchDialogSearchRowContainer* _tmp13_;
 	SavedSearchDialogSearchRowContainer* _tmp14_;
 	gboolean _tmp15_;
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->row_list;
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == 1) {
-#line 1358 "SavedSearchDialog.c"
+#line 1188 "SavedSearchDialog.c"
 		GeeArrayList* _tmp3_;
 		gpointer _tmp4_;
 		SavedSearchDialogSearchRowContainer* _tmp5_;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->row_list;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = (SavedSearchDialogSearchRowContainer*) _tmp4_;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE);
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp5_);
-#line 1372 "SavedSearchDialog.c"
+#line 1202 "SavedSearchDialog.c"
 	}
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->row_box;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp6_ = self->priv->row_listbox;
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = row;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_);
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_);
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp9_);
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = row;
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = row;
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0);
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = row;
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0);
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = row;
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp15_);
-#line 1406 "SavedSearchDialog.c"
+#line 1236 "SavedSearchDialog.c"
 }
 
 
@@ -1411,88 +1241,91 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 	guint _tmp1_;
 	SavedSearchDialogSearchRowContainer* _tmp2_;
 	guint _tmp3_;
-	GtkBox* _tmp4_;
+	GtkListBox* _tmp4_;
 	SavedSearchDialogSearchRowContainer* _tmp5_;
 	GtkWidget* _tmp6_;
 	GtkWidget* _tmp7_;
-	GeeArrayList* _tmp8_;
-	SavedSearchDialogSearchRowContainer* _tmp9_;
-	GeeArrayList* _tmp10_;
-	gint _tmp11_;
+	GtkContainer* _tmp8_;
+	GeeArrayList* _tmp9_;
+	SavedSearchDialogSearchRowContainer* _tmp10_;
+	GeeArrayList* _tmp11_;
 	gint _tmp12_;
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gint _tmp13_;
+#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE);
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = row;
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE);
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->row_box;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp4_ = self->priv->row_listbox;
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = row;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), _tmp7_);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp8_ = (GtkContainer*) gtk_widget_get_parent (_tmp7_);
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp7_);
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->row_list;
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = row;
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->row_list;
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = _tmp11_;
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp12_ == 1) {
-#line 1466 "SavedSearchDialog.c"
-		GeeArrayList* _tmp13_;
-		gpointer _tmp14_;
-		SavedSearchDialogSearchRowContainer* _tmp15_;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp13_ = self->priv->row_list;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp15_ = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE);
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_dialog_search_row_container_unref0 (_tmp15_);
-#line 1480 "SavedSearchDialog.c"
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp9_ = self->priv->row_list;
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp10_ = row;
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp11_ = self->priv->row_list;
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp13_ = _tmp12_;
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	if (_tmp13_ == 1) {
+#line 1299 "SavedSearchDialog.c"
+		GeeArrayList* _tmp14_;
+		gpointer _tmp15_;
+		SavedSearchDialogSearchRowContainer* _tmp16_;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp14_ = self->priv->row_list;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp16_ = (SavedSearchDialogSearchRowContainer*) _tmp15_;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		saved_search_dialog_search_row_container_allow_removal (_tmp16_, FALSE);
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_saved_search_dialog_search_row_container_unref0 (_tmp16_);
+#line 1313 "SavedSearchDialog.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 1484 "SavedSearchDialog.c"
+#line 1317 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) {
 	gint _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = response_id;
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1496 "SavedSearchDialog.c"
+#line 1329 "SavedSearchDialog.c"
 		gboolean _tmp1_ = FALSE;
 		SavedSearchTable* _tmp2_;
 		SavedSearchTable* _tmp3_;
@@ -1514,111 +1347,111 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 		GeeArrayList* _tmp46_;
 		SavedSearch* _tmp47_;
 		SavedSearch* _tmp48_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_table_get_instance ();
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = _tmp2_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->search_title;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = _tmp6_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp3_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp7_) {
-#line 1534 "SavedSearchDialog.c"
+#line 1367 "SavedSearchDialog.c"
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp9_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->edit_mode;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp9_) {
-#line 1541 "SavedSearchDialog.c"
+#line 1374 "SavedSearchDialog.c"
 				SavedSearch* _tmp10_;
 				gchar* _tmp11_;
 				gchar* _tmp12_;
 				GtkEntry* _tmp13_;
 				const gchar* _tmp14_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = self->priv->previous_search;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = _tmp11_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = self->priv->search_title;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp12_);
-#line 1561 "SavedSearchDialog.c"
+#line 1394 "SavedSearchDialog.c"
 			} else {
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = FALSE;
-#line 1565 "SavedSearchDialog.c"
+#line 1398 "SavedSearchDialog.c"
 			}
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = !_tmp8_;
-#line 1569 "SavedSearchDialog.c"
+#line 1402 "SavedSearchDialog.c"
 		} else {
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = FALSE;
-#line 1573 "SavedSearchDialog.c"
+#line 1406 "SavedSearchDialog.c"
 		}
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_) {
-#line 1577 "SavedSearchDialog.c"
+#line 1410 "SavedSearchDialog.c"
 			GtkEntry* _tmp15_;
 			const gchar* _tmp16_;
 			gchar* _tmp17_;
 			gchar* _tmp18_;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = self->priv->search_title;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = gtk_entry_get_text (_tmp15_);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _tmp17_;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_free0 (_tmp18_);
-#line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return;
-#line 1596 "SavedSearchDialog.c"
+#line 1429 "SavedSearchDialog.c"
 		}
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp19_ = self->priv->edit_mode;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp19_) {
-#line 1602 "SavedSearchDialog.c"
+#line 1435 "SavedSearchDialog.c"
 			SavedSearchTable* _tmp20_;
 			SavedSearchTable* _tmp21_;
 			SavedSearch* _tmp22_;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = saved_search_table_get_instance ();
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = _tmp20_;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = self->priv->previous_search;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_table_remove (_tmp21_, _tmp22_);
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_table_unref0 (_tmp21_);
-#line 1616 "SavedSearchDialog.c"
+#line 1449 "SavedSearchDialog.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
-#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		conditions = _tmp23_;
-#line 1622 "SavedSearchDialog.c"
+#line 1455 "SavedSearchDialog.c"
 		{
 			GeeArrayList* _c_list = NULL;
 			GeeArrayList* _tmp24_;
@@ -1628,25 +1461,25 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			gint _tmp27_;
 			gint _tmp28_;
 			gint _c_index = 0;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp24_ = self->priv->row_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_list = _tmp25_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp26_ = _c_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp28_ = _tmp27_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_size = _tmp28_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_index = -1;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 1650 "SavedSearchDialog.c"
+#line 1483 "SavedSearchDialog.c"
 				gint _tmp29_;
 				gint _tmp30_;
 				gint _tmp31_;
@@ -1658,77 +1491,77 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				SavedSearchDialogSearchRowContainer* _tmp36_;
 				SearchCondition* _tmp37_;
 				SearchCondition* _tmp38_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp29_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_c_index = _tmp29_ + 1;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp30_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp31_ = _c_size;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp30_ < _tmp31_)) {
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 1674 "SavedSearchDialog.c"
+#line 1507 "SavedSearchDialog.c"
 				}
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp32_ = _c_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp33_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				c = (SavedSearchDialogSearchRowContainer*) _tmp34_;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp35_ = conditions;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp36_ = c;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_);
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp38_ = _tmp37_;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_search_condition_unref0 (_tmp38_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_saved_search_dialog_search_row_container_unref0 (c);
-#line 1698 "SavedSearchDialog.c"
+#line 1531 "SavedSearchDialog.c"
 			}
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_object_unref0 (_c_list);
-#line 1702 "SavedSearchDialog.c"
+#line 1535 "SavedSearchDialog.c"
 		}
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp39_ = self->priv->operator;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox));
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		search_operator = (SearchOperator) _tmp40_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp41_ = saved_search_table_get_instance ();
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp42_ = _tmp41_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp43_ = self->priv->search_title;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp44_ = gtk_entry_get_text (_tmp43_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp45_ = search_operator;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp46_ = conditions;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp48_ = _tmp47_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp48_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp42_);
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (conditions);
-#line 1732 "SavedSearchDialog.c"
+#line 1565 "SavedSearchDialog.c"
 	}
 }
 
@@ -1736,29 +1569,29 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	gboolean _tmp1_;
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_);
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp1_);
-#line 1750 "SavedSearchDialog.c"
+#line 1583 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) {
 	gboolean _tmp0_;
-#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 772 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_is_title_valid (self);
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp0_);
-#line 1762 "SavedSearchDialog.c"
+#line 1595 "SavedSearchDialog.c"
 }
 
 
@@ -1781,7 +1614,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1785 "SavedSearchDialog.c"
+#line 1618 "SavedSearchDialog.c"
 }
 
 
@@ -1801,147 +1634,146 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	const gchar* _tmp17_;
 	gboolean _tmp18_;
 	gboolean _tmp19_;
-#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->edit_mode;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_) {
-#line 1811 "SavedSearchDialog.c"
+#line 1644 "SavedSearchDialog.c"
 		SavedSearch* _tmp3_;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->previous_search;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1817 "SavedSearchDialog.c"
+#line 1650 "SavedSearchDialog.c"
 	} else {
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = FALSE;
-#line 1821 "SavedSearchDialog.c"
+#line 1654 "SavedSearchDialog.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 1825 "SavedSearchDialog.c"
+#line 1658 "SavedSearchDialog.c"
 		SavedSearch* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		GtkEntry* _tmp7_;
 		const gchar* _tmp8_;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->previous_search;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = _tmp5_;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = self->priv->search_title;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = gtk_entry_get_text (_tmp7_);
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_free0 (_tmp6_);
-#line 1845 "SavedSearchDialog.c"
+#line 1678 "SavedSearchDialog.c"
 	} else {
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = FALSE;
-#line 1849 "SavedSearchDialog.c"
+#line 1682 "SavedSearchDialog.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = TRUE;
-#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1857 "SavedSearchDialog.c"
+#line 1690 "SavedSearchDialog.c"
 	}
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->search_title;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = string_chomp (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = g_strcmp0 (_tmp12_, "") == 0;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp12_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp13_) {
-#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1877 "SavedSearchDialog.c"
+#line 1710 "SavedSearchDialog.c"
 	}
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_table_get_instance ();
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->search_title;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = _tmp18_;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_table_unref0 (_tmp15_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp19_) {
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1899 "SavedSearchDialog.c"
+#line 1732 "SavedSearchDialog.c"
 	}
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1905 "SavedSearchDialog.c"
+#line 1738 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) {
 	gboolean _tmp0_;
-	GtkDialog* _tmp22_;
-	gboolean _tmp23_;
-#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gboolean _tmp22_;
+#line 788 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = v;
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!_tmp0_) {
-#line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self->priv->valid = FALSE;
-#line 1921 "SavedSearchDialog.c"
+#line 1753 "SavedSearchDialog.c"
 	} else {
 		gboolean _tmp1_;
 		gboolean _tmp2_;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = v;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->valid;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_ != _tmp2_) {
-#line 1931 "SavedSearchDialog.c"
+#line 1763 "SavedSearchDialog.c"
 			gboolean _tmp3_;
-#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp3_ = saved_search_dialog_is_title_valid (self);
-#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp3_) {
-#line 1937 "SavedSearchDialog.c"
+#line 1769 "SavedSearchDialog.c"
 				gint valid_rows = 0;
 				gint _tmp18_;
 				GeeArrayList* _tmp19_;
 				gint _tmp20_;
 				gint _tmp21_;
-#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				valid_rows = 0;
-#line 1945 "SavedSearchDialog.c"
+#line 1777 "SavedSearchDialog.c"
 				{
 					GeeArrayList* _c_list = NULL;
 					GeeArrayList* _tmp4_;
@@ -1951,25 +1783,25 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 					gint _tmp7_;
 					gint _tmp8_;
 					gint _c_index = 0;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp4_ = self->priv->row_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_list = _tmp5_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp6_ = _c_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp8_ = _tmp7_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_size = _tmp8_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_index = -1;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					while (TRUE) {
-#line 1973 "SavedSearchDialog.c"
+#line 1805 "SavedSearchDialog.c"
 						gint _tmp9_;
 						gint _tmp10_;
 						gint _tmp11_;
@@ -1979,96 +1811,94 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 						gpointer _tmp14_;
 						SavedSearchDialogSearchRowContainer* _tmp15_;
 						gboolean _tmp16_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp9_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_c_index = _tmp9_ + 1;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp10_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp11_ = _c_size;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (!(_tmp10_ < _tmp11_)) {
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							break;
-#line 1995 "SavedSearchDialog.c"
+#line 1827 "SavedSearchDialog.c"
 						}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp12_ = _c_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp13_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_);
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						c = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp15_ = c;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_);
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (_tmp16_) {
-#line 2011 "SavedSearchDialog.c"
+#line 1843 "SavedSearchDialog.c"
 							gint _tmp17_;
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							_tmp17_ = valid_rows;
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							valid_rows = _tmp17_ + 1;
-#line 2017 "SavedSearchDialog.c"
+#line 1849 "SavedSearchDialog.c"
 						}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_saved_search_dialog_search_row_container_unref0 (c);
-#line 2021 "SavedSearchDialog.c"
+#line 1853 "SavedSearchDialog.c"
 					}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_g_object_unref0 (_c_list);
-#line 2025 "SavedSearchDialog.c"
+#line 1857 "SavedSearchDialog.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp18_ = valid_rows;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp19_ = self->priv->row_list;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp21_ = _tmp20_;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = _tmp18_ == _tmp21_;
-#line 2037 "SavedSearchDialog.c"
+#line 1869 "SavedSearchDialog.c"
 			} else {
-#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = FALSE;
-#line 2041 "SavedSearchDialog.c"
+#line 1873 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->dialog;
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->valid;
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_);
-#line 2051 "SavedSearchDialog.c"
+#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp22_ = self->priv->valid;
+#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp22_);
+#line 1881 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) {
 	SavedSearchDialogSearchRowContainer* self = NULL;
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_setup_gui (self);
+	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 25 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_setup_gui (self);
+#line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2065 "SavedSearchDialog.c"
+#line 1895 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) {
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2072 "SavedSearchDialog.c"
+#line 1902 "SavedSearchDialog.c"
 }
 
 
@@ -2082,60 +1912,58 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	SearchConditionSearchType _tmp5_;
 	SavedSearchDialogSearchRow* _tmp6_;
 	SearchCondition* _tmp7_;
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL);
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_setup_gui (self);
+	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_setup_gui (self);
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_get_search_type (_tmp0_);
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = sc;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_get_search_type (_tmp3_);
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->my_row;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = sc;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_populate (_tmp6_, _tmp7_);
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2116 "SavedSearchDialog.c"
+#line 1946 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) {
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc);
-#line 2123 "SavedSearchDialog.c"
+#line 1953 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self);
-#line 2130 "SavedSearchDialog.c"
+#line 1960 "SavedSearchDialog.c"
 }
 
 
-static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 2139 "SavedSearchDialog.c"
+static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self);
+#line 1967 "SavedSearchDialog.c"
 }
 
 
@@ -2147,53 +1975,58 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	GtkComboBoxText* _tmp18_;
 	GtkButton* _tmp19_;
 	GtkButton* _tmp20_;
-	GtkBox* _tmp21_;
+	GtkButton* _tmp21_;
 	GtkBox* _tmp22_;
-	GtkComboBoxText* _tmp23_;
-	GtkBox* _tmp24_;
-	GtkButton* _tmp25_;
-	GtkBox* _tmp26_;
-#line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+	GtkBox* _tmp23_;
+	GtkComboBoxText* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkButton* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkBox* _tmp28_;
+	GtkBox* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkBox* _tmp31_;
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_search_type_as_array (&_tmp0_);
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = (g_free (self->priv->search_types), NULL);
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types_length1 = _tmp0_;
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->_search_types_size_ = self->priv->search_types_length1;
 #line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->_search_types_size_ = self->priv->search_types_length1;
+#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gee_hash_map_new (SEARCH_CONDITION_TYPE_SEARCH_TYPE, NULL, NULL, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_types_index = _tmp2_;
 #line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->search_types_index = _tmp2_;
+#line 40 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_condition_search_type_sort_array (&self->priv->search_types, &self->priv->search_types_length1);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp3_);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->type_combo);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->type_combo = _tmp3_;
-#line 2185 "SavedSearchDialog.c"
+#line 2018 "SavedSearchDialog.c"
 	{
 		gint i = 0;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		i = 0;
-#line 2190 "SavedSearchDialog.c"
+#line 2023 "SavedSearchDialog.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp4_ = TRUE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 2197 "SavedSearchDialog.c"
+#line 2030 "SavedSearchDialog.c"
 				gint _tmp6_;
 				SearchConditionSearchType* _tmp7_;
 				gint _tmp7__length1;
@@ -2209,121 +2042,141 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				SearchConditionSearchType _tmp15_;
 				gchar* _tmp16_;
 				gchar* _tmp17_;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!_tmp4_) {
-#line 2215 "SavedSearchDialog.c"
+#line 2048 "SavedSearchDialog.c"
 					gint _tmp5_;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = i;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					i = _tmp5_ + 1;
-#line 2221 "SavedSearchDialog.c"
+#line 2054 "SavedSearchDialog.c"
 				}
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp4_ = FALSE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp6_ = i;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7_ = self->priv->search_types;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7__length1 = self->priv->search_types_length1;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp6_ < _tmp7__length1)) {
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 2235 "SavedSearchDialog.c"
+#line 2068 "SavedSearchDialog.c"
 				}
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = self->priv->search_types;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8__length1 = self->priv->search_types_length1;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp9_ = i;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = _tmp8_[_tmp9_];
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				st = _tmp10_;
 #line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+				st = _tmp10_;
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = self->priv->search_types_index;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = st;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = i;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_));
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_));
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = self->priv->type_combo;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp15_ = st;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp16_ = search_condition_search_type_display_text (_tmp15_);
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp17_ = _tmp16_;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gtk_combo_box_text_append_text (_tmp14_, _tmp17_);
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp17_);
-#line 2267 "SavedSearchDialog.c"
+#line 2100 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
 #line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->type_combo;
-#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->remove_button);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->remove_button = _tmp19_;
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->remove_button = _tmp19_;
+#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->remove_button;
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event, self);
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_button_set_relief (_tmp20_, GTK_RELIEF_NONE);
 #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp21_);
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->box);
+	_tmp21_ = self->priv->remove_button;
 #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp21_;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->box;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->type_combo;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	g_signal_connect (_tmp21_, "clicked", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked, self);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->box;
+	_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->remove_button;
+	g_object_ref_sink (_tmp22_);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_end (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	_g_object_unref0 (self->priv->box);
+#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->box = _tmp22_;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp23_ = self->priv->box;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 2313 "SavedSearchDialog.c"
+	_tmp24_ = self->priv->type_combo;
+#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp25_ = self->priv->box;
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp26_ = self->priv->remove_button;
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_end (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp27_ = self->priv->box;
+#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), 2);
+#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp28_ = self->priv->box;
+#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 2);
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp29_ = self->priv->box;
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), 8);
+#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp30_ = self->priv->box;
+#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), 8);
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp31_ = self->priv->box;
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+#line 2166 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) {
 	SearchConditionSearchType _tmp0_;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_get_search_type (self);
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, _tmp0_);
-#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self);
-#line 2327 "SavedSearchDialog.c"
+#line 2180 "SavedSearchDialog.c"
 }
 
 
@@ -2332,19 +2185,19 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe
 	GeeHashMap* _tmp1_;
 	SearchConditionSearchType _tmp2_;
 	gpointer _tmp3_;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->type_combo;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->search_types_index;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = st;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_));
-#line 2348 "SavedSearchDialog.c"
+#line 2201 "SavedSearchDialog.c"
 }
 
 
@@ -2355,155 +2208,155 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 	SavedSearchDialogSearchRow* _tmp13_;
 	GtkWidget* _tmp14_;
 	GtkWidget* _tmp15_;
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ != NULL) {
-#line 2365 "SavedSearchDialog.c"
+#line 2218 "SavedSearchDialog.c"
 		GtkBox* _tmp1_;
 		SavedSearchDialogSearchRow* _tmp2_;
 		GtkWidget* _tmp3_;
 		GtkWidget* _tmp4_;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = self->priv->box;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->my_row;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = saved_search_dialog_search_row_get_widget (_tmp2_);
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = _tmp3_;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_);
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2382 "SavedSearchDialog.c"
+#line 2235 "SavedSearchDialog.c"
 	}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = type;
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	switch (_tmp5_) {
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 2400 "SavedSearchDialog.c"
+#line 2253 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowText* _tmp6_;
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp6_ = saved_search_dialog_search_row_text_new (self);
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2411 "SavedSearchDialog.c"
+#line 2264 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 2415 "SavedSearchDialog.c"
+#line 2268 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowMediaType* _tmp7_;
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = saved_search_dialog_search_row_media_type_new (self);
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2426 "SavedSearchDialog.c"
+#line 2279 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 2430 "SavedSearchDialog.c"
+#line 2283 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowFlagged* _tmp8_;
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = saved_search_dialog_search_row_flagged_new (self);
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 94 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2441 "SavedSearchDialog.c"
+#line 2294 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 2445 "SavedSearchDialog.c"
+#line 2298 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowModified* _tmp9_;
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = saved_search_dialog_search_row_modified_new (self);
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2456 "SavedSearchDialog.c"
+#line 2309 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 2460 "SavedSearchDialog.c"
+#line 2313 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowRating* _tmp10_;
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = saved_search_dialog_search_row_rating_new (self);
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 102 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2471 "SavedSearchDialog.c"
+#line 2324 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 2475 "SavedSearchDialog.c"
+#line 2328 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowDate* _tmp11_;
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = saved_search_dialog_search_row_date_new (self);
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2486 "SavedSearchDialog.c"
+#line 2339 "SavedSearchDialog.c"
 		}
 		default:
 		{
-#line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			g_assert_not_reached ();
-#line 2492 "SavedSearchDialog.c"
+#line 2345 "SavedSearchDialog.c"
 		}
 	}
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->box;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->my_row;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_);
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0);
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2507 "SavedSearchDialog.c"
+#line 2360 "SavedSearchDialog.c"
 }
 
 
@@ -2514,54 +2367,47 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se
 	GtkComboBoxText* _tmp1_;
 	gint _tmp2_;
 	SearchConditionSearchType _tmp3_;
-#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0);
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->search_types;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0__length1 = self->priv->search_types_length1;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->type_combo;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2534 "SavedSearchDialog.c"
+#line 2387 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event) {
-	gboolean result = FALSE;
-#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) {
+#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+#line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self);
-#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 2550 "SavedSearchDialog.c"
+#line 2396 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) {
 	GtkButton* _tmp0_;
 	gboolean _tmp1_;
-#line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->remove_button;
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = allow;
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2565 "SavedSearchDialog.c"
+#line 2411 "SavedSearchDialog.c"
 }
 
 
@@ -2569,17 +2415,17 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2583 "SavedSearchDialog.c"
+#line 2429 "SavedSearchDialog.c"
 }
 
 
@@ -2587,17 +2433,17 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond
 	SearchCondition* result = NULL;
 	SavedSearchDialogSearchRow* _tmp0_;
 	SearchCondition* _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_get_search_condition (_tmp0_);
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2601 "SavedSearchDialog.c"
+#line 2447 "SavedSearchDialog.c"
 }
 
 
@@ -2605,17 +2451,17 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc
 	gboolean result = FALSE;
 	SavedSearchDialogSearchRow* _tmp0_;
 	gboolean _tmp1_;
-#line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_);
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2619 "SavedSearchDialog.c"
+#line 2465 "SavedSearchDialog.c"
 }
 
 
@@ -2626,255 +2472,255 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = closure->data;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2638 "SavedSearchDialog.c"
+#line 2484 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = closure->data;
-#line 2644 "SavedSearchDialog.c"
+#line 2490 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2);
-#line 2650 "SavedSearchDialog.c"
+#line 2496 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_init (GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2657 "SavedSearchDialog.c"
+#line 2503 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_free_value (GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (value->data[0].v_pointer);
-#line 2666 "SavedSearchDialog.c"
+#line 2512 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer);
-#line 2676 "SavedSearchDialog.c"
+#line 2522 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2680 "SavedSearchDialog.c"
+#line 2526 "SavedSearchDialog.c"
 	}
 }
 
 
 static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2688 "SavedSearchDialog.c"
+#line 2534 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2695 "SavedSearchDialog.c"
+#line 2541 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowContainer * object;
 		object = collect_values[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2702 "SavedSearchDialog.c"
+#line 2548 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2706 "SavedSearchDialog.c"
+#line 2552 "SavedSearchDialog.c"
 		}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object);
-#line 2710 "SavedSearchDialog.c"
+#line 2556 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2714 "SavedSearchDialog.c"
+#line 2560 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2718 "SavedSearchDialog.c"
+#line 2564 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SavedSearchDialogSearchRowContainer ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2729 "SavedSearchDialog.c"
+#line 2575 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2735 "SavedSearchDialog.c"
+#line 2581 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2739 "SavedSearchDialog.c"
+#line 2585 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2743 "SavedSearchDialog.c"
+#line 2589 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2747 "SavedSearchDialog.c"
+#line 2593 "SavedSearchDialog.c"
 }
 
 
 static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SavedSearchDialogParamSpecSearchRowContainer* spec;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2761 "SavedSearchDialog.c"
+#line 2607 "SavedSearchDialog.c"
 }
 
 
 static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2770 "SavedSearchDialog.c"
+#line 2616 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRowContainer * old;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2790 "SavedSearchDialog.c"
+#line 2636 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2794 "SavedSearchDialog.c"
+#line 2640 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2800 "SavedSearchDialog.c"
+#line 2646 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRowContainer * old;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 2819 "SavedSearchDialog.c"
+#line 2665 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2823 "SavedSearchDialog.c"
+#line 2669 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2829 "SavedSearchDialog.c"
+#line 2675 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_parent_class = g_type_class_peek_parent (klass);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowContainerClass *) klass)->finalize = saved_search_dialog_search_row_container_finalize;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowContainerPrivate));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2845 "SavedSearchDialog.c"
+#line 2691 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self);
-#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->my_row = NULL;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 2856 "SavedSearchDialog.c"
+#line 2702 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) {
 	SavedSearchDialogSearchRowContainer * self;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->type_combo);
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->box);
+	_g_object_unref0 (self->priv->type_combo);
 #line 17 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->remove_button);
+	_g_object_unref0 (self->priv->box);
 #line 18 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_types = (g_free (self->priv->search_types), NULL);
+	_g_object_unref0 (self->priv->remove_button);
 #line 19 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->search_types = (g_free (self->priv->search_types), NULL);
+#line 20 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 2878 "SavedSearchDialog.c"
+#line 2724 "SavedSearchDialog.c"
 }
 
 
@@ -2895,322 +2741,322 @@ static GType saved_search_dialog_search_row_container_get_type (void) {
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) {
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 2903 "SavedSearchDialog.c"
+#line 2749 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_unref (gpointer instance) {
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2916 "SavedSearchDialog.c"
+#line 2762 "SavedSearchDialog.c"
 	}
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) {
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2926 "SavedSearchDialog.c"
+#line 2772 "SavedSearchDialog.c"
 }
 
 
 GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) {
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self);
-#line 2935 "SavedSearchDialog.c"
+#line 2781 "SavedSearchDialog.c"
 }
 
 
 static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2944 "SavedSearchDialog.c"
+#line 2790 "SavedSearchDialog.c"
 }
 
 
 SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self);
-#line 2953 "SavedSearchDialog.c"
+#line 2799 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return;
-#line 2962 "SavedSearchDialog.c"
+#line 2808 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self));
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc);
-#line 2971 "SavedSearchDialog.c"
+#line 2817 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _tmp0_;
-#line 2981 "SavedSearchDialog.c"
+#line 2827 "SavedSearchDialog.c"
 }
 
 
 gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) {
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 2990 "SavedSearchDialog.c"
+#line 2836 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) {
 	SavedSearchDialogSearchRow* self = NULL;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3000 "SavedSearchDialog.c"
+#line 2846 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_init (GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 3007 "SavedSearchDialog.c"
+#line 2853 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_free_value (GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 3016 "SavedSearchDialog.c"
+#line 2862 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 3026 "SavedSearchDialog.c"
+#line 2872 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3030 "SavedSearchDialog.c"
+#line 2876 "SavedSearchDialog.c"
 	}
 }
 
 
 static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3038 "SavedSearchDialog.c"
+#line 2884 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 3045 "SavedSearchDialog.c"
+#line 2891 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRow * object;
 		object = collect_values[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3052 "SavedSearchDialog.c"
+#line 2898 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3056 "SavedSearchDialog.c"
+#line 2902 "SavedSearchDialog.c"
 		}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 3060 "SavedSearchDialog.c"
+#line 2906 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3064 "SavedSearchDialog.c"
+#line 2910 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3068 "SavedSearchDialog.c"
+#line 2914 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SavedSearchDialogSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3079 "SavedSearchDialog.c"
+#line 2925 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 3085 "SavedSearchDialog.c"
+#line 2931 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3089 "SavedSearchDialog.c"
+#line 2935 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3093 "SavedSearchDialog.c"
+#line 2939 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3097 "SavedSearchDialog.c"
+#line 2943 "SavedSearchDialog.c"
 }
 
 
 static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SavedSearchDialogParamSpecSearchRow* spec;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 3111 "SavedSearchDialog.c"
+#line 2957 "SavedSearchDialog.c"
 }
 
 
 static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3120 "SavedSearchDialog.c"
+#line 2966 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow * old;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3140 "SavedSearchDialog.c"
+#line 2986 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3144 "SavedSearchDialog.c"
+#line 2990 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3150 "SavedSearchDialog.c"
+#line 2996 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow * old;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3169 "SavedSearchDialog.c"
+#line 3015 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3173 "SavedSearchDialog.c"
+#line 3019 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3179 "SavedSearchDialog.c"
+#line 3025 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_search_condition;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete;
-#line 3197 "SavedSearchDialog.c"
+#line 3043 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3204 "SavedSearchDialog.c"
+#line 3050 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRow * self;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3214 "SavedSearchDialog.c"
+#line 3060 "SavedSearchDialog.c"
 }
 
 
@@ -3231,46 +3077,46 @@ static GType saved_search_dialog_search_row_get_type (void) {
 static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
 	SavedSearchDialogSearchRow * self;
 	self = instance;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3239 "SavedSearchDialog.c"
+#line 3085 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_unref (gpointer instance) {
 	SavedSearchDialogSearchRow * self;
 	self = instance;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3252 "SavedSearchDialog.c"
+#line 3098 "SavedSearchDialog.c"
 	}
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3260 "SavedSearchDialog.c"
+#line 3106 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3267 "SavedSearchDialog.c"
+#line 3113 "SavedSearchDialog.c"
 }
 
 
 static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3274 "SavedSearchDialog.c"
+#line 3120 "SavedSearchDialog.c"
 }
 
 
@@ -3298,116 +3144,116 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	GtkBox* _tmp19_;
 	GtkEntry* _tmp20_;
 	GtkBox* _tmp21_;
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->text_context = _tmp2_;
-#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->text_context;
-#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("contains"));
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->text_context;
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly"));
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->text_context;
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _ ("starts with"));
-#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->text_context;
-#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp6_, _ ("ends with"));
-#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->text_context;
-#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain"));
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->text_context;
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("is not set"));
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->text_context;
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("is set"));
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->text_context;
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->text_context;
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = (GtkEntry*) gtk_entry_new ();
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp12_);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->entry = _tmp12_;
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->entry;
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_width_chars (_tmp13_, 25);
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->entry;
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_activates_default (_tmp14_, TRUE);
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->entry;
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp16_);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp16_;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->box;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->text_context;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->box;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->entry;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->box;
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3404 "SavedSearchDialog.c"
+#line 3250 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3411 "SavedSearchDialog.c"
+#line 3257 "SavedSearchDialog.c"
 }
 
 
@@ -3416,17 +3262,17 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3430 "SavedSearchDialog.c"
+#line 3276 "SavedSearchDialog.c"
 }
 
 
@@ -3444,44 +3290,44 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	SearchConditionTextContext _tmp5_;
 	SearchConditionText* c = NULL;
 	SearchConditionText* _tmp6_;
-#line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = _tmp1_;
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp4_;
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = _tmp5_;
-#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_new (type, text, context);
-#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (text);
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3478 "SavedSearchDialog.c"
+#line 3324 "SavedSearchDialog.c"
 }
 
 
 static gpointer _search_condition_ref0 (gpointer self) {
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3485 "SavedSearchDialog.c"
+#line 3331 "SavedSearchDialog.c"
 }
 
 
@@ -3496,39 +3342,39 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 	GtkEntry* _tmp5_;
 	const gchar* _tmp6_;
 	const gchar* _tmp7_;
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL);
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp1_;
-#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (text != NULL, "text != null");
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->text_context;
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_text_get_context (text);
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->entry;
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_get_text (text);
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp5_, _tmp7_);
-#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed (self);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3532 "SavedSearchDialog.c"
+#line 3378 "SavedSearchDialog.c"
 }
 
 
@@ -3543,53 +3389,53 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gboolean _tmp7_;
-#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 213 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = string_chomp (_tmp4_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = g_strcmp0 (_tmp6_, "") != 0;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp6_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp7_) {
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3567 "SavedSearchDialog.c"
+#line 3413 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp8_;
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3574 "SavedSearchDialog.c"
+#line 3420 "SavedSearchDialog.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3580 "SavedSearchDialog.c"
+#line 3426 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp9_;
-#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3587 "SavedSearchDialog.c"
+#line 3433 "SavedSearchDialog.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3593 "SavedSearchDialog.c"
+#line 3439 "SavedSearchDialog.c"
 }
 
 
@@ -3597,17 +3443,17 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c
 	SearchConditionTextContext result = 0;
 	GtkComboBoxText* _tmp0_;
 	gint _tmp1_;
-#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = (SearchConditionTextContext) _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3611 "SavedSearchDialog.c"
+#line 3457 "SavedSearchDialog.c"
 }
 
 
@@ -3616,73 +3462,73 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	SearchConditionTextContext _tmp1_;
 	SavedSearchDialogSearchRowContainer* _tmp5_;
 	SavedSearchDialogSearchRowContainer* _tmp6_;
-#line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self));
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3628 "SavedSearchDialog.c"
+#line 3474 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp2_;
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3635 "SavedSearchDialog.c"
+#line 3481 "SavedSearchDialog.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3639 "SavedSearchDialog.c"
+#line 3485 "SavedSearchDialog.c"
 		GtkEntry* _tmp3_;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->entry;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3645 "SavedSearchDialog.c"
+#line 3491 "SavedSearchDialog.c"
 	} else {
 		GtkEntry* _tmp4_;
-#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->entry;
-#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3652 "SavedSearchDialog.c"
+#line 3498 "SavedSearchDialog.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->parent;
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_);
-#line 3660 "SavedSearchDialog.c"
+#line 3506 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass);
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_text_finalize;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate));
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_widget;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_search_condition;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete;
-#line 3679 "SavedSearchDialog.c"
+#line 3525 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3686 "SavedSearchDialog.c"
+#line 3532 "SavedSearchDialog.c"
 }
 
 
@@ -3692,31 +3538,31 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	guint _tmp1_;
 	GtkEntry* _tmp2_;
 	guint _tmp3_;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 151 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 160 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3720 "SavedSearchDialog.c"
+#line 3566 "SavedSearchDialog.c"
 }
 
 
@@ -3733,9 +3579,9 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3739 "SavedSearchDialog.c"
+#line 3585 "SavedSearchDialog.c"
 }
 
 
@@ -3760,104 +3606,104 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	GtkBox* _tmp16_;
 	GtkComboBoxText* _tmp17_;
 	GtkBox* _tmp18_;
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_context = _tmp2_;
-#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->media_context;
-#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("is"));
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->media_context;
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is not"));
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_context;
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->media_context;
-#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_type = _tmp7_;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->media_type;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("any photo"));
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->media_type;
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo"));
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->media_type;
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _ ("a video"));
-#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->media_type;
-#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->media_type;
-#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp13_);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp13_;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->box;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->media_context;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->box;
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->media_type;
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3854 "SavedSearchDialog.c"
+#line 3700 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3861 "SavedSearchDialog.c"
+#line 3707 "SavedSearchDialog.c"
 }
 
 
@@ -3866,17 +3712,17 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3880 "SavedSearchDialog.c"
+#line 3726 "SavedSearchDialog.c"
 }
 
 
@@ -3894,35 +3740,35 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	gint _tmp5_;
 	SearchConditionMediaType* c = NULL;
 	SearchConditionMediaType* _tmp6_;
-#line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionMediaTypeContext) _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->media_type;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = (SearchConditionMediaTypeMediaType) _tmp5_;
-#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_new (search_type, context, type);
-#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3926 "SavedSearchDialog.c"
+#line 3772 "SavedSearchDialog.c"
 }
 
 
@@ -3937,91 +3783,91 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 	GtkComboBoxText* _tmp5_;
 	SearchConditionMediaTypeMediaType _tmp6_;
 	SearchConditionMediaTypeMediaType _tmp7_;
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL);
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	media = _tmp1_;
-#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (media != NULL, "media != null");
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_media_type_get_context (media);
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_type;
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_get_media_type (media);
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 3971 "SavedSearchDialog.c"
+#line 3817 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowMediaType * self;
 	gboolean result = FALSE;
-#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3984 "SavedSearchDialog.c"
+#line 3830 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self));
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 3999 "SavedSearchDialog.c"
+#line 3845 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) {
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass);
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_media_type_finalize;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate));
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_widget;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_search_condition;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4018 "SavedSearchDialog.c"
+#line 3864 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 4025 "SavedSearchDialog.c"
+#line 3871 "SavedSearchDialog.c"
 }
 
 
@@ -4031,31 +3877,31 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->media_context;
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_type;
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 233 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 240 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 4059 "SavedSearchDialog.c"
+#line 3905 "SavedSearchDialog.c"
 }
 
 
@@ -4072,9 +3918,9 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 4078 "SavedSearchDialog.c"
+#line 3924 "SavedSearchDialog.c"
 }
 
 
@@ -4099,104 +3945,104 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	GtkBox* _tmp16_;
 	GtkComboBoxText* _tmp17_;
 	GtkBox* _tmp18_;
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_context = _tmp2_;
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->modified_context;
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("has"));
-#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->modified_context;
-#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("has no"));
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->modified_context;
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_state = _tmp7_;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->modified_state;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("modifications"));
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->modified_state;
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications"));
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->modified_state;
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications"));
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->modified_state;
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->modified_state;
-#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp13_);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp13_;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->box;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->modified_context;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->box;
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->modified_state;
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4193 "SavedSearchDialog.c"
+#line 4039 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4200 "SavedSearchDialog.c"
+#line 4046 "SavedSearchDialog.c"
 }
 
 
@@ -4205,17 +4051,17 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4219 "SavedSearchDialog.c"
+#line 4065 "SavedSearchDialog.c"
 }
 
 
@@ -4233,35 +4079,35 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	gint _tmp5_;
 	SearchConditionModified* c = NULL;
 	SearchConditionModified* _tmp6_;
-#line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionModifiedContext) _tmp3_;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->modified_state;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionModifiedState) _tmp5_;
-#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_new (search_type, context, state);
-#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4265 "SavedSearchDialog.c"
+#line 4111 "SavedSearchDialog.c"
 }
 
 
@@ -4276,91 +4122,91 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 	GtkComboBoxText* _tmp5_;
 	SearchConditionModifiedContext _tmp6_;
 	SearchConditionModifiedContext _tmp7_;
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL);
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	scm = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (scm != NULL, "scm != null");
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_state;
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_modified_get_state (scm);
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_get_context (scm);
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4310 "SavedSearchDialog.c"
+#line 4156 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowModified * self;
 	gboolean result = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4323 "SavedSearchDialog.c"
+#line 4169 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self));
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4338 "SavedSearchDialog.c"
+#line 4184 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) {
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass);
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_modified_finalize;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate));
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_widget;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_search_condition;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete;
-#line 4357 "SavedSearchDialog.c"
+#line 4203 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4364 "SavedSearchDialog.c"
+#line 4210 "SavedSearchDialog.c"
 }
 
 
@@ -4370,31 +4216,31 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->modified_state;
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 297 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4398 "SavedSearchDialog.c"
+#line 4244 "SavedSearchDialog.c"
 }
 
 
@@ -4411,9 +4257,9 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4417 "SavedSearchDialog.c"
+#line 4263 "SavedSearchDialog.c"
 }
 
 
@@ -4433,82 +4279,82 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 	GtkBox* _tmp11_;
 	GtkComboBoxText* _tmp12_;
 	GtkBox* _tmp13_;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->flagged_state = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->flagged_state;
-#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("flagged"));
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->flagged_state;
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged"));
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->flagged_state;
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->flagged_state;
-#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp7_;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->box;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkLabel*) gtk_label_new (_ ("is"));
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _tmp9_;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp10_);
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->box;
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->flagged_state;
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->box;
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4505 "SavedSearchDialog.c"
+#line 4351 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4512 "SavedSearchDialog.c"
+#line 4358 "SavedSearchDialog.c"
 }
 
 
@@ -4517,17 +4363,17 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4531 "SavedSearchDialog.c"
+#line 4377 "SavedSearchDialog.c"
 }
 
 
@@ -4542,29 +4388,29 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	gint _tmp3_;
 	SearchConditionFlagged* c = NULL;
 	SearchConditionFlagged* _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 391 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionFlaggedState) _tmp3_;
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_flagged_new (search_type, state);
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp4_;
-#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4568 "SavedSearchDialog.c"
+#line 4414 "SavedSearchDialog.c"
 }
 
 
@@ -4576,83 +4422,83 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia
 	GtkComboBoxText* _tmp2_;
 	SearchConditionFlaggedState _tmp3_;
 	SearchConditionFlaggedState _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL);
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	f = _tmp1_;
-#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (f != NULL, "f != null");
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_flagged_get_state (f);
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4602 "SavedSearchDialog.c"
+#line 4448 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowFlagged * self;
 	gboolean result = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4615 "SavedSearchDialog.c"
+#line 4461 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self));
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4630 "SavedSearchDialog.c"
+#line 4476 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) {
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass);
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_flagged_finalize;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate));
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_widget;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_search_condition;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4649 "SavedSearchDialog.c"
+#line 4495 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4656 "SavedSearchDialog.c"
+#line 4502 "SavedSearchDialog.c"
 }
 
 
@@ -4660,23 +4506,23 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->flagged_state;
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 360 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 365 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4680 "SavedSearchDialog.c"
+#line 4526 "SavedSearchDialog.c"
 }
 
 
@@ -4693,9 +4539,9 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4699 "SavedSearchDialog.c"
+#line 4545 "SavedSearchDialog.c"
 }
 
 
@@ -4735,150 +4581,150 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	GtkBox* _tmp31_;
 	GtkComboBoxText* _tmp32_;
 	GtkBox* _tmp33_;
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->rating = _tmp2_;
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->rating;
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = resources_rating_combo_box (RATING_REJECTED);
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = resources_rating_combo_box (RATING_UNRATED);
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->rating;
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = resources_rating_combo_box (RATING_ONE);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->rating;
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = resources_rating_combo_box (RATING_TWO);
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->rating;
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = resources_rating_combo_box (RATING_THREE);
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->rating;
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = resources_rating_combo_box (RATING_FOUR);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->rating;
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = resources_rating_combo_box (RATING_FIVE);
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->rating;
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->rating;
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp19_;
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->context;
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp20_, _ ("and higher"));
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->context;
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp21_, _ ("only"));
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->context;
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp22_, _ ("and lower"));
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->context;
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->context;
-#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp25_);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp25_;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new (_ ("is"));
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp27_);
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp28_ = _tmp27_;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp28_);
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp29_ = self->priv->box;
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = self->priv->rating;
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = self->priv->box;
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = self->priv->context;
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = self->priv->box;
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4875 "SavedSearchDialog.c"
+#line 4721 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4882 "SavedSearchDialog.c"
+#line 4728 "SavedSearchDialog.c"
 }
 
 
@@ -4887,17 +4733,17 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4901 "SavedSearchDialog.c"
+#line 4747 "SavedSearchDialog.c"
 }
 
 
@@ -4915,35 +4761,35 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	gint _tmp5_;
 	SearchConditionRating* c = NULL;
 	SearchConditionRating* _tmp6_;
-#line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->rating;
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_rating = ((Rating) _tmp3_) + RATING_REJECTED;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->context;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionRatingContext) _tmp5_;
-#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_new (search_type, search_rating, search_context);
-#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4947 "SavedSearchDialog.c"
+#line 4793 "SavedSearchDialog.c"
 }
 
 
@@ -4958,91 +4804,91 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 	GtkComboBoxText* _tmp5_;
 	Rating _tmp6_;
 	Rating _tmp7_;
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL);
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	r = _tmp1_;
-#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (r != NULL, "r != null");
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_rating_get_context (r);
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_get_rating (r);
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 4992 "SavedSearchDialog.c"
+#line 4838 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowRating * self;
 	gboolean result = FALSE;
-#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5005 "SavedSearchDialog.c"
+#line 4851 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self));
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 5020 "SavedSearchDialog.c"
+#line 4866 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) {
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass);
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_rating_finalize;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate));
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_widget;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_search_condition;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete;
-#line 5039 "SavedSearchDialog.c"
+#line 4885 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 5046 "SavedSearchDialog.c"
+#line 4892 "SavedSearchDialog.c"
 }
 
 
@@ -5052,31 +4898,31 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->rating;
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 411 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 418 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 5080 "SavedSearchDialog.c"
+#line 4926 "SavedSearchDialog.c"
 }
 
 
@@ -5093,23 +4939,23 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 5099 "SavedSearchDialog.c"
+#line 4945 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5106 "SavedSearchDialog.c"
+#line 4952 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5113 "SavedSearchDialog.c"
+#line 4959 "SavedSearchDialog.c"
 }
 
 
@@ -5142,150 +4988,150 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	GtkBox* _tmp24_;
 	GtkButton* _tmp25_;
 	GtkBox* _tmp26_;
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp2_;
-#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->context;
-#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly"));
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->context;
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is after"));
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->context;
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _ ("is before"));
-#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->context;
-#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp6_, _ ("is between"));
-#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->context;
-#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _ ("is not set"));
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->context;
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->context;
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = (GtkCalendar*) gtk_calendar_new ();
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp10_);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_one = _tmp10_;
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = (GtkCalendar*) gtk_calendar_new ();
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp11_);
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_two = _tmp11_;
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = (GtkButton*) gtk_button_new ();
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp12_);
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_one = _tmp12_;
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->label_one;
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = (GtkButton*) gtk_button_new ();
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp14_);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_two = _tmp14_;
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->label_two;
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = (GtkLabel*) gtk_label_new (_ ("and"));
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp16_);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->and = _tmp16_;
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp17_);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp17_;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->context;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->box;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->label_one;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->box;
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->and;
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->box;
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = self->priv->label_two;
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5282 "SavedSearchDialog.c"
+#line 5128 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5289 "SavedSearchDialog.c"
+#line 5135 "SavedSearchDialog.c"
 }
 
 
@@ -5304,110 +5150,110 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	GDateTime* _tmp20_;
 	gchar* _tmp21_;
 	gchar* _tmp22_;
-#line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = (SearchConditionDateContext) _tmp1_;
-#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = c;
-#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5320 "SavedSearchDialog.c"
+#line 5166 "SavedSearchDialog.c"
 		GtkButton* _tmp3_;
 		GtkLabel* _tmp4_;
 		GtkButton* _tmp5_;
-#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->label_one;
-#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->and;
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = self->priv->label_two;
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5336 "SavedSearchDialog.c"
+#line 5182 "SavedSearchDialog.c"
 	} else {
 		SearchConditionDateContext _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = c;
-#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5343 "SavedSearchDialog.c"
+#line 5189 "SavedSearchDialog.c"
 			GtkButton* _tmp7_;
 			GtkLabel* _tmp8_;
 			GtkButton* _tmp9_;
-#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = self->priv->label_one;
-#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = self->priv->and;
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->label_two;
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5359 "SavedSearchDialog.c"
+#line 5205 "SavedSearchDialog.c"
 		} else {
 			GtkButton* _tmp10_;
 			GtkLabel* _tmp11_;
 			GtkButton* _tmp12_;
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = self->priv->label_one;
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = self->priv->and;
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp12_ = self->priv->label_two;
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5376 "SavedSearchDialog.c"
+#line 5222 "SavedSearchDialog.c"
 		}
 	}
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->label_one;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = _tmp16_;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp13_, _tmp17_);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp17_);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp15_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->label_two;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _tmp19_;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = _tmp21_;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp18_, _tmp22_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp22_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp20_);
-#line 5411 "SavedSearchDialog.c"
+#line 5257 "SavedSearchDialog.c"
 }
 
 
@@ -5416,17 +5262,17 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5430 "SavedSearchDialog.c"
+#line 5276 "SavedSearchDialog.c"
 }
 
 
@@ -5442,33 +5288,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	gint _tmp7_;
 	gint _tmp8_;
 	GDateTime* _tmp9_;
-#line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5472 "SavedSearchDialog.c"
+#line 5318 "SavedSearchDialog.c"
 }
 
 
@@ -5484,33 +5330,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	gint _tmp7_;
 	gint _tmp8_;
 	GDateTime* _tmp9_;
-#line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5514 "SavedSearchDialog.c"
+#line 5360 "SavedSearchDialog.c"
 }
 
 
@@ -5524,35 +5370,35 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 	GtkCalendar* _tmp6_;
 	GDateTime* _tmp7_;
 	gint _tmp8_;
-#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5556 "SavedSearchDialog.c"
+#line 5402 "SavedSearchDialog.c"
 }
 
 
@@ -5566,35 +5412,35 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 	GtkCalendar* _tmp6_;
 	GDateTime* _tmp7_;
 	gint _tmp8_;
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5598 "SavedSearchDialog.c"
+#line 5444 "SavedSearchDialog.c"
 }
 
 
@@ -5614,43 +5460,43 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	GDateTime* _tmp7_;
 	SearchConditionDate* _tmp8_;
 	SearchConditionDate* _tmp9_;
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionDateContext) _tmp3_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp9_;
-#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5654 "SavedSearchDialog.c"
+#line 5500 "SavedSearchDialog.c"
 }
 
 
@@ -5666,136 +5512,136 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog
 	GDateTime* _tmp6_;
 	GDateTime* _tmp7_;
 	GDateTime* _tmp8_;
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	cond = _tmp1_;
-#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (cond != NULL, "cond != null");
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_date_get_context (cond);
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = search_condition_date_get_date_one (cond);
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_one (self, _tmp6_);
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = search_condition_date_get_date_two (cond);
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_two (self, _tmp8_);
-#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5706 "SavedSearchDialog.c"
+#line 5552 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowDate * self;
 	gboolean result = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5719 "SavedSearchDialog.c"
+#line 5565 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5736 "SavedSearchDialog.c"
+#line 5582 "SavedSearchDialog.c"
 }
 
 
 static Block10Data* block10_data_ref (Block10Data* _data10_) {
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&_data10_->_ref_count_);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data10_;
-#line 5745 "SavedSearchDialog.c"
+#line 5591 "SavedSearchDialog.c"
 }
 
 
 static void block10_data_unref (void * _userdata_) {
 	Block10Data* _data10_;
 	_data10_ = (Block10Data*) _userdata_;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
-#line 5754 "SavedSearchDialog.c"
+#line 5600 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data10_->self;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_data10_->d);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_unref0 (self);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block10Data, _data10_);
-#line 5764 "SavedSearchDialog.c"
+#line 5610 "SavedSearchDialog.c"
 	}
 }
 
 
-static void __lambda13_ (SavedSearchDialogSearchRowDate* self) {
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void __lambda14_ (SavedSearchDialogSearchRowDate* self) {
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5772 "SavedSearchDialog.c"
+#line 5618 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	__lambda13_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5779 "SavedSearchDialog.c"
+static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	__lambda14_ ((SavedSearchDialogSearchRowDate*) self);
+#line 5625 "SavedSearchDialog.c"
 }
 
 
-static void __lambda14_ (Block10Data* _data10_) {
+static void __lambda15_ (Block10Data* _data10_) {
 	SavedSearchDialogSearchRowDate* self;
 	GtkDialog* _tmp0_;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = _data10_->self;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = _data10_->d;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5792 "SavedSearchDialog.c"
+#line 5638 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	__lambda14_ (self);
-#line 5799 "SavedSearchDialog.c"
+static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	__lambda15_ (self);
+#line 5645 "SavedSearchDialog.c"
 }
 
 
@@ -5836,192 +5682,192 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	GtkCalendar* _tmp32_;
 	gulong _tmp33_;
 	GtkDialog* _tmp34_;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (GTK_IS_CALENDAR (cal));
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = g_slice_new0 (Block10Data);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->_ref_count_ = 1;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->self = saved_search_dialog_search_row_ref (self);
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = cal;
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "day", &_tmp1_, NULL);
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_day = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = cal;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_month = _tmp5_;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = cal;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "year", &_tmp7_, NULL);
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_year = _tmp8_;
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL);
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->d = _tmp9_;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _data10_->d;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _data10_->d;
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _data10_->d;
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _data10_->d;
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = cal;
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = cal;
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self);
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self);
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_1 = _tmp17_;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = cal;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_2 = _tmp19_;
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _data10_->d;
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = _data10_->d;
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = gtk_dialog_run (_tmp21_);
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	res = _tmp22_;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = res;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 5926 "SavedSearchDialog.c"
+#line 5772 "SavedSearchDialog.c"
 		GtkCalendar* _tmp24_;
 		gint _tmp25_;
 		GtkCalendar* _tmp26_;
 		gint _tmp27_;
 		GtkCalendar* _tmp28_;
 		gint _tmp29_;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp24_ = cal;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp25_ = orig_day;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp24_, "day", _tmp25_, NULL);
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp26_ = cal;
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = orig_month;
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp26_, "month", _tmp27_, NULL);
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = cal;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = orig_year;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 5951 "SavedSearchDialog.c"
+#line 5797 "SavedSearchDialog.c"
 	}
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = id_1;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_);
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = cal;
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = id_2;
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_);
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp34_ = _data10_->d;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	block10_data_unref (_data10_);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = NULL;
-#line 5975 "SavedSearchDialog.c"
+#line 5821 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5987 "SavedSearchDialog.c"
+#line 5833 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_;
-#line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5999 "SavedSearchDialog.c"
+#line 5845 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) {
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass);
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_date_finalize;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate));
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_widget;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_search_condition;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete;
-#line 6018 "SavedSearchDialog.c"
+#line 5864 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 6025 "SavedSearchDialog.c"
+#line 5871 "SavedSearchDialog.c"
 }
 
 
@@ -6029,33 +5875,33 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	SavedSearchDialogSearchRowDate * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 480 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 481 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 486 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 488 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 492 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 6059 "SavedSearchDialog.c"
+#line 5905 "SavedSearchDialog.c"
 }
 
 
@@ -6071,288 +5917,82 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 }
 
 
-static void value_saved_search_dialog_init (GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	value->data[0].v_pointer = NULL;
-#line 6078 "SavedSearchDialog.c"
-}
-
-
-static void value_saved_search_dialog_free_value (GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (value->data[0].v_pointer);
-#line 6087 "SavedSearchDialog.c"
-	}
-}
-
-
-static void value_saved_search_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (src_value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer);
-#line 6097 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 6101 "SavedSearchDialog.c"
-	}
-}
-
-
-static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return value->data[0].v_pointer;
-#line 6109 "SavedSearchDialog.c"
-}
-
-
-static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (collect_values[0].v_pointer) {
-#line 6116 "SavedSearchDialog.c"
-		SavedSearchDialog * object;
-		object = collect_values[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6123 "SavedSearchDialog.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6127 "SavedSearchDialog.c"
-		}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6131 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6135 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return NULL;
-#line 6139 "SavedSearchDialog.c"
-}
-
-
-static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchDialog ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (!object_p) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6150 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (!value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = NULL;
-#line 6156 "SavedSearchDialog.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = value->data[0].v_pointer;
-#line 6160 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6164 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return NULL;
-#line 6168 "SavedSearchDialog.c"
-}
-
-
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecSavedSearchDialog* spec;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_DIALOG), NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return G_PARAM_SPEC (spec);
-#line 6182 "SavedSearchDialog.c"
-}
-
-
-gpointer value_get_saved_search_dialog (const GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return value->data[0].v_pointer;
-#line 6191 "SavedSearchDialog.c"
-}
-
-
-void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog * old;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	old = value->data[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (v_object) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = v_object;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6211 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6215 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (old) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (old);
-#line 6221 "SavedSearchDialog.c"
-	}
-}
-
-
-void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog * old;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	old = value->data[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (v_object) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = v_object;
-#line 6240 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6244 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (old) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (old);
-#line 6250 "SavedSearchDialog.c"
-	}
-}
-
-
 static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gint SavedSearchDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate));
-#line 6262 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = saved_search_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	SavedSearchDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/saved_search_dialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "add_criteria", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, add_criteria));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "operator", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, operator));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "search_title", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, search_title));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "row_listbox", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, row_listbox));
+#line 5941 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	GeeArrayList* _tmp0_;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, (GDestroyNotify) saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->row_list = _tmp0_;
-#line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = FALSE;
-#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->previous_search = NULL;
-#line 646 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->valid = FALSE;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->ref_count = 1;
-#line 6282 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 5961 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_finalize (SavedSearchDialog * obj) {
+static void saved_search_dialog_finalize (GObject * obj) {
 	SavedSearchDialog * self;
-	GtkEntry* _tmp0_;
-	guint _tmp1_;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_destroy (self);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->search_title;
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp1_, NULL, FALSE);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->add_criteria);
-#line 640 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->operator);
-#line 641 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->row_box);
-#line 642 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 647 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_title);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (self->priv->row_listbox);
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->row_list);
-#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 6316 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	G_OBJECT_CLASS (saved_search_dialog_parent_class)->finalize (obj);
+#line 5983 "SavedSearchDialog.c"
 }
 
 
 GType saved_search_dialog_get_type (void) {
 	static volatile gsize saved_search_dialog_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_saved_search_dialog_init, value_saved_search_dialog_free_value, value_saved_search_dialog_copy_value, value_saved_search_dialog_peek_pointer, "p", value_saved_search_dialog_collect_value, "p", value_saved_search_dialog_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, NULL };
 		GType saved_search_dialog_type_id;
-		saved_search_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SavedSearchDialog", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		saved_search_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SavedSearchDialog", &g_define_type_info, 0);
 		g_once_init_leave (&saved_search_dialog_type_id__volatile, saved_search_dialog_type_id);
 	}
 	return saved_search_dialog_type_id__volatile;
 }
 
 
-gpointer saved_search_dialog_ref (gpointer instance) {
-	SavedSearchDialog * self;
-	self = instance;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return instance;
-#line 6341 "SavedSearchDialog.c"
-}
-
-
-void saved_search_dialog_unref (gpointer instance) {
-	SavedSearchDialog * self;
-	self = instance;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6354 "SavedSearchDialog.c"
-	}
-}
-
-
 
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index 5365cde..d31140a 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -5,7 +5,8 @@
  */
 
 // This dialog displays a boolean search configuration.
-public class SavedSearchDialog {
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/saved_search_dialog.ui")]
+public class SavedSearchDialog : Gtk.Dialog {
     
     // Contains a search row, with a type selector and remove button.
     private class SearchRowContainer {
@@ -47,12 +48,17 @@ public class SavedSearchDialog {
             set_type_combo_box(SearchCondition.SearchType.ANY_TEXT); // Sets default.
             type_combo.changed.connect(on_type_changed);
             
-            remove_button = new Gtk.Button.from_icon_name("list-remove-symbolic", Gtk.IconSize.BUTTON);
-            remove_button.button_press_event.connect(on_removed);
+            remove_button = new Gtk.Button.from_icon_name("window-close-symbolic", Gtk.IconSize.BUTTON);
+            remove_button.set_relief(Gtk.ReliefStyle.NONE);
+            remove_button.clicked.connect(on_removed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
             box.pack_start(type_combo, false, false, 0);
             box.pack_end(remove_button, false, false, 0);
+            box.margin_top = 2;
+            box.margin_bottom = 2;
+            box.margin_start = 8;
+            box.margin_end = 8;
             box.show_all();
         }
         
@@ -110,9 +116,8 @@ public class SavedSearchDialog {
             return search_types[type_combo.get_active()];
         }
         
-        private bool on_removed(Gdk.EventButton event) {
+        private void on_removed() {
             remove(this);
-            return false;
         }
         
         public void allow_removal(bool allow) {
@@ -634,18 +639,23 @@ public class SavedSearchDialog {
         }
     }
     
-    private Gtk.Builder builder;
-    private Gtk.Dialog dialog;
+    [GtkChild]
     private Gtk.Button add_criteria;
+    [GtkChild]
     private Gtk.ComboBoxText operator;
-    private Gtk.Box row_box;
+    [GtkChild]
     private Gtk.Entry search_title;
+    [GtkChild]
+    private Gtk.ListBox row_listbox;
+
     private Gee.ArrayList<SearchRowContainer> row_list = new Gee.ArrayList<SearchRowContainer>();
     private bool edit_mode = false;
     private SavedSearch? previous_search = null;
     private bool valid = false;
     
     public SavedSearchDialog() {
+        Object (use_header_bar : Resources.use_header_bar());
+
         setup_dialog();
         
         // Default name.
@@ -656,16 +666,18 @@ public class SavedSearchDialog {
         add_text_search();
         row_list.get(0).allow_removal(false);
 
-        dialog.show_all();
+        show_all();
         set_valid(false);
     }
     
     public SavedSearchDialog.edit_existing(SavedSearch saved_search) {
+        Object (use_header_bar : Resources.use_header_bar());
+
         previous_search = saved_search;
         edit_mode = true;
         setup_dialog();
         
-        dialog.show_all();
+        show_all();
         
         // Load existing search into dialog.
         operator.set_active((SearchOperator) saved_search.get_operator());
@@ -680,55 +692,25 @@ public class SavedSearchDialog {
         set_valid(true);
     }
     
-    ~SavedSearchDialog() {
-        search_title.changed.disconnect(on_title_changed);
-    }
-    
     // Builds the dialog UI.  Doesn't add buttons to the dialog or call dialog.show().
     private void setup_dialog() {
-        builder = AppWindow.create_builder();
-
-        dialog = new Gtk.Dialog.with_buttons(_("Search"),
-                                         (Gtk.Window) AppWindow.get_instance().get_parent_window(),
-                                         Gtk.DialogFlags.MODAL |
-                                         Gtk.DialogFlags.DESTROY_WITH_PARENT |
-                                         Gtk.DialogFlags.USE_HEADER_BAR,
-                                         _("Cancel"), Gtk.ResponseType.CANCEL,
-                                         _("OK"), Gtk.ResponseType.OK,
-                                         null);
-        dialog.set_resizable(false);
-        dialog.set_transient_for(AppWindow.get_instance());
-        dialog.set_default_response(Gtk.ResponseType.OK);
-        dialog.response.connect(on_response);
-        dialog.get_content_area().add(builder.get_object("criteria") as Gtk.Widget);
-        dialog.set_default_response (Gtk.ResponseType.OK);
+        set_transient_for(AppWindow.get_instance());
+        response.connect(on_response);
 
-        add_criteria = builder.get_object("Add search button") as Gtk.Button;
-        add_criteria.button_press_event.connect(on_add_criteria);
+        add_criteria.clicked.connect(on_add_criteria);
         
-        search_title = builder.get_object("Search title") as Gtk.Entry;
-        search_title.set_activates_default(true);
         search_title.changed.connect(on_title_changed);
-        
-        row_box = builder.get_object("row_box") as Gtk.Box;
-        
-        operator = builder.get_object("Type of search criteria") as Gtk.ComboBoxText;
-        operator.append_text(_("any"));
-        operator.append_text(_("all"));
-        operator.append_text(_("none"));
-        operator.set_active(0);
     }
     
     // Displays the dialog.
-    public void show() {
-        dialog.run();
-        dialog.destroy();
+    public new void show() {
+        run();
+        destroy();
     }
     
     // Adds a row of search criteria.
-    private bool on_add_criteria(Gdk.EventButton event) {
+    private void on_add_criteria() {
         add_text_search();
-        return false;
     }
     
     private void add_text_search() {
@@ -740,7 +722,7 @@ public class SavedSearchDialog {
     private void add_row(SearchRowContainer row) {
         if (row_list.size == 1)
             row_list.get(0).allow_removal(true);
-        row_box.add(row.get_widget());
+        row_listbox.add(row.get_widget());
         row_list.add(row);
         row.remove.connect(on_remove_row);
         row.changed.connect(on_row_changed);
@@ -751,7 +733,7 @@ public class SavedSearchDialog {
     private void on_remove_row(SearchRowContainer row) {
         row.remove.disconnect(on_remove_row);
         row.changed.disconnect(on_row_changed);
-        row_box.remove(row.get_widget());
+        row_listbox.remove(row.get_widget().get_parent());
         row_list.remove(row);
         if (row_list.size == 1)
             row_list.get(0).allow_removal(false);
@@ -820,6 +802,6 @@ public class SavedSearchDialog {
             }
         }
         
-        dialog.set_response_sensitive(Gtk.ResponseType.OK, valid);
+        set_response_sensitive(Gtk.ResponseType.OK, valid);
     }
 }
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 92f433b..57c205f 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -451,7 +451,6 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 struct _ViewManager {
 	GTypeInstance parent_instance;
@@ -808,12 +807,6 @@ 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);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search);
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search);
@@ -828,7 +821,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 832 "SavedSearchPage.c"
+#line 825 "SavedSearchPage.c"
 }
 
 
@@ -855,14 +848,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 859 "SavedSearchPage.c"
+#line 852 "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 866 "SavedSearchPage.c"
+#line 859 "SavedSearchPage.c"
 }
 
 
@@ -886,7 +879,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 890 "SavedSearchPage.c"
+#line 883 "SavedSearchPage.c"
 }
 
 
@@ -899,14 +892,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 = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view;
-#line 903 "SavedSearchPage.c"
+#line 896 "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 910 "SavedSearchPage.c"
+#line 903 "SavedSearchPage.c"
 }
 
 
@@ -918,7 +911,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 922 "SavedSearchPage.c"
+#line 915 "SavedSearchPage.c"
 }
 
 
@@ -937,21 +930,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 941 "SavedSearchPage.c"
+#line 934 "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 948 "SavedSearchPage.c"
+#line 941 "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 955 "SavedSearchPage.c"
+#line 948 "SavedSearchPage.c"
 }
 
 
@@ -982,7 +975,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 986 "SavedSearchPage.c"
+#line 979 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_;
@@ -1011,7 +1004,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 1015 "SavedSearchPage.c"
+#line 1008 "SavedSearchPage.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
@@ -1033,7 +1026,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 1037 "SavedSearchPage.c"
+#line 1030 "SavedSearchPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp13_ = _sources_it;
@@ -1065,24 +1058,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 1069 "SavedSearchPage.c"
+#line 1062 "SavedSearchPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 1073 "SavedSearchPage.c"
+#line 1066 "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 1079 "SavedSearchPage.c"
+#line 1072 "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 1086 "SavedSearchPage.c"
+#line 1079 "SavedSearchPage.c"
 }
 
 
@@ -1112,13 +1105,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 1116 "SavedSearchPage.c"
+#line 1109 "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 1122 "SavedSearchPage.c"
+#line 1115 "SavedSearchPage.c"
 	}
 }
 
@@ -1143,7 +1136,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 1147 "SavedSearchPage.c"
+#line 1140 "SavedSearchPage.c"
 }
 
 
@@ -1163,7 +1156,7 @@ 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 1167 "SavedSearchPage.c"
+#line 1160 "SavedSearchPage.c"
 }
 
 
@@ -1183,7 +1176,7 @@ static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_action_map_add_action_entries (_tmp1_, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self);
-#line 1187 "SavedSearchPage.c"
+#line 1180 "SavedSearchPage.c"
 }
 
 
@@ -1198,7 +1191,7 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 	_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"
+#line 1195 "SavedSearchPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1210,11 +1203,11 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 		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"
+#line 1207 "SavedSearchPage.c"
 			GActionEntry entry = {0};
 #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			entry = entry_collection[entry_it];
-#line 1218 "SavedSearchPage.c"
+#line 1211 "SavedSearchPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1227,7 +1220,7 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1231 "SavedSearchPage.c"
+#line 1224 "SavedSearchPage.c"
 			}
 		}
 	}
@@ -1245,7 +1238,7 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
-#line 1249 "SavedSearchPage.c"
+#line 1242 "SavedSearchPage.c"
 		CommandManager* _tmp2_;
 		CommandManager* _tmp3_;
 		SavedSearch* _tmp4_;
@@ -1267,7 +1260,7 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1271 "SavedSearchPage.c"
+#line 1264 "SavedSearchPage.c"
 	}
 }
 
@@ -1288,7 +1281,7 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 	library_window_rename_search_in_sidebar (_tmp1_, _tmp2_);
 #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1292 "SavedSearchPage.c"
+#line 1285 "SavedSearchPage.c"
 }
 
 
@@ -1303,12 +1296,14 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = saved_search_dialog_new_edit_existing (_tmp0_);
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	g_object_ref_sink (_tmp1_);
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	ssd = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_dialog_show (ssd);
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_saved_search_dialog_unref0 (ssd);
-#line 1312 "SavedSearchPage.c"
+	_g_object_unref0 (ssd);
+#line 1307 "SavedSearchPage.c"
 }
 
 
@@ -1330,7 +1325,7 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou
 	_tmp1_ = count;
 #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 1334 "SavedSearchPage.c"
+#line 1329 "SavedSearchPage.c"
 }
 
 
@@ -1353,14 +1348,14 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) 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 1357 "SavedSearchPage.c"
+#line 1352 "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 1364 "SavedSearchPage.c"
+#line 1359 "SavedSearchPage.c"
 }
 
 
@@ -1372,7 +1367,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 1376 "SavedSearchPage.c"
+#line 1371 "SavedSearchPage.c"
 }
 
 
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index a32204d..12966d0 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -748,10 +748,10 @@ enum  {
 };
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
 void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda12_ (void* a, void* b);
+static gint __lambda13_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda12____compar_fn_t (void* key1, void* key2);
+static gint ___lambda13____compar_fn_t (void* key1, void* key2);
 gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
 gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
@@ -1162,7 +1162,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 }
 
 
-static gint __lambda12_ (void* a, void* b) {
+static gint __lambda13_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	gchar* _tmp1_;
@@ -1187,9 +1187,9 @@ static gint __lambda12_ (void* a, void* b) {
 }
 
 
-static gint ___lambda12____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda13____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda12_ (key1, key2);
+	result = __lambda13_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
 #line 1196 "SearchBoolean.c"
@@ -1210,7 +1210,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1__length1 = *array_length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t);
+	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t);
 #line 1215 "SearchBoolean.c"
 }
 
@@ -5665,7 +5665,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5658 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch86_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);
@@ -5681,8 +5681,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5673 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally86;
+	__catch86_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -5698,7 +5698,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5690 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally86:
 #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"
@@ -5811,7 +5811,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 5804 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch87_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);
@@ -5822,8 +5822,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5813 "SearchBoolean.c"
 		}
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally87;
+	__catch87_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -5843,7 +5843,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5835 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally87:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5840 "SearchBoolean.c"
@@ -6019,7 +6019,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 6012 "SearchBoolean.c"
-				goto __catch80_database_error;
+				goto __catch88_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);
@@ -6108,8 +6108,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6100 "SearchBoolean.c"
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally88;
+	__catch88_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_;
@@ -6125,7 +6125,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6117 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally88:
 #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"
@@ -6258,7 +6258,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 6251 "SearchBoolean.c"
-				goto __catch81_database_error;
+				goto __catch89_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6280,8 +6280,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6272 "SearchBoolean.c"
 	}
-	goto __finally81;
-	__catch81_database_error:
+	goto __finally89;
+	__catch89_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -6297,7 +6297,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6289 "SearchBoolean.c"
 	}
-	__finally81:
+	__finally89:
 #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"
@@ -6362,7 +6362,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 6355 "SearchBoolean.c"
-				goto __catch82_database_error;
+				goto __catch90_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);
@@ -6373,8 +6373,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6364 "SearchBoolean.c"
 		}
 	}
-	goto __finally82;
-	__catch82_database_error:
+	goto __finally90;
+	__catch90_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -6390,7 +6390,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6382 "SearchBoolean.c"
 	}
-	__finally82:
+	__finally90:
 #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/Branch.c b/src/searches/SearchesBranch.c
index a1664ff..dfa635b 100644
--- a/src/searches/Branch.c
+++ b/src/searches/SearchesBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* SearchesBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from SearchesBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -541,8 +541,8 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 enum  {
 	SEARCHES_HEADER_DUMMY_PROPERTY
 };
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 static void searches_header_setup_context_menu (SearchesHeader* self);
 gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -606,25 +606,25 @@ static void searches_sidebar_entry_finalize (GObject * obj);
 
 
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 612 "Branch.c"
+#line 612 "SearchesBranch.c"
 }
 
 
 static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 619 "Branch.c"
+#line 619 "SearchesBranch.c"
 }
 
 
 static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 628 "Branch.c"
+#line 628 "SearchesBranch.c"
 }
 
 
@@ -636,15 +636,15 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	SavedSearchTable* _tmp14_;
 	SavedSearchTable* _tmp15_;
 	SavedSearchTable* _tmp16_;
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = searches_header_new ();
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 648 "Branch.c"
+#line 648 "SearchesBranch.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp2_;
@@ -653,87 +653,87 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 		GeeCollection* _tmp5_;
 		GeeIterator* _tmp6_;
 		GeeIterator* _tmp7_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp2_ = saved_search_table_get_instance ();
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp4_ = saved_search_table_get_all (_tmp3_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp7_ = _tmp6_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (_tmp5_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_saved_search_table_unref0 (_tmp3_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_search_it = _tmp7_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		while (TRUE) {
-#line 677 "Branch.c"
+#line 677 "SearchesBranch.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			SavedSearch* search = NULL;
 			GeeIterator* _tmp10_;
 			gpointer _tmp11_;
 			SavedSearch* _tmp12_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp8_ = _search_it;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			if (!_tmp9_) {
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 				break;
-#line 692 "Branch.c"
+#line 692 "SearchesBranch.c"
 			}
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp10_ = _search_it;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			search = (SavedSearch*) _tmp11_;
-#line 20 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp12_ = search;
-#line 20 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			searches_branch_on_saved_search_added (self, _tmp12_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_g_object_unref0 (search);
-#line 706 "Branch.c"
+#line 706 "SearchesBranch.c"
 		}
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (_search_it);
-#line 710 "Branch.c"
+#line 710 "SearchesBranch.c"
 	}
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp13_ = saved_search_table_get_instance ();
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp14_ = _tmp13_;
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_connect_object (_tmp14_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0);
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp14_);
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp15_ = saved_search_table_get_instance ();
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp16_ = _tmp15_;
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_connect_object (_tmp16_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0);
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp16_);
-#line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 730 "Branch.c"
+#line 730 "SearchesBranch.c"
 }
 
 
 SearchesBranch* searches_branch_new (void) {
-#line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 737 "Branch.c"
+#line 737 "SearchesBranch.c"
 }
 
 
@@ -742,21 +742,21 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 	GeeHashMap* _tmp0_;
 	SavedSearch* _tmp1_;
 	gpointer _tmp2_;
-#line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
-#line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = search;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = (SearchesSidebarEntry*) _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 760 "Branch.c"
+#line 760 "SearchesBranch.c"
 }
 
 
@@ -769,37 +769,37 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	SidebarEntry* _tmp4_;
 	SavedSearch* _tmp5_;
 	gint _tmp6_;
-#line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = a;
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = b;
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		result = 0;
-#line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		return result;
-#line 787 "Branch.c"
+#line 787 "SearchesBranch.c"
 	}
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp2_ = a;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp3_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp4_ = b;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp5_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp6_ = saved_search_compare_names (_tmp3_, _tmp5_);
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = _tmp6_;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 803 "Branch.c"
+#line 803 "SearchesBranch.c"
 }
 
 
@@ -811,35 +811,35 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 	SavedSearch* _tmp3_;
 	SidebarEntry* _tmp4_;
 	SidebarEntry* _tmp5_;
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 45 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_debug ("Branch.vala:45: search added");
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_debug ("SearchesBranch.vala:45: search added");
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = search;
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = searches_sidebar_entry_new (_tmp0_);
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	entry = _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp2_ = self->priv->entry_map;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp3_ = search;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (_tmp5_);
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (entry);
-#line 843 "Branch.c"
+#line 843 "SearchesBranch.c"
 }
 
 
@@ -852,60 +852,60 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved
 	GeeHashMap* _tmp3_;
 	SavedSearch* _tmp4_;
 	gboolean _tmp5_;
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 52 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_debug ("Branch.vala:52: search removed");
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_debug ("SearchesBranch.vala:52: search removed");
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = search;
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	entry = (SearchesSidebarEntry*) _tmp2_;
-#line 54 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 54 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_vala_assert (entry != NULL, "entry != null");
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp4_ = search;
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	is_removed = _tmp5_;
-#line 57 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_vala_assert (is_removed, "is_removed");
-#line 59 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (entry);
-#line 886 "Branch.c"
+#line 886 "SearchesBranch.c"
 }
 
 
 static void searches_branch_class_init (SearchesBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 897 "Branch.c"
+#line 897 "SearchesBranch.c"
 }
 
 
 static void searches_branch_instance_init (SearchesBranch * self) {
 	GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 909 "Branch.c"
+#line 909 "SearchesBranch.c"
 }
 
 
@@ -917,33 +917,33 @@ static void searches_branch_finalize (GObject * obj) {
 	SavedSearchTable* _tmp3_;
 	SavedSearchTable* _tmp4_;
 	guint _tmp5_;
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = saved_search_table_get_instance ();
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_parse_name ("search-added", TYPE_SAVED_SEARCH_TABLE, &_tmp2_, NULL, FALSE);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp3_ = saved_search_table_get_instance ();
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_parse_name ("search-removed", TYPE_SAVED_SEARCH_TABLE, &_tmp5_, NULL, FALSE);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp4_);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->entry_map);
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 947 "Branch.c"
+#line 947 "SearchesBranch.c"
 }
 
 
@@ -961,42 +961,42 @@ GType searches_branch_get_type (void) {
 
 SearchesHeader* searches_header_construct (GType object_type) {
 	SearchesHeader * self = NULL;
-#line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), TRUE);
-#line 69 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), _ ("Organize your saved searches"), TRUE);
+#line 69 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_header_setup_context_menu (self);
-#line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 971 "Branch.c"
+#line 971 "SearchesBranch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
-#line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 978 "Branch.c"
+#line 978 "SearchesBranch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 985 "Branch.c"
+#line 985 "SearchesBranch.c"
 }
 
 
 static void searches_header_setup_context_menu (SearchesHeader* self) {
 	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (SEARCHES_IS_HEADER (self));
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->builder = _tmp0_;
-#line 1000 "Branch.c"
+#line 1000 "SearchesBranch.c"
 	{
 		GtkBuilder* _tmp1_;
 		gchar* _tmp2_;
@@ -1007,45 +1007,45 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		GMenuModel* _tmp6_;
 		GMenuModel* _tmp7_;
 		GtkMenu* _tmp8_;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp1_ = self->priv->builder;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp2_ = resources_get_ui ("search_sidebar_context.ui");
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_free0 (_tmp3_);
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1023 "Branch.c"
-			goto __catch77_g_error;
+#line 1023 "SearchesBranch.c"
+			goto __catch85_g_error;
 		}
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp4_ = self->priv->builder;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		model = _tmp6_;
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp7_ = model;
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		g_object_ref_sink (_tmp8_);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		self->priv->context_menu = _tmp8_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (model);
-#line 1046 "Branch.c"
+#line 1046 "SearchesBranch.c"
 	}
-	goto __finally77;
-	__catch77_g_error:
+	goto __finally85;
+	__catch85_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp9_;
@@ -1054,44 +1054,44 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		gchar* _tmp12_;
 		Application* _tmp13_;
 		Application* _tmp14_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_error_ = _inner_error_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_inner_error_ = NULL;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp9_ = _error_;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp10_ = _tmp9_->message;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp12_ = _tmp11_;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		app_window_error_message (_tmp12_, NULL);
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_free0 (_tmp12_);
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp13_ = application_get_instance ();
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp14_ = _tmp13_;
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		application_panic (_tmp14_);
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_application_unref0 (_tmp14_);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_error_free0 (_error_);
-#line 1084 "Branch.c"
+#line 1084 "SearchesBranch.c"
 	}
-	__finally77:
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+	__finally85:
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		g_clear_error (&_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		return;
-#line 1095 "Branch.c"
+#line 1095 "SearchesBranch.c"
 	}
 }
 
@@ -1101,60 +1101,60 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_;
 	GtkMenu* _tmp1_;
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = _tmp1_;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1115 "Branch.c"
+#line 1115 "SearchesBranch.c"
 }
 
 
 static void searches_header_class_init (SearchesHeaderClass * klass) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_header_parent_class = g_type_class_peek_parent (klass);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1126 "Branch.c"
+#line 1126 "SearchesBranch.c"
 }
 
 
 static void searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1135 "Branch.c"
+#line 1135 "SearchesBranch.c"
 }
 
 
 static void searches_header_instance_init (SearchesHeader * self) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
-#line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->context_menu = NULL;
-#line 1144 "Branch.c"
+#line 1144 "SearchesBranch.c"
 }
 
 
 static void searches_header_finalize (GObject * obj) {
 	SearchesHeader * self;
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 64 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->context_menu);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1158 "Branch.c"
+#line 1158 "SearchesBranch.c"
 }
 
 
@@ -1176,28 +1176,28 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	SearchesSidebarEntry * self = NULL;
 	SavedSearch* _tmp0_;
 	SavedSearch* _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = search;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->search = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 1194 "Branch.c"
+#line 1194 "SearchesBranch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1201 "Branch.c"
+#line 1201 "SearchesBranch.c"
 }
 
 
@@ -1213,17 +1213,17 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	SavedSearch* result = NULL;
 	SavedSearch* _tmp0_;
 	SavedSearch* _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->search;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1227 "Branch.c"
+#line 1227 "SearchesBranch.c"
 }
 
 
@@ -1232,17 +1232,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	gchar* result = NULL;
 	SavedSearch* _tmp0_;
 	gchar* _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->search;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1246 "Branch.c"
+#line 1246 "SearchesBranch.c"
 }
 
 
@@ -1251,17 +1251,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = searches_sidebar_entry_single_search_icon;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1265 "Branch.c"
+#line 1265 "SearchesBranch.c"
 }
 
 
@@ -1270,32 +1270,32 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	Page* result = NULL;
 	SavedSearch* _tmp0_;
 	SavedSearchPage* _tmp1_;
-#line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->search;
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = saved_search_page_new (_tmp0_);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1286 "Branch.c"
+#line 1286 "SearchesBranch.c"
 }
 
 
 static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	SearchesSidebarEntry * self;
 	gboolean result = FALSE;
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 122 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	result = TRUE;
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1299 "Branch.c"
+#line 1299 "SearchesBranch.c"
 }
 
 
@@ -1306,85 +1306,85 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	const gchar* _tmp2_;
 	gboolean _tmp3_;
 	gboolean _tmp4_;
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = saved_search_table_get_instance ();
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp2_ = new_name;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp4_ = !_tmp3_;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	if (_tmp4_) {
-#line 1328 "Branch.c"
+#line 1328 "SearchesBranch.c"
 		CommandManager* _tmp5_;
 		CommandManager* _tmp6_;
 		SavedSearch* _tmp7_;
 		const gchar* _tmp8_;
 		RenameSavedSearchCommand* _tmp9_;
 		RenameSavedSearchCommand* _tmp10_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp5_ = app_window_get_command_manager ();
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp6_ = _tmp5_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp7_ = self->priv->search;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp8_ = new_name;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp10_ = _tmp9_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (_tmp10_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1353 "Branch.c"
+#line 1353 "SearchesBranch.c"
 	} else {
 		const gchar* _tmp11_;
 		SavedSearch* _tmp12_;
 		gchar* _tmp13_;
 		gchar* _tmp14_;
 		gboolean _tmp15_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp11_ = new_name;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp12_ = self->priv->search;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp14_ = _tmp13_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_free0 (_tmp14_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		if (_tmp15_) {
-#line 1374 "Branch.c"
+#line 1374 "SearchesBranch.c"
 			const gchar* _tmp16_;
 			gchar* _tmp17_;
 			gchar* _tmp18_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp16_ = new_name;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp18_ = _tmp17_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_g_free0 (_tmp18_);
-#line 1388 "Branch.c"
+#line 1388 "SearchesBranch.c"
 		}
 	}
 }
@@ -1394,99 +1394,99 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	SearchesSidebarEntry * self;
 	SavedSearch* _tmp0_;
 	gboolean _tmp1_;
-#line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->search;
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	if (_tmp1_) {
-#line 1406 "Branch.c"
+#line 1406 "SearchesBranch.c"
 		CommandManager* _tmp2_;
 		CommandManager* _tmp3_;
 		SavedSearch* _tmp4_;
 		DeleteSavedSearchCommand* _tmp5_;
 		DeleteSavedSearchCommand* _tmp6_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp4_ = self->priv->search;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_tmp6_ = _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1428 "Branch.c"
+#line 1428 "SearchesBranch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
 	gchar* _tmp0_;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
-#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = g_strdup ("edit-find");
-#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1451 "Branch.c"
+#line 1451 "SearchesBranch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1462 "Branch.c"
+#line 1462 "SearchesBranch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
-#line 1471 "Branch.c"
+#line 1471 "SearchesBranch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1478 "Branch.c"
+#line 1478 "SearchesBranch.c"
 }
 
 
 static void searches_sidebar_entry_finalize (GObject * obj) {
 	SearchesSidebarEntry * self;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 94 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1490 "Branch.c"
+#line 1490 "SearchesBranch.c"
 }
 
 
diff --git a/src/searches/Branch.vala b/src/searches/SearchesBranch.vala
index 3b54acf..caf8ac6 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/SearchesBranch.vala
@@ -65,7 +65,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
     private Gtk.Menu? context_menu = null;
     
     public Header() {
-        base (_("Saved Searches"));
+        base (_("Saved Searches"), _("Organize your saved searches"));
         setup_context_menu();
     }
 
diff --git a/src/shotwell-graphics-processor.h b/src/shotwell-graphics-processor.h
new file mode 100644
index 0000000..fc05d79
--- /dev/null
+++ b/src/shotwell-graphics-processor.h
@@ -0,0 +1,637 @@
+/* shotwell-graphics-processor.h generated by valac 0.36.6, the Vala compiler, do not modify */
+
+
+#ifndef __SRC_SHOTWELL_GRAPHICS_PROCESSOR_H__
+#define __SRC_SHOTWELL_GRAPHICS_PROCESSOR_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <float.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gee.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gio/gio.h>
+#include <gdk/gdk.h>
+
+G_BEGIN_DECLS
+
+
+#define TYPE_RGB_ANALYTIC_PIXEL (rgb_analytic_pixel_get_type ())
+typedef struct _RGBAnalyticPixel RGBAnalyticPixel;
+
+#define TYPE_HSV_ANALYTIC_PIXEL (hsv_analytic_pixel_get_type ())
+typedef struct _HSVAnalyticPixel HSVAnalyticPixel;
+
+#define TYPE_COMPOSITION_MODE (composition_mode_get_type ())
+
+#define TYPE_PIXEL_FORMAT (pixel_format_get_type ())
+
+#define TYPE_PIXEL_TRANSFORMATION_TYPE (pixel_transformation_type_get_type ())
+
+#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
+#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
+#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
+#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
+#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
+#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
+
+typedef struct _PixelTransformationBundle PixelTransformationBundle;
+typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
+typedef struct _PixelTransformationBundlePrivate PixelTransformationBundlePrivate;
+
+#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
+#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
+#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
+#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
+#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
+#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
+
+typedef struct _PixelTransformation PixelTransformation;
+typedef struct _PixelTransformationClass PixelTransformationClass;
+
+#define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
+#define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
+#define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
+#define IS_KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEY_VALUE_MAP))
+#define IS_KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEY_VALUE_MAP))
+#define KEY_VALUE_MAP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
+
+typedef struct _KeyValueMap KeyValueMap;
+typedef struct _KeyValueMapClass KeyValueMapClass;
+
+#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
+#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
+#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
+#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
+#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
+#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
+
+typedef struct _PixelTransformer PixelTransformer;
+typedef struct _PixelTransformerClass PixelTransformerClass;
+typedef struct _PixelTransformationPrivate PixelTransformationPrivate;
+
+#define TYPE_RGB_TRANSFORMATION (rgb_transformation_get_type ())
+#define RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformation))
+#define RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
+#define IS_RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_TRANSFORMATION))
+#define IS_RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_TRANSFORMATION))
+#define RGB_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
+
+typedef struct _RGBTransformation RGBTransformation;
+typedef struct _RGBTransformationClass RGBTransformationClass;
+typedef struct _RGBTransformationPrivate RGBTransformationPrivate;
+
+#define TYPE_HSV_TRANSFORMATION (hsv_transformation_get_type ())
+#define HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformation))
+#define HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
+#define IS_HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HSV_TRANSFORMATION))
+#define IS_HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HSV_TRANSFORMATION))
+#define HSV_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
+
+typedef struct _HSVTransformation HSVTransformation;
+typedef struct _HSVTransformationClass HSVTransformationClass;
+typedef struct _HSVTransformationPrivate HSVTransformationPrivate;
+
+#define TYPE_TINT_TRANSFORMATION (tint_transformation_get_type ())
+#define TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TINT_TRANSFORMATION, TintTransformation))
+#define TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
+#define IS_TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TINT_TRANSFORMATION))
+#define IS_TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TINT_TRANSFORMATION))
+#define TINT_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
+
+typedef struct _TintTransformation TintTransformation;
+typedef struct _TintTransformationClass TintTransformationClass;
+typedef struct _TintTransformationPrivate TintTransformationPrivate;
+
+#define TYPE_TEMPERATURE_TRANSFORMATION (temperature_transformation_get_type ())
+#define TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation))
+#define TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
+#define IS_TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TEMPERATURE_TRANSFORMATION))
+#define IS_TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TEMPERATURE_TRANSFORMATION))
+#define TEMPERATURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
+
+typedef struct _TemperatureTransformation TemperatureTransformation;
+typedef struct _TemperatureTransformationClass TemperatureTransformationClass;
+typedef struct _TemperatureTransformationPrivate TemperatureTransformationPrivate;
+
+#define TYPE_SATURATION_TRANSFORMATION (saturation_transformation_get_type ())
+#define SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))
+#define SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
+#define IS_SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SATURATION_TRANSFORMATION))
+#define IS_SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SATURATION_TRANSFORMATION))
+#define SATURATION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
+
+typedef struct _SaturationTransformation SaturationTransformation;
+typedef struct _SaturationTransformationClass SaturationTransformationClass;
+typedef struct _SaturationTransformationPrivate SaturationTransformationPrivate;
+
+#define TYPE_EXPOSURE_TRANSFORMATION (exposure_transformation_get_type ())
+#define EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation))
+#define EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
+#define IS_EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPOSURE_TRANSFORMATION))
+#define IS_EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPOSURE_TRANSFORMATION))
+#define EXPOSURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
+
+typedef struct _ExposureTransformation ExposureTransformation;
+typedef struct _ExposureTransformationClass ExposureTransformationClass;
+typedef struct _ExposureTransformationPrivate ExposureTransformationPrivate;
+
+#define TYPE_CONTRAST_TRANSFORMATION (contrast_transformation_get_type ())
+#define CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))
+#define CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+#define IS_CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTRAST_TRANSFORMATION))
+#define IS_CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTRAST_TRANSFORMATION))
+#define CONTRAST_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+
+typedef struct _ContrastTransformation ContrastTransformation;
+typedef struct _ContrastTransformationClass ContrastTransformationClass;
+typedef struct _ContrastTransformationPrivate ContrastTransformationPrivate;
+typedef struct _PixelTransformerPrivate PixelTransformerPrivate;
+
+#define TYPE_RGB_HISTOGRAM (rgb_histogram_get_type ())
+#define RGB_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_HISTOGRAM, RGBHistogram))
+#define RGB_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_HISTOGRAM, RGBHistogramClass))
+#define IS_RGB_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_HISTOGRAM))
+#define IS_RGB_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_HISTOGRAM))
+#define RGB_HISTOGRAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_HISTOGRAM, RGBHistogramClass))
+
+typedef struct _RGBHistogram RGBHistogram;
+typedef struct _RGBHistogramClass RGBHistogramClass;
+typedef struct _RGBHistogramPrivate RGBHistogramPrivate;
+
+#define TYPE_INTENSITY_HISTOGRAM (intensity_histogram_get_type ())
+#define INTENSITY_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INTENSITY_HISTOGRAM, IntensityHistogram))
+#define INTENSITY_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_INTENSITY_HISTOGRAM, IntensityHistogramClass))
+#define IS_INTENSITY_HISTOGRAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_INTENSITY_HISTOGRAM))
+#define IS_INTENSITY_HISTOGRAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_INTENSITY_HISTOGRAM))
+#define INTENSITY_HISTOGRAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_INTENSITY_HISTOGRAM, IntensityHistogramClass))
+
+typedef struct _IntensityHistogram IntensityHistogram;
+typedef struct _IntensityHistogramClass IntensityHistogramClass;
+typedef struct _IntensityHistogramPrivate IntensityHistogramPrivate;
+
+#define TYPE_EXPANSION_TRANSFORMATION (expansion_transformation_get_type ())
+#define EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation))
+#define EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
+#define IS_EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPANSION_TRANSFORMATION))
+#define IS_EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPANSION_TRANSFORMATION))
+#define EXPANSION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
+
+typedef struct _ExpansionTransformation ExpansionTransformation;
+typedef struct _ExpansionTransformationClass ExpansionTransformationClass;
+typedef struct _ExpansionTransformationPrivate ExpansionTransformationPrivate;
+
+#define TYPE_SHADOW_DETAIL_TRANSFORMATION (shadow_detail_transformation_get_type ())
+#define SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation))
+#define SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
+#define IS_SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION))
+#define IS_SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION))
+#define SHADOW_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
+
+typedef struct _ShadowDetailTransformation ShadowDetailTransformation;
+typedef struct _ShadowDetailTransformationClass ShadowDetailTransformationClass;
+typedef struct _ShadowDetailTransformationPrivate ShadowDetailTransformationPrivate;
+
+#define TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION (hermite_gamma_approximation_function_get_type ())
+#define HERMITE_GAMMA_APPROXIMATION_FUNCTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunction))
+#define HERMITE_GAMMA_APPROXIMATION_FUNCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunctionClass))
+#define IS_HERMITE_GAMMA_APPROXIMATION_FUNCTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION))
+#define IS_HERMITE_GAMMA_APPROXIMATION_FUNCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION))
+#define HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunctionClass))
+
+typedef struct _HermiteGammaApproximationFunction HermiteGammaApproximationFunction;
+typedef struct _HermiteGammaApproximationFunctionClass HermiteGammaApproximationFunctionClass;
+typedef struct _HermiteGammaApproximationFunctionPrivate HermiteGammaApproximationFunctionPrivate;
+
+#define TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION (highlight_detail_transformation_get_type ())
+#define HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation))
+#define HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
+#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
+#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
+#define HIGHLIGHT_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
+
+typedef struct _HighlightDetailTransformation HighlightDetailTransformation;
+typedef struct _HighlightDetailTransformationClass HighlightDetailTransformationClass;
+typedef struct _HighlightDetailTransformationPrivate HighlightDetailTransformationPrivate;
+typedef struct _KeyValueMapPrivate KeyValueMapPrivate;
+
+struct _RGBAnalyticPixel {
+	gfloat red;
+	gfloat green;
+	gfloat blue;
+};
+
+struct _HSVAnalyticPixel {
+	gfloat hue;
+	gfloat saturation;
+	gfloat light_value;
+};
+
+typedef enum  {
+	COMPOSITION_MODE_NONE,
+	COMPOSITION_MODE_RGB_MATRIX,
+	COMPOSITION_MODE_HSV_LOOKUP
+} CompositionMode;
+
+typedef enum  {
+	PIXEL_FORMAT_RGB,
+	PIXEL_FORMAT_HSV
+} PixelFormat;
+
+typedef enum  {
+	PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION,
+	PIXEL_TRANSFORMATION_TYPE_SHADOWS,
+	PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS,
+	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
+	PIXEL_TRANSFORMATION_TYPE_TINT,
+	PIXEL_TRANSFORMATION_TYPE_SATURATION,
+	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
+	PIXEL_TRANSFORMATION_TYPE_CONTRAST
+} PixelTransformationType;
+
+struct _PixelTransformationBundle {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PixelTransformationBundlePrivate * priv;
+};
+
+struct _PixelTransformationBundleClass {
+	GTypeClass parent_class;
+	void (*finalize) (PixelTransformationBundle *self);
+};
+
+struct _PixelTransformation {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PixelTransformationPrivate * priv;
+};
+
+struct _PixelTransformationClass {
+	GTypeClass parent_class;
+	void (*finalize) (PixelTransformation *self);
+	CompositionMode (*get_composition_mode) (PixelTransformation* self);
+	void (*compose_with) (PixelTransformation* self, PixelTransformation* other);
+	gboolean (*is_identity) (PixelTransformation* self);
+	void (*transform_pixel_hsv) (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result);
+	void (*transform_pixel_rgb) (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
+	gchar* (*to_string) (PixelTransformation* self);
+	PixelTransformation* (*copy) (PixelTransformation* self);
+};
+
+struct _RGBTransformation {
+	PixelTransformation parent_instance;
+	RGBTransformationPrivate * priv;
+	gfloat* matrix_entries;
+	gint matrix_entries_length1;
+	gboolean identity;
+};
+
+struct _RGBTransformationClass {
+	PixelTransformationClass parent_class;
+};
+
+struct _HSVTransformation {
+	PixelTransformation parent_instance;
+	HSVTransformationPrivate * priv;
+	gfloat remap_table[256];
+};
+
+struct _HSVTransformationClass {
+	PixelTransformationClass parent_class;
+};
+
+struct _TintTransformation {
+	RGBTransformation parent_instance;
+	TintTransformationPrivate * priv;
+};
+
+struct _TintTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _TemperatureTransformation {
+	RGBTransformation parent_instance;
+	TemperatureTransformationPrivate * priv;
+};
+
+struct _TemperatureTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _SaturationTransformation {
+	RGBTransformation parent_instance;
+	SaturationTransformationPrivate * priv;
+};
+
+struct _SaturationTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _ExposureTransformation {
+	RGBTransformation parent_instance;
+	ExposureTransformationPrivate * priv;
+};
+
+struct _ExposureTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _ContrastTransformation {
+	RGBTransformation parent_instance;
+	ContrastTransformationPrivate * priv;
+};
+
+struct _ContrastTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _PixelTransformer {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PixelTransformerPrivate * priv;
+	PixelTransformation** optimized_transformations;
+	gint optimized_transformations_length1;
+	gint optimized_slots_used;
+};
+
+struct _PixelTransformerClass {
+	GTypeClass parent_class;
+	void (*finalize) (PixelTransformer *self);
+};
+
+struct _RGBHistogram {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	RGBHistogramPrivate * priv;
+};
+
+struct _RGBHistogramClass {
+	GTypeClass parent_class;
+	void (*finalize) (RGBHistogram *self);
+};
+
+struct _IntensityHistogram {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	IntensityHistogramPrivate * priv;
+};
+
+struct _IntensityHistogramClass {
+	GTypeClass parent_class;
+	void (*finalize) (IntensityHistogram *self);
+};
+
+struct _ExpansionTransformation {
+	HSVTransformation parent_instance;
+	ExpansionTransformationPrivate * priv;
+};
+
+struct _ExpansionTransformationClass {
+	HSVTransformationClass parent_class;
+};
+
+struct _ShadowDetailTransformation {
+	HSVTransformation parent_instance;
+	ShadowDetailTransformationPrivate * priv;
+};
+
+struct _ShadowDetailTransformationClass {
+	HSVTransformationClass parent_class;
+};
+
+struct _HermiteGammaApproximationFunction {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	HermiteGammaApproximationFunctionPrivate * priv;
+};
+
+struct _HermiteGammaApproximationFunctionClass {
+	GTypeClass parent_class;
+	void (*finalize) (HermiteGammaApproximationFunction *self);
+};
+
+struct _HighlightDetailTransformation {
+	HSVTransformation parent_instance;
+	HighlightDetailTransformationPrivate * priv;
+};
+
+struct _HighlightDetailTransformationClass {
+	HSVTransformationClass parent_class;
+};
+
+struct _KeyValueMap {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	KeyValueMapPrivate * priv;
+};
+
+struct _KeyValueMapClass {
+	GTypeClass parent_class;
+	void (*finalize) (KeyValueMap *self);
+};
+
+
+GType rgb_analytic_pixel_get_type (void) G_GNUC_CONST;
+RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self);
+void rgb_analytic_pixel_free (RGBAnalyticPixel* self);
+void rgb_analytic_pixel_init (RGBAnalyticPixel *self);
+void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red, gfloat green, gfloat blue);
+void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self, guchar red_quantized, guchar green_quantized, guchar blue_quantized);
+GType hsv_analytic_pixel_get_type (void) G_GNUC_CONST;
+HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self);
+void hsv_analytic_pixel_free (HSVAnalyticPixel* self);
+void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* hsv_pixel);
+guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self);
+guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self);
+guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self);
+gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rhs);
+guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self);
+void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result);
+void hsv_analytic_pixel_init (HSVAnalyticPixel *self);
+void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue, gfloat saturation, gfloat light_value);
+void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self, guchar hue_quantized, guchar saturation_quantized, guchar light_value_quantized);
+void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* p);
+void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result);
+gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rhs);
+guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self);
+GType composition_mode_get_type (void) G_GNUC_CONST;
+GType pixel_format_get_type (void) G_GNUC_CONST;
+GType pixel_transformation_type_get_type (void) G_GNUC_CONST;
+gpointer pixel_transformation_bundle_ref (gpointer instance);
+void pixel_transformation_bundle_unref (gpointer instance);
+GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
+void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
+gpointer value_get_pixel_transformation_bundle (const GValue* value);
+GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
+PixelTransformationBundle* pixel_transformation_bundle_new (void);
+PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type);
+PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void);
+void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments);
+gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
+gpointer pixel_transformation_ref (gpointer instance);
+void pixel_transformation_unref (gpointer instance);
+GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_pixel_transformation (GValue* value, gpointer v_object);
+void value_take_pixel_transformation (GValue* value, gpointer v_object);
+gpointer value_get_pixel_transformation (const GValue* value);
+GType pixel_transformation_get_type (void) G_GNUC_CONST;
+void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation);
+void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self);
+gpointer key_value_map_ref (gpointer instance);
+void key_value_map_unref (gpointer instance);
+GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_key_value_map (GValue* value, gpointer v_object);
+void value_take_key_value_map (GValue* value, gpointer v_object);
+gpointer value_get_key_value_map (const GValue* value);
+GType key_value_map_get_type (void) G_GNUC_CONST;
+void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValueMap* store);
+KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self, const gchar* group);
+gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self);
+PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type);
+GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
+gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self);
+gpointer pixel_transformer_ref (gpointer instance);
+void pixel_transformer_unref (gpointer instance);
+GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_pixel_transformer (GValue* value, gpointer v_object);
+void value_take_pixel_transformer (GValue* value, gpointer v_object);
+gpointer value_get_pixel_transformer (const GValue* value);
+GType pixel_transformer_get_type (void) G_GNUC_CONST;
+PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self);
+PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
+PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type, PixelFormat preferred_format);
+PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self);
+PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self);
+CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self);
+void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other);
+gboolean pixel_transformation_is_identity (PixelTransformation* self);
+void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result);
+void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result);
+gchar* pixel_transformation_to_string (PixelTransformation* self);
+PixelTransformation* pixel_transformation_copy (PixelTransformation* self);
+GType rgb_transformation_get_type (void) G_GNUC_CONST;
+#define RGB_TRANSFORMATION_MATRIX_SIZE 16
+RGBTransformation* rgb_transformation_new (PixelTransformationType type);
+RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransformationType type);
+GType hsv_transformation_get_type (void) G_GNUC_CONST;
+HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type);
+GType tint_transformation_get_type (void) G_GNUC_CONST;
+#define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f
+TintTransformation* tint_transformation_new (gfloat client_param);
+TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param);
+gfloat tint_transformation_get_parameter (TintTransformation* self);
+GType temperature_transformation_get_type (void) G_GNUC_CONST;
+#define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f
+TemperatureTransformation* temperature_transformation_new (gfloat client_parameter);
+TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter);
+gfloat temperature_transformation_get_parameter (TemperatureTransformation* self);
+GType saturation_transformation_get_type (void) G_GNUC_CONST;
+#define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
+SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
+SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
+gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
+GType exposure_transformation_get_type (void) G_GNUC_CONST;
+#define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
+ExposureTransformation* exposure_transformation_new (gfloat client_parameter);
+ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter);
+gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
+GType contrast_transformation_get_type (void) G_GNUC_CONST;
+#define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
+ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
+ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
+gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
+PixelTransformer* pixel_transformer_new (void);
+PixelTransformer* pixel_transformer_construct (GType object_type);
+PixelTransformer* pixel_transformer_copy (PixelTransformer* self);
+void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
+void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim);
+void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
+void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
+void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
+void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable, gint jobs);
+gpointer rgb_histogram_ref (gpointer instance);
+void rgb_histogram_unref (gpointer instance);
+GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_rgb_histogram (GValue* value, gpointer v_object);
+void value_take_rgb_histogram (GValue* value, gpointer v_object);
+gpointer value_get_rgb_histogram (const GValue* value);
+GType rgb_histogram_get_type (void) G_GNUC_CONST;
+#define RGB_HISTOGRAM_GRAPHIC_WIDTH 256
+#define RGB_HISTOGRAM_GRAPHIC_HEIGHT 100
+RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf);
+RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
+GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self);
+gpointer intensity_histogram_ref (gpointer instance);
+void intensity_histogram_unref (gpointer instance);
+GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_intensity_histogram (GValue* value, gpointer v_object);
+void value_take_intensity_histogram (GValue* value, gpointer v_object);
+gpointer value_get_intensity_histogram (const GValue* value);
+GType intensity_histogram_get_type (void) G_GNUC_CONST;
+IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf);
+IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf* pixbuf);
+gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self, gint level);
+GType expansion_transformation_get_type (void) G_GNUC_CONST;
+ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram);
+ExpansionTransformation* expansion_transformation_construct (GType object_type, IntensityHistogram* histogram);
+ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point);
+ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point);
+ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation);
+ExpansionTransformation* expansion_transformation_construct_from_string (GType object_type, const gchar* encoded_transformation);
+gint expansion_transformation_get_white_point (ExpansionTransformation* self);
+gint expansion_transformation_get_black_point (ExpansionTransformation* self);
+GType shadow_detail_transformation_get_type (void) G_GNUC_CONST;
+#define SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER 0.0f
+#define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f
+ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity);
+ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity);
+gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self);
+gpointer hermite_gamma_approximation_function_ref (gpointer instance);
+void hermite_gamma_approximation_function_unref (gpointer instance);
+GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object);
+void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object);
+gpointer value_get_hermite_gamma_approximation_function (const GValue* value);
+GType hermite_gamma_approximation_function_get_type (void) G_GNUC_CONST;
+HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper);
+HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construct (GType object_type, gfloat user_interval_upper);
+gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x);
+GType highlight_detail_transformation_get_type (void) G_GNUC_CONST;
+#define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f)
+#define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f
+HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity);
+HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity);
+gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self);
+PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixbuf* pixbuf);
+KeyValueMap* key_value_map_new (const gchar* group);
+KeyValueMap* key_value_map_construct (GType object_type, const gchar* group);
+KeyValueMap* key_value_map_copy (KeyValueMap* self);
+gchar* key_value_map_get_group (KeyValueMap* self);
+GeeSet* key_value_map_get_keys (KeyValueMap* self);
+gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key);
+void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar* value);
+void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value);
+void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble value);
+void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value);
+void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value);
+gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gchar* def);
+gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def);
+gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble def);
+gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def);
+gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean def);
+void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def, GdkPoint* result);
+void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* point);
+
+extern const gfloat rgb_lookup_table[256];
+
+G_END_DECLS
+
+#endif
diff --git a/src/shotwell-graphics-processor.vapi b/src/shotwell-graphics-processor.vapi
new file mode 100644
index 0000000..e34078b
--- /dev/null
+++ b/src/shotwell-graphics-processor.vapi
@@ -0,0 +1,225 @@
+/* shotwell-graphics-processor.vapi generated by valac 0.36.6, do not modify. */
+
+namespace AutoEnhance {
+	[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+	public static PixelTransformationBundle create_auto_enhance_adjustments (Gdk.Pixbuf pixbuf);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public enum CompositionMode {
+	NONE,
+	RGB_MATRIX,
+	HSV_LOOKUP
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public enum PixelFormat {
+	RGB,
+	HSV
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public enum PixelTransformationType {
+	TONE_EXPANSION,
+	SHADOWS,
+	HIGHLIGHTS,
+	TEMPERATURE,
+	TINT,
+	SATURATION,
+	EXPOSURE,
+	CONTRAST
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class PixelTransformationBundle {
+	public PixelTransformationBundle ();
+	public PixelTransformationBundle copy ();
+	public PixelTransformer generate_transformer ();
+	public static PixelTransformationBundle? get_copied_color_adjustments ();
+	public int get_count ();
+	public PixelTransformation? get_transformation (PixelTransformationType type);
+	public Gee.Iterable<PixelTransformation> get_transformations ();
+	public static bool has_copied_color_adjustments ();
+	public bool is_identity ();
+	public void load (KeyValueMap store);
+	public KeyValueMap save (string group);
+	public void @set (PixelTransformation transformation);
+	public static void set_copied_color_adjustments (PixelTransformationBundle adjustments);
+	public void set_to_identity ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public abstract class PixelTransformation {
+	public PixelTransformation (PixelTransformationType type, PixelFormat preferred_format);
+	public virtual void compose_with (PixelTransformation other);
+	public abstract PixelTransformation copy ();
+	public virtual CompositionMode get_composition_mode ();
+	public PixelFormat get_preferred_format ();
+	public PixelTransformationType get_transformation_type ();
+	public virtual bool is_identity ();
+	public virtual string to_string ();
+	public virtual HSVAnalyticPixel transform_pixel_hsv (HSVAnalyticPixel p);
+	public virtual RGBAnalyticPixel transform_pixel_rgb (RGBAnalyticPixel p);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class RGBTransformation : PixelTransformation {
+	protected bool identity;
+	protected float[] matrix_entries;
+	protected const int MATRIX_SIZE;
+	public RGBTransformation (PixelTransformationType type);
+	public override void compose_with (PixelTransformation other);
+	public override PixelTransformation copy ();
+	public override CompositionMode get_composition_mode ();
+	public override bool is_identity ();
+	public override HSVAnalyticPixel transform_pixel_hsv (HSVAnalyticPixel p);
+	public override RGBAnalyticPixel transform_pixel_rgb (RGBAnalyticPixel p);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public abstract class HSVTransformation : PixelTransformation {
+	protected float remap_table[256];
+	public HSVTransformation (PixelTransformationType type);
+	public override void compose_with (PixelTransformation other);
+	public override CompositionMode get_composition_mode ();
+	public override HSVAnalyticPixel transform_pixel_hsv (HSVAnalyticPixel pixel);
+	public override RGBAnalyticPixel transform_pixel_rgb (RGBAnalyticPixel p);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class TintTransformation : RGBTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public TintTransformation (float client_param);
+	public float get_parameter ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class TemperatureTransformation : RGBTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public TemperatureTransformation (float client_parameter);
+	public float get_parameter ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class SaturationTransformation : RGBTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public SaturationTransformation (float client_parameter);
+	public float get_parameter ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class ExposureTransformation : RGBTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public ExposureTransformation (float client_parameter);
+	public float get_parameter ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class ContrastTransformation : RGBTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public ContrastTransformation (float client_parameter);
+	public float get_parameter ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class PixelTransformer {
+	public int optimized_slots_used;
+	public PixelTransformation[] optimized_transformations;
+	public PixelTransformer ();
+	public void attach_transformation (PixelTransformation trans);
+	public PixelTransformer copy ();
+	public void detach_transformation (PixelTransformation victim);
+	public void replace_transformation (PixelTransformation old_trans, PixelTransformation new_trans);
+	public void transform_from_fp (ref float[] fp_pixel_cache, Gdk.Pixbuf dest);
+	public void transform_pixbuf (Gdk.Pixbuf pixbuf, GLib.Cancellable? cancellable = null);
+	public void transform_to_other_pixbuf (Gdk.Pixbuf source, Gdk.Pixbuf dest, GLib.Cancellable? cancellable = null, int jobs = -1);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class RGBHistogram {
+	public const int GRAPHIC_HEIGHT;
+	public const int GRAPHIC_WIDTH;
+	public RGBHistogram (Gdk.Pixbuf pixbuf);
+	public Gdk.Pixbuf get_graphic ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class IntensityHistogram {
+	public IntensityHistogram (Gdk.Pixbuf pixbuf);
+	public float get_cumulative_probability (int level);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class ExpansionTransformation : HSVTransformation {
+	public ExpansionTransformation (IntensityHistogram histogram);
+	public override PixelTransformation copy ();
+	public ExpansionTransformation.from_extrema (int black_point, int white_point);
+	public ExpansionTransformation.from_string (string encoded_transformation);
+	public int get_black_point ();
+	public int get_white_point ();
+	public override bool is_identity ();
+	public override string to_string ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class ShadowDetailTransformation : HSVTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public ShadowDetailTransformation (float user_intensity);
+	public override PixelTransformation copy ();
+	public float get_parameter ();
+	public override bool is_identity ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class HermiteGammaApproximationFunction {
+	public HermiteGammaApproximationFunction (float user_interval_upper);
+	public float evaluate (float x);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class HighlightDetailTransformation : HSVTransformation {
+	public const float MAX_PARAMETER;
+	public const float MIN_PARAMETER;
+	public HighlightDetailTransformation (float user_intensity);
+	public override PixelTransformation copy ();
+	public float get_parameter ();
+	public override bool is_identity ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public class KeyValueMap {
+	public KeyValueMap (string group);
+	public KeyValueMap copy ();
+	public bool get_bool (string key, bool def);
+	public double get_double (string key, double def);
+	public float get_float (string key, float def);
+	public string get_group ();
+	public int get_int (string key, int def);
+	public Gee.Set<string> get_keys ();
+	public Gdk.Point get_point (string key, Gdk.Point def);
+	public string get_string (string key, string? def);
+	public bool has_key (string key);
+	public void set_bool (string key, bool value);
+	public void set_double (string key, double value);
+	public void set_float (string key, float value);
+	public void set_int (string key, int value);
+	public void set_point (string key, Gdk.Point point);
+	public void set_string (string key, string value);
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public struct RGBAnalyticPixel {
+	public float red;
+	public float green;
+	public float blue;
+	public RGBAnalyticPixel ();
+	public bool equals (RGBAnalyticPixel? rhs);
+	public RGBAnalyticPixel.from_components (float red, float green, float blue);
+	public RGBAnalyticPixel.from_hsv (HSVAnalyticPixel hsv_pixel);
+	public RGBAnalyticPixel.from_quantized_components (uchar red_quantized, uchar green_quantized, uchar blue_quantized);
+	public uint hash_code ();
+	public uchar quantized_blue ();
+	public uchar quantized_green ();
+	public uchar quantized_red ();
+	public HSVAnalyticPixel to_hsv ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public struct HSVAnalyticPixel {
+	public float hue;
+	public float saturation;
+	public float light_value;
+	public HSVAnalyticPixel ();
+	public bool equals (ref HSVAnalyticPixel rhs);
+	public HSVAnalyticPixel.from_components (float hue, float saturation, float light_value);
+	public HSVAnalyticPixel.from_quantized_components (uchar hue_quantized, uchar saturation_quantized, uchar light_value_quantized);
+	public HSVAnalyticPixel.from_rgb (RGBAnalyticPixel p);
+	public uint hash_code ();
+	public RGBAnalyticPixel to_rgb ();
+}
+[CCode (cheader_filename = "shotwell-graphics-processor.h")]
+public const float[] rgb_lookup_table;
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index c6bb85d..1345227 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -243,7 +243,6 @@ typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface;
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 #define TYPE_COMMAND (command_get_type ())
 #define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command))
@@ -497,7 +496,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 GType library_window_target_type_get_type (void) G_GNUC_CONST;
-static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value);
+static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value);
 static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self);
 static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self);
@@ -581,7 +580,7 @@ gchar* sidebar_entry_get_sidebar_tooltip (SidebarEntry* self);
 static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter);
 static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarEntry* entry, const gchar* tooltip);
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self);
-static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon);
+static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name);
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self);
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -645,12 +644,6 @@ static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (G
 void sidebar_renameable_entry_rename (SidebarRenameableEntry* self, const gchar* new_name);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 void saved_search_dialog_show (SavedSearchDialog* self);
 GType command_get_type (void) G_GNUC_CONST;
@@ -689,16 +682,16 @@ static void sidebar_tree_finalize (GObject * obj);
 static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}};
 
 static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
-#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 695 "Tree.c"
+#line 688 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 702 "Tree.c"
+#line 695 "Tree.c"
 }
 
 
@@ -715,303 +708,298 @@ static GType sidebar_tree_columns_get_type (void) {
 
 
 static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 721 "Tree.c"
+#line 714 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 728 "Tree.c"
+#line 721 "Tree.c"
 }
 
 
 static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 735 "Tree.c"
+#line 728 "Tree.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 742 "Tree.c"
+#line 735 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
-#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 751 "Tree.c"
+#line 744 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
-#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 760 "Tree.c"
+#line 753 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
-#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 769 "Tree.c"
+#line 762 "Tree.c"
 }
 
 
-static void _vala_array_add64 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) {
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+static void _vala_array_add67 (GtkTargetEntry* * array, int* length, int* size, const GtkTargetEntry* value) {
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((*length) == (*size)) {
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 780 "Tree.c"
+#line 773 "Tree.c"
 	}
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 784 "Tree.c"
+#line 777 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
-#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 793 "Tree.c"
+#line 786 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 800 "Tree.c"
+#line 793 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 807 "Tree.c"
+#line 800 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 816 "Tree.c"
+#line 809 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 	SidebarTree * self = NULL;
 	GtkTreeStore* _tmp0_;
-	GtkStyleContext* _tmp1_;
 	GtkTreeViewColumn* text_column = NULL;
-	GtkTreeViewColumn* _tmp2_;
+	GtkTreeViewColumn* _tmp1_;
 	GtkCellRendererPixbuf* icon_renderer = NULL;
-	GtkCellRendererPixbuf* _tmp3_;
+	GtkCellRendererPixbuf* _tmp2_;
+	GtkCellRendererText* _tmp3_;
 	GtkCellRendererText* _tmp4_;
 	GtkCellRendererText* _tmp5_;
 	GtkCellRendererText* _tmp6_;
 	GtkCellRendererText* _tmp7_;
 	GtkCellRendererText* _tmp8_;
-	GtkCellRendererText* _tmp9_;
 	GtkCellRendererText* invisitext = NULL;
-	GtkCellRendererText* _tmp10_;
+	GtkCellRendererText* _tmp9_;
 	GtkTreeViewColumn* page_holder = NULL;
-	GtkTreeViewColumn* _tmp11_;
+	GtkTreeViewColumn* _tmp10_;
 	GtkTreeSelection* selection = NULL;
+	GtkTreeSelection* _tmp11_;
 	GtkTreeSelection* _tmp12_;
-	GtkTreeSelection* _tmp13_;
-	GtkTargetEntry* _tmp14_;
-	gint _tmp14__length1;
-	GdkDragAction _tmp15_;
+	GtkTargetEntry* _tmp13_;
+	gint _tmp13__length1;
+	GdkDragAction _tmp14_;
 	GtkTargetEntry* source_entries = NULL;
-	GtkTargetEntry* _tmp16_;
+	GtkTargetEntry* _tmp15_;
 	gint source_entries_length1;
 	gint _source_entries_size_;
+	GtkTargetEntry* _tmp16_;
+	gint _tmp16__length1;
 	GtkTargetEntry* _tmp17_;
 	gint _tmp17__length1;
-	GtkTargetEntry* _tmp18_;
-	gint _tmp18__length1;
-	GtkTargetEntry _tmp19_;
-	GtkTargetEntry* _tmp20_;
-	gint _tmp20__length1;
-	SidebarTreeExternalDropHandler _tmp21_;
-	void* _tmp21__target;
+	GtkTargetEntry _tmp18_;
+	GtkTargetEntry* _tmp19_;
+	gint _tmp19__length1;
+	SidebarTreeExternalDropHandler _tmp20_;
+	void* _tmp20__target;
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = (SidebarTree*) g_object_new (object_type, NULL);
 #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
 #line 95 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 96 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 96 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_style_context_add_class (_tmp1_, "sidebar");
-#line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = gtk_tree_view_column_new ();
+#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp1_ = gtk_tree_view_column_new ();
+#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_ref_sink (_tmp1_);
+#line 97 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	text_column = _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_view_column_set_expand (text_column, TRUE);
+#line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp2_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+#line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_ref_sink (_tmp2_);
-#line 98 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	text_column = _tmp2_;
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_column_set_expand (text_column, TRUE);
-#line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_ref_sink (_tmp3_);
+	icon_renderer = _tmp2_;
 #line 100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	icon_renderer = _tmp3_;
-#line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (icon_renderer, "follow-state", TRUE, NULL);
-#line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
+#line 102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "gicon", (gint) SIDEBAR_TREE_COLUMNS_ICON);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "icon_name", (gint) SIDEBAR_TREE_COLUMNS_ICON);
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_cell_layout_set_cell_data_func (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (icon_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func, g_object_ref (self), g_object_unref);
-#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_ref_sink (_tmp4_);
-#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp3_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_ref_sink (_tmp3_);
+#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->text_renderer);
+#line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	self->priv->text_renderer = _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->text_renderer = _tmp4_;
+	_tmp4_ = self->priv->text_renderer;
+#line 105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_set (_tmp4_, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = self->priv->text_renderer;
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_set (_tmp5_, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-canceled", (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self, 0);
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->text_renderer;
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-canceled", (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-started", (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self, 0);
 #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = self->priv->text_renderer;
 #line 108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), "editing-started", (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self, 0);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = self->priv->text_renderer;
 #line 109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = self->priv->text_renderer;
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME);
 #line 110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (text_column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_cell_renderer_get_type (), GtkCellRenderer), "markup", (gint) SIDEBAR_TREE_COLUMNS_NAME);
-#line 111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), text_column);
+#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp9_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_ref_sink (_tmp9_);
+#line 112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	invisitext = _tmp9_;
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp10_ = gtk_tree_view_column_new ();
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_ref_sink (_tmp10_);
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	invisitext = _tmp10_;
-#line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = gtk_tree_view_column_new ();
-#line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_object_ref_sink (_tmp11_);
+	page_holder = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	page_holder = _tmp11_;
-#line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (page_holder, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (invisitext, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_column_set_visible (page_holder, FALSE);
-#line 117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_append_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), page_holder);
-#line 119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_headers_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_enable_search (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_show_expanders (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE);
-#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_reorderable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_enable_tree_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_grid_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GTK_TREE_VIEW_GRID_LINES_NONE);
-#line 125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_tooltip_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) SIDEBAR_TREE_COLUMNS_TOOLTIP);
+#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp11_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
+#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp12_ = _g_object_ref0 (_tmp11_);
+#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	selection = _tmp12_;
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	selection = _tmp13_;
-#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_set_select_function (selection, _sidebar_tree_on_selection_gtk_tree_selection_func, g_object_ref (self), g_object_unref);
-#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-expand-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row, self, 0);
-#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-collapse-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row, self, 0);
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14_ = target_entries;
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp14__length1 = target_entries_length1;
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp15_ = actions;
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, _tmp14__length1, _tmp15_);
+#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp13_ = target_entries;
+#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp13__length1 = target_entries_length1;
+#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp14_ = actions;
+#line 136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_, _tmp13__length1, _tmp14_);
+#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp15_ = g_new0 (GtkTargetEntry, 0);
+#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	source_entries = _tmp15_;
+#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	source_entries_length1 = 0;
+#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_source_entries_size_ = source_entries_length1;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = g_new0 (GtkTargetEntry, 0);
+	_tmp16_ = source_entries;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	source_entries = _tmp16_;
+	_tmp16__length1 = source_entries_length1;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	source_entries_length1 = 0;
+	_tmp17_ = target_entries;
 #line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_source_entries_size_ = source_entries_length1;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17_ = source_entries;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp17__length1 = source_entries_length1;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18_ = target_entries;
+	_tmp17__length1 = target_entries_length1;
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp18_ = _tmp17_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH];
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_vala_array_add67 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp18_);
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp18__length1 = target_entries_length1;
+	_tmp19_ = source_entries;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp19_ = _tmp18_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH];
+	_tmp19__length1 = source_entries_length1;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_array_add64 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp19_);
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20_ = source_entries;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp20__length1 = source_entries_length1;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp20_, _tmp20__length1, GDK_ACTION_COPY);
-#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21_ = drop_handler;
-#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp21__target = drop_handler_target;
-#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->drop_handler = _tmp21_;
-#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->drop_handler_target = _tmp21__target;
-#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp19_, _tmp19__length1, GDK_ACTION_COPY);
+#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp20_ = drop_handler;
+#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp20__target = drop_handler_target;
+#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	self->priv->drop_handler = _tmp20_;
+#line 143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	self->priv->drop_handler_target = _tmp20__target;
+#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu, self, 0);
-#line 148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_setup_default_context_menu (self);
-#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", (GCallback) _sidebar_tree_on_drag_begin_gtk_widget_drag_begin, self, 0);
-#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", (GCallback) _sidebar_tree_on_drag_end_gtk_widget_drag_end, self, 0);
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-motion", (GCallback) _sidebar_tree_on_drag_motion_gtk_widget_drag_motion, self, 0);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	source_entries = (g_free (source_entries), NULL);
@@ -1027,14 +1015,14 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	_g_object_unref0 (text_column);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 1031 "Tree.c"
+#line 1019 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1038 "Tree.c"
+#line 1026 "Tree.c"
 }
 
 
@@ -1046,69 +1034,69 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 	GtkCellRenderer* _tmp3_;
 	SidebarTreeEntryWrapper* _tmp4_;
 	SidebarEntry* _tmp5_;
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_LAYOUT (layout));
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_TREE_MODEL (model));
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1074 "Tree.c"
+#line 1062 "Tree.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = renderer;
-#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
-#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1086 "Tree.c"
+#line 1074 "Tree.c"
 }
 
 
 static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx) {
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
-#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1097 "Tree.c"
+#line 1085 "Tree.c"
 }
 
 
 static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
-#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
-#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = FALSE;
-#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
-#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1112 "Tree.c"
+#line 1100 "Tree.c"
 }
 
 
@@ -1116,29 +1104,29 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1128 "Tree.c"
+#line 1116 "Tree.c"
 		SidebarEntry* _tmp2_;
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = self->priv->internal_drag_source_entry;
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1134 "Tree.c"
+#line 1122 "Tree.c"
 	} else {
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1138 "Tree.c"
+#line 1126 "Tree.c"
 	}
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1142 "Tree.c"
+#line 1130 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
 		gint _tmp3_;
@@ -1146,74 +1134,74 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewDropPosition _tmp6_ = 0;
 		GtkTreePath* _tmp7_;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = x;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = y;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		path = _tmp5_;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		position = _tmp6_;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp7_ != NULL) {
-#line 1166 "Tree.c"
+#line 1154 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp8_;
 			SidebarTreeEntryWrapper* _tmp9_;
 			SidebarTreeEntryWrapper* _tmp10_;
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = path;
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = sidebar_tree_get_wrapper_at_path (self, _tmp8_);
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp9_;
-#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = wrapper;
-#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp10_ != NULL) {
-#line 1181 "Tree.c"
+#line 1169 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp11_;
 				SidebarEntry* _tmp12_;
 				SidebarEntry* _tmp13_;
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp11_ = wrapper;
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = _tmp11_->entry;
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1195 "Tree.c"
+#line 1183 "Tree.c"
 			}
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1199 "Tree.c"
+#line 1187 "Tree.c"
 		}
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1203 "Tree.c"
+#line 1191 "Tree.c"
 	}
-#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1209 "Tree.c"
+#line 1197 "Tree.c"
 }
 
 
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 	GError * _inner_error_ = NULL;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1217 "Tree.c"
+#line 1205 "Tree.c"
 	{
 		GtkBuilder* _tmp0_;
 		gchar* _tmp1_;
@@ -1229,63 +1217,63 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		GSimpleActionGroup* _tmp9_;
 		GSimpleActionGroup* _tmp10_;
 		GtkMenu* _tmp11_;
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = self->priv->builder;
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = resources_get_ui ("sidebar_default_context.ui");
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_builder_add_from_resource (_tmp0_, _tmp2_, &_inner_error_);
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1245 "Tree.c"
-			goto __catch51_g_error;
+#line 1233 "Tree.c"
+			goto __catch55_g_error;
 		}
-#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->builder;
-#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = gtk_builder_get_object (_tmp3_, "popup-menu");
-#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp4_) : NULL);
-#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		model = _tmp5_;
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = model;
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_);
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_ref_sink (_tmp7_);
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->default_context_menu);
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->default_context_menu = _tmp7_;
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_simple_action_group_new ();
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		group = _tmp8_;
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = group;
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self);
-#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = group;
-#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_widget_insert_action_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "sidebar", G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_action_group_get_type (), GActionGroup));
-#line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = self->priv->default_context_menu;
-#line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_attach_to_widget (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (group);
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 1286 "Tree.c"
+#line 1274 "Tree.c"
 	}
-	goto __finally51;
-	__catch51_g_error:
+	goto __finally55;
+	__catch55_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp12_;
@@ -1294,44 +1282,44 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		gchar* _tmp15_;
 		Application* _tmp16_;
 		Application* _tmp17_;
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_error_ = _inner_error_;
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_inner_error_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _error_;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->message;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = g_strdup_printf ("Error loading UI resource: %s", _tmp13_);
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _tmp14_;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp15_);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = application_get_instance ();
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		application_panic (_tmp17_);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_application_unref0 (_tmp17_);
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (_error_);
-#line 1324 "Tree.c"
+#line 1312 "Tree.c"
 	}
-	__finally51:
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	__finally55:
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_clear_error (&_inner_error_);
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1335 "Tree.c"
+#line 1323 "Tree.c"
 	}
 }
 
@@ -1341,21 +1329,21 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 	GeeHashMap* _tmp0_;
 	SidebarEntry* _tmp1_;
 	gboolean _tmp2_;
-#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1359 "Tree.c"
+#line 1347 "Tree.c"
 }
 
 
@@ -1366,43 +1354,43 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 	SidebarEntry* _tmp1_;
 	gpointer _tmp2_;
 	SidebarTreeEntryWrapper* _tmp3_;
-#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = (SidebarTreeEntryWrapper*) _tmp2_;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1386 "Tree.c"
+#line 1374 "Tree.c"
 		SidebarEntry* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = entry;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = sidebar_entry_to_string (_tmp4_);
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_warning ("Tree.vala:221: Entry %s not found in sidebar", _tmp6_);
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_warning ("Tree.vala:220: Entry %s not found in sidebar", _tmp6_);
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 1400 "Tree.c"
+#line 1388 "Tree.c"
 	}
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1406 "Tree.c"
+#line 1394 "Tree.c"
 }
 
 
@@ -1416,64 +1404,64 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	GValue _tmp3_;
 	SidebarTreeEntryWrapper* _tmp4_;
 	SidebarTreeEntryWrapper* _tmp5_;
-#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 225 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 225 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, NULL);
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = *iter;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_);
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	val = _tmp2_;
-#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = val;
-#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _g_object_ref0 (g_value_get_object (&_tmp3_));
-#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1444 "Tree.c"
+#line 1432 "Tree.c"
 		GtkTreeStore* _tmp6_;
 		GtkTreeIter _tmp7_;
 		GtkTreePath* _tmp8_;
 		GtkTreePath* _tmp9_;
 		gchar* _tmp10_;
 		gchar* _tmp11_;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->store;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = *iter;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp8_;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_path_to_string (_tmp9_);
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = _tmp10_;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:232: No entry found in sidebar at %s", _tmp11_);
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:231: No entry found in sidebar at %s", _tmp11_);
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp11_);
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp9_);
-#line 1469 "Tree.c"
+#line 1457 "Tree.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1477 "Tree.c"
+#line 1465 "Tree.c"
 }
 
 
@@ -1486,49 +1474,49 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	gboolean _tmp3_;
 	GtkTreeIter _tmp7_;
 	SidebarTreeEntryWrapper* _tmp8_;
-#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp2_;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1504 "Tree.c"
+#line 1492 "Tree.c"
 		GtkTreePath* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = path;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = gtk_tree_path_to_string (_tmp4_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:240: No entry found in sidebar at %s", _tmp6_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:239: No entry found in sidebar at %s", _tmp6_);
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1522 "Tree.c"
+#line 1510 "Tree.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = iter;
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp8_;
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 244 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1532 "Tree.c"
+#line 1520 "Tree.c"
 }
 
 
@@ -1550,79 +1538,79 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 	GtkTreePath* _tmp12_;
 	SidebarEntry* _tmp13_;
 	gboolean _tmp14_;
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 249 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1568 "Tree.c"
+#line 1556 "Tree.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1586 "Tree.c"
+#line 1574 "Tree.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp5_, _tmp8_);
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = mask_signal;
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = _tmp9_;
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = wrapper;
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_);
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = _tmp11_;
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE);
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp12_);
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = FALSE;
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = entry;
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_);
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1626 "Tree.c"
+#line 1614 "Tree.c"
 }
 
 
@@ -1637,75 +1625,75 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	GtkTreeSelection* _tmp4_;
 	gboolean _tmp5_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp6_;
-#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 271 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = selection;
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1669 "Tree.c"
+#line 1657 "Tree.c"
 	}
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ != NULL) {
-#line 1675 "Tree.c"
+#line 1663 "Tree.c"
 		GtkTreeSelection* _tmp7_;
 		SidebarTreeEntryWrapper* _tmp8_;
 		GtkTreePath* _tmp9_;
 		GtkTreePath* _tmp10_;
 		gboolean _tmp11_;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = selection;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp11_;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp10_);
-#line 1695 "Tree.c"
+#line 1683 "Tree.c"
 	} else {
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 1699 "Tree.c"
+#line 1687 "Tree.c"
 	}
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp5_;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1709 "Tree.c"
+#line 1697 "Tree.c"
 }
 
 
@@ -1713,40 +1701,40 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	gboolean result = FALSE;
 	GtkTreeSelection* _tmp0_;
 	gint _tmp1_;
-#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 278 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_);
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp1_ != 0;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1727 "Tree.c"
+#line 1715 "Tree.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1734 "Tree.c"
+#line 1722 "Tree.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1741 "Tree.c"
+#line 1729 "Tree.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_free (self);
-#line 1750 "Tree.c"
+#line 1738 "Tree.c"
 }
 
 
@@ -1769,96 +1757,96 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GList* _tmp13_;
 	guint _tmp14_;
 	GtkTreePath* _tmp17_;
-#line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp1_;
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = selection;
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1793 "Tree.c"
+#line 1781 "Tree.c"
 	}
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_selection_get_selected_rows (_tmp3_, &_tmp4_);
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (_tmp4_);
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp6_;
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp5_;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = rows;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = g_list_length (_tmp8_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_ == ((guint) 0)) {
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1815 "Tree.c"
+#line 1803 "Tree.c"
 	} else {
 		GList* _tmp10_;
 		guint _tmp11_;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = rows;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = g_list_length (_tmp10_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1825 "Tree.c"
+#line 1813 "Tree.c"
 	}
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = rows;
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = g_list_length (_tmp13_);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_ != ((guint) 0)) {
-#line 1835 "Tree.c"
+#line 1823 "Tree.c"
 		GList* _tmp15_;
 		gconstpointer _tmp16_;
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = rows;
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1844 "Tree.c"
+#line 1832 "Tree.c"
 	} else {
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = NULL;
-#line 1848 "Tree.c"
+#line 1836 "Tree.c"
 	}
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp17_;
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1862 "Tree.c"
+#line 1850 "Tree.c"
 }
 
 
@@ -1875,90 +1863,90 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	SidebarEmphasizableEntry* _tmp6_;
 	gboolean _tmp7_ = FALSE;
 	SidebarEmphasizableEntry* _tmp8_;
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = guarded_markup_escape_text (_tmp2_);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp2_);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	name = _tmp4_;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL);
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable_entry = _tmp6_;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = emphasizable_entry;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ != NULL) {
-#line 1907 "Tree.c"
+#line 1895 "Tree.c"
 		SidebarEmphasizableEntry* _tmp9_;
 		gboolean _tmp10_;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = emphasizable_entry;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp10_;
-#line 1916 "Tree.c"
+#line 1904 "Tree.c"
 	} else {
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = FALSE;
-#line 1920 "Tree.c"
+#line 1908 "Tree.c"
 	}
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 1924 "Tree.c"
+#line 1912 "Tree.c"
 		const gchar* _tmp11_;
 		gchar* _tmp12_;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = name;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = g_strdup_printf ("<b>%s</b>", _tmp11_);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		name = _tmp12_;
-#line 1935 "Tree.c"
+#line 1923 "Tree.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
-#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable_entry);
-#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1943 "Tree.c"
+#line 1931 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
 	gboolean result = FALSE;
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1953 "Tree.c"
+#line 1941 "Tree.c"
 }
 
 
 gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1962 "Tree.c"
+#line 1950 "Tree.c"
 }
 
 
@@ -1972,41 +1960,41 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	SidebarTreeEntryWrapper* _tmp3_;
 	SidebarTreeEntryWrapper* _tmp4_;
 	SidebarTreeEntryWrapper* _tmp5_;
-#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_ == NULL) {
-#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1990 "Tree.c"
+#line 1978 "Tree.c"
 		}
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1996 "Tree.c"
+#line 1984 "Tree.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 316 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->selected_wrapper;
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2010 "Tree.c"
+#line 1998 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
 		SidebarTreeEntryWrapper* _tmp6_;
 		SidebarTreeEntryWrapper* _tmp7_;
@@ -2016,168 +2004,168 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		gint _tmp11_;
 		gboolean _tmp19_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp20_;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		old_wrapper = _tmp7_;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = _tmp8_;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = self->priv->editing_disabled;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2034 "Tree.c"
+#line 2022 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp12_;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2040 "Tree.c"
+#line 2028 "Tree.c"
 		} else {
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2044 "Tree.c"
+#line 2032 "Tree.c"
 		}
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2048 "Tree.c"
+#line 2036 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp13_;
 			SidebarEntry* _tmp14_;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = wrapper;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_->entry;
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2057 "Tree.c"
+#line 2045 "Tree.c"
 		} else {
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2061 "Tree.c"
+#line 2049 "Tree.c"
 		}
-#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2065 "Tree.c"
+#line 2053 "Tree.c"
 			GtkCellRendererText* _tmp15_;
 			SidebarTreeEntryWrapper* _tmp16_;
 			SidebarEntry* _tmp17_;
 			gboolean _tmp18_;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = wrapper;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = _tmp16_->entry;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2080 "Tree.c"
+#line 2068 "Tree.c"
 		}
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = wrapper;
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp20_ != NULL) {
-#line 2086 "Tree.c"
+#line 2074 "Tree.c"
 			gboolean _tmp21_;
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = self->priv->mask_entry_selected_signal;
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = !_tmp21_;
-#line 2092 "Tree.c"
+#line 2080 "Tree.c"
 		} else {
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = FALSE;
-#line 2096 "Tree.c"
+#line 2084 "Tree.c"
 		}
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_) {
-#line 2100 "Tree.c"
+#line 2088 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
 			SidebarTreeEntryWrapper* _tmp22_;
 			SidebarEntry* _tmp23_;
 			SidebarSelectableEntry* _tmp24_;
 			SidebarSelectableEntry* _tmp25_;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = wrapper;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _tmp22_->entry;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL);
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			selectable = _tmp24_;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = selectable;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ != NULL) {
-#line 2118 "Tree.c"
+#line 2106 "Tree.c"
 				gboolean _tmp26_;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp26_) {
-#line 2124 "Tree.c"
+#line 2112 "Tree.c"
 					SidebarSelectableEntry* _tmp27_;
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp27_ = selectable;
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp27_);
-#line 2130 "Tree.c"
+#line 2118 "Tree.c"
 				} else {
 					SidebarTreeEntryWrapper* _tmp28_;
 					SidebarEntry* _tmp29_;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp28_ = old_wrapper;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp29_ = _tmp28_->entry;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2140 "Tree.c"
+#line 2128 "Tree.c"
 				}
 			}
-#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2145 "Tree.c"
+#line 2133 "Tree.c"
 		}
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2149 "Tree.c"
+#line 2137 "Tree.c"
 	}
-#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 337 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2155 "Tree.c"
+#line 2143 "Tree.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2161 "Tree.c"
+#line 2149 "Tree.c"
 }
 
 
 void sidebar_tree_disable_editing (SidebarTree* self) {
 	gint _tmp0_;
-#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 341 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->editing_disabled = _tmp0_ + 1;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2175 "Tree.c"
+#line 2163 "Tree.c"
 		GtkCellRendererText* _tmp1_;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2181 "Tree.c"
+#line 2169 "Tree.c"
 	}
 }
 
@@ -2188,141 +2176,141 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GtkTreePath* _tmp3_;
-#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2202 "Tree.c"
+#line 2190 "Tree.c"
 		gint _tmp4_;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2208 "Tree.c"
+#line 2196 "Tree.c"
 	} else {
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2212 "Tree.c"
+#line 2200 "Tree.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2216 "Tree.c"
+#line 2204 "Tree.c"
 		gint _tmp5_;
 		gint _tmp6_;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->editing_disabled;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->editing_disabled = _tmp5_ - 1;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->editing_disabled;
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2227 "Tree.c"
+#line 2215 "Tree.c"
 	} else {
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2231 "Tree.c"
+#line 2219 "Tree.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2235 "Tree.c"
+#line 2223 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
 		GtkTreePath* _tmp7_;
 		SidebarTreeEntryWrapper* _tmp8_;
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp10_;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_path (self, _tmp7_);
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp8_;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = wrapper;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2251 "Tree.c"
+#line 2239 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp11_;
 			SidebarEntry* _tmp12_;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = wrapper;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _tmp11_->entry;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2260 "Tree.c"
+#line 2248 "Tree.c"
 		} else {
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2264 "Tree.c"
+#line 2252 "Tree.c"
 		}
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2268 "Tree.c"
+#line 2256 "Tree.c"
 			GtkCellRendererText* _tmp13_;
 			SidebarTreeEntryWrapper* _tmp14_;
 			SidebarEntry* _tmp15_;
 			gboolean _tmp16_;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = wrapper;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp14_->entry;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2283 "Tree.c"
+#line 2271 "Tree.c"
 		}
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2287 "Tree.c"
+#line 2275 "Tree.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2291 "Tree.c"
+#line 2279 "Tree.c"
 }
 
 
 void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
 	GtkTreePath* _tmp0_;
 	gboolean _tmp1_;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2310 "Tree.c"
+#line 2298 "Tree.c"
 		GtkTreePath* _tmp2_;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = path;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2316 "Tree.c"
+#line 2304 "Tree.c"
 	} else {
 		GtkTreePath* _tmp3_;
 		gboolean _tmp4_;
-#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = path;
-#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = expand_all;
-#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2326 "Tree.c"
+#line 2314 "Tree.c"
 	}
 }
 
@@ -2336,47 +2324,47 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_;
 	GtkTreePath* _tmp4_;
 	GtkTreePath* _tmp5_;
-#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 364 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2362 "Tree.c"
+#line 2350 "Tree.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_);
-#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2380 "Tree.c"
+#line 2368 "Tree.c"
 }
 
 
@@ -2390,37 +2378,37 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	GtkTreePath* _tmp4_;
 	GtkTreeIter iter = {0};
 	GtkTreePath* _tmp13_;
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2414 "Tree.c"
+#line 2402 "Tree.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp4_;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2424 "Tree.c"
+#line 2412 "Tree.c"
 		GtkTreeStore* _tmp5_;
 		GtkTreePath* _tmp6_;
 		GtkTreeIter _tmp7_ = {0};
@@ -2429,89 +2417,89 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		GtkTreeIter _tmp10_;
 		gboolean _tmp11_;
 		GtkTreePath* _tmp12_;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->store;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = path;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_);
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		iter = _tmp7_;
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp8_) {
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2445 "Tree.c"
+#line 2433 "Tree.c"
 		}
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = self->priv->store;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_);
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp11_) {
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2457 "Tree.c"
+#line 2445 "Tree.c"
 		}
-#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_path_down (_tmp12_);
-#line 2463 "Tree.c"
+#line 2451 "Tree.c"
 	}
-#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = path;
-#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 391 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_);
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2473 "Tree.c"
+#line 2461 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2480 "Tree.c"
+#line 2468 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2487 "Tree.c"
+#line 2475 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2494 "Tree.c"
+#line 2482 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2501 "Tree.c"
+#line 2489 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2508 "Tree.c"
+#line 2496 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2515 "Tree.c"
+#line 2503 "Tree.c"
 }
 
 
@@ -2532,139 +2520,139 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 	SidebarBranch* _tmp24_;
 	SidebarBranch* _tmp25_;
 	SidebarBranch* _tmp26_;
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = position;
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_return_if_fail (_tmp0_ >= 0, "position >= 0");
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->branches;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = branch;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp3_, "!branches.has_key(branch)");
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->branches;
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = branch;
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = position;
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_));
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_) {
-#line 2566 "Tree.c"
+#line 2554 "Tree.c"
 		SidebarBranch* _tmp9_;
 		SidebarBranch* _tmp10_;
 		gboolean _tmp11_;
 		SidebarBranch* _tmp15_;
 		gboolean _tmp16_;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = branch;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp9_);
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = branch;
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_) {
-#line 2582 "Tree.c"
+#line 2570 "Tree.c"
 			SidebarBranch* _tmp12_;
 			SidebarEntry* _tmp13_;
 			SidebarEntry* _tmp14_;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = branch;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = sidebar_branch_get_root (_tmp12_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_first_child (self, _tmp14_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2596 "Tree.c"
+#line 2584 "Tree.c"
 		}
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = branch;
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp16_) {
-#line 2604 "Tree.c"
+#line 2592 "Tree.c"
 			SidebarBranch* _tmp17_;
 			SidebarEntry* _tmp18_;
 			SidebarEntry* _tmp19_;
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = branch;
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_branch_get_root (_tmp17_);
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_;
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_entry (self, _tmp19_);
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp19_);
-#line 2618 "Tree.c"
+#line 2606 "Tree.c"
 		}
 	}
-#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = branch;
-#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = branch;
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0);
-#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = branch;
-#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_ADDED_SIGNAL], 0, _tmp26_);
-#line 2649 "Tree.c"
+#line 2637 "Tree.c"
 }
 
 
 static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	GtkTreeIter* dup;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	dup = g_new0 (GtkTreeIter, 1);
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	memcpy (dup, self, sizeof (GtkTreeIter));
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2661 "Tree.c"
+#line 2649 "Tree.c"
 }
 
 
 static gpointer __gtk_tree_iter_dup0 (gpointer self) {
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2668 "Tree.c"
+#line 2656 "Tree.c"
 }
 
 
@@ -2703,39 +2691,39 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	SidebarEntry* _tmp46_;
 	GtkTreeIter* _tmp47_;
 	GtkTreeIter _tmp48_;
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->branches;
-#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	position = (gint) ((gintptr) _tmp5_);
-#line 426 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	insertion_iter = NULL;
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp7_;
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp8_;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2739 "Tree.c"
+#line 2727 "Tree.c"
 		gboolean _tmp9_;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
 		GtkTreeIter _tmp10_;
@@ -2747,154 +2735,154 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		gint _tmp16_;
 		GtkTreeStore* _tmp22_;
 		gboolean _tmp23_;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = found;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp9_) {
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2757 "Tree.c"
+#line 2745 "Tree.c"
 		}
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_);
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp12_ == NULL) {
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp11_);
-#line 2769 "Tree.c"
+#line 2757 "Tree.c"
 		}
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		root_wrapper = _tmp12_;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = root_wrapper;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp13_ != NULL, "root_wrapper != null");
-#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = position;
-#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = root_wrapper;
-#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _tmp15_->root_position;
-#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ < _tmp16_) {
-#line 2785 "Tree.c"
+#line 2773 "Tree.c"
 			GtkTreeStore* _tmp17_;
 			GtkTreeIter _tmp18_;
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeIter _tmp20_;
 			GtkTreeIter* _tmp21_;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = self->priv->store;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = iter;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_);
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_free0 (insertion_iter);
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _tmp19_;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_);
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			insertion_iter = _tmp21_;
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (root_wrapper);
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2809 "Tree.c"
+#line 2797 "Tree.c"
 		}
-#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->store;
-#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter);
-#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp23_;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2819 "Tree.c"
+#line 2807 "Tree.c"
 	}
-#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = insertion_iter;
-#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ == NULL) {
-#line 2825 "Tree.c"
+#line 2813 "Tree.c"
 		GtkTreeStore* _tmp25_;
 		GtkTreeIter _tmp26_ = {0};
 		GtkTreeIter _tmp27_;
 		GtkTreeIter* _tmp28_;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = self->priv->store;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp25_, &_tmp26_, NULL);
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (insertion_iter);
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = _tmp26_;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp28_;
-#line 2842 "Tree.c"
+#line 2830 "Tree.c"
 	}
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = insertion_iter;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->store;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = branch;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = sidebar_branch_get_root (_tmp31_);
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = self->priv->store;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = insertion_iter;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = *_tmp35_;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_);
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = _tmp37_;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = position;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_);
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _tmp40_;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = *_tmp29_;
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper));
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp41_);
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp38_);
-#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp33_);
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp43_ = branch;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp44_ = branch;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp45_ = sidebar_branch_get_root (_tmp44_);
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp46_ = _tmp45_;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = insertion_iter;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = *_tmp47_;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_);
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 452 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp46_);
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 2898 "Tree.c"
+#line 2886 "Tree.c"
 }
 
 
@@ -2904,31 +2892,31 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 	SidebarEntry* _tmp1_;
 	GeeList* _tmp2_;
 	GeeList* _tmp3_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (parent));
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (parent_iter != NULL);
-#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = parent;
-#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2932 "Tree.c"
+#line 2920 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -2939,25 +2927,25 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		gint _tmp7_;
 		gint _tmp8_;
 		gint _child_index = 0;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 2961 "Tree.c"
+#line 2949 "Tree.c"
 			gint _tmp9_;
 			gint _tmp10_;
 			gint _tmp11_;
@@ -2974,61 +2962,61 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			SidebarBranch* _tmp20_;
 			SidebarEntry* _tmp21_;
 			GtkTreeIter _tmp22_;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 2990 "Tree.c"
+#line 2978 "Tree.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->store;
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = *parent_iter;
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_);
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			append_iter = _tmp17_;
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = append_iter;
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = child;
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_);
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = branch;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = child;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = append_iter;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3024 "Tree.c"
+#line 3012 "Tree.c"
 		}
-#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3028 "Tree.c"
+#line 3016 "Tree.c"
 	}
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 455 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3032 "Tree.c"
+#line 3020 "Tree.c"
 }
 
 
@@ -3042,79 +3030,79 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 	GtkTreePath* _tmp6_;
 	SidebarTreeEntryWrapper* _tmp7_;
 	SidebarTreeEntryWrapper* _tmp8_;
-#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *assoc_iter;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->store;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = *assoc_iter;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp8_);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp6_);
-#line 3076 "Tree.c"
+#line 3064 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3083 "Tree.c"
+#line 3071 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3090 "Tree.c"
+#line 3078 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3097 "Tree.c"
+#line 3085 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3104 "Tree.c"
+#line 3092 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3111 "Tree.c"
+#line 3099 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3118 "Tree.c"
+#line 3106 "Tree.c"
 }
 
 
@@ -3160,162 +3148,162 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	SidebarRenameableEntry* _tmp37_;
 	SidebarRenameableEntry* _tmp38_;
 	SidebarEntry* _tmp40_;
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp5_, "!entry_map.has_key(entry)");
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->entry_map;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = entry;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_);
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = self->priv->store;
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = *assoc_iter;
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = entry;
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_);
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = _tmp12_;
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1);
-#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp13_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = self->priv->store;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = *assoc_iter;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = entry;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = _tmp17_;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = guarded_markup_escape_text (_tmp18_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp18_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->store;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = *assoc_iter;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = wrapper;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1);
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *assoc_iter;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp24_);
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = entry;
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0);
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = entry;
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL);
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp28_;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = pageable;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_ != NULL) {
-#line 3258 "Tree.c"
+#line 3246 "Tree.c"
 		SidebarPageRepresentative* _tmp30_;
 		SidebarPageRepresentative* _tmp31_;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = pageable;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp31_ = pageable;
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3269 "Tree.c"
+#line 3257 "Tree.c"
 	}
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = entry;
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL);
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp33_;
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = emphasizable;
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp34_ != NULL) {
-#line 3281 "Tree.c"
+#line 3269 "Tree.c"
 		SidebarEmphasizableEntry* _tmp35_;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = emphasizable;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3287 "Tree.c"
+#line 3275 "Tree.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL);
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp37_;
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = renameable;
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp38_ != NULL) {
-#line 3299 "Tree.c"
+#line 3287 "Tree.c"
 		SidebarRenameableEntry* _tmp39_;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp39_ = renameable;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3305 "Tree.c"
+#line 3293 "Tree.c"
 	}
-#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_grafted (_tmp40_, self);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3319 "Tree.c"
+#line 3307 "Tree.c"
 }
 
 
@@ -3350,97 +3338,97 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 	GtkTreeStore* _tmp23_;
 	GtkTreeIter _tmp24_;
 	GtkTreeIter _tmp25_;
-#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (new_iter != NULL, NULL);
-#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = current_wrapper;
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp4_;
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = self->priv->store;
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *new_iter;
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_;
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = _tmp10_;
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp11_;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = self->priv->entry_map;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper);
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = *new_iter;
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_name_for_entry (self, entry);
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _tmp15_;
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1);
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp16_);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = self->priv->store;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = *new_iter;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_entry_get_sidebar_tooltip (entry);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = guarded_markup_escape_text (_tmp20_);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = _tmp21_;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp22_);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = self->priv->store;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *new_iter;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = *new_iter;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp25_);
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = new_wrapper;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3444 "Tree.c"
+#line 3432 "Tree.c"
 }
 
 
@@ -3470,91 +3458,91 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 	SidebarBranch* _tmp22_;
 	gboolean _tmp23_;
 	SidebarBranch* _tmp24_;
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 522 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_branch_get_root (_tmp3_);
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_);
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = _tmp6_;
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp5_);
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 3500 "Tree.c"
+#line 3488 "Tree.c"
 		SidebarBranch* _tmp8_;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = branch;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3506 "Tree.c"
+#line 3494 "Tree.c"
 	}
-#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = branch;
-#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE);
-#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self);
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = branch;
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE);
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self);
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = branch;
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = branch;
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self);
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = branch;
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE);
-#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = branch;
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self);
-#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->branches;
-#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL);
-#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp23_;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_REMOVED_SIGNAL], 0, _tmp24_);
-#line 3558 "Tree.c"
+#line 3546 "Tree.c"
 }
 
 
@@ -3566,39 +3554,39 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	SidebarTreeEntryWrapper* _tmp3_;
 	SidebarTreeRootWrapper* _tmp4_;
 	SidebarTreeRootWrapper* _tmp5_;
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_branch_get_root (_tmp0_);
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3588 "Tree.c"
+#line 3576 "Tree.c"
 	}
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp2_);
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	root_wrapper = _tmp5_;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (root_wrapper != NULL, "root_wrapper != null");
-#line 546 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3602 "Tree.c"
+#line 3590 "Tree.c"
 }
 
 
@@ -3610,54 +3598,54 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 	SidebarTreeEntryWrapper* _tmp3_;
 	gboolean _tmp4_;
 	gboolean _tmp5_;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_is_selected (self, _tmp1_);
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp2_;
-#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = only_children;
-#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_);
-#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = selected;
-#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 3636 "Tree.c"
+#line 3624 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_;
 		SidebarEntry* _tmp7_;
 		SidebarSelectableEntry* _tmp8_;
 		SidebarSelectableEntry* _tmp9_;
 		SidebarSelectableEntry* _tmp10_;
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL);
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp8_;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selectable;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "selectable != null");
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = selectable;
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_SELECTED_ENTRY_REMOVED_SIGNAL], 0, _tmp10_);
-#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3661 "Tree.c"
+#line 3649 "Tree.c"
 	}
 }
 
@@ -3705,29 +3693,29 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	SidebarEntry* _tmp58_;
 	gboolean _tmp59_;
 	gboolean _tmp60_;
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_);
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_);
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp4_;
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 567 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp5_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3731 "Tree.c"
+#line 3719 "Tree.c"
 		gboolean _tmp6_;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
 		GtkTreeIter _tmp7_;
@@ -3737,39 +3725,39 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		SidebarTreeEntryWrapper* _tmp11_;
 		GtkTreeStore* _tmp12_;
 		gboolean _tmp13_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = found;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp6_) {
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3747 "Tree.c"
+#line 3735 "Tree.c"
 		}
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = child_iter;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		child_wrapper = _tmp8_;
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = child_wrapper;
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "child_wrapper != null");
-#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = children;
-#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = child_wrapper;
-#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = self->priv->store;
-#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp13_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3773 "Tree.c"
+#line 3761 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
@@ -3780,25 +3768,25 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		gint _tmp17_;
 		gint _tmp18_;
 		gint _child_wrapper_index = 0;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = children;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_list = _tmp15_;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _child_wrapper_list;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = _tmp17_;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_size = _tmp18_;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_index = -1;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3802 "Tree.c"
+#line 3790 "Tree.c"
 			gint _tmp19_;
 			gint _tmp20_;
 			gint _tmp21_;
@@ -3807,188 +3795,188 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			gint _tmp23_;
 			gpointer _tmp24_;
 			SidebarTreeEntryWrapper* _tmp25_;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _child_wrapper_index;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_wrapper_index = _tmp19_ + 1;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _child_wrapper_index;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _child_wrapper_size;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp20_ < _tmp21_)) {
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3823 "Tree.c"
+#line 3811 "Tree.c"
 			}
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = _child_wrapper_list;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _child_wrapper_index;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = child_wrapper;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
 #line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 3839 "Tree.c"
+#line 3827 "Tree.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3843 "Tree.c"
+#line 3831 "Tree.c"
 	}
-#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = only_children;
-#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp26_) {
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3853 "Tree.c"
+#line 3841 "Tree.c"
 	}
-#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_);
-#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp28_;
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = self->priv->store;
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp29_, &iter);
-#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->selected_wrapper;
-#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = wrapper;
-#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp30_ == _tmp31_) {
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3873 "Tree.c"
+#line 3861 "Tree.c"
 	}
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = wrapper;
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_->entry;
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp34_;
-#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = entry;
-#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_pruned (_tmp35_, self);
-#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE);
-#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = entry;
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self);
-#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL);
-#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp41_;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = pageable;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp42_ != NULL) {
-#line 3909 "Tree.c"
+#line 3897 "Tree.c"
 		SidebarPageRepresentative* _tmp43_;
 		guint _tmp44_;
 		SidebarPageRepresentative* _tmp45_;
 		guint _tmp46_;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = pageable;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE);
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self);
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = pageable;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 3926 "Tree.c"
+#line 3914 "Tree.c"
 	}
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = entry;
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL);
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp48_;
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp49_ = renameable;
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp49_ != NULL) {
-#line 3938 "Tree.c"
+#line 3926 "Tree.c"
 		SidebarRenameableEntry* _tmp50_;
 		guint _tmp51_;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = renameable;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 3947 "Tree.c"
+#line 3935 "Tree.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp52_ = entry;
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL);
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp53_;
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp54_ = emphasizable;
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp54_ != NULL) {
-#line 3959 "Tree.c"
+#line 3947 "Tree.c"
 		SidebarEmphasizableEntry* _tmp55_;
 		guint _tmp56_;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp55_ = emphasizable;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 3968 "Tree.c"
+#line 3956 "Tree.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = self->priv->entry_map;
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = entry;
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL);
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp59_;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp60_ = removed;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp60_, "removed");
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 563 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3992 "Tree.c"
+#line 3980 "Tree.c"
 }
 
 
@@ -4015,47 +4003,47 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp27_;
 	SidebarBranch* _tmp28_;
 	gboolean _tmp29_;
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_);
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp2_;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = parent;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp3_ != NULL, "parent != null");
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = parent;
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_);
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp5_;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = parent_wrapper;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp6_ != NULL, "parent_wrapper != null");
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = entry;
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_);
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 622 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	next = _tmp9_;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = next;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 4059 "Tree.c"
+#line 4047 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
 		SidebarEntry* _tmp11_;
 		SidebarTreeEntryWrapper* _tmp12_;
@@ -4065,81 +4053,81 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp16_;
 		GtkTreeIter _tmp17_ = {0};
 		GtkTreeIter _tmp18_ = {0};
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = next;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_);
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		next_wrapper = _tmp12_;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->store;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = parent_wrapper;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = next_wrapper;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_);
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp18_;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4091 "Tree.c"
+#line 4079 "Tree.c"
 	} else {
 		GtkTreeStore* _tmp19_;
 		SidebarTreeEntryWrapper* _tmp20_;
 		GtkTreeIter _tmp21_ = {0};
 		GtkTreeIter _tmp22_ = {0};
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = self->priv->store;
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = parent_wrapper;
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_);
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 630 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp22_;
-#line 4107 "Tree.c"
+#line 4095 "Tree.c"
 	}
-#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = insertion_iter;
-#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = entry;
-#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_);
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = insertion_iter;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_);
-#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = branch;
-#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
-#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_) {
-#line 4129 "Tree.c"
+#line 4117 "Tree.c"
 		SidebarEntry* _tmp30_;
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = entry;
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4135 "Tree.c"
+#line 4123 "Tree.c"
 	}
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 614 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4143 "Tree.c"
+#line 4131 "Tree.c"
 }
 
 
@@ -4147,27 +4135,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	SidebarEntry* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (wrapper, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
-#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 640 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4171 "Tree.c"
+#line 4159 "Tree.c"
 }
 
 
@@ -4188,41 +4176,41 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp15_ = {0};
 	GtkTreeStore* _tmp16_;
 	GtkTreeIter* _tmp17_;
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 654 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_);
-#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp6_;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = prev;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ != NULL) {
-#line 4226 "Tree.c"
+#line 4214 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp8_;
 		SidebarTreeEntryWrapper* _tmp9_;
@@ -4230,49 +4218,49 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp11_;
 		GtkTreeIter _tmp12_ = {0};
 		GtkTreeIter* _tmp13_;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = prev;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_);
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp9_;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = prev_wrapper;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp10_ != NULL, "prev_wrapper != null");
-#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = prev_wrapper;
-#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_);
-#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp13_;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4256 "Tree.c"
+#line 4244 "Tree.c"
 	}
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = wrapper;
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry_iter = _tmp15_;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = self->priv->store;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = prev_iter;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_);
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 648 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4276 "Tree.c"
+#line 4264 "Tree.c"
 }
 
 
@@ -4320,95 +4308,95 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	SidebarTreeEntryWrapper* _tmp37_;
 	SidebarTreeEntryWrapper* _tmp38_;
 	gboolean _tmp39_;
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent));
-#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_get_current_path (self);
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_);
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = _tmp9_ == 0;
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp10_;
-#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = wrapper;
-#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp12_;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp13_, &iter);
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = branch;
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = entry;
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_);
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp16_;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = parent;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp17_ != NULL, "parent != null");
-#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = parent;
-#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_);
-#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp19_;
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = parent_wrapper;
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp20_ != NULL, "parent_wrapper != null");
-#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = entry;
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_);
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp23_;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = prev;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ != NULL) {
-#line 4412 "Tree.c"
+#line 4400 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp25_;
 		SidebarTreeEntryWrapper* _tmp26_;
@@ -4416,86 +4404,86 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		SidebarTreeEntryWrapper* _tmp28_;
 		GtkTreeIter _tmp29_ = {0};
 		GtkTreeIter* _tmp30_;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = prev;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_);
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp26_;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = prev_wrapper;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp27_ != NULL, "prev_wrapper != null");
-#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = prev_wrapper;
-#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_);
-#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_);
-#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp30_;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4442 "Tree.c"
+#line 4430 "Tree.c"
 	}
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = self->priv->store;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = parent_wrapper;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_);
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = prev_iter;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_);
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_iter = _tmp35_;
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = new_iter;
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = wrapper;
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_);
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp38_;
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = selected;
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp39_) {
-#line 4468 "Tree.c"
+#line 4456 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp40_;
 		SidebarEntry* _tmp41_;
 		SidebarTreeEntryWrapper* _tmp42_;
 		SidebarEntry* _tmp43_;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp40_ = new_wrapper;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = _tmp40_->entry;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp41_);
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = new_wrapper;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = _tmp42_->entry;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4485 "Tree.c"
+#line 4473 "Tree.c"
 	}
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4499 "Tree.c"
+#line 4487 "Tree.c"
 }
 
 
@@ -4505,29 +4493,29 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 	SidebarEntry* _tmp1_;
 	GeeList* _tmp2_;
 	GeeList* _tmp3_;
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4531 "Tree.c"
+#line 4519 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -4538,25 +4526,25 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		gint _tmp7_;
 		gint _tmp8_;
 		gint _child_index = 0;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4560 "Tree.c"
+#line 4548 "Tree.c"
 			gint _tmp9_;
 			gint _tmp10_;
 			gint _tmp11_;
@@ -4572,61 +4560,61 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			SidebarTreeEntryWrapper* _tmp18_;
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeStore* _tmp20_;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4588 "Tree.c"
+#line 4576 "Tree.c"
 			}
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = child;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = _tmp16_;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = child_wrapper;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_vala_assert (_tmp17_ != NULL, "child_wrapper != null");
-#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = child_wrapper;
-#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_);
-#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_iter = _tmp19_;
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = self->priv->store;
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_move_before (_tmp20_, &child_iter, NULL);
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4622 "Tree.c"
+#line 4610 "Tree.c"
 		}
-#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 713 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4626 "Tree.c"
+#line 4614 "Tree.c"
 	}
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 706 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4630 "Tree.c"
+#line 4618 "Tree.c"
 }
 
 
@@ -4634,36 +4622,36 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
 	gboolean _tmp0_;
 	SidebarBranch* _tmp3_;
 	gboolean _tmp4_;
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = shown;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 4646 "Tree.c"
+#line 4634 "Tree.c"
 		SidebarBranch* _tmp1_;
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = branch;
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4652 "Tree.c"
+#line 4640 "Tree.c"
 	} else {
 		SidebarBranch* _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = branch;
-#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4659 "Tree.c"
+#line 4647 "Tree.c"
 	}
-#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = shown;
-#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_BRANCH_SHOWN_SIGNAL], 0, _tmp3_, _tmp4_);
-#line 4667 "Tree.c"
+#line 4655 "Tree.c"
 }
 
 
@@ -4676,68 +4664,143 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
 	const gchar* _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = tooltip;
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1);
-#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4708 "Tree.c"
+#line 4696 "Tree.c"
 }
 
 
-static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon) {
+static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntry* entry, const gchar* icon_name) {
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	SidebarEntry* _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
-	GtkTreeStore* _tmp2_;
-	GtkTreeIter _tmp3_ = {0};
-	const gchar* _tmp4_;
-#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	SidebarTreeEntryWrapper* _tmp2_;
+	GIcon* icon = NULL;
+	GtkTreeStore* _tmp8_;
+	SidebarTreeEntryWrapper* _tmp9_;
+	GtkTreeIter _tmp10_ = {0};
+	GIcon* _tmp11_;
+	GError * _inner_error_ = NULL;
+#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp2_ = wrapper;
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_vala_assert (_tmp2_ != NULL, "wrapper != null");
 #line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_assert (wrapper != NULL, "wrapper != null");
+	icon = NULL;
+#line 4727 "Tree.c"
+	{
+		const gchar* _tmp3_;
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp3_ = icon_name;
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		if (_tmp3_ != NULL) {
+#line 4734 "Tree.c"
+			GIcon* _tmp4_ = NULL;
+			const gchar* _tmp5_;
+			GIcon* _tmp6_;
+			GIcon* _tmp7_;
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp5_ = icon_name;
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp6_ = g_icon_new_for_string (_tmp5_, &_inner_error_);
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp4_ = _tmp6_;
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4747 "Tree.c"
+				goto __catch56_g_error;
+			}
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp7_ = _tmp4_;
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp4_ = NULL;
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_g_object_unref0 (icon);
+#line 745 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			icon = _tmp7_;
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_g_object_unref0 (_tmp4_);
+#line 4760 "Tree.c"
+		}
+	}
+	goto __finally56;
+	__catch56_g_error:
+	{
+		GError* e = NULL;
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_ = self->priv->store;
+		e = _inner_error_;
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
+		_inner_error_ = NULL;
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_error_free0 (e);
+#line 4773 "Tree.c"
+	}
+	__finally56:
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = icon;
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
-#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (icon);
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (wrapper);
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_clear_error (&_inner_error_);
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		return;
+#line 4788 "Tree.c"
+	}
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp8_ = self->priv->store;
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp9_ = wrapper;
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	sidebar_tree_entry_wrapper_get_iter (_tmp9_, &_tmp10_);
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp11_ = icon;
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_store_set (_tmp8_, &_tmp10_, SIDEBAR_TREE_COLUMNS_ICON, _tmp11_, -1);
+#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_g_object_unref0 (icon);
+#line 738 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4741 "Tree.c"
+#line 4804 "Tree.c"
 }
 
 
@@ -4750,103 +4813,103 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarEntry* _tmp4_;
 	gchar* _tmp5_;
 	gchar* _tmp6_;
-#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_);
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1);
-#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 752 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4782 "Tree.c"
+#line 4845 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
 	SidebarEntry* _tmp0_;
-#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (name != NULL);
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 760 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4798 "Tree.c"
+#line 4861 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_;
 	Page* _tmp1_;
-#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 764 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4817 "Tree.c"
+#line 4880 "Tree.c"
 }
 
 
 static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
 	SidebarEmphasizableEntry* _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry));
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 768 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4831 "Tree.c"
+#line 4894 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_;
 	Page* _tmp1_;
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL], 0, _tmp0_, _tmp1_);
-#line 4850 "Tree.c"
+#line 4913 "Tree.c"
 }
 
 
@@ -4854,55 +4917,128 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	GtkTreeIter _tmp0_;
 	SidebarTreeEntryWrapper* _tmp1_;
+	GIcon* icon = NULL;
 	SidebarTreeEntryWrapper* _tmp2_;
-	gchar* icon = NULL;
-	SidebarTreeEntryWrapper* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gchar* _tmp5_;
-	GtkTreeStore* _tmp6_;
-	GtkTreeIter _tmp7_;
-	const gchar* _tmp8_;
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	GtkTreeStore* _tmp11_;
+	GtkTreeIter _tmp12_;
+	GIcon* _tmp13_;
+	GError * _inner_error_ = NULL;
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 776 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	icon = NULL;
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (icon);
+#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4884 "Tree.c"
+#line 4949 "Tree.c"
 	}
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = wrapper;
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = _tmp3_->entry;
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_);
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	icon = _tmp5_;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_ = self->priv->store;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = *iter;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = icon;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1);
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_free0 (icon);
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	{
+		gchar* name = NULL;
+		SidebarTreeEntryWrapper* _tmp3_;
+		SidebarEntry* _tmp4_;
+		gchar* _tmp5_;
+		const gchar* _tmp6_;
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp3_ = wrapper;
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp4_ = _tmp3_->entry;
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_);
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		name = _tmp5_;
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp6_ = name;
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		if (_tmp6_ != NULL) {
+#line 4969 "Tree.c"
+			GIcon* _tmp7_ = NULL;
+			const gchar* _tmp8_;
+			GIcon* _tmp9_;
+			GIcon* _tmp10_;
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp8_ = name;
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp9_ = g_icon_new_for_string (_tmp8_, &_inner_error_);
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp7_ = _tmp9_;
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+				_g_free0 (name);
+#line 4984 "Tree.c"
+				goto __catch57_g_error;
+			}
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp10_ = _tmp7_;
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_tmp7_ = NULL;
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_g_object_unref0 (icon);
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			icon = _tmp10_;
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+			_g_object_unref0 (_tmp7_);
+#line 4997 "Tree.c"
+		}
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_free0 (name);
+#line 5001 "Tree.c"
+	}
+	goto __finally57;
+	__catch57_g_error:
+	{
+		GError* e = NULL;
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		e = _inner_error_;
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_inner_error_ = NULL;
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_error_free0 (e);
+#line 5013 "Tree.c"
+	}
+	__finally57:
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (icon);
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (wrapper);
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_clear_error (&_inner_error_);
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		return;
+#line 5028 "Tree.c"
+	}
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp11_ = self->priv->store;
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp12_ = *iter;
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp13_ = icon;
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_tree_store_set (_tmp11_, &_tmp12_, SIDEBAR_TREE_COLUMNS_ICON, _tmp13_, -1);
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_g_object_unref0 (icon);
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4906 "Tree.c"
+#line 5042 "Tree.c"
 }
 
 
@@ -4913,56 +5049,56 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 	GtkTreeIter _tmp2_;
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_;
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp0_);
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = *iter;
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_);
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp3_;
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 4935 "Tree.c"
+#line 5071 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 4942 "Tree.c"
+#line 5078 "Tree.c"
 				GtkTreeIter _tmp8_;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 4946 "Tree.c"
+#line 5082 "Tree.c"
 					GtkTreeStore* _tmp6_;
 					gboolean _tmp7_;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					if (!_tmp7_) {
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 4957 "Tree.c"
+#line 5093 "Tree.c"
 					}
 				}
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp5_ = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp8_ = child_iter;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 798 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 4966 "Tree.c"
+#line 5102 "Tree.c"
 			}
 		}
 	}
@@ -4976,46 +5112,46 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	SidebarTreeEntryWrapper* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp3_;
-#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 803 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 806 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 4998 "Tree.c"
+#line 5134 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp4_;
 		SidebarEntry* _tmp5_;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = wrapper;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->entry;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5007 "Tree.c"
+#line 5143 "Tree.c"
 	} else {
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5011 "Tree.c"
+#line 5147 "Tree.c"
 	}
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5019 "Tree.c"
+#line 5155 "Tree.c"
 }
 
 
@@ -5043,65 +5179,65 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint _tmp13_ = 0;
 	gboolean _tmp14_;
 	GtkTreePath* _tmp16_;
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, NULL);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->window;
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_display_get_default ();
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gdk_display_get_device_manager (_tmp2_);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	x = _tmp5_;
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	y = _tmp6_;
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 814 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	mask = _tmp7_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = x;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = y;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_);
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp11_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_x = _tmp12_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_y = _tmp13_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_) {
-#line 5085 "Tree.c"
+#line 5221 "Tree.c"
 		GtkTreePath* _tmp15_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = path;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp15_;
-#line 5091 "Tree.c"
+#line 5227 "Tree.c"
 	} else {
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = NULL;
-#line 5095 "Tree.c"
+#line 5231 "Tree.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5105 "Tree.c"
+#line 5241 "Tree.c"
 }
 
 
@@ -5120,74 +5256,74 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GList* _tmp10_;
 	guint _tmp11_;
 	GtkTreePath* _tmp14_;
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp0_, &_tmp1_);
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp3_;
-#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp2_;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = rows;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = g_list_length (_tmp5_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5146 "Tree.c"
+#line 5282 "Tree.c"
 	} else {
 		GList* _tmp7_;
 		guint _tmp8_;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = rows;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_list_length (_tmp7_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5156 "Tree.c"
+#line 5292 "Tree.c"
 	}
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = rows;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp11_ != ((guint) 0)) {
-#line 5166 "Tree.c"
+#line 5302 "Tree.c"
 		GList* _tmp12_;
 		gconstpointer _tmp13_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = rows;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5175 "Tree.c"
+#line 5311 "Tree.c"
 	} else {
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = NULL;
-#line 5179 "Tree.c"
+#line 5315 "Tree.c"
 	}
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5191 "Tree.c"
+#line 5327 "Tree.c"
 }
 
 
@@ -5205,65 +5341,65 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	GtkTreePath* _tmp7_;
 	GtkTreePath* _tmp8_;
 	gboolean _tmp9_;
-#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_get_selected_rows (_tmp0_, NULL);
-#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp1_;
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = rows;
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5227 "Tree.c"
+#line 5363 "Tree.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->data;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp5_;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5249 "Tree.c"
+#line 5385 "Tree.c"
 	}
-#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
-#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp7_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = path;
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp9_;
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5267 "Tree.c"
+#line 5403 "Tree.c"
 }
 
 
@@ -5291,157 +5427,157 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	GtkMenu* _tmp16_;
 	GtkWidget* _tmp17_;
 	GdkEventButton* _tmp19_;
-#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5315 "Tree.c"
+#line 5451 "Tree.c"
 	}
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL);
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	contextable = _tmp5_;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = contextable;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5337 "Tree.c"
+#line 5473 "Tree.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->entry;
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL);
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selectable = _tmp9_;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = selectable;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5351 "Tree.c"
+#line 5487 "Tree.c"
 		SidebarSelectableEntry* _tmp11_;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit (self, sidebar_tree_signals[SIDEBAR_TREE_ENTRY_SELECTED_SIGNAL], 0, _tmp11_);
-#line 5357 "Tree.c"
+#line 5493 "Tree.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = event;
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_);
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	context_menu = _tmp14_;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context_menu;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp15_ == NULL) {
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (context_menu);
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5383 "Tree.c"
+#line 5519 "Tree.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context_menu;
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 5391 "Tree.c"
+#line 5527 "Tree.c"
 		GtkMenu* _tmp18_;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = context_menu;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 863 "/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 5397 "Tree.c"
+#line 5533 "Tree.c"
 	}
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = event;
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp19_ != NULL) {
-#line 5403 "Tree.c"
+#line 5539 "Tree.c"
 		GtkMenu* _tmp20_;
 		GdkEventButton* _tmp21_;
 		guint _tmp22_;
 		GdkEventButton* _tmp23_;
 		guint32 _tmp24_;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = context_menu;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp21_ = event;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = _tmp21_->button;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = event;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = _tmp23_->time;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5421 "Tree.c"
+#line 5557 "Tree.c"
 	} else {
 		GtkMenu* _tmp25_;
 		guint32 _tmp26_;
-#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = context_menu;
-#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = gtk_get_current_event_time ();
-#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5431 "Tree.c"
+#line 5567 "Tree.c"
 	}
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (context_menu);
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selectable);
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (contextable);
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5445 "Tree.c"
+#line 5581 "Tree.c"
 }
 
 
@@ -5452,27 +5588,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	guint _tmp2_;
 	GdkEventButton* _tmp3_;
 	guint32 _tmp4_;
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = event;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_->button;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = event;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->time;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5476 "Tree.c"
+#line 5612 "Tree.c"
 }
 
 
@@ -5489,129 +5625,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	GtkTreePath* _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp16_;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5515 "Tree.c"
+#line 5651 "Tree.c"
 	}
-#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
-#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	should_allow_toggle = _tmp3_;
-#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/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 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5529 "Tree.c"
+#line 5665 "Tree.c"
 		GtkTreeStore* _tmp8_;
 		GtkTreeIter _tmp9_;
 		gboolean _tmp10_;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = *iter;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/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 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5541 "Tree.c"
+#line 5677 "Tree.c"
 	} else {
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5545 "Tree.c"
+#line 5681 "Tree.c"
 	}
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5549 "Tree.c"
+#line 5685 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp11_;
 		SidebarEntry* _tmp12_;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5558 "Tree.c"
+#line 5694 "Tree.c"
 	} else {
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5562 "Tree.c"
+#line 5698 "Tree.c"
 	}
-#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5566 "Tree.c"
+#line 5702 "Tree.c"
 		gint _tmp13_;
 		gint _tmp14_;
-#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
-#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = _tmp13_ + 1;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = self->priv->expander_special_count;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ == 1) {
-#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
-#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5583 "Tree.c"
+#line 5719 "Tree.c"
 		} else {
 			gboolean _tmp15_;
-#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
-#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5590 "Tree.c"
+#line 5726 "Tree.c"
 		}
 	} else {
-#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5595 "Tree.c"
+#line 5731 "Tree.c"
 	}
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
-#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp16_) {
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5607 "Tree.c"
+#line 5743 "Tree.c"
 	}
-#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5615 "Tree.c"
+#line 5751 "Tree.c"
 }
 
 
@@ -5628,120 +5764,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	guint _tmp8_;
 	GdkEventButton* _tmp58_;
 	gboolean _tmp59_;
-#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp1_;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5646 "Tree.c"
+#line 5782 "Tree.c"
 		GdkEventButton* _tmp4_;
 		guint _tmp5_;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5655 "Tree.c"
+#line 5791 "Tree.c"
 	} else {
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5659 "Tree.c"
+#line 5795 "Tree.c"
 	}
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5669 "Tree.c"
+#line 5805 "Tree.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->button;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5677 "Tree.c"
+#line 5813 "Tree.c"
 		GdkEventButton* _tmp9_;
 		GdkEventType _tmp10_;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5686 "Tree.c"
+#line 5822 "Tree.c"
 	} else {
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5690 "Tree.c"
+#line 5826 "Tree.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5694 "Tree.c"
+#line 5830 "Tree.c"
 		GtkTreePath* _tmp11_;
-#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
-#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5700 "Tree.c"
+#line 5836 "Tree.c"
 			GtkTreePath* _tmp12_;
 			GdkEventButton* _tmp13_;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5709 "Tree.c"
+#line 5845 "Tree.c"
 		} else {
 			GdkEventButton* _tmp14_;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
-#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5716 "Tree.c"
+#line 5852 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
 		GdkEventButton* _tmp16_;
 		guint _tmp17_;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5728 "Tree.c"
+#line 5864 "Tree.c"
 			GdkEventButton* _tmp18_;
 			GdkEventType _tmp19_;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5737 "Tree.c"
+#line 5873 "Tree.c"
 		} else {
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5741 "Tree.c"
+#line 5877 "Tree.c"
 		}
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5745 "Tree.c"
+#line 5881 "Tree.c"
 			GtkTreePath* _tmp20_;
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp23_;
@@ -5759,226 +5895,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			GtkTreeStore* _tmp55_;
 			GtkTreePath* _tmp56_;
 			GtkTreeRowReference* _tmp57_;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5767 "Tree.c"
+#line 5903 "Tree.c"
 				GdkEventButton* _tmp21_;
 				gboolean _tmp22_;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp21_ = event;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/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 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp22_;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5784 "Tree.c"
+#line 5920 "Tree.c"
 			}
-#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
-#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
-#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp24_;
-#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = wrapper;
-#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5796 "Tree.c"
+#line 5932 "Tree.c"
 				GdkEventButton* _tmp26_;
 				gboolean _tmp27_;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = event;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/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 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp27_;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5815 "Tree.c"
+#line 5951 "Tree.c"
 			}
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp30_ = _tmp29_->entry;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5825 "Tree.c"
+#line 5961 "Tree.c"
 			} else {
 				SidebarTreeEntryWrapper* _tmp31_;
 				SidebarEntry* _tmp32_;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5835 "Tree.c"
+#line 5971 "Tree.c"
 			}
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5839 "Tree.c"
+#line 5975 "Tree.c"
 				GtkTreePath* _tmp33_;
-#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
-#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5845 "Tree.c"
+#line 5981 "Tree.c"
 			}
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5851 "Tree.c"
+#line 5987 "Tree.c"
 				const GtkTreeRowReference* _tmp37_;
 				GtkTreePath* _tmp38_;
 				GtkTreePath* _tmp39_;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp39_ = _tmp38_;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = _tmp39_ != NULL;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5865 "Tree.c"
+#line 6001 "Tree.c"
 			} else {
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5869 "Tree.c"
+#line 6005 "Tree.c"
 			}
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5873 "Tree.c"
+#line 6009 "Tree.c"
 				const GtkTreeRowReference* _tmp40_;
 				GtkTreePath* _tmp41_;
 				GtkTreePath* _tmp42_;
 				GtkTreePath* _tmp43_;
 				gint _tmp44_;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp42_ = _tmp41_;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp43_ = path;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = _tmp44_ == 0;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5893 "Tree.c"
+#line 6029 "Tree.c"
 			} else {
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5897 "Tree.c"
+#line 6033 "Tree.c"
 			}
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5901 "Tree.c"
+#line 6037 "Tree.c"
 				GtkCellRendererText* _tmp45_;
 				GdkEventButton* _tmp46_;
 				gboolean _tmp47_;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp46_ = event;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/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 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp47_;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5921 "Tree.c"
+#line 6057 "Tree.c"
 			}
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp50_ = _tmp49_->entry;
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5929 "Tree.c"
+#line 6065 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp51_;
 				SidebarEntry* _tmp52_;
 				gboolean _tmp53_;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp52_ = _tmp51_->entry;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 961 "/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 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 5941 "Tree.c"
+#line 6077 "Tree.c"
 			} else {
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 5945 "Tree.c"
+#line 6081 "Tree.c"
 			}
-#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 960 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 5949 "Tree.c"
+#line 6085 "Tree.c"
 				GtkCellRendererText* _tmp54_;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5955 "Tree.c"
+#line 6091 "Tree.c"
 			}
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = path;
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/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 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			self->priv->old_path_ref = _tmp57_;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 5969 "Tree.c"
+#line 6105 "Tree.c"
 		}
 	}
-#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = event;
-#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/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 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp59_;
-#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5982 "Tree.c"
+#line 6118 "Tree.c"
 }
 
 
@@ -5989,53 +6125,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/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 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6019 "Tree.c"
+#line 6155 "Tree.c"
 			default:
 			{
-#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6026 "Tree.c"
+#line 6162 "Tree.c"
 			}
 		}
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6032 "Tree.c"
+#line 6168 "Tree.c"
 			default:
 			{
-#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
-#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6039 "Tree.c"
+#line 6175 "Tree.c"
 			}
 		}
 	}
@@ -6050,134 +6186,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
 	GQuark _tmp5_ = 0U;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6062 "Tree.c"
+#line 6198 "Tree.c"
 	GdkEventKey* _tmp15_;
 	gboolean _tmp16_;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/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 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6083 "Tree.c"
+#line 6219 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp6_;
 				GtkTreePath* _tmp7_;
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp6_;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp7_ = path;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6097 "Tree.c"
+#line 6233 "Tree.c"
 					GtkTreePath* _tmp8_;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6103 "Tree.c"
+#line 6239 "Tree.c"
 				}
-#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6111 "Tree.c"
+#line 6247 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6117 "Tree.c"
+#line 6253 "Tree.c"
 			default:
 			{
 				gboolean _tmp9_;
-#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
-#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6127 "Tree.c"
+#line 6263 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6133 "Tree.c"
+#line 6269 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp10_;
 				gboolean _tmp11_ = FALSE;
 				GtkTreePath* _tmp12_;
-#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
-#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp10_;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = path;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6148 "Tree.c"
+#line 6284 "Tree.c"
 					GtkTreePath* _tmp13_;
 					gboolean _tmp14_;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6157 "Tree.c"
+#line 6293 "Tree.c"
 				} else {
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6161 "Tree.c"
+#line 6297 "Tree.c"
 				}
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6169 "Tree.c"
+#line 6305 "Tree.c"
 			}
 		}
 	}
-#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = event;
-#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/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 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6181 "Tree.c"
+#line 6317 "Tree.c"
 }
 
 
@@ -6188,41 +6324,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	SidebarEntry* _tmp2_;
 	gboolean _tmp3_;
 	gboolean _tmp4_;
-#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6206 "Tree.c"
+#line 6342 "Tree.c"
 	}
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6218 "Tree.c"
+#line 6354 "Tree.c"
 	}
-#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp4_;
-#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6226 "Tree.c"
+#line 6362 "Tree.c"
 }
 
 
@@ -6235,57 +6371,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp2_;
 	GtkTreePath* _tmp3_;
 	gboolean _tmp4_;
-#line 1002 "/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 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/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 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
-#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_column = _tmp2_;
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6259 "Tree.c"
+#line 6395 "Tree.c"
 		GtkTreePath* _tmp5_;
 		GtkTreeViewColumn* _tmp6_;
 		GtkCellRendererText* _tmp7_;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = cursor_column;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = self->priv->text_renderer;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/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 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
-#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (cursor_path);
-#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6279 "Tree.c"
+#line 6415 "Tree.c"
 	}
-#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6289 "Tree.c"
+#line 6425 "Tree.c"
 }
 
 
@@ -6298,45 +6434,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_;
 	GtkTreePath* _tmp4_;
 	GtkTreePath* _tmp5_;
-#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6322 "Tree.c"
+#line 6458 "Tree.c"
 	}
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1036 "/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 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1036 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6340 "Tree.c"
+#line 6476 "Tree.c"
 }
 
 
@@ -6347,55 +6483,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	SidebarInternalDragSourceEntry* _tmp6_;
 	SidebarInternalDragSourceEntry* _tmp16_;
 	GtkSelectionData* _tmp17_;
-#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	drag_source = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->internal_drag_source_entry;
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6363 "Tree.c"
+#line 6499 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_;
 		SidebarSelectableEntry* _tmp2_;
 		SidebarSelectableEntry* _tmp3_;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/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 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = selectable;
-#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6378 "Tree.c"
+#line 6514 "Tree.c"
 			SidebarEntry* _tmp4_;
 			SidebarInternalDragSourceEntry* _tmp5_;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/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 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6389 "Tree.c"
+#line 6525 "Tree.c"
 		}
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6393 "Tree.c"
+#line 6529 "Tree.c"
 	}
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6399 "Tree.c"
+#line 6535 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_;
 		GtkTreePath* _tmp8_;
@@ -6407,81 +6543,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		SidebarEntry* _tmp13_;
 		SidebarInternalDragSourceEntry* _tmp14_;
 		SidebarInternalDragSourceEntry* _tmp15_;
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selected_path = _tmp7_;
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = selected_path;
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6425 "Tree.c"
+#line 6561 "Tree.c"
 		}
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_);
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1058 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp10_;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == NULL) {
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6445 "Tree.c"
+#line 6581 "Tree.c"
 		}
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->entry;
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/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 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (drag_source);
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		drag_source = _tmp14_;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = drag_source;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_ == NULL) {
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6469 "Tree.c"
+#line 6605 "Tree.c"
 		}
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6475 "Tree.c"
+#line 6611 "Tree.c"
 	}
-#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
-#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = selection_data;
-#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
-#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6485 "Tree.c"
+#line 6621 "Tree.c"
 }
 
 
@@ -6514,87 +6650,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	GdkDragContext* _tmp57_;
 	gboolean _tmp58_;
 	guint _tmp59_;
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = x;
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = y;
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/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 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp2_;
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp3_;
-#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6538 "Tree.c"
+#line 6674 "Tree.c"
 		GdkDragContext* _tmp5_;
 		GtkWidget* _tmp6_;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6547 "Tree.c"
+#line 6683 "Tree.c"
 			SidebarTreeExternalDropHandler _tmp7_;
 			void* _tmp7__target;
 			GdkDragContext* _tmp8_;
 			GtkSelectionData* _tmp9_;
 			guint _tmp10_;
 			guint _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7__target = self->priv->drop_handler_target;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = context;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = selection_data;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = info;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = time;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6568 "Tree.c"
+#line 6704 "Tree.c"
 		} else {
 			GdkDragContext* _tmp12_;
 			guint _tmp13_;
-#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
-#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
-#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1080 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6578 "Tree.c"
+#line 6714 "Tree.c"
 		}
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6584 "Tree.c"
+#line 6720 "Tree.c"
 	}
-#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
-#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
-#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp15_;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
-#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6598 "Tree.c"
+#line 6734 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
 		SidebarTreeEntryWrapper* _tmp19_;
 		SidebarTreeExternalDropHandler _tmp22_;
@@ -6603,128 +6739,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GtkSelectionData* _tmp24_;
 		guint _tmp25_;
 		guint _tmp26_;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6611 "Tree.c"
+#line 6747 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp20_;
 			SidebarEntry* _tmp21_;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6620 "Tree.c"
+#line 6756 "Tree.c"
 		} else {
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6624 "Tree.c"
+#line 6760 "Tree.c"
 		}
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22__target = self->priv->drop_handler_target;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = context;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = selection_data;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = info;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = time;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6646 "Tree.c"
+#line 6782 "Tree.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6652 "Tree.c"
+#line 6788 "Tree.c"
 		GdkDragContext* _tmp28_;
 		guint _tmp29_;
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp29_ = time;
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
-#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6667 "Tree.c"
+#line 6803 "Tree.c"
 	}
-#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
-#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = _tmp30_->entry;
-#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/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 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	targetable = _tmp32_;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = targetable;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6681 "Tree.c"
+#line 6817 "Tree.c"
 		GdkDragContext* _tmp34_;
 		guint _tmp35_;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = time;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6698 "Tree.c"
+#line 6834 "Tree.c"
 	}
-#line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = selection_data;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = gdk_atom_name (_tmp37_);
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = _tmp38_;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp39_);
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6716 "Tree.c"
+#line 6852 "Tree.c"
 		SidebarInternalDropTargetEntry* _tmp41_;
 		GtkSelectionData* _tmp42_;
 		gboolean _tmp43_;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = selection_data;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6728 "Tree.c"
+#line 6864 "Tree.c"
 	} else {
 		GeeList* media = NULL;
 		GtkSelectionData* _tmp44_;
@@ -6734,75 +6870,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GeeList* _tmp48_;
 		gboolean _tmp49_ = FALSE;
 		GeeList* _tmp50_;
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp46_ = selection_data;
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		media = _tmp48_;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = media;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6754 "Tree.c"
+#line 6890 "Tree.c"
 			GeeList* _tmp51_;
 			gint _tmp52_;
 			gint _tmp53_;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp53_ = _tmp52_;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6766 "Tree.c"
+#line 6902 "Tree.c"
 		} else {
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6770 "Tree.c"
+#line 6906 "Tree.c"
 		}
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6774 "Tree.c"
+#line 6910 "Tree.c"
 			SidebarInternalDropTargetEntry* _tmp54_;
 			GeeList* _tmp55_;
 			gboolean _tmp56_;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = media;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6786 "Tree.c"
+#line 6922 "Tree.c"
 		}
-#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6790 "Tree.c"
+#line 6926 "Tree.c"
 	}
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = success;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = time;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6806 "Tree.c"
+#line 6942 "Tree.c"
 }
 
 
@@ -6827,90 +6963,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	GdkDragContext* _tmp16_;
 	GdkDragAction _tmp17_;
 	guint _tmp18_;
-#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = context;
-#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = x;
-#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = y;
-#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = time;
-#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1126 "/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 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = x;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = y;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/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 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp6_;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp7_;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	has_dest = _tmp8_;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = has_dest;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp10_) {
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6865 "Tree.c"
+#line 7001 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp11_;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6872 "Tree.c"
+#line 7008 "Tree.c"
 	}
-#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6876 "Tree.c"
+#line 7012 "Tree.c"
 		GtkTreePath* _tmp12_;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/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 6882 "Tree.c"
+#line 7018 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp13_;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6889 "Tree.c"
+#line 7025 "Tree.c"
 			GtkTreePath* _tmp14_;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/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 6895 "Tree.c"
+#line 7031 "Tree.c"
 		}
 	}
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context;
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = time;
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
-#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
-#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6914 "Tree.c"
+#line 7050 "Tree.c"
 }
 
 
@@ -6930,91 +7066,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	SidebarEntry* _tmp9_;
 	GtkTreeSelection* _tmp10_;
 	GtkTreePath* _tmp11_;
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ > 0) {
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6946 "Tree.c"
+#line 7082 "Tree.c"
 	}
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp2_;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6964 "Tree.c"
+#line 7100 "Tree.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/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 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp6_;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = renameable;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ == NULL) {
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6986 "Tree.c"
+#line 7122 "Tree.c"
 	}
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_->entry;
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7002 "Tree.c"
+#line 7138 "Tree.c"
 	}
-#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/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 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = path;
-#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7018 "Tree.c"
+#line 7154 "Tree.c"
 }
 
 
@@ -7030,121 +7166,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	SidebarDestroyableEntry* _tmp5_;
 	SidebarDestroyableEntry* _tmp6_;
 	SidebarDestroyableEntry* _tmp7_;
-#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7054 "Tree.c"
+#line 7190 "Tree.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/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 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	destroyable = _tmp5_;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = destroyable;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (destroyable);
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7076 "Tree.c"
+#line 7212 "Tree.c"
 	}
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_destroyable_entry_destroy_source (_tmp7_);
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (destroyable);
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7090 "Tree.c"
+#line 7226 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7097 "Tree.c"
+#line 7233 "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 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7106 "Tree.c"
+#line 7242 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
 	GtkCellEditable* _tmp0_;
-#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_EDITABLE (editable));
-#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = editable;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7122 "Tree.c"
+#line 7258 "Tree.c"
 		GtkCellEditable* _tmp1_;
 		GtkEntry* _tmp2_;
 		GtkEntry* _tmp3_;
 		GtkEntry* _tmp4_;
 		GtkEntry* _tmp5_;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->text_entry = _tmp2_;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->text_entry;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/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 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->text_entry;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/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 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->text_entry;
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7148 "Tree.c"
+#line 7284 "Tree.c"
 	}
 }
 
@@ -7155,25 +7291,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	guint _tmp2_;
 	GtkEntry* _tmp3_;
 	guint _tmp4_;
-#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
-#line 1175 "/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, &_tmp2_, NULL, FALSE);
-#line 1175 "/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 (_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 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
-#line 1176 "/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 (), &_tmp4_, NULL, FALSE);
-#line 1176 "/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 (_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 7177 "Tree.c"
+#line 7313 "Tree.c"
 }
 
 
@@ -7189,110 +7325,112 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	guint _tmp14_;
 	GtkEntry* _tmp15_;
 	guint _tmp16_;
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_current_path (self);
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp2_);
-#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7215 "Tree.c"
+#line 7351 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_;
 		SidebarEntry* _tmp7_;
 		SidebarRenameableEntry* _tmp8_;
 		SidebarRenameableEntry* _tmp9_;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1199 "/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 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		renameable = _tmp8_;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = renameable;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7233 "Tree.c"
+#line 7369 "Tree.c"
 			SidebarRenameableEntry* _tmp10_;
 			GtkEntry* _tmp11_;
 			const gchar* _tmp12_;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = self->priv->text_entry;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7245 "Tree.c"
+#line 7381 "Tree.c"
 		}
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7249 "Tree.c"
+#line 7385 "Tree.c"
 	}
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/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 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/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 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7265 "Tree.c"
+#line 7401 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1212 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7279 "Tree.c"
+#line 7415 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
-#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	g_object_ref_sink (_tmp0_);
+#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_;
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_saved_search_dialog_unref0 (_tmp1_);
-#line 7296 "Tree.c"
+#line 1216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_g_object_unref0 (_tmp1_);
+#line 7434 "Tree.c"
 }
 
 
@@ -7305,37 +7443,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	LibraryWindow* _tmp4_;
 	Tag* _tmp5_;
 	Tag* _tmp6_;
-#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = new_root_tag_command_new ();
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	creation_command = _tmp0_;
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = app_window_get_command_manager ();
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_command_manager_unref0 (_tmp2_);
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = library_window_get_app ();
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7339 "Tree.c"
+#line 7477 "Tree.c"
 }
 
 
@@ -7354,19 +7492,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 7358 "Tree.c"
+#line 7496 "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 7502 "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 7370 "Tree.c"
+#line 7508 "Tree.c"
 }
 
 
@@ -7385,19 +7523,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 7389 "Tree.c"
+#line 7527 "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 7395 "Tree.c"
+#line 7533 "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 7401 "Tree.c"
+#line 7539 "Tree.c"
 }
 
 
@@ -7436,14 +7574,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 7440 "Tree.c"
+#line 7578 "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 7447 "Tree.c"
+#line 7585 "Tree.c"
 }
 
 
@@ -7461,7 +7599,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 7465 "Tree.c"
+#line 7603 "Tree.c"
 }
 
 
@@ -7501,7 +7639,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 7505 "Tree.c"
+#line 7643 "Tree.c"
 }
 
 
@@ -7510,7 +7648,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 7514 "Tree.c"
+#line 7652 "Tree.c"
 }
 
 
@@ -7528,7 +7666,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 7532 "Tree.c"
+#line 7670 "Tree.c"
 }
 
 
@@ -7570,14 +7708,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 7574 "Tree.c"
+#line 7712 "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 7581 "Tree.c"
+#line 7719 "Tree.c"
 }
 
 
@@ -7586,7 +7724,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 7590 "Tree.c"
+#line 7728 "Tree.c"
 }
 
 
@@ -7600,7 +7738,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 7604 "Tree.c"
+#line 7742 "Tree.c"
 }
 
 
@@ -7651,7 +7789,7 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 	sidebar_tree_signals[SIDEBAR_TREE_PAGE_CREATED_SIGNAL] = 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"
 	sidebar_tree_signals[SIDEBAR_TREE_DESTROYING_PAGE_SIGNAL] = 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 7655 "Tree.c"
+#line 7793 "Tree.c"
 }
 
 
@@ -7663,7 +7801,7 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv = SIDEBAR_TREE_GET_PRIVATE (self);
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = gtk_tree_store_new ((gint) SIDEBAR_TREE_COLUMNS_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, G_TYPE_STRING);
+	_tmp0_ = gtk_tree_store_new ((gint) SIDEBAR_TREE_COLUMNS_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, g_icon_get_type ());
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->store = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7698,7 +7836,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 7702 "Tree.c"
+#line 7840 "Tree.c"
 }
 
 
@@ -7710,17 +7848,17 @@ static void sidebar_tree_finalize (GObject * obj) {
 	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_renderer;
-#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-canceled", gtk_cell_renderer_get_type (), &_tmp1_, NULL, FALSE);
-#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self);
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->text_renderer;
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-started", gtk_cell_renderer_get_type (), &_tmp3_, NULL, FALSE);
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self);
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->store);
@@ -7742,7 +7880,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 7746 "Tree.c"
+#line 7884 "Tree.c"
 }
 
 
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index a3fc8bf..c707c63 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -56,7 +56,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         typeof (string),            // NAME
         typeof (string?),           // TOOLTIP
         typeof (EntryWrapper),      // WRAPPER
-        typeof (string?)            // ICON
+        typeof (Icon?)             // ICON
     );
     
     private Gtk.Builder builder = new Gtk.Builder ();
@@ -93,14 +93,13 @@ public class Sidebar.Tree : Gtk.TreeView {
     public Tree(Gtk.TargetEntry[] target_entries, Gdk.DragAction actions,
         ExternalDropHandler drop_handler) {
         set_model(store);
-        get_style_context().add_class("sidebar");
         
         Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn();
         text_column.set_expand(true);
         Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf();
         icon_renderer.follow_state = true;
-        text_column.pack_start(icon_renderer, false);
-        text_column.add_attribute(icon_renderer, "icon_name", Columns.ICON);
+        text_column.pack_start (icon_renderer, false);
+        text_column.add_attribute(icon_renderer, "gicon", Columns.ICON);
         text_column.set_cell_data_func(icon_renderer, icon_renderer_function);
         text_renderer = new Gtk.CellRendererText();
         text_renderer.ellipsize = Pango.EllipsizeMode.END;
@@ -736,10 +735,17 @@ public class Sidebar.Tree : Gtk.TreeView {
         store.set(wrapper.get_iter(), Columns.TOOLTIP, guarded_markup_escape_text(tooltip));
     }
     
-    private void on_sidebar_icon_changed(Sidebar.Entry entry, string? icon) {
+    private void on_sidebar_icon_changed(Sidebar.Entry entry, string? icon_name) {
         EntryWrapper? wrapper = get_wrapper(entry);
         assert(wrapper != null);
-        
+        Icon? icon = null;
+
+        try {
+            if (icon_name != null) {
+                icon = Icon.new_for_string (icon_name);
+            }
+        } catch (Error e) { }
+
         store.set(wrapper.get_iter(), Columns.ICON, icon);
     }
 
@@ -768,9 +774,18 @@ public class Sidebar.Tree : Gtk.TreeView {
     
     private void load_entry_icons(Gtk.TreeIter iter) {
         EntryWrapper? wrapper = get_wrapper_at_iter(iter);
+        Icon? icon = null;
         if (wrapper == null)
             return;
-        string? icon = wrapper.entry.get_sidebar_icon();
+
+        try {
+            string? name = wrapper.entry.get_sidebar_icon();
+            if (name != null) {
+                icon = Icon.new_for_string (name);
+            }
+        } catch (Error e) { }
+
+
         store.set(iter, Columns.ICON, icon);
     }
     
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 4b46c50..eebbd0d 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -342,8 +342,8 @@ GType sidebar_header_get_type (void) G_GNUC_CONST;
 enum  {
 	SIDEBAR_HEADER_DUMMY_PROPERTY
 };
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* base);
 static void sidebar_header_finalize (GObject * obj);
 GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self, GdkEventButton* event);
@@ -1033,30 +1033,33 @@ GType sidebar_root_only_branch_get_type (void) {
 }
 
 
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized) {
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized) {
 	SidebarHeader * self = NULL;
 	const gchar* _tmp0_;
-	gboolean _tmp1_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	_tmp0_ = name;
 #line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, NULL);
+	_tmp1_ = tooltip;
+#line 124 "/home/jens/Source/shotwell/src/sidebar/common.vala"
+	self = (SidebarHeader*) sidebar_grouping_construct (object_type, _tmp0_, NULL, _tmp1_);
 #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	_tmp1_ = emphasized;
+	_tmp2_ = emphasized;
 #line 125 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	self->priv->emphasized = _tmp1_;
+	self->priv->emphasized = _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return self;
-#line 1053 "common.c"
+#line 1056 "common.c"
 }
 
 
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized) {
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized) {
 #line 123 "/home/jens/Source/shotwell/src/sidebar/common.vala"
-	return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, emphasized);
-#line 1060 "common.c"
+	return sidebar_header_construct (SIDEBAR_TYPE_HEADER, name, tooltip, emphasized);
+#line 1063 "common.c"
 }
 
 
@@ -1072,7 +1075,7 @@ static gboolean sidebar_header_real_is_emphasized (SidebarEmphasizableEntry* bas
 	result = _tmp0_;
 #line 129 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return result;
-#line 1076 "common.c"
+#line 1079 "common.c"
 }
 
 
@@ -1083,7 +1086,7 @@ static void sidebar_header_class_init (SidebarHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SidebarHeaderPrivate));
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_header_finalize;
-#line 1087 "common.c"
+#line 1090 "common.c"
 }
 
 
@@ -1092,14 +1095,14 @@ static void sidebar_header_sidebar_emphasizable_entry_interface_init (SidebarEmp
 	sidebar_header_sidebar_emphasizable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	iface->is_emphasized = (gboolean (*) (SidebarEmphasizableEntry *)) sidebar_header_real_is_emphasized;
-#line 1096 "common.c"
+#line 1099 "common.c"
 }
 
 
 static void sidebar_header_instance_init (SidebarHeader * self) {
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	self->priv = SIDEBAR_HEADER_GET_PRIVATE (self);
-#line 1103 "common.c"
+#line 1106 "common.c"
 }
 
 
@@ -1109,7 +1112,7 @@ static void sidebar_header_finalize (GObject * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_HEADER, SidebarHeader);
 #line 120 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	G_OBJECT_CLASS (sidebar_header_parent_class)->finalize (obj);
-#line 1113 "common.c"
+#line 1116 "common.c"
 }
 
 
@@ -1139,7 +1142,7 @@ GtkMenu* sidebar_contextable_get_sidebar_context_menu (SidebarContextable* self,
 	g_return_val_if_fail (SIDEBAR_IS_CONTEXTABLE (self), NULL);
 #line 135 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 	return SIDEBAR_CONTEXTABLE_GET_INTERFACE (self)->get_sidebar_context_menu (self, event);
-#line 1143 "common.c"
+#line 1146 "common.c"
 }
 
 
@@ -1150,7 +1153,7 @@ static void sidebar_contextable_base_init (SidebarContextableIface * iface) {
 	if (!initialized) {
 #line 133 "/home/jens/Source/shotwell/src/sidebar/common.vala"
 		initialized = TRUE;
-#line 1154 "common.c"
+#line 1157 "common.c"
 	}
 }
 
diff --git a/src/sidebar/common.vala b/src/sidebar/common.vala
index c5a4764..0467ce3 100644
--- a/src/sidebar/common.vala
+++ b/src/sidebar/common.vala
@@ -120,8 +120,8 @@ public class Sidebar.RootOnlyBranch : Sidebar.Branch {
 public class Sidebar.Header : Sidebar.Grouping, Sidebar.EmphasizableEntry {
     private bool emphasized;
     
-    public Header(string name, bool emphasized = true) {
-        base(name, null);
+    public Header(string name, string? tooltip = null, bool emphasized = true) {
+        base(name, null, tooltip);
         this.emphasized = emphasized;
     }
     
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index df6975c..c4a2082 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -18,9 +18,6 @@
 
 
 void slideshow_init (GError** error);
-static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value);
-static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value);
@@ -28,6 +25,9 @@ static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* v
 static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value);
 static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add43 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add45 (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_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point"
 void transition_effects_manager_init (void);
@@ -37,7 +37,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -54,7 +54,7 @@ static void _vala_array_add33 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -71,7 +71,7 @@ static void _vala_array_add34 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -88,7 +88,7 @@ static void _vala_array_add35 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -105,7 +105,7 @@ static void _vala_array_add36 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -122,7 +122,7 @@ static void _vala_array_add37 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -139,7 +139,7 @@ static void _vala_array_add38 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -156,7 +156,7 @@ static void _vala_array_add39 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add43 (gchar** * array, int* length, int* size, gchar* value) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -173,7 +173,7 @@ static void _vala_array_add40 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -190,7 +190,7 @@ static void _vala_array_add41 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add42 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -259,7 +259,7 @@ void slideshow_init (GError** error) {
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.transitions.crumble");
 #line 11 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add33 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add36 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp3_ = core_ids;
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -267,7 +267,7 @@ void slideshow_init (GError** error) {
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp4_ = g_strdup ("org.yorba.shotwell.transitions.fade");
 #line 12 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add34 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
+	_vala_array_add37 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp5_ = core_ids;
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -275,7 +275,7 @@ void slideshow_init (GError** error) {
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp6_ = g_strdup ("org.yorba.shotwell.transitions.slide");
 #line 13 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add35 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
+	_vala_array_add38 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp7_ = core_ids;
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -283,7 +283,7 @@ void slideshow_init (GError** error) {
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp8_ = g_strdup ("org.yorba.shotwell.transitions.blinds");
 #line 14 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add36 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
+	_vala_array_add39 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp9_ = core_ids;
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -291,7 +291,7 @@ void slideshow_init (GError** error) {
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp10_ = g_strdup ("org.yorba.shotwell.transitions.circle");
 #line 15 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add37 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp10_);
+	_vala_array_add40 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp10_);
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp11_ = core_ids;
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -299,7 +299,7 @@ void slideshow_init (GError** error) {
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp12_ = g_strdup ("org.yorba.shotwell.transitions.circles");
 #line 16 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add38 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp12_);
+	_vala_array_add41 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp12_);
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp13_ = core_ids;
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -307,7 +307,7 @@ void slideshow_init (GError** error) {
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp14_ = g_strdup ("org.yorba.shotwell.transitions.clock");
 #line 17 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add39 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp14_);
+	_vala_array_add42 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp14_);
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp15_ = core_ids;
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -315,7 +315,7 @@ void slideshow_init (GError** error) {
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp16_ = g_strdup ("org.yorba.shotwell.transitions.stripes");
 #line 18 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add40 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp16_);
+	_vala_array_add43 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp16_);
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp17_ = core_ids;
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -323,7 +323,7 @@ void slideshow_init (GError** error) {
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp18_ = g_strdup ("org.yorba.shotwell.transitions.squares");
 #line 19 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add41 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp18_);
+	_vala_array_add44 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp18_);
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp19_ = core_ids;
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
@@ -331,7 +331,7 @@ void slideshow_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp20_ = g_strdup ("org.yorba.shotwell.transitions.chess");
 #line 20 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
-	_vala_array_add42 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp20_);
+	_vala_array_add45 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp20_);
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
 	_tmp21_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/slideshow/Slideshow.vala"
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index c188835..c57a25f 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -140,7 +140,7 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self);
 gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path);
 gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name);
 gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add65 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value);
 static void hierarchical_tag_index_finalize (HierarchicalTagIndex * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -665,7 +665,7 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 }
 
 
-static void _vala_array_add65 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add68 (gchar** * array, int* length, int* size, gchar* value) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if ((*length) == (*size)) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -740,7 +740,7 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex*
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_tmp5_ = hierarchical_tag_index_get_path_for_name (self, _tmp4_);
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
-				_vala_array_add65 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+				_vala_array_add68 (&_result_, &_result__length1, &__result__size_, _tmp5_);
 #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_g_free0 (name);
 #line 747 "HierarchicalTagIndex.c"
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index f8cfd5d..2a1695b 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1353,7 +1353,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1356 "HierarchicalTagUtilities.c"
-				goto __catch57_g_regex_error;
+				goto __catch63_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -1378,7 +1378,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1381 "HierarchicalTagUtilities.c"
-				goto __catch57_g_regex_error;
+				goto __catch63_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1404,8 +1404,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1406 "HierarchicalTagUtilities.c"
 	}
-	goto __finally57;
-	__catch57_g_regex_error:
+	goto __finally63;
+	__catch63_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -1418,7 +1418,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1420 "HierarchicalTagUtilities.c"
 	}
-	__finally57:
+	__finally63:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
diff --git a/src/tags/Branch.c b/src/tags/TagsBranch.c
index 0c02a90..d86b3ac 100644
--- a/src/tags/Branch.c
+++ b/src/tags/TagsBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* TagsBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from TagsBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -725,8 +725,8 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 enum  {
 	TAGS_HEADER_DUMMY_PROPERTY
 };
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
 static void tags_header_setup_context_menu (TagsHeader* self);
 gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -825,25 +825,25 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed);
-#line 831 "Branch.c"
+#line 831 "TagsBranch.c"
 }
 
 
 static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_branch_on_tags_altered ((TagsBranch*) self, items);
-#line 838 "Branch.c"
+#line 838 "TagsBranch.c"
 }
 
 
 static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 847 "Branch.c"
+#line 847 "TagsBranch.c"
 }
 
 
@@ -856,42 +856,42 @@ TagsBranch* tags_branch_construct (GType object_type) {
 	GeeCollection* _tmp4_;
 	TagSourceCollection* _tmp5_;
 	TagSourceCollection* _tmp6_;
-#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = tags_header_new ();
-#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = (TagsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _tags_branch_comparator_gcompare_func, NULL);
-#line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = tag_global;
-#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection));
-#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_branch_on_tags_added_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 18 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp4_);
-#line 21 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = tag_global;
-#line 21 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 21 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _tags_branch_on_tags_added_removed_data_collection_contents_altered, self, 0);
-#line 22 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6_ = tag_global;
-#line 22 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0);
-#line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return self;
-#line 888 "Branch.c"
+#line 888 "TagsBranch.c"
 }
 
 
 TagsBranch* tags_branch_new (void) {
-#line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return tags_branch_construct (TAGS_TYPE_BRANCH);
-#line 895 "Branch.c"
+#line 895 "TagsBranch.c"
 }
 
 
@@ -900,33 +900,33 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) {
 	GeeHashMap* _tmp0_;
 	Tag* _tmp1_;
 	gpointer _tmp2_;
-#line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (TAGS_IS_BRANCH (self), NULL);
-#line 30 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
-#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = tag;
-#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = (TagsSidebarEntry*) _tmp2_;
-#line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 918 "Branch.c"
+#line 918 "TagsBranch.c"
 }
 
 
 gboolean tags_branch_is_user_renameable (TagsBranch* self) {
 	gboolean result = FALSE;
-#line 34 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (TAGS_IS_BRANCH (self), FALSE);
-#line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = TRUE;
-#line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 930 "Branch.c"
+#line 930 "TagsBranch.c"
 }
 
 
@@ -942,63 +942,63 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	Tag* _tmp7_;
 	gint _tmp8_;
 	gint _tmp9_;
-#line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 38 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 39 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = a;
-#line 39 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = b;
-#line 39 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 39 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		result = 0;
-#line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return result;
-#line 960 "Branch.c"
+#line 960 "TagsBranch.c"
 	}
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = a;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry));
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = b;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6_ = tags_sidebar_entry_for_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry));
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp7_ = _tmp6_;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp8_ = tag_compare_names (_tmp4_, _tmp7_);
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp7_);
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp4_);
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = _tmp9_;
-#line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 42 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 986 "Branch.c"
+#line 986 "TagsBranch.c"
 }
 
 
 static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = tag_compare_names ((Tag*) a, (Tag*) b);
-#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 995 "Branch.c"
+#line 995 "TagsBranch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1002 "Branch.c"
+#line 1002 "TagsBranch.c"
 }
 
 
@@ -1006,39 +1006,39 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 	Tag* restore_point = NULL;
 	GeeIterable* _tmp0_;
 	GeeIterable* _tmp49_;
-#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (TAGS_IS_BRANCH (self));
-#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail ((added_raw == NULL) || GEE_IS_ITERABLE (added_raw));
-#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 51 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	restore_point = NULL;
-#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = added_raw;
-#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp0_ != NULL) {
-#line 1022 "Branch.c"
+#line 1022 "TagsBranch.c"
 		GeeSortedSet* added = NULL;
 		GeeTreeSet* _tmp1_;
-#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
-#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1029 "Branch.c"
+#line 1029 "TagsBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp2_;
 			GeeIterator* _tmp3_;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp2_ = added_raw;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_object_it = _tmp3_;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			while (TRUE) {
-#line 1042 "Branch.c"
+#line 1042 "TagsBranch.c"
 				GeeIterator* _tmp4_;
 				gboolean _tmp5_;
 				DataObject* object = NULL;
@@ -1049,57 +1049,57 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				Tag* _tmp9_;
 				GeeSortedSet* _tmp10_;
 				Tag* _tmp11_;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp4_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp5_ = gee_iterator_next (_tmp4_);
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (!_tmp5_) {
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					break;
-#line 1061 "Branch.c"
+#line 1061 "TagsBranch.c"
 				}
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp6_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp7_ = gee_iterator_get (_tmp6_);
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				object = (DataObject*) _tmp7_;
-#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp8_ = object;
-#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_TAG, Tag));
-#line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				tag = _tmp9_;
-#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp10_ = added;
-#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp11_ = tag;
-#line 60 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (tag);
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (object);
-#line 1085 "Branch.c"
+#line 1085 "TagsBranch.c"
 			}
-#line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 1089 "Branch.c"
+#line 1089 "TagsBranch.c"
 		}
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeSortedSet* _tmp12_;
 			GeeIterator* _tmp13_;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp12_ = added;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tag_it = _tmp13_;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			while (TRUE) {
-#line 1103 "Branch.c"
+#line 1103 "TagsBranch.c"
 				GeeIterator* _tmp14_;
 				gboolean _tmp15_;
 				Tag* tag = NULL;
@@ -1119,196 +1119,196 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				Tag* _tmp38_;
 				Tag* _tmp47_;
 				Tag* _tmp48_;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp14_ = _tag_it;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp15_ = gee_iterator_next (_tmp14_);
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (!_tmp15_) {
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					break;
-#line 1131 "Branch.c"
+#line 1131 "TagsBranch.c"
 				}
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp16_ = _tag_it;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp17_ = gee_iterator_get (_tmp16_);
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				tag = (Tag*) _tmp17_;
-#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp18_ = tag;
-#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp19_ = tag_get_hierarchical_parent (_tmp18_);
-#line 66 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				parent_tag = _tmp19_;
-#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				while (TRUE) {
-#line 1147 "Branch.c"
+#line 1147 "TagsBranch.c"
 					Tag* _tmp20_;
 					GeeHashMap* _tmp21_;
 					Tag* _tmp22_;
 					gboolean _tmp23_;
 					Tag* _tmp29_;
 					Tag* _tmp30_;
-#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp20_ = parent_tag;
-#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					if (!(_tmp20_ != NULL)) {
-#line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						break;
-#line 1160 "Branch.c"
+#line 1160 "TagsBranch.c"
 					}
-#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp21_ = self->priv->entry_map;
-#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp22_ = parent_tag;
-#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
-#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					if (!_tmp23_) {
-#line 1170 "Branch.c"
+#line 1170 "TagsBranch.c"
 						TagsSidebarEntry* parent_entry = NULL;
 						Tag* _tmp24_;
 						TagsSidebarEntry* _tmp25_;
 						GeeHashMap* _tmp26_;
 						Tag* _tmp27_;
 						TagsSidebarEntry* _tmp28_;
-#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_tmp24_ = parent_tag;
-#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_tmp25_ = tags_sidebar_entry_new (_tmp24_);
-#line 69 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 69 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						parent_entry = _tmp25_;
-#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_tmp26_ = self->priv->entry_map;
-#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_tmp27_ = parent_tag;
-#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_tmp28_ = parent_entry;
-#line 70 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_);
-#line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 68 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 						_g_object_unref0 (parent_entry);
-#line 1193 "Branch.c"
+#line 1193 "TagsBranch.c"
 					}
-#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp29_ = parent_tag;
-#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp30_ = tag_get_hierarchical_parent (_tmp29_);
-#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_object_unref0 (parent_tag);
-#line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					parent_tag = _tmp30_;
-#line 1203 "Branch.c"
+#line 1203 "TagsBranch.c"
 				}
-#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp31_ = tag;
-#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp32_ = tags_sidebar_entry_new (_tmp31_);
-#line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				entry = _tmp32_;
-#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp33_ = self->priv->entry_map;
-#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp34_ = tag;
-#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp35_ = entry;
-#line 78 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_);
-#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp36_ = tag;
-#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp37_ = tag_get_hierarchical_parent (_tmp36_);
-#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (parent_tag);
-#line 80 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				parent_tag = _tmp37_;
-#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp38_ = parent_tag;
-#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (_tmp38_ != NULL) {
-#line 1231 "Branch.c"
+#line 1231 "TagsBranch.c"
 					TagsSidebarEntry* parent_entry = NULL;
 					GeeHashMap* _tmp39_;
 					Tag* _tmp40_;
 					gpointer _tmp41_;
 					TagsSidebarEntry* _tmp42_;
 					TagsSidebarEntry* _tmp43_;
-#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp39_ = self->priv->entry_map;
-#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp40_ = parent_tag;
-#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp41_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp40_);
-#line 82 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					parent_entry = (TagsSidebarEntry*) _tmp41_;
-#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp42_ = parent_entry;
-#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp43_ = entry;
-#line 83 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 83 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_object_unref0 (parent_entry);
-#line 1254 "Branch.c"
+#line 1254 "TagsBranch.c"
 				} else {
 					SidebarEntry* _tmp44_;
 					SidebarEntry* _tmp45_;
 					TagsSidebarEntry* _tmp46_;
-#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp44_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp45_ = _tmp44_;
-#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_tmp46_ = entry;
-#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_object_unref0 (_tmp45_);
-#line 1269 "Branch.c"
+#line 1269 "TagsBranch.c"
 				}
-#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp47_ = tag;
-#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (restore_point);
-#line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				restore_point = _tmp48_;
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (entry);
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (parent_tag);
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (tag);
-#line 1285 "Branch.c"
+#line 1285 "TagsBranch.c"
 			}
-#line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 63 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (_tag_it);
-#line 1289 "Branch.c"
+#line 1289 "TagsBranch.c"
 		}
-#line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (added);
-#line 1293 "Branch.c"
+#line 1293 "TagsBranch.c"
 	}
-#line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp49_ = removed;
-#line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp49_ != NULL) {
-#line 1299 "Branch.c"
+#line 1299 "TagsBranch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp50_;
 			GeeIterator* _tmp51_;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp50_ = removed;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp51_ = gee_iterable_iterator (_tmp50_);
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_object_it = _tmp51_;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			while (TRUE) {
-#line 1312 "Branch.c"
+#line 1312 "TagsBranch.c"
 				GeeIterator* _tmp52_;
 				gboolean _tmp53_;
 				DataObject* object = NULL;
@@ -1328,81 +1328,81 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				gboolean _tmp64_;
 				gboolean _tmp65_;
 				TagsSidebarEntry* _tmp66_;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp52_ = _object_it;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp53_ = gee_iterator_next (_tmp52_);
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (!_tmp53_) {
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					break;
-#line 1340 "Branch.c"
+#line 1340 "TagsBranch.c"
 				}
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp54_ = _object_it;
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp55_ = gee_iterator_get (_tmp54_);
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				object = (DataObject*) _tmp55_;
-#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp56_ = object;
-#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_TAG, Tag));
-#line 96 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				tag = _tmp57_;
-#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp58_ = self->priv->entry_map;
-#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp59_ = tag;
-#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp60_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp59_);
-#line 98 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				entry = (TagsSidebarEntry*) _tmp60_;
-#line 99 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp61_ = entry;
-#line 99 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_vala_assert (_tmp61_ != NULL, "entry != null");
-#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp62_ = self->priv->entry_map;
-#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp63_ = tag;
-#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp64_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp63_, NULL);
-#line 101 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				is_removed = _tmp64_;
-#line 102 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp65_ = is_removed;
-#line 102 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 102 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_vala_assert (_tmp65_, "is_removed");
-#line 104 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp66_ = entry;
-#line 104 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (entry);
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (tag);
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (object);
-#line 1388 "Branch.c"
+#line 1388 "TagsBranch.c"
 			}
-#line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (_object_it);
-#line 1392 "Branch.c"
+#line 1392 "TagsBranch.c"
 		}
 	}
-#line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (restore_point);
-#line 1397 "Branch.c"
+#line 1397 "TagsBranch.c"
 }
 
 
 static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
-#line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (TAGS_IS_BRANCH (self));
-#line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1406 "Branch.c"
+#line 1406 "TagsBranch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_;
@@ -1411,25 +1411,25 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 		GeeSet* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp0_ = altered;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp2_ = _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_object_it = _tmp5_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		while (TRUE) {
-#line 1433 "Branch.c"
+#line 1433 "TagsBranch.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			DataObject* object = NULL;
@@ -1458,125 +1458,125 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			gchar* _tmp28_;
 			gchar* _tmp29_;
 			TagsSidebarEntry* _tmp30_;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp6_ = _object_it;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			if (!_tmp7_) {
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				break;
-#line 1470 "Branch.c"
+#line 1470 "TagsBranch.c"
 			}
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp8_ = _object_it;
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			object = (DataObject*) _tmp9_;
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp10_ = altered;
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp11_ = object;
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp13_ = (Alteration*) _tmp12_;
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp14_ = alteration_has_detail (_tmp13_, "metadata", "name");
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp15_ = !_tmp14_;
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_alteration_unref0 (_tmp13_);
-#line 111 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			if (_tmp15_) {
-#line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_object_unref0 (object);
-#line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				continue;
-#line 1498 "Branch.c"
+#line 1498 "TagsBranch.c"
 			}
-#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp16_ = object;
-#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_TAG, Tag));
-#line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			tag = _tmp17_;
-#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp18_ = self->priv->entry_map;
-#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp19_ = tag;
-#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
-#line 115 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			entry = (TagsSidebarEntry*) _tmp20_;
-#line 116 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp21_ = entry;
-#line 116 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_vala_assert (_tmp21_ != NULL, "entry != null");
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp22_ = entry;
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp23_ = tag;
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp24_ = tag_get_user_visible_name (_tmp23_);
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp25_ = _tmp24_;
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp25_);
-#line 118 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (_tmp25_);
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp26_ = entry;
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp27_ = tag;
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp28_ = tag_get_user_visible_name (_tmp27_);
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp29_ = _tmp28_;
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp29_);
-#line 119 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (_tmp29_);
-#line 120 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp30_ = entry;
-#line 120 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			sidebar_branch_reorder (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (entry);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (tag);
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (object);
-#line 1552 "Branch.c"
+#line 1552 "TagsBranch.c"
 		}
-#line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_object_it);
-#line 1556 "Branch.c"
+#line 1556 "TagsBranch.c"
 	}
 }
 
 
 static void tags_branch_class_init (TagsBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_type_class_add_private (klass, sizeof (TagsBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize;
-#line 1568 "Branch.c"
+#line 1568 "TagsBranch.c"
 }
 
 
 static void tags_branch_instance_init (TagsBranch * self) {
 	GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv = TAGS_BRANCH_GET_PRIVATE (self);
-#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 1580 "Branch.c"
+#line 1580 "TagsBranch.c"
 }
 
 
@@ -1586,25 +1586,25 @@ static void tags_branch_finalize (GObject * obj) {
 	guint _tmp1_;
 	TagSourceCollection* _tmp2_;
 	guint _tmp3_;
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_BRANCH, TagsBranch);
-#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = tag_global;
-#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 26 "/home/jens/Source/shotwell/src/tags/TagsBranch.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) _tags_branch_on_tags_added_removed_data_collection_contents_altered, self);
-#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = tag_global;
-#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 27 "/home/jens/Source/shotwell/src/tags/TagsBranch.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) _tags_branch_on_tags_altered_data_collection_items_altered, self);
-#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->entry_map);
-#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj);
-#line 1608 "Branch.c"
+#line 1608 "TagsBranch.c"
 }
 
 
@@ -1622,35 +1622,35 @@ GType tags_branch_get_type (void) {
 
 TagsHeader* tags_header_construct (GType object_type) {
 	TagsHeader * self = NULL;
-#line 131 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), TRUE);
-#line 132 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
+	self = (TagsHeader*) sidebar_header_construct (object_type, _ ("Tags"), _ ("Organize and browse your photo’s tags"), TRUE);
+#line 132 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_header_setup_context_menu (self);
-#line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return self;
-#line 1632 "Branch.c"
+#line 1632 "TagsBranch.c"
 }
 
 
 TagsHeader* tags_header_new (void) {
-#line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return tags_header_construct (TAGS_TYPE_HEADER);
-#line 1639 "Branch.c"
+#line 1639 "TagsBranch.c"
 }
 
 
 static void tags_header_setup_context_menu (TagsHeader* self) {
 	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (TAGS_IS_HEADER (self));
-#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv->builder = _tmp0_;
-#line 1654 "Branch.c"
+#line 1654 "TagsBranch.c"
 	{
 		GtkBuilder* _tmp1_;
 		gchar* _tmp2_;
@@ -1661,45 +1661,45 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		GMenuModel* _tmp6_;
 		GMenuModel* _tmp7_;
 		GtkMenu* _tmp8_;
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp1_ = self->priv->builder;
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp2_ = resources_get_ui ("tag_sidebar_context.ui");
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (_tmp3_);
-#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1677 "Branch.c"
-			goto __catch55_g_error;
+#line 1677 "TagsBranch.c"
+			goto __catch61_g_error;
 		}
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp4_ = self->priv->builder;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		model = _tmp6_;
-#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp7_ = model;
-#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
-#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		g_object_ref_sink (_tmp8_);
-#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		self->priv->context_menu = _tmp8_;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (model);
-#line 1700 "Branch.c"
+#line 1700 "TagsBranch.c"
 	}
-	goto __finally55;
-	__catch55_g_error:
+	goto __finally61;
+	__catch61_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp9_;
@@ -1708,44 +1708,44 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		gchar* _tmp12_;
 		Application* _tmp13_;
 		Application* _tmp14_;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_error_ = _inner_error_;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp9_ = _error_;
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp10_ = _tmp9_->message;
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp12_ = _tmp11_;
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		app_window_error_message (_tmp12_, NULL);
-#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (_tmp12_);
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp13_ = application_get_instance ();
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp14_ = _tmp13_;
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		application_panic (_tmp14_);
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_application_unref0 (_tmp14_);
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_error_free0 (_error_);
-#line 1738 "Branch.c"
+#line 1738 "TagsBranch.c"
 	}
-	__finally55:
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+	__finally61:
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		g_clear_error (&_inner_error_);
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return;
-#line 1749 "Branch.c"
+#line 1749 "TagsBranch.c"
 	}
 }
 
@@ -1771,85 +1771,85 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	GeeList* _tmp10_;
 	AddTagsCommand* _tmp11_;
 	AddTagsCommand* _tmp12_;
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	dialog = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = dialog;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	names = _tmp3_;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	names_length1 = _tmp2_;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_names_size_ = names_length1;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = names;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5__length1 = names_length1;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp5_ == NULL) {
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp4_ = TRUE;
-#line 1801 "Branch.c"
+#line 1801 "TagsBranch.c"
 	} else {
 		gchar** _tmp6_;
 		gint _tmp6__length1;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6_ = names;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6__length1 = names_length1;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 1811 "Branch.c"
+#line 1811 "TagsBranch.c"
 	}
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp4_) {
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		result = FALSE;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return result;
-#line 1823 "Branch.c"
+#line 1823 "TagsBranch.c"
 	}
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp8_ = _tmp7_;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp9_ = names;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp9__length1 = names_length1;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp10_ = media;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp12_ = _tmp11_;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp12_);
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = TRUE;
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 1853 "Branch.c"
+#line 1853 "TagsBranch.c"
 }
 
 
@@ -1861,25 +1861,25 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gboolean _tmp4_;
-#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = data;
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (_tmp3_);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp4_) {
-#line 1883 "Branch.c"
+#line 1883 "TagsBranch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_;
 		guchar* _tmp6_;
@@ -1900,91 +1900,91 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 		Tag* _tmp21_;
 		ReparentTagCommand* _tmp22_;
 		ReparentTagCommand* _tmp23_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp5_ = data;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		old_tag_path = _tmp7_;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp8_ = tag_global;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp9_ = old_tag_path;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE);
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)");
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp11_ = old_tag_path;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp13_ = _tmp12_;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp15_ = _tmp14_;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp16_ = _tmp15_ < 2;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp13_);
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		if (_tmp16_) {
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			result = TRUE;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (old_tag_path);
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			return result;
-#line 1942 "Branch.c"
+#line 1942 "TagsBranch.c"
 		}
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp17_ = app_window_get_command_manager ();
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp18_ = _tmp17_;
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp19_ = old_tag_path;
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp20_ = tag_for_path (_tmp19_);
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp21_ = _tmp20_;
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp22_ = reparent_tag_command_new (_tmp21_, "/");
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp23_ = _tmp22_;
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp23_);
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp21_);
-#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_command_manager_unref0 (_tmp18_);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		result = TRUE;
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (old_tag_path);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return result;
-#line 1972 "Branch.c"
+#line 1972 "TagsBranch.c"
 	}
-#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = FALSE;
-#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 1978 "Branch.c"
+#line 1978 "TagsBranch.c"
 }
 
 
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) {
 	TagsHeader * self;
-#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (data != NULL);
-#line 1988 "Branch.c"
+#line 1988 "TagsBranch.c"
 }
 
 
@@ -1993,80 +1993,80 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_;
 	GtkMenu* _tmp1_;
-#line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = _tmp1_;
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2007 "Branch.c"
+#line 2007 "TagsBranch.c"
 }
 
 
 static void tags_header_class_init (TagsHeaderClass * klass) {
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_header_parent_class = g_type_class_peek_parent (klass);
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_type_class_add_private (klass, sizeof (TagsHeaderPrivate));
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_header_finalize;
-#line 2018 "Branch.c"
+#line 2018 "TagsBranch.c"
 }
 
 
 static void tags_header_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_header_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_header_real_internal_drop_received;
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
-#line 2029 "Branch.c"
+#line 2029 "TagsBranch.c"
 }
 
 
 static void tags_header_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) {
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_header_real_prepare_selection_data;
-#line 2038 "Branch.c"
+#line 2038 "TagsBranch.c"
 }
 
 
 static void tags_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
-#line 2047 "Branch.c"
+#line 2047 "TagsBranch.c"
 }
 
 
 static void tags_header_instance_init (TagsHeader * self) {
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv = TAGS_HEADER_GET_PRIVATE (self);
-#line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv->context_menu = NULL;
-#line 2056 "Branch.c"
+#line 2056 "TagsBranch.c"
 }
 
 
 static void tags_header_finalize (GObject * obj) {
 	TagsHeader * self;
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader);
-#line 127 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->context_menu);
-#line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj);
-#line 2070 "Branch.c"
+#line 2070 "TagsBranch.c"
 }
 
 
@@ -2092,28 +2092,28 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	TagsSidebarEntry * self = NULL;
 	Tag* _tmp0_;
 	Tag* _tmp1_;
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = tag;
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv->tag = _tmp1_;
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return self;
-#line 2110 "Branch.c"
+#line 2110 "TagsBranch.c"
 }
 
 
 TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) {
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag);
-#line 2117 "Branch.c"
+#line 2117 "TagsBranch.c"
 }
 
 
@@ -2129,17 +2129,17 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	Tag* result = NULL;
 	Tag* _tmp0_;
 	Tag* _tmp1_;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->tag;
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = _tmp1_;
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2143 "Branch.c"
+#line 2143 "TagsBranch.c"
 }
 
 
@@ -2148,17 +2148,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	Tag* _tmp0_;
 	gchar* _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->tag;
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2162 "Branch.c"
+#line 2162 "TagsBranch.c"
 }
 
 
@@ -2167,17 +2167,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 211 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->single_tag_icon;
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2181 "Branch.c"
+#line 2181 "TagsBranch.c"
 }
 
 
@@ -2186,32 +2186,32 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
 	Page* result = NULL;
 	Tag* _tmp0_;
 	TagPage* _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 215 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->tag;
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = tag_page_new (_tmp0_);
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2202 "Branch.c"
+#line 2202 "TagsBranch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 219 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 219 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = TRUE;
-#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2215 "Branch.c"
+#line 2215 "TagsBranch.c"
 }
 
 
@@ -2230,20 +2230,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 2234 "Branch.c"
+#line 2234 "TagsBranch.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 2241 "Branch.c"
+#line 2241 "TagsBranch.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 2247 "Branch.c"
+#line 2247 "TagsBranch.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -2253,11 +2253,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 2257 "Branch.c"
+#line 2257 "TagsBranch.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 2261 "Branch.c"
+#line 2261 "TagsBranch.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -2265,7 +2265,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2269 "Branch.c"
+#line 2269 "TagsBranch.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -2297,8 +2297,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2301 "Branch.c"
-				goto __catch56_g_regex_error;
+#line 2301 "TagsBranch.c"
+				goto __catch62_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/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);
@@ -2306,7 +2306,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2310 "Branch.c"
+#line 2310 "TagsBranch.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -2322,8 +2322,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2326 "Branch.c"
-				goto __catch56_g_regex_error;
+#line 2326 "TagsBranch.c"
+				goto __catch62_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -2333,7 +2333,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2337 "Branch.c"
+#line 2337 "TagsBranch.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -2347,10 +2347,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2351 "Branch.c"
+#line 2351 "TagsBranch.c"
 	}
-	goto __finally56;
-	__catch56_g_regex_error:
+	goto __finally62;
+	__catch62_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -2361,9 +2361,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2365 "Branch.c"
+#line 2365 "TagsBranch.c"
 	}
-	__finally56:
+	__finally62:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -2372,7 +2372,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2376 "Branch.c"
+#line 2376 "TagsBranch.c"
 	}
 }
 
@@ -2397,85 +2397,85 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 	const gchar* _tmp14_;
 	RenameTagCommand* _tmp15_;
 	RenameTagCommand* _tmp16_;
-#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = new_name;
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = tag_prep_tag_name (_tmp0_);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	prepped = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = prepped;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp2_ == NULL) {
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (prepped);
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return;
-#line 2419 "Branch.c"
+#line 2419 "TagsBranch.c"
 	}
-#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = prepped;
-#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = string_replace (_tmp3_, "/", "");
-#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (prepped);
-#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	prepped = _tmp4_;
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = prepped;
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6_ = self->priv->tag;
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp7_ = tag_get_user_visible_name (_tmp6_);
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp8_ = _tmp7_;
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0;
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (_tmp8_);
-#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp9_) {
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (prepped);
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return;
-#line 2447 "Branch.c"
+#line 2447 "TagsBranch.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp10_ = prepped;
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (g_strcmp0 (_tmp10_, "") == 0) {
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (prepped);
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return;
-#line 2457 "Branch.c"
+#line 2457 "TagsBranch.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp11_ = app_window_get_command_manager ();
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp12_ = _tmp11_;
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp13_ = self->priv->tag;
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp14_ = prepped;
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_);
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp16_ = _tmp15_;
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp16_);
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (prepped);
-#line 2479 "Branch.c"
+#line 2479 "TagsBranch.c"
 }
 
 
@@ -2483,37 +2483,37 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 	TagsSidebarEntry * self;
 	Tag* _tmp0_;
 	gboolean _tmp1_;
-#line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 239 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = self->priv->tag;
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp1_) {
-#line 2495 "Branch.c"
+#line 2495 "TagsBranch.c"
 		CommandManager* _tmp2_;
 		CommandManager* _tmp3_;
 		Tag* _tmp4_;
 		DeleteTagCommand* _tmp5_;
 		DeleteTagCommand* _tmp6_;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp4_ = self->priv->tag;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6_ = _tmp5_;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 2517 "Branch.c"
+#line 2517 "TagsBranch.c"
 	}
 }
 
@@ -2530,39 +2530,39 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD
 	gint _tmp6_;
 	TagUntagPhotosCommand* _tmp7_;
 	TagUntagPhotosCommand* _tmp8_;
-#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = self->priv->tag;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = media;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = media;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6_ = _tmp5_;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp8_ = _tmp7_;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (_tmp8_);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = TRUE;
-#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2566 "Branch.c"
+#line 2566 "TagsBranch.c"
 }
 
 
@@ -2574,25 +2574,25 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	gboolean _tmp4_;
-#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = data;
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (_tmp3_);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	if (_tmp4_) {
-#line 2596 "Branch.c"
+#line 2596 "TagsBranch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_;
 		guchar* _tmp6_;
@@ -2621,35 +2621,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		gchar* _tmp49_;
 		ReparentTagCommand* _tmp50_;
 		ReparentTagCommand* _tmp51_;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp5_ = data;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		old_tag_path = _tmp7_;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp8_ = old_tag_path;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp9_ = self->priv->tag;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp10_ = tag_get_path (_tmp9_);
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp11_ = _tmp10_;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (_tmp11_);
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		if (_tmp12_) {
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			result = TRUE;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (old_tag_path);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			return result;
-#line 2653 "Branch.c"
+#line 2653 "TagsBranch.c"
 		}
 		{
 			GeeList* _parent_path_list = NULL;
@@ -2663,33 +2663,33 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			gint _tmp19_;
 			gint _tmp20_;
 			gint _parent_path_index = 0;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp13_ = self->priv->tag;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp14_ = tag_get_path (_tmp13_);
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp15_ = _tmp14_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_);
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp17_ = _tmp16_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (_tmp15_);
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_parent_path_list = _tmp17_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp18_ = _parent_path_list;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp20_ = _tmp19_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_parent_path_size = _tmp20_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_parent_path_index = -1;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			while (TRUE) {
-#line 2693 "Branch.c"
+#line 2693 "TagsBranch.c"
 				gint _tmp21_;
 				gint _tmp22_;
 				gint _tmp23_;
@@ -2699,177 +2699,177 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 				gpointer _tmp26_;
 				const gchar* _tmp27_;
 				const gchar* _tmp28_;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp21_ = _parent_path_index;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_parent_path_index = _tmp21_ + 1;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp22_ = _parent_path_index;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp23_ = _parent_path_size;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (!(_tmp22_ < _tmp23_)) {
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					break;
-#line 2715 "Branch.c"
+#line 2715 "TagsBranch.c"
 				}
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp24_ = _parent_path_list;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp25_ = _parent_path_index;
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp26_ = gee_list_get (_tmp24_, _tmp25_);
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				parent_path = (gchar*) _tmp26_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp27_ = parent_path;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_tmp28_ = old_tag_path;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				if (g_strcmp0 (_tmp27_, _tmp28_) == 0) {
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					result = TRUE;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_free0 (parent_path);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_object_unref0 (_parent_path_list);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					_g_free0 (old_tag_path);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 					return result;
-#line 2741 "Branch.c"
+#line 2741 "TagsBranch.c"
 				}
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 				_g_free0 (parent_path);
-#line 2745 "Branch.c"
+#line 2745 "TagsBranch.c"
 			}
-#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (_parent_path_list);
-#line 2749 "Branch.c"
+#line 2749 "TagsBranch.c"
 		}
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp29_ = tag_global;
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp30_ = old_tag_path;
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)");
-#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp32_ = old_tag_path;
-#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp33_ = tag_for_path (_tmp32_);
-#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		old_tag = _tmp33_;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp34_ = old_tag;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp35_ = tag_get_hierarchical_parent (_tmp34_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		old_tag_parent = _tmp35_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp37_ = old_tag_parent;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		if (_tmp37_ != NULL) {
-#line 2775 "Branch.c"
+#line 2775 "TagsBranch.c"
 			Tag* _tmp38_;
 			gchar* _tmp39_;
 			gchar* _tmp40_;
 			Tag* _tmp41_;
 			gchar* _tmp42_;
 			gchar* _tmp43_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp38_ = old_tag_parent;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp39_ = tag_get_path (_tmp38_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp40_ = _tmp39_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp41_ = self->priv->tag;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp42_ = tag_get_path (_tmp41_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp43_ = _tmp42_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (_tmp43_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (_tmp40_);
-#line 2800 "Branch.c"
+#line 2800 "TagsBranch.c"
 		} else {
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_tmp36_ = FALSE;
-#line 2804 "Branch.c"
+#line 2804 "TagsBranch.c"
 		}
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		if (_tmp36_) {
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			result = TRUE;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (old_tag_parent);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_object_unref0 (old_tag);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			_g_free0 (old_tag_path);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 			return result;
-#line 2818 "Branch.c"
+#line 2818 "TagsBranch.c"
 		}
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp44_ = app_window_get_command_manager ();
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp45_ = _tmp44_;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp46_ = old_tag;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp47_ = self->priv->tag;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp48_ = tag_get_path (_tmp47_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp49_ = _tmp48_;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_tmp51_ = _tmp50_;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (_tmp51_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (_tmp49_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_command_manager_unref0 (_tmp45_);
-#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		result = TRUE;
-#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (old_tag_parent);
-#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_object_unref0 (old_tag);
-#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		_g_free0 (old_tag_path);
-#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 		return result;
-#line 2854 "Branch.c"
+#line 2854 "TagsBranch.c"
 	}
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = FALSE;
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2860 "Branch.c"
+#line 2860 "TagsBranch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 282 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	result = FALSE;
-#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	return result;
-#line 2873 "Branch.c"
+#line 2873 "TagsBranch.c"
 }
 
 
@@ -2913,13 +2913,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2917 "Branch.c"
+#line 2917 "TagsBranch.c"
 	}
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2923 "Branch.c"
+#line 2923 "TagsBranch.c"
 }
 
 
@@ -2934,123 +2934,123 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS
 	gint _tmp5__length1;
 	guint8* _tmp6_;
 	gint _tmp6__length1;
-#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_return_if_fail (data != NULL);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = data;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp2_ = self->priv->tag;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp3_ = tag_get_path (_tmp2_);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp4_ = _tmp3_;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6_ = _tmp5_;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (_tmp4_);
-#line 2962 "Branch.c"
+#line 2962 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_name;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_get_sidebar_icon;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) tags_sidebar_entry_real_create_page;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
-#line 2979 "Branch.c"
+#line 2979 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) tags_sidebar_entry_real_is_user_renameable;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) tags_sidebar_entry_real_rename;
-#line 2990 "Branch.c"
+#line 2990 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) tags_sidebar_entry_real_destroy_source;
-#line 2999 "Branch.c"
+#line 2999 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 3010 "Branch.c"
+#line 3010 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) tags_sidebar_entry_real_expand_on_select;
-#line 3019 "Branch.c"
+#line 3019 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) {
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	iface->prepare_selection_data = (void (*) (SidebarInternalDragSourceEntry *, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
-#line 3028 "Branch.c"
+#line 3028 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) {
 	gchar* _tmp0_;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG);
-#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self->priv->single_tag_icon = _tmp0_;
-#line 3040 "Branch.c"
+#line 3040 "TagsBranch.c"
 }
 
 
 static void tags_sidebar_entry_finalize (GObject * obj) {
 	TagsSidebarEntry * self;
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_free0 (self->priv->single_tag_icon);
-#line 191 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/TagsBranch.vala"
 	G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj);
-#line 3054 "Branch.c"
+#line 3054 "TagsBranch.c"
 }
 
 
diff --git a/src/tags/Branch.vala b/src/tags/TagsBranch.vala
index 52dabdb..e11ea5d 100644
--- a/src/tags/Branch.vala
+++ b/src/tags/TagsBranch.vala
@@ -128,7 +128,7 @@ public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry,
     private Gtk.Menu? context_menu = null;
     
     public Header() {
-        base (_("Tags"));
+        base (_("Tags"), _("Organize and browse your photo’s tags"));
         setup_context_menu();
     }
 
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index ff453c2..210929f 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -98,8 +98,6 @@ KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (group != NULL, NULL);
-#line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self = (KeyValueMap*) g_type_create_instance (object_type);
 #line 12 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = group;
@@ -111,14 +109,14 @@ KeyValueMap* key_value_map_construct (GType object_type, const gchar* group) {
 	self->priv->group = _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return self;
-#line 115 "KeyValueMap.c"
+#line 113 "KeyValueMap.c"
 }
 
 
 KeyValueMap* key_value_map_new (const gchar* group) {
 #line 11 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return key_value_map_construct (TYPE_KEY_VALUE_MAP, group);
-#line 122 "KeyValueMap.c"
+#line 120 "KeyValueMap.c"
 }
 
 
@@ -127,15 +125,13 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 	KeyValueMap* clone = NULL;
 	const gchar* _tmp0_;
 	KeyValueMap* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->group;
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp1_ = key_value_map_new (_tmp0_);
 #line 16 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	clone = _tmp1_;
-#line 139 "KeyValueMap.c"
+#line 135 "KeyValueMap.c"
 	{
 		GeeIterator* _key_it = NULL;
 		GeeHashMap* _tmp2_;
@@ -162,7 +158,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 		_key_it = _tmp7_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		while (TRUE) {
-#line 166 "KeyValueMap.c"
+#line 162 "KeyValueMap.c"
 			GeeIterator* _tmp8_;
 			gboolean _tmp9_;
 			gchar* key = NULL;
@@ -183,7 +179,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 			if (!_tmp9_) {
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 				break;
-#line 187 "KeyValueMap.c"
+#line 183 "KeyValueMap.c"
 			}
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_tmp10_ = _key_it;
@@ -211,17 +207,17 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 			_g_free0 (_tmp18_);
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			_g_free0 (key);
-#line 215 "KeyValueMap.c"
+#line 211 "KeyValueMap.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_g_object_unref0 (_key_it);
-#line 219 "KeyValueMap.c"
+#line 215 "KeyValueMap.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = clone;
 #line 20 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 225 "KeyValueMap.c"
+#line 221 "KeyValueMap.c"
 }
 
 
@@ -229,8 +225,6 @@ gchar* key_value_map_get_group (KeyValueMap* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 23 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->group;
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -239,7 +233,7 @@ gchar* key_value_map_get_group (KeyValueMap* self) {
 	result = _tmp1_;
 #line 24 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 243 "KeyValueMap.c"
+#line 237 "KeyValueMap.c"
 }
 
 
@@ -248,8 +242,6 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 	GeeHashMap* _tmp0_;
 	GeeSet* _tmp1_;
 	GeeSet* _tmp2_;
-#line 27 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -260,7 +252,7 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 	result = _tmp2_;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 264 "KeyValueMap.c"
+#line 256 "KeyValueMap.c"
 }
 
 
@@ -269,10 +261,6 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
 	GeeHashMap* _tmp0_;
 	const gchar* _tmp1_;
 	gboolean _tmp2_;
-#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
-#line 31 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -283,7 +271,7 @@ gboolean key_value_map_has_key (KeyValueMap* self, const gchar* key) {
 	result = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 287 "KeyValueMap.c"
+#line 275 "KeyValueMap.c"
 }
 
 
@@ -292,12 +280,6 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar*
 	GeeHashMap* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 35 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (value != NULL);
 #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = key;
 #line 36 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -310,7 +292,7 @@ void key_value_map_set_string (KeyValueMap* self, const gchar* key, const gchar*
 	_tmp3_ = value;
 #line 38 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp3_);
-#line 314 "KeyValueMap.c"
+#line 296 "KeyValueMap.c"
 }
 
 
@@ -321,10 +303,6 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
 	gint _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 41 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
 #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = key;
 #line 42 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -343,7 +321,7 @@ void key_value_map_set_int (KeyValueMap* self, const gchar* key, gint value) {
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
 #line 44 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (_tmp5_);
-#line 347 "KeyValueMap.c"
+#line 325 "KeyValueMap.c"
 }
 
 
@@ -373,7 +351,7 @@ static gchar* double_to_string (gdouble self) {
 	result = _tmp4_;
 #line 871 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 377 "KeyValueMap.c"
+#line 355 "KeyValueMap.c"
 }
 
 
@@ -384,10 +362,6 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu
 	gdouble _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 47 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
 #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = key;
 #line 48 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -406,7 +380,7 @@ void key_value_map_set_double (KeyValueMap* self, const gchar* key, gdouble valu
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
 #line 50 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (_tmp5_);
-#line 410 "KeyValueMap.c"
+#line 384 "KeyValueMap.c"
 }
 
 
@@ -417,10 +391,6 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
 	gfloat _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 53 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
 #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = key;
 #line 54 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -439,7 +409,7 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
 #line 56 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (_tmp5_);
-#line 443 "KeyValueMap.c"
+#line 413 "KeyValueMap.c"
 }
 
 
@@ -447,7 +417,7 @@ static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
 #line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (self) {
-#line 451 "KeyValueMap.c"
+#line 421 "KeyValueMap.c"
 		gchar* _tmp0_;
 #line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
@@ -455,7 +425,7 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp0_;
 #line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 459 "KeyValueMap.c"
+#line 429 "KeyValueMap.c"
 	} else {
 		gchar* _tmp1_;
 #line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -464,7 +434,7 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp1_;
 #line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 468 "KeyValueMap.c"
+#line 438 "KeyValueMap.c"
 	}
 }
 
@@ -476,10 +446,6 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value
 	gboolean _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 59 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
 #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = key;
 #line 60 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -498,7 +464,7 @@ void key_value_map_set_bool (KeyValueMap* self, const gchar* key, gboolean value
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, _tmp5_);
 #line 62 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (_tmp5_);
-#line 502 "KeyValueMap.c"
+#line 468 "KeyValueMap.c"
 }
 
 
@@ -511,10 +477,6 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_;
 	gchar* _tmp7_;
-#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, NULL);
 #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 66 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -527,20 +489,20 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
 	_tmp4_ = value;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
-#line 531 "KeyValueMap.c"
+#line 493 "KeyValueMap.c"
 		const gchar* _tmp5_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp5_ = value;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp5_;
-#line 537 "KeyValueMap.c"
+#line 499 "KeyValueMap.c"
 	} else {
 		const gchar* _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp6_ = def;
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp6_;
-#line 544 "KeyValueMap.c"
+#line 506 "KeyValueMap.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp7_ = g_strdup (_tmp3_);
@@ -550,7 +512,7 @@ gchar* key_value_map_get_string (KeyValueMap* self, const gchar* key, const gcha
 	_g_free0 (value);
 #line 68 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 554 "KeyValueMap.c"
+#line 516 "KeyValueMap.c"
 }
 
 
@@ -562,10 +524,6 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 	gpointer _tmp2_;
 	gint _tmp3_ = 0;
 	const gchar* _tmp4_;
-#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0);
-#line 71 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0);
 #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 72 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -578,7 +536,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 	_tmp4_ = value;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
-#line 582 "KeyValueMap.c"
+#line 540 "KeyValueMap.c"
 		const gchar* _tmp5_;
 		gint _tmp6_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -587,14 +545,14 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 		_tmp6_ = atoi (_tmp5_);
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp6_;
-#line 591 "KeyValueMap.c"
+#line 549 "KeyValueMap.c"
 	} else {
 		gint _tmp7_;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp7_;
-#line 598 "KeyValueMap.c"
+#line 556 "KeyValueMap.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = _tmp3_;
@@ -602,7 +560,7 @@ gint key_value_map_get_int (KeyValueMap* self, const gchar* key, gint def) {
 	_g_free0 (value);
 #line 74 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 606 "KeyValueMap.c"
+#line 564 "KeyValueMap.c"
 }
 
 
@@ -610,8 +568,6 @@ static gdouble double_parse (const gchar* str) {
 	gdouble result = 0.0;
 	const gchar* _tmp0_;
 	gdouble _tmp1_;
-#line 877 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (str != NULL, 0.0);
 #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
 #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -620,7 +576,7 @@ static gdouble double_parse (const gchar* str) {
 	result = _tmp1_;
 #line 878 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 624 "KeyValueMap.c"
+#line 580 "KeyValueMap.c"
 }
 
 
@@ -632,10 +588,6 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 	gpointer _tmp2_;
 	gdouble _tmp3_ = 0.0;
 	const gchar* _tmp4_;
-#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0);
-#line 77 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0.0);
 #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 78 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -648,7 +600,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 	_tmp4_ = value;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
-#line 652 "KeyValueMap.c"
+#line 604 "KeyValueMap.c"
 		const gchar* _tmp5_;
 		gdouble _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -657,14 +609,14 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 		_tmp6_ = double_parse (_tmp5_);
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp6_;
-#line 661 "KeyValueMap.c"
+#line 613 "KeyValueMap.c"
 	} else {
 		gdouble _tmp7_;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp7_;
-#line 668 "KeyValueMap.c"
+#line 620 "KeyValueMap.c"
 	}
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = _tmp3_;
@@ -672,7 +624,7 @@ gdouble key_value_map_get_double (KeyValueMap* self, const gchar* key, gdouble d
 	_g_free0 (value);
 #line 80 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 676 "KeyValueMap.c"
+#line 628 "KeyValueMap.c"
 }
 
 
@@ -684,10 +636,6 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 	gpointer _tmp2_;
 	gfloat _tmp3_ = 0.0F;
 	const gchar* _tmp4_;
-#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), 0.0F);
-#line 83 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, 0.0F);
 #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 84 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -700,7 +648,7 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 	_tmp4_ = value;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
-#line 704 "KeyValueMap.c"
+#line 652 "KeyValueMap.c"
 		const gchar* _tmp5_;
 		gdouble _tmp6_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -709,14 +657,14 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 		_tmp6_ = double_parse (_tmp5_);
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = (gfloat) _tmp6_;
-#line 713 "KeyValueMap.c"
+#line 661 "KeyValueMap.c"
 	} else {
 		gfloat _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp7_;
-#line 720 "KeyValueMap.c"
+#line 668 "KeyValueMap.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = _tmp3_;
@@ -724,15 +672,13 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
 	_g_free0 (value);
 #line 86 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 728 "KeyValueMap.c"
+#line 676 "KeyValueMap.c"
 }
 
 
 static gboolean bool_parse (const gchar* str) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
-#line 44 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (str != NULL, FALSE);
 #line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
 #line 45 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -741,13 +687,13 @@ static gboolean bool_parse (const gchar* str) {
 		result = TRUE;
 #line 46 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 745 "KeyValueMap.c"
+#line 691 "KeyValueMap.c"
 	} else {
 #line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = FALSE;
 #line 48 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 751 "KeyValueMap.c"
+#line 697 "KeyValueMap.c"
 	}
 }
 
@@ -760,10 +706,6 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 	gpointer _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	const gchar* _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (IS_KEY_VALUE_MAP (self), FALSE);
-#line 89 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
 #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 90 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -776,7 +718,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 	_tmp4_ = value;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp4_ != NULL) {
-#line 780 "KeyValueMap.c"
+#line 722 "KeyValueMap.c"
 		const gchar* _tmp5_;
 		gboolean _tmp6_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -785,14 +727,14 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 		_tmp6_ = bool_parse (_tmp5_);
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp6_;
-#line 789 "KeyValueMap.c"
+#line 731 "KeyValueMap.c"
 	} else {
 		gboolean _tmp7_;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp7_ = def;
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp3_ = _tmp7_;
-#line 796 "KeyValueMap.c"
+#line 738 "KeyValueMap.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	result = _tmp3_;
@@ -800,7 +742,7 @@ gboolean key_value_map_get_bool (KeyValueMap* self, const gchar* key, gboolean d
 	_g_free0 (value);
 #line 92 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return result;
-#line 804 "KeyValueMap.c"
+#line 746 "KeyValueMap.c"
 }
 
 
@@ -810,12 +752,6 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 	const gchar* _tmp1_;
 	gpointer _tmp2_;
 	const gchar* _tmp3_;
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (def != NULL);
 #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 101 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -828,7 +764,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 	_tmp3_ = value;
 #line 103 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (_tmp3_ == NULL) {
-#line 832 "KeyValueMap.c"
+#line 768 "KeyValueMap.c"
 		GdkPoint _tmp4_;
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp4_ = *def;
@@ -838,7 +774,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 		_g_free0 (value);
 #line 104 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		return;
-#line 842 "KeyValueMap.c"
+#line 778 "KeyValueMap.c"
 	} else {
 		GdkPoint _result_ = {0};
 		GdkPoint _tmp5_ = {0};
@@ -860,7 +796,7 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 			_g_free0 (value);
 #line 108 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return;
-#line 864 "KeyValueMap.c"
+#line 800 "KeyValueMap.c"
 		} else {
 			GdkPoint _tmp8_;
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -871,12 +807,12 @@ void key_value_map_get_point (KeyValueMap* self, const gchar* key, GdkPoint* def
 			_g_free0 (value);
 #line 110 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return;
-#line 875 "KeyValueMap.c"
+#line 811 "KeyValueMap.c"
 		}
 	}
 #line 100 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (value);
-#line 880 "KeyValueMap.c"
+#line 816 "KeyValueMap.c"
 }
 
 
@@ -889,12 +825,6 @@ void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* poi
 	gint _tmp5_;
 	gchar* _tmp6_;
 	gchar* _tmp7_;
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (IS_KEY_VALUE_MAP (self));
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (key != NULL);
-#line 114 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	g_return_if_fail (point != NULL);
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -915,14 +845,14 @@ void key_value_map_set_point (KeyValueMap* self, const gchar* key, GdkPoint* poi
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp7_);
 #line 115 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_free0 (_tmp7_);
-#line 919 "KeyValueMap.c"
+#line 849 "KeyValueMap.c"
 }
 
 
 static void value_key_value_map_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	value->data[0].v_pointer = NULL;
-#line 926 "KeyValueMap.c"
+#line 856 "KeyValueMap.c"
 }
 
 
@@ -931,7 +861,7 @@ static void value_key_value_map_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (value->data[0].v_pointer);
-#line 935 "KeyValueMap.c"
+#line 865 "KeyValueMap.c"
 	}
 }
 
@@ -941,11 +871,11 @@ static void value_key_value_map_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		dest_value->data[0].v_pointer = key_value_map_ref (src_value->data[0].v_pointer);
-#line 945 "KeyValueMap.c"
+#line 875 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 949 "KeyValueMap.c"
+#line 879 "KeyValueMap.c"
 	}
 }
 
@@ -953,37 +883,37 @@ static void value_key_value_map_copy_value (const GValue* src_value, GValue* des
 static gpointer value_key_value_map_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return value->data[0].v_pointer;
-#line 957 "KeyValueMap.c"
+#line 887 "KeyValueMap.c"
 }
 
 
 static gchar* value_key_value_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (collect_values[0].v_pointer) {
-#line 964 "KeyValueMap.c"
+#line 894 "KeyValueMap.c"
 		KeyValueMap * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 971 "KeyValueMap.c"
+#line 901 "KeyValueMap.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.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 975 "KeyValueMap.c"
+#line 905 "KeyValueMap.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = key_value_map_ref (object);
-#line 979 "KeyValueMap.c"
+#line 909 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 983 "KeyValueMap.c"
+#line 913 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return NULL;
-#line 987 "KeyValueMap.c"
+#line 917 "KeyValueMap.c"
 }
 
 
@@ -994,25 +924,25 @@ static gchar* value_key_value_map_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 998 "KeyValueMap.c"
+#line 928 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = NULL;
-#line 1004 "KeyValueMap.c"
+#line 934 "KeyValueMap.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1008 "KeyValueMap.c"
+#line 938 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		*object_p = key_value_map_ref (value->data[0].v_pointer);
-#line 1012 "KeyValueMap.c"
+#line 942 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return NULL;
-#line 1016 "KeyValueMap.c"
+#line 946 "KeyValueMap.c"
 }
 
 
@@ -1026,7 +956,7 @@ GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return G_PARAM_SPEC (spec);
-#line 1030 "KeyValueMap.c"
+#line 960 "KeyValueMap.c"
 }
 
 
@@ -1035,7 +965,7 @@ gpointer value_get_key_value_map (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEY_VALUE_MAP), NULL);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return value->data[0].v_pointer;
-#line 1039 "KeyValueMap.c"
+#line 969 "KeyValueMap.c"
 }
 
 
@@ -1055,17 +985,17 @@ void value_set_key_value_map (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_ref (value->data[0].v_pointer);
-#line 1059 "KeyValueMap.c"
+#line 989 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 1063 "KeyValueMap.c"
+#line 993 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (old);
-#line 1069 "KeyValueMap.c"
+#line 999 "KeyValueMap.c"
 	}
 }
 
@@ -1084,17 +1014,17 @@ void value_take_key_value_map (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/util/KeyValueMap.vala"
 		value->data[0].v_pointer = v_object;
-#line 1088 "KeyValueMap.c"
+#line 1018 "KeyValueMap.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		value->data[0].v_pointer = NULL;
-#line 1092 "KeyValueMap.c"
+#line 1022 "KeyValueMap.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		key_value_map_unref (old);
-#line 1098 "KeyValueMap.c"
+#line 1028 "KeyValueMap.c"
 	}
 }
 
@@ -1106,7 +1036,7 @@ static void key_value_map_class_init (KeyValueMapClass * klass) {
 	((KeyValueMapClass *) klass)->finalize = key_value_map_finalize;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	g_type_class_add_private (klass, sizeof (KeyValueMapPrivate));
-#line 1110 "KeyValueMap.c"
+#line 1040 "KeyValueMap.c"
 }
 
 
@@ -1120,7 +1050,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->ref_count = 1;
-#line 1124 "KeyValueMap.c"
+#line 1054 "KeyValueMap.c"
 }
 
 
@@ -1134,7 +1064,7 @@ static void key_value_map_finalize (KeyValueMap * obj) {
 	_g_free0 (self->priv->group);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_g_object_unref0 (self->priv->map);
-#line 1138 "KeyValueMap.c"
+#line 1068 "KeyValueMap.c"
 }
 
 
@@ -1159,7 +1089,7 @@ gpointer key_value_map_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	return instance;
-#line 1163 "KeyValueMap.c"
+#line 1093 "KeyValueMap.c"
 }
 
 
@@ -1172,7 +1102,7 @@ void key_value_map_unref (gpointer instance) {
 		KEY_VALUE_MAP_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1176 "KeyValueMap.c"
+#line 1106 "KeyValueMap.c"
 	}
 }
 
diff --git a/src/util/image.c b/src/util/image.c
index d103a3f..324464c 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -27,6 +27,27 @@ typedef struct _Dimensions Dimensions;
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
 #define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
 
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
 #define TYPE_BOX (box_get_type ())
 typedef struct _Box Box;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
@@ -47,6 +68,8 @@ struct _Box {
 };
 
 
+extern cairo_surface_t* background_surface;
+cairo_surface_t* background_surface = NULL;
 
 gboolean is_color_parsable (const gchar* spec);
 void parse_color (const gchar* spec, GdkRGBA* result);
@@ -82,6 +105,14 @@ gdouble degrees_to_radians (gdouble theta);
 GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle);
 void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result);
 void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result);
+cairo_surface_t* get_background_surface (void);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self);
+gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self);
+void invalidate_transparent_background (void);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
 GType box_get_type (void) G_GNUC_CONST;
 Box* box_dup (const Box* self);
 void box_free (Box* self);
@@ -108,7 +139,7 @@ gboolean is_color_parsable (const gchar* spec) {
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 112 "image.c"
+#line 143 "image.c"
 }
 
 
@@ -125,7 +156,7 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
 	*result = _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 129 "image.c"
+#line 160 "image.c"
 }
 
 
@@ -143,19 +174,19 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 	_tmp1_ = gdk_rgba_parse (&rgba, _tmp0_);
 #line 128 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (!_tmp1_) {
-#line 147 "image.c"
+#line 178 "image.c"
 		const gchar* _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = spec;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		g_error ("image.vala:129: Can't parse color %s", _tmp2_);
-#line 153 "image.c"
+#line 184 "image.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = rgba;
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 159 "image.c"
+#line 190 "image.c"
 }
 
 
@@ -202,14 +233,14 @@ void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
 	_tmp10_ = _tmp9_.alpha;
 #line 136 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_);
-#line 206 "image.c"
+#line 237 "image.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 213 "image.c"
+#line 244 "image.c"
 }
 
 
@@ -219,7 +250,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 	GError * _inner_error_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/util/image.vala"
 	pixbuf = NULL;
-#line 223 "image.c"
+#line 254 "image.c"
 	{
 		GtkIconTheme* icon_theme = NULL;
 		GtkIconTheme* _tmp0_;
@@ -241,7 +272,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
 			_g_object_unref0 (icon_theme);
-#line 245 "image.c"
+#line 276 "image.c"
 			goto __catch4_g_error;
 		}
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -256,7 +287,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		_g_object_unref0 (_tmp2_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_object_unref0 (icon_theme);
-#line 260 "image.c"
+#line 291 "image.c"
 	}
 	goto __finally4;
 	__catch4_g_error:
@@ -283,7 +314,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_error_free0 (_error_);
-#line 287 "image.c"
+#line 318 "image.c"
 	}
 	__finally4:
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -296,13 +327,13 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_clear_error (&_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		return NULL;
-#line 300 "image.c"
+#line 331 "image.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = pixbuf;
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 306 "image.c"
+#line 337 "image.c"
 }
 
 
@@ -354,7 +385,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	_tmp9_ = _tmp8_.width;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ == _tmp9_) {
-#line 358 "image.c"
+#line 389 "image.c"
 		Dimensions _tmp10_;
 		gint _tmp11_;
 		Dimensions _tmp12_;
@@ -369,15 +400,15 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		_tmp13_ = _tmp12_.height;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = _tmp11_ == _tmp13_;
-#line 373 "image.c"
+#line 404 "image.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = FALSE;
-#line 377 "image.c"
+#line 408 "image.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp5_) {
-#line 381 "image.c"
+#line 412 "image.c"
 		GdkPixbuf* _tmp14_;
 		GdkPixbuf* _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -388,7 +419,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		result = _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 392 "image.c"
+#line 423 "image.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_);
@@ -412,7 +443,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	result = _tmp23_;
 #line 167 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 416 "image.c"
+#line 447 "image.c"
 }
 
 
@@ -454,7 +485,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	_tmp6_ = _tmp5_.width;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 458 "image.c"
+#line 489 "image.c"
 		Dimensions _tmp7_;
 		gint _tmp8_;
 		Dimensions _tmp9_;
@@ -469,15 +500,15 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		_tmp10_ = _tmp9_.height;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 473 "image.c"
+#line 504 "image.c"
 	} else {
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 477 "image.c"
+#line 508 "image.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 481 "image.c"
+#line 512 "image.c"
 		GdkPixbuf* _tmp11_;
 		GdkPixbuf* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -488,7 +519,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		result = _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 492 "image.c"
+#line 523 "image.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_);
@@ -512,7 +543,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	result = _tmp20_;
 #line 178 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 516 "image.c"
+#line 547 "image.c"
 }
 
 
@@ -542,7 +573,7 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
 	_tmp4_ = ctx;
 #line 186 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_paint (_tmp4_);
-#line 546 "image.c"
+#line 577 "image.c"
 }
 
 
@@ -648,7 +679,7 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 	_tmp21_ = cx;
 #line 209 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_clip (_tmp21_);
-#line 652 "image.c"
+#line 683 "image.c"
 }
 
 
@@ -667,7 +698,7 @@ inline guchar shift_color_byte (gint b, gint shift) {
 	result = (guchar) _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 671 "image.c"
+#line 702 "image.c"
 }
 
 
@@ -706,17 +737,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp1_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_ >= -255) {
-#line 710 "image.c"
+#line 741 "image.c"
 		gint _tmp2_;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp2_ <= 255;
-#line 716 "image.c"
+#line 747 "image.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 720 "image.c"
+#line 751 "image.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp0_, "red >= -255 && red <= 255");
@@ -724,17 +755,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp4_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ >= -255) {
-#line 728 "image.c"
+#line 759 "image.c"
 		gint _tmp5_;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = _tmp5_ <= 255;
-#line 734 "image.c"
+#line 765 "image.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = FALSE;
-#line 738 "image.c"
+#line 769 "image.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp3_, "green >= -255 && green <= 255");
@@ -742,17 +773,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp7_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ >= -255) {
-#line 746 "image.c"
+#line 777 "image.c"
 		gint _tmp8_;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = _tmp8_ <= 255;
-#line 752 "image.c"
+#line 783 "image.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = FALSE;
-#line 756 "image.c"
+#line 787 "image.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp6_, "blue >= -255 && blue <= 255");
@@ -760,17 +791,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp10_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp10_ >= -255) {
-#line 764 "image.c"
+#line 795 "image.c"
 		gint _tmp11_;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = _tmp11_ <= 255;
-#line 770 "image.c"
+#line 801 "image.c"
 	} else {
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = FALSE;
-#line 774 "image.c"
+#line 805 "image.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255");
@@ -820,19 +851,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_);
 #line 230 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8");
-#line 824 "image.c"
+#line 855 "image.c"
 	{
 		gint y = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 		y = 0;
-#line 829 "image.c"
+#line 860 "image.c"
 		{
 			gboolean _tmp27_ = FALSE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp27_ = TRUE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 836 "image.c"
+#line 867 "image.c"
 				gint _tmp29_;
 				gint _tmp30_;
 				gint y_offset = 0;
@@ -840,13 +871,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				gint _tmp32_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp27_) {
-#line 844 "image.c"
+#line 875 "image.c"
 					gint _tmp28_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp28_ = y;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					y = _tmp28_ + 1;
-#line 850 "image.c"
+#line 881 "image.c"
 				}
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp27_ = FALSE;
@@ -858,7 +889,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				if (!(_tmp29_ < _tmp30_)) {
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 862 "image.c"
+#line 893 "image.c"
 				}
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp31_ = y;
@@ -866,19 +897,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				_tmp32_ = rowstride;
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				y_offset = _tmp31_ * _tmp32_;
-#line 870 "image.c"
+#line 901 "image.c"
 				{
 					gint x = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 					x = 0;
-#line 875 "image.c"
+#line 906 "image.c"
 					{
 						gboolean _tmp33_ = FALSE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						_tmp33_ = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						while (TRUE) {
-#line 882 "image.c"
+#line 913 "image.c"
 							gint _tmp35_;
 							gint _tmp36_;
 							gint offset = 0;
@@ -892,13 +923,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							gint _tmp68_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (!_tmp33_) {
-#line 896 "image.c"
+#line 927 "image.c"
 								gint _tmp34_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp34_ = x;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								x = _tmp34_ + 1;
-#line 902 "image.c"
+#line 933 "image.c"
 							}
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp33_ = FALSE;
@@ -910,7 +941,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							if (!(_tmp35_ < _tmp36_)) {
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								break;
-#line 914 "image.c"
+#line 945 "image.c"
 							}
 #line 236 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp37_ = y_offset;
@@ -924,7 +955,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							_tmp40_ = red;
 #line 238 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp40_ != 0) {
-#line 928 "image.c"
+#line 959 "image.c"
 								guchar* _tmp41_;
 								gint _tmp42_;
 								guchar* _tmp43_;
@@ -951,13 +982,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp41_[_tmp42_] = _tmp47_;
 #line 239 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp48_ = _tmp41_[_tmp42_];
-#line 955 "image.c"
+#line 986 "image.c"
 							}
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp49_ = green;
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp49_ != 0) {
-#line 961 "image.c"
+#line 992 "image.c"
 								guchar* _tmp50_;
 								gint _tmp51_;
 								guchar* _tmp52_;
@@ -984,13 +1015,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp50_[_tmp51_ + 1] = _tmp56_;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp57_ = _tmp50_[_tmp51_ + 1];
-#line 988 "image.c"
+#line 1019 "image.c"
 							}
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp58_ = blue;
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp58_ != 0) {
-#line 994 "image.c"
+#line 1025 "image.c"
 								guchar* _tmp59_;
 								gint _tmp60_;
 								guchar* _tmp61_;
@@ -1017,27 +1048,27 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp59_[_tmp60_ + 2] = _tmp65_;
 #line 245 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp66_ = _tmp59_[_tmp60_ + 2];
-#line 1021 "image.c"
+#line 1052 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp68_ = alpha;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp68_ != 0) {
-#line 1027 "image.c"
+#line 1058 "image.c"
 								gint _tmp69_;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp69_ = channels;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = _tmp69_ >= 4;
-#line 1033 "image.c"
+#line 1064 "image.c"
 							} else {
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = FALSE;
-#line 1037 "image.c"
+#line 1068 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp67_) {
-#line 1041 "image.c"
+#line 1072 "image.c"
 								guchar* _tmp70_;
 								gint _tmp71_;
 								guchar* _tmp72_;
@@ -1064,7 +1095,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp70_[_tmp71_ + 3] = _tmp76_;
 #line 248 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp77_ = _tmp70_[_tmp71_ + 3];
-#line 1068 "image.c"
+#line 1099 "image.c"
 							}
 						}
 					}
@@ -1093,7 +1124,7 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	_tmp5_ = _tmp4_.x;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp3_ >= _tmp5_) {
-#line 1097 "image.c"
+#line 1128 "image.c"
 		gint _tmp6_;
 		GdkRectangle _tmp7_;
 		gint _tmp8_;
@@ -1111,15 +1142,15 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp10_ = _tmp9_.width;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_);
-#line 1115 "image.c"
+#line 1146 "image.c"
 	} else {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1119 "image.c"
+#line 1150 "image.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1123 "image.c"
+#line 1154 "image.c"
 		gint _tmp11_;
 		GdkRectangle _tmp12_;
 		gint _tmp13_;
@@ -1131,15 +1162,15 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp13_ = _tmp12_.y;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp11_ >= _tmp13_;
-#line 1135 "image.c"
+#line 1166 "image.c"
 	} else {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1139 "image.c"
+#line 1170 "image.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1143 "image.c"
+#line 1174 "image.c"
 		gint _tmp14_;
 		GdkRectangle _tmp15_;
 		gint _tmp16_;
@@ -1157,17 +1188,17 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp18_ = _tmp17_.height;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_);
-#line 1161 "image.c"
+#line 1192 "image.c"
 	} else {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1165 "image.c"
+#line 1196 "image.c"
 	}
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1171 "image.c"
+#line 1202 "image.c"
 }
 
 
@@ -1194,7 +1225,7 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 	_tmp6_ = _tmp5_.x;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 1198 "image.c"
+#line 1229 "image.c"
 		GdkRectangle _tmp7_;
 		gint _tmp8_;
 		GdkRectangle _tmp9_;
@@ -1209,15 +1240,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp10_ = _tmp9_.y;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 1213 "image.c"
+#line 1244 "image.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1217 "image.c"
+#line 1248 "image.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1221 "image.c"
+#line 1252 "image.c"
 		GdkRectangle _tmp11_;
 		gint _tmp12_;
 		GdkRectangle _tmp13_;
@@ -1232,15 +1263,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp14_ = _tmp13_.width;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp12_ == _tmp14_;
-#line 1236 "image.c"
+#line 1267 "image.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1240 "image.c"
+#line 1271 "image.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1244 "image.c"
+#line 1275 "image.c"
 		GdkRectangle _tmp15_;
 		gint _tmp16_;
 		GdkRectangle _tmp17_;
@@ -1255,17 +1286,17 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp18_ = _tmp17_.height;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp16_ == _tmp18_;
-#line 1259 "image.c"
+#line 1290 "image.c"
 	} else {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1263 "image.c"
+#line 1294 "image.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1269 "image.c"
+#line 1300 "image.c"
 }
 
 
@@ -1304,7 +1335,7 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
 	result = _tmp8_;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1308 "image.c"
+#line 1339 "image.c"
 }
 
 
@@ -1388,7 +1419,7 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
 	*result = rect;
 #line 272 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1392 "image.c"
+#line 1423 "image.c"
 }
 
 
@@ -1427,7 +1458,7 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 	*result = _result_;
 #line 280 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1431 "image.c"
+#line 1462 "image.c"
 }
 
 
@@ -1474,7 +1505,7 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	*result = _result_;
 #line 288 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1478 "image.c"
+#line 1509 "image.c"
 }
 
 
@@ -1521,7 +1552,7 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	*result = _result_;
 #line 296 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1525 "image.c"
+#line 1556 "image.c"
 }
 
 
@@ -1540,19 +1571,19 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 	_tmp2_ = _tmp1_;
 #line 301 "/home/jens/Source/shotwell/src/util/image.vala"
 	gdk_pixels = _tmp2_;
-#line 1544 "image.c"
+#line 1575 "image.c"
 	{
 		gint j = 0;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 		j = 0;
-#line 1549 "image.c"
+#line 1580 "image.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp3_ = TRUE;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 1556 "image.c"
+#line 1587 "image.c"
 				gint _tmp5_;
 				GdkPixbuf* _tmp6_;
 				gint _tmp7_;
@@ -1570,13 +1601,13 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				gint _tmp29_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp3_) {
-#line 1574 "image.c"
+#line 1605 "image.c"
 					gint _tmp4_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp4_ = j;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					j = _tmp4_ + 1;
-#line 1580 "image.c"
+#line 1611 "image.c"
 				}
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp3_ = FALSE;
@@ -1592,7 +1623,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				if (!(_tmp5_ < _tmp8_)) {
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 1596 "image.c"
+#line 1627 "image.c"
 				}
 #line 303 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp9_ = gdk_pixels;
@@ -1610,7 +1641,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				end = _tmp10_ + (4 * _tmp13_);
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 				while (TRUE) {
-#line 1614 "image.c"
+#line 1645 "image.c"
 					guchar* _tmp14_;
 					guchar* _tmp15_;
 					guchar tmp = '\0';
@@ -1632,7 +1663,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 					if (!(_tmp14_ < _tmp15_)) {
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 						break;
-#line 1636 "image.c"
+#line 1667 "image.c"
 					}
 #line 307 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp16_ = p;
@@ -1662,7 +1693,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 					_tmp25_ = p;
 #line 317 "/home/jens/Source/shotwell/src/util/image.vala"
 					p = _tmp25_ + 4;
-#line 1666 "image.c"
+#line 1697 "image.c"
 				}
 #line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp26_ = gdk_pixels;
@@ -1674,7 +1705,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				_tmp29_ = _tmp28_;
 #line 320 "/home/jens/Source/shotwell/src/util/image.vala"
 				gdk_pixels = _tmp26_ + _tmp29_;
-#line 1678 "image.c"
+#line 1709 "image.c"
 			}
 		}
 	}
@@ -1754,13 +1785,13 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
 	if (dest_width) {
 #line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_width = _vala_dest_width;
-#line 1758 "image.c"
+#line 1789 "image.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (dest_height) {
 #line 334 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_height = _vala_dest_height;
-#line 1764 "image.c"
+#line 1795 "image.c"
 	}
 }
 
@@ -1850,7 +1881,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	_tmp0_ = angle;
 #line 353 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 1854 "image.c"
+#line 1885 "image.c"
 		GdkPixbuf* _tmp1_;
 		GdkPixbuf* _tmp2_;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1861,7 +1892,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 		result = _tmp2_;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 1865 "image.c"
+#line 1896 "image.c"
 	}
 #line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = source_pixbuf;
@@ -1905,11 +1936,11 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	if (_tmp20_) {
 #line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_ARGB32;
-#line 1909 "image.c"
+#line 1940 "image.c"
 	} else {
 #line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_RGB24;
-#line 1913 "image.c"
+#line 1944 "image.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_ = dest_pixbuf;
@@ -2037,7 +2068,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	_cairo_surface_destroy0 (surface);
 #line 390 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 2041 "image.c"
+#line 2072 "image.c"
 }
 
 
@@ -2086,7 +2117,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	_tmp0_ = angle;
 #line 409 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 2090 "image.c"
+#line 2121 "image.c"
 		GdkPoint _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = *source_point;
@@ -2094,7 +2125,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 		*result = _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		return;
-#line 2098 "image.c"
+#line 2129 "image.c"
 	}
 #line 416 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = img_w;
@@ -2132,13 +2163,13 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	_tmp13_ = invert;
 #line 422 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp13_) {
-#line 2136 "image.c"
+#line 2167 "image.c"
 		cairo_status_t _tmp14_;
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = cairo_matrix_invert (&matrix);
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
-#line 2142 "image.c"
+#line 2173 "image.c"
 	}
 #line 425 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = *source_point;
@@ -2166,7 +2197,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	*result = _tmp21_;
 #line 429 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2170 "image.c"
+#line 2201 "image.c"
 }
 
 
@@ -2205,7 +2236,335 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
 	*result = _tmp4_;
 #line 446 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2209 "image.c"
+#line 2240 "image.c"
+}
+
+
+static gpointer _cairo_surface_reference0 (gpointer self) {
+#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+	return self ? cairo_surface_reference (self) : NULL;
+#line 2247 "image.c"
+}
+
+
+cairo_surface_t* get_background_surface (void) {
+	cairo_surface_t* result = NULL;
+	cairo_surface_t* _tmp0_;
+	cairo_surface_t* _tmp31_;
+	cairo_surface_t* _tmp32_;
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp0_ = background_surface;
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+	if (_tmp0_ == NULL) {
+#line 2260 "image.c"
+		gchar* color_a = NULL;
+		gchar* color_b = NULL;
+		ConfigFacade* config = NULL;
+		ConfigFacade* _tmp1_;
+		gchar* type = NULL;
+		ConfigFacade* _tmp2_;
+		gchar* _tmp3_;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		GQuark _tmp7_ = 0U;
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		static GQuark _tmp6_label0 = 0;
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		static GQuark _tmp6_label1 = 0;
+#line 2275 "image.c"
+		cairo_surface_t* _tmp17_;
+		cairo_t* ctx = NULL;
+		cairo_surface_t* _tmp18_;
+		cairo_t* _tmp19_;
+		cairo_t* _tmp20_;
+		cairo_t* _tmp21_;
+		const gchar* _tmp22_;
+		cairo_t* _tmp23_;
+		cairo_t* _tmp24_;
+		cairo_t* _tmp25_;
+		cairo_t* _tmp26_;
+		const gchar* _tmp27_;
+		cairo_t* _tmp28_;
+		cairo_t* _tmp29_;
+		cairo_t* _tmp30_;
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp1_ = config_facade_get_instance ();
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+		config = _tmp1_;
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp2_ = config;
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp3_ = configuration_facade_get_transparent_background_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+		type = _tmp3_;
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp4_ = type;
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp5_ = _tmp4_;
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+		if (_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("checkered")))) {
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+			switch (0) {
+#line 2311 "image.c"
+				default:
+				{
+					gchar* _tmp8_;
+					gchar* _tmp9_;
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp8_ = g_strdup ("#808080");
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_a);
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_a = _tmp8_;
+#line 461 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp9_ = g_strdup ("#ccc");
+#line 461 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_b);
+#line 461 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_b = _tmp9_;
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+					break;
+#line 2330 "image.c"
+				}
+			}
+		} else if (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("solid")))) {
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+			switch (0) {
+#line 2336 "image.c"
+				default:
+				{
+					ConfigFacade* _tmp10_;
+					gchar* _tmp11_;
+					const gchar* _tmp12_;
+					gchar* _tmp13_;
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp10_ = config;
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp11_ = configuration_facade_get_transparent_background_color (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_b);
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_b = _tmp11_;
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp12_ = color_b;
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp13_ = g_strdup (_tmp12_);
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_a);
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_a = _tmp13_;
+#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+					break;
+#line 2361 "image.c"
+				}
+			}
+		} else {
+#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
+			switch (0) {
+#line 2367 "image.c"
+				default:
+				{
+					gchar* _tmp14_;
+					const gchar* _tmp15_;
+					gchar* _tmp16_;
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp14_ = g_strdup ("#000");
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_b);
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_b = _tmp14_;
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp15_ = color_b;
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					_tmp16_ = g_strdup (_tmp15_);
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					_g_free0 (color_a);
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+					color_a = _tmp16_;
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+					break;
+#line 2389 "image.c"
+				}
+			}
+		}
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp17_ = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 16, 16);
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+		_cairo_surface_destroy0 (background_surface);
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+		background_surface = _tmp17_;
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp18_ = background_surface;
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp19_ = cairo_create (_tmp18_);
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+		ctx = _tmp19_;
+#line 473 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp20_ = ctx;
+#line 473 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_set_operator (_tmp20_, CAIRO_OPERATOR_SOURCE);
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp21_ = ctx;
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp22_ = color_a;
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+		set_source_color_from_string (_tmp21_, _tmp22_);
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp23_ = ctx;
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_rectangle (_tmp23_, (gdouble) 0, (gdouble) 0, (gdouble) 8, (gdouble) 8);
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp24_ = ctx;
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_rectangle (_tmp24_, (gdouble) 8, (gdouble) 8, (gdouble) 8, (gdouble) 8);
+#line 477 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp25_ = ctx;
+#line 477 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_fill (_tmp25_);
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp26_ = ctx;
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp27_ = color_b;
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+		set_source_color_from_string (_tmp26_, _tmp27_);
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp28_ = ctx;
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_rectangle (_tmp28_, (gdouble) 0, (gdouble) 8, (gdouble) 8, (gdouble) 8);
+#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp29_ = ctx;
+#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_rectangle (_tmp29_, (gdouble) 8, (gdouble) 0, (gdouble) 8, (gdouble) 8);
+#line 481 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp30_ = ctx;
+#line 481 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_fill (_tmp30_);
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+		_cairo_destroy0 (ctx);
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+		_g_free0 (type);
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+		_g_object_unref0 (config);
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+		_g_free0 (color_b);
+#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
+		_g_free0 (color_a);
+#line 2455 "image.c"
+	}
+#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp31_ = background_surface;
+#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp32_ = _cairo_surface_reference0 (_tmp31_);
+#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+	result = _tmp32_;
+#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+	return result;
+#line 2465 "image.c"
+}
+
+
+void invalidate_transparent_background (void) {
+#line 488 "/home/jens/Source/shotwell/src/util/image.vala"
+	_cairo_surface_destroy0 (background_surface);
+#line 488 "/home/jens/Source/shotwell/src/util/image.vala"
+	background_surface = NULL;
+#line 2474 "image.c"
+}
+
+
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y) {
+	GdkPixbuf* _tmp0_;
+	gboolean _tmp1_;
+	cairo_t* _tmp17_;
+	GdkPixbuf* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	cairo_t* _tmp21_;
+#line 491 "/home/jens/Source/shotwell/src/util/image.vala"
+	g_return_if_fail (ctx != NULL);
+#line 491 "/home/jens/Source/shotwell/src/util/image.vala"
+	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp0_ = pixbuf;
+#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp1_ = gdk_pixbuf_get_has_alpha (_tmp0_);
+#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
+	if (_tmp1_) {
+#line 2496 "image.c"
+		cairo_t* _tmp2_;
+		cairo_surface_t* _tmp3_;
+		cairo_surface_t* _tmp4_;
+		cairo_t* _tmp5_;
+		cairo_pattern_t* _tmp6_;
+		cairo_t* _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
+		GdkPixbuf* _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		GdkPixbuf* _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		cairo_t* _tmp16_;
+#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp2_ = ctx;
+#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp3_ = get_background_surface ();
+#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp4_ = _tmp3_;
+#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_set_source_surface (_tmp2_, _tmp4_, (gdouble) 0, (gdouble) 0);
+#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
+		_cairo_surface_destroy0 (_tmp4_);
+#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp5_ = ctx;
+#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp6_ = cairo_get_source (_tmp5_);
+#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_pattern_set_extend (_tmp6_, CAIRO_EXTEND_REPEAT);
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp7_ = ctx;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp8_ = x;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp9_ = y;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp10_ = pixbuf;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp11_ = gdk_pixbuf_get_width (_tmp10_);
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp12_ = _tmp11_;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp13_ = pixbuf;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp15_ = _tmp14_;
+#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_rectangle (_tmp7_, (gdouble) _tmp8_, (gdouble) _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_);
+#line 496 "/home/jens/Source/shotwell/src/util/image.vala"
+		_tmp16_ = ctx;
+#line 496 "/home/jens/Source/shotwell/src/util/image.vala"
+		cairo_fill (_tmp16_);
+#line 2552 "image.c"
+	}
+#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp17_ = ctx;
+#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp18_ = pixbuf;
+#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp19_ = x;
+#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp20_ = y;
+#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
+	gdk_cairo_set_source_pixbuf (_tmp17_, _tmp18_, (gdouble) _tmp19_, (gdouble) _tmp20_);
+#line 500 "/home/jens/Source/shotwell/src/util/image.vala"
+	_tmp21_ = ctx;
+#line 500 "/home/jens/Source/shotwell/src/util/image.vala"
+	cairo_paint (_tmp21_);
+#line 2568 "image.c"
 }
 
 
@@ -2289,263 +2648,263 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	gint _tmp73_;
 	Box _tmp78_ = {0};
 	gboolean _tmp79_;
-#line 451 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 504 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (src != NULL);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = *src;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp1_ = _tmp0_.left;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = *src;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = _tmp2_.top;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_.x = _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp4_.y = _tmp3_;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp5_ = img_w;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp6_ = img_h;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp7_ = angle_deg;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp4_, _tmp5_, _tmp6_, _tmp7_, &_tmp8_);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_left = _tmp8_;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp9_ = *src;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp10_ = _tmp9_.right;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp11_ = *src;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp12_ = _tmp11_.top;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_.x = _tmp10_;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp13_.y = _tmp12_;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp14_ = img_w;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = img_h;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp16_ = angle_deg;
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp13_, _tmp14_, _tmp15_, _tmp16_, &_tmp17_);
-#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_right = _tmp17_;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp18_ = *src;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp19_ = _tmp18_.left;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp20_ = *src;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_ = _tmp20_.bottom;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp22_.x = _tmp19_;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp22_.y = _tmp21_;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp23_ = img_w;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp24_ = img_h;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp25_ = angle_deg;
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp22_, _tmp23_, _tmp24_, _tmp25_, &_tmp26_);
-#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_left = _tmp26_;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp27_ = *src;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp28_ = _tmp27_.right;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp29_ = *src;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp30_ = _tmp29_.bottom;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp31_.x = _tmp28_;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp31_.y = _tmp30_;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp32_ = img_w;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp33_ = img_h;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp34_ = angle_deg;
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	derotate_point_arb (&_tmp31_, _tmp32_, _tmp33_, _tmp34_, &_tmp35_);
-#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_right = _tmp35_;
-#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp36_ = angle_deg;
-#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp37_ = degrees_to_radians (_tmp36_);
-#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
 	angle = _tmp37_;
-#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
 	top_offset = 0;
-#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom_offset = 0;
-#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
 	left_offset = 0;
-#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
 	right_offset = 0;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp38_ = top_left;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp39_ = _tmp38_.y;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp40_ = top_right;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp41_ = _tmp40_.y;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp42_ = MIN (_tmp39_, _tmp41_);
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
 	top = _tmp42_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 516 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp43_ = top;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 516 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp43_ < 0) {
-#line 2413 "image.c"
+#line 2772 "image.c"
 		gint _tmp44_;
 		gdouble _tmp45_;
 		gdouble _tmp46_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp44_ = top;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp45_ = angle;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp46_ = cos (_tmp45_);
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
 		top_offset = (gint) ((0 - _tmp44_) * _tmp46_);
-#line 2425 "image.c"
+#line 2784 "image.c"
 	}
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp47_ = bottom_left;
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp48_ = _tmp47_.y;
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp49_ = bottom_right;
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp50_ = _tmp49_.y;
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp51_ = MAX (_tmp48_, _tmp50_);
-#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
 	bottom = _tmp51_;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp52_ = bottom;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp53_ = img_h;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp52_ > _tmp53_) {
-#line 2445 "image.c"
+#line 2804 "image.c"
 		gint _tmp54_;
 		gint _tmp55_;
 		gdouble _tmp56_;
 		gdouble _tmp57_;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp54_ = img_h;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp55_ = bottom;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp56_ = angle;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp57_ = cos (_tmp56_);
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
 		bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_);
-#line 2460 "image.c"
+#line 2819 "image.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp58_ = top_left;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp59_ = _tmp58_.x;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp60_ = bottom_left;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp61_ = _tmp60_.x;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp62_ = MIN (_tmp59_, _tmp61_);
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
 	left = _tmp62_;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 524 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp63_ = left;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 524 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp63_ < 0) {
-#line 2478 "image.c"
+#line 2837 "image.c"
 		gint _tmp64_;
 		gdouble _tmp65_;
 		gdouble _tmp66_;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp64_ = left;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp65_ = angle;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp66_ = cos (_tmp65_);
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
 		left_offset = (gint) ((0 - _tmp64_) * _tmp66_);
-#line 2490 "image.c"
+#line 2849 "image.c"
 	}
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp67_ = top_right;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp68_ = _tmp67_.x;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp69_ = bottom_right;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp70_ = _tmp69_.x;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp71_ = MAX (_tmp68_, _tmp70_);
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
 	right = _tmp71_;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp72_ = right;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp73_ = img_w;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp72_ > _tmp73_) {
-#line 2510 "image.c"
+#line 2869 "image.c"
 		gint _tmp74_;
 		gint _tmp75_;
 		gdouble _tmp76_;
 		gdouble _tmp77_;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp74_ = img_w;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp75_ = right;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp76_ = angle;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp77_ = cos (_tmp76_);
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
 		right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_);
-#line 2525 "image.c"
+#line 2884 "image.c"
 	}
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp79_ = preserve_geom;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp79_) {
-#line 2531 "image.c"
+#line 2890 "image.c"
 		gint _tmp80_;
 		gint _tmp81_;
 		gint _tmp82_;
 		gint _tmp83_;
 		Box _tmp84_ = {0};
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp80_ = left_offset;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp81_ = right_offset;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp82_ = top_offset;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp83_ = bottom_offset;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_);
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp78_ = _tmp84_;
-#line 2549 "image.c"
+#line 2908 "image.c"
 	} else {
 		Box _tmp85_;
 		gint _tmp86_;
@@ -2559,39 +2918,39 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		Box _tmp94_;
 		gint _tmp95_;
 		gint _tmp96_;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp85_ = *src;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp86_ = _tmp85_.left;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp87_ = left_offset;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp88_ = *src;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp89_ = _tmp88_.top;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp90_ = top_offset;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp91_ = *src;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp92_ = _tmp91_.right;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp93_ = right_offset;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp94_ = *src;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp95_ = _tmp94_.bottom;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp96_ = bottom_offset;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
 		box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_);
-#line 2589 "image.c"
+#line 2948 "image.c"
 	}
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _tmp78_;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2595 "image.c"
+#line 2954 "image.c"
 }
 
 
diff --git a/src/util/image.vala b/src/util/image.vala
index 4adafae..f8646e2 100644
--- a/src/util/image.vala
+++ b/src/util/image.vala
@@ -446,6 +446,59 @@ Gdk.Point derotate_point_arb(Gdk.Point source_point, int img_w, int img_h, doubl
     return rotate_point_arb(source_point, img_w, img_h, angle, true);
 }
 
+private static Cairo.Surface background_surface = null;
+
+private Cairo.Surface get_background_surface() {
+    if (background_surface == null) {
+        string color_a;
+        string color_b;
+        var config = Config.Facade.get_instance();
+
+        var type = config.get_transparent_background_type();
+        switch (type) {
+            case "checkered":
+                color_a = "#808080";
+                color_b = "#ccc";
+                break;
+            case "solid":
+                color_a = color_b = config.get_transparent_background_color();
+                break;
+            default:
+                color_a = color_b = "#000";
+                break;
+        }
+
+        background_surface = new Cairo.ImageSurface(Cairo.Format.RGB24, 16, 16);
+        var ctx = new Cairo.Context(background_surface);
+        ctx.set_operator(Cairo.Operator.SOURCE);
+        set_source_color_from_string(ctx, color_a);
+        ctx.rectangle(0,0,8,8);
+        ctx.rectangle(8,8,8,8);
+        ctx.fill();
+        set_source_color_from_string(ctx, color_b);
+        ctx.rectangle(0,8,8,8);
+        ctx.rectangle(8,0,8,8);
+        ctx.fill();
+    }
+
+    return background_surface;
+}
+
+public void invalidate_transparent_background() {
+    background_surface = null;
+}
+
+public void paint_pixmap_with_background (Cairo.Context ctx, Gdk.Pixbuf pixbuf, int x, int y) {
+    if (pixbuf.get_has_alpha()) {
+        ctx.set_source_surface(get_background_surface(), 0, 0);
+        ctx.get_source().set_extend(Cairo.Extend.REPEAT);
+        ctx.rectangle(x, y, pixbuf.width, pixbuf.height);
+        ctx.fill();
+    }
+
+    Gdk.cairo_set_source_pixbuf(ctx, pixbuf, x, y);
+    ctx.paint();
+}
 
 // Force an axially-aligned box to be inside a rotated rectangle.
 Box clamp_inside_rotated_image(Box src, int img_w, int img_h, double angle_deg,
diff --git a/src/util/misc.c b/src/util/misc.c
index 98b6719..beac274 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -10,9 +10,9 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <time.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gio/gio.h>
 #include <gee.h>
 #include <gdk/gdk.h>
 #include <float.h>
@@ -193,7 +193,6 @@ gulong timeval_to_ms (GTimeVal* time_val);
 gulong now_ms (void);
 gulong now_sec (void);
 time_t now_time_t (void);
-gchar* md5_binary (guint8* buffer, gsize length);
 gchar* md5_file (GFile* file, GError** error);
 gboolean equal_sets (GeeSet* a, GeeSet* b);
 GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded);
@@ -282,32 +281,32 @@ guint int64_hash (gint64* n) {
 	u8 = (guint8*) _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/util/misc.vala"
 	hash = (guint) 0;
-#line 286 "misc.c"
+#line 285 "misc.c"
 	{
 		gint ctr = 0;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 		ctr = 0;
-#line 291 "misc.c"
+#line 290 "misc.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp1_ = TRUE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			while (TRUE) {
-#line 298 "misc.c"
+#line 297 "misc.c"
 				gint _tmp3_;
 				guint _tmp4_;
 				guint _tmp5_;
 				guint8* _tmp6_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (!_tmp1_) {
-#line 305 "misc.c"
+#line 304 "misc.c"
 					gint _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp2_ = ctr;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					ctr = _tmp2_ + 1;
-#line 311 "misc.c"
+#line 310 "misc.c"
 				}
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp1_ = FALSE;
@@ -317,7 +316,7 @@ guint int64_hash (gint64* n) {
 				if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) {
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					break;
-#line 321 "misc.c"
+#line 320 "misc.c"
 				}
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp4_ = hash;
@@ -329,7 +328,7 @@ guint int64_hash (gint64* n) {
 				u8 = _tmp6_ + 1;
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_);
-#line 333 "misc.c"
+#line 332 "misc.c"
 			}
 		}
 	}
@@ -337,7 +336,7 @@ guint int64_hash (gint64* n) {
 	result = hash;
 #line 15 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 341 "misc.c"
+#line 340 "misc.c"
 }
 
 
@@ -359,7 +358,7 @@ gboolean int64_equal (gint64* a, gint64* b) {
 	result = (*bia) == (*bib);
 #line 22 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 363 "misc.c"
+#line 362 "misc.c"
 }
 
 
@@ -383,7 +382,7 @@ gint int64_compare (gint64* a, gint64* b) {
 		result = -1;
 #line 28 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 387 "misc.c"
+#line 386 "misc.c"
 	} else {
 		gint64 _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -394,13 +393,13 @@ gint int64_compare (gint64* a, gint64* b) {
 			result = 1;
 #line 30 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 398 "misc.c"
+#line 397 "misc.c"
 		} else {
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 404 "misc.c"
+#line 403 "misc.c"
 		}
 	}
 }
@@ -432,7 +431,7 @@ gint uint64_compare (guint64* a, guint64* b) {
 		result = -1;
 #line 40 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 436 "misc.c"
+#line 435 "misc.c"
 	} else {
 		guint64 _tmp4_;
 		guint64 _tmp5_;
@@ -446,13 +445,13 @@ gint uint64_compare (guint64* a, guint64* b) {
 			result = 1;
 #line 42 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 450 "misc.c"
+#line 449 "misc.c"
 		} else {
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 456 "misc.c"
+#line 455 "misc.c"
 		}
 	}
 }
@@ -474,7 +473,7 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_);
 #line 50 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 478 "misc.c"
+#line 477 "misc.c"
 }
 
 
@@ -494,7 +493,7 @@ gboolean int_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_);
 #line 54 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 498 "misc.c"
+#line 497 "misc.c"
 }
 
 
@@ -518,7 +517,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
 	result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000);
 #line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 522 "misc.c"
+#line 521 "misc.c"
 }
 
 
@@ -534,7 +533,7 @@ gulong now_ms (void) {
 	result = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 538 "misc.c"
+#line 537 "misc.c"
 }
 
 
@@ -553,7 +552,7 @@ gulong now_sec (void) {
 	result = (gulong) _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 557 "misc.c"
+#line 556 "misc.c"
 }
 
 
@@ -566,44 +565,7 @@ inline time_t now_time_t (void) {
 	result = (time_t) _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 570 "misc.c"
-}
-
-
-gchar* md5_binary (guint8* buffer, gsize length) {
-	gchar* result = NULL;
-	gsize _tmp0_;
-	GChecksum* md5 = NULL;
-	GChecksum* _tmp1_;
-	guint8* _tmp2_;
-	gsize _tmp3_;
-	const gchar* _tmp4_;
-	gchar* _tmp5_;
-#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp0_ = length;
-#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_vala_assert (_tmp0_ != ((gsize) 0), "length != 0");
-#line 78 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp1_ = g_checksum_new (G_CHECKSUM_MD5);
-#line 78 "/home/jens/Source/shotwell/src/util/misc.vala"
-	md5 = _tmp1_;
-#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp2_ = buffer;
-#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp3_ = length;
-#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
-	g_checksum_update (md5, (guchar*) _tmp2_, _tmp3_);
-#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp4_ = g_checksum_get_string (md5);
-#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
-	result = _tmp5_;
-#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_g_checksum_free0 (md5);
-#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
-	return result;
-#line 607 "misc.c"
+#line 569 "misc.c"
 }
 
 
@@ -622,45 +584,45 @@ gchar* md5_file (GFile* file, GError** error) {
 	const gchar* _tmp19_;
 	gchar* _tmp20_;
 	GError * _inner_error_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 75 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = g_checksum_new (G_CHECKSUM_MD5);
-#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 76 "/home/jens/Source/shotwell/src/util/misc.vala"
 	md5 = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 77 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = g_new0 (guint8, 64 * 1024);
-#line 86 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 77 "/home/jens/Source/shotwell/src/util/misc.vala"
 	buffer = _tmp1_;
-#line 86 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 77 "/home/jens/Source/shotwell/src/util/misc.vala"
 	buffer_length1 = 64 * 1024;
-#line 86 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 77 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_buffer_size_ = buffer_length1;
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = file;
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = g_file_read (_tmp2_, NULL, &_inner_error_);
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 	fins = _tmp3_;
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_propagate_error (error, _inner_error_);
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 		buffer = (g_free (buffer), NULL);
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_checksum_free0 (md5);
-#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 79 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 656 "misc.c"
+#line 618 "misc.c"
 	}
 	{
 		gboolean _tmp4_ = FALSE;
-#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 80 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = TRUE;
-#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 80 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 664 "misc.c"
+#line 626 "misc.c"
 			gsize bytes_read = 0UL;
 			GFileInputStream* _tmp5_;
 			guint8* _tmp6_;
@@ -671,66 +633,66 @@ gchar* md5_file (GFile* file, GError** error) {
 			guint8* _tmp10_;
 			gint _tmp10__length1;
 			gsize _tmp11_;
-#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 80 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp4_) {
-#line 677 "misc.c"
+#line 639 "misc.c"
 			}
-#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 80 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp5_ = fins;
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = buffer;
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6__length1 = buffer_length1;
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_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"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			bytes_read = (gsize) _tmp7_;
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 				g_propagate_error (error, _inner_error_);
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_object_unref0 (fins);
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 				buffer = (g_free (buffer), NULL);
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_checksum_free0 (md5);
-#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return NULL;
-#line 703 "misc.c"
+#line 665 "misc.c"
 			}
-#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 82 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = bytes_read;
-#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 82 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp8_ <= ((gsize) 0)) {
-#line 92 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 83 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 711 "misc.c"
+#line 673 "misc.c"
 			}
-#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = md5;
-#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = buffer;
-#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10__length1 = buffer_length1;
-#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = bytes_read;
-#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 85 "/home/jens/Source/shotwell/src/util/misc.vala"
 			g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_);
-#line 723 "misc.c"
+#line 685 "misc.c"
 		}
 	}
 	{
 		GFileInputStream* _tmp12_;
-#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
-#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 		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"
+#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 734 "misc.c"
+#line 696 "misc.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -743,60 +705,60 @@ gchar* md5_file (GFile* file, GError** error) {
 		gchar* _tmp15_;
 		GError* _tmp16_;
 		const gchar* _tmp17_;
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		err = _inner_error_;
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_inner_error_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp13_ = file;
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = _tmp14_;
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp16_ = err;
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = _tmp16_->message;
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
-		g_warning ("misc.vala:100: Unable to close MD5 input stream for %s: %s", _tmp15_, _tmp17_);
-#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
+		g_warning ("misc.vala:91: Unable to close MD5 input stream for %s: %s", _tmp15_, _tmp17_);
+#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_free0 (_tmp15_);
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_error_free0 (err);
-#line 767 "misc.c"
+#line 729 "misc.c"
 	}
 	__finally5:
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_propagate_error (error, _inner_error_);
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (fins);
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		buffer = (g_free (buffer), NULL);
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_checksum_free0 (md5);
-#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 782 "misc.c"
+#line 744 "misc.c"
 	}
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp18_ = md5;
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = g_checksum_get_string (_tmp18_);
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp20_ = g_strdup (_tmp19_);
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp20_;
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_object_unref0 (fins);
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	buffer = (g_free (buffer), NULL);
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_checksum_free0 (md5);
-#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 800 "misc.c"
+#line 762 "misc.c"
 }
 
 
@@ -818,208 +780,208 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	GeeSet* _tmp27_;
 	gint _tmp28_;
 	gint _tmp29_;
-#line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE);
-#line 107 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((b == NULL) || GEE_IS_SET (b), FALSE);
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = a;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ != NULL) {
-#line 830 "misc.c"
+#line 792 "misc.c"
 		GeeSet* _tmp3_;
 		gint _tmp4_;
 		gint _tmp5_;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = a;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = _tmp4_;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp5_ == 0;
-#line 842 "misc.c"
+#line 804 "misc.c"
 	} else {
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = FALSE;
-#line 846 "misc.c"
+#line 808 "misc.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
-#line 850 "misc.c"
+#line 812 "misc.c"
 		GeeSet* _tmp6_;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = b;
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp6_ == NULL;
-#line 856 "misc.c"
+#line 818 "misc.c"
 	} else {
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 860 "misc.c"
+#line 822 "misc.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 99 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
-#line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = TRUE;
-#line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 100 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 868 "misc.c"
+#line 830 "misc.c"
 	}
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = a;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp8_ == NULL) {
-#line 874 "misc.c"
+#line 836 "misc.c"
 		gboolean _tmp9_ = FALSE;
 		GeeSet* _tmp10_;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = b;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp10_ != NULL) {
-#line 881 "misc.c"
+#line 843 "misc.c"
 			GeeSet* _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = b;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp13_ = _tmp12_;
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = _tmp13_ == 0;
-#line 893 "misc.c"
+#line 855 "misc.c"
 		} else {
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = FALSE;
-#line 897 "misc.c"
+#line 859 "misc.c"
 		}
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = _tmp9_;
-#line 901 "misc.c"
+#line 863 "misc.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = FALSE;
-#line 905 "misc.c"
+#line 867 "misc.c"
 	}
-#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 102 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_) {
-#line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = TRUE;
-#line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 913 "misc.c"
+#line 875 "misc.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = a;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp16_ == NULL) {
-#line 919 "misc.c"
+#line 881 "misc.c"
 		GeeSet* _tmp17_;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = b;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = _tmp17_ != NULL;
-#line 925 "misc.c"
+#line 887 "misc.c"
 	} else {
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = FALSE;
-#line 929 "misc.c"
+#line 891 "misc.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp15_) {
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = TRUE;
-#line 935 "misc.c"
+#line 897 "misc.c"
 	} else {
 		gboolean _tmp18_ = FALSE;
 		GeeSet* _tmp19_;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp19_ = a;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp19_ != NULL) {
-#line 943 "misc.c"
+#line 905 "misc.c"
 			GeeSet* _tmp20_;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = b;
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = _tmp20_ == NULL;
-#line 949 "misc.c"
+#line 911 "misc.c"
 		} else {
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = FALSE;
-#line 953 "misc.c"
+#line 915 "misc.c"
 		}
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = _tmp18_;
-#line 957 "misc.c"
+#line 919 "misc.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 105 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp14_) {
-#line 115 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 106 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 106 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 965 "misc.c"
+#line 927 "misc.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22_ = a;
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp22_ == NULL) {
-#line 971 "misc.c"
+#line 933 "misc.c"
 		GeeSet* _tmp23_;
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp23_ = b;
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = _tmp23_ == NULL;
-#line 977 "misc.c"
+#line 939 "misc.c"
 	} else {
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = FALSE;
-#line 981 "misc.c"
+#line 943 "misc.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp21_) {
-#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = TRUE;
-#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 989 "misc.c"
+#line 951 "misc.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp24_ = a;
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp26_ = _tmp25_;
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp27_ = b;
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp29_ = _tmp28_;
-#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp26_ != _tmp29_) {
-#line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = FALSE;
-#line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1009 "misc.c"
+#line 971 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
 		GeeSet* _tmp30_;
 		GeeIterator* _tmp31_;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp30_ = a;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp31_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_element_it = _tmp31_;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1023 "misc.c"
+#line 985 "misc.c"
 			GeeIterator* _tmp32_;
 			gboolean _tmp33_;
 			gchar* element = NULL;
@@ -1028,60 +990,60 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 			GeeSet* _tmp36_;
 			const gchar* _tmp37_;
 			gboolean _tmp38_;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp32_ = _element_it;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp33_ = gee_iterator_next (_tmp32_);
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp33_) {
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1040 "misc.c"
+#line 1002 "misc.c"
 			}
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp34_ = _element_it;
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp35_ = gee_iterator_get (_tmp34_);
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			element = (gchar*) _tmp35_;
-#line 126 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp36_ = b;
-#line 126 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp37_ = element;
-#line 126 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp38_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
-#line 126 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp38_) {
-#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 				result = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_free0 (element);
-#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_object_unref0 (_element_it);
-#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return result;
-#line 1064 "misc.c"
+#line 1026 "misc.c"
 			}
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1068 "misc.c"
+#line 1030 "misc.c"
 		}
-#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 116 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1072 "misc.c"
+#line 1034 "misc.c"
 	}
-#line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = TRUE;
-#line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1078 "misc.c"
+#line 1040 "misc.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1085 "misc.c"
+#line 1047 "misc.c"
 }
 
 
@@ -1098,112 +1060,112 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	gint _tmp43_;
 	gint _tmp44_;
 	GeeSet* _tmp46_;
-#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL);
-#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((b == NULL) || GEE_IS_SET (b), NULL);
-#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail ((excluded == NULL) || GEE_IS_SET (excluded), NULL);
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = a;
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != NULL) {
-#line 1112 "misc.c"
+#line 1074 "misc.c"
 		GeeSet* _tmp2_;
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = b;
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1118 "misc.c"
+#line 1080 "misc.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 1122 "misc.c"
+#line 1084 "misc.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
-#line 1126 "misc.c"
+#line 1088 "misc.c"
 		GeeSet* _tmp3_;
-#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 128 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = excluded;
-#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 128 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp3_ != NULL) {
-#line 1132 "misc.c"
+#line 1094 "misc.c"
 			GeeSet* _tmp4_;
 			GeeSet* _tmp5_;
-#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 129 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = excluded;
-#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 129 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp5_ = a;
-#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 129 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1141 "misc.c"
+#line 1103 "misc.c"
 		}
-#line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 131 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
-#line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 131 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1147 "misc.c"
+#line 1109 "misc.c"
 	}
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = a;
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ == NULL) {
-#line 1153 "misc.c"
+#line 1115 "misc.c"
 		GeeSet* _tmp8_;
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = b;
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 1159 "misc.c"
+#line 1121 "misc.c"
 	} else {
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = FALSE;
-#line 1163 "misc.c"
+#line 1125 "misc.c"
 	}
-#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 134 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp6_) {
-#line 1167 "misc.c"
+#line 1129 "misc.c"
 		GeeSet* _tmp9_;
-#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 135 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = excluded;
-#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 135 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp9_ != NULL) {
-#line 1173 "misc.c"
+#line 1135 "misc.c"
 			GeeSet* _tmp10_;
 			GeeSet* _tmp11_;
-#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = excluded;
-#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = b;
-#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1182 "misc.c"
+#line 1144 "misc.c"
 		}
-#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
-#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1188 "misc.c"
+#line 1150 "misc.c"
 	}
-#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 141 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 141 "/home/jens/Source/shotwell/src/util/misc.vala"
 	intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
-#line 1194 "misc.c"
+#line 1156 "misc.c"
 	{
 		GeeIterator* _element_it = NULL;
 		GeeSet* _tmp13_;
 		GeeIterator* _tmp14_;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp13_ = a;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_element_it = _tmp14_;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1207 "misc.c"
+#line 1169 "misc.c"
 			GeeIterator* _tmp15_;
 			gboolean _tmp16_;
 			gchar* element = NULL;
@@ -1212,79 +1174,79 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			GeeSet* _tmp19_;
 			const gchar* _tmp20_;
 			gboolean _tmp21_;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = _element_it;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp16_) {
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1224 "misc.c"
+#line 1186 "misc.c"
 			}
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp17_ = _element_it;
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			element = (gchar*) _tmp18_;
-#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp19_ = b;
-#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = element;
-#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
-#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp21_) {
-#line 1240 "misc.c"
+#line 1202 "misc.c"
 				GeeSet* _tmp22_;
 				const gchar* _tmp23_;
-#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp22_ = intersection;
-#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp23_ = element;
-#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1249 "misc.c"
+#line 1211 "misc.c"
 			} else {
 				GeeSet* _tmp24_;
-#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 146 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp24_ = excluded;
-#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 146 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp24_ != NULL) {
-#line 1256 "misc.c"
+#line 1218 "misc.c"
 					GeeSet* _tmp25_;
 					const gchar* _tmp26_;
-#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp25_ = excluded;
-#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp26_ = element;
-#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
-#line 1265 "misc.c"
+#line 1227 "misc.c"
 				}
 			}
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1270 "misc.c"
+#line 1232 "misc.c"
 		}
-#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1274 "misc.c"
+#line 1236 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
 		GeeSet* _tmp27_;
 		GeeIterator* _tmp28_;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp27_ = b;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_element_it = _tmp28_;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1288 "misc.c"
+#line 1250 "misc.c"
 			GeeIterator* _tmp29_;
 			gboolean _tmp30_;
 			gchar* element = NULL;
@@ -1293,95 +1255,95 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			GeeSet* _tmp33_;
 			const gchar* _tmp34_;
 			gboolean _tmp35_;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp29_ = _element_it;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp30_ = gee_iterator_next (_tmp29_);
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp30_) {
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1305 "misc.c"
+#line 1267 "misc.c"
 			}
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp31_ = _element_it;
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp32_ = gee_iterator_get (_tmp31_);
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			element = (gchar*) _tmp32_;
-#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 151 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp33_ = a;
-#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 151 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp34_ = element;
-#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 151 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
-#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 151 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp35_) {
-#line 1321 "misc.c"
+#line 1283 "misc.c"
 				GeeSet* _tmp36_;
 				const gchar* _tmp37_;
-#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp36_ = intersection;
-#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp37_ = element;
-#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
-#line 1330 "misc.c"
+#line 1292 "misc.c"
 			} else {
 				GeeSet* _tmp38_;
-#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp38_ = excluded;
-#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp38_ != NULL) {
-#line 1337 "misc.c"
+#line 1299 "misc.c"
 					GeeSet* _tmp39_;
 					const gchar* _tmp40_;
-#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp39_ = excluded;
-#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp40_ = element;
-#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_);
-#line 1346 "misc.c"
+#line 1308 "misc.c"
 				}
 			}
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1351 "misc.c"
+#line 1313 "misc.c"
 		}
-#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1355 "misc.c"
+#line 1317 "misc.c"
 	}
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp42_ = intersection;
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp44_ = _tmp43_;
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp44_ > 0) {
-#line 1365 "misc.c"
+#line 1327 "misc.c"
 		GeeSet* _tmp45_;
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp45_ = intersection;
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = _tmp45_;
-#line 1371 "misc.c"
+#line 1333 "misc.c"
 	} else {
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = NULL;
-#line 1375 "misc.c"
+#line 1337 "misc.c"
 	}
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp46_ = _g_object_ref0 (_tmp41_);
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp46_;
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_object_unref0 (intersection);
-#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 157 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1385 "misc.c"
+#line 1347 "misc.c"
 }
 
 
@@ -1407,38 +1369,38 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	gint _tmp20__length1;
 	guchar* _tmp21_;
 	gint _tmp21__length1;
-#line 169 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL);
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = photos;
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = _tmp1_;
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = g_new0 (gint64, _tmp2_);
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids = _tmp3_;
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids_length1 = _tmp2_;
-#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_ids_size_ = ids_length1;
-#line 171 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1429 "misc.c"
+#line 1391 "misc.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = photos;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_photo_it = _tmp5_;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1442 "misc.c"
+#line 1404 "misc.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			Photo* photo = NULL;
@@ -1451,87 +1413,87 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 			PhotoID _tmp13_ = {0};
 			gint64 _tmp14_;
 			gint64 _tmp15_;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _photo_it;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp7_) {
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1463 "misc.c"
+#line 1425 "misc.c"
 			}
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _photo_it;
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			photo = (Photo*) _tmp9_;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = ids;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10__length1 = ids_length1;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = ctr;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			ctr = _tmp11_ + 1;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp12_ = photo;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			photo_get_photo_id (_tmp12_, &_tmp13_);
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp14_ = _tmp13_.id;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_[_tmp11_] = _tmp14_;
-#line 173 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 164 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = _tmp10_[_tmp11_];
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (photo);
-#line 1491 "misc.c"
+#line 1453 "misc.c"
 		}
-#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_photo_it);
-#line 1495 "misc.c"
+#line 1457 "misc.c"
 	}
-#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = photos;
-#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp17_ = gee_collection_get_size (_tmp16_);
-#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp18_ = _tmp17_;
-#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	bytes = (gsize) (_tmp18_ * sizeof (gint64));
-#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 167 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = g_new0 (guchar, bytes);
-#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 167 "/home/jens/Source/shotwell/src/util/misc.vala"
 	serialized = _tmp19_;
-#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 167 "/home/jens/Source/shotwell/src/util/misc.vala"
 	serialized_length1 = bytes;
-#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 167 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_serialized_size_ = serialized_length1;
-#line 177 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 168 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp20_ = ids;
-#line 177 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 168 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp20__length1 = ids_length1;
-#line 177 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 168 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (serialized, _tmp20_, bytes);
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp21_ = serialized;
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp21__length1 = serialized_length1;
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (result_length1) {
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp21__length1;
-#line 1527 "misc.c"
+#line 1489 "misc.c"
 	}
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp21_;
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids = (g_free (ids), NULL);
-#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 170 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1535 "misc.c"
+#line 1497 "misc.c"
 }
 
 
@@ -1554,101 +1516,101 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	GeeArrayList* _tmp9_;
 	gint64* _tmp10_;
 	gint _tmp10__length1;
-#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 174 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
-#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 174 "/home/jens/Source/shotwell/src/util/misc.vala"
 	count = (gsize) (_tmp0_ / sizeof (gint64));
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = count;
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ <= ((gsize) 0)) {
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1568 "misc.c"
+#line 1530 "misc.c"
 	} else {
 		guchar* _tmp3_;
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1575 "misc.c"
+#line 1537 "misc.c"
 	}
-#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
-#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
-#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 176 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1583 "misc.c"
+#line 1545 "misc.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 178 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
-#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 178 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = g_new0 (gint64, _tmp4_);
-#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 178 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids = _tmp5_;
-#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 178 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids_length1 = _tmp4_;
-#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 178 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_ids_size_ = ids_length1;
-#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp6_ = ids;
-#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp6__length1 = ids_length1;
-#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = serialized;
-#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = size;
-#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
-#line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 181 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
-#line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 181 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10_ = ids;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = ids_length1;
-#line 1613 "misc.c"
+#line 1575 "misc.c"
 	{
 		gint64* id_collection = NULL;
 		gint id_collection_length1 = 0;
 		gint _id_collection_size_ = 0;
 		gint id_it = 0;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 		id_collection = _tmp10_;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 		id_collection_length1 = _tmp10__length1;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 1625 "misc.c"
+#line 1587 "misc.c"
 			gint64 id = 0LL;
-#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 182 "/home/jens/Source/shotwell/src/util/misc.vala"
 			id = id_collection[id_it];
-#line 1629 "misc.c"
+#line 1591 "misc.c"
 			{
 				GeeArrayList* _tmp11_;
 				gint64 _tmp12_;
 				PhotoID _tmp13_ = {0};
-#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = list;
-#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp12_ = id;
-#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 				photo_id_init (&_tmp13_, _tmp12_);
-#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 183 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_);
-#line 1642 "misc.c"
+#line 1604 "misc.c"
 			}
 		}
 	}
-#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
-#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ids = (g_free (ids), NULL);
-#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1652 "misc.c"
+#line 1614 "misc.c"
 }
 
 
@@ -1674,38 +1636,38 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	gint _tmp21__length1;
 	guchar* _tmp22_;
 	gint _tmp22__length1;
-#line 197 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL);
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = media;
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = _tmp1_;
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = g_new0 (GdkAtom, _tmp2_);
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms = _tmp3_;
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms_length1 = _tmp2_;
-#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 189 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_atoms_size_ = atoms_length1;
-#line 199 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1696 "misc.c"
+#line 1658 "misc.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = media;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_current_media_it = _tmp5_;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1709 "misc.c"
+#line 1671 "misc.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSource* current_media = NULL;
@@ -1719,91 +1681,91 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 			gchar* _tmp14_;
 			GdkAtom _tmp15_;
 			GdkAtom _tmp16_;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6_ = _current_media_it;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp7_) {
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1731 "misc.c"
+#line 1693 "misc.c"
 			}
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _current_media_it;
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			current_media = (MediaSource*) _tmp9_;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = atoms;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10__length1 = atoms_length1;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = ctr;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			ctr = _tmp11_ + 1;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp12_ = current_media;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp13_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource));
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp14_ = _tmp13_;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = gdk_atom_intern (_tmp14_, FALSE);
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_[_tmp11_] = _tmp15_;
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp16_ = _tmp10_[_tmp11_];
-#line 201 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (_tmp14_);
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (current_media);
-#line 1763 "misc.c"
+#line 1725 "misc.c"
 		}
-#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_current_media_it);
-#line 1767 "misc.c"
+#line 1729 "misc.c"
 	}
-#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp17_ = media;
-#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp18_ = gee_collection_get_size (_tmp17_);
-#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = _tmp18_;
-#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	bytes = (gsize) (_tmp19_ * sizeof (GdkAtom));
-#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp20_ = g_new0 (guchar, bytes);
-#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/misc.vala"
 	serialized = _tmp20_;
-#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/misc.vala"
 	serialized_length1 = bytes;
-#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 195 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_serialized_size_ = serialized_length1;
-#line 205 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 196 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp21_ = atoms;
-#line 205 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 196 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp21__length1 = atoms_length1;
-#line 205 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 196 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (serialized, _tmp21_, bytes);
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22_ = serialized;
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22__length1 = serialized_length1;
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (result_length1) {
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp22__length1;
-#line 1799 "misc.c"
+#line 1761 "misc.c"
 	}
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp22_;
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms = (g_free (atoms), NULL);
-#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 198 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1807 "misc.c"
+#line 1769 "misc.c"
 }
 
 
@@ -1826,78 +1788,78 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	GeeArrayList* _tmp9_;
 	GdkAtom* _tmp10_;
 	gint _tmp10__length1;
-#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 202 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = size;
-#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 202 "/home/jens/Source/shotwell/src/util/misc.vala"
 	count = (gsize) (_tmp0_ / sizeof (GdkAtom));
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = count;
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ <= ((gsize) 0)) {
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1840 "misc.c"
+#line 1802 "misc.c"
 	} else {
 		guchar* _tmp3_;
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1847 "misc.c"
+#line 1809 "misc.c"
 	}
-#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
-#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
-#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 204 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1855 "misc.c"
+#line 1817 "misc.c"
 	}
-#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
-#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = g_new0 (GdkAtom, _tmp4_);
-#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms = _tmp5_;
-#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms_length1 = _tmp4_;
-#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 206 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_atoms_size_ = atoms_length1;
-#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp6_ = atoms;
-#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp6__length1 = atoms_length1;
-#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = serialized;
-#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = size;
-#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
-#line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 209 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 209 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10_ = atoms;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = atoms_length1;
-#line 1885 "misc.c"
+#line 1847 "misc.c"
 	{
 		GdkAtom* current_atom_collection = NULL;
 		gint current_atom_collection_length1 = 0;
 		gint _current_atom_collection_size_ = 0;
 		gint current_atom_it = 0;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 		current_atom_collection = _tmp10_;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 		current_atom_collection_length1 = _tmp10__length1;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) {
-#line 1897 "misc.c"
+#line 1859 "misc.c"
 			GdkAtom current_atom = 0U;
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 			current_atom = current_atom_collection[current_atom_it];
-#line 1901 "misc.c"
+#line 1863 "misc.c"
 			{
 				MediaSource* media = NULL;
 				MediaCollectionRegistry* _tmp11_;
@@ -1910,49 +1872,49 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 				MediaSource* _tmp18_;
 				GeeArrayList* _tmp19_;
 				MediaSource* _tmp20_;
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp11_ = media_collection_registry_get_instance ();
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp12_ = _tmp11_;
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp13_ = current_atom;
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp14_ = gdk_atom_name (_tmp13_);
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp15_ = _tmp14_;
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp16_ = media_collection_registry_fetch_media (_tmp12_, _tmp15_);
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp17_ = _tmp16_;
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_free0 (_tmp15_);
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_media_collection_registry_unref0 (_tmp12_);
-#line 220 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 211 "/home/jens/Source/shotwell/src/util/misc.vala"
 				media = _tmp17_;
-#line 221 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp18_ = media;
-#line 221 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_vala_assert (_tmp18_ != NULL, "media != null");
-#line 222 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp19_ = list;
-#line 222 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp20_ = media;
-#line 222 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
-#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 210 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_object_unref0 (media);
-#line 1946 "misc.c"
+#line 1908 "misc.c"
 			}
 		}
 	}
-#line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
-#line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
 	atoms = (g_free (atoms), NULL);
-#line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1956 "misc.c"
+#line 1918 "misc.c"
 }
 
 
@@ -1998,7 +1960,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2002 "misc.c"
+#line 1964 "misc.c"
 }
 
 
@@ -2020,144 +1982,144 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	gchar* _tmp26_;
 	gchar* _tmp27_;
 	gchar* _tmp28_;
-#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (from_date != NULL, NULL);
-#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (to_date != NULL, NULL);
-#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 224 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = *from_date;
-#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 224 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = _tmp0_.tm_year;
-#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 224 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = *to_date;
-#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 224 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = _tmp2_.tm_year;
-#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 224 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 2038 "misc.c"
+#line 2000 "misc.c"
 		gboolean _tmp4_ = FALSE;
 		struct tm _tmp5_;
 		gint _tmp6_;
 		struct tm _tmp7_;
 		gint _tmp8_;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = *from_date;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = _tmp5_.tm_mon;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = *to_date;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = _tmp7_.tm_mon;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp6_ == _tmp8_) {
-#line 2054 "misc.c"
+#line 2016 "misc.c"
 			struct tm _tmp9_;
 			gint _tmp10_;
 			struct tm _tmp11_;
 			gint _tmp12_;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = *from_date;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp10_ = _tmp9_.tm_mday;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp11_ = *to_date;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp12_ = _tmp11_.tm_mday;
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = _tmp10_ == (_tmp12_ - 1);
-#line 2069 "misc.c"
+#line 2031 "misc.c"
 		} else {
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
-#line 2073 "misc.c"
+#line 2035 "misc.c"
 		}
-#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 226 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp4_) {
-#line 2077 "misc.c"
+#line 2039 "misc.c"
 			gchar* _tmp13_;
 			gchar* _tmp14_;
-#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp13_ = resources_get_start_multiday_span_format_string ();
-#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (from_format);
-#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 228 "/home/jens/Source/shotwell/src/util/misc.vala"
 			from_format = _tmp13_;
-#line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 229 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp14_ = resources_get_end_multiday_span_format_string ();
-#line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 229 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (to_format);
-#line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 229 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp14_;
-#line 2092 "misc.c"
+#line 2054 "misc.c"
 		} else {
 			gchar* _tmp15_;
 			gchar* _tmp16_;
-#line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp15_ = resources_get_start_multimonth_span_format_string ();
-#line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (from_format);
-#line 242 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
 			from_format = _tmp15_;
-#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 234 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp16_ = resources_get_end_multimonth_span_format_string ();
-#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 234 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (to_format);
-#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 234 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp16_;
-#line 2108 "misc.c"
+#line 2070 "misc.c"
 		}
 	} else {
 		gchar* _tmp17_;
 		gchar* _tmp18_;
-#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 239 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = resources_get_long_date_format_string ();
-#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 239 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_free0 (from_format);
-#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 239 "/home/jens/Source/shotwell/src/util/misc.vala"
 		from_format = _tmp17_;
-#line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 240 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp18_ = resources_get_long_date_format_string ();
-#line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 240 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_free0 (to_format);
-#line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 240 "/home/jens/Source/shotwell/src/util/misc.vala"
 		to_format = _tmp18_;
-#line 2125 "misc.c"
+#line 2087 "misc.c"
 	}
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = from_format;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp20_ = g_time_format (from_date, _tmp19_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp21_ = _tmp20_;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22_ = to_format;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp23_ = g_time_format (to_date, _tmp22_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp24_ = _tmp23_;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp25_ = g_strdup_printf ("%s - %s", _tmp21_, _tmp24_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp26_ = _tmp25_;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp27_ = string_strip_leading_zeroes (_tmp26_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp28_ = _tmp27_;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (_tmp26_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (_tmp24_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (_tmp21_);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp28_;
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (to_format);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (from_format);
-#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2161 "misc.c"
+#line 2123 "misc.c"
 }
 
 
@@ -2169,29 +2131,29 @@ gchar* format_local_date (struct tm* date) {
 	gchar* _tmp3_;
 	gchar* _tmp4_;
 	gchar* _tmp5_;
-#line 256 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 247 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (date != NULL, NULL);
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = resources_get_long_date_format_string ();
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = _tmp0_;
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = g_time_format (date, _tmp1_);
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = _tmp2_;
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = string_strip_leading_zeroes (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = _tmp4_;
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (_tmp1_);
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp5_;
-#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 248 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2195 "misc.c"
+#line 2157 "misc.c"
 }
 
 
@@ -2201,90 +2163,90 @@ OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar*
 	gchar* _tmp1_;
 	OneShotCallback _tmp2_;
 	void* _tmp2__target;
-#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = (OneShotScheduler*) g_type_create_instance (object_type);
-#line 268 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 259 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = name;
-#line 268 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 259 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 268 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 259 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 268 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 259 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->name = _tmp1_;
-#line 269 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 260 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = callback;
-#line 269 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 260 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2__target = callback_target;
-#line 269 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 260 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->callback = _tmp2_;
-#line 269 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 260 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->callback_target = _tmp2__target;
-#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2227 "misc.c"
+#line 2189 "misc.c"
 }
 
 
 OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) {
-#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target);
-#line 2234 "misc.c"
+#line 2196 "misc.c"
 }
 
 
 gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
 	gboolean result = FALSE;
 	guint _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 271 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
-#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->scheduled;
-#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp0_ != ((guint) 0);
-#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2249 "misc.c"
+#line 2211 "misc.c"
 }
 
 
 void one_shot_scheduler_at_idle (OneShotScheduler* self) {
-#line 284 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
-#line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 276 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE);
-#line 2258 "misc.c"
+#line 2220 "misc.c"
 }
 
 
 static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self) {
 	gboolean result;
 	result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self);
-#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2267 "misc.c"
+#line 2229 "misc.c"
 }
 
 
 void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) {
 	guint _tmp0_;
-#line 288 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 279 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
-#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->scheduled;
-#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
-#line 2279 "misc.c"
+#line 2241 "misc.c"
 		gint _tmp1_;
 		guint _tmp2_;
-#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = priority;
-#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
-#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->scheduled = _tmp2_;
-#line 2288 "misc.c"
+#line 2250 "misc.c"
 	}
 }
 
@@ -2292,15 +2254,15 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) {
 	guint _tmp0_;
 	gboolean _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 284 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
-#line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = msec;
-#line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = reschedule;
-#line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_);
-#line 2304 "misc.c"
+#line 2266 "misc.c"
 }
 
 
@@ -2311,74 +2273,74 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 	gint _tmp5_;
 	guint _tmp6_;
 	guint _tmp7_;
-#line 297 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = self->priv->scheduled;
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 2321 "misc.c"
+#line 2283 "misc.c"
 		gboolean _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = reschedule;
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = !_tmp2_;
-#line 2327 "misc.c"
+#line 2289 "misc.c"
 	} else {
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 2331 "misc.c"
+#line 2293 "misc.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
-#line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2337 "misc.c"
+#line 2299 "misc.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = self->priv->scheduled;
-#line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 2343 "misc.c"
+#line 2305 "misc.c"
 		guint _tmp4_;
-#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->scheduled;
-#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_source_remove (_tmp4_);
-#line 2349 "misc.c"
+#line 2311 "misc.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = priority;
-#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp6_ = msec;
-#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
-#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 295 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = _tmp7_;
-#line 2359 "misc.c"
+#line 2321 "misc.c"
 }
 
 
 void one_shot_scheduler_cancel (OneShotScheduler* self) {
 	guint _tmp0_;
 	guint _tmp1_;
-#line 307 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
-#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->scheduled;
-#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
-#line 309 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 300 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2374 "misc.c"
+#line 2336 "misc.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = self->priv->scheduled;
-#line 311 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_source_remove (_tmp1_);
-#line 312 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 303 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = (guint) 0;
-#line 2382 "misc.c"
+#line 2344 "misc.c"
 }
 
 
@@ -2386,237 +2348,237 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
 	gboolean result = FALSE;
 	OneShotCallback _tmp0_;
 	void* _tmp0__target;
-#line 315 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_ONE_SHOT_SCHEDULER (self), FALSE);
-#line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = (guint) 0;
-#line 317 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->callback;
-#line 317 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0__target = self->priv->callback_target;
-#line 317 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 308 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ (_tmp0__target);
-#line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2404 "misc.c"
+#line 2366 "misc.c"
 }
 
 
 static void value_one_shot_scheduler_init (GValue* value) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2411 "misc.c"
+#line 2373 "misc.c"
 }
 
 
 static void value_one_shot_scheduler_free_value (GValue* value) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (value->data[0].v_pointer) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (value->data[0].v_pointer);
-#line 2420 "misc.c"
+#line 2382 "misc.c"
 	}
 }
 
 
 static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (src_value->data[0].v_pointer) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer);
-#line 2430 "misc.c"
+#line 2392 "misc.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2434 "misc.c"
+#line 2396 "misc.c"
 	}
 }
 
 
 static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2442 "misc.c"
+#line 2404 "misc.c"
 }
 
 
 static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2449 "misc.c"
+#line 2411 "misc.c"
 		OneShotScheduler * object;
 		object = collect_values[0].v_pointer;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2456 "misc.c"
+#line 2418 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.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 2460 "misc.c"
+#line 2422 "misc.c"
 		}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = one_shot_scheduler_ref (object);
-#line 2464 "misc.c"
+#line 2426 "misc.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2468 "misc.c"
+#line 2430 "misc.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2472 "misc.c"
+#line 2434 "misc.c"
 }
 
 
 static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	OneShotScheduler ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2483 "misc.c"
+#line 2445 "misc.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2489 "misc.c"
+#line 2451 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2493 "misc.c"
+#line 2455 "misc.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2497 "misc.c"
+#line 2459 "misc.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2501 "misc.c"
+#line 2463 "misc.c"
 }
 
 
 GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecOneShotScheduler* spec;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_ONE_SHOT_SCHEDULER), NULL);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2515 "misc.c"
+#line 2477 "misc.c"
 }
 
 
 gpointer value_get_one_shot_scheduler (const GValue* value) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2524 "misc.c"
+#line 2486 "misc.c"
 }
 
 
 void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
 	OneShotScheduler * old;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	old = value->data[0].v_pointer;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (v_object) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_ONE_SHOT_SCHEDULER));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2544 "misc.c"
+#line 2506 "misc.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2548 "misc.c"
+#line 2510 "misc.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2554 "misc.c"
+#line 2516 "misc.c"
 	}
 }
 
 
 void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
 	OneShotScheduler * old;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	old = value->data[0].v_pointer;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (v_object) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_ONE_SHOT_SCHEDULER));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2573 "misc.c"
+#line 2535 "misc.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2577 "misc.c"
+#line 2539 "misc.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2583 "misc.c"
+#line 2545 "misc.c"
 	}
 }
 
 
 static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_parent_class = g_type_class_peek_parent (klass);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate));
-#line 2595 "misc.c"
+#line 2557 "misc.c"
 }
 
 
 static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv = ONE_SHOT_SCHEDULER_GET_PRIVATE (self);
-#line 265 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 256 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = (guint) 0;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 2606 "misc.c"
+#line 2568 "misc.c"
 }
 
 
 static void one_shot_scheduler_finalize (OneShotScheduler * obj) {
 	OneShotScheduler * self;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_signal_handlers_destroy (self);
-#line 277 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_cancel (self);
-#line 263 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 2620 "misc.c"
+#line 2582 "misc.c"
 }
 
 
@@ -2637,24 +2599,24 @@ GType one_shot_scheduler_get_type (void) {
 gpointer one_shot_scheduler_ref (gpointer instance) {
 	OneShotScheduler * self;
 	self = instance;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 2645 "misc.c"
+#line 2607 "misc.c"
 }
 
 
 void one_shot_scheduler_unref (gpointer instance) {
 	OneShotScheduler * self;
 	self = instance;
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self);
-#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2658 "misc.c"
+#line 2620 "misc.c"
 	}
 }
 
@@ -2663,40 +2625,40 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name) {
 	OpTimer* self = NULL;
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 322 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 322 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = (OpTimer*) g_type_create_instance (object_type);
-#line 332 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = name;
-#line 332 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 332 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 332 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->name = _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 322 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2681 "misc.c"
+#line 2643 "misc.c"
 }
 
 
 OpTimer* op_timer_new (const gchar* name) {
-#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 322 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return op_timer_construct (TYPE_OP_TIMER, name);
-#line 2688 "misc.c"
+#line 2650 "misc.c"
 }
 
 
 void op_timer_start (OpTimer* self) {
 	GTimer* _tmp0_;
-#line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 326 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
-#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 327 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->timer;
-#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 327 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_timer_start (_tmp0_);
-#line 2700 "misc.c"
+#line 2662 "misc.c"
 }
 
 
@@ -2711,66 +2673,66 @@ void op_timer_stop (OpTimer* self) {
 	gdouble _tmp7_;
 	gdouble _tmp8_;
 	glong _tmp10_;
-#line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 330 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (IS_OP_TIMER (self));
-#line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->timer;
-#line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = g_timer_elapsed (_tmp0_, NULL);
-#line 340 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	time = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 333 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp2_ = self->priv->elapsed;
-#line 342 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 333 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = time;
-#line 342 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 333 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->elapsed = _tmp2_ + _tmp3_;
-#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = time;
-#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = self->priv->shortest;
-#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 335 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp4_ < _tmp5_) {
-#line 2735 "misc.c"
+#line 2697 "misc.c"
 		gdouble _tmp6_;
-#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = time;
-#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->shortest = _tmp6_;
-#line 2741 "misc.c"
+#line 2703 "misc.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = time;
-#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = self->priv->longest;
-#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ > _tmp8_) {
-#line 2749 "misc.c"
+#line 2711 "misc.c"
 		gdouble _tmp9_;
-#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = time;
-#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->longest = _tmp9_;
-#line 2755 "misc.c"
+#line 2717 "misc.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 341 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10_ = self->priv->count;
-#line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 341 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->count = _tmp10_ + 1;
-#line 2761 "misc.c"
+#line 2723 "misc.c"
 }
 
 
 gchar* op_timer_to_string (OpTimer* self) {
 	gchar* result = NULL;
 	glong _tmp0_;
-#line 353 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (IS_OP_TIMER (self), NULL);
-#line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = self->priv->count;
-#line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ > ((glong) 0)) {
-#line 2774 "misc.c"
+#line 2736 "misc.c"
 		const gchar* _tmp1_;
 		glong _tmp2_;
 		gdouble _tmp3_;
@@ -2779,267 +2741,267 @@ gchar* op_timer_to_string (OpTimer* self) {
 		glong _tmp6_;
 		gdouble _tmp7_;
 		gchar* _tmp8_;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = self->priv->name;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = self->priv->count;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = self->priv->elapsed;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->shortest;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp5_ = self->priv->elapsed;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = self->priv->count;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = self->priv->longest;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = g_strdup_printf ("%s: count=%ld elapsed=%.03lfs min/avg/max=%.03lf/%.03lf/%.03lf", _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_ / ((gdouble) _tmp6_), _tmp7_);
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = _tmp8_;
-#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 346 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2803 "misc.c"
+#line 2765 "misc.c"
 	} else {
 		const gchar* _tmp9_;
 		gchar* _tmp10_;
-#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = self->priv->name;
-#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = g_strdup_printf ("%s: no operations", _tmp9_);
-#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = _tmp10_;
-#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2815 "misc.c"
+#line 2777 "misc.c"
 	}
 }
 
 
 static void value_op_timer_init (GValue* value) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2823 "misc.c"
+#line 2785 "misc.c"
 }
 
 
 static void value_op_timer_free_value (GValue* value) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (value->data[0].v_pointer) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (value->data[0].v_pointer);
-#line 2832 "misc.c"
+#line 2794 "misc.c"
 	}
 }
 
 
 static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (src_value->data[0].v_pointer) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer);
-#line 2842 "misc.c"
+#line 2804 "misc.c"
 	} else {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2846 "misc.c"
+#line 2808 "misc.c"
 	}
 }
 
 
 static gpointer value_op_timer_peek_pointer (const GValue* value) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2854 "misc.c"
+#line 2816 "misc.c"
 }
 
 
 static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2861 "misc.c"
+#line 2823 "misc.c"
 		OpTimer * object;
 		object = collect_values[0].v_pointer;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2868 "misc.c"
+#line 2830 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.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 2872 "misc.c"
+#line 2834 "misc.c"
 		}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = op_timer_ref (object);
-#line 2876 "misc.c"
+#line 2838 "misc.c"
 	} else {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2880 "misc.c"
+#line 2842 "misc.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2884 "misc.c"
+#line 2846 "misc.c"
 }
 
 
 static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	OpTimer ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!object_p) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2895 "misc.c"
+#line 2857 "misc.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2901 "misc.c"
+#line 2863 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2905 "misc.c"
+#line 2867 "misc.c"
 	} else {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = op_timer_ref (value->data[0].v_pointer);
-#line 2909 "misc.c"
+#line 2871 "misc.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2913 "misc.c"
+#line 2875 "misc.c"
 }
 
 
 GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecOpTimer* spec;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_OP_TIMER), NULL);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2927 "misc.c"
+#line 2889 "misc.c"
 }
 
 
 gpointer value_get_op_timer (const GValue* value) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2936 "misc.c"
+#line 2898 "misc.c"
 }
 
 
 void value_set_op_timer (GValue* value, gpointer v_object) {
 	OpTimer * old;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	old = value->data[0].v_pointer;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (v_object) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_OP_TIMER));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_ref (value->data[0].v_pointer);
-#line 2956 "misc.c"
+#line 2918 "misc.c"
 	} else {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2960 "misc.c"
+#line 2922 "misc.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2966 "misc.c"
+#line 2928 "misc.c"
 	}
 }
 
 
 void value_take_op_timer (GValue* value, gpointer v_object) {
 	OpTimer * old;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	old = value->data[0].v_pointer;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (v_object) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_OP_TIMER));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2985 "misc.c"
+#line 2947 "misc.c"
 	} else {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2989 "misc.c"
+#line 2951 "misc.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2995 "misc.c"
+#line 2957 "misc.c"
 	}
 }
 
 
 static void op_timer_class_init (OpTimerClass * klass) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	op_timer_parent_class = g_type_class_peek_parent (klass);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	((OpTimerClass *) klass)->finalize = op_timer_finalize;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OpTimerPrivate));
-#line 3007 "misc.c"
+#line 2969 "misc.c"
 }
 
 
 static void op_timer_instance_init (OpTimer * self) {
 	GTimer* _tmp0_;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv = OP_TIMER_GET_PRIVATE (self);
-#line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp0_ = g_timer_new ();
-#line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->timer = _tmp0_;
-#line 326 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 317 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->count = (glong) 0;
-#line 327 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 318 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->elapsed = (gdouble) 0;
-#line 328 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->shortest = DBL_MAX;
-#line 329 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->longest = DBL_MIN;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 3029 "misc.c"
+#line 2991 "misc.c"
 }
 
 
 static void op_timer_finalize (OpTimer * obj) {
 	OpTimer * self;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_signal_handlers_destroy (self);
-#line 324 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 315 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 316 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_timer_destroy0 (self->priv->timer);
-#line 3043 "misc.c"
+#line 3005 "misc.c"
 }
 
 
@@ -3060,24 +3022,24 @@ GType op_timer_get_type (void) {
 gpointer op_timer_ref (gpointer instance) {
 	OpTimer * self;
 	self = instance;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 3068 "misc.c"
+#line 3030 "misc.c"
 }
 
 
 void op_timer_unref (gpointer instance) {
 	OpTimer * self;
 	self = instance;
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		OP_TIMER_GET_CLASS (self)->finalize (self);
-#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
+#line 314 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3081 "misc.c"
+#line 3043 "misc.c"
 	}
 }
 
diff --git a/src/util/misc.vala b/src/util/misc.vala
index cbc6dfa..6111ea3 100644
--- a/src/util/misc.vala
+++ b/src/util/misc.vala
@@ -72,15 +72,6 @@ public inline time_t now_time_t() {
     return (time_t) now_sec();
 }
 
-public string md5_binary(uint8 *buffer, size_t length) {
-    assert(length != 0);
-
-    Checksum md5 = new Checksum(ChecksumType.MD5);
-    md5.update((uchar []) buffer, length);
-    
-    return md5.get_string();
-}
-
 public string md5_file(File file) throws Error {
     Checksum md5 = new Checksum(ChecksumType.MD5);
     uint8[] buffer = new uint8[64 * 1024];
diff --git a/src/util/system.c b/src/util/system.c
index d099120..3075260 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -63,36 +63,60 @@ GFile* get_sys_install_dir (GFile* exec_dir) {
 	if (_tmp6_) {
 #line 65 "system.c"
 		GFile* _tmp7_;
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
-		_tmp7_ = g_file_new_for_path (RESOURCES_PREFIX);
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
-		result = _tmp7_;
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		gboolean _tmp10_;
+		GFile* _tmp11_;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp7_ = exec_dir;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp8_ = g_file_get_basename (_tmp7_);
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp9_ = _tmp8_;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp10_ = g_strcmp0 (_tmp9_, "src") == 0;
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		_g_free0 (_tmp9_);
+#line 14 "/home/jens/Source/shotwell/src/util/system.vala"
+		if (_tmp10_) {
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			result = NULL;
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			_g_object_unref0 (child);
+#line 15 "/home/jens/Source/shotwell/src/util/system.vala"
+			return result;
+#line 89 "system.c"
+		}
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
+		_tmp11_ = g_file_new_for_path (RESOURCES_PREFIX);
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
+		result = _tmp11_;
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		_g_object_unref0 (child);
-#line 13 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 18 "/home/jens/Source/shotwell/src/util/system.vala"
 		return result;
-#line 75 "system.c"
+#line 99 "system.c"
 	}
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	result = NULL;
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_object_unref0 (child);
-#line 16 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 21 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 83 "system.c"
+#line 107 "system.c"
 }
 
 
 gchar* get_nautilus_install_location (void) {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = g_find_program_in_path ("nautilus");
-#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	result = _tmp0_;
-#line 20 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 25 "/home/jens/Source/shotwell/src/util/system.vala"
 	return result;
-#line 96 "system.c"
+#line 120 "system.c"
 }
 
 
@@ -100,23 +124,23 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error) {
 	GdkScreen* _tmp0_;
 	const gchar* _tmp1_;
 	GError * _inner_error_ = NULL;
-#line 23 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 23 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (uri != NULL);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = screen;
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp1_ = uri;
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	gtk_show_uri (_tmp0_, _tmp1_, (guint32) GDK_CURRENT_TIME, &_inner_error_);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		g_propagate_error (error, _inner_error_);
-#line 24 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 29 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 120 "system.c"
+#line 144 "system.c"
 	}
 }
 
@@ -130,37 +154,37 @@ void show_file_in_nautilus (const gchar* filename, GError** error) {
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
-#line 27 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 32 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_return_if_fail (filename != NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp1_ = _tmp0_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp2_ = g_strconcat (_tmp1_, " ", NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp3_ = _tmp2_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp4_ = filename;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_tmp6_ = _tmp5_;
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	g_spawn_command_line_async (_tmp6_, &_inner_error_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp6_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp3_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	_g_free0 (_tmp1_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 		g_propagate_error (error, _inner_error_);
-#line 28 "/home/jens/Source/shotwell/src/util/system.vala"
+#line 33 "/home/jens/Source/shotwell/src/util/system.vala"
 		return;
-#line 164 "system.c"
+#line 188 "system.c"
 	}
 }
 
diff --git a/src/util/system.vala b/src/util/system.vala
index f2436e4..38abf1e 100644
--- a/src/util/system.vala
+++ b/src/util/system.vala
@@ -10,6 +10,11 @@ File? get_sys_install_dir(File exec_dir) {
     File child = exec_dir.get_child("ui");
 
     if (!FileUtils.test(child.get_path(), FileTest.IS_DIR | FileTest.EXISTS)) {
+        // If not, let's see if we are in "src" dir - meson out-of-tree build
+        if (exec_dir.get_basename() == "src") {
+            return null;
+        }
+
         return File.new_for_path(Resources.PREFIX);
     }
 
diff --git a/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp b/src_libgraphics_processor_la_vala.stamp
index 859afb1..859afb1 100644
--- a/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp
+++ b/src_libgraphics_processor_la_vala.stamp
diff --git a/src_shotwell_graphics_processor_vala.stamp b/src_shotwell_graphics_processor_vala.stamp
new file mode 100644
index 0000000..859afb1
--- /dev/null
+++ b/src_shotwell_graphics_processor_vala.stamp
@@ -0,0 +1 @@
+stamp
diff --git a/thumbnailer.am b/thumbnailer.am
index 04362e0..6b835be 100644
--- a/thumbnailer.am
+++ b/thumbnailer.am
@@ -4,7 +4,8 @@ thumbnailer_shotwell_video_thumbnailer_SOURCES = thumbnailer/shotwell-video-thum
 thumbnailer_shotwell_video_thumbnailer_VALAFLAGS = $(COMMON_VALAFLAGS) \
 	--pkg gstreamer-1.0 \
 	--pkg gee-0.8 \
-	--pkg gtk+-3.0
+	--pkg gtk+-3.0 \
+	--pkg posix
 
 thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS)
 thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS)
diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
new file mode 100644
index 0000000..29acb1f
--- /dev/null
+++ b/thumbnailer/meson.build
@@ -0,0 +1,5 @@
+executable('shotwell-video-thumbnailer',
+           'shotwell-video-thumbnailer.vala',
+           dependencies : [posix, gstreamer, gee, gdk_pixbuf],
+           install : true,
+           install_dir : join_paths(get_option('libexecdir'), 'shotwell'))
diff --git a/thumbnailer/shotwell-video-thumbnailer.c b/thumbnailer/shotwell-video-thumbnailer.c
index c40d6c7..7446b90 100644
--- a/thumbnailer/shotwell-video-thumbnailer.c
+++ b/thumbnailer/shotwell-video-thumbnailer.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <gst/gst.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <gobject/gvaluecollector.h>
 
@@ -32,8 +33,9 @@
 typedef struct _ShotwellThumbnailer ShotwellThumbnailer;
 typedef struct _ShotwellThumbnailerClass ShotwellThumbnailerClass;
 typedef struct _ShotwellThumbnailerPrivate ShotwellThumbnailerPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _ParamSpecShotwellThumbnailer ParamSpecShotwellThumbnailer;
 
@@ -67,15 +69,73 @@ enum  {
 };
 #define SHOTWELL_THUMBNAILER_caps_string "video/x-raw,format=RGB,pixel-aspect-ratio=1/1"
 gint shotwell_thumbnailer_main (gchar** args, int args_length1);
+static gboolean __lambda4_ (GstPluginFeature* f);
+static gboolean ___lambda4__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self);
+static void _g_object_unref0_ (gpointer var);
+static void _g_list_free__g_object_unref0_ (GList* self);
 ShotwellThumbnailer* shotwell_thumbnailer_new (void);
 ShotwellThumbnailer* shotwell_thumbnailer_construct (GType object_type);
 static void shotwell_thumbnailer_finalize (ShotwellThumbnailer * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 25 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+#line 29 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 79 "shotwell-video-thumbnailer.c"
+#line 85 "shotwell-video-thumbnailer.c"
+}
+
+
+static gboolean __lambda4_ (GstPluginFeature* f) {
+	gboolean result = FALSE;
+	GstPluginFeature* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+#line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	g_return_val_if_fail (GST_IS_PLUGIN_FEATURE (f), FALSE);
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp0_ = f;
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp1_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gst_object_get_type (), GstObject));
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp2_ = _tmp1_;
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp3_ = g_str_has_prefix (_tmp2_, "vaapi");
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp4_ = _tmp3_;
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_g_free0 (_tmp2_);
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	result = _tmp4_;
+#line 31 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	return result;
+#line 114 "shotwell-video-thumbnailer.c"
+}
+
+
+static gboolean ___lambda4__gst_plugin_feature_filter (GstPluginFeature* feature, gpointer self) {
+	gboolean result;
+	result = __lambda4_ (feature);
+#line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	return result;
+#line 123 "shotwell-video-thumbnailer.c"
+}
+
+
+static void _g_object_unref0_ (gpointer var) {
+#line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
+#line 130 "shotwell-video-thumbnailer.c"
+}
+
+
+static void _g_list_free__g_object_unref0_ (GList* self) {
+#line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
+#line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	g_list_free (self);
+#line 139 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -91,16 +151,14 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	gint64 duration = 0LL;
 	gint64 position = 0LL;
 	GstStateChangeReturn ret = 0;
+	gint _tmp0_;
 	GstRegistry* registry = NULL;
-	GstRegistry* _tmp0_;
 	GstRegistry* _tmp1_;
-	GstPluginFeature* feature = NULL;
 	GstRegistry* _tmp2_;
-	GstPluginFeature* _tmp3_;
-	GstPluginFeature* _tmp4_;
-	GstRegistry* _tmp7_;
-	GstPluginFeature* _tmp8_;
-	GstPluginFeature* _tmp9_;
+	GList* features = NULL;
+	GstRegistry* _tmp3_;
+	GList* _tmp4_;
+	GList* _tmp5_;
 	gchar** _tmp12_;
 	gint _tmp12__length1;
 	gchar** _tmp16_;
@@ -113,56 +171,73 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	gchar* _tmp22_;
 	GError * _inner_error_ = NULL;
 #line 23 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	gst_init (&args_length1, &args);
-#line 25 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp0_ = gst_registry_get ();
-#line 25 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 25 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	registry = _tmp1_;
-#line 27 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp2_ = registry;
-#line 27 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp3_ = gst_registry_find_feature (_tmp2_, "vaapidecodebin", gst_element_factory_get_type ());
+	_tmp0_ = nice (19);
+#line 23 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	if (_tmp0_ < 0) {
+#line 24 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+		g_debug ("shotwell-video-thumbnailer.vala:24: Failed to reduce thumbnailer nice " \
+"level. Continuing anyway");
+#line 180 "shotwell-video-thumbnailer.c"
+	}
 #line 27 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	feature = _tmp3_;
+	gst_init (&args_length1, &args);
 #line 29 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp4_ = feature;
+	_tmp1_ = gst_registry_get ();
 #line 29 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	if (_tmp4_ != NULL) {
-#line 134 "shotwell-video-thumbnailer.c"
-		GstRegistry* _tmp5_;
-		GstPluginFeature* _tmp6_;
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 29 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	registry = _tmp2_;
 #line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_tmp5_ = registry;
+	_tmp3_ = registry;
 #line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_tmp6_ = feature;
+	_tmp4_ = gst_registry_feature_filter (_tmp3_, ___lambda4__gst_plugin_feature_filter, FALSE, NULL);
 #line 30 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		gst_registry_remove_feature (_tmp5_, _tmp6_);
-#line 143 "shotwell-video-thumbnailer.c"
-	}
-#line 33 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp7_ = registry;
-#line 33 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp8_ = gst_registry_find_feature (_tmp7_, "vaapidecode", gst_element_factory_get_type ());
-#line 33 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_g_object_unref0 (feature);
-#line 33 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	feature = _tmp8_;
+	features = _tmp4_;
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+	_tmp5_ = features;
+#line 198 "shotwell-video-thumbnailer.c"
+	{
+		GList* feature_collection = NULL;
+		GList* feature_it = NULL;
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+		feature_collection = _tmp5_;
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+		for (feature_it = feature_collection; feature_it != NULL; feature_it = feature_it->next) {
+#line 206 "shotwell-video-thumbnailer.c"
+			GstPluginFeature* _tmp6_;
+			GstPluginFeature* feature = NULL;
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+			_tmp6_ = _g_object_ref0 ((GstPluginFeature*) feature_it->data);
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+			feature = _tmp6_;
+#line 213 "shotwell-video-thumbnailer.c"
+			{
+				GstPluginFeature* _tmp7_;
+				gchar* _tmp8_;
+				gchar* _tmp9_;
+				GstRegistry* _tmp10_;
+				GstPluginFeature* _tmp11_;
+#line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+				_tmp7_ = feature;
+#line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+				_tmp8_ = gst_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gst_object_get_type (), GstObject));
 #line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_tmp9_ = feature;
+				_tmp9_ = _tmp8_;
 #line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	if (_tmp9_ != NULL) {
-#line 157 "shotwell-video-thumbnailer.c"
-		GstRegistry* _tmp10_;
-		GstPluginFeature* _tmp11_;
+				g_debug ("shotwell-video-thumbnailer.vala:35: Removing registry feature %s", _tmp9_);
+#line 35 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+				_g_free0 (_tmp9_);
 #line 36 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_tmp10_ = registry;
+				_tmp10_ = registry;
 #line 36 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_tmp11_ = feature;
+				_tmp11_ = feature;
 #line 36 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		gst_registry_remove_feature (_tmp10_, _tmp11_);
-#line 166 "shotwell-video-thumbnailer.c"
+				gst_registry_remove_feature (_tmp10_, _tmp11_);
+#line 34 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
+				_g_object_unref0 (feature);
+#line 238 "shotwell-video-thumbnailer.c"
+			}
+		}
 	}
 #line 39 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	_tmp12_ = args;
@@ -170,7 +245,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	_tmp12__length1 = args_length1;
 #line 39 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (_tmp12__length1 != 2) {
-#line 174 "shotwell-video-thumbnailer.c"
+#line 248 "shotwell-video-thumbnailer.c"
 		FILE* _tmp13_;
 		gchar** _tmp14_;
 		gint _tmp14__length1;
@@ -188,7 +263,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		result = 1;
 #line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_g_object_unref0 (feature);
+		__g_list_free__g_object_unref0_0 (features);
 #line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_g_object_unref0 (registry);
 #line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -203,7 +278,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_g_object_unref0 (pipeline);
 #line 41 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		return result;
-#line 207 "shotwell-video-thumbnailer.c"
+#line 281 "shotwell-video-thumbnailer.c"
 	}
 #line 44 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	_tmp16_ = args;
@@ -229,7 +304,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	_g_free0 (_tmp21_);
 #line 44 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	_g_free0 (_tmp19_);
-#line 233 "shotwell-video-thumbnailer.c"
+#line 307 "shotwell-video-thumbnailer.c"
 	{
 		GstElement* _tmp23_ = NULL;
 		const gchar* _tmp24_;
@@ -269,7 +344,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_tmp23_ = _tmp25_;
 #line 49 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 273 "shotwell-video-thumbnailer.c"
+#line 347 "shotwell-video-thumbnailer.c"
 			goto __catch0_g_error;
 		}
 #line 49 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -300,7 +375,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_tmp31_ = ret;
 #line 56 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp31_ == GST_STATE_CHANGE_FAILURE) {
-#line 304 "shotwell-video-thumbnailer.c"
+#line 378 "shotwell-video-thumbnailer.c"
 			FILE* _tmp32_;
 #line 57 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp32_ = stderr;
@@ -311,7 +386,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 58 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (_tmp23_);
 #line 58 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-			_g_object_unref0 (feature);
+			__g_list_free__g_object_unref0_0 (features);
 #line 58 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (registry);
 #line 58 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -326,14 +401,14 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 			_g_object_unref0 (pipeline);
 #line 58 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return result;
-#line 330 "shotwell-video-thumbnailer.c"
+#line 404 "shotwell-video-thumbnailer.c"
 		} else {
 			GstStateChangeReturn _tmp33_;
 #line 59 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp33_ = ret;
 #line 59 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			if (_tmp33_ == GST_STATE_CHANGE_NO_PREROLL) {
-#line 337 "shotwell-video-thumbnailer.c"
+#line 411 "shotwell-video-thumbnailer.c"
 				FILE* _tmp34_;
 #line 60 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 				_tmp34_ = stderr;
@@ -344,7 +419,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 61 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 				_g_object_unref0 (_tmp23_);
 #line 61 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-				_g_object_unref0 (feature);
+				__g_list_free__g_object_unref0_0 (features);
 #line 61 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 				_g_object_unref0 (registry);
 #line 61 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -359,7 +434,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 				_g_object_unref0 (pipeline);
 #line 61 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 				return result;
-#line 363 "shotwell-video-thumbnailer.c"
+#line 437 "shotwell-video-thumbnailer.c"
 			}
 		}
 #line 67 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -372,7 +447,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_tmp37_ = ret;
 #line 68 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp37_ == GST_STATE_CHANGE_FAILURE) {
-#line 376 "shotwell-video-thumbnailer.c"
+#line 450 "shotwell-video-thumbnailer.c"
 			FILE* _tmp38_;
 #line 69 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp38_ = stderr;
@@ -383,7 +458,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 70 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (_tmp23_);
 #line 70 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-			_g_object_unref0 (feature);
+			__g_list_free__g_object_unref0_0 (features);
 #line 70 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (registry);
 #line 70 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -398,7 +473,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 			_g_object_unref0 (pipeline);
 #line 70 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return result;
-#line 402 "shotwell-video-thumbnailer.c"
+#line 476 "shotwell-video-thumbnailer.c"
 		}
 #line 74 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp39_ = pipeline;
@@ -408,7 +483,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		duration = _tmp40_;
 #line 74 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (!_tmp41_) {
-#line 412 "shotwell-video-thumbnailer.c"
+#line 486 "shotwell-video-thumbnailer.c"
 			FILE* _tmp42_;
 #line 75 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp42_ = stderr;
@@ -419,7 +494,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 76 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (_tmp23_);
 #line 76 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-			_g_object_unref0 (feature);
+			__g_list_free__g_object_unref0_0 (features);
 #line 76 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (registry);
 #line 76 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -434,7 +509,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 			_g_object_unref0 (pipeline);
 #line 76 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return result;
-#line 438 "shotwell-video-thumbnailer.c"
+#line 512 "shotwell-video-thumbnailer.c"
 		}
 #line 79 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		position = (gint64) (1 * GST_SECOND);
@@ -454,7 +529,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_tmp47_ = ret;
 #line 88 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (_tmp47_ == GST_STATE_CHANGE_FAILURE) {
-#line 458 "shotwell-video-thumbnailer.c"
+#line 532 "shotwell-video-thumbnailer.c"
 			FILE* _tmp48_;
 #line 89 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_tmp48_ = stderr;
@@ -465,7 +540,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 90 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (_tmp23_);
 #line 90 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-			_g_object_unref0 (feature);
+			__g_list_free__g_object_unref0_0 (features);
 #line 90 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (registry);
 #line 90 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -480,7 +555,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 			_g_object_unref0 (pipeline);
 #line 90 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return result;
-#line 484 "shotwell-video-thumbnailer.c"
+#line 558 "shotwell-video-thumbnailer.c"
 		}
 #line 93 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_tmp49_ = sink;
@@ -502,7 +577,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 96 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			_g_object_unref0 (_tmp23_);
-#line 506 "shotwell-video-thumbnailer.c"
+#line 580 "shotwell-video-thumbnailer.c"
 			goto __catch0_g_error;
 		}
 #line 97 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -519,7 +594,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		gst_element_set_state (_tmp55_, GST_STATE_NULL);
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_g_object_unref0 (_tmp23_);
-#line 523 "shotwell-video-thumbnailer.c"
+#line 597 "shotwell-video-thumbnailer.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -545,7 +620,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 #line 104 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_g_error_free0 (e);
 #line 104 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_g_object_unref0 (feature);
+		__g_list_free__g_object_unref0_0 (features);
 #line 104 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_g_object_unref0 (registry);
 #line 104 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -560,15 +635,15 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		_g_object_unref0 (pipeline);
 #line 104 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		return result;
-#line 564 "shotwell-video-thumbnailer.c"
+#line 638 "shotwell-video-thumbnailer.c"
 	}
 	__finally0:
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 569 "shotwell-video-thumbnailer.c"
+#line 643 "shotwell-video-thumbnailer.c"
 		gint _tmp59_ = 0;
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-		_g_object_unref0 (feature);
+		__g_list_free__g_object_unref0_0 (features);
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		_g_object_unref0 (registry);
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -587,12 +662,12 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 47 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		return _tmp59_;
-#line 591 "shotwell-video-thumbnailer.c"
+#line 665 "shotwell-video-thumbnailer.c"
 	}
 #line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	result = 0;
 #line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
-	_g_object_unref0 (feature);
+	__g_list_free__g_object_unref0_0 (features);
 #line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	_g_object_unref0 (registry);
 #line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
@@ -607,7 +682,7 @@ gint shotwell_thumbnailer_main (gchar** args, int args_length1) {
 	_g_object_unref0 (pipeline);
 #line 107 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return result;
-#line 611 "shotwell-video-thumbnailer.c"
+#line 685 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -617,7 +692,7 @@ int main (int argc, char ** argv) {
 #endif
 #line 15 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return shotwell_thumbnailer_main (argv, argc);
-#line 621 "shotwell-video-thumbnailer.c"
+#line 695 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -627,21 +702,21 @@ ShotwellThumbnailer* shotwell_thumbnailer_construct (GType object_type) {
 	self = (ShotwellThumbnailer*) g_type_create_instance (object_type);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return self;
-#line 631 "shotwell-video-thumbnailer.c"
+#line 705 "shotwell-video-thumbnailer.c"
 }
 
 
 ShotwellThumbnailer* shotwell_thumbnailer_new (void) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return shotwell_thumbnailer_construct (TYPE_SHOTWELL_THUMBNAILER);
-#line 638 "shotwell-video-thumbnailer.c"
+#line 712 "shotwell-video-thumbnailer.c"
 }
 
 
 static void value_shotwell_thumbnailer_init (GValue* value) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	value->data[0].v_pointer = NULL;
-#line 645 "shotwell-video-thumbnailer.c"
+#line 719 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -650,7 +725,7 @@ static void value_shotwell_thumbnailer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (value->data[0].v_pointer);
-#line 654 "shotwell-video-thumbnailer.c"
+#line 728 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -660,11 +735,11 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		dest_value->data[0].v_pointer = shotwell_thumbnailer_ref (src_value->data[0].v_pointer);
-#line 664 "shotwell-video-thumbnailer.c"
+#line 738 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 668 "shotwell-video-thumbnailer.c"
+#line 742 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -672,37 +747,37 @@ static void value_shotwell_thumbnailer_copy_value (const GValue* src_value, GVal
 static gpointer value_shotwell_thumbnailer_peek_pointer (const GValue* value) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return value->data[0].v_pointer;
-#line 676 "shotwell-video-thumbnailer.c"
+#line 750 "shotwell-video-thumbnailer.c"
 }
 
 
 static gchar* value_shotwell_thumbnailer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (collect_values[0].v_pointer) {
-#line 683 "shotwell-video-thumbnailer.c"
+#line 757 "shotwell-video-thumbnailer.c"
 		ShotwellThumbnailer * object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 690 "shotwell-video-thumbnailer.c"
+#line 764 "shotwell-video-thumbnailer.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.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 694 "shotwell-video-thumbnailer.c"
+#line 768 "shotwell-video-thumbnailer.c"
 		}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = shotwell_thumbnailer_ref (object);
-#line 698 "shotwell-video-thumbnailer.c"
+#line 772 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 702 "shotwell-video-thumbnailer.c"
+#line 776 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return NULL;
-#line 706 "shotwell-video-thumbnailer.c"
+#line 780 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -713,25 +788,25 @@ static gchar* value_shotwell_thumbnailer_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 717 "shotwell-video-thumbnailer.c"
+#line 791 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = NULL;
-#line 723 "shotwell-video-thumbnailer.c"
+#line 797 "shotwell-video-thumbnailer.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = value->data[0].v_pointer;
-#line 727 "shotwell-video-thumbnailer.c"
+#line 801 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		*object_p = shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 731 "shotwell-video-thumbnailer.c"
+#line 805 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return NULL;
-#line 735 "shotwell-video-thumbnailer.c"
+#line 809 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -745,7 +820,7 @@ GParamSpec* param_spec_shotwell_thumbnailer (const gchar* name, const gchar* nic
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return G_PARAM_SPEC (spec);
-#line 749 "shotwell-video-thumbnailer.c"
+#line 823 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -754,7 +829,7 @@ gpointer value_get_shotwell_thumbnailer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SHOTWELL_THUMBNAILER), NULL);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return value->data[0].v_pointer;
-#line 758 "shotwell-video-thumbnailer.c"
+#line 832 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -774,17 +849,17 @@ void value_set_shotwell_thumbnailer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_ref (value->data[0].v_pointer);
-#line 778 "shotwell-video-thumbnailer.c"
+#line 852 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 782 "shotwell-video-thumbnailer.c"
+#line 856 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (old);
-#line 788 "shotwell-video-thumbnailer.c"
+#line 862 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -803,17 +878,17 @@ void value_take_shotwell_thumbnailer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = v_object;
-#line 807 "shotwell-video-thumbnailer.c"
+#line 881 "shotwell-video-thumbnailer.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		value->data[0].v_pointer = NULL;
-#line 811 "shotwell-video-thumbnailer.c"
+#line 885 "shotwell-video-thumbnailer.c"
 	}
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		shotwell_thumbnailer_unref (old);
-#line 817 "shotwell-video-thumbnailer.c"
+#line 891 "shotwell-video-thumbnailer.c"
 	}
 }
 
@@ -823,14 +898,14 @@ static void shotwell_thumbnailer_class_init (ShotwellThumbnailerClass * klass) {
 	shotwell_thumbnailer_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	((ShotwellThumbnailerClass *) klass)->finalize = shotwell_thumbnailer_finalize;
-#line 827 "shotwell-video-thumbnailer.c"
+#line 901 "shotwell-video-thumbnailer.c"
 }
 
 
 static void shotwell_thumbnailer_instance_init (ShotwellThumbnailer * self) {
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	self->ref_count = 1;
-#line 834 "shotwell-video-thumbnailer.c"
+#line 908 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -840,7 +915,7 @@ static void shotwell_thumbnailer_finalize (ShotwellThumbnailer * obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_THUMBNAILER, ShotwellThumbnailer);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	g_signal_handlers_destroy (self);
-#line 844 "shotwell-video-thumbnailer.c"
+#line 918 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -865,7 +940,7 @@ gpointer shotwell_thumbnailer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 	return instance;
-#line 869 "shotwell-video-thumbnailer.c"
+#line 943 "shotwell-video-thumbnailer.c"
 }
 
 
@@ -878,7 +953,7 @@ void shotwell_thumbnailer_unref (gpointer instance) {
 		SHOTWELL_THUMBNAILER_GET_CLASS (self)->finalize (self);
 #line 12 "/home/jens/Source/shotwell/thumbnailer/shotwell-video-thumbnailer.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 882 "shotwell-video-thumbnailer.c"
+#line 956 "shotwell-video-thumbnailer.c"
 	}
 }
 
diff --git a/thumbnailer/shotwell-video-thumbnailer.vala b/thumbnailer/shotwell-video-thumbnailer.vala
index 234868a..2b381a6 100644
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
@@ -11,7 +11,7 @@
 // a replacement for totem-video-thumbnailer
 class ShotwellThumbnailer {
     const string caps_string = """video/x-raw,format=RGB,pixel-aspect-ratio=1/1""";
-    
+
     public static int main(string[] args) {
         Gst.Element pipeline, sink;
         string descr;
@@ -19,20 +19,20 @@ class ShotwellThumbnailer {
         uint8[]? pngdata;
         int64 duration, position;
         Gst.StateChangeReturn ret;
-        
+
+        if (Posix.nice (19) < 0) {
+            debug ("Failed to reduce thumbnailer nice level. Continuing anyway");
+        }
+
         Gst.init(ref args);
 
         var registry = Gst.Registry.@get ();
+        var features = registry.feature_filter ((f) => {
+            return f.get_name ().has_prefix ("vaapi");
+        }, false);
 
-        var feature = registry.find_feature ("vaapidecodebin",
-                                             typeof (Gst.ElementFactory));
-        if (feature != null) {
-            registry.remove_feature (feature);
-        }
-
-        feature = registry.find_feature ("vaapidecode",
-                                             typeof (Gst.ElementFactory));
-        if (feature != null) {
+        foreach (var feature in features) {
+            debug ("Removing registry feature %s", feature.get_name ());
             registry.remove_feature (feature);
         }
 
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 73bb976..fe6cf12 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -7,11 +7,15 @@ dist_noinst_DATA = \
 	fullscreen.ui \
 	import_queue.ui \
 	import.ui \
+	manifest_widget.ui \
 	media.ui \
+	multitextentrydialog.ui \
 	offline.ui \
 	photo_context.ui \
 	photo.ui \
+	preferences_dialog.ui \
 	printing_widget.ui \
+	saved_search_dialog.ui \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
@@ -19,8 +23,10 @@ dist_noinst_DATA = \
 	set_background_slideshow_dialog.ui \
 	shotwell.ui \
 	sidebar_default_context.ui \
+	slideshow_settings.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
+	textentrydialog.ui \
 	trash.ui
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 2880e3f..82f9470 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -322,11 +322,15 @@ dist_noinst_DATA = \
 	fullscreen.ui \
 	import_queue.ui \
 	import.ui \
+	manifest_widget.ui \
 	media.ui \
+	multitextentrydialog.ui \
 	offline.ui \
 	photo_context.ui \
 	photo.ui \
+	preferences_dialog.ui \
 	printing_widget.ui \
+	saved_search_dialog.ui \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
@@ -334,8 +338,10 @@ dist_noinst_DATA = \
 	set_background_slideshow_dialog.ui \
 	shotwell.ui \
 	sidebar_default_context.ui \
+	slideshow_settings.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
+	textentrydialog.ui \
 	trash.ui
 
 all: all-am
diff --git a/ui/collection.ui b/ui/collection.ui
index 1da6169..212d5b9 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.18"/>
   <menu id="CollectionContextMenu">
     <section>
       <item>
@@ -105,7 +105,7 @@
         <attribute name="accel">F3</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="label" translatable="yes">Open With E_xternal Editor</attribute>
         <attribute name="accel">&lt;Primary&gt;Return</attribute>
         <attribute name="action">win.ExternalEdit</attribute>
       </item>
diff --git a/ui/direct.ui b/ui/direct.ui
index 75acb0f..f079ff8 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -165,6 +165,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
+          <attribute name="accel">F4</attribute>
           <attribute name="action">win.AdjustDateTime</attribute>
         </item>
       </section>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 398d8c2..852fe93 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
   <menu id="DirectContextMenu">
       <section>
         <item>
diff --git a/ui/event.ui b/ui/event.ui
index 3de91b0..771b2a9 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
@@ -71,7 +71,7 @@
       <section>
         <attribute name="id">EditExtrasPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="label" translatable="yes">R_emove From Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
@@ -544,7 +544,7 @@
         <attribute name="accel">F3</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="label" translatable="yes">Open With E_xternal Editor</attribute>
         <attribute name="accel">&lt;Primary&gt;Return</attribute>
         <attribute name="action">win.ExternalEdit</attribute>
       </item>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 380da0a..6d0e939 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
diff --git a/ui/import.ui b/ui/import.ui
index 73320d6..6f13e31 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index 9b07d9c..1f67fc3 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -11,7 +11,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
diff --git a/ui/manifest_widget.ui b/ui/manifest_widget.ui
new file mode 100644
index 0000000..afcf173
--- /dev/null
+++ b/ui/manifest_widget.ui
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.18"/>
+  <template class="PluginsManifestWidgetMediator" parent="GtkBox">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkScrolledWindow" id="list_bin">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="shadow_type">etched-in</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButtonBox" id="hbuttonbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="layout_style">end</property>
+        <child>
+          <object class="GtkButton" id="about_button">
+            <property name="label" translatable="yes">_About</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </template>
+</interface>
diff --git a/ui/media.ui b/ui/media.ui
index 1688d4d..22a6b83 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
@@ -71,7 +71,7 @@
       <section>
         <attribute name="id">EditExtrasPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="label" translatable="yes">R_emove From Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
diff --git a/ui/multitextentrydialog.ui b/ui/multitextentrydialog.ui
new file mode 100644
index 0000000..6477129
--- /dev/null
+++ b/ui/multitextentrydialog.ui
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkTextBuffer" id="textbuffer1"/>
+  <template class="MultiTextEntryDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="default_width">500</property>
+    <property name="default_height">300</property>
+    <property name="type_hint">normal</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ok_button">
+                <property name="label" translatable="yes">_OK</property>
+                <property name="visible">True</property>
+                <property name="can_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="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTextView" id="entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="wrap_mode">word</property>
+                <property name="buffer">textbuffer1</property>
+                <property name="accepts_tab">False</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">cancel_button</action-widget>
+      <action-widget response="-5">ok_button</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/ui/offline.ui b/ui/offline.ui
index d6608d6..f419315 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
@@ -55,7 +55,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="label" translatable="yes">R_emove From Library</attribute>
           <attribute name="accel">Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
@@ -204,7 +204,7 @@
   <menu id="OfflineContextMenu">
     <section>
       <item>
-        <attribute name="label" translatable="yes">R_emove from Library</attribute>
+        <attribute name="label" translatable="yes">R_emove From Library</attribute>
         <attribute name="accel">Delete</attribute>
         <attribute name="action">win.RemoveFromLibrary</attribute>
       </item>
diff --git a/ui/photo.ui b/ui/photo.ui
index 6044d1f..3219557 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
@@ -74,7 +74,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="label" translatable="yes">R_emove From Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
@@ -335,6 +335,7 @@
         </item>
         <item>
           <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
+          <attribute name="accel">F4</attribute>
           <attribute name="action">win.AdjustDateTime</attribute>
         </item>
       </section>
@@ -357,7 +358,7 @@
       </section>
       <section>
         <item>
-          <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+          <attribute name="label" translatable="yes">Open With E_xternal Editor</attribute>
           <attribute name="accel">&lt;Primary&gt;Return</attribute>
           <attribute name="action">win.ExternalEdit</attribute>
         </item>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index 6deabcc..27a37d2 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -112,7 +112,7 @@
         <attribute name="accel">F3</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="label" translatable="yes">Open With E_xternal Editor</attribute>
         <attribute name="accel">&lt;Primary&gt;Return</attribute>
         <attribute name="action">win.ExternalEdit</attribute>
       </item>
diff --git a/ui/preferences_dialog.ui b/ui/preferences_dialog.ui
new file mode 100644
index 0000000..60df1c2
--- /dev/null
+++ b/ui/preferences_dialog.ui
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.18"/>
+  <object class="GtkAdjustment" id="bg_color_adjustment">
+    <property name="upper">65535</property>
+    <property name="step_increment">1000</property>
+    <property name="page_increment">1000</property>
+    <property name="page_size">1000</property>
+  </object>
+  <template class="PreferencesDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook" id="preferences_notebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_border">False</property>
+            <child>
+              <object class="GtkGrid" id="table1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">6</property>
+                <property name="row_spacing">4</property>
+                <property name="column_spacing">8</property>
+                <child>
+                  <object class="GtkFileChooserButton" id="library_dir_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action">select-folder</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="slider container">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">white</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="bg_color_slider">
+                        <property name="width_request">150</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">bg_color_adjustment</property>
+                        <property name="draw_value">False</property>
+                        <property name="value_pos">left</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">black</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="default_raw_developer_combo">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">14</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Display</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="library location">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Library Location</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="bg_color_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">_Background:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">bg_color_slider</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">_Import photos to:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">library_dir_button</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="autoimport">
+                    <property name="label" translatable="yes">_Watch library directory for new files</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="importing">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Importing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dir_structure_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">_Directory structure:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">dir_pattern_combo</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dir_pattern_example">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">34</property>
+                    <property name="label" translatable="yes">Example:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="lowercase">
+                    <property name="label" translatable="yes">R_ename imported files to lowercase</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="label" translatable="yes">Metadata</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">11</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="write_metadata">
+                    <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">12</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="label" translatable="yes">RAW Developer</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">13</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">De_fault:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">default_raw_developer_combo</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">14</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="dir_pattern_combo">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="dir_pattern_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dynamic example">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">9</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="patern">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">34</property>
+                        <property name="label" translatable="yes">_Pattern:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="pattern_help">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <attributes>
+                          <attribute name="underline" value="True"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="valign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">Transparent Background:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkRadioButton" id="transparent_checker_radio">
+                        <property name="label" translatable="yes">Checkered</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="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">transparent_solid_radio</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkRadioButton" id="transparent_solid_radio">
+                            <property name="label" translatable="yes">Solid color</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="active">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkColorButton" id="transparent_solid_color">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="transparent_none_radio">
+                        <property name="label" translatable="yes">None</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="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">transparent_solid_radio</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="library-tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Library</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="hbox4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="border_width">6</property>
+                <child>
+                  <object class="GtkBox" id="vbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">6</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="hexpand">True</property>
+                        <property name="label" translatable="yes">E_xternal photo editor:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">photo_editor_combo</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="label" translatable="yes">External _RAW editor:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">raw_editor_combo</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkComboBox" id="photo_editor_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="raw_editor_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="external-editors-tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">External Editors</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="plugins-tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Plugins</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="title" translatable="yes">Shotwell Preferences</property>
+        <property name="show_close_button">True</property>
+      </object>
+    </child>
+  </template>
+  <object class="GtkSizeGroup">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="transparent_checker_radio"/>
+      <widget name="box1"/>
+      <widget name="transparent_none_radio"/>
+    </widgets>
+  </object>
+</interface>
diff --git a/ui/printing_widget.ui b/ui/printing_widget.ui
index 02b452e..86f215d 100644
--- a/ui/printing_widget.ui
+++ b/ui/printing_widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.18"/>
   <template class="CustomPrintTab" parent="GtkBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -15,7 +15,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
-        <property name="margin_top">4</property>
         <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
         <property name="use_markup">True</property>
       </object>
@@ -26,11 +25,14 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="box2">
+      <object class="GtkGrid" id="box2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <property name="row_homogeneous">True</property>
         <child>
           <object class="GtkRadioButton" id="standard_size_radio">
             <property name="label" translatable="yes">Use a _standard size:</property>
@@ -44,37 +46,20 @@
             <property name="group">custom_size_radio</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="standard_sizes_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">20</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="padding">6</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
-        <property name="margin_top">2</property>
         <child>
           <object class="GtkRadioButton" id="custom_size_radio">
             <property name="label" translatable="yes">Use a c_ustom size:</property>
@@ -87,21 +72,19 @@
             <property name="draw_indicator">True</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">19</property>
+            <property name="spacing">4</property>
             <child>
               <object class="GtkEntry" id="custom_width_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_right">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
               </object>
@@ -127,7 +110,6 @@
               <object class="GtkEntry" id="custom_height_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_left">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
               </object>
@@ -155,43 +137,25 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">14</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="aspect_ratio_check">
+            <property name="label" translatable="yes">_Match photo aspect ratio</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="aspect_ratio_check">
-        <property name="label" translatable="yes">_Match photo aspect ratio</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">210</property>
-        <property name="use_underline">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="box5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
-        <property name="margin_top">2</property>
-        <property name="margin_bottom">12</property>
         <child>
           <object class="GtkRadioButton" id="image_per_page_radio">
             <property name="label" translatable="yes">_Autosize:</property>
@@ -205,28 +169,29 @@
             <property name="group">custom_size_radio</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="image_per_page_combo">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">95</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">4</property>
+        <property name="padding">6</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
@@ -240,14 +205,14 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">5</property>
+        <property name="position">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="box6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
         <child>
           <object class="GtkCheckButton" id="title_print_check">
@@ -285,7 +250,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">6</property>
+        <property name="position">3</property>
       </packing>
     </child>
     <child>
@@ -300,14 +265,14 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">7</property>
+        <property name="position">4</property>
       </packing>
     </child>
     <child>
       <object class="GtkBox" id="box7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">24</property>
+        <property name="margin_left">12</property>
         <property name="margin_top">2</property>
         <child>
           <object class="GtkLabel" id="lbl_OutputPhotoAt">
@@ -367,7 +332,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">8</property>
+        <property name="position">5</property>
       </packing>
     </child>
   </template>
diff --git a/ui/saved_search_dialog.ui b/ui/saved_search_dialog.ui
new file mode 100644
index 0000000..825b750
--- /dev/null
+++ b/ui/saved_search_dialog.ui
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.18"/>
+  <template class="SavedSearchDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Search</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="criteria">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">3</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkBox" id="hbox3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkLabel" id="Name of search:">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Name of search:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">search_title</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="search_title">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="activates_default">True</property>
+                    <property name="width_chars">20</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="hseparator1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkLabel" id="Match">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">_Match</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">right</property>
+                    <property name="mnemonic_widget">operator</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="operator">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="active">0</property>
+                    <items>
+                      <item translatable="yes">any</item>
+                      <item translatable="yes">all</item>
+                      <item translatable="yes">none</item>
+                    </items>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">1</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="of the following:">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">of the following:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkButton" id="add_criteria">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">list-add-symbolic</property>
+                        <property name="icon_size">1</property>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="image-button"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator" id="hseparator2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolled">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">176</property>
+                <child>
+                  <object class="GtkViewport">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkListBox" id="row_listbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/ui/set_background_dialog.ui b/ui/set_background_dialog.ui
index e8930e1..d00125e 100644
--- a/ui/set_background_dialog.ui
+++ b/ui/set_background_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.18"/>
   <template class="SetBackgroundPhotoDialog" parent="GtkDialog">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
diff --git a/ui/set_background_slideshow_dialog.ui b/ui/set_background_slideshow_dialog.ui
index 39e1b82..93c3a99 100644
--- a/ui/set_background_slideshow_dialog.ui
+++ b/ui/set_background_slideshow_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="value">50</property>
@@ -30,7 +30,6 @@
             <child>
               <object class="GtkButton" id="cancel_button">
                 <property name="label">_Cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -46,7 +45,6 @@
             <child>
               <object class="GtkButton" id="ok_button">
                 <property name="label">_OK</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/ui/shotwell.ui b/ui/shotwell.ui
index 59b034a..af41b10 100644
--- a/ui/shotwell.ui
+++ b/ui/shotwell.ui
@@ -1,862 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
-  <requires lib="gtk+" version="3.14"/>
-  <object class="GtkAdjustment" id="bg_color_adjustment">
-    <property name="upper">65535</property>
-    <property name="step_increment">1000</property>
-    <property name="page_increment">1000</property>
-    <property name="page_size">1000</property>
-  </object>
-  <object class="GtkDialog" id="preferences_dialog">
-    <property name="can_focus">False</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkNotebook" id="preferences-notebook">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_border">False</property>
-            <child>
-              <object class="GtkGrid" id="table1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="border_width">6</property>
-                <property name="row_spacing">4</property>
-                <property name="column_spacing">8</property>
-                <child>
-                  <object class="GtkFileChooserButton" id="library_dir_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="action">select-folder</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="slider container">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">white</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScale" id="bg_color_slider">
-                        <property name="width_request">150</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="adjustment">bg_color_adjustment</property>
-                        <property name="draw_value">False</property>
-                        <property name="value_pos">left</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">black</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="default_raw_developer">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">13</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_bottom">3</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Display</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="library location">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_top">14</property>
-                    <property name="margin_bottom">3</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Library Location</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="bg_color_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">_Background:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">bg_color_slider</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="label" translatable="yes">_Import photos to:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">library_dir_button</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="autoimport">
-                    <property name="label" translatable="yes">_Watch library directory for new files</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="importing">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_top">14</property>
-                    <property name="margin_bottom">3</property>
-                    <property name="hexpand">True</property>
-                    <property name="label" translatable="yes">Importing</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">5</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="dir_structure_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="label" translatable="yes">_Directory structure:</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="example">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">34</property>
-                    <property name="label" translatable="yes">Example:</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">8</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="lowercase">
-                    <property name="label" translatable="yes">R_ename imported files to lowercase</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">9</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label10">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_top">14</property>
-                    <property name="margin_bottom">3</property>
-                    <property name="label" translatable="yes">Metadata</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">10</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="write_metadata">
-                    <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">11</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_top">14</property>
-                    <property name="margin_bottom">3</property>
-                    <property name="label" translatable="yes">RAW Developer</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">12</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin_left">10</property>
-                    <property name="label" translatable="yes">De_fault:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">default_raw_developer</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">13</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="dir choser">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="dir_pattern_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="primary_icon_activatable">False</property>
-                    <property name="secondary_icon_activatable">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="dynamic example">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="hexpand">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">8</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="patern">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">34</property>
-                        <property name="label" translatable="yes">_Pattern:</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="pattern_help">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <attributes>
-                          <attribute name="underline" value="True"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">7</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="library-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Library</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="hbox4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="border_width">6</property>
-                <child>
-                  <object class="GtkBox" id="vbox2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">6</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">4</property>
-                        <property name="margin_right">4</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">E_xternal photo editor:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">external_photo_editor_combo</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">4</property>
-                        <property name="margin_right">4</property>
-                        <property name="label" translatable="yes">External _RAW editor:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">external_raw_editor_combo</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="vbox3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkComboBox" id="external_photo_editor_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="external_raw_editor_combo">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="external-editors-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">External Editors</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="plugins-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Plugins</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title">Shotwell Preferences</property>
-        <property name="show_close_button">True</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkBox" id="criteria">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">3</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">5</property>
-    <child>
-      <object class="GtkBox" id="hbox3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="spacing">3</property>
-        <child>
-          <object class="GtkLabel" id="Name of search:">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Name of search:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">Search title</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="Search title">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">•</property>
-            <property name="width_chars">20</property>
-            <property name="primary_icon_activatable">False</property>
-            <property name="secondary_icon_activatable">False</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator" id="hseparator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="hbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="spacing">3</property>
-        <child>
-          <object class="GtkLabel" id="Match">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">_Match</property>
-            <property name="use_underline">True</property>
-            <property name="justify">right</property>
-            <property name="mnemonic_widget">Type of search criteria</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="Type of search criteria">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="padding">1</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="of the following:">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">of the following:</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkButton" id="Add search button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">list-add-symbolic</property>
-                <property name="icon_size">1</property>
-              </object>
-            </child>
-            <style>
-              <class name="image-button"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator" id="hseparator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="row_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">5</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkBox" id="dialog-vbox2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">3</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">3</property>
-    <child>
-      <object class="GtkLabel" id="label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">label</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="invisible_char">●</property>
-        <property name="activates_default">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-  <object class="GtkBox" id="dialog-vbox4">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
-    <property name="border_width">3</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkScrolledWindow" id="scrolledwindow1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="shadow_type">in</property>
-        <child>
-          <object class="GtkTextView" id="textview1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="wrap_mode">word</property>
-            <property name="accepts_tab">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-  <object class="GtkBox" id="plugin-manifest">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">12</property>
-    <child>
-      <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
-        <property name="hscrollbar_policy">never</property>
-        <property name="shadow_type">etched-in</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButtonBox" id="hbuttonbox1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="layout_style">end</property>
-        <child>
-          <object class="GtkButton" id="about-plugin-button">
-            <property name="label">_About</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_underline">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
+  <requires lib="gtk+" version="3.18"/>
   <object class="GtkBox" id="progress_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -879,180 +24,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkBox" id="slideshow_settings_pane">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkBox" id="dialog-vbox7">
-        <property name="can_focus">False</property>
-        <property name="margin_left">8</property>
-        <property name="margin_right">8</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">4</property>
-            <property name="column_spacing">4</property>
-            <child>
-              <object class="GtkLabel" id="delay_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes">_Delay:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">delay_hscale</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="transition_effect_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes">_Transition effect:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">transition_effect_selector</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="transition_delay_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes">Transition d_elay:</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_title_button">
-                <property name="label" translatable="yes">Show t_itle</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-                <property name="width">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="transition_effect_selector">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="delay_hscale">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="fill_level">300</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="transition_effect_hscale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="delay_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="transition_effect_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
-                <property name="digits">1</property>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="seconds_label_3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">seconds</property>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="seconds_label_4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">seconds</property>
-              </object>
-              <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="padding">4</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-  </object>
   <object class="GtkBox" id="static_msg_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/ui/slideshow_settings.ui b/ui/slideshow_settings.ui
new file mode 100644
index 0000000..6f597b1
--- /dev/null
+++ b/ui/slideshow_settings.ui
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkAdjustment" id="delay_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">30</property>
+    <property name="value">3</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="transition_effect_adjustment">
+    <property name="lower">0.10000000000000001</property>
+    <property name="upper">1</property>
+    <property name="value">0.29999999999999999</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <template class="SettingsDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Settings</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">_OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="slideshow_settings_pane">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="dialog-vbox7">
+                <property name="can_focus">False</property>
+                <property name="margin_left">8</property>
+                <property name="margin_right">8</property>
+                <property name="spacing">2</property>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">4</property>
+                    <property name="column_spacing">4</property>
+                    <child>
+                      <object class="GtkLabel" id="delay_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">_Delay:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">delay_hscale</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="transition_effect_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">_Transition effect:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">transition_effect_selector</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="transition_delay_label">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes">Transition d_elay:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="show_title_button">
+                        <property name="label" translatable="yes">Show t_itle</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="halign">start</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="transition_effect_selector">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="delay_hscale">
+                        <property name="width_request">150</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">delay_adjustment</property>
+                        <property name="fill_level">300</property>
+                        <property name="draw_value">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="transition_effect_hscale">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">transition_effect_adjustment</property>
+                        <property name="fill_level">3</property>
+                        <property name="draw_value">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="delay_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <property name="adjustment">delay_adjustment</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="transition_effect_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">●</property>
+                        <property name="activates_default">True</property>
+                        <property name="adjustment">transition_effect_adjustment</property>
+                        <property name="digits">1</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="seconds_label_3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">seconds</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="seconds_label_4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">seconds</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="padding">4</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">button1</action-widget>
+      <action-widget response="0">button2</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/ui/tags.ui b/ui/tags.ui
index 8ca0659..03378ae 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
@@ -71,7 +71,7 @@
       <section>
         <attribute name="id">EditExtrasPlaceholder</attribute>
         <item>
-          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="label" translatable="yes">R_emove From Library</attribute>
           <attribute name="accel">&lt;Shift&gt;Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
diff --git a/ui/textentrydialog.ui b/ui/textentrydialog.ui
new file mode 100644
index 0000000..6a2dc78
--- /dev/null
+++ b/ui/textentrydialog.ui
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.18"/>
+  <template class="TextEntryDialog" parent="GtkDialog">
+    <property name="can_focus">False</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label" translatable="yes">_Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label" translatable="yes">_Save</property>
+                <property name="visible">True</property>
+                <property name="can_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="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="dialog-vbox2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="border_width">3</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">3</property>
+            <child>
+              <object class="GtkLabel" id="label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">label</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="activates_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button2</action-widget>
+    </action-widgets>
+  </template>
+</interface>
diff --git a/ui/trash.ui b/ui/trash.ui
index 2fbb9a4..ed49d28 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -5,7 +5,7 @@
       <attribute name="label" translatable="yes">_File</attribute>
       <section>
         <item>
-          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="label" translatable="yes">_Import From Folder…</attribute>
           <attribute name="accel">&lt;Primary&gt;i</attribute>
           <attribute name="action">win.CommonFileImport</attribute>
         </item>
diff --git a/vapi/unity.deps b/vapi/unity.deps
deleted file mode 100644
index 82127ef..0000000
--- a/vapi/unity.deps
+++ /dev/null
@@ -1,6 +0,0 @@
-glib-2.0 
-gobject-2.0 
-gio-2.0 
-gio-unix-2.0 
-dee-1.0 
-Dbusmenu-0.4
diff --git a/vapi/unity.vapi b/vapi/unity.vapi
deleted file mode 100644
index 45147fb..0000000
--- a/vapi/unity.vapi
+++ /dev/null
@@ -1,438 +0,0 @@
-/* unity.vapi generated by valac 0.18.0, do not modify. */
-
-namespace Unity {
-	namespace IO {
-		[CCode (cheader_filename = "unity.h")]
-		public static string[] get_system_data_dirs ();
-		[CCode (cheader_filename = "unity.h")]
-		public static async GLib.FileInputStream? open_from_data_dirs (string filename) throws GLib.Error;
-		[CCode (cheader_filename = "unity.h")]
-		public static async GLib.FileInputStream? open_from_dirs (string filename, string[] dirs) throws GLib.Error;
-		[CCode (cheader_filename = "unity.h")]
-		public static async void read_stream_async (GLib.InputStream input, int io_priority = GLib.Priority.LOW, GLib.Cancellable? cancellable = null, out uint8[] data, out size_t size) throws GLib.IOError;
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class ActivationResponse : GLib.InitiallyUnowned {
-		public ActivationResponse (Unity.HandledType handled, string goto_uri = "");
-		public ActivationResponse.with_preview (Unity.Preview preview);
-		public string goto_uri { get; set construct; }
-		public Unity.HandledType handled { get; construct; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class AnnotatedIcon : GLib.Object {
-		public AnnotatedIcon (GLib.Icon base_icon);
-		public string to_string ();
-		public Unity.CategoryType category { get; set; }
-		public GLib.Icon icon { get; set; }
-		public string ribbon { get; set; }
-		public Unity.IconSizeHint size_hint { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class AppInfoManager : GLib.Object {
-		public void clear ();
-		public unowned string[]? get_categories (string id);
-		public static Unity.AppInfoManager get_default ();
-		[Deprecated (replacement = "AppInfoManager.get_default")]
-		public static Unity.AppInfoManager get_instance ();
-		public unowned string[]? get_keywords (string id);
-		public string? get_path (string id);
-		public GLib.AppInfo? lookup (string id);
-		public async GLib.AppInfo? lookup_async (string id) throws GLib.Error;
-		public signal void changed (string id, GLib.AppInfo? new_appinfo);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class ApplicationPreview : Unity.Preview {
-		public ApplicationPreview (string title, string subtitle, string description, GLib.Icon? icon, GLib.Icon? screenshot);
-		public void set_rating (float rating, uint num_ratings);
-		public GLib.Icon app_icon { get; set; }
-		public string copyright { get; set; }
-		public string last_update { get; set; }
-		public string license { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class AsyncPreview : Unity.Preview {
-		public AsyncPreview ();
-		[CCode (name = "unity_async_preview_preview_ready")]
-		public void emit_preview_ready (Unity.Preview? preview);
-		public AsyncPreview.with_cancellable (GLib.Cancellable cancellable);
-		public GLib.Cancellable cancellable { get; set construct; }
-		public signal void preview_ready (Unity.Preview? preview);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class Category : GLib.Object {
-		public Category (string name, GLib.Icon icon_hint, Unity.CategoryRenderer renderer = CategoryRenderer.VERTICAL_TILE);
-		public Unity.CategoryRenderer default_renderer { get; construct; }
-		public GLib.Icon? icon_hint { get; construct; }
-		public string name { get; construct; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class CheckOptionFilter : Unity.OptionsFilter {
-		public CheckOptionFilter (string id, string display_name, GLib.Icon? icon_hint = null, bool collapsed = false);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class CheckOptionFilterCompact : Unity.OptionsFilter {
-		public CheckOptionFilterCompact (string id, string display_name, GLib.Icon? icon_hint = null, bool collapsed = false);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public abstract class Filter : GLib.Object {
-		public Filter ();
-		public bool collapsed { get; construct; }
-		public string display_name { get; internal set construct; }
-		public bool filtering { get; internal set construct; }
-		public GLib.Icon? icon_hint { get; construct; }
-		public string id { get; construct; }
-		public Unity.FilterRenderer renderer { get; construct; }
-		public bool visible { get; set construct; }
-		public signal void changed ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class FilterOption : GLib.Object {
-		public FilterOption (string id, string display_name, GLib.Icon? icon_hint = null, bool active = false);
-		public bool active { get; internal set construct; }
-		public string display_name { get; construct; }
-		public GLib.Icon icon_hint { get; construct; }
-		public string id { get; construct; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class GenericPreview : Unity.Preview {
-		public GenericPreview (string title, string description, GLib.Icon? image);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class InfoHint : GLib.InitiallyUnowned {
-		public InfoHint (string id, string display_name, GLib.Icon? icon_hint, string data);
-		public InfoHint.with_variant (string id, string display_name, GLib.Icon? icon_hint, GLib.Variant data);
-		public GLib.Variant data { get; construct; }
-		public string display_name { get; construct; }
-		public GLib.Icon? icon_hint { get; construct; }
-		public string id { get; construct; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class Inspector : GLib.Object {
-		public static unowned Unity.Inspector get_default ();
-		public string? unity_bus_name { get; }
-		public bool unity_running { get; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class LauncherEntry : Dee.Serializable, GLib.Object {
-		public static Unity.LauncherEntry get_for_app_uri (string app_uri);
-		public static Unity.LauncherEntry get_for_desktop_file (string desktop_file);
-		public static Unity.LauncherEntry get_for_desktop_id (string desktop_id);
-		public string app_uri { get; set construct; }
-		public int64 count { get; set; }
-		public bool count_visible { get; set; }
-		public double progress { get; set; }
-		public bool progress_visible { get; set; }
-		public Dbusmenu.Menuitem? quicklist { get; set; }
-		public bool urgent { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class LauncherFavorites : GLib.Object {
-		public GLib.AppInfo[] enumerate_app_infos ();
-		public string[] enumerate_ids ();
-		public static unowned Unity.LauncherFavorites get_default ();
-		public bool has_app_id (string app_id);
-		public bool has_app_info (GLib.AppInfo appinfo);
-		public GLib.AppInfo? lookup (string app_id);
-		public signal void changed ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class Lens : GLib.Object {
-		public Lens (string dbus_path_, string id_);
-		public void add_local_scope (Unity.Scope scope);
-		public void export () throws GLib.IOError;
-		public bool active { get; private set; }
-		public GLib.List<Unity.Category> categories { get; set; }
-		public string dbus_path { get; construct; }
-		public bool exported { get; private set; }
-		public GLib.List<Unity.Filter> filters { get; set; }
-		public Unity.MergeStrategy global_merge_strategy { get; set; }
-		public string home_lens_default_name { get; set; }
-		public string id { get; construct; }
-		public Unity.MergeStrategy merge_strategy { get; set; }
-		public string search_hint { get; set; }
-		public bool search_in_global { get; set; }
-		public bool searching { get; private set; }
-		public string sources_display_name { get; set construct; }
-		public bool visible { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class LensSearch : GLib.InitiallyUnowned {
-		public LensSearch (string search_string, GLib.HashTable<string,GLib.Variant> hints, Dee.SerializableModel results_model);
-		[CCode (cname = "unity_lens_search_finished")]
-		public void emit_finished ();
-		public bool equals (Unity.LensSearch? other);
-		public void set_reply_hint (string key, GLib.Variant variant);
-		public GLib.HashTable<string,GLib.Variant> hints { get; construct; }
-		public Dee.SerializableModel results_model { get; construct; }
-		public string search_string { get; construct; }
-		[Signal (action = true)]
-		public signal void finished ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class MoviePreview : Unity.Preview {
-		public MoviePreview (string title, string subtitle, string description, GLib.Icon? image);
-		public void set_rating (float rating, uint num_ratings);
-		public string year { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class MultiRangeFilter : Unity.OptionsFilter {
-		public MultiRangeFilter (string id, string display_name, GLib.Icon? icon_hint = null, bool collapsed = false);
-		public Unity.FilterOption? get_first_active ();
-		public Unity.FilterOption? get_last_active ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class MusicPlayer : GLib.Object {
-		public MusicPlayer (string desktop);
-		public bool add_playlist (Unity.Playlist p);
-		public void edit_playlist_name (string id, string name);
-		public void export ();
-		public Unity.Playlist[] get_playlists ();
-		public bool remove_playlist (Unity.Playlist p);
-		public void unexport ();
-		public GLib.AppInfo app_info { get; construct; }
-		public bool can_go_next { get; set; }
-		public bool can_go_previous { get; set; }
-		public bool can_pause { get; set; }
-		public bool can_play { get; set; }
-		public Unity.Playlist current_playlist { get; set; }
-		public Unity.TrackMetadata current_track { get; set; }
-		public string desktop_file_name { get; construct; }
-		public bool is_blacklisted { get; set; }
-		public Unity.PlaybackState playback_state { get; set; }
-		public Dbusmenu.Menuitem? player_menu { get; set; }
-		public string title { get; set; }
-		public Dbusmenu.Menuitem? track_menu { get; set; }
-		public signal void activate_playlist (GLib.ObjectPath playlist_id);
-		public signal void next ();
-		public signal void play_pause ();
-		public signal void previous ();
-		public signal void raise ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class MusicPreview : Unity.Preview {
-		public enum TrackState {
-			STOPPED,
-			PLAYING,
-			PAUSED
-		}
-		public MusicPreview (string title, string subtitle, GLib.Icon? image);
-		public void add_track (Unity.TrackMetadata track);
-		public float current_progress { get; set; }
-		public Unity.MusicPreview.TrackState current_track_state { get; set; }
-		public string current_track_uri { get; set; }
-		public signal void pause (string uri);
-		public signal void play (string uri);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class OptionsFilter : Unity.Filter {
-		public enum SortType {
-			MANUAL,
-			DISPLAY_NAME,
-			ID
-		}
-		public GLib.List<Unity.FilterOption> options;
-		public OptionsFilter ();
-		public Unity.FilterOption add_option (string id, string display_name, GLib.Icon? icon_hint = null);
-		public Unity.FilterOption? get_option (string id);
-		public bool remove_option (string id);
-		public Unity.OptionsFilter.SortType sort_type { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class Playlist : GLib.Object {
-		public Playlist (string id);
-		public GLib.DateTime creation_date { get; set; }
-		public GLib.Icon icon { get; set; }
-		public string id { get; construct; }
-		public GLib.DateTime last_play_date { get; set; }
-		public GLib.DateTime modification_date { get; set; }
-		public string name { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class PreferencesManager : GLib.Object {
-		public enum RemoteContent {
-			ALL,
-			NONE
-		}
-		public static Unity.PreferencesManager get_default ();
-		public Unity.PreferencesManager.RemoteContent remote_content_search { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public abstract class Preview : GLib.Object, Dee.Serializable {
-		public Preview ();
-		public void add_action (Unity.PreviewAction action);
-		public void add_info (Unity.InfoHint info_hint);
-		public string description_markup { get; set; }
-		public GLib.Icon? image { get; set; }
-		public string image_source_uri { get; set; }
-		public string subtitle { get; set; }
-		public string title { get; set; }
-		public signal void closed ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class PreviewAction : GLib.Object, Dee.Serializable {
-		public PreviewAction (string id, string display_name, GLib.Icon? icon_hint);
-		public PreviewAction.with_layout_hint (string id, string display_name, GLib.Icon? icon_hint, Unity.LayoutHint layout);
-		public string display_name { get; construct; }
-		public string extra_text { get; set; }
-		public GLib.HashTable<string,GLib.Variant>? hints { get; }
-		public GLib.Icon? icon_hint { get; construct; }
-		public string id { get; construct; }
-		public Unity.LayoutHint layout_hint { get; construct; }
-		public signal Unity.ActivationResponse activated (string uri);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class RadioOptionFilter : Unity.OptionsFilter {
-		public RadioOptionFilter (string id, string display_name, GLib.Icon? icon_hint = null, bool collapsed = false);
-		public Unity.FilterOption? get_active_option ();
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class RatingsFilter : Unity.Filter {
-		public RatingsFilter (string id, string display_name, GLib.Icon? icon_hint = null, bool collapsed = false);
-		public float rating { get; internal set construct; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class Scope : GLib.Object {
-		public Scope (string dbus_path_);
-		public void export () throws GLib.IOError;
-		public Unity.Filter? get_filter (string id);
-		public void invalidate_search (Unity.SearchType search_type);
-		public void queue_search_changed (Unity.SearchType search_type);
-		public bool active { get; set; }
-		public string dbus_path { get; construct; }
-		public bool exported { get; private set; }
-		public GLib.List<Unity.Filter> filters { get; }
-		public Dee.SerializableModel global_results_model { get; }
-		public bool provides_personal_content { get; set; }
-		public Dee.SerializableModel results_model { get; }
-		public bool search_in_global { get; set; }
-		public Unity.OptionsFilter sources { get; internal set; }
-		public signal Unity.ActivationResponse? activate_uri (string uri);
-		public signal void active_sources_changed (string[] active_ids);
-		public signal void filters_changed ();
-		[Signal (detailed = true)]
-		public signal string generate_search_key (Unity.LensSearch search);
-		public signal Unity.Preview? preview_uri (string uri);
-		public signal void search_changed (Unity.LensSearch search, Unity.SearchType search_type, GLib.Cancellable cancellable);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class SocialPreview : Unity.Preview {
-		public class Comment : GLib.InitiallyUnowned {
-			public Comment (string id, string name, string text, string time);
-			public string id { get; construct; }
-			public string name { get; construct; }
-			public string text { get; construct; }
-			public string time { get; construct; }
-		}
-		public SocialPreview (string sender, string subtitle, string content, GLib.Icon? avatar);
-		public void add_comment (Unity.SocialPreview.Comment comment);
-		public GLib.Icon avatar { get; set; }
-		public string content { get; set; }
-		public string sender { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public class TrackMetadata : GLib.Object {
-		public TrackMetadata ();
-		public TrackMetadata.full (string uri, int track_no, string title, string artist, string album, uint length);
-		public string album { get; set; }
-		public GLib.Icon art_icon { get; set; }
-		public GLib.File art_location { get; set; }
-		public string artist { get; set; }
-		public uint length { get; set; }
-		public string title { get; set; }
-		public int track_no { get; set; }
-		public string uri { get; set; }
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public interface MergeStrategy : GLib.Object {
-		public abstract unowned Dee.ModelIter? merge_result (Dee.Model target, GLib.Variant[] row);
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public struct ActivePlaylistContainer {
-		public bool valid;
-		public Unity.PlaylistDetails details;
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public struct PlaylistDetails {
-		public GLib.ObjectPath id;
-		public string name;
-		public string icon_name;
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum CategoryRenderer {
-		VERTICAL_TILE,
-		HORIZONTAL_TILE,
-		LIST_TILE,
-		FLOW
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum CategoryType {
-		NONE,
-		APPLICATION,
-		BOOK,
-		MUSIC,
-		MOVIE,
-		GAMES,
-		ELECTRONICS,
-		COMPUTERS,
-		OFFICE,
-		HOME,
-		GARDEN,
-		PETS,
-		TOYS,
-		CHILDREN,
-		BABY,
-		CLOTHES,
-		SHOES,
-		WATCHES,
-		SPORTS,
-		OUTDOORS,
-		GROCERY,
-		HEALTH,
-		BEAUTY,
-		DIY,
-		TOOLS,
-		CAR,
-		N_CATEGORIES
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum FilterRenderer {
-		CHECK_OPTIONS,
-		RADIO_OPTIONS,
-		MULTIRANGE,
-		RATINGS,
-		CHECK_OPTIONS_COMPACT
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum HandledType {
-		NOT_HANDLED,
-		SHOW_DASH,
-		HIDE_DASH,
-		GOTO_DASH_URI,
-		SHOW_PREVIEW
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum IconSizeHint {
-		DEFAULT,
-		SMALL,
-		LARGE
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum LayoutHint {
-		NONE,
-		LEFT,
-		RIGHT,
-		TOP,
-		BOTTOM
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum PlaybackState {
-		PLAYING,
-		PAUSED
-	}
-	[CCode (cheader_filename = "unity.h")]
-	public enum SearchType {
-		DEFAULT,
-		GLOBAL,
-		N_TYPES
-	}
-}